From 6be28745c75c3542058fc7833c773e3b44ad3b92 Mon Sep 17 00:00:00 2001
From: Evan Sharp <ego@evansharp.ca>
Date: Sat, 15 May 2021 11:38:09 -0700
Subject: [PATCH 0001/2325] Add information for apache mod_userdir

Resolution of issue #4471
---
 .../source/installation/running.rst           | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst
index 4d00260ffcea..deb9bea50693 100644
--- a/user_guide_src/source/installation/running.rst
+++ b/user_guide_src/source/installation/running.rst
@@ -129,6 +129,72 @@ e.g., ``apache2/conf/extra/httpd-vhost.conf``::
 If your project folder is not a subfolder of the Apache document root, then your
 <VirtualHost> element may need a nested <Directory> element to grant the web server access to the files.
 
+With mod_userdir (shared hosts)
+--------------------------------
+
+A common practice in shared hosting environments is to use the Apache module "mod_userdir" to enable per-user Virtual Hosts automatically. Additional configuration is required to allow CodeIgniter4 to be run from these per-user directories.
+
+The following assumes that the server is already configured for mod_userdir. A guide to enabling this module is available `in the Apache documentation <https://httpd.apache.org/docs/2.4/howto/public_html.html>`_.
+
+Because CodeIgniter4 requires the server to find the framework front controller at ``/public/index.php``, you must specify this location as an alternative to search for the request, even if CodeIgniter4 is installed within the per-user web directory.
+
+The default user web directory ``~/public_html`` is specified by the default ``UserDir`` directive, typically in ``/apache2/mods-available/userdir.conf`` or ``/apache2/conf/extra/httpd-userdir.conf``::
+
+    UserDir public_html
+
+So you will need to configure Apache to look for CodeIgniter's public directory first before trying to serve the default::
+
+    UserDir "public_html/public" "public_html"
+
+Be sure to specify options and permissions for the CodeIgniter public directory as well. A ``userdir.conf`` might look like::
+
+    <IfModule mod_userdir.c>
+        UserDir "public_html/public" "public_html"
+        UserDir disabled root
+
+        <Directory /home/*/public_html>
+                AllowOverride All
+                Options MultiViews Indexes FollowSymLinks
+                <Limit GET POST OPTIONS>
+                        # Apache <= 2.2:
+                        #Order allow,deny
+                        # Allow from all
+
+                        # Apache >= 2.4:
+                        Require all granted
+                </Limit>
+                <LimitExcept GET POST OPTIONS>
+                        # Apache <= 2.2:
+                        #Order deny,allow
+                        # Deny from all
+
+                        # Apache >= 2.4:
+                        Require all denied
+                </LimitExcept>
+        </Directory>
+
+        <Directory /home/*/public_html/public>
+                AllowOverride All
+                Options MultiViews Indexes FollowSymLinks
+                <Limit GET POST OPTIONS>
+                        # Apache <= 2.2:
+                        #Order allow,deny
+                        #Allow from all
+
+                        # Apache >= 2.4:
+                        Require all granted
+                </Limit>
+                <LimitExcept GET POST OPTIONS>
+                        # Apache <= 2.2:
+                        #Order deny,allow
+                        #Deny from all
+
+                        # Apache >= 2.4:
+                        Require all denied
+                </LimitExcept>
+        </Directory>
+    </IfModule>
+
 Testing
 -------
 

From 4206bcc41ec182d181d6c6ecd7cc9f73069455d8 Mon Sep 17 00:00:00 2001
From: Evan Sharp <ego@evansharp.ca>
Date: Mon, 17 May 2021 06:52:34 -0700
Subject: [PATCH 0002/2325] Update
 user_guide_src/source/installation/running.rst

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/installation/running.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst
index deb9bea50693..9b5ed53b2c14 100644
--- a/user_guide_src/source/installation/running.rst
+++ b/user_guide_src/source/installation/running.rst
@@ -136,7 +136,7 @@ A common practice in shared hosting environments is to use the Apache module "mo
 
 The following assumes that the server is already configured for mod_userdir. A guide to enabling this module is available `in the Apache documentation <https://httpd.apache.org/docs/2.4/howto/public_html.html>`_.
 
-Because CodeIgniter4 requires the server to find the framework front controller at ``/public/index.php``, you must specify this location as an alternative to search for the request, even if CodeIgniter4 is installed within the per-user web directory.
+Because CodeIgniter4 expects the server to find the framework front controller at ``/public/index.php`` by default, you must specify this location as an alternative to search for the request (even if CodeIgniter4 is installed within the per-user web directory).
 
 The default user web directory ``~/public_html`` is specified by the default ``UserDir`` directive, typically in ``/apache2/mods-available/userdir.conf`` or ``/apache2/conf/extra/httpd-userdir.conf``::
 

From 032e8fdc7373dc5f4f05f79ee6c183eb4cbeda2a Mon Sep 17 00:00:00 2001
From: Evan Sharp <ego@evansharp.ca>
Date: Mon, 17 May 2021 06:52:41 -0700
Subject: [PATCH 0003/2325] Update
 user_guide_src/source/installation/running.rst

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/installation/running.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst
index 9b5ed53b2c14..3c0abeeae114 100644
--- a/user_guide_src/source/installation/running.rst
+++ b/user_guide_src/source/installation/running.rst
@@ -138,7 +138,7 @@ The following assumes that the server is already configured for mod_userdir. A g
 
 Because CodeIgniter4 expects the server to find the framework front controller at ``/public/index.php`` by default, you must specify this location as an alternative to search for the request (even if CodeIgniter4 is installed within the per-user web directory).
 
-The default user web directory ``~/public_html`` is specified by the default ``UserDir`` directive, typically in ``/apache2/mods-available/userdir.conf`` or ``/apache2/conf/extra/httpd-userdir.conf``::
+The default user web directory ``~/public_html`` is specified by the ``UserDir`` directive, typically in ``/apache2/mods-available/userdir.conf`` or ``/apache2/conf/extra/httpd-userdir.conf``::
 
     UserDir public_html
 

From ff77f3b7e909519e23170095be64a164deb76b59 Mon Sep 17 00:00:00 2001
From: Evan Sharp <ego@evansharp.ca>
Date: Mon, 17 May 2021 06:52:46 -0700
Subject: [PATCH 0004/2325] Update
 user_guide_src/source/installation/running.rst

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/installation/running.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst
index 3c0abeeae114..0e7e666ec963 100644
--- a/user_guide_src/source/installation/running.rst
+++ b/user_guide_src/source/installation/running.rst
@@ -165,7 +165,7 @@ Be sure to specify options and permissions for the CodeIgniter public directory
                 </Limit>
                 <LimitExcept GET POST OPTIONS>
                         # Apache <= 2.2:
-                        #Order deny,allow
+                        # Order deny,allow
                         # Deny from all
 
                         # Apache >= 2.4:

From fbb4cb735753716136de030dd7efb6fdca5ff37e Mon Sep 17 00:00:00 2001
From: Evan Sharp <ego@evansharp.ca>
Date: Mon, 17 May 2021 06:52:58 -0700
Subject: [PATCH 0005/2325] Update
 user_guide_src/source/installation/running.rst

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/installation/running.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst
index 0e7e666ec963..c1b5017748f6 100644
--- a/user_guide_src/source/installation/running.rst
+++ b/user_guide_src/source/installation/running.rst
@@ -186,8 +186,8 @@ Be sure to specify options and permissions for the CodeIgniter public directory
                 </Limit>
                 <LimitExcept GET POST OPTIONS>
                         # Apache <= 2.2:
-                        #Order deny,allow
-                        #Deny from all
+                        # Order deny,allow
+                        # Deny from all
 
                         # Apache >= 2.4:
                         Require all denied

From 2b3798cf0f016446a0e103f009c22777ce3ff656 Mon Sep 17 00:00:00 2001
From: Evan Sharp <ego@evansharp.ca>
Date: Mon, 17 May 2021 06:53:02 -0700
Subject: [PATCH 0006/2325] Update
 user_guide_src/source/installation/running.rst

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/installation/running.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst
index c1b5017748f6..a7b1bb034a41 100644
--- a/user_guide_src/source/installation/running.rst
+++ b/user_guide_src/source/installation/running.rst
@@ -178,8 +178,8 @@ Be sure to specify options and permissions for the CodeIgniter public directory
                 Options MultiViews Indexes FollowSymLinks
                 <Limit GET POST OPTIONS>
                         # Apache <= 2.2:
-                        #Order allow,deny
-                        #Allow from all
+                        # Order allow,deny
+                        # Allow from all
 
                         # Apache >= 2.4:
                         Require all granted

From 5fa4159d90afd3fe2d9e51128633d1eaaf52f6ee Mon Sep 17 00:00:00 2001
From: Evan Sharp <ego@evansharp.ca>
Date: Mon, 17 May 2021 06:53:10 -0700
Subject: [PATCH 0007/2325] Update
 user_guide_src/source/installation/running.rst

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/installation/running.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst
index a7b1bb034a41..45e92387dee1 100644
--- a/user_guide_src/source/installation/running.rst
+++ b/user_guide_src/source/installation/running.rst
@@ -157,7 +157,7 @@ Be sure to specify options and permissions for the CodeIgniter public directory
                 Options MultiViews Indexes FollowSymLinks
                 <Limit GET POST OPTIONS>
                         # Apache <= 2.2:
-                        #Order allow,deny
+                        # Order allow,deny
                         # Allow from all
 
                         # Apache >= 2.4:

From 1476c8417a489502ee0dbd69439d974c471160f9 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 15 Jun 2021 23:16:02 +0800
Subject: [PATCH 0008/2325] Define switch-related rules

---
 utils/PhpCsFixer/CodeIgniter4.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index f2515e6bf34c..3b10fe2ceb5f 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -176,11 +176,14 @@ public function __construct()
                 'null_adjustment' => 'always_last',
                 'sort_algorithm'  => 'alpha',
             ],
-            'set_type_to_cast'            => true,
-            'short_scalar_cast'           => true,
-            'static_lambda'               => true,
-            'ternary_to_null_coalescing'  => true,
-            'trailing_comma_in_multiline' => [
+            'set_type_to_cast'               => true,
+            'short_scalar_cast'              => true,
+            'static_lambda'                  => true,
+            'switch_case_semicolon_to_colon' => true,
+            'switch_case_space'              => true,
+            'switch_continue_to_break'       => true,
+            'ternary_to_null_coalescing'     => true,
+            'trailing_comma_in_multiline'    => [
                 'after_heredoc' => true,
                 'elements'      => ['arrays'],
             ],

From 44a9fe24d136f2e08600bd49bb3dfb756cb594bd Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 16 Jun 2021 00:08:12 +0800
Subject: [PATCH 0009/2325] Define rules starting with "L"

---
 tests/system/ControllerTest.php   | 4 ++--
 utils/PhpCsFixer/CodeIgniter4.php | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index 37e9596f58c8..2a89cb1f9350 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -79,7 +79,7 @@ public function testConstructorHTTPS()
         $original = $_SERVER;
         $_SERVER  = ['HTTPS' => 'on'];
         // make sure we can instantiate one
-        $this->controller         = new Class() extends Controller {
+        $this->controller         = new class() extends Controller {
             protected $forceHTTPS = 1;
         };
         $this->controller->initController($this->request, $this->response, $this->logger);
@@ -165,7 +165,7 @@ public function testValidateWithStringRulesFoundUseMessagesParameter()
     //--------------------------------------------------------------------
     public function testHelpers()
     {
-        $this->controller      = new Class() extends Controller {
+        $this->controller      = new class() extends Controller {
             protected $helpers = [
                 'cookie',
                 'text',
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index f2515e6bf34c..0dbc17ce5d54 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -96,9 +96,14 @@ public function __construct()
             'heredoc_indentation'                   => ['indentation' => 'start_plus_one'],
             'heredoc_to_nowdoc'                     => true,
             'indentation_type'                      => true,
+            'lambda_not_used_import'                => true,
             'line_ending'                           => true,
+            'linebreak_after_opening_tag'           => true,
             'list_syntax'                           => ['syntax' => 'short'],
+            'logical_operators'                     => true,
             'lowercase_cast'                        => true,
+            'lowercase_keywords'                    => true,
+            'lowercase_static_reference'            => true,
             'modernize_types_casting'               => true,
             'no_alias_functions'                    => ['sets' => ['@all']],
             'no_short_bool_cast'                    => true,

From 4c5d8e34c4472e04064db3313a0f9daf5ecc0dbb Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 15 Jun 2021 23:19:25 +0800
Subject: [PATCH 0010/2325] Define rules for ternary operators

---
 utils/PhpCsFixer/CodeIgniter4.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index f8461e3e6aab..98bb380de04c 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -187,6 +187,8 @@ public function __construct()
             'switch_case_semicolon_to_colon' => true,
             'switch_case_space'              => true,
             'switch_continue_to_break'       => true,
+            'ternary_operator_spaces'        => true,
+            'ternary_to_elvis_operator'      => true,
             'ternary_to_null_coalescing'     => true,
             'trailing_comma_in_multiline'    => [
                 'after_heredoc' => true,

From fb24304d234c802e3c1c228cae8ea04757cab6c7 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 15 Jun 2021 23:32:42 +0800
Subject: [PATCH 0011/2325] Define rules on unary operators

---
 system/CLI/CLI.php                              | 14 +++++++-------
 system/Database/BaseBuilder.php                 |  6 +++---
 system/Database/BaseConnection.php              |  8 ++++----
 system/Database/BaseResult.php                  |  6 +++---
 system/Database/BaseUtils.php                   |  4 ++--
 system/Database/MySQLi/Forge.php                |  4 ++--
 system/Database/Postgre/Connection.php          |  2 +-
 system/Database/Postgre/PreparedQuery.php       |  2 +-
 system/Database/Postgre/Result.php              |  4 ++--
 system/Database/SQLSRV/Builder.php              |  3 ++-
 system/Database/SQLite3/Result.php              |  4 ++--
 system/Debug/Iterator.php                       |  5 ++---
 system/Email/Email.php                          | 12 ++++++------
 system/Files/File.php                           |  6 +++---
 system/HTTP/RequestTrait.php                    |  2 +-
 system/HTTP/URI.php                             |  4 ++--
 system/Helpers/number_helper.php                |  2 +-
 system/Helpers/text_helper.php                  | 12 ++++++------
 system/Helpers/url_helper.php                   |  8 ++++----
 system/Pager/PagerRenderer.php                  |  2 +-
 system/Router/RouteCollection.php               |  2 +-
 system/Session/Handlers/MemcachedHandler.php    |  2 +-
 system/Session/Handlers/RedisHandler.php        |  2 +-
 system/Typography/Typography.php                |  6 +++---
 system/Validation/CreditCardRules.php           |  4 ++--
 tests/system/Helpers/TextHelperTest.php         |  4 ++--
 tests/system/Validation/CreditCardRulesTest.php |  4 ++--
 tests/system/View/ParserTest.php                |  2 +-
 utils/PhpCsFixer/CodeIgniter4.php               |  5 +++++
 29 files changed, 73 insertions(+), 68 deletions(-)

diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index b7249022497a..4d5ad1ec8ab5 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -403,7 +403,7 @@ public static function wait(int $seconds, bool $countdown = false)
             while ($time > 0) {
                 static::fwrite(STDOUT, $time . '... ');
                 sleep(1);
-                $time --;
+                $time--;
             }
 
             static::write();
@@ -442,7 +442,7 @@ public static function isWindows(): bool
     public static function newLine(int $num = 1)
     {
         // Do it once or more, write with empty string gives us a new line
-        for ($i = 0; $i < $num; $i ++) {
+        for ($i = 0; $i < $num; $i++) {
             static::write();
         }
     }
@@ -998,7 +998,7 @@ public static function table(array $tbody, array $thead = [])
         $maxColsLengths = [];
 
         // Read row by row and define the longest columns
-        for ($row = 0; $row < $totalRows; $row ++) {
+        for ($row = 0; $row < $totalRows; $row++) {
             $column = 0; // Current column index
 
             foreach ($tableRows[$row] as $col) {
@@ -1013,13 +1013,13 @@ public static function table(array $tbody, array $thead = [])
                 }
 
                 // We can go check the size of the next column...
-                $column ++;
+                $column++;
             }
         }
 
         // Read row by row and add spaces at the end of the columns
         // to match the exact column length
-        for ($row = 0; $row < $totalRows; $row ++) {
+        for ($row = 0; $row < $totalRows; $row++) {
             $column = 0;
 
             foreach ($tableRows[$row] as $col) {
@@ -1029,14 +1029,14 @@ public static function table(array $tbody, array $thead = [])
                     $tableRows[$row][$column] = $tableRows[$row][$column] . str_repeat(' ', $diff);
                 }
 
-                $column ++;
+                $column++;
             }
         }
 
         $table = '';
 
         // Joins columns and append the well formatted rows to the table
-        for ($row = 0; $row < $totalRows; $row ++) {
+        for ($row = 0; $row < $totalRows; $row++) {
             // Set the table border-top
             if ($row === 0) {
                 $cols = '+';
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 2657586262dc..ce22b79b5901 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -653,7 +653,7 @@ public function join(string $table, string $cond, string $type = '', bool $escap
                 $joints     = $joints[0];
                 array_unshift($joints, ['', 0]);
 
-                for ($i = count($joints) - 1, $pos = strlen($cond); $i >= 0; $i --) {
+                for ($i = count($joints) - 1, $pos = strlen($cond); $i >= 0; $i--) {
                     $joints[$i][1] += strlen($joints[$i][0]); // offset
                     $conditions[$i] = substr($cond, $joints[$i][1], $pos - $joints[$i][1]);
                     $pos            = $joints[$i][1] - strlen($joints[$i][0]);
@@ -1419,7 +1419,7 @@ protected function groupStartPrepare(string $not = '', string $type = 'AND ', st
         $this->QBWhereGroupStarted = true;
         $prefix                    = empty($this->$clause) ? '' : $type;
         $where                     = [
-            'condition' => $prefix . $not . str_repeat(' ', ++ $this->QBWhereGroupCount) . ' (',
+            'condition' => $prefix . $not . str_repeat(' ', ++$this->QBWhereGroupCount) . ' (',
             'escape'    => false,
         ];
 
@@ -1999,7 +1999,7 @@ public function insertBatch(array $set = null, bool $escape = null, int $batchSi
             $sql = $this->_insertBatch($this->db->protectIdentifiers($table, true, $escape, false), $this->QBKeys, array_slice($this->QBSet, $i, $batchSize));
 
             if ($this->testMode) {
-                ++$affectedRows;
+                $affectedRows++;
             } else {
                 $this->db->query($sql, $this->binds, false);
                 $affectedRows += $this->db->affectedRows();
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 7186036f32e5..b1d92c154c10 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -821,7 +821,7 @@ public function transBegin(bool $testMode = false): bool
 
         // When transactions are nested we only begin/commit/rollback the outermost ones
         if ($this->transDepth > 0) {
-            $this->transDepth ++;
+            $this->transDepth++;
 
             return true;
         }
@@ -836,7 +836,7 @@ public function transBegin(bool $testMode = false): bool
         $this->transFailure = ($testMode === true);
 
         if ($this->_transBegin()) {
-            $this->transDepth ++;
+            $this->transDepth++;
 
             return true;
         }
@@ -859,7 +859,7 @@ public function transCommit(): bool
 
         // When transactions are nested we only begin/commit/rollback the outermost ones
         if ($this->transDepth > 1 || $this->_transCommit()) {
-            $this->transDepth --;
+            $this->transDepth--;
 
             return true;
         }
@@ -882,7 +882,7 @@ public function transRollback(): bool
 
         // When transactions are nested we only begin/commit/rollback the outermost ones
         if ($this->transDepth > 1 || $this->_transRollback()) {
-            $this->transDepth --;
+            $this->transDepth--;
 
             return true;
         }
diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php
index ba190bda7b93..9c22e34ca74a 100644
--- a/system/Database/BaseResult.php
+++ b/system/Database/BaseResult.php
@@ -140,7 +140,7 @@ public function getCustomResultObject(string $className)
         }
 
         if ($_data !== null) {
-            for ($i = 0; $i < $c; $i ++) {
+            for ($i = 0; $i < $c; $i++) {
                 $this->customResultObject[$className][$i] = new $className();
 
                 foreach ($this->{$_data}[$i] as $key => $value) {
@@ -444,7 +444,7 @@ public function getNextRow(string $type = 'object')
             return null;
         }
 
-        return isset($result[$this->currentRow + 1]) ? $result[++ $this->currentRow] : null;
+        return isset($result[$this->currentRow + 1]) ? $result[++$this->currentRow] : null;
     }
 
     //--------------------------------------------------------------------
@@ -464,7 +464,7 @@ public function getPreviousRow(string $type = 'object')
         }
 
         if (isset($result[$this->currentRow - 1])) {
-            -- $this->currentRow;
+            $this->currentRow--;
         }
 
         return $result[$this->currentRow];
diff --git a/system/Database/BaseUtils.php b/system/Database/BaseUtils.php
index 48d54f7f1a89..2fcfd2142949 100644
--- a/system/Database/BaseUtils.php
+++ b/system/Database/BaseUtils.php
@@ -57,7 +57,7 @@ abstract class BaseUtils
      */
     public function __construct(ConnectionInterface &$db)
     {
-        $this->db = & $db;
+        $this->db = &$db;
     }
 
     //--------------------------------------------------------------------
@@ -91,7 +91,7 @@ public function listDatabases()
             return $this->db->dataCache['db_names'];
         }
 
-        for ($i = 0, $query = $query->getResultArray(), $c = count($query); $i < $c; $i ++) {
+        for ($i = 0, $query = $query->getResultArray(), $c = count($query); $i < $c; $i++) {
             $this->db->dataCache['db_names'][] = current($query[$i]);
         }
 
diff --git a/system/Database/MySQLi/Forge.php b/system/Database/MySQLi/Forge.php
index c3202a2e3008..390ee2e1e58b 100644
--- a/system/Database/MySQLi/Forge.php
+++ b/system/Database/MySQLi/Forge.php
@@ -207,9 +207,9 @@ protected function _processIndexes(string $table): string
     {
         $sql = '';
 
-        for ($i = 0, $c = count($this->keys); $i < $c; $i ++) {
+        for ($i = 0, $c = count($this->keys); $i < $c; $i++) {
             if (is_array($this->keys[$i])) {
-                for ($i2 = 0, $c2 = count($this->keys[$i]); $i2 < $c2; $i2 ++) {
+                for ($i2 = 0, $c2 = count($this->keys[$i]); $i2 < $c2; $i2++) {
                     if (! isset($this->fields[$this->keys[$i][$i2]])) {
                         unset($this->keys[$i][$i2]);
 
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
index 334ac39df46b..3012a769491b 100644
--- a/system/Database/Postgre/Connection.php
+++ b/system/Database/Postgre/Connection.php
@@ -294,7 +294,7 @@ public function _fieldData(string $table): array
 
         $retVal = [];
 
-        for ($i = 0, $c = count($query); $i < $c; $i ++) {
+        for ($i = 0, $c = count($query); $i < $c; $i++) {
             $retVal[$i] = new stdClass();
 
             $retVal[$i]->name       = $query[$i]->column_name;
diff --git a/system/Database/Postgre/PreparedQuery.php b/system/Database/Postgre/PreparedQuery.php
index dd9c3699c746..9c94b5c304dd 100644
--- a/system/Database/Postgre/PreparedQuery.php
+++ b/system/Database/Postgre/PreparedQuery.php
@@ -112,7 +112,7 @@ public function parameterize(string $sql): string
         $count = 0;
 
         return preg_replace_callback('/\?/', static function () use (&$count) {
-            $count ++;
+            $count++;
 
             return "\${$count}";
         }, $sql);
diff --git a/system/Database/Postgre/Result.php b/system/Database/Postgre/Result.php
index bd1d2342d08f..936adf339226 100644
--- a/system/Database/Postgre/Result.php
+++ b/system/Database/Postgre/Result.php
@@ -41,7 +41,7 @@ public function getFieldNames(): array
     {
         $fieldNames = [];
 
-        for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i ++) {
+        for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i++) {
             $fieldNames[] = pg_field_name($this->resultID, $i);
         }
 
@@ -59,7 +59,7 @@ public function getFieldData(): array
     {
         $retVal = [];
 
-        for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i ++) {
+        for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i++) {
             $retVal[$i]             = new stdClass();
             $retVal[$i]->name       = pg_field_name($this->resultID, $i);
             $retVal[$i]->type       = pg_field_type_oid($this->resultID, $i);
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index f461c03477b4..656854093ba0 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -141,12 +141,13 @@ public function join(string $table, string $cond, string $type = '', bool $escap
                 $joints     = $joints[0];
                 array_unshift($joints, ['', 0]);
 
-                for ($i = count($joints) - 1, $pos = strlen($cond); $i >= 0; $i --) {
+                for ($i = count($joints) - 1, $pos = strlen($cond); $i >= 0; $i--) {
                     $joints[$i][1] += strlen($joints[$i][0]); // offset
                     $conditions[$i] = substr($cond, $joints[$i][1], $pos - $joints[$i][1]);
                     $pos            = $joints[$i][1] - strlen($joints[$i][0]);
                     $joints[$i]     = $joints[$i][0];
                 }
+
                 ksort($conditions);
             } else {
                 $conditions = [$cond];
diff --git a/system/Database/SQLite3/Result.php b/system/Database/SQLite3/Result.php
index 04109fb498f4..4bddc63fe854 100644
--- a/system/Database/SQLite3/Result.php
+++ b/system/Database/SQLite3/Result.php
@@ -43,7 +43,7 @@ public function getFieldNames(): array
     {
         $fieldNames = [];
 
-        for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i ++) {
+        for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i++) {
             $fieldNames[] = $this->resultID->columnName($i); // @phpstan-ignore-line
         }
 
@@ -70,7 +70,7 @@ public function getFieldData(): array
         $retVal = [];
         $this->resultID->fetchArray(SQLITE3_NUM); // @phpstan-ignore-line
 
-        for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i ++) {
+        for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i++) {
             $retVal[$i]             = new stdClass();
             $retVal[$i]->name       = $this->resultID->columnName($i); // @phpstan-ignore-line
             $type                   = $this->resultID->columnType($i); // @phpstan-ignore-line
diff --git a/system/Debug/Iterator.php b/system/Debug/Iterator.php
index 7f924b66a8eb..ca5233010d2f 100644
--- a/system/Debug/Iterator.php
+++ b/system/Debug/Iterator.php
@@ -75,9 +75,8 @@ public function run(int $iterations = 1000, bool $output = true)
             $start    = microtime(true);
             $startMem = $maxMemory = memory_get_usage(true);
 
-            for ($i = 0; $i < $iterations; $i ++) {
-                $result = $test();
-
+            for ($i = 0; $i < $iterations; $i++) {
+                $result    = $test();
                 $maxMemory = max($maxMemory, memory_get_usage(true));
 
                 unset($result);
diff --git a/system/Email/Email.php b/system/Email/Email.php
index 62742e7d8ebb..406a8c5ee7c9 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -691,7 +691,7 @@ public function attach($file, $disposition = '', $newname = null, $mime = '')
 
             fclose($fp);
         } else {
-            $fileContent = & $file; // buffered file
+            $fileContent = &$file; // buffered file
         }
 
         // declare names on their own, to make phpcbf happy
@@ -1042,7 +1042,7 @@ protected function getAltMessage()
         $body = preg_match('/\<body.*?\>(.*)\<\/body\>/si', $this->body, $match) ? $match[1] : $this->body;
         $body = str_replace("\t", '', preg_replace('#<!--(.*)--\>#', '', trim(strip_tags($body))));
 
-        for ($i = 20; $i >= 3; $i --) {
+        for ($i = 20; $i >= 3; $i--) {
             $body = str_replace(str_repeat("\n", $i), "\n\n", $body);
         }
 
@@ -1080,7 +1080,7 @@ public function wordWrap($str, $charlim = null)
         $unwrap = [];
 
         if (preg_match_all('|\{unwrap\}(.+?)\{/unwrap\}|s', $str, $matches)) {
-            for ($i = 0, $c = count($matches[0]); $i < $c; $i ++) {
+            for ($i = 0, $c = count($matches[0]); $i < $c; $i++) {
                 $unwrap[] = $matches[1][$i];
                 $str      = str_replace($matches[0][$i], '{{unwrapped' . $i . '}}', $str);
             }
@@ -1488,7 +1488,7 @@ protected function prepQuotedPrintable($str)
             // Loop through each character in the line to add soft-wrap
             // characters at the end of a line " =\r\n" and add the newly
             // processed line(s) to the output (see comment on $crlf class property)
-            for ($i = 0; $i < $length; $i ++) {
+            for ($i = 0; $i < $length; $i++) {
                 // Grab the next character
                 $char  = $line[$i];
                 $ascii = ord($char);
@@ -1577,7 +1577,7 @@ protected function prepQEncoding($str)
 
         $output = '=?' . $this->charset . '?Q?';
 
-        for ($i = 0, $length = static::strlen($output); $i < $chars; $i ++) {
+        for ($i = 0, $length = static::strlen($output); $i < $chars; $i++) {
             $chr = ($this->charset === 'UTF-8' && extension_loaded('iconv')) ? '=' . implode('=', str_split(strtoupper(bin2hex(iconv_substr($str, $i, 1, $this->charset))), 2)) : '=' . strtoupper(bin2hex($str[$i]));
 
             // RFC 2045 sets a limit of 76 characters per line.
@@ -1679,7 +1679,7 @@ public function batchBCCSend()
             }
         }
 
-        for ($i = 0, $c = count($chunk); $i < $c; $i ++) {
+        for ($i = 0, $c = count($chunk); $i < $c; $i++) {
             unset($this->headers['Bcc']);
             $bcc = $this->cleanEmail($this->stringToArray($chunk[$i]));
 
diff --git a/system/Files/File.php b/system/Files/File.php
index 3605b1b8f2cb..c257e261a33d 100644
--- a/system/Files/File.php
+++ b/system/Files/File.php
@@ -198,13 +198,13 @@ public function getDestination(string $destination, string $delimiter = '_', int
                 if (is_numeric(end($parts))) {
                     $i = end($parts);
                     array_pop($parts);
-                    $parts[]     = ++ $i;
+                    $parts[]     = ++$i;
                     $destination = $info['dirname'] . '/' . implode($delimiter, $parts) . $extension;
                 } else {
-                    $destination = $info['dirname'] . '/' . $info['filename'] . $delimiter . ++ $i . $extension;
+                    $destination = $info['dirname'] . '/' . $info['filename'] . $delimiter . ++$i . $extension;
                 }
             } else {
-                $destination = $info['dirname'] . '/' . $info['filename'] . $delimiter . ++ $i . $extension;
+                $destination = $info['dirname'] . '/' . $info['filename'] . $delimiter . ++$i . $extension;
             }
         }
 
diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php
index d819ca662a2c..daf719e40a43 100644
--- a/system/HTTP/RequestTrait.php
+++ b/system/HTTP/RequestTrait.php
@@ -112,7 +112,7 @@ public function getIPAddress(): string
                             // Make sure we're have the "full" IPv6 format
                             $ip = explode(':', str_replace('::', str_repeat(':', 9 - substr_count($this->ipAddress, ':')), $this->ipAddress));
 
-                            for ($j = 0; $j < 8; $j ++) {
+                            for ($j = 0; $j < 8; $j++) {
                                 $ip[$j] = intval($ip[$j], 16);
                             }
 
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index 9805ef41e3f4..6b2ce5f2e8f0 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -579,7 +579,7 @@ public function getSegment(int $number, string $default = ''): string
     {
         // The segment should treat the array as 1-based for the user
         // but we still have to deal with a zero-based array.
-        $number -= 1;
+        $number--;
 
         if ($number > count($this->segments) && ! $this->silent) {
             throw HTTPException::forURISegmentOutOfRange($number);
@@ -601,7 +601,7 @@ public function setSegment(int $number, $value)
     {
         // The segment should treat the array as 1-based for the user
         // but we still have to deal with a zero-based array.
-        $number -= 1;
+        $number--;
 
         if ($number > count($this->segments) + 1) {
             if ($this->silent) {
diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
index d253adef53a9..9ccfb5ca9359 100644
--- a/system/Helpers/number_helper.php
+++ b/system/Helpers/number_helper.php
@@ -275,7 +275,7 @@ function number_to_roman(string $num): ?string
                     break;
             }
             if ($num > 10) {
-                $return = $_number_to_roman($num / 10, ++ $th) . $return;
+                $return = $_number_to_roman($num / 10, ++$th) . $return;
             }
 
             return $return;
diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index dcd51d7916a5..4e4b66b6b7ce 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -102,7 +102,7 @@ function ascii_to_entities(string $str): string
     {
         $out = '';
 
-        for ($i = 0, $s = strlen($str) - 1, $count = 1, $temp = []; $i <= $s; $i ++) {
+        for ($i = 0, $s = strlen($str) - 1, $count = 1, $temp = []; $i <= $s; $i++) {
             $ordinal = ord($str[$i]);
 
             if ($ordinal < 128) {
@@ -156,7 +156,7 @@ function ascii_to_entities(string $str): string
     function entities_to_ascii(string $str, bool $all = true): string
     {
         if (preg_match_all('/\&#(\d+)\;/', $str, $matches)) {
-            for ($i = 0, $s = count($matches[0]); $i < $s; $i ++) {
+            for ($i = 0, $s = count($matches[0]); $i < $s; $i++) {
                 $digits = $matches[1][$i];
                 $out    = '';
                 if ($digits < 128) {
@@ -235,7 +235,7 @@ function word_censor(string $str, array $censored, string $replacement = ''): st
             } elseif (preg_match_all("/{$delim}(" . $badword . "){$delim}/i", $str, $matches, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE)) {
                 $matches = $matches[1];
 
-                for ($i = count($matches) - 1; $i >= 0; $i --) {
+                for ($i = count($matches) - 1; $i >= 0; $i--) {
                     $length = strlen($matches[$i][0]);
                     $str    = substr_replace(
                             $str, str_repeat('#', $length), $matches[$i][1], $length
@@ -410,7 +410,7 @@ function word_wrap(string $str, int $charlim = 76): string
         $unwrap = [];
 
         if (preg_match_all('|\{unwrap\}(.+?)\{/unwrap\}|s', $str, $matches)) {
-            for ($i = 0, $c = count($matches[0]); $i < $c; $i ++) {
+            for ($i = 0, $c = count($matches[0]); $i < $c; $i++) {
                 $unwrap[] = $matches[1][$i];
                 $str      = str_replace($matches[0][$i], '{{unwrapped' . $i . '}}', $str);
             }
@@ -765,7 +765,7 @@ function excerpt(string $text, string $phrase = null, int $radius = 100, string
             if ((strlen($e) + $count + 1) < $radius) {
                 $prev = ' ' . $e . $prev;
             }
-            $count = ++ $count + strlen($e);
+            $count = ++$count + strlen($e);
         }
 
         $count = 0;
@@ -774,7 +774,7 @@ function excerpt(string $text, string $phrase = null, int $radius = 100, string
             if ((strlen($s) + $count + 1) < $radius) {
                 $post .= $s . ' ';
             }
-            $count = ++ $count + strlen($s);
+            $count = ++$count + strlen($s);
         }
 
         $ellPre = $phrase ? $ellipsis : '';
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
index 7a42c7f11c1c..0e725d1c653e 100644
--- a/system/Helpers/url_helper.php
+++ b/system/Helpers/url_helper.php
@@ -356,7 +356,7 @@ function safe_mailto(string $email, string $title = '', $attributes = ''): strin
 
         $x = str_split('<a href="mailto:', 1);
 
-        for ($i = 0, $l = strlen($email); $i < $l; $i ++) {
+        for ($i = 0, $l = strlen($email); $i < $l; $i++) {
             $x[] = '|' . ord($email[$i]);
         }
 
@@ -367,14 +367,14 @@ function safe_mailto(string $email, string $title = '', $attributes = ''): strin
                 foreach ($attributes as $key => $val) {
                     $x[] = ' ' . $key . '="';
 
-                    for ($i = 0, $l = strlen($val); $i < $l; $i ++) {
+                    for ($i = 0, $l = strlen($val); $i < $l; $i++) {
                         $x[] = '|' . ord($val[$i]);
                     }
 
                     $x[] = '"';
                 }
             } else {
-                for ($i = 0, $l = mb_strlen($attributes); $i < $l; $i ++) {
+                for ($i = 0, $l = mb_strlen($attributes); $i < $l; $i++) {
                     $x[] = mb_substr($attributes, $i, 1);
                 }
             }
@@ -384,7 +384,7 @@ function safe_mailto(string $email, string $title = '', $attributes = ''): strin
 
         $temp = [];
 
-        for ($i = 0, $l = strlen($title); $i < $l; $i ++) {
+        for ($i = 0, $l = strlen($title); $i < $l; $i++) {
             $ordinal = ord($title[$i]);
 
             if ($ordinal < 128) {
diff --git a/system/Pager/PagerRenderer.php b/system/Pager/PagerRenderer.php
index 45562094bd2f..33d7b01b2824 100644
--- a/system/Pager/PagerRenderer.php
+++ b/system/Pager/PagerRenderer.php
@@ -271,7 +271,7 @@ public function links(): array
 
         $uri = clone $this->uri;
 
-        for ($i = $this->first; $i <= $this->last; $i ++) {
+        for ($i = $this->first; $i <= $this->last; $i++) {
             $uri     = $this->segment === 0 ? $uri->addQuery($this->pageSelector, $i) : $uri->setSegment($this->segment, $i);
             $links[] = [
                 'uri'    => URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment()),
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 7118c4a05882..09ea2542da7f 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1365,7 +1365,7 @@ protected function create(string $verb, string $from, $to, array $options = null
             // Get a constant string to work with.
             $to = preg_replace('/(\$\d+)/', '$X', $to);
 
-            for ($i = (int) $options['offset'] + 1; $i < (int) $options['offset'] + 7; $i ++) {
+            for ($i = (int) $options['offset'] + 1; $i < (int) $options['offset'] + 7; $i++) {
                 $to = preg_replace_callback(
                         '/\$X/', static function ($m) use ($i) {
                             return '$' . $i;
diff --git a/system/Session/Handlers/MemcachedHandler.php b/system/Session/Handlers/MemcachedHandler.php
index c4cccd4b2669..b924e6318d44 100644
--- a/system/Session/Handlers/MemcachedHandler.php
+++ b/system/Session/Handlers/MemcachedHandler.php
@@ -308,7 +308,7 @@ protected function lockSession(string $sessionID): bool
 
             $this->lockKey = $lockKey;
             break;
-        } while (++ $attempt < 30);
+        } while (++$attempt < 30);
 
         if ($attempt === 30) {
             $this->logger->error('Session: Unable to obtain lock for ' . $this->keyPrefix . $sessionID . ' after 30 attempts, aborting.');
diff --git a/system/Session/Handlers/RedisHandler.php b/system/Session/Handlers/RedisHandler.php
index b05c3579588c..dc55f9f2f170 100644
--- a/system/Session/Handlers/RedisHandler.php
+++ b/system/Session/Handlers/RedisHandler.php
@@ -329,7 +329,7 @@ protected function lockSession(string $sessionID): bool
 
             $this->lockKey = $lockKey;
             break;
-        } while (++ $attempt < 30);
+        } while (++$attempt < 30);
 
         if ($attempt === 30) {
             log_message('error', 'Session: Unable to obtain lock for ' . $this->keyPrefix . $sessionID . ' after 30 attempts, aborting.');
diff --git a/system/Typography/Typography.php b/system/Typography/Typography.php
index 38da93779ba9..fa91bb8f49fb 100644
--- a/system/Typography/Typography.php
+++ b/system/Typography/Typography.php
@@ -94,7 +94,7 @@ public function autoTypography(string $str, bool $reduceLinebreaks = false): str
         // HTML comment tags don't conform to patterns of normal tags, so pull them out separately, only if needed
         $htmlComments = [];
         if (strpos($str, '<!--') !== false && preg_match_all('#(<!\-\-.*?\-\->)#s', $str, $matches)) {
-            for ($i = 0, $total = count($matches[0]); $i < $total; $i ++) {
+            for ($i = 0, $total = count($matches[0]); $i < $total; $i++) {
                 $htmlComments[] = $matches[0][$i];
                 $str            = str_replace($matches[0][$i], '{@HC' . $i . '}', $str);
             }
@@ -135,7 +135,7 @@ public function autoTypography(string $str, bool $reduceLinebreaks = false): str
         $str     = '';
         $process = true;
 
-        for ($i = 0, $c = count($chunks) - 1; $i <= $c; $i ++) {
+        for ($i = 0, $c = count($chunks) - 1; $i <= $c; $i++) {
             // Are we dealing with a tag? If so, we'll skip the processing for this cycle.
             // Well also set the "process" flag which allows us to skip <pre> tags and a few other things.
             if (preg_match('#<(/*)(' . $this->blockElements . ').*?>#', $chunks[$i], $match)) {
@@ -349,7 +349,7 @@ public function nl2brExceptPre(string $str): string
     {
         $newstr = '';
 
-        for ($ex = explode('pre>', $str), $ct = count($ex), $i = 0; $i < $ct; $i ++) {
+        for ($ex = explode('pre>', $str), $ct = count($ex), $i = 0; $i < $ct; $i++) {
             $newstr .= (($i % 2) === 0) ? nl2br($ex[$i]) : $ex[$i];
 
             if ($ct - 1 !== $i) {
diff --git a/system/Validation/CreditCardRules.php b/system/Validation/CreditCardRules.php
index f4be76d4a993..13813063c8b6 100644
--- a/system/Validation/CreditCardRules.php
+++ b/system/Validation/CreditCardRules.php
@@ -284,8 +284,8 @@ protected function isValidLuhn(string $number = null): bool
         $sum  = 0;
         $flip = 0;
 
-        for ($i = strlen($number) - 1; $i >= 0; $i --) {
-            $sum += $sumTable[$flip ++ & 0x1][$number[$i]];
+        for ($i = strlen($number) - 1; $i >= 0; $i--) {
+            $sum += $sumTable[$flip++ & 0x1][$number[$i]];
         }
 
         return $sum % 10 === 0;
diff --git a/tests/system/Helpers/TextHelperTest.php b/tests/system/Helpers/TextHelperTest.php
index 9ee8ebb306ff..aa8e3aef3bf1 100755
--- a/tests/system/Helpers/TextHelperTest.php
+++ b/tests/system/Helpers/TextHelperTest.php
@@ -345,7 +345,7 @@ public function testAlternator()
         $result = '';
         alternator();
 
-        for ($i = 0; $i < 4; $i ++) {
+        for ($i = 0; $i < 4; $i++) {
             $result .= alternator('I', 'you', 'we') . $phrase;
         }
         $this->assertEquals('I scream! you scream! we scream! I scream! ', $result);
@@ -356,7 +356,7 @@ public function testEmptyAlternator()
         $phrase = ' scream! ';
         $result = '';
 
-        for ($i = 0; $i < 4; $i ++) {
+        for ($i = 0; $i < 4; $i++) {
             $result .= alternator() . $phrase;
         }
 
diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php
index 5cd29c8db821..91c2abc5cfd5 100644
--- a/tests/system/Validation/CreditCardRulesTest.php
+++ b/tests/system/Validation/CreditCardRulesTest.php
@@ -1236,13 +1236,13 @@ protected function generateCardNum(int $prefix, int $length)
 
         // Fill all of the remaining values with random numbers, except the last one.
         while ($pos < $length - 1) {
-            $string[$pos ++] = random_int(0, 9);
+            $string[$pos++] = random_int(0, 9);
         }
 
         // Calculate the Luhn checksum of the current values.
         $lenOffset = ($length + 1) % 2;
 
-        for ($pos = 0; $pos < $length - 1; $pos ++) {
+        for ($pos = 0; $pos < $length - 1; $pos++) {
             if (($pos + $lenOffset) % 2) {
                 $temp = $string[$pos] * 2;
                 if ($temp > 9) {
diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php
index 299dfd6e5174..41d8d3ac99bc 100644
--- a/tests/system/View/ParserTest.php
+++ b/tests/system/View/ParserTest.php
@@ -781,7 +781,7 @@ public function testParserPluginParams()
 
             $out = '';
 
-            for ($i = 1; $i <= $count; $i ++) {
+            for ($i = 1; $i <= $count; $i++) {
                 $out .= ' ' . $i * $step;
             }
 
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index f8461e3e6aab..9a8ec7eccd11 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -95,6 +95,7 @@ public function __construct()
             'function_to_constant'                  => true,
             'heredoc_indentation'                   => ['indentation' => 'start_plus_one'],
             'heredoc_to_nowdoc'                     => true,
+            'increment_style'                       => ['style' => 'post'],
             'indentation_type'                      => true,
             'lambda_not_used_import'                => true,
             'line_ending'                           => true,
@@ -110,6 +111,8 @@ public function __construct()
             'no_trailing_comma_in_singleline_array' => true,
             'no_unset_cast'                         => true,
             'no_whitespace_before_comma_in_array'   => ['after_heredoc' => true],
+            'not_operator_with_space'               => false,
+            'not_operator_with_successor_space'     => true,
             'normalize_index_brace'                 => true,
             'ordered_imports'                       => ['sort_algorithm' => 'alpha'],
             'phpdoc_align'                          => true,
@@ -183,6 +186,7 @@ public function __construct()
             ],
             'set_type_to_cast'               => true,
             'short_scalar_cast'              => true,
+            'standardize_increment'          => true,
             'static_lambda'                  => true,
             'switch_case_semicolon_to_colon' => true,
             'switch_case_space'              => true,
@@ -194,6 +198,7 @@ public function __construct()
             ],
             'trim_array_spaces'               => true,
             'whitespace_after_comma_in_array' => true,
+            'unary_operator_spaces'           => true,
             'visibility_required'             => ['elements' => ['const', 'method', 'property']],
             'yoda_style'                      => [
                 'equal'                => false,

From 9197063e53b7e486643e9c91769742b9d94cbc8b Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 16 Jun 2021 00:12:18 +0800
Subject: [PATCH 0012/2325] Use correct casing for PHP magic methods and
 constants

---
 tests/system/Test/BootstrapFCPATHTest.php | 4 ++--
 utils/PhpCsFixer/CodeIgniter4.php         | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/system/Test/BootstrapFCPATHTest.php b/tests/system/Test/BootstrapFCPATHTest.php
index 7fb62ca2c969..7622438db99e 100644
--- a/tests/system/Test/BootstrapFCPATHTest.php
+++ b/tests/system/Test/BootstrapFCPATHTest.php
@@ -15,7 +15,7 @@
 
 class BootstrapFCPATHTest extends CIUnitTestCase
 {
-    private $currentDir = __dir__;
+    private $currentDir = __DIR__;
     private $dir1       = '/tmp/dir1';
     private $file1      = '/tmp/dir1/testFile.php';
 
@@ -44,7 +44,7 @@ public function testSetFCPATH()
 
     private function correctFCPATH()
     {
-        return realpath(__dir__ . '/../../../public') . DIRECTORY_SEPARATOR;
+        return realpath(__DIR__ . '/../../../public') . DIRECTORY_SEPARATOR;
     }
 
     private function buildDirectories() : void
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index f8461e3e6aab..c2dce5b46ab1 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -104,6 +104,8 @@ public function __construct()
             'lowercase_cast'                        => true,
             'lowercase_keywords'                    => true,
             'lowercase_static_reference'            => true,
+            'magic_constant_casing'                 => true,
+            'magic_method_casing'                   => true,
             'modernize_types_casting'               => true,
             'no_alias_functions'                    => ['sets' => ['@all']],
             'no_short_bool_cast'                    => true,

From 6d70cfe7c4303b51371d96f63047db5da1820721 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 16 Jun 2021 00:13:23 +0800
Subject: [PATCH 0013/2325] Set `mb_str_functions` fixer as false

---
 utils/PhpCsFixer/CodeIgniter4.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index c2dce5b46ab1..f01c2e4939a6 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -106,6 +106,7 @@ public function __construct()
             'lowercase_static_reference'            => true,
             'magic_constant_casing'                 => true,
             'magic_method_casing'                   => true,
+            'mb_str_functions'                      => false,
             'modernize_types_casting'               => true,
             'no_alias_functions'                    => ['sets' => ['@all']],
             'no_short_bool_cast'                    => true,

From 915190a9730bb74afcc13948174d670ceff5317c Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Thu, 17 Jun 2021 00:58:17 +0800
Subject: [PATCH 0014/2325] Enable `multiline_comment_opening_closing` fixer

---
 system/Entity/Entity.php          | 2 +-
 utils/PhpCsFixer/CodeIgniter4.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index 62a3cc827f91..7a63503f2dc7 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -106,7 +106,7 @@ class Entity implements JsonSerializable
      * Holds info whenever properties have to be casted
      *
      * @var bool
-     **/
+     */
     private $_cast = true;
 
     /**
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 3b0b97cd6ec6..25f5f6a193a5 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -109,6 +109,7 @@ public function __construct()
             'magic_method_casing'                   => true,
             'mb_str_functions'                      => false,
             'modernize_types_casting'               => true,
+            'multiline_comment_opening_closing'     => true,
             'no_alias_functions'                    => ['sets' => ['@all']],
             'no_short_bool_cast'                    => true,
             'no_trailing_comma_in_singleline_array' => true,

From 4b601e59cbbda64c0515042c32d0b5ab6b6ac40c Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Thu, 17 Jun 2021 01:01:42 +0800
Subject: [PATCH 0015/2325] Enable `multiline_whitespace_before_semicolons`
 fixer

---
 tests/system/View/ParserFilterTest.php |  3 +-
 utils/PhpCsFixer/CodeIgniter4.php      | 67 +++++++++++++-------------
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/tests/system/View/ParserFilterTest.php b/tests/system/View/ParserFilterTest.php
index 9e3e4001e6a1..d2b9f001c420 100644
--- a/tests/system/View/ParserFilterTest.php
+++ b/tests/system/View/ParserFilterTest.php
@@ -17,8 +17,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->loader = Services::locator();
-        ;
+        $this->loader   = Services::locator();
         $this->viewsDir = __DIR__ . '/Views';
         $this->config   = new View();
     }
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 25f5f6a193a5..1886509d03da 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -89,39 +89,40 @@ public function __construct()
                     'phpstan-ignore-next-line',
                 ],
             ],
-            'compact_nullable_typehint'             => true,
-            'concat_space'                          => ['spacing' => 'one'],
-            'constant_case'                         => ['case' => 'lower'],
-            'function_to_constant'                  => true,
-            'heredoc_indentation'                   => ['indentation' => 'start_plus_one'],
-            'heredoc_to_nowdoc'                     => true,
-            'increment_style'                       => ['style' => 'post'],
-            'indentation_type'                      => true,
-            'lambda_not_used_import'                => true,
-            'line_ending'                           => true,
-            'linebreak_after_opening_tag'           => true,
-            'list_syntax'                           => ['syntax' => 'short'],
-            'logical_operators'                     => true,
-            'lowercase_cast'                        => true,
-            'lowercase_keywords'                    => true,
-            'lowercase_static_reference'            => true,
-            'magic_constant_casing'                 => true,
-            'magic_method_casing'                   => true,
-            'mb_str_functions'                      => false,
-            'modernize_types_casting'               => true,
-            'multiline_comment_opening_closing'     => true,
-            'no_alias_functions'                    => ['sets' => ['@all']],
-            'no_short_bool_cast'                    => true,
-            'no_trailing_comma_in_singleline_array' => true,
-            'no_unset_cast'                         => true,
-            'no_whitespace_before_comma_in_array'   => ['after_heredoc' => true],
-            'not_operator_with_space'               => false,
-            'not_operator_with_successor_space'     => true,
-            'normalize_index_brace'                 => true,
-            'ordered_imports'                       => ['sort_algorithm' => 'alpha'],
-            'phpdoc_align'                          => true,
-            'phpdoc_indent'                         => true,
-            'phpdoc_inline_tag_normalizer'          => [
+            'compact_nullable_typehint'              => true,
+            'concat_space'                           => ['spacing' => 'one'],
+            'constant_case'                          => ['case' => 'lower'],
+            'function_to_constant'                   => true,
+            'heredoc_indentation'                    => ['indentation' => 'start_plus_one'],
+            'heredoc_to_nowdoc'                      => true,
+            'increment_style'                        => ['style' => 'post'],
+            'indentation_type'                       => true,
+            'lambda_not_used_import'                 => true,
+            'line_ending'                            => true,
+            'linebreak_after_opening_tag'            => true,
+            'list_syntax'                            => ['syntax' => 'short'],
+            'logical_operators'                      => true,
+            'lowercase_cast'                         => true,
+            'lowercase_keywords'                     => true,
+            'lowercase_static_reference'             => true,
+            'magic_constant_casing'                  => true,
+            'magic_method_casing'                    => true,
+            'mb_str_functions'                       => false,
+            'modernize_types_casting'                => true,
+            'multiline_comment_opening_closing'      => true,
+            'multiline_whitespace_before_semicolons' => ['strategy' => 'no_multi_line'],
+            'no_alias_functions'                     => ['sets' => ['@all']],
+            'no_short_bool_cast'                     => true,
+            'no_trailing_comma_in_singleline_array'  => true,
+            'no_unset_cast'                          => true,
+            'no_whitespace_before_comma_in_array'    => ['after_heredoc' => true],
+            'not_operator_with_space'                => false,
+            'not_operator_with_successor_space'      => true,
+            'normalize_index_brace'                  => true,
+            'ordered_imports'                        => ['sort_algorithm' => 'alpha'],
+            'phpdoc_align'                           => true,
+            'phpdoc_indent'                          => true,
+            'phpdoc_inline_tag_normalizer'           => [
                 'tags' => [
                     'example',
                     'id',

From a0dca3d5ba99e75b9583c61b162ea639af2e8aee Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 16 Jun 2021 00:50:52 +0800
Subject: [PATCH 0016/2325] Enable `method_argument_space` fixer

---
 system/Autoloader/FileLocator.php           |   6 +-
 system/Cache/Handlers/MemcachedHandler.php  |  14 ++-
 system/Cache/Handlers/PredisHandler.php     |   6 +-
 system/Common.php                           |   7 +-
 system/Config/DotEnv.php                    |   3 +-
 system/Database/BaseBuilder.php             |  32 ++++--
 system/Database/BaseConnection.php          |  21 ++--
 system/Database/Forge.php                   |  41 +++++---
 system/Database/MySQLi/Connection.php       |  61 ++++++-----
 system/Database/SQLite3/Connection.php      |   5 +-
 system/Debug/Exceptions.php                 |   6 +-
 system/Debug/Toolbar.php                    |   8 +-
 system/Debug/Toolbar/Views/toolbar.tpl.php  |   6 +-
 system/Entity/Cast/JsonCast.php             |   6 +-
 system/HTTP/Files/FileCollection.php        |   6 +-
 system/HTTP/RequestTrait.php                |   6 +-
 system/HTTP/URI.php                         |  15 ++-
 system/Helpers/filesystem_helper.php        |   6 +-
 system/Helpers/inflector_helper.php         |  15 ++-
 system/Helpers/security_helper.php          |  11 +-
 system/Helpers/text_helper.php              | 108 +++++++++-----------
 system/Images/Handlers/GDHandler.php        |   3 +-
 system/Model.php                            |   7 +-
 system/Router/RouteCollection.php           |   9 +-
 system/Session/Handlers/BaseHandler.php     |   8 +-
 system/Test/Constraints/SeeInDatabase.php   |  11 +-
 system/View/Parser.php                      |   5 +-
 tests/system/Autoloader/FileLocatorTest.php |   9 +-
 tests/system/CommonFunctionsTest.php        |   3 +-
 tests/system/Database/Live/ConnectTest.php  |   2 +-
 tests/system/I18n/TimeTest.php              |  31 ++++--
 tests/system/Pager/PagerTest.php            |  45 +++++---
 tests/system/Router/RouteCollectionTest.php |  98 ++++++++++--------
 tests/system/Session/SessionTest.php        |   9 +-
 tests/system/Test/ReflectionHelperTest.php  |  26 +++--
 tests/system/View/TableTest.php             |  64 ++++++------
 utils/PhpCsFixer/CodeIgniter4.php           |  43 ++++----
 37 files changed, 444 insertions(+), 318 deletions(-)

diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index 5afd47c26f1a..ef5d52e61704 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -295,8 +295,10 @@ public function findQualifiedNameFromPath(string $path)
 
             if (mb_strpos($path, $namespace['path']) === 0) {
                 $className = '\\' . $namespace['prefix'] . '\\' .
-                        ltrim(str_replace('/', '\\', mb_substr(
-                            $path, mb_strlen($namespace['path']))
+                        ltrim(str_replace(
+                            '/',
+                            '\\',
+                            mb_substr($path, mb_strlen($namespace['path']))
                         ), '\\');
 
                 // Remove the file extension (.php)
diff --git a/system/Cache/Handlers/MemcachedHandler.php b/system/Cache/Handlers/MemcachedHandler.php
index ac0a74c130af..d3c7e32878c4 100644
--- a/system/Cache/Handlers/MemcachedHandler.php
+++ b/system/Cache/Handlers/MemcachedHandler.php
@@ -90,7 +90,9 @@ public function initialize()
 
                 // Add server
                 $this->memcached->addServer(
-                    $this->config['host'], $this->config['port'], $this->config['weight']
+                    $this->config['host'],
+                    $this->config['port'],
+                    $this->config['weight']
                 );
 
                 // attempt to get status of servers
@@ -107,7 +109,8 @@ public function initialize()
 
                 // Check if we can connect to the server
                 $canConnect = $this->memcached->connect(
-                    $this->config['host'], $this->config['port']
+                    $this->config['host'],
+                    $this->config['port']
                 );
 
                 // If we can't connect, throw a CriticalError exception
@@ -117,16 +120,17 @@ public function initialize()
 
                 // Add server, third parameter is persistence and defaults to TRUE.
                 $this->memcached->addServer(
-                    $this->config['host'], $this->config['port'], true, $this->config['weight']
+                    $this->config['host'],
+                    $this->config['port'],
+                    true,
+                    $this->config['weight']
                 );
             } else {
                 throw new CriticalError('Cache: Not support Memcache(d) extension.');
             }
         } catch (CriticalError $e) {
-            // If a CriticalError exception occurs, throw it up.
             throw $e;
         } catch (Exception $e) {
-            // If an \Exception occurs, convert it into a CriticalError exception and throw it.
             throw new CriticalError('Cache: Memcache(d) connection refused (' . $e->getMessage() . ').');
         }
     }
diff --git a/system/Cache/Handlers/PredisHandler.php b/system/Cache/Handlers/PredisHandler.php
index 8fb7ca7682d0..6f93c7a9bae0 100644
--- a/system/Cache/Handlers/PredisHandler.php
+++ b/system/Cache/Handlers/PredisHandler.php
@@ -92,10 +92,8 @@ public function get(string $key)
     {
         $key = static::validateKey($key);
 
-        $data = array_combine([
-            '__ci_type',
-            '__ci_value',
-        ],
+        $data = array_combine(
+            ['__ci_type', '__ci_value'],
             $this->redis->hmget($key, ['__ci_type', '__ci_value'])
         );
 
diff --git a/system/Common.php b/system/Common.php
index 384367bda29b..1a072ebc4ac2 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -513,8 +513,11 @@ function force_https(int $duration = 31536000, RequestInterface $request = null,
         }
 
         $uri = URI::createURIString(
-            'https', $baseURL, $request->uri->getPath(), // Absolute URIs should use a "/" for an empty path
-            $request->uri->getQuery(), $request->uri->getFragment()
+            'https',
+            $baseURL,
+            $request->uri->getPath(), // Absolute URIs should use a "/" for an empty path
+            $request->uri->getQuery(),
+            $request->uri->getFragment()
         );
 
         // Set an HSTS header
diff --git a/system/Config/DotEnv.php b/system/Config/DotEnv.php
index 880f81c49be4..92fbad012784 100644
--- a/system/Config/DotEnv.php
+++ b/system/Config/DotEnv.php
@@ -187,7 +187,8 @@ protected function sanitizeValue(string $value): string
                 )             # end of the capturing sub-pattern
                 %1$s          # and the closing quote
                 .*$           # and discard any string after the closing quote
-                /mx', $quote
+                /mx',
+                $quote
             );
 
             $value = preg_replace($regexPattern, '$1', $value);
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index ce22b79b5901..c2c5f179d29a 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -2104,9 +2104,14 @@ public function getCompiledInsert(bool $reset = true)
         }
 
         $sql = $this->_insert(
-                $this->db->protectIdentifiers(
-                        $this->QBFrom[0], true, null, false
-                ), array_keys($this->QBSet), array_values($this->QBSet)
+            $this->db->protectIdentifiers(
+                $this->QBFrom[0],
+                true,
+                null,
+                false
+            ),
+            array_keys($this->QBSet),
+            array_values($this->QBSet)
         );
 
         if ($reset === true) {
@@ -2139,9 +2144,14 @@ public function insert(array $set = null, bool $escape = null)
         }
 
         $sql = $this->_insert(
-                $this->db->protectIdentifiers(
-                        $this->QBFrom[0], true, $escape, false
-                ), array_keys($this->QBSet), array_values($this->QBSet)
+            $this->db->protectIdentifiers(
+                $this->QBFrom[0],
+                true,
+                $escape,
+                false
+            ),
+            array_keys($this->QBSet),
+            array_values($this->QBSet)
         );
 
         if (! $this->testMode) {
@@ -2465,7 +2475,10 @@ public function updateBatch(array $set = null, string $index = null, int $batchS
         $savedQBWhere = $this->QBWhere;
 
         for ($i = 0, $total = count($this->QBSet); $i < $total; $i += $batchSize) {
-            $sql = $this->_updateBatch($table, array_slice($this->QBSet, $i, $batchSize), $this->db->protectIdentifiers($index)
+            $sql = $this->_updateBatch(
+                $table,
+                array_slice($this->QBSet, $i, $batchSize),
+                $this->db->protectIdentifiers($index)
             );
 
             if ($this->testMode) {
@@ -2920,7 +2933,10 @@ protected function compileWhereHaving(string $qbKey): string
 
                 // Split multiple conditions
                 $conditions = preg_split(
-                        '/((?:^|\s+)AND\s+|(?:^|\s+)OR\s+)/i', $qbkey['condition'], -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY
+                    '/((?:^|\s+)AND\s+|(?:^|\s+)OR\s+)/i',
+                    $qbkey['condition'],
+                    -1,
+                    PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY
                 );
 
                 foreach ($conditions as &$condition) {
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index b1d92c154c10..98422325cf15 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -1352,15 +1352,18 @@ public function escapeString($str, bool $like = false)
 
         // escape LIKE condition wildcards
         if ($like === true) {
-            return str_replace([
-                $this->likeEscapeChar,
-                '%',
-                '_',
-            ], [
-                $this->likeEscapeChar . $this->likeEscapeChar,
-                $this->likeEscapeChar . '%',
-                $this->likeEscapeChar . '_',
-            ], $str
+            return str_replace(
+                [
+                    $this->likeEscapeChar,
+                    '%',
+                    '_',
+                ],
+                [
+                    $this->likeEscapeChar . $this->likeEscapeChar,
+                    $this->likeEscapeChar . '%',
+                    $this->likeEscapeChar . '_',
+                ],
+                $str
             );
         }
 
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index e524b43ed741..fd15971520e6 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -441,8 +441,11 @@ public function addForeignKey(string $fieldName = '', string $tableName = '', st
      */
     public function dropForeignKey(string $table, string $foreignName)
     {
-        $sql = sprintf($this->dropConstraintStr, $this->db->escapeIdentifiers($this->db->DBPrefix . $table),
-            $this->db->escapeIdentifiers($this->db->DBPrefix . $foreignName));
+        $sql = sprintf(
+            $this->dropConstraintStr,
+            $this->db->escapeIdentifiers($this->db->DBPrefix . $table),
+            $this->db->escapeIdentifiers($this->db->DBPrefix . $foreignName)
+        );
 
         if ($sql === false) { // @phpstan-ignore-line
             if ($this->db->DBDebug) {
@@ -557,8 +560,13 @@ protected function _createTable(string $table, bool $ifNotExists, array $attribu
         }
 
         // createTableStr will usually have the following format: "%s %s (%s\n)"
-        $sql = sprintf($this->createTableStr . '%s', $sql, $this->db->escapeIdentifiers($table), $columns,
-            $this->_createTableAttributes($attributes));
+        $sql = sprintf(
+            $this->createTableStr . '%s',
+            $sql,
+            $this->db->escapeIdentifiers($table),
+            $columns,
+            $this->_createTableAttributes($attributes)
+        );
 
         return $sql;
     }
@@ -625,8 +633,12 @@ public function dropTable(string $tableName, bool $ifExists = false, bool $casca
 
         // Update table list cache
         if ($query && ! empty($this->db->dataCache['table_names'])) {
-            $key = array_search(strtolower($this->db->DBPrefix . $tableName),
-                array_map('strtolower', $this->db->dataCache['table_names']), true);
+            $key = array_search(
+                strtolower($this->db->DBPrefix . $tableName),
+                array_map('strtolower', $this->db->dataCache['table_names']),
+                true
+            );
+
             if ($key !== false) {
                 unset($this->db->dataCache['table_names'][$key]);
             }
@@ -691,14 +703,19 @@ public function renameTable(string $tableName, string $newTableName)
             return false;
         }
 
-        $result = $this->db->query(sprintf($this->renameTableStr,
-                $this->db->escapeIdentifiers($this->db->DBPrefix . $tableName),
-                $this->db->escapeIdentifiers($this->db->DBPrefix . $newTableName))
-        );
+        $result = $this->db->query(sprintf(
+            $this->renameTableStr,
+            $this->db->escapeIdentifiers($this->db->DBPrefix . $tableName),
+            $this->db->escapeIdentifiers($this->db->DBPrefix . $newTableName)
+        ));
 
         if ($result && ! empty($this->db->dataCache['table_names'])) {
-            $key = array_search(strtolower($this->db->DBPrefix . $tableName),
-                array_map('strtolower', $this->db->dataCache['table_names']), true);
+            $key = array_search(
+                strtolower($this->db->DBPrefix . $tableName),
+                array_map('strtolower', $this->db->dataCache['table_names']),
+                true
+            );
+
             if ($key !== false) {
                 $this->db->dataCache['table_names'][$key] = $this->db->DBPrefix . $newTableName;
             }
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
index 6385b7b689c9..4ce56007c639 100644
--- a/system/Database/MySQLi/Connection.php
+++ b/system/Database/MySQLi/Connection.php
@@ -95,18 +95,21 @@ public function connect(bool $persistent = false)
 
         if (isset($this->strictOn)) {
             if ($this->strictOn) {
-                $this->mysqli->options(MYSQLI_INIT_COMMAND,
-                    'SET SESSION sql_mode = CONCAT(@@sql_mode, ",", "STRICT_ALL_TABLES")');
+                $this->mysqli->options(
+                    MYSQLI_INIT_COMMAND,
+                    'SET SESSION sql_mode = CONCAT(@@sql_mode, ",", "STRICT_ALL_TABLES")'
+                );
             } else {
-                $this->mysqli->options(MYSQLI_INIT_COMMAND, 'SET SESSION sql_mode =
-						REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(
-												@@sql_mode,
-												"STRICT_ALL_TABLES,", ""),
-											",STRICT_ALL_TABLES", ""),
-										"STRICT_ALL_TABLES", ""),
-									"STRICT_TRANS_TABLES,", ""),
-								",STRICT_TRANS_TABLES", ""),
-							"STRICT_TRANS_TABLES", "")'
+                $this->mysqli->options(
+                    MYSQLI_INIT_COMMAND,
+                    'SET SESSION sql_mode = REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(
+                                        @@sql_mode,
+                                        "STRICT_ALL_TABLES,", ""),
+                                    ",STRICT_ALL_TABLES", ""),
+                                "STRICT_ALL_TABLES", ""),
+                            "STRICT_TRANS_TABLES,", ""),
+                        ",STRICT_TRANS_TABLES", ""),
+                    "STRICT_TRANS_TABLES", "")'
                 );
             }
         }
@@ -149,16 +152,25 @@ public function connect(bool $persistent = false)
 
                 $clientFlags += MYSQLI_CLIENT_SSL;
                 $this->mysqli->ssl_set(
-                    $ssl['key'] ?? null, $ssl['cert'] ?? null, $ssl['ca'] ?? null,
-                    $ssl['capath'] ?? null, $ssl['cipher'] ?? null
+                    $ssl['key'] ?? null,
+                    $ssl['cert'] ?? null,
+                    $ssl['ca'] ?? null,
+                    $ssl['capath'] ?? null,
+                    $ssl['cipher'] ?? null
                 );
             }
         }
 
         try {
-            if ($this->mysqli->real_connect($hostname, $this->username, $this->password,
-                $this->database, $port, $socket, $clientFlags)
-            ) {
+            if ($this->mysqli->real_connect(
+                $hostname,
+                $this->username,
+                $this->password,
+                $this->database,
+                $port,
+                $socket,
+                $clientFlags
+            )) {
                 // Prior to version 5.7.3, MySQL silently downgrades to an unencrypted connection if SSL setup fails
                 if (($clientFlags & MYSQLI_CLIENT_SSL) && version_compare($this->mysqli->client_info, 'mysqlnd 5.7.3', '<=')
                     && empty($this->mysqli->query("SHOW STATUS LIKE 'ssl_cipher'")
@@ -176,8 +188,8 @@ public function connect(bool $persistent = false)
                 }
 
                 if (! $this->mysqli->set_charset($this->charset)) {
-                    log_message('error',
-                        "Database: Unable to set the configured connection charset ('{$this->charset}').");
+                    log_message('error', "Database: Unable to set the configured connection charset ('{$this->charset}').");
+
                     $this->mysqli->close();
 
                     if ($this->DBDebug) {
@@ -384,15 +396,10 @@ public function escapeLikeStringDirect($str)
         $str = $this->_escapeString($str);
 
         // Escape LIKE condition wildcards
-        return str_replace([
-            $this->likeEscapeChar,
-            '%',
-            '_',
-        ], [
-            '\\' . $this->likeEscapeChar,
-            '\\' . '%',
-            '\\' . '_',
-        ], $str
+        return str_replace(
+            [$this->likeEscapeChar, '%', '_'],
+            ['\\' . $this->likeEscapeChar, '\\' . '%', '\\' . '_'],
+            $str
         );
     }
 
diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
index f712689c5127..2f8525e3dade 100644
--- a/system/Database/SQLite3/Connection.php
+++ b/system/Database/SQLite3/Connection.php
@@ -190,9 +190,8 @@ protected function _listTables(bool $prefixLimit = false): string
         return 'SELECT "NAME" FROM "SQLITE_MASTER" WHERE "TYPE" = \'table\''
                . ' AND "NAME" NOT LIKE \'sqlite!_%\' ESCAPE \'!\''
                . (($prefixLimit !== false && $this->DBPrefix !== '')
-                ? ' AND "NAME" LIKE \'' . $this->escapeLikeString($this->DBPrefix) . '%\' ' . sprintf($this->likeEscapeStr,
-                    $this->likeEscapeChar)
-                : '');
+                    ? ' AND "NAME" LIKE \'' . $this->escapeLikeString($this->DBPrefix) . '%\' ' . sprintf($this->likeEscapeStr, $this->likeEscapeChar)
+                    : '');
     }
 
     //--------------------------------------------------------------------
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index 89cb8c1014bb..65222b0a6b06 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -478,7 +478,11 @@ public static function highlightFile(string $file, int $lineNumber, int $lines =
 
             if (($n + $start + 1) === $lineNumber) {
                 preg_match_all('#<[^>]+>#', $row, $tags);
-                $out .= sprintf("<span class='line highlight'><span class='number'>{$format}</span> %s\n</span>%s", $n + $start + 1, strip_tags($row), implode('', $tags[0])
+                $out .= sprintf(
+                    "<span class='line highlight'><span class='number'>{$format}</span> %s\n</span>%s",
+                    $n + $start + 1,
+                    strip_tags($row),
+                    implode('', $tags[0])
                 );
             } else {
                 $out .= sprintf('<span class="line"><span class="number">' . $format . '</span> %s', $n + $start + 1, $row) . "\n";
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 1acf00e73aaf..6c2e57e19df3 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -322,10 +322,10 @@ public function prepare(RequestInterface $request = null, ResponseInterface $res
             $toolbar = Services::toolbar(config(Toolbar::class));
             $stats   = $app->getPerformanceStats();
             $data    = $toolbar->run(
-                    $stats['startTime'],
-                    $stats['totalTime'],
-                    $request,
-                    $response
+                $stats['startTime'],
+                $stats['totalTime'],
+                $request,
+                $response
             );
 
             helper('filesystem');
diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php
index d689331ea06d..d342808eddfd 100644
--- a/system/Debug/Toolbar/Views/toolbar.tpl.php
+++ b/system/Debug/Toolbar/Views/toolbar.tpl.php
@@ -94,8 +94,7 @@
 			</tr>
 			</thead>
 			<tbody>
-			<?= $this->renderTimeline($collectors, $startTime, $segmentCount, $segmentDuration,
-                $styles) ?>
+			<?= $this->renderTimeline($collectors, $startTime, $segmentCount, $segmentDuration, $styles) ?>
 			</tbody>
 		</table>
 	</div>
@@ -120,8 +119,7 @@
 		<?php if (isset($vars['varData'])) : ?>
 			<?php foreach ($vars['varData'] as $heading => $items) : ?>
 
-				<a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('<?= strtolower(str_replace(' ',
-                    '-', $heading)) ?>'); return false;">
+				<a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('<?= strtolower(str_replace(' ', '-', $heading)) ?>'); return false;">
 					<h2><?= $heading ?></h2>
 				</a>
 
diff --git a/system/Entity/Cast/JsonCast.php b/system/Entity/Cast/JsonCast.php
index a9576a53549d..2e4c8d13422a 100644
--- a/system/Entity/Cast/JsonCast.php
+++ b/system/Entity/Cast/JsonCast.php
@@ -26,10 +26,12 @@ class JsonCast extends BaseCast
     public static function get($value, array $params = [])
     {
         $associative = in_array('array', $params, true);
-        $tmp         = ! is_null($value) ? ($associative ? [] : new stdClass) : null;
+
+        $tmp = ! is_null($value) ? ($associative ? [] : new stdClass) : null;
 
         if (function_exists('json_decode')
-            && ((is_string($value)
+            && (
+                (is_string($value)
                     && strlen($value) > 1
                     && in_array($value[0], ['[', '{', '"'], true))
                 || is_numeric($value)
diff --git a/system/HTTP/Files/FileCollection.php b/system/HTTP/Files/FileCollection.php
index 81dc9507b887..a4ce2bbd3b5b 100644
--- a/system/HTTP/Files/FileCollection.php
+++ b/system/HTTP/Files/FileCollection.php
@@ -196,7 +196,11 @@ protected function createFileObject(array $array)
         }
 
         return new UploadedFile(
-                $array['tmp_name'] ?? null, $array['name'] ?? null, $array['type'] ?? null, $array['size'] ?? null, $array['error'] ?? null
+            $array['tmp_name'] ?? null,
+            $array['name'] ?? null,
+            $array['type'] ?? null,
+            $array['size'] ?? null,
+            $array['error'] ?? null
         );
     }
 
diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php
index daf719e40a43..c67fdf280639 100644
--- a/system/HTTP/RequestTrait.php
+++ b/system/HTTP/RequestTrait.php
@@ -284,8 +284,10 @@ public function fetchGlobal(string $method, $index = null, ?int $filter = null,
 
         // @phpstan-ignore-next-line
         if (is_array($value)
-            && ($filter !== FILTER_DEFAULT
-                || ((is_numeric($flags) && $flags !== 0)
+            && (
+                $filter !== FILTER_DEFAULT
+                || (
+                    (is_numeric($flags) && $flags !== 0)
                     || is_array($flags) && count($flags) > 0
                 )
             )
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index 6b2ce5f2e8f0..3a2fb9be7d98 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -667,8 +667,11 @@ public function __toString(): string
         }
 
         return static::createURIString(
-            $scheme, $this->getAuthority(), $path, // Absolute URIs should use a "/" for an empty path
-            $this->getQuery(), $this->getFragment()
+            $scheme,
+            $this->getAuthority(),
+            $path, // Absolute URIs should use a "/" for an empty path
+            $this->getQuery(),
+            $this->getFragment()
         );
     }
 
@@ -984,9 +987,11 @@ protected function filterPath(string $path = null): string
 
         // Encode characters
         $path = preg_replace_callback(
-                '/(?:[^' . static::CHAR_UNRESERVED . ':@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/', static function (array $matches) {
-                    return rawurlencode($matches[0]);
-                }, $path
+            '/(?:[^' . static::CHAR_UNRESERVED . ':@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/',
+            static function (array $matches) {
+                return rawurlencode($matches[0]);
+            },
+            $path
         );
 
         return $path;
diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php
index a555d596ee1f..b07ca3599a34 100644
--- a/system/Helpers/filesystem_helper.php
+++ b/system/Helpers/filesystem_helper.php
@@ -225,9 +225,9 @@ function get_filenames(string $sourceDir, ?bool $includePath = false, bool $hidd
 
         try {
             foreach (new RecursiveIteratorIterator(
-                    new RecursiveDirectoryIterator($sourceDir, RecursiveDirectoryIterator::SKIP_DOTS),
-                    RecursiveIteratorIterator::SELF_FIRST
-                ) as $name => $object) {
+                new RecursiveDirectoryIterator($sourceDir, RecursiveDirectoryIterator::SKIP_DOTS),
+                RecursiveIteratorIterator::SELF_FIRST
+            ) as $name => $object) {
                 $basename = pathinfo($name, PATHINFO_BASENAME);
                 if (! $hidden && $basename[0] === '.') {
                     continue;
diff --git a/system/Helpers/inflector_helper.php b/system/Helpers/inflector_helper.php
index 56273b75da25..9e70f6849f16 100755
--- a/system/Helpers/inflector_helper.php
+++ b/system/Helpers/inflector_helper.php
@@ -228,10 +228,7 @@ function humanize(string $string, string $separator = '_'): string
     {
         $replacement = trim($string);
 
-        return ucwords
-                (
-                preg_replace('/[' . $separator . ']+/', ' ', $replacement)
-        );
+        return ucwords(preg_replace('/[' . $separator . ']+/', ' ', $replacement));
     }
 }
 
@@ -247,9 +244,9 @@ function humanize(string $string, string $separator = '_'): string
      */
     function is_pluralizable(string $word): bool
     {
-        $uncountables = in_array
-                (
-            strtolower($word), [
+        $uncountables = in_array(
+            strtolower($word),
+            [
                 'advice',
                 'bravery',
                 'butter',
@@ -296,7 +293,9 @@ function is_pluralizable(string $word): bool
                 'weather',
                 'wisdom',
                 'work',
-            ], true);
+            ],
+            true
+        );
 
         return ! $uncountables;
     }
diff --git a/system/Helpers/security_helper.php b/system/Helpers/security_helper.php
index 8738dd1192c0..e6ded75dc2b5 100644
--- a/system/Helpers/security_helper.php
+++ b/system/Helpers/security_helper.php
@@ -41,10 +41,13 @@ function sanitize_filename(string $filename): string
      */
     function strip_image_tags(string $str): string
     {
-        return preg_replace([
-            '#<img[\s/]+.*?src\s*=\s*(["\'])([^\\1]+?)\\1.*?\>#i',
-            '#<img[\s/]+.*?src\s*=\s*?(([^\s"\'=<>`]+)).*?\>#i',
-        ], '\\2', $str
+        return preg_replace(
+            [
+                '#<img[\s/]+.*?src\s*=\s*(["\'])([^\\1]+?)\\1.*?\>#i',
+                '#<img[\s/]+.*?src\s*=\s*?(([^\s"\'=<>`]+)).*?\>#i',
+            ],
+            '\\2',
+            $str
         );
     }
 }
diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index 4e4b66b6b7ce..4d97522a21a1 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -173,21 +173,10 @@ function entities_to_ascii(string $str, bool $all = true): string
         }
 
         if ($all) {
-            return str_replace([
-                '&amp;',
-                '&lt;',
-                '&gt;',
-                '&quot;',
-                '&apos;',
-                '&#45;',
-            ], [
-                '&',
-                '<',
-                '>',
-                '"',
-                "'",
-                '-',
-            ], $str
+            return str_replace(
+                ['&amp;', '&lt;', '&gt;', '&quot;', '&apos;', '&#45;'],
+                ['&', '<', '>', '"', "'",  '-'],
+                $str
             );
         }
 
@@ -230,15 +219,21 @@ function word_censor(string $str, array $censored, string $replacement = ''): st
 
             if ($replacement !== '') {
                 $str = preg_replace(
-                        "/({$delim})(" . $badword . ")({$delim})/i", "\\1{$replacement}\\3", $str
+                    "/({$delim})(" . $badword . ")({$delim})/i",
+                    "\\1{$replacement}\\3",
+                    $str
                 );
             } elseif (preg_match_all("/{$delim}(" . $badword . "){$delim}/i", $str, $matches, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE)) {
                 $matches = $matches[1];
 
                 for ($i = count($matches) - 1; $i >= 0; $i--) {
                     $length = strlen($matches[$i][0]);
-                    $str    = substr_replace(
-                            $str, str_repeat('#', $length), $matches[$i][1], $length
+
+                    $str = substr_replace(
+                        $str,
+                        str_repeat('#', $length),
+                        $matches[$i][1],
+                        $length
                     );
                 }
             }
@@ -269,25 +264,10 @@ function highlight_code(string $str): string
          * so they don't accidentally break the string out of PHP,
          * and thus, thwart the highlighting.
          */
-        $str = str_replace([
-            '&lt;',
-            '&gt;',
-            '<?',
-            '?>',
-            '<%',
-            '%>',
-            '\\',
-            '</script>',
-        ], [
-            '<',
-            '>',
-            'phptagopen',
-            'phptagclose',
-            'asptagopen',
-            'asptagclose',
-            'backslashtmp',
-            'scriptclose',
-        ], $str
+        $str = str_replace(
+            ['&lt;', '&gt;', '<?', '?>', '<%', '%>', '\\', '</script>'],
+            ['<', '>', 'phptagopen', 'phptagclose', 'asptagopen', 'asptagclose', 'backslashtmp', 'scriptclose'],
+            $str
         );
 
         // The highlight_string function requires that the text be surrounded
@@ -295,33 +275,39 @@ function highlight_code(string $str): string
         $str = highlight_string('<?php ' . $str . ' ?>', true);
 
         // Remove our artificially added PHP, and the syntax highlighting that came with it
-        $str = preg_replace([
-            '/<span style="color: #([A-Z0-9]+)">&lt;\?php(&nbsp;| )/i',
-            '/(<span style="color: #[A-Z0-9]+">.*?)\?&gt;<\/span>\n<\/span>\n<\/code>/is',
-            '/<span style="color: #[A-Z0-9]+"\><\/span>/i',
-        ], [
-            '<span style="color: #$1">',
-            "$1</span>\n</span>\n</code>",
-            '',
-        ], $str
+        $str = preg_replace(
+            [
+                '/<span style="color: #([A-Z0-9]+)">&lt;\?php(&nbsp;| )/i',
+                '/(<span style="color: #[A-Z0-9]+">.*?)\?&gt;<\/span>\n<\/span>\n<\/code>/is',
+                '/<span style="color: #[A-Z0-9]+"\><\/span>/i',
+            ],
+            [
+                '<span style="color: #$1">',
+                "$1</span>\n</span>\n</code>",
+                '',
+            ],
+            $str
         );
 
         // Replace our markers back to PHP tags.
-        return str_replace([
-            'phptagopen',
-            'phptagclose',
-            'asptagopen',
-            'asptagclose',
-            'backslashtmp',
-            'scriptclose',
-        ], [
-            '&lt;?',
-            '?&gt;',
-            '&lt;%',
-            '%&gt;',
-            '\\',
-            '&lt;/script&gt;',
-        ], $str
+        return str_replace(
+            [
+                'phptagopen',
+                'phptagclose',
+                'asptagopen',
+                'asptagclose',
+                'backslashtmp',
+                'scriptclose',
+            ],
+            [
+                '&lt;?',
+                '?&gt;',
+                '&lt;%',
+                '%&gt;',
+                '\\',
+                '&lt;/script&gt;',
+            ],
+            $str
         );
     }
 }
diff --git a/system/Images/Handlers/GDHandler.php b/system/Images/Handlers/GDHandler.php
index 274eaa3da876..8b7ad21eed23 100644
--- a/system/Images/Handlers/GDHandler.php
+++ b/system/Images/Handlers/GDHandler.php
@@ -353,7 +353,8 @@ protected function ensureResource()
         if ($this->resource === null) {
             // if valid image type, make corresponding image resource
             $this->resource = $this->getImageResource(
-                $this->image()->getPathname(), $this->image()->imageType
+                $this->image()->getPathname(),
+                $this->image()->imageType
             );
         }
     }
diff --git a/system/Model.php b/system/Model.php
index ce557f8078c3..7376d59e3cde 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -610,11 +610,10 @@ protected function shouldUpdate($data) : bool
     {
         // When useAutoIncrement feature is disabled check
         // in the database if given record already exists
-        return parent::shouldUpdate($data) &&
-            ($this->useAutoIncrement
+        return parent::shouldUpdate($data)
+            && $this->useAutoIncrement
                 ? true
-                : $this->where($this->primaryKey, $this->getIdValue($data))->countAllResults() === 1
-            );
+                : $this->where($this->primaryKey, $this->getIdValue($data))->countAllResults() === 1;
     }
 
     /**
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 09ea2542da7f..8542c9c0cfb5 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1367,9 +1367,12 @@ protected function create(string $verb, string $from, $to, array $options = null
 
             for ($i = (int) $options['offset'] + 1; $i < (int) $options['offset'] + 7; $i++) {
                 $to = preg_replace_callback(
-                        '/\$X/', static function ($m) use ($i) {
-                            return '$' . $i;
-                        }, $to, 1
+                    '/\$X/',
+                    static function ($m) use ($i) {
+                        return '$' . $i;
+                    },
+                    $to,
+                    1
                 );
             }
         }
diff --git a/system/Session/Handlers/BaseHandler.php b/system/Session/Handlers/BaseHandler.php
index 12c36b8391b0..6977bd44d897 100644
--- a/system/Session/Handlers/BaseHandler.php
+++ b/system/Session/Handlers/BaseHandler.php
@@ -131,7 +131,13 @@ public function __construct(AppConfig $config, string $ipAddress)
     protected function destroyCookie(): bool
     {
         return setcookie(
-                $this->cookieName, '', 1, $this->cookiePath, $this->cookieDomain, $this->cookieSecure, true
+            $this->cookieName,
+            '',
+            1,
+            $this->cookiePath,
+            $this->cookieDomain,
+            $this->cookieSecure,
+            true
         );
     }
 
diff --git a/system/Test/Constraints/SeeInDatabase.php b/system/Test/Constraints/SeeInDatabase.php
index b4d9b04a21aa..16ab49cc41c2 100644
--- a/system/Test/Constraints/SeeInDatabase.php
+++ b/system/Test/Constraints/SeeInDatabase.php
@@ -62,7 +62,9 @@ public function failureDescription($table): string
     {
         return sprintf(
             "a row in the table [%s] matches the attributes \n%s\n\n%s",
-            $table, $this->toString(JSON_PRETTY_PRINT), $this->getAdditionalInfo($table)
+            $table,
+            $this->toString(JSON_PRETTY_PRINT),
+            $this->getAdditionalInfo($table)
         );
     }
 
@@ -78,10 +80,9 @@ protected function getAdditionalInfo(string $table): string
         $builder = $this->db->table($table);
 
         $similar = $builder->where(
-                array_key_first($this->data),
-                $this->data[array_key_first($this->data)]
-            )->limit($this->show)
-            ->get()->getResultArray();
+            array_key_first($this->data),
+            $this->data[array_key_first($this->data)]
+        )->limit($this->show)->get()->getResultArray();
 
         if ($similar !== []) {
             $description = 'Found similar results: ' . json_encode($similar, JSON_PRETTY_PRINT);
diff --git a/system/View/Parser.php b/system/View/Parser.php
index 9c4aa35a3815..362efec2fa17 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -309,7 +309,10 @@ protected function parsePair(string $variable, array $data, string $template): a
         // have something to loop over.
         preg_match_all(
             '#' . $this->leftDelimiter . '\s*' . preg_quote($variable, '#') . '\s*' . $this->rightDelimiter . '(.+?)' .
-            $this->leftDelimiter . '\s*' . '/' . preg_quote($variable, '#') . '\s*' . $this->rightDelimiter . '#s', $template, $matches, PREG_SET_ORDER
+            $this->leftDelimiter . '\s*' . '/' . preg_quote($variable, '#') . '\s*' . $this->rightDelimiter . '#s',
+            $template,
+            $matches,
+            PREG_SET_ORDER
         );
 
         /*
diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php
index 872c43c82481..7b7b45b472d7 100644
--- a/tests/system/Autoloader/FileLocatorTest.php
+++ b/tests/system/Autoloader/FileLocatorTest.php
@@ -201,10 +201,11 @@ public function testSearchPrioritizeSystemOverApp()
     {
         $foundFiles = $this->locator->search('Language/en/Validation.php', 'php', false);
 
-        $this->assertEquals([
-            SYSTEMPATH . 'Language/en/Validation.php',
-            APPPATH . 'Language/en/Validation.php',
-        ],
+        $this->assertEquals(
+            [
+                SYSTEMPATH . 'Language/en/Validation.php',
+                APPPATH . 'Language/en/Validation.php',
+            ],
             $foundFiles
         );
     }
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index e1f1d4319659..337e9497f573 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -102,7 +102,8 @@ public function testRedirectReturnsRedirectResponse()
 
         $response = $this->createMock(Response::class);
         $routes   = new RouteCollection(
-            Services::locator(), new Modules()
+            Services::locator(),
+            new Modules()
         );
         \CodeIgniter\Services::injectMock('response', $response);
         \CodeIgniter\Services::injectMock('routes', $routes);
diff --git a/tests/system/Database/Live/ConnectTest.php b/tests/system/Database/Live/ConnectTest.php
index 416346f71b9f..ae7cbed2e0d0 100644
--- a/tests/system/Database/Live/ConnectTest.php
+++ b/tests/system/Database/Live/ConnectTest.php
@@ -76,7 +76,7 @@ public function testConnectWorksWithGroupName()
 
         $config                      = config('Database');
         $config->default['DBDriver'] = 'MySQLi';
-        Factories::injectMock('config','Database', $config);
+        Factories::injectMock('config', 'Database', $config);
 
         $db1 = Database::connect('default');
         $this->assertNotInstanceOf(Connection::class, $db1);
diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php
index 64aad377d099..08d4a331c53d 100644
--- a/tests/system/I18n/TimeTest.php
+++ b/tests/system/I18n/TimeTest.php
@@ -22,8 +22,12 @@ protected function setUp(): void
     public function testNewTimeNow()
     {
         $formatter = new IntlDateFormatter(
-                'en_US', IntlDateFormatter::SHORT, IntlDateFormatter::SHORT, 'America/Chicago', // Default for CodeIgniter
-                IntlDateFormatter::GREGORIAN, 'yyyy-MM-dd HH:mm:ss'
+            'en_US',
+            IntlDateFormatter::SHORT,
+            IntlDateFormatter::SHORT,
+            'America/Chicago', // Default for CodeIgniter
+            IntlDateFormatter::GREGORIAN,
+            'yyyy-MM-dd HH:mm:ss'
         );
 
         $time = new Time(null, 'America/Chicago');
@@ -34,8 +38,12 @@ public function testNewTimeNow()
     public function testTimeWithTimezone()
     {
         $formatter = new IntlDateFormatter(
-                'en_US', IntlDateFormatter::SHORT, IntlDateFormatter::SHORT, 'Europe/London', // Default for CodeIgniter
-                IntlDateFormatter::GREGORIAN, 'yyyy-MM-dd HH:mm:ss'
+            'en_US',
+            IntlDateFormatter::SHORT,
+            IntlDateFormatter::SHORT,
+            'Europe/London', // Default for CodeIgniter
+                IntlDateFormatter::GREGORIAN,
+            'yyyy-MM-dd HH:mm:ss'
         );
 
         $time = new Time('now', 'Europe/London');
@@ -46,8 +54,12 @@ public function testTimeWithTimezone()
     public function testTimeWithTimezoneAndLocale()
     {
         $formatter = new IntlDateFormatter(
-                'fr_FR', IntlDateFormatter::SHORT, IntlDateFormatter::SHORT, 'Europe/London', // Default for CodeIgniter
-                IntlDateFormatter::GREGORIAN, 'yyyy-MM-dd HH:mm:ss'
+            'fr_FR',
+            IntlDateFormatter::SHORT,
+            IntlDateFormatter::SHORT,
+            'Europe/London', // Default for CodeIgniter
+                IntlDateFormatter::GREGORIAN,
+            'yyyy-MM-dd HH:mm:ss'
         );
 
         $time = new Time('now', 'Europe/London', 'fr_FR');
@@ -58,7 +70,12 @@ public function testTimeWithTimezoneAndLocale()
     public function testTimeWithDateTimeZone()
     {
         $formatter = new IntlDateFormatter(
-                'fr_FR', IntlDateFormatter::SHORT, IntlDateFormatter::SHORT, 'Europe/London', IntlDateFormatter::GREGORIAN, 'yyyy-MM-dd HH:mm:ss'
+            'fr_FR',
+            IntlDateFormatter::SHORT,
+            IntlDateFormatter::SHORT,
+            'Europe/London',
+            IntlDateFormatter::GREGORIAN,
+            'yyyy-MM-dd HH:mm:ss'
         );
 
         $time = new Time('now', new \DateTimeZone('Europe/London'), 'fr_FR');
diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index b14ab9a602ad..abcbff48af84 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -318,16 +318,16 @@ public function testGetOnlyQueries()
         $uri = current_url(true);
 
         $this->assertEquals(
-            $this->pager->only($onlyQueries)
-                        ->getPreviousPageURI(), (string) $uri->setQuery('search=foo&order=asc&page=1')
+            $this->pager->only($onlyQueries)->getPreviousPageURI(),
+            (string) $uri->setQuery('search=foo&order=asc&page=1')
         );
         $this->assertEquals(
-            $this->pager->only($onlyQueries)
-                        ->getNextPageURI(), (string) $uri->setQuery('search=foo&order=asc&page=3')
+            $this->pager->only($onlyQueries)->getNextPageURI(),
+            (string) $uri->setQuery('search=foo&order=asc&page=3')
         );
         $this->assertEquals(
-            $this->pager->only($onlyQueries)
-                        ->getPageURI(4), (string) $uri->setQuery('search=foo&order=asc&page=4')
+            $this->pager->only($onlyQueries)->getPageURI(4),
+            (string) $uri->setQuery('search=foo&order=asc&page=4')
         );
     }
 
@@ -353,37 +353,48 @@ public function testSimpleLinks()
     public function testMakeLinks()
     {
         $this->assertStringContainsString(
-            '<ul class="pagination">', $this->pager->makeLinks(4, 10, 50)
+            '<ul class="pagination">',
+            $this->pager->makeLinks(4, 10, 50)
         );
         $this->assertStringContainsString(
-            '<ul class="pagination">', $this->pager->makeLinks(4, 10, 50, 'default_full')
+            '<ul class="pagination">',
+            $this->pager->makeLinks(4, 10, 50, 'default_full')
         );
         $this->assertStringContainsString(
-            '<ul class="pager">', $this->pager->makeLinks(4, 10, 50, 'default_simple')
+            '<ul class="pager">',
+            $this->pager->makeLinks(4, 10, 50, 'default_simple')
         );
         $this->assertStringContainsString(
-            '<link rel="canonical"', $this->pager->makeLinks(4, 10, 50, 'default_head')
+            '<link rel="canonical"',
+            $this->pager->makeLinks(4, 10, 50, 'default_head')
         );
         $this->assertStringContainsString(
-            '?page=1', $this->pager->makeLinks(1, 10, 1, 'default_full', 0)
+            '?page=1',
+            $this->pager->makeLinks(1, 10, 1, 'default_full', 0)
         );
         $this->assertStringContainsString(
-            '?page=1', $this->pager->makeLinks(1, 10, 1, 'default_full', 0, '')
+            '?page=1',
+            $this->pager->makeLinks(1, 10, 1, 'default_full', 0, '')
         );
         $this->assertStringContainsString(
-            '?page=1', $this->pager->makeLinks(1, 10, 1, 'default_full', 0, 'default')
+            '?page=1',
+            $this->pager->makeLinks(1, 10, 1, 'default_full', 0, 'default')
         );
         $this->assertStringContainsString(
-            '?page_custom=1', $this->pager->makeLinks(1, 10, 1, 'default_full', 0, 'custom')
+            '?page_custom=1',
+            $this->pager->makeLinks(1, 10, 1, 'default_full', 0, 'custom')
         );
         $this->assertStringContainsString(
-            '?page_custom=1', $this->pager->makeLinks(1, null, 1, 'default_full', 0, 'custom')
+            '?page_custom=1',
+            $this->pager->makeLinks(1, null, 1, 'default_full', 0, 'custom')
         );
         $this->assertStringContainsString(
-            '/1', $this->pager->makeLinks(1, 10, 1, 'default_full', 1)
+            '/1',
+            $this->pager->makeLinks(1, 10, 1, 'default_full', 1)
         );
         $this->assertStringContainsString(
-            '<li class="active">', $this->pager->makeLinks(1, 10, 1, 'default_full', 1)
+            '<li class="active">',
+            $this->pager->makeLinks(1, 10, 1, 'default_full', 1)
         );
     }
 
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index bea745fc5b09..d869faf13391 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -257,9 +257,10 @@ public function testGroupingWorks()
         $routes = $this->getCollector();
 
         $routes->group(
-                'admin', static function ($routes) {
-                    $routes->add('users/list', '\Users::list');
-                }
+            'admin',
+            static function ($routes) {
+                $routes->add('users/list', '\Users::list');
+            }
         );
 
         $expected = [
@@ -276,9 +277,10 @@ public function testGroupGetsSanitized()
         $routes = $this->getCollector();
 
         $routes->group(
-                '<script>admin', static function ($routes) {
-                    $routes->add('users/list', '\Users::list');
-                }
+            '<script>admin',
+            static function ($routes) {
+                $routes->add('users/list', '\Users::list');
+            }
         );
 
         $expected = [
@@ -295,9 +297,11 @@ public function testGroupSetsOptions()
         $routes = $this->getCollector();
 
         $routes->group(
-                'admin', ['namespace' => 'Admin'], static function ($routes) {
-                    $routes->add('users/list', 'Users::list');
-                }
+            'admin',
+            ['namespace' => 'Admin'],
+            static function ($routes) {
+                $routes->add('users/list', 'Users::list');
+            }
         );
 
         $expected = [
@@ -314,9 +318,10 @@ public function testGroupingWorksWithEmptyStringPrefix()
         $routes = $this->getCollector();
 
         $routes->group(
-                '', static function ($routes) {
-                    $routes->add('users/list', '\Users::list');
-                }
+            '',
+            static function ($routes) {
+                $routes->add('users/list', '\Users::list');
+            }
         );
 
         $expected = [
@@ -336,13 +341,15 @@ public function testNestedGroupingWorksWithEmptyPrefix()
 
         $routes->group('admin', static function ($routes) {
             $routes->group(
-                '', static function ($routes) {
+                '',
+                static function ($routes) {
                     $routes->add('users/list', '\Users::list');
 
                     $routes->group('delegate', static function ($routes) {
                         $routes->add('foo', '\Users::foo');
                     });
-                });
+                }
+            );
         });
 
         $expected = [
@@ -794,15 +801,17 @@ public function testEnvironmentRestricts()
         $expected = ['here' => '\there'];
 
         $routes->environment(
-                'testing', static function ($routes) {
-                    $routes->get('here', 'there');
-                }
+            'testing',
+            static function ($routes) {
+                $routes->get('here', 'there');
+            }
         );
 
         $routes->environment(
-                'badenvironment', static function ($routes) {
-                    $routes->get('from', 'to');
-                }
+            'badenvironment',
+            static function ($routes) {
+                $routes->get('from', 'to');
+            }
         );
 
         $this->assertEquals($expected, $routes->getRoutes());
@@ -938,12 +947,14 @@ public function testNamedRoutesWithSameURIDifferentMethods()
 
         $routes->get('user/insert', 'myController::goto/$1/$2', ['as' => 'namedRoute1']);
         $routes->post(
-                'user/insert', static function () {
-                }, ['as' => 'namedRoute2']
+            'user/insert',
+            static function () {},
+            ['as' => 'namedRoute2']
         );
         $routes->put(
-                'user/insert', static function () {
-                }, ['as' => 'namedRoute3']
+            'user/insert',
+            static function () {},
+            ['as' => 'namedRoute3']
         );
 
         $match1 = $routes->reverseRoute('namedRoute1');
@@ -1286,8 +1297,9 @@ public function testRoutesOptions()
             'foo' => 'baz',
         ];
         $routes->add(
-                'administrator', static function () {
-                }, $options
+            'administrator',
+            static function () {},
+            $options
         );
 
         $options = $routes->getRoutesOptions('administrator');
@@ -1312,16 +1324,19 @@ public function testRoutesOptionsForDifferentVerbs()
             'bar' => 'baz',
         ];
         $routes->get(
-                'administrator', static function () {
-                }, $options1
+            'administrator',
+            static function () {},
+            $options1
         );
         $routes->post(
-                'administrator', static function () {
-                }, $options2
+            'administrator',
+            static function () {},
+            $options2
         );
         $routes->add(
-                'administrator', static function () {
-                }, $options3
+            'administrator',
+            static function () {},
+            $options3
         );
 
         $options = $routes->getRoutesOptions('administrator');
@@ -1343,9 +1358,11 @@ public function testRouteGroupWithFilterSimple()
         $routes = $this->getCollector();
 
         $routes->group(
-                'admin', ['filter' => 'role'], static function ($routes) {
-                    $routes->add('users', '\Users::list');
-                }
+            'admin',
+            ['filter' => 'role'],
+            static function ($routes) {
+                $routes->add('users', '\Users::list');
+            }
         );
 
         $this->assertTrue($routes->isFiltered('admin/users'));
@@ -1360,9 +1377,11 @@ public function testRouteGroupWithFilterWithParams()
         $routes = $this->getCollector();
 
         $routes->group(
-                'admin', ['filter' => 'role:admin,manager'], static function ($routes) {
-                    $routes->add('users', '\Users::list');
-                }
+            'admin',
+            ['filter' => 'role:admin,manager'],
+            static function ($routes) {
+                $routes->add('users', '\Users::list');
+            }
         );
 
         $this->assertTrue($routes->isFiltered('admin/users'));
@@ -1396,8 +1415,7 @@ public function test404OverrideCallable()
 
         $routes->set404Override(static function () {
             echo 'Explode now';
-        }
-        );
+        });
         $this->assertTrue(is_callable($routes->get404Override()));
     }
 
diff --git a/tests/system/Session/SessionTest.php b/tests/system/Session/SessionTest.php
index 31d9ea972058..94ac22ea5a43 100644
--- a/tests/system/Session/SessionTest.php
+++ b/tests/system/Session/SessionTest.php
@@ -258,10 +258,11 @@ public function testPushNewValueIntoArraySessionValue()
         $session->set('hobbies', ['cooking' => 'baking']);
         $session->push('hobbies', ['sport' => 'tennis']);
 
-        $this->assertEquals([
-            'cooking' => 'baking',
-            'sport'   => 'tennis',
-        ],
+        $this->assertEquals(
+            [
+                'cooking' => 'baking',
+                'sport'   => 'tennis',
+            ],
             $session->get('hobbies')
         );
     }
diff --git a/tests/system/Test/ReflectionHelperTest.php b/tests/system/Test/ReflectionHelperTest.php
index 625ec46738ad..78a7de8441c1 100644
--- a/tests/system/Test/ReflectionHelperTest.php
+++ b/tests/system/Test/ReflectionHelperTest.php
@@ -21,7 +21,8 @@ public function testGetPrivatePropertyWithObjectStaticCall()
     public function testGetPrivatePropertyWithStatic()
     {
         $actual = $this->getPrivateProperty(
-            __TestForReflectionHelper::class, 'static_private'
+            __TestForReflectionHelper::class,
+            'static_private'
         );
         $this->assertEquals('xyz', $actual);
     }
@@ -30,7 +31,9 @@ public function testSetPrivatePropertyWithObject()
     {
         $obj = new __TestForReflectionHelper();
         $this->setPrivateProperty(
-            $obj, 'private', 'open'
+            $obj,
+            'private',
+            'open'
         );
         $this->assertEquals('open', $obj->getPrivate());
     }
@@ -38,10 +41,13 @@ public function testSetPrivatePropertyWithObject()
     public function testSetPrivatePropertyWithStatic()
     {
         $this->setPrivateProperty(
-            __TestForReflectionHelper::class, 'static_private', 'abc'
+            __TestForReflectionHelper::class,
+            'static_private',
+            'abc'
         );
         $this->assertEquals(
-            'abc', __TestForReflectionHelper::getStaticPrivate()
+            'abc',
+            __TestForReflectionHelper::getStaticPrivate()
         );
     }
 
@@ -49,20 +55,24 @@ public function testGetPrivateMethodInvokerWithObject()
     {
         $obj    = new __TestForReflectionHelper();
         $method = $this->getPrivateMethodInvoker(
-            $obj, 'privateMethod'
+            $obj,
+            'privateMethod'
         );
         $this->assertEquals(
-            'private param1param2', $method('param1', 'param2')
+            'private param1param2',
+            $method('param1', 'param2')
         );
     }
 
     public function testGetPrivateMethodInvokerWithStatic()
     {
         $method = $this->getPrivateMethodInvoker(
-            __TestForReflectionHelper::class, 'privateStaticMethod'
+            __TestForReflectionHelper::class,
+            'privateStaticMethod'
         );
         $this->assertEquals(
-            'private_static param1param2', $method('param1', 'param2')
+            'private_static param1param2',
+            $method('param1', 'param2')
         );
     }
 }
diff --git a/tests/system/View/TableTest.php b/tests/system/View/TableTest.php
index 94b181ec7eb4..b22a3c8e0227 100644
--- a/tests/system/View/TableTest.php
+++ b/tests/system/View/TableTest.php
@@ -50,12 +50,13 @@ public function testSetHeading()
 
         $this->table->setHeading('name', 'color', 'size');
 
-        $this->assertEquals([
-            ['data' => 'name'],
-            ['data' => 'color'],
-            ['data' => 'size'],
-        ],
-                $this->table->heading
+        $this->assertEquals(
+            [
+                ['data' => 'name'],
+                ['data' => 'color'],
+                ['data' => 'size'],
+            ],
+            $this->table->heading
         );
     }
 
@@ -69,11 +70,12 @@ public function testSetFooting()
 
         $this->table->setFooting('Subtotal', $subtotal);
 
-        $this->assertEquals([
-            ['data' => 'Subtotal'],
-            ['data' => $subtotal],
-        ],
-                $this->table->footing
+        $this->assertEquals(
+            [
+                ['data' => 'Subtotal'],
+                ['data' => $subtotal],
+            ],
+            $this->table->footing
         );
     }
 
@@ -92,12 +94,13 @@ public function testAddRow()
 
         $this->assertCount(3, $this->table->rows);
 
-        $this->assertEquals([
-            ['data' => 'your'],
-            ['data' => 'pony'],
-            ['data' => 'stinks'],
-        ],
-                $this->table->rows[1]
+        $this->assertEquals(
+            [
+                ['data' => 'your'],
+                ['data' => 'pony'],
+                ['data' => 'stinks'],
+            ],
+            $this->table->rows[1]
         );
     }
 
@@ -113,8 +116,8 @@ public function testPrepArgs()
         ];
 
         $this->assertEquals(
-                $expected,
-                $this->table->prepArgs(['name', 'color', 'size'])
+            $expected,
+            $this->table->prepArgs(['name', 'color', 'size'])
         );
 
         // with cell attributes
@@ -125,8 +128,8 @@ public function testPrepArgs()
         ];
 
         $this->assertEquals(
-                $expected,
-                $this->table->prepArgs(['name', 'color', 'size', ['data' => 'weight', 'class' => 'awesome']])
+            $expected,
+            $this->table->prepArgs(['name', 'color', 'size', ['data' => 'weight', 'class' => 'awesome']])
         );
     }
 
@@ -196,24 +199,17 @@ public function testMakeColumns()
 
         // No column count - no changes to the array
         $this->assertEquals(
-                $fiveValues,
-                $this->table->makeColumns($fiveValues)
+            $fiveValues,
+            $this->table->makeColumns($fiveValues)
         );
 
         // Column count of 3 leaves us with one &nbsp;
-        $this->assertEquals([
-            [
-                'Laura',
-                'Red',
-                '15',
-            ],
+        $this->assertEquals(
             [
-                'Katie',
-                'Blue',
-                '&nbsp;',
+                ['Laura', 'Red', '15'],
+                ['Katie', 'Blue', '&nbsp;'],
             ],
-        ],
-                $this->table->makeColumns($fiveValues, 3)
+            $this->table->makeColumns($fiveValues, 3)
         );
     }
 
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index c778431417b5..141eba47eca4 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -89,25 +89,30 @@ public function __construct()
                     'phpstan-ignore-next-line',
                 ],
             ],
-            'compact_nullable_typehint'              => true,
-            'concat_space'                           => ['spacing' => 'one'],
-            'constant_case'                          => ['case' => 'lower'],
-            'function_to_constant'                   => true,
-            'heredoc_indentation'                    => ['indentation' => 'start_plus_one'],
-            'heredoc_to_nowdoc'                      => true,
-            'increment_style'                        => ['style' => 'post'],
-            'indentation_type'                       => true,
-            'lambda_not_used_import'                 => true,
-            'line_ending'                            => true,
-            'linebreak_after_opening_tag'            => true,
-            'list_syntax'                            => ['syntax' => 'short'],
-            'logical_operators'                      => true,
-            'lowercase_cast'                         => true,
-            'lowercase_keywords'                     => true,
-            'lowercase_static_reference'             => true,
-            'magic_constant_casing'                  => true,
-            'magic_method_casing'                    => true,
-            'mb_str_functions'                       => false,
+            'compact_nullable_typehint'   => true,
+            'concat_space'                => ['spacing' => 'one'],
+            'constant_case'               => ['case' => 'lower'],
+            'function_to_constant'        => true,
+            'heredoc_indentation'         => ['indentation' => 'start_plus_one'],
+            'heredoc_to_nowdoc'           => true,
+            'increment_style'             => ['style' => 'post'],
+            'indentation_type'            => true,
+            'lambda_not_used_import'      => true,
+            'line_ending'                 => true,
+            'linebreak_after_opening_tag' => true,
+            'list_syntax'                 => ['syntax' => 'short'],
+            'logical_operators'           => true,
+            'lowercase_cast'              => true,
+            'lowercase_keywords'          => true,
+            'lowercase_static_reference'  => true,
+            'magic_constant_casing'       => true,
+            'magic_method_casing'         => true,
+            'mb_str_functions'            => false,
+            'method_argument_space'       => [
+                'after_heredoc'                    => false,
+                'keep_multiple_spaces_after_comma' => false,
+                'on_multiline'                     => 'ensure_fully_multiline',
+            ],
             'modernize_types_casting'                => true,
             'multiline_comment_opening_closing'      => true,
             'multiline_whitespace_before_semicolons' => ['strategy' => 'no_multi_line'],

From 57f5cd8bef1739058b7e6710b8dfb92ea46f1233 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Thu, 17 Jun 2021 00:23:39 +0800
Subject: [PATCH 0017/2325] Enable `method_chaining_indentation` fixer

---
 system/Common.php                             |   3 +-
 system/Database/MigrationRunner.php           |  32 +-
 system/Database/MySQLi/Connection.php         |   3 +-
 system/Database/SQLite3/Forge.php             |   9 +-
 system/Debug/Toolbar.php                      |   4 +-
 system/HTTP/URI.php                           |   7 +-
 system/I18n/Time.php                          |   4 +-
 system/Images/Handlers/BaseHandler.php        |  12 +-
 system/Images/Handlers/ImageMagickHandler.php |   9 +-
 system/Pager/Pager.php                        |   4 +-
 system/Session/Handlers/DatabaseHandler.php   |   4 +-
 system/Test/ControllerTester.php              |   4 +-
 system/Test/DatabaseTestTrait.php             |  21 +-
 system/Test/FeatureTestCase.php               |   4 +-
 system/Test/FeatureTestTrait.php              |   4 +-
 system/Validation/Rules.php                   |  12 +-
 tests/system/CommonFunctionsSendTest.php      |   4 +-
 tests/system/CommonFunctionsTest.php          |   8 +-
 tests/system/Database/Builder/GroupTest.php   | 187 ++++++------
 tests/system/Database/Builder/WhereTest.php   |   3 +-
 tests/system/Database/Live/DeleteTest.php     |   3 +-
 tests/system/Database/Live/ForgeTest.php      |   4 +-
 tests/system/Database/Live/GetTest.php        |  72 ++---
 tests/system/Database/Live/GroupTest.php      | 278 +++++++++---------
 tests/system/Database/Live/IncrementTest.php  |  16 +-
 tests/system/Database/Live/InsertTest.php     |   8 +-
 tests/system/Database/Live/JoinTest.php       |   8 +-
 tests/system/Database/Live/LikeTest.php       |  20 +-
 tests/system/Database/Live/LimitTest.php      |  12 +-
 tests/system/Database/Live/OrderTest.php      |  20 +-
 tests/system/Database/Live/PretendTest.php    |   8 +-
 tests/system/Database/Live/SelectTest.php     |   8 +-
 tests/system/Database/Live/UpdateTest.php     |  42 ++-
 tests/system/Database/Live/WhereTest.php      |  98 +++---
 tests/system/Filters/FiltersTest.php          |  14 +-
 tests/system/HTTP/HeaderTest.php              |   9 +-
 tests/system/HTTP/RedirectResponseTest.php    |   3 +-
 tests/system/HTTP/ResponseSendTest.php        |   4 +-
 tests/system/HTTP/ResponseTest.php            |   4 +-
 tests/system/Models/DeleteModelTest.php       |  12 +-
 tests/system/Models/FindModelTest.php         |  12 +-
 tests/system/Test/ControllerTestTraitTest.php | 106 +++----
 tests/system/Validation/RulesTest.php         | 102 +++----
 utils/PhpCsFixer/CodeIgniter4.php             |   1 +
 44 files changed, 573 insertions(+), 629 deletions(-)

diff --git a/system/Common.php b/system/Common.php
index 1a072ebc4ac2..ed2f57dd3f1a 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -1167,8 +1167,7 @@ function view(string $name, array $data = [], array $options = []): string
             unset($options['saveData']);
         }
 
-        return $renderer->setData($data, 'raw')
-                        ->render($name, $options, $saveData);
+        return $renderer->setData($data, 'raw')->render($name, $options, $saveData);
     }
 }
 
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
index 2fc269cda24f..feb056069c66 100644
--- a/system/Database/MigrationRunner.php
+++ b/system/Database/MigrationRunner.php
@@ -796,9 +796,9 @@ public function getBatchHistory(int $batch, $order = 'asc'): array
         $this->ensureTable();
 
         $query = $this->db->table($this->table)
-                          ->where('batch', $batch)
-                          ->orderBy('id', $order)
-                          ->get();
+            ->where('batch', $batch)
+            ->orderBy('id', $order)
+            ->get();
 
         return ! empty($query) ? $query->getResultObject() : [];
     }
@@ -815,11 +815,11 @@ public function getBatches(): array
         $this->ensureTable();
 
         $batches = $this->db->table($this->table)
-                          ->select('batch')
-                          ->distinct()
-                          ->orderBy('batch', 'asc')
-                          ->get()
-                          ->getResultArray();
+            ->select('batch')
+            ->distinct()
+            ->orderBy('batch', 'asc')
+            ->get()
+            ->getResultArray();
 
         return array_map('intval', array_column($batches, 'batch'));
     }
@@ -836,9 +836,9 @@ public function getLastBatch(): int
         $this->ensureTable();
 
         $batch = $this->db->table($this->table)
-                          ->selectMax('batch')
-                          ->get()
-                          ->getResultObject();
+            ->selectMax('batch')
+            ->get()
+            ->getResultObject();
 
         $batch = is_array($batch) && count($batch)
             ? end($batch)->batch
@@ -894,11 +894,11 @@ public function getBatchEnd(int $batch): string
         }
 
         $migration = $this->db->table($this->table)
-              ->where('batch', $batch)
-              ->orderBy('id', 'desc')
-              ->limit(1)
-              ->get()
-              ->getResultObject();
+            ->where('batch', $batch)
+            ->orderBy('id', 'desc')
+            ->limit(1)
+            ->get()
+            ->getResultObject();
 
         return count($migration) ? $migration[0]->version : 0;
     }
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
index 4ce56007c639..1c3e7a42e8b7 100644
--- a/system/Database/MySQLi/Connection.php
+++ b/system/Database/MySQLi/Connection.php
@@ -173,8 +173,7 @@ public function connect(bool $persistent = false)
             )) {
                 // Prior to version 5.7.3, MySQL silently downgrades to an unencrypted connection if SSL setup fails
                 if (($clientFlags & MYSQLI_CLIENT_SSL) && version_compare($this->mysqli->client_info, 'mysqlnd 5.7.3', '<=')
-                    && empty($this->mysqli->query("SHOW STATUS LIKE 'ssl_cipher'")
-                                          ->fetch_object()->Value)
+                    && empty($this->mysqli->query("SHOW STATUS LIKE 'ssl_cipher'")->fetch_object()->Value)
                 ) {
                     $this->mysqli->close();
                     $message = 'MySQLi was configured for an SSL connection, but got an unencrypted connection instead!';
diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
index 3f17fbf2c031..3d8cbf87a9e3 100644
--- a/system/Database/SQLite3/Forge.php
+++ b/system/Database/SQLite3/Forge.php
@@ -136,11 +136,10 @@ protected function _alterTable(string $alterType, string $table, $field)
                 return '';
 
             case 'CHANGE':
-                $sqlTable = new Table($this->db, $this);
-
-                $sqlTable->fromTable($table)
-                         ->modifyColumn($field)
-                         ->run();
+                (new Table($this->db, $this))
+                    ->fromTable($table)
+                    ->modifyColumn($field)
+                    ->run();
 
                 return null;
 
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 6c2e57e19df3..cd870df95b59 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -346,8 +346,8 @@ public function prepare(RequestInterface $request = null, ResponseInterface $res
             // for this response
             if ($request->isAJAX() || strpos($format, 'html') === false) {
                 $response->setHeader('Debugbar-Time', "$time")
-                        ->setHeader('Debugbar-Link', site_url("?debugbar_time={$time}"))
-                        ->getBody();
+                    ->setHeader('Debugbar-Link', site_url("?debugbar_time={$time}"))
+                    ->getBody();
 
                 return;
             }
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index 3a2fb9be7d98..06f66072791d 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -1077,9 +1077,10 @@ public function resolveRelativeURI(string $uri)
 
         // 5.2.2 Transform References in a non-strict method (no scheme)
         if (! empty($relative->getAuthority())) {
-            $transformed->setAuthority($relative->getAuthority())
-                    ->setPath($relative->getPath())
-                    ->setQuery($relative->getQuery());
+            $transformed
+                ->setAuthority($relative->getAuthority())
+                ->setPath($relative->getPath())
+                ->setQuery($relative->getQuery());
         } else {
             if ($relative->getPath() === '') {
                 $transformed->setPath($this->getPath());
diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index 919e7fb2cdb0..d3899a7b883a 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -1097,8 +1097,8 @@ public function equals($testTime, string $timezone = null): bool
         $testTime = $this->getUTCObject($testTime, $timezone);
 
         $ourTime = $this->toDateTime()
-                ->setTimezone(new DateTimeZone('UTC'))
-                ->format('Y-m-d H:i:s');
+            ->setTimezone(new DateTimeZone('UTC'))
+            ->format('Y-m-d H:i:s');
 
         return $testTime->format('Y-m-d H:i:s') === $ourTime;
     }
diff --git a/system/Images/Handlers/BaseHandler.php b/system/Images/Handlers/BaseHandler.php
index 2417fb0f3628..bcda8e98561e 100644
--- a/system/Images/Handlers/BaseHandler.php
+++ b/system/Images/Handlers/BaseHandler.php
@@ -548,19 +548,16 @@ public function reorient(bool $silent = false)
                 return $this->rotate(180);
 
             case 4:
-                return $this->rotate(180)
-                                ->flip('horizontal');
+                return $this->rotate(180)->flip('horizontal');
 
             case 5:
-                return $this->rotate(270)
-                                ->flip('horizontal');
+                return $this->rotate(270)->flip('horizontal');
 
             case 6:
                 return $this->rotate(270);
 
             case 7:
-                return $this->rotate(90)
-                                ->flip('horizontal');
+                return $this->rotate(90)->flip('horizontal');
 
             case 8:
                 return $this->rotate(90);
@@ -644,8 +641,7 @@ public function fit(int $width, int $height = null, string $position = 'center')
 
         [$x, $y] = $this->calcCropCoords($cropWidth, $cropHeight, $origWidth, $origHeight, $position);
 
-        return $this->crop($cropWidth, $cropHeight, $x, $y)
-                        ->resize($width, $height);
+        return $this->crop($cropWidth, $cropHeight, $x, $y)->resize($width, $height);
     }
 
     //--------------------------------------------------------------------
diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php
index 03bc248a77e7..3082845f7164 100644
--- a/system/Images/Handlers/ImageMagickHandler.php
+++ b/system/Images/Handlers/ImageMagickHandler.php
@@ -506,19 +506,16 @@ public function reorient(bool $silent = false)
                 return $this->rotate(180);
 
             case 4:
-                return $this->rotate(180)
-                                ->flip('horizontal');
+                return $this->rotate(180)->flip('horizontal');
 
             case 5:
-                return $this->rotate(90)
-                                ->flip('horizontal');
+                return $this->rotate(90)->flip('horizontal');
 
             case 6:
                 return $this->rotate(90);
 
             case 7:
-                return $this->rotate(270)
-                                ->flip('horizontal');
+                return $this->rotate(270)->flip('horizontal');
 
             case 8:
                 return $this->rotate(270);
diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
index 5ed9ae8f4c03..6c23109d1de9 100644
--- a/system/Pager/Pager.php
+++ b/system/Pager/Pager.php
@@ -150,10 +150,10 @@ protected function displayLinks(string $group, string $template): string
         if (! array_key_exists($template, $this->config->templates)) {
             throw PagerException::forInvalidTemplate($template);
         }
+
         $pager = new PagerRenderer($this->getDetails($group));
 
-        return $this->view->setVar('pager', $pager)
-                        ->render($this->config->templates[$template]);
+        return $this->view->setVar('pager', $pager)->render($this->config->templates[$template]);
     }
 
     //--------------------------------------------------------------------
diff --git a/system/Session/Handlers/DatabaseHandler.php b/system/Session/Handlers/DatabaseHandler.php
index d85c5b58c939..674da60f1481 100644
--- a/system/Session/Handlers/DatabaseHandler.php
+++ b/system/Session/Handlers/DatabaseHandler.php
@@ -139,8 +139,8 @@ public function read($sessionID): string
         }
 
         $builder = $this->db->table($this->table)
-                ->select($this->platform === 'postgre' ? "encode(data, 'base64') AS data" : 'data')
-                ->where('id', $sessionID);
+            ->select($this->platform === 'postgre' ? "encode(data, 'base64') AS data" : 'data')
+            ->where('id', $sessionID);
 
         if ($this->matchIP) {
             $builder = $builder->where('ip_address', $this->ipAddress);
diff --git a/system/Test/ControllerTester.php b/system/Test/ControllerTester.php
index 4b9ea524d4d9..b74af78cdb5a 100644
--- a/system/Test/ControllerTester.php
+++ b/system/Test/ControllerTester.php
@@ -163,8 +163,8 @@ public function execute(string $method, ...$params)
         helper('url');
 
         $result = (new ControllerResponse())
-                ->setRequest($this->request)
-                ->setResponse($this->response);
+            ->setRequest($this->request)
+            ->setResponse($this->response);
 
         $response = null;
 
diff --git a/system/Test/DatabaseTestTrait.php b/system/Test/DatabaseTestTrait.php
index 355271826606..cd444c57406a 100644
--- a/system/Test/DatabaseTestTrait.php
+++ b/system/Test/DatabaseTestTrait.php
@@ -232,8 +232,8 @@ protected function clearInsertCache()
         if (! empty($this->insertCache)) {
             foreach ($this->insertCache as $row) {
                 $this->db->table($row[0])
-                        ->where($row[1])
-                        ->delete();
+                    ->where($row[1])
+                    ->delete();
             }
         }
     }
@@ -267,9 +267,9 @@ public function loadBuilder(string $tableName)
     public function grabFromDatabase(string $table, string $column, array $where)
     {
         $query = $this->db->table($table)
-                          ->select($column)
-                          ->where($where)
-                          ->get();
+            ->select($column)
+            ->where($where)
+            ->get();
 
         $query = $query->getRow();
 
@@ -309,8 +309,8 @@ public function seeInDatabase(string $table, array $where)
     public function dontSeeInDatabase(string $table, array $where)
     {
         $count = $this->db->table($table)
-                          ->where($where)
-                          ->countAllResults();
+            ->where($where)
+            ->countAllResults();
 
         $this->assertTrue($count === 0, 'Row was found in database');
     }
@@ -331,8 +331,7 @@ public function hasInDatabase(string $table, array $data)
             $data,
         ];
 
-        return $this->db->table($table)
-                        ->insert($data);
+        return $this->db->table($table)->insert($data);
     }
 
     /**
@@ -350,8 +349,8 @@ public function hasInDatabase(string $table, array $data)
     public function seeNumRecords(int $expected, string $table, array $where)
     {
         $count = $this->db->table($table)
-                          ->where($where)
-                          ->countAllResults();
+            ->where($where)
+            ->countAllResults();
 
         $this->assertEquals($expected, $count, 'Wrong number of matching rows in database.');
     }
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index 43740f7d1a8a..253a896bb3e0 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -194,8 +194,8 @@ public function call(string $method, string $path, array $params = null)
         Services::injectMock('filters', Services::filters(null, false));
 
         $response = $this->app
-                ->setRequest($request)
-                ->run($routes, true);
+            ->setRequest($request)
+            ->run($routes, true);
 
         $output = \ob_get_contents();
         if (empty($response->getBody()) && ! empty($output)) {
diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php
index 5d6e5e910a63..694d1212e1b1 100644
--- a/system/Test/FeatureTestTrait.php
+++ b/system/Test/FeatureTestTrait.php
@@ -188,8 +188,8 @@ public function call(string $method, string $path, array $params = null)
         Services::injectMock('filters', Services::filters(null, false));
 
         $response = $this->app
-                ->setRequest($request)
-                ->run($routes, true);
+            ->setRequest($request)
+            ->run($routes, true);
 
         $output = \ob_get_contents();
         if (empty($response->getBody()) && ! empty($output)) {
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
index c91e109998fa..d33456230fa1 100644
--- a/system/Validation/Rules.php
+++ b/system/Validation/Rules.php
@@ -136,9 +136,9 @@ public function is_not_unique(string $str = null, string $field, array $data): b
         $db = Database::connect($data['DBGroup'] ?? null);
 
         $row = $db->table($table)
-                  ->select('1')
-                  ->where($field, $str)
-                  ->limit(1);
+            ->select('1')
+            ->where($field, $str)
+            ->limit(1);
 
         if (! empty($whereField) && ! empty($whereValue) && ! preg_match('/^\{(\w+)\}$/', $whereValue)) {
             $row = $row->where($whereField, $whereValue);
@@ -192,9 +192,9 @@ public function is_unique(string $str = null, string $field, array $data): bool
         $db = Database::connect($data['DBGroup'] ?? null);
 
         $row = $db->table($table)
-                  ->select('1')
-                  ->where($field, $str)
-                  ->limit(1);
+            ->select('1')
+            ->where($field, $str)
+            ->limit(1);
 
         if (! empty($ignoreField) && ! empty($ignoreValue) && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)) {
             $row = $row->where("{$ignoreField} !=", $ignoreValue);
diff --git a/tests/system/CommonFunctionsSendTest.php b/tests/system/CommonFunctionsSendTest.php
index c520216f62f8..d87828de1f2c 100644
--- a/tests/system/CommonFunctionsSendTest.php
+++ b/tests/system/CommonFunctionsSendTest.php
@@ -30,8 +30,8 @@ public function testRedirectResponseCookiesSent()
         $routes->add('user/login', 'Auth::verify', ['as' => 'login']);
 
         $response = redirect()->route('login')
-                ->setCookie('foo', 'onething', YEAR)
-                ->setCookie('login_time', $loginTime, YEAR);
+            ->setCookie('foo', 'onething', YEAR)
+            ->setCookie('login_time', $loginTime, YEAR);
         $response->pretend(false);
         $this->assertTrue($response->hasCookie('foo', 'onething'));
         $this->assertTrue($response->hasCookie('login_time'));
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 337e9497f573..fa8a8f82d644 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -109,9 +109,7 @@ public function testRedirectReturnsRedirectResponse()
         \CodeIgniter\Services::injectMock('routes', $routes);
 
         $routes->add('home/base', 'Controller::index', ['as' => 'base']);
-
-        $response->method('redirect')
-                ->will($this->returnArgument(0));
+        $response->method('redirect')->will($this->returnArgument(0));
 
         $this->assertInstanceOf(RedirectResponse::class, redirect('base'));
     }
@@ -391,8 +389,8 @@ public function testRedirectResponseCookies1()
         $routes->add('user/login', 'Auth::verify', ['as' => 'login']);
 
         $answer1 = redirect()->route('login')
-                ->setCookie('foo', 'onething', YEAR)
-                ->setCookie('login_time', $loginTime, YEAR);
+            ->setCookie('foo', 'onething', YEAR)
+            ->setCookie('login_time', $loginTime, YEAR);
 
         $this->assertTrue($answer1->hasCookie('foo', 'onething'));
         $this->assertTrue($answer1->hasCookie('login_time'));
diff --git a/tests/system/Database/Builder/GroupTest.php b/tests/system/Database/Builder/GroupTest.php
index 858050c215c4..534babac60da 100644
--- a/tests/system/Database/Builder/GroupTest.php
+++ b/tests/system/Database/Builder/GroupTest.php
@@ -25,8 +25,7 @@ public function testGroupBy()
     {
         $builder = new BaseBuilder('user', $this->db);
 
-        $builder->select('name')
-                ->groupBy('name');
+        $builder->select('name')->groupBy('name');
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name"';
 
@@ -40,8 +39,8 @@ public function testHavingBy()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->having('SUM(id) > 2');
+            ->groupBy('name')
+            ->having('SUM(id) > 2');
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING SUM(id) > 2';
 
@@ -55,9 +54,9 @@ public function testOrHavingBy()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->having('id >', 3)
-                ->orHaving('SUM(id) > 2');
+            ->groupBy('name')
+            ->having('id >', 3)
+            ->orHaving('SUM(id) > 2');
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" > 3 OR SUM(id) > 2';
 
@@ -71,8 +70,8 @@ public function testHavingIn()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->havingIn('id', [1, 2]);
+            ->groupBy('name')
+            ->havingIn('id', [1, 2]);
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" IN (1,2)';
 
@@ -85,8 +84,7 @@ public function testHavingInClosure()
     {
         $builder = new BaseBuilder('user', $this->db);
 
-        $builder->select('name')
-                ->groupBy('name');
+        $builder->select('name')->groupBy('name');
 
         $builder->havingIn('id', static function (BaseBuilder $builder) {
             return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
@@ -104,9 +102,9 @@ public function testOrHavingIn()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->havingIn('id', [1, 2])
-                ->orHavingIn('group_id', [5, 6]);
+            ->groupBy('name')
+            ->havingIn('id', [1, 2])
+            ->orHavingIn('group_id', [5, 6]);
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" IN (1,2) OR "group_id" IN (5,6)';
 
@@ -119,8 +117,7 @@ public function testOrHavingInClosure()
     {
         $builder = new BaseBuilder('user', $this->db);
 
-        $builder->select('name')
-                ->groupBy('name');
+        $builder->select('name')->groupBy('name');
 
         $builder->havingIn('id', static function (BaseBuilder $builder) {
             return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
@@ -141,8 +138,8 @@ public function testHavingNotIn()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->havingNotIn('id', [1, 2]);
+            ->groupBy('name')
+            ->havingNotIn('id', [1, 2]);
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" NOT IN (1,2)';
 
@@ -155,8 +152,7 @@ public function testHavingNotInClosure()
     {
         $builder = new BaseBuilder('user', $this->db);
 
-        $builder->select('name')
-                ->groupBy('name');
+        $builder->select('name')->groupBy('name');
 
         $builder->havingNotIn('id', static function (BaseBuilder $builder) {
             return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
@@ -174,9 +170,9 @@ public function testOrHavingNotIn()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->havingNotIn('id', [1, 2])
-                ->orHavingNotIn('group_id', [5, 6]);
+            ->groupBy('name')
+            ->havingNotIn('id', [1, 2])
+            ->orHavingNotIn('group_id', [5, 6]);
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" NOT IN (1,2) OR "group_id" NOT IN (5,6)';
 
@@ -189,8 +185,7 @@ public function testOrHavingNotInClosure()
     {
         $builder = new BaseBuilder('user', $this->db);
 
-        $builder->select('name')
-                ->groupBy('name');
+        $builder->select('name')->groupBy('name');
 
         $builder->havingNotIn('id', static function (BaseBuilder $builder) {
             return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
@@ -211,8 +206,8 @@ public function testHavingLike()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->havingLike('pet_name', 'a');
+            ->groupBy('name')
+            ->havingLike('pet_name', 'a');
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a%\' ESCAPE \'!\'';
 
@@ -226,8 +221,8 @@ public function testHavingLikeBefore()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->havingLike('pet_name', 'a', 'before');
+            ->groupBy('name')
+            ->havingLike('pet_name', 'a', 'before');
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a\' ESCAPE \'!\'';
 
@@ -241,8 +236,8 @@ public function testHavingLikeAfter()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->havingLike('pet_name', 'a', 'after');
+            ->groupBy('name')
+            ->havingLike('pet_name', 'a', 'after');
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'a%\' ESCAPE \'!\'';
 
@@ -256,8 +251,8 @@ public function testNotHavingLike()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->notHavingLike('pet_name', 'a');
+            ->groupBy('name')
+            ->notHavingLike('pet_name', 'a');
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" NOT LIKE \'%a%\' ESCAPE \'!\'';
 
@@ -271,8 +266,8 @@ public function testNotHavingLikeBefore()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->notHavingLike('pet_name', 'a', 'before');
+            ->groupBy('name')
+            ->notHavingLike('pet_name', 'a', 'before');
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" NOT LIKE \'%a\' ESCAPE \'!\'';
 
@@ -286,8 +281,8 @@ public function testNotHavingLikeAfter()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->notHavingLike('pet_name', 'a', 'after');
+            ->groupBy('name')
+            ->notHavingLike('pet_name', 'a', 'after');
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" NOT LIKE \'a%\' ESCAPE \'!\'';
 
@@ -301,9 +296,9 @@ public function testOrHavingLike()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->havingLike('pet_name', 'a')
-                ->orHavingLike('pet_color', 'b');
+            ->groupBy('name')
+            ->havingLike('pet_name', 'a')
+            ->orHavingLike('pet_color', 'b');
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a%\' ESCAPE \'!\' OR  "pet_color" LIKE \'%b%\' ESCAPE \'!\'';
 
@@ -317,9 +312,9 @@ public function testOrHavingLikeBefore()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->havingLike('pet_name', 'a', 'before')
-                ->orHavingLike('pet_color', 'b', 'before');
+            ->groupBy('name')
+            ->havingLike('pet_name', 'a', 'before')
+            ->orHavingLike('pet_color', 'b', 'before');
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a\' ESCAPE \'!\' OR  "pet_color" LIKE \'%b\' ESCAPE \'!\'';
 
@@ -333,9 +328,9 @@ public function testOrHavingLikeAfter()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->havingLike('pet_name', 'a', 'after')
-                ->orHavingLike('pet_color', 'b', 'after');
+            ->groupBy('name')
+            ->havingLike('pet_name', 'a', 'after')
+            ->orHavingLike('pet_color', 'b', 'after');
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'a%\' ESCAPE \'!\' OR  "pet_color" LIKE \'b%\' ESCAPE \'!\'';
 
@@ -349,9 +344,9 @@ public function testOrNotHavingLike()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->havingLike('pet_name', 'a')
-                ->orNotHavingLike('pet_color', 'b');
+            ->groupBy('name')
+            ->havingLike('pet_name', 'a')
+            ->orNotHavingLike('pet_color', 'b');
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a%\' ESCAPE \'!\' OR  "pet_color" NOT LIKE \'%b%\' ESCAPE \'!\'';
 
@@ -365,9 +360,9 @@ public function testOrNotHavingLikeBefore()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->havingLike('pet_name', 'a', 'before')
-                ->orNotHavingLike('pet_color', 'b', 'before');
+            ->groupBy('name')
+            ->havingLike('pet_name', 'a', 'before')
+            ->orNotHavingLike('pet_color', 'b', 'before');
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a\' ESCAPE \'!\' OR  "pet_color" NOT LIKE \'%b\' ESCAPE \'!\'';
 
@@ -381,9 +376,9 @@ public function testOrNotHavingLikeAfter()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->havingLike('pet_name', 'a', 'after')
-                ->orNotHavingLike('pet_color', 'b', 'after');
+            ->groupBy('name')
+            ->havingLike('pet_name', 'a', 'after')
+            ->orNotHavingLike('pet_color', 'b', 'after');
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'a%\' ESCAPE \'!\' OR  "pet_color" NOT LIKE \'b%\' ESCAPE \'!\'';
 
@@ -397,12 +392,12 @@ public function testHavingAndGroup()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->having('SUM(id) <', 3)
-                ->havingGroupStart()
-                    ->having('SUM(id)', 2)
-                    ->having('name', 'adam')
-                ->havingGroupEnd();
+            ->groupBy('name')
+            ->having('SUM(id) <', 3)
+            ->havingGroupStart()
+            ->having('SUM(id)', 2)
+            ->having('name', 'adam')
+            ->havingGroupEnd();
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING SUM(id) < 3 AND   ( SUM(id) = 2 AND "name" = \'adam\'  )';
 
@@ -416,12 +411,12 @@ public function testHavingOrGroup()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->having('SUM(id) >', 3)
-                ->orHavingGroupStart()
-                    ->having('SUM(id)', 2)
-                    ->having('name', 'adam')
-                ->havingGroupEnd();
+            ->groupBy('name')
+            ->having('SUM(id) >', 3)
+            ->orHavingGroupStart()
+            ->having('SUM(id)', 2)
+            ->having('name', 'adam')
+            ->havingGroupEnd();
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING SUM(id) > 3 OR   ( SUM(id) = 2 AND "name" = \'adam\'  )';
 
@@ -435,12 +430,12 @@ public function testNotHavingAndGroup()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->having('SUM(id) <', 3)
-                ->notHavingGroupStart()
-                    ->having('SUM(id)', 2)
-                    ->having('name', 'adam')
-                ->havingGroupEnd();
+            ->groupBy('name')
+            ->having('SUM(id) <', 3)
+            ->notHavingGroupStart()
+            ->having('SUM(id)', 2)
+            ->having('name', 'adam')
+            ->havingGroupEnd();
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING SUM(id) < 3 AND NOT   ( SUM(id) = 2 AND "name" = \'adam\'  )';
 
@@ -454,12 +449,12 @@ public function testNotHavingOrGroup()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->select('name')
-                ->groupBy('name')
-                ->having('SUM(id) <', 3)
-                ->orNotHavingGroupStart()
-                    ->having('SUM(id)', 2)
-                    ->having('name', 'adam')
-                ->havingGroupEnd();
+            ->groupBy('name')
+            ->having('SUM(id) <', 3)
+            ->orNotHavingGroupStart()
+            ->having('SUM(id)', 2)
+            ->having('name', 'adam')
+            ->havingGroupEnd();
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING SUM(id) < 3 OR NOT   ( SUM(id) = 2 AND "name" = \'adam\'  )';
 
@@ -473,10 +468,10 @@ public function testAndGroups()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->groupStart()
-                    ->where('id >', 3)
-                    ->where('name !=', 'Luke')
-                ->groupEnd()
-                ->where('name', 'Darth');
+            ->where('id >', 3)
+            ->where('name !=', 'Luke')
+            ->groupEnd()
+            ->where('name', 'Darth');
 
         $expectedSQL = 'SELECT * FROM "user" WHERE   ( "id" > 3 AND "name" != \'Luke\'  ) AND "name" = \'Darth\'';
 
@@ -490,10 +485,10 @@ public function testOrGroups()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->where('name', 'Darth')
-                ->orGroupStart()
-                    ->where('id >', 3)
-                    ->where('name !=', 'Luke')
-                ->groupEnd();
+            ->orGroupStart()
+            ->where('id >', 3)
+            ->where('name !=', 'Luke')
+            ->groupEnd();
 
         $expectedSQL = 'SELECT * FROM "user" WHERE "name" = \'Darth\' OR   ( "id" > 3 AND "name" != \'Luke\'  )';
 
@@ -507,10 +502,10 @@ public function testNotGroups()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->where('name', 'Darth')
-                ->notGroupStart()
-                ->where('id >', 3)
-                ->where('name !=', 'Luke')
-                ->groupEnd();
+            ->notGroupStart()
+            ->where('id >', 3)
+            ->where('name !=', 'Luke')
+            ->groupEnd();
 
         $expectedSQL = 'SELECT * FROM "user" WHERE "name" = \'Darth\' AND NOT   ( "id" > 3 AND "name" != \'Luke\'  )';
 
@@ -524,15 +519,13 @@ public function testOrNotGroups()
         $builder = new BaseBuilder('user', $this->db);
 
         $builder->where('name', 'Darth')
-                ->orNotGroupStart()
-                ->where('id >', 3)
-                ->where('name !=', 'Luke')
-                ->groupEnd();
+            ->orNotGroupStart()
+            ->where('id >', 3)
+            ->where('name !=', 'Luke')
+            ->groupEnd();
 
         $expectedSQL = 'SELECT * FROM "user" WHERE "name" = \'Darth\' OR NOT   ( "id" > 3 AND "name" != \'Luke\'  )';
 
         $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php
index 611d7c210f69..f3f178462d35 100644
--- a/tests/system/Database/Builder/WhereTest.php
+++ b/tests/system/Database/Builder/WhereTest.php
@@ -151,8 +151,7 @@ public function testOrWhereSameColumn()
     {
         $builder = $this->db->table('jobs');
 
-        $builder->where('name', 'Accountant')
-                ->orWhere('name', 'foobar');
+        $builder->where('name', 'Accountant')->orWhere('name', 'foobar');
 
         $expectedSQL   = 'SELECT * FROM "jobs" WHERE "name" = \'Accountant\' OR "name" = \'foobar\'';
         $expectedBinds = [
diff --git a/tests/system/Database/Live/DeleteTest.php b/tests/system/Database/Live/DeleteTest.php
index b34451aefca3..4b9ed8b938a6 100644
--- a/tests/system/Database/Live/DeleteTest.php
+++ b/tests/system/Database/Live/DeleteTest.php
@@ -58,8 +58,7 @@ public function testDeleteWithLimit()
         $this->seeNumRecords(2, 'user', ['country' => 'US']);
 
         try {
-            $this->db->table('user')
-                     ->delete(['country' => 'US'], 1);
+            $this->db->table('user')->delete(['country' => 'US'], 1);
         } catch (DatabaseException $e) {
             if (strpos($e->getMessage(), 'does not allow LIMITs on DELETE queries.') !== false) {
                 return;
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 63681115f2ad..1d2e8b004cc3 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -536,8 +536,8 @@ public function testAddColumn()
         $this->forge->addColumn('forge_test_table', $newField);
 
         $fieldNames = $this->db->table('forge_test_table')
-                ->get()
-                ->getFieldNames();
+            ->get()
+            ->getFieldNames();
 
         $this->forge->dropTable('forge_test_table', true);
 
diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php
index a730d94ad5f7..51e950af7009 100644
--- a/tests/system/Database/Live/GetTest.php
+++ b/tests/system/Database/Live/GetTest.php
@@ -19,9 +19,7 @@ class GetTest extends CIUnitTestCase
 
     public function testGet()
     {
-        $jobs = $this->db->table('job')
-                         ->get()
-                         ->getResult();
+        $jobs = $this->db->table('job')->get()->getResult();
 
         $this->assertCount(4, $jobs);
         $this->assertEquals('Developer', $jobs[0]->name);
@@ -34,9 +32,7 @@ public function testGet()
 
     public function testGetWitLimit()
     {
-        $jobs = $this->db->table('job')
-                         ->get(2, 2)
-                         ->getResult();
+        $jobs = $this->db->table('job')->get(2, 2)->getResult();
 
         $this->assertCount(2, $jobs);
         $this->assertEquals('Accountant', $jobs[0]->name);
@@ -48,8 +44,8 @@ public function testGetWitLimit()
     public function testGetWhereArray()
     {
         $jobs = $this->db->table('job')
-                         ->getWhere(['id' => 1])
-                         ->getResult();
+            ->getWhere(['id' => 1])
+            ->getResult();
 
         $this->assertCount(1, $jobs);
         $this->assertEquals('Developer', $jobs[0]->name);
@@ -60,8 +56,8 @@ public function testGetWhereArray()
     public function testGetWhereWithLimits()
     {
         $jobs = $this->db->table('job')
-                         ->getWhere('id > 1', 1, 1)
-                         ->getResult();
+            ->getWhere('id > 1', 1, 1)
+            ->getResult();
 
         $this->assertCount(1, $jobs);
         $this->assertEquals('Accountant', $jobs[0]->name);
@@ -71,9 +67,7 @@ public function testGetWhereWithLimits()
 
     public function testGetFieldCount()
     {
-        $jobs = $this->db->table('job')
-                         ->get()
-                         ->getFieldCount();
+        $jobs = $this->db->table('job')->get()->getFieldCount();
 
         $this->assertEquals(6, $jobs);
     }
@@ -82,9 +76,7 @@ public function testGetFieldCount()
 
     public function testGetFieldNames()
     {
-        $jobs = $this->db->table('job')
-                         ->get()
-                         ->getFieldNames();
+        $jobs = $this->db->table('job')->get()->getFieldNames();
 
         $this->assertTrue(in_array('name', $jobs, true));
         $this->assertTrue(in_array('description', $jobs, true));
@@ -94,16 +86,12 @@ public function testGetFieldNames()
 
     public function testGetFieldData()
     {
-        $jobs = $this->db->table('job')
-                         ->get()
-                         ->getFieldData();
+        $jobs = $this->db->table('job')->get()->getFieldData();
 
         $this->assertEquals('id', $jobs[0]->name);
         $this->assertEquals('name', $jobs[1]->name);
 
-        $typeTest = $this->db->table('type_test')
-                              ->get()
-                              ->getFieldData();
+        $typeTest = $this->db->table('type_test')->get()->getFieldData();
 
         if ($this->db->DBDriver === 'SQLite3') {
             $this->assertEquals('integer', $typeTest[0]->type_name); //INTEGER AUTO INC
@@ -186,8 +174,7 @@ public function testGetFieldData()
 
     public function testGetDataSeek()
     {
-        $data = $this->db->table('job')
-                         ->get();
+        $data = $this->db->table('job')->get();
 
         if ($this->db->DBDriver === 'SQLite3') {
             $this->expectException(DatabaseException::class);
@@ -203,8 +190,7 @@ public function testGetDataSeek()
     //--------------------------------------------------------------------
     public function testGetAnotherDataSeek()
     {
-        $data = $this->db->table('job')
-                         ->get();
+        $data = $this->db->table('job')->get();
 
         $data->dataSeek(0);
 
@@ -220,9 +206,7 @@ public function testGetAnotherDataSeek()
 
     public function testFreeResult()
     {
-        $data = $this->db->table('job')
-                         ->where('id', 4)
-                         ->get();
+        $data = $this->db->table('job')->where('id', 4)->get();
 
         $details = $data->getResult();
 
@@ -237,9 +221,7 @@ public function testFreeResult()
 
     public function testGetRowWithColumnName()
     {
-        $name = $this->db->table('user')
-                         ->get()
-                         ->getRow('name', 'array');
+        $name = $this->db->table('user')->get()->getRow('name', 'array');
 
         $this->assertEquals('Derek Jones', $name);
     }
@@ -248,9 +230,7 @@ public function testGetRowWithColumnName()
 
     public function testGetRowWithReturnType()
     {
-        $user = $this->db->table('user')
-                         ->get()
-                         ->getRow(0, 'array');
+        $user = $this->db->table('user')->get()->getRow(0, 'array');
 
         $this->assertEquals('Derek Jones', $user['name']);
     }
@@ -261,9 +241,7 @@ public function testGetRowWithCustomReturnType()
     {
         $testClass = new class { };
 
-        $user = $this->db->table('user')
-                         ->get()
-                         ->getRow(0, get_class($testClass));
+        $user = $this->db->table('user')->get()->getRow(0, get_class($testClass));
 
         $this->assertEquals('Derek Jones', $user->name);
     }
@@ -272,9 +250,7 @@ public function testGetRowWithCustomReturnType()
 
     public function testGetFirstRow()
     {
-        $user = $this->db->table('user')
-                         ->get()
-                         ->getFirstRow();
+        $user = $this->db->table('user')->get()->getFirstRow();
 
         $this->assertEquals('Derek Jones', $user->name);
     }
@@ -283,9 +259,7 @@ public function testGetFirstRow()
 
     public function testGetLastRow()
     {
-        $user = $this->db->table('user')
-                         ->get()
-                         ->getLastRow();
+        $user = $this->db->table('user')->get()->getLastRow();
 
         $this->assertEquals('Chris Martin', $user->name);
     }
@@ -294,9 +268,7 @@ public function testGetLastRow()
 
     public function testGetNextRow()
     {
-        $user = $this->db->table('user')
-                         ->get()
-                         ->getNextRow();
+        $user = $this->db->table('user')->get()->getNextRow();
 
         $this->assertEquals('Ahmadinejad', $user->name);
     }
@@ -305,11 +277,11 @@ public function testGetNextRow()
 
     public function testGetPreviousRow()
     {
-        $user = $this->db->table('user')
-                         ->get();
+        $user = $this->db->table('user')->get();
 
         $user->currentRow = 3;
-        $user             = $user->getPreviousRow();
+
+        $user = $user->getPreviousRow();
 
         $this->assertEquals('Richard A Causey', $user->name);
     }
diff --git a/tests/system/Database/Live/GroupTest.php b/tests/system/Database/Live/GroupTest.php
index 5cadfd2b16dd..ae53143e90ae 100644
--- a/tests/system/Database/Live/GroupTest.php
+++ b/tests/system/Database/Live/GroupTest.php
@@ -19,10 +19,10 @@ class GroupTest extends CIUnitTestCase
     public function testGroupBy()
     {
         $result = $this->db->table('user')
-                        ->select('name')
-                        ->groupBy('name')
-                        ->get()
-                        ->getResult();
+            ->select('name')
+            ->groupBy('name')
+            ->get()
+            ->getResult();
 
         $this->assertCount(4, $result);
     }
@@ -32,11 +32,11 @@ public function testGroupBy()
     public function testHavingBy()
     {
         $result = $this->db->table('job')
-                        ->select('name')
-                        ->groupBy('name')
-                        ->having('SUM(id) > 2')
-                        ->get()
-                        ->getResultArray();
+            ->select('name')
+            ->groupBy('name')
+            ->having('SUM(id) > 2')
+            ->get()
+            ->getResultArray();
 
         $this->assertCount(2, $result);
     }
@@ -46,12 +46,12 @@ public function testHavingBy()
     public function testOrHavingBy()
     {
         $result = $this->db->table('user')
-                        ->select('id')
-                        ->groupBy('id')
-                        ->having('id >', 3)
-                        ->orHaving('SUM(id) > 2')
-                        ->get()
-                        ->getResult();
+            ->select('id')
+            ->groupBy('id')
+            ->having('id >', 3)
+            ->orHaving('SUM(id) > 2')
+            ->get()
+            ->getResult();
 
         $this->assertCount(2, $result);
     }
@@ -61,12 +61,12 @@ public function testOrHavingBy()
     public function testHavingIn()
     {
         $result = $this->db->table('job')
-                        ->select('name')
-                        ->groupBy('name')
-                        ->orderBy('name', 'asc')
-                        ->havingIn('name', ['Developer', 'Politician'])
-                        ->get()
-                        ->getResult();
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->havingIn('name', ['Developer', 'Politician'])
+            ->get()
+            ->getResult();
 
         $this->assertCount(2, $result);
         $this->assertEquals('Developer', $result[0]->name);
@@ -78,13 +78,13 @@ public function testHavingIn()
     public function testorHavingIn()
     {
         $result = $this->db->table('job')
-                        ->select('name')
-                        ->groupBy('name')
-                        ->orderBy('name', 'asc')
-                        ->havingIn('name', ['Developer'])
-                        ->orHavingIn('name', ['Politician'])
-                        ->get()
-                        ->getResult();
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->havingIn('name', ['Developer'])
+            ->orHavingIn('name', ['Politician'])
+            ->get()
+            ->getResult();
 
         $this->assertCount(2, $result);
         $this->assertEquals('Developer', $result[0]->name);
@@ -96,12 +96,12 @@ public function testorHavingIn()
     public function testHavingNotIn()
     {
         $result = $this->db->table('job')
-                        ->select('name')
-                        ->groupBy('name')
-                        ->orderBy('name', 'asc')
-                        ->havingNotIn('name', ['Developer', 'Politician'])
-                        ->get()
-                        ->getResult();
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->havingNotIn('name', ['Developer', 'Politician'])
+            ->get()
+            ->getResult();
 
         $this->assertCount(2, $result);
         $this->assertEquals('Accountant', $result[0]->name);
@@ -113,13 +113,13 @@ public function testHavingNotIn()
     public function testOrHavingNotIn()
     {
         $result = $this->db->table('job')
-                        ->select('name')
-                        ->groupBy('name')
-                        ->orderBy('name', 'asc')
-                        ->having('SUM(id) > 2')
-                        ->orHavingNotIn('name', ['Developer', 'Politician'])
-                        ->get()
-                        ->getResult();
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->having('SUM(id) > 2')
+            ->orHavingNotIn('name', ['Developer', 'Politician'])
+            ->get()
+            ->getResult();
 
         $this->assertCount(2, $result);
         $this->assertEquals('Accountant', $result[0]->name);
@@ -131,11 +131,11 @@ public function testOrHavingNotIn()
     public function testHavingLike()
     {
         $result = $this->db->table('job')
-                        ->select('name')
-                        ->groupBy('name')
-                        ->havingLike('name', 'elo')
-                        ->get()
-                        ->getResult();
+            ->select('name')
+            ->groupBy('name')
+            ->havingLike('name', 'elo')
+            ->get()
+            ->getResult();
 
         $this->assertCount(1, $result);
         $this->assertEquals('Developer', $result[0]->name);
@@ -146,12 +146,12 @@ public function testHavingLike()
     public function testNotHavingLike()
     {
         $result = $this->db->table('job')
-                        ->select('name')
-                        ->groupBy('name')
-                        ->orderBy('name', 'asc')
-                        ->notHavingLike('name', 'ian')
-                        ->get()
-                        ->getResult();
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->notHavingLike('name', 'ian')
+            ->get()
+            ->getResult();
 
         $this->assertCount(2, $result);
         $this->assertEquals('Accountant', $result[0]->name);
@@ -163,13 +163,13 @@ public function testNotHavingLike()
     public function testOrHavingLike()
     {
         $result = $this->db->table('job')
-                        ->select('name')
-                        ->groupBy('name')
-                        ->orderBy('name', 'asc')
-                        ->havingLike('name', 'elo')
-                        ->orHavingLike('name', 'cc')
-                        ->get()
-                        ->getResult();
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->havingLike('name', 'elo')
+            ->orHavingLike('name', 'cc')
+            ->get()
+            ->getResult();
 
         $this->assertCount(2, $result);
         $this->assertEquals('Accountant', $result[0]->name);
@@ -181,13 +181,13 @@ public function testOrHavingLike()
     public function testOrNotHavingLike()
     {
         $result = $this->db->table('job')
-                        ->select('name')
-                        ->groupBy('name')
-                        ->orderBy('name', 'asc')
-                        ->having('SUM(id) > 2')
-                        ->orNotHavingLike('name', 'ian')
-                        ->get()
-                        ->getResult();
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->having('SUM(id) > 2')
+            ->orNotHavingLike('name', 'ian')
+            ->get()
+            ->getResult();
 
         $this->assertCount(3, $result);
         $this->assertEquals('Accountant', $result[0]->name);
@@ -200,16 +200,16 @@ public function testOrNotHavingLike()
     public function testAndHavingGroupStart()
     {
         $result = $this->db->table('job')
-                        ->select('name')
-                        ->groupBy('name')
-                        ->orderBy('name', 'asc')
-                        ->having('SUM(id) > 2')
-                        ->havingGroupStart()
-                            ->having('SUM(id) <= 4')
-                            ->havingLike('name', 'ant', 'before')
-                        ->havingGroupEnd()
-                        ->get()
-                        ->getResult();
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->having('SUM(id) > 2')
+            ->havingGroupStart()
+            ->having('SUM(id) <= 4')
+            ->havingLike('name', 'ant', 'before')
+            ->havingGroupEnd()
+            ->get()
+            ->getResult();
 
         $this->assertCount(1, $result);
         $this->assertEquals('Accountant', $result[0]->name);
@@ -220,16 +220,16 @@ public function testAndHavingGroupStart()
     public function testOrHavingGroupStart()
     {
         $result = $this->db->table('job')
-                        ->select('name')
-                        ->groupBy('name')
-                        ->orderBy('name', 'asc')
-                        ->having('SUM(id) > 2')
-                        ->orHavingGroupStart()
-                            ->having('SUM(id) <= 4')
-                            ->havingLike('name', 'ant', 'before')
-                        ->havingGroupEnd()
-                        ->get()
-                        ->getResult();
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->having('SUM(id) > 2')
+            ->orHavingGroupStart()
+            ->having('SUM(id) <= 4')
+            ->havingLike('name', 'ant', 'before')
+            ->havingGroupEnd()
+            ->get()
+            ->getResult();
 
         $this->assertCount(2, $result);
         $this->assertEquals('Accountant', $result[0]->name);
@@ -241,16 +241,16 @@ public function testOrHavingGroupStart()
     public function testNotHavingGroupStart()
     {
         $result = $this->db->table('job')
-                        ->select('name')
-                        ->groupBy('name')
-                        ->orderBy('name', 'asc')
-                        ->having('SUM(id) > 2')
-                        ->notHavingGroupStart()
-                            ->having('SUM(id) <= 4')
-                            ->havingLike('name', 'ant', 'before')
-                        ->havingGroupEnd()
-                        ->get()
-                        ->getResult();
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->having('SUM(id) > 2')
+            ->notHavingGroupStart()
+            ->having('SUM(id) <= 4')
+            ->havingLike('name', 'ant', 'before')
+            ->havingGroupEnd()
+            ->get()
+            ->getResult();
 
         $this->assertCount(1, $result);
         $this->assertEquals('Musician', $result[0]->name);
@@ -261,16 +261,16 @@ public function testNotHavingGroupStart()
     public function testOrNotHavingGroupStart()
     {
         $result = $this->db->table('job')
-                        ->select('name')
-                        ->groupBy('name')
-                        ->orderBy('name', 'asc')
-                        ->having('SUM(id) > 2')
-                        ->orNotHavingGroupStart()
-                            ->having('SUM(id) < 2')
-                            ->havingLike('name', 'o')
-                        ->havingGroupEnd()
-                        ->get()
-                        ->getResult();
+            ->select('name')
+            ->groupBy('name')
+            ->orderBy('name', 'asc')
+            ->having('SUM(id) > 2')
+            ->orNotHavingGroupStart()
+            ->having('SUM(id) < 2')
+            ->havingLike('name', 'o')
+            ->havingGroupEnd()
+            ->get()
+            ->getResult();
 
         $this->assertCount(3, $result);
         $this->assertEquals('Accountant', $result[0]->name);
@@ -283,13 +283,13 @@ public function testOrNotHavingGroupStart()
     public function testAndGroups()
     {
         $result = $this->db->table('user')
-                ->groupStart()
-                ->where('id >=', 3)
-                ->where('name !=', 'Chris Martin')
-                ->groupEnd()
-                ->where('country', 'US')
-                ->get()
-                ->getResult();
+            ->groupStart()
+            ->where('id >=', 3)
+            ->where('name !=', 'Chris Martin')
+            ->groupEnd()
+            ->where('country', 'US')
+            ->get()
+            ->getResult();
 
         $this->assertCount(1, $result);
         $this->assertEquals('Richard A Causey', $result[0]->name);
@@ -300,13 +300,13 @@ public function testAndGroups()
     public function testOrGroups()
     {
         $result = $this->db->table('user')
-                ->where('country', 'Iran')
-                ->orGroupStart()
-                ->where('id >=', 3)
-                ->where('name !=', 'Richard A Causey')
-                ->groupEnd()
-                ->get()
-                ->getResult();
+            ->where('country', 'Iran')
+            ->orGroupStart()
+            ->where('id >=', 3)
+            ->where('name !=', 'Richard A Causey')
+            ->groupEnd()
+            ->get()
+            ->getResult();
 
         $this->assertCount(2, $result);
         $this->assertEquals('Ahmadinejad', $result[0]->name);
@@ -318,13 +318,13 @@ public function testOrGroups()
     public function testNotGroups()
     {
         $result = $this->db->table('user')
-                ->where('country', 'US')
-                ->notGroupStart()
-                ->where('id >=', 3)
-                ->where('name !=', 'Chris Martin')
-                ->groupEnd()
-                ->get()
-                ->getResult();
+            ->where('country', 'US')
+            ->notGroupStart()
+            ->where('id >=', 3)
+            ->where('name !=', 'Chris Martin')
+            ->groupEnd()
+            ->get()
+            ->getResult();
 
         $this->assertCount(1, $result);
         $this->assertEquals('Derek Jones', $result[0]->name);
@@ -335,13 +335,13 @@ public function testNotGroups()
     public function testOrNotGroups()
     {
         $result = $this->db->table('user')
-                ->where('country', 'US')
-                ->orNotGroupStart()
-                ->where('id >=', 2)
-                ->where('country', 'Iran')
-                ->groupEnd()
-                ->get()
-                ->getResult();
+            ->where('country', 'US')
+            ->orNotGroupStart()
+            ->where('id >=', 2)
+            ->where('country', 'Iran')
+            ->groupEnd()
+            ->get()
+            ->getResult();
 
         $this->assertCount(3, $result);
         $this->assertEquals('Derek Jones', $result[0]->name);
@@ -354,11 +354,11 @@ public function testOrNotGroups()
     public function testGroupByCount()
     {
         $result = $this->db->table('user')
-                ->selectCount('id', 'count')
-                ->groupBy('country')
-                ->orderBy('country', 'desc')
-                ->get()
-                ->getResult();
+            ->selectCount('id', 'count')
+            ->groupBy('country')
+            ->orderBy('country', 'desc')
+            ->get()
+            ->getResult();
 
         $this->assertEquals(2, $result[0]->count);
     }
diff --git a/tests/system/Database/Live/IncrementTest.php b/tests/system/Database/Live/IncrementTest.php
index d54634637f7e..bd5c6f75e5a5 100644
--- a/tests/system/Database/Live/IncrementTest.php
+++ b/tests/system/Database/Live/IncrementTest.php
@@ -21,8 +21,8 @@ public function testIncrement()
         $this->hasInDatabase('job', ['name' => 'incremental', 'description' => '6']);
 
         $this->db->table('job')
-                ->where('name', 'incremental')
-                ->increment('description');
+            ->where('name', 'incremental')
+            ->increment('description');
 
         $this->seeInDatabase('job', ['name' => 'incremental', 'description' => '7']);
     }
@@ -34,8 +34,8 @@ public function testIncrementWithValue()
         $this->hasInDatabase('job', ['name' => 'incremental', 'description' => '6']);
 
         $this->db->table('job')
-                 ->where('name', 'incremental')
-                 ->increment('description', 2);
+            ->where('name', 'incremental')
+            ->increment('description', 2);
 
         $this->seeInDatabase('job', ['name' => 'incremental', 'description' => '8']);
     }
@@ -47,8 +47,8 @@ public function testDecrement()
         $this->hasInDatabase('job', ['name' => 'incremental', 'description' => '6']);
 
         $this->db->table('job')
-                 ->where('name', 'incremental')
-                 ->decrement('description');
+            ->where('name', 'incremental')
+            ->decrement('description');
 
         $this->seeInDatabase('job', ['name' => 'incremental', 'description' => '5']);
     }
@@ -60,8 +60,8 @@ public function testDecrementWithValue()
         $this->hasInDatabase('job', ['name' => 'incremental', 'description' => '6']);
 
         $this->db->table('job')
-                 ->where('name', 'incremental')
-                 ->decrement('description', 2);
+            ->where('name', 'incremental')
+            ->decrement('description', 2);
 
         $this->seeInDatabase('job', ['name' => 'incremental', 'description' => '4']);
     }
diff --git a/tests/system/Database/Live/InsertTest.php b/tests/system/Database/Live/InsertTest.php
index 8ce9d99dc98c..97eb3a80886c 100644
--- a/tests/system/Database/Live/InsertTest.php
+++ b/tests/system/Database/Live/InsertTest.php
@@ -62,8 +62,8 @@ public function testReplaceWithNoMatchingData()
         $this->db->table('job')->replace($data);
 
         $row = $this->db->table('job')
-                        ->getwhere(['id' => 5])
-                        ->getRow();
+            ->getwhere(['id' => 5])
+            ->getRow();
 
         $this->assertEquals('Cab Driver', $row->name);
     }
@@ -81,8 +81,8 @@ public function testReplaceWithMatchingData()
         $this->db->table('job')->replace($data);
 
         $row = $this->db->table('job')
-                        ->getwhere(['id' => 1])
-                        ->getRow();
+            ->getwhere(['id' => 1])
+            ->getRow();
 
         $this->assertEquals('Cab Driver', $row->name);
     }
diff --git a/tests/system/Database/Live/JoinTest.php b/tests/system/Database/Live/JoinTest.php
index 3c11b244759e..e88a5b4a4ea3 100644
--- a/tests/system/Database/Live/JoinTest.php
+++ b/tests/system/Database/Live/JoinTest.php
@@ -19,10 +19,10 @@ class JoinTest extends CIUnitTestCase
     public function testSimpleJoin()
     {
         $row = $this->db->table('job')
-                        ->select('job.id as job_id, job.name as job_name, user.id as user_id, user.name as user_name')
-                        ->join('user', 'user.id = job.id')
-                        ->get()
-                        ->getRow();
+            ->select('job.id as job_id, job.name as job_name, user.id as user_id, user.name as user_name')
+            ->join('user', 'user.id = job.id')
+            ->get()
+            ->getRow();
 
         $this->assertEquals(1, $row->job_id);
         $this->assertEquals(1, $row->user_id);
diff --git a/tests/system/Database/Live/LikeTest.php b/tests/system/Database/Live/LikeTest.php
index b0a3388250a5..422d1a5027b9 100644
--- a/tests/system/Database/Live/LikeTest.php
+++ b/tests/system/Database/Live/LikeTest.php
@@ -74,9 +74,9 @@ public function testLikeCaseInsensitive()
     public function testOrLike()
     {
         $jobs = $this->db->table('job')->like('name', 'ian')
-                        ->orLike('name', 'veloper')
-                        ->get()
-                        ->getResult();
+            ->orLike('name', 'veloper')
+            ->get()
+            ->getResult();
 
         $this->assertCount(3, $jobs);
         $this->assertEquals('Developer', $jobs[0]->name);
@@ -89,9 +89,9 @@ public function testOrLike()
     public function testNotLike()
     {
         $jobs = $this->db->table('job')
-                         ->notLike('name', 'veloper')
-                         ->get()
-                         ->getResult();
+            ->notLike('name', 'veloper')
+            ->get()
+            ->getResult();
 
         $this->assertCount(3, $jobs);
         $this->assertEquals('Politician', $jobs[0]->name);
@@ -104,10 +104,10 @@ public function testNotLike()
     public function testOrNotLike()
     {
         $jobs = $this->db->table('job')
-                         ->like('name', 'ian')
-                         ->orNotLike('name', 'veloper')
-                         ->get()
-                         ->getResult();
+            ->like('name', 'ian')
+            ->orNotLike('name', 'veloper')
+            ->get()
+            ->getResult();
 
         $this->assertCount(3, $jobs);
         $this->assertEquals('Politician', $jobs[0]->name);
diff --git a/tests/system/Database/Live/LimitTest.php b/tests/system/Database/Live/LimitTest.php
index 5484f9ee1958..2cb39644901e 100644
--- a/tests/system/Database/Live/LimitTest.php
+++ b/tests/system/Database/Live/LimitTest.php
@@ -18,9 +18,9 @@ class LimitTest extends CIUnitTestCase
     public function testLimit()
     {
         $jobs = $this->db->table('job')
-                        ->limit(2)
-                        ->get()
-                        ->getResult();
+            ->limit(2)
+            ->get()
+            ->getResult();
 
         $this->assertCount(2, $jobs);
         $this->assertEquals('Developer', $jobs[0]->name);
@@ -32,9 +32,9 @@ public function testLimit()
     public function testLimitAndOffset()
     {
         $jobs = $this->db->table('job')
-                        ->limit(2, 2)
-                        ->get()
-                        ->getResult();
+            ->limit(2, 2)
+            ->get()
+            ->getResult();
 
         $this->assertCount(2, $jobs);
         $this->assertEquals('Accountant', $jobs[0]->name);
diff --git a/tests/system/Database/Live/OrderTest.php b/tests/system/Database/Live/OrderTest.php
index 67c91351f982..f0b4f6a5d6fc 100644
--- a/tests/system/Database/Live/OrderTest.php
+++ b/tests/system/Database/Live/OrderTest.php
@@ -19,9 +19,9 @@ class OrderTest extends CIUnitTestCase
     public function testOrderAscending()
     {
         $jobs = $this->db->table('job')
-                        ->orderBy('name', 'asc')
-                        ->get()
-                        ->getResult();
+            ->orderBy('name', 'asc')
+            ->get()
+            ->getResult();
 
         $this->assertCount(4, $jobs);
         $this->assertEquals('Accountant', $jobs[0]->name);
@@ -35,9 +35,9 @@ public function testOrderAscending()
     public function testOrderDescending()
     {
         $jobs = $this->db->table('job')
-                         ->orderBy('name', 'desc')
-                         ->get()
-                         ->getResult();
+            ->orderBy('name', 'desc')
+            ->get()
+            ->getResult();
 
         $this->assertCount(4, $jobs);
         $this->assertEquals('Accountant', $jobs[3]->name);
@@ -51,10 +51,10 @@ public function testOrderDescending()
     public function testMultipleOrderValues()
     {
         $users = $this->db->table('user')
-                        ->orderBy('country', 'asc')
-                        ->orderBy('name', 'desc')
-                        ->get()
-                        ->getResult();
+            ->orderBy('country', 'asc')
+            ->orderBy('name', 'desc')
+            ->get()
+            ->getResult();
 
         $this->assertCount(4, $users);
         $this->assertEquals('Ahmadinejad', $users[0]->name);
diff --git a/tests/system/Database/Live/PretendTest.php b/tests/system/Database/Live/PretendTest.php
index 527fb78a4867..31a68e09f674 100644
--- a/tests/system/Database/Live/PretendTest.php
+++ b/tests/system/Database/Live/PretendTest.php
@@ -22,14 +22,14 @@ public function tearDown(): void
     public function testPretendReturnsQueryObject()
     {
         $result = $this->db->pretend(false)
-                           ->table('user')
-                           ->get();
+            ->table('user')
+            ->get();
 
         $this->assertFalse($result instanceof Query);
 
         $result = $this->db->pretend(true)
-                    ->table('user')
-                    ->get();
+            ->table('user')
+            ->get();
 
         $this->assertInstanceOf(Query::class, $result);
     }
diff --git a/tests/system/Database/Live/SelectTest.php b/tests/system/Database/Live/SelectTest.php
index 754256f1b752..94fde7d0bf66 100644
--- a/tests/system/Database/Live/SelectTest.php
+++ b/tests/system/Database/Live/SelectTest.php
@@ -183,10 +183,10 @@ public function testSelectWithMultipleWheresOnSameColumn()
     public function testSelectWithMultipleWheresOnSameColumnAgain()
     {
         $users = $this->db->table('user')
-                          ->whereIn('id', [1, 2])
-                          ->orWhere('id', 3)
-                          ->get()
-                          ->getResultArray();
+            ->whereIn('id', [1, 2])
+            ->orWhere('id', 3)
+            ->get()
+            ->getResultArray();
 
         $this->assertCount(3, $users);
 
diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index cbbd775c4955..4de6968474b3 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -19,8 +19,7 @@ class UpdateTest extends CIUnitTestCase
 
     public function testUpdateSetsAllWithoutWhere()
     {
-        $this->db->table('user')
-                    ->update(['name' => 'Bobby']);
+        $this->db->table('user')->update(['name' => 'Bobby']);
 
         $result = $this->db->table('user')->get()->getResult();
 
@@ -35,13 +34,12 @@ public function testUpdateSetsAllWithoutWhere()
     public function testUpdateSetsAllWithoutWhereAndLimit()
     {
         try {
-            $this->db->table('user')
-                     ->update(['name' => 'Bobby'], null, 1);
+            $this->db->table('user')->update(['name' => 'Bobby'], null, 1);
 
             $result = $this->db->table('user')
-                               ->orderBy('id', 'asc')
-                               ->get()
-                               ->getResult();
+                ->orderBy('id', 'asc')
+                ->get()
+                ->getResult();
 
             $this->assertEquals('Bobby', $result[0]->name);
             $this->assertEquals('Ahmadinejad', $result[1]->name);
@@ -60,8 +58,7 @@ public function testUpdateSetsAllWithoutWhereAndLimit()
 
     public function testUpdateWithWhere()
     {
-        $this->db->table('user')
-                 ->update(['name' => 'Bobby'], ['country' => 'US']);
+        $this->db->table('user')->update(['name' => 'Bobby'], ['country' => 'US']);
 
         $result = $this->db->table('user')->get()->getResultArray();
 
@@ -81,12 +78,9 @@ public function testUpdateWithWhere()
     public function testUpdateWithWhereAndLimit()
     {
         try {
-            $this->db->table('user')
-                     ->update(['name' => 'Bobby'], ['country' => 'US'], 1);
+            $this->db->table('user')->update(['name' => 'Bobby'], ['country' => 'US'], 1);
 
-            $result = $this->db->table('user')
-                               ->get()
-                               ->getResult();
+            $result = $this->db->table('user')->get()->getResult();
 
             $this->assertEquals('Bobby', $result[0]->name);
             $this->assertEquals('Ahmadinejad', $result[1]->name);
@@ -116,8 +110,7 @@ public function testUpdateBatch()
             ],
         ];
 
-        $this->db->table('user')
-                    ->updateBatch($data, 'name');
+        $this->db->table('user')->updateBatch($data, 'name');
 
         $this->seeInDatabase('user', [
             'name'    => 'Derek Jones',
@@ -133,8 +126,7 @@ public function testUpdateBatch()
 
     public function testUpdateWithWhereSameColumn()
     {
-        $this->db->table('user')
-                 ->update(['country' => 'CA'], ['country' => 'US']);
+        $this->db->table('user')->update(['country' => 'CA'], ['country' => 'US']);
 
         $result = $this->db->table('user')->get()->getResultArray();
 
@@ -155,9 +147,9 @@ public function testUpdateWithWhereSameColumn2()
     {
         // calling order: set() -> where()
         $this->db->table('user')
-                 ->set('country', 'CA')
-                 ->where('country', 'US')
-                 ->update();
+            ->set('country', 'CA')
+            ->where('country', 'US')
+            ->update();
 
         $result = $this->db->table('user')->get()->getResultArray();
 
@@ -178,8 +170,8 @@ public function testUpdateWithWhereSameColumn3()
     {
         // calling order: where() -> set() in update()
         $this->db->table('user')
-                 ->where('country', 'US')
-                 ->update(['country' => 'CA']);
+            ->where('country', 'US')
+            ->update(['country' => 'CA']);
 
         $result = $this->db->table('user')->get()->getResultArray();
 
@@ -222,8 +214,8 @@ public function testUpdatePeriods()
     public function testSetWithoutEscape()
     {
         $this->db->table('job')
-                 ->set('description', 'name', false)
-                 ->update();
+            ->set('description', 'name', false)
+            ->update();
 
         $result = $this->db->table('user')->get()->getResultArray();
 
diff --git a/tests/system/Database/Live/WhereTest.php b/tests/system/Database/Live/WhereTest.php
index 3e57f743cc07..a0d23818f9cb 100644
--- a/tests/system/Database/Live/WhereTest.php
+++ b/tests/system/Database/Live/WhereTest.php
@@ -53,8 +53,8 @@ public function testWhereArray()
     public function testWhereCustomString()
     {
         $jobs = $this->db->table('job')->where("id > 2 AND name != 'Accountant'")
-                            ->get()
-                            ->getResult();
+            ->get()
+            ->getResult();
 
         $this->assertCount(1, $jobs);
 
@@ -67,10 +67,10 @@ public function testWhereCustomString()
     public function testOrWhere()
     {
         $jobs = $this->db->table('job')
-                        ->where('name !=', 'Accountant')
-                        ->orWhere('id >', 3)
-                        ->get()
-                        ->getResult();
+            ->where('name !=', 'Accountant')
+            ->orWhere('id >', 3)
+            ->get()
+            ->getResult();
 
         $this->assertCount(3, $jobs);
         $this->assertEquals('Developer', $jobs[0]->name);
@@ -83,10 +83,10 @@ public function testOrWhere()
     public function testOrWhereSameColumn()
     {
         $jobs = $this->db->table('job')
-                        ->where('name', 'Developer')
-                        ->orWhere('name', 'Politician')
-                        ->get()
-                        ->getResult();
+            ->where('name', 'Developer')
+            ->orWhere('name', 'Politician')
+            ->get()
+            ->getResult();
 
         $this->assertCount(2, $jobs);
         $this->assertEquals('Developer', $jobs[0]->name);
@@ -98,9 +98,9 @@ public function testOrWhereSameColumn()
     public function testWhereIn()
     {
         $jobs = $this->db->table('job')
-                        ->whereIn('name', ['Politician', 'Accountant'])
-                        ->get()
-                        ->getResult();
+            ->whereIn('name', ['Politician', 'Accountant'])
+            ->get()
+            ->getResult();
 
         $this->assertCount(2, $jobs);
         $this->assertEquals('Politician', $jobs[0]->name);
@@ -115,9 +115,9 @@ public function testWhereIn()
     public function testWhereNotIn()
     {
         $jobs = $this->db->table('job')
-                         ->whereNotIn('name', ['Politician', 'Accountant'])
-                         ->get()
-                         ->getResult();
+            ->whereNotIn('name', ['Politician', 'Accountant'])
+            ->get()
+            ->getResult();
 
         $this->assertCount(2, $jobs);
         $this->assertEquals('Developer', $jobs[0]->name);
@@ -129,14 +129,14 @@ public function testWhereNotIn()
     public function testSubQuery()
     {
         $subQuery = $this->db->table('job')
-                             ->select('id')
-                             ->where('name', 'Developer')
-                             ->getCompiledSelect();
+            ->select('id')
+            ->where('name', 'Developer')
+            ->getCompiledSelect();
 
         $jobs = $this->db->table('job')
-                         ->where('id not in (' . $subQuery . ')', null, false)
-                         ->get()
-                         ->getResult();
+            ->where('id not in (' . $subQuery . ')', null, false)
+            ->get()
+            ->getResult();
 
         $this->assertCount(3, $jobs);
         $this->assertEquals('Politician', $jobs[0]->name);
@@ -149,14 +149,14 @@ public function testSubQuery()
     public function testSubQueryAnotherType()
     {
         $subQuery = $this->db->table('job')
-                             ->select('id')
-                             ->where('name', 'Developer')
-                             ->getCompiledSelect();
+            ->select('id')
+            ->where('name', 'Developer')
+            ->getCompiledSelect();
 
         $jobs = $this->db->table('job')
-                         ->where('id = (' . $subQuery . ')', null, false)
-                         ->get()
-                         ->getResult();
+            ->where('id = (' . $subQuery . ')', null, false)
+            ->get()
+            ->getResult();
 
         $this->assertCount(1, $jobs);
         $this->assertEquals('Developer', $jobs[0]->name);
@@ -167,15 +167,15 @@ public function testSubQueryAnotherType()
     public function testWhereNullParam()
     {
         $this->db->table('job')
-                 ->insert([
-                     'name'        => 'Brewmaster',
-                     'description' => null,
-                 ]);
+            ->insert([
+                'name'        => 'Brewmaster',
+                'description' => null,
+            ]);
 
         $jobs = $this->db->table('job')
-                         ->where('description', null)
-                         ->get()
-                         ->getResult();
+            ->where('description', null)
+            ->get()
+            ->getResult();
 
         $this->assertCount(1, $jobs);
         $this->assertEquals('Brewmaster', $jobs[0]->name);
@@ -186,15 +186,15 @@ public function testWhereNullParam()
     public function testWhereIsNull()
     {
         $this->db->table('job')
-                 ->insert([
-                     'name'        => 'Brewmaster',
-                     'description' => null,
-                 ]);
+            ->insert([
+                'name'        => 'Brewmaster',
+                'description' => null,
+            ]);
 
         $jobs = $this->db->table('job')
-                         ->where('description IS NULL')
-                         ->get()
-                         ->getResult();
+            ->where('description IS NULL')
+            ->get()
+            ->getResult();
 
         $this->assertCount(1, $jobs);
         $this->assertEquals('Brewmaster', $jobs[0]->name);
@@ -205,15 +205,15 @@ public function testWhereIsNull()
     public function testWhereIsNotNull()
     {
         $this->db->table('job')
-                 ->insert([
-                     'name'        => 'Brewmaster',
-                     'description' => null,
-                 ]);
+            ->insert([
+                'name'        => 'Brewmaster',
+                'description' => null,
+            ]);
 
         $jobs = $this->db->table('job')
-                         ->where('description IS NOT NULL')
-                         ->get()
-                         ->getResult();
+            ->where('description IS NOT NULL')
+            ->get()
+            ->getResult();
 
         $this->assertCount(4, $jobs);
     }
diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index 9b5c748e8c0c..b80f11a905c5 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -669,8 +669,10 @@ public function testAddFilterSection()
 
         $filters = new Filters((object) $config, $this->request, $this->response);
 
-        $filters = $filters->addFilter('Some\OtherClass', 'another', 'before', 'globals')
-                ->initialize('admin/foo/bar');
+        $filters = $filters
+            ->addFilter('Some\OtherClass', 'another', 'before', 'globals')
+            ->initialize('admin/foo/bar');
+
         $list = $filters->getFilters();
 
         $this->assertTrue(in_array('another', $list['before'], true));
@@ -684,9 +686,11 @@ public function testInitializeTwice()
 
         $filters = new Filters((object) $config, $this->request, $this->response);
 
-        $filters = $filters->addFilter('Some\OtherClass', 'another', 'before', 'globals')
-                ->initialize('admin/foo/bar')
-                ->initialize();
+        $filters = $filters
+            ->addFilter('Some\OtherClass', 'another', 'before', 'globals')
+            ->initialize('admin/foo/bar')
+            ->initialize();
+
         $list = $filters->getFilters();
 
         $this->assertTrue(in_array('another', $list['before'], true));
diff --git a/tests/system/HTTP/HeaderTest.php b/tests/system/HTTP/HeaderTest.php
index e2e29cc1bc56..845757398376 100644
--- a/tests/system/HTTP/HeaderTest.php
+++ b/tests/system/HTTP/HeaderTest.php
@@ -174,8 +174,7 @@ public function testHeaderSetValueWithNullWillMarkAsEmptyString()
         $expected = '';
 
         $header = new Header($name);
-        $header->setValue('bar')
-               ->setValue(null);
+        $header->setValue('bar')->setValue(null);
 
         $this->assertEquals($name, $header->getName());
         $this->assertEquals($expected, $header->getValueLine());
@@ -189,8 +188,7 @@ public function testHeaderLineWithArrayValues()
 
         $header = new Header($name);
 
-        $header->setValue('bar')
-               ->appendValue(['baz' => 'fuzz']);
+        $header->setValue('bar')->appendValue(['baz' => 'fuzz']);
 
         $this->assertEquals($name, $header->getName());
         $this->assertEquals($expected, $header->getValueLine());
@@ -206,8 +204,7 @@ public function testHeaderToStringShowsEntireHeader()
 
         $header = new Header($name);
 
-        $header->setValue('bar')
-               ->appendValue(['baz' => 'fuzz']);
+        $header->setValue('bar')->appendValue(['baz' => 'fuzz']);
 
         $this->assertEquals($expected, (string) $header);
     }
diff --git a/tests/system/HTTP/RedirectResponseTest.php b/tests/system/HTTP/RedirectResponseTest.php
index 20f05bf95e52..08bbc8f1ae3e 100644
--- a/tests/system/HTTP/RedirectResponseTest.php
+++ b/tests/system/HTTP/RedirectResponseTest.php
@@ -128,8 +128,7 @@ public function testWithValidationErrors()
         $response = new RedirectResponse(new App());
 
         $validation = $this->createMock(Validation::class);
-        $validation->method('getErrors')
-                ->willReturn(['foo' => 'bar']);
+        $validation->method('getErrors')->willReturn(['foo' => 'bar']);
 
         Services::injectMock('validation', $validation);
 
diff --git a/tests/system/HTTP/ResponseSendTest.php b/tests/system/HTTP/ResponseSendTest.php
index 39f5d651a9a1..261fffeb52c6 100644
--- a/tests/system/HTTP/ResponseSendTest.php
+++ b/tests/system/HTTP/ResponseSendTest.php
@@ -116,8 +116,8 @@ public function testRedirectResponseCookies()
         $routes->add('user/login', 'Auth::verify', ['as' => 'login']);
 
         $answer1 = $response->redirect('/login')
-                ->setCookie('foo', 'bar', YEAR)
-                ->setCookie('login_time', $loginTime, YEAR);
+            ->setCookie('foo', 'bar', YEAR)
+            ->setCookie('login_time', $loginTime, YEAR);
         $this->assertTrue($answer1->hasCookie('foo', 'bar'));
         $this->assertTrue($answer1->hasCookie('login_time'));
         $response->setBody('Hello');
diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php
index 58cc443fbe30..d0ad3d4023f8 100644
--- a/tests/system/HTTP/ResponseTest.php
+++ b/tests/system/HTTP/ResponseTest.php
@@ -522,8 +522,8 @@ public function testRedirectResponseCookies()
 
         $response = new Response(new App());
         $answer1  = $response->redirect('/login')
-                ->setCookie('foo', 'bar', YEAR)
-                ->setCookie('login_time', $loginTime, YEAR);
+            ->setCookie('foo', 'bar', YEAR)
+            ->setCookie('login_time', $loginTime, YEAR);
 
         $this->assertTrue($answer1->hasCookie('foo'));
         $this->assertTrue($answer1->hasCookie('login_time'));
diff --git a/tests/system/Models/DeleteModelTest.php b/tests/system/Models/DeleteModelTest.php
index 3c643f3d4162..b62d4943ab6c 100644
--- a/tests/system/Models/DeleteModelTest.php
+++ b/tests/system/Models/DeleteModelTest.php
@@ -96,8 +96,8 @@ public function testPurgeDeleted(): void
         $this->createModel(UserModel::class);
 
         $this->db->table('user')
-                 ->where('id', 1)
-                 ->update(['deleted_at' => date('Y-m-d H:i:s')]);
+            ->where('id', 1)
+            ->update(['deleted_at' => date('Y-m-d H:i:s')]);
 
         $this->model->purgeDeleted();
 
@@ -110,8 +110,8 @@ public function testOnlyDeleted(): void
         $this->createModel(UserModel::class);
 
         $this->db->table('user')
-                 ->where('id', 1)
-                 ->update(['deleted_at' => date('Y-m-d H:i:s')]);
+            ->where('id', 1)
+            ->update(['deleted_at' => date('Y-m-d H:i:s')]);
 
         $users = $this->model->onlyDeleted()->findAll();
         $this->assertCount(1, $users);
@@ -190,8 +190,8 @@ public function testDeleteWithSoftDelete(): void
     public function testPurgeDeletedWithSoftDeleteFalse(): void
     {
         $this->db->table('job')
-                 ->where('id', 1)
-                 ->update(['deleted_at' => time()]);
+            ->where('id', 1)
+            ->update(['deleted_at' => time()]);
 
         $this->createModel(JobModel::class);
         $this->model->purgeDeleted();
diff --git a/tests/system/Models/FindModelTest.php b/tests/system/Models/FindModelTest.php
index 6224f6cc9007..fd7b57aa7de4 100644
--- a/tests/system/Models/FindModelTest.php
+++ b/tests/system/Models/FindModelTest.php
@@ -72,8 +72,8 @@ public function testFindRespectsReturnObject(): void
     public function testFindRespectsSoftDeletes(): void
     {
         $this->db->table('user')
-                 ->where('id', 4)
-                 ->update(['deleted_at' => date('Y-m-d H:i:s')]);
+            ->where('id', 4)
+            ->update(['deleted_at' => date('Y-m-d H:i:s')]);
 
         $this->createModel(UserModel::class);
 
@@ -122,8 +122,8 @@ public function testFindAllRespectsLimitsAndOffset(): void
     public function testFindAllRespectsSoftDeletes(): void
     {
         $this->db->table('user')
-                 ->where('id', 4)
-                 ->update(['deleted_at' => date('Y-m-d H:i:s')]);
+            ->where('id', 4)
+            ->update(['deleted_at' => date('Y-m-d H:i:s')]);
 
         $this->createModel(UserModel::class);
 
@@ -171,8 +171,8 @@ public static function provideGroupBy(): iterable
     public function testFirstRespectsSoftDeletes($aggregate, $groupBy): void
     {
         $this->db->table('user')
-                 ->where('id', 1)
-                 ->update(['deleted_at' => date('Y-m-d H:i:s')]);
+            ->where('id', 1)
+            ->update(['deleted_at' => date('Y-m-d H:i:s')]);
 
         $this->createModel(UserModel::class);
 
diff --git a/tests/system/Test/ControllerTestTraitTest.php b/tests/system/Test/ControllerTestTraitTest.php
index cef99ab0188d..e93089fba25f 100644
--- a/tests/system/Test/ControllerTestTraitTest.php
+++ b/tests/system/Test/ControllerTestTraitTest.php
@@ -26,9 +26,9 @@ public function testBadController()
         $this->expectException(InvalidArgumentException::class);
         $logger = new Logger(new LoggerConfig());
         $result = $this->withURI('http://example.com')
-                ->withLogger($logger)
-                ->controller(NeverHeardOfIt::class)
-                ->execute('index');
+            ->withLogger($logger)
+            ->controller(NeverHeardOfIt::class)
+            ->execute('index');
     }
 
     public function testBadControllerMethod()
@@ -36,18 +36,18 @@ public function testBadControllerMethod()
         $this->expectException(InvalidArgumentException::class);
         $logger = new Logger(new LoggerConfig());
         $result = $this->withURI('http://example.com')
-                ->withLogger($logger)
-                ->controller(Home::class)
-                ->execute('nothere');
+            ->withLogger($logger)
+            ->controller(Home::class)
+            ->execute('nothere');
     }
 
     public function testController()
     {
         $logger = new Logger(new LoggerConfig());
         $result = $this->withURI('http://example.com')
-                ->withLogger($logger)
-                ->controller(Home::class)
-                ->execute('index');
+            ->withLogger($logger)
+            ->controller(Home::class)
+            ->execute('index');
 
         $body = $result->response()->getBody();
         $this->assertTrue($result->isOK());
@@ -56,8 +56,8 @@ public function testController()
     public function testControllerWithoutLogger()
     {
         $result = $this->withURI('http://example.com')
-                ->controller(Home::class)
-                ->execute('index');
+            ->controller(Home::class)
+            ->execute('index');
 
         $body = $result->response()->getBody();
         $this->assertTrue($result->isOK());
@@ -67,9 +67,9 @@ public function testPopcornIndex()
     {
         $logger = new Logger(new LoggerConfig());
         $result = $this->withURI('http://example.com')
-                ->withLogger($logger)
-                ->controller(Popcorn::class)
-                ->execute('index');
+            ->withLogger($logger)
+            ->controller(Popcorn::class)
+            ->execute('index');
 
         $body = $result->response()->getBody();
         $this->assertTrue($result->isOK());
@@ -79,9 +79,9 @@ public function testPopcornIndex2()
     {
         $logger = new Logger(new LoggerConfig());
         $result = $this->withURI('http://example.com')
-                ->withLogger($logger)
-                ->controller(Popcorn::class)
-                ->execute('index');
+            ->withLogger($logger)
+            ->controller(Popcorn::class)
+            ->execute('index');
 
         $body = $result->response()->getBody();
         $this->assertEquals('Hi there', $body);
@@ -91,9 +91,9 @@ public function testPopcornFailure()
     {
         $logger = new Logger(new LoggerConfig());
         $result = $this->withURI('http://example.com')
-                ->withLogger($logger)
-                ->controller(Popcorn::class)
-                ->execute('pop');
+            ->withLogger($logger)
+            ->controller(Popcorn::class)
+            ->execute('pop');
 
         $this->assertEquals(567, $result->response()->getStatusCode());
     }
@@ -102,9 +102,9 @@ public function testPopcornException()
     {
         $logger = new Logger(new LoggerConfig());
         $result = $this->withURI('http://example.com')
-                ->withLogger($logger)
-                ->controller(Popcorn::class)
-                ->execute('popper');
+            ->withLogger($logger)
+            ->controller(Popcorn::class)
+            ->execute('popper');
 
         $this->assertEquals(500, $result->response()->getStatusCode());
     }
@@ -116,13 +116,13 @@ public function testPopcornIndexWithSupport()
         $body   = '';
 
         $result = $this->withURI('http://example.com')
-                ->withConfig($config)
-                ->withRequest(Services::request($config))
-                ->withResponse(Services::response($config))
-                ->withLogger($logger)
-                ->withBody($body)
-                ->controller(Popcorn::class)
-                ->execute('index');
+            ->withConfig($config)
+            ->withRequest(Services::request($config))
+            ->withResponse(Services::response($config))
+            ->withLogger($logger)
+            ->withBody($body)
+            ->controller(Popcorn::class)
+            ->execute('index');
 
         $body = $result->response()->getBody();
         $this->assertEquals('Hi there', $body);
@@ -132,9 +132,9 @@ public function testRequestPassthrough()
     {
         $logger = new Logger(new LoggerConfig());
         $result = $this->withURI('http://example.com')
-                ->withLogger($logger)
-                ->controller(Popcorn::class)
-                ->execute('popper');
+            ->withLogger($logger)
+            ->controller(Popcorn::class)
+            ->execute('popper');
 
         $req = $result->request();
         $this->assertEquals('get', $req->getMethod());
@@ -144,9 +144,9 @@ public function testFailureResponse()
     {
         $logger = new Logger(new LoggerConfig());
         $result = $this->withURI('http://example.com')
-                ->withLogger($logger)
-                ->controller(Popcorn::class)
-                ->execute('oops');
+            ->withLogger($logger)
+            ->controller(Popcorn::class)
+            ->execute('oops');
 
         $this->assertFalse($result->isOK());
         $this->assertEquals(401, $result->response()->getStatusCode());
@@ -156,9 +156,9 @@ public function testEmptyResponse()
     {
         $logger = new Logger(new LoggerConfig());
         $result = $this->withURI('http://example.com')
-                ->withLogger($logger)
-                ->controller(Popcorn::class)
-                ->execute('weasel');
+            ->withLogger($logger)
+            ->controller(Popcorn::class)
+            ->execute('weasel');
 
         $body = $result->response()->getBody(); // empty
         $this->assertEmpty($body);
@@ -169,9 +169,9 @@ public function testRedirect()
     {
         $logger = new Logger(new LoggerConfig());
         $result = $this->withURI('http://example.com')
-                ->withLogger($logger)
-                ->controller(Popcorn::class)
-                ->execute('goaway');
+            ->withLogger($logger)
+            ->controller(Popcorn::class)
+            ->execute('goaway');
 
         $this->assertTrue($result->isRedirect());
     }
@@ -180,9 +180,9 @@ public function testDOMParserForward()
     {
         $logger = new Logger(new LoggerConfig());
         $result = $this->withURI('http://example.com')
-                ->withLogger($logger)
-                ->controller(Popcorn::class)
-                ->execute('index');
+            ->withLogger($logger)
+            ->controller(Popcorn::class)
+            ->execute('index');
 
         $this->assertTrue($result->see('Hi'));
     }
@@ -191,9 +191,9 @@ public function testFailsForward()
     {
         $logger = new Logger(new LoggerConfig());
         $result = $this->withURI('http://example.com')
-                ->withLogger($logger)
-                ->controller(Popcorn::class)
-                ->execute('index');
+            ->withLogger($logger)
+            ->controller(Popcorn::class)
+            ->execute('index');
 
         // won't fail, but doesn't do anything
         $this->assertNull($result->ohno('Hi'));
@@ -205,8 +205,8 @@ public function testFailsForward()
     public function testResponseOverriding()
     {
         $result = $this->withURI('http://example.com/rest/')
-                ->controller(Popcorn::class)
-                ->execute('index3');
+            ->controller(Popcorn::class)
+            ->execute('index3');
 
         $response = json_decode($result->response()->getBody());
         $this->assertEquals('en', $response->lang);
@@ -219,8 +219,8 @@ public function testControllerNoURI()
     {
         $logger = new Logger(new LoggerConfig());
         $result = $this->withLogger($logger)
-                       ->controller(Home::class)
-                       ->execute('index');
+            ->controller(Home::class)
+            ->execute('index');
 
         $body = $result->response()->getBody();
         $this->assertTrue($result->isOK());
@@ -229,7 +229,7 @@ public function testControllerNoURI()
     public function testRedirectRoute()
     {
         $result = $this->controller(Popcorn::class)
-                        ->execute('toindex');
+            ->execute('toindex');
         $this->assertTrue($result->isRedirect());
     }
 }
diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
index fb92252dbd12..9f9ade6407cb 100644
--- a/tests/system/Validation/RulesTest.php
+++ b/tests/system/Validation/RulesTest.php
@@ -691,11 +691,11 @@ public function testIsUniqueFalse()
     {
         $db = Database::connect();
         $db->table('user')
-           ->insert([
-               'name'    => 'Derek Travis',
-               'email'   => 'derek@world.com',
-               'country' => 'Elbonia',
-           ]);
+            ->insert([
+                'name'    => 'Derek Travis',
+                'email'   => 'derek@world.com',
+                'country' => 'Elbonia',
+            ]);
 
         $data = [
             'email' => 'derek@world.com',
@@ -733,17 +733,17 @@ public function testIsUniqueTrue()
      */
     public function testIsUniqueIgnoresParams()
     {
-        $db   = Database::connect();
-        $user = $db->table('user')
-                   ->insert([
-                       'name'    => 'Developer A',
-                       'email'   => 'deva@example.com',
-                       'country' => 'Elbonia',
-                   ]);
+        $db = Database::connect();
+        $db->table('user')
+            ->insert([
+                'name'    => 'Developer A',
+                'email'   => 'deva@example.com',
+                'country' => 'Elbonia',
+            ]);
         $row = $db->table('user')
-                   ->limit(1)
-                   ->get()
-                   ->getRow();
+            ->limit(1)
+            ->get()
+            ->getRow();
 
         $data = [
             'email' => 'derek@world.co.uk',
@@ -771,9 +771,9 @@ public function testIsUniqueIgnoresParamsPlaceholders()
 
         $db  = Database::connect();
         $row = $db->table('user')
-                  ->limit(1)
-                  ->get()
-                  ->getRow();
+            ->limit(1)
+            ->get()
+            ->getRow();
 
         $data = [
             'id'    => $row->id,
@@ -796,11 +796,11 @@ public function testIsUniqueByManualRun()
     {
         $db = Database::connect();
         $db->table('user')
-                   ->insert([
-                       'name'    => 'Developer A',
-                       'email'   => 'deva@example.com',
-                       'country' => 'Elbonia',
-                   ]);
+            ->insert([
+                'name'    => 'Developer A',
+                'email'   => 'deva@example.com',
+                'country' => 'Elbonia',
+            ]);
 
         $this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
     }
@@ -814,11 +814,11 @@ public function testIsNotUniqueFalse()
     {
         $db = Database::connect();
         $db->table('user')
-           ->insert([
-               'name'    => 'Derek Travis',
-               'email'   => 'derek@world.com',
-               'country' => 'Elbonia',
-           ]);
+            ->insert([
+                'name'    => 'Derek Travis',
+                'email'   => 'derek@world.com',
+                'country' => 'Elbonia',
+            ]);
 
         $data = [
             'email' => 'derek1@world.com',
@@ -840,11 +840,11 @@ public function testIsNotUniqueTrue()
     {
         $db = Database::connect();
         $db->table('user')
-           ->insert([
-               'name'    => 'Derek Travis',
-               'email'   => 'derek@world.com',
-               'country' => 'Elbonia',
-           ]);
+            ->insert([
+                'name'    => 'Derek Travis',
+                'email'   => 'derek@world.com',
+                'country' => 'Elbonia',
+            ]);
 
         $data = [
             'email' => 'derek@world.com',
@@ -864,17 +864,17 @@ public function testIsNotUniqueTrue()
      */
     public function testIsNotUniqueIgnoresParams()
     {
-        $db   = Database::connect();
-        $user = $db->table('user')
-                   ->insert([
-                       'name'    => 'Developer A',
-                       'email'   => 'deva@example.com',
-                       'country' => 'Elbonia',
-                   ]);
+        $db = Database::connect();
+        $db->table('user')
+            ->insert([
+                'name'    => 'Developer A',
+                'email'   => 'deva@example.com',
+                'country' => 'Elbonia',
+            ]);
         $row = $db->table('user')
-                   ->limit(1)
-                   ->get()
-                   ->getRow();
+            ->limit(1)
+            ->get()
+            ->getRow();
 
         $data = [
             'email' => 'derek@world.co.uk',
@@ -902,9 +902,9 @@ public function testIsNotUniqueIgnoresParamsPlaceholders()
 
         $db  = Database::connect();
         $row = $db->table('user')
-                  ->limit(1)
-                  ->get()
-                  ->getRow();
+            ->limit(1)
+            ->get()
+            ->getRow();
 
         $data = [
             'id'    => $row->id,
@@ -927,11 +927,11 @@ public function testIsNotUniqueByManualRun()
     {
         $db = Database::connect();
         $db->table('user')
-                   ->insert([
-                       'name'    => 'Developer A',
-                       'email'   => 'deva@example.com',
-                       'country' => 'Elbonia',
-                   ]);
+            ->insert([
+                'name'    => 'Developer A',
+                'email'   => 'deva@example.com',
+                'country' => 'Elbonia',
+            ]);
 
         $this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
     }
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 141eba47eca4..47bc3dd69fed 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -113,6 +113,7 @@ public function __construct()
                 'keep_multiple_spaces_after_comma' => false,
                 'on_multiline'                     => 'ensure_fully_multiline',
             ],
+            'method_chaining_indentation'            => true,
             'modernize_types_casting'                => true,
             'multiline_comment_opening_closing'      => true,
             'multiline_whitespace_before_semicolons' => ['strategy' => 'no_multi_line'],

From 23dbbfc47258ea479ded159bff610d031ef859e8 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 18 Jun 2021 00:52:34 +0800
Subject: [PATCH 0018/2325] Native functions and type hints should be written
 in correct case

---
 utils/PhpCsFixer/CodeIgniter4.php | 34 ++++++++++++++++---------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 47bc3dd69fed..f030254a32d5 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -113,22 +113,24 @@ public function __construct()
                 'keep_multiple_spaces_after_comma' => false,
                 'on_multiline'                     => 'ensure_fully_multiline',
             ],
-            'method_chaining_indentation'            => true,
-            'modernize_types_casting'                => true,
-            'multiline_comment_opening_closing'      => true,
-            'multiline_whitespace_before_semicolons' => ['strategy' => 'no_multi_line'],
-            'no_alias_functions'                     => ['sets' => ['@all']],
-            'no_short_bool_cast'                     => true,
-            'no_trailing_comma_in_singleline_array'  => true,
-            'no_unset_cast'                          => true,
-            'no_whitespace_before_comma_in_array'    => ['after_heredoc' => true],
-            'not_operator_with_space'                => false,
-            'not_operator_with_successor_space'      => true,
-            'normalize_index_brace'                  => true,
-            'ordered_imports'                        => ['sort_algorithm' => 'alpha'],
-            'phpdoc_align'                           => true,
-            'phpdoc_indent'                          => true,
-            'phpdoc_inline_tag_normalizer'           => [
+            'method_chaining_indentation'             => true,
+            'modernize_types_casting'                 => true,
+            'multiline_comment_opening_closing'       => true,
+            'multiline_whitespace_before_semicolons'  => ['strategy' => 'no_multi_line'],
+            'native_function_casing'                  => true,
+            'native_function_type_declaration_casing' => true,
+            'no_alias_functions'                      => ['sets' => ['@all']],
+            'no_short_bool_cast'                      => true,
+            'no_trailing_comma_in_singleline_array'   => true,
+            'no_unset_cast'                           => true,
+            'no_whitespace_before_comma_in_array'     => ['after_heredoc' => true],
+            'not_operator_with_space'                 => false,
+            'not_operator_with_successor_space'       => true,
+            'normalize_index_brace'                   => true,
+            'ordered_imports'                         => ['sort_algorithm' => 'alpha'],
+            'phpdoc_align'                            => true,
+            'phpdoc_indent'                           => true,
+            'phpdoc_inline_tag_normalizer'            => [
                 'tags' => [
                     'example',
                     'id',

From 1b0fa3507cb25901f40111169bd90a4da2aaf5a1 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 18 Jun 2021 00:57:03 +0800
Subject: [PATCH 0019/2325] All instances created with new keyword must be
 followed by braces.

---
 system/Debug/Toolbar.php                      |  2 +-
 system/Entity/Cast/JsonCast.php               |  2 +-
 system/Test/Mock/MockResult.php               |  2 +-
 .../system/Cache/Handlers/BaseHandlerTest.php |  2 +-
 tests/system/CommonFunctionsTest.php          |  6 +++---
 tests/system/Database/Builder/WhereTest.php   |  2 +-
 tests/system/Database/DatabaseSeederTest.php  |  2 +-
 tests/system/Database/Live/GetTest.php        |  2 +-
 .../Database/Migrations/MigrationTest.php     |  2 +-
 tests/system/EntityTest.php                   | 12 +++++------
 tests/system/HTTP/HeaderTest.php              |  2 +-
 .../system/Images/ImageMagickHandlerTest.php  |  2 +-
 tests/system/Models/GeneralModelTest.php      |  4 ++--
 tests/system/Models/InsertModelTest.php       |  4 ++--
 tests/system/Models/SaveModelTest.php         |  6 +++---
 tests/system/Models/UpdateModelTest.php       |  6 +++---
 .../system/RESTful/ResourceControllerTest.php | 20 +++++++++----------
 tests/system/Router/RouterTest.php            |  2 +-
 tests/system/View/ParserTest.php              |  4 ++--
 utils/PhpCsFixer/CodeIgniter4.php             |  1 +
 20 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index cd870df95b59..1dae2bd08f36 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -475,7 +475,7 @@ protected function format(string $data, string $format = 'html'): string
                 break;
 
             case 'xml':
-                $formatter = new XMLFormatter;
+                $formatter = new XMLFormatter();
                 $output    = $formatter->format($data);
                 break;
         }
diff --git a/system/Entity/Cast/JsonCast.php b/system/Entity/Cast/JsonCast.php
index 2e4c8d13422a..71ec9c7dcf7f 100644
--- a/system/Entity/Cast/JsonCast.php
+++ b/system/Entity/Cast/JsonCast.php
@@ -27,7 +27,7 @@ public static function get($value, array $params = [])
     {
         $associative = in_array('array', $params, true);
 
-        $tmp = ! is_null($value) ? ($associative ? [] : new stdClass) : null;
+        $tmp = ! is_null($value) ? ($associative ? [] : new stdClass()) : null;
 
         if (function_exists('json_decode')
             && (
diff --git a/system/Test/Mock/MockResult.php b/system/Test/Mock/MockResult.php
index 49260c23569a..0a8ec78d9c7f 100644
--- a/system/Test/Mock/MockResult.php
+++ b/system/Test/Mock/MockResult.php
@@ -101,7 +101,7 @@ protected function fetchAssoc()
      */
     protected function fetchObject($className = 'stdClass')
     {
-        return new $className;
+        return new $className();
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Cache/Handlers/BaseHandlerTest.php b/tests/system/Cache/Handlers/BaseHandlerTest.php
index 133c644f1b9e..6a958ebc0366 100644
--- a/tests/system/Cache/Handlers/BaseHandlerTest.php
+++ b/tests/system/Cache/Handlers/BaseHandlerTest.php
@@ -26,7 +26,7 @@ public function invalidTypeProvider(): array
             [false],
             [null],
             [42],
-            [new stdClass],
+            [new stdClass()],
         ];
     }
 
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index fa8a8f82d644..32e3ce357dbb 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -41,12 +41,12 @@ public function testStringifyAttributes()
     {
         $this->assertEquals(' class="foo" id="bar"', stringify_attributes(['class' => 'foo', 'id' => 'bar']));
 
-        $atts        = new stdClass;
+        $atts        = new stdClass();
         $atts->class = 'foo';
         $atts->id    = 'bar';
         $this->assertEquals(' class="foo" id="bar"', stringify_attributes($atts));
 
-        $atts = new stdClass;
+        $atts = new stdClass();
         $this->assertEquals('', stringify_attributes($atts));
 
         $this->assertEquals(' class="foo" id="bar"', stringify_attributes('class="foo" id="bar"'));
@@ -58,7 +58,7 @@ public function testStringifyJsAttributes()
     {
         $this->assertEquals('width=800,height=600', stringify_attributes(['width' => '800', 'height' => '600'], true));
 
-        $atts         = new stdClass;
+        $atts         = new stdClass();
         $atts->width  = 800;
         $atts->height = 600;
         $this->assertEquals('width=800,height=600', stringify_attributes($atts, true));
diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php
index f3f178462d35..e79541d3f04a 100644
--- a/tests/system/Database/Builder/WhereTest.php
+++ b/tests/system/Database/Builder/WhereTest.php
@@ -227,7 +227,7 @@ public function provideInvalidValues()
         return [
             'null'                    => [null],
             'not array'               => ['not array'],
-            'not instanceof \Closure' => [new stdClass],
+            'not instanceof \Closure' => [new stdClass()],
         ];
     }
 
diff --git a/tests/system/Database/DatabaseSeederTest.php b/tests/system/Database/DatabaseSeederTest.php
index a4d45b1be20b..83935c240132 100644
--- a/tests/system/Database/DatabaseSeederTest.php
+++ b/tests/system/Database/DatabaseSeederTest.php
@@ -21,7 +21,7 @@ public function testInstantiateNotDirSeedPath()
     {
         $this->expectException('InvalidArgumentException');
 
-        $config            = new Database;
+        $config            = new Database();
         $config->filesPath = APPPATH . 'Foo';
         new Seeder($config);
     }
diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php
index 51e950af7009..8ca5b95a8273 100644
--- a/tests/system/Database/Live/GetTest.php
+++ b/tests/system/Database/Live/GetTest.php
@@ -239,7 +239,7 @@ public function testGetRowWithReturnType()
 
     public function testGetRowWithCustomReturnType()
     {
-        $testClass = new class { };
+        $testClass = new class() {};
 
         $user = $this->db->table('user')->get()->getRow(0, get_class($testClass));
 
diff --git a/tests/system/Database/Migrations/MigrationTest.php b/tests/system/Database/Migrations/MigrationTest.php
index e3ee51dc8e76..d515695ad60a 100644
--- a/tests/system/Database/Migrations/MigrationTest.php
+++ b/tests/system/Database/Migrations/MigrationTest.php
@@ -17,7 +17,7 @@ public function setUp(): void
 
     public function testDBGroup()
     {
-        $migration             = new class extends Migration {
+        $migration             = new class() extends Migration {
             protected $DBGroup = 'tests';
 
             public function up()
diff --git a/tests/system/EntityTest.php b/tests/system/EntityTest.php
index 29494fc18b0f..8a8fcda8b09e 100644
--- a/tests/system/EntityTest.php
+++ b/tests/system/EntityTest.php
@@ -810,7 +810,7 @@ public function testAsArraySwapped()
 
     public function testToArraySkipAttributesWithUnderscoreInFirstCharacter()
     {
-        $entity                   = new class extends Entity {
+        $entity                   = new class() extends Entity {
             protected $attributes = [
                 '_foo' => null,
                 'bar'  => null,
@@ -979,7 +979,7 @@ public function testJsonSerializableEntity()
 
     protected function getEntity() : Entity
     {
-        return new class extends Entity {
+        return new class() extends Entity {
             protected $attributes = [
                 'foo'        => null,
                 'bar'        => null,
@@ -1019,7 +1019,7 @@ public function getFakeBar()
 
     protected function getMappedEntity() : Entity
     {
-        return new class extends Entity {
+        return new class() extends Entity {
             protected $attributes = [
                 'foo'    => null,
                 'simple' => null,
@@ -1050,7 +1050,7 @@ protected function getSimple()
 
     protected function getSwappedEntity() : Entity
     {
-        return new class extends Entity {
+        return new class() extends Entity {
             protected $attributes = [
                 'foo' => 'foo',
                 'bar' => 'bar',
@@ -1130,7 +1130,7 @@ public function setSeventh($seventh)
 
     protected function getCastNullableEntity() : Entity
     {
-        return new class extends Entity {
+        return new class() extends Entity {
             protected $attributes = [
                 'string_null'           => null,
                 'string_empty'          => null,
@@ -1160,7 +1160,7 @@ protected function getCastNullableEntity() : Entity
 
     protected function getCustomCastEntity() : Entity
     {
-        return new class extends Entity {
+        return new class() extends Entity {
             protected $attributes = [
                 'first'  => null,
                 'second' => null,
diff --git a/tests/system/HTTP/HeaderTest.php b/tests/system/HTTP/HeaderTest.php
index 845757398376..57a2ccd5f35c 100644
--- a/tests/system/HTTP/HeaderTest.php
+++ b/tests/system/HTTP/HeaderTest.php
@@ -156,7 +156,7 @@ public function testHeaderLineSimple()
     public function testHeaderLineValueNotStringOrArray()
     {
         $name  = 'foo';
-        $value = new stdClass;
+        $value = new stdClass();
 
         $expected = '';
 
diff --git a/tests/system/Images/ImageMagickHandlerTest.php b/tests/system/Images/ImageMagickHandlerTest.php
index c9848b33d01e..56a7e2d045bb 100644
--- a/tests/system/Images/ImageMagickHandlerTest.php
+++ b/tests/system/Images/ImageMagickHandlerTest.php
@@ -38,7 +38,7 @@ protected function setUp(): void
 
         $this->path = $this->origin . 'ci-logo.png';
 
-        $handlerConfig              = new Images;
+        $handlerConfig              = new Images();
         $handlerConfig->libraryPath = '/usr/bin/convert';
         $this->handler              = Services::image('imagick', $handlerConfig, false);
     }
diff --git a/tests/system/Models/GeneralModelTest.php b/tests/system/Models/GeneralModelTest.php
index 0b8368ac7060..517b230d343e 100644
--- a/tests/system/Models/GeneralModelTest.php
+++ b/tests/system/Models/GeneralModelTest.php
@@ -98,7 +98,7 @@ public function testSetAllowedFields(): void
             'updated_at',
         ];
 
-        $model                       = new class extends Model {
+        $model                       = new class() extends Model {
             protected $allowedFields = [
                 'id',
                 'created_at',
@@ -141,7 +141,7 @@ public function testBuilderWithParameterIgnoresShared(): void
 
     public function testInitialize(): void
     {
-        $model = new class extends Model {
+        $model = new class() extends Model {
 
             /**
              * @var bool
diff --git a/tests/system/Models/InsertModelTest.php b/tests/system/Models/InsertModelTest.php
index 2b6d3d7fef66..1b2716b06a78 100644
--- a/tests/system/Models/InsertModelTest.php
+++ b/tests/system/Models/InsertModelTest.php
@@ -145,7 +145,7 @@ public function testInsertResultFail(): void
 
     public function testInsertBatchNewEntityWithDateTime(): void
     {
-        $entity = new class extends Entity {
+        $entity = new class() extends Entity {
             protected $id;
             protected $name;
             protected $email;
@@ -203,7 +203,7 @@ public function testInsertEntityWithNoDataExceptionNoAllowedData(): void
     {
         $this->createModel(UserModel::class);
 
-        $entity = new class extends Entity {
+        $entity = new class() extends Entity {
             protected $id;
             protected $name;
             protected $email;
diff --git a/tests/system/Models/SaveModelTest.php b/tests/system/Models/SaveModelTest.php
index ba5c4dbead7c..e1a4e688baee 100644
--- a/tests/system/Models/SaveModelTest.php
+++ b/tests/system/Models/SaveModelTest.php
@@ -196,7 +196,7 @@ public function testEmptySaveData(): void
 
     public function testSaveNewEntityWithDateTime(): void
     {
-        $entity = new class extends Entity {
+        $entity = new class() extends Entity {
             protected $id;
             protected $name;
             protected $email;
@@ -230,7 +230,7 @@ public function testSaveNewEntityWithDateTime(): void
 
     public function testSaveNewEntityWithDate(): void
     {
-        $entity = new class extends Entity {
+        $entity = new class() extends Entity {
             protected $id;
             protected $name;
             protected $created_at;
@@ -246,7 +246,7 @@ public function testSaveNewEntityWithDate(): void
             ];
         };
 
-        $testModel                   = new class extends Model {
+        $testModel                   = new class() extends Model {
             protected $table         = 'empty';
             protected $allowedFields = [
                 'name',
diff --git a/tests/system/Models/UpdateModelTest.php b/tests/system/Models/UpdateModelTest.php
index eeb58cbd60ad..69779acd4e2c 100644
--- a/tests/system/Models/UpdateModelTest.php
+++ b/tests/system/Models/UpdateModelTest.php
@@ -146,7 +146,7 @@ public function testUpdateBatchValidationFail(): void
 
     public function testUpdateBatchWithEntity(): void
     {
-        $entity1 = new class extends Entity {
+        $entity1 = new class() extends Entity {
             protected $id;
             protected $name;
             protected $email;
@@ -166,7 +166,7 @@ public function testUpdateBatchWithEntity(): void
             ];
         };
 
-        $entity2 = new class extends Entity {
+        $entity2 = new class() extends Entity {
             protected $id;
             protected $name;
             protected $email;
@@ -295,7 +295,7 @@ public function testUpdateWithEntityNoAllowedFields(): void
     {
         $this->createModel(UserModel::class);
 
-        $entity = new class extends Entity {
+        $entity = new class() extends Entity {
             protected $id;
             protected $name;
             protected $email;
diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index ceb7b9b19a06..a034cd9f4164 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -274,13 +274,13 @@ public function testJSONFormatOutput()
     {
         $resource = new MockResourceController();
 
-        $config = new App;
-        $uri    = new URI;
-        $agent  = new UserAgent;
+        $config = new App();
+        $uri    = new URI();
+        $agent  = new UserAgent();
 
         $request  = new IncomingRequest($config, $uri, '', $agent);
         $response = new Response($config);
-        $logger   = new NullLogger;
+        $logger   = new NullLogger();
 
         $resource->initController($request, $response, $logger);
         $resource->setFormat('json');
@@ -292,7 +292,7 @@ public function testJSONFormatOutput()
         $theResponse = $resource->respond($data);
         $result      = $theResponse->getBody();
 
-        $JSONFormatter = new JSONFormatter;
+        $JSONFormatter = new JSONFormatter();
         $expected      = $JSONFormatter->format($data);
 
         $this->assertEquals($expected, $result);
@@ -303,13 +303,13 @@ public function testXMLFormatOutput()
     {
         $resource = new MockResourceController();
 
-        $config = new App;
-        $uri    = new URI;
-        $agent  = new UserAgent;
+        $config = new App();
+        $uri    = new URI();
+        $agent  = new UserAgent();
 
         $request  = new IncomingRequest($config, $uri, '', $agent);
         $response = new Response($config);
-        $logger   = new NullLogger;
+        $logger   = new NullLogger();
 
         $resource->initController($request, $response, $logger);
         $resource->setFormat('xml');
@@ -321,7 +321,7 @@ public function testXMLFormatOutput()
         $theResponse = $resource->respond($data);
         $result      = $theResponse->getBody();
 
-        $XMLFormatter = new XMLFormatter;
+        $XMLFormatter = new XMLFormatter();
         $expected     = $XMLFormatter->format($data);
 
         $this->assertEquals($expected, $result);
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index cb1086fa0fa1..671392f47047 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -32,7 +32,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $moduleConfig          = new Modules;
+        $moduleConfig          = new Modules();
         $moduleConfig->enabled = false;
         $this->collection      = new RouteCollection(Services::locator(), $moduleConfig);
 
diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php
index 41d8d3ac99bc..efbd1fddca95 100644
--- a/tests/system/View/ParserTest.php
+++ b/tests/system/View/ParserTest.php
@@ -268,7 +268,7 @@ public function testParseLoopObjectProperties()
 
     public function testParseLoopEntityProperties()
     {
-        $power             = new class extends Entity {
+        $power             = new class() extends Entity {
             public $foo    = 'bar';
             protected $bar = 'baz';
 
@@ -298,7 +298,7 @@ public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recu
 
     public function testParseLoopEntityObjectProperties()
     {
-        $power                    = new class extends Entity {
+        $power                    = new class() extends Entity {
             protected $attributes = [
                 'foo'     => 'bar',
                 'bar'     => 'baz',
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index f030254a32d5..7cd9ad9a9fe5 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -119,6 +119,7 @@ public function __construct()
             'multiline_whitespace_before_semicolons'  => ['strategy' => 'no_multi_line'],
             'native_function_casing'                  => true,
             'native_function_type_declaration_casing' => true,
+            'new_with_braces'                         => true,
             'no_alias_functions'                      => ['sets' => ['@all']],
             'no_short_bool_cast'                      => true,
             'no_trailing_comma_in_singleline_array'   => true,

From 6524cccbd2dbcf69e25a2f6627867782e0a3a11a Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 18 Jun 2021 01:03:41 +0800
Subject: [PATCH 0020/2325] Master language constructs shall be used instead of
 aliases.

---
 spark                             | 2 +-
 system/HTTP/IncomingRequest.php   | 9 ++++-----
 utils/PhpCsFixer/CodeIgniter4.php | 1 +
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spark b/spark
index f8febc9a1fce..9a5a5db90284 100755
--- a/spark
+++ b/spark
@@ -25,7 +25,7 @@ define('SPARKED', true);
 
 // Refuse to run when called from php-cgi
 if (strpos(PHP_SAPI, 'cgi') === 0) {
-    die("The cli tool is not supported when running php-cgi. It needs php-cli to function!\n\n");
+    exit("The cli tool is not supported when running php-cgi. It needs php-cli to function!\n\n");
 }
 
 // Path to the front controller
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index c1362cf8956c..117b613cb2bd 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -440,12 +440,11 @@ public function setPath(string $path, App $config = null)
             if ($config->forceGlobalSecureRequests && $this->uri->getScheme() === 'http') {
                 $this->uri->setScheme('https');
             }
+        } elseif (! is_cli()) {
+            // @codeCoverageIgnoreStart
+            exit('You have an empty or invalid base URL. The baseURL value must be set in Config\App.php, or through the .env file.');
+            // @codeCoverageIgnoreEnd
         }
-        // @codeCoverageIgnoreStart
-        elseif (! is_cli()) {
-            die('You have an empty or invalid base URL. The baseURL value must be set in Config\App.php, or through the .env file.');
-        }
-        // @codeCoverageIgnoreEnd
 
         return $this;
     }
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index f030254a32d5..cf4d87b3e962 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -120,6 +120,7 @@ public function __construct()
             'native_function_casing'                  => true,
             'native_function_type_declaration_casing' => true,
             'no_alias_functions'                      => ['sets' => ['@all']],
+            'no_alias_language_construct_call'        => true,
             'no_short_bool_cast'                      => true,
             'no_trailing_comma_in_singleline_array'   => true,
             'no_unset_cast'                           => true,

From e47a9544c3b7af60928fa6c75d3c1a244b01970b Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sun, 20 Jun 2021 14:15:28 +0700
Subject: [PATCH 0021/2325] [Commands] Remove unused $minPHPVersion property at
 Serve command

---
 system/Commands/Server/Serve.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/system/Commands/Server/Serve.php b/system/Commands/Server/Serve.php
index d578e410c767..04cced6c9c2d 100644
--- a/system/Commands/Server/Serve.php
+++ b/system/Commands/Server/Serve.php
@@ -23,13 +23,6 @@
  */
 class Serve extends BaseCommand
 {
-    /**
-     * Minimum PHP version
-     *
-     * @var string
-     */
-    protected $minPHPVersion = '7.3';
-
     /**
      * Group
      *

From 35f2c4f0634b040f49729a0cdcc8b1a424c22f83 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Wed, 23 Jun 2021 07:51:28 +0700
Subject: [PATCH 0022/2325] Update to latest PHPStan and Rector and Rector
 config compat

---
 composer.json | 4 ++--
 rector.php    | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 79d9f449b108..abea2bb246b0 100644
--- a/composer.json
+++ b/composer.json
@@ -20,10 +20,10 @@
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.1",
         "nexusphp/tachycardia": "^1.0",
-        "phpstan/phpstan": "0.12.88",
+        "phpstan/phpstan": "0.12.90",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.20",
+        "rector/rector": "0.11.21",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {
diff --git a/rector.php b/rector.php
index 892f7f252071..58507aaf2f6e 100644
--- a/rector.php
+++ b/rector.php
@@ -63,7 +63,6 @@
 
     // auto import fully qualified class names
     $parameters->set(Option::AUTO_IMPORT_NAMES, true);
-    $parameters->set(Option::ENABLE_CACHE, true);
     $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_73);
 
     $services = $containerConfigurator->services();

From 3e0c3436d2e4ddc4c4ca9682304944cf792b798f Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Wed, 23 Jun 2021 08:19:54 +0700
Subject: [PATCH 0023/2325] [Rector] Apply Rector: RemoveExtraParametersRector

---
 rector.php                                     | 2 ++
 tests/system/Database/Builder/InsertTest.php   | 2 +-
 tests/system/Database/Builder/UpdateTest.php   | 5 +++--
 tests/system/Helpers/URLHelper/SiteUrlTest.php | 2 +-
 tests/system/Router/RouterTest.php             | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/rector.php b/rector.php
index 58507aaf2f6e..14cd4a81e96d 100644
--- a/rector.php
+++ b/rector.php
@@ -26,6 +26,7 @@
 use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
 use Rector\EarlyReturn\Rector\Return_\PreparedValueToEarlyReturnRector;
 use Rector\Php70\Rector\Ternary\TernaryToNullCoalescingRector;
+use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector;
 use Rector\Php71\Rector\List_\ListToArrayDestructRector;
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
@@ -97,4 +98,5 @@
     $services->set(RemoveVarTagFromClassConstantRector::class);
     $services->set(AddPregQuoteDelimiterRector::class);
     $services->set(SimplifyRegexPatternRector::class);
+    $services->set(RemoveExtraParametersRector::class);
 };
diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php
index 04ef5535fa7a..fef85a606aba 100644
--- a/tests/system/Database/Builder/InsertTest.php
+++ b/tests/system/Database/Builder/InsertTest.php
@@ -117,7 +117,7 @@ public function testInsertBatchThrowsExceptionOnNoData()
     {
         $builder = $this->db->table('jobs');
 
-        $this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException', 'You must use the "set" method to update an entry.');
+        $this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
         $this->expectExceptionMessage('You must use the "set" method to update an entry.');
         $builder->insertBatch();
     }
diff --git a/tests/system/Database/Builder/UpdateTest.php b/tests/system/Database/Builder/UpdateTest.php
index e8c8f1be42a7..107b661b97b1 100644
--- a/tests/system/Database/Builder/UpdateTest.php
+++ b/tests/system/Database/Builder/UpdateTest.php
@@ -91,9 +91,10 @@ public function testUpdateThrowsExceptionWithNoData()
     {
         $builder = new BaseBuilder('jobs', $this->db);
 
-        $this->expectException('CodeIgniter\Database\Exceptions\DatabaseException', 'You must use the "set" method to update an entry.');
+        $this->expectException('CodeIgniter\Database\Exceptions\DatabaseException');
+        $this->expectExceptionMessage('You must use the "set" method to update an entry.');
 
-        $builder->update(null, null, null, true);
+        $builder->update(null, null, null);
     }
 
     public function testUpdateBatch()
diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php
index 86479f45cf2c..4648e9587190 100644
--- a/tests/system/Helpers/URLHelper/SiteUrlTest.php
+++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php
@@ -266,6 +266,6 @@ public function testBaseURLService()
         Services::injectMock('request', $request);
 
         $this->assertEquals('http://example.com/ci/v4/index.php/controller/method', site_url('controller/method', null, $this->config));
-        $this->assertEquals('http://example.com/ci/v4/controller/method', base_url('controller/method', null, $this->config));
+        $this->assertEquals('http://example.com/ci/v4/controller/method', base_url('controller/method', null));
     }
 }
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index 671392f47047..c1ede0f37e34 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -181,7 +181,7 @@ public function testClosures()
     {
         $router = new Router($this->collection, $this->request);
 
-        $router->handle('closure/123/alpha', $this->request);
+        $router->handle('closure/123/alpha');
 
         $closure = $router->controllerName();
 

From 398b329cd71a838e3df99202cbfb065cde138218 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Thu, 24 Jun 2021 15:43:23 +0700
Subject: [PATCH 0024/2325] [Rector] Apply Rector:
 RemoveUnusedVariableAssignRector

---
 rector.php                                            | 2 ++
 tests/system/API/ResponseTraitTest.php                | 2 +-
 tests/system/Cache/Handlers/FileHandlerTest.php       | 1 -
 tests/system/CodeIgniterTest.php                      | 4 ++--
 tests/system/CommonFunctionsSendTest.php              | 2 --
 tests/system/CommonFunctionsTest.php                  | 4 +---
 tests/system/Database/Live/BadQueryTest.php           | 2 +-
 tests/system/Database/Live/DEBugTest.php              | 2 +-
 tests/system/Database/Live/ForgeTest.php              | 2 +-
 tests/system/Database/Live/SQLite/AlterTableTest.php  | 2 +-
 tests/system/Database/Live/UpdateTest.php             | 2 --
 tests/system/Files/FileTest.php                       | 2 +-
 tests/system/HTTP/ContentSecurityPolicyTest.php       | 6 +++---
 tests/system/HTTP/DownloadResponseTest.php            | 2 --
 tests/system/HTTP/ResponseSendTest.php                | 6 ------
 tests/system/HTTP/ResponseTest.php                    | 2 --
 tests/system/HTTP/URITest.php                         | 2 --
 tests/system/Helpers/DateHelperTest.php               | 1 -
 tests/system/Helpers/FilesystemHelperTest.php         | 8 ++++----
 tests/system/Helpers/URLHelper/MiscUrlTest.php        | 1 -
 tests/system/Images/BaseHandlerTest.php               | 2 +-
 tests/system/Images/GDHandlerTest.php                 | 2 +-
 tests/system/Images/ImageTest.php                     | 2 +-
 tests/system/Log/Handlers/ChromeLoggerHandlerTest.php | 2 +-
 tests/system/Router/RouteCollectionTest.php           | 2 +-
 tests/system/Test/ControllerTestTraitTest.php         | 8 ++------
 tests/system/Test/FabricatorTest.php                  | 2 +-
 tests/system/Test/FilterTestTraitTest.php             | 2 +-
 tests/system/Test/TestCaseEmissionsTest.php           | 5 +----
 tests/system/Validation/ValidationTest.php            | 4 ----
 tests/system/View/ParserFilterTest.php                | 2 --
 tests/system/View/ViewTest.php                        | 1 -
 32 files changed, 28 insertions(+), 61 deletions(-)

diff --git a/rector.php b/rector.php
index 14cd4a81e96d..ec64a2c38292 100644
--- a/rector.php
+++ b/rector.php
@@ -17,6 +17,7 @@
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
 use Rector\Core\Configuration\Option;
 use Rector\Core\ValueObject\PhpVersion;
+use Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector;
 use Rector\DeadCode\Rector\Concat\RemoveConcatAutocastRector;
 use Rector\DeadCode\Rector\Foreach_\RemoveUnusedForeachKeyRector;
 use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector;
@@ -99,4 +100,5 @@
     $services->set(AddPregQuoteDelimiterRector::class);
     $services->set(SimplifyRegexPatternRector::class);
     $services->set(RemoveExtraParametersRector::class);
+    $services->set(RemoveUnusedVariableAssignRector::class);
 };
diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
index 8701922e734c..2988fe3e300d 100644
--- a/tests/system/API/ResponseTraitTest.php
+++ b/tests/system/API/ResponseTraitTest.php
@@ -448,7 +448,7 @@ private function tryValidContentType($mimeType, $contentType)
         $original                = $_SERVER;
         $_SERVER['CONTENT_TYPE'] = $mimeType;
 
-        $controller = $this->makeController([], 'http://codeigniter.com', ['Accept' => $mimeType]);
+        $this->makeController([], 'http://codeigniter.com', ['Accept' => $mimeType]);
         $this->assertEquals($mimeType, $this->request->getHeaderLine('Accept'), 'Request header...');
         $this->response->setContentType($contentType);
         $this->assertEquals($contentType, $this->response->getHeaderLine('Content-Type'), 'Response header pre-response...');
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index bb998f930295..d228c51b6028 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -243,7 +243,6 @@ public function testGetMetaData()
 
     public function testGetCacheInfo()
     {
-        $time = time();
         $this->fileHandler->save(self::$key1, 'value');
 
         $actual = $this->fileHandler->getCacheInfo();
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index d67be6d671dd..4511d291c8f3 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -239,7 +239,7 @@ public function testTransfersCorrectHTTPVersion()
 
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run();
-        $output = ob_get_clean();
+        ob_get_clean();
 
         $response = $this->getPrivateProperty($this->codeigniter, 'response');
 
@@ -284,7 +284,7 @@ public function testRunForceSecure()
 
         ob_start();
         $codeigniter->useSafeOutput(true)->run();
-        $output = ob_get_clean();
+        ob_get_clean();
 
         $this->assertEquals('https://example.com/', $response->header('Location')->getValue());
     }
diff --git a/tests/system/CommonFunctionsSendTest.php b/tests/system/CommonFunctionsSendTest.php
index d87828de1f2c..5d09a71e8a45 100644
--- a/tests/system/CommonFunctionsSendTest.php
+++ b/tests/system/CommonFunctionsSendTest.php
@@ -40,8 +40,6 @@ public function testRedirectResponseCookiesSent()
         // send it
         ob_start();
         $response->send();
-
-        $buffer = ob_clean();
         if (ob_get_level() > 0) {
             ob_end_clean();
         }
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 32e3ce357dbb..6a7987100668 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -331,7 +331,7 @@ public function testOldInputArray()
         $_POST    = ['location' => $locations];
 
         $response = new RedirectResponse(new App());
-        $returned = $response->withInput();
+        $response->withInput();
 
         $this->assertEquals($locations, old('location'));
     }
@@ -383,8 +383,6 @@ public function testRedirectResponseCookies1()
     {
         $loginTime = time();
 
-        $response = new Response(new App());
-
         $routes = service('routes');
         $routes->add('user/login', 'Auth::verify', ['as' => 'login']);
 
diff --git a/tests/system/Database/Live/BadQueryTest.php b/tests/system/Database/Live/BadQueryTest.php
index d32d949d9835..d7af31b859d1 100644
--- a/tests/system/Database/Live/BadQueryTest.php
+++ b/tests/system/Database/Live/BadQueryTest.php
@@ -36,7 +36,7 @@ public function testBadQueryDebugTrue()
         $this->setPrivateProperty($this->db, 'DBDebug', true);
         // expect an exception, class and message varies by DBMS
         $this->expectException(Exception::class);
-        $query = $this->db->query('SELECT * FROM table_does_not_exist');
+        $this->db->query('SELECT * FROM table_does_not_exist');
 
         // this code is never executed
     }
diff --git a/tests/system/Database/Live/DEBugTest.php b/tests/system/Database/Live/DEBugTest.php
index dc387f2aa2ab..61bae0c56642 100644
--- a/tests/system/Database/Live/DEBugTest.php
+++ b/tests/system/Database/Live/DEBugTest.php
@@ -18,7 +18,7 @@ public function testDBDebugTrue()
     {
         $this->setPrivateProperty($this->db, 'DBDebug', true);
         $this->expectException('Exception');
-        $result = $this->db->simpleQuery('SELECT * FROM db_error');
+        $this->db->simpleQuery('SELECT * FROM db_error');
     }
 
     public function testDBDebugFalse()
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 1d2e8b004cc3..b07f374b2353 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -573,7 +573,7 @@ public function testAddFields()
 
         $this->forge->addKey('id', true);
         $this->forge->addUniqueKey(['username', 'active']);
-        $create = $this->forge->createTable('forge_test_fields', true);
+        $this->forge->createTable('forge_test_fields', true);
 
         $fieldsNames = $this->db->getFieldNames('forge_test_fields');
         $fieldsData  = $this->db->getFieldData('forge_test_fields');
diff --git a/tests/system/Database/Live/SQLite/AlterTableTest.php b/tests/system/Database/Live/SQLite/AlterTableTest.php
index 113b77aba734..a7286ccd0729 100644
--- a/tests/system/Database/Live/SQLite/AlterTableTest.php
+++ b/tests/system/Database/Live/SQLite/AlterTableTest.php
@@ -208,7 +208,7 @@ public function testProcessCopiesOldData()
 
         $this->seeInDatabase('foo', ['name' => 'George Clinton']);
 
-        $result = $this->table
+        $this->table
             ->fromTable('foo')
             ->dropColumn('name')
             ->run();
diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index 4de6968474b3..b0e51a2e4d02 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -217,8 +217,6 @@ public function testSetWithoutEscape()
             ->set('description', 'name', false)
             ->update();
 
-        $result = $this->db->table('user')->get()->getResultArray();
-
         $this->seeInDatabase('job', [
             'name'        => 'Developer',
             'description' => 'Developer',
diff --git a/tests/system/Files/FileTest.php b/tests/system/Files/FileTest.php
index c954c5b102bb..dfccd4c016c9 100644
--- a/tests/system/Files/FileTest.php
+++ b/tests/system/Files/FileTest.php
@@ -75,6 +75,6 @@ public function testThrowsExceptionIfNotAFile()
     {
         $this->expectException('CodeIgniter\Files\Exceptions\FileNotFoundException');
 
-        $file = new File(SYSTEMPATH . 'Commoner.php', true);
+        new File(SYSTEMPATH . 'Commoner.php', true);
     }
 }
diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php
index 818f9a9e5738..cf08026acf17 100644
--- a/tests/system/HTTP/ContentSecurityPolicyTest.php
+++ b/tests/system/HTTP/ContentSecurityPolicyTest.php
@@ -48,7 +48,7 @@ protected function work(string $parm = 'Hello')
     public function testExistence()
     {
         $this->prepare();
-        $result = $this->work();
+        $this->work();
 
         $this->assertHeaderEmitted('Content-Security-Policy:');
     }
@@ -63,7 +63,7 @@ public function testReportOnly()
     {
         $this->prepare();
         $this->csp->reportOnly(false);
-        $result = $this->work();
+        $this->work();
 
         $this->assertHeaderEmitted('Content-Security-Policy:');
     }
@@ -515,7 +515,7 @@ public function testHeaderIgnoreCase()
     public function testCSPDisabled()
     {
         $this->prepare(false);
-        $result = $this->work();
+        $this->work();
         $this->response->CSP->addStyleSrc('https://example.com');
 
         $this->assertHeaderNotEmitted('content-security-policy', true);
diff --git a/tests/system/HTTP/DownloadResponseTest.php b/tests/system/HTTP/DownloadResponseTest.php
index 96cc8841fdaa..eb0f5ddde0c9 100644
--- a/tests/system/HTTP/DownloadResponseTest.php
+++ b/tests/system/HTTP/DownloadResponseTest.php
@@ -300,8 +300,6 @@ public function testRealOutput()
         // send it
         ob_start();
         $response->send();
-
-        $buffer = ob_clean();
         if (ob_get_level() > 0) {
             ob_end_clean();
         }
diff --git a/tests/system/HTTP/ResponseSendTest.php b/tests/system/HTTP/ResponseSendTest.php
index 261fffeb52c6..e776b3805ad8 100644
--- a/tests/system/HTTP/ResponseSendTest.php
+++ b/tests/system/HTTP/ResponseSendTest.php
@@ -50,8 +50,6 @@ public function testHeadersMissingDate()
         // send it
         ob_start();
         $response->send();
-
-        $buffer = ob_clean();
         if (ob_get_level() > 0) {
             ob_end_clean();
         }
@@ -86,8 +84,6 @@ public function testHeadersWithCSP()
         // send it
         ob_start();
         $response->send();
-
-        $buffer = ob_clean();
         if (ob_get_level() > 0) {
             ob_end_clean();
         }
@@ -125,8 +121,6 @@ public function testRedirectResponseCookies()
         // send it
         ob_start();
         $response->send();
-
-        $buffer = ob_clean();
         if (ob_get_level() > 0) {
             ob_end_clean();
         }
diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php
index d0ad3d4023f8..81ef36a3efdc 100644
--- a/tests/system/HTTP/ResponseTest.php
+++ b/tests/system/HTTP/ResponseTest.php
@@ -245,8 +245,6 @@ public function testSetCacheNoOptions()
     {
         $response = new Response(new App());
 
-        $date = date('r');
-
         $options = [];
 
         $response->setCache($options);
diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php
index 20390c829b29..a392c25e5981 100644
--- a/tests/system/HTTP/URITest.php
+++ b/tests/system/HTTP/URITest.php
@@ -468,8 +468,6 @@ public function testSetQueryThrowsErrorWhenFragmentPresent()
         $url = 'http://example.com/path';
         $uri = new URI($url);
 
-        $expected = 'http://example.com/path?key=value';
-
         $this->expectException(HTTPException::class);
         $uri->setQuery('?key=value#fragment');
     }
diff --git a/tests/system/Helpers/DateHelperTest.php b/tests/system/Helpers/DateHelperTest.php
index 262a2a37bfcc..44d5e1d8592d 100644
--- a/tests/system/Helpers/DateHelperTest.php
+++ b/tests/system/Helpers/DateHelperTest.php
@@ -17,7 +17,6 @@ protected function setUp(): void
 
     public function testNowDefault()
     {
-        $time = new DateTime();
         $this->assertCloseEnough(now(), time());  // close enough
     }
 
diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php
index 9b6a6eba6f55..5b409c0eeede 100644
--- a/tests/system/Helpers/FilesystemHelperTest.php
+++ b/tests/system/Helpers/FilesystemHelperTest.php
@@ -113,7 +113,7 @@ public function testDirectoryMirror()
         // Create a subdirectory
         $this->structure['foo']['bam'] = ['zab' => 'A deep file'];
 
-        $vfs  = vfsStream::setup('root', null, $this->structure);
+        vfsStream::setup('root', null, $this->structure);
         $root = rtrim(vfsStream::url('root') . DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
 
         directory_mirror($root . 'foo', $root . 'boo');
@@ -130,7 +130,7 @@ public function testDirectoryMirrorOverwrites()
         $this->structure['foo']['far'] = 'all your base';
         $this->structure['foo']['faz'] = 'are belong to us';
 
-        $vfs  = vfsStream::setup('root', null, $this->structure);
+        vfsStream::setup('root', null, $this->structure);
         $root = rtrim(vfsStream::url('root') . DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
 
         directory_mirror($root . 'foo', $root . 'boo', true);
@@ -147,7 +147,7 @@ public function testDirectoryMirrorNotOverwrites()
         $this->structure['foo']['far'] = 'all your base';
         $this->structure['foo']['faz'] = 'are belong to us';
 
-        $vfs  = vfsStream::setup('root', null, $this->structure);
+        vfsStream::setup('root', null, $this->structure);
         $root = rtrim(vfsStream::url('root') . DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
 
         directory_mirror($root . 'foo', $root . 'boo', false);
@@ -168,7 +168,7 @@ public function testWriteFileSuccess()
 
     public function testWriteFileFailure()
     {
-        $vfs = vfsStream::setup('root');
+        vfsStream::setup('root');
 
         $this->assertFalse(write_file(vfsStream::url('apple#test.php'), 'Simple'));
     }
diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php
index 2752932482a8..02436c2a905c 100644
--- a/tests/system/Helpers/URLHelper/MiscUrlTest.php
+++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php
@@ -72,7 +72,6 @@ public function testPreviousURLUsesSessionFirst()
     public function testPreviousURLUsesRefererIfNeeded()
     {
         $uri1 = 'http://example.com/one?two';
-        $uri2 = 'http://example.com/two?foo';
 
         $_SERVER['HTTP_REFERER'] = $uri1;
 
diff --git a/tests/system/Images/BaseHandlerTest.php b/tests/system/Images/BaseHandlerTest.php
index ced0f212e6ac..6a3f42cd76c1 100644
--- a/tests/system/Images/BaseHandlerTest.php
+++ b/tests/system/Images/BaseHandlerTest.php
@@ -39,7 +39,7 @@ protected function setUp(): void
         ];
         vfsStream::create($structure);
         // with one of them read only
-        $wont = $this->root->getChild('wontwork')->chmod(0400);
+        $this->root->getChild('wontwork')->chmod(0400);
 
         // for VFS tests
         $this->start = $this->root->url() . '/';
diff --git a/tests/system/Images/GDHandlerTest.php b/tests/system/Images/GDHandlerTest.php
index a04a4126cbc9..3a9cc6b4efb5 100644
--- a/tests/system/Images/GDHandlerTest.php
+++ b/tests/system/Images/GDHandlerTest.php
@@ -37,7 +37,7 @@ protected function setUp(): void
         ];
         vfsStream::create($structure);
         // with one of them read only
-        $wont = $this->root->getChild('wontwork')->chmod(0400);
+        $this->root->getChild('wontwork')->chmod(0400);
 
         $this->start = $this->root->url() . '/';
 
diff --git a/tests/system/Images/ImageTest.php b/tests/system/Images/ImageTest.php
index 44d150e2569b..e4ac95960c8b 100644
--- a/tests/system/Images/ImageTest.php
+++ b/tests/system/Images/ImageTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
         ];
         vfsStream::create($structure);
         // with one of them read only
-        $wont = $this->root->getChild('wontwork')->chmod(0400);
+        $this->root->getChild('wontwork')->chmod(0400);
 
         $this->start = $this->root->url() . '/';
 
diff --git a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
index 032cf94de20e..297808d0ab81 100644
--- a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
+++ b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
@@ -72,7 +72,7 @@ public function testChromeLoggerHeaderSent()
         $data              = new stdClass();
         $data->code        = 123;
         $data->explanation = "That's no moon, it's a pumpkin";
-        $result            = $logger->setDateFormat('F j, Y');
+        $logger->setDateFormat('F j, Y');
 
         $logger->handle('warning', $data);
 
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index d869faf13391..bd8deeea9f6e 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -874,7 +874,7 @@ public function testReverseRoutingThrowsExceptionWithBadParamTypes()
         $routes->add('path/(:any)/to/(:num)', 'myController::goto/$1/$2');
 
         $this->expectException(RouterException::class);
-        $match = $routes->reverseRoute('myController::goto', 13, 'string');
+        $routes->reverseRoute('myController::goto', 13, 'string');
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Test/ControllerTestTraitTest.php b/tests/system/Test/ControllerTestTraitTest.php
index e93089fba25f..5933140925f1 100644
--- a/tests/system/Test/ControllerTestTraitTest.php
+++ b/tests/system/Test/ControllerTestTraitTest.php
@@ -25,7 +25,7 @@ public function testBadController()
     {
         $this->expectException(InvalidArgumentException::class);
         $logger = new Logger(new LoggerConfig());
-        $result = $this->withURI('http://example.com')
+        $this->withURI('http://example.com')
             ->withLogger($logger)
             ->controller(NeverHeardOfIt::class)
             ->execute('index');
@@ -35,7 +35,7 @@ public function testBadControllerMethod()
     {
         $this->expectException(InvalidArgumentException::class);
         $logger = new Logger(new LoggerConfig());
-        $result = $this->withURI('http://example.com')
+        $this->withURI('http://example.com')
             ->withLogger($logger)
             ->controller(Home::class)
             ->execute('nothere');
@@ -49,7 +49,6 @@ public function testController()
             ->controller(Home::class)
             ->execute('index');
 
-        $body = $result->response()->getBody();
         $this->assertTrue($result->isOK());
     }
 
@@ -59,7 +58,6 @@ public function testControllerWithoutLogger()
             ->controller(Home::class)
             ->execute('index');
 
-        $body = $result->response()->getBody();
         $this->assertTrue($result->isOK());
     }
 
@@ -71,7 +69,6 @@ public function testPopcornIndex()
             ->controller(Popcorn::class)
             ->execute('index');
 
-        $body = $result->response()->getBody();
         $this->assertTrue($result->isOK());
     }
 
@@ -222,7 +219,6 @@ public function testControllerNoURI()
             ->controller(Home::class)
             ->execute('index');
 
-        $body = $result->response()->getBody();
         $this->assertTrue($result->isOK());
     }
 
diff --git a/tests/system/Test/FabricatorTest.php b/tests/system/Test/FabricatorTest.php
index 9db734c9d516..4ff7955f0441 100644
--- a/tests/system/Test/FabricatorTest.php
+++ b/tests/system/Test/FabricatorTest.php
@@ -55,7 +55,7 @@ public function testConstructorWithInvalid()
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage(lang('Fabricator.invalidModel'));
 
-        $fabricator = new Fabricator('SillyRabbit\Models\AreForKids');
+        new Fabricator('SillyRabbit\Models\AreForKids');
     }
 
     public function testConstructorSetsFormatters()
diff --git a/tests/system/Test/FilterTestTraitTest.php b/tests/system/Test/FilterTestTraitTest.php
index 773a0b08361a..9df20bdd798d 100644
--- a/tests/system/Test/FilterTestTraitTest.php
+++ b/tests/system/Test/FilterTestTraitTest.php
@@ -54,7 +54,7 @@ public function testGetCallerInvalidPosition()
         $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage('Invalid filter position passed: banana');
 
-        $caller = $this->getFilterCaller('test-customfilter', 'banana');
+        $this->getFilterCaller('test-customfilter', 'banana');
     }
 
     public function testCallerUsesClonedInstance()
diff --git a/tests/system/Test/TestCaseEmissionsTest.php b/tests/system/Test/TestCaseEmissionsTest.php
index 9e2e45b92a28..4bacbb2b9faf 100644
--- a/tests/system/Test/TestCaseEmissionsTest.php
+++ b/tests/system/Test/TestCaseEmissionsTest.php
@@ -49,8 +49,6 @@ public function testHeadersEmitted()
         // send it
         ob_start();
         $response->send();
-
-        $buffer = ob_clean();
         if (ob_get_level() > 0) {
             ob_end_clean();
         }
@@ -81,8 +79,7 @@ public function testHeadersNotEmitted()
 
         // send it
         ob_start();
-        $response->send();
-        $output = ob_clean(); // what really was sent
+        $response->send(); // what really was sent
         if (ob_get_level() > 0) {
             ob_end_clean();
         }
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index 8883e55a4d27..40f2a3d92447 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -451,10 +451,6 @@ public function testRawInput()
         $config->baseURL = 'http://example.com/';
 
         $request = new IncomingRequest($config, new URI(), $rawstring, new UserAgent());
-
-        $rules = [
-            'role' => 'required|min_length[5]',
-        ];
         $this->validation->withRequest($request->withMethod('patch'))->run($data);
         $this->assertEquals([], $this->validation->getErrors());
     }
diff --git a/tests/system/View/ParserFilterTest.php b/tests/system/View/ParserFilterTest.php
index d2b9f001c420..050fe7d5b89a 100644
--- a/tests/system/View/ParserFilterTest.php
+++ b/tests/system/View/ParserFilterTest.php
@@ -85,8 +85,6 @@ public function testDate()
     public function testDateModify()
     {
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
-
-        $today     = date('Y-m-d');
         $tommorrow = date('Y-m-d', strtotime('+1 day'));
 
         $data = [
diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php
index 1e65901efd08..351deb622475 100644
--- a/tests/system/View/ViewTest.php
+++ b/tests/system/View/ViewTest.php
@@ -328,7 +328,6 @@ public function testRenderLayoutWithInclude()
         $view = new View($this->config, $this->viewsDir, $this->loader);
 
         $view->setVar('testString', 'Hello World');
-        $expected = "<p>Open</p>\n<h1>Hello World</h1>";
 
         $content = $view->render('extend_include');
 

From 625be30564412f265c77685e6496d8dc70247059 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Jun 2021 15:32:52 +0000
Subject: [PATCH 0025/2325] Update rector/rector requirement from 0.11.21 to
 0.11.23 (#4869)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index abea2bb246b0..acdcaa2cbd15 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "phpstan/phpstan": "0.12.90",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.21",
+        "rector/rector": "0.11.23",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {

From 7e4e56c72a184fa89dc679d3a0f169159946e33b Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Fri, 25 Jun 2021 22:27:37 +0800
Subject: [PATCH 0026/2325] Test classes should be marked as final and internal

---
 admin/module/tests/_support/DatabaseTestCase.php    |  5 ++++-
 admin/module/tests/_support/SessionTestCase.php     |  5 ++++-
 admin/module/tests/database/ExampleDatabaseTest.php |  5 ++++-
 admin/module/tests/session/ExampleSessionTest.php   |  5 ++++-
 admin/module/tests/unit/ExampleTest.php             |  5 ++++-
 admin/starter/tests/_support/DatabaseTestCase.php   |  5 ++++-
 admin/starter/tests/_support/SessionTestCase.php    |  5 ++++-
 .../starter/tests/database/ExampleDatabaseTest.php  |  5 ++++-
 admin/starter/tests/session/ExampleSessionTest.php  |  5 ++++-
 admin/starter/tests/unit/HealthTest.php             |  5 ++++-
 system/Test/FeatureTestCase.php                     |  4 ++++
 system/Test/TestResponse.php                        |  4 ++++
 tests/system/API/ResponseTraitTest.php              |  5 ++++-
 tests/system/Autoloader/AutoloaderTest.php          |  5 ++++-
 tests/system/Autoloader/FileLocatorTest.php         |  5 ++++-
 tests/system/CLI/CLITest.php                        |  3 +++
 tests/system/CLI/CommandRunnerTest.php              |  3 +++
 tests/system/CLI/ConsoleTest.php                    |  5 ++++-
 tests/system/Cache/CacheFactoryTest.php             |  5 ++++-
 tests/system/Cache/Handlers/BaseHandlerTest.php     |  5 ++++-
 tests/system/Cache/Handlers/DummyHandlerTest.php    |  5 ++++-
 tests/system/Cache/Handlers/FileHandlerTest.php     |  3 +++
 .../system/Cache/Handlers/MemcachedHandlerTest.php  |  3 +++
 tests/system/Cache/Handlers/PredisHandlerTest.php   |  3 +++
 tests/system/Cache/Handlers/RedisHandlerTest.php    |  3 +++
 tests/system/CodeIgniterTest.php                    |  4 +++-
 tests/system/Commands/BaseCommandTest.php           |  5 ++++-
 tests/system/Commands/ClearCacheTest.php            |  5 ++++-
 tests/system/Commands/ClearDebugbarTest.php         |  5 ++++-
 tests/system/Commands/ClearLogsTest.php             |  5 ++++-
 tests/system/Commands/CommandTest.php               |  5 ++++-
 tests/system/Commands/ConfigGeneratorTest.php       |  5 ++++-
 .../system/Commands/ConfigurableSortImportsTest.php |  5 ++++-
 tests/system/Commands/ControllerGeneratorTest.php   |  5 ++++-
 tests/system/Commands/CreateDatabaseTest.php        |  5 ++++-
 tests/system/Commands/DatabaseCommandsTest.php      |  5 ++++-
 tests/system/Commands/EntityGeneratorTest.php       |  5 ++++-
 tests/system/Commands/EnvironmentCommandTest.php    |  3 +++
 tests/system/Commands/FilterGeneratorTest.php       |  5 ++++-
 tests/system/Commands/GenerateKeyTest.php           |  5 ++++-
 tests/system/Commands/GeneratorsTest.php            |  5 ++++-
 tests/system/Commands/HelpCommandTest.php           |  5 ++++-
 tests/system/Commands/InfoCacheTest.php             |  5 ++++-
 tests/system/Commands/MigrationGeneratorTest.php    |  5 ++++-
 tests/system/Commands/ModelGeneratorTest.php        |  5 ++++-
 tests/system/Commands/ScaffoldGeneratorTest.php     |  5 ++++-
 tests/system/Commands/SeederGeneratorTest.php       |  5 ++++-
 tests/system/Commands/SessionsCommandsTest.php      |  5 ++++-
 tests/system/Commands/ValidationGeneratorTest.php   |  5 ++++-
 tests/system/CommonFunctionsSendTest.php            |  5 ++++-
 tests/system/CommonFunctionsTest.php                |  4 +++-
 tests/system/CommonSingleServiceTest.php            |  3 +++
 tests/system/Config/BaseConfigTest.php              |  5 ++++-
 tests/system/Config/ConfigTest.php                  |  5 ++++-
 tests/system/Config/DotEnvTest.php                  |  4 +++-
 tests/system/Config/FactoriesTest.php               |  5 ++++-
 tests/system/Config/MimesTest.php                   |  5 ++++-
 tests/system/Config/ServicesTest.php                |  5 ++++-
 tests/system/ControllerTest.php                     |  4 +++-
 tests/system/Database/BaseConnectionTest.php        |  5 ++++-
 tests/system/Database/BaseQueryTest.php             |  5 ++++-
 tests/system/Database/Builder/AliasTest.php         |  5 ++++-
 tests/system/Database/Builder/BaseTest.php          |  5 ++++-
 tests/system/Database/Builder/CountTest.php         |  5 ++++-
 tests/system/Database/Builder/DeleteTest.php        |  5 ++++-
 tests/system/Database/Builder/DistinctTest.php      |  5 ++++-
 tests/system/Database/Builder/EmptyTest.php         |  5 ++++-
 tests/system/Database/Builder/FromTest.php          |  5 ++++-
 tests/system/Database/Builder/GetTest.php           |  5 ++++-
 tests/system/Database/Builder/GroupTest.php         |  5 ++++-
 tests/system/Database/Builder/InsertTest.php        |  5 ++++-
 tests/system/Database/Builder/JoinTest.php          |  5 ++++-
 tests/system/Database/Builder/LikeTest.php          |  5 ++++-
 tests/system/Database/Builder/LimitTest.php         |  5 ++++-
 tests/system/Database/Builder/OrderTest.php         |  5 ++++-
 tests/system/Database/Builder/PrefixTest.php        |  5 ++++-
 tests/system/Database/Builder/ReplaceTest.php       |  5 ++++-
 tests/system/Database/Builder/SelectTest.php        |  5 ++++-
 tests/system/Database/Builder/TruncateTest.php      |  5 ++++-
 tests/system/Database/Builder/UpdateTest.php        |  5 ++++-
 tests/system/Database/Builder/WhereTest.php         |  5 ++++-
 tests/system/Database/ConfigTest.php                |  5 ++++-
 tests/system/Database/DatabaseSeederTest.php        |  5 ++++-
 .../DatabaseTestCaseMigrationOnce1Test.php          |  4 +++-
 .../DatabaseTestCaseMigrationOnce2Test.php          |  4 +++-
 tests/system/Database/DatabaseTestCaseTest.php      |  4 +++-
 tests/system/Database/Live/AliasTest.php            |  4 +++-
 tests/system/Database/Live/BadQueryTest.php         |  4 +++-
 tests/system/Database/Live/ConnectTest.php          |  4 +++-
 tests/system/Database/Live/CountTest.php            |  4 +++-
 tests/system/Database/Live/DEBugTest.php            |  4 +++-
 .../Database/Live/DatabaseTestTraitCaseTest.php     |  4 +++-
 tests/system/Database/Live/DbUtilsTest.php          |  4 +++-
 tests/system/Database/Live/DeleteTest.php           |  4 +++-
 tests/system/Database/Live/EmptyTest.php            |  4 +++-
 tests/system/Database/Live/EscapeTest.php           |  4 +++-
 tests/system/Database/Live/FabricatorLiveTest.php   |  4 +++-
 tests/system/Database/Live/ForgeTest.php            |  4 +++-
 tests/system/Database/Live/FromTest.php             |  4 +++-
 tests/system/Database/Live/GetNumRowsTest.php       |  5 ++++-
 tests/system/Database/Live/GetTest.php              |  4 +++-
 tests/system/Database/Live/GroupTest.php            |  4 +++-
 tests/system/Database/Live/IncrementTest.php        |  4 +++-
 tests/system/Database/Live/InsertTest.php           |  4 +++-
 tests/system/Database/Live/JoinTest.php             |  4 +++-
 tests/system/Database/Live/LikeTest.php             |  4 +++-
 tests/system/Database/Live/LimitTest.php            |  4 +++-
 tests/system/Database/Live/MetadataTest.php         |  4 +++-
 tests/system/Database/Live/OrderTest.php            |  4 +++-
 tests/system/Database/Live/PreparedQueryTest.php    |  4 +++-
 tests/system/Database/Live/PretendTest.php          |  4 +++-
 .../system/Database/Live/SQLite/AlterTableTest.php  |  4 +++-
 tests/system/Database/Live/SelectTest.php           |  4 +++-
 tests/system/Database/Live/UpdateTest.php           |  4 +++-
 tests/system/Database/Live/WhereTest.php            |  4 +++-
 tests/system/Database/Live/WriteTypeQueryTest.php   |  4 +++-
 .../Database/Migrations/MigrationRunnerTest.php     |  4 +++-
 tests/system/Database/Migrations/MigrationTest.php  |  5 ++++-
 tests/system/Database/ModelFactoryTest.php          |  5 ++++-
 tests/system/Debug/ExceptionsTest.php               |  5 ++++-
 tests/system/Debug/TimerTest.php                    |  3 +++
 tests/system/DebugTraceableTraitTest.php            |  8 +++++---
 tests/system/Email/EmailTest.php                    |  5 ++++-
 tests/system/Encryption/EncryptionTest.php          |  5 ++++-
 .../Encryption/Handlers/OpenSSLHandlerTest.php      |  5 ++++-
 .../Encryption/Handlers/SodiumHandlerTest.php       |  5 ++++-
 tests/system/EntityTest.php                         |  5 ++++-
 tests/system/Events/EventsTest.php                  |  5 ++++-
 tests/system/Files/FileTest.php                     |  5 ++++-
 tests/system/Files/FileWithVfsTest.php              |  5 ++++-
 tests/system/Filters/CSRFTest.php                   |  4 +++-
 tests/system/Filters/DebugToolbarTest.php           |  4 +++-
 tests/system/Filters/FiltersTest.php                |  4 +++-
 tests/system/Filters/HoneypotTest.php               |  4 +++-
 tests/system/Format/FormatTest.php                  |  5 ++++-
 tests/system/Format/JSONFormatterTest.php           |  5 ++++-
 tests/system/Format/XMLFormatterTest.php            |  5 ++++-
 tests/system/HTTP/CLIRequestTest.php                |  4 +++-
 tests/system/HTTP/CURLRequestTest.php               |  5 ++++-
 tests/system/HTTP/ContentSecurityPolicyTest.php     |  4 +++-
 tests/system/HTTP/DownloadResponseTest.php          |  5 ++++-
 tests/system/HTTP/Files/FileCollectionTest.php      |  5 ++++-
 tests/system/HTTP/Files/FileMovingTest.php          |  5 ++++-
 tests/system/HTTP/HeaderTest.php                    |  5 ++++-
 tests/system/HTTP/IncomingRequestDetectingTest.php  |  4 +++-
 tests/system/HTTP/IncomingRequestTest.php           |  4 +++-
 tests/system/HTTP/MessageTest.php                   |  5 ++++-
 tests/system/HTTP/NegotiateTest.php                 |  5 ++++-
 tests/system/HTTP/RedirectResponseTest.php          |  5 ++++-
 tests/system/HTTP/RequestTest.php                   |  4 +++-
 tests/system/HTTP/ResponseSendTest.php              |  4 +++-
 tests/system/HTTP/ResponseTest.php                  |  5 ++++-
 tests/system/HTTP/URITest.php                       |  4 +++-
 tests/system/HTTP/UserAgentTest.php                 |  5 ++++-
 tests/system/Helpers/ArrayHelperTest.php            |  5 ++++-
 tests/system/Helpers/CookieHelperTest.php           |  3 +++
 tests/system/Helpers/DateHelperTest.php             |  3 +++
 tests/system/Helpers/FilesystemHelperTest.php       |  5 ++++-
 tests/system/Helpers/FormHelperTest.php             |  5 ++++-
 tests/system/Helpers/HTMLHelperTest.php             |  3 +++
 tests/system/Helpers/InflectorHelperTest.php        |  3 +++
 tests/system/Helpers/NumberHelperTest.php           |  3 +++
 tests/system/Helpers/SecurityHelperTest.php         |  5 ++++-
 tests/system/Helpers/TextHelperTest.php             |  5 ++++-
 tests/system/Helpers/URLHelper/CurrentUrlTest.php   |  2 ++
 tests/system/Helpers/URLHelper/MiscUrlTest.php      |  2 ++
 tests/system/Helpers/URLHelper/SiteUrlTest.php      |  2 ++
 tests/system/Helpers/XMLHelperTest.php              |  5 ++++-
 tests/system/HomeTest.php                           |  5 ++++-
 tests/system/Honeypot/HoneypotTest.php              |  4 +++-
 tests/system/I18n/TimeDifferenceTest.php            |  5 ++++-
 tests/system/I18n/TimeTest.php                      |  5 ++++-
 tests/system/Images/BaseHandlerTest.php             |  4 +++-
 tests/system/Images/GDHandlerTest.php               |  4 +++-
 tests/system/Images/ImageMagickHandlerTest.php      |  4 +++-
 tests/system/Images/ImageTest.php                   |  5 ++++-
 tests/system/Language/LanguageTest.php              |  5 ++++-
 .../system/Log/Handlers/ChromeLoggerHandlerTest.php |  5 ++++-
 tests/system/Log/Handlers/ErrorlogHandlerTest.php   |  3 +++
 tests/system/Log/Handlers/FileHandlerTest.php       |  5 ++++-
 tests/system/Log/LoggerTest.php                     |  5 ++++-
 tests/system/Models/CountAllModelTest.php           |  3 +++
 tests/system/Models/DeleteModelTest.php             |  3 +++
 tests/system/Models/EventsModelTest.php             |  3 +++
 tests/system/Models/FindModelTest.php               |  3 +++
 tests/system/Models/GeneralModelTest.php            |  2 ++
 tests/system/Models/InsertModelTest.php             |  3 +++
 tests/system/Models/MiscellaneousModelTest.php      |  3 +++
 tests/system/Models/PaginateModelTest.php           |  3 +++
 tests/system/Models/SaveModelTest.php               |  3 +++
 tests/system/Models/UpdateModelTest.php             |  3 +++
 tests/system/Models/ValidationModelTest.php         |  3 +++
 tests/system/Pager/PagerRendererTest.php            |  5 ++++-
 tests/system/Pager/PagerTest.php                    |  4 +++-
 tests/system/RESTful/ResourceControllerTest.php     |  4 +++-
 tests/system/RESTful/ResourcePresenterTest.php      |  4 +++-
 tests/system/Router/RouteCollectionTest.php         |  4 +++-
 tests/system/Router/RouterTest.php                  |  5 ++++-
 tests/system/Security/SecurityTest.php              |  4 +++-
 tests/system/Session/SessionTest.php                |  4 +++-
 tests/system/Test/BootstrapFCPATHTest.php           |  4 +++-
 tests/system/Test/ControllerTestTraitTest.php       |  4 +++-
 tests/system/Test/DOMParserTest.php                 |  5 ++++-
 tests/system/Test/FabricatorTest.php                |  5 ++++-
 tests/system/Test/FeatureTestTraitTest.php          |  4 +++-
 tests/system/Test/FilterTestTraitTest.php           |  4 +++-
 tests/system/Test/ReflectionHelperTest.php          |  5 ++++-
 tests/system/Test/TestCaseEmissionsTest.php         |  4 +++-
 tests/system/Test/TestCaseTest.php                  |  5 ++++-
 tests/system/Test/TestResponseTest.php              |  5 ++++-
 tests/system/Throttle/ThrottleTest.php              |  5 ++++-
 tests/system/Typography/TypographyTest.php          |  5 ++++-
 tests/system/Validation/CreditCardRulesTest.php     |  5 ++++-
 tests/system/Validation/FileRulesTest.php           |  5 ++++-
 tests/system/Validation/FormatRulesTest.php         |  5 ++++-
 tests/system/Validation/RulesTest.php               |  5 ++++-
 tests/system/View/CellTest.php                      |  5 ++++-
 tests/system/View/ParserFilterTest.php              |  7 +++++--
 tests/system/View/ParserPluginTest.php              |  5 ++++-
 tests/system/View/ParserTest.php                    |  5 ++++-
 tests/system/View/TableTest.php                     |  5 ++++-
 tests/system/View/ViewTest.php                      |  5 ++++-
 utils/PhpCsFixer/CodeIgniter4.php                   | 13 ++++++++++---
 223 files changed, 804 insertions(+), 197 deletions(-)

diff --git a/admin/module/tests/_support/DatabaseTestCase.php b/admin/module/tests/_support/DatabaseTestCase.php
index ac6bf7d3bf9c..ff2eaf13cf1f 100644
--- a/admin/module/tests/_support/DatabaseTestCase.php
+++ b/admin/module/tests/_support/DatabaseTestCase.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
-class DatabaseTestCase extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class DatabaseTestCase extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/admin/module/tests/_support/SessionTestCase.php b/admin/module/tests/_support/SessionTestCase.php
index 404299865cae..a33e1e656707 100644
--- a/admin/module/tests/_support/SessionTestCase.php
+++ b/admin/module/tests/_support/SessionTestCase.php
@@ -7,7 +7,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockSession;
 
-class SessionTestCase extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class SessionTestCase extends CIUnitTestCase
 {
     /**
      * @var SessionInterface
diff --git a/admin/module/tests/database/ExampleDatabaseTest.php b/admin/module/tests/database/ExampleDatabaseTest.php
index 5934961c1d78..96fabd09b5dc 100644
--- a/admin/module/tests/database/ExampleDatabaseTest.php
+++ b/admin/module/tests/database/ExampleDatabaseTest.php
@@ -2,7 +2,10 @@
 
 use Tests\Support\Models\ExampleModel;
 
-class ExampleDatabaseTest extends \Tests\Support\DatabaseTestCase
+/**
+ * @internal
+ */
+final class ExampleDatabaseTest extends \Tests\Support\DatabaseTestCase
 {
     public function setUp(): void
     {
diff --git a/admin/module/tests/session/ExampleSessionTest.php b/admin/module/tests/session/ExampleSessionTest.php
index b0a91214dea8..97181c41c7a4 100644
--- a/admin/module/tests/session/ExampleSessionTest.php
+++ b/admin/module/tests/session/ExampleSessionTest.php
@@ -1,6 +1,9 @@
 <?php
 
-class ExampleSessionTest extends \Tests\Support\SessionTestCase
+/**
+ * @internal
+ */
+final class ExampleSessionTest extends \Tests\Support\SessionTestCase
 {
     public function setUp(): void
     {
diff --git a/admin/module/tests/unit/ExampleTest.php b/admin/module/tests/unit/ExampleTest.php
index 042354ef3cac..e13a1a6c6a0f 100644
--- a/admin/module/tests/unit/ExampleTest.php
+++ b/admin/module/tests/unit/ExampleTest.php
@@ -1,6 +1,9 @@
 <?php
 
-class ExampleTest extends \CodeIgniter\Test\CIUnitTestCase
+/**
+ * @internal
+ */
+final class ExampleTest extends \CodeIgniter\Test\CIUnitTestCase
 {
     public function setUp(): void
     {
diff --git a/admin/starter/tests/_support/DatabaseTestCase.php b/admin/starter/tests/_support/DatabaseTestCase.php
index ac6bf7d3bf9c..ff2eaf13cf1f 100644
--- a/admin/starter/tests/_support/DatabaseTestCase.php
+++ b/admin/starter/tests/_support/DatabaseTestCase.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
-class DatabaseTestCase extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class DatabaseTestCase extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/admin/starter/tests/_support/SessionTestCase.php b/admin/starter/tests/_support/SessionTestCase.php
index 404299865cae..a33e1e656707 100644
--- a/admin/starter/tests/_support/SessionTestCase.php
+++ b/admin/starter/tests/_support/SessionTestCase.php
@@ -7,7 +7,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockSession;
 
-class SessionTestCase extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class SessionTestCase extends CIUnitTestCase
 {
     /**
      * @var SessionInterface
diff --git a/admin/starter/tests/database/ExampleDatabaseTest.php b/admin/starter/tests/database/ExampleDatabaseTest.php
index 5934961c1d78..96fabd09b5dc 100644
--- a/admin/starter/tests/database/ExampleDatabaseTest.php
+++ b/admin/starter/tests/database/ExampleDatabaseTest.php
@@ -2,7 +2,10 @@
 
 use Tests\Support\Models\ExampleModel;
 
-class ExampleDatabaseTest extends \Tests\Support\DatabaseTestCase
+/**
+ * @internal
+ */
+final class ExampleDatabaseTest extends \Tests\Support\DatabaseTestCase
 {
     public function setUp(): void
     {
diff --git a/admin/starter/tests/session/ExampleSessionTest.php b/admin/starter/tests/session/ExampleSessionTest.php
index b0a91214dea8..97181c41c7a4 100644
--- a/admin/starter/tests/session/ExampleSessionTest.php
+++ b/admin/starter/tests/session/ExampleSessionTest.php
@@ -1,6 +1,9 @@
 <?php
 
-class ExampleSessionTest extends \Tests\Support\SessionTestCase
+/**
+ * @internal
+ */
+final class ExampleSessionTest extends \Tests\Support\SessionTestCase
 {
     public function setUp(): void
     {
diff --git a/admin/starter/tests/unit/HealthTest.php b/admin/starter/tests/unit/HealthTest.php
index e13c358832ee..fc0fb33c9ae2 100644
--- a/admin/starter/tests/unit/HealthTest.php
+++ b/admin/starter/tests/unit/HealthTest.php
@@ -2,7 +2,10 @@
 
 use Config\Services;
 
-class HealthTest extends \CodeIgniter\Test\CIUnitTestCase
+/**
+ * @internal
+ */
+final class HealthTest extends \CodeIgniter\Test\CIUnitTestCase
 {
     public function setUp(): void
     {
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index 253a896bb3e0..409f9f839e39 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -29,9 +29,13 @@
  * Provides a base class with the trait for doing full HTTP testing
  * against your application.
  *
+ * @no-final
+ *
  * @deprecated Use FeatureTestTrait instead
  *
  * @codeCoverageIgnore
+ *
+ * @internal
  */
 class FeatureTestCase extends CIUnitTestCase
 {
diff --git a/system/Test/TestResponse.php b/system/Test/TestResponse.php
index 83e2b84b82f6..ca7cf5d72f29 100644
--- a/system/Test/TestResponse.php
+++ b/system/Test/TestResponse.php
@@ -23,6 +23,10 @@
  *
  * Consolidated response processing
  * for test results.
+ *
+ * @no-final
+ *
+ * @internal
  */
 class TestResponse extends TestCase
 {
diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
index 2988fe3e300d..5cdc0c6e4d8c 100644
--- a/tests/system/API/ResponseTraitTest.php
+++ b/tests/system/API/ResponseTraitTest.php
@@ -12,7 +12,10 @@
 use Config\App;
 use stdClass;
 
-class ResponseTraitTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ResponseTraitTest extends CIUnitTestCase
 {
     protected $request;
     protected $response;
diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php
index b321a4922334..b84ca000f1d0 100644
--- a/tests/system/Autoloader/AutoloaderTest.php
+++ b/tests/system/Autoloader/AutoloaderTest.php
@@ -8,7 +8,10 @@
 use Config\Services;
 use UnnamespacedClass;
 
-class AutoloaderTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class AutoloaderTest extends CIUnitTestCase
 {
     /**
      * @var Autoloader
diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php
index 7b7b45b472d7..52f22945b269 100644
--- a/tests/system/Autoloader/FileLocatorTest.php
+++ b/tests/system/Autoloader/FileLocatorTest.php
@@ -6,7 +6,10 @@
 use Config\Autoload;
 use Config\Modules;
 
-class FileLocatorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FileLocatorTest extends CIUnitTestCase
 {
     /**
      * @var FileLocator
diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php
index f5f621f237ed..7f89d6bd40cb 100644
--- a/tests/system/CLI/CLITest.php
+++ b/tests/system/CLI/CLITest.php
@@ -6,6 +6,9 @@
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 use ReflectionProperty;
 
+/**
+ * @internal
+ */
 final class CLITest extends CIUnitTestCase
 {
     private $stream_filter;
diff --git a/tests/system/CLI/CommandRunnerTest.php b/tests/system/CLI/CommandRunnerTest.php
index 40b07a0a45ff..ab5302341e93 100644
--- a/tests/system/CLI/CommandRunnerTest.php
+++ b/tests/system/CLI/CommandRunnerTest.php
@@ -7,6 +7,9 @@
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 use Config\Services;
 
+/**
+ * @internal
+ */
 final class CommandRunnerTest extends CIUnitTestCase
 {
     /**
diff --git a/tests/system/CLI/ConsoleTest.php b/tests/system/CLI/ConsoleTest.php
index 8583d69ef37b..fca3093064b3 100644
--- a/tests/system/CLI/ConsoleTest.php
+++ b/tests/system/CLI/ConsoleTest.php
@@ -10,7 +10,10 @@
 use CodeIgniter\Test\Mock\MockCLIConfig;
 use CodeIgniter\Test\Mock\MockCodeIgniter;
 
-class ConsoleTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ConsoleTest extends CIUnitTestCase
 {
     private $stream_filter;
 
diff --git a/tests/system/Cache/CacheFactoryTest.php b/tests/system/Cache/CacheFactoryTest.php
index 3fd362e1e26b..890cdd64eb9f 100644
--- a/tests/system/Cache/CacheFactoryTest.php
+++ b/tests/system/Cache/CacheFactoryTest.php
@@ -6,7 +6,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Cache;
 
-class CacheFactoryTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class CacheFactoryTest extends CIUnitTestCase
 {
     private static $directory = 'CacheFactory';
     private $cacheFactory;
diff --git a/tests/system/Cache/Handlers/BaseHandlerTest.php b/tests/system/Cache/Handlers/BaseHandlerTest.php
index 6a958ebc0366..d4a0ff984bf5 100644
--- a/tests/system/Cache/Handlers/BaseHandlerTest.php
+++ b/tests/system/Cache/Handlers/BaseHandlerTest.php
@@ -6,7 +6,10 @@
 use stdClass;
 use Tests\Support\Cache\RestrictiveHandler;
 
-class BaseHandlerTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class BaseHandlerTest extends CIUnitTestCase
 {
     /**
      * @dataProvider invalidTypeProvider
diff --git a/tests/system/Cache/Handlers/DummyHandlerTest.php b/tests/system/Cache/Handlers/DummyHandlerTest.php
index 071cc520b110..ab3e5f24fd2f 100644
--- a/tests/system/Cache/Handlers/DummyHandlerTest.php
+++ b/tests/system/Cache/Handlers/DummyHandlerTest.php
@@ -4,7 +4,10 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 
-class DummyHandlerTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class DummyHandlerTest extends CIUnitTestCase
 {
     private $dummyHandler;
 
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index d228c51b6028..15d77715a5a3 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -6,6 +6,9 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Cache;
 
+/**
+ * @internal
+ */
 final class FileHandlerTest extends CIUnitTestCase
 {
     private static $directory = 'FileHandler';
diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
index ba6571329d67..3084c4548d37 100644
--- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php
+++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
@@ -7,6 +7,9 @@
 use Config\Cache;
 use Exception;
 
+/**
+ * @internal
+ */
 final class MemcachedHandlerTest extends CIUnitTestCase
 {
     private $memcachedHandler;
diff --git a/tests/system/Cache/Handlers/PredisHandlerTest.php b/tests/system/Cache/Handlers/PredisHandlerTest.php
index 837a31cccf7c..20bc11c9d7e7 100644
--- a/tests/system/Cache/Handlers/PredisHandlerTest.php
+++ b/tests/system/Cache/Handlers/PredisHandlerTest.php
@@ -6,6 +6,9 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Cache;
 
+/**
+ * @internal
+ */
 final class PredisHandlerTest extends CIUnitTestCase
 {
     private $PredisHandler;
diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php
index 6f0dbecfc8e0..664e8ad33ece 100644
--- a/tests/system/Cache/Handlers/RedisHandlerTest.php
+++ b/tests/system/Cache/Handlers/RedisHandlerTest.php
@@ -6,6 +6,9 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Cache;
 
+/**
+ * @internal
+ */
 final class RedisHandlerTest extends CIUnitTestCase
 {
     private $redisHandler;
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index 4511d291c8f3..3bb8f0de6013 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -11,8 +11,10 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class CodeIgniterTest extends CIUnitTestCase
+final class CodeIgniterTest extends CIUnitTestCase
 {
     /**
      * @var CodeIgniter
diff --git a/tests/system/Commands/BaseCommandTest.php b/tests/system/Commands/BaseCommandTest.php
index 4332882800ba..647e922fb4d3 100644
--- a/tests/system/Commands/BaseCommandTest.php
+++ b/tests/system/Commands/BaseCommandTest.php
@@ -7,7 +7,10 @@
 use Config\Services;
 use Tests\Support\Commands\AppInfo;
 
-class BaseCommandTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class BaseCommandTest extends CIUnitTestCase
 {
     protected $logger;
     protected $runner;
diff --git a/tests/system/Commands/ClearCacheTest.php b/tests/system/Commands/ClearCacheTest.php
index 8a88dac929e6..0ca370571264 100644
--- a/tests/system/Commands/ClearCacheTest.php
+++ b/tests/system/Commands/ClearCacheTest.php
@@ -7,7 +7,10 @@
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 use Config\Services;
 
-class ClearCacheTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ClearCacheTest extends CIUnitTestCase
 {
     protected $streamFilter;
 
diff --git a/tests/system/Commands/ClearDebugbarTest.php b/tests/system/Commands/ClearDebugbarTest.php
index 560cc5618eab..4040d6d37008 100644
--- a/tests/system/Commands/ClearDebugbarTest.php
+++ b/tests/system/Commands/ClearDebugbarTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class ClearDebugbarTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ClearDebugbarTest extends CIUnitTestCase
 {
     protected $streamFilter;
     protected $time;
diff --git a/tests/system/Commands/ClearLogsTest.php b/tests/system/Commands/ClearLogsTest.php
index 544a2aa8434e..584b785909a1 100644
--- a/tests/system/Commands/ClearLogsTest.php
+++ b/tests/system/Commands/ClearLogsTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class ClearLogsTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ClearLogsTest extends CIUnitTestCase
 {
     protected $streamFilter;
     protected $date;
diff --git a/tests/system/Commands/CommandTest.php b/tests/system/Commands/CommandTest.php
index 0c546e560919..8658eda43932 100644
--- a/tests/system/Commands/CommandTest.php
+++ b/tests/system/Commands/CommandTest.php
@@ -7,7 +7,10 @@
 use Config\Services;
 use Tests\Support\Commands\ParamsReveal;
 
-class CommandTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class CommandTest extends CIUnitTestCase
 {
     private $streamFilter;
     protected $logger;
diff --git a/tests/system/Commands/ConfigGeneratorTest.php b/tests/system/Commands/ConfigGeneratorTest.php
index 2674e867acb5..1469ff7e721b 100644
--- a/tests/system/Commands/ConfigGeneratorTest.php
+++ b/tests/system/Commands/ConfigGeneratorTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class ConfigGeneratorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ConfigGeneratorTest extends CIUnitTestCase
 {
     protected $streamFilter;
 
diff --git a/tests/system/Commands/ConfigurableSortImportsTest.php b/tests/system/Commands/ConfigurableSortImportsTest.php
index cd0c72c14bdf..1c4cceeb455b 100644
--- a/tests/system/Commands/ConfigurableSortImportsTest.php
+++ b/tests/system/Commands/ConfigurableSortImportsTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class ConfigurableSortImportsTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ConfigurableSortImportsTest extends CIUnitTestCase
 {
     protected $streamFilter;
 
diff --git a/tests/system/Commands/ControllerGeneratorTest.php b/tests/system/Commands/ControllerGeneratorTest.php
index 924aee37eef7..2221ae95ca27 100644
--- a/tests/system/Commands/ControllerGeneratorTest.php
+++ b/tests/system/Commands/ControllerGeneratorTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class ControllerGeneratorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ControllerGeneratorTest extends CIUnitTestCase
 {
     protected $streamFilter;
 
diff --git a/tests/system/Commands/CreateDatabaseTest.php b/tests/system/Commands/CreateDatabaseTest.php
index e6e6acfd2a31..0b06cc103993 100644
--- a/tests/system/Commands/CreateDatabaseTest.php
+++ b/tests/system/Commands/CreateDatabaseTest.php
@@ -8,7 +8,10 @@
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 use Config\Database;
 
-class CreateDatabaseTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class CreateDatabaseTest extends CIUnitTestCase
 {
     protected $streamFilter;
 
diff --git a/tests/system/Commands/DatabaseCommandsTest.php b/tests/system/Commands/DatabaseCommandsTest.php
index 7094f9bc32cb..2b1cd462b180 100644
--- a/tests/system/Commands/DatabaseCommandsTest.php
+++ b/tests/system/Commands/DatabaseCommandsTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class DatabaseCommandsTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class DatabaseCommandsTest extends CIUnitTestCase
 {
     protected $streamFilter;
 
diff --git a/tests/system/Commands/EntityGeneratorTest.php b/tests/system/Commands/EntityGeneratorTest.php
index 315e16efe79a..9489a8c9e539 100644
--- a/tests/system/Commands/EntityGeneratorTest.php
+++ b/tests/system/Commands/EntityGeneratorTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class EntityGeneratorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class EntityGeneratorTest extends CIUnitTestCase
 {
     protected $streamFilter;
 
diff --git a/tests/system/Commands/EnvironmentCommandTest.php b/tests/system/Commands/EnvironmentCommandTest.php
index 6aae2abb50f4..435e1ac4e6eb 100644
--- a/tests/system/Commands/EnvironmentCommandTest.php
+++ b/tests/system/Commands/EnvironmentCommandTest.php
@@ -5,6 +5,9 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
+/**
+ * @internal
+ */
 final class EnvironmentCommandTest extends CIUnitTestCase
 {
     private $streamFilter;
diff --git a/tests/system/Commands/FilterGeneratorTest.php b/tests/system/Commands/FilterGeneratorTest.php
index 9d84ccdcfd47..2f53aba8a090 100644
--- a/tests/system/Commands/FilterGeneratorTest.php
+++ b/tests/system/Commands/FilterGeneratorTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class FilterGeneratorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FilterGeneratorTest extends CIUnitTestCase
 {
     protected $streamFilter;
 
diff --git a/tests/system/Commands/GenerateKeyTest.php b/tests/system/Commands/GenerateKeyTest.php
index b06ec4e3c339..28620cf543c2 100644
--- a/tests/system/Commands/GenerateKeyTest.php
+++ b/tests/system/Commands/GenerateKeyTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class GenerateKeyTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class GenerateKeyTest extends CIUnitTestCase
 {
     private $streamFilter;
     private $envPath;
diff --git a/tests/system/Commands/GeneratorsTest.php b/tests/system/Commands/GeneratorsTest.php
index f625142c5959..e6ae7bdec504 100644
--- a/tests/system/Commands/GeneratorsTest.php
+++ b/tests/system/Commands/GeneratorsTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class GeneratorsTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class GeneratorsTest extends CIUnitTestCase
 {
     protected $streamFilter;
 
diff --git a/tests/system/Commands/HelpCommandTest.php b/tests/system/Commands/HelpCommandTest.php
index e80eeee19228..09c26d5e7a03 100644
--- a/tests/system/Commands/HelpCommandTest.php
+++ b/tests/system/Commands/HelpCommandTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class HelpCommandTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class HelpCommandTest extends CIUnitTestCase
 {
     private $streamFilter;
 
diff --git a/tests/system/Commands/InfoCacheTest.php b/tests/system/Commands/InfoCacheTest.php
index ccb1bfac5b26..a5923835f142 100644
--- a/tests/system/Commands/InfoCacheTest.php
+++ b/tests/system/Commands/InfoCacheTest.php
@@ -7,7 +7,10 @@
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 use Config\Services;
 
-class InfoCacheTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class InfoCacheTest extends CIUnitTestCase
 {
     protected $streamFilter;
 
diff --git a/tests/system/Commands/MigrationGeneratorTest.php b/tests/system/Commands/MigrationGeneratorTest.php
index 78aa9777d39c..00e67ecf9219 100644
--- a/tests/system/Commands/MigrationGeneratorTest.php
+++ b/tests/system/Commands/MigrationGeneratorTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class MigrationGeneratorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class MigrationGeneratorTest extends CIUnitTestCase
 {
     protected $streamFilter;
 
diff --git a/tests/system/Commands/ModelGeneratorTest.php b/tests/system/Commands/ModelGeneratorTest.php
index 56be5ffa552d..c57d1f2aeadd 100644
--- a/tests/system/Commands/ModelGeneratorTest.php
+++ b/tests/system/Commands/ModelGeneratorTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class ModelGeneratorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ModelGeneratorTest extends CIUnitTestCase
 {
     protected $streamFilter;
 
diff --git a/tests/system/Commands/ScaffoldGeneratorTest.php b/tests/system/Commands/ScaffoldGeneratorTest.php
index a8b1b0578437..46cd3b113a80 100644
--- a/tests/system/Commands/ScaffoldGeneratorTest.php
+++ b/tests/system/Commands/ScaffoldGeneratorTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class ScaffoldGeneratorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ScaffoldGeneratorTest extends CIUnitTestCase
 {
     protected $streamFilter;
 
diff --git a/tests/system/Commands/SeederGeneratorTest.php b/tests/system/Commands/SeederGeneratorTest.php
index 32bb305421ab..d6be637fe710 100644
--- a/tests/system/Commands/SeederGeneratorTest.php
+++ b/tests/system/Commands/SeederGeneratorTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class SeederGeneratorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class SeederGeneratorTest extends CIUnitTestCase
 {
     protected $streamFilter;
 
diff --git a/tests/system/Commands/SessionsCommandsTest.php b/tests/system/Commands/SessionsCommandsTest.php
index f3429f6b3e55..8a9f6a211bb6 100644
--- a/tests/system/Commands/SessionsCommandsTest.php
+++ b/tests/system/Commands/SessionsCommandsTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class SessionsCommandsTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class SessionsCommandsTest extends CIUnitTestCase
 {
     private $streamFilter;
 
diff --git a/tests/system/Commands/ValidationGeneratorTest.php b/tests/system/Commands/ValidationGeneratorTest.php
index b2d31248fd8b..32c9b12e6e3c 100644
--- a/tests/system/Commands/ValidationGeneratorTest.php
+++ b/tests/system/Commands/ValidationGeneratorTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 
-class ValidationGeneratorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ValidationGeneratorTest extends CIUnitTestCase
 {
     protected $streamFilter;
 
diff --git a/tests/system/CommonFunctionsSendTest.php b/tests/system/CommonFunctionsSendTest.php
index 5d09a71e8a45..49e1c3616c04 100644
--- a/tests/system/CommonFunctionsSendTest.php
+++ b/tests/system/CommonFunctionsSendTest.php
@@ -4,7 +4,10 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 
-class CommonFunctionsSendTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class CommonFunctionsSendTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 6a7987100668..ca96ee288ca0 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -26,8 +26,10 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class CommonFunctionsTest extends CIUnitTestCase
+final class CommonFunctionsTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/CommonSingleServiceTest.php b/tests/system/CommonSingleServiceTest.php
index 39b5051d3a3b..2bb1f8d9c3ea 100644
--- a/tests/system/CommonSingleServiceTest.php
+++ b/tests/system/CommonSingleServiceTest.php
@@ -7,6 +7,9 @@
 use ReflectionClass;
 use ReflectionMethod;
 
+/**
+ * @internal
+ */
 final class CommonSingleServiceTest extends CIUnitTestCase
 {
     /**
diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php
index e3bf23912ab5..15f759ad383c 100644
--- a/tests/system/Config/BaseConfigTest.php
+++ b/tests/system/Config/BaseConfigTest.php
@@ -8,7 +8,10 @@
 use RuntimeException;
 use SimpleConfig;
 
-class BaseConfigTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class BaseConfigTest extends CIUnitTestCase
 {
     protected $fixturesFolder;
 
diff --git a/tests/system/Config/ConfigTest.php b/tests/system/Config/ConfigTest.php
index dbda1ceb9e13..7876ea95d948 100644
--- a/tests/system/Config/ConfigTest.php
+++ b/tests/system/Config/ConfigTest.php
@@ -6,7 +6,10 @@
 use Config\DocTypes;
 use stdClass;
 
-class ConfigTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ConfigTest extends CIUnitTestCase
 {
     public function testCreateSingleInstance()
     {
diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php
index 756b97ebc1ff..30855c401190 100644
--- a/tests/system/Config/DotEnvTest.php
+++ b/tests/system/Config/DotEnvTest.php
@@ -7,8 +7,10 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class DotEnvTest extends CIUnitTestCase
+final class DotEnvTest extends CIUnitTestCase
 {
     protected $fixturesFolder;
 
diff --git a/tests/system/Config/FactoriesTest.php b/tests/system/Config/FactoriesTest.php
index fc4c32f94d48..ffb194134839 100644
--- a/tests/system/Config/FactoriesTest.php
+++ b/tests/system/Config/FactoriesTest.php
@@ -9,7 +9,10 @@
 use Tests\Support\Widgets\OtherWidget;
 use Tests\Support\Widgets\SomeWidget;
 
-class FactoriesTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FactoriesTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/Config/MimesTest.php b/tests/system/Config/MimesTest.php
index 067b0f535c97..19da622123a6 100644
--- a/tests/system/Config/MimesTest.php
+++ b/tests/system/Config/MimesTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Mimes;
 
-class MimesTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class MimesTest extends CIUnitTestCase
 {
     public function extensionsList()
     {
diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php
index af2d64549187..489aae4bbdd7 100644
--- a/tests/system/Config/ServicesTest.php
+++ b/tests/system/Config/ServicesTest.php
@@ -36,7 +36,10 @@
 use Config\Exceptions;
 use Tests\Support\Config\Services as Services;
 
-class ServicesTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ServicesTest extends CIUnitTestCase
 {
     protected $config;
     protected $original;
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index 2a89cb1f9350..55db0e95d45a 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -19,8 +19,10 @@
  * we can exercise everything without blowing up :-/
  *
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class ControllerTest extends CIUnitTestCase
+final class ControllerTest extends CIUnitTestCase
 {
 
     /**
diff --git a/tests/system/Database/BaseConnectionTest.php b/tests/system/Database/BaseConnectionTest.php
index 796965274b6c..a8eb2e87082c 100644
--- a/tests/system/Database/BaseConnectionTest.php
+++ b/tests/system/Database/BaseConnectionTest.php
@@ -7,7 +7,10 @@
 use CodeIgniter\Test\Mock\MockConnection;
 use Throwable;
 
-class BaseConnectionTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class BaseConnectionTest extends CIUnitTestCase
 {
     protected $options = [
         'DSN'      => '',
diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php
index 8b926cc83530..efe5a1a77e23 100644
--- a/tests/system/Database/BaseQueryTest.php
+++ b/tests/system/Database/BaseQueryTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class BaseQueryTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class BaseQueryTest extends CIUnitTestCase
 {
     protected $db;
 
diff --git a/tests/system/Database/Builder/AliasTest.php b/tests/system/Database/Builder/AliasTest.php
index b2e69d546922..5fe5415abe94 100644
--- a/tests/system/Database/Builder/AliasTest.php
+++ b/tests/system/Database/Builder/AliasTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class AliasTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class AliasTest extends CIUnitTestCase
 {
     protected $db;
 
diff --git a/tests/system/Database/Builder/BaseTest.php b/tests/system/Database/Builder/BaseTest.php
index b149a8d9c03a..4c475a60c614 100644
--- a/tests/system/Database/Builder/BaseTest.php
+++ b/tests/system/Database/Builder/BaseTest.php
@@ -6,7 +6,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class BaseTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class BaseTest extends CIUnitTestCase
 {
     protected $db;
 
diff --git a/tests/system/Database/Builder/CountTest.php b/tests/system/Database/Builder/CountTest.php
index 0f94dc6b94ff..badd3c00a7e3 100644
--- a/tests/system/Database/Builder/CountTest.php
+++ b/tests/system/Database/Builder/CountTest.php
@@ -6,7 +6,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class CountTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class CountTest extends CIUnitTestCase
 {
     protected $db;
 
diff --git a/tests/system/Database/Builder/DeleteTest.php b/tests/system/Database/Builder/DeleteTest.php
index 52ca78cc2f4d..eefc336be07a 100644
--- a/tests/system/Database/Builder/DeleteTest.php
+++ b/tests/system/Database/Builder/DeleteTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class DeleteTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class DeleteTest extends CIUnitTestCase
 {
     protected $db;
 
diff --git a/tests/system/Database/Builder/DistinctTest.php b/tests/system/Database/Builder/DistinctTest.php
index c744474b1f58..90da2976b46f 100644
--- a/tests/system/Database/Builder/DistinctTest.php
+++ b/tests/system/Database/Builder/DistinctTest.php
@@ -6,7 +6,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class DistinctTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class DistinctTest extends CIUnitTestCase
 {
     protected $db;
 
diff --git a/tests/system/Database/Builder/EmptyTest.php b/tests/system/Database/Builder/EmptyTest.php
index 356ea79c0ad8..23ab8944a453 100644
--- a/tests/system/Database/Builder/EmptyTest.php
+++ b/tests/system/Database/Builder/EmptyTest.php
@@ -6,7 +6,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class EmptyTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class EmptyTest extends CIUnitTestCase
 {
     protected $db;
 
diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php
index c7ba312da20c..20ac11f7f429 100644
--- a/tests/system/Database/Builder/FromTest.php
+++ b/tests/system/Database/Builder/FromTest.php
@@ -7,7 +7,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class FromTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FromTest extends CIUnitTestCase
 {
     protected $db;
 
diff --git a/tests/system/Database/Builder/GetTest.php b/tests/system/Database/Builder/GetTest.php
index 078f68fe08c2..67035ed7b7ce 100644
--- a/tests/system/Database/Builder/GetTest.php
+++ b/tests/system/Database/Builder/GetTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class GetTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class GetTest extends CIUnitTestCase
 {
     protected $db;
 
diff --git a/tests/system/Database/Builder/GroupTest.php b/tests/system/Database/Builder/GroupTest.php
index 534babac60da..59d8d699ff4b 100644
--- a/tests/system/Database/Builder/GroupTest.php
+++ b/tests/system/Database/Builder/GroupTest.php
@@ -6,7 +6,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class GroupTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class GroupTest extends CIUnitTestCase
 {
     protected $db;
 
diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php
index fef85a606aba..23a58c569e9d 100644
--- a/tests/system/Database/Builder/InsertTest.php
+++ b/tests/system/Database/Builder/InsertTest.php
@@ -6,7 +6,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class InsertTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class InsertTest extends CIUnitTestCase
 {
     /**
      * @var MockConnection
diff --git a/tests/system/Database/Builder/JoinTest.php b/tests/system/Database/Builder/JoinTest.php
index 9bfabad65733..0182350774b0 100644
--- a/tests/system/Database/Builder/JoinTest.php
+++ b/tests/system/Database/Builder/JoinTest.php
@@ -8,7 +8,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class JoinTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class JoinTest extends CIUnitTestCase
 {
     protected $db;
 
diff --git a/tests/system/Database/Builder/LikeTest.php b/tests/system/Database/Builder/LikeTest.php
index de09d48fa60f..a58712b237e1 100644
--- a/tests/system/Database/Builder/LikeTest.php
+++ b/tests/system/Database/Builder/LikeTest.php
@@ -6,7 +6,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class LikeTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class LikeTest extends CIUnitTestCase
 {
     protected $db;
 
diff --git a/tests/system/Database/Builder/LimitTest.php b/tests/system/Database/Builder/LimitTest.php
index 6d1fec6f35eb..7c6e659691d4 100644
--- a/tests/system/Database/Builder/LimitTest.php
+++ b/tests/system/Database/Builder/LimitTest.php
@@ -6,7 +6,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class LimitTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class LimitTest extends CIUnitTestCase
 {
     protected $db;
 
diff --git a/tests/system/Database/Builder/OrderTest.php b/tests/system/Database/Builder/OrderTest.php
index 228b3af17f43..08e97f232664 100644
--- a/tests/system/Database/Builder/OrderTest.php
+++ b/tests/system/Database/Builder/OrderTest.php
@@ -6,7 +6,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class OrderTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class OrderTest extends CIUnitTestCase
 {
     protected $db;
 
diff --git a/tests/system/Database/Builder/PrefixTest.php b/tests/system/Database/Builder/PrefixTest.php
index 9747b9f4bc86..cb52805864c1 100644
--- a/tests/system/Database/Builder/PrefixTest.php
+++ b/tests/system/Database/Builder/PrefixTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class PrefixTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class PrefixTest extends CIUnitTestCase
 {
     protected $db;
 
diff --git a/tests/system/Database/Builder/ReplaceTest.php b/tests/system/Database/Builder/ReplaceTest.php
index 651f4a92f3f5..4a69fbb0f438 100644
--- a/tests/system/Database/Builder/ReplaceTest.php
+++ b/tests/system/Database/Builder/ReplaceTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class ReplaceTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ReplaceTest extends CIUnitTestCase
 {
     protected $db;
 
diff --git a/tests/system/Database/Builder/SelectTest.php b/tests/system/Database/Builder/SelectTest.php
index 1d99b9a35682..d0fec1003446 100644
--- a/tests/system/Database/Builder/SelectTest.php
+++ b/tests/system/Database/Builder/SelectTest.php
@@ -8,7 +8,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class SelectTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class SelectTest extends CIUnitTestCase
 {
     protected $db;
 
diff --git a/tests/system/Database/Builder/TruncateTest.php b/tests/system/Database/Builder/TruncateTest.php
index 2b513d0d6a21..46baea32ec44 100644
--- a/tests/system/Database/Builder/TruncateTest.php
+++ b/tests/system/Database/Builder/TruncateTest.php
@@ -6,7 +6,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
-class TruncateTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class TruncateTest extends CIUnitTestCase
 {
     protected $db;
 
diff --git a/tests/system/Database/Builder/UpdateTest.php b/tests/system/Database/Builder/UpdateTest.php
index 107b661b97b1..47d424100c62 100644
--- a/tests/system/Database/Builder/UpdateTest.php
+++ b/tests/system/Database/Builder/UpdateTest.php
@@ -7,7 +7,10 @@
 use CodeIgniter\Test\Mock\MockConnection;
 use CodeIgniter\Test\Mock\MockQuery;
 
-class UpdateTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class UpdateTest extends CIUnitTestCase
 {
     /**
      * @var MockConnection
diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php
index e79541d3f04a..5e6bbde7353d 100644
--- a/tests/system/Database/Builder/WhereTest.php
+++ b/tests/system/Database/Builder/WhereTest.php
@@ -8,7 +8,10 @@
 use InvalidArgumentException;
 use stdClass;
 
-class WhereTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class WhereTest extends CIUnitTestCase
 {
     /**
      * @var MockConnection
diff --git a/tests/system/Database/ConfigTest.php b/tests/system/Database/ConfigTest.php
index ba04282530ba..326f922164f6 100644
--- a/tests/system/Database/ConfigTest.php
+++ b/tests/system/Database/ConfigTest.php
@@ -7,7 +7,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\ReflectionHelper;
 
-class ConfigTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ConfigTest extends CIUnitTestCase
 {
     use ReflectionHelper;
 
diff --git a/tests/system/Database/DatabaseSeederTest.php b/tests/system/Database/DatabaseSeederTest.php
index 83935c240132..e2c1a01bbfb4 100644
--- a/tests/system/Database/DatabaseSeederTest.php
+++ b/tests/system/Database/DatabaseSeederTest.php
@@ -6,7 +6,10 @@
 use Config\Database;
 use Faker\Generator;
 
-class DatabaseSeederTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class DatabaseSeederTest extends CIUnitTestCase
 {
     public function testInstantiateNoSeedPath()
     {
diff --git a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php
index 20ebf180cd63..38b7f9f97d26 100644
--- a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php
+++ b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php
@@ -12,8 +12,10 @@
  * show $migrateOnce applies per test case file.
  *
  * @group DatabaseLive
+ *
+ * @internal
  */
-class DatabaseTestCaseMigrationOnce1Test extends CIUnitTestCase
+final class DatabaseTestCaseMigrationOnce1Test extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php
index 776ea6e75bd0..a4691ef75fbf 100644
--- a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php
+++ b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php
@@ -11,8 +11,10 @@
  * show $migrateOnce applies per test case file.
  *
  * @group DatabaseLive
+ *
+ * @internal
  */
-class DatabaseTestCaseMigrationOnce2Test extends CIUnitTestCase
+final class DatabaseTestCaseMigrationOnce2Test extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/DatabaseTestCaseTest.php b/tests/system/Database/DatabaseTestCaseTest.php
index 2863b4db5aed..4270e0d19ca0 100644
--- a/tests/system/Database/DatabaseTestCaseTest.php
+++ b/tests/system/Database/DatabaseTestCaseTest.php
@@ -8,8 +8,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class DatabaseTestCaseTest extends CIUnitTestCase
+final class DatabaseTestCaseTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/AliasTest.php b/tests/system/Database/Live/AliasTest.php
index c2171201dda1..e180767c5a43 100644
--- a/tests/system/Database/Live/AliasTest.php
+++ b/tests/system/Database/Live/AliasTest.php
@@ -7,8 +7,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class AliasTest extends CIUnitTestCase
+final class AliasTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/BadQueryTest.php b/tests/system/Database/Live/BadQueryTest.php
index d7af31b859d1..8bafb8de710d 100644
--- a/tests/system/Database/Live/BadQueryTest.php
+++ b/tests/system/Database/Live/BadQueryTest.php
@@ -8,8 +8,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class BadQueryTest extends CIUnitTestCase
+final class BadQueryTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/ConnectTest.php b/tests/system/Database/Live/ConnectTest.php
index ae7cbed2e0d0..a3a7b33c935a 100644
--- a/tests/system/Database/Live/ConnectTest.php
+++ b/tests/system/Database/Live/ConnectTest.php
@@ -10,8 +10,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class ConnectTest extends CIUnitTestCase
+final class ConnectTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/CountTest.php b/tests/system/Database/Live/CountTest.php
index 608ac5bfec99..14ff5dd65f5a 100644
--- a/tests/system/Database/Live/CountTest.php
+++ b/tests/system/Database/Live/CountTest.php
@@ -7,8 +7,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class CountTest extends CIUnitTestCase
+final class CountTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/DEBugTest.php b/tests/system/Database/Live/DEBugTest.php
index 61bae0c56642..6f090b2d2184 100644
--- a/tests/system/Database/Live/DEBugTest.php
+++ b/tests/system/Database/Live/DEBugTest.php
@@ -7,8 +7,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class DEBugTest extends CIUnitTestCase
+final class DEBugTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/DatabaseTestTraitCaseTest.php b/tests/system/Database/Live/DatabaseTestTraitCaseTest.php
index f4949cef834f..4456ea7e504a 100644
--- a/tests/system/Database/Live/DatabaseTestTraitCaseTest.php
+++ b/tests/system/Database/Live/DatabaseTestTraitCaseTest.php
@@ -7,8 +7,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class DatabaseTestTraitCaseTest extends CIUnitTestCase
+final class DatabaseTestTraitCaseTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/DbUtilsTest.php b/tests/system/Database/Live/DbUtilsTest.php
index 8acfd06e5325..16e3c0a1c2e4 100644
--- a/tests/system/Database/Live/DbUtilsTest.php
+++ b/tests/system/Database/Live/DbUtilsTest.php
@@ -9,8 +9,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class DbUtilsTest extends CIUnitTestCase
+final class DbUtilsTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/DeleteTest.php b/tests/system/Database/Live/DeleteTest.php
index 4b9ed8b938a6..c80597138862 100644
--- a/tests/system/Database/Live/DeleteTest.php
+++ b/tests/system/Database/Live/DeleteTest.php
@@ -8,8 +8,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class DeleteTest extends CIUnitTestCase
+final class DeleteTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/EmptyTest.php b/tests/system/Database/Live/EmptyTest.php
index d4fd51c9ff6d..2a4b6dfb87a4 100644
--- a/tests/system/Database/Live/EmptyTest.php
+++ b/tests/system/Database/Live/EmptyTest.php
@@ -7,8 +7,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class EmptyTest extends CIUnitTestCase
+final class EmptyTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/EscapeTest.php b/tests/system/Database/Live/EscapeTest.php
index 88fedfc99613..39b21fb9a416 100644
--- a/tests/system/Database/Live/EscapeTest.php
+++ b/tests/system/Database/Live/EscapeTest.php
@@ -7,8 +7,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class EscapeTest extends CIUnitTestCase
+final class EscapeTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/FabricatorLiveTest.php b/tests/system/Database/Live/FabricatorLiveTest.php
index b34d2c5aa2e9..8deeb0d36035 100644
--- a/tests/system/Database/Live/FabricatorLiveTest.php
+++ b/tests/system/Database/Live/FabricatorLiveTest.php
@@ -11,8 +11,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class FabricatorLiveTest extends CIUnitTestCase
+final class FabricatorLiveTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index b07f374b2353..17ea8e3e5d03 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -12,8 +12,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class ForgeTest extends CIUnitTestCase
+final class ForgeTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/FromTest.php b/tests/system/Database/Live/FromTest.php
index 9abef5e2c431..cca48e6dc701 100644
--- a/tests/system/Database/Live/FromTest.php
+++ b/tests/system/Database/Live/FromTest.php
@@ -7,8 +7,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class FromTest extends CIUnitTestCase
+final class FromTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/GetNumRowsTest.php b/tests/system/Database/Live/GetNumRowsTest.php
index 6a14afaa1a5e..9b4e17e4f742 100644
--- a/tests/system/Database/Live/GetNumRowsTest.php
+++ b/tests/system/Database/Live/GetNumRowsTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
-class GetNumRowsTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class GetNumRowsTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php
index 8ca5b95a8273..a43d50921d59 100644
--- a/tests/system/Database/Live/GetTest.php
+++ b/tests/system/Database/Live/GetTest.php
@@ -8,8 +8,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class GetTest extends CIUnitTestCase
+final class GetTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/GroupTest.php b/tests/system/Database/Live/GroupTest.php
index ae53143e90ae..5f32ea0d626b 100644
--- a/tests/system/Database/Live/GroupTest.php
+++ b/tests/system/Database/Live/GroupTest.php
@@ -7,8 +7,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class GroupTest extends CIUnitTestCase
+final class GroupTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/IncrementTest.php b/tests/system/Database/Live/IncrementTest.php
index bd5c6f75e5a5..078b4d5db51f 100644
--- a/tests/system/Database/Live/IncrementTest.php
+++ b/tests/system/Database/Live/IncrementTest.php
@@ -7,8 +7,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class IncrementTest extends CIUnitTestCase
+final class IncrementTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/InsertTest.php b/tests/system/Database/Live/InsertTest.php
index 97eb3a80886c..fee6d1791664 100644
--- a/tests/system/Database/Live/InsertTest.php
+++ b/tests/system/Database/Live/InsertTest.php
@@ -7,8 +7,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class InsertTest extends CIUnitTestCase
+final class InsertTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/JoinTest.php b/tests/system/Database/Live/JoinTest.php
index e88a5b4a4ea3..d3df8ff7f377 100644
--- a/tests/system/Database/Live/JoinTest.php
+++ b/tests/system/Database/Live/JoinTest.php
@@ -7,8 +7,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class JoinTest extends CIUnitTestCase
+final class JoinTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/LikeTest.php b/tests/system/Database/Live/LikeTest.php
index 422d1a5027b9..449a0aa3397b 100644
--- a/tests/system/Database/Live/LikeTest.php
+++ b/tests/system/Database/Live/LikeTest.php
@@ -7,8 +7,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class LikeTest extends CIUnitTestCase
+final class LikeTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/LimitTest.php b/tests/system/Database/Live/LimitTest.php
index 2cb39644901e..031452883eb0 100644
--- a/tests/system/Database/Live/LimitTest.php
+++ b/tests/system/Database/Live/LimitTest.php
@@ -7,8 +7,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class LimitTest extends CIUnitTestCase
+final class LimitTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
     protected $refresh = true;
diff --git a/tests/system/Database/Live/MetadataTest.php b/tests/system/Database/Live/MetadataTest.php
index 9480506a8780..d30af1288df3 100644
--- a/tests/system/Database/Live/MetadataTest.php
+++ b/tests/system/Database/Live/MetadataTest.php
@@ -8,8 +8,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class MetadataTest extends CIUnitTestCase
+final class MetadataTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/OrderTest.php b/tests/system/Database/Live/OrderTest.php
index f0b4f6a5d6fc..6b8fa1a17d7d 100644
--- a/tests/system/Database/Live/OrderTest.php
+++ b/tests/system/Database/Live/OrderTest.php
@@ -7,8 +7,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class OrderTest extends CIUnitTestCase
+final class OrderTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php
index 56f8a591ef66..eb1c1bc6509e 100644
--- a/tests/system/Database/Live/PreparedQueryTest.php
+++ b/tests/system/Database/Live/PreparedQueryTest.php
@@ -9,8 +9,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class PreparedQueryTest extends CIUnitTestCase
+final class PreparedQueryTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/PretendTest.php b/tests/system/Database/Live/PretendTest.php
index 31a68e09f674..2a602593cd55 100644
--- a/tests/system/Database/Live/PretendTest.php
+++ b/tests/system/Database/Live/PretendTest.php
@@ -8,8 +8,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class PretendTest extends CIUnitTestCase
+final class PretendTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/SQLite/AlterTableTest.php b/tests/system/Database/Live/SQLite/AlterTableTest.php
index a7286ccd0729..3b618951af97 100644
--- a/tests/system/Database/Live/SQLite/AlterTableTest.php
+++ b/tests/system/Database/Live/SQLite/AlterTableTest.php
@@ -11,8 +11,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class AlterTableTest extends CIUnitTestCase
+final class AlterTableTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/SelectTest.php b/tests/system/Database/Live/SelectTest.php
index 94fde7d0bf66..656b9f8edc39 100644
--- a/tests/system/Database/Live/SelectTest.php
+++ b/tests/system/Database/Live/SelectTest.php
@@ -7,8 +7,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class SelectTest extends CIUnitTestCase
+final class SelectTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index b0e51a2e4d02..ff89dce3e5d8 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -8,8 +8,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class UpdateTest extends CIUnitTestCase
+final class UpdateTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/WhereTest.php b/tests/system/Database/Live/WhereTest.php
index a0d23818f9cb..bf5619a4df7d 100644
--- a/tests/system/Database/Live/WhereTest.php
+++ b/tests/system/Database/Live/WhereTest.php
@@ -7,8 +7,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class WhereTest extends CIUnitTestCase
+final class WhereTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/WriteTypeQueryTest.php b/tests/system/Database/Live/WriteTypeQueryTest.php
index 8a44a0947424..beb633b22e14 100644
--- a/tests/system/Database/Live/WriteTypeQueryTest.php
+++ b/tests/system/Database/Live/WriteTypeQueryTest.php
@@ -8,8 +8,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class WriteTypeQueryTest extends CIUnitTestCase
+final class WriteTypeQueryTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php
index 688f9b8d8cb0..4fd77d8707bb 100644
--- a/tests/system/Database/Migrations/MigrationRunnerTest.php
+++ b/tests/system/Database/Migrations/MigrationRunnerTest.php
@@ -16,8 +16,10 @@
 
 /**
  * @group DatabaseLive
+ *
+ * @internal
  */
-class MigrationRunnerTest extends CIUnitTestCase
+final class MigrationRunnerTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Migrations/MigrationTest.php b/tests/system/Database/Migrations/MigrationTest.php
index d515695ad60a..07febf2fc2fc 100644
--- a/tests/system/Database/Migrations/MigrationTest.php
+++ b/tests/system/Database/Migrations/MigrationTest.php
@@ -6,7 +6,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
-class MigrationTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class MigrationTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/ModelFactoryTest.php b/tests/system/Database/ModelFactoryTest.php
index 797ec5ad02c6..c36af0fe6a61 100644
--- a/tests/system/Database/ModelFactoryTest.php
+++ b/tests/system/Database/ModelFactoryTest.php
@@ -7,7 +7,10 @@
 use Tests\Support\Models\JobModel;
 use Tests\Support\Models\UserModel;
 
-class ModelFactoryTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ModelFactoryTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php
index eb1a1368bb0f..18daef6b887f 100644
--- a/tests/system/Debug/ExceptionsTest.php
+++ b/tests/system/Debug/ExceptionsTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Services;
 
-class ExceptionsTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ExceptionsTest extends CIUnitTestCase
 {
     public function testNew()
     {
diff --git a/tests/system/Debug/TimerTest.php b/tests/system/Debug/TimerTest.php
index 2c9fe8d99498..196c81341e32 100644
--- a/tests/system/Debug/TimerTest.php
+++ b/tests/system/Debug/TimerTest.php
@@ -4,6 +4,9 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 
+/**
+ * @internal
+ */
 final class TimerTest extends CIUnitTestCase
 {
     /**
diff --git a/tests/system/DebugTraceableTraitTest.php b/tests/system/DebugTraceableTraitTest.php
index 1aed11d18960..2256441771f5 100644
--- a/tests/system/DebugTraceableTraitTest.php
+++ b/tests/system/DebugTraceableTraitTest.php
@@ -8,18 +8,20 @@
 
 /**
  * @covers \CodeIgniter\Exceptions\DebugTraceableTrait
+ *
+ * @internal
  */
 final class DebugTraceableTraitTest extends CIUnitTestCase
 {
     public function testFactoryInstanceReturnsWhereItIsRaised(): void
     {
-        $e1 = new FrameworkException('I am on line 16');
+        $e1 = new FrameworkException('I am on line 18');
         $e2 = FrameworkException::forEnabledZlibOutputCompression();
 
         $this->assertContainsEquals(DebugTraceableTrait::class, class_uses(FrameworkException::class));
-        $this->assertSame(16, $e1->getLine());
+        $this->assertSame(18, $e1->getLine());
         $this->assertSame(__FILE__, $e1->getFile());
-        $this->assertSame(17, $e2->getLine());
+        $this->assertSame(19, $e2->getLine());
         $this->assertSame(__FILE__, $e2->getFile());
     }
 }
diff --git a/tests/system/Email/EmailTest.php b/tests/system/Email/EmailTest.php
index 088b3049930a..5515af311e1f 100644
--- a/tests/system/Email/EmailTest.php
+++ b/tests/system/Email/EmailTest.php
@@ -6,7 +6,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockEmail;
 
-class EmailTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class EmailTest extends CIUnitTestCase
 {
     public function testEmailValidation()
     {
diff --git a/tests/system/Encryption/EncryptionTest.php b/tests/system/Encryption/EncryptionTest.php
index 62ff8a9d9980..31e39bad00d3 100644
--- a/tests/system/Encryption/EncryptionTest.php
+++ b/tests/system/Encryption/EncryptionTest.php
@@ -7,7 +7,10 @@
 use Config\Encryption as EncryptionConfig;
 use Config\Services;
 
-class EncryptionTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class EncryptionTest extends CIUnitTestCase
 {
     /**
      * @var \CodeIgniter\Encryption\Encryption
diff --git a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
index 97ac519cd257..b0cb3cf30640 100644
--- a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
+++ b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
@@ -7,7 +7,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Encryption as EncryptionConfig;
 
-class OpenSSLHandlerTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class OpenSSLHandlerTest extends CIUnitTestCase
 {
     /**
      * @var \CodeIgniter\Encryption\Encryption
diff --git a/tests/system/Encryption/Handlers/SodiumHandlerTest.php b/tests/system/Encryption/Handlers/SodiumHandlerTest.php
index ad98681297dd..958b34f69539 100644
--- a/tests/system/Encryption/Handlers/SodiumHandlerTest.php
+++ b/tests/system/Encryption/Handlers/SodiumHandlerTest.php
@@ -6,7 +6,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Encryption as EncryptionConfig;
 
-class SodiumHandlerTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class SodiumHandlerTest extends CIUnitTestCase
 {
     /**
      * @var \CodeIgniter\Encryption\Encryption
diff --git a/tests/system/EntityTest.php b/tests/system/EntityTest.php
index 8a8fcda8b09e..5ebefaecdd75 100644
--- a/tests/system/EntityTest.php
+++ b/tests/system/EntityTest.php
@@ -14,7 +14,10 @@
 use Tests\Support\Entity\Cast\NotExtendsBaseCast;
 use Tests\Support\SomeEntity;
 
-class EntityTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class EntityTest extends CIUnitTestCase
 {
     use ReflectionHelper;
 
diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php
index 00decc3f3eef..a599fb45ce83 100644
--- a/tests/system/Events/EventsTest.php
+++ b/tests/system/Events/EventsTest.php
@@ -6,7 +6,10 @@
 use CodeIgniter\Test\Mock\MockEvents;
 use Config\Modules;
 
-class EventsTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class EventsTest extends CIUnitTestCase
 {
     /**
      * Accessible event manager instance
diff --git a/tests/system/Files/FileTest.php b/tests/system/Files/FileTest.php
index dfccd4c016c9..31b2e5b46def 100644
--- a/tests/system/Files/FileTest.php
+++ b/tests/system/Files/FileTest.php
@@ -4,7 +4,10 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 
-class FileTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FileTest extends CIUnitTestCase
 {
     public function testNewGoodChecked()
     {
diff --git a/tests/system/Files/FileWithVfsTest.php b/tests/system/Files/FileWithVfsTest.php
index 778317206881..7fc26842c7cd 100644
--- a/tests/system/Files/FileWithVfsTest.php
+++ b/tests/system/Files/FileWithVfsTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use org\bovigo\vfs\vfsStream;
 
-class FileWithVfsTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FileWithVfsTest extends CIUnitTestCase
 {
 
     // For VFS stuff
diff --git a/tests/system/Filters/CSRFTest.php b/tests/system/Filters/CSRFTest.php
index 85525e88552d..a82bf1578d8c 100644
--- a/tests/system/Filters/CSRFTest.php
+++ b/tests/system/Filters/CSRFTest.php
@@ -7,8 +7,10 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class CSRFTest extends CIUnitTestCase
+final class CSRFTest extends CIUnitTestCase
 {
     protected $config;
     protected $request;
diff --git a/tests/system/Filters/DebugToolbarTest.php b/tests/system/Filters/DebugToolbarTest.php
index 550a522ce29f..04079d79fa03 100644
--- a/tests/system/Filters/DebugToolbarTest.php
+++ b/tests/system/Filters/DebugToolbarTest.php
@@ -8,8 +8,10 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class DebugToolbarTest extends CIUnitTestCase
+final class DebugToolbarTest extends CIUnitTestCase
 {
     protected $request;
     protected $response;
diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index b80f11a905c5..bdc09ab2bf16 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -18,8 +18,10 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class FiltersTest extends CIUnitTestCase
+final class FiltersTest extends CIUnitTestCase
 {
     protected $request;
     protected $response;
diff --git a/tests/system/Filters/HoneypotTest.php b/tests/system/Filters/HoneypotTest.php
index d074a23d26db..0c90b44be2af 100644
--- a/tests/system/Filters/HoneypotTest.php
+++ b/tests/system/Filters/HoneypotTest.php
@@ -9,8 +9,10 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class HoneypotTest extends CIUnitTestCase
+final class HoneypotTest extends CIUnitTestCase
 {
     protected $config;
     protected $honey;
diff --git a/tests/system/Format/FormatTest.php b/tests/system/Format/FormatTest.php
index e54e5a85e792..a662033d3621 100644
--- a/tests/system/Format/FormatTest.php
+++ b/tests/system/Format/FormatTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Format\Exceptions\FormatException;
 use CodeIgniter\Test\CIUnitTestCase;
 
-class FormatTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FormatTest extends CIUnitTestCase
 {
     /**
      * @var Format
diff --git a/tests/system/Format/JSONFormatterTest.php b/tests/system/Format/JSONFormatterTest.php
index df4f3b373d48..bf40a9576d34 100644
--- a/tests/system/Format/JSONFormatterTest.php
+++ b/tests/system/Format/JSONFormatterTest.php
@@ -4,7 +4,10 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 
-class JSONFormatterTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class JSONFormatterTest extends CIUnitTestCase
 {
     protected $jsonFormatter;
 
diff --git a/tests/system/Format/XMLFormatterTest.php b/tests/system/Format/XMLFormatterTest.php
index 7cedeb9acdf0..347782cc4edd 100644
--- a/tests/system/Format/XMLFormatterTest.php
+++ b/tests/system/Format/XMLFormatterTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use DOMDocument;
 
-class XMLFormatterTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class XMLFormatterTest extends CIUnitTestCase
 {
     protected $xmlFormatter;
 
diff --git a/tests/system/HTTP/CLIRequestTest.php b/tests/system/HTTP/CLIRequestTest.php
index 639603a44e1a..a645dd4090a3 100644
--- a/tests/system/HTTP/CLIRequestTest.php
+++ b/tests/system/HTTP/CLIRequestTest.php
@@ -10,8 +10,10 @@
  * except also testing the methods added by CLIRequest
  *
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class CLIRequestTest extends CIUnitTestCase
+final class CLIRequestTest extends CIUnitTestCase
 {
 
     /**
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index 2a675337df52..42b41d8d5670 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -9,7 +9,10 @@
 use Config\App;
 use CURLFile;
 
-class CURLRequestTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class CURLRequestTest extends CIUnitTestCase
 {
     /**
      * @var MockCURLRequest
diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php
index cf08026acf17..cc4be4750ecf 100644
--- a/tests/system/HTTP/ContentSecurityPolicyTest.php
+++ b/tests/system/HTTP/ContentSecurityPolicyTest.php
@@ -10,8 +10,10 @@
  *
  * See https://apimirror.com/http/headers/content-security-policy
  * See https://cspvalidator.org/
+ *
+ * @internal
  */
-class ContentSecurityPolicyTest extends CIUnitTestCase
+final class ContentSecurityPolicyTest extends CIUnitTestCase
 {
     // Having this method as setUp() doesn't work - can't find Config\App !?
     protected function prepare(bool $CSPEnabled = true)
diff --git a/tests/system/HTTP/DownloadResponseTest.php b/tests/system/HTTP/DownloadResponseTest.php
index eb0f5ddde0c9..96b0a57b2c9b 100644
--- a/tests/system/HTTP/DownloadResponseTest.php
+++ b/tests/system/HTTP/DownloadResponseTest.php
@@ -8,7 +8,10 @@
 use DateTime;
 use DateTimeZone;
 
-class DownloadResponseTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class DownloadResponseTest extends CIUnitTestCase
 {
     public function tearDown(): void
     {
diff --git a/tests/system/HTTP/Files/FileCollectionTest.php b/tests/system/HTTP/Files/FileCollectionTest.php
index 7060b73c42f3..95437c0efdbd 100644
--- a/tests/system/HTTP/Files/FileCollectionTest.php
+++ b/tests/system/HTTP/Files/FileCollectionTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Mimes;
 
-class FileCollectionTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FileCollectionTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php
index 3f8560ab1393..af768a87150e 100644
--- a/tests/system/HTTP/Files/FileMovingTest.php
+++ b/tests/system/HTTP/Files/FileMovingTest.php
@@ -6,7 +6,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use org\bovigo\vfs\vfsStream;
 
-class FileMovingTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FileMovingTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/HeaderTest.php b/tests/system/HTTP/HeaderTest.php
index 57a2ccd5f35c..0ca86a51f14f 100644
--- a/tests/system/HTTP/HeaderTest.php
+++ b/tests/system/HTTP/HeaderTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use stdClass;
 
-class HeaderTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class HeaderTest extends CIUnitTestCase
 {
     public function testHeaderStoresBasics()
     {
diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php
index 4767b1cad35c..2cea84461428 100644
--- a/tests/system/HTTP/IncomingRequestDetectingTest.php
+++ b/tests/system/HTTP/IncomingRequestDetectingTest.php
@@ -7,8 +7,10 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class IncomingRequestDetectingTest extends CIUnitTestCase
+final class IncomingRequestDetectingTest extends CIUnitTestCase
 {
 
     /**
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 4a2b6c086bcf..70f0380d4648 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -9,8 +9,10 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class IncomingRequestTest extends CIUnitTestCase
+final class IncomingRequestTest extends CIUnitTestCase
 {
 
     /**
diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php
index be6f2e2e3cf0..3b94d58e4f8f 100644
--- a/tests/system/HTTP/MessageTest.php
+++ b/tests/system/HTTP/MessageTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\Test\CIUnitTestCase;
 
-class MessageTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class MessageTest extends CIUnitTestCase
 {
 
     /**
diff --git a/tests/system/HTTP/NegotiateTest.php b/tests/system/HTTP/NegotiateTest.php
index c2526b55462e..a8d7f3f16fed 100644
--- a/tests/system/HTTP/NegotiateTest.php
+++ b/tests/system/HTTP/NegotiateTest.php
@@ -6,7 +6,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\App;
 
-class NegotiateTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class NegotiateTest extends CIUnitTestCase
 {
 
     /**
diff --git a/tests/system/HTTP/RedirectResponseTest.php b/tests/system/HTTP/RedirectResponseTest.php
index 08bbc8f1ae3e..fe798675e29f 100644
--- a/tests/system/HTTP/RedirectResponseTest.php
+++ b/tests/system/HTTP/RedirectResponseTest.php
@@ -12,7 +12,10 @@
 use Config\Modules;
 use Config\Services;
 
-class RedirectResponseTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class RedirectResponseTest extends CIUnitTestCase
 {
     /**
      * @var RouteCollection
diff --git a/tests/system/HTTP/RequestTest.php b/tests/system/HTTP/RequestTest.php
index afb0595fe10f..54d2cd18a6f7 100644
--- a/tests/system/HTTP/RequestTest.php
+++ b/tests/system/HTTP/RequestTest.php
@@ -7,8 +7,10 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class RequestTest extends CIUnitTestCase
+final class RequestTest extends CIUnitTestCase
 {
 
     /**
diff --git a/tests/system/HTTP/ResponseSendTest.php b/tests/system/HTTP/ResponseSendTest.php
index e776b3805ad8..27948ba0504c 100644
--- a/tests/system/HTTP/ResponseSendTest.php
+++ b/tests/system/HTTP/ResponseSendTest.php
@@ -10,8 +10,10 @@
  * TestCaseTest because it messes with output
  * buffering from PHPUnit, and the individual
  * test cases need to be run as separate processes.
+ *
+ * @internal
  */
-class ResponseSendTest extends CIUnitTestCase
+final class ResponseSendTest extends CIUnitTestCase
 {
 
     /**
diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php
index 81ef36a3efdc..4f4f4c08bcaf 100644
--- a/tests/system/HTTP/ResponseTest.php
+++ b/tests/system/HTTP/ResponseTest.php
@@ -12,7 +12,10 @@
 use DateTime;
 use DateTimeZone;
 
-class ResponseTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ResponseTest extends CIUnitTestCase
 {
     protected $server;
 
diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php
index a392c25e5981..aeede2494ab5 100644
--- a/tests/system/HTTP/URITest.php
+++ b/tests/system/HTTP/URITest.php
@@ -10,8 +10,10 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class URITest extends CIUnitTestCase
+final class URITest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/UserAgentTest.php b/tests/system/HTTP/UserAgentTest.php
index 9682fec77f84..461ea911481c 100644
--- a/tests/system/HTTP/UserAgentTest.php
+++ b/tests/system/HTTP/UserAgentTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Test\CIUnitTestCase;
 
-class UserAgentTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class UserAgentTest extends CIUnitTestCase
 {
     protected $_user_agent = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27';
     protected $_mobile_ua  = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7';
diff --git a/tests/system/Helpers/ArrayHelperTest.php b/tests/system/Helpers/ArrayHelperTest.php
index 6c8870b91c4a..7c22c743b36e 100644
--- a/tests/system/Helpers/ArrayHelperTest.php
+++ b/tests/system/Helpers/ArrayHelperTest.php
@@ -4,7 +4,10 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 
-class ArrayHelperTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ArrayHelperTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/Helpers/CookieHelperTest.php b/tests/system/Helpers/CookieHelperTest.php
index 730328c83f0d..5582c224a7d0 100755
--- a/tests/system/Helpers/CookieHelperTest.php
+++ b/tests/system/Helpers/CookieHelperTest.php
@@ -11,6 +11,9 @@
 use Config\App;
 use Config\Services;
 
+/**
+ * @internal
+ */
 final class CookieHelperTest extends CIUnitTestCase
 {
     private $name;
diff --git a/tests/system/Helpers/DateHelperTest.php b/tests/system/Helpers/DateHelperTest.php
index 44d5e1d8592d..75ae6f2f90fc 100644
--- a/tests/system/Helpers/DateHelperTest.php
+++ b/tests/system/Helpers/DateHelperTest.php
@@ -5,6 +5,9 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use DateTime;
 
+/**
+ * @internal
+ */
 final class DateHelperTest extends CIUnitTestCase
 {
     protected function setUp(): void
diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php
index 5b409c0eeede..ae4d2491c7f3 100644
--- a/tests/system/Helpers/FilesystemHelperTest.php
+++ b/tests/system/Helpers/FilesystemHelperTest.php
@@ -9,7 +9,10 @@
 use org\bovigo\vfs\vfsStreamDirectory;
 use org\bovigo\vfs\visitor\vfsStreamStructureVisitor;
 
-class FilesystemHelperTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FilesystemHelperTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
index 4bf1224b0b7e..0c2bf250d9cc 100644
--- a/tests/system/Helpers/FormHelperTest.php
+++ b/tests/system/Helpers/FormHelperTest.php
@@ -8,7 +8,10 @@
 use Config\App;
 use Config\Filters;
 
-class FormHelperTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FormHelperTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index a62bf5725a68..3604dd51e150 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -5,6 +5,9 @@
 use CodeIgniter\Files\Exceptions\FileNotFoundException;
 use CodeIgniter\Test\CIUnitTestCase;
 
+/**
+ * @internal
+ */
 final class HTMLHelperTest extends CIUnitTestCase
 {
     private $tracks;
diff --git a/tests/system/Helpers/InflectorHelperTest.php b/tests/system/Helpers/InflectorHelperTest.php
index 687f7a8abb4c..faaef5f38e88 100755
--- a/tests/system/Helpers/InflectorHelperTest.php
+++ b/tests/system/Helpers/InflectorHelperTest.php
@@ -4,6 +4,9 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 
+/**
+ * @internal
+ */
 final class InflectorHelperTest extends CIUnitTestCase
 {
     protected function setUp(): void
diff --git a/tests/system/Helpers/NumberHelperTest.php b/tests/system/Helpers/NumberHelperTest.php
index 480e48a41a00..2cd51cfa47bc 100755
--- a/tests/system/Helpers/NumberHelperTest.php
+++ b/tests/system/Helpers/NumberHelperTest.php
@@ -4,6 +4,9 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 
+/**
+ * @internal
+ */
 final class NumberHelperTest extends CIUnitTestCase
 {
     protected function setUp(): void
diff --git a/tests/system/Helpers/SecurityHelperTest.php b/tests/system/Helpers/SecurityHelperTest.php
index 4f05aa091722..597ff8816f18 100644
--- a/tests/system/Helpers/SecurityHelperTest.php
+++ b/tests/system/Helpers/SecurityHelperTest.php
@@ -4,7 +4,10 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 
-class SecurityHelperTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class SecurityHelperTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/Helpers/TextHelperTest.php b/tests/system/Helpers/TextHelperTest.php
index aa8e3aef3bf1..f36c42ab0661 100755
--- a/tests/system/Helpers/TextHelperTest.php
+++ b/tests/system/Helpers/TextHelperTest.php
@@ -4,7 +4,10 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 
-class TextHelperTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class TextHelperTest extends CIUnitTestCase
 {
     private $_long_string = 'Once upon a time, a framework had no tests. It sad. So some nice people began to write tests. The more time that went on, the happier it became. Everyone was happy.';
 
diff --git a/tests/system/Helpers/URLHelper/CurrentUrlTest.php b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
index 34f40285f1f1..6ac7aaa5aa16 100644
--- a/tests/system/Helpers/URLHelper/CurrentUrlTest.php
+++ b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
@@ -15,6 +15,8 @@
  * Includes: current_url, uri_string, uri_is
  *
  * @backupGlobals enabled
+ *
+ * @internal
  */
 final class CurrentUrlTest extends CIUnitTestCase
 {
diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php
index 02436c2a905c..36d99f7a80b8 100644
--- a/tests/system/Helpers/URLHelper/MiscUrlTest.php
+++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php
@@ -11,6 +11,8 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
 final class MiscUrlTest extends CIUnitTestCase
 {
diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php
index 4648e9587190..24503829d48a 100644
--- a/tests/system/Helpers/URLHelper/SiteUrlTest.php
+++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php
@@ -15,6 +15,8 @@
  * simultaneously.
  *
  * @backupGlobals enabled
+ *
+ * @internal
  */
 final class SiteUrlTest extends CIUnitTestCase
 {
diff --git a/tests/system/Helpers/XMLHelperTest.php b/tests/system/Helpers/XMLHelperTest.php
index 5534eb68e5cc..f84e557daae8 100644
--- a/tests/system/Helpers/XMLHelperTest.php
+++ b/tests/system/Helpers/XMLHelperTest.php
@@ -4,7 +4,10 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 
-class XMLHelperTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class XMLHelperTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/HomeTest.php b/tests/system/HomeTest.php
index 8d473b72800f..7e47df728df7 100644
--- a/tests/system/HomeTest.php
+++ b/tests/system/HomeTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\FeatureTestTrait;
 
-class HomeTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class HomeTest extends CIUnitTestCase
 {
     use FeatureTestTrait;
 
diff --git a/tests/system/Honeypot/HoneypotTest.php b/tests/system/Honeypot/HoneypotTest.php
index 18a2084022f2..2945890cf9bc 100644
--- a/tests/system/Honeypot/HoneypotTest.php
+++ b/tests/system/Honeypot/HoneypotTest.php
@@ -9,8 +9,10 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class HoneypotTest extends CIUnitTestCase
+final class HoneypotTest extends CIUnitTestCase
 {
     protected $config;
     protected $honeypot;
diff --git a/tests/system/I18n/TimeDifferenceTest.php b/tests/system/I18n/TimeDifferenceTest.php
index 5cad4519802a..e64e4fcfe1d4 100644
--- a/tests/system/I18n/TimeDifferenceTest.php
+++ b/tests/system/I18n/TimeDifferenceTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use Locale;
 
-class TimeDifferenceTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class TimeDifferenceTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php
index 08d4a331c53d..eb2a0036287e 100644
--- a/tests/system/I18n/TimeTest.php
+++ b/tests/system/I18n/TimeTest.php
@@ -9,7 +9,10 @@
 use IntlDateFormatter;
 use Locale;
 
-class TimeTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class TimeTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/Images/BaseHandlerTest.php b/tests/system/Images/BaseHandlerTest.php
index 6a3f42cd76c1..cd180c1d6586 100644
--- a/tests/system/Images/BaseHandlerTest.php
+++ b/tests/system/Images/BaseHandlerTest.php
@@ -16,8 +16,10 @@
  * with vfsStream, so the support files are used directly for
  * most work, and the virtual file system will be used for
  * testing saving only.
+ *
+ * @internal
  */
-class BaseHandlerTest extends CIUnitTestCase
+final class BaseHandlerTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/Images/GDHandlerTest.php b/tests/system/Images/GDHandlerTest.php
index 3a9cc6b4efb5..92008b8f6017 100644
--- a/tests/system/Images/GDHandlerTest.php
+++ b/tests/system/Images/GDHandlerTest.php
@@ -15,8 +15,10 @@
  * and we can make sure the code coverage is good.
  *
  * Was unable to test fontPath & related logic.
+ *
+ * @internal
  */
-class GDHandlerTest extends CIUnitTestCase
+final class GDHandlerTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/Images/ImageMagickHandlerTest.php b/tests/system/Images/ImageMagickHandlerTest.php
index 56a7e2d045bb..729b9c9cde5b 100644
--- a/tests/system/Images/ImageMagickHandlerTest.php
+++ b/tests/system/Images/ImageMagickHandlerTest.php
@@ -16,8 +16,10 @@
  * and we can make sure the code coverage is good.
  *
  * Was unable to test fontPath & related logic.
+ *
+ * @internal
  */
-class ImageMagickHandlerTest extends CIUnitTestCase
+final class ImageMagickHandlerTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/Images/ImageTest.php b/tests/system/Images/ImageTest.php
index e4ac95960c8b..93cf2e1e2598 100644
--- a/tests/system/Images/ImageTest.php
+++ b/tests/system/Images/ImageTest.php
@@ -6,7 +6,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use org\bovigo\vfs\vfsStream;
 
-class ImageTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ImageTest extends CIUnitTestCase
 {
     protected $path = 'tests/_support/ci-logo.png';
 
diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php
index 06152922c3a2..ba81e9127701 100644
--- a/tests/system/Language/LanguageTest.php
+++ b/tests/system/Language/LanguageTest.php
@@ -7,7 +7,10 @@
 use Config\Services;
 use Tests\Support\Language\SecondMockLanguage;
 
-class LanguageTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class LanguageTest extends CIUnitTestCase
 {
     /**
      * @var MockLanguage
diff --git a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
index 297808d0ab81..fb9897ae59ea 100644
--- a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
+++ b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
@@ -9,7 +9,10 @@
 use Config\App;
 use stdClass;
 
-class ChromeLoggerHandlerTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ChromeLoggerHandlerTest extends CIUnitTestCase
 {
     public function testCanHandleLogLevel()
     {
diff --git a/tests/system/Log/Handlers/ErrorlogHandlerTest.php b/tests/system/Log/Handlers/ErrorlogHandlerTest.php
index 10ddfbe15bb0..ca8203a2e116 100644
--- a/tests/system/Log/Handlers/ErrorlogHandlerTest.php
+++ b/tests/system/Log/Handlers/ErrorlogHandlerTest.php
@@ -6,6 +6,9 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 
+/**
+ * @internal
+ */
 final class ErrorlogHandlerTest extends CIUnitTestCase
 {
     public function testHandlerThrowsOnInvalidMessageType(): void
diff --git a/tests/system/Log/Handlers/FileHandlerTest.php b/tests/system/Log/Handlers/FileHandlerTest.php
index 968f2de8848a..dca8d3ad1bc5 100644
--- a/tests/system/Log/Handlers/FileHandlerTest.php
+++ b/tests/system/Log/Handlers/FileHandlerTest.php
@@ -7,7 +7,10 @@
 use CodeIgniter\Test\Mock\MockLogger as LoggerConfig;
 use org\bovigo\vfs\vfsStream;
 
-class FileHandlerTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FileHandlerTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/Log/LoggerTest.php b/tests/system/Log/LoggerTest.php
index 16be520d5af2..13d17f1733d3 100644
--- a/tests/system/Log/LoggerTest.php
+++ b/tests/system/Log/LoggerTest.php
@@ -11,7 +11,10 @@
 use Exception;
 use Tests\Support\Log\Handlers\TestHandler;
 
-class LoggerTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class LoggerTest extends CIUnitTestCase
 {
     public function testThrowsExceptionWithBadHandlerSettings()
     {
diff --git a/tests/system/Models/CountAllModelTest.php b/tests/system/Models/CountAllModelTest.php
index b6c6c4467902..eab41b699d87 100644
--- a/tests/system/Models/CountAllModelTest.php
+++ b/tests/system/Models/CountAllModelTest.php
@@ -5,6 +5,9 @@
 use CodeIgniter\Database\BaseBuilder;
 use Tests\Support\Models\UserModel;
 
+/**
+ * @internal
+ */
 final class CountAllModelTest extends LiveModelTestCase
 {
     /**
diff --git a/tests/system/Models/DeleteModelTest.php b/tests/system/Models/DeleteModelTest.php
index b62d4943ab6c..1014e2e941b5 100644
--- a/tests/system/Models/DeleteModelTest.php
+++ b/tests/system/Models/DeleteModelTest.php
@@ -8,6 +8,9 @@
 use Tests\Support\Models\StringifyPkeyModel;
 use Tests\Support\Models\UserModel;
 
+/**
+ * @internal
+ */
 final class DeleteModelTest extends LiveModelTestCase
 {
     public function testDeleteBasics(): void
diff --git a/tests/system/Models/EventsModelTest.php b/tests/system/Models/EventsModelTest.php
index bd19f0740f6c..6492975f52f0 100644
--- a/tests/system/Models/EventsModelTest.php
+++ b/tests/system/Models/EventsModelTest.php
@@ -5,6 +5,9 @@
 use CodeIgniter\Database\Exceptions\DataException;
 use Tests\Support\Models\EventModel;
 
+/**
+ * @internal
+ */
 final class EventsModelTest extends LiveModelTestCase
 {
     /**
diff --git a/tests/system/Models/FindModelTest.php b/tests/system/Models/FindModelTest.php
index fd7b57aa7de4..f044833a6f78 100644
--- a/tests/system/Models/FindModelTest.php
+++ b/tests/system/Models/FindModelTest.php
@@ -8,6 +8,9 @@
 use Tests\Support\Models\SecondaryModel;
 use Tests\Support\Models\UserModel;
 
+/**
+ * @internal
+ */
 final class FindModelTest extends LiveModelTestCase
 {
     public function testFindReturnsRow(): void
diff --git a/tests/system/Models/GeneralModelTest.php b/tests/system/Models/GeneralModelTest.php
index 517b230d343e..0c24929773a5 100644
--- a/tests/system/Models/GeneralModelTest.php
+++ b/tests/system/Models/GeneralModelTest.php
@@ -12,6 +12,8 @@
 /**
  * GeneralModelTest should be used when only testing Model's
  * features without requiring a database connection.
+ *
+ * @internal
  */
 final class GeneralModelTest extends CIUnitTestCase
 {
diff --git a/tests/system/Models/InsertModelTest.php b/tests/system/Models/InsertModelTest.php
index 1b2716b06a78..95339157d2f7 100644
--- a/tests/system/Models/InsertModelTest.php
+++ b/tests/system/Models/InsertModelTest.php
@@ -10,6 +10,9 @@
 use Tests\Support\Models\UserModel;
 use Tests\Support\Models\WithoutAutoIncrementModel;
 
+/**
+ * @internal
+ */
 final class InsertModelTest extends LiveModelTestCase
 {
     public function testSetWorksWithInsert(): void
diff --git a/tests/system/Models/MiscellaneousModelTest.php b/tests/system/Models/MiscellaneousModelTest.php
index 78c569d1fa2c..80e05d76c3c0 100644
--- a/tests/system/Models/MiscellaneousModelTest.php
+++ b/tests/system/Models/MiscellaneousModelTest.php
@@ -10,6 +10,9 @@
 use Tests\Support\Models\UserModel;
 use Tests\Support\Models\ValidModel;
 
+/**
+ * @internal
+ */
 final class MiscellaneousModelTest extends LiveModelTestCase
 {
     public function testChunk(): void
diff --git a/tests/system/Models/PaginateModelTest.php b/tests/system/Models/PaginateModelTest.php
index 9f86f02a7751..e7ac070e4909 100644
--- a/tests/system/Models/PaginateModelTest.php
+++ b/tests/system/Models/PaginateModelTest.php
@@ -5,6 +5,9 @@
 use Tests\Support\Models\UserModel;
 use Tests\Support\Models\ValidModel;
 
+/**
+ * @internal
+ */
 final class PaginateModelTest extends LiveModelTestCase
 {
     public function testPaginate(): void
diff --git a/tests/system/Models/SaveModelTest.php b/tests/system/Models/SaveModelTest.php
index e1a4e688baee..da624349c6d0 100644
--- a/tests/system/Models/SaveModelTest.php
+++ b/tests/system/Models/SaveModelTest.php
@@ -14,6 +14,9 @@
 use Tests\Support\Models\ValidModel;
 use Tests\Support\Models\WithoutAutoIncrementModel;
 
+/**
+ * @internal
+ */
 final class SaveModelTest extends LiveModelTestCase
 {
     public function testSaveNewRecordObject(): void
diff --git a/tests/system/Models/UpdateModelTest.php b/tests/system/Models/UpdateModelTest.php
index 69779acd4e2c..34719c661ac3 100644
--- a/tests/system/Models/UpdateModelTest.php
+++ b/tests/system/Models/UpdateModelTest.php
@@ -12,6 +12,9 @@
 use Tests\Support\Models\ValidModel;
 use Tests\Support\Models\WithoutAutoIncrementModel;
 
+/**
+ * @internal
+ */
 final class UpdateModelTest extends LiveModelTestCase
 {
     public function testSetWorksWithUpdate(): void
diff --git a/tests/system/Models/ValidationModelTest.php b/tests/system/Models/ValidationModelTest.php
index da996aaf3e06..544ff587c89a 100644
--- a/tests/system/Models/ValidationModelTest.php
+++ b/tests/system/Models/ValidationModelTest.php
@@ -9,6 +9,9 @@
 use Tests\Support\Models\ValidErrorsModel;
 use Tests\Support\Models\ValidModel;
 
+/**
+ * @internal
+ */
 final class ValidationModelTest extends LiveModelTestCase
 {
     protected function setUp(): void
diff --git a/tests/system/Pager/PagerRendererTest.php b/tests/system/Pager/PagerRendererTest.php
index f5884f1ec83d..f229bf488620 100644
--- a/tests/system/Pager/PagerRendererTest.php
+++ b/tests/system/Pager/PagerRendererTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\Test\CIUnitTestCase;
 
-class PagerRendererTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class PagerRendererTest extends CIUnitTestCase
 {
     /**
      * @var URI
diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index abcbff48af84..9bc355fdfb41 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -11,8 +11,10 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class PagerTest extends CIUnitTestCase
+final class PagerTest extends CIUnitTestCase
 {
 
     /**
diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index a034cd9f4164..d49a2bdf0b1d 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -25,8 +25,10 @@
  *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState         disabled
+ *
+ * @internal
  */
-class ResourceControllerTest extends CIUnitTestCase
+final class ResourceControllerTest extends CIUnitTestCase
 {
 
     /**
diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php
index cb5c10291549..b0703e043253 100644
--- a/tests/system/RESTful/ResourcePresenterTest.php
+++ b/tests/system/RESTful/ResourcePresenterTest.php
@@ -19,8 +19,10 @@
  *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState         disabled
+ *
+ * @internal
  */
-class ResourcePresenterTest extends CIUnitTestCase
+final class ResourcePresenterTest extends CIUnitTestCase
 {
 
     /**
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index bd8deeea9f6e..ee6b4d529dc8 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -9,8 +9,10 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class RouteCollectionTest extends CIUnitTestCase
+final class RouteCollectionTest extends CIUnitTestCase
 {
     public function tearDown(): void
     {
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index c1ede0f37e34..e91e0fd35da6 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -8,7 +8,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Modules;
 
-class RouterTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class RouterTest extends CIUnitTestCase
 {
 
     /**
diff --git a/tests/system/Security/SecurityTest.php b/tests/system/Security/SecurityTest.php
index 8b7e7d66c8c3..bee38f996594 100644
--- a/tests/system/Security/SecurityTest.php
+++ b/tests/system/Security/SecurityTest.php
@@ -16,8 +16,10 @@
 
 /**
  * @backupGlobals enabled
+ *
+ * @internal
  */
-class SecurityTest extends CIUnitTestCase
+final class SecurityTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/Session/SessionTest.php b/tests/system/Session/SessionTest.php
index 94ac22ea5a43..0deb4b464a6f 100644
--- a/tests/system/Session/SessionTest.php
+++ b/tests/system/Session/SessionTest.php
@@ -16,8 +16,10 @@
  * @runTestsInSeparateProcesses
  *
  * @preserveGlobalState disabled
+ *
+ * @internal
  */
-class SessionTest extends CIUnitTestCase
+final class SessionTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/Test/BootstrapFCPATHTest.php b/tests/system/Test/BootstrapFCPATHTest.php
index 7622438db99e..8f8fd73e272f 100644
--- a/tests/system/Test/BootstrapFCPATHTest.php
+++ b/tests/system/Test/BootstrapFCPATHTest.php
@@ -11,9 +11,11 @@
  * It writes a file in the temp directory that loads the bootstrap file
  * then compares its echo FCPATH; to the correct FCPATH returned
  * from correctFCPATH();
+ *
+ * @internal
  */
 
-class BootstrapFCPATHTest extends CIUnitTestCase
+final class BootstrapFCPATHTest extends CIUnitTestCase
 {
     private $currentDir = __DIR__;
     private $dir1       = '/tmp/dir1';
diff --git a/tests/system/Test/ControllerTestTraitTest.php b/tests/system/Test/ControllerTestTraitTest.php
index 5933140925f1..b9f261abed5c 100644
--- a/tests/system/Test/ControllerTestTraitTest.php
+++ b/tests/system/Test/ControllerTestTraitTest.php
@@ -16,8 +16,10 @@
  *
  * @runTestsInSeparateProcesses
  * @preserveGlobalState         disabled
+ *
+ * @internal
  */
-class ControllerTestTraitTest extends CIUnitTestCase
+final class ControllerTestTraitTest extends CIUnitTestCase
 {
     use ControllerTestTrait;
 
diff --git a/tests/system/Test/DOMParserTest.php b/tests/system/Test/DOMParserTest.php
index af0626ba0119..98474cb9f4c5 100644
--- a/tests/system/Test/DOMParserTest.php
+++ b/tests/system/Test/DOMParserTest.php
@@ -4,7 +4,10 @@
 
 use InvalidArgumentException;
 
-class DOMParserTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class DOMParserTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/Test/FabricatorTest.php b/tests/system/Test/FabricatorTest.php
index 4ff7955f0441..4d8e39693c32 100644
--- a/tests/system/Test/FabricatorTest.php
+++ b/tests/system/Test/FabricatorTest.php
@@ -11,7 +11,10 @@
 use Tests\Support\Models\FabricatorModel;
 use Tests\Support\Models\UserModel;
 
-class FabricatorTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FabricatorTest extends CIUnitTestCase
 {
     /**
      * Default formatters to use for UserModel. Should match detected version.
diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php
index 929c54640747..3e5d9a1abb08 100644
--- a/tests/system/Test/FeatureTestTraitTest.php
+++ b/tests/system/Test/FeatureTestTraitTest.php
@@ -12,8 +12,10 @@
  * @group                       DatabaseLive
  * @runTestsInSeparateProcesses
  * @preserveGlobalState         disabled
+ *
+ * @internal
  */
-class FeatureTestTraitTest extends CIUnitTestCase
+final class FeatureTestTraitTest extends CIUnitTestCase
 {
     use FeatureTestTrait;
 
diff --git a/tests/system/Test/FilterTestTraitTest.php b/tests/system/Test/FilterTestTraitTest.php
index 9df20bdd798d..149426b4fa2f 100644
--- a/tests/system/Test/FilterTestTraitTest.php
+++ b/tests/system/Test/FilterTestTraitTest.php
@@ -21,8 +21,10 @@
  * in test/_support/Filters/Customfilter.php:
  *  - alias: test-customfilter
  *  - class: \Tests\Support\Filters\Customfilter::class
+ *
+ * @internal
  */
-class FilterTestTraitTest extends CIUnitTestCase
+final class FilterTestTraitTest extends CIUnitTestCase
 {
     use FilterTestTrait;
 
diff --git a/tests/system/Test/ReflectionHelperTest.php b/tests/system/Test/ReflectionHelperTest.php
index 78a7de8441c1..6565bcccb09c 100644
--- a/tests/system/Test/ReflectionHelperTest.php
+++ b/tests/system/Test/ReflectionHelperTest.php
@@ -2,7 +2,10 @@
 
 namespace CodeIgniter\Test;
 
-class ReflectionHelperTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ReflectionHelperTest extends CIUnitTestCase
 {
     public function testGetPrivatePropertyWithObject()
     {
diff --git a/tests/system/Test/TestCaseEmissionsTest.php b/tests/system/Test/TestCaseEmissionsTest.php
index 4bacbb2b9faf..a6a4d603b4d8 100644
--- a/tests/system/Test/TestCaseEmissionsTest.php
+++ b/tests/system/Test/TestCaseEmissionsTest.php
@@ -10,8 +10,10 @@
  * TestCaseTest because it messes with output
  * buffering from PHPUnit, and the individual
  * test cases need to be run as separate processes.
+ *
+ * @internal
  */
-class TestCaseEmissionsTest extends CIUnitTestCase
+final class TestCaseEmissionsTest extends CIUnitTestCase
 {
 
     /**
diff --git a/tests/system/Test/TestCaseTest.php b/tests/system/Test/TestCaseTest.php
index 0f821b8a937d..1295e547dece 100644
--- a/tests/system/Test/TestCaseTest.php
+++ b/tests/system/Test/TestCaseTest.php
@@ -8,7 +8,10 @@
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 use Config\App;
 
-class TestCaseTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class TestCaseTest extends CIUnitTestCase
 {
     //  protected function tearDown(): void
     //  {
diff --git a/tests/system/Test/TestResponseTest.php b/tests/system/Test/TestResponseTest.php
index 6554b4a70222..73d8e8010410 100644
--- a/tests/system/Test/TestResponseTest.php
+++ b/tests/system/Test/TestResponseTest.php
@@ -10,7 +10,10 @@
 use Config\Services;
 use PHPUnit\Framework\AssertionFailedError;
 
-class TestResponseTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class TestResponseTest extends CIUnitTestCase
 {
     /**
      * @var TestResponse
diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php
index 05dc01c65771..a3f1bf412558 100644
--- a/tests/system/Throttle/ThrottleTest.php
+++ b/tests/system/Throttle/ThrottleTest.php
@@ -5,7 +5,10 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockCache;
 
-class ThrottleTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ThrottleTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/Typography/TypographyTest.php b/tests/system/Typography/TypographyTest.php
index fab6e4398072..9ecf59d7b12c 100644
--- a/tests/system/Typography/TypographyTest.php
+++ b/tests/system/Typography/TypographyTest.php
@@ -4,7 +4,10 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 
-class TypographyTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class TypographyTest extends CIUnitTestCase
 {
     protected $typography;
 
diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php
index 91c2abc5cfd5..e5a1ee1343c4 100644
--- a/tests/system/Validation/CreditCardRulesTest.php
+++ b/tests/system/Validation/CreditCardRulesTest.php
@@ -6,7 +6,10 @@
 use Config\Services;
 use Tests\Support\Validation\TestRules;
 
-class CreditCardRulesTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class CreditCardRulesTest extends CIUnitTestCase
 {
 
     /**
diff --git a/tests/system/Validation/FileRulesTest.php b/tests/system/Validation/FileRulesTest.php
index 5252a57b2863..78f44d321380 100644
--- a/tests/system/Validation/FileRulesTest.php
+++ b/tests/system/Validation/FileRulesTest.php
@@ -6,7 +6,10 @@
 use Config\Services;
 use Tests\Support\Validation\TestRules;
 
-class FileRulesTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FileRulesTest extends CIUnitTestCase
 {
 
     /**
diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php
index 080df77e1227..f5be8b078281 100644
--- a/tests/system/Validation/FormatRulesTest.php
+++ b/tests/system/Validation/FormatRulesTest.php
@@ -6,7 +6,10 @@
 use Config\Services;
 use Tests\Support\Validation\TestRules;
 
-class FormatRulesTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FormatRulesTest extends CIUnitTestCase
 {
     public const ALPHABET     = 'abcdefghijklmnopqrstuvwxyzABCDEFGHLIJKLMNOPQRSTUVWXYZ';
     public const ALPHANUMERIC = 'abcdefghijklmnopqrstuvwxyzABCDEFGHLIJKLMNOPQRSTUVWXYZ0123456789';
diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
index 9f9ade6407cb..441e90cfc407 100644
--- a/tests/system/Validation/RulesTest.php
+++ b/tests/system/Validation/RulesTest.php
@@ -9,7 +9,10 @@
 use stdClass;
 use Tests\Support\Validation\TestRules;
 
-class RulesTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class RulesTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/View/CellTest.php b/tests/system/View/CellTest.php
index 378084685c09..6eecac3a2acb 100644
--- a/tests/system/View/CellTest.php
+++ b/tests/system/View/CellTest.php
@@ -7,7 +7,10 @@
 use CodeIgniter\View\Cell;
 use CodeIgniter\View\Exceptions\ViewException;
 
-class CellTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class CellTest extends CIUnitTestCase
 {
     protected $cache;
 
diff --git a/tests/system/View/ParserFilterTest.php b/tests/system/View/ParserFilterTest.php
index 050fe7d5b89a..64efc624f32f 100644
--- a/tests/system/View/ParserFilterTest.php
+++ b/tests/system/View/ParserFilterTest.php
@@ -7,7 +7,10 @@
 use CodeIgniter\View\Parser;
 use Config\View;
 
-class ParserFilterTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ParserFilterTest extends CIUnitTestCase
 {
     protected $loader;
     protected $viewsDir;
@@ -84,7 +87,7 @@ public function testDate()
 
     public function testDateModify()
     {
-        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
+        $parser    = new Parser($this->config, $this->viewsDir, $this->loader);
         $tommorrow = date('Y-m-d', strtotime('+1 day'));
 
         $data = [
diff --git a/tests/system/View/ParserPluginTest.php b/tests/system/View/ParserPluginTest.php
index 3bb01908036c..17dd2211516d 100644
--- a/tests/system/View/ParserPluginTest.php
+++ b/tests/system/View/ParserPluginTest.php
@@ -6,7 +6,10 @@
 use CodeIgniter\Validation\Validation;
 use Config\Services;
 
-class ParserPluginTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ParserPluginTest extends CIUnitTestCase
 {
     /**
      * @var Parser
diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php
index efbd1fddca95..0cc95ebe2b1b 100644
--- a/tests/system/View/ParserTest.php
+++ b/tests/system/View/ParserTest.php
@@ -10,7 +10,10 @@
 use Config\View as ViewConfig;
 use stdClass;
 
-class ParserTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ParserTest extends CIUnitTestCase
 {
     /**
      * @var FileLocator
diff --git a/tests/system/View/TableTest.php b/tests/system/View/TableTest.php
index b22a3c8e0227..b5383c6384ef 100644
--- a/tests/system/View/TableTest.php
+++ b/tests/system/View/TableTest.php
@@ -7,7 +7,10 @@
 use CodeIgniter\Test\Mock\MockTable;
 use stdClass;
 
-class TableTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class TableTest extends CIUnitTestCase
 {
     public function setUp(): void
     {
diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php
index 351deb622475..647c90d193fa 100644
--- a/tests/system/View/ViewTest.php
+++ b/tests/system/View/ViewTest.php
@@ -9,7 +9,10 @@
 use Config;
 use RuntimeException;
 
-class ViewTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class ViewTest extends CIUnitTestCase
 {
     protected $loader;
     protected $viewsDir;
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index aebcb75849dd..a9e047756d3b 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -89,9 +89,15 @@ public function __construct()
                     'phpstan-ignore-next-line',
                 ],
             ],
-            'compact_nullable_typehint'   => true,
-            'concat_space'                => ['spacing' => 'one'],
-            'constant_case'               => ['case' => 'lower'],
+            'compact_nullable_typehint' => true,
+            'concat_space'              => ['spacing' => 'one'],
+            'constant_case'             => ['case' => 'lower'],
+            'final_class'               => false,
+            'final_internal_class'      => [
+                'annotation_exclude'                         => ['@no-final'],
+                'annotation_include'                         => ['@internal'],
+                'consider_absent_docblock_as_internal_class' => false,
+            ],
             'function_to_constant'        => true,
             'heredoc_indentation'         => ['indentation' => 'start_plus_one'],
             'heredoc_to_nowdoc'           => true,
@@ -130,6 +136,7 @@ public function __construct()
             'not_operator_with_successor_space'       => true,
             'normalize_index_brace'                   => true,
             'ordered_imports'                         => ['sort_algorithm' => 'alpha'],
+            'php_unit_internal_class'                 => ['types' => ['normal', 'final']],
             'phpdoc_align'                            => true,
             'phpdoc_indent'                           => true,
             'phpdoc_inline_tag_normalizer'            => [

From 224f34799632edadf508f0254a83bcf65119df8e Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Fri, 25 Jun 2021 22:34:50 +0800
Subject: [PATCH 0027/2325] Normalize tests to use dedicated PHPUnit assertions

---
 system/Test/TestResponse.php                  |  4 ++--
 tests/system/CLI/CLITest.php                  |  8 +++----
 .../system/Cache/Handlers/FileHandlerTest.php |  8 +++----
 tests/system/CommonFunctionsTest.php          |  2 +-
 tests/system/Config/BaseConfigTest.php        |  2 +-
 tests/system/Config/FactoriesTest.php         |  2 +-
 tests/system/Database/ConfigTest.php          | 12 +++++-----
 tests/system/Database/Live/AliasTest.php      |  2 +-
 tests/system/Database/Live/BadQueryTest.php   |  2 +-
 tests/system/Database/Live/ConnectTest.php    |  4 ++--
 tests/system/Database/Live/DEBugTest.php      |  2 +-
 tests/system/Database/Live/GetTest.php        |  6 ++---
 .../Database/Live/SQLite/AlterTableTest.php   | 22 +++++++++---------
 tests/system/EntityTest.php                   |  8 +++----
 tests/system/HTTP/CLIRequestTest.php          |  2 +-
 tests/system/HTTP/CURLRequestTest.php         |  4 ++--
 .../system/HTTP/Files/FileCollectionTest.php  |  2 +-
 tests/system/HTTP/HeaderTest.php              |  2 +-
 tests/system/HTTP/RequestTest.php             |  2 +-
 tests/system/HTTP/URITest.php                 |  2 +-
 tests/system/Helpers/HTMLHelperTest.php       |  2 +-
 tests/system/Helpers/NumberHelperTest.php     |  6 ++---
 tests/system/Honeypot/HoneypotTest.php        |  4 ++--
 tests/system/Images/GDHandlerTest.php         |  2 +-
 .../system/Images/ImageMagickHandlerTest.php  |  8 +++----
 tests/system/Language/LanguageTest.php        |  6 ++---
 tests/system/Pager/PagerRendererTest.php      |  8 +++----
 tests/system/Router/RouteCollectionTest.php   | 10 ++++----
 tests/system/Session/SessionTest.php          |  4 ++--
 tests/system/View/ViewTest.php                | 10 ++++----
 utils/PhpCsFixer/CodeIgniter4.php             | 23 +++++++++++++++----
 31 files changed, 98 insertions(+), 83 deletions(-)

diff --git a/system/Test/TestResponse.php b/system/Test/TestResponse.php
index ca7cf5d72f29..cbba8976ffad 100644
--- a/system/Test/TestResponse.php
+++ b/system/Test/TestResponse.php
@@ -268,7 +268,7 @@ public function getRedirectUrl(): ?string
      */
     public function assertSessionHas(string $key, $value = null)
     {
-        $this->assertTrue(array_key_exists($key, $_SESSION), "'{$key}' is not in the current \$_SESSION");
+        $this->assertArrayHasKey($key, $_SESSION, "'{$key}' is not in the current \$_SESSION");
 
         if (is_null($value)) {
             return;
@@ -290,7 +290,7 @@ public function assertSessionHas(string $key, $value = null)
      */
     public function assertSessionMissing(string $key)
     {
-        $this->assertFalse(array_key_exists($key, $_SESSION), "'{$key}' should not be present in \$_SESSION.");
+        $this->assertArrayNotHasKey($key, $_SESSION, "'{$key}' should not be present in \$_SESSION.");
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php
index 7f89d6bd40cb..33cad5d788b8 100644
--- a/tests/system/CLI/CLITest.php
+++ b/tests/system/CLI/CLITest.php
@@ -276,7 +276,7 @@ public function testParseCommand()
         ];
         $_SERVER['argc'] = 3;
         CLI::init();
-        $this->assertEquals(null, CLI::getSegment(3));
+        $this->assertNull(CLI::getSegment(3));
         $this->assertEquals('b', CLI::getSegment(1));
         $this->assertEquals('c', CLI::getSegment(2));
         $this->assertEquals('b/c', CLI::getURI());
@@ -301,7 +301,7 @@ public function testParseCommandMixed()
             'sure',
         ];
         CLI::init();
-        $this->assertEquals(null, CLI::getSegment(7));
+        $this->assertNull(CLI::getSegment(7));
         $this->assertEquals('b', CLI::getSegment(1));
         $this->assertEquals('c', CLI::getSegment(2));
         $this->assertEquals('d', CLI::getSegment(3));
@@ -362,12 +362,12 @@ public function testWindow()
         $height = new ReflectionProperty(CLI::class, 'height');
         $height->setAccessible(true);
         $height->setValue(null);
-        $this->assertTrue(is_int(CLI::getHeight()));
+        $this->assertIsInt(CLI::getHeight());
 
         $width = new ReflectionProperty(CLI::class, 'width');
         $width->setAccessible(true);
         $width->setValue(null);
-        $this->assertTrue(is_int(CLI::getWidth()));
+        $this->assertIsInt(CLI::getWidth());
     }
 
     /**
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index 15d77715a5a3..fb29f9f3acba 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -163,14 +163,14 @@ public function testDeleteMatchingPrefix()
         }
 
         // check that there are 101 items is cache store
-        $this->assertSame(101, count($this->fileHandler->getCacheInfo()));
+        $this->assertCount(101, $this->fileHandler->getCacheInfo());
 
         // Checking that given the prefix "key_1", deleteMatching deletes 13 keys:
         // (key_1, key_10, key_11, key_12, key_13, key_14, key_15, key_16, key_17, key_18, key_19, key_100, key_101)
         $this->assertSame(13, $this->fileHandler->deleteMatching('key_1*'));
 
         // check that there remains (101 - 13) = 88 items is cache store
-        $this->assertSame(88, count($this->fileHandler->getCacheInfo()));
+        $this->assertCount(88, $this->fileHandler->getCacheInfo());
 
         // Clear all files
         $this->fileHandler->clean();
@@ -184,14 +184,14 @@ public function testDeleteMatchingSuffix()
         }
 
         // check that there are 101 items is cache store
-        $this->assertSame(101, count($this->fileHandler->getCacheInfo()));
+        $this->assertCount(101, $this->fileHandler->getCacheInfo());
 
         // Checking that given the suffix "1", deleteMatching deletes 11 keys:
         // (key_1, key_11, key_21, key_31, key_41, key_51, key_61, key_71, key_81, key_91, key_101)
         $this->assertSame(11, $this->fileHandler->deleteMatching('*1'));
 
         // check that there remains (101 - 13) = 88 items is cache store
-        $this->assertSame(90, count($this->fileHandler->getCacheInfo()));
+        $this->assertCount(90, $this->fileHandler->getCacheInfo());
 
         // Clear all files
         $this->fileHandler->clean();
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index ca96ee288ca0..972f0a96b496 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -194,7 +194,7 @@ public function testSessionVariableNotThere()
         $this->injectSessionMock();
 
         $_SESSION['bogus'] = 'Hi there';
-        $this->assertEquals(null, session('notbogus'));
+        $this->assertNull(session('notbogus'));
     }
 
     public function testRouteTo()
diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php
index 15f759ad383c..98a3f90fc10b 100644
--- a/tests/system/Config/BaseConfigTest.php
+++ b/tests/system/Config/BaseConfigTest.php
@@ -257,6 +257,6 @@ public function testDidDiscovery()
         $method = $this->getPrivateMethodInvoker($config, 'registerProperties');
         $method();
 
-        $this->assertSame(true, $this->getPrivateProperty($config, 'didDiscovery'));
+        $this->assertTrue($this->getPrivateProperty($config, 'didDiscovery'));
     }
 }
diff --git a/tests/system/Config/FactoriesTest.php b/tests/system/Config/FactoriesTest.php
index ffb194134839..f9bddc928c56 100644
--- a/tests/system/Config/FactoriesTest.php
+++ b/tests/system/Config/FactoriesTest.php
@@ -62,7 +62,7 @@ public function testSetsOptions()
         $result = Factories::getOptions('widgets');
 
         $this->assertEquals('bar', $result['foo']);
-        $this->assertEquals(true, $result['preferApp']);
+        $this->assertTrue($result['preferApp']);
     }
 
     public function testUsesConfigOptions()
diff --git a/tests/system/Database/ConfigTest.php b/tests/system/Database/ConfigTest.php
index 326f922164f6..e98bb96c1c4c 100644
--- a/tests/system/Database/ConfigTest.php
+++ b/tests/system/Database/ConfigTest.php
@@ -130,10 +130,10 @@ public function testConnectionGroupWithDSN()
         $this->assertEquals('3306', $this->getPrivateProperty($conn, 'port'));
         $this->assertEquals('MySQLi', $this->getPrivateProperty($conn, 'DBDriver'));
         $this->assertEquals('test_', $this->getPrivateProperty($conn, 'DBPrefix'));
-        $this->assertEquals(true, $this->getPrivateProperty($conn, 'pConnect'));
+        $this->assertTrue($this->getPrivateProperty($conn, 'pConnect'));
         $this->assertEquals('latin1', $this->getPrivateProperty($conn, 'charset'));
         $this->assertEquals('latin1_swedish_ci', $this->getPrivateProperty($conn, 'DBCollat'));
-        $this->assertEquals(true, $this->getPrivateProperty($conn, 'strictOn'));
+        $this->assertTrue($this->getPrivateProperty($conn, 'strictOn'));
         $this->assertEquals([], $this->getPrivateProperty($conn, 'failover'));
     }
 
@@ -150,10 +150,10 @@ public function testConnectionGroupWithDSNPostgre()
         $this->assertEquals('5432', $this->getPrivateProperty($conn, 'port'));
         $this->assertEquals('Postgre', $this->getPrivateProperty($conn, 'DBDriver'));
         $this->assertEquals('test_', $this->getPrivateProperty($conn, 'DBPrefix'));
-        $this->assertEquals(false, $this->getPrivateProperty($conn, 'pConnect'));
+        $this->assertFalse($this->getPrivateProperty($conn, 'pConnect'));
         $this->assertEquals('utf8', $this->getPrivateProperty($conn, 'charset'));
         $this->assertEquals('utf8_general_ci', $this->getPrivateProperty($conn, 'DBCollat'));
-        $this->assertEquals(true, $this->getPrivateProperty($conn, 'strictOn'));
+        $this->assertTrue($this->getPrivateProperty($conn, 'strictOn'));
         $this->assertEquals([], $this->getPrivateProperty($conn, 'failover'));
         $this->assertEquals('5', $this->getPrivateProperty($conn, 'connect_timeout'));
         $this->assertEquals('1', $this->getPrivateProperty($conn, 'sslmode'));
@@ -178,10 +178,10 @@ public function testConnectionGroupWithDSNPostgreNative()
         $this->assertEquals('5432', $this->getPrivateProperty($conn, 'port'));
         $this->assertEquals('Postgre', $this->getPrivateProperty($conn, 'DBDriver'));
         $this->assertEquals('t_', $this->getPrivateProperty($conn, 'DBPrefix'));
-        $this->assertEquals(false, $this->getPrivateProperty($conn, 'pConnect'));
+        $this->assertFalse($this->getPrivateProperty($conn, 'pConnect'));
         $this->assertEquals('utf8', $this->getPrivateProperty($conn, 'charset'));
         $this->assertEquals('utf8_general_ci', $this->getPrivateProperty($conn, 'DBCollat'));
-        $this->assertEquals(true, $this->getPrivateProperty($conn, 'strictOn'));
+        $this->assertTrue($this->getPrivateProperty($conn, 'strictOn'));
         $this->assertEquals([], $this->getPrivateProperty($conn, 'failover'));
     }
 }
diff --git a/tests/system/Database/Live/AliasTest.php b/tests/system/Database/Live/AliasTest.php
index e180767c5a43..40776641e931 100644
--- a/tests/system/Database/Live/AliasTest.php
+++ b/tests/system/Database/Live/AliasTest.php
@@ -26,7 +26,7 @@ public function testAlias()
             ->where('j.name', 'Developer')
             ->get();
 
-        $this->assertEquals(1, count($jobs->getResult()));
+        $this->assertCount(1, $jobs->getResult());
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Database/Live/BadQueryTest.php b/tests/system/Database/Live/BadQueryTest.php
index 8bafb8de710d..a1552f12a70c 100644
--- a/tests/system/Database/Live/BadQueryTest.php
+++ b/tests/system/Database/Live/BadQueryTest.php
@@ -49,7 +49,7 @@ public function testBadQueryDebugFalse()
         $this->setPrivateProperty($this->db, 'DBDebug', false);
         // this throws an exception when DBDebug is true, but it'll return FALSE when DBDebug is false
         $query = $this->db->query('SELECT * FROM table_does_not_exist');
-        $this->assertEquals(false, $query);
+        $this->assertFalse($query);
 
         // restore the DBDebug value in effect when this unit test began
         $this->setPrivateProperty($this->db, 'DBDebug', self::$origDebug);
diff --git a/tests/system/Database/Live/ConnectTest.php b/tests/system/Database/Live/ConnectTest.php
index a3a7b33c935a..2cf84ea1626f 100644
--- a/tests/system/Database/Live/ConnectTest.php
+++ b/tests/system/Database/Live/ConnectTest.php
@@ -41,7 +41,7 @@ public function testConnectWithMultipleCustomGroups()
     {
         // We should have our test database connection already.
         $instances = $this->getPrivateProperty(Database::class, 'instances');
-        $this->assertEquals(1, count($instances));
+        $this->assertCount(1, $instances);
 
         $db1 = Database::connect($this->group1);
         $db2 = Database::connect($this->group2);
@@ -49,7 +49,7 @@ public function testConnectWithMultipleCustomGroups()
         $this->assertNotSame($db1, $db2);
 
         $instances = $this->getPrivateProperty(Database::class, 'instances');
-        $this->assertEquals(3, count($instances));
+        $this->assertCount(3, $instances);
     }
 
     public function testConnectReturnsProvidedConnection()
diff --git a/tests/system/Database/Live/DEBugTest.php b/tests/system/Database/Live/DEBugTest.php
index 6f090b2d2184..cb025f7f44f6 100644
--- a/tests/system/Database/Live/DEBugTest.php
+++ b/tests/system/Database/Live/DEBugTest.php
@@ -27,7 +27,7 @@ public function testDBDebugFalse()
     {
         $this->setPrivateProperty($this->db, 'DBDebug', false);
         $result = $this->db->simpleQuery('SELECT * FROM db_error');
-        $this->assertEquals(false, $result);
+        $this->assertFalse($result);
     }
 
     public function tearDown(): void
diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php
index a43d50921d59..f644fd38982b 100644
--- a/tests/system/Database/Live/GetTest.php
+++ b/tests/system/Database/Live/GetTest.php
@@ -163,9 +163,9 @@ public function testGetFieldData()
             $this->assertEquals('int', $typeTest[5]->type_name);  //INTEGER
             $this->assertEquals('float', $typeTest[6]->type_name);  //FLOAT
             $this->assertEquals('numeric', $typeTest[7]->type_name);  //NUMERIC
-            $this->assertEquals(null, $typeTest[8]->type_name);  //DATE
-            $this->assertEquals(null, $typeTest[9]->type_name);  //TIME
-            $this->assertEquals(null, $typeTest[10]->type_name);  //DATETIME
+            $this->assertNull($typeTest[8]->type_name);  //DATE
+            $this->assertNull($typeTest[9]->type_name);  //TIME
+            $this->assertNull($typeTest[10]->type_name);  //DATETIME
             $this->assertEquals('bigint', $typeTest[11]->type_name); //BIGINT
             $this->assertEquals('real', $typeTest[12]->type_name);  //REAL
             $this->assertEquals('decimal', $typeTest[13]->type_name);  //DECIMAL
diff --git a/tests/system/Database/Live/SQLite/AlterTableTest.php b/tests/system/Database/Live/SQLite/AlterTableTest.php
index 3b618951af97..6c75801e24b6 100644
--- a/tests/system/Database/Live/SQLite/AlterTableTest.php
+++ b/tests/system/Database/Live/SQLite/AlterTableTest.php
@@ -85,17 +85,17 @@ public function testFromTableFillsDetails()
         $fields = $this->getPrivateProperty($this->table, 'fields');
 
         $this->assertCount(4, $fields);
-        $this->assertTrue(array_key_exists('id', $fields));
+        $this->assertArrayHasKey('id', $fields);
         $this->assertNull($fields['id']['default']);
         $this->assertTrue($fields['id']['null']);
         $this->assertEquals('integer', strtolower($fields['id']['type']));
 
-        $this->assertTrue(array_key_exists('name', $fields));
+        $this->assertArrayHasKey('name', $fields);
         $this->assertNull($fields['name']['default']);
         $this->assertFalse($fields['name']['null']);
         $this->assertEquals('varchar', strtolower($fields['name']['type']));
 
-        $this->assertTrue(array_key_exists('email', $fields));
+        $this->assertArrayHasKey('email', $fields);
         $this->assertNull($fields['email']['default']);
         $this->assertTrue($fields['email']['null']);
         $this->assertEquals('varchar', strtolower($fields['email']['type']));
@@ -103,11 +103,11 @@ public function testFromTableFillsDetails()
         $keys = $this->getPrivateProperty($this->table, 'keys');
 
         $this->assertCount(3, $keys);
-        $this->assertTrue(array_key_exists('foo_name', $keys));
+        $this->assertArrayHasKey('foo_name', $keys);
         $this->assertEquals(['fields' => ['name'], 'type' => 'index'], $keys['foo_name']);
-        $this->assertTrue(array_key_exists('id', $keys));
+        $this->assertArrayHasKey('id', $keys);
         $this->assertEquals(['fields' => ['id'], 'type' => 'primary'], $keys['id']);
-        $this->assertTrue(array_key_exists('id', $keys));
+        $this->assertArrayHasKey('id', $keys);
         $this->assertEquals(['fields' => ['id'], 'type' => 'primary'], $keys['id']);
     }
 
@@ -135,8 +135,8 @@ public function testDropColumnMaintainsKeys()
 
         $oldKeys = $this->db->getIndexData('foo');
 
-        $this->assertTrue(array_key_exists('foo_name', $oldKeys));
-        $this->assertTrue(array_key_exists('foo_email', $oldKeys));
+        $this->assertArrayHasKey('foo_name', $oldKeys);
+        $this->assertArrayHasKey('foo_email', $oldKeys);
 
         $result = $this->table
             ->fromTable('foo')
@@ -145,8 +145,8 @@ public function testDropColumnMaintainsKeys()
 
         $newKeys = $this->db->getIndexData('foo');
 
-        $this->assertFalse(array_key_exists('foo_name', $newKeys));
-        $this->assertTrue(array_key_exists('foo_email', $newKeys));
+        $this->assertArrayNotHasKey('foo_name', $newKeys);
+        $this->assertArrayHasKey('foo_email', $newKeys);
 
         $this->assertTrue($result);
     }
@@ -189,7 +189,7 @@ public function testDropForeignKeySuccess()
         $this->assertTrue($result);
 
         $keys = $this->db->getForeignKeyData('aliens');
-        $this->assertTrue(empty($keys));
+        $this->assertEmpty($keys);
     }
 
     public function testProcessCopiesOldData()
diff --git a/tests/system/EntityTest.php b/tests/system/EntityTest.php
index 5ebefaecdd75..ebd11a1df226 100644
--- a/tests/system/EntityTest.php
+++ b/tests/system/EntityTest.php
@@ -144,8 +144,8 @@ public function testIssetWorksWithMapping()
 
         $attributes = $this->getPrivateProperty($entity, 'attributes');
 
-        $this->assertTrue(array_key_exists('foo', $attributes));
-        $this->assertFalse(array_key_exists('bar', $attributes));
+        $this->assertArrayHasKey('foo', $attributes);
+        $this->assertArrayNotHasKey('bar', $attributes);
     }
 
     public function testUnsetWorksWithMapping()
@@ -492,9 +492,9 @@ public function testCastNullable()
     {
         $entity = $this->getCastNullableEntity();
 
-        $this->assertSame(null, $entity->string_null);
+        $this->assertNull($entity->string_null);
         $this->assertSame('', $entity->string_empty);
-        $this->assertSame(null, $entity->integer_null);
+        $this->assertNull($entity->integer_null);
         $this->assertSame(0, $entity->integer_0);
         $this->assertSame('value', $entity->string_value_not_null);
     }
diff --git a/tests/system/HTTP/CLIRequestTest.php b/tests/system/HTTP/CLIRequestTest.php
index a645dd4090a3..63e58db64b0f 100644
--- a/tests/system/HTTP/CLIRequestTest.php
+++ b/tests/system/HTTP/CLIRequestTest.php
@@ -423,7 +423,7 @@ public function testFetchGlobalWithArrayChildElement()
         $this->request->setGlobal('post', $post);
 
         $this->assertEquals(['zipcode' => 90210], $this->request->fetchGlobal('post', 'clients[address]'));
-        $this->assertEquals(null, $this->request->fetchGlobal('post', 'clients[zipcode]'));
+        $this->assertNull($this->request->fetchGlobal('post', 'clients[zipcode]'));
     }
 
     public function testFetchGlobalWithKeylessArrayChildElement()
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index 42b41d8d5670..96d9187d60d7 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -575,7 +575,7 @@ public function testDebugOptionTrue()
         $this->assertEquals(1, $options[CURLOPT_VERBOSE]);
 
         $this->assertArrayHasKey(CURLOPT_STDERR, $options);
-        $this->assertTrue(is_resource($options[CURLOPT_STDERR]));
+        $this->assertIsResource($options[CURLOPT_STDERR]);
     }
 
     public function testDebugOptionFalse()
@@ -604,7 +604,7 @@ public function testDebugOptionFile()
         $this->assertEquals(1, $options[CURLOPT_VERBOSE]);
 
         $this->assertArrayHasKey(CURLOPT_STDERR, $options);
-        $this->assertTrue(is_resource($options[CURLOPT_STDERR]));
+        $this->assertIsResource($options[CURLOPT_STDERR]);
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/HTTP/Files/FileCollectionTest.php b/tests/system/HTTP/Files/FileCollectionTest.php
index 95437c0efdbd..d043d5b156d3 100644
--- a/tests/system/HTTP/Files/FileCollectionTest.php
+++ b/tests/system/HTTP/Files/FileCollectionTest.php
@@ -195,7 +195,7 @@ public function testExtensionGuessing()
         $this->assertInstanceOf(UploadedFile::class, $file);
         $this->assertEquals('txt', $file->getExtension());
         // but not client mime type
-        $this->assertEquals(null, Mimes::guessExtensionFromType($file->getClientMimeType(), $file->getClientExtension()));
+        $this->assertNull(Mimes::guessExtensionFromType($file->getClientMimeType(), $file->getClientExtension()));
 
         // proposed extension does not match finfo_open mime type (text/plain)
         // but can be resolved by reverse searching
diff --git a/tests/system/HTTP/HeaderTest.php b/tests/system/HTTP/HeaderTest.php
index 0ca86a51f14f..8f60191d9676 100644
--- a/tests/system/HTTP/HeaderTest.php
+++ b/tests/system/HTTP/HeaderTest.php
@@ -60,7 +60,7 @@ public function testHeaderSetters()
 
         $header = new Header($name);
         $this->assertEquals($name, $header->getName());
-        $this->assertEquals(null, $header->getValue());
+        $this->assertEmpty($header->getValue());
         $this->assertEquals($name . ': ', (string) $header);
 
         $name = 'foo2';
diff --git a/tests/system/HTTP/RequestTest.php b/tests/system/HTTP/RequestTest.php
index 54d2cd18a6f7..c422b36ce7a4 100644
--- a/tests/system/HTTP/RequestTest.php
+++ b/tests/system/HTTP/RequestTest.php
@@ -238,7 +238,7 @@ public function testFetchGlobalWithArrayChildElement()
         $this->request->setGlobal('post', $post);
 
         $this->assertEquals(['zipcode' => 90210], $this->request->fetchGlobal('post', 'clients[address]'));
-        $this->assertEquals(null, $this->request->fetchGlobal('post', 'clients[zipcode]'));
+        $this->assertNull($this->request->fetchGlobal('post', 'clients[zipcode]'));
     }
 
     public function testFetchGlobalWithKeylessArrayChildElement()
diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php
index aeede2494ab5..8e2d7e54cfa5 100644
--- a/tests/system/HTTP/URITest.php
+++ b/tests/system/HTTP/URITest.php
@@ -298,7 +298,7 @@ public function testSetPortInvalidValuesSilent()
 
         $uri->setSilent()->setPort(70000);
 
-        $this->assertEquals(null, $uri->getPort());
+        $this->assertNull($uri->getPort());
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index 3604dd51e150..92eb5d9bc89c 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -295,7 +295,7 @@ public function testDocTypeDefault()
     public function testDocTypeInvalid()
     {
         $target = 'good-guess';
-        $this->assertEquals(false, doctype($target));
+        $this->assertEmpty(doctype($target));
     }
 
     // ------------------------------------------------------------------------
diff --git a/tests/system/Helpers/NumberHelperTest.php b/tests/system/Helpers/NumberHelperTest.php
index 2cd51cfa47bc..5ecdde8934e1 100755
--- a/tests/system/Helpers/NumberHelperTest.php
+++ b/tests/system/Helpers/NumberHelperTest.php
@@ -27,9 +27,9 @@ public function testRomanNumber()
 
     public function testRomanNumberRange()
     {
-        $this->assertEquals(null, number_to_roman(-1));
-        $this->assertEquals(null, number_to_roman(0));
-        $this->assertEquals(null, number_to_roman(4000));
+        $this->assertNull(number_to_roman(-1));
+        $this->assertNull(number_to_roman(0));
+        $this->assertNull(number_to_roman(4000));
     }
 
     public function testFormatNumber()
diff --git a/tests/system/Honeypot/HoneypotTest.php b/tests/system/Honeypot/HoneypotTest.php
index 2945890cf9bc..9dc7c8e77847 100644
--- a/tests/system/Honeypot/HoneypotTest.php
+++ b/tests/system/Honeypot/HoneypotTest.php
@@ -70,12 +70,12 @@ public function testHasntContent()
         unset($_POST[$this->config->name]);
         $this->request = Services::request();
 
-        $this->assertEquals(false, $this->honeypot->hasContent($this->request));
+        $this->assertFalse($this->honeypot->hasContent($this->request));
     }
 
     public function testHasContent()
     {
-        $this->assertEquals(true, $this->honeypot->hasContent($this->request));
+        $this->assertTrue($this->honeypot->hasContent($this->request));
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Images/GDHandlerTest.php b/tests/system/Images/GDHandlerTest.php
index 92008b8f6017..214af7d6c1b3 100644
--- a/tests/system/Images/GDHandlerTest.php
+++ b/tests/system/Images/GDHandlerTest.php
@@ -353,7 +353,7 @@ public function testImageCopyWithNoTargetAndMaxQuality()
         foreach (['gif', 'jpeg', 'png', 'webp'] as $type) {
             $this->handler->withFile($this->origin . 'ci-logo.' . $type);
             $this->handler->save(null, 100);
-            $this->assertTrue(file_exists($this->origin . 'ci-logo.' . $type));
+            $this->assertFileExists($this->origin . 'ci-logo.' . $type);
 
             $this->assertEquals(
                 file_get_contents($this->origin . 'ci-logo.' . $type),
diff --git a/tests/system/Images/ImageMagickHandlerTest.php b/tests/system/Images/ImageMagickHandlerTest.php
index 729b9c9cde5b..997274f6ff19 100644
--- a/tests/system/Images/ImageMagickHandlerTest.php
+++ b/tests/system/Images/ImageMagickHandlerTest.php
@@ -337,7 +337,7 @@ public function testImageCopy()
 
             $this->handler->withFile($this->origin . 'ci-logo.' . $type);
             $this->handler->save($this->root . 'ci-logo.' . $type);
-            $this->assertTrue(file_exists($this->root . 'ci-logo.' . $type));
+            $this->assertFileExists($this->root . 'ci-logo.' . $type);
 
             $this->assertNotEquals(
                 file_get_contents($this->origin . 'ci-logo.' . $type),
@@ -351,7 +351,7 @@ public function testImageCopyWithNoTargetAndMaxQuality()
         foreach (['gif', 'jpeg', 'png', 'webp'] as $type) {
             $this->handler->withFile($this->origin . 'ci-logo.' . $type);
             $this->handler->save(null, 100);
-            $this->assertTrue(file_exists($this->origin . 'ci-logo.' . $type));
+            $this->assertFileExists($this->origin . 'ci-logo.' . $type);
 
             $this->assertEquals(
                 file_get_contents($this->origin . 'ci-logo.' . $type),
@@ -371,7 +371,7 @@ public function testImageCompressionGetResource()
             $this->handler->withFile($this->origin . 'ci-logo.' . $type);
             $this->handler->getResource(); // make sure resource is loaded
             $this->handler->save($this->root . 'ci-logo.' . $type);
-            $this->assertTrue(file_exists($this->root . 'ci-logo.' . $type));
+            $this->assertFileExists($this->root . 'ci-logo.' . $type);
 
             $this->assertNotEquals(
                 file_get_contents($this->origin . 'ci-logo.' . $type),
@@ -392,7 +392,7 @@ public function testImageCompressionWithResource()
                 ->withResource() // make sure resource is loaded
                 ->save($this->root . 'ci-logo.' . $type);
 
-            $this->assertTrue(file_exists($this->root . 'ci-logo.' . $type));
+            $this->assertFileExists($this->root . 'ci-logo.' . $type);
 
             $this->assertNotEquals(
                 file_get_contents($this->origin . 'ci-logo.' . $type),
diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php
index ba81e9127701..53a6d60b2d2b 100644
--- a/tests/system/Language/LanguageTest.php
+++ b/tests/system/Language/LanguageTest.php
@@ -177,7 +177,7 @@ public function testLanguageFileLoading()
         $this->assertTrue(in_array('More', $this->lang->loaded(), true));
 
         $this->lang->loadem('More', 'en');
-        $this->assertEquals(1, count($this->lang->loaded())); // should only be there once
+        $this->assertCount(1, $this->lang->loaded()); // should only be there once
     }
 
     //--------------------------------------------------------------------
@@ -188,11 +188,11 @@ public function testLanguageFileLoadingReturns()
 
         $result = $this->lang->loadem('More', 'en', true);
         $this->assertFalse(in_array('More', $this->lang->loaded(), true));
-        $this->assertEquals(3, count($result));
+        $this->assertCount(3, $result);
 
         $result = $this->lang->loadem('More', 'en');
         $this->assertTrue(in_array('More', $this->lang->loaded(), true));
-        $this->assertEquals(1, count($this->lang->loaded()));
+        $this->assertCount(1, $this->lang->loaded());
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Pager/PagerRendererTest.php b/tests/system/Pager/PagerRendererTest.php
index f229bf488620..291d1289ba70 100644
--- a/tests/system/Pager/PagerRendererTest.php
+++ b/tests/system/Pager/PagerRendererTest.php
@@ -255,8 +255,8 @@ public function testSurroundCount()
         $pager = new PagerRenderer($details);
 
         // without any surround count
-        $this->assertEquals(null, $pager->getPrevious());
-        $this->assertEquals(null, $pager->getNext());
+        $this->assertNull($pager->getPrevious());
+        $this->assertNull($pager->getNext());
 
         // with surropund count of 2
         $pager->setSurroundCount(2);
@@ -270,8 +270,8 @@ public function testSurroundCount()
 
         // and with huge surround count
         $pager->setSurroundCount(100);
-        $this->assertEquals(null, $pager->getPrevious());
-        $this->assertEquals(null, $pager->getNext());
+        $this->assertNull($pager->getPrevious());
+        $this->assertNull($pager->getNext());
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index ee6b4d529dc8..a716cf2b99fa 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -1398,7 +1398,7 @@ public function test404OverrideNot()
         Services::request()->setMethod('get');
         $routes = $this->getCollector();
 
-        $this->assertEquals(null, $routes->get404Override());
+        $this->assertNull($routes->get404Override());
     }
 
     public function test404OverrideString()
@@ -1418,7 +1418,7 @@ public function test404OverrideCallable()
         $routes->set404Override(static function () {
             echo 'Explode now';
         });
-        $this->assertTrue(is_callable($routes->get404Override()));
+        $this->assertIsCallable($routes->get404Override());
     }
 
     //--------------------------------------------------------------------
@@ -1729,15 +1729,15 @@ public function testRoutePriorityDetected()
     {
         $collection = $this->getCollector();
 
-        $this->assertEquals(false, $this->getPrivateProperty($collection, 'prioritizeDetected'));
+        $this->assertFalse($this->getPrivateProperty($collection, 'prioritizeDetected'));
 
         $collection->add('/', 'Controller::method', ['priority' => 0]);
 
-        $this->assertEquals(false, $this->getPrivateProperty($collection, 'prioritizeDetected'));
+        $this->assertFalse($this->getPrivateProperty($collection, 'prioritizeDetected'));
 
         $collection->add('priority', 'Controller::method', ['priority' => 1]);
 
-        $this->assertEquals(true, $this->getPrivateProperty($collection, 'prioritizeDetected'));
+        $this->assertTrue($this->getPrivateProperty($collection, 'prioritizeDetected'));
     }
 
     public function testRoutePriorityValue()
diff --git a/tests/system/Session/SessionTest.php b/tests/system/Session/SessionTest.php
index 0deb4b464a6f..09f080adf7eb 100644
--- a/tests/system/Session/SessionTest.php
+++ b/tests/system/Session/SessionTest.php
@@ -188,8 +188,8 @@ public function testGetReturnsAllWithNoKeys()
 
         $result = $session->get();
 
-        $this->assertTrue(array_key_exists('foo', $result));
-        $this->assertTrue(array_key_exists('bar', $result));
+        $this->assertArrayHasKey('foo', $result);
+        $this->assertArrayHasKey('bar', $result);
     }
 
     public function testGetAsProperty()
diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php
index 647c90d193fa..81c223b88239 100644
--- a/tests/system/View/ViewTest.php
+++ b/tests/system/View/ViewTest.php
@@ -264,24 +264,24 @@ public function testPerformanceLogging()
     {
         // Make sure debugging is on for our view
         $view = new View($this->config, $this->viewsDir, $this->loader, true);
-        $this->assertEquals(0, count($view->getPerformanceData()));
+        $this->assertCount(0, $view->getPerformanceData());
 
         $view->setVar('testString', 'Hello World');
         $expected = '<h1>Hello World</h1>';
         $this->assertEquals($expected, $view->renderString('<h1><?= $testString ?></h1>', [], true));
-        $this->assertEquals(1, count($view->getPerformanceData()));
+        $this->assertCount(1, $view->getPerformanceData());
     }
 
     public function testPerformanceNonLogging()
     {
         // Make sure debugging is on for our view
         $view = new View($this->config, $this->viewsDir, $this->loader, false);
-        $this->assertEquals(0, count($view->getPerformanceData()));
+        $this->assertCount(0, $view->getPerformanceData());
 
         $view->setVar('testString', 'Hello World');
         $expected = '<h1>Hello World</h1>';
         $this->assertEquals($expected, $view->renderString('<h1><?= $testString ?></h1>', [], true));
-        $this->assertEquals(0, count($view->getPerformanceData()));
+        $this->assertCount(0, $view->getPerformanceData());
     }
 
     public function testRenderLayoutExtendsCorrectly()
@@ -366,7 +366,7 @@ public function testRenderSaveDataCover()
         $this->setPrivateProperty($view, 'saveData', true);
         $view->setVar('testString', 'test');
         $view->render('simple', null, false);
-        $this->assertEquals(true, $this->getPrivateProperty($view, 'saveData'));
+        $this->assertTrue($this->getPrivateProperty($view, 'saveData'));
     }
 
     public function testRenderSaveDataUseAfterSaveDataFalse()
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index a9e047756d3b..5342c64f7269 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -136,10 +136,25 @@ public function __construct()
             'not_operator_with_successor_space'       => true,
             'normalize_index_brace'                   => true,
             'ordered_imports'                         => ['sort_algorithm' => 'alpha'],
-            'php_unit_internal_class'                 => ['types' => ['normal', 'final']],
-            'phpdoc_align'                            => true,
-            'phpdoc_indent'                           => true,
-            'phpdoc_inline_tag_normalizer'            => [
+            'php_unit_construct'                      => [
+                'assertions' => [
+                    'assertSame',
+                    'assertEquals',
+                    'assertNotEquals',
+                    'assertNotSame',
+                ],
+            ],
+            'php_unit_dedicate_assert'               => ['target' => 'newest'],
+            'php_unit_dedicate_assert_internal_type' => ['target' => 'newest'],
+            'php_unit_expectation'                   => ['target' => 'newest'],
+            'php_unit_internal_class'                => ['types' => ['normal', 'final']],
+            'php_unit_no_expectation_annotation'     => [
+                'target'          => 'newest',
+                'use_class_const' => true,
+            ],
+            'phpdoc_align'                 => true,
+            'phpdoc_indent'                => true,
+            'phpdoc_inline_tag_normalizer' => [
                 'tags' => [
                     'example',
                     'id',

From f8bba8c9e116d6c7a3def7043793f9ad6c78767b Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Thu, 24 Jun 2021 23:24:23 +0800
Subject: [PATCH 0028/2325] Covers should be using FQCN

---
 utils/PhpCsFixer/CodeIgniter4.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 5342c64f7269..96c5f37b71a2 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -147,6 +147,7 @@ public function __construct()
             'php_unit_dedicate_assert'               => ['target' => 'newest'],
             'php_unit_dedicate_assert_internal_type' => ['target' => 'newest'],
             'php_unit_expectation'                   => ['target' => 'newest'],
+            'php_unit_fqcn_annotation'               => true,
             'php_unit_internal_class'                => ['types' => ['normal', 'final']],
             'php_unit_no_expectation_annotation'     => [
                 'target'          => 'newest',

From 39cfd814b86677c0d014d0d7d877915ae19f2029 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Thu, 24 Jun 2021 23:27:25 +0800
Subject: [PATCH 0029/2325] Test methods should camelCased

---
 tests/system/Helpers/SecurityHelperTest.php | 2 +-
 utils/PhpCsFixer/CodeIgniter4.php           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/system/Helpers/SecurityHelperTest.php b/tests/system/Helpers/SecurityHelperTest.php
index 597ff8816f18..fbaa6b856068 100644
--- a/tests/system/Helpers/SecurityHelperTest.php
+++ b/tests/system/Helpers/SecurityHelperTest.php
@@ -34,7 +34,7 @@ public function testStripImageTags()
         $this->assertEquals('http://example.com/spacer.gif', strip_image_tags('<img src="http://example.com/spacer.gif" alt="Who needs CSS when you have a spacer.gif?" />'));
     }
 
-    public function test_encode_php_tags()
+    public function testEncodePhpTags()
     {
         $this->assertEquals('&lt;? echo $foo; ?&gt;', encode_php_tags('<? echo $foo; ?>'));
     }
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 96c5f37b71a2..67dd8527e517 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -149,6 +149,7 @@ public function __construct()
             'php_unit_expectation'                   => ['target' => 'newest'],
             'php_unit_fqcn_annotation'               => true,
             'php_unit_internal_class'                => ['types' => ['normal', 'final']],
+            'php_unit_method_casing'                 => ['case' => 'camel_case'],
             'php_unit_no_expectation_annotation'     => [
                 'target'          => 'newest',
                 'use_class_const' => true,

From 04874954ee86c361b9a87a5f4d22d08d0467588c Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Thu, 24 Jun 2021 23:29:53 +0800
Subject: [PATCH 0030/2325] Simplify mocks used

---
 tests/system/CommonFunctionsTest.php | 2 +-
 utils/PhpCsFixer/CodeIgniter4.php    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 972f0a96b496..74ce64c7a364 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -111,7 +111,7 @@ public function testRedirectReturnsRedirectResponse()
         \CodeIgniter\Services::injectMock('routes', $routes);
 
         $routes->add('home/base', 'Controller::index', ['as' => 'base']);
-        $response->method('redirect')->will($this->returnArgument(0));
+        $response->method('redirect')->willReturnArgument(0);
 
         $this->assertInstanceOf(RedirectResponse::class, redirect('base'));
     }
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 67dd8527e517..53cd65e2ccf2 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -150,6 +150,8 @@ public function __construct()
             'php_unit_fqcn_annotation'               => true,
             'php_unit_internal_class'                => ['types' => ['normal', 'final']],
             'php_unit_method_casing'                 => ['case' => 'camel_case'],
+            'php_unit_mock'                          => ['target' => 'newest'],
+            'php_unit_mock_short_will_return'        => true,
             'php_unit_no_expectation_annotation'     => [
                 'target'          => 'newest',
                 'use_class_const' => true,

From 9ee4abd2c37732227de4f62a02e6c5d6d8be4def Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Thu, 24 Jun 2021 23:32:25 +0800
Subject: [PATCH 0031/2325] PHPUnit classes MUST be used in namespaced version

---
 utils/PhpCsFixer/CodeIgniter4.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 53cd65e2ccf2..e69947f84148 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -152,6 +152,7 @@ public function __construct()
             'php_unit_method_casing'                 => ['case' => 'camel_case'],
             'php_unit_mock'                          => ['target' => 'newest'],
             'php_unit_mock_short_will_return'        => true,
+            'php_unit_namespaced'                    => true,
             'php_unit_no_expectation_annotation'     => [
                 'target'          => 'newest',
                 'use_class_const' => true,

From d47cd9e1726e9c12d86a27af1328e7ecf88c547a Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Thu, 24 Jun 2021 23:37:45 +0800
Subject: [PATCH 0032/2325] Change visibility of `setUp` and `tearDown` to
 original `protected`

---
 admin/module/tests/_support/DatabaseTestCase.php           | 4 ++--
 admin/module/tests/_support/SessionTestCase.php            | 2 +-
 admin/module/tests/database/ExampleDatabaseTest.php        | 2 +-
 admin/module/tests/session/ExampleSessionTest.php          | 2 +-
 admin/module/tests/unit/ExampleTest.php                    | 2 +-
 admin/starter/tests/_support/DatabaseTestCase.php          | 4 ++--
 admin/starter/tests/_support/SessionTestCase.php           | 2 +-
 admin/starter/tests/database/ExampleDatabaseTest.php       | 2 +-
 admin/starter/tests/session/ExampleSessionTest.php         | 2 +-
 admin/starter/tests/unit/HealthTest.php                    | 2 +-
 tests/system/CLI/CLITest.php                               | 2 +-
 tests/system/CLI/CommandRunnerTest.php                     | 2 +-
 tests/system/CLI/ConsoleTest.php                           | 2 +-
 tests/system/Cache/CacheFactoryTest.php                    | 2 +-
 tests/system/Cache/Handlers/FileHandlerTest.php            | 2 +-
 tests/system/Cache/Handlers/MemcachedHandlerTest.php       | 2 +-
 tests/system/Cache/Handlers/PredisHandlerTest.php          | 2 +-
 tests/system/Cache/Handlers/RedisHandlerTest.php           | 2 +-
 tests/system/CodeIgniterTest.php                           | 2 +-
 tests/system/Commands/ClearCacheTest.php                   | 2 +-
 tests/system/Commands/InfoCacheTest.php                    | 2 +-
 tests/system/Commands/SessionsCommandsTest.php             | 2 +-
 tests/system/Config/ServicesTest.php                       | 2 +-
 .../DatabaseTestCaseMigrationOnce1Test.php                 | 2 +-
 .../DatabaseTestCaseMigrationOnce2Test.php                 | 2 +-
 tests/system/Database/DatabaseTestCaseTest.php             | 2 +-
 tests/system/Database/Live/DEBugTest.php                   | 2 +-
 tests/system/Database/Live/GetNumRowsTest.php              | 4 ++--
 tests/system/Database/Live/PretendTest.php                 | 2 +-
 tests/system/Database/Live/SQLite/AlterTableTest.php       | 2 +-
 tests/system/Database/Migrations/MigrationRunnerTest.php   | 2 +-
 tests/system/Database/Migrations/MigrationTest.php         | 2 +-
 tests/system/Files/FileWithVfsTest.php                     | 2 +-
 tests/system/HTTP/DownloadResponseTest.php                 | 2 +-
 tests/system/HTTP/Files/FileMovingTest.php                 | 2 +-
 tests/system/HTTP/MessageTest.php                          | 2 +-
 tests/system/HTTP/NegotiateTest.php                        | 2 +-
 tests/system/HTTP/ResponseTest.php                         | 2 +-
 tests/system/HTTP/URITest.php                              | 2 +-
 tests/system/Helpers/URLHelper/CurrentUrlTest.php          | 2 +-
 tests/system/Helpers/URLHelper/MiscUrlTest.php             | 2 +-
 tests/system/Helpers/URLHelper/SiteUrlTest.php             | 2 +-
 tests/system/RESTful/ResourceControllerTest.php            | 2 +-
 tests/system/RESTful/ResourcePresenterTest.php             | 2 +-
 tests/system/Router/RouteCollectionTest.php                | 2 +-
 tests/system/Router/RouterTest.php                         | 2 +-
 tests/system/Test/BootstrapFCPATHTest.php                  | 2 +-
 tests/system/View/TableTest.php                            | 2 +-
 utils/PhpCsFixer/CodeIgniter4.php                          | 7 ++++---
 49 files changed, 55 insertions(+), 54 deletions(-)

diff --git a/admin/module/tests/_support/DatabaseTestCase.php b/admin/module/tests/_support/DatabaseTestCase.php
index ff2eaf13cf1f..fd067a585c87 100644
--- a/admin/module/tests/_support/DatabaseTestCase.php
+++ b/admin/module/tests/_support/DatabaseTestCase.php
@@ -45,14 +45,14 @@ final class DatabaseTestCase extends CIUnitTestCase
      */
     protected $namespace = 'Tests\Support';
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
         // Extra code to run before each test
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
 
diff --git a/admin/module/tests/_support/SessionTestCase.php b/admin/module/tests/_support/SessionTestCase.php
index a33e1e656707..08a071154494 100644
--- a/admin/module/tests/_support/SessionTestCase.php
+++ b/admin/module/tests/_support/SessionTestCase.php
@@ -17,7 +17,7 @@ final class SessionTestCase extends CIUnitTestCase
      */
     protected $session;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/admin/module/tests/database/ExampleDatabaseTest.php b/admin/module/tests/database/ExampleDatabaseTest.php
index 96fabd09b5dc..203b1261c7e0 100644
--- a/admin/module/tests/database/ExampleDatabaseTest.php
+++ b/admin/module/tests/database/ExampleDatabaseTest.php
@@ -7,7 +7,7 @@
  */
 final class ExampleDatabaseTest extends \Tests\Support\DatabaseTestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/admin/module/tests/session/ExampleSessionTest.php b/admin/module/tests/session/ExampleSessionTest.php
index 97181c41c7a4..06956196e459 100644
--- a/admin/module/tests/session/ExampleSessionTest.php
+++ b/admin/module/tests/session/ExampleSessionTest.php
@@ -5,7 +5,7 @@
  */
 final class ExampleSessionTest extends \Tests\Support\SessionTestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
     }
diff --git a/admin/module/tests/unit/ExampleTest.php b/admin/module/tests/unit/ExampleTest.php
index e13a1a6c6a0f..4306ddfe55d5 100644
--- a/admin/module/tests/unit/ExampleTest.php
+++ b/admin/module/tests/unit/ExampleTest.php
@@ -5,7 +5,7 @@
  */
 final class ExampleTest extends \CodeIgniter\Test\CIUnitTestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
     }
diff --git a/admin/starter/tests/_support/DatabaseTestCase.php b/admin/starter/tests/_support/DatabaseTestCase.php
index ff2eaf13cf1f..fd067a585c87 100644
--- a/admin/starter/tests/_support/DatabaseTestCase.php
+++ b/admin/starter/tests/_support/DatabaseTestCase.php
@@ -45,14 +45,14 @@ final class DatabaseTestCase extends CIUnitTestCase
      */
     protected $namespace = 'Tests\Support';
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
         // Extra code to run before each test
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
 
diff --git a/admin/starter/tests/_support/SessionTestCase.php b/admin/starter/tests/_support/SessionTestCase.php
index a33e1e656707..08a071154494 100644
--- a/admin/starter/tests/_support/SessionTestCase.php
+++ b/admin/starter/tests/_support/SessionTestCase.php
@@ -17,7 +17,7 @@ final class SessionTestCase extends CIUnitTestCase
      */
     protected $session;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/admin/starter/tests/database/ExampleDatabaseTest.php b/admin/starter/tests/database/ExampleDatabaseTest.php
index 96fabd09b5dc..203b1261c7e0 100644
--- a/admin/starter/tests/database/ExampleDatabaseTest.php
+++ b/admin/starter/tests/database/ExampleDatabaseTest.php
@@ -7,7 +7,7 @@
  */
 final class ExampleDatabaseTest extends \Tests\Support\DatabaseTestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/admin/starter/tests/session/ExampleSessionTest.php b/admin/starter/tests/session/ExampleSessionTest.php
index 97181c41c7a4..06956196e459 100644
--- a/admin/starter/tests/session/ExampleSessionTest.php
+++ b/admin/starter/tests/session/ExampleSessionTest.php
@@ -5,7 +5,7 @@
  */
 final class ExampleSessionTest extends \Tests\Support\SessionTestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
     }
diff --git a/admin/starter/tests/unit/HealthTest.php b/admin/starter/tests/unit/HealthTest.php
index fc0fb33c9ae2..f834ac605b40 100644
--- a/admin/starter/tests/unit/HealthTest.php
+++ b/admin/starter/tests/unit/HealthTest.php
@@ -7,7 +7,7 @@
  */
 final class HealthTest extends \CodeIgniter\Test\CIUnitTestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
     }
diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php
index 33cad5d788b8..e20b64e200b8 100644
--- a/tests/system/CLI/CLITest.php
+++ b/tests/system/CLI/CLITest.php
@@ -21,7 +21,7 @@ protected function setUp(): void
         $this->stream_filter        = stream_filter_append(STDOUT, 'CITestStreamFilter');
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         stream_filter_remove($this->stream_filter);
     }
diff --git a/tests/system/CLI/CommandRunnerTest.php b/tests/system/CLI/CommandRunnerTest.php
index ab5302341e93..28e69bf99ea3 100644
--- a/tests/system/CLI/CommandRunnerTest.php
+++ b/tests/system/CLI/CommandRunnerTest.php
@@ -45,7 +45,7 @@ protected function setUp(): void
         $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         stream_filter_remove($this->streamFilter);
     }
diff --git a/tests/system/CLI/ConsoleTest.php b/tests/system/CLI/ConsoleTest.php
index fca3093064b3..115c55a95b92 100644
--- a/tests/system/CLI/ConsoleTest.php
+++ b/tests/system/CLI/ConsoleTest.php
@@ -42,7 +42,7 @@ protected function setUp(): void
         $this->app = new MockCodeIgniter(new MockCLIConfig());
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         stream_filter_remove($this->stream_filter);
     }
diff --git a/tests/system/Cache/CacheFactoryTest.php b/tests/system/Cache/CacheFactoryTest.php
index 890cdd64eb9f..1985f2869a51 100644
--- a/tests/system/Cache/CacheFactoryTest.php
+++ b/tests/system/Cache/CacheFactoryTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
         $this->config->storePath .= self::$directory;
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         if (is_dir($this->config->storePath)) {
             chmod($this->config->storePath, 0777);
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index fb29f9f3acba..0b2760b5a6fd 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -49,7 +49,7 @@ protected function setUp(): void
         $this->fileHandler->initialize();
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
 
diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
index 3084c4548d37..a3635a125fa0 100644
--- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php
+++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
@@ -40,7 +40,7 @@ protected function setUp(): void
         $this->memcachedHandler->initialize();
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         foreach (self::getKeyArray() as $key) {
             $this->memcachedHandler->delete($key);
diff --git a/tests/system/Cache/Handlers/PredisHandlerTest.php b/tests/system/Cache/Handlers/PredisHandlerTest.php
index 20bc11c9d7e7..01828dd26404 100644
--- a/tests/system/Cache/Handlers/PredisHandlerTest.php
+++ b/tests/system/Cache/Handlers/PredisHandlerTest.php
@@ -39,7 +39,7 @@ protected function setUp(): void
         $this->PredisHandler->initialize();
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         foreach (self::getKeyArray() as $key) {
             $this->PredisHandler->delete($key);
diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php
index 664e8ad33ece..d08c4bd359a6 100644
--- a/tests/system/Cache/Handlers/RedisHandlerTest.php
+++ b/tests/system/Cache/Handlers/RedisHandlerTest.php
@@ -39,7 +39,7 @@ protected function setUp(): void
         $this->redisHandler->initialize();
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         foreach (self::getKeyArray() as $key) {
             $this->redisHandler->delete($key);
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index 3bb8f0de6013..4a82df33e544 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -37,7 +37,7 @@ protected function setUp(): void
         $this->codeigniter = new MockCodeIgniter($config);
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
 
diff --git a/tests/system/Commands/ClearCacheTest.php b/tests/system/Commands/ClearCacheTest.php
index 0ca370571264..dff562a2189c 100644
--- a/tests/system/Commands/ClearCacheTest.php
+++ b/tests/system/Commands/ClearCacheTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
         Services::injectMock('cache', CacheFactory::getHandler(config('Cache')));
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         stream_filter_remove($this->streamFilter);
     }
diff --git a/tests/system/Commands/InfoCacheTest.php b/tests/system/Commands/InfoCacheTest.php
index a5923835f142..5997a438cb0f 100644
--- a/tests/system/Commands/InfoCacheTest.php
+++ b/tests/system/Commands/InfoCacheTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void
         Services::injectMock('cache', CacheFactory::getHandler(config('Cache')));
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         stream_filter_remove($this->streamFilter);
 
diff --git a/tests/system/Commands/SessionsCommandsTest.php b/tests/system/Commands/SessionsCommandsTest.php
index 8a9f6a211bb6..d218911df835 100644
--- a/tests/system/Commands/SessionsCommandsTest.php
+++ b/tests/system/Commands/SessionsCommandsTest.php
@@ -22,7 +22,7 @@ protected function setUp(): void
         $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         stream_filter_remove($this->streamFilter);
 
diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php
index 489aae4bbdd7..3e7662fb49ac 100644
--- a/tests/system/Config/ServicesTest.php
+++ b/tests/system/Config/ServicesTest.php
@@ -52,7 +52,7 @@ protected function setUp(): void
         $this->config   = new App();
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         $_SERVER = $this->original;
         Services::reset();
diff --git a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php
index 38b7f9f97d26..bf0bdcf8c766 100644
--- a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php
+++ b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php
@@ -45,7 +45,7 @@ final class DatabaseTestCaseMigrationOnce1Test extends CIUnitTestCase
         'Tests\Support\MigrationTestMigrations',
     ];
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         Services::autoloader()->addNamespace('Tests\Support\MigrationTestMigrations', SUPPORTPATH . 'MigrationTestMigrations');
 
diff --git a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php
index a4691ef75fbf..fa71fd395f30 100644
--- a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php
+++ b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php
@@ -44,7 +44,7 @@ final class DatabaseTestCaseMigrationOnce2Test extends CIUnitTestCase
         'Tests\Support\MigrationTestMigrations',
     ];
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         Services::autoloader()->addNamespace('Tests\Support\MigrationTestMigrations', SUPPORTPATH . 'MigrationTestMigrations');
 
diff --git a/tests/system/Database/DatabaseTestCaseTest.php b/tests/system/Database/DatabaseTestCaseTest.php
index 4270e0d19ca0..64f441706806 100644
--- a/tests/system/Database/DatabaseTestCaseTest.php
+++ b/tests/system/Database/DatabaseTestCaseTest.php
@@ -49,7 +49,7 @@ final class DatabaseTestCaseTest extends CIUnitTestCase
         'Tests\Support\MigrationTestMigrations',
     ];
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         if (! self::$loaded) {
             Services::autoloader()->addNamespace('Tests\Support\MigrationTestMigrations', SUPPORTPATH . 'MigrationTestMigrations');
diff --git a/tests/system/Database/Live/DEBugTest.php b/tests/system/Database/Live/DEBugTest.php
index cb025f7f44f6..376b2d3e17a5 100644
--- a/tests/system/Database/Live/DEBugTest.php
+++ b/tests/system/Database/Live/DEBugTest.php
@@ -30,7 +30,7 @@ public function testDBDebugFalse()
         $this->assertFalse($result);
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         $this->setPrivateProperty($this->db, 'DBDebug', true);
         parent::tearDown();
diff --git a/tests/system/Database/Live/GetNumRowsTest.php b/tests/system/Database/Live/GetNumRowsTest.php
index 9b4e17e4f742..7aa130d21ada 100644
--- a/tests/system/Database/Live/GetNumRowsTest.php
+++ b/tests/system/Database/Live/GetNumRowsTest.php
@@ -22,7 +22,7 @@ final class GetNumRowsTest extends CIUnitTestCase
      *
      * @see \CodeIgniter\Test\CIDatabaseTestCase::setUp()
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
     }
@@ -33,7 +33,7 @@ public function setUp(): void
      *
      * @see \CodeIgniter\Test\CIDatabaseTestCase::tearDown()
      */
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
     }
diff --git a/tests/system/Database/Live/PretendTest.php b/tests/system/Database/Live/PretendTest.php
index 2a602593cd55..dc738e7559e0 100644
--- a/tests/system/Database/Live/PretendTest.php
+++ b/tests/system/Database/Live/PretendTest.php
@@ -15,7 +15,7 @@ final class PretendTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         // We share `$this->db` in testing, so we need to restore the state.
         $this->db->pretend(false);
diff --git a/tests/system/Database/Live/SQLite/AlterTableTest.php b/tests/system/Database/Live/SQLite/AlterTableTest.php
index 6c75801e24b6..374be142b596 100644
--- a/tests/system/Database/Live/SQLite/AlterTableTest.php
+++ b/tests/system/Database/Live/SQLite/AlterTableTest.php
@@ -40,7 +40,7 @@ final class AlterTableTest extends CIUnitTestCase
      */
     protected $forge;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php
index 4fd77d8707bb..4b5fa7ee059c 100644
--- a/tests/system/Database/Migrations/MigrationRunnerTest.php
+++ b/tests/system/Database/Migrations/MigrationRunnerTest.php
@@ -29,7 +29,7 @@ final class MigrationRunnerTest extends CIUnitTestCase
     protected $start;
     protected $config;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/system/Database/Migrations/MigrationTest.php b/tests/system/Database/Migrations/MigrationTest.php
index 07febf2fc2fc..5ce35835b93f 100644
--- a/tests/system/Database/Migrations/MigrationTest.php
+++ b/tests/system/Database/Migrations/MigrationTest.php
@@ -13,7 +13,7 @@ final class MigrationTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
     }
diff --git a/tests/system/Files/FileWithVfsTest.php b/tests/system/Files/FileWithVfsTest.php
index 7fc26842c7cd..b0a0bed7b4df 100644
--- a/tests/system/Files/FileWithVfsTest.php
+++ b/tests/system/Files/FileWithVfsTest.php
@@ -32,7 +32,7 @@ protected function setUp(): void
         $this->file  = new File($this->start . 'able/apple.php');
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
 
diff --git a/tests/system/HTTP/DownloadResponseTest.php b/tests/system/HTTP/DownloadResponseTest.php
index 96b0a57b2c9b..8251245d6537 100644
--- a/tests/system/HTTP/DownloadResponseTest.php
+++ b/tests/system/HTTP/DownloadResponseTest.php
@@ -13,7 +13,7 @@
  */
 final class DownloadResponseTest extends CIUnitTestCase
 {
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         if (isset($_SERVER['HTTP_USER_AGENT'])) {
             unset($_SERVER['HTTP_USER_AGENT']);
diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php
index af768a87150e..900a1f7f50e2 100644
--- a/tests/system/HTTP/Files/FileMovingTest.php
+++ b/tests/system/HTTP/Files/FileMovingTest.php
@@ -28,7 +28,7 @@ protected function setUp(): void
         $_FILES = [];
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
         $this->root = null;
diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php
index 3b94d58e4f8f..3fbcf80b9493 100644
--- a/tests/system/HTTP/MessageTest.php
+++ b/tests/system/HTTP/MessageTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void
 
     //--------------------------------------------------------------------
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         $this->message = null;
         unset($this->message);
diff --git a/tests/system/HTTP/NegotiateTest.php b/tests/system/HTTP/NegotiateTest.php
index a8d7f3f16fed..6c7799297058 100644
--- a/tests/system/HTTP/NegotiateTest.php
+++ b/tests/system/HTTP/NegotiateTest.php
@@ -33,7 +33,7 @@ protected function setUp(): void
 
     //--------------------------------------------------------------------
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         $this->request = $this->negotiate = null;
         unset($this->request, $this->negotiate);
diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php
index 4f4f4c08bcaf..6fa17cdb5fe9 100644
--- a/tests/system/HTTP/ResponseTest.php
+++ b/tests/system/HTTP/ResponseTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void
         $this->server = $_SERVER;
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         $_SERVER = $this->server;
         Factories::reset('config');
diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php
index 8e2d7e54cfa5..f2ae05229daf 100644
--- a/tests/system/HTTP/URITest.php
+++ b/tests/system/HTTP/URITest.php
@@ -22,7 +22,7 @@ protected function setUp(): void
 
     //--------------------------------------------------------------------
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         Factories::reset('config');
     }
diff --git a/tests/system/Helpers/URLHelper/CurrentUrlTest.php b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
index 6ac7aaa5aa16..132427d1e301 100644
--- a/tests/system/Helpers/URLHelper/CurrentUrlTest.php
+++ b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
@@ -49,7 +49,7 @@ protected function setUp(): void
         $_SERVER['SCRIPT_NAME'] = '/index.php';
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
 
diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php
index 36d99f7a80b8..7cd23ff4c911 100644
--- a/tests/system/Helpers/URLHelper/MiscUrlTest.php
+++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php
@@ -41,7 +41,7 @@ protected function setUp(): void
         Factories::injectMock('config', 'App', $this->config);
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
 
diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php
index 24503829d48a..49dc62cb53d1 100644
--- a/tests/system/Helpers/URLHelper/SiteUrlTest.php
+++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php
@@ -42,7 +42,7 @@ protected function setUp(): void
         Factories::injectMock('config', 'App', $this->config);
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
 
diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index d49a2bdf0b1d..1ac6168e46a8 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -60,7 +60,7 @@ protected function setUp(): void
         $this->codeigniter = new MockCodeIgniter($config);
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
 
diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php
index b0703e043253..2bbbf98dfaad 100644
--- a/tests/system/RESTful/ResourcePresenterTest.php
+++ b/tests/system/RESTful/ResourcePresenterTest.php
@@ -54,7 +54,7 @@ protected function setUp(): void
         $this->codeigniter = new MockCodeIgniter($config);
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
 
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index a716cf2b99fa..6222f28569c1 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -14,7 +14,7 @@
  */
 final class RouteCollectionTest extends CIUnitTestCase
 {
-    public function tearDown(): void
+    protected function tearDown(): void
     {
     }
 
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index e91e0fd35da6..cc05357714d5 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -64,7 +64,7 @@ protected function setUp(): void
 
     //--------------------------------------------------------------------
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
     }
 
diff --git a/tests/system/Test/BootstrapFCPATHTest.php b/tests/system/Test/BootstrapFCPATHTest.php
index 8f8fd73e272f..f184cc354888 100644
--- a/tests/system/Test/BootstrapFCPATHTest.php
+++ b/tests/system/Test/BootstrapFCPATHTest.php
@@ -30,7 +30,7 @@ protected function setUp(): void
         $this->writeFiles();
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
         $this->deleteFiles();
diff --git a/tests/system/View/TableTest.php b/tests/system/View/TableTest.php
index b5383c6384ef..520968cc1328 100644
--- a/tests/system/View/TableTest.php
+++ b/tests/system/View/TableTest.php
@@ -12,7 +12,7 @@
  */
 final class TableTest extends CIUnitTestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->table = new MockTable();
     }
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index e69947f84148..e37a9923d658 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -157,9 +157,10 @@ public function __construct()
                 'target'          => 'newest',
                 'use_class_const' => true,
             ],
-            'phpdoc_align'                 => true,
-            'phpdoc_indent'                => true,
-            'phpdoc_inline_tag_normalizer' => [
+            'php_unit_set_up_tear_down_visibility' => true,
+            'phpdoc_align'                         => true,
+            'phpdoc_indent'                        => true,
+            'phpdoc_inline_tag_normalizer'         => [
                 'tags' => [
                     'example',
                     'id',

From 32f74f1fffb2a672149019507d844e0fc93d35dd Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Thu, 24 Jun 2021 23:45:16 +0800
Subject: [PATCH 0033/2325] Convert test annotation to prefix

---
 tests/system/View/TableTest.php   | 4 ++--
 utils/PhpCsFixer/CodeIgniter4.php | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/system/View/TableTest.php b/tests/system/View/TableTest.php
index 520968cc1328..4e6f3012719d 100644
--- a/tests/system/View/TableTest.php
+++ b/tests/system/View/TableTest.php
@@ -43,7 +43,7 @@ public function testSetCaption()
     }
 
     /**
-     * @depends	testPrepArgs
+     * @depends testPrepArgs
      */
     public function testSetHeading()
     {
@@ -83,7 +83,7 @@ public function testSetFooting()
     }
 
     /**
-     * @depends	testPrepArgs
+     * @depends testPrepArgs
      */
     public function testAddRow()
     {
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index e37a9923d658..a16f12cc9038 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -158,6 +158,7 @@ public function __construct()
                 'use_class_const' => true,
             ],
             'php_unit_set_up_tear_down_visibility' => true,
+            'php_unit_test_annotation'             => ['style' => 'prefix'],
             'phpdoc_align'                         => true,
             'phpdoc_indent'                        => true,
             'phpdoc_inline_tag_normalizer'         => [

From 11023ccd6e1c8f36528ad94fd6a82a47abf89ed4 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Thu, 24 Jun 2021 23:48:08 +0800
Subject: [PATCH 0034/2325] Ensure all assertions are invoked the same

---
 tests/system/Test/BootstrapFCPATHTest.php |  2 +-
 utils/PhpCsFixer/CodeIgniter4.php         | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/tests/system/Test/BootstrapFCPATHTest.php b/tests/system/Test/BootstrapFCPATHTest.php
index f184cc354888..aadf61ef5ab4 100644
--- a/tests/system/Test/BootstrapFCPATHTest.php
+++ b/tests/system/Test/BootstrapFCPATHTest.php
@@ -41,7 +41,7 @@ public function testSetFCPATH()
     {
         $result1     = $this->readOutput($this->file1);
         $correctPath = $this->correctFCPATH();
-        self::assertEquals($correctPath, $result1);
+        $this->assertEquals($correctPath, $result1);
     }
 
     private function correctFCPATH()
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index a16f12cc9038..3edcc5974b2c 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -157,11 +157,15 @@ public function __construct()
                 'target'          => 'newest',
                 'use_class_const' => true,
             ],
-            'php_unit_set_up_tear_down_visibility' => true,
-            'php_unit_test_annotation'             => ['style' => 'prefix'],
-            'phpdoc_align'                         => true,
-            'phpdoc_indent'                        => true,
-            'phpdoc_inline_tag_normalizer'         => [
+            'php_unit_set_up_tear_down_visibility'   => true,
+            'php_unit_test_annotation'               => ['style' => 'prefix'],
+            'php_unit_test_case_static_method_calls' => [
+                'call_type' => 'this',
+                'methods'   => [],
+            ],
+            'phpdoc_align'                 => true,
+            'phpdoc_indent'                => true,
+            'phpdoc_inline_tag_normalizer' => [
                 'tags' => [
                     'example',
                     'id',

From 36613e69b965a8396fbc67f3b1c3a290ad2ac45e Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Thu, 24 Jun 2021 23:49:50 +0800
Subject: [PATCH 0035/2325] Disable requiring size and covers by default

---
 utils/PhpCsFixer/CodeIgniter4.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 3edcc5974b2c..30ca6161efa0 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -158,14 +158,16 @@ public function __construct()
                 'use_class_const' => true,
             ],
             'php_unit_set_up_tear_down_visibility'   => true,
+            'php_unit_size_class'                    => false,
             'php_unit_test_annotation'               => ['style' => 'prefix'],
             'php_unit_test_case_static_method_calls' => [
                 'call_type' => 'this',
                 'methods'   => [],
             ],
-            'phpdoc_align'                 => true,
-            'phpdoc_indent'                => true,
-            'phpdoc_inline_tag_normalizer' => [
+            'php_unit_test_class_requires_covers' => false,
+            'phpdoc_align'                        => true,
+            'phpdoc_indent'                       => true,
+            'phpdoc_inline_tag_normalizer'        => [
                 'tags' => [
                     'example',
                     'id',

From 047d061f208c0905f20a4f7706ce7d59f9371f65 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 25 Jun 2021 23:04:37 +0800
Subject: [PATCH 0036/2325] Var annotations should be correct and proper

---
 tests/system/Helpers/HTMLHelperTest.php |  2 +-
 tests/system/Router/RouterTest.php      |  2 +-
 utils/PhpCsFixer/CodeIgniter4.php       | 24 +++++++++++++-----------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index 92eb5d9bc89c..a97426574fe1 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -18,7 +18,7 @@ final class HTMLHelperTest extends CIUnitTestCase
     private $imgPath = SUPPORTPATH . 'Images' . DIRECTORY_SEPARATOR . 'ci-logo.gif';
 
     /**
-     * @var string Expected base64 encoding of $imgPath
+     * @var string Expected base64 encoding of img path
      */
     private $imgData = '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';
 
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index cc05357714d5..f781fde06a46 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -15,7 +15,7 @@ final class RouterTest extends CIUnitTestCase
 {
 
     /**
-     * @var RouteCollection $collection
+     * @var RouteCollection
      */
     protected $collection;
 
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 30ca6161efa0..5bb64c3db117 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -234,17 +234,19 @@ public function __construct()
                 'null_adjustment' => 'always_last',
                 'sort_algorithm'  => 'alpha',
             ],
-            'set_type_to_cast'               => true,
-            'short_scalar_cast'              => true,
-            'standardize_increment'          => true,
-            'static_lambda'                  => true,
-            'switch_case_semicolon_to_colon' => true,
-            'switch_case_space'              => true,
-            'switch_continue_to_break'       => true,
-            'ternary_operator_spaces'        => true,
-            'ternary_to_elvis_operator'      => true,
-            'ternary_to_null_coalescing'     => true,
-            'trailing_comma_in_multiline'    => [
+            'phpdoc_var_annotation_correct_order' => true,
+            'phpdoc_var_without_name'             => true,
+            'set_type_to_cast'                    => true,
+            'short_scalar_cast'                   => true,
+            'standardize_increment'               => true,
+            'static_lambda'                       => true,
+            'switch_case_semicolon_to_colon'      => true,
+            'switch_case_space'                   => true,
+            'switch_continue_to_break'            => true,
+            'ternary_operator_spaces'             => true,
+            'ternary_to_elvis_operator'           => true,
+            'ternary_to_null_coalescing'          => true,
+            'trailing_comma_in_multiline'         => [
                 'after_heredoc' => true,
                 'elements'      => ['arrays'],
             ],

From bd108340e51bc367a43a74c00c6f525ab7fa3056 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 25 Jun 2021 23:06:47 +0800
Subject: [PATCH 0037/2325] Modernize exponentiation

---
 utils/PhpCsFixer/CodeIgniter4.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 5bb64c3db117..d5ab874fd401 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -236,6 +236,7 @@ public function __construct()
             ],
             'phpdoc_var_annotation_correct_order' => true,
             'phpdoc_var_without_name'             => true,
+            'pow_to_exponentiation'               => true,
             'set_type_to_cast'                    => true,
             'short_scalar_cast'                   => true,
             'standardize_increment'               => true,

From fa57ddd4e107c6bf734125859e57e9cf3cf2c7b9 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 25 Jun 2021 23:10:40 +0800
Subject: [PATCH 0038/2325] Change protected properties and methods to private
 when possible

---
 utils/PhpCsFixer/CodeIgniter4.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index d5ab874fd401..3df620e82c12 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -237,6 +237,7 @@ public function __construct()
             'phpdoc_var_annotation_correct_order' => true,
             'phpdoc_var_without_name'             => true,
             'pow_to_exponentiation'               => true,
+            'protected_to_private'                => true,
             'set_type_to_cast'                    => true,
             'short_scalar_cast'                   => true,
             'standardize_increment'               => true,

From 304fbd3e20854428f84f2ccfe497088be11fdcce Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 25 Jun 2021 23:17:22 +0800
Subject: [PATCH 0039/2325] Ensure classes follow PSR-4

---
 utils/PhpCsFixer/CodeIgniter4.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 3df620e82c12..6d56f4d349a7 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -238,6 +238,7 @@ public function __construct()
             'phpdoc_var_without_name'             => true,
             'pow_to_exponentiation'               => true,
             'protected_to_private'                => true,
+            'psr_autoloading'                     => ['dir' => null],
             'set_type_to_cast'                    => true,
             'short_scalar_cast'                   => true,
             'standardize_increment'               => true,

From 02a439b7d2c8124c217bd226741f3164bde96abe Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Sat, 26 Jun 2021 20:55:33 +0800
Subject: [PATCH 0040/2325] Configure rules in "d"

---
 utils/PhpCsFixer/CodeIgniter4.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 30ca6161efa0..9cf830ab91cb 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -89,11 +89,19 @@ public function __construct()
                     'phpstan-ignore-next-line',
                 ],
             ],
-            'compact_nullable_typehint' => true,
-            'concat_space'              => ['spacing' => 'one'],
-            'constant_case'             => ['case' => 'lower'],
-            'final_class'               => false,
-            'final_internal_class'      => [
+            'compact_nullable_typehint'            => true,
+            'concat_space'                         => ['spacing' => 'one'],
+            'constant_case'                        => ['case' => 'lower'],
+            'date_time_immutable'                  => false,
+            'declare_equal_normalize'              => ['space' => 'none'],
+            'declare_strict_types'                 => false,
+            'dir_constant'                         => true,
+            'doctrine_annotation_array_assignment' => false,
+            'doctrine_annotation_braces'           => false,
+            'doctrine_annotation_indentation'      => false,
+            'doctrine_annotation_spaces'           => false,
+            'final_class'                          => false,
+            'final_internal_class'                 => [
                 'annotation_exclude'                         => ['@no-final'],
                 'annotation_include'                         => ['@internal'],
                 'consider_absent_docblock_as_internal_class' => false,

From 4dbf046b63285df567ca362814bc896492e6bdc4 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sat, 26 Jun 2021 22:30:09 +0700
Subject: [PATCH 0041/2325] Update to latest laminas-escaper ^2.8

---
 admin/framework/composer.json                 |   2 +-
 composer.json                                 |   2 +-
 system/ThirdParty/Escaper/Escaper.php         | 121 +++++++++++-------
 .../Escaper/Exception/ExceptionInterface.php  |   6 +-
 .../Exception/InvalidArgumentException.php    |   6 +-
 .../Escaper/Exception/RuntimeException.php    |   6 +-
 6 files changed, 81 insertions(+), 62 deletions(-)

diff --git a/admin/framework/composer.json b/admin/framework/composer.json
index b04834081fb7..d65d30bdbed5 100644
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@@ -11,7 +11,7 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "kint-php/kint": "^3.3",
-        "laminas/laminas-escaper": "^2.6",
+        "laminas/laminas-escaper": "^2.8",
         "psr/log": "^1.1"
     },
     "require-dev": {
diff --git a/composer.json b/composer.json
index acdcaa2cbd15..b5805b3a510a 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "kint-php/kint": "^3.3",
-        "laminas/laminas-escaper": "^2.6",
+        "laminas/laminas-escaper": "^2.8",
         "psr/log": "^1.1"
     },
     "require-dev": {
diff --git a/system/ThirdParty/Escaper/Escaper.php b/system/ThirdParty/Escaper/Escaper.php
index 9f903a5931a5..ca0f1a9dd21c 100644
--- a/system/ThirdParty/Escaper/Escaper.php
+++ b/system/ThirdParty/Escaper/Escaper.php
@@ -1,13 +1,30 @@
 <?php
 
-/**
- * @see       https://github.com/laminas/laminas-escaper for the canonical source repository
- * @copyright https://github.com/laminas/laminas-escaper/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas/laminas-escaper/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 namespace Laminas\Escaper;
 
+use function bin2hex;
+use function ctype_digit;
+use function function_exists;
+use function hexdec;
+use function htmlspecialchars;
+use function iconv;
+use function in_array;
+use function mb_convert_encoding;
+use function ord;
+use function preg_match;
+use function preg_replace_callback;
+use function rawurlencode;
+use function sprintf;
+use function strlen;
+use function strtolower;
+use function strtoupper;
+use function substr;
+
+use const ENT_QUOTES;
+use const ENT_SUBSTITUTE;
+
 /**
  * Context specific methods for use in secure output escaping
  */
@@ -24,10 +41,10 @@ class Escaper
      * @var array
      */
     protected static $htmlNamedEntityMap = [
-        34 => 'quot',         // quotation mark
-        38 => 'amp',          // ampersand
-        60 => 'lt',           // less-than sign
-        62 => 'gt',           // greater-than sign
+        34 => 'quot', // quotation mark
+        38 => 'amp', // ampersand
+        60 => 'lt', // less-than sign
+        62 => 'gt', // greater-than sign
     ];
 
     /**
@@ -73,42 +90,61 @@ class Escaper
      * @var array
      */
     protected $supportedEncodings = [
-        'iso-8859-1',   'iso8859-1',    'iso-8859-5',   'iso8859-5',
-        'iso-8859-15',  'iso8859-15',   'utf-8',        'cp866',
-        'ibm866',       '866',          'cp1251',       'windows-1251',
-        'win-1251',     '1251',         'cp1252',       'windows-1252',
-        '1252',         'koi8-r',       'koi8-ru',      'koi8r',
-        'big5',         '950',          'gb2312',       '936',
-        'big5-hkscs',   'shift_jis',    'sjis',         'sjis-win',
-        'cp932',        '932',          'euc-jp',       'eucjp',
-        'eucjp-win',    'macroman'
+        'iso-8859-1',
+        'iso8859-1',
+        'iso-8859-5',
+        'iso8859-5',
+        'iso-8859-15',
+        'iso8859-15',
+        'utf-8',
+        'cp866',
+        'ibm866',
+        '866',
+        'cp1251',
+        'windows-1251',
+        'win-1251',
+        '1251',
+        'cp1252',
+        'windows-1252',
+        '1252',
+        'koi8-r',
+        'koi8-ru',
+        'koi8r',
+        'big5',
+        '950',
+        'gb2312',
+        '936',
+        'big5-hkscs',
+        'shift_jis',
+        'sjis',
+        'sjis-win',
+        'cp932',
+        '932',
+        'euc-jp',
+        'eucjp',
+        'eucjp-win',
+        'macroman',
     ];
 
     /**
      * Constructor: Single parameter allows setting of global encoding for use by
      * the current object.
      *
-     * @param string $encoding
      * @throws Exception\InvalidArgumentException
      */
-    public function __construct($encoding = null)
+    public function __construct(?string $encoding = null)
     {
         if ($encoding !== null) {
-            if (! is_string($encoding)) {
-                throw new Exception\InvalidArgumentException(
-                    get_class($this) . ' constructor parameter must be a string, received ' . gettype($encoding)
-                );
-            }
             if ($encoding === '') {
                 throw new Exception\InvalidArgumentException(
-                    get_class($this) . ' constructor parameter does not allow a blank value'
+                    static::class . ' constructor parameter does not allow a blank value'
                 );
             }
 
             $encoding = strtolower($encoding);
             if (! in_array($encoding, $this->supportedEncodings)) {
                 throw new Exception\InvalidArgumentException(
-                    'Value of \'' . $encoding . '\' passed to ' . get_class($this)
+                    'Value of \'' . $encoding . '\' passed to ' . static::class
                     . ' constructor parameter is invalid. Provide an encoding supported by htmlspecialchars()'
                 );
             }
@@ -139,10 +175,9 @@ public function getEncoding()
      * Escape a string for the HTML Body context where there are very few characters
      * of special meaning. Internally this will use htmlspecialchars().
      *
-     * @param string $string
      * @return string
      */
-    public function escapeHtml($string)
+    public function escapeHtml(string $string)
     {
         return htmlspecialchars($string, $this->htmlSpecialCharsFlags, $this->encoding);
     }
@@ -152,10 +187,9 @@ public function escapeHtml($string)
      * to escape that are not covered by htmlspecialchars() to cover cases where an attribute
      * might be unquoted or quoted illegally (e.g. backticks are valid quotes for IE).
      *
-     * @param string $string
      * @return string
      */
-    public function escapeHtmlAttr($string)
+    public function escapeHtmlAttr(string $string)
     {
         $string = $this->toUtf8($string);
         if ($string === '' || ctype_digit($string)) {
@@ -175,10 +209,9 @@ public function escapeHtmlAttr($string)
      * Backslash escaping is not used as it still leaves the escaped character as-is and so
      * is not useful in a HTML context.
      *
-     * @param string $string
      * @return string
      */
-    public function escapeJs($string)
+    public function escapeJs(string $string)
     {
         $string = $this->toUtf8($string);
         if ($string === '' || ctype_digit($string)) {
@@ -194,10 +227,9 @@ public function escapeJs($string)
      * an entire URI - only a subcomponent being inserted. The function is a simple proxy
      * to rawurlencode() which now implements RFC 3986 since PHP 5.3 completely.
      *
-     * @param string $string
      * @return string
      */
-    public function escapeUrl($string)
+    public function escapeUrl(string $string)
     {
         return rawurlencode($string);
     }
@@ -206,10 +238,9 @@ public function escapeUrl($string)
      * Escape a string for the CSS context. CSS escaping can be applied to any string being
      * inserted into CSS and escapes everything except alphanumerics.
      *
-     * @param string $string
      * @return string
      */
-    public function escapeCss($string)
+    public function escapeCss(string $string)
     {
         $string = $this->toUtf8($string);
         if ($string === '' || ctype_digit($string)) {
@@ -236,7 +267,8 @@ protected function htmlAttrMatcher($matches)
          * The following replaces characters undefined in HTML with the
          * hex entity for the Unicode replacement character.
          */
-        if (($ord <= 0x1f && $chr != "\t" && $chr != "\n" && $chr != "\r")
+        if (
+            ($ord <= 0x1f && $chr !== "\t" && $chr !== "\n" && $chr !== "\r")
             || ($ord >= 0x7f && $ord <= 0x9f)
         ) {
             return '&#xFFFD;';
@@ -276,7 +308,7 @@ protected function htmlAttrMatcher($matches)
     protected function jsMatcher($matches)
     {
         $chr = $matches[0];
-        if (strlen($chr) == 1) {
+        if (strlen($chr) === 1) {
             return sprintf('\\x%02X', ord($chr));
         }
         $chr = $this->convertEncoding($chr, 'UTF-16BE', 'UTF-8');
@@ -285,7 +317,7 @@ protected function jsMatcher($matches)
             return sprintf('\\u%04s', $hex);
         }
         $highSurrogate = substr($hex, 0, 4);
-        $lowSurrogate = substr($hex, 4, 4);
+        $lowSurrogate  = substr($hex, 4, 4);
         return sprintf('\\u%04s\\u%04s', $highSurrogate, $lowSurrogate);
     }
 
@@ -299,7 +331,7 @@ protected function jsMatcher($matches)
     protected function cssMatcher($matches)
     {
         $chr = $matches[0];
-        if (strlen($chr) == 1) {
+        if (strlen($chr) === 1) {
             $ord = ord($chr);
         } else {
             $chr = $this->convertEncoding($chr, 'UTF-32BE', 'UTF-8');
@@ -310,7 +342,6 @@ protected function cssMatcher($matches)
 
     /**
      * Converts a string to UTF-8 from the base encoding. The base encoding is set via this
-     * class' constructor.
      *
      * @param string $string
      * @throws Exception\RuntimeException
@@ -335,7 +366,7 @@ protected function toUtf8($string)
 
     /**
      * Converts a string from UTF-8 to the base encoding. The base encoding is set via this
-     * class' constructor.
+     *
      * @param string $string
      * @return string
      */
@@ -356,7 +387,7 @@ protected function fromUtf8($string)
      */
     protected function isUtf8($string)
     {
-        return ($string === '' || preg_match('/^./su', $string));
+        return $string === '' || preg_match('/^./su', $string);
     }
 
     /**
@@ -377,7 +408,7 @@ protected function convertEncoding($string, $to, $from)
             $result = mb_convert_encoding($string, $to, $from);
         } else {
             throw new Exception\RuntimeException(
-                get_class($this)
+                static::class
                 . ' requires either the iconv or mbstring extension to be installed'
                 . ' when escaping for non UTF-8 strings.'
             );
diff --git a/system/ThirdParty/Escaper/Exception/ExceptionInterface.php b/system/ThirdParty/Escaper/Exception/ExceptionInterface.php
index 7ebe04ef6b36..87edfd2aa582 100644
--- a/system/ThirdParty/Escaper/Exception/ExceptionInterface.php
+++ b/system/ThirdParty/Escaper/Exception/ExceptionInterface.php
@@ -1,10 +1,6 @@
 <?php
 
-/**
- * @see       https://github.com/laminas/laminas-escaper for the canonical source repository
- * @copyright https://github.com/laminas/laminas-escaper/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas/laminas-escaper/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 namespace Laminas\Escaper\Exception;
 
diff --git a/system/ThirdParty/Escaper/Exception/InvalidArgumentException.php b/system/ThirdParty/Escaper/Exception/InvalidArgumentException.php
index f5bf1fa5c01e..48e646dcefad 100644
--- a/system/ThirdParty/Escaper/Exception/InvalidArgumentException.php
+++ b/system/ThirdParty/Escaper/Exception/InvalidArgumentException.php
@@ -1,10 +1,6 @@
 <?php
 
-/**
- * @see       https://github.com/laminas/laminas-escaper for the canonical source repository
- * @copyright https://github.com/laminas/laminas-escaper/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas/laminas-escaper/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 namespace Laminas\Escaper\Exception;
 
diff --git a/system/ThirdParty/Escaper/Exception/RuntimeException.php b/system/ThirdParty/Escaper/Exception/RuntimeException.php
index ab1903fd2bb1..5004c4c47523 100644
--- a/system/ThirdParty/Escaper/Exception/RuntimeException.php
+++ b/system/ThirdParty/Escaper/Exception/RuntimeException.php
@@ -1,10 +1,6 @@
 <?php
 
-/**
- * @see       https://github.com/laminas/laminas-escaper for the canonical source repository
- * @copyright https://github.com/laminas/laminas-escaper/blob/master/COPYRIGHT.md
- * @license   https://github.com/laminas/laminas-escaper/blob/master/LICENSE.md New BSD License
- */
+declare(strict_types=1);
 
 namespace Laminas\Escaper\Exception;
 

From 39f6889af8c3d73d755cba7f89a6eb73742bebea Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sat, 26 Jun 2021 23:30:55 +0800
Subject: [PATCH 0042/2325] Enable `echo_tag_syntax` until `error_suppression`
 fixers

---
 utils/PhpCsFixer/CodeIgniter4.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index bdf28fa0eb19..c6b422827dd8 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -100,8 +100,21 @@ public function __construct()
             'doctrine_annotation_braces'           => false,
             'doctrine_annotation_indentation'      => false,
             'doctrine_annotation_spaces'           => false,
-            'final_class'                          => false,
-            'final_internal_class'                 => [
+            'echo_tag_syntax'                      => [
+                'format'                         => 'short',
+                'long_function'                  => 'echo',
+                'shorten_simple_statements_only' => false,
+            ],
+            'elseif'            => true,
+            'encoding'          => true,
+            'ereg_to_preg'      => true,
+            'error_suppression' => [
+                'mute_deprecation_error'         => true,
+                'noise_remaining_usages'         => false,
+                'noise_remaining_usages_exclude' => [],
+            ],
+            'final_class'          => false,
+            'final_internal_class' => [
                 'annotation_exclude'                         => ['@no-final'],
                 'annotation_include'                         => ['@internal'],
                 'consider_absent_docblock_as_internal_class' => false,

From 2d11584a0e7d79e99abaa4514d1f259c8320266d Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 25 Jun 2021 23:35:25 +0800
Subject: [PATCH 0043/2325] Strive for stricter assertions

---
 .../tests/session/ExampleSessionTest.php      |   2 +-
 .../tests/session/ExampleSessionTest.php      |   2 +-
 system/Test/TestResponse.php                  |  11 +-
 tests/system/API/ResponseTraitTest.php        | 116 +++----
 tests/system/Autoloader/AutoloaderTest.php    |   6 +-
 tests/system/Autoloader/FileLocatorTest.php   |  28 +-
 tests/system/CLI/CLITest.php                  | 108 +++----
 .../system/Cache/Handlers/FileHandlerTest.php |   4 +-
 tests/system/CodeIgniterTest.php              | 135 +++------
 tests/system/Commands/BaseCommandTest.php     |   2 +-
 tests/system/Commands/ClearCacheTest.php      |   2 +-
 tests/system/Commands/CommandTest.php         |  49 +--
 tests/system/CommonFunctionsTest.php          |  62 ++--
 tests/system/Config/BaseConfigTest.php        |   2 +-
 tests/system/Config/DotEnvTest.php            |  86 +++---
 tests/system/Config/FactoriesTest.php         |  16 +-
 tests/system/Config/MimesTest.php             |   4 +-
 tests/system/Config/ServicesTest.php          |  15 +-
 tests/system/ControllerTest.php               |   4 +-
 tests/system/Cookie/CookieTest.php            |   2 +-
 tests/system/Database/BaseQueryTest.php       |  32 +-
 tests/system/Database/Builder/AliasTest.php   |  10 +-
 tests/system/Database/Builder/BaseTest.php    |   4 +-
 .../system/Database/Builder/DistinctTest.php  |   2 +-
 tests/system/Database/Builder/EmptyTest.php   |   2 +-
 tests/system/Database/Builder/FromTest.php    |  18 +-
 tests/system/Database/Builder/GetTest.php     |  28 +-
 tests/system/Database/Builder/GroupTest.php   |  62 ++--
 tests/system/Database/Builder/InsertTest.php  |   8 +-
 tests/system/Database/Builder/JoinTest.php    |  12 +-
 tests/system/Database/Builder/LimitTest.php   |   6 +-
 tests/system/Database/Builder/OrderTest.php   |   6 +-
 tests/system/Database/Builder/PrefixTest.php  |   4 +-
 tests/system/Database/Builder/SelectTest.php  |  36 +--
 .../system/Database/Builder/TruncateTest.php  |   2 +-
 tests/system/Database/ConfigTest.php          |  94 +++---
 tests/system/Database/Live/ConnectTest.php    |  10 +-
 .../Live/DatabaseTestTraitCaseTest.php        |   2 +-
 .../Live/{DEBugTest.php => DbDebugTest.php}   |   2 +-
 tests/system/Database/Live/DbUtilsTest.php    |   4 +-
 tests/system/Database/Live/EmptyTest.php      |   4 +-
 tests/system/Database/Live/EscapeTest.php     |  10 +-
 .../Database/Live/FabricatorLiveTest.php      |   6 +-
 tests/system/Database/Live/ForgeTest.php      | 151 +++++----
 tests/system/Database/Live/GetNumRowsTest.php |   2 +-
 tests/system/Database/Live/GetTest.php        | 176 +++++------
 tests/system/Database/Live/GroupTest.php      |  62 ++--
 tests/system/Database/Live/InsertTest.php     |   4 +-
 tests/system/Database/Live/JoinTest.php       |  10 +-
 tests/system/Database/Live/LikeTest.php       |  56 ++--
 tests/system/Database/Live/LimitTest.php      |   8 +-
 tests/system/Database/Live/MetadataTest.php   |   6 +-
 tests/system/Database/Live/OrderTest.php      |  26 +-
 .../Database/Live/PreparedQueryTest.php       |   4 +-
 .../Database/Live/SQLite/AlterTableTest.php   |  14 +-
 tests/system/Database/Live/SelectTest.php     |  52 +---
 tests/system/Database/Live/UpdateTest.php     |  24 +-
 tests/system/Database/Live/WhereTest.php      |  62 ++--
 .../Migrations/MigrationRunnerTest.php        |  91 +++---
 .../Database/Migrations/MigrationTest.php     |   2 +-
 tests/system/Debug/ExceptionsTest.php         |   2 +-
 tests/system/Debug/TimerTest.php              |   2 +-
 tests/system/Email/EmailTest.php              |  14 +-
 tests/system/Encryption/EncryptionTest.php    |  10 +-
 .../Handlers/OpenSSLHandlerTest.php           |  24 +-
 tests/system/{ => Entity}/EntityTest.php      | 269 ++++++----------
 tests/system/Events/EventsTest.php            |  26 +-
 tests/system/Files/FileTest.php               |  20 +-
 tests/system/Files/FileWithVfsTest.php        |  18 +-
 tests/system/Filters/CSRFTest.php             |   2 +-
 tests/system/Filters/DebugToolbarTest.php     |   4 +-
 tests/system/Filters/FiltersTest.php          |  72 ++---
 tests/system/Filters/HoneypotTest.php         |   2 +-
 tests/system/Format/JSONFormatterTest.php     |   8 +-
 tests/system/Format/XMLFormatterTest.php      |  14 +-
 tests/system/HTTP/CLIRequestTest.php          | 122 ++++----
 tests/system/HTTP/CURLRequestTest.php         | 271 ++++++-----------
 .../system/HTTP/ContentSecurityPolicyTest.php |   2 +-
 tests/system/HTTP/DownloadResponseTest.php    |  38 +--
 .../system/HTTP/Files/FileCollectionTest.php  | 166 +++++-----
 tests/system/HTTP/Files/FileMovingTest.php    |   2 +-
 tests/system/HTTP/HeaderTest.php              |  56 ++--
 .../HTTP/IncomingRequestDetectingTest.php     |  26 +-
 tests/system/HTTP/IncomingRequestTest.php     | 180 +++++------
 tests/system/HTTP/MessageTest.php             |  50 +--
 tests/system/HTTP/NegotiateTest.php           |  70 ++---
 tests/system/HTTP/RedirectResponseTest.php    |  18 +-
 tests/system/HTTP/RequestTest.php             |  81 +++--
 tests/system/HTTP/ResponseTest.php            |  58 ++--
 tests/system/HTTP/URITest.php                 | 214 ++++++-------
 tests/system/HTTP/UserAgentTest.php           |  28 +-
 tests/system/Helpers/ArrayHelperTest.php      |  24 +-
 tests/system/Helpers/CookieHelperTest.php     |  14 +-
 tests/system/Helpers/FilesystemHelperTest.php |  44 +--
 tests/system/Helpers/FormHelperTest.php       | 162 +++++-----
 tests/system/Helpers/HTMLHelperTest.php       |  74 ++---
 tests/system/Helpers/InflectorHelperTest.php  |  22 +-
 tests/system/Helpers/NumberHelperTest.php     |  48 +--
 tests/system/Helpers/SecurityHelperTest.php   |  10 +-
 tests/system/Helpers/TextHelperTest.php       | 114 +++----
 .../Helpers/URLHelper/CurrentUrlTest.php      |  52 ++--
 .../system/Helpers/URLHelper/MiscUrlTest.php  |  40 +--
 .../system/Helpers/URLHelper/SiteUrlTest.php  |  14 +-
 tests/system/Helpers/XMLHelperTest.php        |   4 +-
 tests/system/Honeypot/HoneypotTest.php        |   8 +-
 tests/system/I18n/TimeDifferenceTest.php      |  96 +++---
 tests/system/I18n/TimeTest.php                | 204 +++++++------
 tests/system/Images/BaseHandlerTest.php       |   6 +-
 tests/system/Images/GDHandlerTest.php         | 128 ++++----
 .../system/Images/ImageMagickHandlerTest.php  | 128 ++++----
 tests/system/Images/ImageTest.php             |  20 +-
 tests/system/Language/LanguageTest.php        |  74 ++---
 tests/system/Log/LoggerTest.php               |  36 +--
 tests/system/Models/ValidationModelTest.php   |   2 +-
 tests/system/Pager/PagerRendererTest.php      |  66 ++--
 tests/system/Pager/PagerTest.php              |  76 ++---
 .../system/RESTful/ResourceControllerTest.php |  16 +-
 .../system/RESTful/ResourcePresenterTest.php  |  16 +-
 tests/system/Router/RouteCollectionTest.php   | 234 +++++++-------
 tests/system/Router/RouterTest.php            | 286 +++++++-----------
 tests/system/Security/SecurityTest.php        |  10 +-
 tests/system/Session/SessionTest.php          |  50 +--
 tests/system/Test/BootstrapFCPATHTest.php     |   2 +-
 tests/system/Test/ControllerTestTraitTest.php |  14 +-
 tests/system/Test/DOMParserTest.php           |  20 +-
 tests/system/Test/FabricatorTest.php          |  62 ++--
 tests/system/Test/FeatureTestTraitTest.php    |   8 +-
 tests/system/Test/FilterTestTraitTest.php     |   4 +-
 tests/system/Test/ReflectionHelperTest.php    |  14 +-
 tests/system/Test/TestCaseTest.php            |   4 +-
 tests/system/Test/TestResponseTest.php        |  16 +-
 tests/system/Throttle/ThrottleTest.php        |  18 +-
 tests/system/Typography/TypographyTest.php    |  18 +-
 .../system/Validation/CreditCardRulesTest.php |   2 +-
 tests/system/Validation/FormatRulesTest.php   |  42 +--
 tests/system/Validation/RulesTest.php         |  20 +-
 tests/system/Validation/ValidationTest.php    |  62 ++--
 tests/system/View/CellTest.php                |  54 ++--
 tests/system/View/ParserFilterTest.php        |  50 +--
 tests/system/View/ParserPluginTest.php        |  18 +-
 tests/system/View/ParserTest.php              | 118 ++++----
 tests/system/View/TableTest.php               |  34 +--
 tests/system/View/ViewTest.php                |  34 +--
 utils/PhpCsFixer/CodeIgniter4.php             |  12 +-
 144 files changed, 2972 insertions(+), 3371 deletions(-)
 rename tests/system/Database/Live/{DEBugTest.php => DbDebugTest.php} (94%)
 rename tests/system/{ => Entity}/EntityTest.php (80%)

diff --git a/admin/module/tests/session/ExampleSessionTest.php b/admin/module/tests/session/ExampleSessionTest.php
index 06956196e459..65dd37c6b498 100644
--- a/admin/module/tests/session/ExampleSessionTest.php
+++ b/admin/module/tests/session/ExampleSessionTest.php
@@ -16,6 +16,6 @@ public function testSessionSimple()
 
         $value = $this->session->get('logged_in');
 
-        $this->assertEquals(123, $value);
+        $this->assertSame(123, $value);
     }
 }
diff --git a/admin/starter/tests/session/ExampleSessionTest.php b/admin/starter/tests/session/ExampleSessionTest.php
index 06956196e459..65dd37c6b498 100644
--- a/admin/starter/tests/session/ExampleSessionTest.php
+++ b/admin/starter/tests/session/ExampleSessionTest.php
@@ -16,6 +16,6 @@ public function testSessionSimple()
 
         $value = $this->session->get('logged_in');
 
-        $this->assertEquals(123, $value);
+        $this->assertSame(123, $value);
     }
 }
diff --git a/system/Test/TestResponse.php b/system/Test/TestResponse.php
index cbba8976ffad..2831ad63856d 100644
--- a/system/Test/TestResponse.php
+++ b/system/Test/TestResponse.php
@@ -16,6 +16,7 @@
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
 use Exception;
+use PHPUnit\Framework\Constraint\IsEqual;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -151,7 +152,7 @@ public function isOK(): bool
      */
     public function assertStatus(int $code)
     {
-        $this->assertEquals($code, $this->response->getStatusCode());
+        $this->assertSame($code, $this->response->getStatusCode());
     }
 
     /**
@@ -275,9 +276,9 @@ public function assertSessionHas(string $key, $value = null)
         }
 
         if (is_scalar($value)) {
-            $this->assertEquals($value, $_SESSION[$key], "The value of '{$key}' ({$value}) does not match expected value.");
+            $this->assertSame($value, $_SESSION[$key], "The value of '{$key}' ({$value}) does not match expected value.");
         } else {
-            $this->assertEquals($value, $_SESSION[$key], "The value of '{$key}' does not match expected value.");
+            $this->assertSame($value, $_SESSION[$key], "The value of '{$key}' does not match expected value.");
         }
     }
 
@@ -310,7 +311,7 @@ public function assertHeader(string $key, $value = null)
         $this->assertTrue($this->response->hasHeader($key), "'{$key}' is not a valid Response header.");
 
         if ($value !== null) {
-            $this->assertEquals($value, $this->response->getHeaderLine($key), "The value of '{$key}' header ({$this->response->getHeaderLine($key)}) does not match expected value.");
+            $this->assertSame($value, $this->response->getHeaderLine($key), "The value of '{$key}' header ({$this->response->getHeaderLine($key)}) does not match expected value.");
         }
     }
 
@@ -405,7 +406,7 @@ public function assertJSONFragment(array $fragment, bool $strict = false)
         if ($strict) {
             $this->assertSame($json, $patched, 'Response does not contain a matching JSON fragment.');
         } else {
-            $this->assertEquals($json, $patched, 'Response does not contain a matching JSON fragment.');
+            $this->assertThat($patched, new IsEqual($json), 'Response does not contain a matching JSON fragment.');
         }
     }
 
diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
index 5cdc0c6e4d8c..7ec5f5418623 100644
--- a/tests/system/API/ResponseTraitTest.php
+++ b/tests/system/API/ResponseTraitTest.php
@@ -102,15 +102,15 @@ public function testNoFormatterJSON()
         $controller      = $this->makeController([], 'http://codeigniter.com', ['Accept' => 'application/json']);
         $controller->respondCreated(['id' => 3], 'A Custom Reason');
 
-        $this->assertEquals('A Custom Reason', $this->response->getReason());
-        $this->assertEquals(201, $this->response->getStatusCode());
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(201, $this->response->getStatusCode());
 
         $expected = <<<'EOH'
             {
                 "id": 3
             }
             EOH;
-        $this->assertEquals($expected, $this->response->getBody());
+        $this->assertSame($expected, $this->response->getBody());
     }
 
     public function testNoFormatter()
@@ -119,7 +119,7 @@ public function testNoFormatter()
         $controller      = $this->makeController([], 'http://codeigniter.com', ['Accept' => 'application/json']);
         $controller->respondCreated('A Custom Reason');
 
-        $this->assertEquals('A Custom Reason', $this->response->getBody());
+        $this->assertSame('A Custom Reason', $this->response->getBody());
     }
 
     public function testAssociativeArrayPayload()
@@ -133,7 +133,7 @@ public function testAssociativeArrayPayload()
             }
             EOH;
         $controller->respond($payload);
-        $this->assertEquals($expected, $this->response->getBody());
+        $this->assertSame($expected, $this->response->getBody());
     }
 
     public function testArrayPayload()
@@ -153,7 +153,7 @@ public function testArrayPayload()
             ]
             EOH;
         $controller->respond($payload);
-        $this->assertEquals($expected, $this->response->getBody());
+        $this->assertSame($expected, $this->response->getBody());
     }
 
     public function testPHPtoArrayPayload()
@@ -170,7 +170,7 @@ public function testPHPtoArrayPayload()
             }
             EOH;
         $controller->respond((array) $payload);
-        $this->assertEquals($expected, $this->response->getBody());
+        $this->assertSame($expected, $this->response->getBody());
     }
 
     public function testRespondSets404WithNoData()
@@ -178,7 +178,7 @@ public function testRespondSets404WithNoData()
         $controller = $this->makeController();
         $controller->respond(null, null);
 
-        $this->assertEquals(404, $this->response->getStatusCode());
+        $this->assertSame(404, $this->response->getStatusCode());
         $this->assertNull($this->response->getBody());
     }
 
@@ -187,7 +187,7 @@ public function testRespondSetsStatusWithEmptyData()
         $controller = $this->makeController();
         $controller->respond(null, 201);
 
-        $this->assertEquals(201, $this->response->getStatusCode());
+        $this->assertSame(201, $this->response->getStatusCode());
         $this->assertNull($this->response->getBody());
     }
 
@@ -196,10 +196,10 @@ public function testRespondSetsCorrectBodyAndStatus()
         $controller = $this->makeController();
         $controller->respond('something', 201);
 
-        $this->assertEquals(201, $this->response->getStatusCode());
-        $this->assertEquals('something', $this->response->getBody());
+        $this->assertSame(201, $this->response->getStatusCode());
+        $this->assertSame('something', $this->response->getBody());
         $this->assertStringStartsWith('text/html', $this->response->getHeaderLine('Content-Type'));
-        $this->assertEquals('Created', $this->response->getReason());
+        $this->assertSame('Created', $this->response->getReason());
     }
 
     public function testRespondWithCustomReason()
@@ -207,8 +207,8 @@ public function testRespondWithCustomReason()
         $controller = $this->makeController();
         $controller->respond('something', 201, 'A Custom Reason');
 
-        $this->assertEquals(201, $this->response->getStatusCode());
-        $this->assertEquals('A Custom Reason', $this->response->getReason());
+        $this->assertSame(201, $this->response->getStatusCode());
+        $this->assertSame('A Custom Reason', $this->response->getReason());
     }
 
     public function testFailSingleMessage()
@@ -226,9 +226,9 @@ public function testFailSingleMessage()
             ],
         ];
 
-        $this->assertEquals($this->formatter->format($expected), $this->response->getBody());
-        $this->assertEquals(500, $this->response->getStatusCode());
-        $this->assertEquals('A Custom Reason', $this->response->getReason());
+        $this->assertSame($this->formatter->format($expected), $this->response->getBody());
+        $this->assertSame(500, $this->response->getStatusCode());
+        $this->assertSame('A Custom Reason', $this->response->getReason());
     }
 
     public function testCreated()
@@ -236,9 +236,9 @@ public function testCreated()
         $controller = $this->makeController();
         $controller->respondCreated(['id' => 3], 'A Custom Reason');
 
-        $this->assertEquals('A Custom Reason', $this->response->getReason());
-        $this->assertEquals(201, $this->response->getStatusCode());
-        $this->assertEquals($this->formatter->format(['id' => 3]), $this->response->getBody());
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(201, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format(['id' => 3]), $this->response->getBody());
     }
 
     public function testDeleted()
@@ -246,9 +246,9 @@ public function testDeleted()
         $controller = $this->makeController();
         $controller->respondDeleted(['id' => 3], 'A Custom Reason');
 
-        $this->assertEquals('A Custom Reason', $this->response->getReason());
-        $this->assertEquals(200, $this->response->getStatusCode());
-        $this->assertEquals($this->formatter->format(['id' => 3]), $this->response->getBody());
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(200, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format(['id' => 3]), $this->response->getBody());
     }
 
     public function testUpdated()
@@ -256,9 +256,9 @@ public function testUpdated()
         $controller = $this->makeController();
         $controller->respondUpdated(['id' => 3], 'A Custom Reason');
 
-        $this->assertEquals('A Custom Reason', $this->response->getReason());
-        $this->assertEquals(200, $this->response->getStatusCode());
-        $this->assertEquals($this->formatter->format(['id' => 3]), $this->response->getBody());
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(200, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format(['id' => 3]), $this->response->getBody());
     }
 
     public function testUnauthorized()
@@ -274,9 +274,9 @@ public function testUnauthorized()
             ],
         ];
 
-        $this->assertEquals('A Custom Reason', $this->response->getReason());
-        $this->assertEquals(401, $this->response->getStatusCode());
-        $this->assertEquals($this->formatter->format($expected), $this->response->getBody());
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(401, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format($expected), $this->response->getBody());
     }
 
     public function testForbidden()
@@ -292,9 +292,9 @@ public function testForbidden()
             ],
         ];
 
-        $this->assertEquals('A Custom Reason', $this->response->getReason());
-        $this->assertEquals(403, $this->response->getStatusCode());
-        $this->assertEquals($this->formatter->format($expected), $this->response->getBody());
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(403, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format($expected), $this->response->getBody());
     }
 
     public function testNoContent()
@@ -302,8 +302,8 @@ public function testNoContent()
         $controller = $this->makeController();
         $controller->respondNoContent('');
 
-        $this->assertEquals('No Content', $this->response->getReason());
-        $this->assertEquals(204, $this->response->getStatusCode());
+        $this->assertSame('No Content', $this->response->getReason());
+        $this->assertSame(204, $this->response->getStatusCode());
     }
 
     public function testNotFound()
@@ -319,9 +319,9 @@ public function testNotFound()
             ],
         ];
 
-        $this->assertEquals('A Custom Reason', $this->response->getReason());
-        $this->assertEquals(404, $this->response->getStatusCode());
-        $this->assertEquals($this->formatter->format($expected), $this->response->getBody());
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(404, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format($expected), $this->response->getBody());
     }
 
     public function testValidationError()
@@ -337,9 +337,9 @@ public function testValidationError()
             ],
         ];
 
-        $this->assertEquals('A Custom Reason', $this->response->getReason());
-        $this->assertEquals(400, $this->response->getStatusCode());
-        $this->assertEquals($this->formatter->format($expected), $this->response->getBody());
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(400, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format($expected), $this->response->getBody());
     }
 
     public function testValidationErrors()
@@ -356,9 +356,9 @@ public function testValidationErrors()
             ],
         ];
 
-        $this->assertEquals('A Custom Reason', $this->response->getReason());
-        $this->assertEquals(400, $this->response->getStatusCode());
-        $this->assertEquals($this->formatter->format($expected), $this->response->getBody());
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(400, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format($expected), $this->response->getBody());
     }
 
     public function testResourceExists()
@@ -374,9 +374,9 @@ public function testResourceExists()
             ],
         ];
 
-        $this->assertEquals('A Custom Reason', $this->response->getReason());
-        $this->assertEquals(409, $this->response->getStatusCode());
-        $this->assertEquals($this->formatter->format($expected), $this->response->getBody());
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(409, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format($expected), $this->response->getBody());
     }
 
     public function testResourceGone()
@@ -392,9 +392,9 @@ public function testResourceGone()
             ],
         ];
 
-        $this->assertEquals('A Custom Reason', $this->response->getReason());
-        $this->assertEquals(410, $this->response->getStatusCode());
-        $this->assertEquals($this->formatter->format($expected), $this->response->getBody());
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(410, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format($expected), $this->response->getBody());
     }
 
     public function testTooManyRequests()
@@ -410,9 +410,9 @@ public function testTooManyRequests()
             ],
         ];
 
-        $this->assertEquals('A Custom Reason', $this->response->getReason());
-        $this->assertEquals(429, $this->response->getStatusCode());
-        $this->assertEquals($this->formatter->format($expected), $this->response->getBody());
+        $this->assertSame('A Custom Reason', $this->response->getReason());
+        $this->assertSame(429, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format($expected), $this->response->getBody());
     }
 
     public function testServerError()
@@ -452,9 +452,9 @@ private function tryValidContentType($mimeType, $contentType)
         $_SERVER['CONTENT_TYPE'] = $mimeType;
 
         $this->makeController([], 'http://codeigniter.com', ['Accept' => $mimeType]);
-        $this->assertEquals($mimeType, $this->request->getHeaderLine('Accept'), 'Request header...');
+        $this->assertSame($mimeType, $this->request->getHeaderLine('Accept'), 'Request header...');
         $this->response->setContentType($contentType);
-        $this->assertEquals($contentType, $this->response->getHeaderLine('Content-Type'), 'Response header pre-response...');
+        $this->assertSame($contentType, $this->response->getHeaderLine('Content-Type'), 'Response header pre-response...');
 
         $_SERVER = $original;
     }
@@ -479,7 +479,7 @@ public function testXMLFormatter()
         $this->formatter = new XMLFormatter();
         $controller      = $this->makeController();
 
-        $this->assertEquals('CodeIgniter\Format\XMLFormatter', get_class($this->formatter));
+        $this->assertSame('CodeIgniter\Format\XMLFormatter', get_class($this->formatter));
 
         $controller->respondCreated(['id' => 3], 'A Custom Reason');
         $expected = <<<'EOH'
@@ -487,7 +487,7 @@ public function testXMLFormatter()
             <response><id>3</id></response>
 
             EOH;
-        $this->assertEquals($expected, $this->response->getBody());
+        $this->assertSame($expected, $this->response->getBody());
     }
 
     public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
@@ -543,7 +543,7 @@ public function testResponseFormat()
         $controller->respond($data, 201);
 
         $this->assertStringStartsWith('application/json', $this->response->getHeaderLine('Content-Type'));
-        $this->assertEquals($this->formatter->format($data), $this->response->getJSON());
+        $this->assertSame($this->formatter->format($data), $this->response->getJSON());
 
         $controller->setResponseFormat('xml');
         $controller->respond($data, 201);
@@ -560,6 +560,6 @@ public function testXMLResponseFormat()
         $controller->respond($data, 201);
 
         $xmlFormatter = new XMLFormatter();
-        $this->assertEquals($xmlFormatter->format($data), $this->response->getXML());
+        $this->assertSame($xmlFormatter->format($data), $this->response->getXML());
     }
 }
diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php
index b84ca000f1d0..575ea8f14c3b 100644
--- a/tests/system/Autoloader/AutoloaderTest.php
+++ b/tests/system/Autoloader/AutoloaderTest.php
@@ -187,7 +187,7 @@ public function testSanitizationSimply()
         $test     = '${../path}!#/to/some/file.php_';
         $expected = '/path/to/some/file.php';
 
-        $this->assertEquals($expected, $this->loader->sanitizeFilename($test));
+        $this->assertSame($expected, $this->loader->sanitizeFilename($test));
     }
 
     public function testSanitizationAllowUnicodeChars()
@@ -195,14 +195,14 @@ public function testSanitizationAllowUnicodeChars()
         $test     = 'Ä/path/to/some/file.php_';
         $expected = 'Ä/path/to/some/file.php';
 
-        $this->assertEquals($expected, $this->loader->sanitizeFilename($test));
+        $this->assertSame($expected, $this->loader->sanitizeFilename($test));
     }
 
     public function testSanitizationAllowsWindowsFilepaths()
     {
         $test = 'C:\path\to\some/file.php';
 
-        $this->assertEquals($test, $this->loader->sanitizeFilename($test));
+        $this->assertSame($test, $this->loader->sanitizeFilename($test));
     }
 
     public function testFindsComposerRoutes()
diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php
index 52f22945b269..d61b0aaa7a1b 100644
--- a/tests/system/Autoloader/FileLocatorTest.php
+++ b/tests/system/Autoloader/FileLocatorTest.php
@@ -47,7 +47,7 @@ public function testLocateFileWorksWithLegacyStructure()
 
         $expected = APPPATH . 'Controllers/Home.php';
 
-        $this->assertEquals($expected, $this->locator->locateFile($file));
+        $this->assertSame($expected, $this->locator->locateFile($file));
     }
 
     //--------------------------------------------------------------------
@@ -67,7 +67,7 @@ public function testLocateFileWorksInApplicationDirectory()
 
         $expected = APPPATH . 'Views/welcome_message.php';
 
-        $this->assertEquals($expected, $this->locator->locateFile($file, 'Views'));
+        $this->assertSame($expected, $this->locator->locateFile($file, 'Views'));
     }
 
     //--------------------------------------------------------------------
@@ -78,7 +78,7 @@ public function testLocateFileWorksInApplicationDirectoryWithoutFolder()
 
         $expected = APPPATH . 'Common.php';
 
-        $this->assertEquals($expected, $this->locator->locateFile($file));
+        $this->assertSame($expected, $this->locator->locateFile($file));
     }
 
     //--------------------------------------------------------------------
@@ -89,7 +89,7 @@ public function testLocateFileWorksInNestedApplicationDirectory()
 
         $expected = APPPATH . 'Controllers/Home.php';
 
-        $this->assertEquals($expected, $this->locator->locateFile($file, 'Controllers'));
+        $this->assertSame($expected, $this->locator->locateFile($file, 'Controllers'));
     }
 
     //--------------------------------------------------------------------
@@ -100,7 +100,7 @@ public function testLocateFileReplacesFolderName()
 
         $expected = APPPATH . 'Views/errors/html/error_404.php';
 
-        $this->assertEquals($expected, $this->locator->locateFile($file, 'Views'));
+        $this->assertSame($expected, $this->locator->locateFile($file, 'Views'));
     }
 
     //--------------------------------------------------------------------
@@ -111,7 +111,7 @@ public function testLocateFileReplacesFolderNameLegacy()
 
         $expected = APPPATH . 'Views/welcome_message.php';
 
-        $this->assertEquals($expected, $this->locator->locateFile($file, 'Views'));
+        $this->assertSame($expected, $this->locator->locateFile($file, 'Views'));
     }
 
     //--------------------------------------------------------------------
@@ -122,7 +122,7 @@ public function testLocateFileCanFindNamespacedView()
 
         $expected = APPPATH . 'Views/errors/html/error_404.php';
 
-        $this->assertEquals($expected, $this->locator->locateFile($file, 'html'));
+        $this->assertSame($expected, $this->locator->locateFile($file, 'html'));
     }
 
     //--------------------------------------------------------------------
@@ -133,7 +133,7 @@ public function testLocateFileCanFindNestedNamespacedView()
 
         $expected = APPPATH . 'Views/errors/html/error_404.php';
 
-        $this->assertEquals($expected, $this->locator->locateFile($file, 'html'));
+        $this->assertSame($expected, $this->locator->locateFile($file, 'html'));
     }
 
     //--------------------------------------------------------------------
@@ -162,7 +162,7 @@ public function testSearchSimple()
 
         $foundFiles = $this->locator->search('Config/App.php');
 
-        $this->assertEquals($expected, $foundFiles[0]);
+        $this->assertSame($expected, $foundFiles[0]);
     }
 
     //--------------------------------------------------------------------
@@ -173,7 +173,7 @@ public function testSearchWithFileExtension()
 
         $foundFiles = $this->locator->search('Config/App', 'php');
 
-        $this->assertEquals($expected, $foundFiles[0]);
+        $this->assertSame($expected, $foundFiles[0]);
     }
 
     //--------------------------------------------------------------------
@@ -204,7 +204,7 @@ public function testSearchPrioritizeSystemOverApp()
     {
         $foundFiles = $this->locator->search('Language/en/Validation.php', 'php', false);
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 SYSTEMPATH . 'Language/en/Validation.php',
                 APPPATH . 'Language/en/Validation.php',
@@ -278,7 +278,7 @@ public function testFindQNameFromPathSimple()
         $ClassName = $this->locator->findQualifiedNameFromPath(SYSTEMPATH . 'HTTP/Header.php');
         $expected  = '\CodeIgniter\HTTP\Header';
 
-        $this->assertEquals($expected, $ClassName);
+        $this->assertSame($expected, $ClassName);
     }
 
     public function testFindQNameFromPathWithFileNotExist()
@@ -297,7 +297,7 @@ public function testFindQNameFromPathWithoutCorrespondingNamespace()
 
     public function testGetClassNameFromClassFile()
     {
-        $this->assertEquals(
+        $this->assertSame(
             __CLASS__,
             $this->locator->getClassname(__FILE__)
         );
@@ -305,7 +305,7 @@ public function testGetClassNameFromClassFile()
 
     public function testGetClassNameFromNonClassFile()
     {
-        $this->assertEquals(
+        $this->assertSame(
             '',
             $this->locator->getClassname(SYSTEMPATH . 'bootstrap.php')
         );
diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php
index e20b64e200b8..3d8f3df3229c 100644
--- a/tests/system/CLI/CLITest.php
+++ b/tests/system/CLI/CLITest.php
@@ -78,8 +78,8 @@ public function testWait()
 
     public function testIsWindows()
     {
-        $this->assertEquals(('\\' === DIRECTORY_SEPARATOR), CLI::isWindows());
-        $this->assertEquals(defined('PHP_WINDOWS_VERSION_MAJOR'), CLI::isWindows());
+        $this->assertSame(('\\' === DIRECTORY_SEPARATOR), CLI::isWindows());
+        $this->assertSame(defined('PHP_WINDOWS_VERSION_MAJOR'), CLI::isWindows());
     }
 
     public function testNewLine()
@@ -110,7 +110,7 @@ public function testColorSupportOnNoColor()
         putenv('NO_COLOR=1');
 
         CLI::init(); // force re-check on env
-        $this->assertEquals('test', CLI::color('test', 'white', 'green'));
+        $this->assertSame('test', CLI::color('test', 'white', 'green'));
         putenv($nocolor ? "NO_COLOR=$nocolor" : 'NO_COLOR');
     }
 
@@ -120,7 +120,7 @@ public function testColorSupportOnHyperTerminals()
         putenv('TERM_PROGRAM=Hyper');
 
         CLI::init(); // force re-check on env
-        $this->assertEquals("\033[1;37m\033[42m\033[4mtest\033[0m", CLI::color('test', 'white', 'green', 'underline'));
+        $this->assertSame("\033[1;37m\033[42m\033[4mtest\033[0m", CLI::color('test', 'white', 'green', 'underline'));
         putenv($termProgram ? "TERM_PROGRAM=$termProgram" : 'TERM_PROGRAM');
     }
 
@@ -135,7 +135,7 @@ public function testColor()
         // After the tests on NO_COLOR and TERM_PROGRAM above,
         // the $isColored variable is rigged. So we reset this.
         CLI::init();
-        $this->assertEquals("\033[1;37m\033[42m\033[4mtest\033[0m", CLI::color('test', 'white', 'green', 'underline'));
+        $this->assertSame("\033[1;37m\033[42m\033[4mtest\033[0m", CLI::color('test', 'white', 'green', 'underline'));
     }
 
     public function testPrint()
@@ -143,7 +143,7 @@ public function testPrint()
         CLI::print('test');
         $expected = 'test';
 
-        $this->assertEquals($expected, CITestStreamFilter::$buffer);
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
 
     public function testPrintForeground()
@@ -151,7 +151,7 @@ public function testPrintForeground()
         CLI::print('test', 'red');
         $expected = "\033[0;31mtest\033[0m";
 
-        $this->assertEquals($expected, CITestStreamFilter::$buffer);
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
 
     public function testPrintBackground()
@@ -159,42 +159,42 @@ public function testPrintBackground()
         CLI::print('test', 'red', 'green');
         $expected = "\033[0;31m\033[42mtest\033[0m";
 
-        $this->assertEquals($expected, CITestStreamFilter::$buffer);
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
 
     public function testWrite()
     {
         CLI::write('test');
         $expected = PHP_EOL . 'test' . PHP_EOL;
-        $this->assertEquals($expected, CITestStreamFilter::$buffer);
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
 
     public function testWriteForeground()
     {
         CLI::write('test', 'red');
         $expected = "\033[0;31mtest\033[0m" . PHP_EOL;
-        $this->assertEquals($expected, CITestStreamFilter::$buffer);
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
 
     public function testWriteForegroundWithColorBefore()
     {
         CLI::write(CLI::color('green', 'green') . ' red', 'red');
         $expected = "\033[0;31m\033[0;32mgreen\033[0m\033[0;31m red\033[0m" . PHP_EOL;
-        $this->assertEquals($expected, CITestStreamFilter::$buffer);
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
 
     public function testWriteForegroundWithColorAfter()
     {
         CLI::write('red ' . CLI::color('green', 'green'), 'red');
         $expected = "\033[0;31mred \033[0;32mgreen\033[0m" . PHP_EOL;
-        $this->assertEquals($expected, CITestStreamFilter::$buffer);
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
 
     public function testWriteBackground()
     {
         CLI::write('test', 'red', 'green');
         $expected = "\033[0;31m\033[42mtest\033[0m" . PHP_EOL;
-        $this->assertEquals($expected, CITestStreamFilter::$buffer);
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
 
     public function testError()
@@ -203,7 +203,7 @@ public function testError()
         CLI::error('test');
         // red expected cuz stderr
         $expected = "\033[1;31mtest\033[0m" . PHP_EOL;
-        $this->assertEquals($expected, CITestStreamFilter::$buffer);
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
 
     public function testErrorForeground()
@@ -211,7 +211,7 @@ public function testErrorForeground()
         $this->stream_filter = stream_filter_append(STDERR, 'CITestStreamFilter');
         CLI::error('test', 'purple');
         $expected = "\033[0;35mtest\033[0m" . PHP_EOL;
-        $this->assertEquals($expected, CITestStreamFilter::$buffer);
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
 
     public function testErrorBackground()
@@ -219,7 +219,7 @@ public function testErrorBackground()
         $this->stream_filter = stream_filter_append(STDERR, 'CITestStreamFilter');
         CLI::error('test', 'purple', 'green');
         $expected = "\033[0;35m\033[42mtest\033[0m" . PHP_EOL;
-        $this->assertEquals($expected, CITestStreamFilter::$buffer);
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
 
     public function testShowProgress()
@@ -245,7 +245,7 @@ public function testShowProgress()
                     "\033[1A[\033[32m##########\033[0m] 100% Complete" . PHP_EOL .
                     'third.' . PHP_EOL .
                     "[\033[32m#.........\033[0m]   5% Complete" . PHP_EOL;
-        $this->assertEquals($expected, CITestStreamFilter::$buffer);
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
 
     public function testShowProgressWithoutBar()
@@ -256,15 +256,15 @@ public function testShowProgressWithoutBar()
         CLI::showProgress(false, 20);
 
         $expected = 'first.' . PHP_EOL . "\007\007\007";
-        $this->assertEquals($expected, CITestStreamFilter::$buffer);
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
 
     public function testWrap()
     {
-        $this->assertEquals('', CLI::wrap(''));
-        $this->assertEquals('1234' . PHP_EOL . ' 5678' . PHP_EOL . ' 90' . PHP_EOL . ' abc' . PHP_EOL . ' de' . PHP_EOL . ' fghij' . PHP_EOL . ' 0987654321', CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', 5, 1));
-        $this->assertEquals('1234 5678 90' . PHP_EOL . '  abc de fghij' . PHP_EOL . '  0987654321', CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', 999, 2));
-        $this->assertEquals('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321'));
+        $this->assertSame('', CLI::wrap(''));
+        $this->assertSame('1234' . PHP_EOL . ' 5678' . PHP_EOL . ' 90' . PHP_EOL . ' abc' . PHP_EOL . ' de' . PHP_EOL . ' fghij' . PHP_EOL . ' 0987654321', CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', 5, 1));
+        $this->assertSame('1234 5678 90' . PHP_EOL . '  abc de fghij' . PHP_EOL . '  0987654321', CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', 999, 2));
+        $this->assertSame('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321'));
     }
 
     public function testParseCommand()
@@ -277,12 +277,12 @@ public function testParseCommand()
         $_SERVER['argc'] = 3;
         CLI::init();
         $this->assertNull(CLI::getSegment(3));
-        $this->assertEquals('b', CLI::getSegment(1));
-        $this->assertEquals('c', CLI::getSegment(2));
-        $this->assertEquals('b/c', CLI::getURI());
-        $this->assertEquals([], CLI::getOptions());
+        $this->assertSame('b', CLI::getSegment(1));
+        $this->assertSame('c', CLI::getSegment(2));
+        $this->assertSame('b/c', CLI::getURI());
+        $this->assertSame([], CLI::getOptions());
         $this->assertEmpty(CLI::getOptionString());
-        $this->assertEquals(['b', 'c'], CLI::getSegments());
+        $this->assertSame(['b', 'c'], CLI::getSegments());
     }
 
     public function testParseCommandMixed()
@@ -302,15 +302,15 @@ public function testParseCommandMixed()
         ];
         CLI::init();
         $this->assertNull(CLI::getSegment(7));
-        $this->assertEquals('b', CLI::getSegment(1));
-        $this->assertEquals('c', CLI::getSegment(2));
-        $this->assertEquals('d', CLI::getSegment(3));
-        $this->assertEquals(['b', 'c', 'd', 'd2', 'da-sh'], CLI::getSegments());
-        $this->assertEquals(['parm' => 'pvalue', 'fix' => null, 'opt-in' => 'sure'], CLI::getOptions());
-        $this->assertEquals('-parm pvalue -fix -opt-in sure ', CLI::getOptionString());
-        $this->assertEquals('-parm pvalue -fix -opt-in sure', CLI::getOptionString(false, true));
-        $this->assertEquals('--parm pvalue --fix --opt-in sure ', CLI::getOptionString(true));
-        $this->assertEquals('--parm pvalue --fix --opt-in sure', CLI::getOptionString(true, true));
+        $this->assertSame('b', CLI::getSegment(1));
+        $this->assertSame('c', CLI::getSegment(2));
+        $this->assertSame('d', CLI::getSegment(3));
+        $this->assertSame(['b', 'c', 'd', 'd2', 'da-sh'], CLI::getSegments());
+        $this->assertSame(['parm' => 'pvalue', 'fix' => null, 'opt-in' => 'sure'], CLI::getOptions());
+        $this->assertSame('-parm pvalue -fix -opt-in sure ', CLI::getOptionString());
+        $this->assertSame('-parm pvalue -fix -opt-in sure', CLI::getOptionString(false, true));
+        $this->assertSame('--parm pvalue --fix --opt-in sure ', CLI::getOptionString(true));
+        $this->assertSame('--parm pvalue --fix --opt-in sure', CLI::getOptionString(true, true));
     }
 
     public function testParseCommandOption()
@@ -324,14 +324,14 @@ public function testParseCommandOption()
             'd',
         ];
         CLI::init();
-        $this->assertEquals(['parm' => 'pvalue'], CLI::getOptions());
-        $this->assertEquals('pvalue', CLI::getOption('parm'));
-        $this->assertEquals('-parm pvalue ', CLI::getOptionString());
-        $this->assertEquals('-parm pvalue', CLI::getOptionString(false, true));
-        $this->assertEquals('--parm pvalue ', CLI::getOptionString(true));
-        $this->assertEquals('--parm pvalue', CLI::getOptionString(true, true));
+        $this->assertSame(['parm' => 'pvalue'], CLI::getOptions());
+        $this->assertSame('pvalue', CLI::getOption('parm'));
+        $this->assertSame('-parm pvalue ', CLI::getOptionString());
+        $this->assertSame('-parm pvalue', CLI::getOptionString(false, true));
+        $this->assertSame('--parm pvalue ', CLI::getOptionString(true));
+        $this->assertSame('--parm pvalue', CLI::getOptionString(true, true));
         $this->assertNull(CLI::getOption('bogus'));
-        $this->assertEquals(['b', 'c', 'd'], CLI::getSegments());
+        $this->assertSame(['b', 'c', 'd'], CLI::getSegments());
     }
 
     public function testParseCommandMultipleOptions()
@@ -348,13 +348,13 @@ public function testParseCommandMultipleOptions()
             'value 3',
         ];
         CLI::init();
-        $this->assertEquals(['parm' => 'pvalue', 'p2' => null, 'p3' => 'value 3'], CLI::getOptions());
-        $this->assertEquals('pvalue', CLI::getOption('parm'));
-        $this->assertEquals('-parm pvalue -p2 -p3 "value 3" ', CLI::getOptionString());
-        $this->assertEquals('-parm pvalue -p2 -p3 "value 3"', CLI::getOptionString(false, true));
-        $this->assertEquals('--parm pvalue --p2 --p3 "value 3" ', CLI::getOptionString(true));
-        $this->assertEquals('--parm pvalue --p2 --p3 "value 3"', CLI::getOptionString(true, true));
-        $this->assertEquals(['b', 'c', 'd'], CLI::getSegments());
+        $this->assertSame(['parm' => 'pvalue', 'p2' => null, 'p3' => 'value 3'], CLI::getOptions());
+        $this->assertSame('pvalue', CLI::getOption('parm'));
+        $this->assertSame('-parm pvalue -p2 -p3 "value 3" ', CLI::getOptionString());
+        $this->assertSame('-parm pvalue -p2 -p3 "value 3"', CLI::getOptionString(false, true));
+        $this->assertSame('--parm pvalue --p2 --p3 "value 3" ', CLI::getOptionString(true));
+        $this->assertSame('--parm pvalue --p2 --p3 "value 3"', CLI::getOptionString(true, true));
+        $this->assertSame(['b', 'c', 'd'], CLI::getSegments());
     }
 
     public function testWindow()
@@ -380,7 +380,7 @@ public function testWindow()
     public function testTable($tbody, $thead, $expected)
     {
         CLI::table($tbody, $thead);
-        $this->assertEquals(CITestStreamFilter::$buffer, $expected);
+        $this->assertSame(CITestStreamFilter::$buffer, $expected);
     }
 
     public function tableProvider()
@@ -470,8 +470,8 @@ public function tableProvider()
 
     public function testStrlen()
     {
-        $this->assertEquals(18, mb_strlen(CLI::color('success', 'green')));
-        $this->assertEquals(7, CLI::strlen(CLI::color('success', 'green')));
-        $this->assertEquals(0, CLI::strlen(null));
+        $this->assertSame(18, mb_strlen(CLI::color('success', 'green')));
+        $this->assertSame(7, CLI::strlen(CLI::color('success', 'green')));
+        $this->assertSame(0, CLI::strlen(null));
     }
 }
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index 0b2760b5a6fd..6c639a43a646 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -250,7 +250,7 @@ public function testGetCacheInfo()
 
         $actual = $this->fileHandler->getCacheInfo();
         $this->assertArrayHasKey(self::$key1, $actual);
-        $this->assertEquals(self::$key1, $actual[self::$key1]['name']);
+        $this->assertSame(self::$key1, $actual[self::$key1]['name']);
         $this->assertArrayHasKey('server_path', $actual[self::$key1]);
     }
 
@@ -276,7 +276,7 @@ public function testSaveMode($int, $string)
         $file = $config->file['storePath'] . DIRECTORY_SEPARATOR . self::$key1;
         $mode = octal_permissions(fileperms($file));
 
-        $this->assertEquals($string, $mode);
+        $this->assertSame($string, $mode);
     }
 
     public function modeProvider()
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index 4a82df33e544..a56d1472a258 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -28,20 +28,18 @@ final class CodeIgniterTest extends CIUnitTestCase
     protected function setUp(): void
     {
         parent::setUp();
-
         Services::reset();
 
         $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
 
-        $config            = new App();
-        $this->codeigniter = new MockCodeIgniter($config);
+        $this->codeigniter = new MockCodeIgniter(new App());
     }
 
     protected function tearDown(): void
     {
         parent::tearDown();
 
-        if (count( ob_list_handlers() ) > 1) {
+        if (count(ob_list_handlers()) > 1) {
             ob_end_clean();
         }
     }
@@ -50,9 +48,7 @@ protected function tearDown(): void
 
     public function testRunEmptyDefaultRoute()
     {
-        $_SERVER['argv'] = [
-            'index.php',
-        ];
+        $_SERVER['argv'] = ['index.php'];
         $_SERVER['argc'] = 1;
 
         ob_start();
@@ -66,10 +62,7 @@ public function testRunEmptyDefaultRoute()
 
     public function testRunClosureRoute()
     {
-        $_SERVER['argv'] = [
-            'index.php',
-            'pages/about',
-        ];
+        $_SERVER['argv'] = ['index.php', 'pages/about'];
         $_SERVER['argc'] = 2;
 
         $_SERVER['REQUEST_URI'] = '/pages/about';
@@ -93,10 +86,7 @@ public function testRunClosureRoute()
 
     public function testRun404Override()
     {
-        $_SERVER['argv'] = [
-            'index.php',
-            '/',
-        ];
+        $_SERVER['argv'] = ['index.php', '/'];
         $_SERVER['argc'] = 2;
 
         // Inject mock router.
@@ -117,10 +107,7 @@ public function testRun404Override()
 
     public function testRun404OverrideByClosure()
     {
-        $_SERVER['argv'] = [
-            'index.php',
-            '/',
-        ];
+        $_SERVER['argv'] = ['index.php', '/'];
         $_SERVER['argc'] = 2;
 
         // Inject mock router.
@@ -143,11 +130,9 @@ public function testRun404OverrideByClosure()
 
     public function testControllersCanReturnString()
     {
-        $_SERVER['argv'] = [
-            'index.php',
-            'pages/about',
-        ];
-        $_SERVER['argc']        = 2;
+        $_SERVER['argv'] = ['index.php', 'pages/about'];
+        $_SERVER['argc'] = 2;
+
         $_SERVER['REQUEST_URI'] = '/pages/about';
 
         // Inject mock router.
@@ -169,11 +154,9 @@ public function testControllersCanReturnString()
 
     public function testControllersCanReturnResponseObject()
     {
-        $_SERVER['argv'] = [
-            'index.php',
-            'pages/about',
-        ];
-        $_SERVER['argc']        = 2;
+        $_SERVER['argv'] = ['index.php', 'pages/about'];
+        $_SERVER['argc'] = 2;
+
         $_SERVER['REQUEST_URI'] = '/pages/about';
 
         // Inject mock router.
@@ -198,10 +181,7 @@ public function testControllersCanReturnResponseObject()
 
     public function testResponseConfigEmpty()
     {
-        $_SERVER['argv'] = [
-            'index.php',
-            '/',
-        ];
+        $_SERVER['argv'] = ['index.php', '/'];
         $_SERVER['argc'] = 2;
 
         $response = Services::response(null, false);
@@ -213,10 +193,7 @@ public function testResponseConfigEmpty()
 
     public function testRoutesIsEmpty()
     {
-        $_SERVER['argv'] = [
-            'index.php',
-            '/',
-        ];
+        $_SERVER['argv'] = ['index.php', '/'];
         $_SERVER['argc'] = 2;
 
         // Inject mock router.
@@ -232,11 +209,9 @@ public function testRoutesIsEmpty()
 
     public function testTransfersCorrectHTTPVersion()
     {
-        $_SERVER['argv'] = [
-            'index.php',
-            '/',
-        ];
-        $_SERVER['argc']            = 2;
+        $_SERVER['argv'] = ['index.php', '/'];
+        $_SERVER['argc'] = 2;
+
         $_SERVER['SERVER_PROTOCOL'] = 'HTTP/2.0';
 
         ob_start();
@@ -245,15 +220,12 @@ public function testTransfersCorrectHTTPVersion()
 
         $response = $this->getPrivateProperty($this->codeigniter, 'response');
 
-        $this->assertEquals(2, $response->getProtocolVersion());
+        $this->assertSame('2.0', $response->getProtocolVersion());
     }
 
     public function testIgnoringErrorSuppressedByAt()
     {
-        $_SERVER['argv'] = [
-            'index.php',
-            '/',
-        ];
+        $_SERVER['argv'] = ['index.php', '/'];
         $_SERVER['argc'] = 2;
 
         ob_start();
@@ -268,15 +240,14 @@ public function testIgnoringErrorSuppressedByAt()
 
     public function testRunForceSecure()
     {
-        $_SERVER['argv'] = [
-            'index.php',
-            '/',
-        ];
+        $_SERVER['argv'] = ['index.php', '/'];
         $_SERVER['argc'] = 2;
 
-        $config                            = new App();
+        $config = new App();
+
         $config->forceGlobalSecureRequests = true;
-        $codeigniter                       = new MockCodeIgniter($config);
+
+        $codeigniter = new MockCodeIgniter($config);
 
         $this->getPrivateMethodInvoker($codeigniter, 'getRequestObject')();
         $this->getPrivateMethodInvoker($codeigniter, 'getResponseObject')();
@@ -288,16 +259,14 @@ public function testRunForceSecure()
         $codeigniter->useSafeOutput(true)->run();
         ob_get_clean();
 
-        $this->assertEquals('https://example.com/', $response->header('Location')->getValue());
+        $this->assertSame('https://example.com/', $response->header('Location')->getValue());
     }
 
     public function testRunRedirectionWithNamed()
     {
-        $_SERVER['argv'] = [
-            'index.php',
-            'example',
-        ];
-        $_SERVER['argc']        = 2;
+        $_SERVER['argv'] = ['index.php', 'example'];
+        $_SERVER['argc'] = 2;
+
         $_SERVER['REQUEST_URI'] = '/example';
 
         // Inject mock router.
@@ -313,16 +282,14 @@ public function testRunRedirectionWithNamed()
         $this->codeigniter->useSafeOutput(true)->run();
         ob_get_clean();
         $response = $this->getPrivateProperty($this->codeigniter, 'response');
-        $this->assertEquals('http://example.com/pages/named', $response->header('Location')->getValue());
+        $this->assertSame('http://example.com/pages/named', $response->header('Location')->getValue());
     }
 
     public function testRunRedirectionWithURI()
     {
-        $_SERVER['argv'] = [
-            'index.php',
-            'example',
-        ];
-        $_SERVER['argc']        = 2;
+        $_SERVER['argv'] = ['index.php', 'example'];
+        $_SERVER['argc'] = 2;
+
         $_SERVER['REQUEST_URI'] = '/example';
 
         // Inject mock router.
@@ -338,7 +305,7 @@ public function testRunRedirectionWithURI()
         $this->codeigniter->useSafeOutput(true)->run();
         ob_get_clean();
         $response = $this->getPrivateProperty($this->codeigniter, 'response');
-        $this->assertEquals('http://example.com/pages/uri', $response->header('Location')->getValue());
+        $this->assertSame('http://example.com/pages/uri', $response->header('Location')->getValue());
     }
 
     /**
@@ -346,11 +313,9 @@ public function testRunRedirectionWithURI()
      */
     public function testRunRedirectionWithURINotSet()
     {
-        $_SERVER['argv'] = [
-            'index.php',
-            'example',
-        ];
-        $_SERVER['argc']        = 2;
+        $_SERVER['argv'] = ['index.php', 'example'];
+        $_SERVER['argc'] = 2;
+
         $_SERVER['REQUEST_URI'] = '/example';
 
         // Inject mock router.
@@ -364,16 +329,14 @@ public function testRunRedirectionWithURINotSet()
         $this->codeigniter->useSafeOutput(true)->run();
         ob_get_clean();
         $response = $this->getPrivateProperty($this->codeigniter, 'response');
-        $this->assertEquals('http://example.com/pages/notset', $response->header('Location')->getValue());
+        $this->assertSame('http://example.com/pages/notset', $response->header('Location')->getValue());
     }
 
     public function testRunRedirectionWithHTTPCode303()
     {
-        $_SERVER['argv'] = [
-            'index.php',
-            'example',
-        ];
-        $_SERVER['argc']            = 2;
+        $_SERVER['argv'] = ['index.php', 'example'];
+        $_SERVER['argc'] = 2;
+
         $_SERVER['REQUEST_URI']     = '/example';
         $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
         $_SERVER['REQUEST_METHOD']  = 'POST';
@@ -388,17 +351,16 @@ public function testRunRedirectionWithHTTPCode303()
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run();
         ob_get_clean();
+
         $response = $this->getPrivateProperty($this->codeigniter, 'response');
-        $this->assertEquals('303', $response->getStatusCode());
+        $this->assertSame(303, $response->getStatusCode());
     }
 
     public function testRunRedirectionWithHTTPCode301()
     {
-        $_SERVER['argv'] = [
-            'index.php',
-            'example',
-        ];
-        $_SERVER['argc']            = 2;
+        $_SERVER['argv'] = ['index.php', 'example'];
+        $_SERVER['argc'] = 2;
+
         $_SERVER['REQUEST_URI']     = '/example';
         $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
         $_SERVER['REQUEST_METHOD']  = 'GET';
@@ -414,7 +376,7 @@ public function testRunRedirectionWithHTTPCode301()
         $this->codeigniter->useSafeOutput(true)->run();
         ob_get_clean();
         $response = $this->getPrivateProperty($this->codeigniter, 'response');
-        $this->assertEquals('301', $response->getStatusCode());
+        $this->assertSame(301, $response->getStatusCode());
     }
 
     /**
@@ -424,10 +386,7 @@ public function testRunRedirectionWithHTTPCode301()
      */
     public function testRunDefaultRoute()
     {
-        $_SERVER['argv'] = [
-            'index.php',
-            '/',
-        ];
+        $_SERVER['argv'] = ['index.php', '/'];
         $_SERVER['argc'] = 2;
 
         ob_start();
diff --git a/tests/system/Commands/BaseCommandTest.php b/tests/system/Commands/BaseCommandTest.php
index 647e922fb4d3..3596237ea0ae 100644
--- a/tests/system/Commands/BaseCommandTest.php
+++ b/tests/system/Commands/BaseCommandTest.php
@@ -40,7 +40,7 @@ public function testMagicGet()
     {
         $command = new AppInfo($this->logger, service('commands'));
 
-        $this->assertEquals('demo', $command->group);
+        $this->assertSame('demo', $command->group);
     }
 
     public function testMagicGetMissing()
diff --git a/tests/system/Commands/ClearCacheTest.php b/tests/system/Commands/ClearCacheTest.php
index dff562a2189c..35ee04bcf31f 100644
--- a/tests/system/Commands/ClearCacheTest.php
+++ b/tests/system/Commands/ClearCacheTest.php
@@ -41,7 +41,7 @@ public function testClearCacheInvalidHandler()
     public function testClearCacheWorks()
     {
         cache()->save('foo', 'bar');
-        $this->assertEquals('bar', cache('foo'));
+        $this->assertSame('bar', cache('foo'));
 
         command('cache:clear');
 
diff --git a/tests/system/Commands/CommandTest.php b/tests/system/Commands/CommandTest.php
index 8658eda43932..25c1c870d741 100644
--- a/tests/system/Commands/CommandTest.php
+++ b/tests/system/Commands/CommandTest.php
@@ -21,8 +21,9 @@ protected function setUp(): void
         parent::setUp();
 
         CITestStreamFilter::$buffer = '';
-        $this->streamFilter         = stream_filter_append(STDOUT, 'CITestStreamFilter');
-        $this->streamFilter         = stream_filter_append(STDERR, 'CITestStreamFilter');
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
 
         $this->logger   = Services::logger();
         $this->commands = Services::commands();
@@ -137,7 +138,7 @@ public function testCommandParsesArgsCorrectly(string $input, array $expected)
         ParamsReveal::$args = null;
         command($input);
 
-        $this->assertEquals($expected, ParamsReveal::$args);
+        $this->assertSame($expected, ParamsReveal::$args);
     }
 
     public function commandArgsProvider(): array
@@ -145,10 +146,7 @@ public function commandArgsProvider(): array
         return [
             [
                 'reveal as df',
-                [
-                    'as',
-                    'df',
-                ],
+                ['as', 'df'],
             ],
             [
                 'reveal',
@@ -156,50 +154,23 @@ public function commandArgsProvider(): array
             ],
             [
                 'reveal seg1 seg2 -opt1 -opt2',
-                [
-                    'seg1',
-                    'seg2',
-                    'opt1' => null,
-                    'opt2' => null,
-                ],
+                ['seg1', 'seg2', 'opt1' => null, 'opt2' => null],
             ],
             [
                 'reveal seg1 seg2 -opt1 val1 seg3',
-                [
-                    'seg1',
-                    'seg2',
-                    'opt1' => 'val1',
-                    'seg3',
-                ],
+                ['seg1', 'seg2', 'opt1' => 'val1', 'seg3'],
             ],
             [
                 'reveal as df -gh -jk -qw 12 zx cv',
-                [
-                    'as',
-                    'df',
-                    'gh' => null,
-                    'jk' => null,
-                    'qw' => 12,
-                    'zx',
-                    'cv',
-                ],
+                ['as', 'df', 'gh' => null, 'jk' => null, 'qw' => '12', 'zx', 'cv'],
             ],
             [
                 'reveal as -df "some stuff" -jk 12 -sd "Some longer stuff" -fg \'using single quotes\'',
-                [
-                    'as',
-                    'df' => 'some stuff',
-                    'jk' => 12,
-                    'sd' => 'Some longer stuff',
-                    'fg' => 'using single quotes',
-                ],
+                ['as', 'df' => 'some stuff', 'jk' => '12', 'sd' => 'Some longer stuff', 'fg' => 'using single quotes'],
             ],
             [
                 'reveal as -df "using mixed \'quotes\'\" here\""',
-                [
-                    'as',
-                    'df' => 'using mixed \'quotes\'" here"',
-                ],
+                ['as', 'df' => 'using mixed \'quotes\'" here"'],
             ],
         ];
     }
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 74ce64c7a364..c76c3191e992 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -41,48 +41,48 @@ protected function setUp(): void
 
     public function testStringifyAttributes()
     {
-        $this->assertEquals(' class="foo" id="bar"', stringify_attributes(['class' => 'foo', 'id' => 'bar']));
+        $this->assertSame(' class="foo" id="bar"', stringify_attributes(['class' => 'foo', 'id' => 'bar']));
 
         $atts        = new stdClass();
         $atts->class = 'foo';
         $atts->id    = 'bar';
-        $this->assertEquals(' class="foo" id="bar"', stringify_attributes($atts));
+        $this->assertSame(' class="foo" id="bar"', stringify_attributes($atts));
 
         $atts = new stdClass();
-        $this->assertEquals('', stringify_attributes($atts));
+        $this->assertSame('', stringify_attributes($atts));
 
-        $this->assertEquals(' class="foo" id="bar"', stringify_attributes('class="foo" id="bar"'));
+        $this->assertSame(' class="foo" id="bar"', stringify_attributes('class="foo" id="bar"'));
 
-        $this->assertEquals('', stringify_attributes([]));
+        $this->assertSame('', stringify_attributes([]));
     }
 
     public function testStringifyJsAttributes()
     {
-        $this->assertEquals('width=800,height=600', stringify_attributes(['width' => '800', 'height' => '600'], true));
+        $this->assertSame('width=800,height=600', stringify_attributes(['width' => '800', 'height' => '600'], true));
 
         $atts         = new stdClass();
         $atts->width  = 800;
         $atts->height = 600;
-        $this->assertEquals('width=800,height=600', stringify_attributes($atts, true));
+        $this->assertSame('width=800,height=600', stringify_attributes($atts, true));
     }
 
     public function testEnvReturnsDefault()
     {
-        $this->assertEquals('baz', env('foo', 'baz'));
+        $this->assertSame('baz', env('foo', 'baz'));
     }
 
     public function testEnvGetsFromSERVER()
     {
         $_SERVER['foo'] = 'bar';
 
-        $this->assertEquals('bar', env('foo', 'baz'));
+        $this->assertSame('bar', env('foo', 'baz'));
     }
 
     public function testEnvGetsFromENV()
     {
         $_ENV['foo'] = 'bar';
 
-        $this->assertEquals('bar', env('foo', 'baz'));
+        $this->assertSame('bar', env('foo', 'baz'));
     }
 
     public function testEnvBooleans()
@@ -145,14 +145,14 @@ public function testViewSavedData()
     public function testViewCell()
     {
         $expected = 'Hello';
-        $this->assertEquals($expected, view_cell('\Tests\Support\View\SampleClass::hello'));
+        $this->assertSame($expected, view_cell('\Tests\Support\View\SampleClass::hello'));
     }
 
     public function testEscapeWithDifferentEncodings()
     {
-        $this->assertEquals('&lt;x', esc('<x', 'html', 'utf-8'));
-        $this->assertEquals('&lt;x', esc('<x', 'html', 'iso-8859-1'));
-        $this->assertEquals('&lt;x', esc('<x', 'html', 'windows-1251'));
+        $this->assertSame('&lt;x', esc('<x', 'html', 'utf-8'));
+        $this->assertSame('&lt;x', esc('<x', 'html', 'iso-8859-1'));
+        $this->assertSame('&lt;x', esc('<x', 'html', 'windows-1251'));
     }
 
     public function testEscapeBadContext()
@@ -182,7 +182,7 @@ public function testSessionVariable()
 
         $_SESSION['notbogus'] = 'Hi there';
 
-        $this->assertEquals('Hi there', session('notbogus'));
+        $this->assertSame('Hi there', session('notbogus'));
     }
 
     /**
@@ -203,37 +203,37 @@ public function testRouteTo()
         $routes = service('routes');
         $routes->add('path/(:any)/to/(:num)', 'myController::goto/$1/$2');
 
-        $this->assertEquals('/path/string/to/13', route_to('myController::goto', 'string', 13));
+        $this->assertSame('/path/string/to/13', route_to('myController::goto', 'string', 13));
     }
 
     public function testInvisible()
     {
-        $this->assertEquals('Javascript', remove_invisible_characters("Java\0script"));
+        $this->assertSame('Javascript', remove_invisible_characters("Java\0script"));
     }
 
     public function testInvisibleEncoded()
     {
-        $this->assertEquals('Javascript', remove_invisible_characters('Java%0cscript'));
+        $this->assertSame('Javascript', remove_invisible_characters('Java%0cscript'));
     }
 
     public function testAppTimezone()
     {
-        $this->assertEquals('America/Chicago', app_timezone());
+        $this->assertSame('America/Chicago', app_timezone());
     }
 
     public function testCSRFToken()
     {
-        $this->assertEquals('csrf_test_name', csrf_token());
+        $this->assertSame('csrf_test_name', csrf_token());
     }
 
     public function testCSRFHeader()
     {
-        $this->assertEquals('X-CSRF-TOKEN', csrf_header());
+        $this->assertSame('X-CSRF-TOKEN', csrf_header());
     }
 
     public function testHash()
     {
-        $this->assertEquals(32, strlen(csrf_hash()));
+        $this->assertSame(32, strlen(csrf_hash()));
     }
 
     public function testCSRFField()
@@ -296,9 +296,9 @@ public function testOldInput()
         $response = new RedirectResponse(new App());
         $response->withInput();
 
-        $this->assertEquals('bar', old('foo')); // regular parameter
-        $this->assertEquals('doo', old('yabba dabba', 'doo')); // non-existing parameter
-        $this->assertEquals('fritz', old('zibble')); // serialized parameter
+        $this->assertSame('bar', old('foo')); // regular parameter
+        $this->assertSame('doo', old('yabba dabba', 'doo')); // non-existing parameter
+        $this->assertSame('fritz', old('zibble')); // serialized parameter
     }
 
     /**
@@ -335,7 +335,7 @@ public function testOldInputArray()
         $response = new RedirectResponse(new App());
         $response->withInput();
 
-        $this->assertEquals($locations, old('location'));
+        $this->assertSame($locations, old('location'));
     }
 
     public function testReallyWritable()
@@ -346,9 +346,9 @@ public function testReallyWritable()
 
     public function testSlashItem()
     {
-        $this->assertEquals('/', slash_item('cookiePath')); // slash already there
-        $this->assertEquals('', slash_item('cookieDomain')); // empty, so untouched
-        $this->assertEquals('en/', slash_item('defaultLocale')); // slash appended
+        $this->assertSame('/', slash_item('cookiePath')); // slash already there
+        $this->assertSame('', slash_item('cookieDomain')); // empty, so untouched
+        $this->assertSame('en/', slash_item('defaultLocale')); // slash appended
     }
 
     protected function injectSessionMock()
@@ -425,7 +425,7 @@ public function testForceHttpsNullRequestAndResponse()
 
         force_https();
 
-        $this->assertEquals('https://example.com/', Services::response()->header('Location')->getValue());
+        $this->assertSame('https://example.com/', Services::response()->header('Location')->getValue());
     }
 
     /**
@@ -433,7 +433,7 @@ public function testForceHttpsNullRequestAndResponse()
      */
     public function testCleanPathActuallyCleaningThePaths($input, $expected)
     {
-        $this->assertEquals($expected, clean_path($input));
+        $this->assertSame($expected, clean_path($input));
     }
 
     public function dirtyPathsProvider()
diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php
index 98a3f90fc10b..c091e63e8144 100644
--- a/tests/system/Config/BaseConfigTest.php
+++ b/tests/system/Config/BaseConfigTest.php
@@ -192,7 +192,7 @@ public function testRecognizesLooseValues()
 
         $config = new SimpleConfig();
 
-        $this->assertEquals(0, $config->QZERO);
+        $this->assertSame(0, (int) $config->QZERO);
         $this->assertSame('0', $config->QZEROSTR);
         $this->assertSame(' ', $config->QEMPTYSTR);
         $this->assertFalse($config->QFALSE);
diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php
index 30855c401190..efaed6a69ff3 100644
--- a/tests/system/Config/DotEnvTest.php
+++ b/tests/system/Config/DotEnvTest.php
@@ -51,10 +51,10 @@ public function testLoadsVars()
     {
         $dotenv = new DotEnv($this->fixturesFolder);
         $dotenv->load();
-        $this->assertEquals('bar', getenv('FOO'));
-        $this->assertEquals('baz', getenv('BAR'));
-        $this->assertEquals('with spaces', getenv('SPACED'));
-        $this->assertEquals('', getenv('NULL'));
+        $this->assertSame('bar', getenv('FOO'));
+        $this->assertSame('baz', getenv('BAR'));
+        $this->assertSame('with spaces', getenv('SPACED'));
+        $this->assertSame('', getenv('NULL'));
     }
 
     //--------------------------------------------------------------------
@@ -68,9 +68,9 @@ public function testLoadsHex2Bin()
         $dotenv = new DotEnv($this->fixturesFolder, 'encryption.env');
         $dotenv->load();
 
-        $this->assertEquals('hex2bin:f699c7fd18a8e082d0228932f3acd40e1ef5ef92efcedda32842a211d62f0aa6', getenv('encryption.key'));
-        $this->assertEquals('hex2bin:f699c7fd18a8e082d0228932f3acd40e1ef5ef92efcedda32842a211d62f0aa6', getenv('different.key'));
-        $this->assertEquals('OpenSSL', getenv('encryption.driver'));
+        $this->assertSame('hex2bin:f699c7fd18a8e082d0228932f3acd40e1ef5ef92efcedda32842a211d62f0aa6', getenv('encryption.key'));
+        $this->assertSame('hex2bin:f699c7fd18a8e082d0228932f3acd40e1ef5ef92efcedda32842a211d62f0aa6', getenv('different.key'));
+        $this->assertSame('OpenSSL', getenv('encryption.driver'));
     }
 
     //--------------------------------------------------------------------
@@ -84,8 +84,8 @@ public function testLoadsBase64()
         $dotenv = new DotEnv($this->fixturesFolder, 'base64encryption.env');
         $dotenv->load();
 
-        $this->assertEquals('base64:L40bKo6b8Nu541LeVeZ1i5RXfGgnkar42CPTfukhGhw=', getenv('encryption.key'));
-        $this->assertEquals('OpenSSL', getenv('encryption.driver'));
+        $this->assertSame('base64:L40bKo6b8Nu541LeVeZ1i5RXfGgnkar42CPTfukhGhw=', getenv('encryption.key'));
+        $this->assertSame('OpenSSL', getenv('encryption.driver'));
     }
 
     //--------------------------------------------------------------------
@@ -94,10 +94,10 @@ public function testLoadsNoneStringFiles()
     {
         $dotenv = new DotEnv($this->fixturesFolder, 2);
         $dotenv->load();
-        $this->assertEquals('bar', getenv('FOO'));
-        $this->assertEquals('baz', getenv('BAR'));
-        $this->assertEquals('with spaces', getenv('SPACED'));
-        $this->assertEquals('', getenv('NULL'));
+        $this->assertSame('bar', getenv('FOO'));
+        $this->assertSame('baz', getenv('BAR'));
+        $this->assertSame('with spaces', getenv('SPACED'));
+        $this->assertSame('', getenv('NULL'));
     }
 
     //--------------------------------------------------------------------
@@ -106,13 +106,13 @@ public function testCommentedLoadsVars()
     {
         $dotenv = new DotEnv($this->fixturesFolder, 'commented.env');
         $dotenv->load();
-        $this->assertEquals('bar', getenv('CFOO'));
+        $this->assertSame('bar', getenv('CFOO'));
         $this->assertFalse(getenv('CBAR'));
         $this->assertFalse(getenv('CZOO'));
-        $this->assertEquals('with spaces', getenv('CSPACED'));
-        $this->assertEquals('a value with a # character', getenv('CQUOTES'));
-        $this->assertEquals('a value with a # character & a quote " character inside quotes', getenv('CQUOTESWITHQUOTE'));
-        $this->assertEquals('', getenv('CNULL'));
+        $this->assertSame('with spaces', getenv('CSPACED'));
+        $this->assertSame('a value with a # character', getenv('CQUOTES'));
+        $this->assertSame('a value with a # character & a quote " character inside quotes', getenv('CQUOTESWITHQUOTE'));
+        $this->assertSame('', getenv('CNULL'));
     }
 
     //--------------------------------------------------------------------
@@ -134,12 +134,12 @@ public function testQuotedDotenvLoadsEnvironmentVars()
     {
         $dotenv = new Dotenv($this->fixturesFolder, 'quoted.env');
         $dotenv->load();
-        $this->assertEquals('bar', getenv('QFOO'));
-        $this->assertEquals('baz', getenv('QBAR'));
-        $this->assertEquals('with spaces', getenv('QSPACED'));
-        $this->assertEquals('', getenv('QNULL'));
-        $this->assertEquals('pgsql:host=localhost;dbname=test', getenv('QEQUALS'));
-        $this->assertEquals('test some escaped characters like a quote (") or maybe a backslash (\\)', getenv('QESCAPED'));
+        $this->assertSame('bar', getenv('QFOO'));
+        $this->assertSame('baz', getenv('QBAR'));
+        $this->assertSame('with spaces', getenv('QSPACED'));
+        $this->assertSame('', getenv('QNULL'));
+        $this->assertSame('pgsql:host=localhost;dbname=test', getenv('QEQUALS'));
+        $this->assertSame('test some escaped characters like a quote (") or maybe a backslash (\\)', getenv('QESCAPED'));
     }
 
     //--------------------------------------------------------------------
@@ -160,10 +160,10 @@ public function testLoadsServerGlobals()
         $dotenv = new Dotenv($this->fixturesFolder, '.env');
         $dotenv->load();
 
-        $this->assertEquals('bar', $_SERVER['FOO']);
-        $this->assertEquals('baz', $_SERVER['BAR']);
-        $this->assertEquals('with spaces', $_SERVER['SPACED']);
-        $this->assertEquals('', $_SERVER['NULL']);
+        $this->assertSame('bar', $_SERVER['FOO']);
+        $this->assertSame('baz', $_SERVER['BAR']);
+        $this->assertSame('with spaces', $_SERVER['SPACED']);
+        $this->assertSame('', $_SERVER['NULL']);
     }
 
     //--------------------------------------------------------------------
@@ -173,7 +173,7 @@ public function testNamespacedVariables()
         $dotenv = new Dotenv($this->fixturesFolder, '.env');
         $dotenv->load();
 
-        $this->assertEquals('complex', $_SERVER['SimpleConfig.simple.name']);
+        $this->assertSame('complex', $_SERVER['SimpleConfig.simple.name']);
     }
 
     //--------------------------------------------------------------------
@@ -184,7 +184,7 @@ public function testLoadsGetServerVar()
         $dotenv             = new Dotenv($this->fixturesFolder, 'nested.env');
         $dotenv->load();
 
-        $this->assertEquals('TT', $_ENV['NVAR7']);
+        $this->assertSame('TT', $_ENV['NVAR7']);
     }
 
     //--------------------------------------------------------------------
@@ -193,10 +193,10 @@ public function testLoadsEnvGlobals()
     {
         $dotenv = new Dotenv($this->fixturesFolder);
         $dotenv->load();
-        $this->assertEquals('bar', $_ENV['FOO']);
-        $this->assertEquals('baz', $_ENV['BAR']);
-        $this->assertEquals('with spaces', $_ENV['SPACED']);
-        $this->assertEquals('', $_ENV['NULL']);
+        $this->assertSame('bar', $_ENV['FOO']);
+        $this->assertSame('baz', $_ENV['BAR']);
+        $this->assertSame('with spaces', $_ENV['SPACED']);
+        $this->assertSame('', $_ENV['NULL']);
     }
 
     //--------------------------------------------------------------------
@@ -205,10 +205,10 @@ public function testNestedEnvironmentVars()
     {
         $dotenv = new Dotenv($this->fixturesFolder, 'nested.env');
         $dotenv->load();
-        $this->assertEquals('{$NVAR1} {$NVAR2}', $_ENV['NVAR3']); // not resolved
-        $this->assertEquals('Hello World!', $_ENV['NVAR4']);
-        $this->assertEquals('$NVAR1 {NVAR2}', $_ENV['NVAR5']); // not resolved
-        $this->assertEquals('Hello/World!', $_ENV['NVAR8']);
+        $this->assertSame('{$NVAR1} {$NVAR2}', $_ENV['NVAR3']); // not resolved
+        $this->assertSame('Hello World!', $_ENV['NVAR4']);
+        $this->assertSame('$NVAR1 {NVAR2}', $_ENV['NVAR5']); // not resolved
+        $this->assertSame('Hello/World!', $_ENV['NVAR8']);
     }
 
     //--------------------------------------------------------------------
@@ -217,11 +217,11 @@ public function testDotenvAllowsSpecialCharacters()
     {
         $dotenv = new Dotenv($this->fixturesFolder, 'specialchars.env');
         $dotenv->load();
-        $this->assertEquals('$a6^C7k%zs+e^.jvjXk', getenv('SPVAR1'));
-        $this->assertEquals('?BUty3koaV3%GA*hMAwH}B', getenv('SPVAR2'));
-        $this->assertEquals('jdgEB4{QgEC]HL))&GcXxokB+wqoN+j>xkV7K?m$r', getenv('SPVAR3'));
-        $this->assertEquals('22222:22#2^{', getenv('SPVAR4'));
-        $this->assertEquals('test some escaped characters like a quote " or maybe a backslash \\', getenv('SPVAR5'));
+        $this->assertSame('$a6^C7k%zs+e^.jvjXk', getenv('SPVAR1'));
+        $this->assertSame('?BUty3koaV3%GA*hMAwH}B', getenv('SPVAR2'));
+        $this->assertSame('jdgEB4{QgEC]HL))&GcXxokB+wqoN+j>xkV7K?m$r', getenv('SPVAR3'));
+        $this->assertSame('22222:22#2^{', getenv('SPVAR4'));
+        $this->assertSame('test some escaped characters like a quote " or maybe a backslash \\', getenv('SPVAR5'));
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Config/FactoriesTest.php b/tests/system/Config/FactoriesTest.php
index f9bddc928c56..e51d138efac1 100644
--- a/tests/system/Config/FactoriesTest.php
+++ b/tests/system/Config/FactoriesTest.php
@@ -52,7 +52,7 @@ public function testGetsDefaultOptions()
         $result = Factories::getOptions('blahblahs');
 
         $this->assertTrue($result['preferApp']);
-        $this->assertEquals('Blahblahs', $result['path']);
+        $this->assertSame('Blahblahs', $result['path']);
     }
 
     public function testSetsOptions()
@@ -61,7 +61,7 @@ public function testSetsOptions()
 
         $result = Factories::getOptions('widgets');
 
-        $this->assertEquals('bar', $result['foo']);
+        $this->assertSame('bar', $result['foo']);
         $this->assertTrue($result['preferApp']);
     }
 
@@ -74,7 +74,7 @@ public function testUsesConfigOptions()
 
         $result = Factories::getOptions('widgets');
 
-        $this->assertEquals('bam', $result['bar']);
+        $this->assertSame('bam', $result['bar']);
     }
 
     public function testSetOptionsResets()
@@ -99,7 +99,7 @@ public function testResetsAll()
         Factories::reset();
 
         $result = $this->getFactoriesStaticProperty('options');
-        $this->assertEquals([], $result);
+        $this->assertSame([], $result);
     }
 
     public function testResetsComponentOnly()
@@ -118,22 +118,22 @@ public function testResetsComponentOnly()
 
     public function testGetsBasenameByBasename()
     {
-        $this->assertEquals('SomeWidget', Factories::getBasename('SomeWidget'));
+        $this->assertSame('SomeWidget', Factories::getBasename('SomeWidget'));
     }
 
     public function testGetsBasenameByClassname()
     {
-        $this->assertEquals('SomeWidget', Factories::getBasename(SomeWidget::class));
+        $this->assertSame('SomeWidget', Factories::getBasename(SomeWidget::class));
     }
 
     public function testGetsBasenameByAbsoluteClassname()
     {
-        $this->assertEquals('UserModel', Factories::getBasename('\Tests\Support\Models\UserModel'));
+        $this->assertSame('UserModel', Factories::getBasename('\Tests\Support\Models\UserModel'));
     }
 
     public function testGetsBasenameInvalid()
     {
-        $this->assertEquals('', Factories::getBasename('Tests\\Support\\'));
+        $this->assertSame('', Factories::getBasename('Tests\\Support\\'));
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Config/MimesTest.php b/tests/system/Config/MimesTest.php
index 19da622123a6..a5a33ddd0761 100644
--- a/tests/system/Config/MimesTest.php
+++ b/tests/system/Config/MimesTest.php
@@ -46,7 +46,7 @@ public function extensionsList()
      */
     public function testGuessExtensionFromType($expected, $mime)
     {
-        $this->assertEquals($expected, Mimes::guessExtensionFromType($mime));
+        $this->assertSame($expected, Mimes::guessExtensionFromType($mime));
     }
 
     //--------------------------------------------------------------------
@@ -84,7 +84,7 @@ public function mimesList()
      */
     public function testGuessTypeFromExtension($expected, $ext)
     {
-        $this->assertEquals($expected, Mimes::guessTypeFromExtension($ext));
+        $this->assertSame($expected, Mimes::guessTypeFromExtension($ext));
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php
index 3e7662fb49ac..e33b985bc57a 100644
--- a/tests/system/Config/ServicesTest.php
+++ b/tests/system/Config/ServicesTest.php
@@ -171,20 +171,20 @@ public function testNewLanguage()
     {
         $actual = Services::language();
         $this->assertInstanceOf(Language::class, $actual);
-        $this->assertEquals('en', $actual->getLocale());
+        $this->assertSame('en', $actual->getLocale());
 
         Services::language('la');
-        $this->assertEquals('la', $actual->getLocale());
+        $this->assertSame('la', $actual->getLocale());
     }
 
     public function testNewUnsharedLanguage()
     {
         $actual = Services::language(null, false);
         $this->assertInstanceOf(Language::class, $actual);
-        $this->assertEquals('en', $actual->getLocale());
+        $this->assertSame('en', $actual->getLocale());
 
         Services::language('la', false);
-        $this->assertEquals('en', $actual->getLocale());
+        $this->assertSame('en', $actual->getLocale());
     }
 
     public function testNewPager()
@@ -294,7 +294,12 @@ public function testMockInjection()
         $response2 = service('response');
         $this->assertInstanceOf(MockResponse::class, $response2);
 
-        $this->assertEquals($response, $response2);
+        Services::injectMock('response', $response);
+        $response3 = service('response');
+        $this->assertInstanceOf(MockResponse::class, $response3);
+
+        $this->assertNotSame($response, $response2);
+        $this->assertSame($response, $response3);
     }
 
     /**
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index 55db0e95d45a..acf2b436971f 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -141,7 +141,7 @@ public function testValidateWithStringRulesFoundReadMessagesFromValidationConfig
 
         $method = $this->getPrivateMethodInvoker($this->controller, 'validate');
         $this->assertFalse($method('signup'));
-        $this->assertEquals('You must choose a username.', Services::validation()->getError());
+        $this->assertSame('You must choose a username.', Services::validation()->getError());
     }
 
     public function testValidateWithStringRulesFoundUseMessagesParameter()
@@ -161,7 +161,7 @@ public function testValidateWithStringRulesFoundUseMessagesParameter()
                 'required' => 'You must choose a username.',
             ],
         ]));
-        $this->assertEquals('You must choose a username.', Services::validation()->getError());
+        $this->assertSame('You must choose a username.', Services::validation()->getError());
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Cookie/CookieTest.php b/tests/system/Cookie/CookieTest.php
index ea6d7fcc61e0..b6e8469ec013 100644
--- a/tests/system/Cookie/CookieTest.php
+++ b/tests/system/Cookie/CookieTest.php
@@ -167,7 +167,7 @@ public function testSetCookieHeaderCreation(string $header, array $changed): voi
     {
         $cookie = Cookie::fromHeaderString($header);
         $cookie = $cookie->toArray();
-        $this->assertEquals($changed + $cookie, $cookie);
+        $this->assertSame(array_merge($cookie, $changed), $cookie);
     }
 
     public static function setCookieHeaderProvider(): iterable
diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php
index efe5a1a77e23..4fdc6ad6f701 100644
--- a/tests/system/Database/BaseQueryTest.php
+++ b/tests/system/Database/BaseQueryTest.php
@@ -26,7 +26,7 @@ public function testQueryStoresSQL()
 
         $query->setQuery($sql);
 
-        $this->assertEquals($sql, $query->getQuery());
+        $this->assertSame($sql, $query->getQuery());
     }
 
     public function testStoresDuration()
@@ -37,7 +37,7 @@ public function testStoresDuration()
 
         $query->setDuration($start, $start + 5);
 
-        $this->assertEquals(5, $query->getDuration());
+        $this->assertSame(5, (int) $query->getDuration());
     }
 
     public function testGetStartTime()
@@ -48,7 +48,7 @@ public function testGetStartTime()
 
         $query->setDuration($start, $start + 5);
 
-        $this->assertEquals($start, $query->getStartTime(true));
+        $this->assertSame($start, $query->getStartTime(true));
     }
 
     public function testGetStartTimeNumberFormat()
@@ -59,7 +59,7 @@ public function testGetStartTimeNumberFormat()
 
         $query->setDuration($start, $start + 5);
 
-        $this->assertEquals(number_format($start, 6), $query->getStartTime());
+        $this->assertSame(number_format($start, 6), $query->getStartTime());
     }
 
     public function testsStoresErrorInformation()
@@ -73,8 +73,8 @@ public function testsStoresErrorInformation()
 
         $query->setError($code, $msg);
         $this->assertTrue($query->hasError());
-        $this->assertEquals($code, $query->getErrorCode());
-        $this->assertEquals($msg, $query->getErrorMessage());
+        $this->assertSame($code, $query->getErrorCode());
+        $this->assertSame($msg, $query->getErrorMessage());
     }
 
     public function testSwapPrefix()
@@ -90,7 +90,7 @@ public function testSwapPrefix()
         $query->setQuery($origSQL);
         $query->swapPrefix($origPrefix, $newPrefix);
 
-        $this->assertEquals($newSQL, $query->getQuery());
+        $this->assertSame($newSQL, $query->getQuery());
     }
 
     public function queryTypes()
@@ -190,7 +190,7 @@ public function testSingleBindingOutsideOfArray()
 
         $expected = 'SELECT * FROM users WHERE id = 13';
 
-        $this->assertEquals($expected, $query->getQuery());
+        $this->assertSame($expected, $query->getQuery());
     }
 
     public function testBindingSingleElementInArray()
@@ -201,7 +201,7 @@ public function testBindingSingleElementInArray()
 
         $expected = 'SELECT * FROM users WHERE id = 13';
 
-        $this->assertEquals($expected, $query->getQuery());
+        $this->assertSame($expected, $query->getQuery());
     }
 
     public function testBindingMultipleItems()
@@ -212,7 +212,7 @@ public function testBindingMultipleItems()
 
         $expected = "SELECT * FROM users WHERE id = 13 OR name = 'Vader'";
 
-        $this->assertEquals($expected, $query->getQuery());
+        $this->assertSame($expected, $query->getQuery());
     }
 
     public function testBindingAutoEscapesParameters()
@@ -223,7 +223,7 @@ public function testBindingAutoEscapesParameters()
 
         $expected = "SELECT * FROM users WHERE name = 'O''Reilly'";
 
-        $this->assertEquals($expected, $query->getQuery());
+        $this->assertSame($expected, $query->getQuery());
     }
 
     public function testNamedBinds()
@@ -234,7 +234,7 @@ public function testNamedBinds()
 
         $expected = "SELECT * FROM users WHERE id = 13 OR name = 'Geoffrey'";
 
-        $this->assertEquals($expected, $query->getQuery());
+        $this->assertSame($expected, $query->getQuery());
     }
 
     /**
@@ -262,7 +262,7 @@ public function testSimilarNamedBinds()
 
         $expected = "SELECT * FROM users WHERE sitemap = 'sitemap' OR site = 'site'";
 
-        $this->assertEquals($expected, $query->getQuery());
+        $this->assertSame($expected, $query->getQuery());
     }
 
     /**
@@ -276,7 +276,7 @@ public function testSetQueryBindsWithSetEscapeTrue()
 
         $expected = 'UPDATE user_table SET `x` = NOW() WHERE `id` = 22';
 
-        $this->assertEquals($expected, $query->getQuery());
+        $this->assertSame($expected, $query->getQuery());
     }
 
     /**
@@ -299,7 +299,7 @@ public function testSetQueryBindsWithSetEscapeFalse()
 
         $expected = 'UPDATE user_table SET `x` = NOW() WHERE `id` = 22';
 
-        $this->assertEquals($expected, $query->getQuery());
+        $this->assertSame($expected, $query->getQuery());
     }
 
     /**
@@ -318,6 +318,6 @@ public function testSetQueryBinds()
 
         $expected = 'SELECT @factorA := 1, @factorB := 2';
 
-        $this->assertEquals($expected, $query->getQuery());
+        $this->assertSame($expected, $query->getQuery());
     }
 }
diff --git a/tests/system/Database/Builder/AliasTest.php b/tests/system/Database/Builder/AliasTest.php
index 5fe5415abe94..9b71a4173dcd 100644
--- a/tests/system/Database/Builder/AliasTest.php
+++ b/tests/system/Database/Builder/AliasTest.php
@@ -29,7 +29,7 @@ public function testAlias()
 
         $expectedSQL = 'SELECT * FROM "jobs" "j"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -40,7 +40,7 @@ public function testAliasSupportsArrayOfNames()
 
         $expectedSQL = 'SELECT * FROM "jobs" "j", "users" "u"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -51,7 +51,7 @@ public function testAliasSupportsStringOfNames()
 
         $expectedSQL = 'SELECT * FROM "jobs" "j", "users" "u"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -68,7 +68,7 @@ public function testAliasLeftJoinWithShortTableName()
 
         $expectedSQL = 'SELECT * FROM "db_jobs" LEFT JOIN "db_users" as "u" ON "u"."id" = "db_jobs"."id"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     /**
@@ -83,6 +83,6 @@ public function testAliasLeftJoinWithLongTableName()
 
         $expectedSQL = 'SELECT * FROM "db_jobs" LEFT JOIN "db_users" as "u" ON "db_users"."id" = "db_jobs"."id"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 }
diff --git a/tests/system/Database/Builder/BaseTest.php b/tests/system/Database/Builder/BaseTest.php
index 4c475a60c614..c0b7fe595a2d 100644
--- a/tests/system/Database/Builder/BaseTest.php
+++ b/tests/system/Database/Builder/BaseTest.php
@@ -40,7 +40,7 @@ public function testGetTableReturnsTable()
         $builder = $this->db->table('jobs');
 
         $result = $builder->getTable();
-        $this->assertEquals('jobs', $result);
+        $this->assertSame('jobs', $result);
     }
 
     public function testGetTableIgnoresFrom()
@@ -49,6 +49,6 @@ public function testGetTableIgnoresFrom()
 
         $builder->from('foo');
         $result = $builder->getTable();
-        $this->assertEquals('jobs', $result);
+        $this->assertSame('jobs', $result);
     }
 }
diff --git a/tests/system/Database/Builder/DistinctTest.php b/tests/system/Database/Builder/DistinctTest.php
index 90da2976b46f..a67ec428c75e 100644
--- a/tests/system/Database/Builder/DistinctTest.php
+++ b/tests/system/Database/Builder/DistinctTest.php
@@ -32,7 +32,7 @@ public function testDelete()
 
         $expectedSQL = 'SELECT DISTINCT "country" FROM "user"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Database/Builder/EmptyTest.php b/tests/system/Database/Builder/EmptyTest.php
index 23ab8944a453..a5f46297a4a7 100644
--- a/tests/system/Database/Builder/EmptyTest.php
+++ b/tests/system/Database/Builder/EmptyTest.php
@@ -32,7 +32,7 @@ public function testEmptyWithNoTable()
 
         $expectedSQL = 'DELETE FROM "jobs"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $answer));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $answer));
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php
index 20ac11f7f429..253604cdfdb2 100644
--- a/tests/system/Database/Builder/FromTest.php
+++ b/tests/system/Database/Builder/FromTest.php
@@ -33,7 +33,7 @@ public function testSimpleFrom()
 
         $expectedSQL = 'SELECT * FROM "user", "jobs"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -46,7 +46,7 @@ public function testFromThatOverwrites()
 
         $expectedSQL = 'SELECT * FROM "jobs"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -59,7 +59,7 @@ public function testFromWithMultipleTables()
 
         $expectedSQL = 'SELECT * FROM "user", "jobs", "roles"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -72,7 +72,7 @@ public function testFromWithMultipleTablesAsString()
 
         $expectedSQL = 'SELECT * FROM "user", "jobs", "roles"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -85,23 +85,23 @@ public function testFromReset()
 
         $expectedSQL = 'SELECT * FROM "user", "jobs", "roles"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
         $expectedSQL = 'SELECT * FROM "user"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
         $expectedSQL = 'SELECT *';
 
         $builder->from(null, true);
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
         $expectedSQL = 'SELECT * FROM "jobs"';
 
         $builder->from('jobs');
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -116,7 +116,7 @@ public function testFromWithMultipleTablesAsStringWithSQLSRV()
 
         $expectedSQL = 'SELECT * FROM "test"."dbo"."user", "test"."dbo"."jobs", "test"."dbo"."roles"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Database/Builder/GetTest.php b/tests/system/Database/Builder/GetTest.php
index 67035ed7b7ce..5ae2bf885fd8 100644
--- a/tests/system/Database/Builder/GetTest.php
+++ b/tests/system/Database/Builder/GetTest.php
@@ -29,7 +29,7 @@ public function testGet()
 
         $expectedSQL = 'SELECT * FROM "users"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -45,9 +45,9 @@ public function testGetWithReset()
         $expectedSQL           = 'SELECT * FROM "users" WHERE "username" = \'bogus\'';
         $expectedSQLafterreset = 'SELECT * FROM "users"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->get(0, 50, false)));
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->get(0, 50, true)));
-        $this->assertEquals($expectedSQLafterreset, str_replace("\n", ' ', $builder->get(0, 50, true)));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->get(0, 50, false)));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->get(0, 50, true)));
+        $this->assertSame($expectedSQLafterreset, str_replace("\n", ' ', $builder->get(0, 50, true)));
     }
 
     //--------------------------------------------------------------------
@@ -63,9 +63,9 @@ public function testGetWhereWithLimit()
         $expectedSQL             = 'SELECT * FROM "users" WHERE "username" = \'bogus\'  LIMIT 5';
         $expectedSQLWithoutReset = 'SELECT * FROM "users" WHERE "username" = \'bogus\' AND "username" = \'bogus\'  LIMIT 5';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, null, false)));
-        $this->assertEquals($expectedSQLWithoutReset, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, 0, true)));
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, null, true)));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, null, false)));
+        $this->assertSame($expectedSQLWithoutReset, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, 0, true)));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, null, true)));
     }
 
     //--------------------------------------------------------------------
@@ -78,9 +78,9 @@ public function testGetWhereWithLimitAndOffset()
         $expectedSQL             = 'SELECT * FROM "users" WHERE "username" = \'bogus\'  LIMIT 10, 5';
         $expectedSQLWithoutReset = 'SELECT * FROM "users" WHERE "username" = \'bogus\' AND "username" = \'bogus\'  LIMIT 10, 5';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, 10, false)));
-        $this->assertEquals($expectedSQLWithoutReset, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, 10, true)));
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, 10, true)));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, 10, false)));
+        $this->assertSame($expectedSQLWithoutReset, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, 10, true)));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, 10, true)));
     }
 
     //--------------------------------------------------------------------
@@ -93,9 +93,9 @@ public function testGetWhereWithWhereConditionOnly()
         $expectedSQL             = 'SELECT * FROM "users" WHERE "username" = \'bogus\'';
         $expectedSQLWithoutReset = 'SELECT * FROM "users" WHERE "username" = \'bogus\' AND "username" = \'bogus\'';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], null, null, false)));
-        $this->assertEquals($expectedSQLWithoutReset, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], null, null, true)));
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], null, null, true)));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], null, null, false)));
+        $this->assertSame($expectedSQLWithoutReset, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], null, null, true)));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], null, null, true)));
     }
 
     //--------------------------------------------------------------------
@@ -107,6 +107,6 @@ public function testGetWhereWithoutArgs()
 
         $expectedSQL = 'SELECT * FROM "users"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getWhere(null, null, null, true)));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getWhere(null, null, null, true)));
     }
 }
diff --git a/tests/system/Database/Builder/GroupTest.php b/tests/system/Database/Builder/GroupTest.php
index 59d8d699ff4b..be2f31855ec0 100644
--- a/tests/system/Database/Builder/GroupTest.php
+++ b/tests/system/Database/Builder/GroupTest.php
@@ -32,7 +32,7 @@ public function testGroupBy()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -47,7 +47,7 @@ public function testHavingBy()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING SUM(id) > 2';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -63,7 +63,7 @@ public function testOrHavingBy()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" > 3 OR SUM(id) > 2';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -78,7 +78,7 @@ public function testHavingIn()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" IN (1,2)';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -95,7 +95,7 @@ public function testHavingInClosure()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -111,7 +111,7 @@ public function testOrHavingIn()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" IN (1,2) OR "group_id" IN (5,6)';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -131,7 +131,7 @@ public function testOrHavingInClosure()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3) OR "group_id" IN (SELECT "group_id" FROM "groups" WHERE "group_id" = 6)';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -146,7 +146,7 @@ public function testHavingNotIn()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" NOT IN (1,2)';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -163,7 +163,7 @@ public function testHavingNotInClosure()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -179,7 +179,7 @@ public function testOrHavingNotIn()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" NOT IN (1,2) OR "group_id" NOT IN (5,6)';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -199,7 +199,7 @@ public function testOrHavingNotInClosure()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3) OR "group_id" NOT IN (SELECT "group_id" FROM "groups" WHERE "group_id" = 6)';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -214,7 +214,7 @@ public function testHavingLike()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a%\' ESCAPE \'!\'';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -229,7 +229,7 @@ public function testHavingLikeBefore()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a\' ESCAPE \'!\'';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -244,7 +244,7 @@ public function testHavingLikeAfter()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'a%\' ESCAPE \'!\'';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -259,7 +259,7 @@ public function testNotHavingLike()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" NOT LIKE \'%a%\' ESCAPE \'!\'';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -274,7 +274,7 @@ public function testNotHavingLikeBefore()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" NOT LIKE \'%a\' ESCAPE \'!\'';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -289,7 +289,7 @@ public function testNotHavingLikeAfter()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" NOT LIKE \'a%\' ESCAPE \'!\'';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -305,7 +305,7 @@ public function testOrHavingLike()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a%\' ESCAPE \'!\' OR  "pet_color" LIKE \'%b%\' ESCAPE \'!\'';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -321,7 +321,7 @@ public function testOrHavingLikeBefore()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a\' ESCAPE \'!\' OR  "pet_color" LIKE \'%b\' ESCAPE \'!\'';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -337,7 +337,7 @@ public function testOrHavingLikeAfter()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'a%\' ESCAPE \'!\' OR  "pet_color" LIKE \'b%\' ESCAPE \'!\'';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -353,7 +353,7 @@ public function testOrNotHavingLike()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a%\' ESCAPE \'!\' OR  "pet_color" NOT LIKE \'%b%\' ESCAPE \'!\'';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -369,7 +369,7 @@ public function testOrNotHavingLikeBefore()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'%a\' ESCAPE \'!\' OR  "pet_color" NOT LIKE \'%b\' ESCAPE \'!\'';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -385,7 +385,7 @@ public function testOrNotHavingLikeAfter()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "pet_name" LIKE \'a%\' ESCAPE \'!\' OR  "pet_color" NOT LIKE \'b%\' ESCAPE \'!\'';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -404,7 +404,7 @@ public function testHavingAndGroup()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING SUM(id) < 3 AND   ( SUM(id) = 2 AND "name" = \'adam\'  )';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -423,7 +423,7 @@ public function testHavingOrGroup()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING SUM(id) > 3 OR   ( SUM(id) = 2 AND "name" = \'adam\'  )';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -442,7 +442,7 @@ public function testNotHavingAndGroup()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING SUM(id) < 3 AND NOT   ( SUM(id) = 2 AND "name" = \'adam\'  )';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -461,7 +461,7 @@ public function testNotHavingOrGroup()
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING SUM(id) < 3 OR NOT   ( SUM(id) = 2 AND "name" = \'adam\'  )';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -478,7 +478,7 @@ public function testAndGroups()
 
         $expectedSQL = 'SELECT * FROM "user" WHERE   ( "id" > 3 AND "name" != \'Luke\'  ) AND "name" = \'Darth\'';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -495,7 +495,7 @@ public function testOrGroups()
 
         $expectedSQL = 'SELECT * FROM "user" WHERE "name" = \'Darth\' OR   ( "id" > 3 AND "name" != \'Luke\'  )';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -512,7 +512,7 @@ public function testNotGroups()
 
         $expectedSQL = 'SELECT * FROM "user" WHERE "name" = \'Darth\' AND NOT   ( "id" > 3 AND "name" != \'Luke\'  )';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -529,6 +529,6 @@ public function testOrNotGroups()
 
         $expectedSQL = 'SELECT * FROM "user" WHERE "name" = \'Darth\' OR NOT   ( "id" > 3 AND "name" != \'Luke\'  )';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 }
diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php
index 23a58c569e9d..de1d3c0ddee5 100644
--- a/tests/system/Database/Builder/InsertTest.php
+++ b/tests/system/Database/Builder/InsertTest.php
@@ -45,8 +45,8 @@ public function testSimpleInsert()
             ],
         ];
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledInsert()));
-        $this->assertEquals($expectedBinds, $builder->getBinds());
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledInsert()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
     }
 
     public function testThrowsExceptionOnNoValuesSet()
@@ -83,10 +83,10 @@ public function testInsertBatch()
         $this->assertInstanceOf(Query::class, $query);
 
         $raw = 'INSERT INTO "jobs" ("description", "id", "name") VALUES (:description:,:id:,:name:), (:description.1:,:id.1:,:name.1:)';
-        $this->assertEquals($raw, str_replace("\n", ' ', $query->getOriginalQuery() ));
+        $this->assertSame($raw, str_replace("\n", ' ', $query->getOriginalQuery() ));
 
         $expected = "INSERT INTO \"jobs\" (\"description\", \"id\", \"name\") VALUES ('There''s something in your teeth',2,'Commedian'), ('I am yellow',3,'Cab Driver')";
-        $this->assertEquals($expected, str_replace("\n", ' ', $query->getQuery()));
+        $this->assertSame($expected, str_replace("\n", ' ', $query->getQuery()));
     }
 
     /**
diff --git a/tests/system/Database/Builder/JoinTest.php b/tests/system/Database/Builder/JoinTest.php
index 0182350774b0..6204331929b0 100644
--- a/tests/system/Database/Builder/JoinTest.php
+++ b/tests/system/Database/Builder/JoinTest.php
@@ -34,7 +34,7 @@ public function testJoinSimple()
 
         $expectedSQL = 'SELECT * FROM "user" JOIN "job" ON "user"."id" = "job"."id"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -47,7 +47,7 @@ public function testJoinIsNull()
 
         $expectedSQL = 'SELECT * FROM "table1" JOIN "table2" ON "field" IS NULL';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -60,7 +60,7 @@ public function testJoinIsNotNull()
 
         $expectedSQL = 'SELECT * FROM "table1" JOIN "table2" ON "field" IS NOT NULL';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -73,7 +73,7 @@ public function testJoinMultipleConditions()
 
         $expectedSQL = "SELECT * FROM \"table1\" LEFT JOIN \"table2\" ON \"table1\".\"field1\" = \"table2\".\"field2\" AND \"table1\".\"field1\" = 'foo' AND \"table2\".\"field2\" = 0";
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -86,7 +86,7 @@ public function testFullOuterJoin()
 
         $expectedSQL = 'SELECT * FROM "jobs" FULL OUTER JOIN "users" as "u" ON "users"."id" = "jobs"."id"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -101,7 +101,7 @@ public function testJoinWithAlias()
 
         $expectedSQL = 'SELECT * FROM "test"."dbo"."jobs" LEFT JOIN "test"."dbo"."users" "u" ON "u"."id" = "jobs"."id"';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Database/Builder/LimitTest.php b/tests/system/Database/Builder/LimitTest.php
index 7c6e659691d4..3d0ce683a199 100644
--- a/tests/system/Database/Builder/LimitTest.php
+++ b/tests/system/Database/Builder/LimitTest.php
@@ -32,7 +32,7 @@ public function testLimitAlone()
 
         $expectedSQL = 'SELECT * FROM "user"  LIMIT 5';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -45,7 +45,7 @@ public function testLimitAndOffset()
 
         $expectedSQL = 'SELECT * FROM "user"  LIMIT 1, 5';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -58,7 +58,7 @@ public function testLimitAndOffsetMethod()
 
         $expectedSQL = 'SELECT * FROM "user"  LIMIT 1, 5';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Database/Builder/OrderTest.php b/tests/system/Database/Builder/OrderTest.php
index 08e97f232664..c0b851aafa1f 100644
--- a/tests/system/Database/Builder/OrderTest.php
+++ b/tests/system/Database/Builder/OrderTest.php
@@ -32,7 +32,7 @@ public function testOrderAscending()
 
         $expectedSQL = 'SELECT * FROM "user" ORDER BY "name" ASC';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -45,7 +45,7 @@ public function testOrderDescending()
 
         $expectedSQL = 'SELECT * FROM "user" ORDER BY "name" DESC';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -58,7 +58,7 @@ public function testOrderRandom()
 
         $expectedSQL = 'SELECT * FROM "user" ORDER BY RAND()';
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Database/Builder/PrefixTest.php b/tests/system/Database/Builder/PrefixTest.php
index cb52805864c1..2510835561c4 100644
--- a/tests/system/Database/Builder/PrefixTest.php
+++ b/tests/system/Database/Builder/PrefixTest.php
@@ -27,7 +27,7 @@ public function testPrefixesSetOnTableNames()
     {
         $expected = 'ci_users';
 
-        $this->assertEquals($expected, $this->db->prefixTable('users'));
+        $this->assertSame($expected, $this->db->prefixTable('users'));
     }
 
     //--------------------------------------------------------------------
@@ -43,7 +43,7 @@ public function testPrefixesSetOnTableNamesWithWhereClause()
 
         $builder->where($where);
 
-        $this->assertEquals($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
         $this->assertSame($expectedBinds, $builder->getBinds());
     }
 }
diff --git a/tests/system/Database/Builder/SelectTest.php b/tests/system/Database/Builder/SelectTest.php
index d0fec1003446..a06e7e0c0f64 100644
--- a/tests/system/Database/Builder/SelectTest.php
+++ b/tests/system/Database/Builder/SelectTest.php
@@ -32,7 +32,7 @@ public function testSimpleSelect()
 
         $expected = 'SELECT * FROM "users"';
 
-        $this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -45,7 +45,7 @@ public function testSelectOnlyOneColumn()
 
         $expected = 'SELECT "name" FROM "users"';
 
-        $this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -58,7 +58,7 @@ public function testSelectAcceptsArray()
 
         $expected = 'SELECT "name", "role" FROM "users"';
 
-        $this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -71,7 +71,7 @@ public function testSelectAcceptsMultipleColumns()
 
         $expected = 'SELECT "name", "role" FROM "users"';
 
-        $this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -84,7 +84,7 @@ public function testSelectKeepsAliases()
 
         $expected = 'SELECT "name", "role" as "myRole" FROM "users"';
 
-        $this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -97,7 +97,7 @@ public function testSelectWorksWithComplexSelects()
 
         $expected = 'SELECT (SELECT SUM(payments.amount) FROM payments WHERE payments.invoice_id=4) AS amount_paid FROM "users"';
 
-        $this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -110,7 +110,7 @@ public function testSelectMinWithNoAlias()
 
         $expected = 'SELECT MIN("payments") AS "payments" FROM "invoices"';
 
-        $this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -123,7 +123,7 @@ public function testSelectMinWithAlias()
 
         $expected = 'SELECT MIN("payments") AS "myAlias" FROM "invoices"';
 
-        $this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -136,7 +136,7 @@ public function testSelectMaxWithNoAlias()
 
         $expected = 'SELECT MAX("payments") AS "payments" FROM "invoices"';
 
-        $this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -149,7 +149,7 @@ public function testSelectMaxWithAlias()
 
         $expected = 'SELECT MAX("payments") AS "myAlias" FROM "invoices"';
 
-        $this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -162,7 +162,7 @@ public function testSelectAvgWithNoAlias()
 
         $expected = 'SELECT AVG("payments") AS "payments" FROM "invoices"';
 
-        $this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -175,7 +175,7 @@ public function testSelectAvgWithAlias()
 
         $expected = 'SELECT AVG("payments") AS "myAlias" FROM "invoices"';
 
-        $this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -188,7 +188,7 @@ public function testSelectSumWithNoAlias()
 
         $expected = 'SELECT SUM("payments") AS "payments" FROM "invoices"';
 
-        $this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -201,7 +201,7 @@ public function testSelectSumWithAlias()
 
         $expected = 'SELECT SUM("payments") AS "myAlias" FROM "invoices"';
 
-        $this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -214,7 +214,7 @@ public function testSelectCountWithNoAlias()
 
         $expected = 'SELECT COUNT("payments") AS "payments" FROM "invoices"';
 
-        $this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -227,7 +227,7 @@ public function testSelectCountWithAlias()
 
         $expected = 'SELECT COUNT("payments") AS "myAlias" FROM "invoices"';
 
-        $this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -252,7 +252,7 @@ public function testSelectMaxWithDotNameAndNoAlias()
 
         $expected = 'SELECT MAX("db"."payments") AS "payments" FROM "invoices"';
 
-        $this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
@@ -277,7 +277,7 @@ public function testSimpleSelectWithSQLSRV()
 
         $expected = 'SELECT * FROM "test"."dbo"."users"';
 
-        $this->assertEquals($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Database/Builder/TruncateTest.php b/tests/system/Database/Builder/TruncateTest.php
index 46baea32ec44..a4f4752ba0ac 100644
--- a/tests/system/Database/Builder/TruncateTest.php
+++ b/tests/system/Database/Builder/TruncateTest.php
@@ -30,7 +30,7 @@ public function testTruncate()
 
         $expectedSQL = 'TRUNCATE "user"';
 
-        $this->assertEquals($expectedSQL, $builder->testMode()->truncate());
+        $this->assertSame($expectedSQL, $builder->testMode()->truncate());
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Database/ConfigTest.php b/tests/system/Database/ConfigTest.php
index e98bb96c1c4c..e377a97bbe87 100644
--- a/tests/system/Database/ConfigTest.php
+++ b/tests/system/Database/ConfigTest.php
@@ -104,17 +104,17 @@ public function testConnectionGroup()
         $conn = Config::connect($this->group, false);
         $this->assertInstanceOf(BaseConnection::class, $conn);
 
-        $this->assertEquals($this->group['DSN'], $this->getPrivateProperty($conn, 'DSN'));
-        $this->assertEquals($this->group['hostname'], $this->getPrivateProperty($conn, 'hostname'));
-        $this->assertEquals($this->group['username'], $this->getPrivateProperty($conn, 'username'));
-        $this->assertEquals($this->group['password'], $this->getPrivateProperty($conn, 'password'));
-        $this->assertEquals($this->group['database'], $this->getPrivateProperty($conn, 'database'));
-        $this->assertEquals($this->group['port'], $this->getPrivateProperty($conn, 'port'));
-        $this->assertEquals($this->group['DBDriver'], $this->getPrivateProperty($conn, 'DBDriver'));
-        $this->assertEquals($this->group['DBPrefix'], $this->getPrivateProperty($conn, 'DBPrefix'));
-        $this->assertEquals($this->group['pConnect'], $this->getPrivateProperty($conn, 'pConnect'));
-        $this->assertEquals($this->group['charset'], $this->getPrivateProperty($conn, 'charset'));
-        $this->assertEquals($this->group['DBCollat'], $this->getPrivateProperty($conn, 'DBCollat'));
+        $this->assertSame($this->group['DSN'], $this->getPrivateProperty($conn, 'DSN'));
+        $this->assertSame($this->group['hostname'], $this->getPrivateProperty($conn, 'hostname'));
+        $this->assertSame($this->group['username'], $this->getPrivateProperty($conn, 'username'));
+        $this->assertSame($this->group['password'], $this->getPrivateProperty($conn, 'password'));
+        $this->assertSame($this->group['database'], $this->getPrivateProperty($conn, 'database'));
+        $this->assertSame($this->group['port'], $this->getPrivateProperty($conn, 'port'));
+        $this->assertSame($this->group['DBDriver'], $this->getPrivateProperty($conn, 'DBDriver'));
+        $this->assertSame($this->group['DBPrefix'], $this->getPrivateProperty($conn, 'DBPrefix'));
+        $this->assertSame($this->group['pConnect'], $this->getPrivateProperty($conn, 'pConnect'));
+        $this->assertSame($this->group['charset'], $this->getPrivateProperty($conn, 'charset'));
+        $this->assertSame($this->group['DBCollat'], $this->getPrivateProperty($conn, 'DBCollat'));
     }
 
     public function testConnectionGroupWithDSN()
@@ -122,19 +122,19 @@ public function testConnectionGroupWithDSN()
         $conn = Config::connect($this->dsnGroup, false);
         $this->assertInstanceOf(BaseConnection::class, $conn);
 
-        $this->assertEquals('', $this->getPrivateProperty($conn, 'DSN'));
-        $this->assertEquals('localhost', $this->getPrivateProperty($conn, 'hostname'));
-        $this->assertEquals('user', $this->getPrivateProperty($conn, 'username'));
-        $this->assertEquals('pass', $this->getPrivateProperty($conn, 'password'));
-        $this->assertEquals('dbname', $this->getPrivateProperty($conn, 'database'));
-        $this->assertEquals('3306', $this->getPrivateProperty($conn, 'port'));
-        $this->assertEquals('MySQLi', $this->getPrivateProperty($conn, 'DBDriver'));
-        $this->assertEquals('test_', $this->getPrivateProperty($conn, 'DBPrefix'));
+        $this->assertSame('', $this->getPrivateProperty($conn, 'DSN'));
+        $this->assertSame('localhost', $this->getPrivateProperty($conn, 'hostname'));
+        $this->assertSame('user', $this->getPrivateProperty($conn, 'username'));
+        $this->assertSame('pass', $this->getPrivateProperty($conn, 'password'));
+        $this->assertSame('dbname', $this->getPrivateProperty($conn, 'database'));
+        $this->assertSame('3306', $this->getPrivateProperty($conn, 'port'));
+        $this->assertSame('MySQLi', $this->getPrivateProperty($conn, 'DBDriver'));
+        $this->assertSame('test_', $this->getPrivateProperty($conn, 'DBPrefix'));
         $this->assertTrue($this->getPrivateProperty($conn, 'pConnect'));
-        $this->assertEquals('latin1', $this->getPrivateProperty($conn, 'charset'));
-        $this->assertEquals('latin1_swedish_ci', $this->getPrivateProperty($conn, 'DBCollat'));
+        $this->assertSame('latin1', $this->getPrivateProperty($conn, 'charset'));
+        $this->assertSame('latin1_swedish_ci', $this->getPrivateProperty($conn, 'DBCollat'));
         $this->assertTrue($this->getPrivateProperty($conn, 'strictOn'));
-        $this->assertEquals([], $this->getPrivateProperty($conn, 'failover'));
+        $this->assertSame([], $this->getPrivateProperty($conn, 'failover'));
     }
 
     public function testConnectionGroupWithDSNPostgre()
@@ -142,27 +142,27 @@ public function testConnectionGroupWithDSNPostgre()
         $conn = Config::connect($this->dsnGroupPostgre, false);
         $this->assertInstanceOf(BaseConnection::class, $conn);
 
-        $this->assertEquals('', $this->getPrivateProperty($conn, 'DSN'));
-        $this->assertEquals('localhost', $this->getPrivateProperty($conn, 'hostname'));
-        $this->assertEquals('user', $this->getPrivateProperty($conn, 'username'));
-        $this->assertEquals('pass', $this->getPrivateProperty($conn, 'password'));
-        $this->assertEquals('dbname', $this->getPrivateProperty($conn, 'database'));
-        $this->assertEquals('5432', $this->getPrivateProperty($conn, 'port'));
-        $this->assertEquals('Postgre', $this->getPrivateProperty($conn, 'DBDriver'));
-        $this->assertEquals('test_', $this->getPrivateProperty($conn, 'DBPrefix'));
+        $this->assertSame('', $this->getPrivateProperty($conn, 'DSN'));
+        $this->assertSame('localhost', $this->getPrivateProperty($conn, 'hostname'));
+        $this->assertSame('user', $this->getPrivateProperty($conn, 'username'));
+        $this->assertSame('pass', $this->getPrivateProperty($conn, 'password'));
+        $this->assertSame('dbname', $this->getPrivateProperty($conn, 'database'));
+        $this->assertSame('5432', $this->getPrivateProperty($conn, 'port'));
+        $this->assertSame('Postgre', $this->getPrivateProperty($conn, 'DBDriver'));
+        $this->assertSame('test_', $this->getPrivateProperty($conn, 'DBPrefix'));
         $this->assertFalse($this->getPrivateProperty($conn, 'pConnect'));
-        $this->assertEquals('utf8', $this->getPrivateProperty($conn, 'charset'));
-        $this->assertEquals('utf8_general_ci', $this->getPrivateProperty($conn, 'DBCollat'));
+        $this->assertSame('utf8', $this->getPrivateProperty($conn, 'charset'));
+        $this->assertSame('utf8_general_ci', $this->getPrivateProperty($conn, 'DBCollat'));
         $this->assertTrue($this->getPrivateProperty($conn, 'strictOn'));
-        $this->assertEquals([], $this->getPrivateProperty($conn, 'failover'));
-        $this->assertEquals('5', $this->getPrivateProperty($conn, 'connect_timeout'));
-        $this->assertEquals('1', $this->getPrivateProperty($conn, 'sslmode'));
+        $this->assertSame([], $this->getPrivateProperty($conn, 'failover'));
+        $this->assertSame('5', $this->getPrivateProperty($conn, 'connect_timeout'));
+        $this->assertSame('1', $this->getPrivateProperty($conn, 'sslmode'));
 
         $method = $this->getPrivateMethodInvoker($conn, 'buildDSN');
         $method();
 
         $expected = "host=localhost port=5432 user=user password='pass' dbname=dbname connect_timeout='5' sslmode='1'";
-        $this->assertEquals($expected, $this->getPrivateProperty($conn, 'DSN'));
+        $this->assertSame($expected, $this->getPrivateProperty($conn, 'DSN'));
     }
 
     public function testConnectionGroupWithDSNPostgreNative()
@@ -170,18 +170,18 @@ public function testConnectionGroupWithDSNPostgreNative()
         $conn = Config::connect($this->dsnGroupPostgreNative, false);
         $this->assertInstanceOf(BaseConnection::class, $conn);
 
-        $this->assertEquals('pgsql:host=localhost;port=5432;dbname=database_name', $this->getPrivateProperty($conn, 'DSN'));
-        $this->assertEquals('', $this->getPrivateProperty($conn, 'hostname'));
-        $this->assertEquals('', $this->getPrivateProperty($conn, 'username'));
-        $this->assertEquals('', $this->getPrivateProperty($conn, 'password'));
-        $this->assertEquals('', $this->getPrivateProperty($conn, 'database'));
-        $this->assertEquals('5432', $this->getPrivateProperty($conn, 'port'));
-        $this->assertEquals('Postgre', $this->getPrivateProperty($conn, 'DBDriver'));
-        $this->assertEquals('t_', $this->getPrivateProperty($conn, 'DBPrefix'));
+        $this->assertSame('pgsql:host=localhost;port=5432;dbname=database_name', $this->getPrivateProperty($conn, 'DSN'));
+        $this->assertSame('', $this->getPrivateProperty($conn, 'hostname'));
+        $this->assertSame('', $this->getPrivateProperty($conn, 'username'));
+        $this->assertSame('', $this->getPrivateProperty($conn, 'password'));
+        $this->assertSame('', $this->getPrivateProperty($conn, 'database'));
+        $this->assertSame(5432, $this->getPrivateProperty($conn, 'port'));
+        $this->assertSame('Postgre', $this->getPrivateProperty($conn, 'DBDriver'));
+        $this->assertSame('t_', $this->getPrivateProperty($conn, 'DBPrefix'));
         $this->assertFalse($this->getPrivateProperty($conn, 'pConnect'));
-        $this->assertEquals('utf8', $this->getPrivateProperty($conn, 'charset'));
-        $this->assertEquals('utf8_general_ci', $this->getPrivateProperty($conn, 'DBCollat'));
+        $this->assertSame('utf8', $this->getPrivateProperty($conn, 'charset'));
+        $this->assertSame('utf8_general_ci', $this->getPrivateProperty($conn, 'DBCollat'));
         $this->assertTrue($this->getPrivateProperty($conn, 'strictOn'));
-        $this->assertEquals([], $this->getPrivateProperty($conn, 'failover'));
+        $this->assertSame([], $this->getPrivateProperty($conn, 'failover'));
     }
 }
diff --git a/tests/system/Database/Live/ConnectTest.php b/tests/system/Database/Live/ConnectTest.php
index 2cf84ea1626f..37cd39fccdd0 100644
--- a/tests/system/Database/Live/ConnectTest.php
+++ b/tests/system/Database/Live/ConnectTest.php
@@ -58,11 +58,11 @@ public function testConnectReturnsProvidedConnection()
 
         // This will be the tests database
         $db = Database::connect();
-        $this->assertEquals($config->tests['DBDriver'], $this->getPrivateProperty($db, 'DBDriver'));
+        $this->assertSame($config->tests['DBDriver'], $this->getPrivateProperty($db, 'DBDriver'));
 
         // Get an instance of the system's default db so we have something to test with.
         $db1 = Database::connect($this->group1);
-        $this->assertEquals('MySQLi', $this->getPrivateProperty($db1, 'DBDriver'));
+        $this->assertSame('MySQLi', $this->getPrivateProperty($db1, 'DBDriver'));
 
         // If a connection is passed into connect, it should simply be returned to us...
         $db2 = Database::connect($db1);
@@ -74,7 +74,7 @@ public function testConnectWorksWithGroupName()
         $config = config('Database');
 
         $db = Database::connect('tests');
-        $this->assertEquals($config->tests['DBDriver'], $this->getPrivateProperty($db, 'DBDriver'));
+        $this->assertSame($config->tests['DBDriver'], $this->getPrivateProperty($db, 'DBDriver'));
 
         $config                      = config('Database');
         $config->default['DBDriver'] = 'MySQLi';
@@ -82,7 +82,7 @@ public function testConnectWorksWithGroupName()
 
         $db1 = Database::connect('default');
         $this->assertNotInstanceOf(Connection::class, $db1);
-        $this->assertEquals('MySQLi', $this->getPrivateProperty($db1, 'DBDriver'));
+        $this->assertSame('MySQLi', $this->getPrivateProperty($db1, 'DBDriver'));
     }
 
     public function testConnectWithFailover()
@@ -95,7 +95,7 @@ public function testConnectWithFailover()
 
         $db1 = Database::connect($this->tests);
 
-        $this->assertEquals($this->tests['failover'][0]['DBDriver'], $this->getPrivateProperty($db1, 'DBDriver'));
+        $this->assertSame($this->tests['failover'][0]['DBDriver'], $this->getPrivateProperty($db1, 'DBDriver'));
         $this->assertTrue(count($db1->listTables()) >= 0);
     }
 }
diff --git a/tests/system/Database/Live/DatabaseTestTraitCaseTest.php b/tests/system/Database/Live/DatabaseTestTraitCaseTest.php
index 4456ea7e504a..38f931ee23d7 100644
--- a/tests/system/Database/Live/DatabaseTestTraitCaseTest.php
+++ b/tests/system/Database/Live/DatabaseTestTraitCaseTest.php
@@ -39,7 +39,7 @@ public function testGrabFromDatabase()
     {
         $email = $this->grabFromDatabase('user', 'email', ['name' => 'Derek Jones']);
 
-        $this->assertEquals('derek@world.com', $email);
+        $this->assertSame('derek@world.com', $email);
     }
 
     public function testSeeInDatabase()
diff --git a/tests/system/Database/Live/DEBugTest.php b/tests/system/Database/Live/DbDebugTest.php
similarity index 94%
rename from tests/system/Database/Live/DEBugTest.php
rename to tests/system/Database/Live/DbDebugTest.php
index 376b2d3e17a5..0ab0610d9b7d 100644
--- a/tests/system/Database/Live/DEBugTest.php
+++ b/tests/system/Database/Live/DbDebugTest.php
@@ -10,7 +10,7 @@
  *
  * @internal
  */
-final class DEBugTest extends CIUnitTestCase
+final class DbDebugTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
diff --git a/tests/system/Database/Live/DbUtilsTest.php b/tests/system/Database/Live/DbUtilsTest.php
index 16e3c0a1c2e4..1e4b986dce9d 100644
--- a/tests/system/Database/Live/DbUtilsTest.php
+++ b/tests/system/Database/Live/DbUtilsTest.php
@@ -201,7 +201,7 @@ public function testUtilsCSVFromResult()
 
         $data = array_filter(preg_split('/(\r\n|\n|\r)/', $data));
 
-        $this->assertEquals('"1","Developer","Awesome job, but sometimes makes you bored","","",""', $data[1]);
+        $this->assertSame('"1","Developer","Awesome job, but sometimes makes you bored","","",""', $data[1]);
     }
 
     //--------------------------------------------------------------------
@@ -219,6 +219,6 @@ public function testUtilsXMLFromResult()
         $actual = preg_replace('#\R+#', '', $data);
         $actual = preg_replace('/[ ]{2,}|[\t]/', '', $actual);
 
-        $this->assertEquals($expected, $actual);
+        $this->assertSame($expected, $actual);
     }
 }
diff --git a/tests/system/Database/Live/EmptyTest.php b/tests/system/Database/Live/EmptyTest.php
index 2a4b6dfb87a4..beceb7f4b57c 100644
--- a/tests/system/Database/Live/EmptyTest.php
+++ b/tests/system/Database/Live/EmptyTest.php
@@ -22,7 +22,7 @@ public function testEmpty()
     {
         $this->db->table('misc')->emptyTable();
 
-        $this->assertEquals(0, $this->db->table('misc')->countAll());
+        $this->assertSame(0, $this->db->table('misc')->countAll());
     }
 
     //--------------------------------------------------------------------
@@ -31,7 +31,7 @@ public function testTruncate()
     {
         $this->db->table('misc')->truncate();
 
-        $this->assertEquals(0, $this->db->table('misc')->countAll());
+        $this->assertSame(0, $this->db->table('misc')->countAll());
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Database/Live/EscapeTest.php b/tests/system/Database/Live/EscapeTest.php
index 39b21fb9a416..dbf6396d5bff 100644
--- a/tests/system/Database/Live/EscapeTest.php
+++ b/tests/system/Database/Live/EscapeTest.php
@@ -34,7 +34,7 @@ protected function setUp(): void
      */
     public function testEscapeProtectsNegativeNumbers()
     {
-        $this->assertEquals("'-100'", $this->db->escape(-100));
+        $this->assertSame("'-100'", $this->db->escape(-100));
     }
 
     //--------------------------------------------------------------------
@@ -44,7 +44,7 @@ public function testEscape()
         $expected = "SELECT * FROM brands WHERE name = 'O" . $this->char . "'Doules'";
         $sql      = 'SELECT * FROM brands WHERE name = ' . $this->db->escape("O'Doules");
 
-        $this->assertEquals($expected, $sql);
+        $this->assertSame($expected, $sql);
     }
 
     //--------------------------------------------------------------------
@@ -54,7 +54,7 @@ public function testEscapeString()
         $expected = "SELECT * FROM brands WHERE name = 'O" . $this->char . "'Doules'";
         $sql      = "SELECT * FROM brands WHERE name = '" . $this->db->escapeString("O'Doules") . "'";
 
-        $this->assertEquals($expected, $sql);
+        $this->assertSame($expected, $sql);
     }
 
     //--------------------------------------------------------------------
@@ -64,7 +64,7 @@ public function testEscapeLikeString()
         $expected = "SELECT * FROM brands WHERE column LIKE '%10!% more%' ESCAPE '!'";
         $sql      = "SELECT * FROM brands WHERE column LIKE '%" . $this->db->escapeLikeString('10% more') . "%' ESCAPE '!'";
 
-        $this->assertEquals($expected, $sql);
+        $this->assertSame($expected, $sql);
     }
 
     //--------------------------------------------------------------------
@@ -75,7 +75,7 @@ public function testEscapeLikeStringDirect()
             $expected = "SHOW COLUMNS FROM brands WHERE column LIKE 'wild\_chars%'";
             $sql      = "SHOW COLUMNS FROM brands WHERE column LIKE '" . $this->db->escapeLikeStringDirect('wild_chars') . "%'";
 
-            $this->assertEquals($expected, $sql);
+            $this->assertSame($expected, $sql);
         } else {
             $this->expectNotToPerformAssertions();
         }
diff --git a/tests/system/Database/Live/FabricatorLiveTest.php b/tests/system/Database/Live/FabricatorLiveTest.php
index 8deeb0d36035..21ef47ff8ced 100644
--- a/tests/system/Database/Live/FabricatorLiveTest.php
+++ b/tests/system/Database/Live/FabricatorLiveTest.php
@@ -64,7 +64,7 @@ public function testCreateIncrementsCount()
 
         $fabricator->create();
 
-        $this->assertEquals($count + 1, Fabricator::getCount('user'));
+        $this->assertSame($count + 1, Fabricator::getCount('user'));
     }
 
     public function testHelperIncrementsCount()
@@ -73,7 +73,7 @@ public function testHelperIncrementsCount()
 
         fake(UserModel::class, ['country' => 'Italy']);
 
-        $this->assertEquals($count + 1, Fabricator::getCount('user'));
+        $this->assertSame($count + 1, Fabricator::getCount('user'));
     }
 
     public function testCreateThrowsOnFailure()
@@ -88,7 +88,7 @@ public function testHelperDoesNotPersist()
     {
         helper('test');
         $result = fake(UserModel::class, ['name' => 'Derek'], false);
-        $this->assertEquals('Derek', $result->name);
+        $this->assertSame('Derek', $result->name);
         $this->dontSeeInDatabase('user', ['name' => 'Derek']);
     }
 }
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 17ea8e3e5d03..24314da9558f 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -20,7 +20,8 @@ final class ForgeTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     /**
      * @var Forge
@@ -155,13 +156,13 @@ public function testCreateTableApplyBigInt()
 
         $fieldsData = $this->db->getFieldData('forge_test_table');
         if ($this->db->DBDriver === 'MySQLi') {
-            $this->assertEquals(strtolower($fieldsData[0]->type), 'bigint');
+            $this->assertSame(strtolower($fieldsData[0]->type), 'bigint');
         } elseif ($this->db->DBDriver === 'Postgre') {
-            $this->assertEquals(strtolower($fieldsData[0]->type), 'bigint');
+            $this->assertSame(strtolower($fieldsData[0]->type), 'bigint');
         } elseif ($this->db->DBDriver === 'SQLite3') {
-            $this->assertEquals(strtolower($fieldsData[0]->type), 'integer');
+            $this->assertSame(strtolower($fieldsData[0]->type), 'integer');
         } elseif ($this->db->DBDriver === 'SQLSRV') {
-            $this->assertEquals(strtolower($fieldsData[0]->type), 'bigint');
+            $this->assertSame(strtolower($fieldsData[0]->type), 'bigint');
         }
 
         $this->forge->dropTable('forge_test_table', true);
@@ -207,13 +208,13 @@ public function testCreateTableWithArrayFieldConstraints()
 
             $fields = $this->db->getFieldData('forge_array_constraint');
 
-            $this->assertEquals('status', $fields[0]->name);
+            $this->assertSame('status', $fields[0]->name);
 
             if ($this->db->DBDriver === 'SQLite3') {
                 // SQLite3 converts array constraints to TEXT CHECK(...)
-                $this->assertEquals('TEXT', $fields[0]->type);
+                $this->assertSame('TEXT', $fields[0]->type);
             } else {
-                $this->assertEquals('enum', $fields[0]->type);
+                $this->assertSame('enum', $fields[0]->type);
             }
 
             $this->forge->dropTable('forge_array_constraint', true);
@@ -403,15 +404,15 @@ public function testForeignKey()
         $foreignKeyData = $this->db->getForeignKeyData('forge_test_invoices');
 
         if ($this->db->DBDriver === 'SQLite3') {
-            $this->assertEquals($foreignKeyData[0]->constraint_name, 'users_id to db_forge_test_users.id');
-            $this->assertEquals($foreignKeyData[0]->sequence, 0);
+            $this->assertSame($foreignKeyData[0]->constraint_name, 'users_id to db_forge_test_users.id');
+            $this->assertSame($foreignKeyData[0]->sequence, 0);
         } else {
-            $this->assertEquals($foreignKeyData[0]->constraint_name, $this->db->DBPrefix . 'forge_test_invoices_users_id_foreign');
-            $this->assertEquals($foreignKeyData[0]->column_name, 'users_id');
-            $this->assertEquals($foreignKeyData[0]->foreign_column_name, 'id');
+            $this->assertSame($foreignKeyData[0]->constraint_name, $this->db->DBPrefix . 'forge_test_invoices_users_id_foreign');
+            $this->assertSame($foreignKeyData[0]->column_name, 'users_id');
+            $this->assertSame($foreignKeyData[0]->foreign_column_name, 'id');
         }
-        $this->assertEquals($foreignKeyData[0]->table_name, $this->db->DBPrefix . 'forge_test_invoices');
-        $this->assertEquals($foreignKeyData[0]->foreign_table_name, $this->db->DBPrefix . 'forge_test_users');
+        $this->assertSame($foreignKeyData[0]->table_name, $this->db->DBPrefix . 'forge_test_invoices');
+        $this->assertSame($foreignKeyData[0]->foreign_table_name, $this->db->DBPrefix . 'forge_test_users');
 
         $this->forge->dropTable('forge_test_invoices', true);
         $this->forge->dropTable('forge_test_users', true);
@@ -543,7 +544,7 @@ public function testAddColumn()
 
         $this->forge->dropTable('forge_test_table', true);
 
-        $this->assertEquals('username', $fieldNames[1]);
+        $this->assertSame('username', $fieldNames[1]);
     }
 
     public function testAddFields()
@@ -582,58 +583,50 @@ public function testAddFields()
 
         $this->forge->dropTable('forge_test_fields', true);
 
-        // Check field names
+        $this->assertIsArray($fieldsNames);
         $this->assertContains('id', $fieldsNames);
         $this->assertContains('username', $fieldsNames);
         $this->assertContains('name', $fieldsNames);
         $this->assertContains('active', $fieldsNames);
 
-        // Check field data
-        $this->assertContains($fieldsData[0]->name, ['id', 'name', 'username', 'active']);
-        $this->assertContains($fieldsData[1]->name, ['id', 'name', 'username', 'active']);
+        $fields = ['id', 'name', 'username', 'active'];
+        $this->assertContains($fieldsData[0]->name, $fields);
+        $this->assertContains($fieldsData[1]->name, $fields);
+        unset($fields);
 
         if ($this->db->DBDriver === 'MySQLi') {
-            // Check types
-            $this->assertEquals($fieldsData[0]->type, 'int');
-            $this->assertEquals($fieldsData[1]->type, 'varchar');
+            $this->assertSame('int', $fieldsData[0]->type);
+            $this->assertSame('varchar', $fieldsData[1]->type);
 
             if (version_compare($this->db->getVersion(), '8.0.17', '<')) {
                 // As of MySQL 8.0.17, the display width attribute for integer data types
                 // is deprecated and is not reported back anymore.
                 // @see https://dev.mysql.com/doc/refman/8.0/en/numeric-type-attributes.html
-                $this->assertEquals($fieldsData[0]->max_length, 11);
+                $this->assertSame(11, $fieldsData[0]->max_length);
             }
 
             $this->assertNull($fieldsData[0]->default);
             $this->assertNull($fieldsData[1]->default);
-
-            $this->assertEquals($fieldsData[0]->primary_key, 1);
-
-            $this->assertEquals($fieldsData[1]->max_length, 255);
+            $this->assertSame(1, (int) $fieldsData[0]->primary_key);
+            $this->assertSame(255, (int) $fieldsData[1]->max_length);
         } elseif ($this->db->DBDriver === 'Postgre') {
-            // Check types
-            $this->assertEquals($fieldsData[0]->type, 'integer', print_r($fieldsData, true));
-            $this->assertEquals($fieldsData[1]->type, 'character varying', print_r($fieldsData, true));
-
-            $this->assertEquals($fieldsData[0]->max_length, 32);
+            $this->assertSame('integer', $fieldsData[0]->type);
+            $this->assertSame('character varying', $fieldsData[1]->type);
+            $this->assertSame(32, (int) $fieldsData[0]->max_length);
             $this->assertNull($fieldsData[1]->default);
-
-            $this->assertEquals($fieldsData[1]->max_length, 255);
+            $this->assertSame(255, (int) $fieldsData[1]->max_length);
         } elseif ($this->db->DBDriver === 'SQLite3') {
-            $this->assertEquals(strtolower($fieldsData[0]->type), 'integer');
-            $this->assertEquals(strtolower($fieldsData[1]->type), 'varchar');
-
-            $this->assertEquals($fieldsData[1]->default, null);
+            $this->assertSame('integer', strtolower($fieldsData[0]->type));
+            $this->assertSame('varchar', strtolower($fieldsData[1]->type));
+            $this->assertNull($fieldsData[1]->default);
         } elseif ($this->db->DBDriver === 'SQLSRV') {
-            // Check types
-            $this->assertEquals($fieldsData[0]->type, 'int');
-            $this->assertEquals($fieldsData[0]->max_length, 10);
-
-            $this->assertEquals($fieldsData[1]->type, 'varchar');
+            $this->assertSame('int', $fieldsData[0]->type);
+            $this->assertSame(10, (int) $fieldsData[0]->max_length);
+            $this->assertSame('varchar', $fieldsData[1]->type);
             $this->assertNull($fieldsData[1]->default);
-            $this->assertEquals($fieldsData[1]->max_length, 255);
+            $this->assertSame(255, (int) $fieldsData[1]->max_length);
         } else {
-            $this->assertTrue(false, 'DB Driver not supported');
+            $this->fail(sprintf('DB driver "%s" is not supported.', $this->db->DBDriver));
         }
     }
 
@@ -669,44 +662,44 @@ public function testCompositeKey()
         $keys = $this->db->getIndexData('forge_test_1');
 
         if ($this->db->DBDriver === 'MySQLi') {
-            $this->assertEquals($keys['PRIMARY']->name, 'PRIMARY');
-            $this->assertEquals($keys['PRIMARY']->fields, ['id']);
-            $this->assertEquals($keys['PRIMARY']->type, 'PRIMARY');
-            $this->assertEquals($keys['code_company']->name, 'code_company');
-            $this->assertEquals($keys['code_company']->fields, ['code', 'company']);
-            $this->assertEquals($keys['code_company']->type, 'INDEX');
-            $this->assertEquals($keys['code_active']->name, 'code_active');
-            $this->assertEquals($keys['code_active']->fields, ['code', 'active']);
-            $this->assertEquals($keys['code_active']->type, 'UNIQUE');
+            $this->assertSame($keys['PRIMARY']->name, 'PRIMARY');
+            $this->assertSame($keys['PRIMARY']->fields, ['id']);
+            $this->assertSame($keys['PRIMARY']->type, 'PRIMARY');
+            $this->assertSame($keys['code_company']->name, 'code_company');
+            $this->assertSame($keys['code_company']->fields, ['code', 'company']);
+            $this->assertSame($keys['code_company']->type, 'INDEX');
+            $this->assertSame($keys['code_active']->name, 'code_active');
+            $this->assertSame($keys['code_active']->fields, ['code', 'active']);
+            $this->assertSame($keys['code_active']->type, 'UNIQUE');
         } elseif ($this->db->DBDriver === 'Postgre') {
-            $this->assertEquals($keys['pk_db_forge_test_1']->name, 'pk_db_forge_test_1');
-            $this->assertEquals($keys['pk_db_forge_test_1']->fields, ['id']);
-            $this->assertEquals($keys['pk_db_forge_test_1']->type, 'PRIMARY');
-            $this->assertEquals($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
-            $this->assertEquals($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
-            $this->assertEquals($keys['db_forge_test_1_code_company']->type, 'INDEX');
-            $this->assertEquals($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
-            $this->assertEquals($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
-            $this->assertEquals($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
+            $this->assertSame($keys['pk_db_forge_test_1']->name, 'pk_db_forge_test_1');
+            $this->assertSame($keys['pk_db_forge_test_1']->fields, ['id']);
+            $this->assertSame($keys['pk_db_forge_test_1']->type, 'PRIMARY');
+            $this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
+            $this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
+            $this->assertSame($keys['db_forge_test_1_code_company']->type, 'INDEX');
+            $this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
+            $this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
+            $this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
         } elseif ($this->db->DBDriver === 'SQLite3') {
-            $this->assertEquals($keys['sqlite_autoindex_db_forge_test_1_1']->name, 'sqlite_autoindex_db_forge_test_1_1');
-            $this->assertEquals($keys['sqlite_autoindex_db_forge_test_1_1']->fields, ['id']);
-            $this->assertEquals($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
-            $this->assertEquals($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
-            $this->assertEquals($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
-            $this->assertEquals($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
+            $this->assertSame($keys['sqlite_autoindex_db_forge_test_1_1']->name, 'sqlite_autoindex_db_forge_test_1_1');
+            $this->assertSame($keys['sqlite_autoindex_db_forge_test_1_1']->fields, ['id']);
+            $this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
+            $this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
+            $this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
+            $this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
         } elseif ($this->db->DBDriver === 'SQLSRV') {
-            $this->assertEquals($keys['pk_db_forge_test_1']->name, 'pk_db_forge_test_1');
-            $this->assertEquals($keys['pk_db_forge_test_1']->fields, ['id']);
-            $this->assertEquals($keys['pk_db_forge_test_1']->type, 'PRIMARY');
+            $this->assertSame($keys['pk_db_forge_test_1']->name, 'pk_db_forge_test_1');
+            $this->assertSame($keys['pk_db_forge_test_1']->fields, ['id']);
+            $this->assertSame($keys['pk_db_forge_test_1']->type, 'PRIMARY');
 
-            $this->assertEquals($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
-            $this->assertEquals($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
-            $this->assertEquals($keys['db_forge_test_1_code_company']->type, 'INDEX');
+            $this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
+            $this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
+            $this->assertSame($keys['db_forge_test_1_code_company']->type, 'INDEX');
 
-            $this->assertEquals($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
-            $this->assertEquals($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
-            $this->assertEquals($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
+            $this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
+            $this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
+            $this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
         }
 
         $this->forge->dropTable('forge_test_1', true);
diff --git a/tests/system/Database/Live/GetNumRowsTest.php b/tests/system/Database/Live/GetNumRowsTest.php
index 7aa130d21ada..fc3da95e5a4a 100644
--- a/tests/system/Database/Live/GetNumRowsTest.php
+++ b/tests/system/Database/Live/GetNumRowsTest.php
@@ -44,6 +44,6 @@ protected function tearDown(): void
     public function testGetRowNum()
     {
         $query = $this->db->table('job')->get();
-        $this->assertEquals(4, $query->getNumRows());
+        $this->assertSame(4, $query->getNumRows());
     }
 }
diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php
index f644fd38982b..5aaedcb6b847 100644
--- a/tests/system/Database/Live/GetTest.php
+++ b/tests/system/Database/Live/GetTest.php
@@ -24,10 +24,10 @@ public function testGet()
         $jobs = $this->db->table('job')->get()->getResult();
 
         $this->assertCount(4, $jobs);
-        $this->assertEquals('Developer', $jobs[0]->name);
-        $this->assertEquals('Politician', $jobs[1]->name);
-        $this->assertEquals('Accountant', $jobs[2]->name);
-        $this->assertEquals('Musician', $jobs[3]->name);
+        $this->assertSame('Developer', $jobs[0]->name);
+        $this->assertSame('Politician', $jobs[1]->name);
+        $this->assertSame('Accountant', $jobs[2]->name);
+        $this->assertSame('Musician', $jobs[3]->name);
     }
 
     //--------------------------------------------------------------------
@@ -37,8 +37,8 @@ public function testGetWitLimit()
         $jobs = $this->db->table('job')->get(2, 2)->getResult();
 
         $this->assertCount(2, $jobs);
-        $this->assertEquals('Accountant', $jobs[0]->name);
-        $this->assertEquals('Musician', $jobs[1]->name);
+        $this->assertSame('Accountant', $jobs[0]->name);
+        $this->assertSame('Musician', $jobs[1]->name);
     }
 
     //--------------------------------------------------------------------
@@ -50,7 +50,7 @@ public function testGetWhereArray()
             ->getResult();
 
         $this->assertCount(1, $jobs);
-        $this->assertEquals('Developer', $jobs[0]->name);
+        $this->assertSame('Developer', $jobs[0]->name);
     }
 
     //--------------------------------------------------------------------
@@ -62,7 +62,7 @@ public function testGetWhereWithLimits()
             ->getResult();
 
         $this->assertCount(1, $jobs);
-        $this->assertEquals('Accountant', $jobs[0]->name);
+        $this->assertSame('Accountant', $jobs[0]->name);
     }
 
     //--------------------------------------------------------------------
@@ -71,7 +71,7 @@ public function testGetFieldCount()
     {
         $jobs = $this->db->table('job')->get()->getFieldCount();
 
-        $this->assertEquals(6, $jobs);
+        $this->assertSame(6, $jobs);
     }
 
     //--------------------------------------------------------------------
@@ -90,85 +90,85 @@ public function testGetFieldData()
     {
         $jobs = $this->db->table('job')->get()->getFieldData();
 
-        $this->assertEquals('id', $jobs[0]->name);
-        $this->assertEquals('name', $jobs[1]->name);
+        $this->assertSame('id', $jobs[0]->name);
+        $this->assertSame('name', $jobs[1]->name);
 
         $typeTest = $this->db->table('type_test')->get()->getFieldData();
 
         if ($this->db->DBDriver === 'SQLite3') {
-            $this->assertEquals('integer', $typeTest[0]->type_name); //INTEGER AUTO INC
-            $this->assertEquals('text', $typeTest[1]->type_name);  //VARCHAR
-            $this->assertEquals('text', $typeTest[2]->type_name);  //CHAR
-            $this->assertEquals('text', $typeTest[3]->type_name);  //TEXT
-            $this->assertEquals('integer', $typeTest[4]->type_name);  //SMALLINT
-            $this->assertEquals('integer', $typeTest[5]->type_name);  //INTEGER
-            $this->assertEquals('float', $typeTest[6]->type_name);  //FLOAT
-            $this->assertEquals('float', $typeTest[7]->type_name);  //NUMERIC
-            $this->assertEquals('text', $typeTest[8]->type_name);  //DATE
-            $this->assertEquals('text', $typeTest[9]->type_name);  //TIME
-            $this->assertEquals('text', $typeTest[10]->type_name);  //DATETIME
-            $this->assertEquals('text', $typeTest[11]->type_name);  //TIMESTAMP
-            $this->assertEquals('integer', $typeTest[12]->type_name);  //BIGINT
-            $this->assertEquals('float', $typeTest[13]->type_name);  //REAL
-            $this->assertEquals('text', $typeTest[14]->type_name);  //ENUM
-            $this->assertEquals('text', $typeTest[15]->type_name);  //SET
-            $this->assertEquals('text', $typeTest[16]->type_name);  //MEDIUMTEXT
-            $this->assertEquals('float', $typeTest[17]->type_name);  //DOUBLE
-            $this->assertEquals('float', $typeTest[18]->type_name);  //DECIMAL
-            $this->assertEquals('text', $typeTest[19]->type_name);  //BLOB
+            $this->assertSame('integer', $typeTest[0]->type_name); //INTEGER AUTO INC
+            $this->assertSame('text', $typeTest[1]->type_name);  //VARCHAR
+            $this->assertSame('text', $typeTest[2]->type_name);  //CHAR
+            $this->assertSame('text', $typeTest[3]->type_name);  //TEXT
+            $this->assertSame('integer', $typeTest[4]->type_name);  //SMALLINT
+            $this->assertSame('integer', $typeTest[5]->type_name);  //INTEGER
+            $this->assertSame('float', $typeTest[6]->type_name);  //FLOAT
+            $this->assertSame('float', $typeTest[7]->type_name);  //NUMERIC
+            $this->assertSame('text', $typeTest[8]->type_name);  //DATE
+            $this->assertSame('text', $typeTest[9]->type_name);  //TIME
+            $this->assertSame('text', $typeTest[10]->type_name);  //DATETIME
+            $this->assertSame('text', $typeTest[11]->type_name);  //TIMESTAMP
+            $this->assertSame('integer', $typeTest[12]->type_name);  //BIGINT
+            $this->assertSame('float', $typeTest[13]->type_name);  //REAL
+            $this->assertSame('text', $typeTest[14]->type_name);  //ENUM
+            $this->assertSame('text', $typeTest[15]->type_name);  //SET
+            $this->assertSame('text', $typeTest[16]->type_name);  //MEDIUMTEXT
+            $this->assertSame('float', $typeTest[17]->type_name);  //DOUBLE
+            $this->assertSame('float', $typeTest[18]->type_name);  //DECIMAL
+            $this->assertSame('text', $typeTest[19]->type_name);  //BLOB
         }
         if ($this->db->DBDriver === 'MySQLi') {
-            $this->assertEquals('long', $typeTest[0]->type_name); //INTEGER AUTOINC
-            $this->assertEquals('var_string', $typeTest[1]->type_name);  //VARCHAR
-            $this->assertEquals('string', $typeTest[2]->type_name);  //CHAR
-            $this->assertEquals('blob', $typeTest[3]->type_name);  //TEXT
-            $this->assertEquals('short', $typeTest[4]->type_name);  //SMALLINT
-            $this->assertEquals('long', $typeTest[5]->type_name);  //INTEGER
-            $this->assertEquals('float', $typeTest[6]->type_name);  //FLOAT
-            $this->assertEquals('newdecimal', $typeTest[7]->type_name);  //NUMERIC
-            $this->assertEquals('date', $typeTest[8]->type_name);  //DATE
-            $this->assertEquals('time', $typeTest[9]->type_name);  //TIME
-            $this->assertEquals('datetime', $typeTest[10]->type_name);  //DATETIME
-            $this->assertEquals('timestamp', $typeTest[11]->type_name);  //TIMESTAMP
-            $this->assertEquals('longlong', $typeTest[12]->type_name); //BIGINT
-            $this->assertEquals('double', $typeTest[13]->type_name);  //REAL
-            $this->assertEquals('string', $typeTest[14]->type_name);  //ENUM
-            $this->assertEquals('string', $typeTest[15]->type_name);  //SET
-            $this->assertEquals('blob', $typeTest[16]->type_name);  //MEDIUMTEXT
-            $this->assertEquals('double', $typeTest[17]->type_name);  //DOUBLE
-            $this->assertEquals('newdecimal', $typeTest[18]->type_name);  //DECIMAL
-            $this->assertEquals('blob', $typeTest[19]->type_name);  //BLOB
+            $this->assertSame('long', $typeTest[0]->type_name); //INTEGER AUTOINC
+            $this->assertSame('var_string', $typeTest[1]->type_name);  //VARCHAR
+            $this->assertSame('string', $typeTest[2]->type_name);  //CHAR
+            $this->assertSame('blob', $typeTest[3]->type_name);  //TEXT
+            $this->assertSame('short', $typeTest[4]->type_name);  //SMALLINT
+            $this->assertSame('long', $typeTest[5]->type_name);  //INTEGER
+            $this->assertSame('float', $typeTest[6]->type_name);  //FLOAT
+            $this->assertSame('newdecimal', $typeTest[7]->type_name);  //NUMERIC
+            $this->assertSame('date', $typeTest[8]->type_name);  //DATE
+            $this->assertSame('time', $typeTest[9]->type_name);  //TIME
+            $this->assertSame('datetime', $typeTest[10]->type_name);  //DATETIME
+            $this->assertSame('timestamp', $typeTest[11]->type_name);  //TIMESTAMP
+            $this->assertSame('longlong', $typeTest[12]->type_name); //BIGINT
+            $this->assertSame('double', $typeTest[13]->type_name);  //REAL
+            $this->assertSame('string', $typeTest[14]->type_name);  //ENUM
+            $this->assertSame('string', $typeTest[15]->type_name);  //SET
+            $this->assertSame('blob', $typeTest[16]->type_name);  //MEDIUMTEXT
+            $this->assertSame('double', $typeTest[17]->type_name);  //DOUBLE
+            $this->assertSame('newdecimal', $typeTest[18]->type_name);  //DECIMAL
+            $this->assertSame('blob', $typeTest[19]->type_name);  //BLOB
         }
         if ($this->db->DBDriver === 'Postgre') {
-            $this->assertEquals('int4', $typeTest[0]->type_name); //INTEGER AUTOINC
-            $this->assertEquals('varchar', $typeTest[1]->type_name);  //VARCHAR
-            $this->assertEquals('bpchar', $typeTest[2]->type_name);  //CHAR
-            $this->assertEquals('text', $typeTest[3]->type_name);  //TEXT
-            $this->assertEquals('int2', $typeTest[4]->type_name);  //SMALLINT
-            $this->assertEquals('int4', $typeTest[5]->type_name);  //INTEGER
-            $this->assertEquals('float8', $typeTest[6]->type_name);  //FLOAT
-            $this->assertEquals('numeric', $typeTest[7]->type_name);  //NUMERIC
-            $this->assertEquals('date', $typeTest[8]->type_name);  //DATE
-            $this->assertEquals('time', $typeTest[9]->type_name);  //TIME
-            $this->assertEquals('timestamp', $typeTest[10]->type_name);  //DATETIME
-            $this->assertEquals('timestamp', $typeTest[11]->type_name);  //TIMESTAMP
-            $this->assertEquals('int8', $typeTest[12]->type_name); //BIGINT
+            $this->assertSame('int4', $typeTest[0]->type_name); //INTEGER AUTOINC
+            $this->assertSame('varchar', $typeTest[1]->type_name);  //VARCHAR
+            $this->assertSame('bpchar', $typeTest[2]->type_name);  //CHAR
+            $this->assertSame('text', $typeTest[3]->type_name);  //TEXT
+            $this->assertSame('int2', $typeTest[4]->type_name);  //SMALLINT
+            $this->assertSame('int4', $typeTest[5]->type_name);  //INTEGER
+            $this->assertSame('float8', $typeTest[6]->type_name);  //FLOAT
+            $this->assertSame('numeric', $typeTest[7]->type_name);  //NUMERIC
+            $this->assertSame('date', $typeTest[8]->type_name);  //DATE
+            $this->assertSame('time', $typeTest[9]->type_name);  //TIME
+            $this->assertSame('timestamp', $typeTest[10]->type_name);  //DATETIME
+            $this->assertSame('timestamp', $typeTest[11]->type_name);  //TIMESTAMP
+            $this->assertSame('int8', $typeTest[12]->type_name); //BIGINT
         }
         if ($this->db->DBDriver === 'SQLSRV') {
-            $this->assertEquals('int', $typeTest[0]->type_name); //INTEGER AUTOINC
-            $this->assertEquals('varchar', $typeTest[1]->type_name);  //VARCHAR
-            $this->assertEquals('char', $typeTest[2]->type_name);  //CHAR
-            $this->assertEquals('text', $typeTest[3]->type_name);  //TEXT
-            $this->assertEquals('smallint', $typeTest[4]->type_name);  //SMALLINT
-            $this->assertEquals('int', $typeTest[5]->type_name);  //INTEGER
-            $this->assertEquals('float', $typeTest[6]->type_name);  //FLOAT
-            $this->assertEquals('numeric', $typeTest[7]->type_name);  //NUMERIC
+            $this->assertSame('int', $typeTest[0]->type_name); //INTEGER AUTOINC
+            $this->assertSame('varchar', $typeTest[1]->type_name);  //VARCHAR
+            $this->assertSame('char', $typeTest[2]->type_name);  //CHAR
+            $this->assertSame('text', $typeTest[3]->type_name);  //TEXT
+            $this->assertSame('smallint', $typeTest[4]->type_name);  //SMALLINT
+            $this->assertSame('int', $typeTest[5]->type_name);  //INTEGER
+            $this->assertSame('float', $typeTest[6]->type_name);  //FLOAT
+            $this->assertSame('numeric', $typeTest[7]->type_name);  //NUMERIC
             $this->assertNull($typeTest[8]->type_name);  //DATE
             $this->assertNull($typeTest[9]->type_name);  //TIME
             $this->assertNull($typeTest[10]->type_name);  //DATETIME
-            $this->assertEquals('bigint', $typeTest[11]->type_name); //BIGINT
-            $this->assertEquals('real', $typeTest[12]->type_name);  //REAL
-            $this->assertEquals('decimal', $typeTest[13]->type_name);  //DECIMAL
+            $this->assertSame('bigint', $typeTest[11]->type_name); //BIGINT
+            $this->assertSame('real', $typeTest[12]->type_name);  //REAL
+            $this->assertSame('decimal', $typeTest[13]->type_name);  //DECIMAL
         }
     }
 
@@ -186,7 +186,7 @@ public function testGetDataSeek()
         $data->dataSeek(3);
 
         $details = $data->getResult();
-        $this->assertEquals('Musician', $details[0]->name);
+        $this->assertSame('Musician', $details[0]->name);
     }
 
     //--------------------------------------------------------------------
@@ -198,10 +198,10 @@ public function testGetAnotherDataSeek()
 
         $details = $data->getResult();
 
-        $this->assertEquals('Developer', $details[0]->name);
-        $this->assertEquals('Politician', $details[1]->name);
-        $this->assertEquals('Accountant', $details[2]->name);
-        $this->assertEquals('Musician', $details[3]->name);
+        $this->assertSame('Developer', $details[0]->name);
+        $this->assertSame('Politician', $details[1]->name);
+        $this->assertSame('Accountant', $details[2]->name);
+        $this->assertSame('Musician', $details[3]->name);
     }
 
     //--------------------------------------------------------------------
@@ -212,7 +212,7 @@ public function testFreeResult()
 
         $details = $data->getResult();
 
-        $this->assertEquals('Musician', $details[0]->name);
+        $this->assertSame('Musician', $details[0]->name);
 
         $data->freeResult();
 
@@ -225,7 +225,7 @@ public function testGetRowWithColumnName()
     {
         $name = $this->db->table('user')->get()->getRow('name', 'array');
 
-        $this->assertEquals('Derek Jones', $name);
+        $this->assertSame('Derek Jones', $name);
     }
 
     //--------------------------------------------------------------------
@@ -234,7 +234,7 @@ public function testGetRowWithReturnType()
     {
         $user = $this->db->table('user')->get()->getRow(0, 'array');
 
-        $this->assertEquals('Derek Jones', $user['name']);
+        $this->assertSame('Derek Jones', $user['name']);
     }
 
     //--------------------------------------------------------------------
@@ -245,7 +245,7 @@ public function testGetRowWithCustomReturnType()
 
         $user = $this->db->table('user')->get()->getRow(0, get_class($testClass));
 
-        $this->assertEquals('Derek Jones', $user->name);
+        $this->assertSame('Derek Jones', $user->name);
     }
 
     //--------------------------------------------------------------------
@@ -254,7 +254,7 @@ public function testGetFirstRow()
     {
         $user = $this->db->table('user')->get()->getFirstRow();
 
-        $this->assertEquals('Derek Jones', $user->name);
+        $this->assertSame('Derek Jones', $user->name);
     }
 
     //--------------------------------------------------------------------
@@ -263,7 +263,7 @@ public function testGetLastRow()
     {
         $user = $this->db->table('user')->get()->getLastRow();
 
-        $this->assertEquals('Chris Martin', $user->name);
+        $this->assertSame('Chris Martin', $user->name);
     }
 
     //--------------------------------------------------------------------
@@ -272,7 +272,7 @@ public function testGetNextRow()
     {
         $user = $this->db->table('user')->get()->getNextRow();
 
-        $this->assertEquals('Ahmadinejad', $user->name);
+        $this->assertSame('Ahmadinejad', $user->name);
     }
 
     //--------------------------------------------------------------------
@@ -285,6 +285,6 @@ public function testGetPreviousRow()
 
         $user = $user->getPreviousRow();
 
-        $this->assertEquals('Richard A Causey', $user->name);
+        $this->assertSame('Richard A Causey', $user->name);
     }
 }
diff --git a/tests/system/Database/Live/GroupTest.php b/tests/system/Database/Live/GroupTest.php
index 5f32ea0d626b..c29270a0bd92 100644
--- a/tests/system/Database/Live/GroupTest.php
+++ b/tests/system/Database/Live/GroupTest.php
@@ -71,8 +71,8 @@ public function testHavingIn()
             ->getResult();
 
         $this->assertCount(2, $result);
-        $this->assertEquals('Developer', $result[0]->name);
-        $this->assertEquals('Politician', $result[1]->name);
+        $this->assertSame('Developer', $result[0]->name);
+        $this->assertSame('Politician', $result[1]->name);
     }
 
     //--------------------------------------------------------------------
@@ -89,8 +89,8 @@ public function testorHavingIn()
             ->getResult();
 
         $this->assertCount(2, $result);
-        $this->assertEquals('Developer', $result[0]->name);
-        $this->assertEquals('Politician', $result[1]->name);
+        $this->assertSame('Developer', $result[0]->name);
+        $this->assertSame('Politician', $result[1]->name);
     }
 
     //--------------------------------------------------------------------
@@ -106,8 +106,8 @@ public function testHavingNotIn()
             ->getResult();
 
         $this->assertCount(2, $result);
-        $this->assertEquals('Accountant', $result[0]->name);
-        $this->assertEquals('Musician', $result[1]->name);
+        $this->assertSame('Accountant', $result[0]->name);
+        $this->assertSame('Musician', $result[1]->name);
     }
 
     //--------------------------------------------------------------------
@@ -124,8 +124,8 @@ public function testOrHavingNotIn()
             ->getResult();
 
         $this->assertCount(2, $result);
-        $this->assertEquals('Accountant', $result[0]->name);
-        $this->assertEquals('Musician', $result[1]->name);
+        $this->assertSame('Accountant', $result[0]->name);
+        $this->assertSame('Musician', $result[1]->name);
     }
 
     //--------------------------------------------------------------------
@@ -140,7 +140,7 @@ public function testHavingLike()
             ->getResult();
 
         $this->assertCount(1, $result);
-        $this->assertEquals('Developer', $result[0]->name);
+        $this->assertSame('Developer', $result[0]->name);
     }
 
     //--------------------------------------------------------------------
@@ -156,8 +156,8 @@ public function testNotHavingLike()
             ->getResult();
 
         $this->assertCount(2, $result);
-        $this->assertEquals('Accountant', $result[0]->name);
-        $this->assertEquals('Developer', $result[1]->name);
+        $this->assertSame('Accountant', $result[0]->name);
+        $this->assertSame('Developer', $result[1]->name);
     }
 
     //--------------------------------------------------------------------
@@ -174,8 +174,8 @@ public function testOrHavingLike()
             ->getResult();
 
         $this->assertCount(2, $result);
-        $this->assertEquals('Accountant', $result[0]->name);
-        $this->assertEquals('Developer', $result[1]->name);
+        $this->assertSame('Accountant', $result[0]->name);
+        $this->assertSame('Developer', $result[1]->name);
     }
 
     //--------------------------------------------------------------------
@@ -192,9 +192,9 @@ public function testOrNotHavingLike()
             ->getResult();
 
         $this->assertCount(3, $result);
-        $this->assertEquals('Accountant', $result[0]->name);
-        $this->assertEquals('Developer', $result[1]->name);
-        $this->assertEquals('Musician', $result[2]->name);
+        $this->assertSame('Accountant', $result[0]->name);
+        $this->assertSame('Developer', $result[1]->name);
+        $this->assertSame('Musician', $result[2]->name);
     }
 
     //--------------------------------------------------------------------
@@ -214,7 +214,7 @@ public function testAndHavingGroupStart()
             ->getResult();
 
         $this->assertCount(1, $result);
-        $this->assertEquals('Accountant', $result[0]->name);
+        $this->assertSame('Accountant', $result[0]->name);
     }
 
     //--------------------------------------------------------------------
@@ -234,8 +234,8 @@ public function testOrHavingGroupStart()
             ->getResult();
 
         $this->assertCount(2, $result);
-        $this->assertEquals('Accountant', $result[0]->name);
-        $this->assertEquals('Musician', $result[1]->name);
+        $this->assertSame('Accountant', $result[0]->name);
+        $this->assertSame('Musician', $result[1]->name);
     }
 
     //--------------------------------------------------------------------
@@ -255,7 +255,7 @@ public function testNotHavingGroupStart()
             ->getResult();
 
         $this->assertCount(1, $result);
-        $this->assertEquals('Musician', $result[0]->name);
+        $this->assertSame('Musician', $result[0]->name);
     }
 
     //--------------------------------------------------------------------
@@ -275,9 +275,9 @@ public function testOrNotHavingGroupStart()
             ->getResult();
 
         $this->assertCount(3, $result);
-        $this->assertEquals('Accountant', $result[0]->name);
-        $this->assertEquals('Musician', $result[1]->name);
-        $this->assertEquals('Politician', $result[2]->name);
+        $this->assertSame('Accountant', $result[0]->name);
+        $this->assertSame('Musician', $result[1]->name);
+        $this->assertSame('Politician', $result[2]->name);
     }
 
     //--------------------------------------------------------------------
@@ -294,7 +294,7 @@ public function testAndGroups()
             ->getResult();
 
         $this->assertCount(1, $result);
-        $this->assertEquals('Richard A Causey', $result[0]->name);
+        $this->assertSame('Richard A Causey', $result[0]->name);
     }
 
     //--------------------------------------------------------------------
@@ -311,8 +311,8 @@ public function testOrGroups()
             ->getResult();
 
         $this->assertCount(2, $result);
-        $this->assertEquals('Ahmadinejad', $result[0]->name);
-        $this->assertEquals('Chris Martin', $result[1]->name);
+        $this->assertSame('Ahmadinejad', $result[0]->name);
+        $this->assertSame('Chris Martin', $result[1]->name);
     }
 
     //--------------------------------------------------------------------
@@ -329,7 +329,7 @@ public function testNotGroups()
             ->getResult();
 
         $this->assertCount(1, $result);
-        $this->assertEquals('Derek Jones', $result[0]->name);
+        $this->assertSame('Derek Jones', $result[0]->name);
     }
 
     //--------------------------------------------------------------------
@@ -346,9 +346,9 @@ public function testOrNotGroups()
             ->getResult();
 
         $this->assertCount(3, $result);
-        $this->assertEquals('Derek Jones', $result[0]->name);
-        $this->assertEquals('Richard A Causey', $result[1]->name);
-        $this->assertEquals('Chris Martin', $result[2]->name);
+        $this->assertSame('Derek Jones', $result[0]->name);
+        $this->assertSame('Richard A Causey', $result[1]->name);
+        $this->assertSame('Chris Martin', $result[2]->name);
     }
 
     //--------------------------------------------------------------------
@@ -362,6 +362,6 @@ public function testGroupByCount()
             ->get()
             ->getResult();
 
-        $this->assertEquals(2, $result[0]->count);
+        $this->assertSame(2, (int) $result[0]->count);
     }
 }
diff --git a/tests/system/Database/Live/InsertTest.php b/tests/system/Database/Live/InsertTest.php
index fee6d1791664..74cb782410b4 100644
--- a/tests/system/Database/Live/InsertTest.php
+++ b/tests/system/Database/Live/InsertTest.php
@@ -67,7 +67,7 @@ public function testReplaceWithNoMatchingData()
             ->getwhere(['id' => 5])
             ->getRow();
 
-        $this->assertEquals('Cab Driver', $row->name);
+        $this->assertSame('Cab Driver', $row->name);
     }
 
     //--------------------------------------------------------------------
@@ -86,7 +86,7 @@ public function testReplaceWithMatchingData()
             ->getwhere(['id' => 1])
             ->getRow();
 
-        $this->assertEquals('Cab Driver', $row->name);
+        $this->assertSame('Cab Driver', $row->name);
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Database/Live/JoinTest.php b/tests/system/Database/Live/JoinTest.php
index d3df8ff7f377..d6b9750abd33 100644
--- a/tests/system/Database/Live/JoinTest.php
+++ b/tests/system/Database/Live/JoinTest.php
@@ -26,11 +26,9 @@ public function testSimpleJoin()
             ->get()
             ->getRow();
 
-        $this->assertEquals(1, $row->job_id);
-        $this->assertEquals(1, $row->user_id);
-        $this->assertEquals('Derek Jones', $row->user_name);
-        $this->assertEquals('Developer', $row->job_name);
+        $this->assertSame(1, (int) $row->job_id);
+        $this->assertSame(1, (int) $row->user_id);
+        $this->assertSame('Derek Jones', $row->user_name);
+        $this->assertSame('Developer', $row->job_name);
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Database/Live/LikeTest.php b/tests/system/Database/Live/LikeTest.php
index 449a0aa3397b..532a24cb56d5 100644
--- a/tests/system/Database/Live/LikeTest.php
+++ b/tests/system/Database/Live/LikeTest.php
@@ -23,56 +23,46 @@ public function testLikeDefault()
         $job = $this->db->table('job')->like('name', 'veloper')->get();
         $job = $job->getRow();
 
-        $this->assertEquals(1, $job->id);
-        $this->assertEquals('Developer', $job->name);
+        $this->assertSame(1, (int) $job->id);
+        $this->assertSame('Developer', $job->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLikeBefore()
     {
         $job = $this->db->table('job')->like('name', 'veloper', 'before')->get();
         $job = $job->getRow();
 
-        $this->assertEquals(1, $job->id);
-        $this->assertEquals('Developer', $job->name);
+        $this->assertSame(1, (int) $job->id);
+        $this->assertSame('Developer', $job->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLikeAfter()
     {
         $job = $this->db->table('job')->like('name', 'Develop')->get();
         $job = $job->getRow();
 
-        $this->assertEquals(1, $job->id);
-        $this->assertEquals('Developer', $job->name);
+        $this->assertSame(1, (int) $job->id);
+        $this->assertSame('Developer', $job->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLikeBoth()
     {
         $job = $this->db->table('job')->like('name', 'veloper', 'both')->get();
         $job = $job->getRow();
 
-        $this->assertEquals(1, $job->id);
-        $this->assertEquals('Developer', $job->name);
+        $this->assertSame(1, (int) $job->id);
+        $this->assertSame('Developer', $job->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLikeCaseInsensitive()
     {
         $job = $this->db->table('job')->like('name', 'VELOPER', 'both', null, true)->get();
         $job = $job->getRow();
 
-        $this->assertEquals(1, $job->id);
-        $this->assertEquals('Developer', $job->name);
+        $this->assertSame(1, (int) $job->id);
+        $this->assertSame('Developer', $job->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrLike()
     {
         $jobs = $this->db->table('job')->like('name', 'ian')
@@ -81,13 +71,11 @@ public function testOrLike()
             ->getResult();
 
         $this->assertCount(3, $jobs);
-        $this->assertEquals('Developer', $jobs[0]->name);
-        $this->assertEquals('Politician', $jobs[1]->name);
-        $this->assertEquals('Musician', $jobs[2]->name);
+        $this->assertSame('Developer', $jobs[0]->name);
+        $this->assertSame('Politician', $jobs[1]->name);
+        $this->assertSame('Musician', $jobs[2]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testNotLike()
     {
         $jobs = $this->db->table('job')
@@ -96,13 +84,11 @@ public function testNotLike()
             ->getResult();
 
         $this->assertCount(3, $jobs);
-        $this->assertEquals('Politician', $jobs[0]->name);
-        $this->assertEquals('Accountant', $jobs[1]->name);
-        $this->assertEquals('Musician', $jobs[2]->name);
+        $this->assertSame('Politician', $jobs[0]->name);
+        $this->assertSame('Accountant', $jobs[1]->name);
+        $this->assertSame('Musician', $jobs[2]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrNotLike()
     {
         $jobs = $this->db->table('job')
@@ -112,13 +98,11 @@ public function testOrNotLike()
             ->getResult();
 
         $this->assertCount(3, $jobs);
-        $this->assertEquals('Politician', $jobs[0]->name);
-        $this->assertEquals('Accountant', $jobs[1]->name);
-        $this->assertEquals('Musician', $jobs[2]->name);
+        $this->assertSame('Politician', $jobs[0]->name);
+        $this->assertSame('Accountant', $jobs[1]->name);
+        $this->assertSame('Musician', $jobs[2]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLikeSpacesOrTabs()
     {
         $builder = $this->db->table('misc');
@@ -128,6 +112,4 @@ public function testLikeSpacesOrTabs()
         $this->assertCount(1, $spaces);
         $this->assertCount(1, $tabs);
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Database/Live/LimitTest.php b/tests/system/Database/Live/LimitTest.php
index 031452883eb0..fe689b0cf696 100644
--- a/tests/system/Database/Live/LimitTest.php
+++ b/tests/system/Database/Live/LimitTest.php
@@ -25,8 +25,8 @@ public function testLimit()
             ->getResult();
 
         $this->assertCount(2, $jobs);
-        $this->assertEquals('Developer', $jobs[0]->name);
-        $this->assertEquals('Politician', $jobs[1]->name);
+        $this->assertSame('Developer', $jobs[0]->name);
+        $this->assertSame('Politician', $jobs[1]->name);
     }
 
     //--------------------------------------------------------------------
@@ -39,8 +39,8 @@ public function testLimitAndOffset()
             ->getResult();
 
         $this->assertCount(2, $jobs);
-        $this->assertEquals('Accountant', $jobs[0]->name);
-        $this->assertEquals('Musician', $jobs[1]->name);
+        $this->assertSame('Accountant', $jobs[0]->name);
+        $this->assertSame('Musician', $jobs[1]->name);
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Database/Live/MetadataTest.php b/tests/system/Database/Live/MetadataTest.php
index d30af1288df3..537465edea2e 100644
--- a/tests/system/Database/Live/MetadataTest.php
+++ b/tests/system/Database/Live/MetadataTest.php
@@ -49,7 +49,7 @@ public function testListTables()
     {
         $result = $this->db->listTables(true);
 
-        $this->assertEquals($this->expectedTables, array_values($result));
+        $this->assertSame($this->expectedTables, array_values($result));
     }
 
     //--------------------------------------------------------------------
@@ -58,7 +58,7 @@ public function testListTablesConstrainPrefix()
     {
         $result = $this->db->listTables(true);
 
-        $this->assertEquals($this->expectedTables, array_values($result));
+        $this->assertSame($this->expectedTables, array_values($result));
     }
 
     //--------------------------------------------------------------------
@@ -89,7 +89,7 @@ public function testConstrainPrefixIgnoresOtherTables()
         $this->db->setPrefix($DBPrefix);
         $result = $this->db->listTables(true);
 
-        $this->assertEquals($this->expectedTables, array_values($result));
+        $this->assertSame($this->expectedTables, array_values($result));
 
         // Clean up temporary table
         $this->db->setPrefix('tmp_');
diff --git a/tests/system/Database/Live/OrderTest.php b/tests/system/Database/Live/OrderTest.php
index 6b8fa1a17d7d..08ba75eaab77 100644
--- a/tests/system/Database/Live/OrderTest.php
+++ b/tests/system/Database/Live/OrderTest.php
@@ -26,10 +26,10 @@ public function testOrderAscending()
             ->getResult();
 
         $this->assertCount(4, $jobs);
-        $this->assertEquals('Accountant', $jobs[0]->name);
-        $this->assertEquals('Developer', $jobs[1]->name);
-        $this->assertEquals('Musician', $jobs[2]->name);
-        $this->assertEquals('Politician', $jobs[3]->name);
+        $this->assertSame('Accountant', $jobs[0]->name);
+        $this->assertSame('Developer', $jobs[1]->name);
+        $this->assertSame('Musician', $jobs[2]->name);
+        $this->assertSame('Politician', $jobs[3]->name);
     }
 
     //--------------------------------------------------------------------
@@ -42,10 +42,10 @@ public function testOrderDescending()
             ->getResult();
 
         $this->assertCount(4, $jobs);
-        $this->assertEquals('Accountant', $jobs[3]->name);
-        $this->assertEquals('Developer', $jobs[2]->name);
-        $this->assertEquals('Musician', $jobs[1]->name);
-        $this->assertEquals('Politician', $jobs[0]->name);
+        $this->assertSame('Accountant', $jobs[3]->name);
+        $this->assertSame('Developer', $jobs[2]->name);
+        $this->assertSame('Musician', $jobs[1]->name);
+        $this->assertSame('Politician', $jobs[0]->name);
     }
 
     //--------------------------------------------------------------------
@@ -59,10 +59,10 @@ public function testMultipleOrderValues()
             ->getResult();
 
         $this->assertCount(4, $users);
-        $this->assertEquals('Ahmadinejad', $users[0]->name);
-        $this->assertEquals('Chris Martin', $users[1]->name);
-        $this->assertEquals('Richard A Causey', $users[2]->name);
-        $this->assertEquals('Derek Jones', $users[3]->name);
+        $this->assertSame('Ahmadinejad', $users[0]->name);
+        $this->assertSame('Chris Martin', $users[1]->name);
+        $this->assertSame('Richard A Causey', $users[2]->name);
+        $this->assertSame('Derek Jones', $users[3]->name);
     }
 
     //--------------------------------------------------------------------
@@ -85,6 +85,6 @@ public function testOrderRandom()
 
         $expected = 'SELECT * FROM ' . $table . ' ORDER BY ' . $key;
 
-        $this->assertEquals($expected, str_replace("\n", ' ', $sql));
+        $this->assertSame($expected, str_replace("\n", ' ', $sql));
     }
 }
diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php
index eb1c1bc6509e..358a412a30ef 100644
--- a/tests/system/Database/Live/PreparedQueryTest.php
+++ b/tests/system/Database/Live/PreparedQueryTest.php
@@ -47,7 +47,7 @@ public function testPrepareReturnsPreparedQuery()
         } else {
             $expected = "INSERT INTO {$ec}{$pre}user{$ec} ({$ec}name{$ec}, {$ec}email{$ec}) VALUES ({$placeholders})";
         }
-        $this->assertEquals($expected, $query->getQueryString());
+        $this->assertSame($expected, $query->getQueryString());
 
         $query->close();
     }
@@ -71,7 +71,7 @@ public function testPrepareReturnsManualPreparedQuery()
         }
 
         $expected = "INSERT INTO {$pre}user (name, email, country) VALUES ({$placeholders})";
-        $this->assertEquals($expected, $query->getQueryString());
+        $this->assertSame($expected, $query->getQueryString());
 
         $query->close();
     }
diff --git a/tests/system/Database/Live/SQLite/AlterTableTest.php b/tests/system/Database/Live/SQLite/AlterTableTest.php
index 374be142b596..c2d9bcb4e6f6 100644
--- a/tests/system/Database/Live/SQLite/AlterTableTest.php
+++ b/tests/system/Database/Live/SQLite/AlterTableTest.php
@@ -88,27 +88,27 @@ public function testFromTableFillsDetails()
         $this->assertArrayHasKey('id', $fields);
         $this->assertNull($fields['id']['default']);
         $this->assertTrue($fields['id']['null']);
-        $this->assertEquals('integer', strtolower($fields['id']['type']));
+        $this->assertSame('integer', strtolower($fields['id']['type']));
 
         $this->assertArrayHasKey('name', $fields);
         $this->assertNull($fields['name']['default']);
         $this->assertFalse($fields['name']['null']);
-        $this->assertEquals('varchar', strtolower($fields['name']['type']));
+        $this->assertSame('varchar', strtolower($fields['name']['type']));
 
         $this->assertArrayHasKey('email', $fields);
         $this->assertNull($fields['email']['default']);
         $this->assertTrue($fields['email']['null']);
-        $this->assertEquals('varchar', strtolower($fields['email']['type']));
+        $this->assertSame('varchar', strtolower($fields['email']['type']));
 
         $keys = $this->getPrivateProperty($this->table, 'keys');
 
         $this->assertCount(3, $keys);
         $this->assertArrayHasKey('foo_name', $keys);
-        $this->assertEquals(['fields' => ['name'], 'type' => 'index'], $keys['foo_name']);
+        $this->assertSame(['fields' => ['name'], 'type' => 'index'], $keys['foo_name']);
         $this->assertArrayHasKey('id', $keys);
-        $this->assertEquals(['fields' => ['id'], 'type' => 'primary'], $keys['id']);
+        $this->assertSame(['fields' => ['id'], 'type' => 'primary'], $keys['id']);
         $this->assertArrayHasKey('id', $keys);
-        $this->assertEquals(['fields' => ['id'], 'type' => 'primary'], $keys['id']);
+        $this->assertSame(['fields' => ['id'], 'type' => 'primary'], $keys['id']);
     }
 
     public function testDropColumnSuccess()
@@ -179,7 +179,7 @@ public function testDropForeignKeySuccess()
         $this->createTable('aliens');
 
         $keys = $this->db->getForeignKeyData('aliens');
-        $this->assertEquals('key_id to aliens_fk.id', $keys[0]->constraint_name);
+        $this->assertSame('key_id to aliens_fk.id', $keys[0]->constraint_name);
 
         $result = $this->table
             ->fromTable('aliens')
diff --git a/tests/system/Database/Live/SelectTest.php b/tests/system/Database/Live/SelectTest.php
index 656b9f8edc39..5572ee757180 100644
--- a/tests/system/Database/Live/SelectTest.php
+++ b/tests/system/Database/Live/SelectTest.php
@@ -18,8 +18,6 @@ final class SelectTest extends CIUnitTestCase
 
     protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
 
-    //--------------------------------------------------------------------
-
     public function testSelectAllByDefault()
     {
         $row = $this->db->table('job')->get()->getRowArray();
@@ -29,8 +27,6 @@ public function testSelectAllByDefault()
         $this->assertArrayHasKey('description', $row);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectSingleColumn()
     {
         $row = $this->db->table('job')->select('name')->get()->getRowArray();
@@ -40,8 +36,6 @@ public function testSelectSingleColumn()
         $this->assertArrayNotHasKey('description', $row);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectMultipleColumns()
     {
         $row = $this->db->table('job')->select('name, description')->get()->getRowArray();
@@ -51,98 +45,76 @@ public function testSelectMultipleColumns()
         $this->assertArrayHasKey('description', $row);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectMax()
     {
         $result = $this->db->table('job')->selectMax('id')->get()->getRow();
 
-        $this->assertEquals(4, $result->id);
+        $this->assertSame(4, (int) $result->id);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectMaxWithAlias()
     {
         $result = $this->db->table('job')->selectMax('id', 'xam')->get()->getRow();
 
-        $this->assertEquals(4, $result->xam);
+        $this->assertSame(4, (int) $result->xam);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectMin()
     {
         $result = $this->db->table('job')->selectMin('id')->get()->getRow();
 
-        $this->assertEquals(1, $result->id);
+        $this->assertSame(1, (int) $result->id);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectMinWithAlias()
     {
         $result = $this->db->table('job')->selectMin('id', 'xam')->get()->getRow();
 
-        $this->assertEquals(1, $result->xam);
+        $this->assertSame(1, (int) $result->xam);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectAvg()
     {
         $result = $this->db->table('job')->selectAvg('id')->get()->getRow();
 
-        $this->assertEquals(2.5, $result->id);
+        $this->assertSame(2.5, (float) $result->id);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectAvgWithAlias()
     {
         $result = $this->db->table('job')->selectAvg('id', 'xam')->get()->getRow();
 
-        $this->assertEquals(2.5, $result->xam);
+        $this->assertSame(2.5, (float) $result->xam);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectSum()
     {
         $result = $this->db->table('job')->selectSum('id')->get()->getRow();
 
-        $this->assertEquals(10, $result->id);
+        $this->assertSame(10, (int) $result->id);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectSumWithAlias()
     {
         $result = $this->db->table('job')->selectSum('id', 'xam')->get()->getRow();
 
-        $this->assertEquals(10, $result->xam);
+        $this->assertSame(10, (int) $result->xam);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectCount()
     {
         $result = $this->db->table('job')->selectCount('id')->get()->getRow();
 
-        $this->assertEquals(4, $result->id);
+        $this->assertSame(4, (int) $result->id);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectCountWithAlias()
     {
         $result = $this->db->table('job')->selectCount('id', 'xam')->get()->getRow();
 
-        $this->assertEquals(4, $result->xam);
+        $this->assertSame(4, (int) $result->xam);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectDistinctWorkTogether()
     {
         $users = $this->db->table('user')->select('country')->distinct()->get()->getResult();
@@ -150,8 +122,6 @@ public function testSelectDistinctWorkTogether()
         $this->assertCount(3, $users);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectDistinctCanBeTurnedOff()
     {
         $users = $this->db->table('user')->select('country')->distinct(false)->get()->getResult();
@@ -159,8 +129,6 @@ public function testSelectDistinctCanBeTurnedOff()
         $this->assertCount(4, $users);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/1226
      */
diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index ff89dce3e5d8..a1c8a2999383 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -25,10 +25,10 @@ public function testUpdateSetsAllWithoutWhere()
 
         $result = $this->db->table('user')->get()->getResult();
 
-        $this->assertEquals('Bobby', $result[0]->name);
-        $this->assertEquals('Bobby', $result[1]->name);
-        $this->assertEquals('Bobby', $result[2]->name);
-        $this->assertEquals('Bobby', $result[3]->name);
+        $this->assertSame('Bobby', $result[0]->name);
+        $this->assertSame('Bobby', $result[1]->name);
+        $this->assertSame('Bobby', $result[2]->name);
+        $this->assertSame('Bobby', $result[3]->name);
     }
 
     //--------------------------------------------------------------------
@@ -43,10 +43,10 @@ public function testUpdateSetsAllWithoutWhereAndLimit()
                 ->get()
                 ->getResult();
 
-            $this->assertEquals('Bobby', $result[0]->name);
-            $this->assertEquals('Ahmadinejad', $result[1]->name);
-            $this->assertEquals('Richard A Causey', $result[2]->name);
-            $this->assertEquals('Chris Martin', $result[3]->name);
+            $this->assertSame('Bobby', $result[0]->name);
+            $this->assertSame('Ahmadinejad', $result[1]->name);
+            $this->assertSame('Richard A Causey', $result[2]->name);
+            $this->assertSame('Chris Martin', $result[3]->name);
         } catch (DatabaseException $e) {
             // This DB doesn't support Where and Limit together
             // but we don't want it called a "Risky" test.
@@ -84,10 +84,10 @@ public function testUpdateWithWhereAndLimit()
 
             $result = $this->db->table('user')->get()->getResult();
 
-            $this->assertEquals('Bobby', $result[0]->name);
-            $this->assertEquals('Ahmadinejad', $result[1]->name);
-            $this->assertEquals('Richard A Causey', $result[2]->name);
-            $this->assertEquals('Chris Martin', $result[3]->name);
+            $this->assertSame('Bobby', $result[0]->name);
+            $this->assertSame('Ahmadinejad', $result[1]->name);
+            $this->assertSame('Richard A Causey', $result[2]->name);
+            $this->assertSame('Chris Martin', $result[3]->name);
         } catch (DatabaseException $e) {
             // This DB doesn't support Where and Limit together
             // but we don't want it called a "Risky" test.
diff --git a/tests/system/Database/Live/WhereTest.php b/tests/system/Database/Live/WhereTest.php
index bf5619a4df7d..9b3253986e07 100644
--- a/tests/system/Database/Live/WhereTest.php
+++ b/tests/system/Database/Live/WhereTest.php
@@ -22,12 +22,10 @@ public function testWhereSimpleKeyValue()
     {
         $row = $this->db->table('job')->where('id', 1)->get()->getRow();
 
-        $this->assertEquals(1, $row->id);
-        $this->assertEquals('Developer', $row->name);
+        $this->assertSame(1, (int) $row->id);
+        $this->assertSame('Developer', $row->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testWhereCustomKeyValue()
     {
         $jobs = $this->db->table('job')->where('id !=', 1)->get()->getResult();
@@ -35,8 +33,6 @@ public function testWhereCustomKeyValue()
         $this->assertCount(3, $jobs);
     }
 
-    //--------------------------------------------------------------------
-
     public function testWhereArray()
     {
         $jobs = $this->db->table('job')->where([
@@ -47,11 +43,9 @@ public function testWhereArray()
         $this->assertCount(1, $jobs);
 
         $job = current($jobs);
-        $this->assertEquals('Musician', $job->name);
+        $this->assertSame('Musician', $job->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testWhereCustomString()
     {
         $jobs = $this->db->table('job')->where("id > 2 AND name != 'Accountant'")
@@ -61,11 +55,9 @@ public function testWhereCustomString()
         $this->assertCount(1, $jobs);
 
         $job = current($jobs);
-        $this->assertEquals('Musician', $job->name);
+        $this->assertSame('Musician', $job->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrWhere()
     {
         $jobs = $this->db->table('job')
@@ -75,13 +67,11 @@ public function testOrWhere()
             ->getResult();
 
         $this->assertCount(3, $jobs);
-        $this->assertEquals('Developer', $jobs[0]->name);
-        $this->assertEquals('Politician', $jobs[1]->name);
-        $this->assertEquals('Musician', $jobs[2]->name);
+        $this->assertSame('Developer', $jobs[0]->name);
+        $this->assertSame('Politician', $jobs[1]->name);
+        $this->assertSame('Musician', $jobs[2]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrWhereSameColumn()
     {
         $jobs = $this->db->table('job')
@@ -91,12 +81,10 @@ public function testOrWhereSameColumn()
             ->getResult();
 
         $this->assertCount(2, $jobs);
-        $this->assertEquals('Developer', $jobs[0]->name);
-        $this->assertEquals('Politician', $jobs[1]->name);
+        $this->assertSame('Developer', $jobs[0]->name);
+        $this->assertSame('Politician', $jobs[1]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testWhereIn()
     {
         $jobs = $this->db->table('job')
@@ -105,12 +93,10 @@ public function testWhereIn()
             ->getResult();
 
         $this->assertCount(2, $jobs);
-        $this->assertEquals('Politician', $jobs[0]->name);
-        $this->assertEquals('Accountant', $jobs[1]->name);
+        $this->assertSame('Politician', $jobs[0]->name);
+        $this->assertSame('Accountant', $jobs[1]->name);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group single
      */
@@ -122,12 +108,10 @@ public function testWhereNotIn()
             ->getResult();
 
         $this->assertCount(2, $jobs);
-        $this->assertEquals('Developer', $jobs[0]->name);
-        $this->assertEquals('Musician', $jobs[1]->name);
+        $this->assertSame('Developer', $jobs[0]->name);
+        $this->assertSame('Musician', $jobs[1]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSubQuery()
     {
         $subQuery = $this->db->table('job')
@@ -141,13 +125,11 @@ public function testSubQuery()
             ->getResult();
 
         $this->assertCount(3, $jobs);
-        $this->assertEquals('Politician', $jobs[0]->name);
-        $this->assertEquals('Accountant', $jobs[1]->name);
-        $this->assertEquals('Musician', $jobs[2]->name);
+        $this->assertSame('Politician', $jobs[0]->name);
+        $this->assertSame('Accountant', $jobs[1]->name);
+        $this->assertSame('Musician', $jobs[2]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSubQueryAnotherType()
     {
         $subQuery = $this->db->table('job')
@@ -161,11 +143,9 @@ public function testSubQueryAnotherType()
             ->getResult();
 
         $this->assertCount(1, $jobs);
-        $this->assertEquals('Developer', $jobs[0]->name);
+        $this->assertSame('Developer', $jobs[0]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testWhereNullParam()
     {
         $this->db->table('job')
@@ -180,11 +160,9 @@ public function testWhereNullParam()
             ->getResult();
 
         $this->assertCount(1, $jobs);
-        $this->assertEquals('Brewmaster', $jobs[0]->name);
+        $this->assertSame('Brewmaster', $jobs[0]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testWhereIsNull()
     {
         $this->db->table('job')
@@ -199,11 +177,9 @@ public function testWhereIsNull()
             ->getResult();
 
         $this->assertCount(1, $jobs);
-        $this->assertEquals('Brewmaster', $jobs[0]->name);
+        $this->assertSame('Brewmaster', $jobs[0]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testWhereIsNotNull()
     {
         $this->db->table('job')
diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php
index 4b5fa7ee059c..a31ec0bfcb2d 100644
--- a/tests/system/Database/Migrations/MigrationRunnerTest.php
+++ b/tests/system/Database/Migrations/MigrationRunnerTest.php
@@ -33,9 +33,10 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->root            = vfsStream::setup('root');
-        $this->start           = $this->root->url() . '/';
-        $this->config          = new Migrations();
+        $this->root   = vfsStream::setup('root');
+        $this->start  = $this->root->url() . '/';
+        $this->config = new Migrations();
+
         $this->config->enabled = true;
 
         Services::autoloader()->addNamespace('Tests\Support\MigrationTestMigrations', TESTPATH . '_support/MigrationTestMigrations');
@@ -49,25 +50,22 @@ public function testLoadsDefaultDatabaseWhenNoneSpecified()
         $db = $this->getPrivateProperty($runner, 'db');
 
         $this->assertInstanceOf(BaseConnection::class, $db);
-        $this->assertEquals(
+        $this->assertSame(
             ($dbConfig->tests['DBDriver'] === 'SQLite3' ? WRITEPATH : '' ) . $dbConfig->tests['database'],
             $this->getPrivateProperty($db, 'database')
         );
-        $this->assertEquals($dbConfig->tests['DBDriver'], $this->getPrivateProperty($db, 'DBDriver'));
+        $this->assertSame($dbConfig->tests['DBDriver'], $this->getPrivateProperty($db, 'DBDriver'));
     }
 
     public function testGetCliMessages()
     {
         $runner = new MigrationRunner($this->config);
 
-        $messages = [
-            'foo',
-            'bar',
-        ];
+        $messages = ['foo', 'bar'];
 
         $this->setPrivateProperty($runner, 'cliMessages', $messages);
 
-        $this->assertEquals($messages, $runner->getCliMessages());
+        $this->assertSame($messages, $runner->getCliMessages());
     }
 
     public function testGetHistory()
@@ -75,7 +73,7 @@ public function testGetHistory()
         $runner = new MigrationRunner($this->config);
         $runner->ensureTable();
 
-        $history = [
+        $expected = [
             'id'        => 4,
             'version'   => 'abc123',
             'class'     => 'changesomething',
@@ -89,9 +87,18 @@ public function testGetHistory()
             $this->db->simpleQuery('SET IDENTITY_INSERT ' . $this->db->prefixTable('migrations') . ' ON');
         }
 
-        $this->hasInDatabase('migrations', $history);
+        $this->hasInDatabase('migrations', $expected);
+
+        $history = (array) $runner->getHistory()[0];
+        $history = array_map(static function ($value) {
+            if (is_numeric($value)) {
+                return (int) $value;
+            }
+
+            return $value;
+        }, $history);
 
-        $this->assertEquals($history, (array) $runner->getHistory()[0]);
+        $this->assertSame($expected, $history);
 
         if ($this->db->DBDriver === 'SQLSRV') {
             $this->db->simpleQuery('SET IDENTITY_INSERT ' . $this->db->prefixTable('migrations') . ' OFF');
@@ -106,7 +113,7 @@ public function testGetHistoryReturnsEmptyArrayWithNoResults()
         $runner = new MigrationRunner($this->config);
         $runner->ensureTable();
 
-        $this->assertEquals([], $runner->getHistory());
+        $this->assertSame([], $runner->getHistory());
     }
 
     public function testGetMigrationNumberAllDigits()
@@ -115,7 +122,7 @@ public function testGetMigrationNumberAllDigits()
 
         $method = $this->getPrivateMethodInvoker($runner, 'getMigrationNumber');
 
-        $this->assertEquals('20190806235100', $method('20190806235100_Foo'));
+        $this->assertSame('20190806235100', $method('20190806235100_Foo'));
     }
 
     public function testGetMigrationNumberDashes()
@@ -124,7 +131,7 @@ public function testGetMigrationNumberDashes()
 
         $method = $this->getPrivateMethodInvoker($runner, 'getMigrationNumber');
 
-        $this->assertEquals('2019-08-06-235100', $method('2019-08-06-235100_Foo'));
+        $this->assertSame('2019-08-06-235100', $method('2019-08-06-235100_Foo'));
     }
 
     public function testGetMigrationNumberUnderscores()
@@ -133,7 +140,7 @@ public function testGetMigrationNumberUnderscores()
 
         $method = $this->getPrivateMethodInvoker($runner, 'getMigrationNumber');
 
-        $this->assertEquals('2019_08_06_235100', $method('2019_08_06_235100_Foo'));
+        $this->assertSame('2019_08_06_235100', $method('2019_08_06_235100_Foo'));
     }
 
     public function testGetMigrationNumberReturnsZeroIfNoneFound()
@@ -142,7 +149,7 @@ public function testGetMigrationNumberReturnsZeroIfNoneFound()
 
         $method = $this->getPrivateMethodInvoker($runner, 'getMigrationNumber');
 
-        $this->assertEquals('0', $method('Foo'));
+        $this->assertSame('0', $method('Foo'));
     }
 
     public function testSetSilentStoresValue()
@@ -161,7 +168,7 @@ public function testSetNameStoresValue()
         $runner = new MigrationRunner($this->config);
 
         $runner->setName('foo');
-        $this->assertEquals('foo', $this->getPrivateProperty($runner, 'name'));
+        $this->assertSame('foo', $this->getPrivateProperty($runner, 'name'));
     }
 
     public function testSetGroupStoresValue()
@@ -169,7 +176,7 @@ public function testSetGroupStoresValue()
         $runner = new MigrationRunner($this->config);
 
         $runner->setGroup('foo');
-        $this->assertEquals('foo', $this->getPrivateProperty($runner, 'group'));
+        $this->assertSame('foo', $this->getPrivateProperty($runner, 'group'));
     }
 
     public function testSetNamespaceStoresValue()
@@ -177,18 +184,16 @@ public function testSetNamespaceStoresValue()
         $runner = new MigrationRunner($this->config);
 
         $runner->setNamespace('foo');
-        $this->assertEquals('foo', $this->getPrivateProperty($runner, 'namespace'));
+        $this->assertSame('foo', $this->getPrivateProperty($runner, 'namespace'));
     }
 
     public function testFindMigrationsReturnsEmptyArrayWithNoneFound()
     {
         $config       = $this->config;
         $config->type = 'timestamp';
-        $runner       = new MigrationRunner($config);
-
-        //      $runner->setPath($this->start);
 
-        $this->assertEquals([], $runner->findMigrations());
+        $runner = new MigrationRunner($config);
+        $this->assertSame([], $runner->findMigrations());
     }
 
     public function testFindMigrationsSuccessTimestamp()
@@ -200,18 +205,18 @@ public function testFindMigrationsSuccessTimestamp()
         $runner = $runner->setNamespace('Tests\Support\MigrationTestMigrations');
 
         $mig1 = (object) [
+            'version'   => '2018-01-24-102301',
             'name'      => 'Some_migration',
             'path'      => TESTPATH . '_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php',
-            'version'   => '2018-01-24-102301',
             'class'     => 'Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_some_migration',
             'namespace' => 'Tests\Support\MigrationTestMigrations',
         ];
         $mig1->uid = $runner->getObjectUid($mig1);
 
         $mig2 = (object) [
+            'version'   => '2018-01-24-102302',
             'name'      => 'Another_migration',
             'path'      => TESTPATH . '_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php',
-            'version'   => '2018-01-24-102302',
             'class'     => 'Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration',
             'namespace' => 'Tests\Support\MigrationTestMigrations',
             'uid'       => '20180124102302Tests\Support\MigrationTestMigrations\Database\Migrations\Migration_another_migration',
@@ -221,8 +226,8 @@ public function testFindMigrationsSuccessTimestamp()
         $migrations = $runner->findMigrations();
 
         $this->assertCount(2, $migrations);
-        $this->assertEquals($mig1, array_shift($migrations));
-        $this->assertEquals($mig2, array_shift($migrations));
+        $this->assertSame((array) $mig1, (array) array_shift($migrations));
+        $this->assertSame((array) $mig2, (array) array_shift($migrations));
     }
 
     public function testMigrationThrowsDisabledException()
@@ -264,13 +269,13 @@ public function testVersionReturnsUpDownSuccess()
         $runner->latest();
         $version = $runner->getBatchEnd($runner->getLastBatch());
 
-        $this->assertEquals('2018-01-24-102302', $version);
+        $this->assertSame('2018-01-24-102302', $version);
         $this->seeInDatabase('foo', ['key' => 'foobar']);
 
         $runner->regress(0);
         $version = $runner->getBatchEnd($runner->getLastBatch());
 
-        $this->assertEquals('0', $version);
+        $this->assertSame('0', $version);
         $this->assertFalse($this->db->tableExists('foo'));
     }
 
@@ -284,7 +289,7 @@ public function testLatestSuccess()
         $runner->latest();
         $version = $runner->getBatchEnd($runner->getLastBatch());
 
-        $this->assertEquals('2018-01-24-102302', $version);
+        $this->assertSame('2018-01-24-102302', $version);
         $this->assertTrue(db_connect()->tableExists('foo'));
 
         $this->seeInDatabase('migrations', [
@@ -304,7 +309,7 @@ public function testRegressSuccess()
 
         $version = $runner->getBatchEnd($runner->getLastBatch());
 
-        $this->assertEquals(0, $version);
+        $this->assertSame('0', $version);
         $this->assertFalse(db_connect()->tableExists('foo'));
 
         $history = $runner->getHistory();
@@ -326,7 +331,7 @@ public function testLatestTriggersEvent()
         $runner->latest();
 
         $this->assertIsArray($result);
-        $this->assertEquals('latest', $result['method']);
+        $this->assertSame('latest', $result['method']);
     }
 
     public function testRegressTriggersEvent()
@@ -345,7 +350,7 @@ public function testRegressTriggersEvent()
         $runner->regress();
 
         $this->assertIsArray($result);
-        $this->assertEquals('regress', $result['method']);
+        $this->assertSame('regress', $result['method']);
     }
 
     public function testHistoryRecordsBatches()
@@ -361,18 +366,14 @@ public function testHistoryRecordsBatches()
         $runner->latest();
         $version = $runner->getBatchEnd($runner->getLastBatch());
 
-        $this->assertEquals('2018-01-24-102302', $version);
+        $this->assertSame('2018-01-24-102302', $version);
 
         $history = $runner->getHistory('tests');
 
-        $this->assertEquals(1, $history[0]->batch);
-
-        $this->assertEquals(1, $history[0]->batch);
-        $this->assertEquals(1, $history[1]->batch);
+        $this->assertSame(1, (int) $history[0]->batch);
+        $this->assertSame(1, (int) $history[1]->batch);
 
-        $this->seeInDatabase('migrations', [
-            'batch' => 1,
-        ]);
+        $this->seeInDatabase('migrations', ['batch' => 1]);
     }
 
     public function testGetBatchVersions()
@@ -387,8 +388,8 @@ public function testGetBatchVersions()
 
         $runner->latest();
 
-        $this->assertEquals('2018-01-24-102301', $runner->getBatchStart(1));
-        $this->assertEquals('2018-01-24-102302', $runner->getBatchEnd(1));
+        $this->assertSame('2018-01-24-102301', $runner->getBatchStart(1));
+        $this->assertSame('2018-01-24-102302', $runner->getBatchEnd(1));
     }
 
     protected function resetTables()
diff --git a/tests/system/Database/Migrations/MigrationTest.php b/tests/system/Database/Migrations/MigrationTest.php
index 5ce35835b93f..d9bf116013b4 100644
--- a/tests/system/Database/Migrations/MigrationTest.php
+++ b/tests/system/Database/Migrations/MigrationTest.php
@@ -34,6 +34,6 @@ public function down()
 
         $dbGroup = $migration->getDBGroup();
 
-        $this->assertEquals('tests', $dbGroup);
+        $this->assertSame('tests', $dbGroup);
     }
 }
diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php
index 18daef6b887f..6cdf9e772628 100644
--- a/tests/system/Debug/ExceptionsTest.php
+++ b/tests/system/Debug/ExceptionsTest.php
@@ -21,7 +21,7 @@ public function testNew()
      */
     public function testCleanPaths($file, $expected)
     {
-        $this->assertEquals($expected, Exceptions::cleanPath($file));
+        $this->assertSame($expected, Exceptions::cleanPath($file));
     }
 
     public function dirtyPathsProvider()
diff --git a/tests/system/Debug/TimerTest.php b/tests/system/Debug/TimerTest.php
index 196c81341e32..fdf515065535 100644
--- a/tests/system/Debug/TimerTest.php
+++ b/tests/system/Debug/TimerTest.php
@@ -68,7 +68,7 @@ public function testElapsedTimeGivesSameResultAsTimersArray()
 
         $expected = $timers['test1']['duration'];
 
-        $this->assertEquals($expected, $timer->getElapsedTime('test1'));
+        $this->assertSame($expected, $timer->getElapsedTime('test1'));
     }
 
     public function testThrowsExceptionStoppingNonTimer()
diff --git a/tests/system/Email/EmailTest.php b/tests/system/Email/EmailTest.php
index 5515af311e1f..08aadb80313d 100644
--- a/tests/system/Email/EmailTest.php
+++ b/tests/system/Email/EmailTest.php
@@ -41,7 +41,7 @@ public function testEmailSendWithClearance($autoClear)
         $this->assertTrue($email->send($autoClear));
 
         if (! $autoClear) {
-            $this->assertEquals('foo@foo.com', $email->archive['recipients'][0]);
+            $this->assertSame('foo@foo.com', $email->archive['recipients'][0]);
         }
     }
 
@@ -57,9 +57,9 @@ public function testEmailSendStoresArchive()
         $this->assertTrue($email->send());
 
         $this->assertNotEmpty($email->archive);
-        $this->assertEquals(['foo@foo.com'], $email->archive['recipients']);
-        $this->assertEquals('bar@foo.com', $email->archive['fromEmail']);
-        $this->assertEquals('Archive Test', $email->archive['subject']);
+        $this->assertSame(['foo@foo.com'], $email->archive['recipients']);
+        $this->assertSame('bar@foo.com', $email->archive['fromEmail']);
+        $this->assertSame('Archive Test', $email->archive['subject']);
     }
 
     public function testAutoClearLeavesArchive()
@@ -87,8 +87,8 @@ public function testEmailSendRepeatUpdatesArchive()
         $email->setSubject('Archive Test');
         $this->assertTrue($email->send());
 
-        $this->assertEquals('', $email->archive['fromEmail']);
-        $this->assertEquals('Archive Test', $email->archive['subject']);
+        $this->assertSame('', $email->archive['fromEmail']);
+        $this->assertSame('Archive Test', $email->archive['subject']);
     }
 
     public function testSuccessDoesTriggerEvent()
@@ -107,7 +107,7 @@ public function testSuccessDoesTriggerEvent()
         $this->assertTrue($email->send());
 
         $this->assertIsArray($result);
-        $this->assertEquals(['foo@foo.com'], $result['recipients']);
+        $this->assertSame(['foo@foo.com'], $result['recipients']);
     }
 
     public function testFailureDoesNotTriggerEvent()
diff --git a/tests/system/Encryption/EncryptionTest.php b/tests/system/Encryption/EncryptionTest.php
index 31e39bad00d3..87a03a651aa2 100644
--- a/tests/system/Encryption/EncryptionTest.php
+++ b/tests/system/Encryption/EncryptionTest.php
@@ -41,7 +41,7 @@ public function testConstructor()
         $ikm              = 'Secret stuff';
         $config->key      = $ikm;
         $this->encryption = new Encryption($config);
-        $this->assertEquals($ikm, $this->encryption->key);
+        $this->assertSame($ikm, $this->encryption->key);
     }
 
     /**
@@ -77,8 +77,8 @@ public function testMissingDriver()
     public function testKeyCreation()
     {
         $this->assertNotEmpty($this->encryption->createKey());
-        $this->assertEquals(32, strlen($this->encryption->createKey()));
-        $this->assertEquals(16, strlen($this->encryption->createKey(16)));
+        $this->assertSame(32, strlen($this->encryption->createKey()));
+        $this->assertSame(16, strlen($this->encryption->createKey(16)));
     }
 
     public function testServiceSuccess()
@@ -120,7 +120,7 @@ public function testServiceShared()
 
         $config->key = 'Abracadabra';
         $encrypter   = Services::encrypter($config, true);
-        $this->assertEquals('anything', $encrypter->key);
+        $this->assertSame('anything', $encrypter->key);
     }
 
     public function testMagicIssetTrue()
@@ -135,7 +135,7 @@ public function testMagicIssetFalse()
 
     public function testMagicGet()
     {
-        $this->assertEquals('SHA512', $this->encryption->digest);
+        $this->assertSame('SHA512', $this->encryption->digest);
     }
 
     public function testMagicGetMissing()
diff --git a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
index b0cb3cf30640..e20722bde10f 100644
--- a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
+++ b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
@@ -37,8 +37,8 @@ public function testSanity()
 
         $encrypter = $this->encryption->initialize($params);
 
-        $this->assertEquals('AES-256-CTR', $encrypter->cipher);
-        $this->assertEquals('Something other than an empty string', $encrypter->key);
+        $this->assertSame('AES-256-CTR', $encrypter->cipher);
+        $this->assertSame('Something other than an empty string', $encrypter->key);
     }
 
     /**
@@ -56,14 +56,14 @@ public function testSimple()
         $encrypter = $this->encryption->initialize($params);
 
         // Was the key properly set?
-        $this->assertEquals($params->key, $encrypter->key);
+        $this->assertSame($params->key, $encrypter->key);
 
         // simple encrypt/decrypt, default parameters
         $message1 = 'This is a plain-text message.';
-        $this->assertEquals($message1, $encrypter->decrypt($encrypter->encrypt($message1)));
+        $this->assertSame($message1, $encrypter->decrypt($encrypter->encrypt($message1)));
         $message2 = 'This is a different plain-text message.';
-        $this->assertEquals($message2, $encrypter->decrypt($encrypter->encrypt($message2)));
-        $this->assertNotEquals($message2, $encrypter->decrypt($encrypter->encrypt($message1)));
+        $this->assertSame($message2, $encrypter->decrypt($encrypter->encrypt($message2)));
+        $this->assertNotSame($message2, $encrypter->decrypt($encrypter->encrypt($message1)));
     }
 
     /**
@@ -84,7 +84,7 @@ public function testWithKeyString()
         $encrypter = new OpenSSLHandler();
         $message1  = 'This is a plain-text message.';
         $encoded   = $encrypter->encrypt($message1, $key);
-        $this->assertEquals($message1, $encrypter->decrypt($encoded, $key));
+        $this->assertSame($message1, $encrypter->decrypt($encoded, $key));
     }
 
     /**
@@ -98,9 +98,9 @@ public function testWithWrongKeyString()
         $encrypter = new OpenSSLHandler();
         $message1  = 'This is a plain-text message.';
         $encoded   = $encrypter->encrypt($message1, $key1);
-        $this->assertNotEquals($message1, $encoded);
+        $this->assertNotSame($message1, $encoded);
         $key2 = 'Holy cow, batman!';
-        $this->assertNotEquals($message1, $encrypter->decrypt($encoded, $key2));
+        $this->assertNotSame($message1, $encrypter->decrypt($encoded, $key2));
     }
 
     public function testWithKeyArray()
@@ -109,7 +109,7 @@ public function testWithKeyArray()
         $encrypter = new OpenSSLHandler();
         $message1  = 'This is a plain-text message.';
         $encoded   = $encrypter->encrypt($message1, ['key' => $key]);
-        $this->assertEquals($message1, $encrypter->decrypt($encoded, ['key' => $key]));
+        $this->assertSame($message1, $encrypter->decrypt($encoded, ['key' => $key]));
     }
 
     /**
@@ -123,8 +123,8 @@ public function testWithWrongKeyArray()
         $encrypter = new OpenSSLHandler();
         $message1  = 'This is a plain-text message.';
         $encoded   = $encrypter->encrypt($message1, ['key' => $key1]);
-        $this->assertNotEquals($message1, $encoded);
+        $this->assertNotSame($message1, $encoded);
         $key2 = 'Holy cow, batman!';
-        $this->assertNotEquals($message1, $encrypter->decrypt($encoded, ['key' => $key2]));
+        $this->assertNotSame($message1, $encrypter->decrypt($encoded, ['key' => $key2]));
     }
 }
diff --git a/tests/system/EntityTest.php b/tests/system/Entity/EntityTest.php
similarity index 80%
rename from tests/system/EntityTest.php
rename to tests/system/Entity/EntityTest.php
index ebd11a1df226..1ef2bb29867a 100644
--- a/tests/system/EntityTest.php
+++ b/tests/system/Entity/EntityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace CodeIgniter;
+namespace CodeIgniter\Entity;
 
 use CodeIgniter\Entity\Exceptions\CastException;
 use CodeIgniter\HTTP\URI;
@@ -9,6 +9,7 @@
 use CodeIgniter\Test\ReflectionHelper;
 use DateTime;
 use ReflectionException;
+use stdClass;
 use Tests\Support\Entity\Cast\CastBase64;
 use Tests\Support\Entity\Cast\CastPassParameters;
 use Tests\Support\Entity\Cast\NotExtendsBaseCast;
@@ -27,29 +28,27 @@ public function testSimpleSetAndGet()
 
         $entity->foo = 'to wong';
 
-        $this->assertEquals('to wong', $entity->foo);
+        $this->assertSame('to wong', $entity->foo);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetterSetters()
     {
         $entity = $this->getEntity();
 
         $entity->bar = 'thanks';
 
-        $this->assertEquals('bar:thanks:bar', $entity->bar);
+        $this->assertSame('bar:thanks:bar', $entity->bar);
     }
 
     public function testUnsetUnsetsAttribute()
     {
         $entity = $this->getEntity();
 
-        $this->assertEquals('sumfin', $entity->default);
+        $this->assertSame('sumfin', $entity->default);
 
         $entity->default = 'else';
 
-        $this->assertEquals('else', $entity->default);
+        $this->assertSame('else', $entity->default);
 
         unset($entity->default);
 
@@ -67,8 +66,6 @@ public function testIssetWorksLikeTraditionalIsset()
         $this->assertTrue(isset($attributes['default']));
     }
 
-    //--------------------------------------------------------------------
-
     public function testFill()
     {
         $entity = $this->getEntity();
@@ -79,8 +76,8 @@ public function testFill()
             'baz' => 4556,
         ]);
 
-        $this->assertEquals(123, $entity->foo);
-        $this->assertEquals('bar:234:bar', $entity->bar);
+        $this->assertSame(123, $entity->foo);
+        $this->assertSame('bar:234:bar', $entity->bar);
         $this->assertObjectNotHasAttribute('baz', $entity);
     }
 
@@ -97,12 +94,10 @@ public function testFillMapsEntities()
         ];
         $entity->fill($data);
 
-        $this->assertEquals('foo', $entity->bar);
-        $this->assertEquals('oo:simple:oo', $entity->orig);
+        $this->assertSame('foo', $entity->bar);
+        $this->assertSame('oo:simple:oo', $entity->orig);
     }
 
-    //--------------------------------------------------------------------
-
     public function testDataMappingConvertsOriginalName()
     {
         $entity = $this->getMappedEntity();
@@ -110,11 +105,11 @@ public function testDataMappingConvertsOriginalName()
         $entity->bar = 'made it';
 
         // Check mapped field
-        $this->assertEquals('made it', $entity->foo);
+        $this->assertSame('made it', $entity->foo);
 
         // Should also get from original name
         // since Model's would be looking for the original name
-        $this->assertEquals('made it', $entity->bar);
+        $this->assertSame('made it', $entity->bar);
 
         // But it shouldn't actually set a class property for the original name...
         $this->expectException(ReflectionException::class);
@@ -128,11 +123,11 @@ public function testDataMappingWorksWithCustomSettersAndGetters()
         // Will map to "simple"
         $entity->orig = 'first';
 
-        $this->assertEquals('oo:first:oo', $entity->simple);
+        $this->assertSame('oo:first:oo', $entity->simple);
 
         $entity->simple = 'second';
 
-        $this->assertEquals('oo:second:oo', $entity->simple);
+        $this->assertSame('oo:second:oo', $entity->simple);
     }
 
     public function testIssetWorksWithMapping()
@@ -157,8 +152,8 @@ public function testUnsetWorksWithMapping()
 
         // doesn't work on original name
         unset($entity->bar);
-        $this->assertEquals('here', $entity->bar);
-        $this->assertEquals('here', $entity->foo);
+        $this->assertSame('here', $entity->bar);
+        $this->assertSame('here', $entity->foo);
 
         // does work on mapped field
         unset($entity->foo);
@@ -166,20 +161,16 @@ public function testUnsetWorksWithMapping()
         $this->assertNull($entity->bar);
     }
 
-    //--------------------------------------------------------------------
-
     public function testDateMutationFromString()
     {
         $entity     = $this->getEntity();
-        $attributes = [
-            'created_at' => '2017-07-15 13:23:34',
-        ];
+        $attributes = ['created_at' => '2017-07-15 13:23:34'];
         $this->setPrivateProperty($entity, 'attributes', $attributes);
 
         $time = $entity->created_at;
 
         $this->assertInstanceOf(Time::class, $time);
-        $this->assertEquals('2017-07-15 13:23:34', $time->format('Y-m-d H:i:s'));
+        $this->assertSame('2017-07-15 13:23:34', $time->format('Y-m-d H:i:s'));
     }
 
     public function testDateMutationFromTimestamp()
@@ -187,9 +178,7 @@ public function testDateMutationFromTimestamp()
         $stamp = time();
 
         $entity     = $this->getEntity();
-        $attributes = [
-            'created_at' => $stamp,
-        ];
+        $attributes = ['created_at' => $stamp];
         $this->setPrivateProperty($entity, 'attributes', $attributes);
 
         $time = $entity->created_at;
@@ -202,9 +191,7 @@ public function testDateMutationFromDatetime()
     {
         $dt         = new DateTime('now');
         $entity     = $this->getEntity();
-        $attributes = [
-            'created_at' => $dt,
-        ];
+        $attributes = ['created_at' => $dt];
         $this->setPrivateProperty($entity, 'attributes', $attributes);
 
         $time = $entity->created_at;
@@ -217,9 +204,7 @@ public function testDateMutationFromTime()
     {
         $dt         = Time::now();
         $entity     = $this->getEntity();
-        $attributes = [
-            'created_at' => $dt,
-        ];
+        $attributes = ['created_at' => $dt];
         $this->setPrivateProperty($entity, 'attributes', $attributes);
 
         $time = $entity->created_at;
@@ -237,7 +222,7 @@ public function testDateMutationStringToTime()
         $time = $this->getPrivateProperty($entity, 'attributes')['created_at'];
 
         $this->assertInstanceOf(Time::class, $time);
-        $this->assertEquals('2017-07-15 13:23:34', $time->format('Y-m-d H:i:s'));
+        $this->assertSame('2017-07-15 13:23:34', $time->format('Y-m-d H:i:s'));
     }
 
     public function testDateMutationTimestampToTime()
@@ -279,18 +264,16 @@ public function testDateMutationTimeToTime()
         $this->assertCloseEnoughString($dt->format('Y-m-d H:i:s'), $time->format('Y-m-d H:i:s'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testCastInteger()
     {
         $entity = $this->getCastEntity();
 
         $entity->first = 3.1;
         $this->assertIsInt($entity->first);
-        $this->assertEquals(3, $entity->first);
+        $this->assertSame(3, $entity->first);
 
         $entity->first = 3.6;
-        $this->assertEquals(3, $entity->first);
+        $this->assertSame(3, $entity->first);
     }
 
     public function testCastFloat()
@@ -299,11 +282,11 @@ public function testCastFloat()
 
         $entity->second = 3;
         $this->assertIsFloat($entity->second);
-        $this->assertEquals(3.0, $entity->second);
+        $this->assertSame(3.0, $entity->second);
 
         $entity->second = '3.6';
         $this->assertIsFloat($entity->second);
-        $this->assertEquals(3.6, $entity->second);
+        $this->assertSame(3.6, $entity->second);
     }
 
     public function testCastDouble()
@@ -345,20 +328,16 @@ public function testCastCSV()
     {
         $entity = $this->getCastEntity();
 
-        $data = [
-            'foo',
-            'bar',
-            'bam',
-        ];
+        $data = ['foo', 'bar', 'bam'];
 
         $entity->twelfth = $data;
 
         $result = $entity->toRawArray();
         $this->assertIsString($result['twelfth']);
-        $this->assertEquals('foo,bar,bam', $result['twelfth']);
+        $this->assertSame('foo,bar,bam', $result['twelfth']);
 
         $this->assertIsArray($entity->twelfth);
-        $this->assertEquals($data, $entity->twelfth);
+        $this->assertSame($data, $entity->twelfth);
     }
 
     public function testCastObject()
@@ -369,7 +348,8 @@ public function testCastObject()
 
         $entity->sixth = $data;
         $this->assertIsObject($entity->sixth);
-        $this->assertEquals((object) $data, $entity->sixth);
+        $this->assertInstanceOf(stdClass::class, $entity->sixth);
+        $this->assertSame($data, (array) $entity->sixth);
     }
 
     public function testCastDateTime()
@@ -378,7 +358,7 @@ public function testCastDateTime()
 
         $entity->eighth = 'March 12, 2017';
         $this->assertInstanceOf('DateTime', $entity->eighth);
-        $this->assertEquals('2017-03-12', $entity->eighth->format('Y-m-d'));
+        $this->assertSame('2017-03-12', $entity->eighth->format('Y-m-d'));
     }
 
     public function testCastTimestamp()
@@ -389,7 +369,7 @@ public function testCastTimestamp()
 
         $entity->ninth = $date;
         $this->assertIsInt($entity->ninth);
-        $this->assertEquals(strtotime($date), $entity->ninth);
+        $this->assertSame(strtotime($date), $entity->ninth);
     }
 
     public function testCastTimestampException()
@@ -404,8 +384,6 @@ public function testCastTimestampException()
         $entity->ninth;
     }
 
-    //--------------------------------------------------------------------
-
     public function testCastArray()
     {
         $entity = $this->getCastEntity();
@@ -413,9 +391,9 @@ public function testCastArray()
         $entity->seventh = ['foo' => 'bar'];
 
         $check = $this->getPrivateProperty($entity, 'attributes')['seventh'];
-        $this->assertEquals(serialize(['foo' => 'bar']), $check);
+        $this->assertSame(serialize(['foo' => 'bar']), $check);
 
-        $this->assertEquals(['foo' => 'bar'], $entity->seventh);
+        $this->assertSame(['foo' => 'bar'], $entity->seventh);
     }
 
     public function testCastArrayByStringSerialize()
@@ -426,9 +404,9 @@ public function testCastArrayByStringSerialize()
 
         // Should be a serialized string now...
         $check = $this->getPrivateProperty($entity, 'attributes')['seventh'];
-        $this->assertEquals(serialize('foobar'), $check);
+        $this->assertSame(serialize('foobar'), $check);
 
-        $this->assertEquals(['foobar'], $entity->seventh);
+        $this->assertSame(['foobar'], $entity->seventh);
     }
 
     public function testCastArrayByArraySerialize()
@@ -439,55 +417,41 @@ public function testCastArrayByArraySerialize()
 
         // Should be a serialized string now...
         $check = $this->getPrivateProperty($entity, 'attributes')['seventh'];
-        $this->assertEquals(serialize(['foo' => 'bar']), $check);
+        $this->assertSame(serialize(['foo' => 'bar']), $check);
 
-        $this->assertEquals(['foo' => 'bar'], $entity->seventh);
+        $this->assertSame(['foo' => 'bar'], $entity->seventh);
     }
 
     public function testCastArrayByFill()
     {
         $entity = $this->getCastEntity();
 
-        $data = [
-            'seventh' => [
-                1,
-                2,
-                3,
-            ],
-        ];
+        $data = ['seventh' => [1, 2, 3]];
 
         $entity->fill($data);
 
         // Check if serialiazed
         $check = $this->getPrivateProperty($entity, 'attributes')['seventh'];
-        $this->assertEquals(serialize([1, 2, 3]), $check);
+        $this->assertSame(serialize([1, 2, 3]), $check);
 
         // Check if unserialized
-        $this->assertEquals([1, 2, 3], $entity->seventh);
+        $this->assertSame([1, 2, 3], $entity->seventh);
     }
 
     public function testCastArrayByConstructor()
     {
-        $data = [
-            'seventh' => [
-                1,
-                2,
-                3,
-            ],
-        ];
+        $data = ['seventh' => [1, 2, 3]];
 
         $entity = $this->getCastEntity($data);
 
         // Check if serialiazed
         $check = $this->getPrivateProperty($entity, 'attributes')['seventh'];
-        $this->assertEquals(serialize([1, 2, 3]), $check);
+        $this->assertSame(serialize([1, 2, 3]), $check);
 
         // Check if unserialized
-        $this->assertEquals([1, 2, 3], $entity->seventh);
+        $this->assertSame([1, 2, 3], $entity->seventh);
     }
 
-    //--------------------------------------------------------------------
-
     public function testCastNullable()
     {
         $entity = $this->getCastNullableEntity();
@@ -499,8 +463,6 @@ public function testCastNullable()
         $this->assertSame('value', $entity->string_value_not_null);
     }
 
-    //--------------------------------------------------------------------
-
     public function testCastURI()
     {
         $entity = $this->getCastEntity();
@@ -525,8 +487,6 @@ public function testURICastURI()
         $this->assertSame('/banana', $entity->thirteenth->getPath());
     }
 
-    //--------------------------------------------------------------------
-
     public function testCastAsJSON()
     {
         $entity = $this->getCastEntity();
@@ -535,68 +495,53 @@ public function testCastAsJSON()
 
         // Should be a JSON-encoded string now...
         $check = $this->getPrivateProperty($entity, 'attributes')['tenth'];
-        $this->assertEquals('{"foo":"bar"}', $check);
+        $this->assertSame('{"foo":"bar"}', $check);
 
-        $this->assertEquals((object) ['foo' => 'bar'], $entity->tenth);
+        $this->assertInstanceOf(stdClass::class, $entity->tenth);
+        $this->assertSame(['foo' => 'bar'], (array) $entity->tenth);
     }
 
     public function testCastAsJSONArray()
     {
         $entity = $this->getCastEntity();
 
-        $data = [
-            'Sun',
-            'Mon',
-            'Tue',
-        ];
+        $data = ['Sun', 'Mon', 'Tue'];
+
         $entity->eleventh = $data;
 
         // Should be a JSON-encoded string now...
         $check = $this->getPrivateProperty($entity, 'attributes')['eleventh'];
-        $this->assertEquals('["Sun","Mon","Tue"]', $check);
+        $this->assertSame('["Sun","Mon","Tue"]', $check);
 
-        $this->assertEquals($data, $entity->eleventh);
+        $this->assertSame($data, $entity->eleventh);
     }
 
     public function testCastAsJsonByFill()
     {
         $entity = $this->getCastEntity();
-        $data   = [
-            'eleventh' => [
-                1,
-                2,
-                3,
-            ],
-        ];
+        $data   = ['eleventh' => [1, 2, 3]];
 
         $entity->fill($data);
 
         // Check if serialiazed
         $check = $this->getPrivateProperty($entity, 'attributes')['eleventh'];
-        $this->assertEquals(json_encode([1, 2, 3]), $check);
+        $this->assertSame(json_encode([1, 2, 3]), $check);
 
         // Check if unserialized
-        $this->assertEquals([1, 2, 3], $entity->eleventh);
+        $this->assertSame([1, 2, 3], $entity->eleventh);
     }
 
     public function testCastAsJsonByConstructor()
     {
-        $data = [
-            'eleventh' => [
-                1,
-                2,
-                3,
-            ],
-        ];
-
+        $data   = ['eleventh' => [1, 2, 3]];
         $entity = $this->getCastEntity($data);
 
         // Check if serialiazed
         $check = $this->getPrivateProperty($entity, 'attributes')['eleventh'];
-        $this->assertEquals(json_encode([1, 2, 3]), $check);
+        $this->assertSame(json_encode([1, 2, 3]), $check);
 
         // Check if unserialized
-        $this->assertEquals([1, 2, 3], $entity->eleventh);
+        $this->assertSame([1, 2, 3], $entity->eleventh);
     }
 
     public function testCastAsJSONErrorDepth()
@@ -662,7 +607,6 @@ public function testCastAsJSONAnotherErrorDepth()
     public function testCastAsJSONControlCharCheck()
     {
         $entity = new Entity();
-
         $method = $this->getPrivateMethodInvoker($entity, 'castAsJson');
 
         $this->expectException(CastException::class);
@@ -676,7 +620,6 @@ public function testCastAsJSONControlCharCheck()
     public function testCastAsJSONStateMismatch()
     {
         $entity = new Entity();
-
         $method = $this->getPrivateMethodInvoker($entity, 'castAsJson');
 
         $this->expectException(CastException::class);
@@ -687,8 +630,6 @@ public function testCastAsJSONStateMismatch()
         $method($string, true);
     }
 
-    //--------------------------------------------------------------------
-
     public function testCastSetter()
     {
         $string = '321 String with numbers 123';
@@ -698,11 +639,11 @@ public function testCastSetter()
 
         $entity->cast(false);
         $this->assertIsString($entity->first);
-        $this->assertEquals($string, $entity->first);
+        $this->assertSame($string, $entity->first);
 
         $entity->cast(true);
         $this->assertIsInt($entity->first);
-        $this->assertEquals((int) $string, $entity->first);
+        $this->assertSame((int) $string, $entity->first);
     }
 
     public function testCastGetter()
@@ -720,9 +661,9 @@ public function testCustomCast()
 
         $fieldValue = $this->getPrivateProperty($entity, 'attributes')['first'];
 
-        $this->assertEquals(base64_encode('base 64'), $fieldValue);
+        $this->assertSame(base64_encode('base 64'), $fieldValue);
 
-        $this->assertEquals('base 64', $entity->first);
+        $this->assertSame('base 64', $entity->first);
     }
 
     public function testCustomCastException()
@@ -730,10 +671,7 @@ public function testCustomCastException()
         $entity = $this->getCustomCastEntity();
 
         $this->expectException(CastException::class);
-        $this->expectErrorMessage(
-            'The "Tests\Support\Entity\Cast\NotExtendsBaseCast" class '
-            . 'must inherit the "CodeIgniter\Entity\Cast\BaseCast" class'
-        );
+        $this->expectErrorMessage('The "Tests\Support\Entity\Cast\NotExtendsBaseCast" class must inherit the "CodeIgniter\Entity\Cast\BaseCast" class');
         $entity->second = 'throw Exception';
     }
 
@@ -743,21 +681,18 @@ public function testCustomCastParams()
 
         $entity->third = 'value';
 
-        $this->assertEquals('value:["param1","param2","param3"]', $entity->third);
+        $this->assertSame('value:["param1","param2","param3"]', $entity->third);
 
         $entity->fourth = 'test_nullable_type';
-        $this->assertEquals('test_nullable_type:["nullable"]', $entity->fourth);
+        $this->assertSame('test_nullable_type:["nullable"]', $entity->fourth);
     }
 
-    //--------------------------------------------------------------------
-
     public function testAsArray()
     {
         $entity = $this->getEntity();
-
         $result = $entity->toArray();
 
-        $this->assertEquals($result, [
+        $this->assertSame($result, [
             'foo'       => null,
             'bar'       => ':bar',
             'default'   => 'sumfin',
@@ -772,27 +707,26 @@ public function testAsArrayRecursive()
 
         $result = $entity->toArray(false, true, true);
 
-        $this->assertEquals($result, [
-            'foo'       => null,
-            'bar'       => ':bar',
-            'default'   => 'sumfin',
-            'createdAt' => null,
-            'entity'    => [
+        $this->assertSame([
+            'foo'     => null,
+            'bar'     => ':bar',
+            'default' => 'sumfin',
+            'entity'  => [
                 'foo'       => null,
                 'bar'       => ':bar',
                 'default'   => 'sumfin',
                 'createdAt' => null,
             ],
-        ]);
+            'createdAt' => null,
+        ], $result);
     }
 
     public function testAsArrayMapped()
     {
         $entity = $this->getMappedEntity();
-
         $result = $entity->toArray();
 
-        $this->assertEquals($result, [
+        $this->assertSame($result, [
             'bar'  => null,
             'orig' => ':oo',
         ]);
@@ -801,10 +735,9 @@ public function testAsArrayMapped()
     public function testAsArraySwapped()
     {
         $entity = $this->getSwappedEntity();
-
         $result = $entity->toArray();
 
-        $this->assertEquals($result, [
+        $this->assertSame($result, [
             'bar'          => 'foo',
             'foo'          => 'bar',
             'original_bar' => 'bar',
@@ -822,7 +755,7 @@ public function testToArraySkipAttributesWithUnderscoreInFirstCharacter()
 
         $result = $entity->toArray();
 
-        $this->assertEquals($result, [
+        $this->assertSame($result, [
             'bar' => null,
         ]);
     }
@@ -835,7 +768,7 @@ public function testAsArrayOnlyChanged()
 
         $result = $entity->toArray(true);
 
-        $this->assertEquals($result, [
+        $this->assertSame($result, [
             'bar' => 'bar:foo:bar',
         ]);
     }
@@ -846,7 +779,7 @@ public function testToRawArray()
 
         $result = $entity->toRawArray();
 
-        $this->assertEquals($result, [
+        $this->assertSame($result, [
             'foo'        => null,
             'bar'        => null,
             'default'    => 'sumfin',
@@ -861,7 +794,7 @@ public function testToRawArrayRecursive()
 
         $result = $entity->toRawArray(false, true);
 
-        $this->assertEquals($result, [
+        $this->assertSame($result, [
             'foo'        => null,
             'bar'        => null,
             'default'    => 'sumfin',
@@ -883,13 +816,11 @@ public function testToRawArrayOnlyChanged()
 
         $result = $entity->toRawArray(true);
 
-        $this->assertEquals($result, [
+        $this->assertSame($result, [
             'bar' => 'bar:foo',
         ]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testFilledConstruction()
     {
         $data = [
@@ -898,31 +829,25 @@ public function testFilledConstruction()
         ];
 
         $something = new SomeEntity($data);
-        $this->assertEquals('bar', $something->foo);
-        $this->assertEquals('baz', $something->bar);
+        $this->assertSame('bar', $something->foo);
+        $this->assertSame('baz', $something->bar);
     }
 
-    //--------------------------------------------------------------------
-
     public function testChangedArray()
     {
-        $data = [
-            'bar' => 'baz',
-        ];
+        $data = ['bar' => 'baz'];
 
         $something = new SomeEntity($data);
-        $whatsnew  = $something->toArray(true);
-        $expected  = $data;
-        $this->assertEquals($expected, $whatsnew);
+        $this->assertSame($data, $something->toArray(true));
 
-        $something->magic  = 'rockin';
-        $expected['magic'] = 'rockin';
-        $expected['foo']   = null;
-        $whatsnew          = $something->toArray(false);
-        $this->assertEquals($expected, $whatsnew);
-    }
+        $something->magic = 'rockin';
 
-    //--------------------------------------------------------------------
+        $this->assertSame([
+            'foo'   => null,
+            'bar'   => 'baz',
+            'magic' => 'rockin',
+        ], $something->toArray(false));
+    }
 
     public function testHasChangedNotExists()
     {
@@ -977,10 +902,10 @@ public function testJsonSerializableEntity()
     {
         $entity = $this->getEntity();
         $entity->setBar('foo');
-        $this->assertEquals(json_encode($entity->toArray()), json_encode($entity));
+        $this->assertSame(json_encode($entity->toArray()), json_encode($entity));
     }
 
-    protected function getEntity() : Entity
+    protected function getEntity()
     {
         return new class() extends Entity {
             protected $attributes = [
@@ -1020,7 +945,7 @@ public function getFakeBar()
         };
     }
 
-    protected function getMappedEntity() : Entity
+    protected function getMappedEntity()
     {
         return new class() extends Entity {
             protected $attributes = [
@@ -1051,7 +976,7 @@ protected function getSimple()
         };
     }
 
-    protected function getSwappedEntity() : Entity
+    protected function getSwappedEntity()
     {
         return new class() extends Entity {
             protected $attributes = [
@@ -1131,7 +1056,7 @@ public function setSeventh($seventh)
         };
     }
 
-    protected function getCastNullableEntity() : Entity
+    protected function getCastNullableEntity()
     {
         return new class() extends Entity {
             protected $attributes = [
@@ -1161,7 +1086,7 @@ protected function getCastNullableEntity() : Entity
         };
     }
 
-    protected function getCustomCastEntity() : Entity
+    protected function getCustomCastEntity()
     {
         return new class() extends Entity {
             protected $attributes = [
diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php
index a599fb45ce83..7c2fa5c99c81 100644
--- a/tests/system/Events/EventsTest.php
+++ b/tests/system/Events/EventsTest.php
@@ -52,15 +52,15 @@ public function testInitialize()
         $default = [APPPATH . 'Config' . DIRECTORY_SEPARATOR . 'Events.php'];
         $this->manager->unInitialize();
         MockEvents::initialize();
-        $this->assertEquals($default, $this->manager->getFiles());
+        $this->assertSame($default, $this->manager->getFiles());
 
         // but we should be able to change it through the backdoor
         MockEvents::setFiles(['/peanuts']);
-        $this->assertEquals(['/peanuts'], $this->manager->getFiles());
+        $this->assertSame(['/peanuts'], $this->manager->getFiles());
 
         // re-initializing should have no effect
         MockEvents::initialize();
-        $this->assertEquals(['/peanuts'], $this->manager->getFiles());
+        $this->assertSame(['/peanuts'], $this->manager->getFiles());
     }
 
     public function testPerformance()
@@ -86,7 +86,7 @@ public function testListeners()
         Events::on('foo', $callback1, EVENT_PRIORITY_HIGH);
         Events::on('foo', $callback2, EVENT_PRIORITY_NORMAL);
 
-        $this->assertEquals([$callback2, $callback1], Events::listeners('foo'));
+        $this->assertSame([$callback1, $callback2], Events::listeners('foo'));
     }
 
     public function testHandleEvent()
@@ -99,7 +99,7 @@ public function testHandleEvent()
 
         $this->assertTrue(Events::trigger('foo', 'bar'));
 
-        $this->assertEquals('bar', $result);
+        $this->assertSame('bar', $result);
     }
 
     public function testCancelEvent()
@@ -118,7 +118,7 @@ public function testCancelEvent()
         });
 
         $this->assertFalse(Events::trigger('foo', 'bar'));
-        $this->assertEquals(1, $result);
+        $this->assertSame(1, $result);
     }
 
     public function testPriority()
@@ -139,7 +139,7 @@ public function testPriority()
         }, EVENT_PRIORITY_HIGH);
 
         $this->assertFalse(Events::trigger('foo', 'bar'));
-        $this->assertEquals(2, $result);
+        $this->assertSame(2, $result);
     }
 
     public function testPriorityWithMultiple()
@@ -163,7 +163,7 @@ public function testPriorityWithMultiple()
         }, 75);
 
         Events::trigger('foo');
-        $this->assertEquals(['c', 'd', 'a', 'b'], $result);
+        $this->assertSame(['c', 'd', 'a', 'b'], $result);
     }
 
     public function testRemoveListener()
@@ -241,7 +241,7 @@ public function testRemoveAllListenersWithSingleEvent()
 
         $listeners = Events::listeners('foo');
 
-        $this->assertEquals([], $listeners);
+        $this->assertSame([], $listeners);
     }
 
     public function testRemoveAllListenersWithMultipleEvents()
@@ -257,8 +257,8 @@ public function testRemoveAllListenersWithMultipleEvents()
 
         Events::removeAllListeners();
 
-        $this->assertEquals([], Events::listeners('foo'));
-        $this->assertEquals([], Events::listeners('bar'));
+        $this->assertSame([], Events::listeners('foo'));
+        $this->assertSame([], Events::listeners('bar'));
     }
 
     // Basically if it doesn't crash this should be good...
@@ -284,7 +284,7 @@ public function hold(string $value)
 
         $this->assertTrue(Events::trigger('foo', 'bar'));
 
-        $this->assertEquals('bar', $box->logged);
+        $this->assertSame('bar', $box->logged);
     }
 
     public function testSimulate()
@@ -300,6 +300,6 @@ public function testSimulate()
         Events::simulate(true);
         Events::trigger('foo');
 
-        $this->assertEquals(0, $result);
+        $this->assertSame(0, $result);
     }
 }
diff --git a/tests/system/Files/FileTest.php b/tests/system/Files/FileTest.php
index 31b2e5b46def..d42578844f68 100644
--- a/tests/system/Files/FileTest.php
+++ b/tests/system/Files/FileTest.php
@@ -13,14 +13,14 @@ public function testNewGoodChecked()
     {
         $path = SYSTEMPATH . 'Common.php';
         $file = new File($path, true);
-        $this->assertEquals($path, $file->getRealPath());
+        $this->assertSame($path, $file->getRealPath());
     }
 
     public function testNewGoodUnchecked()
     {
         $path = SYSTEMPATH . 'Common.php';
         $file = new File($path, false);
-        $this->assertEquals($path, $file->getRealPath());
+        $this->assertSame($path, $file->getRealPath());
     }
 
     public function testNewBadUnchecked()
@@ -33,45 +33,45 @@ public function testNewBadUnchecked()
     public function testGuessExtension()
     {
         $file = new File(SYSTEMPATH . 'Common.php');
-        $this->assertEquals('php', $file->guessExtension());
+        $this->assertSame('php', $file->guessExtension());
         $file = new File(SYSTEMPATH . 'index.html');
-        $this->assertEquals('html', $file->guessExtension());
+        $this->assertSame('html', $file->guessExtension());
         $file = new File(ROOTPATH . 'phpunit.xml.dist');
-        $this->assertEquals('xml', $file->guessExtension());
+        $this->assertSame('xml', $file->guessExtension());
     }
 
     public function testRandomName()
     {
         $file    = new File(SYSTEMPATH . 'Common.php');
         $result1 = $file->getRandomName();
-        $this->assertNotEquals($result1, $file->getRandomName());
+        $this->assertNotSame($result1, $file->getRandomName());
     }
 
     public function testCanAccessSplFileInfoMethods()
     {
         $file = new File(SYSTEMPATH . 'Common.php');
-        $this->assertEquals('file', $file->getType());
+        $this->assertSame('file', $file->getType());
     }
 
     public function testGetSizeReturnsKB()
     {
         $file = new File(SYSTEMPATH . 'Common.php');
         $size = number_format(filesize(SYSTEMPATH . 'Common.php') / 1024, 3);
-        $this->assertEquals($size, $file->getSizeByUnit('kb'));
+        $this->assertSame($size, $file->getSizeByUnit('kb'));
     }
 
     public function testGetSizeReturnsMB()
     {
         $file = new File(SYSTEMPATH . 'Common.php');
         $size = number_format(filesize(SYSTEMPATH . 'Common.php') / 1024 / 1024, 3);
-        $this->assertEquals($size, $file->getSizeByUnit('mb'));
+        $this->assertSame($size, $file->getSizeByUnit('mb'));
     }
 
     public function testGetSizeReturnsBytes()
     {
         $file = new File(SYSTEMPATH . 'Common.php');
         $size = filesize(SYSTEMPATH . 'Common.php');
-        $this->assertEquals($size, $file->getSizeByUnit('b'));
+        $this->assertSame($size, $file->getSizeByUnit('b'));
     }
 
     public function testThrowsExceptionIfNotAFile()
diff --git a/tests/system/Files/FileWithVfsTest.php b/tests/system/Files/FileWithVfsTest.php
index b0a0bed7b4df..219fb8bdb4cb 100644
--- a/tests/system/Files/FileWithVfsTest.php
+++ b/tests/system/Files/FileWithVfsTest.php
@@ -42,49 +42,49 @@ protected function tearDown(): void
     public function testDestinationUnknown()
     {
         $destination = $this->start . 'charlie/cherry.php';
-        $this->assertEquals($destination, $this->file->getDestination($destination));
+        $this->assertSame($destination, $this->file->getDestination($destination));
     }
 
     public function testDestinationSameFileSameFolder()
     {
         $destination = $this->start . 'able/apple.php';
-        $this->assertEquals($this->start . 'able/apple_1.php', $this->file->getDestination($destination));
+        $this->assertSame($this->start . 'able/apple_1.php', $this->file->getDestination($destination));
     }
 
     public function testDestinationSameFileDifferentFolder()
     {
         $destination = $this->start . 'baker/apple.php';
-        $this->assertEquals($destination, $this->file->getDestination($destination));
+        $this->assertSame($destination, $this->file->getDestination($destination));
     }
 
     public function testDestinationDifferentFileSameFolder()
     {
         $destination = $this->start . 'able/date.php';
-        $this->assertEquals($destination, $this->file->getDestination($destination));
+        $this->assertSame($destination, $this->file->getDestination($destination));
     }
 
     public function testDestinationDifferentFileDifferentFolder()
     {
         $destination = $this->start . 'baker/date.php';
-        $this->assertEquals($destination, $this->file->getDestination($destination));
+        $this->assertSame($destination, $this->file->getDestination($destination));
     }
 
     public function testDestinationExistingFileDifferentFolder()
     {
         $destination = $this->start . 'baker/banana.php';
-        $this->assertEquals($this->start . 'baker/banana_1.php', $this->file->getDestination($destination));
+        $this->assertSame($this->start . 'baker/banana_1.php', $this->file->getDestination($destination));
     }
 
     public function testDestinationDelimited()
     {
         $destination = $this->start . 'able/fig_3.php';
-        $this->assertEquals($this->start . 'able/fig_4.php', $this->file->getDestination($destination));
+        $this->assertSame($this->start . 'able/fig_4.php', $this->file->getDestination($destination));
     }
 
     public function testDestinationDelimitedAlpha()
     {
         $destination = $this->start . 'able/prune_ripe.php';
-        $this->assertEquals($this->start . 'able/prune_ripe_1.php', $this->file->getDestination($destination));
+        $this->assertSame($this->start . 'able/prune_ripe_1.php', $this->file->getDestination($destination));
     }
 
     public function testMoveNormal()
@@ -140,6 +140,6 @@ public function testMoveReturnsNewInstance()
 
         $this->assertTrue($this->root->hasChild('baker/apple.php'));
         $this->assertInstanceOf(File::class, $file);
-        $this->assertEquals($destination . '/apple.php', $file->getPathname());
+        $this->assertSame($destination . '/apple.php', $file->getPathname());
     }
 }
diff --git a/tests/system/Filters/CSRFTest.php b/tests/system/Filters/CSRFTest.php
index a82bf1578d8c..878c6e78aaf7 100644
--- a/tests/system/Filters/CSRFTest.php
+++ b/tests/system/Filters/CSRFTest.php
@@ -39,6 +39,6 @@ public function testNormal()
         // we expect CSRF requests to be ignored in CLI
         $expected = $this->request;
         $request  = $filters->run($uri, 'before');
-        $this->assertEquals($expected, $request);
+        $this->assertSame($expected, $request);
     }
 }
diff --git a/tests/system/Filters/DebugToolbarTest.php b/tests/system/Filters/DebugToolbarTest.php
index 04079d79fa03..9d1b5f24a422 100644
--- a/tests/system/Filters/DebugToolbarTest.php
+++ b/tests/system/Filters/DebugToolbarTest.php
@@ -43,10 +43,10 @@ public function testDebugToolbarFilter()
 
         // nothing should change here, since we have no before logic
         $filter->before($this->request);
-        $this->assertEquals($expectedBefore, $this->request);
+        $this->assertSame($expectedBefore, $this->request);
 
         // nothing should change here, since we are running in the CLI
         $filter->after($this->request, $this->response);
-        $this->assertEquals($expectedAfter, $this->response);
+        $this->assertSame($expectedAfter, $this->response);
     }
 }
diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index bdc09ab2bf16..3bf56c7b616b 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -58,7 +58,7 @@ public function testProcessMethodDetectsCLI()
             'after'  => [],
         ];
 
-        $this->assertEquals($expected, $filters->initialize()->getFilters());
+        $this->assertSame($expected, $filters->initialize()->getFilters());
     }
 
     public function testProcessMethodDetectsGetRequests()
@@ -78,7 +78,7 @@ public function testProcessMethodDetectsGetRequests()
             'after'  => [],
         ];
 
-        $this->assertEquals($expected, $filters->initialize()->getFilters());
+        $this->assertSame($expected, $filters->initialize()->getFilters());
     }
 
     public function testProcessMethodRespectsMethod()
@@ -102,7 +102,7 @@ public function testProcessMethodRespectsMethod()
             'after'  => [],
         ];
 
-        $this->assertEquals($expected, $filters->initialize()->getFilters());
+        $this->assertSame($expected, $filters->initialize()->getFilters());
     }
 
     public function testProcessMethodIgnoresMethod()
@@ -126,7 +126,7 @@ public function testProcessMethodIgnoresMethod()
             'after'  => [],
         ];
 
-        $this->assertEquals($expected, $filters->initialize()->getFilters());
+        $this->assertSame($expected, $filters->initialize()->getFilters());
     }
 
     public function testProcessMethodProcessGlobals()
@@ -160,7 +160,7 @@ public function testProcessMethodProcessGlobals()
             'after' => ['baz'],
         ];
 
-        $this->assertEquals($expected, $filters->initialize()->getFilters());
+        $this->assertSame($expected, $filters->initialize()->getFilters());
     }
 
     public function provideExcept()
@@ -208,7 +208,7 @@ public function testProcessMethodProcessGlobalsWithExcept(array $except)
             'after' => ['baz'],
         ];
 
-        $this->assertEquals($expected, $filters->initialize($uri)->getFilters());
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
     public function testProcessMethodProcessesFiltersBefore()
@@ -236,7 +236,7 @@ public function testProcessMethodProcessesFiltersBefore()
             'after'  => [],
         ];
 
-        $this->assertEquals($expected, $filters->initialize($uri)->getFilters());
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
     public function testProcessMethodProcessesFiltersAfter()
@@ -266,7 +266,7 @@ public function testProcessMethodProcessesFiltersAfter()
             ],
         ];
 
-        $this->assertEquals($expected, $filters->initialize($uri)->getFilters());
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
     public function testProcessMethodProcessesCombined()
@@ -314,7 +314,7 @@ public function testProcessMethodProcessesCombined()
             'after' => ['bazg'],
         ];
 
-        $this->assertEquals($expected, $filters->initialize($uri)->getFilters());
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
     public function testProcessMethodProcessesCombinedAfterForToolbar()
@@ -355,7 +355,7 @@ public function testProcessMethodProcessesCombinedAfterForToolbar()
             ],
         ];
 
-        $this->assertEquals($expected, $filters->initialize($uri)->getFilters());
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
     public function testRunThrowsWithInvalidAlias()
@@ -395,7 +395,7 @@ public function testCustomFiltersLoad()
 
         $request = $filters->run($uri, 'before');
 
-        $this->assertEquals('http://hellowworld.com', $request->url);
+        $this->assertSame('http://hellowworld.com', $request->url);
     }
 
     public function testRunThrowsWithInvalidClassType()
@@ -435,7 +435,7 @@ public function testRunDoesBefore()
 
         $request = $filters->run($uri, 'before');
 
-        $this->assertEquals('http://google.com', $request->url);
+        $this->assertSame('http://google.com', $request->url);
     }
 
     public function testRunDoesAfter()
@@ -455,7 +455,7 @@ public function testRunDoesAfter()
 
         $response = $filters->run($uri, 'after');
 
-        $this->assertEquals('http://google.com', $response->csp);
+        $this->assertSame('http://google.com', $response->csp);
     }
 
     public function testShortCircuit()
@@ -475,7 +475,7 @@ public function testShortCircuit()
 
         $response = $filters->run($uri, 'before');
         $this->assertTrue($response instanceof ResponseInterface);
-        $this->assertEquals('http://google.com', $response->csp);
+        $this->assertSame('http://google.com', $response->csp);
     }
 
     public function testOtherResult()
@@ -501,7 +501,7 @@ public function testOtherResult()
 
         $response = $filters->run($uri, 'before');
 
-        $this->assertEquals('This is curious', $response);
+        $this->assertSame('This is curious', $response);
     }
 
     public function testBeforeExceptString()
@@ -534,7 +534,7 @@ public function testBeforeExceptString()
             'after' => ['baz'],
         ];
 
-        $this->assertEquals($expected, $filters->initialize($uri)->getFilters());
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
     public function testBeforeExceptInapplicable()
@@ -568,7 +568,7 @@ public function testBeforeExceptInapplicable()
             'after' => ['baz'],
         ];
 
-        $this->assertEquals($expected, $filters->initialize($uri)->getFilters());
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
     public function testAfterExceptString()
@@ -601,7 +601,7 @@ public function testAfterExceptString()
             'after' => ['baz'],
         ];
 
-        $this->assertEquals($expected, $filters->initialize($uri)->getFilters());
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
     public function testAfterExceptInapplicable()
@@ -637,7 +637,7 @@ public function testAfterExceptInapplicable()
             ],
         ];
 
-        $this->assertEquals($expected, $filters->initialize($uri)->getFilters());
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
     public function testAddFilter()
@@ -742,14 +742,14 @@ public function testEnableFilterWithArguments()
         $found = $filters->getFilters();
 
         $this->assertTrue(in_array('role', $found['before'], true));
-        $this->assertEquals(['admin', 'super'], $filters->getArguments('role'));
-        $this->assertEquals(['role' => ['admin', 'super']], $filters->getArguments());
+        $this->assertSame(['admin', 'super'], $filters->getArguments('role'));
+        $this->assertSame(['role' => ['admin', 'super']], $filters->getArguments());
 
         $response = $filters->run('admin/foo/bar', 'before');
-        $this->assertEquals('admin;super', $response);
+        $this->assertSame('admin;super', $response);
 
         $response = $filters->run('admin/foo/bar', 'after');
-        $this->assertEquals('admin;super', $response->getBody());
+        $this->assertSame('admin;super', $response->getBody());
     }
 
     public function testEnableFilterWithNoArguments()
@@ -776,10 +776,10 @@ public function testEnableFilterWithNoArguments()
         $this->assertTrue(in_array('role', $found['before'], true));
 
         $response = $filters->run('admin/foo/bar', 'before');
-        $this->assertEquals('Is null', $response);
+        $this->assertSame('Is null', $response);
 
         $response = $filters->run('admin/foo/bar', 'after');
-        $this->assertEquals('Is null', $response->getBody());
+        $this->assertSame('Is null', $response->getBody());
     }
 
     public function testEnableNonFilter()
@@ -848,7 +848,7 @@ public function testMatchesURICaseInsensitively()
             ],
         ];
 
-        $this->assertEquals($expected, $filters->initialize($uri)->getFilters());
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
     /**
@@ -883,7 +883,7 @@ public function testFilterMatching()
         ];
 
         $actual = $filters->initialize($uri)->getFilters();
-        $this->assertEquals($expected, $actual);
+        $this->assertSame($expected, $actual);
     }
 
     /**
@@ -925,7 +925,7 @@ public function testGlobalFilterMatching()
         ];
 
         $actual = $filters->initialize($uri)->getFilters();
-        $this->assertEquals($expected, $actual);
+        $this->assertSame($expected, $actual);
     }
 
     /**
@@ -974,7 +974,7 @@ public function testCombinedFilterMatching()
             ],
         ];
 
-        $this->assertEquals($expected, $filters->initialize($uri)->getFilters());
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
     /**
@@ -1018,7 +1018,7 @@ public function testSegmentedFilterMatching()
             ],
         ];
 
-        $this->assertEquals($expected, $filters->initialize($uri)->getFilters());
+        $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
     /**
@@ -1043,8 +1043,8 @@ public function testFilterAlitasMultiple()
         $uri     = 'admin/foo/bar';
 
         $request = $filters->run($uri, 'before');
-        $this->assertEquals('http://exampleMultipleURL.com', $request->url);
-        $this->assertEquals('http://exampleMultipleCSP.com', $request->csp);
+        $this->assertSame('http://exampleMultipleURL.com', $request->url);
+        $this->assertSame('http://exampleMultipleCSP.com', $request->csp);
     }
 
     public function testFilterClass()
@@ -1066,13 +1066,13 @@ public function testFilterClass()
 
         $filters->run('admin/foo/bar', 'before');
         $expected = [
-            'after' => [
+            'before' => [],
+            'after'  => [
                 'CodeIgniter\Filters\fixtures\Multiple1',
                 'CodeIgniter\Filters\fixtures\Multiple2',
             ],
-            'before' => [],
         ];
-        $this->assertEquals($expected, $filters->getFiltersClass());
+        $this->assertSame($expected, $filters->getFiltersClass());
     }
 
     public function testReset()
@@ -1093,7 +1093,7 @@ public function testReset()
         $filters = new Filters((object) $config, $this->request, $this->response);
         $uri     = 'admin';
 
-        $this->assertEquals(['foo'], $filters->initialize($uri)->getFilters()['before']);
+        $this->assertSame(['foo'], $filters->initialize($uri)->getFilters()['before']);
         $this->assertSame([], $filters->reset()->getFilters()['before']);
     }
 }
diff --git a/tests/system/Filters/HoneypotTest.php b/tests/system/Filters/HoneypotTest.php
index 0c90b44be2af..fa8089c1e5ba 100644
--- a/tests/system/Filters/HoneypotTest.php
+++ b/tests/system/Filters/HoneypotTest.php
@@ -66,7 +66,7 @@ public function testBeforeClean()
         $uri     = 'admin/foo/bar';
 
         $request = $filters->run($uri, 'before');
-        $this->assertEquals($expected, $request);
+        $this->assertSame($expected, $request);
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Format/JSONFormatterTest.php b/tests/system/Format/JSONFormatterTest.php
index bf40a9576d34..2a6109985613 100644
--- a/tests/system/Format/JSONFormatterTest.php
+++ b/tests/system/Format/JSONFormatterTest.php
@@ -27,7 +27,7 @@ public function testBasicJSON()
     "foo": "bar"
 }';
 
-        $this->assertEquals($expected, $this->jsonFormatter->format($data));
+        $this->assertSame($expected, $this->jsonFormatter->format($data));
     }
 
     public function testUnicodeOutput()
@@ -40,7 +40,7 @@ public function testUnicodeOutput()
     "foo": "База данни грешка"
 }';
 
-        $this->assertEquals($expected, $this->jsonFormatter->format($data));
+        $this->assertSame($expected, $this->jsonFormatter->format($data));
     }
 
     public function testKeepsURLs()
@@ -53,7 +53,7 @@ public function testKeepsURLs()
     "foo": "https://www.example.com/foo/bar"
 }';
 
-        $this->assertEquals($expected, $this->jsonFormatter->format($data));
+        $this->assertSame($expected, $this->jsonFormatter->format($data));
     }
 
     public function testJSONError()
@@ -62,6 +62,6 @@ public function testJSONError()
 
         $data     = ["\xB1\x31"];
         $expected = 'Boom';
-        $this->assertEquals($expected, $this->jsonFormatter->format($data));
+        $this->assertSame($expected, $this->jsonFormatter->format($data));
     }
 }
diff --git a/tests/system/Format/XMLFormatterTest.php b/tests/system/Format/XMLFormatterTest.php
index 347782cc4edd..2213b470c87f 100644
--- a/tests/system/Format/XMLFormatterTest.php
+++ b/tests/system/Format/XMLFormatterTest.php
@@ -30,7 +30,7 @@ public function testBasicXML()
 
             EOH;
 
-        $this->assertEquals($expected, $this->xmlFormatter->format($data));
+        $this->assertSame($expected, $this->xmlFormatter->format($data));
     }
 
     public function testFormatXMLWithMultilevelArray()
@@ -45,7 +45,7 @@ public function testFormatXMLWithMultilevelArray()
 
             EOH;
 
-        $this->assertEquals($expected, $this->xmlFormatter->format($data));
+        $this->assertSame($expected, $this->xmlFormatter->format($data));
     }
 
     public function testFormatXMLWithMultilevelArrayAndNumericKey()
@@ -60,7 +60,7 @@ public function testFormatXMLWithMultilevelArrayAndNumericKey()
 
             EOH;
 
-        $this->assertEquals($expected, $this->xmlFormatter->format($data));
+        $this->assertSame($expected, $this->xmlFormatter->format($data));
     }
 
     public function testStringFormatting()
@@ -72,7 +72,7 @@ public function testStringFormatting()
 
             EOH;
 
-        $this->assertEquals($expected, $this->xmlFormatter->format($data));
+        $this->assertSame($expected, $this->xmlFormatter->format($data));
     }
 
     public function testValidatingXmlTags()
@@ -87,7 +87,7 @@ public function testValidatingXmlTags()
 
             EOH;
 
-        $this->assertEquals($expected, $this->xmlFormatter->format($data));
+        $this->assertSame($expected, $this->xmlFormatter->format($data));
     }
 
     /**
@@ -104,7 +104,7 @@ public function testValidatingInvalidTags(string $expected, array $input)
 
             EOH;
 
-        $this->assertEquals($expectedXML, $this->xmlFormatter->format($input));
+        $this->assertSame($expectedXML, $this->xmlFormatter->format($input));
     }
 
     public function invalidTagsProvider()
@@ -217,6 +217,6 @@ public function testDeepNestedArrayToXml()
         $dom->formatOutput       = true;
         $dom->loadXML($this->xmlFormatter->format($data));
 
-        $this->assertEquals($expectedXML, $dom->saveXML());
+        $this->assertSame($expectedXML, $dom->saveXML());
     }
 }
diff --git a/tests/system/HTTP/CLIRequestTest.php b/tests/system/HTTP/CLIRequestTest.php
index 63e58db64b0f..08fd32b777e3 100644
--- a/tests/system/HTTP/CLIRequestTest.php
+++ b/tests/system/HTTP/CLIRequestTest.php
@@ -15,7 +15,6 @@
  */
 final class CLIRequestTest extends CIUnitTestCase
 {
-
     /**
      * @var CLIRequest
      */
@@ -26,8 +25,9 @@ protected function setUp(): void
         parent::setUp();
 
         $this->request = new CLIRequest(new App());
-        $_POST         = [];
-        $_GET          = [];
+
+        $_POST = [];
+        $_GET  = [];
     }
 
     //--------------------------------------------------------------------
@@ -51,7 +51,7 @@ public function testParsingSegments()
             '21',
             'profile',
         ];
-        $this->assertEquals($segments, $this->request->getSegments());
+        $this->assertSame($segments, $this->request->getSegments());
     }
 
     public function testParsingOptions()
@@ -74,7 +74,7 @@ public function testParsingOptions()
             'foo'     => 'bar',
             'foo-bar' => 'yes',
         ];
-        $this->assertEquals($options, $this->request->getOptions());
+        $this->assertSame($options, $this->request->getOptions());
     }
 
     public function testParsingOptionDetails()
@@ -91,7 +91,7 @@ public function testParsingOptionDetails()
         // reinstantiate it to force parsing
         $this->request = new CLIRequest(new App());
 
-        $this->assertEquals('bar', $this->request->getOption('foo'));
+        $this->assertSame('bar', $this->request->getOption('foo'));
         $this->assertNull($this->request->getOption('notthere'));
     }
 
@@ -111,8 +111,8 @@ public function testParsingOptionString()
         // reinstantiate it to force parsing
         $this->request = new CLIRequest(new App());
 
-        $this->assertEquals('-foo bar -baz "queue some stuff"', $this->request->getOptionString());
-        $this->assertEquals('--foo bar --baz "queue some stuff"', $this->request->getOptionString(true));
+        $this->assertSame('-foo bar -baz "queue some stuff"', $this->request->getOptionString());
+        $this->assertSame('--foo bar --baz "queue some stuff"', $this->request->getOptionString(true));
     }
 
     public function testParsingNoOptions()
@@ -128,7 +128,7 @@ public function testParsingNoOptions()
         $this->request = new CLIRequest(new App());
 
         $expected = '';
-        $this->assertEquals($expected, $this->request->getOptionString());
+        $this->assertSame($expected, $this->request->getOptionString());
     }
 
     public function testParsingPath()
@@ -145,7 +145,7 @@ public function testParsingPath()
         // reinstantiate it to force parsing
         $this->request = new CLIRequest(new App());
 
-        $this->assertEquals('users/21/profile', $this->request->getPath());
+        $this->assertSame('users/21/profile', $this->request->getPath());
     }
 
     public function testParsingMalformed()
@@ -164,9 +164,9 @@ public function testParsingMalformed()
         // reinstantiate it to force parsing
         $this->request = new CLIRequest(new App());
 
-        $this->assertEquals('-foo bar -baz "queue some stuff"', $this->request->getOptionString());
-        $this->assertEquals('--foo bar --baz "queue some stuff"', $this->request->getOptionString(true));
-        $this->assertEquals('users/21/pro-file', $this->request->getPath());
+        $this->assertSame('-foo bar -baz "queue some stuff"', $this->request->getOptionString());
+        $this->assertSame('--foo bar --baz "queue some stuff"', $this->request->getOptionString(true));
+        $this->assertSame('users/21/pro-file', $this->request->getPath());
     }
 
     public function testParsingMalformed2()
@@ -185,9 +185,9 @@ public function testParsingMalformed2()
         // reinstantiate it to force parsing
         $this->request = new CLIRequest(new App());
 
-        $this->assertEquals('-foo oops-bar -baz "queue some stuff"', $this->request->getOptionString());
-        $this->assertEquals('--foo oops-bar --baz "queue some stuff"', $this->request->getOptionString(true));
-        $this->assertEquals('users/21/profile', $this->request->getPath());
+        $this->assertSame('-foo oops-bar -baz "queue some stuff"', $this->request->getOptionString());
+        $this->assertSame('--foo oops-bar --baz "queue some stuff"', $this->request->getOptionString(true));
+        $this->assertSame('users/21/profile', $this->request->getPath());
     }
 
     public function testParsingMalformed3()
@@ -207,9 +207,9 @@ public function testParsingMalformed3()
         // reinstantiate it to force parsing
         $this->request = new CLIRequest(new App());
 
-        $this->assertEquals('-foo oops -baz "queue some stuff"', $this->request->getOptionString());
-        $this->assertEquals('--foo oops --baz "queue some stuff"', $this->request->getOptionString(true));
-        $this->assertEquals('users/21/profile/bar', $this->request->getPath());
+        $this->assertSame('-foo oops -baz "queue some stuff"', $this->request->getOptionString());
+        $this->assertSame('--foo oops --baz "queue some stuff"', $this->request->getOptionString(true));
+        $this->assertSame('users/21/profile/bar', $this->request->getPath());
     }
 
     //--------------------------------------------------------------------
@@ -219,8 +219,8 @@ public function testFetchGlobalsSingleValue()
         $_POST['foo'] = 'bar';
         $_GET['bar']  = 'baz';
 
-        $this->assertEquals('bar', $this->request->fetchGlobal('post', 'foo'));
-        $this->assertEquals('baz', $this->request->fetchGlobal('get', 'bar'));
+        $this->assertSame('bar', $this->request->fetchGlobal('post', 'foo'));
+        $this->assertSame('baz', $this->request->fetchGlobal('get', 'bar'));
     }
 
     public function testFetchGlobalsReturnsNullWhenNotFound()
@@ -235,8 +235,8 @@ public function testFetchGlobalsFiltersValues()
             'bar' => 'baz',
         ]);
 
-        $this->assertEquals('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED));
-        $this->assertEquals('baz', $this->request->fetchGlobal('post', 'bar'));
+        $this->assertSame('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED));
+        $this->assertSame('baz', $this->request->fetchGlobal('post', 'bar'));
     }
 
     public function testFetchGlobalsWithFilterFlag()
@@ -246,8 +246,8 @@ public function testFetchGlobalsWithFilterFlag()
             'bar' => 'baz',
         ]);
 
-        $this->assertEquals('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
-        $this->assertEquals('baz', $this->request->fetchGlobal('post', 'bar'));
+        $this->assertSame('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
+        $this->assertSame('baz', $this->request->fetchGlobal('post', 'bar'));
     }
 
     public function testFetchGlobalReturnsAllWhenEmpty()
@@ -260,7 +260,7 @@ public function testFetchGlobalReturnsAllWhenEmpty()
         ];
         $this->request->setGlobal('post', $post);
 
-        $this->assertEquals($post, $this->request->fetchGlobal('post'));
+        $this->assertSame($post, $this->request->fetchGlobal('post'));
     }
 
     public function testFetchGlobalFiltersAllValues()
@@ -279,7 +279,7 @@ public function testFetchGlobalFiltersAllValues()
             'yyy' => 'zzz%3Cscript%3E',
         ];
 
-        $this->assertEquals($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED));
+        $this->assertSame($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED));
     }
 
     public function testFetchGlobalFilterWithFlagAllValues()
@@ -298,7 +298,7 @@ public function testFetchGlobalFilterWithFlagAllValues()
             'yyy' => 'zzz%3Cscript%3E',
         ];
 
-        $this->assertEquals($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
+        $this->assertSame($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
     }
 
     public function testFetchGlobalReturnsSelectedKeys()
@@ -315,7 +315,7 @@ public function testFetchGlobalReturnsSelectedKeys()
             'bar' => 'baz',
         ];
 
-        $this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar']));
+        $this->assertSame($expected, $this->request->fetchGlobal('post', ['foo', 'bar']));
     }
 
     public function testFetchGlobalFiltersSelectedValues()
@@ -332,7 +332,7 @@ public function testFetchGlobalFiltersSelectedValues()
             'bar' => 'baz%3Cscript%3E',
         ];
 
-        $this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED));
+        $this->assertSame($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED));
     }
 
     public function testFetchGlobalFilterWithFlagSelectedValues()
@@ -349,7 +349,7 @@ public function testFetchGlobalFilterWithFlagSelectedValues()
             'bar' => 'baz%3Cscript%3E',
         ];
 
-        $this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
+        $this->assertSame($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
     }
 
     /**
@@ -371,7 +371,7 @@ public function testFetchGlobalReturnsArrayValues()
         $this->request->setGlobal('post', $post);
         $result = $this->request->fetchGlobal('post');
 
-        $this->assertEquals($post, $result);
+        $this->assertSame($post, $result);
         $this->assertIsArray($result['ANNOUNCEMENTS']);
         $this->assertCount(2, $result['ANNOUNCEMENTS']);
     }
@@ -387,7 +387,7 @@ public function testFetchGlobalWithArrayTop()
         ];
         $this->request->setGlobal('post', $post);
 
-        $this->assertEquals(['address' => ['zipcode' => 90210]], $this->request->fetchGlobal('post', 'clients'));
+        $this->assertSame(['address' => ['zipcode' => 90210]], $this->request->fetchGlobal('post', 'clients'));
     }
 
     public function testFetchGlobalWithArrayChildNumeric()
@@ -408,7 +408,7 @@ public function testFetchGlobalWithArrayChildNumeric()
         ];
         $this->request->setGlobal('post', $post);
 
-        $this->assertEquals(['zipcode' => 60610], $this->request->fetchGlobal('post', 'clients[1][address]'));
+        $this->assertSame(['zipcode' => 60610], $this->request->fetchGlobal('post', 'clients[1][address]'));
     }
 
     public function testFetchGlobalWithArrayChildElement()
@@ -422,7 +422,7 @@ public function testFetchGlobalWithArrayChildElement()
         ];
         $this->request->setGlobal('post', $post);
 
-        $this->assertEquals(['zipcode' => 90210], $this->request->fetchGlobal('post', 'clients[address]'));
+        $this->assertSame(['zipcode' => 90210], $this->request->fetchGlobal('post', 'clients[address]'));
         $this->assertNull($this->request->fetchGlobal('post', 'clients[zipcode]'));
     }
 
@@ -438,43 +438,27 @@ public function testFetchGlobalWithKeylessArrayChildElement()
         ];
         $this->request->setGlobal('post', $post);
 
-        $this->assertEquals([['a']], $this->request->fetchGlobal('post', 'clients[stuff]'));
+        $this->assertSame([['a']], $this->request->fetchGlobal('post', 'clients[stuff]'));
     }
 
     public function testFetchGlobalWithArrayLastElement()
     {
-        $post = [
-            'clients' => [
-                'address' => [
-                    'zipcode' => 90210,
-                ],
-            ],
-        ];
+        $post = ['clients' => ['address' => ['zipcode' => 90210]]];
         $this->request->setGlobal('post', $post);
 
-        $this->assertEquals(90210, $this->request->fetchGlobal('post', 'clients[address][zipcode]'));
+        $this->assertSame('90210', $this->request->fetchGlobal('post', 'clients[address][zipcode]'));
     }
 
     public function testFetchGlobalWithEmptyNotation()
     {
         $expected = [
-            [
-                'address' => [
-                    'zipcode' => 90210,
-                ],
-            ],
-            [
-                'address' => [
-                    'zipcode' => 60610,
-                ],
-            ],
-        ];
-        $post = [
-            'clients' => $expected,
+            ['address' => ['zipcode' => '90210']],
+            ['address' => ['zipcode' => '60610']],
         ];
+        $post = ['clients' => $expected];
         $this->request->setGlobal('post', $post);
 
-        $this->assertEquals($expected, $this->request->fetchGlobal('post', 'clients[]'));
+        $this->assertSame($expected, $this->request->fetchGlobal('post', 'clients[]'));
     }
 
     //--------------------------------------------------------------------
@@ -530,14 +514,14 @@ public function ipAddressChecks()
      */
     public function testValidIPAddress($expected, $address, $type = null)
     {
-        $this->assertEquals($expected, $this->request->isValidIP($address, $type));
+        $this->assertSame($expected, $this->request->isValidIP($address, $type));
     }
 
     //--------------------------------------------------------------------
 
     public function testGetIPAddressDefault()
     {
-        $this->assertEquals('0.0.0.0', $this->request->getIPAddress());
+        $this->assertSame('0.0.0.0', $this->request->getIPAddress());
     }
 
     public function testGetIPAddressNormal()
@@ -545,9 +529,9 @@ public function testGetIPAddressNormal()
         $expected               = '123.123.123.123';
         $_SERVER['REMOTE_ADDR'] = $expected;
         $this->request          = new Request(new App());
-        $this->assertEquals($expected, $this->request->getIPAddress());
+        $this->assertSame($expected, $this->request->getIPAddress());
         // call a second time to exercise the initial conditional block in getIPAddress()
-        $this->assertEquals($expected, $this->request->getIPAddress());
+        $this->assertSame($expected, $this->request->getIPAddress());
     }
 
     public function testGetIPAddressThruProxy()
@@ -560,7 +544,7 @@ public function testGetIPAddressThruProxy()
         $this->request                   = new Request($config);
 
         // we should see the original forwarded address
-        $this->assertEquals($expected, $this->request->getIPAddress());
+        $this->assertSame($expected, $this->request->getIPAddress());
     }
 
     public function testGetIPAddressThruProxyInvalid()
@@ -573,7 +557,7 @@ public function testGetIPAddressThruProxyInvalid()
         $this->request                   = new Request($config);
 
         // spoofed address invalid
-        $this->assertEquals('10.0.1.200', $this->request->getIPAddress());
+        $this->assertSame('10.0.1.200', $this->request->getIPAddress());
     }
 
     public function testGetIPAddressThruProxyNotWhitelisted()
@@ -586,7 +570,7 @@ public function testGetIPAddressThruProxyNotWhitelisted()
         $this->request                   = new Request($config);
 
         // spoofed address invalid
-        $this->assertEquals('10.10.1.200', $this->request->getIPAddress());
+        $this->assertSame('10.10.1.200', $this->request->getIPAddress());
     }
 
     public function testGetIPAddressThruProxySubnet()
@@ -599,7 +583,7 @@ public function testGetIPAddressThruProxySubnet()
         $this->request                   = new Request($config);
 
         // we should see the original forwarded address
-        $this->assertEquals($expected, $this->request->getIPAddress());
+        $this->assertSame($expected, $this->request->getIPAddress());
     }
 
     public function testGetIPAddressThruProxyOutofSubnet()
@@ -612,7 +596,7 @@ public function testGetIPAddressThruProxyOutofSubnet()
         $this->request                   = new Request($config);
 
         // we should see the original forwarded address
-        $this->assertEquals('192.168.5.21', $this->request->getIPAddress());
+        $this->assertSame('192.168.5.21', $this->request->getIPAddress());
     }
 
     //FIXME getIPAddress should have more testing, to 100% code coverage
@@ -622,8 +606,8 @@ public function testGetIPAddressThruProxyOutofSubnet()
     public function testMethodReturnsRightStuff()
     {
         // Defaults method to CLI now.
-        $this->assertEquals('cli', $this->request->getMethod());
-        $this->assertEquals('CLI', $this->request->getMethod(true));
+        $this->assertSame('cli', $this->request->getMethod());
+        $this->assertSame('CLI', $this->request->getMethod(true));
     }
 
     //---------------------------------------------------------------------
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index 96d9187d60d7..abd3ca98ed23 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -34,8 +34,6 @@ protected function getRequest(array $options = [])
         return new MockCURLRequest(($app = new App()), $uri, new Response($app), $options);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/4707
      */
@@ -43,31 +41,25 @@ public function testPrepareURLIgnoresAppConfig()
     {
         config('App')->baseURL = 'http://example.com/fruit/';
 
-        $request = $this->getRequest([
-            'base_uri' => 'http://example.com/v1/',
-        ]);
+        $request = $this->getRequest(['base_uri' => 'http://example.com/v1/']);
 
         $method = $this->getPrivateMethodInvoker($request, 'prepareURL');
 
-        $this->assertEquals('http://example.com/v1/bananas', $method('bananas'));
+        $this->assertSame('http://example.com/v1/bananas', $method('bananas'));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/1029
      */
     public function testGetRemembersBaseURI()
     {
-        $request = $this->getRequest([
-            'base_uri' => 'http://www.foo.com/api/v1/',
-        ]);
+        $request = $this->getRequest(['base_uri' => 'http://www.foo.com/api/v1/']);
 
         $request->get('products');
 
         $options = $request->curl_options;
 
-        $this->assertEquals('http://www.foo.com/api/v1/products', $options[CURLOPT_URL]);
+        $this->assertSame('http://www.foo.com/api/v1/products', $options[CURLOPT_URL]);
     }
 
     /**
@@ -75,94 +67,77 @@ public function testGetRemembersBaseURI()
      */
     public function testGetRemembersBaseURIWithHelperMethod()
     {
-        $request = Services::curlrequest([
-            'base_uri' => 'http://www.foo.com/api/v1/',
-        ]);
+        $request = Services::curlrequest(['base_uri' => 'http://www.foo.com/api/v1/']);
 
         $uri = $this->getPrivateProperty($request, 'baseURI');
-        $this->assertEquals('www.foo.com', $uri->getHost());
-        $this->assertEquals('/api/v1/', $uri->getPath());
+        $this->assertSame('www.foo.com', $uri->getHost());
+        $this->assertSame('/api/v1/', $uri->getPath());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSendReturnsResponse()
     {
         $output = 'Howdy Stranger.';
 
-        $response = $this->request->setOutput($output)
-            ->send('get', 'http://example.com');
+        $response = $this->request->setOutput($output)->send('get', 'http://example.com');
 
         $this->assertInstanceOf('CodeIgniter\\HTTP\\Response', $response);
-        $this->assertEquals($output, $response->getBody());
+        $this->assertSame($output, $response->getBody());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetSetsCorrectMethod()
     {
         $this->request->get('http://example.com');
 
-        $this->assertEquals('get', $this->request->getMethod());
+        $this->assertSame('get', $this->request->getMethod());
 
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
-        $this->assertEquals('GET', $options[CURLOPT_CUSTOMREQUEST]);
+        $this->assertSame('GET', $options[CURLOPT_CUSTOMREQUEST]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testDeleteSetsCorrectMethod()
     {
         $this->request->delete('http://example.com');
 
-        $this->assertEquals('delete', $this->request->getMethod());
+        $this->assertSame('delete', $this->request->getMethod());
 
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
-        $this->assertEquals('DELETE', $options[CURLOPT_CUSTOMREQUEST]);
+        $this->assertSame('DELETE', $options[CURLOPT_CUSTOMREQUEST]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testHeadSetsCorrectMethod()
     {
         $this->request->head('http://example.com');
 
-        $this->assertEquals('head', $this->request->getMethod());
+        $this->assertSame('head', $this->request->getMethod());
 
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
-        $this->assertEquals('HEAD', $options[CURLOPT_CUSTOMREQUEST]);
+        $this->assertSame('HEAD', $options[CURLOPT_CUSTOMREQUEST]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testOptionsSetsCorrectMethod()
     {
         $this->request->options('http://example.com');
 
-        $this->assertEquals('options', $this->request->getMethod());
+        $this->assertSame('options', $this->request->getMethod());
 
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
-        $this->assertEquals('OPTIONS', $options[CURLOPT_CUSTOMREQUEST]);
+        $this->assertSame('OPTIONS', $options[CURLOPT_CUSTOMREQUEST]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testOptionsBaseURIOption()
     {
-        $options = [
-            'base_uri' => 'http://www.foo.com/api/v1/',
-        ];
+        $options = ['base_uri' => 'http://www.foo.com/api/v1/'];
         $request = $this->getRequest($options);
 
-        $this->assertEquals('http://www.foo.com/api/v1/', $request->getBaseURI());
+        $this->assertSame('http://www.foo.com/api/v1/', $request->getBaseURI()->__toString());
     }
 
     public function testOptionsBaseURIOverride()
@@ -173,11 +148,9 @@ public function testOptionsBaseURIOverride()
         ];
         $request = $this->getRequest($options);
 
-        $this->assertEquals('http://bogus/com', $request->getBaseURI());
+        $this->assertSame('http://bogus/com', $request->getBaseURI()->__toString());
     }
 
-    //--------------------------------------------------------------------
-
     public function testOptionsHeaders()
     {
         $options = [
@@ -188,11 +161,9 @@ public function testOptionsHeaders()
         $this->assertNull($request->header('fruit'));
 
         $request = $this->getRequest($options);
-        $this->assertEquals('apple', $request->header('fruit')->getValue());
+        $this->assertSame('apple', $request->header('fruit')->getValue());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @backupGlobals enabled
      */
@@ -209,7 +180,7 @@ public function testOptionHeadersUsingPopulate()
         $request = $this->getRequest($options);
         $request->get('example');
         // we fill the Accept-Language header from _SERVER when no headers are defined for the request
-        $this->assertEquals('en-US', $request->header('Accept-Language')->getValue());
+        $this->assertSame('en-US', $request->header('Accept-Language')->getValue());
         // but we skip Host header - since it would corrupt the request
         $this->assertNull($request->header('Host'));
         // and Accept-Encoding
@@ -236,12 +207,10 @@ public function testOptionHeadersNotUsingPopulate()
         $request->get('example');
         // if headers for the request are defined we use them
         $this->assertNull($request->header('Accept-Language'));
-        $this->assertEquals('www.foo.com', $request->header('Host')->getValue());
-        $this->assertEquals('', $request->header('Accept-Encoding')->getValue());
+        $this->assertSame('www.foo.com', $request->header('Host')->getValue());
+        $this->assertSame('', $request->header('Accept-Encoding')->getValue());
     }
 
-    //--------------------------------------------------------------------
-
     public function testOptionsDelay()
     {
         $options = [
@@ -249,84 +218,72 @@ public function testOptionsDelay()
             'headers' => ['fruit' => 'apple'],
         ];
         $request = $this->getRequest();
-        $this->assertEquals(0.0, $request->getDelay());
+        $this->assertSame(0.0, $request->getDelay());
 
         $request = $this->getRequest($options);
-        $this->assertEquals(2.0, $request->getDelay());
+        $this->assertSame(2.0, $request->getDelay());
     }
 
-    //--------------------------------------------------------------------
-
     public function testPatchSetsCorrectMethod()
     {
         $this->request->patch('http://example.com');
 
-        $this->assertEquals('patch', $this->request->getMethod());
+        $this->assertSame('patch', $this->request->getMethod());
 
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
-        $this->assertEquals('PATCH', $options[CURLOPT_CUSTOMREQUEST]);
+        $this->assertSame('PATCH', $options[CURLOPT_CUSTOMREQUEST]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testPostSetsCorrectMethod()
     {
         $this->request->post('http://example.com');
 
-        $this->assertEquals('post', $this->request->getMethod());
+        $this->assertSame('post', $this->request->getMethod());
 
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
-        $this->assertEquals('POST', $options[CURLOPT_CUSTOMREQUEST]);
+        $this->assertSame('POST', $options[CURLOPT_CUSTOMREQUEST]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testPutSetsCorrectMethod()
     {
         $this->request->put('http://example.com');
 
-        $this->assertEquals('put', $this->request->getMethod());
+        $this->assertSame('put', $this->request->getMethod());
 
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
-        $this->assertEquals('PUT', $options[CURLOPT_CUSTOMREQUEST]);
+        $this->assertSame('PUT', $options[CURLOPT_CUSTOMREQUEST]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testCustomMethodSetsCorrectMethod()
     {
         $this->request->request('custom', 'http://example.com');
 
-        $this->assertEquals('custom', $this->request->getMethod());
+        $this->assertSame('custom', $this->request->getMethod());
 
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
-        $this->assertEquals('CUSTOM', $options[CURLOPT_CUSTOMREQUEST]);
+        $this->assertSame('CUSTOM', $options[CURLOPT_CUSTOMREQUEST]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testRequestMethodGetsSanitized()
     {
         $this->request->request('<script>Custom</script>', 'http://example.com');
 
-        $this->assertEquals('custom', $this->request->getMethod());
+        $this->assertSame('custom', $this->request->getMethod());
 
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
-        $this->assertEquals('CUSTOM', $options[CURLOPT_CUSTOMREQUEST]);
+        $this->assertSame('CUSTOM', $options[CURLOPT_CUSTOMREQUEST]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testRequestSetsBasicCurlOptions()
     {
         $this->request->request('get', 'http://example.com');
@@ -334,7 +291,7 @@ public function testRequestSetsBasicCurlOptions()
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_URL, $options);
-        $this->assertEquals('http://example.com', $options[CURLOPT_URL]);
+        $this->assertSame('http://example.com', $options[CURLOPT_URL]);
 
         $this->assertArrayHasKey(CURLOPT_RETURNTRANSFER, $options);
         $this->assertTrue($options[CURLOPT_RETURNTRANSFER]);
@@ -346,14 +303,12 @@ public function testRequestSetsBasicCurlOptions()
         $this->assertTrue($options[CURLOPT_FRESH_CONNECT]);
 
         $this->assertArrayHasKey(CURLOPT_TIMEOUT_MS, $options);
-        $this->assertEquals(0.0, $options[CURLOPT_TIMEOUT_MS]);
+        $this->assertSame(0.0, $options[CURLOPT_TIMEOUT_MS]);
 
         $this->assertArrayHasKey(CURLOPT_CONNECTTIMEOUT_MS, $options);
-        $this->assertEquals(150 * 1000, $options[CURLOPT_CONNECTTIMEOUT_MS]);
+        $this->assertSame(150000.0, $options[CURLOPT_CONNECTTIMEOUT_MS]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testAuthBasicOption()
     {
         $this->request->request('get', 'http://example.com', [
@@ -366,14 +321,12 @@ public function testAuthBasicOption()
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_USERPWD, $options);
-        $this->assertEquals('username:password', $options[CURLOPT_USERPWD]);
+        $this->assertSame('username:password', $options[CURLOPT_USERPWD]);
 
         $this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options);
-        $this->assertEquals(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]);
+        $this->assertSame(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testAuthBasicOptionExplicit()
     {
         $this->request->request('get', 'http://example.com', [
@@ -387,14 +340,12 @@ public function testAuthBasicOptionExplicit()
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_USERPWD, $options);
-        $this->assertEquals('username:password', $options[CURLOPT_USERPWD]);
+        $this->assertSame('username:password', $options[CURLOPT_USERPWD]);
 
         $this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options);
-        $this->assertEquals(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]);
+        $this->assertSame(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testAuthDigestOption()
     {
         $output = "HTTP/1.1 401 Unauthorized
@@ -425,18 +376,16 @@ public function testAuthDigestOption()
 
         $options = $this->request->curl_options;
 
-        $this->assertEquals('<title>Update success! config</title>', $response->getBody());
-        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertSame('<title>Update success! config</title>', $response->getBody());
+        $this->assertSame(200, $response->getStatusCode());
 
         $this->assertArrayHasKey(CURLOPT_USERPWD, $options);
-        $this->assertEquals('username:password', $options[CURLOPT_USERPWD]);
+        $this->assertSame('username:password', $options[CURLOPT_USERPWD]);
 
         $this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options);
-        $this->assertEquals(CURLAUTH_DIGEST, $options[CURLOPT_HTTPAUTH]);
+        $this->assertSame(CURLAUTH_DIGEST, $options[CURLOPT_HTTPAUTH]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetAuthBasic()
     {
         $this->request->setAuth('username', 'password')->get('http://example.com');
@@ -444,10 +393,10 @@ public function testSetAuthBasic()
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_USERPWD, $options);
-        $this->assertEquals('username:password', $options[CURLOPT_USERPWD]);
+        $this->assertSame('username:password', $options[CURLOPT_USERPWD]);
 
         $this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options);
-        $this->assertEquals(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]);
+        $this->assertSame(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]);
     }
 
     public function testSetAuthDigest()
@@ -474,18 +423,16 @@ public function testSetAuthDigest()
 
         $options = $this->request->curl_options;
 
-        $this->assertEquals('<title>Update success! config</title>', $response->getBody());
-        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertSame('<title>Update success! config</title>', $response->getBody());
+        $this->assertSame(200, $response->getStatusCode());
 
         $this->assertArrayHasKey(CURLOPT_USERPWD, $options);
-        $this->assertEquals('username:password', $options[CURLOPT_USERPWD]);
+        $this->assertSame('username:password', $options[CURLOPT_USERPWD]);
 
         $this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options);
-        $this->assertEquals(CURLAUTH_DIGEST, $options[CURLOPT_HTTPAUTH]);
+        $this->assertSame(CURLAUTH_DIGEST, $options[CURLOPT_HTTPAUTH]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testCertOption()
     {
         $file = __FILE__;
@@ -497,7 +444,7 @@ public function testCertOption()
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_SSLCERT, $options);
-        $this->assertEquals($file, $options[CURLOPT_SSLCERT]);
+        $this->assertSame($file, $options[CURLOPT_SSLCERT]);
     }
 
     public function testCertOptionWithPassword()
@@ -514,10 +461,10 @@ public function testCertOptionWithPassword()
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_SSLCERT, $options);
-        $this->assertEquals($file, $options[CURLOPT_SSLCERT]);
+        $this->assertSame($file, $options[CURLOPT_SSLCERT]);
 
         $this->assertArrayHasKey(CURLOPT_SSLCERTPASSWD, $options);
-        $this->assertEquals('password', $options[CURLOPT_SSLCERTPASSWD]);
+        $this->assertSame('password', $options[CURLOPT_SSLCERTPASSWD]);
     }
 
     public function testMissingCertOption()
@@ -530,8 +477,6 @@ public function testMissingCertOption()
         ]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSSLVerification()
     {
         $file = __FILE__;
@@ -544,10 +489,10 @@ public function testSSLVerification()
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_CAINFO, $options);
-        $this->assertEquals($file, $options[CURLOPT_CAINFO]);
+        $this->assertSame($file, $options[CURLOPT_CAINFO]);
 
         $this->assertArrayHasKey(CURLOPT_SSL_VERIFYPEER, $options);
-        $this->assertEquals(1, $options[CURLOPT_SSL_VERIFYPEER]);
+        $this->assertSame(1, $options[CURLOPT_SSL_VERIFYPEER]);
     }
 
     public function testSSLWithBadKey()
@@ -561,8 +506,6 @@ public function testSSLWithBadKey()
         ]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testDebugOptionTrue()
     {
         $this->request->request('get', 'http://example.com', [
@@ -572,7 +515,7 @@ public function testDebugOptionTrue()
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_VERBOSE, $options);
-        $this->assertEquals(1, $options[CURLOPT_VERBOSE]);
+        $this->assertSame(1, $options[CURLOPT_VERBOSE]);
 
         $this->assertArrayHasKey(CURLOPT_STDERR, $options);
         $this->assertIsResource($options[CURLOPT_STDERR]);
@@ -601,14 +544,12 @@ public function testDebugOptionFile()
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_VERBOSE, $options);
-        $this->assertEquals(1, $options[CURLOPT_VERBOSE]);
+        $this->assertSame(1, $options[CURLOPT_VERBOSE]);
 
         $this->assertArrayHasKey(CURLOPT_STDERR, $options);
         $this->assertIsResource($options[CURLOPT_STDERR]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testDecodeContent()
     {
         $this->request->setHeader('Accept-Encoding', 'cobol');
@@ -619,7 +560,7 @@ public function testDecodeContent()
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_ENCODING, $options);
-        $this->assertEquals('cobol', $options[CURLOPT_ENCODING]);
+        $this->assertSame('cobol', $options[CURLOPT_ENCODING]);
     }
 
     public function testDecodeContentWithoutAccept()
@@ -632,13 +573,11 @@ public function testDecodeContentWithoutAccept()
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_ENCODING, $options);
-        $this->assertEquals('', $options[CURLOPT_ENCODING]);
+        $this->assertSame('', $options[CURLOPT_ENCODING]);
         $this->assertArrayHasKey(CURLOPT_HTTPHEADER, $options);
-        $this->assertEquals('Accept-Encoding', $options[CURLOPT_HTTPHEADER]);
+        $this->assertSame('Accept-Encoding', $options[CURLOPT_HTTPHEADER]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testAllowRedirectsOptionFalse()
     {
         $this->request->request('get', 'http://example.com', [
@@ -648,7 +587,7 @@ public function testAllowRedirectsOptionFalse()
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options);
-        $this->assertEquals(0, $options[CURLOPT_FOLLOWLOCATION]);
+        $this->assertSame(0, $options[CURLOPT_FOLLOWLOCATION]);
 
         $this->assertArrayNotHasKey(CURLOPT_MAXREDIRS, $options);
         $this->assertArrayNotHasKey(CURLOPT_REDIR_PROTOCOLS, $options);
@@ -663,12 +602,12 @@ public function testAllowRedirectsOptionTrue()
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options);
-        $this->assertEquals(1, $options[CURLOPT_FOLLOWLOCATION]);
+        $this->assertSame(1, $options[CURLOPT_FOLLOWLOCATION]);
 
         $this->assertArrayHasKey(CURLOPT_MAXREDIRS, $options);
-        $this->assertEquals(5, $options[CURLOPT_MAXREDIRS]);
+        $this->assertSame(5, $options[CURLOPT_MAXREDIRS]);
         $this->assertArrayHasKey(CURLOPT_REDIR_PROTOCOLS, $options);
-        $this->assertEquals(CURLPROTO_HTTP | CURLPROTO_HTTPS, $options[CURLOPT_REDIR_PROTOCOLS]);
+        $this->assertSame(CURLPROTO_HTTP | CURLPROTO_HTTPS, $options[CURLOPT_REDIR_PROTOCOLS]);
     }
 
     public function testAllowRedirectsOptionDefaults()
@@ -680,7 +619,7 @@ public function testAllowRedirectsOptionDefaults()
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options);
-        $this->assertEquals(1, $options[CURLOPT_FOLLOWLOCATION]);
+        $this->assertSame(1, $options[CURLOPT_FOLLOWLOCATION]);
 
         $this->assertArrayHasKey(CURLOPT_MAXREDIRS, $options);
         $this->assertArrayHasKey(CURLOPT_REDIR_PROTOCOLS, $options);
@@ -695,14 +634,12 @@ public function testAllowRedirectsArray()
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options);
-        $this->assertEquals(1, $options[CURLOPT_FOLLOWLOCATION]);
+        $this->assertSame(1, $options[CURLOPT_FOLLOWLOCATION]);
 
         $this->assertArrayHasKey(CURLOPT_MAXREDIRS, $options);
-        $this->assertEquals(2, $options[CURLOPT_MAXREDIRS]);
+        $this->assertSame(2, $options[CURLOPT_MAXREDIRS]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSendWithQuery()
     {
         $request = $this->getRequest([
@@ -717,7 +654,7 @@ public function testSendWithQuery()
 
         $options = $request->curl_options;
 
-        $this->assertEquals('http://www.foo.com/api/v1/products?name=Henry&d.t=value', $options[CURLOPT_URL]);
+        $this->assertSame('http://www.foo.com/api/v1/products?name=Henry&d.t=value', $options[CURLOPT_URL]);
     }
 
     //--------------------------------------------------------------------
@@ -731,7 +668,7 @@ public function testSendWithDelay()
         $request->get('products');
 
         // we still need to check the code coverage to make sure this was done
-        $this->assertEquals(1.0, $request->getDelay());
+        $this->assertSame(1.0, $request->getDelay());
     }
 
     //--------------------------------------------------------------------
@@ -744,7 +681,7 @@ public function testSendContinued()
 
         $request->setOutput("HTTP/1.1 100 Continue\x0d\x0a\x0d\x0aHi there");
         $response = $request->get('answer');
-        $this->assertEquals('Hi there', $response->getBody());
+        $this->assertSame('Hi there', $response->getBody());
     }
 
     /**
@@ -775,7 +712,7 @@ public function testSendContinuedWithManyHeaders()
         $request->setOutput($output);
         $response = $request->get('answer');
 
-        $this->assertEquals('<title>Update success! config</title>', $response->getBody());
+        $this->assertSame('<title>Update success! config</title>', $response->getBody());
 
         $responseHeaderKeys = [
             'Cache-control',
@@ -789,9 +726,9 @@ public function testSendContinuedWithManyHeaders()
             'Pragma',
             'Transfer-Encoding',
         ];
-        $this->assertEquals($responseHeaderKeys, array_keys($response->headers()));
+        $this->assertSame($responseHeaderKeys, array_keys($response->headers()));
 
-        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertSame(200, $response->getStatusCode());
     }
 
     //--------------------------------------------------------------------
@@ -804,7 +741,7 @@ public function testSplitResponse()
 
         $request->setOutput("Accept: text/html\x0d\x0a\x0d\x0aHi there");
         $response = $request->get('answer');
-        $this->assertEquals('Hi there', $response->getBody());
+        $this->assertSame('Hi there', $response->getBody());
     }
 
     //--------------------------------------------------------------------
@@ -819,8 +756,8 @@ public function testApplyBody()
         $request->setOutput('Hi there');
         $response = $request->post('answer');
 
-        $this->assertEquals('Hi there', $response->getBody());
-        $this->assertEquals('name=George', $request->curl_options[CURLOPT_POSTFIELDS]);
+        $this->assertSame('Hi there', $response->getBody());
+        $this->assertSame('name=George', $request->curl_options[CURLOPT_POSTFIELDS]);
     }
 
     //--------------------------------------------------------------------
@@ -834,8 +771,8 @@ public function testResponseHeaders()
         $request->setOutput("HTTP/2.0 234 Ohoh\x0d\x0aAccept: text/html\x0d\x0a\x0d\x0aHi there");
         $response = $request->get('bogus');
 
-        $this->assertEquals('2.0', $response->getProtocolVersion());
-        $this->assertEquals(234, $response->getStatusCode());
+        $this->assertSame('2.0', $response->getProtocolVersion());
+        $this->assertSame(234, $response->getStatusCode());
     }
 
     public function testResponseHeadersShortProtocol()
@@ -848,12 +785,10 @@ public function testResponseHeadersShortProtocol()
         $request->setOutput("HTTP/2 235 Ohoh\x0d\x0aAccept: text/html\x0d\x0a\x0d\x0aHi there shortie");
         $response = $request->get('bogus');
 
-        $this->assertEquals('2.0', $response->getProtocolVersion());
-        $this->assertEquals(235, $response->getStatusCode());
+        $this->assertSame('2.0', $response->getProtocolVersion());
+        $this->assertSame(235, $response->getStatusCode());
     }
 
-    //--------------------------------------------------------------------
-
     public function testPostFormEncoded()
     {
         $params = [
@@ -867,13 +802,13 @@ public function testPostFormEncoded()
             'form_params' => $params,
         ]);
 
-        $this->assertEquals('post', $this->request->getMethod());
+        $this->assertSame('post', $this->request->getMethod());
 
         $options = $this->request->curl_options;
 
         $expected = http_build_query($params);
         $this->assertArrayHasKey(CURLOPT_POSTFIELDS, $options);
-        $this->assertEquals($expected, $options[CURLOPT_POSTFIELDS]);
+        $this->assertSame($expected, $options[CURLOPT_POSTFIELDS]);
     }
 
     public function testPostFormMultipart()
@@ -890,16 +825,14 @@ public function testPostFormMultipart()
             'multipart' => $params,
         ]);
 
-        $this->assertEquals('post', $this->request->getMethod());
+        $this->assertSame('post', $this->request->getMethod());
 
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_POSTFIELDS, $options);
-        $this->assertEquals($params, $options[CURLOPT_POSTFIELDS]);
+        $this->assertSame($params, $options[CURLOPT_POSTFIELDS]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetForm()
     {
         $params = [
@@ -912,7 +845,7 @@ public function testSetForm()
 
         $this->request->setForm($params)->post('/post');
 
-        $this->assertEquals(
+        $this->assertSame(
             http_build_query($params),
             $this->request->curl_options[CURLOPT_POSTFIELDS]
         );
@@ -921,14 +854,12 @@ public function testSetForm()
 
         $this->request->setForm($params, true)->post('/post');
 
-        $this->assertEquals(
+        $this->assertSame(
             $params,
             $this->request->curl_options[CURLOPT_POSTFIELDS]
         );
     }
 
-    //--------------------------------------------------------------------
-
     public function testJSONData()
     {
         $params = [
@@ -942,14 +873,12 @@ public function testJSONData()
             'json' => $params,
         ]);
 
-        $this->assertEquals('post', $this->request->getMethod());
+        $this->assertSame('post', $this->request->getMethod());
 
         $expected = json_encode($params);
-        $this->assertEquals($expected, $this->request->getBody());
+        $this->assertSame($expected, $this->request->getBody());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetJSON()
     {
         $params = [
@@ -961,12 +890,10 @@ public function testSetJSON()
         ];
         $this->request->setJSON($params)->post('/post');
 
-        $this->assertEquals(json_encode($params), $this->request->getBody());
-        $this->assertEquals('application/json', $this->request->getHeaderLine('Content-Type'));
+        $this->assertSame(json_encode($params), $this->request->getBody());
+        $this->assertSame('application/json', $this->request->getHeaderLine('Content-Type'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testHTTPv1()
     {
         $this->request->request('POST', '/post', [
@@ -976,7 +903,7 @@ public function testHTTPv1()
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options);
-        $this->assertEquals(CURL_HTTP_VERSION_1_0, $options[CURLOPT_HTTP_VERSION]);
+        $this->assertSame(CURL_HTTP_VERSION_1_0, $options[CURLOPT_HTTP_VERSION]);
     }
 
     public function testHTTPv11()
@@ -988,11 +915,9 @@ public function testHTTPv11()
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options);
-        $this->assertEquals(CURL_HTTP_VERSION_1_1, $options[CURLOPT_HTTP_VERSION]);
+        $this->assertSame(CURL_HTTP_VERSION_1_1, $options[CURLOPT_HTTP_VERSION]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testCookieOption()
     {
         $holder = SUPPORTPATH . 'HTTP/Files/CookiesHolder.txt';
@@ -1003,9 +928,9 @@ public function testCookieOption()
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_COOKIEJAR, $options);
-        $this->assertEquals($holder, $options[CURLOPT_COOKIEJAR]);
+        $this->assertSame($holder, $options[CURLOPT_COOKIEJAR]);
         $this->assertArrayHasKey(CURLOPT_COOKIEFILE, $options);
-        $this->assertEquals($holder, $options[CURLOPT_COOKIEFILE]);
+        $this->assertSame($holder, $options[CURLOPT_COOKIEFILE]);
     }
 
     public function testUserAgentOption()
@@ -1019,6 +944,6 @@ public function testUserAgentOption()
         $options = $this->request->curl_options;
 
         $this->assertArrayHasKey(CURLOPT_USERAGENT, $options);
-        $this->assertEquals($agent, $options[CURLOPT_USERAGENT]);
+        $this->assertSame($agent, $options[CURLOPT_USERAGENT]);
     }
 }
diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php
index cc4be4750ecf..389b017fa574 100644
--- a/tests/system/HTTP/ContentSecurityPolicyTest.php
+++ b/tests/system/HTTP/ContentSecurityPolicyTest.php
@@ -443,7 +443,7 @@ public function testBodyEmpty()
         $body = '';
         $this->response->setBody($body);
         $this->csp->finalize($this->response);
-        $this->assertEquals($body, $this->response->getBody());
+        $this->assertSame($body, $this->response->getBody());
     }
 
     /**
diff --git a/tests/system/HTTP/DownloadResponseTest.php b/tests/system/HTTP/DownloadResponseTest.php
index 8251245d6537..797987663619 100644
--- a/tests/system/HTTP/DownloadResponseTest.php
+++ b/tests/system/HTTP/DownloadResponseTest.php
@@ -46,7 +46,7 @@ public function testSetDateRemembersDateInUTC()
 
         $header = $response->getHeaderLine('Date');
 
-        $this->assertEquals($date->format('D, d M Y H:i:s') . ' GMT', $header);
+        $this->assertSame($date->format('D, d M Y H:i:s') . ' GMT', $header);
     }
 
     public function testSetLastModifiedWithDateTimeObject()
@@ -60,7 +60,7 @@ public function testSetLastModifiedWithDateTimeObject()
 
         $header = $response->getHeaderLine('Last-Modified');
 
-        $this->assertEquals($date->format('D, d M Y H:i:s') . ' GMT', $header);
+        $this->assertSame($date->format('D, d M Y H:i:s') . ' GMT', $header);
     }
 
     public function testSetLastModifiedWithString()
@@ -71,7 +71,7 @@ public function testSetLastModifiedWithString()
 
         $header = $response->getHeaderLine('Last-Modified');
 
-        $this->assertEquals('2000-03-10 10:23:45', $header);
+        $this->assertSame('2000-03-10 10:23:45', $header);
     }
 
     public function testsentMethodSouldReturnRedirectResponse()
@@ -87,7 +87,7 @@ public function testSetContentType()
 
         $response->setContentType('text/json');
 
-        $this->assertEquals('text/json; charset=UTF-8', $response->getHeaderLine('Content-Type'));
+        $this->assertSame('text/json; charset=UTF-8', $response->getHeaderLine('Content-Type'));
     }
 
     public function testSetContentTypeNoCharSet()
@@ -96,7 +96,7 @@ public function testSetContentTypeNoCharSet()
 
         $response->setContentType('application/octet-stream', '');
 
-        $this->assertEquals('application/octet-stream', $response->getHeaderLine('Content-Type'));
+        $this->assertSame('application/octet-stream', $response->getHeaderLine('Content-Type'));
     }
 
     public function testSetFileName()
@@ -176,11 +176,11 @@ public function testIsSetDownloadableHeadlersFromBinary()
         $response->setBinary('test');
         $response->buildHeaders();
 
-        $this->assertEquals('application/octet-stream', $response->getHeaderLine('Content-Type'));
-        $this->assertEquals('attachment; filename="unit test.txt"; filename*=UTF-8\'\'unit%20test.txt', $response->getHeaderLine('Content-Disposition'));
-        $this->assertEquals('0', $response->getHeaderLine('Expires-Disposition'));
-        $this->assertEquals('binary', $response->getHeaderLine('Content-Transfer-Encoding'));
-        $this->assertEquals('4', $response->getHeaderLine('Content-Length'));
+        $this->assertSame('application/octet-stream', $response->getHeaderLine('Content-Type'));
+        $this->assertSame('attachment; filename="unit test.txt"; filename*=UTF-8\'\'unit%20test.txt', $response->getHeaderLine('Content-Disposition'));
+        $this->assertSame('0', $response->getHeaderLine('Expires-Disposition'));
+        $this->assertSame('binary', $response->getHeaderLine('Content-Transfer-Encoding'));
+        $this->assertSame('4', $response->getHeaderLine('Content-Length'));
     }
 
     public function testIsSetDownloadableHeadlersFromFile()
@@ -190,11 +190,11 @@ public function testIsSetDownloadableHeadlersFromFile()
         $response->setFilePath(__FILE__);
         $response->buildHeaders();
 
-        $this->assertEquals('application/octet-stream', $response->getHeaderLine('Content-Type'));
-        $this->assertEquals('attachment; filename="unit-test.php"; filename*=UTF-8\'\'unit-test.php', $response->getHeaderLine('Content-Disposition'));
-        $this->assertEquals('0', $response->getHeaderLine('Expires-Disposition'));
-        $this->assertEquals('binary', $response->getHeaderLine('Content-Transfer-Encoding'));
-        $this->assertEquals(filesize(__FILE__), $response->getHeaderLine('Content-Length'));
+        $this->assertSame('application/octet-stream', $response->getHeaderLine('Content-Type'));
+        $this->assertSame('attachment; filename="unit-test.php"; filename*=UTF-8\'\'unit-test.php', $response->getHeaderLine('Content-Disposition'));
+        $this->assertSame('0', $response->getHeaderLine('Expires-Disposition'));
+        $this->assertSame('binary', $response->getHeaderLine('Content-Transfer-Encoding'));
+        $this->assertSame(filesize(__FILE__), (int) $response->getHeaderLine('Content-Length'));
     }
 
     public function testIfTheCharacterCodeIsOtherThanUtf8ReplaceItWithUtf8AndRawurlencode()
@@ -205,7 +205,7 @@ public function testIfTheCharacterCodeIsOtherThanUtf8ReplaceItWithUtf8AndRawurle
         $response->setContentType('application/octet-stream', 'Shift-JIS');
         $response->buildHeaders();
 
-        $this->assertEquals('attachment; filename="' . mb_convert_encoding('テスト.php', 'Shift-JIS', 'UTF-8') . '"; filename*=UTF-8\'\'%E3%83%86%E3%82%B9%E3%83%88.php', $response->getHeaderLine('Content-Disposition'));
+        $this->assertSame('attachment; filename="' . mb_convert_encoding('テスト.php', 'Shift-JIS', 'UTF-8') . '"; filename*=UTF-8\'\'%E3%83%86%E3%82%B9%E3%83%88.php', $response->getHeaderLine('Content-Disposition'));
     }
 
     public function testFileExtensionIsUpperCaseWhenAndroidOSIs2()
@@ -216,7 +216,7 @@ public function testFileExtensionIsUpperCaseWhenAndroidOSIs2()
         $response->setFilePath(__FILE__);
         $response->buildHeaders();
 
-        $this->assertEquals('attachment; filename="unit-test.PHP"; filename*=UTF-8\'\'unit-test.PHP', $response->getHeaderLine('Content-Disposition'));
+        $this->assertSame('attachment; filename="unit-test.PHP"; filename*=UTF-8\'\'unit-test.PHP', $response->getHeaderLine('Content-Disposition'));
     }
 
     public function testIsSetContentTypeFromFilename()
@@ -226,7 +226,7 @@ public function testIsSetContentTypeFromFilename()
         $response->setBinary('test');
         $response->buildHeaders();
 
-        $this->assertEquals('text/plain; charset=UTF-8', $response->getHeaderLine('Content-Type'));
+        $this->assertSame('text/plain; charset=UTF-8', $response->getHeaderLine('Content-Type'));
     }
 
     public function testCanOutputFileBodyFromBinary()
@@ -269,7 +269,7 @@ public function testThrowExceptionWhenNoSetDownloadSource()
     public function testGetReason()
     {
         $response = new DownloadResponse('unit-test.php', false);
-        $this->assertEquals('OK', $response->getReason());
+        $this->assertSame('OK', $response->getReason());
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/HTTP/Files/FileCollectionTest.php b/tests/system/HTTP/Files/FileCollectionTest.php
index d043d5b156d3..73876f0dffcf 100644
--- a/tests/system/HTTP/Files/FileCollectionTest.php
+++ b/tests/system/HTTP/Files/FileCollectionTest.php
@@ -22,7 +22,7 @@ public function testAllReturnsArrayWithNoFiles()
     {
         $files = new FileCollection();
 
-        $this->assertEquals([], $files->all());
+        $this->assertSame([], $files->all());
     }
 
     //--------------------------------------------------------------------
@@ -46,8 +46,8 @@ public function testAllReturnsValidSingleFile()
         $file = array_shift($files);
         $this->assertInstanceOf(UploadedFile::class, $file);
 
-        $this->assertEquals('someFile.txt', $file->getName());
-        $this->assertEquals(124, $file->getSize());
+        $this->assertSame('someFile.txt', $file->getName());
+        $this->assertSame(124, $file->getSize());
     }
 
     //--------------------------------------------------------------------
@@ -79,7 +79,7 @@ public function testAllReturnsValidMultipleFilesSameName()
         $collection = new FileCollection();
         $files      = $collection->all();
         $this->assertCount(1, $files);
-        $this->assertEquals('userfile', key($files));
+        $this->assertSame('userfile', key($files));
 
         $files = array_shift($files);
         $this->assertCount(2, $files);
@@ -87,11 +87,11 @@ public function testAllReturnsValidMultipleFilesSameName()
         $file = $files[0];
         $this->assertInstanceOf(UploadedFile::class, $file);
 
-        $this->assertEquals('fileA.txt', $file->getName());
-        $this->assertEquals('/tmp/fileA.txt', $file->getTempName());
-        $this->assertEquals('txt', $file->getClientExtension());
-        $this->assertEquals('text/plain', $file->getClientMimeType());
-        $this->assertEquals(124, $file->getSize());
+        $this->assertSame('fileA.txt', $file->getName());
+        $this->assertSame('/tmp/fileA.txt', $file->getTempName());
+        $this->assertSame('txt', $file->getClientExtension());
+        $this->assertSame('text/plain', $file->getClientMimeType());
+        $this->assertSame(124, $file->getSize());
     }
 
     //--------------------------------------------------------------------
@@ -118,27 +118,27 @@ public function testAllReturnsValidMultipleFilesDifferentName()
         $collection = new FileCollection();
         $files      = $collection->all();
         $this->assertCount(2, $files);
-        $this->assertEquals('userfile1', key($files));
+        $this->assertSame('userfile1', key($files));
 
         $file = array_shift($files);
         $this->assertInstanceOf(UploadedFile::class, $file);
 
-        $this->assertEquals('fileA.txt', $file->getName());
-        $this->assertEquals('fileA.txt', $file->getClientName());
-        $this->assertEquals('/tmp/fileA.txt', $file->getTempName());
-        $this->assertEquals('txt', $file->getClientExtension());
-        $this->assertEquals('text/plain', $file->getClientMimeType());
-        $this->assertEquals(124, $file->getSize());
+        $this->assertSame('fileA.txt', $file->getName());
+        $this->assertSame('fileA.txt', $file->getClientName());
+        $this->assertSame('/tmp/fileA.txt', $file->getTempName());
+        $this->assertSame('txt', $file->getClientExtension());
+        $this->assertSame('text/plain', $file->getClientMimeType());
+        $this->assertSame(124, $file->getSize());
 
         $file = array_pop($files);
         $this->assertInstanceOf(UploadedFile::class, $file);
 
-        $this->assertEquals('fileB.txt', $file->getName());
-        $this->assertEquals('fileB.txt', $file->getClientName());
-        $this->assertEquals('/tmp/fileB.txt', $file->getTempName());
-        $this->assertEquals('txt', $file->getClientExtension());
-        $this->assertEquals('text/csv', $file->getClientMimeType());
-        $this->assertEquals(248, $file->getSize());
+        $this->assertSame('fileB.txt', $file->getName());
+        $this->assertSame('fileB.txt', $file->getClientName());
+        $this->assertSame('/tmp/fileB.txt', $file->getTempName());
+        $this->assertSame('txt', $file->getClientExtension());
+        $this->assertSame('text/csv', $file->getClientMimeType());
+        $this->assertSame(248, $file->getSize());
     }
 
     //--------------------------------------------------------------------
@@ -188,12 +188,12 @@ public function testExtensionGuessing()
         // proposed extension matches finfo_open mime type (text/plain)
         $file = $collection->getFile('userfile1');
         $this->assertInstanceOf(UploadedFile::class, $file);
-        $this->assertEquals('txt', $file->getExtension());
+        $this->assertSame('txt', $file->getExtension());
 
         // proposed extension matches finfo_open mime type (text/plain)
         $file = $collection->getFile('userfile2');
         $this->assertInstanceOf(UploadedFile::class, $file);
-        $this->assertEquals('txt', $file->getExtension());
+        $this->assertSame('txt', $file->getExtension());
         // but not client mime type
         $this->assertNull(Mimes::guessExtensionFromType($file->getClientMimeType(), $file->getClientExtension()));
 
@@ -201,22 +201,22 @@ public function testExtensionGuessing()
         // but can be resolved by reverse searching
         $file = $collection->getFile('userfile3');
         $this->assertInstanceOf(UploadedFile::class, $file);
-        $this->assertEquals('csv', $file->getExtension());
+        $this->assertSame('csv', $file->getExtension());
 
         // proposed extension matches finfo_open mime type (application/zip)
         $file = $collection->getFile('userfile4');
         $this->assertInstanceOf(UploadedFile::class, $file);
-        $this->assertEquals('zip', $file->getExtension());
+        $this->assertSame('zip', $file->getExtension());
 
         // proposed extension matches client mime type, but not finfo_open mime type (application/zip)
         // this is a zip file (userFile4) but hat been renamed to 'rar'
         $file = $collection->getFile('userfile5');
         $this->assertInstanceOf(UploadedFile::class, $file);
         // getExtension falls back to clientExtension (insecure)
-        $this->assertEquals('rar', $file->getExtension());
-        $this->assertEquals('rar', Mimes::guessExtensionFromType($file->getClientMimeType(), $file->getClientExtension()));
+        $this->assertSame('rar', $file->getExtension());
+        $this->assertSame('rar', Mimes::guessExtensionFromType($file->getClientMimeType(), $file->getClientExtension()));
         // guessExtension is secure and does not returns empty
-        $this->assertEquals('', $file->guessExtension());
+        $this->assertSame('', $file->guessExtension());
     }
 
     //--------------------------------------------------------------------
@@ -255,18 +255,18 @@ public function testAllReturnsValidSingleFileNestedName()
         $collection = new FileCollection();
         $files      = $collection->all();
         $this->assertCount(1, $files);
-        $this->assertEquals('userfile', key($files));
+        $this->assertSame('userfile', key($files));
 
         $this->assertArrayHasKey('bar', $files['userfile']['foo']);
 
         $file = $files['userfile']['foo']['bar'];
         $this->assertInstanceOf(UploadedFile::class, $file);
 
-        $this->assertEquals('fileA.txt', $file->getName());
-        $this->assertEquals('/tmp/fileA.txt', $file->getTempName());
-        $this->assertEquals('txt', $file->getClientExtension());
-        $this->assertEquals('text/plain', $file->getClientMimeType());
-        $this->assertEquals(124, $file->getSize());
+        $this->assertSame('fileA.txt', $file->getName());
+        $this->assertSame('/tmp/fileA.txt', $file->getTempName());
+        $this->assertSame('txt', $file->getClientExtension());
+        $this->assertSame('text/plain', $file->getClientMimeType());
+        $this->assertSame(124, $file->getSize());
     }
 
     //--------------------------------------------------------------------
@@ -375,7 +375,7 @@ public function testErrorString()
         $collection = new FileCollection();
         $file       = $collection->getFile('userfile');
 
-        $this->assertEquals($expected, $file->getErrorString());
+        $this->assertSame($expected, $file->getErrorString());
     }
 
     public function testErrorStringWithUnknownError()
@@ -395,7 +395,7 @@ public function testErrorStringWithUnknownError()
         $collection = new FileCollection();
         $file       = $collection->getFile('userfile');
 
-        $this->assertEquals($expected, $file->getErrorString());
+        $this->assertSame($expected, $file->getErrorString());
     }
 
     public function testErrorStringWithNoError()
@@ -414,7 +414,7 @@ public function testErrorStringWithNoError()
         $collection = new FileCollection();
         $file       = $collection->getFile('userfile');
 
-        $this->assertEquals($expected, $file->getErrorString());
+        $this->assertSame($expected, $file->getErrorString());
     }
 
     //--------------------------------------------------------------------
@@ -434,7 +434,7 @@ public function testError()
         $collection = new FileCollection();
         $file       = $collection->getFile('userfile');
 
-        $this->assertEquals(UPLOAD_ERR_INI_SIZE, $file->getError());
+        $this->assertSame(UPLOAD_ERR_INI_SIZE, $file->getError());
     }
 
     public function testErrorWithUnknownError()
@@ -451,7 +451,7 @@ public function testErrorWithUnknownError()
         $collection = new FileCollection();
         $file       = $collection->getFile('userfile');
 
-        $this->assertEquals(0, $file->getError());
+        $this->assertSame(0, $file->getError());
     }
 
     public function testErrorWithNoError()
@@ -469,7 +469,7 @@ public function testErrorWithNoError()
         $collection = new FileCollection();
         $file       = $collection->getFile('userfile');
 
-        $this->assertEquals(UPLOAD_ERR_OK, $file->getError());
+        $this->assertSame(UPLOAD_ERR_OK, $file->getError());
     }
 
     //--------------------------------------------------------------------
@@ -490,8 +490,8 @@ public function testFileReturnsValidSingleFile()
         $file       = $collection->getFile('userfile');
         $this->assertInstanceOf(UploadedFile::class, $file);
 
-        $this->assertEquals('someFile.txt', $file->getName());
-        $this->assertEquals(124, $file->getSize());
+        $this->assertSame('someFile.txt', $file->getName());
+        $this->assertSame(124, $file->getSize());
     }
 
     //--------------------------------------------------------------------
@@ -543,19 +543,19 @@ public function testFileReturnValidMultipleFiles()
 
         $file1 = $collection->getFile('userfile.0');
         $this->assertInstanceOf(UploadedFile::class, $file1);
-        $this->assertEquals('fileA.txt', $file1->getName());
-        $this->assertEquals('/tmp/fileA.txt', $file1->getTempName());
-        $this->assertEquals('txt', $file1->getClientExtension());
-        $this->assertEquals('text/plain', $file1->getClientMimeType());
-        $this->assertEquals(124, $file1->getSize());
+        $this->assertSame('fileA.txt', $file1->getName());
+        $this->assertSame('/tmp/fileA.txt', $file1->getTempName());
+        $this->assertSame('txt', $file1->getClientExtension());
+        $this->assertSame('text/plain', $file1->getClientMimeType());
+        $this->assertSame(124, $file1->getSize());
 
         $file2 = $collection->getFile('userfile.1');
         $this->assertInstanceOf(UploadedFile::class, $file2);
-        $this->assertEquals('fileB.txt', $file2->getName());
-        $this->assertEquals('/tmp/fileB.txt', $file2->getTempName());
-        $this->assertEquals('txt', $file2->getClientExtension());
-        $this->assertEquals('text/csv', $file2->getClientMimeType());
-        $this->assertEquals(248, $file2->getSize());
+        $this->assertSame('fileB.txt', $file2->getName());
+        $this->assertSame('/tmp/fileB.txt', $file2->getTempName());
+        $this->assertSame('txt', $file2->getClientExtension());
+        $this->assertSame('text/csv', $file2->getClientMimeType());
+        $this->assertSame(248, $file2->getSize());
     }
 
     //--------------------------------------------------------------------
@@ -611,19 +611,19 @@ public function testFileWithMultipleFilesNestedName()
 
         $file1 = $collection->getFile('my-form.details.avatars.0');
         $this->assertInstanceOf(UploadedFile::class, $file1);
-        $this->assertEquals('fileA.txt', $file1->getName());
-        $this->assertEquals('/tmp/fileA.txt', $file1->getTempName());
-        $this->assertEquals('txt', $file1->getClientExtension());
-        $this->assertEquals('text/plain', $file1->getClientMimeType());
-        $this->assertEquals(125, $file1->getSize());
+        $this->assertSame('fileA.txt', $file1->getName());
+        $this->assertSame('/tmp/fileA.txt', $file1->getTempName());
+        $this->assertSame('txt', $file1->getClientExtension());
+        $this->assertSame('text/plain', $file1->getClientMimeType());
+        $this->assertSame(125, $file1->getSize());
 
         $file2 = $collection->getFile('my-form.details.avatars.1');
         $this->assertInstanceOf(UploadedFile::class, $file2);
-        $this->assertEquals('fileB.txt', $file2->getName());
-        $this->assertEquals('/tmp/fileB.txt', $file2->getTempName());
-        $this->assertEquals('txt', $file2->getClientExtension());
-        $this->assertEquals('text/plain', $file2->getClientMimeType());
-        $this->assertEquals(243, $file2->getSize());
+        $this->assertSame('fileB.txt', $file2->getName());
+        $this->assertSame('/tmp/fileB.txt', $file2->getTempName());
+        $this->assertSame('txt', $file2->getClientExtension());
+        $this->assertSame('text/plain', $file2->getClientMimeType());
+        $this->assertSame(243, $file2->getSize());
     }
 
     //--------------------------------------------------------------------
@@ -770,18 +770,18 @@ public function testGetFileMultipleReturnValidDotNotationSyntax()
         $this->assertCount(2, $files);
 
         $this->assertInstanceOf(UploadedFile::class, $files[0]);
-        $this->assertEquals('fileA.txt', $files[0]->getName());
-        $this->assertEquals('/tmp/fileA.txt', $files[0]->getTempName());
-        $this->assertEquals('txt', $files[0]->getClientExtension());
-        $this->assertEquals('text/plain', $files[0]->getClientMimeType());
-        $this->assertEquals(125, $files[0]->getSize());
+        $this->assertSame('fileA.txt', $files[0]->getName());
+        $this->assertSame('/tmp/fileA.txt', $files[0]->getTempName());
+        $this->assertSame('txt', $files[0]->getClientExtension());
+        $this->assertSame('text/plain', $files[0]->getClientMimeType());
+        $this->assertSame(125, $files[0]->getSize());
 
         $this->assertInstanceOf(UploadedFile::class, $files[1]);
-        $this->assertEquals('fileB.txt', $files[1]->getName());
-        $this->assertEquals('/tmp/fileB.txt', $files[1]->getTempName());
-        $this->assertEquals('txt', $files[1]->getClientExtension());
-        $this->assertEquals('text/plain', $files[1]->getClientMimeType());
-        $this->assertEquals(243, $files[1]->getSize());
+        $this->assertSame('fileB.txt', $files[1]->getName());
+        $this->assertSame('/tmp/fileB.txt', $files[1]->getTempName());
+        $this->assertSame('txt', $files[1]->getClientExtension());
+        $this->assertSame('text/plain', $files[1]->getClientMimeType());
+        $this->assertSame(243, $files[1]->getSize());
     }
 
     //--------------------------------------------------------------------
@@ -857,18 +857,18 @@ public function testGetFileMultipleReturnValidMultipleFiles()
         $this->assertIsArray( $files);
 
         $this->assertInstanceOf(UploadedFile::class, $files[0]);
-        $this->assertEquals(124, $files[0]->getSize());
-        $this->assertEquals('fileA.txt', $files[0]->getName());
-        $this->assertEquals('/tmp/fileA.txt', $files[0]->getTempName());
-        $this->assertEquals('txt', $files[0]->getClientExtension());
-        $this->assertEquals('text/plain', $files[0]->getClientMimeType());
+        $this->assertSame(124, $files[0]->getSize());
+        $this->assertSame('fileA.txt', $files[0]->getName());
+        $this->assertSame('/tmp/fileA.txt', $files[0]->getTempName());
+        $this->assertSame('txt', $files[0]->getClientExtension());
+        $this->assertSame('text/plain', $files[0]->getClientMimeType());
 
         $this->assertInstanceOf(UploadedFile::class, $files[1]);
-        $this->assertEquals(248, $files[1]->getSize());
-        $this->assertEquals('fileB.txt', $files[1]->getName());
-        $this->assertEquals('/tmp/fileB.txt', $files[1]->getTempName());
-        $this->assertEquals('txt', $files[1]->getClientExtension());
-        $this->assertEquals('text/csv', $files[1]->getClientMimeType());
+        $this->assertSame(248, $files[1]->getSize());
+        $this->assertSame('fileB.txt', $files[1]->getName());
+        $this->assertSame('/tmp/fileB.txt', $files[1]->getTempName());
+        $this->assertSame('txt', $files[1]->getClientExtension());
+        $this->assertSame('text/csv', $files[1]->getClientMimeType());
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php
index 900a1f7f50e2..15c5a6b3931f 100644
--- a/tests/system/HTTP/Files/FileMovingTest.php
+++ b/tests/system/HTTP/Files/FileMovingTest.php
@@ -196,7 +196,7 @@ public function testStore()
 
         $this->assertInstanceOf(UploadedFile::class, $file);
         $path = $file->store($destination, $file->getName());
-        $this->assertEquals($destination . '/fileA.txt', $path);
+        $this->assertSame($destination . '/fileA.txt', $path);
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/HTTP/HeaderTest.php b/tests/system/HTTP/HeaderTest.php
index 8f60191d9676..f8b566a5634e 100644
--- a/tests/system/HTTP/HeaderTest.php
+++ b/tests/system/HTTP/HeaderTest.php
@@ -17,8 +17,8 @@ public function testHeaderStoresBasics()
 
         $header = new Header($name, $value);
 
-        $this->assertEquals($name, $header->getName());
-        $this->assertEquals($value, $header->getValue());
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($value, $header->getValue());
     }
 
     public function testHeaderStoresBasicsWithNull()
@@ -28,8 +28,8 @@ public function testHeaderStoresBasicsWithNull()
 
         $header = new Header($name, $value);
 
-        $this->assertEquals($name, $header->getName());
-        $this->assertEquals('', $header->getValue());
+        $this->assertSame($name, $header->getName());
+        $this->assertSame('', $header->getValue());
     }
 
     //--------------------------------------------------------------------
@@ -44,8 +44,8 @@ public function testHeaderStoresArrayValues()
 
         $header = new Header($name, $value);
 
-        $this->assertEquals($name, $header->getName());
-        $this->assertEquals($value, $header->getValue());
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($value, $header->getValue());
     }
 
     //--------------------------------------------------------------------
@@ -59,15 +59,15 @@ public function testHeaderSetters()
         ];
 
         $header = new Header($name);
-        $this->assertEquals($name, $header->getName());
+        $this->assertSame($name, $header->getName());
         $this->assertEmpty($header->getValue());
-        $this->assertEquals($name . ': ', (string) $header);
+        $this->assertSame($name . ': ', (string) $header);
 
         $name = 'foo2';
         $header->setName($name)->setValue($value);
-        $this->assertEquals($name, $header->getName());
-        $this->assertEquals($value, $header->getValue());
-        $this->assertEquals($name . ': bar, baz', (string) $header);
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($value, $header->getValue());
+        $this->assertSame($name . ': bar, baz', (string) $header);
     }
 
     //--------------------------------------------------------------------
@@ -82,8 +82,8 @@ public function testHeaderAppendsValueSkippedForNull()
 
         $header->appendValue(null);
 
-        $this->assertEquals($name, $header->getName());
-        $this->assertEquals($expected, $header->getValue());
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($expected, $header->getValue());
     }
 
     public function testHeaderConvertsSingleToArray()
@@ -100,8 +100,8 @@ public function testHeaderConvertsSingleToArray()
 
         $header->appendValue('baz');
 
-        $this->assertEquals($name, $header->getName());
-        $this->assertEquals($expected, $header->getValue());
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($expected, $header->getValue());
     }
 
     //--------------------------------------------------------------------
@@ -116,8 +116,8 @@ public function testHeaderPrependsValueSkippedForNull()
 
         $header->prependValue(null);
 
-        $this->assertEquals($name, $header->getName());
-        $this->assertEquals($expected, $header->getValue());
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($expected, $header->getValue());
     }
 
     public function testHeaderPrependsValue()
@@ -134,8 +134,8 @@ public function testHeaderPrependsValue()
 
         $header->prependValue('baz');
 
-        $this->assertEquals($name, $header->getName());
-        $this->assertEquals($expected, $header->getValue());
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($expected, $header->getValue());
     }
 
     //--------------------------------------------------------------------
@@ -152,8 +152,8 @@ public function testHeaderLineSimple()
 
         $header = new Header($name, $value);
 
-        $this->assertEquals($name, $header->getName());
-        $this->assertEquals($expected, $header->getValueLine());
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($expected, $header->getValueLine());
     }
 
     public function testHeaderLineValueNotStringOrArray()
@@ -165,8 +165,8 @@ public function testHeaderLineValueNotStringOrArray()
 
         $header = new Header($name, $value);
 
-        $this->assertEquals($name, $header->getName());
-        $this->assertEquals($expected, $header->getValueLine());
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($expected, $header->getValueLine());
     }
 
     //--------------------------------------------------------------------
@@ -179,8 +179,8 @@ public function testHeaderSetValueWithNullWillMarkAsEmptyString()
         $header = new Header($name);
         $header->setValue('bar')->setValue(null);
 
-        $this->assertEquals($name, $header->getName());
-        $this->assertEquals($expected, $header->getValueLine());
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($expected, $header->getValueLine());
     }
 
     public function testHeaderLineWithArrayValues()
@@ -193,8 +193,8 @@ public function testHeaderLineWithArrayValues()
 
         $header->setValue('bar')->appendValue(['baz' => 'fuzz']);
 
-        $this->assertEquals($name, $header->getName());
-        $this->assertEquals($expected, $header->getValueLine());
+        $this->assertSame($name, $header->getName());
+        $this->assertSame($expected, $header->getValueLine());
     }
 
     //--------------------------------------------------------------------
@@ -209,6 +209,6 @@ public function testHeaderToStringShowsEntireHeader()
 
         $header->setValue('bar')->appendValue(['baz' => 'fuzz']);
 
-        $this->assertEquals($expected, (string) $header);
+        $this->assertSame($expected, (string) $header);
     }
 }
diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php
index 2cea84461428..af1d4faec73c 100644
--- a/tests/system/HTTP/IncomingRequestDetectingTest.php
+++ b/tests/system/HTTP/IncomingRequestDetectingTest.php
@@ -37,7 +37,7 @@ public function testPathDefault()
         $_SERVER['REQUEST_URI'] = '/index.php/woot';
         $_SERVER['SCRIPT_NAME'] = '/index.php';
         $expected               = 'woot';
-        $this->assertEquals($expected, $this->request->detectPath());
+        $this->assertSame($expected, $this->request->detectPath());
     }
 
     public function testPathEmpty()
@@ -46,7 +46,7 @@ public function testPathEmpty()
         $_SERVER['REQUEST_URI'] = '/';
         $_SERVER['SCRIPT_NAME'] = '/index.php';
         $expected               = '/';
-        $this->assertEquals($expected, $this->request->detectPath());
+        $this->assertSame($expected, $this->request->detectPath());
     }
 
     public function testPathRequestURI()
@@ -55,7 +55,7 @@ public function testPathRequestURI()
         $_SERVER['REQUEST_URI'] = '/index.php/woot';
         $_SERVER['SCRIPT_NAME'] = '/index.php';
         $expected               = 'woot';
-        $this->assertEquals($expected, $this->request->detectPath('REQUEST_URI'));
+        $this->assertSame($expected, $this->request->detectPath('REQUEST_URI'));
     }
 
     public function testPathRequestURINested()
@@ -64,7 +64,7 @@ public function testPathRequestURINested()
         $_SERVER['REQUEST_URI'] = '/index.php/woot';
         $_SERVER['SCRIPT_NAME'] = '/index.php';
         $expected               = 'woot';
-        $this->assertEquals($expected, $this->request->detectPath('REQUEST_URI'));
+        $this->assertSame($expected, $this->request->detectPath('REQUEST_URI'));
     }
 
     public function testPathRequestURISubfolder()
@@ -73,7 +73,7 @@ public function testPathRequestURISubfolder()
         $_SERVER['REQUEST_URI'] = '/ci/index.php/popcorn/woot';
         $_SERVER['SCRIPT_NAME'] = '/ci/index.php';
         $expected               = 'popcorn/woot';
-        $this->assertEquals($expected, $this->request->detectPath('REQUEST_URI'));
+        $this->assertSame($expected, $this->request->detectPath('REQUEST_URI'));
     }
 
     public function testPathRequestURINoIndex()
@@ -82,7 +82,7 @@ public function testPathRequestURINoIndex()
         $_SERVER['REQUEST_URI'] = '/sub/example';
         $_SERVER['SCRIPT_NAME'] = '/sub/index.php';
         $expected               = 'example';
-        $this->assertEquals($expected, $this->request->detectPath('REQUEST_URI'));
+        $this->assertSame($expected, $this->request->detectPath('REQUEST_URI'));
     }
 
     public function testPathRequestURINginx()
@@ -91,7 +91,7 @@ public function testPathRequestURINginx()
         $_SERVER['REQUEST_URI'] = '/index.php/woot?code=good';
         $_SERVER['SCRIPT_NAME'] = '/index.php';
         $expected               = 'woot';
-        $this->assertEquals($expected, $this->request->detectPath('REQUEST_URI'));
+        $this->assertSame($expected, $this->request->detectPath('REQUEST_URI'));
     }
 
     public function testPathRequestURINginxRedirecting()
@@ -100,7 +100,7 @@ public function testPathRequestURINginxRedirecting()
         $_SERVER['REQUEST_URI'] = '/?/ci/woot';
         $_SERVER['SCRIPT_NAME'] = '/index.php';
         $expected               = 'ci/woot';
-        $this->assertEquals($expected, $this->request->detectPath('REQUEST_URI'));
+        $this->assertSame($expected, $this->request->detectPath('REQUEST_URI'));
     }
 
     public function testPathRequestURISuppressed()
@@ -109,7 +109,7 @@ public function testPathRequestURISuppressed()
         $_SERVER['REQUEST_URI'] = '/woot';
         $_SERVER['SCRIPT_NAME'] = '/';
         $expected               = 'woot';
-        $this->assertEquals($expected, $this->request->detectPath('REQUEST_URI'));
+        $this->assertSame($expected, $this->request->detectPath('REQUEST_URI'));
     }
 
     //--------------------------------------------------------------------
@@ -121,7 +121,7 @@ public function testPathQueryString()
         $_SERVER['QUERY_STRING'] = '/ci/woot';
         $_SERVER['SCRIPT_NAME']  = '/index.php';
         $expected                = 'ci/woot';
-        $this->assertEquals($expected, $this->request->detectPath('QUERY_STRING'));
+        $this->assertSame($expected, $this->request->detectPath('QUERY_STRING'));
     }
 
     public function testPathQueryStringEmpty()
@@ -131,7 +131,7 @@ public function testPathQueryStringEmpty()
         $_SERVER['QUERY_STRING'] = '';
         $_SERVER['SCRIPT_NAME']  = '/index.php';
         $expected                = '';
-        $this->assertEquals($expected, $this->request->detectPath('QUERY_STRING'));
+        $this->assertSame($expected, $this->request->detectPath('QUERY_STRING'));
     }
 
     //--------------------------------------------------------------------
@@ -145,7 +145,7 @@ public function testPathPathInfo()
         $_SERVER['REQUEST_URI'] = '/index.php/woot';
         $_SERVER['SCRIPT_NAME'] = '/index.php';
         $expected               = 'woot';
-        $this->assertEquals($expected, $this->request->detectPath('PATH_INFO'));
+        $this->assertSame($expected, $this->request->detectPath('PATH_INFO'));
     }
 
     public function testPathPathInfoGlobal()
@@ -159,6 +159,6 @@ public function testPathPathInfoGlobal()
         $_SERVER['SCRIPT_NAME'] = '/index.php';
 
         $expected = 'silliness';
-        $this->assertEquals($expected, $this->request->detectPath('PATH_INFO'));
+        $this->assertSame($expected, $this->request->detectPath('PATH_INFO'));
     }
 }
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 70f0380d4648..2037b60c7e5f 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -14,7 +14,6 @@
  */
 final class IncomingRequestTest extends CIUnitTestCase
 {
-
     /**
      * @var IncomingRequest
      */
@@ -35,7 +34,7 @@ public function testCanGrabRequestVars()
     {
         $_REQUEST['TEST'] = 5;
 
-        $this->assertEquals(5, $this->request->getVar('TEST'));
+        $this->assertSame('5', $this->request->getVar('TEST'));
         $this->assertNull($this->request->getVar('TESTY'));
     }
 
@@ -43,7 +42,7 @@ public function testCanGrabGetVars()
     {
         $_GET['TEST'] = 5;
 
-        $this->assertEquals(5, $this->request->getGet('TEST'));
+        $this->assertSame('5', $this->request->getGet('TEST'));
         $this->assertNull($this->request->getGet('TESTY'));
     }
 
@@ -51,7 +50,7 @@ public function testCanGrabPostVars()
     {
         $_POST['TEST'] = 5;
 
-        $this->assertEquals(5, $this->request->getPost('TEST'));
+        $this->assertSame('5', $this->request->getPost('TEST'));
         $this->assertNull($this->request->getPost('TESTY'));
     }
 
@@ -60,8 +59,8 @@ public function testCanGrabPostBeforeGet()
         $_POST['TEST'] = 5;
         $_GET['TEST']  = 3;
 
-        $this->assertEquals(5, $this->request->getPostGet('TEST'));
-        $this->assertEquals(3, $this->request->getGetPost('TEST'));
+        $this->assertSame('5', $this->request->getPostGet('TEST'));
+        $this->assertSame('3', $this->request->getGetPost('TEST'));
     }
 
     //--------------------------------------------------------------------
@@ -78,8 +77,8 @@ public function testCanGetOldInput()
             'post' => ['name' => 'foo'],
         ];
 
-        $this->assertEquals('foo', $this->request->getOldInput('name'));
-        $this->assertEquals('two', $this->request->getOldInput('one'));
+        $this->assertSame('foo', $this->request->getOldInput('name'));
+        $this->assertSame('two', $this->request->getOldInput('one'));
     }
 
     public function testCanGetOldInputDotted()
@@ -89,8 +88,8 @@ public function testCanGetOldInputDotted()
             'post' => ['banana' => ['name' => 'foo']],
         ];
 
-        $this->assertEquals('foo', $this->request->getOldInput('banana.name'));
-        $this->assertEquals('two', $this->request->getOldInput('apple.name'));
+        $this->assertSame('foo', $this->request->getOldInput('banana.name'));
+        $this->assertSame('two', $this->request->getOldInput('apple.name'));
     }
 
     public function testMissingOldInput()
@@ -111,8 +110,8 @@ public function testCanGetOldInputArray()
             'post' => ['banana' => ['name' => 'foo']],
         ];
 
-        $this->assertEquals(['name' => 'two'], $this->request->getOldInput('apple'));
-        $this->assertEquals(['name' => 'foo'], $this->request->getOldInput('banana'));
+        $this->assertSame(['name' => 'two'], $this->request->getOldInput('apple'));
+        $this->assertSame(['name' => 'foo'], $this->request->getOldInput('banana'));
     }
 
     // Reference: https://github.com/codeigniter4/CodeIgniter4/issues/1492
@@ -131,7 +130,7 @@ public function testCanSerializeOldArray()
         $session = service('session');
         $session->set(['_ci_old_input' => ['post' => ['location' => $locations]]]);
 
-        $this->assertEquals($locations, $this->request->getOldInput('location'));
+        $this->assertSame($locations, $this->request->getOldInput('location'));
     }
 
     //--------------------------------------------------------------------
@@ -142,7 +141,7 @@ public function testCanGrabServerVars()
         $server['server']['TEST'] = 5;
         $this->setPrivateProperty($this->request, 'globals', $server);
 
-        $this->assertEquals(5, $this->request->getServer('TEST'));
+        $this->assertSame('5', $this->request->getServer('TEST'));
         $this->assertNull($this->request->getServer('TESTY'));
     }
 
@@ -152,7 +151,7 @@ public function testCanGrabEnvVars()
         $server['env']['TEST'] = 5;
         $this->setPrivateProperty($this->request, 'globals', $server);
 
-        $this->assertEquals(5, $this->request->getEnv('TEST'));
+        $this->assertSame('5', $this->request->getEnv('TEST'));
         $this->assertNull($this->request->getEnv('TESTY'));
     }
 
@@ -160,7 +159,7 @@ public function testCanGrabCookieVars()
     {
         $_COOKIE['TEST'] = 5;
 
-        $this->assertEquals(5, $this->request->getCookie('TEST'));
+        $this->assertSame('5', $this->request->getCookie('TEST'));
         $this->assertNull($this->request->getCookie('TESTY'));
     }
 
@@ -170,40 +169,34 @@ public function testStoresDefaultLocale()
     {
         $config = new App();
 
-        $this->assertEquals($config->defaultLocale, $this->request->getDefaultLocale());
-        $this->assertEquals($config->defaultLocale, $this->request->getLocale());
+        $this->assertSame($config->defaultLocale, $this->request->getDefaultLocale());
+        $this->assertSame($config->defaultLocale, $this->request->getLocale());
     }
 
     public function testSetLocaleSaves()
     {
         $config                   = new App();
-        $config->supportedLocales = [
-            'en',
-            'es',
-        ];
-        $config->defaultLocale = 'es';
-        $config->baseURL       = 'http://example.com/';
+        $config->supportedLocales = ['en', 'es'];
+        $config->defaultLocale    = 'es';
+        $config->baseURL          = 'http://example.com/';
 
         $request = new IncomingRequest($config, new URI(), null, new UserAgent());
 
         $request->setLocale('en');
-        $this->assertEquals('en', $request->getLocale());
+        $this->assertSame('en', $request->getLocale());
     }
 
     public function testSetBadLocale()
     {
         $config                   = new App();
-        $config->supportedLocales = [
-            'en',
-            'es',
-        ];
-        $config->defaultLocale = 'es';
-        $config->baseURL       = 'http://example.com/';
+        $config->supportedLocales = ['en', 'es'];
+        $config->defaultLocale    = 'es';
+        $config->baseURL          = 'http://example.com/';
 
         $request = new IncomingRequest($config, new URI(), null, new UserAgent());
 
         $request->setLocale('xx');
-        $this->assertEquals('es', $request->getLocale());
+        $this->assertSame('es', $request->getLocale());
     }
 
     //--------------------------------------------------------------------
@@ -217,16 +210,13 @@ public function testNegotiatesLocale()
 
         $config                   = new App();
         $config->negotiateLocale  = true;
-        $config->supportedLocales = [
-            'fr',
-            'en',
-        ];
-        $config->baseURL = 'http://example.com/';
+        $config->supportedLocales = ['fr', 'en'];
+        $config->baseURL          = 'http://example.com/';
 
         $request = new IncomingRequest($config, new URI(), null, new UserAgent());
 
-        $this->assertEquals($config->defaultLocale, $request->getDefaultLocale());
-        $this->assertEquals('fr', $request->getLocale());
+        $this->assertSame($config->defaultLocale, $request->getDefaultLocale());
+        $this->assertSame('fr', $request->getLocale());
     }
 
     public function testNegotiatesLocaleOnlyBroad()
@@ -235,16 +225,13 @@ public function testNegotiatesLocaleOnlyBroad()
 
         $config                   = new App();
         $config->negotiateLocale  = true;
-        $config->supportedLocales = [
-            'fr',
-            'en',
-        ];
-        $config->baseURL = 'http://example.com/';
+        $config->supportedLocales = ['fr', 'en'];
+        $config->baseURL          = 'http://example.com/';
 
         $request = new IncomingRequest($config, new URI(), null, new UserAgent());
 
-        $this->assertEquals($config->defaultLocale, $request->getDefaultLocale());
-        $this->assertEquals('fr', $request->getLocale());
+        $this->assertSame($config->defaultLocale, $request->getDefaultLocale());
+        $this->assertSame('fr', $request->getLocale());
     }
 
     // The negotiation tests below are not intended to exercise the HTTP\Negotiate class -
@@ -264,25 +251,25 @@ public function testNegotiatesCharset()
         //      $_SERVER['HTTP_ACCEPT_CHARSET'] = 'iso-8859-5, unicode-1-1;q=0.8';
         $this->request->setHeader('Accept-Charset', 'iso-8859-5, unicode-1-1;q=0.8');
 
-        $this->assertEquals(strtolower($this->request->config->charset), $this->request->negotiate('charset', ['iso-8859', 'unicode-1-2']));
+        $this->assertSame(strtolower($this->request->config->charset), $this->request->negotiate('charset', ['iso-8859', 'unicode-1-2']));
     }
 
     public function testNegotiatesMedia()
     {
         $this->request->setHeader('Accept', 'text/plain; q=0.5, text/html, text/x-dvi; q=0.8, text/x-c');
-        $this->assertEquals('text/html', $this->request->negotiate('media', ['text/html', 'text/x-c', 'text/x-dvi', 'text/plain']));
+        $this->assertSame('text/html', $this->request->negotiate('media', ['text/html', 'text/x-c', 'text/x-dvi', 'text/plain']));
     }
 
     public function testNegotiatesEncoding()
     {
         $this->request->setHeader('Accept-Encoding', 'gzip;q=1.0, identity; q=0.4, compress;q=0.5');
-        $this->assertEquals('gzip', $this->request->negotiate('encoding', ['gzip', 'compress']));
+        $this->assertSame('gzip', $this->request->negotiate('encoding', ['gzip', 'compress']));
     }
 
     public function testNegotiatesLanguage()
     {
         $this->request->setHeader('Accept-Language', 'da, en-gb;q=0.8, en;q=0.7');
-        $this->assertEquals('en', $this->request->negotiate('language', ['en', 'da']));
+        $this->assertSame('en', $this->request->negotiate('language', ['en', 'da']));
     }
 
     //--------------------------------------------------------------------
@@ -291,26 +278,21 @@ public function testCanGrabGetRawJSON()
     {
         $json = '{"code":1, "message":"ok"}';
 
-        $expected = [
-            'code'    => 1,
-            'message' => 'ok',
-        ];
+        $expected = ['code' => 1, 'message' => 'ok'];
 
         $config          = new App();
         $config->baseURL = 'http://example.com/';
 
         $request = new IncomingRequest($config, new URI(), $json, new UserAgent());
 
-        $this->assertEquals($expected, $request->getJSON(true));
+        $this->assertSame($expected, $request->getJSON(true));
     }
 
     public function testCanGetAVariableFromJson()
     {
         $jsonObj = [
             'foo' => 'bar',
-            'baz' => [
-                'fizz' => 'buzz',
-            ],
+            'baz' => ['fizz' => 'buzz'],
         ];
         $json = json_encode($jsonObj);
 
@@ -319,11 +301,11 @@ public function testCanGetAVariableFromJson()
 
         $request = new IncomingRequest($config, new URI(), $json, new UserAgent());
 
-        $this->assertEquals('bar', $request->getJsonVar('foo'));
+        $this->assertSame('bar', $request->getJsonVar('foo'));
         $jsonVar = $request->getJsonVar('baz');
         $this->assertIsObject($jsonVar);
-        $this->assertEquals('buzz', $jsonVar->fizz);
-        $this->assertEquals('buzz', $request->getJsonVar('baz.fizz'));
+        $this->assertSame('buzz', $jsonVar->fizz);
+        $this->assertSame('buzz', $request->getJsonVar('baz.fizz'));
     }
 
     public function testGetJsonVarAsArray()
@@ -343,8 +325,8 @@ public function testGetJsonVarAsArray()
 
         $jsonVar = $request->getJsonVar('baz', true);
         $this->assertIsArray($jsonVar);
-        $this->assertEquals('buzz', $jsonVar['fizz']);
-        $this->assertEquals('bar', $jsonVar['foo']);
+        $this->assertSame('buzz', $jsonVar['fizz']);
+        $this->assertSame('bar', $jsonVar['foo']);
     }
 
     public function testGetJsonVarCanFilter()
@@ -373,18 +355,18 @@ public function testGetVarWorksWithJson()
         $request = new IncomingRequest($config, new URI(), $json, new UserAgent());
         $request->setHeader('Content-Type', 'application/json');
 
-        $this->assertEquals('bar', $request->getVar('foo'));
-        $this->assertEquals('buzz', $request->getVar('fizz'));
+        $this->assertSame('bar', $request->getVar('foo'));
+        $this->assertSame('buzz', $request->getVar('fizz'));
 
         $multiple = $request->getVar(['foo', 'fizz']);
         $this->assertIsArray($multiple);
-        $this->assertEquals('bar', $multiple['foo']);
-        $this->assertEquals('buzz', $multiple['fizz']);
+        $this->assertSame('bar', $multiple['foo']);
+        $this->assertSame('buzz', $multiple['fizz']);
 
         $all = $request->getVar();
         $this->assertIsObject($all);
-        $this->assertEquals('bar', $all->foo);
-        $this->assertEquals('buzz', $all->fizz);
+        $this->assertSame('bar', $all->foo);
+        $this->assertSame('buzz', $all->fizz);
     }
 
     public function testGetVarWorksWithJsonAndGetParams()
@@ -402,18 +384,18 @@ public function testGetVarWorksWithJsonAndGetParams()
         // JSON type
         $request->setHeader('Content-Type', 'application/json');
 
-        $this->assertEquals('bar', $request->getVar('foo'));
-        $this->assertEquals('buzz', $request->getVar('fizz'));
+        $this->assertSame('bar', $request->getVar('foo'));
+        $this->assertSame('buzz', $request->getVar('fizz'));
 
         $multiple = $request->getVar(['foo', 'fizz']);
         $this->assertIsArray($multiple);
-        $this->assertEquals('bar', $multiple['foo']);
-        $this->assertEquals('buzz', $multiple['fizz']);
+        $this->assertSame('bar', $multiple['foo']);
+        $this->assertSame('buzz', $multiple['fizz']);
 
         $all = $request->getVar();
         $this->assertIsArray($all);
-        $this->assertEquals('bar', $all['foo']);
-        $this->assertEquals('buzz', $all['fizz']);
+        $this->assertSame('bar', $all['foo']);
+        $this->assertSame('buzz', $all['fizz']);
     }
 
     public function testCanGrabGetRawInput()
@@ -423,7 +405,7 @@ public function testCanGrabGetRawInput()
         $expected = [
             'username' => 'admin001',
             'role'     => 'administrator',
-            'usepass'  => 0,
+            'usepass'  => '0',
         ];
 
         $config          = new App();
@@ -431,7 +413,7 @@ public function testCanGrabGetRawInput()
 
         $request = new IncomingRequest($config, new URI(), $rawstring, new UserAgent());
 
-        $this->assertEquals($expected, $request->getRawInput());
+        $this->assertSame($expected, $request->getRawInput());
     }
 
     //--------------------------------------------------------------------
@@ -473,9 +455,11 @@ public function testIsSecureForwarded()
     public function testUserAgent()
     {
         $_SERVER['HTTP_USER_AGENT'] = 'Mozilla';
-        $config                     = new App();
-        $request                    = new IncomingRequest($config, new URI(), null, new UserAgent());
-        $this->assertEquals('Mozilla', $request->getUserAgent());
+
+        $config  = new App();
+        $request = new IncomingRequest($config, new URI(), null, new UserAgent());
+
+        $this->assertSame('Mozilla', $request->getUserAgent()->__toString());
     }
 
     //--------------------------------------------------------------------
@@ -498,8 +482,8 @@ public function testFileCollectionFactory()
         $file = array_shift($files);
         $this->assertInstanceOf(UploadedFile::class, $file);
 
-        $this->assertEquals('someFile.txt', $file->getName());
-        $this->assertEquals(124, $file->getSize());
+        $this->assertSame('someFile.txt', $file->getName());
+        $this->assertSame(124, $file->getSize());
     }
 
     //--------------------------------------------------------------------
@@ -532,8 +516,8 @@ public function testGetFileMultiple()
         ];
 
         $gotit = $this->request->getFileMultiple('userfile');
-        $this->assertEquals(124, $gotit[0]->getSize());
-        $this->assertEquals(125, $gotit[1]->getSize());
+        $this->assertSame(124, $gotit[0]->getSize());
+        $this->assertSame(125, $gotit[1]->getSize());
     }
 
     //--------------------------------------------------------------------
@@ -551,7 +535,7 @@ public function testGetFile()
         ];
 
         $gotit = $this->request->getFile('userfile');
-        $this->assertEquals(124, $gotit->getSize());
+        $this->assertSame(124, $gotit->getSize());
     }
 
     //--------------------------------------------------------------------
@@ -559,7 +543,7 @@ public function testGetFile()
     public function testSpoofing()
     {
         $this->request->setMethod('WINK');
-        $this->assertEquals('wink', $this->request->getMethod());
+        $this->assertSame('wink', $this->request->getMethod());
     }
 
     /**
@@ -567,10 +551,10 @@ public function testSpoofing()
      */
     public function testGetPostEmpty()
     {
-        $_POST['TEST'] = 5;
-        $_GET['TEST']  = 3;
-        $this->assertEquals($_POST, $this->request->getPostGet());
-        $this->assertEquals($_GET, $this->request->getGetPost());
+        $_POST['TEST'] = '5';
+        $_GET['TEST']  = '3';
+        $this->assertSame($_POST, $this->request->getPostGet());
+        $this->assertSame($_GET, $this->request->getGetPost());
     }
 
     public function testWithFalseBody()
@@ -618,7 +602,7 @@ public function testExtensionPHP($path, $detectPath)
         $_SERVER['REQUEST_URI'] = $path;
         $_SERVER['SCRIPT_NAME'] = $path;
         $request                = new IncomingRequest($config, new URI($path), null, new UserAgent());
-        $this->assertEquals($detectPath, $request->detectPath());
+        $this->assertSame($detectPath, $request->detectPath());
     }
 
     //--------------------------------------------------------------------
@@ -630,7 +614,7 @@ public function testGetPath()
 
         $request = new IncomingRequest(new App(), new URI(), null, new UserAgent());
 
-        $this->assertEquals('fruits/banana', $request->getPath());
+        $this->assertSame('fruits/banana', $request->getPath());
     }
 
     public function testGetPathIsRelative()
@@ -640,7 +624,7 @@ public function testGetPathIsRelative()
 
         $request = new IncomingRequest(new App(), new URI(), null, new UserAgent());
 
-        $this->assertEquals('fruits/banana', $request->getPath());
+        $this->assertSame('fruits/banana', $request->getPath());
     }
 
     public function testGetPathStoresDetectedValue()
@@ -652,7 +636,7 @@ public function testGetPathStoresDetectedValue()
 
         $_SERVER['REQUEST_URI'] = '/candy/snickers';
 
-        $this->assertEquals('fruits/banana', $request->getPath());
+        $this->assertSame('fruits/banana', $request->getPath());
     }
 
     public function testGetPathIsRediscovered()
@@ -665,7 +649,7 @@ public function testGetPathIsRediscovered()
         $_SERVER['REQUEST_URI'] = '/candy/snickers';
         $request->detectPath();
 
-        $this->assertEquals('candy/snickers', $request->getPath());
+        $this->assertSame('candy/snickers', $request->getPath());
     }
 
     //--------------------------------------------------------------------
@@ -673,10 +657,10 @@ public function testGetPathIsRediscovered()
     public function testSetPath()
     {
         $request = new IncomingRequest(new App(), new URI(), null, new UserAgent());
-        $this->assertEquals('', $request->getPath());
+        $this->assertSame('', $request->getPath());
 
         $request->setPath('foobar');
-        $this->assertEquals('foobar', $request->getPath());
+        $this->assertSame('foobar', $request->getPath());
     }
 
     public function testSetPathUpdatesURI()
@@ -685,6 +669,6 @@ public function testSetPathUpdatesURI()
 
         $request->setPath('apples');
 
-        $this->assertEquals('apples', $request->uri->getPath());
+        $this->assertSame('apples', $request->uri->getPath());
     }
 }
diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php
index 3fbcf80b9493..50f8a4e6cd04 100644
--- a/tests/system/HTTP/MessageTest.php
+++ b/tests/system/HTTP/MessageTest.php
@@ -57,7 +57,7 @@ public function testCanGrabSingleHeader()
         $header = $this->message->header('Host');
 
         $this->assertInstanceOf(Header::class, $header);
-        $this->assertEquals('daisyduke.com', $header->getValue());
+        $this->assertSame('daisyduke.com', $header->getValue());
     }
 
     //--------------------------------------------------------------------
@@ -66,8 +66,8 @@ public function testCaseInsensitiveheader()
     {
         $this->message->setHeader('Host', 'daisyduke.com');
 
-        $this->assertEquals('daisyduke.com', $this->message->header('host')->getValue());
-        $this->assertEquals('daisyduke.com', $this->message->header('HOST')->getValue());
+        $this->assertSame('daisyduke.com', $this->message->header('host')->getValue());
+        $this->assertSame('daisyduke.com', $this->message->header('HOST')->getValue());
     }
 
     //--------------------------------------------------------------------
@@ -77,8 +77,8 @@ public function testCanSetHeaders()
         $this->message->setHeader('first', 'kiss');
         $this->message->setHeader('second', ['black', 'book']);
 
-        $this->assertEquals('kiss', $this->message->header('FIRST')->getValue());
-        $this->assertEquals(['black', 'book'], $this->message->header('Second')->getValue());
+        $this->assertSame('kiss', $this->message->header('FIRST')->getValue());
+        $this->assertSame(['black', 'book'], $this->message->header('Second')->getValue());
     }
 
     //--------------------------------------------------------------------
@@ -88,7 +88,7 @@ public function testSetHeaderOverwritesPrevious()
         $this->message->setHeader('Pragma', 'cache');
         $this->message->setHeader('Pragma', 'no-cache');
 
-        $this->assertEquals('no-cache', $this->message->header('Pragma')->getValue());
+        $this->assertSame('no-cache', $this->message->header('Pragma')->getValue());
     }
 
     public function testHeaderLineIsReadable()
@@ -96,8 +96,8 @@ public function testHeaderLineIsReadable()
         $this->message->setHeader('Accept', ['json', 'html']);
         $this->message->setHeader('Host', 'daisyduke.com');
 
-        $this->assertEquals('json, html', $this->message->header('Accept')->getValueLine());
-        $this->assertEquals('daisyduke.com', $this->message->header('Host')->getValueLine());
+        $this->assertSame('json, html', $this->message->header('Accept')->getValueLine());
+        $this->assertSame('daisyduke.com', $this->message->header('Host')->getValueLine());
     }
 
     //--------------------------------------------------------------------
@@ -108,7 +108,7 @@ public function testCanRemoveHeader()
 
         $this->message->removeHeader('host');
 
-        $this->assertEquals('', $this->message->header('host'));
+        $this->assertNull($this->message->header('host'));
     }
 
     //--------------------------------------------------------------------
@@ -119,7 +119,7 @@ public function testCanAppendHeader()
 
         $this->message->appendHeader('Accept', 'xml');
 
-        $this->assertEquals(['json', 'html', 'xml'], $this->message->header('accept')->getValue());
+        $this->assertSame(['json', 'html', 'xml'], $this->message->header('accept')->getValue());
     }
 
     //--------------------------------------------------------------------
@@ -130,7 +130,7 @@ public function testCanPrependHeader()
 
         $this->message->prependHeader('Accept', 'xml');
 
-        $this->assertEquals(['xml', 'json', 'html'], $this->message->header('accept')->getValue());
+        $this->assertSame(['xml', 'json', 'html'], $this->message->header('accept')->getValue());
     }
 
     //--------------------------------------------------------------------
@@ -139,7 +139,7 @@ public function testSetProtocolWorks()
     {
         $this->message->setProtocolVersion('1.1');
 
-        $this->assertEquals('1.1', $this->message->getProtocolVersion());
+        $this->assertSame('1.1', $this->message->getProtocolVersion());
     }
 
     //--------------------------------------------------------------------
@@ -148,7 +148,7 @@ public function testSetProtocolWorksWithNonNumericVersion()
     {
         $this->message->setProtocolVersion('HTTP/1.1');
 
-        $this->assertEquals('1.1', $this->message->getProtocolVersion());
+        $this->assertSame('1.1', $this->message->getProtocolVersion());
     }
 
     //--------------------------------------------------------------------
@@ -167,7 +167,7 @@ public function testBodyBasics()
 
         $this->message->setBody($body);
 
-        $this->assertEquals($body, $this->message->getBody());
+        $this->assertSame($body, $this->message->getBody());
     }
 
     //--------------------------------------------------------------------
@@ -178,7 +178,7 @@ public function testAppendBody()
 
         $this->message->appendBody('\n');
 
-        $this->assertEquals('moo' . '\n', $this->message->getBody());
+        $this->assertSame('moo' . '\n', $this->message->getBody());
     }
 
     //--------------------------------------------------------------------
@@ -187,7 +187,7 @@ public function testSetHeaderReplacingHeader()
     {
         $this->message->setHeader('Accept', 'json');
 
-        $this->assertEquals('json', $this->message->getHeaderLine('Accept'));
+        $this->assertSame('json', $this->message->getHeaderLine('Accept'));
     }
 
     public function testSetHeaderDuplicateSettings()
@@ -195,7 +195,7 @@ public function testSetHeaderDuplicateSettings()
         $this->message->setHeader('Accept', 'json');
         $this->message->setHeader('Accept', 'xml');
 
-        $this->assertEquals('xml', $this->message->getHeaderLine('Accept'));
+        $this->assertSame('xml', $this->message->getHeaderLine('Accept'));
     }
 
     public function testSetHeaderDuplicateSettingsInsensitive()
@@ -203,14 +203,14 @@ public function testSetHeaderDuplicateSettingsInsensitive()
         $this->message->setHeader('Accept', 'json');
         $this->message->setHeader('accept', 'xml');
 
-        $this->assertEquals('xml', $this->message->getHeaderLine('Accept'));
+        $this->assertSame('xml', $this->message->getHeaderLine('Accept'));
     }
 
     public function testSetHeaderArrayValues()
     {
         $this->message->setHeader('Accept', ['json', 'html', 'xml']);
 
-        $this->assertEquals('json, html, xml', $this->message->getHeaderLine('Accept'));
+        $this->assertSame('json, html, xml', $this->message->getHeaderLine('Accept'));
     }
 
     public function provideArrayHeaderValue()
@@ -240,7 +240,7 @@ public function testSetHeaderWithExistingArrayValuesAppendStringValue($arrayHead
         $this->message->setHeader('Accept', $arrayHeaderValue);
         $this->message->setHeader('Accept', 'xml');
 
-        $this->assertEquals('json, html, xml', $this->message->getHeaderLine('Accept'));
+        $this->assertSame('json, html, xml', $this->message->getHeaderLine('Accept'));
     }
 
     /**
@@ -251,7 +251,7 @@ public function testSetHeaderWithExistingArrayValuesAppendArrayValue($arrayHeade
         $this->message->setHeader('Accept', $arrayHeaderValue);
         $this->message->setHeader('Accept', ['xml']);
 
-        $this->assertEquals('json, html, xml', $this->message->getHeaderLine('Accept'));
+        $this->assertSame('json, html, xml', $this->message->getHeaderLine('Accept'));
     }
 
     public function testSetHeaderWithExistingArrayValuesAppendNullValue()
@@ -259,7 +259,7 @@ public function testSetHeaderWithExistingArrayValuesAppendNullValue()
         $this->message->setHeader('Accept', ['json', 'html', 'xml']);
         $this->message->setHeader('Accept', null);
 
-        $this->assertEquals('json, html, xml', $this->message->getHeaderLine('Accept'));
+        $this->assertSame('json, html, xml', $this->message->getHeaderLine('Accept'));
     }
 
     //--------------------------------------------------------------------
@@ -311,7 +311,7 @@ public function testPopulateHeadersKeyNotExists()
 
         $this->message->populateHeaders();
 
-        $this->assertEquals('', $this->message->header('accept-charset')->getValue());
+        $this->assertSame('', $this->message->header('accept-charset')->getValue());
         $this->message->removeHeader('accept-charset');
         $_SERVER = $original; // restore so code coverage doesn't break
     }
@@ -329,8 +329,8 @@ public function testPopulateHeaders()
 
         $this->message->populateHeaders();
 
-        $this->assertEquals('text/html; charset=utf-8', $this->message->header('content-type')->getValue());
-        $this->assertEquals('en-us,en;q=0.50', $this->message->header('accept-language')->getValue());
+        $this->assertSame('text/html; charset=utf-8', $this->message->header('content-type')->getValue());
+        $this->assertSame('en-us,en;q=0.50', $this->message->header('accept-language')->getValue());
         $this->message->removeHeader('content-type');
         $this->message->removeHeader('accept-language');
         $_SERVER = $original; // restore so code coverage doesn't break
diff --git a/tests/system/HTTP/NegotiateTest.php b/tests/system/HTTP/NegotiateTest.php
index 6c7799297058..fabb5cfa2949 100644
--- a/tests/system/HTTP/NegotiateTest.php
+++ b/tests/system/HTTP/NegotiateTest.php
@@ -46,13 +46,13 @@ public function testNegotiateMediaFindsHighestMatch()
         $this->request->setHeader('Accept', 'text/plain; q=0.5, text/html, text/x-dvi; q=0.8, text/x-c');
         $this->negotiate->setRequest($this->request);
 
-        $this->assertEquals('text/html', $this->negotiate->media(['text/html', 'text/x-c', 'text/x-dvi', 'text/plain']));
-        $this->assertEquals('text/x-c', $this->negotiate->media(['text/x-c', 'text/x-dvi', 'text/plain']));
-        $this->assertEquals('text/x-dvi', $this->negotiate->media(['text/plain', 'text/x-dvi']));
-        $this->assertEquals('text/x-dvi', $this->negotiate->media(['text/x-dvi']));
+        $this->assertSame('text/html', $this->negotiate->media(['text/html', 'text/x-c', 'text/x-dvi', 'text/plain']));
+        $this->assertSame('text/x-c', $this->negotiate->media(['text/x-c', 'text/x-dvi', 'text/plain']));
+        $this->assertSame('text/x-dvi', $this->negotiate->media(['text/plain', 'text/x-dvi']));
+        $this->assertSame('text/x-dvi', $this->negotiate->media(['text/x-dvi']));
 
         // No matches? Return the first that we support...
-        $this->assertEquals('text/md', $this->negotiate->media(['text/md']));
+        $this->assertSame('text/md', $this->negotiate->media(['text/md']));
     }
 
     //--------------------------------------------------------------------
@@ -61,10 +61,10 @@ public function testParseHeaderDeterminesCorrectPrecedence()
     {
         $header = $this->negotiate->parseHeader('text/*, text/plain, text/plain;format=flowed, */*');
 
-        $this->assertEquals('text/plain', $header[0]['value']);
-        $this->assertEquals('flowed', $header[0]['params']['format']);
-        $this->assertEquals('text/plain', $header[1]['value']);
-        $this->assertEquals('*/*', $header[3]['value']);
+        $this->assertSame('text/plain', $header[0]['value']);
+        $this->assertSame('flowed', $header[0]['params']['format']);
+        $this->assertSame('text/plain', $header[1]['value']);
+        $this->assertSame('*/*', $header[3]['value']);
     }
 
     //--------------------------------------------------------------------
@@ -73,7 +73,7 @@ public function testNegotiateMediaReturnsSupportedMatchWhenAsterisksInAvailable(
     {
         $this->request->setHeader('Accept', 'image/*, text/*');
 
-        $this->assertEquals('text/plain', $this->negotiate->media(['text/plain']));
+        $this->assertSame('text/plain', $this->negotiate->media(['text/plain']));
     }
 
     //--------------------------------------------------------------------
@@ -83,7 +83,7 @@ public function testNegotiateMediaRecognizesMediaTypes()
         // Image has a higher specificity, but is the wrong type...
         $this->request->setHeader('Accept', 'text/*, image/jpeg');
 
-        $this->assertEquals('text/plain', $this->negotiate->media(['text/plain']));
+        $this->assertSame('text/plain', $this->negotiate->media(['text/plain']));
     }
 
     //--------------------------------------------------------------------
@@ -93,8 +93,8 @@ public function testNegotiateMediaSupportsStrictMatching()
         // Image has a higher specificity, but is the wrong type...
         $this->request->setHeader('Accept', 'text/md, image/jpeg');
 
-        $this->assertEquals('text/plain', $this->negotiate->media(['text/plain']));
-        $this->assertEquals('', $this->negotiate->media(['text/plain'], true));
+        $this->assertSame('text/plain', $this->negotiate->media(['text/plain']));
+        $this->assertSame('', $this->negotiate->media(['text/plain'], true));
     }
 
     //--------------------------------------------------------------------
@@ -106,18 +106,18 @@ public function testAcceptCharsetMatchesBasics()
     {
         $this->request->setHeader('Accept-Charset', 'iso-8859-5, unicode-1-1;q=0.8');
 
-        $this->assertEquals('iso-8859-5', $this->negotiate->charset(['iso-8859-5', 'unicode-1-1']));
-        $this->assertEquals('unicode-1-1', $this->negotiate->charset(['utf-8', 'unicode-1-1']));
+        $this->assertSame('iso-8859-5', $this->negotiate->charset(['iso-8859-5', 'unicode-1-1']));
+        $this->assertSame('unicode-1-1', $this->negotiate->charset(['utf-8', 'unicode-1-1']));
 
         // No match will default to utf-8
-        $this->assertEquals('utf-8', $this->negotiate->charset(['iso-8859', 'unicode-1-2']));
+        $this->assertSame('utf-8', $this->negotiate->charset(['iso-8859', 'unicode-1-2']));
     }
 
     //--------------------------------------------------------------------
 
     public function testNegotiateEncodingReturnsFirstIfNoAcceptHeaderExists()
     {
-        $this->assertEquals('compress', $this->negotiate->encoding(['compress', 'gzip']));
+        $this->assertSame('compress', $this->negotiate->encoding(['compress', 'gzip']));
     }
 
     //--------------------------------------------------------------------
@@ -126,9 +126,9 @@ public function testNegotiatesEncodingBasics()
     {
         $this->request->setHeader('Accept-Encoding', 'gzip;q=1.0, identity; q=0.4, compress;q=0.5');
 
-        $this->assertEquals('gzip', $this->negotiate->encoding(['gzip', 'compress']));
-        $this->assertEquals('compress', $this->negotiate->encoding(['compress']));
-        $this->assertEquals('identity', $this->negotiate->encoding());
+        $this->assertSame('gzip', $this->negotiate->encoding(['gzip', 'compress']));
+        $this->assertSame('compress', $this->negotiate->encoding(['compress']));
+        $this->assertSame('identity', $this->negotiate->encoding());
     }
 
     //--------------------------------------------------------------------
@@ -137,9 +137,9 @@ public function testAcceptLanguageBasics()
     {
         $this->request->setHeader('Accept-Language', 'da, en-gb;q=0.8, en;q=0.7');
 
-        $this->assertEquals('da', $this->negotiate->language(['da', 'en']));
-        $this->assertEquals('en-gb', $this->negotiate->language(['en-gb', 'en']));
-        $this->assertEquals('en', $this->negotiate->language(['en']));
+        $this->assertSame('da', $this->negotiate->language(['da', 'en']));
+        $this->assertSame('en-gb', $this->negotiate->language(['en-gb', 'en']));
+        $this->assertSame('en', $this->negotiate->language(['en']));
     }
 
     //--------------------------------------------------------------------
@@ -151,7 +151,7 @@ public function testAcceptLanguageMatchesBroadly()
     {
         $this->request->setHeader('Accept-Language', 'fr-FR,fr;q=0.9,en-US;q=0.8,en;q=0.7');
 
-        $this->assertEquals('fr', $this->negotiate->language(['fr', 'en']));
+        $this->assertSame('fr', $this->negotiate->language(['fr', 'en']));
     }
 
     public function testBestMatchEmpty()
@@ -163,42 +163,42 @@ public function testBestMatchEmpty()
     public function testBestMatchNoHeader()
     {
         $this->request->setHeader('Accept', '');
-        $this->assertEquals('', $this->negotiate->media(['apple', 'banana'], true));
-        $this->assertEquals('apple/mac', $this->negotiate->media(['apple/mac', 'banana/yellow'], false));
+        $this->assertSame('', $this->negotiate->media(['apple', 'banana'], true));
+        $this->assertSame('apple/mac', $this->negotiate->media(['apple/mac', 'banana/yellow'], false));
     }
 
     public function testBestMatchNotAcceptable()
     {
         $this->request->setHeader('Accept', 'popcorn/cheddar');
-        $this->assertEquals('apple/mac', $this->negotiate->media(['apple/mac', 'banana/yellow'], false));
-        $this->assertEquals('banana/yellow', $this->negotiate->media(['banana/yellow', 'apple/mac'], false));
+        $this->assertSame('apple/mac', $this->negotiate->media(['apple/mac', 'banana/yellow'], false));
+        $this->assertSame('banana/yellow', $this->negotiate->media(['banana/yellow', 'apple/mac'], false));
     }
 
     public function testBestMatchFirstSupported()
     {
         $this->request->setHeader('Accept', 'popcorn/cheddar, */*');
-        $this->assertEquals('apple/mac', $this->negotiate->media(['apple/mac', 'banana/yellow'], false));
+        $this->assertSame('apple/mac', $this->negotiate->media(['apple/mac', 'banana/yellow'], false));
     }
 
     public function testBestMatchLowQuality()
     {
         $this->request->setHeader('Accept', 'popcorn/cheddar;q=0, apple/mac, */*');
-        $this->assertEquals('apple/mac', $this->negotiate->media(['apple/mac', 'popcorn/cheddar'], false));
-        $this->assertEquals('apple/mac', $this->negotiate->media(['popcorn/cheddar', 'apple/mac'], false));
+        $this->assertSame('apple/mac', $this->negotiate->media(['apple/mac', 'popcorn/cheddar'], false));
+        $this->assertSame('apple/mac', $this->negotiate->media(['popcorn/cheddar', 'apple/mac'], false));
     }
 
     public function testBestMatchOnlyLowQuality()
     {
         $this->request->setHeader('Accept', 'popcorn/cheddar;q=0');
         // the first supported should be returned, since nothing will make us happy
-        $this->assertEquals('apple/mac', $this->negotiate->media(['apple/mac', 'popcorn/cheddar'], false));
-        $this->assertEquals('popcorn/cheddar', $this->negotiate->media(['popcorn/cheddar', 'apple/mac'], false));
+        $this->assertSame('apple/mac', $this->negotiate->media(['apple/mac', 'popcorn/cheddar'], false));
+        $this->assertSame('popcorn/cheddar', $this->negotiate->media(['popcorn/cheddar', 'apple/mac'], false));
     }
 
     public function testParameterMatching()
     {
         $this->request->setHeader('Accept', 'popcorn/cheddar;a=0;b=1');
-        $this->assertEquals('popcorn/cheddar;a=2', $this->negotiate->media(['popcorn/cheddar;a=2'], false));
-        $this->assertEquals('popcorn/cheddar;a=0', $this->negotiate->media(['popcorn/cheddar;a=0', 'popcorn/cheddar;a=2;b=1'], false));
+        $this->assertSame('popcorn/cheddar;a=2', $this->negotiate->media(['popcorn/cheddar;a=2'], false));
+        $this->assertSame('popcorn/cheddar;a=0', $this->negotiate->media(['popcorn/cheddar;a=0', 'popcorn/cheddar;a=2;b=1'], false));
     }
 }
diff --git a/tests/system/HTTP/RedirectResponseTest.php b/tests/system/HTTP/RedirectResponseTest.php
index fe798675e29f..9aad6a681a63 100644
--- a/tests/system/HTTP/RedirectResponseTest.php
+++ b/tests/system/HTTP/RedirectResponseTest.php
@@ -49,7 +49,7 @@ public function testRedirectToFullURI()
         $response = $response->to('http://example.com/foo');
 
         $this->assertTrue($response->hasHeader('Location'));
-        $this->assertEquals('http://example.com/foo', $response->getHeaderLine('Location'));
+        $this->assertSame('http://example.com/foo', $response->getHeaderLine('Location'));
     }
 
     //--------------------------------------------------------------------
@@ -63,14 +63,14 @@ public function testRedirectRoute()
         $response->route('exampleRoute');
 
         $this->assertTrue($response->hasHeader('Location'));
-        $this->assertEquals('http://example.com/index.php/exampleRoute', $response->getHeaderLine('Location'));
+        $this->assertSame('http://example.com/index.php/exampleRoute', $response->getHeaderLine('Location'));
 
         $this->routes->add('exampleRoute', 'Home::index', ['as' => 'home']);
 
         $response->route('home');
 
         $this->assertTrue($response->hasHeader('Location'));
-        $this->assertEquals('http://example.com/index.php/exampleRoute', $response->getHeaderLine('Location'));
+        $this->assertSame('http://example.com/index.php/exampleRoute', $response->getHeaderLine('Location'));
     }
 
     public function testRedirectRouteBad()
@@ -93,7 +93,7 @@ public function testRedirectRelativeConvertsToFullURI()
         $response = $response->to('/foo');
 
         $this->assertTrue($response->hasHeader('Location'));
-        $this->assertEquals('http://example.com/index.php/foo', $response->getHeaderLine('Location'));
+        $this->assertSame('http://example.com/index.php/foo', $response->getHeaderLine('Location'));
     }
 
     //--------------------------------------------------------------------
@@ -114,8 +114,8 @@ public function testWithInput()
 
         $this->assertSame($response, $returned);
         $this->assertArrayHasKey('_ci_old_input', $_SESSION);
-        $this->assertEquals('bar', $_SESSION['_ci_old_input']['get']['foo']);
-        $this->assertEquals('baz', $_SESSION['_ci_old_input']['post']['bar']);
+        $this->assertSame('bar', $_SESSION['_ci_old_input']['get']['foo']);
+        $this->assertSame('baz', $_SESSION['_ci_old_input']['post']['bar']);
     }
 
     //--------------------------------------------------------------------
@@ -173,7 +173,7 @@ public function testRedirectBack()
         $response = new RedirectResponse(new App());
 
         $returned = $response->back();
-        $this->assertEquals('http://somewhere.com', $returned->header('location')->getValue());
+        $this->assertSame('http://somewhere.com', $returned->header('location')->getValue());
     }
 
     /**
@@ -213,7 +213,7 @@ public function testRedirectRouteBaseUrl()
         $response->route('exampleRoute');
 
         $this->assertTrue($response->hasHeader('Location'));
-        $this->assertEquals('http://example.com/test/index.php/exampleRoute', $response->getHeaderLine('Location'));
+        $this->assertSame('http://example.com/test/index.php/exampleRoute', $response->getHeaderLine('Location'));
 
         Factories::reset('config');
     }
@@ -260,7 +260,7 @@ public function testWithHeaders()
 
         foreach ($baseResponse->headers() as $name => $header) {
             $this->assertTrue($response->hasHeader($name));
-            $this->assertEquals($header->getValue(), $response->header($name)->getValue());
+            $this->assertSame($header->getValue(), $response->header($name)->getValue());
         }
     }
 
diff --git a/tests/system/HTTP/RequestTest.php b/tests/system/HTTP/RequestTest.php
index c422b36ce7a4..8620c7d4d133 100644
--- a/tests/system/HTTP/RequestTest.php
+++ b/tests/system/HTTP/RequestTest.php
@@ -23,8 +23,9 @@ protected function setUp(): void
         parent::setUp();
 
         $this->request = new Request(new App());
-        $_POST         = [];
-        $_GET          = [];
+
+        $_POST = [];
+        $_GET  = [];
     }
 
     //--------------------------------------------------------------------
@@ -34,8 +35,8 @@ public function testFetchGlobalsSingleValue()
         $_POST['foo'] = 'bar';
         $_GET['bar']  = 'baz';
 
-        $this->assertEquals('bar', $this->request->fetchGlobal('post', 'foo'));
-        $this->assertEquals('baz', $this->request->fetchGlobal('get', 'bar'));
+        $this->assertSame('bar', $this->request->fetchGlobal('post', 'foo'));
+        $this->assertSame('baz', $this->request->fetchGlobal('get', 'bar'));
     }
 
     public function testFetchGlobalsReturnsNullWhenNotFound()
@@ -50,8 +51,8 @@ public function testFetchGlobalsFiltersValues()
             'bar' => 'baz',
         ]);
 
-        $this->assertEquals('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED));
-        $this->assertEquals('baz', $this->request->fetchGlobal('post', 'bar'));
+        $this->assertSame('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED));
+        $this->assertSame('baz', $this->request->fetchGlobal('post', 'bar'));
     }
 
     public function testFetchGlobalsWithFilterFlag()
@@ -61,8 +62,8 @@ public function testFetchGlobalsWithFilterFlag()
             'bar' => 'baz',
         ]);
 
-        $this->assertEquals('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
-        $this->assertEquals('baz', $this->request->fetchGlobal('post', 'bar'));
+        $this->assertSame('bar%3Cscript%3E', $this->request->fetchGlobal('post', 'foo', FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
+        $this->assertSame('baz', $this->request->fetchGlobal('post', 'bar'));
     }
 
     public function testFetchGlobalReturnsAllWhenEmpty()
@@ -75,7 +76,7 @@ public function testFetchGlobalReturnsAllWhenEmpty()
         ];
         $this->request->setGlobal('post', $post);
 
-        $this->assertEquals($post, $this->request->fetchGlobal('post'));
+        $this->assertSame($post, $this->request->fetchGlobal('post'));
     }
 
     public function testFetchGlobalFiltersAllValues()
@@ -94,7 +95,7 @@ public function testFetchGlobalFiltersAllValues()
             'yyy' => 'zzz%3Cscript%3E',
         ];
 
-        $this->assertEquals($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED));
+        $this->assertSame($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED));
     }
 
     public function testFetchGlobalFilterWithFlagAllValues()
@@ -113,7 +114,7 @@ public function testFetchGlobalFilterWithFlagAllValues()
             'yyy' => 'zzz%3Cscript%3E',
         ];
 
-        $this->assertEquals($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
+        $this->assertSame($expected, $this->request->fetchGlobal('post', null, FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
     }
 
     public function testFetchGlobalReturnsSelectedKeys()
@@ -130,7 +131,7 @@ public function testFetchGlobalReturnsSelectedKeys()
             'bar' => 'baz',
         ];
 
-        $this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar']));
+        $this->assertSame($expected, $this->request->fetchGlobal('post', ['foo', 'bar']));
     }
 
     public function testFetchGlobalFiltersSelectedValues()
@@ -147,7 +148,7 @@ public function testFetchGlobalFiltersSelectedValues()
             'bar' => 'baz%3Cscript%3E',
         ];
 
-        $this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED));
+        $this->assertSame($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED));
     }
 
     public function testFetchGlobalFilterWithFlagSelectedValues()
@@ -164,7 +165,7 @@ public function testFetchGlobalFilterWithFlagSelectedValues()
             'bar' => 'baz%3Cscript%3E',
         ];
 
-        $this->assertEquals($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
+        $this->assertSame($expected, $this->request->fetchGlobal('post', ['foo', 'bar'], FILTER_SANITIZE_ENCODED, FILTER_FLAG_STRIP_BACKTICK));
     }
 
     /**
@@ -174,19 +175,15 @@ public function testFetchGlobalReturnsArrayValues()
     {
         $post = [
             'ANNOUNCEMENTS' => [
-                1 => [
-                    'DETAIL' => 'asdf',
-                ],
-                2 => [
-                    'DETAIL' => 'sdfg',
-                ],
+                1 => ['DETAIL' => 'asdf'],
+                2 => ['DETAIL' => 'sdfg'],
             ],
             'submit' => 'SAVE',
         ];
         $this->request->setGlobal('post', $post);
         $result = $this->request->fetchGlobal('post');
 
-        $this->assertEquals($post, $result);
+        $this->assertSame($post, $result);
         $this->assertIsArray($result['ANNOUNCEMENTS']);
         $this->assertCount(2, $result['ANNOUNCEMENTS']);
     }
@@ -202,7 +199,7 @@ public function testFetchGlobalWithArrayTop()
         ];
         $this->request->setGlobal('post', $post);
 
-        $this->assertEquals(['address' => ['zipcode' => 90210]], $this->request->fetchGlobal('post', 'clients'));
+        $this->assertSame(['address' => ['zipcode' => 90210]], $this->request->fetchGlobal('post', 'clients'));
     }
 
     public function testFetchGlobalWithArrayChildNumeric()
@@ -223,7 +220,7 @@ public function testFetchGlobalWithArrayChildNumeric()
         ];
         $this->request->setGlobal('post', $post);
 
-        $this->assertEquals(['zipcode' => 60610], $this->request->fetchGlobal('post', 'clients[1][address]'));
+        $this->assertSame(['zipcode' => 60610], $this->request->fetchGlobal('post', 'clients[1][address]'));
     }
 
     public function testFetchGlobalWithArrayChildElement()
@@ -237,7 +234,7 @@ public function testFetchGlobalWithArrayChildElement()
         ];
         $this->request->setGlobal('post', $post);
 
-        $this->assertEquals(['zipcode' => 90210], $this->request->fetchGlobal('post', 'clients[address]'));
+        $this->assertSame(['zipcode' => 90210], $this->request->fetchGlobal('post', 'clients[address]'));
         $this->assertNull($this->request->fetchGlobal('post', 'clients[zipcode]'));
     }
 
@@ -253,7 +250,7 @@ public function testFetchGlobalWithKeylessArrayChildElement()
         ];
         $this->request->setGlobal('post', $post);
 
-        $this->assertEquals([['a']], $this->request->fetchGlobal('post', 'clients[stuff]'));
+        $this->assertSame([['a']], $this->request->fetchGlobal('post', 'clients[stuff]'));
     }
 
     public function testFetchGlobalWithArrayLastElement()
@@ -267,7 +264,7 @@ public function testFetchGlobalWithArrayLastElement()
         ];
         $this->request->setGlobal('post', $post);
 
-        $this->assertEquals(90210, $this->request->fetchGlobal('post', 'clients[address][zipcode]'));
+        $this->assertSame('90210', $this->request->fetchGlobal('post', 'clients[address][zipcode]'));
     }
 
     public function testFetchGlobalWithEmptyNotation()
@@ -289,7 +286,7 @@ public function testFetchGlobalWithEmptyNotation()
         ];
         $this->request->setGlobal('post', $post);
 
-        $this->assertEquals($expected, $this->request->fetchGlobal('post', 'clients[]'));
+        $this->assertSame($expected, $this->request->fetchGlobal('post', 'clients[]'));
     }
 
     //--------------------------------------------------------------------
@@ -358,7 +355,7 @@ public function testFetchGlobalFiltersWithNull()
         ];
         $this->request->setGlobal('post', $post);
 
-        $this->assertEquals($expected, $this->request->fetchGlobal('post', null, FILTER_VALIDATE_INT));
+        $this->assertSame($expected, $this->request->fetchGlobal('post', null, FILTER_VALIDATE_INT));
     }
 
     public function testFetchGlobalFiltersWithValue()
@@ -417,7 +414,7 @@ public function testFetchGlobalFiltersWithValue()
         ];
         $this->request->setGlobal('post', $post);
 
-        $this->assertEquals($expected, $this->request->fetchGlobal('post', 'people', FILTER_VALIDATE_INT));
+        $this->assertSame($expected, $this->request->fetchGlobal('post', 'people', FILTER_VALIDATE_INT));
     }
 
     public function testFetchGlobalFiltersWithValues()
@@ -482,7 +479,7 @@ public function testFetchGlobalFiltersWithValues()
         ];
         $this->request->setGlobal('post', $post);
 
-        $this->assertEquals($expected, $this->request->fetchGlobal('post', ['address', 'people'], FILTER_VALIDATE_INT));
+        $this->assertSame($expected, $this->request->fetchGlobal('post', ['address', 'people'], FILTER_VALIDATE_INT));
     }
 
     public function testFetchGlobalFiltersWithArrayChildElement()
@@ -529,7 +526,7 @@ public function testFetchGlobalFiltersWithArrayChildElement()
         ];
         $this->request->setGlobal('post', $post);
 
-        $this->assertEquals($expected, $this->request->fetchGlobal('post', 'people[0]', FILTER_VALIDATE_INT));
+        $this->assertSame($expected, $this->request->fetchGlobal('post', 'people[0]', FILTER_VALIDATE_INT));
     }
 
     //--------------------------------------------------------------------
@@ -585,14 +582,14 @@ public function ipAddressChecks()
      */
     public function testValidIPAddress($expected, $address, $type = null)
     {
-        $this->assertEquals($expected, $this->request->isValidIP($address, $type));
+        $this->assertSame($expected, $this->request->isValidIP($address, $type));
     }
 
     //--------------------------------------------------------------------
 
     public function testGetIPAddressDefault()
     {
-        $this->assertEquals('0.0.0.0', $this->request->getIPAddress());
+        $this->assertSame('0.0.0.0', $this->request->getIPAddress());
     }
 
     public function testGetIPAddressNormal()
@@ -600,9 +597,9 @@ public function testGetIPAddressNormal()
         $expected               = '123.123.123.123';
         $_SERVER['REMOTE_ADDR'] = $expected;
         $this->request          = new Request(new App());
-        $this->assertEquals($expected, $this->request->getIPAddress());
+        $this->assertSame($expected, $this->request->getIPAddress());
         // call a second time to exercise the initial conditional block in getIPAddress()
-        $this->assertEquals($expected, $this->request->getIPAddress());
+        $this->assertSame($expected, $this->request->getIPAddress());
     }
 
     public function testGetIPAddressThruProxy()
@@ -615,7 +612,7 @@ public function testGetIPAddressThruProxy()
         $this->request                   = new Request($config);
 
         // we should see the original forwarded address
-        $this->assertEquals($expected, $this->request->getIPAddress());
+        $this->assertSame($expected, $this->request->getIPAddress());
     }
 
     public function testGetIPAddressThruProxyInvalid()
@@ -628,7 +625,7 @@ public function testGetIPAddressThruProxyInvalid()
         $this->request                   = new Request($config);
 
         // spoofed address invalid
-        $this->assertEquals('10.0.1.200', $this->request->getIPAddress());
+        $this->assertSame('10.0.1.200', $this->request->getIPAddress());
     }
 
     public function testGetIPAddressThruProxyNotWhitelisted()
@@ -641,7 +638,7 @@ public function testGetIPAddressThruProxyNotWhitelisted()
         $this->request                   = new Request($config);
 
         // spoofed address invalid
-        $this->assertEquals('10.10.1.200', $this->request->getIPAddress());
+        $this->assertSame('10.10.1.200', $this->request->getIPAddress());
     }
 
     public function testGetIPAddressThruProxySubnet()
@@ -654,7 +651,7 @@ public function testGetIPAddressThruProxySubnet()
         $this->request                   = new Request($config);
 
         // we should see the original forwarded address
-        $this->assertEquals($expected, $this->request->getIPAddress());
+        $this->assertSame($expected, $this->request->getIPAddress());
     }
 
     public function testGetIPAddressThruProxyOutofSubnet()
@@ -667,7 +664,7 @@ public function testGetIPAddressThruProxyOutofSubnet()
         $this->request                   = new Request($config);
 
         // we should see the original forwarded address
-        $this->assertEquals('192.168.5.21', $this->request->getIPAddress());
+        $this->assertSame('192.168.5.21', $this->request->getIPAddress());
     }
 
     //FIXME getIPAddress should have more testing, to 100% code coverage
@@ -677,7 +674,7 @@ public function testGetIPAddressThruProxyOutofSubnet()
     public function testMethodReturnsRightStuff()
     {
         // Defaults method to GET now.
-        $this->assertEquals('get', $this->request->getMethod());
-        $this->assertEquals('GET', $this->request->getMethod(true));
+        $this->assertSame('get', $this->request->getMethod());
+        $this->assertSame('GET', $this->request->getMethod(true));
     }
 }
diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php
index 6fa17cdb5fe9..475f7e078c20 100644
--- a/tests/system/HTTP/ResponseTest.php
+++ b/tests/system/HTTP/ResponseTest.php
@@ -37,7 +37,7 @@ public function testCanSetStatusCode()
 
         $response->setStatusCode(200);
 
-        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertSame(200, $response->getStatusCode());
     }
 
     //--------------------------------------------------------------------
@@ -69,7 +69,7 @@ public function testSetStatusCodeSetsReason()
 
         $response->setStatusCode(200);
 
-        $this->assertEquals('OK', $response->getReasonPhrase());
+        $this->assertSame('OK', $response->getReasonPhrase());
     }
 
     //--------------------------------------------------------------------
@@ -80,7 +80,7 @@ public function testCanSetCustomReasonCode()
 
         $response->setStatusCode(200, 'Not the mama');
 
-        $this->assertEquals('Not the mama', $response->getReasonPhrase());
+        $this->assertSame('Not the mama', $response->getReasonPhrase());
     }
 
     //--------------------------------------------------------------------
@@ -124,7 +124,7 @@ public function testSetStatusCodeInterpretsReason()
 
         $response->setStatusCode(300);
 
-        $this->assertEquals('Multiple Choices', $response->getReasonPhrase());
+        $this->assertSame('Multiple Choices', $response->getReasonPhrase());
     }
 
     //--------------------------------------------------------------------
@@ -135,7 +135,7 @@ public function testSetStatusCodeSavesCustomReason()
 
         $response->setStatusCode(300, 'My Little Pony');
 
-        $this->assertEquals('My Little Pony', $response->getReasonPhrase());
+        $this->assertSame('My Little Pony', $response->getReasonPhrase());
     }
 
     //--------------------------------------------------------------------
@@ -144,7 +144,7 @@ public function testGetReasonDefaultsToOK()
     {
         $response = new Response(new App());
 
-        $this->assertEquals('OK', $response->getReasonPhrase());
+        $this->assertSame('OK', $response->getReasonPhrase());
     }
 
     //--------------------------------------------------------------------
@@ -160,7 +160,7 @@ public function testSetDateRemembersDateInUTC()
 
         $header = $response->getHeaderLine('Date');
 
-        $this->assertEquals($date->format('D, d M Y H:i:s') . ' GMT', $header);
+        $this->assertSame($date->format('D, d M Y H:i:s') . ' GMT', $header);
     }
 
     //--------------------------------------------------------------------
@@ -178,7 +178,7 @@ public function testSetLink()
         $pager->store('default', 3, 10, 200);
         $response->setLink($pager);
 
-        $this->assertEquals(
+        $this->assertSame(
             '<http://example.com/test/index.php?page=1>; rel="first",<http://example.com/test/index.php?page=2>; rel="prev",<http://example.com/test/index.php?page=4>; rel="next",<http://example.com/test/index.php?page=20>; rel="last"',
             $response->header('Link')->getValue()
         );
@@ -186,7 +186,7 @@ public function testSetLink()
         $pager->store('default', 1, 10, 200);
         $response->setLink($pager);
 
-        $this->assertEquals(
+        $this->assertSame(
             '<http://example.com/test/index.php?page=2>; rel="next",<http://example.com/test/index.php?page=20>; rel="last"',
             $response->header('Link')->getValue()
         );
@@ -194,7 +194,7 @@ public function testSetLink()
         $pager->store('default', 20, 10, 200);
         $response->setLink($pager);
 
-        $this->assertEquals(
+        $this->assertSame(
             '<http://example.com/test/index.php?page=1>; rel="first",<http://example.com/test/index.php?page=19>; rel="prev"',
             $response->header('Link')->getValue()
         );
@@ -208,7 +208,7 @@ public function testSetContentType()
 
         $response->setContentType('text/json');
 
-        $this->assertEquals('text/json; charset=UTF-8', $response->getHeaderLine('Content-Type'));
+        $this->assertSame('text/json; charset=UTF-8', $response->getHeaderLine('Content-Type'));
     }
 
     //--------------------------------------------------------------------
@@ -219,7 +219,7 @@ public function testNoCache()
 
         $response->noCache();
 
-        $this->assertEquals('no-store, max-age=0, no-cache', $response->getHeaderLine('Cache-control'));
+        $this->assertSame('no-store, max-age=0, no-cache', $response->getHeaderLine('Cache-control'));
     }
 
     //--------------------------------------------------------------------
@@ -239,9 +239,9 @@ public function testSetCache()
 
         $response->setCache($options);
 
-        $this->assertEquals('12345678', $response->getHeaderLine('ETag'));
-        $this->assertEquals($date, $response->getHeaderLine('Last-Modified'));
-        $this->assertEquals('max-age=300, must-revalidate', $response->getHeaderLine('Cache-Control'));
+        $this->assertSame('12345678', $response->getHeaderLine('ETag'));
+        $this->assertSame($date, $response->getHeaderLine('Last-Modified'));
+        $this->assertSame('max-age=300, must-revalidate', $response->getHeaderLine('Cache-Control'));
     }
 
     public function testSetCacheNoOptions()
@@ -252,7 +252,7 @@ public function testSetCacheNoOptions()
 
         $response->setCache($options);
 
-        $this->assertEquals('no-store, max-age=0, no-cache', $response->getHeaderLine('Cache-Control'));
+        $this->assertSame('no-store, max-age=0, no-cache', $response->getHeaderLine('Cache-Control'));
     }
 
     //--------------------------------------------------------------------
@@ -268,7 +268,7 @@ public function testSetLastModifiedWithDateTimeObject()
 
         $header = $response->getHeaderLine('Last-Modified');
 
-        $this->assertEquals($date->format('D, d M Y H:i:s') . ' GMT', $header);
+        $this->assertSame($date->format('D, d M Y H:i:s') . ' GMT', $header);
     }
 
     //--------------------------------------------------------------------
@@ -280,8 +280,8 @@ public function testRedirectSetsDefaultCodeAndLocationHeader()
         $response->redirect('example.com');
 
         $this->assertTrue($response->hasHeader('location'));
-        $this->assertEquals('example.com', $response->getHeaderLine('Location'));
-        $this->assertEquals(302, $response->getStatusCode());
+        $this->assertSame('example.com', $response->getHeaderLine('Location'));
+        $this->assertSame(302, $response->getStatusCode());
     }
 
     //--------------------------------------------------------------------
@@ -293,8 +293,8 @@ public function testRedirectSetsCode()
         $response->redirect('example.com', 'auto', 307);
 
         $this->assertTrue($response->hasHeader('location'));
-        $this->assertEquals('example.com', $response->getHeaderLine('Location'));
-        $this->assertEquals(307, $response->getStatusCode());
+        $this->assertSame('example.com', $response->getHeaderLine('Location'));
+        $this->assertSame(307, $response->getStatusCode());
     }
 
     //--------------------------------------------------------------------
@@ -304,7 +304,7 @@ public function testRedirectWithIIS()
         $_SERVER['SERVER_SOFTWARE'] = 'Microsoft-IIS';
         $response                   = new Response(new App());
         $response->redirect('example.com', 'auto', 307);
-        $this->assertEquals('0;url=example.com', $response->getHeaderLine('Refresh'));
+        $this->assertSame('0;url=example.com', $response->getHeaderLine('Refresh'));
     }
 
     //--------------------------------------------------------------------
@@ -359,7 +359,7 @@ public function testJSONWithArray()
         $response = new Response(new App());
         $response->setJSON($body);
 
-        $this->assertEquals($expected, $response->getJSON());
+        $this->assertSame($expected, $response->getJSON());
         $this->assertTrue(strpos($response->getHeaderLine('content-type'), 'application/json') !== false);
     }
 
@@ -378,7 +378,7 @@ public function testJSONGetFromNormalBody()
         $response = new Response(new App());
         $response->setBody($body);
 
-        $this->assertEquals($expected, $response->getJSON());
+        $this->assertSame($expected, $response->getJSON());
     }
 
     //--------------------------------------------------------------------
@@ -398,7 +398,7 @@ public function testXMLWithArray()
         $response = new Response(new App());
         $response->setXML($body);
 
-        $this->assertEquals($expected, $response->getXML());
+        $this->assertSame($expected, $response->getXML());
         $this->assertTrue(strpos($response->getHeaderLine('content-type'), 'application/xml') !== false);
     }
 
@@ -417,7 +417,7 @@ public function testXMLGetFromNormalBody()
         $response = new Response(new App());
         $response->setBody($body);
 
-        $this->assertEquals($expected, $response->getXML());
+        $this->assertSame($expected, $response->getXML());
     }
 
     //--------------------------------------------------------------------
@@ -498,7 +498,7 @@ public function testTemporaryRedirect11()
         $response->setProtocolVersion('HTTP/1.1');
         $response->redirect('/foo');
 
-        $this->assertEquals(303, $response->getStatusCode());
+        $this->assertSame(303, $response->getStatusCode());
     }
 
     public function testTemporaryRedirectGet11()
@@ -510,7 +510,7 @@ public function testTemporaryRedirectGet11()
         $response->setProtocolVersion('HTTP/1.1');
         $response->redirect('/foo');
 
-        $this->assertEquals(307, $response->getStatusCode());
+        $this->assertSame(307, $response->getStatusCode());
     }
 
     //--------------------------------------------------------------------
@@ -545,7 +545,7 @@ public function testPretendOutput()
         $actual = ob_get_contents();
         ob_end_clean();
 
-        $this->assertEquals('Happy days', $actual);
+        $this->assertSame('Happy days', $actual);
     }
 
     public function testInvalidSameSiteCookie()
diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php
index f2ae05229daf..e62cc07e9e6c 100644
--- a/tests/system/HTTP/URITest.php
+++ b/tests/system/HTTP/URITest.php
@@ -33,18 +33,18 @@ public function testConstructorSetsAllParts()
     {
         $uri = new URI('http://username:password@hostname:9090/path?arg=value#anchor');
 
-        $this->assertEquals('http', $uri->getScheme());
-        $this->assertEquals('username', $uri->getUserInfo());
-        $this->assertEquals('hostname', $uri->getHost());
-        $this->assertEquals('/path', $uri->getPath());
-        $this->assertEquals('arg=value', $uri->getQuery());
-        $this->assertEquals('9090', $uri->getPort());
-        $this->assertEquals('anchor', $uri->getFragment());
+        $this->assertSame('http', $uri->getScheme());
+        $this->assertSame('username', $uri->getUserInfo());
+        $this->assertSame('hostname', $uri->getHost());
+        $this->assertSame('/path', $uri->getPath());
+        $this->assertSame('arg=value', $uri->getQuery());
+        $this->assertSame(9090, $uri->getPort());
+        $this->assertSame('anchor', $uri->getFragment());
 
         // Password ignored by default for security reasons.
-        $this->assertEquals('username@hostname:9090', $uri->getAuthority());
+        $this->assertSame('username@hostname:9090', $uri->getAuthority());
 
-        $this->assertEquals(['path'], $uri->getSegments());
+        $this->assertSame(['path'], $uri->getSegments());
     }
 
     //--------------------------------------------------------------------
@@ -53,13 +53,13 @@ public function testSegmentsIsPopulatedRightForMultipleSegments()
     {
         $uri = new URI('http://hostname/path/to/script');
 
-        $this->assertEquals(['path', 'to', 'script'], $uri->getSegments());
-        $this->assertEquals('path', $uri->getSegment(1));
-        $this->assertEquals('to', $uri->getSegment(2));
-        $this->assertEquals('script', $uri->getSegment(3));
-        $this->assertEquals('', $uri->getSegment(4));
+        $this->assertSame(['path', 'to', 'script'], $uri->getSegments());
+        $this->assertSame('path', $uri->getSegment(1));
+        $this->assertSame('to', $uri->getSegment(2));
+        $this->assertSame('script', $uri->getSegment(3));
+        $this->assertSame('', $uri->getSegment(4));
 
-        $this->assertEquals(3, $uri->getTotalSegments());
+        $this->assertSame(3, $uri->getTotalSegments());
     }
 
     //--------------------------------------------------------------------
@@ -77,7 +77,7 @@ public function testSegmentOutOfRangeWithSilent()
     {
         $url = 'http://abc.com/a123/b/c';
         $uri = new URI($url);
-        $this->assertEquals('', $uri->setSilent()->getSegment(22));
+        $this->assertSame('', $uri->setSilent()->getSegment(22));
     }
 
     //--------------------------------------------------------------------
@@ -96,7 +96,7 @@ public function testSegmentOutOfRangeWithSilentAndDefaultValue()
     {
         $url = 'http://abc.com/a123/b/c';
         $uri = new URI($url);
-        $this->assertEquals('something', $uri->setSilent()->getSegment(22, 'something'));
+        $this->assertSame('something', $uri->setSilent()->getSegment(22, 'something'));
     }
 
     //--------------------------------------------------------------------
@@ -106,13 +106,13 @@ public function testSegmentsWithDefaultValueAndSilent()
         $uri = new URI('http://hostname/path/to');
         $uri->setSilent();
 
-        $this->assertEquals(['path', 'to'], $uri->getSegments());
-        $this->assertEquals('path', $uri->getSegment(1));
-        $this->assertEquals('to', $uri->getSegment(2, 'different'));
-        $this->assertEquals('script', $uri->getSegment(3, 'script'));
-        $this->assertEquals('', $uri->getSegment(3));
+        $this->assertSame(['path', 'to'], $uri->getSegments());
+        $this->assertSame('path', $uri->getSegment(1));
+        $this->assertSame('to', $uri->getSegment(2, 'different'));
+        $this->assertSame('script', $uri->getSegment(3, 'script'));
+        $this->assertSame('', $uri->getSegment(3));
 
-        $this->assertEquals(2, $uri->getTotalSegments());
+        $this->assertSame(2, $uri->getTotalSegments());
     }
 
     //--------------------------------------------------------------------
@@ -122,11 +122,11 @@ public function testSegmentOutOfRangeWithDefaultValuesAndSilent()
         $uri = new URI('http://hostname/path/to/script');
         $uri->setSilent();
 
-        $this->assertEquals('', $uri->getSegment(22));
-        $this->assertEquals('something', $uri->getSegment(33, 'something'));
+        $this->assertSame('', $uri->getSegment(22));
+        $this->assertSame('something', $uri->getSegment(33, 'something'));
 
-        $this->assertEquals(3, $uri->getTotalSegments());
-        $this->assertEquals(['path', 'to', 'script'], $uri->getSegments());
+        $this->assertSame(3, $uri->getTotalSegments());
+        $this->assertSame(['path', 'to', 'script'], $uri->getSegments());
     }
 
     //--------------------------------------------------------------------
@@ -138,7 +138,7 @@ public function testCanCastAsString()
 
         $expected = 'http://username@hostname:9090/path?arg=value#anchor';
 
-        $this->assertEquals($expected, (string) $uri);
+        $this->assertSame($expected, (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -147,11 +147,11 @@ public function testSimpleUri()
     {
         $url = 'http://example.com';
         $uri = new URI($url);
-        $this->assertEquals($url, (string) $uri);
+        $this->assertSame($url, (string) $uri);
 
         $url = 'http://example.com/';
         $uri = new URI($url);
-        $this->assertEquals($url, (string) $uri);
+        $this->assertSame($url, (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -160,10 +160,10 @@ public function testEmptyUri()
     {
         $url = '';
         $uri = new URI($url);
-        $this->assertEquals('http://' . $url, (string) $uri);
+        $this->assertSame('http://' . $url, (string) $uri);
         $url = '/';
         $uri = new URI($url);
-        $this->assertEquals('http://', (string) $uri);
+        $this->assertSame('http://', (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -181,10 +181,10 @@ public function testMissingScheme()
     {
         $url = 'http://foo.bar/baz';
         $uri = new URI($url);
-        $this->assertEquals('http', $uri->getScheme());
-        $this->assertEquals('foo.bar', $uri->getAuthority());
-        $this->assertEquals('/baz', $uri->getPath());
-        $this->assertEquals($url, (string) $uri);
+        $this->assertSame('http', $uri->getScheme());
+        $this->assertSame('foo.bar', $uri->getAuthority());
+        $this->assertSame('/baz', $uri->getPath());
+        $this->assertSame($url, (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -194,7 +194,7 @@ public function testSchemeSub()
         $url = 'example.com';
         $uri = new URI('http://' . $url);
         $uri->setScheme('x');
-        $this->assertEquals('x://' . $url, (string) $uri);
+        $this->assertSame('x://' . $url, (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -207,8 +207,8 @@ public function testSetSchemeSetsValue()
         $expected = 'https://example.com/path';
 
         $uri->setScheme('https');
-        $this->assertEquals('https', $uri->getScheme());
-        $this->assertEquals($expected, (string) $uri);
+        $this->assertSame('https', $uri->getScheme());
+        $this->assertSame($expected, (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -221,8 +221,8 @@ public function testSetUserInfoSetsValue()
         $expected = 'http://user@example.com/path';
 
         $uri->setUserInfo('user', 'password');
-        $this->assertEquals('user', $uri->getUserInfo());
-        $this->assertEquals($expected, (string) $uri);
+        $this->assertSame('user', $uri->getUserInfo());
+        $this->assertSame($expected, (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -235,15 +235,15 @@ public function testUserInfoCanShowPassword()
         $expected = 'http://user@example.com/path';
 
         $uri->setUserInfo('user', 'password');
-        $this->assertEquals('user', $uri->getUserInfo());
-        $this->assertEquals($expected, (string) $uri);
+        $this->assertSame('user', $uri->getUserInfo());
+        $this->assertSame($expected, (string) $uri);
 
         $uri->showPassword();
 
         $expected = 'http://user:password@example.com/path';
 
-        $this->assertEquals('user:password', $uri->getUserInfo());
-        $this->assertEquals($expected, (string) $uri);
+        $this->assertSame('user:password', $uri->getUserInfo());
+        $this->assertSame($expected, (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -256,8 +256,8 @@ public function testSetHostSetsValue()
         $expected = 'http://another.com/path';
 
         $uri->setHost('another.com');
-        $this->assertEquals('another.com', $uri->getHost());
-        $this->assertEquals($expected, (string) $uri);
+        $this->assertSame('another.com', $uri->getHost());
+        $this->assertSame($expected, (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -270,8 +270,8 @@ public function testSetPortSetsValue()
         $expected = 'http://example.com:9000/path';
 
         $uri->setPort(9000);
-        $this->assertEquals(9000, $uri->getPort());
-        $this->assertEquals($expected, (string) $uri);
+        $this->assertSame(9000, $uri->getPort());
+        $this->assertSame($expected, (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -345,8 +345,8 @@ public function testSetPathSetsValue()
         $expected = 'http://example.com/somewhere/else';
 
         $uri->setPath('somewhere/else');
-        $this->assertEquals('somewhere/else', $uri->getPath());
-        $this->assertEquals($expected, (string) $uri);
+        $this->assertSame('somewhere/else', $uri->getPath());
+        $this->assertSame($expected, (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -390,7 +390,7 @@ public function testPathGetsFiltered($path, $expected)
     {
         $uri = new URI();
         $uri->setPath($path);
-        $this->assertEquals($expected, $uri->getPath());
+        $this->assertSame($expected, $uri->getPath());
     }
 
     //--------------------------------------------------------------------
@@ -403,8 +403,8 @@ public function testSetFragmentSetsValue()
         $expected = 'http://example.com/path#good-stuff';
 
         $uri->setFragment('#good-stuff');
-        $this->assertEquals('good-stuff', $uri->getFragment());
-        $this->assertEquals($expected, (string) $uri);
+        $this->assertSame('good-stuff', $uri->getFragment());
+        $this->assertSame($expected, (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -417,8 +417,8 @@ public function testSetQuerySetsValue()
         $expected = 'http://example.com/path?key=value&second_key=value.2';
 
         $uri->setQuery('?key=value&second.key=value.2');
-        $this->assertEquals('key=value&second_key=value.2', $uri->getQuery());
-        $this->assertEquals($expected, (string) $uri);
+        $this->assertSame('key=value&second_key=value.2', $uri->getQuery());
+        $this->assertSame($expected, (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -431,8 +431,8 @@ public function testSetQuerySetsValueWithUseRawQueryString()
         $expected = 'http://example.com/path?key=value&second.key=value.2';
 
         $uri->useRawQueryString()->setQuery('?key=value&second.key=value.2');
-        $this->assertEquals('key=value&second.key=value.2', $uri->getQuery());
-        $this->assertEquals($expected, (string) $uri);
+        $this->assertSame('key=value&second.key=value.2', $uri->getQuery());
+        $this->assertSame($expected, (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -445,8 +445,8 @@ public function testSetQueryArraySetsValue()
         $expected = 'http://example.com/path?key=value&second_key=value.2';
 
         $uri->setQueryArray(['key' => 'value', 'second.key' => 'value.2']);
-        $this->assertEquals('key=value&second_key=value.2', $uri->getQuery());
-        $this->assertEquals($expected, (string) $uri);
+        $this->assertSame('key=value&second_key=value.2', $uri->getQuery());
+        $this->assertSame($expected, (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -459,8 +459,8 @@ public function testSetQueryArraySetsValueWithUseRawQueryString()
         $expected = 'http://example.com/path?key=value&second.key=value.2';
 
         $uri->useRawQueryString()->setQueryArray(['key' => 'value', 'second.key' => 'value.2']);
-        $this->assertEquals('key=value&second.key=value.2', $uri->getQuery());
-        $this->assertEquals($expected, (string) $uri);
+        $this->assertSame('key=value&second.key=value.2', $uri->getQuery());
+        $this->assertSame($expected, (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -483,7 +483,7 @@ public function testSetQueryThrowsErrorWhenFragmentPresentSilent()
 
         $uri->setSilent()->setQuery('?key=value#fragment');
 
-        $this->assertEquals('', $uri->getQuery());
+        $this->assertSame('', $uri->getQuery());
     }
 
     //--------------------------------------------------------------------
@@ -518,7 +518,7 @@ public function authorityInfo()
     public function testAuthorityReturnsExceptedValues($url, $expected)
     {
         $uri = new URI($url);
-        $this->assertEquals($expected, $uri->getAuthority());
+        $this->assertSame($expected, $uri->getAuthority());
     }
 
     //--------------------------------------------------------------------
@@ -549,7 +549,7 @@ public function testAuthorityRemovesDefaultPorts($scheme, $port)
 
         $expected = "{$scheme}://example.com/path";
 
-        $this->assertEquals($expected, (string) $uri);
+        $this->assertSame($expected, (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -561,7 +561,7 @@ public function testSetAuthorityReconstitutes()
         $uri = new URI();
         $uri->setAuthority($authority);
 
-        $this->assertEquals($authority, $uri->getAuthority());
+        $this->assertSame($authority, $uri->getAuthority());
     }
 
     //--------------------------------------------------------------------
@@ -671,7 +671,7 @@ public function defaultDots()
      */
     public function testRemoveDotSegments($path, $expected)
     {
-        $this->assertEquals($expected, URI::removeDotSegments($path));
+        $this->assertSame($expected, URI::removeDotSegments($path));
     }
 
     //--------------------------------------------------------------------
@@ -717,7 +717,7 @@ public function testResolveRelativeURI($rel, $expected)
 
         $new = $uri->resolveRelativeURI($rel);
 
-        $this->assertEquals($expected, (string) $new);
+        $this->assertSame($expected, (string) $new);
     }
 
     /**
@@ -734,7 +734,7 @@ public function testResolveRelativeURIHTTPS($rel, $expected)
 
         $new = $uri->resolveRelativeURI($rel);
 
-        $this->assertEquals($expected, (string) $new);
+        $this->assertSame($expected, (string) $new);
     }
 
     public function testResolveRelativeURIWithNoBase()
@@ -745,7 +745,7 @@ public function testResolveRelativeURIWithNoBase()
 
         $new = $uri->resolveRelativeURI('x');
 
-        $this->assertEquals('http://a/x', (string) $new);
+        $this->assertSame('http://a/x', (string) $new);
     }
 
     //--------------------------------------------------------------------
@@ -758,7 +758,7 @@ public function testAddQueryVar()
 
         $uri->addQuery('bar', 'baz');
 
-        $this->assertEquals('http://example.com/foo?bar=baz', (string) $uri);
+        $this->assertSame('http://example.com/foo?bar=baz', (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -777,7 +777,7 @@ public function testSetQueryDecode()
 
         // Should NOT be double-encoded, since http_build_query
         // will encode the value again.
-        $this->assertEquals("q={$encoded}", $uri->getQuery());
+        $this->assertSame("q={$encoded}", $uri->getQuery());
     }
 
     public function testAddQueryVarRespectsExistingQueryVars()
@@ -788,7 +788,7 @@ public function testAddQueryVarRespectsExistingQueryVars()
 
         $uri->addQuery('baz', 'foz');
 
-        $this->assertEquals('http://example.com/foo?bar=baz&baz=foz', (string) $uri);
+        $this->assertSame('http://example.com/foo?bar=baz&baz=foz', (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -801,7 +801,7 @@ public function testStripQueryVars()
 
         $uri->stripQuery('bar', 'baz');
 
-        $this->assertEquals('http://example.com/foo?foo=bar', (string) $uri);
+        $this->assertSame('http://example.com/foo?foo=bar', (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -814,7 +814,7 @@ public function testKeepQueryVars()
 
         $uri->keepQuery('bar', 'baz');
 
-        $this->assertEquals('http://example.com/foo?bar=baz&baz=foz', (string) $uri);
+        $this->assertSame('http://example.com/foo?bar=baz&baz=foz', (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -825,7 +825,7 @@ public function testEmptyQueryVars()
 
         $uri = new URI($base);
         $uri->setQuery('foo=&bar=baz&baz=foz');
-        $this->assertEquals('http://example.com/foo?foo=&bar=baz&baz=foz', (string) $uri);
+        $this->assertSame('http://example.com/foo?foo=&bar=baz&baz=foz', (string) $uri);
     }
 
     //--------------------------------------------------------------------
@@ -836,7 +836,7 @@ public function testGetQueryExcept()
 
         $uri = new URI($base);
 
-        $this->assertEquals('foo=bar&baz=foz', $uri->getQuery(['except' => ['bar']]));
+        $this->assertSame('foo=bar&baz=foz', $uri->getQuery(['except' => ['bar']]));
     }
 
     //--------------------------------------------------------------------
@@ -847,8 +847,8 @@ public function testGetQueryOnly()
 
         $uri = new URI($base);
 
-        $this->assertEquals('bar=baz', $uri->getQuery(['only' => ['bar']]));
-        $this->assertEquals('foo=bar&baz=foz', $uri->getQuery(['except' => 'bar']));
+        $this->assertSame('bar=baz', $uri->getQuery(['only' => ['bar']]));
+        $this->assertSame('foo=bar&baz=foz', $uri->getQuery(['except' => 'bar']));
     }
 
     //--------------------------------------------------------------------
@@ -859,7 +859,7 @@ public function testGetQueryWithStrings()
 
         $uri = new URI($base);
 
-        $this->assertEquals('bar=baz', $uri->getQuery(['only' => 'bar']));
+        $this->assertSame('bar=baz', $uri->getQuery(['only' => 'bar']));
     }
 
     //--------------------------------------------------------------------
@@ -870,9 +870,9 @@ public function testGetQueryWithStrings()
      */
     public function testNoExtraSlashes()
     {
-        $this->assertEquals('http://entirely.different.com/subfolder', (string) (new URI('entirely.different.com/subfolder')));
-        $this->assertEquals('http://localhost/subfolder', (string) (new URI('localhost/subfolder')));
-        $this->assertEquals('http://localtest.me/subfolder', (string) (new URI('localtest.me/subfolder')));
+        $this->assertSame('http://entirely.different.com/subfolder', (string) (new URI('entirely.different.com/subfolder')));
+        $this->assertSame('http://localhost/subfolder', (string) (new URI('localhost/subfolder')));
+        $this->assertSame('http://localtest.me/subfolder', (string) (new URI('localtest.me/subfolder')));
     }
 
     //--------------------------------------------------------------------
@@ -884,7 +884,7 @@ public function testSetSegment()
         $uri = new URI($base);
         $uri->setSegment(2, 'banana');
 
-        $this->assertEquals('foo/banana/baz', $uri->getPath());
+        $this->assertSame('foo/banana/baz', $uri->getPath());
     }
 
     //--------------------------------------------------------------------
@@ -897,19 +897,19 @@ public function testSetSegmentFallback()
         $uri->setSegment(1, 'first');
         $uri->setSegment(3, 'third');
 
-        $this->assertEquals('first/third', $uri->getPath());
+        $this->assertSame('first/third', $uri->getPath());
 
         $uri->setSegment(2, 'second');
 
-        $this->assertEquals('first/second', $uri->getPath());
+        $this->assertSame('first/second', $uri->getPath());
 
         $uri->setSegment(3, 'third');
 
-        $this->assertEquals('first/second/third', $uri->getPath());
+        $this->assertSame('first/second/third', $uri->getPath());
 
         $uri->setSegment(5, 'fifth');
 
-        $this->assertEquals('first/second/third/fifth', $uri->getPath());
+        $this->assertSame('first/second/third/fifth', $uri->getPath());
 
         // sixth or seventh was not set
         $this->expectException(HTTPException::class);
@@ -935,7 +935,7 @@ public function testSetBadSegmentSilent()
         $segments = $uri->getSegments();
         $uri->setSilent()->setSegment(6, 'banana');
 
-        $this->assertEquals($segments, $uri->getSegments());
+        $this->assertSame($segments, $uri->getSegments());
     }
 
     //--------------------------------------------------------------------
@@ -957,15 +957,15 @@ public function testBasedNoIndex()
         Services::injectMock('request', $request);
 
         // going through request
-        $this->assertEquals('http://example.com/ci/v4/controller/method', (string) $request->uri);
-        $this->assertEquals('/ci/v4/controller/method', $request->uri->getPath());
+        $this->assertSame('http://example.com/ci/v4/controller/method', (string) $request->uri);
+        $this->assertSame('/ci/v4/controller/method', $request->uri->getPath());
 
         // standalone
         $uri = new URI('http://example.com/ci/v4/controller/method');
-        $this->assertEquals('http://example.com/ci/v4/controller/method', (string) $uri);
-        $this->assertEquals('/ci/v4/controller/method', $uri->getPath());
+        $this->assertSame('http://example.com/ci/v4/controller/method', (string) $uri);
+        $this->assertSame('/ci/v4/controller/method', $uri->getPath());
 
-        $this->assertEquals($uri->getPath(), $request->uri->getPath());
+        $this->assertSame($uri->getPath(), $request->uri->getPath());
     }
 
     public function testBasedWithIndex()
@@ -984,15 +984,15 @@ public function testBasedWithIndex()
         Services::injectMock('request', $request);
 
         // going through request
-        $this->assertEquals('http://example.com/ci/v4/index.php/controller/method', (string) $request->uri);
-        $this->assertEquals('/ci/v4/index.php/controller/method', $request->uri->getPath());
+        $this->assertSame('http://example.com/ci/v4/index.php/controller/method', (string) $request->uri);
+        $this->assertSame('/ci/v4/index.php/controller/method', $request->uri->getPath());
 
         // standalone
         $uri = new URI('http://example.com/ci/v4/index.php/controller/method');
-        $this->assertEquals('http://example.com/ci/v4/index.php/controller/method', (string) $uri);
-        $this->assertEquals('/ci/v4/index.php/controller/method', $uri->getPath());
+        $this->assertSame('http://example.com/ci/v4/index.php/controller/method', (string) $uri);
+        $this->assertSame('/ci/v4/index.php/controller/method', $uri->getPath());
 
-        $this->assertEquals($uri->getPath(), $request->uri->getPath());
+        $this->assertSame($uri->getPath(), $request->uri->getPath());
     }
 
     public function testForceGlobalSecureRequests()
@@ -1015,29 +1015,29 @@ public function testForceGlobalSecureRequests()
         Services::injectMock('request', $request);
 
         // Detected by request
-        $this->assertEquals('https://example.com/ci/v4/controller/method', (string) $request->uri);
+        $this->assertSame('https://example.com/ci/v4/controller/method', (string) $request->uri);
 
         // Standalone
         $uri = new URI('http://example.com/ci/v4/controller/method');
-        $this->assertEquals('https://example.com/ci/v4/controller/method', (string) $uri);
+        $this->assertSame('https://example.com/ci/v4/controller/method', (string) $uri);
 
-        $this->assertEquals(trim($uri->getPath(), '/'), trim($request->uri->getPath(), '/'));
+        $this->assertSame(trim($uri->getPath(), '/'), trim($request->uri->getPath(), '/'));
     }
 
     public function testZeroAsURIPath()
     {
         $url = 'http://example.com/0';
         $uri = new URI($url);
-        $this->assertEquals($url, (string) $uri);
-        $this->assertEquals('/0', $uri->getPath());
+        $this->assertSame($url, (string) $uri);
+        $this->assertSame('/0', $uri->getPath());
     }
 
     public function testEmptyURIPath()
     {
         $url = 'http://example.com/';
         $uri = new URI($url);
-        $this->assertEquals([], $uri->getSegments());
-        $this->assertEquals(0, $uri->getTotalSegments());
+        $this->assertSame([], $uri->getSegments());
+        $this->assertSame(0, $uri->getTotalSegments());
     }
 
     public function testSetURI()
@@ -1065,6 +1065,6 @@ public function testCreateURIString()
         $expected = 'https://example.com/';
         $uri      = URI::createURIString('https', 'example.com/', '/');
 
-        $this->assertEquals($expected, $uri);
+        $this->assertSame($expected, $uri);
     }
 }
diff --git a/tests/system/HTTP/UserAgentTest.php b/tests/system/HTTP/UserAgentTest.php
index 461ea911481c..56059b06f123 100644
--- a/tests/system/HTTP/UserAgentTest.php
+++ b/tests/system/HTTP/UserAgentTest.php
@@ -36,7 +36,7 @@ public function testMobile()
     {
         // Mobile Not Set
         $_SERVER['HTTP_USER_AGENT'] = $this->_mobile_ua;
-        $this->assertEquals('', $this->agent->isMobile());
+        $this->assertFalse($this->agent->isMobile());
         unset($_SERVER['HTTP_USER_AGENT']);
     }
 
@@ -57,29 +57,29 @@ public function testReferrer()
     {
         $_SERVER['HTTP_REFERER'] = 'http://codeigniter.com/user_guide/';
         $this->assertTrue($this->agent->isReferral());
-        $this->assertEquals('http://codeigniter.com/user_guide/', $this->agent->getReferrer());
+        $this->assertSame('http://codeigniter.com/user_guide/', $this->agent->getReferrer());
 
         $this->setPrivateProperty($this->agent, 'referrer', null);
         unset($_SERVER['HTTP_REFERER']);
         $this->assertFalse($this->agent->isReferral());
-        $this->assertEquals('', $this->agent->getReferrer());
+        $this->assertSame('', $this->agent->getReferrer());
     }
 
     // --------------------------------------------------------------------
 
     public function testAgentString()
     {
-        $this->assertEquals($this->_user_agent, $this->agent->getAgentString());
+        $this->assertSame($this->_user_agent, $this->agent->getAgentString());
     }
 
     // --------------------------------------------------------------------
 
     public function testBrowserInfo()
     {
-        $this->assertEquals('Mac OS X', $this->agent->getPlatform());
-        $this->assertEquals('Safari', $this->agent->getBrowser());
-        $this->assertEquals('533.20.27', $this->agent->getVersion());
-        $this->assertEquals('', $this->agent->getRobot());
+        $this->assertSame('Mac OS X', $this->agent->getPlatform());
+        $this->assertSame('Safari', $this->agent->getBrowser());
+        $this->assertSame('533.20.27', $this->agent->getVersion());
+        $this->assertSame('', $this->agent->getRobot());
     }
 
     // --------------------------------------------------------------------
@@ -89,12 +89,12 @@ public function testParse()
         $newAgent = 'Mozilla/5.0 (Android; Mobile; rv:13.0) Gecko/13.0 Firefox/13.0';
         $this->agent->parse($newAgent);
 
-        $this->assertEquals('Android', $this->agent->getPlatform());
-        $this->assertEquals('Firefox', $this->agent->getBrowser());
-        $this->assertEquals('13.0', $this->agent->getVersion());
-        $this->assertEquals('', $this->agent->getRobot());
-        $this->assertEquals('Android', $this->agent->getMobile());
-        $this->assertEquals($newAgent, $this->agent->getAgentString());
+        $this->assertSame('Android', $this->agent->getPlatform());
+        $this->assertSame('Firefox', $this->agent->getBrowser());
+        $this->assertSame('13.0', $this->agent->getVersion());
+        $this->assertSame('', $this->agent->getRobot());
+        $this->assertSame('Android', $this->agent->getMobile());
+        $this->assertSame($newAgent, $this->agent->getAgentString());
         $this->assertTrue($this->agent->isBrowser());
         $this->assertFalse($this->agent->isRobot());
         $this->assertTrue($this->agent->isMobile());
diff --git a/tests/system/Helpers/ArrayHelperTest.php b/tests/system/Helpers/ArrayHelperTest.php
index 7c22c743b36e..532f8acc3398 100644
--- a/tests/system/Helpers/ArrayHelperTest.php
+++ b/tests/system/Helpers/ArrayHelperTest.php
@@ -23,7 +23,7 @@ public function testArrayDotSimple()
             ],
         ];
 
-        $this->assertEquals(23, dot_array_search('foo.bar', $data));
+        $this->assertSame(23, dot_array_search('foo.bar', $data));
     }
 
     public function testArrayDotTooManyLevels()
@@ -34,7 +34,7 @@ public function testArrayDotTooManyLevels()
             ],
         ];
 
-        $this->assertEquals(23, dot_array_search('foo.bar.baz', $data));
+        $this->assertSame(23, dot_array_search('foo.bar.baz', $data));
     }
 
     public function testArrayDotEscape()
@@ -48,8 +48,8 @@ public function testArrayDotEscape()
             ],
         ];
 
-        $this->assertEquals(23, dot_array_search('foo.bar\.baz', $data));
-        $this->assertEquals(42, dot_array_search('foo\.bar.baz', $data));
+        $this->assertSame(23, dot_array_search('foo.bar\.baz', $data));
+        $this->assertSame(42, dot_array_search('foo\.bar.baz', $data));
     }
 
     public function testArraySearchDotMultiLevels()
@@ -103,7 +103,7 @@ public function testArrayDotEarlyIndex()
             ],
         ];
 
-        $this->assertEquals(['bar' => 23], dot_array_search('foo', $data));
+        $this->assertSame(['bar' => 23], dot_array_search('foo', $data));
     }
 
     public function testArrayDotWildcard()
@@ -116,7 +116,7 @@ public function testArrayDotWildcard()
             ],
         ];
 
-        $this->assertEquals(23, dot_array_search('foo.*.baz', $data));
+        $this->assertSame(23, dot_array_search('foo.*.baz', $data));
     }
 
     public function testArrayDotWildcardWithMultipleChoices()
@@ -132,8 +132,8 @@ public function testArrayDotWildcardWithMultipleChoices()
             ],
         ];
 
-        $this->assertEquals(11, dot_array_search('foo.*.fizz', $data));
-        $this->assertEquals(23, dot_array_search('foo.*.baz', $data));
+        $this->assertSame(11, dot_array_search('foo.*.fizz', $data));
+        $this->assertSame(23, dot_array_search('foo.*.baz', $data));
     }
 
     public function testArrayDotNestedNotFound()
@@ -162,7 +162,7 @@ public function testArrayDotIgnoresLastWildcard()
             ],
         ];
 
-        $this->assertEquals(['baz' => 23], dot_array_search('foo.bar.*', $data));
+        $this->assertSame(['baz' => 23], dot_array_search('foo.bar.*', $data));
     }
 
     /**
@@ -191,7 +191,7 @@ public function testArrayDeepSearch($key, $expected)
 
         $result = array_deep_search($key, $data);
 
-        $this->assertEquals($expected, $result);
+        $this->assertSame($expected, $result);
     }
 
     public function testArrayDeepSearchReturnNullEmptyArray()
@@ -209,7 +209,7 @@ public function testArraySortByMultipleKeysWithArray($data, $sortColumns, $expec
         $success = array_sort_by_multiple_keys($data, $sortColumns);
 
         $this->assertTrue($success);
-        $this->assertEquals($expected, array_column($data, 'name'));
+        $this->assertSame($expected, array_column($data, 'name'));
     }
 
     /**
@@ -225,7 +225,7 @@ public function testArraySortByMultipleKeysWithObjects($data, $sortColumns, $exp
         $success = array_sort_by_multiple_keys($data, $sortColumns);
 
         $this->assertTrue($success);
-        $this->assertEquals($expected, array_column((array) $data, 'name'));
+        $this->assertSame($expected, array_column((array) $data, 'name'));
     }
 
     /**
diff --git a/tests/system/Helpers/CookieHelperTest.php b/tests/system/Helpers/CookieHelperTest.php
index 5582c224a7d0..12dab4b9a2b7 100755
--- a/tests/system/Helpers/CookieHelperTest.php
+++ b/tests/system/Helpers/CookieHelperTest.php
@@ -102,15 +102,15 @@ public function testDeleteCookie()
         $cookie = $this->response->getCookie($this->name);
 
         // The cookie is set to be cleared when the request is sent....
-        $this->assertEquals('', $cookie->getValue());
-        $this->assertEquals(0, $cookie->getExpiresTimestamp());
+        $this->assertSame('', $cookie->getValue());
+        $this->assertSame(0, $cookie->getExpiresTimestamp());
     }
 
     public function testGetCookie()
     {
         $_COOKIE['TEST'] = 5;
 
-        $this->assertEquals(5, get_cookie('TEST'));
+        $this->assertSame('5', get_cookie('TEST'));
     }
 
     public function testDeleteCookieAfterLastSet()
@@ -119,7 +119,7 @@ public function testDeleteCookieAfterLastSet()
 
         $cookie = $this->response->getCookie($this->name);
         // The cookie is set to be cleared when the request is sent....
-        $this->assertEquals('', $cookie->getValue());
+        $this->assertSame('', $cookie->getValue());
     }
 
     public function testSameSiteDefault()
@@ -134,7 +134,7 @@ public function testSameSiteDefault()
 
         $this->assertTrue($this->response->hasCookie($this->name));
         $theCookie = $this->response->getCookie($this->name);
-        $this->assertEquals('Lax', $theCookie->getSameSite());
+        $this->assertSame('Lax', $theCookie->getSameSite());
 
         delete_cookie($this->name);
     }
@@ -167,7 +167,7 @@ public function testSameSiteParamArray()
 
         $this->assertTrue($this->response->hasCookie($this->name));
         $theCookie = $this->response->getCookie($this->name);
-        $this->assertEquals('Strict', $theCookie->getSameSite());
+        $this->assertSame('Strict', $theCookie->getSameSite());
 
         delete_cookie($this->name);
     }
@@ -178,7 +178,7 @@ public function testSameSiteParam()
 
         $this->assertTrue($this->response->hasCookie($this->name));
         $theCookie = $this->response->getCookie($this->name);
-        $this->assertEquals('Strict', $theCookie->getSameSite());
+        $this->assertSame('Strict', $theCookie->getSameSite());
 
         delete_cookie($this->name);
     }
diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php
index ae4d2491c7f3..f3b5663be9b3 100644
--- a/tests/system/Helpers/FilesystemHelperTest.php
+++ b/tests/system/Helpers/FilesystemHelperTest.php
@@ -56,7 +56,7 @@ public function testDirectoryMapDefaults()
         $root = vfsStream::setup('root', null, $this->structure);
         $this->assertTrue($root->hasChild('foo'));
 
-        $this->assertEquals($expected, directory_map(vfsStream::url('root')));
+        $this->assertSame($expected, directory_map(vfsStream::url('root')));
     }
 
     public function testDirectoryMapShowsHiddenFiles()
@@ -81,7 +81,7 @@ public function testDirectoryMapShowsHiddenFiles()
         $root = vfsStream::setup('root', null, $this->structure);
         $this->assertTrue($root->hasChild('foo'));
 
-        $this->assertEquals($expected, directory_map(vfsStream::url('root'), false, true));
+        $this->assertSame($expected, directory_map(vfsStream::url('root'), false, true));
     }
 
     public function testDirectoryMapLimitsRecursion()
@@ -99,12 +99,12 @@ public function testDirectoryMapLimitsRecursion()
         $root = vfsStream::setup('root', null, $this->structure);
         $this->assertTrue($root->hasChild('foo'));
 
-        $this->assertEquals($expected, directory_map(vfsStream::url('root'), 1, true));
+        $this->assertSame($expected, directory_map(vfsStream::url('root'), 1, true));
     }
 
     public function testDirectoryMapHandlesNotfound()
     {
-        $this->assertEquals([], directory_map(SUPPORTPATH . 'Files/shaker/'));
+        $this->assertSame([], directory_map(SUPPORTPATH . 'Files/shaker/'));
     }
 
     //--------------------------------------------------------------------
@@ -139,7 +139,7 @@ public function testDirectoryMirrorOverwrites()
         directory_mirror($root . 'foo', $root . 'boo', true);
         $result = file_get_contents($root . 'boo/faz');
 
-        $this->assertEquals($this->structure['foo']['faz'], $result);
+        $this->assertSame($this->structure['foo']['faz'], $result);
     }
 
     public function testDirectoryMirrorNotOverwrites()
@@ -156,7 +156,7 @@ public function testDirectoryMirrorNotOverwrites()
         directory_mirror($root . 'foo', $root . 'boo', false);
         $result = file_get_contents($root . 'boo/faz');
 
-        $this->assertEquals($this->structure['boo']['faz'], $result);
+        $this->assertSame($this->structure['boo']['faz'], $result);
     }
 
     //--------------------------------------------------------------------
@@ -278,7 +278,7 @@ public function testGetFilenames()
 
         $vfs = vfsStream::setup('root', null, $this->structure);
 
-        $this->assertEquals($expected, get_filenames($vfs->url(), false));
+        $this->assertSame($expected, get_filenames($vfs->url(), false));
     }
 
     public function testGetFilenamesWithHidden()
@@ -301,7 +301,7 @@ public function testGetFilenamesWithHidden()
 
         $vfs = vfsStream::setup('root', null, $this->structure);
 
-        $this->assertEquals($expected, get_filenames($vfs->url(), false, true));
+        $this->assertSame($expected, get_filenames($vfs->url(), false, true));
     }
 
     public function testGetFilenamesWithRelativeSource()
@@ -321,7 +321,7 @@ public function testGetFilenamesWithRelativeSource()
 
         $vfs = vfsStream::setup('root', null, $this->structure);
 
-        $this->assertEquals($expected, get_filenames($vfs->url(), null));
+        $this->assertSame($expected, get_filenames($vfs->url(), null));
     }
 
     public function testGetFilenamesWithFullSource()
@@ -341,12 +341,12 @@ public function testGetFilenamesWithFullSource()
             $vfs->url() . DIRECTORY_SEPARATOR . 'simpleFile',
         ];
 
-        $this->assertEquals($expected, get_filenames($vfs->url(), true));
+        $this->assertSame($expected, get_filenames($vfs->url(), true));
     }
 
     public function testGetFilenamesFailure()
     {
-        $this->assertEquals([], get_filenames(SUPPORTPATH . 'Files/shaker/'));
+        $this->assertSame([], get_filenames(SUPPORTPATH . 'Files/shaker/'));
     }
 
     //--------------------------------------------------------------------
@@ -366,7 +366,7 @@ public function testGetDirFileInfo()
             ],
         ];
 
-        $this->assertEquals($expected, get_dir_file_info(SUPPORTPATH . 'Files/baker'));
+        $this->assertSame($expected, get_dir_file_info(SUPPORTPATH . 'Files/baker'));
     }
 
     public function testGetDirFileInfoNested()
@@ -386,7 +386,7 @@ public function testGetDirFileInfoFailure()
     {
         $expected = [];
 
-        $this->assertEquals($expected, get_dir_file_info(SUPPORTPATH . 'Files#baker'));
+        $this->assertSame($expected, get_dir_file_info(SUPPORTPATH . 'Files#baker'));
     }
 
     //--------------------------------------------------------------------
@@ -403,7 +403,7 @@ public function testGetFileInfo()
             'date'        => $info['date'],
         ];
 
-        $this->assertEquals($expected, get_file_info(SUPPORTPATH . 'Files/baker/banana.php'));
+        $this->assertSame($expected, get_file_info(SUPPORTPATH . 'Files/baker/banana.php'));
     }
 
     public function testGetFileInfoCustom()
@@ -414,7 +414,7 @@ public function testGetFileInfoCustom()
             'executable' => false,
         ];
 
-        $this->assertEquals($expected, get_file_info(SUPPORTPATH . 'Files/baker/banana.php', 'readable,writable,executable'));
+        $this->assertSame($expected, get_file_info(SUPPORTPATH . 'Files/baker/banana.php', 'readable,writable,executable'));
     }
 
     public function testGetFileInfoPerms()
@@ -425,14 +425,14 @@ public function testGetFileInfoPerms()
 
         $stuff = get_file_info($file, 'fileperms');
 
-        $this->assertEquals($expected, $stuff['fileperms'] & 0777);
+        $this->assertSame($expected, $stuff['fileperms'] & 0777);
     }
 
     public function testGetFileNotThereInfo()
     {
         $expected = null;
 
-        $this->assertEquals($expected, get_file_info(SUPPORTPATH . 'Files/icer'));
+        $this->assertSame($expected, get_file_info(SUPPORTPATH . 'Files/icer'));
     }
 
     //--------------------------------------------------------------------
@@ -481,9 +481,9 @@ public function testSameFileDirectory()
 
     public function testOctalPermissions()
     {
-        $this->assertEquals('777', octal_permissions(0777));
-        $this->assertEquals('655', octal_permissions(0655));
-        $this->assertEquals('123', octal_permissions(0123));
+        $this->assertSame('777', octal_permissions(0777));
+        $this->assertSame('655', octal_permissions(0655));
+        $this->assertSame('123', octal_permissions(0123));
     }
 
     public function testSymbolicPermissions()
@@ -502,7 +502,7 @@ public function testSymbolicPermissions()
         ];
 
         foreach ($expected as $perm => $value) {
-            $this->assertEquals($value, symbolic_permissions($perm));
+            $this->assertSame($value, symbolic_permissions($perm));
         }
     }
 
@@ -522,6 +522,6 @@ public function testRealPathInvalid()
 
     public function testRealPathResolved()
     {
-        $this->assertEquals(SUPPORTPATH . 'Models/', set_realpath(SUPPORTPATH . 'Files/../Models', true));
+        $this->assertSame(SUPPORTPATH . 'Models/', set_realpath(SUPPORTPATH . 'Files/../Models', true));
     }
 }
diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
index 0c2bf250d9cc..c467d55c5194 100644
--- a/tests/system/Helpers/FormHelperTest.php
+++ b/tests/system/Helpers/FormHelperTest.php
@@ -52,7 +52,7 @@ public function testFormOpenBasic()
             'id'     => 'form',
             'method' => 'POST',
         ];
-        $this->assertEquals($expected, form_open('foo/bar', $attributes));
+        $this->assertSame($expected, form_open('foo/bar', $attributes));
     }
 
     // ------------------------------------------------------------------------
@@ -75,7 +75,7 @@ public function testFormOpenHasLocale()
             'id'     => 'form',
             'method' => 'POST',
         ];
-        $this->assertEquals($expected, form_open('{locale}/foo/bar', $attributes));
+        $this->assertSame($expected, form_open('{locale}/foo/bar', $attributes));
     }
 
     // ------------------------------------------------------------------------
@@ -109,7 +109,7 @@ public function testFormOpenWithoutAction()
             'id'     => 'form',
             'method' => 'POST',
         ];
-        $this->assertEquals($expected, form_open('', $attributes));
+        $this->assertSame($expected, form_open('', $attributes));
     }
 
     // ------------------------------------------------------------------------
@@ -143,7 +143,7 @@ public function testFormOpenWithoutMethod()
             'name' => 'form',
             'id'   => 'form',
         ];
-        $this->assertEquals($expected, form_open('foo/bar', $attributes));
+        $this->assertSame($expected, form_open('foo/bar', $attributes));
     }
 
     // ------------------------------------------------------------------------
@@ -184,7 +184,7 @@ public function testFormOpenWithHidden()
         $hidden = [
             'foo' => 'bar',
         ];
-        $this->assertEquals($expected, form_open('foo/bar', $attributes, $hidden));
+        $this->assertSame($expected, form_open('foo/bar', $attributes, $hidden));
     }
 
     // ------------------------------------------------------------------------
@@ -218,11 +218,11 @@ public function testFormOpenMultipart()
             'id'     => 'form',
             'method' => 'POST',
         ];
-        $this->assertEquals($expected, form_open_multipart('foo/bar', $attributes));
+        $this->assertSame($expected, form_open_multipart('foo/bar', $attributes));
 
         // make sure it works with attributes as a string too
         $attributesString = 'name="form" id="form" method="POST"';
-        $this->assertEquals($expected, form_open_multipart('foo/bar', $attributesString));
+        $this->assertSame($expected, form_open_multipart('foo/bar', $attributesString));
     }
 
     // ------------------------------------------------------------------------
@@ -232,7 +232,7 @@ public function testFormHidden()
 
             <input type="hidden" name="username" value="johndoe" />\n
             EOH;
-        $this->assertEquals($expected, form_hidden('username', 'johndoe'));
+        $this->assertSame($expected, form_hidden('username', 'johndoe'));
     }
 
     // ------------------------------------------------------------------------
@@ -246,7 +246,7 @@ public function testFormHiddenArrayInput()
             <input type="hidden" name="foo" value="bar" />
 
             EOH;
-        $this->assertEquals($expected, form_hidden($data, null));
+        $this->assertSame($expected, form_hidden($data, null));
     }
 
     // ------------------------------------------------------------------------
@@ -260,7 +260,7 @@ public function testFormHiddenArrayValues()
             <input type="hidden" name="name[foo]" value="bar" />
 
             EOH;
-        $this->assertEquals($expected, form_hidden('name', $data));
+        $this->assertSame($expected, form_hidden('name', $data));
     }
 
     // ------------------------------------------------------------------------
@@ -277,7 +277,7 @@ public function testFormInput()
             'size'      => '50',
             'style'     => 'width:50%',
         ];
-        $this->assertEquals($expected, form_input($data));
+        $this->assertSame($expected, form_input($data));
     }
 
     public function testFormInputWithExtra()
@@ -293,7 +293,7 @@ public function testFormInputWithExtra()
         $extra = [
             'class' => 'form-control form-control-lg',
         ];
-        $this->assertEquals($expected, form_input($data, '', $extra));
+        $this->assertSame($expected, form_input($data, '', $extra));
     }
 
     // ------------------------------------------------------------------------
@@ -302,7 +302,7 @@ public function testFormPassword()
         $expected = <<<EOH
             <input type="password" name="password" value="" />\n
             EOH;
-        $this->assertEquals($expected, form_password('password'));
+        $this->assertSame($expected, form_password('password'));
     }
 
     // ------------------------------------------------------------------------
@@ -311,7 +311,7 @@ public function testFormUpload()
         $expected = <<<EOH
             <input type="file" name="attachment" />\n
             EOH;
-        $this->assertEquals($expected, form_upload('attachment'));
+        $this->assertSame($expected, form_upload('attachment'));
     }
 
     // ------------------------------------------------------------------------
@@ -320,7 +320,7 @@ public function testFormTextarea()
         $expected = <<<EOH
             <textarea name="notes" cols="40" rows="10">Notes</textarea>\n
             EOH;
-        $this->assertEquals($expected, form_textarea('notes', 'Notes'));
+        $this->assertSame($expected, form_textarea('notes', 'Notes'));
     }
 
     // ------------------------------------------------------------------------
@@ -334,7 +334,7 @@ public function testFormTextareaWithValueAttribute()
             <textarea name="foo" cols="40" rows="10">bar</textarea>
 
             EOH;
-        $this->assertEquals($expected, form_textarea($data));
+        $this->assertSame($expected, form_textarea($data));
     }
 
     // ------------------------------------------------------------------------
@@ -347,7 +347,7 @@ public function testFormTextareaExtraRowsColsArray()
         $expected = <<<EOH
             <textarea name="notes" cols="30" rows="5">Notes</textarea>\n
             EOH;
-        $this->assertEquals($expected, form_textarea('notes', 'Notes', $extra));
+        $this->assertSame($expected, form_textarea('notes', 'Notes', $extra));
     }
 
     // ------------------------------------------------------------------------
@@ -357,7 +357,7 @@ public function testFormTextareaExtraRowsColsString()
         $expected = <<<EOH
             <textarea name="notes" cols="30" rows="5">Notes</textarea>\n
             EOH;
-        $this->assertEquals($expected, form_textarea('notes', 'Notes', $extra));
+        $this->assertSame($expected, form_textarea('notes', 'Notes', $extra));
     }
 
     // ------------------------------------------------------------------------
@@ -377,7 +377,7 @@ public function testFormDropdown()
             'large'  => 'Large Shirt',
             'xlarge' => 'Extra Large Shirt',
         ];
-        $this->assertEquals($expected, form_dropdown('shirts', $options, 'large'));
+        $this->assertSame($expected, form_dropdown('shirts', $options, 'large'));
         $expected = <<<EOH
             <select name="shirts" multiple="multiple">
             <option value="small" selected="selected">Small Shirt</option>
@@ -390,7 +390,7 @@ public function testFormDropdown()
             'small',
             'large',
         ];
-        $this->assertEquals($expected, form_dropdown('shirts', $options, $shirtsOnSale));
+        $this->assertSame($expected, form_dropdown('shirts', $options, $shirtsOnSale));
         $options = [
             'Swedish Cars' => [
                 'volvo' => 'Volvo',
@@ -413,7 +413,7 @@ public function testFormDropdown()
             </optgroup>
             </select>\n
             EOH;
-        $this->assertEquals($expected, form_dropdown('cars', $options, ['volvo', 'audi']));
+        $this->assertSame($expected, form_dropdown('cars', $options, ['volvo', 'audi']));
     }
 
     public function testFormDropdownUnselected()
@@ -440,7 +440,7 @@ public function testFormDropdownUnselected()
             </optgroup>
             </select>\n
             EOH;
-        $this->assertEquals($expected, form_dropdown('cars', $options));
+        $this->assertSame($expected, form_dropdown('cars', $options));
     }
 
     public function testFormDropdownInferred()
@@ -468,7 +468,7 @@ public function testFormDropdownInferred()
             </select>\n
             EOH;
         $_POST['cars'] = 'audi';
-        $this->assertEquals($expected, form_dropdown('cars', $options));
+        $this->assertSame($expected, form_dropdown('cars', $options));
         unset($_POST['cars']);
     }
 
@@ -488,7 +488,7 @@ public function testFormDropdownWithSelectedAttribute()
         $options = [
             'bar' => 'Bar',
         ];
-        $this->assertEquals($expected, form_dropdown($data, $options));
+        $this->assertSame($expected, form_dropdown($data, $options));
     }
 
     // ------------------------------------------------------------------------
@@ -506,7 +506,7 @@ public function testFormDropdownWithOptionsAttribute()
                 'bar' => 'Bar',
             ],
         ];
-        $this->assertEquals($expected, form_dropdown($data));
+        $this->assertSame($expected, form_dropdown($data));
     }
 
     // ------------------------------------------------------------------------
@@ -520,7 +520,7 @@ public function testFormDropdownWithEmptyArrayOptionValue()
         $options = [
             'bar' => [],
         ];
-        $this->assertEquals($expected, form_dropdown('foo', $options));
+        $this->assertSame($expected, form_dropdown('foo', $options));
     }
 
     // ------------------------------------------------------------------------
@@ -540,7 +540,7 @@ public function testFormMultiselect()
             'large'  => 'Large Shirt',
             'xlarge' => 'Extra Large Shirt',
         ];
-        $this->assertEquals($expected, form_multiselect('shirts[]', $options, ['med', 'large']));
+        $this->assertSame($expected, form_multiselect('shirts[]', $options, ['med', 'large']));
     }
 
     // ------------------------------------------------------------------------
@@ -570,7 +570,7 @@ public function testFormMultiselectArrayData()
             ],
         ];
 
-        $this->assertEquals($expected, form_multiselect($data));
+        $this->assertSame($expected, form_multiselect($data));
     }
 
     // ------------------------------------------------------------------------
@@ -580,7 +580,7 @@ public function testFormFieldset()
             <fieldset>
             <legend>Address Information</legend>\n
             EOH;
-        $this->assertEquals($expected, form_fieldset('Address Information'));
+        $this->assertSame($expected, form_fieldset('Address Information'));
     }
 
     // ------------------------------------------------------------------------
@@ -590,7 +590,7 @@ public function testFormFieldsetWithNoLegent()
             <fieldset>
 
             EOH;
-        $this->assertEquals($expected, form_fieldset());
+        $this->assertSame($expected, form_fieldset());
     }
 
     // ------------------------------------------------------------------------
@@ -604,7 +604,7 @@ public function testFormFieldsetWithAttributes()
             <legend>Foo</legend>
 
             EOH;
-        $this->assertEquals($expected, form_fieldset('Foo', $attributes));
+        $this->assertSame($expected, form_fieldset('Foo', $attributes));
     }
 
     // ------------------------------------------------------------------------
@@ -613,7 +613,7 @@ public function testFormFieldsetClose()
         $expected = <<<'EOH'
             </fieldset></div></div>
             EOH;
-        $this->assertEquals($expected, form_fieldset_close('</div></div>'));
+        $this->assertSame($expected, form_fieldset_close('</div></div>'));
     }
 
     // ------------------------------------------------------------------------
@@ -622,7 +622,7 @@ public function testFormCheckbox()
         $expected = <<<EOH
             <input type="checkbox" name="newsletter" value="accept" checked="checked" />\n
             EOH;
-        $this->assertEquals($expected, form_checkbox('newsletter', 'accept', true));
+        $this->assertSame($expected, form_checkbox('newsletter', 'accept', true));
     }
 
     // ------------------------------------------------------------------------
@@ -637,7 +637,7 @@ public function testFormCheckboxArrayData()
             <input type="checkbox" name="foo" value="bar" checked="checked" />
 
             EOH;
-        $this->assertEquals($expected, form_checkbox($data));
+        $this->assertSame($expected, form_checkbox($data));
     }
 
     // ------------------------------------------------------------------------
@@ -652,7 +652,7 @@ public function testFormCheckboxArrayDataWithCheckedFalse()
             <input type="checkbox" name="foo" value="bar" />
 
             EOH;
-        $this->assertEquals($expected, form_checkbox($data));
+        $this->assertSame($expected, form_checkbox($data));
     }
 
     // ------------------------------------------------------------------------
@@ -661,7 +661,7 @@ public function testFormRadio()
         $expected = <<<EOH
             <input type="radio" name="newsletter" value="accept" checked="checked" />\n
             EOH;
-        $this->assertEquals($expected, form_radio('newsletter', 'accept', true));
+        $this->assertSame($expected, form_radio('newsletter', 'accept', true));
     }
 
     // ------------------------------------------------------------------------
@@ -670,7 +670,7 @@ public function testFormSubmit()
         $expected = <<<EOH
             <input type="submit" name="mysubmit" value="Submit Post!" />\n
             EOH;
-        $this->assertEquals($expected, form_submit('mysubmit', 'Submit Post!'));
+        $this->assertSame($expected, form_submit('mysubmit', 'Submit Post!'));
     }
 
     // ------------------------------------------------------------------------
@@ -679,7 +679,7 @@ public function testFormLabel()
         $expected = <<<'EOH'
             <label for="username">What is your Name</label>
             EOH;
-        $this->assertEquals($expected, form_label('What is your Name', 'username'));
+        $this->assertSame($expected, form_label('What is your Name', 'username'));
     }
 
     // ------------------------------------------------------------------------
@@ -691,7 +691,7 @@ public function testFormLabelWithAttributes()
         $expected = <<<'EOH'
             <label for="foo" id="label1">bar</label>
             EOH;
-        $this->assertEquals($expected, form_label('bar', 'foo', $attributes));
+        $this->assertSame($expected, form_label('bar', 'foo', $attributes));
     }
 
     // ------------------------------------------------------------------------
@@ -700,7 +700,7 @@ public function testFormReset()
         $expected = <<<EOH
             <input type="reset" name="myreset" value="Reset" />\n
             EOH;
-        $this->assertEquals($expected, form_reset('myreset', 'Reset'));
+        $this->assertSame($expected, form_reset('myreset', 'Reset'));
     }
 
     // ------------------------------------------------------------------------
@@ -709,7 +709,7 @@ public function testFormButton()
         $expected = <<<EOH
             <button name="name" type="button">content</button>\n
             EOH;
-        $this->assertEquals($expected, form_button('name', 'content'));
+        $this->assertSame($expected, form_button('name', 'content'));
     }
 
     // ------------------------------------------------------------------------
@@ -723,7 +723,7 @@ public function testFormButtonWithDataArray()
             <button name="foo" type="button">bar</button>
 
             EOH;
-        $this->assertEquals($expected, form_button($data));
+        $this->assertSame($expected, form_button($data));
     }
 
     // ------------------------------------------------------------------------
@@ -732,7 +732,7 @@ public function testFormClose()
         $expected = <<<'EOH'
             </form></div></div>
             EOH;
-        $this->assertEquals($expected, form_close('</div></div>'));
+        $this->assertSame($expected, form_close('</div></div>'));
     }
 
     // ------------------------------------------------------------------------
@@ -750,31 +750,31 @@ public function testFormDatalist()
             </datalist>
 
             EOH;
-        $this->assertEquals($expected, form_datalist('foo', 'bar', $options));
+        $this->assertSame($expected, form_datalist('foo', 'bar', $options));
     }
 
     // ------------------------------------------------------------------------
     public function testSetValue()
     {
         $_SESSION['_ci_old_input']['post']['foo'] = '<bar';
-        $this->assertEquals('&lt;bar', set_value('foo'));
+        $this->assertSame('&lt;bar', set_value('foo'));
 
         unset($_SESSION['_ci_old_input']['post']['foo']);
-        $this->assertEquals('baz', set_value('foo', 'baz'));
+        $this->assertSame('baz', set_value('foo', 'baz'));
     }
 
     // ------------------------------------------------------------------------
     public function testSetSelect()
     {
         $_SESSION['_ci_old_input']['post']['foo'] = 'bar';
-        $this->assertEquals(' selected="selected"', set_select('foo', 'bar'));
+        $this->assertSame(' selected="selected"', set_select('foo', 'bar'));
 
         $_SESSION['_ci_old_input']['post']['foo'] = ['foo' => 'bar'];
-        $this->assertEquals(' selected="selected"', set_select('foo', 'bar'));
-        $this->assertEquals('', set_select('foo', 'baz'));
+        $this->assertSame(' selected="selected"', set_select('foo', 'bar'));
+        $this->assertSame('', set_select('foo', 'baz'));
 
         unset($_SESSION['_ci_old_input']['post']['foo']);
-        $this->assertEquals(' selected="selected"', set_select('foo', 'baz', true));
+        $this->assertSame(' selected="selected"', set_select('foo', 'baz', true));
     }
 
     // ------------------------------------------------------------------------
@@ -788,7 +788,7 @@ public function testSetCheckbox()
             ],
         ];
 
-        $this->assertEquals(' checked="checked"', set_checkbox('foo', 'bar'));
+        $this->assertSame(' checked="checked"', set_checkbox('foo', 'bar'));
 
         $_SESSION = [
             '_ci_old_input' => [
@@ -797,14 +797,14 @@ public function testSetCheckbox()
                 ],
             ],
         ];
-        $this->assertEquals(' checked="checked"', set_checkbox('foo', 'bar'));
-        $this->assertEquals('', set_checkbox('foo', 'baz'));
+        $this->assertSame(' checked="checked"', set_checkbox('foo', 'bar'));
+        $this->assertSame('', set_checkbox('foo', 'baz'));
 
         $_SESSION = [];
-        $this->assertEquals('', set_checkbox('foo', 'bar'));
+        $this->assertSame('', set_checkbox('foo', 'bar'));
 
         $_SESSION = [];
-        $this->assertEquals(' checked="checked"', set_checkbox('foo', 'bar', true));
+        $this->assertSame(' checked="checked"', set_checkbox('foo', 'bar', true));
     }
 
     // ------------------------------------------------------------------------
@@ -818,7 +818,7 @@ public function testSetCheckboxWithValueZero()
             ],
         ];
 
-        $this->assertEquals(' checked="checked"', set_checkbox('foo', '0'));
+        $this->assertSame(' checked="checked"', set_checkbox('foo', '0'));
 
         $_SESSION = [
             '_ci_old_input' => [
@@ -827,14 +827,14 @@ public function testSetCheckboxWithValueZero()
                 ],
             ],
         ];
-        $this->assertEquals(' checked="checked"', set_checkbox('foo', '0'));
-        $this->assertEquals('', set_checkbox('foo', 'baz'));
+        $this->assertSame(' checked="checked"', set_checkbox('foo', '0'));
+        $this->assertSame('', set_checkbox('foo', 'baz'));
 
         $_SESSION = [];
-        $this->assertEquals('', set_checkbox('foo', 'bar'));
+        $this->assertSame('', set_checkbox('foo', 'bar'));
 
         $_SESSION = [];
-        $this->assertEquals(' checked="checked"', set_checkbox('foo', '0', true));
+        $this->assertSame(' checked="checked"', set_checkbox('foo', '0', true));
     }
 
     // ------------------------------------------------------------------------
@@ -853,8 +853,8 @@ public function testSetRadio()
             ],
         ];
 
-        $this->assertEquals(' checked="checked"', set_radio('foo', 'bar'));
-        $this->assertEquals('', set_radio('foo', 'baz'));
+        $this->assertSame(' checked="checked"', set_radio('foo', 'bar'));
+        $this->assertSame('', set_radio('foo', 'baz'));
         unset($_SESSION['_ci_old_input']);
     }
 
@@ -865,9 +865,9 @@ public function testSetRadio()
     public function testSetRadioFromPost()
     {
         $_POST['bar'] = 'baz';
-        $this->assertEquals(' checked="checked"', set_radio('bar', 'baz'));
-        $this->assertEquals('', set_radio('bar', 'boop'));
-        $this->assertEquals(' checked="checked"', set_radio('bar', 'boop', true));
+        $this->assertSame(' checked="checked"', set_radio('bar', 'baz'));
+        $this->assertSame('', set_radio('bar', 'boop'));
+        $this->assertSame(' checked="checked"', set_radio('bar', 'boop', true));
     }
 
     /**
@@ -877,11 +877,11 @@ public function testSetRadioFromPost()
     public function testSetRadioFromPostWithValueZero()
     {
         $_POST['bar'] = 0;
-        $this->assertEquals(' checked="checked"', set_radio('bar', '0'));
-        $this->assertEquals('', set_radio('bar', 'boop'));
+        $this->assertSame(' checked="checked"', set_radio('bar', '0'));
+        $this->assertSame('', set_radio('bar', 'boop'));
 
         $_POST = [];
-        $this->assertEquals(' checked="checked"', set_radio('bar', '0', true));
+        $this->assertSame(' checked="checked"', set_radio('bar', '0', true));
     }
 
     public function testSetRadioFromPostArray()
@@ -896,8 +896,8 @@ public function testSetRadioFromPostArray()
                 ],
             ],
         ];
-        $this->assertEquals(' checked="checked"', set_radio('bar', 'boop'));
-        $this->assertEquals('', set_radio('bar', 'baz'));
+        $this->assertSame(' checked="checked"', set_radio('bar', 'boop'));
+        $this->assertSame('', set_radio('bar', 'baz'));
     }
 
     public function testSetRadioFromPostArrayWithValueZero()
@@ -912,62 +912,62 @@ public function testSetRadioFromPostArrayWithValueZero()
                 ],
             ],
         ];
-        $this->assertEquals(' checked="checked"', set_radio('bar', '0'));
-        $this->assertEquals('', set_radio('bar', 'baz'));
+        $this->assertSame(' checked="checked"', set_radio('bar', '0'));
+        $this->assertSame('', set_radio('bar', 'baz'));
     }
 
     public function testSetRadioDefault()
     {
-        $this->assertEquals(' checked="checked"', set_radio('code', 'alpha', true));
-        $this->assertEquals('', set_radio('code', 'beta', false));
+        $this->assertSame(' checked="checked"', set_radio('code', 'alpha', true));
+        $this->assertSame('', set_radio('code', 'beta', false));
     }
 
     // ------------------------------------------------------------------------
     public function testFormParseFormAttributesTrue()
     {
         $expected = 'readonly ';
-        $this->assertEquals($expected, parse_form_attributes(['readonly' => true], []));
+        $this->assertSame($expected, parse_form_attributes(['readonly' => true], []));
     }
 
     // ------------------------------------------------------------------------
     public function testFormParseFormAttributesFalse()
     {
         $expected = 'disabled ';
-        $this->assertEquals($expected, parse_form_attributes(['disabled' => false], []));
+        $this->assertSame($expected, parse_form_attributes(['disabled' => false], []));
     }
 
     // ------------------------------------------------------------------------
     public function testFormParseFormAttributesNull()
     {
         $expected = 'bar=""';
-        $this->assertEquals($expected, parse_form_attributes(['bar' => null], []));
+        $this->assertSame($expected, parse_form_attributes(['bar' => null], []));
     }
 
     // ------------------------------------------------------------------------
     public function testFormParseFormAttributesStringEmpty()
     {
         $expected = 'bar=""';
-        $this->assertEquals($expected, parse_form_attributes(['bar' => ''], []));
+        $this->assertSame($expected, parse_form_attributes(['bar' => ''], []));
     }
 
     // ------------------------------------------------------------------------
     public function testFormParseFormAttributesStringFoo()
     {
         $expected = 'bar="foo"';
-        $this->assertEquals($expected, parse_form_attributes(['bar' => 'foo'], []));
+        $this->assertSame($expected, parse_form_attributes(['bar' => 'foo'], []));
     }
 
     // ------------------------------------------------------------------------
     public function testFormParseFormAttributesInt0()
     {
         $expected = 'ok="0"';
-        $this->assertEquals($expected, parse_form_attributes(['ok' => 0], []));
+        $this->assertSame($expected, parse_form_attributes(['ok' => 0], []));
     }
 
     // ------------------------------------------------------------------------
     public function testFormParseFormAttributesInt1()
     {
         $expected = 'ok="1"';
-        $this->assertEquals($expected, parse_form_attributes(['ok' => 1], []));
+        $this->assertSame($expected, parse_form_attributes(['ok' => 1], []));
     }
 }
diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index a97426574fe1..7f2b2b86bea4 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -54,7 +54,7 @@ public function testBasicUL()
             'bar',
         ];
 
-        $this->assertEquals(ltrim($expected), ul($list));
+        $this->assertSame(ltrim($expected), ul($list));
     }
 
     public function testULWithClass()
@@ -73,7 +73,7 @@ public function testULWithClass()
             'bar',
         ];
 
-        $this->assertEquals($expected, ul($list, 'class="test"'));
+        $this->assertSame($expected, ul($list, 'class="test"'));
     }
 
     public function testMultiLevelUL()
@@ -102,7 +102,7 @@ public function testMultiLevelUL()
             ],
         ];
 
-        $this->assertEquals(ltrim($expected), ul($list));
+        $this->assertSame(ltrim($expected), ul($list));
     }
 
     //--------------------------------------------------------------------
@@ -123,7 +123,7 @@ public function testBasicOL()
             'bar',
         ];
 
-        $this->assertEquals(ltrim($expected), ol($list));
+        $this->assertSame(ltrim($expected), ol($list));
     }
 
     public function testOLWithClass()
@@ -142,7 +142,7 @@ public function testOLWithClass()
             'bar',
         ];
 
-        $this->assertEquals($expected, ol($list, 'class="test"'));
+        $this->assertSame($expected, ol($list, 'class="test"'));
     }
 
     public function testMultiLevelOL()
@@ -171,7 +171,7 @@ public function testMultiLevelOL()
             ],
         ];
 
-        $this->assertEquals(ltrim($expected), ol($list));
+        $this->assertSame(ltrim($expected), ol($list));
     }
 
     // ------------------------------------------------------------------------
@@ -180,21 +180,21 @@ public function testIMG()
     {
         $target   = 'http://site.com/images/picture.jpg';
         $expected = '<img src="http://site.com/images/picture.jpg" alt="" />';
-        $this->assertEquals($expected, img($target));
+        $this->assertSame($expected, img($target));
     }
 
     public function testIMGWithoutProtocol()
     {
         $target   = 'assets/mugshot.jpg';
         $expected = '<img src="http://example.com/assets/mugshot.jpg" alt="" />';
-        $this->assertEquals($expected, img($target));
+        $this->assertSame($expected, img($target));
     }
 
     public function testIMGWithIndexpage()
     {
         $target   = 'assets/mugshot.jpg';
         $expected = '<img src="http://example.com/index.php/assets/mugshot.jpg" alt="" />';
-        $this->assertEquals($expected, img($target, true));
+        $this->assertSame($expected, img($target, true));
     }
 
     // ------------------------------------------------------------------------
@@ -203,14 +203,14 @@ public function testImgData()
     {
         $expected = 'data:image/gif;base64,' . $this->imgData;
 
-        $this->assertEquals($expected, img_data($this->imgPath));
+        $this->assertSame($expected, img_data($this->imgPath));
     }
 
     public function testImgDataWithMime()
     {
         $expected = 'data:image/png;base64,' . $this->imgData;
 
-        $this->assertEquals($expected, img_data($this->imgPath, 'image/png'));
+        $this->assertSame($expected, img_data($this->imgPath, 'image/png'));
     }
 
     public function testImgDataUnknownMime()
@@ -218,7 +218,7 @@ public function testImgDataUnknownMime()
         $path   = SUPPORTPATH . 'Validation' . DIRECTORY_SEPARATOR . 'uploads' . DIRECTORY_SEPARATOR . 'phpUxc0ty';
         $result = img_data($path);
 
-        $this->assertEquals(0, strpos($result, 'data:image/jpg'));
+        $this->assertSame(0, strpos($result, 'data:image/jpg'));
     }
 
     public function testImgDataNoFile()
@@ -234,21 +234,21 @@ public function testScriptTag()
     {
         $target   = 'http://site.com/js/mystyles.js';
         $expected = '<script src="http://site.com/js/mystyles.js" type="text/javascript"></script>';
-        $this->assertEquals($expected, script_tag($target));
+        $this->assertSame($expected, script_tag($target));
     }
 
     public function testScriptTagWithoutProtocol()
     {
         $target   = 'js/mystyles.js';
         $expected = '<script src="http://example.com/js/mystyles.js" type="text/javascript"></script>';
-        $this->assertEquals($expected, script_tag($target));
+        $this->assertSame($expected, script_tag($target));
     }
 
     public function testScriptTagWithIndexpage()
     {
         $target   = 'js/mystyles.js';
         $expected = '<script src="http://example.com/index.php/js/mystyles.js" type="text/javascript"></script>';
-        $this->assertEquals($expected, script_tag($target, true));
+        $this->assertSame($expected, script_tag($target, true));
     }
 
     // ------------------------------------------------------------------------
@@ -257,14 +257,14 @@ public function testLinkTag()
     {
         $target   = 'css/mystyles.css';
         $expected = '<link href="http://example.com/css/mystyles.css" rel="stylesheet" type="text/css" />';
-        $this->assertEquals($expected, link_tag($target));
+        $this->assertSame($expected, link_tag($target));
     }
 
     public function testLinkTagComplete()
     {
         $target   = 'https://styles.com/css/mystyles.css';
         $expected = '<link href="https://styles.com/css/mystyles.css" rel="banana" type="fruit" media="VHS" title="Go away" />';
-        $this->assertEquals($expected, link_tag($target, 'banana', 'fruit', 'Go away', 'VHS'));
+        $this->assertSame($expected, link_tag($target, 'banana', 'fruit', 'Go away', 'VHS'));
     }
 
     public function testLinkTagArray()
@@ -274,7 +274,7 @@ public function testLinkTagArray()
             'indexPage' => true,
         ];
         $expected = '<link href="http://example.com/index.php/css/mystyles.css" rel="stylesheet" type="text/css" />';
-        $this->assertEquals($expected, link_tag($parms));
+        $this->assertSame($expected, link_tag($parms));
     }
 
     // ------------------------------------------------------------------------
@@ -283,13 +283,13 @@ public function testDocType()
     {
         $target   = 'html4-strict';
         $expected = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">';
-        $this->assertEquals($expected, doctype($target));
+        $this->assertSame($expected, doctype($target));
     }
 
     public function testDocTypeDefault()
     {
         $expected = '<!DOCTYPE html>';
-        $this->assertEquals($expected, doctype());
+        $this->assertSame($expected, doctype());
     }
 
     public function testDocTypeInvalid()
@@ -312,7 +312,7 @@ public function testVideo()
         $target  = 'http://www.codeigniter.com/test.mp4';
         $message = 'Your browser does not support the video tag.';
         $video   = video($target, $message, 'controls');
-        $this->assertEquals($expected, $video);
+        $this->assertSame($expected, $video);
     }
 
     public function testVideoWithTracks()
@@ -329,7 +329,7 @@ public function testVideoWithTracks()
         $target  = 'test.mp4';
         $message = 'Your browser does not support the video tag.';
         $video   = video($target, $message, 'controls', $this->tracks);
-        $this->assertEquals($expected, $video);
+        $this->assertSame($expected, $video);
     }
 
     public function testVideoWithTracksAndIndex()
@@ -346,7 +346,7 @@ public function testVideoWithTracksAndIndex()
         $target  = 'test.mp4';
         $message = 'Your browser does not support the video tag.';
         $video   = video($target, $message, 'controls', $this->tracks, true);
-        $this->assertEquals($expected, $video);
+        $this->assertSame($expected, $video);
     }
 
     public function testVideoMultipleSources()
@@ -373,7 +373,7 @@ public function testVideoMultipleSources()
         $message = 'Your browser does not support the video tag.';
         $video   = video($sources, $message, 'class="test" controls', $this->tracks);
 
-        $this->assertEquals($expected, $video);
+        $this->assertSame($expected, $video);
     }
 
     // ------------------------------------------------------------------------
@@ -398,7 +398,7 @@ public function testAudio()
         $message = 'Your browser does not support the audio tag.';
         $audio   = audio($sources, $message, 'id="test" controls', $this->tracks);
 
-        $this->assertEquals($expected, $audio);
+        $this->assertSame($expected, $audio);
     }
 
     public function testAudioSimple()
@@ -414,7 +414,7 @@ public function testAudioSimple()
         $message = 'Your browser does not support the audio tag.';
         $audio   = audio($source, $message, 'type="audio/mpeg" id="test" controls');
 
-        $this->assertEquals($expected, $audio);
+        $this->assertSame($expected, $audio);
     }
 
     public function testAudioWithSource()
@@ -430,7 +430,7 @@ public function testAudioWithSource()
         $message = 'Your browser does not support the audio tag.';
         $audio   = audio($source, $message, 'type="audio/mpeg" id="test" controls');
 
-        $this->assertEquals($expected, $audio);
+        $this->assertSame($expected, $audio);
     }
 
     public function testAudioWithIndex()
@@ -446,7 +446,7 @@ public function testAudioWithIndex()
         $message = 'Your browser does not support the audio tag.';
         $audio   = audio($source, $message, 'type="audio/mpeg" id="test" controls', [], true);
 
-        $this->assertEquals($expected, $audio);
+        $this->assertSame($expected, $audio);
     }
 
     public function testAudioWithTracks()
@@ -464,7 +464,7 @@ public function testAudioWithTracks()
         $message = 'Your browser does not support the audio tag.';
         $audio   = audio($source, $message, 'type="audio/mpeg" id="test" controls', $this->tracks);
 
-        $this->assertEquals($expected, $audio);
+        $this->assertSame($expected, $audio);
     }
 
     // ------------------------------------------------------------------------
@@ -476,7 +476,7 @@ public function testMediaNameOnly()
             </av>
 
             EOH;
-        $this->assertEquals($expected, _media('av'));
+        $this->assertSame($expected, _media('av'));
     }
 
     public function testMediaWithSources()
@@ -492,13 +492,13 @@ public function testMediaWithSources()
             source('sound.ogg', 'audio/ogg'),
             source('sound.mpeg', 'audio/mpeg'),
         ];
-        $this->assertEquals($expected, _media('av', $sources));
+        $this->assertSame($expected, _media('av', $sources));
     }
 
     public function testSource()
     {
         $expected = '<source src="http://example.com/index.php/sound.mpeg" type="audio/mpeg" />';
-        $this->assertEquals($expected, source('sound.mpeg', 'audio/mpeg', '', true));
+        $this->assertSame($expected, source('sound.mpeg', 'audio/mpeg', '', true));
     }
 
     // ------------------------------------------------------------------------
@@ -512,7 +512,7 @@ public function testEmbed()
 
         $type  = 'video/quicktime';
         $embed = embed('movie.mov', $type, 'class="test"');
-        $this->assertEquals($expected, $embed);
+        $this->assertSame($expected, $embed);
     }
 
     public function testEmbedIndexed()
@@ -524,7 +524,7 @@ public function testEmbedIndexed()
 
         $type  = 'video/quicktime';
         $embed = embed('movie.mov', $type, 'class="test"', true);
-        $this->assertEquals($expected, $embed, '');
+        $this->assertSame($expected, $embed, '');
     }
 
     public function testObject()
@@ -537,7 +537,7 @@ public function testObject()
         $type   = 'application/x-shockwave-flash';
         $object = object('movie.swf', $type, 'class="test"');
 
-        $this->assertEquals($expected, $object);
+        $this->assertSame($expected, $object);
     }
 
     public function testObjectWithParams()
@@ -556,7 +556,7 @@ public function testObjectWithParams()
             param('hello', 'world', 'ref', 'class="test"'),
         ];
         $object = object('movie.swf', $type, 'class="test"', $parms);
-        $this->assertEquals($expected, $object);
+        $this->assertSame($expected, $object);
     }
 
     public function testObjectIndexed()
@@ -569,7 +569,7 @@ public function testObjectIndexed()
         $type   = 'application/x-shockwave-flash';
         $object = object('movie.swf', $type, 'class="test"', [], true);
 
-        $this->assertEquals($expected, $object);
+        $this->assertSame($expected, $object);
     }
 
     // ------------------------------------------------------------------------
diff --git a/tests/system/Helpers/InflectorHelperTest.php b/tests/system/Helpers/InflectorHelperTest.php
index faaef5f38e88..c044c75bc488 100755
--- a/tests/system/Helpers/InflectorHelperTest.php
+++ b/tests/system/Helpers/InflectorHelperTest.php
@@ -51,7 +51,7 @@ public function testSingular()
 
         foreach ($strings as $pluralizedString => $singularizedString) {
             $singular = singular($pluralizedString);
-            $this->assertEquals($singular, $singularizedString);
+            $this->assertSame($singular, $singularizedString);
         }
     }
 
@@ -89,7 +89,7 @@ public function testPlural()
 
         foreach ($strings as $pluralizedString => $singularizedString) {
             $plural = plural($singularizedString);
-            $this->assertEquals($plural, $pluralizedString);
+            $this->assertSame($plural, $pluralizedString);
         }
     }
 
@@ -147,7 +147,7 @@ public function testCounted()
 
         foreach ($triplets as $triplet) {
             $result = counted($triplet[0], $triplet[1]);
-            $this->assertEquals($triplet[2], $result);
+            $this->assertSame($triplet[2], $result);
         }
     }
 
@@ -162,7 +162,7 @@ public function testCamelize()
 
         foreach ($strings as $lowerCasedString => $camelizedString) {
             $camelized = camelize($lowerCasedString);
-            $this->assertEquals($camelized, $camelizedString);
+            $this->assertSame($camelized, $camelizedString);
         }
     }
 
@@ -177,7 +177,7 @@ public function testPascalize()
 
         foreach ($strings as $lowerCasedString => $pascalizedString) {
             $pascalized = pascalize($lowerCasedString);
-            $this->assertEquals($pascalized, $pascalizedString);
+            $this->assertSame($pascalized, $pascalizedString);
         }
     }
 
@@ -192,7 +192,7 @@ public function testUnderscore()
 
         foreach ($strings as $spaced => $underscore) {
             $underscored = underscore($spaced);
-            $this->assertEquals($underscored, $underscore);
+            $this->assertSame($underscored, $underscore);
         }
     }
 
@@ -212,8 +212,8 @@ public function testHumanize()
         $humanizedUnderscore = humanize($underscored[0]);
         $humanizedDash       = humanize($dashed[0], '-');
 
-        $this->assertEquals($humanizedUnderscore, $underscored[1]);
-        $this->assertEquals($humanizedDash, $dashed[1]);
+        $this->assertSame($humanizedUnderscore, $underscored[1]);
+        $this->assertSame($humanizedDash, $dashed[1]);
     }
 
     //--------------------------------------------------------------------
@@ -246,7 +246,7 @@ public function testDasherize()
 
         foreach ($strings as $underscored => $dashed) {
             $dasherized = dasherize($underscored);
-            $this->assertEquals($dasherized, $dashed);
+            $this->assertSame($dasherized, $dashed);
         }
     }
 
@@ -269,7 +269,7 @@ public function testOrdinal()
 
         foreach ($suffixes as $suffix => $number) {
             $ordinal = ordinal($number);
-            $this->assertEquals($suffix, $ordinal);
+            $this->assertSame($suffix, $ordinal);
         }
     }
 
@@ -292,7 +292,7 @@ public function testOrdinalize()
 
         foreach ($suffixedNumbers as $suffixed => $number) {
             $ordinalized = ordinalize($number);
-            $this->assertEquals($suffixed, $ordinalized);
+            $this->assertSame($suffixed, $ordinalized);
         }
     }
 }
diff --git a/tests/system/Helpers/NumberHelperTest.php b/tests/system/Helpers/NumberHelperTest.php
index 5ecdde8934e1..e335a8f7c57c 100755
--- a/tests/system/Helpers/NumberHelperTest.php
+++ b/tests/system/Helpers/NumberHelperTest.php
@@ -18,11 +18,11 @@ protected function setUp(): void
 
     public function testRomanNumber()
     {
-        $this->assertEquals('XCVI', number_to_roman(96));
-        $this->assertEquals('MMDCCCXCV', number_to_roman(2895));
-        $this->assertEquals('CCCXXIX', number_to_roman(329));
-        $this->assertEquals('IV', number_to_roman(4));
-        $this->assertEquals('X', number_to_roman(10));
+        $this->assertSame('XCVI', number_to_roman(96));
+        $this->assertSame('MMDCCCXCV', number_to_roman(2895));
+        $this->assertSame('CCCXXIX', number_to_roman(329));
+        $this->assertSame('IV', number_to_roman(4));
+        $this->assertSame('X', number_to_roman(10));
     }
 
     public function testRomanNumberRange()
@@ -34,13 +34,13 @@ public function testRomanNumberRange()
 
     public function testFormatNumber()
     {
-        $this->assertEquals('123,456', format_number(123456, 0, 'en_US'));
+        $this->assertSame('123,456', format_number(123456, 0, 'en_US'));
     }
 
     public function testFormatNumberWithPrecision()
     {
-        $this->assertEquals('123,456.8', format_number(123456.789, 1, 'en_US'));
-        $this->assertEquals('123,456.79', format_number(123456.789, 2, 'en_US'));
+        $this->assertSame('123,456.8', format_number(123456.789, 1, 'en_US'));
+        $this->assertSame('123,456.79', format_number(123456.789, 2, 'en_US'));
     }
 
     public function testFormattingOptions()
@@ -49,67 +49,67 @@ public function testFormattingOptions()
             'before' => '<<',
             'after'  => '>>',
         ];
-        $this->assertEquals('<<123,456.79>>', format_number(123456.789, 2, 'en_US', $options));
+        $this->assertSame('<<123,456.79>>', format_number(123456.789, 2, 'en_US', $options));
     }
 
     public function testNumberToSize()
     {
-        $this->assertEquals('456 Bytes', number_to_size(456, 1, 'en_US'));
+        $this->assertSame('456 Bytes', number_to_size(456, 1, 'en_US'));
     }
 
     public function testKbFormat()
     {
-        $this->assertEquals('4.5 KB', number_to_size(4567, 1, 'en_US'));
+        $this->assertSame('4.5 KB', number_to_size(4567, 1, 'en_US'));
     }
 
     public function testKbFormatMedium()
     {
-        $this->assertEquals('44.6 KB', number_to_size(45678, 1, 'en_US'));
+        $this->assertSame('44.6 KB', number_to_size(45678, 1, 'en_US'));
     }
 
     public function testKbFormatLarge()
     {
-        $this->assertEquals('446.1 KB', number_to_size(456789, 1, 'en_US'));
+        $this->assertSame('446.1 KB', number_to_size(456789, 1, 'en_US'));
     }
 
     public function testMbFormat()
     {
-        $this->assertEquals('3.3 MB', number_to_size(3456789, 1, 'en_US'));
+        $this->assertSame('3.3 MB', number_to_size(3456789, 1, 'en_US'));
     }
 
     public function testGbFormat()
     {
-        $this->assertEquals('1.8 GB', number_to_size(1932735283.2, 1, 'en_US'));
+        $this->assertSame('1.8 GB', number_to_size(1932735283.2, 1, 'en_US'));
     }
 
     public function testTbFormat()
     {
-        $this->assertEquals('112,283.3 TB', number_to_size(123456789123456789, 1, 'en_US'));
+        $this->assertSame('112,283.3 TB', number_to_size(123456789123456789, 1, 'en_US'));
     }
 
     public function testThousands()
     {
-        $this->assertEquals('123 thousand', number_to_amount('123,000', 0, 'en_US'));
+        $this->assertSame('123 thousand', number_to_amount('123,000', 0, 'en_US'));
     }
 
     public function testMillions()
     {
-        $this->assertEquals('123.4 million', number_to_amount('123,400,000', 1, 'en_US'));
+        $this->assertSame('123.4 million', number_to_amount('123,400,000', 1, 'en_US'));
     }
 
     public function testBillions()
     {
-        $this->assertEquals('123.46 billion', number_to_amount('123,456,000,000', 2, 'en_US'));
+        $this->assertSame('123.46 billion', number_to_amount('123,456,000,000', 2, 'en_US'));
     }
 
     public function testTrillions()
     {
-        $this->assertEquals('123.457 trillion', number_to_amount('123,456,700,000,000', 3, 'en_US'));
+        $this->assertSame('123.457 trillion', number_to_amount('123,456,700,000,000', 3, 'en_US'));
     }
 
     public function testQuadrillions()
     {
-        $this->assertEquals('123.5 quadrillion', number_to_amount('123,456,700,000,000,000', 1, 'en_US'));
+        $this->assertSame('123.5 quadrillion', number_to_amount('123,456,700,000,000,000', 1, 'en_US'));
     }
 
     /**
@@ -117,9 +117,9 @@ public function testQuadrillions()
      */
     public function testCurrencyCurrentLocale()
     {
-        $this->assertEquals('$1,234.56', number_to_currency(1234.56, 'USD', 'en_US', 2));
-        $this->assertEquals('£1,234.56', number_to_currency(1234.56, 'GBP', 'en_GB', 2));
-        $this->assertEquals('1.234,56 RSD', number_to_currency(1234.56, 'RSD', 'sr_RS', 2));
+        $this->assertSame('$1,234.56', number_to_currency(1234.56, 'USD', 'en_US', 2));
+        $this->assertSame('£1,234.56', number_to_currency(1234.56, 'GBP', 'en_GB', 2));
+        $this->assertSame('1.234,56 RSD', number_to_currency(1234.56, 'RSD', 'sr_RS', 2));
     }
 
     public function testNumbersThatArent()
diff --git a/tests/system/Helpers/SecurityHelperTest.php b/tests/system/Helpers/SecurityHelperTest.php
index fbaa6b856068..afa24b0c6546 100644
--- a/tests/system/Helpers/SecurityHelperTest.php
+++ b/tests/system/Helpers/SecurityHelperTest.php
@@ -18,24 +18,24 @@ protected function setUp(): void
 
     public function testSanitizeFilenameSimpleSuccess()
     {
-        $this->assertEquals('hello.doc', sanitize_filename('hello.doc'));
+        $this->assertSame('hello.doc', sanitize_filename('hello.doc'));
     }
 
     public function testSanitizeFilenameStripsExtras()
     {
         $filename = './<!--foo -->';
-        $this->assertEquals('foo ', sanitize_filename($filename));
+        $this->assertSame('foo ', sanitize_filename($filename));
     }
 
     public function testStripImageTags()
     {
-        $this->assertEquals('http://example.com/spacer.gif', strip_image_tags('http://example.com/spacer.gif'));
+        $this->assertSame('http://example.com/spacer.gif', strip_image_tags('http://example.com/spacer.gif'));
 
-        $this->assertEquals('http://example.com/spacer.gif', strip_image_tags('<img src="http://example.com/spacer.gif" alt="Who needs CSS when you have a spacer.gif?" />'));
+        $this->assertSame('http://example.com/spacer.gif', strip_image_tags('<img src="http://example.com/spacer.gif" alt="Who needs CSS when you have a spacer.gif?" />'));
     }
 
     public function testEncodePhpTags()
     {
-        $this->assertEquals('&lt;? echo $foo; ?&gt;', encode_php_tags('<? echo $foo; ?>'));
+        $this->assertSame('&lt;? echo $foo; ?&gt;', encode_php_tags('<? echo $foo; ?>'));
     }
 }
diff --git a/tests/system/Helpers/TextHelperTest.php b/tests/system/Helpers/TextHelperTest.php
index f36c42ab0661..bdee7678e06e 100755
--- a/tests/system/Helpers/TextHelperTest.php
+++ b/tests/system/Helpers/TextHelperTest.php
@@ -30,7 +30,7 @@ public function testStripSlashes()
             "Is your name O\'reilly?",
             "No, my name is O\'connor.",
         ];
-        $this->assertEquals($expected, strip_slashes($str));
+        $this->assertSame($expected, strip_slashes($str));
     }
 
     // --------------------------------------------------------------------
@@ -42,7 +42,7 @@ public function testStripQuotes()
         ];
 
         foreach ($strs as $str => $expect) {
-            $this->assertEquals($expect, strip_quotes($str));
+            $this->assertSame($expect, strip_quotes($str));
         }
     }
 
@@ -55,7 +55,7 @@ public function testQuotesToEntities()
         ];
 
         foreach ($strs as $str => $expect) {
-            $this->assertEquals($expect, quotes_to_entities($str));
+            $this->assertSame($expect, quotes_to_entities($str));
         }
     }
 
@@ -69,7 +69,7 @@ public function testReduceDoubleSlashes()
         ];
 
         foreach ($strs as $str => $expect) {
-            $this->assertEquals($expect, reduce_double_slashes($str));
+            $this->assertSame($expect, reduce_double_slashes($str));
         }
     }
 
@@ -82,7 +82,7 @@ public function testReduceMultiples()
         ];
 
         foreach ($strs as $str => $expect) {
-            $this->assertEquals($expect, reduce_multiples($str));
+            $this->assertSame($expect, reduce_multiples($str));
         }
         $strs = [
             'Fred, Bill,, Joe, Jimmy' => 'Fred, Bill, Joe, Jimmy',
@@ -90,37 +90,37 @@ public function testReduceMultiples()
         ];
 
         foreach ($strs as $str => $expect) {
-            $this->assertEquals($expect, reduce_multiples($str, ',', true));
+            $this->assertSame($expect, reduce_multiples($str, ',', true));
         }
     }
 
     // --------------------------------------------------------------------
     public function testRandomString()
     {
-        $this->assertEquals(16, strlen(random_string('alnum', 16)));
-        $this->assertEquals(16, strlen(random_string('alpha', 16)));
-        $this->assertEquals(16, strlen(random_string('nozero', 16)));
-        $this->assertEquals(16, strlen(random_string('numeric', 16)));
-        $this->assertEquals(8, strlen(random_string('numeric')));
+        $this->assertSame(16, strlen(random_string('alnum', 16)));
+        $this->assertSame(16, strlen(random_string('alpha', 16)));
+        $this->assertSame(16, strlen(random_string('nozero', 16)));
+        $this->assertSame(16, strlen(random_string('numeric', 16)));
+        $this->assertSame(8, strlen(random_string('numeric')));
 
         $this->assertIsString(random_string('basic'));
-        $this->assertEquals(16, strlen($random = random_string('crypto', 16)));
+        $this->assertSame(16, strlen($random = random_string('crypto', 16)));
         $this->assertIsString($random);
 
-        $this->assertEquals(32, strlen($random = random_string('md5')));
-        $this->assertEquals(40, strlen($random = random_string('sha1')));
+        $this->assertSame(32, strlen($random = random_string('md5')));
+        $this->assertSame(40, strlen($random = random_string('sha1')));
     }
 
     // --------------------------------------------------------------------
     public function testIncrementString()
     {
-        $this->assertEquals('my-test_1', increment_string('my-test'));
-        $this->assertEquals('my-test-1', increment_string('my-test', '-'));
-        $this->assertEquals('file_5', increment_string('file_4'));
-        $this->assertEquals('file-5', increment_string('file-4', '-'));
-        $this->assertEquals('file-5', increment_string('file-4', '-'));
-        $this->assertEquals('file-1', increment_string('file', '-', '1'));
-        $this->assertEquals(124, increment_string('123', ''));
+        $this->assertSame('my-test_1', increment_string('my-test'));
+        $this->assertSame('my-test-1', increment_string('my-test', '-'));
+        $this->assertSame('file_5', increment_string('file_4'));
+        $this->assertSame('file-5', increment_string('file-4', '-'));
+        $this->assertSame('file-5', increment_string('file-4', '-'));
+        $this->assertSame('file-1', increment_string('file', '-', '1'));
+        $this->assertSame('124', increment_string('123', ''));
     }
 
     // -------------------------------------------------------------------
@@ -129,20 +129,20 @@ public function testIncrementString()
 
     public function testWordLimiter()
     {
-        $this->assertEquals('Once upon a time,&#8230;', word_limiter($this->_long_string, 4));
-        $this->assertEquals('Once upon a time,&hellip;', word_limiter($this->_long_string, 4, '&hellip;'));
-        $this->assertEquals('', word_limiter('', 4));
-        $this->assertEquals('Once upon a&hellip;', word_limiter($this->_long_string, 3, '&hellip;'));
-        $this->assertEquals('Once upon a time', word_limiter('Once upon a time', 4, '&hellip;'));
+        $this->assertSame('Once upon a time,&#8230;', word_limiter($this->_long_string, 4));
+        $this->assertSame('Once upon a time,&hellip;', word_limiter($this->_long_string, 4, '&hellip;'));
+        $this->assertSame('', word_limiter('', 4));
+        $this->assertSame('Once upon a&hellip;', word_limiter($this->_long_string, 3, '&hellip;'));
+        $this->assertSame('Once upon a time', word_limiter('Once upon a time', 4, '&hellip;'));
     }
 
     // ------------------------------------------------------------------------
     public function testCharacterLimiter()
     {
-        $this->assertEquals('Once upon a time, a&#8230;', character_limiter($this->_long_string, 20));
-        $this->assertEquals('Once upon a time, a&hellip;', character_limiter($this->_long_string, 20, '&hellip;'));
-        $this->assertEquals('Short', character_limiter('Short', 20));
-        $this->assertEquals('Short', character_limiter('Short', 5));
+        $this->assertSame('Once upon a time, a&#8230;', character_limiter($this->_long_string, 20));
+        $this->assertSame('Once upon a time, a&hellip;', character_limiter($this->_long_string, 20, '&hellip;'));
+        $this->assertSame('Short', character_limiter('Short', 20));
+        $this->assertSame('Short', character_limiter('Short', 5));
     }
 
     // ------------------------------------------------------------------------
@@ -154,7 +154,7 @@ public function testAsciiToEntities()
         ];
 
         foreach ($strs as $str => $expect) {
-            $this->assertEquals($expect, ascii_to_entities($str));
+            $this->assertSame($expect, ascii_to_entities($str));
         }
     }
 
@@ -167,29 +167,29 @@ public function testEntitiesToAscii()
         ];
 
         foreach ($strs as $str => $expect) {
-            $this->assertEquals($expect, entities_to_ascii($str));
+            $this->assertSame($expect, entities_to_ascii($str));
         }
     }
 
     public function testEntitiesToAsciiUnsafe()
     {
         $str = '&lt;&gt;';
-        $this->assertEquals('<>', entities_to_ascii($str, true));
-        $this->assertEquals('&lt;&gt;', entities_to_ascii($str, false));
+        $this->assertSame('<>', entities_to_ascii($str, true));
+        $this->assertSame('&lt;&gt;', entities_to_ascii($str, false));
     }
 
     public function testEntitiesToAsciiSmallOrdinals()
     {
         $str = '&#07;';
-        $this->assertEquals(pack('c', 7), entities_to_ascii($str));
+        $this->assertSame(pack('c', 7), entities_to_ascii($str));
     }
 
     // ------------------------------------------------------------------------
     public function testConvertAccentedCharacters()
     {
         //$this->ci_vfs_clone('application/Config/ForeignChars.php');
-        $this->assertEquals('AAAeEEEIIOOEUUUeY', convert_accented_characters('ÀÂÄÈÊËÎÏÔŒÙÛÜŸ'));
-        $this->assertEquals('a e i o u n ue', convert_accented_characters('á é í ó ú ñ ü'));
+        $this->assertSame('AAAeEEEIIOOEUUUeY', convert_accented_characters('ÀÂÄÈÊËÎÏÔŒÙÛÜŸ'));
+        $this->assertSame('a e i o u n ue', convert_accented_characters('á é í ó ú ñ ü'));
     }
 
     // ------------------------------------------------------------------------
@@ -211,7 +211,7 @@ public function testCensoredWords()
         ];
 
         foreach ($strs as $str => $expect) {
-            $this->assertEquals($expect, word_censor($str, $censored, '$*#'));
+            $this->assertSame($expect, word_censor($str, $censored, '$*#'));
         }
     }
 
@@ -219,7 +219,7 @@ public function testCensoredWords()
     public function testHighlightCode()
     {
         $expect = "<code><span style=\"color: #000000\">\n<span style=\"color: #0000BB\">&lt;?php&nbsp;var_dump</span><span style=\"color: #007700\">(</span><span style=\"color: #0000BB\">\$this</span><span style=\"color: #007700\">);&nbsp;</span><span style=\"color: #0000BB\">?&gt;&nbsp;</span>\n</span>\n</code>";
-        $this->assertEquals($expect, highlight_code('<?php var_dump($this); ?>'));
+        $this->assertSame($expect, highlight_code('<?php var_dump($this); ?>'));
     }
 
     // ------------------------------------------------------------------------
@@ -234,10 +234,10 @@ public function testHighlightPhrase()
         ];
 
         foreach ($strs as $str => $expect) {
-            $this->assertEquals($expect, highlight_phrase($str, 'this is'));
+            $this->assertSame($expect, highlight_phrase($str, 'this is'));
         }
 
-        $this->assertEquals('<strong>this is</strong> a strong test', highlight_phrase('this is a strong test', 'this is', '<strong>', '</strong>'));
+        $this->assertSame('<strong>this is</strong> a strong test', highlight_phrase('this is a strong test', 'this is', '<strong>', '</strong>'));
     }
 
     // ------------------------------------------------------------------------
@@ -266,7 +266,7 @@ public function testEllipsize()
 
         foreach ($strs as $pos => $s) {
             foreach ($s as $str => $expect) {
-                $this->assertEquals($expect, ellipsize($str, 10, $pos));
+                $this->assertSame($expect, ellipsize($str, 10, $pos));
             }
         }
     }
@@ -276,26 +276,26 @@ public function testWordWrap()
     {
         $string   = 'Here is a simple string of text that will help us demonstrate this function.';
         $expected = "Here is a simple string\nof text that will help us\ndemonstrate this\nfunction.";
-        $this->assertEquals(substr_count(word_wrap($string, 25), "\n"), 3);
-        $this->assertEquals($expected, word_wrap($string, 25));
+        $this->assertSame(substr_count(word_wrap($string, 25), "\n"), 3);
+        $this->assertSame($expected, word_wrap($string, 25));
 
         $string2   = "Here is a\nbroken up sentence\rspanning lines\r\nwoohoo!";
         $expected2 = "Here is a\nbroken up sentence\nspanning lines\nwoohoo!";
-        $this->assertEquals(substr_count(word_wrap($string2, 25), "\n"), 3);
-        $this->assertEquals($expected2, word_wrap($string2, 25));
+        $this->assertSame(substr_count(word_wrap($string2, 25), "\n"), 3);
+        $this->assertSame($expected2, word_wrap($string2, 25));
 
         $string3   = "Here is another slightly longer\nbroken up sentence\rspanning lines\r\nwoohoo!";
         $expected3 = "Here is another slightly\nlonger\nbroken up sentence\nspanning lines\nwoohoo!";
-        $this->assertEquals(substr_count(word_wrap($string3, 25), "\n"), 4);
-        $this->assertEquals($expected3, word_wrap($string3, 25));
+        $this->assertSame(substr_count(word_wrap($string3, 25), "\n"), 4);
+        $this->assertSame($expected3, word_wrap($string3, 25));
     }
 
     public function testWordWrapUnwrap()
     {
         $string   = 'Here is a {unwrap}simple string of text{/unwrap} that will help us demonstrate this function.';
         $expected = "Here is a simple string of text\nthat will help us\ndemonstrate this\nfunction.";
-        $this->assertEquals(substr_count(word_wrap($string, 25), "\n"), 3);
-        $this->assertEquals($expected, word_wrap($string, 25));
+        $this->assertSame(substr_count(word_wrap($string, 25), "\n"), 3);
+        $this->assertSame($expected, word_wrap($string, 25));
     }
 
     public function testWordWrapLongWords()
@@ -303,7 +303,7 @@ public function testWordWrapLongWords()
         // the really really long word will be split
         $string   = 'Here is an unbelievable super-complicated and reallyreallyquiteextraordinarily sophisticated sentence.';
         $expected = "Here is an unbelievable\nsuper-complicated and\nreallyreallyquiteextraor\ndinarily\nsophisticated sentence.";
-        $this->assertEquals($expected, word_wrap($string, 25));
+        $this->assertSame($expected, word_wrap($string, 25));
     }
 
     public function testWordWrapURL()
@@ -311,14 +311,14 @@ public function testWordWrapURL()
         // the really really long word will be split
         $string   = 'Here is an unbelievable super-complicated and http://www.reallyreallyquiteextraordinarily.com sophisticated sentence.';
         $expected = "Here is an unbelievable\nsuper-complicated and\nhttp://www.reallyreallyquiteextraordinarily.com\nsophisticated sentence.";
-        $this->assertEquals($expected, word_wrap($string, 25));
+        $this->assertSame($expected, word_wrap($string, 25));
     }
 
     // ------------------------------------------------------------------------
     public function testDefaultWordWrapCharlim()
     {
         $string = 'Here is a longer string of text that will help us demonstrate the default charlim of this function.';
-        $this->assertEquals(strpos(word_wrap($string), "\n"), 73);
+        $this->assertSame(strpos(word_wrap($string), "\n"), 73);
     }
 
     // -----------------------------------------------------------------------
@@ -327,7 +327,7 @@ public function testExcerpt()
     {
         $string = $this->_long_string;
         $result = ' Once upon a time, a framework had no tests. It sad  So some nice people began to write tests. The more time that went on, the happier it became. ...';
-        $this->assertEquals(excerpt($string), $result);
+        $this->assertSame(excerpt($string), $result);
     }
 
     // -----------------------------------------------------------------------
@@ -337,7 +337,7 @@ public function testExcerptRadius()
         $string = $this->_long_string;
         $phrase = 'began';
         $result = '... people began to ...';
-        $this->assertEquals(excerpt($string, $phrase, 10), $result);
+        $this->assertSame(excerpt($string, $phrase, 10), $result);
     }
 
     // -----------------------------------------------------------------------
@@ -351,7 +351,7 @@ public function testAlternator()
         for ($i = 0; $i < 4; $i++) {
             $result .= alternator('I', 'you', 'we') . $phrase;
         }
-        $this->assertEquals('I scream! you scream! we scream! I scream! ', $result);
+        $this->assertSame('I scream! you scream! we scream! I scream! ', $result);
     }
 
     public function testEmptyAlternator()
@@ -363,6 +363,6 @@ public function testEmptyAlternator()
             $result .= alternator() . $phrase;
         }
 
-        $this->assertEquals(' scream!  scream!  scream!  scream! ', $result);
+        $this->assertSame(' scream!  scream!  scream!  scream! ', $result);
     }
 }
diff --git a/tests/system/Helpers/URLHelper/CurrentUrlTest.php b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
index 132427d1e301..30ed290c505b 100644
--- a/tests/system/Helpers/URLHelper/CurrentUrlTest.php
+++ b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
@@ -65,7 +65,7 @@ public function testCurrentURLReturnsBasicURL()
         // Since we're on a CLI, we must provide our own URI
         $this->config->baseURL = 'http://example.com/public';
 
-        $this->assertEquals('http://example.com/public/index.php/', current_url());
+        $this->assertSame('http://example.com/public/index.php/', current_url());
     }
 
     public function testCurrentURLReturnsObject()
@@ -76,7 +76,7 @@ public function testCurrentURLReturnsObject()
         $url = current_url(true);
 
         $this->assertInstanceOf(URI::class, $url);
-        $this->assertEquals('http://example.com/public/index.php/', (string) $url);
+        $this->assertSame('http://example.com/public/index.php/', (string) $url);
     }
 
     public function testCurrentURLEquivalence()
@@ -91,7 +91,7 @@ public function testCurrentURLEquivalence()
         $request = Services::request($this->config);
         Services::injectMock('request', $request);
 
-        $this->assertEquals(site_url(uri_string()), current_url());
+        $this->assertSame(site_url(uri_string()), current_url());
     }
 
     public function testCurrentURLInSubfolder()
@@ -107,13 +107,13 @@ public function testCurrentURLInSubfolder()
         $request = Services::request($this->config);
         Services::injectMock('request', $request);
 
-        $this->assertEquals('http://example.com/foo/public/index.php/bar', current_url());
-        $this->assertEquals('http://example.com/foo/public/index.php/bar?baz=quip', (string) current_url(true));
+        $this->assertSame('http://example.com/foo/public/index.php/bar', current_url());
+        $this->assertSame('http://example.com/foo/public/index.php/bar?baz=quip', (string) current_url(true));
 
         $uri = current_url(true);
-        $this->assertEquals('foo', $uri->getSegment(1));
-        $this->assertEquals('example.com', $uri->getHost());
-        $this->assertEquals('http', $uri->getScheme());
+        $this->assertSame('foo', $uri->getSegment(1));
+        $this->assertSame('example.com', $uri->getHost());
+        $this->assertSame('http', $uri->getScheme());
     }
 
     public function testCurrentURLWithPortInSubfolder()
@@ -130,15 +130,15 @@ public function testCurrentURLWithPortInSubfolder()
         $request = Services::request($this->config);
         Services::injectMock('request', $request);
 
-        $this->assertEquals('http://example.com:8080/foo/public/index.php/bar', current_url());
-        $this->assertEquals('http://example.com:8080/foo/public/index.php/bar?baz=quip', (string) current_url(true));
+        $this->assertSame('http://example.com:8080/foo/public/index.php/bar', current_url());
+        $this->assertSame('http://example.com:8080/foo/public/index.php/bar?baz=quip', (string) current_url(true));
 
         $uri = current_url(true);
-        $this->assertEquals(['foo', 'public', 'index.php', 'bar'], $uri->getSegments());
-        $this->assertEquals('foo', $uri->getSegment(1));
-        $this->assertEquals('example.com', $uri->getHost());
-        $this->assertEquals('http', $uri->getScheme());
-        $this->assertEquals('8080', $uri->getPort());
+        $this->assertSame(['foo', 'public', 'index.php', 'bar'], $uri->getSegments());
+        $this->assertSame('foo', $uri->getSegment(1));
+        $this->assertSame('example.com', $uri->getHost());
+        $this->assertSame('http', $uri->getScheme());
+        $this->assertSame(8080, $uri->getPort());
     }
 
     //--------------------------------------------------------------------
@@ -155,7 +155,7 @@ public function testUriStringAbsolute()
 
         Services::injectMock('request', $request);
 
-        $this->assertEquals('/assets/image.jpg', uri_string());
+        $this->assertSame('/assets/image.jpg', uri_string());
     }
 
     public function testUriStringRelative()
@@ -168,7 +168,7 @@ public function testUriStringRelative()
 
         Services::injectMock('request', $request);
 
-        $this->assertEquals('assets/image.jpg', uri_string(true));
+        $this->assertSame('assets/image.jpg', uri_string(true));
     }
 
     public function testUriStringNoTrailingSlashAbsolute()
@@ -182,7 +182,7 @@ public function testUriStringNoTrailingSlashAbsolute()
 
         Services::injectMock('request', $request);
 
-        $this->assertEquals('/assets/image.jpg', uri_string());
+        $this->assertSame('/assets/image.jpg', uri_string());
     }
 
     public function testUriStringNoTrailingSlashRelative()
@@ -196,7 +196,7 @@ public function testUriStringNoTrailingSlashRelative()
 
         Services::injectMock('request', $request);
 
-        $this->assertEquals('assets/image.jpg', uri_string(true));
+        $this->assertSame('assets/image.jpg', uri_string(true));
     }
 
     public function testUriStringEmptyAbsolute()
@@ -206,7 +206,7 @@ public function testUriStringEmptyAbsolute()
 
         Services::injectMock('request', $request);
 
-        $this->assertEquals('/', uri_string());
+        $this->assertSame('/', uri_string());
     }
 
     public function testUriStringEmptyRelative()
@@ -216,7 +216,7 @@ public function testUriStringEmptyRelative()
 
         Services::injectMock('request', $request);
 
-        $this->assertEquals('', uri_string(true));
+        $this->assertSame('', uri_string(true));
     }
 
     public function testUriStringSubfolderAbsolute()
@@ -230,7 +230,7 @@ public function testUriStringSubfolderAbsolute()
 
         Services::injectMock('request', $request);
 
-        $this->assertEquals('/subfolder/assets/image.jpg', uri_string());
+        $this->assertSame('/subfolder/assets/image.jpg', uri_string());
     }
 
     public function testUriStringSubfolderRelative()
@@ -245,7 +245,7 @@ public function testUriStringSubfolderRelative()
 
         Services::injectMock('request', $request);
 
-        $this->assertEquals('assets/image.jpg', uri_string(true));
+        $this->assertSame('assets/image.jpg', uri_string(true));
     }
 
     //--------------------------------------------------------------------
@@ -305,7 +305,7 @@ public function testUrlIs(string $currentPath, string $testPath, bool $expected)
         $request->uri = new URI('http://example.com/' . $currentPath);
         Services::injectMock('request', $request);
 
-        $this->assertEquals($expected, url_is($testPath));
+        $this->assertSame($expected, url_is($testPath));
     }
 
     /**
@@ -321,7 +321,7 @@ public function testUrlIsNoIndex(string $currentPath, string $testPath, bool $ex
         $request->uri = new URI('http://example.com/' . $currentPath);
         Services::injectMock('request', $request);
 
-        $this->assertEquals($expected, url_is($testPath));
+        $this->assertSame($expected, url_is($testPath));
     }
 
     /**
@@ -338,6 +338,6 @@ public function testUrlIsWithSubfolder(string $currentPath, string $testPath, bo
         $request->uri = new URI('http://example.com/subfolder/' . $currentPath);
         Services::injectMock('request', $request);
 
-        $this->assertEquals($expected, url_is($testPath));
+        $this->assertSame($expected, url_is($testPath));
     }
 }
diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php
index 7cd23ff4c911..acf533bc1fd0 100644
--- a/tests/system/Helpers/URLHelper/MiscUrlTest.php
+++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php
@@ -66,7 +66,7 @@ public function testPreviousURLUsesSessionFirst()
 
         Services::injectMock('request', $request);
 
-        $this->assertEquals($uri2, previous_url());
+        $this->assertSame($uri2, previous_url());
     }
 
     //--------------------------------------------------------------------
@@ -84,7 +84,7 @@ public function testPreviousURLUsesRefererIfNeeded()
 
         Services::injectMock('request', $request);
 
-        $this->assertEquals($uri1, previous_url());
+        $this->assertSame($uri1, previous_url());
     }
 
     //--------------------------------------------------------------------
@@ -97,7 +97,7 @@ public function testIndexPage()
 
         Services::injectMock('request', $request);
 
-        $this->assertEquals('index.php', index_page());
+        $this->assertSame('index.php', index_page());
     }
 
     public function testIndexPageAlt()
@@ -108,7 +108,7 @@ public function testIndexPageAlt()
 
         Services::injectMock('request', $request);
 
-        $this->assertEquals('banana.php', index_page($this->config));
+        $this->assertSame('banana.php', index_page($this->config));
     }
 
     //--------------------------------------------------------------------
@@ -166,7 +166,7 @@ public function testAnchor($expected = '', $uri = '', $title = '', $attributes =
         $request->uri = new URI('http://example.com/');
 
         Services::injectMock('request', $request);
-        $this->assertEquals($expected, anchor($uri, $title, $attributes, $this->config));
+        $this->assertSame($expected, anchor($uri, $title, $attributes, $this->config));
     }
 
     public function anchorNoindexPatterns()
@@ -228,7 +228,7 @@ public function testAnchorNoindex($expected = '', $uri = '', $title = '', $attri
         $request->uri            = new URI('http://example.com/');
 
         Services::injectMock('request', $request);
-        $this->assertEquals($expected, anchor($uri, $title, $attributes, $this->config));
+        $this->assertSame($expected, anchor($uri, $title, $attributes, $this->config));
     }
 
     public function anchorSubpagePatterns()
@@ -280,7 +280,7 @@ public function testAnchorTargetted($expected = '', $uri = '', $title = '', $att
         $request->uri            = new URI('http://example.com/');
 
         Services::injectMock('request', $request);
-        $this->assertEquals($expected, anchor($uri, $title, $attributes, $this->config));
+        $this->assertSame($expected, anchor($uri, $title, $attributes, $this->config));
     }
 
     public function anchorExamplePatterns()
@@ -320,7 +320,7 @@ public function testAnchorExamples($expected = '', $uri = '', $title = '', $attr
         $request->uri = new URI('http://example.com/');
 
         Services::injectMock('request', $request);
-        $this->assertEquals($expected, anchor($uri, $title, $attributes, $this->config));
+        $this->assertSame($expected, anchor($uri, $title, $attributes, $this->config));
     }
 
     //--------------------------------------------------------------------
@@ -375,7 +375,7 @@ public function testAnchorPopup($expected = '', $uri = '', $title = '', $attribu
         $request->uri = new URI('http://example.com/');
 
         Services::injectMock('request', $request);
-        $this->assertEquals($expected, anchor_popup($uri, $title, $attributes, $this->config));
+        $this->assertSame($expected, anchor_popup($uri, $title, $attributes, $this->config));
     }
 
     //--------------------------------------------------------------------
@@ -412,7 +412,7 @@ public function testMailto($expected = '', $email = '', $title = '', $attributes
 
         Services::injectMock('request', $request);
 
-        $this->assertEquals($expected, mailto($email, $title, $attributes));
+        $this->assertSame($expected, mailto($email, $title, $attributes));
     }
 
     //--------------------------------------------------------------------
@@ -449,7 +449,7 @@ public function testSafeMailto($expected = '', $email = '', $title = '', $attrib
 
         Services::injectMock('request', $request);
 
-        $this->assertEquals($expected, safe_mailto($email, $title, $attributes));
+        $this->assertSame($expected, safe_mailto($email, $title, $attributes));
     }
 
     //--------------------------------------------------------------------
@@ -498,7 +498,7 @@ public function autolinkUrls()
      */
     public function testAutoLinkUrl($in, $out)
     {
-        $this->assertEquals($out, auto_link($in, 'url'));
+        $this->assertSame($out, auto_link($in, 'url'));
     }
 
     public function autolinkEmails()
@@ -544,7 +544,7 @@ public function autolinkEmails()
      */
     public function testAutoLinkEmail($in, $out)
     {
-        $this->assertEquals($out, auto_link($in, 'email'));
+        $this->assertSame($out, auto_link($in, 'email'));
     }
 
     public function autolinkBoth()
@@ -590,7 +590,7 @@ public function autolinkBoth()
      */
     public function testAutolinkBoth($in, $out)
     {
-        $this->assertEquals($out, auto_link($in));
+        $this->assertSame($out, auto_link($in));
     }
 
     public function autolinkPopup()
@@ -636,7 +636,7 @@ public function autolinkPopup()
      */
     public function testAutoLinkPopup($in, $out)
     {
-        $this->assertEquals($out, auto_link($in, 'url', true));
+        $this->assertSame($out, auto_link($in, 'url', true));
     }
 
     //--------------------------------------------------------------------
@@ -739,7 +739,7 @@ public function testUrlTitle()
         ];
 
         foreach ($words as $in => $out) {
-            $this->assertEquals($out, url_title($in, '-', true));
+            $this->assertSame($out, url_title($in, '-', true));
         }
     }
 
@@ -752,7 +752,7 @@ public function testUrlTitleExtraDashes()
         ];
 
         foreach ($words as $in => $out) {
-            $this->assertEquals($out, url_title($in, '_'));
+            $this->assertSame($out, url_title($in, '_'));
         }
     }
 
@@ -769,7 +769,7 @@ public function testMbUrlTitle()
         ];
 
         foreach ($words as $in => $out) {
-            $this->assertEquals($out, mb_url_title($in, '-', true));
+            $this->assertSame($out, mb_url_title($in, '-', true));
         }
     }
 
@@ -783,7 +783,7 @@ public function testMbUrlTitleExtraDashes()
         ];
 
         foreach ($words as $in => $out) {
-            $this->assertEquals($out, mb_url_title($in, '_'));
+            $this->assertSame($out, mb_url_title($in, '_'));
         }
     }
 
@@ -798,7 +798,7 @@ public function testUrlTo(string $expected, string $input, ...$args)
         $routes->add('path/(:any)/to/(:num)', 'myController::goto/$1/$2', ['as' => 'gotoPage']);
         $routes->add('route/(:any)/to/(:num)', 'myOtherController::goto/$1/$2');
 
-        $this->assertEquals($expected, url_to($input, ...$args));
+        $this->assertSame($expected, url_to($input, ...$args));
     }
 
     /**
diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php
index 49dc62cb53d1..5cf8613bafff 100644
--- a/tests/system/Helpers/URLHelper/SiteUrlTest.php
+++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php
@@ -71,12 +71,12 @@ public function testUrls($baseURL, $indexPage, $scheme, $secure, $path, $expecte
         $this->config->indexPage                 = $indexPage;
         $this->config->forceGlobalSecureRequests = $secure;
 
-        $this->assertEquals($expectedSiteUrl, site_url($path, $scheme, $this->config));
+        $this->assertSame($expectedSiteUrl, site_url($path, $scheme, $this->config));
 
         // base_url is always the trimmed site_url without index page
         $expectedBaseUrl = $indexPage === '' ? $expectedSiteUrl : str_replace('/' . $indexPage, '', $expectedSiteUrl);
         $expectedBaseUrl = rtrim($expectedBaseUrl, '/');
-        $this->assertEquals($expectedBaseUrl, base_url($path, $scheme));
+        $this->assertSame($expectedBaseUrl, base_url($path, $scheme));
     }
 
     public function configProvider()
@@ -247,13 +247,13 @@ public function testBaseURLDiscovery()
         $_SERVER['HTTP_HOST']   = 'example.com';
         $_SERVER['REQUEST_URI'] = '/test';
 
-        $this->assertEquals('http://example.com', base_url());
+        $this->assertSame('http://example.com', base_url());
 
         $_SERVER['HTTP_HOST']   = 'example.com';
         $_SERVER['REQUEST_URI'] = '/test/page';
 
-        $this->assertEquals('http://example.com', base_url());
-        $this->assertEquals('http://example.com/profile', base_url('profile'));
+        $this->assertSame('http://example.com', base_url());
+        $this->assertSame('http://example.com/profile', base_url('profile'));
     }
 
     public function testBaseURLService()
@@ -267,7 +267,7 @@ public function testBaseURLService()
 
         Services::injectMock('request', $request);
 
-        $this->assertEquals('http://example.com/ci/v4/index.php/controller/method', site_url('controller/method', null, $this->config));
-        $this->assertEquals('http://example.com/ci/v4/controller/method', base_url('controller/method', null));
+        $this->assertSame('http://example.com/ci/v4/index.php/controller/method', site_url('controller/method', null, $this->config));
+        $this->assertSame('http://example.com/ci/v4/controller/method', base_url('controller/method', null));
     }
 }
diff --git a/tests/system/Helpers/XMLHelperTest.php b/tests/system/Helpers/XMLHelperTest.php
index f84e557daae8..f3b422ff5fbc 100644
--- a/tests/system/Helpers/XMLHelperTest.php
+++ b/tests/system/Helpers/XMLHelperTest.php
@@ -22,7 +22,7 @@ public function testConvert()
     {
         $original = '<p>Here is a so-so paragraph & an entity (&#123;).</p>';
         $expected = '&lt;p&gt;Here is a so&#45;so paragraph &amp; an entity (&#123;).&lt;/p&gt;';
-        $this->assertEquals($expected, xml_convert($original));
+        $this->assertSame($expected, xml_convert($original));
     }
 
     // --------------------------------------------------------------------
@@ -30,6 +30,6 @@ public function testConvertProtected()
     {
         $original = '<p>Here is a so&so; paragraph & an entity (&#123;).</p>';
         $expected = '&lt;p&gt;Here is a so&so; paragraph &amp; an entity (&#123;).&lt;/p&gt;';
-        $this->assertEquals($expected, xml_convert($original, true));
+        $this->assertSame($expected, xml_convert($original, true));
     }
 }
diff --git a/tests/system/Honeypot/HoneypotTest.php b/tests/system/Honeypot/HoneypotTest.php
index 9dc7c8e77847..f9b255fec5ea 100644
--- a/tests/system/Honeypot/HoneypotTest.php
+++ b/tests/system/Honeypot/HoneypotTest.php
@@ -54,13 +54,13 @@ public function testAttachHoneypotAndContainer()
         $this->response->setBody('<form></form>');
         $this->honeypot->attachHoneypot($this->response);
         $expected = '<form><div style="display:none"><label>Fill This Field</label><input type="text" name="honeypot" value=""/></div></form>';
-        $this->assertEquals($expected, $this->response->getBody());
+        $this->assertSame($expected, $this->response->getBody());
 
         $this->config->container = '<div class="hidden">{template}</div>';
         $this->response->setBody('<form></form>');
         $this->honeypot->attachHoneypot($this->response);
         $expected = '<form><div class="hidden"><label>Fill This Field</label><input type="text" name="honeypot" value=""/></div></form>';
-        $this->assertEquals($expected, $this->response->getBody());
+        $this->assertSame($expected, $this->response->getBody());
     }
 
     //--------------------------------------------------------------------
@@ -143,7 +143,7 @@ public function testEmptyConfigContainer()
         $config->container = '';
         $honeypot          = new Honeypot($config);
 
-        $this->assertEquals(
+        $this->assertSame(
             '<div style="display:none">{template}</div>',
             $this->getPrivateProperty($honeypot, 'config')->container
         );
@@ -155,7 +155,7 @@ public function testNoTemplateConfigContainer()
         $config->container = '<div></div>';
         $honeypot          = new Honeypot($config);
 
-        $this->assertEquals(
+        $this->assertSame(
             '<div style="display:none">{template}</div>',
             $this->getPrivateProperty($honeypot, 'config')->container
         );
diff --git a/tests/system/I18n/TimeDifferenceTest.php b/tests/system/I18n/TimeDifferenceTest.php
index e64e4fcfe1d4..b2878f19bff4 100644
--- a/tests/system/I18n/TimeDifferenceTest.php
+++ b/tests/system/I18n/TimeDifferenceTest.php
@@ -27,29 +27,29 @@ public function testDifferenceBasics()
 
         $obj = $current->difference($test);
 
-        $this->assertEquals(-7, $obj->getYears());
-        $this->assertEquals(-84, $obj->getMonths());
-        $this->assertEquals(-365, $obj->getWeeks());
-        $this->assertEquals(-2557, $obj->getDays());
-        $this->assertEquals(-61368, $obj->getHours());
-        $this->assertEquals(-3682080, $obj->getMinutes());
-        $this->assertEquals(-220924800, $obj->getSeconds());
-
-        $this->assertEquals(-7, $obj->years);
-        $this->assertEquals(-84, $obj->months);
-        $this->assertEquals(-365, $obj->weeks);
-        $this->assertEquals(-2557, $obj->days);
-        $this->assertEquals(-61368, $obj->hours);
-        $this->assertEquals(-3682080, $obj->minutes);
-        $this->assertEquals(-220924800, $obj->seconds);
-
-        $this->assertEquals($diff / YEAR, $obj->getYears(true));
-        $this->assertEquals($diff / MONTH, $obj->getMonths(true));
-        $this->assertEquals($diff / WEEK, $obj->getWeeks(true));
-        $this->assertEquals($diff / DAY, $obj->getDays(true));
-        $this->assertEquals($diff / HOUR, $obj->getHours(true));
-        $this->assertEquals($diff / MINUTE, $obj->getMinutes(true));
-        $this->assertEquals($diff / SECOND, $obj->getSeconds(true));
+        $this->assertSame(-7, $obj->getYears());
+        $this->assertSame(-84, $obj->getMonths());
+        $this->assertSame(-365, $obj->getWeeks());
+        $this->assertSame(-2557, $obj->getDays());
+        $this->assertSame(-61368, $obj->getHours());
+        $this->assertSame(-3682080, $obj->getMinutes());
+        $this->assertSame(-220924800, $obj->getSeconds());
+
+        $this->assertSame(-7, $obj->years);
+        $this->assertSame(-84, $obj->months);
+        $this->assertSame(-365, $obj->weeks);
+        $this->assertSame(-2557, $obj->days);
+        $this->assertSame(-61368, $obj->hours);
+        $this->assertSame(-3682080, $obj->minutes);
+        $this->assertSame(-220924800, $obj->seconds);
+
+        $this->assertSame($diff / YEAR, $obj->getYears(true));
+        $this->assertSame($diff / MONTH, $obj->getMonths(true));
+        $this->assertSame($diff / WEEK, $obj->getWeeks(true));
+        $this->assertSame($diff / DAY, $obj->getDays(true));
+        $this->assertSame($diff / HOUR, $obj->getHours(true));
+        $this->assertSame($diff / MINUTE, $obj->getMinutes(true));
+        $this->assertSame($diff / SECOND, $obj->getSeconds(true));
     }
 
     public function testHumanizeYearsSingle()
@@ -58,7 +58,7 @@ public function testHumanizeYearsSingle()
 
         $diff = $current->difference('March 9, 2016 12:00:00', 'America/Chicago');
 
-        $this->assertEquals('1 year ago', $diff->humanize('en'));
+        $this->assertSame('1 year ago', $diff->humanize('en'));
     }
 
     public function testHumanizeYearsPlural()
@@ -66,7 +66,7 @@ public function testHumanizeYearsPlural()
         $current = Time::parse('March 10, 2017', 'America/Chicago');
         $diff    = $current->difference('March 9, 2014 12:00:00', 'America/Chicago');
 
-        $this->assertEquals('3 years ago', $diff->humanize('en'));
+        $this->assertSame('3 years ago', $diff->humanize('en'));
     }
 
     public function testHumanizeYearsForward()
@@ -74,7 +74,7 @@ public function testHumanizeYearsForward()
         $current = Time::parse('January 1, 2017', 'America/Chicago');
         $diff    = $current->difference('January 1, 2018 12:00:00', 'America/Chicago');
 
-        $this->assertEquals('in 1 year', $diff->humanize('en'));
+        $this->assertSame('in 1 year', $diff->humanize('en'));
     }
 
     public function testHumanizeMonthsSingle()
@@ -82,7 +82,7 @@ public function testHumanizeMonthsSingle()
         $current = Time::parse('March 10, 2017', 'America/Chicago');
         $diff    = $current->difference('February 9, 2017', 'America/Chicago');
 
-        $this->assertEquals('1 month ago', $diff->humanize('en'));
+        $this->assertSame('1 month ago', $diff->humanize('en'));
     }
 
     public function testHumanizeMonthsPlural()
@@ -90,7 +90,7 @@ public function testHumanizeMonthsPlural()
         $current = Time::parse('March 1, 2017', 'America/Chicago');
         $diff    = $current->difference('January 1, 2017', 'America/Chicago');
 
-        $this->assertEquals('2 months ago', $diff->humanize('en'));
+        $this->assertSame('2 months ago', $diff->humanize('en'));
     }
 
     public function testHumanizeMonthsForward()
@@ -98,7 +98,7 @@ public function testHumanizeMonthsForward()
         $current = Time::parse('March 1, 2017', 'America/Chicago');
         $diff    = $current->difference('May 1, 2017', 'America/Chicago');
 
-        $this->assertEquals('in 1 month', $diff->humanize('en'));
+        $this->assertSame('in 1 month', $diff->humanize('en'));
     }
 
     public function testHumanizeDaysSingle()
@@ -106,7 +106,7 @@ public function testHumanizeDaysSingle()
         $current = Time::parse('March 10, 2017', 'America/Chicago');
         $diff    = $current->difference('March 9, 2017', 'America/Chicago');
 
-        $this->assertEquals('1 day ago', $diff->humanize('en'));
+        $this->assertSame('1 day ago', $diff->humanize('en'));
     }
 
     public function testHumanizeDaysPlural()
@@ -114,7 +114,7 @@ public function testHumanizeDaysPlural()
         $current = Time::parse('March 10, 2017', 'America/Chicago');
         $diff    = $current->difference('March 8, 2017', 'America/Chicago');
 
-        $this->assertEquals('2 days ago', $diff->humanize('en'));
+        $this->assertSame('2 days ago', $diff->humanize('en'));
     }
 
     public function testHumanizeDaysForward()
@@ -122,7 +122,7 @@ public function testHumanizeDaysForward()
         $current = Time::parse('March 10, 2017', 'America/Chicago');
         $diff    = $current->difference('March 11, 2017', 'America/Chicago');
 
-        $this->assertEquals('in 1 day', $diff->humanize('en'));
+        $this->assertSame('in 1 day', $diff->humanize('en'));
     }
 
     public function testHumanizeHoursSingle()
@@ -130,7 +130,7 @@ public function testHumanizeHoursSingle()
         $current = Time::parse('March 10, 2017 12:00', 'America/Chicago');
         $diff    = $current->difference('March 10, 2017 11:00', 'America/Chicago');
 
-        $this->assertEquals('1 hour ago', $diff->humanize('en'));
+        $this->assertSame('1 hour ago', $diff->humanize('en'));
     }
 
     public function testHumanizeHoursPlural()
@@ -138,7 +138,7 @@ public function testHumanizeHoursPlural()
         $current = Time::parse('March 10, 2017 12:00', 'America/Chicago');
         $diff    = $current->difference('March 10, 2017 10:00', 'America/Chicago');
 
-        $this->assertEquals('2 hours ago', $diff->humanize('en'));
+        $this->assertSame('2 hours ago', $diff->humanize('en'));
     }
 
     public function testHumanizeHoursForward()
@@ -146,7 +146,7 @@ public function testHumanizeHoursForward()
         $current = Time::parse('March 10, 2017 12:00', 'America/Chicago');
         $diff    = $current->difference('March 10, 2017 13:00', 'America/Chicago');
 
-        $this->assertEquals('in 1 hour', $diff->humanize('en'));
+        $this->assertSame('in 1 hour', $diff->humanize('en'));
     }
 
     public function testHumanizeMinutesSingle()
@@ -154,7 +154,7 @@ public function testHumanizeMinutesSingle()
         $current = Time::parse('March 10, 2017 12:30', 'America/Chicago');
         $diff    = $current->difference('March 10, 2017 12:29', 'America/Chicago');
 
-        $this->assertEquals('1 minute ago', $diff->humanize('en'));
+        $this->assertSame('1 minute ago', $diff->humanize('en'));
     }
 
     public function testHumanizeMinutesPlural()
@@ -162,7 +162,7 @@ public function testHumanizeMinutesPlural()
         $current = Time::parse('March 10, 2017 12:30', 'America/Chicago');
         $diff    = $current->difference('March 10, 2017 12:28', 'America/Chicago');
 
-        $this->assertEquals('2 minutes ago', $diff->humanize('en'));
+        $this->assertSame('2 minutes ago', $diff->humanize('en'));
     }
 
     public function testHumanizeMinutesForward()
@@ -170,7 +170,7 @@ public function testHumanizeMinutesForward()
         $current = Time::parse('March 10, 2017 12:30', 'America/Chicago');
         $diff    = $current->difference('March 10, 2017 12:31', 'America/Chicago');
 
-        $this->assertEquals('in 1 minute', $diff->humanize('en'));
+        $this->assertSame('in 1 minute', $diff->humanize('en'));
     }
 
     public function testHumanizeWeeksSingle()
@@ -178,7 +178,7 @@ public function testHumanizeWeeksSingle()
         $current = Time::parse('March 10, 2017', 'America/Chicago');
         $diff    = $current->difference('March 2, 2017', 'America/Chicago');
 
-        $this->assertEquals('1 week ago', $diff->humanize('en'));
+        $this->assertSame('1 week ago', $diff->humanize('en'));
     }
 
     public function testHumanizeWeeksPlural()
@@ -186,7 +186,7 @@ public function testHumanizeWeeksPlural()
         $current = Time::parse('March 30, 2017', 'America/Chicago');
         $diff    = $current->difference('March 15, 2017', 'America/Chicago');
 
-        $this->assertEquals('2 weeks ago', $diff->humanize('en'));
+        $this->assertSame('2 weeks ago', $diff->humanize('en'));
     }
 
     public function testHumanizeWeeksForward()
@@ -194,7 +194,7 @@ public function testHumanizeWeeksForward()
         $current = Time::parse('March 10, 2017', 'America/Chicago');
         $diff    = $current->difference('March 18, 2017', 'America/Chicago');
 
-        $this->assertEquals('in 1 week', $diff->humanize('en'));
+        $this->assertSame('in 1 week', $diff->humanize('en'));
     }
 
     public function testHumanizeNoDifference()
@@ -202,7 +202,7 @@ public function testHumanizeNoDifference()
         $current = Time::parse('March 10, 2017', 'America/Chicago');
         $diff    = $current->difference('March 10, 2017', 'America/Chicago');
 
-        $this->assertEquals('Just now', $diff->humanize('en'));
+        $this->assertSame('Just now', $diff->humanize('en'));
     }
 
     public function testGetterUTC()
@@ -210,9 +210,9 @@ public function testGetterUTC()
         $current = Time::parse('March 10, 2017', 'UTC');
         $diff    = $current->difference('March 18, 2017', 'UTC');
 
-        $this->assertEquals(8, $diff->getDays());
-        $this->assertEquals(8, $diff->days);
-        $this->assertEquals(-8, (int) round($diff->getDays(true)));
+        $this->assertSame(8, $diff->getDays());
+        $this->assertSame(8, $diff->days);
+        $this->assertSame(-8, (int) round($diff->getDays(true)));
         $this->assertNull($diff->nonsense);
     }
 
@@ -222,11 +222,11 @@ public function testGetterChicagoTime()
         $diff    = $current->difference('March 18, 2017', 'America/Chicago');
 
         // Daylight Saving Time had begun since Sun, 12 Mar, 02:00.
-        $this->assertEquals(7, $diff->getDays());
-        $this->assertEquals(7, $diff->days);
+        $this->assertSame(7, $diff->getDays());
+        $this->assertSame(7, $diff->days);
 
         // The raw value does not take Daylight Saving Time into account.
-        $this->assertEquals(-8, (int) round($diff->getDays(true)));
+        $this->assertSame(-8, (int) round($diff->getDays(true)));
         $this->assertNull($diff->nonsense);
     }
 
diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php
index eb2a0036287e..141e0f7c9be8 100644
--- a/tests/system/I18n/TimeTest.php
+++ b/tests/system/I18n/TimeTest.php
@@ -35,7 +35,7 @@ public function testNewTimeNow()
 
         $time = new Time(null, 'America/Chicago');
 
-        $this->assertEquals($formatter->format($time), (string) $time);
+        $this->assertSame($formatter->format($time), (string) $time);
     }
 
     public function testTimeWithTimezone()
@@ -51,7 +51,7 @@ public function testTimeWithTimezone()
 
         $time = new Time('now', 'Europe/London');
 
-        $this->assertEquals($formatter->format($time), (string) $time);
+        $this->assertSame($formatter->format($time), (string) $time);
     }
 
     public function testTimeWithTimezoneAndLocale()
@@ -67,7 +67,7 @@ public function testTimeWithTimezoneAndLocale()
 
         $time = new Time('now', 'Europe/London', 'fr_FR');
 
-        $this->assertEquals($formatter->format($time), (string) $time);
+        $this->assertSame($formatter->format($time), (string) $time);
     }
 
     public function testTimeWithDateTimeZone()
@@ -83,7 +83,7 @@ public function testTimeWithDateTimeZone()
 
         $time = new Time('now', new \DateTimeZone('Europe/London'), 'fr_FR');
 
-        $this->assertEquals($formatter->format($time), (string) $time);
+        $this->assertSame($formatter->format($time), (string) $time);
     }
 
     public function testToDateTime()
@@ -101,7 +101,7 @@ public function testNow()
         $time1 = new \DateTime();
 
         $this->assertInstanceOf(Time::class, $time);
-        $this->assertEquals($time->getTimestamp(), $time1->getTimestamp());
+        $this->assertSame($time->getTimestamp(), $time1->getTimestamp());
     }
 
     public function testParse()
@@ -110,15 +110,15 @@ public function testParse()
         $time1 = new \DateTime('now', new \DateTimeZone('America/Chicago'));
         $time1->modify('next Tuesday');
 
-        $this->assertEquals($time->getTimestamp(), $time1->getTimestamp());
+        $this->assertSame($time->getTimestamp(), $time1->getTimestamp());
     }
 
     public function testToDateTimeString()
     {
         $time = Time::parse('2017-01-12 00:00', 'America/Chicago');
 
-        $this->assertEquals('2017-01-12 00:00:00', (string) $time);
-        $this->assertEquals('2017-01-12 00:00:00', $time->toDateTimeString());
+        $this->assertSame('2017-01-12 00:00:00', (string) $time);
+        $this->assertSame('2017-01-12 00:00:00', $time->toDateTimeString());
     }
 
     public function testToDateTimeStringWithTimeZone()
@@ -127,63 +127,63 @@ public function testToDateTimeStringWithTimeZone()
 
         $expects = new \DateTime('2017-01-12', new \DateTimeZone('Europe/London'));
 
-        $this->assertEquals($expects->format('Y-m-d H:i:s'), $time->toDateTimeString());
+        $this->assertSame($expects->format('Y-m-d H:i:s'), $time->toDateTimeString());
     }
 
     public function testToday()
     {
         $time = Time::today();
 
-        $this->assertEquals(date('Y-m-d 00:00:00'), $time->toDateTimeString());
+        $this->assertSame(date('Y-m-d 00:00:00'), $time->toDateTimeString());
     }
 
     public function testTodayLocalized()
     {
         $time = Time::today('Europe/London');
 
-        $this->assertEquals(date('Y-m-d 00:00:00'), $time->toDateTimeString());
+        $this->assertSame(date('Y-m-d 00:00:00'), $time->toDateTimeString());
     }
 
     public function testYesterday()
     {
         $time = Time::yesterday();
 
-        $this->assertEquals(date('Y-m-d 00:00:00', strtotime('-1 day')), $time->toDateTimeString());
+        $this->assertSame(date('Y-m-d 00:00:00', strtotime('-1 day')), $time->toDateTimeString());
     }
 
     public function testTomorrow()
     {
         $time = Time::tomorrow();
 
-        $this->assertEquals(date('Y-m-d 00:00:00', strtotime('+1 day')), $time->toDateTimeString());
+        $this->assertSame(date('Y-m-d 00:00:00', strtotime('+1 day')), $time->toDateTimeString());
     }
 
     public function testCreateFromDate()
     {
         $time = Time::createFromDate(2017, 03, 05, 'America/Chicago');
 
-        $this->assertEquals(date('Y-m-d 00:00:00', strtotime('2017-03-05 00:00:00')), $time->toDateTimeString());
+        $this->assertSame(date('Y-m-d 00:00:00', strtotime('2017-03-05 00:00:00')), $time->toDateTimeString());
     }
 
     public function testCreateFromDateLocalized()
     {
         $time = Time::createFromDate(2017, 03, 05, 'Europe/London');
 
-        $this->assertEquals(date('Y-m-d 00:00:00', strtotime('2017-03-05 00:00:00')), $time->toDateTimeString());
+        $this->assertSame(date('Y-m-d 00:00:00', strtotime('2017-03-05 00:00:00')), $time->toDateTimeString());
     }
 
     public function testCreateFromTime()
     {
         $time = Time::createFromTime(10, 03, 05, 'America/Chicago');
 
-        $this->assertEquals(date('Y-m-d 10:03:05'), $time->toDateTimeString());
+        $this->assertSame(date('Y-m-d 10:03:05'), $time->toDateTimeString());
     }
 
     public function testCreateFromTimeEvening()
     {
         $time = Time::createFromTime(20, 03, 05, 'America/Chicago');
 
-        $this->assertEquals(date('Y-m-d 20:03:05'), $time->toDateTimeString());
+        $this->assertSame(date('Y-m-d 20:03:05'), $time->toDateTimeString());
     }
 
     public function testCreateFromTimeLocalized()
@@ -242,7 +242,7 @@ public function testCreateFromTimestamp()
 
         $time = Time::createFromTimestamp($timestamp);
 
-        $this->assertEquals(date('2017-03-18 00:00:00'), $time->toDateTimeString());
+        $this->assertSame(date('2017-03-18 00:00:00'), $time->toDateTimeString());
     }
 
     public function testTestNow()
@@ -254,7 +254,7 @@ public function testTestNow()
         Time::setTestNow($t);
 
         $this->assertTrue(Time::hasTestNow());
-        $this->assertEquals('2000-01-02 00:00:00', Time::now()->toDateTimeString());
+        $this->assertSame('2000-01-02 00:00:00', Time::now()->toDateTimeString());
 
         Time::setTestNow();
         $this->assertCloseEnoughString(date('Y-m-d H:i:s', time()), Time::now()->toDateTimeString());
@@ -283,71 +283,71 @@ public function testGetYear()
         $time  = Time::parse('January 1, 2016');
         $time2 = Time::parse('December 31, 2019');
 
-        $this->assertEquals(2016, $time->year);
-        $this->assertEquals(2019, $time2->year);
+        $this->assertSame('2016', $time->year);
+        $this->assertSame('2019', $time2->year);
     }
 
     public function testGetMonth()
     {
         $time = Time::parse('August 1, 2016');
 
-        $this->assertEquals(8, $time->month);
+        $this->assertSame('8', $time->month);
     }
 
     public function testGetDay()
     {
         $time = Time::parse('August 12, 2016');
 
-        $this->assertEquals(12, $time->day);
+        $this->assertSame('12', $time->day);
     }
 
     public function testGetHour()
     {
         $time = Time::parse('August 12, 2016 4:15pm');
 
-        $this->assertEquals(16, $time->hour);
+        $this->assertSame('16', $time->hour);
     }
 
     public function testGetMinute()
     {
         $time = Time::parse('August 12, 2016 4:15pm');
 
-        $this->assertEquals(15, $time->minute);
+        $this->assertSame('15', $time->minute);
     }
 
     public function testGetSecond()
     {
         $time = Time::parse('August 12, 2016 4:15:23pm');
 
-        $this->assertEquals(23, $time->second);
+        $this->assertSame('23', $time->second);
     }
 
     public function testGetDayOfWeek()
     {
         $time = Time::parse('August 12, 2016 4:15:23pm');
 
-        $this->assertEquals(6, $time->dayOfWeek);
+        $this->assertSame('6', $time->dayOfWeek);
     }
 
     public function testGetDayOfYear()
     {
         $time = Time::parse('August 12, 2016 4:15:23pm');
 
-        $this->assertEquals(225, $time->dayOfYear);
+        $this->assertSame('225', $time->dayOfYear);
     }
 
     public function testGetWeekOfMonth()
     {
         $time = Time::parse('August 12, 2016 4:15:23pm');
 
-        $this->assertEquals(2, $time->weekOfMonth);
+        $this->assertSame('2', $time->weekOfMonth);
     }
 
     public function testGetWeekOfYear()
     {
         $time = Time::parse('August 12, 2016 4:15:23pm');
 
-        $this->assertEquals(33, $time->weekOfYear);
+        $this->assertSame('33', $time->weekOfYear);
     }
 
     public function testGetTimestamp()
@@ -355,32 +355,32 @@ public function testGetTimestamp()
         $time     = Time::parse('August 12, 2016 4:15:23pm');
         $expected = strtotime('August 12, 2016 4:15:23pm');
 
-        $this->assertEquals($expected, $time->timestamp);
+        $this->assertSame($expected, $time->timestamp);
     }
 
     public function testGetAge()
     {
         $time = Time::parse('5 years ago');
-        $this->assertEquals(5, $time->age);
+        $this->assertSame(5, $time->age);
     }
 
     public function testAgeNow()
     {
         $time = new Time();
-        $this->assertEquals(0, $time->age);
+        $this->assertSame(0, $time->age);
     }
 
     public function testAgeFuture()
     {
         $time = Time::parse('August 12, 2116 4:15:23pm');
-        $this->assertEquals(0, $time->age);
+        $this->assertSame(0, $time->age);
     }
 
     public function testGetQuarter()
     {
         $time = Time::parse('April 15, 2015');
 
-        $this->assertEquals(2, $time->quarter);
+        $this->assertSame('2', $time->quarter);
     }
 
     public function testGetDST()
@@ -422,8 +422,8 @@ public function testGetTimezone()
 
     public function testGetTimezonename()
     {
-        $this->assertEquals('America/Chicago', Time::now('America/Chicago')->getTimezoneName());
-        $this->assertEquals('Europe/London', Time::now('Europe/London')->timezoneName);
+        $this->assertSame('America/Chicago', Time::now('America/Chicago')->getTimezoneName());
+        $this->assertSame('Europe/London', Time::now('Europe/London')->timezoneName);
     }
 
     public function testSetYear()
@@ -433,7 +433,7 @@ public function testSetYear()
 
         $this->assertInstanceOf(Time::class, $time2);
         $this->assertNotSame($time, $time2);
-        $this->assertEquals('2015-05-10 00:00:00', $time2->toDateTimeString());
+        $this->assertSame('2015-05-10 00:00:00', $time2->toDateTimeString());
     }
 
     public function testSetMonthNumber()
@@ -443,7 +443,7 @@ public function testSetMonthNumber()
 
         $this->assertInstanceOf(Time::class, $time2);
         $this->assertNotSame($time, $time2);
-        $this->assertEquals('2017-04-10 00:00:00', $time2->toDateTimeString());
+        $this->assertSame('2017-04-10 00:00:00', $time2->toDateTimeString());
     }
 
     public function testSetMonthLongName()
@@ -453,7 +453,7 @@ public function testSetMonthLongName()
 
         $this->assertInstanceOf(Time::class, $time2);
         $this->assertNotSame($time, $time2);
-        $this->assertEquals('2017-04-10 00:00:00', $time2->toDateTimeString());
+        $this->assertSame('2017-04-10 00:00:00', $time2->toDateTimeString());
     }
 
     public function testSetMonthShortName()
@@ -463,7 +463,7 @@ public function testSetMonthShortName()
 
         $this->assertInstanceOf(Time::class, $time2);
         $this->assertNotSame($time, $time2);
-        $this->assertEquals('2017-02-10 00:00:00', $time2->toDateTimeString());
+        $this->assertSame('2017-02-10 00:00:00', $time2->toDateTimeString());
     }
 
     public function testSetDay()
@@ -473,7 +473,7 @@ public function testSetDay()
 
         $this->assertInstanceOf(Time::class, $time2);
         $this->assertNotSame($time, $time2);
-        $this->assertEquals('2017-05-15 00:00:00', $time2->toDateTimeString());
+        $this->assertSame('2017-05-15 00:00:00', $time2->toDateTimeString());
     }
 
     public function testSetDayOverMaxInCurrentMonth()
@@ -491,7 +491,7 @@ public function testSetDayNotOverMaxInCurrentMonth()
 
         $this->assertInstanceOf(Time::class, $time2);
         $this->assertNotSame($time, $time2);
-        $this->assertEquals('2012-02-29 00:00:00', $time2->toDateTimeString());
+        $this->assertSame('2012-02-29 00:00:00', $time2->toDateTimeString());
     }
 
     public function testSetHour()
@@ -501,7 +501,7 @@ public function testSetHour()
 
         $this->assertInstanceOf(Time::class, $time2);
         $this->assertNotSame($time, $time2);
-        $this->assertEquals('2017-05-10 15:00:00', $time2->toDateTimeString());
+        $this->assertSame('2017-05-10 15:00:00', $time2->toDateTimeString());
     }
 
     public function testSetMinute()
@@ -511,7 +511,7 @@ public function testSetMinute()
 
         $this->assertInstanceOf(Time::class, $time2);
         $this->assertNotSame($time, $time2);
-        $this->assertEquals('2017-05-10 00:30:00', $time2->toDateTimeString());
+        $this->assertSame('2017-05-10 00:30:00', $time2->toDateTimeString());
     }
 
     public function testSetSecond()
@@ -521,7 +521,7 @@ public function testSetSecond()
 
         $this->assertInstanceOf(Time::class, $time2);
         $this->assertNotSame($time, $time2);
-        $this->assertEquals('2017-05-10 00:00:20', $time2->toDateTimeString());
+        $this->assertSame('2017-05-10 00:00:20', $time2->toDateTimeString());
     }
 
     public function testSetMonthTooSmall()
@@ -611,8 +611,8 @@ public function testSetTimezone()
 
         $this->assertInstanceOf(Time::class, $time2);
         $this->assertNotSame($time, $time2);
-        $this->assertEquals('America/Chicago', $time->getTimezoneName());
-        $this->assertEquals('Europe/London', $time2->getTimezoneName());
+        $this->assertSame('America/Chicago', $time->getTimezoneName());
+        $this->assertSame('Europe/London', $time2->getTimezoneName());
     }
 
     public function testSetTimestamp()
@@ -623,19 +623,19 @@ public function testSetTimestamp()
 
         $this->assertInstanceOf(Time::class, $time2);
         $this->assertNotSame($time, $time2);
-        $this->assertEquals('2017-04-01 00:00:00', $time2->toDateTimeString());
+        $this->assertSame('2017-04-01 00:00:00', $time2->toDateTimeString());
     }
 
     public function testToDateString()
     {
         $time = Time::parse('May 10, 2017', 'America/Chicago');
-        $this->assertEquals('2017-05-10', $time->toDateString());
+        $this->assertSame('2017-05-10', $time->toDateString());
     }
 
     public function testToFormattedDateString()
     {
         $time = Time::parse('2017-05-10', 'America/Chicago');
-        $this->assertEquals('May 10, 2017', $time->toFormattedDateString());
+        $this->assertSame('May 10, 2017', $time->toFormattedDateString());
     }
 
     /**
@@ -654,7 +654,7 @@ public function testToFormattedDateString()
     public function testToTimeString()
     {
         $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
-        $this->assertEquals('13:20:33', $time->toTimeString());
+        $this->assertSame('13:20:33', $time->toTimeString());
     }
 
     //--------------------------------------------------------------------
@@ -665,104 +665,104 @@ public function testCanAddSeconds()
     {
         $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
         $newTime = $time->addSeconds(10);
-        $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-        $this->assertEquals('2017-01-10 13:20:43', $newTime->toDateTimeString());
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2017-01-10 13:20:43', $newTime->toDateTimeString());
     }
 
     public function testCanAddMinutes()
     {
         $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
         $newTime = $time->addMinutes(10);
-        $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-        $this->assertEquals('2017-01-10 13:30:33', $newTime->toDateTimeString());
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2017-01-10 13:30:33', $newTime->toDateTimeString());
     }
 
     public function testCanAddHours()
     {
         $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
         $newTime = $time->addHours(3);
-        $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-        $this->assertEquals('2017-01-10 16:20:33', $newTime->toDateTimeString());
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2017-01-10 16:20:33', $newTime->toDateTimeString());
     }
 
     public function testCanAddDays()
     {
         $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
         $newTime = $time->addDays(3);
-        $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-        $this->assertEquals('2017-01-13 13:20:33', $newTime->toDateTimeString());
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2017-01-13 13:20:33', $newTime->toDateTimeString());
     }
 
     public function testCanAddMonths()
     {
         $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
         $newTime = $time->addMonths(3);
-        $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-        $this->assertEquals('2017-04-10 13:20:33', $newTime->toDateTimeString());
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2017-04-10 13:20:33', $newTime->toDateTimeString());
     }
 
     public function testCanAddMonthsOverYearBoundary()
     {
         $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
         $newTime = $time->addMonths(13);
-        $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-        $this->assertEquals('2018-02-10 13:20:33', $newTime->toDateTimeString());
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2018-02-10 13:20:33', $newTime->toDateTimeString());
     }
 
     public function testCanAddYears()
     {
         $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
         $newTime = $time->addYears(3);
-        $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-        $this->assertEquals('2020-01-10 13:20:33', $newTime->toDateTimeString());
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2020-01-10 13:20:33', $newTime->toDateTimeString());
     }
 
     public function testCanSubtractSeconds()
     {
         $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
         $newTime = $time->subSeconds(10);
-        $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-        $this->assertEquals('2017-01-10 13:20:23', $newTime->toDateTimeString());
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2017-01-10 13:20:23', $newTime->toDateTimeString());
     }
 
     public function testCanSubtractMinutes()
     {
         $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
         $newTime = $time->subMinutes(10);
-        $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-        $this->assertEquals('2017-01-10 13:10:33', $newTime->toDateTimeString());
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2017-01-10 13:10:33', $newTime->toDateTimeString());
     }
 
     public function testCanSubtractHours()
     {
         $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
         $newTime = $time->subHours(3);
-        $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-        $this->assertEquals('2017-01-10 10:20:33', $newTime->toDateTimeString());
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2017-01-10 10:20:33', $newTime->toDateTimeString());
     }
 
     public function testCanSubtractDays()
     {
         $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
         $newTime = $time->subDays(3);
-        $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-        $this->assertEquals('2017-01-07 13:20:33', $newTime->toDateTimeString());
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2017-01-07 13:20:33', $newTime->toDateTimeString());
     }
 
     public function testCanSubtractMonths()
     {
         $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
         $newTime = $time->subMonths(3);
-        $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-        $this->assertEquals('2016-10-10 13:20:33', $newTime->toDateTimeString());
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2016-10-10 13:20:33', $newTime->toDateTimeString());
     }
 
     public function testCanSubtractYears()
     {
         $time    = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
         $newTime = $time->subYears(3);
-        $this->assertEquals('2017-01-10 13:20:33', $time->toDateTimeString());
-        $this->assertEquals('2014-01-10 13:20:33', $newTime->toDateTimeString());
+        $this->assertSame('2017-01-10 13:20:33', $time->toDateTimeString());
+        $this->assertSame('2014-01-10 13:20:33', $newTime->toDateTimeString());
     }
 
     //--------------------------------------------------------------------
@@ -868,7 +868,7 @@ public function testHumanizeYearsSingle()
         Time::setTestNow('March 10, 2017', 'America/Chicago');
         $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
 
-        $this->assertEquals('1 year ago', $time->humanize());
+        $this->assertSame('1 year ago', $time->humanize());
     }
 
     public function testHumanizeYearsPlural()
@@ -876,7 +876,7 @@ public function testHumanizeYearsPlural()
         Time::setTestNow('March 10, 2017', 'America/Chicago');
         $time = Time::parse('March 9, 2014 12:00:00', 'America/Chicago');
 
-        $this->assertEquals('3 years ago', $time->humanize());
+        $this->assertSame('3 years ago', $time->humanize());
     }
 
     public function testHumanizeYearsForward()
@@ -884,7 +884,7 @@ public function testHumanizeYearsForward()
         Time::setTestNow('January 1, 2017', 'America/Chicago');
         $time = Time::parse('January 1, 2018 12:00:00', 'America/Chicago');
 
-        $this->assertEquals('in 1 year', $time->humanize());
+        $this->assertSame('in 1 year', $time->humanize());
     }
 
     public function testHumanizeMonthsSingle()
@@ -892,7 +892,7 @@ public function testHumanizeMonthsSingle()
         Time::setTestNow('March 10, 2017', 'America/Chicago');
         $time = Time::parse('February 9, 2017', 'America/Chicago');
 
-        $this->assertEquals('1 month ago', $time->humanize());
+        $this->assertSame('1 month ago', $time->humanize());
     }
 
     public function testHumanizeMonthsPlural()
@@ -900,7 +900,7 @@ public function testHumanizeMonthsPlural()
         Time::setTestNow('March 1, 2017', 'America/Chicago');
         $time = Time::parse('January 1, 2017', 'America/Chicago');
 
-        $this->assertEquals('2 months ago', $time->humanize());
+        $this->assertSame('2 months ago', $time->humanize());
     }
 
     public function testHumanizeMonthsForward()
@@ -908,7 +908,7 @@ public function testHumanizeMonthsForward()
         Time::setTestNow('March 1, 2017', 'America/Chicago');
         $time = Time::parse('April 1, 2017', 'America/Chicago');
 
-        $this->assertEquals('in 1 month', $time->humanize());
+        $this->assertSame('in 1 month', $time->humanize());
     }
 
     public function testHumanizeDaysSingle()
@@ -916,7 +916,7 @@ public function testHumanizeDaysSingle()
         Time::setTestNow('March 10, 2017', 'America/Chicago');
         $time = Time::parse('March 8, 2017', 'America/Chicago');
 
-        $this->assertEquals('2 days ago', $time->humanize());
+        $this->assertSame('2 days ago', $time->humanize());
     }
 
     public function testHumanizeDaysPlural()
@@ -924,7 +924,7 @@ public function testHumanizeDaysPlural()
         Time::setTestNow('March 10, 2017', 'America/Chicago');
         $time = Time::parse('March 8, 2017', 'America/Chicago');
 
-        $this->assertEquals('2 days ago', $time->humanize());
+        $this->assertSame('2 days ago', $time->humanize());
     }
 
     public function testHumanizeDaysForward()
@@ -932,7 +932,7 @@ public function testHumanizeDaysForward()
         Time::setTestNow('March 10, 2017', 'America/Chicago');
         $time = Time::parse('March 12, 2017', 'America/Chicago');
 
-        $this->assertEquals('in 2 days', $time->humanize());
+        $this->assertSame('in 2 days', $time->humanize());
     }
 
     public function testHumanizeDaysTomorrow()
@@ -940,7 +940,7 @@ public function testHumanizeDaysTomorrow()
         Time::setTestNow('March 10, 2017', 'America/Chicago');
         $time = Time::parse('March 11, 2017', 'America/Chicago');
 
-        $this->assertEquals('Tomorrow', $time->humanize());
+        $this->assertSame('Tomorrow', $time->humanize());
     }
 
     public function testHumanizeDaysYesterday()
@@ -948,7 +948,7 @@ public function testHumanizeDaysYesterday()
         Time::setTestNow('March 10, 2017', 'America/Chicago');
         $time = Time::parse('March 9, 2017', 'America/Chicago');
 
-        $this->assertEquals('Yesterday', $time->humanize());
+        $this->assertSame('Yesterday', $time->humanize());
     }
 
     public function testHumanizeHoursAsTime()
@@ -956,7 +956,7 @@ public function testHumanizeHoursAsTime()
         Time::setTestNow('March 10, 2017 12:00', 'America/Chicago');
         $time = Time::parse('March 10, 2017 14:00', 'America/Chicago');
 
-        $this->assertEquals('in 2 hours', $time->humanize());
+        $this->assertSame('in 2 hours', $time->humanize());
     }
 
     public function testHumanizeHoursAWhileAgo()
@@ -964,7 +964,7 @@ public function testHumanizeHoursAWhileAgo()
         Time::setTestNow('March 10, 2017 12:00', 'America/Chicago');
         $time = Time::parse('March 10, 2017 8:00', 'America/Chicago');
 
-        $this->assertEquals('4 hours ago', $time->humanize());
+        $this->assertSame('4 hours ago', $time->humanize());
     }
 
     public function testHumanizeMinutesSingle()
@@ -972,7 +972,7 @@ public function testHumanizeMinutesSingle()
         Time::setTestNow('March 10, 2017 12:30', 'America/Chicago');
         $time = Time::parse('March 10, 2017 12:29', 'America/Chicago');
 
-        $this->assertEquals('1 minute ago', $time->humanize());
+        $this->assertSame('1 minute ago', $time->humanize());
     }
 
     public function testHumanizeMinutesPlural()
@@ -980,7 +980,7 @@ public function testHumanizeMinutesPlural()
         Time::setTestNow('March 10, 2017 12:30', 'America/Chicago');
         $time = Time::parse('March 10, 2017 12:28', 'America/Chicago');
 
-        $this->assertEquals('2 minutes ago', $time->humanize());
+        $this->assertSame('2 minutes ago', $time->humanize());
     }
 
     public function testHumanizeMinutesForward()
@@ -988,7 +988,7 @@ public function testHumanizeMinutesForward()
         Time::setTestNow('March 10, 2017 12:30', 'America/Chicago');
         $time = Time::parse('March 10, 2017 12:31', 'America/Chicago');
 
-        $this->assertEquals('in 1 minute', $time->humanize());
+        $this->assertSame('in 1 minute', $time->humanize());
     }
 
     public function testHumanizeWeeksSingle()
@@ -996,7 +996,7 @@ public function testHumanizeWeeksSingle()
         Time::setTestNow('March 10, 2017', 'America/Chicago');
         $time = Time::parse('March 2, 2017', 'America/Chicago');
 
-        $this->assertEquals('1 week ago', $time->humanize());
+        $this->assertSame('1 week ago', $time->humanize());
     }
 
     public function testHumanizeWeeksPlural()
@@ -1004,7 +1004,7 @@ public function testHumanizeWeeksPlural()
         Time::setTestNow('March 30, 2017', 'America/Chicago');
         $time = Time::parse('March 15, 2017', 'America/Chicago');
 
-        $this->assertEquals('2 weeks ago', $time->humanize());
+        $this->assertSame('2 weeks ago', $time->humanize());
     }
 
     public function testHumanizeWeeksForward()
@@ -1012,7 +1012,7 @@ public function testHumanizeWeeksForward()
         Time::setTestNow('March 10, 2017', 'America/Chicago');
         $time = Time::parse('March 18, 2017', 'America/Chicago');
 
-        $this->assertEquals('in 2 weeks', $time->humanize());
+        $this->assertSame('in 2 weeks', $time->humanize());
     }
 
     public function testHumanizeNow()
@@ -1020,19 +1020,17 @@ public function testHumanizeNow()
         Time::setTestNow('March 10, 2017', 'America/Chicago');
         $time = Time::parse('March 10, 2017', 'America/Chicago');
 
-        $this->assertEquals('Just now', $time->humanize());
+        $this->assertSame('Just now', $time->humanize());
     }
 
     public function testSetTimezoneDate()
     {
         $time  = Time::parse('13 May 2020 10:00', 'GMT');
         $time2 = $time->setTimezone('GMT+8');
-        $this->assertEquals('2020-05-13 10:00:00', $time->toDateTimeString());
-        $this->assertEquals('2020-05-13 18:00:00', $time2->toDateTimeString());
+        $this->assertSame('2020-05-13 10:00:00', $time->toDateTimeString());
+        $this->assertSame('2020-05-13 18:00:00', $time2->toDateTimeString());
     }
 
-    //--------------------------------------------------------------------
-
     public function testCreateFromInstance()
     {
         $datetime = new DateTime();
@@ -1056,6 +1054,6 @@ public function testUnserializeTimeObject()
 
         $this->assertInstanceOf(Time::class, $time2);
         $this->assertTrue($time2->equals($time1));
-        $this->assertEquals($time1, $time2);
+        $this->assertNotSame($time1, $time2);
     }
 }
diff --git a/tests/system/Images/BaseHandlerTest.php b/tests/system/Images/BaseHandlerTest.php
index cd180c1d6586..324ab59bf286 100644
--- a/tests/system/Images/BaseHandlerTest.php
+++ b/tests/system/Images/BaseHandlerTest.php
@@ -64,8 +64,8 @@ public function testWithFile()
 
         $image = $handler->getFile();
         $this->assertTrue($image instanceof Image);
-        $this->assertEquals(155, $image->origWidth);
-        $this->assertEquals($path, $image->getPathname());
+        $this->assertSame(155, $image->origWidth);
+        $this->assertSame($path, $image->getPathname());
     }
 
     public function testMissingFile()
@@ -116,6 +116,6 @@ public function testImageHandled()
     {
         $handler = Services::image('gd', null, false);
         $handler->withFile($this->path);
-        $this->assertEquals($this->path, $handler->getPathname());
+        $this->assertSame($this->path, $handler->getPathname());
     }
 }
diff --git a/tests/system/Images/GDHandlerTest.php b/tests/system/Images/GDHandlerTest.php
index 214af7d6c1b3..cf60c5d674a0 100644
--- a/tests/system/Images/GDHandlerTest.php
+++ b/tests/system/Images/GDHandlerTest.php
@@ -63,15 +63,15 @@ public function testImageProperties()
         $file  = $this->handler->getFile();
         $props = $file->getProperties(true);
 
-        $this->assertEquals(155, $this->handler->getWidth());
-        $this->assertEquals(155, $props['width']);
-        $this->assertEquals(155, $file->origWidth);
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(155, $props['width']);
+        $this->assertSame(155, $file->origWidth);
 
-        $this->assertEquals(200, $this->handler->getHeight());
-        $this->assertEquals(200, $props['height']);
-        $this->assertEquals(200, $file->origHeight);
+        $this->assertSame(200, $this->handler->getHeight());
+        $this->assertSame(200, $props['height']);
+        $this->assertSame(200, $file->origHeight);
 
-        $this->assertEquals('width="155" height="200"', $props['size_str']);
+        $this->assertSame('width="155" height="200"', $props['size_str']);
     }
 
     public function testImageTypeProperties()
@@ -80,8 +80,8 @@ public function testImageTypeProperties()
         $file  = $this->handler->getFile();
         $props = $file->getProperties(true);
 
-        $this->assertEquals(IMAGETYPE_PNG, $props['image_type']);
-        $this->assertEquals('image/png', $props['mime_type']);
+        $this->assertSame(IMAGETYPE_PNG, $props['image_type']);
+        $this->assertSame('image/png', $props['mime_type']);
     }
 
     //--------------------------------------------------------------------
@@ -90,40 +90,40 @@ public function testResizeIgnored()
     {
         $this->handler->withFile($this->path);
         $this->handler->resize(155, 200); // 155x200 result
-        $this->assertEquals(155, $this->handler->getWidth());
-        $this->assertEquals(200, $this->handler->getHeight());
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
     }
 
     public function testResizeAbsolute()
     {
         $this->handler->withFile($this->path);
         $this->handler->resize(123, 456, false); // 123x456 result
-        $this->assertEquals(123, $this->handler->getWidth());
-        $this->assertEquals(456, $this->handler->getHeight());
+        $this->assertSame(123, $this->handler->getWidth());
+        $this->assertSame(456, $this->handler->getHeight());
     }
 
     public function testResizeAspect()
     {
         $this->handler->withFile($this->path);
         $this->handler->resize(123, 456, true); // 123x159 result
-        $this->assertEquals(123, $this->handler->getWidth());
-        $this->assertEquals(159, $this->handler->getHeight());
+        $this->assertSame(123, $this->handler->getWidth());
+        $this->assertSame(159, $this->handler->getHeight());
     }
 
     public function testResizeAspectWidth()
     {
         $this->handler->withFile($this->path);
         $this->handler->resize(123, 0, true); // 123x159 result
-        $this->assertEquals(123, $this->handler->getWidth());
-        $this->assertEquals(159, $this->handler->getHeight());
+        $this->assertSame(123, $this->handler->getWidth());
+        $this->assertSame(159, $this->handler->getHeight());
     }
 
     public function testResizeAspectHeight()
     {
         $this->handler->withFile($this->path);
         $this->handler->resize(0, 456, true); // 354x456 result
-        $this->assertEquals(354, $this->handler->getWidth());
-        $this->assertEquals(456, $this->handler->getHeight());
+        $this->assertSame(354, $this->handler->getWidth());
+        $this->assertSame(456, $this->handler->getHeight());
     }
 
     //--------------------------------------------------------------------
@@ -132,48 +132,48 @@ public function testCropTopLeft()
     {
         $this->handler->withFile($this->path);
         $this->handler->crop(100, 100); // 100x100 result
-        $this->assertEquals(100, $this->handler->getWidth());
-        $this->assertEquals(100, $this->handler->getHeight());
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
     }
 
     public function testCropMiddle()
     {
         $this->handler->withFile($this->path);
         $this->handler->crop(100, 100, 50, 50, false); // 100x100 result
-        $this->assertEquals(100, $this->handler->getWidth());
-        $this->assertEquals(100, $this->handler->getHeight());
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
     }
 
     public function testCropMiddlePreserved()
     {
         $this->handler->withFile($this->path);
         $this->handler->crop(100, 100, 50, 50, true); // 78x100 result
-        $this->assertEquals(78, $this->handler->getWidth());
-        $this->assertEquals(100, $this->handler->getHeight());
+        $this->assertSame(78, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
     }
 
     public function testCropTopLeftPreserveAspect()
     {
         $this->handler->withFile($this->path);
         $this->handler->crop(100, 100); // 100x100 result
-        $this->assertEquals(100, $this->handler->getWidth());
-        $this->assertEquals(100, $this->handler->getHeight());
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
     }
 
     public function testCropNothing()
     {
         $this->handler->withFile($this->path);
         $this->handler->crop(155, 200); // 155x200 result
-        $this->assertEquals(155, $this->handler->getWidth());
-        $this->assertEquals(200, $this->handler->getHeight());
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
     }
 
     public function testCropOutOfBounds()
     {
         $this->handler->withFile($this->path);
         $this->handler->crop(100, 100, 100); // 55x100 result in 100x100
-        $this->assertEquals(100, $this->handler->getWidth());
-        $this->assertEquals(100, $this->handler->getHeight());
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
     }
 
     //--------------------------------------------------------------------
@@ -181,16 +181,16 @@ public function testCropOutOfBounds()
     public function testRotate()
     {
         $this->handler->withFile($this->path); // 155x200
-        $this->assertEquals(155, $this->handler->getWidth());
-        $this->assertEquals(200, $this->handler->getHeight());
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
 
         // first rotation
         $this->handler->rotate(90); // 200x155
-        $this->assertEquals(200, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getWidth());
 
         // check image size again after another rotation
         $this->handler->rotate(180); // 200x155
-        $this->assertEquals(200, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getWidth());
     }
 
     public function testRotateBadAngle()
@@ -206,8 +206,8 @@ public function testFlatten()
     {
         $this->handler->withFile($this->path);
         $this->handler->flatten();
-        $this->assertEquals(155, $this->handler->getWidth());
-        $this->assertEquals(200, $this->handler->getHeight());
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
     }
 
     //--------------------------------------------------------------------
@@ -216,24 +216,24 @@ public function testFlip()
     {
         $this->handler->withFile($this->path);
         $this->handler->flip();
-        $this->assertEquals(155, $this->handler->getWidth());
-        $this->assertEquals(200, $this->handler->getHeight());
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
     }
 
     public function testHorizontal()
     {
         $this->handler->withFile($this->path);
         $this->handler->flip('horizontal');
-        $this->assertEquals(155, $this->handler->getWidth());
-        $this->assertEquals(200, $this->handler->getHeight());
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
     }
 
     public function testFlipVertical()
     {
         $this->handler->withFile($this->path);
         $this->handler->flip('vertical');
-        $this->assertEquals(155, $this->handler->getWidth());
-        $this->assertEquals(200, $this->handler->getHeight());
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
     }
 
     public function testFlipUnknown()
@@ -248,24 +248,24 @@ public function testFit()
     {
         $this->handler->withFile($this->path);
         $this->handler->fit(100, 100);
-        $this->assertEquals(100, $this->handler->getWidth());
-        $this->assertEquals(100, $this->handler->getHeight());
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
     }
 
     public function testFitTaller()
     {
         $this->handler->withFile($this->path);
         $this->handler->fit(100, 400);
-        $this->assertEquals(100, $this->handler->getWidth());
-        $this->assertEquals(400, $this->handler->getHeight());
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(400, $this->handler->getHeight());
     }
 
     public function testFitAutoHeight()
     {
         $this->handler->withFile($this->path);
         $this->handler->fit(100);
-        $this->assertEquals(100, $this->handler->getWidth());
-        $this->assertEquals(129, $this->handler->getHeight());
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(129, $this->handler->getHeight());
     }
 
     public function testFitPositions()
@@ -285,8 +285,8 @@ public function testFitPositions()
 
         foreach ($choices as $position) {
             $this->handler->fit(100, 100, $position);
-            $this->assertEquals(100, $this->handler->getWidth(), 'Position ' . $position . ' failed');
-            $this->assertEquals(100, $this->handler->getHeight(), 'Position ' . $position . ' failed');
+            $this->assertSame(100, $this->handler->getWidth(), 'Position ' . $position . ' failed');
+            $this->assertSame(100, $this->handler->getHeight(), 'Position ' . $position . ' failed');
         }
     }
 
@@ -296,8 +296,8 @@ public function testText()
     {
         $this->handler->withFile($this->path);
         $this->handler->text('vertical', ['hAlign' => 'right', 'vAlign' => 'bottom']);
-        $this->assertEquals(155, $this->handler->getWidth());
-        $this->assertEquals(200, $this->handler->getHeight());
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
     }
 
     //--------------------------------------------------------------------
@@ -306,8 +306,8 @@ public function testMoreText()
     {
         $this->handler->withFile($this->path);
         $this->handler->text('vertical', ['vAlign' => 'middle', 'withShadow' => 'sure', 'shadowOffset' => 3]);
-        $this->assertEquals(155, $this->handler->getWidth());
-        $this->assertEquals(200, $this->handler->getHeight());
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
     }
 
     //--------------------------------------------------------------------
@@ -322,8 +322,8 @@ public function testImageCreation()
 
             $this->handler->withFile($this->origin . 'ci-logo.' . $type);
             $this->handler->text('vertical');
-            $this->assertEquals(155, $this->handler->getWidth());
-            $this->assertEquals(200, $this->handler->getHeight());
+            $this->assertSame(155, $this->handler->getWidth());
+            $this->assertSame(200, $this->handler->getHeight());
         }
     }
 
@@ -341,7 +341,7 @@ public function testImageCopy()
             $this->handler->save($this->start . 'work/ci-logo.' . $type);
             $this->assertTrue($this->root->hasChild('work/ci-logo.' . $type));
 
-            $this->assertNotEquals(
+            $this->assertNotSame(
                 file_get_contents($this->origin . 'ci-logo.' . $type),
                 $this->root->getChild('work/ci-logo.' . $type)->getContent()
             );
@@ -355,7 +355,7 @@ public function testImageCopyWithNoTargetAndMaxQuality()
             $this->handler->save(null, 100);
             $this->assertFileExists($this->origin . 'ci-logo.' . $type);
 
-            $this->assertEquals(
+            $this->assertSame(
                 file_get_contents($this->origin . 'ci-logo.' . $type),
                 file_get_contents($this->origin . 'ci-logo.' . $type)
             );
@@ -375,7 +375,7 @@ public function testImageCompressionGetResource()
             $this->handler->save($this->start . 'work/ci-logo.' . $type);
             $this->assertTrue($this->root->hasChild('work/ci-logo.' . $type));
 
-            $this->assertNotEquals(
+            $this->assertNotSame(
                 file_get_contents($this->origin . 'ci-logo.' . $type),
                 $this->root->getChild('work/ci-logo.' . $type)->getContent()
             );
@@ -396,7 +396,7 @@ public function testImageCompressionWithResource()
 
             $this->assertTrue($this->root->hasChild('work/ci-logo.' . $type));
 
-            $this->assertNotEquals(
+            $this->assertNotSame(
                 file_get_contents($this->origin . 'ci-logo.' . $type),
                 $this->root->getChild('work/ci-logo.' . $type)->getContent()
             );
@@ -409,7 +409,7 @@ public function testImageConvert()
         $this->handler->getResource(); // make sure resource is loaded
         $this->handler->convert(IMAGETYPE_PNG);
         $this->handler->save($this->start . 'work/ci-logo.png');
-        $this->assertEquals(exif_imagetype($this->start . 'work/ci-logo.png'), IMAGETYPE_PNG);
+        $this->assertSame(exif_imagetype($this->start . 'work/ci-logo.png'), IMAGETYPE_PNG);
     }
 
     public function testImageReorientLandscape()
@@ -424,7 +424,7 @@ public function testImageReorientLandscape()
             $point    = imagecolorat($resource, 0, 0);
             $rgb      = imagecolorsforindex($resource, $point);
 
-            $this->assertEquals(['red' => 62, 'green' => 62, 'blue' => 62, 'alpha' => 0], $rgb);
+            $this->assertSame(['red' => 62, 'green' => 62, 'blue' => 62, 'alpha' => 0], $rgb);
         }
     }
 
@@ -440,7 +440,7 @@ public function testImageReorientPortrait()
             $point    = imagecolorat($resource, 0, 0);
             $rgb      = imagecolorsforindex($resource, $point);
 
-            $this->assertEquals(['red' => 62, 'green' => 62, 'blue' => 62, 'alpha' => 0], $rgb);
+            $this->assertSame(['red' => 62, 'green' => 62, 'blue' => 62, 'alpha' => 0], $rgb);
         }
     }
 }
diff --git a/tests/system/Images/ImageMagickHandlerTest.php b/tests/system/Images/ImageMagickHandlerTest.php
index 997274f6ff19..c451ef936352 100644
--- a/tests/system/Images/ImageMagickHandlerTest.php
+++ b/tests/system/Images/ImageMagickHandlerTest.php
@@ -61,15 +61,15 @@ public function testImageProperties()
         $file  = $this->handler->getFile();
         $props = $file->getProperties(true);
 
-        $this->assertEquals(155, $this->handler->getWidth());
-        $this->assertEquals(155, $props['width']);
-        $this->assertEquals(155, $file->origWidth);
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(155, $props['width']);
+        $this->assertSame(155, $file->origWidth);
 
-        $this->assertEquals(200, $this->handler->getHeight());
-        $this->assertEquals(200, $props['height']);
-        $this->assertEquals(200, $file->origHeight);
+        $this->assertSame(200, $this->handler->getHeight());
+        $this->assertSame(200, $props['height']);
+        $this->assertSame(200, $file->origHeight);
 
-        $this->assertEquals('width="155" height="200"', $props['size_str']);
+        $this->assertSame('width="155" height="200"', $props['size_str']);
     }
 
     public function testImageTypeProperties()
@@ -78,8 +78,8 @@ public function testImageTypeProperties()
         $file  = $this->handler->getFile();
         $props = $file->getProperties(true);
 
-        $this->assertEquals(IMAGETYPE_PNG, $props['image_type']);
-        $this->assertEquals('image/png', $props['mime_type']);
+        $this->assertSame(IMAGETYPE_PNG, $props['image_type']);
+        $this->assertSame('image/png', $props['mime_type']);
     }
 
     //--------------------------------------------------------------------
@@ -88,40 +88,40 @@ public function testResizeIgnored()
     {
         $this->handler->withFile($this->path);
         $this->handler->resize(155, 200); // 155x200 result
-        $this->assertEquals(155, $this->handler->getWidth());
-        $this->assertEquals(200, $this->handler->getHeight());
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
     }
 
     public function testResizeAbsolute()
     {
         $this->handler->withFile($this->path);
         $this->handler->resize(123, 456, false); // 123x456 result
-        $this->assertEquals(123, $this->handler->getWidth());
-        $this->assertEquals(456, $this->handler->getHeight());
+        $this->assertSame(123, $this->handler->getWidth());
+        $this->assertSame(456, $this->handler->getHeight());
     }
 
     public function testResizeAspect()
     {
         $this->handler->withFile($this->path);
         $this->handler->resize(123, 456, true); // 123x159 result
-        $this->assertEquals(123, $this->handler->getWidth());
-        $this->assertEquals(159, $this->handler->getHeight());
+        $this->assertSame(123, $this->handler->getWidth());
+        $this->assertSame(159, $this->handler->getHeight());
     }
 
     public function testResizeAspectWidth()
     {
         $this->handler->withFile($this->path);
         $this->handler->resize(123, 0, true); // 123x159 result
-        $this->assertEquals(123, $this->handler->getWidth());
-        $this->assertEquals(159, $this->handler->getHeight());
+        $this->assertSame(123, $this->handler->getWidth());
+        $this->assertSame(159, $this->handler->getHeight());
     }
 
     public function testResizeAspectHeight()
     {
         $this->handler->withFile($this->path);
         $this->handler->resize(0, 456, true); // 353x456 result
-        $this->assertEquals(353, $this->handler->getWidth());
-        $this->assertEquals(456, $this->handler->getHeight());
+        $this->assertSame(353, $this->handler->getWidth());
+        $this->assertSame(456, $this->handler->getHeight());
     }
 
     //--------------------------------------------------------------------
@@ -130,48 +130,48 @@ public function testCropTopLeft()
     {
         $this->handler->withFile($this->path);
         $this->handler->crop(100, 100); // 100x100 result
-        $this->assertEquals(100, $this->handler->getWidth());
-        $this->assertEquals(100, $this->handler->getHeight());
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
     }
 
     public function testCropMiddle()
     {
         $this->handler->withFile($this->path);
         $this->handler->crop(100, 100, 50, 50, false); // 100x100 result
-        $this->assertEquals(100, $this->handler->getWidth());
-        $this->assertEquals(100, $this->handler->getHeight());
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
     }
 
     public function testCropMiddlePreserved()
     {
         $this->handler->withFile($this->path);
         $this->handler->crop(100, 100, 50, 50, true); // 78x100 result
-        $this->assertEquals(78, $this->handler->getWidth());
-        $this->assertEquals(100, $this->handler->getHeight());
+        $this->assertSame(78, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
     }
 
     public function testCropTopLeftPreserveAspect()
     {
         $this->handler->withFile($this->path);
         $this->handler->crop(100, 100); // 100x100 result
-        $this->assertEquals(100, $this->handler->getWidth());
-        $this->assertEquals(100, $this->handler->getHeight());
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
     }
 
     public function testCropNothing()
     {
         $this->handler->withFile($this->path);
         $this->handler->crop(155, 200); // 155x200 result
-        $this->assertEquals(155, $this->handler->getWidth());
-        $this->assertEquals(200, $this->handler->getHeight());
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
     }
 
     public function testCropOutOfBounds()
     {
         $this->handler->withFile($this->path);
         $this->handler->crop(100, 100, 100); // 55x100 result in 100x100
-        $this->assertEquals(100, $this->handler->getWidth());
-        $this->assertEquals(100, $this->handler->getHeight());
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
     }
 
     //--------------------------------------------------------------------
@@ -179,16 +179,16 @@ public function testCropOutOfBounds()
     public function testRotate()
     {
         $this->handler->withFile($this->path); // 155x200
-        $this->assertEquals(155, $this->handler->getWidth());
-        $this->assertEquals(200, $this->handler->getHeight());
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
 
         // first rotation
         $this->handler->rotate(90); // 200x155
-        $this->assertEquals(200, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getWidth());
 
         // check image size again after another rotation
         $this->handler->rotate(180); // 200x155
-        $this->assertEquals(200, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getWidth());
     }
 
     public function testRotateBadAngle()
@@ -204,8 +204,8 @@ public function testFlatten()
     {
         $this->handler->withFile($this->path);
         $this->handler->flatten();
-        $this->assertEquals(155, $this->handler->getWidth());
-        $this->assertEquals(200, $this->handler->getHeight());
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
     }
 
     //--------------------------------------------------------------------
@@ -214,24 +214,24 @@ public function testFlip()
     {
         $this->handler->withFile($this->path);
         $this->handler->flip();
-        $this->assertEquals(155, $this->handler->getWidth());
-        $this->assertEquals(200, $this->handler->getHeight());
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
     }
 
     public function testHorizontal()
     {
         $this->handler->withFile($this->path);
         $this->handler->flip('horizontal');
-        $this->assertEquals(155, $this->handler->getWidth());
-        $this->assertEquals(200, $this->handler->getHeight());
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
     }
 
     public function testFlipVertical()
     {
         $this->handler->withFile($this->path);
         $this->handler->flip('vertical');
-        $this->assertEquals(155, $this->handler->getWidth());
-        $this->assertEquals(200, $this->handler->getHeight());
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
     }
 
     public function testFlipUnknown()
@@ -246,24 +246,24 @@ public function testFit()
     {
         $this->handler->withFile($this->path);
         $this->handler->fit(100, 100);
-        $this->assertEquals(100, $this->handler->getWidth());
-        $this->assertEquals(100, $this->handler->getHeight());
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(100, $this->handler->getHeight());
     }
 
     public function testFitTaller()
     {
         $this->handler->withFile($this->path);
         $this->handler->fit(100, 400);
-        $this->assertEquals(100, $this->handler->getWidth());
-        $this->assertEquals(400, $this->handler->getHeight());
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(400, $this->handler->getHeight());
     }
 
     public function testFitAutoHeight()
     {
         $this->handler->withFile($this->path);
         $this->handler->fit(100);
-        $this->assertEquals(100, $this->handler->getWidth());
-        $this->assertEquals(129, $this->handler->getHeight());
+        $this->assertSame(100, $this->handler->getWidth());
+        $this->assertSame(129, $this->handler->getHeight());
     }
 
     public function testFitPositions()
@@ -283,8 +283,8 @@ public function testFitPositions()
 
         foreach ($choices as $position) {
             $this->handler->fit(100, 100, $position);
-            $this->assertEquals(100, $this->handler->getWidth(), 'Position ' . $position . ' failed');
-            $this->assertEquals(100, $this->handler->getHeight(), 'Position ' . $position . ' failed');
+            $this->assertSame(100, $this->handler->getWidth(), 'Position ' . $position . ' failed');
+            $this->assertSame(100, $this->handler->getHeight(), 'Position ' . $position . ' failed');
         }
     }
 
@@ -294,8 +294,8 @@ public function testText()
     {
         $this->handler->withFile($this->path);
         $this->handler->text('vertical', ['hAlign' => 'right', 'vAlign' => 'bottom']);
-        $this->assertEquals(155, $this->handler->getWidth());
-        $this->assertEquals(200, $this->handler->getHeight());
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
     }
 
     //--------------------------------------------------------------------
@@ -304,8 +304,8 @@ public function testMoreText()
     {
         $this->handler->withFile($this->path);
         $this->handler->text('vertical', ['vAlign' => 'middle', 'withShadow' => 'sure', 'shadowOffset' => 3]);
-        $this->assertEquals(155, $this->handler->getWidth());
-        $this->assertEquals(200, $this->handler->getHeight());
+        $this->assertSame(155, $this->handler->getWidth());
+        $this->assertSame(200, $this->handler->getHeight());
     }
 
     //--------------------------------------------------------------------
@@ -320,8 +320,8 @@ public function testImageCreation()
 
             $this->handler->withFile($this->origin . 'ci-logo.' . $type);
             $this->handler->text('vertical');
-            $this->assertEquals(155, $this->handler->getWidth());
-            $this->assertEquals(200, $this->handler->getHeight());
+            $this->assertSame(155, $this->handler->getWidth());
+            $this->assertSame(200, $this->handler->getHeight());
         }
     }
 
@@ -339,7 +339,7 @@ public function testImageCopy()
             $this->handler->save($this->root . 'ci-logo.' . $type);
             $this->assertFileExists($this->root . 'ci-logo.' . $type);
 
-            $this->assertNotEquals(
+            $this->assertNotSame(
                 file_get_contents($this->origin . 'ci-logo.' . $type),
                 file_get_contents($this->root . 'ci-logo.' . $type)
             );
@@ -353,7 +353,7 @@ public function testImageCopyWithNoTargetAndMaxQuality()
             $this->handler->save(null, 100);
             $this->assertFileExists($this->origin . 'ci-logo.' . $type);
 
-            $this->assertEquals(
+            $this->assertSame(
                 file_get_contents($this->origin . 'ci-logo.' . $type),
                 file_get_contents($this->origin . 'ci-logo.' . $type)
             );
@@ -373,7 +373,7 @@ public function testImageCompressionGetResource()
             $this->handler->save($this->root . 'ci-logo.' . $type);
             $this->assertFileExists($this->root . 'ci-logo.' . $type);
 
-            $this->assertNotEquals(
+            $this->assertNotSame(
                 file_get_contents($this->origin . 'ci-logo.' . $type),
                 file_get_contents($this->root . 'ci-logo.' . $type)
             );
@@ -394,7 +394,7 @@ public function testImageCompressionWithResource()
 
             $this->assertFileExists($this->root . 'ci-logo.' . $type);
 
-            $this->assertNotEquals(
+            $this->assertNotSame(
                 file_get_contents($this->origin . 'ci-logo.' . $type),
                 file_get_contents($this->root . 'ci-logo.' . $type)
             );
@@ -407,7 +407,7 @@ public function testImageConvert()
         $this->handler->getResource(); // make sure resource is loaded
         $this->handler->convert(IMAGETYPE_PNG);
         $this->handler->save($this->root . 'ci-logo.png');
-        $this->assertEquals(exif_imagetype($this->root . 'ci-logo.png'), IMAGETYPE_PNG);
+        $this->assertSame(exif_imagetype($this->root . 'ci-logo.png'), IMAGETYPE_PNG);
     }
 
     public function testImageReorientLandscape()
@@ -425,7 +425,7 @@ public function testImageReorientLandscape()
 
             $this->handler->save($result);
 
-            $this->assertEquals(['red' => 62, 'green' => 62, 'blue' => 62, 'alpha' => 0], $rgb);
+            $this->assertSame(['red' => 62, 'green' => 62, 'blue' => 62, 'alpha' => 0], $rgb);
         }
     }
 
@@ -444,7 +444,7 @@ public function testImageReorientPortrait()
 
             $this->handler->save($result);
 
-            $this->assertEquals(['red' => 62, 'green' => 62, 'blue' => 62, 'alpha' => 0], $rgb);
+            $this->assertSame(['red' => 62, 'green' => 62, 'blue' => 62, 'alpha' => 0], $rgb);
         }
     }
 }
diff --git a/tests/system/Images/ImageTest.php b/tests/system/Images/ImageTest.php
index 93cf2e1e2598..163addcf78f2 100644
--- a/tests/system/Images/ImageTest.php
+++ b/tests/system/Images/ImageTest.php
@@ -36,10 +36,10 @@ protected function setUp(): void
 
     public function testBasicPropertiesInherited()
     {
-        $this->assertEquals('ci-logo.png', $this->image->getFilename());
-        $this->assertEquals($this->start . 'ci-logo.png', $this->image->getPathname());
-        $this->assertEquals($this->root->url(), $this->image->getPath());
-        $this->assertEquals('ci-logo.png', $this->image->getBasename());
+        $this->assertSame('ci-logo.png', $this->image->getFilename());
+        $this->assertSame($this->start . 'ci-logo.png', $this->image->getPathname());
+        $this->assertSame($this->root->url(), $this->image->getPath());
+        $this->assertSame('ci-logo.png', $this->image->getBasename());
     }
 
     public function testGetProperties()
@@ -52,7 +52,7 @@ public function testGetProperties()
             'mime_type'  => 'image/png',
         ];
 
-        $this->assertEquals($expected, $this->image->getProperties(true));
+        $this->assertSame($expected, $this->image->getProperties(true));
     }
 
     public function testExtractProperties()
@@ -60,11 +60,11 @@ public function testExtractProperties()
         // extract properties from the image
         $this->assertTrue($this->image->getProperties(false));
 
-        $this->assertEquals(155, $this->image->origWidth);
-        $this->assertEquals(200, $this->image->origHeight);
-        $this->assertEquals(IMAGETYPE_PNG, $this->image->imageType);
-        $this->assertEquals('width="155" height="200"', $this->image->sizeStr);
-        $this->assertEquals('image/png', $this->image->mime);
+        $this->assertSame(155, $this->image->origWidth);
+        $this->assertSame(200, $this->image->origHeight);
+        $this->assertSame(IMAGETYPE_PNG, $this->image->imageType);
+        $this->assertSame('width="155" height="200"', $this->image->sizeStr);
+        $this->assertSame('image/png', $this->image->mime);
     }
 
     public function testCopyDefaultName()
diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php
index 53a6d60b2d2b..2a9a3df7f69c 100644
--- a/tests/system/Language/LanguageTest.php
+++ b/tests/system/Language/LanguageTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
 
     public function testReturnsStringWithNoFileInMessage()
     {
-        $this->assertEquals('something', $this->lang->getLine('something'));
+        $this->assertSame('something', $this->lang->getLine('something'));
     }
 
     /**
@@ -49,7 +49,7 @@ public function testGetLineReturnsLine()
             'booksSaved' => 'We saved some more',
         ]);
 
-        $this->assertEquals('We saved some more', $this->lang->getLine('books.booksSaved'));
+        $this->assertSame('We saved some more', $this->lang->getLine('books.booksSaved'));
     }
 
     //--------------------------------------------------------------------
@@ -69,11 +69,11 @@ public function testGetLineReturnsFallbackLine()
                 'slowcoach' => 'slowpoke',
             ], 'en-US');
 
-        $this->assertEquals('lay of the land', $this->lang->getLine('equivalent.lieOfLand'));
-        $this->assertEquals('slowpoke', $this->lang->getLine('equivalent.slowcoach'));
-        $this->assertEquals('a new lease of life', $this->lang->getLine('equivalent.leaseOfLife'));
-        $this->assertEquals('touch wood', $this->lang->getLine('equivalent.touchWood'));
-        $this->assertEquals('equivalent.unknown', $this->lang->getLine('equivalent.unknown'));
+        $this->assertSame('lay of the land', $this->lang->getLine('equivalent.lieOfLand'));
+        $this->assertSame('slowpoke', $this->lang->getLine('equivalent.slowcoach'));
+        $this->assertSame('a new lease of life', $this->lang->getLine('equivalent.leaseOfLife'));
+        $this->assertSame('touch wood', $this->lang->getLine('equivalent.touchWood'));
+        $this->assertSame('equivalent.unknown', $this->lang->getLine('equivalent.unknown'));
     }
 
     //--------------------------------------------------------------------
@@ -87,7 +87,7 @@ public function testGetLineArrayReturnsLineArray()
             ],
         ]);
 
-        $this->assertEquals([
+        $this->assertSame([
             'The Boogeyman',
             'We Saved',
         ], $this->lang->getLine('books.booksList'));
@@ -106,7 +106,7 @@ public function testGetLineFormatsMessage()
             'bookCount' => '{0, number, integer} books have been saved.',
         ]);
 
-        $this->assertEquals('45 books have been saved.', $this->lang->getLine('books.bookCount', [91 / 2]));
+        $this->assertSame('45 books have been saved.', $this->lang->getLine('books.bookCount', [91 / 2]));
     }
 
     //--------------------------------------------------------------------
@@ -124,7 +124,7 @@ public function testGetLineArrayFormatsMessages()
             ],
         ]);
 
-        $this->assertEquals(['45 related books.'], $this->lang->getLine('books.bookList', [91 / 2]));
+        $this->assertSame(['45 related books.'], $this->lang->getLine('books.bookList', [91 / 2]));
     }
 
     //--------------------------------------------------------------------
@@ -137,8 +137,8 @@ public function testLangAllowsOtherLocales()
         $str1 = lang('Language.languageGetLineInvalidArgumentException', [], 'en');
         $str2 = lang('Language.languageGetLineInvalidArgumentException', [], 'ru');
 
-        $this->assertEquals('Get line must be a string or array of strings.', $str1);
-        $this->assertEquals('Whatever this would be, translated', $str2);
+        $this->assertSame('Get line must be a string or array of strings.', $str1);
+        $this->assertSame('Whatever this would be, translated', $str2);
     }
 
     //--------------------------------------------------------------------
@@ -153,7 +153,7 @@ public function testLangDoesntFormat()
             ],
         ]);
 
-        $this->assertEquals(['{0, number, integer} related books.'], $this->lang->getLine('books.bookList', [15]));
+        $this->assertSame(['{0, number, integer} related books.'], $this->lang->getLine('books.bookList', [15]));
     }
 
     //--------------------------------------------------------------------
@@ -161,10 +161,10 @@ public function testLangDoesntFormat()
     public function testLanguageDuplicateKey()
     {
         $this->lang = new Language('en');
-        $this->assertEquals('These are not the droids you are looking for', $this->lang->getLine('More.strongForce', []));
-        $this->assertEquals('I have a very bad feeling about this', $this->lang->getLine('More.cannotMove', []));
-        $this->assertEquals('Could not move file {0} to {1} ({2}).', $this->lang->getLine('Files.cannotMove', []));
-        $this->assertEquals('I have a very bad feeling about this', $this->lang->getLine('More.cannotMove', []));
+        $this->assertSame('These are not the droids you are looking for', $this->lang->getLine('More.strongForce', []));
+        $this->assertSame('I have a very bad feeling about this', $this->lang->getLine('More.cannotMove', []));
+        $this->assertSame('Could not move file {0} to {1} ({2}).', $this->lang->getLine('Files.cannotMove', []));
+        $this->assertSame('I have a very bad feeling about this', $this->lang->getLine('More.cannotMove', []));
     }
 
     //--------------------------------------------------------------------
@@ -203,12 +203,12 @@ public function testLanguageSameKeyAndFileName()
         $this->lang->setData('example', ['message' => 'This is an example message']);
 
         // force loading data into file Example
-        $this->assertEquals('This is an example message', $this->lang->getLine('example.message'));
+        $this->assertSame('This is an example message', $this->lang->getLine('example.message'));
 
         // second file data | another.example
         $this->lang->setData('another', ['example' => 'Another example']);
 
-        $this->assertEquals('Another example', $this->lang->getLine('another.example'));
+        $this->assertSame('Another example', $this->lang->getLine('another.example'));
     }
 
     //--------------------------------------------------------------------
@@ -216,7 +216,7 @@ public function testLanguageSameKeyAndFileName()
     public function testGetLocale()
     {
         $this->lang = Services::language('en', false);
-        $this->assertEquals('en', $this->lang->getLocale());
+        $this->assertSame('en', $this->lang->getLocale());
     }
 
     //--------------------------------------------------------------------
@@ -225,9 +225,9 @@ public function testPrioritizedLocator()
     {
         // this should load the replacement bundle of messages
         $message = lang('Core.missingExtension', [], 'en');
-        $this->assertEquals('The framework needs the following extension(s) installed and loaded: {0}.', $message);
+        $this->assertSame('The framework needs the following extension(s) installed and loaded: {0}.', $message);
         // and we should have our new message too
-        $this->assertEquals('billions and billions', lang('Core.bazillion', [], 'en'));
+        $this->assertSame('billions and billions', lang('Core.bazillion', [], 'en'));
     }
 
     //--------------------------------------------------------------------
@@ -277,16 +277,16 @@ public function testBaseFallbacks()
     {
         $this->lang = Services::language('en-ZZ', false);
         // key is in both base and variant; should pick variant
-        $this->assertEquals("It's made of cheese", $this->lang->getLine('More.notaMoon'));
+        $this->assertSame("It's made of cheese", $this->lang->getLine('More.notaMoon'));
 
         // key is in base but not variant; should pick base
-        $this->assertEquals('I have a very bad feeling about this', $this->lang->getLine('More.cannotMove'));
+        $this->assertSame('I have a very bad feeling about this', $this->lang->getLine('More.cannotMove'));
 
         // key is in variant but not base; should pick variant
-        $this->assertEquals('There is no try', $this->lang->getLine('More.wisdom'));
+        $this->assertSame('There is no try', $this->lang->getLine('More.wisdom'));
 
         // key isn't in either base or variant; should return bad key
-        $this->assertEquals('More.shootMe', $this->lang->getLine('More.shootMe'));
+        $this->assertSame('More.shootMe', $this->lang->getLine('More.shootMe'));
     }
 
     //--------------------------------------------------------------------
@@ -307,14 +307,14 @@ public function testBaseFallbacks()
     public function testAllTheWayFallbacks()
     {
         $this->lang = Services::language('ab-CD', false);
-        $this->assertEquals('Allin.none', $this->lang->getLine('Allin.none'));
-        $this->assertEquals('Pyramid of Giza', $this->lang->getLine('Allin.one'));
-        $this->assertEquals('gluttony', $this->lang->getLine('Allin.two'));
-        $this->assertEquals('Colossus of Rhodes', $this->lang->getLine('Allin.tre'));
-        $this->assertEquals('four calling birds', $this->lang->getLine('Allin.for'));
-        $this->assertEquals('Temple of Artemis', $this->lang->getLine('Allin.fiv'));
-        $this->assertEquals('envy', $this->lang->getLine('Allin.six'));
-        $this->assertEquals('Hanging Gardens of Babylon', $this->lang->getLine('Allin.sev'));
+        $this->assertSame('Allin.none', $this->lang->getLine('Allin.none'));
+        $this->assertSame('Pyramid of Giza', $this->lang->getLine('Allin.one'));
+        $this->assertSame('gluttony', $this->lang->getLine('Allin.two'));
+        $this->assertSame('Colossus of Rhodes', $this->lang->getLine('Allin.tre'));
+        $this->assertSame('four calling birds', $this->lang->getLine('Allin.for'));
+        $this->assertSame('Temple of Artemis', $this->lang->getLine('Allin.fiv'));
+        $this->assertSame('envy', $this->lang->getLine('Allin.six'));
+        $this->assertSame('Hanging Gardens of Babylon', $this->lang->getLine('Allin.sev'));
     }
 
     public function testLanguageNestedArrayDefinition()
@@ -322,7 +322,7 @@ public function testLanguageNestedArrayDefinition()
         $this->lang = new SecondMockLanguage('en');
         $this->lang->loadem('Nested', 'en');
 
-        $this->assertEquals('e', $this->lang->getLine('Nested.a.b.c.d'));
+        $this->assertSame('e', $this->lang->getLine('Nested.a.b.c.d'));
     }
 
     public function testLanguageKeySeparatedByDot()
@@ -330,7 +330,7 @@ public function testLanguageKeySeparatedByDot()
         $this->lang = new SecondMockLanguage('en');
         $this->lang->loadem('Foo', 'en');
 
-        $this->assertEquals('The fieldname field is very short.', $this->lang->getLine('Foo.bar.min_length1', ['field' => 'fieldname']));
-        $this->assertEquals('The fieldname field is very short.', $this->lang->getLine('Foo.baz.min_length3.short', ['field' => 'fieldname']));
+        $this->assertSame('The fieldname field is very short.', $this->lang->getLine('Foo.bar.min_length1', ['field' => 'fieldname']));
+        $this->assertSame('The fieldname field is very short.', $this->lang->getLine('Foo.baz.min_length3.short', ['field' => 'fieldname']));
     }
 }
diff --git a/tests/system/Log/LoggerTest.php b/tests/system/Log/LoggerTest.php
index 13d17f1733d3..0a178086c549 100644
--- a/tests/system/Log/LoggerTest.php
+++ b/tests/system/Log/LoggerTest.php
@@ -69,7 +69,7 @@ public function testLogActuallyLogs()
         $logs = TestHandler::getLogs();
 
         $this->assertCount(1, $logs);
-        $this->assertEquals($expected, $logs[0]);
+        $this->assertSame($expected, $logs[0]);
     }
 
     //--------------------------------------------------------------------
@@ -103,7 +103,7 @@ public function testLogInterpolatesMessage()
         $logs = TestHandler::getLogs();
 
         $this->assertCount(1, $logs);
-        $this->assertEquals($expected, $logs[0]);
+        $this->assertSame($expected, $logs[0]);
     }
 
     //--------------------------------------------------------------------
@@ -122,7 +122,7 @@ public function testLogInterpolatesPost()
         $logs = TestHandler::getLogs();
 
         $this->assertCount(1, $logs);
-        $this->assertEquals($expected, $logs[0]);
+        $this->assertSame($expected, $logs[0]);
     }
 
     //--------------------------------------------------------------------
@@ -141,7 +141,7 @@ public function testLogInterpolatesGet()
         $logs = TestHandler::getLogs();
 
         $this->assertCount(1, $logs);
-        $this->assertEquals($expected, $logs[0]);
+        $this->assertSame($expected, $logs[0]);
     }
 
     //--------------------------------------------------------------------
@@ -160,7 +160,7 @@ public function testLogInterpolatesSession()
         $logs = TestHandler::getLogs();
 
         $this->assertCount(1, $logs);
-        $this->assertEquals($expected, $logs[0]);
+        $this->assertSame($expected, $logs[0]);
     }
 
     //--------------------------------------------------------------------
@@ -178,7 +178,7 @@ public function testLogInterpolatesCurrentEnvironment()
         $logs = TestHandler::getLogs();
 
         $this->assertCount(1, $logs);
-        $this->assertEquals($expected, $logs[0]);
+        $this->assertSame($expected, $logs[0]);
     }
 
     //--------------------------------------------------------------------
@@ -198,7 +198,7 @@ public function testLogInterpolatesEnvironmentVars()
         $logs = TestHandler::getLogs();
 
         $this->assertCount(1, $logs);
-        $this->assertEquals($expected, $logs[0]);
+        $this->assertSame($expected, $logs[0]);
     }
 
     //--------------------------------------------------------------------
@@ -255,7 +255,7 @@ public function testEmergencyLogsCorrectly()
         $logs = TestHandler::getLogs();
 
         $this->assertCount(1, $logs);
-        $this->assertEquals($expected, $logs[0]);
+        $this->assertSame($expected, $logs[0]);
     }
 
     //--------------------------------------------------------------------
@@ -272,7 +272,7 @@ public function testAlertLogsCorrectly()
         $logs = TestHandler::getLogs();
 
         $this->assertCount(1, $logs);
-        $this->assertEquals($expected, $logs[0]);
+        $this->assertSame($expected, $logs[0]);
     }
 
     //--------------------------------------------------------------------
@@ -289,7 +289,7 @@ public function testCriticalLogsCorrectly()
         $logs = TestHandler::getLogs();
 
         $this->assertCount(1, $logs);
-        $this->assertEquals($expected, $logs[0]);
+        $this->assertSame($expected, $logs[0]);
     }
 
     //--------------------------------------------------------------------
@@ -306,7 +306,7 @@ public function testErrorLogsCorrectly()
         $logs = TestHandler::getLogs();
 
         $this->assertCount(1, $logs);
-        $this->assertEquals($expected, $logs[0]);
+        $this->assertSame($expected, $logs[0]);
     }
 
     //--------------------------------------------------------------------
@@ -323,7 +323,7 @@ public function testWarningLogsCorrectly()
         $logs = TestHandler::getLogs();
 
         $this->assertCount(1, $logs);
-        $this->assertEquals($expected, $logs[0]);
+        $this->assertSame($expected, $logs[0]);
     }
 
     //--------------------------------------------------------------------
@@ -340,7 +340,7 @@ public function testNoticeLogsCorrectly()
         $logs = TestHandler::getLogs();
 
         $this->assertCount(1, $logs);
-        $this->assertEquals($expected, $logs[0]);
+        $this->assertSame($expected, $logs[0]);
     }
 
     //--------------------------------------------------------------------
@@ -357,7 +357,7 @@ public function testInfoLogsCorrectly()
         $logs = TestHandler::getLogs();
 
         $this->assertCount(1, $logs);
-        $this->assertEquals($expected, $logs[0]);
+        $this->assertSame($expected, $logs[0]);
     }
 
     //--------------------------------------------------------------------
@@ -374,7 +374,7 @@ public function testDebugLogsCorrectly()
         $logs = TestHandler::getLogs();
 
         $this->assertCount(1, $logs);
-        $this->assertEquals($expected, $logs[0]);
+        $this->assertSame($expected, $logs[0]);
     }
 
     //--------------------------------------------------------------------
@@ -391,7 +391,7 @@ public function testLogLevels()
         $logs = TestHandler::getLogs();
 
         $this->assertCount(1, $logs);
-        $this->assertEquals($expected, $logs[0]);
+        $this->assertSame($expected, $logs[0]);
     }
 
     //--------------------------------------------------------------------
@@ -420,7 +420,7 @@ public function testFilenameCleaning()
         $ohoh     = APPPATH . 'LoggerTest';
         $expected = 'APPPATH/LoggerTest';
 
-        $this->assertEquals($expected, $logger->cleanup($ohoh));
+        $this->assertSame($expected, $logger->cleanup($ohoh));
     }
 
     //--------------------------------------------------------------------
@@ -435,6 +435,6 @@ public function testDetermineFileNoStackTrace()
             'unknown',
         ];
 
-        $this->assertEquals($expected, $logger->determineFile());
+        $this->assertSame($expected, $logger->determineFile());
     }
 }
diff --git a/tests/system/Models/ValidationModelTest.php b/tests/system/Models/ValidationModelTest.php
index 544ff587c89a..06b0f3cd72f9 100644
--- a/tests/system/Models/ValidationModelTest.php
+++ b/tests/system/Models/ValidationModelTest.php
@@ -30,7 +30,7 @@ public function testValid(): void
         $this->assertIsInt($this->model->insert($data));
 
         $errors = $this->model->errors();
-        $this->assertEquals([], $errors);
+        $this->assertSame([], $errors);
     }
 
     public function testValidationBasics(): void
diff --git a/tests/system/Pager/PagerRendererTest.php b/tests/system/Pager/PagerRendererTest.php
index 291d1289ba70..558b435d1086 100644
--- a/tests/system/Pager/PagerRendererTest.php
+++ b/tests/system/Pager/PagerRendererTest.php
@@ -59,7 +59,7 @@ public function testHasPreviousReturnsTrueWhenFirstIsMoreThanOne()
         $pager->setSurroundCount(2);
 
         $this->assertTrue($pager->hasPrevious());
-        $this->assertEquals('http://example.com/foo?foo=bar&page=2', $pager->getPrevious());
+        $this->assertSame('http://example.com/foo?foo=bar&page=2', $pager->getPrevious());
     }
 
     //--------------------------------------------------------------------
@@ -80,7 +80,7 @@ public function testGetPreviousWhenSurroundCountIsZero()
         $pager->setSurroundCount(0);
 
         $this->assertTrue($pager->hasPrevious());
-        $this->assertEquals('http://example.com/foo?foo=bar&page=3', $pager->getPrevious());
+        $this->assertSame('http://example.com/foo?foo=bar&page=3', $pager->getPrevious());
     }
 
     //--------------------------------------------------------------------
@@ -121,7 +121,7 @@ public function testHasNextReturnsTrueWhenLastIsSmallerThanTotal()
         $pager->setSurroundCount(2);
 
         $this->assertTrue($pager->hasNext());
-        $this->assertEquals('http://example.com/foo?foo=bar&page=7', $pager->getNext());
+        $this->assertSame('http://example.com/foo?foo=bar&page=7', $pager->getNext());
     }
 
     //--------------------------------------------------------------------
@@ -142,7 +142,7 @@ public function testGetNextWhenSurroundCountIsZero()
         $pager->setSurroundCount(0);
 
         $this->assertTrue($pager->hasNext());
-        $this->assertEquals('http://example.com/foo?foo=bar&page=5', $pager->getNext());
+        $this->assertSame('http://example.com/foo?foo=bar&page=5', $pager->getNext());
     }
 
     //--------------------------------------------------------------------
@@ -177,7 +177,7 @@ public function testLinksBasics()
             ],
         ];
 
-        $this->assertEquals($expected, $pager->links());
+        $this->assertSame($expected, $pager->links());
     }
 
     //--------------------------------------------------------------------
@@ -196,8 +196,8 @@ public function testGetFirstAndGetLast()
 
         $pager = new PagerRenderer($details);
 
-        $this->assertEquals('http://example.com/foo?foo=bar&page=1', $pager->getFirst());
-        $this->assertEquals('http://example.com/foo?foo=bar&page=50', $pager->getLast());
+        $this->assertSame('http://example.com/foo?foo=bar&page=1', $pager->getFirst());
+        $this->assertSame('http://example.com/foo?foo=bar&page=50', $pager->getLast());
     }
 
     //--------------------------------------------------------------------
@@ -216,7 +216,7 @@ public function testGetCurrent()
 
         $pager = new PagerRenderer($details);
 
-        $this->assertEquals('http://example.com/foo?foo=bar&page=10', $pager->getCurrent());
+        $this->assertSame('http://example.com/foo?foo=bar&page=10', $pager->getCurrent());
     }
 
     //--------------------------------------------------------------------
@@ -236,7 +236,7 @@ public function testGetCurrentWithSegment()
 
         $pager = new PagerRenderer($details);
 
-        $this->assertEquals('http://example.com/foo/10?foo=bar', $pager->getCurrent());
+        $this->assertSame('http://example.com/foo/10?foo=bar', $pager->getCurrent());
     }
 
     //--------------------------------------------------------------------
@@ -260,13 +260,13 @@ public function testSurroundCount()
 
         // with surropund count of 2
         $pager->setSurroundCount(2);
-        $this->assertEquals($this->expect . '1', $pager->getPrevious());
-        $this->assertEquals($this->expect . '7', $pager->getNext());
+        $this->assertSame($this->expect . '1', $pager->getPrevious());
+        $this->assertSame($this->expect . '7', $pager->getNext());
 
         // with unchanged surround count
         $pager->setSurroundCount();
-        $this->assertEquals($this->expect . '1', $pager->getPrevious());
-        $this->assertEquals($this->expect . '7', $pager->getNext());
+        $this->assertSame($this->expect . '1', $pager->getPrevious());
+        $this->assertSame($this->expect . '7', $pager->getNext());
 
         // and with huge surround count
         $pager->setSurroundCount(100);
@@ -310,7 +310,7 @@ public function testHasPreviousReturnsTrueWhenFirstIsMoreThanOneSegment()
         $pager->setSurroundCount(2);
 
         $this->assertTrue($pager->hasPrevious());
-        $this->assertEquals('http://example.com/foo/2?foo=bar', $pager->getPrevious());
+        $this->assertSame('http://example.com/foo/2?foo=bar', $pager->getPrevious());
     }
 
     //--------------------------------------------------------------------
@@ -332,7 +332,7 @@ public function testGetPreviousWhenSurroundCountIsZeroSegment()
         $pager->setSurroundCount(0);
 
         $this->assertTrue($pager->hasPrevious());
-        $this->assertEquals('http://example.com/foo/3?foo=bar', $pager->getPrevious());
+        $this->assertSame('http://example.com/foo/3?foo=bar', $pager->getPrevious());
     }
 
     //--------------------------------------------------------------------
@@ -375,7 +375,7 @@ public function testHasNextReturnsTrueWhenLastIsSmallerThanTotalSegment()
         $pager->setSurroundCount(2);
 
         $this->assertTrue($pager->hasNext());
-        $this->assertEquals('http://example.com/foo/7?foo=bar', $pager->getNext());
+        $this->assertSame('http://example.com/foo/7?foo=bar', $pager->getNext());
     }
 
     //--------------------------------------------------------------------
@@ -397,7 +397,7 @@ public function testGetNextWhenSurroundCountIsZeroSegment()
         $pager->setSurroundCount(0);
 
         $this->assertTrue($pager->hasNext());
-        $this->assertEquals('http://example.com/foo/5?foo=bar', $pager->getNext());
+        $this->assertSame('http://example.com/foo/5?foo=bar', $pager->getNext());
     }
 
     //--------------------------------------------------------------------
@@ -433,7 +433,7 @@ public function testLinksBasicsSegment()
             ],
         ];
 
-        $this->assertEquals($expected, $pager->links());
+        $this->assertSame($expected, $pager->links());
     }
 
     //--------------------------------------------------------------------
@@ -453,8 +453,8 @@ public function testGetFirstAndGetLastSegment()
 
         $pager = new PagerRenderer($details);
 
-        $this->assertEquals('http://example.com/foo/1?foo=bar', $pager->getFirst());
-        $this->assertEquals('http://example.com/foo/50?foo=bar', $pager->getLast());
+        $this->assertSame('http://example.com/foo/1?foo=bar', $pager->getFirst());
+        $this->assertSame('http://example.com/foo/50?foo=bar', $pager->getLast());
     }
 
     //--------------------------------------------------------------------
@@ -508,7 +508,7 @@ public function testHasPreviousPageReturnsTrueWhenFirstIsMoreThanCurrent()
 
         $this->assertNotNull($pager->getPreviousPage());
         $this->assertTrue($pager->hasPreviousPage());
-        $this->assertEquals('http://example.com/foo?page=2', $pager->getPreviousPage());
+        $this->assertSame('http://example.com/foo?page=2', $pager->getPreviousPage());
     }
 
     //--------------------------------------------------------------------
@@ -526,7 +526,7 @@ public function testGetPreviousPageWithSegmentHigherThanZero()
         ];
 
         $pager = new PagerRenderer($details);
-        $this->assertEquals('http://example.com/foo/2', $pager->getPreviousPage());
+        $this->assertSame('http://example.com/foo/2', $pager->getPreviousPage());
     }
 
     //--------------------------------------------------------------------
@@ -546,7 +546,7 @@ public function testHasNextPageReturnsTrueWhenLastIsMoreThanCurrent()
 
         $this->assertNotNull($pager->getNextPage());
         $this->assertTrue($pager->hasNextPage());
-        $this->assertEquals('http://example.com/foo?page=4', $pager->getNextPage());
+        $this->assertSame('http://example.com/foo?page=4', $pager->getNextPage());
     }
 
     public function testGetNextPageWithSegmentHigherThanZero()
@@ -562,7 +562,7 @@ public function testGetNextPageWithSegmentHigherThanZero()
         ];
 
         $pager = new PagerRenderer($details);
-        $this->assertEquals('http://example.com/foo/4', $pager->getNextPage());
+        $this->assertSame('http://example.com/foo/4', $pager->getNextPage());
     }
 
     public function testGetPageNumber()
@@ -576,10 +576,10 @@ public function testGetPageNumber()
         ];
         $pager = new PagerRenderer($details);
 
-        $this->assertEquals(1, $pager->getFirstPageNumber());
-        $this->assertEquals(3, $pager->getCurrentPageNumber());
-        $this->assertEquals(10, $pager->getLastPageNumber());
-        $this->assertEquals(10, $pager->getPageCount());
+        $this->assertSame(1, $pager->getFirstPageNumber());
+        $this->assertSame(3, $pager->getCurrentPageNumber());
+        $this->assertSame(10, $pager->getLastPageNumber());
+        $this->assertSame(10, $pager->getPageCount());
     }
 
     public function testGetPageNumberSetSurroundCount()
@@ -594,9 +594,9 @@ public function testGetPageNumberSetSurroundCount()
         $pager = new PagerRenderer($details);
         $pager->setSurroundCount(2);
 
-        $this->assertEquals(3, $pager->getFirstPageNumber());
-        $this->assertEquals(5, $pager->getCurrentPageNumber());
-        $this->assertEquals(7, $pager->getLastPageNumber());
+        $this->assertSame(3, $pager->getFirstPageNumber());
+        $this->assertSame(5, $pager->getCurrentPageNumber());
+        $this->assertSame(7, $pager->getLastPageNumber());
     }
 
     public function testGetPreviousPageNumber()
@@ -611,7 +611,7 @@ public function testGetPreviousPageNumber()
         $pager = new PagerRenderer($details);
         $pager->setSurroundCount(2);
 
-        $this->assertEquals(4, $pager->getPreviousPageNumber());
+        $this->assertSame(4, $pager->getPreviousPageNumber());
     }
 
     public function testGetPreviousPageNumberNull()
@@ -641,7 +641,7 @@ public function testGetNextPageNumber()
         $pager = new PagerRenderer($details);
         $pager->setSurroundCount(2);
 
-        $this->assertEquals(6, $pager->getNextPageNumber());
+        $this->assertSame(6, $pager->getNextPageNumber());
     }
 
     public function testGetNextPageNumberNull()
diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index 9bc355fdfb41..571df88afeb4 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -50,7 +50,7 @@ public function testSetPathRemembersPath()
 
         $details = $this->pager->getDetails();
 
-        $this->assertEquals('foo/bar', $details['uri']->getPath());
+        $this->assertSame('foo/bar', $details['uri']->getPath());
     }
 
     public function testGetDetailsRecognizesPageQueryVar()
@@ -62,7 +62,7 @@ public function testGetDetailsRecognizesPageQueryVar()
 
         $details = $this->pager->getDetails();
 
-        $this->assertEquals(2, $details['currentPage']);
+        $this->assertSame(2, $details['currentPage']);
     }
 
     public function testGetDetailsRecognizesGroupedPageQueryVar()
@@ -74,7 +74,7 @@ public function testGetDetailsRecognizesGroupedPageQueryVar()
 
         $details = $this->pager->getDetails('foo');
 
-        $this->assertEquals(2, $details['currentPage']);
+        $this->assertSame(2, $details['currentPage']);
     }
 
     public function testGetDetailsThrowExceptionIfGroupNotFound()
@@ -91,7 +91,7 @@ public function testDetailsHasConfiguredPerPageValue()
 
         $details = $this->pager->getDetails('foo');
 
-        $this->assertEquals($this->config->perPage, $details['perPage']);
+        $this->assertSame($this->config->perPage, $details['perPage']);
     }
 
     public function testStoreDoesBasicCalcs()
@@ -100,9 +100,9 @@ public function testStoreDoesBasicCalcs()
 
         $details = $this->pager->getDetails('foo');
 
-        $this->assertEquals($details['total'], 100);
-        $this->assertEquals($details['perPage'], 25);
-        $this->assertEquals($details['currentPage'], 3);
+        $this->assertSame($details['total'], 100);
+        $this->assertSame($details['perPage'], 25);
+        $this->assertSame($details['currentPage'], 3);
     }
 
     public function testStoreDoesBasicCalcsOnPerPageReadFromPagerConfig()
@@ -111,9 +111,9 @@ public function testStoreDoesBasicCalcsOnPerPageReadFromPagerConfig()
 
         $details = $this->pager->getDetails('foo');
 
-        $this->assertEquals($details['total'], 100);
-        $this->assertEquals($details['perPage'], 20);
-        $this->assertEquals($details['currentPage'], 3);
+        $this->assertSame($details['total'], 100);
+        $this->assertSame($details['perPage'], 20);
+        $this->assertSame($details['currentPage'], 3);
     }
 
     public function testStoreAndHasMore()
@@ -137,10 +137,10 @@ public function testStoreWithQueries()
 
         $this->pager->store('default', 3, 25, 100);
 
-        $this->assertEquals('http://example.com/index.php?page=2&foo=bar', $this->pager->getPreviousPageURI());
-        $this->assertEquals('http://example.com/index.php?page=4&foo=bar', $this->pager->getNextPageURI());
-        $this->assertEquals('http://example.com/index.php?page=5&foo=bar', $this->pager->getPageURI(5));
-        $this->assertEquals(
+        $this->assertSame('http://example.com/index.php?page=2&foo=bar', $this->pager->getPreviousPageURI());
+        $this->assertSame('http://example.com/index.php?page=4&foo=bar', $this->pager->getNextPageURI());
+        $this->assertSame('http://example.com/index.php?page=5&foo=bar', $this->pager->getPageURI(5));
+        $this->assertSame(
             'http://example.com/index.php?foo=bar&page=5',
             $this->pager->only(['foo'])->getPageURI(5)
         );
@@ -153,10 +153,10 @@ public function testStoreWithSegments()
 
         $this->pager->store('default', 3, 25, 100, 1);
 
-        $this->assertEquals('http://example.com/2?page=3&foo=bar', $this->pager->getPreviousPageURI());
-        $this->assertEquals('http://example.com/4?page=3&foo=bar', $this->pager->getNextPageURI());
-        $this->assertEquals('http://example.com/5?page=3&foo=bar', $this->pager->getPageURI(5));
-        $this->assertEquals(
+        $this->assertSame('http://example.com/2?page=3&foo=bar', $this->pager->getPreviousPageURI());
+        $this->assertSame('http://example.com/4?page=3&foo=bar', $this->pager->getNextPageURI());
+        $this->assertSame('http://example.com/5?page=3&foo=bar', $this->pager->getPageURI(5));
+        $this->assertSame(
             'http://example.com/5?foo=bar',
             $this->pager->only(['foo'])->getPageURI(5)
         );
@@ -169,59 +169,59 @@ public function testHasMoreDefaultsToFalse()
 
     public function testPerPageHasDefaultValue()
     {
-        $this->assertEquals($this->config->perPage, $this->pager->getPerPage());
+        $this->assertSame($this->config->perPage, $this->pager->getPerPage());
     }
 
     public function testPerPageKeepsStoredValue()
     {
         $this->pager->store('foo', 3, 13, 70);
 
-        $this->assertEquals(13, $this->pager->getPerPage('foo'));
+        $this->assertSame(13, $this->pager->getPerPage('foo'));
     }
 
     public function testGetCurrentPageDefaultsToOne()
     {
-        $this->assertEquals(1, $this->pager->getCurrentPage());
+        $this->assertSame(1, $this->pager->getCurrentPage());
     }
 
     public function testGetCurrentPageRemembersStoredPage()
     {
         $this->pager->store('foo', 3, 13, 70);
 
-        $this->assertEquals(3, $this->pager->getCurrentPage('foo'));
+        $this->assertSame(3, $this->pager->getCurrentPage('foo'));
     }
 
     public function testGetCurrentPageDetectsURI()
     {
         $_GET['page'] = 2;
 
-        $this->assertEquals(2, $this->pager->getCurrentPage());
+        $this->assertSame(2, $this->pager->getCurrentPage());
     }
 
     public function testGetCurrentPageDetectsGroupedURI()
     {
         $_GET['page_foo'] = 2;
 
-        $this->assertEquals(2, $this->pager->getCurrentPage('foo'));
+        $this->assertSame(2, $this->pager->getCurrentPage('foo'));
     }
 
     public function testGetTotalPagesDefaultsToOne()
     {
-        $this->assertEquals(1, $this->pager->getPageCount());
+        $this->assertSame(1, $this->pager->getPageCount());
     }
 
     public function testGetTotalCorrectValue()
     {
         $this->pager->store('foo', 3, 12, 70);
 
-        $this->assertEquals(70, $this->pager->getTotal('foo'));
+        $this->assertSame(70, $this->pager->getTotal('foo'));
     }
 
     public function testGetTotalPagesCalcsCorrectValue()
     {
         $this->pager->store('foo', 3, 12, 70);
 
-        $this->assertEquals(6, $this->pager->getPageCount('foo'));
+        $this->assertSame(6, $this->pager->getPageCount('foo'));
     }
 
     public function testGetNextURIUsesCurrentURI()
@@ -233,7 +233,7 @@ public function testGetNextURIUsesCurrentURI()
         $expected = current_url(true);
         $expected = (string) $expected->setQuery('page_foo=3');
 
-        $this->assertEquals((string) $expected, $this->pager->getNextPageURI('foo'));
+        $this->assertSame((string) $expected, $this->pager->getNextPageURI('foo'));
     }
 
     public function testGetNextURIReturnsNullOnLastPage()
@@ -250,7 +250,7 @@ public function testGetNextURICorrectOnFirstPage()
         $expected = current_url(true);
         $expected = (string) $expected->setQuery('page_foo=2');
 
-        $this->assertEquals($expected, $this->pager->getNextPageURI('foo'));
+        $this->assertSame($expected, $this->pager->getNextPageURI('foo'));
     }
 
     public function testGetPreviousURIUsesCurrentURI()
@@ -262,7 +262,7 @@ public function testGetPreviousURIUsesCurrentURI()
         $expected = current_url(true);
         $expected = (string) $expected->setQuery('page_foo=1');
 
-        $this->assertEquals((string) $expected, $this->pager->getPreviousPageURI('foo'));
+        $this->assertSame((string) $expected, $this->pager->getPreviousPageURI('foo'));
     }
 
     public function testGetNextURIReturnsNullOnFirstPage()
@@ -284,7 +284,7 @@ public function testGetNextURIWithQueryStringUsesCurrentURI()
 
         $this->pager->store('foo', $_GET['page_foo'] - 1, 12, 70);
 
-        $this->assertEquals((string) $expected, $this->pager->getNextPageURI('foo'));
+        $this->assertSame((string) $expected, $this->pager->getNextPageURI('foo'));
     }
 
     public function testGetPreviousURIWithQueryStringUsesCurrentURI()
@@ -298,7 +298,7 @@ public function testGetPreviousURIWithQueryStringUsesCurrentURI()
 
         $this->pager->store('foo', $_GET['page_foo'] + 1, 12, 70);
 
-        $this->assertEquals((string) $expected, $this->pager->getPreviousPageURI('foo'));
+        $this->assertSame((string) $expected, $this->pager->getPreviousPageURI('foo'));
     }
 
     public function testGetOnlyQueries()
@@ -319,15 +319,15 @@ public function testGetOnlyQueries()
 
         $uri = current_url(true);
 
-        $this->assertEquals(
+        $this->assertSame(
             $this->pager->only($onlyQueries)->getPreviousPageURI(),
             (string) $uri->setQuery('search=foo&order=asc&page=1')
         );
-        $this->assertEquals(
+        $this->assertSame(
             $this->pager->only($onlyQueries)->getNextPageURI(),
             (string) $uri->setQuery('search=foo&order=asc&page=3')
         );
-        $this->assertEquals(
+        $this->assertSame(
             $this->pager->only($onlyQueries)->getPageURI(4),
             (string) $uri->setQuery('search=foo&order=asc&page=4')
         );
@@ -445,18 +445,18 @@ public function testBasedURI()
         $expected = current_url(true);
         $expected = (string) $expected->setQuery('page_foo=1');
 
-        $this->assertEquals((string) $expected, $this->pager->getPreviousPageURI('foo'));
+        $this->assertSame((string) $expected, $this->pager->getPreviousPageURI('foo'));
     }
 
     public function testAccessPageMoreThanPageCountGetLastPage()
     {
         $this->pager->store('default', 11, 1, 10);
-        $this->assertEquals(10, $this->pager->getCurrentPage());
+        $this->assertSame(10, $this->pager->getCurrentPage());
     }
 
     public function testSegmentOutOfBound()
     {
         $this->pager->store('default', 10, 1, 10, 1000);
-        $this->assertEquals(1, $this->pager->getCurrentPage());
+        $this->assertSame(1, $this->pager->getCurrentPage());
     }
 }
diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index 1ac6168e46a8..6a87d92363e6 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -236,7 +236,7 @@ public function testModelBogus()
 
         $resource->setModel('Something');
         $this->assertEmpty($resource->getModel());
-        $this->assertEquals('Something', $resource->getModelName());
+        $this->assertSame('Something', $resource->getModelName());
     }
 
     public function testModelByName()
@@ -244,7 +244,7 @@ public function testModelByName()
         $resource = new MockResourceController();
         $resource->setModel('\Tests\Support\Models\UserModel');
         $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
-        $this->assertEquals('\Tests\Support\Models\UserModel', $resource->getModelName());
+        $this->assertSame('\Tests\Support\Models\UserModel', $resource->getModelName());
     }
 
     public function testModelByObject()
@@ -255,20 +255,20 @@ public function testModelByObject()
         $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
 
         // Note that the leading backslash is missing if we build it this way
-        $this->assertEquals('Tests\Support\Models\UserModel', $resource->getModelName());
+        $this->assertSame('Tests\Support\Models\UserModel', $resource->getModelName());
     }
 
     //--------------------------------------------------------------------
     public function testFormat()
     {
         $resource = new MockResourceController();
-        $this->assertEquals('json', $resource->getFormat());
+        $this->assertSame('json', $resource->getFormat());
 
         $resource->setFormat('Nonsense');
-        $this->assertEquals('json', $resource->getFormat());
+        $this->assertSame('json', $resource->getFormat());
 
         $resource->setFormat('xml');
-        $this->assertEquals('xml', $resource->getFormat());
+        $this->assertSame('xml', $resource->getFormat());
     }
 
     //--------------------------------------------------------------------
@@ -297,7 +297,7 @@ public function testJSONFormatOutput()
         $JSONFormatter = new JSONFormatter();
         $expected      = $JSONFormatter->format($data);
 
-        $this->assertEquals($expected, $result);
+        $this->assertSame($expected, $result);
     }
 
     //--------------------------------------------------------------------
@@ -326,6 +326,6 @@ public function testXMLFormatOutput()
         $XMLFormatter = new XMLFormatter();
         $expected     = $XMLFormatter->format($data);
 
-        $this->assertEquals($expected, $result);
+        $this->assertSame($expected, $result);
     }
 }
diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php
index 2bbbf98dfaad..9910891f90c2 100644
--- a/tests/system/RESTful/ResourcePresenterTest.php
+++ b/tests/system/RESTful/ResourcePresenterTest.php
@@ -80,7 +80,7 @@ public function testResourceGet()
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertEquals(lang('RESTful.notImplemented', ['index']), $output);
+        $this->assertSame(lang('RESTful.notImplemented', ['index']), $output);
     }
 
     public function testResourceShow()
@@ -237,7 +237,7 @@ public function testModelBogus()
 
         $resource->setModel('Something');
         $this->assertEmpty($resource->getModel());
-        $this->assertEquals('Something', $resource->getModelName());
+        $this->assertSame('Something', $resource->getModelName());
     }
 
     public function testModelByName()
@@ -245,7 +245,7 @@ public function testModelByName()
         $resource = new MockResourcePresenter();
         $resource->setModel('\Tests\Support\Models\UserModel');
         $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
-        $this->assertEquals('\Tests\Support\Models\UserModel', $resource->getModelName());
+        $this->assertSame('\Tests\Support\Models\UserModel', $resource->getModelName());
     }
 
     public function testModelByObject()
@@ -256,7 +256,7 @@ public function testModelByObject()
         $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
 
         // Note that the leading backslash is missing if we build it this way
-        $this->assertEquals('Tests\Support\Models\UserModel', $resource->getModelName());
+        $this->assertSame('Tests\Support\Models\UserModel', $resource->getModelName());
     }
 
     public function testChangeSetModelByObject()
@@ -264,12 +264,12 @@ public function testChangeSetModelByObject()
         $resource = new MockResourcePresenter();
         $resource->setModel('\Tests\Support\Models\UserModel');
         $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
-        $this->assertEquals('\Tests\Support\Models\UserModel', $resource->getModelName());
+        $this->assertSame('\Tests\Support\Models\UserModel', $resource->getModelName());
 
         $model = new EntityModel();
         $resource->setModel($model);
         $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
-        $this->assertEquals('Tests\Support\Models\EntityModel', $resource->getModelName());
+        $this->assertSame('Tests\Support\Models\EntityModel', $resource->getModelName());
     }
 
     public function testChangeSetModelByName()
@@ -277,10 +277,10 @@ public function testChangeSetModelByName()
         $resource = new MockResourcePresenter();
         $resource->setModel('\Tests\Support\Models\UserModel');
         $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
-        $this->assertEquals('\Tests\Support\Models\UserModel', $resource->getModelName());
+        $this->assertSame('\Tests\Support\Models\UserModel', $resource->getModelName());
 
         $resource->setModel('\Tests\Support\Models\EntityModel');
         $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
-        $this->assertEquals('\Tests\Support\Models\EntityModel', $resource->getModelName());
+        $this->assertSame('\Tests\Support\Models\EntityModel', $resource->getModelName());
     }
 }
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index 6222f28569c1..01b2e4d513bc 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -18,8 +18,6 @@ protected function tearDown(): void
     {
     }
 
-    //--------------------------------------------------------------------
-
     protected function getCollector(array $config = [], array $files = [], $moduleConfig = null)
     {
         $defaults = [
@@ -52,7 +50,7 @@ public function testBasicAdd()
 
         $routes = $routes->getRoutes();
 
-        $this->assertEquals($expects, $routes);
+        $this->assertSame($expects, $routes);
     }
 
     //--------------------------------------------------------------------
@@ -69,7 +67,7 @@ public function testAddPrefixesDefaultNamespaceWhenNoneExist()
 
         $routes = $routes->getRoutes();
 
-        $this->assertEquals($expects, $routes);
+        $this->assertSame($expects, $routes);
     }
 
     //--------------------------------------------------------------------
@@ -86,7 +84,7 @@ public function testAddIgnoresDefaultNamespaceWhenExists()
 
         $routes = $routes->getRoutes();
 
-        $this->assertEquals($expects, $routes);
+        $this->assertSame($expects, $routes);
     }
 
     //--------------------------------------------------------------------
@@ -105,7 +103,7 @@ public function testAddWorksWithCurrentHTTPMethods()
 
         $routes = $routes->getRoutes();
 
-        $this->assertEquals($expects, $routes);
+        $this->assertSame($expects, $routes);
     }
 
     //--------------------------------------------------------------------
@@ -122,7 +120,7 @@ public function testAddWithLeadingSlash()
 
         $routes = $routes->getRoutes();
 
-        $this->assertEquals($expects, $routes);
+        $this->assertSame($expects, $routes);
     }
 
     //--------------------------------------------------------------------
@@ -137,7 +135,7 @@ public function testMatchIgnoresInvalidHTTPMethods()
 
         $routes = $routes->getRoutes();
 
-        $this->assertEquals([], $routes);
+        $this->assertSame([], $routes);
     }
 
     //--------------------------------------------------------------------
@@ -156,7 +154,7 @@ public function testAddWorksWithArrayOFHTTPMethods()
 
         $routes = $routes->getRoutes();
 
-        $this->assertEquals($expects, $routes);
+        $this->assertSame($expects, $routes);
     }
 
     //--------------------------------------------------------------------
@@ -173,7 +171,7 @@ public function testAddReplacesDefaultPlaceholders()
 
         $routes = $routes->getRoutes();
 
-        $this->assertEquals($expects, $routes);
+        $this->assertSame($expects, $routes);
     }
 
     //--------------------------------------------------------------------
@@ -191,7 +189,7 @@ public function testAddReplacesCustomPlaceholders()
 
         $routes = $routes->getRoutes();
 
-        $this->assertEquals($expects, $routes);
+        $this->assertSame($expects, $routes);
     }
 
     //--------------------------------------------------------------------
@@ -209,7 +207,7 @@ public function testAddRecognizesCustomNamespaces()
 
         $routes = $routes->getRoutes();
 
-        $this->assertEquals($expects, $routes);
+        $this->assertSame($expects, $routes);
     }
 
     //--------------------------------------------------------------------
@@ -219,7 +217,7 @@ public function testSetDefaultControllerStoresIt()
         $routes = $this->getCollector();
         $routes->setDefaultController('godzilla');
 
-        $this->assertEquals('godzilla', $routes->getDefaultController());
+        $this->assertSame('godzilla', $routes->getDefaultController());
     }
 
     //--------------------------------------------------------------------
@@ -229,7 +227,7 @@ public function testSetDefaultMethodStoresIt()
         $routes = $this->getCollector();
         $routes->setDefaultMethod('biggerBox');
 
-        $this->assertEquals('biggerBox', $routes->getDefaultMethod());
+        $this->assertSame('biggerBox', $routes->getDefaultMethod());
     }
 
     //--------------------------------------------------------------------
@@ -269,7 +267,7 @@ static function ($routes) {
             'admin/users/list' => '\Users::list',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -289,7 +287,7 @@ static function ($routes) {
             'admin/users/list' => '\Users::list',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -310,7 +308,7 @@ static function ($routes) {
             'admin/users/list' => '\Admin\Users::list',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -330,7 +328,7 @@ static function ($routes) {
             'users/list' => '\Users::list',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -360,7 +358,7 @@ static function ($routes) {
             'admin/delegate/foo' => '\Users::foo',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -378,7 +376,7 @@ public function testHostnameOption()
             'from' => '\to',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -397,7 +395,7 @@ public function testResourceScaffoldsCorrectly()
             'photos/(.*)'      => '\Photos::show/$1',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
 
         $routes = $this->getCollector();
         $routes->setHTTPVerb('post');
@@ -407,7 +405,7 @@ public function testResourceScaffoldsCorrectly()
             'photos' => '\Photos::create',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
 
         $routes = $this->getCollector();
         $routes->setHTTPVerb('put');
@@ -417,7 +415,7 @@ public function testResourceScaffoldsCorrectly()
             'photos/(.*)' => '\Photos::update/$1',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
 
         $routes = $this->getCollector();
         $routes->setHTTPVerb('patch');
@@ -427,7 +425,7 @@ public function testResourceScaffoldsCorrectly()
             'photos/(.*)' => '\Photos::update/$1',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
 
         $routes = $this->getCollector();
         $routes->setHTTPVerb('delete');
@@ -437,7 +435,7 @@ public function testResourceScaffoldsCorrectly()
             'photos/(.*)' => '\Photos::delete/$1',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     // Similar to the above, but with a more typical endpoint
@@ -456,7 +454,7 @@ public function testResourceAPIScaffoldsCorrectly()
             'api/photos/(.*)'      => '\Photos::show/$1',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
 
         $routes = $this->getCollector();
         $routes->setHTTPVerb('post');
@@ -466,7 +464,7 @@ public function testResourceAPIScaffoldsCorrectly()
             'api/photos' => '\Photos::create',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
 
         $routes = $this->getCollector();
         $routes->setHTTPVerb('put');
@@ -476,7 +474,7 @@ public function testResourceAPIScaffoldsCorrectly()
             'api/photos/(.*)' => '\Photos::update/$1',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
 
         $routes = $this->getCollector();
         $routes->setHTTPVerb('patch');
@@ -486,7 +484,7 @@ public function testResourceAPIScaffoldsCorrectly()
             'api/photos/(.*)' => '\Photos::update/$1',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
 
         $routes = $this->getCollector();
         $routes->setHTTPVerb('delete');
@@ -496,7 +494,7 @@ public function testResourceAPIScaffoldsCorrectly()
             'api/photos/(.*)' => '\Photos::delete/$1',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     public function testPresenterScaffoldsCorrectly()
@@ -515,7 +513,7 @@ public function testPresenterScaffoldsCorrectly()
             'photos/(.*)'        => '\Photos::show/$1',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
 
         $routes = $this->getCollector();
         $routes->setHTTPVerb('post');
@@ -528,7 +526,7 @@ public function testPresenterScaffoldsCorrectly()
             'photos'             => '\Photos::create',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -547,7 +545,7 @@ public function testResourcesWithCustomController()
             'photos/(.*)'      => '\Gallery::show/$1',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -566,7 +564,7 @@ public function testResourcesWithCustomPlaceholder()
             'photos/([0-9]+)'      => '\Photos::show/$1',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     public function testResourcesWithDefaultPlaceholder()
@@ -584,7 +582,7 @@ public function testResourcesWithDefaultPlaceholder()
             'photos/([0-9]+)'      => '\Photos::show/$1',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     public function testResourcesWithBogusDefaultPlaceholder()
@@ -602,7 +600,7 @@ public function testResourcesWithBogusDefaultPlaceholder()
             'photos/(.*)'      => '\Photos::show/$1',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -618,7 +616,7 @@ public function testResourcesWithOnly()
             'photos' => '\Photos::index',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -635,7 +633,7 @@ public function testResourcesWithExcept()
             'photos/(.*)' => '\Photos::show/$1',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -649,11 +647,11 @@ public function testResourcesWithWebsafe()
 
         $expected = [
             'photos'             => '\Photos::create',
-            'photos/(.*)'        => '\Photos::update/$1',
             'photos/(.*)/delete' => '\Photos::delete/$1',
+            'photos/(.*)'        => '\Photos::update/$1',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -666,12 +664,12 @@ public function testMatchSupportsMultipleMethods()
         $expected = ['here' => '\there'];
 
         $routes->match(['get', 'post'], 'here', 'there');
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
 
         Services::request()->setMethod('post');
         $routes = $this->getCollector();
         $routes->match(['get', 'post'], 'here', 'there');
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -684,7 +682,7 @@ public function testGet()
         $expected = ['here' => '\there'];
 
         $routes->get('here', 'there');
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -697,7 +695,7 @@ public function testPost()
         $expected = ['here' => '\there'];
 
         $routes->post('here', 'there');
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -711,7 +709,7 @@ public function testGetDoesntAllowOtherMethods()
 
         $routes->get('here', 'there');
         $routes->post('from', 'to');
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -724,7 +722,7 @@ public function testPut()
         $expected = ['here' => '\there'];
 
         $routes->put('here', 'there');
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -737,7 +735,7 @@ public function testDelete()
         $expected = ['here' => '\there'];
 
         $routes->delete('here', 'there');
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -750,7 +748,7 @@ public function testHead()
         $expected = ['here' => '\there'];
 
         $routes->head('here', 'there');
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -763,7 +761,7 @@ public function testPatch()
         $expected = ['here' => '\there'];
 
         $routes->patch('here', 'there');
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -776,7 +774,7 @@ public function testOptions()
         $expected = ['here' => '\there'];
 
         $routes->options('here', 'there');
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -788,7 +786,7 @@ public function testCLI()
         $expected = ['here' => '\there'];
 
         $routes->cli('here', 'there');
-        $this->assertEquals($expected, $routes->getRoutes('cli'));
+        $this->assertSame($expected, $routes->getRoutes('cli'));
     }
 
     //--------------------------------------------------------------------
@@ -816,7 +814,7 @@ static function ($routes) {
             }
         );
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -829,7 +827,7 @@ public function testReverseRoutingFindsSimpleMatch()
 
         $match = $routes->reverseRoute('myController::goto', 'string', 13);
 
-        $this->assertEquals('/path/string/to/13', $match);
+        $this->assertSame('/path/string/to/13', $match);
     }
 
     //--------------------------------------------------------------------
@@ -842,7 +840,7 @@ public function testReverseRoutingWithLocaleAndFindsSimpleMatch()
 
         $match = $routes->reverseRoute('myController::goto', 'string', 13);
 
-        $this->assertEquals('/en/path/string/to/13', $match);
+        $this->assertSame('/en/path/string/to/13', $match);
     }
 
     //--------------------------------------------------------------------
@@ -887,7 +885,7 @@ public function testReverseRoutingWithLocale()
 
         $routes->add('{locale}/contact', 'myController::goto');
 
-        $this->assertEquals('/en/contact', $routes->reverseRoute('myController::goto'));
+        $this->assertSame('/en/contact', $routes->reverseRoute('myController::goto'));
     }
 
     //--------------------------------------------------------------------
@@ -898,7 +896,7 @@ public function testNamedRoutes()
 
         $routes->add('users', 'Users::index', ['as' => 'namedRoute']);
 
-        $this->assertEquals('/users', $routes->reverseRoute('namedRoute'));
+        $this->assertSame('/users', $routes->reverseRoute('namedRoute'));
     }
 
     //--------------------------------------------------------------------
@@ -909,7 +907,7 @@ public function testNamedRoutesWithLocale()
 
         $routes->add('{locale}/users', 'Users::index', ['as' => 'namedRoute']);
 
-        $this->assertEquals('/en/users', $routes->reverseRoute('namedRoute'));
+        $this->assertSame('/en/users', $routes->reverseRoute('namedRoute'));
     }
 
     //--------------------------------------------------------------------
@@ -922,7 +920,7 @@ public function testNamedRoutesFillInParams()
 
         $match = $routes->reverseRoute('namedRoute', 'string', 13);
 
-        $this->assertEquals('/path/string/to/13', $match);
+        $this->assertSame('/path/string/to/13', $match);
     }
 
     //--------------------------------------------------------------------
@@ -935,7 +933,7 @@ public function testNamedRoutesWithLocaleAndFillInParams()
 
         $match = $routes->reverseRoute('namedRoute', 'string', 13);
 
-        $this->assertEquals('/en/path/string/to/13', $match);
+        $this->assertSame('/en/path/string/to/13', $match);
     }
 
     //--------------------------------------------------------------------
@@ -963,9 +961,9 @@ static function () {},
         $match2 = $routes->reverseRoute('namedRoute2');
         $match3 = $routes->reverseRoute('namedRoute3');
 
-        $this->assertEquals('/user/insert', $match1);
-        $this->assertEquals('/user/insert', $match2);
-        $this->assertEquals('/user/insert', $match3);
+        $this->assertSame('/user/insert', $match1);
+        $this->assertSame('/user/insert', $match2);
+        $this->assertSame('/user/insert', $match3);
     }
 
     //--------------------------------------------------------------------
@@ -995,9 +993,9 @@ static function () {
         $match2 = $routes->reverseRoute('namedRoute2');
         $match3 = $routes->reverseRoute('namedRoute3');
 
-        $this->assertEquals('/en/user/insert', $match1);
-        $this->assertEquals('/en/user/insert', $match2);
-        $this->assertEquals('/en/user/insert', $match3);
+        $this->assertSame('/en/user/insert', $match1);
+        $this->assertSame('/en/user/insert', $match2);
+        $this->assertSame('/en/user/insert', $match3);
     }
 
     //--------------------------------------------------------------------
@@ -1011,8 +1009,8 @@ public function testNamedRoutesWithPipesInRegex()
 
         $routes->get('/system/(this|that)', 'myController::system/$1', ['as' => 'pipedRoute']);
 
-        $this->assertEquals('/system/this', $routes->reverseRoute('pipedRoute', 'this'));
-        $this->assertEquals('/system/that', $routes->reverseRoute('pipedRoute', 'that'));
+        $this->assertSame('/system/this', $routes->reverseRoute('pipedRoute', 'this'));
+        $this->assertSame('/system/that', $routes->reverseRoute('pipedRoute', 'that'));
     }
 
     //--------------------------------------------------------------------
@@ -1025,7 +1023,7 @@ public function testReverseRouteMatching()
 
         $match = $routes->reverseRoute('testRouter', 1, 2);
 
-        $this->assertEquals('/test/1/2', $match);
+        $this->assertSame('/test/1/2', $match);
     }
 
     //--------------------------------------------------------------------
@@ -1038,7 +1036,7 @@ public function testReverseRouteMatchingWithLocale()
 
         $match = $routes->reverseRoute('testRouter', 1, 2);
 
-        $this->assertEquals('/en/test/1/2', $match);
+        $this->assertSame('/en/test/1/2', $match);
     }
 
     //--------------------------------------------------------------------
@@ -1054,10 +1052,10 @@ public function testAddRedirect()
             'users' => 'users/index',
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
         $this->assertTrue($routes->isRedirect('users'));
-        $this->assertEquals(307, $routes->getRedirectCode('users'));
-        $this->assertEquals(0, $routes->getRedirectCode('bosses'));
+        $this->assertSame(307, $routes->getRedirectCode('users'));
+        $this->assertSame(0, $routes->getRedirectCode('bosses'));
     }
 
     public function testAddRedirectNamed()
@@ -1068,15 +1066,13 @@ public function testAddRedirectNamed()
         $routes->addRedirect('users', 'namedRoute', 307);
 
         $expected = [
-            'users' => [
-                'zombies' => '\Zombies::index',
-            ],
             'zombies' => '\Zombies::index',
+            'users'   => ['zombies' => '\Zombies::index'],
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
         $this->assertTrue($routes->isRedirect('users'));
-        $this->assertEquals(307, $routes->getRedirectCode('users'));
+        $this->assertSame(307, $routes->getRedirectCode('users'));
     }
 
     public function testAddRedirectGetMethod()
@@ -1087,15 +1083,13 @@ public function testAddRedirectGetMethod()
         $routes->addRedirect('users', 'namedRoute', 307);
 
         $expected = [
-            'users' => [
-                'zombies' => '\Zombies::index',
-            ],
             'zombies' => '\Zombies::index',
+            'users'   => ['zombies' => '\Zombies::index'],
         ];
 
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
         $this->assertTrue($routes->isRedirect('users'));
-        $this->assertEquals(307, $routes->getRedirectCode('users'));
+        $this->assertSame(307, $routes->getRedirectCode('users'));
     }
 
     //--------------------------------------------------------------------
@@ -1116,7 +1110,7 @@ public function testWithSubdomain()
             'objects/([a-zA-Z0-9]+)' => '\Admin::objectsList/$1',
         ];
 
-        $this->assertEquals($expects, $routes->getRoutes());
+        $this->assertSame($expects, $routes->getRoutes());
     }
 
     public function testWithSubdomainMissing()
@@ -1132,7 +1126,7 @@ public function testWithSubdomainMissing()
             'objects/([a-zA-Z0-9]+)' => '\App::objectsList/$1',
         ];
 
-        $this->assertEquals($expects, $routes->getRoutes());
+        $this->assertSame($expects, $routes->getRoutes());
     }
 
     public function testWithDifferentSubdomain()
@@ -1148,7 +1142,7 @@ public function testWithDifferentSubdomain()
             'objects/([a-zA-Z0-9]+)' => '\App::objectsList/$1',
         ];
 
-        $this->assertEquals($expects, $routes->getRoutes());
+        $this->assertSame($expects, $routes->getRoutes());
     }
 
     public function testWithWWWSubdomain()
@@ -1164,7 +1158,7 @@ public function testWithWWWSubdomain()
             'objects/([a-zA-Z0-9]+)' => '\App::objectsList/$1',
         ];
 
-        $this->assertEquals($expects, $routes->getRoutes());
+        $this->assertSame($expects, $routes->getRoutes());
     }
 
     public function testWithDotCoSubdomain()
@@ -1180,7 +1174,7 @@ public function testWithDotCoSubdomain()
             'objects/([a-zA-Z0-9]+)' => '\App::objectsList/$1',
         ];
 
-        $this->assertEquals($expects, $routes->getRoutes());
+        $this->assertSame($expects, $routes->getRoutes());
     }
 
     public function testWithDifferentSubdomainMissing()
@@ -1196,7 +1190,7 @@ public function testWithDifferentSubdomainMissing()
             'objects/([a-zA-Z0-9]+)' => '\App::objectsList/$1',
         ];
 
-        $this->assertEquals($expects, $routes->getRoutes());
+        $this->assertSame($expects, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -1217,7 +1211,7 @@ public function testWithSubdomainOrdered()
             'objects/([a-zA-Z0-9]+)' => '\Admin::objectsList/$1',
         ];
 
-        $this->assertEquals($expects, $routes->getRoutes());
+        $this->assertSame($expects, $routes->getRoutes());
     }
 
     //--------------------------------------------------------------------
@@ -1234,7 +1228,7 @@ public function testReverseRoutingWithClosure()
 
         $match = $routes->reverseRoute('login');
 
-        $this->assertEquals('/login', $match);
+        $this->assertSame('/login', $match);
     }
 
     public function testReverseRoutingWithClosureNoMatch()
@@ -1251,9 +1245,7 @@ public function testReverseRoutingWithClosureNoMatch()
 
     public function testWillDiscoverLocal()
     {
-        $config = [
-            'SampleSpace' => TESTPATH . '_support',
-        ];
+        $config = ['SampleSpace' => TESTPATH . '_support'];
 
         $moduleConfig          = new Modules();
         $moduleConfig->enabled = true;
@@ -1263,7 +1255,7 @@ public function testWillDiscoverLocal()
         $match = $routes->getRoutes();
 
         $this->assertArrayHasKey('testing', $match);
-        $this->assertEquals($match['testing'], '\TestController::index');
+        $this->assertSame($match['testing'], '\TestController::index');
     }
 
     //--------------------------------------------------------------------
@@ -1284,7 +1276,7 @@ public function testDiscoverLocalAllowsConfigToOverridePackages()
         $match = $routes->getRoutes();
 
         $this->assertArrayHasKey('testing', $match);
-        $this->assertEquals($match['testing'], '\MainRoutes::index');
+        $this->assertSame($match['testing'], '\MainRoutes::index');
     }
 
     //--------------------------------------------------------------------
@@ -1306,7 +1298,7 @@ static function () {},
 
         $options = $routes->getRoutesOptions('administrator');
 
-        $this->assertEquals($options, ['as' => 'admin', 'foo' => 'baz']);
+        $this->assertSame($options, ['as' => 'admin', 'foo' => 'baz']);
     }
 
     public function testRoutesOptionsForDifferentVerbs()
@@ -1343,15 +1335,15 @@ static function () {},
 
         $options = $routes->getRoutesOptions('administrator');
 
-        $this->assertEquals($options, ['as' => 'admin1', 'foo' => 'baz1', 'bar' => 'baz']);
+        $this->assertSame($options, ['as' => 'admin1', 'foo' => 'baz1', 'bar' => 'baz']);
 
         $options = $routes->setHTTPVerb('post')->getRoutesOptions('administrator');
 
-        $this->assertEquals($options, ['as' => 'admin2', 'foo' => 'baz2', 'bar' => 'baz']);
+        $this->assertSame($options, ['as' => 'admin2', 'foo' => 'baz2', 'bar' => 'baz']);
 
         $options = $routes->setHTTPVerb('get')->getRoutesOptions('administrator', 'post');
 
-        $this->assertEquals($options, ['as' => 'admin2', 'foo' => 'baz2', 'bar' => 'baz']);
+        $this->assertSame($options, ['as' => 'admin2', 'foo' => 'baz2', 'bar' => 'baz']);
     }
 
     public function testRouteGroupWithFilterSimple()
@@ -1369,8 +1361,8 @@ static function ($routes) {
 
         $this->assertTrue($routes->isFiltered('admin/users'));
         $this->assertFalse($routes->isFiltered('admin/franky'));
-        $this->assertEquals('role', $routes->getFilterForRoute('admin/users'));
-        $this->assertEquals('', $routes->getFilterForRoute('admin/bosses'));
+        $this->assertSame('role', $routes->getFilterForRoute('admin/users'));
+        $this->assertSame('', $routes->getFilterForRoute('admin/bosses'));
     }
 
     public function testRouteGroupWithFilterWithParams()
@@ -1388,7 +1380,7 @@ static function ($routes) {
 
         $this->assertTrue($routes->isFiltered('admin/users'));
         $this->assertFalse($routes->isFiltered('admin/franky'));
-        $this->assertEquals('role:admin,manager', $routes->getFilterForRoute('admin/users'));
+        $this->assertSame('role:admin,manager', $routes->getFilterForRoute('admin/users'));
     }
 
     //--------------------------------------------------------------------
@@ -1407,7 +1399,7 @@ public function test404OverrideString()
         $routes = $this->getCollector();
 
         $routes->set404Override('Explode');
-        $this->assertEquals('Explode', $routes->get404Override());
+        $this->assertSame('Explode', $routes->get404Override());
     }
 
     public function test404OverrideCallable()
@@ -1430,7 +1422,7 @@ public function testOffsetParameters()
 
         $routes->get('users/(:num)', 'users/show/$1', ['offset' => 1]);
         $expected = ['users/([0-9]+)' => '\users/show/$2'];
-        $this->assertEquals($expected, $routes->getRoutes());
+        $this->assertSame($expected, $routes->getRoutes());
     }
 
     /**
@@ -1447,7 +1439,7 @@ public function testRouteToWithSubdomainMatch()
 
         $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => 'doc', 'as' => 'doc_item']);
 
-        $this->assertEquals('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
+        $this->assertSame('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
     }
 
     public function testRouteToWithSubdomainMismatch()
@@ -1483,7 +1475,7 @@ public function testRouteToWithGenericSubdomainMatch()
 
         $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => '*', 'as' => 'doc_item']);
 
-        $this->assertEquals('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
+        $this->assertSame('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
     }
 
     public function testRouteToWithGenericSubdomainMismatch()
@@ -1495,7 +1487,7 @@ public function testRouteToWithGenericSubdomainMismatch()
 
         $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => '*', 'as' => 'doc_item']);
 
-        $this->assertEquals('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
+        $this->assertSame('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
     }
 
     public function testRouteToWithGenericSubdomainNot()
@@ -1507,7 +1499,7 @@ public function testRouteToWithGenericSubdomainNot()
 
         $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => '*', 'as' => 'doc_item']);
 
-        $this->assertEquals('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
+        $this->assertSame('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
     }
 
     public function testRouteToWithoutSubdomainMatch()
@@ -1543,7 +1535,7 @@ public function testRouteToWithoutSubdomainNot()
 
         $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['hostname' => 'example.com', 'as' => 'doc_item']);
 
-        $this->assertEquals('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
+        $this->assertSame('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
     }
 
     /**
@@ -1569,7 +1561,7 @@ public function testRouteOverwritingDifferentSubdomains()
 
         $expects = '\App\Controllers\Site\CDoc';
 
-        $this->assertEquals($expects, $router->handle('/'));
+        $this->assertSame($expects, $router->handle('/'));
     }
 
     public function testRouteOverwritingTwoRules()
@@ -1590,7 +1582,7 @@ public function testRouteOverwritingTwoRules()
         // the second rule applies, so overwrites the first
         $expects = '\App\Controllers\Home';
 
-        $this->assertEquals($expects, $router->handle('/'));
+        $this->assertSame($expects, $router->handle('/'));
     }
 
     public function testRouteOverwritingTwoRulesLastApplies()
@@ -1610,7 +1602,7 @@ public function testRouteOverwritingTwoRulesLastApplies()
 
         $expects = '\App\Controllers\Site\CDoc';
 
-        $this->assertEquals($expects, $router->handle('/'));
+        $this->assertSame($expects, $router->handle('/'));
     }
 
     public function testRouteOverwritingMatchingSubdomain()
@@ -1630,7 +1622,7 @@ public function testRouteOverwritingMatchingSubdomain()
 
         $expects = '\App\Controllers\Site\CDoc';
 
-        $this->assertEquals($expects, $router->handle('/'));
+        $this->assertSame($expects, $router->handle('/'));
     }
 
     public function testRouteOverwritingMatchingHost()
@@ -1650,7 +1642,7 @@ public function testRouteOverwritingMatchingHost()
 
         $expects = '\App\Controllers\Site\CDoc';
 
-        $this->assertEquals($expects, $router->handle('/'));
+        $this->assertSame($expects, $router->handle('/'));
     }
 
     /**
@@ -1669,7 +1661,7 @@ public function testRouteDefaultNameSpace()
 
         $expects = '\App\Controllers\Core\Home';
 
-        $this->assertEquals($expects, $router->handle('/'));
+        $this->assertSame($expects, $router->handle('/'));
     }
 
     public function testZeroAsURIPath()
@@ -1683,7 +1675,7 @@ public function testZeroAsURIPath()
 
         $expects = '\App\Controllers\Core\Home';
 
-        $this->assertEquals($expects, $router->handle('/0'));
+        $this->assertSame($expects, $router->handle('/0'));
     }
 
     public function provideRouteDefaultNamespace()
@@ -1706,7 +1698,7 @@ public function testAutoRoutesControllerNameReturnsFQCN($namespace)
         $router = new Router($routes, Services::request());
         $router->handle('/product');
 
-        $this->assertEquals('\App\\Controllers\\Product', $router->controllerName());
+        $this->assertSame('\App\\Controllers\\Product', $router->controllerName());
     }
 
     /**
@@ -1722,7 +1714,7 @@ public function testRoutesControllerNameReturnsFQCN($namespace)
         $router = new Router($routes, Services::request());
         $router->handle('/product');
 
-        $this->assertEquals('\App\\Controllers\\Product', $router->controllerName());
+        $this->assertSame('\App\\Controllers\\Product', $router->controllerName());
     }
 
     public function testRoutePriorityDetected()
@@ -1745,12 +1737,12 @@ public function testRoutePriorityValue()
         $collection = $this->getCollector();
 
         $collection->add('string', 'Controller::method', ['priority' => 'string']);
-        $this->assertEquals(0, $collection->getRoutesOptions('string')['priority']);
+        $this->assertSame(0, $collection->getRoutesOptions('string')['priority']);
 
         $collection->add('negative-integer', 'Controller::method', ['priority' => -1]);
-        $this->assertEquals(1, $collection->getRoutesOptions('negative-integer')['priority']);
+        $this->assertSame(1, $collection->getRoutesOptions('negative-integer')['priority']);
 
         $collection->add('string-negative-integer', 'Controller::method', ['priority' => '-1']);
-        $this->assertEquals(1, $collection->getRoutesOptions('string-negative-integer')['priority']);
+        $this->assertSame(1, $collection->getRoutesOptions('string-negative-integer')['priority']);
     }
 }
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index f781fde06a46..99e49c9941c5 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -62,26 +62,20 @@ protected function setUp(): void
         $this->request->setMethod('get');
     }
 
-    //--------------------------------------------------------------------
-
     protected function tearDown(): void
     {
     }
 
-    //--------------------------------------------------------------------
-
     public function testEmptyURIMatchesDefaults()
     {
         $router = new Router($this->collection, $this->request);
 
         $router->handle('');
 
-        $this->assertEquals($this->collection->getDefaultController(), $router->controllerName());
-        $this->assertEquals($this->collection->getDefaultMethod(), $router->methodName());
+        $this->assertSame($this->collection->getDefaultController(), $router->controllerName());
+        $this->assertSame($this->collection->getDefaultMethod(), $router->methodName());
     }
 
-    //--------------------------------------------------------------------
-
     public function testZeroAsURIPath()
     {
         $router = new Router($this->collection, $this->request);
@@ -91,80 +85,66 @@ public function testZeroAsURIPath()
         $router->handle('0');
     }
 
-    //--------------------------------------------------------------------
-
     public function testURIMapsToController()
     {
         $router = new Router($this->collection, $this->request);
 
         $router->handle('users');
 
-        $this->assertEquals('\Users', $router->controllerName());
-        $this->assertEquals('index', $router->methodName());
+        $this->assertSame('\Users', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
     }
 
-    //--------------------------------------------------------------------
-
     public function testURIMapsToControllerAltMethod()
     {
         $router = new Router($this->collection, $this->request);
 
         $router->handle('posts');
 
-        $this->assertEquals('\Blog', $router->controllerName());
-        $this->assertEquals('posts', $router->methodName());
+        $this->assertSame('\Blog', $router->controllerName());
+        $this->assertSame('posts', $router->methodName());
     }
 
-    //--------------------------------------------------------------------
-
     public function testURIMapsToNamespacedController()
     {
         $router = new Router($this->collection, $this->request);
 
         $router->handle('pages');
 
-        $this->assertEquals('\App\Pages', $router->controllerName());
-        $this->assertEquals('list_all', $router->methodName());
+        $this->assertSame('\App\Pages', $router->controllerName());
+        $this->assertSame('list_all', $router->methodName());
     }
 
-    //--------------------------------------------------------------------
-
     public function testURIMapsParamsToBackReferences()
     {
         $router = new Router($this->collection, $this->request);
 
         $router->handle('posts/123');
 
-        $this->assertEquals('show', $router->methodName());
-        $this->assertEquals([123], $router->params());
+        $this->assertSame('show', $router->methodName());
+        $this->assertSame(['123'], $router->params());
     }
 
-    //--------------------------------------------------------------------
-
     public function testURIMapsParamsToRearrangedBackReferences()
     {
         $router = new Router($this->collection, $this->request);
 
         $router->handle('posts/123/edit');
 
-        $this->assertEquals('edit', $router->methodName());
-        $this->assertEquals([123], $router->params());
+        $this->assertSame('edit', $router->methodName());
+        $this->assertSame(['123'], $router->params());
     }
 
-    //--------------------------------------------------------------------
-
     public function testURIMapsParamsToBackReferencesWithUnused()
     {
         $router = new Router($this->collection, $this->request);
 
         $router->handle('books/123/sometitle/456');
 
-        $this->assertEquals('show', $router->methodName());
-        $this->assertEquals([456, 123], $router->params());
+        $this->assertSame('show', $router->methodName());
+        $this->assertSame(['456', '123'], $router->params());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/672
      */
@@ -174,12 +154,10 @@ public function testURIMapsParamsWithMany()
 
         $router->handle('objects/123/sort/abc/FOO');
 
-        $this->assertEquals('objectsSortCreate', $router->methodName());
-        $this->assertEquals([123, 'abc', 'FOO'], $router->params());
+        $this->assertSame('objectsSortCreate', $router->methodName());
+        $this->assertSame(['123', 'abc', 'FOO'], $router->params());
     }
 
-    //--------------------------------------------------------------------
-
     public function testClosures()
     {
         $router = new Router($this->collection, $this->request);
@@ -191,35 +169,29 @@ public function testClosures()
         $expects = $closure(...$router->params());
 
         $this->assertIsCallable($router->controllerName());
-        $this->assertEquals($expects, '123-alpha');
+        $this->assertSame($expects, '123-alpha');
     }
 
-    //--------------------------------------------------------------------
-
     public function testAutoRouteFindsControllerWithFileAndMethod()
     {
         $router = new Router($this->collection, $this->request);
 
         $router->autoRoute('myController/someMethod');
 
-        $this->assertEquals('MyController', $router->controllerName());
-        $this->assertEquals('someMethod', $router->methodName());
+        $this->assertSame('MyController', $router->controllerName());
+        $this->assertSame('someMethod', $router->methodName());
     }
 
-    //--------------------------------------------------------------------
-
     public function testAutoRouteFindsControllerWithFile()
     {
         $router = new Router($this->collection, $this->request);
 
         $router->autoRoute('myController');
 
-        $this->assertEquals('MyController', $router->controllerName());
-        $this->assertEquals('index', $router->methodName());
+        $this->assertSame('MyController', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
     }
 
-    //--------------------------------------------------------------------
-
     public function testAutoRouteFindsControllerWithSubfolder()
     {
         $router = new Router($this->collection, $this->request);
@@ -230,12 +202,10 @@ public function testAutoRouteFindsControllerWithSubfolder()
 
         rmdir(APPPATH . 'Controllers/Subfolder');
 
-        $this->assertEquals('MyController', $router->controllerName());
-        $this->assertEquals('someMethod', $router->methodName());
+        $this->assertSame('MyController', $router->controllerName());
+        $this->assertSame('someMethod', $router->methodName());
     }
 
-    //--------------------------------------------------------------------
-
     public function testAutoRouteFindsDashedSubfolder()
     {
         $router = new Router($this->collection, $this->request);
@@ -247,13 +217,11 @@ public function testAutoRouteFindsDashedSubfolder()
 
         rmdir(APPPATH . 'Controllers/Dash_folder');
 
-        $this->assertEquals('Dash_folder/', $router->directory());
-        $this->assertEquals('Mycontroller', $router->controllerName());
-        $this->assertEquals('somemethod', $router->methodName());
+        $this->assertSame('Dash_folder/', $router->directory());
+        $this->assertSame('Mycontroller', $router->controllerName());
+        $this->assertSame('somemethod', $router->methodName());
     }
 
-    //--------------------------------------------------------------------
-
     public function testAutoRouteFindsDashedController()
     {
         $router = new Router($this->collection, $this->request);
@@ -267,13 +235,11 @@ public function testAutoRouteFindsDashedController()
         unlink(APPPATH . 'Controllers/Dash_folder/Dash_controller.php');
         rmdir(APPPATH . 'Controllers/Dash_folder');
 
-        $this->assertEquals('Dash_folder/', $router->directory());
-        $this->assertEquals('Dash_controller', $router->controllerName());
-        $this->assertEquals('somemethod', $router->methodName());
+        $this->assertSame('Dash_folder/', $router->directory());
+        $this->assertSame('Dash_controller', $router->controllerName());
+        $this->assertSame('somemethod', $router->methodName());
     }
 
-    //--------------------------------------------------------------------
-
     public function testAutoRouteFindsDashedMethod()
     {
         $router = new Router($this->collection, $this->request);
@@ -287,13 +253,11 @@ public function testAutoRouteFindsDashedMethod()
         unlink(APPPATH . 'Controllers/Dash_folder/Dash_controller.php');
         rmdir(APPPATH . 'Controllers/Dash_folder');
 
-        $this->assertEquals('Dash_folder/', $router->directory());
-        $this->assertEquals('Dash_controller', $router->controllerName());
-        $this->assertEquals('dash_method', $router->methodName());
+        $this->assertSame('Dash_folder/', $router->directory());
+        $this->assertSame('Dash_controller', $router->controllerName());
+        $this->assertSame('dash_method', $router->methodName());
     }
 
-    //--------------------------------------------------------------------
-
     public function testAutoRouteFindsDefaultDashFolder()
     {
         $router = new Router($this->collection, $this->request);
@@ -305,13 +269,11 @@ public function testAutoRouteFindsDefaultDashFolder()
 
         rmdir(APPPATH . 'Controllers/Dash_folder');
 
-        $this->assertEquals('Dash_folder/', $router->directory());
-        $this->assertEquals('Home', $router->controllerName());
-        $this->assertEquals('index', $router->methodName());
+        $this->assertSame('Dash_folder/', $router->directory());
+        $this->assertSame('Home', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
     }
 
-    //--------------------------------------------------------------------
-
     public function testAutoRouteFindsMByteDir()
     {
         $router = new Router($this->collection, $this->request);
@@ -323,13 +285,11 @@ public function testAutoRouteFindsMByteDir()
 
         rmdir(APPPATH . 'Controllers/Φ');
 
-        $this->assertEquals('Φ/', $router->directory());
-        $this->assertEquals('Home', $router->controllerName());
-        $this->assertEquals('index', $router->methodName());
+        $this->assertSame('Φ/', $router->directory());
+        $this->assertSame('Home', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
     }
 
-    //--------------------------------------------------------------------
-
     public function testAutoRouteFindsMByteController()
     {
         $router = new Router($this->collection, $this->request);
@@ -341,12 +301,10 @@ public function testAutoRouteFindsMByteController()
 
         unlink(APPPATH . 'Controllers/Φ');
 
-        $this->assertEquals('Φ', $router->controllerName());
-        $this->assertEquals('index', $router->methodName());
+        $this->assertSame('Φ', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
     }
 
-    //--------------------------------------------------------------------
-
     public function testAutoRouteRejectsSingleDot()
     {
         $router = new Router($this->collection, $this->request);
@@ -357,8 +315,6 @@ public function testAutoRouteRejectsSingleDot()
         $router->autoRoute('.');
     }
 
-    //--------------------------------------------------------------------
-
     public function testAutoRouteRejectsDoubleDot()
     {
         $router = new Router($this->collection, $this->request);
@@ -369,8 +325,6 @@ public function testAutoRouteRejectsDoubleDot()
         $router->autoRoute('..');
     }
 
-    //--------------------------------------------------------------------
-
     public function testAutoRouteRejectsMidDot()
     {
         $router = new Router($this->collection, $this->request);
@@ -381,8 +335,6 @@ public function testAutoRouteRejectsMidDot()
         $router->autoRoute('Foo.bar');
     }
 
-    //--------------------------------------------------------------------
-
     public function testDetectsLocales()
     {
         $router = new Router($this->collection, $this->request);
@@ -390,31 +342,27 @@ public function testDetectsLocales()
         $router->handle('fr/pages');
 
         $this->assertTrue($router->hasLocale());
-        $this->assertEquals('fr', $router->getLocale());
+        $this->assertSame('fr', $router->getLocale());
     }
 
-    //--------------------------------------------------------------------
-
     public function testRouteResource()
     {
         $router = new Router($this->collection, $this->request);
 
         $router->handle('Admin/Admins');
 
-        $this->assertEquals('\App\Admin\Admins', $router->controllerName());
-        $this->assertEquals('list_all', $router->methodName());
+        $this->assertSame('\App\Admin\Admins', $router->controllerName());
+        $this->assertSame('list_all', $router->methodName());
     }
 
-    //--------------------------------------------------------------------
-
     public function testRouteWithLeadingSlash()
     {
         $router = new Router($this->collection, $this->request);
 
         $router->handle('some/slash');
 
-        $this->assertEquals('\App\Slash', $router->controllerName());
-        $this->assertEquals('index', $router->methodName());
+        $this->assertSame('\App\Slash', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
     }
 
     //--------------------------------------------------------------------
@@ -438,7 +386,7 @@ public function testMatchedRouteOptions()
 
         $router->handle('foo');
 
-        $this->assertEquals($router->getMatchedRouteOptions(), ['as' => 'login', 'foo' => 'baz']);
+        $this->assertSame($router->getMatchedRouteOptions(), ['as' => 'login', 'foo' => 'baz']);
     }
 
     public function testRouteWorksWithFilters()
@@ -453,13 +401,11 @@ public function testRouteWorksWithFilters()
 
         $router->handle('foo/bar');
 
-        $this->assertEquals('\TestController', $router->controllerName());
-        $this->assertEquals('foobar', $router->methodName());
-        $this->assertEquals('test', $router->getFilter());
+        $this->assertSame('\TestController', $router->controllerName());
+        $this->assertSame('foobar', $router->methodName());
+        $this->assertSame('test', $router->getFilter());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/1247
      */
@@ -485,27 +431,27 @@ static function (RouteCollection $routes) {
 
         $router->handle('api/posts');
 
-        $this->assertEquals('\App\Controllers\Api\PostController', $router->controllerName());
-        $this->assertEquals('index', $router->methodName());
-        $this->assertEquals('api-auth', $router->getFilter());
+        $this->assertSame('\App\Controllers\Api\PostController', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
+        $this->assertSame('api-auth', $router->getFilter());
 
         $router->handle('api/posts/new');
 
-        $this->assertEquals('\App\Controllers\Api\PostController', $router->controllerName());
-        $this->assertEquals('new', $router->methodName());
-        $this->assertEquals('api-auth', $router->getFilter());
+        $this->assertSame('\App\Controllers\Api\PostController', $router->controllerName());
+        $this->assertSame('new', $router->methodName());
+        $this->assertSame('api-auth', $router->getFilter());
 
         $router->handle('api/posts/50');
 
-        $this->assertEquals('\App\Controllers\Api\PostController', $router->controllerName());
-        $this->assertEquals('show', $router->methodName());
-        $this->assertEquals('api-auth', $router->getFilter());
+        $this->assertSame('\App\Controllers\Api\PostController', $router->controllerName());
+        $this->assertSame('show', $router->methodName());
+        $this->assertSame('api-auth', $router->getFilter());
 
         $router->handle('api/posts/50/edit');
 
-        $this->assertEquals('\App\Controllers\Api\PostController', $router->controllerName());
-        $this->assertEquals('edit', $router->methodName());
-        $this->assertEquals('api-auth', $router->getFilter());
+        $this->assertSame('\App\Controllers\Api\PostController', $router->controllerName());
+        $this->assertSame('edit', $router->methodName());
+        $this->assertSame('api-auth', $router->getFilter());
 
         // POST
         $this->collection->group(...$group);
@@ -515,9 +461,9 @@ static function (RouteCollection $routes) {
 
         $router->handle('api/posts');
 
-        $this->assertEquals('\App\Controllers\Api\PostController', $router->controllerName());
-        $this->assertEquals('create', $router->methodName());
-        $this->assertEquals('api-auth', $router->getFilter());
+        $this->assertSame('\App\Controllers\Api\PostController', $router->controllerName());
+        $this->assertSame('create', $router->methodName());
+        $this->assertSame('api-auth', $router->getFilter());
 
         // PUT
         $this->collection->group(...$group);
@@ -527,9 +473,9 @@ static function (RouteCollection $routes) {
 
         $router->handle('api/posts/50');
 
-        $this->assertEquals('\App\Controllers\Api\PostController', $router->controllerName());
-        $this->assertEquals('update', $router->methodName());
-        $this->assertEquals('api-auth', $router->getFilter());
+        $this->assertSame('\App\Controllers\Api\PostController', $router->controllerName());
+        $this->assertSame('update', $router->methodName());
+        $this->assertSame('api-auth', $router->getFilter());
 
         // PATCH
         $this->collection->group(...$group);
@@ -539,9 +485,9 @@ static function (RouteCollection $routes) {
 
         $router->handle('api/posts/50');
 
-        $this->assertEquals('\App\Controllers\Api\PostController', $router->controllerName());
-        $this->assertEquals('update', $router->methodName());
-        $this->assertEquals('api-auth', $router->getFilter());
+        $this->assertSame('\App\Controllers\Api\PostController', $router->controllerName());
+        $this->assertSame('update', $router->methodName());
+        $this->assertSame('api-auth', $router->getFilter());
 
         // DELETE
         $this->collection->group(...$group);
@@ -551,13 +497,11 @@ static function (RouteCollection $routes) {
 
         $router->handle('api/posts/50');
 
-        $this->assertEquals('\App\Controllers\Api\PostController', $router->controllerName());
-        $this->assertEquals('delete', $router->methodName());
-        $this->assertEquals('api-auth', $router->getFilter());
+        $this->assertSame('\App\Controllers\Api\PostController', $router->controllerName());
+        $this->assertSame('delete', $router->methodName());
+        $this->assertSame('api-auth', $router->getFilter());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/1240
      */
@@ -573,24 +517,22 @@ public function testMatchesCorrectlyWithMixedVerbs()
         $router = new Router($this->collection, $this->request);
 
         $router->handle('/');
-        $this->assertEquals('\Home', $router->controllerName());
-        $this->assertEquals('index', $router->methodName());
+        $this->assertSame('\Home', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
 
         $router->handle('news');
-        $this->assertEquals('\News', $router->controllerName());
-        $this->assertEquals('index', $router->methodName());
+        $this->assertSame('\News', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
 
         $router->handle('news/daily');
-        $this->assertEquals('\News', $router->controllerName());
-        $this->assertEquals('view', $router->methodName());
+        $this->assertSame('\News', $router->controllerName());
+        $this->assertSame('view', $router->methodName());
 
         $router->handle('about');
-        $this->assertEquals('\Pages', $router->controllerName());
-        $this->assertEquals('view', $router->methodName());
+        $this->assertSame('\Pages', $router->controllerName());
+        $this->assertSame('view', $router->methodName());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/1354
      */
@@ -603,8 +545,8 @@ public function testRouteOrder()
         $this->collection->setHTTPVerb('post');
 
         $router->handle('auth');
-        $this->assertEquals('\Main', $router->controllerName());
-        $this->assertEquals('auth_post', $router->methodName());
+        $this->assertSame('\Main', $router->controllerName());
+        $this->assertSame('auth_post', $router->methodName());
     }
 
     public function testRoutePriorityOrder()
@@ -618,14 +560,14 @@ public function testRoutePriorityOrder()
         $this->collection->setHTTPVerb('get');
 
         $router->handle('module');
-        $this->assertEquals('\Main', $router->controllerName());
-        $this->assertEquals('wildcard', $router->methodName());
+        $this->assertSame('\Main', $router->controllerName());
+        $this->assertSame('wildcard', $router->methodName());
 
         $this->collection->setPrioritize();
 
         $router->handle('module');
-        $this->assertEquals('\Module', $router->controllerName());
-        $this->assertEquals('index', $router->methodName());
+        $this->assertSame('\Module', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
     }
 
     /**
@@ -639,12 +581,10 @@ public function testTranslateURIDashes()
 
         $router->setTranslateURIDashes(true);
 
-        $this->assertEquals('\User_setting', $router->controllerName());
-        $this->assertEquals('show_list', $router->methodName());
+        $this->assertSame('\User_setting', $router->controllerName());
+        $this->assertSame('show_list', $router->methodName());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/1564
      */
@@ -655,13 +595,11 @@ public function testTranslateURIDashesForParams()
 
         $router->handle('user-setting/2018-12-02');
 
-        $this->assertEquals('\User_setting', $router->controllerName());
-        $this->assertEquals('detail', $router->methodName());
-        $this->assertEquals(['2018-12-02'], $router->params());
+        $this->assertSame('\User_setting', $router->controllerName());
+        $this->assertSame('detail', $router->methodName());
+        $this->assertSame(['2018-12-02'], $router->params());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/1564
      */
@@ -672,12 +610,10 @@ public function testTranslateURIDashesForAutoRoute()
 
         $router->autoRoute('admin-user/show-list');
 
-        $this->assertEquals('Admin_user', $router->controllerName());
-        $this->assertEquals('show_list', $router->methodName());
+        $this->assertSame('Admin_user', $router->controllerName());
+        $this->assertSame('show_list', $router->methodName());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/2032
      */
@@ -687,14 +623,14 @@ public function testAutoRouteMatchesZeroParams()
 
         $router->autoRoute('myController/someMethod/0/abc');
 
-        $this->assertEquals('MyController', $router->controllerName());
-        $this->assertEquals('someMethod', $router->methodName());
+        $this->assertSame('MyController', $router->controllerName());
+        $this->assertSame('someMethod', $router->methodName());
 
         $expected = [
             '0',
             'abc',
         ];
-        $this->assertEquals($expected, $router->params());
+        $this->assertSame($expected, $router->params());
     }
 
     /**
@@ -704,12 +640,10 @@ public function testAutoRouteMethodEmpty()
     {
         $router = new Router($this->collection, $this->request);
         $router->handle('Home/');
-        $this->assertEquals('Home', $router->controllerName());
-        $this->assertEquals('index', $router->methodName());
+        $this->assertSame('Home', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/3169
      */
@@ -720,13 +654,13 @@ public function testRegularExpressionWithUnicode()
         $router = new Router($this->collection, $this->request);
 
         $router->handle('news/a0%E0%A6%80%E0%A7%BF-');
-        $this->assertEquals('\News', $router->controllerName());
-        $this->assertEquals('view', $router->methodName());
+        $this->assertSame('\News', $router->controllerName());
+        $this->assertSame('view', $router->methodName());
 
         $expected = [
             'a0ঀ৿-',
         ];
-        $this->assertEquals($expected, $router->params());
+        $this->assertSame($expected, $router->params());
     }
 
     /**
@@ -740,13 +674,13 @@ public function testRegularExpressionPlaceholderWithUnicode()
         $router = new Router($this->collection, $this->request);
 
         $router->handle('news/a0%E0%A6%80%E0%A7%BF-');
-        $this->assertEquals('\News', $router->controllerName());
-        $this->assertEquals('view', $router->methodName());
+        $this->assertSame('\News', $router->controllerName());
+        $this->assertSame('view', $router->methodName());
 
         $expected = [
             'a0ঀ৿-',
         ];
-        $this->assertEquals($expected, $router->params());
+        $this->assertSame($expected, $router->params());
     }
 
     public function testRouterPriorDirectory()
@@ -756,9 +690,9 @@ public function testRouterPriorDirectory()
         $router->setDirectory('foo/bar/baz', false, true);
         $router->handle('Some_controller/some_method/param1/param2/param3');
 
-        $this->assertEquals('foo/bar/baz/', $router->directory());
-        $this->assertEquals('Some_controller', $router->controllerName());
-        $this->assertEquals('some_method', $router->methodName());
+        $this->assertSame('foo/bar/baz/', $router->directory());
+        $this->assertSame('Some_controller', $router->controllerName());
+        $this->assertSame('some_method', $router->methodName());
     }
 
     public function testSetDirectoryValid()
@@ -766,7 +700,7 @@ public function testSetDirectoryValid()
         $router = new Router($this->collection, $this->request);
         $router->setDirectory('foo/bar/baz', false, true);
 
-        $this->assertEquals('foo/bar/baz/', $router->directory());
+        $this->assertSame('foo/bar/baz/', $router->directory());
     }
 
     public function testSetDirectoryInvalid()
@@ -777,6 +711,6 @@ public function testSetDirectoryInvalid()
         $internal = $this->getPrivateProperty($router, 'directory');
 
         $this->assertNull($internal);
-        $this->assertEquals('', $router->directory());
+        $this->assertSame('', $router->directory());
     }
 }
diff --git a/tests/system/Security/SecurityTest.php b/tests/system/Security/SecurityTest.php
index bee38f996594..0743f4b36e69 100644
--- a/tests/system/Security/SecurityTest.php
+++ b/tests/system/Security/SecurityTest.php
@@ -36,8 +36,8 @@ public function testBasicConfigIsSaved()
 
         $hash = $security->getHash();
 
-        $this->assertEquals(32, strlen($hash));
-        $this->assertEquals('csrf_test_name', $security->getTokenName());
+        $this->assertSame(32, strlen($hash));
+        $this->assertSame('csrf_test_name', $security->getTokenName());
     }
 
     public function testHashIsReadFromCookie()
@@ -46,7 +46,7 @@ public function testHashIsReadFromCookie()
 
         $security = new Security(new MockAppConfig());
 
-        $this->assertEquals('8b9218a55906f9dcc1dc263dce7f005a', $security->getHash());
+        $this->assertSame('8b9218a55906f9dcc1dc263dce7f005a', $security->getHash());
     }
 
     public function testCSRFVerifySetsCookieWhenNotPOST()
@@ -57,7 +57,7 @@ public function testCSRFVerifySetsCookieWhenNotPOST()
 
         $security->verify(new Request(new MockAppConfig()));
 
-        $this->assertEquals($_COOKIE['csrf_cookie_name'], $security->getHash());
+        $this->assertSame($_COOKIE['csrf_cookie_name'], $security->getHash());
     }
 
     public function testCSRFVerifyPostThrowsExceptionOnNoMatch()
@@ -156,7 +156,7 @@ public function testSanitizeFilename()
 
         $filename = './<!--foo-->';
 
-        $this->assertEquals('foo', $security->sanitizeFilename($filename));
+        $this->assertSame('foo', $security->sanitizeFilename($filename));
     }
 
     public function testRegenerateWithFalseSecurityRegenerateProperty()
diff --git a/tests/system/Session/SessionTest.php b/tests/system/Session/SessionTest.php
index 09f080adf7eb..ab49c2830200 100644
--- a/tests/system/Session/SessionTest.php
+++ b/tests/system/Session/SessionTest.php
@@ -86,7 +86,7 @@ public function testCanSetSingleValue()
 
         $session->set('foo', 'bar');
 
-        $this->assertEquals('bar', $_SESSION['foo']);
+        $this->assertSame('bar', $_SESSION['foo']);
     }
 
     public function testCanSetArray()
@@ -99,8 +99,8 @@ public function testCanSetArray()
             'bar' => 'baz',
         ]);
 
-        $this->assertEquals('bar', $_SESSION['foo']);
-        $this->assertEquals('baz', $_SESSION['bar']);
+        $this->assertSame('bar', $_SESSION['foo']);
+        $this->assertSame('baz', $_SESSION['bar']);
         $this->assertArrayNotHasKey('__ci_vars', $_SESSION);
     }
 
@@ -119,7 +119,7 @@ public function testCanSerializeArray()
         ];
         $session->set(['_ci_old_input' => ['location' => $locations]]);
 
-        $this->assertEquals($locations, $session->get('_ci_old_input')['location']);
+        $this->assertSame($locations, $session->get('_ci_old_input')['location']);
     }
 
     public function testGetSimpleKey()
@@ -129,7 +129,7 @@ public function testGetSimpleKey()
 
         $session->set('foo', 'bar');
 
-        $this->assertEquals('bar', $session->get('foo'));
+        $this->assertSame('bar', $session->get('foo'));
     }
 
     public function testGetReturnsNullWhenNotFound()
@@ -161,7 +161,7 @@ public function testGetReturnsEmptyArrayWhenWithXmlHttpRequest()
         $session = $this->getInstance();
         $session->start();
 
-        $this->assertEquals([], $session->get());
+        $this->assertSame([], $session->get());
     }
 
     public function testGetReturnsItemValueisZero()
@@ -199,7 +199,7 @@ public function testGetAsProperty()
 
         $session->set('foo', 'bar');
 
-        $this->assertEquals('bar', $session->foo);
+        $this->assertSame('bar', $session->foo);
     }
 
     public function testGetAsNormal()
@@ -209,7 +209,7 @@ public function testGetAsNormal()
 
         $session->set('foo', 'bar');
 
-        $this->assertEquals('bar', $_SESSION['foo']);
+        $this->assertSame('bar', $_SESSION['foo']);
     }
 
     public function testHasReturnsTrueOnSuccess()
@@ -260,7 +260,7 @@ public function testPushNewValueIntoArraySessionValue()
         $session->set('hobbies', ['cooking' => 'baking']);
         $session->push('hobbies', ['sport' => 'tennis']);
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 'cooking' => 'baking',
                 'sport'   => 'tennis',
@@ -307,7 +307,7 @@ public function testSetMagicMethod()
         $session->foo = 'bar';
 
         $this->assertArrayHasKey('foo', $_SESSION);
-        $this->assertEquals('bar', $_SESSION['foo']);
+        $this->assertSame('bar', $_SESSION['foo']);
     }
 
     public function testCanFlashData()
@@ -318,13 +318,13 @@ public function testCanFlashData()
         $session->setFlashdata('foo', 'bar');
 
         $this->assertTrue($session->has('foo'));
-        $this->assertEquals('new', $_SESSION['__ci_vars']['foo']);
+        $this->assertSame('new', $_SESSION['__ci_vars']['foo']);
 
         // Should reset the 'new' to 'old'
         $session->start();
 
         $this->assertTrue($session->has('foo'));
-        $this->assertEquals('old', $_SESSION['__ci_vars']['foo']);
+        $this->assertSame('old', $_SESSION['__ci_vars']['foo']);
 
         // Should no longer be available
         $session->start();
@@ -343,9 +343,9 @@ public function testCanFlashArray()
         ]);
 
         $this->assertTrue($session->has('foo'));
-        $this->assertEquals('new', $_SESSION['__ci_vars']['foo']);
+        $this->assertSame('new', $_SESSION['__ci_vars']['foo']);
         $this->assertTrue($session->has('bar'));
-        $this->assertEquals('new', $_SESSION['__ci_vars']['bar']);
+        $this->assertSame('new', $_SESSION['__ci_vars']['bar']);
     }
 
     public function testKeepFlashData()
@@ -356,23 +356,23 @@ public function testKeepFlashData()
         $session->setFlashdata('foo', 'bar');
 
         $this->assertTrue($session->has('foo'));
-        $this->assertEquals('new', $_SESSION['__ci_vars']['foo']);
+        $this->assertSame('new', $_SESSION['__ci_vars']['foo']);
 
         // Should reset the 'new' to 'old'
         $session->start();
 
         $this->assertTrue($session->has('foo'));
-        $this->assertEquals('old', $_SESSION['__ci_vars']['foo']);
+        $this->assertSame('old', $_SESSION['__ci_vars']['foo']);
 
         $session->keepFlashdata('foo');
 
-        $this->assertEquals('new', $_SESSION['__ci_vars']['foo']);
+        $this->assertSame('new', $_SESSION['__ci_vars']['foo']);
 
         // Should no longer be available
         $session->start();
 
         $this->assertTrue($session->has('foo'));
-        $this->assertEquals('old', $_SESSION['__ci_vars']['foo']);
+        $this->assertSame('old', $_SESSION['__ci_vars']['foo']);
     }
 
     public function testUnmarkFlashDataRemovesData()
@@ -465,7 +465,7 @@ public function testGetTestDataReturnsAll()
         $session->setTempdata($data);
         $session->set('baz', 'ballywhoo');
 
-        $this->assertEquals($data, $session->getTempdata());
+        $this->assertSame($data, $session->getTempdata());
     }
 
     public function testGetTestDataReturnsSingle()
@@ -480,7 +480,7 @@ public function testGetTestDataReturnsSingle()
 
         $session->setTempdata($data);
 
-        $this->assertEquals('bar', $session->getTempdata('foo'));
+        $this->assertSame('bar', $session->getTempdata('foo'));
     }
 
     public function testRemoveTempDataActuallyDeletes()
@@ -496,7 +496,7 @@ public function testRemoveTempDataActuallyDeletes()
         $session->setTempdata($data);
         $session->removeTempdata('foo');
 
-        $this->assertEquals(['bar' => 'baz'], $session->getTempdata());
+        $this->assertSame(['bar' => 'baz'], $session->getTempdata());
     }
 
     public function testUnMarkTempDataSingle()
@@ -512,7 +512,7 @@ public function testUnMarkTempDataSingle()
         $session->setTempdata($data);
         $session->unmarkTempdata('foo');
 
-        $this->assertEquals(['bar' => 'baz'], $session->getTempdata());
+        $this->assertSame(['bar' => 'baz'], $session->getTempdata());
     }
 
     public function testUnMarkTempDataArray()
@@ -528,7 +528,7 @@ public function testUnMarkTempDataArray()
         $session->setTempdata($data);
         $session->unmarkTempdata(['foo', 'bar']);
 
-        $this->assertEquals([], $session->getTempdata());
+        $this->assertSame([], $session->getTempdata());
     }
 
     public function testGetTempdataKeys()
@@ -544,7 +544,7 @@ public function testGetTempdataKeys()
         $session->setTempdata($data);
         $session->set('baz', 'ballywhoo');
 
-        $this->assertEquals(['foo', 'bar'], $session->getTempKeys());
+        $this->assertSame(['foo', 'bar'], $session->getTempKeys());
     }
 
     public function testGetDotKey()
@@ -552,7 +552,7 @@ public function testGetDotKey()
         $session = $this->getInstance();
         $session->start();
         $session->set('test.1', 'value');
-        $this->assertEquals('value', $session->get('test.1'));
+        $this->assertSame('value', $session->get('test.1'));
     }
 
     public function testLaxSameSite()
diff --git a/tests/system/Test/BootstrapFCPATHTest.php b/tests/system/Test/BootstrapFCPATHTest.php
index aadf61ef5ab4..5bff32d359b0 100644
--- a/tests/system/Test/BootstrapFCPATHTest.php
+++ b/tests/system/Test/BootstrapFCPATHTest.php
@@ -41,7 +41,7 @@ public function testSetFCPATH()
     {
         $result1     = $this->readOutput($this->file1);
         $correctPath = $this->correctFCPATH();
-        $this->assertEquals($correctPath, $result1);
+        $this->assertSame($correctPath, $result1);
     }
 
     private function correctFCPATH()
diff --git a/tests/system/Test/ControllerTestTraitTest.php b/tests/system/Test/ControllerTestTraitTest.php
index b9f261abed5c..846e759b00c3 100644
--- a/tests/system/Test/ControllerTestTraitTest.php
+++ b/tests/system/Test/ControllerTestTraitTest.php
@@ -83,7 +83,7 @@ public function testPopcornIndex2()
             ->execute('index');
 
         $body = $result->response()->getBody();
-        $this->assertEquals('Hi there', $body);
+        $this->assertSame('Hi there', $body);
     }
 
     public function testPopcornFailure()
@@ -94,7 +94,7 @@ public function testPopcornFailure()
             ->controller(Popcorn::class)
             ->execute('pop');
 
-        $this->assertEquals(567, $result->response()->getStatusCode());
+        $this->assertSame(567, $result->response()->getStatusCode());
     }
 
     public function testPopcornException()
@@ -105,7 +105,7 @@ public function testPopcornException()
             ->controller(Popcorn::class)
             ->execute('popper');
 
-        $this->assertEquals(500, $result->response()->getStatusCode());
+        $this->assertSame(500, $result->response()->getStatusCode());
     }
 
     public function testPopcornIndexWithSupport()
@@ -124,7 +124,7 @@ public function testPopcornIndexWithSupport()
             ->execute('index');
 
         $body = $result->response()->getBody();
-        $this->assertEquals('Hi there', $body);
+        $this->assertSame('Hi there', $body);
     }
 
     public function testRequestPassthrough()
@@ -136,7 +136,7 @@ public function testRequestPassthrough()
             ->execute('popper');
 
         $req = $result->request();
-        $this->assertEquals('get', $req->getMethod());
+        $this->assertSame('get', $req->getMethod());
     }
 
     public function testFailureResponse()
@@ -148,7 +148,7 @@ public function testFailureResponse()
             ->execute('oops');
 
         $this->assertFalse($result->isOK());
-        $this->assertEquals(401, $result->response()->getStatusCode());
+        $this->assertSame(401, $result->response()->getStatusCode());
     }
 
     public function testEmptyResponse()
@@ -208,7 +208,7 @@ public function testResponseOverriding()
             ->execute('index3');
 
         $response = json_decode($result->response()->getBody());
-        $this->assertEquals('en', $response->lang);
+        $this->assertSame('en', $response->lang);
     }
 
     /**
diff --git a/tests/system/Test/DOMParserTest.php b/tests/system/Test/DOMParserTest.php
index 98474cb9f4c5..7eee8d5612e5 100644
--- a/tests/system/Test/DOMParserTest.php
+++ b/tests/system/Test/DOMParserTest.php
@@ -26,7 +26,7 @@ public function testCanRoundTripHTML()
         $expected = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">' . "\n"
                 . '<html><body><div><h1>Hello</h1></div></body></html>';
 
-        $this->assertEquals($expected . "\n", $dom->withString($html)->getBody());
+        $this->assertSame($expected . "\n", $dom->withString($html)->getBody());
     }
 
     public function testParseSelectorWithID()
@@ -35,8 +35,8 @@ public function testParseSelectorWithID()
 
         $selector = $dom->parseSelector('div#row');
 
-        $this->assertEquals('div', $selector['tag']);
-        $this->assertEquals('row', $selector['id']);
+        $this->assertSame('div', $selector['tag']);
+        $this->assertSame('row', $selector['id']);
     }
 
     public function testParseSelectorWithClass()
@@ -45,8 +45,8 @@ public function testParseSelectorWithClass()
 
         $selector = $dom->parseSelector('div.row');
 
-        $this->assertEquals('div', $selector['tag']);
-        $this->assertEquals('row', $selector['class']);
+        $this->assertSame('div', $selector['tag']);
+        $this->assertSame('row', $selector['class']);
     }
 
     public function testParseSelectorWithClassMultiple()
@@ -55,9 +55,9 @@ public function testParseSelectorWithClassMultiple()
 
         $selector = $dom->parseSelector('div.row.another');
 
-        $this->assertEquals('div', $selector['tag']);
+        $this->assertSame('div', $selector['tag']);
         // Only parses the first class
-        $this->assertEquals('row', $selector['class']);
+        $this->assertSame('row', $selector['class']);
     }
 
     public function testParseSelectorWithAttribute()
@@ -66,8 +66,8 @@ public function testParseSelectorWithAttribute()
 
         $selector = $dom->parseSelector('a[ href = http://example.com ]');
 
-        $this->assertEquals('a', $selector['tag']);
-        $this->assertEquals(['href' => 'http://example.com'], $selector['attr']);
+        $this->assertSame('a', $selector['tag']);
+        $this->assertSame(['href' => 'http://example.com'], $selector['attr']);
     }
 
     public function provideText()
@@ -394,7 +394,7 @@ public function testSeeAttribute()
         $path     = '[ name = user ]';
         $selector = $dom->parseSelector($path);
 
-        $this->assertEquals(['name' => 'user'], $selector['attr']);
+        $this->assertSame(['name' => 'user'], $selector['attr']);
 
         $html = '<html><body><div name="user">George</div></body></html>';
         $dom->withString($html);
diff --git a/tests/system/Test/FabricatorTest.php b/tests/system/Test/FabricatorTest.php
index 4d8e39693c32..c92ac6fb7839 100644
--- a/tests/system/Test/FabricatorTest.php
+++ b/tests/system/Test/FabricatorTest.php
@@ -65,21 +65,21 @@ public function testConstructorSetsFormatters()
     {
         $fabricator = new Fabricator(UserModel::class, $this->formatters);
 
-        $this->assertEquals($this->formatters, $fabricator->getFormatters());
+        $this->assertSame($this->formatters, $fabricator->getFormatters());
     }
 
     public function testConstructorGuessesFormatters()
     {
         $fabricator = new Fabricator(UserModel::class, null);
 
-        $this->assertEquals($this->formatters, $fabricator->getFormatters());
+        $this->assertSame($this->formatters, $fabricator->getFormatters());
     }
 
     public function testConstructorDefaultsToAppLocale()
     {
         $fabricator = new Fabricator(UserModel::class);
 
-        $this->assertEquals(config('App')->defaultLocale, $fabricator->getLocale());
+        $this->assertSame(config('App')->defaultLocale, $fabricator->getLocale());
     }
 
     public function testConstructorUsesProvidedLocale()
@@ -88,7 +88,7 @@ public function testConstructorUsesProvidedLocale()
 
         $fabricator = new Fabricator(UserModel::class, null, $locale);
 
-        $this->assertEquals($locale, $fabricator->getLocale());
+        $this->assertSame($locale, $fabricator->getLocale());
     }
 
     //--------------------------------------------------------------------
@@ -131,7 +131,7 @@ public function testSetFormattersChangesFormatters()
 
         $fabricator->setFormatters($formatters);
 
-        $this->assertEquals($formatters, $fabricator->getFormatters());
+        $this->assertSame($formatters, $fabricator->getFormatters());
     }
 
     public function testSetFormattersDetectsFormatters()
@@ -141,7 +141,7 @@ public function testSetFormattersDetectsFormatters()
 
         $fabricator->setFormatters();
 
-        $this->assertEquals($this->formatters, $fabricator->getFormatters());
+        $this->assertSame($this->formatters, $fabricator->getFormatters());
     }
 
     public function testDetectFormattersDetectsFormatters()
@@ -153,7 +153,7 @@ public function testDetectFormattersDetectsFormatters()
 
         $method();
 
-        $this->assertEquals($this->formatters, $fabricator->getFormatters());
+        $this->assertSame($this->formatters, $fabricator->getFormatters());
     }
 
     //--------------------------------------------------------------------
@@ -165,7 +165,7 @@ public function testSetOverridesSets()
 
         $fabricator->setOverrides($overrides);
 
-        $this->assertEquals($overrides, $fabricator->getOverrides());
+        $this->assertSame($overrides, $fabricator->getOverrides());
     }
 
     public function testSetOverridesDefaultPersists()
@@ -176,7 +176,7 @@ public function testSetOverridesDefaultPersists()
         $fabricator->setOverrides($overrides);
         $fabricator->getOverrides();
 
-        $this->assertEquals($overrides, $fabricator->getOverrides());
+        $this->assertSame($overrides, $fabricator->getOverrides());
     }
 
     public function testSetOverridesOnce()
@@ -187,7 +187,7 @@ public function testSetOverridesOnce()
         $fabricator->setOverrides($overrides, false);
         $fabricator->getOverrides();
 
-        $this->assertEquals([], $fabricator->getOverrides());
+        $this->assertSame([], $fabricator->getOverrides());
     }
 
     //--------------------------------------------------------------------
@@ -201,7 +201,7 @@ public function testGuessFormattersReturnsActual()
         $field     = 'catchPhrase';
         $formatter = $method($field);
 
-        $this->assertEquals($field, $formatter);
+        $this->assertSame($field, $formatter);
     }
 
     public function testGuessFormattersFieldReturnsDateFormat()
@@ -213,7 +213,7 @@ public function testGuessFormattersFieldReturnsDateFormat()
         $field     = 'created_at';
         $formatter = $method($field);
 
-        $this->assertEquals('date', $formatter);
+        $this->assertSame('date', $formatter);
     }
 
     public function testGuessFormattersPrimaryReturnsNumberBetween()
@@ -225,7 +225,7 @@ public function testGuessFormattersPrimaryReturnsNumberBetween()
         $field     = 'id';
         $formatter = $method($field);
 
-        $this->assertEquals('numberBetween', $formatter);
+        $this->assertSame('numberBetween', $formatter);
     }
 
     public function testGuessFormattersMatchesPartial()
@@ -237,7 +237,7 @@ public function testGuessFormattersMatchesPartial()
         $field     = 'business_email';
         $formatter = $method($field);
 
-        $this->assertEquals('email', $formatter);
+        $this->assertSame('email', $formatter);
     }
 
     public function testGuessFormattersFallback()
@@ -249,7 +249,7 @@ public function testGuessFormattersFallback()
         $field     = 'zaboomafoo';
         $formatter = $method($field);
 
-        $this->assertEquals($fabricator->defaultFormatter, $formatter);
+        $this->assertSame($fabricator->defaultFormatter, $formatter);
     }
 
     //--------------------------------------------------------------------
@@ -272,7 +272,7 @@ public function testMakeArrayUsesOverrides()
 
         $result = $fabricator->makeArray();
 
-        $this->assertEquals($overrides['name'], $result['name']);
+        $this->assertSame($overrides['name'], $result['name']);
     }
 
     public function testMakeArrayReturnsValidData()
@@ -281,7 +281,7 @@ public function testMakeArrayReturnsValidData()
 
         $result = $fabricator->makeArray();
 
-        $this->assertEquals($result['email'], filter_var($result['email'], FILTER_VALIDATE_EMAIL));
+        $this->assertSame($result['email'], filter_var($result['email'], FILTER_VALIDATE_EMAIL));
     }
 
     public function testMakeArrayUsesFakeMethod()
@@ -290,7 +290,7 @@ public function testMakeArrayUsesFakeMethod()
 
         $result = $fabricator->makeArray();
 
-        $this->assertEquals($result['name'], filter_var($result['name'], FILTER_VALIDATE_IP));
+        $this->assertSame($result['name'], filter_var($result['name'], FILTER_VALIDATE_IP));
     }
 
     //--------------------------------------------------------------------
@@ -342,7 +342,7 @@ public function testMakeObjectUsesOverrides()
 
         $result = $fabricator->makeObject();
 
-        $this->assertEquals($overrides['name'], $result->name);
+        $this->assertSame($overrides['name'], $result->name);
     }
 
     public function testMakeObjectReturnsValidData()
@@ -351,7 +351,7 @@ public function testMakeObjectReturnsValidData()
 
         $result = $fabricator->makeObject();
 
-        $this->assertEquals($result->email, filter_var($result->email, FILTER_VALIDATE_EMAIL));
+        $this->assertSame($result->email, filter_var($result->email, FILTER_VALIDATE_EMAIL));
     }
 
     public function testMakeObjectUsesFakeMethod()
@@ -360,7 +360,7 @@ public function testMakeObjectUsesFakeMethod()
 
         $result = $fabricator->makeObject();
 
-        $this->assertEquals($result->name, filter_var($result->name, FILTER_VALIDATE_IP));
+        $this->assertSame($result->name, filter_var($result->name, FILTER_VALIDATE_IP));
     }
 
     //--------------------------------------------------------------------
@@ -427,7 +427,7 @@ public function testSetCountReturnsCount()
     {
         $result = Fabricator::setCount('goblins', 42);
 
-        $this->assertEquals(42, $result);
+        $this->assertSame(42, $result);
     }
 
     public function testSetCountSetsValue()
@@ -435,14 +435,14 @@ public function testSetCountSetsValue()
         Fabricator::setCount('trolls', 3);
         $result = Fabricator::getCount('trolls');
 
-        $this->assertEquals(3, $result);
+        $this->assertSame(3, $result);
     }
 
     public function testGetCountNewTableReturnsZero()
     {
         $result = Fabricator::getCount('gremlins');
 
-        $this->assertEquals(0, $result);
+        $this->assertSame(0, $result);
     }
 
     public function testUpCountIncrementsValue()
@@ -450,7 +450,7 @@ public function testUpCountIncrementsValue()
         Fabricator::setCount('orcs', 12);
         Fabricator::upCount('orcs');
 
-        $this->assertEquals(13, Fabricator::getCount('orcs'));
+        $this->assertSame(13, Fabricator::getCount('orcs'));
     }
 
     public function testUpCountReturnsValue()
@@ -458,14 +458,14 @@ public function testUpCountReturnsValue()
         Fabricator::setCount('hobgoblins', 12);
         $result = Fabricator::upCount('hobgoblins');
 
-        $this->assertEquals(13, $result);
+        $this->assertSame(13, $result);
     }
 
     public function testUpCountNewTableReturnsOne()
     {
         $result = Fabricator::upCount('ogres');
 
-        $this->assertEquals(1, $result);
+        $this->assertSame(1, $result);
     }
 
     public function testDownCountDecrementsValue()
@@ -473,7 +473,7 @@ public function testDownCountDecrementsValue()
         Fabricator::setCount('orcs', 12);
         Fabricator::downCount('orcs');
 
-        $this->assertEquals(11, Fabricator::getCount('orcs'));
+        $this->assertSame(11, Fabricator::getCount('orcs'));
     }
 
     public function testDownCountReturnsValue()
@@ -481,14 +481,14 @@ public function testDownCountReturnsValue()
         Fabricator::setCount('hobgoblins', 12);
         $result = Fabricator::downCount('hobgoblins');
 
-        $this->assertEquals(11, $result);
+        $this->assertSame(11, $result);
     }
 
     public function testDownCountNewTableReturnsNegativeOne()
     {
         $result = Fabricator::downCount('ogres');
 
-        $this->assertEquals(-1, $result);
+        $this->assertSame(-1, $result);
     }
 
     public function testResetClearsValue()
@@ -496,6 +496,6 @@ public function testResetClearsValue()
         Fabricator::setCount('giants', 1000);
         Fabricator::resetCounts();
 
-        $this->assertEquals(0, Fabricator::getCount('giants'));
+        $this->assertSame(0, Fabricator::getCount('giants'));
     }
 }
diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php
index 3e5d9a1abb08..27eb76a3f500 100644
--- a/tests/system/Test/FeatureTestTraitTest.php
+++ b/tests/system/Test/FeatureTestTraitTest.php
@@ -59,8 +59,8 @@ static function () {
         $this->assertInstanceOf(TestResponse::class, $response);
         $this->assertInstanceOf(Response::class, $response->response());
         $this->assertTrue($response->isOK());
-        $this->assertEquals('Hello Earth', $response->response()->getBody());
-        $this->assertEquals(200, $response->response()->getStatusCode());
+        $this->assertSame('Hello Earth', $response->response()->getBody());
+        $this->assertSame(200, $response->response()->getStatusCode());
     }
 
     public function testCallPost()
@@ -369,7 +369,7 @@ public function testSetupRequestBodyWithXml()
 <response><foo>bar</foo></response>
 ';
 
-        $this->assertEquals($expectedXml, $request->getBody());
+        $this->assertSame($expectedXml, $request->getBody());
         $this->assertTrue($request->header('Content-Type')->getValue() === 'application/xml');
     }
 
@@ -379,6 +379,6 @@ public function testSetupRequestBodyWithBody()
 
         $request = $this->withBody('test')->setRequestBody($request);
 
-        $this->assertEquals('test', $request->getBody());
+        $this->assertSame('test', $request->getBody());
     }
 }
diff --git a/tests/system/Test/FilterTestTraitTest.php b/tests/system/Test/FilterTestTraitTest.php
index 149426b4fa2f..b7567ae437a0 100644
--- a/tests/system/Test/FilterTestTraitTest.php
+++ b/tests/system/Test/FilterTestTraitTest.php
@@ -67,14 +67,14 @@ public function testCallerUsesClonedInstance()
         $this->assertObjectNotHasAttribute('url', $this->request);
 
         $this->assertObjectHasAttribute('url', $result);
-        $this->assertEquals('http://hellowworld.com', $result->url);
+        $this->assertSame('http://hellowworld.com', $result->url);
     }
 
     public function testGetFiltersForRoute()
     {
         $result = $this->getFiltersForRoute('/', 'before');
 
-        $this->assertEquals(['test-customfilter'], $result);
+        $this->assertSame(['test-customfilter'], $result);
     }
 
     public function testAssertFilter()
diff --git a/tests/system/Test/ReflectionHelperTest.php b/tests/system/Test/ReflectionHelperTest.php
index 6565bcccb09c..23ccb3605098 100644
--- a/tests/system/Test/ReflectionHelperTest.php
+++ b/tests/system/Test/ReflectionHelperTest.php
@@ -11,14 +11,14 @@ public function testGetPrivatePropertyWithObject()
     {
         $obj    = new __TestForReflectionHelper();
         $actual = $this->getPrivateProperty($obj, 'private');
-        $this->assertEquals('secret', $actual);
+        $this->assertSame('secret', $actual);
     }
 
     public function testGetPrivatePropertyWithObjectStaticCall()
     {
         $obj    = new __TestForReflectionHelper();
         $actual = CIUnitTestCase::getPrivateProperty($obj, 'private');
-        $this->assertEquals('secret', $actual);
+        $this->assertSame('secret', $actual);
     }
 
     public function testGetPrivatePropertyWithStatic()
@@ -27,7 +27,7 @@ public function testGetPrivatePropertyWithStatic()
             __TestForReflectionHelper::class,
             'static_private'
         );
-        $this->assertEquals('xyz', $actual);
+        $this->assertSame('xyz', $actual);
     }
 
     public function testSetPrivatePropertyWithObject()
@@ -38,7 +38,7 @@ public function testSetPrivatePropertyWithObject()
             'private',
             'open'
         );
-        $this->assertEquals('open', $obj->getPrivate());
+        $this->assertSame('open', $obj->getPrivate());
     }
 
     public function testSetPrivatePropertyWithStatic()
@@ -48,7 +48,7 @@ public function testSetPrivatePropertyWithStatic()
             'static_private',
             'abc'
         );
-        $this->assertEquals(
+        $this->assertSame(
             'abc',
             __TestForReflectionHelper::getStaticPrivate()
         );
@@ -61,7 +61,7 @@ public function testGetPrivateMethodInvokerWithObject()
             $obj,
             'privateMethod'
         );
-        $this->assertEquals(
+        $this->assertSame(
             'private param1param2',
             $method('param1', 'param2')
         );
@@ -73,7 +73,7 @@ public function testGetPrivateMethodInvokerWithStatic()
             __TestForReflectionHelper::class,
             'privateStaticMethod'
         );
-        $this->assertEquals(
+        $this->assertSame(
             'private_static param1param2',
             $method('param1', 'param2')
         );
diff --git a/tests/system/Test/TestCaseTest.php b/tests/system/Test/TestCaseTest.php
index 1295e547dece..6c0306b856df 100644
--- a/tests/system/Test/TestCaseTest.php
+++ b/tests/system/Test/TestCaseTest.php
@@ -26,7 +26,7 @@ public function testGetPrivatePropertyWithObject()
     {
         $obj    = new __TestForReflectionHelper();
         $actual = $this->getPrivateProperty($obj, 'private');
-        $this->assertEquals('secret', $actual);
+        $this->assertSame('secret', $actual);
     }
 
     //--------------------------------------------------------------------
@@ -58,7 +58,7 @@ public function testStreamFilter()
         $this->stream_filter        = stream_filter_append(STDOUT, 'CITestStreamFilter');
         CLI::write('first.');
         $expected = "first.\n";
-        $this->assertEquals($expected, CITestStreamFilter::$buffer);
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
         stream_filter_remove($this->stream_filter);
     }
 
diff --git a/tests/system/Test/TestResponseTest.php b/tests/system/Test/TestResponseTest.php
index 73d8e8010410..83050190b791 100644
--- a/tests/system/Test/TestResponseTest.php
+++ b/tests/system/Test/TestResponseTest.php
@@ -38,7 +38,7 @@ public function testIsOK(int $code, bool $isOk)
         $this->getTestResponse('Hello World');
         $this->response->setStatusCode($code);
 
-        $this->assertEquals($isOk, $this->testResponse->isOK());
+        $this->assertSame($isOk, $this->testResponse->isOK());
     }
 
     /**
@@ -167,7 +167,7 @@ public function testAssertRedirectSuccessWithoutRedirectResponse()
         $this->assertFalse($this->testResponse->response() instanceof RedirectResponse);
         $this->assertTrue($this->testResponse->isRedirect());
         $this->testResponse->assertRedirect();
-        $this->assertEquals('foo/bar', $this->testResponse->getRedirectUrl());
+        $this->assertSame('foo/bar', $this->testResponse->getRedirectUrl());
     }
 
     public function testGetRedirectUrlReturnsUrl()
@@ -176,7 +176,7 @@ public function testGetRedirectUrlReturnsUrl()
         $this->testResponse->setResponse(new RedirectResponse(new App()));
         $this->testResponse->response()->redirect('foo/bar');
 
-        $this->assertEquals('foo/bar', $this->testResponse->getRedirectUrl());
+        $this->assertSame('foo/bar', $this->testResponse->getRedirectUrl());
     }
 
     public function testGetRedirectUrlReturnsNull()
@@ -300,7 +300,7 @@ public function testGetJSON()
         $this->getTestResponse(['foo' => 'bar']);
         $formatter = Services::format()->getFormatter('application/json');
 
-        $this->assertEquals($formatter->format(['foo' => 'bar']), $this->testResponse->getJSON());
+        $this->assertSame($formatter->format(['foo' => 'bar']), $this->testResponse->getJSON());
     }
 
     public function testEmptyJSON()
@@ -309,7 +309,7 @@ public function testEmptyJSON()
         $this->response->setJSON('', true);
 
         // this should be "" - json_encode('');
-        $this->assertEquals('""', $this->testResponse->getJSON());
+        $this->assertSame('""', $this->testResponse->getJSON());
     }
 
     public function testFalseJSON()
@@ -318,7 +318,7 @@ public function testFalseJSON()
         $this->response->setJSON(false, true);
 
         // this should be FALSE - json_encode(false)
-        $this->assertEquals('false', $this->testResponse->getJSON());
+        $this->assertSame('false', $this->testResponse->getJSON());
     }
 
     public function testTrueJSON()
@@ -327,7 +327,7 @@ public function testTrueJSON()
         $this->response->setJSON(true, true);
 
         // this should be TRUE - json_encode(true)
-        $this->assertEquals('true', $this->testResponse->getJSON());
+        $this->assertSame('true', $this->testResponse->getJSON());
     }
 
     public function testInvalidJSON()
@@ -345,7 +345,7 @@ public function testGetXML()
         $this->getTestResponse(['foo' => 'bar']);
         $formatter = Services::format()->getFormatter('application/xml');
 
-        $this->assertEquals($formatter->format(['foo' => 'bar']), $this->testResponse->getXML());
+        $this->assertSame($formatter->format(['foo' => 'bar']), $this->testResponse->getXML());
     }
 
     public function testJsonFragment()
diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php
index a3f1bf412558..19a9f1641d74 100644
--- a/tests/system/Throttle/ThrottleTest.php
+++ b/tests/system/Throttle/ThrottleTest.php
@@ -22,14 +22,14 @@ public function testTokenTime()
         $throttler = new Throttler($this->cache);
 
         // tokenTime should be 0 to start
-        $this->assertEquals(0, $throttler->getTokenTime());
+        $this->assertSame(0, $throttler->getTokenTime());
 
         // set $rate
         $rate = 1;    // allow 1 request per minute
 
         // first check just creates a bucket, so tokenTime should be 0
         $throttler->check('127.0.0.1', $rate, MINUTE);
-        $this->assertEquals(0, $throttler->getTokenTime());
+        $this->assertSame(0, $throttler->getTokenTime());
 
         // additional check affects tokenTime, so tokenTime should be 1 or greater
         $throttler->check('127.0.0.1', $rate, MINUTE);
@@ -41,7 +41,7 @@ public function testIPSavesBucket()
         $throttler = new Throttler($this->cache);
 
         $this->assertTrue($throttler->check('127.0.0.1', 60, MINUTE));
-        $this->assertEquals(59, $this->cache->get('throttler_127.0.0.1'));
+        $this->assertSame(59, $this->cache->get('throttler_127.0.0.1'));
     }
 
     public function testRemove()
@@ -68,7 +68,7 @@ public function testDecrementsValues()
         $throttler->check('127.0.0.1', 60, MINUTE);
         $throttler->check('127.0.0.1', 60, MINUTE);
 
-        $this->assertEquals(57, $this->cache->get('throttler_127.0.0.1'));
+        $this->assertSame(57, $this->cache->get('throttler_127.0.0.1'));
     }
 
     public function testReturnsFalseIfBucketEmpty()
@@ -87,7 +87,7 @@ public function testCosting()
         $rate = 60; // allow 1 per second
         $cost = 10;
         $throttler->check('127.0.0.1', $rate, MINUTE, $cost);
-        $this->assertEquals($rate - $cost, $this->cache->get('throttler_127.0.0.1'));
+        $this->assertSame($rate - $cost, $this->cache->get('throttler_127.0.0.1'));
     }
 
     public function testUnderload()
@@ -96,12 +96,12 @@ public function testUnderload()
 
         $rate = 120; // allow 2 per second, in theory
         $throttler->check('127.0.0.1', $rate, MINUTE);
-        $this->assertEquals($rate - 1, $this->cache->get('throttler_127.0.0.1'));
+        $this->assertSame($rate - 1, $this->cache->get('throttler_127.0.0.1'));
 
         $throttler->setTestTime(strtotime('+2 seconds')); // should be more tokens available
         $this->assertTrue($throttler->check('127.0.0.1', $rate, MINUTE));
         // but the bucket should not be over-filled
-        $this->assertEquals($rate - 1, $this->cache->get('throttler_127.0.0.1'));
+        $this->assertSame($rate - 1, $this->cache->get('throttler_127.0.0.1'));
     }
 
     public function testOverload()
@@ -130,11 +130,11 @@ public function testFlooding()
 
         // Should be empty now.
         $this->assertFalse($throttler->check('127.0.0.1', $rate, MINUTE, $cost));
-        $this->assertEquals(0, $this->cache->get('throttler_127.0.0.1'));
+        $this->assertSame(0, $this->cache->get('throttler_127.0.0.1'));
 
         $throttler = $throttler->setTestTime(strtotime('+10 seconds'));
 
         $this->assertTrue($throttler->check('127.0.0.1', $rate, MINUTE, 0));
-        $this->assertEquals(10, round($this->cache->get('throttler_127.0.0.1')));
+        $this->assertSame(10.0, round($this->cache->get('throttler_127.0.0.1')));
     }
 }
diff --git a/tests/system/Typography/TypographyTest.php b/tests/system/Typography/TypographyTest.php
index 9ecf59d7b12c..9ed3646a07d5 100644
--- a/tests/system/Typography/TypographyTest.php
+++ b/tests/system/Typography/TypographyTest.php
@@ -19,7 +19,7 @@ protected function setUp(): void
 
     public function testAutoTypographyEmptyString()
     {
-        $this->assertEquals('', $this->typography->autoTypography(''));
+        $this->assertSame('', $this->typography->autoTypography(''));
     }
 
     public function testAutoTypographyNormalString()
@@ -30,7 +30,7 @@ public function testAutoTypographyNormalString()
         ];
 
         foreach ($strs as $str => $expect) {
-            $this->assertEquals($expect, $this->typography->autoTypography($str));
+            $this->assertSame($expect, $this->typography->autoTypography($str));
         }
     }
 
@@ -42,7 +42,7 @@ public function testAutoTypographyMultipleSpaces()
         ];
 
         foreach ($strs as $str => $expect) {
-            $this->assertEquals($expect, $this->typography->autoTypography($str));
+            $this->assertSame($expect, $this->typography->autoTypography($str));
         }
     }
 
@@ -62,7 +62,7 @@ public function testAutoTypographyLineBreaks()
         ];
 
         foreach ($strs as $str => $expect) {
-            $this->assertEquals($expect, $this->typography->autoTypography($str));
+            $this->assertSame($expect, $this->typography->autoTypography($str));
         }
     }
 
@@ -82,7 +82,7 @@ public function testAutoTypographyReduceLineBreaks()
         ];
 
         foreach ($strs as $str => $expect) {
-            $this->assertEquals($expect, $this->typography->autoTypography($str, true));
+            $this->assertSame($expect, $this->typography->autoTypography($str, true));
         }
     }
 
@@ -95,7 +95,7 @@ public function testAutoTypographyHTMLComment()
         ];
 
         foreach ($strs as $str => $expect) {
-            $this->assertEquals($expect, $this->typography->autoTypography($str));
+            $this->assertSame($expect, $this->typography->autoTypography($str));
         }
     }
 
@@ -110,7 +110,7 @@ public function testAutoTypographyHTMLTags()
         ];
 
         foreach ($strs as $str => $expect) {
-            $this->assertEquals($expect, $this->typography->autoTypography($str));
+            $this->assertSame($expect, $this->typography->autoTypography($str));
         }
     }
 
@@ -123,7 +123,7 @@ public function testAutoTypographySpecialCharacters()
         ];
 
         foreach ($strs as $str => $expect) {
-            $this->assertEquals($expect, $this->typography->autoTypography($str));
+            $this->assertSame($expect, $this->typography->autoTypography($str));
         }
     }
 
@@ -136,7 +136,7 @@ public function testNewlinesToHTMLLineBreaksExceptWithinPRE()
         ];
 
         foreach ($strs as $str => $expect) {
-            $this->assertEquals($expect, $this->typography->nl2brExceptPre($str));
+            $this->assertSame($expect, $this->typography->nl2brExceptPre($str));
         }
     }
 }
diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php
index e5a1ee1343c4..6a580fbea596 100644
--- a/tests/system/Validation/CreditCardRulesTest.php
+++ b/tests/system/Validation/CreditCardRulesTest.php
@@ -66,7 +66,7 @@ public function testValidCCNumber($type, $number, $expected = false)
             'cc' => "valid_cc_number[{$type}]",
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php
index f5be8b078281..2c998d628f8a 100644
--- a/tests/system/Validation/FormatRulesTest.php
+++ b/tests/system/Validation/FormatRulesTest.php
@@ -88,7 +88,7 @@ public function testValidURL(?string $url, bool $expected)
             'foo' => 'valid_url',
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     public function urlProvider()
@@ -171,7 +171,7 @@ public function testValidEmail($email, $expected)
             'foo' => 'valid_email',
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     /**
@@ -190,7 +190,7 @@ public function testValidEmails($email, $expected)
             'foo' => 'valid_emails',
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     public function emailProviderSingle()
@@ -258,7 +258,7 @@ public function testValidIP($ip, $which, $expected)
             'foo' => "valid_ip[{$which}]",
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     public function ipProvider()
@@ -328,7 +328,7 @@ public function testString($str, $expected)
             'foo' => 'string',
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     public function stringProvider()
@@ -365,7 +365,7 @@ public function testAlpha($str, $expected)
             'foo' => 'alpha',
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     public function alphaProvider()
@@ -412,7 +412,7 @@ public function testAlphaSpace($value, $expected)
             'foo' => 'alpha_space',
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     public function alphaSpaceProvider()
@@ -461,7 +461,7 @@ public function testAlphaNumeric($str, $expected)
             'foo' => 'alpha_numeric',
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     public function alphaNumericProvider()
@@ -502,7 +502,7 @@ public function testAlphaNumericPunct($str, $expected)
             'foo' => 'alpha_numeric_punct',
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     public function alphaNumericPunctProvider()
@@ -599,7 +599,7 @@ public function testAlphaNumericSpace($str, $expected)
             'foo' => 'alpha_numeric_space',
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     public function alphaNumericSpaceProvider()
@@ -640,7 +640,7 @@ public function testAlphaDash($str, $expected)
             'foo' => 'alpha_dash',
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     public function alphaDashProvider()
@@ -681,7 +681,7 @@ public function testHex($str, $expected)
             'foo' => 'hex',
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     public function hexProvider()
@@ -722,7 +722,7 @@ public function testNumeric($str, $expected)
             'foo' => 'numeric',
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     public function numericProvider()
@@ -779,7 +779,7 @@ public function testInteger($str, $expected)
             'foo' => 'integer',
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     public function integerProvider()
@@ -836,7 +836,7 @@ public function testDecimal($str, $expected)
             'foo' => 'decimal',
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     public function decimalProvider()
@@ -897,7 +897,7 @@ public function testNatural($first, $expected)
             'foo' => 'is_natural',
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     public function naturalProvider()
@@ -942,7 +942,7 @@ public function testNaturalNoZero($first, $expected)
             'foo' => 'is_natural_no_zero',
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     public function naturalZeroProvider()
@@ -987,7 +987,7 @@ public function testBase64($first, $expected)
             'foo' => 'valid_base64',
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     public function base64Provider()
@@ -1024,7 +1024,7 @@ public function testJson($first, $expected)
             'foo' => 'valid_json',
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     public function jsonProvider()
@@ -1085,7 +1085,7 @@ public function testTimeZone($value, $expected)
             'foo' => 'timezone',
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     public function timezoneProvider()
@@ -1127,7 +1127,7 @@ public function testValidDate($str, $format, $expected)
             'foo' => "valid_date[{$format}]",
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     public function validDateProvider()
diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
index 441e90cfc407..536a48e3e087 100644
--- a/tests/system/Validation/RulesTest.php
+++ b/tests/system/Validation/RulesTest.php
@@ -158,7 +158,7 @@ public function testIfExist($rules, $data, $expected)
     {
         $this->validation->setRules($rules);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     //--------------------------------------------------------------------
@@ -214,7 +214,7 @@ public function testEmptys($rules, $data, $expected)
     {
         $this->validation->setRules($rules);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     //--------------------------------------------------------------------
@@ -1167,7 +1167,7 @@ public function testGreaterThan($first, $second, $expected)
             'foo' => "greater_than[{$second}]",
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     //--------------------------------------------------------------------
@@ -1226,7 +1226,7 @@ public function testGreaterThanEqual($first, $second, $expected)
             'foo' => "greater_than_equal_to[{$second}]",
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     //--------------------------------------------------------------------
@@ -1290,7 +1290,7 @@ public function testLessThan($first, $second, $expected)
             'foo' => "less_than[{$second}]",
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     //--------------------------------------------------------------------
@@ -1354,7 +1354,7 @@ public function testLessEqualThan($first, $second, $expected)
             'foo' => "less_than_equal_to[{$second}]",
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     //--------------------------------------------------------------------
@@ -1424,7 +1424,7 @@ public function testInList($first, $second, $expected)
             'foo' => "in_list[{$second}]",
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     //--------------------------------------------------------------------
@@ -1448,7 +1448,7 @@ public function testNotInList($first, $second, $expected)
             'foo' => "not_in_list[{$second}]",
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     //--------------------------------------------------------------------
@@ -1530,7 +1530,7 @@ public function testRequiredWith($field, $check, $expected = false)
             $field => "required_with[{$check}]",
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     //--------------------------------------------------------------------
@@ -1617,7 +1617,7 @@ public function testRequiredWithout($field, $check, $expected = false)
             $field => "required_without[{$check}]",
         ]);
 
-        $this->assertEquals($expected, $this->validation->run($data));
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index 40f2a3d92447..a605df6a7c4f 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -84,7 +84,7 @@ public function testSetRulesStoresRules()
 
         $this->validation->setRules($rules);
 
-        $this->assertEquals($rules, $this->validation->getRules());
+        $this->assertSame($rules, $this->validation->getRules());
     }
 
     //--------------------------------------------------------------------
@@ -124,7 +124,7 @@ public function testRunReturnsLocalizedErrors()
         ]);
 
         $this->assertFalse($this->validation->run($data));
-        $this->assertEquals('Validation.is_numeric', $this->validation->getError('foo'));
+        $this->assertSame('Validation.is_numeric', $this->validation->getError('foo'));
     }
 
     //--------------------------------------------------------------------
@@ -146,7 +146,7 @@ public function testRunWithCustomErrors()
         ], $messages);
 
         $this->validation->run($data);
-        $this->assertEquals('Nope. Not a number.', $this->validation->getError('foo'));
+        $this->assertSame('Nope. Not a number.', $this->validation->getError('foo'));
     }
 
     //--------------------------------------------------------------------
@@ -161,7 +161,7 @@ public function testCheck()
     public function testCheckLocalizedError()
     {
         $this->assertFalse($this->validation->check('notanumber', 'is_numeric'));
-        $this->assertEquals('Validation.is_numeric', $this->validation->getError());
+        $this->assertSame('Validation.is_numeric', $this->validation->getError());
     }
 
     //--------------------------------------------------------------------
@@ -171,7 +171,7 @@ public function testCheckCustomError()
         $this->validation->check('notanumber', 'is_numeric', [
             'is_numeric' => 'Nope. Not a number.',
         ]);
-        $this->assertEquals('Nope. Not a number.', $this->validation->getError());
+        $this->assertSame('Nope. Not a number.', $this->validation->getError());
     }
 
     //--------------------------------------------------------------------
@@ -188,7 +188,7 @@ public function testGetErrors()
 
         $this->validation->run($data);
 
-        $this->assertEquals(['foo' => 'Validation.is_numeric'], $this->validation->getErrors());
+        $this->assertSame(['foo' => 'Validation.is_numeric'], $this->validation->getErrors());
     }
 
     //--------------------------------------------------------------------
@@ -207,7 +207,7 @@ public function testGetErrorsWhenNone()
 
         $this->validation->run($data);
 
-        $this->assertEquals([], $this->validation->getErrors());
+        $this->assertSame([], $this->validation->getErrors());
     }
 
     //--------------------------------------------------------------------
@@ -220,7 +220,7 @@ public function testSetErrors()
 
         $this->validation->setError('foo', 'Nadda');
 
-        $this->assertEquals(['foo' => 'Nadda'], $this->validation->getErrors());
+        $this->assertSame(['foo' => 'Nadda'], $this->validation->getErrors());
     }
 
     //--------------------------------------------------------------------
@@ -233,7 +233,7 @@ public function testRulesReturnErrors()
 
         $this->validation->run(['foo' => 'bar']);
 
-        $this->assertEquals(['foo' => 'My lovely error'], $this->validation->getErrors());
+        $this->assertSame(['foo' => 'My lovely error'], $this->validation->getErrors());
     }
 
     //--------------------------------------------------------------------
@@ -245,7 +245,7 @@ public function testGroupsReadFromConfig()
         ];
 
         $this->assertFalse($this->validation->run($data, 'groupA'));
-        $this->assertEquals('Shame, shame. Too short.', $this->validation->getError('foo'));
+        $this->assertSame('Shame, shame. Too short.', $this->validation->getError('foo'));
     }
 
     //--------------------------------------------------------------------
@@ -263,7 +263,7 @@ public function testGroupsReadFromConfigValid()
 
     public function testGetRuleGroup()
     {
-        $this->assertEquals([
+        $this->assertSame([
             'foo' => 'required|min_length[5]',
         ], $this->validation->getRuleGroup('groupA'));
     }
@@ -282,7 +282,7 @@ public function testSetRuleGroup()
     {
         $this->validation->setRuleGroup('groupA');
 
-        $this->assertEquals([
+        $this->assertSame([
             'foo' => 'required|min_length[5]',
         ], $this->validation->getRules());
     }
@@ -306,7 +306,7 @@ public function testSetRuleGroupWithCustomErrorMessage()
             'username' => 'codeigniter',
         ]);
 
-        $this->assertEquals([
+        $this->assertSame([
             'password' => 'custom password required error msg.',
         ], $this->validation->getErrors());
     }
@@ -320,7 +320,7 @@ public function testRunGroupWithCustomErrorMessage()
             'username' => 'codeigniter',
         ], 'login');
 
-        $this->assertEquals([
+        $this->assertSame([
             'password' => 'custom password required error msg.',
         ], $this->validation->getErrors());
     }
@@ -342,7 +342,7 @@ public function testRulesSetup($rules, $expected, $errors = [])
 
         $this->validation->run($data);
 
-        $this->assertEquals($expected, $this->validation->getError('foo'));
+        $this->assertSame($expected, $this->validation->getError('foo'));
     }
 
     //--------------------------------------------------------------------
@@ -416,7 +416,7 @@ public function testSetRulesRemovesErrorsArray()
 
         $this->validation->run(['foo' => 'abc']);
 
-        $this->assertEquals('The Foo Bar field is very short.', $this->validation->getError('foo'));
+        $this->assertSame('The Foo Bar field is very short.', $this->validation->getError('foo'));
     }
 
     public function testInvalidRule()
@@ -452,7 +452,7 @@ public function testRawInput()
 
         $request = new IncomingRequest($config, new URI(), $rawstring, new UserAgent());
         $this->validation->withRequest($request->withMethod('patch'))->run($data);
-        $this->assertEquals([], $this->validation->getErrors());
+        $this->assertSame([], $this->validation->getErrors());
     }
 
     //--------------------------------------------------------------------
@@ -482,7 +482,7 @@ public function testJsonInput()
             ->run();
 
         $this->assertTrue($validated);
-        $this->assertEquals([], $this->validation->getErrors());
+        $this->assertSame([], $this->validation->getErrors());
 
         unset($_SERVER['CONTENT_TYPE']);
     }
@@ -523,7 +523,7 @@ public function testShowNonError()
 
         $this->validation->setError('foo', 'Nadda');
 
-        $this->assertEquals('', $this->validation->showError('bogus'));
+        $this->assertSame('', $this->validation->showError('bogus'));
     }
 
     //--------------------------------------------------------------------
@@ -537,7 +537,7 @@ public function testShowBadTemplate()
         ]);
         $this->validation->setError('foo', 'Nadda');
 
-        $this->assertEquals('We should never get here', $this->validation->showError('foo', 'bogus_template'));
+        $this->assertSame('We should never get here', $this->validation->showError('foo', 'bogus_template'));
     }
 
     //--------------------------------------------------------------------
@@ -641,7 +641,7 @@ public function testSplitNotRegex()
 
         $result = $method('uploaded[avatar]|max_size[avatar,1024]');
 
-        $this->assertEquals('uploaded[avatar]', $result[0]);
+        $this->assertSame('uploaded[avatar]', $result[0]);
     }
 
     public function testSplitRegex()
@@ -650,7 +650,7 @@ public function testSplitRegex()
 
         $result = $method('required|regex_match[/^[0-9]{4}[\-\.\[\/][0-9]{2}[\-\.\[\/][0-9]{2}/]|max_length[10]');
 
-        $this->assertEquals('regex_match[/^[0-9]{4}[\-\.\[\/][0-9]{2}[\-\.\[\/][0-9]{2}/]', $result[1]);
+        $this->assertSame('regex_match[/^[0-9]{4}[\-\.\[\/][0-9]{2}[\-\.\[\/][0-9]{2}/]', $result[1]);
     }
 
     //--------------------------------------------------------------------
@@ -686,7 +686,7 @@ public function testTagReplacement()
         $expected = 'Supplied value (Pizza) for Username must have at least 6 characters.';
 
         // check if they are the same!
-        $this->assertEquals($expected, $errors['Username']);
+        $this->assertSame($expected, $errors['Username']);
     }
 
     //--------------------------------------------------------------------
@@ -703,7 +703,7 @@ public function testRulesForArrayField($body, $rules, $results)
 
         $this->validation->setRules($rules);
         $this->validation->withRequest($request->withMethod('post'))->run($body);
-        $this->assertEquals($results, $this->validation->getErrors());
+        $this->assertSame($results, $this->validation->getErrors());
     }
 
     //--------------------------------------------------------------------
@@ -790,7 +790,7 @@ public function testRulesForSingleRuleWithAsteriskWillReturnNoError()
         ]);
 
         $this->validation->withRequest($request->withMethod('post'))->run();
-        $this->assertEquals([], $this->validation->getErrors());
+        $this->assertSame([], $this->validation->getErrors());
     }
 
     //--------------------------------------------------------------------
@@ -819,7 +819,7 @@ public function testRulesForSingleRuleWithAsteriskWillReturnError()
         ]);
 
         $this->validation->withRequest($request->withMethod('post'))->run();
-        $this->assertEquals([
+        $this->assertSame([
             'id_user.*'   => 'The id_user.* field must contain only numbers.',
             'name_user.*' => 'The name_user.* field may only contain alphabetical characters.',
         ], $this->validation->getErrors());
@@ -843,7 +843,7 @@ public function testRulesForSingleRuleWithSingleValue()
         ]);
 
         $this->validation->withRequest($request->withMethod('post'))->run();
-        $this->assertEquals([
+        $this->assertSame([
             'id_user' => 'The id_user field must contain only numbers.',
         ], $this->validation->getErrors());
     }
@@ -863,7 +863,7 @@ public function testTranslatedLabel()
 
         $this->validation->run(['foo' => 'abc']);
 
-        $this->assertEquals('The Foo Bar Translated field must be at least 10 characters in length.', $this->validation->getError('foo'));
+        $this->assertSame('The Foo Bar Translated field must be at least 10 characters in length.', $this->validation->getError('foo'));
     }
 
     //--------------------------------------------------------------------
@@ -881,7 +881,7 @@ public function testTranslatedLabelIsMissing()
 
         $this->validation->run(['foo' => 'abc']);
 
-        $this->assertEquals('The Foo.bar.is.missing field must be at least 10 characters in length.', $this->validation->getError('foo'));
+        $this->assertSame('The Foo.bar.is.missing field must be at least 10 characters in length.', $this->validation->getError('foo'));
     }
 
     //--------------------------------------------------------------------
@@ -902,7 +902,7 @@ public function testTranslatedLabelWithCustomErrorMessage()
 
         $this->validation->run(['foo' => 'abc']);
 
-        $this->assertEquals('The Foo Bar Translated field is very short.', $this->validation->getError('foo'));
+        $this->assertSame('The Foo Bar Translated field is very short.', $this->validation->getError('foo'));
     }
 
     //--------------------------------------------------------------------
@@ -941,7 +941,7 @@ public function testTranslatedLabelTagReplacement()
         $expected = 'Supplied value (Pizza) for Foo Bar Translated must have at least 6 characters.';
 
         // check if they are the same!
-        $this->assertEquals($expected, $errors['Username']);
+        $this->assertSame($expected, $errors['Username']);
     }
 
     /**
diff --git a/tests/system/View/CellTest.php b/tests/system/View/CellTest.php
index 6eecac3a2acb..1b374ce93461 100644
--- a/tests/system/View/CellTest.php
+++ b/tests/system/View/CellTest.php
@@ -33,14 +33,14 @@ protected function setUp(): void
 
     public function testPrepareParamsReturnsEmptyArrayWithInvalidParam()
     {
-        $this->assertEquals([], $this->cell->prepareParams(1.023));
+        $this->assertSame([], $this->cell->prepareParams(1.023));
     }
 
     //--------------------------------------------------------------------
 
     public function testPrepareParamsReturnsNullWithEmptyString()
     {
-        $this->assertEquals([], $this->cell->prepareParams(''));
+        $this->assertSame([], $this->cell->prepareParams(''));
     }
 
     //--------------------------------------------------------------------
@@ -52,14 +52,14 @@ public function testPrepareParamsReturnsSelfWhenArray()
             'three' => 'four',
         ];
 
-        $this->assertEquals($object, $this->cell->prepareParams($object));
+        $this->assertSame($object, $this->cell->prepareParams($object));
     }
 
     //--------------------------------------------------------------------
 
     public function testPrepareParamsReturnsEmptyArrayWithEmptyArray()
     {
-        $this->assertEquals([], $this->cell->prepareParams([]));
+        $this->assertSame([], $this->cell->prepareParams([]));
     }
 
     //--------------------------------------------------------------------
@@ -72,7 +72,7 @@ public function testPrepareParamsReturnsArrayWithString()
             'three' => 'four',
         ];
 
-        $this->assertEquals($expected, $this->cell->prepareParams($params));
+        $this->assertSame($expected, $this->cell->prepareParams($params));
     }
 
     //--------------------------------------------------------------------
@@ -81,11 +81,11 @@ public function testPrepareParamsHandlesCommas()
     {
         $params   = 'one=2, three=4.15';
         $expected = [
-            'one'   => 2,
-            'three' => 4.15,
+            'one'   => '2',
+            'three' => '4.15',
         ];
 
-        $this->assertEquals($expected, $this->cell->prepareParams($params));
+        $this->assertSame($expected, $this->cell->prepareParams($params));
     }
 
     //--------------------------------------------------------------------
@@ -98,7 +98,7 @@ public function testPrepareParamsWorksWithoutSpaces()
             'three' => 'four',
         ];
 
-        $this->assertEquals($expected, $this->cell->prepareParams($params));
+        $this->assertSame($expected, $this->cell->prepareParams($params));
     }
 
     //--------------------------------------------------------------------
@@ -112,7 +112,7 @@ public function testPrepareParamsWorksWithOddEqualsSpaces()
             'five'  => 'six',
         ];
 
-        $this->assertEquals($expected, $this->cell->prepareParams($params));
+        $this->assertSame($expected, $this->cell->prepareParams($params));
     }
 
     //--------------------------------------------------------------------
@@ -124,7 +124,7 @@ public function testDisplayRendersWithNamespacedClass()
     {
         $expected = 'Hello';
 
-        $this->assertEquals($expected, $this->cell->render('\Tests\Support\View\SampleClass::hello'));
+        $this->assertSame($expected, $this->cell->render('\Tests\Support\View\SampleClass::hello'));
     }
 
     //--------------------------------------------------------------------
@@ -137,7 +137,7 @@ public function testDisplayRendersWithValidParamString()
             'three' => 'four',
         ];
 
-        $this->assertEquals(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params));
+        $this->assertSame(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params));
     }
 
     //--------------------------------------------------------------------
@@ -150,7 +150,7 @@ public function testDisplayRendersWithStaticMethods()
             'three' => 'four',
         ];
 
-        $this->assertEquals(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::staticEcho', $params));
+        $this->assertSame(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::staticEcho', $params));
     }
 
     //--------------------------------------------------------------------
@@ -160,14 +160,14 @@ public function testOptionsEmptyArray()
         $params   = [];
         $expected = [];
 
-        $this->assertEquals(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::staticEcho', $params));
+        $this->assertSame(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::staticEcho', $params));
     }
 
     public function testOptionsNoParams()
     {
         $expected = [];
 
-        $this->assertEquals(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::staticEcho'));
+        $this->assertSame(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::staticEcho'));
     }
 
     public function testCellEmptyParams()
@@ -175,7 +175,7 @@ public function testCellEmptyParams()
         $params   = ',';
         $expected = 'Hello World';
 
-        $this->assertEquals($expected, $this->cell->render('\Tests\Support\View\SampleClass::index', $params));
+        $this->assertSame($expected, $this->cell->render('\Tests\Support\View\SampleClass::index', $params));
     }
 
     //--------------------------------------------------------------------
@@ -189,7 +189,7 @@ public function testCellClassMissing()
             'three' => 'four',
         ];
 
-        $this->assertEquals(implode(',', $expected), $this->cell->render('::echobox', $params));
+        $this->assertSame(implode(',', $expected), $this->cell->render('::echobox', $params));
     }
 
     public function testCellMethodMissing()
@@ -201,7 +201,7 @@ public function testCellMethodMissing()
             'three' => 'four',
         ];
 
-        $this->assertEquals(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::', $params));
+        $this->assertSame(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::', $params));
     }
 
     public function testCellBadClass()
@@ -210,7 +210,7 @@ public function testCellBadClass()
         $params   = 'one=two,three=four';
         $expected = 'Hello World';
 
-        $this->assertEquals($expected, $this->cell->render('\CodeIgniter\View\GoodQuestion::', $params));
+        $this->assertSame($expected, $this->cell->render('\CodeIgniter\View\GoodQuestion::', $params));
     }
 
     public function testCellBadMethod()
@@ -219,7 +219,7 @@ public function testCellBadMethod()
         $params   = 'one=two,three=four';
         $expected = 'Hello World';
 
-        $this->assertEquals($expected, $this->cell->render('\Tests\Support\View\SampleClass::notThere', $params));
+        $this->assertSame($expected, $this->cell->render('\Tests\Support\View\SampleClass::notThere', $params));
     }
 
     //--------------------------------------------------------------------
@@ -232,9 +232,9 @@ public function testRenderCached()
             'three' => 'four',
         ];
 
-        $this->assertEquals(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params, 60, 'rememberme'));
+        $this->assertSame(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params, 60, 'rememberme'));
         $params = 'one=six,three=five';
-        $this->assertEquals(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params, 1, 'rememberme'));
+        $this->assertSame(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params, 1, 'rememberme'));
     }
 
     public function testRenderCachedAutoName()
@@ -245,11 +245,11 @@ public function testRenderCachedAutoName()
             'three' => 'four',
         ];
 
-        $this->assertEquals(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params, 60));
+        $this->assertSame(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params, 60));
         $params = 'one=six,three=five';
         // When auto-generating it takes the params as part of cachename, so it wouldn't have actually cached this, but
         // we want to make sure it doesn't throw us a curveball here.
-        $this->assertEquals('six,five', $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params, 1));
+        $this->assertSame('six,five', $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params, 1));
     }
 
     //--------------------------------------------------------------------
@@ -263,7 +263,7 @@ public function testParametersMatch()
         ];
         $expected = 'Right on';
 
-        $this->assertEquals($expected, $this->cell->render('\Tests\Support\View\SampleClass::work', $params));
+        $this->assertSame($expected, $this->cell->render('\Tests\Support\View\SampleClass::work', $params));
     }
 
     public function testParametersDontMatch()
@@ -272,11 +272,11 @@ public function testParametersDontMatch()
         $params   = 'p1=one,p2=two,p3=three';
         $expected = 'Right on';
 
-        $this->assertEquals($expected, $this->cell->render('\Tests\Support\View\SampleClass::work', $params));
+        $this->assertSame($expected, $this->cell->render('\Tests\Support\View\SampleClass::work', $params));
     }
 
     public function testCallInitControllerIfMethodExists()
     {
-        $this->assertEquals('CodeIgniter\HTTP\Response', $this->cell->render('\Tests\Support\View\SampleClassWithInitController::index'));
+        $this->assertSame('CodeIgniter\HTTP\Response', $this->cell->render('\Tests\Support\View\SampleClassWithInitController::index'));
     }
 }
diff --git a/tests/system/View/ParserFilterTest.php b/tests/system/View/ParserFilterTest.php
index 64efc624f32f..7bc75f25b777 100644
--- a/tests/system/View/ParserFilterTest.php
+++ b/tests/system/View/ParserFilterTest.php
@@ -39,7 +39,7 @@ public function testAbs()
         $template = '{ value1|abs }{ value2|abs }';
 
         $parser->setData($data);
-        $this->assertEquals('55', $parser->renderString($template));
+        $this->assertSame('55', $parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -56,7 +56,7 @@ public function testCapitalize()
         $template = '{ value1|capitalize } { value2|capitalize }';
 
         $parser->setData($data);
-        $this->assertEquals('Wonder Twins', $parser->renderString($template));
+        $this->assertSame('Wonder Twins', $parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -80,7 +80,7 @@ public function testDate()
         $template = '{ value1|date(Y-m-d) } { value2|date(Y-m-d) } { value1|date(Y.m.d) } { value1|date(Y m d) } { value1|date(Y:m:d) } { value1|date(Y/m/d) } { value1|date(Y\\\m\\\d) }';
 
         $parser->setData($data);
-        $this->assertEquals("{$todayDash} {$todayDash} {$todayDot} {$todaySpace} {$todayColon} {$todaySlash} {$todayBackslash}", $parser->renderString($template));
+        $this->assertSame("{$todayDash} {$todayDash} {$todayDot} {$todaySpace} {$todayColon} {$todaySlash} {$todayBackslash}", $parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -98,7 +98,7 @@ public function testDateModify()
         $template = '{ value1|date_modify(+1 day)|date(Y-m-d) } { value2|date_modify(+1 day)|date(Y-m-d) }';
 
         $parser->setData($data);
-        $this->assertEquals("{$tommorrow} {$tommorrow}", $parser->renderString($template));
+        $this->assertSame("{$tommorrow} {$tommorrow}", $parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -116,7 +116,7 @@ public function testDefault()
         $template = '{ value1|default(foo) } { value2|default(bar) } { value3|default(baz) }';
 
         $parser->setData($data);
-        $this->assertEquals('foo bar test', $parser->renderString($template));
+        $this->assertSame('foo bar test', $parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -135,7 +135,7 @@ public function testEsc()
         $template = '{ value1|esc(html) } { value1|esc(js) }';
 
         $parser->setData($data);
-        $this->assertEquals("{$value1} {$value2}", $parser->renderString($template));
+        $this->assertSame("{$value1} {$value2}", $parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -151,7 +151,7 @@ public function testExcerpt()
         $template = '{ value1|excerpt(jumped, 10) }';
 
         $parser->setData($data);
-        $this->assertEquals('... red fox jumped over ...', $parser->renderString($template));
+        $this->assertSame('... red fox jumped over ...', $parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -167,7 +167,7 @@ public function testHighlight()
         $template = '{ value1|highlight(jumped over) }';
 
         $parser->setData($data);
-        $this->assertEquals('The quick red fox <mark>jumped over</mark> the lazy brown dog', $parser->renderString($template));
+        $this->assertSame('The quick red fox <mark>jumped over</mark> the lazy brown dog', $parser->renderString($template));
     }
 
     public function testHighlightCode()
@@ -186,7 +186,7 @@ public function testHighlightCode()
             </span>
             </code>
             EOF;
-        $this->assertEquals($expected, $parser->renderString($template));
+        $this->assertSame($expected, $parser->renderString($template));
     }
 
     public function testProse()
@@ -200,7 +200,7 @@ public function testProse()
 
         $template = '{ value1|prose }';
         $expected = '<p>Sincerely\nMe</p>';
-        $this->assertEquals($expected, $parser->renderString($template));
+        $this->assertSame($expected, $parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -216,7 +216,7 @@ public function testLimitChars()
         $template = '{ value1|limit_chars(10) }';
 
         $parser->setData($data);
-        $this->assertEquals('The quick&#8230;', $parser->renderString($template));
+        $this->assertSame('The quick&#8230;', $parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -232,7 +232,7 @@ public function testLimitWords()
         $template = '{ value1|limit_words(4) }';
 
         $parser->setData($data);
-        $this->assertEquals('The quick red fox&#8230;', $parser->renderString($template));
+        $this->assertSame('The quick red fox&#8230;', $parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -248,7 +248,7 @@ public function testLower()
         $template = '{ value1|lower }';
 
         $parser->setData($data);
-        $this->assertEquals('something', $parser->renderString($template));
+        $this->assertSame('something', $parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -264,7 +264,7 @@ public function testNL2BR()
         $template = '{ value1|nl2br }';
 
         $parser->setData($data);
-        $this->assertEquals("first<br />\nsecond", $parser->renderString($template));
+        $this->assertSame("first<br />\nsecond", $parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -280,7 +280,7 @@ public function testNumberFormat()
         $template = '{ value1|number_format(2) }';
 
         $parser->setData($data);
-        $this->assertEquals('1,098.35', $parser->renderString($template));
+        $this->assertSame('1,098.35', $parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -296,7 +296,7 @@ public function testRound()
         $template = '{ value1|round(1) } { value1|round(1, common) } { value1|round(ceil) } { value1|round(floor) } { value1|round(unknown) }';
 
         $parser->setData($data);
-        $this->assertEquals('5.6 5.6 6 5 5.55', $parser->renderString($template));
+        $this->assertSame('5.6 5.6 6 5 5.55', $parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -312,7 +312,7 @@ public function testStripTags()
         $template = '{ value1|strip_tags } { value1|strip_tags(<b>) }';
 
         $parser->setData($data);
-        $this->assertEquals('Middle <b>Middle</b>', $parser->renderString($template));
+        $this->assertSame('Middle <b>Middle</b>', $parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -328,7 +328,7 @@ public function testTitle()
         $template = '{ value1|title }';
 
         $parser->setData($data);
-        $this->assertEquals('Though She Be Little', $parser->renderString($template));
+        $this->assertSame('Though She Be Little', $parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -344,7 +344,7 @@ public function testUpper()
         $template = '{ value1|upper }';
 
         $parser->setData($data);
-        $this->assertEquals('THOUGH SHE BE LITTLE', $parser->renderString($template));
+        $this->assertSame('THOUGH SHE BE LITTLE', $parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -360,7 +360,7 @@ public function testLocalNumberBase()
         $template = '{ mynum|local_number }';
 
         $parser->setData($data);
-        $this->assertEquals('1,234,567.8912', $parser->renderString($template));
+        $this->assertSame('1,234,567.8912', $parser->renderString($template));
     }
 
     public function testLocalNumberPrecision()
@@ -374,7 +374,7 @@ public function testLocalNumberPrecision()
         $template = '{ mynum|local_number(decimal,2) }';
 
         $parser->setData($data);
-        $this->assertEquals('1,234,567.89', $parser->renderString($template));
+        $this->assertSame('1,234,567.89', $parser->renderString($template));
     }
 
     public function testLocalNumberType()
@@ -388,7 +388,7 @@ public function testLocalNumberType()
         $template = '{ mynum|local_number(spellout) }';
 
         $parser->setData($data);
-        $this->assertEquals('one million two hundred thirty-four thousand five hundred sixty-seven point eight nine one two three four six', $parser->renderString($template));
+        $this->assertSame('one million two hundred thirty-four thousand five hundred sixty-seven point eight nine one two three four six', $parser->renderString($template));
     }
 
     public function testLocalNumberLocale()
@@ -402,7 +402,7 @@ public function testLocalNumberLocale()
         $template = '{ mynum|local_number(decimal,4,de_DE) }';
 
         $parser->setData($data);
-        $this->assertEquals('1.234.567,8912', $parser->renderString($template));
+        $this->assertSame('1.234.567,8912', $parser->renderString($template));
     }
 
     public function testLocalCurrency()
@@ -416,7 +416,7 @@ public function testLocalCurrency()
         $template = '{ mynum|local_currency(EUR,de_DE,2) }';
 
         $parser->setData($data);
-        $this->assertEquals('1.234.567,89 €', $parser->renderString($template));
+        $this->assertSame('1.234.567,89 €', $parser->renderString($template));
     }
 
     public function testParsePairWithAbs()
@@ -472,6 +472,6 @@ public function testParsePairWithAbs()
             . '{/nested}';
 
         $parser->setData($data);
-        $this->assertEquals('112233445566', $parser->renderString($template));
+        $this->assertSame('112233445566', $parser->renderString($template));
     }
 }
diff --git a/tests/system/View/ParserPluginTest.php b/tests/system/View/ParserPluginTest.php
index 17dd2211516d..3b43d9c42d12 100644
--- a/tests/system/View/ParserPluginTest.php
+++ b/tests/system/View/ParserPluginTest.php
@@ -35,7 +35,7 @@ public function testCurrentURL()
         helper('url');
         $template = '{+ current_url +}';
 
-        $this->assertEquals(current_url(), $this->parser->renderString($template));
+        $this->assertSame(current_url(), $this->parser->renderString($template));
     }
 
     public function testPreviousURL()
@@ -46,7 +46,7 @@ public function testPreviousURL()
         // Ensure a previous URL exists to work with.
         $_SESSION['_ci_previous_url'] = 'http://example.com/foo';
 
-        $this->assertEquals(previous_url(), $this->parser->renderString($template));
+        $this->assertSame(previous_url(), $this->parser->renderString($template));
     }
 
     public function testMailto()
@@ -54,7 +54,7 @@ public function testMailto()
         helper('url');
         $template = '{+ mailto email=foo@example.com title=Silly +}';
 
-        $this->assertEquals(mailto('foo@example.com', 'Silly'), $this->parser->renderString($template));
+        $this->assertSame(mailto('foo@example.com', 'Silly'), $this->parser->renderString($template));
     }
 
     /**
@@ -73,14 +73,14 @@ public function testSafeMailto()
         helper('url');
         $template = '{+ safe_mailto email=foo@example.com title=Silly +}';
 
-        $this->assertEquals(safe_mailto('foo@example.com', 'Silly'), $this->parser->renderString($template));
+        $this->assertSame(safe_mailto('foo@example.com', 'Silly'), $this->parser->renderString($template));
     }
 
     public function testLang()
     {
         $template = '{+ lang Number.terabyteAbbr +}';
 
-        $this->assertEquals('TB', $this->parser->renderString($template));
+        $this->assertSame('TB', $this->parser->renderString($template));
     }
 
     public function testValidationErrors()
@@ -89,7 +89,7 @@ public function testValidationErrors()
 
         $template = '{+ validation_errors field=email +}';
 
-        $this->assertEquals($this->setHints($this->validator->showError('email')), $this->setHints($this->parser->renderString($template)));
+        $this->assertSame($this->setHints($this->validator->showError('email')), $this->setHints($this->parser->renderString($template)));
     }
 
     public function testRoute()
@@ -100,14 +100,14 @@ public function testRoute()
 
         $template = '{+ route myController::goto string 13 +}';
 
-        $this->assertEquals('/path/string/to/13', $this->parser->renderString($template));
+        $this->assertSame('/path/string/to/13', $this->parser->renderString($template));
     }
 
     public function testSiteURL()
     {
         $template = '{+ siteURL +}';
 
-        $this->assertEquals('http://example.com/index.php', $this->parser->renderString($template));
+        $this->assertSame('http://example.com/index.php', $this->parser->renderString($template));
     }
 
     public function testValidationErrorsList()
@@ -116,7 +116,7 @@ public function testValidationErrorsList()
         $this->validator->setError('username', 'User name must be unique');
         $template = '{+ validation_errors +}';
 
-        $this->assertEquals($this->setHints($this->validator->listErrors()), $this->setHints($this->parser->renderString($template)));
+        $this->assertSame($this->setHints($this->validator->listErrors()), $this->setHints($this->parser->renderString($template)));
     }
 
     public function setHints($output)
diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php
index 0cc95ebe2b1b..947e568ec349 100644
--- a/tests/system/View/ParserTest.php
+++ b/tests/system/View/ParserTest.php
@@ -50,22 +50,22 @@ protected function setUp(): void
     public function testSetDelimiters()
     {
         // Make sure default delimiters are there
-        $this->assertEquals('{', $this->parser->leftDelimiter);
-        $this->assertEquals('}', $this->parser->rightDelimiter);
+        $this->assertSame('{', $this->parser->leftDelimiter);
+        $this->assertSame('}', $this->parser->rightDelimiter);
 
         // Change them to square brackets
         $this->parser->setDelimiters('[', ']');
 
         // Make sure they changed
-        $this->assertEquals('[', $this->parser->leftDelimiter);
-        $this->assertEquals(']', $this->parser->rightDelimiter);
+        $this->assertSame('[', $this->parser->leftDelimiter);
+        $this->assertSame(']', $this->parser->rightDelimiter);
 
         // Reset them
         $this->parser->setDelimiters();
 
         // Make sure default delimiters are there
-        $this->assertEquals('{', $this->parser->leftDelimiter);
-        $this->assertEquals('}', $this->parser->rightDelimiter);
+        $this->assertSame('{', $this->parser->leftDelimiter);
+        $this->assertSame('}', $this->parser->rightDelimiter);
     }
 
     // --------------------------------------------------------------------
@@ -73,7 +73,7 @@ public function testSetDelimiters()
     public function testParseSimple()
     {
         $this->parser->setVar('teststring', 'Hello World');
-        $this->assertEquals("<h1>Hello World</h1>\n", $this->parser->render('template1'));
+        $this->assertSame("<h1>Hello World</h1>\n", $this->parser->render('template1'));
     }
 
     // --------------------------------------------------------------------
@@ -90,7 +90,7 @@ public function testParseString()
         $result = implode("\n", $data);
 
         $this->parser->setData($data);
-        $this->assertEquals($result, $this->parser->renderString($template));
+        $this->assertSame($result, $this->parser->renderString($template));
     }
 
     // --------------------------------------------------------------------
@@ -107,7 +107,7 @@ public function testParseStringMissingData()
         $result = implode("\n", $data) . "\n{name}";
 
         $this->parser->setData($data);
-        $this->assertEquals($result, $this->parser->renderString($template));
+        $this->assertSame($result, $this->parser->renderString($template));
     }
 
     // --------------------------------------------------------------------
@@ -125,14 +125,14 @@ public function testParseStringUnusedData()
         $result = "Page Title\nLorem ipsum dolor sit amet.";
 
         $this->parser->setData($data);
-        $this->assertEquals($result, $this->parser->renderString($template));
+        $this->assertSame($result, $this->parser->renderString($template));
     }
 
     // --------------------------------------------------------------------
 
     public function testParseNoTemplate()
     {
-        $this->assertEquals('', $this->parser->renderString(''));
+        $this->assertSame('', $this->parser->renderString(''));
     }
 
     // --------------------------------------------------------------------
@@ -152,7 +152,7 @@ public function testParseArraySingle()
         $template = "{title}\n{powers}{invisibility}\n{flying}{/powers}";
 
         $this->parser->setData($data);
-        $this->assertEquals("Super Heroes\nyes\nno", $this->parser->renderString($template));
+        $this->assertSame("Super Heroes\nyes\nno", $this->parser->renderString($template));
     }
 
     public function testParseArrayMulti()
@@ -169,7 +169,7 @@ public function testParseArrayMulti()
         $template = "{powers}{invisibility}\n{flying}{/powers}\nsecond:{powers} {invisibility} {flying}{ /powers}";
 
         $this->parser->setData($data);
-        $this->assertEquals("yes\nno\nsecond: yes no", $this->parser->renderString($template));
+        $this->assertSame("yes\nno\nsecond: yes no", $this->parser->renderString($template));
     }
 
     public function testParseArrayNested()
@@ -193,7 +193,7 @@ public function testParseArrayNested()
         $template = "{title}\n{powers}{invisibility}\n{flying}{by} {with}{/flying}{/powers}";
 
         $this->parser->setData($data);
-        $this->assertEquals("Super Heroes\nyes\nplane broomstick", $this->parser->renderString($template));
+        $this->assertSame("Super Heroes\nyes\nplane broomstick", $this->parser->renderString($template));
     }
 
     public function testParseArrayNestedObject()
@@ -220,7 +220,7 @@ public function testParseArrayNestedObject()
         $template = '{birds}{mom} and {pop} work at {home}{/birds}';
 
         $this->parser->setData($data);
-        $this->assertEquals('Owl and Class: stdClass work at Resource', $this->parser->renderString($template));
+        $this->assertSame('Owl and Class: stdClass work at Resource', $this->parser->renderString($template));
     }
 
     // --------------------------------------------------------------------
@@ -239,7 +239,7 @@ public function testParseLoop()
         $template = "{title}\n{powers}{name} {/powers}";
 
         $this->parser->setData($data);
-        $this->assertEquals("Super Heroes\nTom Dick Henry ", $this->parser->renderString($template));
+        $this->assertSame("Super Heroes\nTom Dick Henry ", $this->parser->renderString($template));
     }
 
     public function testParseLoopObjectProperties()
@@ -264,7 +264,7 @@ public function testParseLoopObjectProperties()
         $template = "{title}\n{powers}{name} {/powers}";
 
         $this->parser->setData($data, 'html');
-        $this->assertEquals("Super Heroes\nTom Dick Henry ", $this->parser->renderString($template));
+        $this->assertSame("Super Heroes\nTom Dick Henry ", $this->parser->renderString($template));
     }
 
     // --------------------------------------------------------------------
@@ -296,7 +296,7 @@ public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recu
         $template = "{title}\n{powers} {foo} {bar} {bobbles}{name} {/bobbles}{/powers}";
 
         $this->parser->setData($data);
-        $this->assertEquals("Super Heroes\n bar baz first second ", $this->parser->renderString($template));
+        $this->assertSame("Super Heroes\n bar baz first second ", $this->parser->renderString($template));
     }
 
     public function testParseLoopEntityObjectProperties()
@@ -333,7 +333,7 @@ public function __construct()
         $template = "{title}\n{powers} {foo} {bar} {bobbles}{name} {/bobbles}{/powers}";
 
         $this->parser->setData($data, 'html');
-        $this->assertEquals("Super Heroes\n bar baz first second ", $this->parser->renderString($template));
+        $this->assertSame("Super Heroes\n bar baz first second ", $this->parser->renderString($template));
     }
 
     // --------------------------------------------------------------------
@@ -354,7 +354,7 @@ public function testMismatchedVarPair()
         $result   = "Super Heroes\n{powers}{invisibility}\n{flying}";
 
         $this->parser->setData($data);
-        $this->assertEquals($result, $this->parser->renderString($template));
+        $this->assertSame($result, $this->parser->renderString($template));
     }
 
     public function escValueTypes()
@@ -419,7 +419,7 @@ public function testEscHandling($value, $expected = null)
         if ($expected === null) {
             $expected = $value;
         }
-        $this->assertEquals($expected, \esc($value));
+        $this->assertSame($expected, \esc($value));
     }
 
     //------------------------------------------------------------------------
@@ -432,7 +432,7 @@ public function testParseSimilarVariableNames()
         $template = '{foo} {foo_bar}';
 
         $this->parser->setData(['foo' => 'bar', 'foo_bar' => 'foo-bar'], 'raw');
-        $this->assertEquals('bar foo-bar', $this->parser->renderString($template));
+        $this->assertSame('bar foo-bar', $this->parser->renderString($template));
     }
 
     public function testParsePairSimilarVariableNames()
@@ -449,7 +449,7 @@ public function testParsePairSimilarVariableNames()
 
         $template = '{title} {powers}{link} {link_second}{/powers}';
         $this->parser->setData($data);
-        $this->assertEquals('&lt;script&gt;Heroes&lt;/script&gt; &lt;a href=&#039;test&#039;&gt;Link&lt;/a&gt; &lt;a href=&#039;test2&#039;&gt;Link second&lt;/a&gt;', $this->parser->renderString($template));
+        $this->assertSame('&lt;script&gt;Heroes&lt;/script&gt; &lt;a href=&#039;test&#039;&gt;Link&lt;/a&gt; &lt;a href=&#039;test2&#039;&gt;Link second&lt;/a&gt;', $this->parser->renderString($template));
     }
 
     //------------------------------------------------------------------------
@@ -462,7 +462,7 @@ public function testEscapingRespectsSetDataRaw()
         $template = '{ foo }';
 
         $this->parser->setData(['foo' => '<script>'], 'raw');
-        $this->assertEquals('<script>', $this->parser->renderString($template));
+        $this->assertSame('<script>', $this->parser->renderString($template));
     }
 
     public function testEscapingSetDataWithOtherContext()
@@ -470,7 +470,7 @@ public function testEscapingSetDataWithOtherContext()
         $template = '{ foo }';
 
         $this->parser->setData(['foo' => 'http://foo.com'], 'url');
-        $this->assertEquals('http%3A%2F%2Ffoo.com', $this->parser->renderString($template));
+        $this->assertSame('http%3A%2F%2Ffoo.com', $this->parser->renderString($template));
     }
 
     public function testNoEscapingSetData()
@@ -478,14 +478,14 @@ public function testNoEscapingSetData()
         $template = '{ foo | noescape}';
 
         $this->parser->setData(['foo' => 'http://foo.com'], 'unknown');
-        $this->assertEquals('http://foo.com', $this->parser->renderString($template));
+        $this->assertSame('http://foo.com', $this->parser->renderString($template));
     }
 
     public function testAutoEscaping()
     {
         $this->parser->setData(['foo' => 'http://foo.com'], 'unknown');
 
-        $this->assertEquals('html', $this->parser->shouldAddEscaping('{ foo | this | that }'));
+        $this->assertSame('html', $this->parser->shouldAddEscaping('{ foo | this | that }'));
     }
 
     public function testAutoEscapingNot()
@@ -505,7 +505,7 @@ public function testFilterWithNoArgument()
         $template = '{ that_thing|esc }';
 
         $this->parser->setData($data);
-        $this->assertEquals('&lt;script&gt;alert(&quot;ci4&quot;)&lt;/script&gt;', $this->parser->renderString($template));
+        $this->assertSame('&lt;script&gt;alert(&quot;ci4&quot;)&lt;/script&gt;', $this->parser->renderString($template));
     }
 
     public function testFilterWithArgument()
@@ -519,7 +519,7 @@ public function testFilterWithArgument()
         $template = '{ my_date| date(Y-m-d ) }';
 
         $this->parser->setData($data);
-        $this->assertEquals(date('Y-m-d', $date), $this->parser->renderString($template));
+        $this->assertSame(date('Y-m-d', $date), $this->parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -535,7 +535,7 @@ public function testParserEscapesDataDefaultsToHTML()
 
         $template = '{title} {powers}{link}{/powers}';
         $this->parser->setData($data);
-        $this->assertEquals('&lt;script&gt;Heroes&lt;/script&gt; &lt;a href=&#039;test&#039;&gt;Link&lt;/a&gt;', $this->parser->renderString($template));
+        $this->assertSame('&lt;script&gt;Heroes&lt;/script&gt; &lt;a href=&#039;test&#039;&gt;Link&lt;/a&gt;', $this->parser->renderString($template));
     }
 
     public function testParserNoEscape()
@@ -546,7 +546,7 @@ public function testParserNoEscape()
 
         $template = '{! title!}';
         $this->parser->setData($data);
-        $this->assertEquals('<script>Heroes</script>', $this->parser->renderString($template));
+        $this->assertSame('<script>Heroes</script>', $this->parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -567,7 +567,7 @@ public function testIgnoresComments()
         $result   = "Super Heroes\n{powers}{invisibility}\n{flying}";
 
         $this->parser->setData($data);
-        $this->assertEquals($result, $this->parser->renderString($template));
+        $this->assertSame($result, $this->parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -588,7 +588,7 @@ public function testNoParse()
         $result   = "{title}\n{powers}{invisibility}\n{flying}";
 
         $this->parser->setData($data);
-        $this->assertEquals($result, $this->parser->renderString($template));
+        $this->assertSame($result, $this->parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -603,7 +603,7 @@ public function testIfConditionalTrue()
         $template = '{if $doit}Howdy{endif}{ if $dontdoit === false}Welcome{ endif }';
         $this->parser->setData($data);
 
-        $this->assertEquals('HowdyWelcome', $this->parser->renderString($template));
+        $this->assertSame('HowdyWelcome', $this->parser->renderString($template));
     }
 
     public function testElseConditionalFalse()
@@ -615,7 +615,7 @@ public function testElseConditionalFalse()
         $template = '{if $doit}Howdy{else}Welcome{ endif }';
         $this->parser->setData($data);
 
-        $this->assertEquals('Howdy', $this->parser->renderString($template));
+        $this->assertSame('Howdy', $this->parser->renderString($template));
     }
 
     public function testElseConditionalTrue()
@@ -627,7 +627,7 @@ public function testElseConditionalTrue()
         $template = '{if $doit}Howdy{else}Welcome{ endif }';
         $this->parser->setData($data);
 
-        $this->assertEquals('Welcome', $this->parser->renderString($template));
+        $this->assertSame('Welcome', $this->parser->renderString($template));
     }
 
     public function testElseifConditionalTrue()
@@ -640,7 +640,7 @@ public function testElseifConditionalTrue()
         $template = '{if $doit}Howdy{elseif $dontdoit}Welcome{ endif }';
         $this->parser->setData($data);
 
-        $this->assertEquals('Welcome', $this->parser->renderString($template));
+        $this->assertSame('Welcome', $this->parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -657,7 +657,7 @@ public function testConditionalBadSyntax()
         $template = '{if doit}Howdy{elseif doit}Welcome{ endif )}';
 
         $this->parser->setData($data);
-        $this->assertEquals('HowdyWelcome', $this->parser->renderString($template));
+        $this->assertSame('HowdyWelcome', $this->parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -665,7 +665,7 @@ public function testConditionalBadSyntax()
     public function testWontParsePHP()
     {
         $template = "<?php echo 'Foo' ?> - <?= 'Bar' ?>";
-        $this->assertEquals('&lt;?php echo \'Foo\' ?&gt; - &lt;?= \'Bar\' ?&gt;', $this->parser->renderString($template));
+        $this->assertSame('&lt;?php echo \'Foo\' ?&gt; - &lt;?= \'Bar\' ?&gt;', $this->parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -682,7 +682,7 @@ public function testParseHandlesSpaces()
         $result = implode("\n", $data);
 
         $this->parser->setData($data);
-        $this->assertEquals($result, $this->parser->renderString($template));
+        $this->assertSame($result, $this->parser->renderString($template));
     }
 
     // --------------------------------------------------------------------
@@ -699,7 +699,7 @@ public function testParseRuns()
         $result = implode("\n", $data);
 
         $this->parser->setData($data);
-        $this->assertEquals($result, $this->parser->renderString($template));
+        $this->assertSame($result, $this->parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -733,7 +733,7 @@ public function testParserPluginNoMatches()
     {
         $template = 'hit:it';
 
-        $this->assertEquals('hit:it', $this->parser->renderString($template));
+        $this->assertSame('hit:it', $this->parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -749,7 +749,7 @@ public function testParserPluginNoParams()
 
         $template = '{+ hit:it +} stuff here {+ /hit:it +}';
 
-        $this->assertEquals(' stuff Hip to the Hop ', $this->parser->renderString($template));
+        $this->assertSame(' stuff Hip to the Hop ', $this->parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -768,7 +768,7 @@ public function testParserPluginClosure()
 
         $template = '{+ hello world +}';
 
-        $this->assertEquals('Hello, world', $this->parser->renderString($template));
+        $this->assertSame('Hello, world', $this->parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -793,7 +793,7 @@ public function testParserPluginParams()
 
         $template = '{+ growth step=2 count=4 +}  {+ /growth +}';
 
-        $this->assertEquals(' 2 4 6 8', $this->parser->renderString($template));
+        $this->assertSame(' 2 4 6 8', $this->parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -809,7 +809,7 @@ public function testParserSingleTag()
 
         $template = '{+ hit:it +}';
 
-        $this->assertEquals('Hip to the Hop', $this->parser->renderString($template));
+        $this->assertSame('Hip to the Hop', $this->parser->renderString($template));
     }
 
     /**
@@ -823,7 +823,7 @@ public function testParserSingleTagWithParams()
 
         $template = '{+ hit:it first=foo last=bar +}';
 
-        $this->assertEquals('foo to the bar', $this->parser->renderString($template));
+        $this->assertSame('foo to the bar', $this->parser->renderString($template));
     }
 
     /**
@@ -837,7 +837,7 @@ public function testParserSingleTagWithSingleParams()
 
         $template = '{+ hit:it foo bar +}';
 
-        $this->assertEquals('foo to the bar', $this->parser->renderString($template));
+        $this->assertSame('foo to the bar', $this->parser->renderString($template));
     }
 
     /**
@@ -857,7 +857,7 @@ public function testParserSingleTagWithQuotedParams()
 
         $template = '{+ count "foo bar" baz "foo bar" +}';
 
-        $this->assertEquals('0. foo bar 1. baz 2. foo bar ', $this->parser->renderString($template));
+        $this->assertSame('0. foo bar 1. baz 2. foo bar ', $this->parser->renderString($template));
     }
 
     /**
@@ -877,7 +877,7 @@ public function testParserSingleTagWithNamedParams()
 
         $template = '{+ read_params title="Hello world" page=5 email=test@test.net +}';
 
-        $this->assertEquals('title: Hello world. page: 5. email: test@test.net. ', $this->parser->renderString($template));
+        $this->assertSame('title: Hello world. page: 5. email: test@test.net. ', $this->parser->renderString($template));
     }
 
     //--------------------------------------------------------------------
@@ -896,7 +896,7 @@ public function testParseLoopWithDollarSign()
         $template = '{books}<p>Price $: {price}</p>{/books}';
 
         $this->parser->setData($data);
-        $this->assertEquals('<p>Price $: 12.50</p>', $this->parser->renderString($template));
+        $this->assertSame('<p>Price $: 12.50</p>', $this->parser->renderString($template));
     }
 
     /**
@@ -958,9 +958,9 @@ public function testCachedRender()
         $this->parser->setVar('teststring', 'Hello World');
 
         $expected = "<h1>Hello World</h1>\n";
-        $this->assertEquals($expected, $this->parser->render('template1', ['cache' => 10, 'cache_name' => 'HelloWorld']));
+        $this->assertSame($expected, $this->parser->render('template1', ['cache' => 10, 'cache_name' => 'HelloWorld']));
         // this second renderings should go thru the cache
-        $this->assertEquals($expected, $this->parser->render('template1', ['cache' => 10, 'cache_name' => 'HelloWorld']));
+        $this->assertSame($expected, $this->parser->render('template1', ['cache' => 10, 'cache_name' => 'HelloWorld']));
     }
 
     //--------------------------------------------------------------------
@@ -968,7 +968,7 @@ public function testCachedRender()
     public function testRenderFindsView()
     {
         $this->parser->setData(['testString' => 'Hello World']);
-        $this->assertEquals("<h1>Hello World</h1>\n", $this->parser->render('Simpler'));
+        $this->assertSame("<h1>Hello World</h1>\n", $this->parser->render('Simpler'));
     }
 
     public function testRenderCannotFindView()
@@ -987,11 +987,11 @@ public function testRenderSavingData()
         $expected = "<h1>Hello World</h1>\n";
 
         $this->parser->setData(['testString' => 'Hello World']);
-        $this->assertEquals($expected, $this->parser->render('Simpler', [], false));
+        $this->assertSame($expected, $this->parser->render('Simpler', [], false));
         $this->assertArrayNotHasKey('testString', $this->parser->getData());
 
         $this->parser->setData(['testString' => 'Hello World']);
-        $this->assertEquals($expected, $this->parser->render('Simpler', [], true));
+        $this->assertSame($expected, $this->parser->render('Simpler', [], true));
         $this->assertArrayHasKey('testString', $this->parser->getData());
     }
 
@@ -1001,11 +1001,11 @@ public function testRenderStringSavingData()
         $pattern  = '<h1>{testString}</h1>';
 
         $this->parser->setData(['testString' => 'Hello World']);
-        $this->assertEquals($expected, $this->parser->renderString($pattern, [], false));
+        $this->assertSame($expected, $this->parser->renderString($pattern, [], false));
         $this->assertArrayNotHasKey('testString', $this->parser->getData());
         //last set data is not saved
         $this->parser->setData(['testString' => 'Hello World']);
-        $this->assertEquals($expected, $this->parser->renderString($pattern, [], true));
+        $this->assertSame($expected, $this->parser->renderString($pattern, [], true));
         $this->assertArrayHasKey('testString', $this->parser->getData());
     }
 
@@ -1013,6 +1013,6 @@ public function testRenderFindsOtherView()
     {
         $this->parser->setData(['testString' => 'Hello World']);
         $expected = '<h1>Hello World</h1>';
-        $this->assertEquals($expected, $this->parser->render('Simpler.html'));
+        $this->assertSame($expected, $this->parser->render('Simpler.html'));
     }
 }
diff --git a/tests/system/View/TableTest.php b/tests/system/View/TableTest.php
index 4e6f3012719d..0c49ea01488d 100644
--- a/tests/system/View/TableTest.php
+++ b/tests/system/View/TableTest.php
@@ -27,19 +27,19 @@ public function testSetTemplate()
         $template = ['a' => 'b'];
 
         $this->table->setTemplate($template);
-        $this->assertEquals($template, $this->table->template);
+        $this->assertSame($template, $this->table->template);
     }
 
     public function testSetEmpty()
     {
         $this->table->setEmpty('nada');
-        $this->assertEquals('nada', $this->table->emptyCells);
+        $this->assertSame('nada', $this->table->emptyCells);
     }
 
     public function testSetCaption()
     {
         $this->table->setCaption('awesome cap');
-        $this->assertEquals('awesome cap', $this->table->caption);
+        $this->assertSame('awesome cap', $this->table->caption);
     }
 
     /**
@@ -53,7 +53,7 @@ public function testSetHeading()
 
         $this->table->setHeading('name', 'color', 'size');
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 ['data' => 'name'],
                 ['data' => 'color'],
@@ -73,7 +73,7 @@ public function testSetFooting()
 
         $this->table->setFooting('Subtotal', $subtotal);
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 ['data' => 'Subtotal'],
                 ['data' => $subtotal],
@@ -97,7 +97,7 @@ public function testAddRow()
 
         $this->assertCount(3, $this->table->rows);
 
-        $this->assertEquals(
+        $this->assertSame(
             [
                 ['data' => 'your'],
                 ['data' => 'pony'],
@@ -118,7 +118,7 @@ public function testPrepArgs()
             ['data' => 'size'],
         ];
 
-        $this->assertEquals(
+        $this->assertSame(
             $expected,
             $this->table->prepArgs(['name', 'color', 'size'])
         );
@@ -130,7 +130,7 @@ public function testPrepArgs()
             'class' => 'awesome',
         ];
 
-        $this->assertEquals(
+        $this->assertSame(
             $expected,
             $this->table->prepArgs(['name', 'color', 'size', ['data' => 'weight', 'class' => 'awesome']])
         );
@@ -173,14 +173,14 @@ public function testCompileTemplate()
         $this->table->compileTemplate();
 
         $this->assertArrayHasKey('nonsense', $this->table->template);
-        $this->assertEquals('foo', $this->table->template['nonsense']);
+        $this->assertSame('foo', $this->table->template['nonsense']);
 
         // override default
         $this->table->setTemplate(['table_close' => '</table junk>']);
         $this->table->compileTemplate();
 
         $this->assertArrayHasKey('table_close', $this->table->template);
-        $this->assertEquals('</table junk>', $this->table->template['table_close']);
+        $this->assertSame('</table junk>', $this->table->template['table_close']);
     }
 
     public function testMakeColumns()
@@ -201,13 +201,13 @@ public function testMakeColumns()
         ];
 
         // No column count - no changes to the array
-        $this->assertEquals(
+        $this->assertSame(
             $fiveValues,
             $this->table->makeColumns($fiveValues)
         );
 
         // Column count of 3 leaves us with one &nbsp;
-        $this->assertEquals(
+        $this->assertSame(
             [
                 ['Laura', 'Red', '15'],
                 ['Katie', 'Blue', '&nbsp;'],
@@ -278,14 +278,14 @@ public function testSetFromArray()
             ['data' => 'number'],
         ];
 
-        $this->assertEquals($expected, $this->table->heading);
+        $this->assertSame($expected, $this->table->heading);
 
         $expected = [
             ['data' => 'Katie'],
             ['data' => 'Blue'],
         ];
 
-        $this->assertEquals($expected, $this->table->rows[1]);
+        $this->assertSame($expected, $this->table->rows[1]);
     }
 
     public function testSetFromObject()
@@ -304,14 +304,14 @@ public function testSetFromObject()
             ['data' => 'email'],
         ];
 
-        $this->assertEquals($expected, $this->table->heading);
+        $this->assertSame($expected, $this->table->heading);
 
         $expected = [
             'name'  => ['data' => 'Foo Bar'],
             'email' => ['data' => 'foo@bar.com'],
         ];
 
-        $this->assertEquals($expected, $this->table->rows[1]);
+        $this->assertSame($expected, $this->table->rows[1]);
     }
 
     public function testGenerate()
@@ -464,7 +464,7 @@ public function testUndefined()
 
         $table = $this->table->generate($data);
 
-        $this->assertEquals('Undefined table data', $table);
+        $this->assertSame('Undefined table data', $table);
     }
 
     // --------------------------------------------------------------------
diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php
index 81c223b88239..a440ef4a02c1 100644
--- a/tests/system/View/ViewTest.php
+++ b/tests/system/View/ViewTest.php
@@ -37,7 +37,7 @@ public function testSetVarStoresData()
 
         $view->setVar('foo', 'bar');
 
-        $this->assertEquals(['foo' => 'bar'], $view->getData());
+        $this->assertSame(['foo' => 'bar'], $view->getData());
     }
 
     public function testSetVarOverwrites()
@@ -47,7 +47,7 @@ public function testSetVarOverwrites()
         $view->setVar('foo', 'bar');
         $view->setVar('foo', 'baz');
 
-        $this->assertEquals(['foo' => 'baz'], $view->getData());
+        $this->assertSame(['foo' => 'baz'], $view->getData());
     }
 
     //--------------------------------------------------------------------
@@ -63,7 +63,7 @@ public function testSetDataStoresValue()
 
         $view->setData($expected);
 
-        $this->assertEquals($expected, $view->getData());
+        $this->assertSame($expected, $view->getData());
     }
 
     public function testSetDataMergesData()
@@ -82,7 +82,7 @@ public function testSetDataMergesData()
             'bar' => 'baz',
         ]);
 
-        $this->assertEquals($expected, $view->getData());
+        $this->assertSame($expected, $view->getData());
     }
 
     public function testSetDataOverwritesData()
@@ -100,7 +100,7 @@ public function testSetDataOverwritesData()
             'bar' => 'baz',
         ]);
 
-        $this->assertEquals($expected, $view->getData());
+        $this->assertSame($expected, $view->getData());
     }
 
     //--------------------------------------------------------------------
@@ -111,7 +111,7 @@ public function testSetVarWillEscape()
 
         $view->setVar('foo', 'bar&', 'html');
 
-        $this->assertEquals(['foo' => 'bar&amp;'], $view->getData());
+        $this->assertSame(['foo' => 'bar&amp;'], $view->getData());
     }
 
     public function testSetDataWillEscapeAll()
@@ -128,7 +128,7 @@ public function testSetDataWillEscapeAll()
             'bar' => 'baz<',
         ], 'html');
 
-        $this->assertEquals($expected, $view->getData());
+        $this->assertSame($expected, $view->getData());
     }
 
     //--------------------------------------------------------------------
@@ -152,13 +152,13 @@ public function testRenderString()
         $view->setVar('testString', 'Hello World');
         $expected = '<h1>Hello World</h1>';
 
-        $this->assertEquals($expected, $view->renderString('<h1><?= $testString ?></h1>'));
+        $this->assertSame($expected, $view->renderString('<h1><?= $testString ?></h1>'));
     }
 
     public function testRenderStringNullTempdata()
     {
         $view = new View($this->config, $this->viewsDir, $this->loader);
-        $this->assertEquals('test string', $view->renderString('test string'));
+        $this->assertSame('test string', $view->renderString('test string'));
     }
 
     //--------------------------------------------------------------------
@@ -196,7 +196,7 @@ public function testRenderCanSaveData()
 
         $expected = ['testString' => 'Hello World'];
 
-        $this->assertEquals($expected, $view->getData());
+        $this->assertSame($expected, $view->getData());
     }
 
     public function testRenderCanSaveDataThroughConfigSetting()
@@ -210,7 +210,7 @@ public function testRenderCanSaveDataThroughConfigSetting()
 
         $expected = ['testString' => 'Hello World'];
 
-        $this->assertEquals($expected, $view->getData());
+        $this->assertSame($expected, $view->getData());
     }
 
     //--------------------------------------------------------------------
@@ -224,7 +224,7 @@ public function testCanDeleteData()
 
         $view->resetData();
 
-        $this->assertEquals([], $view->getData());
+        $this->assertSame([], $view->getData());
     }
 
     //--------------------------------------------------------------------
@@ -250,11 +250,11 @@ public function testRenderStringSavingData()
 
         //I think saveData is sava current data, is not clean already set data.
         $view->setVar('testString', 'Hello World');
-        $this->assertEquals($expected, $view->renderString('<h1><?= $testString ?></h1>', [], false));
+        $this->assertSame($expected, $view->renderString('<h1><?= $testString ?></h1>', [], false));
         $this->assertArrayNotHasKey('testString', $view->getData());
 
         $view->setVar('testString', 'Hello World');
-        $this->assertEquals($expected, $view->renderString('<h1><?= $testString ?></h1>', [], true));
+        $this->assertSame($expected, $view->renderString('<h1><?= $testString ?></h1>', [], true));
         $this->assertArrayHasKey('testString', $view->getData());
     }
 
@@ -268,7 +268,7 @@ public function testPerformanceLogging()
 
         $view->setVar('testString', 'Hello World');
         $expected = '<h1>Hello World</h1>';
-        $this->assertEquals($expected, $view->renderString('<h1><?= $testString ?></h1>', [], true));
+        $this->assertSame($expected, $view->renderString('<h1><?= $testString ?></h1>', [], true));
         $this->assertCount(1, $view->getPerformanceData());
     }
 
@@ -280,7 +280,7 @@ public function testPerformanceNonLogging()
 
         $view->setVar('testString', 'Hello World');
         $expected = '<h1>Hello World</h1>';
-        $this->assertEquals($expected, $view->renderString('<h1><?= $testString ?></h1>', [], true));
+        $this->assertSame($expected, $view->renderString('<h1><?= $testString ?></h1>', [], true));
         $this->assertCount(0, $view->getPerformanceData());
     }
 
@@ -336,7 +336,7 @@ public function testRenderLayoutWithInclude()
 
         $this->assertTrue(strpos($content, '<p>Open</p>') !== false);
         $this->assertTrue(strpos($content, '<h1>Hello World</h1>') !== false);
-        $this->assertEquals(2, substr_count($content, 'Hello World'));
+        $this->assertSame(2, substr_count($content, 'Hello World'));
     }
 
     public function testRenderLayoutBroken()
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index bdf28fa0eb19..ca3cc49cb19c 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -165,8 +165,16 @@ public function __construct()
                 'target'          => 'newest',
                 'use_class_const' => true,
             ],
-            'php_unit_set_up_tear_down_visibility'   => true,
-            'php_unit_size_class'                    => false,
+            'php_unit_set_up_tear_down_visibility' => true,
+            'php_unit_size_class'                  => false,
+            'php_unit_strict'                      => [
+                'assertions' => [
+                    'assertAttributeEquals',
+                    'assertAttributeNotEquals',
+                    'assertEquals',
+                    'assertNotEquals',
+                ],
+            ],
             'php_unit_test_annotation'               => ['style' => 'prefix'],
             'php_unit_test_case_static_method_calls' => [
                 'call_type' => 'this',

From 7b7d251f898ddb8afcf3fcf0c7d498d448844c19 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Mon, 28 Jun 2021 22:08:40 +0800
Subject: [PATCH 0044/2325] Convert to explicit those implicit string variables
 (#4882)

---
 app/Views/errors/html/error_exception.php  |  2 +-
 system/Commands/Encryption/GenerateKey.php |  4 ++--
 system/Config/DotEnv.php                   |  4 ++--
 system/Database/BaseBuilder.php            | 21 ++++++++++-----------
 system/Database/Postgre/Builder.php        |  4 ++--
 system/Database/SQLSRV/Builder.php         |  4 ++--
 system/Debug/Toolbar.php                   |  2 +-
 system/Format/XMLFormatter.php             |  4 ++--
 system/Helpers/form_helper.php             |  2 +-
 tests/system/CLI/CLITest.php               |  4 ++--
 tests/system/HTTP/MessageTest.php          |  2 +-
 tests/system/Helpers/CookieHelperTest.php  |  4 ++--
 tests/system/Helpers/FormHelperTest.php    | 10 +++++-----
 tests/system/Log/LoggerTest.php            |  2 +-
 utils/PhpCsFixer/CodeIgniter4.php          |  6 ++++--
 15 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
index 626e92fb36df..4477ee08ff8b 100644
--- a/app/Views/errors/html/error_exception.php
+++ b/app/Views/errors/html/error_exception.php
@@ -92,7 +92,7 @@
 
                                         foreach ($row['args'] as $key => $value) : ?>
 											<tr>
-												<td><code><?= esc(isset($params[$key]) ? '$' . $params[$key]->name : "#$key") ?></code></td>
+												<td><code><?= esc(isset($params[$key]) ? '$' . $params[$key]->name : "#{$key}") ?></code></td>
 												<td><pre><?= esc(print_r($value, true)) ?></pre></td>
 											</tr>
 										<?php endforeach ?>
diff --git a/system/Commands/Encryption/GenerateKey.php b/system/Commands/Encryption/GenerateKey.php
index cd9e1f100296..1b7bbbef5801 100644
--- a/system/Commands/Encryption/GenerateKey.php
+++ b/system/Commands/Encryption/GenerateKey.php
@@ -190,7 +190,7 @@ protected function writeNewEncryptionKeyToFile(string $oldKey, string $newKey):
 
         $ret = file_put_contents($envFile, preg_replace(
             $this->keyPattern($oldKey),
-            "\nencryption.key = $newKey",
+            "\nencryption.key = {$newKey}",
             file_get_contents($envFile)
         ));
 
@@ -209,7 +209,7 @@ protected function keyPattern(string $oldKey): string
         $escaped = preg_quote($oldKey, '/');
 
         if ($escaped !== '') {
-            $escaped = "[$escaped]*";
+            $escaped = "[{$escaped}]*";
         }
 
         return "/^[#\s]*encryption.key[=\s]*{$escaped}$/m";
diff --git a/system/Config/DotEnv.php b/system/Config/DotEnv.php
index 92fbad012784..b0b55b1195f2 100644
--- a/system/Config/DotEnv.php
+++ b/system/Config/DotEnv.php
@@ -107,7 +107,7 @@ public function parse(): ?array
     protected function setVariable(string $name, string $value = '')
     {
         if (! getenv($name, true)) {
-            putenv("$name=$value");
+            putenv("{$name}={$value}");
         }
 
         if (empty($_ENV[$name])) {
@@ -192,7 +192,7 @@ protected function sanitizeValue(string $value): string
             );
 
             $value = preg_replace($regexPattern, '$1', $value);
-            $value = str_replace("\\$quote", $quote, $value);
+            $value = str_replace("\\{$quote}", $quote, $value);
             $value = str_replace('\\\\', '\\', $value);
         } else {
             $parts = explode(' #', $value, 2);
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index c2c5f179d29a..2038c1f97cf2 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -776,14 +776,14 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
                 if (empty($op)) {
                     $k .= ' =';
                 } else {
-                    $k .= " $op";
+                    $k .= " {$op}";
                 }
 
                 if ($v instanceof Closure) {
                     $builder = $this->cleanClone();
                     $v       = '(' . str_replace("\n", ' ', $v($builder)->getCompiledSelect()) . ')';
                 } else {
-                    $v = " :$bind:";
+                    $v = " :{$bind}:";
                 }
             } elseif (! $this->hasOperator($k) && $qbKey !== 'QBHaving') {
                 // value appears not to have been set, assign the test to IS NULL
@@ -989,9 +989,8 @@ protected function _whereIn(string $key = null, $values = null, bool $not = fals
             if (CI_DEBUG) {
                 throw new InvalidArgumentException(sprintf('%s() expects $values to be of type array or closure', debug_backtrace(0, 2)[1]['function']));
             }
-            // @codeCoverageIgnoreStart
-            return $this;
-            // @codeCoverageIgnoreEnd
+
+            return $this; // @codeCoverageIgnore
         }
 
         if (! is_bool($escape)) {
@@ -1017,7 +1016,7 @@ protected function _whereIn(string $key = null, $values = null, bool $not = fals
         $prefix = empty($this->$clause) ? $this->groupGetType('') : $this->groupGetType($type);
 
         $whereIn = [
-            'condition' => $prefix . $key . $not . ($values instanceof Closure ? " IN ($ok)" : " IN :{$ok}:"),
+            'condition' => $prefix . $key . $not . ($values instanceof Closure ? " IN ({$ok})" : " IN :{$ok}:"),
             'escape'    => false,
         ];
 
@@ -1236,11 +1235,11 @@ protected function _like($field, string $match = '', string $type = 'AND ', stri
             if ($side === 'none') {
                 $bind = $this->setBind($k, $v, $escape);
             } elseif ($side === 'before') {
-                $bind = $this->setBind($k, "%$v", $escape);
+                $bind = $this->setBind($k, "%{$v}", $escape);
             } elseif ($side === 'after') {
-                $bind = $this->setBind($k, "$v%", $escape);
+                $bind = $this->setBind($k, "{$v}%", $escape);
             } else {
-                $bind = $this->setBind($k, "%$v%", $escape);
+                $bind = $this->setBind($k, "%{$v}%", $escape);
             }
 
             $likeStatement = $this->_like_statement($prefix, $k, $not, $bind, $insensitiveSearch);
@@ -1691,7 +1690,7 @@ public function set($key, ?string $value = '', bool $escape = null)
         foreach ($key as $k => $v) {
             if ($escape) {
                 $bind                                                           = $this->setBind($k, $v, $escape);
-                $this->QBSet[$this->db->protectIdentifiers($k, false, $escape)] = ":$bind:";
+                $this->QBSet[$this->db->protectIdentifiers($k, false, $escape)] = ":{$bind}:";
             } else {
                 $this->QBSet[$this->db->protectIdentifiers($k, false, $escape)] = $v;
             }
@@ -2573,7 +2572,7 @@ public function setUpdateBatch($key, string $index = '', bool $escape = null)
 
                 $bind = $this->setBind($k2, $v2, $escape);
 
-                $clean[$this->db->protectIdentifiers($k2, false, $escape)] = ":$bind:";
+                $clean[$this->db->protectIdentifiers($k2, false, $escape)] = ":{$bind}:";
             }
 
             if ($indexSet === false) {
diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index ad2a25f06920..77079da69c66 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -173,13 +173,13 @@ public function replace(array $set = null)
         $value = $set[$key];
 
         $builder = $this->db->table($table);
-        $exists  = $builder->where("$key = $value", null, false)->get()->getFirstRow();
+        $exists  = $builder->where("{$key} = {$value}", null, false)->get()->getFirstRow();
 
         if (empty($exists)) {
             $result = $builder->insert($set);
         } else {
             array_pop($set);
-            $result = $builder->update($set, "$key = $value");
+            $result = $builder->update($set, "{$key} = {$value}");
         }
 
         unset($builder);
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index 656854093ba0..d35516abb7e5 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -643,14 +643,14 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
                 if (empty($op)) {
                     $k .= ' =';
                 } else {
-                    $k .= " $op";
+                    $k .= " {$op}";
                 }
 
                 if ($v instanceof Closure) {
                     $builder = $this->cleanClone();
                     $v       = '(' . str_replace("\n", ' ', $v($builder)->getCompiledSelect()) . ')';
                 } else {
-                    $v = " :$bind:";
+                    $v = " :{$bind}:";
                 }
             } elseif (! $this->hasOperator($k) && $qbKey !== 'QBHaving') {
                 // value appears not to have been set, assign the test to IS NULL
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 1dae2bd08f36..1ec5b1d41101 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -345,7 +345,7 @@ public function prepare(RequestInterface $request = null, ResponseInterface $res
             // then we send headers saying where to find the debug data
             // for this response
             if ($request->isAJAX() || strpos($format, 'html') === false) {
-                $response->setHeader('Debugbar-Time', "$time")
+                $response->setHeader('Debugbar-Time', "{$time}")
                     ->setHeader('Debugbar-Link', site_url("?debugbar_time={$time}"))
                     ->getBody();
 
diff --git a/system/Format/XMLFormatter.php b/system/Format/XMLFormatter.php
index ff3c5698b6ed..ad129374687b 100644
--- a/system/Format/XMLFormatter.php
+++ b/system/Format/XMLFormatter.php
@@ -64,10 +64,10 @@ protected function arrayToXML(array $data, &$output)
             $key = $this->normalizeXMLTag($key);
 
             if (is_array($value)) {
-                $subnode = $output->addChild("$key");
+                $subnode = $output->addChild("{$key}");
                 $this->arrayToXML($value, $subnode);
             } else {
-                $output->addChild("$key", htmlspecialchars("$value"));
+                $output->addChild("{$key}", htmlspecialchars("{$value}"));
             }
         }
     }
diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
index c1a4b8f0e91d..24954a87c6ef 100644
--- a/system/Helpers/form_helper.php
+++ b/system/Helpers/form_helper.php
@@ -571,7 +571,7 @@ function form_datalist(string $name, string $value, array $options): string
         $out .= "<datalist id='" . $name . '_list' . "'>";
 
         foreach ($options as $option) {
-            $out .= "<option value='$option'>" . "\n";
+            $out .= "<option value='{$option}'>" . "\n";
         }
 
         return $out . ('</datalist>' . "\n");
diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php
index 3d8f3df3229c..117d87a136d4 100644
--- a/tests/system/CLI/CLITest.php
+++ b/tests/system/CLI/CLITest.php
@@ -111,7 +111,7 @@ public function testColorSupportOnNoColor()
 
         CLI::init(); // force re-check on env
         $this->assertSame('test', CLI::color('test', 'white', 'green'));
-        putenv($nocolor ? "NO_COLOR=$nocolor" : 'NO_COLOR');
+        putenv($nocolor ? "NO_COLOR={$nocolor}" : 'NO_COLOR');
     }
 
     public function testColorSupportOnHyperTerminals()
@@ -121,7 +121,7 @@ public function testColorSupportOnHyperTerminals()
 
         CLI::init(); // force re-check on env
         $this->assertSame("\033[1;37m\033[42m\033[4mtest\033[0m", CLI::color('test', 'white', 'green', 'underline'));
-        putenv($termProgram ? "TERM_PROGRAM=$termProgram" : 'TERM_PROGRAM');
+        putenv($termProgram ? "TERM_PROGRAM={$termProgram}" : 'TERM_PROGRAM');
     }
 
     public function testStreamSupports()
diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php
index 50f8a4e6cd04..1adb2bbade7d 100644
--- a/tests/system/HTTP/MessageTest.php
+++ b/tests/system/HTTP/MessageTest.php
@@ -275,7 +275,7 @@ public function testPopulateHeadersWithoutContentType()
         $this->message->populateHeaders();
 
         $this->assertNull($this->message->header('content-type'));
-        putenv("CONTENT_TYPE=$originalEnv");
+        putenv("CONTENT_TYPE={$originalEnv}");
         $this->message->removeHeader('accept-language');
         $_SERVER = $original; // restore so code coverage doesn't break
     }
diff --git a/tests/system/Helpers/CookieHelperTest.php b/tests/system/Helpers/CookieHelperTest.php
index 12dab4b9a2b7..f6060775e801 100755
--- a/tests/system/Helpers/CookieHelperTest.php
+++ b/tests/system/Helpers/CookieHelperTest.php
@@ -78,8 +78,8 @@ public function testSetCookieSecured()
     {
         $pre       = 'Hello, I try to';
         $pst       = 'your site';
-        $unsec     = "$pre <script>alert('Hack');</script> $pst";
-        $sec       = "$pre [removed]alert&#40;&#39;Hack&#39;&#41;;[removed] $pst";
+        $unsec     = "{$pre} <script>alert('Hack');</script> {$pst}";
+        $sec       = "{$pre} [removed]alert&#40;&#39;Hack&#39;&#41;;[removed] {$pst}";
         $unsecured = 'unsecured';
         $secured   = 'secured';
 
diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
index c467d55c5194..f23cdf0d8ede 100644
--- a/tests/system/Helpers/FormHelperTest.php
+++ b/tests/system/Helpers/FormHelperTest.php
@@ -37,7 +37,7 @@ public function testFormOpenBasic()
             $Name     = csrf_token();
             $expected = <<<EOH
                 <form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" accept-charset="utf-8">
-                <input type="hidden" name="$Name" value="$Value" style="display:none;" />
+                <input type="hidden" name="{$Name}" value="{$Value}" style="display:none;" />
 
                 EOH;
         } else {
@@ -95,7 +95,7 @@ public function testFormOpenWithoutAction()
             $Name     = csrf_token();
             $expected = <<<EOH
                 <form action="http://example.com/index.php" name="form" id="form" method="POST" accept-charset="utf-8">
-                <input type="hidden" name="$Name" value="$Value" style="display:none;" />
+                <input type="hidden" name="{$Name}" value="{$Value}" style="display:none;" />
 
                 EOH;
         } else {
@@ -129,7 +129,7 @@ public function testFormOpenWithoutMethod()
             $Name     = csrf_token();
             $expected = <<<EOH
                 <form action="http://example.com/index.php/foo/bar" name="form" id="form" method="post" accept-charset="utf-8">
-                <input type="hidden" name="$Name" value="$Value" style="display:none;" />
+                <input type="hidden" name="{$Name}" value="{$Value}" style="display:none;" />
 
                 EOH;
         } else {
@@ -164,7 +164,7 @@ public function testFormOpenWithHidden()
             $expected = <<<EOH
                 <form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" accept-charset="utf-8">
                 <input type="hidden" name="foo" value="bar" />
-                <input type="hidden" name="$Name" value="$Value" />
+                <input type="hidden" name="{$Name}" value="{$Value}" />
 
                 EOH;
         } else {
@@ -204,7 +204,7 @@ public function testFormOpenMultipart()
             $Name     = csrf_token();
             $expected = <<<EOH
                 <form action="http://example.com/index.php/foo/bar" name="form" id="form" method="POST" enctype="multipart/form-data" accept-charset="utf-8">
-                <input type="hidden" name="$Name" value="$Value" style="display:none;" />
+                <input type="hidden" name="{$Name}" value="{$Value}" style="display:none;" />
 
                 EOH;
         } else {
diff --git a/tests/system/Log/LoggerTest.php b/tests/system/Log/LoggerTest.php
index 0a178086c549..c4ba3a9a67eb 100644
--- a/tests/system/Log/LoggerTest.php
+++ b/tests/system/Log/LoggerTest.php
@@ -213,7 +213,7 @@ public function testLogInterpolatesFileAndLine()
 
         $logger->log('debug', 'Test message {file} {line}');
         $line     = __LINE__ - 1;
-        $expected = "LoggerTest.php $line";
+        $expected = "LoggerTest.php {$line}";
 
         $logs = TestHandler::getLogs();
 
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 2aee033b0889..acea9a43bfda 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -113,8 +113,9 @@ public function __construct()
                 'noise_remaining_usages'         => false,
                 'noise_remaining_usages_exclude' => [],
             ],
-            'final_class'          => false,
-            'final_internal_class' => [
+            'explicit_string_variable' => true,
+            'final_class'              => false,
+            'final_internal_class'     => [
                 'annotation_exclude'                         => ['@no-final'],
                 'annotation_include'                         => ['@internal'],
                 'consider_absent_docblock_as_internal_class' => false,
@@ -270,6 +271,7 @@ public function __construct()
             'psr_autoloading'                     => ['dir' => null],
             'set_type_to_cast'                    => true,
             'short_scalar_cast'                   => true,
+            'simple_to_complex_string_variable'   => true,
             'standardize_increment'               => true,
             'static_lambda'                       => true,
             'switch_case_semicolon_to_colon'      => true,

From 308d0bed2dad24707deb2695c65706bb5e40c261 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Mon, 28 Jun 2021 22:10:44 +0800
Subject: [PATCH 0045/2325] Enable `explicit_indirect_variable` (#4881)

---
 system/BaseModel.php                   |  6 +++---
 system/CLI/BaseCommand.php             |  4 ++--
 system/Common.php                      |  2 +-
 system/Config/BaseConfig.php           | 21 ++++++++++-----------
 system/Config/Factories.php            |  2 +-
 system/Controller.php                  |  6 +++---
 system/Database/BaseBuilder.php        | 18 +++++++++---------
 system/Database/BaseConnection.php     |  6 +++---
 system/Database/BaseResult.php         |  2 +-
 system/Database/Config.php             |  6 +++---
 system/Database/SQLSRV/Builder.php     |  2 +-
 system/Database/SQLite3/Result.php     |  2 +-
 system/Debug/Exceptions.php            |  4 ++--
 system/Email/Email.php                 |  6 +++---
 system/Entity/Entity.php               |  4 ++--
 system/HTTP/ResponseTrait.php          |  2 +-
 system/HTTP/UserAgent.php              |  2 +-
 system/Helpers/array_helper.php        |  2 +-
 system/I18n/Time.php                   |  4 ++--
 system/Images/Handlers/BaseHandler.php |  2 +-
 system/Model.php                       |  6 +++---
 system/Test/CIUnitTestCase.php         |  6 +++---
 system/Test/DatabaseTestTrait.php      |  2 +-
 system/Test/Fabricator.php             |  4 ++--
 system/Validation/Validation.php       | 24 ++++++++++++------------
 system/View/Cell.php                   |  2 +-
 tests/system/API/ResponseTraitTest.php |  4 ++--
 tests/system/CommonFunctionsTest.php   |  2 +-
 tests/system/Session/SessionTest.php   |  2 +-
 tests/system/Test/TestResponseTest.php |  2 +-
 utils/PhpCsFixer/CodeIgniter4.php      |  7 ++++---
 31 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/system/BaseModel.php b/system/BaseModel.php
index af0175352e93..b6bee0677f33 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -1633,10 +1633,10 @@ protected function transformDataToArray($data, string $type): array
     public function __get(string $name)
     {
         if (property_exists($this, $name)) {
-            return $this->$name;
+            return $this->{$name};
         }
 
-        return $this->db->$name ?? null;
+        return $this->db->{$name} ?? null;
     }
 
     /**
@@ -1652,7 +1652,7 @@ public function __isset(string $name): bool
             return true;
         }
 
-        return isset($this->db->$name);
+        return isset($this->db->{$name});
     }
 
     /**
diff --git a/system/CLI/BaseCommand.php b/system/CLI/BaseCommand.php
index 44e22a1b2a3f..d548f26c402e 100644
--- a/system/CLI/BaseCommand.php
+++ b/system/CLI/BaseCommand.php
@@ -230,7 +230,7 @@ public function getPad(array $array, int $pad): int
      */
     public function __get(string $key)
     {
-        return $this->$key ?? null;
+        return $this->{$key} ?? null;
     }
 
     /**
@@ -242,6 +242,6 @@ public function __get(string $key)
      */
     public function __isset(string $key): bool
     {
-        return isset($this->$key);
+        return isset($this->{$key});
     }
 }
diff --git a/system/Common.php b/system/Common.php
index ed2f57dd3f1a..da8edd0fcac0 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -457,7 +457,7 @@ function esc($data, string $context = 'html', string $encoding = null)
                 $escaper = new Escaper($encoding);
             }
 
-            $data = $escaper->$method($data);
+            $data = $escaper->{$method}($data);
         }
 
         return $data;
diff --git a/system/Config/BaseConfig.php b/system/Config/BaseConfig.php
index bbe98ce3c4c3..48d80f08547b 100644
--- a/system/Config/BaseConfig.php
+++ b/system/Config/BaseConfig.php
@@ -69,16 +69,15 @@ public function __construct()
         $shortPrefix = strtolower(substr($prefix, $slashAt === false ? 0 : $slashAt + 1));
 
         foreach ($properties as $property) {
-            $this->initEnvValue($this->$property, $property, $prefix, $shortPrefix);
+            $this->initEnvValue($this->{$property}, $property, $prefix, $shortPrefix);
 
             if ($this instanceof Encryption && $property === 'key') {
-                // Handle hex2bin prefix
-                if (strpos($this->$property, 'hex2bin:') === 0) {
-                    $this->$property = hex2bin(substr($this->$property, 8));
-                }
-                // Handle base64 prefix
-                elseif (strpos($this->$property, 'base64:') === 0) {
-                    $this->$property = base64_decode(substr($this->$property, 7), true);
+                if (strpos($this->{$property}, 'hex2bin:') === 0) {
+                    // Handle hex2bin prefix
+                    $this->{$property} = hex2bin(substr($this->{$property}, 8));
+                } elseif (strpos($this->{$property}, 'base64:') === 0) {
+                    // Handle base64 prefix
+                    $this->{$property} = base64_decode(substr($this->{$property}, 7), true);
                 }
             }
         }
@@ -188,10 +187,10 @@ protected function registerProperties()
             }
 
             foreach ($properties as $property => $value) {
-                if (isset($this->$property) && is_array($this->$property) && is_array($value)) {
-                    $this->$property = array_merge($this->$property, $value);
+                if (isset($this->{$property}) && is_array($this->{$property}) && is_array($value)) {
+                    $this->{$property} = array_merge($this->{$property}, $value);
                 } else {
-                    $this->$property = $value;
+                    $this->{$property} = $value;
                 }
             }
         }
diff --git a/system/Config/Factories.php b/system/Config/Factories.php
index 88e905e61560..97218b6ea513 100644
--- a/system/Config/Factories.php
+++ b/system/Config/Factories.php
@@ -242,7 +242,7 @@ public static function getOptions(string $component): array
             // Handle Config as a special case to prevent logic loops
             ? self::$configOptions
             // Load values from the best Factory configuration (will include Registrars)
-            : config('Factory')->$component ?? [];
+            : config('Factory')->{$component} ?? [];
 
         return self::setOptions($component, $values);
     }
diff --git a/system/Controller.php b/system/Controller.php
index 93f8b0c3efbf..d19adf550fac 100644
--- a/system/Controller.php
+++ b/system/Controller.php
@@ -162,17 +162,17 @@ protected function validate($rules, array $messages = []): bool
 
             // If the rule wasn't found in the \Config\Validation, we
             // should throw an exception so the developer can find it.
-            if (! isset($validation->$rules)) {
+            if (! isset($validation->{$rules})) {
                 throw ValidationException::forRuleNotFound($rules);
             }
 
             // If no error message is defined, use the error message in the Config\Validation file
             if (! $messages) {
                 $errorName = $rules . '_errors';
-                $messages  = $validation->$errorName ?? [];
+                $messages  = $validation->{$errorName} ?? [];
             }
 
-            $rules = $validation->$rules;
+            $rules = $validation->{$rules};
         }
 
         return $this->validator->withRequest($this->request)->setRules($rules, $messages)->run();
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 2038c1f97cf2..612794b4745f 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -272,7 +272,7 @@ public function __construct($tableName, ConnectionInterface &$db, array $options
         if (! empty($options)) {
             foreach ($options as $key => $value) {
                 if (property_exists($this, $key)) {
-                    $this->$key = $value;
+                    $this->{$key} = $value;
                 }
             }
         }
@@ -754,7 +754,7 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
         }
 
         foreach ($key as $k => $v) {
-            $prefix = empty($this->$qbKey) ? $this->groupGetType('') : $this->groupGetType($type);
+            $prefix = empty($this->{$qbKey}) ? $this->groupGetType('') : $this->groupGetType($type);
 
             if ($v !== null) {
                 $op = $this->getOperator($k, true);
@@ -1013,7 +1013,7 @@ protected function _whereIn(string $key = null, $values = null, bool $not = fals
             $ok      = $this->setBind($ok, $whereIn, $escape);
         }
 
-        $prefix = empty($this->$clause) ? $this->groupGetType('') : $this->groupGetType($type);
+        $prefix = empty($this->{$clause}) ? $this->groupGetType('') : $this->groupGetType($type);
 
         $whereIn = [
             'condition' => $prefix . $key . $not . ($values instanceof Closure ? " IN ({$ok})" : " IN :{$ok}:"),
@@ -1230,7 +1230,7 @@ protected function _like($field, string $match = '', string $type = 'AND ', stri
                 $v = strtolower($v);
             }
 
-            $prefix = empty($this->$clause) ? $this->groupGetType('') : $this->groupGetType($type);
+            $prefix = empty($this->{$clause}) ? $this->groupGetType('') : $this->groupGetType($type);
 
             if ($side === 'none') {
                 $bind = $this->setBind($k, $v, $escape);
@@ -1416,7 +1416,7 @@ protected function groupStartPrepare(string $not = '', string $type = 'AND ', st
         $type = $this->groupGetType($type);
 
         $this->QBWhereGroupStarted = true;
-        $prefix                    = empty($this->$clause) ? '' : $type;
+        $prefix                    = empty($this->{$clause}) ? '' : $type;
         $where                     = [
             'condition' => $prefix . $not . str_repeat(' ', ++$this->QBWhereGroupCount) . ' (',
             'escape'    => false,
@@ -2917,8 +2917,8 @@ protected function compileIgnore(string $statement)
      */
     protected function compileWhereHaving(string $qbKey): string
     {
-        if (! empty($this->$qbKey)) {
-            foreach ($this->$qbKey as &$qbkey) {
+        if (! empty($this->{$qbKey})) {
+            foreach ($this->{$qbKey} as &$qbkey) {
                 // Is this condition already compiled?
                 if (is_string($qbkey)) {
                     continue;
@@ -2974,7 +2974,7 @@ protected function compileWhereHaving(string $qbKey): string
             }
 
             return ($qbKey === 'QBHaving' ? "\nHAVING " : "\nWHERE ")
-                    . implode("\n", $this->$qbKey);
+                    . implode("\n", $this->{$qbKey});
         }
 
         return '';
@@ -3172,7 +3172,7 @@ public function resetQuery()
     protected function resetRun(array $qbResetItems)
     {
         foreach ($qbResetItems as $item => $defaultValue) {
-            $this->$item = $defaultValue;
+            $this->{$item} = $defaultValue;
         }
     }
 
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 98422325cf15..30c1e4f5b443 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -307,7 +307,7 @@ abstract class BaseConnection implements ConnectionInterface
     public function __construct(array $params)
     {
         foreach ($params as $key => $value) {
-            $this->$key = $value;
+            $this->{$key} = $value;
         }
 
         $queryClass = str_replace('Connection', 'Query', static::class);
@@ -360,7 +360,7 @@ public function initialize()
                     // Replace the current settings with those of the failover
                     foreach ($failover as $key => $val) {
                         if (property_exists($this, $key)) {
-                            $this->$key = $val;
+                            $this->{$key} = $val;
                         }
                     }
 
@@ -1783,7 +1783,7 @@ abstract protected function _foreignKeyData(string $table): array;
     public function __get(string $key)
     {
         if (property_exists($this, $key)) {
-            return $this->$key;
+            return $this->{$key};
         }
 
         return null;
diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php
index 9c22e34ca74a..189313248dae 100644
--- a/system/Database/BaseResult.php
+++ b/system/Database/BaseResult.php
@@ -144,7 +144,7 @@ public function getCustomResultObject(string $className)
                 $this->customResultObject[$className][$i] = new $className();
 
                 foreach ($this->{$_data}[$i] as $key => $value) {
-                    $this->customResultObject[$className][$i]->$key = $value;
+                    $this->customResultObject[$className][$i]->{$key} = $value;
                 }
             }
 
diff --git a/system/Database/Config.php b/system/Database/Config.php
index bde77f39c1e2..9201afb480b6 100644
--- a/system/Database/Config.php
+++ b/system/Database/Config.php
@@ -64,7 +64,7 @@ public static function connect($group = null, bool $getShared = true)
             $group = ENVIRONMENT === 'testing' ? 'tests' : $config->defaultGroup;
         }
 
-        if (is_string($group) && ! isset($config->$group) && strpos($group, 'custom-') !== 0) {
+        if (is_string($group) && ! isset($config->{$group}) && strpos($group, 'custom-') !== 0) {
             throw new InvalidArgumentException($group . ' is not a valid database connection group.');
         }
 
@@ -74,8 +74,8 @@ public static function connect($group = null, bool $getShared = true)
 
         static::ensureFactory();
 
-        if (isset($config->$group)) {
-            $config = $config->$group;
+        if (isset($config->{$group})) {
+            $config = $config->{$group};
         }
 
         $connection = static::$factory->load($config, $group);
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index d35516abb7e5..39d72d207aa8 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -621,7 +621,7 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
         }
 
         foreach ($key as $k => $v) {
-            $prefix = empty($this->$qbKey) ? $this->groupGetType('') : $this->groupGetType($type);
+            $prefix = empty($this->{$qbKey}) ? $this->groupGetType('') : $this->groupGetType($type);
 
             if ($v !== null) {
                 $op = $this->getOperator($k, true);
diff --git a/system/Database/SQLite3/Result.php b/system/Database/SQLite3/Result.php
index 4bddc63fe854..b8902b5a81d4 100644
--- a/system/Database/SQLite3/Result.php
+++ b/system/Database/SQLite3/Result.php
@@ -164,7 +164,7 @@ protected function fetchObject(string $className = 'stdClass')
         }
 
         $classSet = Closure::bind(function ($key, $value) {
-            $this->$key = $value;
+            $this->{$key} = $value;
         }, $classObj, $className);
 
         foreach (array_keys($row) as $key) {
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index 65222b0a6b06..c613579332f0 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -313,8 +313,8 @@ protected function maskSensitiveData(&$trace, array $keysToMask, string $path =
             if (strpos(strrev($path . '/' . $index), strrev($keyToMask)) === 0) {
                 if (is_array($trace) && array_key_exists($index, $trace)) {
                     $trace[$index] = '******************';
-                } elseif (is_object($trace) && property_exists($trace, $index) && isset($trace->$index)) {
-                    $trace->$index = '******************';
+                } elseif (is_object($trace) && property_exists($trace, $index) && isset($trace->{$index})) {
+                    $trace->{$index} = '******************';
                 }
             }
         }
diff --git a/system/Email/Email.php b/system/Email/Email.php
index 406a8c5ee7c9..1a49b03ab0ca 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -420,9 +420,9 @@ public function initialize($config)
                 $method = 'set' . ucfirst($key);
 
                 if (method_exists($this, $method)) {
-                    $this->$method($config[$key]);
+                    $this->{$method}($config[$key]);
                 } else {
-                    $this->$key = $config[$key];
+                    $this->{$key} = $config[$key];
                 }
             }
         }
@@ -1741,7 +1741,7 @@ protected function spoolEmail()
         $method   = 'sendWith' . ucfirst($protocol);
 
         try {
-            $success = $this->$method();
+            $success = $this->{$method}();
         } catch (ErrorException $e) {
             $success = false;
             log_message('error', 'Email: ' . $method . ' throwed ' . $e->getMessage());
diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index 7a63503f2dc7..753f9106f975 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -477,7 +477,7 @@ public function __set(string $key, $value = null)
         $method = 'set' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key)));
 
         if (method_exists($this, $method)) {
-            $this->$method($value);
+            $this->{$method}($value);
 
             return $this;
         }
@@ -517,7 +517,7 @@ public function __get(string $key)
         // if a set* method exists for this key,
         // use that method to insert this value.
         if (method_exists($this, $method)) {
-            $result = $this->$method();
+            $result = $this->{$method}();
         }
 
         // Otherwise return the protected property
diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
index 38ab87ba9e2c..2e88e71b7941 100644
--- a/system/HTTP/ResponseTrait.php
+++ b/system/HTTP/ResponseTrait.php
@@ -573,7 +573,7 @@ public function setCookie(
             // always leave 'name' in last place, as the loop will break otherwise, due to $$item
             foreach (['samesite', 'value', 'expire', 'domain', 'path', 'prefix', 'secure', 'httponly', 'name'] as $item) {
                 if (isset($name[$item])) {
-                    $$item = $name[$item];
+                    ${$item} = $name[$item];
                 }
             }
         }
diff --git a/system/HTTP/UserAgent.php b/system/HTTP/UserAgent.php
index 26754bfe8fdc..6fe613f43de6 100644
--- a/system/HTTP/UserAgent.php
+++ b/system/HTTP/UserAgent.php
@@ -333,7 +333,7 @@ protected function compileData()
         $this->setPlatform();
 
         foreach (['setRobot', 'setBrowser', 'setMobile'] as $function) {
-            if ($this->$function() === true) {
+            if ($this->{$function}() === true) {
                 break;
             }
         }
diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php
index 7f95aecdaf80..d0af3e579d05 100644
--- a/system/Helpers/array_helper.php
+++ b/system/Helpers/array_helper.php
@@ -169,7 +169,7 @@ function array_sort_by_multiple_keys(array &$array, array $sortColumns): bool
                 if (is_object(reset($carry))) {
                     // Extract the object attribute
                     foreach ($carry as $index => $object) {
-                        $carry[$index] = $object->$keySegment;
+                        $carry[$index] = $object->{$keySegment};
                     }
 
                     continue;
diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index d3899a7b883a..e1af6f06e522 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -778,7 +778,7 @@ protected function setValue(string $name, $value)
     {
         [$year, $month, $day, $hour, $minute, $second] = explode('-', $this->format('Y-n-j-G-i-s'));
 
-        $$name = $value;
+        ${$name} = $value;
 
         return Time::create(
             (int) $year,
@@ -1352,7 +1352,7 @@ public function __get($name)
         $method = 'get' . ucfirst($name);
 
         if (method_exists($this, $method)) {
-            return $this->$method();
+            return $this->{$method}();
         }
 
         return null;
diff --git a/system/Images/Handlers/BaseHandler.php b/system/Images/Handlers/BaseHandler.php
index bcda8e98561e..4a8cc941735c 100644
--- a/system/Images/Handlers/BaseHandler.php
+++ b/system/Images/Handlers/BaseHandler.php
@@ -812,7 +812,7 @@ abstract protected function process(string $action);
     public function __call(string $name, array $args = [])
     {
         if (method_exists($this->image(), $name)) {
-            return $this->image()->$name(...$args);
+            return $this->image()->{$name}(...$args);
         }
     }
 
diff --git a/system/Model.php b/system/Model.php
index 7376d59e3cde..3a8d1fe96d6b 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -710,8 +710,8 @@ public function __get(string $name)
             return parent::__get($name);
         }
 
-        if (isset($this->builder()->$name)) {
-            return $this->builder()->$name;
+        if (isset($this->builder()->{$name})) {
+            return $this->builder()->{$name};
         }
 
         return null;
@@ -730,7 +730,7 @@ public function __isset(string $name): bool
             return true;
         }
 
-        return isset($this->builder()->$name);
+        return isset($this->builder()->{$name});
     }
 
     /**
diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
index ef625c340210..6a0d6dd10354 100644
--- a/system/Test/CIUnitTestCase.php
+++ b/system/Test/CIUnitTestCase.php
@@ -236,7 +236,7 @@ protected function setUp(): void
         }
 
         foreach ($this->setUpMethods as $method) {
-            $this->$method();
+            $this->{$method}();
         }
 
         // Check for the database trait
@@ -253,7 +253,7 @@ protected function tearDown(): void
         parent::tearDown();
 
         foreach ($this->tearDownMethods as $method) {
-            $this->$method();
+            $this->{$method}();
         }
 
         // Check for the database trait
@@ -283,7 +283,7 @@ private function callTraitMethods(string $stage): void
             $method = $stage . class_basename($trait);
 
             if (method_exists($this, $method)) {
-                $this->$method();
+                $this->{$method}();
             }
         }
     }
diff --git a/system/Test/DatabaseTestTrait.php b/system/Test/DatabaseTestTrait.php
index cd444c57406a..b39ec500d542 100644
--- a/system/Test/DatabaseTestTrait.php
+++ b/system/Test/DatabaseTestTrait.php
@@ -273,7 +273,7 @@ public function grabFromDatabase(string $table, string $column, array $where)
 
         $query = $query->getRow();
 
-        return $query->$column ?? false;
+        return $query->{$column} ?? false;
     }
 
     //--------------------------------------------------------------------
diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
index 0505298d634c..cc1260995322 100644
--- a/system/Test/Fabricator.php
+++ b/system/Test/Fabricator.php
@@ -126,8 +126,8 @@ public function __construct($model, array $formatters = null, string $locale = n
 
         // Determine eligible date fields
         foreach (['createdField', 'updatedField', 'deletedField'] as $field) {
-            if (! empty($this->model->$field)) {
-                $this->dateFields[] = $this->model->$field;
+            if (! empty($this->model->{$field})) {
+                $this->dateFields[] = $this->model->{$field};
             }
         }
 
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 476b161e8aaa..2c5eee378fda 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -243,7 +243,7 @@ protected function processRules(string $field, string $label = null, $value, $ru
                                 continue;
                             }
 
-                            $passed = $passed && $set->$rule($value, $param, $data);
+                            $passed = $passed && $set->{$rule}($value, $param, $data);
                             break;
                         }
                     }
@@ -284,7 +284,7 @@ protected function processRules(string $field, string $label = null, $value, $ru
                     }
 
                     $found  = true;
-                    $passed = $param === false ? $set->$rule($value, $error) : $set->$rule($value, $param, $data, $error);
+                    $passed = $param === false ? $set->{$rule}($value, $error) : $set->{$rule}($value, $param, $data, $error);
 
                     break;
                 }
@@ -450,15 +450,15 @@ public function hasRule(string $field): bool
      */
     public function getRuleGroup(string $group): array
     {
-        if (! isset($this->config->$group)) {
+        if (! isset($this->config->{$group})) {
             throw ValidationException::forGroupNotFound($group);
         }
 
-        if (! is_array($this->config->$group)) {
+        if (! is_array($this->config->{$group})) {
             throw ValidationException::forGroupNotArray($group);
         }
 
-        return $this->config->$group;
+        return $this->config->{$group};
     }
 
     /**
@@ -474,8 +474,8 @@ public function setRuleGroup(string $group)
         $this->setRules($rules);
 
         $errorName = $group . '_errors';
-        if (isset($this->config->$errorName)) {
-            $this->customErrors = $this->config->$errorName;
+        if (isset($this->config->{$errorName})) {
+            $this->customErrors = $this->config->{$errorName};
         }
     }
 
@@ -553,22 +553,22 @@ public function loadRuleGroup(string $group = null)
             return null;
         }
 
-        if (! isset($this->config->$group)) {
+        if (! isset($this->config->{$group})) {
             throw ValidationException::forGroupNotFound($group);
         }
 
-        if (! is_array($this->config->$group)) {
+        if (! is_array($this->config->{$group})) {
             throw ValidationException::forGroupNotArray($group);
         }
 
-        $this->setRules($this->config->$group);
+        $this->setRules($this->config->{$group});
 
         // If {group}_errors exists in the config file,
         // then override our custom errors with them.
         $errorName = $group . '_errors';
 
-        if (isset($this->config->$errorName)) {
-            $this->customErrors = $this->config->$errorName;
+        if (isset($this->config->{$errorName})) {
+            $this->customErrors = $this->config->{$errorName};
         }
 
         return $this->rules;
diff --git a/system/View/Cell.php b/system/View/Cell.php
index e168596add4f..c97625a2ef66 100644
--- a/system/View/Cell.php
+++ b/system/View/Cell.php
@@ -137,7 +137,7 @@ public function render(string $library, $params = null, int $ttl = 0, string $ca
                 }
             }
 
-            $output = $instance->$method(...array_values($fireArgs));
+            $output = $instance->{$method}(...array_values($fireArgs));
         }
         // Can we cache it?
         if (! empty($this->cache) && $ttl !== 0) {
diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
index 7ec5f5418623..865fc72eb7e5 100644
--- a/tests/system/API/ResponseTraitTest.php
+++ b/tests/system/API/ResponseTraitTest.php
@@ -51,7 +51,7 @@ protected function makeController(array $userConfig = [], string $uri = 'http://
             'proxyIPs' => [],
             'cookieSameSite' => 'Lax',
         ] as $key => $value) {
-            $config->$key = $value;
+            $config->{$key} = $value;
         }
 
         if (is_null($this->request)) {
@@ -509,7 +509,7 @@ public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
             'proxyIPs' => [],
             'cookieSameSite' => 'Lax',
         ] as $key => $value) {
-            $config->$key = $value;
+            $config->{$key} = $value;
         }
 
         $request  = new MockIncomingRequest($config, new URI($config->baseURL), null, new UserAgent());
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index c76c3191e992..ce8a7c474175 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -371,7 +371,7 @@ protected function injectSessionMock()
         $appConfig = new App();
 
         foreach ($defaults as $key => $config) {
-            $appConfig->$key = $config;
+            $appConfig->{$key} = $config;
         }
 
         $session = new MockSession(new FileHandler($appConfig, '127.0.0.1'), $appConfig);
diff --git a/tests/system/Session/SessionTest.php b/tests/system/Session/SessionTest.php
index ab49c2830200..a125badd461b 100644
--- a/tests/system/Session/SessionTest.php
+++ b/tests/system/Session/SessionTest.php
@@ -50,7 +50,7 @@ protected function getInstance($options = [])
         $appConfig = new AppConfig();
 
         foreach ($config as $key => $c) {
-            $appConfig->$key = $c;
+            $appConfig->{$key} = $c;
         }
 
         $session = new MockSession(new FileHandler($appConfig, '127.0.0.1'), $appConfig);
diff --git a/tests/system/Test/TestResponseTest.php b/tests/system/Test/TestResponseTest.php
index 83050190b791..f63bf6429685 100644
--- a/tests/system/Test/TestResponseTest.php
+++ b/tests/system/Test/TestResponseTest.php
@@ -419,7 +419,7 @@ protected function getTestResponse($body = null, array $responseOptions = [], ar
             $method = 'set' . ucfirst($key);
 
             if (method_exists($this->response, $method)) {
-                $this->response = $this->response->$method($value);
+                $this->response = $this->response->{$method}($value);
             }
         }
 
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index acea9a43bfda..47faf8c2317a 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -113,9 +113,10 @@ public function __construct()
                 'noise_remaining_usages'         => false,
                 'noise_remaining_usages_exclude' => [],
             ],
-            'explicit_string_variable' => true,
-            'final_class'              => false,
-            'final_internal_class'     => [
+            'explicit_indirect_variable' => true,
+            'explicit_string_variable'   => true,
+            'final_class'                => false,
+            'final_internal_class'       => [
                 'annotation_exclude'                         => ['@no-final'],
                 'annotation_include'                         => ['@internal'],
                 'consider_absent_docblock_as_internal_class' => false,

From 9acff4fe0444e2264720e0550a1a11e29aa38f2f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Jun 2021 16:43:44 +0000
Subject: [PATCH 0046/2325] Update rector/rector requirement from 0.11.23 to
 0.11.28 (#4889)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index b5805b3a510a..6cd2bf12c4ec 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "phpstan/phpstan": "0.12.90",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.23",
+        "rector/rector": "0.11.28",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {

From e524097492e1cbf1544416d09f0f4d82e88c8785 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Wed, 30 Jun 2021 17:03:52 +0700
Subject: [PATCH 0047/2325] Update to rector 0.11.29

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 6cd2bf12c4ec..4744042b7d0e 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "phpstan/phpstan": "0.12.90",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.28",
+        "rector/rector": "0.11.29",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {

From 0641dd9023a6595aa30534b6a99c9ae0854981de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 15:37:38 +0000
Subject: [PATCH 0048/2325] Update rector/rector requirement from 0.11.29 to
 0.11.32 (#4895)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 4744042b7d0e..957d5a0220f2 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "phpstan/phpstan": "0.12.90",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.29",
+        "rector/rector": "0.11.32",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {

From 05988508d191ddea319054b46bbeaa306f6d160b Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Fri, 2 Jul 2021 16:58:12 +0800
Subject: [PATCH 0049/2325] Enable remaining rules in "f" (#4888)

---
 system/HTTP/CURLRequest.php                   |  2 +-
 system/HTTP/Files/UploadedFile.php            |  2 +-
 tests/system/Log/Handlers/FileHandlerTest.php |  4 +-
 utils/PhpCsFixer/CodeIgniter4.php             | 41 +++++++++++--------
 4 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index d1d4ace131c2..20e1fa32379b 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -617,7 +617,7 @@ protected function setCURLOptions(array $curlOptions = [], array $config = [])
         // Debug
         if ($config['debug']) {
             $curlOptions[CURLOPT_VERBOSE] = 1;
-            $curlOptions[CURLOPT_STDERR]  = is_string($config['debug']) ? fopen($config['debug'], 'a+') : fopen('php://stderr', 'w');
+            $curlOptions[CURLOPT_STDERR]  = is_string($config['debug']) ? fopen($config['debug'], 'a+b') : fopen('php://stderr', 'wb');
         }
 
         // Decode Content
diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
index e73cea923896..351ffa7de24d 100644
--- a/system/HTTP/Files/UploadedFile.php
+++ b/system/HTTP/Files/UploadedFile.php
@@ -177,7 +177,7 @@ protected function setPath(string $path): string
             mkdir($path, 0777, true);
             //create the index.html file
             if (! is_file($path . 'index.html')) {
-                $file = fopen($path . 'index.html', 'x+');
+                $file = fopen($path . 'index.html', 'x+b');
                 fclose($file);
             }
         }
diff --git a/tests/system/Log/Handlers/FileHandlerTest.php b/tests/system/Log/Handlers/FileHandlerTest.php
index dca8d3ad1bc5..ef55dcbbc6ef 100644
--- a/tests/system/Log/Handlers/FileHandlerTest.php
+++ b/tests/system/Log/Handlers/FileHandlerTest.php
@@ -56,7 +56,7 @@ public function testHandleCreateFile()
         vfsStream::newFile($expected)->at(vfsStream::setup('root'))->withContent('This is a test log');
         $logger->handle('warning', 'This is a test log');
 
-        $fp   = fopen($config->handlers['Tests\Support\Log\Handlers\TestHandler']['path'] . $expected, 'r');
+        $fp   = fopen($config->handlers['Tests\Support\Log\Handlers\TestHandler']['path'] . $expected, 'rb');
         $line = fgets($fp);
         fclose($fp);
 
@@ -75,7 +75,7 @@ public function testHandleDateTimeCorrectly()
         $expected = 'log-' . date('Y-m-d') . '.log';
         vfsStream::newFile($expected)->at(vfsStream::setup('root'))->withContent('Test message');
         $logger->handle('debug', 'Test message');
-        $fp   = fopen($config->handlers['Tests\Support\Log\Handlers\TestHandler']['path'] . $expected, 'r');
+        $fp   = fopen($config->handlers['Tests\Support\Log\Handlers\TestHandler']['path'] . $expected, 'rb');
         $line = fgets($fp); // and get the second line
         fclose($fp);
 
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 47faf8c2317a..09838317afe1 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -121,23 +121,30 @@ public function __construct()
                 'annotation_include'                         => ['@internal'],
                 'consider_absent_docblock_as_internal_class' => false,
             ],
-            'function_to_constant'        => true,
-            'heredoc_indentation'         => ['indentation' => 'start_plus_one'],
-            'heredoc_to_nowdoc'           => true,
-            'increment_style'             => ['style' => 'post'],
-            'indentation_type'            => true,
-            'lambda_not_used_import'      => true,
-            'line_ending'                 => true,
-            'linebreak_after_opening_tag' => true,
-            'list_syntax'                 => ['syntax' => 'short'],
-            'logical_operators'           => true,
-            'lowercase_cast'              => true,
-            'lowercase_keywords'          => true,
-            'lowercase_static_reference'  => true,
-            'magic_constant_casing'       => true,
-            'magic_method_casing'         => true,
-            'mb_str_functions'            => false,
-            'method_argument_space'       => [
+            'final_public_method_for_abstract_class' => false,
+            'fopen_flag_order'                       => true,
+            'fopen_flags'                            => ['b_mode' => true],
+            'full_opening_tag'                       => true,
+            'fully_qualified_strict_types'           => true,
+            'function_declaration'                   => ['closure_function_spacing' => 'one'],
+            'function_typehint_space'                => true,
+            'function_to_constant'                   => true,
+            'heredoc_indentation'                    => ['indentation' => 'start_plus_one'],
+            'heredoc_to_nowdoc'                      => true,
+            'increment_style'                        => ['style' => 'post'],
+            'indentation_type'                       => true,
+            'lambda_not_used_import'                 => true,
+            'line_ending'                            => true,
+            'linebreak_after_opening_tag'            => true,
+            'list_syntax'                            => ['syntax' => 'short'],
+            'logical_operators'                      => true,
+            'lowercase_cast'                         => true,
+            'lowercase_keywords'                     => true,
+            'lowercase_static_reference'             => true,
+            'magic_constant_casing'                  => true,
+            'magic_method_casing'                    => true,
+            'mb_str_functions'                       => false,
+            'method_argument_space'                  => [
                 'after_heredoc'                    => false,
                 'keep_multiple_spaces_after_comma' => false,
                 'on_multiline'                     => 'ensure_fully_multiline',

From e1b3ec08355bff8efba71feb190d6240a5efc8f2 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Fri, 2 Jul 2021 23:58:00 +0800
Subject: [PATCH 0050/2325] Enable `escape_implicit_backslashes` fixer (#4880)

---
 system/CLI/CLI.php                              |  2 +-
 system/CLI/GeneratorTrait.php                   |  2 +-
 system/Commands/Encryption/GenerateKey.php      |  2 +-
 system/Database/BaseBuilder.php                 |  2 +-
 system/Database/Database.php                    |  2 +-
 system/Database/SQLSRV/Builder.php              |  2 +-
 system/Helpers/text_helper.php                  |  2 +-
 system/Typography/Typography.php                |  2 +-
 tests/system/Commands/ScaffoldGeneratorTest.php | 10 +++++-----
 tests/system/Database/Live/EscapeTest.php       |  2 +-
 tests/system/Database/Live/InsertTest.php       |  2 +-
 tests/system/Helpers/TextHelperTest.php         |  4 ++--
 utils/PhpCsFixer/CodeIgniter4.php               |  5 +++++
 13 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index 4d5ad1ec8ab5..8e293d66a565 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -506,7 +506,7 @@ public static function color(string $text, string $foreground, string $backgroun
         if (strpos($text, "\033[0m") !== false) {
             // Split the text into parts so that we can see
             // if any part missing the color definition
-            $chunks = mb_split("\\033\[0m", $text);
+            $chunks = mb_split("\\033\\[0m", $text);
             // Reset text
             $text = '';
 
diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php
index 925f1c73a6b5..ce3b97ec253f 100644
--- a/system/CLI/GeneratorTrait.php
+++ b/system/CLI/GeneratorTrait.php
@@ -254,7 +254,7 @@ protected function renderTemplate(array $data = []): string
         } catch (Throwable $e) {
             log_message('error', $e->getMessage());
 
-            return view("CodeIgniter\Commands\Generators\Views\\{$this->template}", $data, ['debug' => false]);
+            return view("CodeIgniter\\Commands\\Generators\\Views\\{$this->template}", $data, ['debug' => false]);
         }
     }
 
diff --git a/system/Commands/Encryption/GenerateKey.php b/system/Commands/Encryption/GenerateKey.php
index 1b7bbbef5801..f87563a3cc23 100644
--- a/system/Commands/Encryption/GenerateKey.php
+++ b/system/Commands/Encryption/GenerateKey.php
@@ -212,6 +212,6 @@ protected function keyPattern(string $oldKey): string
             $escaped = "[{$escaped}]*";
         }
 
-        return "/^[#\s]*encryption.key[=\s]*{$escaped}$/m";
+        return "/^[#\\s]*encryption.key[=\\s]*{$escaped}$/m";
     }
 }
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 612794b4745f..28213478a76b 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -671,7 +671,7 @@ public function join(string $table, string $cond, string $type = '', bool $escap
                 $operator = $this->getOperator($condition);
 
                 $cond .= $joints[$i];
-                $cond .= preg_match("/(\(*)?([\[\]\w\.'-]+)" . preg_quote($operator, '/') . '(.*)/i', $condition, $match) ? $match[1] . $this->db->protectIdentifiers($match[2]) . $operator . $this->db->protectIdentifiers($match[3]) : $condition;
+                $cond .= preg_match('/(\(*)?([\[\]\w\.\'-]+)' . preg_quote($operator, '/') . '(.*)/i', $condition, $match) ? $match[1] . $this->db->protectIdentifiers($match[2]) . $operator . $this->db->protectIdentifiers($match[3]) : $condition;
             }
         }
 
diff --git a/system/Database/Database.php b/system/Database/Database.php
index d7f629aba203..35cff46ae161 100644
--- a/system/Database/Database.php
+++ b/system/Database/Database.php
@@ -167,7 +167,7 @@ protected function initDriver(string $driver, string $class, $argument): object
         $class = $driver . '\\' . $class;
 
         if (strpos($driver, '\\') === false) {
-            $class = "CodeIgniter\Database\\{$class}";
+            $class = "CodeIgniter\\Database\\{$class}";
         }
 
         return new $class($argument);
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index 39d72d207aa8..7ad2f9269bec 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -160,7 +160,7 @@ public function join(string $table, string $cond, string $type = '', bool $escap
                 $operator = $this->getOperator($condition);
 
                 $cond .= $joints[$i];
-                $cond .= preg_match("/(\(*)?([\[\]\w\.'-]+)" . preg_quote($operator, '/') . '(.*)/i', $condition, $match) ? $match[1] . $this->db->protectIdentifiers($match[2]) . $operator . $this->db->protectIdentifiers($match[3]) : $condition;
+                $cond .= preg_match('/(\(*)?([\[\]\w\.\'-]+)' . preg_quote($operator, '/') . '(.*)/i', $condition, $match) ? $match[1] . $this->db->protectIdentifiers($match[2]) . $operator . $this->db->protectIdentifiers($match[3]) : $condition;
             }
         }
 
diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index 4d97522a21a1..52e423ff64af 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -550,7 +550,7 @@ function strip_quotes(string $str): string
      */
     function quotes_to_entities(string $str): string
     {
-        return str_replace(["\'", '"', "'", '"'], ['&#39;', '&quot;', '&#39;', '&quot;'], $str);
+        return str_replace(["\\'", '"', "'", '"'], ['&#39;', '&quot;', '&#39;', '&quot;'], $str);
     }
 }
 
diff --git a/system/Typography/Typography.php b/system/Typography/Typography.php
index fa91bb8f49fb..ca56634b5c34 100644
--- a/system/Typography/Typography.php
+++ b/system/Typography/Typography.php
@@ -267,7 +267,7 @@ public function formatCharacters(string $str): string
                 '/"(\W)/'       => '&#8221;$1',
                 '/(\W)"/'       => '$1&#8220;',
                 // apostrophes
-                "/(\w)'(\w)/" => '$1&#8217;$2',
+                '/(\w)\'(\w)/' => '$1&#8217;$2',
                 // Em dash and ellipses dots
                 '/\s?\-\-\s?/' => '&#8212;',
                 '/(\w)\.{3}/'  => '$1&#8230;',
diff --git a/tests/system/Commands/ScaffoldGeneratorTest.php b/tests/system/Commands/ScaffoldGeneratorTest.php
index 46cd3b113a80..89a41bfcb955 100644
--- a/tests/system/Commands/ScaffoldGeneratorTest.php
+++ b/tests/system/Commands/ScaffoldGeneratorTest.php
@@ -39,7 +39,7 @@ public function testCreateComponentProducesManyFiles()
         command('make:scaffold people');
 
         $dir       = '\\' . DIRECTORY_SEPARATOR;
-        $migration = "APPPATH{$dir}Database{$dir}Migrations{$dir}(.*)\.php";
+        $migration = "APPPATH{$dir}Database{$dir}Migrations{$dir}(.*)\\.php";
         preg_match('/' . $migration . '/u', CITestStreamFilter::$buffer, $matches);
         $matches[0] = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, $matches[0]);
 
@@ -62,7 +62,7 @@ public function testCreateComponentWithManyOptions()
         command('make:scaffold user -restful -return entity');
 
         $dir       = '\\' . DIRECTORY_SEPARATOR;
-        $migration = "APPPATH{$dir}Database{$dir}Migrations{$dir}(.*)\.php";
+        $migration = "APPPATH{$dir}Database{$dir}Migrations{$dir}(.*)\\.php";
         preg_match('/' . $migration . '/u', CITestStreamFilter::$buffer, $matches);
         $matches[0] = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, $matches[0]);
 
@@ -91,7 +91,7 @@ public function testCreateComponentWithOptionSuffix()
         command('make:scaffold order -suffix');
 
         $dir       = '\\' . DIRECTORY_SEPARATOR;
-        $migration = "APPPATH{$dir}Database{$dir}Migrations{$dir}(.*)\.php";
+        $migration = "APPPATH{$dir}Database{$dir}Migrations{$dir}(.*)\\.php";
         preg_match('/' . $migration . '/u', CITestStreamFilter::$buffer, $matches);
         $matches[0] = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, $matches[0]);
 
@@ -120,7 +120,7 @@ public function testCreateComponentWithOptionForce()
         command('make:scaffold fixer -bare -force');
 
         $dir       = '\\' . DIRECTORY_SEPARATOR;
-        $migration = "APPPATH{$dir}Database{$dir}Migrations{$dir}(.*)\.php";
+        $migration = "APPPATH{$dir}Database{$dir}Migrations{$dir}(.*)\\.php";
         preg_match('/' . $migration . '/u', CITestStreamFilter::$buffer, $matches);
         $matches[0] = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, $matches[0]);
 
@@ -147,7 +147,7 @@ public function testCreateComponentWithOptionNamespace()
         command('make:scaffold product -namespace App');
 
         $dir       = '\\' . DIRECTORY_SEPARATOR;
-        $migration = "APPPATH{$dir}Database{$dir}Migrations{$dir}(.*)\.php";
+        $migration = "APPPATH{$dir}Database{$dir}Migrations{$dir}(.*)\\.php";
         preg_match('/' . $migration . '/u', CITestStreamFilter::$buffer, $matches);
         $matches[0] = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, $matches[0]);
 
diff --git a/tests/system/Database/Live/EscapeTest.php b/tests/system/Database/Live/EscapeTest.php
index dbf6396d5bff..f99d2c778d96 100644
--- a/tests/system/Database/Live/EscapeTest.php
+++ b/tests/system/Database/Live/EscapeTest.php
@@ -72,7 +72,7 @@ public function testEscapeLikeString()
     public function testEscapeLikeStringDirect()
     {
         if ($this->db->DBDriver === 'MySQLi') {
-            $expected = "SHOW COLUMNS FROM brands WHERE column LIKE 'wild\_chars%'";
+            $expected = "SHOW COLUMNS FROM brands WHERE column LIKE 'wild\\_chars%'";
             $sql      = "SHOW COLUMNS FROM brands WHERE column LIKE '" . $this->db->escapeLikeStringDirect('wild_chars') . "%'";
 
             $this->assertSame($expected, $sql);
diff --git a/tests/system/Database/Live/InsertTest.php b/tests/system/Database/Live/InsertTest.php
index 74cb782410b4..d6817742d40b 100644
--- a/tests/system/Database/Live/InsertTest.php
+++ b/tests/system/Database/Live/InsertTest.php
@@ -93,7 +93,7 @@ public function testReplaceWithMatchingData()
 
     public function testBug302()
     {
-        $code = "my code \'CodeIgniter\Autoloader\'";
+        $code = "my code \\'CodeIgniter\\Autoloader\\'";
 
         $this->db->table('misc')->insert([
             'key'   => 'test',
diff --git a/tests/system/Helpers/TextHelperTest.php b/tests/system/Helpers/TextHelperTest.php
index bdee7678e06e..919e9f6254b8 100755
--- a/tests/system/Helpers/TextHelperTest.php
+++ b/tests/system/Helpers/TextHelperTest.php
@@ -27,8 +27,8 @@ public function testStripSlashes()
             "No, my name is O'connor.",
         ];
         $str = [
-            "Is your name O\'reilly?",
-            "No, my name is O\'connor.",
+            "Is your name O\\'reilly?",
+            "No, my name is O\\'connor.",
         ];
         $this->assertSame($expected, strip_slashes($str));
     }
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 09838317afe1..8585cf656fea 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -113,6 +113,11 @@ public function __construct()
                 'noise_remaining_usages'         => false,
                 'noise_remaining_usages_exclude' => [],
             ],
+            'escape_implicit_backslashes' => [
+                'double_quoted'  => true,
+                'heredoc_syntax' => true,
+                'single_quoted'  => false,
+            ],
             'explicit_indirect_variable' => true,
             'explicit_string_variable'   => true,
             'final_class'                => false,

From 86ece118f578e44acf6b149a7199d977c4fcaab5 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sat, 3 Jul 2021 00:36:27 +0800
Subject: [PATCH 0051/2325] Enable `no_blank_lines_after_class_opening` fixer

---
 tests/_support/Log/Handlers/TestHandler.php        | 1 -
 tests/system/ControllerTest.php                    | 1 -
 tests/system/Files/FileWithVfsTest.php             | 1 -
 tests/system/HTTP/IncomingRequestDetectingTest.php | 1 -
 tests/system/HTTP/MessageTest.php                  | 1 -
 tests/system/HTTP/NegotiateTest.php                | 1 -
 tests/system/HTTP/RequestTest.php                  | 1 -
 tests/system/HTTP/ResponseSendTest.php             | 1 -
 tests/system/Models/GeneralModelTest.php           | 1 -
 tests/system/Pager/PagerTest.php                   | 1 -
 tests/system/RESTful/ResourceControllerTest.php    | 1 -
 tests/system/RESTful/ResourcePresenterTest.php     | 1 -
 tests/system/Router/RouterTest.php                 | 1 -
 tests/system/Test/TestCaseEmissionsTest.php        | 1 -
 tests/system/Validation/CreditCardRulesTest.php    | 1 -
 tests/system/Validation/FileRulesTest.php          | 1 -
 utils/PhpCsFixer/CodeIgniter4.php                  | 1 +
 17 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/tests/_support/Log/Handlers/TestHandler.php b/tests/_support/Log/Handlers/TestHandler.php
index d37bc331b457..a3257bb45496 100644
--- a/tests/_support/Log/Handlers/TestHandler.php
+++ b/tests/_support/Log/Handlers/TestHandler.php
@@ -11,7 +11,6 @@
 
 class TestHandler extends \CodeIgniter\Log\Handlers\FileHandler
 {
-
     /**
      * Local storage for logs.
      *
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index acf2b436971f..9221410669b5 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -24,7 +24,6 @@
  */
 final class ControllerTest extends CIUnitTestCase
 {
-
     /**
      * @var CodeIgniter
      */
diff --git a/tests/system/Files/FileWithVfsTest.php b/tests/system/Files/FileWithVfsTest.php
index 219fb8bdb4cb..d62dbf29690f 100644
--- a/tests/system/Files/FileWithVfsTest.php
+++ b/tests/system/Files/FileWithVfsTest.php
@@ -10,7 +10,6 @@
  */
 final class FileWithVfsTest extends CIUnitTestCase
 {
-
     // For VFS stuff
     protected $root;
     protected $path;
diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php
index af1d4faec73c..257bb034b5f2 100644
--- a/tests/system/HTTP/IncomingRequestDetectingTest.php
+++ b/tests/system/HTTP/IncomingRequestDetectingTest.php
@@ -12,7 +12,6 @@
  */
 final class IncomingRequestDetectingTest extends CIUnitTestCase
 {
-
     /**
      * @var IncomingRequest
      */
diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php
index 1adb2bbade7d..18d75e408796 100644
--- a/tests/system/HTTP/MessageTest.php
+++ b/tests/system/HTTP/MessageTest.php
@@ -10,7 +10,6 @@
  */
 final class MessageTest extends CIUnitTestCase
 {
-
     /**
      * @var Message
      */
diff --git a/tests/system/HTTP/NegotiateTest.php b/tests/system/HTTP/NegotiateTest.php
index fabb5cfa2949..7896059df768 100644
--- a/tests/system/HTTP/NegotiateTest.php
+++ b/tests/system/HTTP/NegotiateTest.php
@@ -11,7 +11,6 @@
  */
 final class NegotiateTest extends CIUnitTestCase
 {
-
     /**
      * @var Request
      */
diff --git a/tests/system/HTTP/RequestTest.php b/tests/system/HTTP/RequestTest.php
index 8620c7d4d133..141fafd79639 100644
--- a/tests/system/HTTP/RequestTest.php
+++ b/tests/system/HTTP/RequestTest.php
@@ -12,7 +12,6 @@
  */
 final class RequestTest extends CIUnitTestCase
 {
-
     /**
      * @var Request
      */
diff --git a/tests/system/HTTP/ResponseSendTest.php b/tests/system/HTTP/ResponseSendTest.php
index 27948ba0504c..2ee2392d19df 100644
--- a/tests/system/HTTP/ResponseSendTest.php
+++ b/tests/system/HTTP/ResponseSendTest.php
@@ -15,7 +15,6 @@
  */
 final class ResponseSendTest extends CIUnitTestCase
 {
-
     /**
      * These need to be run as a separate process, since phpunit
      * has already captured the "normal" output, and we will get
diff --git a/tests/system/Models/GeneralModelTest.php b/tests/system/Models/GeneralModelTest.php
index 0c24929773a5..5242631b78e8 100644
--- a/tests/system/Models/GeneralModelTest.php
+++ b/tests/system/Models/GeneralModelTest.php
@@ -144,7 +144,6 @@ public function testBuilderWithParameterIgnoresShared(): void
     public function testInitialize(): void
     {
         $model = new class() extends Model {
-
             /**
              * @var bool
              */
diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index 571df88afeb4..912a02a95b1a 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -16,7 +16,6 @@
  */
 final class PagerTest extends CIUnitTestCase
 {
-
     /**
      * @var \CodeIgniter\Pager\Pager
      */
diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index 6a87d92363e6..4b47db042ef9 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -30,7 +30,6 @@
  */
 final class ResourceControllerTest extends CIUnitTestCase
 {
-
     /**
      * @var CodeIgniter
      */
diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php
index 9910891f90c2..5576b9b32fc9 100644
--- a/tests/system/RESTful/ResourcePresenterTest.php
+++ b/tests/system/RESTful/ResourcePresenterTest.php
@@ -24,7 +24,6 @@
  */
 final class ResourcePresenterTest extends CIUnitTestCase
 {
-
     /**
      * @var CodeIgniter
      */
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index 99e49c9941c5..c29a99d16a93 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -13,7 +13,6 @@
  */
 final class RouterTest extends CIUnitTestCase
 {
-
     /**
      * @var RouteCollection
      */
diff --git a/tests/system/Test/TestCaseEmissionsTest.php b/tests/system/Test/TestCaseEmissionsTest.php
index a6a4d603b4d8..387a9fd24652 100644
--- a/tests/system/Test/TestCaseEmissionsTest.php
+++ b/tests/system/Test/TestCaseEmissionsTest.php
@@ -15,7 +15,6 @@
  */
 final class TestCaseEmissionsTest extends CIUnitTestCase
 {
-
     /**
      * These need to be run as a separate process, since phpunit
      * has already captured the "normal" output, and we will get
diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php
index 6a580fbea596..95e52ac56227 100644
--- a/tests/system/Validation/CreditCardRulesTest.php
+++ b/tests/system/Validation/CreditCardRulesTest.php
@@ -11,7 +11,6 @@
  */
 final class CreditCardRulesTest extends CIUnitTestCase
 {
-
     /**
      * @var Validation
      */
diff --git a/tests/system/Validation/FileRulesTest.php b/tests/system/Validation/FileRulesTest.php
index 78f44d321380..7d1019049959 100644
--- a/tests/system/Validation/FileRulesTest.php
+++ b/tests/system/Validation/FileRulesTest.php
@@ -11,7 +11,6 @@
  */
 final class FileRulesTest extends CIUnitTestCase
 {
-
     /**
      * @var Validation
      */
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 8585cf656fea..8209bfb329a7 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -163,6 +163,7 @@ public function __construct()
             'new_with_braces'                         => true,
             'no_alias_functions'                      => ['sets' => ['@all']],
             'no_alias_language_construct_call'        => true,
+            'no_blank_lines_after_class_opening'      => true,
             'no_short_bool_cast'                      => true,
             'no_trailing_comma_in_singleline_array'   => true,
             'no_unset_cast'                           => true,

From 8ac891bd3f139cc206bec291a1ba47156fe7d4c5 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sat, 3 Jul 2021 00:44:18 +0800
Subject: [PATCH 0052/2325] Conditionally enable `no_blank_lines_after_phpdoc`
 fixer

---
 admin/starter/app/Config/Paths.php                    | 1 -
 app/Config/Mimes.php                                  | 1 -
 app/Config/Paths.php                                  | 1 -
 app/Controllers/BaseController.php                    | 1 -
 tests/_support/Config/BadRegistrar.php                | 1 -
 tests/_support/Config/Registrar.php                   | 1 -
 tests/_support/Config/TestRegistrar.php               | 1 -
 tests/_support/Log/Handlers/TestHandler.php           | 1 -
 tests/_support/View/SampleClass.php                   | 1 -
 tests/_support/View/SampleClassWithInitController.php | 1 -
 tests/system/Test/BootstrapFCPATHTest.php             | 1 -
 utils/PhpCsFixer/CodeIgniter4.php                     | 1 +
 12 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/admin/starter/app/Config/Paths.php b/admin/starter/app/Config/Paths.php
index 5b9739ee5d0b..d97bbb35a820 100644
--- a/admin/starter/app/Config/Paths.php
+++ b/admin/starter/app/Config/Paths.php
@@ -13,7 +13,6 @@
  *
  * All paths are relative to the project's root folder.
  */
-
 class Paths
 {
     /**
diff --git a/app/Config/Mimes.php b/app/Config/Mimes.php
index 4edcfa4edc5c..a7cca8788d00 100644
--- a/app/Config/Mimes.php
+++ b/app/Config/Mimes.php
@@ -16,7 +16,6 @@
  * When working with mime types, please make sure you have the ´fileinfo´
  * extension enabled to reliably detect the media types.
  */
-
 class Mimes
 {
     /**
diff --git a/app/Config/Paths.php b/app/Config/Paths.php
index 137fc486e409..f701b7570507 100644
--- a/app/Config/Paths.php
+++ b/app/Config/Paths.php
@@ -13,7 +13,6 @@
  *
  * All paths are relative to the project's root folder.
  */
-
 class Paths
 {
     /**
diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php
index 7a7d104425c1..b6740e940202 100644
--- a/app/Controllers/BaseController.php
+++ b/app/Controllers/BaseController.php
@@ -19,7 +19,6 @@
  *
  * For security be sure to declare any new methods as protected or private.
  */
-
 class BaseController extends Controller
 {
     /**
diff --git a/tests/_support/Config/BadRegistrar.php b/tests/_support/Config/BadRegistrar.php
index ff7aba3aa377..6f9fdd2b354a 100644
--- a/tests/_support/Config/BadRegistrar.php
+++ b/tests/_support/Config/BadRegistrar.php
@@ -8,7 +8,6 @@
  * Doesn't provides a basic registrar class for testing BaseConfig registration functions,
  * because it doesn't return an associative array
  */
-
 class BadRegistrar
 {
     public static function RegistrarConfig()
diff --git a/tests/_support/Config/Registrar.php b/tests/_support/Config/Registrar.php
index 32d114b25f3d..c8a607ae7e43 100644
--- a/tests/_support/Config/Registrar.php
+++ b/tests/_support/Config/Registrar.php
@@ -7,7 +7,6 @@
  *
  * Provides a basic registrar class for testing BaseConfig registration functions.
  */
-
 class Registrar
 {
     /**
diff --git a/tests/_support/Config/TestRegistrar.php b/tests/_support/Config/TestRegistrar.php
index 947587d84069..8ac4c9655c90 100644
--- a/tests/_support/Config/TestRegistrar.php
+++ b/tests/_support/Config/TestRegistrar.php
@@ -7,7 +7,6 @@
  *
  * Provides a basic registrar class for testing BaseConfig registration functions.
  */
-
 class TestRegistrar
 {
     public static function RegistrarConfig()
diff --git a/tests/_support/Log/Handlers/TestHandler.php b/tests/_support/Log/Handlers/TestHandler.php
index a3257bb45496..3559856059e5 100644
--- a/tests/_support/Log/Handlers/TestHandler.php
+++ b/tests/_support/Log/Handlers/TestHandler.php
@@ -8,7 +8,6 @@
  * A simple LogHandler that stores the logs in memory.
  * Only used for testing purposes.
  */
-
 class TestHandler extends \CodeIgniter\Log\Handlers\FileHandler
 {
     /**
diff --git a/tests/_support/View/SampleClass.php b/tests/_support/View/SampleClass.php
index 3c7e58db2a82..08bdb1da0760 100644
--- a/tests/_support/View/SampleClass.php
+++ b/tests/_support/View/SampleClass.php
@@ -8,7 +8,6 @@
  * This class is only used to provide a reference point
  * during tests to make sure that things work as expected.
  */
-
 class SampleClass
 {
     public function index()
diff --git a/tests/_support/View/SampleClassWithInitController.php b/tests/_support/View/SampleClassWithInitController.php
index bb8c04376347..5e402b1b7f6f 100644
--- a/tests/_support/View/SampleClassWithInitController.php
+++ b/tests/_support/View/SampleClassWithInitController.php
@@ -12,7 +12,6 @@
  * This class is only used to provide a reference point
  * during tests to make sure that things work as expected.
  */
-
 class SampleClassWithInitController
 {
     public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
diff --git a/tests/system/Test/BootstrapFCPATHTest.php b/tests/system/Test/BootstrapFCPATHTest.php
index 5bff32d359b0..cfeef89ee227 100644
--- a/tests/system/Test/BootstrapFCPATHTest.php
+++ b/tests/system/Test/BootstrapFCPATHTest.php
@@ -14,7 +14,6 @@
  *
  * @internal
  */
-
 final class BootstrapFCPATHTest extends CIUnitTestCase
 {
     private $currentDir = __DIR__;
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 8209bfb329a7..86fb3ba80f3b 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -164,6 +164,7 @@ public function __construct()
             'no_alias_functions'                      => ['sets' => ['@all']],
             'no_alias_language_construct_call'        => true,
             'no_blank_lines_after_class_opening'      => true,
+            'no_blank_lines_after_phpdoc'             => false, // @todo enable fully when `header_comment` is required
             'no_short_bool_cast'                      => true,
             'no_trailing_comma_in_singleline_array'   => true,
             'no_unset_cast'                           => true,

From 3e1b2052051d23fb5ceb8ad154203aae974464f7 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sat, 3 Jul 2021 00:56:44 +0800
Subject: [PATCH 0053/2325] Enable PSR-12 normative rules

---
 system/Debug/Toolbar.php                             |  4 ++--
 tests/system/CodeIgniterTest.php                     |  2 +-
 tests/system/Commands/InfoCacheTest.php              |  2 +-
 tests/system/Database/Builder/InsertTest.php         |  4 ++--
 tests/system/Database/Builder/UpdateTest.php         |  2 +-
 .../Database/Migrations/MigrationRunnerTest.php      |  2 +-
 tests/system/HTTP/Files/FileCollectionTest.php       | 10 +++++-----
 tests/system/HTTP/Files/FileMovingTest.php           |  2 +-
 tests/system/Test/BootstrapFCPATHTest.php            |  8 ++++----
 utils/PhpCsFixer/CodeIgniter4.php                    | 12 ++++++++++++
 10 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 1ec5b1d41101..a230440e6a7d 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -122,7 +122,7 @@ public function run(float $startTime, float $totalTime, RequestInterface $reques
                         Kint::$display_called_from = false;
 
                         $kint = @Kint::dump($value);
-                        $kint = substr($kint, strpos($kint, '</style>') + 8 );
+                        $kint = substr($kint, strpos($kint, '</style>') + 8);
 
                         Kint::$mode_default        = $oldKintMode;
                         Kint::$display_called_from = $oldKintCalledFrom;
@@ -356,7 +356,7 @@ public function prepare(RequestInterface $request = null, ResponseInterface $res
             Kint::$mode_default = Kint::MODE_RICH;
             $kintScript         = @Kint::dump('');
             Kint::$mode_default = $oldKintMode;
-            $kintScript         = substr($kintScript, 0, strpos($kintScript, '</style>') + 8 );
+            $kintScript         = substr($kintScript, 0, strpos($kintScript, '</style>') + 8);
 
             $script = PHP_EOL
                     . '<script type="text/javascript" {csp-script-nonce} id="debugbar_loader" '
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index a56d1472a258..db1053841ab4 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -2,7 +2,7 @@
 
 namespace CodeIgniter;
 
-use \CodeIgniter\Config\Services;
+use CodeIgniter\Config\Services;
 use CodeIgniter\Router\RouteCollection;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockCodeIgniter;
diff --git a/tests/system/Commands/InfoCacheTest.php b/tests/system/Commands/InfoCacheTest.php
index 5997a438cb0f..efef578449c0 100644
--- a/tests/system/Commands/InfoCacheTest.php
+++ b/tests/system/Commands/InfoCacheTest.php
@@ -71,6 +71,6 @@ public function testInfoCacheCannotSeeFoo()
         cache()->delete('foo');
         command('cache:info');
 
-        $this->assertStringNotContainsString ('foo', $this->getBuffer());
+        $this->assertStringNotContainsString('foo', $this->getBuffer());
     }
 }
diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php
index de1d3c0ddee5..55f46f0f7808 100644
--- a/tests/system/Database/Builder/InsertTest.php
+++ b/tests/system/Database/Builder/InsertTest.php
@@ -83,7 +83,7 @@ public function testInsertBatch()
         $this->assertInstanceOf(Query::class, $query);
 
         $raw = 'INSERT INTO "jobs" ("description", "id", "name") VALUES (:description:,:id:,:name:), (:description.1:,:id.1:,:name.1:)';
-        $this->assertSame($raw, str_replace("\n", ' ', $query->getOriginalQuery() ));
+        $this->assertSame($raw, str_replace("\n", ' ', $query->getOriginalQuery()));
 
         $expected = "INSERT INTO \"jobs\" (\"description\", \"id\", \"name\") VALUES ('There''s something in your teeth',2,'Commedian'), ('I am yellow',3,'Cab Driver')";
         $this->assertSame($expected, str_replace("\n", ' ', $query->getQuery()));
@@ -110,7 +110,7 @@ public function testInsertBatchWithFieldsEndingInNumbers()
         $this->assertInstanceOf(Query::class, $query);
 
         $raw = 'INSERT INTO "ip_table" ("ip", "ip2") VALUES (:ip:,:ip2:), (:ip.1:,:ip2.1:), (:ip.2:,:ip2.2:), (:ip.3:,:ip2.3:)';
-        $this->assertSame($raw, str_replace("\n", ' ', $query->getOriginalQuery() ));
+        $this->assertSame($raw, str_replace("\n", ' ', $query->getOriginalQuery()));
 
         $expected = "INSERT INTO \"ip_table\" (\"ip\", \"ip2\") VALUES ('1.1.1.0','1.1.1.2'), ('2.2.2.0','2.2.2.2'), ('3.3.3.0','3.3.3.2'), ('4.4.4.0','4.4.4.2')";
         $this->assertSame($expected, str_replace("\n", ' ', $query->getQuery()));
diff --git a/tests/system/Database/Builder/UpdateTest.php b/tests/system/Database/Builder/UpdateTest.php
index 47d424100c62..5fadb0a3bc96 100644
--- a/tests/system/Database/Builder/UpdateTest.php
+++ b/tests/system/Database/Builder/UpdateTest.php
@@ -149,7 +149,7 @@ public function testUpdateBatch()
             WHERE "id" IN(2,3)
             EOF;
 
-        $this->assertSame($expected, $query->getQuery() );
+        $this->assertSame($expected, $query->getQuery());
     }
 
     public function testUpdateBatchThrowsExceptionWithNoData()
diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php
index a31ec0bfcb2d..f567e227deba 100644
--- a/tests/system/Database/Migrations/MigrationRunnerTest.php
+++ b/tests/system/Database/Migrations/MigrationRunnerTest.php
@@ -51,7 +51,7 @@ public function testLoadsDefaultDatabaseWhenNoneSpecified()
 
         $this->assertInstanceOf(BaseConnection::class, $db);
         $this->assertSame(
-            ($dbConfig->tests['DBDriver'] === 'SQLite3' ? WRITEPATH : '' ) . $dbConfig->tests['database'],
+            ($dbConfig->tests['DBDriver'] === 'SQLite3' ? WRITEPATH : '') . $dbConfig->tests['database'],
             $this->getPrivateProperty($db, 'database')
         );
         $this->assertSame($dbConfig->tests['DBDriver'], $this->getPrivateProperty($db, 'DBDriver'));
diff --git a/tests/system/HTTP/Files/FileCollectionTest.php b/tests/system/HTTP/Files/FileCollectionTest.php
index 73876f0dffcf..284e0bd56195 100644
--- a/tests/system/HTTP/Files/FileCollectionTest.php
+++ b/tests/system/HTTP/Files/FileCollectionTest.php
@@ -711,7 +711,7 @@ public function testGetFileMultipleHasNoFile()
 
         $files = $collection->getFileMultiple('userfiletest');
 
-        $this->assertNull( $files);
+        $this->assertNull($files);
     }
 
     //--------------------------------------------------------------------
@@ -766,7 +766,7 @@ public function testGetFileMultipleReturnValidDotNotationSyntax()
         $collection = new FileCollection();
 
         $files = $collection->getFileMultiple('my-form.details.avatars');
-        $this->assertIsArray( $files);
+        $this->assertIsArray($files);
         $this->assertCount(2, $files);
 
         $this->assertInstanceOf(UploadedFile::class, $files[0]);
@@ -821,7 +821,7 @@ public function testGetFileMultipleReturnInvalidDotNotationSyntax()
         $collection = new FileCollection();
 
         $files = $collection->getFileMultiple('my-form.details.avatars');
-        $this->assertNull( $files);
+        $this->assertNull($files);
     }
 
     //--------------------------------------------------------------------
@@ -854,7 +854,7 @@ public function testGetFileMultipleReturnValidMultipleFiles()
 
         $files = $collection->getFileMultiple('userfile');
         $this->assertCount(2, $files);
-        $this->assertIsArray( $files);
+        $this->assertIsArray($files);
 
         $this->assertInstanceOf(UploadedFile::class, $files[0]);
         $this->assertSame(124, $files[0]->getSize());
@@ -888,7 +888,7 @@ public function testGetFileMultipleReturnInvalidSingleFile()
         $collection = new FileCollection();
 
         $files = $collection->getFileMultiple('userfile');
-        $this->assertNull( $files);
+        $this->assertNull($files);
     }
 
     //--------------------------------------------------------------------
diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php
index 15c5a6b3931f..94ec312f0068 100644
--- a/tests/system/HTTP/Files/FileMovingTest.php
+++ b/tests/system/HTTP/Files/FileMovingTest.php
@@ -317,7 +317,7 @@ function rrmdir($src)
     $dir = opendir($src);
 
     while (false !== $file = readdir($dir)) {
-        if (( $file !== '.' ) && ( $file !== '..' )) {
+        if (($file !== '.') && ($file !== '..')) {
             $full = $src . '/' . $file;
 
             if (is_dir($full)) {
diff --git a/tests/system/Test/BootstrapFCPATHTest.php b/tests/system/Test/BootstrapFCPATHTest.php
index cfeef89ee227..ed1beda9a3c3 100644
--- a/tests/system/Test/BootstrapFCPATHTest.php
+++ b/tests/system/Test/BootstrapFCPATHTest.php
@@ -50,27 +50,27 @@ private function correctFCPATH()
 
     private function buildDirectories() : void
     {
-        mkdir( $this->dir1, 0777, true);
+        mkdir($this->dir1, 0777, true);
     }
 
     private function deleteDirectories() : void
     {
         // these need to be executed in reverse order: dir 2 in inside dir1
         if (is_dir($this->dir1)) {
-            rmdir( $this->dir1 );
+            rmdir($this->dir1);
         }
     }
 
     private function writeFiles() : void
     {
-        file_put_contents( $this->file1, $this->fileContents());
+        file_put_contents($this->file1, $this->fileContents());
         chmod($this->file1, 0777);
     }
 
     private function deleteFiles() : void
     {
         if (file_exists($this->file1)) {
-            unlink( $this->file1 );
+            unlink($this->file1);
         }
     }
 
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 86fb3ba80f3b..dc7ba2fb7db4 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -165,10 +165,21 @@ public function __construct()
             'no_alias_language_construct_call'        => true,
             'no_blank_lines_after_class_opening'      => true,
             'no_blank_lines_after_phpdoc'             => false, // @todo enable fully when `header_comment` is required
+            'no_blank_lines_before_namespace'         => false, // conflicts with `single_blank_line_before_namespace`
+            'no_break_comment'                        => ['comment_text' => 'no break'],
+            'no_closing_tag'                          => true,
+            'no_leading_import_slash'                 => true,
             'no_short_bool_cast'                      => true,
+            'no_spaces_after_function_name'           => true,
+            'no_spaces_inside_parenthesis'            => true,
             'no_trailing_comma_in_singleline_array'   => true,
+            'no_trailing_whitespace'                  => true,
+            'no_trailing_whitespace_in_comment'       => true,
+            'no_trailing_whitespace_in_string'        => true,
+            'no_unreachable_default_argument_value'   => true,
             'no_unset_cast'                           => true,
             'no_whitespace_before_comma_in_array'     => ['after_heredoc' => true],
+            'no_whitespace_in_blank_line'             => true,
             'not_operator_with_space'                 => false,
             'not_operator_with_successor_space'       => true,
             'normalize_index_brace'                   => true,
@@ -287,6 +298,7 @@ public function __construct()
             'set_type_to_cast'                    => true,
             'short_scalar_cast'                   => true,
             'simple_to_complex_string_variable'   => true,
+            'single_blank_line_before_namespace'  => true,
             'standardize_increment'               => true,
             'static_lambda'                       => true,
             'switch_case_semicolon_to_colon'      => true,

From 3b9ef14ac6aebceedc3e323a9378f3211869fe4c Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sat, 3 Jul 2021 01:31:26 +0800
Subject: [PATCH 0054/2325] Enable other "no" rules with little impact

---
 system/Debug/Toolbar.php             |  2 +-
 system/Email/Email.php               |  2 +-
 system/HTTP/UserAgent.php            |  6 +-
 system/Helpers/filesystem_helper.php | 11 ++--
 system/I18n/Time.php                 | 24 ++++----
 system/I18n/TimeDifference.php       | 16 +++---
 system/Test/FeatureTestCase.php      |  2 +-
 system/Validation/FormatRules.php    |  6 +-
 system/Validation/Rules.php          |  4 +-
 system/View/View.php                 |  1 -
 utils/PhpCsFixer/CodeIgniter4.php    | 85 ++++++++++++++++++----------
 11 files changed, 90 insertions(+), 69 deletions(-)

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index a230440e6a7d..98bbd20ff59a 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -286,7 +286,7 @@ protected function roundTo(float $number, int $increments = 5): float
     {
         $increments = 1 / $increments;
 
-        return (ceil($number * $increments) / $increments);
+        return ceil($number * $increments) / $increments;
     }
 
     //--------------------------------------------------------------------
diff --git a/system/Email/Email.php b/system/Email/Email.php
index 1a49b03ab0ca..87b4a0cd40a3 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -1782,7 +1782,7 @@ protected function validateEmailForShell(&$email)
                 . idn_to_ascii(static::substr($email, $atpos), 0, INTL_IDNA_VARIANT_UTS46);
         }
 
-        return (filter_var($email, FILTER_VALIDATE_EMAIL) === $email && preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email));
+        return filter_var($email, FILTER_VALIDATE_EMAIL) === $email && preg_match('#\A[a-z0-9._+-]+@[a-z0-9.-]{1,253}\z#i', $email);
     }
 
     /**
diff --git a/system/HTTP/UserAgent.php b/system/HTTP/UserAgent.php
index 6fe613f43de6..3cddffe2f26c 100644
--- a/system/HTTP/UserAgent.php
+++ b/system/HTTP/UserAgent.php
@@ -135,7 +135,7 @@ public function isBrowser(string $key = null): bool
         }
 
         // Check for a specific browser
-        return (isset($this->config->browsers[$key]) && $this->browser === $this->config->browsers[$key]);
+        return isset($this->config->browsers[$key]) && $this->browser === $this->config->browsers[$key];
     }
 
     //--------------------------------------------------------------------
@@ -159,7 +159,7 @@ public function isRobot(string $key = null): bool
         }
 
         // Check for a specific robot
-        return (isset($this->config->robots[$key]) && $this->robot === $this->config->robots[$key]);
+        return isset($this->config->robots[$key]) && $this->robot === $this->config->robots[$key];
     }
 
     //--------------------------------------------------------------------
@@ -183,7 +183,7 @@ public function isMobile(string $key = null): bool
         }
 
         // Check for a specific robot
-        return (isset($this->config->mobiles[$key]) && $this->mobile === $this->config->mobiles[$key]);
+        return isset($this->config->mobiles[$key]) && $this->mobile === $this->config->mobiles[$key];
     }
 
     //--------------------------------------------------------------------
diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php
index b07ca3599a34..2f3a5d0ffe72 100644
--- a/system/Helpers/filesystem_helper.php
+++ b/system/Helpers/filesystem_helper.php
@@ -275,14 +275,14 @@ function get_dir_file_info(string $sourceDir, bool $topLevelOnly = true, bool $r
 
         try {
             $fp = opendir($sourceDir);
-            {
-                // reset the array and make sure $source_dir has a trailing slash on the initial call
+
+            // reset the array and make sure $source_dir has a trailing slash on the initial call
             if ($recursion === false) {
                 $fileData  = [];
                 $sourceDir = rtrim(realpath($sourceDir), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
             }
 
-                // Used to be foreach (scandir($source_dir, 1) as $file), but scandir() is simply not as fast
+            // Used to be foreach (scandir($source_dir, 1) as $file), but scandir() is simply not as fast
             while (false !== ($file = readdir($fp))) {
                 if (is_dir($sourceDir . $file) && $file[0] !== '.' && $topLevelOnly === false) {
                     get_dir_file_info($sourceDir . $file . DIRECTORY_SEPARATOR, $topLevelOnly, true);
@@ -292,10 +292,9 @@ function get_dir_file_info(string $sourceDir, bool $topLevelOnly = true, bool $r
                 }
             }
 
-                closedir($fp);
+            closedir($fp);
 
-                return $fileData;
-            }
+            return $fileData;
         } catch (Throwable $fe) {
             return [];
         }
diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index e1af6f06e522..419fadda883f 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -837,7 +837,7 @@ public function setTimestamp($timestamp)
      */
     public function addSeconds(int $seconds)
     {
-        $time = clone($this);
+        $time = clone $this;
 
         return $time->add(DateInterval::createFromDateString("{$seconds} seconds"));
     }
@@ -851,7 +851,7 @@ public function addSeconds(int $seconds)
      */
     public function addMinutes(int $minutes)
     {
-        $time = clone($this);
+        $time = clone $this;
 
         return $time->add(DateInterval::createFromDateString("{$minutes} minutes"));
     }
@@ -865,7 +865,7 @@ public function addMinutes(int $minutes)
      */
     public function addHours(int $hours)
     {
-        $time = clone($this);
+        $time = clone $this;
 
         return $time->add(DateInterval::createFromDateString("{$hours} hours"));
     }
@@ -879,7 +879,7 @@ public function addHours(int $hours)
      */
     public function addDays(int $days)
     {
-        $time = clone($this);
+        $time = clone $this;
 
         return $time->add(DateInterval::createFromDateString("{$days} days"));
     }
@@ -893,7 +893,7 @@ public function addDays(int $days)
      */
     public function addMonths(int $months)
     {
-        $time = clone($this);
+        $time = clone $this;
 
         return $time->add(DateInterval::createFromDateString("{$months} months"));
     }
@@ -907,7 +907,7 @@ public function addMonths(int $months)
      */
     public function addYears(int $years)
     {
-        $time = clone($this);
+        $time = clone $this;
 
         return $time->add(DateInterval::createFromDateString("{$years} years"));
     }
@@ -921,7 +921,7 @@ public function addYears(int $years)
      */
     public function subSeconds(int $seconds)
     {
-        $time = clone($this);
+        $time = clone $this;
 
         return $time->sub(DateInterval::createFromDateString("{$seconds} seconds"));
     }
@@ -935,7 +935,7 @@ public function subSeconds(int $seconds)
      */
     public function subMinutes(int $minutes)
     {
-        $time = clone($this);
+        $time = clone $this;
 
         return $time->sub(DateInterval::createFromDateString("{$minutes} minutes"));
     }
@@ -949,7 +949,7 @@ public function subMinutes(int $minutes)
      */
     public function subHours(int $hours)
     {
-        $time = clone($this);
+        $time = clone $this;
 
         return $time->sub(DateInterval::createFromDateString("{$hours} hours"));
     }
@@ -963,7 +963,7 @@ public function subHours(int $hours)
      */
     public function subDays(int $days)
     {
-        $time = clone($this);
+        $time = clone $this;
 
         return $time->sub(DateInterval::createFromDateString("{$days} days"));
     }
@@ -977,7 +977,7 @@ public function subDays(int $days)
      */
     public function subMonths(int $months)
     {
-        $time = clone($this);
+        $time = clone $this;
 
         return $time->sub(DateInterval::createFromDateString("{$months} months"));
     }
@@ -991,7 +991,7 @@ public function subMonths(int $months)
      */
     public function subYears(int $years)
     {
-        $time = clone($this);
+        $time = clone $this;
 
         return $time->sub(DateInterval::createFromDateString("{$years} years"));
     }
diff --git a/system/I18n/TimeDifference.php b/system/I18n/TimeDifference.php
index 54dc2c475515..eac75fe122cc 100644
--- a/system/I18n/TimeDifference.php
+++ b/system/I18n/TimeDifference.php
@@ -129,7 +129,7 @@ public function getYears(bool $raw = false)
             return $this->difference / YEAR;
         }
 
-        $time = clone($this->currentTime);
+        $time = clone $this->currentTime;
 
         return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_YEAR);
     }
@@ -147,7 +147,7 @@ public function getMonths(bool $raw = false)
             return $this->difference / MONTH;
         }
 
-        $time = clone($this->currentTime);
+        $time = clone $this->currentTime;
 
         return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_MONTH);
     }
@@ -165,7 +165,7 @@ public function getWeeks(bool $raw = false)
             return $this->difference / WEEK;
         }
 
-        $time = clone($this->currentTime);
+        $time = clone $this->currentTime;
 
         return (int) ($time->fieldDifference($this->testTime, IntlCalendar::FIELD_DAY_OF_YEAR) / 7);
     }
@@ -183,7 +183,7 @@ public function getDays(bool $raw = false)
             return $this->difference / DAY;
         }
 
-        $time = clone($this->currentTime);
+        $time = clone $this->currentTime;
 
         return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_DAY_OF_YEAR);
     }
@@ -201,7 +201,7 @@ public function getHours(bool $raw = false)
             return $this->difference / HOUR;
         }
 
-        $time = clone($this->currentTime);
+        $time = clone $this->currentTime;
 
         return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_HOUR_OF_DAY);
     }
@@ -219,7 +219,7 @@ public function getMinutes(bool $raw = false)
             return $this->difference / MINUTE;
         }
 
-        $time = clone($this->currentTime);
+        $time = clone $this->currentTime;
 
         return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_MINUTE);
     }
@@ -237,7 +237,7 @@ public function getSeconds(bool $raw = false)
             return $this->difference;
         }
 
-        $time = clone($this->currentTime);
+        $time = clone $this->currentTime;
 
         return $time->fieldDifference($this->testTime, IntlCalendar::FIELD_SECOND);
     }
@@ -251,7 +251,7 @@ public function getSeconds(bool $raw = false)
      */
     public function humanize(string $locale = null): string
     {
-        $current = clone($this->currentTime);
+        $current = clone $this->currentTime;
 
         $years   = $current->fieldDifference($this->testTime, IntlCalendar::FIELD_YEAR);
         $months  = $current->fieldDifference($this->testTime, IntlCalendar::FIELD_MONTH);
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index 409f9f839e39..aff063d0115f 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -333,7 +333,7 @@ protected function setupRequest(string $method, string $path = null): IncomingRe
         $config = config(App::class);
         $uri    = new URI(rtrim($config->baseURL, '/') . '/' . trim($path, '/ '));
 
-        $request      = new IncomingRequest($config, clone($uri), null, new UserAgent());
+        $request      = new IncomingRequest($config, clone $uri, null, new UserAgent());
         $request->uri = $uri;
 
         $request->setMethod($method);
diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index c99038d6624c..bc29ac0a9867 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -175,7 +175,7 @@ public function is_natural(?string $str = null): bool
      */
     public function is_natural_no_zero(?string $str = null): bool
     {
-        return ($str !== '0' && ctype_digit($str));
+        return $str !== '0' && ctype_digit($str);
     }
 
     /**
@@ -235,7 +235,7 @@ public function timezone(string $str = null): bool
      */
     public function valid_base64(string $str = null): bool
     {
-        return (base64_encode(base64_decode($str, true)) === $str);
+        return base64_encode(base64_decode($str, true)) === $str;
     }
 
     /**
@@ -349,7 +349,7 @@ public function valid_url(string $str = null): bool
 
         $str = 'http://' . $str;
 
-        return (filter_var($str, FILTER_VALIDATE_URL) !== false);
+        return filter_var($str, FILTER_VALIDATE_URL) !== false;
     }
 
     /**
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
index d33456230fa1..c132cb2774ba 100644
--- a/system/Validation/Rules.php
+++ b/system/Validation/Rules.php
@@ -265,7 +265,7 @@ public function matches(string $str = null, string $field, array $data): bool
      */
     public function max_length(string $str = null, string $val): bool
     {
-        return (is_numeric($val) && $val >= mb_strlen($str));
+        return is_numeric($val) && $val >= mb_strlen($str);
     }
 
     //--------------------------------------------------------------------
@@ -280,7 +280,7 @@ public function max_length(string $str = null, string $val): bool
      */
     public function min_length(string $str = null, string $val): bool
     {
-        return (is_numeric($val) && $val <= mb_strlen($str));
+        return is_numeric($val) && $val <= mb_strlen($str);
     }
 
     //--------------------------------------------------------------------
diff --git a/system/View/View.php b/system/View/View.php
index f3d2c619f1d1..57ac8f07ffbe 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -109,7 +109,6 @@ class View implements RendererInterface
      */
     protected $layout;
 
-
     /**
      * Holds the sections and their data.
      *
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index dc7ba2fb7db4..fa39a8d256e1 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -154,37 +154,60 @@ public function __construct()
                 'keep_multiple_spaces_after_comma' => false,
                 'on_multiline'                     => 'ensure_fully_multiline',
             ],
-            'method_chaining_indentation'             => true,
-            'modernize_types_casting'                 => true,
-            'multiline_comment_opening_closing'       => true,
-            'multiline_whitespace_before_semicolons'  => ['strategy' => 'no_multi_line'],
-            'native_function_casing'                  => true,
-            'native_function_type_declaration_casing' => true,
-            'new_with_braces'                         => true,
-            'no_alias_functions'                      => ['sets' => ['@all']],
-            'no_alias_language_construct_call'        => true,
-            'no_blank_lines_after_class_opening'      => true,
-            'no_blank_lines_after_phpdoc'             => false, // @todo enable fully when `header_comment` is required
-            'no_blank_lines_before_namespace'         => false, // conflicts with `single_blank_line_before_namespace`
-            'no_break_comment'                        => ['comment_text' => 'no break'],
-            'no_closing_tag'                          => true,
-            'no_leading_import_slash'                 => true,
-            'no_short_bool_cast'                      => true,
-            'no_spaces_after_function_name'           => true,
-            'no_spaces_inside_parenthesis'            => true,
-            'no_trailing_comma_in_singleline_array'   => true,
-            'no_trailing_whitespace'                  => true,
-            'no_trailing_whitespace_in_comment'       => true,
-            'no_trailing_whitespace_in_string'        => true,
-            'no_unreachable_default_argument_value'   => true,
-            'no_unset_cast'                           => true,
-            'no_whitespace_before_comma_in_array'     => ['after_heredoc' => true],
-            'no_whitespace_in_blank_line'             => true,
-            'not_operator_with_space'                 => false,
-            'not_operator_with_successor_space'       => true,
-            'normalize_index_brace'                   => true,
-            'ordered_imports'                         => ['sort_algorithm' => 'alpha'],
-            'php_unit_construct'                      => [
+            'method_chaining_indentation'                 => true,
+            'modernize_types_casting'                     => true,
+            'multiline_comment_opening_closing'           => true,
+            'multiline_whitespace_before_semicolons'      => ['strategy' => 'no_multi_line'],
+            'native_function_casing'                      => true,
+            'native_function_type_declaration_casing'     => true,
+            'new_with_braces'                             => true,
+            'no_alias_functions'                          => ['sets' => ['@all']],
+            'no_alias_language_construct_call'            => true,
+            'no_alternative_syntax'                       => false,
+            'no_binary_string'                            => true,
+            'no_blank_lines_after_class_opening'          => true,
+            'no_blank_lines_after_phpdoc'                 => false, // @todo enable fully when `header_comment` is required
+            'no_blank_lines_before_namespace'             => false, // conflicts with `single_blank_line_before_namespace`
+            'no_break_comment'                            => ['comment_text' => 'no break'],
+            'no_closing_tag'                              => true,
+            'no_empty_comment'                            => true,
+            'no_empty_phpdoc'                             => true,
+            'no_empty_statement'                          => true,
+            'no_extra_blank_lines'                        => ['tokens' => ['extra']],
+            'no_homoglyph_names'                          => true,
+            'no_leading_import_slash'                     => true,
+            'no_leading_namespace_whitespace'             => true,
+            'no_mixed_echo_print'                         => ['use' => 'echo'],
+            'no_multiline_whitespace_around_double_arrow' => true,
+            'no_php4_constructor'                         => true,
+            'no_short_bool_cast'                          => true,
+            'no_singleline_whitespace_before_semicolons'  => true,
+            'no_spaces_after_function_name'               => true,
+            'no_spaces_around_offset'                     => ['positions' => ['inside', 'outside']],
+            'no_spaces_inside_parenthesis'                => true,
+            'no_superfluous_elseif'                       => true,
+            'no_superfluous_phpdoc_tags'                  => false,
+            'no_trailing_comma_in_list_call'              => true,
+            'no_trailing_comma_in_singleline_array'       => true,
+            'no_trailing_whitespace'                      => true,
+            'no_trailing_whitespace_in_comment'           => true,
+            'no_trailing_whitespace_in_string'            => true,
+            'no_unneeded_control_parentheses'             => true,
+            'no_unneeded_curly_braces'                    => true,
+            'no_unneeded_final_method'                    => ['private_methods' => true],
+            'no_unreachable_default_argument_value'       => true,
+            'no_unset_cast'                               => true,
+            'no_unset_on_property'                        => false,
+            'no_useless_else'                             => true,
+            'no_useless_return'                           => true,
+            'no_useless_sprintf'                          => true,
+            'no_whitespace_before_comma_in_array'         => ['after_heredoc' => true],
+            'no_whitespace_in_blank_line'                 => true,
+            'not_operator_with_space'                     => false,
+            'not_operator_with_successor_space'           => true,
+            'normalize_index_brace'                       => true,
+            'ordered_imports'                             => ['sort_algorithm' => 'alpha'],
+            'php_unit_construct'                          => [
                 'assertions' => [
                     'assertSame',
                     'assertEquals',

From b198a43554ec685af95a13a2eea125035b2aadb2 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sat, 3 Jul 2021 01:50:48 +0800
Subject: [PATCH 0055/2325] Remove unused imports and non-printable characters

---
 tests/_support/Filters/Customfilter.php                 | 4 ----
 tests/system/Config/FactoriesTest.php                   | 1 -
 tests/system/Cookie/CookieStoreTest.php                 | 1 -
 tests/system/Cookie/CookieTest.php                      | 1 -
 tests/system/Database/Builder/BaseTest.php              | 1 -
 tests/system/Database/ConfigTest.php                    | 2 --
 tests/system/Encryption/EncryptionTest.php              | 1 -
 tests/system/Encryption/Handlers/OpenSSLHandlerTest.php | 1 -
 tests/system/HTTP/UserAgentTest.php                     | 1 -
 tests/system/Helpers/DateHelperTest.php                 | 1 -
 tests/system/Helpers/FilesystemHelperTest.php           | 3 ---
 tests/system/Helpers/NumberHelperTest.php               | 2 +-
 tests/system/Helpers/URLHelper/CurrentUrlTest.php       | 1 -
 tests/system/Helpers/URLHelper/SiteUrlTest.php          | 1 -
 tests/system/Log/LoggerTest.php                         | 1 -
 tests/system/Models/CountAllModelTest.php               | 1 -
 tests/system/Test/FabricatorTest.php                    | 1 -
 tests/system/Test/FeatureTestTraitTest.php              | 3 ---
 tests/system/Test/FilterTestTraitTest.php               | 7 -------
 tests/system/Test/TestResponseTest.php                  | 1 -
 tests/system/View/CellTest.php                          | 1 -
 tests/system/View/ParserFilterTest.php                  | 3 +--
 tests/system/View/ViewTest.php                          | 1 -
 utils/PhpCsFixer/CodeIgniter4.php                       | 2 ++
 24 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/tests/_support/Filters/Customfilter.php b/tests/_support/Filters/Customfilter.php
index b3769d17ec27..93bbe23608e3 100644
--- a/tests/_support/Filters/Customfilter.php
+++ b/tests/_support/Filters/Customfilter.php
@@ -4,8 +4,6 @@
 
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
-use CodeIgniter\Security\Exceptions\SecurityException;
-use Config\Services;
 
 class Customfilter implements \CodeIgniter\Filters\FilterInterface
 {
@@ -19,6 +17,4 @@ public function before(RequestInterface $request, $arguments = null)
     public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
     {
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Config/FactoriesTest.php b/tests/system/Config/FactoriesTest.php
index e51d138efac1..b29ce5dda086 100644
--- a/tests/system/Config/FactoriesTest.php
+++ b/tests/system/Config/FactoriesTest.php
@@ -2,7 +2,6 @@
 
 namespace CodeIgniter\Config;
 
-use CodeIgniter\Config\Factories;
 use CodeIgniter\Test\CIUnitTestCase;
 use ReflectionClass;
 use stdClass;
diff --git a/tests/system/Cookie/CookieStoreTest.php b/tests/system/Cookie/CookieStoreTest.php
index 90630ba5408a..c1e6eee8e2a0 100644
--- a/tests/system/Cookie/CookieStoreTest.php
+++ b/tests/system/Cookie/CookieStoreTest.php
@@ -2,7 +2,6 @@
 
 namespace CodeIgniter\Cookie;
 
-use CodeIgniter\Cookie\CookieStore;
 use CodeIgniter\Cookie\Exceptions\CookieException;
 use CodeIgniter\Test\CIUnitTestCase;
 use DateTimeImmutable;
diff --git a/tests/system/Cookie/CookieTest.php b/tests/system/Cookie/CookieTest.php
index b6e8469ec013..3cd6a4bd5c6f 100644
--- a/tests/system/Cookie/CookieTest.php
+++ b/tests/system/Cookie/CookieTest.php
@@ -2,7 +2,6 @@
 
 namespace CodeIgniter\Cookie;
 
-use CodeIgniter\Cookie\Cookie;
 use CodeIgniter\Cookie\Exceptions\CookieException;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Cookie as CookieConfig;
diff --git a/tests/system/Database/Builder/BaseTest.php b/tests/system/Database/Builder/BaseTest.php
index c0b7fe595a2d..9b20375e02d3 100644
--- a/tests/system/Database/Builder/BaseTest.php
+++ b/tests/system/Database/Builder/BaseTest.php
@@ -2,7 +2,6 @@
 
 namespace CodeIgniter\Database\Builder;
 
-use CodeIgniter\Database\Query;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
diff --git a/tests/system/Database/ConfigTest.php b/tests/system/Database/ConfigTest.php
index e377a97bbe87..9efc66653265 100644
--- a/tests/system/Database/ConfigTest.php
+++ b/tests/system/Database/ConfigTest.php
@@ -2,8 +2,6 @@
 
 namespace CodeIgniter\Database;
 
-use CodeIgniter\Database\BaseConnection;
-use CodeIgniter\Database\Config;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\ReflectionHelper;
 
diff --git a/tests/system/Encryption/EncryptionTest.php b/tests/system/Encryption/EncryptionTest.php
index 87a03a651aa2..35bb847fb4a4 100644
--- a/tests/system/Encryption/EncryptionTest.php
+++ b/tests/system/Encryption/EncryptionTest.php
@@ -2,7 +2,6 @@
 
 namespace CodeIgniter\Encryption;
 
-use CodeIgniter\Encryption\Encryption;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Encryption as EncryptionConfig;
 use Config\Services;
diff --git a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
index e20722bde10f..ba05f191f076 100644
--- a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
+++ b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
@@ -3,7 +3,6 @@
 namespace CodeIgniter\Encryption\Handlers;
 
 use CodeIgniter\Encryption\Encryption;
-use CodeIgniter\Encryption\Handlers\OpenSSLHandler;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Encryption as EncryptionConfig;
 
diff --git a/tests/system/HTTP/UserAgentTest.php b/tests/system/HTTP/UserAgentTest.php
index 56059b06f123..3c8047f3b853 100644
--- a/tests/system/HTTP/UserAgentTest.php
+++ b/tests/system/HTTP/UserAgentTest.php
@@ -2,7 +2,6 @@
 
 namespace CodeIgniter\HTTP;
 
-use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Test\CIUnitTestCase;
 
 /**
diff --git a/tests/system/Helpers/DateHelperTest.php b/tests/system/Helpers/DateHelperTest.php
index 75ae6f2f90fc..30f5f95b4ef2 100644
--- a/tests/system/Helpers/DateHelperTest.php
+++ b/tests/system/Helpers/DateHelperTest.php
@@ -3,7 +3,6 @@
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Test\CIUnitTestCase;
-use DateTime;
 
 /**
  * @internal
diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php
index f3b5663be9b3..ac392a52790a 100644
--- a/tests/system/Helpers/FilesystemHelperTest.php
+++ b/tests/system/Helpers/FilesystemHelperTest.php
@@ -6,9 +6,6 @@
 use InvalidArgumentException;
 use org\bovigo\vfs\vfsStream;
 
-use org\bovigo\vfs\vfsStreamDirectory;
-use org\bovigo\vfs\visitor\vfsStreamStructureVisitor;
-
 /**
  * @internal
  */
diff --git a/tests/system/Helpers/NumberHelperTest.php b/tests/system/Helpers/NumberHelperTest.php
index e335a8f7c57c..da5c77eea44f 100755
--- a/tests/system/Helpers/NumberHelperTest.php
+++ b/tests/system/Helpers/NumberHelperTest.php
@@ -119,7 +119,7 @@ public function testCurrencyCurrentLocale()
     {
         $this->assertSame('$1,234.56', number_to_currency(1234.56, 'USD', 'en_US', 2));
         $this->assertSame('£1,234.56', number_to_currency(1234.56, 'GBP', 'en_GB', 2));
-        $this->assertSame('1.234,56 RSD', number_to_currency(1234.56, 'RSD', 'sr_RS', 2));
+        $this->assertSame("1.234,56\u{a0}RSD", number_to_currency(1234.56, 'RSD', 'sr_RS', 2));
     }
 
     public function testNumbersThatArent()
diff --git a/tests/system/Helpers/URLHelper/CurrentUrlTest.php b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
index 30ed290c505b..be10b4bc4157 100644
--- a/tests/system/Helpers/URLHelper/CurrentUrlTest.php
+++ b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
@@ -5,7 +5,6 @@
 use CodeIgniter\Config\Factories;
 use CodeIgniter\Config\Services;
 use CodeIgniter\HTTP\URI;
-use CodeIgniter\Router\Exceptions\RouterException;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\App;
 
diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php
index 5cf8613bafff..40e63678e2c1 100644
--- a/tests/system/Helpers/URLHelper/SiteUrlTest.php
+++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php
@@ -5,7 +5,6 @@
 use CodeIgniter\Config\Factories;
 use CodeIgniter\Config\Services;
 use CodeIgniter\HTTP\URI;
-use CodeIgniter\Router\Exceptions\RouterException;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\App;
 
diff --git a/tests/system/Log/LoggerTest.php b/tests/system/Log/LoggerTest.php
index c4ba3a9a67eb..065a8804a3fd 100644
--- a/tests/system/Log/LoggerTest.php
+++ b/tests/system/Log/LoggerTest.php
@@ -4,7 +4,6 @@
 
 use CodeIgniter\Exceptions\FrameworkException;
 use CodeIgniter\Log\Exceptions\LogException;
-use CodeIgniter\Log\Logger;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockLogger as LoggerConfig;
 use CodeIgniter\Test\TestLogger;
diff --git a/tests/system/Models/CountAllModelTest.php b/tests/system/Models/CountAllModelTest.php
index eab41b699d87..aa3bc1e4f734 100644
--- a/tests/system/Models/CountAllModelTest.php
+++ b/tests/system/Models/CountAllModelTest.php
@@ -2,7 +2,6 @@
 
 namespace CodeIgniter\Models;
 
-use CodeIgniter\Database\BaseBuilder;
 use Tests\Support\Models\UserModel;
 
 /**
diff --git a/tests/system/Test/FabricatorTest.php b/tests/system/Test/FabricatorTest.php
index c92ac6fb7839..2ac4ce0d101e 100644
--- a/tests/system/Test/FabricatorTest.php
+++ b/tests/system/Test/FabricatorTest.php
@@ -3,7 +3,6 @@
 namespace CodeIgniter\Test;
 
 use CodeIgniter\Database\ModelFactory;
-use CodeIgniter\Test\CIUnitTestCase;
 use InvalidArgumentException;
 use stdClass;
 use Tests\Support\Models\EntityModel;
diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php
index 27eb76a3f500..8569820d82da 100644
--- a/tests/system/Test/FeatureTestTraitTest.php
+++ b/tests/system/Test/FeatureTestTraitTest.php
@@ -4,9 +4,6 @@
 
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\Response;
-use CodeIgniter\Test\CIUnitTestCase;
-use CodeIgniter\Test\FeatureTestTrait;
-use CodeIgniter\Test\TestResponse;
 
 /**
  * @group                       DatabaseLive
diff --git a/tests/system/Test/FilterTestTraitTest.php b/tests/system/Test/FilterTestTraitTest.php
index b7567ae437a0..fef2d63756df 100644
--- a/tests/system/Test/FilterTestTraitTest.php
+++ b/tests/system/Test/FilterTestTraitTest.php
@@ -2,15 +2,8 @@
 
 namespace CodeIgniter\Test;
 
-use CodeIgniter\Filters\Exceptions\FilterException;
-use CodeIgniter\Filters\FilterInterface;
 use CodeIgniter\Filters\Filters;
 use CodeIgniter\HTTP\RequestInterface;
-use CodeIgniter\Router\RouteCollection;
-use Config\Filters as FiltersConfig;
-use Config\Services;
-use InvalidArgumentException;
-use RuntimeException;
 use Tests\Support\Filters\Customfilter;
 
 /**
diff --git a/tests/system/Test/TestResponseTest.php b/tests/system/Test/TestResponseTest.php
index f63bf6429685..6bbec24a1451 100644
--- a/tests/system/Test/TestResponseTest.php
+++ b/tests/system/Test/TestResponseTest.php
@@ -5,7 +5,6 @@
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
-use CodeIgniter\Test\CIUnitTestCase;
 use Config\App;
 use Config\Services;
 use PHPUnit\Framework\AssertionFailedError;
diff --git a/tests/system/View/CellTest.php b/tests/system/View/CellTest.php
index 1b374ce93461..2f2879807e6f 100644
--- a/tests/system/View/CellTest.php
+++ b/tests/system/View/CellTest.php
@@ -4,7 +4,6 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockCache;
-use CodeIgniter\View\Cell;
 use CodeIgniter\View\Exceptions\ViewException;
 
 /**
diff --git a/tests/system/View/ParserFilterTest.php b/tests/system/View/ParserFilterTest.php
index 7bc75f25b777..ec27517dcdf0 100644
--- a/tests/system/View/ParserFilterTest.php
+++ b/tests/system/View/ParserFilterTest.php
@@ -4,7 +4,6 @@
 
 use CodeIgniter\Config\Services;
 use CodeIgniter\Test\CIUnitTestCase;
-use CodeIgniter\View\Parser;
 use Config\View;
 
 /**
@@ -416,7 +415,7 @@ public function testLocalCurrency()
         $template = '{ mynum|local_currency(EUR,de_DE,2) }';
 
         $parser->setData($data);
-        $this->assertSame('1.234.567,89 €', $parser->renderString($template));
+        $this->assertSame("1.234.567,89\u{a0}€", $parser->renderString($template));
     }
 
     public function testParsePairWithAbs()
diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php
index a440ef4a02c1..5be61ecbc798 100644
--- a/tests/system/View/ViewTest.php
+++ b/tests/system/View/ViewTest.php
@@ -5,7 +5,6 @@
 use CodeIgniter\Config\Services;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\View\Exceptions\ViewException;
-use CodeIgniter\View\View;
 use Config;
 use RuntimeException;
 
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index fa39a8d256e1..54e70a815cfb 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -198,6 +198,7 @@ public function __construct()
             'no_unreachable_default_argument_value'       => true,
             'no_unset_cast'                               => true,
             'no_unset_on_property'                        => false,
+            'no_unused_imports'                           => true,
             'no_useless_else'                             => true,
             'no_useless_return'                           => true,
             'no_useless_sprintf'                          => true,
@@ -205,6 +206,7 @@ public function __construct()
             'no_whitespace_in_blank_line'                 => true,
             'not_operator_with_space'                     => false,
             'not_operator_with_successor_space'           => true,
+            'non_printable_character'                     => ['use_escape_sequences_in_strings' => true],
             'normalize_index_brace'                       => true,
             'ordered_imports'                             => ['sort_algorithm' => 'alpha'],
             'php_unit_construct'                          => [

From 651a4e9e6e237f64be3d11b93eef09dbe1dd06d9 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Sun, 4 Jul 2021 17:00:32 +0800
Subject: [PATCH 0056/2325] Enable `no_null_property_initialization` fixer
 (#4901)

---
 app/Config/ContentSecurityPolicy.php | 20 ++++++++++----------
 app/Config/Kint.php                  |  6 +++---
 system/Database/BaseResult.php       |  2 +-
 system/Files/File.php                |  2 +-
 system/Security/Security.php         |  2 +-
 system/View/View.php                 |  2 +-
 utils/PhpCsFixer/CodeIgniter4.php    |  1 +
 7 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/app/Config/ContentSecurityPolicy.php b/app/Config/ContentSecurityPolicy.php
index 1f864e27f336..6fa5bd7b4cc7 100644
--- a/app/Config/ContentSecurityPolicy.php
+++ b/app/Config/ContentSecurityPolicy.php
@@ -32,7 +32,7 @@ class ContentSecurityPolicy extends BaseConfig
      *
      * @var string|null
      */
-    public $reportURI = null;
+    public $reportURI;
 
     /**
      * Instructs user agents to rewrite URL schemes, changing
@@ -53,7 +53,7 @@ class ContentSecurityPolicy extends BaseConfig
      *
      * @var string|string[]|null
      */
-    public $defaultSrc = null;
+    public $defaultSrc;
 
     /**
      * Lists allowed scripts' URLs.
@@ -83,7 +83,7 @@ class ContentSecurityPolicy extends BaseConfig
      *
      * @var string|string[]|null
      */
-    public $baseURI = null;
+    public $baseURI;
 
     /**
      * Lists the URLs for workers and embedded frame contents
@@ -105,7 +105,7 @@ class ContentSecurityPolicy extends BaseConfig
      *
      * @var string|string[]
      */
-    public $fontSrc = null;
+    public $fontSrc;
 
     /**
      * Lists valid endpoints for submission from `<form>` tags.
@@ -122,7 +122,7 @@ class ContentSecurityPolicy extends BaseConfig
      *
      * @var string|string[]|null
      */
-    public $frameAncestors = null;
+    public $frameAncestors;
 
     /**
      * The frame-src directive restricts the URLs which may
@@ -130,14 +130,14 @@ class ContentSecurityPolicy extends BaseConfig
      *
      * @var array|string|null
      */
-    public $frameSrc = null;
+    public $frameSrc;
 
     /**
      * Restricts the origins allowed to deliver video and audio.
      *
      * @var string|string[]|null
      */
-    public $mediaSrc = null;
+    public $mediaSrc;
 
     /**
      * Allows control over Flash and other plugins.
@@ -149,19 +149,19 @@ class ContentSecurityPolicy extends BaseConfig
     /**
      * @var string|string[]|null
      */
-    public $manifestSrc = null;
+    public $manifestSrc;
 
     /**
      * Limits the kinds of plugins a page may invoke.
      *
      * @var string|string[]|null
      */
-    public $pluginTypes = null;
+    public $pluginTypes;
 
     /**
      * List of actions allowed.
      *
      * @var string|string[]|null
      */
-    public $sandbox = null;
+    public $sandbox;
 }
diff --git a/app/Config/Kint.php b/app/Config/Kint.php
index 6101d56baed1..4b52422af7d7 100644
--- a/app/Config/Kint.php
+++ b/app/Config/Kint.php
@@ -23,7 +23,7 @@ class Kint extends BaseConfig
     |--------------------------------------------------------------------------
     */
 
-    public $plugins = null;
+    public $plugins;
 
     public $maxDepth = 6;
 
@@ -42,9 +42,9 @@ class Kint extends BaseConfig
 
     public $richSort = Renderer::SORT_FULL;
 
-    public $richObjectPlugins = null;
+    public $richObjectPlugins;
 
-    public $richTabPlugins = null;
+    public $richTabPlugins;
 
     /*
     |--------------------------------------------------------------------------
diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php
index 189313248dae..e3b7bfd42716 100644
--- a/system/Database/BaseResult.php
+++ b/system/Database/BaseResult.php
@@ -65,7 +65,7 @@ abstract class BaseResult implements ResultInterface
      *
      * @var int|null
      */
-    protected $numRows = null;
+    protected $numRows;
 
     /**
      * Row data
diff --git a/system/Files/File.php b/system/Files/File.php
index c257e261a33d..e0cca28b7687 100644
--- a/system/Files/File.php
+++ b/system/Files/File.php
@@ -33,7 +33,7 @@ class File extends SplFileInfo
      *
      * @var string|null
      */
-    protected $originalMimeType = null;
+    protected $originalMimeType;
 
     //--------------------------------------------------------------------
 
diff --git a/system/Security/Security.php b/system/Security/Security.php
index 0bed0de91855..6db8404287da 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -33,7 +33,7 @@ class Security implements SecurityInterface
      *
      * @var string|null
      */
-    protected $hash = null;
+    protected $hash;
 
     /**
      * CSRF Token Name
diff --git a/system/View/View.php b/system/View/View.php
index 57ac8f07ffbe..6cb306c15d89 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -35,7 +35,7 @@ class View implements RendererInterface
     /**
      * Merge savedData and userData
      */
-    protected $tempData = null;
+    protected $tempData;
 
     /**
      * The base directory to look in for our Views.
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 54e70a815cfb..49f4c0583d69 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -179,6 +179,7 @@ public function __construct()
             'no_leading_namespace_whitespace'             => true,
             'no_mixed_echo_print'                         => ['use' => 'echo'],
             'no_multiline_whitespace_around_double_arrow' => true,
+            'no_null_property_initialization'             => true,
             'no_php4_constructor'                         => true,
             'no_short_bool_cast'                          => true,
             'no_singleline_whitespace_before_semicolons'  => true,

From 1928006ccc9fa86be11bb8ee5708f4d7bec95fda Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Jul 2021 15:52:05 +0000
Subject: [PATCH 0057/2325] Update rector/rector requirement from 0.11.32 to
 0.11.35 (#4916)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 957d5a0220f2..2cf15f4e86ed 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "phpstan/phpstan": "0.12.90",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.32",
+        "rector/rector": "0.11.35",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {

From 2b2097a90ba6c1539c18b75cfd63f27da498ed29 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 7 Jul 2021 21:02:35 +0800
Subject: [PATCH 0058/2325] Add rule to remove some phpdoc tags and sort the
 rules

---
 utils/PhpCsFixer/CodeIgniter4.php | 54 +++++++++++++++++++------------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 49f4c0583d69..22e7a609f612 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -132,24 +132,38 @@ public function __construct()
             'full_opening_tag'                       => true,
             'fully_qualified_strict_types'           => true,
             'function_declaration'                   => ['closure_function_spacing' => 'one'],
-            'function_typehint_space'                => true,
             'function_to_constant'                   => true,
-            'heredoc_indentation'                    => ['indentation' => 'start_plus_one'],
-            'heredoc_to_nowdoc'                      => true,
-            'increment_style'                        => ['style' => 'post'],
-            'indentation_type'                       => true,
-            'lambda_not_used_import'                 => true,
-            'line_ending'                            => true,
-            'linebreak_after_opening_tag'            => true,
-            'list_syntax'                            => ['syntax' => 'short'],
-            'logical_operators'                      => true,
-            'lowercase_cast'                         => true,
-            'lowercase_keywords'                     => true,
-            'lowercase_static_reference'             => true,
-            'magic_constant_casing'                  => true,
-            'magic_method_casing'                    => true,
-            'mb_str_functions'                       => false,
-            'method_argument_space'                  => [
+            'function_typehint_space'                => true,
+            'general_phpdoc_annotation_remove'       => [
+                'annotations' => [
+                    'author',
+                    'package',
+                    'subpackage',
+                ],
+            ],
+            'general_phpdoc_tag_rename' => [
+                'case_sensitive' => false,
+                'fix_annotation' => true,
+                'fix_inline'     => true,
+                'replacements'   => ['inheritDocs' => 'inheritDoc'],
+            ],
+            'group_import'                => false,
+            'heredoc_indentation'         => ['indentation' => 'start_plus_one'],
+            'heredoc_to_nowdoc'           => true,
+            'increment_style'             => ['style' => 'post'],
+            'indentation_type'            => true,
+            'lambda_not_used_import'      => true,
+            'line_ending'                 => true,
+            'linebreak_after_opening_tag' => true,
+            'list_syntax'                 => ['syntax' => 'short'],
+            'logical_operators'           => true,
+            'lowercase_cast'              => true,
+            'lowercase_keywords'          => true,
+            'lowercase_static_reference'  => true,
+            'magic_constant_casing'       => true,
+            'magic_method_casing'         => true,
+            'mb_str_functions'            => false,
+            'method_argument_space'       => [
                 'after_heredoc'                    => false,
                 'keep_multiple_spaces_after_comma' => false,
                 'on_multiline'                     => 'ensure_fully_multiline',
@@ -205,10 +219,10 @@ public function __construct()
             'no_useless_sprintf'                          => true,
             'no_whitespace_before_comma_in_array'         => ['after_heredoc' => true],
             'no_whitespace_in_blank_line'                 => true,
-            'not_operator_with_space'                     => false,
-            'not_operator_with_successor_space'           => true,
             'non_printable_character'                     => ['use_escape_sequences_in_strings' => true],
             'normalize_index_brace'                       => true,
+            'not_operator_with_space'                     => false,
+            'not_operator_with_successor_space'           => true,
             'ordered_imports'                             => ['sort_algorithm' => 'alpha'],
             'php_unit_construct'                          => [
                 'assertions' => [
@@ -338,9 +352,9 @@ public function __construct()
                 'elements'      => ['arrays'],
             ],
             'trim_array_spaces'               => true,
-            'whitespace_after_comma_in_array' => true,
             'unary_operator_spaces'           => true,
             'visibility_required'             => ['elements' => ['const', 'method', 'property']],
+            'whitespace_after_comma_in_array' => true,
             'yoda_style'                      => [
                 'equal'                => false,
                 'identical'            => null,

From 7beece1cbef122840c843a8726e877318f266bb5 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 7 Jul 2021 21:11:20 +0800
Subject: [PATCH 0059/2325] Explicitly define all available options

---
 utils/PhpCsFixer/CodeIgniter4.php | 83 +++++++++++++++++++++----------
 1 file changed, 58 insertions(+), 25 deletions(-)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 22e7a609f612..cdcf3669410c 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -132,9 +132,18 @@ public function __construct()
             'full_opening_tag'                       => true,
             'fully_qualified_strict_types'           => true,
             'function_declaration'                   => ['closure_function_spacing' => 'one'],
-            'function_to_constant'                   => true,
-            'function_typehint_space'                => true,
-            'general_phpdoc_annotation_remove'       => [
+            'function_to_constant'                   => [
+                'functions' => [
+                    'get_called_class',
+                    'get_class',
+                    'get_class_this',
+                    'php_sapi_name',
+                    'phpversion',
+                    'pi',
+                ],
+            ],
+            'function_typehint_space'          => true,
+            'general_phpdoc_annotation_remove' => [
                 'annotations' => [
                     'author',
                     'package',
@@ -207,24 +216,37 @@ public function __construct()
             'no_trailing_whitespace'                      => true,
             'no_trailing_whitespace_in_comment'           => true,
             'no_trailing_whitespace_in_string'            => true,
-            'no_unneeded_control_parentheses'             => true,
-            'no_unneeded_curly_braces'                    => true,
-            'no_unneeded_final_method'                    => ['private_methods' => true],
-            'no_unreachable_default_argument_value'       => true,
-            'no_unset_cast'                               => true,
-            'no_unset_on_property'                        => false,
-            'no_unused_imports'                           => true,
-            'no_useless_else'                             => true,
-            'no_useless_return'                           => true,
-            'no_useless_sprintf'                          => true,
-            'no_whitespace_before_comma_in_array'         => ['after_heredoc' => true],
-            'no_whitespace_in_blank_line'                 => true,
-            'non_printable_character'                     => ['use_escape_sequences_in_strings' => true],
-            'normalize_index_brace'                       => true,
-            'not_operator_with_space'                     => false,
-            'not_operator_with_successor_space'           => true,
-            'ordered_imports'                             => ['sort_algorithm' => 'alpha'],
-            'php_unit_construct'                          => [
+            'no_unneeded_control_parentheses'             => [
+                'statements' => [
+                    'break',
+                    'clone',
+                    'continue',
+                    'echo_print',
+                    'return',
+                    'switch_case',
+                    'yield',
+                ],
+            ],
+            'no_unneeded_curly_braces'              => ['namespaces' => true],
+            'no_unneeded_final_method'              => ['private_methods' => true],
+            'no_unreachable_default_argument_value' => true,
+            'no_unset_cast'                         => true,
+            'no_unset_on_property'                  => false,
+            'no_unused_imports'                     => true,
+            'no_useless_else'                       => true,
+            'no_useless_return'                     => true,
+            'no_useless_sprintf'                    => true,
+            'no_whitespace_before_comma_in_array'   => ['after_heredoc' => true],
+            'no_whitespace_in_blank_line'           => true,
+            'non_printable_character'               => ['use_escape_sequences_in_strings' => true],
+            'normalize_index_brace'                 => true,
+            'not_operator_with_space'               => false,
+            'not_operator_with_successor_space'     => true,
+            'ordered_imports'                       => [
+                'imports_order'  => null,
+                'sort_algorithm' => 'alpha',
+            ],
+            'php_unit_construct' => [
                 'assertions' => [
                     'assertSame',
                     'assertEquals',
@@ -240,7 +262,7 @@ public function __construct()
             'php_unit_method_casing'                 => ['case' => 'camel_case'],
             'php_unit_mock'                          => ['target' => 'newest'],
             'php_unit_mock_short_will_return'        => true,
-            'php_unit_namespaced'                    => true,
+            'php_unit_namespaced'                    => ['target' => 'newest'],
             'php_unit_no_expectation_annotation'     => [
                 'target'          => 'newest',
                 'use_class_const' => true,
@@ -261,9 +283,20 @@ public function __construct()
                 'methods'   => [],
             ],
             'php_unit_test_class_requires_covers' => false,
-            'phpdoc_align'                        => true,
-            'phpdoc_indent'                       => true,
-            'phpdoc_inline_tag_normalizer'        => [
+            'phpdoc_align'                        => [
+                'align' => 'vertical',
+                'tags'  => [
+                    'method',
+                    'param',
+                    'property',
+                    'return',
+                    'throws',
+                    'type',
+                    'var',
+                ],
+            ],
+            'phpdoc_indent'                => true,
+            'phpdoc_inline_tag_normalizer' => [
                 'tags' => [
                     'example',
                     'id',

From 30b1bc1a8b77e87b62ab7d62ca7b2da1c1e4cccc Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 7 Jul 2021 21:32:49 +0800
Subject: [PATCH 0060/2325] Define `implode_call` and `include` rules

---
 system/Common.php                 | 2 +-
 system/Debug/Toolbar.php          | 4 ++--
 utils/PhpCsFixer/CodeIgniter4.php | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/system/Common.php b/system/Common.php
index da8edd0fcac0..a1066927ed06 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -674,7 +674,7 @@ function helper($filenames)
         // Now actually include all of the files
         if (! empty($includes)) {
             foreach ($includes as $path) {
-                include_once($path);
+                include_once $path;
             }
         }
     }
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 98bbd20ff59a..39a9de8497a5 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -398,7 +398,7 @@ public function respond()
             header('Content-Type: application/javascript');
 
             ob_start();
-            include($this->config->viewsPath . 'toolbarloader.js.php');
+            include $this->config->viewsPath . 'toolbarloader.js.php';
             $output = ob_get_clean();
 
             exit($output);
@@ -465,7 +465,7 @@ protected function format(string $data, string $format = 'html'): string
                 extract($data);
                 $parser = Services::parser($this->config->viewsPath, null, false);
                 ob_start();
-                include($this->config->viewsPath . 'toolbar.tpl.php');
+                include $this->config->viewsPath . 'toolbar.tpl.php';
                 $output = ob_get_clean();
                 break;
 
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index cdcf3669410c..2b1600fd32aa 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -159,6 +159,8 @@ public function __construct()
             'group_import'                => false,
             'heredoc_indentation'         => ['indentation' => 'start_plus_one'],
             'heredoc_to_nowdoc'           => true,
+            'implode_call'                => true,
+            'include'                     => true,
             'increment_style'             => ['style' => 'post'],
             'indentation_type'            => true,
             'lambda_not_used_import'      => true,

From 1dc72c1d65a9c981b0c1b6d1c1af6eb12abfd744 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 7 Jul 2021 21:55:16 +0800
Subject: [PATCH 0061/2325] Convert is_null to null === and fix phpstan errors

---
 app/Views/errors/cli/error_exception.php      |  2 +-
 system/API/ResponseTrait.php                  |  2 +-
 system/CLI/CLI.php                            |  6 +++---
 system/CLI/GeneratorTrait.php                 |  4 ++--
 system/Cache/Handlers/BaseHandler.php         |  2 +-
 system/CodeIgniter.php                        |  2 +-
 system/Common.php                             |  8 ++++----
 system/Config/BaseConfig.php                  |  2 +-
 system/Config/DotEnv.php                      |  2 +-
 system/Database/BaseBuilder.php               |  4 ++--
 system/Database/BaseResult.php                |  6 +++---
 system/Database/Migration.php                 |  2 +-
 system/Database/MigrationRunner.php           |  8 ++++----
 system/Database/Query.php                     |  4 ++--
 system/Database/SQLSRV/Builder.php            |  2 +-
 system/Debug/Exceptions.php                   |  2 +-
 system/Debug/Toolbar/Views/toolbar.tpl.php    |  2 +-
 system/Entity/Cast/JsonCast.php               |  2 +-
 system/Entity/Entity.php                      |  6 +++---
 system/Events/Events.php                      |  2 +-
 system/Filters/Filters.php                    |  2 +-
 system/HTTP/CURLRequest.php                   |  2 +-
 system/HTTP/Files/UploadedFile.php            |  2 +-
 system/HTTP/IncomingRequest.php               | 18 +++++++++---------
 system/HTTP/Negotiate.php                     |  2 +-
 system/HTTP/RequestTrait.php                  |  4 ++--
 system/HTTP/URI.php                           |  8 ++++----
 system/Helpers/filesystem_helper.php          |  2 +-
 system/I18n/Time.php                          | 12 ++++++------
 system/Images/Handlers/BaseHandler.php        |  6 +++---
 system/Images/Handlers/ImageMagickHandler.php |  2 +-
 system/Images/Image.php                       |  2 +-
 system/Language/Language.php                  |  2 +-
 system/Log/Handlers/ChromeLoggerHandler.php   |  2 +-
 system/Pager/PagerRenderer.php                |  2 +-
 system/Router/RouteCollection.php             |  4 ++--
 system/Security/Security.php                  |  2 +-
 system/Session/Handlers/DatabaseHandler.php   |  2 +-
 system/Session/Handlers/FileHandler.php       |  2 +-
 system/Session/Handlers/MemcachedHandler.php  |  2 +-
 system/Session/Handlers/RedisHandler.php      |  2 +-
 system/Session/Session.php                    |  2 +-
 system/Test/CIUnitTestCase.php                |  2 +-
 system/Test/DOMParser.php                     |  4 ++--
 system/Test/Fabricator.php                    | 16 ++++++++--------
 system/Test/FeatureTestCase.php               |  2 +-
 system/Test/FeatureTestTrait.php              |  2 +-
 system/Test/FilterTestTrait.php               |  2 +-
 system/Test/Mock/MockCache.php                |  2 +-
 system/Test/TestResponse.php                  |  4 ++--
 system/Validation/FileRules.php               | 14 +++++++-------
 system/Validation/Rules.php                   |  4 ++--
 system/Validation/Validation.php              |  4 ++--
 system/View/Parser.php                        | 10 +++++-----
 system/View/View.php                          |  2 +-
 tests/system/API/ResponseTraitTest.php        |  2 +-
 tests/system/Filters/fixtures/Role.php        |  4 ++--
 utils/PhpCsFixer/CodeIgniter4.php             |  1 +
 58 files changed, 115 insertions(+), 114 deletions(-)

diff --git a/app/Views/errors/cli/error_exception.php b/app/Views/errors/cli/error_exception.php
index 38253d3e4efa..f24e98fb9a49 100644
--- a/app/Views/errors/cli/error_exception.php
+++ b/app/Views/errors/cli/error_exception.php
@@ -49,7 +49,7 @@
                 case is_array($value):
                     return count($value) ? '[...]' : '[]';
 
-                case is_null($value):
+                case $value === null:
                     return 'null'; // return the lowercased version
 
                 default:
diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
index 78d774e91239..ce1056561b42 100644
--- a/system/API/ResponseTrait.php
+++ b/system/API/ResponseTrait.php
@@ -110,7 +110,7 @@ public function respond($data = null, int $status = null, string $message = '')
             $output = $this->format($data);
         }
 
-        if (! is_null($output)) {
+        if ($output !== null) {
             if ($this->format === 'json') {
                 return $this->response->setJSON($output)->setStatusCode($status, $message);
             }
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index 8e293d66a565..b9b70ba608b5 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -541,7 +541,7 @@ public static function color(string $text, string $foreground, string $backgroun
      */
     public static function strlen(?string $string): int
     {
-        if (is_null($string)) {
+        if ($string === null) {
             return 0;
         }
 
@@ -632,7 +632,7 @@ public static function hasColorSupport($resource): bool
      */
     public static function getWidth(int $default = 80): int
     {
-        if (\is_null(static::$width)) {
+        if (static::$width === null) {
             static::generateDimensions();
         }
 
@@ -650,7 +650,7 @@ public static function getWidth(int $default = 80): int
      */
     public static function getHeight(int $default = 32): int
     {
-        if (\is_null(static::$height)) {
+        if (static::$height === null) {
             static::generateDimensions();
         }
 
diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php
index ce3b97ec253f..7946a280781e 100644
--- a/system/CLI/GeneratorTrait.php
+++ b/system/CLI/GeneratorTrait.php
@@ -201,7 +201,7 @@ protected function qualifyClassName(): string
         // Gets the class name from input.
         $class = $this->params[0] ?? CLI::getSegment(2);
 
-        if (is_null($class) && $this->hasClassName) {
+        if ($class === null && $this->hasClassName) {
             // @codeCoverageIgnoreStart
             $nameLang = $this->classNameLang ?: 'CLI.generator.className.default';
             $class    = CLI::prompt(lang($nameLang), null, 'required');
@@ -388,6 +388,6 @@ protected function getOption(string $name)
             return CLI::getOption($name);
         }
 
-        return is_null($this->params[$name]) ? true : $this->params[$name];
+        return $this->params[$name] === null ? true : $this->params[$name];
     }
 }
diff --git a/system/Cache/Handlers/BaseHandler.php b/system/Cache/Handlers/BaseHandler.php
index ffd031b00134..a55f59d96393 100644
--- a/system/Cache/Handlers/BaseHandler.php
+++ b/system/Cache/Handlers/BaseHandler.php
@@ -81,7 +81,7 @@ public function remember(string $key, int $ttl, Closure $callback)
     {
         $value = $this->get($key);
 
-        if (! is_null($value)) {
+        if ($value !== null) {
             return $value;
         }
 
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index e709b9ee712e..a9b23821a7c1 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -379,7 +379,7 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
 
         // If any filters were specified within the routes file,
         // we need to ensure it's active for the current request
-        if (! is_null($routeFilter)) {
+        if ($routeFilter !== null) {
             $filters->enableFilter($routeFilter, 'before');
             $filters->enableFilter($routeFilter, 'after');
         }
diff --git a/system/Common.php b/system/Common.php
index a1066927ed06..f0463e5d8cc9 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -72,7 +72,7 @@ function cache(string $key = null)
         $cache = Services::cache();
 
         // No params - return cache object
-        if (is_null($key)) {
+        if ($key === null) {
             return $cache;
         }
 
@@ -482,10 +482,10 @@ function esc($data, string $context = 'html', string $encoding = null)
      */
     function force_https(int $duration = 31536000, RequestInterface $request = null, ResponseInterface $response = null)
     {
-        if (is_null($request)) {
+        if ($request === null) {
             $request = Services::request(null, true);
         }
-        if (is_null($response)) {
+        if ($response === null) {
             $response = Services::response(null, true);
         }
 
@@ -861,7 +861,7 @@ function old(string $key, $default = null, $escape = 'html')
 
         // Return the default value if nothing
         // found in the old input.
-        if (is_null($value)) {
+        if ($value === null) {
             return $default;
         }
 
diff --git a/system/Config/BaseConfig.php b/system/Config/BaseConfig.php
index 48d80f08547b..a3386c118cac 100644
--- a/system/Config/BaseConfig.php
+++ b/system/Config/BaseConfig.php
@@ -99,7 +99,7 @@ protected function initEnvValue(&$property, string $name, string $prefix, string
             foreach (array_keys($property) as $key) {
                 $this->initEnvValue($property[$key], "{$name}.{$key}", $prefix, $shortPrefix);
             }
-        } elseif (($value = $this->getEnvValue($name, $prefix, $shortPrefix)) !== false && ! is_null($value)) {
+        } elseif (($value = $this->getEnvValue($name, $prefix, $shortPrefix)) !== false && $value !== null) {
             if ($value === 'false') {
                 $value = false;
             } elseif ($value === 'true') {
diff --git a/system/Config/DotEnv.php b/system/Config/DotEnv.php
index b0b55b1195f2..52f5ec24dddb 100644
--- a/system/Config/DotEnv.php
+++ b/system/Config/DotEnv.php
@@ -230,7 +230,7 @@ protected function resolveNestedVariables(string $value): string
                 function ($matchedPatterns) {
                     $nestedVariable = $this->getVariable($matchedPatterns[1]);
 
-                    if (is_null($nestedVariable)) {
+                    if ($nestedVariable === null) {
                         return $matchedPatterns[0];
                     }
 
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 28213478a76b..ad1e4e313a0a 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1619,7 +1619,7 @@ public function orderBy(string $orderBy, string $direction = '', bool $escape =
      */
     public function limit(?int $value = null, ?int $offset = 0)
     {
-        if (! is_null($value)) {
+        if ($value !== null) {
             $this->QBLimit = $value;
         }
 
@@ -1778,7 +1778,7 @@ protected function compileFinalQuery(string $sql): string
      */
     public function get(int $limit = null, int $offset = 0, bool $reset = true)
     {
-        if (! is_null($limit)) {
+        if ($limit !== null) {
             $this->limit($limit, $offset);
         }
 
diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php
index e3b7bfd42716..b7de79e39490 100644
--- a/system/Database/BaseResult.php
+++ b/system/Database/BaseResult.php
@@ -151,7 +151,7 @@ public function getCustomResultObject(string $className)
             return $this->customResultObject[$className];
         }
 
-        is_null($this->rowData) || $this->dataSeek();
+        $this->rowData === null || $this->dataSeek();
         $this->customResultObject[$className] = [];
 
         while ($row = $this->fetchObject($className)) {
@@ -196,7 +196,7 @@ public function getResultArray(): array
             return $this->resultArray;
         }
 
-        is_null($this->rowData) || $this->dataSeek();
+        $this->rowData === null || $this->dataSeek();
 
         while ($row = $this->fetchAssoc()) {
             $this->resultArray[] = $row;
@@ -235,7 +235,7 @@ public function getResultObject(): array
             return $this->resultObject;
         }
 
-        is_null($this->rowData) || $this->dataSeek();
+        $this->rowData === null || $this->dataSeek();
 
         while ($row = $this->fetchObject()) {
             if (! is_subclass_of($row, Entity::class) && method_exists($row, 'syncOriginal')) {
diff --git a/system/Database/Migration.php b/system/Database/Migration.php
index 020617f023bb..b103e84baecd 100644
--- a/system/Database/Migration.php
+++ b/system/Database/Migration.php
@@ -48,7 +48,7 @@ abstract class Migration
      */
     public function __construct(Forge $forge = null)
     {
-        $this->forge = ! is_null($forge) ? $forge : Database::forge($this->DBGroup ?? config('Database')->defaultGroup);
+        $this->forge = $forge !== null ? $forge : Database::forge($this->DBGroup ?? config('Database')->defaultGroup);
 
         $this->db = $this->forge->getConnection();
     }
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
index feb056069c66..534a768f55fd 100644
--- a/system/Database/MigrationRunner.php
+++ b/system/Database/MigrationRunner.php
@@ -171,7 +171,7 @@ public function latest(string $group = null)
         $this->ensureTable();
 
         // Set database group if not null
-        if (! is_null($group)) {
+        if ($group !== null) {
             $this->groupFilter = $group;
             $this->setGroup($group);
         }
@@ -248,7 +248,7 @@ public function regress(int $targetBatch = 0, string $group = null)
         }
 
         // Set database group if not null
-        if (! is_null($group)) {
+        if ($group !== null) {
             $this->setGroup($group);
         }
 
@@ -370,7 +370,7 @@ public function force(string $path, string $namespace, string $group = null)
         $this->ensureTable();
 
         // Set database group if not null
-        if (! is_null($group)) {
+        if ($group !== null) {
             $this->groupFilter = $group;
             $this->setGroup($group);
         }
@@ -1006,7 +1006,7 @@ protected function migrate($direction, $migration): bool
         }
 
         // Skip migration if group filtering was set
-        if ($direction === 'up' && ! is_null($this->groupFilter) && $this->groupFilter !== $group) {
+        if ($direction === 'up' && $this->groupFilter !== null && $this->groupFilter !== $group) {
             $this->groupSkip = true;
 
             return true;
diff --git a/system/Database/Query.php b/system/Database/Query.php
index 0aa7db5781d5..2635f9e0fe93 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -107,7 +107,7 @@ public function setQuery(string $sql, $binds = null, bool $setEscape = true)
     {
         $this->originalQueryString = $sql;
 
-        if (! is_null($binds)) {
+        if ($binds !== null) {
             if (! is_array($binds)) {
                 $binds = [$binds];
             }
@@ -181,7 +181,7 @@ public function setDuration(float $start, float $end = null)
     {
         $this->startTime = $start;
 
-        if (is_null($end)) {
+        if ($end === null) {
             $end = microtime(true);
         }
 
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index 7ad2f9269bec..44126b6e471f 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -682,7 +682,7 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
      */
     public function get(int $limit = null, int $offset = 0, bool $reset = true)
     {
-        if (! is_null($limit)) {
+        if ($limit !== null) {
             $this->limit($limit, $offset);
         }
 
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index c613579332f0..2091ce6b9b5b 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -186,7 +186,7 @@ public function shutdownHandler()
         // it to an Exception and use the Exception handler to display it
         // to the user.
         // Fatal Error?
-        if (! is_null($error) && in_array($error['type'], [E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE], true)) {
+        if ($error !== null && in_array($error['type'], [E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE], true)) {
             $this->exceptionHandler(new ErrorException($error['message'], $error['type'], 0, $error['file'], $error['line']));
         }
     }
diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php
index d342808eddfd..f6366958e1be 100644
--- a/system/Debug/Toolbar/Views/toolbar.tpl.php
+++ b/system/Debug/Toolbar/Views/toolbar.tpl.php
@@ -49,7 +49,7 @@
 						<img src="<?= $c['icon'] ?>">
 						<span class="hide-sm">
 							<?= $c['title'] ?>
-							<?php if (! is_null($c['badgeValue'])) : ?>
+							<?php if ($c['badgeValue'] !== null) : ?>
 								<span class="badge"><?= $c['badgeValue'] ?></span>
 							<?php endif ?>
 						</span>
diff --git a/system/Entity/Cast/JsonCast.php b/system/Entity/Cast/JsonCast.php
index 71ec9c7dcf7f..f644e0bb6e90 100644
--- a/system/Entity/Cast/JsonCast.php
+++ b/system/Entity/Cast/JsonCast.php
@@ -27,7 +27,7 @@ public static function get($value, array $params = [])
     {
         $associative = in_array('array', $params, true);
 
-        $tmp = ! is_null($value) ? ($associative ? [] : new stdClass()) : null;
+        $tmp = $value !== null ? ($associative ? [] : new stdClass()) : null;
 
         if (function_exists('json_decode')
             && (
diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index 753f9106f975..149e9676fc3e 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -263,7 +263,7 @@ public function syncOriginal()
     public function hasChanged(string $key = null): bool
     {
         // If no parameter was given then check all attributes
-        if (is_null($key)) {
+        if ($key === null) {
             return $this->original !== $this->attributes;
         }
 
@@ -358,7 +358,7 @@ protected function castAs($value, string $attribute, string $method = 'get')
         if (strpos($type, '?') === 0) {
             $isNullable = true;
 
-            if (is_null($value)) {
+            if ($value === null) {
                 return null;
             }
 
@@ -435,7 +435,7 @@ public function jsonSerialize()
      */
     public function cast(bool $cast = null)
     {
-        if (is_null($cast)) {
+        if ($cast === null) {
             return $this->_cast;
         }
 
diff --git a/system/Events/Events.php b/system/Events/Events.php
index 6266bafe7dbd..1cfe301f9728 100644
--- a/system/Events/Events.php
+++ b/system/Events/Events.php
@@ -241,7 +241,7 @@ public static function removeListener($eventName, callable $listener): bool
      */
     public static function removeAllListeners($eventName = null)
     {
-        if (! is_null($eventName)) {
+        if ($eventName !== null) {
             unset(static::$listeners[$eventName]);
         } else {
             static::$listeners = [];
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index 6865d2d6097c..eb9bf2b26e16 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -383,7 +383,7 @@ public function enableFilter(string $name, string $when = 'before')
      */
     public function getArguments(string $key = null)
     {
-        return is_null($key) ? $this->arguments : $this->arguments[$key];
+        return $key === null ? $this->arguments : $this->arguments[$key];
     }
 
     //--------------------------------------------------------------------
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 20e1fa32379b..3efff9d8ba4c 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -499,7 +499,7 @@ protected function applyMethod(string $method, array $curlOptions): array
 
         if ($method === 'PUT' || $method === 'POST') {
             // See http://tools.ietf.org/html/rfc7230#section-3.3.2
-            if (is_null($this->header('content-length')) && ! isset($this->config['multipart'])) {
+            if ($this->header('content-length') === null && ! isset($this->config['multipart'])) {
                 $this->setHeader('Content-Length', '0');
             }
         } elseif ($method === 'HEAD') {
diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
index 351ffa7de24d..616545d80cbe 100644
--- a/system/HTTP/Files/UploadedFile.php
+++ b/system/HTTP/Files/UploadedFile.php
@@ -141,7 +141,7 @@ public function move(string $targetPath, string $name = null, bool $overwrite =
             throw HTTPException::forInvalidFile();
         }
 
-        $name        = is_null($name) ? $this->getName() : $name;
+        $name        = $name === null ? $this->getName() : $name;
         $destination = $overwrite ? $targetPath . $name : $this->getDestination($targetPath . $name);
 
         try {
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 117b613cb2bd..10648aa6f8b9 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -340,7 +340,7 @@ protected function parseQueryString(): string
      */
     public function negotiate(string $type, array $supported, bool $strictMatch = false): string
     {
-        if (is_null($this->negotiator)) {
+        if ($this->negotiator === null) {
             $this->negotiator = Services::negotiator($this, true);
         }
 
@@ -457,7 +457,7 @@ public function setPath(string $path, App $config = null)
      */
     public function getPath(): string
     {
-        if (is_null($this->path)) {
+        if ($this->path === null) {
             $this->detectPath($this->config->uriProtocol);
         }
 
@@ -523,8 +523,8 @@ public function getDefaultLocale(): string
      */
     public function getVar($index = null, $filter = null, $flags = null)
     {
-        if (strpos($this->getHeaderLine('Content-Type'), 'application/json') !== false && ! is_null($this->body)) {
-            if (is_null($index)) {
+        if (strpos($this->getHeaderLine('Content-Type'), 'application/json') !== false && $this->body !== null) {
+            if ($index === null) {
                 return $this->getJSON();
             }
 
@@ -743,7 +743,7 @@ public function getOldInput(string $key)
         // Check for an array value in POST.
         if (isset($_SESSION['_ci_old_input']['post'])) {
             $value = dot_array_search($key, $_SESSION['_ci_old_input']['post']);
-            if (! is_null($value)) {
+            if ($value !== null) {
                 return $value;
             }
         }
@@ -751,7 +751,7 @@ public function getOldInput(string $key)
         // Check for an array value in GET.
         if (isset($_SESSION['_ci_old_input']['get'])) {
             $value = dot_array_search($key, $_SESSION['_ci_old_input']['get']);
-            if (! is_null($value)) {
+            if ($value !== null) {
                 return $value;
             }
         }
@@ -770,7 +770,7 @@ public function getOldInput(string $key)
      */
     public function getFiles(): array
     {
-        if (is_null($this->files)) {
+        if ($this->files === null) {
             $this->files = new FileCollection();
         }
 
@@ -787,7 +787,7 @@ public function getFiles(): array
      */
     public function getFileMultiple(string $fileID)
     {
-        if (is_null($this->files)) {
+        if ($this->files === null) {
             $this->files = new FileCollection();
         }
 
@@ -804,7 +804,7 @@ public function getFileMultiple(string $fileID)
      */
     public function getFile(string $fileID)
     {
-        if (is_null($this->files)) {
+        if ($this->files === null) {
             $this->files = new FileCollection();
         }
 
diff --git a/system/HTTP/Negotiate.php b/system/HTTP/Negotiate.php
index a371cab4008e..67aa4e39c9d7 100644
--- a/system/HTTP/Negotiate.php
+++ b/system/HTTP/Negotiate.php
@@ -40,7 +40,7 @@ class Negotiate
      */
     public function __construct(RequestInterface $request = null)
     {
-        if (! is_null($request)) {
+        if ($request !== null) {
             $this->request = $request;
         }
     }
diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php
index c67fdf280639..e3fdcb67b16a 100644
--- a/system/HTTP/RequestTrait.php
+++ b/system/HTTP/RequestTrait.php
@@ -236,7 +236,7 @@ public function fetchGlobal(string $method, $index = null, ?int $filter = null,
         $flags  = is_array($flags) ? $flags : (is_numeric($flags) ? (int) $flags : 0);
 
         // Return all values when $index is null
-        if (is_null($index)) {
+        if ($index === null) {
             $values = [];
 
             foreach ($this->globals[$method] as $key => $value) {
@@ -301,7 +301,7 @@ public function fetchGlobal(string $method, $index = null, ?int $filter = null,
         }
 
         // Cannot filter these types of data automatically...
-        if (is_array($value) || is_object($value) || is_null($value)) {
+        if (is_array($value) || is_object($value) || $value === null) {
             return $value;
         }
 
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index 06f66072791d..eb43e0065221 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -241,7 +241,7 @@ public static function removeDotSegments(string $path): string
      */
     public function __construct(string $uri = null)
     {
-        if (! is_null($uri)) {
+        if ($uri !== null) {
             $this->setURI($uri);
         }
     }
@@ -291,7 +291,7 @@ public function useRawQueryString(bool $raw = true)
      */
     public function setURI(string $uri = null)
     {
-        if (! is_null($uri)) {
+        if ($uri !== null) {
             $parts = parse_url($uri);
 
             if ($parts === false) {
@@ -771,7 +771,7 @@ public function setHost(string $str)
      */
     public function setPort(int $port = null)
     {
-        if (is_null($port)) {
+        if ($port === null) {
             return $this;
         }
 
@@ -1030,7 +1030,7 @@ protected function applyParts(array $parts)
         }
 
         // Port
-        if (isset($parts['port']) && ! is_null($parts['port'])) {
+        if (isset($parts['port']) && $parts['port'] !== null) {
             // Valid port numbers are enforced by earlier parse_url or setPort()
             $port       = $parts['port'];
             $this->port = $port;
diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php
index 2f3a5d0ffe72..98d4d9c0446e 100644
--- a/system/Helpers/filesystem_helper.php
+++ b/system/Helpers/filesystem_helper.php
@@ -235,7 +235,7 @@ function get_filenames(string $sourceDir, ?bool $includePath = false, bool $hidd
 
                 if ($includePath === false) {
                     $files[] = $basename;
-                } elseif (is_null($includePath)) {
+                } elseif ($includePath === null) {
                     $files[] = str_replace($sourceDir, '', $name);
                 } else {
                     $files[] = $name;
diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index 419fadda883f..468a8d9a5a18 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -82,7 +82,7 @@ public function __construct(string $time = null, $timezone = null, string $local
         $this->locale = ! empty($locale) ? $locale : Locale::getDefault();
 
         // If a test instance has been provided, use it instead.
-        if (is_null($time) && static::$testNow instanceof Time) {
+        if ($time === null && static::$testNow instanceof Time) {
             if (empty($timezone)) {
                 $timezone = static::$testNow->getTimezone();
             }
@@ -255,9 +255,9 @@ public static function createFromTime(int $hour = null, int $minutes = null, int
      */
     public static function create(int $year = null, int $month = null, int $day = null, int $hour = null, int $minutes = null, int $seconds = null, $timezone = null, string $locale = null)
     {
-        $year    = is_null($year) ? date('Y') : $year;
-        $month   = is_null($month) ? date('m') : $month;
-        $day     = is_null($day) ? date('d') : $day;
+        $year    = $year === null ? date('Y') : $year;
+        $month   = $month === null ? date('m') : $month;
+        $day     = $day === null ? date('d') : $day;
         $hour    = empty($hour) ? 0 : $hour;
         $minutes = empty($minutes) ? 0 : $minutes;
         $seconds = empty($seconds) ? 0 : $seconds;
@@ -380,7 +380,7 @@ public function toDateTime()
     public static function setTestNow($datetime = null, $timezone = null, string $locale = null)
     {
         // Reset the test instance
-        if (is_null($datetime)) {
+        if ($datetime === null) {
             static::$testNow = null;
 
             return;
@@ -405,7 +405,7 @@ public static function setTestNow($datetime = null, $timezone = null, string $lo
      */
     public static function hasTestNow(): bool
     {
-        return ! is_null(static::$testNow);
+        return static::$testNow !== null;
     }
 
     //--------------------------------------------------------------------
diff --git a/system/Images/Handlers/BaseHandler.php b/system/Images/Handlers/BaseHandler.php
index 4a8cc941735c..3a63c2455214 100644
--- a/system/Images/Handlers/BaseHandler.php
+++ b/system/Images/Handlers/BaseHandler.php
@@ -598,7 +598,7 @@ public function getEXIF(string $key = null, bool $silent = false)
             case IMAGETYPE_JPEG:
             case IMAGETYPE_TIFF_II:
                 $exif = @exif_read_data($this->image()->getPathname());
-                if (! is_null($key) && is_array($exif)) {
+                if ($key !== null && is_array($exif)) {
                     $exif = $exif[$key] ?? false;
                 }
         }
@@ -635,7 +635,7 @@ public function fit(int $width, int $height = null, string $position = 'center')
 
         [$cropWidth, $cropHeight] = $this->calcAspectRatio($width, $height, $origWidth, $origHeight);
 
-        if (is_null($height)) {
+        if ($height === null) {
             $height = ceil(($width / $cropWidth) * $cropHeight);
         }
 
@@ -664,7 +664,7 @@ protected function calcAspectRatio($width, $height = null, $origWidth = 0, $orig
 
         // If $height is null, then we have it easy.
         // Calc based on full image size and be done.
-        if (is_null($height)) {
+        if ($height === null) {
             $height = ($width / $origWidth) * $origHeight;
 
             return [
diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php
index 3082845f7164..3f92bc1a9186 100644
--- a/system/Images/Handlers/ImageMagickHandler.php
+++ b/system/Images/Handlers/ImageMagickHandler.php
@@ -321,7 +321,7 @@ public function save(string $target = null, int $quality = 90): bool
      */
     protected function getResourcePath()
     {
-        if (! is_null($this->resource)) {
+        if ($this->resource !== null) {
             return $this->resource;
         }
 
diff --git a/system/Images/Image.php b/system/Images/Image.php
index f1ea29c29b00..ec07af3432f9 100644
--- a/system/Images/Image.php
+++ b/system/Images/Image.php
@@ -71,7 +71,7 @@ public function copy(string $targetPath, string $targetName = null, int $perms =
     {
         $targetPath = rtrim($targetPath, '/ ') . '/';
 
-        $targetName = is_null($targetName) ? $this->getFilename() : $targetName;
+        $targetName = $targetName === null ? $this->getFilename() : $targetName;
 
         if (empty($targetName)) {
             throw ImageException::forInvalidFile($targetName);
diff --git a/system/Language/Language.php b/system/Language/Language.php
index b2b46e0813e1..f163f1f0c695 100644
--- a/system/Language/Language.php
+++ b/system/Language/Language.php
@@ -75,7 +75,7 @@ public function __construct(string $locale)
      */
     public function setLocale(string $locale = null)
     {
-        if (! is_null($locale)) {
+        if ($locale !== null) {
             $this->locale = $locale;
         }
 
diff --git a/system/Log/Handlers/ChromeLoggerHandler.php b/system/Log/Handlers/ChromeLoggerHandler.php
index 47ff298de41a..4a93a49983b5 100644
--- a/system/Log/Handlers/ChromeLoggerHandler.php
+++ b/system/Log/Handlers/ChromeLoggerHandler.php
@@ -165,7 +165,7 @@ protected function format($object)
      */
     public function sendLogs(ResponseInterface &$response = null)
     {
-        if (is_null($response)) {
+        if ($response === null) {
             $response = Services::response(null, true);
         }
 
diff --git a/system/Pager/PagerRenderer.php b/system/Pager/PagerRenderer.php
index 33d7b01b2824..7b73075f92c0 100644
--- a/system/Pager/PagerRenderer.php
+++ b/system/Pager/PagerRenderer.php
@@ -294,7 +294,7 @@ public function links(): array
      */
     protected function updatePages(int $count = null)
     {
-        if (is_null($count)) {
+        if ($count === null) {
             return;
         }
 
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 8542c9c0cfb5..438500e77b82 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1316,7 +1316,7 @@ protected function fillRouteParams(string $from, array $params = null): string
     protected function create(string $verb, string $from, $to, array $options = null)
     {
         $overwrite = false;
-        $prefix    = is_null($this->group) ? '' : $this->group . '/';
+        $prefix    = $this->group === null ? '' : $this->group . '/';
 
         $from = filter_var($prefix . $from, FILTER_SANITIZE_STRING);
 
@@ -1435,7 +1435,7 @@ private function checkSubdomains($subdomains): bool
             return false;
         }
 
-        if (is_null($this->currentSubdomain)) {
+        if ($this->currentSubdomain === null) {
             $this->currentSubdomain = $this->determineCurrentSubdomain();
         }
 
diff --git a/system/Security/Security.php b/system/Security/Security.php
index 6db8404287da..c6a300abb146 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -394,7 +394,7 @@ public function sanitizeFilename(string $str, bool $relativePath = false): strin
      */
     protected function generateHash(): string
     {
-        if (is_null($this->hash)) {
+        if ($this->hash === null) {
             // If the cookie exists we will use its value.
             // We don't necessarily want to regenerate it with
             // each page load since a page could contain embedded
diff --git a/system/Session/Handlers/DatabaseHandler.php b/system/Session/Handlers/DatabaseHandler.php
index 674da60f1481..91aa16f997a4 100644
--- a/system/Session/Handlers/DatabaseHandler.php
+++ b/system/Session/Handlers/DatabaseHandler.php
@@ -134,7 +134,7 @@ public function read($sessionID): string
         }
 
         // Needed by write() to detect session_regenerate_id() calls
-        if (is_null($this->sessionID)) { // @phpstan-ignore-line
+        if (! isset($this->sessionID)) {
             $this->sessionID = $sessionID;
         }
 
diff --git a/system/Session/Handlers/FileHandler.php b/system/Session/Handlers/FileHandler.php
index a6762080e5ce..0350767a1255 100644
--- a/system/Session/Handlers/FileHandler.php
+++ b/system/Session/Handlers/FileHandler.php
@@ -157,7 +157,7 @@ public function read($sessionID)
             }
 
             // Needed by write() to detect session_regenerate_id() calls
-            if (is_null($this->sessionID)) { // @phpstan-ignore-line
+            if (! isset($this->sessionID)) {
                 $this->sessionID = $sessionID;
             }
 
diff --git a/system/Session/Handlers/MemcachedHandler.php b/system/Session/Handlers/MemcachedHandler.php
index b924e6318d44..43a432b25abb 100644
--- a/system/Session/Handlers/MemcachedHandler.php
+++ b/system/Session/Handlers/MemcachedHandler.php
@@ -147,7 +147,7 @@ public function read($sessionID): string
     {
         if (isset($this->memcached) && $this->lockSession($sessionID)) {
             // Needed by write() to detect session_regenerate_id() calls
-            if (is_null($this->sessionID)) { // @phpstan-ignore-line
+            if (! isset($this->sessionID)) {
                 $this->sessionID = $sessionID;
             }
 
diff --git a/system/Session/Handlers/RedisHandler.php b/system/Session/Handlers/RedisHandler.php
index dc55f9f2f170..e937fd83eb6c 100644
--- a/system/Session/Handlers/RedisHandler.php
+++ b/system/Session/Handlers/RedisHandler.php
@@ -152,7 +152,7 @@ public function read($sessionID): string
     {
         if (isset($this->redis) && $this->lockSession($sessionID)) {
             // Needed by write() to detect session_regenerate_id() calls
-            if (is_null($this->sessionID)) { // @phpstan-ignore-line
+            if (! isset($this->sessionID)) {
                 $this->sessionID = $sessionID;
             }
 
diff --git a/system/Session/Session.php b/system/Session/Session.php
index b99d5b3ae9f3..6cbbbf11a0c5 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -488,7 +488,7 @@ public function set($data, $value = null)
      */
     public function get(string $key = null)
     {
-        if (! empty($key) && (! is_null($value = $_SESSION[$key] ?? null) || ! is_null($value = dot_array_search($key, $_SESSION ?? [])))) {
+        if (! empty($key) && (null !== ($value = $_SESSION[$key] ?? null) || null !== ($value = dot_array_search($key, $_SESSION ?? [])))) {
             return $value;
         }
 
diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
index 6a0d6dd10354..2b2e9b9794e8 100644
--- a/system/Test/CIUnitTestCase.php
+++ b/system/Test/CIUnitTestCase.php
@@ -275,7 +275,7 @@ protected function tearDown(): void
      */
     private function callTraitMethods(string $stage): void
     {
-        if (is_null($this->traits)) {
+        if ($this->traits === null) {
             $this->traits = class_uses_recursive($this);
         }
 
diff --git a/system/Test/DOMParser.php b/system/Test/DOMParser.php
index 401cfb9627a8..17d8b006ceb4 100644
--- a/system/Test/DOMParser.php
+++ b/system/Test/DOMParser.php
@@ -116,7 +116,7 @@ public function withFile(string $path)
     public function see(string $search = null, string $element = null): bool
     {
         // If Element is null, we're just scanning for text
-        if (is_null($element)) {
+        if ($element === null) {
             $content = $this->dom->saveHTML($this->dom->documentElement);
 
             return mb_strpos($content, $search) !== false;
@@ -261,7 +261,7 @@ protected function doXPath(?string $search, string $element, array $paths = [])
             }
         }
 
-        if (! is_null($search)) {
+        if ($search !== null) {
             $path .= "[contains(., \"{$search}\")]";
         }
 
diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
index cc1260995322..ec4ee4c10862 100644
--- a/system/Test/Fabricator.php
+++ b/system/Test/Fabricator.php
@@ -114,7 +114,7 @@ public function __construct($model, array $formatters = null, string $locale = n
         $this->model = $model;
 
         // If no locale was specified then use the App default
-        if (is_null($locale)) {
+        if ($locale === null) {
             $locale = config('App')->defaultLocale;
         }
 
@@ -284,7 +284,7 @@ public function getFormatters(): ?array
      */
     public function setFormatters(array $formatters = null): self
     {
-        if (! is_null($formatters)) {
+        if ($formatters !== null) {
             $this->formatters = $formatters;
         } elseif (method_exists($this->model, 'fake')) {
             $this->formatters = null;
@@ -372,7 +372,7 @@ protected function guessFormatter($field): string
     public function make(int $count = null)
     {
         // If a singleton was requested then go straight to it
-        if (is_null($count)) {
+        if ($count === null) {
             return $this->model->returnType === 'array'
                 ? $this->makeArray()
                 : $this->makeObject();
@@ -398,7 +398,7 @@ public function make(int $count = null)
      */
     public function makeArray()
     {
-        if (! is_null($this->formatters)) {
+        if ($this->formatters !== null) {
             $result = [];
 
             foreach ($this->formatters as $field => $formatter) {
@@ -435,7 +435,7 @@ public function makeArray()
      */
     public function makeObject(string $className = null): object
     {
-        if (is_null($className)) {
+        if ($className === null) {
             if ($this->model->returnType === 'object' || $this->model->returnType === 'array') {
                 $className = 'stdClass';
             } else {
@@ -444,7 +444,7 @@ public function makeObject(string $className = null): object
         }
 
         // If using the model's fake() method then check it for the correct return type
-        if (is_null($this->formatters) && method_exists($this->model, 'fake')) {
+        if ($this->formatters === null && method_exists($this->model, 'fake')) {
             $result = $this->model->fake($this->faker);
 
             if ($result instanceof $className) {
@@ -511,7 +511,7 @@ public function create(int $count = null, bool $mock = false)
             $this->model->withDeleted();
         }
 
-        return $this->model->find(is_null($count) ? reset($ids) : $ids);
+        return $this->model->find($count === null ? reset($ids) : $ids);
     }
 
     /**
@@ -567,6 +567,6 @@ protected function createMock(int $count = null)
             $return[] = $result;
         }
 
-        return is_null($count) ? reset($return) : $return;
+        return $count === null ? reset($return) : $return;
     }
 }
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index aff063d0115f..3efe384a97b6 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -80,7 +80,7 @@ protected function withRoutes(array $routes = null)
      */
     public function withSession(array $values = null)
     {
-        $this->session = is_null($values) ? $_SESSION : $values;
+        $this->session = $values === null ? $_SESSION : $values;
 
         return $this;
     }
diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php
index 694d1212e1b1..6e87b57fcc35 100644
--- a/system/Test/FeatureTestTrait.php
+++ b/system/Test/FeatureTestTrait.php
@@ -70,7 +70,7 @@ protected function withRoutes(array $routes = null)
      */
     public function withSession(array $values = null)
     {
-        $this->session = is_null($values) ? $_SESSION : $values;
+        $this->session = $values === null ? $_SESSION : $values;
 
         return $this;
     }
diff --git a/system/Test/FilterTestTrait.php b/system/Test/FilterTestTrait.php
index 0da5d975724f..9b990c192107 100644
--- a/system/Test/FilterTestTrait.php
+++ b/system/Test/FilterTestTrait.php
@@ -103,7 +103,7 @@ protected function setUpFilterTestTrait(): void
         $this->filtersConfig = $this->filtersConfig ?? config('Filters');
         $this->filters       = $this->filters ?? new Filters($this->filtersConfig, $this->request, $this->response);
 
-        if (is_null($this->collection)) {
+        if ($this->collection === null) {
             // Load the RouteCollection from Config to gather App route info
             // (creates $routes using the Service as a starting point)
             require APPPATH . 'Config/Routes.php';
diff --git a/system/Test/Mock/MockCache.php b/system/Test/Mock/MockCache.php
index d5a591a833ed..1ba580eb6d95 100644
--- a/system/Test/Mock/MockCache.php
+++ b/system/Test/Mock/MockCache.php
@@ -71,7 +71,7 @@ public function remember(string $key, int $ttl, Closure $callback)
     {
         $value = $this->get($key);
 
-        if (! is_null($value)) {
+        if ($value !== null) {
             return $value;
         }
 
diff --git a/system/Test/TestResponse.php b/system/Test/TestResponse.php
index 2831ad63856d..670982db6772 100644
--- a/system/Test/TestResponse.php
+++ b/system/Test/TestResponse.php
@@ -271,7 +271,7 @@ public function assertSessionHas(string $key, $value = null)
     {
         $this->assertArrayHasKey($key, $_SESSION, "'{$key}' is not in the current \$_SESSION");
 
-        if (is_null($value)) {
+        if ($value === null) {
             return;
         }
 
@@ -382,7 +382,7 @@ public function getJSON()
     {
         $response = $this->response->getJSON();
 
-        if (is_null($response)) {
+        if ($response === null) {
             return false;
         }
 
diff --git a/system/Validation/FileRules.php b/system/Validation/FileRules.php
index 5016db7ed4a7..bd7ed617d565 100644
--- a/system/Validation/FileRules.php
+++ b/system/Validation/FileRules.php
@@ -36,7 +36,7 @@ class FileRules
      */
     public function __construct(RequestInterface $request = null)
     {
-        if (is_null($request)) {
+        if ($request === null) {
             $request = Services::request();
         }
 
@@ -60,7 +60,7 @@ public function uploaded(?string $blank, string $name): bool
         }
 
         foreach ($files as $file) {
-            if (is_null($file)) {
+            if ($file === null) {
                 return false;
             }
 
@@ -103,7 +103,7 @@ public function max_size(?string $blank, string $params): bool
         }
 
         foreach ($files as $file) {
-            if (is_null($file)) {
+            if ($file === null) {
                 return false;
             }
 
@@ -146,7 +146,7 @@ public function is_image(?string $blank, string $params): bool
         }
 
         foreach ($files as $file) {
-            if (is_null($file)) {
+            if ($file === null) {
                 return false;
             }
 
@@ -188,7 +188,7 @@ public function mime_in(?string $blank, string $params): bool
         }
 
         foreach ($files as $file) {
-            if (is_null($file)) {
+            if ($file === null) {
                 return false;
             }
 
@@ -226,7 +226,7 @@ public function ext_in(?string $blank, string $params): bool
         }
 
         foreach ($files as $file) {
-            if (is_null($file)) {
+            if ($file === null) {
                 return false;
             }
 
@@ -265,7 +265,7 @@ public function max_dims(?string $blank, string $params): bool
         }
 
         foreach ($files as $file) {
-            if (is_null($file)) {
+            if ($file === null) {
                 return false;
             }
 
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
index c132cb2774ba..70b523c2064e 100644
--- a/system/Validation/Rules.php
+++ b/system/Validation/Rules.php
@@ -349,7 +349,7 @@ public function required($str = null): bool
      */
     public function required_with($str = null, string $fields = null, array $data = []): bool
     {
-        if (is_null($fields) || empty($data)) {
+        if ($fields === null || empty($data)) {
             throw new InvalidArgumentException('You must supply the parameters: fields, data.');
         }
 
@@ -396,7 +396,7 @@ public function required_with($str = null, string $fields = null, array $data =
      */
     public function required_without($str = null, string $fields = null, array $data = []): bool
     {
-        if (is_null($fields) || empty($data)) {
+        if ($fields === null || empty($data)) {
             throw new InvalidArgumentException('You must supply the parameters: fields, data.');
         }
 
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 2c5eee378fda..03d9e76c5244 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -191,7 +191,7 @@ public function check($value, string $rule, array $errors = []): bool
      */
     protected function processRules(string $field, string $label = null, $value, $rules = null, array $data = null): bool
     {
-        if (is_null($data)) {
+        if ($data === null) {
             throw new InvalidArgumentException('You must supply the parameter: data.');
         }
 
@@ -303,7 +303,7 @@ protected function processRules(string $field, string $label = null, $value, $ru
                     $value = '[' . implode(', ', $value) . ']';
                 }
 
-                $this->errors[$field] = is_null($error)
+                $this->errors[$field] = $error === null
                     ? $this->getErrorMessage($rule, $field, $label, $param, $value)
                     : $error; // @phpstan-ignore-line
 
diff --git a/system/View/Parser.php b/system/View/Parser.php
index 362efec2fa17..fc17b868f796 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -93,7 +93,7 @@ public function __construct(ViewConfig $config, string $viewPath = null, $loader
     public function render(string $view, array $options = null, bool $saveData = null): string
     {
         $start = microtime(true);
-        if (is_null($saveData)) {
+        if ($saveData === null) {
             $saveData = $this->config->saveData;
         }
 
@@ -121,7 +121,7 @@ public function render(string $view, array $options = null, bool $saveData = nul
             }
         }
 
-        if (is_null($this->tempData)) {
+        if ($this->tempData === null) {
             $this->tempData = $this->data;
         }
 
@@ -158,11 +158,11 @@ public function render(string $view, array $options = null, bool $saveData = nul
     public function renderString(string $template, array $options = null, bool $saveData = null): string
     {
         $start = microtime(true);
-        if (is_null($saveData)) {
+        if ($saveData === null) {
             $saveData = $this->config->saveData;
         }
 
-        if (is_null($this->tempData)) {
+        if ($this->tempData === null) {
             $this->tempData = $this->data;
         }
 
@@ -488,7 +488,7 @@ protected function parseConditionals(string $template): string
         // Parse the PHP itself, or insert an error so they can debug
         ob_start();
 
-        if (is_null($this->tempData)) {
+        if ($this->tempData === null) {
             $this->tempData = $this->data;
         }
 
diff --git a/system/View/View.php b/system/View/View.php
index 6cb306c15d89..65f2350e9a9a 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -233,7 +233,7 @@ public function render(string $view, array $options = null, bool $saveData = nul
         // When using layouts, the data has already been stored
         // in $this->sections, and no other valid output
         // is allowed in $output so we'll overwrite it.
-        if (! is_null($this->layout) && $this->sectionStack === []) {
+        if ($this->layout !== null && $this->sectionStack === []) {
             $layoutView   = $this->layout;
             $this->layout = null;
             // Save current vars
diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
index 865fc72eb7e5..88a21f0aa642 100644
--- a/tests/system/API/ResponseTraitTest.php
+++ b/tests/system/API/ResponseTraitTest.php
@@ -54,7 +54,7 @@ protected function makeController(array $userConfig = [], string $uri = 'http://
             $config->{$key} = $value;
         }
 
-        if (is_null($this->request)) {
+        if ($this->request === null) {
             $this->request  = new MockIncomingRequest((object) $config, new URI($uri), null, new UserAgent());
             $this->response = new MockResponse((object) $config);
         }
diff --git a/tests/system/Filters/fixtures/Role.php b/tests/system/Filters/fixtures/Role.php
index 91032f82765d..b55abaeace2c 100644
--- a/tests/system/Filters/fixtures/Role.php
+++ b/tests/system/Filters/fixtures/Role.php
@@ -12,7 +12,7 @@ public function after(RequestInterface $request, ResponseInterface $response, $a
     {
         if (is_array($arguments)) {
             $response->setBody(implode(';', $arguments));
-        } elseif (is_null($arguments)) {
+        } elseif ($arguments === null) {
             $response->setBody('Is null');
         } else {
             $response->setBody('Something else');
@@ -26,7 +26,7 @@ public function before(RequestInterface $request, $arguments = null)
         if (is_array($arguments)) {
             return implode(';', $arguments);
         }
-        if (is_null($arguments)) {
+        if ($arguments === null) {
             return 'Is null';
         }
 
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 2b1600fd32aa..6459f644c9de 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -163,6 +163,7 @@ public function __construct()
             'include'                     => true,
             'increment_style'             => ['style' => 'post'],
             'indentation_type'            => true,
+            'is_null'                     => true,
             'lambda_not_used_import'      => true,
             'line_ending'                 => true,
             'linebreak_after_opening_tag' => true,

From 71e33a1b3ef0a1b37c8d054118d1d095cb7575ae Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 7 Jul 2021 22:48:38 +0800
Subject: [PATCH 0062/2325] Apply rector fixes

---
 system/CLI/GeneratorTrait.php      | 2 +-
 system/Database/Migration.php      | 2 +-
 system/HTTP/Files/UploadedFile.php | 2 +-
 system/I18n/Time.php               | 6 +++---
 system/Images/Image.php            | 2 +-
 system/Test/FeatureTestCase.php    | 2 +-
 system/Test/FeatureTestTrait.php   | 2 +-
 system/Validation/Validation.php   | 4 +---
 8 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php
index 7946a280781e..0b8fb5310e2d 100644
--- a/system/CLI/GeneratorTrait.php
+++ b/system/CLI/GeneratorTrait.php
@@ -388,6 +388,6 @@ protected function getOption(string $name)
             return CLI::getOption($name);
         }
 
-        return $this->params[$name] === null ? true : $this->params[$name];
+        return $this->params[$name] ?? true;
     }
 }
diff --git a/system/Database/Migration.php b/system/Database/Migration.php
index b103e84baecd..06032fe2e14f 100644
--- a/system/Database/Migration.php
+++ b/system/Database/Migration.php
@@ -48,7 +48,7 @@ abstract class Migration
      */
     public function __construct(Forge $forge = null)
     {
-        $this->forge = $forge !== null ? $forge : Database::forge($this->DBGroup ?? config('Database')->defaultGroup);
+        $this->forge = $forge ?? Database::forge($this->DBGroup ?? config('Database')->defaultGroup);
 
         $this->db = $this->forge->getConnection();
     }
diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
index 616545d80cbe..1e4b136c0410 100644
--- a/system/HTTP/Files/UploadedFile.php
+++ b/system/HTTP/Files/UploadedFile.php
@@ -141,7 +141,7 @@ public function move(string $targetPath, string $name = null, bool $overwrite =
             throw HTTPException::forInvalidFile();
         }
 
-        $name        = $name === null ? $this->getName() : $name;
+        $name        = $name ?? $this->getName();
         $destination = $overwrite ? $targetPath . $name : $this->getDestination($targetPath . $name);
 
         try {
diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index 468a8d9a5a18..bfffadd641b1 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -255,9 +255,9 @@ public static function createFromTime(int $hour = null, int $minutes = null, int
      */
     public static function create(int $year = null, int $month = null, int $day = null, int $hour = null, int $minutes = null, int $seconds = null, $timezone = null, string $locale = null)
     {
-        $year    = $year === null ? date('Y') : $year;
-        $month   = $month === null ? date('m') : $month;
-        $day     = $day === null ? date('d') : $day;
+        $year    = $year ?? date('Y');
+        $month   = $month ?? date('m');
+        $day     = $day ?? date('d');
         $hour    = empty($hour) ? 0 : $hour;
         $minutes = empty($minutes) ? 0 : $minutes;
         $seconds = empty($seconds) ? 0 : $seconds;
diff --git a/system/Images/Image.php b/system/Images/Image.php
index ec07af3432f9..c27c36dc3b04 100644
--- a/system/Images/Image.php
+++ b/system/Images/Image.php
@@ -71,7 +71,7 @@ public function copy(string $targetPath, string $targetName = null, int $perms =
     {
         $targetPath = rtrim($targetPath, '/ ') . '/';
 
-        $targetName = $targetName === null ? $this->getFilename() : $targetName;
+        $targetName = $targetName ?? $this->getFilename();
 
         if (empty($targetName)) {
             throw ImageException::forInvalidFile($targetName);
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index 3efe384a97b6..0b3197ffb676 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -80,7 +80,7 @@ protected function withRoutes(array $routes = null)
      */
     public function withSession(array $values = null)
     {
-        $this->session = $values === null ? $_SESSION : $values;
+        $this->session = $values ?? $_SESSION;
 
         return $this;
     }
diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php
index 6e87b57fcc35..77b370933c42 100644
--- a/system/Test/FeatureTestTrait.php
+++ b/system/Test/FeatureTestTrait.php
@@ -70,7 +70,7 @@ protected function withRoutes(array $routes = null)
      */
     public function withSession(array $values = null)
     {
-        $this->session = $values === null ? $_SESSION : $values;
+        $this->session = $values ?? $_SESSION;
 
         return $this;
     }
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 03d9e76c5244..04c118184a73 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -303,9 +303,7 @@ protected function processRules(string $field, string $label = null, $value, $ru
                     $value = '[' . implode(', ', $value) . ']';
                 }
 
-                $this->errors[$field] = $error === null
-                    ? $this->getErrorMessage($rule, $field, $label, $param, $value)
-                    : $error; // @phpstan-ignore-line
+                $this->errors[$field] = $error ?? $this->getErrorMessage($rule, $field, $label, $param, $value);
 
                 return false;
             }

From d932904208e9de9d2a961d4b060fb4bdd094ca83 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 7 Jul 2021 22:03:39 +0800
Subject: [PATCH 0063/2325] Object accessors should be without whitespace

---
 utils/PhpCsFixer/CodeIgniter4.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index cdcf3669410c..f2180025fb91 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -242,6 +242,7 @@ public function __construct()
             'normalize_index_brace'                 => true,
             'not_operator_with_space'               => false,
             'not_operator_with_successor_space'     => true,
+            'object_operator_without_whitespace'    => true,
             'ordered_imports'                       => [
                 'imports_order'  => null,
                 'sort_algorithm' => 'alpha',

From cc20a0b21d741fb685c3def99bf917374f268c5d Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 7 Jul 2021 22:11:27 +0800
Subject: [PATCH 0064/2325] Enable `operator_linebreak` rule

---
 system/Database/BaseBuilder.php              | 4 ++--
 system/Database/MySQLi/Connection.php        | 4 ++--
 system/Filters/Filters.php                   | 6 +++---
 system/Session/Handlers/MemcachedHandler.php | 5 +++--
 system/Session/Session.php                   | 8 ++++----
 utils/PhpCsFixer/CodeIgniter4.php            | 1 +
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 28213478a76b..1b2cf7e66a90 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -2891,8 +2891,8 @@ protected function compileSelect($selectOverride = false): string
      */
     protected function compileIgnore(string $statement)
     {
-        if ($this->QBIgnore &&
-            isset($this->supportedIgnoreStatements[$statement])
+        if ($this->QBIgnore
+            && isset($this->supportedIgnoreStatements[$statement])
         ) {
             return trim($this->supportedIgnoreStatements[$statement]) . ' ';
         }
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
index 1c3e7a42e8b7..37d3f38b0f57 100644
--- a/system/Database/MySQLi/Connection.php
+++ b/system/Database/MySQLi/Connection.php
@@ -136,8 +136,8 @@ public function connect(bool $persistent = false)
             if (! empty($ssl)) {
                 if (isset($this->encrypt['ssl_verify'])) {
                     if ($this->encrypt['ssl_verify']) {
-                        defined('MYSQLI_OPT_SSL_VERIFY_SERVER_CERT') &&
-                        $this->mysqli->options(MYSQLI_OPT_SSL_VERIFY_SERVER_CERT, 1);
+                        defined('MYSQLI_OPT_SSL_VERIFY_SERVER_CERT')
+                        && $this->mysqli->options(MYSQLI_OPT_SSL_VERIFY_SERVER_CERT, 1);
                     }
                     // Apparently (when it exists), setting MYSQLI_OPT_SSL_VERIFY_SERVER_CERT
                     // to FALSE didn't do anything, so PHP 5.6.16 introduced yet another
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index 6865d2d6097c..ffeba5c209db 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -242,9 +242,9 @@ public function initialize(string $uri = null)
         $this->processFilters($uri);
 
         // Set the toolbar filter to the last position to be executed
-        if (in_array('toolbar', $this->filters['after'], true) &&
-            ($count = count($this->filters['after'])) > 1 &&
-            $this->filters['after'][$count - 1] !== 'toolbar'
+        if (in_array('toolbar', $this->filters['after'], true)
+            && ($count = count($this->filters['after'])) > 1
+            && $this->filters['after'][$count - 1] !== 'toolbar'
         ) {
             array_splice($this->filters['after'], array_search('toolbar', $this->filters['after'], true), 1);
             $this->filters['after'][] = 'toolbar';
diff --git a/system/Session/Handlers/MemcachedHandler.php b/system/Session/Handlers/MemcachedHandler.php
index b924e6318d44..95a3114c7d06 100644
--- a/system/Session/Handlers/MemcachedHandler.php
+++ b/system/Session/Handlers/MemcachedHandler.php
@@ -333,8 +333,9 @@ protected function lockSession(string $sessionID): bool
     protected function releaseLock(): bool
     {
         if (isset($this->memcached, $this->lockKey) && $this->lock) {
-            if (! $this->memcached->delete($this->lockKey) &&
-                    $this->memcached->getResultCode() !== Memcached::RES_NOTFOUND
+            if (
+                ! $this->memcached->delete($this->lockKey)
+                && $this->memcached->getResultCode() !== Memcached::RES_NOTFOUND
             ) {
                 $this->logger->error('Session: Error while trying to free lock for ' . $this->lockKey);
 
diff --git a/system/Session/Session.php b/system/Session/Session.php
index b99d5b3ae9f3..62d5713b324d 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -646,8 +646,8 @@ public function setFlashdata($data, $value = null)
     public function getFlashdata(string $key = null)
     {
         if (isset($key)) {
-            return (isset($_SESSION['__ci_vars'], $_SESSION['__ci_vars'][$key], $_SESSION[$key]) &&
-                    ! is_int($_SESSION['__ci_vars'][$key])) ? $_SESSION[$key] : null;
+            return (isset($_SESSION['__ci_vars'], $_SESSION['__ci_vars'][$key], $_SESSION[$key])
+                && ! is_int($_SESSION['__ci_vars'][$key])) ? $_SESSION[$key] : null;
         }
 
         $flashdata = [];
@@ -782,8 +782,8 @@ public function setTempdata($data, $value = null, int $ttl = 300)
     public function getTempdata(string $key = null)
     {
         if (isset($key)) {
-            return (isset($_SESSION['__ci_vars'], $_SESSION['__ci_vars'][$key], $_SESSION[$key]) &&
-                    is_int($_SESSION['__ci_vars'][$key])) ? $_SESSION[$key] : null;
+            return (isset($_SESSION['__ci_vars'], $_SESSION['__ci_vars'][$key], $_SESSION[$key])
+                    && is_int($_SESSION['__ci_vars'][$key])) ? $_SESSION[$key] : null;
         }
 
         $tempdata = [];
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index f2180025fb91..1a38f1b7858d 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -243,6 +243,7 @@ public function __construct()
             'not_operator_with_space'               => false,
             'not_operator_with_successor_space'     => true,
             'object_operator_without_whitespace'    => true,
+            'operator_linebreak'                    => ['only_booleans' => true, 'position' => 'beginning'],
             'ordered_imports'                       => [
                 'imports_order'  => null,
                 'sort_algorithm' => 'alpha',

From 9224fb398dc328291923876d05b9c9a18e078d93 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 7 Jul 2021 22:17:18 +0800
Subject: [PATCH 0065/2325] Set ordering rules

---
 system/Debug/Exceptions.php       | 2 +-
 utils/PhpCsFixer/CodeIgniter4.php | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index c613579332f0..d9fc60e7defc 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -17,9 +17,9 @@
 use CodeIgniter\HTTP\Response;
 use Config\Exceptions as ExceptionsConfig;
 use Config\Paths;
-use function error_reporting;
 use ErrorException;
 use Throwable;
+use function error_reporting;
 
 /**
  * Exceptions manager
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 1a38f1b7858d..3ca4ba314e0d 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -244,10 +244,13 @@ public function __construct()
             'not_operator_with_successor_space'     => true,
             'object_operator_without_whitespace'    => true,
             'operator_linebreak'                    => ['only_booleans' => true, 'position' => 'beginning'],
+            'ordered_class_elements'                => false,
             'ordered_imports'                       => [
-                'imports_order'  => null,
                 'sort_algorithm' => 'alpha',
+                'imports_order'  => ['class', 'function', 'const'],
             ],
+            'ordered_interfaces' => false,
+            'ordered_traits'     => false,
             'php_unit_construct' => [
                 'assertions' => [
                     'assertSame',

From a70577b5cc94739c3a3e289e7bae3de7e99ae175 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 9 Jul 2021 02:10:16 +0800
Subject: [PATCH 0066/2325] Enable `random_api_migration` fixer

---
 utils/PhpCsFixer/CodeIgniter4.php | 33 +++++++++++++++++++------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index ad39fa2984ba..a67dd39435eb 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -376,19 +376,26 @@ public function __construct()
             'pow_to_exponentiation'               => true,
             'protected_to_private'                => true,
             'psr_autoloading'                     => ['dir' => null],
-            'set_type_to_cast'                    => true,
-            'short_scalar_cast'                   => true,
-            'simple_to_complex_string_variable'   => true,
-            'single_blank_line_before_namespace'  => true,
-            'standardize_increment'               => true,
-            'static_lambda'                       => true,
-            'switch_case_semicolon_to_colon'      => true,
-            'switch_case_space'                   => true,
-            'switch_continue_to_break'            => true,
-            'ternary_operator_spaces'             => true,
-            'ternary_to_elvis_operator'           => true,
-            'ternary_to_null_coalescing'          => true,
-            'trailing_comma_in_multiline'         => [
+            'random_api_migration'                => [
+                'replacements' => [
+                    'getrandmax' => 'mt_getrandmax',
+                    'rand'       => 'mt_rand',
+                    'srand'      => 'mt_srand',
+                ],
+            ],
+            'set_type_to_cast'                   => true,
+            'short_scalar_cast'                  => true,
+            'simple_to_complex_string_variable'  => true,
+            'single_blank_line_before_namespace' => true,
+            'standardize_increment'              => true,
+            'static_lambda'                      => true,
+            'switch_case_semicolon_to_colon'     => true,
+            'switch_case_space'                  => true,
+            'switch_continue_to_break'           => true,
+            'ternary_operator_spaces'            => true,
+            'ternary_to_elvis_operator'          => true,
+            'ternary_to_null_coalescing'         => true,
+            'trailing_comma_in_multiline'        => [
                 'after_heredoc' => true,
                 'elements'      => ['arrays'],
             ],

From 2bdb38d03d5288443545c858def113bfba8b7ddd Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 9 Jul 2021 02:13:53 +0800
Subject: [PATCH 0067/2325] Enable `regular_callable_call` fixer

---
 system/Events/Events.php                    | 2 +-
 system/View/Table.php                       | 2 +-
 tests/system/Models/ValidationModelTest.php | 6 +++---
 utils/PhpCsFixer/CodeIgniter4.php           | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/system/Events/Events.php b/system/Events/Events.php
index 1cfe301f9728..97d58824e546 100644
--- a/system/Events/Events.php
+++ b/system/Events/Events.php
@@ -154,7 +154,7 @@ public static function trigger($eventName, ...$arguments): bool
         foreach ($listeners as $listener) {
             $start = microtime(true);
 
-            $result = static::$simulate === false ? call_user_func($listener, ...$arguments) : true;
+            $result = static::$simulate === false ? $listener(...$arguments) : true;
 
             if (CI_DEBUG) {
                 static::$performanceLog[] = [
diff --git a/system/View/Table.php b/system/View/Table.php
index edcce2e6c42c..7899c34a37f0 100644
--- a/system/View/Table.php
+++ b/system/View/Table.php
@@ -344,7 +344,7 @@ public function generate($tableData = null)
                     if ($cell === '' || $cell === null) {
                         $out .= $this->emptyCells;
                     } elseif (isset($this->function)) {
-                        $out .= call_user_func($this->function, $cell);
+                        $out .= ($this->function)($cell);
                     } else {
                         $out .= $cell;
                     }
diff --git a/tests/system/Models/ValidationModelTest.php b/tests/system/Models/ValidationModelTest.php
index 06b0f3cd72f9..78d431b704f0 100644
--- a/tests/system/Models/ValidationModelTest.php
+++ b/tests/system/Models/ValidationModelTest.php
@@ -151,7 +151,7 @@ public function testCleanValidationRemovesAllWhenNoDataProvided(): void
             'foo'  => 'bar',
         ];
 
-        $rules = call_user_func($cleaner, $rules, null);
+        $rules = $cleaner($rules, null);
         $this->assertEmpty($rules);
     }
 
@@ -168,7 +168,7 @@ public function testCleanValidationRemovesOnlyForFieldsNotProvided(): void
             'foo' => 'bar',
         ];
 
-        $rules = call_user_func($cleaner, $rules, $data);
+        $rules = $cleaner($rules, $data);
         $this->assertArrayHasKey('foo', $rules);
         $this->assertArrayNotHasKey('name', $rules);
     }
@@ -187,7 +187,7 @@ public function testCleanValidationReturnsAllWhenAllExist(): void
             'name' => null,
         ];
 
-        $rules = call_user_func($cleaner, $rules, $data);
+        $rules = $cleaner($rules, $data);
         $this->assertArrayHasKey('foo', $rules);
         $this->assertArrayHasKey('name', $rules);
     }
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index a67dd39435eb..03ba5f712e75 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -383,6 +383,7 @@ public function __construct()
                     'srand'      => 'mt_srand',
                 ],
             ],
+            'regular_callable_call'              => true,
             'set_type_to_cast'                   => true,
             'short_scalar_cast'                  => true,
             'simple_to_complex_string_variable'  => true,

From 1b7d7254078fe6a0fd53ca3aa84bc9b5673c65ee Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 9 Jul 2021 02:17:17 +0800
Subject: [PATCH 0068/2325] Enable `return_assignment` fixer

---
 system/Autoloader/Autoloader.php  | 4 +---
 system/Autoloader/FileLocator.php | 4 +---
 system/Database/Forge.php         | 4 +---
 system/Helpers/text_helper.php    | 4 +---
 utils/PhpCsFixer/CodeIgniter4.php | 1 +
 5 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
index 083d24f92a63..092c9b32eb17 100644
--- a/system/Autoloader/Autoloader.php
+++ b/system/Autoloader/Autoloader.php
@@ -305,9 +305,7 @@ public function sanitizeFilename(string $filename): string
         $filename = preg_replace('/[^0-9\p{L}\s\/\-\_\.\:\\\\]/u', '', $filename);
 
         // Clean up our filename edges.
-        $filename = trim($filename, '.-_');
-
-        return $filename;
+        return trim($filename, '.-_');
     }
 
     /**
diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index ef5d52e61704..57ad5c52c1dc 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -209,9 +209,7 @@ public function search(string $path, string $ext = 'php', bool $prioritizeApp =
         }
 
         // Remove any duplicates
-        $foundPaths = array_unique($foundPaths);
-
-        return $foundPaths;
+        return array_unique($foundPaths);
     }
 
     /**
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index fd15971520e6..31b45498b118 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -560,15 +560,13 @@ protected function _createTable(string $table, bool $ifNotExists, array $attribu
         }
 
         // createTableStr will usually have the following format: "%s %s (%s\n)"
-        $sql = sprintf(
+        return sprintf(
             $this->createTableStr . '%s',
             $sql,
             $this->db->escapeIdentifiers($table),
             $columns,
             $this->_createTableAttributes($attributes)
         );
-
-        return $sql;
     }
 
     //--------------------------------------------------------------------
diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index 52e423ff64af..9a1373bb3eee 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -448,9 +448,7 @@ function word_wrap(string $str, int $charlim = 76): string
         }
 
         // remove any trailing newline
-        $output = rtrim($output);
-
-        return $output;
+        return rtrim($output);
     }
 }
 
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 03ba5f712e75..6e07dd511c58 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -384,6 +384,7 @@ public function __construct()
                 ],
             ],
             'regular_callable_call'              => true,
+            'return_assignment'                  => true,
             'set_type_to_cast'                   => true,
             'short_scalar_cast'                  => true,
             'simple_to_complex_string_variable'  => true,

From a374f94cfc6c32ada45ef115b2677b6dc25551a0 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 9 Jul 2021 02:21:42 +0800
Subject: [PATCH 0069/2325] Enable `return_type_declaration` fixer

---
 system/Autoloader/FileLocator.php                         | 2 +-
 system/BaseModel.php                                      | 2 +-
 system/HTTP/DownloadResponse.php                          | 4 ++--
 system/Model.php                                          | 2 +-
 system/Pager/Pager.php                                    | 2 +-
 system/Router/RouteCollection.php                         | 2 +-
 tests/_support/Entity/Cast/CastBase64.php                 | 4 ++--
 tests/system/Entity/EntityTest.php                        | 2 +-
 tests/system/Test/BootstrapFCPATHTest.php                 | 8 ++++----
 utils/PhpCsFixer/CodeIgniter4.php                         | 1 +
 utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php | 2 +-
 11 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index 57ad5c52c1dc..6781ce244e62 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -123,7 +123,7 @@ public function locateFile(string $file, string $folder = null, string $ext = 'p
      *
      * @return string
      */
-    public function getClassname(string $file) : string
+    public function getClassname(string $file): string
     {
         $php       = file_get_contents($file);
         $tokens    = token_get_all($php);
diff --git a/system/BaseModel.php b/system/BaseModel.php
index b6bee0677f33..80cff8812ba5 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -688,7 +688,7 @@ public function save($data): bool
      *
      * @return bool
      */
-    protected function shouldUpdate($data) : bool
+    protected function shouldUpdate($data): bool
     {
         return ! empty($this->getIdValue($data));
     }
diff --git a/system/HTTP/DownloadResponse.php b/system/HTTP/DownloadResponse.php
index 7ea2d174d345..c0de33dea22c 100644
--- a/system/HTTP/DownloadResponse.php
+++ b/system/HTTP/DownloadResponse.php
@@ -133,7 +133,7 @@ public function setFileName(string $filename)
      *
      * @return int
      */
-    public function getContentLength() : int
+    public function getContentLength(): int
     {
         if (is_string($this->binary)) {
             return strlen($this->binary);
@@ -200,7 +200,7 @@ private function getDownloadFileName(): string
      *
      * @return string
      */
-    private function getContentDisposition() : string
+    private function getContentDisposition(): string
     {
         $downloadFilename = $this->getDownloadFileName();
 
diff --git a/system/Model.php b/system/Model.php
index 3a8d1fe96d6b..774dca8f06c6 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -606,7 +606,7 @@ public function set($key, ?string $value = '', ?bool $escape = null)
      *
      * @return bool
      */
-    protected function shouldUpdate($data) : bool
+    protected function shouldUpdate($data): bool
     {
         // When useAutoIncrement feature is disabled check
         // in the database if given record already exists
diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
index 6c23109d1de9..174bb3ac1621 100644
--- a/system/Pager/Pager.php
+++ b/system/Pager/Pager.php
@@ -481,7 +481,7 @@ public function getDetails(string $group = 'default'): array
      *
      * @return Pager
      */
-    public function only(array $queries):Pager
+    public function only(array $queries): Pager
     {
         $this->only = $queries;
 
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 438500e77b82..5aab32433a08 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1218,7 +1218,7 @@ public function reverseRoute(string $search, ...$params)
      *
      * @return string
      */
-    protected function localizeRoute(string $route) :string
+    protected function localizeRoute(string $route): string
     {
         return strtr($route, ['{locale}' => Services::request()->getLocale()]);
     }
diff --git a/tests/_support/Entity/Cast/CastBase64.php b/tests/_support/Entity/Cast/CastBase64.php
index a82ea55e2c29..08e6a50aaacb 100644
--- a/tests/_support/Entity/Cast/CastBase64.php
+++ b/tests/_support/Entity/Cast/CastBase64.php
@@ -14,7 +14,7 @@ class CastBase64 extends BaseCast
      *
      * @return mixed
      */
-    public static function get($value, array $params = []) : string
+    public static function get($value, array $params = []): string
     {
         return base64_decode($value);
     }
@@ -27,7 +27,7 @@ public static function get($value, array $params = []) : string
      *
      * @return mixed
      */
-    public static function set($value, array $params = []) : string
+    public static function set($value, array $params = []): string
     {
         return base64_encode($value);
     }
diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php
index 1ef2bb29867a..87c63e9188e4 100644
--- a/tests/system/Entity/EntityTest.php
+++ b/tests/system/Entity/EntityTest.php
@@ -997,7 +997,7 @@ protected function getSwappedEntity()
         };
     }
 
-    protected function getCastEntity($data = null) : Entity
+    protected function getCastEntity($data = null): Entity
     {
         return new class($data) extends Entity {
             protected $attributes = [
diff --git a/tests/system/Test/BootstrapFCPATHTest.php b/tests/system/Test/BootstrapFCPATHTest.php
index ed1beda9a3c3..e05e7215fda2 100644
--- a/tests/system/Test/BootstrapFCPATHTest.php
+++ b/tests/system/Test/BootstrapFCPATHTest.php
@@ -48,12 +48,12 @@ private function correctFCPATH()
         return realpath(__DIR__ . '/../../../public') . DIRECTORY_SEPARATOR;
     }
 
-    private function buildDirectories() : void
+    private function buildDirectories(): void
     {
         mkdir($this->dir1, 0777, true);
     }
 
-    private function deleteDirectories() : void
+    private function deleteDirectories(): void
     {
         // these need to be executed in reverse order: dir 2 in inside dir1
         if (is_dir($this->dir1)) {
@@ -61,13 +61,13 @@ private function deleteDirectories() : void
         }
     }
 
-    private function writeFiles() : void
+    private function writeFiles(): void
     {
         file_put_contents($this->file1, $this->fileContents());
         chmod($this->file1, 0777);
     }
 
-    private function deleteFiles() : void
+    private function deleteFiles(): void
     {
         if (file_exists($this->file1)) {
             unlink($this->file1);
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 6e07dd511c58..b97d4c0b0913 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -385,6 +385,7 @@ public function __construct()
             ],
             'regular_callable_call'              => true,
             'return_assignment'                  => true,
+            'return_type_declaration'            => ['space_before' => 'none'],
             'set_type_to_cast'                   => true,
             'short_scalar_cast'                  => true,
             'simple_to_complex_string_variable'  => true,
diff --git a/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php b/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php
index 7c8d97b8122a..4e36f10311e6 100644
--- a/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php
+++ b/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php
@@ -51,7 +51,7 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        $inStmts = (bool) $this->betterNodeFinder->findFirst((array) $tryCatch->stmts, static function (Node $n) use ($node) : bool {
+        $inStmts = (bool) $this->betterNodeFinder->findFirst((array) $tryCatch->stmts, static function (Node $n) use ($node): bool {
             return $n === $node;
         });
 

From 7df9693f24886fa9b878f821d5fe7b81000c63ff Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 9 Jul 2021 01:39:27 +0800
Subject: [PATCH 0070/2325] Enable initial `single_**` rules which does not
 change current code

---
 utils/PhpCsFixer/CodeIgniter4.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index b97d4c0b0913..61c6c54bbaba 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -389,7 +389,11 @@ public function __construct()
             'set_type_to_cast'                   => true,
             'short_scalar_cast'                  => true,
             'simple_to_complex_string_variable'  => true,
+            'single_blank_line_at_eof'           => true,
             'single_blank_line_before_namespace' => true,
+            'single_class_element_per_statement' => ['elements' => ['const', 'property']],
+            'single_import_per_statement'        => true,
+            'single_line_after_imports'          => true,
             'standardize_increment'              => true,
             'static_lambda'                      => true,
             'switch_case_semicolon_to_colon'     => true,

From c56a5b19639586f16cf6cdeff5ba790b0849f7c1 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 9 Jul 2021 01:40:09 +0800
Subject: [PATCH 0071/2325] Simplify single line comments

---
 app/Config/Logger.php                      | 4 +---
 system/Database/SQLSRV/PreparedQuery.php   | 4 ++--
 system/Debug/Toolbar/Collectors/Routes.php | 8 ++------
 system/Test/Mock/MockLogger.php            | 8 ++------
 utils/PhpCsFixer/CodeIgniter4.php          | 1 +
 5 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/app/Config/Logger.php b/app/Config/Logger.php
index 9ba1c9b09c6c..a4eaeb648955 100644
--- a/app/Config/Logger.php
+++ b/app/Config/Logger.php
@@ -85,9 +85,7 @@ class Logger extends BaseConfig
          */
         'CodeIgniter\Log\Handlers\FileHandler' => [
 
-            /*
-             * The log levels that this handler will handle.
-             */
+            // The log levels that this handler will handle.
             'handles' => [
                 'critical',
                 'alert',
diff --git a/system/Database/SQLSRV/PreparedQuery.php b/system/Database/SQLSRV/PreparedQuery.php
index 4a53d7612be2..843bbbf597a3 100755
--- a/system/Database/SQLSRV/PreparedQuery.php
+++ b/system/Database/SQLSRV/PreparedQuery.php
@@ -50,12 +50,12 @@ class PreparedQuery extends BasePreparedQuery
      */
     public function _prepare(string $sql, array $options = [])
     {
-        /* Prepare parameters for the query */
+        // Prepare parameters for the query
         $queryString = $this->getQueryString();
 
         $parameters = $this->parameterize($queryString);
 
-        /* Prepare  the query */
+        // Prepare the query
         $this->statement = sqlsrv_prepare($this->db->connID, $sql, $parameters);
 
         if (! $this->statement) {
diff --git a/system/Debug/Toolbar/Collectors/Routes.php b/system/Debug/Toolbar/Collectors/Routes.php
index dfd112e0a0fa..6e99b99db806 100644
--- a/system/Debug/Toolbar/Collectors/Routes.php
+++ b/system/Debug/Toolbar/Collectors/Routes.php
@@ -59,9 +59,7 @@ public function display(): array
         $rawRoutes = Services::routes(true);
         $router    = Services::router(null, null, true);
 
-        /*
-         * Matched Route
-         */
+        // Matched Route
         $route = $router->getMatchedRoute();
 
         // Get our parameters
@@ -101,9 +99,7 @@ public function display(): array
             ],
         ];
 
-        /*
-        * Defined Routes
-        */
+        // Defined Routes
         $routes  = [];
         $methods = [
             'get',
diff --git a/system/Test/Mock/MockLogger.php b/system/Test/Mock/MockLogger.php
index 3427fe7ec251..e5855f6e0042 100644
--- a/system/Test/Mock/MockLogger.php
+++ b/system/Test/Mock/MockLogger.php
@@ -85,9 +85,7 @@ class MockLogger
         //--------------------------------------------------------------------
 
         'Tests\Support\Log\Handlers\TestHandler' => [
-            /*
-             * The log levels that this handler will handle.
-             */
+            // The log levels that this handler will handle.
             'handles' => [
                 'critical',
                 'alert',
@@ -99,9 +97,7 @@ class MockLogger
                 'warning',
             ],
 
-            /*
-             * Logging Directory Path
-             */
+            // Logging Directory Path
             'path' => '',
         ],
     ];
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 61c6c54bbaba..37e3c5587a82 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -394,6 +394,7 @@ public function __construct()
             'single_class_element_per_statement' => ['elements' => ['const', 'property']],
             'single_import_per_statement'        => true,
             'single_line_after_imports'          => true,
+            'single_line_comment_style'          => true,
             'standardize_increment'              => true,
             'static_lambda'                      => true,
             'switch_case_semicolon_to_colon'     => true,

From bc29beb5ee9370cdb894a20cef0fdb67d3bf7116 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 9 Jul 2021 01:45:30 +0800
Subject: [PATCH 0072/2325] Use single quotes when possible

---
 system/CLI/CLI.php                | 2 +-
 utils/PhpCsFixer/CodeIgniter4.php | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index b9b70ba608b5..a7d328f3929e 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -506,7 +506,7 @@ public static function color(string $text, string $foreground, string $backgroun
         if (strpos($text, "\033[0m") !== false) {
             // Split the text into parts so that we can see
             // if any part missing the color definition
-            $chunks = mb_split("\\033\\[0m", $text);
+            $chunks = mb_split('\\033\\[0m', $text);
             // Reset text
             $text = '';
 
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 37e3c5587a82..9bff8d252e4c 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -395,6 +395,8 @@ public function __construct()
             'single_import_per_statement'        => true,
             'single_line_after_imports'          => true,
             'single_line_comment_style'          => true,
+            'single_line_throw'                  => false,
+            'single_quote'                       => ['strings_containing_single_quote_chars' => false],
             'standardize_increment'              => true,
             'static_lambda'                      => true,
             'switch_case_semicolon_to_colon'     => true,

From 21afd7f0552347169d549951b5af31086f853c86 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 9 Jul 2021 01:49:14 +0800
Subject: [PATCH 0073/2325] Enable `single_space_after_construct` fixer

---
 system/HTTP/Files/FileCollection.php |  6 +--
 utils/PhpCsFixer/CodeIgniter4.php    | 78 ++++++++++++++++++++++++----
 2 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/system/HTTP/Files/FileCollection.php b/system/HTTP/Files/FileCollection.php
index a4ce2bbd3b5b..05308fb1c668 100644
--- a/system/HTTP/Files/FileCollection.php
+++ b/system/HTTP/Files/FileCollection.php
@@ -63,15 +63,13 @@ public function getFile(string $name)
                 $name         = explode('.', $name);
                 $uploadedFile = $this->getValueDotNotationSyntax($name, $this->files);
 
-                return ($uploadedFile instanceof UploadedFile) ?
-                     $uploadedFile : null;
+                return $uploadedFile instanceof UploadedFile ? $uploadedFile : null;
             }
 
             if (array_key_exists($name, $this->files)) {
                 $uploadedFile = $this->files[$name];
 
-                return  ($uploadedFile instanceof UploadedFile) ?
-                    $uploadedFile : null;
+                return $uploadedFile instanceof UploadedFile ? $uploadedFile : null;
             }
         }
 
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 9bff8d252e4c..2951b85020d6 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -397,15 +397,75 @@ public function __construct()
             'single_line_comment_style'          => true,
             'single_line_throw'                  => false,
             'single_quote'                       => ['strings_containing_single_quote_chars' => false],
-            'standardize_increment'              => true,
-            'static_lambda'                      => true,
-            'switch_case_semicolon_to_colon'     => true,
-            'switch_case_space'                  => true,
-            'switch_continue_to_break'           => true,
-            'ternary_operator_spaces'            => true,
-            'ternary_to_elvis_operator'          => true,
-            'ternary_to_null_coalescing'         => true,
-            'trailing_comma_in_multiline'        => [
+            'single_space_after_construct'       => [
+                'constructs' => [
+                    'abstract',
+                    'as',
+                    'attribute',
+                    'break',
+                    'case',
+                    'catch',
+                    'class',
+                    'clone',
+                    'comment',
+                    'const',
+                    'const_import',
+                    'continue',
+                    'do',
+                    'echo',
+                    'else',
+                    'elseif',
+                    'extends',
+                    'final',
+                    'finally',
+                    'for',
+                    'foreach',
+                    'function',
+                    'function_import',
+                    'global',
+                    'goto',
+                    'if',
+                    'implements',
+                    'include',
+                    'include_once',
+                    'instanceof',
+                    'insteadof',
+                    'interface',
+                    'match',
+                    'named_argument',
+                    'new',
+                    'open_tag_with_echo',
+                    'php_doc',
+                    'php_open',
+                    'print',
+                    'private',
+                    'protected',
+                    'public',
+                    'require',
+                    'require_once',
+                    'return',
+                    'static',
+                    'throw',
+                    'trait',
+                    'try',
+                    'use',
+                    'use_lambda',
+                    'use_trait',
+                    'var',
+                    'while',
+                    'yield',
+                    'yield_from',
+                ],
+            ],
+            'standardize_increment'          => true,
+            'static_lambda'                  => true,
+            'switch_case_semicolon_to_colon' => true,
+            'switch_case_space'              => true,
+            'switch_continue_to_break'       => true,
+            'ternary_operator_spaces'        => true,
+            'ternary_to_elvis_operator'      => true,
+            'ternary_to_null_coalescing'     => true,
+            'trailing_comma_in_multiline'    => [
                 'after_heredoc' => true,
                 'elements'      => ['arrays'],
             ],

From d932e877fac865d3cdaa58cf18b2419a1a04b7a7 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 9 Jul 2021 01:52:27 +0800
Subject: [PATCH 0074/2325] Use one trait per statement

---
 utils/PhpCsFixer/CodeIgniter4.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 2951b85020d6..b7cadc25b5a5 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -457,15 +457,16 @@ public function __construct()
                     'yield_from',
                 ],
             ],
-            'standardize_increment'          => true,
-            'static_lambda'                  => true,
-            'switch_case_semicolon_to_colon' => true,
-            'switch_case_space'              => true,
-            'switch_continue_to_break'       => true,
-            'ternary_operator_spaces'        => true,
-            'ternary_to_elvis_operator'      => true,
-            'ternary_to_null_coalescing'     => true,
-            'trailing_comma_in_multiline'    => [
+            'single_trait_insert_per_statement' => true,
+            'standardize_increment'             => true,
+            'static_lambda'                     => true,
+            'switch_case_semicolon_to_colon'    => true,
+            'switch_case_space'                 => true,
+            'switch_continue_to_break'          => true,
+            'ternary_operator_spaces'           => true,
+            'ternary_to_elvis_operator'         => true,
+            'ternary_to_null_coalescing'        => true,
+            'trailing_comma_in_multiline'       => [
                 'after_heredoc' => true,
                 'elements'      => ['arrays'],
             ],

From a4fe347638772071faa931885e34bbdf76099475 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 9 Jul 2021 23:13:08 +0800
Subject: [PATCH 0075/2325] Add `?` to nullable typehints

---
 app/Config/Mimes.php                          |  2 +-
 system/API/ResponseTrait.php                  | 24 +++---
 system/Autoloader/Autoloader.php              |  4 +-
 system/Autoloader/FileLocator.php             |  4 +-
 system/BaseModel.php                          | 14 ++--
 system/CLI/CLI.php                            | 12 +--
 system/Cache/CacheFactory.php                 |  2 +-
 system/CodeIgniter.php                        |  6 +-
 system/Common.php                             | 22 +++---
 system/Config/Factories.php                   |  2 +-
 system/Config/Services.php                    | 54 ++++++-------
 system/Cookie/CookieStore.php                 |  2 +-
 system/Database/BaseBuilder.php               | 78 +++++++++----------
 system/Database/BaseConnection.php            |  4 +-
 system/Database/BaseUtils.php                 |  2 +-
 system/Database/Config.php                    |  2 +-
 system/Database/ConnectionInterface.php       |  2 +-
 system/Database/Migration.php                 |  2 +-
 system/Database/MigrationRunner.php           |  6 +-
 system/Database/ModelFactory.php              |  2 +-
 system/Database/MySQLi/Utils.php              |  2 +-
 system/Database/Postgre/Builder.php           |  8 +-
 system/Database/Postgre/Utils.php             |  2 +-
 system/Database/Query.php                     |  2 +-
 system/Database/QueryInterface.php            |  2 +-
 system/Database/SQLSRV/Builder.php            | 10 +--
 system/Database/SQLSRV/Connection.php         |  2 +-
 system/Database/SQLSRV/Utils.php              |  2 +-
 system/Database/SQLite3/Utils.php             |  2 +-
 system/Database/Seeder.php                    |  2 +-
 system/Debug/Exceptions.php                   |  2 +-
 system/Debug/Timer.php                        |  2 +-
 system/Debug/Toolbar.php                      |  2 +-
 system/Encryption/Encryption.php              |  4 +-
 .../Exceptions/EncryptionException.php        |  2 +-
 system/Encryption/Handlers/BaseHandler.php    |  2 +-
 system/Entity/Entity.php                      |  8 +-
 system/Exceptions/DebugTraceableTrait.php     |  2 +-
 system/Exceptions/PageNotFoundException.php   |  2 +-
 system/Files/Exceptions/FileException.php     |  2 +-
 system/Files/File.php                         |  2 +-
 system/Filters/Filters.php                    | 12 +--
 system/Format/Exceptions/FormatException.php  |  2 +-
 system/HTTP/CURLRequest.php                   |  2 +-
 system/HTTP/ContentSecurityPolicy.php         | 34 ++++----
 system/HTTP/Exceptions/HTTPException.php      |  2 +-
 system/HTTP/Files/UploadedFile.php            |  6 +-
 system/HTTP/Files/UploadedFileInterface.php   |  4 +-
 system/HTTP/IncomingRequest.php               |  4 +-
 system/HTTP/Negotiate.php                     |  4 +-
 system/HTTP/RedirectResponse.php              |  4 +-
 system/HTTP/Request.php                       |  2 +-
 system/HTTP/RequestInterface.php              |  2 +-
 system/HTTP/ResponseInterface.php             |  6 +-
 system/HTTP/ResponseTrait.php                 |  6 +-
 system/HTTP/URI.php                           | 10 +--
 system/HTTP/UserAgent.php                     |  8 +-
 system/Helpers/cookie_helper.php              |  4 +-
 system/Helpers/date_helper.php                |  4 +-
 system/Helpers/html_helper.php                |  2 +-
 system/Helpers/number_helper.php              |  8 +-
 system/Helpers/test_helper.php                |  2 +-
 system/Helpers/text_helper.php                |  2 +-
 system/Helpers/url_helper.php                 | 14 ++--
 system/I18n/Time.php                          | 40 +++++-----
 system/I18n/TimeDifference.php                |  2 +-
 system/Images/Exceptions/ImageException.php   |  6 +-
 system/Images/Handlers/BaseHandler.php        |  8 +-
 system/Images/Handlers/GDHandler.php          |  2 +-
 system/Images/Handlers/ImageMagickHandler.php |  2 +-
 system/Images/Image.php                       |  2 +-
 system/Images/ImageHandlerInterface.php       |  6 +-
 system/Language/Language.php                  |  2 +-
 system/Log/Handlers/ChromeLoggerHandler.php   |  2 +-
 system/Model.php                              |  6 +-
 system/Pager/Exceptions/PagerException.php    |  4 +-
 system/Pager/Pager.php                        |  4 +-
 system/Pager/PagerInterface.php               |  2 +-
 system/Pager/PagerRenderer.php                |  4 +-
 system/Router/RouteCollection.php             | 42 +++++-----
 system/Router/RouteCollectionInterface.php    |  4 +-
 system/Router/Router.php                      |  6 +-
 system/Router/RouterInterface.php             |  4 +-
 .../Session/Exceptions/SessionException.php   |  4 +-
 system/Session/Session.php                    |  6 +-
 system/Session/SessionInterface.php           |  6 +-
 system/Test/DOMParser.php                     |  6 +-
 system/Test/Fabricator.php                    | 12 +--
 system/Test/FeatureTestCase.php               | 24 +++---
 system/Test/FeatureTestTrait.php              | 24 +++---
 system/Test/FilterTestTrait.php               |  4 +-
 system/Test/Mock/MockBuilder.php              |  2 +-
 system/Test/Mock/MockCommon.php               |  2 +-
 system/Test/Mock/MockLanguage.php             |  2 +-
 system/Test/TestResponse.php                  |  8 +-
 system/Validation/CreditCardRules.php         |  2 +-
 .../Exceptions/ValidationException.php        |  8 +-
 system/Validation/FileRules.php               |  2 +-
 system/Validation/FormatRules.php             | 16 ++--
 system/Validation/Rules.php                   | 34 ++++----
 system/Validation/Validation.php              | 12 +--
 system/Validation/ValidationInterface.php     |  2 +-
 system/View/Cell.php                          |  2 +-
 system/View/Exceptions/ViewException.php      |  2 +-
 system/View/Filters.php                       |  4 +-
 system/View/Parser.php                        | 10 +--
 system/View/RendererInterface.php             |  8 +-
 system/View/View.php                          | 12 +--
 tests/_support/Autoloader/FatalLocator.php    |  2 +-
 tests/_support/Config/Services.php            |  2 +-
 tests/_support/Validation/TestRules.php       |  2 +-
 tests/system/Models/GeneralModelTest.php      |  2 +-
 tests/system/Models/LiveModelTestCase.php     |  2 +-
 utils/PhpCsFixer/CodeIgniter4.php             | 39 +++++-----
 114 files changed, 433 insertions(+), 432 deletions(-)

diff --git a/app/Config/Mimes.php b/app/Config/Mimes.php
index a7cca8788d00..628dd0db2ff8 100644
--- a/app/Config/Mimes.php
+++ b/app/Config/Mimes.php
@@ -508,7 +508,7 @@ public static function guessTypeFromExtension(string $extension)
      *
      * @return string|null The extension determined, or null if unable to match.
      */
-    public static function guessExtensionFromType(string $type, string $proposedExtension = null)
+    public static function guessExtensionFromType(string $type, ?string $proposedExtension = null)
     {
         $type = trim(strtolower($type), '. ');
 
diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
index ce1056561b42..db562ad38fa5 100644
--- a/system/API/ResponseTrait.php
+++ b/system/API/ResponseTrait.php
@@ -93,7 +93,7 @@ trait ResponseTrait
      *
      * @return mixed
      */
-    public function respond($data = null, int $status = null, string $message = '')
+    public function respond($data = null, ?int $status = null, string $message = '')
     {
         // If data is null and status code not provided, exit and bail
         if ($data === null && $status === null) {
@@ -135,7 +135,7 @@ public function respond($data = null, int $status = null, string $message = '')
      *
      * @return mixed
      */
-    public function fail($messages, int $status = 400, string $code = null, string $customMessage = '')
+    public function fail($messages, int $status = 400, ?string $code = null, string $customMessage = '')
     {
         if (! is_array($messages)) {
             $messages = ['error' => $messages];
@@ -224,7 +224,7 @@ public function respondNoContent(string $message = 'No Content')
      *
      * @return mixed
      */
-    public function failUnauthorized(string $description = 'Unauthorized', string $code = null, string $message = '')
+    public function failUnauthorized(string $description = 'Unauthorized', ?string $code = null, string $message = '')
     {
         return $this->fail($description, $this->codes['unauthorized'], $code, $message);
     }
@@ -241,7 +241,7 @@ public function failUnauthorized(string $description = 'Unauthorized', string $c
      *
      * @return mixed
      */
-    public function failForbidden(string $description = 'Forbidden', string $code = null, string $message = '')
+    public function failForbidden(string $description = 'Forbidden', ?string $code = null, string $message = '')
     {
         return $this->fail($description, $this->codes['forbidden'], $code, $message);
     }
@@ -257,7 +257,7 @@ public function failForbidden(string $description = 'Forbidden', string $code =
      *
      * @return mixed
      */
-    public function failNotFound(string $description = 'Not Found', string $code = null, string $message = '')
+    public function failNotFound(string $description = 'Not Found', ?string $code = null, string $message = '')
     {
         return $this->fail($description, $this->codes['resource_not_found'], $code, $message);
     }
@@ -275,7 +275,7 @@ public function failNotFound(string $description = 'Not Found', string $code = n
      *
      * @deprecated Use failValidationErrors instead
      */
-    public function failValidationError(string $description = 'Bad Request', string $code = null, string $message = '')
+    public function failValidationError(string $description = 'Bad Request', ?string $code = null, string $message = '')
     {
         return $this->fail($description, $this->codes['invalid_data'], $code, $message);
     }
@@ -289,7 +289,7 @@ public function failValidationError(string $description = 'Bad Request', string
      *
      * @return mixed
      */
-    public function failValidationErrors($errors, string $code = null, string $message = '')
+    public function failValidationErrors($errors, ?string $code = null, string $message = '')
     {
         return $this->fail($errors, $this->codes['invalid_data'], $code, $message);
     }
@@ -305,7 +305,7 @@ public function failValidationErrors($errors, string $code = null, string $messa
      *
      * @return mixed
      */
-    public function failResourceExists(string $description = 'Conflict', string $code = null, string $message = '')
+    public function failResourceExists(string $description = 'Conflict', ?string $code = null, string $message = '')
     {
         return $this->fail($description, $this->codes['resource_exists'], $code, $message);
     }
@@ -323,7 +323,7 @@ public function failResourceExists(string $description = 'Conflict', string $cod
      *
      * @return mixed
      */
-    public function failResourceGone(string $description = 'Gone', string $code = null, string $message = '')
+    public function failResourceGone(string $description = 'Gone', ?string $code = null, string $message = '')
     {
         return $this->fail($description, $this->codes['resource_gone'], $code, $message);
     }
@@ -339,7 +339,7 @@ public function failResourceGone(string $description = 'Gone', string $code = nu
      *
      * @return mixed
      */
-    public function failTooManyRequests(string $description = 'Too Many Requests', string $code = null, string $message = '')
+    public function failTooManyRequests(string $description = 'Too Many Requests', ?string $code = null, string $message = '')
     {
         return $this->fail($description, $this->codes['too_many_requests'], $code, $message);
     }
@@ -355,7 +355,7 @@ public function failTooManyRequests(string $description = 'Too Many Requests', s
      *
      * @return Response The value of the Response's send() method.
      */
-    public function failServerError(string $description = 'Internal Server Error', string $code = null, string $message = ''): Response
+    public function failServerError(string $description = 'Internal Server Error', ?string $code = null, string $message = ''): Response
     {
         return $this->fail($description, $this->codes['server_error'], $code, $message);
     }
@@ -418,7 +418,7 @@ protected function format($data = null)
      *
      * @return $this
      */
-    public function setResponseFormat(string $format = null)
+    public function setResponseFormat(?string $format = null)
     {
         $this->format = strtolower($format);
 
diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
index 092c9b32eb17..b73065d3e0cd 100644
--- a/system/Autoloader/Autoloader.php
+++ b/system/Autoloader/Autoloader.php
@@ -140,7 +140,7 @@ public function register()
      *
      * @return $this
      */
-    public function addNamespace($namespace, string $path = null)
+    public function addNamespace($namespace, ?string $path = null)
     {
         if (is_array($namespace)) {
             foreach ($namespace as $prefix => $namespacedPath) {
@@ -172,7 +172,7 @@ public function addNamespace($namespace, string $path = null)
      *
      * @return array
      */
-    public function getNamespace(string $prefix = null)
+    public function getNamespace(?string $prefix = null)
     {
         if ($prefix === null) {
             return $this->prefixes;
diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index 6781ce244e62..2c645416e920 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -46,7 +46,7 @@ public function __construct(Autoloader $autoloader)
      *
      * @return false|string The path to the file, or false if not found.
      */
-    public function locateFile(string $file, string $folder = null, string $ext = 'php')
+    public function locateFile(string $file, ?string $folder = null, string $ext = 'php')
     {
         $file = $this->ensureExt($file, $ext);
 
@@ -393,7 +393,7 @@ public function listNamespaceFiles(string $prefix, string $path): array
      *
      * @return false|string The path to the file, or false if not found.
      */
-    protected function legacyLocate(string $file, string $folder = null)
+    protected function legacyLocate(string $file, ?string $folder = null)
     {
         $path = APPPATH . (empty($folder) ? $file : $folder . '/' . $file);
         $path = realpath($path) ?: $path;
diff --git a/system/BaseModel.php b/system/BaseModel.php
index 80cff8812ba5..4d26ab92465d 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -293,7 +293,7 @@ abstract class BaseModel
      *
      * @param ValidationInterface|null $validation Validation
      */
-    public function __construct(ValidationInterface $validation = null)
+    public function __construct(?ValidationInterface $validation = null)
     {
         $this->tempReturnType     = $this->returnType;
         $this->tempUseSoftDeletes = $this->useSoftDeletes;
@@ -405,7 +405,7 @@ abstract protected function doUpdate($id = null, $data = null): bool;
      *
      * @return mixed Number of rows affected or FALSE on failure
      */
-    abstract protected function doUpdateBatch(array $set = null, string $index = null, int $batchSize = 100, bool $returnSQL = false);
+    abstract protected function doUpdateBatch(?array $set = null, ?string $index = null, int $batchSize = 100, bool $returnSQL = false);
 
     /**
      * Deletes a single record from the database where $id matches
@@ -447,7 +447,7 @@ abstract protected function doOnlyDeleted();
      *
      * @return mixed
      */
-    abstract protected function doReplace(array $data = null, bool $returnSQL = false);
+    abstract protected function doReplace(?array $data = null, bool $returnSQL = false);
 
     /**
      * Grabs the last error(s) that occurred from the Database connection.
@@ -906,7 +906,7 @@ public function update($id = null, $data = null): bool
      *
      * @return mixed Number of rows affected or FALSE on failure
      */
-    public function updateBatch(array $set = null, string $index = null, int $batchSize = 100, bool $returnSQL = false)
+    public function updateBatch(?array $set = null, ?string $index = null, int $batchSize = 100, bool $returnSQL = false)
     {
         if (is_array($set)) {
             foreach ($set as &$row) {
@@ -1043,7 +1043,7 @@ public function onlyDeleted()
      *
      * @return mixed
      */
-    public function replace(array $data = null, bool $returnSQL = false)
+    public function replace(?array $data = null, bool $returnSQL = false)
     {
         // Validate data before saving.
         if ($data && ! $this->skipValidation && ! $this->cleanRules(true)->validate($data)) {
@@ -1086,7 +1086,7 @@ public function errors(bool $forceDB = false)
      *
      * @return array|null
      */
-    public function paginate(int $perPage = null, string $group = 'default', int $page = null, int $segment = 0)
+    public function paginate(?int $perPage = null, string $group = 'default', ?int $page = null, int $segment = 0)
     {
         $pager = Services::pager(null, null, false);
 
@@ -1414,7 +1414,7 @@ public function getValidationMessages(): array
      *
      * @return array
      */
-    protected function cleanValidationRules(array $rules, array $data = null): array
+    protected function cleanValidationRules(array $rules, ?array $data = null): array
     {
         if (empty($data)) {
             return [];
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index b9b70ba608b5..1c3bbc97951a 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -186,7 +186,7 @@ public static function init()
      *
      * @codeCoverageIgnore
      */
-    public static function input(string $prefix = null): string
+    public static function input(?string $prefix = null): string
     {
         if (static::$readline_support) {
             return readline($prefix);
@@ -317,7 +317,7 @@ protected static function validate(string $field, string $value, $rules): bool
      * @param string|null $foreground
      * @param string|null $background
      */
-    public static function print(string $text = '', string $foreground = null, string $background = null)
+    public static function print(string $text = '', ?string $foreground = null, ?string $background = null)
     {
         if ($foreground || $background) {
             $text = static::color($text, $foreground, $background);
@@ -335,7 +335,7 @@ public static function print(string $text = '', string $foreground = null, strin
      * @param string $foreground
      * @param string $background
      */
-    public static function write(string $text = '', string $foreground = null, string $background = null)
+    public static function write(string $text = '', ?string $foreground = null, ?string $background = null)
     {
         if ($foreground || $background) {
             $text = static::color($text, $foreground, $background);
@@ -358,7 +358,7 @@ public static function write(string $text = '', string $foreground = null, strin
      * @param string      $foreground
      * @param string|null $background
      */
-    public static function error(string $text, string $foreground = 'light_red', string $background = null)
+    public static function error(string $text, string $foreground = 'light_red', ?string $background = null)
     {
         // Check color support for STDERR
         $stdout            = static::$isColored;
@@ -478,7 +478,7 @@ public static function clearScreen()
      *
      * @return string The color coded string
      */
-    public static function color(string $text, string $foreground, string $background = null, string $format = null): string
+    public static function color(string $text, string $foreground, ?string $background = null, ?string $format = null): string
     {
         if (! static::$isColored) {
             return $text;
@@ -761,7 +761,7 @@ public static function showProgress($thisStep = 1, int $totalSteps = 10)
      *
      * @return string
      */
-    public static function wrap(string $string = null, int $max = 0, int $padLeft = 0): string
+    public static function wrap(?string $string = null, int $max = 0, int $padLeft = 0): string
     {
         if (empty($string)) {
             return '';
diff --git a/system/Cache/CacheFactory.php b/system/Cache/CacheFactory.php
index 1cf1aff13772..a63fb9805408 100644
--- a/system/Cache/CacheFactory.php
+++ b/system/Cache/CacheFactory.php
@@ -31,7 +31,7 @@ class CacheFactory
      *
      * @return CacheInterface
      */
-    public static function getHandler(Cache $config, string $handler = null, string $backup = null)
+    public static function getHandler(Cache $config, ?string $handler = null, ?string $backup = null)
     {
         if (! isset($config->validHandlers) || ! is_array($config->validHandlers)) {
             throw CacheException::forInvalidHandlers();
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index a9b23821a7c1..f588f48050b3 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -292,7 +292,7 @@ protected function initializeKint()
      *
      * @return bool|mixed|RequestInterface|ResponseInterface
      */
-    public function run(RouteCollectionInterface $routes = null, bool $returnResponse = false)
+    public function run(?RouteCollectionInterface $routes = null, bool $returnResponse = false)
     {
         $this->startBenchmark();
 
@@ -746,7 +746,7 @@ public function displayPerformanceMetrics(string $output): string
      *
      * @return string|null
      */
-    protected function tryToRouteIt(RouteCollectionInterface $routes = null)
+    protected function tryToRouteIt(?RouteCollectionInterface $routes = null)
     {
         if ($routes === null) {
             require APPPATH . 'Config/Routes.php';
@@ -943,7 +943,7 @@ protected function display404errors(PageNotFoundException $e)
      * @param Cache|null $cacheConfig
      * @param mixed|null $returned
      */
-    protected function gatherOutput(Cache $cacheConfig = null, $returned = null)
+    protected function gatherOutput(?Cache $cacheConfig = null, $returned = null)
     {
         $this->output = ob_get_contents();
         // If buffering is not null.
diff --git a/system/Common.php b/system/Common.php
index f0463e5d8cc9..7b0eb8a4ffb6 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -67,7 +67,7 @@ function app_timezone(): string
      *
      * @return CacheInterface|mixed
      */
-    function cache(string $key = null)
+    function cache(?string $key = null)
     {
         $cache = Services::cache();
 
@@ -300,7 +300,7 @@ function csrf_hash(): string
      *
      * @return string
      */
-    function csrf_field(string $id = null): string
+    function csrf_field(?string $id = null): string
     {
         return '<input type="hidden"' . (! empty($id) ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_token() . '" value="' . csrf_hash() . '" />';
     }
@@ -314,7 +314,7 @@ function csrf_field(string $id = null): string
      *
      * @return string
      */
-    function csrf_meta(string $id = null): string
+    function csrf_meta(?string $id = null): string
     {
         return '<meta' . (! empty($id) ? ' id="' . esc($id, 'attr') . '"' : '') . ' name="' . csrf_header() . '" content="' . csrf_hash() . '" />';
     }
@@ -424,7 +424,7 @@ function env(string $key, $default = null)
      *
      * @return array|string
      */
-    function esc($data, string $context = 'html', string $encoding = null)
+    function esc($data, string $context = 'html', ?string $encoding = null)
     {
         if (is_array($data)) {
             foreach ($data as &$value) {
@@ -480,7 +480,7 @@ function esc($data, string $context = 'html', string $encoding = null)
      *
      * @throws HTTPException
      */
-    function force_https(int $duration = 31536000, RequestInterface $request = null, ResponseInterface $response = null)
+    function force_https(int $duration = 31536000, ?RequestInterface $request = null, ?ResponseInterface $response = null)
     {
         if ($request === null) {
             $request = Services::request(null, true);
@@ -773,7 +773,7 @@ function is_really_writable(string $file): bool
      *
      * @return string
      */
-    function lang(string $line, array $args = [], string $locale = null)
+    function lang(string $line, array $args = [], ?string $locale = null)
     {
         return Services::language($locale)
             ->getLine($line, $args);
@@ -829,7 +829,7 @@ function log_message(string $level, string $message, array $context = [])
      *
      * @return mixed
      */
-    function model(string $name, bool $getShared = true, ConnectionInterface &$conn = null)
+    function model(string $name, bool $getShared = true, ?ConnectionInterface &$conn = null)
     {
         return Factories::models($name, ['getShared' => $getShared], $conn);
     }
@@ -888,7 +888,7 @@ function old(string $key, $default = null, $escape = 'html')
      *
      * @return RedirectResponse
      */
-    function redirect(string $route = null): RedirectResponse
+    function redirect(?string $route = null): RedirectResponse
     {
         $response = Services::redirectresponse(null, true);
 
@@ -966,7 +966,7 @@ function route_to(string $method, ...$params)
      *
      * @return mixed|Session|null
      */
-    function session(string $val = null)
+    function session(?string $val = null)
     {
         $session = Services::session();
 
@@ -1110,7 +1110,7 @@ function stringify_attributes($attributes, bool $js = false): string
      *
      * @return mixed|Timer
      */
-    function timer(string $name = null)
+    function timer(?string $name = null)
     {
         $timer = Services::timer();
 
@@ -1185,7 +1185,7 @@ function view(string $name, array $data = [], array $options = []): string
      *
      * @return string
      */
-    function view_cell(string $library, $params = null, int $ttl = 0, string $cacheName = null): string
+    function view_cell(string $library, $params = null, int $ttl = 0, ?string $cacheName = null): string
     {
         return Services::viewcell()
             ->render($library, $params, $ttl, $cacheName);
diff --git a/system/Config/Factories.php b/system/Config/Factories.php
index 97218b6ea513..ec8aa2080eb5 100644
--- a/system/Config/Factories.php
+++ b/system/Config/Factories.php
@@ -281,7 +281,7 @@ public static function setOptions(string $component, array $values): array
      *
      * @param string $component Lowercase, plural component name
      */
-    public static function reset(string $component = null)
+    public static function reset(?string $component = null)
     {
         if ($component) {
             unset(
diff --git a/system/Config/Services.php b/system/Config/Services.php
index 5f20c7d6a3fe..0186cfa4b118 100644
--- a/system/Config/Services.php
+++ b/system/Config/Services.php
@@ -98,7 +98,7 @@ class Services extends BaseService
      *
      * @return CacheInterface
      */
-    public static function cache(Cache $config = null, bool $getShared = true)
+    public static function cache(?Cache $config = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('cache', $config);
@@ -120,7 +120,7 @@ public static function cache(Cache $config = null, bool $getShared = true)
      *
      * @return CLIRequest
      */
-    public static function clirequest(App $config = null, bool $getShared = true)
+    public static function clirequest(?App $config = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('clirequest', $config);
@@ -141,7 +141,7 @@ public static function clirequest(App $config = null, bool $getShared = true)
      *
      * @return CodeIgniter
      */
-    public static function codeigniter(App $config = null, bool $getShared = true)
+    public static function codeigniter(?App $config = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('codeigniter', $config);
@@ -179,7 +179,7 @@ public static function commands(bool $getShared = true)
      *
      * @return CURLRequest
      */
-    public static function curlrequest(array $options = [], ResponseInterface $response = null, App $config = null, bool $getShared = true)
+    public static function curlrequest(array $options = [], ?ResponseInterface $response = null, ?App $config = null, bool $getShared = true)
     {
         if ($getShared === true) {
             return static::getSharedInstance('curlrequest', $options, $response, $config);
@@ -227,7 +227,7 @@ public static function email($config = null, bool $getShared = true)
      *
      * @return EncrypterInterface Encryption handler
      */
-    public static function encrypter(EncryptionConfig $config = null, $getShared = false)
+    public static function encrypter(?EncryptionConfig $config = null, $getShared = false)
     {
         if ($getShared === true) {
             return static::getSharedInstance('encrypter', $config);
@@ -256,9 +256,9 @@ public static function encrypter(EncryptionConfig $config = null, $getShared = f
      * @return Exceptions
      */
     public static function exceptions(
-        ExceptionsConfig $config = null,
-        IncomingRequest $request = null,
-        Response $response = null,
+        ?ExceptionsConfig $config = null,
+        ?IncomingRequest $request = null,
+        ?Response $response = null,
         bool $getShared = true
     ) {
         if ($getShared) {
@@ -285,7 +285,7 @@ public static function exceptions(
      *
      * @return Filters
      */
-    public static function filters(FiltersConfig $config = null, bool $getShared = true)
+    public static function filters(?FiltersConfig $config = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('filters', $config);
@@ -306,7 +306,7 @@ public static function filters(FiltersConfig $config = null, bool $getShared = t
      *
      * @return Format
      */
-    public static function format(FormatConfig $config = null, bool $getShared = true)
+    public static function format(?FormatConfig $config = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('format', $config);
@@ -328,7 +328,7 @@ public static function format(FormatConfig $config = null, bool $getShared = tru
      *
      * @return Honeypot
      */
-    public static function honeypot(HoneypotConfig $config = null, bool $getShared = true)
+    public static function honeypot(?HoneypotConfig $config = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('honeypot', $config);
@@ -351,7 +351,7 @@ public static function honeypot(HoneypotConfig $config = null, bool $getShared =
      *
      * @return BaseHandler
      */
-    public static function image(string $handler = null, Images $config = null, bool $getShared = true)
+    public static function image(?string $handler = null, ?Images $config = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('image', $handler, $config);
@@ -394,7 +394,7 @@ public static function iterator(bool $getShared = true)
      *
      * @return Language
      */
-    public static function language(string $locale = null, bool $getShared = true)
+    public static function language(?string $locale = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('language', $locale)->setLocale($locale);
@@ -436,7 +436,7 @@ public static function logger(bool $getShared = true)
      *
      * @return MigrationRunner
      */
-    public static function migrations(Migrations $config = null, ConnectionInterface $db = null, bool $getShared = true)
+    public static function migrations(?Migrations $config = null, ?ConnectionInterface $db = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('migrations', $config, $db);
@@ -459,7 +459,7 @@ public static function migrations(Migrations $config = null, ConnectionInterface
      *
      * @return Negotiate
      */
-    public static function negotiator(RequestInterface $request = null, bool $getShared = true)
+    public static function negotiator(?RequestInterface $request = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('negotiator', $request);
@@ -481,7 +481,7 @@ public static function negotiator(RequestInterface $request = null, bool $getSha
      *
      * @return Pager
      */
-    public static function pager(PagerConfig $config = null, RendererInterface $view = null, bool $getShared = true)
+    public static function pager(?PagerConfig $config = null, ?RendererInterface $view = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('pager', $config, $view);
@@ -504,7 +504,7 @@ public static function pager(PagerConfig $config = null, RendererInterface $view
      *
      * @return Parser
      */
-    public static function parser(string $viewPath = null, ViewConfig $config = null, bool $getShared = true)
+    public static function parser(?string $viewPath = null, ?ViewConfig $config = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('parser', $viewPath, $config);
@@ -529,7 +529,7 @@ public static function parser(string $viewPath = null, ViewConfig $config = null
      *
      * @return View
      */
-    public static function renderer(string $viewPath = null, ViewConfig $config = null, bool $getShared = true)
+    public static function renderer(?string $viewPath = null, ?ViewConfig $config = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('renderer', $viewPath, $config);
@@ -551,7 +551,7 @@ public static function renderer(string $viewPath = null, ViewConfig $config = nu
      *
      * @return IncomingRequest
      */
-    public static function request(App $config = null, bool $getShared = true)
+    public static function request(?App $config = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('request', $config);
@@ -577,7 +577,7 @@ public static function request(App $config = null, bool $getShared = true)
      *
      * @return Response
      */
-    public static function response(App $config = null, bool $getShared = true)
+    public static function response(?App $config = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('response', $config);
@@ -598,7 +598,7 @@ public static function response(App $config = null, bool $getShared = true)
      *
      * @return RedirectResponse
      */
-    public static function redirectresponse(App $config = null, bool $getShared = true)
+    public static function redirectresponse(?App $config = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('redirectresponse', $config);
@@ -642,7 +642,7 @@ public static function routes(bool $getShared = true)
      *
      * @return Router
      */
-    public static function router(RouteCollectionInterface $routes = null, Request $request = null, bool $getShared = true)
+    public static function router(?RouteCollectionInterface $routes = null, ?Request $request = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('router', $routes, $request);
@@ -665,7 +665,7 @@ public static function router(RouteCollectionInterface $routes = null, Request $
      *
      * @return Security
      */
-    public static function security(App $config = null, bool $getShared = true)
+    public static function security(?App $config = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('security', $config);
@@ -686,7 +686,7 @@ public static function security(App $config = null, bool $getShared = true)
      *
      * @return Session
      */
-    public static function session(App $config = null, bool $getShared = true)
+    public static function session(?App $config = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('session', $config);
@@ -757,7 +757,7 @@ public static function timer(bool $getShared = true)
      *
      * @return Toolbar
      */
-    public static function toolbar(ToolbarConfig $config = null, bool $getShared = true)
+    public static function toolbar(?ToolbarConfig $config = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('toolbar', $config);
@@ -778,7 +778,7 @@ public static function toolbar(ToolbarConfig $config = null, bool $getShared = t
      *
      * @return URI
      */
-    public static function uri(string $uri = null, bool $getShared = true)
+    public static function uri(?string $uri = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('uri', $uri);
@@ -797,7 +797,7 @@ public static function uri(string $uri = null, bool $getShared = true)
      *
      * @return Validation
      */
-    public static function validation(ValidationConfig $config = null, bool $getShared = true)
+    public static function validation(?ValidationConfig $config = null, bool $getShared = true)
     {
         if ($getShared) {
             return static::getSharedInstance('validation', $config);
diff --git a/system/Cookie/CookieStore.php b/system/Cookie/CookieStore.php
index 098901dc9f82..bd2468778050 100644
--- a/system/Cookie/CookieStore.php
+++ b/system/Cookie/CookieStore.php
@@ -83,7 +83,7 @@ final public function __construct(array $cookies)
      *
      * @return bool
      */
-    public function has(string $name, string $prefix = '', string $value = null): bool
+    public function has(string $name, string $prefix = '', ?string $value = null): bool
     {
         $name = $prefix . $name;
 
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 5a8dfe99842e..c60a6d39f7bb 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -255,7 +255,7 @@ class BaseBuilder
      *
      * @throws DatabaseException
      */
-    public function __construct($tableName, ConnectionInterface &$db, array $options = null)
+    public function __construct($tableName, ConnectionInterface &$db, ?array $options = null)
     {
         if (empty($tableName)) {
             throw new DatabaseException('A table must be specified when creating a new Query Builder.');
@@ -362,7 +362,7 @@ public function ignore(bool $ignore = true)
      *
      * @return $this
      */
-    public function select($select = '*', bool $escape = null)
+    public function select($select = '*', ?bool $escape = null)
     {
         if (is_string($select)) {
             $select = explode(',', $select);
@@ -622,7 +622,7 @@ public function from($from, bool $overwrite = false)
      *
      * @return $this
      */
-    public function join(string $table, string $cond, string $type = '', bool $escape = null)
+    public function join(string $table, string $cond, string $type = '', ?bool $escape = null)
     {
         if ($type !== '') {
             $type = strtoupper(trim($type));
@@ -700,7 +700,7 @@ public function join(string $table, string $cond, string $type = '', bool $escap
      *
      * @return $this
      */
-    public function where($key, $value = null, bool $escape = null)
+    public function where($key, $value = null, ?bool $escape = null)
     {
         return $this->whereHaving('QBWhere', $key, $value, 'AND ', $escape);
     }
@@ -719,7 +719,7 @@ public function where($key, $value = null, bool $escape = null)
      *
      * @return $this
      */
-    public function orWhere($key, $value = null, bool $escape = null)
+    public function orWhere($key, $value = null, ?bool $escape = null)
     {
         return $this->whereHaving('QBWhere', $key, $value, 'OR ', $escape);
     }
@@ -742,7 +742,7 @@ public function orWhere($key, $value = null, bool $escape = null)
      *
      * @return $this
      */
-    protected function whereHaving(string $qbKey, $key, $value = null, string $type = 'AND ', bool $escape = null)
+    protected function whereHaving(string $qbKey, $key, $value = null, string $type = 'AND ', ?bool $escape = null)
     {
         if (! is_array($key)) {
             $key = [$key => $value];
@@ -815,7 +815,7 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
      *
      * @return $this
      */
-    public function whereIn(string $key = null, $values = null, bool $escape = null)
+    public function whereIn(?string $key = null, $values = null, ?bool $escape = null)
     {
         return $this->_whereIn($key, $values, false, 'AND ', $escape);
     }
@@ -834,7 +834,7 @@ public function whereIn(string $key = null, $values = null, bool $escape = null)
      *
      * @return $this
      */
-    public function orWhereIn(string $key = null, $values = null, bool $escape = null)
+    public function orWhereIn(?string $key = null, $values = null, ?bool $escape = null)
     {
         return $this->_whereIn($key, $values, false, 'OR ', $escape);
     }
@@ -853,7 +853,7 @@ public function orWhereIn(string $key = null, $values = null, bool $escape = nul
      *
      * @return $this
      */
-    public function whereNotIn(string $key = null, $values = null, bool $escape = null)
+    public function whereNotIn(?string $key = null, $values = null, ?bool $escape = null)
     {
         return $this->_whereIn($key, $values, true, 'AND ', $escape);
     }
@@ -872,7 +872,7 @@ public function whereNotIn(string $key = null, $values = null, bool $escape = nu
      *
      * @return $this
      */
-    public function orWhereNotIn(string $key = null, $values = null, bool $escape = null)
+    public function orWhereNotIn(?string $key = null, $values = null, ?bool $escape = null)
     {
         return $this->_whereIn($key, $values, true, 'OR ', $escape);
     }
@@ -891,7 +891,7 @@ public function orWhereNotIn(string $key = null, $values = null, bool $escape =
      *
      * @return $this
      */
-    public function havingIn(string $key = null, $values = null, bool $escape = null)
+    public function havingIn(?string $key = null, $values = null, ?bool $escape = null)
     {
         return $this->_whereIn($key, $values, false, 'AND ', $escape, 'QBHaving');
     }
@@ -910,7 +910,7 @@ public function havingIn(string $key = null, $values = null, bool $escape = null
      *
      * @return $this
      */
-    public function orHavingIn(string $key = null, $values = null, bool $escape = null)
+    public function orHavingIn(?string $key = null, $values = null, ?bool $escape = null)
     {
         return $this->_whereIn($key, $values, false, 'OR ', $escape, 'QBHaving');
     }
@@ -929,7 +929,7 @@ public function orHavingIn(string $key = null, $values = null, bool $escape = nu
      *
      * @return $this
      */
-    public function havingNotIn(string $key = null, $values = null, bool $escape = null)
+    public function havingNotIn(?string $key = null, $values = null, ?bool $escape = null)
     {
         return $this->_whereIn($key, $values, true, 'AND ', $escape, 'QBHaving');
     }
@@ -948,7 +948,7 @@ public function havingNotIn(string $key = null, $values = null, bool $escape = n
      *
      * @return $this
      */
-    public function orHavingNotIn(string $key = null, $values = null, bool $escape = null)
+    public function orHavingNotIn(?string $key = null, $values = null, ?bool $escape = null)
     {
         return $this->_whereIn($key, $values, true, 'OR ', $escape, 'QBHaving');
     }
@@ -974,7 +974,7 @@ public function orHavingNotIn(string $key = null, $values = null, bool $escape =
      *
      * @return $this
      */
-    protected function _whereIn(string $key = null, $values = null, bool $not = false, string $type = 'AND ', bool $escape = null, string $clause = 'QBWhere')
+    protected function _whereIn(?string $key = null, $values = null, bool $not = false, string $type = 'AND ', ?bool $escape = null, string $clause = 'QBWhere')
     {
         if (empty($key) || ! is_string($key)) {
             if (CI_DEBUG) {
@@ -1041,7 +1041,7 @@ protected function _whereIn(string $key = null, $values = null, bool $not = fals
      *
      * @return $this
      */
-    public function like($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
+    public function like($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
     {
         return $this->_like($field, $match, 'AND ', $side, '', $escape, $insensitiveSearch);
     }
@@ -1062,7 +1062,7 @@ public function like($field, string $match = '', string $side = 'both', bool $es
      *
      * @return $this
      */
-    public function notLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
+    public function notLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
     {
         return $this->_like($field, $match, 'AND ', $side, 'NOT', $escape, $insensitiveSearch);
     }
@@ -1083,7 +1083,7 @@ public function notLike($field, string $match = '', string $side = 'both', bool
      *
      * @return $this
      */
-    public function orLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
+    public function orLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
     {
         return $this->_like($field, $match, 'OR ', $side, '', $escape, $insensitiveSearch);
     }
@@ -1104,7 +1104,7 @@ public function orLike($field, string $match = '', string $side = 'both', bool $
      *
      * @return $this
      */
-    public function orNotLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
+    public function orNotLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
     {
         return $this->_like($field, $match, 'OR ', $side, 'NOT', $escape, $insensitiveSearch);
     }
@@ -1124,7 +1124,7 @@ public function orNotLike($field, string $match = '', string $side = 'both', boo
      *
      * @return $this
      */
-    public function havingLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
+    public function havingLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
     {
         return $this->_like($field, $match, 'AND ', $side, '', $escape, $insensitiveSearch, 'QBHaving');
     }
@@ -1144,7 +1144,7 @@ public function havingLike($field, string $match = '', string $side = 'both', bo
      *
      * @return $this
      */
-    public function notHavingLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
+    public function notHavingLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
     {
         return $this->_like($field, $match, 'AND ', $side, 'NOT', $escape, $insensitiveSearch, 'QBHaving');
     }
@@ -1164,7 +1164,7 @@ public function notHavingLike($field, string $match = '', string $side = 'both',
      *
      * @return $this
      */
-    public function orHavingLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
+    public function orHavingLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
     {
         return $this->_like($field, $match, 'OR ', $side, '', $escape, $insensitiveSearch, 'QBHaving');
     }
@@ -1184,7 +1184,7 @@ public function orHavingLike($field, string $match = '', string $side = 'both',
      *
      * @return $this
      */
-    public function orNotHavingLike($field, string $match = '', string $side = 'both', bool $escape = null, bool $insensitiveSearch = false)
+    public function orNotHavingLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
     {
         return $this->_like($field, $match, 'OR ', $side, 'NOT', $escape, $insensitiveSearch, 'QBHaving');
     }
@@ -1214,7 +1214,7 @@ public function orNotHavingLike($field, string $match = '', string $side = 'both
      *
      * @return $this
      */
-    protected function _like($field, string $match = '', string $type = 'AND ', string $side = 'both', string $not = '', bool $escape = null, bool $insensitiveSearch = false, string $clause = 'QBWhere')
+    protected function _like($field, string $match = '', string $type = 'AND ', string $side = 'both', string $not = '', ?bool $escape = null, bool $insensitiveSearch = false, string $clause = 'QBWhere')
     {
         if (! is_array($field)) {
             $field = [$field => $match];
@@ -1484,7 +1484,7 @@ protected function groupGetType(string $type): string
      *
      * @return $this
      */
-    public function groupBy($by, bool $escape = null)
+    public function groupBy($by, ?bool $escape = null)
     {
         if (! is_bool($escape)) {
             $escape = $this->db->protectIdentifiers;
@@ -1523,7 +1523,7 @@ public function groupBy($by, bool $escape = null)
      *
      * @return $this
      */
-    public function having($key, $value = null, bool $escape = null)
+    public function having($key, $value = null, ?bool $escape = null)
     {
         return $this->whereHaving('QBHaving', $key, $value, 'AND ', $escape);
     }
@@ -1541,7 +1541,7 @@ public function having($key, $value = null, bool $escape = null)
      *
      * @return $this
      */
-    public function orHaving($key, $value = null, bool $escape = null)
+    public function orHaving($key, $value = null, ?bool $escape = null)
     {
         return $this->whereHaving('QBHaving', $key, $value, 'OR ', $escape);
     }
@@ -1557,7 +1557,7 @@ public function orHaving($key, $value = null, bool $escape = null)
      *
      * @return $this
      */
-    public function orderBy(string $orderBy, string $direction = '', bool $escape = null)
+    public function orderBy(string $orderBy, string $direction = '', ?bool $escape = null)
     {
         $direction = strtoupper(trim($direction));
 
@@ -1677,7 +1677,7 @@ protected function _limit(string $sql, bool $offsetIgnore = false): string
      *
      * @return $this
      */
-    public function set($key, ?string $value = '', bool $escape = null)
+    public function set($key, ?string $value = '', ?bool $escape = null)
     {
         $key = $this->objectToArray($key);
 
@@ -1776,7 +1776,7 @@ protected function compileFinalQuery(string $sql): string
      *
      * @return false|ResultInterface
      */
-    public function get(int $limit = null, int $offset = 0, bool $reset = true)
+    public function get(?int $limit = null, int $offset = 0, bool $reset = true)
     {
         if ($limit !== null) {
             $this->limit($limit, $offset);
@@ -1927,7 +1927,7 @@ public function getCompiledQBWhere()
      *
      * @return ResultInterface
      */
-    public function getWhere($where = null, int $limit = null, ?int $offset = 0, bool $reset = true)
+    public function getWhere($where = null, ?int $limit = null, ?int $offset = 0, bool $reset = true)
     {
         if ($where !== null) {
             $this->where($where);
@@ -1966,7 +1966,7 @@ public function getWhere($where = null, int $limit = null, ?int $offset = 0, boo
      *
      * @return false|int Number of rows inserted or FALSE on failure
      */
-    public function insertBatch(array $set = null, bool $escape = null, int $batchSize = 100)
+    public function insertBatch(?array $set = null, ?bool $escape = null, int $batchSize = 100)
     {
         if ($set === null) {
             if (empty($this->QBSet)) {
@@ -2041,7 +2041,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
      *
      * @return $this|null
      */
-    public function setInsertBatch($key, string $value = '', bool $escape = null)
+    public function setInsertBatch($key, string $value = '', ?bool $escape = null)
     {
         $key = $this->batchObjectToArray($key);
 
@@ -2132,7 +2132,7 @@ public function getCompiledInsert(bool $reset = true)
      *
      * @return bool|Query
      */
-    public function insert(array $set = null, bool $escape = null)
+    public function insert(?array $set = null, ?bool $escape = null)
     {
         if ($set !== null) {
             $this->set($set, '', $escape);
@@ -2223,7 +2223,7 @@ protected function _insert(string $table, array $keys, array $unescapedKeys): st
      *
      * @return BaseResult|false|Query|string
      */
-    public function replace(array $set = null)
+    public function replace(?array $set = null)
     {
         if ($set !== null) {
             $this->set($set);
@@ -2323,7 +2323,7 @@ public function getCompiledUpdate(bool $reset = true)
      *
      * @return bool TRUE on success, FALSE on failure
      */
-    public function update(array $set = null, $where = null, int $limit = null): bool
+    public function update(?array $set = null, $where = null, ?int $limit = null): bool
     {
         if ($set !== null) {
             $this->set($set);
@@ -2433,7 +2433,7 @@ protected function validateUpdate(): bool
      *
      * @return mixed Number of rows affected, SQL string, or FALSE on failure
      */
-    public function updateBatch(array $set = null, string $index = null, int $batchSize = 100)
+    public function updateBatch(?array $set = null, ?string $index = null, int $batchSize = 100)
     {
         if ($index === null) {
             if (CI_DEBUG) {
@@ -2549,7 +2549,7 @@ protected function _updateBatch(string $table, array $values, string $index): st
      *
      * @return $this|null
      */
-    public function setUpdateBatch($key, string $index = '', bool $escape = null)
+    public function setUpdateBatch($key, string $index = '', ?bool $escape = null)
     {
         $key = $this->batchObjectToArray($key);
 
@@ -2688,7 +2688,7 @@ public function getCompiledDelete(bool $reset = true): string
      *
      * @return bool|string
      */
-    public function delete($where = '', int $limit = null, bool $resetData = true)
+    public function delete($where = '', ?int $limit = null, bool $resetData = true)
     {
         $table = $this->db->protectIdentifiers($this->QBFrom[0], true, null, false);
 
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 30c1e4f5b443..a8520de6896a 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -461,7 +461,7 @@ abstract public function reconnect();
      *
      * @return mixed
      */
-    public function getConnection(string $alias = null)
+    public function getConnection(?string $alias = null)
     {
         //@todo work with read/write connections
         return $this->connID;
@@ -1071,7 +1071,7 @@ public function getConnectDuration(int $decimals = 6): string
      *
      * @return array|string
      */
-    public function protectIdentifiers($item, bool $prefixSingle = false, bool $protectIdentifiers = null, bool $fieldExists = true)
+    public function protectIdentifiers($item, bool $prefixSingle = false, ?bool $protectIdentifiers = null, bool $fieldExists = true)
     {
         if (! is_bool($protectIdentifiers)) {
             $protectIdentifiers = $this->protectIdentifiers;
diff --git a/system/Database/BaseUtils.php b/system/Database/BaseUtils.php
index 2fcfd2142949..8287fea4bd6e 100644
--- a/system/Database/BaseUtils.php
+++ b/system/Database/BaseUtils.php
@@ -375,7 +375,7 @@ public function backup($params = [])
      *
      * @return mixed
      */
-    abstract public function _backup(array $prefs = null);
+    abstract public function _backup(?array $prefs = null);
 
     //--------------------------------------------------------------------
 }
diff --git a/system/Database/Config.php b/system/Database/Config.php
index 9201afb480b6..60de8ad904ba 100644
--- a/system/Database/Config.php
+++ b/system/Database/Config.php
@@ -137,7 +137,7 @@ public static function utils($group = null)
      *
      * @return Seeder
      */
-    public static function seeder(string $group = null)
+    public static function seeder(?string $group = null)
     {
         $config = config('Database');
 
diff --git a/system/Database/ConnectionInterface.php b/system/Database/ConnectionInterface.php
index 0b3d5d9cfde5..01f663df7cf3 100644
--- a/system/Database/ConnectionInterface.php
+++ b/system/Database/ConnectionInterface.php
@@ -65,7 +65,7 @@ public function reconnect();
      *
      * @return mixed
      */
-    public function getConnection(string $alias = null);
+    public function getConnection(?string $alias = null);
 
     //--------------------------------------------------------------------
 
diff --git a/system/Database/Migration.php b/system/Database/Migration.php
index 06032fe2e14f..ef7025d1f62a 100644
--- a/system/Database/Migration.php
+++ b/system/Database/Migration.php
@@ -46,7 +46,7 @@ abstract class Migration
      *
      * @param Forge $forge
      */
-    public function __construct(Forge $forge = null)
+    public function __construct(?Forge $forge = null)
     {
         $this->forge = $forge ?? Database::forge($this->DBGroup ?? config('Database')->defaultGroup);
 
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
index 534a768f55fd..1cbc269512b2 100644
--- a/system/Database/MigrationRunner.php
+++ b/system/Database/MigrationRunner.php
@@ -162,7 +162,7 @@ public function __construct(MigrationsConfig $config, $db = null)
      *
      * @return bool
      */
-    public function latest(string $group = null)
+    public function latest(?string $group = null)
     {
         if (! $this->enabled) {
             throw ConfigException::forDisabledMigrations();
@@ -241,7 +241,7 @@ public function latest(string $group = null)
      *
      * @return mixed Current batch number on success, FALSE on failure or no migrations are found
      */
-    public function regress(int $targetBatch = 0, string $group = null)
+    public function regress(int $targetBatch = 0, ?string $group = null)
     {
         if (! $this->enabled) {
             throw ConfigException::forDisabledMigrations();
@@ -361,7 +361,7 @@ public function regress(int $targetBatch = 0, string $group = null)
      * @param string      $path  Namespace of the target migration
      * @param string|null $group
      */
-    public function force(string $path, string $namespace, string $group = null)
+    public function force(string $path, string $namespace, ?string $group = null)
     {
         if (! $this->enabled) {
             throw ConfigException::forDisabledMigrations();
diff --git a/system/Database/ModelFactory.php b/system/Database/ModelFactory.php
index 88cf242366a3..148820fc2e60 100644
--- a/system/Database/ModelFactory.php
+++ b/system/Database/ModelFactory.php
@@ -31,7 +31,7 @@ class ModelFactory
      *
      * @return mixed|null
      */
-    public static function get(string $name, bool $getShared = true, ConnectionInterface $connection = null)
+    public static function get(string $name, bool $getShared = true, ?ConnectionInterface $connection = null)
     {
         return Factories::models($name, ['getShared' => $getShared], $connection);
     }
diff --git a/system/Database/MySQLi/Utils.php b/system/Database/MySQLi/Utils.php
index b37a2f2cf40a..9fd686160da0 100644
--- a/system/Database/MySQLi/Utils.php
+++ b/system/Database/MySQLi/Utils.php
@@ -42,7 +42,7 @@ class Utils extends BaseUtils
      *
      * @return mixed
      */
-    public function _backup(array $prefs = null)
+    public function _backup(?array $prefs = null)
     {
         throw new DatabaseException('Unsupported feature of the database platform you are using.');
     }
diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index 77079da69c66..217551f606a1 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -72,7 +72,7 @@ protected function compileIgnore(string $statement)
      *
      * @return BaseBuilder
      */
-    public function orderBy(string $orderBy, string $direction = '', bool $escape = null)
+    public function orderBy(string $orderBy, string $direction = '', ?bool $escape = null)
     {
         $direction = strtoupper(trim($direction));
         if ($direction === 'RANDOM') {
@@ -152,7 +152,7 @@ public function decrement(string $column, int $value = 1)
      *
      * @internal
      */
-    public function replace(array $set = null)
+    public function replace(?array $set = null)
     {
         if ($set !== null) {
             $this->set($set);
@@ -237,7 +237,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
      * @internal param the $mixed limit clause
      * @internal param the $mixed where clause
      */
-    public function delete($where = '', int $limit = null, bool $resetData = true)
+    public function delete($where = '', ?int $limit = null, bool $resetData = true)
     {
         if (! empty($limit) || ! empty($this->QBLimit)) {
             throw new DatabaseException('PostgreSQL does not allow LIMITs on DELETE queries.');
@@ -409,7 +409,7 @@ public function _like_statement(?string $prefix, string $column, ?string $not, s
      *
      * @return BaseBuilder
      */
-    public function join(string $table, string $cond, string $type = '', bool $escape = null)
+    public function join(string $table, string $cond, string $type = '', ?bool $escape = null)
     {
         if (! in_array('FULL OUTER', $this->joinTypes, true)) {
             $this->joinTypes = array_merge($this->joinTypes, ['FULL OUTER']);
diff --git a/system/Database/Postgre/Utils.php b/system/Database/Postgre/Utils.php
index 9c8614684e72..b2503ba2ac11 100644
--- a/system/Database/Postgre/Utils.php
+++ b/system/Database/Postgre/Utils.php
@@ -42,7 +42,7 @@ class Utils extends BaseUtils
      *
      * @return mixed
      */
-    public function _backup(array $prefs = null)
+    public function _backup(?array $prefs = null)
     {
         throw new DatabaseException('Unsupported feature of the database platform you are using.');
     }
diff --git a/system/Database/Query.php b/system/Database/Query.php
index 2635f9e0fe93..9b512647cf4d 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -177,7 +177,7 @@ public function getQuery(): string
      *
      * @return $this
      */
-    public function setDuration(float $start, float $end = null)
+    public function setDuration(float $start, ?float $end = null)
     {
         $this->startTime = $start;
 
diff --git a/system/Database/QueryInterface.php b/system/Database/QueryInterface.php
index 7214eb89738b..e0e7924f93d0 100644
--- a/system/Database/QueryInterface.php
+++ b/system/Database/QueryInterface.php
@@ -52,7 +52,7 @@ public function getQuery();
      *
      * @return mixed
      */
-    public function setDuration(float $start, float $end = null);
+    public function setDuration(float $start, ?float $end = null);
 
     //--------------------------------------------------------------------
 
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index 44126b6e471f..d5b88974a00d 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -110,7 +110,7 @@ protected function _truncate(string $table): string
      *
      * @return $this
      */
-    public function join(string $table, string $cond, string $type = '', bool $escape = null)
+    public function join(string $table, string $cond, string $type = '', ?bool $escape = null)
     {
         if ($type !== '') {
             $type = strtoupper(trim($type));
@@ -340,7 +340,7 @@ protected function _limit(string $sql, bool $offsetIgnore = false): string
      *
      * @return mixed
      */
-    public function replace(array $set = null)
+    public function replace(?array $set = null)
     {
         if ($set !== null) {
             $this->set($set);
@@ -508,7 +508,7 @@ protected function _delete(string $table): string
      *
      * @return mixed
      */
-    public function delete($where = '', int $limit = null, bool $resetData = true)
+    public function delete($where = '', ?int $limit = null, bool $resetData = true)
     {
         $table = $this->db->protectIdentifiers($this->QBFrom[0], true, null, false);
 
@@ -609,7 +609,7 @@ protected function compileSelect($selectOverride = false): string
      *
      * @return $this
      */
-    protected function whereHaving(string $qbKey, $key, $value = null, string $type = 'AND ', bool $escape = null)
+    protected function whereHaving(string $qbKey, $key, $value = null, string $type = 'AND ', ?bool $escape = null)
     {
         if (! is_array($key)) {
             $key = [$key => $value];
@@ -680,7 +680,7 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
      *
      * @return ResultInterface
      */
-    public function get(int $limit = null, int $offset = 0, bool $reset = true)
+    public function get(?int $limit = null, int $offset = 0, bool $reset = true)
     {
         if ($limit !== null) {
             $this->limit($limit, $offset);
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index 2053f71249f0..dd158ecf2226 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -462,7 +462,7 @@ public function affectedRows(): int
      *
      * @return mixed
      */
-    public function setDatabase(string $databaseName = null)
+    public function setDatabase(?string $databaseName = null)
     {
         if (empty($databaseName)) {
             $databaseName = $this->database;
diff --git a/system/Database/SQLSRV/Utils.php b/system/Database/SQLSRV/Utils.php
index 0007faafbb37..2f8af25c7933 100755
--- a/system/Database/SQLSRV/Utils.php
+++ b/system/Database/SQLSRV/Utils.php
@@ -42,7 +42,7 @@ class Utils extends BaseUtils
      *
      * @return mixed
      */
-    public function _backup(array $prefs = null)
+    public function _backup(?array $prefs = null)
     {
         throw new DatabaseException('Unsupported feature of the database platform you are using.');
     }
diff --git a/system/Database/SQLite3/Utils.php b/system/Database/SQLite3/Utils.php
index aa8bb12ce0f6..6a6478226e3f 100644
--- a/system/Database/SQLite3/Utils.php
+++ b/system/Database/SQLite3/Utils.php
@@ -35,7 +35,7 @@ class Utils extends BaseUtils
      *
      * @return mixed
      */
-    public function _backup(array $prefs = null)
+    public function _backup(?array $prefs = null)
     {
         throw new DatabaseException('Unsupported feature of the database platform you are using.');
     }
diff --git a/system/Database/Seeder.php b/system/Database/Seeder.php
index 1bdd5dc84e62..515d90e94d5f 100644
--- a/system/Database/Seeder.php
+++ b/system/Database/Seeder.php
@@ -77,7 +77,7 @@ class Seeder
      * @param Database            $config
      * @param BaseConnection|null $db
      */
-    public function __construct(Database $config, BaseConnection $db = null)
+    public function __construct(Database $config, ?BaseConnection $db = null)
     {
         $this->seedPath = $config->filesPath ?? APPPATH . 'Database/';
 
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index c13ab394718a..52bc7722591a 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -162,7 +162,7 @@ public function exceptionHandler(Throwable $exception)
      *
      * @throws ErrorException
      */
-    public function errorHandler(int $severity, string $message, string $file = null, int $line = null)
+    public function errorHandler(int $severity, string $message, ?string $file = null, ?int $line = null)
     {
         if (! (error_reporting() & $severity)) {
             return;
diff --git a/system/Debug/Timer.php b/system/Debug/Timer.php
index 93a00abbcf63..463119bf30f7 100644
--- a/system/Debug/Timer.php
+++ b/system/Debug/Timer.php
@@ -41,7 +41,7 @@ class Timer
      *
      * @return Timer
      */
-    public function start(string $name, float $time = null)
+    public function start(string $name, ?float $time = null)
     {
         $this->timers[strtolower($name)] = [
             'start' => ! empty($time) ? $time : microtime(true),
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 39a9de8497a5..915ecb0d102c 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -301,7 +301,7 @@ protected function roundTo(float $number, int $increments = 5): float
      *
      * @return void
      */
-    public function prepare(RequestInterface $request = null, ResponseInterface $response = null)
+    public function prepare(?RequestInterface $request = null, ?ResponseInterface $response = null)
     {
         /**
          * @var IncomingRequest $request
diff --git a/system/Encryption/Encryption.php b/system/Encryption/Encryption.php
index 2fec6306e2e8..f93546162115 100644
--- a/system/Encryption/Encryption.php
+++ b/system/Encryption/Encryption.php
@@ -84,7 +84,7 @@ class Encryption
      *
      * @return void
      */
-    public function __construct(EncryptionConfig $config = null)
+    public function __construct(?EncryptionConfig $config = null)
     {
         $config = $config ?? new EncryptionConfig();
 
@@ -115,7 +115,7 @@ public function __construct(EncryptionConfig $config = null)
      *
      * @return EncrypterInterface
      */
-    public function initialize(EncryptionConfig $config = null)
+    public function initialize(?EncryptionConfig $config = null)
     {
         // override config?
         if ($config) {
diff --git a/system/Encryption/Exceptions/EncryptionException.php b/system/Encryption/Exceptions/EncryptionException.php
index 7d6baf305ca2..ff9b9b90260f 100644
--- a/system/Encryption/Exceptions/EncryptionException.php
+++ b/system/Encryption/Exceptions/EncryptionException.php
@@ -51,7 +51,7 @@ public static function forNoHandlerAvailable(string $handler)
      *
      * @return static
      */
-    public static function forUnKnownHandler(string $driver = null)
+    public static function forUnKnownHandler(?string $driver = null)
     {
         return new static(lang('Encryption.unKnownHandler', [$driver]));
     }
diff --git a/system/Encryption/Handlers/BaseHandler.php b/system/Encryption/Handlers/BaseHandler.php
index aa3f91d8c125..7caad11708b9 100644
--- a/system/Encryption/Handlers/BaseHandler.php
+++ b/system/Encryption/Handlers/BaseHandler.php
@@ -32,7 +32,7 @@ abstract class BaseHandler implements EncrypterInterface
      *
      * @param Encryption|null $config
      */
-    public function __construct(Encryption $config = null)
+    public function __construct(?Encryption $config = null)
     {
         $config = $config ?? config('Encryption');
 
diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index 149e9676fc3e..c2c239875d1c 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -114,7 +114,7 @@ class Entity implements JsonSerializable
      *
      * @param array|null $data
      */
-    public function __construct(array $data = null)
+    public function __construct(?array $data = null)
     {
         $this->syncOriginal();
 
@@ -130,7 +130,7 @@ public function __construct(array $data = null)
      *
      * @return $this
      */
-    public function fill(array $data = null)
+    public function fill(?array $data = null)
     {
         if (! is_array($data)) {
             return $this;
@@ -260,7 +260,7 @@ public function syncOriginal()
      *
      * @return bool
      */
-    public function hasChanged(string $key = null): bool
+    public function hasChanged(?string $key = null): bool
     {
         // If no parameter was given then check all attributes
         if ($key === null) {
@@ -433,7 +433,7 @@ public function jsonSerialize()
      *
      * @return bool|Entity
      */
-    public function cast(bool $cast = null)
+    public function cast(?bool $cast = null)
     {
         if ($cast === null) {
             return $this->_cast;
diff --git a/system/Exceptions/DebugTraceableTrait.php b/system/Exceptions/DebugTraceableTrait.php
index 91a33df0c399..16174caae4ec 100644
--- a/system/Exceptions/DebugTraceableTrait.php
+++ b/system/Exceptions/DebugTraceableTrait.php
@@ -20,7 +20,7 @@ trait DebugTraceableTrait
      * @param int            $code
      * @param Throwable|null $previous
      */
-    final public function __construct(string $message = '', int $code = 0, Throwable $previous = null)
+    final public function __construct(string $message = '', int $code = 0, ?Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
 
diff --git a/system/Exceptions/PageNotFoundException.php b/system/Exceptions/PageNotFoundException.php
index 80f49b2098ca..6c9bd0c251b8 100644
--- a/system/Exceptions/PageNotFoundException.php
+++ b/system/Exceptions/PageNotFoundException.php
@@ -24,7 +24,7 @@ class PageNotFoundException extends OutOfBoundsException implements ExceptionInt
      */
     protected $code = 404;
 
-    public static function forPageNotFound(string $message = null)
+    public static function forPageNotFound(?string $message = null)
     {
         return new static($message ?? lang('HTTP.pageNotFound'));
     }
diff --git a/system/Files/Exceptions/FileException.php b/system/Files/Exceptions/FileException.php
index ddaac3639b72..cbedd0e46ec1 100644
--- a/system/Files/Exceptions/FileException.php
+++ b/system/Files/Exceptions/FileException.php
@@ -19,7 +19,7 @@ class FileException extends RuntimeException implements ExceptionInterface
 {
     use DebugTraceableTrait;
 
-    public static function forUnableToMove(string $from = null, string $to = null, string $error = null)
+    public static function forUnableToMove(?string $from = null, ?string $to = null, ?string $error = null)
     {
         return new static(lang('Files.cannotMove', [$from, $to, $error]));
     }
diff --git a/system/Files/File.php b/system/Files/File.php
index e0cca28b7687..547142d0ec6d 100644
--- a/system/Files/File.php
+++ b/system/Files/File.php
@@ -154,7 +154,7 @@ public function getRandomName(): string
      *
      * @return File
      */
-    public function move(string $targetPath, string $name = null, bool $overwrite = false)
+    public function move(string $targetPath, ?string $name = null, bool $overwrite = false)
     {
         $targetPath  = rtrim($targetPath, '/') . '/';
         $name        = $name ?? $this->getBaseName();
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index 88168d6a73a5..a2688aa11d5e 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -103,7 +103,7 @@ class Filters
      * @param ResponseInterface $response
      * @param Modules|null      $modules
      */
-    public function __construct($config, RequestInterface $request, ResponseInterface $response, Modules $modules = null)
+    public function __construct($config, RequestInterface $request, ResponseInterface $response, ?Modules $modules = null)
     {
         $this->config  = $config;
         $this->request = &$request;
@@ -227,7 +227,7 @@ public function run(string $uri, string $position = 'before')
      *
      * @return Filters
      */
-    public function initialize(string $uri = null)
+    public function initialize(?string $uri = null)
     {
         if ($this->initialized === true) {
             return $this;
@@ -311,7 +311,7 @@ public function getFiltersClass(): array
      *
      * @return $this
      */
-    public function addFilter(string $class, string $alias = null, string $when = 'before', string $section = 'globals')
+    public function addFilter(string $class, ?string $alias = null, string $when = 'before', string $section = 'globals')
     {
         $alias = $alias ?? md5($class);
 
@@ -381,7 +381,7 @@ public function enableFilter(string $name, string $when = 'before')
      *
      * @return mixed
      */
-    public function getArguments(string $key = null)
+    public function getArguments(?string $key = null)
     {
         return $key === null ? $this->arguments : $this->arguments[$key];
     }
@@ -397,7 +397,7 @@ public function getArguments(string $key = null)
      *
      * @return void
      */
-    protected function processGlobals(string $uri = null)
+    protected function processGlobals(?string $uri = null)
     {
         if (! isset($this->config->globals) || ! is_array($this->config->globals)) {
             return;
@@ -465,7 +465,7 @@ protected function processMethods()
      *
      * @return void
      */
-    protected function processFilters(string $uri = null)
+    protected function processFilters(?string $uri = null)
     {
         if (! isset($this->config->filters) || ! $this->config->filters) {
             return;
diff --git a/system/Format/Exceptions/FormatException.php b/system/Format/Exceptions/FormatException.php
index c773e00faa89..a4fa3ea0dde7 100644
--- a/system/Format/Exceptions/FormatException.php
+++ b/system/Format/Exceptions/FormatException.php
@@ -42,7 +42,7 @@ public static function forInvalidFormatter(string $class)
      *
      * @return FormatException
      */
-    public static function forInvalidJSON(string $error = null)
+    public static function forInvalidJSON(?string $error = null)
     {
         return new static(lang('Format.invalidJSON', [$error]));
     }
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 3efff9d8ba4c..092c48bcfced 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -86,7 +86,7 @@ class CURLRequest extends Request
      * @param ResponseInterface $response
      * @param array             $options
      */
-    public function __construct(App $config, URI $uri, ResponseInterface $response = null, array $options = [])
+    public function __construct(App $config, URI $uri, ?ResponseInterface $response = null, array $options = [])
     {
         if (! function_exists('curl_version')) {
             // we won't see this during travis-CI
diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index 6889959368dc..c5d14976a2a7 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -253,7 +253,7 @@ public function reportOnly(bool $value = true)
      *
      * @return $this
      */
-    public function addBaseURI($uri, bool $explicitReporting = null)
+    public function addBaseURI($uri, ?bool $explicitReporting = null)
     {
         $this->addOption($uri, 'baseURI', $explicitReporting ?? $this->reportOnly);
 
@@ -275,7 +275,7 @@ public function addBaseURI($uri, bool $explicitReporting = null)
      *
      * @return $this
      */
-    public function addChildSrc($uri, bool $explicitReporting = null)
+    public function addChildSrc($uri, ?bool $explicitReporting = null)
     {
         $this->addOption($uri, 'childSrc', $explicitReporting ?? $this->reportOnly);
 
@@ -296,7 +296,7 @@ public function addChildSrc($uri, bool $explicitReporting = null)
      *
      * @return $this
      */
-    public function addConnectSrc($uri, bool $explicitReporting = null)
+    public function addConnectSrc($uri, ?bool $explicitReporting = null)
     {
         $this->addOption($uri, 'connectSrc', $explicitReporting ?? $this->reportOnly);
 
@@ -317,7 +317,7 @@ public function addConnectSrc($uri, bool $explicitReporting = null)
      *
      * @return $this
      */
-    public function setDefaultSrc($uri, bool $explicitReporting = null)
+    public function setDefaultSrc($uri, ?bool $explicitReporting = null)
     {
         $this->defaultSrc = [(string) $uri => $explicitReporting ?? $this->reportOnly];
 
@@ -337,7 +337,7 @@ public function setDefaultSrc($uri, bool $explicitReporting = null)
      *
      * @return $this
      */
-    public function addFontSrc($uri, bool $explicitReporting = null)
+    public function addFontSrc($uri, ?bool $explicitReporting = null)
     {
         $this->addOption($uri, 'fontSrc', $explicitReporting ?? $this->reportOnly);
 
@@ -355,7 +355,7 @@ public function addFontSrc($uri, bool $explicitReporting = null)
      *
      * @return $this
      */
-    public function addFormAction($uri, bool $explicitReporting = null)
+    public function addFormAction($uri, ?bool $explicitReporting = null)
     {
         $this->addOption($uri, 'formAction', $explicitReporting ?? $this->reportOnly);
 
@@ -373,7 +373,7 @@ public function addFormAction($uri, bool $explicitReporting = null)
      *
      * @return $this
      */
-    public function addFrameAncestor($uri, bool $explicitReporting = null)
+    public function addFrameAncestor($uri, ?bool $explicitReporting = null)
     {
         $this->addOption($uri, 'frameAncestors', $explicitReporting ?? $this->reportOnly);
 
@@ -391,7 +391,7 @@ public function addFrameAncestor($uri, bool $explicitReporting = null)
      *
      * @return $this
      */
-    public function addFrameSrc($uri, bool $explicitReporting = null)
+    public function addFrameSrc($uri, ?bool $explicitReporting = null)
     {
         $this->addOption($uri, 'frameSrc', $explicitReporting ?? $this->reportOnly);
 
@@ -411,7 +411,7 @@ public function addFrameSrc($uri, bool $explicitReporting = null)
      *
      * @return $this
      */
-    public function addImageSrc($uri, bool $explicitReporting = null)
+    public function addImageSrc($uri, ?bool $explicitReporting = null)
     {
         $this->addOption($uri, 'imageSrc', $explicitReporting ?? $this->reportOnly);
 
@@ -429,7 +429,7 @@ public function addImageSrc($uri, bool $explicitReporting = null)
      *
      * @return $this
      */
-    public function addMediaSrc($uri, bool $explicitReporting = null)
+    public function addMediaSrc($uri, ?bool $explicitReporting = null)
     {
         $this->addOption($uri, 'mediaSrc', $explicitReporting ?? $this->reportOnly);
 
@@ -447,7 +447,7 @@ public function addMediaSrc($uri, bool $explicitReporting = null)
      *
      * @return $this
      */
-    public function addManifestSrc($uri, bool $explicitReporting = null)
+    public function addManifestSrc($uri, ?bool $explicitReporting = null)
     {
         $this->addOption($uri, 'manifestSrc', $explicitReporting ?? $this->reportOnly);
 
@@ -465,7 +465,7 @@ public function addManifestSrc($uri, bool $explicitReporting = null)
      *
      * @return $this
      */
-    public function addObjectSrc($uri, bool $explicitReporting = null)
+    public function addObjectSrc($uri, ?bool $explicitReporting = null)
     {
         $this->addOption($uri, 'objectSrc', $explicitReporting ?? $this->reportOnly);
 
@@ -483,7 +483,7 @@ public function addObjectSrc($uri, bool $explicitReporting = null)
      *
      * @return $this
      */
-    public function addPluginType($mime, bool $explicitReporting = null)
+    public function addPluginType($mime, ?bool $explicitReporting = null)
     {
         $this->addOption($mime, 'pluginTypes', $explicitReporting ?? $this->reportOnly);
 
@@ -518,7 +518,7 @@ public function setReportURI(string $uri)
      *
      * @return $this
      */
-    public function addSandbox($flags, bool $explicitReporting = null)
+    public function addSandbox($flags, ?bool $explicitReporting = null)
     {
         $this->addOption($flags, 'sandbox', $explicitReporting ?? $this->reportOnly);
 
@@ -536,7 +536,7 @@ public function addSandbox($flags, bool $explicitReporting = null)
      *
      * @return $this
      */
-    public function addScriptSrc($uri, bool $explicitReporting = null)
+    public function addScriptSrc($uri, ?bool $explicitReporting = null)
     {
         $this->addOption($uri, 'scriptSrc', $explicitReporting ?? $this->reportOnly);
 
@@ -554,7 +554,7 @@ public function addScriptSrc($uri, bool $explicitReporting = null)
      *
      * @return $this
      */
-    public function addStyleSrc($uri, bool $explicitReporting = null)
+    public function addStyleSrc($uri, ?bool $explicitReporting = null)
     {
         $this->addOption($uri, 'styleSrc', $explicitReporting ?? $this->reportOnly);
 
@@ -589,7 +589,7 @@ public function upgradeInsecureRequests(bool $value = true)
      *
      * @return void
      */
-    protected function addOption($options, string $target, bool $explicitReporting = null)
+    protected function addOption($options, string $target, ?bool $explicitReporting = null)
     {
         // Ensure we have an array to work with...
         if (is_string($this->{$target})) {
diff --git a/system/HTTP/Exceptions/HTTPException.php b/system/HTTP/Exceptions/HTTPException.php
index 706f0150c9ec..471e210efb90 100644
--- a/system/HTTP/Exceptions/HTTPException.php
+++ b/system/HTTP/Exceptions/HTTPException.php
@@ -212,7 +212,7 @@ public static function forAlreadyMoved()
      *
      * @return HTTPException
      */
-    public static function forInvalidFile(string $path = null)
+    public static function forInvalidFile(?string $path = null)
     {
         return new static(lang('HTTP.invalidFile'));
     }
diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
index 1e4b136c0410..abd374b93d2a 100644
--- a/system/HTTP/Files/UploadedFile.php
+++ b/system/HTTP/Files/UploadedFile.php
@@ -81,7 +81,7 @@ class UploadedFile extends File implements UploadedFileInterface
      * @param int    $size         The size of the file, in bytes
      * @param int    $error        The error constant of the upload (one of PHP's UPLOADERRXXX constants)
      */
-    public function __construct(string $path, string $originalName, string $mimeType = null, int $size = null, int $error = null)
+    public function __construct(string $path, string $originalName, ?string $mimeType = null, ?int $size = null, ?int $error = null)
     {
         $this->path             = $path;
         $this->name             = $originalName;
@@ -128,7 +128,7 @@ public function __construct(string $path, string $originalName, string $mimeType
      *
      * @return bool
      */
-    public function move(string $targetPath, string $name = null, bool $overwrite = false)
+    public function move(string $targetPath, ?string $name = null, bool $overwrite = false)
     {
         $targetPath = rtrim($targetPath, '/') . '/';
         $targetPath = $this->setPath($targetPath); //set the target path
@@ -367,7 +367,7 @@ public function isValid(): bool
      *
      * @return string file full path
      */
-    public function store(string $folderName = null, string $fileName = null): string
+    public function store(?string $folderName = null, ?string $fileName = null): string
     {
         $folderName = rtrim($folderName ?? date('Ymd'), '/') . '/';
         $fileName   = $fileName ?? $this->getRandomName();
diff --git a/system/HTTP/Files/UploadedFileInterface.php b/system/HTTP/Files/UploadedFileInterface.php
index a7a7c7b823cf..cf08d1d6e988 100644
--- a/system/HTTP/Files/UploadedFileInterface.php
+++ b/system/HTTP/Files/UploadedFileInterface.php
@@ -32,7 +32,7 @@ interface UploadedFileInterface
      * @param int    $size         The size of the file, in bytes
      * @param int    $error        The error constant of the upload (one of PHP's UPLOADERRXXX constants)
      */
-    public function __construct(string $path, string $originalName, string $mimeType = null, int $size = null, int $error = null);
+    public function __construct(string $path, string $originalName, ?string $mimeType = null, ?int $size = null, ?int $error = null);
 
     //--------------------------------------------------------------------
 
@@ -65,7 +65,7 @@ public function __construct(string $path, string $originalName, string $mimeType
      * @throws RuntimeException         on any error during the move operation.
      * @throws RuntimeException         on the second or subsequent call to the method.
      */
-    public function move(string $targetPath, string $name = null);
+    public function move(string $targetPath, ?string $name = null);
 
     //--------------------------------------------------------------------
 
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 10648aa6f8b9..4af60c82d12e 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -145,7 +145,7 @@ class IncomingRequest extends Request
      * @param string|null $body
      * @param UserAgent   $userAgent
      */
-    public function __construct($config, URI $uri = null, $body = 'php://input', UserAgent $userAgent = null)
+    public function __construct($config, ?URI $uri = null, $body = 'php://input', ?UserAgent $userAgent = null)
     {
         if (empty($uri) || empty($userAgent)) {
             throw new InvalidArgumentException('You must supply the parameters: uri, userAgent.');
@@ -415,7 +415,7 @@ public function isSecure(): bool
      *
      * @return $this
      */
-    public function setPath(string $path, App $config = null)
+    public function setPath(string $path, ?App $config = null)
     {
         $this->path = $path;
         $this->uri->setPath($path);
diff --git a/system/HTTP/Negotiate.php b/system/HTTP/Negotiate.php
index 67aa4e39c9d7..6e71f745770b 100644
--- a/system/HTTP/Negotiate.php
+++ b/system/HTTP/Negotiate.php
@@ -38,7 +38,7 @@ class Negotiate
      *
      * @param RequestInterface|null $request
      */
-    public function __construct(RequestInterface $request = null)
+    public function __construct(?RequestInterface $request = null)
     {
         if ($request !== null) {
             $this->request = $request;
@@ -169,7 +169,7 @@ public function language(array $supported): string
      *
      * @return string Best match
      */
-    protected function getBestMatch(array $supported, string $header = null, bool $enforceTypes = false, bool $strictMatch = false, bool $matchLocales = false): string
+    protected function getBestMatch(array $supported, ?string $header = null, bool $enforceTypes = false, bool $strictMatch = false, bool $matchLocales = false): string
     {
         if (empty($supported)) {
             throw HTTPException::forEmptySupportedNegotiations();
diff --git a/system/HTTP/RedirectResponse.php b/system/HTTP/RedirectResponse.php
index 66b79fc13092..264f769d32ed 100644
--- a/system/HTTP/RedirectResponse.php
+++ b/system/HTTP/RedirectResponse.php
@@ -30,7 +30,7 @@ class RedirectResponse extends Response
      *
      * @return $this
      */
-    public function to(string $uri, int $code = null, string $method = 'auto')
+    public function to(string $uri, ?int $code = null, string $method = 'auto')
     {
         // If it appears to be a relative URL, then convert to full URL
         // for better security.
@@ -76,7 +76,7 @@ public function route(string $route, array $params = [], int $code = 302, string
      *
      * @return $this
      */
-    public function back(int $code = null, string $method = 'auto')
+    public function back(?int $code = null, string $method = 'auto')
     {
         Services::session();
 
diff --git a/system/HTTP/Request.php b/system/HTTP/Request.php
index 35762d0af65a..a240b985756a 100644
--- a/system/HTTP/Request.php
+++ b/system/HTTP/Request.php
@@ -78,7 +78,7 @@ public function __construct($config = null)
      *
      * @codeCoverageIgnore
      */
-    public function isValidIP(string $ip = null, string $which = null): bool
+    public function isValidIP(?string $ip = null, ?string $which = null): bool
     {
         return (new FormatRules())->valid_ip($ip, $which);
     }
diff --git a/system/HTTP/RequestInterface.php b/system/HTTP/RequestInterface.php
index 2d8d501726e9..18076e969f7f 100644
--- a/system/HTTP/RequestInterface.php
+++ b/system/HTTP/RequestInterface.php
@@ -40,7 +40,7 @@ public function getIPAddress(): string;
      *
      * @deprecated Use Validation instead
      */
-    public function isValidIP(string $ip, string $which = null): bool;
+    public function isValidIP(string $ip, ?string $which = null): bool;
 
     //--------------------------------------------------------------------
 
diff --git a/system/HTTP/ResponseInterface.php b/system/HTTP/ResponseInterface.php
index 45f2b884c0d7..8b6fa185e4c8 100644
--- a/system/HTTP/ResponseInterface.php
+++ b/system/HTTP/ResponseInterface.php
@@ -350,7 +350,7 @@ public function setCookie(
      *
      * @return bool
      */
-    public function hasCookie(string $name, string $value = null, string $prefix = ''): bool;
+    public function hasCookie(string $name, ?string $value = null, string $prefix = ''): bool;
 
     /**
      * Returns the cookie
@@ -360,7 +360,7 @@ public function hasCookie(string $name, string $value = null, string $prefix = '
      *
      * @return Cookie|Cookie[]|null
      */
-    public function getCookie(string $name = null, string $prefix = '');
+    public function getCookie(?string $name = null, string $prefix = '');
 
     /**
      * Sets a cookie to be deleted when the response is sent.
@@ -396,7 +396,7 @@ public function getCookies();
      *
      * @return $this
      */
-    public function redirect(string $uri, string $method = 'auto', int $code = null);
+    public function redirect(string $uri, string $method = 'auto', ?int $code = null);
 
     /**
      * Force a download.
diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
index 2e88e71b7941..a96045a550b1 100644
--- a/system/HTTP/ResponseTrait.php
+++ b/system/HTTP/ResponseTrait.php
@@ -507,7 +507,7 @@ public function sendBody()
      *
      * @return $this
      */
-    public function redirect(string $uri, string $method = 'auto', int $code = null)
+    public function redirect(string $uri, string $method = 'auto', ?int $code = null)
     {
         // Assume 302 status code response; override if needed
         if (empty($code)) {
@@ -616,7 +616,7 @@ public function getCookieStore()
      *
      * @return bool
      */
-    public function hasCookie(string $name, string $value = null, string $prefix = ''): bool
+    public function hasCookie(string $name, ?string $value = null, string $prefix = ''): bool
     {
         $prefix = $prefix ?: Cookie::setDefaults()['prefix']; // to retain BC
 
@@ -631,7 +631,7 @@ public function hasCookie(string $name, string $value = null, string $prefix = '
      *
      * @return Cookie|Cookie[]|null
      */
-    public function getCookie(string $name = null, string $prefix = '')
+    public function getCookie(?string $name = null, string $prefix = '')
     {
         if ((string) $name === '') {
             return $this->cookieStore->display();
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index eb43e0065221..9f79cccddbd6 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -148,7 +148,7 @@ class URI
      *
      * @return string
      */
-    public static function createURIString(string $scheme = null, string $authority = null, string $path = null, string $query = null, string $fragment = null): string
+    public static function createURIString(?string $scheme = null, ?string $authority = null, ?string $path = null, ?string $query = null, ?string $fragment = null): string
     {
         $uri = '';
         if (! empty($scheme)) {
@@ -239,7 +239,7 @@ public static function removeDotSegments(string $path): string
      *
      * @throws InvalidArgumentException
      */
-    public function __construct(string $uri = null)
+    public function __construct(?string $uri = null)
     {
         if ($uri !== null) {
             $this->setURI($uri);
@@ -289,7 +289,7 @@ public function useRawQueryString(bool $raw = true)
      *
      * @return URI
      */
-    public function setURI(string $uri = null)
+    public function setURI(?string $uri = null)
     {
         if ($uri !== null) {
             $parts = parse_url($uri);
@@ -769,7 +769,7 @@ public function setHost(string $str)
      *
      * @return $this
      */
-    public function setPort(int $port = null)
+    public function setPort(?int $port = null)
     {
         if ($port === null) {
             return $this;
@@ -966,7 +966,7 @@ public function setFragment(string $string)
      *
      * @return string
      */
-    protected function filterPath(string $path = null): string
+    protected function filterPath(?string $path = null): string
     {
         $orig = $path;
 
diff --git a/system/HTTP/UserAgent.php b/system/HTTP/UserAgent.php
index 3cddffe2f26c..17bc52cd3656 100644
--- a/system/HTTP/UserAgent.php
+++ b/system/HTTP/UserAgent.php
@@ -104,7 +104,7 @@ class UserAgent
      *
      * @param UserAgents|null $config
      */
-    public function __construct(UserAgents $config = null)
+    public function __construct(?UserAgents $config = null)
     {
         $this->config = $config ?? new UserAgents();
 
@@ -123,7 +123,7 @@ public function __construct(UserAgents $config = null)
      *
      * @return bool
      */
-    public function isBrowser(string $key = null): bool
+    public function isBrowser(?string $key = null): bool
     {
         if (! $this->isBrowser) {
             return false;
@@ -147,7 +147,7 @@ public function isBrowser(string $key = null): bool
      *
      * @return bool
      */
-    public function isRobot(string $key = null): bool
+    public function isRobot(?string $key = null): bool
     {
         if (! $this->isRobot) {
             return false;
@@ -171,7 +171,7 @@ public function isRobot(string $key = null): bool
      *
      * @return bool
      */
-    public function isMobile(string $key = null): bool
+    public function isMobile(?string $key = null): bool
     {
         if (! $this->isMobile) {
             return false;
diff --git a/system/Helpers/cookie_helper.php b/system/Helpers/cookie_helper.php
index 9931457c4953..1af54dcbca5f 100755
--- a/system/Helpers/cookie_helper.php
+++ b/system/Helpers/cookie_helper.php
@@ -44,7 +44,7 @@ function set_cookie(
         string $prefix = '',
         bool $secure = false,
         bool $httpOnly = false,
-        string $sameSite = null
+        ?string $sameSite = null
     ) {
         $response = Services::response();
         $response->setCookie($name, $value, $expire, $domain, $path, $prefix, $secure, $httpOnly, $sameSite);
@@ -101,7 +101,7 @@ function delete_cookie($name, string $domain = '', string $path = '/', string $p
      *
      * @return bool
      */
-    function has_cookie(string $name, string $value = null, string $prefix = ''): bool
+    function has_cookie(string $name, ?string $value = null, string $prefix = ''): bool
     {
         return Services::response()->hasCookie($name, $value, $prefix);
     }
diff --git a/system/Helpers/date_helper.php b/system/Helpers/date_helper.php
index 8de5c9135b1f..5b3e6cbcc869 100644
--- a/system/Helpers/date_helper.php
+++ b/system/Helpers/date_helper.php
@@ -26,7 +26,7 @@
      *
      * @return int
      */
-    function now(string $timezone = null): int
+    function now(?string $timezone = null): int
     {
         $timezone = empty($timezone) ? app_timezone() : $timezone;
 
@@ -56,7 +56,7 @@ function now(string $timezone = null): int
      *
      * @return string
      */
-    function timezone_select(string $class = '', string $default = '', int $what = DateTimeZone::ALL, string $country = null): string
+    function timezone_select(string $class = '', string $default = '', int $what = DateTimeZone::ALL, ?string $country = null): string
     {
         $timezones = DateTimeZone::listIdentifiers($what, $country);
 
diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
index fb76414fa944..2917f44d92dd 100755
--- a/system/Helpers/html_helper.php
+++ b/system/Helpers/html_helper.php
@@ -164,7 +164,7 @@ function img($src = '', bool $indexPage = false, $attributes = ''): string
      *
      * @return string
      */
-    function img_data(string $path, string $mime = null): string
+    function img_data(string $path, ?string $mime = null): string
     {
         if (! is_file($path) || ! is_readable($path)) {
             throw FileNotFoundException::forFileNotFound($path);
diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
index 9ccfb5ca9359..590e0f25449f 100644
--- a/system/Helpers/number_helper.php
+++ b/system/Helpers/number_helper.php
@@ -25,7 +25,7 @@
      *
      * @return bool|string
      */
-    function number_to_size($num, int $precision = 1, string $locale = null)
+    function number_to_size($num, int $precision = 1, ?string $locale = null)
     {
         // Strip any formatting & ensure numeric input
         try {
@@ -80,7 +80,7 @@ function number_to_size($num, int $precision = 1, string $locale = null)
      *
      * @return bool|string
      */
-    function number_to_amount($num, int $precision = 0, string $locale = null)
+    function number_to_amount($num, int $precision = 0, ?string $locale = null)
     {
         // Strip any formatting & ensure numeric input
         try {
@@ -129,7 +129,7 @@ function number_to_amount($num, int $precision = 0, string $locale = null)
      *
      * @return string
      */
-    function number_to_currency(float $num, string $currency, string $locale = null, int $fraction = null): string
+    function number_to_currency(float $num, string $currency, ?string $locale = null, ?int $fraction = null): string
     {
         return format_number($num, 1, $locale, [
             'type'     => NumberFormatter::CURRENCY,
@@ -153,7 +153,7 @@ function number_to_currency(float $num, string $currency, string $locale = null,
      *
      * @return string
      */
-    function format_number(float $num, int $precision = 1, string $locale = null, array $options = []): string
+    function format_number(float $num, int $precision = 1, ?string $locale = null, array $options = []): string
     {
         // Locale is either passed in here, negotiated with client, or grabbed from our config file.
         $locale = $locale ?? Services::request()->getLocale();
diff --git a/system/Helpers/test_helper.php b/system/Helpers/test_helper.php
index c94ee44dc0f2..1815cf0d14d7 100644
--- a/system/Helpers/test_helper.php
+++ b/system/Helpers/test_helper.php
@@ -26,7 +26,7 @@
      *
      * @return array|object
      */
-    function fake($model, array $overrides = null, $persist = true)
+    function fake($model, ?array $overrides = null, $persist = true)
     {
         // Get a model-appropriate Fabricator instance
         $fabricator = new Fabricator($model);
diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index 9a1373bb3eee..2ee52f12ad15 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -728,7 +728,7 @@ function alternator(): string
      * If no $phrase is passed, will generate an excerpt of $radius characters
      * from the beginning of $text.
      */
-    function excerpt(string $text, string $phrase = null, int $radius = 100, string $ellipsis = '...'): string
+    function excerpt(string $text, ?string $phrase = null, int $radius = 100, string $ellipsis = '...'): string
     {
         if (isset($phrase)) {
             $phrasePos = stripos($text, $phrase);
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
index 0e725d1c653e..fa2991763f6b 100644
--- a/system/Helpers/url_helper.php
+++ b/system/Helpers/url_helper.php
@@ -33,7 +33,7 @@
      *
      * @return URI
      */
-    function _get_uri(string $relativePath = '', App $config = null): URI
+    function _get_uri(string $relativePath = '', ?App $config = null): URI
     {
         $config = $config ?? config('App');
 
@@ -87,7 +87,7 @@ function _get_uri(string $relativePath = '', App $config = null): URI
      *
      * @return string
      */
-    function site_url($relativePath = '', string $scheme = null, App $config = null): string
+    function site_url($relativePath = '', ?string $scheme = null, ?App $config = null): string
     {
         // Convert array of segments to a string
         if (is_array($relativePath)) {
@@ -112,7 +112,7 @@ function site_url($relativePath = '', string $scheme = null, App $config = null)
      *
      * @return string
      */
-    function base_url($relativePath = '', string $scheme = null): string
+    function base_url($relativePath = '', ?string $scheme = null): string
     {
         $config            = clone config('App');
         $config->indexPage = '';
@@ -133,7 +133,7 @@ function base_url($relativePath = '', string $scheme = null): string
      *
      * @return string|URI
      */
-    function current_url(bool $returnObject = false, IncomingRequest $request = null)
+    function current_url(bool $returnObject = false, ?IncomingRequest $request = null)
     {
         $request = $request ?? Services::request();
         $path    = $request->getPath();
@@ -210,7 +210,7 @@ function uri_string(bool $relative = false): string
      *
      * @return string
      */
-    function index_page(App $altConfig = null): string
+    function index_page(?App $altConfig = null): string
     {
         // use alternate config if provided, else default one
         $config = $altConfig ?? config(App::class);
@@ -234,7 +234,7 @@ function index_page(App $altConfig = null): string
      *
      * @return string
      */
-    function anchor($uri = '', string $title = '', $attributes = '', App $altConfig = null): string
+    function anchor($uri = '', string $title = '', $attributes = '', ?App $altConfig = null): string
     {
         // use alternate config if provided, else default one
         $config = $altConfig ?? config(App::class);
@@ -271,7 +271,7 @@ function anchor($uri = '', string $title = '', $attributes = '', App $altConfig
      *
      * @return string
      */
-    function anchor_popup($uri = '', string $title = '', $attributes = false, App $altConfig = null): string
+    function anchor_popup($uri = '', string $title = '', $attributes = false, ?App $altConfig = null): string
     {
         // use alternate config if provided, else default one
         $config = $altConfig ?? config(App::class);
diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index bfffadd641b1..663cb2f2bbae 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -76,7 +76,7 @@ class Time extends DateTime
      *
      * @throws Exception
      */
-    public function __construct(string $time = null, $timezone = null, string $locale = null)
+    public function __construct(?string $time = null, $timezone = null, ?string $locale = null)
     {
         // If no locale was provided, grab it from Locale (set by IncomingRequest for web requests)
         $this->locale = ! empty($locale) ? $locale : Locale::getDefault();
@@ -117,7 +117,7 @@ public function __construct(string $time = null, $timezone = null, string $local
      *
      * @return Time
      */
-    public static function now($timezone = null, string $locale = null)
+    public static function now($timezone = null, ?string $locale = null)
     {
         return new Time(null, $timezone, $locale);
     }
@@ -138,7 +138,7 @@ public static function now($timezone = null, string $locale = null)
      *
      * @return Time
      */
-    public static function parse(string $datetime, $timezone = null, string $locale = null)
+    public static function parse(string $datetime, $timezone = null, ?string $locale = null)
     {
         return new Time($datetime, $timezone, $locale);
     }
@@ -155,7 +155,7 @@ public static function parse(string $datetime, $timezone = null, string $locale
      *
      * @return Time
      */
-    public static function today($timezone = null, string $locale = null)
+    public static function today($timezone = null, ?string $locale = null)
     {
         return new Time(date('Y-m-d 00:00:00'), $timezone, $locale);
     }
@@ -172,7 +172,7 @@ public static function today($timezone = null, string $locale = null)
      *
      * @return Time
      */
-    public static function yesterday($timezone = null, string $locale = null)
+    public static function yesterday($timezone = null, ?string $locale = null)
     {
         return new Time(date('Y-m-d 00:00:00', strtotime('-1 day')), $timezone, $locale);
     }
@@ -189,7 +189,7 @@ public static function yesterday($timezone = null, string $locale = null)
      *
      * @return Time
      */
-    public static function tomorrow($timezone = null, string $locale = null)
+    public static function tomorrow($timezone = null, ?string $locale = null)
     {
         return new Time(date('Y-m-d 00:00:00', strtotime('+1 day')), $timezone, $locale);
     }
@@ -210,7 +210,7 @@ public static function tomorrow($timezone = null, string $locale = null)
      *
      * @return Time
      */
-    public static function createFromDate(int $year = null, int $month = null, int $day = null, $timezone = null, string $locale = null)
+    public static function createFromDate(?int $year = null, ?int $month = null, ?int $day = null, $timezone = null, ?string $locale = null)
     {
         return static::create($year, $month, $day, null, null, null, $timezone, $locale);
     }
@@ -230,7 +230,7 @@ public static function createFromDate(int $year = null, int $month = null, int $
      *
      * @return Time
      */
-    public static function createFromTime(int $hour = null, int $minutes = null, int $seconds = null, $timezone = null, string $locale = null)
+    public static function createFromTime(?int $hour = null, ?int $minutes = null, ?int $seconds = null, $timezone = null, ?string $locale = null)
     {
         return static::create(null, null, null, $hour, $minutes, $seconds, $timezone, $locale);
     }
@@ -253,7 +253,7 @@ public static function createFromTime(int $hour = null, int $minutes = null, int
      *
      * @return Time
      */
-    public static function create(int $year = null, int $month = null, int $day = null, int $hour = null, int $minutes = null, int $seconds = null, $timezone = null, string $locale = null)
+    public static function create(?int $year = null, ?int $month = null, ?int $day = null, ?int $hour = null, ?int $minutes = null, ?int $seconds = null, $timezone = null, ?string $locale = null)
     {
         $year    = $year ?? date('Y');
         $month   = $month ?? date('m');
@@ -301,7 +301,7 @@ public static function createFromFormat($format, $datetime, $timeZone = null)
      *
      * @return Time
      */
-    public static function createFromTimestamp(int $timestamp, $timezone = null, string $locale = null)
+    public static function createFromTimestamp(int $timestamp, $timezone = null, ?string $locale = null)
     {
         return new Time(gmdate('Y-m-d H:i:s', $timestamp), $timezone ?? 'UTC', $locale);
     }
@@ -318,7 +318,7 @@ public static function createFromTimestamp(int $timestamp, $timezone = null, str
      *
      * @return Time
      */
-    public static function createFromInstance(DateTimeInterface $dateTime, string $locale = null)
+    public static function createFromInstance(DateTimeInterface $dateTime, ?string $locale = null)
     {
         $date     = $dateTime->format('Y-m-d H:i:s');
         $timezone = $dateTime->getTimezone();
@@ -341,7 +341,7 @@ public static function createFromInstance(DateTimeInterface $dateTime, string $l
      * @deprecated         Use createFromInstance() instead
      * @codeCoverageIgnore
      */
-    public static function instance(DateTime $dateTime, string $locale = null)
+    public static function instance(DateTime $dateTime, ?string $locale = null)
     {
         return self::createFromInstance($dateTime, $locale);
     }
@@ -377,7 +377,7 @@ public function toDateTime()
      *
      * @throws Exception
      */
-    public static function setTestNow($datetime = null, $timezone = null, string $locale = null)
+    public static function setTestNow($datetime = null, $timezone = null, ?string $locale = null)
     {
         // Reset the test instance
         if ($datetime === null) {
@@ -1067,7 +1067,7 @@ public function toTimeString()
      *
      * @return bool|string
      */
-    public function toLocalizedString(string $format = null)
+    public function toLocalizedString(?string $format = null)
     {
         $format = $format ?? $this->toStringFormat;
 
@@ -1092,7 +1092,7 @@ public function toLocalizedString(string $format = null)
      *
      * @return bool
      */
-    public function equals($testTime, string $timezone = null): bool
+    public function equals($testTime, ?string $timezone = null): bool
     {
         $testTime = $this->getUTCObject($testTime, $timezone);
 
@@ -1115,7 +1115,7 @@ public function equals($testTime, string $timezone = null): bool
      *
      * @return bool
      */
-    public function sameAs($testTime, string $timezone = null): bool
+    public function sameAs($testTime, ?string $timezone = null): bool
     {
         if ($testTime instanceof DateTimeInterface) {
             $testTime = $testTime->format('Y-m-d H:i:s');
@@ -1144,7 +1144,7 @@ public function sameAs($testTime, string $timezone = null): bool
      *
      * @return bool
      */
-    public function isBefore($testTime, string $timezone = null): bool
+    public function isBefore($testTime, ?string $timezone = null): bool
     {
         $testTime = $this->getUTCObject($testTime, $timezone)->getTimestamp();
         $ourTime  = $this->getTimestamp();
@@ -1165,7 +1165,7 @@ public function isBefore($testTime, string $timezone = null): bool
      *
      * @return bool
      */
-    public function isAfter($testTime, string $timezone = null): bool
+    public function isAfter($testTime, ?string $timezone = null): bool
     {
         $testTime = $this->getUTCObject($testTime, $timezone)->getTimestamp();
         $ourTime  = $this->getTimestamp();
@@ -1243,7 +1243,7 @@ public function humanize()
      *
      * @return TimeDifference
      */
-    public function difference($testTime, string $timezone = null)
+    public function difference($testTime, ?string $timezone = null)
     {
         $testTime = $this->getUTCObject($testTime, $timezone);
         $ourTime  = $this->getUTCObject($this);
@@ -1265,7 +1265,7 @@ public function difference($testTime, string $timezone = null)
      *
      * @return DateTime|static
      */
-    public function getUTCObject($time, string $timezone = null)
+    public function getUTCObject($time, ?string $timezone = null)
     {
         if ($time instanceof Time) {
             $time = $time->toDateTime();
diff --git a/system/I18n/TimeDifference.php b/system/I18n/TimeDifference.php
index eac75fe122cc..1f17c2853413 100644
--- a/system/I18n/TimeDifference.php
+++ b/system/I18n/TimeDifference.php
@@ -249,7 +249,7 @@ public function getSeconds(bool $raw = false)
      *
      * @return string
      */
-    public function humanize(string $locale = null): string
+    public function humanize(?string $locale = null): string
     {
         $current = clone $this->currentTime;
 
diff --git a/system/Images/Exceptions/ImageException.php b/system/Images/Exceptions/ImageException.php
index 142807b5273b..58946167f254 100644
--- a/system/Images/Exceptions/ImageException.php
+++ b/system/Images/Exceptions/ImageException.php
@@ -31,7 +31,7 @@ public static function forMissingAngle()
         return new static(lang('Images.rotationAngleRequired'));
     }
 
-    public static function forInvalidDirection(string $dir = null)
+    public static function forInvalidDirection(?string $dir = null)
     {
         return new static(lang('Images.invalidDirection', [$dir]));
     }
@@ -46,7 +46,7 @@ public static function forEXIFUnsupported()
         return new static(lang('Images.exifNotSupported'));
     }
 
-    public static function forInvalidImageCreate(string $extra = null)
+    public static function forInvalidImageCreate(?string $extra = null)
     {
         return new static(lang('Images.unsupportedImageCreate') . ' ' . $extra);
     }
@@ -56,7 +56,7 @@ public static function forSaveFailed()
         return new static(lang('Images.saveFailed'));
     }
 
-    public static function forInvalidImageLibraryPath(string $path = null)
+    public static function forInvalidImageLibraryPath(?string $path = null)
     {
         return new static(lang('Images.libPathInvalid', [$path]));
     }
diff --git a/system/Images/Handlers/BaseHandler.php b/system/Images/Handlers/BaseHandler.php
index 3a63c2455214..236b5f1c0b83 100644
--- a/system/Images/Handlers/BaseHandler.php
+++ b/system/Images/Handlers/BaseHandler.php
@@ -291,7 +291,7 @@ public function resize(int $width, int $height, bool $maintainRatio = false, str
      *
      * @return $this
      */
-    public function crop(int $width = null, int $height = null, int $x = null, int $y = null, bool $maintainRatio = false, string $masterDim = 'auto')
+    public function crop(?int $width = null, ?int $height = null, ?int $x = null, ?int $y = null, bool $maintainRatio = false, string $masterDim = 'auto')
     {
         $this->width  = $width;
         $this->height = $height;
@@ -582,7 +582,7 @@ public function reorient(bool $silent = false)
      *
      * @return mixed
      */
-    public function getEXIF(string $key = null, bool $silent = false)
+    public function getEXIF(?string $key = null, bool $silent = false)
     {
         if (! function_exists('exif_read_data')) {
             if ($silent) {
@@ -628,7 +628,7 @@ public function getEXIF(string $key = null, bool $silent = false)
      *
      * @return BaseHandler
      */
-    public function fit(int $width, int $height = null, string $position = 'center')
+    public function fit(int $width, ?int $height = null, string $position = 'center')
     {
         $origWidth  = $this->image()->origWidth;
         $origHeight = $this->image()->origHeight;
@@ -785,7 +785,7 @@ abstract public function getVersion();
      *
      * @return bool
      */
-    abstract public function save(string $target = null, int $quality = 90);
+    abstract public function save(?string $target = null, int $quality = 90);
 
     //--------------------------------------------------------------------
 
diff --git a/system/Images/Handlers/GDHandler.php b/system/Images/Handlers/GDHandler.php
index 8b7ad21eed23..be4e9df1300e 100644
--- a/system/Images/Handlers/GDHandler.php
+++ b/system/Images/Handlers/GDHandler.php
@@ -241,7 +241,7 @@ protected function process(string $action)
      *
      * @return bool
      */
-    public function save(string $target = null, int $quality = 90): bool
+    public function save(?string $target = null, int $quality = 90): bool
     {
         $original = $target;
         $target   = empty($target) ? $this->image()->getPathname() : $target;
diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php
index 3f92bc1a9186..3e2d072c91a0 100644
--- a/system/Images/Handlers/ImageMagickHandler.php
+++ b/system/Images/Handlers/ImageMagickHandler.php
@@ -270,7 +270,7 @@ protected function process(string $action, int $quality = 100): array
      *
      * @return bool
      */
-    public function save(string $target = null, int $quality = 90): bool
+    public function save(?string $target = null, int $quality = 90): bool
     {
         $original = $target;
         $target   = empty($target) ? $this->image()->getPathname() : $target;
diff --git a/system/Images/Image.php b/system/Images/Image.php
index c27c36dc3b04..7e2035ed5bd1 100644
--- a/system/Images/Image.php
+++ b/system/Images/Image.php
@@ -67,7 +67,7 @@ class Image extends File
      *
      * @return bool
      */
-    public function copy(string $targetPath, string $targetName = null, int $perms = 0644): bool
+    public function copy(string $targetPath, ?string $targetName = null, int $perms = 0644): bool
     {
         $targetPath = rtrim($targetPath, '/ ') . '/';
 
diff --git a/system/Images/ImageHandlerInterface.php b/system/Images/ImageHandlerInterface.php
index 7dfcaa0cb581..72b8c07eb932 100644
--- a/system/Images/ImageHandlerInterface.php
+++ b/system/Images/ImageHandlerInterface.php
@@ -44,7 +44,7 @@ public function resize(int $width, int $height, bool $maintainRatio = false, str
      *
      * @return $this
      */
-    public function crop(int $width = null, int $height = null, int $x = null, int $y = null, bool $maintainRatio = false, string $masterDim = 'auto');
+    public function crop(?int $width = null, ?int $height = null, ?int $x = null, ?int $y = null, bool $maintainRatio = false, string $masterDim = 'auto');
 
     //--------------------------------------------------------------------
 
@@ -102,7 +102,7 @@ public function reorient();
      *
      * @return mixed
      */
-    public function getEXIF(string $key = null);
+    public function getEXIF(?string $key = null);
 
     //--------------------------------------------------------------------
 
@@ -177,5 +177,5 @@ public function text(string $text, array $options = []);
      *
      * @return bool
      */
-    public function save(string $target = null, int $quality = 90);
+    public function save(?string $target = null, int $quality = 90);
 }
diff --git a/system/Language/Language.php b/system/Language/Language.php
index f163f1f0c695..51e039511978 100644
--- a/system/Language/Language.php
+++ b/system/Language/Language.php
@@ -73,7 +73,7 @@ public function __construct(string $locale)
      *
      * @return $this
      */
-    public function setLocale(string $locale = null)
+    public function setLocale(?string $locale = null)
     {
         if ($locale !== null) {
             $this->locale = $locale;
diff --git a/system/Log/Handlers/ChromeLoggerHandler.php b/system/Log/Handlers/ChromeLoggerHandler.php
index 4a93a49983b5..c1c81f4cf16d 100644
--- a/system/Log/Handlers/ChromeLoggerHandler.php
+++ b/system/Log/Handlers/ChromeLoggerHandler.php
@@ -163,7 +163,7 @@ protected function format($object)
      *
      * @param ResponseInterface $response
      */
-    public function sendLogs(ResponseInterface &$response = null)
+    public function sendLogs(?ResponseInterface &$response = null)
     {
         if ($response === null) {
             $response = Services::response(null, true);
diff --git a/system/Model.php b/system/Model.php
index 774dca8f06c6..e8ccdce86316 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -97,7 +97,7 @@ class Model extends BaseModel
      * @param ConnectionInterface|null $db         DB Connection
      * @param ValidationInterface|null $validation Validation
      */
-    public function __construct(ConnectionInterface &$db = null, ValidationInterface $validation = null)
+    public function __construct(?ConnectionInterface &$db = null, ?ValidationInterface $validation = null)
     {
         /**
          * @var BaseConnection $db
@@ -321,7 +321,7 @@ protected function doUpdate($id = null, $data = null): bool
      *
      * @return mixed Number of rows affected or FALSE on failure
      */
-    protected function doUpdateBatch(array $set = null, string $index = null, int $batchSize = 100, bool $returnSQL = false)
+    protected function doUpdateBatch(?array $set = null, ?string $index = null, int $batchSize = 100, bool $returnSQL = false)
     {
         return $this->builder()->testMode($returnSQL)->updateBatch($set, $index, $batchSize);
     }
@@ -404,7 +404,7 @@ protected function doOnlyDeleted()
      *
      * @return mixed
      */
-    protected function doReplace(array $data = null, bool $returnSQL = false)
+    protected function doReplace(?array $data = null, bool $returnSQL = false)
     {
         return $this->builder()->testMode($returnSQL)->replace($data);
     }
diff --git a/system/Pager/Exceptions/PagerException.php b/system/Pager/Exceptions/PagerException.php
index 6f52619efd0d..9da0ec4b5591 100644
--- a/system/Pager/Exceptions/PagerException.php
+++ b/system/Pager/Exceptions/PagerException.php
@@ -15,12 +15,12 @@
 
 class PagerException extends FrameworkException
 {
-    public static function forInvalidTemplate(string $template = null)
+    public static function forInvalidTemplate(?string $template = null)
     {
         return new static(lang('Pager.invalidTemplate', [$template]));
     }
 
-    public static function forInvalidPaginationGroup(string $group = null)
+    public static function forInvalidPaginationGroup(?string $group = null)
     {
         return new static(lang('Pager.invalidPaginationGroup', [$group]));
     }
diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
index 174bb3ac1621..bbdc9af989d3 100644
--- a/system/Pager/Pager.php
+++ b/system/Pager/Pager.php
@@ -341,7 +341,7 @@ public function getFirstPage(string $group = 'default'): int
      *
      * @return string|URI
      */
-    public function getPageURI(int $page = null, string $group = 'default', bool $returnObject = false)
+    public function getPageURI(?int $page = null, string $group = 'default', bool $returnObject = false)
     {
         $this->ensureGroup($group);
 
@@ -496,7 +496,7 @@ public function only(array $queries): Pager
      * @param string $group
      * @param int    $perPage
      */
-    protected function ensureGroup(string $group, int $perPage = null)
+    protected function ensureGroup(string $group, ?int $perPage = null)
     {
         if (array_key_exists($group, $this->groups)) {
             return;
diff --git a/system/Pager/PagerInterface.php b/system/Pager/PagerInterface.php
index 02a5df3a727e..c928ba461766 100644
--- a/system/Pager/PagerInterface.php
+++ b/system/Pager/PagerInterface.php
@@ -115,7 +115,7 @@ public function getCurrentPage(string $group = 'default'): int;
      *
      * @return string|URI
      */
-    public function getPageURI(int $page = null, string $group = 'default', bool $returnObject = false);
+    public function getPageURI(?int $page = null, string $group = 'default', bool $returnObject = false);
 
     //--------------------------------------------------------------------
 
diff --git a/system/Pager/PagerRenderer.php b/system/Pager/PagerRenderer.php
index 7b73075f92c0..080b3c0222a6 100644
--- a/system/Pager/PagerRenderer.php
+++ b/system/Pager/PagerRenderer.php
@@ -108,7 +108,7 @@ public function __construct(array $details)
      *
      * @return PagerRenderer
      */
-    public function setSurroundCount(int $count = null)
+    public function setSurroundCount(?int $count = null)
     {
         $this->updatePages($count);
 
@@ -292,7 +292,7 @@ public function links(): array
      *
      * @param int|null $count The new "surroundCount"
      */
-    protected function updatePages(int $count = null)
+    protected function updatePages(?int $count = null)
     {
         if ($count === null) {
             return;
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 5aab32433a08..b96f0c6d69d4 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -239,7 +239,7 @@ public function __construct(FileLocator $locator, Modules $moduleConfig)
      *
      * @return RouteCollectionInterface
      */
-    public function addPlaceholder($placeholder, string $pattern = null): RouteCollectionInterface
+    public function addPlaceholder($placeholder, ?string $pattern = null): RouteCollectionInterface
     {
         if (! is_array($placeholder)) {
             $placeholder = [$placeholder => $pattern];
@@ -496,7 +496,7 @@ public function shouldAutoRoute(): bool
      *
      * @return array
      */
-    public function getRoutes(string $verb = null): array
+    public function getRoutes(?string $verb = null): array
     {
         if (empty($verb)) {
             $verb = $this->getHTTPVerb();
@@ -551,7 +551,7 @@ public function getRoutes(string $verb = null): array
      *
      * @return array
      */
-    public function getRoutesOptions(string $from = null, string $verb = null): array
+    public function getRoutesOptions(?string $from = null, ?string $verb = null): array
     {
         $options = $this->loadRoutesOptions($verb);
 
@@ -597,7 +597,7 @@ public function setHTTPVerb(string $verb)
      *
      * @return RouteCollectionInterface
      */
-    public function map(array $routes = [], array $options = null): RouteCollectionInterface
+    public function map(array $routes = [], ?array $options = null): RouteCollectionInterface
     {
         foreach ($routes as $from => $to) {
             $this->add($from, $to, $options);
@@ -620,7 +620,7 @@ public function map(array $routes = [], array $options = null): RouteCollectionI
      *
      * @return RouteCollectionInterface
      */
-    public function add(string $from, $to, array $options = null): RouteCollectionInterface
+    public function add(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
         $this->create('*', $from, $to, $options);
 
@@ -786,7 +786,7 @@ public function group(string $name, ...$params)
      *
      * @return RouteCollectionInterface
      */
-    public function resource(string $name, array $options = null): RouteCollectionInterface
+    public function resource(string $name, ?array $options = null): RouteCollectionInterface
     {
         // In order to allow customization of the route the
         // resources are sent to, we need to have a new name
@@ -881,7 +881,7 @@ public function resource(string $name, array $options = null): RouteCollectionIn
      *
      * @return RouteCollectionInterface
      */
-    public function presenter(string $name, array $options = null): RouteCollectionInterface
+    public function presenter(string $name, ?array $options = null): RouteCollectionInterface
     {
         // In order to allow customization of the route the
         // resources are sent to, we need to have a new name
@@ -961,7 +961,7 @@ public function presenter(string $name, array $options = null): RouteCollectionI
      *
      * @return RouteCollectionInterface
      */
-    public function match(array $verbs = [], string $from = '', $to = '', array $options = null): RouteCollectionInterface
+    public function match(array $verbs = [], string $from = '', $to = '', ?array $options = null): RouteCollectionInterface
     {
         if (empty($from) || empty($to)) {
             throw new InvalidArgumentException('You must supply the parameters: from, to.');
@@ -987,7 +987,7 @@ public function match(array $verbs = [], string $from = '', $to = '', array $opt
      *
      * @return RouteCollectionInterface
      */
-    public function get(string $from, $to, array $options = null): RouteCollectionInterface
+    public function get(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
         $this->create('get', $from, $to, $options);
 
@@ -1005,7 +1005,7 @@ public function get(string $from, $to, array $options = null): RouteCollectionIn
      *
      * @return RouteCollectionInterface
      */
-    public function post(string $from, $to, array $options = null): RouteCollectionInterface
+    public function post(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
         $this->create('post', $from, $to, $options);
 
@@ -1023,7 +1023,7 @@ public function post(string $from, $to, array $options = null): RouteCollectionI
      *
      * @return RouteCollectionInterface
      */
-    public function put(string $from, $to, array $options = null): RouteCollectionInterface
+    public function put(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
         $this->create('put', $from, $to, $options);
 
@@ -1041,7 +1041,7 @@ public function put(string $from, $to, array $options = null): RouteCollectionIn
      *
      * @return RouteCollectionInterface
      */
-    public function delete(string $from, $to, array $options = null): RouteCollectionInterface
+    public function delete(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
         $this->create('delete', $from, $to, $options);
 
@@ -1059,7 +1059,7 @@ public function delete(string $from, $to, array $options = null): RouteCollectio
      *
      * @return RouteCollectionInterface
      */
-    public function head(string $from, $to, array $options = null): RouteCollectionInterface
+    public function head(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
         $this->create('head', $from, $to, $options);
 
@@ -1077,7 +1077,7 @@ public function head(string $from, $to, array $options = null): RouteCollectionI
      *
      * @return RouteCollectionInterface
      */
-    public function patch(string $from, $to, array $options = null): RouteCollectionInterface
+    public function patch(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
         $this->create('patch', $from, $to, $options);
 
@@ -1095,7 +1095,7 @@ public function patch(string $from, $to, array $options = null): RouteCollection
      *
      * @return RouteCollectionInterface
      */
-    public function options(string $from, $to, array $options = null): RouteCollectionInterface
+    public function options(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
         $this->create('options', $from, $to, $options);
 
@@ -1113,7 +1113,7 @@ public function options(string $from, $to, array $options = null): RouteCollecti
      *
      * @return RouteCollectionInterface
      */
-    public function cli(string $from, $to, array $options = null): RouteCollectionInterface
+    public function cli(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
         $this->create('cli', $from, $to, $options);
 
@@ -1233,7 +1233,7 @@ protected function localizeRoute(string $route): string
      *
      * @return bool
      */
-    public function isFiltered(string $search, string $verb = null): bool
+    public function isFiltered(string $search, ?string $verb = null): bool
     {
         $options = $this->loadRoutesOptions($verb);
 
@@ -1257,7 +1257,7 @@ public function isFiltered(string $search, string $verb = null): bool
      *
      * @return string
      */
-    public function getFilterForRoute(string $search, string $verb = null): string
+    public function getFilterForRoute(string $search, ?string $verb = null): string
     {
         $options = $this->loadRoutesOptions($verb);
 
@@ -1276,7 +1276,7 @@ public function getFilterForRoute(string $search, string $verb = null): string
      *
      * @return string
      */
-    protected function fillRouteParams(string $from, array $params = null): string
+    protected function fillRouteParams(string $from, ?array $params = null): string
     {
         // Find all of our back-references in the original route
         preg_match_all('/\(([^)]+)\)/', $from, $matches);
@@ -1313,7 +1313,7 @@ protected function fillRouteParams(string $from, array $params = null): string
      * @param array|string $to
      * @param array|null   $options
      */
-    protected function create(string $verb, string $from, $to, array $options = null)
+    protected function create(string $verb, string $from, $to, ?array $options = null)
     {
         $overwrite = false;
         $prefix    = $this->group === null ? '' : $this->group . '/';
@@ -1524,7 +1524,7 @@ public function resetRoutes()
      *
      * @return array
      */
-    protected function loadRoutesOptions(string $verb = null): array
+    protected function loadRoutesOptions(?string $verb = null): array
     {
         $verb = $verb ?: $this->getHTTPVerb();
 
diff --git a/system/Router/RouteCollectionInterface.php b/system/Router/RouteCollectionInterface.php
index baa6b24e6d58..27b8ef6f0dfc 100644
--- a/system/Router/RouteCollectionInterface.php
+++ b/system/Router/RouteCollectionInterface.php
@@ -34,7 +34,7 @@ interface RouteCollectionInterface
      *
      * @return mixed
      */
-    public function add(string $from, $to, array $options = null);
+    public function add(string $from, $to, ?array $options = null);
 
     //--------------------------------------------------------------------
 
@@ -51,7 +51,7 @@ public function add(string $from, $to, array $options = null);
      *
      * @return mixed
      */
-    public function addPlaceholder($placeholder, string $pattern = null);
+    public function addPlaceholder($placeholder, ?string $pattern = null);
 
     //--------------------------------------------------------------------
 
diff --git a/system/Router/Router.php b/system/Router/Router.php
index 5fe66dda9d2a..8c2a57b9e7fc 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -110,7 +110,7 @@ class Router implements RouterInterface
      * @param RouteCollectionInterface $routes
      * @param Request                  $request
      */
-    public function __construct(RouteCollectionInterface $routes, Request $request = null)
+    public function __construct(RouteCollectionInterface $routes, ?Request $request = null)
     {
         $this->collection = $routes;
 
@@ -131,7 +131,7 @@ public function __construct(RouteCollectionInterface $routes, Request $request =
      *
      * @return mixed|string
      */
-    public function handle(string $uri = null)
+    public function handle(?string $uri = null)
     {
         $this->translateURIDashes = $this->collection->shouldTranslateURIDashes();
 
@@ -624,7 +624,7 @@ protected function scanControllers(array $segments): array
      * @param bool        $append
      * @param bool        $validate if true, checks to make sure $dir consists of only PSR4 compliant segments
      */
-    public function setDirectory(string $dir = null, bool $append = false, bool $validate = true)
+    public function setDirectory(?string $dir = null, bool $append = false, bool $validate = true)
     {
         if (empty($dir)) {
             $this->directory = null;
diff --git a/system/Router/RouterInterface.php b/system/Router/RouterInterface.php
index 5d846724f505..5d666a0b1ae1 100644
--- a/system/Router/RouterInterface.php
+++ b/system/Router/RouterInterface.php
@@ -24,7 +24,7 @@ interface RouterInterface
      * @param RouteCollectionInterface $routes
      * @param Request                  $request
      */
-    public function __construct(RouteCollectionInterface $routes, Request $request = null);
+    public function __construct(RouteCollectionInterface $routes, ?Request $request = null);
 
     //--------------------------------------------------------------------
 
@@ -36,7 +36,7 @@ public function __construct(RouteCollectionInterface $routes, Request $request =
      *
      * @return mixed
      */
-    public function handle(string $uri = null);
+    public function handle(?string $uri = null);
 
     //--------------------------------------------------------------------
 
diff --git a/system/Session/Exceptions/SessionException.php b/system/Session/Exceptions/SessionException.php
index 50a1cfabf00b..9ae07af933f0 100644
--- a/system/Session/Exceptions/SessionException.php
+++ b/system/Session/Exceptions/SessionException.php
@@ -20,12 +20,12 @@ public static function forMissingDatabaseTable()
         return new static(lang('Session.missingDatabaseTable'));
     }
 
-    public static function forInvalidSavePath(string $path = null)
+    public static function forInvalidSavePath(?string $path = null)
     {
         return new static(lang('Session.invalidSavePath', [$path]));
     }
 
-    public static function forWriteProtectedSavePath(string $path = null)
+    public static function forWriteProtectedSavePath(?string $path = null)
     {
         return new static(lang('Session.writeProtectedSavePath', [$path]));
     }
diff --git a/system/Session/Session.php b/system/Session/Session.php
index 8810f996be52..e5787bae85f9 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -486,7 +486,7 @@ public function set($data, $value = null)
      *
      * @return mixed The property value(s)
      */
-    public function get(string $key = null)
+    public function get(?string $key = null)
     {
         if (! empty($key) && (null !== ($value = $_SESSION[$key] ?? null) || null !== ($value = dot_array_search($key, $_SESSION ?? [])))) {
             return $value;
@@ -643,7 +643,7 @@ public function setFlashdata($data, $value = null)
      *
      * @return array|null The requested property value, or an associative array  of them
      */
-    public function getFlashdata(string $key = null)
+    public function getFlashdata(?string $key = null)
     {
         if (isset($key)) {
             return (isset($_SESSION['__ci_vars'], $_SESSION['__ci_vars'][$key], $_SESSION[$key])
@@ -779,7 +779,7 @@ public function setTempdata($data, $value = null, int $ttl = 300)
      *
      * @return mixed Session data value or null if not found.
      */
-    public function getTempdata(string $key = null)
+    public function getTempdata(?string $key = null)
     {
         if (isset($key)) {
             return (isset($_SESSION['__ci_vars'], $_SESSION['__ci_vars'][$key], $_SESSION[$key])
diff --git a/system/Session/SessionInterface.php b/system/Session/SessionInterface.php
index 655d1cfa445d..5dc558963d6e 100644
--- a/system/Session/SessionInterface.php
+++ b/system/Session/SessionInterface.php
@@ -61,7 +61,7 @@ public function set($data, $value = null);
      *
      * @return mixed The property value(s)
      */
-    public function get(string $key = null);
+    public function get(?string $key = null);
 
     //--------------------------------------------------------------------
 
@@ -115,7 +115,7 @@ public function setFlashdata($data, $value = null);
      * @return array|null The requested property value, or an associative
      *                    array  of them
      */
-    public function getFlashdata(string $key = null);
+    public function getFlashdata(?string $key = null);
 
     //--------------------------------------------------------------------
 
@@ -177,7 +177,7 @@ public function setTempdata($data, $value = null, int $ttl = 300);
      *
      * @return mixed Session data value or null if not found.
      */
-    public function getTempdata(string $key = null);
+    public function getTempdata(?string $key = null);
 
     //--------------------------------------------------------------------
 
diff --git a/system/Test/DOMParser.php b/system/Test/DOMParser.php
index 17d8b006ceb4..87f405d4a733 100644
--- a/system/Test/DOMParser.php
+++ b/system/Test/DOMParser.php
@@ -113,7 +113,7 @@ public function withFile(string $path)
      *
      * @return bool
      */
-    public function see(string $search = null, string $element = null): bool
+    public function see(?string $search = null, ?string $element = null): bool
     {
         // If Element is null, we're just scanning for text
         if ($element === null) {
@@ -135,7 +135,7 @@ public function see(string $search = null, string $element = null): bool
      *
      * @return bool
      */
-    public function dontSee(string $search = null, string $element = null): bool
+    public function dontSee(?string $search = null, ?string $element = null): bool
     {
         return ! $this->see($search, $element);
     }
@@ -174,7 +174,7 @@ public function dontSeeElement(string $element): bool
      *
      * @return bool
      */
-    public function seeLink(string $text, string $details = null): bool
+    public function seeLink(string $text, ?string $details = null): bool
     {
         return $this->see($text, 'a' . $details);
     }
diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
index ec4ee4c10862..d848a64b9ca5 100644
--- a/system/Test/Fabricator.php
+++ b/system/Test/Fabricator.php
@@ -100,7 +100,7 @@ class Fabricator
      *
      * @throws InvalidArgumentException
      */
-    public function __construct($model, array $formatters = null, string $locale = null)
+    public function __construct($model, ?array $formatters = null, ?string $locale = null)
     {
         if (is_string($model)) {
             // Create a new model instance
@@ -282,7 +282,7 @@ public function getFormatters(): ?array
      *
      * @return $this
      */
-    public function setFormatters(array $formatters = null): self
+    public function setFormatters(?array $formatters = null): self
     {
         if ($formatters !== null) {
             $this->formatters = $formatters;
@@ -369,7 +369,7 @@ protected function guessFormatter($field): string
      *
      * @return array|object An array or object (based on returnType), or an array of returnTypes
      */
-    public function make(int $count = null)
+    public function make(?int $count = null)
     {
         // If a singleton was requested then go straight to it
         if ($count === null) {
@@ -433,7 +433,7 @@ public function makeArray()
      *
      * @return object An instance of the class with faked data
      */
-    public function makeObject(string $className = null): object
+    public function makeObject(?string $className = null): object
     {
         if ($className === null) {
             if ($this->model->returnType === 'object' || $this->model->returnType === 'array') {
@@ -485,7 +485,7 @@ public function makeObject(string $className = null): object
      *
      * @return array|object An array or object (based on returnType), or an array of returnTypes
      */
-    public function create(int $count = null, bool $mock = false)
+    public function create(?int $count = null, bool $mock = false)
     {
         // Intercept mock requests
         if ($mock) {
@@ -521,7 +521,7 @@ public function create(int $count = null, bool $mock = false)
      *
      * @return array|object An array or object (based on returnType), or an array of returnTypes
      */
-    protected function createMock(int $count = null)
+    protected function createMock(?int $count = null)
     {
         switch ($this->model->dateFormat) {
             case 'datetime':
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index 0b3197ffb676..230382603669 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -54,7 +54,7 @@ class FeatureTestCase extends CIUnitTestCase
      *
      * @return $this
      */
-    protected function withRoutes(array $routes = null)
+    protected function withRoutes(?array $routes = null)
     {
         $collection = Services::routes();
 
@@ -78,7 +78,7 @@ protected function withRoutes(array $routes = null)
      *
      * @return $this
      */
-    public function withSession(array $values = null)
+    public function withSession(?array $values = null)
     {
         $this->session = $values ?? $_SESSION;
 
@@ -157,7 +157,7 @@ public function skipEvents()
      *
      * @return FeatureResponse
      */
-    public function call(string $method, string $path, array $params = null)
+    public function call(string $method, string $path, ?array $params = null)
     {
         $buffer = \ob_get_level();
 
@@ -234,7 +234,7 @@ public function call(string $method, string $path, array $params = null)
      *
      * @return FeatureResponse
      */
-    public function get(string $path, array $params = null)
+    public function get(string $path, ?array $params = null)
     {
         return $this->call('get', $path, $params);
     }
@@ -250,7 +250,7 @@ public function get(string $path, array $params = null)
      *
      * @return FeatureResponse
      */
-    public function post(string $path, array $params = null)
+    public function post(string $path, ?array $params = null)
     {
         return $this->call('post', $path, $params);
     }
@@ -266,7 +266,7 @@ public function post(string $path, array $params = null)
      *
      * @return FeatureResponse
      */
-    public function put(string $path, array $params = null)
+    public function put(string $path, ?array $params = null)
     {
         return $this->call('put', $path, $params);
     }
@@ -282,7 +282,7 @@ public function put(string $path, array $params = null)
      *
      * @return FeatureResponse
      */
-    public function patch(string $path, array $params = null)
+    public function patch(string $path, ?array $params = null)
     {
         return $this->call('patch', $path, $params);
     }
@@ -298,7 +298,7 @@ public function patch(string $path, array $params = null)
      *
      * @return FeatureResponse
      */
-    public function delete(string $path, array $params = null)
+    public function delete(string $path, ?array $params = null)
     {
         return $this->call('delete', $path, $params);
     }
@@ -314,7 +314,7 @@ public function delete(string $path, array $params = null)
      *
      * @return FeatureResponse
      */
-    public function options(string $path, array $params = null)
+    public function options(string $path, ?array $params = null)
     {
         return $this->call('options', $path, $params);
     }
@@ -328,7 +328,7 @@ public function options(string $path, array $params = null)
      *
      * @return IncomingRequest
      */
-    protected function setupRequest(string $method, string $path = null): IncomingRequest
+    protected function setupRequest(string $method, ?string $path = null): IncomingRequest
     {
         $config = config(App::class);
         $uri    = new URI(rtrim($config->baseURL, '/') . '/' . trim($path, '/ '));
@@ -378,7 +378,7 @@ protected function setupHeaders(IncomingRequest $request)
      *
      * @return Request
      */
-    protected function populateGlobals(string $method, Request $request, array $params = null)
+    protected function populateGlobals(string $method, Request $request, ?array $params = null)
     {
         // $params should set the query vars if present,
         // otherwise set it from the URL.
@@ -409,7 +409,7 @@ protected function populateGlobals(string $method, Request $request, array $para
      *
      * @return Request
      */
-    protected function setRequestBody(Request $request, array $params = null): Request
+    protected function setRequestBody(Request $request, ?array $params = null): Request
     {
         if (isset($this->requestBody) && $this->requestBody !== '') {
             $request->setBody($this->requestBody);
diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php
index 77b370933c42..07cec87893fa 100644
--- a/system/Test/FeatureTestTrait.php
+++ b/system/Test/FeatureTestTrait.php
@@ -44,7 +44,7 @@ trait FeatureTestTrait
      *
      * @return $this
      */
-    protected function withRoutes(array $routes = null)
+    protected function withRoutes(?array $routes = null)
     {
         $collection = Services::routes();
 
@@ -68,7 +68,7 @@ protected function withRoutes(array $routes = null)
      *
      * @return $this
      */
-    public function withSession(array $values = null)
+    public function withSession(?array $values = null)
     {
         $this->session = $values ?? $_SESSION;
 
@@ -147,7 +147,7 @@ public function skipEvents()
      *
      * @return TestResponse
      */
-    public function call(string $method, string $path, array $params = null)
+    public function call(string $method, string $path, ?array $params = null)
     {
         $buffer = \ob_get_level();
 
@@ -224,7 +224,7 @@ public function call(string $method, string $path, array $params = null)
      *
      * @return TestResponse
      */
-    public function get(string $path, array $params = null)
+    public function get(string $path, ?array $params = null)
     {
         return $this->call('get', $path, $params);
     }
@@ -240,7 +240,7 @@ public function get(string $path, array $params = null)
      *
      * @return TestResponse
      */
-    public function post(string $path, array $params = null)
+    public function post(string $path, ?array $params = null)
     {
         return $this->call('post', $path, $params);
     }
@@ -256,7 +256,7 @@ public function post(string $path, array $params = null)
      *
      * @return TestResponse
      */
-    public function put(string $path, array $params = null)
+    public function put(string $path, ?array $params = null)
     {
         return $this->call('put', $path, $params);
     }
@@ -272,7 +272,7 @@ public function put(string $path, array $params = null)
      *
      * @return TestResponse
      */
-    public function patch(string $path, array $params = null)
+    public function patch(string $path, ?array $params = null)
     {
         return $this->call('patch', $path, $params);
     }
@@ -288,7 +288,7 @@ public function patch(string $path, array $params = null)
      *
      * @return TestResponse
      */
-    public function delete(string $path, array $params = null)
+    public function delete(string $path, ?array $params = null)
     {
         return $this->call('delete', $path, $params);
     }
@@ -304,7 +304,7 @@ public function delete(string $path, array $params = null)
      *
      * @return TestResponse
      */
-    public function options(string $path, array $params = null)
+    public function options(string $path, ?array $params = null)
     {
         return $this->call('options', $path, $params);
     }
@@ -318,7 +318,7 @@ public function options(string $path, array $params = null)
      *
      * @return IncomingRequest
      */
-    protected function setupRequest(string $method, string $path = null): IncomingRequest
+    protected function setupRequest(string $method, ?string $path = null): IncomingRequest
     {
         $path    = URI::removeDotSegments($path);
         $config  = config(App::class);
@@ -371,7 +371,7 @@ protected function setupHeaders(IncomingRequest $request)
      *
      * @return Request
      */
-    protected function populateGlobals(string $method, Request $request, array $params = null)
+    protected function populateGlobals(string $method, Request $request, ?array $params = null)
     {
         // $params should set the query vars if present,
         // otherwise set it from the URL.
@@ -402,7 +402,7 @@ protected function populateGlobals(string $method, Request $request, array $para
      *
      * @return Request
      */
-    protected function setRequestBody(Request $request, array $params = null): Request
+    protected function setRequestBody(Request $request, ?array $params = null): Request
     {
         if (isset($this->requestBody) && $this->requestBody !== '') {
             $request->setBody($this->requestBody);
diff --git a/system/Test/FilterTestTrait.php b/system/Test/FilterTestTrait.php
index 9b990c192107..3b9f73322aeb 100644
--- a/system/Test/FilterTestTrait.php
+++ b/system/Test/FilterTestTrait.php
@@ -155,14 +155,14 @@ protected function getFilterCaller($filter, string $position): Closure
         $request = clone $this->request;
 
         if ($position === 'before') {
-            return static function (array $params = null) use ($filter, $request) {
+            return static function (?array $params = null) use ($filter, $request) {
                 return $filter->before($request, $params);
             };
         }
 
         $response = clone $this->response;
 
-        return static function (array $params = null) use ($filter, $request, $response) {
+        return static function (?array $params = null) use ($filter, $request, $response) {
             return $filter->after($request, $response, $params);
         };
     }
diff --git a/system/Test/Mock/MockBuilder.php b/system/Test/Mock/MockBuilder.php
index 95a92ff9dd23..03ec9d6ebecf 100644
--- a/system/Test/Mock/MockBuilder.php
+++ b/system/Test/Mock/MockBuilder.php
@@ -16,7 +16,7 @@
 
 class MockBuilder extends BaseBuilder
 {
-    public function __construct($tableName, ConnectionInterface &$db, array $options = null)
+    public function __construct($tableName, ConnectionInterface &$db, ?array $options = null)
     {
         parent::__construct($tableName, $db, $options);
     }
diff --git a/system/Test/Mock/MockCommon.php b/system/Test/Mock/MockCommon.php
index fb1affa21b80..bc11326f752d 100644
--- a/system/Test/Mock/MockCommon.php
+++ b/system/Test/Mock/MockCommon.php
@@ -20,7 +20,7 @@
      *
      * @return bool
      */
-    function is_cli(bool $newReturn = null): bool
+    function is_cli(?bool $newReturn = null): bool
     {
         // PHPUnit always runs via CLI.
         static $returnValue = true;
diff --git a/system/Test/Mock/MockLanguage.php b/system/Test/Mock/MockLanguage.php
index fb23d631fc34..d6b78a42a20e 100644
--- a/system/Test/Mock/MockLanguage.php
+++ b/system/Test/Mock/MockLanguage.php
@@ -36,7 +36,7 @@ class MockLanguage extends Language
      *
      * @return $this
      */
-    public function setData(string $file, array $data, string $locale = null)
+    public function setData(string $file, array $data, ?string $locale = null)
     {
         $this->language[$locale ?? $this->locale][$file] = $data;
 
diff --git a/system/Test/TestResponse.php b/system/Test/TestResponse.php
index 670982db6772..36d5ba522899 100644
--- a/system/Test/TestResponse.php
+++ b/system/Test/TestResponse.php
@@ -459,7 +459,7 @@ public function getXML()
      *
      * @throws Exception
      */
-    public function assertSee(string $search = null, string $element = null)
+    public function assertSee(?string $search = null, ?string $element = null)
     {
         $this->assertTrue($this->domParser->see($search, $element), "Do not see '{$search}' in response.");
     }
@@ -472,7 +472,7 @@ public function assertSee(string $search = null, string $element = null)
      *
      * @throws Exception
      */
-    public function assertDontSee(string $search = null, string $element = null)
+    public function assertDontSee(?string $search = null, ?string $element = null)
     {
         $this->assertTrue($this->domParser->dontSee($search, $element), "I should not see '{$search}' in response.");
     }
@@ -509,7 +509,7 @@ public function assertDontSeeElement(string $search)
      *
      * @throws Exception
      */
-    public function assertSeeLink(string $text, string $details = null)
+    public function assertSeeLink(string $text, ?string $details = null)
     {
         $this->assertTrue($this->domParser->seeLink($text, $details), "Do no see anchor tag with the text {$text} in response.");
     }
@@ -522,7 +522,7 @@ public function assertSeeLink(string $text, string $details = null)
      *
      * @throws Exception
      */
-    public function assertSeeInField(string $field, string $value = null)
+    public function assertSeeInField(string $field, ?string $value = null)
     {
         $this->assertTrue($this->domParser->seeInField($field, $value), "Do no see input named {$field} with value {$value} in response.");
     }
diff --git a/system/Validation/CreditCardRules.php b/system/Validation/CreditCardRules.php
index 13813063c8b6..03a39f26f75e 100644
--- a/system/Validation/CreditCardRules.php
+++ b/system/Validation/CreditCardRules.php
@@ -250,7 +250,7 @@ public function valid_cc_number(?string $ccNumber, string $type): bool
      *
      * @return bool
      */
-    protected function isValidLuhn(string $number = null): bool
+    protected function isValidLuhn(?string $number = null): bool
     {
         $number = (string) $number;
 
diff --git a/system/Validation/Exceptions/ValidationException.php b/system/Validation/Exceptions/ValidationException.php
index fb8b3c7dfaeb..322bae9a35b5 100644
--- a/system/Validation/Exceptions/ValidationException.php
+++ b/system/Validation/Exceptions/ValidationException.php
@@ -15,22 +15,22 @@
 
 class ValidationException extends FrameworkException
 {
-    public static function forRuleNotFound(string $rule = null)
+    public static function forRuleNotFound(?string $rule = null)
     {
         return new static(lang('Validation.ruleNotFound', [$rule]));
     }
 
-    public static function forGroupNotFound(string $group = null)
+    public static function forGroupNotFound(?string $group = null)
     {
         return new static(lang('Validation.groupNotFound', [$group]));
     }
 
-    public static function forGroupNotArray(string $group = null)
+    public static function forGroupNotArray(?string $group = null)
     {
         return new static(lang('Validation.groupNotArray', [$group]));
     }
 
-    public static function forInvalidTemplate(string $template = null)
+    public static function forInvalidTemplate(?string $template = null)
     {
         return new static(lang('Validation.invalidTemplate', [$template]));
     }
diff --git a/system/Validation/FileRules.php b/system/Validation/FileRules.php
index bd7ed617d565..e66e8ccadf36 100644
--- a/system/Validation/FileRules.php
+++ b/system/Validation/FileRules.php
@@ -34,7 +34,7 @@ class FileRules
      *
      * @param RequestInterface $request
      */
-    public function __construct(RequestInterface $request = null)
+    public function __construct(?RequestInterface $request = null)
     {
         if ($request === null) {
             $request = Services::request();
diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index bc29ac0a9867..6cd9a56fc3f1 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -218,7 +218,7 @@ public function regex_match(?string $str, string $pattern): bool
      *
      * @return bool
      */
-    public function timezone(string $str = null): bool
+    public function timezone(?string $str = null): bool
     {
         return in_array($str, timezone_identifiers_list(), true);
     }
@@ -233,7 +233,7 @@ public function timezone(string $str = null): bool
      *
      * @return bool
      */
-    public function valid_base64(string $str = null): bool
+    public function valid_base64(?string $str = null): bool
     {
         return base64_encode(base64_decode($str, true)) === $str;
     }
@@ -245,7 +245,7 @@ public function valid_base64(string $str = null): bool
      *
      * @return bool
      */
-    public function valid_json(string $str = null): bool
+    public function valid_json(?string $str = null): bool
     {
         json_decode($str);
 
@@ -259,7 +259,7 @@ public function valid_json(string $str = null): bool
      *
      * @return bool
      */
-    public function valid_email(string $str = null): bool
+    public function valid_email(?string $str = null): bool
     {
         // @see https://regex101.com/r/wlJG1t/1/
         if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches)) {
@@ -279,7 +279,7 @@ public function valid_email(string $str = null): bool
      *
      * @return bool
      */
-    public function valid_emails(string $str = null): bool
+    public function valid_emails(?string $str = null): bool
     {
         foreach (explode(',', $str) as $email) {
             $email = trim($email);
@@ -303,7 +303,7 @@ public function valid_emails(string $str = null): bool
      *
      * @return bool
      */
-    public function valid_ip(string $ip = null, string $which = null): bool
+    public function valid_ip(?string $ip = null, ?string $which = null): bool
     {
         if (empty($ip)) {
             return false;
@@ -333,7 +333,7 @@ public function valid_ip(string $ip = null, string $which = null): bool
      *
      * @return bool
      */
-    public function valid_url(string $str = null): bool
+    public function valid_url(?string $str = null): bool
     {
         if (empty($str)) {
             return false;
@@ -360,7 +360,7 @@ public function valid_url(string $str = null): bool
      *
      * @return bool
      */
-    public function valid_date(string $str = null, string $format = null): bool
+    public function valid_date(?string $str = null, ?string $format = null): bool
     {
         if (empty($format)) {
             return (bool) strtotime($str);
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
index 70b523c2064e..7273f247fbbe 100644
--- a/system/Validation/Rules.php
+++ b/system/Validation/Rules.php
@@ -30,7 +30,7 @@ class Rules
      *
      * @return bool
      */
-    public function differs(string $str = null, string $field, array $data): bool
+    public function differs(?string $str, string $field, array $data): bool
     {
         if (strpos($field, '.') !== false) {
             return $str !== dot_array_search($field, $data);
@@ -49,7 +49,7 @@ public function differs(string $str = null, string $field, array $data): bool
      *
      * @return bool
      */
-    public function equals(string $str = null, string $val): bool
+    public function equals(?string $str, string $val): bool
     {
         return $str === $val;
     }
@@ -65,7 +65,7 @@ public function equals(string $str = null, string $val): bool
      *
      * @return bool
      */
-    public function exact_length(string $str = null, string $val): bool
+    public function exact_length(?string $str, string $val): bool
     {
         $val = explode(',', $val);
 
@@ -88,7 +88,7 @@ public function exact_length(string $str = null, string $val): bool
      *
      * @return bool
      */
-    public function greater_than(string $str = null, string $min): bool
+    public function greater_than(?string $str, string $min): bool
     {
         return is_numeric($str) && $str > $min;
     }
@@ -103,7 +103,7 @@ public function greater_than(string $str = null, string $min): bool
      *
      * @return bool
      */
-    public function greater_than_equal_to(string $str = null, string $min): bool
+    public function greater_than_equal_to(?string $str, string $min): bool
     {
         return is_numeric($str) && $str >= $min;
     }
@@ -125,7 +125,7 @@ public function greater_than_equal_to(string $str = null, string $min): bool
      *
      * @return bool
      */
-    public function is_not_unique(string $str = null, string $field, array $data): bool
+    public function is_not_unique(?string $str, string $field, array $data): bool
     {
         // Grab any data for exclusion of a single row.
         [$field, $whereField, $whereValue] = array_pad(explode(',', $field), 3, null);
@@ -157,7 +157,7 @@ public function is_not_unique(string $str = null, string $field, array $data): b
      *
      * @return bool
      */
-    public function in_list(string $value = null, string $list): bool
+    public function in_list(?string $value, string $list): bool
     {
         $list = array_map('trim', explode(',', $list));
 
@@ -181,7 +181,7 @@ public function in_list(string $value = null, string $list): bool
      *
      * @return bool
      */
-    public function is_unique(string $str = null, string $field, array $data): bool
+    public function is_unique(?string $str, string $field, array $data): bool
     {
         // Grab any data for exclusion of a single row.
         [$field, $ignoreField, $ignoreValue] = array_pad(explode(',', $field), 3, null);
@@ -213,7 +213,7 @@ public function is_unique(string $str = null, string $field, array $data): bool
      *
      * @return bool
      */
-    public function less_than(string $str = null, string $max): bool
+    public function less_than(?string $str, string $max): bool
     {
         return is_numeric($str) && $str < $max;
     }
@@ -228,7 +228,7 @@ public function less_than(string $str = null, string $max): bool
      *
      * @return bool
      */
-    public function less_than_equal_to(string $str = null, string $max): bool
+    public function less_than_equal_to(?string $str, string $max): bool
     {
         return is_numeric($str) && $str <= $max;
     }
@@ -244,7 +244,7 @@ public function less_than_equal_to(string $str = null, string $max): bool
      *
      * @return bool
      */
-    public function matches(string $str = null, string $field, array $data): bool
+    public function matches(?string $str, string $field, array $data): bool
     {
         if (strpos($field, '.') !== false) {
             return $str === dot_array_search($field, $data);
@@ -263,7 +263,7 @@ public function matches(string $str = null, string $field, array $data): bool
      *
      * @return bool
      */
-    public function max_length(string $str = null, string $val): bool
+    public function max_length(?string $str, string $val): bool
     {
         return is_numeric($val) && $val >= mb_strlen($str);
     }
@@ -278,7 +278,7 @@ public function max_length(string $str = null, string $val): bool
      *
      * @return bool
      */
-    public function min_length(string $str = null, string $val): bool
+    public function min_length(?string $str, string $val): bool
     {
         return is_numeric($val) && $val <= mb_strlen($str);
     }
@@ -293,7 +293,7 @@ public function min_length(string $str = null, string $val): bool
      *
      * @return bool
      */
-    public function not_equals(string $str = null, string $val): bool
+    public function not_equals(?string $str, string $val): bool
     {
         return $str !== $val;
     }
@@ -308,7 +308,7 @@ public function not_equals(string $str = null, string $val): bool
      *
      * @return bool
      */
-    public function not_in_list(string $value = null, string $list): bool
+    public function not_in_list(?string $value, string $list): bool
     {
         return ! $this->in_list($value, $list);
     }
@@ -347,7 +347,7 @@ public function required($str = null): bool
      *
      * @return bool
      */
-    public function required_with($str = null, string $fields = null, array $data = []): bool
+    public function required_with($str = null, ?string $fields = null, array $data = []): bool
     {
         if ($fields === null || empty($data)) {
             throw new InvalidArgumentException('You must supply the parameters: fields, data.');
@@ -394,7 +394,7 @@ public function required_with($str = null, string $fields = null, array $data =
      *
      * @return bool
      */
-    public function required_without($str = null, string $fields = null, array $data = []): bool
+    public function required_without($str = null, ?string $fields = null, array $data = []): bool
     {
         if ($fields === null || empty($data)) {
             throw new InvalidArgumentException('You must supply the parameters: fields, data.');
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 04c118184a73..9c64fad3dfd8 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -108,7 +108,7 @@ public function __construct($config, RendererInterface $view)
      *
      * @return bool
      */
-    public function run(array $data = null, string $group = null, string $dbGroup = null): bool
+    public function run(?array $data = null, ?string $group = null, ?string $dbGroup = null): bool
     {
         $data = $data ?? $this->data;
 
@@ -189,7 +189,7 @@ public function check($value, string $rule, array $errors = []): bool
      *
      * @return bool
      */
-    protected function processRules(string $field, string $label = null, $value, $rules = null, array $data = null): bool
+    protected function processRules(string $field, ?string $label, $value, $rules = null, ?array $data = null): bool
     {
         if ($data === null) {
             throw new InvalidArgumentException('You must supply the parameter: data.');
@@ -358,7 +358,7 @@ public function withRequest(RequestInterface $request): ValidationInterface
      *
      * @return $this
      */
-    public function setRule(string $field, string $label = null, string $rules, array $errors = [])
+    public function setRule(string $field, ?string $label, string $rules, array $errors = [])
     {
         $this->rules[$field] = [
             'label' => $label,
@@ -545,7 +545,7 @@ protected function loadRuleSets()
      *
      * @return array|ValidationException|null
      */
-    public function loadRuleGroup(string $group = null)
+    public function loadRuleGroup(?string $group = null)
     {
         if (empty($group)) {
             return null;
@@ -643,7 +643,7 @@ public function hasError(string $field): bool
      *
      * @return string Error(s).
      */
-    public function getError(string $field = null): string
+    public function getError(?string $field = null): string
     {
         if ($field === null && count($this->rules) === 1) {
             $field = array_key_first($this->rules);
@@ -705,7 +705,7 @@ public function setError(string $field, string $error): ValidationInterface
      *
      * @return string
      */
-    protected function getErrorMessage(string $rule, string $field, string $label = null, string $param = null, string $value = null): string
+    protected function getErrorMessage(string $rule, string $field, ?string $label = null, ?string $param = null, ?string $value = null): string
     {
         // Check if custom message has been defined by user
         if (isset($this->customErrors[$field][$rule])) {
diff --git a/system/Validation/ValidationInterface.php b/system/Validation/ValidationInterface.php
index 8a22f5d94880..fd590ccba906 100644
--- a/system/Validation/ValidationInterface.php
+++ b/system/Validation/ValidationInterface.php
@@ -27,7 +27,7 @@ interface ValidationInterface
      *
      * @return bool
      */
-    public function run(array $data = null, string $group = null): bool;
+    public function run(?array $data = null, ?string $group = null): bool;
 
     //--------------------------------------------------------------------
 
diff --git a/system/View/Cell.php b/system/View/Cell.php
index c97625a2ef66..65ecc3403b09 100644
--- a/system/View/Cell.php
+++ b/system/View/Cell.php
@@ -77,7 +77,7 @@ public function __construct(CacheInterface $cache)
      *
      * @return string
      */
-    public function render(string $library, $params = null, int $ttl = 0, string $cacheName = null): string
+    public function render(string $library, $params = null, int $ttl = 0, ?string $cacheName = null): string
     {
         [$class, $method] = $this->determineClass($library);
 
diff --git a/system/View/Exceptions/ViewException.php b/system/View/Exceptions/ViewException.php
index 51a9064518f7..a6b96939ea3b 100644
--- a/system/View/Exceptions/ViewException.php
+++ b/system/View/Exceptions/ViewException.php
@@ -35,7 +35,7 @@ public static function forNoCellClass()
         return new static(lang('View.noCellClass'));
     }
 
-    public static function forInvalidCellClass(string $class = null)
+    public static function forInvalidCellClass(?string $class = null)
     {
         return new static(lang('View.invalidCellClass', [$class]));
     }
diff --git a/system/View/Filters.php b/system/View/Filters.php
index c113bf2e21be..8cca244e831d 100644
--- a/system/View/Filters.php
+++ b/system/View/Filters.php
@@ -201,7 +201,7 @@ public static function limit_words($value, int $limit = 100): string
      *
      * @return string
      */
-    public static function local_number($value, string $type = 'decimal', int $precision = 4, string $locale = null): string
+    public static function local_number($value, string $type = 'decimal', int $precision = 4, ?string $locale = null): string
     {
         helper('number');
 
@@ -230,7 +230,7 @@ public static function local_number($value, string $type = 'decimal', int $preci
      *
      * @return string
      */
-    public static function local_currency($value, string $currency, string $locale = null, $fraction = null): string
+    public static function local_currency($value, string $currency, ?string $locale = null, $fraction = null): string
     {
         helper('number');
 
diff --git a/system/View/Parser.php b/system/View/Parser.php
index fc17b868f796..9fb4736a201d 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -68,7 +68,7 @@ class Parser extends View
      * @param bool            $debug
      * @param LoggerInterface $logger
      */
-    public function __construct(ViewConfig $config, string $viewPath = null, $loader = null, bool $debug = null, LoggerInterface $logger = null)
+    public function __construct(ViewConfig $config, ?string $viewPath = null, $loader = null, ?bool $debug = null, ?LoggerInterface $logger = null)
     {
         // Ensure user plugins override core plugins.
         $this->plugins = $config->plugins ?? [];
@@ -90,7 +90,7 @@ public function __construct(ViewConfig $config, string $viewPath = null, $loader
      *
      * @return string
      */
-    public function render(string $view, array $options = null, bool $saveData = null): string
+    public function render(string $view, ?array $options = null, ?bool $saveData = null): string
     {
         $start = microtime(true);
         if ($saveData === null) {
@@ -155,7 +155,7 @@ public function render(string $view, array $options = null, bool $saveData = nul
      *
      * @return string
      */
-    public function renderString(string $template, array $options = null, bool $saveData = null): string
+    public function renderString(string $template, ?array $options = null, ?bool $saveData = null): string
     {
         $start = microtime(true);
         if ($saveData === null) {
@@ -193,7 +193,7 @@ public function renderString(string $template, array $options = null, bool $save
      *
      * @return RendererInterface
      */
-    public function setData(array $data = [], string $context = null): RendererInterface
+    public function setData(array $data = [], ?string $context = null): RendererInterface
     {
         if (! empty($context)) {
             foreach ($data as $key => &$value) {
@@ -229,7 +229,7 @@ public function setData(array $data = [], string $context = null): RendererInter
      *
      * @return string
      */
-    protected function parse(string $template, array $data = [], array $options = null): string
+    protected function parse(string $template, array $data = [], ?array $options = null): string
     {
         if ($template === '') {
             return '';
diff --git a/system/View/RendererInterface.php b/system/View/RendererInterface.php
index 2eb26e8b613d..f2419949b02a 100644
--- a/system/View/RendererInterface.php
+++ b/system/View/RendererInterface.php
@@ -30,7 +30,7 @@ interface RendererInterface
      *
      * @return string
      */
-    public function render(string $view, array $options = null, bool $saveData = false): string;
+    public function render(string $view, ?array $options = null, bool $saveData = false): string;
 
     //--------------------------------------------------------------------
 
@@ -46,7 +46,7 @@ public function render(string $view, array $options = null, bool $saveData = fal
      *
      * @return string
      */
-    public function renderString(string $view, array $options = null, bool $saveData = false): string;
+    public function renderString(string $view, ?array $options = null, bool $saveData = false): string;
 
     //--------------------------------------------------------------------
 
@@ -59,7 +59,7 @@ public function renderString(string $view, array $options = null, bool $saveData
      *
      * @return RendererInterface
      */
-    public function setData(array $data = [], string $context = null);
+    public function setData(array $data = [], ?string $context = null);
 
     //--------------------------------------------------------------------
 
@@ -73,7 +73,7 @@ public function setData(array $data = [], string $context = null);
      *
      * @return RendererInterface
      */
-    public function setVar(string $name, $value = null, string $context = null);
+    public function setVar(string $name, $value = null, ?string $context = null);
 
     //--------------------------------------------------------------------
 
diff --git a/system/View/View.php b/system/View/View.php
index 65f2350e9a9a..28edeeed1aa8 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -143,7 +143,7 @@ class View implements RendererInterface
      * @param bool|null        $debug
      * @param LoggerInterface  $logger
      */
-    public function __construct(ViewConfig $config, string $viewPath = null, FileLocator $loader = null, bool $debug = null, LoggerInterface $logger = null)
+    public function __construct(ViewConfig $config, ?string $viewPath = null, ?FileLocator $loader = null, ?bool $debug = null, ?LoggerInterface $logger = null)
     {
         $this->config   = $config;
         $this->viewPath = rtrim($viewPath, '\\/ ') . DIRECTORY_SEPARATOR;
@@ -171,7 +171,7 @@ public function __construct(ViewConfig $config, string $viewPath = null, FileLoc
      *
      * @return string
      */
-    public function render(string $view, array $options = null, bool $saveData = null): string
+    public function render(string $view, ?array $options = null, ?bool $saveData = null): string
     {
         $this->renderVars['start'] = microtime(true);
 
@@ -286,7 +286,7 @@ public function render(string $view, array $options = null, bool $saveData = nul
      *
      * @return string
      */
-    public function renderString(string $view, array $options = null, bool $saveData = null): string
+    public function renderString(string $view, ?array $options = null, ?bool $saveData = null): string
     {
         $start          = microtime(true);
         $saveData       = $saveData ?? $this->saveData;
@@ -332,7 +332,7 @@ public function excerpt(string $string, int $length = 20): string
      *
      * @return RendererInterface
      */
-    public function setData(array $data = [], string $context = null): RendererInterface
+    public function setData(array $data = [], ?string $context = null): RendererInterface
     {
         if ($context) {
             $data = \esc($data, $context);
@@ -354,7 +354,7 @@ public function setData(array $data = [], string $context = null): RendererInter
      *
      * @return RendererInterface
      */
-    public function setVar(string $name, $value = null, string $context = null): RendererInterface
+    public function setVar(string $name, $value = null, ?string $context = null): RendererInterface
     {
         if ($context) {
             $value = \esc($value, $context);
@@ -469,7 +469,7 @@ public function renderSection(string $sectionName)
      *
      * @return string
      */
-    public function include(string $view, array $options = null, $saveData = true): string
+    public function include(string $view, ?array $options = null, $saveData = true): string
     {
         return $this->render($view, $options, $saveData);
     }
diff --git a/tests/_support/Autoloader/FatalLocator.php b/tests/_support/Autoloader/FatalLocator.php
index e069b6ee4dd1..f2096f21619e 100644
--- a/tests/_support/Autoloader/FatalLocator.php
+++ b/tests/_support/Autoloader/FatalLocator.php
@@ -23,7 +23,7 @@ class FatalLocator extends FileLocator
      *
      * @return false|string The path to the file, or false if not found.
      */
-    public function locateFile(string $file, string $folder = null, string $ext = 'php')
+    public function locateFile(string $file, ?string $folder = null, string $ext = 'php')
     {
         $folder = $folder ?? 'null';
 
diff --git a/tests/_support/Config/Services.php b/tests/_support/Config/Services.php
index ed95ffd40fcc..c798c823a71f 100644
--- a/tests/_support/Config/Services.php
+++ b/tests/_support/Config/Services.php
@@ -22,7 +22,7 @@ class Services extends BaseServices
      *
      * @return URI
      */
-    public static function uri(string $uri = null, bool $getShared = true)
+    public static function uri(?string $uri = null, bool $getShared = true)
     {
         // Intercept our test case
         if ($uri === 'testCanReplaceFrameworkServices') {
diff --git a/tests/_support/Validation/TestRules.php b/tests/_support/Validation/TestRules.php
index 5ea50a564f12..ce0d273b20db 100644
--- a/tests/_support/Validation/TestRules.php
+++ b/tests/_support/Validation/TestRules.php
@@ -4,7 +4,7 @@
 
 class TestRules
 {
-    public function customError(string $str, string &$error = null)
+    public function customError(string $str, ?string &$error = null)
     {
         $error = 'My lovely error';
 
diff --git a/tests/system/Models/GeneralModelTest.php b/tests/system/Models/GeneralModelTest.php
index 5242631b78e8..eef1ba1783cd 100644
--- a/tests/system/Models/GeneralModelTest.php
+++ b/tests/system/Models/GeneralModelTest.php
@@ -43,7 +43,7 @@ protected function tearDown(): void
      *
      * @return Model
      */
-    private function createModel(string $modelName, BaseConnection $db = null): Model
+    private function createModel(string $modelName, ?BaseConnection $db = null): Model
     {
         $this->model = new $modelName($db);
 
diff --git a/tests/system/Models/LiveModelTestCase.php b/tests/system/Models/LiveModelTestCase.php
index f03bda56a1ea..9b92998d1fbd 100644
--- a/tests/system/Models/LiveModelTestCase.php
+++ b/tests/system/Models/LiveModelTestCase.php
@@ -46,7 +46,7 @@ protected function tearDown(): void
      *
      * @return Model
      */
-    protected function createModel(string $modelName, BaseConnection $db = null): Model
+    protected function createModel(string $modelName, ?BaseConnection $db = null): Model
     {
         $this->db    = $db ?? $this->db;
         $this->model = new $modelName($this->db);
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index b97d4c0b0913..e10d40eabb06 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -230,25 +230,26 @@ public function __construct()
                     'yield',
                 ],
             ],
-            'no_unneeded_curly_braces'              => ['namespaces' => true],
-            'no_unneeded_final_method'              => ['private_methods' => true],
-            'no_unreachable_default_argument_value' => true,
-            'no_unset_cast'                         => true,
-            'no_unset_on_property'                  => false,
-            'no_unused_imports'                     => true,
-            'no_useless_else'                       => true,
-            'no_useless_return'                     => true,
-            'no_useless_sprintf'                    => true,
-            'no_whitespace_before_comma_in_array'   => ['after_heredoc' => true],
-            'no_whitespace_in_blank_line'           => true,
-            'non_printable_character'               => ['use_escape_sequences_in_strings' => true],
-            'normalize_index_brace'                 => true,
-            'not_operator_with_space'               => false,
-            'not_operator_with_successor_space'     => true,
-            'object_operator_without_whitespace'    => true,
-            'operator_linebreak'                    => ['only_booleans' => true, 'position' => 'beginning'],
-            'ordered_class_elements'                => false,
-            'ordered_imports'                       => [
+            'no_unneeded_curly_braces'                         => ['namespaces' => true],
+            'no_unneeded_final_method'                         => ['private_methods' => true],
+            'no_unreachable_default_argument_value'            => true,
+            'no_unset_cast'                                    => true,
+            'no_unset_on_property'                             => false,
+            'no_unused_imports'                                => true,
+            'no_useless_else'                                  => true,
+            'no_useless_return'                                => true,
+            'no_useless_sprintf'                               => true,
+            'no_whitespace_before_comma_in_array'              => ['after_heredoc' => true],
+            'no_whitespace_in_blank_line'                      => true,
+            'non_printable_character'                          => ['use_escape_sequences_in_strings' => true],
+            'normalize_index_brace'                            => true,
+            'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
+            'not_operator_with_space'                          => false,
+            'not_operator_with_successor_space'                => true,
+            'object_operator_without_whitespace'               => true,
+            'operator_linebreak'                               => ['only_booleans' => true, 'position' => 'beginning'],
+            'ordered_class_elements'                           => false,
+            'ordered_imports'                                  => [
                 'sort_algorithm' => 'alpha',
                 'imports_order'  => ['class', 'function', 'const'],
             ],

From ac19c85ed001b4cbe4705271ee47128653f5d2e6 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sun, 11 Jul 2021 07:31:21 +0700
Subject: [PATCH 0076/2325] [Rector] Re-run InlineIfToExplicitIfRector on
 Latest Rector 0.11.36

---
 composer.json                                 |  4 +--
 rector.php                                    |  4 +++
 system/CodeIgniter.php                        |  8 +++--
 system/Database/BaseResult.php                | 16 +++++++---
 system/Database/Forge.php                     | 10 +++---
 system/Database/MySQLi/Connection.php         |  5 +--
 system/Database/Postgre/Connection.php        |  4 ++-
 system/Email/Email.php                        |  4 ++-
 system/Session/Handlers/MemcachedHandler.php  |  4 ++-
 system/Session/Handlers/RedisHandler.php      |  4 ++-
 .../system/Commands/CommandGeneratorTest.php  |  8 +++--
 tests/system/Commands/ConfigGeneratorTest.php |  4 ++-
 .../Commands/ConfigurableSortImportsTest.php  | 20 +++++++++---
 .../Commands/ControllerGeneratorTest.php      |  4 ++-
 tests/system/Commands/EntityGeneratorTest.php |  8 +++--
 tests/system/Commands/FilterGeneratorTest.php |  4 ++-
 tests/system/Commands/GeneratorsTest.php      | 32 ++++++++++++++-----
 .../Commands/MigrationGeneratorTest.php       |  4 ++-
 tests/system/Commands/ModelGeneratorTest.php  | 16 +++++++---
 tests/system/Commands/SeederGeneratorTest.php |  4 ++-
 .../system/Commands/SessionsCommandsTest.php  |  4 ++-
 .../Commands/ValidationGeneratorTest.php      |  8 +++--
 tests/system/HTTP/Files/FileMovingTest.php    | 24 ++++++++++----
 23 files changed, 150 insertions(+), 53 deletions(-)

diff --git a/composer.json b/composer.json
index 2cf15f4e86ed..ef116fc0887e 100644
--- a/composer.json
+++ b/composer.json
@@ -20,10 +20,10 @@
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.1",
         "nexusphp/tachycardia": "^1.0",
-        "phpstan/phpstan": "0.12.90",
+        "phpstan/phpstan": "0.12.91",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.35",
+        "rector/rector": "0.11.36",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {
diff --git a/rector.php b/rector.php
index ec64a2c38292..bc01a45eb11f 100644
--- a/rector.php
+++ b/rector.php
@@ -61,6 +61,10 @@
         PassStrictParameterToFunctionParameterRector::class => [__DIR__ . '/tests/system/Database/Live/SelectTest.php'],
         JsonThrowOnErrorRector::class,
         StringifyStrNeedlesRector::class,
+        InlineIfToExplicitIfRector::class => [
+            __DIR__ . '/app/Config',
+            __DIR__ . '/system/Test/bootstrap.php',
+        ],
     ]);
 
     // auto import fully qualified class names
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index a9b23821a7c1..57857bc63ed3 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -239,7 +239,9 @@ protected function initializeKint()
 
                 $file = SYSTEMPATH . 'ThirdParty/Kint/' . implode('/', $class) . '.php';
 
-                file_exists($file) && require_once $file;
+                if (file_exists($file)) {
+                    require_once $file;
+                }
             });
 
             require_once SYSTEMPATH . 'ThirdParty/Kint/init.php';
@@ -476,7 +478,9 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
     protected function detectEnvironment()
     {
         // Make sure ENVIRONMENT isn't already set by other means.
-        defined('ENVIRONMENT') || define('ENVIRONMENT', $_SERVER['CI_ENVIRONMENT'] ?? 'production'); // @codeCoverageIgnore
+        if (!defined('ENVIRONMENT')) {
+            define('ENVIRONMENT', $_SERVER['CI_ENVIRONMENT'] ?? 'production');
+        } // @codeCoverageIgnore
     }
 
     //--------------------------------------------------------------------
diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php
index b7de79e39490..7b558886cbfb 100644
--- a/system/Database/BaseResult.php
+++ b/system/Database/BaseResult.php
@@ -151,7 +151,9 @@ public function getCustomResultObject(string $className)
             return $this->customResultObject[$className];
         }
 
-        $this->rowData === null || $this->dataSeek();
+        if ($this->rowData !== null) {
+            $this->dataSeek();
+        }
         $this->customResultObject[$className] = [];
 
         while ($row = $this->fetchObject($className)) {
@@ -196,7 +198,9 @@ public function getResultArray(): array
             return $this->resultArray;
         }
 
-        $this->rowData === null || $this->dataSeek();
+        if ($this->rowData !== null) {
+            $this->dataSeek();
+        }
 
         while ($row = $this->fetchAssoc()) {
             $this->resultArray[] = $row;
@@ -235,7 +239,9 @@ public function getResultObject(): array
             return $this->resultObject;
         }
 
-        $this->rowData === null || $this->dataSeek();
+        if ($this->rowData !== null) {
+            $this->dataSeek();
+        }
 
         while ($row = $this->fetchObject()) {
             if (! is_subclass_of($row, Entity::class) && method_exists($row, 'syncOriginal')) {
@@ -303,7 +309,9 @@ public function getRow($n = 0, string $type = 'object')
      */
     public function getCustomRowObject(int $n, string $className)
     {
-        isset($this->customResultObject[$className]) || $this->getCustomResultObject($className);
+        if (!isset($this->customResultObject[$className])) {
+            $this->getCustomResultObject($className);
+        }
 
         if (empty($this->customResultObject[$className])) {
             return null;
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 31b45498b118..62efaf9720a5 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -905,8 +905,9 @@ protected function _processFields(bool $createTable = false): array
                 continue;
             }
 
-            // @phpstan-ignore-next-line
-            isset($attributes['TYPE']) && $this->_attributeType($attributes);
+            if (isset($attributes['TYPE'])) {
+                $this->_attributeType($attributes);
+            }
 
             $field = [
                 'name'           => $key,
@@ -921,8 +922,9 @@ protected function _processFields(bool $createTable = false): array
                 '_literal'       => false,
             ];
 
-            // @phpstan-ignore-next-line
-            isset($attributes['TYPE']) && $this->_attributeUnsigned($attributes, $field);
+            if (isset($attributes['TYPE'])) {
+                $this->_attributeUnsigned($attributes, $field);
+            }
 
             if ($createTable === false) {
                 if (isset($attributes['AFTER'])) {
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
index 37d3f38b0f57..cb7bff2efd8a 100644
--- a/system/Database/MySQLi/Connection.php
+++ b/system/Database/MySQLi/Connection.php
@@ -136,8 +136,9 @@ public function connect(bool $persistent = false)
             if (! empty($ssl)) {
                 if (isset($this->encrypt['ssl_verify'])) {
                     if ($this->encrypt['ssl_verify']) {
-                        defined('MYSQLI_OPT_SSL_VERIFY_SERVER_CERT')
-                        && $this->mysqli->options(MYSQLI_OPT_SSL_VERIFY_SERVER_CERT, 1);
+                        if (defined('MYSQLI_OPT_SSL_VERIFY_SERVER_CERT')) {
+                            $this->mysqli->options(MYSQLI_OPT_SSL_VERIFY_SERVER_CERT, 1);
+                        }
                     }
                     // Apparently (when it exists), setting MYSQLI_OPT_SSL_VERIFY_SERVER_CERT
                     // to FALSE didn't do anything, so PHP 5.6.16 introduced yet another
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
index 3012a769491b..dda54ca0bdd3 100644
--- a/system/Database/Postgre/Connection.php
+++ b/system/Database/Postgre/Connection.php
@@ -75,7 +75,9 @@ public function connect(bool $persistent = false)
                 return false;
             }
 
-            empty($this->schema) || $this->simpleQuery("SET search_path TO {$this->schema},public");
+            if (!empty($this->schema)) {
+                $this->simpleQuery("SET search_path TO {$this->schema},public");
+            }
 
             if ($this->setClientEncoding($this->charset) === false) {
                 return false;
diff --git a/system/Email/Email.php b/system/Email/Email.php
index 87b4a0cd40a3..788400c9878d 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -2256,7 +2256,9 @@ protected function mimeTypes($ext = '')
      */
     public function __destruct()
     {
-        is_resource($this->SMTPConnect) && $this->sendCommand('quit');
+        if (is_resource($this->SMTPConnect)) {
+            $this->sendCommand('quit');
+        }
     }
 
     /**
diff --git a/system/Session/Handlers/MemcachedHandler.php b/system/Session/Handlers/MemcachedHandler.php
index 8bdc68f55464..475a1efde386 100644
--- a/system/Session/Handlers/MemcachedHandler.php
+++ b/system/Session/Handlers/MemcachedHandler.php
@@ -219,7 +219,9 @@ public function write($sessionID, $sessionData): bool
     public function close(): bool
     {
         if (isset($this->memcached)) {
-            isset($this->lockKey) && $this->memcached->delete($this->lockKey);
+            if (isset($this->lockKey)) {
+                $this->memcached->delete($this->lockKey);
+            }
 
             if (! $this->memcached->quit()) {
                 return false;
diff --git a/system/Session/Handlers/RedisHandler.php b/system/Session/Handlers/RedisHandler.php
index e937fd83eb6c..eec6fb307907 100644
--- a/system/Session/Handlers/RedisHandler.php
+++ b/system/Session/Handlers/RedisHandler.php
@@ -231,7 +231,9 @@ public function close(): bool
                 $pingReply = $this->redis->ping();
                 // @phpstan-ignore-next-line
                 if (($pingReply === true) || ($pingReply === '+PONG')) {
-                    isset($this->lockKey) && $this->redis->del($this->lockKey);
+                    if (isset($this->lockKey)) {
+                        $this->redis->del($this->lockKey);
+                    }
 
                     if (! $this->redis->close()) {
                         return false;
diff --git a/tests/system/Commands/CommandGeneratorTest.php b/tests/system/Commands/CommandGeneratorTest.php
index 3dbfcdb96d70..231914487af2 100644
--- a/tests/system/Commands/CommandGeneratorTest.php
+++ b/tests/system/Commands/CommandGeneratorTest.php
@@ -28,8 +28,12 @@ protected function tearDown(): void
         $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
         $dir    = dirname($file);
 
-        is_file($file) && unlink($file);
-        is_dir($dir) && strpos($dir, 'Commands') !== false && rmdir($dir);
+        if (is_file($file)) {
+            unlink($file);
+        }
+        if (is_dir($dir) && strpos($dir, 'Commands') !== false) {
+            rmdir($dir);
+        }
     }
 
     protected function getFileContents(string $filepath): string
diff --git a/tests/system/Commands/ConfigGeneratorTest.php b/tests/system/Commands/ConfigGeneratorTest.php
index 1469ff7e721b..8cb991e7e42d 100644
--- a/tests/system/Commands/ConfigGeneratorTest.php
+++ b/tests/system/Commands/ConfigGeneratorTest.php
@@ -26,7 +26,9 @@ protected function tearDown(): void
 
         $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
         $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-        is_file($file) && unlink($file);
+        if (is_file($file)) {
+            unlink($file);
+        }
     }
 
     public function testGenerateConfig()
diff --git a/tests/system/Commands/ConfigurableSortImportsTest.php b/tests/system/Commands/ConfigurableSortImportsTest.php
index 1c4cceeb455b..788738899c8b 100644
--- a/tests/system/Commands/ConfigurableSortImportsTest.php
+++ b/tests/system/Commands/ConfigurableSortImportsTest.php
@@ -35,7 +35,9 @@ public function testPublishLanguageWithoutOptions()
         $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
         $this->assertFileExists($file);
         $this->assertNotSame(sha1_file(SUPPORTPATH . 'Commands/Foobar.php'), sha1_file($file));
-        is_file($file) && unlink($file);
+        if (is_file($file)) {
+            unlink($file);
+        }
     }
 
     public function testEnabledSortImportsWillDisruptLanguageFilePublish()
@@ -46,9 +48,13 @@ public function testEnabledSortImportsWillDisruptLanguageFilePublish()
         $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
         $this->assertFileExists($file);
         $this->assertNotSame(sha1_file(SUPPORTPATH . 'Commands/Foobar.php'), sha1_file($file));
-        is_file($file) && unlink($file);
+        if (is_file($file)) {
+            unlink($file);
+        }
         $dir = dirname($file);
-        is_dir($dir) && rmdir($dir);
+        if (is_dir($dir)) {
+            rmdir($dir);
+        }
     }
 
     public function testDisabledSortImportsWillNotAffectLanguageFilesPublish()
@@ -59,8 +65,12 @@ public function testDisabledSortImportsWillNotAffectLanguageFilesPublish()
         $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
         $this->assertFileExists($file);
         $this->assertSame(sha1_file(SUPPORTPATH . 'Commands/Foobar.php'), sha1_file($file));
-        is_file($file) && unlink($file);
+        if (is_file($file)) {
+            unlink($file);
+        }
         $dir = dirname($file);
-        is_dir($dir) && rmdir($dir);
+        if (is_dir($dir)) {
+            rmdir($dir);
+        }
     }
 }
diff --git a/tests/system/Commands/ControllerGeneratorTest.php b/tests/system/Commands/ControllerGeneratorTest.php
index 2221ae95ca27..06780051c575 100644
--- a/tests/system/Commands/ControllerGeneratorTest.php
+++ b/tests/system/Commands/ControllerGeneratorTest.php
@@ -26,7 +26,9 @@ protected function tearDown(): void
 
         $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
         $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-        is_file($file) && unlink($file);
+        if (is_file($file)) {
+            unlink($file);
+        }
     }
 
     protected function getFileContents(string $filepath): string
diff --git a/tests/system/Commands/EntityGeneratorTest.php b/tests/system/Commands/EntityGeneratorTest.php
index 9489a8c9e539..267cfa0c681e 100644
--- a/tests/system/Commands/EntityGeneratorTest.php
+++ b/tests/system/Commands/EntityGeneratorTest.php
@@ -27,8 +27,12 @@ protected function tearDown(): void
         $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
         $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
         $dir    = dirname($file);
-        is_file($file) && unlink($file);
-        is_dir($dir) && rmdir($dir);
+        if (is_file($file)) {
+            unlink($file);
+        }
+        if (is_dir($dir)) {
+            rmdir($dir);
+        }
     }
 
     public function testGenerateEntity()
diff --git a/tests/system/Commands/FilterGeneratorTest.php b/tests/system/Commands/FilterGeneratorTest.php
index 2f53aba8a090..c8a55b282ec3 100644
--- a/tests/system/Commands/FilterGeneratorTest.php
+++ b/tests/system/Commands/FilterGeneratorTest.php
@@ -26,7 +26,9 @@ protected function tearDown(): void
 
         $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
         $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-        is_file($file) && unlink($file);
+        if (is_file($file)) {
+            unlink($file);
+        }
     }
 
     public function testGenerateFilter()
diff --git a/tests/system/Commands/GeneratorsTest.php b/tests/system/Commands/GeneratorsTest.php
index e6ae7bdec504..3adb0fe9788c 100644
--- a/tests/system/Commands/GeneratorsTest.php
+++ b/tests/system/Commands/GeneratorsTest.php
@@ -30,7 +30,9 @@ public function testGenerateFileCreated()
         command('make:seeder categories');
         $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
         $file = APPPATH . 'Database/Seeds/Categories.php';
-        is_file($file) && unlink($file);
+        if (is_file($file)) {
+            unlink($file);
+        }
     }
 
     public function testGenerateFileExists()
@@ -41,7 +43,9 @@ public function testGenerateFileExists()
         command('make:filter items');
         $this->assertStringContainsString('File exists: ', CITestStreamFilter::$buffer);
         $file = APPPATH . 'Filters/Items.php';
-        is_file($file) && unlink($file);
+        if (is_file($file)) {
+            unlink($file);
+        }
     }
 
     public function testGenerateFileOverwritten()
@@ -52,7 +56,9 @@ public function testGenerateFileOverwritten()
         command('make:controller products -force');
         $this->assertStringContainsString('File overwritten: ', CITestStreamFilter::$buffer);
         $file = APPPATH . 'Controllers/Products.php';
-        is_file($file) && unlink($file);
+        if (is_file($file)) {
+            unlink($file);
+        }
     }
 
     public function testGenerateFileFailsOnUnwritableDirectory()
@@ -82,8 +88,12 @@ public function testGenerateFileInSubfolders()
         $dir  = dirname($file);
         $this->assertFileExists($file);
         $this->assertDirectoryExists($dir);
-        is_file($file) && unlink($file);
-        is_dir($dir) && rmdir($dir);
+        if (is_file($file)) {
+            unlink($file);
+        }
+        if (is_dir($dir)) {
+            rmdir($dir);
+        }
     }
 
     public function testSuffixingHasNoEffect(): void
@@ -96,8 +106,14 @@ public function testSuffixingHasNoEffect(): void
         $this->assertFileExists($file1);
         $this->assertFileDoesNotExist($file2);
 
-        is_file($file1) && unlink($file1);
-        is_file($file2) && unlink($file2);
-        is_dir($dir) && rmdir($dir);
+        if (is_file($file1)) {
+            unlink($file1);
+        }
+        if (is_file($file2)) {
+            unlink($file2);
+        }
+        if (is_dir($dir)) {
+            rmdir($dir);
+        }
     }
 }
diff --git a/tests/system/Commands/MigrationGeneratorTest.php b/tests/system/Commands/MigrationGeneratorTest.php
index 00e67ecf9219..59b501c19d9b 100644
--- a/tests/system/Commands/MigrationGeneratorTest.php
+++ b/tests/system/Commands/MigrationGeneratorTest.php
@@ -26,7 +26,9 @@ protected function tearDown(): void
 
         $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
         $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-        file_exists($file) && unlink($file);
+        if (file_exists($file)) {
+            unlink($file);
+        }
     }
 
     public function testGenerateMigration()
diff --git a/tests/system/Commands/ModelGeneratorTest.php b/tests/system/Commands/ModelGeneratorTest.php
index c57d1f2aeadd..dc58f6a86322 100644
--- a/tests/system/Commands/ModelGeneratorTest.php
+++ b/tests/system/Commands/ModelGeneratorTest.php
@@ -26,7 +26,9 @@ protected function tearDown(): void
 
         $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
         $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-        is_file($file) && unlink($file);
+        if (is_file($file)) {
+            unlink($file);
+        }
     }
 
     protected function getFileContent(string $filepath): string
@@ -93,12 +95,18 @@ public function testGenerateModelWithOptionReturnEntity()
         $file = APPPATH . 'Models/User.php';
         $this->assertFileExists($file);
         $this->assertStringContainsString('protected $returnType           = \'App\Entities\User\';', $this->getFileContent($file));
-        is_file($file) && unlink($file);
+        if (is_file($file)) {
+            unlink($file);
+        }
         $file = APPPATH . 'Entities/User.php';
         $this->assertFileExists($file);
         $dir = dirname($file);
-        is_file($file) && unlink($file);
-        is_dir($dir) && rmdir($dir);
+        if (is_file($file)) {
+            unlink($file);
+        }
+        if (is_dir($dir)) {
+            rmdir($dir);
+        }
     }
 
     public function testGenerateModelWithOptionSuffix()
diff --git a/tests/system/Commands/SeederGeneratorTest.php b/tests/system/Commands/SeederGeneratorTest.php
index d6be637fe710..fb9ecfd37823 100644
--- a/tests/system/Commands/SeederGeneratorTest.php
+++ b/tests/system/Commands/SeederGeneratorTest.php
@@ -26,7 +26,9 @@ protected function tearDown(): void
 
         $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
         $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-        file_exists($file) && unlink($file);
+        if (file_exists($file)) {
+            unlink($file);
+        }
     }
 
     public function testGenerateSeeder()
diff --git a/tests/system/Commands/SessionsCommandsTest.php b/tests/system/Commands/SessionsCommandsTest.php
index d218911df835..1ffd447af649 100644
--- a/tests/system/Commands/SessionsCommandsTest.php
+++ b/tests/system/Commands/SessionsCommandsTest.php
@@ -28,7 +28,9 @@ protected function tearDown(): void
 
         $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
         $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-        file_exists($file) && unlink($file);
+        if (file_exists($file)) {
+            unlink($file);
+        }
     }
 
     public function testCreateMigrationCommand()
diff --git a/tests/system/Commands/ValidationGeneratorTest.php b/tests/system/Commands/ValidationGeneratorTest.php
index 32c9b12e6e3c..9f21ac97f900 100644
--- a/tests/system/Commands/ValidationGeneratorTest.php
+++ b/tests/system/Commands/ValidationGeneratorTest.php
@@ -27,8 +27,12 @@ protected function tearDown(): void
         $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
         $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
         $dir    = dirname($file);
-        is_file($file) && unlink($file);
-        is_dir($dir) && rmdir($dir);
+        if (is_file($file)) {
+            unlink($file);
+        }
+        if (is_dir($dir)) {
+            rmdir($dir);
+        }
     }
 
     public function testGenerateValidation()
diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php
index 94ec312f0068..29b19018dd1c 100644
--- a/tests/system/HTTP/Files/FileMovingTest.php
+++ b/tests/system/HTTP/Files/FileMovingTest.php
@@ -71,7 +71,9 @@ public function testMove()
         $destination = $this->destination;
 
         // Create the destination if not exists
-        is_dir($destination) || mkdir($destination, 0777, true);
+        if (!is_dir($destination)) {
+            mkdir($destination, 0777, true);
+        }
 
         foreach ($collection->all() as $file) {
             $this->assertInstanceOf(UploadedFile::class, $file);
@@ -121,7 +123,9 @@ public function testMoveOverwriting()
         $destination = $this->destination;
 
         // Create the destination if not exists
-        is_dir($destination) || mkdir($destination, 0777, true);
+        if (!is_dir($destination)) {
+            mkdir($destination, 0777, true);
+        }
 
         foreach ($collection->all() as $file) {
             $this->assertInstanceOf(UploadedFile::class, $file);
@@ -157,7 +161,9 @@ public function testMoved()
         $destination = $this->destination;
 
         // Create the destination if not exists
-        is_dir($destination) || mkdir($destination, 0777, true);
+        if (!is_dir($destination)) {
+            mkdir($destination, 0777, true);
+        }
 
         $file = $collection->getFile('userfile1');
 
@@ -190,7 +196,9 @@ public function testStore()
         $destination = $this->destination;
 
         // Create the destination if not exists
-        is_dir($destination) || mkdir($destination, 0777, true);
+        if (!is_dir($destination)) {
+            mkdir($destination, 0777, true);
+        }
 
         $file = $collection->getFile('userfile1');
 
@@ -222,7 +230,9 @@ public function testAlreadyMoved()
         $destination = $this->destination;
 
         // Create the destination if not exists
-        is_dir($destination) || mkdir($destination, 0777, true);
+        if (!is_dir($destination)) {
+            mkdir($destination, 0777, true);
+        }
 
         $this->expectException(HTTPException::class);
 
@@ -272,7 +282,9 @@ public function testFailedMove()
         $destination = $this->destination;
 
         // Create the destination and make it read only
-        is_dir($destination) || mkdir($destination, 0400, true);
+        if (!is_dir($destination)) {
+            mkdir($destination, 0400, true);
+        }
 
         $collection = new FileCollection();
         $file       = $collection->getFile('userfile');

From c9414b885eba873c5d8a6cc5861855f58111bccf Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sun, 11 Jul 2021 07:38:24 +0700
Subject: [PATCH 0077/2325] move * // @codeCoverageIgnore to method comment

---
 system/CodeIgniter.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 57857bc63ed3..ced5b62defe9 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -474,13 +474,15 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
      *     development
      *     testing
      *     production
+     *
+     * @codeCoverageIgnore
      */
     protected function detectEnvironment()
     {
         // Make sure ENVIRONMENT isn't already set by other means.
         if (!defined('ENVIRONMENT')) {
             define('ENVIRONMENT', $_SERVER['CI_ENVIRONMENT'] ?? 'production');
-        } // @codeCoverageIgnore
+        }
     }
 
     //--------------------------------------------------------------------

From 34735f5044c786479cd23c988090bba7cd8fb66e Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sun, 11 Jul 2021 07:39:57 +0700
Subject: [PATCH 0078/2325] run cs fix

---
 system/CodeIgniter.php                     |  2 +-
 system/Database/BaseResult.php             |  2 +-
 system/Database/Postgre/Connection.php     |  2 +-
 tests/_support/Commands/Foobar.php         | 10 +++++-----
 tests/system/HTTP/Files/FileMovingTest.php | 12 ++++++------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index ced5b62defe9..84d308e7196a 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -480,7 +480,7 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
     protected function detectEnvironment()
     {
         // Make sure ENVIRONMENT isn't already set by other means.
-        if (!defined('ENVIRONMENT')) {
+        if (! defined('ENVIRONMENT')) {
             define('ENVIRONMENT', $_SERVER['CI_ENVIRONMENT'] ?? 'production');
         }
     }
diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php
index 7b558886cbfb..acceb5e85b28 100644
--- a/system/Database/BaseResult.php
+++ b/system/Database/BaseResult.php
@@ -309,7 +309,7 @@ public function getRow($n = 0, string $type = 'object')
      */
     public function getCustomRowObject(int $n, string $className)
     {
-        if (!isset($this->customResultObject[$className])) {
+        if (! isset($this->customResultObject[$className])) {
             $this->getCustomResultObject($className);
         }
 
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
index dda54ca0bdd3..6f7fb859fbc8 100644
--- a/system/Database/Postgre/Connection.php
+++ b/system/Database/Postgre/Connection.php
@@ -75,7 +75,7 @@ public function connect(bool $persistent = false)
                 return false;
             }
 
-            if (!empty($this->schema)) {
+            if (! empty($this->schema)) {
                 $this->simpleQuery("SET search_path TO {$this->schema},public");
             }
 
diff --git a/tests/_support/Commands/Foobar.php b/tests/_support/Commands/Foobar.php
index 1479c68ffa22..c759d6f0933e 100644
--- a/tests/_support/Commands/Foobar.php
+++ b/tests/_support/Commands/Foobar.php
@@ -1,11 +1,11 @@
 <?php
 
-use Config\App;
 use CodeIgniter\CLI\CLI;
+use Config\App;
 
 return [
-   'foo' => 'The command will use this as foo.',
-   'bar' => 'The command will use this as bar.',
-   'baz' => 'The baz is here.',
-   'bas' => CLI::color('bas', 'green') . (new App())->baseURL,
+    'foo' => 'The command will use this as foo.',
+    'bar' => 'The command will use this as bar.',
+    'baz' => 'The baz is here.',
+    'bas' => CLI::color('bas', 'green') . (new App())->baseURL,
 ];
diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php
index 29b19018dd1c..3870fc45a7a2 100644
--- a/tests/system/HTTP/Files/FileMovingTest.php
+++ b/tests/system/HTTP/Files/FileMovingTest.php
@@ -71,7 +71,7 @@ public function testMove()
         $destination = $this->destination;
 
         // Create the destination if not exists
-        if (!is_dir($destination)) {
+        if (! is_dir($destination)) {
             mkdir($destination, 0777, true);
         }
 
@@ -123,7 +123,7 @@ public function testMoveOverwriting()
         $destination = $this->destination;
 
         // Create the destination if not exists
-        if (!is_dir($destination)) {
+        if (! is_dir($destination)) {
             mkdir($destination, 0777, true);
         }
 
@@ -161,7 +161,7 @@ public function testMoved()
         $destination = $this->destination;
 
         // Create the destination if not exists
-        if (!is_dir($destination)) {
+        if (! is_dir($destination)) {
             mkdir($destination, 0777, true);
         }
 
@@ -196,7 +196,7 @@ public function testStore()
         $destination = $this->destination;
 
         // Create the destination if not exists
-        if (!is_dir($destination)) {
+        if (! is_dir($destination)) {
             mkdir($destination, 0777, true);
         }
 
@@ -230,7 +230,7 @@ public function testAlreadyMoved()
         $destination = $this->destination;
 
         // Create the destination if not exists
-        if (!is_dir($destination)) {
+        if (! is_dir($destination)) {
             mkdir($destination, 0777, true);
         }
 
@@ -282,7 +282,7 @@ public function testFailedMove()
         $destination = $this->destination;
 
         // Create the destination and make it read only
-        if (!is_dir($destination)) {
+        if (! is_dir($destination)) {
             mkdir($destination, 0400, true);
         }
 

From ef3bbb9cd8f82adfa48f20e5d4b8afb9064d96e0 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sun, 11 Jul 2021 10:40:00 +0700
Subject: [PATCH 0079/2325] undo Foobar.php _support

---
 tests/_support/Commands/Foobar.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/_support/Commands/Foobar.php b/tests/_support/Commands/Foobar.php
index c759d6f0933e..32d3c3e6b5b1 100644
--- a/tests/_support/Commands/Foobar.php
+++ b/tests/_support/Commands/Foobar.php
@@ -1,11 +1,11 @@
 <?php
 
-use CodeIgniter\CLI\CLI;
 use Config\App;
+use CodeIgniter\CLI\CLI;
 
 return [
-    'foo' => 'The command will use this as foo.',
-    'bar' => 'The command will use this as bar.',
-    'baz' => 'The baz is here.',
-    'bas' => CLI::color('bas', 'green') . (new App())->baseURL,
-];
+   'foo' => 'The command will use this as foo.',
+   'bar' => 'The command will use this as bar.',
+   'baz' => 'The baz is here.',
+   'bas' => CLI::color('bas', 'green') . (new App())->baseURL,
+];
\ No newline at end of file

From e6836d2f4e18839f38fc2400f203962c13705a32 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sun, 11 Jul 2021 10:40:37 +0700
Subject: [PATCH 0080/2325] eol

---
 tests/_support/Commands/Foobar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/_support/Commands/Foobar.php b/tests/_support/Commands/Foobar.php
index 32d3c3e6b5b1..1479c68ffa22 100644
--- a/tests/_support/Commands/Foobar.php
+++ b/tests/_support/Commands/Foobar.php
@@ -8,4 +8,4 @@
    'bar' => 'The command will use this as bar.',
    'baz' => 'The baz is here.',
    'bas' => CLI::color('bas', 'green') . (new App())->baseURL,
-];
\ No newline at end of file
+];

From 7843c24c748cd9b9a41b0b08e407761cac2ab01a Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 9 Jul 2021 02:04:01 +0800
Subject: [PATCH 0081/2325] Define last "s" rules

---
 tests/_support/Entity/Cast/CastBase64.php | 2 +-
 tests/_support/Models/EventModel.php      | 2 +-
 tests/system/Database/Live/SelectTest.php | 4 ++--
 utils/PhpCsFixer/CodeIgniter4.php         | 5 +++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tests/_support/Entity/Cast/CastBase64.php b/tests/_support/Entity/Cast/CastBase64.php
index 08e6a50aaacb..ba4c919faa3c 100644
--- a/tests/_support/Entity/Cast/CastBase64.php
+++ b/tests/_support/Entity/Cast/CastBase64.php
@@ -16,7 +16,7 @@ class CastBase64 extends BaseCast
      */
     public static function get($value, array $params = []): string
     {
-        return base64_decode($value);
+        return base64_decode($value, true);
     }
 
     /**
diff --git a/tests/_support/Models/EventModel.php b/tests/_support/Models/EventModel.php
index 7f69c7076de0..118c6d5e703d 100644
--- a/tests/_support/Models/EventModel.php
+++ b/tests/_support/Models/EventModel.php
@@ -110,6 +110,6 @@ protected function afterFindMethod(array $data)
 
     public function hasToken(string $token)
     {
-        return in_array($token, $this->tokens);
+        return in_array($token, $this->tokens, true);
     }
 }
diff --git a/tests/system/Database/Live/SelectTest.php b/tests/system/Database/Live/SelectTest.php
index 5572ee757180..2c7f4b6559ae 100644
--- a/tests/system/Database/Live/SelectTest.php
+++ b/tests/system/Database/Live/SelectTest.php
@@ -143,7 +143,7 @@ public function testSelectWithMultipleWheresOnSameColumn()
         $this->assertCount(3, $users);
 
         foreach ($users as $user) {
-            $this->assertTrue(in_array($user['id'], [1, 2, 3]));
+            $this->assertContains((int) $user['id'], [1, 2, 3]);
         }
     }
 
@@ -161,7 +161,7 @@ public function testSelectWithMultipleWheresOnSameColumnAgain()
         $this->assertCount(3, $users);
 
         foreach ($users as $user) {
-            $this->assertTrue(in_array($user['id'], [1, 2, 3]));
+            $this->assertContains((int) $user['id'], [1, 2, 3]);
         }
     }
 }
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 2ade4e40568f..4b2327028c0d 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -459,8 +459,13 @@ public function __construct()
                 ],
             ],
             'single_trait_insert_per_statement' => true,
+            'space_after_semicolon'             => ['remove_in_empty_for_expressions' => true],
             'standardize_increment'             => true,
+            'standardize_not_equals'            => true,
             'static_lambda'                     => true,
+            'strict_comparison'                 => true,
+            'strict_param'                      => true,
+            'string_line_ending'                => true,
             'switch_case_semicolon_to_colon'    => true,
             'switch_case_space'                 => true,
             'switch_continue_to_break'          => true,

From d4afbec8c019309a7071a6fa893a22308697de15 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 9 Jul 2021 01:07:05 +0800
Subject: [PATCH 0082/2325] Enable `self_accessor` and `self_static_accessor`
 fixers

---
 system/CLI/CLI.php                          |  6 +-
 system/Debug/Toolbar.php                    |  2 +-
 system/Entity/Entity.php                    |  6 +-
 system/Files/File.php                       |  2 +-
 system/HTTP/URI.php                         |  2 +-
 system/I18n/Time.php                        | 38 +++++------
 system/Pager/Pager.php                      |  2 +-
 system/Validation/ValidationInterface.php   |  8 +--
 tests/system/Validation/FormatRulesTest.php | 72 ++++++++++-----------
 utils/PhpCsFixer/CodeIgniter4.php           |  2 +
 10 files changed, 71 insertions(+), 69 deletions(-)

diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index 304e3214d33c..1ee314a655fc 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -768,11 +768,11 @@ public static function wrap(?string $string = null, int $max = 0, int $padLeft =
         }
 
         if ($max === 0) {
-            $max = CLI::getWidth();
+            $max = self::getWidth();
         }
 
-        if (CLI::getWidth() < $max) {
-            $max = CLI::getWidth();
+        if (self::getWidth() < $max) {
+            $max = self::getWidth();
         }
 
         $max = $max - $padLeft;
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 915ecb0d102c..a3b4057fb7d7 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -319,7 +319,7 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
                 return;
             }
 
-            $toolbar = Services::toolbar(config(Toolbar::class));
+            $toolbar = Services::toolbar(config(self::class));
             $stats   = $app->getPerformanceStats();
             $data    = $toolbar->run(
                 $stats['startTime'],
diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index c2c239875d1c..1ecbec0d8667 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -179,7 +179,7 @@ public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recu
             $return[$key] = $this->__get($key);
 
             if ($recursive) {
-                if ($return[$key] instanceof Entity) {
+                if ($return[$key] instanceof self) {
                     $return[$key] = $return[$key]->toArray($onlyChanged, $cast, $recursive);
                 } elseif (is_callable([$return[$key], 'toArray'])) {
                     $return[$key] = $return[$key]->toArray();
@@ -207,7 +207,7 @@ public function toRawArray(bool $onlyChanged = false, bool $recursive = false):
         if (! $onlyChanged) {
             if ($recursive) {
                 return array_map(static function ($value) use ($onlyChanged, $recursive) {
-                    if ($value instanceof Entity) {
+                    if ($value instanceof self) {
                         $value = $value->toRawArray($onlyChanged, $recursive);
                     } elseif (is_callable([$value, 'toRawArray'])) {
                         $value = $value->toRawArray();
@@ -226,7 +226,7 @@ public function toRawArray(bool $onlyChanged = false, bool $recursive = false):
             }
 
             if ($recursive) {
-                if ($value instanceof Entity) {
+                if ($value instanceof self) {
                     $value = $value->toRawArray($onlyChanged, $recursive);
                 } elseif (is_callable([$value, 'toRawArray'])) {
                     $value = $value->toRawArray();
diff --git a/system/Files/File.php b/system/Files/File.php
index 547142d0ec6d..cc86e5cc3bba 100644
--- a/system/Files/File.php
+++ b/system/Files/File.php
@@ -170,7 +170,7 @@ public function move(string $targetPath, ?string $name = null, bool $overwrite =
 
         @chmod($destination, 0777 & ~umask());
 
-        return new File($destination);
+        return new self($destination);
     }
 
     //--------------------------------------------------------------------
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index 9f79cccddbd6..db72fd75568a 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -1123,7 +1123,7 @@ public function resolveRelativeURI(string $uri)
      *
      * @return string
      */
-    protected function mergePaths(URI $base, URI $reference): string
+    protected function mergePaths(self $base, self $reference): string
     {
         if (! empty($base->getAuthority()) && $base->getPath() === '') {
             return '/' . ltrim($reference->getPath(), '/ ');
diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index 663cb2f2bbae..2f1edd42ebfa 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -82,7 +82,7 @@ public function __construct(?string $time = null, $timezone = null, ?string $loc
         $this->locale = ! empty($locale) ? $locale : Locale::getDefault();
 
         // If a test instance has been provided, use it instead.
-        if ($time === null && static::$testNow instanceof Time) {
+        if ($time === null && static::$testNow instanceof self) {
             if (empty($timezone)) {
                 $timezone = static::$testNow->getTimezone();
             }
@@ -119,7 +119,7 @@ public function __construct(?string $time = null, $timezone = null, ?string $loc
      */
     public static function now($timezone = null, ?string $locale = null)
     {
-        return new Time(null, $timezone, $locale);
+        return new self(null, $timezone, $locale);
     }
 
     //--------------------------------------------------------------------
@@ -140,7 +140,7 @@ public static function now($timezone = null, ?string $locale = null)
      */
     public static function parse(string $datetime, $timezone = null, ?string $locale = null)
     {
-        return new Time($datetime, $timezone, $locale);
+        return new self($datetime, $timezone, $locale);
     }
 
     //--------------------------------------------------------------------
@@ -157,7 +157,7 @@ public static function parse(string $datetime, $timezone = null, ?string $locale
      */
     public static function today($timezone = null, ?string $locale = null)
     {
-        return new Time(date('Y-m-d 00:00:00'), $timezone, $locale);
+        return new self(date('Y-m-d 00:00:00'), $timezone, $locale);
     }
 
     //--------------------------------------------------------------------
@@ -174,7 +174,7 @@ public static function today($timezone = null, ?string $locale = null)
      */
     public static function yesterday($timezone = null, ?string $locale = null)
     {
-        return new Time(date('Y-m-d 00:00:00', strtotime('-1 day')), $timezone, $locale);
+        return new self(date('Y-m-d 00:00:00', strtotime('-1 day')), $timezone, $locale);
     }
 
     //--------------------------------------------------------------------
@@ -191,7 +191,7 @@ public static function yesterday($timezone = null, ?string $locale = null)
      */
     public static function tomorrow($timezone = null, ?string $locale = null)
     {
-        return new Time(date('Y-m-d 00:00:00', strtotime('+1 day')), $timezone, $locale);
+        return new self(date('Y-m-d 00:00:00', strtotime('+1 day')), $timezone, $locale);
     }
 
     //--------------------------------------------------------------------
@@ -262,7 +262,7 @@ public static function create(?int $year = null, ?int $month = null, ?int $day =
         $minutes = empty($minutes) ? 0 : $minutes;
         $seconds = empty($seconds) ? 0 : $seconds;
 
-        return new Time(date('Y-m-d H:i:s', strtotime("{$year}-{$month}-{$day} {$hour}:{$minutes}:{$seconds}")), $timezone, $locale);
+        return new self(date('Y-m-d H:i:s', strtotime("{$year}-{$month}-{$day} {$hour}:{$minutes}:{$seconds}")), $timezone, $locale);
     }
 
     //--------------------------------------------------------------------
@@ -285,7 +285,7 @@ public static function createFromFormat($format, $datetime, $timeZone = null)
             throw I18nException::forInvalidFormat($format);
         }
 
-        return new Time($date->format('Y-m-d H:i:s'), $timeZone);
+        return new self($date->format('Y-m-d H:i:s'), $timeZone);
     }
 
     //--------------------------------------------------------------------
@@ -303,7 +303,7 @@ public static function createFromFormat($format, $datetime, $timeZone = null)
      */
     public static function createFromTimestamp(int $timestamp, $timezone = null, ?string $locale = null)
     {
-        return new Time(gmdate('Y-m-d H:i:s', $timestamp), $timezone ?? 'UTC', $locale);
+        return new self(gmdate('Y-m-d H:i:s', $timestamp), $timezone ?? 'UTC', $locale);
     }
 
     //--------------------------------------------------------------------
@@ -323,7 +323,7 @@ public static function createFromInstance(DateTimeInterface $dateTime, ?string $
         $date     = $dateTime->format('Y-m-d H:i:s');
         $timezone = $dateTime->getTimezone();
 
-        return new Time($date, $timezone, $locale);
+        return new self($date, $timezone, $locale);
     }
 
     //--------------------------------------------------------------------
@@ -388,9 +388,9 @@ public static function setTestNow($datetime = null, $timezone = null, ?string $l
 
         // Convert to a Time instance
         if (is_string($datetime)) {
-            $datetime = new Time($datetime, $timezone, $locale);
-        } elseif ($datetime instanceof DateTimeInterface && ! $datetime instanceof Time) {
-            $datetime = new Time($datetime->format('Y-m-d H:i:s'), $timezone);
+            $datetime = new self($datetime, $timezone, $locale);
+        } elseif ($datetime instanceof DateTimeInterface && ! $datetime instanceof self) {
+            $datetime = new self($datetime->format('Y-m-d H:i:s'), $timezone);
         }
 
         static::$testNow = $datetime;
@@ -562,7 +562,7 @@ public function getWeekOfYear(): string
      */
     public function getAge()
     {
-        $now  = Time::now()->getTimestamp();
+        $now  = self::now()->getTimestamp();
         $time = $this->getTimestamp();
 
         // future dates have no age
@@ -780,7 +780,7 @@ protected function setValue(string $name, $value)
 
         ${$name} = $value;
 
-        return Time::create(
+        return self::create(
             (int) $year,
             (int) $month,
             (int) $day,
@@ -805,7 +805,7 @@ public function setTimezone($timezone)
     {
         $timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
 
-        return Time::createFromInstance($this->toDateTime()->setTimezone($timezone), $this->locale);
+        return self::createFromInstance($this->toDateTime()->setTimezone($timezone), $this->locale);
     }
 
     /**
@@ -821,7 +821,7 @@ public function setTimestamp($timestamp)
     {
         $time = date('Y-m-d H:i:s', $timestamp);
 
-        return Time::parse($time, $this->timezone, $this->locale);
+        return self::parse($time, $this->timezone, $this->locale);
     }
 
     //--------------------------------------------------------------------
@@ -1192,7 +1192,7 @@ public function isAfter($testTime, ?string $timezone = null): bool
      */
     public function humanize()
     {
-        $now  = IntlCalendar::fromDateTime(Time::now($this->timezone)->toDateTimeString());
+        $now  = IntlCalendar::fromDateTime(self::now($this->timezone)->toDateTimeString());
         $time = $this->getCalendar()->getTime();
 
         $years   = $now->fieldDifference($time, IntlCalendar::FIELD_YEAR);
@@ -1267,7 +1267,7 @@ public function difference($testTime, ?string $timezone = null)
      */
     public function getUTCObject($time, ?string $timezone = null)
     {
-        if ($time instanceof Time) {
+        if ($time instanceof self) {
             $time = $time->toDateTime();
         } elseif (is_string($time)) {
             $timezone = $timezone ?: $this->timezone;
diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
index bbdc9af989d3..0eaf8703f712 100644
--- a/system/Pager/Pager.php
+++ b/system/Pager/Pager.php
@@ -481,7 +481,7 @@ public function getDetails(string $group = 'default'): array
      *
      * @return Pager
      */
-    public function only(array $queries): Pager
+    public function only(array $queries): self
     {
         $this->only = $queries;
 
diff --git a/system/Validation/ValidationInterface.php b/system/Validation/ValidationInterface.php
index fd590ccba906..10a681954911 100644
--- a/system/Validation/ValidationInterface.php
+++ b/system/Validation/ValidationInterface.php
@@ -53,7 +53,7 @@ public function check($value, string $rule, array $errors = []): bool;
      *
      * @return ValidationInterface
      */
-    public function withRequest(RequestInterface $request): ValidationInterface;
+    public function withRequest(RequestInterface $request): self;
 
     //--------------------------------------------------------------------
     // Rules
@@ -67,7 +67,7 @@ public function withRequest(RequestInterface $request): ValidationInterface;
      *
      * @return ValidationInterface
      */
-    public function setRules(array $rules, array $messages = []): ValidationInterface;
+    public function setRules(array $rules, array $messages = []): self;
 
     //--------------------------------------------------------------------
 
@@ -119,7 +119,7 @@ public function getErrors(): array;
      *
      * @return ValidationInterface
      */
-    public function setError(string $alias, string $error): ValidationInterface;
+    public function setError(string $alias, string $error): self;
 
     //--------------------------------------------------------------------
     // Misc
@@ -131,7 +131,7 @@ public function setError(string $alias, string $error): ValidationInterface;
      *
      * @return ValidationInterface
      */
-    public function reset(): ValidationInterface;
+    public function reset(): self;
 
     //--------------------------------------------------------------------
 }
diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php
index 2c998d628f8a..649275042819 100644
--- a/tests/system/Validation/FormatRulesTest.php
+++ b/tests/system/Validation/FormatRulesTest.php
@@ -372,19 +372,19 @@ public function alphaProvider()
     {
         return [
             [
-                FormatRulesTest::ALPHABET,
+                self::ALPHABET,
                 true,
             ],
             [
-                FormatRulesTest::ALPHABET . ' ',
+                self::ALPHABET . ' ',
                 false,
             ],
             [
-                FormatRulesTest::ALPHABET . '1',
+                self::ALPHABET . '1',
                 false,
             ],
             [
-                FormatRulesTest::ALPHABET . '*',
+                self::ALPHABET . '*',
                 false,
             ],
             [
@@ -423,23 +423,23 @@ public function alphaSpaceProvider()
                 true,
             ],
             [
-                FormatRulesTest::ALPHABET,
+                self::ALPHABET,
                 true,
             ],
             [
-                FormatRulesTest::ALPHABET . ' ',
+                self::ALPHABET . ' ',
                 true,
             ],
             [
-                FormatRulesTest::ALPHABET . "\n",
+                self::ALPHABET . "\n",
                 false,
             ],
             [
-                FormatRulesTest::ALPHABET . '1',
+                self::ALPHABET . '1',
                 false,
             ],
             [
-                FormatRulesTest::ALPHABET . '*',
+                self::ALPHABET . '*',
                 false,
             ],
         ];
@@ -468,15 +468,15 @@ public function alphaNumericProvider()
     {
         return [
             [
-                FormatRulesTest::ALPHANUMERIC,
+                self::ALPHANUMERIC,
                 true,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC . '\ ',
+                self::ALPHANUMERIC . '\ ',
                 false,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC . '_',
+                self::ALPHANUMERIC . '_',
                 false,
             ],
             [
@@ -509,71 +509,71 @@ public function alphaNumericPunctProvider()
     {
         return [
             [
-                FormatRulesTest::ALPHANUMERIC . ' ~!#$%&*-_+=|:.',
+                self::ALPHANUMERIC . ' ~!#$%&*-_+=|:.',
                 true,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC . '`',
+                self::ALPHANUMERIC . '`',
                 false,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC . "\n",
+                self::ALPHANUMERIC . "\n",
                 false,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC . '@',
+                self::ALPHANUMERIC . '@',
                 false,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC . '^',
+                self::ALPHANUMERIC . '^',
                 false,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC . '(',
+                self::ALPHANUMERIC . '(',
                 false,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC . ')',
+                self::ALPHANUMERIC . ')',
                 false,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC . '\\',
+                self::ALPHANUMERIC . '\\',
                 false,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC . '{',
+                self::ALPHANUMERIC . '{',
                 false,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC . '}',
+                self::ALPHANUMERIC . '}',
                 false,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC . '[',
+                self::ALPHANUMERIC . '[',
                 false,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC . ']',
+                self::ALPHANUMERIC . ']',
                 false,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC . '"',
+                self::ALPHANUMERIC . '"',
                 false,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC . "'",
+                self::ALPHANUMERIC . "'",
                 false,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC . '<',
+                self::ALPHANUMERIC . '<',
                 false,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC . '>',
+                self::ALPHANUMERIC . '>',
                 false,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC . '/',
+                self::ALPHANUMERIC . '/',
                 false,
             ],
             [
@@ -606,15 +606,15 @@ public function alphaNumericSpaceProvider()
     {
         return [
             [
-                ' ' . FormatRulesTest::ALPHANUMERIC,
+                ' ' . self::ALPHANUMERIC,
                 true,
             ],
             [
-                ' ' . FormatRulesTest::ALPHANUMERIC . '-',
+                ' ' . self::ALPHANUMERIC . '-',
                 false,
             ],
             [
-                ' ' . FormatRulesTest::ALPHANUMERIC . "\n",
+                ' ' . self::ALPHANUMERIC . "\n",
                 false,
             ],
             [
@@ -647,15 +647,15 @@ public function alphaDashProvider()
     {
         return [
             [
-                FormatRulesTest::ALPHANUMERIC . '-',
+                self::ALPHANUMERIC . '-',
                 true,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC . '-\ ',
+                self::ALPHANUMERIC . '-\ ',
                 false,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC . "-\n",
+                self::ALPHANUMERIC . "-\n",
                 false,
             ],
             [
@@ -692,7 +692,7 @@ public function hexProvider()
                 true,
             ],
             [
-                FormatRulesTest::ALPHANUMERIC,
+                self::ALPHANUMERIC,
                 false,
             ],
             [
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 4b2327028c0d..fc98d257b01b 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -387,6 +387,8 @@ public function __construct()
             'regular_callable_call'              => true,
             'return_assignment'                  => true,
             'return_type_declaration'            => ['space_before' => 'none'],
+            'self_accessor'                      => false,
+            'self_static_accessor'               => true,
             'set_type_to_cast'                   => true,
             'short_scalar_cast'                  => true,
             'simple_to_complex_string_variable'  => true,

From e9110afe8831a02c394d2a12751be835e94de462 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 9 Jul 2021 01:12:08 +0800
Subject: [PATCH 0083/2325] Configure but disable `semicolon_after_instruction`

---
 utils/PhpCsFixer/CodeIgniter4.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index fc98d257b01b..310ceadd6b4a 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -389,6 +389,7 @@ public function __construct()
             'return_type_declaration'            => ['space_before' => 'none'],
             'self_accessor'                      => false,
             'self_static_accessor'               => true,
+            'semicolon_after_instruction'        => false,
             'set_type_to_cast'                   => true,
             'short_scalar_cast'                  => true,
             'simple_to_complex_string_variable'  => true,

From cdc475ea0d90b3a15b12163e43c9836ae47456df Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 9 Jul 2021 01:20:39 +0800
Subject: [PATCH 0084/2325] Enable `simplified_if_return` fixer

---
 system/Validation/ValidationInterface.php | 8 ++++----
 utils/PhpCsFixer/CodeIgniter4.php         | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/system/Validation/ValidationInterface.php b/system/Validation/ValidationInterface.php
index 10a681954911..fd590ccba906 100644
--- a/system/Validation/ValidationInterface.php
+++ b/system/Validation/ValidationInterface.php
@@ -53,7 +53,7 @@ public function check($value, string $rule, array $errors = []): bool;
      *
      * @return ValidationInterface
      */
-    public function withRequest(RequestInterface $request): self;
+    public function withRequest(RequestInterface $request): ValidationInterface;
 
     //--------------------------------------------------------------------
     // Rules
@@ -67,7 +67,7 @@ public function withRequest(RequestInterface $request): self;
      *
      * @return ValidationInterface
      */
-    public function setRules(array $rules, array $messages = []): self;
+    public function setRules(array $rules, array $messages = []): ValidationInterface;
 
     //--------------------------------------------------------------------
 
@@ -119,7 +119,7 @@ public function getErrors(): array;
      *
      * @return ValidationInterface
      */
-    public function setError(string $alias, string $error): self;
+    public function setError(string $alias, string $error): ValidationInterface;
 
     //--------------------------------------------------------------------
     // Misc
@@ -131,7 +131,7 @@ public function setError(string $alias, string $error): self;
      *
      * @return ValidationInterface
      */
-    public function reset(): self;
+    public function reset(): ValidationInterface;
 
     //--------------------------------------------------------------------
 }
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 310ceadd6b4a..f14472baa96d 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -393,6 +393,8 @@ public function __construct()
             'set_type_to_cast'                   => true,
             'short_scalar_cast'                  => true,
             'simple_to_complex_string_variable'  => true,
+            'simplified_if_return'               => true,
+            'simplified_null_return'             => false,
             'single_blank_line_at_eof'           => true,
             'single_blank_line_before_namespace' => true,
             'single_class_element_per_statement' => ['elements' => ['const', 'property']],

From 6c37823fc384e1e4250afed4ceffef4d1cbf03ad Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 15 Jul 2021 02:05:44 +0800
Subject: [PATCH 0085/2325] Define remaining rules (#4934)

---
 utils/PhpCsFixer/CodeIgniter4.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index f14472baa96d..1d0acff3aa0f 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -156,7 +156,9 @@ public function __construct()
                 'fix_inline'     => true,
                 'replacements'   => ['inheritDocs' => 'inheritDoc'],
             ],
+            'global_namespace_import'     => false,
             'group_import'                => false,
+            'header_comment'              => false, // false by default
             'heredoc_indentation'         => ['indentation' => 'start_plus_one'],
             'heredoc_to_nowdoc'           => true,
             'implode_call'                => true,
@@ -184,7 +186,9 @@ public function __construct()
             'modernize_types_casting'                     => true,
             'multiline_comment_opening_closing'           => true,
             'multiline_whitespace_before_semicolons'      => ['strategy' => 'no_multi_line'],
+            'native_constant_invocation'                  => false,
             'native_function_casing'                      => true,
+            'native_function_invocation'                  => false,
             'native_function_type_declaration_casing'     => true,
             'new_with_braces'                             => true,
             'no_alias_functions'                          => ['sets' => ['@all']],
@@ -483,7 +487,9 @@ public function __construct()
             ],
             'trim_array_spaces'               => true,
             'unary_operator_spaces'           => true,
+            'use_arrow_functions'             => false, // requires PHP7.4+
             'visibility_required'             => ['elements' => ['const', 'method', 'property']],
+            'void_return'                     => false, // changes method signature
             'whitespace_after_comma_in_array' => true,
             'yoda_style'                      => [
                 'equal'                => false,

From 46130bba851fab032ac469bf8b48aa42717dd4d4 Mon Sep 17 00:00:00 2001
From: Maurice <mauricevanbreukelen@outlook.com>
Date: Sat, 17 Jul 2021 15:50:50 +0200
Subject: [PATCH 0086/2325] Remove 'memory_usage' from
 'displayPerformanceMetrics()' comment (#4939)

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

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 40535d7e5ca4..b680c008f52a 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -725,7 +725,7 @@ protected function generateCacheName(Cache $config): string
     //--------------------------------------------------------------------
 
     /**
-     * Replaces the memory_usage and elapsed_time tags.
+     * Replaces the elapsed_time tag.
      *
      * @param string $output
      *

From 9aa9cd308f2c43eddcc1e0b55f17b1e116666557 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Sun, 18 Jul 2021 22:01:52 +0800
Subject: [PATCH 0087/2325] Normalize var and return annotations (#4942)

---
 utils/PhpCsFixer/CodeIgniter4.php | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 1d0acff3aa0f..322db68a2fbf 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -247,9 +247,9 @@ public function __construct()
             'no_whitespace_in_blank_line'                      => true,
             'non_printable_character'                          => ['use_escape_sequences_in_strings' => true],
             'normalize_index_brace'                            => true,
-            'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
             'not_operator_with_space'                          => false,
             'not_operator_with_successor_space'                => true,
+            'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
             'object_operator_without_whitespace'               => true,
             'operator_linebreak'                               => ['only_booleans' => true, 'position' => 'beginning'],
             'ordered_class_elements'                           => false,
@@ -308,8 +308,9 @@ public function __construct()
                     'var',
                 ],
             ],
-            'phpdoc_indent'                => true,
-            'phpdoc_inline_tag_normalizer' => [
+            'phpdoc_annotation_without_dot' => false,
+            'phpdoc_indent'                 => true,
+            'phpdoc_inline_tag_normalizer'  => [
                 'tags' => [
                     'example',
                     'id',
@@ -358,6 +359,16 @@ public function __construct()
                     'uses',
                 ],
             ],
+            'phpdoc_return_self_reference' => [
+                'replacements' => [
+                    'this'    => '$this',
+                    '@this'   => '$this',
+                    '$self'   => 'self',
+                    '@self'   => 'self',
+                    '$static' => 'static',
+                    '@static' => 'static',
+                ],
+            ],
             'phpdoc_scalar' => [
                 'types' => [
                     'boolean',
@@ -369,6 +380,8 @@ public function __construct()
                 ],
             ],
             'phpdoc_separation'                             => true,
+            'phpdoc_single_line_var_spacing'                => true,
+            'phpdoc_summary'                                => false,
             'phpdoc_trim'                                   => true,
             'phpdoc_trim_consecutive_blank_line_separation' => true,
             'phpdoc_types'                                  => ['groups' => ['simple', 'alias', 'meta']],
@@ -404,7 +417,7 @@ public function __construct()
             'single_class_element_per_statement' => ['elements' => ['const', 'property']],
             'single_import_per_statement'        => true,
             'single_line_after_imports'          => true,
-            'single_line_comment_style'          => true,
+            'single_line_comment_style'          => ['comment_types' => ['asterisk', 'hash']],
             'single_line_throw'                  => false,
             'single_quote'                       => ['strings_containing_single_quote_chars' => false],
             'single_space_after_construct'       => [

From 52c814525bfd9f6641288afe5bcf6f8c3e968256 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Sun, 18 Jul 2021 22:07:56 +0800
Subject: [PATCH 0088/2325] Fix tag casing and tag types (#4943)

---
 system/Commands/Utilities/Environment.php | 2 +-
 system/Entity/Cast/ArrayCast.php          | 4 ++--
 system/Entity/Cast/BooleanCast.php        | 2 +-
 system/Entity/Cast/CSVCast.php            | 4 ++--
 system/Entity/Cast/DatetimeCast.php       | 2 +-
 system/Entity/Cast/FloatCast.php          | 2 +-
 system/Entity/Cast/IntegerCast.php        | 2 +-
 system/Entity/Cast/JsonCast.php           | 4 ++--
 system/Entity/Cast/ObjectCast.php         | 2 +-
 system/Entity/Cast/StringCast.php         | 2 +-
 system/Entity/Cast/TimestampCast.php      | 2 +-
 system/Entity/Cast/URICast.php            | 2 +-
 utils/PhpCsFixer/CodeIgniter4.php         | 2 ++
 13 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/system/Commands/Utilities/Environment.php b/system/Commands/Utilities/Environment.php
index ede7ae2d8a00..5b44ea02bdf9 100644
--- a/system/Commands/Utilities/Environment.php
+++ b/system/Commands/Utilities/Environment.php
@@ -69,7 +69,7 @@ final class Environment extends BaseCommand
     ];
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      *
      * @param array<string, mixed> $params
      *
diff --git a/system/Entity/Cast/ArrayCast.php b/system/Entity/Cast/ArrayCast.php
index 64d200e1d0b7..67a18bd07e73 100644
--- a/system/Entity/Cast/ArrayCast.php
+++ b/system/Entity/Cast/ArrayCast.php
@@ -17,7 +17,7 @@
 class ArrayCast extends BaseCast
 {
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public static function get($value, array $params = []): array
     {
@@ -29,7 +29,7 @@ public static function get($value, array $params = []): array
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public static function set($value, array $params = []): string
     {
diff --git a/system/Entity/Cast/BooleanCast.php b/system/Entity/Cast/BooleanCast.php
index 152117032459..cca9d4f2cde7 100644
--- a/system/Entity/Cast/BooleanCast.php
+++ b/system/Entity/Cast/BooleanCast.php
@@ -17,7 +17,7 @@
 class BooleanCast extends BaseCast
 {
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public static function get($value, array $params = []): bool
     {
diff --git a/system/Entity/Cast/CSVCast.php b/system/Entity/Cast/CSVCast.php
index 0ebd43cc4265..ee8a8764fefd 100644
--- a/system/Entity/Cast/CSVCast.php
+++ b/system/Entity/Cast/CSVCast.php
@@ -17,7 +17,7 @@
 class CSVCast extends BaseCast
 {
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public static function get($value, array $params = []): array
     {
@@ -25,7 +25,7 @@ public static function get($value, array $params = []): array
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public static function set($value, array $params = []): string
     {
diff --git a/system/Entity/Cast/DatetimeCast.php b/system/Entity/Cast/DatetimeCast.php
index 4cfe0099bc1c..d805a4ea5c00 100644
--- a/system/Entity/Cast/DatetimeCast.php
+++ b/system/Entity/Cast/DatetimeCast.php
@@ -21,7 +21,7 @@
 class DatetimeCast extends BaseCast
 {
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      *
      * @throws Exception
      */
diff --git a/system/Entity/Cast/FloatCast.php b/system/Entity/Cast/FloatCast.php
index f7c063949c31..b69bf74e14ac 100644
--- a/system/Entity/Cast/FloatCast.php
+++ b/system/Entity/Cast/FloatCast.php
@@ -17,7 +17,7 @@
 class FloatCast extends BaseCast
 {
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public static function get($value, array $params = []): float
     {
diff --git a/system/Entity/Cast/IntegerCast.php b/system/Entity/Cast/IntegerCast.php
index 409a73a6a206..8d645bd53f80 100644
--- a/system/Entity/Cast/IntegerCast.php
+++ b/system/Entity/Cast/IntegerCast.php
@@ -17,7 +17,7 @@
 class IntegerCast extends BaseCast
 {
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public static function get($value, array $params = []): int
     {
diff --git a/system/Entity/Cast/JsonCast.php b/system/Entity/Cast/JsonCast.php
index f644e0bb6e90..c892a4fd9d7a 100644
--- a/system/Entity/Cast/JsonCast.php
+++ b/system/Entity/Cast/JsonCast.php
@@ -21,7 +21,7 @@
 class JsonCast extends BaseCast
 {
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public static function get($value, array $params = [])
     {
@@ -48,7 +48,7 @@ public static function get($value, array $params = [])
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public static function set($value, array $params = []): string
     {
diff --git a/system/Entity/Cast/ObjectCast.php b/system/Entity/Cast/ObjectCast.php
index 86214e5888ab..fe5802c4d5ab 100644
--- a/system/Entity/Cast/ObjectCast.php
+++ b/system/Entity/Cast/ObjectCast.php
@@ -17,7 +17,7 @@
 class ObjectCast extends BaseCast
 {
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public static function get($value, array $params = []): object
     {
diff --git a/system/Entity/Cast/StringCast.php b/system/Entity/Cast/StringCast.php
index 8eae036b70de..d45327c437fb 100644
--- a/system/Entity/Cast/StringCast.php
+++ b/system/Entity/Cast/StringCast.php
@@ -17,7 +17,7 @@
 class StringCast extends BaseCast
 {
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public static function get($value, array $params = []): string
     {
diff --git a/system/Entity/Cast/TimestampCast.php b/system/Entity/Cast/TimestampCast.php
index 1cbb086dd2da..8329c36200f7 100644
--- a/system/Entity/Cast/TimestampCast.php
+++ b/system/Entity/Cast/TimestampCast.php
@@ -19,7 +19,7 @@
 class TimestampCast extends BaseCast
 {
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public static function get($value, array $params = [])
     {
diff --git a/system/Entity/Cast/URICast.php b/system/Entity/Cast/URICast.php
index 010de5889590..e6a00162d0d3 100644
--- a/system/Entity/Cast/URICast.php
+++ b/system/Entity/Cast/URICast.php
@@ -19,7 +19,7 @@
 class URICast extends BaseCast
 {
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public static function get($value, array $params = []): URI
     {
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 322db68a2fbf..66c901aaf3c6 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -382,6 +382,8 @@ public function __construct()
             'phpdoc_separation'                             => true,
             'phpdoc_single_line_var_spacing'                => true,
             'phpdoc_summary'                                => false,
+            'phpdoc_tag_casing'                             => ['tags' => ['inheritDoc']],
+            'phpdoc_tag_type'                               => ['tags' => ['inheritDoc' => 'inline']],
             'phpdoc_trim'                                   => true,
             'phpdoc_trim_consecutive_blank_line_separation' => true,
             'phpdoc_types'                                  => ['groups' => ['simple', 'alias', 'meta']],

From 36152b39b29490cf46a93139e9a4c36c5c9d7f75 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Sun, 18 Jul 2021 22:13:55 +0800
Subject: [PATCH 0089/2325] Change some phpdocs to simple comments (#4945)

---
 app/Config/Routes.php                | 2 +-
 system/Config/Routes.php             | 2 +-
 system/Helpers/array_helper.php      | 4 +---
 system/Helpers/date_helper.php       | 4 +---
 system/Helpers/filesystem_helper.php | 4 +---
 system/Helpers/form_helper.php       | 4 +---
 system/Helpers/html_helper.php       | 4 +---
 system/Helpers/inflector_helper.php  | 4 +---
 system/Helpers/number_helper.php     | 4 +---
 system/Helpers/security_helper.php   | 4 +---
 system/Helpers/test_helper.php       | 4 +---
 system/Helpers/text_helper.php       | 4 +---
 system/Helpers/url_helper.php        | 4 +---
 system/Helpers/xml_helper.php        | 4 +---
 system/View/Parser.php               | 2 +-
 tests/_support/Config/Routes.php     | 4 +---
 utils/PhpCsFixer/CodeIgniter4.php    | 4 ++++
 17 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 4d70f112860e..0060a6f67dff 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -11,7 +11,7 @@
     require SYSTEMPATH . 'Config/Routes.php';
 }
 
-/**
+/*
  * --------------------------------------------------------------------
  * Router Setup
  * --------------------------------------------------------------------
diff --git a/system/Config/Routes.php b/system/Config/Routes.php
index 3ee1301d4858..1867bdd1ae98 100644
--- a/system/Config/Routes.php
+++ b/system/Config/Routes.php
@@ -11,7 +11,7 @@
 
 use CodeIgniter\Exceptions\PageNotFoundException;
 
-/**
+/*
  * System URI Routing
  *
  * This file contains any routing to system tools, such as command-line
diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php
index d0af3e579d05..7855cf288dfe 100644
--- a/system/Helpers/array_helper.php
+++ b/system/Helpers/array_helper.php
@@ -9,9 +9,7 @@
  * file that was distributed with this source code.
  */
 
-/**
- * CodeIgniter Array Helpers
- */
+// CodeIgniter Array Helpers
 
 if (! function_exists('dot_array_search')) {
     /**
diff --git a/system/Helpers/date_helper.php b/system/Helpers/date_helper.php
index 5b3e6cbcc869..2a2dc42780de 100644
--- a/system/Helpers/date_helper.php
+++ b/system/Helpers/date_helper.php
@@ -9,9 +9,7 @@
  * file that was distributed with this source code.
  */
 
-/**
- * CodeIgniter Date Helpers
- */
+// CodeIgniter Date Helpers
 
 if (! function_exists('now')) {
     /**
diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php
index 98d4d9c0446e..b15800d4305f 100644
--- a/system/Helpers/filesystem_helper.php
+++ b/system/Helpers/filesystem_helper.php
@@ -9,9 +9,7 @@
  * file that was distributed with this source code.
  */
 
-/**
- * CodeIgniter File System Helpers
- */
+// CodeIgniter File System Helpers
 // ------------------------------------------------------------------------
 
 if (! function_exists('directory_map')) {
diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
index 24954a87c6ef..750210ebf840 100644
--- a/system/Helpers/form_helper.php
+++ b/system/Helpers/form_helper.php
@@ -11,9 +11,7 @@
 
 use Config\App;
 
-/**
- * CodeIgniter Form Helpers
- */
+// CodeIgniter Form Helpers
 
 use Config\Services;
 
diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
index 2917f44d92dd..c1d93571a690 100755
--- a/system/Helpers/html_helper.php
+++ b/system/Helpers/html_helper.php
@@ -15,9 +15,7 @@
 
 // --------------------------------------------------------------------
 
-/**
- * CodeIgniter HTML Helpers
- */
+// CodeIgniter HTML Helpers
 if (! function_exists('ul')) {
     /**
      * Unordered List
diff --git a/system/Helpers/inflector_helper.php b/system/Helpers/inflector_helper.php
index 9e70f6849f16..3762886a9da3 100755
--- a/system/Helpers/inflector_helper.php
+++ b/system/Helpers/inflector_helper.php
@@ -11,9 +11,7 @@
 
 // --------------------------------------------------------------------
 
-/**
- * CodeIgniter Inflector Helpers
- */
+// CodeIgniter Inflector Helpers
 if (! function_exists('singular')) {
     /**
      * Singular
diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
index 590e0f25449f..697b5215ef49 100644
--- a/system/Helpers/number_helper.php
+++ b/system/Helpers/number_helper.php
@@ -11,9 +11,7 @@
 
 use Config\Services;
 
-/**
- * CodeIgniter Number Helpers
- */
+// CodeIgniter Number Helpers
 
 if (! function_exists('number_to_size')) {
     /**
diff --git a/system/Helpers/security_helper.php b/system/Helpers/security_helper.php
index e6ded75dc2b5..640f0c8c571d 100644
--- a/system/Helpers/security_helper.php
+++ b/system/Helpers/security_helper.php
@@ -11,9 +11,7 @@
 
 use Config\Services;
 
-/**
- * CodeIgniter Security Helpers
- */
+// CodeIgniter Security Helpers
 
 if (! function_exists('sanitize_filename')) {
     /**
diff --git a/system/Helpers/test_helper.php b/system/Helpers/test_helper.php
index 1815cf0d14d7..d18d6da8143e 100644
--- a/system/Helpers/test_helper.php
+++ b/system/Helpers/test_helper.php
@@ -12,9 +12,7 @@
 use CodeIgniter\Model;
 use CodeIgniter\Test\Fabricator;
 
-/**
- * CodeIgniter Test Helpers
- */
+// CodeIgniter Test Helpers
 //--------------------------------------------------------------------
 
 if (! function_exists('fake')) {
diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index 2ee52f12ad15..d9ac6c96be67 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -11,9 +11,7 @@
 
 use Config\ForeignCharacters;
 
-/**
- * CodeIgniter Text Helpers
- */
+// CodeIgniter Text Helpers
 //--------------------------------------------------------------------
 
 if (! function_exists('word_limiter')) {
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
index fa2991763f6b..392de6e720cd 100644
--- a/system/Helpers/url_helper.php
+++ b/system/Helpers/url_helper.php
@@ -15,9 +15,7 @@
 use Config\App;
 use Config\Services;
 
-/**
- * CodeIgniter URL Helpers
- */
+// CodeIgniter URL Helpers
 
 if (! function_exists('_get_uri')) {
     /**
diff --git a/system/Helpers/xml_helper.php b/system/Helpers/xml_helper.php
index ac28c81bc935..29c1c14c8797 100644
--- a/system/Helpers/xml_helper.php
+++ b/system/Helpers/xml_helper.php
@@ -9,9 +9,7 @@
  * file that was distributed with this source code.
  */
 
-/**
- * CodeIgniter XML Helpers
- */
+// CodeIgniter XML Helpers
 
 if (! function_exists('xml_convert')) {
     /**
diff --git a/system/View/Parser.php b/system/View/Parser.php
index 9fb4736a201d..e792b9f13626 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -465,7 +465,7 @@ protected function parseConditionals(string $template): string
     {
         $pattern = '/\{\s*(if|elseif)\s*((?:\()?(.*?)(?:\))?)\s*\}/ms';
 
-        /**
+        /*
          * For each match:
          * [0] = raw match `{if var}`
          * [1] = conditional `if`
diff --git a/tests/_support/Config/Routes.php b/tests/_support/Config/Routes.php
index 76983f080f6b..ee98afd5a880 100644
--- a/tests/_support/Config/Routes.php
+++ b/tests/_support/Config/Routes.php
@@ -2,7 +2,5 @@
 
 namespace Tests\Support\Config;
 
-/**
- * This is a simple file to include for testing the RouteCollection class.
- */
+// This is a simple file to include for testing the RouteCollection class.
 $routes->add('testing', 'TestController::index', ['as' => 'testing-index']);
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 66c901aaf3c6..209c513c4dcf 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -384,6 +384,10 @@ public function __construct()
             'phpdoc_summary'                                => false,
             'phpdoc_tag_casing'                             => ['tags' => ['inheritDoc']],
             'phpdoc_tag_type'                               => ['tags' => ['inheritDoc' => 'inline']],
+            'phpdoc_to_comment'                             => false,
+            'phpdoc_to_param_type'                          => false,
+            'phpdoc_to_property_type'                       => false,
+            'phpdoc_to_return_type'                         => false,
             'phpdoc_trim'                                   => true,
             'phpdoc_trim_consecutive_blank_line_separation' => true,
             'phpdoc_types'                                  => ['groups' => ['simple', 'alias', 'meta']],

From a6cfb8c1e6b6aa1ef7321ecc2c31a772f90a4c15 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Mon, 19 Jul 2021 21:08:51 +0800
Subject: [PATCH 0090/2325] Remove useless code separator comments (#4946)

---
 app/Config/Database.php                       |   4 -
 app/Config/Format.php                         |   2 -
 app/Controllers/BaseController.php            |   3 +-
 app/Views/errors/html/debug.js                |  12 +-
 contributing/styleguide.rst                   |  71 ++----
 system/API/ResponseTrait.php                  |  25 --
 system/CLI/CLI.php                            |  61 +----
 system/CLI/Console.php                        |   6 -
 system/Cache/CacheFactory.php                 |   2 -
 system/Cache/CacheInterface.php               |  20 --
 system/Cache/Handlers/BaseHandler.php         |   4 -
 system/Cache/Handlers/DummyHandler.php        |  22 --
 system/Cache/Handlers/FileHandler.php         |  37 ---
 system/Cache/Handlers/MemcachedHandler.php    |  24 --
 system/Cache/Handlers/PredisHandler.php       |  24 --
 system/Cache/Handlers/RedisHandler.php        |  24 --
 system/Cache/Handlers/WincacheHandler.php     |  22 --
 system/CodeIgniter.php                        |  62 +----
 system/Commands/Help.php                      |   2 -
 system/Commands/ListCommands.php              |   2 -
 system/Commands/Utilities/Namespaces.php      |   2 -
 system/Commands/Utilities/Routes.php          |   2 -
 system/Common.php                             |   2 -
 system/Config/DotEnv.php                      |  18 --
 system/Config/Factories.php                   |   6 -
 system/Config/Services.php                    |  60 -----
 system/Controller.php                         |  10 -
 system/Database/BaseBuilder.php               | 216 ------------------
 system/Database/BaseConnection.php            | 133 -----------
 system/Database/BasePreparedQuery.php         |  24 --
 system/Database/BaseResult.php                |  46 ----
 system/Database/BaseUtils.php                 |  24 --
 system/Database/Config.php                    |  12 -
 system/Database/ConnectionInterface.php       |  32 ---
 system/Database/Database.php                  |  10 -
 system/Database/Forge.php                     |  64 ------
 system/Database/Migration.php                 |  10 -
 system/Database/MigrationRunner.php           |  50 ----
 system/Database/MySQLi/Connection.php         |  50 ----
 system/Database/MySQLi/Forge.php              |   8 -
 system/Database/MySQLi/Result.php             |  16 --
 system/Database/MySQLi/Utils.php              |   4 -
 system/Database/Postgre/Builder.php           |  26 ---
 system/Database/Postgre/Connection.php        |  52 -----
 system/Database/Postgre/Forge.php             |  12 -
 system/Database/Postgre/Result.php            |  16 --
 system/Database/Postgre/Utils.php             |   4 -
 system/Database/PreparedQueryInterface.php    |  12 -
 system/Database/QueryInterface.php            |  20 --
 system/Database/ResultInterface.php           |  38 ---
 system/Database/SQLSRV/Builder.php            |   2 -
 system/Database/SQLSRV/Connection.php         |   6 -
 system/Database/SQLSRV/Forge.php              |   4 -
 system/Database/SQLSRV/Result.php             |   6 -
 system/Database/SQLSRV/Utils.php              |   2 -
 system/Database/SQLite3/Builder.php           |   4 -
 system/Database/SQLite3/Connection.php        |  44 ----
 system/Database/SQLite3/Forge.php             |  18 --
 system/Database/SQLite3/Result.php            |  14 --
 system/Database/SQLite3/Utils.php             |   4 -
 system/Debug/Exceptions.php                   |  23 --
 system/Debug/Iterator.php                     |   8 -
 system/Debug/Timer.php                        |  12 -
 system/Debug/Toolbar.php                      |  17 --
 .../Toolbar/Collectors/BaseCollector.php      |  22 --
 system/Debug/Toolbar/Collectors/Database.php  |  16 --
 system/Debug/Toolbar/Collectors/Events.php    |  10 -
 system/Debug/Toolbar/Collectors/Files.php     |   8 -
 system/Debug/Toolbar/Collectors/History.php   |   8 -
 system/Debug/Toolbar/Collectors/Logs.php      |  10 -
 system/Debug/Toolbar/Collectors/Routes.php    |   6 -
 system/Debug/Toolbar/Collectors/Timers.php    |   2 -
 system/Debug/Toolbar/Collectors/Views.php     |   8 -
 system/Debug/Toolbar/Views/toolbar.js         |  29 ---
 system/Files/File.php                         |  16 --
 system/Filters/CSRF.php                       |   4 -
 system/Filters/DebugToolbar.php               |   4 -
 system/Filters/FilterInterface.php            |   4 -
 system/Format/JSONFormatter.php               |   2 -
 system/HTTP/CLIRequest.php                    |   6 -
 system/HTTP/CURLRequest.php                   |  46 ----
 system/HTTP/ContentSecurityPolicy.php         |   6 -
 system/HTTP/DownloadResponse.php              |  10 -
 system/HTTP/Files/FileCollection.php          |  12 -
 system/HTTP/Files/UploadedFile.php            |  26 ---
 system/HTTP/Files/UploadedFileInterface.php   |  20 --
 system/HTTP/Header.php                        |  20 --
 system/HTTP/IncomingRequest.php               |  38 ---
 system/HTTP/Message.php                       |   2 -
 system/HTTP/MessageTrait.php                  |   2 -
 system/HTTP/Negotiate.php                     |  23 --
 system/HTTP/RequestInterface.php              |   8 -
 system/HTTP/RequestTrait.php                  |  10 -
 system/HTTP/Response.php                      |   3 +-
 system/HTTP/ResponseInterface.php             |   4 -
 system/HTTP/URI.php                           |  72 ------
 system/HTTP/UserAgent.php                     |  38 ---
 system/Helpers/filesystem_helper.php          |  21 --
 system/Helpers/form_helper.php                |  53 +----
 system/Helpers/html_helper.php                |  37 +--
 system/Helpers/inflector_helper.php           |  23 +-
 system/Helpers/number_helper.php              |   8 -
 system/Helpers/security_helper.php            |   6 -
 system/Helpers/test_helper.php                |   1 -
 system/Helpers/text_helper.php                |  39 ----
 system/Helpers/url_helper.php                 |  30 ---
 system/Honeypot/Honeypot.php                  |   4 -
 system/I18n/Time.php                          |  85 -------
 system/I18n/TimeDifference.php                |   2 -
 system/Images/Handlers/BaseHandler.php        |  64 ------
 system/Images/Handlers/GDHandler.php          |  28 ---
 system/Images/Handlers/ImageMagickHandler.php |  28 ---
 system/Images/Image.php                       |   4 -
 system/Images/ImageHandlerInterface.php       |  20 --
 system/Language/Language.php                  |  18 --
 system/Log/Handlers/BaseHandler.php           |  10 -
 system/Log/Handlers/ChromeLoggerHandler.php   |   8 -
 system/Log/Handlers/FileHandler.php           |   6 -
 system/Log/Handlers/HandlerInterface.php      |   6 -
 system/Log/Logger.php                         |  26 ---
 system/Pager/Pager.php                        |  46 ----
 system/Pager/PagerInterface.php               |  30 ---
 system/Pager/PagerRenderer.php                |  30 ---
 system/Router/RouteCollection.php             | 117 +---------
 system/Router/RouteCollectionInterface.php    |  36 ---
 system/Router/Router.php                      |  44 ----
 system/Router/RouterInterface.php             |  12 -
 system/Session/Handlers/ArrayHandler.php      |  14 --
 system/Session/Handlers/BaseHandler.php       |  10 -
 system/Session/Handlers/DatabaseHandler.php   |  20 --
 system/Session/Handlers/FileHandler.php       |  16 --
 system/Session/Handlers/MemcachedHandler.php  |  20 --
 system/Session/Handlers/RedisHandler.php      |  20 --
 system/Session/Session.php                    |  22 +-
 system/Session/SessionInterface.php           |  36 ---
 system/Test/DOMParser.php                     |   2 -
 system/Test/Fabricator.php                    |  14 --
 system/Test/Mock/MockCURLRequest.php          |   5 -
 system/Test/Mock/MockCache.php                |  26 ---
 system/Test/Mock/MockConnection.php           |  34 ---
 system/Test/Mock/MockFileLogger.php           |   2 -
 system/Test/Mock/MockLanguage.php             |   6 -
 system/Test/Mock/MockLogger.php               |   3 -
 system/Test/Mock/MockResult.php               |  16 --
 system/Test/Mock/MockServices.php             |   3 -
 system/Test/TestLogger.php                    |   5 -
 system/Throttle/Throttler.php                 |  10 -
 system/Throttle/ThrottlerInterface.php        |   2 -
 system/Typography/Typography.php              |   8 -
 system/Validation/CreditCardRules.php         |   6 -
 system/Validation/FileRules.php               |  16 --
 system/Validation/Rules.php                   |  38 ---
 system/Validation/ValidationInterface.php     |  25 --
 system/View/Cell.php                          |  10 -
 system/View/Filters.php                       |  30 ---
 system/View/Parser.php                        |  38 ---
 system/View/Plugins.php                       |  14 --
 system/View/RendererInterface.php             |  10 -
 tests/_support/Autoloader/FatalLocator.php    |   2 -
 .../20160428212500_Create_test_tables.php     |   2 -
 .../_support/Language/SecondMockLanguage.php  |   4 -
 tests/_support/Log/Handlers/TestHandler.php   |   8 -
 tests/_support/Services.php                   |   8 -
 tests/_support/Validation/TestRules.php       |   2 -
 tests/_support/View/SampleClass.php           |   6 -
 tests/system/Autoloader/AutoloaderTest.php    |   6 -
 tests/system/Autoloader/FileLocatorTest.php   |  46 ----
 tests/system/CodeIgniterTest.php              |  20 --
 tests/system/CommonFunctionsSendTest.php      |   2 -
 tests/system/Config/DotEnvTest.php            |  34 ---
 tests/system/Config/FactoriesTest.php         |   8 -
 tests/system/Config/MimesTest.php             |   8 -
 tests/system/ControllerTest.php               |   6 -
 tests/system/Database/Builder/AliasTest.php   |  10 -
 tests/system/Database/Builder/BaseTest.php    |   6 -
 .../system/Database/Builder/DistinctTest.php  |   6 -
 tests/system/Database/Builder/EmptyTest.php   |   6 -
 tests/system/Database/Builder/FromTest.php    |  16 --
 tests/system/Database/Builder/GetTest.php     |  14 --
 tests/system/Database/Builder/GroupTest.php   |  64 ------
 tests/system/Database/Builder/JoinTest.php    |  16 --
 tests/system/Database/Builder/LimitTest.php   |  10 -
 tests/system/Database/Builder/OrderTest.php   |  10 -
 tests/system/Database/Builder/PrefixTest.php  |   6 -
 tests/system/Database/Builder/SelectTest.php  |  44 ----
 .../system/Database/Builder/TruncateTest.php  |   6 -
 tests/system/Database/Live/AliasTest.php      |   2 -
 tests/system/Database/Live/BadQueryTest.php   |   2 -
 tests/system/Database/Live/CountTest.php      |  10 -
 tests/system/Database/Live/DbUtilsTest.php    |  28 ---
 tests/system/Database/Live/DeleteTest.php     |   8 -
 tests/system/Database/Live/EmptyTest.php      |   4 -
 tests/system/Database/Live/EscapeTest.php     |  10 -
 tests/system/Database/Live/FromTest.php       |   6 -
 tests/system/Database/Live/GetTest.php        |  31 ---
 tests/system/Database/Live/GroupTest.php      |  38 ---
 tests/system/Database/Live/IncrementTest.php  |   8 -
 tests/system/Database/Live/InsertTest.php     |   8 -
 tests/system/Database/Live/LimitTest.php      |   4 -
 tests/system/Database/Live/MetadataTest.php   |   6 -
 tests/system/Database/Live/OrderTest.php      |   6 -
 .../Database/Live/PreparedQueryTest.php       |   4 -
 tests/system/Database/Live/PretendTest.php    |   2 -
 tests/system/Database/Live/UpdateTest.php     |  18 --
 .../Database/Live/WriteTypeQueryTest.php      |  18 --
 tests/system/Filters/CSRFTest.php             |   1 -
 tests/system/Filters/DebugToolbarTest.php     |   2 -
 tests/system/Filters/HoneypotTest.php         |   6 -
 tests/system/Filters/fixtures/GoogleMe.php    |   4 -
 .../system/Filters/fixtures/InvalidClass.php  |   2 -
 tests/system/HTTP/CLIRequestTest.php          |  12 -
 tests/system/HTTP/CURLRequestTest.php         |   5 -
 .../system/HTTP/ContentSecurityPolicyTest.php |  12 -
 tests/system/HTTP/DownloadResponseTest.php    |   4 -
 .../system/HTTP/Files/FileCollectionTest.php  |  44 ----
 tests/system/HTTP/Files/FileMovingTest.php    |  16 --
 tests/system/HTTP/HeaderTest.php              |  14 --
 .../HTTP/IncomingRequestDetectingTest.php     |   6 -
 tests/system/HTTP/IncomingRequestTest.php     |  30 ---
 tests/system/HTTP/MessageTest.php             |  37 ---
 tests/system/HTTP/NegotiateTest.php           |  22 --
 tests/system/HTTP/RedirectResponseTest.php    |  14 --
 tests/system/HTTP/RequestTest.php             |  10 -
 tests/system/HTTP/ResponseSendTest.php        |   4 -
 tests/system/HTTP/ResponseTest.php            |  54 -----
 tests/system/HTTP/URITest.php                 | 109 ---------
 tests/system/HTTP/UserAgentTest.php           |  12 -
 tests/system/Helpers/DateHelperTest.php       |   4 -
 tests/system/Helpers/FilesystemHelperTest.php |  20 --
 tests/system/Helpers/FormHelperTest.php       |  51 -----
 tests/system/Helpers/HTMLHelperTest.php       |  24 --
 tests/system/Helpers/InflectorHelperTest.php  |  22 --
 tests/system/Helpers/TextHelperTest.php       |  26 ---
 .../Helpers/URLHelper/CurrentUrlTest.php      |  12 -
 .../system/Helpers/URLHelper/MiscUrlTest.php  |  14 --
 .../system/Helpers/URLHelper/SiteUrlTest.php  |   4 -
 tests/system/Helpers/XMLHelperTest.php        |   3 -
 tests/system/Honeypot/HoneypotTest.php        |  11 -
 tests/system/I18n/TimeTest.php                |   8 -
 tests/system/Images/BaseHandlerTest.php       |   3 -
 tests/system/Images/GDHandlerTest.php         |  19 --
 .../system/Images/ImageMagickHandlerTest.php  |  19 --
 tests/system/Language/LanguageTest.php        |  31 ---
 tests/system/Log/Handlers/FileHandlerTest.php |   2 -
 tests/system/Log/LoggerTest.php               |  48 ----
 tests/system/Pager/PagerRendererTest.php      |  50 ----
 .../system/RESTful/ResourceControllerTest.php |   8 -
 .../system/RESTful/ResourcePresenterTest.php  |   6 -
 tests/system/Router/RouteCollectionTest.php   | 120 ----------
 tests/system/Router/RouterTest.php            |   1 -
 tests/system/Test/FabricatorTest.php          |  20 --
 tests/system/Test/TestCaseEmissionsTest.php   |   4 -
 tests/system/Test/TestCaseTest.php            |   9 -
 .../system/Validation/CreditCardRulesTest.php |  10 -
 tests/system/Validation/FileRulesTest.php     |  14 --
 tests/system/Validation/RulesTest.php         | 142 ------------
 tests/system/Validation/ValidationTest.php    |  92 --------
 tests/system/View/CellTest.php                |  33 ---
 tests/system/View/ParserFilterTest.php        |  36 ---
 tests/system/View/ParserTest.php              |  62 -----
 tests/system/View/TableTest.php               |   6 -
 tests/system/View/ViewTest.php                |  26 ---
 user_guide_src/source/general/logging.rst     |   5 -
 user_guide_src/source/libraries/throttler.rst |   8 +-
 264 files changed, 48 insertions(+), 5324 deletions(-)

diff --git a/app/Config/Database.php b/app/Config/Database.php
index b3cdfccc3f9e..1e6340899bf4 100644
--- a/app/Config/Database.php
+++ b/app/Config/Database.php
@@ -76,8 +76,6 @@ class Database extends Config
         'port'     => 3306,
     ];
 
-    //--------------------------------------------------------------------
-
     public function __construct()
     {
         parent::__construct();
@@ -89,6 +87,4 @@ public function __construct()
             $this->defaultGroup = 'tests';
         }
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/app/Config/Format.php b/app/Config/Format.php
index 83ea5c2a1f56..fb2bfde59351 100644
--- a/app/Config/Format.php
+++ b/app/Config/Format.php
@@ -61,8 +61,6 @@ class Format extends BaseConfig
         'text/xml'         => 0,
     ];
 
-    //--------------------------------------------------------------------
-
     /**
      * A Factory method to return the appropriate formatter for the given mime type.
      *
diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php
index b6740e940202..ce357b843fe0 100644
--- a/app/Controllers/BaseController.php
+++ b/app/Controllers/BaseController.php
@@ -49,9 +49,8 @@ public function initController(RequestInterface $request, ResponseInterface $res
         // Do Not Edit This Line
         parent::initController($request, $response, $logger);
 
-        //--------------------------------------------------------------------
         // Preload any models, libraries, etc, here.
-        //--------------------------------------------------------------------
+
         // E.g.: $this->session = \Config\Services::session();
     }
 }
diff --git a/app/Views/errors/html/debug.js b/app/Views/errors/html/debug.js
index f36f8b504188..2b4d0638153a 100644
--- a/app/Views/errors/html/debug.js
+++ b/app/Views/errors/html/debug.js
@@ -1,6 +1,4 @@
-//--------------------------------------------------------------------
 // Tabs
-//--------------------------------------------------------------------
 
 var tabLinks    = new Array();
 var contentDivs = new Array();
@@ -52,8 +50,6 @@ function init()
 	}
 }
 
-//--------------------------------------------------------------------
-
 function showTab()
 {
 	var selectedId = getHash(this.getAttribute('href'));
@@ -78,8 +74,6 @@ function showTab()
 	return false;
 }
 
-//--------------------------------------------------------------------
-
 function getFirstChildWithTagName(element, tagName)
 {
 	for (var i = 0; i < element.childNodes.length; i ++)
@@ -91,16 +85,12 @@ function getFirstChildWithTagName(element, tagName)
 	}
 }
 
-//--------------------------------------------------------------------
-
 function getHash(url)
 {
 	var hashPos = url.lastIndexOf('#');
 	return url.substring(hashPos + 1);
 }
 
-//--------------------------------------------------------------------
-
 function toggle(elem)
 {
 	elem = document.getElementById(elem);
@@ -125,4 +115,4 @@ function toggle(elem)
 	elem.style.display = disp == 'block' ? 'none' : 'block';
 
 	return false;
-}
\ No newline at end of file
+}
diff --git a/contributing/styleguide.rst b/contributing/styleguide.rst
index dd976afdc89e..a500d663fe11 100644
--- a/contributing/styleguide.rst
+++ b/contributing/styleguide.rst
@@ -266,61 +266,38 @@ An example::
 
     <?php
 
-    /**
-     * CodeIgniter
-     *
-     * An open source application development framework for PHP
-     *
-     ...
-     *
-     * @package    CodeIgniter
-     * @author     CodeIgniter Dev Team
-     * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
-     * @license    https://opensource.org/licenses/MIT	MIT License
-     * @link       https://codeigniter.com
-     * @since      Version 4.0.0
-     * @filesource
-     */
     namespace CodeIgniter\Fruit;
+
     use CodeIgniter\Config\BaseConfig;
 
     /**
      * Base class for entities in the CodeIgniter\Fruit module.
-     *
-     * @property $group
-     * @property $name
-     * @property $description
-     *
-     * @package CodeIgniter\Fruit
      */
     abstract class BaseFruit
     {
-
-            /**
-             * The group a fruit belongs to.
-             *
-             * @var string
-             */
-            protected $group;
-
-            /**
-             * Fruit constructor.
-             *
-             * @param BaseConfig       $config
-             */
-            public function __construct(BaseConfig $Config)
-            {
-                    $this->group   = 'Unknown';
-            }
-
-            //--------------------------------------------------------------------
-
-            /**
-             * Model a fruit ripening over time.
-             * 
-             * @param	array	$params
-             */
-            abstract public function ripen(array $params);
+      /**
+        * The group a fruit belongs to.
+        *
+        * @var string
+        */
+      protected $group;
+
+      /**
+        * Fruit constructor.
+        *
+        * @param BaseConfig       $config
+        */
+      public function __construct(BaseConfig $Config)
+      {
+              $this->group   = 'Unknown';
+      }
+
+      /**
+        * Model a fruit ripening over time.
+        *
+        * @param	array	$params
+        */
+      abstract public function ripen(array $params);
     }
 
 Other
diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
index db562ad38fa5..3dbb249634a2 100644
--- a/system/API/ResponseTrait.php
+++ b/system/API/ResponseTrait.php
@@ -81,8 +81,6 @@ trait ResponseTrait
      */
     protected $formatter;
 
-    //--------------------------------------------------------------------
-
     /**
      * Provides a single, simple method to return an API response, formatted
      * to match the requested format, with proper content-type and status code.
@@ -123,8 +121,6 @@ public function respond($data = null, ?int $status = null, string $message = '')
         return $this->response->setBody($output)->setStatusCode($status, $message);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Used for generic failures that no custom methods exist for.
      *
@@ -150,7 +146,6 @@ public function fail($messages, int $status = 400, ?string $code = null, string
         return $this->respond($response, $status, $customMessage);
     }
 
-    //--------------------------------------------------------------------
     //--------------------------------------------------------------------
     // Response Helpers
     //--------------------------------------------------------------------
@@ -168,8 +163,6 @@ public function respondCreated($data = null, string $message = '')
         return $this->respond($data, $this->codes['created'], $message);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Used after a resource has been successfully deleted.
      *
@@ -196,8 +189,6 @@ public function respondUpdated($data = null, string $message = '')
         return $this->respond($data, $this->codes['updated'], $message);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Used after a command has been successfully executed but there is no
      * meaningful reply to send back to the client.
@@ -211,8 +202,6 @@ public function respondNoContent(string $message = 'No Content')
         return $this->respond(null, $this->codes['no_content'], $message);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Used when the client is either didn't send authorization information,
      * or had bad authorization credentials. User is encouraged to try again
@@ -229,8 +218,6 @@ public function failUnauthorized(string $description = 'Unauthorized', ?string $
         return $this->fail($description, $this->codes['unauthorized'], $code, $message);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Used when access is always denied to this resource and no amount
      * of trying again will help.
@@ -246,8 +233,6 @@ public function failForbidden(string $description = 'Forbidden', ?string $code =
         return $this->fail($description, $this->codes['forbidden'], $code, $message);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Used when a specified resource cannot be found.
      *
@@ -262,8 +247,6 @@ public function failNotFound(string $description = 'Not Found', ?string $code =
         return $this->fail($description, $this->codes['resource_not_found'], $code, $message);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Used when the data provided by the client cannot be validated.
      *
@@ -294,8 +277,6 @@ public function failValidationErrors($errors, ?string $code = null, string $mess
         return $this->fail($errors, $this->codes['invalid_data'], $code, $message);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Use when trying to create a new resource and it already exists.
      *
@@ -310,8 +291,6 @@ public function failResourceExists(string $description = 'Conflict', ?string $co
         return $this->fail($description, $this->codes['resource_exists'], $code, $message);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Use when a resource was previously deleted. This is different than
      * Not Found, because here we know the data previously existed, but is now gone,
@@ -328,8 +307,6 @@ public function failResourceGone(string $description = 'Gone', ?string $code = n
         return $this->fail($description, $this->codes['resource_gone'], $code, $message);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Used when the user has made too many requests for the resource recently.
      *
@@ -344,8 +321,6 @@ public function failTooManyRequests(string $description = 'Too Many Requests', ?
         return $this->fail($description, $this->codes['too_many_requests'], $code, $message);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Used when there is a server error.
      *
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index 1ee314a655fc..2705c0cdac70 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -140,8 +140,6 @@ class CLI
      */
     protected static $isColored = false;
 
-    //--------------------------------------------------------------------
-
     /**
      * Static "constructor".
      */
@@ -172,8 +170,6 @@ public static function init()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get input from the shell, using readline or the standard STDIN
      *
@@ -197,8 +193,6 @@ public static function input(?string $prefix = null): string
         return fgets(STDIN);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Asks the user for input.
      *
@@ -272,8 +266,6 @@ public static function prompt(string $field, $options = null, $validation = null
         return empty($input) ? '' : $input;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Validate one prompt "field" at a time
      *
@@ -307,8 +299,6 @@ protected static function validate(string $field, string $value, $rules): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Outputs a string to the CLI without any surrounding newlines.
      * Useful for showing repeating elements on a single line.
@@ -349,8 +339,6 @@ public static function write(string $text = '', ?string $foreground = null, ?str
         static::fwrite(STDOUT, $text . PHP_EOL);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Outputs an error to the CLI using STDERR instead of STDOUT
      *
@@ -374,8 +362,6 @@ public static function error(string $text, string $foreground = 'light_red', ?st
         static::$isColored = $stdout;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Beeps a certain number of times.
      *
@@ -386,8 +372,6 @@ public static function beep(int $num = 1)
         echo str_repeat("\x07", $num);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Waits a certain number of seconds, optionally showing a wait message and
      * waiting for a key press.
@@ -418,8 +402,6 @@ public static function wait(int $seconds, bool $countdown = false)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * if operating system === windows
      *
@@ -430,8 +412,6 @@ public static function isWindows(): bool
         return PHP_OS_FAMILY === 'Windows';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Enter a number of empty lines
      *
@@ -447,8 +427,6 @@ public static function newLine(int $num = 1)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Clears the screen of output
      *
@@ -465,8 +443,6 @@ public static function clearScreen()
             : static::fwrite(STDOUT, "\033[H\033[2J");
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the given text with the correct color codes for a foreground and
      * optionally a background color.
@@ -529,8 +505,6 @@ public static function color(string $text, string $foreground, ?string $backgrou
         return $string . $text . "\033[0m";
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get the number of characters in string having encoded characters
      * and ignores styles set by the color() function
@@ -558,8 +532,6 @@ public static function strlen(?string $string): int
         return mb_strwidth($string);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks whether the current stream resource supports or
      * refers to a valid terminal type device.
@@ -583,8 +555,6 @@ public static function streamSupports(string $function, $resource): bool
         // @codeCoverageIgnoreEnd
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns true if the stream resource supports colors.
      *
@@ -621,8 +591,6 @@ public static function hasColorSupport($resource): bool
         return static::streamSupports('stream_isatty', $resource);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Attempts to determine the width of the viewable CLI window.
      *
@@ -639,8 +607,6 @@ public static function getWidth(int $default = 80): int
         return static::$width ?: $default;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Attempts to determine the height of the viewable CLI window.
      *
@@ -657,8 +623,6 @@ public static function getHeight(int $default = 32): int
         return static::$height ?: $default;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Populates the CLI's dimensions.
      *
@@ -708,8 +672,6 @@ public static function generateDimensions()
         // @codeCoverageIgnoreEnd
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Displays a progress bar on the CLI. You must call it repeatedly
      * to update it. Set $thisStep = false to erase the progress bar.
@@ -744,8 +706,6 @@ public static function showProgress($thisStep = 1, int $totalSteps = 10)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Takes a string and writes it to the command line, wrapping to a maximum
      * width. If no maximum width is specified, will wrap to the window's max
@@ -798,7 +758,6 @@ public static function wrap(?string $string = null, int $max = 0, int $padLeft =
         return $lines;
     }
 
-    //--------------------------------------------------------------------
     //--------------------------------------------------------------------
     // Command-Line 'URI' support
     //--------------------------------------------------------------------
@@ -841,8 +800,6 @@ protected static function parseCommandLine()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the command line string portions of the arguments, minus
      * any options, as a string. This is used to pass along to the main
@@ -855,8 +812,6 @@ public static function getURI(): string
         return implode('/', static::$segments);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an individual segment.
      *
@@ -877,8 +832,6 @@ public static function getSegment(int $index)
         return static::$segments[$index - 1] ?? null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the raw array of segments found.
      *
@@ -889,8 +842,6 @@ public static function getSegments(): array
         return static::$segments;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Gets a single command-line option. Returns TRUE if the option
      * exists, but doesn't have a value, and is simply acting as a flag.
@@ -912,8 +863,6 @@ public static function getOption(string $name)
         return $val;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the raw array of options found.
      *
@@ -924,8 +873,6 @@ public static function getOptions(): array
         return static::$options;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the options as a string, suitable for passing along on
      * the CLI to other commands.
@@ -962,8 +909,6 @@ public static function getOptionString(bool $useLongOpts = false, bool $trim = f
         return $trim ? trim($out) : $out;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a well formatted table
      *
@@ -1059,8 +1004,6 @@ public static function table(array $tbody, array $thead = [])
         static::write($table);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * While the library is intended for use on CLI commands,
      * commands can be called from controllers and elsewhere
@@ -1089,6 +1032,4 @@ protected static function fwrite($handle, string $string)
 }
 
 // Ensure the class is initialized. Done outside of code coverage
-// @codeCoverageIgnoreStart
-CLI::init();
-// @codeCoverageIgnoreEnd
+CLI::init(); // @codeCoverageIgnore
diff --git a/system/CLI/Console.php b/system/CLI/Console.php
index 9f777f13bf5e..486c6d9d4d3c 100644
--- a/system/CLI/Console.php
+++ b/system/CLI/Console.php
@@ -29,8 +29,6 @@ class Console
      */
     protected $app;
 
-    //--------------------------------------------------------------------
-
     /**
      * Console constructor.
      *
@@ -41,8 +39,6 @@ public function __construct(CodeIgniter $app)
         $this->app = $app;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Runs the current command discovered on the CLI.
      *
@@ -62,8 +58,6 @@ public function run(bool $useSafeOutput = false)
         return $this->app->useSafeOutput($useSafeOutput)->run();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Displays basic information about the Console.
      *
diff --git a/system/Cache/CacheFactory.php b/system/Cache/CacheFactory.php
index a63fb9805408..ff326c8f03ad 100644
--- a/system/Cache/CacheFactory.php
+++ b/system/Cache/CacheFactory.php
@@ -75,6 +75,4 @@ public static function getHandler(Cache $config, ?string $handler = null, ?strin
 
         return $adapter;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Cache/CacheInterface.php b/system/Cache/CacheInterface.php
index 0e788bdc4a2e..3dc344d6f149 100644
--- a/system/Cache/CacheInterface.php
+++ b/system/Cache/CacheInterface.php
@@ -21,8 +21,6 @@ interface CacheInterface
      */
     public function initialize();
 
-    //--------------------------------------------------------------------
-
     /**
      * Attempts to fetch an item from the cache store.
      *
@@ -32,8 +30,6 @@ public function initialize();
      */
     public function get(string $key);
 
-    //--------------------------------------------------------------------
-
     /**
      * Saves an item to the cache store.
      *
@@ -45,8 +41,6 @@ public function get(string $key);
      */
     public function save(string $key, $value, int $ttl = 60);
 
-    //--------------------------------------------------------------------
-
     /**
      * Deletes a specific item from the cache store.
      *
@@ -56,8 +50,6 @@ public function save(string $key, $value, int $ttl = 60);
      */
     public function delete(string $key);
 
-    //--------------------------------------------------------------------
-
     /**
      * Performs atomic incrementation of a raw stored value.
      *
@@ -68,8 +60,6 @@ public function delete(string $key);
      */
     public function increment(string $key, int $offset = 1);
 
-    //--------------------------------------------------------------------
-
     /**
      * Performs atomic decrementation of a raw stored value.
      *
@@ -80,8 +70,6 @@ public function increment(string $key, int $offset = 1);
      */
     public function decrement(string $key, int $offset = 1);
 
-    //--------------------------------------------------------------------
-
     /**
      * Will delete all items in the entire cache.
      *
@@ -89,8 +77,6 @@ public function decrement(string $key, int $offset = 1);
      */
     public function clean();
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns information on the entire cache.
      *
@@ -101,8 +87,6 @@ public function clean();
      */
     public function getCacheInfo();
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns detailed information about the specific item in the cache.
      *
@@ -115,14 +99,10 @@ public function getCacheInfo();
      */
     public function getMetaData(string $key);
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines if the driver is supported on this system.
      *
      * @return bool
      */
     public function isSupported(): bool;
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Cache/Handlers/BaseHandler.php b/system/Cache/Handlers/BaseHandler.php
index a55f59d96393..9397959f2da0 100644
--- a/system/Cache/Handlers/BaseHandler.php
+++ b/system/Cache/Handlers/BaseHandler.php
@@ -66,8 +66,6 @@ public static function validateKey($key, $prefix = ''): string
         return strlen($prefix . $key) > static::MAX_KEY_LENGTH ? $prefix . md5($key) : $prefix . $key;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get an item from the cache, or execute the given Closure and store the result.
      *
@@ -90,8 +88,6 @@ public function remember(string $key, int $ttl, Closure $callback)
         return $value;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Deletes items from the cache store matching a given pattern.
      *
diff --git a/system/Cache/Handlers/DummyHandler.php b/system/Cache/Handlers/DummyHandler.php
index b1cbccf741f8..cd1cf0a029a4 100644
--- a/system/Cache/Handlers/DummyHandler.php
+++ b/system/Cache/Handlers/DummyHandler.php
@@ -25,8 +25,6 @@ public function initialize()
     {
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Attempts to fetch an item from the cache store.
      *
@@ -39,8 +37,6 @@ public function get(string $key)
         return null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get an item from the cache, or execute the given Closure and store the result.
      *
@@ -55,8 +51,6 @@ public function remember(string $key, int $ttl, Closure $callback)
         return null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Saves an item to the cache store.
      *
@@ -71,8 +65,6 @@ public function save(string $key, $value, int $ttl = 60)
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Deletes a specific item from the cache store.
      *
@@ -85,8 +77,6 @@ public function delete(string $key)
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Deletes items from the cache store matching a given pattern.
      *
@@ -99,8 +89,6 @@ public function deleteMatching(string $pattern)
         return 0;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Performs atomic incrementation of a raw stored value.
      *
@@ -114,8 +102,6 @@ public function increment(string $key, int $offset = 1)
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Performs atomic decrementation of a raw stored value.
      *
@@ -129,8 +115,6 @@ public function decrement(string $key, int $offset = 1)
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Will delete all items in the entire cache.
      *
@@ -141,8 +125,6 @@ public function clean()
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns information on the entire cache.
      *
@@ -156,8 +138,6 @@ public function getCacheInfo()
         return null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns detailed information about the specific item in the cache.
      *
@@ -170,8 +150,6 @@ public function getMetaData(string $key)
         return null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines if the driver is supported on this system.
      *
diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php
index 9ee4c6691dc0..d5277c2496fa 100644
--- a/system/Cache/Handlers/FileHandler.php
+++ b/system/Cache/Handlers/FileHandler.php
@@ -42,8 +42,6 @@ class FileHandler extends BaseHandler
      */
     protected $mode;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      *
@@ -71,8 +69,6 @@ public function __construct(Cache $config)
         $this->prefix = $config->prefix;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Takes care of any handler-specific setup that must be done.
      */
@@ -80,8 +76,6 @@ public function initialize()
     {
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Attempts to fetch an item from the cache store.
      *
@@ -97,8 +91,6 @@ public function get(string $key)
         return is_array($data) ? $data['data'] : null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Saves an item to the cache store.
      *
@@ -134,8 +126,6 @@ public function save(string $key, $value, int $ttl = 60)
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Deletes a specific item from the cache store.
      *
@@ -150,8 +140,6 @@ public function delete(string $key)
         return is_file($this->path . $key) && unlink($this->path . $key);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Deletes items from the cache store matching a given pattern.
      *
@@ -172,8 +160,6 @@ public function deleteMatching(string $pattern)
         return $deleted;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Performs atomic incrementation of a raw stored value.
      *
@@ -201,8 +187,6 @@ public function increment(string $key, int $offset = 1)
         return $this->save($key, $newValue, $data['ttl']) ? $newValue : false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Performs atomic decrementation of a raw stored value.
      *
@@ -230,8 +214,6 @@ public function decrement(string $key, int $offset = 1)
         return $this->save($key, $newValue, $data['ttl']) ? $newValue : false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Will delete all items in the entire cache.
      *
@@ -242,8 +224,6 @@ public function clean()
         return $this->deleteFiles($this->path, false, true);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns information on the entire cache.
      *
@@ -257,8 +237,6 @@ public function getCacheInfo()
         return $this->getDirFileInfo($this->path);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns detailed information about the specific item in the cache.
      *
@@ -284,8 +262,6 @@ public function getMetaData(string $key)
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines if the driver is supported on this system.
      *
@@ -296,8 +272,6 @@ public function isSupported(): bool
         return is_writable($this->path);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Does the heavy lifting of actually retrieving the file and
      * verifying it's age.
@@ -330,11 +304,6 @@ protected function getItem(string $filename)
         return $data;
     }
 
-    //--------------------------------------------------------------------
-    //--------------------------------------------------------------------
-    // SUPPORT METHODS FOR FILES
-    //--------------------------------------------------------------------
-
     /**
      * Writes a file to disk, or returns false if not successful.
      *
@@ -364,8 +333,6 @@ protected function writeFile($path, $data, $mode = 'wb')
         return is_int($result);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Delete Files
      *
@@ -405,8 +372,6 @@ protected function deleteFiles(string $path, bool $delDir = false, bool $htdocs
         return ($delDir === true && $_level > 0) ? @rmdir($path) : true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get Directory File Information
      *
@@ -451,8 +416,6 @@ protected function getDirFileInfo(string $sourceDir, bool $topLevelOnly = true,
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get File Info
      *
diff --git a/system/Cache/Handlers/MemcachedHandler.php b/system/Cache/Handlers/MemcachedHandler.php
index d3c7e32878c4..4c9ec7878320 100644
--- a/system/Cache/Handlers/MemcachedHandler.php
+++ b/system/Cache/Handlers/MemcachedHandler.php
@@ -41,8 +41,6 @@ class MemcachedHandler extends BaseHandler
         'raw'    => false,
     ];
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      *
@@ -71,8 +69,6 @@ public function __destruct()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Takes care of any handler-specific setup that must be done.
      */
@@ -135,8 +131,6 @@ public function initialize()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Attempts to fetch an item from the cache store.
      *
@@ -168,8 +162,6 @@ public function get(string $key)
         return is_array($data) ? $data[0] : $data; // @phpstan-ignore-line
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Saves an item to the cache store.
      *
@@ -203,8 +195,6 @@ public function save(string $key, $value, int $ttl = 60)
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Deletes a specific item from the cache store.
      *
@@ -219,8 +209,6 @@ public function delete(string $key)
         return $this->memcached->delete($key);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Deletes items from the cache store matching a given pattern.
      *
@@ -233,8 +221,6 @@ public function deleteMatching(string $pattern)
         throw new Exception('The deleteMatching method is not implemented for Memcached. You must select File, Redis or Predis handlers to use it.');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Performs atomic incrementation of a raw stored value.
      *
@@ -255,8 +241,6 @@ public function increment(string $key, int $offset = 1)
         return $this->memcached->increment($key, $offset, $offset, 60);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Performs atomic decrementation of a raw stored value.
      *
@@ -278,8 +262,6 @@ public function decrement(string $key, int $offset = 1)
         return $this->memcached->decrement($key, $offset, $offset, 60);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Will delete all items in the entire cache.
      *
@@ -290,8 +272,6 @@ public function clean()
         return $this->memcached->flush();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns information on the entire cache.
      *
@@ -305,8 +285,6 @@ public function getCacheInfo()
         return $this->memcached->getStats();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns detailed information about the specific item in the cache.
      *
@@ -336,8 +314,6 @@ public function getMetaData(string $key)
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines if the driver is supported on this system.
      *
diff --git a/system/Cache/Handlers/PredisHandler.php b/system/Cache/Handlers/PredisHandler.php
index 6f93c7a9bae0..c1b8d33991a0 100644
--- a/system/Cache/Handlers/PredisHandler.php
+++ b/system/Cache/Handlers/PredisHandler.php
@@ -42,8 +42,6 @@ class PredisHandler extends BaseHandler
      */
     protected $redis;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      *
@@ -58,8 +56,6 @@ public function __construct(Cache $config)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Takes care of any handler-specific setup that must be done.
      */
@@ -79,8 +75,6 @@ public function initialize()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Attempts to fetch an item from the cache store.
      *
@@ -119,8 +113,6 @@ public function get(string $key)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Saves an item to the cache store.
      *
@@ -161,8 +153,6 @@ public function save(string $key, $value, int $ttl = 60)
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Deletes a specific item from the cache store.
      *
@@ -177,8 +167,6 @@ public function delete(string $key)
         return $this->redis->del($key) === 1;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Deletes items from the cache store matching a given pattern.
      *
@@ -197,8 +185,6 @@ public function deleteMatching(string $pattern)
         return $this->redis->del($matchedKeys);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Performs atomic incrementation of a raw stored value.
      *
@@ -214,8 +200,6 @@ public function increment(string $key, int $offset = 1)
         return $this->redis->hincrby($key, 'data', $offset);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Performs atomic decrementation of a raw stored value.
      *
@@ -231,8 +215,6 @@ public function decrement(string $key, int $offset = 1)
         return $this->redis->hincrby($key, 'data', -$offset);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Will delete all items in the entire cache.
      *
@@ -243,8 +225,6 @@ public function clean()
         return $this->redis->flushdb()->getPayload() === 'OK';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns information on the entire cache.
      *
@@ -258,8 +238,6 @@ public function getCacheInfo()
         return $this->redis->info();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns detailed information about the specific item in the cache.
      *
@@ -289,8 +267,6 @@ public function getMetaData(string $key)
         return null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines if the driver is supported on this system.
      *
diff --git a/system/Cache/Handlers/RedisHandler.php b/system/Cache/Handlers/RedisHandler.php
index 72e3482c3e29..92323984b5c1 100644
--- a/system/Cache/Handlers/RedisHandler.php
+++ b/system/Cache/Handlers/RedisHandler.php
@@ -41,8 +41,6 @@ class RedisHandler extends BaseHandler
      */
     protected $redis;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      *
@@ -69,8 +67,6 @@ public function __destruct()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Takes care of any handler-specific setup that must be done.
      */
@@ -111,8 +107,6 @@ public function initialize()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Attempts to fetch an item from the cache store.
      *
@@ -147,8 +141,6 @@ public function get(string $key)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Saves an item to the cache store.
      *
@@ -191,8 +183,6 @@ public function save(string $key, $value, int $ttl = 60)
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Deletes a specific item from the cache store.
      *
@@ -207,8 +197,6 @@ public function delete(string $key)
         return $this->redis->del($key) === 1;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Deletes items from the cache store matching a given pattern.
      *
@@ -236,8 +224,6 @@ public function deleteMatching(string $pattern)
         return $this->redis->del($matchedKeys);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Performs atomic incrementation of a raw stored value.
      *
@@ -253,8 +239,6 @@ public function increment(string $key, int $offset = 1)
         return $this->redis->hIncrBy($key, 'data', $offset);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Performs atomic decrementation of a raw stored value.
      *
@@ -270,8 +254,6 @@ public function decrement(string $key, int $offset = 1)
         return $this->redis->hIncrBy($key, 'data', -$offset);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Will delete all items in the entire cache.
      *
@@ -282,8 +264,6 @@ public function clean()
         return $this->redis->flushDB();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns information on the entire cache.
      *
@@ -297,8 +277,6 @@ public function getCacheInfo()
         return $this->redis->info();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns detailed information about the specific item in the cache.
      *
@@ -327,8 +305,6 @@ public function getMetaData(string $key)
         return null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines if the driver is supported on this system.
      *
diff --git a/system/Cache/Handlers/WincacheHandler.php b/system/Cache/Handlers/WincacheHandler.php
index 3863f3f51576..1c114ddeb738 100644
--- a/system/Cache/Handlers/WincacheHandler.php
+++ b/system/Cache/Handlers/WincacheHandler.php
@@ -31,8 +31,6 @@ public function __construct(Cache $config)
         $this->prefix = $config->prefix;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Takes care of any handler-specific setup that must be done.
      */
@@ -40,8 +38,6 @@ public function initialize()
     {
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Attempts to fetch an item from the cache store.
      *
@@ -60,8 +56,6 @@ public function get(string $key)
         return $success ? $data : null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Saves an item to the cache store.
      *
@@ -78,8 +72,6 @@ public function save(string $key, $value, int $ttl = 60)
         return wincache_ucache_set($key, $value, $ttl);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Deletes a specific item from the cache store.
      *
@@ -94,8 +86,6 @@ public function delete(string $key)
         return wincache_ucache_delete($key);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Deletes items from the cache store matching a given pattern.
      *
@@ -108,8 +98,6 @@ public function deleteMatching(string $pattern)
         throw new Exception('The deleteMatching method is not implemented for Wincache. You must select File, Redis or Predis handlers to use it.');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Performs atomic incrementation of a raw stored value.
      *
@@ -125,8 +113,6 @@ public function increment(string $key, int $offset = 1)
         return wincache_ucache_inc($key, $offset);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Performs atomic decrementation of a raw stored value.
      *
@@ -142,8 +128,6 @@ public function decrement(string $key, int $offset = 1)
         return wincache_ucache_dec($key, $offset);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Will delete all items in the entire cache.
      *
@@ -154,8 +138,6 @@ public function clean()
         return wincache_ucache_clear();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns information on the entire cache.
      *
@@ -169,8 +151,6 @@ public function getCacheInfo()
         return wincache_ucache_info(true);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns detailed information about the specific item in the cache.
      *
@@ -201,8 +181,6 @@ public function getMetaData(string $key)
         return false; // This will return null in a future release
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines if the driver is supported on this system.
      *
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index b680c008f52a..9d23f80d0290 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -276,8 +276,6 @@ protected function initializeKint()
         CliRenderer::$min_terminal_width = $config->cliMinWidth;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Launch the application!
      *
@@ -341,8 +339,6 @@ public function run(?RouteCollectionInterface $routes = null, bool $returnRespon
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Set our Response instance to "pretend" mode so that things like
      * cookies and headers are not actually sent, allowing PHP 7.2+ to
@@ -359,8 +355,6 @@ public function useSafeOutput(bool $safe = true)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Handles the main request logic and fires the controller.
      *
@@ -454,16 +448,12 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
             $this->sendResponse();
         }
 
-        //--------------------------------------------------------------------
         // Is there a post-system event?
-        //--------------------------------------------------------------------
         Events::trigger('post_system');
 
         return $this->response;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * You can load different configurations depending on your
      * current environment. Setting the environment also influences
@@ -485,8 +475,6 @@ protected function detectEnvironment()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Load any custom boot files based upon the current environment.
      *
@@ -507,8 +495,6 @@ protected function bootstrapEnvironment()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Start the Benchmark
      *
@@ -524,8 +510,6 @@ protected function startBenchmark()
         $this->benchmark->start('bootstrap');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets a Request object to be used for this request.
      * Used when running certain tests.
@@ -541,8 +525,6 @@ public function setRequest(Request $request)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get our Request object, (either IncomingRequest or CLIRequest)
      * and set the server protocol based on the information provided
@@ -566,8 +548,6 @@ protected function getRequestObject()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get our Response object, and set some default values, including
      * the HTTP protocol version and a default successful response.
@@ -584,8 +564,6 @@ protected function getResponseObject()
         $this->response->setStatusCode(200);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Force Secure Site Access? If the config value 'forceGlobalSecureRequests'
      * is true, will enforce that all requests to this site are made through
@@ -605,8 +583,6 @@ protected function forceSecureAccess($duration = 31536000)
         force_https($duration, $this->request, $this->response);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines if a response has been cached for the given URI.
      *
@@ -646,8 +622,6 @@ public function displayCache(Cache $config)
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Tells the app that the final output should be cached.
      *
@@ -660,8 +634,6 @@ public static function cache(int $time)
         static::$cacheTTL = $time;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Caches the full response from the current request. Used for
      * full-page caching for very high performance.
@@ -681,8 +653,6 @@ public function cachePage(Cache $config)
         return cache()->save($this->generateCacheName($config), serialize(['headers' => $headers, 'output' => $this->output]), static::$cacheTTL);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an array with our basic performance stats collected.
      *
@@ -696,8 +666,6 @@ public function getPerformanceStats(): array
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates the cache name to use for our full-page caching.
      *
@@ -722,8 +690,6 @@ protected function generateCacheName(Cache $config): string
         return md5($name);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Replaces the elapsed_time tag.
      *
@@ -738,8 +704,6 @@ public function displayPerformanceMetrics(string $output): string
         return str_replace('{elapsed_time}', (string) $this->totalTime, $output);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Try to Route It - As it sounds like, works with the router to
      * match a route against the current URI. If the route is a
@@ -782,8 +746,6 @@ protected function tryToRouteIt(?RouteCollectionInterface $routes = null)
         return $this->router->getFilter();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines the path to use for us to try to route to, based
      * on user input (setPath), or the CLI/IncomingRequest path.
@@ -797,8 +759,6 @@ protected function determinePath()
         return method_exists($this->request, 'getPath') ? $this->request->getPath() : $this->request->getUri()->getPath();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Allows the request path to be set from outside the class,
      * instead of relying on CLIRequest or IncomingRequest for the path.
@@ -816,8 +776,6 @@ public function setPath(string $path)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Now that everything has been setup, this method attempts to run the
      * controller method and make the script go. If it's not able to, will
@@ -846,8 +804,6 @@ protected function startController()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Instantiates the controller class.
      *
@@ -863,8 +819,6 @@ protected function createController()
         return $class;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Runs the controller, allowing for _remap methods to function.
      *
@@ -888,8 +842,6 @@ protected function runController($class)
         return $output;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Displays a 404 Page Not Found error. If set, will try to
      * call the 404Override controller/method that was set in routing config.
@@ -940,8 +892,6 @@ protected function display404errors(PageNotFoundException $e)
         throw PageNotFoundException::forPageNotFound(ENVIRONMENT !== 'production' || is_cli() ? $e->getMessage() : '');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Gathers the script output from the buffer, replaces some execution
      * time tag in the output and displays the debug toolbar, if required.
@@ -989,8 +939,6 @@ protected function gatherOutput(?Cache $cacheConfig = null, $returned = null)
         $this->response->setBody($this->output);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * If we have a session object to use, store the current URI
      * as the previous URI. This is called just prior to sending the
@@ -1021,8 +969,6 @@ public function storePreviousURL($uri)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Modifies the Request Object to use a different method if a POST
      * variable called _method is found.
@@ -1052,8 +998,6 @@ protected function sendResponse()
         $this->response->pretend($this->useSafeOutput)->send();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Exits the application, setting the exit code for CLI-based applications
      * that might be watching.
@@ -1065,10 +1009,6 @@ protected function sendResponse()
      */
     protected function callExit($code)
     {
-        // @codeCoverageIgnoreStart
-        exit($code);
-        // @codeCoverageIgnoreEnd
+        exit($code); // @codeCoverageIgnore
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Commands/Help.php b/system/Commands/Help.php
index de11e0af5762..7aa9a5cc6ad7 100644
--- a/system/Commands/Help.php
+++ b/system/Commands/Help.php
@@ -66,8 +66,6 @@ class Help extends BaseCommand
      */
     protected $options = [];
 
-    //--------------------------------------------------------------------
-
     /**
      * Displays the help for spark commands.
      *
diff --git a/system/Commands/ListCommands.php b/system/Commands/ListCommands.php
index cf1638d882a4..fd57bfc9e73a 100644
--- a/system/Commands/ListCommands.php
+++ b/system/Commands/ListCommands.php
@@ -67,8 +67,6 @@ class ListCommands extends BaseCommand
         '--simple' => 'Prints a list of the commands with no other info',
     ];
 
-    //--------------------------------------------------------------------
-
     /**
      * Displays the help for the spark cli script itself.
      *
diff --git a/system/Commands/Utilities/Namespaces.php b/system/Commands/Utilities/Namespaces.php
index fa4a7e7dcbf6..f4ef07a5c1ee 100644
--- a/system/Commands/Utilities/Namespaces.php
+++ b/system/Commands/Utilities/Namespaces.php
@@ -65,8 +65,6 @@ class Namespaces extends BaseCommand
      */
     protected $options = [];
 
-    //--------------------------------------------------------------------
-
     /**
      * Displays the help for the spark cli script itself.
      *
diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
index a1eff53f2106..0d914d766f84 100644
--- a/system/Commands/Utilities/Routes.php
+++ b/system/Commands/Utilities/Routes.php
@@ -65,8 +65,6 @@ class Routes extends BaseCommand
      */
     protected $options = [];
 
-    //--------------------------------------------------------------------
-
     /**
      * Displays the help for the spark cli script itself.
      *
diff --git a/system/Common.php b/system/Common.php
index 7b0eb8a4ffb6..2e76c2cab237 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -32,9 +32,7 @@
 use Config\View;
 use Laminas\Escaper\Escaper;
 
-//--------------------------------------------------------------------
 // Services Convenience Functions
-//--------------------------------------------------------------------
 
 if (! function_exists('app_timezone')) {
     /**
diff --git a/system/Config/DotEnv.php b/system/Config/DotEnv.php
index 52f5ec24dddb..49a2a70a3a1d 100644
--- a/system/Config/DotEnv.php
+++ b/system/Config/DotEnv.php
@@ -25,8 +25,6 @@ class DotEnv
      */
     protected $path;
 
-    //--------------------------------------------------------------------
-
     /**
      * Builds the path to our file.
      *
@@ -38,8 +36,6 @@ public function __construct(string $path, string $file = '.env')
         $this->path = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The main entry point, will load the .env file and process it
      * so that we end up with all settings in the PHP environment vars
@@ -54,8 +50,6 @@ public function load(): bool
         return $vars !== null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Parse the .env file into an array of key => value
      *
@@ -94,8 +88,6 @@ public function parse(): ?array
         return $vars;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the variable into the environment. Will parse the string
      * first to look for {name}={value} pattern, ensure that nested
@@ -119,8 +111,6 @@ protected function setVariable(string $name, string $value = '')
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Parses for assignment, cleans the $name and $value, and ensures
      * that nested variables are handled.
@@ -150,8 +140,6 @@ public function normaliseVariable(string $name, string $value = ''): array
         return [$name, $value];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Strips quotes from the environment variable value.
      *
@@ -207,8 +195,6 @@ protected function sanitizeValue(string $value): string
         return $value;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      *  Resolve the nested variables.
      *
@@ -243,8 +229,6 @@ function ($matchedPatterns) {
         return $value;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Search the different places for environment variables and return first value found.
      *
@@ -271,6 +255,4 @@ protected function getVariable(string $name)
                 return $value === false ? null : $value;
         }
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Config/Factories.php b/system/Config/Factories.php
index ec8aa2080eb5..c03264b422fa 100644
--- a/system/Config/Factories.php
+++ b/system/Config/Factories.php
@@ -67,8 +67,6 @@ class Factories
      */
     protected static $instances = [];
 
-    //--------------------------------------------------------------------
-
     /**
      * Loads instances based on the method component name. Either
      * creates a new instance or returns an existing shared instance.
@@ -177,8 +175,6 @@ protected static function locateClass(array $options, string $name): ?string
         return null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Verifies that a class & config satisfy the "preferApp" option
      *
@@ -220,8 +216,6 @@ protected static function verifyInstanceOf(array $options, string $name): bool
         return is_a($name, $options['instanceOf'], true);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the component-specific configuration
      *
diff --git a/system/Config/Services.php b/system/Config/Services.php
index 0186cfa4b118..65f5b7cc368d 100644
--- a/system/Config/Services.php
+++ b/system/Config/Services.php
@@ -109,8 +109,6 @@ public static function cache(?Cache $config = null, bool $getShared = true)
         return CacheFactory::getHandler($config);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The CLI Request class provides for ways to interact with
      * a command line request.
@@ -131,8 +129,6 @@ public static function clirequest(?App $config = null, bool $getShared = true)
         return new CLIRequest($config);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * CodeIgniter, the core of the framework.
      *
@@ -196,8 +192,6 @@ public static function curlrequest(array $options = [], ?ResponseInterface $resp
         );
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The Email class allows you to send email via mail, sendmail, SMTP.
      *
@@ -239,8 +233,6 @@ public static function encrypter(?EncryptionConfig $config = null, $getShared =
         return $encryption->initialize($config);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The Exceptions class holds the methods that handle:
      *
@@ -272,8 +264,6 @@ public static function exceptions(
         return new Exceptions($config, $request, $response);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Filters allow you to run tasks before and/or after a controller
      * is executed. During before filters, the request can be modified,
@@ -296,8 +286,6 @@ public static function filters(?FiltersConfig $config = null, bool $getShared =
         return new Filters($config, AppServices::request(), AppServices::response());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The Format class is a convenient place to create Formatters.
      *
@@ -317,8 +305,6 @@ public static function format(?FormatConfig $config = null, bool $getShared = tr
         return new Format($config);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The Honeypot provides a secret input on forms that bots should NOT
      * fill in, providing an additional safeguard when accepting user input.
@@ -339,8 +325,6 @@ public static function honeypot(?HoneypotConfig $config = null, bool $getShared
         return new Honeypot($config);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Acts as a factory for ImageHandler classes and returns an instance
      * of the handler. Used like Services::image()->withFile($path)->rotate(90)->save();
@@ -364,8 +348,6 @@ public static function image(?string $handler = null, ?Images $config = null, bo
         return new $class($config);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The Iterator class provides a simple way of looping over a function
      * and timing the results and memory usage. Used when debugging and
@@ -384,8 +366,6 @@ public static function iterator(bool $getShared = true)
         return new Iterator();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Responsible for loading the language string translations.
      *
@@ -406,8 +386,6 @@ public static function language(?string $locale = null, bool $getShared = true)
         return new Language($locale);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The Logger class is a PSR-3 compatible Logging class that supports
      * multiple handlers that process the actual logging.
@@ -425,8 +403,6 @@ public static function logger(bool $getShared = true)
         return new Logger(config('Logger'));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Return the appropriate Migration runner.
      *
@@ -447,8 +423,6 @@ public static function migrations(?Migrations $config = null, ?ConnectionInterfa
         return new MigrationRunner($config, $db);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The Negotiate class provides the content negotiation features for
      * working the request to determine correct language, encoding, charset,
@@ -470,8 +444,6 @@ public static function negotiator(?RequestInterface $request = null, bool $getSh
         return new Negotiate($request);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Return the appropriate pagination handler.
      *
@@ -493,8 +465,6 @@ public static function pager(?PagerConfig $config = null, ?RendererInterface $vi
         return new Pager($config, $view);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The Parser is a simple template parser.
      *
@@ -516,8 +486,6 @@ public static function parser(?string $viewPath = null, ?ViewConfig $config = nu
         return new Parser($config, $viewPath, AppServices::locator(), CI_DEBUG, AppServices::logger());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The Renderer class is the class that actually displays a file to the user.
      * The default View class within CodeIgniter is intentionally simple, but this
@@ -541,8 +509,6 @@ public static function renderer(?string $viewPath = null, ?ViewConfig $config =
         return new View($config, $viewPath, AppServices::locator(), CI_DEBUG, AppServices::logger());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The Request class models an HTTP request.
      *
@@ -567,8 +533,6 @@ public static function request(?App $config = null, bool $getShared = true)
         );
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The Response class models an HTTP response.
      *
@@ -588,8 +552,6 @@ public static function response(?App $config = null, bool $getShared = true)
         return new Response($config);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The Redirect class provides nice way of working with redirects.
      *
@@ -611,8 +573,6 @@ public static function redirectresponse(?App $config = null, bool $getShared = t
         return $response;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The Routes service is a class that allows for easily building
      * a collection of routes.
@@ -630,8 +590,6 @@ public static function routes(bool $getShared = true)
         return new RouteCollection(AppServices::locator(), config('Modules'));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The Router class uses a RouteCollection's array of routes, and determines
      * the correct Controller and Method to execute.
@@ -654,8 +612,6 @@ public static function router(?RouteCollectionInterface $routes = null, ?Request
         return new Router($routes, $request);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The Security class provides a few handy tools for keeping the site
      * secure, most notably the CSRF protection tools.
@@ -676,8 +632,6 @@ public static function security(?App $config = null, bool $getShared = true)
         return new Security($config);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Return the session manager.
      *
@@ -709,8 +663,6 @@ public static function session(?App $config = null, bool $getShared = true)
         return $session;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The Throttler class provides a simple method for implementing
      * rate limiting in your applications.
@@ -728,8 +680,6 @@ public static function throttler(bool $getShared = true)
         return new Throttler(AppServices::cache());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The Timer class provides a simple way to Benchmark portions of your
      * application.
@@ -747,8 +697,6 @@ public static function timer(bool $getShared = true)
         return new Timer();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Return the debug toolbar.
      *
@@ -768,8 +716,6 @@ public static function toolbar(?ToolbarConfig $config = null, bool $getShared =
         return new Toolbar($config);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The URI class provides a way to model and manipulate URIs.
      *
@@ -787,8 +733,6 @@ public static function uri(?string $uri = null, bool $getShared = true)
         return new URI($uri);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The Validation class provides tools for validating input data.
      *
@@ -808,8 +752,6 @@ public static function validation(?ValidationConfig $config = null, bool $getSha
         return new Validation($config, AppServices::renderer());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * View cells are intended to let you insert HTML into view
      * that has been generated by any callable in the system.
@@ -827,8 +769,6 @@ public static function viewcell(bool $getShared = true)
         return new Cell(AppServices::cache());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The Typography class provides a way to format text in semantically relevant ways.
      *
diff --git a/system/Controller.php b/system/Controller.php
index d19adf550fac..255322391a7f 100644
--- a/system/Controller.php
+++ b/system/Controller.php
@@ -66,8 +66,6 @@ class Controller
      */
     protected $validator;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      *
@@ -91,8 +89,6 @@ public function initController(RequestInterface $request, ResponseInterface $res
         helper($this->helpers);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * A convenience method to use when you need to ensure that a single
      * method is reached only via HTTPS. If it isn't, then a redirect
@@ -110,8 +106,6 @@ protected function forceHTTPS(int $duration = 31536000)
         force_https($duration, $this->request, $this->response);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Provides a simple way to tie into the main CodeIgniter class and
      * tell it how long to cache the current page for.
@@ -123,8 +117,6 @@ protected function cachePage(int $time)
         CodeIgniter::cache($time);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Handles "auto-loading" helper files.
      *
@@ -141,8 +133,6 @@ protected function loadHelpers()
         helper($this->helpers);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * A shortcut to performing validation on input data. If validation
      * is not successful, a $errors property will be set on this class.
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index c60a6d39f7bb..763ce0ace0b1 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -244,8 +244,6 @@ class BaseBuilder
         'RIGHT OUTER',
     ];
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor
      *
@@ -278,8 +276,6 @@ public function __construct($tableName, ConnectionInterface &$db, ?array $option
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the current database connection
      *
@@ -290,8 +286,6 @@ public function db(): ConnectionInterface
         return $this->db;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets a test mode status.
      *
@@ -306,8 +300,6 @@ public function testMode(bool $mode = true)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Gets the name of the primary table.
      *
@@ -318,8 +310,6 @@ public function getTable(): string
         return $this->tableName;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an array of bind values and their
      * named parameters for binding in the Query object later.
@@ -331,8 +321,6 @@ public function getBinds(): array
         return $this->binds;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Ignore
      *
@@ -350,8 +338,6 @@ public function ignore(bool $ignore = true)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Select
      *
@@ -397,8 +383,6 @@ public function select($select = '*', ?bool $escape = null)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Select Max
      *
@@ -414,8 +398,6 @@ public function selectMax(string $select = '', string $alias = '')
         return $this->maxMinAvgSum($select, $alias);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Select Min
      *
@@ -431,8 +413,6 @@ public function selectMin(string $select = '', string $alias = '')
         return $this->maxMinAvgSum($select, $alias, 'MIN');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Select Average
      *
@@ -448,8 +428,6 @@ public function selectAvg(string $select = '', string $alias = '')
         return $this->maxMinAvgSum($select, $alias, 'AVG');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Select Sum
      *
@@ -465,8 +443,6 @@ public function selectSum(string $select = '', string $alias = '')
         return $this->maxMinAvgSum($select, $alias, 'SUM');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Select Count
      *
@@ -482,8 +458,6 @@ public function selectCount(string $select = '', string $alias = '')
         return $this->maxMinAvgSum($select, $alias, 'COUNT');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * SELECT [MAX|MIN|AVG|SUM|COUNT]()
      *
@@ -529,8 +503,6 @@ protected function maxMinAvgSum(string $select = '', string $alias = '', string
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines the alias name based on the table
      *
@@ -549,8 +521,6 @@ protected function createAliasFromTable(string $item): string
         return $item;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * DISTINCT
      *
@@ -567,8 +537,6 @@ public function distinct(bool $val = true)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * From
      *
@@ -608,8 +576,6 @@ public function from($from, bool $overwrite = false)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * JOIN
      *
@@ -686,8 +652,6 @@ public function join(string $table, string $cond, string $type = '', ?bool $esca
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * WHERE
      *
@@ -705,8 +669,6 @@ public function where($key, $value = null, ?bool $escape = null)
         return $this->whereHaving('QBWhere', $key, $value, 'AND ', $escape);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * OR WHERE
      *
@@ -724,8 +686,6 @@ public function orWhere($key, $value = null, ?bool $escape = null)
         return $this->whereHaving('QBWhere', $key, $value, 'OR ', $escape);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * WHERE, HAVING
      *
@@ -801,8 +761,6 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * WHERE IN
      *
@@ -820,8 +778,6 @@ public function whereIn(?string $key = null, $values = null, ?bool $escape = nul
         return $this->_whereIn($key, $values, false, 'AND ', $escape);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * OR WHERE IN
      *
@@ -839,8 +795,6 @@ public function orWhereIn(?string $key = null, $values = null, ?bool $escape = n
         return $this->_whereIn($key, $values, false, 'OR ', $escape);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * WHERE NOT IN
      *
@@ -858,8 +812,6 @@ public function whereNotIn(?string $key = null, $values = null, ?bool $escape =
         return $this->_whereIn($key, $values, true, 'AND ', $escape);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * OR WHERE NOT IN
      *
@@ -877,8 +829,6 @@ public function orWhereNotIn(?string $key = null, $values = null, ?bool $escape
         return $this->_whereIn($key, $values, true, 'OR ', $escape);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * HAVING IN
      *
@@ -896,8 +846,6 @@ public function havingIn(?string $key = null, $values = null, ?bool $escape = nu
         return $this->_whereIn($key, $values, false, 'AND ', $escape, 'QBHaving');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * OR HAVING IN
      *
@@ -915,8 +863,6 @@ public function orHavingIn(?string $key = null, $values = null, ?bool $escape =
         return $this->_whereIn($key, $values, false, 'OR ', $escape, 'QBHaving');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * HAVING NOT IN
      *
@@ -934,8 +880,6 @@ public function havingNotIn(?string $key = null, $values = null, ?bool $escape =
         return $this->_whereIn($key, $values, true, 'AND ', $escape, 'QBHaving');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * OR HAVING NOT IN
      *
@@ -953,8 +897,6 @@ public function orHavingNotIn(?string $key = null, $values = null, ?bool $escape
         return $this->_whereIn($key, $values, true, 'OR ', $escape, 'QBHaving');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Internal WHERE IN
      *
@@ -1025,8 +967,6 @@ protected function _whereIn(?string $key = null, $values = null, bool $not = fal
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * LIKE
      *
@@ -1046,8 +986,6 @@ public function like($field, string $match = '', string $side = 'both', ?bool $e
         return $this->_like($field, $match, 'AND ', $side, '', $escape, $insensitiveSearch);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * NOT LIKE
      *
@@ -1067,8 +1005,6 @@ public function notLike($field, string $match = '', string $side = 'both', ?bool
         return $this->_like($field, $match, 'AND ', $side, 'NOT', $escape, $insensitiveSearch);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * OR LIKE
      *
@@ -1088,8 +1024,6 @@ public function orLike($field, string $match = '', string $side = 'both', ?bool
         return $this->_like($field, $match, 'OR ', $side, '', $escape, $insensitiveSearch);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * OR NOT LIKE
      *
@@ -1109,8 +1043,6 @@ public function orNotLike($field, string $match = '', string $side = 'both', ?bo
         return $this->_like($field, $match, 'OR ', $side, 'NOT', $escape, $insensitiveSearch);
     }
 
-    // --------------------------------------------------------------------
-
     /**
      * LIKE with HAVING clause
      *
@@ -1129,8 +1061,6 @@ public function havingLike($field, string $match = '', string $side = 'both', ?b
         return $this->_like($field, $match, 'AND ', $side, '', $escape, $insensitiveSearch, 'QBHaving');
     }
 
-    // --------------------------------------------------------------------
-
     /**
      * NOT LIKE with HAVING clause
      *
@@ -1149,8 +1079,6 @@ public function notHavingLike($field, string $match = '', string $side = 'both',
         return $this->_like($field, $match, 'AND ', $side, 'NOT', $escape, $insensitiveSearch, 'QBHaving');
     }
 
-    // --------------------------------------------------------------------
-
     /**
      * OR LIKE with HAVING clause
      *
@@ -1169,8 +1097,6 @@ public function orHavingLike($field, string $match = '', string $side = 'both',
         return $this->_like($field, $match, 'OR ', $side, '', $escape, $insensitiveSearch, 'QBHaving');
     }
 
-    // --------------------------------------------------------------------
-
     /**
      * OR NOT LIKE with HAVING clause
      *
@@ -1189,8 +1115,6 @@ public function orNotHavingLike($field, string $match = '', string $side = 'both
         return $this->_like($field, $match, 'OR ', $side, 'NOT', $escape, $insensitiveSearch, 'QBHaving');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Internal LIKE
      *
@@ -1258,8 +1182,6 @@ protected function _like($field, string $match = '', string $type = 'AND ', stri
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Platform independent LIKE statement builder.
      *
@@ -1280,8 +1202,6 @@ protected function _like_statement(?string $prefix, string $column, ?string $not
         return "{$prefix} {$column} {$not} LIKE :{$bind}:";
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Starts a query group.
      *
@@ -1292,8 +1212,6 @@ public function groupStart()
         return $this->groupStartPrepare();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Starts a query group, but ORs the group
      *
@@ -1304,8 +1222,6 @@ public function orGroupStart()
         return $this->groupStartPrepare('', 'OR ');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Starts a query group, but NOTs the group
      *
@@ -1316,8 +1232,6 @@ public function notGroupStart()
         return $this->groupStartPrepare('NOT ');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Starts a query group, but OR NOTs the group
      *
@@ -1328,8 +1242,6 @@ public function orNotGroupStart()
         return $this->groupStartPrepare('NOT ', 'OR ');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Ends a query group
      *
@@ -1340,8 +1252,6 @@ public function groupEnd()
         return $this->groupEndPrepare();
     }
 
-    // --------------------------------------------------------------------
-
     /**
      * Starts a query group for HAVING clause.
      *
@@ -1352,8 +1262,6 @@ public function havingGroupStart()
         return $this->groupStartPrepare('', 'AND ', 'QBHaving');
     }
 
-    // --------------------------------------------------------------------
-
     /**
      * Starts a query group for HAVING clause, but ORs the group.
      *
@@ -1364,8 +1272,6 @@ public function orHavingGroupStart()
         return $this->groupStartPrepare('', 'OR ', 'QBHaving');
     }
 
-    // --------------------------------------------------------------------
-
     /**
      * Starts a query group for HAVING clause, but NOTs the group.
      *
@@ -1376,8 +1282,6 @@ public function notHavingGroupStart()
         return $this->groupStartPrepare('NOT ', 'AND ', 'QBHaving');
     }
 
-    // --------------------------------------------------------------------
-
     /**
      * Starts a query group for HAVING clause, but OR NOTs the group.
      *
@@ -1388,8 +1292,6 @@ public function orNotHavingGroupStart()
         return $this->groupStartPrepare('NOT ', 'OR ', 'QBHaving');
     }
 
-    // --------------------------------------------------------------------
-
     /**
      * Ends a query group for HAVING clause.
      *
@@ -1400,8 +1302,6 @@ public function havingGroupEnd()
         return $this->groupEndPrepare('QBHaving');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Prepate a query group start.
      *
@@ -1427,8 +1327,6 @@ protected function groupStartPrepare(string $not = '', string $type = 'AND ', st
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Prepate a query group end.
      *
@@ -1449,8 +1347,6 @@ protected function groupEndPrepare(string $clause = 'QBWhere')
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Group_get_type
      *
@@ -1474,8 +1370,6 @@ protected function groupGetType(string $type): string
         return $type;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * GROUP BY
      *
@@ -1510,8 +1404,6 @@ public function groupBy($by, ?bool $escape = null)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * HAVING
      *
@@ -1528,8 +1420,6 @@ public function having($key, $value = null, ?bool $escape = null)
         return $this->whereHaving('QBHaving', $key, $value, 'AND ', $escape);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * OR HAVING
      *
@@ -1546,8 +1436,6 @@ public function orHaving($key, $value = null, ?bool $escape = null)
         return $this->whereHaving('QBHaving', $key, $value, 'OR ', $escape);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * ORDER BY
      *
@@ -1607,8 +1495,6 @@ public function orderBy(string $orderBy, string $direction = '', ?bool $escape =
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * LIMIT
      *
@@ -1630,8 +1516,6 @@ public function limit(?int $value = null, ?int $offset = 0)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the OFFSET value
      *
@@ -1648,8 +1532,6 @@ public function offset(int $offset)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * LIMIT string
      *
@@ -1664,8 +1546,6 @@ protected function _limit(string $sql, bool $offsetIgnore = false): string
         return $sql . ' LIMIT ' . ($offsetIgnore === false && $this->QBOffset ? $this->QBOffset . ', ' : '') . $this->QBLimit;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The "set" function.
      *
@@ -1699,8 +1579,6 @@ public function set($key, ?string $value = '', ?bool $escape = null)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the previously set() data, alternatively resetting it
      * if needed.
@@ -1720,8 +1598,6 @@ public function getSetData(bool $clean = false): array
         return $data;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get SELECT query string
      *
@@ -1742,8 +1618,6 @@ public function getCompiledSelect(bool $reset = true): string
         return $this->compileFinalQuery($select);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a finalized, compiled query string with the bindings
      * inserted and prefixes swapped out.
@@ -1796,8 +1670,6 @@ public function get(?int $limit = null, int $offset = 0, bool $reset = true)
         return $result;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * "Count All" query
      *
@@ -1833,8 +1705,6 @@ public function countAll(bool $reset = true)
         return (int) $query->numrows;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * "Count All Results" query
      *
@@ -1899,8 +1769,6 @@ public function countAllResults(bool $reset = true)
         return (int) $row->numrows;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get compiled 'where' condition string
      *
@@ -1913,8 +1781,6 @@ public function getCompiledQBWhere()
         return $this->QBWhere;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get_Where
      *
@@ -1951,8 +1817,6 @@ public function getWhere($where = null, ?int $limit = null, ?int $offset = 0, bo
         return $result;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Insert_Batch
      *
@@ -2012,8 +1876,6 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
         return $affectedRows;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Insert batch statement
      *
@@ -2030,8 +1892,6 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
         return 'INSERT ' . $this->compileIgnore('insert') . 'INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES ' . implode(', ', $values);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The "setInsertBatch" function.  Allows key/value pairs to be set for batch inserts
      *
@@ -2083,8 +1943,6 @@ public function setInsertBatch($key, string $value = '', ?bool $escape = null)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get INSERT query string
      *
@@ -2167,8 +2025,6 @@ public function insert(?array $set = null, ?bool $escape = null)
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Validate Insert
      *
@@ -2194,8 +2050,6 @@ protected function validateInsert(): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Insert statement
      *
@@ -2247,8 +2101,6 @@ public function replace(?array $set = null)
         return $this->testMode ? $sql : $this->db->query($sql, $this->binds, false);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Replace statement
      *
@@ -2265,8 +2117,6 @@ protected function _replace(string $table, array $keys, array $values): string
         return 'REPLACE INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES (' . implode(', ', $values) . ')';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * FROM tables
      *
@@ -2282,8 +2132,6 @@ protected function _fromTables(): string
         return implode(', ', $this->QBFrom);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get UPDATE query string
      *
@@ -2308,8 +2156,6 @@ public function getCompiledUpdate(bool $reset = true)
         return $this->compileFinalQuery($sql);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * UPDATE
      *
@@ -2365,8 +2211,6 @@ public function update(?array $set = null, $where = null, ?int $limit = null): b
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Update statement
      *
@@ -2391,8 +2235,6 @@ protected function _update(string $table, array $values): string
                 . ($this->QBLimit ? $this->_limit(' ', true) : '');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Validate Update
      *
@@ -2418,8 +2260,6 @@ protected function validateUpdate(): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Update_Batch
      *
@@ -2495,8 +2335,6 @@ public function updateBatch(?array $set = null, ?string $index = null, int $batc
         return $this->testMode ? $savedSQL : $affectedRows;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Update_Batch statement
      *
@@ -2536,8 +2374,6 @@ protected function _updateBatch(string $table, array $values, string $index): st
         return 'UPDATE ' . $this->compileIgnore('update') . $table . ' SET ' . substr($cases, 0, -2) . $this->compileWhereHaving('QBWhere');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The "setUpdateBatch" function.  Allows key/value pairs to be set for batch updating
      *
@@ -2585,8 +2421,6 @@ public function setUpdateBatch($key, string $index = '', ?bool $escape = null)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Empty Table
      *
@@ -2609,8 +2443,6 @@ public function emptyTable()
         return $this->db->query($sql, null, false);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Truncate
      *
@@ -2635,8 +2467,6 @@ public function truncate()
         return $this->db->query($sql, null, false);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Truncate statement
      *
@@ -2654,8 +2484,6 @@ protected function _truncate(string $table): string
         return 'TRUNCATE ' . $table;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get DELETE query string
      *
@@ -2673,8 +2501,6 @@ public function getCompiledDelete(bool $reset = true): string
         return $this->compileFinalQuery($sql);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Delete
      *
@@ -2726,8 +2552,6 @@ public function delete($where = '', ?int $limit = null, bool $resetData = true)
         return $this->testMode ? $sql : $this->db->query($sql, $this->binds, false);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Increments a numeric column by the specified value.
      *
@@ -2745,8 +2569,6 @@ public function increment(string $column, int $value = 1)
         return $this->db->query($sql, $this->binds, false);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Decrements a numeric column by the specified value.
      *
@@ -2764,8 +2586,6 @@ public function decrement(string $column, int $value = 1)
         return $this->db->query($sql, $this->binds, false);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Delete statement
      *
@@ -2780,8 +2600,6 @@ protected function _delete(string $table): string
         return 'DELETE ' . $this->compileIgnore('delete') . 'FROM ' . $table . $this->compileWhereHaving('QBWhere');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Track Aliases
      *
@@ -2820,8 +2638,6 @@ protected function trackAliases($table)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Compile the SELECT statement
      *
@@ -2877,8 +2693,6 @@ protected function compileSelect($selectOverride = false): string
         return $sql;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Compile Ignore Statement
      *
@@ -2900,8 +2714,6 @@ protected function compileIgnore(string $statement)
         return '';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Compile WHERE, HAVING statements
      *
@@ -2980,8 +2792,6 @@ protected function compileWhereHaving(string $qbKey): string
         return '';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Compile GROUP BY
      *
@@ -3013,8 +2823,6 @@ protected function compileGroupBy(): string
         return '';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Compile ORDER BY
      *
@@ -3047,8 +2855,6 @@ protected function compileOrderBy(): string
         return '';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Object to Array
      *
@@ -3076,8 +2882,6 @@ protected function objectToArray($object)
         return $array;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Object to Array
      *
@@ -3111,8 +2915,6 @@ protected function batchObjectToArray($object)
         return $array;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Is literal
      *
@@ -3143,8 +2945,6 @@ protected function isLiteral(string $str): bool
         return in_array($str[0], $_str, true);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Reset Query Builder values.
      *
@@ -3160,8 +2960,6 @@ public function resetQuery()
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Resets the query builder values.  Called by the get() function
      *
@@ -3176,8 +2974,6 @@ protected function resetRun(array $qbResetItems)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Resets the query builder values.  Called by the get() function
      */
@@ -3206,8 +3002,6 @@ protected function resetSelect()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Resets the query builder "write" values.
      *
@@ -3226,8 +3020,6 @@ protected function resetWrite()
         ]);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Tests whether the string has an SQL operator
      *
@@ -3240,8 +3032,6 @@ protected function hasOperator(string $str): bool
         return (bool) preg_match('/(<|>|!|=|\sIS NULL|\sIS NOT NULL|\sEXISTS|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i', trim($str));
     }
 
-    // --------------------------------------------------------------------
-
     /**
      * Returns the SQL string operator
      *
@@ -3275,8 +3065,6 @@ protected function getOperator(string $str, bool $list = false)
         return preg_match_all('/' . implode('|', $_operators) . '/i', $str, $match) ? ($list ? $match[0] : $match[0][0]) : false;
     }
 
-    // --------------------------------------------------------------------
-
     /**
      * Stores a bind value after ensuring that it's unique.
      * While it might be nicer to have named keys for our binds array
@@ -3314,8 +3102,6 @@ protected function setBind(string $key, $value = null, bool $escape = true): str
         return $key . '.' . $count;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a clone of a Base Builder with reset query builder values.
      *
@@ -3325,6 +3111,4 @@ protected function cleanClone()
     {
         return (clone $this)->from([], true)->resetQuery();
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index a8520de6896a..e2a9bb81e601 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -153,8 +153,6 @@ abstract class BaseConnection implements ConnectionInterface
      */
     protected $failover = [];
 
-    //--------------------------------------------------------------------
-
     /**
      * The last query object that was executed
      * on this connection.
@@ -297,8 +295,6 @@ abstract class BaseConnection implements ConnectionInterface
      */
     protected $queryClass = 'CodeIgniter\\Database\\Query';
 
-    //--------------------------------------------------------------------
-
     /**
      * Saves our connection settings.
      *
@@ -317,8 +313,6 @@ public function __construct(array $params)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Initializes the database connection/settings.
      *
@@ -338,8 +332,6 @@ public function initialize()
             return;
         }
 
-        //--------------------------------------------------------------------
-
         $this->connectTime = microtime(true);
         $connectionErrors  = [];
 
@@ -392,8 +384,6 @@ public function initialize()
         $this->connectDuration = microtime(true) - $this->connectTime;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Connect to the database.
      *
@@ -403,8 +393,6 @@ public function initialize()
      */
     abstract public function connect(bool $persistent = false);
 
-    //--------------------------------------------------------------------
-
     /**
      * Close the database connection.
      *
@@ -418,8 +406,6 @@ public function close()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Platform dependent way method for closing the connection.
      *
@@ -427,8 +413,6 @@ public function close()
      */
     abstract protected function _close();
 
-    //--------------------------------------------------------------------
-
     /**
      * Create a persistent database connection.
      *
@@ -439,8 +423,6 @@ public function persistentConnect()
         return $this->connect(true);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Keep or establish the connection if no queries have been sent for
      * a length of time exceeding the server's idle timeout.
@@ -449,8 +431,6 @@ public function persistentConnect()
      */
     abstract public function reconnect();
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the actual connection object. If both a 'read' and 'write'
      * connection has been specified, you can pass either term in to
@@ -467,8 +447,6 @@ public function getConnection(?string $alias = null)
         return $this->connID;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Select a specific database table to use.
      *
@@ -478,8 +456,6 @@ public function getConnection(?string $alias = null)
      */
     abstract public function setDatabase(string $databaseName);
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the name of the current database being used.
      *
@@ -490,8 +466,6 @@ public function getDatabase(): string
         return empty($this->database) ? '' : $this->database;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Set DB Prefix
      *
@@ -506,8 +480,6 @@ public function setPrefix(string $prefix = ''): string
         return $this->DBPrefix = $prefix;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the database prefix.
      *
@@ -518,8 +490,6 @@ public function getPrefix(): string
         return $this->DBPrefix;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The name of the platform in use (MySQLi, mssql, etc)
      *
@@ -530,8 +500,6 @@ public function getPlatform(): string
         return $this->DBDriver;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a string containing the version of the database being used.
      *
@@ -539,8 +507,6 @@ public function getPlatform(): string
      */
     abstract public function getVersion(): string;
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the Table Aliases to use. These are typically
      * collected during use of the Builder, and set here
@@ -557,8 +523,6 @@ public function setAliasedTables(array $aliases)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Add a table alias to our list.
      *
@@ -686,8 +650,6 @@ public function query(string $sql, $binds = null, bool $setEscapeFlags = true, s
         return new $resultClass($this->connID, $this->resultID);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Performs a basic query against the database. No binding or caching
      * is performed, nor are transactions handled. Simply takes a raw
@@ -706,8 +668,6 @@ public function simpleQuery(string $sql)
         return $this->execute($sql);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Disable Transactions
      *
@@ -720,8 +680,6 @@ public function transOff()
         $this->transEnabled = false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Enable/disable Transaction Strict Mode
      *
@@ -743,8 +701,6 @@ public function transStrict(bool $mode = true)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Start Transaction
      *
@@ -761,8 +717,6 @@ public function transStart(bool $testMode = false): bool
         return $this->transBegin($testMode);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Complete Transaction
      *
@@ -792,8 +746,6 @@ public function transComplete(): bool
         return $this->transCommit();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Lets you retrieve the transaction flag to determine if it has failed
      *
@@ -804,8 +756,6 @@ public function transStatus(): bool
         return $this->transStatus;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Begin Transaction
      *
@@ -844,8 +794,6 @@ public function transBegin(bool $testMode = false): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Commit Transaction
      *
@@ -867,8 +815,6 @@ public function transCommit(): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Rollback Transaction
      *
@@ -890,8 +836,6 @@ public function transRollback(): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Begin Transaction
      *
@@ -899,8 +843,6 @@ public function transRollback(): bool
      */
     abstract protected function _transBegin(): bool;
 
-    //--------------------------------------------------------------------
-
     /**
      * Commit Transaction
      *
@@ -908,8 +850,6 @@ abstract protected function _transBegin(): bool;
      */
     abstract protected function _transCommit(): bool;
 
-    //--------------------------------------------------------------------
-
     /**
      * Rollback Transaction
      *
@@ -917,8 +857,6 @@ abstract protected function _transCommit(): bool;
      */
     abstract protected function _transRollback(): bool;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an instance of the query builder for this connection.
      *
@@ -939,8 +877,6 @@ public function table($tableName)
         return new $className($tableName, $this);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Creates a prepared statement with the database that can then
      * be used to execute multiple statements against. Within the
@@ -986,8 +922,6 @@ public function prepare(Closure $func, array $options = [])
         return $class->prepare($sql, $options);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the last query's statement object.
      *
@@ -998,8 +932,6 @@ public function getLastQuery()
         return $this->lastQuery;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a string representation of the last query's statement object.
      *
@@ -1010,8 +942,6 @@ public function showLastQuery(): string
         return (string) $this->lastQuery;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the time we started to connect to this database in
      * seconds with microseconds.
@@ -1025,8 +955,6 @@ public function getConnectStart(): ?float
         return $this->connectTime;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the number of seconds with microseconds that it took
      * to connect to the database.
@@ -1042,8 +970,6 @@ public function getConnectDuration(int $decimals = 6): string
         return number_format($this->connectDuration, $decimals);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Protect Identifiers
      *
@@ -1208,8 +1134,6 @@ public function protectIdentifiers($item, bool $prefixSingle = false, ?bool $pro
         return $item . $alias;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Escape the SQL Identifiers
      *
@@ -1266,8 +1190,6 @@ public function escapeIdentifiers($item)
         return preg_replace('/' . $pregEc[0] . '?([^' . $pregEc[1] . '\.]+)' . $pregEc[1] . '?(\.)?/i', $pregEc[2] . '$1' . $pregEc[3] . '$2', $item);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Prepends a database prefix if one exists in configuration
      *
@@ -1286,8 +1208,6 @@ public function prefixTable(string $table = ''): string
         return $this->DBPrefix . $table;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the total number of rows affected by this query.
      *
@@ -1295,8 +1215,6 @@ public function prefixTable(string $table = ''): string
      */
     abstract public function affectedRows(): int;
 
-    //--------------------------------------------------------------------
-
     /**
      * "Smart" Escape String
      *
@@ -1328,8 +1246,6 @@ public function escape($str)
         return $str ?? 'NULL';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Escape String
      *
@@ -1370,8 +1286,6 @@ public function escapeString($str, bool $like = false)
         return $str;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Escape LIKE String
      *
@@ -1387,8 +1301,6 @@ public function escapeLikeString($str)
         return $this->escapeString($str, true);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Platform independent string escape.
      *
@@ -1403,8 +1315,6 @@ protected function _escapeString(string $str): string
         return str_replace("'", "''", remove_invisible_characters($str, false));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * This function enables you to call PHP database functions that are not natively included
      * in CodeIgniter, in a platform independent manner.
@@ -1436,7 +1346,6 @@ public function callFunction(string $functionName, ...$params): bool
         return $functionName(...$params);
     }
 
-    //--------------------------------------------------------------------
     //--------------------------------------------------------------------
     // META Methods
     //--------------------------------------------------------------------
@@ -1494,8 +1403,6 @@ public function listTables(bool $constrainByPrefix = false)
         return $this->dataCache['table_names'];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determine if a particular table exists
      *
@@ -1508,8 +1415,6 @@ public function tableExists(string $tableName): bool
         return in_array($this->protectIdentifiers($tableName, true, false, false), $this->listTables(), true);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Fetch Field Names
      *
@@ -1560,8 +1465,6 @@ public function getFieldNames(string $table)
         return $this->dataCache['field_names'][$table];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determine if a particular field exists
      *
@@ -1575,8 +1478,6 @@ public function fieldExists(string $fieldName, string $tableName): bool
         return in_array($fieldName, $this->getFieldNames($tableName), true);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an object with field data
      *
@@ -1589,8 +1490,6 @@ public function getFieldData(string $table)
         return $this->_fieldData($this->protectIdentifiers($table, true, false, false));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an object with key data
      *
@@ -1603,8 +1502,6 @@ public function getIndexData(string $table)
         return $this->_indexData($this->protectIdentifiers($table, true, false, false));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an object with foreign key data
      *
@@ -1617,8 +1514,6 @@ public function getForeignKeyData(string $table)
         return $this->_foreignKeyData($this->protectIdentifiers($table, true, false, false));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Disables foreign key checks temporarily.
      */
@@ -1629,8 +1524,6 @@ public function disableForeignKeyChecks()
         return $this->query($sql);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Enables foreign key checks temporarily.
      */
@@ -1641,8 +1534,6 @@ public function enableForeignKeyChecks()
         return $this->query($sql);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Allows the engine to be set into a mode where queries are not
      * actually executed, but they are still generated, timed, etc.
@@ -1660,8 +1551,6 @@ public function pretend(bool $pretend = true)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Empties our data cache. Especially helpful during testing.
      *
@@ -1674,8 +1563,6 @@ public function resetDataCache()
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines if the statement is a write-type query or not.
      *
@@ -1688,8 +1575,6 @@ public function isWriteType($sql): bool
         return (bool) preg_match('/^\s*"?(SET|INSERT|UPDATE|DELETE|REPLACE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX|MERGE)\s/i', $sql);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the last error code and message.
      *
@@ -1701,8 +1586,6 @@ public function isWriteType($sql): bool
      */
     abstract public function error(): array;
 
-    //--------------------------------------------------------------------
-
     /**
      * Insert ID
      *
@@ -1710,8 +1593,6 @@ abstract public function error(): array;
      */
     abstract public function insertID();
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates the SQL for listing tables in a platform-dependent manner.
      *
@@ -1721,8 +1602,6 @@ abstract public function insertID();
      */
     abstract protected function _listTables(bool $constrainByPrefix = false);
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates a platform-specific query string so that the column names can be fetched.
      *
@@ -1732,8 +1611,6 @@ abstract protected function _listTables(bool $constrainByPrefix = false);
      */
     abstract protected function _listColumns(string $table = '');
 
-    //--------------------------------------------------------------------
-
     /**
      * Platform-specific field data information.
      *
@@ -1745,8 +1622,6 @@ abstract protected function _listColumns(string $table = '');
      */
     abstract protected function _fieldData(string $table): array;
 
-    //--------------------------------------------------------------------
-
     /**
      * Platform-specific index data.
      *
@@ -1758,8 +1633,6 @@ abstract protected function _fieldData(string $table): array;
      */
     abstract protected function _indexData(string $table): array;
 
-    //--------------------------------------------------------------------
-
     /**
      * Platform-specific foreign keys data.
      *
@@ -1771,8 +1644,6 @@ abstract protected function _indexData(string $table): array;
      */
     abstract protected function _foreignKeyData(string $table): array;
 
-    //--------------------------------------------------------------------
-
     /**
      * Accessor for properties if they exist.
      *
@@ -1789,8 +1660,6 @@ public function __get(string $key)
         return null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checker for properties existence.
      *
@@ -1802,6 +1671,4 @@ public function __isset(string $key): bool
     {
         return property_exists($this, $key);
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Database/BasePreparedQuery.php b/system/Database/BasePreparedQuery.php
index 2344a41cf9e3..6e2c296bb8cc 100644
--- a/system/Database/BasePreparedQuery.php
+++ b/system/Database/BasePreparedQuery.php
@@ -55,8 +55,6 @@ abstract class BasePreparedQuery implements PreparedQueryInterface
      */
     protected $db;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      *
@@ -67,8 +65,6 @@ public function __construct(BaseConnection $db)
         $this->db = &$db;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Prepares the query against the database, and saves the connection
      * info necessary to execute the query later.
@@ -105,8 +101,6 @@ public function prepare(string $sql, array $options = [], string $queryClass = '
         return $this->_prepare($query->getOriginalQuery(), $options);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The database-dependent portion of the prepare statement.
      *
@@ -117,8 +111,6 @@ public function prepare(string $sql, array $options = [], string $queryClass = '
      */
     abstract public function _prepare(string $sql, array $options = []);
 
-    //--------------------------------------------------------------------
-
     /**
      * Takes a new set of data and runs it against the currently
      * prepared query. Upon success, will return a Results object.
@@ -151,8 +143,6 @@ public function execute(...$data)
         return new $resultClass($this->db->connID, $resultID);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The database dependant version of the execute method.
      *
@@ -162,8 +152,6 @@ public function execute(...$data)
      */
     abstract public function _execute(array $data): bool;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the result object for the prepared query.
      *
@@ -171,8 +159,6 @@ abstract public function _execute(array $data): bool;
      */
     abstract public function _getResult();
 
-    //--------------------------------------------------------------------
-
     /**
      * Explicitly closes the statement.
      *
@@ -187,8 +173,6 @@ public function close()
         $this->statement->close();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the SQL that has been prepared.
      *
@@ -203,8 +187,6 @@ public function getQueryString(): string
         return $this->query->getQuery();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * A helper to determine if any error exists.
      *
@@ -215,8 +197,6 @@ public function hasError(): bool
         return ! empty($this->errorString);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the error code created while executing this statement.
      *
@@ -227,8 +207,6 @@ public function getErrorCode(): int
         return $this->errorCode;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the error message created while executing this statement.
      *
@@ -238,6 +216,4 @@ public function getErrorMessage(): string
     {
         return $this->errorString;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php
index acceb5e85b28..fdb4bf186a62 100644
--- a/system/Database/BaseResult.php
+++ b/system/Database/BaseResult.php
@@ -74,8 +74,6 @@ abstract class BaseResult implements ResultInterface
      */
     public $rowData;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor
      *
@@ -88,8 +86,6 @@ public function __construct(&$connID, &$resultID)
         $this->resultID = $resultID;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieve the results of the query. Typically an array of
      * individual data rows, which can be either an 'array', an
@@ -112,8 +108,6 @@ public function getResult(string $type = 'object'): array
         return $this->getCustomResultObject($type);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the results as an array of custom objects.
      *
@@ -168,8 +162,6 @@ public function getCustomResultObject(string $className)
         return $this->customResultObject[$className];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the results as an array of arrays.
      *
@@ -209,8 +201,6 @@ public function getResultArray(): array
         return $this->resultArray;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the results as an array of objects.
      *
@@ -255,8 +245,6 @@ public function getResultObject(): array
         return $this->resultObject;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Wrapper object to return a row as either an array, an object, or
      * a custom class.
@@ -295,8 +283,6 @@ public function getRow($n = 0, string $type = 'object')
         return $this->getCustomRowObject($n, $type);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a row as a custom class instance.
      *
@@ -324,8 +310,6 @@ public function getCustomRowObject(int $n, string $className)
         return $this->customResultObject[$className][$this->currentRow];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a single row from the results as an array.
      *
@@ -349,8 +333,6 @@ public function getRowArray(int $n = 0)
         return $result[$this->currentRow];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a single row from the results as an object.
      *
@@ -374,8 +356,6 @@ public function getRowObject(int $n = 0)
         return $result[$this->currentRow];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Assigns an item into a particular column slot.
      *
@@ -404,8 +384,6 @@ public function setRow($key, $value = null)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the "first" row of the current results.
      *
@@ -420,8 +398,6 @@ public function getFirstRow(string $type = 'object')
         return (empty($result)) ? null : $result[0];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the "last" row of the current results.
      *
@@ -436,8 +412,6 @@ public function getLastRow(string $type = 'object')
         return (empty($result)) ? null : $result[count($result) - 1];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the "next" row of the current results.
      *
@@ -455,8 +429,6 @@ public function getNextRow(string $type = 'object')
         return isset($result[$this->currentRow + 1]) ? $result[++$this->currentRow] : null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the "previous" row of the current results.
      *
@@ -478,8 +450,6 @@ public function getPreviousRow(string $type = 'object')
         return $result[$this->currentRow];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an unbuffered row and move the pointer to the next row.
      *
@@ -500,8 +470,6 @@ public function getUnbufferedRow(string $type = 'object')
         return $this->fetchObject($type);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Number of rows in the result set; checks for previous count, falls
      * back on counting resultArray or resultObject, finally fetching resultArray
@@ -531,8 +499,6 @@ public function getNumRows(): int
      */
     abstract public function getFieldCount(): int;
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates an array of column names in the result set.
      *
@@ -540,8 +506,6 @@ abstract public function getFieldCount(): int;
      */
     abstract public function getFieldNames(): array;
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates an array of objects representing field meta-data.
      *
@@ -549,8 +513,6 @@ abstract public function getFieldNames(): array;
      */
     abstract public function getFieldData(): array;
 
-    //--------------------------------------------------------------------
-
     /**
      * Frees the current result.
      *
@@ -558,8 +520,6 @@ abstract public function getFieldData(): array;
      */
     abstract public function freeResult();
 
-    //--------------------------------------------------------------------
-
     /**
      * Moves the internal pointer to the desired offset. This is called
      * internally before fetching results to make sure the result set
@@ -571,8 +531,6 @@ abstract public function freeResult();
      */
     abstract public function dataSeek(int $n = 0);
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the result set as an array.
      *
@@ -582,8 +540,6 @@ abstract public function dataSeek(int $n = 0);
      */
     abstract protected function fetchAssoc();
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the result set as an object.
      *
@@ -594,6 +550,4 @@ abstract protected function fetchAssoc();
      * @return object
      */
     abstract protected function fetchObject(string $className = 'stdClass');
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Database/BaseUtils.php b/system/Database/BaseUtils.php
index 8287fea4bd6e..7b45f6a43103 100644
--- a/system/Database/BaseUtils.php
+++ b/system/Database/BaseUtils.php
@@ -25,8 +25,6 @@ abstract class BaseUtils
      */
     protected $db;
 
-    //--------------------------------------------------------------------
-
     /**
      * List databases statement
      *
@@ -48,8 +46,6 @@ abstract class BaseUtils
      */
     protected $repairTable = false;
 
-    //--------------------------------------------------------------------
-
     /**
      * Class constructor
      *
@@ -60,8 +56,6 @@ public function __construct(ConnectionInterface &$db)
         $this->db = &$db;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * List databases
      *
@@ -98,8 +92,6 @@ public function listDatabases()
         return $this->db->dataCache['db_names'];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determine if a particular database exists
      *
@@ -112,8 +104,6 @@ public function databaseExists(string $databaseName): bool
         return in_array($databaseName, $this->listDatabases(), true);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Optimize Table
      *
@@ -138,8 +128,6 @@ public function optimizeTable(string $tableName)
         return $query !== false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Optimize Database
      *
@@ -185,8 +173,6 @@ public function optimizeDatabase()
         return $result;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Repair Table
      *
@@ -216,8 +202,6 @@ public function repairTable(string $tableName)
         return current($query);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generate CSV from a query result object
      *
@@ -252,8 +236,6 @@ public function getCSVFromResult(ResultInterface $query, string $delim = ',', st
         return $out;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generate XML data from a query result object
      *
@@ -297,8 +279,6 @@ public function getXMLFromResult(ResultInterface $query, array $params = []): st
         return $xml . '</' . $root . '>' . $newline;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Database Backup
      *
@@ -366,8 +346,6 @@ public function backup($params = [])
         return gzencode($this->_backup($prefs));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Platform dependent version of the backup function.
      *
@@ -376,6 +354,4 @@ public function backup($params = [])
      * @return mixed
      */
     abstract public function _backup(?array $prefs = null);
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Database/Config.php b/system/Database/Config.php
index 60de8ad904ba..f227017c3317 100644
--- a/system/Database/Config.php
+++ b/system/Database/Config.php
@@ -35,8 +35,6 @@ class Config extends BaseConfig
      */
     protected static $factory;
 
-    //--------------------------------------------------------------------
-
     /**
      * Creates the default
      *
@@ -85,8 +83,6 @@ public static function connect($group = null, bool $getShared = true)
         return $connection;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an array of all db connections currently made.
      *
@@ -112,8 +108,6 @@ public static function forge($group = null)
         return static::$factory->loadForge($db);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a new instance of the Database Utilities class.
      *
@@ -128,8 +122,6 @@ public static function utils($group = null)
         return static::$factory->loadUtils($db);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a new instance of the Database Seeder.
      *
@@ -144,8 +136,6 @@ public static function seeder(?string $group = null)
         return new Seeder($config, static::connect($group));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Ensures the database Connection Manager/Factory is loaded and ready to use.
      */
@@ -157,6 +147,4 @@ protected static function ensureFactory()
 
         static::$factory = new Database();
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Database/ConnectionInterface.php b/system/Database/ConnectionInterface.php
index 01f663df7cf3..d458bc8abd8c 100644
--- a/system/Database/ConnectionInterface.php
+++ b/system/Database/ConnectionInterface.php
@@ -23,8 +23,6 @@ interface ConnectionInterface
      */
     public function initialize();
 
-    //--------------------------------------------------------------------
-
     /**
      * Connect to the database.
      *
@@ -34,8 +32,6 @@ public function initialize();
      */
     public function connect(bool $persistent = false);
 
-    //--------------------------------------------------------------------
-
     /**
      * Create a persistent database connection.
      *
@@ -43,8 +39,6 @@ public function connect(bool $persistent = false);
      */
     public function persistentConnect();
 
-    //--------------------------------------------------------------------
-
     /**
      * Keep or establish the connection if no queries have been sent for
      * a length of time exceeding the server's idle timeout.
@@ -53,8 +47,6 @@ public function persistentConnect();
      */
     public function reconnect();
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the actual connection object. If both a 'read' and 'write'
      * connection has been specified, you can pass either term in to
@@ -67,8 +59,6 @@ public function reconnect();
      */
     public function getConnection(?string $alias = null);
 
-    //--------------------------------------------------------------------
-
     /**
      * Select a specific database table to use.
      *
@@ -78,8 +68,6 @@ public function getConnection(?string $alias = null);
      */
     public function setDatabase(string $databaseName);
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the name of the current database being used.
      *
@@ -87,8 +75,6 @@ public function setDatabase(string $databaseName);
      */
     public function getDatabase(): string;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the last error encountered by this connection.
      * Must return this format: ['code' => string|int, 'message' => string]
@@ -98,8 +84,6 @@ public function getDatabase(): string;
      */
     public function error(): array;
 
-    //--------------------------------------------------------------------
-
     /**
      * The name of the platform in use (MySQLi, mssql, etc)
      *
@@ -107,8 +91,6 @@ public function error(): array;
      */
     public function getPlatform(): string;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a string containing the version of the database being used.
      *
@@ -116,8 +98,6 @@ public function getPlatform(): string;
      */
     public function getVersion(): string;
 
-    //--------------------------------------------------------------------
-
     /**
      * Orchestrates a query against the database. Queries must use
      * Database\Statement objects to store the query and build it.
@@ -133,8 +113,6 @@ public function getVersion(): string;
      */
     public function query(string $sql, $binds = null);
 
-    //--------------------------------------------------------------------
-
     /**
      * Performs a basic query against the database. No binding or caching
      * is performed, nor are transactions handled. Simply takes a raw
@@ -146,8 +124,6 @@ public function query(string $sql, $binds = null);
      */
     public function simpleQuery(string $sql);
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an instance of the query builder for this connection.
      *
@@ -157,8 +133,6 @@ public function simpleQuery(string $sql);
      */
     public function table($tableName);
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the last query's statement object.
      *
@@ -166,8 +140,6 @@ public function table($tableName);
      */
     public function getLastQuery();
 
-    //--------------------------------------------------------------------
-
     /**
      * "Smart" Escaping
      *
@@ -180,8 +152,6 @@ public function getLastQuery();
      */
     public function escape($str);
 
-    //--------------------------------------------------------------------
-
     /**
      * Allows for custom calls to the database engine that are not
      * supported through our database layer.
@@ -193,8 +163,6 @@ public function escape($str);
      */
     public function callFunction(string $functionName, ...$params);
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines if the statement is a write-type query or not.
      *
diff --git a/system/Database/Database.php b/system/Database/Database.php
index 35cff46ae161..43da80375459 100644
--- a/system/Database/Database.php
+++ b/system/Database/Database.php
@@ -31,8 +31,6 @@ class Database
      */
     protected $connections = [];
 
-    //--------------------------------------------------------------------
-
     /**
      * Parses the connection binds and returns an instance of the driver
      * ready to go.
@@ -68,8 +66,6 @@ public function load(array $params = [], string $alias = '')
         return $this->connections[$alias];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Creates a Forge instance for the current database type.
      *
@@ -87,8 +83,6 @@ public function loadForge(ConnectionInterface $db): object
         return $this->initDriver($db->DBDriver, 'Forge', $db);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Creates a Utils instance for the current database type.
      *
@@ -106,8 +100,6 @@ public function loadUtils(ConnectionInterface $db): object
         return $this->initDriver($db->DBDriver, 'Utils', $db);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Parse universal DSN string
      *
@@ -151,8 +143,6 @@ protected function parseDSN(array $params): array
         return array_merge($params, $dsnParams);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Initialize database driver.
      *
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 62efaf9720a5..3e591e63efaf 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -71,8 +71,6 @@ class Forge
      */
     protected $charset = '';
 
-    //--------------------------------------------------------------------
-
     /**
      * CREATE DATABASE statement
      *
@@ -162,8 +160,6 @@ class Forge
      */
     protected $default = ' DEFAULT ';
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      *
@@ -174,8 +170,6 @@ public function __construct(BaseConnection $db)
         $this->db = &$db;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Provides access to the forge's current database connection.
      *
@@ -186,8 +180,6 @@ public function getConnection()
         return $this->db;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Create database
      *
@@ -242,8 +234,6 @@ public function createDatabase(string $dbName, bool $ifNotExists = false): bool
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determine if a database exists
      *
@@ -266,8 +256,6 @@ private function databaseExists(string $dbName): bool
         return $this->db->query($this->checkDatabaseExistStr, $dbName)->getRow() !== null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Drop database
      *
@@ -305,8 +293,6 @@ public function dropDatabase(string $dbName): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Add Key
      *
@@ -333,8 +319,6 @@ public function addKey($key, bool $primary = false, bool $unique = false)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Add Primary Key
      *
@@ -347,8 +331,6 @@ public function addPrimaryKey($key)
         return $this->addKey($key, true);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Add Unique Key
      *
@@ -361,8 +343,6 @@ public function addUniqueKey($key)
         return $this->addKey($key, false, true);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Add Field
      *
@@ -398,8 +378,6 @@ public function addField($field)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Add Foreign Key
      *
@@ -458,8 +436,6 @@ public function dropForeignKey(string $table, string $foreignName)
         return $this->db->query($sql);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Create Table
      *
@@ -514,8 +490,6 @@ public function createTable(string $table, bool $ifNotExists = false, array $att
         return $result;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Create Table
      *
@@ -569,8 +543,6 @@ protected function _createTable(string $table, bool $ifNotExists, array $attribu
         );
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * CREATE TABLE attributes
      *
@@ -591,8 +563,6 @@ protected function _createTableAttributes(array $attributes): string
         return $sql;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Drop Table
      *
@@ -645,8 +615,6 @@ public function dropTable(string $tableName, bool $ifExists = false, bool $casca
         return $query;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Drop Table
      *
@@ -675,8 +643,6 @@ protected function _dropTable(string $table, bool $ifExists, bool $cascade)
         return $sql . ' ' . $this->db->escapeIdentifiers($table);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Rename Table
      *
@@ -722,8 +688,6 @@ public function renameTable(string $tableName, string $newTableName)
         return $result;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Column Add
      *
@@ -764,8 +728,6 @@ public function addColumn(string $table, $field): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Column Drop
      *
@@ -790,8 +752,6 @@ public function dropColumn(string $table, $columnName)
         return $this->db->query($sql);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Column Modify
      *
@@ -838,8 +798,6 @@ public function modifyColumn(string $table, $field): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * ALTER TABLE
      *
@@ -879,8 +837,6 @@ protected function _alterTable(string $alterType, string $table, $fields)
         return $sqls;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Process fields
      *
@@ -968,8 +924,6 @@ protected function _processFields(bool $createTable = false): array
         return $fields;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Process column
      *
@@ -988,8 +942,6 @@ protected function _processColumn(array $field): string
                . $field['unique'];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Field attribute TYPE
      *
@@ -1004,8 +956,6 @@ protected function _attributeType(array &$attributes)
         // Usually overridden by drivers
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Field attribute UNSIGNED
      *
@@ -1053,8 +1003,6 @@ protected function _attributeUnsigned(array &$attributes, array &$field)
         $field['unsigned'] = ($this->unsigned === true) ? ' UNSIGNED' : '';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Field attribute DEFAULT
      *
@@ -1082,8 +1030,6 @@ protected function _attributeDefault(array &$attributes, array &$field)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Field attribute UNIQUE
      *
@@ -1099,8 +1045,6 @@ protected function _attributeUnique(array &$attributes, array &$field)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Field attribute AUTO_INCREMENT
      *
@@ -1118,8 +1062,6 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Process primary keys
      *
@@ -1145,8 +1087,6 @@ protected function _processPrimaryKeys(string $table): string
         return $sql;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Process indexes
      *
@@ -1186,8 +1126,6 @@ protected function _processIndexes(string $table)
         return $sqls;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Process foreign keys
      *
@@ -1227,8 +1165,6 @@ protected function _processForeignKeys(string $table): string
         return $sql;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Reset
      *
diff --git a/system/Database/Migration.php b/system/Database/Migration.php
index ef7025d1f62a..45e87049a072 100644
--- a/system/Database/Migration.php
+++ b/system/Database/Migration.php
@@ -39,8 +39,6 @@ abstract class Migration
      */
     protected $forge;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      *
@@ -53,8 +51,6 @@ public function __construct(?Forge $forge = null)
         $this->db = $this->forge->getConnection();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the database group name this migration uses.
      *
@@ -65,19 +61,13 @@ public function getDBGroup(): ?string
         return $this->DBGroup;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Perform a migration step.
      */
     abstract public function up();
 
-    //--------------------------------------------------------------------
-
     /**
      * Revert a migration step.
      */
     abstract public function down();
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
index 1cbc269512b2..7437dda86b39 100644
--- a/system/Database/MigrationRunner.php
+++ b/system/Database/MigrationRunner.php
@@ -150,8 +150,6 @@ public function __construct(MigrationsConfig $config, $db = null)
         $this->db = db_connect($db);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Locate and run all new migrations
      *
@@ -226,8 +224,6 @@ public function latest(?string $group = null)
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Migrate down to a previous batch
      *
@@ -350,8 +346,6 @@ public function regress(int $targetBatch = 0, ?string $group = null)
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Migrate a single file regardless of order or batches.
      * Method "up" or "down" determined by presence in history.
@@ -434,8 +428,6 @@ public function force(string $path, string $namespace, ?string $group = null)
         throw new RuntimeException($message);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieves list of available migration scripts
      *
@@ -461,8 +453,6 @@ public function findMigrations(): array
         return $migrations;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieves a list of available migration scripts for one namespace
      *
@@ -501,8 +491,6 @@ public function findNamespaceMigrations(string $namespace): array
         return $migrations;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Create a migration object from a file path.
      *
@@ -541,8 +529,6 @@ protected function migrationFromFile(string $path, string $namespace)
         return $migration;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Set namespace.
      * Allows other scripts to modify on the fly as needed.
@@ -558,8 +544,6 @@ public function setNamespace(?string $namespace)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Set database Group.
      * Allows other scripts to modify on the fly as needed.
@@ -575,8 +559,6 @@ public function setGroup(string $group)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Set migration Name.
      *
@@ -591,8 +573,6 @@ public function setName(string $name)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * If $silent == true, then will not throw exceptions and will
      * attempt to continue gracefully.
@@ -608,8 +588,6 @@ public function setSilent(bool $silent)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Extracts the migration number from a filename
      *
@@ -624,8 +602,6 @@ protected function getMigrationNumber(string $migration): string
         return count($matches) ? $matches[0] : '0';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Extracts the migration class name from a filename
      *
@@ -641,8 +617,6 @@ protected function getMigrationName(string $migration): string
         return implode('_', $parts);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Uses the non-repeatable portions of a migration or history
      * to create a sortable unique key
@@ -656,8 +630,6 @@ public function getObjectUid($object): string
         return preg_replace('/[^0-9]/', '', $object->version) . $object->class;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieves messages formatted for CLI output
      *
@@ -668,8 +640,6 @@ public function getCliMessages(): array
         return $this->cliMessages;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Clears any CLI messages.
      *
@@ -682,8 +652,6 @@ public function clearCliMessages()
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Truncates the history table.
      *
@@ -696,8 +664,6 @@ public function clearHistory()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Add a history to the table.
      *
@@ -728,8 +694,6 @@ protected function addHistory($migration, int $batch)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Removes a single history
      *
@@ -752,8 +716,6 @@ protected function removeHistory($history)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Grabs the full migration history from the database for a group
      *
@@ -782,8 +744,6 @@ public function getHistory(string $group = 'default'): array
         return ! empty($query) ? $query->getResultObject() : [];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the migration history for a single batch.
      *
@@ -803,8 +763,6 @@ public function getBatchHistory(int $batch, $order = 'asc'): array
         return ! empty($query) ? $query->getResultObject() : [];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns all the batches from the database history in order
      *
@@ -824,8 +782,6 @@ public function getBatches(): array
         return array_map('intval', array_column($batches, 'batch'));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the value of the last batch in the database.
      *
@@ -847,8 +803,6 @@ public function getLastBatch(): int
         return (int) $batch;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the version number of the first migration for a batch.
      * Mostly just for tests.
@@ -875,8 +829,6 @@ public function getBatchStart(int $batch): string
         return count($migration) ? $migration[0]->version : '0';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the version number of the last migration for a batch.
      * Mostly just for tests.
@@ -903,8 +855,6 @@ public function getBatchEnd(int $batch): string
         return count($migration) ? $migration[0]->version : 0;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Ensures that we have created our migrations table
      * in the database.
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
index cb7bff2efd8a..804ac807aa8a 100644
--- a/system/Database/MySQLi/Connection.php
+++ b/system/Database/MySQLi/Connection.php
@@ -42,8 +42,6 @@ class Connection extends BaseConnection
      */
     public $deleteHack = true;
 
-    // --------------------------------------------------------------------
-
     /**
      * Identifier escape character
      *
@@ -51,8 +49,6 @@ class Connection extends BaseConnection
      */
     public $escapeChar = '`';
 
-    // --------------------------------------------------------------------
-
     /**
      * MySQLi object
      *
@@ -62,8 +58,6 @@ class Connection extends BaseConnection
      */
     public $mysqli;
 
-    //--------------------------------------------------------------------
-
     /**
      * Connect to the database.
      *
@@ -214,8 +208,6 @@ public function connect(bool $persistent = false)
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Keep or establish the connection if no queries have been sent for
      * a length of time exceeding the server's idle timeout.
@@ -228,8 +220,6 @@ public function reconnect()
         $this->initialize();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Close the database connection.
      *
@@ -240,8 +230,6 @@ protected function _close()
         $this->connID->close();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Select a specific database table to use.
      *
@@ -268,8 +256,6 @@ public function setDatabase(string $databaseName): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a string containing the version of the database being used.
      *
@@ -288,8 +274,6 @@ public function getVersion(): string
         return $this->dataCache['version'] = $this->mysqli->server_info;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Executes the query against the database.
      *
@@ -319,8 +303,6 @@ public function execute(string $sql)
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Prep the query
      *
@@ -341,8 +323,6 @@ protected function prepQuery(string $sql): string
         return $sql;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the total number of rows affected by this query.
      *
@@ -353,8 +333,6 @@ public function affectedRows(): int
         return $this->connID->affected_rows ?? 0;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Platform-dependant string escape
      *
@@ -371,8 +349,6 @@ protected function _escapeString(string $str): string
         return $this->connID->real_escape_string($str);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Escape Like String Direct
      * There are a few instances where MySQLi queries cannot take the
@@ -403,8 +379,6 @@ public function escapeLikeStringDirect($str)
         );
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates the SQL for listing tables in a platform-dependent manner.
      * Uses escapeLikeStringDirect().
@@ -424,8 +398,6 @@ protected function _listTables(bool $prefixLimit = false): string
         return $sql;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates a platform-specific query string so that the column names can be fetched.
      *
@@ -438,8 +410,6 @@ protected function _listColumns(string $table = ''): string
         return 'SHOW COLUMNS FROM ' . $this->protectIdentifiers($table, true, null, false);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an array of objects with field data
      *
@@ -474,8 +444,6 @@ public function _fieldData(string $table): array
         return $retVal;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an array of objects with index data
      *
@@ -524,8 +492,6 @@ public function _indexData(string $table): array
         return $keys;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an array of objects with Foreign key data
      *
@@ -575,8 +541,6 @@ public function _foreignKeyData(string $table): array
         return $retVal;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns platform-specific SQL to disable foreign key checks.
      *
@@ -587,8 +551,6 @@ protected function _disableForeignKeyChecks()
         return 'SET FOREIGN_KEY_CHECKS=0';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns platform-specific SQL to enable foreign key checks.
      *
@@ -599,8 +561,6 @@ protected function _enableForeignKeyChecks()
         return 'SET FOREIGN_KEY_CHECKS=1';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the last error code and message.
      * Must return this format: ['code' => string|int, 'message' => string]
@@ -623,8 +583,6 @@ public function error(): array
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Insert ID
      *
@@ -635,8 +593,6 @@ public function insertID(): int
         return $this->connID->insert_id;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Begin Transaction
      *
@@ -649,8 +605,6 @@ protected function _transBegin(): bool
         return $this->connID->begin_transaction();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Commit Transaction
      *
@@ -667,8 +621,6 @@ protected function _transCommit(): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Rollback Transaction
      *
@@ -684,6 +636,4 @@ protected function _transRollback(): bool
 
         return false;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Database/MySQLi/Forge.php b/system/Database/MySQLi/Forge.php
index 390ee2e1e58b..14e04552f395 100644
--- a/system/Database/MySQLi/Forge.php
+++ b/system/Database/MySQLi/Forge.php
@@ -93,8 +93,6 @@ class Forge extends BaseForge
      */
     protected $null = 'NULL';
 
-    //--------------------------------------------------------------------
-
     /**
      * CREATE TABLE attributes
      *
@@ -129,8 +127,6 @@ protected function _createTableAttributes(array $attributes): string
         return $sql;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * ALTER TABLE
      *
@@ -165,8 +161,6 @@ protected function _alterTable(string $alterType, string $table, $field)
         return [$sql . implode(',', $field)];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Process column
      *
@@ -194,8 +188,6 @@ protected function _processColumn(array $field): string
                 . $extraClause;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Process indexes
      *
diff --git a/system/Database/MySQLi/Result.php b/system/Database/MySQLi/Result.php
index 233b94098e52..83d2556638b5 100644
--- a/system/Database/MySQLi/Result.php
+++ b/system/Database/MySQLi/Result.php
@@ -30,8 +30,6 @@ public function getFieldCount(): int
         return $this->resultID->field_count;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates an array of column names in the result set.
      *
@@ -49,8 +47,6 @@ public function getFieldNames(): array
         return $fieldNames;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates an array of objects representing field meta-data.
      *
@@ -107,8 +103,6 @@ public function getFieldData(): array
         return $retVal;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Frees the current result.
      *
@@ -122,8 +116,6 @@ public function freeResult()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Moves the internal pointer to the desired offset. This is called
      * internally before fetching results to make sure the result set
@@ -138,8 +130,6 @@ public function dataSeek(int $n = 0)
         return $this->resultID->data_seek($n);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the result set as an array.
      *
@@ -152,8 +142,6 @@ protected function fetchAssoc()
         return $this->resultID->fetch_assoc();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the result set as an object.
      *
@@ -172,8 +160,6 @@ protected function fetchObject(string $className = 'stdClass')
         return $this->resultID->fetch_object($className);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the number of rows in the resultID (i.e., mysqli_result object)
      *
@@ -187,6 +173,4 @@ public function getNumRows(): int
 
         return $this->numRows;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Database/MySQLi/Utils.php b/system/Database/MySQLi/Utils.php
index 9fd686160da0..2e91ad291ce1 100644
--- a/system/Database/MySQLi/Utils.php
+++ b/system/Database/MySQLi/Utils.php
@@ -33,8 +33,6 @@ class Utils extends BaseUtils
      */
     protected $optimizeTable = 'OPTIMIZE TABLE %s';
 
-    //--------------------------------------------------------------------
-
     /**
      * Platform dependent version of the backup function.
      *
@@ -46,6 +44,4 @@ public function _backup(?array $prefs = null)
     {
         throw new DatabaseException('Unsupported feature of the database platform you are using.');
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index 217551f606a1..03cf05e3a079 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -38,8 +38,6 @@ class Builder extends BaseBuilder
         'insert' => 'ON CONFLICT DO NOTHING',
     ];
 
-    //--------------------------------------------------------------------
-
     /**
      * Compile Ignore Statement
      *
@@ -61,8 +59,6 @@ protected function compileIgnore(string $statement)
         return $sql;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * ORDER BY
      *
@@ -92,8 +88,6 @@ public function orderBy(string $orderBy, string $direction = '', ?bool $escape =
         return parent::orderBy($orderBy, $direction, $escape);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Increments a numeric column by the specified value.
      *
@@ -113,8 +107,6 @@ public function increment(string $column, int $value = 1)
         return $this->db->query($sql, $this->binds, false);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Decrements a numeric column by the specified value.
      *
@@ -134,8 +126,6 @@ public function decrement(string $column, int $value = 1)
         return $this->db->query($sql, $this->binds, false);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Replace
      *
@@ -246,8 +236,6 @@ public function delete($where = '', ?int $limit = null, bool $resetData = true)
         return parent::delete($where, $limit, $resetData);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * LIMIT string
      *
@@ -262,8 +250,6 @@ protected function _limit(string $sql, bool $offsetIgnore = false): string
         return $sql . ' LIMIT ' . $this->QBLimit . ($this->QBOffset ? " OFFSET {$this->QBOffset}" : '');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Update statement
      *
@@ -290,8 +276,6 @@ protected function _update(string $table, array $values): string
         return parent::_update($table, $values);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Update_Batch statement
      *
@@ -333,8 +317,6 @@ protected function _updateBatch(string $table, array $values, string $index): st
         return "UPDATE {$table} SET " . substr($cases, 0, -2) . $this->compileWhereHaving('QBWhere');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Delete statement
      *
@@ -351,8 +333,6 @@ protected function _delete(string $table): string
         return parent::_delete($table);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Truncate statement
      *
@@ -370,8 +350,6 @@ protected function _truncate(string $table): string
         return 'TRUNCATE ' . $table . ' RESTART IDENTITY';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Platform independent LIKE statement builder.
      *
@@ -395,8 +373,6 @@ public function _like_statement(?string $prefix, string $column, ?string $not, s
         return "{$prefix} {$column} {$not} {$op} :{$bind}:";
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * JOIN
      *
@@ -417,6 +393,4 @@ public function join(string $table, string $cond, string $type = '', ?bool $esca
 
         return parent::join($table, $cond, $type, $escape);
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
index 6f7fb859fbc8..98adb01c13a6 100644
--- a/system/Database/Postgre/Connection.php
+++ b/system/Database/Postgre/Connection.php
@@ -28,8 +28,6 @@ class Connection extends BaseConnection
      */
     public $DBDriver = 'Postgre';
 
-    //--------------------------------------------------------------------
-
     /**
      * Database schema
      *
@@ -44,8 +42,6 @@ class Connection extends BaseConnection
      */
     public $escapeChar = '"';
 
-    //--------------------------------------------------------------------
-
     /**
      * Connect to the database.
      *
@@ -87,8 +83,6 @@ public function connect(bool $persistent = false)
         return $this->connID;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Keep or establish the connection if no queries have been sent for
      * a length of time exceeding the server's idle timeout.
@@ -102,8 +96,6 @@ public function reconnect()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Close the database connection.
      *
@@ -114,8 +106,6 @@ protected function _close()
         pg_close($this->connID);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Select a specific database table to use.
      *
@@ -128,8 +118,6 @@ public function setDatabase(string $databaseName): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a string containing the version of the database being used.
      *
@@ -149,8 +137,6 @@ public function getVersion(): string
         return isset($pgVersion['server']) ? $this->dataCache['version'] = $pgVersion['server'] : false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Executes the query against the database.
      *
@@ -172,8 +158,6 @@ public function execute(string $sql)
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the total number of rows affected by this query.
      *
@@ -184,8 +168,6 @@ public function affectedRows(): int
         return pg_affected_rows($this->resultID);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * "Smart" Escape String
      *
@@ -212,8 +194,6 @@ public function escape($str)
         return parent::escape($str);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Platform-dependant string escape
      *
@@ -230,8 +210,6 @@ protected function _escapeString(string $str): string
         return pg_escape_string($this->connID, $str);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates the SQL for listing tables in a platform-dependent manner.
      *
@@ -252,8 +230,6 @@ protected function _listTables(bool $prefixLimit = false): string
         return $sql;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates a platform-specific query string so that the column names can be fetched.
      *
@@ -270,8 +246,6 @@ protected function _listColumns(string $table = ''): string
                 . ' ORDER BY "ordinal_position"';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an array of objects with field data
      *
@@ -308,8 +282,6 @@ public function _fieldData(string $table): array
         return $retVal;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an array of objects with index data
      *
@@ -353,8 +325,6 @@ public function _indexData(string $table): array
         return $retVal;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an array of objects with Foreign key data
      *
@@ -400,8 +370,6 @@ public function _foreignKeyData(string $table): array
         return $retVal;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns platform-specific SQL to disable foreign key checks.
      *
@@ -412,8 +380,6 @@ protected function _disableForeignKeyChecks()
         return 'SET CONSTRAINTS ALL DEFERRED';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns platform-specific SQL to enable foreign key checks.
      *
@@ -424,8 +390,6 @@ protected function _enableForeignKeyChecks()
         return 'SET CONSTRAINTS ALL IMMEDIATE;';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the last error code and message.
      * Must return this format: ['code' => string|int, 'message' => string]
@@ -441,8 +405,6 @@ public function error(): array
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Insert ID
      *
@@ -481,8 +443,6 @@ public function insertID()
         return (int) $query->ins_id;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Build a DSN from the provided parameters
      *
@@ -535,8 +495,6 @@ protected function buildDSN()
         $this->DSN = rtrim($this->DSN);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Set client encoding
      *
@@ -549,8 +507,6 @@ protected function setClientEncoding(string $charset): bool
         return pg_set_client_encoding($this->connID, $charset) === 0;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Begin Transaction
      *
@@ -561,8 +517,6 @@ protected function _transBegin(): bool
         return (bool) pg_query($this->connID, 'BEGIN');
     }
 
-    // --------------------------------------------------------------------
-
     /**
      * Commit Transaction
      *
@@ -573,8 +527,6 @@ protected function _transCommit(): bool
         return (bool) pg_query($this->connID, 'COMMIT');
     }
 
-    // --------------------------------------------------------------------
-
     /**
      * Rollback Transaction
      *
@@ -585,8 +537,6 @@ protected function _transRollback(): bool
         return (bool) pg_query($this->connID, 'ROLLBACK');
     }
 
-    // --------------------------------------------------------------------
-
     /**
      * Determines if a query is a "write" type.
      *
@@ -604,6 +554,4 @@ public function isWriteType($sql): bool
 
         return parent::isWriteType($sql);
     }
-
-    // --------------------------------------------------------------------
 }
diff --git a/system/Database/Postgre/Forge.php b/system/Database/Postgre/Forge.php
index ae7af3320f2b..335c37a9280f 100644
--- a/system/Database/Postgre/Forge.php
+++ b/system/Database/Postgre/Forge.php
@@ -58,8 +58,6 @@ class Forge extends BaseForge
      */
     protected $null = 'NULL';
 
-    //--------------------------------------------------------------------
-
     /**
      * CREATE TABLE attributes
      *
@@ -72,8 +70,6 @@ protected function _createTableAttributes(array $attributes): string
         return '';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * ALTER TABLE
      *
@@ -127,8 +123,6 @@ protected function _alterTable(string $alterType, string $table, $field)
         return $sqls;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Process column
      *
@@ -146,8 +140,6 @@ protected function _processColumn(array $field): string
                 . $field['unique'];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Field attribute TYPE
      *
@@ -184,8 +176,6 @@ protected function _attributeType(array &$attributes)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Field attribute AUTO_INCREMENT
      *
@@ -201,8 +191,6 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Drop Table
      *
diff --git a/system/Database/Postgre/Result.php b/system/Database/Postgre/Result.php
index 936adf339226..9cc47e135ebe 100644
--- a/system/Database/Postgre/Result.php
+++ b/system/Database/Postgre/Result.php
@@ -30,8 +30,6 @@ public function getFieldCount(): int
         return pg_num_fields($this->resultID);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates an array of column names in the result set.
      *
@@ -48,8 +46,6 @@ public function getFieldNames(): array
         return $fieldNames;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates an array of objects representing field meta-data.
      *
@@ -73,8 +69,6 @@ public function getFieldData(): array
         return $retVal;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Frees the current result.
      *
@@ -88,8 +82,6 @@ public function freeResult()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Moves the internal pointer to the desired offset. This is called
      * internally before fetching results to make sure the result set
@@ -104,8 +96,6 @@ public function dataSeek(int $n = 0)
         return pg_result_seek($this->resultID, $n);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the result set as an array.
      *
@@ -118,8 +108,6 @@ protected function fetchAssoc()
         return pg_fetch_assoc($this->resultID);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the result set as an object.
      *
@@ -138,8 +126,6 @@ protected function fetchObject(string $className = 'stdClass')
         return pg_fetch_object($this->resultID, null, $className);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the number of rows in the resultID (i.e., PostgreSQL query result resource)
      *
@@ -153,6 +139,4 @@ public function getNumRows(): int
 
         return $this->numRows;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Database/Postgre/Utils.php b/system/Database/Postgre/Utils.php
index b2503ba2ac11..7de2b127ff22 100644
--- a/system/Database/Postgre/Utils.php
+++ b/system/Database/Postgre/Utils.php
@@ -33,8 +33,6 @@ class Utils extends BaseUtils
      */
     protected $optimizeTable = 'REINDEX TABLE %s';
 
-    //--------------------------------------------------------------------
-
     /**
      * Platform dependent version of the backup function.
      *
@@ -46,6 +44,4 @@ public function _backup(?array $prefs = null)
     {
         throw new DatabaseException('Unsupported feature of the database platform you are using.');
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Database/PreparedQueryInterface.php b/system/Database/PreparedQueryInterface.php
index 35fc14604957..99fad9af2c20 100644
--- a/system/Database/PreparedQueryInterface.php
+++ b/system/Database/PreparedQueryInterface.php
@@ -26,8 +26,6 @@ interface PreparedQueryInterface
      */
     public function execute(...$data);
 
-    //--------------------------------------------------------------------
-
     /**
      * Prepares the query against the database, and saves the connection
      * info necessary to execute the query later.
@@ -39,15 +37,11 @@ public function execute(...$data);
      */
     public function prepare(string $sql, array $options = []);
 
-    //--------------------------------------------------------------------
-
     /**
      * Explicity closes the statement.
      */
     public function close();
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the SQL that has been prepared.
      *
@@ -55,8 +49,6 @@ public function close();
      */
     public function getQueryString(): string;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the error code created while executing this statement.
      *
@@ -64,14 +56,10 @@ public function getQueryString(): string;
      */
     public function getErrorCode(): int;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the error message created while executing this statement.
      *
      * @return string
      */
     public function getErrorMessage(): string;
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Database/QueryInterface.php b/system/Database/QueryInterface.php
index e0e7924f93d0..73b65faba561 100644
--- a/system/Database/QueryInterface.php
+++ b/system/Database/QueryInterface.php
@@ -30,8 +30,6 @@ interface QueryInterface
      */
     public function setQuery(string $sql, $binds = null, bool $setEscape = true);
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the final, processed query string after binding, etal
      * has been performed.
@@ -40,8 +38,6 @@ public function setQuery(string $sql, $binds = null, bool $setEscape = true);
      */
     public function getQuery();
 
-    //--------------------------------------------------------------------
-
     /**
      * Records the execution time of the statement using microtime(true)
      * for it's start and end values. If no end value is present, will
@@ -54,8 +50,6 @@ public function getQuery();
      */
     public function setDuration(float $start, ?float $end = null);
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the duration of this query during execution, or null if
      * the query has not been executed yet.
@@ -66,8 +60,6 @@ public function setDuration(float $start, ?float $end = null);
      */
     public function getDuration(int $decimals = 6): string;
 
-    //--------------------------------------------------------------------
-
     /**
      * Stores the error description that happened for this query.
      *
@@ -76,8 +68,6 @@ public function getDuration(int $decimals = 6): string;
      */
     public function setError(int $code, string $error);
 
-    //--------------------------------------------------------------------
-
     /**
      * Reports whether this statement created an error not.
      *
@@ -85,8 +75,6 @@ public function setError(int $code, string $error);
      */
     public function hasError(): bool;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the error code created while executing this statement.
      *
@@ -94,8 +82,6 @@ public function hasError(): bool;
      */
     public function getErrorCode(): int;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the error message created while executing this statement.
      *
@@ -103,8 +89,6 @@ public function getErrorCode(): int;
      */
     public function getErrorMessage(): string;
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines if the statement is a write-type query or not.
      *
@@ -112,8 +96,6 @@ public function getErrorMessage(): string;
      */
     public function isWriteType(): bool;
 
-    //--------------------------------------------------------------------
-
     /**
      * Swaps out one table prefix for a new one.
      *
@@ -123,6 +105,4 @@ public function isWriteType(): bool;
      * @return mixed
      */
     public function swapPrefix(string $orig, string $swap);
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Database/ResultInterface.php b/system/Database/ResultInterface.php
index 47f9d55802d7..be24679f96c9 100644
--- a/system/Database/ResultInterface.php
+++ b/system/Database/ResultInterface.php
@@ -27,8 +27,6 @@ interface ResultInterface
      */
     public function getResult(string $type = 'object'): array;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the results as an array of custom objects.
      *
@@ -38,8 +36,6 @@ public function getResult(string $type = 'object'): array;
      */
     public function getCustomResultObject(string $className);
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the results as an array of arrays.
      *
@@ -49,8 +45,6 @@ public function getCustomResultObject(string $className);
      */
     public function getResultArray(): array;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the results as an array of objects.
      *
@@ -60,8 +54,6 @@ public function getResultArray(): array;
      */
     public function getResultObject(): array;
 
-    //--------------------------------------------------------------------
-
     /**
      * Wrapper object to return a row as either an array, an object, or
      * a custom class.
@@ -75,8 +67,6 @@ public function getResultObject(): array;
      */
     public function getRow($n = 0, string $type = 'object');
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a row as a custom class instance.
      *
@@ -89,8 +79,6 @@ public function getRow($n = 0, string $type = 'object');
      */
     public function getCustomRowObject(int $n, string $className);
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a single row from the results as an array.
      *
@@ -102,8 +90,6 @@ public function getCustomRowObject(int $n, string $className);
      */
     public function getRowArray(int $n = 0);
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a single row from the results as an object.
      *
@@ -115,8 +101,6 @@ public function getRowArray(int $n = 0);
      */
     public function getRowObject(int $n = 0);
 
-    //--------------------------------------------------------------------
-
     /**
      * Assigns an item into a particular column slot.
      *
@@ -127,8 +111,6 @@ public function getRowObject(int $n = 0);
      */
     public function setRow($key, $value = null);
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the "first" row of the current results.
      *
@@ -138,8 +120,6 @@ public function setRow($key, $value = null);
      */
     public function getFirstRow(string $type = 'object');
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the "last" row of the current results.
      *
@@ -149,8 +129,6 @@ public function getFirstRow(string $type = 'object');
      */
     public function getLastRow(string $type = 'object');
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the "next" row of the current results.
      *
@@ -160,8 +138,6 @@ public function getLastRow(string $type = 'object');
      */
     public function getNextRow(string $type = 'object');
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the "previous" row of the current results.
      *
@@ -171,8 +147,6 @@ public function getNextRow(string $type = 'object');
      */
     public function getPreviousRow(string $type = 'object');
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an unbuffered row and move the pointer to the next row.
      *
@@ -182,8 +156,6 @@ public function getPreviousRow(string $type = 'object');
      */
     public function getUnbufferedRow(string $type = 'object');
 
-    //--------------------------------------------------------------------
-
     /**
      * Gets the number of fields in the result set.
      *
@@ -191,8 +163,6 @@ public function getUnbufferedRow(string $type = 'object');
      */
     public function getFieldCount(): int;
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates an array of column names in the result set.
      *
@@ -200,8 +170,6 @@ public function getFieldCount(): int;
      */
     public function getFieldNames(): array;
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates an array of objects representing field meta-data.
      *
@@ -209,8 +177,6 @@ public function getFieldNames(): array;
      */
     public function getFieldData(): array;
 
-    //--------------------------------------------------------------------
-
     /**
      * Frees the current result.
      *
@@ -218,8 +184,6 @@ public function getFieldData(): array;
      */
     public function freeResult();
 
-    //--------------------------------------------------------------------
-
     /**
      * Moves the internal pointer to the desired offset. This is called
      * internally before fetching results to make sure the result set
@@ -230,6 +194,4 @@ public function freeResult();
      * @return mixed
      */
     public function dataSeek(int $n = 0);
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index d5b88974a00d..4276c5359056 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -60,8 +60,6 @@ class Builder extends BaseBuilder
      */
     public $keyPermission = false;
 
-    //--------------------------------------------------------------------
-
     /**
      * FROM tables
      *
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index dd158ecf2226..0b0e729a7c30 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -80,8 +80,6 @@ class Connection extends BaseConnection
      */
     protected $_reserved_identifiers = ['*'];
 
-    //--------------------------------------------------------------------
-
     /**
      * Class constructor
      *
@@ -567,8 +565,6 @@ public function getVersion(): string
         return isset($info['SQLServerVersion']) ? $this->dataCache['version'] = $info['SQLServerVersion'] : false;
     }
 
-    // --------------------------------------------------------------------
-
     /**
      * Determines if a query is a "write" type.
      *
@@ -586,6 +582,4 @@ public function isWriteType($sql): bool
 
         return parent::isWriteType($sql);
     }
-
-    // --------------------------------------------------------------------
 }
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
index a61a58b1d95f..6e87cd23a508 100755
--- a/system/Database/SQLSRV/Forge.php
+++ b/system/Database/SQLSRV/Forge.php
@@ -96,8 +96,6 @@ class Forge extends BaseForge
      */
     protected $_drop_table_if = "IF EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nDROP TABLE";
 
-    //--------------------------------------------------------------------
-
     /**
      * CREATE TABLE attributes
      *
@@ -193,8 +191,6 @@ protected function _alterTable(string $alterType, string $table, $field)
         return $sqls;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Drop index for table
      *
diff --git a/system/Database/SQLSRV/Result.php b/system/Database/SQLSRV/Result.php
index 907106494202..94eaecebf80d 100755
--- a/system/Database/SQLSRV/Result.php
+++ b/system/Database/SQLSRV/Result.php
@@ -20,8 +20,6 @@
  */
 class Result extends BaseResult
 {
-    //--------------------------------------------------------------------
-
     /**
      * Gets the number of fields in the result set.
      *
@@ -172,8 +170,6 @@ protected function fetchObject(string $className = 'stdClass')
         return sqlsrv_fetch_object($this->resultID, $className);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the number of rows in the resultID (i.e., SQLSRV query result resource)
      *
@@ -187,6 +183,4 @@ public function getNumRows(): int
 
         return $this->numRows;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Database/SQLSRV/Utils.php b/system/Database/SQLSRV/Utils.php
index 2f8af25c7933..d1223ce5d855 100755
--- a/system/Database/SQLSRV/Utils.php
+++ b/system/Database/SQLSRV/Utils.php
@@ -33,8 +33,6 @@ class Utils extends BaseUtils
      */
     protected $optimizeTable = 'ALTER INDEX all ON %s REORGANIZE';
 
-    //--------------------------------------------------------------------
-
     /**
      * Platform dependent version of the backup function.
      *
diff --git a/system/Database/SQLite3/Builder.php b/system/Database/SQLite3/Builder.php
index d2f39304756c..f5896739c539 100644
--- a/system/Database/SQLite3/Builder.php
+++ b/system/Database/SQLite3/Builder.php
@@ -50,8 +50,6 @@ class Builder extends BaseBuilder
         'insert' => 'OR IGNORE',
     ];
 
-    //--------------------------------------------------------------------
-
     /**
      * Replace statement
      *
@@ -68,8 +66,6 @@ protected function _replace(string $table, array $keys, array $values): string
         return 'INSERT OR ' . parent::_replace($table, $keys, $values);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Truncate statement
      *
diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
index 2f8525e3dade..cf499268c838 100644
--- a/system/Database/SQLite3/Connection.php
+++ b/system/Database/SQLite3/Connection.php
@@ -37,8 +37,6 @@ class Connection extends BaseConnection
      */
     public $escapeChar = '`';
 
-    //--------------------------------------------------------------------
-
     /**
      * Connect to the database.
      *
@@ -67,8 +65,6 @@ public function connect(bool $persistent = false)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Keep or establish the connection if no queries have been sent for
      * a length of time exceeding the server's idle timeout.
@@ -81,8 +77,6 @@ public function reconnect()
         $this->initialize();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Close the database connection.
      *
@@ -93,8 +87,6 @@ protected function _close()
         $this->connID->close();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Select a specific database table to use.
      *
@@ -107,8 +99,6 @@ public function setDatabase(string $databaseName): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a string containing the version of the database being used.
      *
@@ -125,8 +115,6 @@ public function getVersion(): string
         return $this->dataCache['version'] = $version['versionString'];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Execute the query
      *
@@ -150,8 +138,6 @@ public function execute(string $sql)
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the total number of rows affected by this query.
      *
@@ -162,8 +148,6 @@ public function affectedRows(): int
         return $this->connID->changes();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Platform-dependant string escape
      *
@@ -176,8 +160,6 @@ protected function _escapeString(string $str): string
         return $this->connID->escapeString($str);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates the SQL for listing tables in a platform-dependent manner.
      *
@@ -194,8 +176,6 @@ protected function _listTables(bool $prefixLimit = false): string
                     : '');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates a platform-specific query string so that the column names can be fetched.
      *
@@ -254,8 +234,6 @@ public function getFieldNames(string $table)
         return $this->dataCache['field_names'][$table];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an array of objects with field data
      *
@@ -293,8 +271,6 @@ public function _fieldData(string $table): array
         return $retVal;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an array of objects with index data
      *
@@ -340,8 +316,6 @@ public function _indexData(string $table): array
         return $retVal;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an array of objects with Foreign key data
      *
@@ -380,8 +354,6 @@ public function _foreignKeyData(string $table): array
         return $retVal;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns platform-specific SQL to disable foreign key checks.
      *
@@ -392,8 +364,6 @@ protected function _disableForeignKeyChecks()
         return 'PRAGMA foreign_keys = OFF';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns platform-specific SQL to enable foreign key checks.
      *
@@ -404,8 +374,6 @@ protected function _enableForeignKeyChecks()
         return 'PRAGMA foreign_keys = ON';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the last error code and message.
      * Must return this format: ['code' => string|int, 'message' => string]
@@ -421,8 +389,6 @@ public function error(): array
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Insert ID
      *
@@ -433,8 +399,6 @@ public function insertID(): int
         return $this->connID->lastInsertRowID();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Begin Transaction
      *
@@ -445,8 +409,6 @@ protected function _transBegin(): bool
         return $this->connID->exec('BEGIN TRANSACTION');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Commit Transaction
      *
@@ -457,8 +419,6 @@ protected function _transCommit(): bool
         return $this->connID->exec('END TRANSACTION');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Rollback Transaction
      *
@@ -469,8 +429,6 @@ protected function _transRollback(): bool
         return $this->connID->exec('ROLLBACK');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks to see if the current install supports Foreign Keys
      * and has them enabled.
@@ -483,6 +441,4 @@ public function supportsForeignKeys(): bool
 
         return (bool) $result;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
index 3d8cbf87a9e3..eb0492971494 100644
--- a/system/Database/SQLite3/Forge.php
+++ b/system/Database/SQLite3/Forge.php
@@ -36,8 +36,6 @@ class Forge extends BaseForge
      */
     protected $null = 'NULL';
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      *
@@ -53,8 +51,6 @@ public function __construct(BaseConnection $db)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Create database
      *
@@ -70,8 +66,6 @@ public function createDatabase(string $dbName, bool $ifNotExists = false): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Drop database
      *
@@ -112,8 +106,6 @@ public function dropDatabase(string $dbName): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * ALTER TABLE
      *
@@ -148,8 +140,6 @@ protected function _alterTable(string $alterType, string $table, $field)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Process column
      *
@@ -172,8 +162,6 @@ protected function _processColumn(array $field): string
                . $field['default'];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Process indexes
      *
@@ -213,8 +201,6 @@ protected function _processIndexes(string $table): array
         return $sqls;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Field attribute TYPE
      *
@@ -237,8 +223,6 @@ protected function _attributeType(array &$attributes)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Field attribute AUTO_INCREMENT
      *
@@ -261,8 +245,6 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Foreign Key Drop
      *
diff --git a/system/Database/SQLite3/Result.php b/system/Database/SQLite3/Result.php
index b8902b5a81d4..1e25d0e58bb4 100644
--- a/system/Database/SQLite3/Result.php
+++ b/system/Database/SQLite3/Result.php
@@ -32,8 +32,6 @@ public function getFieldCount(): int
         return $this->resultID->numColumns(); // @phpstan-ignore-line
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates an array of column names in the result set.
      *
@@ -50,8 +48,6 @@ public function getFieldNames(): array
         return $fieldNames;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates an array of objects representing field meta-data.
      *
@@ -84,8 +80,6 @@ public function getFieldData(): array
         return $retVal;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Frees the current result.
      *
@@ -99,8 +93,6 @@ public function freeResult()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Moves the internal pointer to the desired offset. This is called
      * internally before fetching results to make sure the result set
@@ -121,8 +113,6 @@ public function dataSeek(int $n = 0)
         return $this->resultID->reset(); // @phpstan-ignore-line
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the result set as an array.
      *
@@ -135,8 +125,6 @@ protected function fetchAssoc()
         return $this->resultID->fetchArray(SQLITE3_ASSOC); // @phpstan-ignore-line
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the result set as an object.
      *
@@ -173,6 +161,4 @@ protected function fetchObject(string $className = 'stdClass')
 
         return $classObj;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Database/SQLite3/Utils.php b/system/Database/SQLite3/Utils.php
index 6a6478226e3f..bad750babecb 100644
--- a/system/Database/SQLite3/Utils.php
+++ b/system/Database/SQLite3/Utils.php
@@ -26,8 +26,6 @@ class Utils extends BaseUtils
      */
     protected $optimizeTable = 'REINDEX %s';
 
-    //--------------------------------------------------------------------
-
     /**
      * Platform dependent version of the backup function.
      *
@@ -39,6 +37,4 @@ public function _backup(?array $prefs = null)
     {
         throw new DatabaseException('Unsupported feature of the database platform you are using.');
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index 52bc7722591a..a9cb75c0bf74 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -64,8 +64,6 @@ class Exceptions
      */
     protected $response;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      *
@@ -85,8 +83,6 @@ public function __construct(ExceptionsConfig $config, IncomingRequest $request,
         $this->response = $response;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Responsible for registering the error, exception and shutdown
      * handling of our application.
@@ -104,8 +100,6 @@ public function initialize()
         register_shutdown_function([$this, 'shutdownHandler']);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Catches any uncaught errors and exceptions, including most Fatal errors
      * (Yay PHP7!). Will log the error, display it if display_errors is on,
@@ -146,8 +140,6 @@ public function exceptionHandler(Throwable $exception)
         exit($exitCode);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Even in PHP7, some errors make it through to the errorHandler, so
      * convert these to Exceptions and let the exception handler log it and
@@ -172,8 +164,6 @@ public function errorHandler(int $severity, string $message, ?string $file = nul
         throw new ErrorException($message, 0, $severity, $file, $line);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks to see if any errors have happened during shutdown that
      * need to be caught and handle them.
@@ -191,8 +181,6 @@ public function shutdownHandler()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines the view to display based on the exception thrown,
      * whether an HTTP or CLI request, etc.
@@ -225,8 +213,6 @@ protected function determineView(Throwable $exception, string $templatePath): st
         return $view;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Given an exception and status code will display the error to the client.
      *
@@ -269,8 +255,6 @@ protected function render(Throwable $exception, int $statusCode)
         echo $buffer;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Gathers the variables that will be made available to the view.
      *
@@ -357,7 +341,6 @@ protected function determineCodes(Throwable $exception): array
         ];
     }
 
-    //--------------------------------------------------------------------
     //--------------------------------------------------------------------
     // Display Methods
     //--------------------------------------------------------------------
@@ -394,8 +377,6 @@ public static function cleanPath(string $file): string
         return $file;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Describes memory usage in real-world units. Intended for use
      * with memory_get_usage, etc.
@@ -416,8 +397,6 @@ public static function describeMemory(int $bytes): string
         return round($bytes / 1048576, 2) . 'MB';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Creates a syntax-highlighted version of a PHP file.
      *
@@ -495,6 +474,4 @@ public static function highlightFile(string $file, int $lineNumber, int $lines =
 
         return '<pre><code>' . $out . '</code></pre>';
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Debug/Iterator.php b/system/Debug/Iterator.php
index ca5233010d2f..6fcf741f0b4b 100644
--- a/system/Debug/Iterator.php
+++ b/system/Debug/Iterator.php
@@ -32,8 +32,6 @@ class Iterator
      */
     protected $results = [];
 
-    //--------------------------------------------------------------------
-
     /**
      * Adds a test to run.
      *
@@ -54,8 +52,6 @@ public function add(string $name, Closure $closure)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Runs through all of the tests that have been added, recording
      * time to execute the desired number of iterations, and the approximate
@@ -96,8 +92,6 @@ public function run(int $iterations = 1000, bool $output = true)
         return null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get results.
      *
@@ -141,6 +135,4 @@ public function getReport(): string
 
         return $tpl . '<br/>';
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Debug/Timer.php b/system/Debug/Timer.php
index 463119bf30f7..975e7cc29d99 100644
--- a/system/Debug/Timer.php
+++ b/system/Debug/Timer.php
@@ -28,8 +28,6 @@ class Timer
      */
     protected $timers = [];
 
-    //--------------------------------------------------------------------
-
     /**
      * Starts a timer running.
      *
@@ -51,8 +49,6 @@ public function start(string $name, ?float $time = null)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Stops a running timer.
      *
@@ -76,8 +72,6 @@ public function stop(string $name)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the duration of a recorded timer.
      *
@@ -105,8 +99,6 @@ public function getElapsedTime(string $name, int $decimals = 4)
         return (float) number_format($timer['end'] - $timer['start'], $decimals);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the array of timers, with the duration pre-calculated for you.
      *
@@ -129,8 +121,6 @@ public function getTimers(int $decimals = 4): array
         return $timers;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks whether or not a timer with the specified name exists.
      *
@@ -142,6 +132,4 @@ public function has(string $name): bool
     {
         return array_key_exists(strtolower($name), $this->timers);
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index a3b4057fb7d7..1bda0619801b 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -49,8 +49,6 @@ class Toolbar
      */
     protected $collectors = [];
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor
      *
@@ -72,8 +70,6 @@ public function __construct(ToolbarConfig $config)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns all the data required by Debug Bar
      *
@@ -179,9 +175,6 @@ public function run(float $startTime, float $totalTime, RequestInterface $reques
         return json_encode($data);
     }
 
-    //--------------------------------------------------------------------
-    //--------------------------------------------------------------------
-
     /**
      * Called within the view to display the timeline itself.
      *
@@ -222,8 +215,6 @@ protected function renderTimeline(array $collectors, float $startTime, int $segm
         return $output;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a sorted array of timeline data arrays from the collectors.
      *
@@ -249,8 +240,6 @@ protected function collectTimelineData($collectors): array
         return $data;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an array of data from all of the modules
      * that should be displayed in the 'Vars' tab.
@@ -272,8 +261,6 @@ protected function collectVarData(): array
         return $data;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Rounds a number to the nearest incremental value.
      *
@@ -289,8 +276,6 @@ protected function roundTo(float $number, int $increments = 5): float
         return ceil($number * $increments) / $increments;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Prepare for debugging..
      *
@@ -377,8 +362,6 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Inject debug toolbar into the response.
      */
diff --git a/system/Debug/Toolbar/Collectors/BaseCollector.php b/system/Debug/Toolbar/Collectors/BaseCollector.php
index bc551a25e4b8..fbe92410f363 100644
--- a/system/Debug/Toolbar/Collectors/BaseCollector.php
+++ b/system/Debug/Toolbar/Collectors/BaseCollector.php
@@ -58,8 +58,6 @@ class BaseCollector
      */
     protected $title = '';
 
-    //--------------------------------------------------------------------
-
     /**
      * Gets the Collector's title.
      *
@@ -76,8 +74,6 @@ public function getTitle(bool $safe = false): string
         return $this->title;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns any information that should be shown next to the title.
      *
@@ -88,8 +84,6 @@ public function getTitleDetails(): string
         return '';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Does this collector need it's own tab?
      *
@@ -100,8 +94,6 @@ public function hasTabContent(): bool
         return (bool) $this->hasTabContent;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Does this collector have a label?
      *
@@ -112,8 +104,6 @@ public function hasLabel(): bool
         return (bool) $this->hasLabel;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Does this collector have information for the timeline?
      *
@@ -124,8 +114,6 @@ public function hasTimelineData(): bool
         return (bool) $this->hasTimeline;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Grabs the data for the timeline, properly formatted,
      * or returns an empty array.
@@ -141,8 +129,6 @@ public function timelineData(): array
         return $this->formatTimelineData();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Does this Collector have data that should be shown in the
      * 'Vars' tab?
@@ -154,8 +140,6 @@ public function hasVarData(): bool
         return (bool) $this->hasVarData;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Gets a collection of data that should be shown in the 'Vars' tab.
      * The format is an array of sections, each with their own array
@@ -177,8 +161,6 @@ public function getVarData()
         return null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Child classes should implement this to return the timeline data
      * formatted for correct usage.
@@ -199,8 +181,6 @@ protected function formatTimelineData(): array
         return [];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the data of this collector to be formatted in the toolbar
      *
@@ -211,8 +191,6 @@ public function display()
         return [];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Clean Path
      *
diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 70c4632f31f2..5b45c182ceca 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -61,8 +61,6 @@ class Database extends BaseCollector
      */
     protected static $queries = [];
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor
      */
@@ -71,8 +69,6 @@ public function __construct()
         $this->connections = \Config\Database::getConnections();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The static method used during Events to collect
      * data.
@@ -93,8 +89,6 @@ public static function collect(Query $query)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns timeline data formatted for the toolbar.
      *
@@ -126,8 +120,6 @@ protected function formatTimelineData(): array
         return $data;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the data of this collector to be formatted in the toolbar
      *
@@ -145,8 +137,6 @@ public function display(): array
         return $data;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Gets the "badge" value for the button.
      *
@@ -157,8 +147,6 @@ public function getBadgeValue(): int
         return count(static::$queries);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Information to be displayed next to the title.
      *
@@ -170,8 +158,6 @@ public function getTitleDetails(): string
                 ($countConnection > 1 ? 's' : '') . ')';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Does this collector have any data collected?
      *
@@ -182,8 +168,6 @@ public function isEmpty(): bool
         return empty(static::$queries);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Display the icon.
      *
diff --git a/system/Debug/Toolbar/Collectors/Events.php b/system/Debug/Toolbar/Collectors/Events.php
index 60c94e88482e..4515f26bf110 100644
--- a/system/Debug/Toolbar/Collectors/Events.php
+++ b/system/Debug/Toolbar/Collectors/Events.php
@@ -58,8 +58,6 @@ class Events extends BaseCollector
      */
     protected $viewer;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      */
@@ -68,8 +66,6 @@ public function __construct()
         $this->viewer = Services::renderer();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Child classes should implement this to return the timeline data
      * formatted for correct usage.
@@ -94,8 +90,6 @@ protected function formatTimelineData(): array
         return $data;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the data of this collector to be formatted in the toolbar
      *
@@ -131,8 +125,6 @@ public function display(): array
         return $data;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Gets the "badge" value for the button.
      *
@@ -143,8 +135,6 @@ public function getBadgeValue(): int
         return count(\CodeIgniter\Events\Events::getPerformanceLogs());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Display the icon.
      *
diff --git a/system/Debug/Toolbar/Collectors/Files.php b/system/Debug/Toolbar/Collectors/Files.php
index ca602949281d..26256660befa 100644
--- a/system/Debug/Toolbar/Collectors/Files.php
+++ b/system/Debug/Toolbar/Collectors/Files.php
@@ -40,8 +40,6 @@ class Files extends BaseCollector
      */
     protected $title = 'Files';
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns any information that should be shown next to the title.
      *
@@ -52,8 +50,6 @@ public function getTitleDetails(): string
         return '( ' . (int) count(get_included_files()) . ' )';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the data of this collector to be formatted in the toolbar
      *
@@ -90,8 +86,6 @@ public function display(): array
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Displays the number of included files as a badge in the tab button.
      *
@@ -102,8 +96,6 @@ public function getBadgeValue(): int
         return count(get_included_files());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Display the icon.
      *
diff --git a/system/Debug/Toolbar/Collectors/History.php b/system/Debug/Toolbar/Collectors/History.php
index 63a6d7b80a79..6beea6386fb3 100644
--- a/system/Debug/Toolbar/Collectors/History.php
+++ b/system/Debug/Toolbar/Collectors/History.php
@@ -53,8 +53,6 @@ class History extends BaseCollector
      */
     protected $files = [];
 
-    //--------------------------------------------------------------------
-
     /**
      * Specify time limit & file count for debug history.
      *
@@ -103,8 +101,6 @@ public function setFiles(int $current, int $limit = 20)
         $this->files = $files;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the data of this collector to be formatted in the toolbar
      *
@@ -115,8 +111,6 @@ public function display(): array
         return ['files' => $this->files];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Displays the number of included files as a badge in the tab button.
      *
@@ -137,8 +131,6 @@ public function isEmpty(): bool
         return empty($this->files);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Display the icon.
      *
diff --git a/system/Debug/Toolbar/Collectors/Logs.php b/system/Debug/Toolbar/Collectors/Logs.php
index a7fb5ff3b699..80eee730762b 100644
--- a/system/Debug/Toolbar/Collectors/Logs.php
+++ b/system/Debug/Toolbar/Collectors/Logs.php
@@ -49,8 +49,6 @@ class Logs extends BaseCollector
      */
     protected $data;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the data of this collector to be formatted in the toolbar
      *
@@ -63,8 +61,6 @@ public function display(): array
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Does this collector actually have any data to display?
      *
@@ -77,8 +73,6 @@ public function isEmpty(): bool
         return empty($this->data);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Display the icon.
      *
@@ -91,8 +85,6 @@ public function icon(): string
         return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACYSURBVEhLYxgFJIHU1FSjtLS0i0D8AYj7gEKMEBkqAaAFF4D4ERCvAFrwH4gDoFIMKSkpFkB+OTEYqgUTACXfA/GqjIwMQyD9H2hRHlQKJFcBEiMGQ7VgAqCBvUgK32dmZspCpagGGNPT0/1BLqeF4bQHQJePpiIwhmrBBEADR1MRfgB0+WgqAmOoFkwANHA0FY0CUgEDAwCQ0PUpNB3kqwAAAABJRU5ErkJggg==';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Ensures the data has been collected.
      */
@@ -104,6 +96,4 @@ protected function collectLogs()
 
         return $this->data = Services::logger(true)->logCache ?? [];
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Debug/Toolbar/Collectors/Routes.php b/system/Debug/Toolbar/Collectors/Routes.php
index 6e99b99db806..4f50ef7201bd 100644
--- a/system/Debug/Toolbar/Collectors/Routes.php
+++ b/system/Debug/Toolbar/Collectors/Routes.php
@@ -45,8 +45,6 @@ class Routes extends BaseCollector
      */
     protected $title = 'Routes';
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the data of this collector to be formatted in the toolbar
      *
@@ -135,8 +133,6 @@ public function display(): array
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a count of all the routes in the system.
      *
@@ -149,8 +145,6 @@ public function getBadgeValue(): int
         return count($rawRoutes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Display the icon.
      *
diff --git a/system/Debug/Toolbar/Collectors/Timers.php b/system/Debug/Toolbar/Collectors/Timers.php
index 4d312fc39bdc..940ff67a5c56 100644
--- a/system/Debug/Toolbar/Collectors/Timers.php
+++ b/system/Debug/Toolbar/Collectors/Timers.php
@@ -42,8 +42,6 @@ class Timers extends BaseCollector
      */
     protected $title = 'Timers';
 
-    //--------------------------------------------------------------------
-
     /**
      * Child classes should implement this to return the timeline data
      * formatted for correct usage.
diff --git a/system/Debug/Toolbar/Collectors/Views.php b/system/Debug/Toolbar/Collectors/Views.php
index 3a6f3c4c6266..0cf25ccdd24e 100644
--- a/system/Debug/Toolbar/Collectors/Views.php
+++ b/system/Debug/Toolbar/Collectors/Views.php
@@ -73,8 +73,6 @@ class Views extends BaseCollector
      */
     protected $views = [];
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      */
@@ -83,8 +81,6 @@ public function __construct()
         $this->viewer = Services::renderer();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Child classes should implement this to return the timeline data
      * formatted for correct usage.
@@ -109,8 +105,6 @@ protected function formatTimelineData(): array
         return $data;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Gets a collection of data that should be shown in the 'Vars' tab.
      * The format is an array of sections, each with their own array
@@ -137,8 +131,6 @@ public function getVarData(): array
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a count of all views.
      *
diff --git a/system/Debug/Toolbar/Views/toolbar.js b/system/Debug/Toolbar/Views/toolbar.js
index ca38f9b47bb5..563cf21cd682 100644
--- a/system/Debug/Toolbar/Views/toolbar.js
+++ b/system/Debug/Toolbar/Views/toolbar.js
@@ -8,8 +8,6 @@ var ciDebugBar = {
 	toolbar : null,
 	icon : null,
 
-	//--------------------------------------------------------------------
-
 	init : function () {
 		this.toolbarContainer = document.getElementById('toolbarContainer');
 		this.toolbar          = document.getElementById('debug-bar');
@@ -53,8 +51,6 @@ var ciDebugBar = {
 		}
 	},
 
-	//--------------------------------------------------------------------
-
 	createListeners : function () {
 		var buttons = [].slice.call(document.querySelectorAll('#debug-bar .ci-label a'));
 
@@ -64,8 +60,6 @@ var ciDebugBar = {
 		}
 	},
 
-	//--------------------------------------------------------------------
-
 	showTab: function () {
 		// Get the target tab, if any
 		var tab = document.getElementById(this.getAttribute('data-tab'));
@@ -108,8 +102,6 @@ var ciDebugBar = {
 		}
 	},
 
-	//--------------------------------------------------------------------
-
 	addClass : function (el, className) {
 		if (el.classList)
 		{
@@ -121,8 +113,6 @@ var ciDebugBar = {
 		}
 	},
 
-	//--------------------------------------------------------------------
-
 	removeClass : function (el, className) {
 		if (el.classList)
 		{
@@ -134,8 +124,6 @@ var ciDebugBar = {
 		}
 	},
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Toggle display of a data table
 	 *
@@ -153,8 +141,6 @@ var ciDebugBar = {
 		}
 	},
 
-	//--------------------------------------------------------------------
-
 	/**
 	 *   Toggle tool bar from full to icon and icon to full
 	 */
@@ -169,8 +155,6 @@ var ciDebugBar = {
 		ciDebugBar.createCookie('debug-bar-state', open == true ? 'minimized' : 'open' , 365);
 	},
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Sets the initial state of the toolbar (open or minimized) when
 	 * the page is first loaded to allow it to remember the state between refreshes.
@@ -182,8 +166,6 @@ var ciDebugBar = {
 		ciDebugBar.toolbar.style.display = open == 'open' ? 'inline-block' : 'none';
 	},
 
-	//--------------------------------------------------------------------
-
 	toggleViewsHints: function () {
 		// Avoid toggle hints on history requests that are not the initial
 		if (localStorage.getItem('debugbar-time') != localStorage.getItem('debugbar-time-new'))
@@ -475,8 +457,6 @@ var ciDebugBar = {
 		}
 	},
 
-	//--------------------------------------------------------------------
-
 	setToolbarPosition: function () {
 		var btnPosition = document.getElementById('toolbar-position');
 
@@ -506,8 +486,6 @@ var ciDebugBar = {
 		}, true);
 	},
 
-	//--------------------------------------------------------------------
-
 	setToolbarTheme: function () {
 		var btnTheme    = document.getElementById('toolbar-theme');
 		var isDarkMode  = window.matchMedia("(prefers-color-scheme: dark)").matches;
@@ -556,8 +534,6 @@ var ciDebugBar = {
 		}, true);
 	},
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Helper to create a cookie.
 	 *
@@ -582,8 +558,6 @@ var ciDebugBar = {
 		document.cookie = name + "=" + value + expires + "; path=/; samesite=Lax";
 	},
 
-	//--------------------------------------------------------------------
-
 	readCookie : function (name) {
 		var nameEQ = name + "=";
 		var ca     = document.cookie.split(';');
@@ -603,8 +577,6 @@ var ciDebugBar = {
 		return null;
 	},
 
-	//--------------------------------------------------------------------
-
 	trimSlash: function (text) {
 		return text.replace(/^\/|\/$/g, '');
 	},
@@ -668,5 +640,4 @@ var ciDebugBar = {
 			})
 		}
 	}
-
 };
diff --git a/system/Files/File.php b/system/Files/File.php
index cc86e5cc3bba..9bf5dd989380 100644
--- a/system/Files/File.php
+++ b/system/Files/File.php
@@ -35,8 +35,6 @@ class File extends SplFileInfo
      */
     protected $originalMimeType;
 
-    //--------------------------------------------------------------------
-
     /**
      * Run our SplFileInfo constructor with an optional verification
      * that the path is really a file.
@@ -53,8 +51,6 @@ public function __construct(string $path, bool $checkFile = false)
         parent::__construct($path);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieve the file size.
      *
@@ -90,8 +86,6 @@ public function getSizeByUnit(string $unit = 'b')
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Attempts to determine the file extension based on the trusted
      * getType() method. If the mime type is unknown, will return null.
@@ -103,8 +97,6 @@ public function guessExtension(): ?string
         return Mimes::guessExtensionFromType($this->getMimeType());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieve the media type of the file. SHOULD not use information from
      * the $_FILES array, but should use other methods to more accurately
@@ -127,8 +119,6 @@ public function getMimeType(): string
         return $mimeType;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates a random names based on a simple hash and the time, with
      * the correct file extension attached.
@@ -143,8 +133,6 @@ public function getRandomName(): string
         return time() . '_' . bin2hex(random_bytes(10)) . $extension;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Moves a file to a new location.
      *
@@ -173,8 +161,6 @@ public function move(string $targetPath, ?string $name = null, bool $overwrite =
         return new self($destination);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the destination path for the move operation where overwriting is not expected.
      *
@@ -210,6 +196,4 @@ public function getDestination(string $destination, string $delimiter = '_', int
 
         return $destination;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Filters/CSRF.php b/system/Filters/CSRF.php
index e65abc403663..846bfd8acbf0 100644
--- a/system/Filters/CSRF.php
+++ b/system/Filters/CSRF.php
@@ -63,8 +63,6 @@ public function before(RequestInterface $request, $arguments = null)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * We don't have anything to do here.
      *
@@ -77,6 +75,4 @@ public function before(RequestInterface $request, $arguments = null)
     public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
     {
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Filters/DebugToolbar.php b/system/Filters/DebugToolbar.php
index 761986b65f51..8aca2ecc7a3f 100644
--- a/system/Filters/DebugToolbar.php
+++ b/system/Filters/DebugToolbar.php
@@ -34,8 +34,6 @@ public function before(RequestInterface $request, $arguments = null)
     {
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * If the debug flag is set (CI_DEBUG) then collect performance
      * and debug information and display it in a toolbar.
@@ -50,6 +48,4 @@ public function after(RequestInterface $request, ResponseInterface $response, $a
     {
         Services::toolbar()->prepare($request, $response);
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Filters/FilterInterface.php b/system/Filters/FilterInterface.php
index bcb188c4f5c8..a0daa08ec472 100644
--- a/system/Filters/FilterInterface.php
+++ b/system/Filters/FilterInterface.php
@@ -36,8 +36,6 @@ interface FilterInterface
      */
     public function before(RequestInterface $request, $arguments = null);
 
-    //--------------------------------------------------------------------
-
     /**
      * Allows After filters to inspect and modify the response
      * object as needed. This method does not allow any way
@@ -51,6 +49,4 @@ public function before(RequestInterface $request, $arguments = null);
      * @return mixed
      */
     public function after(RequestInterface $request, ResponseInterface $response, $arguments = null);
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Format/JSONFormatter.php b/system/Format/JSONFormatter.php
index 79a5541dba65..3b7bb784dc66 100644
--- a/system/Format/JSONFormatter.php
+++ b/system/Format/JSONFormatter.php
@@ -43,6 +43,4 @@ public function format($data)
 
         return $result;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
index 7ad7f9b09510..e25285f6ee6b 100644
--- a/system/HTTP/CLIRequest.php
+++ b/system/HTTP/CLIRequest.php
@@ -167,8 +167,6 @@ public function getOptionString(bool $useLongOpts = false): string
         return trim($out);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Parses the command line it was called from and collects all options
      * and valid segments.
@@ -206,8 +204,6 @@ protected function parseCommand()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines if this request was made from the command line (CLI).
      *
@@ -217,6 +213,4 @@ public function isCLI(): bool
     {
         return is_cli();
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 092c48bcfced..be2ef7a21f59 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -72,8 +72,6 @@ class CURLRequest extends Request
      */
     protected $delay = 0.0;
 
-    //--------------------------------------------------------------------
-
     /**
      * Takes an array of options to set the following possible class properties:
      *
@@ -103,8 +101,6 @@ public function __construct(App $config, URI $uri, ?ResponseInterface $response
         $this->parseOptions($options);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sends an HTTP request to the specified $url. If this is a relative
      * URL, it will be merged with $this->baseURI to form a complete URL.
@@ -128,8 +124,6 @@ public function request($method, string $url, array $options = []): ResponseInte
         return $this->response;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Convenience method for sending a GET request.
      *
@@ -143,8 +137,6 @@ public function get(string $url, array $options = []): ResponseInterface
         return $this->request('get', $url, $options);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Convenience method for sending a DELETE request.
      *
@@ -158,8 +150,6 @@ public function delete(string $url, array $options = []): ResponseInterface
         return $this->request('delete', $url, $options);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Convenience method for sending a HEAD request.
      *
@@ -173,8 +163,6 @@ public function head(string $url, array $options = []): ResponseInterface
         return $this->request('head', $url, $options);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Convenience method for sending an OPTIONS request.
      *
@@ -188,8 +176,6 @@ public function options(string $url, array $options = []): ResponseInterface
         return $this->request('options', $url, $options);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Convenience method for sending a PATCH request.
      *
@@ -203,8 +189,6 @@ public function patch(string $url, array $options = []): ResponseInterface
         return $this->request('patch', $url, $options);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Convenience method for sending a POST request.
      *
@@ -218,8 +202,6 @@ public function post(string $url, array $options = []): ResponseInterface
         return $this->request('post', $url, $options);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Convenience method for sending a PUT request.
      *
@@ -233,8 +215,6 @@ public function put(string $url, array $options = []): ResponseInterface
         return $this->request('put', $url, $options);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Set the HTTP Authentication.
      *
@@ -255,8 +235,6 @@ public function setAuth(string $username, string $password, string $type = 'basi
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Set form data to be sent.
      *
@@ -276,8 +254,6 @@ public function setForm(array $params, bool $multipart = false)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Set JSON data to be sent.
      *
@@ -292,8 +268,6 @@ public function setJSON($data)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the correct settings based on the options array
      * passed in.
@@ -327,8 +301,6 @@ protected function parseOptions(array $options)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * If the $url is a relative URL, will attempt to create
      * a full URL by prepending $this->baseURI to it.
@@ -350,8 +322,6 @@ protected function prepareURL(string $url): string
         return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get the request method. Overrides the Request class' method
      * since users expect a different answer here.
@@ -365,8 +335,6 @@ public function getMethod(bool $upper = false): string
         return ($upper) ? strtoupper($this->method) : strtolower($this->method);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Fires the actual cURL request.
      *
@@ -437,8 +405,6 @@ public function send(string $method, string $url)
         return $this->response;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Takes all headers current part of this request and adds them
      * to the cURL request.
@@ -473,8 +439,6 @@ protected function applyRequestHeaders(array $curlOptions = []): array
         return $curlOptions;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Apply method
      *
@@ -509,8 +473,6 @@ protected function applyMethod(string $method, array $curlOptions): array
         return $curlOptions;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Apply body
      *
@@ -527,8 +489,6 @@ protected function applyBody(array $curlOptions = []): array
         return $curlOptions;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Parses the header retrieved from the cURL response into
      * our Response object.
@@ -557,8 +517,6 @@ protected function setResponseHeaders(array $headers = [])
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Set CURL options
      *
@@ -718,8 +676,6 @@ protected function setCURLOptions(array $curlOptions = [], array $config = [])
         return $curlOptions;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Does the actual work of initializing cURL, setting the options,
      * and grabbing the output.
@@ -747,6 +703,4 @@ protected function sendRequest(array $curlOptions = []): string
 
         return $output;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index c5d14976a2a7..f1fffb0c1aad 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -398,8 +398,6 @@ public function addFrameSrc($uri, ?bool $explicitReporting = null)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Adds a new valid endpoint for valid image sources. Can be either
      * a URI class or a simple string.
@@ -576,10 +574,6 @@ public function upgradeInsecureRequests(bool $value = true)
         return $this;
     }
 
-    //-------------------------------------------------------------------------
-    // Utility
-    //-------------------------------------------------------------------------
-
     /**
      * DRY method to add an string or array to a class property.
      *
diff --git a/system/HTTP/DownloadResponse.php b/system/HTTP/DownloadResponse.php
index c0de33dea22c..b42db81dd94c 100644
--- a/system/HTTP/DownloadResponse.php
+++ b/system/HTTP/DownloadResponse.php
@@ -219,8 +219,6 @@ private function getContentDisposition(): string
         return $result;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Disallows status changing.
      *
@@ -234,8 +232,6 @@ public function setStatusCode(int $code, string $reason = '')
         throw DownloadException::forCannotSetStatusCode($code, $reason);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the Content Type header for this response with the mime type
      * and, optionally, the charset.
@@ -269,8 +265,6 @@ public function noCache(): self
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Disables cache configuration.
      *
@@ -283,10 +277,6 @@ public function setCache(array $options = [])
         throw DownloadException::forCannotSetCache();
     }
 
-    //--------------------------------------------------------------------
-    // Output Methods
-    //--------------------------------------------------------------------
-
     /**
      * {@inheritDoc}
      *
diff --git a/system/HTTP/Files/FileCollection.php b/system/HTTP/Files/FileCollection.php
index 05308fb1c668..ce21aca1bc60 100644
--- a/system/HTTP/Files/FileCollection.php
+++ b/system/HTTP/Files/FileCollection.php
@@ -31,8 +31,6 @@ class FileCollection
      */
     protected $files;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an array of all uploaded files that were found.
      * Each element in the array will be an instance of UploadedFile.
@@ -76,8 +74,6 @@ public function getFile(string $name)
         return null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Verify if a file exist in the collection of uploaded files and is have been uploaded with multiple option.
      *
@@ -109,8 +105,6 @@ public function getFileMultiple(string $name)
         return null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks whether an uploaded file with name $fileID exists in
      * this request.
@@ -142,8 +136,6 @@ public function hasFile(string $fileID): bool
         return isset($this->files[$fileID]);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Taking information from the $_FILES array, it creates an instance
      * of UploadedFile for each one, saving the results to this->files.
@@ -202,8 +194,6 @@ protected function createFileObject(array $array)
         );
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Reformats the odd $_FILES array into something much more like
      * we would expect, with each object having its own array.
@@ -252,8 +242,6 @@ protected function fixFilesArray(array $data): array
         return $output;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Navigate through a array looking for a particular index
      *
diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
index abd374b93d2a..58088444ea8f 100644
--- a/system/HTTP/Files/UploadedFile.php
+++ b/system/HTTP/Files/UploadedFile.php
@@ -70,8 +70,6 @@ class UploadedFile extends File implements UploadedFileInterface
      */
     protected $hasMoved = false;
 
-    //--------------------------------------------------------------------
-
     /**
      * Accepts the file information as would be filled in from the $_FILES array.
      *
@@ -93,8 +91,6 @@ public function __construct(string $path, string $originalName, ?string $mimeTyp
         parent::__construct($path, false);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Move the uploaded file to a new location.
      *
@@ -185,8 +181,6 @@ protected function setPath(string $path): string
         return $path;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns whether the file has been moved or not. If it has,
      * the move() method will not work and certain properties, like
@@ -199,8 +193,6 @@ public function hasMoved(): bool
         return $this->hasMoved;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieve the error associated with the uploaded file.
      *
@@ -221,8 +213,6 @@ public function getError(): int
         return $this->error ?? UPLOAD_ERR_OK;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get error string
      *
@@ -246,8 +236,6 @@ public function getErrorString(): string
         return sprintf($errors[$error] ?? lang('HTTP.uploadErrUnknown'), $this->getName());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the mime type as provided by the client.
      * This is NOT a trusted value.
@@ -260,8 +248,6 @@ public function getClientMimeType(): string
         return $this->originalMimeType;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieve the filename. This will typically be the filename sent
      * by the client, and should not be trusted. If the file has been
@@ -274,8 +260,6 @@ public function getName(): string
         return $this->name;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the name of the file as provided by the client during upload.
      *
@@ -286,8 +270,6 @@ public function getClientName(): string
         return $this->originalName;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Gets the temporary filename where the file was uploaded to.
      *
@@ -298,8 +280,6 @@ public function getTempName(): string
         return $this->path;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Overrides SPLFileInfo's to work with uploaded files, since
      * the temp file that's been uploaded doesn't have an extension.
@@ -329,8 +309,6 @@ public function guessExtension(): string
         return Mimes::guessExtensionFromType($this->getMimeType(), $this->getClientExtension()) ?? '';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the original file extension, based on the file name that
      * was uploaded. This is NOT a trusted source.
@@ -343,8 +321,6 @@ public function getClientExtension(): string
         return pathinfo($this->originalName, PATHINFO_EXTENSION) ?? '';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns whether the file was uploaded successfully, based on whether
      * it was uploaded via HTTP and has no errors.
@@ -377,6 +353,4 @@ public function store(?string $folderName = null, ?string $fileName = null): str
 
         return $folderName . $this->name;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/HTTP/Files/UploadedFileInterface.php b/system/HTTP/Files/UploadedFileInterface.php
index cf08d1d6e988..16a4de164049 100644
--- a/system/HTTP/Files/UploadedFileInterface.php
+++ b/system/HTTP/Files/UploadedFileInterface.php
@@ -34,8 +34,6 @@ interface UploadedFileInterface
      */
     public function __construct(string $path, string $originalName, ?string $mimeType = null, ?int $size = null, ?int $error = null);
 
-    //--------------------------------------------------------------------
-
     /**
      * Move the uploaded file to a new location.
      *
@@ -67,8 +65,6 @@ public function __construct(string $path, string $originalName, ?string $mimeTyp
      */
     public function move(string $targetPath, ?string $name = null);
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns whether the file has been moved or not. If it has,
      * the move() method will not work and certain properties, like
@@ -78,8 +74,6 @@ public function move(string $targetPath, ?string $name = null);
      */
     public function hasMoved(): bool;
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieve the error associated with the uploaded file.
      *
@@ -97,8 +91,6 @@ public function hasMoved(): bool;
      */
     public function getError(): int;
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieve the filename sent by the client.
      *
@@ -114,8 +106,6 @@ public function getError(): int;
      */
     public function getName(): string;
 
-    //--------------------------------------------------------------------
-
     /**
      * Gets the temporary filename where the file was uploaded to.
      *
@@ -123,8 +113,6 @@ public function getName(): string;
      */
     public function getTempName(): string;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the original file extension, based on the file name that
      * was uploaded. This is NOT a trusted source.
@@ -134,8 +122,6 @@ public function getTempName(): string;
      */
     public function getClientExtension(): string;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the mime type as provided by the client.
      * This is NOT a trusted value.
@@ -145,8 +131,6 @@ public function getClientExtension(): string;
      */
     public function getClientMimeType(): string;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns whether the file was uploaded successfully, based on whether
      * it was uploaded via HTTP and has no errors.
@@ -155,8 +139,6 @@ public function getClientMimeType(): string;
      */
     public function isValid(): bool;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the destination path for the move operation where overwriting is not expected.
      *
@@ -171,6 +153,4 @@ public function isValid(): bool;
      * @return string
      */
     public function getDestination(string $destination, string $delimiter = '_', int $i = 0): string;
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/HTTP/Header.php b/system/HTTP/Header.php
index f97911dad6bf..17365618dd0f 100644
--- a/system/HTTP/Header.php
+++ b/system/HTTP/Header.php
@@ -33,8 +33,6 @@ class Header
      */
     protected $value;
 
-    //--------------------------------------------------------------------
-
     /**
      * Header constructor. name is mandatory, if a value is provided, it will be set.
      *
@@ -47,8 +45,6 @@ public function __construct(string $name, $value = null)
         $this->setValue($value);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the name of the header, in the same case it was set.
      *
@@ -59,8 +55,6 @@ public function getName(): string
         return $this->name;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Gets the raw value of the header. This may return either a string
      * of an array, depending on whether the header has multiple values or not.
@@ -72,8 +66,6 @@ public function getValue()
         return $this->value;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the name of the header, overwriting any previous value.
      *
@@ -88,8 +80,6 @@ public function setName(string $name)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the value of the header, overwriting any previous value(s).
      *
@@ -104,8 +94,6 @@ public function setValue($value = null)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Appends a value to the list of values for this header. If the
      * header is a single value string, it will be converted to an array.
@@ -131,8 +119,6 @@ public function appendValue($value = null)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Prepends a value to the list of values for this header. If the
      * header is a single value string, it will be converted to an array.
@@ -156,8 +142,6 @@ public function prependValue($value = null)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieves a comma-separated string of the values for a single header.
      *
@@ -192,8 +176,6 @@ public function getValueLine(): string
         return implode(', ', $options);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a representation of the entire header string, including
      * the header name and all values converted to the proper format.
@@ -204,6 +186,4 @@ public function __toString(): string
     {
         return $this->name . ': ' . $this->getValueLine();
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 4af60c82d12e..125081db3803 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -135,8 +135,6 @@ class IncomingRequest extends Request
      */
     protected $userAgent;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor
      *
@@ -169,8 +167,6 @@ public function __construct($config, ?URI $uri = null, $body = 'php://input', ?U
         $this->detectLocale($config);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Handles setting up the locale, perhaps auto-detecting through
      * content negotiation.
@@ -237,8 +233,6 @@ public function detectPath(string $protocol = ''): string
         return $this->path;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Will parse the REQUEST_URI and automatically detect the URI from it,
      * fixing the query string if necessary.
@@ -326,8 +320,6 @@ protected function parseQueryString(): string
         return ($uri === '/' || $uri === '') ? '/' : ltrim($uri, '/');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Provides a convenient way to work with the Negotiate class
      * for content negotiation.
@@ -361,8 +353,6 @@ public function negotiate(string $type, array $supported, bool $strictMatch = fa
         throw HTTPException::forInvalidNegotiationType($type);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines if this request was made from the command line (CLI).
      *
@@ -402,8 +392,6 @@ public function isSecure(): bool
         return $this->hasHeader('Front-End-Https') && ! empty($this->header('Front-End-Https')->getValue()) && strtolower($this->header('Front-End-Https')->getValue()) !== 'off';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the relative path and updates the URI object.
      * Note: Since current_url() accesses the shared request
@@ -464,8 +452,6 @@ public function getPath(): string
         return $this->path;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the locale string for this request.
      *
@@ -508,8 +494,6 @@ public function getDefaultLocale(): string
         return $this->defaultLocale;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Fetch an item from JSON input stream with fallback to $_REQUEST object. This is the simplest way
      * to grab data from the request object and can be used in lieu of the
@@ -544,8 +528,6 @@ public function getVar($index = null, $filter = null, $flags = null)
         return $this->fetchGlobal('request', $index, $filter, $flags);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * A convenience method that grabs the raw input stream and decodes
      * the JSON into an array.
@@ -596,8 +578,6 @@ public function getJsonVar(string $index, bool $assoc = false, ?int $filter = nu
         return $data;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * A convenience method that grabs the raw input stream(send method in PUT, PATCH, DELETE) and decodes
      * the String into an array.
@@ -611,8 +591,6 @@ public function getRawInput()
         return $output;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Fetch an item from GET data.
      *
@@ -627,8 +605,6 @@ public function getGet($index = null, $filter = null, $flags = null)
         return $this->fetchGlobal('get', $index, $filter, $flags);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Fetch an item from POST.
      *
@@ -643,8 +619,6 @@ public function getPost($index = null, $filter = null, $flags = null)
         return $this->fetchGlobal('post', $index, $filter, $flags);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Fetch an item from POST data with fallback to GET.
      *
@@ -662,8 +636,6 @@ public function getPostGet($index = null, $filter = null, $flags = null)
         return isset($_POST[$index]) ? $this->getPost($index, $filter, $flags) : (isset($_GET[$index]) ? $this->getGet($index, $filter, $flags) : $this->getPost($index, $filter, $flags));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Fetch an item from GET data with fallback to POST.
      *
@@ -681,8 +653,6 @@ public function getGetPost($index = null, $filter = null, $flags = null)
         return isset($_GET[$index]) ? $this->getGet($index, $filter, $flags) : (isset($_POST[$index]) ? $this->getPost($index, $filter, $flags) : $this->getGet($index, $filter, $flags));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Fetch an item from the COOKIE array.
      *
@@ -697,8 +667,6 @@ public function getCookie($index = null, $filter = null, $flags = null)
         return $this->fetchGlobal('cookie', $index, $filter, $flags);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Fetch the user agent string
      *
@@ -709,8 +677,6 @@ public function getUserAgent()
         return $this->userAgent;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Attempts to get old Input data that has been flashed to the session
      * with redirect_with_input(). It first checks for the data in the old
@@ -760,8 +726,6 @@ public function getOldInput(string $key)
         return null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an array of all files that have been uploaded with this
      * request. Each file is represented by an UploadedFile instance.
@@ -811,8 +775,6 @@ public function getFile(string $fileID)
         return $this->files->getFile($fileID);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Remove relative directory (../) and multi slashes (///)
      *
diff --git a/system/HTTP/Message.php b/system/HTTP/Message.php
index 0504cd9293be..a39d5c551809 100644
--- a/system/HTTP/Message.php
+++ b/system/HTTP/Message.php
@@ -43,8 +43,6 @@ class Message implements MessageInterface
      */
     protected $body;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the Message's body.
      *
diff --git a/system/HTTP/MessageTrait.php b/system/HTTP/MessageTrait.php
index 09f2fe1aad39..6cb145d8d6b4 100644
--- a/system/HTTP/MessageTrait.php
+++ b/system/HTTP/MessageTrait.php
@@ -225,8 +225,6 @@ protected function getHeaderName(string $name): string
         return $this->headerMap[strtolower($name)] ?? $name;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the HTTP protocol version.
      *
diff --git a/system/HTTP/Negotiate.php b/system/HTTP/Negotiate.php
index 6e71f745770b..cd15c04c8519 100644
--- a/system/HTTP/Negotiate.php
+++ b/system/HTTP/Negotiate.php
@@ -31,8 +31,6 @@ class Negotiate
      */
     protected $request;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor
      *
@@ -45,8 +43,6 @@ public function __construct(?RequestInterface $request = null)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Stores the request instance to grab the headers from.
      *
@@ -61,8 +57,6 @@ public function setRequest(RequestInterface $request)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines the best content-type to use based on the $supported
      * types the application says it supports, and the types requested
@@ -82,8 +76,6 @@ public function media(array $supported, bool $strictMatch = false): string
         return $this->getBestMatch($supported, $this->request->getHeaderLine('accept'), true, $strictMatch);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines the best charset to use based on the $supported
      * types the application says it supports, and the types requested
@@ -109,8 +101,6 @@ public function charset(array $supported): string
         return $match;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines the best encoding type to use based on the $supported
      * types the application says it supports, and the types requested
@@ -130,8 +120,6 @@ public function encoding(array $supported = []): string
         return $this->getBestMatch($supported, $this->request->getHeaderLine('accept-encoding'));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines the best language to use based on the $supported
      * types the application says it supports, and the types requested
@@ -149,7 +137,6 @@ public function language(array $supported): string
         return $this->getBestMatch($supported, $this->request->getHeaderLine('accept-language'), false, false, true);
     }
 
-    //--------------------------------------------------------------------
     //--------------------------------------------------------------------
     // Utility Methods
     //--------------------------------------------------------------------
@@ -204,8 +191,6 @@ protected function getBestMatch(array $supported, ?string $header = null, bool $
         return $strictMatch ? '' : $supported[0];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Parses an Accept* header into it's multiple values.
      *
@@ -289,8 +274,6 @@ public function parseHeader(string $header): array
         return $results;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Match-maker
      *
@@ -327,8 +310,6 @@ protected function match(array $acceptable, string $supported, bool $enforceType
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks two Accept values with matching 'values' to see if their
      * 'params' are the same.
@@ -355,8 +336,6 @@ protected function matchParameters(array $acceptable, array $supported): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Compares the types/subtypes of an acceptable Media type and
      * the supported string.
@@ -387,8 +366,6 @@ public function matchTypes(array $acceptable, array $supported): bool
         return $aSubType === $sSubType;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Will match locales against their broader pairs, so that fr-FR would
      * match a supported localed of fr
diff --git a/system/HTTP/RequestInterface.php b/system/HTTP/RequestInterface.php
index 18076e969f7f..7b49519fe028 100644
--- a/system/HTTP/RequestInterface.php
+++ b/system/HTTP/RequestInterface.php
@@ -28,8 +28,6 @@ interface RequestInterface
      */
     public function getIPAddress(): string;
 
-    //--------------------------------------------------------------------
-
     /**
      * Validate an IP address
      *
@@ -42,8 +40,6 @@ public function getIPAddress(): string;
      */
     public function isValidIP(string $ip, ?string $which = null): bool;
 
-    //--------------------------------------------------------------------
-
     /**
      * Get the request method.
      * An extension of PSR-7's getMethod to allow casing.
@@ -56,8 +52,6 @@ public function isValidIP(string $ip, ?string $which = null): bool;
      */
     public function getMethod(bool $upper = false): string;
 
-    //--------------------------------------------------------------------
-
     /**
      * Fetch an item from the $_SERVER array.
      * Supplied by RequestTrait.
@@ -68,6 +62,4 @@ public function getMethod(bool $upper = false): string;
      * @return mixed
      */
     public function getServer($index = null, $filter = null);
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php
index e3fdcb67b16a..4bb7d109a614 100644
--- a/system/HTTP/RequestTrait.php
+++ b/system/HTTP/RequestTrait.php
@@ -155,8 +155,6 @@ public function getIPAddress(): string
         return empty($this->ipAddress) ? '' : $this->ipAddress;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Fetch an item from the $_SERVER array.
      *
@@ -171,8 +169,6 @@ public function getServer($index = null, $filter = null, $flags = null)
         return $this->fetchGlobal('server', $index, $filter, $flags);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Fetch an item from the $_ENV array.
      *
@@ -187,8 +183,6 @@ public function getEnv($index = null, $filter = null, $flags = null)
         return $this->fetchGlobal('env', $index, $filter, $flags);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Allows manually setting the value of PHP global, like $_GET, $_POST, etc.
      *
@@ -204,8 +198,6 @@ public function setGlobal(string $method, $value)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Fetches one or more items from a global, like cookies, get, post, etc.
      * Can optionally filter the input when you retrieve it by passing in
@@ -308,8 +300,6 @@ public function fetchGlobal(string $method, $index = null, ?int $filter = null,
         return filter_var($value, $filter, $flags);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Saves a copy of the current state of one of several PHP globals
      * so we can retrieve them later.
diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php
index 98e1e9d04699..f0bcb7048d90 100644
--- a/system/HTTP/Response.php
+++ b/system/HTTP/Response.php
@@ -156,9 +156,8 @@ public function __construct($config)
 
         $this->CSPEnabled = $config->CSPEnabled;
 
-        //---------------------------------------------------------------------
         // DEPRECATED COOKIE MANAGEMENT
-        //---------------------------------------------------------------------
+
         $this->cookiePrefix   = $config->cookiePrefix;
         $this->cookieDomain   = $config->cookieDomain;
         $this->cookiePath     = $config->cookiePath;
diff --git a/system/HTTP/ResponseInterface.php b/system/HTTP/ResponseInterface.php
index 8b6fa185e4c8..c2c02296bba6 100644
--- a/system/HTTP/ResponseInterface.php
+++ b/system/HTTP/ResponseInterface.php
@@ -116,8 +116,6 @@ interface ResponseInterface
      */
     public function getStatusCode(): int;
 
-    //--------------------------------------------------------------------
-
     /**
      * Return an instance with the specified status code and, optionally, reason phrase.
      *
@@ -138,8 +136,6 @@ public function getStatusCode(): int;
      */
     public function setStatusCode(int $code, string $reason = '');
 
-    //--------------------------------------------------------------------
-
     /**
      * Gets the response response phrase associated with the status code.
      *
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index db72fd75568a..da395c3c6ceb 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -135,8 +135,6 @@ class URI
      */
     protected $rawQueryString = false;
 
-    //--------------------------------------------------------------------
-
     /**
      * Builds a representation of the string from the component parts.
      *
@@ -230,8 +228,6 @@ public static function removeDotSegments(string $path): string
         return $output;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      *
@@ -246,8 +242,6 @@ public function __construct(?string $uri = null)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * If $silent == true, then will not throw exceptions and will
      * attempt to continue gracefully.
@@ -263,8 +257,6 @@ public function setSilent(bool $silent = true)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * If $raw == true, then will use parseStr() method
      * instead of native parse_str() function.
@@ -280,8 +272,6 @@ public function useRawQueryString(bool $raw = true)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets and overwrites any current URI information.
      *
@@ -308,8 +298,6 @@ public function setURI(?string $uri = null)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieve the scheme component of the URI.
      *
@@ -330,8 +318,6 @@ public function getScheme(): string
         return $this->scheme;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieve the authority component of the URI.
      *
@@ -376,8 +362,6 @@ public function getAuthority(bool $ignorePort = false): string
         return $authority;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieve the user information component of the URI.
      *
@@ -409,8 +393,6 @@ public function getUserInfo()
         return $userInfo;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Temporarily sets the URI to show a password in userInfo. Will
      * reset itself after the first call to authority().
@@ -426,8 +408,6 @@ public function showPassword(bool $val = true)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieve the host component of the URI.
      *
@@ -445,8 +425,6 @@ public function getHost(): string
         return $this->host ?? '';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieve the port component of the URI.
      *
@@ -467,8 +445,6 @@ public function getPort()
         return $this->port;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieve the path component of the URI.
      *
@@ -500,8 +476,6 @@ public function getPath(): string
         return $this->path ?? '';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieve the query string
      *
@@ -540,8 +514,6 @@ public function getQuery(array $options = []): string
         return empty($vars) ? '' : http_build_query($vars);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieve a URI fragment
      *
@@ -552,8 +524,6 @@ public function getFragment(): string
         return $this->fragment ?? '';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the segments of the path as an array.
      *
@@ -564,8 +534,6 @@ public function getSegments(): array
         return $this->segments;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the value of a specific segment of the URI path.
      *
@@ -617,8 +585,6 @@ public function setSegment(int $number, $value)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the total number of segments.
      *
@@ -629,8 +595,6 @@ public function getTotalSegments(): int
         return count($this->segments);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Formats the URI as a string.
      *
@@ -675,8 +639,6 @@ public function __toString(): string
         );
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Parses the given string and saves the appropriate authority pieces.
      *
@@ -702,8 +664,6 @@ public function setAuthority(string $str)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the scheme for this URI.
      *
@@ -726,8 +686,6 @@ public function setScheme(string $str)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the userInfo/Authority portion of the URI.
      *
@@ -744,8 +702,6 @@ public function setUserInfo(string $user, string $pass)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the host name to use.
      *
@@ -760,8 +716,6 @@ public function setHost(string $str)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the port portion of the URI.
      *
@@ -788,8 +742,6 @@ public function setPort(?int $port = null)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the path portion of the URI.
      *
@@ -824,8 +776,6 @@ public function refreshPath()
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the query portion of the URI, while attempting
      * to clean the various parts of the query keys and values.
@@ -858,8 +808,6 @@ public function setQuery(string $query)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * A convenience method to pass an array of items in as the Query
      * portion of the URI.
@@ -875,8 +823,6 @@ public function setQueryArray(array $query)
         return $this->setQuery($query);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Adds a single new element to the query vars.
      *
@@ -892,8 +838,6 @@ public function addQuery(string $key, $value = null)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Removes one or more query vars from the URI.
      *
@@ -910,8 +854,6 @@ public function stripQuery(...$params)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Filters the query variables so that only the keys passed in
      * are kept. The rest are removed from the object.
@@ -937,8 +879,6 @@ public function keepQuery(...$params)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the fragment portion of the URI.
      *
@@ -955,8 +895,6 @@ public function setFragment(string $string)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Encodes any dangerous characters, and removes dot segments.
      * While dot segments have valid uses according to the spec,
@@ -997,8 +935,6 @@ static function (array $matches) {
         return $path;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Saves our parts from a parse_url call.
      *
@@ -1048,8 +984,6 @@ protected function applyParts(array $parts)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Combines one URI string with this one based on the rules set out in
      * RFC 3986 Section 2
@@ -1110,8 +1044,6 @@ public function resolveRelativeURI(string $uri)
         return $transformed;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Given 2 paths, will merge them according to rules set out in RFC 2986,
      * Section 5.2
@@ -1141,8 +1073,6 @@ protected function mergePaths(self $base, self $reference): string
         return implode('/', $path);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * This is equivalent to the native PHP parse_str() function.
      * This version allows the dot to be used as a key of the query string.
@@ -1173,6 +1103,4 @@ protected function parseStr(string $query): array
 
         return $return;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/HTTP/UserAgent.php b/system/HTTP/UserAgent.php
index 17bc52cd3656..85baf2539455 100644
--- a/system/HTTP/UserAgent.php
+++ b/system/HTTP/UserAgent.php
@@ -95,8 +95,6 @@ class UserAgent
      */
     protected $referrer;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor
      *
@@ -114,8 +112,6 @@ public function __construct(?UserAgents $config = null)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Is Browser
      *
@@ -138,8 +134,6 @@ public function isBrowser(?string $key = null): bool
         return isset($this->config->browsers[$key]) && $this->browser === $this->config->browsers[$key];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Is Robot
      *
@@ -162,8 +156,6 @@ public function isRobot(?string $key = null): bool
         return isset($this->config->robots[$key]) && $this->robot === $this->config->robots[$key];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Is Mobile
      *
@@ -186,8 +178,6 @@ public function isMobile(?string $key = null): bool
         return isset($this->config->mobiles[$key]) && $this->mobile === $this->config->mobiles[$key];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Is this a referral from another site?
      *
@@ -209,8 +199,6 @@ public function isReferral(): bool
         return $this->referrer;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Agent String
      *
@@ -221,8 +209,6 @@ public function getAgentString(): string
         return $this->agent;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get Platform
      *
@@ -233,8 +219,6 @@ public function getPlatform(): string
         return $this->platform;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get Browser Name
      *
@@ -245,8 +229,6 @@ public function getBrowser(): string
         return $this->browser;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get the Browser Version
      *
@@ -257,8 +239,6 @@ public function getVersion(): string
         return $this->version;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get The Robot Name
      *
@@ -269,8 +249,6 @@ public function getRobot(): string
         return $this->robot;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get the Mobile Device
      *
@@ -281,8 +259,6 @@ public function getMobile(): string
         return $this->mobile;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get the referrer
      *
@@ -293,8 +269,6 @@ public function getReferrer(): string
         return empty($_SERVER['HTTP_REFERER']) ? '' : trim($_SERVER['HTTP_REFERER']);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Parse a custom user-agent string
      *
@@ -321,8 +295,6 @@ public function parse(string $string)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Compile the User Agent Data
      *
@@ -339,8 +311,6 @@ protected function compileData()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Set the Platform
      *
@@ -363,8 +333,6 @@ protected function setPlatform(): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Set the Browser
      *
@@ -388,8 +356,6 @@ protected function setBrowser(): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Set the Robot
      *
@@ -412,8 +378,6 @@ protected function setRobot(): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Set the Mobile Device
      *
@@ -435,8 +399,6 @@ protected function setMobile(): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Outputs the original Agent String when cast as a string.
      *
diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php
index b15800d4305f..18000cc756e9 100644
--- a/system/Helpers/filesystem_helper.php
+++ b/system/Helpers/filesystem_helper.php
@@ -10,7 +10,6 @@
  */
 
 // CodeIgniter File System Helpers
-// ------------------------------------------------------------------------
 
 if (! function_exists('directory_map')) {
     /**
@@ -62,8 +61,6 @@ function directory_map(string $sourceDir, int $directoryDepth = 0, bool $hidden
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('directory_mirror')) {
     /**
      * Recursively copies the files and directories of the origin directory
@@ -108,8 +105,6 @@ function directory_mirror(string $originDir, string $targetDir, bool $overwrite
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('write_file')) {
     /**
      * Write File
@@ -146,8 +141,6 @@ function write_file(string $path, string $data, string $mode = 'wb'): bool
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('delete_files')) {
     /**
      * Delete Files
@@ -199,8 +192,6 @@ function delete_files(string $path, bool $delDir = false, bool $htdocs = false,
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('get_filenames')) {
     /**
      * Get Filenames
@@ -249,8 +240,6 @@ function get_filenames(string $sourceDir, ?bool $includePath = false, bool $hidd
     }
 }
 
-// --------------------------------------------------------------------
-
 if (! function_exists('get_dir_file_info')) {
     /**
      * Get Directory File Information
@@ -299,8 +288,6 @@ function get_dir_file_info(string $sourceDir, bool $topLevelOnly = true, bool $r
     }
 }
 
-// --------------------------------------------------------------------
-
 if (! function_exists('get_file_info')) {
     /**
      * Get File Info
@@ -367,8 +354,6 @@ function get_file_info(string $file, $returnedValues = ['name', 'server_path', '
     }
 }
 
-// --------------------------------------------------------------------
-
 if (! function_exists('symbolic_permissions')) {
     /**
      * Symbolic Permissions
@@ -419,8 +404,6 @@ function symbolic_permissions(int $perms): string
     }
 }
 
-// --------------------------------------------------------------------
-
 if (! function_exists('octal_permissions')) {
     /**
      * Octal Permissions
@@ -438,8 +421,6 @@ function octal_permissions(int $perms): string
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('same_file')) {
     /**
      * Checks if two files both exist and have identical hashes
@@ -455,8 +436,6 @@ function same_file(string $file1, string $file2): bool
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('set_realpath')) {
     /**
      * Set Realpath
diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
index 750210ebf840..1f46a4e066b9 100644
--- a/system/Helpers/form_helper.php
+++ b/system/Helpers/form_helper.php
@@ -10,12 +10,9 @@
  */
 
 use Config\App;
-
-// CodeIgniter Form Helpers
-
 use Config\Services;
 
-//--------------------------------------------------------------------
+// CodeIgniter Form Helpers
 
 if (! function_exists('form_open')) {
     /**
@@ -78,8 +75,6 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('form_open_multipart')) {
     /**
      * Form Declaration - Multipart type
@@ -104,8 +99,6 @@ function form_open_multipart(string $action = '', $attributes = [], array $hidde
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('form_hidden')) {
     /**
      * Hidden Input Field
@@ -148,8 +141,6 @@ function form_hidden($name, $value = '', bool $recursing = false): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('form_input')) {
     /**
      * Text Input Field. If 'type' is passed in the $type field, it will be
@@ -174,8 +165,6 @@ function form_input($data = '', string $value = '', $extra = '', string $type =
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('form_password')) {
     /**
      * Password Field
@@ -199,8 +188,6 @@ function form_password($data = '', string $value = '', $extra = ''): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('form_upload')) {
     /**
      * Upload Field
@@ -230,8 +217,6 @@ function form_upload($data = '', string $value = '', $extra = ''): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('form_textarea')) {
     /**
      * Textarea field
@@ -271,8 +256,6 @@ function form_textarea($data = '', string $value = '', $extra = ''): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('form_multiselect')) {
     /**
      * Multi-select menu
@@ -296,8 +279,6 @@ function form_multiselect($name = '', array $options = [], array $selected = [],
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('form_dropdown')) {
     /**
      * Drop-down Menu
@@ -379,8 +360,6 @@ function form_dropdown($data = '', $options = [], $selected = [], $extra = ''):
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('form_checkbox')) {
     /**
      * Checkbox Field
@@ -419,8 +398,6 @@ function form_checkbox($data = '', string $value = '', bool $checked = false, $e
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('form_radio')) {
     /**
      * Radio Button
@@ -443,8 +420,6 @@ function form_radio($data = '', string $value = '', bool $checked = false, $extr
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('form_submit')) {
     /**
      * Submit Button
@@ -461,8 +436,6 @@ function form_submit($data = '', string $value = '', $extra = ''): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('form_reset')) {
     /**
      * Reset Button
@@ -479,8 +452,6 @@ function form_reset($data = '', string $value = '', $extra = ''): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('form_button')) {
     /**
      * Form Button
@@ -509,8 +480,6 @@ function form_button($data = '', string $content = '', $extra = ''): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('form_label')) {
     /**
      * Form Label Tag
@@ -539,8 +508,6 @@ function form_label(string $labelText = '', string $id = '', array $attributes =
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('form_datalist')) {
     /**
      * Datalist
@@ -576,8 +543,6 @@ function form_datalist(string $name, string $value, array $options): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('form_fieldset')) {
     /**
      * Fieldset Tag
@@ -602,8 +567,6 @@ function form_fieldset(string $legendText = '', array $attributes = []): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('form_fieldset_close')) {
     /**
      * Fieldset Close Tag
@@ -618,8 +581,6 @@ function form_fieldset_close(string $extra = ''): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('form_close')) {
     /**
      * Form Close Tag
@@ -634,8 +595,6 @@ function form_close(string $extra = ''): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('set_value')) {
     /**
      * Form Value
@@ -664,8 +623,6 @@ function set_value(string $field, $default = '', bool $htmlEscape = true)
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('set_select')) {
     /**
      * Set Select
@@ -709,8 +666,6 @@ function set_select(string $field, string $value = '', bool $default = false): s
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('set_checkbox')) {
     /**
      * Set Checkbox
@@ -755,8 +710,6 @@ function set_checkbox(string $field, string $value = '', bool $default = false):
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('set_radio')) {
     /**
      * Set Radio
@@ -805,8 +758,6 @@ function set_radio(string $field, string $value = '', bool $default = false): st
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('parse_form_attributes')) {
     /**
      * Parse the form attributes
@@ -849,6 +800,4 @@ function parse_form_attributes($attributes, array $default): string
 
         return $att;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
index c1d93571a690..20e4a6560cfd 100755
--- a/system/Helpers/html_helper.php
+++ b/system/Helpers/html_helper.php
@@ -13,9 +13,8 @@
 use Config\DocTypes;
 use Config\Mimes;
 
-// --------------------------------------------------------------------
-
 // CodeIgniter HTML Helpers
+
 if (! function_exists('ul')) {
     /**
      * Unordered List
@@ -34,8 +33,6 @@ function ul(array $list, $attributes = ''): string
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('ol')) {
     /**
      * Ordered List
@@ -53,8 +50,6 @@ function ol(array $list, $attributes = ''): string
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('_list')) {
     /**
      * Generates the list
@@ -98,8 +93,6 @@ function _list(string $type = 'ul', $list = [], $attributes = '', int $depth = 0
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('img')) {
     /**
      * Image
@@ -183,8 +176,6 @@ function img_data(string $path, ?string $mime = null): string
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('doctype')) {
     /**
      * Doctype
@@ -208,8 +199,6 @@ function doctype(string $type = 'html5'): string
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('script_tag')) {
     /**
      * Script
@@ -244,8 +233,6 @@ function script_tag($src = '', bool $indexPage = false): string
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('link_tag')) {
     /**
      * Link
@@ -309,8 +296,6 @@ function link_tag($href = '', string $rel = 'stylesheet', string $type = 'text/c
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('video')) {
     /**
      * Video
@@ -364,8 +349,6 @@ function video($src, string $unsupportedMessage = '', string $attributes = '', a
     }
 }
 
-    // ------------------------------------------------------------------------
-
 if (! function_exists('audio')) {
     /**
      * Audio
@@ -416,8 +399,6 @@ function audio($src, string $unsupportedMessage = '', string $attributes = '', a
     }
 }
 
-    // ------------------------------------------------------------------------
-
 if (! function_exists('_media')) {
     /**
      * Generate media based tag
@@ -460,8 +441,6 @@ function _media(string $name, array $types = [], string $unsupportedMessage = ''
     }
 }
 
-    // ------------------------------------------------------------------------
-
 if (! function_exists('source')) {
     /**
      * Source
@@ -493,8 +472,6 @@ function source(string $src, string $type = 'unknown', string $attributes = '',
     }
 }
 
-    // ------------------------------------------------------------------------
-
 if (! function_exists('track')) {
     /**
      * Track
@@ -519,8 +496,6 @@ function track(string $src, string $kind, string $srcLanguage, string $label): s
     }
 }
 
-    // ------------------------------------------------------------------------
-
 if (! function_exists('object')) {
     /**
      * Object
@@ -558,8 +533,6 @@ function object(string $data, string $type = 'unknown', string $attributes = '',
     }
 }
 
-    // ------------------------------------------------------------------------
-
 if (! function_exists('param')) {
     /**
      * Param
@@ -583,8 +556,6 @@ function param(string $name, string $value, string $type = 'ref', string $attrib
     }
 }
 
-    // ------------------------------------------------------------------------
-
 if (! function_exists('embed')) {
     /**
      * Embed
@@ -610,8 +581,6 @@ function embed(string $src, string $type = 'unknown', string $attributes = '', b
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('_has_protocol')) {
     /**
      * Test the protocol of a URI.
@@ -626,8 +595,6 @@ function _has_protocol(string $url)
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('_space_indent')) {
     /**
      * Provide space indenting.
@@ -641,5 +608,3 @@ function _space_indent(int $depth = 2): string
         return str_repeat(' ', $depth);
     }
 }
-
-// ------------------------------------------------------------------------
diff --git a/system/Helpers/inflector_helper.php b/system/Helpers/inflector_helper.php
index 3762886a9da3..0312bb5de211 100755
--- a/system/Helpers/inflector_helper.php
+++ b/system/Helpers/inflector_helper.php
@@ -9,9 +9,8 @@
  * file that was distributed with this source code.
  */
 
-// --------------------------------------------------------------------
-
 // CodeIgniter Inflector Helpers
+
 if (! function_exists('singular')) {
     /**
      * Singular
@@ -73,8 +72,6 @@ function singular(string $string): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('plural')) {
     /**
      * Plural
@@ -127,8 +124,6 @@ function plural(string $string): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('counted')) {
     /**
      * Counted
@@ -149,8 +144,6 @@ function counted(int $count, string $string): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('camelize')) {
     /**
      * Camelize
@@ -168,8 +161,6 @@ function camelize(string $string): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('pascalize')) {
     /**
      * Pascalize
@@ -188,8 +179,6 @@ function pascalize(string $string): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('underscore')) {
     /**
      * Underscore
@@ -208,8 +197,6 @@ function underscore(string $string): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('humanize')) {
     /**
      * Humanize
@@ -230,8 +217,6 @@ function humanize(string $string, string $separator = '_'): string
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('is_pluralizable')) {
     /**
      * Checks if the given word has a plural version.
@@ -299,8 +284,6 @@ function is_pluralizable(string $word): bool
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('dasherize')) {
     /**
      * Replaces underscores with dashes in the string.
@@ -315,8 +298,6 @@ function dasherize(string $string): string
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('ordinal')) {
     /**
      * Returns the suffix that should be added to a
@@ -346,8 +327,6 @@ function ordinal(int $integer): string
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('ordinalize')) {
     /**
      * Turns a number into an ordinal string used
diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
index 697b5215ef49..a5dc5a4185bf 100644
--- a/system/Helpers/number_helper.php
+++ b/system/Helpers/number_helper.php
@@ -58,8 +58,6 @@ function number_to_size($num, int $precision = 1, ?string $locale = null)
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('number_to_amount')) {
     /**
      * Converts numbers to a more readable representation
@@ -116,8 +114,6 @@ function number_to_amount($num, int $precision = 0, ?string $locale = null)
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('number_to_currency')) {
     /**
      * @param float  $num
@@ -137,8 +133,6 @@ function number_to_currency(float $num, string $currency, ?string $locale = null
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('format_number')) {
     /**
      * A general purpose, locale-aware, number_format method.
@@ -194,8 +188,6 @@ function format_number(float $num, int $precision = 1, ?string $locale = null, a
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('number_to_roman')) {
     /**
      * Convert a number to a roman numeral.
diff --git a/system/Helpers/security_helper.php b/system/Helpers/security_helper.php
index 640f0c8c571d..5ad050375a73 100644
--- a/system/Helpers/security_helper.php
+++ b/system/Helpers/security_helper.php
@@ -27,8 +27,6 @@ function sanitize_filename(string $filename): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('strip_image_tags')) {
     /**
      * Strip Image Tags
@@ -50,8 +48,6 @@ function strip_image_tags(string $str): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('encode_php_tags')) {
     /**
      * Convert PHP tags to entities
@@ -65,5 +61,3 @@ function encode_php_tags(string $str): string
         return str_replace(['<?', '?>'], ['&lt;?', '?&gt;'], $str);
     }
 }
-
-//--------------------------------------------------------------------
diff --git a/system/Helpers/test_helper.php b/system/Helpers/test_helper.php
index d18d6da8143e..36cd71652fe9 100644
--- a/system/Helpers/test_helper.php
+++ b/system/Helpers/test_helper.php
@@ -13,7 +13,6 @@
 use CodeIgniter\Test\Fabricator;
 
 // CodeIgniter Test Helpers
-//--------------------------------------------------------------------
 
 if (! function_exists('fake')) {
     /**
diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index d9ac6c96be67..230191ba1869 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -12,7 +12,6 @@
 use Config\ForeignCharacters;
 
 // CodeIgniter Text Helpers
-//--------------------------------------------------------------------
 
 if (! function_exists('word_limiter')) {
     /**
@@ -42,8 +41,6 @@ function word_limiter(string $str, int $limit = 100, string $endChar = '&#8230;'
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('character_limiter')) {
     /**
      * Character Limiter
@@ -84,8 +81,6 @@ function character_limiter(string $str, int $n = 500, string $endChar = '&#8230;
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('ascii_to_entities')) {
     /**
      * High ASCII to Entities
@@ -138,8 +133,6 @@ function ascii_to_entities(string $str): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('entities_to_ascii')) {
     /**
      * Entities to ASCII
@@ -182,8 +175,6 @@ function entities_to_ascii(string $str, bool $all = true): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('word_censor')) {
     /**
      * Word Censoring Function
@@ -241,8 +232,6 @@ function word_censor(string $str, array $censored, string $replacement = ''): st
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('highlight_code')) {
     /**
      * Code Highlighter
@@ -310,8 +299,6 @@ function highlight_code(string $str): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('highlight_phrase')) {
     /**
      * Phrase Highlighter
@@ -331,8 +318,6 @@ function highlight_phrase(string $str, string $phrase, string $tagOpen = '<mark>
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('convert_accented_characters')) {
     /**
      * Convert Accented Foreign Characters to ASCII
@@ -364,8 +349,6 @@ function convert_accented_characters(string $str): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('word_wrap')) {
     /**
      * Word Wrap
@@ -450,8 +433,6 @@ function word_wrap(string $str, int $charlim = 76): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('ellipsize')) {
     /**
      * Ellipsize String
@@ -488,8 +469,6 @@ function ellipsize(string $str, int $maxLength, $position = 1, string $ellipsis
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('strip_slashes')) {
     /**
      * Strip Slashes
@@ -514,8 +493,6 @@ function strip_slashes($str)
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('strip_quotes')) {
     /**
      * Strip Quotes
@@ -532,8 +509,6 @@ function strip_quotes(string $str): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('quotes_to_entities')) {
     /**
      * Quotes to Entities
@@ -550,8 +525,6 @@ function quotes_to_entities(string $str): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('reduce_double_slashes')) {
     /**
      * Reduce Double Slashes
@@ -575,8 +548,6 @@ function reduce_double_slashes(string $str): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('reduce_multiples')) {
     /**
      * Reduce Multiples
@@ -603,8 +574,6 @@ function reduce_multiples(string $str, string $character = ',', bool $trim = fal
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('random_string')) {
     /**
      * Create a Random String
@@ -658,8 +627,6 @@ function random_string(string $type = 'alnum', int $len = 8): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('increment_string')) {
     /**
      * Add's _1 to a string or increment the ending number to allow _2, _3, etc
@@ -678,8 +645,6 @@ function increment_string(string $str, string $separator = '_', int $first = 1):
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('alternator')) {
     /**
      * Alternator
@@ -708,8 +673,6 @@ function alternator(): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('excerpt')) {
     /**
      * Excerpt.
@@ -763,6 +726,4 @@ function excerpt(string $text, ?string $phrase = null, int $radius = 100, string
 
         return str_replace('  ', ' ', $ellPre . $prev . $phrase . $post . $ellipsis);
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
index 392de6e720cd..e9d5c4bdd711 100644
--- a/system/Helpers/url_helper.php
+++ b/system/Helpers/url_helper.php
@@ -73,8 +73,6 @@ function _get_uri(string $relativePath = '', ?App $config = null): URI
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('site_url')) {
     /**
      * Returns a site URL as defined by the App config.
@@ -98,8 +96,6 @@ function site_url($relativePath = '', ?string $scheme = null, ?App $config = nul
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('base_url')) {
     /**
      * Returns the base URL as defined by the App config.
@@ -119,8 +115,6 @@ function base_url($relativePath = '', ?string $scheme = null): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('current_url')) {
     /**
      * Returns the current full URL based on the IncomingRequest.
@@ -150,8 +144,6 @@ function current_url(bool $returnObject = false, ?IncomingRequest $request = nul
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('previous_url')) {
     /**
      * Returns the previous URL the current visitor was on. For security reasons
@@ -176,8 +168,6 @@ function previous_url(bool $returnObject = false)
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('uri_string')) {
     /**
      * URL String
@@ -196,8 +186,6 @@ function uri_string(bool $relative = false): string
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('index_page')) {
     /**
      * Index page
@@ -217,8 +205,6 @@ function index_page(?App $altConfig = null): string
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('anchor')) {
     /**
      * Anchor Link
@@ -253,8 +239,6 @@ function anchor($uri = '', string $title = '', $attributes = '', ?App $altConfig
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('anchor_popup')) {
     /**
      * Anchor Link - Pop-up version
@@ -310,8 +294,6 @@ function anchor_popup($uri = '', string $title = '', $attributes = false, ?App $
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('mailto')) {
     /**
      * Mailto Link
@@ -332,8 +314,6 @@ function mailto(string $email, string $title = '', $attributes = ''): string
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('safe_mailto')) {
     /**
      * Encoded Mailto Link
@@ -426,8 +406,6 @@ function safe_mailto(string $email, string $title = '', $attributes = ''): strin
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('auto_link')) {
     /**
      * Auto-linker
@@ -477,8 +455,6 @@ function auto_link(string $str, string $type = 'both', bool $popup = false): str
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('prep_url')) {
     /**
      * Prep URL - Simply adds the http:// or https:// part if no scheme is included.
@@ -510,8 +486,6 @@ function prep_url(string $str = '', bool $secure = false): string
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('url_title')) {
     /**
      * Create URL Title
@@ -551,8 +525,6 @@ function url_title(string $str, string $separator = '-', bool $lowercase = false
     }
 }
 
-// ------------------------------------------------------------------------
-
 if (! function_exists('mb_url_title')) {
     /**
      * Create URL Title that takes into account accented characters
@@ -575,8 +547,6 @@ function mb_url_title(string $str, string $separator = '-', bool $lowercase = fa
     }
 }
 
-//--------------------------------------------------------------------
-
 if (! function_exists('url_to')) {
     /**
      * Get the full, absolute URL to a controller method
diff --git a/system/Honeypot/Honeypot.php b/system/Honeypot/Honeypot.php
index 91ec16874b6b..ef5a2b0d5fbc 100644
--- a/system/Honeypot/Honeypot.php
+++ b/system/Honeypot/Honeypot.php
@@ -28,8 +28,6 @@ class Honeypot
      */
     protected $config;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      *
@@ -58,8 +56,6 @@ public function __construct(HoneypotConfig $config)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks the request if honeypot field has data.
      *
diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index 2f1edd42ebfa..92203a793d9f 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -105,8 +105,6 @@ public function __construct(?string $time = null, $timezone = null, ?string $loc
         parent::__construct($time, $this->timezone);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a new Time instance with the timezone set.
      *
@@ -122,8 +120,6 @@ public static function now($timezone = null, ?string $locale = null)
         return new self(null, $timezone, $locale);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a new Time instance while parsing a datetime string.
      *
@@ -143,8 +139,6 @@ public static function parse(string $datetime, $timezone = null, ?string $locale
         return new self($datetime, $timezone, $locale);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Return a new time with the time set to midnight.
      *
@@ -160,8 +154,6 @@ public static function today($timezone = null, ?string $locale = null)
         return new self(date('Y-m-d 00:00:00'), $timezone, $locale);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an instance set to midnight yesterday morning.
      *
@@ -177,8 +169,6 @@ public static function yesterday($timezone = null, ?string $locale = null)
         return new self(date('Y-m-d 00:00:00', strtotime('-1 day')), $timezone, $locale);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an instance set to midnight tomorrow morning.
      *
@@ -194,8 +184,6 @@ public static function tomorrow($timezone = null, ?string $locale = null)
         return new self(date('Y-m-d 00:00:00', strtotime('+1 day')), $timezone, $locale);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a new instance based on the year, month and day. If any of those three
      * are left empty, will default to the current value.
@@ -215,8 +203,6 @@ public static function createFromDate(?int $year = null, ?int $month = null, ?in
         return static::create($year, $month, $day, null, null, null, $timezone, $locale);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a new instance with the date set to today, and the time set to the values passed in.
      *
@@ -235,8 +221,6 @@ public static function createFromTime(?int $hour = null, ?int $minutes = null, ?
         return static::create(null, null, null, $hour, $minutes, $seconds, $timezone, $locale);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a new instance with the date time values individually set.
      *
@@ -265,8 +249,6 @@ public static function create(?int $year = null, ?int $month = null, ?int $day =
         return new self(date('Y-m-d H:i:s', strtotime("{$year}-{$month}-{$day} {$hour}:{$minutes}:{$seconds}")), $timezone, $locale);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Provides a replacement for DateTime's own createFromFormat function, that provides
      * more flexible timeZone handling
@@ -288,8 +270,6 @@ public static function createFromFormat($format, $datetime, $timeZone = null)
         return new self($date->format('Y-m-d H:i:s'), $timeZone);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a new instance with the datetime set based on the provided UNIX timestamp.
      *
@@ -306,8 +286,6 @@ public static function createFromTimestamp(int $timestamp, $timezone = null, ?st
         return new self(gmdate('Y-m-d H:i:s', $timestamp), $timezone ?? 'UTC', $locale);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Takes an instance of DateTimeInterface and returns an instance of Time with it's same values.
      *
@@ -326,8 +304,6 @@ public static function createFromInstance(DateTimeInterface $dateTime, ?string $
         return new self($date, $timezone, $locale);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Takes an instance of DateTime and returns an instance of Time with it's same values.
      *
@@ -346,8 +322,6 @@ public static function instance(DateTime $dateTime, ?string $locale = null)
         return self::createFromInstance($dateTime, $locale);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Converts the current instance to a mutable DateTime object.
      *
@@ -396,8 +370,6 @@ public static function setTestNow($datetime = null, $timezone = null, ?string $l
         static::$testNow = $datetime;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns whether we have a testNow instance saved.
      *
@@ -408,7 +380,6 @@ public static function hasTestNow(): bool
         return static::$testNow !== null;
     }
 
-    //--------------------------------------------------------------------
     //--------------------------------------------------------------------
     // Getters
     //--------------------------------------------------------------------
@@ -425,8 +396,6 @@ public function getYear(): string
         return $this->toLocalizedString('y');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the localized Month
      *
@@ -439,8 +408,6 @@ public function getMonth(): string
         return $this->toLocalizedString('M');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Return the localized day of the month.
      *
@@ -453,8 +420,6 @@ public function getDay(): string
         return $this->toLocalizedString('d');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Return the localized hour (in 24-hour format).
      *
@@ -467,8 +432,6 @@ public function getHour(): string
         return $this->toLocalizedString('H');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Return the localized minutes in the hour.
      *
@@ -481,8 +444,6 @@ public function getMinute(): string
         return $this->toLocalizedString('m');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Return the localized seconds
      *
@@ -495,8 +456,6 @@ public function getSecond(): string
         return $this->toLocalizedString('s');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Return the index of the day of the week
      *
@@ -509,8 +468,6 @@ public function getDayOfWeek(): string
         return $this->toLocalizedString('c');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Return the index of the day of the year
      *
@@ -523,8 +480,6 @@ public function getDayOfYear(): string
         return $this->toLocalizedString('D');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Return the index of the week in the month
      *
@@ -537,8 +492,6 @@ public function getWeekOfMonth(): string
         return $this->toLocalizedString('W');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Return the index of the week in the year
      *
@@ -551,8 +504,6 @@ public function getWeekOfYear(): string
         return $this->toLocalizedString('w');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the age in years from the "current" date and 'now'
      *
@@ -569,8 +520,6 @@ public function getAge()
         return max(0, date('Y', $now) - date('Y', $time));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the number of the current quarter for the year.
      *
@@ -583,8 +532,6 @@ public function getQuarter(): string
         return $this->toLocalizedString('Q');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Are we in daylight savings time currently?
      *
@@ -609,8 +556,6 @@ public function getDst(): bool
         return $daylightSaving;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns boolean whether the passed timezone is the same as
      * the local timezone.
@@ -624,8 +569,6 @@ public function getLocal(): bool
         return $local === $this->timezone->getName();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns boolean whether object is in UTC.
      *
@@ -1010,8 +953,6 @@ public function toDateTimeString()
         return $this->toLocalizedString('yyyy-MM-dd HH:mm:ss');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a localized version of the date in Y-m-d format.
      *
@@ -1024,8 +965,6 @@ public function toDateString()
         return $this->toLocalizedString('yyyy-MM-dd');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a localized version of the date in nicer date format:
      *
@@ -1040,8 +979,6 @@ public function toFormattedDateString()
         return $this->toLocalizedString('MMM d, yyyy');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a localized version of the time in nicer date format:
      *
@@ -1056,8 +993,6 @@ public function toTimeString()
         return $this->toLocalizedString('HH:mm:ss');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the localized value of this instance in $format.
      *
@@ -1074,7 +1009,6 @@ public function toLocalizedString(?string $format = null)
         return IntlDateFormatter::formatObject($this->toDateTime(), $format, $this->locale);
     }
 
-    //--------------------------------------------------------------------
     //--------------------------------------------------------------------
     // Comparison
     //--------------------------------------------------------------------
@@ -1103,8 +1037,6 @@ public function equals($testTime, ?string $timezone = null): bool
         return $testTime->format('Y-m-d H:i:s') === $ourTime;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Ensures that the times are identical, taking timezone into account.
      *
@@ -1131,8 +1063,6 @@ public function sameAs($testTime, ?string $timezone = null): bool
         return $testTime === $ourTime;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines if the current instance's time is before $testTime,
      * after converting to UTC.
@@ -1152,8 +1082,6 @@ public function isBefore($testTime, ?string $timezone = null): bool
         return $ourTime < $testTime;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines if the current instance's time is after $testTime,
      * after converting in UTC.
@@ -1173,7 +1101,6 @@ public function isAfter($testTime, ?string $timezone = null): bool
         return $ourTime > $testTime;
     }
 
-    //--------------------------------------------------------------------
     //--------------------------------------------------------------------
     // Differences
     //--------------------------------------------------------------------
@@ -1282,8 +1209,6 @@ public function getUTCObject($time, ?string $timezone = null)
         return $time;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the IntlCalendar object used for this object,
      * taking into account the locale, date, etc.
@@ -1300,8 +1225,6 @@ public function getCalendar()
         return IntlCalendar::fromDateTime($this->toDateTimeString());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Check a time string to see if it includes a relative date (like 'next Tuesday').
      *
@@ -1319,8 +1242,6 @@ protected static function hasRelativeKeywords(string $time): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Outputs a short format version of the datetime.
      *
@@ -1333,8 +1254,6 @@ public function __toString(): string
         return IntlDateFormatter::formatObject($this->toDateTime(), $this->toStringFormat, $this->locale);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Allow for property-type access to any getX method...
      *
@@ -1358,8 +1277,6 @@ public function __get($name)
         return null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Allow for property-type checking to any getX method...
      *
@@ -1374,8 +1291,6 @@ public function __isset($name): bool
         return method_exists($this, $method);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * This is called when we unserialize the Time object.
      */
diff --git a/system/I18n/TimeDifference.php b/system/I18n/TimeDifference.php
index 1f17c2853413..6d4a0f2f04d4 100644
--- a/system/I18n/TimeDifference.php
+++ b/system/I18n/TimeDifference.php
@@ -114,8 +114,6 @@ public function __construct(DateTime $currentTime, DateTime $testTime)
         $this->testTime    = $time;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the number of years of difference between the two.
      *
diff --git a/system/Images/Handlers/BaseHandler.php b/system/Images/Handlers/BaseHandler.php
index 236b5f1c0b83..1cd35c7ed145 100644
--- a/system/Images/Handlers/BaseHandler.php
+++ b/system/Images/Handlers/BaseHandler.php
@@ -122,8 +122,6 @@ abstract class BaseHandler implements ImageHandlerInterface
      */
     protected $resource;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      *
@@ -134,8 +132,6 @@ public function __construct($config = null)
         $this->config = $config ?? new Images();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets another image for this handler to work on.
      * Keeps us from needing to continually instantiate the handler.
@@ -160,15 +156,11 @@ public function withFile(string $path)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Make the image resource object if needed
      */
     abstract protected function ensureResource();
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the image instance.
      *
@@ -213,8 +205,6 @@ protected function image(): Image
         return $this->image;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the temporary image used during the image processing.
      * Good for extending the system or doing things this library
@@ -229,8 +219,6 @@ public function getResource()
         return $this->resource;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Load the temporary image used during the image processing.
      * Some functions e.g. save() will only copy and not compress
@@ -245,8 +233,6 @@ public function withResource()
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Resize the image
      *
@@ -275,8 +261,6 @@ public function resize(int $width, int $height, bool $maintainRatio = false, str
         return $this->_resize($maintainRatio);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Crops the image to the desired height and width. If one of the height/width values
      * is not provided, that value will be set the appropriate value based on offsets and
@@ -311,8 +295,6 @@ public function crop(?int $width = null, ?int $height = null, ?int $x = null, ?i
         return $result;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Changes the stored image type to indicate the new file format to use when saving.
      * Does not touch the actual resource.
@@ -328,8 +310,6 @@ public function convert(int $imageType)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Rotates the image on the current canvas.
      *
@@ -366,8 +346,6 @@ public function rotate(float $angle)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Flattens transparencies, default white background
      *
@@ -385,8 +363,6 @@ public function flatten(int $red = 255, int $green = 255, int $blue = 255)
         return $this->_flatten($red, $green, $blue);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Handler-specific method to flattening an image's transparencies.
      *
@@ -400,8 +376,6 @@ public function flatten(int $red = 255, int $green = 255, int $blue = 255)
      */
     abstract protected function _flatten(int $red = 255, int $green = 255, int $blue = 255);
 
-    //--------------------------------------------------------------------
-
     /**
      * Handler-specific method to handle rotating an image in 90 degree increments.
      *
@@ -411,8 +385,6 @@ abstract protected function _flatten(int $red = 255, int $green = 255, int $blue
      */
     abstract protected function _rotate(int $angle);
 
-    //--------------------------------------------------------------------
-
     /**
      * Flips an image either horizontally or vertically.
      *
@@ -431,8 +403,6 @@ public function flip(string $dir = 'vertical')
         return $this->_flip($dir);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Handler-specific method to handle flipping an image along its
      * horizontal or vertical axis.
@@ -443,8 +413,6 @@ public function flip(string $dir = 'vertical')
      */
     abstract protected function _flip(string $direction);
 
-    //--------------------------------------------------------------------
-
     /**
      * Overlays a string of text over the image.
      *
@@ -476,8 +444,6 @@ public function text(string $text, array $options = [])
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Handler-specific method for overlaying text on an image.
      *
@@ -486,8 +452,6 @@ public function text(string $text, array $options = [])
      */
     abstract protected function _text(string $text, array $options = []);
 
-    //--------------------------------------------------------------------
-
     /**
      * Handles the actual resizing of the image.
      *
@@ -497,8 +461,6 @@ abstract protected function _text(string $text, array $options = []);
      */
     abstract public function _resize(bool $maintainRatio = false);
 
-    //--------------------------------------------------------------------
-
     /**
      * Crops the image.
      *
@@ -506,8 +468,6 @@ abstract public function _resize(bool $maintainRatio = false);
      */
     abstract public function _crop();
 
-    //--------------------------------------------------------------------
-
     /**
      * Return image width.
      *
@@ -515,8 +475,6 @@ abstract public function _crop();
      */
     abstract public function _getWidth();
 
-    //--------------------------------------------------------------------
-
     /**
      * Return the height of an image.
      *
@@ -524,8 +482,6 @@ abstract public function _getWidth();
      */
     abstract public function _getHeight();
 
-    //--------------------------------------------------------------------
-
     /**
      * Reads the EXIF information from the image and modifies the orientation
      * so that displays correctly in the browser. This is especially an issue
@@ -567,8 +523,6 @@ public function reorient(bool $silent = false)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieve the EXIF information from the image, if possible. Returns
      * an array of the information, or null if nothing can be found.
@@ -606,8 +560,6 @@ public function getEXIF(?string $key = null, bool $silent = false)
         return $exif;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Combine cropping and resizing into a single command.
      *
@@ -644,8 +596,6 @@ public function fit(int $width, ?int $height = null, string $position = 'center'
         return $this->crop($cropWidth, $cropHeight, $x, $y)->resize($width, $height);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Calculate image aspect ratio.
      *
@@ -689,8 +639,6 @@ protected function calcAspectRatio($width, $height = null, $origWidth = 0, $orig
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Based on the position, will determine the correct x/y coords to
      * crop the desired portion from the image.
@@ -762,8 +710,6 @@ protected function calcCropCoords($width, $height, $origWidth, $origHeight, $pos
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get the version of the image library in use.
      *
@@ -771,8 +717,6 @@ protected function calcCropCoords($width, $height, $origWidth, $origHeight, $pos
      */
     abstract public function getVersion();
 
-    //--------------------------------------------------------------------
-
     /**
      * Saves any changes that have been made to file.
      *
@@ -787,8 +731,6 @@ abstract public function getVersion();
      */
     abstract public function save(?string $target = null, int $quality = 90);
 
-    //--------------------------------------------------------------------
-
     /**
      * Does the driver-specific processing of the image.
      *
@@ -798,8 +740,6 @@ abstract public function save(?string $target = null, int $quality = 90);
      */
     abstract protected function process(string $action);
 
-    //--------------------------------------------------------------------
-
     /**
      * Provide access to the Image class' methods if they don't exist
      * on the handler itself.
@@ -816,8 +756,6 @@ public function __call(string $name, array $args = [])
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Re-proportion Image Width/Height
      *
@@ -859,8 +797,6 @@ protected function reproportion()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Return image width.
      *
diff --git a/system/Images/Handlers/GDHandler.php b/system/Images/Handlers/GDHandler.php
index be4e9df1300e..ef7e2b459680 100644
--- a/system/Images/Handlers/GDHandler.php
+++ b/system/Images/Handlers/GDHandler.php
@@ -38,8 +38,6 @@ public function __construct($config = null)
         // @codeCoverageIgnoreEnd
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Handles the rotation of an image resource.
      * Doesn't save the image, but replaces the current resource.
@@ -71,8 +69,6 @@ protected function _rotate(int $angle): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Flattens transparencies
      *
@@ -108,8 +104,6 @@ public function _flatten(int $red = 255, int $green = 255, int $blue = 255)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Flips an image along it's vertical or horizontal axis.
      *
@@ -130,8 +124,6 @@ public function _flip(string $direction)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get GD version
      *
@@ -148,8 +140,6 @@ public function getVersion()
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Resizes the image.
      *
@@ -160,8 +150,6 @@ public function _resize(bool $maintainRatio = false)
         return $this->process('resize');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Crops the image.
      *
@@ -172,8 +160,6 @@ public function _crop()
         return $this->process('crop');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Handles all of the grunt work of resizing, etc.
      *
@@ -225,8 +211,6 @@ protected function process(string $action)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Saves any changes that have been made to file. If no new filename is
      * provided, the existing image is overwritten, otherwise a copy of the
@@ -313,8 +297,6 @@ public function save(?string $target = null, int $quality = 90): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Create Image Resource
      *
@@ -343,8 +325,6 @@ protected function createImage(string $path = '', string $imageType = '')
         return $this->getImageResource($path, $imageType);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Make the image resource object if needed
      */
@@ -359,8 +339,6 @@ protected function ensureResource()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Check if image type is supported and return image resource
      *
@@ -407,8 +385,6 @@ protected function getImageResource(string $path, int $imageType)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Add text overlay to an image.
      *
@@ -489,8 +465,6 @@ protected function _text(string $text, array $options = [])
         $this->textOverlay($text, $options);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Handler-specific method for overlaying text on an image.
      *
@@ -538,8 +512,6 @@ protected function textOverlay(string $text, array $options = [], bool $isShadow
         $this->resource = $src;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Return image width.
      *
diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php
index 3e2d072c91a0..581a4092f6a5 100644
--- a/system/Images/Handlers/ImageMagickHandler.php
+++ b/system/Images/Handlers/ImageMagickHandler.php
@@ -36,8 +36,6 @@ class ImageMagickHandler extends BaseHandler
      */
     protected $resource;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      *
@@ -57,8 +55,6 @@ public function __construct($config = null)
         // @codeCoverageIgnoreEnd
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Handles the actual resizing of the image.
      *
@@ -88,8 +84,6 @@ public function _resize(bool $maintainRatio = false)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Crops the image.
      *
@@ -114,8 +108,6 @@ public function _crop()
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Handles the rotation of an image resource.
      * Doesn't save the image, but replaces the current resource.
@@ -140,8 +132,6 @@ protected function _rotate(int $angle)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Flattens transparencies, default white background
      *
@@ -167,8 +157,6 @@ public function _flatten(int $red = 255, int $green = 255, int $blue = 255)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Flips an image along it's vertical or horizontal axis.
      *
@@ -192,8 +180,6 @@ public function _flip(string $direction)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get driver version
      *
@@ -209,8 +195,6 @@ public function getVersion(): string
         return str_replace('ImageMagick ', '', $matches[0]);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Handles all of the grunt work of resizing, etc.
      *
@@ -254,8 +238,6 @@ protected function process(string $action, int $quality = 100): array
         return $output;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Saves any changes that have been made to file. If no new filename is
      * provided, the existing image is overwritten, otherwise a copy of the
@@ -301,8 +283,6 @@ public function save(?string $target = null, int $quality = 90): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get Image Resource
      *
@@ -335,8 +315,6 @@ protected function getResourcePath()
         return $this->resource;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Make the image resource object if needed
      *
@@ -365,8 +343,6 @@ protected function supportedFormatCheck()
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Handler-specific method for overlaying text on an image.
      *
@@ -460,8 +436,6 @@ protected function _text(string $text, array $options = [])
         $this->process($cmd);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Return the width of an image.
      *
@@ -482,8 +456,6 @@ public function _getHeight()
         return imagesy(imagecreatefromstring(file_get_contents($this->resource)));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Reads the EXIF information from the image and modifies the orientation
      * so that displays correctly in the browser. This is especially an issue
diff --git a/system/Images/Image.php b/system/Images/Image.php
index 7e2035ed5bd1..e43bc24f53d8 100644
--- a/system/Images/Image.php
+++ b/system/Images/Image.php
@@ -90,8 +90,6 @@ public function copy(string $targetPath, ?string $targetName = null, int $perms
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get image properties
      *
@@ -136,6 +134,4 @@ public function getProperties(bool $return = false)
 
         return true;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Images/ImageHandlerInterface.php b/system/Images/ImageHandlerInterface.php
index 72b8c07eb932..e701e4dfa2c4 100644
--- a/system/Images/ImageHandlerInterface.php
+++ b/system/Images/ImageHandlerInterface.php
@@ -28,8 +28,6 @@ interface ImageHandlerInterface
      */
     public function resize(int $width, int $height, bool $maintainRatio = false, string $masterDim = 'auto');
 
-    //--------------------------------------------------------------------
-
     /**
      * Crops the image to the desired height and width. If one of the height/width values
      * is not provided, that value will be set the appropriate value based on offsets and
@@ -46,8 +44,6 @@ public function resize(int $width, int $height, bool $maintainRatio = false, str
      */
     public function crop(?int $width = null, ?int $height = null, ?int $x = null, ?int $y = null, bool $maintainRatio = false, string $masterDim = 'auto');
 
-    //--------------------------------------------------------------------
-
     /**
      * Changes the stored image type to indicate the new file format to use when saving.
      * Does not touch the actual resource.
@@ -58,8 +54,6 @@ public function crop(?int $width = null, ?int $height = null, ?int $x = null, ?i
      */
     public function convert(int $imageType);
 
-    //--------------------------------------------------------------------
-
     /**
      * Rotates the image on the current canvas.
      *
@@ -69,8 +63,6 @@ public function convert(int $imageType);
      */
     public function rotate(float $angle);
 
-    //--------------------------------------------------------------------
-
     /**
      * Flattens transparencies, default white background
      *
@@ -82,8 +74,6 @@ public function rotate(float $angle);
      */
     public function flatten(int $red = 255, int $green = 255, int $blue = 255);
 
-    //--------------------------------------------------------------------
-
     /**
      * Reads the EXIF information from the image and modifies the orientation
      * so that displays correctly in the browser.
@@ -92,8 +82,6 @@ public function flatten(int $red = 255, int $green = 255, int $blue = 255);
      */
     public function reorient();
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieve the EXIF information from the image, if possible. Returns
      * an array of the information, or null if nothing can be found.
@@ -104,8 +92,6 @@ public function reorient();
      */
     public function getEXIF(?string $key = null);
 
-    //--------------------------------------------------------------------
-
     /**
      * Flip an image horizontally or vertically
      *
@@ -115,8 +101,6 @@ public function getEXIF(?string $key = null);
      */
     public function flip(string $dir = 'vertical');
 
-    //--------------------------------------------------------------------
-
     /**
      * Combine cropping and resizing into a single command.
      *
@@ -139,8 +123,6 @@ public function flip(string $dir = 'vertical');
      */
     public function fit(int $width, int $height, string $position);
 
-    //--------------------------------------------------------------------
-
     /**
      * Overlays a string of text over the image.
      *
@@ -163,8 +145,6 @@ public function fit(int $width, int $height, string $position);
      */
     public function text(string $text, array $options = []);
 
-    //--------------------------------------------------------------------
-
     /**
      * Saves any changes that have been made to file.
      *
diff --git a/system/Language/Language.php b/system/Language/Language.php
index 51e039511978..020f48e95581 100644
--- a/system/Language/Language.php
+++ b/system/Language/Language.php
@@ -53,8 +53,6 @@ class Language
      */
     protected $loadedFiles = [];
 
-    //--------------------------------------------------------------------
-
     public function __construct(string $locale)
     {
         $this->locale = $locale;
@@ -64,8 +62,6 @@ public function __construct(string $locale)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the current locale to use when performing string lookups.
      *
@@ -82,8 +78,6 @@ public function setLocale(?string $locale = null)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @return string
      */
@@ -92,8 +86,6 @@ public function getLocale(): string
         return $this->locale;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Parses the language string for a file, loads the file, if necessary,
      * getting the line.
@@ -136,8 +128,6 @@ public function getLine(string $line, array $args = [])
         return $this->formatMessage($output, $args);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @return array|string|null
      */
@@ -193,8 +183,6 @@ protected function parseLine(string $line, string $locale): array
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Advanced message formatting.
      *
@@ -220,8 +208,6 @@ protected function formatMessage($message, array $args = [])
         return MessageFormatter::formatMessage($this->locale, $message, $args);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Loads a language file in the current locale. If $return is true,
      * will return the file's contents, otherwise will merge with
@@ -266,8 +252,6 @@ protected function load(string $file, string $locale, bool $return = false)
         $this->language[$locale][$file] = $lang;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * A simple method for including files that can be
      * overridden during testing.
@@ -299,6 +283,4 @@ protected function requireFile(string $path): array
 
         return $strings;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Log/Handlers/BaseHandler.php b/system/Log/Handlers/BaseHandler.php
index 96b1b05b0999..af915aa547b0 100644
--- a/system/Log/Handlers/BaseHandler.php
+++ b/system/Log/Handlers/BaseHandler.php
@@ -30,8 +30,6 @@ abstract class BaseHandler implements HandlerInterface
      */
     protected $dateFormat = 'Y-m-d H:i:s';
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor
      *
@@ -42,8 +40,6 @@ public function __construct(array $config)
         $this->handles = $config['handles'] ?? [];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks whether the Handler will handle logging items of this
      * log Level.
@@ -57,8 +53,6 @@ public function canHandle(string $level): bool
         return in_array($level, $this->handles, true);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Handles logging the message.
      * If the handler returns false, then execution of handlers
@@ -72,8 +66,6 @@ public function canHandle(string $level): bool
      */
     abstract public function handle($level, $message): bool;
 
-    //--------------------------------------------------------------------
-
     /**
      * Stores the date format to use while logging messages.
      *
@@ -87,6 +79,4 @@ public function setDateFormat(string $format): HandlerInterface
 
         return $this;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Log/Handlers/ChromeLoggerHandler.php b/system/Log/Handlers/ChromeLoggerHandler.php
index c1c81f4cf16d..e8488b54a459 100644
--- a/system/Log/Handlers/ChromeLoggerHandler.php
+++ b/system/Log/Handlers/ChromeLoggerHandler.php
@@ -74,8 +74,6 @@ class ChromeLoggerHandler extends BaseHandler
         'debug'     => 'info',
     ];
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor
      *
@@ -88,8 +86,6 @@ public function __construct(array $config = [])
         $this->json['request_uri'] = current_url();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Handles logging the message.
      * If the handler returns false, then execution of handlers
@@ -133,8 +129,6 @@ public function handle($level, $message): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Converts the object to display nicely in the Chrome Logger UI.
      *
@@ -156,8 +150,6 @@ protected function format($object)
         return $objectArray;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Attaches the header and the content to the passed in request object.
      *
diff --git a/system/Log/Handlers/FileHandler.php b/system/Log/Handlers/FileHandler.php
index 755609e56811..221787af127f 100644
--- a/system/Log/Handlers/FileHandler.php
+++ b/system/Log/Handlers/FileHandler.php
@@ -40,8 +40,6 @@ class FileHandler extends BaseHandler
      */
     protected $filePermissions;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor
      *
@@ -59,8 +57,6 @@ public function __construct(array $config = [])
         $this->filePermissions = $config['filePermissions'] ?? 0644;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Handles logging the message.
      * If the handler returns false, then execution of handlers
@@ -127,6 +123,4 @@ public function handle($level, $message): bool
 
         return is_int($result);
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Log/Handlers/HandlerInterface.php b/system/Log/Handlers/HandlerInterface.php
index a4943a0ed421..5ea2ee3c4098 100644
--- a/system/Log/Handlers/HandlerInterface.php
+++ b/system/Log/Handlers/HandlerInterface.php
@@ -29,8 +29,6 @@ interface HandlerInterface
      */
     public function handle($level, $message): bool;
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks whether the Handler will handle logging items of this
      * log Level.
@@ -41,8 +39,6 @@ public function handle($level, $message): bool;
      */
     public function canHandle(string $level): bool;
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the preferred date format to use when logging.
      *
@@ -51,6 +47,4 @@ public function canHandle(string $level): bool;
      * @return HandlerInterface
      */
     public function setDateFormat(string $format);
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Log/Logger.php b/system/Log/Logger.php
index c773cf24a04d..24f8fa0ee6a2 100644
--- a/system/Log/Logger.php
+++ b/system/Log/Logger.php
@@ -109,8 +109,6 @@ class Logger implements LoggerInterface
      */
     protected $cacheLogs = false;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      *
@@ -152,8 +150,6 @@ public function __construct($config, bool $debug = CI_DEBUG)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * System is unusable.
      *
@@ -167,8 +163,6 @@ public function emergency($message, array $context = []): bool
         return $this->log('emergency', $message, $context);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Action must be taken immediately.
      *
@@ -185,8 +179,6 @@ public function alert($message, array $context = []): bool
         return $this->log('alert', $message, $context);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Critical conditions.
      *
@@ -202,8 +194,6 @@ public function critical($message, array $context = []): bool
         return $this->log('critical', $message, $context);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Runtime errors that do not require immediate action but should typically
      * be logged and monitored.
@@ -218,8 +208,6 @@ public function error($message, array $context = []): bool
         return $this->log('error', $message, $context);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Exceptional occurrences that are not errors.
      *
@@ -236,8 +224,6 @@ public function warning($message, array $context = []): bool
         return $this->log('warning', $message, $context);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Normal but significant events.
      *
@@ -251,8 +237,6 @@ public function notice($message, array $context = []): bool
         return $this->log('notice', $message, $context);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Interesting events.
      *
@@ -268,8 +252,6 @@ public function info($message, array $context = []): bool
         return $this->log('info', $message, $context);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Detailed debug information.
      *
@@ -283,8 +265,6 @@ public function debug($message, array $context = []): bool
         return $this->log('debug', $message, $context);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Logs with an arbitrary level.
      *
@@ -348,8 +328,6 @@ public function log($level, $message, array $context = []): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Replaces any placeholders in the message with variables
      * from the context, as well as a few special items like:
@@ -467,8 +445,6 @@ public function determineFile(): array
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Cleans the paths of filenames by replacing APPPATH, SYSTEMPATH, FCPATH
      * with the actual var. i.e.
@@ -488,6 +464,4 @@ protected function cleanFileNames(string $file): string
 
         return str_replace(FCPATH, 'FCPATH/', $file);
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
index 0eaf8703f712..6dc68009477d 100644
--- a/system/Pager/Pager.php
+++ b/system/Pager/Pager.php
@@ -62,8 +62,6 @@ class Pager implements PagerInterface
      */
     protected $only = [];
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      *
@@ -76,8 +74,6 @@ public function __construct(PagerConfig $config, RendererInterface $view)
         $this->view   = $view;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Handles creating and displaying the
      *
@@ -93,8 +89,6 @@ public function links(string $group = 'default', string $template = 'default_ful
         return $this->displayLinks($group, $template);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Creates simple Next/Previous links, instead of full pagination.
      *
@@ -110,8 +104,6 @@ public function simpleLinks(string $group = 'default', string $template = 'defau
         return $this->displayLinks($group, $template);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Allows for a simple, manual, form of pagination where all of the data
      * is provided by the user. The URL is the current URI.
@@ -134,8 +126,6 @@ public function makeLinks(int $page, ?int $perPage, int $total, string $template
         return $this->displayLinks($group, $template);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Does the actual work of displaying the view file. Used internally
      * by links(), simpleLinks(), and makeLinks().
@@ -156,8 +146,6 @@ protected function displayLinks(string $group, string $template): string
         return $this->view->setVar('pager', $pager)->render($this->config->templates[$template]);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Stores a set of pagination data for later display. Most commonly used
      * by the model to automate the process.
@@ -193,8 +181,6 @@ public function store(string $group, int $page, ?int $perPage, int $total, int $
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets segment for a group.
      *
@@ -210,8 +196,6 @@ public function setSegment(int $number, string $group = 'default')
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the path that an aliased group of links will use.
      *
@@ -229,8 +213,6 @@ public function setPath(string $path, string $group = 'default')
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the total number of items in data store.
      *
@@ -245,8 +227,6 @@ public function getTotal(string $group = 'default'): int
         return $this->groups[$group]['total'];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the total number of pages.
      *
@@ -261,8 +241,6 @@ public function getPageCount(string $group = 'default'): int
         return $this->groups[$group]['pageCount'];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the number of the current page of results.
      *
@@ -277,8 +255,6 @@ public function getCurrentPage(string $group = 'default'): int
         return $this->groups[$group]['currentPage'] ?: 1;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Tells whether this group of results has any more pages of results.
      *
@@ -293,8 +269,6 @@ public function hasMore(string $group = 'default'): bool
         return ($this->groups[$group]['currentPage'] * $this->groups[$group]['perPage']) < $this->groups[$group]['total'];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the last page, if we have a total that we can calculate with.
      *
@@ -313,8 +287,6 @@ public function getLastPage(string $group = 'default')
         return (int) ceil($this->groups[$group]['total'] / $this->groups[$group]['perPage']);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines the first page # that should be shown.
      *
@@ -330,8 +302,6 @@ public function getFirstPage(string $group = 'default'): int
         return 1;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the URI for a specific page for the specified group.
      *
@@ -371,8 +341,6 @@ public function getPageURI(?int $page = null, string $group = 'default', bool $r
         return $returnObject === true ? $uri : URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the full URI to the next page of results, or null.
      *
@@ -400,8 +368,6 @@ public function getNextPageURI(string $group = 'default', bool $returnObject = f
         return $this->getPageURI($page, $group, $returnObject);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the full URL to the previous page of results, or null.
      *
@@ -429,8 +395,6 @@ public function getPreviousPageURI(string $group = 'default', bool $returnObject
         return $this->getPageURI($page, $group, $returnObject);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the number of results per page that should be shown.
      *
@@ -445,8 +409,6 @@ public function getPerPage(string $group = 'default'): int
         return (int) $this->groups[$group]['perPage'];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an array with details about the results, including
      * total, per_page, current_page, last_page, next_url, prev_url, from, to.
@@ -472,8 +434,6 @@ public function getDetails(string $group = 'default'): array
         return $newGroup;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets only allowed queries on pagination links.
      *
@@ -488,8 +448,6 @@ public function only(array $queries): self
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Ensures that an array exists for the group specified.
      *
@@ -518,8 +476,6 @@ protected function ensureGroup(string $group, ?int $perPage = null)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Calculating the current page
      *
@@ -541,6 +497,4 @@ protected function calculateCurrentPage(string $group)
             $this->groups[$group]['currentPage'] = $page < 1 ? 1 : $page;
         }
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Pager/PagerInterface.php b/system/Pager/PagerInterface.php
index c928ba461766..4bd7a9af1dce 100644
--- a/system/Pager/PagerInterface.php
+++ b/system/Pager/PagerInterface.php
@@ -28,8 +28,6 @@ interface PagerInterface
      */
     public function links(string $group = 'default', string $template = 'default'): string;
 
-    //--------------------------------------------------------------------
-
     /**
      * Creates simple Next/Previous links, instead of full pagination.
      *
@@ -40,8 +38,6 @@ public function links(string $group = 'default', string $template = 'default'):
      */
     public function simpleLinks(string $group = 'default', string $template = 'default'): string;
 
-    //--------------------------------------------------------------------
-
     /**
      * Allows for a simple, manual, form of pagination where all of the data
      * is provided by the user. The URL is the current URI.
@@ -55,8 +51,6 @@ public function simpleLinks(string $group = 'default', string $template = 'defau
      */
     public function makeLinks(int $page, int $perPage, int $total, string $template = 'default'): string;
 
-    //--------------------------------------------------------------------
-
     /**
      * Stores a set of pagination data for later display. Most commonly used
      * by the model to automate the process.
@@ -70,8 +64,6 @@ public function makeLinks(int $page, int $perPage, int $total, string $template
      */
     public function store(string $group, int $page, int $perPage, int $total);
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the path that an aliased group of links will use.
      *
@@ -82,8 +74,6 @@ public function store(string $group, int $page, int $perPage, int $total);
      */
     public function setPath(string $path, string $group = 'default');
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the total number of pages.
      *
@@ -93,8 +83,6 @@ public function setPath(string $path, string $group = 'default');
      */
     public function getPageCount(string $group = 'default'): int;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the number of the current page of results.
      *
@@ -104,8 +92,6 @@ public function getPageCount(string $group = 'default'): int;
      */
     public function getCurrentPage(string $group = 'default'): int;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the URI for a specific page for the specified group.
      *
@@ -117,8 +103,6 @@ public function getCurrentPage(string $group = 'default'): int;
      */
     public function getPageURI(?int $page = null, string $group = 'default', bool $returnObject = false);
 
-    //--------------------------------------------------------------------
-
     /**
      * Tells whether this group of results has any more pages of results.
      *
@@ -128,8 +112,6 @@ public function getPageURI(?int $page = null, string $group = 'default', bool $r
      */
     public function hasMore(string $group = 'default'): bool;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the first page.
      *
@@ -139,8 +121,6 @@ public function hasMore(string $group = 'default'): bool;
      */
     public function getFirstPage(string $group = 'default');
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the last page, if we have a total that we can calculate with.
      *
@@ -150,8 +130,6 @@ public function getFirstPage(string $group = 'default');
      */
     public function getLastPage(string $group = 'default');
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the full URI to the next page of results, or null.
      *
@@ -161,8 +139,6 @@ public function getLastPage(string $group = 'default');
      */
     public function getNextPageURI(string $group = 'default');
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the full URL to the previous page of results, or null.
      *
@@ -172,8 +148,6 @@ public function getNextPageURI(string $group = 'default');
      */
     public function getPreviousPageURI(string $group = 'default');
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the number of results per page that should be shown.
      *
@@ -183,8 +157,6 @@ public function getPreviousPageURI(string $group = 'default');
      */
     public function getPerPage(string $group = 'default'): int;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an array with details about the results, including
      * total, per_page, current_page, last_page, next_url, prev_url, from, to.
@@ -196,6 +168,4 @@ public function getPerPage(string $group = 'default'): int;
      * @return array
      */
     public function getDetails(string $group = 'default'): array;
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Pager/PagerRenderer.php b/system/Pager/PagerRenderer.php
index 080b3c0222a6..730cd933af56 100644
--- a/system/Pager/PagerRenderer.php
+++ b/system/Pager/PagerRenderer.php
@@ -78,8 +78,6 @@ class PagerRenderer
      */
     protected $pageSelector;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      *
@@ -97,8 +95,6 @@ public function __construct(array $details)
         $this->pageSelector = $details['pageSelector'] ?? 'page';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the total number of links that should appear on either
      * side of the current page. Adjusts the first and last counts
@@ -115,8 +111,6 @@ public function setSurroundCount(?int $count = null)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks to see if there is a "previous" page before our "first" page.
      *
@@ -127,8 +121,6 @@ public function hasPrevious(): bool
         return $this->first > 1;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a URL to the "previous" page. The previous page is NOT the
      * page before the current page, but is the page just before the
@@ -155,8 +147,6 @@ public function getPrevious()
         return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks to see if there is a "next" page after our "last" page.
      *
@@ -167,8 +157,6 @@ public function hasNext(): bool
         return $this->pageCount > $this->last;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a URL to the "next" page. The next page is NOT, the
      * page after the current page, but is the page that follows the
@@ -195,8 +183,6 @@ public function getNext()
         return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the URI of the first page.
      *
@@ -215,8 +201,6 @@ public function getFirst(): string
         return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the URI of the last page.
      *
@@ -235,8 +219,6 @@ public function getLast(): string
         return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the URI of the current page.
      *
@@ -255,8 +237,6 @@ public function getCurrent(): string
         return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an array of links that should be displayed. Each link
      * is represented by another array containing of the URI the link
@@ -283,8 +263,6 @@ public function links(): array
         return $links;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Updates the first and last pages based on $surroundCount,
      * which is the number of links surrounding the active page
@@ -302,8 +280,6 @@ protected function updatePages(?int $count = null)
         $this->last  = $this->current + $count <= $this->pageCount ? (int) ($this->current + $count) : (int) $this->pageCount;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks to see if there is a "previous" page before our "first" page.
      *
@@ -314,8 +290,6 @@ public function hasPreviousPage(): bool
         return $this->current > 1;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a URL to the "previous" page.
      *
@@ -340,8 +314,6 @@ public function getPreviousPage()
         return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks to see if there is a "next" page after our "last" page.
      *
@@ -352,8 +324,6 @@ public function hasNextPage(): bool
         return $this->current < $this->last;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a URL to the "next" page.
      *
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index b96f0c6d69d4..2edced3b4255 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -210,8 +210,6 @@ class RouteCollection implements RouteCollectionInterface
      */
     protected $prioritizeDetected = false;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor
      *
@@ -224,8 +222,6 @@ public function __construct(FileLocator $locator, Modules $moduleConfig)
         $this->moduleConfig = $moduleConfig;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Registers a new constraint with the system. Constraints are used
      * by the routes as placeholders for regular expressions to make defining
@@ -250,8 +246,6 @@ public function addPlaceholder($placeholder, ?string $pattern = null): RouteColl
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the default namespace to use for Controllers when no other
      * namespace has been specified.
@@ -268,8 +262,6 @@ public function setDefaultNamespace(string $value): RouteCollectionInterface
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the default controller to use when no other controller has been
      * specified.
@@ -285,8 +277,6 @@ public function setDefaultController(string $value): RouteCollectionInterface
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the default method to call on the controller when no other
      * method has been set in the route.
@@ -302,8 +292,6 @@ public function setDefaultMethod(string $value): RouteCollectionInterface
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Tells the system whether to convert dashes in URI strings into
      * underscores. In some search engines, including Google, dashes
@@ -322,8 +310,6 @@ public function setTranslateURIDashes(bool $value): RouteCollectionInterface
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * If TRUE, the system will attempt to match the URI against
      * Controllers by matching each segment against folders/files
@@ -343,8 +329,6 @@ public function setAutoRoute(bool $value): RouteCollectionInterface
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the class/method that should be called if routing doesn't
      * find a match. It can be either a closure or the controller/method
@@ -363,8 +347,6 @@ public function set404Override($callable = null): RouteCollectionInterface
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the 404 Override setting, which can be null, a closure
      * or the controller/string.
@@ -376,8 +358,6 @@ public function get404Override()
         return $this->override404;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Will attempt to discover any additional routes, either through
      * the local PSR4 namespaces, or through selected Composer packages.
@@ -408,8 +388,6 @@ protected function discoverRoutes()
         $this->didDiscover = true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the default constraint to be used in the system. Typically
      * for use with the 'resource' method.
@@ -427,8 +405,6 @@ public function setDefaultConstraint(string $placeholder): RouteCollectionInterf
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the name of the default controller. With Namespace.
      *
@@ -439,8 +415,6 @@ public function getDefaultController(): string
         return $this->defaultController;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the name of the default method to use within the controller.
      *
@@ -451,8 +425,6 @@ public function getDefaultMethod(): string
         return $this->defaultMethod;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the default namespace as set in the Routes config file.
      *
@@ -463,8 +435,6 @@ public function getDefaultNamespace(): string
         return $this->defaultNamespace;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the current value of the translateURIDashes setting.
      *
@@ -475,8 +445,6 @@ public function shouldTranslateURIDashes(): bool
         return $this->translateURIDashes;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the flag that tells whether to autoRoute URI against Controllers.
      *
@@ -487,8 +455,6 @@ public function shouldAutoRoute(): bool
         return $this->autoRoute;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the raw array of available routes.
      *
@@ -541,8 +507,6 @@ public function getRoutes(?string $verb = null): array
         return $routes;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns one or all routes options
      *
@@ -558,8 +522,6 @@ public function getRoutesOptions(?string $from = null, ?string $verb = null): ar
         return $from ? $options[$from] ?? [] : $options;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the current HTTP Verb being used.
      *
@@ -570,8 +532,6 @@ public function getHTTPVerb(): string
         return $this->HTTPVerb;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the current HTTP verb.
      * Used primarily for testing.
@@ -606,8 +566,6 @@ public function map(array $routes = [], ?array $options = null): RouteCollection
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Adds a single route to the collection.
      *
@@ -627,8 +585,6 @@ public function add(string $from, $to, ?array $options = null): RouteCollectionI
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Adds a temporary redirect from one route to another. Used for
      * redirecting traffic from old, non-existing routes to the new
@@ -654,8 +610,6 @@ public function addRedirect(string $from, string $to, int $status = 302)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines if the route is a redirecting route.
      *
@@ -675,8 +629,6 @@ public function isRedirect(string $from): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Grabs the HTTP status code from a redirecting Route.
      *
@@ -696,11 +648,6 @@ public function getRedirectCode(string $from): int
         return 0;
     }
 
-    //--------------------------------------------------------------------
-    //--------------------------------------------------------------------
-    // Grouping Routes
-    //--------------------------------------------------------------------
-
     /**
      * Group a series of routes under a single URL segment. This is handy
      * for grouping items into an admin area, like:
@@ -740,18 +687,18 @@ public function group(string $name, ...$params)
         $this->currentOptions = $oldOptions;
     }
 
-    //--------------------------------------------------------------------
-    //--------------------------------------------------------------------
-    // HTTP Verb-based routing
-    //--------------------------------------------------------------------
-    // Routing works here because, as the routes Config file is read in,
-    // the various HTTP verb-based routes will only be added to the in-memory
-    // routes if it is a call that should respond to that verb.
-    //
-    // The options array is typically used to pass in an 'as' or var, but may
-    // be expanded in the future. See the docblock for 'add' method above for
-    // current list of globally available options.
-    //
+    /*
+     * --------------------------------------------------------------------
+     *  HTTP Verb-based routing
+     * --------------------------------------------------------------------
+     * Routing works here because, as the routes Config file is read in,
+     * the various HTTP verb-based routes will only be added to the in-memory
+     * routes if it is a call that should respond to that verb.
+     *
+     * The options array is typically used to pass in an 'as' or var, but may
+     * be expanded in the future. See the docblock for 'add' method above for
+     * current list of globally available options.
+     */
 
     /**
      * Creates a collections of HTTP-verb based routes for a controller.
@@ -946,8 +893,6 @@ public function presenter(string $name, ?array $options = null): RouteCollection
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Specifies a single route to match for multiple HTTP Verbs.
      *
@@ -976,8 +921,6 @@ public function match(array $verbs = [], string $from = '', $to = '', ?array $op
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Specifies a route that is only available to GET requests.
      *
@@ -994,8 +937,6 @@ public function get(string $from, $to, ?array $options = null): RouteCollectionI
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Specifies a route that is only available to POST requests.
      *
@@ -1012,8 +953,6 @@ public function post(string $from, $to, ?array $options = null): RouteCollection
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Specifies a route that is only available to PUT requests.
      *
@@ -1030,8 +969,6 @@ public function put(string $from, $to, ?array $options = null): RouteCollectionI
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Specifies a route that is only available to DELETE requests.
      *
@@ -1048,8 +985,6 @@ public function delete(string $from, $to, ?array $options = null): RouteCollecti
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Specifies a route that is only available to HEAD requests.
      *
@@ -1066,8 +1001,6 @@ public function head(string $from, $to, ?array $options = null): RouteCollection
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Specifies a route that is only available to PATCH requests.
      *
@@ -1084,8 +1017,6 @@ public function patch(string $from, $to, ?array $options = null): RouteCollectio
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Specifies a route that is only available to OPTIONS requests.
      *
@@ -1102,8 +1033,6 @@ public function options(string $from, $to, ?array $options = null): RouteCollect
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Specifies a route that is only available to command-line requests.
      *
@@ -1120,8 +1049,6 @@ public function cli(string $from, $to, ?array $options = null): RouteCollectionI
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Limits the routes to a specified ENVIRONMENT or they won't run.
      *
@@ -1139,8 +1066,6 @@ public function environment(string $env, Closure $callback): RouteCollectionInte
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Attempts to look up a route based on its destination.
      *
@@ -1209,8 +1134,6 @@ public function reverseRoute(string $search, ...$params)
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Replaces the {locale} tag with the current application locale
      *
@@ -1223,8 +1146,6 @@ protected function localizeRoute(string $route): string
         return strtr($route, ['{locale}' => Services::request()->getLocale()]);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks a route (using the "from") to see if it's filtered or not.
      *
@@ -1240,8 +1161,6 @@ public function isFiltered(string $search, ?string $verb = null): bool
         return isset($options[$search]['filter']);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the filter that should be applied for a single route, along
      * with any parameters it might have. Parameters are found by splitting
@@ -1264,8 +1183,6 @@ public function getFilterForRoute(string $search, ?string $verb = null): string
         return $options[$search]['filter'] ?? '';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Given a
      *
@@ -1301,8 +1218,6 @@ protected function fillRouteParams(string $from, ?array $params = null): string
         return '/' . ltrim($from, '/');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Does the heavy lifting of creating an actual route. You must specify
      * the request method(s) that this route will work for. They can be separated
@@ -1418,8 +1333,6 @@ static function ($m) use ($i) {
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Compares the subdomain(s) passed in against the current subdomain
      * on this page request.
@@ -1452,8 +1365,6 @@ private function checkSubdomains($subdomains): bool
         return in_array($this->currentSubdomain, $subdomains, true);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Examines the HTTP_HOST to get a best match for the subdomain. It
      * won't be perfect, but should work for our needs.
@@ -1498,8 +1409,6 @@ private function determineCurrentSubdomain()
         return array_shift($host);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Reset the routes, so that a test case can provide the
      * explicit ones needed for it.
@@ -1515,8 +1424,6 @@ public function resetRoutes()
         $this->prioritizeDetected = false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Load routes options based on verb
      *
diff --git a/system/Router/RouteCollectionInterface.php b/system/Router/RouteCollectionInterface.php
index 27b8ef6f0dfc..cc9003f6ddbf 100644
--- a/system/Router/RouteCollectionInterface.php
+++ b/system/Router/RouteCollectionInterface.php
@@ -36,8 +36,6 @@ interface RouteCollectionInterface
      */
     public function add(string $from, $to, ?array $options = null);
 
-    //--------------------------------------------------------------------
-
     /**
      * Registers a new constraint with the system. Constraints are used
      * by the routes as placeholders for regular expressions to make defining
@@ -53,8 +51,6 @@ public function add(string $from, $to, ?array $options = null);
      */
     public function addPlaceholder($placeholder, ?string $pattern = null);
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the default namespace to use for Controllers when no other
      * namespace has been specified.
@@ -65,8 +61,6 @@ public function addPlaceholder($placeholder, ?string $pattern = null);
      */
     public function setDefaultNamespace(string $value);
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the default controller to use when no other controller has been
      * specified.
@@ -77,8 +71,6 @@ public function setDefaultNamespace(string $value);
      */
     public function setDefaultController(string $value);
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the default method to call on the controller when no other
      * method has been set in the route.
@@ -89,8 +81,6 @@ public function setDefaultController(string $value);
      */
     public function setDefaultMethod(string $value);
 
-    //--------------------------------------------------------------------
-
     /**
      * Tells the system whether to convert dashes in URI strings into
      * underscores. In some search engines, including Google, dashes
@@ -104,8 +94,6 @@ public function setDefaultMethod(string $value);
      */
     public function setTranslateURIDashes(bool $value);
 
-    //--------------------------------------------------------------------
-
     /**
      * If TRUE, the system will attempt to match the URI against
      * Controllers by matching each segment against folders/files
@@ -120,8 +108,6 @@ public function setTranslateURIDashes(bool $value);
      */
     public function setAutoRoute(bool $value): self;
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the class/method that should be called if routing doesn't
      * find a match. It can be either a closure or the controller/method
@@ -135,8 +121,6 @@ public function setAutoRoute(bool $value): self;
      */
     public function set404Override($callable = null): self;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the 404 Override setting, which can be null, a closure
      * or the controller/string.
@@ -145,8 +129,6 @@ public function set404Override($callable = null): self;
      */
     public function get404Override();
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the name of the default controller. With Namespace.
      *
@@ -154,8 +136,6 @@ public function get404Override();
      */
     public function getDefaultController();
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the name of the default method to use within the controller.
      *
@@ -163,8 +143,6 @@ public function getDefaultController();
      */
     public function getDefaultMethod();
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the current value of the translateURIDashes setting.
      *
@@ -172,8 +150,6 @@ public function getDefaultMethod();
      */
     public function shouldTranslateURIDashes();
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the flag that tells whether to autoRoute URI against Controllers.
      *
@@ -181,8 +157,6 @@ public function shouldTranslateURIDashes();
      */
     public function shouldAutoRoute();
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the raw array of available routes.
      *
@@ -190,8 +164,6 @@ public function shouldAutoRoute();
      */
     public function getRoutes();
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the current HTTP Verb being used.
      *
@@ -199,8 +171,6 @@ public function getRoutes();
      */
     public function getHTTPVerb();
 
-    //--------------------------------------------------------------------
-
     /**
      * Attempts to look up a route based on it's destination.
      *
@@ -221,8 +191,6 @@ public function getHTTPVerb();
      */
     public function reverseRoute(string $search, ...$params);
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines if the route is a redirecting route.
      *
@@ -232,8 +200,6 @@ public function reverseRoute(string $search, ...$params);
      */
     public function isRedirect(string $from): bool;
 
-    //--------------------------------------------------------------------
-
     /**
      * Grabs the HTTP status code from a redirecting Route.
      *
@@ -242,6 +208,4 @@ public function isRedirect(string $from): bool;
      * @return int
      */
     public function getRedirectCode(string $from): int;
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Router/Router.php b/system/Router/Router.php
index 8c2a57b9e7fc..f7c2915c4154 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -102,8 +102,6 @@ class Router implements RouterInterface
      */
     protected $filterInfo;
 
-    //--------------------------------------------------------------------
-
     /**
      * Stores a reference to the RouteCollection object.
      *
@@ -121,8 +119,6 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request
         $this->collection->setHTTPVerb($request->getMethod() ?? strtolower($_SERVER['REQUEST_METHOD']));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @param string|null $uri
      *
@@ -169,8 +165,6 @@ public function handle(?string $uri = null)
         return $this->controllerName();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the filter info for the matched route, if any.
      *
@@ -181,8 +175,6 @@ public function getFilter()
         return $this->filterInfo;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the name of the matched controller.
      *
@@ -195,8 +187,6 @@ public function controllerName()
             : $this->controller;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the name of the method to run in the
      * chosen container.
@@ -210,8 +200,6 @@ public function methodName(): string
             : $this->method;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the 404 Override settings from the Collection.
      * If the override is a string, will split to controller/index array.
@@ -236,8 +224,6 @@ public function get404Override()
         return null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the binds that have been matched and collected
      * during the parsing process as an array, ready to send to
@@ -250,8 +236,6 @@ public function params(): array
         return $this->params;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the name of the sub-directory the controller is in,
      * if any. Relative to APPPATH.'Controllers'.
@@ -265,8 +249,6 @@ public function directory(): string
         return ! empty($this->directory) ? $this->directory : '';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the routing information that was matched for this
      * request, if a route was defined.
@@ -278,8 +260,6 @@ public function getMatchedRoute()
         return $this->matchedRoute;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns all options set for the matched route
      *
@@ -290,8 +270,6 @@ public function getMatchedRouteOptions()
         return $this->matchedRouteOptions;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the value that should be used to match the index.php file. Defaults
      * to index.php but this allows you to modify it in case your are using
@@ -309,8 +287,6 @@ public function setIndexPage($page): self
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Tells the system whether we should translate URI dashes or not
      * in the URI from a dash to an underscore.
@@ -326,8 +302,6 @@ public function setTranslateURIDashes(bool $val = false): self
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns true/false based on whether the current route contained
      * a {locale} placeholder.
@@ -339,8 +313,6 @@ public function hasLocale()
         return (bool) $this->detectedLocale;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the detected locale, if any, or null.
      *
@@ -351,8 +323,6 @@ public function getLocale()
         return $this->detectedLocale;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Compares the uri string against the routes that the
      * RouteCollection class defined for us, attempting to find a match.
@@ -470,8 +440,6 @@ protected function checkRoutes(string $uri): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Attempts to match a URI path against Controllers and directories
      * found in APPPATH/Controllers, to find a matching route.
@@ -547,8 +515,6 @@ public function autoRoute(string $uri)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Scans the controller directory, attempting to locate a controller matching the supplied uri $segments
      *
@@ -565,8 +531,6 @@ protected function validateRequest(array $segments): array
         return $this->scanControllers($segments);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Scans the controller directory, attempting to locate a controller matching the supplied uri $segments
      *
@@ -615,8 +579,6 @@ protected function scanControllers(array $segments): array
         return $segments;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the sub-directory that the controller is in.
      *
@@ -663,8 +625,6 @@ private function isValidSegment(string $segment): bool
         return (bool) preg_match('/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*$/', $segment);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Set request route
      *
@@ -697,8 +657,6 @@ protected function setRequest(array $segments = [])
         $this->params = $segments;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the default controller based on the info set in the RouteCollection.
      */
@@ -721,6 +679,4 @@ protected function setDefaultController()
 
         log_message('info', 'Used the default controller.');
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Router/RouterInterface.php b/system/Router/RouterInterface.php
index 5d666a0b1ae1..28002b250a21 100644
--- a/system/Router/RouterInterface.php
+++ b/system/Router/RouterInterface.php
@@ -26,8 +26,6 @@ interface RouterInterface
      */
     public function __construct(RouteCollectionInterface $routes, ?Request $request = null);
 
-    //--------------------------------------------------------------------
-
     /**
      * Scans the URI and attempts to match the current URI to the
      * one of the defined routes in the RouteCollection.
@@ -38,8 +36,6 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request
      */
     public function handle(?string $uri = null);
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the name of the matched controller.
      *
@@ -47,8 +43,6 @@ public function handle(?string $uri = null);
      */
     public function controllerName();
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the name of the method to run in the
      * chosen container.
@@ -57,8 +51,6 @@ public function controllerName();
      */
     public function methodName();
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the binds that have been matched and collected
      * during the parsing process as an array, ready to send to
@@ -68,8 +60,6 @@ public function methodName();
      */
     public function params();
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the value that should be used to match the index.php file. Defaults
      * to index.php but this allows you to modify it in case your are using
@@ -81,6 +71,4 @@ public function params();
      * @return mixed
      */
     public function setIndexPage($page);
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Session/Handlers/ArrayHandler.php b/system/Session/Handlers/ArrayHandler.php
index 4dae96b25d3b..adce88b400ea 100644
--- a/system/Session/Handlers/ArrayHandler.php
+++ b/system/Session/Handlers/ArrayHandler.php
@@ -21,8 +21,6 @@ class ArrayHandler extends BaseHandler
 {
     protected static $cache = [];
 
-    //--------------------------------------------------------------------
-
     /**
      * Open
      *
@@ -40,8 +38,6 @@ public function open($savePath, $name): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Read
      *
@@ -56,8 +52,6 @@ public function read($sessionID): string
         return '';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Write
      *
@@ -73,8 +67,6 @@ public function write($sessionID, $sessionData): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Close
      *
@@ -87,8 +79,6 @@ public function close(): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Destroy
      *
@@ -103,8 +93,6 @@ public function destroy($sessionID): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Garbage Collector
      *
@@ -118,6 +106,4 @@ public function gc($maxlifetime): bool
     {
         return true;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Session/Handlers/BaseHandler.php b/system/Session/Handlers/BaseHandler.php
index 6977bd44d897..bfd524ea348e 100644
--- a/system/Session/Handlers/BaseHandler.php
+++ b/system/Session/Handlers/BaseHandler.php
@@ -100,8 +100,6 @@ abstract class BaseHandler implements SessionHandlerInterface
      */
     protected $ipAddress;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor
      *
@@ -120,8 +118,6 @@ public function __construct(AppConfig $config, string $ipAddress)
         $this->ipAddress    = $ipAddress;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Internal method to force removal of a cookie by the client
      * when session_destroy() is called.
@@ -141,8 +137,6 @@ protected function destroyCookie(): bool
         );
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * A dummy method allowing drivers with no locking functionality
      * (databases other than PostgreSQL and MySQL) to act as if they
@@ -159,8 +153,6 @@ protected function lockSession(string $sessionID): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Releases the lock, if any.
      *
@@ -173,8 +165,6 @@ protected function releaseLock(): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Fail
      *
diff --git a/system/Session/Handlers/DatabaseHandler.php b/system/Session/Handlers/DatabaseHandler.php
index 91aa16f997a4..902a3f415cc7 100644
--- a/system/Session/Handlers/DatabaseHandler.php
+++ b/system/Session/Handlers/DatabaseHandler.php
@@ -57,8 +57,6 @@ class DatabaseHandler extends BaseHandler
      */
     protected $rowExists = false;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor
      *
@@ -91,8 +89,6 @@ public function __construct(AppConfig $config, string $ipAddress)
         }
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Open
      *
@@ -114,8 +110,6 @@ public function open($savePath, $name): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Read
      *
@@ -170,8 +164,6 @@ public function read($sessionID): string
         return $result;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Write
      *
@@ -235,8 +227,6 @@ public function write($sessionID, $sessionData): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Close
      *
@@ -249,8 +239,6 @@ public function close(): bool
         return ($this->lock && ! $this->releaseLock()) ? $this->fail() : true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Destroy
      *
@@ -283,8 +271,6 @@ public function destroy($sessionID): bool
         return $this->fail();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Garbage Collector
      *
@@ -302,8 +288,6 @@ public function gc($maxlifetime): bool
         return $this->db->table($this->table)->delete("timestamp < now() - INTERVAL {$interval}") ? true : $this->fail();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Lock the session.
      *
@@ -339,8 +323,6 @@ protected function lockSession(string $sessionID): bool
         return parent::lockSession($sessionID);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Releases the lock, if any.
      *
@@ -375,6 +357,4 @@ protected function releaseLock(): bool
         // Unsupported DB? Let the parent handle the simple version.
         return parent::releaseLock();
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Session/Handlers/FileHandler.php b/system/Session/Handlers/FileHandler.php
index 0350767a1255..c3f2124cd11c 100644
--- a/system/Session/Handlers/FileHandler.php
+++ b/system/Session/Handlers/FileHandler.php
@@ -62,8 +62,6 @@ class FileHandler extends BaseHandler
      */
     protected $sessionIDRegex = '';
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor
      *
@@ -92,8 +90,6 @@ public function __construct(AppConfig $config, string $ipAddress)
         $this->configureSessionIDRegex();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Open
      *
@@ -124,8 +120,6 @@ public function open($savePath, $name): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Read
      *
@@ -187,8 +181,6 @@ public function read($sessionID)
         return $sessionData;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Write
      *
@@ -241,8 +233,6 @@ public function write($sessionID, $sessionData): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Close
      *
@@ -265,8 +255,6 @@ public function close(): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Destroy
      *
@@ -293,8 +281,6 @@ public function destroy($sessionId): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Garbage Collector
      *
@@ -341,8 +327,6 @@ public function gc($maxlifetime): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Configure Session ID regular expression
      */
diff --git a/system/Session/Handlers/MemcachedHandler.php b/system/Session/Handlers/MemcachedHandler.php
index 475a1efde386..5fa801362a46 100644
--- a/system/Session/Handlers/MemcachedHandler.php
+++ b/system/Session/Handlers/MemcachedHandler.php
@@ -48,8 +48,6 @@ class MemcachedHandler extends BaseHandler
      */
     protected $sessionExpiration = 7200;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor
      *
@@ -77,8 +75,6 @@ public function __construct(AppConfig $config, string $ipAddress)
         $this->sessionExpiration = $config->sessionExpiration;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Open
      *
@@ -132,8 +128,6 @@ public function open($savePath, $name): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Read
      *
@@ -160,8 +154,6 @@ public function read($sessionID): string
         return '';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Write
      *
@@ -207,8 +199,6 @@ public function write($sessionID, $sessionData): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Close
      *
@@ -235,8 +225,6 @@ public function close(): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Destroy
      *
@@ -257,8 +245,6 @@ public function destroy($sessionId): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Garbage Collector
      *
@@ -274,8 +260,6 @@ public function gc($maxlifetime): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get lock
      *
@@ -323,8 +307,6 @@ protected function lockSession(string $sessionID): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Release lock
      *
@@ -350,6 +332,4 @@ protected function releaseLock(): bool
 
         return true;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Session/Handlers/RedisHandler.php b/system/Session/Handlers/RedisHandler.php
index eec6fb307907..070b5d6e2789 100644
--- a/system/Session/Handlers/RedisHandler.php
+++ b/system/Session/Handlers/RedisHandler.php
@@ -57,8 +57,6 @@ class RedisHandler extends BaseHandler
      */
     protected $sessionExpiration = 7200;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor
      *
@@ -102,8 +100,6 @@ public function __construct(AppConfig $config, string $ipAddress)
             : (int) $config->sessionExpiration;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Open
      *
@@ -137,8 +133,6 @@ public function open($savePath, $name): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Read
      *
@@ -167,8 +161,6 @@ public function read($sessionID): string
         return '';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Write
      *
@@ -215,8 +207,6 @@ public function write($sessionID, $sessionData): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Close
      *
@@ -251,8 +241,6 @@ public function close(): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Destroy
      *
@@ -275,8 +263,6 @@ public function destroy($sessionID): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Garbage Collector
      *
@@ -292,8 +278,6 @@ public function gc($maxlifetime): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get lock
      *
@@ -348,8 +332,6 @@ protected function lockSession(string $sessionID): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Release lock
      *
@@ -372,6 +354,4 @@ protected function releaseLock(): bool
 
         return true;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Session/Session.php b/system/Session/Session.php
index e5787bae85f9..893833247566 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -179,17 +179,13 @@ public function __construct(SessionHandlerInterface $driver, App $config)
         $this->sessionTimeToUpdate      = $config->sessionTimeToUpdate ?? $this->sessionTimeToUpdate;
         $this->sessionRegenerateDestroy = $config->sessionRegenerateDestroy ?? $this->sessionRegenerateDestroy;
 
-        //---------------------------------------------------------------------
         // DEPRECATED COOKIE MANAGEMENT
-        //---------------------------------------------------------------------
         $this->cookiePath     = $config->cookiePath ?? $this->cookiePath;
         $this->cookieDomain   = $config->cookieDomain ?? $this->cookieDomain;
         $this->cookieSecure   = $config->cookieSecure ?? $this->cookieSecure;
         $this->cookieSameSite = $config->cookieSameSite ?? $this->cookieSameSite;
 
-        /**
-         * @var CookieConfig
-         */
+        /** @var CookieConfig */
         $cookie = config('Cookie');
 
         $this->cookie = new Cookie($this->sessionCookieName, '', [
@@ -413,10 +409,6 @@ protected function initVars()
         }
     }
 
-    //--------------------------------------------------------------------
-    // Session Utility Methods
-    //--------------------------------------------------------------------
-
     /**
      * Regenerates the session ID.
      *
@@ -440,10 +432,6 @@ public function destroy()
         session_destroy();
     }
 
-    //--------------------------------------------------------------------
-    // Basic Setters and Getters
-    //--------------------------------------------------------------------
-
     /**
      * Sets user data into the session.
      *
@@ -612,10 +600,6 @@ public function __isset(string $key): bool
         return isset($_SESSION[$key]) || ($key === 'session_id');
     }
 
-    //--------------------------------------------------------------------
-    // Flash Data Methods
-    //--------------------------------------------------------------------
-
     /**
      * Sets data into the session that will only last for a single request.
      * Perfect for use with single-use status update messages.
@@ -753,10 +737,6 @@ public function getFlashKeys(): array
         return $keys;
     }
 
-    //--------------------------------------------------------------------
-    // Temp Data Methods
-    //--------------------------------------------------------------------
-
     /**
      * Sets new data into the session, and marks it as temporary data
      * with a set lifespan.
diff --git a/system/Session/SessionInterface.php b/system/Session/SessionInterface.php
index 5dc558963d6e..090528ae00ea 100644
--- a/system/Session/SessionInterface.php
+++ b/system/Session/SessionInterface.php
@@ -23,15 +23,11 @@ interface SessionInterface
      */
     public function regenerate(bool $destroy = false);
 
-    //--------------------------------------------------------------------
-
     /**
      * Destroys the current session.
      */
     public function destroy();
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets user data into the session.
      *
@@ -46,8 +42,6 @@ public function destroy();
      */
     public function set($data, $value = null);
 
-    //--------------------------------------------------------------------
-
     /**
      * Get user data that has been set in the session.
      *
@@ -63,8 +57,6 @@ public function set($data, $value = null);
      */
     public function get(?string $key = null);
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns whether an index exists in the session array.
      *
@@ -74,8 +66,6 @@ public function get(?string $key = null);
      */
     public function has(string $key): bool;
 
-    //--------------------------------------------------------------------
-
     /**
      * Remove one or more session properties.
      *
@@ -87,8 +77,6 @@ public function has(string $key): bool;
      */
     public function remove($key);
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets data into the session that will only last for a single request.
      * Perfect for use with single-use status update messages.
@@ -103,8 +91,6 @@ public function remove($key);
      */
     public function setFlashdata($data, $value = null);
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieve one or more items of flash data from the session.
      *
@@ -117,8 +103,6 @@ public function setFlashdata($data, $value = null);
      */
     public function getFlashdata(?string $key = null);
 
-    //--------------------------------------------------------------------
-
     /**
      * Keeps a single piece of flash data alive for one more request.
      *
@@ -126,8 +110,6 @@ public function getFlashdata(?string $key = null);
      */
     public function keepFlashdata($key);
 
-    //--------------------------------------------------------------------
-
     /**
      * Mark a session property or properties as flashdata.
      *
@@ -137,8 +119,6 @@ public function keepFlashdata($key);
      */
     public function markAsFlashdata($key);
 
-    //--------------------------------------------------------------------
-
     /**
      * Unmark data in the session as flashdata.
      *
@@ -146,8 +126,6 @@ public function markAsFlashdata($key);
      */
     public function unmarkFlashdata($key);
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieve all of the keys for session data marked as flashdata.
      *
@@ -155,8 +133,6 @@ public function unmarkFlashdata($key);
      */
     public function getFlashKeys(): array;
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets new data into the session, and marks it as temporary data
      * with a set lifespan.
@@ -167,8 +143,6 @@ public function getFlashKeys(): array;
      */
     public function setTempdata($data, $value = null, int $ttl = 300);
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns either a single piece of tempdata, or all temp data currently
      * in the session.
@@ -179,8 +153,6 @@ public function setTempdata($data, $value = null, int $ttl = 300);
      */
     public function getTempdata(?string $key = null);
 
-    //--------------------------------------------------------------------
-
     /**
      * Removes a single piece of temporary data from the session.
      *
@@ -188,8 +160,6 @@ public function getTempdata(?string $key = null);
      */
     public function removeTempdata(string $key);
 
-    //--------------------------------------------------------------------
-
     /**
      * Mark one of more pieces of data as being temporary, meaning that
      * it has a set lifespan within the session.
@@ -201,8 +171,6 @@ public function removeTempdata(string $key);
      */
     public function markAsTempdata($key, int $ttl = 300);
 
-    //--------------------------------------------------------------------
-
     /**
      * Unmarks temporary data in the session, effectively removing its
      * lifespan and allowing it to live as long as the session does.
@@ -211,14 +179,10 @@ public function markAsTempdata($key, int $ttl = 300);
      */
     public function unmarkTempdata($key);
 
-    //--------------------------------------------------------------------
-
     /**
      * Retrieve the keys of all session data that have been marked as temporary data.
      *
      * @return array
      */
     public function getTempKeys(): array;
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Test/DOMParser.php b/system/Test/DOMParser.php
index 87f405d4a733..5826e12f09b1 100644
--- a/system/Test/DOMParser.php
+++ b/system/Test/DOMParser.php
@@ -211,8 +211,6 @@ public function seeCheckboxIsChecked(string $element): bool
         return (bool) $result->length;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Search the DOM using an XPath expression.
      *
diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
index d848a64b9ca5..420288cb1296 100644
--- a/system/Test/Fabricator.php
+++ b/system/Test/Fabricator.php
@@ -89,8 +89,6 @@ class Fabricator
      */
     public $defaultFormatter = 'word';
 
-    //--------------------------------------------------------------------
-
     /**
      * Store the model instance and initialize Faker to the locale.
      *
@@ -135,8 +133,6 @@ public function __construct($model, ?array $formatters = null, ?string $locale =
         $this->setFormatters($formatters);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Reset internal counts
      */
@@ -196,8 +192,6 @@ public static function downCount(string $table): int
         return self::setCount($table, self::getCount($table) - 1);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the model instance
      *
@@ -228,8 +222,6 @@ public function getFaker(): Generator
         return $this->faker;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Return and reset tempOverrides
      *
@@ -263,8 +255,6 @@ public function setOverrides(array $overrides = [], $persist = true): self
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the current formatters
      *
@@ -360,8 +350,6 @@ protected function guessFormatter($field): string
         return $this->defaultFormatter;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generate new entities with faked data
      *
@@ -473,8 +461,6 @@ public function makeObject(?string $className = null): object
         return $object;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generate new entities from the database
      *
diff --git a/system/Test/Mock/MockCURLRequest.php b/system/Test/Mock/MockCURLRequest.php
index 73b20caea488..e4058d559b81 100644
--- a/system/Test/Mock/MockCURLRequest.php
+++ b/system/Test/Mock/MockCURLRequest.php
@@ -26,8 +26,6 @@ class MockCURLRequest extends CURLRequest
 
     protected $output = '';
 
-    //--------------------------------------------------------------------
-
     public function setOutput($output)
     {
         $this->output = $output;
@@ -35,8 +33,6 @@ public function setOutput($output)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     protected function sendRequest(array $curlOptions = []): string
     {
         // Save so we can access later.
@@ -45,7 +41,6 @@ protected function sendRequest(array $curlOptions = []): string
         return $this->output;
     }
 
-    //--------------------------------------------------------------------
     // for testing purposes only
     public function getBaseURI()
     {
diff --git a/system/Test/Mock/MockCache.php b/system/Test/Mock/MockCache.php
index 1ba580eb6d95..7a8e0475369a 100644
--- a/system/Test/Mock/MockCache.php
+++ b/system/Test/Mock/MockCache.php
@@ -31,8 +31,6 @@ class MockCache extends BaseHandler implements CacheInterface
      */
     protected $expirations = [];
 
-    //--------------------------------------------------------------------
-
     /**
      * Takes care of any handler-specific setup that must be done.
      */
@@ -40,8 +38,6 @@ public function initialize()
     {
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Attempts to fetch an item from the cache store.
      *
@@ -56,8 +52,6 @@ public function get(string $key)
         return $this->cache[$key] ?? null;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Get an item from the cache, or execute the given Closure and store the result.
      *
@@ -80,8 +74,6 @@ public function remember(string $key, int $ttl, Closure $callback)
         return $value;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Saves an item to the cache store.
      *
@@ -105,8 +97,6 @@ public function save(string $key, $value, int $ttl = 60, bool $raw = false)
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Deletes a specific item from the cache store.
      *
@@ -127,8 +117,6 @@ public function delete(string $key)
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Deletes items from the cache store matching a given pattern.
      *
@@ -150,8 +138,6 @@ public function deleteMatching(string $pattern)
         return $count;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Performs atomic incrementation of a raw stored value.
      *
@@ -174,8 +160,6 @@ public function increment(string $key, int $offset = 1)
         return $this->save($key, $data + $offset);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Performs atomic decrementation of a raw stored value.
      *
@@ -199,8 +183,6 @@ public function decrement(string $key, int $offset = 1)
         return $this->save($key, $data - $offset);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Will delete all items in the entire cache.
      *
@@ -214,8 +196,6 @@ public function clean()
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns information on the entire cache.
      *
@@ -229,8 +209,6 @@ public function getCacheInfo()
         return array_keys($this->cache);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns detailed information about the specific item in the cache.
      *
@@ -257,8 +235,6 @@ public function getMetaData(string $key)
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Determines if the driver is supported on this system.
      *
@@ -268,6 +244,4 @@ public function isSupported(): bool
     {
         return true;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Test/Mock/MockConnection.php b/system/Test/Mock/MockConnection.php
index 955fd03df8bb..c1d9f23ecf6f 100644
--- a/system/Test/Mock/MockConnection.php
+++ b/system/Test/Mock/MockConnection.php
@@ -24,8 +24,6 @@ class MockConnection extends BaseConnection
 
     public $lastQuery;
 
-    //--------------------------------------------------------------------
-
     public function shouldReturn(string $method, $return)
     {
         $this->returnValues[$method] = $return;
@@ -33,8 +31,6 @@ public function shouldReturn(string $method, $return)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Orchestrates a query against the database. Queries must use
      * Database\Statement objects to store the query and build it.
@@ -90,8 +86,6 @@ public function query(string $sql, $binds = null, bool $setEscapeFlags = true, s
         return new $resultClass($this->connID, $this->resultID);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Connect to the database.
      *
@@ -112,8 +106,6 @@ public function connect(bool $persistent = false)
         return $return;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Keep or establish the connection if no queries have been sent for
      * a length of time exceeding the server's idle timeout.
@@ -125,8 +117,6 @@ public function reconnect(): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Select a specific database table to use.
      *
@@ -141,8 +131,6 @@ public function setDatabase(string $databaseName)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a string containing the version of the database being used.
      *
@@ -153,8 +141,6 @@ public function getVersion(): string
         return CodeIgniter::CI_VERSION;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Executes the query against the database.
      *
@@ -167,8 +153,6 @@ protected function execute(string $sql)
         return $this->returnValues['execute'];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the total number of rows affected by this query.
      *
@@ -179,8 +163,6 @@ public function affectedRows(): int
         return 1;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the last error code and message.
      *
@@ -198,8 +180,6 @@ public function error(): array
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Insert ID
      *
@@ -210,8 +190,6 @@ public function insertID(): int
         return $this->connID->insert_id; // @phpstan-ignore-line
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates the SQL for listing tables in a platform-dependent manner.
      *
@@ -224,8 +202,6 @@ protected function _listTables(bool $constrainByPrefix = false): string
         return '';
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates a platform-specific query string so that the column names can be fetched.
      *
@@ -268,8 +244,6 @@ protected function _foreignKeyData(string $table): array
         return [];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Close the connection.
      */
@@ -277,8 +251,6 @@ protected function _close()
     {
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Begin Transaction
      *
@@ -289,8 +261,6 @@ protected function _transBegin(): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Commit Transaction
      *
@@ -301,8 +271,6 @@ protected function _transCommit(): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Rollback Transaction
      *
@@ -312,6 +280,4 @@ protected function _transRollback(): bool
     {
         return true;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Test/Mock/MockFileLogger.php b/system/Test/Mock/MockFileLogger.php
index 967c89801bf6..4c0d911c4160 100644
--- a/system/Test/Mock/MockFileLogger.php
+++ b/system/Test/Mock/MockFileLogger.php
@@ -25,8 +25,6 @@ class MockFileLogger extends FileHandler
      */
     public $destination;
 
-    //--------------------------------------------------------------------
-
     public function __construct(array $config)
     {
         parent::__construct($config);
diff --git a/system/Test/Mock/MockLanguage.php b/system/Test/Mock/MockLanguage.php
index d6b78a42a20e..b4c01d19f7a2 100644
--- a/system/Test/Mock/MockLanguage.php
+++ b/system/Test/Mock/MockLanguage.php
@@ -23,8 +23,6 @@ class MockLanguage extends Language
      */
     protected $data;
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the data that should be returned by the
      * 'requireFile()' method to allow easy overrides
@@ -43,8 +41,6 @@ public function setData(string $file, array $data, ?string $locale = null)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Provides an override that allows us to set custom
      * data to be returned easily during testing.
@@ -58,8 +54,6 @@ protected function requireFile(string $path): array
         return $this->data ?? [];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Arbitrarily turnoff internationalization support for testing
      */
diff --git a/system/Test/Mock/MockLogger.php b/system/Test/Mock/MockLogger.php
index e5855f6e0042..1b2da7536133 100644
--- a/system/Test/Mock/MockLogger.php
+++ b/system/Test/Mock/MockLogger.php
@@ -80,10 +80,7 @@ class MockLogger
       |
      */
     public $handlers = [
-        //--------------------------------------------------------------------
         // File Handler
-        //--------------------------------------------------------------------
-
         'Tests\Support\Log\Handlers\TestHandler' => [
             // The log levels that this handler will handle.
             'handles' => [
diff --git a/system/Test/Mock/MockResult.php b/system/Test/Mock/MockResult.php
index 0a8ec78d9c7f..6e132b03fab9 100644
--- a/system/Test/Mock/MockResult.php
+++ b/system/Test/Mock/MockResult.php
@@ -25,8 +25,6 @@ public function getFieldCount(): int
         return 0;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates an array of column names in the result set.
      *
@@ -37,8 +35,6 @@ public function getFieldNames(): array
         return [];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Generates an array of objects representing field meta-data.
      *
@@ -49,8 +45,6 @@ public function getFieldData(): array
         return [];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Frees the current result.
      *
@@ -60,8 +54,6 @@ public function freeResult()
     {
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Moves the internal pointer to the desired offset. This is called
      * internally before fetching results to make sure the result set
@@ -75,8 +67,6 @@ public function dataSeek($n = 0)
     {
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the result set as an array.
      *
@@ -88,8 +78,6 @@ protected function fetchAssoc()
     {
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the result set as an object.
      *
@@ -104,8 +92,6 @@ protected function fetchObject($className = 'stdClass')
         return new $className();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Gets the number of fields in the result set.
      *
@@ -115,6 +101,4 @@ public function getNumRows(): int
     {
         return 0;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Test/Mock/MockServices.php b/system/Test/Mock/MockServices.php
index 7880dd6f3bdc..6f9cdd1066d3 100644
--- a/system/Test/Mock/MockServices.php
+++ b/system/Test/Mock/MockServices.php
@@ -22,15 +22,12 @@ class MockServices extends BaseService
 
     public $classmap = [];
 
-    //--------------------------------------------------------------------
-
     public function __construct()
     {
         // Don't call the parent since we don't want the default mappings.
         // parent::__construct();
     }
 
-    //--------------------------------------------------------------------
     public static function locator(bool $getShared = true)
     {
         return new FileLocator(static::autoloader());
diff --git a/system/Test/TestLogger.php b/system/Test/TestLogger.php
index f8b1d203d442..aeb8ba2fdb4e 100644
--- a/system/Test/TestLogger.php
+++ b/system/Test/TestLogger.php
@@ -17,8 +17,6 @@ class TestLogger extends Logger
 {
     protected static $op_logs = [];
 
-    //--------------------------------------------------------------------
-
     /**
      * The log method is overridden so that we can store log history during
      * the tests to allow us to check ->assertLogged() methods.
@@ -57,8 +55,6 @@ public function log($level, $message, array $context = []): bool
         return parent::log($level, $message, $context);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Used by CIUnitTestCase class to provide ->assertLogged() methods.
      *
@@ -78,7 +74,6 @@ public static function didLog(string $level, $message)
         return false;
     }
 
-    //--------------------------------------------------------------------
     // Expose cleanFileNames()
     public function cleanup($file)
     {
diff --git a/system/Throttle/Throttler.php b/system/Throttle/Throttler.php
index 5310edb9e728..ae50d77c8b72 100644
--- a/system/Throttle/Throttler.php
+++ b/system/Throttle/Throttler.php
@@ -56,8 +56,6 @@ class Throttler implements ThrottlerInterface
      */
     protected $testTime;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      *
@@ -68,8 +66,6 @@ public function __construct(CacheInterface $cache)
         $this->cache = $cache;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the number of seconds until the next available token will
      * be released for usage.
@@ -81,8 +77,6 @@ public function getTokenTime(): int
         return $this->tokenTime;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Restricts the number of requests made by a single IP address within
      * a set number of seconds.
@@ -164,8 +158,6 @@ public function remove(string $key): self
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Used during testing to set the current timestamp to use.
      *
@@ -180,8 +172,6 @@ public function setTestTime(int $time)
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Return the test time, defaulting to current.
      *
diff --git a/system/Throttle/ThrottlerInterface.php b/system/Throttle/ThrottlerInterface.php
index 6c22f45e17b4..a94b3d5564a5 100644
--- a/system/Throttle/ThrottlerInterface.php
+++ b/system/Throttle/ThrottlerInterface.php
@@ -36,8 +36,6 @@ interface ThrottlerInterface
      */
     public function check(string $key, int $capacity, int $seconds, int $cost);
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the number of seconds until the next available token will
      * be released for usage.
diff --git a/system/Typography/Typography.php b/system/Typography/Typography.php
index ca56634b5c34..1a23d0d007b8 100644
--- a/system/Typography/Typography.php
+++ b/system/Typography/Typography.php
@@ -222,8 +222,6 @@ public function autoTypography(string $str, bool $reduceLinebreaks = false): str
         return preg_replace(array_keys($table), $table, $str);
     }
 
-    // --------------------------------------------------------------------
-
     /**
      * Format Characters
      *
@@ -281,8 +279,6 @@ public function formatCharacters(string $str): string
         return preg_replace(array_keys($table), $table, $str);
     }
 
-    // --------------------------------------------------------------------
-
     /**
      * Format Newlines
      *
@@ -317,8 +313,6 @@ protected function formatNewLines(string $str): string
         return preg_replace('/<p><\/p>(.*)/', '\\1', $str, 1);
     }
 
-    // ------------------------------------------------------------------------
-
     /**
      * Protect Characters
      *
@@ -336,8 +330,6 @@ protected function protectCharacters(array $match): string
         return str_replace(["'", '"', '--', '  '], ['{@SQ}', '{@DQ}', '{@DD}', '{@NBS}'], $match[0]);
     }
 
-    // --------------------------------------------------------------------
-
     /**
      * Convert newlines to HTML line breaks except within PRE tags
      *
diff --git a/system/Validation/CreditCardRules.php b/system/Validation/CreditCardRules.php
index 03a39f26f75e..e407a9c632ff 100644
--- a/system/Validation/CreditCardRules.php
+++ b/system/Validation/CreditCardRules.php
@@ -160,8 +160,6 @@ class CreditCardRules
         ],
     ];
 
-    //--------------------------------------------------------------------
-
     /**
      * Verifies that a credit card number is valid and matches the known
      * formats for a wide number of credit card types. This does not verify
@@ -241,8 +239,6 @@ public function valid_cc_number(?string $ccNumber, string $type): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks the given number to see if the number passing a Luhn check.
      *
@@ -290,6 +286,4 @@ protected function isValidLuhn(?string $number = null): bool
 
         return $sum % 10 === 0;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Validation/FileRules.php b/system/Validation/FileRules.php
index e66e8ccadf36..e6caf6e6c560 100644
--- a/system/Validation/FileRules.php
+++ b/system/Validation/FileRules.php
@@ -27,8 +27,6 @@ class FileRules
      */
     protected $request;
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor.
      *
@@ -43,8 +41,6 @@ public function __construct(?RequestInterface $request = null)
         $this->request = $request;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Verifies that $name is the name of a valid uploaded file.
      *
@@ -81,8 +77,6 @@ public function uploaded(?string $blank, string $name): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Verifies if the file's size in Kilobytes is no larger than the parameter.
      *
@@ -123,8 +117,6 @@ public function max_size(?string $blank, string $params): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Uses the mime config file to determine if a file is considered an "image",
      * which for our purposes basically means that it's a raster image or svg.
@@ -166,8 +158,6 @@ public function is_image(?string $blank, string $params): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks to see if an uploaded file's mime type matches one in the parameter.
      *
@@ -204,8 +194,6 @@ public function mime_in(?string $blank, string $params): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks to see if an uploaded file's extension matches one in the parameter.
      *
@@ -242,8 +230,6 @@ public function ext_in(?string $blank, string $params): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks an uploaded file to verify that the dimensions are within
      * a specified allowable dimension.
@@ -289,6 +275,4 @@ public function max_dims(?string $blank, string $params): bool
 
         return true;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
index 7273f247fbbe..426b4e1e60ae 100644
--- a/system/Validation/Rules.php
+++ b/system/Validation/Rules.php
@@ -19,8 +19,6 @@
  */
 class Rules
 {
-    //--------------------------------------------------------------------
-
     /**
      * The value does not match another field in $data.
      *
@@ -39,8 +37,6 @@ public function differs(?string $str, string $field, array $data): bool
         return array_key_exists($field, $data) && $str !== $data[$field];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Equals the static value provided.
      *
@@ -54,8 +50,6 @@ public function equals(?string $str, string $val): bool
         return $str === $val;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns true if $str is $val characters long.
      * $val = "5" (one) | "5,8,12" (multiple values)
@@ -78,8 +72,6 @@ public function exact_length(?string $str, string $val): bool
         return false;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Greater than
      *
@@ -93,8 +85,6 @@ public function greater_than(?string $str, string $min): bool
         return is_numeric($str) && $str > $min;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Equal to or Greater than
      *
@@ -108,8 +98,6 @@ public function greater_than_equal_to(?string $str, string $min): bool
         return is_numeric($str) && $str >= $min;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks the database to see if the given value exist.
      * Can ignore records by field/value to filter (currently
@@ -147,8 +135,6 @@ public function is_not_unique(?string $str, string $field, array $data): bool
         return (bool) ($row->get()->getRow() !== null);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Value should be within an array of values
      *
@@ -164,8 +150,6 @@ public function in_list(?string $value, string $list): bool
         return in_array($value, $list, true);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks the database to see if the given value is unique. Can
      * ignore a single record by field/value to make it useful during
@@ -203,8 +187,6 @@ public function is_unique(?string $str, string $field, array $data): bool
         return (bool) ($row->get()->getRow() === null);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Less than
      *
@@ -218,8 +200,6 @@ public function less_than(?string $str, string $max): bool
         return is_numeric($str) && $str < $max;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Equal to or Less than
      *
@@ -233,8 +213,6 @@ public function less_than_equal_to(?string $str, string $max): bool
         return is_numeric($str) && $str <= $max;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Matches the value of another field in $data.
      *
@@ -253,8 +231,6 @@ public function matches(?string $str, string $field, array $data): bool
         return array_key_exists($field, $data) && $str === $data[$field];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns true if $str is $val or fewer characters in length.
      *
@@ -268,8 +244,6 @@ public function max_length(?string $str, string $val): bool
         return is_numeric($val) && $val >= mb_strlen($str);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns true if $str is at least $val length.
      *
@@ -283,8 +257,6 @@ public function min_length(?string $str, string $val): bool
         return is_numeric($val) && $val <= mb_strlen($str);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Does not equal the static value provided.
      *
@@ -298,8 +270,6 @@ public function not_equals(?string $str, string $val): bool
         return $str !== $val;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Value should not be within an array of values.
      *
@@ -313,8 +283,6 @@ public function not_in_list(?string $value, string $list): bool
         return ! $this->in_list($value, $list);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Required
      *
@@ -331,8 +299,6 @@ public function required($str = null): bool
         return is_array($str) ? ! empty($str) : (trim($str) !== '');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The field is required when any of the other required fields are present
      * in the data.
@@ -378,8 +344,6 @@ public function required_with($str = null, ?string $fields = null, array $data =
         return empty($requiredFields);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * The field is required when all of the other fields are present
      * in the data but not required.
@@ -421,6 +385,4 @@ public function required_without($str = null, ?string $fields = null, array $dat
 
         return true;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/Validation/ValidationInterface.php b/system/Validation/ValidationInterface.php
index fd590ccba906..451819906b9a 100644
--- a/system/Validation/ValidationInterface.php
+++ b/system/Validation/ValidationInterface.php
@@ -29,8 +29,6 @@ interface ValidationInterface
      */
     public function run(?array $data = null, ?string $group = null): bool;
 
-    //--------------------------------------------------------------------
-
     /**
      * Check; runs the validation process, returning true or false
      * determining whether or not validation was successful.
@@ -43,8 +41,6 @@ public function run(?array $data = null, ?string $group = null): bool;
      */
     public function check($value, string $rule, array $errors = []): bool;
 
-    //--------------------------------------------------------------------
-
     /**
      * Takes a Request object and grabs the input data to use from its
      * array values.
@@ -55,10 +51,6 @@ public function check($value, string $rule, array $errors = []): bool;
      */
     public function withRequest(RequestInterface $request): ValidationInterface;
 
-    //--------------------------------------------------------------------
-    // Rules
-    //--------------------------------------------------------------------
-
     /**
      * Stores the rules that should be used to validate the items.
      *
@@ -69,8 +61,6 @@ public function withRequest(RequestInterface $request): ValidationInterface;
      */
     public function setRules(array $rules, array $messages = []): ValidationInterface;
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks to see if the rule for key $field has been set or not.
      *
@@ -80,11 +70,6 @@ public function setRules(array $rules, array $messages = []): ValidationInterfac
      */
     public function hasRule(string $field): bool;
 
-    //--------------------------------------------------------------------
-    //--------------------------------------------------------------------
-    // Errors
-    //--------------------------------------------------------------------
-
     /**
      * Returns the error for a specified $field (or empty string if not set).
      *
@@ -94,8 +79,6 @@ public function hasRule(string $field): bool;
      */
     public function getError(string $field): string;
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the array of errors that were encountered during
      * a run() call. The array should be in the following format:
@@ -109,8 +92,6 @@ public function getError(string $field): string;
      */
     public function getErrors(): array;
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets the error for a specific field. Used by custom validation methods.
      *
@@ -121,10 +102,6 @@ public function getErrors(): array;
      */
     public function setError(string $alias, string $error): ValidationInterface;
 
-    //--------------------------------------------------------------------
-    // Misc
-    //--------------------------------------------------------------------
-
     /**
      * Resets the class to a blank slate. Should be called whenever
      * you need to process more than one array.
@@ -132,6 +109,4 @@ public function setError(string $alias, string $error): ValidationInterface;
      * @return ValidationInterface
      */
     public function reset(): ValidationInterface;
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/View/Cell.php b/system/View/Cell.php
index 65ecc3403b09..19de7567eb48 100644
--- a/system/View/Cell.php
+++ b/system/View/Cell.php
@@ -51,8 +51,6 @@ class Cell
      */
     protected $cache;
 
-    //--------------------------------------------------------------------
-
     /**
      * Cell constructor.
      *
@@ -63,8 +61,6 @@ public function __construct(CacheInterface $cache)
         $this->cache = $cache;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Render a cell, returning its body as a string.
      *
@@ -147,8 +143,6 @@ public function render(string $library, $params = null, int $ttl = 0, ?string $c
         return $output;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Parses the params attribute. If an array, returns untouched.
      * If a string, it should be in the format "key1=value key2=value".
@@ -194,8 +188,6 @@ public function prepareParams($params)
         return $params;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Given the library string, attempts to determine the class and method
      * to call.
@@ -229,6 +221,4 @@ protected function determineClass(string $library): array
             $method,
         ];
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/View/Filters.php b/system/View/Filters.php
index 8cca244e831d..03f13560f2ef 100644
--- a/system/View/Filters.php
+++ b/system/View/Filters.php
@@ -31,8 +31,6 @@ public static function capitalize(string $value): string
         return ucfirst(strtolower($value));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Formats a date into the given $format.
      *
@@ -50,8 +48,6 @@ public static function date($value, string $format): string
         return date($format, $value);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Given a string or DateTime object, will return the date modified
      * by the given value. Returns the value as a unix timestamp
@@ -71,8 +67,6 @@ public static function date_modify($value, string $adjustment)
         return strtotime($adjustment, strtotime($value));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the given default value if $value is empty or undefined.
      *
@@ -88,8 +82,6 @@ public static function default($value, string $default): string
             : $value;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Escapes the given value with our `esc()` helper function.
      *
@@ -103,8 +95,6 @@ public static function esc($value, string $context = 'html'): string
         return esc($value, $context);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns an excerpt of the given string.
      *
@@ -121,8 +111,6 @@ public static function excerpt(string $value, string $phrase, int $radius = 100)
         return excerpt($value, $phrase, $radius);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Highlights a given phrase within the text using '<mark></mark>' tags.
      *
@@ -138,8 +126,6 @@ public static function highlight(string $value, string $phrase): string
         return highlight_phrase($value, $phrase);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Highlights code samples with HTML/CSS.
      *
@@ -154,8 +140,6 @@ public static function highlight_code($value): string
         return highlight_code($value);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Limits the number of characters to $limit, and trails of with an ellipsis.
      * Will break at word break so may be more or less than $limit.
@@ -172,8 +156,6 @@ public static function limit_chars($value, int $limit = 500): string
         return character_limiter($value, $limit);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Limits the number of words to $limit, and trails of with an ellipsis.
      *
@@ -189,8 +171,6 @@ public static function limit_words($value, int $limit = 100): string
         return word_limiter($value, $limit);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the $value displayed in a localized manner.
      *
@@ -218,8 +198,6 @@ public static function local_number($value, string $type = 'decimal', int $preci
         return format_number($value, $precision, $locale, ['type' => $types[$type]]);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns the $value displayed as a currency string.
      *
@@ -258,8 +236,6 @@ public static function nl2br(string $value): string
         return $typography->nl2brExceptPre($value);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Takes a body of text and uses the auto_typography() method to
      * turn it into prettier, easier-to-read, prose.
@@ -275,8 +251,6 @@ public static function prose(string $value): string
         return $typography->autoTypography($value);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Rounds a given $value in one of 3 ways;
      *
@@ -312,8 +286,6 @@ public static function round(string $value, $precision = 2, string $type = 'comm
         return $value;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a "title case" version of the string.
      *
@@ -325,6 +297,4 @@ public static function title(string $value): string
     {
         return ucwords(strtolower($value));
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/View/Parser.php b/system/View/Parser.php
index e792b9f13626..f00da2b79a2c 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -57,8 +57,6 @@ class Parser extends View
      */
     protected $dataContexts = [];
 
-    //--------------------------------------------------------------------
-
     /**
      * Constructor
      *
@@ -76,8 +74,6 @@ public function __construct(ViewConfig $config, ?string $viewPath = null, $loade
         parent::__construct($config, $viewPath, $loader, $debug, $logger);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Parse a template
      *
@@ -141,8 +137,6 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
         return $output;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Parse a String
      *
@@ -179,8 +173,6 @@ public function renderString(string $template, ?array $options = null, ?bool $sa
         return $output;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets several pieces of view data at once.
      * In the Parser, we need to store the context here
@@ -215,8 +207,6 @@ public function setData(array $data = [], ?string $context = null): RendererInte
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Parse a template
      *
@@ -269,8 +259,6 @@ protected function parse(string $template, array $data = [], ?array $options = n
         return $this->insertNoparse($template);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Parse a single key/value, extracting it
      *
@@ -286,8 +274,6 @@ protected function parseSingle(string $key, string $val): array
         return [$pattern => $val];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Parse a tag pair
      *
@@ -381,8 +367,6 @@ protected function parsePair(string $variable, array $data, string $template): a
         return $replace;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Removes any comments from the file. Comments are wrapped in {# #} symbols:
      *
@@ -397,8 +381,6 @@ protected function parseComments(string $template): string
         return preg_replace('/\{#.*?#\}/s', '', $template);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Extracts noparse blocks, inserting a hash in its place so that
      * those blocks of the page are not touched by parsing.
@@ -427,8 +409,6 @@ protected function extractNoparse(string $template): string
         return $template;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Re-inserts the noparsed contents back into the template.
      *
@@ -446,8 +426,6 @@ public function insertNoparse(string $template): string
         return $template;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Parses any conditionals in the code, removing blocks that don't
      * pass so we don't try to parse it later.
@@ -505,8 +483,6 @@ protected function parseConditionals(string $template): string
         return ob_get_clean();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Over-ride the substitution field delimiters.
      *
@@ -523,8 +499,6 @@ public function setDelimiters($leftDelimiter = '{', $rightDelimiter = '}'): Rend
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Handles replacing a pseudo-variable with the actual content. Will double-check
      * for escaping brackets.
@@ -559,8 +533,6 @@ protected function replaceSingle($pattern, $content, $template, bool $escape = f
         }, (string) $template);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Callback used during parse() to apply any filters to the value.
      *
@@ -585,8 +557,6 @@ protected function prepareReplacement(array $matches, string $replace, bool $esc
         return $this->applyFilters($replace, $filters);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Checks the placeholder the view provided to see if we need to provide any autoescaping.
      *
@@ -623,8 +593,6 @@ public function shouldAddEscaping(string $key)
         return $escape;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Given a set of filters, will apply each of the filters in turn
      * to $replace, and return the modified string.
@@ -670,9 +638,7 @@ protected function applyFilters(string $replace, array $filters): string
         return $replace;
     }
 
-    //--------------------------------------------------------------------
     // Plugins
-    //--------------------------------------------------------------------
 
     /**
      * Scans the template for any parser plugins, and attempts to execute them.
@@ -746,8 +712,6 @@ public function addPlugin(string $alias, callable $callback, bool $isPair = fals
         return $this;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Removes a plugin from the available plugins.
      *
@@ -784,6 +748,4 @@ protected function objectToArray($value)
 
         return $value;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/system/View/Plugins.php b/system/View/Plugins.php
index 4f4ab74da82b..c7f66627bd48 100644
--- a/system/View/Plugins.php
+++ b/system/View/Plugins.php
@@ -29,8 +29,6 @@ public static function currentURL()
         return current_url();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Wrap helper function to use as view plugin.
      *
@@ -41,8 +39,6 @@ public static function previousURL()
         return previous_url();
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Wrap helper function to use as view plugin.
      *
@@ -59,8 +55,6 @@ public static function mailto(array $params = []): string
         return mailto($email, $title, $attrs);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Wrap helper function to use as view plugin.
      *
@@ -77,8 +71,6 @@ public static function safeMailto(array $params = []): string
         return safe_mailto($email, $title, $attrs);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Wrap helper function to use as view plugin.
      *
@@ -93,8 +85,6 @@ public static function lang(array $params = []): string
         return lang($line, $params);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Wrap helper function to use as view plugin.
      *
@@ -112,8 +102,6 @@ public static function ValidationErrors(array $params = []): string
         return $validator->showError($params['field']);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Wrap helper function to use as view plugin.
      *
@@ -126,8 +114,6 @@ public static function route(array $params = [])
         return route_to(...$params);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Wrap helper function to use as view plugin.
      *
diff --git a/system/View/RendererInterface.php b/system/View/RendererInterface.php
index f2419949b02a..cf9c0fa43a41 100644
--- a/system/View/RendererInterface.php
+++ b/system/View/RendererInterface.php
@@ -32,8 +32,6 @@ interface RendererInterface
      */
     public function render(string $view, ?array $options = null, bool $saveData = false): string;
 
-    //--------------------------------------------------------------------
-
     /**
      * Builds the output based upon a string and any
      * data that has already been set.
@@ -48,8 +46,6 @@ public function render(string $view, ?array $options = null, bool $saveData = fa
      */
     public function renderString(string $view, ?array $options = null, bool $saveData = false): string;
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets several pieces of view data at once.
      *
@@ -61,8 +57,6 @@ public function renderString(string $view, ?array $options = null, bool $saveDat
      */
     public function setData(array $data = [], ?string $context = null);
 
-    //--------------------------------------------------------------------
-
     /**
      * Sets a single piece of view data.
      *
@@ -75,14 +69,10 @@ public function setData(array $data = [], ?string $context = null);
      */
     public function setVar(string $name, $value = null, ?string $context = null);
 
-    //--------------------------------------------------------------------
-
     /**
      * Removes all of the view data from the system.
      *
      * @return RendererInterface
      */
     public function resetData();
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/_support/Autoloader/FatalLocator.php b/tests/_support/Autoloader/FatalLocator.php
index f2096f21619e..702aa8880249 100644
--- a/tests/_support/Autoloader/FatalLocator.php
+++ b/tests/_support/Autoloader/FatalLocator.php
@@ -30,8 +30,6 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
         throw new RuntimeException("locateFile({$file}, {$folder}, {$ext})");
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Searches through all of the defined namespaces looking for a file.
      * Returns an array of all found locations for the defined file.
diff --git a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
index 7fdfbb0c3c34..ce16e513c3f5 100644
--- a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
+++ b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
@@ -120,8 +120,6 @@ public function up()
         ])->createTable('ip_table', true);
     }
 
-    //--------------------------------------------------------------------
-
     public function down()
     {
         $this->forge->dropTable('user', true);
diff --git a/tests/_support/Language/SecondMockLanguage.php b/tests/_support/Language/SecondMockLanguage.php
index 07d09b4bc1fc..e001a1ae8abb 100644
--- a/tests/_support/Language/SecondMockLanguage.php
+++ b/tests/_support/Language/SecondMockLanguage.php
@@ -6,8 +6,6 @@
 
 class SecondMockLanguage extends Language
 {
-    //--------------------------------------------------------------------
-
     /**
      * Expose the protected *load* method
      */
@@ -16,8 +14,6 @@ public function loadem(string $file, string $locale = 'en', bool $return = false
         return $this->load($file, $locale, $return);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Expose the loaded language files
      */
diff --git a/tests/_support/Log/Handlers/TestHandler.php b/tests/_support/Log/Handlers/TestHandler.php
index 3559856059e5..b0b755fd3552 100644
--- a/tests/_support/Log/Handlers/TestHandler.php
+++ b/tests/_support/Log/Handlers/TestHandler.php
@@ -20,8 +20,6 @@ class TestHandler extends \CodeIgniter\Log\Handlers\FileHandler
     /**
      * Where would the log be written?
      */
-    //--------------------------------------------------------------------
-
     public function __construct(array $config)
     {
         parent::__construct($config);
@@ -31,8 +29,6 @@ public function __construct(array $config)
         self::$logs = [];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Handles logging the message.
      * If the handler returns false, then execution of handlers
@@ -53,12 +49,8 @@ public function handle($level, $message): bool
         return true;
     }
 
-    //--------------------------------------------------------------------
-
     public static function getLogs()
     {
         return self::$logs;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/_support/Services.php b/tests/_support/Services.php
index 87117950aa0d..6ca27438b1f2 100644
--- a/tests/_support/Services.php
+++ b/tests/_support/Services.php
@@ -17,8 +17,6 @@ class Services
      */
     protected static $mocks = [];
 
-    //--------------------------------------------------------------------
-
     /**
      * Reset shared instances and mocks for testing.
      */
@@ -29,8 +27,6 @@ public static function reset()
         CIUnitTestCase::setPrivateProperty(ConfigServices::class, 'instances', []);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Inject mock object for testing.
      *
@@ -43,8 +39,6 @@ public static function injectMock(string $name, $mock)
         static::$mocks[$name] = $mock;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Returns a service
      *
@@ -64,6 +58,4 @@ public static function __callStatic(string $name, array $arguments)
             return ConfigServices::$name(...$arguments);
         }
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/_support/Validation/TestRules.php b/tests/_support/Validation/TestRules.php
index ce0d273b20db..8facdbe8ced8 100644
--- a/tests/_support/Validation/TestRules.php
+++ b/tests/_support/Validation/TestRules.php
@@ -10,6 +10,4 @@ public function customError(string $str, ?string &$error = null)
 
         return false;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/_support/View/SampleClass.php b/tests/_support/View/SampleClass.php
index 08bdb1da0760..2dad61095602 100644
--- a/tests/_support/View/SampleClass.php
+++ b/tests/_support/View/SampleClass.php
@@ -20,8 +20,6 @@ public function hello()
         return 'Hello';
     }
 
-    //--------------------------------------------------------------------
-
     public function echobox($params)
     {
         if (is_array($params)) {
@@ -31,8 +29,6 @@ public function echobox($params)
         return $params;
     }
 
-    //--------------------------------------------------------------------
-
     public static function staticEcho($params)
     {
         if (is_array($params)) {
@@ -42,8 +38,6 @@ public static function staticEcho($params)
         return $params;
     }
 
-    //--------------------------------------------------------------------
-
     public function work($p1, $p2, $p4)
     {
         return 'Right on';
diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php
index 575ea8f14c3b..96eb9f098fff 100644
--- a/tests/system/Autoloader/AutoloaderTest.php
+++ b/tests/system/Autoloader/AutoloaderTest.php
@@ -61,10 +61,6 @@ public function testInitializeWithInvalidArguments()
         (new Autoloader())->initialize($config, $modules);
     }
 
-    //--------------------------------------------------------------------
-    // PSR4 Namespacing
-    //--------------------------------------------------------------------
-
     public function testServiceAutoLoaderFromShareInstances()
     {
         $autoloader = Services::autoloader();
@@ -180,8 +176,6 @@ public function testloadClassNonNamespaced()
         $this->assertFalse($this->loader->loadClass('Modules'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSanitizationSimply()
     {
         $test     = '${../path}!#/to/some/file.php_';
diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php
index d61b0aaa7a1b..00274b98034b 100644
--- a/tests/system/Autoloader/FileLocatorTest.php
+++ b/tests/system/Autoloader/FileLocatorTest.php
@@ -16,8 +16,6 @@ final class FileLocatorTest extends CIUnitTestCase
      */
     protected $locator;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -39,8 +37,6 @@ protected function setUp(): void
         $this->locator = new FileLocator($autoloader);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLocateFileWorksWithLegacyStructure()
     {
         $file = 'Controllers/Home';
@@ -50,8 +46,6 @@ public function testLocateFileWorksWithLegacyStructure()
         $this->assertSame($expected, $this->locator->locateFile($file));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLocateFileWithLegacyStructureNotFound()
     {
         $file = 'Unknown';
@@ -59,8 +53,6 @@ public function testLocateFileWithLegacyStructureNotFound()
         $this->assertFalse($this->locator->locateFile($file));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLocateFileWorksInApplicationDirectory()
     {
         $file = 'welcome_message';
@@ -70,8 +62,6 @@ public function testLocateFileWorksInApplicationDirectory()
         $this->assertSame($expected, $this->locator->locateFile($file, 'Views'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLocateFileWorksInApplicationDirectoryWithoutFolder()
     {
         $file = 'Common';
@@ -81,8 +71,6 @@ public function testLocateFileWorksInApplicationDirectoryWithoutFolder()
         $this->assertSame($expected, $this->locator->locateFile($file));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLocateFileWorksInNestedApplicationDirectory()
     {
         $file = 'Controllers/Home';
@@ -92,8 +80,6 @@ public function testLocateFileWorksInNestedApplicationDirectory()
         $this->assertSame($expected, $this->locator->locateFile($file, 'Controllers'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLocateFileReplacesFolderName()
     {
         $file = '\App\Views/errors/html/error_404.php';
@@ -103,8 +89,6 @@ public function testLocateFileReplacesFolderName()
         $this->assertSame($expected, $this->locator->locateFile($file, 'Views'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLocateFileReplacesFolderNameLegacy()
     {
         $file = 'Views/welcome_message.php';
@@ -114,8 +98,6 @@ public function testLocateFileReplacesFolderNameLegacy()
         $this->assertSame($expected, $this->locator->locateFile($file, 'Views'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLocateFileCanFindNamespacedView()
     {
         $file = '\Errors\error_404';
@@ -125,8 +107,6 @@ public function testLocateFileCanFindNamespacedView()
         $this->assertSame($expected, $this->locator->locateFile($file, 'html'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLocateFileCanFindNestedNamespacedView()
     {
         $file = '\Errors\html/error_404';
@@ -136,8 +116,6 @@ public function testLocateFileCanFindNestedNamespacedView()
         $this->assertSame($expected, $this->locator->locateFile($file, 'html'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLocateFileNotFoundExistingNamespace()
     {
         $file = '\App\Views/unexistence-file.php';
@@ -145,8 +123,6 @@ public function testLocateFileNotFoundExistingNamespace()
         $this->assertFalse($this->locator->locateFile($file, 'Views'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLocateFileNotFoundWithBadNamespace()
     {
         $file = '\Blogger\admin/posts.php';
@@ -154,8 +130,6 @@ public function testLocateFileNotFoundWithBadNamespace()
         $this->assertFalse($this->locator->locateFile($file, 'Views'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSearchSimple()
     {
         $expected = APPPATH . 'Config/App.php';
@@ -165,8 +139,6 @@ public function testSearchSimple()
         $this->assertSame($expected, $foundFiles[0]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSearchWithFileExtension()
     {
         $expected = APPPATH . 'Config/App.php';
@@ -176,8 +148,6 @@ public function testSearchWithFileExtension()
         $this->assertSame($expected, $foundFiles[0]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSearchWithMultipleFilesFound()
     {
         $foundFiles = $this->locator->search('index', 'html');
@@ -189,8 +159,6 @@ public function testSearchWithMultipleFilesFound()
         $this->assertContains($expected, $foundFiles);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSearchForFileNotExist()
     {
         $foundFiles = $this->locator->search('Views/Fake.html');
@@ -198,8 +166,6 @@ public function testSearchForFileNotExist()
         $this->assertArrayNotHasKey(0, $foundFiles);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSearchPrioritizeSystemOverApp()
     {
         $foundFiles = $this->locator->search('Language/en/Validation.php', 'php', false);
@@ -213,15 +179,11 @@ public function testSearchPrioritizeSystemOverApp()
         );
     }
 
-    //--------------------------------------------------------------------
-
     public function testListNamespaceFilesEmptyPrefixAndPath()
     {
         $this->assertEmpty($this->locator->listNamespaceFiles('', ''));
     }
 
-    //--------------------------------------------------------------------
-
     public function testListFilesSimple()
     {
         $files = $this->locator->listFiles('Config/');
@@ -231,8 +193,6 @@ public function testListFilesSimple()
         $this->assertTrue(in_array($expectedWin, $files, true) || in_array($expectedLin, $files, true));
     }
 
-    //--------------------------------------------------------------------
-
     public function testListFilesWithFileAsInput()
     {
         $files = $this->locator->listFiles('Config/App.php');
@@ -240,8 +200,6 @@ public function testListFilesWithFileAsInput()
         $this->assertEmpty($files);
     }
 
-    //--------------------------------------------------------------------
-
     public function testListFilesFromMultipleDir()
     {
         $files = $this->locator->listFiles('Filters/');
@@ -255,8 +213,6 @@ public function testListFilesFromMultipleDir()
         $this->assertTrue(in_array($expectedWin, $files, true) || in_array($expectedLin, $files, true));
     }
 
-    //--------------------------------------------------------------------
-
     public function testListFilesWithPathNotExist()
     {
         $files = $this->locator->listFiles('Fake/');
@@ -264,8 +220,6 @@ public function testListFilesWithPathNotExist()
         $this->assertEmpty($files);
     }
 
-    //--------------------------------------------------------------------
-
     public function testListFilesWithoutPath()
     {
         $files = $this->locator->listFiles('');
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index db1053841ab4..32bc9053996a 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -23,8 +23,6 @@ final class CodeIgniterTest extends CIUnitTestCase
 
     protected $routes;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -44,8 +42,6 @@ protected function tearDown(): void
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testRunEmptyDefaultRoute()
     {
         $_SERVER['argv'] = ['index.php'];
@@ -58,8 +54,6 @@ public function testRunEmptyDefaultRoute()
         $this->assertStringContainsString('Welcome to CodeIgniter', $output);
     }
 
-    //--------------------------------------------------------------------
-
     public function testRunClosureRoute()
     {
         $_SERVER['argv'] = ['index.php', 'pages/about'];
@@ -82,8 +76,6 @@ public function testRunClosureRoute()
         $this->assertStringContainsString('You want to see "about" page.', $output);
     }
 
-    //--------------------------------------------------------------------
-
     public function testRun404Override()
     {
         $_SERVER['argv'] = ['index.php', '/'];
@@ -103,8 +95,6 @@ public function testRun404Override()
         $this->assertStringContainsString('Welcome to CodeIgniter', $output);
     }
 
-    //--------------------------------------------------------------------
-
     public function testRun404OverrideByClosure()
     {
         $_SERVER['argv'] = ['index.php', '/'];
@@ -126,8 +116,6 @@ public function testRun404OverrideByClosure()
         $this->assertStringContainsString('404 Override by Closure.', $output);
     }
 
-    //--------------------------------------------------------------------
-
     public function testControllersCanReturnString()
     {
         $_SERVER['argv'] = ['index.php', 'pages/about'];
@@ -150,8 +138,6 @@ public function testControllersCanReturnString()
         $this->assertStringContainsString('You want to see "about" page.', $output);
     }
 
-    //--------------------------------------------------------------------
-
     public function testControllersCanReturnResponseObject()
     {
         $_SERVER['argv'] = ['index.php', 'pages/about'];
@@ -177,8 +163,6 @@ public function testControllersCanReturnResponseObject()
         $this->assertStringContainsString("You want to see 'about' page.", $output);
     }
 
-    //--------------------------------------------------------------------
-
     public function testResponseConfigEmpty()
     {
         $_SERVER['argv'] = ['index.php', '/'];
@@ -189,8 +173,6 @@ public function testResponseConfigEmpty()
         $this->assertInstanceOf('\CodeIgniter\HTTP\Response', $response);
     }
 
-    //--------------------------------------------------------------------
-
     public function testRoutesIsEmpty()
     {
         $_SERVER['argv'] = ['index.php', '/'];
@@ -236,8 +218,6 @@ public function testIgnoringErrorSuppressedByAt()
         $this->assertStringContainsString('Welcome to CodeIgniter', $output);
     }
 
-    //--------------------------------------------------------------------
-
     public function testRunForceSecure()
     {
         $_SERVER['argv'] = ['index.php', '/'];
diff --git a/tests/system/CommonFunctionsSendTest.php b/tests/system/CommonFunctionsSendTest.php
index 49e1c3616c04..d59253bad3f9 100644
--- a/tests/system/CommonFunctionsSendTest.php
+++ b/tests/system/CommonFunctionsSendTest.php
@@ -16,8 +16,6 @@ protected function setUp(): void
         unset($_ENV['foo'], $_SERVER['foo']);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Make sure cookies are set by RedirectResponse this way
      * See https://github.com/codeigniter4/CodeIgniter4/issues/1393
diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php
index efaed6a69ff3..3e805f4a44e7 100644
--- a/tests/system/Config/DotEnvTest.php
+++ b/tests/system/Config/DotEnvTest.php
@@ -14,8 +14,6 @@ final class DotEnvTest extends CIUnitTestCase
 {
     protected $fixturesFolder;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -37,16 +35,12 @@ protected function tearDown(): void
         $this->root = null;
     }
 
-    //--------------------------------------------------------------------
-
     public function testReturnsFalseIfCannotFindFile()
     {
         $dotenv = new DotEnv($this->fixturesFolder, 'bogus');
         $this->assertFalse($dotenv->load());
     }
 
-    //--------------------------------------------------------------------
-
     public function testLoadsVars()
     {
         $dotenv = new DotEnv($this->fixturesFolder);
@@ -57,8 +51,6 @@ public function testLoadsVars()
         $this->assertSame('', getenv('NULL'));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
@@ -73,8 +65,6 @@ public function testLoadsHex2Bin()
         $this->assertSame('OpenSSL', getenv('encryption.driver'));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
@@ -88,8 +78,6 @@ public function testLoadsBase64()
         $this->assertSame('OpenSSL', getenv('encryption.driver'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLoadsNoneStringFiles()
     {
         $dotenv = new DotEnv($this->fixturesFolder, 2);
@@ -100,8 +88,6 @@ public function testLoadsNoneStringFiles()
         $this->assertSame('', getenv('NULL'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testCommentedLoadsVars()
     {
         $dotenv = new DotEnv($this->fixturesFolder, 'commented.env');
@@ -115,8 +101,6 @@ public function testCommentedLoadsVars()
         $this->assertSame('', getenv('CNULL'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLoadsUnreadableFile()
     {
         $file = 'unreadable.env';
@@ -128,8 +112,6 @@ public function testLoadsUnreadableFile()
         $dotenv->load();
     }
 
-    //--------------------------------------------------------------------
-
     public function testQuotedDotenvLoadsEnvironmentVars()
     {
         $dotenv = new Dotenv($this->fixturesFolder, 'quoted.env');
@@ -142,8 +124,6 @@ public function testQuotedDotenvLoadsEnvironmentVars()
         $this->assertSame('test some escaped characters like a quote (") or maybe a backslash (\\)', getenv('QESCAPED'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSpacedValuesWithoutQuotesThrowsException()
     {
         $this->expectException('InvalidArgumentException');
@@ -153,8 +133,6 @@ public function testSpacedValuesWithoutQuotesThrowsException()
         $dotenv->load();
     }
 
-    //--------------------------------------------------------------------
-
     public function testLoadsServerGlobals()
     {
         $dotenv = new Dotenv($this->fixturesFolder, '.env');
@@ -166,8 +144,6 @@ public function testLoadsServerGlobals()
         $this->assertSame('', $_SERVER['NULL']);
     }
 
-    //--------------------------------------------------------------------
-
     public function testNamespacedVariables()
     {
         $dotenv = new Dotenv($this->fixturesFolder, '.env');
@@ -176,8 +152,6 @@ public function testNamespacedVariables()
         $this->assertSame('complex', $_SERVER['SimpleConfig.simple.name']);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLoadsGetServerVar()
     {
         $_SERVER['SER_VAR'] = 'TT';
@@ -187,8 +161,6 @@ public function testLoadsGetServerVar()
         $this->assertSame('TT', $_ENV['NVAR7']);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLoadsEnvGlobals()
     {
         $dotenv = new Dotenv($this->fixturesFolder);
@@ -199,8 +171,6 @@ public function testLoadsEnvGlobals()
         $this->assertSame('', $_ENV['NULL']);
     }
 
-    //--------------------------------------------------------------------
-
     public function testNestedEnvironmentVars()
     {
         $dotenv = new Dotenv($this->fixturesFolder, 'nested.env');
@@ -211,8 +181,6 @@ public function testNestedEnvironmentVars()
         $this->assertSame('Hello/World!', $_ENV['NVAR8']);
     }
 
-    //--------------------------------------------------------------------
-
     public function testDotenvAllowsSpecialCharacters()
     {
         $dotenv = new Dotenv($this->fixturesFolder, 'specialchars.env');
@@ -223,6 +191,4 @@ public function testDotenvAllowsSpecialCharacters()
         $this->assertSame('22222:22#2^{', getenv('SPVAR4'));
         $this->assertSame('test some escaped characters like a quote " or maybe a backslash \\', getenv('SPVAR5'));
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Config/FactoriesTest.php b/tests/system/Config/FactoriesTest.php
index b29ce5dda086..9182bc5224c4 100644
--- a/tests/system/Config/FactoriesTest.php
+++ b/tests/system/Config/FactoriesTest.php
@@ -37,8 +37,6 @@ protected function getFactoriesStaticProperty(...$params)
         return $property;
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetsOptions()
     {
         $result = Factories::getOptions('models');
@@ -113,8 +111,6 @@ public function testResetsComponentOnly()
         $this->assertArrayHasKey('widgets', $result);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetsBasenameByBasename()
     {
         $this->assertSame('SomeWidget', Factories::getBasename('SomeWidget'));
@@ -135,8 +131,6 @@ public function testGetsBasenameInvalid()
         $this->assertSame('', Factories::getBasename('Tests\\Support\\'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testCreatesByBasename()
     {
         $result = Factories::widgets('SomeWidget', ['getShared' => false]);
@@ -189,8 +183,6 @@ public function testInjection()
         $this->assertInstanceOf(stdClass::class, $result);
     }
 
-    //--------------------------------------------------------------------
-
     public function testRespectsComponentAlias()
     {
         Factories::setOptions('tedwigs', ['component' => 'widgets']);
diff --git a/tests/system/Config/MimesTest.php b/tests/system/Config/MimesTest.php
index a5a33ddd0761..921138adbd55 100644
--- a/tests/system/Config/MimesTest.php
+++ b/tests/system/Config/MimesTest.php
@@ -36,8 +36,6 @@ public function extensionsList()
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @dataProvider extensionsList
      *
@@ -49,8 +47,6 @@ public function testGuessExtensionFromType($expected, $mime)
         $this->assertSame($expected, Mimes::guessExtensionFromType($mime));
     }
 
-    //--------------------------------------------------------------------
-
     public function mimesList()
     {
         return [
@@ -77,8 +73,6 @@ public function mimesList()
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @dataProvider mimesList
      */
@@ -86,6 +80,4 @@ public function testGuessTypeFromExtension($expected, $ext)
     {
         $this->assertSame($expected, Mimes::guessTypeFromExtension($ext));
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index 9221410669b5..d28e05a40e61 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -52,8 +52,6 @@ final class ControllerTest extends CIUnitTestCase
      */
     protected $logger;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -65,8 +63,6 @@ protected function setUp(): void
         $this->codeigniter = new MockCodeIgniter($this->config);
     }
 
-    //--------------------------------------------------------------------
-
     public function testConstructor()
     {
         // make sure we can instantiate one
@@ -89,7 +85,6 @@ public function testConstructorHTTPS()
         $_SERVER = $original; // restore so code coverage doesn't break
     }
 
-    //--------------------------------------------------------------------
     public function testCachePage()
     {
         $this->controller = new Controller();
@@ -163,7 +158,6 @@ public function testValidateWithStringRulesFoundUseMessagesParameter()
         $this->assertSame('You must choose a username.', Services::validation()->getError());
     }
 
-    //--------------------------------------------------------------------
     public function testHelpers()
     {
         $this->controller      = new class() extends Controller {
diff --git a/tests/system/Database/Builder/AliasTest.php b/tests/system/Database/Builder/AliasTest.php
index 9b71a4173dcd..f22580d21e26 100644
--- a/tests/system/Database/Builder/AliasTest.php
+++ b/tests/system/Database/Builder/AliasTest.php
@@ -12,8 +12,6 @@ final class AliasTest extends CIUnitTestCase
 {
     protected $db;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -21,8 +19,6 @@ protected function setUp(): void
         $this->db = new MockConnection([]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testAlias()
     {
         $builder = $this->db->table('jobs j');
@@ -32,8 +28,6 @@ public function testAlias()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testAliasSupportsArrayOfNames()
     {
         $builder = $this->db->table(['jobs j', 'users u']);
@@ -43,8 +37,6 @@ public function testAliasSupportsArrayOfNames()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testAliasSupportsStringOfNames()
     {
         $builder = $this->db->table('jobs j, users u');
@@ -54,8 +46,6 @@ public function testAliasSupportsStringOfNames()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/1599
      */
diff --git a/tests/system/Database/Builder/BaseTest.php b/tests/system/Database/Builder/BaseTest.php
index 9b20375e02d3..2afd8e586742 100644
--- a/tests/system/Database/Builder/BaseTest.php
+++ b/tests/system/Database/Builder/BaseTest.php
@@ -12,8 +12,6 @@ final class BaseTest extends CIUnitTestCase
 {
     protected $db;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -21,8 +19,6 @@ protected function setUp(): void
         $this->db = new MockConnection([]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testDbReturnsConnection()
     {
         $builder = $this->db->table('jobs');
@@ -32,8 +28,6 @@ public function testDbReturnsConnection()
         $this->assertInstanceOf(MockConnection::class, $result);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetTableReturnsTable()
     {
         $builder = $this->db->table('jobs');
diff --git a/tests/system/Database/Builder/DistinctTest.php b/tests/system/Database/Builder/DistinctTest.php
index a67ec428c75e..cfb55de70979 100644
--- a/tests/system/Database/Builder/DistinctTest.php
+++ b/tests/system/Database/Builder/DistinctTest.php
@@ -13,8 +13,6 @@ final class DistinctTest extends CIUnitTestCase
 {
     protected $db;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -22,8 +20,6 @@ protected function setUp(): void
         $this->db = new MockConnection([]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testDelete()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -34,6 +30,4 @@ public function testDelete()
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Database/Builder/EmptyTest.php b/tests/system/Database/Builder/EmptyTest.php
index a5f46297a4a7..6fd4b60648c7 100644
--- a/tests/system/Database/Builder/EmptyTest.php
+++ b/tests/system/Database/Builder/EmptyTest.php
@@ -13,8 +13,6 @@ final class EmptyTest extends CIUnitTestCase
 {
     protected $db;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -22,8 +20,6 @@ protected function setUp(): void
         $this->db = new MockConnection([]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testEmptyWithNoTable()
     {
         $builder = new BaseBuilder('jobs', $this->db);
@@ -34,6 +30,4 @@ public function testEmptyWithNoTable()
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $answer));
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php
index 253604cdfdb2..2c0c97b739f9 100644
--- a/tests/system/Database/Builder/FromTest.php
+++ b/tests/system/Database/Builder/FromTest.php
@@ -14,8 +14,6 @@ final class FromTest extends CIUnitTestCase
 {
     protected $db;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -23,8 +21,6 @@ protected function setUp(): void
         $this->db = new MockConnection([]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSimpleFrom()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -36,8 +32,6 @@ public function testSimpleFrom()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testFromThatOverwrites()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -49,8 +43,6 @@ public function testFromThatOverwrites()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testFromWithMultipleTables()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -62,8 +54,6 @@ public function testFromWithMultipleTables()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testFromWithMultipleTablesAsString()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -75,8 +65,6 @@ public function testFromWithMultipleTablesAsString()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testFromReset()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -104,8 +92,6 @@ public function testFromReset()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testFromWithMultipleTablesAsStringWithSQLSRV()
     {
         $this->db = new MockConnection(['DBDriver' => 'SQLSRV', 'database' => 'test', 'schema' => 'dbo']);
@@ -118,6 +104,4 @@ public function testFromWithMultipleTablesAsStringWithSQLSRV()
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Database/Builder/GetTest.php b/tests/system/Database/Builder/GetTest.php
index 5ae2bf885fd8..69e11c3345f4 100644
--- a/tests/system/Database/Builder/GetTest.php
+++ b/tests/system/Database/Builder/GetTest.php
@@ -12,8 +12,6 @@ final class GetTest extends CIUnitTestCase
 {
     protected $db;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -21,8 +19,6 @@ protected function setUp(): void
         $this->db = new MockConnection([]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGet()
     {
         $builder = $this->db->table('users');
@@ -32,8 +28,6 @@ public function testGet()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/2141
      */
@@ -50,8 +44,6 @@ public function testGetWithReset()
         $this->assertSame($expectedSQLafterreset, str_replace("\n", ' ', $builder->get(0, 50, true)));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/2143
      */
@@ -68,8 +60,6 @@ public function testGetWhereWithLimit()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, null, true)));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetWhereWithLimitAndOffset()
     {
         $builder = $this->db->table('users');
@@ -83,8 +73,6 @@ public function testGetWhereWithLimitAndOffset()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], 5, 10, true)));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetWhereWithWhereConditionOnly()
     {
         $builder = $this->db->table('users');
@@ -98,8 +86,6 @@ public function testGetWhereWithWhereConditionOnly()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getWhere(['username' => 'bogus'], null, null, true)));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetWhereWithoutArgs()
     {
         $builder = $this->db->table('users');
diff --git a/tests/system/Database/Builder/GroupTest.php b/tests/system/Database/Builder/GroupTest.php
index be2f31855ec0..5a48ac60e21e 100644
--- a/tests/system/Database/Builder/GroupTest.php
+++ b/tests/system/Database/Builder/GroupTest.php
@@ -13,8 +13,6 @@ final class GroupTest extends CIUnitTestCase
 {
     protected $db;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -22,8 +20,6 @@ protected function setUp(): void
         $this->db = new MockConnection([]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGroupBy()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -35,8 +31,6 @@ public function testGroupBy()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testHavingBy()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -50,8 +44,6 @@ public function testHavingBy()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrHavingBy()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -66,8 +58,6 @@ public function testOrHavingBy()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testHavingIn()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -81,8 +71,6 @@ public function testHavingIn()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testHavingInClosure()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -98,8 +86,6 @@ public function testHavingInClosure()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrHavingIn()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -114,8 +100,6 @@ public function testOrHavingIn()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrHavingInClosure()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -134,8 +118,6 @@ public function testOrHavingInClosure()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testHavingNotIn()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -149,8 +131,6 @@ public function testHavingNotIn()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testHavingNotInClosure()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -166,8 +146,6 @@ public function testHavingNotInClosure()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrHavingNotIn()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -182,8 +160,6 @@ public function testOrHavingNotIn()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrHavingNotInClosure()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -202,8 +178,6 @@ public function testOrHavingNotInClosure()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testHavingLike()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -217,8 +191,6 @@ public function testHavingLike()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testHavingLikeBefore()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -232,8 +204,6 @@ public function testHavingLikeBefore()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testHavingLikeAfter()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -247,8 +217,6 @@ public function testHavingLikeAfter()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNotHavingLike()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -262,8 +230,6 @@ public function testNotHavingLike()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNotHavingLikeBefore()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -277,8 +243,6 @@ public function testNotHavingLikeBefore()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNotHavingLikeAfter()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -292,8 +256,6 @@ public function testNotHavingLikeAfter()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrHavingLike()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -308,8 +270,6 @@ public function testOrHavingLike()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrHavingLikeBefore()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -324,8 +284,6 @@ public function testOrHavingLikeBefore()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrHavingLikeAfter()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -340,8 +298,6 @@ public function testOrHavingLikeAfter()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrNotHavingLike()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -356,8 +312,6 @@ public function testOrNotHavingLike()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrNotHavingLikeBefore()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -372,8 +326,6 @@ public function testOrNotHavingLikeBefore()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrNotHavingLikeAfter()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -388,8 +340,6 @@ public function testOrNotHavingLikeAfter()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testHavingAndGroup()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -407,8 +357,6 @@ public function testHavingAndGroup()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testHavingOrGroup()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -426,8 +374,6 @@ public function testHavingOrGroup()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNotHavingAndGroup()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -445,8 +391,6 @@ public function testNotHavingAndGroup()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNotHavingOrGroup()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -464,8 +408,6 @@ public function testNotHavingOrGroup()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testAndGroups()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -481,8 +423,6 @@ public function testAndGroups()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrGroups()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -498,8 +438,6 @@ public function testOrGroups()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNotGroups()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -515,8 +453,6 @@ public function testNotGroups()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrNotGroups()
     {
         $builder = new BaseBuilder('user', $this->db);
diff --git a/tests/system/Database/Builder/JoinTest.php b/tests/system/Database/Builder/JoinTest.php
index 6204331929b0..47a9d4b24522 100644
--- a/tests/system/Database/Builder/JoinTest.php
+++ b/tests/system/Database/Builder/JoinTest.php
@@ -15,8 +15,6 @@ final class JoinTest extends CIUnitTestCase
 {
     protected $db;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -24,8 +22,6 @@ protected function setUp(): void
         $this->db = new MockConnection([]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testJoinSimple()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -37,8 +33,6 @@ public function testJoinSimple()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testJoinIsNull()
     {
         $builder = new BaseBuilder('table1', $this->db);
@@ -50,8 +44,6 @@ public function testJoinIsNull()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testJoinIsNotNull()
     {
         $builder = new BaseBuilder('table1', $this->db);
@@ -63,8 +55,6 @@ public function testJoinIsNotNull()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testJoinMultipleConditions()
     {
         $builder = new BaseBuilder('table1', $this->db);
@@ -76,8 +66,6 @@ public function testJoinMultipleConditions()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testFullOuterJoin()
     {
         $builder = new PostgreBuilder('jobs', $this->db);
@@ -89,8 +77,6 @@ public function testFullOuterJoin()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testJoinWithAlias()
     {
         $this->db = new MockConnection(['DBDriver' => 'SQLSRV', 'database' => 'test', 'schema' => 'dbo']);
@@ -103,6 +89,4 @@ public function testJoinWithAlias()
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Database/Builder/LimitTest.php b/tests/system/Database/Builder/LimitTest.php
index 3d0ce683a199..e10c41679270 100644
--- a/tests/system/Database/Builder/LimitTest.php
+++ b/tests/system/Database/Builder/LimitTest.php
@@ -13,8 +13,6 @@ final class LimitTest extends CIUnitTestCase
 {
     protected $db;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -22,8 +20,6 @@ protected function setUp(): void
         $this->db = new MockConnection([]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLimitAlone()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -35,8 +31,6 @@ public function testLimitAlone()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLimitAndOffset()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -48,8 +42,6 @@ public function testLimitAndOffset()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLimitAndOffsetMethod()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -60,6 +52,4 @@ public function testLimitAndOffsetMethod()
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Database/Builder/OrderTest.php b/tests/system/Database/Builder/OrderTest.php
index c0b851aafa1f..1855cfd4c4ae 100644
--- a/tests/system/Database/Builder/OrderTest.php
+++ b/tests/system/Database/Builder/OrderTest.php
@@ -13,8 +13,6 @@ final class OrderTest extends CIUnitTestCase
 {
     protected $db;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -22,8 +20,6 @@ protected function setUp(): void
         $this->db = new MockConnection([]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrderAscending()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -35,8 +31,6 @@ public function testOrderAscending()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrderDescending()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -48,8 +42,6 @@ public function testOrderDescending()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrderRandom()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -60,6 +52,4 @@ public function testOrderRandom()
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Database/Builder/PrefixTest.php b/tests/system/Database/Builder/PrefixTest.php
index 2510835561c4..22bc253f8017 100644
--- a/tests/system/Database/Builder/PrefixTest.php
+++ b/tests/system/Database/Builder/PrefixTest.php
@@ -12,8 +12,6 @@ final class PrefixTest extends CIUnitTestCase
 {
     protected $db;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -21,8 +19,6 @@ protected function setUp(): void
         $this->db = new MockConnection(['DBPrefix' => 'ci_']);
     }
 
-    //--------------------------------------------------------------------
-
     public function testPrefixesSetOnTableNames()
     {
         $expected = 'ci_users';
@@ -30,8 +26,6 @@ public function testPrefixesSetOnTableNames()
         $this->assertSame($expected, $this->db->prefixTable('users'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testPrefixesSetOnTableNamesWithWhereClause()
     {
         $builder = $this->db->table('users');
diff --git a/tests/system/Database/Builder/SelectTest.php b/tests/system/Database/Builder/SelectTest.php
index a06e7e0c0f64..53e957d5b070 100644
--- a/tests/system/Database/Builder/SelectTest.php
+++ b/tests/system/Database/Builder/SelectTest.php
@@ -15,8 +15,6 @@ final class SelectTest extends CIUnitTestCase
 {
     protected $db;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -24,8 +22,6 @@ protected function setUp(): void
         $this->db = new MockConnection([]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSimpleSelect()
     {
         $builder = new BaseBuilder('users', $this->db);
@@ -35,8 +31,6 @@ public function testSimpleSelect()
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectOnlyOneColumn()
     {
         $builder = new BaseBuilder('users', $this->db);
@@ -48,8 +42,6 @@ public function testSelectOnlyOneColumn()
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectAcceptsArray()
     {
         $builder = new BaseBuilder('users', $this->db);
@@ -61,8 +53,6 @@ public function testSelectAcceptsArray()
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectAcceptsMultipleColumns()
     {
         $builder = new BaseBuilder('users', $this->db);
@@ -74,8 +64,6 @@ public function testSelectAcceptsMultipleColumns()
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectKeepsAliases()
     {
         $builder = new BaseBuilder('users', $this->db);
@@ -87,8 +75,6 @@ public function testSelectKeepsAliases()
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectWorksWithComplexSelects()
     {
         $builder = new BaseBuilder('users', $this->db);
@@ -100,8 +86,6 @@ public function testSelectWorksWithComplexSelects()
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectMinWithNoAlias()
     {
         $builder = new BaseBuilder('invoices', $this->db);
@@ -113,8 +97,6 @@ public function testSelectMinWithNoAlias()
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectMinWithAlias()
     {
         $builder = new BaseBuilder('invoices', $this->db);
@@ -126,8 +108,6 @@ public function testSelectMinWithAlias()
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectMaxWithNoAlias()
     {
         $builder = new BaseBuilder('invoices', $this->db);
@@ -139,8 +119,6 @@ public function testSelectMaxWithNoAlias()
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectMaxWithAlias()
     {
         $builder = new BaseBuilder('invoices', $this->db);
@@ -152,8 +130,6 @@ public function testSelectMaxWithAlias()
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectAvgWithNoAlias()
     {
         $builder = new BaseBuilder('invoices', $this->db);
@@ -165,8 +141,6 @@ public function testSelectAvgWithNoAlias()
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectAvgWithAlias()
     {
         $builder = new BaseBuilder('invoices', $this->db);
@@ -178,8 +152,6 @@ public function testSelectAvgWithAlias()
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectSumWithNoAlias()
     {
         $builder = new BaseBuilder('invoices', $this->db);
@@ -191,8 +163,6 @@ public function testSelectSumWithNoAlias()
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectSumWithAlias()
     {
         $builder = new BaseBuilder('invoices', $this->db);
@@ -204,8 +174,6 @@ public function testSelectSumWithAlias()
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectCountWithNoAlias()
     {
         $builder = new BaseBuilder('invoices', $this->db);
@@ -217,8 +185,6 @@ public function testSelectCountWithNoAlias()
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectCountWithAlias()
     {
         $builder = new BaseBuilder('invoices', $this->db);
@@ -230,8 +196,6 @@ public function testSelectCountWithAlias()
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectMinThrowsExceptionOnEmptyValue()
     {
         $builder = new BaseBuilder('invoices', $this->db);
@@ -242,8 +206,6 @@ public function testSelectMinThrowsExceptionOnEmptyValue()
         $builder->selectSum('');
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectMaxWithDotNameAndNoAlias()
     {
         $builder = new BaseBuilder('invoices', $this->db);
@@ -255,8 +217,6 @@ public function testSelectMaxWithDotNameAndNoAlias()
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSelectMinThrowsExceptionOnMultipleColumn()
     {
         $builder = new BaseBuilder('users', $this->db);
@@ -267,8 +227,6 @@ public function testSelectMinThrowsExceptionOnMultipleColumn()
         $builder->selectSum('name,role');
     }
 
-    //--------------------------------------------------------------------
-
     public function testSimpleSelectWithSQLSRV()
     {
         $this->db = new MockConnection(['DBDriver' => 'SQLSRV', 'database' => 'test', 'schema' => 'dbo']);
@@ -279,6 +237,4 @@ public function testSimpleSelectWithSQLSRV()
 
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Database/Builder/TruncateTest.php b/tests/system/Database/Builder/TruncateTest.php
index a4f4752ba0ac..f29ac7356dbf 100644
--- a/tests/system/Database/Builder/TruncateTest.php
+++ b/tests/system/Database/Builder/TruncateTest.php
@@ -13,8 +13,6 @@ final class TruncateTest extends CIUnitTestCase
 {
     protected $db;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -22,8 +20,6 @@ protected function setUp(): void
         $this->db = new MockConnection([]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testTruncate()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -32,6 +28,4 @@ public function testTruncate()
 
         $this->assertSame($expectedSQL, $builder->testMode()->truncate());
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Database/Live/AliasTest.php b/tests/system/Database/Live/AliasTest.php
index 40776641e931..8209ee68e284 100644
--- a/tests/system/Database/Live/AliasTest.php
+++ b/tests/system/Database/Live/AliasTest.php
@@ -28,6 +28,4 @@ public function testAlias()
 
         $this->assertCount(1, $jobs->getResult());
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Database/Live/BadQueryTest.php b/tests/system/Database/Live/BadQueryTest.php
index a1552f12a70c..4d179271c5f5 100644
--- a/tests/system/Database/Live/BadQueryTest.php
+++ b/tests/system/Database/Live/BadQueryTest.php
@@ -20,8 +20,6 @@ final class BadQueryTest extends CIUnitTestCase
     protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
     protected static $origDebug;
 
-    //--------------------------------------------------------------------
-
     /**
      * This test must run first to store the inital debug value before we tinker with it below
      */
diff --git a/tests/system/Database/Live/CountTest.php b/tests/system/Database/Live/CountTest.php
index 14ff5dd65f5a..72125960c395 100644
--- a/tests/system/Database/Live/CountTest.php
+++ b/tests/system/Database/Live/CountTest.php
@@ -23,29 +23,21 @@ public function testCountReturnsZeroWithNoResults()
         $this->assertSame(0, $this->db->table('empty')->countAll());
     }
 
-    //--------------------------------------------------------------------
-
     public function testCountAllReturnsCorrectInteger()
     {
         $this->assertSame(4, $this->db->table('job')->countAll());
     }
 
-    //--------------------------------------------------------------------
-
     public function testCountAllResultsReturnsZeroWithNoResults()
     {
         $this->assertSame(0, $this->db->table('job')->where('name', 'Superstar')->countAllResults());
     }
 
-    //--------------------------------------------------------------------
-
     public function testCountAllResultsReturnsCorrectValue()
     {
         $this->assertSame(1, $this->db->table('job')->where('name', 'Developer')->countAllResults());
     }
 
-    //--------------------------------------------------------------------
-
     public function testCountAllResultsHonorsReset()
     {
         $builder = $this->db->table('job');
@@ -53,6 +45,4 @@ public function testCountAllResultsHonorsReset()
         $this->assertSame(1, $builder->where('name', 'Developer')->countAllResults(false));
         $this->assertSame(1, $builder->countAllResults());
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Database/Live/DbUtilsTest.php b/tests/system/Database/Live/DbUtilsTest.php
index 1e4b986dce9d..79920345d71b 100644
--- a/tests/system/Database/Live/DbUtilsTest.php
+++ b/tests/system/Database/Live/DbUtilsTest.php
@@ -20,8 +20,6 @@ final class DbUtilsTest extends CIUnitTestCase
     protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
     protected static $origDebug;
 
-    //--------------------------------------------------------------------
-
     /**
      * This test must run first to store the inital debug value before we tinker with it below
      */
@@ -32,8 +30,6 @@ public function testFirst()
         $this->assertIsBool($this::$origDebug);
     }
 
-    //--------------------------------------------------------------------
-
     public function testUtilsBackup()
     {
         $util = (new Database())->loadUtils($this->db);
@@ -44,8 +40,6 @@ public function testUtilsBackup()
         $util->backup();
     }
 
-    //--------------------------------------------------------------------
-
     public function testUtilsBackupWithParamsArray()
     {
         $util = (new Database())->loadUtils($this->db);
@@ -59,8 +53,6 @@ public function testUtilsBackupWithParamsArray()
         $util->backup($params);
     }
 
-    //--------------------------------------------------------------------
-
     public function testUtilsBackupWithParamsString()
     {
         $util = (new Database())->loadUtils($this->db);
@@ -71,8 +63,6 @@ public function testUtilsBackupWithParamsString()
         $util->backup('db_jobs');
     }
 
-    //--------------------------------------------------------------------
-
     public function testUtilsListDatabases()
     {
         $util = (new Database())->loadUtils($this->db);
@@ -89,8 +79,6 @@ public function testUtilsListDatabases()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testUtilsDatabaseExist()
     {
         $util = (new Database())->loadUtils($this->db);
@@ -107,8 +95,6 @@ public function testUtilsDatabaseExist()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testUtilsOptimizeDatabase()
     {
         $util = (new Database())->loadUtils($this->db);
@@ -118,8 +104,6 @@ public function testUtilsOptimizeDatabase()
         $this->assertTrue((bool) $d);
     }
 
-    //--------------------------------------------------------------------
-
     public function testUtilsOptimizeTableFalseOptimizeDatabaseDebugTrue()
     {
         $util = (new Database())->loadUtils($this->db);
@@ -135,8 +119,6 @@ public function testUtilsOptimizeTableFalseOptimizeDatabaseDebugTrue()
         // this point in code execution will never be reached
     }
 
-    //--------------------------------------------------------------------
-
     public function testUtilsOptimizeTableFalseOptimizeDatabaseDebugFalse()
     {
         $util = (new Database())->loadUtils($this->db);
@@ -152,8 +134,6 @@ public function testUtilsOptimizeTableFalseOptimizeDatabaseDebugFalse()
         $this->setPrivateProperty($this->db, 'DBDebug', self::$origDebug);
     }
 
-    //--------------------------------------------------------------------
-
     public function testUtilsOptimizeTable()
     {
         $util = (new Database())->loadUtils($this->db);
@@ -163,8 +143,6 @@ public function testUtilsOptimizeTable()
         $this->assertTrue((bool) $d);
     }
 
-    //--------------------------------------------------------------------
-
     public function testUtilsOptimizeTableFalseOptimizeTable()
     {
         $util = (new Database())->loadUtils($this->db);
@@ -177,8 +155,6 @@ public function testUtilsOptimizeTableFalseOptimizeTable()
         $util->optimizeTable('db_job');
     }
 
-    //--------------------------------------------------------------------
-
     public function testUtilsRepairTable()
     {
         $util = (new Database())->loadUtils($this->db);
@@ -189,8 +165,6 @@ public function testUtilsRepairTable()
         $util->repairTable('db_job');
     }
 
-    //--------------------------------------------------------------------
-
     public function testUtilsCSVFromResult()
     {
         $data = $this->db->table('job')->get();
@@ -204,8 +178,6 @@ public function testUtilsCSVFromResult()
         $this->assertSame('"1","Developer","Awesome job, but sometimes makes you bored","","",""', $data[1]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testUtilsXMLFromResult()
     {
         $data = $this->db->table('job')->where('id', 4)->get();
diff --git a/tests/system/Database/Live/DeleteTest.php b/tests/system/Database/Live/DeleteTest.php
index c80597138862..1f1414021b6f 100644
--- a/tests/system/Database/Live/DeleteTest.php
+++ b/tests/system/Database/Live/DeleteTest.php
@@ -26,8 +26,6 @@ public function testDeleteThrowExceptionWithNoCriteria()
         $this->db->table('job')->delete();
     }
 
-    //--------------------------------------------------------------------
-
     public function testDeleteWithExternalWhere()
     {
         $this->seeInDatabase('job', ['name' => 'Developer']);
@@ -37,8 +35,6 @@ public function testDeleteWithExternalWhere()
         $this->dontSeeInDatabase('job', ['name' => 'Developer']);
     }
 
-    //--------------------------------------------------------------------
-
     public function testDeleteWithInternalWhere()
     {
         $this->seeInDatabase('job', ['name' => 'Developer']);
@@ -48,8 +44,6 @@ public function testDeleteWithInternalWhere()
         $this->dontSeeInDatabase('job', ['name' => 'Developer']);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group  single
      *
@@ -69,6 +63,4 @@ public function testDeleteWithLimit()
 
         $this->seeNumRecords(1, 'user', ['country' => 'US']);
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Database/Live/EmptyTest.php b/tests/system/Database/Live/EmptyTest.php
index beceb7f4b57c..811e2bf5fed2 100644
--- a/tests/system/Database/Live/EmptyTest.php
+++ b/tests/system/Database/Live/EmptyTest.php
@@ -25,14 +25,10 @@ public function testEmpty()
         $this->assertSame(0, $this->db->table('misc')->countAll());
     }
 
-    //--------------------------------------------------------------------
-
     public function testTruncate()
     {
         $this->db->table('misc')->truncate();
 
         $this->assertSame(0, $this->db->table('misc')->countAll());
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Database/Live/EscapeTest.php b/tests/system/Database/Live/EscapeTest.php
index f99d2c778d96..6b871cbc2d3d 100644
--- a/tests/system/Database/Live/EscapeTest.php
+++ b/tests/system/Database/Live/EscapeTest.php
@@ -25,8 +25,6 @@ protected function setUp(): void
         $this->char = $this->db->DBDriver === 'MySQLi' ? '\\' : "'";
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Ensures we don't have escaped - values...
      *
@@ -37,8 +35,6 @@ public function testEscapeProtectsNegativeNumbers()
         $this->assertSame("'-100'", $this->db->escape(-100));
     }
 
-    //--------------------------------------------------------------------
-
     public function testEscape()
     {
         $expected = "SELECT * FROM brands WHERE name = 'O" . $this->char . "'Doules'";
@@ -47,8 +43,6 @@ public function testEscape()
         $this->assertSame($expected, $sql);
     }
 
-    //--------------------------------------------------------------------
-
     public function testEscapeString()
     {
         $expected = "SELECT * FROM brands WHERE name = 'O" . $this->char . "'Doules'";
@@ -57,8 +51,6 @@ public function testEscapeString()
         $this->assertSame($expected, $sql);
     }
 
-    //--------------------------------------------------------------------
-
     public function testEscapeLikeString()
     {
         $expected = "SELECT * FROM brands WHERE column LIKE '%10!% more%' ESCAPE '!'";
@@ -67,8 +59,6 @@ public function testEscapeLikeString()
         $this->assertSame($expected, $sql);
     }
 
-    //--------------------------------------------------------------------
-
     public function testEscapeLikeStringDirect()
     {
         if ($this->db->DBDriver === 'MySQLi') {
diff --git a/tests/system/Database/Live/FromTest.php b/tests/system/Database/Live/FromTest.php
index cca48e6dc701..9d33fddac18c 100644
--- a/tests/system/Database/Live/FromTest.php
+++ b/tests/system/Database/Live/FromTest.php
@@ -25,8 +25,6 @@ public function testFromCanAddTables()
         $this->assertCount(12, $result);
     }
 
-    //--------------------------------------------------------------------
-
     public function testFromCanOverride()
     {
         $result = $this->db->table('job')->from('misc', true)->get()->getResult();
@@ -34,14 +32,10 @@ public function testFromCanOverride()
         $this->assertCount(3, $result);
     }
 
-    //--------------------------------------------------------------------
-
     public function testFromWithWhere()
     {
         $result = $this->db->table('job')->from('user')->where('user.id', 1)->get()->getResult();
 
         $this->assertCount(4, $result);
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php
index 5aaedcb6b847..1bb184c6d50e 100644
--- a/tests/system/Database/Live/GetTest.php
+++ b/tests/system/Database/Live/GetTest.php
@@ -30,8 +30,6 @@ public function testGet()
         $this->assertSame('Musician', $jobs[3]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetWitLimit()
     {
         $jobs = $this->db->table('job')->get(2, 2)->getResult();
@@ -41,8 +39,6 @@ public function testGetWitLimit()
         $this->assertSame('Musician', $jobs[1]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetWhereArray()
     {
         $jobs = $this->db->table('job')
@@ -53,8 +49,6 @@ public function testGetWhereArray()
         $this->assertSame('Developer', $jobs[0]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetWhereWithLimits()
     {
         $jobs = $this->db->table('job')
@@ -65,8 +59,6 @@ public function testGetWhereWithLimits()
         $this->assertSame('Accountant', $jobs[0]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetFieldCount()
     {
         $jobs = $this->db->table('job')->get()->getFieldCount();
@@ -74,8 +66,6 @@ public function testGetFieldCount()
         $this->assertSame(6, $jobs);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetFieldNames()
     {
         $jobs = $this->db->table('job')->get()->getFieldNames();
@@ -84,8 +74,6 @@ public function testGetFieldNames()
         $this->assertTrue(in_array('description', $jobs, true));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetFieldData()
     {
         $jobs = $this->db->table('job')->get()->getFieldData();
@@ -172,8 +160,6 @@ public function testGetFieldData()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetDataSeek()
     {
         $data = $this->db->table('job')->get();
@@ -189,7 +175,6 @@ public function testGetDataSeek()
         $this->assertSame('Musician', $details[0]->name);
     }
 
-    //--------------------------------------------------------------------
     public function testGetAnotherDataSeek()
     {
         $data = $this->db->table('job')->get();
@@ -204,8 +189,6 @@ public function testGetAnotherDataSeek()
         $this->assertSame('Musician', $details[3]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testFreeResult()
     {
         $data = $this->db->table('job')->where('id', 4)->get();
@@ -219,8 +202,6 @@ public function testFreeResult()
         $this->assertFalse($data->resultID);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetRowWithColumnName()
     {
         $name = $this->db->table('user')->get()->getRow('name', 'array');
@@ -228,8 +209,6 @@ public function testGetRowWithColumnName()
         $this->assertSame('Derek Jones', $name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetRowWithReturnType()
     {
         $user = $this->db->table('user')->get()->getRow(0, 'array');
@@ -237,8 +216,6 @@ public function testGetRowWithReturnType()
         $this->assertSame('Derek Jones', $user['name']);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetRowWithCustomReturnType()
     {
         $testClass = new class() {};
@@ -248,8 +225,6 @@ public function testGetRowWithCustomReturnType()
         $this->assertSame('Derek Jones', $user->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetFirstRow()
     {
         $user = $this->db->table('user')->get()->getFirstRow();
@@ -257,8 +232,6 @@ public function testGetFirstRow()
         $this->assertSame('Derek Jones', $user->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetLastRow()
     {
         $user = $this->db->table('user')->get()->getLastRow();
@@ -266,8 +239,6 @@ public function testGetLastRow()
         $this->assertSame('Chris Martin', $user->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetNextRow()
     {
         $user = $this->db->table('user')->get()->getNextRow();
@@ -275,8 +246,6 @@ public function testGetNextRow()
         $this->assertSame('Ahmadinejad', $user->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetPreviousRow()
     {
         $user = $this->db->table('user')->get();
diff --git a/tests/system/Database/Live/GroupTest.php b/tests/system/Database/Live/GroupTest.php
index c29270a0bd92..765fe7f09670 100644
--- a/tests/system/Database/Live/GroupTest.php
+++ b/tests/system/Database/Live/GroupTest.php
@@ -29,8 +29,6 @@ public function testGroupBy()
         $this->assertCount(4, $result);
     }
 
-    //--------------------------------------------------------------------
-
     public function testHavingBy()
     {
         $result = $this->db->table('job')
@@ -43,8 +41,6 @@ public function testHavingBy()
         $this->assertCount(2, $result);
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrHavingBy()
     {
         $result = $this->db->table('user')
@@ -58,8 +54,6 @@ public function testOrHavingBy()
         $this->assertCount(2, $result);
     }
 
-    //--------------------------------------------------------------------
-
     public function testHavingIn()
     {
         $result = $this->db->table('job')
@@ -75,8 +69,6 @@ public function testHavingIn()
         $this->assertSame('Politician', $result[1]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testorHavingIn()
     {
         $result = $this->db->table('job')
@@ -93,8 +85,6 @@ public function testorHavingIn()
         $this->assertSame('Politician', $result[1]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testHavingNotIn()
     {
         $result = $this->db->table('job')
@@ -110,8 +100,6 @@ public function testHavingNotIn()
         $this->assertSame('Musician', $result[1]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrHavingNotIn()
     {
         $result = $this->db->table('job')
@@ -128,8 +116,6 @@ public function testOrHavingNotIn()
         $this->assertSame('Musician', $result[1]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testHavingLike()
     {
         $result = $this->db->table('job')
@@ -143,8 +129,6 @@ public function testHavingLike()
         $this->assertSame('Developer', $result[0]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testNotHavingLike()
     {
         $result = $this->db->table('job')
@@ -160,8 +144,6 @@ public function testNotHavingLike()
         $this->assertSame('Developer', $result[1]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrHavingLike()
     {
         $result = $this->db->table('job')
@@ -178,8 +160,6 @@ public function testOrHavingLike()
         $this->assertSame('Developer', $result[1]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrNotHavingLike()
     {
         $result = $this->db->table('job')
@@ -197,8 +177,6 @@ public function testOrNotHavingLike()
         $this->assertSame('Musician', $result[2]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testAndHavingGroupStart()
     {
         $result = $this->db->table('job')
@@ -217,8 +195,6 @@ public function testAndHavingGroupStart()
         $this->assertSame('Accountant', $result[0]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrHavingGroupStart()
     {
         $result = $this->db->table('job')
@@ -238,8 +214,6 @@ public function testOrHavingGroupStart()
         $this->assertSame('Musician', $result[1]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testNotHavingGroupStart()
     {
         $result = $this->db->table('job')
@@ -258,8 +232,6 @@ public function testNotHavingGroupStart()
         $this->assertSame('Musician', $result[0]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrNotHavingGroupStart()
     {
         $result = $this->db->table('job')
@@ -280,8 +252,6 @@ public function testOrNotHavingGroupStart()
         $this->assertSame('Politician', $result[2]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testAndGroups()
     {
         $result = $this->db->table('user')
@@ -297,8 +267,6 @@ public function testAndGroups()
         $this->assertSame('Richard A Causey', $result[0]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrGroups()
     {
         $result = $this->db->table('user')
@@ -315,8 +283,6 @@ public function testOrGroups()
         $this->assertSame('Chris Martin', $result[1]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testNotGroups()
     {
         $result = $this->db->table('user')
@@ -332,8 +298,6 @@ public function testNotGroups()
         $this->assertSame('Derek Jones', $result[0]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrNotGroups()
     {
         $result = $this->db->table('user')
@@ -351,8 +315,6 @@ public function testOrNotGroups()
         $this->assertSame('Chris Martin', $result[2]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGroupByCount()
     {
         $result = $this->db->table('user')
diff --git a/tests/system/Database/Live/IncrementTest.php b/tests/system/Database/Live/IncrementTest.php
index 078b4d5db51f..043305189712 100644
--- a/tests/system/Database/Live/IncrementTest.php
+++ b/tests/system/Database/Live/IncrementTest.php
@@ -29,8 +29,6 @@ public function testIncrement()
         $this->seeInDatabase('job', ['name' => 'incremental', 'description' => '7']);
     }
 
-    //--------------------------------------------------------------------
-
     public function testIncrementWithValue()
     {
         $this->hasInDatabase('job', ['name' => 'incremental', 'description' => '6']);
@@ -42,8 +40,6 @@ public function testIncrementWithValue()
         $this->seeInDatabase('job', ['name' => 'incremental', 'description' => '8']);
     }
 
-    //--------------------------------------------------------------------
-
     public function testDecrement()
     {
         $this->hasInDatabase('job', ['name' => 'incremental', 'description' => '6']);
@@ -55,8 +51,6 @@ public function testDecrement()
         $this->seeInDatabase('job', ['name' => 'incremental', 'description' => '5']);
     }
 
-    //--------------------------------------------------------------------
-
     public function testDecrementWithValue()
     {
         $this->hasInDatabase('job', ['name' => 'incremental', 'description' => '6']);
@@ -67,6 +61,4 @@ public function testDecrementWithValue()
 
         $this->seeInDatabase('job', ['name' => 'incremental', 'description' => '4']);
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Database/Live/InsertTest.php b/tests/system/Database/Live/InsertTest.php
index d6817742d40b..6143ee9752b1 100644
--- a/tests/system/Database/Live/InsertTest.php
+++ b/tests/system/Database/Live/InsertTest.php
@@ -30,8 +30,6 @@ public function testInsert()
         $this->seeInDatabase('job', ['name' => 'Grocery Sales']);
     }
 
-    //--------------------------------------------------------------------
-
     public function testInsertBatch()
     {
         $jobData = [
@@ -51,8 +49,6 @@ public function testInsertBatch()
         $this->seeInDatabase('job', ['name' => 'Cab Driver']);
     }
 
-    //--------------------------------------------------------------------
-
     public function testReplaceWithNoMatchingData()
     {
         $data = [
@@ -70,8 +66,6 @@ public function testReplaceWithNoMatchingData()
         $this->assertSame('Cab Driver', $row->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testReplaceWithMatchingData()
     {
         $data = [
@@ -89,8 +83,6 @@ public function testReplaceWithMatchingData()
         $this->assertSame('Cab Driver', $row->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testBug302()
     {
         $code = "my code \\'CodeIgniter\\Autoloader\\'";
diff --git a/tests/system/Database/Live/LimitTest.php b/tests/system/Database/Live/LimitTest.php
index fe689b0cf696..1f5e9a75b708 100644
--- a/tests/system/Database/Live/LimitTest.php
+++ b/tests/system/Database/Live/LimitTest.php
@@ -29,8 +29,6 @@ public function testLimit()
         $this->assertSame('Politician', $jobs[1]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLimitAndOffset()
     {
         $jobs = $this->db->table('job')
@@ -42,6 +40,4 @@ public function testLimitAndOffset()
         $this->assertSame('Accountant', $jobs[0]->name);
         $this->assertSame('Musician', $jobs[1]->name);
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Database/Live/MetadataTest.php b/tests/system/Database/Live/MetadataTest.php
index 537465edea2e..796122992706 100644
--- a/tests/system/Database/Live/MetadataTest.php
+++ b/tests/system/Database/Live/MetadataTest.php
@@ -52,8 +52,6 @@ public function testListTables()
         $this->assertSame($this->expectedTables, array_values($result));
     }
 
-    //--------------------------------------------------------------------
-
     public function testListTablesConstrainPrefix()
     {
         $result = $this->db->listTables(true);
@@ -61,8 +59,6 @@ public function testListTablesConstrainPrefix()
         $this->assertSame($this->expectedTables, array_values($result));
     }
 
-    //--------------------------------------------------------------------
-
     public function testConstrainPrefixIgnoresOtherTables()
     {
         $this->forge = Database::forge($this->DBGroup);
@@ -96,6 +92,4 @@ public function testConstrainPrefixIgnoresOtherTables()
         $this->forge->dropTable('widgets');
         $this->db->setPrefix($DBPrefix);
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Database/Live/OrderTest.php b/tests/system/Database/Live/OrderTest.php
index 08ba75eaab77..24aebbad7c5e 100644
--- a/tests/system/Database/Live/OrderTest.php
+++ b/tests/system/Database/Live/OrderTest.php
@@ -32,8 +32,6 @@ public function testOrderAscending()
         $this->assertSame('Politician', $jobs[3]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrderDescending()
     {
         $jobs = $this->db->table('job')
@@ -48,8 +46,6 @@ public function testOrderDescending()
         $this->assertSame('Politician', $jobs[0]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testMultipleOrderValues()
     {
         $users = $this->db->table('user')
@@ -65,8 +61,6 @@ public function testMultipleOrderValues()
         $this->assertSame('Derek Jones', $users[3]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrderRandom()
     {
         $sql = $this->db->table('job')
diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php
index 358a412a30ef..4a06ee00d78d 100644
--- a/tests/system/Database/Live/PreparedQueryTest.php
+++ b/tests/system/Database/Live/PreparedQueryTest.php
@@ -19,8 +19,6 @@ final class PreparedQueryTest extends CIUnitTestCase
     protected $refresh = true;
     protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
-    //--------------------------------------------------------------------
-
     public function testPrepareReturnsPreparedQuery()
     {
         $query = $this->db->prepare(static function ($db) {
@@ -76,8 +74,6 @@ public function testPrepareReturnsManualPreparedQuery()
         $query->close();
     }
 
-    //--------------------------------------------------------------------
-
     public function testExecuteRunsQueryAndReturnsResultObject()
     {
         $query = $this->db->prepare(static function ($db) {
diff --git a/tests/system/Database/Live/PretendTest.php b/tests/system/Database/Live/PretendTest.php
index dc738e7559e0..132d104c9662 100644
--- a/tests/system/Database/Live/PretendTest.php
+++ b/tests/system/Database/Live/PretendTest.php
@@ -35,6 +35,4 @@ public function testPretendReturnsQueryObject()
 
         $this->assertInstanceOf(Query::class, $result);
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index a1c8a2999383..f60fb08717ae 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -31,8 +31,6 @@ public function testUpdateSetsAllWithoutWhere()
         $this->assertSame('Bobby', $result[3]->name);
     }
 
-    //--------------------------------------------------------------------
-
     public function testUpdateSetsAllWithoutWhereAndLimit()
     {
         try {
@@ -56,8 +54,6 @@ public function testUpdateSetsAllWithoutWhereAndLimit()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testUpdateWithWhere()
     {
         $this->db->table('user')->update(['name' => 'Bobby'], ['country' => 'US']);
@@ -75,8 +71,6 @@ public function testUpdateWithWhere()
         $this->assertCount(2, $rows);
     }
 
-    //--------------------------------------------------------------------
-
     public function testUpdateWithWhereAndLimit()
     {
         try {
@@ -97,8 +91,6 @@ public function testUpdateWithWhereAndLimit()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testUpdateBatch()
     {
         $data = [
@@ -124,8 +116,6 @@ public function testUpdateBatch()
         ]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testUpdateWithWhereSameColumn()
     {
         $this->db->table('user')->update(['country' => 'CA'], ['country' => 'US']);
@@ -143,8 +133,6 @@ public function testUpdateWithWhereSameColumn()
         $this->assertCount(2, $rows);
     }
 
-    //--------------------------------------------------------------------
-
     public function testUpdateWithWhereSameColumn2()
     {
         // calling order: set() -> where()
@@ -166,8 +154,6 @@ public function testUpdateWithWhereSameColumn2()
         $this->assertCount(2, $rows);
     }
 
-    //--------------------------------------------------------------------
-
     public function testUpdateWithWhereSameColumn3()
     {
         // calling order: where() -> set() in update()
@@ -188,8 +174,6 @@ public function testUpdateWithWhereSameColumn3()
         $this->assertCount(2, $rows);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group single
      *
@@ -208,8 +192,6 @@ public function testUpdatePeriods()
         ]);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://codeigniter4.github.io/CodeIgniter4/database/query_builder.html#updating-data
      */
diff --git a/tests/system/Database/Live/WriteTypeQueryTest.php b/tests/system/Database/Live/WriteTypeQueryTest.php
index beb633b22e14..7a984bcc6d52 100644
--- a/tests/system/Database/Live/WriteTypeQueryTest.php
+++ b/tests/system/Database/Live/WriteTypeQueryTest.php
@@ -26,8 +26,6 @@ public function testSet()
         $this->assertTrue($this->db->isWriteType($sql));
     }
 
-    //--------------------------------------------------------------------
-
     public function testInsert()
     {
         $builder = $this->db->table('jobs');
@@ -48,8 +46,6 @@ public function testInsert()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testUpdate()
     {
         $builder = new BaseBuilder('jobs', $this->db);
@@ -65,8 +61,6 @@ public function testUpdate()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testDelete()
     {
         $builder = $this->db->table('jobs');
@@ -75,8 +69,6 @@ public function testDelete()
         $this->assertTrue($this->db->isWriteType($sql));
     }
 
-    //--------------------------------------------------------------------
-
     public function testReplace()
     {
         if (in_array($this->db->DBDriver, ['Postgre', 'SQLSRV'], true)) {
@@ -95,8 +87,6 @@ public function testReplace()
         $this->assertTrue($this->db->isWriteType($sql));
     }
 
-    //--------------------------------------------------------------------
-
     public function testCreate()
     {
         $sql = 'CREATE DATABASE foo';
@@ -104,8 +94,6 @@ public function testCreate()
         $this->assertTrue($this->db->isWriteType($sql));
     }
 
-    //--------------------------------------------------------------------
-
     public function testDrop()
     {
         $sql = 'DROP DATABASE foo';
@@ -117,8 +105,6 @@ public function testDrop()
         $this->assertTrue($this->db->isWriteType($sql));
     }
 
-    //--------------------------------------------------------------------
-
     public function testTruncate()
     {
         $builder = new BaseBuilder('user', $this->db);
@@ -127,8 +113,6 @@ public function testTruncate()
         $this->assertTrue($this->db->isWriteType($sql));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLoad()
     {
         $sql = "LOAD DATA INFILE '/tmp/test.txt' INTO TABLE test FIELDS TERMINATED BY ','  LINES STARTING BY 'xxx';";
@@ -136,8 +120,6 @@ public function testLoad()
         $this->assertTrue($this->db->isWriteType($sql));
     }
 
-    //--------------------------------------------------------------------
-
     public function testCopy()
     {
         $sql = "COPY demo(firstname, lastname) TO 'demo.txt' DELIMITER ' ';";
diff --git a/tests/system/Filters/CSRFTest.php b/tests/system/Filters/CSRFTest.php
index 878c6e78aaf7..7840f67e6ed0 100644
--- a/tests/system/Filters/CSRFTest.php
+++ b/tests/system/Filters/CSRFTest.php
@@ -22,7 +22,6 @@ protected function setUp(): void
         $this->config = new \Config\Filters();
     }
 
-    //--------------------------------------------------------------------
     public function testNormal()
     {
         $this->config->globals = [
diff --git a/tests/system/Filters/DebugToolbarTest.php b/tests/system/Filters/DebugToolbarTest.php
index 9d1b5f24a422..aa31613f4770 100644
--- a/tests/system/Filters/DebugToolbarTest.php
+++ b/tests/system/Filters/DebugToolbarTest.php
@@ -24,8 +24,6 @@ protected function setUp(): void
         $this->response = Services::response();
     }
 
-    //--------------------------------------------------------------------
-
     public function testDebugToolbarFilter()
     {
         $_SERVER['REQUEST_METHOD'] = 'GET';
diff --git a/tests/system/Filters/HoneypotTest.php b/tests/system/Filters/HoneypotTest.php
index fa8089c1e5ba..0361a3f602cf 100644
--- a/tests/system/Filters/HoneypotTest.php
+++ b/tests/system/Filters/HoneypotTest.php
@@ -30,7 +30,6 @@ protected function setUp(): void
         $_POST[$this->honey->name] = 'hey';
     }
 
-    //--------------------------------------------------------------------
     public function testBeforeTriggered()
     {
         $this->config->globals = [
@@ -48,7 +47,6 @@ public function testBeforeTriggered()
         $request = $filters->run($uri, 'before');
     }
 
-    //--------------------------------------------------------------------
     public function testBeforeClean()
     {
         $this->config->globals = [
@@ -69,8 +67,6 @@ public function testBeforeClean()
         $this->assertSame($expected, $request);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
@@ -93,8 +89,6 @@ public function testAfter()
         $this->assertStringContainsString($this->honey->name, $this->response->getBody());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
diff --git a/tests/system/Filters/fixtures/GoogleMe.php b/tests/system/Filters/fixtures/GoogleMe.php
index f4dec838a690..0594ed0813c3 100644
--- a/tests/system/Filters/fixtures/GoogleMe.php
+++ b/tests/system/Filters/fixtures/GoogleMe.php
@@ -15,14 +15,10 @@ public function before(RequestInterface $request, $arguments = null)
         return $request;
     }
 
-    //--------------------------------------------------------------------
-
     public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
     {
         $response->csp = 'http://google.com';
 
         return $response;
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Filters/fixtures/InvalidClass.php b/tests/system/Filters/fixtures/InvalidClass.php
index d43d41119701..6385816983fe 100644
--- a/tests/system/Filters/fixtures/InvalidClass.php
+++ b/tests/system/Filters/fixtures/InvalidClass.php
@@ -8,6 +8,4 @@ public function index()
     {
         return 'bad';
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/HTTP/CLIRequestTest.php b/tests/system/HTTP/CLIRequestTest.php
index 08fd32b777e3..63b386e6134e 100644
--- a/tests/system/HTTP/CLIRequestTest.php
+++ b/tests/system/HTTP/CLIRequestTest.php
@@ -30,8 +30,6 @@ protected function setUp(): void
         $_GET  = [];
     }
 
-    //--------------------------------------------------------------------
-
     public function testParsingSegments()
     {
         $_SERVER['argv'] = [
@@ -212,8 +210,6 @@ public function testParsingMalformed3()
         $this->assertSame('users/21/profile/bar', $this->request->getPath());
     }
 
-    //--------------------------------------------------------------------
-
     public function testFetchGlobalsSingleValue()
     {
         $_POST['foo'] = 'bar';
@@ -461,8 +457,6 @@ public function testFetchGlobalWithEmptyNotation()
         $this->assertSame($expected, $this->request->fetchGlobal('post', 'clients[]'));
     }
 
-    //--------------------------------------------------------------------
-
     public function ipAddressChecks()
     {
         return [
@@ -517,8 +511,6 @@ public function testValidIPAddress($expected, $address, $type = null)
         $this->assertSame($expected, $this->request->isValidIP($address, $type));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetIPAddressDefault()
     {
         $this->assertSame('0.0.0.0', $this->request->getIPAddress());
@@ -601,8 +593,6 @@ public function testGetIPAddressThruProxyOutofSubnet()
 
     //FIXME getIPAddress should have more testing, to 100% code coverage
 
-    //--------------------------------------------------------------------
-
     public function testMethodReturnsRightStuff()
     {
         // Defaults method to CLI now.
@@ -610,8 +600,6 @@ public function testMethodReturnsRightStuff()
         $this->assertSame('CLI', $this->request->getMethod(true));
     }
 
-    //---------------------------------------------------------------------
-
     public function testMethodIsCliReturnsAlwaysTrue()
     {
         $this->assertTrue($this->request->isCLI());
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index abd3ca98ed23..d450a25c1386 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -657,7 +657,6 @@ public function testSendWithQuery()
         $this->assertSame('http://www.foo.com/api/v1/products?name=Henry&d.t=value', $options[CURLOPT_URL]);
     }
 
-    //--------------------------------------------------------------------
     public function testSendWithDelay()
     {
         $request = $this->getRequest([
@@ -671,7 +670,6 @@ public function testSendWithDelay()
         $this->assertSame(1.0, $request->getDelay());
     }
 
-    //--------------------------------------------------------------------
     public function testSendContinued()
     {
         $request = $this->getRequest([
@@ -731,7 +729,6 @@ public function testSendContinuedWithManyHeaders()
         $this->assertSame(200, $response->getStatusCode());
     }
 
-    //--------------------------------------------------------------------
     public function testSplitResponse()
     {
         $request = $this->getRequest([
@@ -744,7 +741,6 @@ public function testSplitResponse()
         $this->assertSame('Hi there', $response->getBody());
     }
 
-    //--------------------------------------------------------------------
     public function testApplyBody()
     {
         $request = $this->getRequest([
@@ -760,7 +756,6 @@ public function testApplyBody()
         $this->assertSame('name=George', $request->curl_options[CURLOPT_POSTFIELDS]);
     }
 
-    //--------------------------------------------------------------------
     public function testResponseHeaders()
     {
         $request = $this->getRequest([
diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php
index 389b017fa574..d4991a67792c 100644
--- a/tests/system/HTTP/ContentSecurityPolicyTest.php
+++ b/tests/system/HTTP/ContentSecurityPolicyTest.php
@@ -41,8 +41,6 @@ protected function work(string $parm = 'Hello')
         return $buffer;
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
@@ -55,8 +53,6 @@ public function testExistence()
         $this->assertHeaderEmitted('Content-Security-Policy:');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
@@ -70,8 +66,6 @@ public function testReportOnly()
         $this->assertHeaderEmitted('Content-Security-Policy:');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
@@ -91,8 +85,6 @@ public function testDefaults()
         $this->assertStringContainsString("style-src 'self';", $result);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
@@ -329,8 +321,6 @@ public function testStyleSrc()
         $this->assertStringContainsString("style-src 'self' cdn.cloudy.com;", $result);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
@@ -482,8 +472,6 @@ public function testBodyStyleNonce()
         $this->assertStringContainsString('nonce-', $result);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
diff --git a/tests/system/HTTP/DownloadResponseTest.php b/tests/system/HTTP/DownloadResponseTest.php
index 797987663619..d98fca98d63e 100644
--- a/tests/system/HTTP/DownloadResponseTest.php
+++ b/tests/system/HTTP/DownloadResponseTest.php
@@ -265,14 +265,12 @@ public function testThrowExceptionWhenNoSetDownloadSource()
         $response->sendBody();
     }
 
-    //--------------------------------------------------------------------
     public function testGetReason()
     {
         $response = new DownloadResponse('unit-test.php', false);
         $this->assertSame('OK', $response->getReason());
     }
 
-    //--------------------------------------------------------------------
     public function testPretendOutput()
     {
         $response = new DownloadResponse('unit-test.php', false);
@@ -288,8 +286,6 @@ public function testPretendOutput()
         $this->assertSame(file_get_contents(__FILE__), $actual);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
diff --git a/tests/system/HTTP/Files/FileCollectionTest.php b/tests/system/HTTP/Files/FileCollectionTest.php
index 284e0bd56195..efc02ae8ba14 100644
--- a/tests/system/HTTP/Files/FileCollectionTest.php
+++ b/tests/system/HTTP/Files/FileCollectionTest.php
@@ -16,8 +16,6 @@ protected function setUp(): void
         $_FILES = [];
     }
 
-    //--------------------------------------------------------------------
-
     public function testAllReturnsArrayWithNoFiles()
     {
         $files = new FileCollection();
@@ -25,8 +23,6 @@ public function testAllReturnsArrayWithNoFiles()
         $this->assertSame([], $files->all());
     }
 
-    //--------------------------------------------------------------------
-
     public function testAllReturnsValidSingleFile()
     {
         $_FILES = [
@@ -50,8 +46,6 @@ public function testAllReturnsValidSingleFile()
         $this->assertSame(124, $file->getSize());
     }
 
-    //--------------------------------------------------------------------
-
     public function testAllReturnsValidMultipleFilesSameName()
     {
         $_FILES = [
@@ -94,8 +88,6 @@ public function testAllReturnsValidMultipleFilesSameName()
         $this->assertSame(124, $file->getSize());
     }
 
-    //--------------------------------------------------------------------
-
     public function testAllReturnsValidMultipleFilesDifferentName()
     {
         $_FILES = [
@@ -141,8 +133,6 @@ public function testAllReturnsValidMultipleFilesDifferentName()
         $this->assertSame(248, $file->getSize());
     }
 
-    //--------------------------------------------------------------------
-
     public function testExtensionGuessing()
     {
         $_FILES = [
@@ -219,8 +209,6 @@ public function testExtensionGuessing()
         $this->assertSame('', $file->guessExtension());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group single
      */
@@ -269,8 +257,6 @@ public function testAllReturnsValidSingleFileNestedName()
         $this->assertSame(124, $file->getSize());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHasFileWithSingleFile()
     {
         $_FILES = [
@@ -289,8 +275,6 @@ public function testHasFileWithSingleFile()
         $this->assertFalse($collection->hasFile('foo'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testHasFileWithMultipleFilesWithDifferentNames()
     {
         $_FILES = [
@@ -316,8 +300,6 @@ public function testHasFileWithMultipleFilesWithDifferentNames()
         $this->assertTrue($collection->hasFile('userfile2'));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group single
      */
@@ -356,8 +338,6 @@ public function testHasFileWithSingleFileNestedName()
         $this->assertTrue($collection->hasFile('userfile.foo.bar'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testErrorString()
     {
         $_FILES = [
@@ -417,8 +397,6 @@ public function testErrorStringWithNoError()
         $this->assertSame($expected, $file->getErrorString());
     }
 
-    //--------------------------------------------------------------------
-
     public function testError()
     {
         $_FILES = [
@@ -472,8 +450,6 @@ public function testErrorWithNoError()
         $this->assertSame(UPLOAD_ERR_OK, $file->getError());
     }
 
-    //--------------------------------------------------------------------
-
     public function testFileReturnsValidSingleFile()
     {
         $_FILES = [
@@ -494,8 +470,6 @@ public function testFileReturnsValidSingleFile()
         $this->assertSame(124, $file->getSize());
     }
 
-    //--------------------------------------------------------------------
-
     public function testFileNoExistSingleFile()
     {
         $_FILES = [
@@ -513,8 +487,6 @@ public function testFileNoExistSingleFile()
         $this->AssertNull($file);
     }
 
-    //--------------------------------------------------------------------
-
     public function testFileReturnValidMultipleFiles()
     {
         $_FILES = [
@@ -558,8 +530,6 @@ public function testFileReturnValidMultipleFiles()
         $this->assertSame(248, $file2->getSize());
     }
 
-    //--------------------------------------------------------------------
-
     public function testFileWithMultipleFilesNestedName()
     {
         $_FILES = [
@@ -626,8 +596,6 @@ public function testFileWithMultipleFilesNestedName()
         $this->assertSame(243, $file2->getSize());
     }
 
-    //--------------------------------------------------------------------
-
     public function testDoesntHaveFile()
     {
         $_FILES = [
@@ -681,8 +649,6 @@ public function testDoesntHaveFile()
         $this->assertNull($collection->getFile('my-form.detailz.avatars.0'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetFileMultipleHasNoFile()
     {
         $_FILES = [
@@ -714,8 +680,6 @@ public function testGetFileMultipleHasNoFile()
         $this->assertNull($files);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetFileMultipleReturnValidDotNotationSyntax()
     {
         $_FILES = [
@@ -784,8 +748,6 @@ public function testGetFileMultipleReturnValidDotNotationSyntax()
         $this->assertSame(243, $files[1]->getSize());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetFileMultipleReturnInvalidDotNotationSyntax()
     {
         $_FILES = [
@@ -824,8 +786,6 @@ public function testGetFileMultipleReturnInvalidDotNotationSyntax()
         $this->assertNull($files);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetFileMultipleReturnValidMultipleFiles()
     {
         $_FILES = [
@@ -871,8 +831,6 @@ public function testGetFileMultipleReturnValidMultipleFiles()
         $this->assertSame('text/csv', $files[1]->getClientMimeType());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetFileMultipleReturnInvalidSingleFile()
     {
         $_FILES = [
@@ -890,6 +848,4 @@ public function testGetFileMultipleReturnInvalidSingleFile()
         $files = $collection->getFileMultiple('userfile');
         $this->assertNull($files);
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php
index 3870fc45a7a2..17ab39be6bf2 100644
--- a/tests/system/HTTP/Files/FileMovingTest.php
+++ b/tests/system/HTTP/Files/FileMovingTest.php
@@ -40,8 +40,6 @@ protected function tearDown(): void
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testMove()
     {
         $finalFilename = 'fileA';
@@ -84,8 +82,6 @@ public function testMove()
         $this->assertTrue($this->root->hasChild('destination/' . $finalFilename . '_1.txt'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testMoveOverwriting()
     {
         $finalFilename = 'file_with_delimiters_underscore';
@@ -138,8 +134,6 @@ public function testMoveOverwriting()
         $this->assertFileExists($destination . '/' . $finalFilename . '.txt');
     }
 
-    //--------------------------------------------------------------------
-
     public function testMoved()
     {
         $finalFilename = 'fileA';
@@ -173,8 +167,6 @@ public function testMoved()
         $this->assertTrue($file->hasMoved());
     }
 
-    //--------------------------------------------------------------------
-
     public function testStore()
     {
         $finalFilename = 'fileA';
@@ -207,8 +199,6 @@ public function testStore()
         $this->assertSame($destination . '/fileA.txt', $path);
     }
 
-    //--------------------------------------------------------------------
-
     public function testAlreadyMoved()
     {
         $finalFilename = 'fileA';
@@ -242,8 +232,6 @@ public function testAlreadyMoved()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testInvalidFile()
     {
         $_FILES = [
@@ -265,8 +253,6 @@ public function testInvalidFile()
         $file->move($destination, $file->getName(), false);
     }
 
-    //--------------------------------------------------------------------
-
     public function testFailedMove()
     {
         $_FILES = [
@@ -292,8 +278,6 @@ public function testFailedMove()
         $this->expectException(HTTPException::class);
         $file->move($destination, $file->getName(), false);
     }
-
-    //--------------------------------------------------------------------
 }
 
 /*
diff --git a/tests/system/HTTP/HeaderTest.php b/tests/system/HTTP/HeaderTest.php
index f8b566a5634e..1751095a93cf 100644
--- a/tests/system/HTTP/HeaderTest.php
+++ b/tests/system/HTTP/HeaderTest.php
@@ -32,8 +32,6 @@ public function testHeaderStoresBasicsWithNull()
         $this->assertSame('', $header->getValue());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHeaderStoresArrayValues()
     {
         $name  = 'foo';
@@ -48,8 +46,6 @@ public function testHeaderStoresArrayValues()
         $this->assertSame($value, $header->getValue());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHeaderSetters()
     {
         $name  = 'foo';
@@ -70,8 +66,6 @@ public function testHeaderSetters()
         $this->assertSame($name . ': bar, baz', (string) $header);
     }
 
-    //--------------------------------------------------------------------
-
     public function testHeaderAppendsValueSkippedForNull()
     {
         $name     = 'foo';
@@ -104,8 +98,6 @@ public function testHeaderConvertsSingleToArray()
         $this->assertSame($expected, $header->getValue());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHeaderPrependsValueSkippedForNull()
     {
         $name     = 'foo';
@@ -138,8 +130,6 @@ public function testHeaderPrependsValue()
         $this->assertSame($expected, $header->getValue());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHeaderLineSimple()
     {
         $name  = 'foo';
@@ -169,8 +159,6 @@ public function testHeaderLineValueNotStringOrArray()
         $this->assertSame($expected, $header->getValueLine());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHeaderSetValueWithNullWillMarkAsEmptyString()
     {
         $name     = 'foo';
@@ -197,8 +185,6 @@ public function testHeaderLineWithArrayValues()
         $this->assertSame($expected, $header->getValueLine());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHeaderToStringShowsEntireHeader()
     {
         $name = 'foo';
diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php
index 257bb034b5f2..2dab90797192 100644
--- a/tests/system/HTTP/IncomingRequestDetectingTest.php
+++ b/tests/system/HTTP/IncomingRequestDetectingTest.php
@@ -28,8 +28,6 @@ protected function setUp(): void
         $this->request = new IncomingRequest(new App(), new URI($origin), null, new UserAgent());
     }
 
-    //--------------------------------------------------------------------
-
     public function testPathDefault()
     {
         $this->request->uri     = '/index.php/woot?code=good#pos';
@@ -111,8 +109,6 @@ public function testPathRequestURISuppressed()
         $this->assertSame($expected, $this->request->detectPath('REQUEST_URI'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testPathQueryString()
     {
         $this->request->uri      = '/?/ci/index.php/woot';
@@ -133,8 +129,6 @@ public function testPathQueryStringEmpty()
         $this->assertSame($expected, $this->request->detectPath('QUERY_STRING'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testPathPathInfo()
     {
         $this->request->uri = '/index.php/woot?code=good#pos';
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 2037b60c7e5f..f4152c87112b 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -28,8 +28,6 @@ protected function setUp(): void
         $_POST = $_GET = $_SERVER = $_REQUEST = $_ENV = $_COOKIE = $_SESSION = [];
     }
 
-    //--------------------------------------------------------------------
-
     public function testCanGrabRequestVars()
     {
         $_REQUEST['TEST'] = 5;
@@ -63,8 +61,6 @@ public function testCanGrabPostBeforeGet()
         $this->assertSame('3', $this->request->getGetPost('TEST'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNoOldInput()
     {
         $this->assertNull($this->request->getOldInput('name'));
@@ -133,8 +129,6 @@ public function testCanSerializeOldArray()
         $this->assertSame($locations, $this->request->getOldInput('location'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testCanGrabServerVars()
     {
         $server                   = $this->getPrivateProperty($this->request, 'globals');
@@ -163,8 +157,6 @@ public function testCanGrabCookieVars()
         $this->assertNull($this->request->getCookie('TESTY'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testStoresDefaultLocale()
     {
         $config = new App();
@@ -199,8 +191,6 @@ public function testSetBadLocale()
         $this->assertSame('es', $request->getLocale());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/2774
      */
@@ -272,8 +262,6 @@ public function testNegotiatesLanguage()
         $this->assertSame('en', $this->request->negotiate('language', ['en', 'da']));
     }
 
-    //--------------------------------------------------------------------
-
     public function testCanGrabGetRawJSON()
     {
         $json = '{"code":1, "message":"ok"}';
@@ -416,8 +404,6 @@ public function testCanGrabGetRawInput()
         $this->assertSame($expected, $request->getRawInput());
     }
 
-    //--------------------------------------------------------------------
-
     public function testIsCLI()
     {
         // this should be the case in unit testing
@@ -430,8 +416,6 @@ public function testIsAJAX()
         $this->assertTrue($this->request->isAJAX());
     }
 
-    //--------------------------------------------------------------------
-
     public function testIsSecure()
     {
         $_SERVER['HTTPS'] = 'on';
@@ -450,8 +434,6 @@ public function testIsSecureForwarded()
         $this->assertTrue($this->request->isSecure());
     }
 
-    //--------------------------------------------------------------------
-
     public function testUserAgent()
     {
         $_SERVER['HTTP_USER_AGENT'] = 'Mozilla';
@@ -462,8 +444,6 @@ public function testUserAgent()
         $this->assertSame('Mozilla', $request->getUserAgent()->__toString());
     }
 
-    //--------------------------------------------------------------------
-
     public function testFileCollectionFactory()
     {
         $_FILES = [
@@ -486,8 +466,6 @@ public function testFileCollectionFactory()
         $this->assertSame(124, $file->getSize());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetFileMultiple()
     {
         $_FILES = [
@@ -520,8 +498,6 @@ public function testGetFileMultiple()
         $this->assertSame(125, $gotit[1]->getSize());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetFile()
     {
         $_FILES = [
@@ -538,8 +514,6 @@ public function testGetFile()
         $this->assertSame(124, $gotit->getSize());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSpoofing()
     {
         $this->request->setMethod('WINK');
@@ -605,8 +579,6 @@ public function testExtensionPHP($path, $detectPath)
         $this->assertSame($detectPath, $request->detectPath());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetPath()
     {
         $_SERVER['REQUEST_URI'] = '/index.php/fruits/banana';
@@ -652,8 +624,6 @@ public function testGetPathIsRediscovered()
         $this->assertSame('candy/snickers', $request->getPath());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetPath()
     {
         $request = new IncomingRequest(new App(), new URI(), null, new UserAgent());
diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php
index 18d75e408796..e0aa7c8559ba 100644
--- a/tests/system/HTTP/MessageTest.php
+++ b/tests/system/HTTP/MessageTest.php
@@ -22,15 +22,12 @@ protected function setUp(): void
         $this->message = new Message();
     }
 
-    //--------------------------------------------------------------------
-
     protected function tearDown(): void
     {
         $this->message = null;
         unset($this->message);
     }
 
-    //--------------------------------------------------------------------
     // We can only test the headers retrieved from $_SERVER
     // This test might fail under apache.
     public function testHeadersRetrievesHeaders()
@@ -47,8 +44,6 @@ public function testHeadersRetrievesHeaders()
         $this->assertSame('RoscoePekoTrain.com', $headers['Referer']->getValue());
     }
 
-    //--------------------------------------------------------------------
-
     public function testCanGrabSingleHeader()
     {
         $this->message->setHeader('Host', 'daisyduke.com');
@@ -59,8 +54,6 @@ public function testCanGrabSingleHeader()
         $this->assertSame('daisyduke.com', $header->getValue());
     }
 
-    //--------------------------------------------------------------------
-
     public function testCaseInsensitiveheader()
     {
         $this->message->setHeader('Host', 'daisyduke.com');
@@ -69,8 +62,6 @@ public function testCaseInsensitiveheader()
         $this->assertSame('daisyduke.com', $this->message->header('HOST')->getValue());
     }
 
-    //--------------------------------------------------------------------
-
     public function testCanSetHeaders()
     {
         $this->message->setHeader('first', 'kiss');
@@ -80,8 +71,6 @@ public function testCanSetHeaders()
         $this->assertSame(['black', 'book'], $this->message->header('Second')->getValue());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetHeaderOverwritesPrevious()
     {
         $this->message->setHeader('Pragma', 'cache');
@@ -99,8 +88,6 @@ public function testHeaderLineIsReadable()
         $this->assertSame('daisyduke.com', $this->message->header('Host')->getValueLine());
     }
 
-    //--------------------------------------------------------------------
-
     public function testCanRemoveHeader()
     {
         $this->message->setHeader('Host', 'daisyduke.com');
@@ -110,8 +97,6 @@ public function testCanRemoveHeader()
         $this->assertNull($this->message->header('host'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testCanAppendHeader()
     {
         $this->message->setHeader('accept', ['json', 'html']);
@@ -121,8 +106,6 @@ public function testCanAppendHeader()
         $this->assertSame(['json', 'html', 'xml'], $this->message->header('accept')->getValue());
     }
 
-    //--------------------------------------------------------------------
-
     public function testCanPrependHeader()
     {
         $this->message->setHeader('accept', ['json', 'html']);
@@ -132,8 +115,6 @@ public function testCanPrependHeader()
         $this->assertSame(['xml', 'json', 'html'], $this->message->header('accept')->getValue());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetProtocolWorks()
     {
         $this->message->setProtocolVersion('1.1');
@@ -141,8 +122,6 @@ public function testSetProtocolWorks()
         $this->assertSame('1.1', $this->message->getProtocolVersion());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetProtocolWorksWithNonNumericVersion()
     {
         $this->message->setProtocolVersion('HTTP/1.1');
@@ -150,16 +129,12 @@ public function testSetProtocolWorksWithNonNumericVersion()
         $this->assertSame('1.1', $this->message->getProtocolVersion());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetProtocolThrowsExceptionWithInvalidProtocol()
     {
         $this->expectException(HTTPException::class);
         $this->message->setProtocolVersion('1.2');
     }
 
-    //--------------------------------------------------------------------
-
     public function testBodyBasics()
     {
         $body = 'a strange little fellow.';
@@ -169,8 +144,6 @@ public function testBodyBasics()
         $this->assertSame($body, $this->message->getBody());
     }
 
-    //--------------------------------------------------------------------
-
     public function testAppendBody()
     {
         $this->message->setBody('moo');
@@ -180,8 +153,6 @@ public function testAppendBody()
         $this->assertSame('moo' . '\n', $this->message->getBody());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetHeaderReplacingHeader()
     {
         $this->message->setHeader('Accept', 'json');
@@ -261,8 +232,6 @@ public function testSetHeaderWithExistingArrayValuesAppendNullValue()
         $this->assertSame('json, html, xml', $this->message->getHeaderLine('Accept'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testPopulateHeadersWithoutContentType()
     {
         // fail path, if the CONTENT_TYPE doesn't exist
@@ -279,8 +248,6 @@ public function testPopulateHeadersWithoutContentType()
         $_SERVER = $original; // restore so code coverage doesn't break
     }
 
-    //--------------------------------------------------------------------
-
     public function testPopulateHeadersWithoutHTTP()
     {
         // fail path, if arguement does't have the HTTP_*
@@ -297,8 +264,6 @@ public function testPopulateHeadersWithoutHTTP()
         $_SERVER = $original; // restore so code coverage doesn't break
     }
 
-    //--------------------------------------------------------------------
-
     public function testPopulateHeadersKeyNotExists()
     {
         // Success path, if array key is not exists, assign empty string to it's value
@@ -315,8 +280,6 @@ public function testPopulateHeadersKeyNotExists()
         $_SERVER = $original; // restore so code coverage doesn't break
     }
 
-    //--------------------------------------------------------------------
-
     public function testPopulateHeaders()
     {
         // success path
diff --git a/tests/system/HTTP/NegotiateTest.php b/tests/system/HTTP/NegotiateTest.php
index 7896059df768..a1d92212ee33 100644
--- a/tests/system/HTTP/NegotiateTest.php
+++ b/tests/system/HTTP/NegotiateTest.php
@@ -30,16 +30,12 @@ protected function setUp(): void
         $this->negotiate = new Negotiate($this->request);
     }
 
-    //--------------------------------------------------------------------
-
     protected function tearDown(): void
     {
         $this->request = $this->negotiate = null;
         unset($this->request, $this->negotiate);
     }
 
-    //--------------------------------------------------------------------
-
     public function testNegotiateMediaFindsHighestMatch()
     {
         $this->request->setHeader('Accept', 'text/plain; q=0.5, text/html, text/x-dvi; q=0.8, text/x-c');
@@ -54,8 +50,6 @@ public function testNegotiateMediaFindsHighestMatch()
         $this->assertSame('text/md', $this->negotiate->media(['text/md']));
     }
 
-    //--------------------------------------------------------------------
-
     public function testParseHeaderDeterminesCorrectPrecedence()
     {
         $header = $this->negotiate->parseHeader('text/*, text/plain, text/plain;format=flowed, */*');
@@ -66,8 +60,6 @@ public function testParseHeaderDeterminesCorrectPrecedence()
         $this->assertSame('*/*', $header[3]['value']);
     }
 
-    //--------------------------------------------------------------------
-
     public function testNegotiateMediaReturnsSupportedMatchWhenAsterisksInAvailable()
     {
         $this->request->setHeader('Accept', 'image/*, text/*');
@@ -75,8 +67,6 @@ public function testNegotiateMediaReturnsSupportedMatchWhenAsterisksInAvailable(
         $this->assertSame('text/plain', $this->negotiate->media(['text/plain']));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNegotiateMediaRecognizesMediaTypes()
     {
         // Image has a higher specificity, but is the wrong type...
@@ -85,8 +75,6 @@ public function testNegotiateMediaRecognizesMediaTypes()
         $this->assertSame('text/plain', $this->negotiate->media(['text/plain']));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNegotiateMediaSupportsStrictMatching()
     {
         // Image has a higher specificity, but is the wrong type...
@@ -96,8 +84,6 @@ public function testNegotiateMediaSupportsStrictMatching()
         $this->assertSame('', $this->negotiate->media(['text/plain'], true));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group single
      */
@@ -112,15 +98,11 @@ public function testAcceptCharsetMatchesBasics()
         $this->assertSame('utf-8', $this->negotiate->charset(['iso-8859', 'unicode-1-2']));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNegotiateEncodingReturnsFirstIfNoAcceptHeaderExists()
     {
         $this->assertSame('compress', $this->negotiate->encoding(['compress', 'gzip']));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNegotiatesEncodingBasics()
     {
         $this->request->setHeader('Accept-Encoding', 'gzip;q=1.0, identity; q=0.4, compress;q=0.5');
@@ -130,8 +112,6 @@ public function testNegotiatesEncodingBasics()
         $this->assertSame('identity', $this->negotiate->encoding());
     }
 
-    //--------------------------------------------------------------------
-
     public function testAcceptLanguageBasics()
     {
         $this->request->setHeader('Accept-Language', 'da, en-gb;q=0.8, en;q=0.7');
@@ -141,8 +121,6 @@ public function testAcceptLanguageBasics()
         $this->assertSame('en', $this->negotiate->language(['en']));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/2774
      */
diff --git a/tests/system/HTTP/RedirectResponseTest.php b/tests/system/HTTP/RedirectResponseTest.php
index 9aad6a681a63..45fb04e1b01b 100644
--- a/tests/system/HTTP/RedirectResponseTest.php
+++ b/tests/system/HTTP/RedirectResponseTest.php
@@ -40,8 +40,6 @@ protected function setUp(): void
         Services::injectMock('request', $this->request);
     }
 
-    //--------------------------------------------------------------------
-
     public function testRedirectToFullURI()
     {
         $response = new RedirectResponse(new App());
@@ -52,8 +50,6 @@ public function testRedirectToFullURI()
         $this->assertSame('http://example.com/foo', $response->getHeaderLine('Location'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testRedirectRoute()
     {
         $response = new RedirectResponse(new App());
@@ -84,8 +80,6 @@ public function testRedirectRouteBad()
         $response->route('differentRoute');
     }
 
-    //--------------------------------------------------------------------
-
     public function testRedirectRelativeConvertsToFullURI()
     {
         $response = new RedirectResponse($this->config);
@@ -96,8 +90,6 @@ public function testRedirectRelativeConvertsToFullURI()
         $this->assertSame('http://example.com/index.php/foo', $response->getHeaderLine('Location'));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
@@ -118,8 +110,6 @@ public function testWithInput()
         $this->assertSame('baz', $_SESSION['_ci_old_input']['post']['bar']);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
@@ -140,8 +130,6 @@ public function testWithValidationErrors()
         $this->assertArrayHasKey('_ci_validation_errors', $_SESSION);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
@@ -158,8 +146,6 @@ public function testWith()
         $this->assertArrayHasKey('foo', $_SESSION);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
diff --git a/tests/system/HTTP/RequestTest.php b/tests/system/HTTP/RequestTest.php
index 141fafd79639..108f0363c80a 100644
--- a/tests/system/HTTP/RequestTest.php
+++ b/tests/system/HTTP/RequestTest.php
@@ -27,8 +27,6 @@ protected function setUp(): void
         $_GET  = [];
     }
 
-    //--------------------------------------------------------------------
-
     public function testFetchGlobalsSingleValue()
     {
         $_POST['foo'] = 'bar';
@@ -288,8 +286,6 @@ public function testFetchGlobalWithEmptyNotation()
         $this->assertSame($expected, $this->request->fetchGlobal('post', 'clients[]'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testFetchGlobalFiltersWithNull()
     {
         $expected = [
@@ -528,8 +524,6 @@ public function testFetchGlobalFiltersWithArrayChildElement()
         $this->assertSame($expected, $this->request->fetchGlobal('post', 'people[0]', FILTER_VALIDATE_INT));
     }
 
-    //--------------------------------------------------------------------
-
     public function ipAddressChecks()
     {
         return [
@@ -584,8 +578,6 @@ public function testValidIPAddress($expected, $address, $type = null)
         $this->assertSame($expected, $this->request->isValidIP($address, $type));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetIPAddressDefault()
     {
         $this->assertSame('0.0.0.0', $this->request->getIPAddress());
@@ -668,8 +660,6 @@ public function testGetIPAddressThruProxyOutofSubnet()
 
     //FIXME getIPAddress should have more testing, to 100% code coverage
 
-    //--------------------------------------------------------------------
-
     public function testMethodReturnsRightStuff()
     {
         // Defaults method to GET now.
diff --git a/tests/system/HTTP/ResponseSendTest.php b/tests/system/HTTP/ResponseSendTest.php
index 2ee2392d19df..f462f3d2f9d0 100644
--- a/tests/system/HTTP/ResponseSendTest.php
+++ b/tests/system/HTTP/ResponseSendTest.php
@@ -59,8 +59,6 @@ public function testHeadersMissingDate()
         $this->assertHeaderEmitted('Date:');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * This test does not test that CSP is handled properly -
      * it makes sure that sending gives CSP a chance to do its thing.
@@ -93,8 +91,6 @@ public function testHeadersWithCSP()
         $this->assertHeaderEmitted('Content-Security-Policy:');
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Make sure cookies are set by RedirectResponse this way
      *
diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php
index 475f7e078c20..cfb86a4319ae 100644
--- a/tests/system/HTTP/ResponseTest.php
+++ b/tests/system/HTTP/ResponseTest.php
@@ -40,8 +40,6 @@ public function testCanSetStatusCode()
         $this->assertSame(200, $response->getStatusCode());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetStatusCodeThrowsExceptionForBadCodes()
     {
         $response = new Response(new App());
@@ -50,8 +48,6 @@ public function testSetStatusCodeThrowsExceptionForBadCodes()
         $response->setStatusCode(54322);
     }
 
-    //--------------------------------------------------------------------
-
     public function testConstructWithCSPEnabled()
     {
         $config             = new App();
@@ -61,8 +57,6 @@ public function testConstructWithCSPEnabled()
         $this->assertTrue($response instanceof Response);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetStatusCodeSetsReason()
     {
         $response = new Response(new App());
@@ -72,8 +66,6 @@ public function testSetStatusCodeSetsReason()
         $this->assertSame('OK', $response->getReasonPhrase());
     }
 
-    //--------------------------------------------------------------------
-
     public function testCanSetCustomReasonCode()
     {
         $response = new Response(new App());
@@ -83,8 +75,6 @@ public function testCanSetCustomReasonCode()
         $this->assertSame('Not the mama', $response->getReasonPhrase());
     }
 
-    //--------------------------------------------------------------------
-
     public function testRequiresMessageWithUnknownStatusCode()
     {
         $response = new Response(new App());
@@ -94,8 +84,6 @@ public function testRequiresMessageWithUnknownStatusCode()
         $response->setStatusCode(115);
     }
 
-    //--------------------------------------------------------------------
-
     public function testRequiresMessageWithSmallStatusCode()
     {
         $response = new Response(new App());
@@ -105,8 +93,6 @@ public function testRequiresMessageWithSmallStatusCode()
         $response->setStatusCode(95);
     }
 
-    //--------------------------------------------------------------------
-
     public function testRequiresMessageWithLargeStatusCode()
     {
         $response = new Response(new App());
@@ -116,8 +102,6 @@ public function testRequiresMessageWithLargeStatusCode()
         $response->setStatusCode(695);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetStatusCodeInterpretsReason()
     {
         $response = new Response(new App());
@@ -127,8 +111,6 @@ public function testSetStatusCodeInterpretsReason()
         $this->assertSame('Multiple Choices', $response->getReasonPhrase());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetStatusCodeSavesCustomReason()
     {
         $response = new Response(new App());
@@ -138,8 +120,6 @@ public function testSetStatusCodeSavesCustomReason()
         $this->assertSame('My Little Pony', $response->getReasonPhrase());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetReasonDefaultsToOK()
     {
         $response = new Response(new App());
@@ -147,8 +127,6 @@ public function testGetReasonDefaultsToOK()
         $this->assertSame('OK', $response->getReasonPhrase());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetDateRemembersDateInUTC()
     {
         $response = new Response(new App());
@@ -163,8 +141,6 @@ public function testSetDateRemembersDateInUTC()
         $this->assertSame($date->format('D, d M Y H:i:s') . ' GMT', $header);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetLink()
     {
         // Ensure our URL is not getting overridden
@@ -200,8 +176,6 @@ public function testSetLink()
         );
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetContentType()
     {
         $response = new Response(new App());
@@ -211,8 +185,6 @@ public function testSetContentType()
         $this->assertSame('text/json; charset=UTF-8', $response->getHeaderLine('Content-Type'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNoCache()
     {
         $response = new Response(new App());
@@ -222,8 +194,6 @@ public function testNoCache()
         $this->assertSame('no-store, max-age=0, no-cache', $response->getHeaderLine('Cache-control'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetCache()
     {
         $response = new Response(new App());
@@ -255,8 +225,6 @@ public function testSetCacheNoOptions()
         $this->assertSame('no-store, max-age=0, no-cache', $response->getHeaderLine('Cache-Control'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetLastModifiedWithDateTimeObject()
     {
         $response = new Response(new App());
@@ -271,8 +239,6 @@ public function testSetLastModifiedWithDateTimeObject()
         $this->assertSame($date->format('D, d M Y H:i:s') . ' GMT', $header);
     }
 
-    //--------------------------------------------------------------------
-
     public function testRedirectSetsDefaultCodeAndLocationHeader()
     {
         $response = new Response(new App());
@@ -284,8 +250,6 @@ public function testRedirectSetsDefaultCodeAndLocationHeader()
         $this->assertSame(302, $response->getStatusCode());
     }
 
-    //--------------------------------------------------------------------
-
     public function testRedirectSetsCode()
     {
         $response = new Response(new App());
@@ -297,8 +261,6 @@ public function testRedirectSetsCode()
         $this->assertSame(307, $response->getStatusCode());
     }
 
-    //--------------------------------------------------------------------
-
     public function testRedirectWithIIS()
     {
         $_SERVER['SERVER_SOFTWARE'] = 'Microsoft-IIS';
@@ -307,8 +269,6 @@ public function testRedirectWithIIS()
         $this->assertSame('0;url=example.com', $response->getHeaderLine('Refresh'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetCookieFails()
     {
         $response = new Response(new App());
@@ -342,8 +302,6 @@ public function testSetCookieSuccessOnPrefix()
         $this->assertFalse($response->hasCookie('foo', null, 'nak'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testJSONWithArray()
     {
         $body = [
@@ -381,8 +339,6 @@ public function testJSONGetFromNormalBody()
         $this->assertSame($expected, $response->getJSON());
     }
 
-    //--------------------------------------------------------------------
-
     public function testXMLWithArray()
     {
         $body = [
@@ -420,8 +376,6 @@ public function testXMLGetFromNormalBody()
         $this->assertSame($expected, $response->getXML());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetDownloadResponseByData()
     {
         $response = new Response(new App());
@@ -467,8 +421,6 @@ public function testVagueDownload()
         $this->assertNull($actual);
     }
 
-    //--------------------------------------------------------------------
-
     public function testPretendMode()
     {
         $response = new MockResponse(new App());
@@ -487,8 +439,6 @@ public function testMisbehaving()
         $response->getStatusCode();
     }
 
-    //--------------------------------------------------------------------
-
     public function testTemporaryRedirect11()
     {
         $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
@@ -513,8 +463,6 @@ public function testTemporaryRedirectGet11()
         $this->assertSame(307, $response->getStatusCode());
     }
 
-    //--------------------------------------------------------------------
-
     // Make sure cookies are set by RedirectResponse this way
     // See https://github.com/codeigniter4/CodeIgniter4/issues/1393
     public function testRedirectResponseCookies()
@@ -530,8 +478,6 @@ public function testRedirectResponseCookies()
         $this->assertTrue($answer1->hasCookie('login_time'));
     }
 
-    //--------------------------------------------------------------------
-
     // Make sure we don't blow up if pretending to send headers
     public function testPretendOutput()
     {
diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php
index e62cc07e9e6c..206e937bff86 100644
--- a/tests/system/HTTP/URITest.php
+++ b/tests/system/HTTP/URITest.php
@@ -20,15 +20,11 @@ protected function setUp(): void
         parent::setUp();
     }
 
-    //--------------------------------------------------------------------
-
     protected function tearDown(): void
     {
         Factories::reset('config');
     }
 
-    //--------------------------------------------------------------------
-
     public function testConstructorSetsAllParts()
     {
         $uri = new URI('http://username:password@hostname:9090/path?arg=value#anchor');
@@ -47,8 +43,6 @@ public function testConstructorSetsAllParts()
         $this->assertSame(['path'], $uri->getSegments());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSegmentsIsPopulatedRightForMultipleSegments()
     {
         $uri = new URI('http://hostname/path/to/script');
@@ -62,8 +56,6 @@ public function testSegmentsIsPopulatedRightForMultipleSegments()
         $this->assertSame(3, $uri->getTotalSegments());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSegmentOutOfRange()
     {
         $this->expectException(HTTPException::class);
@@ -71,8 +63,6 @@ public function testSegmentOutOfRange()
         $uri->getSegment(5);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSegmentOutOfRangeWithSilent()
     {
         $url = 'http://abc.com/a123/b/c';
@@ -80,8 +70,6 @@ public function testSegmentOutOfRangeWithSilent()
         $this->assertSame('', $uri->setSilent()->getSegment(22));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSegmentOutOfRangeWithDefaultValue()
     {
         $this->expectException(HTTPException::class);
@@ -90,8 +78,6 @@ public function testSegmentOutOfRangeWithDefaultValue()
         $uri->getSegment(22, 'something');
     }
 
-    //--------------------------------------------------------------------
-
     public function testSegmentOutOfRangeWithSilentAndDefaultValue()
     {
         $url = 'http://abc.com/a123/b/c';
@@ -99,8 +85,6 @@ public function testSegmentOutOfRangeWithSilentAndDefaultValue()
         $this->assertSame('something', $uri->setSilent()->getSegment(22, 'something'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSegmentsWithDefaultValueAndSilent()
     {
         $uri = new URI('http://hostname/path/to');
@@ -115,8 +99,6 @@ public function testSegmentsWithDefaultValueAndSilent()
         $this->assertSame(2, $uri->getTotalSegments());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSegmentOutOfRangeWithDefaultValuesAndSilent()
     {
         $uri = new URI('http://hostname/path/to/script');
@@ -129,8 +111,6 @@ public function testSegmentOutOfRangeWithDefaultValuesAndSilent()
         $this->assertSame(['path', 'to', 'script'], $uri->getSegments());
     }
 
-    //--------------------------------------------------------------------
-
     public function testCanCastAsString()
     {
         $url = 'http://username:password@hostname:9090/path?arg=value#anchor';
@@ -141,8 +121,6 @@ public function testCanCastAsString()
         $this->assertSame($expected, (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSimpleUri()
     {
         $url = 'http://example.com';
@@ -154,8 +132,6 @@ public function testSimpleUri()
         $this->assertSame($url, (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function testEmptyUri()
     {
         $url = '';
@@ -166,8 +142,6 @@ public function testEmptyUri()
         $this->assertSame('http://', (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function testMalformedUri()
     {
         $this->expectException(HTTPException::class);
@@ -175,8 +149,6 @@ public function testMalformedUri()
         $uri = new URI($url);
     }
 
-    //--------------------------------------------------------------------
-
     public function testMissingScheme()
     {
         $url = 'http://foo.bar/baz';
@@ -187,8 +159,6 @@ public function testMissingScheme()
         $this->assertSame($url, (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSchemeSub()
     {
         $url = 'example.com';
@@ -197,8 +167,6 @@ public function testSchemeSub()
         $this->assertSame('x://' . $url, (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetSchemeSetsValue()
     {
         $url = 'http://example.com/path';
@@ -211,8 +179,6 @@ public function testSetSchemeSetsValue()
         $this->assertSame($expected, (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetUserInfoSetsValue()
     {
         $url = 'http://example.com/path';
@@ -225,8 +191,6 @@ public function testSetUserInfoSetsValue()
         $this->assertSame($expected, (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function testUserInfoCanShowPassword()
     {
         $url = 'http://example.com/path';
@@ -246,8 +210,6 @@ public function testUserInfoCanShowPassword()
         $this->assertSame($expected, (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetHostSetsValue()
     {
         $url = 'http://example.com/path';
@@ -260,8 +222,6 @@ public function testSetHostSetsValue()
         $this->assertSame($expected, (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetPortSetsValue()
     {
         $url = 'http://example.com/path';
@@ -274,8 +234,6 @@ public function testSetPortSetsValue()
         $this->assertSame($expected, (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetPortInvalidValues()
     {
         $url = 'http://example.com/path';
@@ -289,8 +247,6 @@ public function testSetPortInvalidValues()
         $uri->setPort(70000);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetPortInvalidValuesSilent()
     {
         $url = 'http://example.com/path';
@@ -301,8 +257,6 @@ public function testSetPortInvalidValuesSilent()
         $this->assertNull($uri->getPort());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetPortTooSmall()
     {
         $url = 'http://example.com/path';
@@ -313,8 +267,6 @@ public function testSetPortTooSmall()
         $uri->setPort(-1);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetPortZero()
     {
         $url = 'http://example.com/path';
@@ -325,8 +277,6 @@ public function testSetPortZero()
         $uri->setPort(0);
     }
 
-    //--------------------------------------------------------------------
-
     public function testCatchesBadPort()
     {
         $this->expectException(HTTPException::class);
@@ -335,8 +285,6 @@ public function testCatchesBadPort()
         $uri->setURI($url);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetPathSetsValue()
     {
         $url = 'http://example.com/path';
@@ -349,8 +297,6 @@ public function testSetPathSetsValue()
         $this->assertSame($expected, (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function invalidPaths()
     {
         return [
@@ -381,8 +327,6 @@ public function invalidPaths()
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @dataProvider invalidPaths
      */
@@ -393,8 +337,6 @@ public function testPathGetsFiltered($path, $expected)
         $this->assertSame($expected, $uri->getPath());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetFragmentSetsValue()
     {
         $url = 'http://example.com/path';
@@ -407,8 +349,6 @@ public function testSetFragmentSetsValue()
         $this->assertSame($expected, (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetQuerySetsValue()
     {
         $url = 'http://example.com/path';
@@ -421,8 +361,6 @@ public function testSetQuerySetsValue()
         $this->assertSame($expected, (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetQuerySetsValueWithUseRawQueryString()
     {
         $url = 'http://example.com/path';
@@ -435,8 +373,6 @@ public function testSetQuerySetsValueWithUseRawQueryString()
         $this->assertSame($expected, (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetQueryArraySetsValue()
     {
         $url = 'http://example.com/path';
@@ -449,8 +385,6 @@ public function testSetQueryArraySetsValue()
         $this->assertSame($expected, (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetQueryArraySetsValueWithUseRawQueryString()
     {
         $url = 'http://example.com/path';
@@ -463,8 +397,6 @@ public function testSetQueryArraySetsValueWithUseRawQueryString()
         $this->assertSame($expected, (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetQueryThrowsErrorWhenFragmentPresent()
     {
         $url = 'http://example.com/path';
@@ -474,8 +406,6 @@ public function testSetQueryThrowsErrorWhenFragmentPresent()
         $uri->setQuery('?key=value#fragment');
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetQueryThrowsErrorWhenFragmentPresentSilent()
     {
         $url = 'http://example.com/path';
@@ -486,8 +416,6 @@ public function testSetQueryThrowsErrorWhenFragmentPresentSilent()
         $this->assertSame('', $uri->getQuery());
     }
 
-    //--------------------------------------------------------------------
-
     public function authorityInfo()
     {
         return [
@@ -510,8 +438,6 @@ public function authorityInfo()
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @dataProvider authorityInfo
      */
@@ -521,8 +447,6 @@ public function testAuthorityReturnsExceptedValues($url, $expected)
         $this->assertSame($expected, $uri->getAuthority());
     }
 
-    //--------------------------------------------------------------------
-
     public function defaultPorts()
     {
         return [
@@ -537,8 +461,6 @@ public function defaultPorts()
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @dataProvider defaultPorts
      */
@@ -552,8 +474,6 @@ public function testAuthorityRemovesDefaultPorts($scheme, $port)
         $this->assertSame($expected, (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetAuthorityReconstitutes()
     {
         $authority = 'me@foo.com:3000';
@@ -564,8 +484,6 @@ public function testSetAuthorityReconstitutes()
         $this->assertSame($authority, $uri->getAuthority());
     }
 
-    //--------------------------------------------------------------------
-
     public function defaultDots()
     {
         return [
@@ -664,8 +582,6 @@ public function defaultDots()
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @dataProvider defaultDots
      */
@@ -674,8 +590,6 @@ public function testRemoveDotSegments($path, $expected)
         $this->assertSame($expected, URI::removeDotSegments($path));
     }
 
-    //--------------------------------------------------------------------
-
     public function defaultResolutions()
     {
         return [
@@ -748,8 +662,6 @@ public function testResolveRelativeURIWithNoBase()
         $this->assertSame('http://a/x', (string) $new);
     }
 
-    //--------------------------------------------------------------------
-
     public function testAddQueryVar()
     {
         $base = 'http://example.com/foo';
@@ -761,8 +673,6 @@ public function testAddQueryVar()
         $this->assertSame('http://example.com/foo?bar=baz', (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/pull/954
      */
@@ -791,8 +701,6 @@ public function testAddQueryVarRespectsExistingQueryVars()
         $this->assertSame('http://example.com/foo?bar=baz&baz=foz', (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function testStripQueryVars()
     {
         $base = 'http://example.com/foo?foo=bar&bar=baz&baz=foz';
@@ -804,8 +712,6 @@ public function testStripQueryVars()
         $this->assertSame('http://example.com/foo?foo=bar', (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function testKeepQueryVars()
     {
         $base = 'http://example.com/foo?foo=bar&bar=baz&baz=foz';
@@ -817,8 +723,6 @@ public function testKeepQueryVars()
         $this->assertSame('http://example.com/foo?bar=baz&baz=foz', (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function testEmptyQueryVars()
     {
         $base = 'http://example.com/foo';
@@ -828,8 +732,6 @@ public function testEmptyQueryVars()
         $this->assertSame('http://example.com/foo?foo=&bar=baz&baz=foz', (string) $uri);
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetQueryExcept()
     {
         $base = 'http://example.com/foo?foo=bar&bar=baz&baz=foz';
@@ -839,8 +741,6 @@ public function testGetQueryExcept()
         $this->assertSame('foo=bar&baz=foz', $uri->getQuery(['except' => ['bar']]));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetQueryOnly()
     {
         $base = 'http://example.com/foo?foo=bar&bar=baz&baz=foz';
@@ -851,8 +751,6 @@ public function testGetQueryOnly()
         $this->assertSame('foo=bar&baz=foz', $uri->getQuery(['except' => 'bar']));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetQueryWithStrings()
     {
         $base = 'http://example.com/foo?foo=bar&bar=baz&baz=foz';
@@ -862,8 +760,6 @@ public function testGetQueryWithStrings()
         $this->assertSame('bar=baz', $uri->getQuery(['only' => 'bar']));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see   https://github.com/codeigniter4/CodeIgniter4/issues/331
      * @group single
@@ -875,8 +771,6 @@ public function testNoExtraSlashes()
         $this->assertSame('http://localtest.me/subfolder', (string) (new URI('localtest.me/subfolder')));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetSegment()
     {
         $base = 'http://example.com/foo/bar/baz';
@@ -887,8 +781,6 @@ public function testSetSegment()
         $this->assertSame('foo/banana/baz', $uri->getPath());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetSegmentFallback()
     {
         $base = 'http://example.com';
@@ -938,7 +830,6 @@ public function testSetBadSegmentSilent()
         $this->assertSame($segments, $uri->getSegments());
     }
 
-    //--------------------------------------------------------------------
     // Exploratory testing, investigating https://github.com/codeigniter4/CodeIgniter4/issues/2016
 
     public function testBasedNoIndex()
diff --git a/tests/system/HTTP/UserAgentTest.php b/tests/system/HTTP/UserAgentTest.php
index 3c8047f3b853..b19538465647 100644
--- a/tests/system/HTTP/UserAgentTest.php
+++ b/tests/system/HTTP/UserAgentTest.php
@@ -29,8 +29,6 @@ protected function setUp(): void
         helper('url');
     }
 
-    // --------------------------------------------------------------------
-
     public function testMobile()
     {
         // Mobile Not Set
@@ -39,8 +37,6 @@ public function testMobile()
         unset($_SERVER['HTTP_USER_AGENT']);
     }
 
-    // --------------------------------------------------------------------
-
     public function testIsFunctions()
     {
         $this->assertTrue($this->agent->isBrowser());
@@ -50,8 +46,6 @@ public function testIsFunctions()
         $this->assertFalse($this->agent->isMobile());
     }
 
-    // --------------------------------------------------------------------
-
     public function testReferrer()
     {
         $_SERVER['HTTP_REFERER'] = 'http://codeigniter.com/user_guide/';
@@ -64,15 +58,11 @@ public function testReferrer()
         $this->assertSame('', $this->agent->getReferrer());
     }
 
-    // --------------------------------------------------------------------
-
     public function testAgentString()
     {
         $this->assertSame($this->_user_agent, $this->agent->getAgentString());
     }
 
-    // --------------------------------------------------------------------
-
     public function testBrowserInfo()
     {
         $this->assertSame('Mac OS X', $this->agent->getPlatform());
@@ -81,8 +71,6 @@ public function testBrowserInfo()
         $this->assertSame('', $this->agent->getRobot());
     }
 
-    // --------------------------------------------------------------------
-
     public function testParse()
     {
         $newAgent = 'Mozilla/5.0 (Android; Mobile; rv:13.0) Gecko/13.0 Firefox/13.0';
diff --git a/tests/system/Helpers/DateHelperTest.php b/tests/system/Helpers/DateHelperTest.php
index 30f5f95b4ef2..da9de130e183 100644
--- a/tests/system/Helpers/DateHelperTest.php
+++ b/tests/system/Helpers/DateHelperTest.php
@@ -15,15 +15,11 @@ protected function setUp(): void
         helper('date');
     }
 
-    //--------------------------------------------------------------------
-
     public function testNowDefault()
     {
         $this->assertCloseEnough(now(), time());  // close enough
     }
 
-    //--------------------------------------------------------------------
-
     public function testNowSpecific()
     {
         // Chicago should be two hours ahead of Vancouver
diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php
index ac392a52790a..e04c5b3e8213 100644
--- a/tests/system/Helpers/FilesystemHelperTest.php
+++ b/tests/system/Helpers/FilesystemHelperTest.php
@@ -30,8 +30,6 @@ protected function setUp(): void
         ];
     }
 
-    //--------------------------------------------------------------------
-
     public function testDirectoryMapDefaults()
     {
         helper('filesystem');
@@ -104,8 +102,6 @@ public function testDirectoryMapHandlesNotfound()
         $this->assertSame([], directory_map(SUPPORTPATH . 'Files/shaker/'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testDirectoryMirror()
     {
         $this->assertTrue(function_exists('directory_mirror'));
@@ -156,8 +152,6 @@ public function testDirectoryMirrorNotOverwrites()
         $this->assertSame($this->structure['boo']['faz'], $result);
     }
 
-    //--------------------------------------------------------------------
-
     public function testWriteFileSuccess()
     {
         $vfs = vfsStream::setup('root');
@@ -173,8 +167,6 @@ public function testWriteFileFailure()
         $this->assertFalse(write_file(vfsStream::url('apple#test.php'), 'Simple'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testDeleteFilesDefaultsToOneLevelDeep()
     {
         $this->assertTrue(function_exists('delete_files'));
@@ -254,8 +246,6 @@ public function testDeleteFilesFailure()
         $this->assertFalse(delete_files(SUPPORTPATH . 'Files/shaker/'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetFilenames()
     {
         $this->assertTrue(function_exists('delete_files'));
@@ -346,8 +336,6 @@ public function testGetFilenamesFailure()
         $this->assertSame([], get_filenames(SUPPORTPATH . 'Files/shaker/'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetDirFileInfo()
     {
         $file = SUPPORTPATH . 'Files/baker/banana.php';
@@ -386,8 +374,6 @@ public function testGetDirFileInfoFailure()
         $this->assertSame($expected, get_dir_file_info(SUPPORTPATH . 'Files#baker'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetFileInfo()
     {
         $file = SUPPORTPATH . 'Files/baker/banana.php';
@@ -432,8 +418,6 @@ public function testGetFileNotThereInfo()
         $this->assertSame($expected, get_file_info(SUPPORTPATH . 'Files/icer'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSameFileSame()
     {
         $file1 = SUPPORTPATH . 'Files/able/apple.php';
@@ -474,8 +458,6 @@ public function testSameFileDirectory()
         $this->assertFalse(same_file($file1, $file2));
     }
 
-    //--------------------------------------------------------------------
-
     public function testOctalPermissions()
     {
         $this->assertSame('777', octal_permissions(0777));
@@ -503,8 +485,6 @@ public function testSymbolicPermissions()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testRealPathURL()
     {
         $this->expectException(InvalidArgumentException::class);
diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
index f23cdf0d8ede..609460669688 100644
--- a/tests/system/Helpers/FormHelperTest.php
+++ b/tests/system/Helpers/FormHelperTest.php
@@ -20,7 +20,6 @@ protected function setUp(): void
         helper('form');
     }
 
-    // ------------------------------------------------------------------------
     public function testFormOpenBasic()
     {
         $config            = new App();
@@ -55,7 +54,6 @@ public function testFormOpenBasic()
         $this->assertSame($expected, form_open('foo/bar', $attributes));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormOpenHasLocale()
     {
         $config            = new App();
@@ -78,7 +76,6 @@ public function testFormOpenHasLocale()
         $this->assertSame($expected, form_open('{locale}/foo/bar', $attributes));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormOpenWithoutAction()
     {
         $config            = new App();
@@ -112,7 +109,6 @@ public function testFormOpenWithoutAction()
         $this->assertSame($expected, form_open('', $attributes));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormOpenWithoutMethod()
     {
         $config            = new App();
@@ -146,7 +142,6 @@ public function testFormOpenWithoutMethod()
         $this->assertSame($expected, form_open('foo/bar', $attributes));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormOpenWithHidden()
     {
         $config            = new App();
@@ -187,7 +182,6 @@ public function testFormOpenWithHidden()
         $this->assertSame($expected, form_open('foo/bar', $attributes, $hidden));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormOpenMultipart()
     {
         $config            = new App();
@@ -225,7 +219,6 @@ public function testFormOpenMultipart()
         $this->assertSame($expected, form_open_multipart('foo/bar', $attributesString));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormHidden()
     {
         $expected = <<<EOH
@@ -235,7 +228,6 @@ public function testFormHidden()
         $this->assertSame($expected, form_hidden('username', 'johndoe'));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormHiddenArrayInput()
     {
         $data = [
@@ -249,7 +241,6 @@ public function testFormHiddenArrayInput()
         $this->assertSame($expected, form_hidden($data, null));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormHiddenArrayValues()
     {
         $data = [
@@ -263,7 +254,6 @@ public function testFormHiddenArrayValues()
         $this->assertSame($expected, form_hidden('name', $data));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormInput()
     {
         $expected = <<<EOH
@@ -296,7 +286,6 @@ public function testFormInputWithExtra()
         $this->assertSame($expected, form_input($data, '', $extra));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormPassword()
     {
         $expected = <<<EOH
@@ -305,7 +294,6 @@ public function testFormPassword()
         $this->assertSame($expected, form_password('password'));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormUpload()
     {
         $expected = <<<EOH
@@ -314,7 +302,6 @@ public function testFormUpload()
         $this->assertSame($expected, form_upload('attachment'));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormTextarea()
     {
         $expected = <<<EOH
@@ -323,7 +310,6 @@ public function testFormTextarea()
         $this->assertSame($expected, form_textarea('notes', 'Notes'));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormTextareaWithValueAttribute()
     {
         $data = [
@@ -337,7 +323,6 @@ public function testFormTextareaWithValueAttribute()
         $this->assertSame($expected, form_textarea($data));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormTextareaExtraRowsColsArray()
     {
         $extra = [
@@ -350,7 +335,6 @@ public function testFormTextareaExtraRowsColsArray()
         $this->assertSame($expected, form_textarea('notes', 'Notes', $extra));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormTextareaExtraRowsColsString()
     {
         $extra    = 'cols="30" rows="5"';
@@ -360,7 +344,6 @@ public function testFormTextareaExtraRowsColsString()
         $this->assertSame($expected, form_textarea('notes', 'Notes', $extra));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormDropdown()
     {
         $expected = <<<EOH
@@ -472,7 +455,6 @@ public function testFormDropdownInferred()
         unset($_POST['cars']);
     }
 
-    // ------------------------------------------------------------------------
     public function testFormDropdownWithSelectedAttribute()
     {
         $expected = <<<'EOH'
@@ -491,7 +473,6 @@ public function testFormDropdownWithSelectedAttribute()
         $this->assertSame($expected, form_dropdown($data, $options));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormDropdownWithOptionsAttribute()
     {
         $expected = <<<'EOH'
@@ -509,7 +490,6 @@ public function testFormDropdownWithOptionsAttribute()
         $this->assertSame($expected, form_dropdown($data));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormDropdownWithEmptyArrayOptionValue()
     {
         $expected = <<<'EOH'
@@ -523,7 +503,6 @@ public function testFormDropdownWithEmptyArrayOptionValue()
         $this->assertSame($expected, form_dropdown('foo', $options));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormMultiselect()
     {
         $expected = <<<EOH
@@ -543,7 +522,6 @@ public function testFormMultiselect()
         $this->assertSame($expected, form_multiselect('shirts[]', $options, ['med', 'large']));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormMultiselectArrayData()
     {
         $expected = <<<EOH
@@ -573,7 +551,6 @@ public function testFormMultiselectArrayData()
         $this->assertSame($expected, form_multiselect($data));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormFieldset()
     {
         $expected = <<<EOH
@@ -583,7 +560,6 @@ public function testFormFieldset()
         $this->assertSame($expected, form_fieldset('Address Information'));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormFieldsetWithNoLegent()
     {
         $expected = <<<'EOH'
@@ -593,7 +569,6 @@ public function testFormFieldsetWithNoLegent()
         $this->assertSame($expected, form_fieldset());
     }
 
-    // ------------------------------------------------------------------------
     public function testFormFieldsetWithAttributes()
     {
         $attributes = [
@@ -607,7 +582,6 @@ public function testFormFieldsetWithAttributes()
         $this->assertSame($expected, form_fieldset('Foo', $attributes));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormFieldsetClose()
     {
         $expected = <<<'EOH'
@@ -616,7 +590,6 @@ public function testFormFieldsetClose()
         $this->assertSame($expected, form_fieldset_close('</div></div>'));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormCheckbox()
     {
         $expected = <<<EOH
@@ -625,7 +598,6 @@ public function testFormCheckbox()
         $this->assertSame($expected, form_checkbox('newsletter', 'accept', true));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormCheckboxArrayData()
     {
         $data = [
@@ -640,7 +612,6 @@ public function testFormCheckboxArrayData()
         $this->assertSame($expected, form_checkbox($data));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormCheckboxArrayDataWithCheckedFalse()
     {
         $data = [
@@ -655,7 +626,6 @@ public function testFormCheckboxArrayDataWithCheckedFalse()
         $this->assertSame($expected, form_checkbox($data));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormRadio()
     {
         $expected = <<<EOH
@@ -664,7 +634,6 @@ public function testFormRadio()
         $this->assertSame($expected, form_radio('newsletter', 'accept', true));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormSubmit()
     {
         $expected = <<<EOH
@@ -673,7 +642,6 @@ public function testFormSubmit()
         $this->assertSame($expected, form_submit('mysubmit', 'Submit Post!'));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormLabel()
     {
         $expected = <<<'EOH'
@@ -682,7 +650,6 @@ public function testFormLabel()
         $this->assertSame($expected, form_label('What is your Name', 'username'));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormLabelWithAttributes()
     {
         $attributes = [
@@ -694,7 +661,6 @@ public function testFormLabelWithAttributes()
         $this->assertSame($expected, form_label('bar', 'foo', $attributes));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormReset()
     {
         $expected = <<<EOH
@@ -703,7 +669,6 @@ public function testFormReset()
         $this->assertSame($expected, form_reset('myreset', 'Reset'));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormButton()
     {
         $expected = <<<EOH
@@ -712,7 +677,6 @@ public function testFormButton()
         $this->assertSame($expected, form_button('name', 'content'));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormButtonWithDataArray()
     {
         $data = [
@@ -726,7 +690,6 @@ public function testFormButtonWithDataArray()
         $this->assertSame($expected, form_button($data));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormClose()
     {
         $expected = <<<'EOH'
@@ -735,7 +698,6 @@ public function testFormClose()
         $this->assertSame($expected, form_close('</div></div>'));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormDatalist()
     {
         $options = [
@@ -753,7 +715,6 @@ public function testFormDatalist()
         $this->assertSame($expected, form_datalist('foo', 'bar', $options));
     }
 
-    // ------------------------------------------------------------------------
     public function testSetValue()
     {
         $_SESSION['_ci_old_input']['post']['foo'] = '<bar';
@@ -763,7 +724,6 @@ public function testSetValue()
         $this->assertSame('baz', set_value('foo', 'baz'));
     }
 
-    // ------------------------------------------------------------------------
     public function testSetSelect()
     {
         $_SESSION['_ci_old_input']['post']['foo'] = 'bar';
@@ -777,7 +737,6 @@ public function testSetSelect()
         $this->assertSame(' selected="selected"', set_select('foo', 'baz', true));
     }
 
-    // ------------------------------------------------------------------------
     public function testSetCheckbox()
     {
         $_SESSION = [
@@ -807,7 +766,6 @@ public function testSetCheckbox()
         $this->assertSame(' checked="checked"', set_checkbox('foo', 'bar', true));
     }
 
-    // ------------------------------------------------------------------------
     public function testSetCheckboxWithValueZero()
     {
         $_SESSION = [
@@ -837,8 +795,6 @@ public function testSetCheckboxWithValueZero()
         $this->assertSame(' checked="checked"', set_checkbox('foo', '0', true));
     }
 
-    // ------------------------------------------------------------------------
-
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
@@ -922,49 +878,42 @@ public function testSetRadioDefault()
         $this->assertSame('', set_radio('code', 'beta', false));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormParseFormAttributesTrue()
     {
         $expected = 'readonly ';
         $this->assertSame($expected, parse_form_attributes(['readonly' => true], []));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormParseFormAttributesFalse()
     {
         $expected = 'disabled ';
         $this->assertSame($expected, parse_form_attributes(['disabled' => false], []));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormParseFormAttributesNull()
     {
         $expected = 'bar=""';
         $this->assertSame($expected, parse_form_attributes(['bar' => null], []));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormParseFormAttributesStringEmpty()
     {
         $expected = 'bar=""';
         $this->assertSame($expected, parse_form_attributes(['bar' => ''], []));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormParseFormAttributesStringFoo()
     {
         $expected = 'bar="foo"';
         $this->assertSame($expected, parse_form_attributes(['bar' => 'foo'], []));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormParseFormAttributesInt0()
     {
         $expected = 'ok="0"';
         $this->assertSame($expected, parse_form_attributes(['ok' => 0], []));
     }
 
-    // ------------------------------------------------------------------------
     public function testFormParseFormAttributesInt1()
     {
         $expected = 'ok="1"';
diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index 7f2b2b86bea4..7b1c29827fcd 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -36,8 +36,6 @@ protected function setUp(): void
         ];
     }
 
-    //--------------------------------------------------------------------
-
     public function testBasicUL()
     {
         $expected = <<<'EOH'
@@ -105,8 +103,6 @@ public function testMultiLevelUL()
         $this->assertSame(ltrim($expected), ul($list));
     }
 
-    //--------------------------------------------------------------------
-
     public function testBasicOL()
     {
         $expected = <<<'EOH'
@@ -174,8 +170,6 @@ public function testMultiLevelOL()
         $this->assertSame(ltrim($expected), ol($list));
     }
 
-    // ------------------------------------------------------------------------
-
     public function testIMG()
     {
         $target   = 'http://site.com/images/picture.jpg';
@@ -197,8 +191,6 @@ public function testIMGWithIndexpage()
         $this->assertSame($expected, img($target, true));
     }
 
-    // ------------------------------------------------------------------------
-
     public function testImgData()
     {
         $expected = 'data:image/gif;base64,' . $this->imgData;
@@ -228,8 +220,6 @@ public function testImgDataNoFile()
         img_data($this->imgPath . 'gobbledygook');
     }
 
-    // ------------------------------------------------------------------------
-
     public function testScriptTag()
     {
         $target   = 'http://site.com/js/mystyles.js';
@@ -251,8 +241,6 @@ public function testScriptTagWithIndexpage()
         $this->assertSame($expected, script_tag($target, true));
     }
 
-    // ------------------------------------------------------------------------
-
     public function testLinkTag()
     {
         $target   = 'css/mystyles.css';
@@ -277,8 +265,6 @@ public function testLinkTagArray()
         $this->assertSame($expected, link_tag($parms));
     }
 
-    // ------------------------------------------------------------------------
-
     public function testDocType()
     {
         $target   = 'html4-strict';
@@ -298,8 +284,6 @@ public function testDocTypeInvalid()
         $this->assertEmpty(doctype($target));
     }
 
-    // ------------------------------------------------------------------------
-
     public function testVideo()
     {
         $expected = <<<'EOH'
@@ -376,8 +360,6 @@ public function testVideoMultipleSources()
         $this->assertSame($expected, $video);
     }
 
-    // ------------------------------------------------------------------------
-
     public function testAudio()
     {
         $expected = <<<'EOH'
@@ -467,8 +449,6 @@ public function testAudioWithTracks()
         $this->assertSame($expected, $audio);
     }
 
-    // ------------------------------------------------------------------------
-
     public function testMediaNameOnly()
     {
         $expected = <<<'EOH'
@@ -501,8 +481,6 @@ public function testSource()
         $this->assertSame($expected, source('sound.mpeg', 'audio/mpeg', '', true));
     }
 
-    // ------------------------------------------------------------------------
-
     public function testEmbed()
     {
         $expected = <<<'EOH'
@@ -571,6 +549,4 @@ public function testObjectIndexed()
 
         $this->assertSame($expected, $object);
     }
-
-    // ------------------------------------------------------------------------
 }
diff --git a/tests/system/Helpers/InflectorHelperTest.php b/tests/system/Helpers/InflectorHelperTest.php
index c044c75bc488..8f074c639b87 100755
--- a/tests/system/Helpers/InflectorHelperTest.php
+++ b/tests/system/Helpers/InflectorHelperTest.php
@@ -16,8 +16,6 @@ protected function setUp(): void
         helper('inflector');
     }
 
-    //--------------------------------------------------------------------
-
     public function testSingular()
     {
         $strings = [
@@ -55,8 +53,6 @@ public function testSingular()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testPlural()
     {
         $strings = [
@@ -93,8 +89,6 @@ public function testPlural()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testCounted()
     {
         $triplets = [
@@ -151,8 +145,6 @@ public function testCounted()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testCamelize()
     {
         $strings = [
@@ -166,8 +158,6 @@ public function testCamelize()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testPascalize()
     {
         $strings = [
@@ -181,8 +171,6 @@ public function testPascalize()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testUnderscore()
     {
         $strings = [
@@ -196,8 +184,6 @@ public function testUnderscore()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testHumanize()
     {
         $underscored = [
@@ -216,8 +202,6 @@ public function testHumanize()
         $this->assertSame($humanizedDash, $dashed[1]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testIsCountable()
     {
         $words = [
@@ -235,8 +219,6 @@ public function testIsCountable()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testDasherize()
     {
         $strings = [
@@ -250,8 +232,6 @@ public function testDasherize()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrdinal()
     {
         $suffixes = [
@@ -273,8 +253,6 @@ public function testOrdinal()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testOrdinalize()
     {
         $suffixedNumbers = [
diff --git a/tests/system/Helpers/TextHelperTest.php b/tests/system/Helpers/TextHelperTest.php
index 919e9f6254b8..50f110938854 100755
--- a/tests/system/Helpers/TextHelperTest.php
+++ b/tests/system/Helpers/TextHelperTest.php
@@ -18,8 +18,6 @@ protected function setUp(): void
         helper('text');
     }
 
-    // --------------------------------------------------------------------
-
     public function testStripSlashes()
     {
         $expected = [
@@ -33,7 +31,6 @@ public function testStripSlashes()
         $this->assertSame($expected, strip_slashes($str));
     }
 
-    // --------------------------------------------------------------------
     public function testStripQuotes()
     {
         $strs = [
@@ -46,7 +43,6 @@ public function testStripQuotes()
         }
     }
 
-    // --------------------------------------------------------------------
     public function testQuotesToEntities()
     {
         $strs = [
@@ -59,7 +55,6 @@ public function testQuotesToEntities()
         }
     }
 
-    // --------------------------------------------------------------------
     public function testReduceDoubleSlashes()
     {
         $strs = [
@@ -73,7 +68,6 @@ public function testReduceDoubleSlashes()
         }
     }
 
-    // --------------------------------------------------------------------
     public function testReduceMultiples()
     {
         $strs = [
@@ -94,7 +88,6 @@ public function testReduceMultiples()
         }
     }
 
-    // --------------------------------------------------------------------
     public function testRandomString()
     {
         $this->assertSame(16, strlen(random_string('alnum', 16)));
@@ -111,7 +104,6 @@ public function testRandomString()
         $this->assertSame(40, strlen($random = random_string('sha1')));
     }
 
-    // --------------------------------------------------------------------
     public function testIncrementString()
     {
         $this->assertSame('my-test_1', increment_string('my-test'));
@@ -123,9 +115,7 @@ public function testIncrementString()
         $this->assertSame('124', increment_string('123', ''));
     }
 
-    // -------------------------------------------------------------------
     // Functions from text_helper_test.php
-    // -------------------------------------------------------------------
 
     public function testWordLimiter()
     {
@@ -136,7 +126,6 @@ public function testWordLimiter()
         $this->assertSame('Once upon a time', word_limiter('Once upon a time', 4, '&hellip;'));
     }
 
-    // ------------------------------------------------------------------------
     public function testCharacterLimiter()
     {
         $this->assertSame('Once upon a time, a&#8230;', character_limiter($this->_long_string, 20));
@@ -145,7 +134,6 @@ public function testCharacterLimiter()
         $this->assertSame('Short', character_limiter('Short', 5));
     }
 
-    // ------------------------------------------------------------------------
     public function testAsciiToEntities()
     {
         $strs = [
@@ -158,7 +146,6 @@ public function testAsciiToEntities()
         }
     }
 
-    // ------------------------------------------------------------------------
     public function testEntitiesToAscii()
     {
         $strs = [
@@ -184,7 +171,6 @@ public function testEntitiesToAsciiSmallOrdinals()
         $this->assertSame(pack('c', 7), entities_to_ascii($str));
     }
 
-    // ------------------------------------------------------------------------
     public function testConvertAccentedCharacters()
     {
         //$this->ci_vfs_clone('application/Config/ForeignChars.php');
@@ -192,7 +178,6 @@ public function testConvertAccentedCharacters()
         $this->assertSame('a e i o u n ue', convert_accented_characters('á é í ó ú ñ ü'));
     }
 
-    // ------------------------------------------------------------------------
     public function testCensoredWords()
     {
         $censored = [
@@ -215,14 +200,12 @@ public function testCensoredWords()
         }
     }
 
-    // ------------------------------------------------------------------------
     public function testHighlightCode()
     {
         $expect = "<code><span style=\"color: #000000\">\n<span style=\"color: #0000BB\">&lt;?php&nbsp;var_dump</span><span style=\"color: #007700\">(</span><span style=\"color: #0000BB\">\$this</span><span style=\"color: #007700\">);&nbsp;</span><span style=\"color: #0000BB\">?&gt;&nbsp;</span>\n</span>\n</code>";
         $this->assertSame($expect, highlight_code('<?php var_dump($this); ?>'));
     }
 
-    // ------------------------------------------------------------------------
     public function testHighlightPhrase()
     {
         $strs = [
@@ -240,7 +223,6 @@ public function testHighlightPhrase()
         $this->assertSame('<strong>this is</strong> a strong test', highlight_phrase('this is a strong test', 'this is', '<strong>', '</strong>'));
     }
 
-    // ------------------------------------------------------------------------
     public function testEllipsize()
     {
         $strs = [
@@ -271,7 +253,6 @@ public function testEllipsize()
         }
     }
 
-    // ------------------------------------------------------------------------
     public function testWordWrap()
     {
         $string   = 'Here is a simple string of text that will help us demonstrate this function.';
@@ -314,15 +295,12 @@ public function testWordWrapURL()
         $this->assertSame($expected, word_wrap($string, 25));
     }
 
-    // ------------------------------------------------------------------------
     public function testDefaultWordWrapCharlim()
     {
         $string = 'Here is a longer string of text that will help us demonstrate the default charlim of this function.';
         $this->assertSame(strpos(word_wrap($string), "\n"), 73);
     }
 
-    // -----------------------------------------------------------------------
-
     public function testExcerpt()
     {
         $string = $this->_long_string;
@@ -330,8 +308,6 @@ public function testExcerpt()
         $this->assertSame(excerpt($string), $result);
     }
 
-    // -----------------------------------------------------------------------
-
     public function testExcerptRadius()
     {
         $string = $this->_long_string;
@@ -340,8 +316,6 @@ public function testExcerptRadius()
         $this->assertSame(excerpt($string, $phrase, 10), $result);
     }
 
-    // -----------------------------------------------------------------------
-
     public function testAlternator()
     {
         $phrase = ' scream! ';
diff --git a/tests/system/Helpers/URLHelper/CurrentUrlTest.php b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
index be10b4bc4157..2a00c76dea99 100644
--- a/tests/system/Helpers/URLHelper/CurrentUrlTest.php
+++ b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
@@ -55,10 +55,6 @@ protected function tearDown(): void
         $_SERVER = [];
     }
 
-    //--------------------------------------------------------------------
-    // current_url
-    //--------------------------------------------------------------------
-
     public function testCurrentURLReturnsBasicURL()
     {
         // Since we're on a CLI, we must provide our own URI
@@ -140,10 +136,6 @@ public function testCurrentURLWithPortInSubfolder()
         $this->assertSame(8080, $uri->getPort());
     }
 
-    //--------------------------------------------------------------------
-    // uri_string
-    //--------------------------------------------------------------------
-
     public function testUriStringAbsolute()
     {
         $_SERVER['HTTP_HOST']   = 'example.com';
@@ -247,10 +239,6 @@ public function testUriStringSubfolderRelative()
         $this->assertSame('assets/image.jpg', uri_string(true));
     }
 
-    //--------------------------------------------------------------------
-    // uri_is
-    //--------------------------------------------------------------------
-
     public function urlIsProvider()
     {
         return [
diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php
index acf533bc1fd0..b62243bfe043 100644
--- a/tests/system/Helpers/URLHelper/MiscUrlTest.php
+++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php
@@ -48,9 +48,6 @@ protected function tearDown(): void
         $_SERVER = [];
     }
 
-    //--------------------------------------------------------------------
-    // Test previous_url
-
     public function testPreviousURLUsesSessionFirst()
     {
         $uri1 = 'http://example.com/one?two';
@@ -69,8 +66,6 @@ public function testPreviousURLUsesSessionFirst()
         $this->assertSame($uri2, previous_url());
     }
 
-    //--------------------------------------------------------------------
-
     public function testPreviousURLUsesRefererIfNeeded()
     {
         $uri1 = 'http://example.com/one?two';
@@ -87,7 +82,6 @@ public function testPreviousURLUsesRefererIfNeeded()
         $this->assertSame($uri1, previous_url());
     }
 
-    //--------------------------------------------------------------------
     // Test index_page
 
     public function testIndexPage()
@@ -111,7 +105,6 @@ public function testIndexPageAlt()
         $this->assertSame('banana.php', index_page($this->config));
     }
 
-    //--------------------------------------------------------------------
     // Test anchor
 
     public function anchorNormalPatterns()
@@ -323,7 +316,6 @@ public function testAnchorExamples($expected = '', $uri = '', $title = '', $attr
         $this->assertSame($expected, anchor($uri, $title, $attributes, $this->config));
     }
 
-    //--------------------------------------------------------------------
     // Test anchor_popup
 
     public function anchorPopupPatterns()
@@ -378,7 +370,6 @@ public function testAnchorPopup($expected = '', $uri = '', $title = '', $attribu
         $this->assertSame($expected, anchor_popup($uri, $title, $attributes, $this->config));
     }
 
-    //--------------------------------------------------------------------
     // Test mailto
 
     public function mailtoPatterns()
@@ -415,7 +406,6 @@ public function testMailto($expected = '', $email = '', $title = '', $attributes
         $this->assertSame($expected, mailto($email, $title, $attributes));
     }
 
-    //--------------------------------------------------------------------
     // Test safe_mailto
 
     public function safeMailtoPatterns()
@@ -452,7 +442,6 @@ public function testSafeMailto($expected = '', $email = '', $title = '', $attrib
         $this->assertSame($expected, safe_mailto($email, $title, $attributes));
     }
 
-    //--------------------------------------------------------------------
     // Test auto_link
 
     public function autolinkUrls()
@@ -639,7 +628,6 @@ public function testAutoLinkPopup($in, $out)
         $this->assertSame($out, auto_link($in, 'url', true));
     }
 
-    //--------------------------------------------------------------------
     // Test prep_url
 
     public function prepUrlProvider()
@@ -727,7 +715,6 @@ public function testPrepUrl(string $input, string $expected, bool $secure)
         $this->assertSame($expected, prep_url($input, $secure));
     }
 
-    //--------------------------------------------------------------------
     // Test url_title
 
     public function testUrlTitle()
@@ -756,7 +743,6 @@ public function testUrlTitleExtraDashes()
         }
     }
 
-    //--------------------------------------------------------------------
     // Test mb_url_title
 
     public function testMbUrlTitle()
diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php
index 40e63678e2c1..ce5d5004be29 100644
--- a/tests/system/Helpers/URLHelper/SiteUrlTest.php
+++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php
@@ -48,8 +48,6 @@ protected function tearDown(): void
         $_SERVER = [];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Takes a multitude of various config input and verifies
      * that base_url() and site_url() return the expected result.
@@ -229,9 +227,7 @@ public function configProvider()
         ];
     }
 
-    //--------------------------------------------------------------------
     // base_url
-    //--------------------------------------------------------------------
 
     /**
      * These tests are only really relevant to show that base_url()
diff --git a/tests/system/Helpers/XMLHelperTest.php b/tests/system/Helpers/XMLHelperTest.php
index f3b422ff5fbc..00effb13e38f 100644
--- a/tests/system/Helpers/XMLHelperTest.php
+++ b/tests/system/Helpers/XMLHelperTest.php
@@ -16,8 +16,6 @@ protected function setUp(): void
         helper('xml');
     }
 
-    // --------------------------------------------------------------------
-
     public function testConvert()
     {
         $original = '<p>Here is a so-so paragraph & an entity (&#123;).</p>';
@@ -25,7 +23,6 @@ public function testConvert()
         $this->assertSame($expected, xml_convert($original));
     }
 
-    // --------------------------------------------------------------------
     public function testConvertProtected()
     {
         $original = '<p>Here is a so&so; paragraph & an entity (&#123;).</p>';
diff --git a/tests/system/Honeypot/HoneypotTest.php b/tests/system/Honeypot/HoneypotTest.php
index f9b255fec5ea..29db05fdd897 100644
--- a/tests/system/Honeypot/HoneypotTest.php
+++ b/tests/system/Honeypot/HoneypotTest.php
@@ -19,8 +19,6 @@ final class HoneypotTest extends CIUnitTestCase
     protected $request;
     protected $response;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -34,8 +32,6 @@ protected function setUp(): void
         $this->response             = Services::response();
     }
 
-    //--------------------------------------------------------------------
-
     public function testAttachHoneypot()
     {
         $this->response->setBody('<form></form>');
@@ -47,8 +43,6 @@ public function testAttachHoneypot()
         $this->assertStringNotContainsString($this->config->name, $this->response->getBody());
     }
 
-    //--------------------------------------------------------------------
-
     public function testAttachHoneypotAndContainer()
     {
         $this->response->setBody('<form></form>');
@@ -63,8 +57,6 @@ public function testAttachHoneypotAndContainer()
         $this->assertSame($expected, $this->response->getBody());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHasntContent()
     {
         unset($_POST[$this->config->name]);
@@ -78,8 +70,6 @@ public function testHasContent()
         $this->assertTrue($this->honeypot->hasContent($this->request));
     }
 
-    //--------------------------------------------------------------------
-
     public function testConfigHidden()
     {
         $this->config->hidden = '';
@@ -101,7 +91,6 @@ public function testConfigName()
         $this->honeypot = new Honeypot($this->config);
     }
 
-    //--------------------------------------------------------------------
     public function testHoneypotFilterBefore()
     {
         $config = [
diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php
index 141e0f7c9be8..fad994c978df 100644
--- a/tests/system/I18n/TimeTest.php
+++ b/tests/system/I18n/TimeTest.php
@@ -260,8 +260,6 @@ public function testTestNow()
         $this->assertCloseEnoughString(date('Y-m-d H:i:s', time()), Time::now()->toDateTimeString());
     }
 
-    //--------------------------------------------------------------------
-
     public function testMagicIssetTrue()
     {
         $time = Time::parse('January 1, 2016');
@@ -276,8 +274,6 @@ public function testMagicIssetFalse()
         $this->assertFalse(isset($time->foobar));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetYear()
     {
         $time  = Time::parse('January 1, 2016');
@@ -657,9 +653,7 @@ public function testToTimeString()
         $this->assertSame('13:20:33', $time->toTimeString());
     }
 
-    //--------------------------------------------------------------------
     // Add/Subtract
-    //--------------------------------------------------------------------
 
     public function testCanAddSeconds()
     {
@@ -765,9 +759,7 @@ public function testCanSubtractYears()
         $this->assertSame('2014-01-10 13:20:33', $newTime->toDateTimeString());
     }
 
-    //--------------------------------------------------------------------
     // Comparison
-    //--------------------------------------------------------------------
 
     public function testEqualWithDifferent()
     {
diff --git a/tests/system/Images/BaseHandlerTest.php b/tests/system/Images/BaseHandlerTest.php
index 324ab59bf286..645a3104cb67 100644
--- a/tests/system/Images/BaseHandlerTest.php
+++ b/tests/system/Images/BaseHandlerTest.php
@@ -48,8 +48,6 @@ protected function setUp(): void
         $this->path  = $this->start . 'ci-logo.png';
     }
 
-    //--------------------------------------------------------------------
-
     public function testNew()
     {
         $handler = Services::image('gd', null, false);
@@ -110,7 +108,6 @@ public function testFileTypes()
         $this->assertTrue($image instanceof Image);
     }
 
-    //--------------------------------------------------------------------
     // Something handled by our Image
     public function testImageHandled()
     {
diff --git a/tests/system/Images/GDHandlerTest.php b/tests/system/Images/GDHandlerTest.php
index cf60c5d674a0..3c7617f79a00 100644
--- a/tests/system/Images/GDHandlerTest.php
+++ b/tests/system/Images/GDHandlerTest.php
@@ -84,8 +84,6 @@ public function testImageTypeProperties()
         $this->assertSame('image/png', $props['mime_type']);
     }
 
-    //--------------------------------------------------------------------
-
     public function testResizeIgnored()
     {
         $this->handler->withFile($this->path);
@@ -126,8 +124,6 @@ public function testResizeAspectHeight()
         $this->assertSame(456, $this->handler->getHeight());
     }
 
-    //--------------------------------------------------------------------
-
     public function testCropTopLeft()
     {
         $this->handler->withFile($this->path);
@@ -176,8 +172,6 @@ public function testCropOutOfBounds()
         $this->assertSame(100, $this->handler->getHeight());
     }
 
-    //--------------------------------------------------------------------
-
     public function testRotate()
     {
         $this->handler->withFile($this->path); // 155x200
@@ -200,8 +194,6 @@ public function testRotateBadAngle()
         $this->handler->rotate(77);
     }
 
-    //--------------------------------------------------------------------
-
     public function testFlatten()
     {
         $this->handler->withFile($this->path);
@@ -210,8 +202,6 @@ public function testFlatten()
         $this->assertSame(200, $this->handler->getHeight());
     }
 
-    //--------------------------------------------------------------------
-
     public function testFlip()
     {
         $this->handler->withFile($this->path);
@@ -243,7 +233,6 @@ public function testFlipUnknown()
         $this->handler->flip('bogus');
     }
 
-    //--------------------------------------------------------------------
     public function testFit()
     {
         $this->handler->withFile($this->path);
@@ -290,8 +279,6 @@ public function testFitPositions()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testText()
     {
         $this->handler->withFile($this->path);
@@ -300,8 +287,6 @@ public function testText()
         $this->assertSame(200, $this->handler->getHeight());
     }
 
-    //--------------------------------------------------------------------
-
     public function testMoreText()
     {
         $this->handler->withFile($this->path);
@@ -310,8 +295,6 @@ public function testMoreText()
         $this->assertSame(200, $this->handler->getHeight());
     }
 
-    //--------------------------------------------------------------------
-
     public function testImageCreation()
     {
         foreach (['gif', 'jpeg', 'png', 'webp'] as $type) {
@@ -327,8 +310,6 @@ public function testImageCreation()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testImageCopy()
     {
         foreach (['gif', 'jpeg', 'png', 'webp'] as $type) {
diff --git a/tests/system/Images/ImageMagickHandlerTest.php b/tests/system/Images/ImageMagickHandlerTest.php
index c451ef936352..d2c58f32968e 100644
--- a/tests/system/Images/ImageMagickHandlerTest.php
+++ b/tests/system/Images/ImageMagickHandlerTest.php
@@ -82,8 +82,6 @@ public function testImageTypeProperties()
         $this->assertSame('image/png', $props['mime_type']);
     }
 
-    //--------------------------------------------------------------------
-
     public function testResizeIgnored()
     {
         $this->handler->withFile($this->path);
@@ -124,8 +122,6 @@ public function testResizeAspectHeight()
         $this->assertSame(456, $this->handler->getHeight());
     }
 
-    //--------------------------------------------------------------------
-
     public function testCropTopLeft()
     {
         $this->handler->withFile($this->path);
@@ -174,8 +170,6 @@ public function testCropOutOfBounds()
         $this->assertSame(100, $this->handler->getHeight());
     }
 
-    //--------------------------------------------------------------------
-
     public function testRotate()
     {
         $this->handler->withFile($this->path); // 155x200
@@ -198,8 +192,6 @@ public function testRotateBadAngle()
         $this->handler->rotate(77);
     }
 
-    //--------------------------------------------------------------------
-
     public function testFlatten()
     {
         $this->handler->withFile($this->path);
@@ -208,8 +200,6 @@ public function testFlatten()
         $this->assertSame(200, $this->handler->getHeight());
     }
 
-    //--------------------------------------------------------------------
-
     public function testFlip()
     {
         $this->handler->withFile($this->path);
@@ -241,7 +231,6 @@ public function testFlipUnknown()
         $this->handler->flip('bogus');
     }
 
-    //--------------------------------------------------------------------
     public function testFit()
     {
         $this->handler->withFile($this->path);
@@ -288,8 +277,6 @@ public function testFitPositions()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testText()
     {
         $this->handler->withFile($this->path);
@@ -298,8 +285,6 @@ public function testText()
         $this->assertSame(200, $this->handler->getHeight());
     }
 
-    //--------------------------------------------------------------------
-
     public function testMoreText()
     {
         $this->handler->withFile($this->path);
@@ -308,8 +293,6 @@ public function testMoreText()
         $this->assertSame(200, $this->handler->getHeight());
     }
 
-    //--------------------------------------------------------------------
-
     public function testImageCreation()
     {
         foreach (['gif', 'jpeg', 'png', 'webp'] as $type) {
@@ -325,8 +308,6 @@ public function testImageCreation()
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testImageCopy()
     {
         foreach (['gif', 'jpeg', 'png', 'webp'] as $type) {
diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php
index 2a9a3df7f69c..93d10fc07c8e 100644
--- a/tests/system/Language/LanguageTest.php
+++ b/tests/system/Language/LanguageTest.php
@@ -40,8 +40,6 @@ public function testReturnParsedStringWithNoFileInMessage()
         $this->assertSame('£7.41', lang($line, ['price' => '7.41'], 'en-GB'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetLineReturnsLine()
     {
         $this->lang->setData('books', [
@@ -52,8 +50,6 @@ public function testGetLineReturnsLine()
         $this->assertSame('We saved some more', $this->lang->getLine('books.booksSaved'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetLineReturnsFallbackLine()
     {
         $this->lang
@@ -76,8 +72,6 @@ public function testGetLineReturnsFallbackLine()
         $this->assertSame('equivalent.unknown', $this->lang->getLine('equivalent.unknown'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetLineArrayReturnsLineArray()
     {
         $this->lang->setData('books', [
@@ -93,8 +87,6 @@ public function testGetLineArrayReturnsLineArray()
         ], $this->lang->getLine('books.booksList'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetLineFormatsMessage()
     {
         // No intl extension? then we can't test this - go away....
@@ -109,8 +101,6 @@ public function testGetLineFormatsMessage()
         $this->assertSame('45 books have been saved.', $this->lang->getLine('books.bookCount', [91 / 2]));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetLineArrayFormatsMessages()
     {
         // No intl extension? Then we can't test this - go away...
@@ -127,8 +117,6 @@ public function testGetLineArrayFormatsMessages()
         $this->assertSame(['45 related books.'], $this->lang->getLine('books.bookList', [91 / 2]));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/891
      */
@@ -141,8 +129,6 @@ public function testLangAllowsOtherLocales()
         $this->assertSame('Whatever this would be, translated', $str2);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLangDoesntFormat()
     {
         $this->lang->disableIntlSupport();
@@ -156,8 +142,6 @@ public function testLangDoesntFormat()
         $this->assertSame(['{0, number, integer} related books.'], $this->lang->getLine('books.bookList', [15]));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLanguageDuplicateKey()
     {
         $this->lang = new Language('en');
@@ -167,8 +151,6 @@ public function testLanguageDuplicateKey()
         $this->assertSame('I have a very bad feeling about this', $this->lang->getLine('More.cannotMove', []));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLanguageFileLoading()
     {
         $this->lang = new SecondMockLanguage('en');
@@ -180,8 +162,6 @@ public function testLanguageFileLoading()
         $this->assertCount(1, $this->lang->loaded()); // should only be there once
     }
 
-    //--------------------------------------------------------------------
-
     public function testLanguageFileLoadingReturns()
     {
         $this->lang = new SecondMockLanguage('en');
@@ -195,8 +175,6 @@ public function testLanguageFileLoadingReturns()
         $this->assertCount(1, $this->lang->loaded());
     }
 
-    //--------------------------------------------------------------------
-
     public function testLanguageSameKeyAndFileName()
     {
         // first file data | example.message
@@ -211,16 +189,12 @@ public function testLanguageSameKeyAndFileName()
         $this->assertSame('Another example', $this->lang->getLine('another.example'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetLocale()
     {
         $this->lang = Services::language('en', false);
         $this->assertSame('en', $this->lang->getLocale());
     }
 
-    //--------------------------------------------------------------------
-
     public function testPrioritizedLocator()
     {
         // this should load the replacement bundle of messages
@@ -230,8 +204,6 @@ public function testPrioritizedLocator()
         $this->assertSame('billions and billions', lang('Core.bazillion', [], 'en'));
     }
 
-    //--------------------------------------------------------------------
-
     public function MessageBundles()
     {
         return [
@@ -270,7 +242,6 @@ public function testBundleUniqueKeys($bundle)
         $this->assertGreaterThan(0, count($messages));
     }
 
-    //--------------------------------------------------------------------
     // Testing base locale vs variants
 
     public function testBaseFallbacks()
@@ -289,8 +260,6 @@ public function testBaseFallbacks()
         $this->assertSame('More.shootMe', $this->lang->getLine('More.shootMe'));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Testing base locale vs variants, with fallback to English.
      *
diff --git a/tests/system/Log/Handlers/FileHandlerTest.php b/tests/system/Log/Handlers/FileHandlerTest.php
index ef55dcbbc6ef..add23b7ba1b5 100644
--- a/tests/system/Log/Handlers/FileHandlerTest.php
+++ b/tests/system/Log/Handlers/FileHandlerTest.php
@@ -30,8 +30,6 @@ public function testHandle()
         $this->assertTrue($logger->handle('warning', 'This is a test log'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testBasicHandle()
     {
         $config                                                                = new LoggerConfig();
diff --git a/tests/system/Log/LoggerTest.php b/tests/system/Log/LoggerTest.php
index 065a8804a3fd..45420e64a90b 100644
--- a/tests/system/Log/LoggerTest.php
+++ b/tests/system/Log/LoggerTest.php
@@ -26,8 +26,6 @@ public function testThrowsExceptionWithBadHandlerSettings()
         $logger = new Logger($config);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLogThrowsExceptionOnInvalidLevel()
     {
         $config = new LoggerConfig();
@@ -40,8 +38,6 @@ public function testLogThrowsExceptionOnInvalidLevel()
         $logger->log('foo', '');
     }
 
-    //--------------------------------------------------------------------
-
     public function testLogReturnsFalseWhenLogNotHandled()
     {
         $config            = new LoggerConfig();
@@ -52,8 +48,6 @@ public function testLogReturnsFalseWhenLogNotHandled()
         $this->assertFalse($logger->log('debug', ''));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLogActuallyLogs()
     {
         $config = new LoggerConfig();
@@ -71,8 +65,6 @@ public function testLogActuallyLogs()
         $this->assertSame($expected, $logs[0]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLogDoesnotLogUnhandledLevels()
     {
         $config                                                                = new LoggerConfig();
@@ -87,8 +79,6 @@ public function testLogDoesnotLogUnhandledLevels()
         $this->assertCount(0, $logs);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLogInterpolatesMessage()
     {
         $config = new LoggerConfig();
@@ -105,8 +95,6 @@ public function testLogInterpolatesMessage()
         $this->assertSame($expected, $logs[0]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLogInterpolatesPost()
     {
         $config = new LoggerConfig();
@@ -124,8 +112,6 @@ public function testLogInterpolatesPost()
         $this->assertSame($expected, $logs[0]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLogInterpolatesGet()
     {
         $config = new LoggerConfig();
@@ -143,8 +129,6 @@ public function testLogInterpolatesGet()
         $this->assertSame($expected, $logs[0]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLogInterpolatesSession()
     {
         $config = new LoggerConfig();
@@ -162,8 +146,6 @@ public function testLogInterpolatesSession()
         $this->assertSame($expected, $logs[0]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLogInterpolatesCurrentEnvironment()
     {
         $config = new LoggerConfig();
@@ -180,8 +162,6 @@ public function testLogInterpolatesCurrentEnvironment()
         $this->assertSame($expected, $logs[0]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLogInterpolatesEnvironmentVars()
     {
         $config = new LoggerConfig();
@@ -200,8 +180,6 @@ public function testLogInterpolatesEnvironmentVars()
         $this->assertSame($expected, $logs[0]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLogInterpolatesFileAndLine()
     {
         $config = new LoggerConfig();
@@ -219,8 +197,6 @@ public function testLogInterpolatesFileAndLine()
         $this->assertTrue(strpos($logs[0], $expected) > 1);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLogInterpolatesExceptions()
     {
         $config = new LoggerConfig();
@@ -240,8 +216,6 @@ public function testLogInterpolatesExceptions()
         $this->assertTrue(strpos($logs[0], $expected) === 0);
     }
 
-    //--------------------------------------------------------------------
-
     public function testEmergencyLogsCorrectly()
     {
         $config = new LoggerConfig();
@@ -257,8 +231,6 @@ public function testEmergencyLogsCorrectly()
         $this->assertSame($expected, $logs[0]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testAlertLogsCorrectly()
     {
         $config = new LoggerConfig();
@@ -274,8 +246,6 @@ public function testAlertLogsCorrectly()
         $this->assertSame($expected, $logs[0]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testCriticalLogsCorrectly()
     {
         $config = new LoggerConfig();
@@ -291,8 +261,6 @@ public function testCriticalLogsCorrectly()
         $this->assertSame($expected, $logs[0]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testErrorLogsCorrectly()
     {
         $config = new LoggerConfig();
@@ -308,8 +276,6 @@ public function testErrorLogsCorrectly()
         $this->assertSame($expected, $logs[0]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testWarningLogsCorrectly()
     {
         $config = new LoggerConfig();
@@ -325,8 +291,6 @@ public function testWarningLogsCorrectly()
         $this->assertSame($expected, $logs[0]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testNoticeLogsCorrectly()
     {
         $config = new LoggerConfig();
@@ -342,8 +306,6 @@ public function testNoticeLogsCorrectly()
         $this->assertSame($expected, $logs[0]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testInfoLogsCorrectly()
     {
         $config = new LoggerConfig();
@@ -359,8 +321,6 @@ public function testInfoLogsCorrectly()
         $this->assertSame($expected, $logs[0]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testDebugLogsCorrectly()
     {
         $config = new LoggerConfig();
@@ -376,8 +336,6 @@ public function testDebugLogsCorrectly()
         $this->assertSame($expected, $logs[0]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLogLevels()
     {
         $config = new LoggerConfig();
@@ -393,8 +351,6 @@ public function testLogLevels()
         $this->assertSame($expected, $logs[0]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testNonStringMessage()
     {
         $config = new LoggerConfig();
@@ -409,8 +365,6 @@ public function testNonStringMessage()
         $this->assertStringContainsString($expected, $logs[0]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testFilenameCleaning()
     {
         $config = new LoggerConfig();
@@ -422,8 +376,6 @@ public function testFilenameCleaning()
         $this->assertSame($expected, $logger->cleanup($ohoh));
     }
 
-    //--------------------------------------------------------------------
-
     public function testDetermineFileNoStackTrace()
     {
         $config = new LoggerConfig();
diff --git a/tests/system/Pager/PagerRendererTest.php b/tests/system/Pager/PagerRendererTest.php
index 558b435d1086..a4bbbf4e49ff 100644
--- a/tests/system/Pager/PagerRendererTest.php
+++ b/tests/system/Pager/PagerRendererTest.php
@@ -15,8 +15,6 @@ final class PagerRendererTest extends CIUnitTestCase
      */
     protected $uri;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -25,8 +23,6 @@ protected function setUp(): void
         $this->expect = 'http://example.com/foo?page=';
     }
 
-    //--------------------------------------------------------------------
-
     public function testHasPreviousReturnsFalseWhenFirstIsOne()
     {
         $details = [
@@ -41,8 +37,6 @@ public function testHasPreviousReturnsFalseWhenFirstIsOne()
         $this->assertFalse($pager->hasPrevious());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHasPreviousReturnsTrueWhenFirstIsMoreThanOne()
     {
         $uri = $this->uri;
@@ -62,8 +56,6 @@ public function testHasPreviousReturnsTrueWhenFirstIsMoreThanOne()
         $this->assertSame('http://example.com/foo?foo=bar&page=2', $pager->getPrevious());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetPreviousWhenSurroundCountIsZero()
     {
         $uri = $this->uri;
@@ -83,8 +75,6 @@ public function testGetPreviousWhenSurroundCountIsZero()
         $this->assertSame('http://example.com/foo?foo=bar&page=3', $pager->getPrevious());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHasNextReturnsFalseWhenLastIsTotal()
     {
         $uri = $this->uri;
@@ -103,8 +93,6 @@ public function testHasNextReturnsFalseWhenLastIsTotal()
         $this->assertFalse($pager->hasNext());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHasNextReturnsTrueWhenLastIsSmallerThanTotal()
     {
         $uri = $this->uri;
@@ -124,8 +112,6 @@ public function testHasNextReturnsTrueWhenLastIsSmallerThanTotal()
         $this->assertSame('http://example.com/foo?foo=bar&page=7', $pager->getNext());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetNextWhenSurroundCountIsZero()
     {
         $uri = $this->uri;
@@ -145,8 +131,6 @@ public function testGetNextWhenSurroundCountIsZero()
         $this->assertSame('http://example.com/foo?foo=bar&page=5', $pager->getNext());
     }
 
-    //--------------------------------------------------------------------
-
     public function testLinksBasics()
     {
         $details = [
@@ -180,8 +164,6 @@ public function testLinksBasics()
         $this->assertSame($expected, $pager->links());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetFirstAndGetLast()
     {
         $uri = $this->uri;
@@ -200,8 +182,6 @@ public function testGetFirstAndGetLast()
         $this->assertSame('http://example.com/foo?foo=bar&page=50', $pager->getLast());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetCurrent()
     {
         $uri = $this->uri;
@@ -219,8 +199,6 @@ public function testGetCurrent()
         $this->assertSame('http://example.com/foo?foo=bar&page=10', $pager->getCurrent());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetCurrentWithSegment()
     {
         $uri = $this->uri;
@@ -239,8 +217,6 @@ public function testGetCurrentWithSegment()
         $this->assertSame('http://example.com/foo/10?foo=bar', $pager->getCurrent());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSurroundCount()
     {
         $uri = $this->uri;
@@ -274,8 +250,6 @@ public function testSurroundCount()
         $this->assertNull($pager->getNext());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHasPreviousReturnsFalseWhenFirstIsOneSegment()
     {
         $details = [
@@ -291,8 +265,6 @@ public function testHasPreviousReturnsFalseWhenFirstIsOneSegment()
         $this->assertFalse($pager->hasPrevious());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHasPreviousReturnsTrueWhenFirstIsMoreThanOneSegment()
     {
         $uri = $this->uri;
@@ -313,8 +285,6 @@ public function testHasPreviousReturnsTrueWhenFirstIsMoreThanOneSegment()
         $this->assertSame('http://example.com/foo/2?foo=bar', $pager->getPrevious());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetPreviousWhenSurroundCountIsZeroSegment()
     {
         $uri = $this->uri;
@@ -335,8 +305,6 @@ public function testGetPreviousWhenSurroundCountIsZeroSegment()
         $this->assertSame('http://example.com/foo/3?foo=bar', $pager->getPrevious());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHasNextReturnsFalseWhenLastIsTotalSegment()
     {
         $uri = $this->uri;
@@ -356,8 +324,6 @@ public function testHasNextReturnsFalseWhenLastIsTotalSegment()
         $this->assertFalse($pager->hasNext());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHasNextReturnsTrueWhenLastIsSmallerThanTotalSegment()
     {
         $uri = $this->uri;
@@ -378,8 +344,6 @@ public function testHasNextReturnsTrueWhenLastIsSmallerThanTotalSegment()
         $this->assertSame('http://example.com/foo/7?foo=bar', $pager->getNext());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetNextWhenSurroundCountIsZeroSegment()
     {
         $uri = $this->uri;
@@ -400,8 +364,6 @@ public function testGetNextWhenSurroundCountIsZeroSegment()
         $this->assertSame('http://example.com/foo/5?foo=bar', $pager->getNext());
     }
 
-    //--------------------------------------------------------------------
-
     public function testLinksBasicsSegment()
     {
         $details = [
@@ -436,8 +398,6 @@ public function testLinksBasicsSegment()
         $this->assertSame($expected, $pager->links());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetFirstAndGetLastSegment()
     {
         $uri = $this->uri;
@@ -457,8 +417,6 @@ public function testGetFirstAndGetLastSegment()
         $this->assertSame('http://example.com/foo/50?foo=bar', $pager->getLast());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHasPreviousPageReturnsFalseWhenCurrentPageIsFirst()
     {
         $details = [
@@ -474,8 +432,6 @@ public function testHasPreviousPageReturnsFalseWhenCurrentPageIsFirst()
         $this->assertFalse($pager->hasPreviousPage());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHasNextPageReturnsFalseWhenCurrentPageIsLast()
     {
         $details = [
@@ -491,8 +447,6 @@ public function testHasNextPageReturnsFalseWhenCurrentPageIsLast()
         $this->assertFalse($pager->hasNextPage());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHasPreviousPageReturnsTrueWhenFirstIsMoreThanCurrent()
     {
         $uri = $this->uri;
@@ -511,8 +465,6 @@ public function testHasPreviousPageReturnsTrueWhenFirstIsMoreThanCurrent()
         $this->assertSame('http://example.com/foo?page=2', $pager->getPreviousPage());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetPreviousPageWithSegmentHigherThanZero()
     {
         $uri = $this->uri;
@@ -529,8 +481,6 @@ public function testGetPreviousPageWithSegmentHigherThanZero()
         $this->assertSame('http://example.com/foo/2', $pager->getPreviousPage());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHasNextPageReturnsTrueWhenLastIsMoreThanCurrent()
     {
         $uri = $this->uri;
diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index 4b47db042ef9..f24adc1e7b4b 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -40,8 +40,6 @@ final class ResourceControllerTest extends CIUnitTestCase
      */
     protected $routes;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -68,8 +66,6 @@ protected function tearDown(): void
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testResourceGet()
     {
         $_SERVER['argv'] = [
@@ -221,7 +217,6 @@ public function testResourceDelete()
         $this->assertStringContainsString(lang('RESTful.notImplemented', ['delete']), $output);
     }
 
-    //--------------------------------------------------------------------
     public function testModel()
     {
         $resource = new MockResourceController();
@@ -257,7 +252,6 @@ public function testModelByObject()
         $this->assertSame('Tests\Support\Models\UserModel', $resource->getModelName());
     }
 
-    //--------------------------------------------------------------------
     public function testFormat()
     {
         $resource = new MockResourceController();
@@ -270,7 +264,6 @@ public function testFormat()
         $this->assertSame('xml', $resource->getFormat());
     }
 
-    //--------------------------------------------------------------------
     public function testJSONFormatOutput()
     {
         $resource = new MockResourceController();
@@ -299,7 +292,6 @@ public function testJSONFormatOutput()
         $this->assertSame($expected, $result);
     }
 
-    //--------------------------------------------------------------------
     public function testXMLFormatOutput()
     {
         $resource = new MockResourceController();
diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php
index 5576b9b32fc9..17eefadc8952 100644
--- a/tests/system/RESTful/ResourcePresenterTest.php
+++ b/tests/system/RESTful/ResourcePresenterTest.php
@@ -34,8 +34,6 @@ final class ResourcePresenterTest extends CIUnitTestCase
      */
     protected $routes;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -62,8 +60,6 @@ protected function tearDown(): void
         }
     }
 
-    //--------------------------------------------------------------------
-
     public function testResourceGet()
     {
         $_SERVER['argv'] = [
@@ -221,8 +217,6 @@ public function testResourceUpdate()
         $this->assertStringContainsString(lang('RESTful.notImplemented', ['update']), $output);
     }
 
-    //--------------------------------------------------------------------
-
     public function testModel()
     {
         $resource = new MockResourcePresenter();
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index 01b2e4d513bc..b6350381b911 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -53,8 +53,6 @@ public function testBasicAdd()
         $this->assertSame($expects, $routes);
     }
 
-    //--------------------------------------------------------------------
-
     public function testAddPrefixesDefaultNamespaceWhenNoneExist()
     {
         $routes = $this->getCollector();
@@ -70,8 +68,6 @@ public function testAddPrefixesDefaultNamespaceWhenNoneExist()
         $this->assertSame($expects, $routes);
     }
 
-    //--------------------------------------------------------------------
-
     public function testAddIgnoresDefaultNamespaceWhenExists()
     {
         $routes = $this->getCollector();
@@ -87,8 +83,6 @@ public function testAddIgnoresDefaultNamespaceWhenExists()
         $this->assertSame($expects, $routes);
     }
 
-    //--------------------------------------------------------------------
-
     public function testAddWorksWithCurrentHTTPMethods()
     {
         Services::request()->setMethod('get');
@@ -106,8 +100,6 @@ public function testAddWorksWithCurrentHTTPMethods()
         $this->assertSame($expects, $routes);
     }
 
-    //--------------------------------------------------------------------
-
     public function testAddWithLeadingSlash()
     {
         $routes = $this->getCollector();
@@ -123,8 +115,6 @@ public function testAddWithLeadingSlash()
         $this->assertSame($expects, $routes);
     }
 
-    //--------------------------------------------------------------------
-
     public function testMatchIgnoresInvalidHTTPMethods()
     {
         Services::request()->setMethod('get');
@@ -138,8 +128,6 @@ public function testMatchIgnoresInvalidHTTPMethods()
         $this->assertSame([], $routes);
     }
 
-    //--------------------------------------------------------------------
-
     public function testAddWorksWithArrayOFHTTPMethods()
     {
         Services::request()->setMethod('post');
@@ -157,8 +145,6 @@ public function testAddWorksWithArrayOFHTTPMethods()
         $this->assertSame($expects, $routes);
     }
 
-    //--------------------------------------------------------------------
-
     public function testAddReplacesDefaultPlaceholders()
     {
         $routes = $this->getCollector();
@@ -174,8 +160,6 @@ public function testAddReplacesDefaultPlaceholders()
         $this->assertSame($expects, $routes);
     }
 
-    //--------------------------------------------------------------------
-
     public function testAddReplacesCustomPlaceholders()
     {
         $routes = $this->getCollector();
@@ -192,8 +176,6 @@ public function testAddReplacesCustomPlaceholders()
         $this->assertSame($expects, $routes);
     }
 
-    //--------------------------------------------------------------------
-
     public function testAddRecognizesCustomNamespaces()
     {
         $routes = $this->getCollector();
@@ -210,8 +192,6 @@ public function testAddRecognizesCustomNamespaces()
         $this->assertSame($expects, $routes);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetDefaultControllerStoresIt()
     {
         $routes = $this->getCollector();
@@ -220,8 +200,6 @@ public function testSetDefaultControllerStoresIt()
         $this->assertSame('godzilla', $routes->getDefaultController());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetDefaultMethodStoresIt()
     {
         $routes = $this->getCollector();
@@ -230,8 +208,6 @@ public function testSetDefaultMethodStoresIt()
         $this->assertSame('biggerBox', $routes->getDefaultMethod());
     }
 
-    //--------------------------------------------------------------------
-
     public function testTranslateURIDashesWorks()
     {
         $routes = $this->getCollector();
@@ -240,8 +216,6 @@ public function testTranslateURIDashesWorks()
         $this->assertTrue($routes->shouldTranslateURIDashes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testAutoRouteStoresIt()
     {
         $routes = $this->getCollector();
@@ -250,8 +224,6 @@ public function testAutoRouteStoresIt()
         $this->assertTrue($routes->shouldAutoRoute());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGroupingWorks()
     {
         $routes = $this->getCollector();
@@ -270,8 +242,6 @@ static function ($routes) {
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGroupGetsSanitized()
     {
         $routes = $this->getCollector();
@@ -290,8 +260,6 @@ static function ($routes) {
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGroupSetsOptions()
     {
         $routes = $this->getCollector();
@@ -311,8 +279,6 @@ static function ($routes) {
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGroupingWorksWithEmptyStringPrefix()
     {
         $routes = $this->getCollector();
@@ -331,8 +297,6 @@ static function ($routes) {
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testNestedGroupingWorksWithEmptyPrefix()
     {
         $routes = $this->getCollector();
@@ -361,8 +325,6 @@ static function ($routes) {
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHostnameOption()
     {
         $_SERVER['HTTP_HOST'] = 'example.com';
@@ -379,8 +341,6 @@ public function testHostnameOption()
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testResourceScaffoldsCorrectly()
     {
         $routes = $this->getCollector();
@@ -529,8 +489,6 @@ public function testPresenterScaffoldsCorrectly()
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testResourcesWithCustomController()
     {
         Services::request()->setMethod('get');
@@ -548,8 +506,6 @@ public function testResourcesWithCustomController()
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testResourcesWithCustomPlaceholder()
     {
         Services::request()->setMethod('get');
@@ -603,8 +559,6 @@ public function testResourcesWithBogusDefaultPlaceholder()
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testResourcesWithOnly()
     {
         Services::request()->setMethod('get');
@@ -619,8 +573,6 @@ public function testResourcesWithOnly()
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testResourcesWithExcept()
     {
         Services::request()->setMethod('get');
@@ -636,8 +588,6 @@ public function testResourcesWithExcept()
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testResourcesWithWebsafe()
     {
         $routes = $this->getCollector();
@@ -654,8 +604,6 @@ public function testResourcesWithWebsafe()
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testMatchSupportsMultipleMethods()
     {
         Services::request()->setMethod('get');
@@ -672,8 +620,6 @@ public function testMatchSupportsMultipleMethods()
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGet()
     {
         Services::request()->setMethod('get');
@@ -685,8 +631,6 @@ public function testGet()
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testPost()
     {
         $routes = $this->getCollector();
@@ -698,8 +642,6 @@ public function testPost()
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetDoesntAllowOtherMethods()
     {
         $routes = $this->getCollector();
@@ -712,8 +654,6 @@ public function testGetDoesntAllowOtherMethods()
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testPut()
     {
         $routes = $this->getCollector();
@@ -725,8 +665,6 @@ public function testPut()
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testDelete()
     {
         $routes = $this->getCollector();
@@ -738,8 +676,6 @@ public function testDelete()
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testHead()
     {
         $routes = $this->getCollector();
@@ -751,8 +687,6 @@ public function testHead()
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testPatch()
     {
         $routes = $this->getCollector();
@@ -764,8 +698,6 @@ public function testPatch()
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testOptions()
     {
         $routes = $this->getCollector();
@@ -777,8 +709,6 @@ public function testOptions()
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testCLI()
     {
         $routes = $this->getCollector();
@@ -789,8 +719,6 @@ public function testCLI()
         $this->assertSame($expected, $routes->getRoutes('cli'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testEnvironmentRestricts()
     {
         // ENVIRONMENT should be 'testing'
@@ -817,8 +745,6 @@ static function ($routes) {
         $this->assertSame($expected, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     public function testReverseRoutingFindsSimpleMatch()
     {
         $routes = $this->getCollector();
@@ -830,8 +756,6 @@ public function testReverseRoutingFindsSimpleMatch()
         $this->assertSame('/path/string/to/13', $match);
     }
 
-    //--------------------------------------------------------------------
-
     public function testReverseRoutingWithLocaleAndFindsSimpleMatch()
     {
         $routes = $this->getCollector();
@@ -843,8 +767,6 @@ public function testReverseRoutingWithLocaleAndFindsSimpleMatch()
         $this->assertSame('/en/path/string/to/13', $match);
     }
 
-    //--------------------------------------------------------------------
-
     public function testReverseRoutingReturnsFalseWithBadParamCount()
     {
         $routes = $this->getCollector();
@@ -854,8 +776,6 @@ public function testReverseRoutingReturnsFalseWithBadParamCount()
         $this->assertFalse($routes->reverseRoute('myController::goto', 'string', 13));
     }
 
-    //--------------------------------------------------------------------
-
     public function testReverseRoutingReturnsFalseWithNoMatch()
     {
         $routes = $this->getCollector();
@@ -865,8 +785,6 @@ public function testReverseRoutingReturnsFalseWithNoMatch()
         $this->assertFalse($routes->reverseRoute('myBadController::goto', 'string', 13));
     }
 
-    //--------------------------------------------------------------------
-
     public function testReverseRoutingThrowsExceptionWithBadParamTypes()
     {
         $routes = $this->getCollector();
@@ -877,8 +795,6 @@ public function testReverseRoutingThrowsExceptionWithBadParamTypes()
         $routes->reverseRoute('myController::goto', 13, 'string');
     }
 
-    //--------------------------------------------------------------------
-
     public function testReverseRoutingWithLocale()
     {
         $routes = $this->getCollector();
@@ -888,8 +804,6 @@ public function testReverseRoutingWithLocale()
         $this->assertSame('/en/contact', $routes->reverseRoute('myController::goto'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNamedRoutes()
     {
         $routes = $this->getCollector();
@@ -899,8 +813,6 @@ public function testNamedRoutes()
         $this->assertSame('/users', $routes->reverseRoute('namedRoute'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNamedRoutesWithLocale()
     {
         $routes = $this->getCollector();
@@ -910,8 +822,6 @@ public function testNamedRoutesWithLocale()
         $this->assertSame('/en/users', $routes->reverseRoute('namedRoute'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNamedRoutesFillInParams()
     {
         $routes = $this->getCollector();
@@ -923,8 +833,6 @@ public function testNamedRoutesFillInParams()
         $this->assertSame('/path/string/to/13', $match);
     }
 
-    //--------------------------------------------------------------------
-
     public function testNamedRoutesWithLocaleAndFillInParams()
     {
         $routes = $this->getCollector();
@@ -936,8 +844,6 @@ public function testNamedRoutesWithLocaleAndFillInParams()
         $this->assertSame('/en/path/string/to/13', $match);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/642
      */
@@ -966,8 +872,6 @@ static function () {},
         $this->assertSame('/user/insert', $match3);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/642
      */
@@ -998,8 +902,6 @@ static function () {
         $this->assertSame('/en/user/insert', $match3);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/3048
      */
@@ -1013,8 +915,6 @@ public function testNamedRoutesWithPipesInRegex()
         $this->assertSame('/system/that', $routes->reverseRoute('pipedRoute', 'that'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testReverseRouteMatching()
     {
         $routes = $this->getCollector();
@@ -1026,8 +926,6 @@ public function testReverseRouteMatching()
         $this->assertSame('/test/1/2', $match);
     }
 
-    //--------------------------------------------------------------------
-
     public function testReverseRouteMatchingWithLocale()
     {
         $routes = $this->getCollector();
@@ -1039,8 +937,6 @@ public function testReverseRouteMatchingWithLocale()
         $this->assertSame('/en/test/1/2', $match);
     }
 
-    //--------------------------------------------------------------------
-
     public function testAddRedirect()
     {
         $routes = $this->getCollector();
@@ -1092,8 +988,6 @@ public function testAddRedirectGetMethod()
         $this->assertSame(307, $routes->getRedirectCode('users'));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/497
      */
@@ -1193,8 +1087,6 @@ public function testWithDifferentSubdomainMissing()
         $this->assertSame($expects, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/1692
      */
@@ -1214,8 +1106,6 @@ public function testWithSubdomainOrdered()
         $this->assertSame($expects, $routes->getRoutes());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/568
      */
@@ -1241,8 +1131,6 @@ public function testReverseRoutingWithClosureNoMatch()
         $this->assertFalse($routes->reverseRoute('foobar'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testWillDiscoverLocal()
     {
         $config = ['SampleSpace' => TESTPATH . '_support'];
@@ -1258,8 +1146,6 @@ public function testWillDiscoverLocal()
         $this->assertSame($match['testing'], '\TestController::index');
     }
 
-    //--------------------------------------------------------------------
-
     public function testDiscoverLocalAllowsConfigToOverridePackages()
     {
         $config = [
@@ -1279,8 +1165,6 @@ public function testDiscoverLocalAllowsConfigToOverridePackages()
         $this->assertSame($match['testing'], '\MainRoutes::index');
     }
 
-    //--------------------------------------------------------------------
-
     public function testRoutesOptions()
     {
         $routes = $this->getCollector();
@@ -1383,8 +1267,6 @@ static function ($routes) {
         $this->assertSame('role:admin,manager', $routes->getFilterForRoute('admin/users'));
     }
 
-    //--------------------------------------------------------------------
-
     public function test404OverrideNot()
     {
         Services::request()->setMethod('get');
@@ -1413,8 +1295,6 @@ public function test404OverrideCallable()
         $this->assertIsCallable($routes->get404Override());
     }
 
-    //--------------------------------------------------------------------
-
     public function testOffsetParameters()
     {
         Services::request()->setMethod('get');
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index c29a99d16a93..c305def0a203 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -364,7 +364,6 @@ public function testRouteWithLeadingSlash()
         $this->assertSame('index', $router->methodName());
     }
 
-    //--------------------------------------------------------------------
     // options need to be declared separately, to not confuse PHPCBF
     public function testMatchedRouteOptions()
     {
diff --git a/tests/system/Test/FabricatorTest.php b/tests/system/Test/FabricatorTest.php
index 2ac4ce0d101e..e3d458dc9310 100644
--- a/tests/system/Test/FabricatorTest.php
+++ b/tests/system/Test/FabricatorTest.php
@@ -34,8 +34,6 @@ protected function tearDown(): void
         Fabricator::resetCounts();
     }
 
-    //--------------------------------------------------------------------
-
     public function testConstructorWithString()
     {
         $fabricator = new Fabricator(UserModel::class);
@@ -90,8 +88,6 @@ public function testConstructorUsesProvidedLocale()
         $this->assertSame($locale, $fabricator->getLocale());
     }
 
-    //--------------------------------------------------------------------
-
     public function testModelUsesNewInstance()
     {
         // Inject the wrong model for UserModel to show it is ignored by Fabricator
@@ -121,8 +117,6 @@ public function testGetFakerReturnsUsableGenerator()
         $this->assertIsNumeric($faker->randomDigit);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetFormattersChangesFormatters()
     {
         $formatters = ['boo' => 'hiss'];
@@ -155,8 +149,6 @@ public function testDetectFormattersDetectsFormatters()
         $this->assertSame($this->formatters, $fabricator->getFormatters());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetOverridesSets()
     {
         $overrides  = ['name' => 'Steve'];
@@ -189,8 +181,6 @@ public function testSetOverridesOnce()
         $this->assertSame([], $fabricator->getOverrides());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGuessFormattersReturnsActual()
     {
         $fabricator = new Fabricator(UserModel::class);
@@ -251,8 +241,6 @@ public function testGuessFormattersFallback()
         $this->assertSame($fabricator->defaultFormatter, $formatter);
     }
 
-    //--------------------------------------------------------------------
-
     public function testMakeArrayReturnsArray()
     {
         $fabricator = new Fabricator(UserModel::class, $this->formatters);
@@ -292,8 +280,6 @@ public function testMakeArrayUsesFakeMethod()
         $this->assertSame($result['name'], filter_var($result['name'], FILTER_VALIDATE_IP));
     }
 
-    //--------------------------------------------------------------------
-
     public function testMakeObjectReturnsModelReturnType()
     {
         $fabricator = new Fabricator(EntityModel::class);
@@ -362,8 +348,6 @@ public function testMakeObjectUsesFakeMethod()
         $this->assertSame($result->name, filter_var($result->name, FILTER_VALIDATE_IP));
     }
 
-    //--------------------------------------------------------------------
-
     public function testMakeReturnsSingleton()
     {
         $fabricator = new Fabricator(UserModel::class);
@@ -384,8 +368,6 @@ public function testMakeReturnsExpectedCount()
         $this->assertCount($count, $result);
     }
 
-    //--------------------------------------------------------------------
-
     public function testCreateMockReturnsSingleton()
     {
         $fabricator = new Fabricator(UserModel::class);
@@ -420,8 +402,6 @@ public function testCreateMockSetsDatabaseFields()
         $this->assertNull($result->deleted_at);
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetCountReturnsCount()
     {
         $result = Fabricator::setCount('goblins', 42);
diff --git a/tests/system/Test/TestCaseEmissionsTest.php b/tests/system/Test/TestCaseEmissionsTest.php
index 387a9fd24652..33e4647bf97b 100644
--- a/tests/system/Test/TestCaseEmissionsTest.php
+++ b/tests/system/Test/TestCaseEmissionsTest.php
@@ -29,8 +29,6 @@ final class TestCaseEmissionsTest extends CIUnitTestCase
      * the body we thought would be sent actually was.
      */
 
-    //--------------------------------------------------------------------
-
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
@@ -59,8 +57,6 @@ public function testHeadersEmitted()
         $this->assertHeaderEmitted('set-cookie: FOO=bar', true);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
diff --git a/tests/system/Test/TestCaseTest.php b/tests/system/Test/TestCaseTest.php
index 6c0306b856df..d47bee950c02 100644
--- a/tests/system/Test/TestCaseTest.php
+++ b/tests/system/Test/TestCaseTest.php
@@ -29,16 +29,12 @@ public function testGetPrivatePropertyWithObject()
         $this->assertSame('secret', $actual);
     }
 
-    //--------------------------------------------------------------------
-
     public function testLogging()
     {
         log_message('error', 'Some variable did not contain a value.');
         $this->assertLogged('error', 'Some variable did not contain a value.');
     }
 
-    //--------------------------------------------------------------------
-
     public function testEventTriggering()
     {
         Events::on('foo', static function ($arg) use (&$result) {
@@ -50,8 +46,6 @@ public function testEventTriggering()
         $this->assertEventTriggered('foo');
     }
 
-    //--------------------------------------------------------------------
-
     public function testStreamFilter()
     {
         CITestStreamFilter::$buffer = '';
@@ -62,8 +56,6 @@ public function testStreamFilter()
         stream_filter_remove($this->stream_filter);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * PHPunit emits headers before we get nominal control of
      * the output stream, making header testing awkward, to say
@@ -90,7 +82,6 @@ public function testPHPUnitHeadersEmitted()
         $this->assertHeaderNotEmitted('Set-Cookie: foo=bar;');
     }
 
-    //--------------------------------------------------------------------
     public function testCloseEnough()
     {
         $this->assertCloseEnough(1, 1);
diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php
index 95e52ac56227..ea0e5d040a06 100644
--- a/tests/system/Validation/CreditCardRulesTest.php
+++ b/tests/system/Validation/CreditCardRulesTest.php
@@ -33,8 +33,6 @@ final class CreditCardRulesTest extends CIUnitTestCase
         ],
     ];
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -44,9 +42,7 @@ protected function setUp(): void
         $_FILES = [];
     }
 
-    //--------------------------------------------------------------------
     // Credit Card Rules
-    //--------------------------------------------------------------------
 
     /**
      * @dataProvider creditCardProvider
@@ -68,8 +64,6 @@ public function testValidCCNumber($type, $number, $expected = false)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Cards shown are test cards found around the web.
      *
@@ -1213,8 +1207,6 @@ public function creditCardProvider()
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Used to generate fake credit card numbers that will still pass the Luhn
      * check used to validate the card so we can be sure the cards are recognized correctly.
@@ -1263,6 +1255,4 @@ protected function generateCardNum(int $prefix, int $length)
 
         return implode('', $string);
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Validation/FileRulesTest.php b/tests/system/Validation/FileRulesTest.php
index 7d1019049959..ff6f2a319a1b 100644
--- a/tests/system/Validation/FileRulesTest.php
+++ b/tests/system/Validation/FileRulesTest.php
@@ -33,8 +33,6 @@ final class FileRulesTest extends CIUnitTestCase
         ],
     ];
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -132,8 +130,6 @@ protected function setUp(): void
         ];
     }
 
-    //--------------------------------------------------------------------
-
     public function testUploadedTrue()
     {
         $this->validation->setRules([
@@ -170,8 +166,6 @@ public function testUploadedArrayReturnsFalse()
         $this->assertFalse($this->validation->run([]));
     }
 
-    //--------------------------------------------------------------------
-
     public function testMaxSize()
     {
         $this->validation->setRules([
@@ -223,8 +217,6 @@ public function testMaxSizeBad()
         $this->assertFalse($this->validation->run([]));
     }
 
-    //--------------------------------------------------------------------
-
     public function testMaxDims()
     {
         $this->validation->setRules([
@@ -249,8 +241,6 @@ public function testMaxDimsBad()
         $this->assertFalse($this->validation->run([]));
     }
 
-    //--------------------------------------------------------------------
-
     public function testIsImage()
     {
         $this->validation->setRules([
@@ -282,8 +272,6 @@ public function testAlsoIsntImage()
         $this->assertFalse($this->validation->run([]));
     }
 
-    //--------------------------------------------------------------------
-
     public function testMimeTypeOk()
     {
         $this->validation->setRules([
@@ -308,8 +296,6 @@ public function testMimeTypeImpossible()
         $this->assertFalse($this->validation->run([]));
     }
 
-    //--------------------------------------------------------------------
-
     public function testExtensionOk()
     {
         $this->validation->setRules([
diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
index 536a48e3e087..ef281711ae77 100644
--- a/tests/system/Validation/RulesTest.php
+++ b/tests/system/Validation/RulesTest.php
@@ -40,8 +40,6 @@ final class RulesTest extends CIUnitTestCase
         ],
     ];
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -52,9 +50,7 @@ protected function setUp(): void
         $_FILES = [];
     }
 
-    //--------------------------------------------------------------------
     // Rules Tests
-    //--------------------------------------------------------------------
 
     public function testRequiredNull()
     {
@@ -69,8 +65,6 @@ public function testRequiredNull()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testRequiredTrueString()
     {
         $data = [
@@ -84,8 +78,6 @@ public function testRequiredTrueString()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testRequiredFalseString()
     {
         $data = [
@@ -100,8 +92,6 @@ public function testRequiredFalseString()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testRequiredTrueArray()
     {
         $data = [
@@ -115,8 +105,6 @@ public function testRequiredTrueArray()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testRequiredFalseArray()
     {
         $data = [
@@ -130,8 +118,6 @@ public function testRequiredFalseArray()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testRequiredObject()
     {
         $data = [
@@ -145,8 +131,6 @@ public function testRequiredObject()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @dataProvider ifExistProvider
      *
@@ -161,8 +145,6 @@ public function testIfExist($rules, $data, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function ifExistProvider()
     {
         return [
@@ -201,8 +183,6 @@ public function ifExistProvider()
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @dataProvider emptysProvider
      *
@@ -217,8 +197,6 @@ public function testEmptys($rules, $data, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function emptysProvider()
     {
         return [
@@ -367,8 +345,6 @@ public function emptysProvider()
         ];
     }
 
-    //--------------------------------------------------------------------
-
     public function testMatchesNull()
     {
         $data = [
@@ -383,8 +359,6 @@ public function testMatchesNull()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testMatchesTrue()
     {
         $data = [
@@ -399,8 +373,6 @@ public function testMatchesTrue()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testMatchesFalse()
     {
         $data = [
@@ -415,8 +387,6 @@ public function testMatchesFalse()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testMatcheNestedsTrue()
     {
         $data = [
@@ -433,8 +403,6 @@ public function testMatcheNestedsTrue()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testMatchesNestedFalse()
     {
         $data = [
@@ -451,8 +419,6 @@ public function testMatchesNestedFalse()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testDiffersNull()
     {
         $data = [
@@ -467,8 +433,6 @@ public function testDiffersNull()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testDiffersTrue()
     {
         $data = [
@@ -483,8 +447,6 @@ public function testDiffersTrue()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testDiffersFalse()
     {
         $data = [
@@ -499,8 +461,6 @@ public function testDiffersFalse()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testDiffersNestedTrue()
     {
         $data = [
@@ -517,8 +477,6 @@ public function testDiffersNestedTrue()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testDiffersNestedFalse()
     {
         $data = [
@@ -535,8 +493,6 @@ public function testDiffersNestedFalse()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testEqualsNull()
     {
         $data = [
@@ -550,8 +506,6 @@ public function testEqualsNull()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testEqualsEmptyIsEmpty()
     {
         $data = [
@@ -565,8 +519,6 @@ public function testEqualsEmptyIsEmpty()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testEqualsReturnsFalseOnFailure()
     {
         $data = [
@@ -580,8 +532,6 @@ public function testEqualsReturnsFalseOnFailure()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testEqualsReturnsTrueOnSuccess()
     {
         $data = [
@@ -595,8 +545,6 @@ public function testEqualsReturnsTrueOnSuccess()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testEqualsReturnsFalseOnCaseMismatch()
     {
         $data = [
@@ -610,8 +558,6 @@ public function testEqualsReturnsFalseOnCaseMismatch()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNotEqualsNull()
     {
         $data = [
@@ -625,8 +571,6 @@ public function testNotEqualsNull()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNotEqualsEmptyIsEmpty()
     {
         $data = [
@@ -640,8 +584,6 @@ public function testNotEqualsEmptyIsEmpty()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNotEqualsReturnsFalseOnFailure()
     {
         $data = [
@@ -655,8 +597,6 @@ public function testNotEqualsReturnsFalseOnFailure()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNotEqualsReturnsTrueOnSuccess()
     {
         $data = [
@@ -670,8 +610,6 @@ public function testNotEqualsReturnsTrueOnSuccess()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNotEqualsReturnsTrueOnCaseMismatch()
     {
         $data = [
@@ -685,8 +623,6 @@ public function testNotEqualsReturnsTrueOnCaseMismatch()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group DatabaseLive
      */
@@ -711,8 +647,6 @@ public function testIsUniqueFalse()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group DatabaseLive
      */
@@ -729,8 +663,6 @@ public function testIsUniqueTrue()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group DatabaseLive
      */
@@ -759,8 +691,6 @@ public function testIsUniqueIgnoresParams()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group DatabaseLive
      */
@@ -790,8 +720,6 @@ public function testIsUniqueIgnoresParamsPlaceholders()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group DatabaseLive
      */
@@ -808,8 +736,6 @@ public function testIsUniqueByManualRun()
         $this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group DatabaseLive
      */
@@ -834,8 +760,6 @@ public function testIsNotUniqueFalse()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group DatabaseLive
      */
@@ -860,8 +784,6 @@ public function testIsNotUniqueTrue()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group DatabaseLive
      */
@@ -890,8 +812,6 @@ public function testIsNotUniqueIgnoresParams()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group DatabaseLive
      */
@@ -921,8 +841,6 @@ public function testIsNotUniqueIgnoresParamsPlaceholders()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group DatabaseLive
      */
@@ -939,8 +857,6 @@ public function testIsNotUniqueByManualRun()
         $this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
     }
 
-    //--------------------------------------------------------------------
-
     public function testMinLengthNull()
     {
         $data = [
@@ -954,8 +870,6 @@ public function testMinLengthNull()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testMinLengthReturnsTrueWithSuccess()
     {
         $data = [
@@ -969,8 +883,6 @@ public function testMinLengthReturnsTrueWithSuccess()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testMinLengthReturnsTrueWithExactLength()
     {
         $data = [
@@ -984,8 +896,6 @@ public function testMinLengthReturnsTrueWithExactLength()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testMinLengthReturnsFalseWhenWrong()
     {
         $data = [
@@ -999,8 +909,6 @@ public function testMinLengthReturnsFalseWhenWrong()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testMaxLengthNull()
     {
         $data = [
@@ -1014,8 +922,6 @@ public function testMaxLengthNull()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testMaxLengthReturnsFalseWithNonNumericVal()
     {
         $data = [
@@ -1029,8 +935,6 @@ public function testMaxLengthReturnsFalseWithNonNumericVal()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testMaxLengthReturnsTrueWithSuccess()
     {
         $data = [
@@ -1044,8 +948,6 @@ public function testMaxLengthReturnsTrueWithSuccess()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testMaxLengthReturnsTrueWithExactLength()
     {
         $data = [
@@ -1059,8 +961,6 @@ public function testMaxLengthReturnsTrueWithExactLength()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testMaxLengthReturnsFalseWhenWrong()
     {
         $data = [
@@ -1074,8 +974,6 @@ public function testMaxLengthReturnsFalseWhenWrong()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testExactLengthNull()
     {
         $data = [
@@ -1089,8 +987,6 @@ public function testExactLengthNull()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testExactLengthReturnsTrueOnSuccess()
     {
         $data = [
@@ -1104,8 +1000,6 @@ public function testExactLengthReturnsTrueOnSuccess()
         $this->assertTrue($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testExactLengthDetectsBadLength()
     {
         $data = [
@@ -1119,8 +1013,6 @@ public function testExactLengthDetectsBadLength()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testExactLengthReturnsFalseWhenShort()
     {
         $data = [
@@ -1134,8 +1026,6 @@ public function testExactLengthReturnsFalseWhenShort()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testExactLengthReturnsFalseWhenLong()
     {
         $data = [
@@ -1149,8 +1039,6 @@ public function testExactLengthReturnsFalseWhenLong()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //-------------------------------------------------------------------
-
     /**
      * @dataProvider greaterThanProvider
      *
@@ -1170,8 +1058,6 @@ public function testGreaterThan($first, $second, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function greaterThanProvider()
     {
         return [
@@ -1208,8 +1094,6 @@ public function greaterThanProvider()
         ];
     }
 
-    //-------------------------------------------------------------------
-
     /**
      * @dataProvider greaterThanEqualProvider
      *
@@ -1229,8 +1113,6 @@ public function testGreaterThanEqual($first, $second, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function greaterThanEqualProvider()
     {
         return [
@@ -1272,8 +1154,6 @@ public function greaterThanEqualProvider()
         ];
     }
 
-    //-------------------------------------------------------------------
-
     /**
      * @dataProvider lessThanProvider
      *
@@ -1293,8 +1173,6 @@ public function testLessThan($first, $second, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function lessThanProvider()
     {
         return [
@@ -1336,8 +1214,6 @@ public function lessThanProvider()
         ];
     }
 
-    //-------------------------------------------------------------------
-
     /**
      * @dataProvider lessThanEqualProvider
      *
@@ -1357,8 +1233,6 @@ public function testLessEqualThan($first, $second, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function lessThanEqualProvider()
     {
         return [
@@ -1405,8 +1279,6 @@ public function lessThanEqualProvider()
         ];
     }
 
-    //-------------------------------------------------------------------
-
     /**
      * @dataProvider inListProvider
      *
@@ -1427,8 +1299,6 @@ public function testInList($first, $second, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @dataProvider inListProvider
      *
@@ -1451,8 +1321,6 @@ public function testNotInList($first, $second, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function inListProvider()
     {
         return [
@@ -1504,8 +1372,6 @@ public function inListProvider()
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @dataProvider requiredWithProvider
      *
@@ -1533,8 +1399,6 @@ public function testRequiredWith($field, $check, $expected = false)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function requiredWithProvider()
     {
         return [
@@ -1591,8 +1455,6 @@ public function requiredWithProvider()
         ];
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @dataProvider requiredWithoutProvider
      *
@@ -1620,8 +1482,6 @@ public function testRequiredWithout($field, $check, $expected = false)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function requiredWithoutProvider()
     {
         return [
@@ -1672,6 +1532,4 @@ public function requiredWithoutProvider()
             ],
         ];
     }
-
-    //--------------------------------------------------------------------
 }
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index a605df6a7c4f..2252a8bce802 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -59,8 +59,6 @@ final class ValidationTest extends CIUnitTestCase
         ],
     ];
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -73,8 +71,6 @@ protected function setUp(): void
         $_FILES = [];
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetRulesStoresRules()
     {
         $rules = [
@@ -87,8 +83,6 @@ public function testSetRulesStoresRules()
         $this->assertSame($rules, $this->validation->getRules());
     }
 
-    //--------------------------------------------------------------------
-
     public function testRunReturnsFalseWithNothingToDo()
     {
         $this->validation->setRules([]);
@@ -96,8 +90,6 @@ public function testRunReturnsFalseWithNothingToDo()
         $this->assertFalse($this->validation->run([]));
     }
 
-    //--------------------------------------------------------------------
-
     public function testRunDoesTheBasics()
     {
         $data = [
@@ -111,8 +103,6 @@ public function testRunDoesTheBasics()
         $this->assertFalse($this->validation->run($data));
     }
 
-    //--------------------------------------------------------------------
-
     public function testRunReturnsLocalizedErrors()
     {
         $data = [
@@ -127,8 +117,6 @@ public function testRunReturnsLocalizedErrors()
         $this->assertSame('Validation.is_numeric', $this->validation->getError('foo'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testRunWithCustomErrors()
     {
         $data = [
@@ -149,23 +137,17 @@ public function testRunWithCustomErrors()
         $this->assertSame('Nope. Not a number.', $this->validation->getError('foo'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testCheck()
     {
         $this->assertFalse($this->validation->check('notanumber', 'is_numeric'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testCheckLocalizedError()
     {
         $this->assertFalse($this->validation->check('notanumber', 'is_numeric'));
         $this->assertSame('Validation.is_numeric', $this->validation->getError());
     }
 
-    //--------------------------------------------------------------------
-
     public function testCheckCustomError()
     {
         $this->validation->check('notanumber', 'is_numeric', [
@@ -174,8 +156,6 @@ public function testCheckCustomError()
         $this->assertSame('Nope. Not a number.', $this->validation->getError());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetErrors()
     {
         $data = [
@@ -191,8 +171,6 @@ public function testGetErrors()
         $this->assertSame(['foo' => 'Validation.is_numeric'], $this->validation->getErrors());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetErrorsWhenNone()
     {
         $_SESSION = [];
@@ -210,8 +188,6 @@ public function testGetErrorsWhenNone()
         $this->assertSame([], $this->validation->getErrors());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetErrors()
     {
         $this->validation->setRules([
@@ -223,8 +199,6 @@ public function testSetErrors()
         $this->assertSame(['foo' => 'Nadda'], $this->validation->getErrors());
     }
 
-    //--------------------------------------------------------------------
-
     public function testRulesReturnErrors()
     {
         $this->validation->setRules([
@@ -236,8 +210,6 @@ public function testRulesReturnErrors()
         $this->assertSame(['foo' => 'My lovely error'], $this->validation->getErrors());
     }
 
-    //--------------------------------------------------------------------
-
     public function testGroupsReadFromConfig()
     {
         $data = [
@@ -248,8 +220,6 @@ public function testGroupsReadFromConfig()
         $this->assertSame('Shame, shame. Too short.', $this->validation->getError('foo'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGroupsReadFromConfigValid()
     {
         $data = [
@@ -259,8 +229,6 @@ public function testGroupsReadFromConfigValid()
         $this->assertTrue($this->validation->run($data, 'groupA'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetRuleGroup()
     {
         $this->assertSame([
@@ -268,16 +236,12 @@ public function testGetRuleGroup()
         ], $this->validation->getRuleGroup('groupA'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testGetRuleGroupException()
     {
         $this->expectException(ValidationException::class);
         $this->validation->getRuleGroup('groupZ');
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetRuleGroup()
     {
         $this->validation->setRuleGroup('groupA');
@@ -287,8 +251,6 @@ public function testSetRuleGroup()
         ], $this->validation->getRules());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetRuleGroupException()
     {
         $this->expectException(ValidationException::class);
@@ -296,8 +258,6 @@ public function testSetRuleGroupException()
         $this->validation->setRuleGroup('groupZ');
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetRuleGroupWithCustomErrorMessage()
     {
         $this->validation->reset();
@@ -311,8 +271,6 @@ public function testSetRuleGroupWithCustomErrorMessage()
         ], $this->validation->getErrors());
     }
 
-    //--------------------------------------------------------------------
-
     public function testRunGroupWithCustomErrorMessage()
     {
         $this->validation->reset();
@@ -325,8 +283,6 @@ public function testRunGroupWithCustomErrorMessage()
         ], $this->validation->getErrors());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @dataProvider rulesSetupProvider
      */
@@ -345,8 +301,6 @@ public function testRulesSetup($rules, $expected, $errors = [])
         $this->assertSame($expected, $this->validation->getError('foo'));
     }
 
-    //--------------------------------------------------------------------
-
     public function rulesSetupProvider()
     {
         return [
@@ -398,8 +352,6 @@ public function rulesSetupProvider()
         ];
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetRulesRemovesErrorsArray()
     {
         $rules = [
@@ -435,8 +387,6 @@ public function testInvalidRule()
         $this->validation->run($data);
     }
 
-    //--------------------------------------------------------------------
-
     public function testRawInput()
     {
         $rawstring = 'username=admin001&role=administrator&usepass=0';
@@ -455,8 +405,6 @@ public function testRawInput()
         $this->assertSame([], $this->validation->getErrors());
     }
 
-    //--------------------------------------------------------------------
-
     public function testJsonInput()
     {
         $data = [
@@ -487,8 +435,6 @@ public function testJsonInput()
         unset($_SERVER['CONTENT_TYPE']);
     }
 
-    //--------------------------------------------------------------------
-
     public function testHasRule()
     {
         $this->validation->setRuleGroup('groupA');
@@ -496,8 +442,6 @@ public function testHasRule()
         $this->assertTrue($this->validation->hasRule('foo'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNotARealGroup()
     {
         $this->expectException(ValidationException::class);
@@ -505,16 +449,12 @@ public function testNotARealGroup()
         $this->validation->getRuleGroup('groupX');
     }
 
-    //--------------------------------------------------------------------
-
     public function testBadTemplate()
     {
         $this->expectException(ValidationException::class);
         $this->validation->listErrors('obviouslyBadTemplate');
     }
 
-    //--------------------------------------------------------------------
-
     public function testShowNonError()
     {
         $this->validation->setRules([
@@ -526,8 +466,6 @@ public function testShowNonError()
         $this->assertSame('', $this->validation->showError('bogus'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testShowBadTemplate()
     {
         $this->expectException(ValidationException::class);
@@ -540,8 +478,6 @@ public function testShowBadTemplate()
         $this->assertSame('We should never get here', $this->validation->showError('foo', 'bogus_template'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNoRuleSetsSetup()
     {
         $this->expectException(ValidationException::class);
@@ -557,8 +493,6 @@ public function testNoRuleSetsSetup()
         $this->validation->run($data);
     }
 
-    //--------------------------------------------------------------------
-
     public function testNotCustomRuleGroup()
     {
         $this->expectException(ValidationException::class);
@@ -570,8 +504,6 @@ public function testNotCustomRuleGroup()
         $this->validation->run($data, 'GeorgeRules');
     }
 
-    //--------------------------------------------------------------------
-
     public function testNotRealCustomRule()
     {
         $this->expectException(ValidationException::class);
@@ -583,8 +515,6 @@ public function testNotRealCustomRule()
         $this->validation->run($data, 'groupX');
     }
 
-    //--------------------------------------------------------------------
-
     public function testHasError()
     {
         $data = [
@@ -600,8 +530,6 @@ public function testHasError()
         $this->assertTrue($this->validation->hasError('foo'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testSplitRulesTrue()
     {
         $data = [
@@ -653,8 +581,6 @@ public function testSplitRegex()
         $this->assertSame('regex_match[/^[0-9]{4}[\-\.\[\/][0-9]{2}[\-\.\[\/][0-9]{2}/]', $result[1]);
     }
 
-    //--------------------------------------------------------------------
-
     public function testTagReplacement()
     {
         // data
@@ -689,8 +615,6 @@ public function testTagReplacement()
         $this->assertSame($expected, $errors['Username']);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @dataProvider arrayFieldDataProvider
      */
@@ -706,8 +630,6 @@ public function testRulesForArrayField($body, $rules, $results)
         $this->assertSame($results, $this->validation->getErrors());
     }
 
-    //--------------------------------------------------------------------
-
     public function arrayFieldDataProvider()
     {
         return [
@@ -764,8 +686,6 @@ public function arrayFieldDataProvider()
         ];
     }
 
-    //--------------------------------------------------------------------
-
     public function testRulesForSingleRuleWithAsteriskWillReturnNoError()
     {
         $config          = new App();
@@ -793,8 +713,6 @@ public function testRulesForSingleRuleWithAsteriskWillReturnNoError()
         $this->assertSame([], $this->validation->getErrors());
     }
 
-    //--------------------------------------------------------------------
-
     public function testRulesForSingleRuleWithAsteriskWillReturnError()
     {
         $config          = new App();
@@ -825,8 +743,6 @@ public function testRulesForSingleRuleWithAsteriskWillReturnError()
         ], $this->validation->getErrors());
     }
 
-    //--------------------------------------------------------------------
-
     public function testRulesForSingleRuleWithSingleValue()
     {
         $config          = new App();
@@ -848,8 +764,6 @@ public function testRulesForSingleRuleWithSingleValue()
         ], $this->validation->getErrors());
     }
 
-    //--------------------------------------------------------------------
-
     public function testTranslatedLabel()
     {
         $rules = [
@@ -866,8 +780,6 @@ public function testTranslatedLabel()
         $this->assertSame('The Foo Bar Translated field must be at least 10 characters in length.', $this->validation->getError('foo'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testTranslatedLabelIsMissing()
     {
         $rules = [
@@ -884,8 +796,6 @@ public function testTranslatedLabelIsMissing()
         $this->assertSame('The Foo.bar.is.missing field must be at least 10 characters in length.', $this->validation->getError('foo'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testTranslatedLabelWithCustomErrorMessage()
     {
         $rules = [
@@ -905,8 +815,6 @@ public function testTranslatedLabelWithCustomErrorMessage()
         $this->assertSame('The Foo Bar Translated field is very short.', $this->validation->getError('foo'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testTranslatedLabelTagReplacement()
     {
         // data
diff --git a/tests/system/View/CellTest.php b/tests/system/View/CellTest.php
index 2f2879807e6f..bb0e2db1a5d6 100644
--- a/tests/system/View/CellTest.php
+++ b/tests/system/View/CellTest.php
@@ -18,8 +18,6 @@ final class CellTest extends CIUnitTestCase
      */
     protected $cell;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -28,22 +26,16 @@ protected function setUp(): void
         $this->cell  = new Cell($this->cache);
     }
 
-    //--------------------------------------------------------------------
-
     public function testPrepareParamsReturnsEmptyArrayWithInvalidParam()
     {
         $this->assertSame([], $this->cell->prepareParams(1.023));
     }
 
-    //--------------------------------------------------------------------
-
     public function testPrepareParamsReturnsNullWithEmptyString()
     {
         $this->assertSame([], $this->cell->prepareParams(''));
     }
 
-    //--------------------------------------------------------------------
-
     public function testPrepareParamsReturnsSelfWhenArray()
     {
         $object = [
@@ -54,15 +46,11 @@ public function testPrepareParamsReturnsSelfWhenArray()
         $this->assertSame($object, $this->cell->prepareParams($object));
     }
 
-    //--------------------------------------------------------------------
-
     public function testPrepareParamsReturnsEmptyArrayWithEmptyArray()
     {
         $this->assertSame([], $this->cell->prepareParams([]));
     }
 
-    //--------------------------------------------------------------------
-
     public function testPrepareParamsReturnsArrayWithString()
     {
         $params   = 'one=two three=four';
@@ -74,8 +62,6 @@ public function testPrepareParamsReturnsArrayWithString()
         $this->assertSame($expected, $this->cell->prepareParams($params));
     }
 
-    //--------------------------------------------------------------------
-
     public function testPrepareParamsHandlesCommas()
     {
         $params   = 'one=2, three=4.15';
@@ -87,8 +73,6 @@ public function testPrepareParamsHandlesCommas()
         $this->assertSame($expected, $this->cell->prepareParams($params));
     }
 
-    //--------------------------------------------------------------------
-
     public function testPrepareParamsWorksWithoutSpaces()
     {
         $params   = 'one=two,three=four';
@@ -100,8 +84,6 @@ public function testPrepareParamsWorksWithoutSpaces()
         $this->assertSame($expected, $this->cell->prepareParams($params));
     }
 
-    //--------------------------------------------------------------------
-
     public function testPrepareParamsWorksWithOddEqualsSpaces()
     {
         $params   = 'one= two,three =four, five = six';
@@ -114,10 +96,7 @@ public function testPrepareParamsWorksWithOddEqualsSpaces()
         $this->assertSame($expected, $this->cell->prepareParams($params));
     }
 
-    //--------------------------------------------------------------------
-    //--------------------------------------------------------------------
     // Render
-    //--------------------------------------------------------------------
 
     public function testDisplayRendersWithNamespacedClass()
     {
@@ -126,8 +105,6 @@ public function testDisplayRendersWithNamespacedClass()
         $this->assertSame($expected, $this->cell->render('\Tests\Support\View\SampleClass::hello'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testDisplayRendersWithValidParamString()
     {
         $params   = 'one=two,three=four';
@@ -139,8 +116,6 @@ public function testDisplayRendersWithValidParamString()
         $this->assertSame(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params));
     }
 
-    //--------------------------------------------------------------------
-
     public function testDisplayRendersWithStaticMethods()
     {
         $params   = 'one=two,three=four';
@@ -152,8 +127,6 @@ public function testDisplayRendersWithStaticMethods()
         $this->assertSame(implode(',', $expected), $this->cell->render('\Tests\Support\View\SampleClass::staticEcho', $params));
     }
 
-    //--------------------------------------------------------------------
-
     public function testOptionsEmptyArray()
     {
         $params   = [];
@@ -177,8 +150,6 @@ public function testCellEmptyParams()
         $this->assertSame($expected, $this->cell->render('\Tests\Support\View\SampleClass::index', $params));
     }
 
-    //--------------------------------------------------------------------
-
     public function testCellClassMissing()
     {
         $this->expectException(ViewException::class);
@@ -221,8 +192,6 @@ public function testCellBadMethod()
         $this->assertSame($expected, $this->cell->render('\Tests\Support\View\SampleClass::notThere', $params));
     }
 
-    //--------------------------------------------------------------------
-
     public function testRenderCached()
     {
         $params   = 'one=two,three=four';
@@ -251,8 +220,6 @@ public function testRenderCachedAutoName()
         $this->assertSame('six,five', $this->cell->render('\Tests\Support\View\SampleClass::echobox', $params, 1));
     }
 
-    //--------------------------------------------------------------------
-
     public function testParametersMatch()
     {
         $params = [
diff --git a/tests/system/View/ParserFilterTest.php b/tests/system/View/ParserFilterTest.php
index ec27517dcdf0..19b20102012b 100644
--- a/tests/system/View/ParserFilterTest.php
+++ b/tests/system/View/ParserFilterTest.php
@@ -24,8 +24,6 @@ protected function setUp(): void
         $this->config   = new View();
     }
 
-    //--------------------------------------------------------------------
-
     public function testAbs()
     {
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
@@ -41,8 +39,6 @@ public function testAbs()
         $this->assertSame('55', $parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testCapitalize()
     {
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
@@ -58,8 +54,6 @@ public function testCapitalize()
         $this->assertSame('Wonder Twins', $parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testDate()
     {
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
@@ -82,8 +76,6 @@ public function testDate()
         $this->assertSame("{$todayDash} {$todayDash} {$todayDot} {$todaySpace} {$todayColon} {$todaySlash} {$todayBackslash}", $parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testDateModify()
     {
         $parser    = new Parser($this->config, $this->viewsDir, $this->loader);
@@ -100,8 +92,6 @@ public function testDateModify()
         $this->assertSame("{$tommorrow} {$tommorrow}", $parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testDefault()
     {
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
@@ -118,8 +108,6 @@ public function testDefault()
         $this->assertSame('foo bar test', $parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testEsc()
     {
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
@@ -137,8 +125,6 @@ public function testEsc()
         $this->assertSame("{$value1} {$value2}", $parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testExcerpt()
     {
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
@@ -153,8 +139,6 @@ public function testExcerpt()
         $this->assertSame('... red fox jumped over ...', $parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testHighlight()
     {
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
@@ -202,8 +186,6 @@ public function testProse()
         $this->assertSame($expected, $parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLimitChars()
     {
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
@@ -218,8 +200,6 @@ public function testLimitChars()
         $this->assertSame('The quick&#8230;', $parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLimitWords()
     {
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
@@ -234,8 +214,6 @@ public function testLimitWords()
         $this->assertSame('The quick red fox&#8230;', $parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLower()
     {
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
@@ -250,8 +228,6 @@ public function testLower()
         $this->assertSame('something', $parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNL2BR()
     {
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
@@ -266,8 +242,6 @@ public function testNL2BR()
         $this->assertSame("first<br />\nsecond", $parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNumberFormat()
     {
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
@@ -282,8 +256,6 @@ public function testNumberFormat()
         $this->assertSame('1,098.35', $parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testRound()
     {
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
@@ -298,8 +270,6 @@ public function testRound()
         $this->assertSame('5.6 5.6 6 5 5.55', $parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testStripTags()
     {
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
@@ -314,8 +284,6 @@ public function testStripTags()
         $this->assertSame('Middle <b>Middle</b>', $parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testTitle()
     {
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
@@ -330,8 +298,6 @@ public function testTitle()
         $this->assertSame('Though She Be Little', $parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testUpper()
     {
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
@@ -346,8 +312,6 @@ public function testUpper()
         $this->assertSame('THOUGH SHE BE LITTLE', $parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testLocalNumberBase()
     {
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php
index 947e568ec349..3328bfe2d910 100644
--- a/tests/system/View/ParserTest.php
+++ b/tests/system/View/ParserTest.php
@@ -45,8 +45,6 @@ protected function setUp(): void
         $this->parser   = new Parser($this->config, $this->viewsDir, $this->loader);
     }
 
-    // --------------------------------------------------------------------
-
     public function testSetDelimiters()
     {
         // Make sure default delimiters are there
@@ -68,16 +66,12 @@ public function testSetDelimiters()
         $this->assertSame('}', $this->parser->rightDelimiter);
     }
 
-    // --------------------------------------------------------------------
-
     public function testParseSimple()
     {
         $this->parser->setVar('teststring', 'Hello World');
         $this->assertSame("<h1>Hello World</h1>\n", $this->parser->render('template1'));
     }
 
-    // --------------------------------------------------------------------
-
     public function testParseString()
     {
         $data = [
@@ -93,8 +87,6 @@ public function testParseString()
         $this->assertSame($result, $this->parser->renderString($template));
     }
 
-    // --------------------------------------------------------------------
-
     public function testParseStringMissingData()
     {
         $data = [
@@ -110,8 +102,6 @@ public function testParseStringMissingData()
         $this->assertSame($result, $this->parser->renderString($template));
     }
 
-    // --------------------------------------------------------------------
-
     public function testParseStringUnusedData()
     {
         $data = [
@@ -128,15 +118,11 @@ public function testParseStringUnusedData()
         $this->assertSame($result, $this->parser->renderString($template));
     }
 
-    // --------------------------------------------------------------------
-
     public function testParseNoTemplate()
     {
         $this->assertSame('', $this->parser->renderString(''));
     }
 
-    // --------------------------------------------------------------------
-
     public function testParseArraySingle()
     {
         $data = [
@@ -223,8 +209,6 @@ public function testParseArrayNestedObject()
         $this->assertSame('Owl and Class: stdClass work at Resource', $this->parser->renderString($template));
     }
 
-    // --------------------------------------------------------------------
-
     public function testParseLoop()
     {
         $data = [
@@ -267,8 +251,6 @@ public function testParseLoopObjectProperties()
         $this->assertSame("Super Heroes\nTom Dick Henry ", $this->parser->renderString($template));
     }
 
-    // --------------------------------------------------------------------
-
     public function testParseLoopEntityProperties()
     {
         $power             = new class() extends Entity {
@@ -336,8 +318,6 @@ public function __construct()
         $this->assertSame("Super Heroes\n bar baz first second ", $this->parser->renderString($template));
     }
 
-    // --------------------------------------------------------------------
-
     public function testMismatchedVarPair()
     {
         $data = [
@@ -422,8 +402,6 @@ public function testEscHandling($value, $expected = null)
         $this->assertSame($expected, \esc($value));
     }
 
-    //------------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/3726
      */
@@ -452,8 +430,6 @@ public function testParsePairSimilarVariableNames()
         $this->assertSame('&lt;script&gt;Heroes&lt;/script&gt; &lt;a href=&#039;test&#039;&gt;Link&lt;/a&gt; &lt;a href=&#039;test2&#039;&gt;Link second&lt;/a&gt;', $this->parser->renderString($template));
     }
 
-    //------------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/788
      */
@@ -494,8 +470,6 @@ public function testAutoEscapingNot()
         $this->assertFalse($this->parser->shouldAddEscaping('{ foo | noescape }'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testFilterWithNoArgument()
     {
         $data = [
@@ -522,8 +496,6 @@ public function testFilterWithArgument()
         $this->assertSame(date('Y-m-d', $date), $this->parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testParserEscapesDataDefaultsToHTML()
     {
         $data = [
@@ -549,8 +521,6 @@ public function testParserNoEscape()
         $this->assertSame('<script>Heroes</script>', $this->parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testIgnoresComments()
     {
         $data = [
@@ -570,8 +540,6 @@ public function testIgnoresComments()
         $this->assertSame($result, $this->parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testNoParse()
     {
         $data = [
@@ -591,8 +559,6 @@ public function testNoParse()
         $this->assertSame($result, $this->parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testIfConditionalTrue()
     {
         $data = [
@@ -643,8 +609,6 @@ public function testElseifConditionalTrue()
         $this->assertSame('Welcome', $this->parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testConditionalBadSyntax()
     {
         $this->expectException(ViewException::class);
@@ -660,16 +624,12 @@ public function testConditionalBadSyntax()
         $this->assertSame('HowdyWelcome', $this->parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testWontParsePHP()
     {
         $template = "<?php echo 'Foo' ?> - <?= 'Bar' ?>";
         $this->assertSame('&lt;?php echo \'Foo\' ?&gt; - &lt;?= \'Bar\' ?&gt;', $this->parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testParseHandlesSpaces()
     {
         $data = [
@@ -685,8 +645,6 @@ public function testParseHandlesSpaces()
         $this->assertSame($result, $this->parser->renderString($template));
     }
 
-    // --------------------------------------------------------------------
-
     public function testParseRuns()
     {
         $data = [
@@ -702,8 +660,6 @@ public function testParseRuns()
         $this->assertSame($result, $this->parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group parserplugins
      */
@@ -724,8 +680,6 @@ public function testCanAddAndRemovePlugins()
         $this->assertArrayNotHasKey('first', $setParsers);
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group parserplugins
      */
@@ -736,8 +690,6 @@ public function testParserPluginNoMatches()
         $this->assertSame('hit:it', $this->parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group parserplugins
      */
@@ -752,8 +704,6 @@ public function testParserPluginNoParams()
         $this->assertSame(' stuff Hip to the Hop ', $this->parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group parserplugins
      */
@@ -771,8 +721,6 @@ public function testParserPluginClosure()
         $this->assertSame('Hello, world', $this->parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group parserplugins
      */
@@ -796,8 +744,6 @@ public function testParserPluginParams()
         $this->assertSame(' 2 4 6 8', $this->parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @group parserplugins
      */
@@ -880,8 +826,6 @@ public function testParserSingleTagWithNamedParams()
         $this->assertSame('title: Hello world. page: 5. email: test@test.net. ', $this->parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/705
      */
@@ -951,8 +895,6 @@ public function testParseLoopWithHashInPrecession(): void
         $this->assertSame($expected, $this->parser->renderString($template));
     }
 
-    //--------------------------------------------------------------------
-
     public function testCachedRender()
     {
         $this->parser->setVar('teststring', 'Hello World');
@@ -963,8 +905,6 @@ public function testCachedRender()
         $this->assertSame($expected, $this->parser->render('template1', ['cache' => 10, 'cache_name' => 'HelloWorld']));
     }
 
-    //--------------------------------------------------------------------
-
     public function testRenderFindsView()
     {
         $this->parser->setData(['testString' => 'Hello World']);
@@ -980,8 +920,6 @@ public function testRenderCannotFindView()
         $this->parser->render('Simplest');
     }
 
-    //--------------------------------------------------------------------
-
     public function testRenderSavingData()
     {
         $expected = "<h1>Hello World</h1>\n";
diff --git a/tests/system/View/TableTest.php b/tests/system/View/TableTest.php
index 0c49ea01488d..efb0e31ad00b 100644
--- a/tests/system/View/TableTest.php
+++ b/tests/system/View/TableTest.php
@@ -18,7 +18,6 @@ protected function setUp(): void
     }
 
     // Setter Methods
-    // --------------------------------------------------------------------
 
     public function testSetTemplate()
     {
@@ -108,7 +107,6 @@ public function testAddRow()
     }
 
     // Uility Methods
-    // --------------------------------------------------------------------
 
     public function testPrepArgs()
     {
@@ -399,8 +397,6 @@ public function testGenerateEmptyCell()
         $this->assertStringContainsString('<td>Huh?</td>', $table);
     }
 
-    // --------------------------------------------------------------------
-
     public function testWithConfig()
     {
         $customSettings = [
@@ -467,8 +463,6 @@ public function testUndefined()
         $this->assertSame('Undefined table data', $table);
     }
 
-    // --------------------------------------------------------------------
-
     public function testCallback()
     {
         $this->table->setHeading('Name', 'Color', 'Size');
diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php
index 5be61ecbc798..7f8b0e24cbb7 100644
--- a/tests/system/View/ViewTest.php
+++ b/tests/system/View/ViewTest.php
@@ -17,8 +17,6 @@ final class ViewTest extends CIUnitTestCase
     protected $viewsDir;
     protected $config;
 
-    //--------------------------------------------------------------------
-
     protected function setUp(): void
     {
         parent::setUp();
@@ -28,8 +26,6 @@ protected function setUp(): void
         $this->config   = new Config\View();
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetVarStoresData()
     {
         $view = new View($this->config, $this->viewsDir, $this->loader);
@@ -49,8 +45,6 @@ public function testSetVarOverwrites()
         $this->assertSame(['foo' => 'baz'], $view->getData());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetDataStoresValue()
     {
         $view = new View($this->config, $this->viewsDir, $this->loader);
@@ -102,8 +96,6 @@ public function testSetDataOverwritesData()
         $this->assertSame($expected, $view->getData());
     }
 
-    //--------------------------------------------------------------------
-
     public function testSetVarWillEscape()
     {
         $view = new View($this->config, $this->viewsDir, $this->loader);
@@ -130,8 +122,6 @@ public function testSetDataWillEscapeAll()
         $this->assertSame($expected, $view->getData());
     }
 
-    //--------------------------------------------------------------------
-
     public function testRenderFindsView()
     {
         $view = new View($this->config, $this->viewsDir, $this->loader);
@@ -142,8 +132,6 @@ public function testRenderFindsView()
         $this->assertStringContainsString($expected, $view->render('simple'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testRenderString()
     {
         $view = new View($this->config, $this->viewsDir, $this->loader);
@@ -160,8 +148,6 @@ public function testRenderStringNullTempdata()
         $this->assertSame('test string', $view->renderString('test string'));
     }
 
-    //--------------------------------------------------------------------
-
     public function testRendersThrowsExceptionIfFileNotFound()
     {
         $view = new View($this->config, $this->viewsDir, $this->loader);
@@ -172,8 +158,6 @@ public function testRendersThrowsExceptionIfFileNotFound()
         $view->render('missing');
     }
 
-    //--------------------------------------------------------------------
-
     public function testRenderScrapsData()
     {
         $view = new View($this->config, $this->viewsDir, $this->loader);
@@ -184,8 +168,6 @@ public function testRenderScrapsData()
         $this->assertEmpty($view->getData());
     }
 
-    //--------------------------------------------------------------------
-
     public function testRenderCanSaveData()
     {
         $view = new View($this->config, $this->viewsDir, $this->loader);
@@ -212,8 +194,6 @@ public function testRenderCanSaveDataThroughConfigSetting()
         $this->assertSame($expected, $view->getData());
     }
 
-    //--------------------------------------------------------------------
-
     public function testCanDeleteData()
     {
         $view = new View($this->config, $this->viewsDir, $this->loader);
@@ -226,8 +206,6 @@ public function testCanDeleteData()
         $this->assertSame([], $view->getData());
     }
 
-    //--------------------------------------------------------------------
-
     public function testCachedRender()
     {
         $view = new View($this->config, $this->viewsDir, $this->loader);
@@ -240,8 +218,6 @@ public function testCachedRender()
         $this->assertStringContainsString($expected, $view->render('simple', ['cache' => 10]));
     }
 
-    //--------------------------------------------------------------------
-
     public function testRenderStringSavingData()
     {
         $view     = new View($this->config, $this->viewsDir, $this->loader);
@@ -257,8 +233,6 @@ public function testRenderStringSavingData()
         $this->assertArrayHasKey('testString', $view->getData());
     }
 
-    //--------------------------------------------------------------------
-
     public function testPerformanceLogging()
     {
         // Make sure debugging is on for our view
diff --git a/user_guide_src/source/general/logging.rst b/user_guide_src/source/general/logging.rst
index 19921b648b17..32953792a136 100644
--- a/user_guide_src/source/general/logging.rst
+++ b/user_guide_src/source/general/logging.rst
@@ -80,13 +80,8 @@ Each handler's section will have one property in common: ``handles``, which is a
 ::
 
     public $handlers = [
-
-        //--------------------------------------------------------------------
         // File Handler
-        //--------------------------------------------------------------------
-
         'CodeIgniter\Log\Handlers\FileHandler' => [
-
             'handles' => ['critical', 'alert', 'emergency', 'debug', 'error', 'info', 'notice', 'warning'],
         ]
     ];
diff --git a/user_guide_src/source/libraries/throttler.rst b/user_guide_src/source/libraries/throttler.rst
index 9513d266ea16..cdefb935ba1d 100644
--- a/user_guide_src/source/libraries/throttler.rst
+++ b/user_guide_src/source/libraries/throttler.rst
@@ -49,8 +49,8 @@ start using it in your application.
 The Code
 ========
 
-You could make your own Throttler filter, at **app/Filters/Throttle.php**, 
-along the lines of:: 
+You could make your own Throttler filter, at **app/Filters/Throttle.php**,
+along the lines of::
 
     <?php
 
@@ -85,8 +85,6 @@ along the lines of::
             }
         }
 
-        //--------------------------------------------------------------------
-
         /**
          * We don't have anything to do here.
          *
@@ -162,4 +160,4 @@ Class Reference
     :rtype: self
 
     Removes & resets the bucket.
-    Won't fail if the bucket doesn't exist.
\ No newline at end of file
+    Won't fail if the bucket doesn't exist.

From c18b692fe6be9f7f283a4ef987d8fa8051140b68 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Mon, 19 Jul 2021 21:21:30 +0800
Subject: [PATCH 0091/2325] Split config files into which has headers or not

---
 .no-header.php-cs-fixer.dist.php  | 26 ++++++++++++++++++++++++++
 .php-cs-fixer.dist.php            | 11 ++++++-----
 utils/PhpCsFixer/CodeIgniter4.php |  4 ++--
 3 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 .no-header.php-cs-fixer.dist.php

diff --git a/.no-header.php-cs-fixer.dist.php b/.no-header.php-cs-fixer.dist.php
new file mode 100644
index 000000000000..8220fe3d6091
--- /dev/null
+++ b/.no-header.php-cs-fixer.dist.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+use Nexus\CsConfig\Factory;
+use PhpCsFixer\Finder;
+use Utils\PhpCsFixer\CodeIgniter4;
+
+$finder = Finder::create()
+    ->files()
+    ->in([
+        __DIR__ . '/admin',
+        __DIR__ . '/app',
+        __DIR__ . '/public',
+    ]);
+
+$overrides = [
+	'no_blank_lines_after_phpdoc' => false,
+];
+
+$options = [
+    'cacheFile' => 'build/.no-header.php-cs-fixer.cache',
+    'finder'    => $finder,
+];
+
+return Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects();
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 7e02b76a134e..1cd558071c3e 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -9,9 +9,6 @@
 $finder = Finder::create()
     ->files()
     ->in([
-        __DIR__ . '/admin', // @todo relocate when `header_comment` is enabled
-        __DIR__ . '/app', // @todo relocate when `header_comment` is enabled
-        __DIR__ . '/public', // @todo relocate when `header_comment` is enabled
         __DIR__ . '/system',
         __DIR__ . '/tests',
         __DIR__ . '/utils',
@@ -20,6 +17,7 @@
     ->notName('#Foobar.php$#')
     ->append([
         __FILE__,
+        __DIR__ . '/.no-header.php-cs-fixer.dist.php',
         __DIR__ . '/rector.php',
         __DIR__ . '/spark',
     ]);
@@ -31,5 +29,8 @@
     'finder'    => $finder,
 ];
 
-// @todo change to `forLibrary()` when `header_comment` is enabled
-return Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects();
+return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
+    'CodeIgniter 4 framework',
+    'CodeIgniter Foundation',
+    'admin@codeigniter.com'
+);
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 209c513c4dcf..3f8cfeba35d2 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -20,7 +20,7 @@ public function __construct()
         $this->rules = [
             'align_multiline_comment' => ['comment_type' => 'phpdocs_only'],
             'array_indentation'       => true,
-            'array_push'              => true, // risky
+            'array_push'              => true,
             'array_syntax'            => ['syntax' => 'short'],
             'backtick_to_shell_exec'  => true,
             'binary_operator_spaces'  => [
@@ -196,7 +196,7 @@ public function __construct()
             'no_alternative_syntax'                       => false,
             'no_binary_string'                            => true,
             'no_blank_lines_after_class_opening'          => true,
-            'no_blank_lines_after_phpdoc'                 => false, // @todo enable fully when `header_comment` is required
+            'no_blank_lines_after_phpdoc'                 => true,
             'no_blank_lines_before_namespace'             => false, // conflicts with `single_blank_line_before_namespace`
             'no_break_comment'                            => ['comment_text' => 'no break'],
             'no_closing_tag'                              => true,

From 0ee2b2f9221c04dbdb56e62ed9cf599b20667011 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Mon, 19 Jul 2021 21:32:33 +0800
Subject: [PATCH 0092/2325] Add file-level headers

---
 .no-header.php-cs-fixer.dist.php              | 11 ++++++++++-
 .php-cs-fixer.dist.php                        |  9 +++++++++
 rector.php                                    |  9 +++++++++
 system/API/ResponseTrait.php                  |  6 +++---
 system/Autoloader/Autoloader.php              |  6 +++---
 system/Autoloader/FileLocator.php             |  6 +++---
 system/BaseModel.php                          |  6 +++---
 system/CLI/BaseCommand.php                    |  6 +++---
 system/CLI/CLI.php                            |  6 +++---
 system/CLI/CommandRunner.php                  |  6 +++---
 system/CLI/Commands.php                       |  6 +++---
 system/CLI/Console.php                        |  6 +++---
 system/CLI/Exceptions/CLIException.php        |  6 +++---
 system/CLI/GeneratorTrait.php                 |  6 +++---
 system/Cache/CacheFactory.php                 |  6 +++---
 system/Cache/CacheInterface.php               |  6 +++---
 system/Cache/Exceptions/CacheException.php    |  6 +++---
 .../Cache/Exceptions/ExceptionInterface.php   |  6 +++---
 system/Cache/Handlers/BaseHandler.php         |  6 +++---
 system/Cache/Handlers/DummyHandler.php        |  6 +++---
 system/Cache/Handlers/FileHandler.php         |  6 +++---
 system/Cache/Handlers/MemcachedHandler.php    |  6 +++---
 system/Cache/Handlers/PredisHandler.php       |  6 +++---
 system/Cache/Handlers/RedisHandler.php        |  6 +++---
 system/Cache/Handlers/WincacheHandler.php     |  6 +++---
 system/CodeIgniter.php                        |  6 +++---
 system/Commands/Cache/ClearCache.php          |  6 +++---
 system/Commands/Cache/InfoCache.php           |  6 +++---
 system/Commands/Database/CreateDatabase.php   |  6 +++---
 system/Commands/Database/Migrate.php          |  6 +++---
 system/Commands/Database/MigrateRefresh.php   |  6 +++---
 system/Commands/Database/MigrateRollback.php  |  6 +++---
 system/Commands/Database/MigrateStatus.php    |  6 +++---
 system/Commands/Database/Seed.php             |  6 +++---
 system/Commands/Encryption/GenerateKey.php    |  6 +++---
 .../Commands/Generators/CommandGenerator.php  |  6 +++---
 .../Commands/Generators/ConfigGenerator.php   |  6 +++---
 .../Generators/ControllerGenerator.php        |  6 +++---
 .../Commands/Generators/EntityGenerator.php   |  6 +++---
 .../Commands/Generators/FilterGenerator.php   |  6 +++---
 system/Commands/Generators/MigrateCreate.php  |  6 +++---
 .../Generators/MigrationGenerator.php         |  6 +++---
 system/Commands/Generators/ModelGenerator.php |  6 +++---
 .../Commands/Generators/ScaffoldGenerator.php |  6 +++---
 .../Commands/Generators/SeederGenerator.php   |  6 +++---
 .../Generators/SessionMigrationGenerator.php  |  6 +++---
 .../Generators/ValidationGenerator.php        |  6 +++---
 system/Commands/Help.php                      |  6 +++---
 .../Commands/Housekeeping/ClearDebugbar.php   |  6 +++---
 system/Commands/Housekeeping/ClearLogs.php    |  6 +++---
 system/Commands/ListCommands.php              |  6 +++---
 system/Commands/Server/Serve.php              |  6 +++---
 system/Commands/Server/rewrite.php            |  6 +++---
 system/Commands/Utilities/Environment.php     |  9 +++++++++
 system/Commands/Utilities/Namespaces.php      |  6 +++---
 system/Commands/Utilities/Routes.php          |  6 +++---
 system/Common.php                             |  6 +++---
 system/ComposerScripts.php                    |  6 +++---
 system/Config/AutoloadConfig.php              |  6 +++---
 system/Config/BaseConfig.php                  |  6 +++---
 system/Config/BaseService.php                 |  6 +++---
 system/Config/Config.php                      |  6 +++---
 system/Config/DotEnv.php                      |  6 +++---
 system/Config/Factories.php                   |  6 +++---
 system/Config/Factory.php                     |  6 +++---
 system/Config/ForeignCharacters.php           |  6 +++---
 system/Config/Routes.php                      |  6 +++---
 system/Config/Services.php                    |  6 +++---
 system/Config/View.php                        |  6 +++---
 system/Controller.php                         |  6 +++---
 system/Cookie/CloneableCookieInterface.php    |  6 +++---
 system/Cookie/Cookie.php                      |  6 +++---
 system/Cookie/CookieInterface.php             |  6 +++---
 system/Cookie/CookieStore.php                 |  6 +++---
 system/Cookie/Exceptions/CookieException.php  |  6 +++---
 system/Database/BaseBuilder.php               |  6 +++---
 system/Database/BaseConnection.php            |  6 +++---
 system/Database/BasePreparedQuery.php         |  6 +++---
 system/Database/BaseResult.php                |  6 +++---
 system/Database/BaseUtils.php                 |  6 +++---
 system/Database/Config.php                    |  6 +++---
 system/Database/ConnectionInterface.php       |  6 +++---
 system/Database/Database.php                  |  6 +++---
 system/Database/Exceptions/DataException.php  |  6 +++---
 .../Database/Exceptions/DatabaseException.php |  6 +++---
 .../Exceptions/ExceptionInterface.php         |  6 +++---
 system/Database/Forge.php                     |  6 +++---
 system/Database/Migration.php                 |  6 +++---
 system/Database/MigrationRunner.php           |  6 +++---
 system/Database/ModelFactory.php              |  6 +++---
 system/Database/MySQLi/Builder.php            |  6 +++---
 system/Database/MySQLi/Connection.php         |  6 +++---
 system/Database/MySQLi/Forge.php              |  6 +++---
 system/Database/MySQLi/PreparedQuery.php      |  6 +++---
 system/Database/MySQLi/Result.php             |  6 +++---
 system/Database/MySQLi/Utils.php              |  6 +++---
 system/Database/Postgre/Builder.php           |  6 +++---
 system/Database/Postgre/Connection.php        |  6 +++---
 system/Database/Postgre/Forge.php             |  6 +++---
 system/Database/Postgre/PreparedQuery.php     |  6 +++---
 system/Database/Postgre/Result.php            |  6 +++---
 system/Database/Postgre/Utils.php             |  6 +++---
 system/Database/PreparedQueryInterface.php    |  6 +++---
 system/Database/Query.php                     |  6 +++---
 system/Database/QueryInterface.php            |  6 +++---
 system/Database/ResultInterface.php           |  6 +++---
 system/Database/SQLSRV/Builder.php            |  6 +++---
 system/Database/SQLSRV/Connection.php         |  6 +++---
 system/Database/SQLSRV/Forge.php              |  6 +++---
 system/Database/SQLSRV/PreparedQuery.php      |  6 +++---
 system/Database/SQLSRV/Result.php             |  6 +++---
 system/Database/SQLSRV/Utils.php              |  6 +++---
 system/Database/SQLite3/Builder.php           |  6 +++---
 system/Database/SQLite3/Connection.php        |  6 +++---
 system/Database/SQLite3/Forge.php             |  6 +++---
 system/Database/SQLite3/PreparedQuery.php     |  6 +++---
 system/Database/SQLite3/Result.php            |  6 +++---
 system/Database/SQLite3/Table.php             |  6 +++---
 system/Database/SQLite3/Utils.php             |  6 +++---
 system/Database/Seeder.php                    |  6 +++---
 system/Debug/Exceptions.php                   |  6 +++---
 system/Debug/Iterator.php                     |  6 +++---
 system/Debug/Timer.php                        |  6 +++---
 system/Debug/Toolbar.php                      |  7 +++----
 .../Toolbar/Collectors/BaseCollector.php      |  6 +++---
 system/Debug/Toolbar/Collectors/Config.php    |  6 +++---
 system/Debug/Toolbar/Collectors/Database.php  |  6 +++---
 system/Debug/Toolbar/Collectors/Events.php    |  6 +++---
 system/Debug/Toolbar/Collectors/Files.php     |  6 +++---
 system/Debug/Toolbar/Collectors/History.php   |  6 +++---
 system/Debug/Toolbar/Collectors/Logs.php      |  6 +++---
 system/Debug/Toolbar/Collectors/Routes.php    |  6 +++---
 system/Debug/Toolbar/Collectors/Timers.php    |  6 +++---
 system/Debug/Toolbar/Collectors/Views.php     |  6 +++---
 system/Debug/Toolbar/Views/toolbar.tpl.php    |  1 -
 system/Email/Email.php                        |  6 +++---
 system/Encryption/EncrypterInterface.php      |  6 +++---
 system/Encryption/Encryption.php              |  6 +++---
 .../Exceptions/EncryptionException.php        |  6 +++---
 system/Encryption/Handlers/BaseHandler.php    |  6 +++---
 system/Encryption/Handlers/OpenSSLHandler.php |  6 +++---
 system/Encryption/Handlers/SodiumHandler.php  |  6 +++---
 system/Entity.php                             |  6 +++---
 system/Entity/Cast/ArrayCast.php              |  6 +++---
 system/Entity/Cast/BaseCast.php               |  6 +++---
 system/Entity/Cast/BooleanCast.php            |  6 +++---
 system/Entity/Cast/CSVCast.php                |  6 +++---
 system/Entity/Cast/CastInterface.php          |  6 +++---
 system/Entity/Cast/DatetimeCast.php           |  6 +++---
 system/Entity/Cast/FloatCast.php              |  6 +++---
 system/Entity/Cast/IntegerCast.php            |  6 +++---
 system/Entity/Cast/JsonCast.php               |  6 +++---
 system/Entity/Cast/ObjectCast.php             |  6 +++---
 system/Entity/Cast/StringCast.php             |  6 +++---
 system/Entity/Cast/TimestampCast.php          |  6 +++---
 system/Entity/Cast/URICast.php                |  6 +++---
 system/Entity/Entity.php                      |  6 +++---
 system/Entity/Exceptions/CastException.php    |  6 +++---
 system/Events/Events.php                      |  6 +++---
 system/Exceptions/AlertError.php              |  6 +++---
 system/Exceptions/CastException.php           |  6 +++---
 system/Exceptions/ConfigException.php         |  6 +++---
 system/Exceptions/CriticalError.php           |  6 +++---
 system/Exceptions/DebugTraceableTrait.php     |  9 +++++++++
 system/Exceptions/DownloadException.php       |  6 +++---
 system/Exceptions/EmergencyError.php          |  6 +++---
 system/Exceptions/ExceptionInterface.php      |  7 +++----
 system/Exceptions/FrameworkException.php      |  6 +++---
 system/Exceptions/ModelException.php          |  7 +++----
 system/Exceptions/PageNotFoundException.php   |  6 +++---
 system/Files/Exceptions/FileException.php     |  6 +++---
 .../Exceptions/FileNotFoundException.php      |  6 +++---
 system/Files/File.php                         |  6 +++---
 system/Filters/CSRF.php                       |  6 +++---
 system/Filters/DebugToolbar.php               |  6 +++---
 system/Filters/Exceptions/FilterException.php |  6 +++---
 system/Filters/FilterInterface.php            |  6 +++---
 system/Filters/Filters.php                    |  6 +++---
 system/Filters/Honeypot.php                   |  6 +++---
 system/Format/Exceptions/FormatException.php  |  6 +++---
 system/Format/Format.php                      |  6 +++---
 system/Format/FormatterInterface.php          |  6 +++---
 system/Format/JSONFormatter.php               |  6 +++---
 system/Format/XMLFormatter.php                |  6 +++---
 system/HTTP/CLIRequest.php                    |  6 +++---
 system/HTTP/CURLRequest.php                   |  6 +++---
 system/HTTP/ContentSecurityPolicy.php         |  6 +++---
 system/HTTP/DownloadResponse.php              |  6 +++---
 system/HTTP/Exceptions/HTTPException.php      |  6 +++---
 system/HTTP/Files/FileCollection.php          |  6 +++---
 system/HTTP/Files/UploadedFile.php            |  6 +++---
 system/HTTP/Files/UploadedFileInterface.php   |  6 +++---
 system/HTTP/Header.php                        |  6 +++---
 system/HTTP/IncomingRequest.php               |  6 +++---
 system/HTTP/Message.php                       |  6 +++---
 system/HTTP/MessageInterface.php              |  6 +++---
 system/HTTP/MessageTrait.php                  |  6 +++---
 system/HTTP/Negotiate.php                     |  6 +++---
 system/HTTP/RedirectResponse.php              |  6 +++---
 system/HTTP/Request.php                       |  6 +++---
 system/HTTP/RequestInterface.php              |  6 +++---
 system/HTTP/RequestTrait.php                  |  6 +++---
 system/HTTP/Response.php                      |  6 +++---
 system/HTTP/ResponseInterface.php             |  6 +++---
 system/HTTP/ResponseTrait.php                 |  6 +++---
 system/HTTP/URI.php                           |  6 +++---
 system/HTTP/UserAgent.php                     |  6 +++---
 system/Helpers/array_helper.php               |  6 +++---
 system/Helpers/cookie_helper.php              |  6 +++---
 system/Helpers/date_helper.php                |  6 +++---
 system/Helpers/filesystem_helper.php          |  6 +++---
 system/Helpers/form_helper.php                |  6 +++---
 system/Helpers/html_helper.php                |  6 +++---
 system/Helpers/inflector_helper.php           |  6 +++---
 system/Helpers/number_helper.php              |  6 +++---
 system/Helpers/security_helper.php            |  6 +++---
 system/Helpers/test_helper.php                |  6 +++---
 system/Helpers/text_helper.php                |  6 +++---
 system/Helpers/url_helper.php                 |  6 +++---
 system/Helpers/xml_helper.php                 |  6 +++---
 .../Honeypot/Exceptions/HoneypotException.php |  6 +++---
 system/Honeypot/Honeypot.php                  |  6 +++---
 system/I18n/Exceptions/I18nException.php      |  6 +++---
 system/I18n/Time.php                          |  6 +++---
 system/I18n/TimeDifference.php                |  6 +++---
 system/Images/Exceptions/ImageException.php   |  6 +++---
 system/Images/Handlers/BaseHandler.php        |  6 +++---
 system/Images/Handlers/GDHandler.php          |  6 +++---
 system/Images/Handlers/ImageMagickHandler.php |  6 +++---
 system/Images/Image.php                       |  6 +++---
 system/Images/ImageHandlerInterface.php       |  6 +++---
 system/Language/Language.php                  |  6 +++---
 system/Language/en/CLI.php                    |  6 +++---
 system/Language/en/Cache.php                  |  6 +++---
 system/Language/en/Cast.php                   |  6 +++---
 system/Language/en/Cookie.php                 |  6 +++---
 system/Language/en/Core.php                   |  6 +++---
 system/Language/en/Database.php               |  6 +++---
 system/Language/en/Email.php                  |  6 +++---
 system/Language/en/Encryption.php             |  6 +++---
 system/Language/en/Fabricator.php             |  6 +++---
 system/Language/en/Files.php                  |  6 +++---
 system/Language/en/Filters.php                |  6 +++---
 system/Language/en/Format.php                 |  6 +++---
 system/Language/en/HTTP.php                   |  6 +++---
 system/Language/en/Images.php                 |  6 +++---
 system/Language/en/Log.php                    |  6 +++---
 system/Language/en/Migrations.php             |  6 +++---
 system/Language/en/Number.php                 |  6 +++---
 system/Language/en/Pager.php                  |  6 +++---
 system/Language/en/RESTful.php                |  6 +++---
 system/Language/en/Router.php                 |  6 +++---
 system/Language/en/Security.php               |  6 +++---
 system/Language/en/Session.php                |  6 +++---
 system/Language/en/Time.php                   |  6 +++---
 system/Language/en/Validation.php             |  6 +++---
 system/Language/en/View.php                   |  6 +++---
 system/Log/Exceptions/LogException.php        |  6 +++---
 system/Log/Handlers/BaseHandler.php           |  6 +++---
 system/Log/Handlers/ChromeLoggerHandler.php   |  6 +++---
 system/Log/Handlers/ErrorlogHandler.php       |  6 +++---
 system/Log/Handlers/FileHandler.php           |  6 +++---
 system/Log/Handlers/HandlerInterface.php      |  6 +++---
 system/Log/Logger.php                         |  6 +++---
 system/Model.php                              |  6 +++---
 system/Modules/Modules.php                    |  6 +++---
 system/Pager/Exceptions/PagerException.php    |  6 +++---
 system/Pager/Pager.php                        |  6 +++---
 system/Pager/PagerInterface.php               |  6 +++---
 system/Pager/PagerRenderer.php                |  6 +++---
 system/Pager/Views/default_head.php           |  6 +++---
 system/RESTful/BaseResource.php               |  6 +++---
 system/RESTful/ResourceController.php         |  6 +++---
 system/RESTful/ResourcePresenter.php          |  6 +++---
 .../Router/Exceptions/RedirectException.php   |  6 +++---
 system/Router/Exceptions/RouterException.php  |  6 +++---
 system/Router/RouteCollection.php             |  6 +++---
 system/Router/RouteCollectionInterface.php    |  6 +++---
 system/Router/Router.php                      |  6 +++---
 system/Router/RouterInterface.php             |  6 +++---
 .../Security/Exceptions/SecurityException.php |  6 +++---
 system/Security/Security.php                  |  6 +++---
 system/Security/SecurityInterface.php         |  6 +++---
 .../Session/Exceptions/SessionException.php   |  6 +++---
 system/Session/Handlers/ArrayHandler.php      |  6 +++---
 system/Session/Handlers/BaseHandler.php       |  6 +++---
 system/Session/Handlers/DatabaseHandler.php   |  6 +++---
 system/Session/Handlers/FileHandler.php       |  6 +++---
 system/Session/Handlers/MemcachedHandler.php  |  6 +++---
 system/Session/Handlers/RedisHandler.php      |  6 +++---
 system/Session/Session.php                    |  6 +++---
 system/Session/SessionInterface.php           |  6 +++---
 system/Test/CIDatabaseTestCase.php            |  6 +++---
 system/Test/CIUnitTestCase.php                |  6 +++---
 system/Test/Constraints/SeeInDatabase.php     |  9 +++++++++
 system/Test/ControllerResponse.php            |  6 +++---
 system/Test/ControllerTestTrait.php           |  6 +++---
 system/Test/ControllerTester.php              |  6 +++---
 system/Test/DOMParser.php                     |  6 +++---
 system/Test/DatabaseTestTrait.php             |  6 +++---
 system/Test/Fabricator.php                    |  6 +++---
 system/Test/FeatureResponse.php               |  6 +++---
 system/Test/FeatureTestCase.php               |  6 +++---
 system/Test/FeatureTestTrait.php              |  6 +++---
 system/Test/FilterTestTrait.php               |  6 +++---
 system/Test/Filters/CITestStreamFilter.php    |  6 +++---
 system/Test/Interfaces/FabricatorModel.php    |  6 +++---
 system/Test/Mock/MockAppConfig.php            |  6 +++---
 system/Test/Mock/MockAutoload.php             |  6 +++---
 system/Test/Mock/MockBuilder.php              |  6 +++---
 system/Test/Mock/MockCLIConfig.php            |  6 +++---
 system/Test/Mock/MockCURLRequest.php          |  6 +++---
 system/Test/Mock/MockCache.php                |  6 +++---
 system/Test/Mock/MockCodeIgniter.php          |  6 +++---
 system/Test/Mock/MockCommon.php               |  6 +++---
 system/Test/Mock/MockConnection.php           |  6 +++---
 system/Test/Mock/MockEmail.php                |  6 +++---
 system/Test/Mock/MockEvents.php               |  6 +++---
 system/Test/Mock/MockFileLogger.php           |  6 +++---
 system/Test/Mock/MockIncomingRequest.php      |  6 +++---
 system/Test/Mock/MockLanguage.php             |  6 +++---
 system/Test/Mock/MockLogger.php               |  6 +++---
 system/Test/Mock/MockQuery.php                |  6 +++---
 system/Test/Mock/MockResourceController.php   |  6 +++---
 system/Test/Mock/MockResourcePresenter.php    |  6 +++---
 system/Test/Mock/MockResponse.php             |  6 +++---
 system/Test/Mock/MockResult.php               |  6 +++---
 system/Test/Mock/MockSecurity.php             |  6 +++---
 system/Test/Mock/MockSecurityConfig.php       |  9 +++++++++
 system/Test/Mock/MockServices.php             |  6 +++---
 system/Test/Mock/MockSession.php              |  6 +++---
 system/Test/Mock/MockTable.php                |  6 +++---
 system/Test/ReflectionHelper.php              |  6 +++---
 system/Test/TestLogger.php                    |  6 +++---
 system/Test/TestResponse.php                  |  6 +++---
 system/Test/bootstrap.php                     |  6 +++---
 system/Throttle/Throttler.php                 |  6 +++---
 system/Throttle/ThrottlerInterface.php        |  6 +++---
 system/Typography/Typography.php              |  6 +++---
 system/Validation/CreditCardRules.php         |  6 +++---
 .../Exceptions/ValidationException.php        |  6 +++---
 system/Validation/FileRules.php               |  6 +++---
 system/Validation/FormatRules.php             |  6 +++---
 system/Validation/Rules.php                   |  6 +++---
 system/Validation/Validation.php              |  6 +++---
 system/Validation/ValidationInterface.php     |  6 +++---
 system/View/Cell.php                          |  6 +++---
 system/View/Exceptions/ViewException.php      |  6 +++---
 system/View/Filters.php                       |  6 +++---
 system/View/Parser.php                        |  6 +++---
 system/View/Plugins.php                       |  6 +++---
 system/View/RendererInterface.php             |  6 +++---
 system/View/Table.php                         |  6 +++---
 system/View/View.php                          |  6 +++---
 system/bootstrap.php                          |  6 +++---
 tests/_support/Autoloader/FatalLocator.php    |  9 +++++++++
 .../_support/Autoloader/UnnamespacedClass.php |  9 +++++++++
 tests/_support/Autoloader/functions.php       |  9 +++++++++
 tests/_support/Cache/RestrictiveHandler.php   |  6 +++---
 tests/_support/Commands/AbstractInfo.php      |  9 +++++++++
 tests/_support/Commands/AppInfo.php           |  9 +++++++++
 tests/_support/Commands/InvalidCommand.php    |  9 +++++++++
 tests/_support/Commands/LanguageCommand.php   |  9 +++++++++
 tests/_support/Commands/ParamsReveal.php      |  9 +++++++++
 tests/_support/Commands/Unsuffixable.php      |  9 +++++++++
 tests/_support/Config/BadRegistrar.php        |  9 +++++++++
 tests/_support/Config/Filters.php             |  9 +++++++++
 tests/_support/Config/Registrar.php           |  9 +++++++++
 tests/_support/Config/Routes.php              |  9 +++++++++
 tests/_support/Config/Services.php            |  9 +++++++++
 tests/_support/Config/TestRegistrar.php       |  9 +++++++++
 tests/_support/Controllers/Hello.php          |  9 +++++++++
 tests/_support/Controllers/Popcorn.php        |  9 +++++++++
 .../20160428212500_Create_test_tables.php     |  9 +++++++++
 .../_support/Database/Seeds/AnotherSeeder.php |  9 +++++++++
 .../_support/Database/Seeds/CITestSeeder.php  |  9 +++++++++
 tests/_support/Entity/Cast/CastBase64.php     |  9 +++++++++
 .../Entity/Cast/CastPassParameters.php        |  9 +++++++++
 .../Entity/Cast/NotExtendsBaseCast.php        |  9 +++++++++
 tests/_support/Files/able/apple.php           | 12 ++++++++----
 tests/_support/Files/able/fig_3.php           | 12 ++++++++----
 tests/_support/Files/able/prune_ripe.php      | 12 ++++++++----
 tests/_support/Files/baker/banana.php         | 12 ++++++++----
 tests/_support/Filters/Customfilter.php       |  9 +++++++++
 tests/_support/Helpers/baguette_helper.php    |  9 ++++++++-
 .../_support/Language/SecondMockLanguage.php  |  9 +++++++++
 tests/_support/Language/ab-CD/Allin.php       | 10 +++++++++-
 tests/_support/Language/ab/Allin.php          | 10 +++++++++-
 tests/_support/Language/en-ZZ/More.php        |  9 +++++++++
 tests/_support/Language/en/Allin.php          | 10 +++++++++-
 tests/_support/Language/en/Core.php           | 10 +++++++++-
 tests/_support/Language/en/Foo.php            |  9 +++++++++
 tests/_support/Language/en/Language.php       |  6 +++---
 tests/_support/Language/en/More.php           |  9 +++++++++
 tests/_support/Language/en/Nested.php         |  9 +++++++++
 tests/_support/Language/ru/Language.php       |  9 +++++++++
 tests/_support/Log/Handlers/TestHandler.php   |  9 +++++++++
 .../2018-01-24-102301_Some_migration.php      |  9 +++++++++
 .../2018-01-24-102302_Another_migration.php   |  9 +++++++++
 tests/_support/Models/EntityModel.php         |  9 +++++++++
 tests/_support/Models/EventModel.php          |  9 +++++++++
 tests/_support/Models/FabricatorModel.php     |  9 +++++++++
 tests/_support/Models/JobModel.php            |  9 +++++++++
 tests/_support/Models/SecondaryModel.php      |  9 +++++++++
 tests/_support/Models/SimpleEntity.php        |  9 +++++++++
 tests/_support/Models/StringifyPkeyModel.php  |  9 +++++++++
 tests/_support/Models/UserModel.php           |  9 +++++++++
 tests/_support/Models/ValidErrorsModel.php    |  9 +++++++++
 tests/_support/Models/ValidModel.php          |  9 +++++++++
 .../Models/WithoutAutoIncrementModel.php      |  9 +++++++++
 tests/_support/RESTful/Worker.php             |  9 +++++++++
 tests/_support/RESTful/Worker2.php            |  9 +++++++++
 tests/_support/Services.php                   |  9 +++++++++
 tests/_support/SomeEntity.php                 |  9 +++++++++
 tests/_support/Validation/TestRules.php       |  9 +++++++++
 tests/_support/View/SampleClass.php           |  9 +++++++++
 .../View/SampleClassWithInitController.php    |  9 +++++++++
 tests/_support/Widgets/NopeWidget.php         | 10 +++++++++-
 tests/_support/Widgets/OtherWidget.php        |  9 +++++++++
 tests/_support/Widgets/SomeWidget.php         |  9 +++++++++
 tests/system/API/ResponseTraitTest.php        |  9 +++++++++
 tests/system/Autoloader/AutoloaderTest.php    |  9 +++++++++
 tests/system/Autoloader/FileLocatorTest.php   |  9 +++++++++
 tests/system/CLI/CLITest.php                  |  9 +++++++++
 tests/system/CLI/CommandRunnerTest.php        |  9 +++++++++
 tests/system/CLI/ConsoleTest.php              |  9 +++++++++
 tests/system/Cache/CacheFactoryTest.php       |  9 +++++++++
 .../system/Cache/Handlers/BaseHandlerTest.php |  9 +++++++++
 .../Cache/Handlers/DummyHandlerTest.php       |  9 +++++++++
 .../system/Cache/Handlers/FileHandlerTest.php |  9 +++++++++
 .../Cache/Handlers/MemcachedHandlerTest.php   |  9 +++++++++
 .../Cache/Handlers/PredisHandlerTest.php      |  9 +++++++++
 .../Cache/Handlers/RedisHandlerTest.php       |  9 +++++++++
 tests/system/CodeIgniterTest.php              |  9 +++++++++
 tests/system/Commands/BaseCommandTest.php     |  9 +++++++++
 tests/system/Commands/ClearCacheTest.php      |  9 +++++++++
 tests/system/Commands/ClearDebugbarTest.php   |  9 +++++++++
 tests/system/Commands/ClearLogsTest.php       |  9 +++++++++
 .../system/Commands/CommandGeneratorTest.php  |  9 +++++++++
 tests/system/Commands/CommandTest.php         |  9 +++++++++
 tests/system/Commands/ConfigGeneratorTest.php |  9 +++++++++
 .../Commands/ConfigurableSortImportsTest.php  |  9 +++++++++
 .../Commands/ControllerGeneratorTest.php      |  9 +++++++++
 tests/system/Commands/CreateDatabaseTest.php  |  9 +++++++++
 .../system/Commands/DatabaseCommandsTest.php  |  9 +++++++++
 tests/system/Commands/EntityGeneratorTest.php |  9 +++++++++
 .../Commands/EnvironmentCommandTest.php       |  9 +++++++++
 tests/system/Commands/FilterGeneratorTest.php |  9 +++++++++
 tests/system/Commands/GenerateKeyTest.php     |  9 +++++++++
 tests/system/Commands/GeneratorsTest.php      |  9 +++++++++
 tests/system/Commands/HelpCommandTest.php     |  9 +++++++++
 tests/system/Commands/InfoCacheTest.php       |  9 +++++++++
 .../Commands/MigrationGeneratorTest.php       |  9 +++++++++
 .../Commands/MigrationIntegrationTest.php     |  9 +++++++++
 tests/system/Commands/ModelGeneratorTest.php  |  9 +++++++++
 .../system/Commands/ScaffoldGeneratorTest.php |  9 +++++++++
 tests/system/Commands/SeederGeneratorTest.php |  9 +++++++++
 .../system/Commands/SessionsCommandsTest.php  |  9 +++++++++
 .../Commands/ValidationGeneratorTest.php      |  9 +++++++++
 tests/system/CommonFunctionsSendTest.php      |  9 +++++++++
 tests/system/CommonFunctionsTest.php          |  9 +++++++++
 tests/system/CommonSingleServiceTest.php      |  9 +++++++++
 tests/system/Config/BaseConfigTest.php        |  9 +++++++++
 tests/system/Config/ConfigTest.php            |  9 +++++++++
 tests/system/Config/DotEnvTest.php            |  9 +++++++++
 tests/system/Config/FactoriesTest.php         |  9 +++++++++
 tests/system/Config/MimesTest.php             |  9 +++++++++
 tests/system/Config/ServicesTest.php          |  9 +++++++++
 tests/system/Config/fixtures/Encryption.php   |  9 +++++++++
 .../Config/fixtures/RegistrarConfig.php       |  9 +++++++++
 tests/system/Config/fixtures/SimpleConfig.php |  9 +++++++++
 tests/system/ControllerTest.php               |  9 +++++++++
 tests/system/Cookie/CookieStoreTest.php       |  9 +++++++++
 tests/system/Cookie/CookieTest.php            |  9 +++++++++
 tests/system/Database/BaseConnectionTest.php  |  9 +++++++++
 tests/system/Database/BaseQueryTest.php       |  9 +++++++++
 tests/system/Database/Builder/AliasTest.php   |  9 +++++++++
 tests/system/Database/Builder/BaseTest.php    |  9 +++++++++
 tests/system/Database/Builder/CountTest.php   |  9 +++++++++
 tests/system/Database/Builder/DeleteTest.php  |  9 +++++++++
 .../system/Database/Builder/DistinctTest.php  |  9 +++++++++
 tests/system/Database/Builder/EmptyTest.php   |  9 +++++++++
 tests/system/Database/Builder/FromTest.php    |  9 +++++++++
 tests/system/Database/Builder/GetTest.php     |  9 +++++++++
 tests/system/Database/Builder/GroupTest.php   |  9 +++++++++
 tests/system/Database/Builder/InsertTest.php  |  9 +++++++++
 tests/system/Database/Builder/JoinTest.php    |  9 +++++++++
 tests/system/Database/Builder/LikeTest.php    |  9 +++++++++
 tests/system/Database/Builder/LimitTest.php   |  9 +++++++++
 tests/system/Database/Builder/OrderTest.php   |  9 +++++++++
 tests/system/Database/Builder/PrefixTest.php  |  9 +++++++++
 tests/system/Database/Builder/ReplaceTest.php |  9 +++++++++
 tests/system/Database/Builder/SelectTest.php  |  9 +++++++++
 .../system/Database/Builder/TruncateTest.php  |  9 +++++++++
 tests/system/Database/Builder/UpdateTest.php  |  9 +++++++++
 tests/system/Database/Builder/WhereTest.php   |  9 +++++++++
 tests/system/Database/ConfigTest.php          |  9 +++++++++
 tests/system/Database/DatabaseSeederTest.php  |  9 +++++++++
 .../DatabaseTestCaseMigrationOnce1Test.php    |  9 +++++++++
 .../DatabaseTestCaseMigrationOnce2Test.php    |  9 +++++++++
 .../system/Database/DatabaseTestCaseTest.php  |  9 +++++++++
 tests/system/Database/Live/AliasTest.php      |  9 +++++++++
 tests/system/Database/Live/BadQueryTest.php   |  9 +++++++++
 tests/system/Database/Live/ConnectTest.php    |  9 +++++++++
 tests/system/Database/Live/CountTest.php      |  9 +++++++++
 .../Live/DatabaseTestTraitCaseTest.php        |  9 +++++++++
 tests/system/Database/Live/DbDebugTest.php    |  9 +++++++++
 tests/system/Database/Live/DbUtilsTest.php    |  9 +++++++++
 tests/system/Database/Live/DeleteTest.php     |  9 +++++++++
 tests/system/Database/Live/EmptyTest.php      |  9 +++++++++
 tests/system/Database/Live/EscapeTest.php     |  9 +++++++++
 .../Database/Live/FabricatorLiveTest.php      |  9 +++++++++
 tests/system/Database/Live/ForgeTest.php      |  9 +++++++++
 tests/system/Database/Live/FromTest.php       |  9 +++++++++
 tests/system/Database/Live/GetNumRowsTest.php |  9 +++++++++
 tests/system/Database/Live/GetTest.php        |  9 +++++++++
 tests/system/Database/Live/GroupTest.php      |  9 +++++++++
 tests/system/Database/Live/IncrementTest.php  |  9 +++++++++
 tests/system/Database/Live/InsertTest.php     |  9 +++++++++
 tests/system/Database/Live/JoinTest.php       |  9 +++++++++
 tests/system/Database/Live/LikeTest.php       |  9 +++++++++
 tests/system/Database/Live/LimitTest.php      |  9 +++++++++
 tests/system/Database/Live/MetadataTest.php   |  9 +++++++++
 tests/system/Database/Live/OrderTest.php      |  9 +++++++++
 .../Database/Live/PreparedQueryTest.php       |  9 +++++++++
 tests/system/Database/Live/PretendTest.php    |  9 +++++++++
 .../Database/Live/SQLite/AlterTableTest.php   |  9 +++++++++
 tests/system/Database/Live/SelectTest.php     |  9 +++++++++
 tests/system/Database/Live/UpdateTest.php     |  9 +++++++++
 tests/system/Database/Live/WhereTest.php      |  9 +++++++++
 .../Database/Live/WriteTypeQueryTest.php      |  9 +++++++++
 .../Migrations/MigrationRunnerTest.php        |  9 +++++++++
 .../Database/Migrations/MigrationTest.php     |  9 +++++++++
 tests/system/Database/ModelFactoryTest.php    |  9 +++++++++
 tests/system/Debug/ExceptionsTest.php         |  9 +++++++++
 tests/system/Debug/TimerTest.php              |  9 +++++++++
 tests/system/DebugTraceableTraitTest.php      | 19 ++++++++++++++-----
 tests/system/Email/EmailTest.php              |  9 +++++++++
 tests/system/Encryption/EncryptionTest.php    |  9 +++++++++
 .../Handlers/OpenSSLHandlerTest.php           |  9 +++++++++
 .../Encryption/Handlers/SodiumHandlerTest.php |  9 +++++++++
 tests/system/Entity/EntityTest.php            |  9 +++++++++
 tests/system/Events/EventsTest.php            |  9 +++++++++
 tests/system/Files/FileTest.php               |  9 +++++++++
 tests/system/Files/FileWithVfsTest.php        |  9 +++++++++
 tests/system/Filters/CSRFTest.php             |  9 +++++++++
 tests/system/Filters/DebugToolbarTest.php     |  9 +++++++++
 tests/system/Filters/FiltersTest.php          |  9 +++++++++
 tests/system/Filters/HoneypotTest.php         |  9 +++++++++
 .../system/Filters/fixtures/GoogleCurious.php |  9 +++++++++
 tests/system/Filters/fixtures/GoogleEmpty.php |  9 +++++++++
 tests/system/Filters/fixtures/GoogleMe.php    |  9 +++++++++
 tests/system/Filters/fixtures/GoogleYou.php   |  9 +++++++++
 .../system/Filters/fixtures/InvalidClass.php  |  9 +++++++++
 tests/system/Filters/fixtures/Multiple1.php   |  9 +++++++++
 tests/system/Filters/fixtures/Multiple2.php   |  9 +++++++++
 tests/system/Filters/fixtures/Role.php        |  9 +++++++++
 tests/system/Format/FormatTest.php            |  9 +++++++++
 tests/system/Format/JSONFormatterTest.php     |  9 +++++++++
 tests/system/Format/XMLFormatterTest.php      |  9 +++++++++
 tests/system/HTTP/CLIRequestTest.php          |  9 +++++++++
 tests/system/HTTP/CURLRequestTest.php         |  9 +++++++++
 .../system/HTTP/ContentSecurityPolicyTest.php |  9 +++++++++
 tests/system/HTTP/DownloadResponseTest.php    |  9 +++++++++
 .../system/HTTP/Files/FileCollectionTest.php  |  9 +++++++++
 tests/system/HTTP/Files/FileMovingTest.php    |  9 +++++++++
 tests/system/HTTP/HeaderTest.php              |  9 +++++++++
 .../HTTP/IncomingRequestDetectingTest.php     |  9 +++++++++
 tests/system/HTTP/IncomingRequestTest.php     |  9 +++++++++
 tests/system/HTTP/MessageTest.php             |  9 +++++++++
 tests/system/HTTP/NegotiateTest.php           |  9 +++++++++
 tests/system/HTTP/RedirectResponseTest.php    |  9 +++++++++
 tests/system/HTTP/RequestTest.php             |  9 +++++++++
 tests/system/HTTP/ResponseCookieTest.php      |  9 +++++++++
 tests/system/HTTP/ResponseSendTest.php        |  9 +++++++++
 tests/system/HTTP/ResponseTest.php            |  9 +++++++++
 tests/system/HTTP/URITest.php                 |  9 +++++++++
 tests/system/HTTP/UserAgentTest.php           |  9 +++++++++
 tests/system/Helpers/ArrayHelperTest.php      |  9 +++++++++
 tests/system/Helpers/CookieHelperTest.php     |  9 +++++++++
 tests/system/Helpers/DateHelperTest.php       |  9 +++++++++
 tests/system/Helpers/FilesystemHelperTest.php |  9 +++++++++
 tests/system/Helpers/FormHelperTest.php       |  9 +++++++++
 tests/system/Helpers/HTMLHelperTest.php       |  9 +++++++++
 tests/system/Helpers/InflectorHelperTest.php  |  9 +++++++++
 tests/system/Helpers/NumberHelperTest.php     |  9 +++++++++
 tests/system/Helpers/SecurityHelperTest.php   |  9 +++++++++
 tests/system/Helpers/TextHelperTest.php       |  9 +++++++++
 .../Helpers/URLHelper/CurrentUrlTest.php      |  9 +++++++++
 .../system/Helpers/URLHelper/MiscUrlTest.php  |  9 +++++++++
 .../system/Helpers/URLHelper/SiteUrlTest.php  |  9 +++++++++
 tests/system/Helpers/XMLHelperTest.php        |  9 +++++++++
 tests/system/HomeTest.php                     |  9 +++++++++
 tests/system/Honeypot/HoneypotTest.php        |  9 +++++++++
 tests/system/I18n/TimeDifferenceTest.php      |  9 +++++++++
 tests/system/I18n/TimeTest.php                |  9 +++++++++
 tests/system/Images/BaseHandlerTest.php       |  9 +++++++++
 tests/system/Images/GDHandlerTest.php         |  9 +++++++++
 .../system/Images/ImageMagickHandlerTest.php  |  9 +++++++++
 tests/system/Images/ImageTest.php             |  9 +++++++++
 tests/system/Language/LanguageTest.php        |  9 +++++++++
 .../Log/Handlers/ChromeLoggerHandlerTest.php  |  9 +++++++++
 .../Log/Handlers/ErrorlogHandlerTest.php      |  9 +++++++++
 tests/system/Log/Handlers/FileHandlerTest.php |  9 +++++++++
 tests/system/Log/LoggerTest.php               |  9 +++++++++
 tests/system/Models/CountAllModelTest.php     |  9 +++++++++
 tests/system/Models/DeleteModelTest.php       |  9 +++++++++
 tests/system/Models/EventsModelTest.php       |  9 +++++++++
 tests/system/Models/FindModelTest.php         |  9 +++++++++
 tests/system/Models/GeneralModelTest.php      |  9 +++++++++
 tests/system/Models/InsertModelTest.php       |  9 +++++++++
 tests/system/Models/LiveModelTestCase.php     |  9 +++++++++
 .../system/Models/MiscellaneousModelTest.php  |  9 +++++++++
 tests/system/Models/PaginateModelTest.php     |  9 +++++++++
 tests/system/Models/SaveModelTest.php         |  9 +++++++++
 tests/system/Models/UpdateModelTest.php       |  9 +++++++++
 tests/system/Models/ValidationModelTest.php   |  9 +++++++++
 tests/system/Pager/PagerRendererTest.php      |  9 +++++++++
 tests/system/Pager/PagerTest.php              |  9 +++++++++
 .../system/RESTful/ResourceControllerTest.php |  9 +++++++++
 .../system/RESTful/ResourcePresenterTest.php  |  9 +++++++++
 tests/system/Router/RouteCollectionTest.php   |  9 +++++++++
 tests/system/Router/RouterTest.php            |  9 +++++++++
 tests/system/Security/SecurityTest.php        |  9 +++++++++
 tests/system/Session/SessionTest.php          |  9 +++++++++
 tests/system/Test/BootstrapFCPATHTest.php     |  9 +++++++++
 tests/system/Test/ControllerTestTraitTest.php |  9 +++++++++
 tests/system/Test/DOMParserTest.php           |  9 +++++++++
 tests/system/Test/FabricatorTest.php          |  9 +++++++++
 tests/system/Test/FeatureTestTraitTest.php    |  9 +++++++++
 tests/system/Test/FilterTestTraitTest.php     |  9 +++++++++
 tests/system/Test/ReflectionHelperTest.php    |  9 +++++++++
 tests/system/Test/TestCaseEmissionsTest.php   |  9 +++++++++
 tests/system/Test/TestCaseTest.php            |  9 +++++++++
 tests/system/Test/TestResponseTest.php        |  9 +++++++++
 tests/system/Throttle/ThrottleTest.php        |  9 +++++++++
 tests/system/Typography/TypographyTest.php    |  9 +++++++++
 .../system/Validation/CreditCardRulesTest.php |  9 +++++++++
 tests/system/Validation/FileRulesTest.php     |  9 +++++++++
 tests/system/Validation/FormatRulesTest.php   |  9 +++++++++
 tests/system/Validation/RulesTest.php         |  9 +++++++++
 tests/system/Validation/ValidationTest.php    |  9 +++++++++
 tests/system/View/CellTest.php                |  9 +++++++++
 tests/system/View/ParserFilterTest.php        |  9 +++++++++
 tests/system/View/ParserPluginTest.php        |  9 +++++++++
 tests/system/View/ParserTest.php              |  9 +++++++++
 tests/system/View/TableTest.php               |  9 +++++++++
 tests/system/View/ViewTest.php                |  9 +++++++++
 ...onInstantiationViaNamedConstructorRule.php |  9 +++++++++
 .../CheckUseStatementsAfterLicenseRule.php    |  9 +++++++++
 utils/PhpCsFixer/CodeIgniter4.php             |  9 +++++++++
 ...rictParameterToFunctionParameterRector.php |  9 +++++++++
 ...moveErrorSuppressInTryCatchStmtsRector.php |  9 +++++++++
 .../RemoveVarTagFromClassConstantRector.php   |  9 +++++++++
 ...nderscoreToCamelCaseVariableNameRector.php |  9 +++++++++
 655 files changed, 3793 insertions(+), 1079 deletions(-)

diff --git a/.no-header.php-cs-fixer.dist.php b/.no-header.php-cs-fixer.dist.php
index 8220fe3d6091..4bee79703546 100644
--- a/.no-header.php-cs-fixer.dist.php
+++ b/.no-header.php-cs-fixer.dist.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 use Nexus\CsConfig\Factory;
 use PhpCsFixer\Finder;
 use Utils\PhpCsFixer\CodeIgniter4;
@@ -15,7 +24,7 @@
     ]);
 
 $overrides = [
-	'no_blank_lines_after_phpdoc' => false,
+    'no_blank_lines_after_phpdoc' => false,
 ];
 
 $options = [
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 1cd558071c3e..15db678cbd35 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 use Nexus\CsConfig\Factory;
 use PhpCsFixer\Finder;
 use Utils\PhpCsFixer\CodeIgniter4;
diff --git a/rector.php b/rector.php
index bc01a45eb11f..aadbef2a766c 100644
--- a/rector.php
+++ b/rector.php
@@ -1,5 +1,14 @@
 <?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.
+ */
+
 use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
 use Rector\CodeQuality\Rector\For_\ForToForeachRector;
 use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector;
diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
index 3dbb249634a2..d83238f66e35 100644
--- a/system/API/ResponseTrait.php
+++ b/system/API/ResponseTrait.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\API;
diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
index b73065d3e0cd..53d5654905ad 100644
--- a/system/Autoloader/Autoloader.php
+++ b/system/Autoloader/Autoloader.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Autoloader;
diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index 2c645416e920..00d4a8ffe993 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Autoloader;
diff --git a/system/BaseModel.php b/system/BaseModel.php
index 4d26ab92465d..12747fef78e7 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter;
diff --git a/system/CLI/BaseCommand.php b/system/CLI/BaseCommand.php
index d548f26c402e..2d15f15f57a5 100644
--- a/system/CLI/BaseCommand.php
+++ b/system/CLI/BaseCommand.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\CLI;
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index 2705c0cdac70..be3d444fbed2 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\CLI;
diff --git a/system/CLI/CommandRunner.php b/system/CLI/CommandRunner.php
index 08bb52082b0f..79d21ff8ea72 100644
--- a/system/CLI/CommandRunner.php
+++ b/system/CLI/CommandRunner.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\CLI;
diff --git a/system/CLI/Commands.php b/system/CLI/Commands.php
index 8e82f4699edd..888d266e46b0 100644
--- a/system/CLI/Commands.php
+++ b/system/CLI/Commands.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\CLI;
diff --git a/system/CLI/Console.php b/system/CLI/Console.php
index 486c6d9d4d3c..20110d0fc25d 100644
--- a/system/CLI/Console.php
+++ b/system/CLI/Console.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\CLI;
diff --git a/system/CLI/Exceptions/CLIException.php b/system/CLI/Exceptions/CLIException.php
index 9859ae14ef90..07c60a8af85f 100644
--- a/system/CLI/Exceptions/CLIException.php
+++ b/system/CLI/Exceptions/CLIException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\CLI\Exceptions;
diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php
index 0b8fb5310e2d..13c36d674a88 100644
--- a/system/CLI/GeneratorTrait.php
+++ b/system/CLI/GeneratorTrait.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\CLI;
diff --git a/system/Cache/CacheFactory.php b/system/Cache/CacheFactory.php
index ff326c8f03ad..691b350a9968 100644
--- a/system/Cache/CacheFactory.php
+++ b/system/Cache/CacheFactory.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache;
diff --git a/system/Cache/CacheInterface.php b/system/Cache/CacheInterface.php
index 3dc344d6f149..52502f5e6742 100644
--- a/system/Cache/CacheInterface.php
+++ b/system/Cache/CacheInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache;
diff --git a/system/Cache/Exceptions/CacheException.php b/system/Cache/Exceptions/CacheException.php
index 3b3d2edec3c2..a3269072ecdf 100644
--- a/system/Cache/Exceptions/CacheException.php
+++ b/system/Cache/Exceptions/CacheException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Exceptions;
diff --git a/system/Cache/Exceptions/ExceptionInterface.php b/system/Cache/Exceptions/ExceptionInterface.php
index 371301153b56..067e8aa208b5 100644
--- a/system/Cache/Exceptions/ExceptionInterface.php
+++ b/system/Cache/Exceptions/ExceptionInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Exceptions;
diff --git a/system/Cache/Handlers/BaseHandler.php b/system/Cache/Handlers/BaseHandler.php
index 9397959f2da0..cae03b901664 100644
--- a/system/Cache/Handlers/BaseHandler.php
+++ b/system/Cache/Handlers/BaseHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Handlers;
diff --git a/system/Cache/Handlers/DummyHandler.php b/system/Cache/Handlers/DummyHandler.php
index cd1cf0a029a4..8d4a9a6e2972 100644
--- a/system/Cache/Handlers/DummyHandler.php
+++ b/system/Cache/Handlers/DummyHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Handlers;
diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php
index d5277c2496fa..d169a9258a37 100644
--- a/system/Cache/Handlers/FileHandler.php
+++ b/system/Cache/Handlers/FileHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Handlers;
diff --git a/system/Cache/Handlers/MemcachedHandler.php b/system/Cache/Handlers/MemcachedHandler.php
index 4c9ec7878320..d1fbdf2b8cac 100644
--- a/system/Cache/Handlers/MemcachedHandler.php
+++ b/system/Cache/Handlers/MemcachedHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Handlers;
diff --git a/system/Cache/Handlers/PredisHandler.php b/system/Cache/Handlers/PredisHandler.php
index c1b8d33991a0..978e48dd8b17 100644
--- a/system/Cache/Handlers/PredisHandler.php
+++ b/system/Cache/Handlers/PredisHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Handlers;
diff --git a/system/Cache/Handlers/RedisHandler.php b/system/Cache/Handlers/RedisHandler.php
index 92323984b5c1..2320de73cf05 100644
--- a/system/Cache/Handlers/RedisHandler.php
+++ b/system/Cache/Handlers/RedisHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Handlers;
diff --git a/system/Cache/Handlers/WincacheHandler.php b/system/Cache/Handlers/WincacheHandler.php
index 1c114ddeb738..04697a32a232 100644
--- a/system/Cache/Handlers/WincacheHandler.php
+++ b/system/Cache/Handlers/WincacheHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cache\Handlers;
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 9d23f80d0290..a8d54bb0e0be 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter;
diff --git a/system/Commands/Cache/ClearCache.php b/system/Commands/Cache/ClearCache.php
index 5e3f4c48f57c..dd9850c381e5 100644
--- a/system/Commands/Cache/ClearCache.php
+++ b/system/Commands/Cache/ClearCache.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Cache;
diff --git a/system/Commands/Cache/InfoCache.php b/system/Commands/Cache/InfoCache.php
index 0b2fd5dec30b..6d4a543c1f91 100644
--- a/system/Commands/Cache/InfoCache.php
+++ b/system/Commands/Cache/InfoCache.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Cache;
diff --git a/system/Commands/Database/CreateDatabase.php b/system/Commands/Database/CreateDatabase.php
index 474342018a48..1040383a1434 100644
--- a/system/Commands/Database/CreateDatabase.php
+++ b/system/Commands/Database/CreateDatabase.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Database;
diff --git a/system/Commands/Database/Migrate.php b/system/Commands/Database/Migrate.php
index f930a044e0d9..24c7ecbddff3 100644
--- a/system/Commands/Database/Migrate.php
+++ b/system/Commands/Database/Migrate.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Database;
diff --git a/system/Commands/Database/MigrateRefresh.php b/system/Commands/Database/MigrateRefresh.php
index c38c749d5d43..733b0eed35d8 100644
--- a/system/Commands/Database/MigrateRefresh.php
+++ b/system/Commands/Database/MigrateRefresh.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Database;
diff --git a/system/Commands/Database/MigrateRollback.php b/system/Commands/Database/MigrateRollback.php
index f09f32bfdeea..fe9c28df7f46 100644
--- a/system/Commands/Database/MigrateRollback.php
+++ b/system/Commands/Database/MigrateRollback.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Database;
diff --git a/system/Commands/Database/MigrateStatus.php b/system/Commands/Database/MigrateStatus.php
index 53ca46e3ec08..28144cd1d144 100644
--- a/system/Commands/Database/MigrateStatus.php
+++ b/system/Commands/Database/MigrateStatus.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Database;
diff --git a/system/Commands/Database/Seed.php b/system/Commands/Database/Seed.php
index 1ff762af9c8b..5de640f3c103 100644
--- a/system/Commands/Database/Seed.php
+++ b/system/Commands/Database/Seed.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Database;
diff --git a/system/Commands/Encryption/GenerateKey.php b/system/Commands/Encryption/GenerateKey.php
index f87563a3cc23..79cce1f20af8 100644
--- a/system/Commands/Encryption/GenerateKey.php
+++ b/system/Commands/Encryption/GenerateKey.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Encryption;
diff --git a/system/Commands/Generators/CommandGenerator.php b/system/Commands/Generators/CommandGenerator.php
index a26c26664731..be979ebf46eb 100644
--- a/system/Commands/Generators/CommandGenerator.php
+++ b/system/Commands/Generators/CommandGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
diff --git a/system/Commands/Generators/ConfigGenerator.php b/system/Commands/Generators/ConfigGenerator.php
index 3bec83d4b75b..301091a0019f 100644
--- a/system/Commands/Generators/ConfigGenerator.php
+++ b/system/Commands/Generators/ConfigGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
diff --git a/system/Commands/Generators/ControllerGenerator.php b/system/Commands/Generators/ControllerGenerator.php
index 05f3fa0c979e..05ffd58ef02d 100644
--- a/system/Commands/Generators/ControllerGenerator.php
+++ b/system/Commands/Generators/ControllerGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
diff --git a/system/Commands/Generators/EntityGenerator.php b/system/Commands/Generators/EntityGenerator.php
index c1c406b39ca8..0b8baf4cb4cc 100644
--- a/system/Commands/Generators/EntityGenerator.php
+++ b/system/Commands/Generators/EntityGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
diff --git a/system/Commands/Generators/FilterGenerator.php b/system/Commands/Generators/FilterGenerator.php
index da42476635c7..4bbc9102bdef 100644
--- a/system/Commands/Generators/FilterGenerator.php
+++ b/system/Commands/Generators/FilterGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
diff --git a/system/Commands/Generators/MigrateCreate.php b/system/Commands/Generators/MigrateCreate.php
index d376762513c2..6501ae0ee492 100644
--- a/system/Commands/Generators/MigrateCreate.php
+++ b/system/Commands/Generators/MigrateCreate.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
diff --git a/system/Commands/Generators/MigrationGenerator.php b/system/Commands/Generators/MigrationGenerator.php
index 23cdf7f62725..dded6a7f5fb8 100644
--- a/system/Commands/Generators/MigrationGenerator.php
+++ b/system/Commands/Generators/MigrationGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
diff --git a/system/Commands/Generators/ModelGenerator.php b/system/Commands/Generators/ModelGenerator.php
index a8990264a207..808968b84542 100644
--- a/system/Commands/Generators/ModelGenerator.php
+++ b/system/Commands/Generators/ModelGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
diff --git a/system/Commands/Generators/ScaffoldGenerator.php b/system/Commands/Generators/ScaffoldGenerator.php
index d619acb830fd..db9eb1420589 100644
--- a/system/Commands/Generators/ScaffoldGenerator.php
+++ b/system/Commands/Generators/ScaffoldGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
diff --git a/system/Commands/Generators/SeederGenerator.php b/system/Commands/Generators/SeederGenerator.php
index c36ed337b767..233595495576 100644
--- a/system/Commands/Generators/SeederGenerator.php
+++ b/system/Commands/Generators/SeederGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
diff --git a/system/Commands/Generators/SessionMigrationGenerator.php b/system/Commands/Generators/SessionMigrationGenerator.php
index 2727257b9dbd..60258e6b1548 100644
--- a/system/Commands/Generators/SessionMigrationGenerator.php
+++ b/system/Commands/Generators/SessionMigrationGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
diff --git a/system/Commands/Generators/ValidationGenerator.php b/system/Commands/Generators/ValidationGenerator.php
index 2115d280efb1..322ecb190b28 100644
--- a/system/Commands/Generators/ValidationGenerator.php
+++ b/system/Commands/Generators/ValidationGenerator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Generators;
diff --git a/system/Commands/Help.php b/system/Commands/Help.php
index 7aa9a5cc6ad7..32df294e222d 100644
--- a/system/Commands/Help.php
+++ b/system/Commands/Help.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands;
diff --git a/system/Commands/Housekeeping/ClearDebugbar.php b/system/Commands/Housekeeping/ClearDebugbar.php
index 7e34a8ec681b..5f81b2eeeda8 100644
--- a/system/Commands/Housekeeping/ClearDebugbar.php
+++ b/system/Commands/Housekeeping/ClearDebugbar.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Housekeeping;
diff --git a/system/Commands/Housekeeping/ClearLogs.php b/system/Commands/Housekeeping/ClearLogs.php
index eb0741b7796e..1c063d80929e 100644
--- a/system/Commands/Housekeeping/ClearLogs.php
+++ b/system/Commands/Housekeeping/ClearLogs.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Housekeeping;
diff --git a/system/Commands/ListCommands.php b/system/Commands/ListCommands.php
index fd57bfc9e73a..f74736832a8b 100644
--- a/system/Commands/ListCommands.php
+++ b/system/Commands/ListCommands.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands;
diff --git a/system/Commands/Server/Serve.php b/system/Commands/Server/Serve.php
index 04cced6c9c2d..4d1d64e6c071 100644
--- a/system/Commands/Server/Serve.php
+++ b/system/Commands/Server/Serve.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Server;
diff --git a/system/Commands/Server/rewrite.php b/system/Commands/Server/rewrite.php
index bb19e4596e76..ef5dc0734f23 100644
--- a/system/Commands/Server/rewrite.php
+++ b/system/Commands/Server/rewrite.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 /*
diff --git a/system/Commands/Utilities/Environment.php b/system/Commands/Utilities/Environment.php
index 5b44ea02bdf9..2ad0dc394e5b 100644
--- a/system/Commands/Utilities/Environment.php
+++ b/system/Commands/Utilities/Environment.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands\Utilities;
 
 use CodeIgniter\CLI\BaseCommand;
diff --git a/system/Commands/Utilities/Namespaces.php b/system/Commands/Utilities/Namespaces.php
index f4ef07a5c1ee..639a861e5271 100644
--- a/system/Commands/Utilities/Namespaces.php
+++ b/system/Commands/Utilities/Namespaces.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Utilities;
diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
index 0d914d766f84..bdc5db9da181 100644
--- a/system/Commands/Utilities/Routes.php
+++ b/system/Commands/Utilities/Routes.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Utilities;
diff --git a/system/Common.php b/system/Common.php
index 2e76c2cab237..97caeee4efae 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use CodeIgniter\Cache\CacheInterface;
diff --git a/system/ComposerScripts.php b/system/ComposerScripts.php
index 52bc46e09e18..cf74406883df 100644
--- a/system/ComposerScripts.php
+++ b/system/ComposerScripts.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter;
diff --git a/system/Config/AutoloadConfig.php b/system/Config/AutoloadConfig.php
index 140d62c42970..0818271e002f 100644
--- a/system/Config/AutoloadConfig.php
+++ b/system/Config/AutoloadConfig.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
diff --git a/system/Config/BaseConfig.php b/system/Config/BaseConfig.php
index a3386c118cac..1468c84271e8 100644
--- a/system/Config/BaseConfig.php
+++ b/system/Config/BaseConfig.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
index ec5bea060e63..49d3688db112 100644
--- a/system/Config/BaseService.php
+++ b/system/Config/BaseService.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
diff --git a/system/Config/Config.php b/system/Config/Config.php
index aa7249410ca2..229e1e35d279 100644
--- a/system/Config/Config.php
+++ b/system/Config/Config.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
diff --git a/system/Config/DotEnv.php b/system/Config/DotEnv.php
index 49a2a70a3a1d..e9761c63edd6 100644
--- a/system/Config/DotEnv.php
+++ b/system/Config/DotEnv.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
diff --git a/system/Config/Factories.php b/system/Config/Factories.php
index c03264b422fa..9df4fec5a6a4 100644
--- a/system/Config/Factories.php
+++ b/system/Config/Factories.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
diff --git a/system/Config/Factory.php b/system/Config/Factory.php
index b259a68a0a49..5889bf4d7336 100644
--- a/system/Config/Factory.php
+++ b/system/Config/Factory.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
diff --git a/system/Config/ForeignCharacters.php b/system/Config/ForeignCharacters.php
index 591870de92fe..f2e7cc57cabf 100644
--- a/system/Config/ForeignCharacters.php
+++ b/system/Config/ForeignCharacters.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
diff --git a/system/Config/Routes.php b/system/Config/Routes.php
index 1867bdd1ae98..4ace952bc3c8 100644
--- a/system/Config/Routes.php
+++ b/system/Config/Routes.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use CodeIgniter\Exceptions\PageNotFoundException;
diff --git a/system/Config/Services.php b/system/Config/Services.php
index 65f5b7cc368d..8760b8bb9f96 100644
--- a/system/Config/Services.php
+++ b/system/Config/Services.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
diff --git a/system/Config/View.php b/system/Config/View.php
index d5201c2b2cfa..0699f45ceaf6 100644
--- a/system/Config/View.php
+++ b/system/Config/View.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
diff --git a/system/Controller.php b/system/Controller.php
index 255322391a7f..9138d930ac53 100644
--- a/system/Controller.php
+++ b/system/Controller.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter;
diff --git a/system/Cookie/CloneableCookieInterface.php b/system/Cookie/CloneableCookieInterface.php
index 9b45da371973..8cbbeb985804 100644
--- a/system/Cookie/CloneableCookieInterface.php
+++ b/system/Cookie/CloneableCookieInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cookie;
diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php
index 75f5e667d57d..84f067442119 100644
--- a/system/Cookie/Cookie.php
+++ b/system/Cookie/Cookie.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cookie;
diff --git a/system/Cookie/CookieInterface.php b/system/Cookie/CookieInterface.php
index 7b27ba604348..0576d7ee48c6 100644
--- a/system/Cookie/CookieInterface.php
+++ b/system/Cookie/CookieInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cookie;
diff --git a/system/Cookie/CookieStore.php b/system/Cookie/CookieStore.php
index bd2468778050..a7c1e37bb297 100644
--- a/system/Cookie/CookieStore.php
+++ b/system/Cookie/CookieStore.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cookie;
diff --git a/system/Cookie/Exceptions/CookieException.php b/system/Cookie/Exceptions/CookieException.php
index da64d8591c89..89fd75e9ff5c 100644
--- a/system/Cookie/Exceptions/CookieException.php
+++ b/system/Cookie/Exceptions/CookieException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Cookie\Exceptions;
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 763ce0ace0b1..2dd7933113e4 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index e2a9bb81e601..675c9958d086 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
diff --git a/system/Database/BasePreparedQuery.php b/system/Database/BasePreparedQuery.php
index 6e2c296bb8cc..db2b02e054bf 100644
--- a/system/Database/BasePreparedQuery.php
+++ b/system/Database/BasePreparedQuery.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php
index fdb4bf186a62..e44de7b47b9a 100644
--- a/system/Database/BaseResult.php
+++ b/system/Database/BaseResult.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
diff --git a/system/Database/BaseUtils.php b/system/Database/BaseUtils.php
index 7b45f6a43103..4f6c5712362e 100644
--- a/system/Database/BaseUtils.php
+++ b/system/Database/BaseUtils.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
diff --git a/system/Database/Config.php b/system/Database/Config.php
index f227017c3317..681662a436a4 100644
--- a/system/Database/Config.php
+++ b/system/Database/Config.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
diff --git a/system/Database/ConnectionInterface.php b/system/Database/ConnectionInterface.php
index d458bc8abd8c..4ebd0fb0a36a 100644
--- a/system/Database/ConnectionInterface.php
+++ b/system/Database/ConnectionInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
diff --git a/system/Database/Database.php b/system/Database/Database.php
index 43da80375459..a0797190d893 100644
--- a/system/Database/Database.php
+++ b/system/Database/Database.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
diff --git a/system/Database/Exceptions/DataException.php b/system/Database/Exceptions/DataException.php
index 1142be6193ef..fb713038df82 100644
--- a/system/Database/Exceptions/DataException.php
+++ b/system/Database/Exceptions/DataException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Exceptions;
diff --git a/system/Database/Exceptions/DatabaseException.php b/system/Database/Exceptions/DatabaseException.php
index 8951de8a525c..a2b3b7637ce7 100644
--- a/system/Database/Exceptions/DatabaseException.php
+++ b/system/Database/Exceptions/DatabaseException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Exceptions;
diff --git a/system/Database/Exceptions/ExceptionInterface.php b/system/Database/Exceptions/ExceptionInterface.php
index 3820c555c025..815652349324 100644
--- a/system/Database/Exceptions/ExceptionInterface.php
+++ b/system/Database/Exceptions/ExceptionInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Exceptions;
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 3e591e63efaf..0f9f6bf5772b 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
diff --git a/system/Database/Migration.php b/system/Database/Migration.php
index 45e87049a072..6b1cf82d642d 100644
--- a/system/Database/Migration.php
+++ b/system/Database/Migration.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
index 7437dda86b39..08963796358a 100644
--- a/system/Database/MigrationRunner.php
+++ b/system/Database/MigrationRunner.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
diff --git a/system/Database/ModelFactory.php b/system/Database/ModelFactory.php
index 148820fc2e60..7db233e8b2cd 100644
--- a/system/Database/ModelFactory.php
+++ b/system/Database/ModelFactory.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
diff --git a/system/Database/MySQLi/Builder.php b/system/Database/MySQLi/Builder.php
index 73f1df25e5b7..55b7cd58f610 100644
--- a/system/Database/MySQLi/Builder.php
+++ b/system/Database/MySQLi/Builder.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\MySQLi;
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
index 804ac807aa8a..e56d0d19c3bc 100644
--- a/system/Database/MySQLi/Connection.php
+++ b/system/Database/MySQLi/Connection.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\MySQLi;
diff --git a/system/Database/MySQLi/Forge.php b/system/Database/MySQLi/Forge.php
index 14e04552f395..fd9f705162d7 100644
--- a/system/Database/MySQLi/Forge.php
+++ b/system/Database/MySQLi/Forge.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\MySQLi;
diff --git a/system/Database/MySQLi/PreparedQuery.php b/system/Database/MySQLi/PreparedQuery.php
index d14fc1125a80..8f5dcf66553c 100644
--- a/system/Database/MySQLi/PreparedQuery.php
+++ b/system/Database/MySQLi/PreparedQuery.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\MySQLi;
diff --git a/system/Database/MySQLi/Result.php b/system/Database/MySQLi/Result.php
index 83d2556638b5..04e91c8eee48 100644
--- a/system/Database/MySQLi/Result.php
+++ b/system/Database/MySQLi/Result.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\MySQLi;
diff --git a/system/Database/MySQLi/Utils.php b/system/Database/MySQLi/Utils.php
index 2e91ad291ce1..39f27e24b052 100644
--- a/system/Database/MySQLi/Utils.php
+++ b/system/Database/MySQLi/Utils.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\MySQLi;
diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index 03cf05e3a079..465b4ff3f7fc 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Postgre;
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
index 98adb01c13a6..74ad88664ade 100644
--- a/system/Database/Postgre/Connection.php
+++ b/system/Database/Postgre/Connection.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Postgre;
diff --git a/system/Database/Postgre/Forge.php b/system/Database/Postgre/Forge.php
index 335c37a9280f..426e5a3606d7 100644
--- a/system/Database/Postgre/Forge.php
+++ b/system/Database/Postgre/Forge.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Postgre;
diff --git a/system/Database/Postgre/PreparedQuery.php b/system/Database/Postgre/PreparedQuery.php
index 9c94b5c304dd..52256530e357 100644
--- a/system/Database/Postgre/PreparedQuery.php
+++ b/system/Database/Postgre/PreparedQuery.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Postgre;
diff --git a/system/Database/Postgre/Result.php b/system/Database/Postgre/Result.php
index 9cc47e135ebe..feb5c1ca0584 100644
--- a/system/Database/Postgre/Result.php
+++ b/system/Database/Postgre/Result.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Postgre;
diff --git a/system/Database/Postgre/Utils.php b/system/Database/Postgre/Utils.php
index 7de2b127ff22..8c4d6d6967be 100644
--- a/system/Database/Postgre/Utils.php
+++ b/system/Database/Postgre/Utils.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\Postgre;
diff --git a/system/Database/PreparedQueryInterface.php b/system/Database/PreparedQueryInterface.php
index 99fad9af2c20..c40ef2f4d455 100644
--- a/system/Database/PreparedQueryInterface.php
+++ b/system/Database/PreparedQueryInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
diff --git a/system/Database/Query.php b/system/Database/Query.php
index 9b512647cf4d..688ffb1323d5 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
diff --git a/system/Database/QueryInterface.php b/system/Database/QueryInterface.php
index 73b65faba561..fd81ab7c4bc7 100644
--- a/system/Database/QueryInterface.php
+++ b/system/Database/QueryInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
diff --git a/system/Database/ResultInterface.php b/system/Database/ResultInterface.php
index be24679f96c9..9a0d79698623 100644
--- a/system/Database/ResultInterface.php
+++ b/system/Database/ResultInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index 4276c5359056..8478293343fd 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLSRV;
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index 0b0e729a7c30..a37c6119ae61 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLSRV;
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
index 6e87cd23a508..4a52695a653f 100755
--- a/system/Database/SQLSRV/Forge.php
+++ b/system/Database/SQLSRV/Forge.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLSRV;
diff --git a/system/Database/SQLSRV/PreparedQuery.php b/system/Database/SQLSRV/PreparedQuery.php
index 843bbbf597a3..7972ba725298 100755
--- a/system/Database/SQLSRV/PreparedQuery.php
+++ b/system/Database/SQLSRV/PreparedQuery.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLSRV;
diff --git a/system/Database/SQLSRV/Result.php b/system/Database/SQLSRV/Result.php
index 94eaecebf80d..6330b58ba2ad 100755
--- a/system/Database/SQLSRV/Result.php
+++ b/system/Database/SQLSRV/Result.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLSRV;
diff --git a/system/Database/SQLSRV/Utils.php b/system/Database/SQLSRV/Utils.php
index d1223ce5d855..0776f3a68c45 100755
--- a/system/Database/SQLSRV/Utils.php
+++ b/system/Database/SQLSRV/Utils.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLSRV;
diff --git a/system/Database/SQLite3/Builder.php b/system/Database/SQLite3/Builder.php
index f5896739c539..fd071957d04d 100644
--- a/system/Database/SQLite3/Builder.php
+++ b/system/Database/SQLite3/Builder.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
index cf499268c838..b4252e1a19a3 100644
--- a/system/Database/SQLite3/Connection.php
+++ b/system/Database/SQLite3/Connection.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
index eb0492971494..373c0bce0bf9 100644
--- a/system/Database/SQLite3/Forge.php
+++ b/system/Database/SQLite3/Forge.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
diff --git a/system/Database/SQLite3/PreparedQuery.php b/system/Database/SQLite3/PreparedQuery.php
index d33f016d67f3..8c00c2b3d10e 100644
--- a/system/Database/SQLite3/PreparedQuery.php
+++ b/system/Database/SQLite3/PreparedQuery.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
diff --git a/system/Database/SQLite3/Result.php b/system/Database/SQLite3/Result.php
index 1e25d0e58bb4..7485d36dca4b 100644
--- a/system/Database/SQLite3/Result.php
+++ b/system/Database/SQLite3/Result.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php
index e1be8388e92e..c4f6b77bf636 100644
--- a/system/Database/SQLite3/Table.php
+++ b/system/Database/SQLite3/Table.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
diff --git a/system/Database/SQLite3/Utils.php b/system/Database/SQLite3/Utils.php
index bad750babecb..192b81846cc7 100644
--- a/system/Database/SQLite3/Utils.php
+++ b/system/Database/SQLite3/Utils.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\SQLite3;
diff --git a/system/Database/Seeder.php b/system/Database/Seeder.php
index 515d90e94d5f..c809fbcd1a32 100644
--- a/system/Database/Seeder.php
+++ b/system/Database/Seeder.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database;
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index a9cb75c0bf74..c1b262060d87 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug;
diff --git a/system/Debug/Iterator.php b/system/Debug/Iterator.php
index 6fcf741f0b4b..01a9d58a0104 100644
--- a/system/Debug/Iterator.php
+++ b/system/Debug/Iterator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug;
diff --git a/system/Debug/Timer.php b/system/Debug/Timer.php
index 975e7cc29d99..fc26abae1aaf 100644
--- a/system/Debug/Timer.php
+++ b/system/Debug/Timer.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug;
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 1bda0619801b..df266710d150 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug;
@@ -292,7 +292,6 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
          * @var IncomingRequest $request
          * @var Response        $response
          */
-
         if (CI_DEBUG && ! is_cli()) {
             global $app;
 
diff --git a/system/Debug/Toolbar/Collectors/BaseCollector.php b/system/Debug/Toolbar/Collectors/BaseCollector.php
index fbe92410f363..7a77e79aa649 100644
--- a/system/Debug/Toolbar/Collectors/BaseCollector.php
+++ b/system/Debug/Toolbar/Collectors/BaseCollector.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
diff --git a/system/Debug/Toolbar/Collectors/Config.php b/system/Debug/Toolbar/Collectors/Config.php
index 83d80a120072..1233d76260a5 100644
--- a/system/Debug/Toolbar/Collectors/Config.php
+++ b/system/Debug/Toolbar/Collectors/Config.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 5b45c182ceca..1f9fa37d7215 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
diff --git a/system/Debug/Toolbar/Collectors/Events.php b/system/Debug/Toolbar/Collectors/Events.php
index 4515f26bf110..741cb5a927d9 100644
--- a/system/Debug/Toolbar/Collectors/Events.php
+++ b/system/Debug/Toolbar/Collectors/Events.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
diff --git a/system/Debug/Toolbar/Collectors/Files.php b/system/Debug/Toolbar/Collectors/Files.php
index 26256660befa..16be0e90a15e 100644
--- a/system/Debug/Toolbar/Collectors/Files.php
+++ b/system/Debug/Toolbar/Collectors/Files.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
diff --git a/system/Debug/Toolbar/Collectors/History.php b/system/Debug/Toolbar/Collectors/History.php
index 6beea6386fb3..5a8053ca46b7 100644
--- a/system/Debug/Toolbar/Collectors/History.php
+++ b/system/Debug/Toolbar/Collectors/History.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
diff --git a/system/Debug/Toolbar/Collectors/Logs.php b/system/Debug/Toolbar/Collectors/Logs.php
index 80eee730762b..dfa91da6854e 100644
--- a/system/Debug/Toolbar/Collectors/Logs.php
+++ b/system/Debug/Toolbar/Collectors/Logs.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
diff --git a/system/Debug/Toolbar/Collectors/Routes.php b/system/Debug/Toolbar/Collectors/Routes.php
index 4f50ef7201bd..945c80cb6148 100644
--- a/system/Debug/Toolbar/Collectors/Routes.php
+++ b/system/Debug/Toolbar/Collectors/Routes.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
diff --git a/system/Debug/Toolbar/Collectors/Timers.php b/system/Debug/Toolbar/Collectors/Timers.php
index 940ff67a5c56..ec09a0fe3e05 100644
--- a/system/Debug/Toolbar/Collectors/Timers.php
+++ b/system/Debug/Toolbar/Collectors/Timers.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
diff --git a/system/Debug/Toolbar/Collectors/Views.php b/system/Debug/Toolbar/Collectors/Views.php
index 0cf25ccdd24e..b716ffa3b178 100644
--- a/system/Debug/Toolbar/Collectors/Views.php
+++ b/system/Debug/Toolbar/Collectors/Views.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php
index f6366958e1be..1c84ee541bd6 100644
--- a/system/Debug/Toolbar/Views/toolbar.tpl.php
+++ b/system/Debug/Toolbar/Views/toolbar.tpl.php
@@ -17,7 +17,6 @@
  * @var array                      $styles
  * @var \CodeIgniter\View\Parser   $parser
  */
-
 ?>
 <style type="text/css">
 	<?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . '/toolbar.css')) ?>
diff --git a/system/Email/Email.php b/system/Email/Email.php
index 788400c9878d..569bdb2b82f0 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Email;
diff --git a/system/Encryption/EncrypterInterface.php b/system/Encryption/EncrypterInterface.php
index 2c5efddecfda..32dc8644926d 100644
--- a/system/Encryption/EncrypterInterface.php
+++ b/system/Encryption/EncrypterInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Encryption;
diff --git a/system/Encryption/Encryption.php b/system/Encryption/Encryption.php
index f93546162115..1663abe93eab 100644
--- a/system/Encryption/Encryption.php
+++ b/system/Encryption/Encryption.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Encryption;
diff --git a/system/Encryption/Exceptions/EncryptionException.php b/system/Encryption/Exceptions/EncryptionException.php
index ff9b9b90260f..808e7c472ac5 100644
--- a/system/Encryption/Exceptions/EncryptionException.php
+++ b/system/Encryption/Exceptions/EncryptionException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Encryption\Exceptions;
diff --git a/system/Encryption/Handlers/BaseHandler.php b/system/Encryption/Handlers/BaseHandler.php
index 7caad11708b9..7c332b8f7217 100644
--- a/system/Encryption/Handlers/BaseHandler.php
+++ b/system/Encryption/Handlers/BaseHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Encryption\Handlers;
diff --git a/system/Encryption/Handlers/OpenSSLHandler.php b/system/Encryption/Handlers/OpenSSLHandler.php
index c27c4e0b09a9..dac36dc71dc7 100644
--- a/system/Encryption/Handlers/OpenSSLHandler.php
+++ b/system/Encryption/Handlers/OpenSSLHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Encryption\Handlers;
diff --git a/system/Encryption/Handlers/SodiumHandler.php b/system/Encryption/Handlers/SodiumHandler.php
index b2197f0d1227..f6903a3bed6b 100644
--- a/system/Encryption/Handlers/SodiumHandler.php
+++ b/system/Encryption/Handlers/SodiumHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Encryption\Handlers;
diff --git a/system/Entity.php b/system/Entity.php
index e1a2be7002fa..94aa7241ffaf 100644
--- a/system/Entity.php
+++ b/system/Entity.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter;
diff --git a/system/Entity/Cast/ArrayCast.php b/system/Entity/Cast/ArrayCast.php
index 67a18bd07e73..315f2e582fec 100644
--- a/system/Entity/Cast/ArrayCast.php
+++ b/system/Entity/Cast/ArrayCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
diff --git a/system/Entity/Cast/BaseCast.php b/system/Entity/Cast/BaseCast.php
index f7597ee78853..c79dfc5f56b4 100644
--- a/system/Entity/Cast/BaseCast.php
+++ b/system/Entity/Cast/BaseCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
diff --git a/system/Entity/Cast/BooleanCast.php b/system/Entity/Cast/BooleanCast.php
index cca9d4f2cde7..f46f5f5326bb 100644
--- a/system/Entity/Cast/BooleanCast.php
+++ b/system/Entity/Cast/BooleanCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
diff --git a/system/Entity/Cast/CSVCast.php b/system/Entity/Cast/CSVCast.php
index ee8a8764fefd..ba2414273543 100644
--- a/system/Entity/Cast/CSVCast.php
+++ b/system/Entity/Cast/CSVCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
diff --git a/system/Entity/Cast/CastInterface.php b/system/Entity/Cast/CastInterface.php
index 46bc74dc34ca..e4a36384dba0 100644
--- a/system/Entity/Cast/CastInterface.php
+++ b/system/Entity/Cast/CastInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
diff --git a/system/Entity/Cast/DatetimeCast.php b/system/Entity/Cast/DatetimeCast.php
index d805a4ea5c00..4655b4e374e3 100644
--- a/system/Entity/Cast/DatetimeCast.php
+++ b/system/Entity/Cast/DatetimeCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
diff --git a/system/Entity/Cast/FloatCast.php b/system/Entity/Cast/FloatCast.php
index b69bf74e14ac..78f87570f32c 100644
--- a/system/Entity/Cast/FloatCast.php
+++ b/system/Entity/Cast/FloatCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
diff --git a/system/Entity/Cast/IntegerCast.php b/system/Entity/Cast/IntegerCast.php
index 8d645bd53f80..b9357d7ed49b 100644
--- a/system/Entity/Cast/IntegerCast.php
+++ b/system/Entity/Cast/IntegerCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
diff --git a/system/Entity/Cast/JsonCast.php b/system/Entity/Cast/JsonCast.php
index c892a4fd9d7a..534631be6167 100644
--- a/system/Entity/Cast/JsonCast.php
+++ b/system/Entity/Cast/JsonCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
diff --git a/system/Entity/Cast/ObjectCast.php b/system/Entity/Cast/ObjectCast.php
index fe5802c4d5ab..0a22ed8a4a36 100644
--- a/system/Entity/Cast/ObjectCast.php
+++ b/system/Entity/Cast/ObjectCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
diff --git a/system/Entity/Cast/StringCast.php b/system/Entity/Cast/StringCast.php
index d45327c437fb..974567ccb62a 100644
--- a/system/Entity/Cast/StringCast.php
+++ b/system/Entity/Cast/StringCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
diff --git a/system/Entity/Cast/TimestampCast.php b/system/Entity/Cast/TimestampCast.php
index 8329c36200f7..f9669d592eb7 100644
--- a/system/Entity/Cast/TimestampCast.php
+++ b/system/Entity/Cast/TimestampCast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
diff --git a/system/Entity/Cast/URICast.php b/system/Entity/Cast/URICast.php
index e6a00162d0d3..bb49e7454ddf 100644
--- a/system/Entity/Cast/URICast.php
+++ b/system/Entity/Cast/URICast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Cast;
diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index 1ecbec0d8667..4d6c31f41f73 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity;
diff --git a/system/Entity/Exceptions/CastException.php b/system/Entity/Exceptions/CastException.php
index 4d9fde2d1b90..296a8a833ca5 100644
--- a/system/Entity/Exceptions/CastException.php
+++ b/system/Entity/Exceptions/CastException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Entity\Exceptions;
diff --git a/system/Events/Events.php b/system/Events/Events.php
index 97d58824e546..0b25f22c7d4b 100644
--- a/system/Events/Events.php
+++ b/system/Events/Events.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Events;
diff --git a/system/Exceptions/AlertError.php b/system/Exceptions/AlertError.php
index 7e2e8df7e2a1..274bb73c562f 100644
--- a/system/Exceptions/AlertError.php
+++ b/system/Exceptions/AlertError.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Exceptions;
diff --git a/system/Exceptions/CastException.php b/system/Exceptions/CastException.php
index 50056a22a885..5e41631536c7 100644
--- a/system/Exceptions/CastException.php
+++ b/system/Exceptions/CastException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Exceptions;
diff --git a/system/Exceptions/ConfigException.php b/system/Exceptions/ConfigException.php
index e4473152d707..41ae4959e594 100644
--- a/system/Exceptions/ConfigException.php
+++ b/system/Exceptions/ConfigException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Exceptions;
diff --git a/system/Exceptions/CriticalError.php b/system/Exceptions/CriticalError.php
index c8355721a8ff..b5129bde0c1c 100644
--- a/system/Exceptions/CriticalError.php
+++ b/system/Exceptions/CriticalError.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Exceptions;
diff --git a/system/Exceptions/DebugTraceableTrait.php b/system/Exceptions/DebugTraceableTrait.php
index 16174caae4ec..5c83d93d42a9 100644
--- a/system/Exceptions/DebugTraceableTrait.php
+++ b/system/Exceptions/DebugTraceableTrait.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Exceptions;
 
 use Throwable;
diff --git a/system/Exceptions/DownloadException.php b/system/Exceptions/DownloadException.php
index 9a4a96be19f1..c830891ed5a9 100644
--- a/system/Exceptions/DownloadException.php
+++ b/system/Exceptions/DownloadException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Exceptions;
diff --git a/system/Exceptions/EmergencyError.php b/system/Exceptions/EmergencyError.php
index 0ec9c5beaf87..db3e25e66877 100644
--- a/system/Exceptions/EmergencyError.php
+++ b/system/Exceptions/EmergencyError.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Exceptions;
diff --git a/system/Exceptions/ExceptionInterface.php b/system/Exceptions/ExceptionInterface.php
index 75cf7868bacd..be8ac692663a 100644
--- a/system/Exceptions/ExceptionInterface.php
+++ b/system/Exceptions/ExceptionInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Exceptions;
@@ -17,7 +17,6 @@
  *
  * catch (\CodeIgniter\Exceptions\ExceptionInterface) { ... }
  */
-
 interface ExceptionInterface
 {
 }
diff --git a/system/Exceptions/FrameworkException.php b/system/Exceptions/FrameworkException.php
index 3f3333e2de09..744f4f906d89 100644
--- a/system/Exceptions/FrameworkException.php
+++ b/system/Exceptions/FrameworkException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Exceptions;
diff --git a/system/Exceptions/ModelException.php b/system/Exceptions/ModelException.php
index 658a58912fcc..7ef6f7a808b9 100644
--- a/system/Exceptions/ModelException.php
+++ b/system/Exceptions/ModelException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Exceptions;
@@ -14,7 +14,6 @@
 /**
  * Model Exceptions.
  */
-
 class ModelException extends FrameworkException
 {
     public static function forNoPrimaryKey(string $modelName)
diff --git a/system/Exceptions/PageNotFoundException.php b/system/Exceptions/PageNotFoundException.php
index 6c9bd0c251b8..444776c087a2 100644
--- a/system/Exceptions/PageNotFoundException.php
+++ b/system/Exceptions/PageNotFoundException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Exceptions;
diff --git a/system/Files/Exceptions/FileException.php b/system/Files/Exceptions/FileException.php
index cbedd0e46ec1..bbbdc1a3cbb1 100644
--- a/system/Files/Exceptions/FileException.php
+++ b/system/Files/Exceptions/FileException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Files\Exceptions;
diff --git a/system/Files/Exceptions/FileNotFoundException.php b/system/Files/Exceptions/FileNotFoundException.php
index 6936c84d6b46..1e0a50f0bd3f 100644
--- a/system/Files/Exceptions/FileNotFoundException.php
+++ b/system/Files/Exceptions/FileNotFoundException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Files\Exceptions;
diff --git a/system/Files/File.php b/system/Files/File.php
index 9bf5dd989380..579e412075e1 100644
--- a/system/Files/File.php
+++ b/system/Files/File.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Files;
diff --git a/system/Filters/CSRF.php b/system/Filters/CSRF.php
index 846bfd8acbf0..518fdc48124b 100644
--- a/system/Filters/CSRF.php
+++ b/system/Filters/CSRF.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Filters;
diff --git a/system/Filters/DebugToolbar.php b/system/Filters/DebugToolbar.php
index 8aca2ecc7a3f..941685ebe8ff 100644
--- a/system/Filters/DebugToolbar.php
+++ b/system/Filters/DebugToolbar.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Filters;
diff --git a/system/Filters/Exceptions/FilterException.php b/system/Filters/Exceptions/FilterException.php
index a5b652387ff3..6bdef40555df 100644
--- a/system/Filters/Exceptions/FilterException.php
+++ b/system/Filters/Exceptions/FilterException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Filters\Exceptions;
diff --git a/system/Filters/FilterInterface.php b/system/Filters/FilterInterface.php
index a0daa08ec472..ffadc19e70f2 100644
--- a/system/Filters/FilterInterface.php
+++ b/system/Filters/FilterInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Filters;
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index a2688aa11d5e..b6cc9bb98cd0 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Filters;
diff --git a/system/Filters/Honeypot.php b/system/Filters/Honeypot.php
index fe220f84e461..f4046d1cd84f 100644
--- a/system/Filters/Honeypot.php
+++ b/system/Filters/Honeypot.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Filters;
diff --git a/system/Format/Exceptions/FormatException.php b/system/Format/Exceptions/FormatException.php
index a4fa3ea0dde7..c22626f4ad1d 100644
--- a/system/Format/Exceptions/FormatException.php
+++ b/system/Format/Exceptions/FormatException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Format\Exceptions;
diff --git a/system/Format/Format.php b/system/Format/Format.php
index f06332f1c6b4..c95ae291cf9d 100644
--- a/system/Format/Format.php
+++ b/system/Format/Format.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Format;
diff --git a/system/Format/FormatterInterface.php b/system/Format/FormatterInterface.php
index ea7434451794..04ba3e8973e9 100644
--- a/system/Format/FormatterInterface.php
+++ b/system/Format/FormatterInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Format;
diff --git a/system/Format/JSONFormatter.php b/system/Format/JSONFormatter.php
index 3b7bb784dc66..b9b3daaebb25 100644
--- a/system/Format/JSONFormatter.php
+++ b/system/Format/JSONFormatter.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Format;
diff --git a/system/Format/XMLFormatter.php b/system/Format/XMLFormatter.php
index ad129374687b..0fad104e89d0 100644
--- a/system/Format/XMLFormatter.php
+++ b/system/Format/XMLFormatter.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Format;
diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
index e25285f6ee6b..c8b59256dff9 100644
--- a/system/HTTP/CLIRequest.php
+++ b/system/HTTP/CLIRequest.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index be2ef7a21f59..c6df75354b83 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index f1fffb0c1aad..19b194842acb 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
diff --git a/system/HTTP/DownloadResponse.php b/system/HTTP/DownloadResponse.php
index b42db81dd94c..bc1825442769 100644
--- a/system/HTTP/DownloadResponse.php
+++ b/system/HTTP/DownloadResponse.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
diff --git a/system/HTTP/Exceptions/HTTPException.php b/system/HTTP/Exceptions/HTTPException.php
index 471e210efb90..cfed948a117f 100644
--- a/system/HTTP/Exceptions/HTTPException.php
+++ b/system/HTTP/Exceptions/HTTPException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP\Exceptions;
diff --git a/system/HTTP/Files/FileCollection.php b/system/HTTP/Files/FileCollection.php
index ce21aca1bc60..208717c82850 100644
--- a/system/HTTP/Files/FileCollection.php
+++ b/system/HTTP/Files/FileCollection.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP\Files;
diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
index 58088444ea8f..0fbdea83dcb6 100644
--- a/system/HTTP/Files/UploadedFile.php
+++ b/system/HTTP/Files/UploadedFile.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP\Files;
diff --git a/system/HTTP/Files/UploadedFileInterface.php b/system/HTTP/Files/UploadedFileInterface.php
index 16a4de164049..c6a06e4e45ed 100644
--- a/system/HTTP/Files/UploadedFileInterface.php
+++ b/system/HTTP/Files/UploadedFileInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP\Files;
diff --git a/system/HTTP/Header.php b/system/HTTP/Header.php
index 17365618dd0f..402eabf65e9b 100644
--- a/system/HTTP/Header.php
+++ b/system/HTTP/Header.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 125081db3803..2357bf2da8ac 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
diff --git a/system/HTTP/Message.php b/system/HTTP/Message.php
index a39d5c551809..37c2e7d19c20 100644
--- a/system/HTTP/Message.php
+++ b/system/HTTP/Message.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
diff --git a/system/HTTP/MessageInterface.php b/system/HTTP/MessageInterface.php
index 5fe9de72c0e9..d5cd77066723 100644
--- a/system/HTTP/MessageInterface.php
+++ b/system/HTTP/MessageInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
diff --git a/system/HTTP/MessageTrait.php b/system/HTTP/MessageTrait.php
index 6cb145d8d6b4..9f2cd2447e37 100644
--- a/system/HTTP/MessageTrait.php
+++ b/system/HTTP/MessageTrait.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
diff --git a/system/HTTP/Negotiate.php b/system/HTTP/Negotiate.php
index cd15c04c8519..ef87f738c1ad 100644
--- a/system/HTTP/Negotiate.php
+++ b/system/HTTP/Negotiate.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
diff --git a/system/HTTP/RedirectResponse.php b/system/HTTP/RedirectResponse.php
index 264f769d32ed..3ff94ce94080 100644
--- a/system/HTTP/RedirectResponse.php
+++ b/system/HTTP/RedirectResponse.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
diff --git a/system/HTTP/Request.php b/system/HTTP/Request.php
index a240b985756a..d6db28d59007 100644
--- a/system/HTTP/Request.php
+++ b/system/HTTP/Request.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
diff --git a/system/HTTP/RequestInterface.php b/system/HTTP/RequestInterface.php
index 7b49519fe028..a1f77b64613a 100644
--- a/system/HTTP/RequestInterface.php
+++ b/system/HTTP/RequestInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php
index 4bb7d109a614..9a6e151997a7 100644
--- a/system/HTTP/RequestTrait.php
+++ b/system/HTTP/RequestTrait.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php
index f0bcb7048d90..a96829cc0df4 100644
--- a/system/HTTP/Response.php
+++ b/system/HTTP/Response.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
diff --git a/system/HTTP/ResponseInterface.php b/system/HTTP/ResponseInterface.php
index c2c02296bba6..92b38c688782 100644
--- a/system/HTTP/ResponseInterface.php
+++ b/system/HTTP/ResponseInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
index a96045a550b1..2bb0cac68aa3 100644
--- a/system/HTTP/ResponseTrait.php
+++ b/system/HTTP/ResponseTrait.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index da395c3c6ceb..a0a867553182 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
diff --git a/system/HTTP/UserAgent.php b/system/HTTP/UserAgent.php
index 85baf2539455..4c85398ae991 100644
--- a/system/HTTP/UserAgent.php
+++ b/system/HTTP/UserAgent.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\HTTP;
diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php
index 7855cf288dfe..e144e278335c 100644
--- a/system/Helpers/array_helper.php
+++ b/system/Helpers/array_helper.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // CodeIgniter Array Helpers
diff --git a/system/Helpers/cookie_helper.php b/system/Helpers/cookie_helper.php
index 1af54dcbca5f..c5d582c65cd3 100755
--- a/system/Helpers/cookie_helper.php
+++ b/system/Helpers/cookie_helper.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use Config\App;
diff --git a/system/Helpers/date_helper.php b/system/Helpers/date_helper.php
index 2a2dc42780de..1312f6110348 100644
--- a/system/Helpers/date_helper.php
+++ b/system/Helpers/date_helper.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // CodeIgniter Date Helpers
diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php
index 18000cc756e9..e7383059205d 100644
--- a/system/Helpers/filesystem_helper.php
+++ b/system/Helpers/filesystem_helper.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // CodeIgniter File System Helpers
diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
index 1f46a4e066b9..c0c5416931e6 100644
--- a/system/Helpers/form_helper.php
+++ b/system/Helpers/form_helper.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use Config\App;
diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
index 20e4a6560cfd..036c7c5d69cf 100755
--- a/system/Helpers/html_helper.php
+++ b/system/Helpers/html_helper.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use CodeIgniter\Files\Exceptions\FileNotFoundException;
diff --git a/system/Helpers/inflector_helper.php b/system/Helpers/inflector_helper.php
index 0312bb5de211..a017a3fd060c 100755
--- a/system/Helpers/inflector_helper.php
+++ b/system/Helpers/inflector_helper.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // CodeIgniter Inflector Helpers
diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
index a5dc5a4185bf..382ff0c01fc1 100644
--- a/system/Helpers/number_helper.php
+++ b/system/Helpers/number_helper.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use Config\Services;
diff --git a/system/Helpers/security_helper.php b/system/Helpers/security_helper.php
index 5ad050375a73..0c457971197d 100644
--- a/system/Helpers/security_helper.php
+++ b/system/Helpers/security_helper.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use Config\Services;
diff --git a/system/Helpers/test_helper.php b/system/Helpers/test_helper.php
index 36cd71652fe9..38b72519fd56 100644
--- a/system/Helpers/test_helper.php
+++ b/system/Helpers/test_helper.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use CodeIgniter\Model;
diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index 230191ba1869..ee399627d8e5 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use Config\ForeignCharacters;
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
index e9d5c4bdd711..c5af264ebe03 100644
--- a/system/Helpers/url_helper.php
+++ b/system/Helpers/url_helper.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use CodeIgniter\HTTP\IncomingRequest;
diff --git a/system/Helpers/xml_helper.php b/system/Helpers/xml_helper.php
index 29c1c14c8797..28d1e3d1ad65 100644
--- a/system/Helpers/xml_helper.php
+++ b/system/Helpers/xml_helper.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // CodeIgniter XML Helpers
diff --git a/system/Honeypot/Exceptions/HoneypotException.php b/system/Honeypot/Exceptions/HoneypotException.php
index 65ac6c61a881..8d8510eca8fa 100644
--- a/system/Honeypot/Exceptions/HoneypotException.php
+++ b/system/Honeypot/Exceptions/HoneypotException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Honeypot\Exceptions;
diff --git a/system/Honeypot/Honeypot.php b/system/Honeypot/Honeypot.php
index ef5a2b0d5fbc..5f44528ca482 100644
--- a/system/Honeypot/Honeypot.php
+++ b/system/Honeypot/Honeypot.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Honeypot;
diff --git a/system/I18n/Exceptions/I18nException.php b/system/I18n/Exceptions/I18nException.php
index f7dce252dfcb..0909a5e653af 100644
--- a/system/I18n/Exceptions/I18nException.php
+++ b/system/I18n/Exceptions/I18nException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\I18n\Exceptions;
diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index 92203a793d9f..5f72edf36e3c 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\I18n;
diff --git a/system/I18n/TimeDifference.php b/system/I18n/TimeDifference.php
index 6d4a0f2f04d4..85656a8ca941 100644
--- a/system/I18n/TimeDifference.php
+++ b/system/I18n/TimeDifference.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\I18n;
diff --git a/system/Images/Exceptions/ImageException.php b/system/Images/Exceptions/ImageException.php
index 58946167f254..3343f6d0c806 100644
--- a/system/Images/Exceptions/ImageException.php
+++ b/system/Images/Exceptions/ImageException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Images\Exceptions;
diff --git a/system/Images/Handlers/BaseHandler.php b/system/Images/Handlers/BaseHandler.php
index 1cd35c7ed145..887b6d4fd7e9 100644
--- a/system/Images/Handlers/BaseHandler.php
+++ b/system/Images/Handlers/BaseHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Images\Handlers;
diff --git a/system/Images/Handlers/GDHandler.php b/system/Images/Handlers/GDHandler.php
index ef7e2b459680..7dac610b3557 100644
--- a/system/Images/Handlers/GDHandler.php
+++ b/system/Images/Handlers/GDHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Images\Handlers;
diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php
index 581a4092f6a5..2ae46284237d 100644
--- a/system/Images/Handlers/ImageMagickHandler.php
+++ b/system/Images/Handlers/ImageMagickHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Images\Handlers;
diff --git a/system/Images/Image.php b/system/Images/Image.php
index e43bc24f53d8..11b6a8175174 100644
--- a/system/Images/Image.php
+++ b/system/Images/Image.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Images;
diff --git a/system/Images/ImageHandlerInterface.php b/system/Images/ImageHandlerInterface.php
index e701e4dfa2c4..1f98cff153e4 100644
--- a/system/Images/ImageHandlerInterface.php
+++ b/system/Images/ImageHandlerInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Images;
diff --git a/system/Language/Language.php b/system/Language/Language.php
index 020f48e95581..226e16a895f3 100644
--- a/system/Language/Language.php
+++ b/system/Language/Language.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Language;
diff --git a/system/Language/en/CLI.php b/system/Language/en/CLI.php
index b7c8bdaba422..c8f7ecae081d 100644
--- a/system/Language/en/CLI.php
+++ b/system/Language/en/CLI.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // CLI language settings
diff --git a/system/Language/en/Cache.php b/system/Language/en/Cache.php
index 991dfd9ca341..d119223a837f 100644
--- a/system/Language/en/Cache.php
+++ b/system/Language/en/Cache.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Cache language settings
diff --git a/system/Language/en/Cast.php b/system/Language/en/Cast.php
index 4effcc04f8a9..46132b0ec801 100644
--- a/system/Language/en/Cast.php
+++ b/system/Language/en/Cast.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Cast language settings
diff --git a/system/Language/en/Cookie.php b/system/Language/en/Cookie.php
index 4014190c9cb2..3de21a0fda01 100644
--- a/system/Language/en/Cookie.php
+++ b/system/Language/en/Cookie.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Cookie language settings
diff --git a/system/Language/en/Core.php b/system/Language/en/Core.php
index 8b78b914a790..f292bb833a01 100644
--- a/system/Language/en/Core.php
+++ b/system/Language/en/Core.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Core language settings
diff --git a/system/Language/en/Database.php b/system/Language/en/Database.php
index e2f36762d17b..f57f7dc598cc 100644
--- a/system/Language/en/Database.php
+++ b/system/Language/en/Database.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Database language settings
diff --git a/system/Language/en/Email.php b/system/Language/en/Email.php
index 1897f3baa6a6..16ff832ee8a8 100644
--- a/system/Language/en/Email.php
+++ b/system/Language/en/Email.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Email language settings
diff --git a/system/Language/en/Encryption.php b/system/Language/en/Encryption.php
index 44a8ad53d493..269974fc885d 100644
--- a/system/Language/en/Encryption.php
+++ b/system/Language/en/Encryption.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Encryption language settings
diff --git a/system/Language/en/Fabricator.php b/system/Language/en/Fabricator.php
index 7a541ed080bf..94140af339b2 100644
--- a/system/Language/en/Fabricator.php
+++ b/system/Language/en/Fabricator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Fabricator language settings
diff --git a/system/Language/en/Files.php b/system/Language/en/Files.php
index ccb9ab306876..924e98ea354a 100644
--- a/system/Language/en/Files.php
+++ b/system/Language/en/Files.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Files language settings
diff --git a/system/Language/en/Filters.php b/system/Language/en/Filters.php
index 6a5f683c8f3b..fc59eaf8d005 100644
--- a/system/Language/en/Filters.php
+++ b/system/Language/en/Filters.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Filters language settings
diff --git a/system/Language/en/Format.php b/system/Language/en/Format.php
index 27e3a1713889..8c06207e80d4 100644
--- a/system/Language/en/Format.php
+++ b/system/Language/en/Format.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Format language settings
diff --git a/system/Language/en/HTTP.php b/system/Language/en/HTTP.php
index ec5dad341e05..8902b8ea4d89 100644
--- a/system/Language/en/HTTP.php
+++ b/system/Language/en/HTTP.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // HTTP language settings
diff --git a/system/Language/en/Images.php b/system/Language/en/Images.php
index c5387187aa59..e31804ab4159 100644
--- a/system/Language/en/Images.php
+++ b/system/Language/en/Images.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Images language settings
diff --git a/system/Language/en/Log.php b/system/Language/en/Log.php
index 69b3261a9172..154d402b6c95 100644
--- a/system/Language/en/Log.php
+++ b/system/Language/en/Log.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Log language settings
diff --git a/system/Language/en/Migrations.php b/system/Language/en/Migrations.php
index faa57a1f989a..1e9ef6316d37 100644
--- a/system/Language/en/Migrations.php
+++ b/system/Language/en/Migrations.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Migration language settings
diff --git a/system/Language/en/Number.php b/system/Language/en/Number.php
index d9e77586c0a4..c1660fdd49a5 100644
--- a/system/Language/en/Number.php
+++ b/system/Language/en/Number.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Number language settings
diff --git a/system/Language/en/Pager.php b/system/Language/en/Pager.php
index 94678fb039b6..81e6d2627cf5 100644
--- a/system/Language/en/Pager.php
+++ b/system/Language/en/Pager.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Pager language settings
diff --git a/system/Language/en/RESTful.php b/system/Language/en/RESTful.php
index 1122478bcbe3..b3ac05e89b91 100644
--- a/system/Language/en/RESTful.php
+++ b/system/Language/en/RESTful.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // RESTful language settings
diff --git a/system/Language/en/Router.php b/system/Language/en/Router.php
index 42c1fcb242ea..9f6cdb700f04 100644
--- a/system/Language/en/Router.php
+++ b/system/Language/en/Router.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Router language settings
diff --git a/system/Language/en/Security.php b/system/Language/en/Security.php
index fdcdf3865cd9..5abec93db367 100644
--- a/system/Language/en/Security.php
+++ b/system/Language/en/Security.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Security language settings
diff --git a/system/Language/en/Session.php b/system/Language/en/Session.php
index 201a2f516e6a..527d2e9c7cea 100644
--- a/system/Language/en/Session.php
+++ b/system/Language/en/Session.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Session language settings
diff --git a/system/Language/en/Time.php b/system/Language/en/Time.php
index faadd9b7d96b..decee74fb844 100644
--- a/system/Language/en/Time.php
+++ b/system/Language/en/Time.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Time language settings
diff --git a/system/Language/en/Validation.php b/system/Language/en/Validation.php
index f57ece4a55ea..e4fa3a64688d 100644
--- a/system/Language/en/Validation.php
+++ b/system/Language/en/Validation.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Validation language settings
diff --git a/system/Language/en/View.php b/system/Language/en/View.php
index 998368784e59..df42d1fa3f0e 100644
--- a/system/Language/en/View.php
+++ b/system/Language/en/View.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // View language settings
diff --git a/system/Log/Exceptions/LogException.php b/system/Log/Exceptions/LogException.php
index 83995ed6990c..f79763622cc7 100644
--- a/system/Log/Exceptions/LogException.php
+++ b/system/Log/Exceptions/LogException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Log\Exceptions;
diff --git a/system/Log/Handlers/BaseHandler.php b/system/Log/Handlers/BaseHandler.php
index af915aa547b0..5f03c7264f5b 100644
--- a/system/Log/Handlers/BaseHandler.php
+++ b/system/Log/Handlers/BaseHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Log\Handlers;
diff --git a/system/Log/Handlers/ChromeLoggerHandler.php b/system/Log/Handlers/ChromeLoggerHandler.php
index e8488b54a459..25d541efb4bc 100644
--- a/system/Log/Handlers/ChromeLoggerHandler.php
+++ b/system/Log/Handlers/ChromeLoggerHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Log\Handlers;
diff --git a/system/Log/Handlers/ErrorlogHandler.php b/system/Log/Handlers/ErrorlogHandler.php
index 0cdc9e540a00..078b1cd11727 100644
--- a/system/Log/Handlers/ErrorlogHandler.php
+++ b/system/Log/Handlers/ErrorlogHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Log\Handlers;
diff --git a/system/Log/Handlers/FileHandler.php b/system/Log/Handlers/FileHandler.php
index 221787af127f..2e519a1448c0 100644
--- a/system/Log/Handlers/FileHandler.php
+++ b/system/Log/Handlers/FileHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Log\Handlers;
diff --git a/system/Log/Handlers/HandlerInterface.php b/system/Log/Handlers/HandlerInterface.php
index 5ea2ee3c4098..978c36a56fc9 100644
--- a/system/Log/Handlers/HandlerInterface.php
+++ b/system/Log/Handlers/HandlerInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Log\Handlers;
diff --git a/system/Log/Logger.php b/system/Log/Logger.php
index 24f8fa0ee6a2..85f56ed186bb 100644
--- a/system/Log/Logger.php
+++ b/system/Log/Logger.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Log;
diff --git a/system/Model.php b/system/Model.php
index e8ccdce86316..a18953020d0c 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter;
diff --git a/system/Modules/Modules.php b/system/Modules/Modules.php
index 4efa40809c69..f8de857c6fc0 100644
--- a/system/Modules/Modules.php
+++ b/system/Modules/Modules.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Modules;
diff --git a/system/Pager/Exceptions/PagerException.php b/system/Pager/Exceptions/PagerException.php
index 9da0ec4b5591..b1cb6072816f 100644
--- a/system/Pager/Exceptions/PagerException.php
+++ b/system/Pager/Exceptions/PagerException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Pager\Exceptions;
diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
index 6dc68009477d..d1375781688f 100644
--- a/system/Pager/Pager.php
+++ b/system/Pager/Pager.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Pager;
diff --git a/system/Pager/PagerInterface.php b/system/Pager/PagerInterface.php
index 4bd7a9af1dce..1a8268d43a18 100644
--- a/system/Pager/PagerInterface.php
+++ b/system/Pager/PagerInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Pager;
diff --git a/system/Pager/PagerRenderer.php b/system/Pager/PagerRenderer.php
index 730cd933af56..681e7c697211 100644
--- a/system/Pager/PagerRenderer.php
+++ b/system/Pager/PagerRenderer.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Pager;
diff --git a/system/Pager/Views/default_head.php b/system/Pager/Views/default_head.php
index 6de7120240bd..c233e5eace22 100644
--- a/system/Pager/Views/default_head.php
+++ b/system/Pager/Views/default_head.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use CodeIgniter\Pager\PagerRenderer;
diff --git a/system/RESTful/BaseResource.php b/system/RESTful/BaseResource.php
index 7d347f533e41..0c7bc37f16c4 100644
--- a/system/RESTful/BaseResource.php
+++ b/system/RESTful/BaseResource.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\RESTful;
diff --git a/system/RESTful/ResourceController.php b/system/RESTful/ResourceController.php
index 73a710f6ff94..da72be0ea849 100644
--- a/system/RESTful/ResourceController.php
+++ b/system/RESTful/ResourceController.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\RESTful;
diff --git a/system/RESTful/ResourcePresenter.php b/system/RESTful/ResourcePresenter.php
index df0496ac479f..467e2687c40d 100644
--- a/system/RESTful/ResourcePresenter.php
+++ b/system/RESTful/ResourcePresenter.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\RESTful;
diff --git a/system/Router/Exceptions/RedirectException.php b/system/Router/Exceptions/RedirectException.php
index 9c7015cf53d4..b2456f367676 100644
--- a/system/Router/Exceptions/RedirectException.php
+++ b/system/Router/Exceptions/RedirectException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Router\Exceptions;
diff --git a/system/Router/Exceptions/RouterException.php b/system/Router/Exceptions/RouterException.php
index 4be2e622515f..bd657a335ded 100644
--- a/system/Router/Exceptions/RouterException.php
+++ b/system/Router/Exceptions/RouterException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Router\Exceptions;
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 2edced3b4255..639df606dd9a 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Router;
diff --git a/system/Router/RouteCollectionInterface.php b/system/Router/RouteCollectionInterface.php
index cc9003f6ddbf..d07328479214 100644
--- a/system/Router/RouteCollectionInterface.php
+++ b/system/Router/RouteCollectionInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Router;
diff --git a/system/Router/Router.php b/system/Router/Router.php
index f7c2915c4154..292e11bf47c8 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Router;
diff --git a/system/Router/RouterInterface.php b/system/Router/RouterInterface.php
index 28002b250a21..5a208240ce8c 100644
--- a/system/Router/RouterInterface.php
+++ b/system/Router/RouterInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Router;
diff --git a/system/Security/Exceptions/SecurityException.php b/system/Security/Exceptions/SecurityException.php
index f1365de97b5b..254f3ec345f5 100644
--- a/system/Security/Exceptions/SecurityException.php
+++ b/system/Security/Exceptions/SecurityException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Security\Exceptions;
diff --git a/system/Security/Security.php b/system/Security/Security.php
index c6a300abb146..bbc25372633f 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Security;
diff --git a/system/Security/SecurityInterface.php b/system/Security/SecurityInterface.php
index eeb400cebd53..97c1c2b23db5 100644
--- a/system/Security/SecurityInterface.php
+++ b/system/Security/SecurityInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Security;
diff --git a/system/Session/Exceptions/SessionException.php b/system/Session/Exceptions/SessionException.php
index 9ae07af933f0..af619c2c198b 100644
--- a/system/Session/Exceptions/SessionException.php
+++ b/system/Session/Exceptions/SessionException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session\Exceptions;
diff --git a/system/Session/Handlers/ArrayHandler.php b/system/Session/Handlers/ArrayHandler.php
index adce88b400ea..2718b7204cc6 100644
--- a/system/Session/Handlers/ArrayHandler.php
+++ b/system/Session/Handlers/ArrayHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session\Handlers;
diff --git a/system/Session/Handlers/BaseHandler.php b/system/Session/Handlers/BaseHandler.php
index bfd524ea348e..856a5bc88002 100644
--- a/system/Session/Handlers/BaseHandler.php
+++ b/system/Session/Handlers/BaseHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session\Handlers;
diff --git a/system/Session/Handlers/DatabaseHandler.php b/system/Session/Handlers/DatabaseHandler.php
index 902a3f415cc7..c9e922839ec9 100644
--- a/system/Session/Handlers/DatabaseHandler.php
+++ b/system/Session/Handlers/DatabaseHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session\Handlers;
diff --git a/system/Session/Handlers/FileHandler.php b/system/Session/Handlers/FileHandler.php
index c3f2124cd11c..d6a6cb26170f 100644
--- a/system/Session/Handlers/FileHandler.php
+++ b/system/Session/Handlers/FileHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session\Handlers;
diff --git a/system/Session/Handlers/MemcachedHandler.php b/system/Session/Handlers/MemcachedHandler.php
index 5fa801362a46..a6bca2ce6946 100644
--- a/system/Session/Handlers/MemcachedHandler.php
+++ b/system/Session/Handlers/MemcachedHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session\Handlers;
diff --git a/system/Session/Handlers/RedisHandler.php b/system/Session/Handlers/RedisHandler.php
index 070b5d6e2789..98b3c93522d5 100644
--- a/system/Session/Handlers/RedisHandler.php
+++ b/system/Session/Handlers/RedisHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session\Handlers;
diff --git a/system/Session/Session.php b/system/Session/Session.php
index 893833247566..b77d581d6206 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session;
diff --git a/system/Session/SessionInterface.php b/system/Session/SessionInterface.php
index 090528ae00ea..7f2319d2c941 100644
--- a/system/Session/SessionInterface.php
+++ b/system/Session/SessionInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Session;
diff --git a/system/Test/CIDatabaseTestCase.php b/system/Test/CIDatabaseTestCase.php
index 932eb1aeeeaf..8e25c3782dbb 100644
--- a/system/Test/CIDatabaseTestCase.php
+++ b/system/Test/CIDatabaseTestCase.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
index 2b2e9b9794e8..ecd6d2a04d4d 100644
--- a/system/Test/CIUnitTestCase.php
+++ b/system/Test/CIUnitTestCase.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
diff --git a/system/Test/Constraints/SeeInDatabase.php b/system/Test/Constraints/SeeInDatabase.php
index 16ab49cc41c2..eef8bd5be24b 100644
--- a/system/Test/Constraints/SeeInDatabase.php
+++ b/system/Test/Constraints/SeeInDatabase.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test\Constraints;
 
 use CodeIgniter\Database\ConnectionInterface;
diff --git a/system/Test/ControllerResponse.php b/system/Test/ControllerResponse.php
index aeb96fae87fa..a8635cc39a7a 100644
--- a/system/Test/ControllerResponse.php
+++ b/system/Test/ControllerResponse.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
diff --git a/system/Test/ControllerTestTrait.php b/system/Test/ControllerTestTrait.php
index 2a670c44eb6d..0035e3125d4f 100644
--- a/system/Test/ControllerTestTrait.php
+++ b/system/Test/ControllerTestTrait.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
diff --git a/system/Test/ControllerTester.php b/system/Test/ControllerTester.php
index b74af78cdb5a..2c8f806ce071 100644
--- a/system/Test/ControllerTester.php
+++ b/system/Test/ControllerTester.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
diff --git a/system/Test/DOMParser.php b/system/Test/DOMParser.php
index 5826e12f09b1..de5af99b526d 100644
--- a/system/Test/DOMParser.php
+++ b/system/Test/DOMParser.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
diff --git a/system/Test/DatabaseTestTrait.php b/system/Test/DatabaseTestTrait.php
index b39ec500d542..8d87cfc9b376 100644
--- a/system/Test/DatabaseTestTrait.php
+++ b/system/Test/DatabaseTestTrait.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
index 420288cb1296..09ba75f9a73a 100644
--- a/system/Test/Fabricator.php
+++ b/system/Test/Fabricator.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
diff --git a/system/Test/FeatureResponse.php b/system/Test/FeatureResponse.php
index 56ab7103fddd..971f41c5b6e4 100644
--- a/system/Test/FeatureResponse.php
+++ b/system/Test/FeatureResponse.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index 230382603669..6385b307a3d8 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php
index 07cec87893fa..936532515132 100644
--- a/system/Test/FeatureTestTrait.php
+++ b/system/Test/FeatureTestTrait.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
diff --git a/system/Test/FilterTestTrait.php b/system/Test/FilterTestTrait.php
index 3b9f73322aeb..903360851d80 100644
--- a/system/Test/FilterTestTrait.php
+++ b/system/Test/FilterTestTrait.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
diff --git a/system/Test/Filters/CITestStreamFilter.php b/system/Test/Filters/CITestStreamFilter.php
index fdb3682b5969..39ab2f7ca444 100644
--- a/system/Test/Filters/CITestStreamFilter.php
+++ b/system/Test/Filters/CITestStreamFilter.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Filters;
diff --git a/system/Test/Interfaces/FabricatorModel.php b/system/Test/Interfaces/FabricatorModel.php
index cb724d5345c5..08cf5a15a0d7 100644
--- a/system/Test/Interfaces/FabricatorModel.php
+++ b/system/Test/Interfaces/FabricatorModel.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Interfaces;
diff --git a/system/Test/Mock/MockAppConfig.php b/system/Test/Mock/MockAppConfig.php
index 7e12f66ad2dd..26fb350db12c 100644
--- a/system/Test/Mock/MockAppConfig.php
+++ b/system/Test/Mock/MockAppConfig.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockAutoload.php b/system/Test/Mock/MockAutoload.php
index 586e5aea7d68..26a92b2f811c 100644
--- a/system/Test/Mock/MockAutoload.php
+++ b/system/Test/Mock/MockAutoload.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockBuilder.php b/system/Test/Mock/MockBuilder.php
index 03ec9d6ebecf..a47d76b0f561 100644
--- a/system/Test/Mock/MockBuilder.php
+++ b/system/Test/Mock/MockBuilder.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockCLIConfig.php b/system/Test/Mock/MockCLIConfig.php
index 786bbb427b70..5c6e6b5db195 100644
--- a/system/Test/Mock/MockCLIConfig.php
+++ b/system/Test/Mock/MockCLIConfig.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockCURLRequest.php b/system/Test/Mock/MockCURLRequest.php
index e4058d559b81..5b7344fe13e5 100644
--- a/system/Test/Mock/MockCURLRequest.php
+++ b/system/Test/Mock/MockCURLRequest.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockCache.php b/system/Test/Mock/MockCache.php
index 7a8e0475369a..995687c9db00 100644
--- a/system/Test/Mock/MockCache.php
+++ b/system/Test/Mock/MockCache.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockCodeIgniter.php b/system/Test/Mock/MockCodeIgniter.php
index 7e7e39fe6eb6..bf2f54afdee0 100644
--- a/system/Test/Mock/MockCodeIgniter.php
+++ b/system/Test/Mock/MockCodeIgniter.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockCommon.php b/system/Test/Mock/MockCommon.php
index bc11326f752d..4b76b7e8a925 100644
--- a/system/Test/Mock/MockCommon.php
+++ b/system/Test/Mock/MockCommon.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 if (! function_exists('is_cli')) {
diff --git a/system/Test/Mock/MockConnection.php b/system/Test/Mock/MockConnection.php
index c1d9f23ecf6f..89726bd05a99 100644
--- a/system/Test/Mock/MockConnection.php
+++ b/system/Test/Mock/MockConnection.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockEmail.php b/system/Test/Mock/MockEmail.php
index 12191b94f4a0..3683ee8885e6 100644
--- a/system/Test/Mock/MockEmail.php
+++ b/system/Test/Mock/MockEmail.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockEvents.php b/system/Test/Mock/MockEvents.php
index c78fdf6ece53..e4f556af81d5 100644
--- a/system/Test/Mock/MockEvents.php
+++ b/system/Test/Mock/MockEvents.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockFileLogger.php b/system/Test/Mock/MockFileLogger.php
index 4c0d911c4160..7422221b68f1 100644
--- a/system/Test/Mock/MockFileLogger.php
+++ b/system/Test/Mock/MockFileLogger.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockIncomingRequest.php b/system/Test/Mock/MockIncomingRequest.php
index 93b95663529a..39d739c1abb0 100644
--- a/system/Test/Mock/MockIncomingRequest.php
+++ b/system/Test/Mock/MockIncomingRequest.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockLanguage.php b/system/Test/Mock/MockLanguage.php
index b4c01d19f7a2..7602973918db 100644
--- a/system/Test/Mock/MockLanguage.php
+++ b/system/Test/Mock/MockLanguage.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockLogger.php b/system/Test/Mock/MockLogger.php
index 1b2da7536133..97c3e89dfb22 100644
--- a/system/Test/Mock/MockLogger.php
+++ b/system/Test/Mock/MockLogger.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockQuery.php b/system/Test/Mock/MockQuery.php
index 7d6aff1efd63..c67c4763af58 100644
--- a/system/Test/Mock/MockQuery.php
+++ b/system/Test/Mock/MockQuery.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockResourceController.php b/system/Test/Mock/MockResourceController.php
index 4484389df4f4..2d5871f414aa 100644
--- a/system/Test/Mock/MockResourceController.php
+++ b/system/Test/Mock/MockResourceController.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockResourcePresenter.php b/system/Test/Mock/MockResourcePresenter.php
index 8a203217e934..26f013239163 100644
--- a/system/Test/Mock/MockResourcePresenter.php
+++ b/system/Test/Mock/MockResourcePresenter.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockResponse.php b/system/Test/Mock/MockResponse.php
index 984e5ac1811e..533129216b41 100755
--- a/system/Test/Mock/MockResponse.php
+++ b/system/Test/Mock/MockResponse.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockResult.php b/system/Test/Mock/MockResult.php
index 6e132b03fab9..ad1f9d3768e4 100644
--- a/system/Test/Mock/MockResult.php
+++ b/system/Test/Mock/MockResult.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockSecurity.php b/system/Test/Mock/MockSecurity.php
index b27d1dcfd6c8..e9776ffd872b 100644
--- a/system/Test/Mock/MockSecurity.php
+++ b/system/Test/Mock/MockSecurity.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockSecurityConfig.php b/system/Test/Mock/MockSecurityConfig.php
index 54aeec237416..67e9e289dde7 100644
--- a/system/Test/Mock/MockSecurityConfig.php
+++ b/system/Test/Mock/MockSecurityConfig.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test\Mock;
 
 use Config\Security as Security;
diff --git a/system/Test/Mock/MockServices.php b/system/Test/Mock/MockServices.php
index 6f9cdd1066d3..f02404a1b74e 100644
--- a/system/Test/Mock/MockServices.php
+++ b/system/Test/Mock/MockServices.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockSession.php b/system/Test/Mock/MockSession.php
index 366ee7cfe3c2..f686f17eab39 100644
--- a/system/Test/Mock/MockSession.php
+++ b/system/Test/Mock/MockSession.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/Mock/MockTable.php b/system/Test/Mock/MockTable.php
index fc392e6f6386..697e72b12a7d 100644
--- a/system/Test/Mock/MockTable.php
+++ b/system/Test/Mock/MockTable.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test\Mock;
diff --git a/system/Test/ReflectionHelper.php b/system/Test/ReflectionHelper.php
index e79b83c4daa0..db41e2c10553 100644
--- a/system/Test/ReflectionHelper.php
+++ b/system/Test/ReflectionHelper.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
diff --git a/system/Test/TestLogger.php b/system/Test/TestLogger.php
index aeb8ba2fdb4e..db29fbedb26f 100644
--- a/system/Test/TestLogger.php
+++ b/system/Test/TestLogger.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
diff --git a/system/Test/TestResponse.php b/system/Test/TestResponse.php
index 36d5ba522899..63c8ab0edad8 100644
--- a/system/Test/TestResponse.php
+++ b/system/Test/TestResponse.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Test;
diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php
index d6021ba7b614..f6ddb2ad68d1 100644
--- a/system/Test/bootstrap.php
+++ b/system/Test/bootstrap.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use CodeIgniter\Config\DotEnv;
diff --git a/system/Throttle/Throttler.php b/system/Throttle/Throttler.php
index ae50d77c8b72..a7c4a01209ca 100644
--- a/system/Throttle/Throttler.php
+++ b/system/Throttle/Throttler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Throttle;
diff --git a/system/Throttle/ThrottlerInterface.php b/system/Throttle/ThrottlerInterface.php
index a94b3d5564a5..d3cd9d24995a 100644
--- a/system/Throttle/ThrottlerInterface.php
+++ b/system/Throttle/ThrottlerInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Throttle;
diff --git a/system/Typography/Typography.php b/system/Typography/Typography.php
index 1a23d0d007b8..ed613222e490 100644
--- a/system/Typography/Typography.php
+++ b/system/Typography/Typography.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Typography;
diff --git a/system/Validation/CreditCardRules.php b/system/Validation/CreditCardRules.php
index e407a9c632ff..f9765a6b0bbb 100644
--- a/system/Validation/CreditCardRules.php
+++ b/system/Validation/CreditCardRules.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Validation;
diff --git a/system/Validation/Exceptions/ValidationException.php b/system/Validation/Exceptions/ValidationException.php
index 322bae9a35b5..2e924fffc937 100644
--- a/system/Validation/Exceptions/ValidationException.php
+++ b/system/Validation/Exceptions/ValidationException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Validation\Exceptions;
diff --git a/system/Validation/FileRules.php b/system/Validation/FileRules.php
index e6caf6e6c560..30a76d1a9dbd 100644
--- a/system/Validation/FileRules.php
+++ b/system/Validation/FileRules.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Validation;
diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index 6cd9a56fc3f1..3dd0b0d514db 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Validation;
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
index 426b4e1e60ae..31f9c6cf9b03 100644
--- a/system/Validation/Rules.php
+++ b/system/Validation/Rules.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Validation;
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 9c64fad3dfd8..1b72e639fe19 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Validation;
diff --git a/system/Validation/ValidationInterface.php b/system/Validation/ValidationInterface.php
index 451819906b9a..44a6729f3072 100644
--- a/system/Validation/ValidationInterface.php
+++ b/system/Validation/ValidationInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Validation;
diff --git a/system/View/Cell.php b/system/View/Cell.php
index 19de7567eb48..5453bcf37bfb 100644
--- a/system/View/Cell.php
+++ b/system/View/Cell.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
diff --git a/system/View/Exceptions/ViewException.php b/system/View/Exceptions/ViewException.php
index a6b96939ea3b..f2643e44ed7e 100644
--- a/system/View/Exceptions/ViewException.php
+++ b/system/View/Exceptions/ViewException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View\Exceptions;
diff --git a/system/View/Filters.php b/system/View/Filters.php
index 03f13560f2ef..0a24389d607f 100644
--- a/system/View/Filters.php
+++ b/system/View/Filters.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
diff --git a/system/View/Parser.php b/system/View/Parser.php
index f00da2b79a2c..7187a3ce850a 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
diff --git a/system/View/Plugins.php b/system/View/Plugins.php
index c7f66627bd48..b58951b8de20 100644
--- a/system/View/Plugins.php
+++ b/system/View/Plugins.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
diff --git a/system/View/RendererInterface.php b/system/View/RendererInterface.php
index cf9c0fa43a41..bc7e4208b274 100644
--- a/system/View/RendererInterface.php
+++ b/system/View/RendererInterface.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
diff --git a/system/View/Table.php b/system/View/Table.php
index 7899c34a37f0..5093d88047da 100644
--- a/system/View/Table.php
+++ b/system/View/Table.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
diff --git a/system/View/View.php b/system/View/View.php
index 28edeeed1aa8..d90fe8dd9234 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\View;
diff --git a/system/bootstrap.php b/system/bootstrap.php
index c9c2c41818e8..17226d099974 100644
--- a/system/bootstrap.php
+++ b/system/bootstrap.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 use CodeIgniter\Config\DotEnv;
diff --git a/tests/_support/Autoloader/FatalLocator.php b/tests/_support/Autoloader/FatalLocator.php
index 702aa8880249..ba5cadca48bd 100644
--- a/tests/_support/Autoloader/FatalLocator.php
+++ b/tests/_support/Autoloader/FatalLocator.php
@@ -1,5 +1,14 @@
 <?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\Autoloader;
 
 use CodeIgniter\Autoloader\FileLocator;
diff --git a/tests/_support/Autoloader/UnnamespacedClass.php b/tests/_support/Autoloader/UnnamespacedClass.php
index 67b1ed352b42..3eeb37a8dd38 100644
--- a/tests/_support/Autoloader/UnnamespacedClass.php
+++ b/tests/_support/Autoloader/UnnamespacedClass.php
@@ -1,5 +1,14 @@
 <?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.
+ */
+
 class UnnamespacedClass
 {
 }
diff --git a/tests/_support/Autoloader/functions.php b/tests/_support/Autoloader/functions.php
index 4a584de45ab4..e5aaddf296d8 100644
--- a/tests/_support/Autoloader/functions.php
+++ b/tests/_support/Autoloader/functions.php
@@ -1,5 +1,14 @@
 <?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.
+ */
+
 if (! function_exists('autoload_foo')) {
     function autoload_foo(): string
     {
diff --git a/tests/_support/Cache/RestrictiveHandler.php b/tests/_support/Cache/RestrictiveHandler.php
index 178cfec62b55..6a5824939954 100644
--- a/tests/_support/Cache/RestrictiveHandler.php
+++ b/tests/_support/Cache/RestrictiveHandler.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace Tests\Support\Cache;
diff --git a/tests/_support/Commands/AbstractInfo.php b/tests/_support/Commands/AbstractInfo.php
index 5b8ca43bfbb2..1913f0e285df 100644
--- a/tests/_support/Commands/AbstractInfo.php
+++ b/tests/_support/Commands/AbstractInfo.php
@@ -1,5 +1,14 @@
 <?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\Commands;
 
 use CodeIgniter\CLI\BaseCommand;
diff --git a/tests/_support/Commands/AppInfo.php b/tests/_support/Commands/AppInfo.php
index daeb335f0b58..562cc9dd3847 100644
--- a/tests/_support/Commands/AppInfo.php
+++ b/tests/_support/Commands/AppInfo.php
@@ -1,5 +1,14 @@
 <?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\Commands;
 
 use CodeIgniter\CLI\BaseCommand;
diff --git a/tests/_support/Commands/InvalidCommand.php b/tests/_support/Commands/InvalidCommand.php
index eba2534714fd..a6d13d6fe494 100644
--- a/tests/_support/Commands/InvalidCommand.php
+++ b/tests/_support/Commands/InvalidCommand.php
@@ -1,5 +1,14 @@
 <?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\Commands;
 
 use CodeIgniter\CLI\BaseCommand;
diff --git a/tests/_support/Commands/LanguageCommand.php b/tests/_support/Commands/LanguageCommand.php
index 72831b7008ed..858755b7549a 100644
--- a/tests/_support/Commands/LanguageCommand.php
+++ b/tests/_support/Commands/LanguageCommand.php
@@ -1,5 +1,14 @@
 <?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\Commands;
 
 use CodeIgniter\CLI\BaseCommand;
diff --git a/tests/_support/Commands/ParamsReveal.php b/tests/_support/Commands/ParamsReveal.php
index 7c5aca0d5699..76be444e69d1 100644
--- a/tests/_support/Commands/ParamsReveal.php
+++ b/tests/_support/Commands/ParamsReveal.php
@@ -1,5 +1,14 @@
 <?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\Commands;
 
 use CodeIgniter\CLI\BaseCommand;
diff --git a/tests/_support/Commands/Unsuffixable.php b/tests/_support/Commands/Unsuffixable.php
index f1360a89ace8..65a48e0efb16 100644
--- a/tests/_support/Commands/Unsuffixable.php
+++ b/tests/_support/Commands/Unsuffixable.php
@@ -1,5 +1,14 @@
 <?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\Commands;
 
 use CodeIgniter\CLI\BaseCommand;
diff --git a/tests/_support/Config/BadRegistrar.php b/tests/_support/Config/BadRegistrar.php
index 6f9fdd2b354a..20730db4602b 100644
--- a/tests/_support/Config/BadRegistrar.php
+++ b/tests/_support/Config/BadRegistrar.php
@@ -1,5 +1,14 @@
 <?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\Config;
 
 /**
diff --git a/tests/_support/Config/Filters.php b/tests/_support/Config/Filters.php
index 198e6d7e8ed4..48936397449e 100644
--- a/tests/_support/Config/Filters.php
+++ b/tests/_support/Config/Filters.php
@@ -1,5 +1,14 @@
 <?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\Config\Filters;
 
 $filters->aliases['test-customfilter'] = \Tests\Support\Filters\Customfilter::class;
diff --git a/tests/_support/Config/Registrar.php b/tests/_support/Config/Registrar.php
index c8a607ae7e43..4a9f3b0fe981 100644
--- a/tests/_support/Config/Registrar.php
+++ b/tests/_support/Config/Registrar.php
@@ -1,5 +1,14 @@
 <?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\Config;
 
 /**
diff --git a/tests/_support/Config/Routes.php b/tests/_support/Config/Routes.php
index ee98afd5a880..6ca5bbf2488d 100644
--- a/tests/_support/Config/Routes.php
+++ b/tests/_support/Config/Routes.php
@@ -1,5 +1,14 @@
 <?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\Config;
 
 // This is a simple file to include for testing the RouteCollection class.
diff --git a/tests/_support/Config/Services.php b/tests/_support/Config/Services.php
index c798c823a71f..bdff42cf54c0 100644
--- a/tests/_support/Config/Services.php
+++ b/tests/_support/Config/Services.php
@@ -1,5 +1,14 @@
 <?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\Config;
 
 use CodeIgniter\HTTP\URI;
diff --git a/tests/_support/Config/TestRegistrar.php b/tests/_support/Config/TestRegistrar.php
index 8ac4c9655c90..f809ef54376f 100644
--- a/tests/_support/Config/TestRegistrar.php
+++ b/tests/_support/Config/TestRegistrar.php
@@ -1,5 +1,14 @@
 <?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\Config;
 
 /**
diff --git a/tests/_support/Controllers/Hello.php b/tests/_support/Controllers/Hello.php
index 9e52dd6dec35..cc63814d7e09 100644
--- a/tests/_support/Controllers/Hello.php
+++ b/tests/_support/Controllers/Hello.php
@@ -1,5 +1,14 @@
 <?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 App\Controllers;
 
 use CodeIgniter\Controller;
diff --git a/tests/_support/Controllers/Popcorn.php b/tests/_support/Controllers/Popcorn.php
index 05187d562302..a0aa972c635f 100644
--- a/tests/_support/Controllers/Popcorn.php
+++ b/tests/_support/Controllers/Popcorn.php
@@ -1,5 +1,14 @@
 <?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\Controllers;
 
 use CodeIgniter\API\ResponseTrait;
diff --git a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
index ce16e513c3f5..b79866b446ae 100644
--- a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
+++ b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
@@ -1,5 +1,14 @@
 <?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\Database\Migrations;
 
 use CodeIgniter\Database\Migration;
diff --git a/tests/_support/Database/Seeds/AnotherSeeder.php b/tests/_support/Database/Seeds/AnotherSeeder.php
index a4768250c660..aaf7c7e93410 100644
--- a/tests/_support/Database/Seeds/AnotherSeeder.php
+++ b/tests/_support/Database/Seeds/AnotherSeeder.php
@@ -1,5 +1,14 @@
 <?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\Database\Seeds;
 
 use CodeIgniter\Database\Seeder;
diff --git a/tests/_support/Database/Seeds/CITestSeeder.php b/tests/_support/Database/Seeds/CITestSeeder.php
index 45633244ac51..2f90f86cdee9 100644
--- a/tests/_support/Database/Seeds/CITestSeeder.php
+++ b/tests/_support/Database/Seeds/CITestSeeder.php
@@ -1,5 +1,14 @@
 <?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\Database\Seeds;
 
 use CodeIgniter\Database\Seeder;
diff --git a/tests/_support/Entity/Cast/CastBase64.php b/tests/_support/Entity/Cast/CastBase64.php
index ba4c919faa3c..f09fb79d3e8d 100644
--- a/tests/_support/Entity/Cast/CastBase64.php
+++ b/tests/_support/Entity/Cast/CastBase64.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Entity\Cast;
 
 use CodeIgniter\Entity\Cast\BaseCast;
diff --git a/tests/_support/Entity/Cast/CastPassParameters.php b/tests/_support/Entity/Cast/CastPassParameters.php
index 824e10d256db..7c73cd262a95 100644
--- a/tests/_support/Entity/Cast/CastPassParameters.php
+++ b/tests/_support/Entity/Cast/CastPassParameters.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Entity\Cast;
 
 use CodeIgniter\Entity\Cast\BaseCast;
diff --git a/tests/_support/Entity/Cast/NotExtendsBaseCast.php b/tests/_support/Entity/Cast/NotExtendsBaseCast.php
index 839cb3cb95b5..35352b0a793e 100644
--- a/tests/_support/Entity/Cast/NotExtendsBaseCast.php
+++ b/tests/_support/Entity/Cast/NotExtendsBaseCast.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Entity\Cast;
 
 class NotExtendsBaseCast
diff --git a/tests/_support/Files/able/apple.php b/tests/_support/Files/able/apple.php
index d4a780d2c6f1..72ff5eff4d01 100644
--- a/tests/_support/Files/able/apple.php
+++ b/tests/_support/Files/able/apple.php
@@ -1,6 +1,10 @@
 <?php
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+
+/**
+ * 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.
  */
diff --git a/tests/_support/Files/able/fig_3.php b/tests/_support/Files/able/fig_3.php
index d4a780d2c6f1..72ff5eff4d01 100644
--- a/tests/_support/Files/able/fig_3.php
+++ b/tests/_support/Files/able/fig_3.php
@@ -1,6 +1,10 @@
 <?php
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+
+/**
+ * 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.
  */
diff --git a/tests/_support/Files/able/prune_ripe.php b/tests/_support/Files/able/prune_ripe.php
index d4a780d2c6f1..72ff5eff4d01 100644
--- a/tests/_support/Files/able/prune_ripe.php
+++ b/tests/_support/Files/able/prune_ripe.php
@@ -1,6 +1,10 @@
 <?php
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+
+/**
+ * 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.
  */
diff --git a/tests/_support/Files/baker/banana.php b/tests/_support/Files/baker/banana.php
index d4a780d2c6f1..72ff5eff4d01 100644
--- a/tests/_support/Files/baker/banana.php
+++ b/tests/_support/Files/baker/banana.php
@@ -1,6 +1,10 @@
 <?php
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+
+/**
+ * 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.
  */
diff --git a/tests/_support/Filters/Customfilter.php b/tests/_support/Filters/Customfilter.php
index 93bbe23608e3..134f82a46f9f 100644
--- a/tests/_support/Filters/Customfilter.php
+++ b/tests/_support/Filters/Customfilter.php
@@ -1,5 +1,14 @@
 <?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;
diff --git a/tests/_support/Helpers/baguette_helper.php b/tests/_support/Helpers/baguette_helper.php
index 0b96ac509260..72ff5eff4d01 100644
--- a/tests/_support/Helpers/baguette_helper.php
+++ b/tests/_support/Helpers/baguette_helper.php
@@ -1,3 +1,10 @@
 <?php
 
-// You did it!
+/**
+ * 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.
+ */
diff --git a/tests/_support/Language/SecondMockLanguage.php b/tests/_support/Language/SecondMockLanguage.php
index e001a1ae8abb..d7550ab848a4 100644
--- a/tests/_support/Language/SecondMockLanguage.php
+++ b/tests/_support/Language/SecondMockLanguage.php
@@ -1,5 +1,14 @@
 <?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\Language;
 
 use CodeIgniter\Language\Language;
diff --git a/tests/_support/Language/ab-CD/Allin.php b/tests/_support/Language/ab-CD/Allin.php
index 365ecdb881a7..070ca73dac05 100644
--- a/tests/_support/Language/ab-CD/Allin.php
+++ b/tests/_support/Language/ab-CD/Allin.php
@@ -1,6 +1,14 @@
 <?php
 
-// seven wonders of the ancient world
+/**
+ * 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.
+ */
+
 return [
     'one' => 'Pyramid of Giza',
     'tre' => 'Colossus of Rhodes',
diff --git a/tests/_support/Language/ab/Allin.php b/tests/_support/Language/ab/Allin.php
index 7733641d3dbc..3960c8989204 100644
--- a/tests/_support/Language/ab/Allin.php
+++ b/tests/_support/Language/ab/Allin.php
@@ -1,6 +1,14 @@
 <?php
 
-// seven deadly sins
+/**
+ * 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.
+ */
+
 return [
     'two' => 'gluttony',
     'tre' => 'greed',
diff --git a/tests/_support/Language/en-ZZ/More.php b/tests/_support/Language/en-ZZ/More.php
index 57f23b152ef4..639adae037f5 100644
--- a/tests/_support/Language/en-ZZ/More.php
+++ b/tests/_support/Language/en-ZZ/More.php
@@ -1,5 +1,14 @@
 <?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.
+ */
+
 return [
     'strongForce' => 'These are not the droids you are looking for',
     'notaMoon'    => "It's made of cheese",
diff --git a/tests/_support/Language/en/Allin.php b/tests/_support/Language/en/Allin.php
index 542b0344729e..0023f5195009 100644
--- a/tests/_support/Language/en/Allin.php
+++ b/tests/_support/Language/en/Allin.php
@@ -1,6 +1,14 @@
 <?php
 
-// 12 days of Christmas
+/**
+ * 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.
+ */
+
 return [
     'for' => 'four calling birds',
     'fiv' => 'five golden rings',
diff --git a/tests/_support/Language/en/Core.php b/tests/_support/Language/en/Core.php
index cd6021612941..240247892e28 100644
--- a/tests/_support/Language/en/Core.php
+++ b/tests/_support/Language/en/Core.php
@@ -1,6 +1,14 @@
 <?php
 
-// looking for a system message not likely to be part of unit testing
+/**
+ * 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.
+ */
+
 return [
     'missingExtension' => '{0} extension could not be found.',
     'bazillion'        => 'billions and billions', // adds a new setting
diff --git a/tests/_support/Language/en/Foo.php b/tests/_support/Language/en/Foo.php
index c0cbcaebc11e..e5493d637dc5 100644
--- a/tests/_support/Language/en/Foo.php
+++ b/tests/_support/Language/en/Foo.php
@@ -1,5 +1,14 @@
 <?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.
+ */
+
 return [
     'bar'             => 'Foo Bar Translated',
     'bar.min_length1' => 'The {field} field is very short.',
diff --git a/tests/_support/Language/en/Language.php b/tests/_support/Language/en/Language.php
index c61f67af3ff7..349a4aade553 100644
--- a/tests/_support/Language/en/Language.php
+++ b/tests/_support/Language/en/Language.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Language system language settings
diff --git a/tests/_support/Language/en/More.php b/tests/_support/Language/en/More.php
index aa839f9f185a..66d4e1b54694 100644
--- a/tests/_support/Language/en/More.php
+++ b/tests/_support/Language/en/More.php
@@ -1,5 +1,14 @@
 <?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.
+ */
+
 return [
     'strongForce' => 'These are not the droids you are looking for',
     'notaMoon'    => "That's no moon... it's a space station",
diff --git a/tests/_support/Language/en/Nested.php b/tests/_support/Language/en/Nested.php
index dcd59bfcee05..8b67880566d5 100644
--- a/tests/_support/Language/en/Nested.php
+++ b/tests/_support/Language/en/Nested.php
@@ -1,5 +1,14 @@
 <?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.
+ */
+
 return [
     'a' => [
         'b' => [
diff --git a/tests/_support/Language/ru/Language.php b/tests/_support/Language/ru/Language.php
index 2caed7fe8056..2568889fee66 100644
--- a/tests/_support/Language/ru/Language.php
+++ b/tests/_support/Language/ru/Language.php
@@ -1,5 +1,14 @@
 <?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.
+ */
+
 return [
     'languageGetLineInvalidArgumentException' => 'Whatever this would be, translated',
 ];
diff --git a/tests/_support/Log/Handlers/TestHandler.php b/tests/_support/Log/Handlers/TestHandler.php
index b0b755fd3552..f34d2855ee4b 100644
--- a/tests/_support/Log/Handlers/TestHandler.php
+++ b/tests/_support/Log/Handlers/TestHandler.php
@@ -1,5 +1,14 @@
 <?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\Log\Handlers;
 
 /**
diff --git a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php
index 5bf90d81f7f6..a6eb0b54ab62 100644
--- a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php
+++ b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php
@@ -1,5 +1,14 @@
 <?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\MigrationTestMigrations\Database\Migrations;
 
 class Migration_some_migration extends \CodeIgniter\Database\Migration
diff --git a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php
index b20c59ee17e5..f1606eff56e1 100644
--- a/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php
+++ b/tests/_support/MigrationTestMigrations/Database/Migrations/2018-01-24-102302_Another_migration.php
@@ -1,5 +1,14 @@
 <?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\MigrationTestMigrations\Database\Migrations;
 
 class Migration_another_migration extends \CodeIgniter\Database\Migration
diff --git a/tests/_support/Models/EntityModel.php b/tests/_support/Models/EntityModel.php
index dc18f9095898..fb53549e8fa6 100644
--- a/tests/_support/Models/EntityModel.php
+++ b/tests/_support/Models/EntityModel.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
diff --git a/tests/_support/Models/EventModel.php b/tests/_support/Models/EventModel.php
index 118c6d5e703d..8b8a947efcc6 100644
--- a/tests/_support/Models/EventModel.php
+++ b/tests/_support/Models/EventModel.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
diff --git a/tests/_support/Models/FabricatorModel.php b/tests/_support/Models/FabricatorModel.php
index b827dd9c57b4..1c40e7e1464e 100644
--- a/tests/_support/Models/FabricatorModel.php
+++ b/tests/_support/Models/FabricatorModel.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
diff --git a/tests/_support/Models/JobModel.php b/tests/_support/Models/JobModel.php
index 29c5c2ff3f54..06b967af7a89 100644
--- a/tests/_support/Models/JobModel.php
+++ b/tests/_support/Models/JobModel.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
diff --git a/tests/_support/Models/SecondaryModel.php b/tests/_support/Models/SecondaryModel.php
index 2c61d423288d..b4ef155a5aa9 100644
--- a/tests/_support/Models/SecondaryModel.php
+++ b/tests/_support/Models/SecondaryModel.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
diff --git a/tests/_support/Models/SimpleEntity.php b/tests/_support/Models/SimpleEntity.php
index b1dcffe96839..2c13dccafd55 100644
--- a/tests/_support/Models/SimpleEntity.php
+++ b/tests/_support/Models/SimpleEntity.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Models;
 
 use CodeIgniter\Entity\Entity;
diff --git a/tests/_support/Models/StringifyPkeyModel.php b/tests/_support/Models/StringifyPkeyModel.php
index d0d3e068fac6..9d66e33d194e 100644
--- a/tests/_support/Models/StringifyPkeyModel.php
+++ b/tests/_support/Models/StringifyPkeyModel.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
diff --git a/tests/_support/Models/UserModel.php b/tests/_support/Models/UserModel.php
index f61dbcc0a14f..7e68c3441803 100644
--- a/tests/_support/Models/UserModel.php
+++ b/tests/_support/Models/UserModel.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
diff --git a/tests/_support/Models/ValidErrorsModel.php b/tests/_support/Models/ValidErrorsModel.php
index 3be93bbf90df..04ff1a98f715 100644
--- a/tests/_support/Models/ValidErrorsModel.php
+++ b/tests/_support/Models/ValidErrorsModel.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
diff --git a/tests/_support/Models/ValidModel.php b/tests/_support/Models/ValidModel.php
index 4a877802e0e9..730985ad8142 100644
--- a/tests/_support/Models/ValidModel.php
+++ b/tests/_support/Models/ValidModel.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
diff --git a/tests/_support/Models/WithoutAutoIncrementModel.php b/tests/_support/Models/WithoutAutoIncrementModel.php
index 7a03d5654e14..248fd3af1134 100644
--- a/tests/_support/Models/WithoutAutoIncrementModel.php
+++ b/tests/_support/Models/WithoutAutoIncrementModel.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Tests\Support\Models;
 
 use CodeIgniter\Model;
diff --git a/tests/_support/RESTful/Worker.php b/tests/_support/RESTful/Worker.php
index 95ad3a51d60f..9e736a0a8f72 100644
--- a/tests/_support/RESTful/Worker.php
+++ b/tests/_support/RESTful/Worker.php
@@ -1,5 +1,14 @@
 <?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\RESTful;
 
 use CodeIgniter\RESTful\ResourceController;
diff --git a/tests/_support/RESTful/Worker2.php b/tests/_support/RESTful/Worker2.php
index f6827036148f..af3df04c713c 100644
--- a/tests/_support/RESTful/Worker2.php
+++ b/tests/_support/RESTful/Worker2.php
@@ -1,5 +1,14 @@
 <?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\RESTful;
 
 use CodeIgniter\RESTful\ResourcePresenter;
diff --git a/tests/_support/Services.php b/tests/_support/Services.php
index 6ca27438b1f2..7d554fc4e6e2 100644
--- a/tests/_support/Services.php
+++ b/tests/_support/Services.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter;
 
 use CIUnitTestCase;
diff --git a/tests/_support/SomeEntity.php b/tests/_support/SomeEntity.php
index 1598b70ccf2a..a0edb4525e1b 100644
--- a/tests/_support/SomeEntity.php
+++ b/tests/_support/SomeEntity.php
@@ -1,5 +1,14 @@
 <?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;
 
 use CodeIgniter\Entity\Entity;
diff --git a/tests/_support/Validation/TestRules.php b/tests/_support/Validation/TestRules.php
index 8facdbe8ced8..ca9b672f583e 100644
--- a/tests/_support/Validation/TestRules.php
+++ b/tests/_support/Validation/TestRules.php
@@ -1,5 +1,14 @@
 <?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\Validation;
 
 class TestRules
diff --git a/tests/_support/View/SampleClass.php b/tests/_support/View/SampleClass.php
index 2dad61095602..acc982dce225 100644
--- a/tests/_support/View/SampleClass.php
+++ b/tests/_support/View/SampleClass.php
@@ -1,5 +1,14 @@
 <?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\View;
 
 /**
diff --git a/tests/_support/View/SampleClassWithInitController.php b/tests/_support/View/SampleClassWithInitController.php
index 5e402b1b7f6f..531b208dc6d7 100644
--- a/tests/_support/View/SampleClassWithInitController.php
+++ b/tests/_support/View/SampleClassWithInitController.php
@@ -1,5 +1,14 @@
 <?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\View;
 
 use CodeIgniter\HTTP\RequestInterface;
diff --git a/tests/_support/Widgets/NopeWidget.php b/tests/_support/Widgets/NopeWidget.php
index b709183c06b6..9c677f380915 100644
--- a/tests/_support/Widgets/NopeWidget.php
+++ b/tests/_support/Widgets/NopeWidget.php
@@ -1,4 +1,12 @@
 <?php
 
-// Valid PHP file but, much like myself: no class
+/**
+ * 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.
+ */
+
 $class = 'nope';
diff --git a/tests/_support/Widgets/OtherWidget.php b/tests/_support/Widgets/OtherWidget.php
index 243c5fae3bd2..6276b8354bfb 100644
--- a/tests/_support/Widgets/OtherWidget.php
+++ b/tests/_support/Widgets/OtherWidget.php
@@ -1,5 +1,14 @@
 <?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\Widgets;
 
 class OtherWidget
diff --git a/tests/_support/Widgets/SomeWidget.php b/tests/_support/Widgets/SomeWidget.php
index 2621af7c062d..380449f14b9b 100644
--- a/tests/_support/Widgets/SomeWidget.php
+++ b/tests/_support/Widgets/SomeWidget.php
@@ -1,5 +1,14 @@
 <?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\Widgets;
 
 // Extends a trivial class to test the instanceOf directive
diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
index 88a21f0aa642..4f6e5a097bdf 100644
--- a/tests/system/API/ResponseTraitTest.php
+++ b/tests/system/API/ResponseTraitTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\API;
 
 use CodeIgniter\Format\JSONFormatter;
diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php
index 96eb9f098fff..fb0b4c8c0cb5 100644
--- a/tests/system/Autoloader/AutoloaderTest.php
+++ b/tests/system/Autoloader/AutoloaderTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Autoloader;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php
index 00274b98034b..8a8b91aeea90 100644
--- a/tests/system/Autoloader/FileLocatorTest.php
+++ b/tests/system/Autoloader/FileLocatorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Autoloader;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php
index 117d87a136d4..51dbe3611684 100644
--- a/tests/system/CLI/CLITest.php
+++ b/tests/system/CLI/CLITest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\CLI;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/CLI/CommandRunnerTest.php b/tests/system/CLI/CommandRunnerTest.php
index 28e69bf99ea3..36c89ddafc76 100644
--- a/tests/system/CLI/CommandRunnerTest.php
+++ b/tests/system/CLI/CommandRunnerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\CLI;
 
 use CodeIgniter\Log\Logger;
diff --git a/tests/system/CLI/ConsoleTest.php b/tests/system/CLI/ConsoleTest.php
index 115c55a95b92..a5b3dd1e9783 100644
--- a/tests/system/CLI/ConsoleTest.php
+++ b/tests/system/CLI/ConsoleTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\CLI;
 
 use CodeIgniter\CodeIgniter;
diff --git a/tests/system/Cache/CacheFactoryTest.php b/tests/system/Cache/CacheFactoryTest.php
index 1985f2869a51..237554d5e5fd 100644
--- a/tests/system/Cache/CacheFactoryTest.php
+++ b/tests/system/Cache/CacheFactoryTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Cache;
 
 use CodeIgniter\Cache\Handlers\DummyHandler;
diff --git a/tests/system/Cache/Handlers/BaseHandlerTest.php b/tests/system/Cache/Handlers/BaseHandlerTest.php
index d4a0ff984bf5..d7a0471e60c3 100644
--- a/tests/system/Cache/Handlers/BaseHandlerTest.php
+++ b/tests/system/Cache/Handlers/BaseHandlerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Cache/Handlers/DummyHandlerTest.php b/tests/system/Cache/Handlers/DummyHandlerTest.php
index ab3e5f24fd2f..c0fc5eb20cf5 100644
--- a/tests/system/Cache/Handlers/DummyHandlerTest.php
+++ b/tests/system/Cache/Handlers/DummyHandlerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index 6c639a43a646..ba3b9df464f8 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\CLI\CLI;
diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
index a3635a125fa0..f83708bd8c98 100644
--- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php
+++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\CLI\CLI;
diff --git a/tests/system/Cache/Handlers/PredisHandlerTest.php b/tests/system/Cache/Handlers/PredisHandlerTest.php
index 01828dd26404..22106c6c09aa 100644
--- a/tests/system/Cache/Handlers/PredisHandlerTest.php
+++ b/tests/system/Cache/Handlers/PredisHandlerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\CLI\CLI;
diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php
index d08c4bd359a6..9c0a13147c5c 100644
--- a/tests/system/Cache/Handlers/RedisHandlerTest.php
+++ b/tests/system/Cache/Handlers/RedisHandlerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\CLI\CLI;
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index 32bc9053996a..af0488f3c7f5 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter;
 
 use CodeIgniter\Config\Services;
diff --git a/tests/system/Commands/BaseCommandTest.php b/tests/system/Commands/BaseCommandTest.php
index 3596237ea0ae..7295c05e4d0c 100644
--- a/tests/system/Commands/BaseCommandTest.php
+++ b/tests/system/Commands/BaseCommandTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\CLI\CommandRunner;
diff --git a/tests/system/Commands/ClearCacheTest.php b/tests/system/Commands/ClearCacheTest.php
index 35ee04bcf31f..2a48a3742f5f 100644
--- a/tests/system/Commands/ClearCacheTest.php
+++ b/tests/system/Commands/ClearCacheTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Cache\CacheFactory;
diff --git a/tests/system/Commands/ClearDebugbarTest.php b/tests/system/Commands/ClearDebugbarTest.php
index 4040d6d37008..0d9957dde7e5 100644
--- a/tests/system/Commands/ClearDebugbarTest.php
+++ b/tests/system/Commands/ClearDebugbarTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Commands/ClearLogsTest.php b/tests/system/Commands/ClearLogsTest.php
index 584b785909a1..2297fdccb284 100644
--- a/tests/system/Commands/ClearLogsTest.php
+++ b/tests/system/Commands/ClearLogsTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Commands/CommandGeneratorTest.php b/tests/system/Commands/CommandGeneratorTest.php
index 231914487af2..abe3ce4c7e6e 100644
--- a/tests/system/Commands/CommandGeneratorTest.php
+++ b/tests/system/Commands/CommandGeneratorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Commands/CommandTest.php b/tests/system/Commands/CommandTest.php
index 25c1c870d741..3333d215ba78 100644
--- a/tests/system/Commands/CommandTest.php
+++ b/tests/system/Commands/CommandTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Commands/ConfigGeneratorTest.php b/tests/system/Commands/ConfigGeneratorTest.php
index 8cb991e7e42d..4ea808864afe 100644
--- a/tests/system/Commands/ConfigGeneratorTest.php
+++ b/tests/system/Commands/ConfigGeneratorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Commands/ConfigurableSortImportsTest.php b/tests/system/Commands/ConfigurableSortImportsTest.php
index 788738899c8b..914796aef3bb 100644
--- a/tests/system/Commands/ConfigurableSortImportsTest.php
+++ b/tests/system/Commands/ConfigurableSortImportsTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Commands/ControllerGeneratorTest.php b/tests/system/Commands/ControllerGeneratorTest.php
index 06780051c575..e1ee68fb540a 100644
--- a/tests/system/Commands/ControllerGeneratorTest.php
+++ b/tests/system/Commands/ControllerGeneratorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Commands/CreateDatabaseTest.php b/tests/system/Commands/CreateDatabaseTest.php
index 0b06cc103993..aed4fd5c144e 100644
--- a/tests/system/Commands/CreateDatabaseTest.php
+++ b/tests/system/Commands/CreateDatabaseTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Database\BaseConnection;
diff --git a/tests/system/Commands/DatabaseCommandsTest.php b/tests/system/Commands/DatabaseCommandsTest.php
index 2b1cd462b180..0d33342654f0 100644
--- a/tests/system/Commands/DatabaseCommandsTest.php
+++ b/tests/system/Commands/DatabaseCommandsTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Commands/EntityGeneratorTest.php b/tests/system/Commands/EntityGeneratorTest.php
index 267cfa0c681e..3f644d6ee526 100644
--- a/tests/system/Commands/EntityGeneratorTest.php
+++ b/tests/system/Commands/EntityGeneratorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Commands/EnvironmentCommandTest.php b/tests/system/Commands/EnvironmentCommandTest.php
index 435e1ac4e6eb..bd7f04ff3121 100644
--- a/tests/system/Commands/EnvironmentCommandTest.php
+++ b/tests/system/Commands/EnvironmentCommandTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Commands/FilterGeneratorTest.php b/tests/system/Commands/FilterGeneratorTest.php
index c8a55b282ec3..ceff677f420e 100644
--- a/tests/system/Commands/FilterGeneratorTest.php
+++ b/tests/system/Commands/FilterGeneratorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Commands/GenerateKeyTest.php b/tests/system/Commands/GenerateKeyTest.php
index 28620cf543c2..fec7c07d8c9d 100644
--- a/tests/system/Commands/GenerateKeyTest.php
+++ b/tests/system/Commands/GenerateKeyTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Commands/GeneratorsTest.php b/tests/system/Commands/GeneratorsTest.php
index 3adb0fe9788c..8b37dc5112f1 100644
--- a/tests/system/Commands/GeneratorsTest.php
+++ b/tests/system/Commands/GeneratorsTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Commands/HelpCommandTest.php b/tests/system/Commands/HelpCommandTest.php
index 09c26d5e7a03..13ce4b14e62c 100644
--- a/tests/system/Commands/HelpCommandTest.php
+++ b/tests/system/Commands/HelpCommandTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Commands/InfoCacheTest.php b/tests/system/Commands/InfoCacheTest.php
index efef578449c0..56a52b72bf1c 100644
--- a/tests/system/Commands/InfoCacheTest.php
+++ b/tests/system/Commands/InfoCacheTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Cache\CacheFactory;
diff --git a/tests/system/Commands/MigrationGeneratorTest.php b/tests/system/Commands/MigrationGeneratorTest.php
index 59b501c19d9b..7e65639948a2 100644
--- a/tests/system/Commands/MigrationGeneratorTest.php
+++ b/tests/system/Commands/MigrationGeneratorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Commands/MigrationIntegrationTest.php b/tests/system/Commands/MigrationIntegrationTest.php
index dd0deda09bb6..77c047ef82ae 100644
--- a/tests/system/Commands/MigrationIntegrationTest.php
+++ b/tests/system/Commands/MigrationIntegrationTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Commands/ModelGeneratorTest.php b/tests/system/Commands/ModelGeneratorTest.php
index dc58f6a86322..68e001103fb5 100644
--- a/tests/system/Commands/ModelGeneratorTest.php
+++ b/tests/system/Commands/ModelGeneratorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Commands/ScaffoldGeneratorTest.php b/tests/system/Commands/ScaffoldGeneratorTest.php
index 89a41bfcb955..d3cbf1088f30 100644
--- a/tests/system/Commands/ScaffoldGeneratorTest.php
+++ b/tests/system/Commands/ScaffoldGeneratorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Commands/SeederGeneratorTest.php b/tests/system/Commands/SeederGeneratorTest.php
index fb9ecfd37823..aa41d745803a 100644
--- a/tests/system/Commands/SeederGeneratorTest.php
+++ b/tests/system/Commands/SeederGeneratorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Commands/SessionsCommandsTest.php b/tests/system/Commands/SessionsCommandsTest.php
index 1ffd447af649..6af2d09bf536 100644
--- a/tests/system/Commands/SessionsCommandsTest.php
+++ b/tests/system/Commands/SessionsCommandsTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Commands/ValidationGeneratorTest.php b/tests/system/Commands/ValidationGeneratorTest.php
index 9f21ac97f900..64698d1b55db 100644
--- a/tests/system/Commands/ValidationGeneratorTest.php
+++ b/tests/system/Commands/ValidationGeneratorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/CommonFunctionsSendTest.php b/tests/system/CommonFunctionsSendTest.php
index d59253bad3f9..49a99b1494ea 100644
--- a/tests/system/CommonFunctionsSendTest.php
+++ b/tests/system/CommonFunctionsSendTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index ce8a7c474175..c666c9c51335 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter;
 
 use CodeIgniter\Config\BaseService;
diff --git a/tests/system/CommonSingleServiceTest.php b/tests/system/CommonSingleServiceTest.php
index 2bb1f8d9c3ea..a25896d24661 100644
--- a/tests/system/CommonSingleServiceTest.php
+++ b/tests/system/CommonSingleServiceTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter;
 
 use CodeIgniter\Config\Services;
diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php
index c091e63e8144..872e7ce48b2f 100644
--- a/tests/system/Config/BaseConfigTest.php
+++ b/tests/system/Config/BaseConfigTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Config;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Config/ConfigTest.php b/tests/system/Config/ConfigTest.php
index 7876ea95d948..7f64a4851205 100644
--- a/tests/system/Config/ConfigTest.php
+++ b/tests/system/Config/ConfigTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Config;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php
index 3e805f4a44e7..9943d20d3a73 100644
--- a/tests/system/Config/DotEnvTest.php
+++ b/tests/system/Config/DotEnvTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Config;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Config/FactoriesTest.php b/tests/system/Config/FactoriesTest.php
index 9182bc5224c4..3a8cb7584f7d 100644
--- a/tests/system/Config/FactoriesTest.php
+++ b/tests/system/Config/FactoriesTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Config;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Config/MimesTest.php b/tests/system/Config/MimesTest.php
index 921138adbd55..d0161b4a859e 100644
--- a/tests/system/Config/MimesTest.php
+++ b/tests/system/Config/MimesTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Config;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php
index e33b985bc57a..44d65b1ebfc7 100644
--- a/tests/system/Config/ServicesTest.php
+++ b/tests/system/Config/ServicesTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Config;
 
 use CodeIgniter\Autoloader\Autoloader;
diff --git a/tests/system/Config/fixtures/Encryption.php b/tests/system/Config/fixtures/Encryption.php
index 003c0a1fcdb0..2793795f56ff 100644
--- a/tests/system/Config/fixtures/Encryption.php
+++ b/tests/system/Config/fixtures/Encryption.php
@@ -1,5 +1,14 @@
 <?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.
+ */
+
 use Config\Encryption as EncryptionConfig;
 
 class Encryption extends EncryptionConfig
diff --git a/tests/system/Config/fixtures/RegistrarConfig.php b/tests/system/Config/fixtures/RegistrarConfig.php
index 7618ff557d9d..a8a656c5ae6b 100644
--- a/tests/system/Config/fixtures/RegistrarConfig.php
+++ b/tests/system/Config/fixtures/RegistrarConfig.php
@@ -1,5 +1,14 @@
 <?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.
+ */
+
 class RegistrarConfig extends \CodeIgniter\Config\BaseConfig
 {
     public $foo = 'bar';
diff --git a/tests/system/Config/fixtures/SimpleConfig.php b/tests/system/Config/fixtures/SimpleConfig.php
index d6fe4ac38416..d2e13fbda3c0 100644
--- a/tests/system/Config/fixtures/SimpleConfig.php
+++ b/tests/system/Config/fixtures/SimpleConfig.php
@@ -1,5 +1,14 @@
 <?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.
+ */
+
 class SimpleConfig extends \CodeIgniter\Config\BaseConfig
 {
     public $QZERO;
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index d28e05a40e61..d10a9038089c 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter;
 
 use CodeIgniter\HTTP\IncomingRequest;
diff --git a/tests/system/Cookie/CookieStoreTest.php b/tests/system/Cookie/CookieStoreTest.php
index c1e6eee8e2a0..a73403fba6e1 100644
--- a/tests/system/Cookie/CookieStoreTest.php
+++ b/tests/system/Cookie/CookieStoreTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Cookie;
 
 use CodeIgniter\Cookie\Exceptions\CookieException;
diff --git a/tests/system/Cookie/CookieTest.php b/tests/system/Cookie/CookieTest.php
index 3cd6a4bd5c6f..53d4343e43ec 100644
--- a/tests/system/Cookie/CookieTest.php
+++ b/tests/system/Cookie/CookieTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Cookie;
 
 use CodeIgniter\Cookie\Exceptions\CookieException;
diff --git a/tests/system/Database/BaseConnectionTest.php b/tests/system/Database/BaseConnectionTest.php
index a8eb2e87082c..85126836650f 100644
--- a/tests/system/Database/BaseConnectionTest.php
+++ b/tests/system/Database/BaseConnectionTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database;
 
 use CodeIgniter\Database\Exceptions\DatabaseException;
diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php
index 4fdc6ad6f701..8805ff5a6fc8 100644
--- a/tests/system/Database/BaseQueryTest.php
+++ b/tests/system/Database/BaseQueryTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Builder/AliasTest.php b/tests/system/Database/Builder/AliasTest.php
index f22580d21e26..b6789d987708 100644
--- a/tests/system/Database/Builder/AliasTest.php
+++ b/tests/system/Database/Builder/AliasTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Builder/BaseTest.php b/tests/system/Database/Builder/BaseTest.php
index 2afd8e586742..1390e4668200 100644
--- a/tests/system/Database/Builder/BaseTest.php
+++ b/tests/system/Database/Builder/BaseTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Builder/CountTest.php b/tests/system/Database/Builder/CountTest.php
index badd3c00a7e3..d0d9000279f6 100644
--- a/tests/system/Database/Builder/CountTest.php
+++ b/tests/system/Database/Builder/CountTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
diff --git a/tests/system/Database/Builder/DeleteTest.php b/tests/system/Database/Builder/DeleteTest.php
index eefc336be07a..777a646992c4 100644
--- a/tests/system/Database/Builder/DeleteTest.php
+++ b/tests/system/Database/Builder/DeleteTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Builder/DistinctTest.php b/tests/system/Database/Builder/DistinctTest.php
index cfb55de70979..d47edc1e85a9 100644
--- a/tests/system/Database/Builder/DistinctTest.php
+++ b/tests/system/Database/Builder/DistinctTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
diff --git a/tests/system/Database/Builder/EmptyTest.php b/tests/system/Database/Builder/EmptyTest.php
index 6fd4b60648c7..25ce07ca0aaf 100644
--- a/tests/system/Database/Builder/EmptyTest.php
+++ b/tests/system/Database/Builder/EmptyTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php
index 2c0c97b739f9..b7c62a2c748c 100644
--- a/tests/system/Database/Builder/FromTest.php
+++ b/tests/system/Database/Builder/FromTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
diff --git a/tests/system/Database/Builder/GetTest.php b/tests/system/Database/Builder/GetTest.php
index 69e11c3345f4..36aacb7b794b 100644
--- a/tests/system/Database/Builder/GetTest.php
+++ b/tests/system/Database/Builder/GetTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Builder/GroupTest.php b/tests/system/Database/Builder/GroupTest.php
index 5a48ac60e21e..8d5520ecd73e 100644
--- a/tests/system/Database/Builder/GroupTest.php
+++ b/tests/system/Database/Builder/GroupTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php
index 55f46f0f7808..f2537543ac5e 100644
--- a/tests/system/Database/Builder/InsertTest.php
+++ b/tests/system/Database/Builder/InsertTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\Query;
diff --git a/tests/system/Database/Builder/JoinTest.php b/tests/system/Database/Builder/JoinTest.php
index 47a9d4b24522..7ebb188adf6d 100644
--- a/tests/system/Database/Builder/JoinTest.php
+++ b/tests/system/Database/Builder/JoinTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
diff --git a/tests/system/Database/Builder/LikeTest.php b/tests/system/Database/Builder/LikeTest.php
index a58712b237e1..74a2d2fbbf81 100644
--- a/tests/system/Database/Builder/LikeTest.php
+++ b/tests/system/Database/Builder/LikeTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
diff --git a/tests/system/Database/Builder/LimitTest.php b/tests/system/Database/Builder/LimitTest.php
index e10c41679270..ab6c2e41e222 100644
--- a/tests/system/Database/Builder/LimitTest.php
+++ b/tests/system/Database/Builder/LimitTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
diff --git a/tests/system/Database/Builder/OrderTest.php b/tests/system/Database/Builder/OrderTest.php
index 1855cfd4c4ae..3b3b6622c59f 100644
--- a/tests/system/Database/Builder/OrderTest.php
+++ b/tests/system/Database/Builder/OrderTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
diff --git a/tests/system/Database/Builder/PrefixTest.php b/tests/system/Database/Builder/PrefixTest.php
index 22bc253f8017..35455d4856f9 100644
--- a/tests/system/Database/Builder/PrefixTest.php
+++ b/tests/system/Database/Builder/PrefixTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Builder/ReplaceTest.php b/tests/system/Database/Builder/ReplaceTest.php
index 4a69fbb0f438..4197ed05449d 100644
--- a/tests/system/Database/Builder/ReplaceTest.php
+++ b/tests/system/Database/Builder/ReplaceTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Builder/SelectTest.php b/tests/system/Database/Builder/SelectTest.php
index 53e957d5b070..7a9e7570221d 100644
--- a/tests/system/Database/Builder/SelectTest.php
+++ b/tests/system/Database/Builder/SelectTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
diff --git a/tests/system/Database/Builder/TruncateTest.php b/tests/system/Database/Builder/TruncateTest.php
index f29ac7356dbf..82bf5ad4d9aa 100644
--- a/tests/system/Database/Builder/TruncateTest.php
+++ b/tests/system/Database/Builder/TruncateTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
diff --git a/tests/system/Database/Builder/UpdateTest.php b/tests/system/Database/Builder/UpdateTest.php
index 5fadb0a3bc96..801324d01f79 100644
--- a/tests/system/Database/Builder/UpdateTest.php
+++ b/tests/system/Database/Builder/UpdateTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php
index 5e6bbde7353d..dea884273f9c 100644
--- a/tests/system/Database/Builder/WhereTest.php
+++ b/tests/system/Database/Builder/WhereTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
diff --git a/tests/system/Database/ConfigTest.php b/tests/system/Database/ConfigTest.php
index 9efc66653265..d4f795dcc26b 100644
--- a/tests/system/Database/ConfigTest.php
+++ b/tests/system/Database/ConfigTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/DatabaseSeederTest.php b/tests/system/Database/DatabaseSeederTest.php
index e2c1a01bbfb4..d17ff71fe61a 100644
--- a/tests/system/Database/DatabaseSeederTest.php
+++ b/tests/system/Database/DatabaseSeederTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php
index bf0bdcf8c766..5cf5ea0d69cc 100644
--- a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php
+++ b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\DatabaseTestCase;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php
index fa71fd395f30..c801d189535b 100644
--- a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php
+++ b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\DatabaseTestCase;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/DatabaseTestCaseTest.php b/tests/system/Database/DatabaseTestCaseTest.php
index 64f441706806..86f3ec3eec31 100644
--- a/tests/system/Database/DatabaseTestCaseTest.php
+++ b/tests/system/Database/DatabaseTestCaseTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Live/AliasTest.php b/tests/system/Database/Live/AliasTest.php
index 8209ee68e284..0024625ce5b5 100644
--- a/tests/system/Database/Live/AliasTest.php
+++ b/tests/system/Database/Live/AliasTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Live/BadQueryTest.php b/tests/system/Database/Live/BadQueryTest.php
index 4d179271c5f5..44a2adb0a391 100644
--- a/tests/system/Database/Live/BadQueryTest.php
+++ b/tests/system/Database/Live/BadQueryTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Live/ConnectTest.php b/tests/system/Database/Live/ConnectTest.php
index 37cd39fccdd0..680f03c94ca7 100644
--- a/tests/system/Database/Live/ConnectTest.php
+++ b/tests/system/Database/Live/ConnectTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Config\Factories;
diff --git a/tests/system/Database/Live/CountTest.php b/tests/system/Database/Live/CountTest.php
index 72125960c395..bfe917cb2adc 100644
--- a/tests/system/Database/Live/CountTest.php
+++ b/tests/system/Database/Live/CountTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Live/DatabaseTestTraitCaseTest.php b/tests/system/Database/Live/DatabaseTestTraitCaseTest.php
index 38f931ee23d7..8e917a7d30e9 100644
--- a/tests/system/Database/Live/DatabaseTestTraitCaseTest.php
+++ b/tests/system/Database/Live/DatabaseTestTraitCaseTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Live/DbDebugTest.php b/tests/system/Database/Live/DbDebugTest.php
index 0ab0610d9b7d..8caadf5144fe 100644
--- a/tests/system/Database/Live/DbDebugTest.php
+++ b/tests/system/Database/Live/DbDebugTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Live/DbUtilsTest.php b/tests/system/Database/Live/DbUtilsTest.php
index 79920345d71b..c9b93242f4d1 100644
--- a/tests/system/Database/Live/DbUtilsTest.php
+++ b/tests/system/Database/Live/DbUtilsTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Database\Database;
diff --git a/tests/system/Database/Live/DeleteTest.php b/tests/system/Database/Live/DeleteTest.php
index 1f1414021b6f..bd3cd7d6d05c 100644
--- a/tests/system/Database/Live/DeleteTest.php
+++ b/tests/system/Database/Live/DeleteTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Database\Exceptions\DatabaseException;
diff --git a/tests/system/Database/Live/EmptyTest.php b/tests/system/Database/Live/EmptyTest.php
index 811e2bf5fed2..5dfcec87e418 100644
--- a/tests/system/Database/Live/EmptyTest.php
+++ b/tests/system/Database/Live/EmptyTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Live/EscapeTest.php b/tests/system/Database/Live/EscapeTest.php
index 6b871cbc2d3d..f5c3ff8b59c1 100644
--- a/tests/system/Database/Live/EscapeTest.php
+++ b/tests/system/Database/Live/EscapeTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Live/FabricatorLiveTest.php b/tests/system/Database/Live/FabricatorLiveTest.php
index 21ef47ff8ced..b1cf373f1244 100644
--- a/tests/system/Database/Live/FabricatorLiveTest.php
+++ b/tests/system/Database/Live/FabricatorLiveTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Exceptions\FrameworkException;
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 24314da9558f..69812f98444b 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Database\Exceptions\DatabaseException;
diff --git a/tests/system/Database/Live/FromTest.php b/tests/system/Database/Live/FromTest.php
index 9d33fddac18c..6a17f800e55a 100644
--- a/tests/system/Database/Live/FromTest.php
+++ b/tests/system/Database/Live/FromTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Live/GetNumRowsTest.php b/tests/system/Database/Live/GetNumRowsTest.php
index fc3da95e5a4a..bfa982d5d6a5 100644
--- a/tests/system/Database/Live/GetNumRowsTest.php
+++ b/tests/system/Database/Live/GetNumRowsTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php
index 1bb184c6d50e..e361ce2bafc4 100644
--- a/tests/system/Database/Live/GetTest.php
+++ b/tests/system/Database/Live/GetTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Database\Exceptions\DatabaseException;
diff --git a/tests/system/Database/Live/GroupTest.php b/tests/system/Database/Live/GroupTest.php
index 765fe7f09670..9ef9da758fff 100644
--- a/tests/system/Database/Live/GroupTest.php
+++ b/tests/system/Database/Live/GroupTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Live/IncrementTest.php b/tests/system/Database/Live/IncrementTest.php
index 043305189712..d53732464f56 100644
--- a/tests/system/Database/Live/IncrementTest.php
+++ b/tests/system/Database/Live/IncrementTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Live/InsertTest.php b/tests/system/Database/Live/InsertTest.php
index 6143ee9752b1..8ca40e2309ef 100644
--- a/tests/system/Database/Live/InsertTest.php
+++ b/tests/system/Database/Live/InsertTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Live/JoinTest.php b/tests/system/Database/Live/JoinTest.php
index d6b9750abd33..7e35effcc852 100644
--- a/tests/system/Database/Live/JoinTest.php
+++ b/tests/system/Database/Live/JoinTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Live/LikeTest.php b/tests/system/Database/Live/LikeTest.php
index 532a24cb56d5..999539e488fc 100644
--- a/tests/system/Database/Live/LikeTest.php
+++ b/tests/system/Database/Live/LikeTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Live/LimitTest.php b/tests/system/Database/Live/LimitTest.php
index 1f5e9a75b708..ee3f8c475b79 100644
--- a/tests/system/Database/Live/LimitTest.php
+++ b/tests/system/Database/Live/LimitTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Live/MetadataTest.php b/tests/system/Database/Live/MetadataTest.php
index 796122992706..e59b28f7b724 100644
--- a/tests/system/Database/Live/MetadataTest.php
+++ b/tests/system/Database/Live/MetadataTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Live/OrderTest.php b/tests/system/Database/Live/OrderTest.php
index 24aebbad7c5e..9d87089b5e79 100644
--- a/tests/system/Database/Live/OrderTest.php
+++ b/tests/system/Database/Live/OrderTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php
index 4a06ee00d78d..b71c0498f80e 100644
--- a/tests/system/Database/Live/PreparedQueryTest.php
+++ b/tests/system/Database/Live/PreparedQueryTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Database\BasePreparedQuery;
diff --git a/tests/system/Database/Live/PretendTest.php b/tests/system/Database/Live/PretendTest.php
index 132d104c9662..b313f41fb7cb 100644
--- a/tests/system/Database/Live/PretendTest.php
+++ b/tests/system/Database/Live/PretendTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Database\Query;
diff --git a/tests/system/Database/Live/SQLite/AlterTableTest.php b/tests/system/Database/Live/SQLite/AlterTableTest.php
index c2d9bcb4e6f6..029c764269a8 100644
--- a/tests/system/Database/Live/SQLite/AlterTableTest.php
+++ b/tests/system/Database/Live/SQLite/AlterTableTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live\SQLite;
 
 use CodeIgniter\Database\SQLite3\Connection;
diff --git a/tests/system/Database/Live/SelectTest.php b/tests/system/Database/Live/SelectTest.php
index 2c7f4b6559ae..6224633847d6 100644
--- a/tests/system/Database/Live/SelectTest.php
+++ b/tests/system/Database/Live/SelectTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index f60fb08717ae..665a7f675fe3 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Database\Exceptions\DatabaseException;
diff --git a/tests/system/Database/Live/WhereTest.php b/tests/system/Database/Live/WhereTest.php
index 9b3253986e07..ce87bbd3c7f4 100644
--- a/tests/system/Database/Live/WhereTest.php
+++ b/tests/system/Database/Live/WhereTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Database/Live/WriteTypeQueryTest.php b/tests/system/Database/Live/WriteTypeQueryTest.php
index 7a984bcc6d52..31dd848c41a2 100644
--- a/tests/system/Database/Live/WriteTypeQueryTest.php
+++ b/tests/system/Database/Live/WriteTypeQueryTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Live;
 
 use CodeIgniter\Database\BaseBuilder;
diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php
index f567e227deba..9dee57a3434e 100644
--- a/tests/system/Database/Migrations/MigrationRunnerTest.php
+++ b/tests/system/Database/Migrations/MigrationRunnerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Migrations;
 
 use CodeIgniter\Database\BaseConnection;
diff --git a/tests/system/Database/Migrations/MigrationTest.php b/tests/system/Database/Migrations/MigrationTest.php
index d9bf116013b4..5f89716279a2 100644
--- a/tests/system/Database/Migrations/MigrationTest.php
+++ b/tests/system/Database/Migrations/MigrationTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database\Migrations;
 
 use CodeIgniter\Database\Migration;
diff --git a/tests/system/Database/ModelFactoryTest.php b/tests/system/Database/ModelFactoryTest.php
index c36af0fe6a61..0be0341cc999 100644
--- a/tests/system/Database/ModelFactoryTest.php
+++ b/tests/system/Database/ModelFactoryTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Database;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php
index 6cdf9e772628..e6fcdd18f158 100644
--- a/tests/system/Debug/ExceptionsTest.php
+++ b/tests/system/Debug/ExceptionsTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Debug;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Debug/TimerTest.php b/tests/system/Debug/TimerTest.php
index fdf515065535..7b7b75199ea9 100644
--- a/tests/system/Debug/TimerTest.php
+++ b/tests/system/Debug/TimerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Debug;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/DebugTraceableTraitTest.php b/tests/system/DebugTraceableTraitTest.php
index 2256441771f5..c0a787bb5ef0 100644
--- a/tests/system/DebugTraceableTraitTest.php
+++ b/tests/system/DebugTraceableTraitTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter;
 
 use CodeIgniter\Exceptions\DebugTraceableTrait;
@@ -7,21 +16,21 @@
 use CodeIgniter\Test\CIUnitTestCase;
 
 /**
- * @covers \CodeIgniter\Exceptions\DebugTraceableTrait
- *
  * @internal
+ *
+ * @covers \CodeIgniter\Exceptions\DebugTraceableTrait
  */
 final class DebugTraceableTraitTest extends CIUnitTestCase
 {
     public function testFactoryInstanceReturnsWhereItIsRaised(): void
     {
-        $e1 = new FrameworkException('I am on line 18');
+        $e1 = new FrameworkException('I am on line 27.');
         $e2 = FrameworkException::forEnabledZlibOutputCompression();
 
         $this->assertContainsEquals(DebugTraceableTrait::class, class_uses(FrameworkException::class));
-        $this->assertSame(18, $e1->getLine());
+        $this->assertSame(27, $e1->getLine());
         $this->assertSame(__FILE__, $e1->getFile());
-        $this->assertSame(19, $e2->getLine());
+        $this->assertSame(28, $e2->getLine());
         $this->assertSame(__FILE__, $e2->getFile());
     }
 }
diff --git a/tests/system/Email/EmailTest.php b/tests/system/Email/EmailTest.php
index 08aadb80313d..b933412de71f 100644
--- a/tests/system/Email/EmailTest.php
+++ b/tests/system/Email/EmailTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Email;
 
 use CodeIgniter\Events\Events;
diff --git a/tests/system/Encryption/EncryptionTest.php b/tests/system/Encryption/EncryptionTest.php
index 35bb847fb4a4..a1f6085a33a6 100644
--- a/tests/system/Encryption/EncryptionTest.php
+++ b/tests/system/Encryption/EncryptionTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Encryption;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
index ba05f191f076..89886b6f8901 100644
--- a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
+++ b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Encryption\Handlers;
 
 use CodeIgniter\Encryption\Encryption;
diff --git a/tests/system/Encryption/Handlers/SodiumHandlerTest.php b/tests/system/Encryption/Handlers/SodiumHandlerTest.php
index 958b34f69539..fc5f353d2ffb 100644
--- a/tests/system/Encryption/Handlers/SodiumHandlerTest.php
+++ b/tests/system/Encryption/Handlers/SodiumHandlerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Encryption\Handlers;
 
 use CodeIgniter\Encryption\Encryption;
diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php
index 87c63e9188e4..0928279ac514 100644
--- a/tests/system/Entity/EntityTest.php
+++ b/tests/system/Entity/EntityTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Entity;
 
 use CodeIgniter\Entity\Exceptions\CastException;
diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php
index 7c2fa5c99c81..65fd7df6365e 100644
--- a/tests/system/Events/EventsTest.php
+++ b/tests/system/Events/EventsTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Events;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Files/FileTest.php b/tests/system/Files/FileTest.php
index d42578844f68..ec911eaa107c 100644
--- a/tests/system/Files/FileTest.php
+++ b/tests/system/Files/FileTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Files;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Files/FileWithVfsTest.php b/tests/system/Files/FileWithVfsTest.php
index d62dbf29690f..33a87535ed54 100644
--- a/tests/system/Files/FileWithVfsTest.php
+++ b/tests/system/Files/FileWithVfsTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Files;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Filters/CSRFTest.php b/tests/system/Filters/CSRFTest.php
index 7840f67e6ed0..5ad75c055393 100644
--- a/tests/system/Filters/CSRFTest.php
+++ b/tests/system/Filters/CSRFTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Filters;
 
 use CodeIgniter\Config\Services;
diff --git a/tests/system/Filters/DebugToolbarTest.php b/tests/system/Filters/DebugToolbarTest.php
index aa31613f4770..543eb6941def 100644
--- a/tests/system/Filters/DebugToolbarTest.php
+++ b/tests/system/Filters/DebugToolbarTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Filters;
 
 use CodeIgniter\Config\Services;
diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index 3bf56c7b616b..dbe88c4879c5 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Filters;
 
 use CodeIgniter\Config\Services;
diff --git a/tests/system/Filters/HoneypotTest.php b/tests/system/Filters/HoneypotTest.php
index 0361a3f602cf..938f0fe525f5 100644
--- a/tests/system/Filters/HoneypotTest.php
+++ b/tests/system/Filters/HoneypotTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Filters;
 
 use CodeIgniter\Config\Services;
diff --git a/tests/system/Filters/fixtures/GoogleCurious.php b/tests/system/Filters/fixtures/GoogleCurious.php
index 04f1a2ed04c3..53d8c7f2b337 100644
--- a/tests/system/Filters/fixtures/GoogleCurious.php
+++ b/tests/system/Filters/fixtures/GoogleCurious.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Filters\fixtures;
 
 use CodeIgniter\Filters\FilterInterface;
diff --git a/tests/system/Filters/fixtures/GoogleEmpty.php b/tests/system/Filters/fixtures/GoogleEmpty.php
index b924d416fcca..16d4eb19347a 100644
--- a/tests/system/Filters/fixtures/GoogleEmpty.php
+++ b/tests/system/Filters/fixtures/GoogleEmpty.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Filters\fixtures;
 
 use CodeIgniter\Filters\FilterInterface;
diff --git a/tests/system/Filters/fixtures/GoogleMe.php b/tests/system/Filters/fixtures/GoogleMe.php
index 0594ed0813c3..8fedc4312111 100644
--- a/tests/system/Filters/fixtures/GoogleMe.php
+++ b/tests/system/Filters/fixtures/GoogleMe.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Filters\fixtures;
 
 use CodeIgniter\Filters\FilterInterface;
diff --git a/tests/system/Filters/fixtures/GoogleYou.php b/tests/system/Filters/fixtures/GoogleYou.php
index 9d018a9638de..0ef4d0bb2f6d 100644
--- a/tests/system/Filters/fixtures/GoogleYou.php
+++ b/tests/system/Filters/fixtures/GoogleYou.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Filters\fixtures;
 
 use CodeIgniter\Config\Services;
diff --git a/tests/system/Filters/fixtures/InvalidClass.php b/tests/system/Filters/fixtures/InvalidClass.php
index 6385816983fe..65a42fa25d45 100644
--- a/tests/system/Filters/fixtures/InvalidClass.php
+++ b/tests/system/Filters/fixtures/InvalidClass.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Filters\fixtures;
 
 class InvalidClass
diff --git a/tests/system/Filters/fixtures/Multiple1.php b/tests/system/Filters/fixtures/Multiple1.php
index 2f7839e1b5b5..22f57e40184f 100644
--- a/tests/system/Filters/fixtures/Multiple1.php
+++ b/tests/system/Filters/fixtures/Multiple1.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Filters\fixtures;
 
 use CodeIgniter\Filters\FilterInterface;
diff --git a/tests/system/Filters/fixtures/Multiple2.php b/tests/system/Filters/fixtures/Multiple2.php
index 1c164bf73ffe..9b2e61f98938 100644
--- a/tests/system/Filters/fixtures/Multiple2.php
+++ b/tests/system/Filters/fixtures/Multiple2.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Filters\fixtures;
 
 use CodeIgniter\Filters\FilterInterface;
diff --git a/tests/system/Filters/fixtures/Role.php b/tests/system/Filters/fixtures/Role.php
index b55abaeace2c..54c016140a41 100644
--- a/tests/system/Filters/fixtures/Role.php
+++ b/tests/system/Filters/fixtures/Role.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Filters\fixtures;
 
 use CodeIgniter\Filters\FilterInterface;
diff --git a/tests/system/Format/FormatTest.php b/tests/system/Format/FormatTest.php
index a662033d3621..0cd53e62a22c 100644
--- a/tests/system/Format/FormatTest.php
+++ b/tests/system/Format/FormatTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Format;
 
 use CodeIgniter\Format\Exceptions\FormatException;
diff --git a/tests/system/Format/JSONFormatterTest.php b/tests/system/Format/JSONFormatterTest.php
index 2a6109985613..b2eb5f2e0d5e 100644
--- a/tests/system/Format/JSONFormatterTest.php
+++ b/tests/system/Format/JSONFormatterTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Format;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Format/XMLFormatterTest.php b/tests/system/Format/XMLFormatterTest.php
index 2213b470c87f..c42660648ea8 100644
--- a/tests/system/Format/XMLFormatterTest.php
+++ b/tests/system/Format/XMLFormatterTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Format;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/HTTP/CLIRequestTest.php b/tests/system/HTTP/CLIRequestTest.php
index 63b386e6134e..904b40353c40 100644
--- a/tests/system/HTTP/CLIRequestTest.php
+++ b/tests/system/HTTP/CLIRequestTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index d450a25c1386..c1ac77765a44 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Config\Services;
diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php
index d4991a67792c..0bbb6f60f988 100644
--- a/tests/system/HTTP/ContentSecurityPolicyTest.php
+++ b/tests/system/HTTP/ContentSecurityPolicyTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/HTTP/DownloadResponseTest.php b/tests/system/HTTP/DownloadResponseTest.php
index d98fca98d63e..736558dcf9d2 100644
--- a/tests/system/HTTP/DownloadResponseTest.php
+++ b/tests/system/HTTP/DownloadResponseTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Exceptions\DownloadException;
diff --git a/tests/system/HTTP/Files/FileCollectionTest.php b/tests/system/HTTP/Files/FileCollectionTest.php
index efc02ae8ba14..6b3c7533ff96 100644
--- a/tests/system/HTTP/Files/FileCollectionTest.php
+++ b/tests/system/HTTP/Files/FileCollectionTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP\Files;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php
index 17ab39be6bf2..9797ca46c301 100644
--- a/tests/system/HTTP/Files/FileMovingTest.php
+++ b/tests/system/HTTP/Files/FileMovingTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP\Files;
 
 use CodeIgniter\HTTP\Exceptions\HTTPException;
diff --git a/tests/system/HTTP/HeaderTest.php b/tests/system/HTTP/HeaderTest.php
index 1751095a93cf..3b02009235e4 100644
--- a/tests/system/HTTP/HeaderTest.php
+++ b/tests/system/HTTP/HeaderTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php
index 2dab90797192..dfb963d05c34 100644
--- a/tests/system/HTTP/IncomingRequestDetectingTest.php
+++ b/tests/system/HTTP/IncomingRequestDetectingTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index f4152c87112b..0975b873bde5 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\HTTP\Exceptions\HTTPException;
diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php
index e0aa7c8559ba..73b6c6162214 100644
--- a/tests/system/HTTP/MessageTest.php
+++ b/tests/system/HTTP/MessageTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\HTTP\Exceptions\HTTPException;
diff --git a/tests/system/HTTP/NegotiateTest.php b/tests/system/HTTP/NegotiateTest.php
index a1d92212ee33..af7549e30239 100644
--- a/tests/system/HTTP/NegotiateTest.php
+++ b/tests/system/HTTP/NegotiateTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\HTTP\Exceptions\HTTPException;
diff --git a/tests/system/HTTP/RedirectResponseTest.php b/tests/system/HTTP/RedirectResponseTest.php
index 45fb04e1b01b..0e8e49a74588 100644
--- a/tests/system/HTTP/RedirectResponseTest.php
+++ b/tests/system/HTTP/RedirectResponseTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Config\Factories;
diff --git a/tests/system/HTTP/RequestTest.php b/tests/system/HTTP/RequestTest.php
index 108f0363c80a..7a6920c55eae 100644
--- a/tests/system/HTTP/RequestTest.php
+++ b/tests/system/HTTP/RequestTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/HTTP/ResponseCookieTest.php b/tests/system/HTTP/ResponseCookieTest.php
index 6e34e3d81bd6..721a2fbd47b7 100644
--- a/tests/system/HTTP/ResponseCookieTest.php
+++ b/tests/system/HTTP/ResponseCookieTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Cookie\Cookie;
diff --git a/tests/system/HTTP/ResponseSendTest.php b/tests/system/HTTP/ResponseSendTest.php
index f462f3d2f9d0..5fedc69da7b1 100644
--- a/tests/system/HTTP/ResponseSendTest.php
+++ b/tests/system/HTTP/ResponseSendTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php
index cfb86a4319ae..dc50aa432140 100644
--- a/tests/system/HTTP/ResponseTest.php
+++ b/tests/system/HTTP/ResponseTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Config\Factories;
diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php
index 206e937bff86..ebcbae35e0f9 100644
--- a/tests/system/HTTP/URITest.php
+++ b/tests/system/HTTP/URITest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Config\Factories;
diff --git a/tests/system/HTTP/UserAgentTest.php b/tests/system/HTTP/UserAgentTest.php
index b19538465647..6b80d8f25b30 100644
--- a/tests/system/HTTP/UserAgentTest.php
+++ b/tests/system/HTTP/UserAgentTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\HTTP;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Helpers/ArrayHelperTest.php b/tests/system/Helpers/ArrayHelperTest.php
index 532f8acc3398..2afe59a1369e 100644
--- a/tests/system/Helpers/ArrayHelperTest.php
+++ b/tests/system/Helpers/ArrayHelperTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Helpers/CookieHelperTest.php b/tests/system/Helpers/CookieHelperTest.php
index f6060775e801..13eae956faea 100755
--- a/tests/system/Helpers/CookieHelperTest.php
+++ b/tests/system/Helpers/CookieHelperTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Cookie\Exceptions\CookieException;
diff --git a/tests/system/Helpers/DateHelperTest.php b/tests/system/Helpers/DateHelperTest.php
index da9de130e183..0f7befd5a975 100644
--- a/tests/system/Helpers/DateHelperTest.php
+++ b/tests/system/Helpers/DateHelperTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php
index e04c5b3e8213..25a1cb1680bd 100644
--- a/tests/system/Helpers/FilesystemHelperTest.php
+++ b/tests/system/Helpers/FilesystemHelperTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
index 609460669688..e7a669847ed9 100644
--- a/tests/system/Helpers/FormHelperTest.php
+++ b/tests/system/Helpers/FormHelperTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\HTTP\URI;
diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index 7b1c29827fcd..71c145fc26da 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Files\Exceptions\FileNotFoundException;
diff --git a/tests/system/Helpers/InflectorHelperTest.php b/tests/system/Helpers/InflectorHelperTest.php
index 8f074c639b87..9085edf4a395 100755
--- a/tests/system/Helpers/InflectorHelperTest.php
+++ b/tests/system/Helpers/InflectorHelperTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Helpers/NumberHelperTest.php b/tests/system/Helpers/NumberHelperTest.php
index da5c77eea44f..286440d7423b 100755
--- a/tests/system/Helpers/NumberHelperTest.php
+++ b/tests/system/Helpers/NumberHelperTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Helpers/SecurityHelperTest.php b/tests/system/Helpers/SecurityHelperTest.php
index afa24b0c6546..3e1d8c332080 100644
--- a/tests/system/Helpers/SecurityHelperTest.php
+++ b/tests/system/Helpers/SecurityHelperTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Helpers/TextHelperTest.php b/tests/system/Helpers/TextHelperTest.php
index 50f110938854..0853ed46c6f4 100755
--- a/tests/system/Helpers/TextHelperTest.php
+++ b/tests/system/Helpers/TextHelperTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Helpers/URLHelper/CurrentUrlTest.php b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
index 2a00c76dea99..6dc5de5a4829 100644
--- a/tests/system/Helpers/URLHelper/CurrentUrlTest.php
+++ b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers\URLHelper;
 
 use CodeIgniter\Config\Factories;
diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php
index b62243bfe043..b761b5af8fce 100644
--- a/tests/system/Helpers/URLHelper/MiscUrlTest.php
+++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers\URLHelper;
 
 use CodeIgniter\Config\Factories;
diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php
index ce5d5004be29..cd9c0f816646 100644
--- a/tests/system/Helpers/URLHelper/SiteUrlTest.php
+++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers\URLHelper;
 
 use CodeIgniter\Config\Factories;
diff --git a/tests/system/Helpers/XMLHelperTest.php b/tests/system/Helpers/XMLHelperTest.php
index 00effb13e38f..539383286146 100644
--- a/tests/system/Helpers/XMLHelperTest.php
+++ b/tests/system/Helpers/XMLHelperTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/HomeTest.php b/tests/system/HomeTest.php
index 7e47df728df7..fca482d3dec8 100644
--- a/tests/system/HomeTest.php
+++ b/tests/system/HomeTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Honeypot/HoneypotTest.php b/tests/system/Honeypot/HoneypotTest.php
index 29db05fdd897..e7f6893b9cf9 100644
--- a/tests/system/Honeypot/HoneypotTest.php
+++ b/tests/system/Honeypot/HoneypotTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Honeypot;
 
 use CodeIgniter\Config\Services;
diff --git a/tests/system/I18n/TimeDifferenceTest.php b/tests/system/I18n/TimeDifferenceTest.php
index b2878f19bff4..0e73b13341d8 100644
--- a/tests/system/I18n/TimeDifferenceTest.php
+++ b/tests/system/I18n/TimeDifferenceTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\I18n;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php
index fad994c978df..70b5ca05fbd7 100644
--- a/tests/system/I18n/TimeTest.php
+++ b/tests/system/I18n/TimeTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\I18n;
 
 use CodeIgniter\I18n\Exceptions\I18nException;
diff --git a/tests/system/Images/BaseHandlerTest.php b/tests/system/Images/BaseHandlerTest.php
index 645a3104cb67..dddcf2bdf097 100644
--- a/tests/system/Images/BaseHandlerTest.php
+++ b/tests/system/Images/BaseHandlerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Images;
 
 use CodeIgniter\Config\Services;
diff --git a/tests/system/Images/GDHandlerTest.php b/tests/system/Images/GDHandlerTest.php
index 3c7617f79a00..e93995d2072e 100644
--- a/tests/system/Images/GDHandlerTest.php
+++ b/tests/system/Images/GDHandlerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Images;
 
 use CodeIgniter\Config\Services;
diff --git a/tests/system/Images/ImageMagickHandlerTest.php b/tests/system/Images/ImageMagickHandlerTest.php
index d2c58f32968e..1c97baeac0e5 100644
--- a/tests/system/Images/ImageMagickHandlerTest.php
+++ b/tests/system/Images/ImageMagickHandlerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Images;
 
 use CodeIgniter\Config\Services;
diff --git a/tests/system/Images/ImageTest.php b/tests/system/Images/ImageTest.php
index 163addcf78f2..f011a76a2bc8 100644
--- a/tests/system/Images/ImageTest.php
+++ b/tests/system/Images/ImageTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Images;
 
 use CodeIgniter\Images\Exceptions\ImageException;
diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php
index 93d10fc07c8e..072c5a2eb1c1 100644
--- a/tests/system/Language/LanguageTest.php
+++ b/tests/system/Language/LanguageTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Language;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
index fb9897ae59ea..1060f90da512 100644
--- a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
+++ b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Log\Handlers;
 
 use CodeIgniter\Services;
diff --git a/tests/system/Log/Handlers/ErrorlogHandlerTest.php b/tests/system/Log/Handlers/ErrorlogHandlerTest.php
index ca8203a2e116..f30d67ccdaa4 100644
--- a/tests/system/Log/Handlers/ErrorlogHandlerTest.php
+++ b/tests/system/Log/Handlers/ErrorlogHandlerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Log\Handlers;
 
 use CodeIgniter\Log\Exceptions\LogException;
diff --git a/tests/system/Log/Handlers/FileHandlerTest.php b/tests/system/Log/Handlers/FileHandlerTest.php
index add23b7ba1b5..e2ea5246ad86 100644
--- a/tests/system/Log/Handlers/FileHandlerTest.php
+++ b/tests/system/Log/Handlers/FileHandlerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Log\Handlers;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Log/LoggerTest.php b/tests/system/Log/LoggerTest.php
index 45420e64a90b..b092cb31041b 100644
--- a/tests/system/Log/LoggerTest.php
+++ b/tests/system/Log/LoggerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Log;
 
 use CodeIgniter\Exceptions\FrameworkException;
diff --git a/tests/system/Models/CountAllModelTest.php b/tests/system/Models/CountAllModelTest.php
index aa3bc1e4f734..f4c89e2bbeec 100644
--- a/tests/system/Models/CountAllModelTest.php
+++ b/tests/system/Models/CountAllModelTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use Tests\Support\Models\UserModel;
diff --git a/tests/system/Models/DeleteModelTest.php b/tests/system/Models/DeleteModelTest.php
index 1014e2e941b5..9b04f2c13a46 100644
--- a/tests/system/Models/DeleteModelTest.php
+++ b/tests/system/Models/DeleteModelTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use CodeIgniter\Database\Exceptions\DatabaseException;
diff --git a/tests/system/Models/EventsModelTest.php b/tests/system/Models/EventsModelTest.php
index 6492975f52f0..09194396099c 100644
--- a/tests/system/Models/EventsModelTest.php
+++ b/tests/system/Models/EventsModelTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use CodeIgniter\Database\Exceptions\DataException;
diff --git a/tests/system/Models/FindModelTest.php b/tests/system/Models/FindModelTest.php
index f044833a6f78..928117a213ad 100644
--- a/tests/system/Models/FindModelTest.php
+++ b/tests/system/Models/FindModelTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use CodeIgniter\Database\Exceptions\DataException;
diff --git a/tests/system/Models/GeneralModelTest.php b/tests/system/Models/GeneralModelTest.php
index eef1ba1783cd..93a3cfc4300d 100644
--- a/tests/system/Models/GeneralModelTest.php
+++ b/tests/system/Models/GeneralModelTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use BadMethodCallException;
diff --git a/tests/system/Models/InsertModelTest.php b/tests/system/Models/InsertModelTest.php
index 95339157d2f7..93a47999d45f 100644
--- a/tests/system/Models/InsertModelTest.php
+++ b/tests/system/Models/InsertModelTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use CodeIgniter\Database\Exceptions\DataException;
diff --git a/tests/system/Models/LiveModelTestCase.php b/tests/system/Models/LiveModelTestCase.php
index 9b92998d1fbd..34e0c334418b 100644
--- a/tests/system/Models/LiveModelTestCase.php
+++ b/tests/system/Models/LiveModelTestCase.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use CodeIgniter\Database\BaseConnection;
diff --git a/tests/system/Models/MiscellaneousModelTest.php b/tests/system/Models/MiscellaneousModelTest.php
index 80e05d76c3c0..e70ff51c4789 100644
--- a/tests/system/Models/MiscellaneousModelTest.php
+++ b/tests/system/Models/MiscellaneousModelTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use CodeIgniter\Database\Exceptions\DataException;
diff --git a/tests/system/Models/PaginateModelTest.php b/tests/system/Models/PaginateModelTest.php
index e7ac070e4909..d5901bd702c4 100644
--- a/tests/system/Models/PaginateModelTest.php
+++ b/tests/system/Models/PaginateModelTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use Tests\Support\Models\UserModel;
diff --git a/tests/system/Models/SaveModelTest.php b/tests/system/Models/SaveModelTest.php
index da624349c6d0..59963c3e4946 100644
--- a/tests/system/Models/SaveModelTest.php
+++ b/tests/system/Models/SaveModelTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use CodeIgniter\Database\Exceptions\DataException;
diff --git a/tests/system/Models/UpdateModelTest.php b/tests/system/Models/UpdateModelTest.php
index 34719c661ac3..50847b620c8a 100644
--- a/tests/system/Models/UpdateModelTest.php
+++ b/tests/system/Models/UpdateModelTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use CodeIgniter\Database\Exceptions\DataException;
diff --git a/tests/system/Models/ValidationModelTest.php b/tests/system/Models/ValidationModelTest.php
index 78d431b704f0..b97532a09d68 100644
--- a/tests/system/Models/ValidationModelTest.php
+++ b/tests/system/Models/ValidationModelTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Models;
 
 use CodeIgniter\Config\Factories;
diff --git a/tests/system/Pager/PagerRendererTest.php b/tests/system/Pager/PagerRendererTest.php
index a4bbbf4e49ff..90546a31b117 100644
--- a/tests/system/Pager/PagerRendererTest.php
+++ b/tests/system/Pager/PagerRendererTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Pager;
 
 use CodeIgniter\HTTP\URI;
diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index 912a02a95b1a..99d2bf7102bd 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Pager;
 
 use CodeIgniter\HTTP\URI;
diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index f24adc1e7b4b..5f2e58994d10 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\RESTful;
 
 use CodeIgniter\CodeIgniter;
diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php
index 17eefadc8952..2f0a332a57f9 100644
--- a/tests/system/RESTful/ResourcePresenterTest.php
+++ b/tests/system/RESTful/ResourcePresenterTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\RESTful;
 
 use CodeIgniter\CodeIgniter;
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index b6350381b911..609a6a5106df 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Router;
 
 use CodeIgniter\Config\Services;
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index c305def0a203..82ea515f600b 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Router;
 
 use CodeIgniter\Config\Services;
diff --git a/tests/system/Security/SecurityTest.php b/tests/system/Security/SecurityTest.php
index 0743f4b36e69..aadb84aa775b 100644
--- a/tests/system/Security/SecurityTest.php
+++ b/tests/system/Security/SecurityTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Security;
 
 use CodeIgniter\Config\Factories;
diff --git a/tests/system/Session/SessionTest.php b/tests/system/Session/SessionTest.php
index a125badd461b..b6989b299db0 100644
--- a/tests/system/Session/SessionTest.php
+++ b/tests/system/Session/SessionTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Session;
 
 use CodeIgniter\Config\Factories;
diff --git a/tests/system/Test/BootstrapFCPATHTest.php b/tests/system/Test/BootstrapFCPATHTest.php
index e05e7215fda2..c3fe92aa2d9d 100644
--- a/tests/system/Test/BootstrapFCPATHTest.php
+++ b/tests/system/Test/BootstrapFCPATHTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test;
 
 /**
diff --git a/tests/system/Test/ControllerTestTraitTest.php b/tests/system/Test/ControllerTestTraitTest.php
index 846e759b00c3..65a671bf4df9 100644
--- a/tests/system/Test/ControllerTestTraitTest.php
+++ b/tests/system/Test/ControllerTestTraitTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test;
 
 use App\Controllers\Home;
diff --git a/tests/system/Test/DOMParserTest.php b/tests/system/Test/DOMParserTest.php
index 7eee8d5612e5..1e6d07c6c4e0 100644
--- a/tests/system/Test/DOMParserTest.php
+++ b/tests/system/Test/DOMParserTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test;
 
 use InvalidArgumentException;
diff --git a/tests/system/Test/FabricatorTest.php b/tests/system/Test/FabricatorTest.php
index e3d458dc9310..f7ba5781979a 100644
--- a/tests/system/Test/FabricatorTest.php
+++ b/tests/system/Test/FabricatorTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test;
 
 use CodeIgniter\Database\ModelFactory;
diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php
index 8569820d82da..74e7bcef24a2 100644
--- a/tests/system/Test/FeatureTestTraitTest.php
+++ b/tests/system/Test/FeatureTestTraitTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test;
 
 use CodeIgniter\Exceptions\PageNotFoundException;
diff --git a/tests/system/Test/FilterTestTraitTest.php b/tests/system/Test/FilterTestTraitTest.php
index fef2d63756df..15b98379fbcf 100644
--- a/tests/system/Test/FilterTestTraitTest.php
+++ b/tests/system/Test/FilterTestTraitTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test;
 
 use CodeIgniter\Filters\Filters;
diff --git a/tests/system/Test/ReflectionHelperTest.php b/tests/system/Test/ReflectionHelperTest.php
index 23ccb3605098..c2f514695973 100644
--- a/tests/system/Test/ReflectionHelperTest.php
+++ b/tests/system/Test/ReflectionHelperTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test;
 
 /**
diff --git a/tests/system/Test/TestCaseEmissionsTest.php b/tests/system/Test/TestCaseEmissionsTest.php
index 33e4647bf97b..5374cd61d327 100644
--- a/tests/system/Test/TestCaseEmissionsTest.php
+++ b/tests/system/Test/TestCaseEmissionsTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test;
 
 use CodeIgniter\HTTP\Response;
diff --git a/tests/system/Test/TestCaseTest.php b/tests/system/Test/TestCaseTest.php
index d47bee950c02..a2c798d21cc6 100644
--- a/tests/system/Test/TestCaseTest.php
+++ b/tests/system/Test/TestCaseTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test;
 
 use CodeIgniter\CLI\CLI;
diff --git a/tests/system/Test/TestResponseTest.php b/tests/system/Test/TestResponseTest.php
index 6bbec24a1451..5bb3da21f1e7 100644
--- a/tests/system/Test/TestResponseTest.php
+++ b/tests/system/Test/TestResponseTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Test;
 
 use CodeIgniter\HTTP\RedirectResponse;
diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php
index 19a9f1641d74..a7905a2f59bf 100644
--- a/tests/system/Throttle/ThrottleTest.php
+++ b/tests/system/Throttle/ThrottleTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Throttle;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Typography/TypographyTest.php b/tests/system/Typography/TypographyTest.php
index 9ed3646a07d5..ad242ee273c7 100644
--- a/tests/system/Typography/TypographyTest.php
+++ b/tests/system/Typography/TypographyTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Typography;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php
index ea0e5d040a06..a225b8291c61 100644
--- a/tests/system/Validation/CreditCardRulesTest.php
+++ b/tests/system/Validation/CreditCardRulesTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Validation;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Validation/FileRulesTest.php b/tests/system/Validation/FileRulesTest.php
index ff6f2a319a1b..0e4e70ec537f 100644
--- a/tests/system/Validation/FileRulesTest.php
+++ b/tests/system/Validation/FileRulesTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Validation;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php
index 649275042819..89a078171ee0 100644
--- a/tests/system/Validation/FormatRulesTest.php
+++ b/tests/system/Validation/FormatRulesTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Validation;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
index ef281711ae77..6ab0d9c8e465 100644
--- a/tests/system/Validation/RulesTest.php
+++ b/tests/system/Validation/RulesTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Validation;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index 2252a8bce802..583ff28ee221 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Validation;
 
 use CodeIgniter\HTTP\IncomingRequest;
diff --git a/tests/system/View/CellTest.php b/tests/system/View/CellTest.php
index bb0e2db1a5d6..2d05fad5fbf2 100644
--- a/tests/system/View/CellTest.php
+++ b/tests/system/View/CellTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\View;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/View/ParserFilterTest.php b/tests/system/View/ParserFilterTest.php
index 19b20102012b..d1670f60a119 100644
--- a/tests/system/View/ParserFilterTest.php
+++ b/tests/system/View/ParserFilterTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\View;
 
 use CodeIgniter\Config\Services;
diff --git a/tests/system/View/ParserPluginTest.php b/tests/system/View/ParserPluginTest.php
index 3b43d9c42d12..df773a375df8 100644
--- a/tests/system/View/ParserPluginTest.php
+++ b/tests/system/View/ParserPluginTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\View;
 
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php
index 3328bfe2d910..dc45de761c76 100644
--- a/tests/system/View/ParserTest.php
+++ b/tests/system/View/ParserTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\View;
 
 use CodeIgniter\Autoloader\FileLocator;
diff --git a/tests/system/View/TableTest.php b/tests/system/View/TableTest.php
index efb0e31ad00b..a96d03bf7657 100644
--- a/tests/system/View/TableTest.php
+++ b/tests/system/View/TableTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\View;
 
 use CodeIgniter\Database\MySQLi\Result;
diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php
index 7f8b0e24cbb7..6003e5134b6a 100644
--- a/tests/system/View/ViewTest.php
+++ b/tests/system/View/ViewTest.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\View;
 
 use CodeIgniter\Config\Services;
diff --git a/utils/PHPStan/CheckFrameworkExceptionInstantiationViaNamedConstructorRule.php b/utils/PHPStan/CheckFrameworkExceptionInstantiationViaNamedConstructorRule.php
index b16edcaeb5a9..a2cefaddfdd7 100644
--- a/utils/PHPStan/CheckFrameworkExceptionInstantiationViaNamedConstructorRule.php
+++ b/utils/PHPStan/CheckFrameworkExceptionInstantiationViaNamedConstructorRule.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Utils\PHPStan;
 
 use CodeIgniter\Exceptions\FrameworkException;
diff --git a/utils/PHPStan/CheckUseStatementsAfterLicenseRule.php b/utils/PHPStan/CheckUseStatementsAfterLicenseRule.php
index 2f462e0698db..2bcd0e20f9a9 100644
--- a/utils/PHPStan/CheckUseStatementsAfterLicenseRule.php
+++ b/utils/PHPStan/CheckUseStatementsAfterLicenseRule.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Utils\PHPStan;
 
 use PhpParser\Comment\Doc;
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 3f8cfeba35d2..46ccb75356fb 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Utils\PhpCsFixer;
 
 use Nexus\CsConfig\Ruleset\AbstractRuleset;
diff --git a/utils/Rector/PassStrictParameterToFunctionParameterRector.php b/utils/Rector/PassStrictParameterToFunctionParameterRector.php
index 9ed09e086bbf..c6e92bb9d418 100644
--- a/utils/Rector/PassStrictParameterToFunctionParameterRector.php
+++ b/utils/Rector/PassStrictParameterToFunctionParameterRector.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Utils\Rector;
 
 use PhpParser\Node;
diff --git a/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php b/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php
index 4e36f10311e6..b083b5daff87 100644
--- a/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php
+++ b/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Utils\Rector;
 
 use PhpParser\Node;
diff --git a/utils/Rector/RemoveVarTagFromClassConstantRector.php b/utils/Rector/RemoveVarTagFromClassConstantRector.php
index 93c0f9ea5155..d780c8647cbd 100644
--- a/utils/Rector/RemoveVarTagFromClassConstantRector.php
+++ b/utils/Rector/RemoveVarTagFromClassConstantRector.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Utils\Rector;
 
 use PhpParser\Node;
diff --git a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
index 479fa8acea59..005355bb7fd6 100644
--- a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
+++ b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
@@ -2,6 +2,15 @@
 
 declare(strict_types=1);
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Utils\Rector;
 
 use Nette\Utils\Strings;

From c29d1761bfc8b29de227f401deb506d5879491e1 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Wed, 21 Jul 2021 08:30:09 +0700
Subject: [PATCH 0093/2325] [Rector] Update rector to 0.11.37, clean up config

---
 composer.json | 2 +-
 rector.php    | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index ef116fc0887e..d86e9bd065d7 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "phpstan/phpstan": "0.12.91",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.36",
+        "rector/rector": "0.11.37",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {
diff --git a/rector.php b/rector.php
index bc01a45eb11f..b8605abc0e10 100644
--- a/rector.php
+++ b/rector.php
@@ -58,13 +58,8 @@
         __DIR__ . '/system/ThirdParty',
         __DIR__ . '/tests/system/Config/fixtures',
         __DIR__ . '/tests/_support',
-        PassStrictParameterToFunctionParameterRector::class => [__DIR__ . '/tests/system/Database/Live/SelectTest.php'],
         JsonThrowOnErrorRector::class,
         StringifyStrNeedlesRector::class,
-        InlineIfToExplicitIfRector::class => [
-            __DIR__ . '/app/Config',
-            __DIR__ . '/system/Test/bootstrap.php',
-        ],
     ]);
 
     // auto import fully qualified class names

From 44a19dbe09c209096b1f7dde7dfec379be53130a Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 22 Jul 2021 20:31:47 +0800
Subject: [PATCH 0094/2325] Update to phpdocumentor v3.0 (#4773)

---
 .github/workflows/deploy-apidocs.yml | 49 ++++++++++++++---------
 phpdoc.dist.xml                      | 58 +++++++++++++---------------
 2 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/.github/workflows/deploy-apidocs.yml b/.github/workflows/deploy-apidocs.yml
index 393adaf7c277..2a7ff4115dcf 100644
--- a/.github/workflows/deploy-apidocs.yml
+++ b/.github/workflows/deploy-apidocs.yml
@@ -1,6 +1,6 @@
 # When changes are pushed to the develop branch,
 # build the current version of the API documentation
-# with phpDocumentor and deploy it to the api branch.
+# with phpDocumentor and deploy it to codeigniter4/api.
 name: Deploy API Documentation
 
 on:
@@ -9,13 +9,13 @@ on:
       - 'develop'
     paths:
       - 'system/**'
+      - '.github/workflows/deploy-apidocs.yml'
 
 jobs:
-
   build:
     name: Deploy to api
-    if: (github.repository == 'codeigniter4/CodeIgniter4')
-    runs-on: ubuntu-latest
+    if: github.repository == 'codeigniter4/CodeIgniter4'
+    runs-on: ubuntu-20.04
     steps:
       - name: Setup credentials
         run: |
@@ -37,37 +37,48 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
+          # phpDocumentor v3.0 does not have support yet for PHP 8.0
           php-version: '7.4'
           extensions: intl
 
       - name: Install GraphViz for phpDocumentor
         run: |
-          sudo apt install -yq graphviz
+          sudo apt-get install -yq graphviz
 
-      - name: Download phpDocumentor
+      - name: Download phpDocumentor v3.0
         run: |
           cd ./source
           curl \
-            -L https://github.com/phpDocumentor/phpDocumentor/releases/download/v2.9.1/phpDocumentor.phar \
+            -L https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.0.0/phpDocumentor.phar \
             -o admin/phpDocumentor.phar
 
-      - name: Prepare
+      - name: Prepare API repo
+        working-directory: api
         run: |
-          cd ./api
-          rm -rf ./api/docs*
-          mkdir -p ./api/docs
+          rm -rf api/docs*
+          mkdir -p api/docs
           git reset --hard master
 
-      - name: Build
+      - name: Build API in source repo
+        working-directory: source
         run: |
-          cd ./source
-          chmod +x admin/phpDocumentor.phar
-          admin/phpDocumentor.phar
+          php admin/phpDocumentor.phar run --ansi --verbose
           cp -R ${GITHUB_WORKSPACE}/source/api/build/* ${GITHUB_WORKSPACE}/api/docs
 
-      - name: Deploy
+      - name: Deploy to API repo
+        working-directory: api
         run: |
-          cd ./api
           git add .
-          git commit -m "API sync for ${GITHUB_SHA}"
-          git push
+          git commit -m "Updated API for commit ${GITHUB_SHA}"
+          git push origin master
+
+  upload:
+    if: github.repository == 'codeigniter4/CodeIgniter4'
+    runs-on: ubuntu-20.04
+    needs: [build]
+    steps:
+      - name: Upload API Documentation
+        uses: actions/upload-artifact@v2
+        with:
+          name: API Documentation
+          path: api/docs/
diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml
index d88de8d9a259..157b02055990 100644
--- a/phpdoc.dist.xml
+++ b/phpdoc.dist.xml
@@ -1,33 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<phpdoc>
+<phpdocumentor
+    configVersion="3"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://www.phpdoc.org"
+    xsi:noNamespaceSchemaLocation="https://docs.phpdoc.org/latest/phpdoc.xsd"
+>
     <title>CodeIgniter v4.0.0 API</title>
-    <parser>
-        <target>api/data/</target>
-    </parser>
-    <transformer>
-        <target>api/build/</target>
-    </transformer>
-    <files>
-        <directory>system</directory>
-        <ignore>vendor/*</ignore>
-        <ignore>tests/*</ignore>
-        <ignore>ThirdParty/*</ignore>
-        <ignore>*.tpl.php</ignore>
-        <ignore>*.js.php</ignore>
-        <ignore>bootstrap.php</ignore>
-        <ignore>Validation/Views/*</ignore>
-        <ignore>Pager/Views/</ignore>
-    </files>
-
-    <logging>
-        <level>err</level>
-        <paths>
-            <default>api/log/{DATE}.log</default>
-            <errors>api/{DATE}.errors.log</errors>
-        </paths>
-    </logging>
-
-    <transformations>
-        <template name="responsive-twig" />
-    </transformations>
-</phpdoc>
+    <paths>
+        <output>api/build/</output>
+        <cache>api/cache/</cache>
+    </paths>
+    <version number="4.0.0">
+        <api format="php">
+            <source dsn=".">
+                <path>system</path>
+            </source>
+            <output>api</output>
+            <ignore hidden="true" symlinks="true">
+                <path>system/ThirdParty/**/*</path>
+                <path>*.tpl.php</path>
+                <path>*.js.php</path>
+                <path>**/Views/*</path>
+                <path>bootstrap.php</path>
+            </ignore>
+        </api>
+    </version>
+    <template name="default" />
+</phpdocumentor>

From 627d86f0aef914065db486796b7880806a76497d Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 22 Jul 2021 20:48:37 +0800
Subject: [PATCH 0095/2325] Remove upload step

---
 .github/workflows/deploy-apidocs.yml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/.github/workflows/deploy-apidocs.yml b/.github/workflows/deploy-apidocs.yml
index 2a7ff4115dcf..fd40e7aa13c1 100644
--- a/.github/workflows/deploy-apidocs.yml
+++ b/.github/workflows/deploy-apidocs.yml
@@ -71,14 +71,3 @@ jobs:
           git add .
           git commit -m "Updated API for commit ${GITHUB_SHA}"
           git push origin master
-
-  upload:
-    if: github.repository == 'codeigniter4/CodeIgniter4'
-    runs-on: ubuntu-20.04
-    needs: [build]
-    steps:
-      - name: Upload API Documentation
-        uses: actions/upload-artifact@v2
-        with:
-          name: API Documentation
-          path: api/docs/

From c44a1505dbe66ee1ebfffd49d1e8f2aa631a2909 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sat, 24 Jul 2021 08:22:00 +0700
Subject: [PATCH 0096/2325] [PHPStan] Using PHPStan ^0.12.91

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index d86e9bd065d7..6e22b4d569f6 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.1",
         "nexusphp/tachycardia": "^1.0",
-        "phpstan/phpstan": "0.12.91",
+        "phpstan/phpstan": "^0.12.91",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
         "rector/rector": "0.11.37",

From f58a15c6a3ff56f887a4f2e61cf5c911c7197e0d Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Sat, 24 Jul 2021 16:58:25 +0800
Subject: [PATCH 0097/2325] Add workflow for linting framework (#4958)

---
 .github/workflows/test-coding-standards.yml | 59 +++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 .github/workflows/test-coding-standards.yml

diff --git a/.github/workflows/test-coding-standards.yml b/.github/workflows/test-coding-standards.yml
new file mode 100644
index 000000000000..cb7d9671e2cd
--- /dev/null
+++ b/.github/workflows/test-coding-standards.yml
@@ -0,0 +1,59 @@
+name: Coding Standards
+
+on:
+  push:
+    paths:
+      - '**.php'
+      - 'spark'
+      - '.github/workflows/test-coding-standards.yml'
+  pull_request:
+    paths:
+      - '**.php'
+      - 'spark'
+      - '.github/workflows/test-coding-standards.yml'
+
+jobs:
+  lint:
+    name: PHP ${{ matrix.php-version }} Lint with PHP CS Fixer
+    runs-on: ubuntu-20.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version:
+          - '7.3'
+          - '7.4'
+          - '8.0'
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: tokenizer
+          coverage: none
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.php-version }}-
+            ${{ runner.os }}-
+
+      - name: Install dependencies
+        run: composer update --ansi --no-interaction
+
+      - name: Run lint on `app/`, `admin/`, `public/`
+        run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.no-header.php-cs-fixer.dist.php --using-cache=no --diff
+
+      - name: Run lint on `system/`, `tests`, `utils/`, and root PHP files
+        run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --using-cache=no --diff

From a037b50012a2f28b64e12d5c118e22658cef24e5 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Sat, 24 Jul 2021 17:01:13 +0800
Subject: [PATCH 0098/2325] Update pre-commit to lint code (#4960)

---
 admin/pre-commit | 54 +++++++++++++++++++++++++++++++++++-------------
 admin/setup.sh   |  2 +-
 2 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/admin/pre-commit b/admin/pre-commit
index 16329801bd38..46b36987da2a 100644
--- a/admin/pre-commit
+++ b/admin/pre-commit
@@ -4,49 +4,75 @@ PROJECT=`php -r "echo dirname(dirname(dirname(realpath('$0'))));"`
 STAGED_FILES_CMD=`git diff --cached --name-only --diff-filter=ACMR HEAD | grep \\\\.php$`
 
 # Determine if a file list is passed
-if [ "$#" -eq 1 ]
-then
+if [ "$#" -eq 1 ]; then
     oIFS=$IFS
     IFS='
     '
     SFILES="$1"
     IFS=$oIFS
 fi
+
 SFILES=${SFILES:-$STAGED_FILES_CMD}
 
 echo "Starting CodeIgniter precommit..."
 
-if [ "$SFILES" != "" ]
-then
+if [ "$SFILES" != "" ]; then
     echo "Linting PHP code..."
-    for FILE in $SFILES
-    do
+    for FILE in $SFILES; do
         php -l -d display_errors=0 "$PROJECT/$FILE"
-        if [ $? != 0 ]
-        then
+
+        if [ $? != 0 ]; then
             echo "Fix the error(s) before commit."
             exit 1
         fi
+
         FILES="$FILES $FILE"
     done
 fi
 
-if [ "$FILES" != "" ]
-then
+if [ "$FILES" != "" ]; then
     echo "Running PHPStan..."
+
     # Run on whole codebase
-    if [ -d /proc/cygdrive ]
-    then
+    if [ -d /proc/cygdrive ]; then
         ./vendor/bin/phpstan analyse
     else
         php ./vendor/bin/phpstan analyse
     fi
 
-    if [ $? != 0 ]
-    then
+    if [ $? != 0 ]; then
         echo "Fix the phpstan error(s) before commit."
         exit 1
     fi
 fi
 
+if [ "$FILES" != "" ]; then
+    echo "Running PHP CS Fixer..."
+
+    # Run on whole codebase to skip on unnecessary filtering
+    # Run first on app, admin, public
+    if [ -d /proc/cygdrive ]; then
+        ./vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no --diff --config=.no-header.php-cs-fixer.dist.php
+    else
+        php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no --diff --config=.no-header.php-cs-fixer.dist.php
+    fi
+
+    if [ $? != 0 ]; then
+        echo "Files in app, admin, or public are not following the coding standards. Please fix them before commit."
+        exit 1
+    fi
+
+    # Next, run on system, tests, utils, and root PHP files
+    if [ -d /proc/cygdrive ]; then
+        ./vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no --diff
+    else
+        php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no --diff
+    fi
+
+    if [ $? != 0]; then
+        echo "Files in system, tests, utils, or root are not following the coding standards. Please fix them before commit."
+        exit 1
+    fi
+fi
+
 exit $?
diff --git a/admin/setup.sh b/admin/setup.sh
index 86254e8e8889..55adf547e4bd 100644
--- a/admin/setup.sh
+++ b/admin/setup.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Install a pre-commit hook that
-# automatically runs phpcs to fix styles
+# automatically runs php-cs-fixer to lint code
 mkdir -p .git/hooks
 cp admin/pre-commit .git/hooks/pre-commit
 chmod +x .git/hooks/pre-commit

From b7ec33cd5618f2e4d31fbc2df2f95879c8b7e07a Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Sat, 24 Jul 2021 19:30:51 +0800
Subject: [PATCH 0099/2325] Remove superfluous phpdoc tags (#4941)

---
 app/Config/Format.php                         |   2 -
 app/Config/Mimes.php                          |   3 -
 app/Controllers/BaseController.php            |   4 -
 system/API/ResponseTrait.php                  |  22 +--
 system/Autoloader/Autoloader.php              |  14 --
 system/Autoloader/FileLocator.php             |  31 ----
 system/BaseModel.php                          |  24 ---
 system/CLI/BaseCommand.php                    |  28 +--
 system/CLI/CLI.php                            |  47 +----
 system/CLI/CommandRunner.php                  |   4 -
 system/CLI/Commands.php                       |  13 --
 system/CLI/Console.php                        |   6 -
 system/CLI/Exceptions/CLIException.php        |   3 -
 system/CLI/GeneratorTrait.php                 |  39 ----
 system/Cache/CacheFactory.php                 |   4 -
 system/Cache/CacheInterface.php               |   2 -
 system/Cache/Exceptions/CacheException.php    |   2 -
 system/Cache/Handlers/DummyHandler.php        |   2 -
 system/Cache/Handlers/FileHandler.php         |   8 -
 system/Cache/Handlers/MemcachedHandler.php    |   4 -
 system/Cache/Handlers/PredisHandler.php       |   4 -
 system/Cache/Handlers/RedisHandler.php        |   4 -
 system/Cache/Handlers/WincacheHandler.php     |   4 -
 system/CodeIgniter.php                        |  34 ----
 system/Commands/Cache/ClearCache.php          |   2 -
 system/Commands/Cache/InfoCache.php           |   2 -
 system/Commands/Database/CreateDatabase.php   |   2 -
 system/Commands/Database/Migrate.php          |   2 -
 system/Commands/Database/MigrateRefresh.php   |   2 -
 system/Commands/Database/MigrateRollback.php  |   2 -
 system/Commands/Database/Seed.php             |   2 -
 system/Commands/Encryption/GenerateKey.php    |  25 ---
 .../Commands/Generators/CommandGenerator.php  |   6 -
 .../Commands/Generators/ConfigGenerator.php   |   6 -
 .../Generators/ControllerGenerator.php        |   6 -
 .../Commands/Generators/EntityGenerator.php   |   2 -
 .../Commands/Generators/FilterGenerator.php   |   2 -
 system/Commands/Generators/MigrateCreate.php  |   2 -
 .../Generators/MigrationGenerator.php         |  10 -
 system/Commands/Generators/ModelGenerator.php |   6 -
 .../Commands/Generators/ScaffoldGenerator.php |   2 -
 .../Commands/Generators/SeederGenerator.php   |   2 -
 .../Generators/SessionMigrationGenerator.php  |  10 -
 .../Generators/ValidationGenerator.php        |   2 -
 system/Commands/Help.php                      |   2 -
 .../Commands/Housekeeping/ClearDebugbar.php   |   2 -
 system/Commands/Housekeeping/ClearLogs.php    |   2 -
 system/Commands/ListCommands.php              |   6 -
 system/Commands/Utilities/Environment.php     |   4 -
 system/Commands/Utilities/Namespaces.php      |   2 -
 system/Commands/Utilities/Routes.php          |   2 -
 system/Common.php                             |  87 +--------
 system/ComposerScripts.php                    |  11 --
 system/Config/BaseConfig.php                  |   9 +-
 system/Config/BaseService.php                 |  22 +--
 system/Config/Config.php                      |   1 -
 system/Config/DotEnv.php                      |  25 ---
 system/Config/Factories.php                   |  15 --
 system/Config/Services.php                    | 100 +---------
 system/Controller.php                         |   8 -
 system/Cookie/CloneableCookieInterface.php    |  18 --
 system/Cookie/Cookie.php                      |  22 ---
 system/Cookie/CookieInterface.php             |  32 ----
 system/Cookie/CookieStore.php                 |  39 ----
 system/Cookie/Exceptions/CookieException.php  |   6 -
 system/Database/BaseBuilder.php               | 172 +++---------------
 system/Database/BaseConnection.php            | 116 +-----------
 system/Database/BasePreparedQuery.php         |  21 +--
 system/Database/BaseResult.php                |  35 ----
 system/Database/BaseUtils.php                 |  14 --
 system/Database/Config.php                    |   4 -
 system/Database/ConnectionInterface.php       |  24 +--
 system/Database/Database.php                  |  17 --
 system/Database/Exceptions/DataException.php  |   8 -
 system/Database/Forge.php                     |  57 +-----
 system/Database/MigrationRunner.php           |  46 +----
 system/Database/ModelFactory.php              |   1 -
 system/Database/MySQLi/Builder.php            |   2 -
 system/Database/MySQLi/Connection.php         |  40 ----
 system/Database/MySQLi/Forge.php              |   8 -
 system/Database/MySQLi/PreparedQuery.php      |   9 +-
 system/Database/MySQLi/Result.php             |  10 -
 system/Database/MySQLi/Utils.php              |   2 -
 system/Database/Postgre/Builder.php           |  34 ----
 system/Database/Postgre/Connection.php        |  40 ----
 system/Database/Postgre/Forge.php             |  14 --
 system/Database/Postgre/PreparedQuery.php     |  13 +-
 system/Database/Postgre/Result.php            |  10 -
 system/Database/Postgre/Utils.php             |   2 -
 system/Database/PreparedQueryInterface.php    |   9 +-
 system/Database/Query.php                     |  49 +----
 system/Database/QueryInterface.php            |  21 +--
 system/Database/ResultInterface.php           |  31 ----
 system/Database/SQLSRV/Builder.php            |  40 +---
 system/Database/SQLSRV/Connection.php         |  40 ----
 system/Database/SQLSRV/Forge.php              |  21 ---
 system/Database/SQLSRV/PreparedQuery.php      |  11 +-
 system/Database/SQLSRV/Result.php             |  10 -
 system/Database/SQLSRV/Utils.php              |   2 -
 system/Database/SQLite3/Builder.php           |   6 -
 system/Database/SQLite3/Connection.php        |  40 ----
 system/Database/SQLite3/Forge.php             |  26 +--
 system/Database/SQLite3/PreparedQuery.php     |   9 +-
 system/Database/SQLite3/Result.php            |  10 -
 system/Database/SQLite3/Table.php             |  11 --
 system/Database/SQLite3/Utils.php             |   2 -
 system/Database/Seeder.php                    |  11 --
 system/Debug/Exceptions.php                   |  40 ----
 system/Debug/Iterator.php                     |   8 -
 system/Debug/Timer.php                        |   6 -
 system/Debug/Toolbar.php                      |  26 +--
 .../Toolbar/Collectors/BaseCollector.php      |  28 ---
 system/Debug/Toolbar/Collectors/Config.php    |   2 -
 system/Debug/Toolbar/Collectors/Database.php  |  10 -
 system/Debug/Toolbar/Collectors/Events.php    |   8 -
 system/Debug/Toolbar/Collectors/Files.php     |   8 -
 system/Debug/Toolbar/Collectors/History.php   |   8 -
 system/Debug/Toolbar/Collectors/Logs.php      |   6 -
 system/Debug/Toolbar/Collectors/Routes.php    |   6 -
 system/Debug/Toolbar/Collectors/Timers.php    |   2 -
 system/Debug/Toolbar/Collectors/Views.php     |   8 -
 system/Email/Email.php                        |   2 +
 system/Encryption/Encryption.php              |   2 -
 .../Exceptions/EncryptionException.php        |   2 -
 system/Encryption/Handlers/BaseHandler.php    |   4 -
 system/Entity/Entity.php                      |  26 ---
 system/Entity/Exceptions/CastException.php    |   6 -
 system/Events/Events.php                      |  13 +-
 system/Exceptions/DebugTraceableTrait.php     |   4 -
 system/Files/File.php                         |  19 --
 system/Filters/Exceptions/FilterException.php |   4 -
 system/Filters/FilterInterface.php            |   7 +-
 system/Filters/Filters.php                    |  26 +--
 system/Filters/Honeypot.php                   |   7 +-
 system/Format/Exceptions/FormatException.php  |   4 -
 system/Format/Format.php                      |   6 -
 system/Format/XMLFormatter.php                |   1 -
 system/HTTP/CLIRequest.php                    |  16 --
 system/HTTP/CURLRequest.php                   |  82 +--------
 system/HTTP/ContentSecurityPolicy.php         |  37 +---
 system/HTTP/DownloadResponse.php              |  23 ---
 system/HTTP/Exceptions/HTTPException.php      |  31 ----
 system/HTTP/Files/FileCollection.php          |  12 --
 system/HTTP/Files/UploadedFile.php            |  16 --
 system/HTTP/Files/UploadedFileInterface.php   |  16 --
 system/HTTP/Header.php                        |   7 -
 system/HTTP/IncomingRequest.php               |  41 -----
 system/HTTP/Message.php                       |  12 --
 system/HTTP/MessageInterface.php              |  11 --
 system/HTTP/MessageTrait.php                  |  15 --
 system/HTTP/Negotiate.php                     |  49 +----
 system/HTTP/RedirectResponse.php              |  14 +-
 system/HTTP/Request.php                       |   6 -
 system/HTTP/RequestInterface.php              |   4 -
 system/HTTP/RequestTrait.php                  |   5 +-
 system/HTTP/Response.php                      |   5 -
 system/HTTP/ResponseInterface.php             |  32 +---
 system/HTTP/ResponseTrait.php                 |  29 +--
 system/HTTP/URI.php                           |  62 +------
 system/HTTP/UserAgent.php                     |  36 ----
 system/Helpers/array_helper.php               |   9 -
 system/Helpers/cookie_helper.php              |   7 -
 system/Helpers/date_helper.php                |   4 -
 system/Helpers/filesystem_helper.php          |  28 +--
 system/Helpers/form_helper.php                | 121 ++----------
 system/Helpers/html_helper.php                |  72 +-------
 system/Helpers/inflector_helper.php           |  22 ---
 system/Helpers/number_helper.php              |  20 +-
 system/Helpers/security_helper.php            |  12 --
 system/Helpers/test_helper.php                |   1 +
 system/Helpers/text_helper.php                |  48 -----
 system/Helpers/url_helper.php                 |  45 +----
 system/Helpers/xml_helper.php                 |   5 -
 system/Honeypot/Honeypot.php                  |  10 -
 system/I18n/Exceptions/I18nException.php      |  15 --
 system/I18n/Time.php                          | 123 +------------
 system/I18n/TimeDifference.php                |  21 ---
 system/Images/Handlers/BaseHandler.php        |  53 +-----
 system/Images/Handlers/GDHandler.php          |  27 +--
 system/Images/Handlers/ImageMagickHandler.php |  23 ---
 system/Images/Image.php                       |   4 -
 system/Images/ImageHandlerInterface.php       |  27 +--
 system/Language/Language.php                  |  34 +---
 system/Log/Handlers/BaseHandler.php           |  12 --
 system/Log/Handlers/ChromeLoggerHandler.php   |   4 -
 system/Log/Handlers/ErrorlogHandler.php       |   7 -
 system/Log/Handlers/FileHandler.php           |   4 -
 system/Log/Handlers/HandlerInterface.php      |   8 -
 system/Log/Logger.php                         |  35 ----
 system/Model.php                              |  10 -
 system/Modules/Modules.php                    |   4 -
 system/Pager/Pager.php                        |  80 +-------
 system/Pager/PagerInterface.php               |  53 ------
 system/Pager/PagerRenderer.php                |  32 ----
 system/RESTful/BaseResource.php               |   4 -
 system/RESTful/ResourceController.php         |   2 -
 system/Router/Exceptions/RouterException.php  |   5 -
 system/Router/RouteCollection.php             | 149 +--------------
 system/Router/RouteCollectionInterface.php    |  22 +--
 system/Router/Router.php                      |  21 +--
 system/Router/RouterInterface.php             |   3 +-
 system/Security/Security.php                  |  30 ---
 system/Security/SecurityInterface.php         |  16 --
 system/Session/Handlers/ArrayHandler.php      |  10 -
 system/Session/Handlers/BaseHandler.php       |  13 --
 system/Session/Handlers/DatabaseHandler.php   |  19 --
 system/Session/Handlers/FileHandler.php       |  13 --
 system/Session/Handlers/MemcachedHandler.php  |  17 --
 system/Session/Handlers/RedisHandler.php      |  17 --
 system/Session/Session.php                    |   9 -
 system/Session/SessionInterface.php           |   4 -
 system/Test/CIUnitTestCase.php                |  27 +--
 system/Test/Constraints/SeeInDatabase.php     |  13 --
 system/Test/ControllerResponse.php            |   4 -
 system/Test/ControllerTestTrait.php           |   7 +-
 system/Test/ControllerTester.php              |   7 +-
 system/Test/DOMParser.php                     |  41 +----
 system/Test/DatabaseTestTrait.php             |  21 ---
 system/Test/Fabricator.php                    |  10 -
 system/Test/FeatureTestCase.php               |  40 +---
 system/Test/FeatureTestTrait.php              |  40 +---
 system/Test/FilterTestTrait.php               |   6 -
 system/Test/Mock/MockCache.php                |   2 -
 system/Test/Mock/MockCommon.php               |   2 -
 system/Test/Mock/MockConnection.php           |  54 +-----
 system/Test/Mock/MockLanguage.php             |   8 -
 system/Test/Mock/MockResult.php               |   8 -
 system/Test/TestLogger.php                    |   4 -
 system/Test/TestResponse.php                  |  50 +----
 system/Throttle/Throttler.php                 |  10 -
 system/Throttle/ThrottlerInterface.php        |   2 -
 system/Typography/Typography.php              |  21 +--
 system/Validation/CreditCardRules.php         |   7 -
 system/Validation/FileRules.php               |  30 ---
 system/Validation/FormatRules.php             |  63 -------
 system/Validation/Rules.php                   |  57 +-----
 system/Validation/Validation.php              |  68 +------
 system/Validation/ValidationInterface.php     |  26 ---
 system/View/Cell.php                          |  13 +-
 system/View/Filters.php                       |  68 +------
 system/View/Parser.php                        |  77 +-------
 system/View/Plugins.php                       |  22 ---
 system/View/RendererInterface.php             |  15 +-
 system/View/Table.php                         |   2 -
 system/View/View.php                          |  41 +----
 tests/_support/Autoloader/FatalLocator.php    |   6 -
 tests/_support/Commands/Unsuffixable.php      |   2 -
 tests/_support/Config/Services.php            |   1 -
 tests/_support/Log/Handlers/TestHandler.php   |   2 -
 tests/_support/Services.php                   |   4 -
 .../system/Cache/Handlers/BaseHandlerTest.php |   2 +
 .../system/Cache/Handlers/FileHandlerTest.php |   3 +
 tests/system/Commands/GenerateKeyTest.php     |   2 -
 tests/system/CommonFunctionsTest.php          |   3 +
 tests/system/CommonSingleServiceTest.php      |   8 -
 tests/system/Config/MimesTest.php             |   4 +
 tests/system/Cookie/CookieTest.php            |   7 -
 tests/system/Database/BaseQueryTest.php       |   3 +
 tests/system/Database/Builder/WhereTest.php   |   4 +
 tests/system/Debug/ExceptionsTest.php         |   3 +
 tests/system/Email/EmailTest.php              |   2 +
 tests/system/Format/XMLFormatterTest.php      |   3 -
 tests/system/HTTP/CLIRequestTest.php          |   4 +
 tests/system/HTTP/IncomingRequestTest.php     |   3 +
 tests/system/HTTP/MessageTest.php             |   4 +
 tests/system/HTTP/RequestTest.php             |   4 +
 tests/system/HTTP/URITest.php                 |  18 ++
 tests/system/Helpers/ArrayHelperTest.php      |  19 +-
 .../system/Helpers/URLHelper/MiscUrlTest.php  |  47 +++++
 tests/system/Language/LanguageTest.php        |   2 +
 .../Log/Handlers/ErrorlogHandlerTest.php      |   2 -
 tests/system/Models/DeleteModelTest.php       |   6 +
 tests/system/Models/FindModelTest.php         |   9 +
 tests/system/Models/GeneralModelTest.php      |   7 -
 tests/system/Models/LiveModelTestCase.php     |   5 -
 tests/system/Router/RouteCollectionTest.php   |   4 +
 tests/system/Test/DOMParserTest.php           |   4 +
 tests/system/Test/FeatureTestTraitTest.php    |   4 +
 .../system/Validation/CreditCardRulesTest.php |   3 -
 tests/system/Validation/FormatRulesTest.php   |   4 +
 tests/system/Validation/RulesTest.php         |  10 +
 tests/system/Validation/ValidationTest.php    |  20 +-
 tests/system/View/ParserTest.php              |   3 +
 utils/PhpCsFixer/CodeIgniter4.php             |  19 +-
 284 files changed, 376 insertions(+), 4810 deletions(-)

diff --git a/app/Config/Format.php b/app/Config/Format.php
index fb2bfde59351..533540e27918 100644
--- a/app/Config/Format.php
+++ b/app/Config/Format.php
@@ -64,8 +64,6 @@ class Format extends BaseConfig
     /**
      * A Factory method to return the appropriate formatter for the given mime type.
      *
-     * @param string $mime
-     *
      * @return FormatterInterface
      *
      * @deprecated This is an alias of `\CodeIgniter\Format\Format::getFormatter`. Use that instead.
diff --git a/app/Config/Mimes.php b/app/Config/Mimes.php
index 628dd0db2ff8..973fb3984901 100644
--- a/app/Config/Mimes.php
+++ b/app/Config/Mimes.php
@@ -485,8 +485,6 @@ class Mimes
     /**
      * Attempts to determine the best mime type for the given file extension.
      *
-     * @param string $extension
-     *
      * @return string|null The mime type found, or none if unable to determine.
      */
     public static function guessTypeFromExtension(string $extension)
@@ -503,7 +501,6 @@ public static function guessTypeFromExtension(string $extension)
     /**
      * Attempts to determine the best file extension for a given mime type.
      *
-     * @param string      $type
      * @param string|null $proposedExtension - default extension (in case there is more than one with the same mime type)
      *
      * @return string|null The extension determined, or null if unable to match.
diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php
index ce357b843fe0..0328f140bfdf 100644
--- a/app/Controllers/BaseController.php
+++ b/app/Controllers/BaseController.php
@@ -39,10 +39,6 @@ class BaseController extends Controller
 
     /**
      * Constructor.
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @param LoggerInterface   $logger
      */
     public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
     {
diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
index d83238f66e35..f1be275cc9c9 100644
--- a/system/API/ResponseTrait.php
+++ b/system/API/ResponseTrait.php
@@ -87,7 +87,6 @@ trait ResponseTrait
      *
      * @param array|string|null $data
      * @param int               $status
-     * @param string            $message
      *
      * @return mixed
      */
@@ -125,9 +124,8 @@ public function respond($data = null, ?int $status = null, string $message = '')
      * Used for generic failures that no custom methods exist for.
      *
      * @param array|string $messages
-     * @param int          $status        HTTP status code
-     * @param string|null  $code          Custom, API-specific, error code
-     * @param string       $customMessage
+     * @param int          $status   HTTP status code
+     * @param string|null  $code     Custom, API-specific, error code
      *
      * @return mixed
      */
@@ -207,9 +205,7 @@ public function respondNoContent(string $message = 'No Content')
      * or had bad authorization credentials. User is encouraged to try again
      * with the proper information.
      *
-     * @param string $description
      * @param string $code
-     * @param string $message
      *
      * @return mixed
      */
@@ -222,9 +218,7 @@ public function failUnauthorized(string $description = 'Unauthorized', ?string $
      * Used when access is always denied to this resource and no amount
      * of trying again will help.
      *
-     * @param string $description
      * @param string $code
-     * @param string $message
      *
      * @return mixed
      */
@@ -236,9 +230,7 @@ public function failForbidden(string $description = 'Forbidden', ?string $code =
     /**
      * Used when a specified resource cannot be found.
      *
-     * @param string $description
      * @param string $code
-     * @param string $message
      *
      * @return mixed
      */
@@ -250,9 +242,7 @@ public function failNotFound(string $description = 'Not Found', ?string $code =
     /**
      * Used when the data provided by the client cannot be validated.
      *
-     * @param string $description
      * @param string $code
-     * @param string $message
      *
      * @return mixed
      *
@@ -267,8 +257,6 @@ public function failValidationError(string $description = 'Bad Request', ?string
      * Used when the data provided by the client cannot be validated on one or more fields.
      *
      * @param string|string[] $errors
-     * @param string|null     $code
-     * @param string          $message
      *
      * @return mixed
      */
@@ -280,9 +268,7 @@ public function failValidationErrors($errors, ?string $code = null, string $mess
     /**
      * Use when trying to create a new resource and it already exists.
      *
-     * @param string $description
      * @param string $code
-     * @param string $message
      *
      * @return mixed
      */
@@ -296,9 +282,7 @@ public function failResourceExists(string $description = 'Conflict', ?string $co
      * Not Found, because here we know the data previously existed, but is now gone,
      * where Not Found means we simply cannot find any information about it.
      *
-     * @param string $description
      * @param string $code
-     * @param string $message
      *
      * @return mixed
      */
@@ -310,9 +294,7 @@ public function failResourceGone(string $description = 'Gone', ?string $code = n
     /**
      * Used when the user has made too many requests for the resource recently.
      *
-     * @param string $description
      * @param string $code
-     * @param string $message
      *
      * @return mixed
      */
diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
index 53d5654905ad..dfe1c72a5573 100644
--- a/system/Autoloader/Autoloader.php
+++ b/system/Autoloader/Autoloader.php
@@ -80,9 +80,6 @@ class Autoloader
      * Reads in the configuration array (described above) and stores
      * the valid parts that we'll need.
      *
-     * @param Autoload $config
-     * @param Modules  $modules
-     *
      * @return $this
      */
     public function initialize(Autoload $config, Modules $modules)
@@ -136,7 +133,6 @@ public function register()
      * Registers namespaces with the autoloader.
      *
      * @param array|string $namespace
-     * @param string|null  $path
      *
      * @return $this
      */
@@ -168,8 +164,6 @@ public function addNamespace($namespace, ?string $path = null)
      *
      * If a prefix param is set, returns only paths to the given prefix.
      *
-     * @param string|null $prefix
-     *
      * @return array
      */
     public function getNamespace(?string $prefix = null)
@@ -184,8 +178,6 @@ public function getNamespace(?string $prefix = null)
     /**
      * Removes a single namespace from the psr4 settings.
      *
-     * @param string $namespace
-     *
      * @return $this
      */
     public function removeNamespace(string $namespace)
@@ -200,8 +192,6 @@ public function removeNamespace(string $namespace)
     /**
      * Load a class using available class mapping.
      *
-     * @param string $class
-     *
      * @return false|string
      */
     public function loadClassmap(string $class)
@@ -266,8 +256,6 @@ protected function loadInNamespace(string $class)
     /**
      * A central way to include a file. Split out primarily for testing purposes.
      *
-     * @param string $file
-     *
      * @return false|string The filename on success, false if the file is not loaded
      */
     protected function includeFile(string $file)
@@ -292,8 +280,6 @@ protected function includeFile(string $file)
      * dashes with a single dash. Trim period, dash and underscore from beginning
      * and end of filename.
      *
-     * @param string $filename
-     *
      * @return string The sanitized filename
      */
     public function sanitizeFilename(string $filename): string
diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index 00d4a8ffe993..882815b213d2 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -28,8 +28,6 @@ class FileLocator
 
     /**
      * Constructor
-     *
-     * @param Autoloader $autoloader
      */
     public function __construct(Autoloader $autoloader)
     {
@@ -118,10 +116,6 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
 
     /**
      * Examines a file and returns the fully qualified domain name.
-     *
-     * @param string $file
-     *
-     * @return string
      */
     public function getClassname(string $file): string
     {
@@ -175,12 +169,6 @@ public function getClassname(string $file): string
      *      'app/Modules/foo/Config/Routes.php',
      *      'app/Modules/bar/Config/Routes.php',
      *  ]
-     *
-     * @param string $path
-     * @param string $ext
-     * @param bool   $prioritizeApp
-     *
-     * @return array
      */
     public function search(string $path, string $ext = 'php', bool $prioritizeApp = true): array
     {
@@ -214,11 +202,6 @@ public function search(string $path, string $ext = 'php', bool $prioritizeApp =
 
     /**
      * Ensures a extension is at the end of a filename
-     *
-     * @param string $path
-     * @param string $ext
-     *
-     * @return string
      */
     protected function ensureExt(string $path, string $ext): string
     {
@@ -272,8 +255,6 @@ protected function getNamespaces()
      * Find the qualified name of a file according to
      * the namespace of the first matched namespace path.
      *
-     * @param string $path
-     *
      * @return false|string The qualified name or false if the path is not found
      */
     public function findQualifiedNameFromPath(string $path)
@@ -315,10 +296,6 @@ public function findQualifiedNameFromPath(string $path)
     /**
      * Scans the defined namespaces, returning a list of all files
      * that are contained within the subpath specified by $path.
-     *
-     * @param string $path
-     *
-     * @return array
      */
     public function listFiles(string $path): array
     {
@@ -350,11 +327,6 @@ public function listFiles(string $path): array
     /**
      * Scans the provided namespace, returning a list of all files
      * that are contained within the subpath specified by $path.
-     *
-     * @param string $prefix
-     * @param string $path
-     *
-     * @return array
      */
     public function listNamespaceFiles(string $prefix, string $path): array
     {
@@ -388,9 +360,6 @@ public function listNamespaceFiles(string $prefix, string $path): array
      * Checks the app folder to see if the file can be found.
      * Only for use with filenames that DO NOT include namespacing.
      *
-     * @param string      $file
-     * @param string|null $folder
-     *
      * @return false|string The path to the file, or false if not found.
      */
     protected function legacyLocate(string $file, ?string $folder = null)
diff --git a/system/BaseModel.php b/system/BaseModel.php
index 12747fef78e7..172776c6586d 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -387,8 +387,6 @@ abstract protected function doInsertBatch(?array $set = null, ?bool $escape = nu
      *
      * @param array|int|string|null $id   ID
      * @param array|null            $data Data
-     *
-     * @return bool
      */
     abstract protected function doUpdate($id = null, $data = null): bool;
 
@@ -658,8 +656,6 @@ public function first()
      * @param array|object $data Data
      *
      * @throws ReflectionException
-     *
-     * @return bool
      */
     public function save($data): bool
     {
@@ -685,8 +681,6 @@ public function save($data): bool
      * If this method return false insert operation will be executed
      *
      * @param array|object $data Data
-     *
-     * @return bool
      */
     protected function shouldUpdate($data): bool
     {
@@ -839,8 +833,6 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
      * @param array|object|null     $data Data
      *
      * @throws ReflectionException
-     *
-     * @return bool
      */
     public function update($id = null, $data = null): bool
     {
@@ -1142,8 +1134,6 @@ public function protect(bool $protect = true)
      * @param array $data Data
      *
      * @throws DataException
-     *
-     * @return array
      */
     protected function doProtectFields(array $data): array
     {
@@ -1339,8 +1329,6 @@ public function cleanRules(bool $choice = false)
      * specified in the class property, $validationRules.
      *
      * @param array|object $data Data
-     *
-     * @return bool
      */
     public function validate($data): bool
     {
@@ -1371,8 +1359,6 @@ public function validate($data): bool
      * can be used elsewhere, if needed.
      *
      * @param array $options Options
-     *
-     * @return array
      */
     public function getValidationRules(array $options = []): array
     {
@@ -1396,8 +1382,6 @@ public function getValidationRules(array $options = []): array
     /**
      * Returns the model's define validation messages so they
      * can be used elsewhere, if needed.
-     *
-     * @return array
      */
     public function getValidationMessages(): array
     {
@@ -1411,8 +1395,6 @@ public function getValidationMessages(): array
      *
      * @param array      $rules Array containing field name and rule
      * @param array|null $data  Data
-     *
-     * @return array
      */
     protected function cleanValidationRules(array $rules, ?array $data = null): array
     {
@@ -1588,8 +1570,6 @@ protected function objectToRawArray($data, bool $onlyChanged = true, bool $recur
      * @throws DataException
      * @throws InvalidArgumentException
      * @throws ReflectionException
-     *
-     * @return array
      */
     protected function transformDataToArray($data, string $type): array
     {
@@ -1643,8 +1623,6 @@ public function __get(string $name)
      * Checks for the existence of properties across this model, and db connection.
      *
      * @param string $name Name
-     *
-     * @return bool
      */
     public function __isset(string $name): bool
     {
@@ -1693,8 +1671,6 @@ public function __call(string $name, array $params)
      * @codeCoverageIgnore
      *
      * @deprecated use fillPlaceholders($rules, $data) from Validation instead
-     *
-     * @return array
      */
     protected function fillPlaceholders(array $rules, array $data): array
     {
diff --git a/system/CLI/BaseCommand.php b/system/CLI/BaseCommand.php
index 2d15f15f57a5..62957f76a4e4 100644
--- a/system/CLI/BaseCommand.php
+++ b/system/CLI/BaseCommand.php
@@ -89,9 +89,6 @@ abstract class BaseCommand
 
     /**
      * BaseCommand constructor.
-     *
-     * @param LoggerInterface $logger
-     * @param Commands        $commands
      */
     public function __construct(LoggerInterface $logger, Commands $commands)
     {
@@ -102,17 +99,12 @@ public function __construct(LoggerInterface $logger, Commands $commands)
     /**
      * Actually execute a command.
      * This has to be over-ridden in any concrete implementation.
-     *
-     * @param array $params
      */
     abstract public function run(array $params);
 
     /**
      * Can be used by a command to run other commands.
      *
-     * @param string $command
-     * @param array  $params
-     *
      * @throws ReflectionException
      *
      * @return mixed
@@ -124,8 +116,6 @@ protected function call(string $command, array $params = [])
 
     /**
      * A simple method to display an error with line/file, in child commands.
-     *
-     * @param Throwable $e
      */
     protected function showError(Throwable $e)
     {
@@ -184,12 +174,7 @@ public function showHelp()
     /**
      * Pads our string out so that all titles are the same length to nicely line up descriptions.
      *
-     * @param string $item
-     * @param int    $max
-     * @param int    $extra  How many extra spaces to add at the end
-     * @param int    $indent
-     *
-     * @return string
+     * @param int $extra How many extra spaces to add at the end
      */
     public function setPad(string $item, int $max, int $extra = 2, int $indent = 0): string
     {
@@ -201,11 +186,6 @@ public function setPad(string $item, int $max, int $extra = 2, int $indent = 0):
     /**
      * Get pad for $key => $value array output
      *
-     * @param array $array
-     * @param int   $pad
-     *
-     * @return int
-     *
      * @deprecated Use setPad() instead.
      *
      * @codeCoverageIgnore
@@ -224,8 +204,6 @@ public function getPad(array $array, int $pad): int
     /**
      * Makes it simple to access our protected properties.
      *
-     * @param string $key
-     *
      * @return mixed
      */
     public function __get(string $key)
@@ -235,10 +213,6 @@ public function __get(string $key)
 
     /**
      * Makes it simple to check our protected properties.
-     *
-     * @param string $key
-     *
-     * @return bool
      */
     public function __isset(string $key): bool
     {
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index be3d444fbed2..48218009833e 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -178,8 +178,6 @@ public static function init()
      *
      * @param string $prefix
      *
-     * @return string
-     *
      * @codeCoverageIgnore
      */
     public static function input(?string $prefix = null): string
@@ -273,8 +271,6 @@ public static function prompt(string $field, $options = null, $validation = null
      * @param string       $value Input value
      * @param array|string $rules Validation rules
      *
-     * @return bool
-     *
      * @codeCoverageIgnore
      */
     protected static function validate(string $field, string $value, $rules): bool
@@ -302,10 +298,6 @@ protected static function validate(string $field, string $value, $rules): bool
     /**
      * Outputs a string to the CLI without any surrounding newlines.
      * Useful for showing repeating elements on a single line.
-     *
-     * @param string      $text
-     * @param string|null $foreground
-     * @param string|null $background
      */
     public static function print(string $text = '', ?string $foreground = null, ?string $background = null)
     {
@@ -342,9 +334,7 @@ public static function write(string $text = '', ?string $foreground = null, ?str
     /**
      * Outputs an error to the CLI using STDERR instead of STDOUT
      *
-     * @param string      $text       The text to output, or array of errors
-     * @param string      $foreground
-     * @param string|null $background
+     * @param string $text The text to output, or array of errors
      */
     public static function error(string $text, string $foreground = 'light_red', ?string $background = null)
     {
@@ -404,8 +394,6 @@ public static function wait(int $seconds, bool $countdown = false)
 
     /**
      * if operating system === windows
-     *
-     * @return bool
      */
     public static function isWindows(): bool
     {
@@ -510,8 +498,6 @@ public static function color(string $text, string $foreground, ?string $backgrou
      * and ignores styles set by the color() function
      *
      * @param string $string
-     *
-     * @return int
      */
     public static function strlen(?string $string): int
     {
@@ -536,10 +522,7 @@ public static function strlen(?string $string): int
      * Checks whether the current stream resource supports or
      * refers to a valid terminal type device.
      *
-     * @param string   $function
      * @param resource $resource
-     *
-     * @return bool
      */
     public static function streamSupports(string $function, $resource): bool
     {
@@ -564,8 +547,6 @@ public static function streamSupports(string $function, $resource): bool
      * Reference: https://github.com/composer/xdebug-handler/blob/master/src/Process.php
      *
      * @param resource $resource
-     *
-     * @return bool
      */
     public static function hasColorSupport($resource): bool
     {
@@ -593,10 +574,6 @@ public static function hasColorSupport($resource): bool
 
     /**
      * Attempts to determine the width of the viewable CLI window.
-     *
-     * @param int $default
-     *
-     * @return int
      */
     public static function getWidth(int $default = 80): int
     {
@@ -609,10 +586,6 @@ public static function getWidth(int $default = 80): int
 
     /**
      * Attempts to determine the height of the viewable CLI window.
-     *
-     * @param int $default
-     *
-     * @return int
      */
     public static function getHeight(int $default = 32): int
     {
@@ -677,7 +650,6 @@ public static function generateDimensions()
      * to update it. Set $thisStep = false to erase the progress bar.
      *
      * @param bool|int $thisStep
-     * @param int      $totalSteps
      */
     public static function showProgress($thisStep = 1, int $totalSteps = 10)
     {
@@ -716,10 +688,6 @@ public static function showProgress($thisStep = 1, int $totalSteps = 10)
      * short descriptions that need to start on an existing line.
      *
      * @param string $string
-     * @param int    $max
-     * @param int    $padLeft
-     *
-     * @return string
      */
     public static function wrap(?string $string = null, int $max = 0, int $padLeft = 0): string
     {
@@ -804,8 +772,6 @@ protected static function parseCommandLine()
      * Returns the command line string portions of the arguments, minus
      * any options, as a string. This is used to pass along to the main
      * CodeIgniter application.
-     *
-     * @return string
      */
     public static function getURI(): string
     {
@@ -823,8 +789,6 @@ public static function getURI(): string
      *
      * **IMPORTANT:** The index here is one-based instead of zero-based.
      *
-     * @param int $index
-     *
      * @return mixed|null
      */
     public static function getSegment(int $index)
@@ -834,8 +798,6 @@ public static function getSegment(int $index)
 
     /**
      * Returns the raw array of segments found.
-     *
-     * @return array
      */
     public static function getSegments(): array
     {
@@ -846,8 +808,6 @@ public static function getSegments(): array
      * Gets a single command-line option. Returns TRUE if the option
      * exists, but doesn't have a value, and is simply acting as a flag.
      *
-     * @param string $name
-     *
      * @return bool|mixed|null
      */
     public static function getOption(string $name)
@@ -865,8 +825,6 @@ public static function getOption(string $name)
 
     /**
      * Returns the raw array of options found.
-     *
-     * @return array
      */
     public static function getOptions(): array
     {
@@ -879,8 +837,6 @@ public static function getOptions(): array
      *
      * @param bool $useLongOpts Use '--' for long options?
      * @param bool $trim        Trim final string output?
-     *
-     * @return string
      */
     public static function getOptionString(bool $useLongOpts = false, bool $trim = false): string
     {
@@ -1013,7 +969,6 @@ public static function table(array $tbody, array $thead = [])
      * solution down the road.
      *
      * @param resource $handle
-     * @param string   $string
      *
      * @return void
      */
diff --git a/system/CLI/CommandRunner.php b/system/CLI/CommandRunner.php
index 79d21ff8ea72..a6985d0db931 100644
--- a/system/CLI/CommandRunner.php
+++ b/system/CLI/CommandRunner.php
@@ -59,8 +59,6 @@ public function _remap($method, ...$params)
     /**
      * Default command.
      *
-     * @param array $params
-     *
      * @throws ReflectionException
      *
      * @return mixed
@@ -74,8 +72,6 @@ public function index(array $params)
 
     /**
      * Allows access to the current commands that have been found.
-     *
-     * @return array
      */
     public function getCommands(): array
     {
diff --git a/system/CLI/Commands.php b/system/CLI/Commands.php
index 888d266e46b0..872b7b103b9d 100644
--- a/system/CLI/Commands.php
+++ b/system/CLI/Commands.php
@@ -48,9 +48,6 @@ public function __construct($logger = null)
 
     /**
      * Runs a command given
-     *
-     * @param string $command
-     * @param array  $params
      */
     public function run(string $command, array $params)
     {
@@ -138,11 +135,6 @@ public function discoverCommands()
     /**
      * Verifies if the command being sought is found
      * in the commands list.
-     *
-     * @param string $command
-     * @param array  $commands
-     *
-     * @return bool
      */
     public function verifyCommand(string $command, array $commands): bool
     {
@@ -171,11 +163,6 @@ public function verifyCommand(string $command, array $commands): bool
     /**
      * Finds alternative of `$name` among collection
      * of commands.
-     *
-     * @param string $name
-     * @param array  $collection
-     *
-     * @return array
      */
     protected function getCommandAlternatives(string $name, array $collection): array
     {
diff --git a/system/CLI/Console.php b/system/CLI/Console.php
index 20110d0fc25d..dfbd5e2ad162 100644
--- a/system/CLI/Console.php
+++ b/system/CLI/Console.php
@@ -31,8 +31,6 @@ class Console
 
     /**
      * Console constructor.
-     *
-     * @param CodeIgniter $app
      */
     public function __construct(CodeIgniter $app)
     {
@@ -42,8 +40,6 @@ public function __construct(CodeIgniter $app)
     /**
      * Runs the current command discovered on the CLI.
      *
-     * @param bool $useSafeOutput
-     *
      * @throws Exception
      *
      * @return mixed|RequestInterface|Response|ResponseInterface
@@ -60,8 +56,6 @@ public function run(bool $useSafeOutput = false)
 
     /**
      * Displays basic information about the Console.
-     *
-     * @param bool $suppress
      */
     public function showHeader(bool $suppress = false)
     {
diff --git a/system/CLI/Exceptions/CLIException.php b/system/CLI/Exceptions/CLIException.php
index 07c60a8af85f..4e07cd64f905 100644
--- a/system/CLI/Exceptions/CLIException.php
+++ b/system/CLI/Exceptions/CLIException.php
@@ -25,9 +25,6 @@ class CLIException extends RuntimeException
      * Thrown when `$color` specified for `$type` is not within the
      * allowed list of colors.
      *
-     * @param string $type
-     * @param string $color
-     *
      * @return CLIException
      */
     public static function forInvalidColor(string $type, string $color)
diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php
index 13c36d674a88..2e1e1ca04bf0 100644
--- a/system/CLI/GeneratorTrait.php
+++ b/system/CLI/GeneratorTrait.php
@@ -86,10 +86,6 @@ trait GeneratorTrait
 
     /**
      * Execute the command.
-     *
-     * @param array $params
-     *
-     * @return void
      */
     protected function execute(array $params): void
     {
@@ -167,10 +163,6 @@ protected function execute(array $params): void
 
     /**
      * Prepare options and do the necessary replacements.
-     *
-     * @param string $class
-     *
-     * @return string
      */
     protected function prepare(string $class): string
     {
@@ -181,10 +173,6 @@ protected function prepare(string $class): string
      * Change file basename before saving.
      *
      * Useful for components where the file name has a date.
-     *
-     * @param string $filename
-     *
-     * @return string
      */
     protected function basename(string $filename): string
     {
@@ -193,8 +181,6 @@ protected function basename(string $filename): string
 
     /**
      * Parses the class name and checks if it is already qualified.
-     *
-     * @return string
      */
     protected function qualifyClassName(): string
     {
@@ -244,8 +230,6 @@ protected function qualifyClassName(): string
      * with fallback to `$template` when the defined view does not exist.
      *
      * @param array $data Data to be passed to the view.
-     *
-     * @return string
      */
     protected function renderTemplate(array $data = []): string
     {
@@ -260,13 +244,6 @@ protected function renderTemplate(array $data = []): string
 
     /**
      * Performs pseudo-variables contained within view file.
-     *
-     * @param string $class
-     * @param array  $search
-     * @param array  $replace
-     * @param array  $data
-     *
-     * @return string
      */
     protected function parseTemplate(string $class, array $search = [], array $replace = [], array $data = []): string
     {
@@ -286,10 +263,6 @@ protected function parseTemplate(string $class, array $search = [], array $repla
      * Builds the contents for class being generated, doing all
      * the replacements necessary, and alphabetically sorts the
      * imports for a given template.
-     *
-     * @param string $class
-     *
-     * @return string
      */
     protected function buildContent(string $class): string
     {
@@ -307,10 +280,6 @@ protected function buildContent(string $class): string
 
     /**
      * Builds the file path from the class name.
-     *
-     * @param string $class
-     *
-     * @return string
      */
     protected function buildPath(string $class): string
     {
@@ -335,8 +304,6 @@ protected function buildPath(string $class): string
     /**
      * Allows child generators to modify the internal `$hasClassName` flag.
      *
-     * @param bool $hasClassName
-     *
      * @return $this
      */
     protected function setHasClassName(bool $hasClassName)
@@ -349,8 +316,6 @@ protected function setHasClassName(bool $hasClassName)
     /**
      * Allows child generators to modify the internal `$sortImports` flag.
      *
-     * @param bool $sortImports
-     *
      * @return $this
      */
     protected function setSortImports(bool $sortImports)
@@ -363,8 +328,6 @@ protected function setSortImports(bool $sortImports)
     /**
      * Allows child generators to modify the internal `$enabledSuffixing` flag.
      *
-     * @param bool $enabledSuffixing
-     *
      * @return $this
      */
     protected function setEnabledSuffixing(bool $enabledSuffixing)
@@ -378,8 +341,6 @@ protected function setEnabledSuffixing(bool $enabledSuffixing)
      * Gets a single command-line option. Returns TRUE if the option exists,
      * but doesn't have a value, and is simply acting as a flag.
      *
-     * @param string $name
-     *
      * @return mixed
      */
     protected function getOption(string $name)
diff --git a/system/Cache/CacheFactory.php b/system/Cache/CacheFactory.php
index 691b350a9968..3ca101ff9d8c 100644
--- a/system/Cache/CacheFactory.php
+++ b/system/Cache/CacheFactory.php
@@ -25,10 +25,6 @@ class CacheFactory
     /**
      * Attempts to create the desired cache handler, based upon the
      *
-     * @param Cache       $config
-     * @param string|null $handler
-     * @param string|null $backup
-     *
      * @return CacheInterface
      */
     public static function getHandler(Cache $config, ?string $handler = null, ?string $backup = null)
diff --git a/system/Cache/CacheInterface.php b/system/Cache/CacheInterface.php
index 52502f5e6742..72b3626d94cf 100644
--- a/system/Cache/CacheInterface.php
+++ b/system/Cache/CacheInterface.php
@@ -101,8 +101,6 @@ public function getMetaData(string $key);
 
     /**
      * Determines if the driver is supported on this system.
-     *
-     * @return bool
      */
     public function isSupported(): bool;
 }
diff --git a/system/Cache/Exceptions/CacheException.php b/system/Cache/Exceptions/CacheException.php
index a3269072ecdf..3445590cf926 100644
--- a/system/Cache/Exceptions/CacheException.php
+++ b/system/Cache/Exceptions/CacheException.php
@@ -25,8 +25,6 @@ class CacheException extends RuntimeException implements ExceptionInterface
     /**
      * Thrown when handler has no permission to write cache.
      *
-     * @param string $path
-     *
      * @return CacheException
      */
     public static function forUnableToWrite(string $path)
diff --git a/system/Cache/Handlers/DummyHandler.php b/system/Cache/Handlers/DummyHandler.php
index 8d4a9a6e2972..99158038ebc7 100644
--- a/system/Cache/Handlers/DummyHandler.php
+++ b/system/Cache/Handlers/DummyHandler.php
@@ -152,8 +152,6 @@ public function getMetaData(string $key)
 
     /**
      * Determines if the driver is supported on this system.
-     *
-     * @return bool
      */
     public function isSupported(): bool
     {
diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php
index d169a9258a37..8dec7c62fb3f 100644
--- a/system/Cache/Handlers/FileHandler.php
+++ b/system/Cache/Handlers/FileHandler.php
@@ -45,8 +45,6 @@ class FileHandler extends BaseHandler
     /**
      * Constructor.
      *
-     * @param Cache $config
-     *
      * @throws CacheException
      */
     public function __construct(Cache $config)
@@ -264,8 +262,6 @@ public function getMetaData(string $key)
 
     /**
      * Determines if the driver is supported on this system.
-     *
-     * @return bool
      */
     public function isSupported(): bool
     {
@@ -276,8 +272,6 @@ public function isSupported(): bool
      * Does the heavy lifting of actually retrieving the file and
      * verifying it's age.
      *
-     * @param string $filename
-     *
      * @return bool|mixed
      */
     protected function getItem(string $filename)
@@ -345,8 +339,6 @@ protected function writeFile($path, $data, $mode = 'wb')
      * @param bool   $delDir Whether to delete any directories found in the path
      * @param bool   $htdocs Whether to skip deleting .htaccess and index page files
      * @param int    $_level Current directory depth level (default: 0; internal use only)
-     *
-     * @return bool
      */
     protected function deleteFiles(string $path, bool $delDir = false, bool $htdocs = false, int $_level = 0): bool
     {
diff --git a/system/Cache/Handlers/MemcachedHandler.php b/system/Cache/Handlers/MemcachedHandler.php
index d1fbdf2b8cac..56f6579ced31 100644
--- a/system/Cache/Handlers/MemcachedHandler.php
+++ b/system/Cache/Handlers/MemcachedHandler.php
@@ -43,8 +43,6 @@ class MemcachedHandler extends BaseHandler
 
     /**
      * Constructor.
-     *
-     * @param Cache $config
      */
     public function __construct(Cache $config)
     {
@@ -316,8 +314,6 @@ public function getMetaData(string $key)
 
     /**
      * Determines if the driver is supported on this system.
-     *
-     * @return bool
      */
     public function isSupported(): bool
     {
diff --git a/system/Cache/Handlers/PredisHandler.php b/system/Cache/Handlers/PredisHandler.php
index 978e48dd8b17..100c19f8f292 100644
--- a/system/Cache/Handlers/PredisHandler.php
+++ b/system/Cache/Handlers/PredisHandler.php
@@ -44,8 +44,6 @@ class PredisHandler extends BaseHandler
 
     /**
      * Constructor.
-     *
-     * @param Cache $config
      */
     public function __construct(Cache $config)
     {
@@ -269,8 +267,6 @@ public function getMetaData(string $key)
 
     /**
      * Determines if the driver is supported on this system.
-     *
-     * @return bool
      */
     public function isSupported(): bool
     {
diff --git a/system/Cache/Handlers/RedisHandler.php b/system/Cache/Handlers/RedisHandler.php
index 2320de73cf05..bf39e1f7b7ae 100644
--- a/system/Cache/Handlers/RedisHandler.php
+++ b/system/Cache/Handlers/RedisHandler.php
@@ -43,8 +43,6 @@ class RedisHandler extends BaseHandler
 
     /**
      * Constructor.
-     *
-     * @param Cache $config
      */
     public function __construct(Cache $config)
     {
@@ -307,8 +305,6 @@ public function getMetaData(string $key)
 
     /**
      * Determines if the driver is supported on this system.
-     *
-     * @return bool
      */
     public function isSupported(): bool
     {
diff --git a/system/Cache/Handlers/WincacheHandler.php b/system/Cache/Handlers/WincacheHandler.php
index 04697a32a232..58062292941a 100644
--- a/system/Cache/Handlers/WincacheHandler.php
+++ b/system/Cache/Handlers/WincacheHandler.php
@@ -23,8 +23,6 @@ class WincacheHandler extends BaseHandler
 {
     /**
      * Constructor.
-     *
-     * @param Cache $config
      */
     public function __construct(Cache $config)
     {
@@ -183,8 +181,6 @@ public function getMetaData(string $key)
 
     /**
      * Determines if the driver is supported on this system.
-     *
-     * @return bool
      */
     public function isSupported(): bool
     {
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index a8d54bb0e0be..ffb52e86a503 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -142,8 +142,6 @@ class CodeIgniter
 
     /**
      * Constructor.
-     *
-     * @param App $config
      */
     public function __construct(App $config)
     {
@@ -284,9 +282,6 @@ protected function initializeKint()
      * tries to route the response, loads the controller and generally
      * makes all of the pieces work together.
      *
-     * @param RouteCollectionInterface|null $routes
-     * @param bool                          $returnResponse
-     *
      * @throws Exception
      * @throws RedirectException
      *
@@ -344,8 +339,6 @@ public function run(?RouteCollectionInterface $routes = null, bool $returnRespon
      * cookies and headers are not actually sent, allowing PHP 7.2+ to
      * not complain when ini_set() function is used.
      *
-     * @param bool $safe
-     *
      * @return $this
      */
     public function useSafeOutput(bool $safe = true)
@@ -358,10 +351,6 @@ public function useSafeOutput(bool $safe = true)
     /**
      * Handles the main request logic and fires the controller.
      *
-     * @param RouteCollectionInterface|null $routes
-     * @param Cache                         $cacheConfig
-     * @param bool                          $returnResponse
-     *
      * @throws RedirectException
      *
      * @return mixed|RequestInterface|ResponseInterface
@@ -514,8 +503,6 @@ protected function startBenchmark()
      * Sets a Request object to be used for this request.
      * Used when running certain tests.
      *
-     * @param Request $request
-     *
      * @return $this
      */
     public function setRequest(Request $request)
@@ -586,8 +573,6 @@ protected function forceSecureAccess($duration = 31536000)
     /**
      * Determines if a response has been cached for the given URI.
      *
-     * @param Cache $config
-     *
      * @throws Exception
      *
      * @return bool|ResponseInterface
@@ -625,8 +610,6 @@ public function displayCache(Cache $config)
     /**
      * Tells the app that the final output should be cached.
      *
-     * @param int $time
-     *
      * @return void
      */
     public static function cache(int $time)
@@ -638,8 +621,6 @@ public static function cache(int $time)
      * Caches the full response from the current request. Used for
      * full-page caching for very high performance.
      *
-     * @param Cache $config
-     *
      * @return mixed
      */
     public function cachePage(Cache $config)
@@ -655,8 +636,6 @@ public function cachePage(Cache $config)
 
     /**
      * Returns an array with our basic performance stats collected.
-     *
-     * @return array
      */
     public function getPerformanceStats(): array
     {
@@ -668,10 +647,6 @@ public function getPerformanceStats(): array
 
     /**
      * Generates the cache name to use for our full-page caching.
-     *
-     * @param Cache $config
-     *
-     * @return string
      */
     protected function generateCacheName(Cache $config): string
     {
@@ -692,10 +667,6 @@ protected function generateCacheName(Cache $config): string
 
     /**
      * Replaces the elapsed_time tag.
-     *
-     * @param string $output
-     *
-     * @return string
      */
     public function displayPerformanceMetrics(string $output): string
     {
@@ -765,8 +736,6 @@ protected function determinePath()
      *
      * This is primarily used by the Console.
      *
-     * @param string $path
-     *
      * @return $this
      */
     public function setPath(string $path)
@@ -845,8 +814,6 @@ protected function runController($class)
     /**
      * Displays a 404 Page Not Found error. If set, will try to
      * call the 404Override controller/method that was set in routing config.
-     *
-     * @param PageNotFoundException $e
      */
     protected function display404errors(PageNotFoundException $e)
     {
@@ -896,7 +863,6 @@ protected function display404errors(PageNotFoundException $e)
      * Gathers the script output from the buffer, replaces some execution
      * time tag in the output and displays the debug toolbar, if required.
      *
-     * @param Cache|null $cacheConfig
      * @param mixed|null $returned
      */
     protected function gatherOutput(?Cache $cacheConfig = null, $returned = null)
diff --git a/system/Commands/Cache/ClearCache.php b/system/Commands/Cache/ClearCache.php
index dd9850c381e5..bb98177a0c0d 100644
--- a/system/Commands/Cache/ClearCache.php
+++ b/system/Commands/Cache/ClearCache.php
@@ -59,8 +59,6 @@ class ClearCache extends BaseCommand
 
     /**
      * Clears the cache
-     *
-     * @param array $params
      */
     public function run(array $params)
     {
diff --git a/system/Commands/Cache/InfoCache.php b/system/Commands/Cache/InfoCache.php
index 6d4a543c1f91..db5a51d76f91 100644
--- a/system/Commands/Cache/InfoCache.php
+++ b/system/Commands/Cache/InfoCache.php
@@ -51,8 +51,6 @@ class InfoCache extends BaseCommand
 
     /**
      * Clears the cache
-     *
-     * @param array $params
      */
     public function run(array $params)
     {
diff --git a/system/Commands/Database/CreateDatabase.php b/system/Commands/Database/CreateDatabase.php
index 1040383a1434..c442c5bea785 100644
--- a/system/Commands/Database/CreateDatabase.php
+++ b/system/Commands/Database/CreateDatabase.php
@@ -73,8 +73,6 @@ class CreateDatabase extends BaseCommand
     /**
      * Creates a new database.
      *
-     * @param array $params
-     *
      * @return void
      */
     public function run(array $params)
diff --git a/system/Commands/Database/Migrate.php b/system/Commands/Database/Migrate.php
index 24c7ecbddff3..095e9927223a 100644
--- a/system/Commands/Database/Migrate.php
+++ b/system/Commands/Database/Migrate.php
@@ -64,8 +64,6 @@ class Migrate extends BaseCommand
     /**
      * Ensures that all migrations have been run.
      *
-     * @param array $params
-     *
      * @return void
      */
     public function run(array $params)
diff --git a/system/Commands/Database/MigrateRefresh.php b/system/Commands/Database/MigrateRefresh.php
index 733b0eed35d8..27c59f499865 100644
--- a/system/Commands/Database/MigrateRefresh.php
+++ b/system/Commands/Database/MigrateRefresh.php
@@ -65,8 +65,6 @@ class MigrateRefresh extends BaseCommand
      * Does a rollback followed by a latest to refresh the current state
      * of the database.
      *
-     * @param array $params
-     *
      * @return void
      */
     public function run(array $params)
diff --git a/system/Commands/Database/MigrateRollback.php b/system/Commands/Database/MigrateRollback.php
index fe9c28df7f46..9f67808d175c 100644
--- a/system/Commands/Database/MigrateRollback.php
+++ b/system/Commands/Database/MigrateRollback.php
@@ -66,8 +66,6 @@ class MigrateRollback extends BaseCommand
      * Runs all of the migrations in reverse order, until they have
      * all been unapplied.
      *
-     * @param array $params
-     *
      * @return void
      */
     public function run(array $params)
diff --git a/system/Commands/Database/Seed.php b/system/Commands/Database/Seed.php
index 5de640f3c103..b71b954e8c1b 100644
--- a/system/Commands/Database/Seed.php
+++ b/system/Commands/Database/Seed.php
@@ -64,8 +64,6 @@ class Seed extends BaseCommand
     /**
      * Passes to Seeder to populate the database.
      *
-     * @param array $params
-     *
      * @return void
      */
     public function run(array $params)
diff --git a/system/Commands/Encryption/GenerateKey.php b/system/Commands/Encryption/GenerateKey.php
index 79cce1f20af8..23555b4e6d9a 100644
--- a/system/Commands/Encryption/GenerateKey.php
+++ b/system/Commands/Encryption/GenerateKey.php
@@ -64,8 +64,6 @@ class GenerateKey extends BaseCommand
     /**
      * Actually execute the command.
      *
-     * @param array $params
-     *
      * @return void
      */
     public function run(array $params)
@@ -112,11 +110,6 @@ public function run(array $params)
 
     /**
      * Generates a key and encodes it.
-     *
-     * @param string $prefix
-     * @param int    $length
-     *
-     * @return string
      */
     protected function generateRandomKey(string $prefix, int $length): string
     {
@@ -131,11 +124,6 @@ protected function generateRandomKey(string $prefix, int $length): string
 
     /**
      * Sets the new encryption key in your .env file.
-     *
-     * @param string $key
-     * @param array  $params
-     *
-     * @return bool
      */
     protected function setNewEncryptionKey(string $key, array $params): bool
     {
@@ -153,10 +141,6 @@ protected function setNewEncryptionKey(string $key, array $params): bool
 
     /**
      * Checks whether to overwrite existing encryption key.
-     *
-     * @param array $params
-     *
-     * @return bool
      */
     protected function confirmOverwrite(array $params): bool
     {
@@ -165,11 +149,6 @@ protected function confirmOverwrite(array $params): bool
 
     /**
      * Writes the new encryption key to .env file.
-     *
-     * @param string $oldKey
-     * @param string $newKey
-     *
-     * @return bool
      */
     protected function writeNewEncryptionKeyToFile(string $oldKey, string $newKey): bool
     {
@@ -199,10 +178,6 @@ protected function writeNewEncryptionKeyToFile(string $oldKey, string $newKey):
 
     /**
      * Get the regex of the current encryption key.
-     *
-     * @param string $oldKey
-     *
-     * @return string
      */
     protected function keyPattern(string $oldKey): string
     {
diff --git a/system/Commands/Generators/CommandGenerator.php b/system/Commands/Generators/CommandGenerator.php
index be979ebf46eb..7ccae13f7163 100644
--- a/system/Commands/Generators/CommandGenerator.php
+++ b/system/Commands/Generators/CommandGenerator.php
@@ -75,8 +75,6 @@ class CommandGenerator extends BaseCommand
 
     /**
      * Actually execute a command.
-     *
-     * @param array $params
      */
     public function run(array $params)
     {
@@ -90,10 +88,6 @@ public function run(array $params)
 
     /**
      * Prepare options and do the necessary replacements.
-     *
-     * @param string $class
-     *
-     * @return string
      */
     protected function prepare(string $class): string
     {
diff --git a/system/Commands/Generators/ConfigGenerator.php b/system/Commands/Generators/ConfigGenerator.php
index 301091a0019f..606af47b33f0 100644
--- a/system/Commands/Generators/ConfigGenerator.php
+++ b/system/Commands/Generators/ConfigGenerator.php
@@ -71,8 +71,6 @@ class ConfigGenerator extends BaseCommand
 
     /**
      * Actually execute a command.
-     *
-     * @param array $params
      */
     public function run(array $params)
     {
@@ -86,10 +84,6 @@ public function run(array $params)
 
     /**
      * Prepare options and do the necessary replacements.
-     *
-     * @param string $class
-     *
-     * @return string
      */
     protected function prepare(string $class): string
     {
diff --git a/system/Commands/Generators/ControllerGenerator.php b/system/Commands/Generators/ControllerGenerator.php
index 05ffd58ef02d..36a951cf0df0 100644
--- a/system/Commands/Generators/ControllerGenerator.php
+++ b/system/Commands/Generators/ControllerGenerator.php
@@ -74,8 +74,6 @@ class ControllerGenerator extends BaseCommand
 
     /**
      * Actually execute a command.
-     *
-     * @param array $params
      */
     public function run(array $params)
     {
@@ -89,10 +87,6 @@ public function run(array $params)
 
     /**
      * Prepare options and do the necessary replacements.
-     *
-     * @param string $class
-     *
-     * @return string
      */
     protected function prepare(string $class): string
     {
diff --git a/system/Commands/Generators/EntityGenerator.php b/system/Commands/Generators/EntityGenerator.php
index 0b8baf4cb4cc..8cd84785c311 100644
--- a/system/Commands/Generators/EntityGenerator.php
+++ b/system/Commands/Generators/EntityGenerator.php
@@ -71,8 +71,6 @@ class EntityGenerator extends BaseCommand
 
     /**
      * Actually execute a command.
-     *
-     * @param array $params
      */
     public function run(array $params)
     {
diff --git a/system/Commands/Generators/FilterGenerator.php b/system/Commands/Generators/FilterGenerator.php
index 4bbc9102bdef..02060b020291 100644
--- a/system/Commands/Generators/FilterGenerator.php
+++ b/system/Commands/Generators/FilterGenerator.php
@@ -71,8 +71,6 @@ class FilterGenerator extends BaseCommand
 
     /**
      * Actually execute a command.
-     *
-     * @param array $params
      */
     public function run(array $params)
     {
diff --git a/system/Commands/Generators/MigrateCreate.php b/system/Commands/Generators/MigrateCreate.php
index 6501ae0ee492..4803dc96db25 100644
--- a/system/Commands/Generators/MigrateCreate.php
+++ b/system/Commands/Generators/MigrateCreate.php
@@ -73,8 +73,6 @@ class MigrateCreate extends BaseCommand
 
     /**
      * Actually execute a command.
-     *
-     * @param array $params
      */
     public function run(array $params)
     {
diff --git a/system/Commands/Generators/MigrationGenerator.php b/system/Commands/Generators/MigrationGenerator.php
index dded6a7f5fb8..1cd931e9e460 100644
--- a/system/Commands/Generators/MigrationGenerator.php
+++ b/system/Commands/Generators/MigrationGenerator.php
@@ -74,8 +74,6 @@ class MigrationGenerator extends BaseCommand
 
     /**
      * Actually execute a command.
-     *
-     * @param array $params
      */
     public function run(array $params)
     {
@@ -94,10 +92,6 @@ public function run(array $params)
 
     /**
      * Prepare options and do the necessary replacements.
-     *
-     * @param string $class
-     *
-     * @return string
      */
     protected function prepare(string $class): string
     {
@@ -118,10 +112,6 @@ protected function prepare(string $class): string
 
     /**
      * Change file basename before saving.
-     *
-     * @param string $filename
-     *
-     * @return string
      */
     protected function basename(string $filename): string
     {
diff --git a/system/Commands/Generators/ModelGenerator.php b/system/Commands/Generators/ModelGenerator.php
index 808968b84542..1ad8a75e1f8c 100644
--- a/system/Commands/Generators/ModelGenerator.php
+++ b/system/Commands/Generators/ModelGenerator.php
@@ -75,8 +75,6 @@ class ModelGenerator extends BaseCommand
 
     /**
      * Actually execute a command.
-     *
-     * @param array $params
      */
     public function run(array $params)
     {
@@ -90,10 +88,6 @@ public function run(array $params)
 
     /**
      * Prepare options and do the necessary replacements.
-     *
-     * @param string $class
-     *
-     * @return string
      */
     protected function prepare(string $class): string
     {
diff --git a/system/Commands/Generators/ScaffoldGenerator.php b/system/Commands/Generators/ScaffoldGenerator.php
index db9eb1420589..351ee009459e 100644
--- a/system/Commands/Generators/ScaffoldGenerator.php
+++ b/system/Commands/Generators/ScaffoldGenerator.php
@@ -77,8 +77,6 @@ class ScaffoldGenerator extends BaseCommand
 
     /**
      * Actually execute a command.
-     *
-     * @param array $params
      */
     public function run(array $params)
     {
diff --git a/system/Commands/Generators/SeederGenerator.php b/system/Commands/Generators/SeederGenerator.php
index 233595495576..09a1037f0bdc 100644
--- a/system/Commands/Generators/SeederGenerator.php
+++ b/system/Commands/Generators/SeederGenerator.php
@@ -71,8 +71,6 @@ class SeederGenerator extends BaseCommand
 
     /**
      * Actually execute a command.
-     *
-     * @param array $params
      */
     public function run(array $params)
     {
diff --git a/system/Commands/Generators/SessionMigrationGenerator.php b/system/Commands/Generators/SessionMigrationGenerator.php
index 60258e6b1548..a1e02a131b63 100644
--- a/system/Commands/Generators/SessionMigrationGenerator.php
+++ b/system/Commands/Generators/SessionMigrationGenerator.php
@@ -66,8 +66,6 @@ class SessionMigrationGenerator extends BaseCommand
 
     /**
      * Actually execute a command.
-     *
-     * @param array $params
      */
     public function run(array $params)
     {
@@ -88,10 +86,6 @@ public function run(array $params)
 
     /**
      * Performs the necessary replacements.
-     *
-     * @param string $class
-     *
-     * @return string
      */
     protected function prepare(string $class): string
     {
@@ -108,10 +102,6 @@ protected function prepare(string $class): string
 
     /**
      * Change file basename before saving.
-     *
-     * @param string $filename
-     *
-     * @return string
      */
     protected function basename(string $filename): string
     {
diff --git a/system/Commands/Generators/ValidationGenerator.php b/system/Commands/Generators/ValidationGenerator.php
index 322ecb190b28..0c58ca5b0866 100644
--- a/system/Commands/Generators/ValidationGenerator.php
+++ b/system/Commands/Generators/ValidationGenerator.php
@@ -71,8 +71,6 @@ class ValidationGenerator extends BaseCommand
 
     /**
      * Actually execute a command.
-     *
-     * @param array $params
      */
     public function run(array $params)
     {
diff --git a/system/Commands/Help.php b/system/Commands/Help.php
index 32df294e222d..7562333a4f09 100644
--- a/system/Commands/Help.php
+++ b/system/Commands/Help.php
@@ -68,8 +68,6 @@ class Help extends BaseCommand
 
     /**
      * Displays the help for spark commands.
-     *
-     * @param array $params
      */
     public function run(array $params)
     {
diff --git a/system/Commands/Housekeeping/ClearDebugbar.php b/system/Commands/Housekeeping/ClearDebugbar.php
index 5f81b2eeeda8..ee7986466295 100644
--- a/system/Commands/Housekeeping/ClearDebugbar.php
+++ b/system/Commands/Housekeeping/ClearDebugbar.php
@@ -51,8 +51,6 @@ class ClearDebugbar extends BaseCommand
     /**
      * Actually runs the command.
      *
-     * @param array $params
-     *
      * @return void
      */
     public function run(array $params)
diff --git a/system/Commands/Housekeeping/ClearLogs.php b/system/Commands/Housekeeping/ClearLogs.php
index 1c063d80929e..eb2489c5ea72 100644
--- a/system/Commands/Housekeeping/ClearLogs.php
+++ b/system/Commands/Housekeeping/ClearLogs.php
@@ -59,8 +59,6 @@ class ClearLogs extends BaseCommand
 
     /**
      * Actually execute a command.
-     *
-     * @param array $params
      */
     public function run(array $params)
     {
diff --git a/system/Commands/ListCommands.php b/system/Commands/ListCommands.php
index f74736832a8b..0c808322af6a 100644
--- a/system/Commands/ListCommands.php
+++ b/system/Commands/ListCommands.php
@@ -69,8 +69,6 @@ class ListCommands extends BaseCommand
 
     /**
      * Displays the help for the spark cli script itself.
-     *
-     * @param array $params
      */
     public function run(array $params)
     {
@@ -85,8 +83,6 @@ public function run(array $params)
 
     /**
      * Lists the commands with accompanying info.
-     *
-     * @param array $commands
      */
     protected function listFull(array $commands)
     {
@@ -128,8 +124,6 @@ protected function listFull(array $commands)
 
     /**
      * Lists the commands only.
-     *
-     * @param array $commands
      */
     protected function listSimple(array $commands)
     {
diff --git a/system/Commands/Utilities/Environment.php b/system/Commands/Utilities/Environment.php
index 2ad0dc394e5b..b9081742d4ac 100644
--- a/system/Commands/Utilities/Environment.php
+++ b/system/Commands/Utilities/Environment.php
@@ -130,10 +130,6 @@ public function run(array $params)
 
     /**
      * @see https://regex101.com/r/4sSORp/1 for the regex in action
-     *
-     * @param string $newEnv
-     *
-     * @return bool
      */
     private function writeNewEnvironmentToEnvFile(string $newEnv): bool
     {
diff --git a/system/Commands/Utilities/Namespaces.php b/system/Commands/Utilities/Namespaces.php
index 639a861e5271..989f02036e86 100644
--- a/system/Commands/Utilities/Namespaces.php
+++ b/system/Commands/Utilities/Namespaces.php
@@ -67,8 +67,6 @@ class Namespaces extends BaseCommand
 
     /**
      * Displays the help for the spark cli script itself.
-     *
-     * @param array $params
      */
     public function run(array $params)
     {
diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
index bdc5db9da181..210d1e11c5f7 100644
--- a/system/Commands/Utilities/Routes.php
+++ b/system/Commands/Utilities/Routes.php
@@ -67,8 +67,6 @@ class Routes extends BaseCommand
 
     /**
      * Displays the help for the spark cli script itself.
-     *
-     * @param array $params
      */
     public function run(array $params)
     {
diff --git a/system/Common.php b/system/Common.php
index 97caeee4efae..4a3a6102e4de 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -40,8 +40,6 @@
      * dates in. This might be different than the timezone set
      * at the server level, as you often want to stores dates in UTC
      * and convert them on the fly for the user.
-     *
-     * @return string
      */
     function app_timezone(): string
     {
@@ -61,8 +59,6 @@ function app_timezone(): string
      *    cache()->save('foo', 'bar');
      *    $foo = cache('bar');
      *
-     * @param string|null $key
-     *
      * @return CacheInterface|mixed
      */
     function cache(?string $key = null)
@@ -84,10 +80,6 @@ function cache(?string $key = null)
      * A convenience method to clean paths for
      * a nicer looking output. Useful for exception
      * handling, error logging, etc.
-     *
-     * @param string $path
-     *
-     * @return string
      */
     function clean_path(string $path): string
     {
@@ -124,8 +116,6 @@ function clean_path(string $path): string
      *
      *  > command('migrate:create SomeMigration');
      *
-     * @param string $command
-     *
      * @return false|string
      */
     function command(string $command)
@@ -200,9 +190,6 @@ function command(string $command)
     /**
      * More simple way of getting config instances from Factories
      *
-     * @param string $name
-     * @param bool   $getShared
-     *
      * @return mixed
      */
     function config(string $name, bool $getShared = true)
@@ -220,8 +207,6 @@ function config(string $name, bool $getShared = true)
      * @param array  $options Array of options to be passed to the cookie
      *
      * @throws CookieException
-     *
-     * @return Cookie
      */
     function cookie(string $name, string $value = '', array $options = []): Cookie
     {
@@ -235,8 +220,6 @@ function cookie(string $name, string $value = '', array $options = []): Cookie
      *
      * @param Cookie[] $cookies   If `getGlobal` is false, this is passed to CookieStore's constructor
      * @param bool     $getGlobal If false, creates a new instance of CookieStore
-     *
-     * @return CookieStore
      */
     function cookies(array $cookies = [], bool $getGlobal = true): CookieStore
     {
@@ -253,8 +236,6 @@ function cookies(array $cookies = [], bool $getGlobal = true): CookieStore
      * Returns the CSRF token name.
      * Can be used in Views when building hidden inputs manually,
      * or used in javascript vars when using APIs.
-     *
-     * @return string
      */
     function csrf_token(): string
     {
@@ -267,8 +248,6 @@ function csrf_token(): string
      * Returns the CSRF header name.
      * Can be used in Views by adding it to the meta tag
      * or used in javascript to define a header name when using APIs.
-     *
-     * @return string
      */
     function csrf_header(): string
     {
@@ -281,8 +260,6 @@ function csrf_header(): string
      * Returns the current hash value for the CSRF protection.
      * Can be used in Views when building hidden inputs manually,
      * or used in javascript vars for API usage.
-     *
-     * @return string
      */
     function csrf_hash(): string
     {
@@ -293,10 +270,6 @@ function csrf_hash(): string
 if (! function_exists('csrf_field')) {
     /**
      * Generates a hidden input field for use within manually generated forms.
-     *
-     * @param string|null $id
-     *
-     * @return string
      */
     function csrf_field(?string $id = null): string
     {
@@ -307,10 +280,6 @@ function csrf_field(?string $id = null): string
 if (! function_exists('csrf_meta')) {
     /**
      * Generates a meta tag for use within javascript calls.
-     *
-     * @param string|null $id
-     *
-     * @return string
      */
     function csrf_meta(?string $id = null): string
     {
@@ -334,7 +303,6 @@ function csrf_meta(?string $id = null): string
      * otherwise it will all calls will return the same instance.
      *
      * @param array|ConnectionInterface|string|null $db
-     * @param bool                                  $getShared
      *
      * @return BaseConnection
      */
@@ -370,7 +338,6 @@ function dd(...$vars)
      * retrieving values set from the .env file for
      * use in config files.
      *
-     * @param string      $key
      * @param string|null $default
      *
      * @return mixed
@@ -415,7 +382,6 @@ function env(string $key, $default = null)
      * Valid context values: html, js, css, url, attr, raw, null
      *
      * @param array|string $data
-     * @param string       $context
      * @param string       $encoding
      *
      * @throws InvalidArgumentException
@@ -682,8 +648,6 @@ function helper($filenames)
     /**
      * Check if PHP was invoked from the command line.
      *
-     * @return bool
-     *
      * @codeCoverageIgnore Cannot be tested fully as PHPUnit always run in CLI
      */
     function is_cli(): bool
@@ -719,12 +683,8 @@ function is_cli(): bool
      *
      * @see https://bugs.php.net/bug.php?id=54709
      *
-     * @param string $file
-     *
      * @throws Exception
      *
-     * @return bool
-     *
      * @codeCoverageIgnore Not practical to test, as travis runs on linux
      */
     function is_really_writable(string $file): bool
@@ -765,10 +725,6 @@ function is_really_writable(string $file): bool
      * A convenience method to translate a string or array of them and format
      * the result with the intl extension's MessageFormatter.
      *
-     * @param string      $line
-     * @param array       $args
-     * @param string|null $locale
-     *
      * @return string
      */
     function lang(string $line, array $args = [], ?string $locale = null)
@@ -793,10 +749,6 @@ function lang(string $line, array $args = [], ?string $locale = null)
      *  - info
      *  - debug
      *
-     * @param string $level
-     * @param string $message
-     * @param array  $context
-     *
      * @return mixed
      */
     function log_message(string $level, string $message, array $context = [])
@@ -821,10 +773,6 @@ function log_message(string $level, string $message, array $context = [])
     /**
      * More simple way of getting model instances from Factories
      *
-     * @param string                   $name
-     * @param bool                     $getShared
-     * @param ConnectionInterface|null $conn
-     *
      * @return mixed
      */
     function model(string $name, bool $getShared = true, ?ConnectionInterface &$conn = null)
@@ -838,7 +786,6 @@ function model(string $name, bool $getShared = true, ?ConnectionInterface &$conn
      * Provides access to "old input" that was set in the session
      * during a redirect()->withInput().
      *
-     * @param string      $key
      * @param null        $default
      * @param bool|string $escape
      *
@@ -883,8 +830,6 @@ function old(string $key, $default = null, $escape = 'html')
      * If more control is needed, you must use $response->redirect explicitly.
      *
      * @param string $route
-     *
-     * @return RedirectResponse
      */
     function redirect(?string $route = null): RedirectResponse
     {
@@ -904,11 +849,6 @@ function redirect(?string $route = null): RedirectResponse
      *
      * This prevents sandwiching null characters
      * between ascii characters, like Java\0script.
-     *
-     * @param string $str
-     * @param bool   $urlEncoded
-     *
-     * @return string
      */
     function remove_invisible_characters(string $str, bool $urlEncoded = true): string
     {
@@ -940,8 +880,7 @@ function remove_invisible_characters(string $str, bool $urlEncoded = true): stri
      * NOTE: This requires the controller/method to
      * have a route defined in the routes Config file.
      *
-     * @param string $method
-     * @param mixed  ...$params
+     * @param mixed ...$params
      *
      * @return false|string
      */
@@ -988,8 +927,7 @@ function session(?string $val = null)
      *  - $timer = service('timer')
      *  - $timer = \CodeIgniter\Config\Services::timer();
      *
-     * @param string $name
-     * @param mixed  ...$params
+     * @param mixed ...$params
      *
      * @return mixed
      */
@@ -1003,8 +941,7 @@ function service(string $name, ...$params)
     /**
      * Always returns a new instance of the class.
      *
-     * @param string $name
-     * @param mixed  ...$params
+     * @param mixed ...$params
      *
      * @return mixed
      */
@@ -1072,9 +1009,6 @@ function slash_item(string $item): ?string
      * of attributes to a string.
      *
      * @param mixed $attributes string, array, object
-     * @param bool  $js
-     *
-     * @return string
      */
     function stringify_attributes($attributes, bool $js = false): string
     {
@@ -1104,8 +1038,6 @@ function stringify_attributes($attributes, bool $js = false): string
      * If no parameter is passed, it will return the timer instance,
      * otherwise will start or stop the timer intelligently.
      *
-     * @param string|null $name
-     *
      * @return mixed|Timer
      */
     function timer(?string $name = null)
@@ -1145,11 +1077,7 @@ function trace()
      * NOTE: Does not provide any escaping of the data, so that must
      * all be handled manually by the developer.
      *
-     * @param string $name
-     * @param array  $data
-     * @param array  $options Unused - reserved for third-party extensions.
-     *
-     * @return string
+     * @param array $options Unused - reserved for third-party extensions.
      */
     function view(string $name, array $data = [], array $options = []): string
     {
@@ -1174,14 +1102,9 @@ function view(string $name, array $data = [], array $options = []): string
      * View cells are used within views to insert HTML chunks that are managed
      * by other classes.
      *
-     * @param string      $library
-     * @param null        $params
-     * @param int         $ttl
-     * @param string|null $cacheName
+     * @param null $params
      *
      * @throws ReflectionException
-     *
-     * @return string
      */
     function view_cell(string $library, $params = null, int $ttl = 0, ?string $cacheName = null): string
     {
diff --git a/system/ComposerScripts.php b/system/ComposerScripts.php
index cf74406883df..791b4506db6d 100644
--- a/system/ComposerScripts.php
+++ b/system/ComposerScripts.php
@@ -80,10 +80,6 @@ public static function postUpdate()
 
     /**
      * Recursively remove the contents of the previous `system/ThirdParty`.
-     *
-     * @param string $directory
-     *
-     * @return void
      */
     private static function recursiveDelete(string $directory): void
     {
@@ -109,11 +105,6 @@ private static function recursiveDelete(string $directory): void
     /**
      * Recursively copy the files and directories of the origin directory
      * into the target directory, i.e. "mirror" its contents.
-     *
-     * @param string $originDir
-     * @param string $targetDir
-     *
-     * @return void
      */
     private static function recursiveMirror(string $originDir, string $targetDir): void
     {
@@ -154,8 +145,6 @@ private static function recursiveMirror(string $originDir, string $targetDir): v
 
     /**
      * Copy Kint's init files into `system/ThirdParty/Kint/`
-     *
-     * @return void
      */
     private static function copyKintInitFiles(): void
     {
diff --git a/system/Config/BaseConfig.php b/system/Config/BaseConfig.php
index 1468c84271e8..d06b930d65b3 100644
--- a/system/Config/BaseConfig.php
+++ b/system/Config/BaseConfig.php
@@ -86,10 +86,7 @@ public function __construct()
     /**
      * Initialization an environment-specific configuration setting
      *
-     * @param mixed  $property
-     * @param string $name
-     * @param string $prefix
-     * @param string $shortPrefix
+     * @param mixed $property
      *
      * @return mixed
      */
@@ -114,10 +111,6 @@ protected function initEnvValue(&$property, string $name, string $prefix, string
     /**
      * Retrieve an environment-specific configuration setting
      *
-     * @param string $property
-     * @param string $prefix
-     * @param string $shortPrefix
-     *
      * @return mixed
      */
     protected function getEnvValue(string $property, string $prefix, string $shortPrefix)
diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
index 49d3688db112..d67af9304176 100644
--- a/system/Config/BaseService.php
+++ b/system/Config/BaseService.php
@@ -169,8 +169,7 @@ class BaseService
      *
      * $key must be a name matching a service.
      *
-     * @param string $key
-     * @param mixed  ...$params
+     * @param mixed ...$params
      *
      * @return mixed
      */
@@ -197,8 +196,6 @@ protected static function getSharedInstance(string $key, ...$params)
      * The Autoloader class is the central class that handles our
      * spl_autoload_register method, and helper methods.
      *
-     * @param bool $getShared
-     *
      * @return Autoloader
      */
     public static function autoloader(bool $getShared = true)
@@ -219,8 +216,6 @@ public static function autoloader(bool $getShared = true)
      * within namespaced folders, as well as convenience methods for
      * loading 'helpers', and 'libraries'.
      *
-     * @param bool $getShared
-     *
      * @return FileLocator
      */
     public static function locator(bool $getShared = true)
@@ -240,9 +235,6 @@ public static function locator(bool $getShared = true)
      * Provides the ability to perform case-insensitive calling of service
      * names.
      *
-     * @param string $name
-     * @param array  $arguments
-     *
      * @return mixed
      */
     public static function __callStatic(string $name, array $arguments)
@@ -259,10 +251,6 @@ public static function __callStatic(string $name, array $arguments)
     /**
      * Check if the requested service is defined and return the declaring
      * class. Return null if not found.
-     *
-     * @param string $name
-     *
-     * @return string|null
      */
     public static function serviceExists(string $name): ?string
     {
@@ -296,8 +284,6 @@ public static function reset(bool $initAutoloader = false)
 
     /**
      * Resets any mock and shared instances for a single service.
-     *
-     * @param string $name
      */
     public static function resetSingle(string $name)
     {
@@ -307,8 +293,7 @@ public static function resetSingle(string $name)
     /**
      * Inject mock object for testing.
      *
-     * @param string $name
-     * @param mixed  $mock
+     * @param mixed $mock
      */
     public static function injectMock(string $name, $mock)
     {
@@ -321,9 +306,6 @@ public static function injectMock(string $name, $mock)
      * looks for the service method in each, returning an instance of
      * the service, if available.
      *
-     * @param string $name
-     * @param array  $arguments
-     *
      * @return mixed
      *
      * @deprecated
diff --git a/system/Config/Config.php b/system/Config/Config.php
index 229e1e35d279..6f52869b5a76 100644
--- a/system/Config/Config.php
+++ b/system/Config/Config.php
@@ -35,7 +35,6 @@ public static function get(string $name, bool $getShared = true)
     /**
      * Helper method for injecting mock instances while testing.
      *
-     * @param string $name
      * @param object $instance
      */
     public static function injectMock(string $name, $instance)
diff --git a/system/Config/DotEnv.php b/system/Config/DotEnv.php
index e9761c63edd6..ddc590cd5986 100644
--- a/system/Config/DotEnv.php
+++ b/system/Config/DotEnv.php
@@ -27,9 +27,6 @@ class DotEnv
 
     /**
      * Builds the path to our file.
-     *
-     * @param string $path
-     * @param string $file
      */
     public function __construct(string $path, string $file = '.env')
     {
@@ -40,8 +37,6 @@ public function __construct(string $path, string $file = '.env')
      * The main entry point, will load the .env file and process it
      * so that we end up with all settings in the PHP environment vars
      * (i.e. getenv(), $_ENV, and $_SERVER)
-     *
-     * @return bool
      */
     public function load(): bool
     {
@@ -52,8 +47,6 @@ public function load(): bool
 
     /**
      * Parse the .env file into an array of key => value
-     *
-     * @return array|null
      */
     public function parse(): ?array
     {
@@ -92,9 +85,6 @@ public function parse(): ?array
      * Sets the variable into the environment. Will parse the string
      * first to look for {name}={value} pattern, ensure that nested
      * variables are handled, and strip it of single and double quotes.
-     *
-     * @param string $name
-     * @param string $value
      */
     protected function setVariable(string $name, string $value = '')
     {
@@ -114,11 +104,6 @@ protected function setVariable(string $name, string $value = '')
     /**
      * Parses for assignment, cleans the $name and $value, and ensures
      * that nested variables are handled.
-     *
-     * @param string $name
-     * @param string $value
-     *
-     * @return array
      */
     public function normaliseVariable(string $name, string $value = ''): array
     {
@@ -146,11 +131,7 @@ public function normaliseVariable(string $name, string $value = ''): array
      * This was borrowed from the excellent phpdotenv with very few changes.
      * https://github.com/vlucas/phpdotenv
      *
-     * @param string $value
-     *
      * @throws InvalidArgumentException
-     *
-     * @return string
      */
     protected function sanitizeValue(string $value): string
     {
@@ -203,10 +184,6 @@ protected function sanitizeValue(string $value): string
      *
      * This was borrowed from the excellent phpdotenv with very few changes.
      * https://github.com/vlucas/phpdotenv
-     *
-     * @param string $value
-     *
-     * @return string
      */
     protected function resolveNestedVariables(string $value): string
     {
@@ -235,8 +212,6 @@ function ($matchedPatterns) {
      * This was borrowed from the excellent phpdotenv with very few changes.
      * https://github.com/vlucas/phpdotenv
      *
-     * @param string $name
-     *
      * @return string|null
      */
     protected function getVariable(string $name)
diff --git a/system/Config/Factories.php b/system/Config/Factories.php
index 9df4fec5a6a4..8aa779220aed 100644
--- a/system/Config/Factories.php
+++ b/system/Config/Factories.php
@@ -71,9 +71,6 @@ class Factories
      * Loads instances based on the method component name. Either
      * creates a new instance or returns an existing shared instance.
      *
-     * @param string $component
-     * @param array  $arguments
-     *
      * @return mixed
      */
     public static function __callStatic(string $component, array $arguments)
@@ -121,8 +118,6 @@ public static function __callStatic(string $component, array $arguments)
      *
      * @param array  $options The array of component-specific directives
      * @param string $name    Class name, namespace optional
-     *
-     * @return string|null
      */
     protected static function locateClass(array $options, string $name): ?string
     {
@@ -180,8 +175,6 @@ protected static function locateClass(array $options, string $name): ?string
      *
      * @param array  $options The array of component-specific directives
      * @param string $name    Class name, namespace optional
-     *
-     * @return bool
      */
     protected static function verifyPreferApp(array $options, string $name): bool
     {
@@ -203,8 +196,6 @@ protected static function verifyPreferApp(array $options, string $name): bool
      *
      * @param array  $options The array of component-specific directives
      * @param string $name    Class name, namespace optional
-     *
-     * @return bool
      */
     protected static function verifyInstanceOf(array $options, string $name): bool
     {
@@ -245,7 +236,6 @@ public static function getOptions(string $component): array
      * Normalizes, stores, and returns the configuration for a specific component
      *
      * @param string $component Lowercase, plural component name
-     * @param array  $values
      *
      * @return array<string, mixed> The result after applying defaults and normalization
      */
@@ -297,7 +287,6 @@ public static function reset(?string $component = null)
      *
      * @param string $component Lowercase, plural component name
      * @param string $name      The name of the instance
-     * @param object $instance
      */
     public static function injectMock(string $component, string $name, object $instance)
     {
@@ -314,10 +303,6 @@ public static function injectMock(string $component, string $name, object $insta
 
     /**
      * Gets a basename from a class name, namespaced or not.
-     *
-     * @param string $name
-     *
-     * @return string
      */
     public static function getBasename(string $name): string
     {
diff --git a/system/Config/Services.php b/system/Config/Services.php
index 8760b8bb9f96..0b681f17ce17 100644
--- a/system/Config/Services.php
+++ b/system/Config/Services.php
@@ -93,9 +93,6 @@ class Services extends BaseService
      * The cache class provides a simple way to store and retrieve
      * complex data for later.
      *
-     * @param Cache|null $config
-     * @param bool       $getShared
-     *
      * @return CacheInterface
      */
     public static function cache(?Cache $config = null, bool $getShared = true)
@@ -113,9 +110,6 @@ public static function cache(?Cache $config = null, bool $getShared = true)
      * The CLI Request class provides for ways to interact with
      * a command line request.
      *
-     * @param App|null $config
-     * @param bool     $getShared
-     *
      * @return CLIRequest
      */
     public static function clirequest(?App $config = null, bool $getShared = true)
@@ -132,9 +126,6 @@ public static function clirequest(?App $config = null, bool $getShared = true)
     /**
      * CodeIgniter, the core of the framework.
      *
-     * @param App|null $config
-     * @param bool     $getShared
-     *
      * @return CodeIgniter
      */
     public static function codeigniter(?App $config = null, bool $getShared = true)
@@ -151,8 +142,6 @@ public static function codeigniter(?App $config = null, bool $getShared = true)
     /**
      * The commands utility for running and working with CLI commands.
      *
-     * @param bool $getShared
-     *
      * @return Commands
      */
     public static function commands(bool $getShared = true)
@@ -168,11 +157,6 @@ public static function commands(bool $getShared = true)
      * The CURL Request class acts as a simple HTTP client for interacting
      * with other servers, typically through APIs.
      *
-     * @param array                  $options
-     * @param ResponseInterface|null $response
-     * @param App|null               $config
-     * @param bool                   $getShared
-     *
      * @return CURLRequest
      */
     public static function curlrequest(array $options = [], ?ResponseInterface $response = null, ?App $config = null, bool $getShared = true)
@@ -196,7 +180,6 @@ public static function curlrequest(array $options = [], ?ResponseInterface $resp
      * The Email class allows you to send email via mail, sendmail, SMTP.
      *
      * @param array|EmailConfig|null $config
-     * @param bool                   $getShared
      *
      * @return Email
      */
@@ -216,8 +199,7 @@ public static function email($config = null, bool $getShared = true)
     /**
      * The Encryption class provides two-way encryption.
      *
-     * @param EncryptionConfig|null $config
-     * @param bool                  $getShared
+     * @param bool $getShared
      *
      * @return EncrypterInterface Encryption handler
      */
@@ -240,11 +222,6 @@ public static function encrypter(?EncryptionConfig $config = null, $getShared =
      *  - set_error_handler
      *  - register_shutdown_function
      *
-     * @param ExceptionsConfig|null $config
-     * @param IncomingRequest|null  $request
-     * @param Response|null         $response
-     * @param bool                  $getShared
-     *
      * @return Exceptions
      */
     public static function exceptions(
@@ -270,9 +247,6 @@ public static function exceptions(
      * and actions taken based on the request, while after filters can
      * act on or modify the response itself before it is sent to the client.
      *
-     * @param FiltersConfig|null $config
-     * @param bool               $getShared
-     *
      * @return Filters
      */
     public static function filters(?FiltersConfig $config = null, bool $getShared = true)
@@ -289,9 +263,6 @@ public static function filters(?FiltersConfig $config = null, bool $getShared =
     /**
      * The Format class is a convenient place to create Formatters.
      *
-     * @param FormatConfig|null $config
-     * @param bool              $getShared
-     *
      * @return Format
      */
     public static function format(?FormatConfig $config = null, bool $getShared = true)
@@ -309,9 +280,6 @@ public static function format(?FormatConfig $config = null, bool $getShared = tr
      * The Honeypot provides a secret input on forms that bots should NOT
      * fill in, providing an additional safeguard when accepting user input.
      *
-     * @param HoneypotConfig|null $config
-     * @param bool                $getShared
-     *
      * @return Honeypot
      */
     public static function honeypot(?HoneypotConfig $config = null, bool $getShared = true)
@@ -329,10 +297,6 @@ public static function honeypot(?HoneypotConfig $config = null, bool $getShared
      * Acts as a factory for ImageHandler classes and returns an instance
      * of the handler. Used like Services::image()->withFile($path)->rotate(90)->save();
      *
-     * @param string|null $handler
-     * @param Images|null $config
-     * @param bool        $getShared
-     *
      * @return BaseHandler
      */
     public static function image(?string $handler = null, ?Images $config = null, bool $getShared = true)
@@ -353,8 +317,6 @@ public static function image(?string $handler = null, ?Images $config = null, bo
      * and timing the results and memory usage. Used when debugging and
      * optimizing applications.
      *
-     * @param bool $getShared
-     *
      * @return Iterator
      */
     public static function iterator(bool $getShared = true)
@@ -369,9 +331,6 @@ public static function iterator(bool $getShared = true)
     /**
      * Responsible for loading the language string translations.
      *
-     * @param string|null $locale
-     * @param bool        $getShared
-     *
      * @return Language
      */
     public static function language(?string $locale = null, bool $getShared = true)
@@ -390,8 +349,6 @@ public static function language(?string $locale = null, bool $getShared = true)
      * The Logger class is a PSR-3 compatible Logging class that supports
      * multiple handlers that process the actual logging.
      *
-     * @param bool $getShared
-     *
      * @return Logger
      */
     public static function logger(bool $getShared = true)
@@ -406,10 +363,6 @@ public static function logger(bool $getShared = true)
     /**
      * Return the appropriate Migration runner.
      *
-     * @param Migrations|null          $config
-     * @param ConnectionInterface|null $db
-     * @param bool                     $getShared
-     *
      * @return MigrationRunner
      */
     public static function migrations(?Migrations $config = null, ?ConnectionInterface $db = null, bool $getShared = true)
@@ -428,9 +381,6 @@ public static function migrations(?Migrations $config = null, ?ConnectionInterfa
      * working the request to determine correct language, encoding, charset,
      * and more.
      *
-     * @param RequestInterface|null $request
-     * @param bool                  $getShared
-     *
      * @return Negotiate
      */
     public static function negotiator(?RequestInterface $request = null, bool $getShared = true)
@@ -447,10 +397,6 @@ public static function negotiator(?RequestInterface $request = null, bool $getSh
     /**
      * Return the appropriate pagination handler.
      *
-     * @param PagerConfig|null       $config
-     * @param RendererInterface|null $view
-     * @param bool                   $getShared
-     *
      * @return Pager
      */
     public static function pager(?PagerConfig $config = null, ?RendererInterface $view = null, bool $getShared = true)
@@ -468,10 +414,6 @@ public static function pager(?PagerConfig $config = null, ?RendererInterface $vi
     /**
      * The Parser is a simple template parser.
      *
-     * @param string|null     $viewPath
-     * @param ViewConfig|null $config
-     * @param bool            $getShared
-     *
      * @return Parser
      */
     public static function parser(?string $viewPath = null, ?ViewConfig $config = null, bool $getShared = true)
@@ -491,10 +433,6 @@ public static function parser(?string $viewPath = null, ?ViewConfig $config = nu
      * The default View class within CodeIgniter is intentionally simple, but this
      * service could easily be replaced by a template engine if the user needed to.
      *
-     * @param string|null     $viewPath
-     * @param ViewConfig|null $config
-     * @param bool            $getShared
-     *
      * @return View
      */
     public static function renderer(?string $viewPath = null, ?ViewConfig $config = null, bool $getShared = true)
@@ -512,9 +450,6 @@ public static function renderer(?string $viewPath = null, ?ViewConfig $config =
     /**
      * The Request class models an HTTP request.
      *
-     * @param App|null $config
-     * @param bool     $getShared
-     *
      * @return IncomingRequest
      */
     public static function request(?App $config = null, bool $getShared = true)
@@ -536,9 +471,6 @@ public static function request(?App $config = null, bool $getShared = true)
     /**
      * The Response class models an HTTP response.
      *
-     * @param App|null $config
-     * @param bool     $getShared
-     *
      * @return Response
      */
     public static function response(?App $config = null, bool $getShared = true)
@@ -555,9 +487,6 @@ public static function response(?App $config = null, bool $getShared = true)
     /**
      * The Redirect class provides nice way of working with redirects.
      *
-     * @param App|null $config
-     * @param bool     $getShared
-     *
      * @return RedirectResponse
      */
     public static function redirectresponse(?App $config = null, bool $getShared = true)
@@ -577,8 +506,6 @@ public static function redirectresponse(?App $config = null, bool $getShared = t
      * The Routes service is a class that allows for easily building
      * a collection of routes.
      *
-     * @param bool $getShared
-     *
      * @return RouteCollection
      */
     public static function routes(bool $getShared = true)
@@ -594,10 +521,6 @@ public static function routes(bool $getShared = true)
      * The Router class uses a RouteCollection's array of routes, and determines
      * the correct Controller and Method to execute.
      *
-     * @param RouteCollectionInterface|null $routes
-     * @param Request|null                  $request
-     * @param bool                          $getShared
-     *
      * @return Router
      */
     public static function router(?RouteCollectionInterface $routes = null, ?Request $request = null, bool $getShared = true)
@@ -616,9 +539,6 @@ public static function router(?RouteCollectionInterface $routes = null, ?Request
      * The Security class provides a few handy tools for keeping the site
      * secure, most notably the CSRF protection tools.
      *
-     * @param App|null $config
-     * @param bool     $getShared
-     *
      * @return Security
      */
     public static function security(?App $config = null, bool $getShared = true)
@@ -635,9 +555,6 @@ public static function security(?App $config = null, bool $getShared = true)
     /**
      * Return the session manager.
      *
-     * @param App|null $config
-     * @param bool     $getShared
-     *
      * @return Session
      */
     public static function session(?App $config = null, bool $getShared = true)
@@ -667,8 +584,6 @@ public static function session(?App $config = null, bool $getShared = true)
      * The Throttler class provides a simple method for implementing
      * rate limiting in your applications.
      *
-     * @param bool $getShared
-     *
      * @return Throttler
      */
     public static function throttler(bool $getShared = true)
@@ -684,8 +599,6 @@ public static function throttler(bool $getShared = true)
      * The Timer class provides a simple way to Benchmark portions of your
      * application.
      *
-     * @param bool $getShared
-     *
      * @return Timer
      */
     public static function timer(bool $getShared = true)
@@ -700,9 +613,6 @@ public static function timer(bool $getShared = true)
     /**
      * Return the debug toolbar.
      *
-     * @param ToolbarConfig|null $config
-     * @param bool               $getShared
-     *
      * @return Toolbar
      */
     public static function toolbar(?ToolbarConfig $config = null, bool $getShared = true)
@@ -720,7 +630,6 @@ public static function toolbar(?ToolbarConfig $config = null, bool $getShared =
      * The URI class provides a way to model and manipulate URIs.
      *
      * @param string $uri
-     * @param bool   $getShared
      *
      * @return URI
      */
@@ -736,9 +645,6 @@ public static function uri(?string $uri = null, bool $getShared = true)
     /**
      * The Validation class provides tools for validating input data.
      *
-     * @param ValidationConfig|null $config
-     * @param bool                  $getShared
-     *
      * @return Validation
      */
     public static function validation(?ValidationConfig $config = null, bool $getShared = true)
@@ -756,8 +662,6 @@ public static function validation(?ValidationConfig $config = null, bool $getSha
      * View cells are intended to let you insert HTML into view
      * that has been generated by any callable in the system.
      *
-     * @param bool $getShared
-     *
      * @return Cell
      */
     public static function viewcell(bool $getShared = true)
@@ -772,8 +676,6 @@ public static function viewcell(bool $getShared = true)
     /**
      * The Typography class provides a way to format text in semantically relevant ways.
      *
-     * @param bool $getShared
-     *
      * @return Typography
      */
     public static function typography(bool $getShared = true)
diff --git a/system/Controller.php b/system/Controller.php
index 9138d930ac53..b50c8bcf3470 100644
--- a/system/Controller.php
+++ b/system/Controller.php
@@ -69,10 +69,6 @@ class Controller
     /**
      * Constructor.
      *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @param LoggerInterface   $logger
-     *
      * @throws HTTPException
      */
     public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
@@ -109,8 +105,6 @@ protected function forceHTTPS(int $duration = 31536000)
     /**
      * Provides a simple way to tie into the main CodeIgniter class and
      * tell it how long to cache the current page for.
-     *
-     * @param int $time
      */
     protected function cachePage(int $time)
     {
@@ -139,8 +133,6 @@ protected function loadHelpers()
      *
      * @param array|string $rules
      * @param array        $messages An array of custom error messages
-     *
-     * @return bool
      */
     protected function validate($rules, array $messages = []): bool
     {
diff --git a/system/Cookie/CloneableCookieInterface.php b/system/Cookie/CloneableCookieInterface.php
index 8cbbeb985804..508c1359970e 100644
--- a/system/Cookie/CloneableCookieInterface.php
+++ b/system/Cookie/CloneableCookieInterface.php
@@ -22,8 +22,6 @@ interface CloneableCookieInterface extends CookieInterface
     /**
      * Creates a new Cookie with a new cookie prefix.
      *
-     * @param string $prefix
-     *
      * @return static
      */
     public function withPrefix(string $prefix = '');
@@ -31,8 +29,6 @@ public function withPrefix(string $prefix = '');
     /**
      * Creates a new Cookie with a new name.
      *
-     * @param string $name
-     *
      * @return static
      */
     public function withName(string $name);
@@ -40,8 +36,6 @@ public function withName(string $name);
     /**
      * Creates a new Cookie with new value.
      *
-     * @param string $value
-     *
      * @return static
      */
     public function withValue(string $value);
@@ -72,8 +66,6 @@ public function withNeverExpiring();
     /**
      * Creates a new Cookie with a new path on the server the cookie is available.
      *
-     * @param string|null $path
-     *
      * @return static
      */
     public function withPath(?string $path);
@@ -81,8 +73,6 @@ public function withPath(?string $path);
     /**
      * Creates a new Cookie with a new domain the cookie is available.
      *
-     * @param string|null $domain
-     *
      * @return static
      */
     public function withDomain(?string $domain);
@@ -90,8 +80,6 @@ public function withDomain(?string $domain);
     /**
      * Creates a new Cookie with a new "Secure" attribute.
      *
-     * @param bool $secure
-     *
      * @return static
      */
     public function withSecure(bool $secure = true);
@@ -99,8 +87,6 @@ public function withSecure(bool $secure = true);
     /**
      * Creates a new Cookie with a new "HttpOnly" attribute
      *
-     * @param bool $httponly
-     *
      * @return static
      */
     public function withHTTPOnly(bool $httponly = true);
@@ -108,8 +94,6 @@ public function withHTTPOnly(bool $httponly = true);
     /**
      * Creates a new Cookie with a new "SameSite" attribute.
      *
-     * @param string $samesite
-     *
      * @return static
      */
     public function withSameSite(string $samesite);
@@ -117,8 +101,6 @@ public function withSameSite(string $samesite);
     /**
      * Creates a new Cookie with URL encoding option updated.
      *
-     * @param bool $raw
-     *
      * @return static
      */
     public function withRaw(bool $raw = true);
diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php
index 84f067442119..3895e3ee2609 100644
--- a/system/Cookie/Cookie.php
+++ b/system/Cookie/Cookie.php
@@ -158,9 +158,6 @@ public static function setDefaults($config = [])
     /**
      * Create a new Cookie instance from a `Set-Cookie` header.
      *
-     * @param string $cookie
-     * @param bool   $raw
-     *
      * @throws CookieException
      *
      * @return static
@@ -701,8 +698,6 @@ public function toArray(): array
      * Converts expires time to Unix format.
      *
      * @param DateTimeInterface|int|string $expires
-     *
-     * @return int
      */
     protected static function convertExpiresTimestamp($expires = 0): int
     {
@@ -735,12 +730,7 @@ protected static function convertExpiresTimestamp($expires = 0): int
      * If `$raw` is true, names should not contain invalid characters
      * as `setrawcookie()` will reject this.
      *
-     * @param string $name
-     * @param bool   $raw
-     *
      * @throws CookieException
-     *
-     * @return void
      */
     protected function validateName(string $name, bool $raw): void
     {
@@ -756,14 +746,7 @@ protected function validateName(string $name, bool $raw): void
     /**
      * Validates the special prefixes if some attribute requirements are met.
      *
-     * @param string $prefix
-     * @param bool   $secure
-     * @param string $path
-     * @param string $domain
-     *
      * @throws CookieException
-     *
-     * @return void
      */
     protected function validatePrefix(string $prefix, bool $secure, string $path, string $domain): void
     {
@@ -779,13 +762,8 @@ protected function validatePrefix(string $prefix, bool $secure, string $path, st
     /**
      * Validates the `SameSite` to be within the allowed types.
      *
-     * @param string $samesite
-     * @param bool   $secure
-     *
      * @throws CookieException
      *
-     * @return void
-     *
      * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite
      */
     protected function validateSameSite(string $samesite, bool $secure): void
diff --git a/system/Cookie/CookieInterface.php b/system/Cookie/CookieInterface.php
index 0576d7ee48c6..0b2b75783c12 100644
--- a/system/Cookie/CookieInterface.php
+++ b/system/Cookie/CookieInterface.php
@@ -60,78 +60,56 @@ interface CookieInterface
     /**
      * Returns a unique identifier for the cookie consisting
      * of its prefixed name, path, and domain.
-     *
-     * @return string
      */
     public function getId(): string;
 
     /**
      * Gets the cookie prefix.
-     *
-     * @return string
      */
     public function getPrefix(): string;
 
     /**
      * Gets the cookie name.
-     *
-     * @return string
      */
     public function getName(): string;
 
     /**
      * Gets the cookie name prepended with the prefix, if any.
-     *
-     * @return string
      */
     public function getPrefixedName(): string;
 
     /**
      * Gets the cookie value.
-     *
-     * @return string
      */
     public function getValue(): string;
 
     /**
      * Gets the time in Unix timestamp the cookie expires.
-     *
-     * @return int
      */
     public function getExpiresTimestamp(): int;
 
     /**
      * Gets the formatted expires time.
-     *
-     * @return string
      */
     public function getExpiresString(): string;
 
     /**
      * Checks if the cookie is expired.
-     *
-     * @return bool
      */
     public function isExpired(): bool;
 
     /**
      * Gets the "Max-Age" cookie attribute.
-     *
-     * @return int
      */
     public function getMaxAge(): int;
 
     /**
      * Gets the "Path" cookie attribute.
-     *
-     * @return string
      */
     public function getPath(): string;
 
     /**
      * Gets the "Domain" cookie attribute.
-     *
-     * @return string
      */
     public function getDomain(): string;
 
@@ -141,8 +119,6 @@ public function getDomain(): string;
      * Checks if the cookie is only sent to the server when a request is made
      * with the `https:` scheme (except on `localhost`), and therefore is more
      * resistent to man-in-the-middle attacks.
-     *
-     * @return bool
      */
     public function isSecure(): bool;
 
@@ -150,22 +126,16 @@ public function isSecure(): bool;
      * Gets the "HttpOnly" cookie attribute.
      *
      * Checks if JavaScript is forbidden from accessing the cookie.
-     *
-     * @return bool
      */
     public function isHTTPOnly(): bool;
 
     /**
      * Gets the "SameSite" cookie attribute.
-     *
-     * @return string
      */
     public function getSameSite(): string;
 
     /**
      * Checks if the cookie should be sent with no URL encoding.
-     *
-     * @return bool
      */
     public function isRaw(): bool;
 
@@ -179,8 +149,6 @@ public function getOptions(): array;
 
     /**
      * Returns the Cookie as a header value.
-     *
-     * @return string
      */
     public function toHeaderString(): string;
 
diff --git a/system/Cookie/CookieStore.php b/system/Cookie/CookieStore.php
index a7c1e37bb297..8ef45c970f59 100644
--- a/system/Cookie/CookieStore.php
+++ b/system/Cookie/CookieStore.php
@@ -35,7 +35,6 @@ class CookieStore implements Countable, IteratorAggregate
      * Creates a CookieStore from an array of `Set-Cookie` headers.
      *
      * @param string[] $headers
-     * @param bool     $raw
      *
      * @throws CookieException
      *
@@ -76,12 +75,6 @@ final public function __construct(array $cookies)
     /**
      * Checks if a `Cookie` object identified by name and
      * prefix is present in the collection.
-     *
-     * @param string      $name
-     * @param string      $prefix
-     * @param string|null $value
-     *
-     * @return bool
      */
     public function has(string $name, string $prefix = '', ?string $value = null): bool
     {
@@ -106,12 +99,7 @@ public function has(string $name, string $prefix = '', ?string $value = null): b
      * Retrieves an instance of `Cookie` identified by a name and prefix.
      * This throws an exception if not found.
      *
-     * @param string $name
-     * @param string $prefix
-     *
      * @throws CookieException
-     *
-     * @return Cookie
      */
     public function get(string $name, string $prefix = ''): Cookie
     {
@@ -130,8 +118,6 @@ public function get(string $name, string $prefix = ''): Cookie
      * Store a new cookie and return a new collection. The original collection
      * is left unchanged.
      *
-     * @param Cookie $cookie
-     *
      * @return static
      */
     public function put(Cookie $cookie)
@@ -151,9 +137,6 @@ public function put(Cookie $cookie)
      * If you intend to delete a cookie *from the browser*, you must put an empty
      * value cookie with the same name to the store.
      *
-     * @param string $name
-     * @param string $prefix
-     *
      * @return static
      */
     public function remove(string $name, string $prefix = '')
@@ -175,8 +158,6 @@ public function remove(string $name, string $prefix = '')
 
     /**
      * Dispatches all cookies in store.
-     *
-     * @return void
      */
     public function dispatch(): void
     {
@@ -207,8 +188,6 @@ public function display(): array
 
     /**
      * Clears the cookie collection.
-     *
-     * @return void
      */
     public function clear(): void
     {
@@ -217,8 +196,6 @@ public function clear(): void
 
     /**
      * Gets the Cookie count in this collection.
-     *
-     * @return int
      */
     public function count(): int
     {
@@ -238,11 +215,7 @@ public function getIterator()
     /**
      * Validates all cookies passed to be instances of Cookie.
      *
-     * @param array $cookies
-     *
      * @throws CookieException
-     *
-     * @return void
      */
     protected function validateCookies(array $cookies): void
     {
@@ -259,12 +232,6 @@ protected function validateCookies(array $cookies): void
      * Extracted call to `setrawcookie()` in order to run unit tests on it.
      *
      * @codeCoverageIgnore
-     *
-     * @param string $name
-     * @param string $value
-     * @param array  $options
-     *
-     * @return void
      */
     protected function setRawCookie(string $name, string $value, array $options): void
     {
@@ -275,12 +242,6 @@ protected function setRawCookie(string $name, string $value, array $options): vo
      * Extracted call to `setcookie()` in order to run unit tests on it.
      *
      * @codeCoverageIgnore
-     *
-     * @param string $name
-     * @param string $value
-     * @param array  $options
-     *
-     * @return void
      */
     protected function setCookie(string $name, string $value, array $options): void
     {
diff --git a/system/Cookie/Exceptions/CookieException.php b/system/Cookie/Exceptions/CookieException.php
index 89fd75e9ff5c..2e69a0e0f891 100644
--- a/system/Cookie/Exceptions/CookieException.php
+++ b/system/Cookie/Exceptions/CookieException.php
@@ -21,8 +21,6 @@ class CookieException extends FrameworkException
     /**
      * Thrown for invalid type given for the "Expires" attribute.
      *
-     * @param string $type
-     *
      * @return static
      */
     public static function forInvalidExpiresTime(string $type)
@@ -43,8 +41,6 @@ public static function forInvalidExpiresValue()
     /**
      * Thrown when the cookie name contains invalid characters per RFC 2616.
      *
-     * @param string $name
-     *
      * @return static
      */
     public static function forInvalidCookieName(string $name)
@@ -87,8 +83,6 @@ public static function forInvalidHostPrefix()
     /**
      * Thrown when the `SameSite` attribute given is not of the valid types.
      *
-     * @param string $sameSite
-     *
      * @return static
      */
     public static function forInvalidSameSite(string $sameSite)
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 2dd7933113e4..1dbd91312ad2 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -247,9 +247,7 @@ class BaseBuilder
     /**
      * Constructor
      *
-     * @param array|string        $tableName
-     * @param ConnectionInterface $db
-     * @param array               $options
+     * @param array|string $tableName
      *
      * @throws DatabaseException
      */
@@ -302,8 +300,6 @@ public function testMode(bool $mode = true)
 
     /**
      * Gets the name of the primary table.
-     *
-     * @return string
      */
     public function getTable(): string
     {
@@ -313,8 +309,6 @@ public function getTable(): string
     /**
      * Returns an array of bind values and their
      * named parameters for binding in the Query object later.
-     *
-     * @return array
      */
     public function getBinds(): array
     {
@@ -327,8 +321,6 @@ public function getBinds(): array
      * Set ignore Flag for next insert,
      * update or delete query.
      *
-     * @param bool $ignore
-     *
      * @return $this
      */
     public function ignore(bool $ignore = true)
@@ -467,8 +459,6 @@ public function selectCount(string $select = '', string $alias = '')
      * @used-by selectSum()
      *
      * @param string $select Field name
-     * @param string $alias
-     * @param string $type
      *
      * @throws DatabaseException
      * @throws DataException
@@ -505,10 +495,6 @@ protected function maxMinAvgSum(string $select = '', string $alias = '', string
 
     /**
      * Determines the alias name based on the table
-     *
-     * @param string $item
-     *
-     * @return string
      */
     protected function createAliasFromTable(string $item): string
     {
@@ -526,8 +512,6 @@ protected function createAliasFromTable(string $item): string
      *
      * Sets a flag which tells the query string compiler to add DISTINCT
      *
-     * @param bool $val
-     *
      * @return $this
      */
     public function distinct(bool $val = true)
@@ -581,7 +565,6 @@ public function from($from, bool $overwrite = false)
      *
      * Generates the JOIN portion of the query
      *
-     * @param string $table
      * @param string $cond   The join condition
      * @param string $type   The type of join
      * @param bool   $escape Whether not to try to escape identifiers
@@ -697,7 +680,6 @@ public function orWhere($key, $value = null, ?bool $escape = null)
      * @param string $qbKey  'QBWhere' or 'QBHaving'
      * @param mixed  $key
      * @param mixed  $value
-     * @param string $type
      * @param bool   $escape
      *
      * @return $this
@@ -908,7 +890,6 @@ public function orHavingNotIn(?string $key = null, $values = null, ?bool $escape
      * @param string             $key    The field to search
      * @param array|Closure|null $values The values searched on, or anonymous function with subquery
      * @param bool               $not    If the statement would be IN or NOT IN
-     * @param string             $type
      * @param bool               $escape
      * @param string             $clause (Internal use only)
      *
@@ -973,11 +954,9 @@ protected function _whereIn(?string $key = null, $values = null, bool $not = fal
      * Generates a %LIKE% portion of the query.
      * Separates multiple calls with 'AND'.
      *
-     * @param mixed  $field
-     * @param string $match
-     * @param string $side
-     * @param bool   $escape
-     * @param bool   $insensitiveSearch IF true, will force a case-insensitive search
+     * @param mixed $field
+     * @param bool  $escape
+     * @param bool  $insensitiveSearch IF true, will force a case-insensitive search
      *
      * @return $this
      */
@@ -992,11 +971,9 @@ public function like($field, string $match = '', string $side = 'both', ?bool $e
      * Generates a NOT LIKE portion of the query.
      * Separates multiple calls with 'AND'.
      *
-     * @param mixed  $field
-     * @param string $match
-     * @param string $side
-     * @param bool   $escape
-     * @param bool   $insensitiveSearch IF true, will force a case-insensitive search
+     * @param mixed $field
+     * @param bool  $escape
+     * @param bool  $insensitiveSearch IF true, will force a case-insensitive search
      *
      * @return $this
      */
@@ -1011,11 +988,9 @@ public function notLike($field, string $match = '', string $side = 'both', ?bool
      * Generates a %LIKE% portion of the query.
      * Separates multiple calls with 'OR'.
      *
-     * @param mixed  $field
-     * @param string $match
-     * @param string $side
-     * @param bool   $escape
-     * @param bool   $insensitiveSearch IF true, will force a case-insensitive search
+     * @param mixed $field
+     * @param bool  $escape
+     * @param bool  $insensitiveSearch IF true, will force a case-insensitive search
      *
      * @return $this
      */
@@ -1030,11 +1005,9 @@ public function orLike($field, string $match = '', string $side = 'both', ?bool
      * Generates a NOT LIKE portion of the query.
      * Separates multiple calls with 'OR'.
      *
-     * @param mixed  $field
-     * @param string $match
-     * @param string $side
-     * @param bool   $escape
-     * @param bool   $insensitiveSearch IF true, will force a case-insensitive search
+     * @param mixed $field
+     * @param bool  $escape
+     * @param bool  $insensitiveSearch IF true, will force a case-insensitive search
      *
      * @return $this
      */
@@ -1049,10 +1022,8 @@ public function orNotLike($field, string $match = '', string $side = 'both', ?bo
      * Generates a %LIKE% portion of the query.
      * Separates multiple calls with 'AND'.
      *
-     * @param mixed  $field
-     * @param string $match
-     * @param string $side
-     * @param bool   $escape
+     * @param mixed $field
+     * @param bool  $escape
      *
      * @return $this
      */
@@ -1067,10 +1038,8 @@ public function havingLike($field, string $match = '', string $side = 'both', ?b
      * Generates a NOT LIKE portion of the query.
      * Separates multiple calls with 'AND'.
      *
-     * @param mixed  $field
-     * @param string $match
-     * @param string $side
-     * @param bool   $escape
+     * @param mixed $field
+     * @param bool  $escape
      *
      * @return $this
      */
@@ -1085,10 +1054,8 @@ public function notHavingLike($field, string $match = '', string $side = 'both',
      * Generates a %LIKE% portion of the query.
      * Separates multiple calls with 'OR'.
      *
-     * @param mixed  $field
-     * @param string $match
-     * @param string $side
-     * @param bool   $escape
+     * @param mixed $field
+     * @param bool  $escape
      *
      * @return $this
      */
@@ -1103,10 +1070,8 @@ public function orHavingLike($field, string $match = '', string $side = 'both',
      * Generates a NOT LIKE portion of the query.
      * Separates multiple calls with 'OR'.
      *
-     * @param mixed  $field
-     * @param string $match
-     * @param string $side
-     * @param bool   $escape
+     * @param mixed $field
+     * @param bool  $escape
      *
      * @return $this
      */
@@ -1128,10 +1093,6 @@ public function orNotHavingLike($field, string $match = '', string $side = 'both
      * @used-by orNotHavingLike()
      *
      * @param mixed  $field
-     * @param string $match
-     * @param string $type
-     * @param string $side
-     * @param string $not
      * @param bool   $escape
      * @param bool   $insensitiveSearch IF true, will force a case-insensitive search
      * @param string $clause            (Internal use only)
@@ -1185,12 +1146,6 @@ protected function _like($field, string $match = '', string $type = 'AND ', stri
     /**
      * Platform independent LIKE statement builder.
      *
-     * @param string|null $prefix
-     * @param string      $column
-     * @param string|null $not
-     * @param string      $bind
-     * @param bool        $insensitiveSearch
-     *
      * @return string $like_statement
      */
     protected function _like_statement(?string $prefix, string $column, ?string $not, string $bind, bool $insensitiveSearch = false): string
@@ -1305,10 +1260,6 @@ public function havingGroupEnd()
     /**
      * Prepate a query group start.
      *
-     * @param string $not
-     * @param string $type
-     * @param string $clause
-     *
      * @return $this
      */
     protected function groupStartPrepare(string $not = '', string $type = 'AND ', string $clause = 'QBWhere')
@@ -1330,8 +1281,6 @@ protected function groupStartPrepare(string $not = '', string $type = 'AND ', st
     /**
      * Prepate a query group end.
      *
-     * @param string $clause
-     *
      * @return $this
      */
     protected function groupEndPrepare(string $clause = 'QBWhere')
@@ -1355,10 +1304,6 @@ protected function groupEndPrepare(string $clause = 'QBWhere')
      * @used-by whereHaving()
      * @used-by _whereIn()
      * @used-by havingGroupStart()
-     *
-     * @param string $type
-     *
-     * @return string
      */
     protected function groupGetType(string $type): string
     {
@@ -1439,7 +1384,6 @@ public function orHaving($key, $value = null, ?bool $escape = null)
     /**
      * ORDER BY
      *
-     * @param string $orderBy
      * @param string $direction ASC, DESC or RANDOM
      * @param bool   $escape
      *
@@ -1538,8 +1482,6 @@ public function offset(int $offset)
      * Generates a platform-specific LIMIT clause.
      *
      * @param string $sql SQL Query
-     *
-     * @return string
      */
     protected function _limit(string $sql, bool $offsetIgnore = false): string
     {
@@ -1582,10 +1524,6 @@ public function set($key, ?string $value = '', ?bool $escape = null)
     /**
      * Returns the previously set() data, alternatively resetting it
      * if needed.
-     *
-     * @param bool $clean
-     *
-     * @return array
      */
     public function getSetData(bool $clean = false): array
     {
@@ -1604,8 +1542,6 @@ public function getSetData(bool $clean = false): array
      * Compiles a SELECT query string and returns the sql.
      *
      * @param bool $reset TRUE: resets QB values; FALSE: leave QB values alone
-     *
-     * @return string
      */
     public function getCompiledSelect(bool $reset = true): string
     {
@@ -1621,10 +1557,6 @@ public function getCompiledSelect(bool $reset = true): string
     /**
      * Returns a finalized, compiled query string with the bindings
      * inserted and prefixes swapped out.
-     *
-     * @param string $sql
-     *
-     * @return string
      */
     protected function compileFinalQuery(string $sql): string
     {
@@ -1711,8 +1643,6 @@ public function countAll(bool $reset = true)
      * Generates a platform-specific query string that counts all records
      * returned by an Query Builder query.
      *
-     * @param bool $reset
-     *
      * @return int|string when $test = true
      */
     public function countAllResults(bool $reset = true)
@@ -1884,8 +1814,6 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
      * @param string $table  Table name
      * @param array  $keys   INSERT keys
      * @param array  $values INSERT values
-     *
-     * @return string
      */
     protected function _insertBatch(string $table, array $keys, array $values): string
     {
@@ -1895,9 +1823,8 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
     /**
      * The "setInsertBatch" function.  Allows key/value pairs to be set for batch inserts
      *
-     * @param mixed  $key
-     * @param string $value
-     * @param bool   $escape
+     * @param mixed $key
+     * @param bool  $escape
      *
      * @return $this|null
      */
@@ -2033,8 +1960,6 @@ public function insert(?array $set = null, ?bool $escape = null)
      * has been chosen to be inserted into.
      *
      * @throws DatabaseException
-     *
-     * @return bool
      */
     protected function validateInsert(): bool
     {
@@ -2058,8 +1983,6 @@ protected function validateInsert(): bool
      * @param string $table         The table name
      * @param array  $keys          The insert keys
      * @param array  $unescapedKeys The insert values
-     *
-     * @return string
      */
     protected function _insert(string $table, array $keys, array $unescapedKeys): string
     {
@@ -2109,8 +2032,6 @@ public function replace(?array $set = null)
      * @param string $table  The table name
      * @param array  $keys   The insert keys
      * @param array  $values The insert values
-     *
-     * @return string
      */
     protected function _replace(string $table, array $keys, array $values): string
     {
@@ -2124,8 +2045,6 @@ protected function _replace(string $table, array $keys, array $values): string
      * about operator precedence.
      *
      * Note: This is only used (and overridden) by MySQL and SQLSRV.
-     *
-     * @return string
      */
     protected function _fromTables(): string
     {
@@ -2218,8 +2137,6 @@ public function update(?array $set = null, $where = null, ?int $limit = null): b
      *
      * @param string $table  the Table name
      * @param array  $values the Update data
-     *
-     * @return string
      */
     protected function _update(string $table, array $values): string
     {
@@ -2243,8 +2160,6 @@ protected function _update(string $table, array $values): string
      * chosen to be update.
      *
      * @throws DatabaseException
-     *
-     * @return bool
      */
     protected function validateUpdate(): bool
     {
@@ -2343,8 +2258,6 @@ public function updateBatch(?array $set = null, ?string $index = null, int $batc
      * @param string $table  Table name
      * @param array  $values Update data
      * @param string $index  WHERE key
-     *
-     * @return string
      */
     protected function _updateBatch(string $table, array $values, string $index): string
     {
@@ -2378,7 +2291,6 @@ protected function _updateBatch(string $table, array $values, string $index): st
      * The "setUpdateBatch" function.  Allows key/value pairs to be set for batch updating
      *
      * @param array|object $key
-     * @param string       $index
      * @param bool         $escape
      *
      * @throws DatabaseException
@@ -2476,8 +2388,6 @@ public function truncate()
      * then this method maps to 'DELETE FROM table'
      *
      * @param string $table The table name
-     *
-     * @return string
      */
     protected function _truncate(string $table): string
     {
@@ -2490,8 +2400,6 @@ protected function _truncate(string $table): string
      * Compiles a delete query string and returns the sql
      *
      * @param bool $reset TRUE: reset QB values; FALSE: leave QB values alone
-     *
-     * @return string
      */
     public function getCompiledDelete(bool $reset = true): string
     {
@@ -2506,9 +2414,8 @@ public function getCompiledDelete(bool $reset = true): string
      *
      * Compiles a delete string and runs the query
      *
-     * @param mixed $where     The where clause
-     * @param int   $limit     The limit clause
-     * @param bool  $resetData
+     * @param mixed $where The where clause
+     * @param int   $limit The limit clause
      *
      * @throws DatabaseException
      *
@@ -2555,9 +2462,6 @@ public function delete($where = '', ?int $limit = null, bool $resetData = true)
     /**
      * Increments a numeric column by the specified value.
      *
-     * @param string $column
-     * @param int    $value
-     *
      * @return bool
      */
     public function increment(string $column, int $value = 1)
@@ -2572,9 +2476,6 @@ public function increment(string $column, int $value = 1)
     /**
      * Decrements a numeric column by the specified value.
      *
-     * @param string $column
-     * @param int    $value
-     *
      * @return bool
      */
     public function decrement(string $column, int $value = 1)
@@ -2592,8 +2493,6 @@ public function decrement(string $column, int $value = 1)
      * Generates a platform-specific delete string from the supplied data
      *
      * @param string $table The table name
-     *
-     * @return string
      */
     protected function _delete(string $table): string
     {
@@ -2645,8 +2544,6 @@ protected function trackAliases($table)
      * Should not be called directly.
      *
      * @param mixed $selectOverride
-     *
-     * @return string
      */
     protected function compileSelect($selectOverride = false): string
     {
@@ -2699,8 +2596,6 @@ protected function compileSelect($selectOverride = false): string
      * Checks if the ignore option is supported by
      * the Database Driver for the specific statement.
      *
-     * @param string $statement
-     *
      * @return string
      */
     protected function compileIgnore(string $statement)
@@ -2919,10 +2814,6 @@ protected function batchObjectToArray($object)
      * Is literal
      *
      * Determines if a string represents a literal value or a field name
-     *
-     * @param string $str
-     *
-     * @return bool
      */
     protected function isLiteral(string $str): bool
     {
@@ -3022,10 +2913,6 @@ protected function resetWrite()
 
     /**
      * Tests whether the string has an SQL operator
-     *
-     * @param string $str
-     *
-     * @return bool
      */
     protected function hasOperator(string $str): bool
     {
@@ -3035,9 +2922,6 @@ protected function hasOperator(string $str): bool
     /**
      * Returns the SQL string operator
      *
-     * @param string $str
-     * @param bool   $list
-     *
      * @return mixed
      */
     protected function getOperator(string $str, bool $list = false)
@@ -3071,11 +2955,7 @@ protected function getOperator(string $str, bool $list = false)
      * with PHP 7+ we get a huge memory/performance gain with indexed
      * arrays instead, so lets take advantage of that here.
      *
-     * @param string $key
-     * @param mixed  $value
-     * @param bool   $escape
-     *
-     * @return string
+     * @param mixed $value
      */
     protected function setBind(string $key, $value = null, bool $escape = true): string
     {
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 675c9958d086..36637441674a 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -297,8 +297,6 @@ abstract class BaseConnection implements ConnectionInterface
 
     /**
      * Saves our connection settings.
-     *
-     * @param array $params
      */
     public function __construct(array $params)
     {
@@ -387,8 +385,6 @@ public function initialize()
     /**
      * Connect to the database.
      *
-     * @param bool $persistent
-     *
      * @return mixed
      */
     abstract public function connect(bool $persistent = false);
@@ -437,8 +433,6 @@ abstract public function reconnect();
      * get that connection. If you pass either alias in and only a single
      * connection is present, it must return the sole connection.
      *
-     * @param string|null $alias
-     *
      * @return mixed
      */
     public function getConnection(?string $alias = null)
@@ -450,16 +444,12 @@ public function getConnection(?string $alias = null)
     /**
      * Select a specific database table to use.
      *
-     * @param string $databaseName
-     *
      * @return mixed
      */
     abstract public function setDatabase(string $databaseName);
 
     /**
      * Returns the name of the current database being used.
-     *
-     * @return string
      */
     public function getDatabase(): string
     {
@@ -472,8 +462,6 @@ public function getDatabase(): string
      * Set's the DB Prefix to something new without needing to reconnect
      *
      * @param string $prefix The prefix
-     *
-     * @return string
      */
     public function setPrefix(string $prefix = ''): string
     {
@@ -482,8 +470,6 @@ public function setPrefix(string $prefix = ''): string
 
     /**
      * Returns the database prefix.
-     *
-     * @return string
      */
     public function getPrefix(): string
     {
@@ -492,8 +478,6 @@ public function getPrefix(): string
 
     /**
      * The name of the platform in use (MySQLi, mssql, etc)
-     *
-     * @return string
      */
     public function getPlatform(): string
     {
@@ -502,8 +486,6 @@ public function getPlatform(): string
 
     /**
      * Returns a string containing the version of the database being used.
-     *
-     * @return string
      */
     abstract public function getVersion(): string;
 
@@ -512,8 +494,6 @@ abstract public function getVersion(): string;
      * collected during use of the Builder, and set here
      * so queries are built correctly.
      *
-     * @param array $aliases
-     *
      * @return $this
      */
     public function setAliasedTables(array $aliases)
@@ -526,8 +506,6 @@ public function setAliasedTables(array $aliases)
     /**
      * Add a table alias to our list.
      *
-     * @param string $table
-     *
      * @return $this
      */
     public function addTableAlias(string $table)
@@ -542,8 +520,6 @@ public function addTableAlias(string $table)
     /**
      * Executes the query against the database.
      *
-     * @param string $sql
-     *
      * @return mixed
      */
     abstract protected function execute(string $sql);
@@ -556,10 +532,7 @@ abstract protected function execute(string $sql);
      * Should automatically handle different connections for read/write
      * queries if needed.
      *
-     * @param string $sql
-     * @param mixed  ...$binds
-     * @param bool   $setEscapeFlags
-     * @param string $queryClass
+     * @param mixed ...$binds
      *
      * @return BaseResult|bool|Query
      *
@@ -655,8 +628,6 @@ public function query(string $sql, $binds = null, bool $setEscapeFlags = true, s
      * is performed, nor are transactions handled. Simply takes a raw
      * query string and returns the database-specific result id.
      *
-     * @param string $sql
-     *
      * @return mixed
      */
     public function simpleQuery(string $sql)
@@ -703,10 +674,6 @@ public function transStrict(bool $mode = true)
 
     /**
      * Start Transaction
-     *
-     * @param bool $testMode
-     *
-     * @return bool
      */
     public function transStart(bool $testMode = false): bool
     {
@@ -719,8 +686,6 @@ public function transStart(bool $testMode = false): bool
 
     /**
      * Complete Transaction
-     *
-     * @return bool
      */
     public function transComplete(): bool
     {
@@ -748,8 +713,6 @@ public function transComplete(): bool
 
     /**
      * Lets you retrieve the transaction flag to determine if it has failed
-     *
-     * @return bool
      */
     public function transStatus(): bool
     {
@@ -758,10 +721,6 @@ public function transStatus(): bool
 
     /**
      * Begin Transaction
-     *
-     * @param bool $testMode
-     *
-     * @return bool
      */
     public function transBegin(bool $testMode = false): bool
     {
@@ -796,8 +755,6 @@ public function transBegin(bool $testMode = false): bool
 
     /**
      * Commit Transaction
-     *
-     * @return bool
      */
     public function transCommit(): bool
     {
@@ -817,8 +774,6 @@ public function transCommit(): bool
 
     /**
      * Rollback Transaction
-     *
-     * @return bool
      */
     public function transRollback(): bool
     {
@@ -838,22 +793,16 @@ public function transRollback(): bool
 
     /**
      * Begin Transaction
-     *
-     * @return bool
      */
     abstract protected function _transBegin(): bool;
 
     /**
      * Commit Transaction
-     *
-     * @return bool
      */
     abstract protected function _transCommit(): bool;
 
     /**
      * Rollback Transaction
-     *
-     * @return bool
      */
     abstract protected function _transRollback(): bool;
 
@@ -891,8 +840,7 @@ public function table($tableName)
      *                     ->get();
      *           })
      *
-     * @param Closure $func
-     * @param array   $options Passed to the prepare() method
+     * @param array $options Passed to the prepare() method
      *
      * @return BasePreparedQuery|null
      */
@@ -934,8 +882,6 @@ public function getLastQuery()
 
     /**
      * Returns a string representation of the last query's statement object.
-     *
-     * @return string
      */
     public function showLastQuery(): string
     {
@@ -947,8 +893,6 @@ public function showLastQuery(): string
      * seconds with microseconds.
      *
      * Used by the Debug Toolbar's timeline.
-     *
-     * @return float|null
      */
     public function getConnectStart(): ?float
     {
@@ -960,10 +904,6 @@ public function getConnectStart(): ?float
      * to connect to the database.
      *
      * Used by the Debug Toolbar's timeline.
-     *
-     * @param int $decimals
-     *
-     * @return string
      */
     public function getConnectDuration(int $decimals = 6): string
     {
@@ -991,9 +931,7 @@ public function getConnectDuration(int $decimals = 6): string
      * the correct identifiers.
      *
      * @param array|string $item
-     * @param bool         $prefixSingle
      * @param bool         $protectIdentifiers
-     * @param bool         $fieldExists
      *
      * @return array|string
      */
@@ -1196,8 +1134,6 @@ public function escapeIdentifiers($item)
      * @param string $table the table
      *
      * @throws DatabaseException
-     *
-     * @return string
      */
     public function prefixTable(string $table = ''): string
     {
@@ -1210,8 +1146,6 @@ public function prefixTable(string $table = ''): string
 
     /**
      * Returns the total number of rows affected by this query.
-     *
-     * @return int
      */
     abstract public function affectedRows(): int;
 
@@ -1305,10 +1239,6 @@ public function escapeLikeString($str)
      * Platform independent string escape.
      *
      * Will likely be overridden in child classes.
-     *
-     * @param string $str
-     *
-     * @return string
      */
     protected function _escapeString(string $str): string
     {
@@ -1319,12 +1249,9 @@ protected function _escapeString(string $str): string
      * This function enables you to call PHP database functions that are not natively included
      * in CodeIgniter, in a platform independent manner.
      *
-     * @param string $functionName
-     * @param array  ...$params
+     * @param array ...$params
      *
      * @throws DatabaseException
-     *
-     * @return bool
      */
     public function callFunction(string $functionName, ...$params): bool
     {
@@ -1405,10 +1332,6 @@ public function listTables(bool $constrainByPrefix = false)
 
     /**
      * Determine if a particular table exists
-     *
-     * @param string $tableName
-     *
-     * @return bool
      */
     public function tableExists(string $tableName): bool
     {
@@ -1467,11 +1390,6 @@ public function getFieldNames(string $table)
 
     /**
      * Determine if a particular field exists
-     *
-     * @param string $fieldName
-     * @param string $tableName
-     *
-     * @return bool
      */
     public function fieldExists(string $fieldName, string $tableName): bool
     {
@@ -1540,8 +1458,6 @@ public function enableForeignKeyChecks()
      *
      * This is primarily used by the prepared query functionality.
      *
-     * @param bool $pretend
-     *
      * @return $this
      */
     public function pretend(bool $pretend = true)
@@ -1567,8 +1483,6 @@ public function resetDataCache()
      * Determines if the statement is a write-type query or not.
      *
      * @param string $sql
-     *
-     * @return bool
      */
     public function isWriteType($sql): bool
     {
@@ -1581,8 +1495,6 @@ public function isWriteType($sql): bool
      * Must return an array with keys 'code' and 'message':
      *
      *  return ['code' => null, 'message' => null);
-     *
-     * @return array
      */
     abstract public function error(): array;
 
@@ -1596,8 +1508,6 @@ abstract public function insertID();
     /**
      * Generates the SQL for listing tables in a platform-dependent manner.
      *
-     * @param bool $constrainByPrefix
-     *
      * @return false|string
      */
     abstract protected function _listTables(bool $constrainByPrefix = false);
@@ -1605,8 +1515,6 @@ abstract protected function _listTables(bool $constrainByPrefix = false);
     /**
      * Generates a platform-specific query string so that the column names can be fetched.
      *
-     * @param string $table
-     *
      * @return false|string
      */
     abstract protected function _listColumns(string $table = '');
@@ -1614,41 +1522,27 @@ abstract protected function _listColumns(string $table = '');
     /**
      * Platform-specific field data information.
      *
-     * @param string $table
-     *
      * @see    getFieldData()
-     *
-     * @return array
      */
     abstract protected function _fieldData(string $table): array;
 
     /**
      * Platform-specific index data.
      *
-     * @param string $table
-     *
      * @see    getIndexData()
-     *
-     * @return array
      */
     abstract protected function _indexData(string $table): array;
 
     /**
      * Platform-specific foreign keys data.
      *
-     * @param string $table
-     *
      * @see    getForeignKeyData()
-     *
-     * @return array
      */
     abstract protected function _foreignKeyData(string $table): array;
 
     /**
      * Accessor for properties if they exist.
      *
-     * @param string $key
-     *
      * @return mixed
      */
     public function __get(string $key)
@@ -1662,10 +1556,6 @@ public function __get(string $key)
 
     /**
      * Checker for properties existence.
-     *
-     * @param string $key
-     *
-     * @return bool
      */
     public function __isset(string $key): bool
     {
diff --git a/system/Database/BasePreparedQuery.php b/system/Database/BasePreparedQuery.php
index db2b02e054bf..8cc50491269e 100644
--- a/system/Database/BasePreparedQuery.php
+++ b/system/Database/BasePreparedQuery.php
@@ -57,8 +57,6 @@ abstract class BasePreparedQuery implements PreparedQueryInterface
 
     /**
      * Constructor.
-     *
-     * @param BaseConnection $db
      */
     public function __construct(BaseConnection $db)
     {
@@ -72,9 +70,7 @@ public function __construct(BaseConnection $db)
      * NOTE: This version is based on SQL code. Child classes should
      * override this method.
      *
-     * @param string $sql
-     * @param array  $options    Passed to the connection's prepare statement.
-     * @param string $queryClass
+     * @param array $options Passed to the connection's prepare statement.
      *
      * @return mixed
      */
@@ -104,8 +100,7 @@ public function prepare(string $sql, array $options = [], string $queryClass = '
     /**
      * The database-dependent portion of the prepare statement.
      *
-     * @param string $sql
-     * @param array  $options Passed to the connection's prepare statement.
+     * @param array $options Passed to the connection's prepare statement.
      *
      * @return mixed
      */
@@ -145,10 +140,6 @@ public function execute(...$data)
 
     /**
      * The database dependant version of the execute method.
-     *
-     * @param array $data
-     *
-     * @return bool
      */
     abstract public function _execute(array $data): bool;
 
@@ -175,8 +166,6 @@ public function close()
 
     /**
      * Returns the SQL that has been prepared.
-     *
-     * @return string
      */
     public function getQueryString(): string
     {
@@ -189,8 +178,6 @@ public function getQueryString(): string
 
     /**
      * A helper to determine if any error exists.
-     *
-     * @return bool
      */
     public function hasError(): bool
     {
@@ -199,8 +186,6 @@ public function hasError(): bool
 
     /**
      * Returns the error code created while executing this statement.
-     *
-     * @return int
      */
     public function getErrorCode(): int
     {
@@ -209,8 +194,6 @@ public function getErrorCode(): int
 
     /**
      * Returns the error message created while executing this statement.
-     *
-     * @return string
      */
     public function getErrorMessage(): string
     {
diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php
index e44de7b47b9a..46e66f2434e7 100644
--- a/system/Database/BaseResult.php
+++ b/system/Database/BaseResult.php
@@ -92,8 +92,6 @@ public function __construct(&$connID, &$resultID)
      * 'object', or a custom class name.
      *
      * @param string $type The row type. Either 'array', 'object', or a class name to use
-     *
-     * @return array
      */
     public function getResult(string $type = 'object'): array
     {
@@ -166,8 +164,6 @@ public function getCustomResultObject(string $className)
      * Returns the results as an array of arrays.
      *
      * If no results, an empty array is returned.
-     *
-     * @return array
      */
     public function getResultArray(): array
     {
@@ -205,8 +201,6 @@ public function getResultArray(): array
      * Returns the results as an array of objects.
      *
      * If no results, an empty array is returned.
-     *
-     * @return array
      */
     public function getResultObject(): array
     {
@@ -288,9 +282,6 @@ public function getRow($n = 0, string $type = 'object')
      *
      * If row doesn't exists, returns null.
      *
-     * @param int    $n
-     * @param string $className
-     *
      * @return mixed
      */
     public function getCustomRowObject(int $n, string $className)
@@ -315,8 +306,6 @@ public function getCustomRowObject(int $n, string $className)
      *
      * If row doesn't exist, returns null.
      *
-     * @param int $n
-     *
      * @return mixed
      */
     public function getRowArray(int $n = 0)
@@ -338,8 +327,6 @@ public function getRowArray(int $n = 0)
      *
      * If row doesn't exist, returns null.
      *
-     * @param int $n
-     *
      * @return mixed
      */
     public function getRowObject(int $n = 0)
@@ -387,8 +374,6 @@ public function setRow($key, $value = null)
     /**
      * Returns the "first" row of the current results.
      *
-     * @param string $type
-     *
      * @return mixed
      */
     public function getFirstRow(string $type = 'object')
@@ -401,8 +386,6 @@ public function getFirstRow(string $type = 'object')
     /**
      * Returns the "last" row of the current results.
      *
-     * @param string $type
-     *
      * @return mixed
      */
     public function getLastRow(string $type = 'object')
@@ -415,8 +398,6 @@ public function getLastRow(string $type = 'object')
     /**
      * Returns the "next" row of the current results.
      *
-     * @param string $type
-     *
      * @return mixed
      */
     public function getNextRow(string $type = 'object')
@@ -432,8 +413,6 @@ public function getNextRow(string $type = 'object')
     /**
      * Returns the "previous" row of the current results.
      *
-     * @param string $type
-     *
      * @return mixed
      */
     public function getPreviousRow(string $type = 'object')
@@ -453,8 +432,6 @@ public function getPreviousRow(string $type = 'object')
     /**
      * Returns an unbuffered row and move the pointer to the next row.
      *
-     * @param string $type
-     *
      * @return mixed
      */
     public function getUnbufferedRow(string $type = 'object')
@@ -474,8 +451,6 @@ public function getUnbufferedRow(string $type = 'object')
      * Number of rows in the result set; checks for previous count, falls
      * back on counting resultArray or resultObject, finally fetching resultArray
      * if nothing was previously fetched
-     *
-     * @return int
      */
     public function getNumRows(): int
     {
@@ -494,22 +469,16 @@ public function getNumRows(): int
 
     /**
      * Gets the number of fields in the result set.
-     *
-     * @return int
      */
     abstract public function getFieldCount(): int;
 
     /**
      * Generates an array of column names in the result set.
-     *
-     * @return array
      */
     abstract public function getFieldNames(): array;
 
     /**
      * Generates an array of objects representing field meta-data.
-     *
-     * @return array
      */
     abstract public function getFieldData(): array;
 
@@ -525,8 +494,6 @@ abstract public function freeResult();
      * internally before fetching results to make sure the result set
      * starts at zero.
      *
-     * @param int $n
-     *
      * @return mixed
      */
     abstract public function dataSeek(int $n = 0);
@@ -545,8 +512,6 @@ abstract protected function fetchAssoc();
      *
      * Overridden by child classes.
      *
-     * @param string $className
-     *
      * @return object
      */
     abstract protected function fetchObject(string $className = 'stdClass');
diff --git a/system/Database/BaseUtils.php b/system/Database/BaseUtils.php
index 4f6c5712362e..24753ff176d1 100644
--- a/system/Database/BaseUtils.php
+++ b/system/Database/BaseUtils.php
@@ -48,8 +48,6 @@ abstract class BaseUtils
 
     /**
      * Class constructor
-     *
-     * @param ConnectionInterface $db
      */
     public function __construct(ConnectionInterface &$db)
     {
@@ -94,10 +92,6 @@ public function listDatabases()
 
     /**
      * Determine if a particular database exists
-     *
-     * @param string $databaseName
-     *
-     * @return bool
      */
     public function databaseExists(string $databaseName): bool
     {
@@ -107,8 +101,6 @@ public function databaseExists(string $databaseName): bool
     /**
      * Optimize Table
      *
-     * @param string $tableName
-     *
      * @throws DatabaseException
      *
      * @return bool
@@ -176,8 +168,6 @@ public function optimizeDatabase()
     /**
      * Repair Table
      *
-     * @param string $tableName
-     *
      * @throws DatabaseException
      *
      * @return mixed
@@ -241,8 +231,6 @@ public function getCSVFromResult(ResultInterface $query, string $delim = ',', st
      *
      * @param ResultInterface $query  Query result object
      * @param array           $params Any preferences
-     *
-     * @return string
      */
     public function getXMLFromResult(ResultInterface $query, array $params = []): string
     {
@@ -349,8 +337,6 @@ public function backup($params = [])
     /**
      * Platform dependent version of the backup function.
      *
-     * @param array|null $prefs
-     *
      * @return mixed
      */
     abstract public function _backup(?array $prefs = null);
diff --git a/system/Database/Config.php b/system/Database/Config.php
index 681662a436a4..4e7deec45c52 100644
--- a/system/Database/Config.php
+++ b/system/Database/Config.php
@@ -85,8 +85,6 @@ public static function connect($group = null, bool $getShared = true)
 
     /**
      * Returns an array of all db connections currently made.
-     *
-     * @return array
      */
     public static function getConnections(): array
     {
@@ -125,8 +123,6 @@ public static function utils($group = null)
     /**
      * Returns a new instance of the Database Seeder.
      *
-     * @param string|null $group
-     *
      * @return Seeder
      */
     public static function seeder(?string $group = null)
diff --git a/system/Database/ConnectionInterface.php b/system/Database/ConnectionInterface.php
index 4ebd0fb0a36a..a937800b3a2f 100644
--- a/system/Database/ConnectionInterface.php
+++ b/system/Database/ConnectionInterface.php
@@ -26,8 +26,6 @@ public function initialize();
     /**
      * Connect to the database.
      *
-     * @param bool $persistent
-     *
      * @return mixed
      */
     public function connect(bool $persistent = false);
@@ -53,8 +51,6 @@ public function reconnect();
      * get that connection. If you pass either alias in and only a single
      * connection is present, it must return the sole connection.
      *
-     * @param string|null $alias
-     *
      * @return mixed
      */
     public function getConnection(?string $alias = null);
@@ -62,16 +58,12 @@ public function getConnection(?string $alias = null);
     /**
      * Select a specific database table to use.
      *
-     * @param string $databaseName
-     *
      * @return mixed
      */
     public function setDatabase(string $databaseName);
 
     /**
      * Returns the name of the current database being used.
-     *
-     * @return string
      */
     public function getDatabase(): string;
 
@@ -80,21 +72,17 @@ public function getDatabase(): string;
      * Must return this format: ['code' => string|int, 'message' => string]
      * intval(code) === 0 means "no error".
      *
-     * @return array<string,int|string>
+     * @return array<string, int|string>
      */
     public function error(): array;
 
     /**
      * The name of the platform in use (MySQLi, mssql, etc)
-     *
-     * @return string
      */
     public function getPlatform(): string;
 
     /**
      * Returns a string containing the version of the database being used.
-     *
-     * @return string
      */
     public function getVersion(): string;
 
@@ -106,8 +94,7 @@ public function getVersion(): string;
      * Should automatically handle different connections for read/write
      * queries if needed.
      *
-     * @param string $sql
-     * @param mixed  ...$binds
+     * @param mixed ...$binds
      *
      * @return BaseResult|bool|Query
      */
@@ -118,8 +105,6 @@ public function query(string $sql, $binds = null);
      * is performed, nor are transactions handled. Simply takes a raw
      * query string and returns the database-specific result id.
      *
-     * @param string $sql
-     *
      * @return mixed
      */
     public function simpleQuery(string $sql);
@@ -156,8 +141,7 @@ public function escape($str);
      * Allows for custom calls to the database engine that are not
      * supported through our database layer.
      *
-     * @param string $functionName
-     * @param array  ...$params
+     * @param array ...$params
      *
      * @return mixed
      */
@@ -167,8 +151,6 @@ public function callFunction(string $functionName, ...$params);
      * Determines if the statement is a write-type query or not.
      *
      * @param string $sql
-     *
-     * @return bool
      */
     public function isWriteType($sql): bool;
 }
diff --git a/system/Database/Database.php b/system/Database/Database.php
index a0797190d893..3d3774925a96 100644
--- a/system/Database/Database.php
+++ b/system/Database/Database.php
@@ -35,9 +35,6 @@ class Database
      * Parses the connection binds and returns an instance of the driver
      * ready to go.
      *
-     * @param array  $params
-     * @param string $alias
-     *
      * @throws InvalidArgumentException
      *
      * @return mixed
@@ -68,10 +65,6 @@ public function load(array $params = [], string $alias = '')
 
     /**
      * Creates a Forge instance for the current database type.
-     *
-     * @param ConnectionInterface $db
-     *
-     * @return object
      */
     public function loadForge(ConnectionInterface $db): object
     {
@@ -85,10 +78,6 @@ public function loadForge(ConnectionInterface $db): object
 
     /**
      * Creates a Utils instance for the current database type.
-     *
-     * @param ConnectionInterface $db
-     *
-     * @return object
      */
     public function loadUtils(ConnectionInterface $db): object
     {
@@ -103,11 +92,7 @@ public function loadUtils(ConnectionInterface $db): object
     /**
      * Parse universal DSN string
      *
-     * @param array $params
-     *
      * @throws InvalidArgumentException
-     *
-     * @return array
      */
     protected function parseDSN(array $params): array
     {
@@ -149,8 +134,6 @@ protected function parseDSN(array $params): array
      * @param string       $driver   Database driver name (e.g. 'MySQLi')
      * @param string       $class    Database class name (e.g. 'Forge')
      * @param array|object $argument
-     *
-     * @return object
      */
     protected function initDriver(string $driver, string $class, $argument): object
     {
diff --git a/system/Database/Exceptions/DataException.php b/system/Database/Exceptions/DataException.php
index fb713038df82..09b9ff329708 100644
--- a/system/Database/Exceptions/DataException.php
+++ b/system/Database/Exceptions/DataException.php
@@ -21,8 +21,6 @@ class DataException extends RuntimeException implements ExceptionInterface
     /**
      * Used by the Model's trigger() method when the callback cannot be found.
      *
-     * @param string $method
-     *
      * @return DataException
      */
     public static function forInvalidMethodTriggered(string $method)
@@ -34,8 +32,6 @@ public static function forInvalidMethodTriggered(string $method)
      * Used by Model's insert/update methods when there isn't
      * any data to actually work with.
      *
-     * @param string $mode
-     *
      * @return DataException
      */
     public static function forEmptyDataset(string $mode)
@@ -48,8 +44,6 @@ public static function forEmptyDataset(string $mode)
      * primary key defined and Model has option `useAutoIncrement`
      * set to false.
      *
-     * @param string $mode
-     *
      * @return DataException
      */
     public static function forEmptyPrimaryKey(string $mode)
@@ -62,8 +56,6 @@ public static function forEmptyPrimaryKey(string $mode)
      * were empty or otherwise invalid, and they could not be
      * to work correctly for that method.
      *
-     * @param string $argument
-     *
      * @return DataException
      */
     public static function forInvalidArgument(string $argument)
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 0f9f6bf5772b..8f6b7b820ae1 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -162,8 +162,6 @@ class Forge
 
     /**
      * Constructor.
-     *
-     * @param BaseConnection $db
      */
     public function __construct(BaseConnection $db)
     {
@@ -183,12 +181,9 @@ public function getConnection()
     /**
      * Create database
      *
-     * @param string $dbName
-     * @param bool   $ifNotExists Whether to add IF NOT EXISTS condition
+     * @param bool $ifNotExists Whether to add IF NOT EXISTS condition
      *
      * @throws DatabaseException
-     *
-     * @return bool
      */
     public function createDatabase(string $dbName, bool $ifNotExists = false): bool
     {
@@ -237,11 +232,7 @@ public function createDatabase(string $dbName, bool $ifNotExists = false): bool
     /**
      * Determine if a database exists
      *
-     * @param string $dbName
-     *
      * @throws DatabaseException
-     *
-     * @return bool
      */
     private function databaseExists(string $dbName): bool
     {
@@ -259,11 +250,7 @@ private function databaseExists(string $dbName): bool
     /**
      * Drop database
      *
-     * @param string $dbName
-     *
      * @throws DatabaseException
-     *
-     * @return bool
      */
     public function dropDatabase(string $dbName): bool
     {
@@ -297,8 +284,6 @@ public function dropDatabase(string $dbName): bool
      * Add Key
      *
      * @param array|string $key
-     * @param bool         $primary
-     * @param bool         $unique
      *
      * @return Forge
      */
@@ -381,12 +366,6 @@ public function addField($field)
     /**
      * Add Foreign Key
      *
-     * @param string $fieldName
-     * @param string $tableName
-     * @param string $tableField
-     * @param string $onUpdate
-     * @param string $onDelete
-     *
      * @throws DatabaseException
      *
      * @return Forge
@@ -547,8 +526,6 @@ protected function _createTable(string $table, bool $ifNotExists, array $attribu
      * CREATE TABLE attributes
      *
      * @param array $attributes Associative array of table attributes
-     *
-     * @return string
      */
     protected function _createTableAttributes(array $attributes): string
     {
@@ -695,8 +672,6 @@ public function renameTable(string $tableName, string $newTableName)
      * @param array|string $field Column definition
      *
      * @throws DatabaseException
-     *
-     * @return bool
      */
     public function addColumn(string $table, $field): bool
     {
@@ -759,8 +734,6 @@ public function dropColumn(string $table, $columnName)
      * @param array|string $field Column definition
      *
      * @throws DatabaseException
-     *
-     * @return bool
      */
     public function modifyColumn(string $table, $field): bool
     {
@@ -839,10 +812,6 @@ protected function _alterTable(string $alterType, string $table, $fields)
 
     /**
      * Process fields
-     *
-     * @param bool $createTable
-     *
-     * @return array
      */
     protected function _processFields(bool $createTable = false): array
     {
@@ -926,10 +895,6 @@ protected function _processFields(bool $createTable = false): array
 
     /**
      * Process column
-     *
-     * @param array $field
-     *
-     * @return string
      */
     protected function _processColumn(array $field): string
     {
@@ -947,8 +912,6 @@ protected function _processColumn(array $field): string
      *
      * Performs a data type mapping between different databases.
      *
-     * @param array $attributes
-     *
      * @return void
      */
     protected function _attributeType(array &$attributes)
@@ -968,9 +931,6 @@ protected function _attributeType(array &$attributes)
      *    - array(TYPE => UTYPE) will change $field['type'],
      *        from TYPE to UTYPE in case of a match
      *
-     * @param array $attributes
-     * @param array $field
-     *
      * @return void|null
      */
     protected function _attributeUnsigned(array &$attributes, array &$field)
@@ -1006,9 +966,6 @@ protected function _attributeUnsigned(array &$attributes, array &$field)
     /**
      * Field attribute DEFAULT
      *
-     * @param array $attributes
-     * @param array $field
-     *
      * @return void|null
      */
     protected function _attributeDefault(array &$attributes, array &$field)
@@ -1033,9 +990,6 @@ protected function _attributeDefault(array &$attributes, array &$field)
     /**
      * Field attribute UNIQUE
      *
-     * @param array $attributes
-     * @param array $field
-     *
      * @return void
      */
     protected function _attributeUnique(array &$attributes, array &$field)
@@ -1048,9 +1002,6 @@ protected function _attributeUnique(array &$attributes, array &$field)
     /**
      * Field attribute AUTO_INCREMENT
      *
-     * @param array $attributes
-     * @param array $field
-     *
      * @return void
      */
     protected function _attributeAutoIncrement(array &$attributes, array &$field)
@@ -1066,8 +1017,6 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
      * Process primary keys
      *
      * @param string $table Table name
-     *
-     * @return string
      */
     protected function _processPrimaryKeys(string $table): string
     {
@@ -1090,8 +1039,6 @@ protected function _processPrimaryKeys(string $table): string
     /**
      * Process indexes
      *
-     * @param string $table
-     *
      * @return array|string
      */
     protected function _processIndexes(string $table)
@@ -1130,8 +1077,6 @@ protected function _processIndexes(string $table)
      * Process foreign keys
      *
      * @param string $table Table name
-     *
-     * @return string
      */
     protected function _processForeignKeys(string $table): string
     {
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
index 08963796358a..5669c2a6d9a0 100644
--- a/system/Database/MigrationRunner.php
+++ b/system/Database/MigrationRunner.php
@@ -127,7 +127,6 @@ class MigrationRunner
      * - existing connection instance
      * - array of database configuration values
      *
-     * @param MigrationsConfig                      $config
      * @param array|ConnectionInterface|string|null $db
      *
      * @throws ConfigException
@@ -153,8 +152,6 @@ public function __construct(MigrationsConfig $config, $db = null)
     /**
      * Locate and run all new migrations
      *
-     * @param string|null $group
-     *
      * @throws ConfigException
      * @throws RuntimeException
      *
@@ -229,8 +226,7 @@ public function latest(?string $group = null)
      *
      * Calls each migration step required to get to the provided batch
      *
-     * @param int         $targetBatch Target batch number, or negative for a relative batch, 0 for all
-     * @param string|null $group
+     * @param int $targetBatch Target batch number, or negative for a relative batch, 0 for all
      *
      * @throws ConfigException
      * @throws RuntimeException
@@ -351,9 +347,8 @@ public function regress(int $targetBatch = 0, ?string $group = null)
      * Method "up" or "down" determined by presence in history.
      * NOTE: This is not recommended and provided mostly for testing.
      *
-     * @param string      $path  Full path to a valid migration file
-     * @param string      $path  Namespace of the target migration
-     * @param string|null $group
+     * @param string $path Full path to a valid migration file
+     * @param string $path Namespace of the target migration
      */
     public function force(string $path, string $namespace, ?string $group = null)
     {
@@ -548,8 +543,6 @@ public function setNamespace(?string $namespace)
      * Set database Group.
      * Allows other scripts to modify on the fly as needed.
      *
-     * @param string $group
-     *
      * @return MigrationRunner
      */
     public function setGroup(string $group)
@@ -562,8 +555,6 @@ public function setGroup(string $group)
     /**
      * Set migration Name.
      *
-     * @param string $name
-     *
      * @return MigrationRunner
      */
     public function setName(string $name)
@@ -577,8 +568,6 @@ public function setName(string $name)
      * If $silent == true, then will not throw exceptions and will
      * attempt to continue gracefully.
      *
-     * @param bool $silent
-     *
      * @return MigrationRunner
      */
     public function setSilent(bool $silent)
@@ -591,8 +580,6 @@ public function setSilent(bool $silent)
     /**
      * Extracts the migration number from a filename
      *
-     * @param string $migration
-     *
      * @return string Numeric portion of a migration filename
      */
     protected function getMigrationNumber(string $migration): string
@@ -605,8 +592,6 @@ protected function getMigrationNumber(string $migration): string
     /**
      * Extracts the migration class name from a filename
      *
-     * @param string $migration
-     *
      * @return string text portion of a migration filename
      */
     protected function getMigrationName(string $migration): string
@@ -622,8 +607,6 @@ protected function getMigrationName(string $migration): string
      * to create a sortable unique key
      *
      * @param object $object migration or $history
-     *
-     * @return string
      */
     public function getObjectUid($object): string
     {
@@ -668,7 +651,6 @@ public function clearHistory()
      * Add a history to the table.
      *
      * @param object $migration
-     * @param int    $batch
      *
      * @return void
      */
@@ -718,10 +700,6 @@ protected function removeHistory($history)
 
     /**
      * Grabs the full migration history from the database for a group
-     *
-     * @param string $group
-     *
-     * @return array
      */
     public function getHistory(string $group = 'default'): array
     {
@@ -747,9 +725,7 @@ public function getHistory(string $group = 'default'): array
     /**
      * Returns the migration history for a single batch.
      *
-     * @param int $batch
-     *
-     * @return array
+     * @param mixed $order
      */
     public function getBatchHistory(int $batch, $order = 'asc'): array
     {
@@ -765,8 +741,6 @@ public function getBatchHistory(int $batch, $order = 'asc'): array
 
     /**
      * Returns all the batches from the database history in order
-     *
-     * @return array
      */
     public function getBatches(): array
     {
@@ -784,8 +758,6 @@ public function getBatches(): array
 
     /**
      * Returns the value of the last batch in the database.
-     *
-     * @return int
      */
     public function getLastBatch(): int
     {
@@ -806,10 +778,6 @@ public function getLastBatch(): int
     /**
      * Returns the version number of the first migration for a batch.
      * Mostly just for tests.
-     *
-     * @param int $batch
-     *
-     * @return string
      */
     public function getBatchStart(int $batch): string
     {
@@ -832,10 +800,6 @@ public function getBatchStart(int $batch): string
     /**
      * Returns the version number of the last migration for a batch.
      * Mostly just for tests.
-     *
-     * @param int $batch
-     *
-     * @return string
      */
     public function getBatchEnd(int $batch): string
     {
@@ -918,8 +882,6 @@ public function ensureTable()
      *
      * @param string $direction "up" or "down"
      * @param object $migration The migration to run
-     *
-     * @return bool
      */
     protected function migrate($direction, $migration): bool
     {
diff --git a/system/Database/ModelFactory.php b/system/Database/ModelFactory.php
index 7db233e8b2cd..cd1b4e9ea554 100644
--- a/system/Database/ModelFactory.php
+++ b/system/Database/ModelFactory.php
@@ -39,7 +39,6 @@ public static function get(string $name, bool $getShared = true, ?ConnectionInte
     /**
      * Helper method for injecting mock instances while testing.
      *
-     * @param string $name
      * @param object $instance
      */
     public static function injectMock(string $name, $instance)
diff --git a/system/Database/MySQLi/Builder.php b/system/Database/MySQLi/Builder.php
index 55b7cd58f610..abeb83f8e4dc 100644
--- a/system/Database/MySQLi/Builder.php
+++ b/system/Database/MySQLi/Builder.php
@@ -44,8 +44,6 @@ class Builder extends BaseBuilder
      * about operator precedence.
      *
      * Note: This is only used (and overridden) by MySQL.
-     *
-     * @return string
      */
     protected function _fromTables(): string
     {
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
index e56d0d19c3bc..03a18178d322 100644
--- a/system/Database/MySQLi/Connection.php
+++ b/system/Database/MySQLi/Connection.php
@@ -61,8 +61,6 @@ class Connection extends BaseConnection
     /**
      * Connect to the database.
      *
-     * @param bool $persistent
-     *
      * @throws DatabaseException
      *
      * @return mixed
@@ -232,10 +230,6 @@ protected function _close()
 
     /**
      * Select a specific database table to use.
-     *
-     * @param string $databaseName
-     *
-     * @return bool
      */
     public function setDatabase(string $databaseName): bool
     {
@@ -258,8 +252,6 @@ public function setDatabase(string $databaseName): bool
 
     /**
      * Returns a string containing the version of the database being used.
-     *
-     * @return string
      */
     public function getVersion(): string
     {
@@ -277,8 +269,6 @@ public function getVersion(): string
     /**
      * Executes the query against the database.
      *
-     * @param string $sql
-     *
      * @return mixed
      */
     public function execute(string $sql)
@@ -309,8 +299,6 @@ public function execute(string $sql)
      * If needed, each database adapter can prep the query string
      *
      * @param string $sql an SQL query
-     *
-     * @return string
      */
     protected function prepQuery(string $sql): string
     {
@@ -325,8 +313,6 @@ protected function prepQuery(string $sql): string
 
     /**
      * Returns the total number of rows affected by this query.
-     *
-     * @return int
      */
     public function affectedRows(): int
     {
@@ -335,10 +321,6 @@ public function affectedRows(): int
 
     /**
      * Platform-dependant string escape
-     *
-     * @param string $str
-     *
-     * @return string
      */
     protected function _escapeString(string $str): string
     {
@@ -382,10 +364,6 @@ public function escapeLikeStringDirect($str)
     /**
      * Generates the SQL for listing tables in a platform-dependent manner.
      * Uses escapeLikeStringDirect().
-     *
-     * @param bool $prefixLimit
-     *
-     * @return string
      */
     protected function _listTables(bool $prefixLimit = false): string
     {
@@ -400,10 +378,6 @@ protected function _listTables(bool $prefixLimit = false): string
 
     /**
      * Generates a platform-specific query string so that the column names can be fetched.
-     *
-     * @param string $table
-     *
-     * @return string
      */
     protected function _listColumns(string $table = ''): string
     {
@@ -413,8 +387,6 @@ protected function _listColumns(string $table = ''): string
     /**
      * Returns an array of objects with field data
      *
-     * @param string $table
-     *
      * @throws DatabaseException
      *
      * @return stdClass[]
@@ -447,8 +419,6 @@ public function _fieldData(string $table): array
     /**
      * Returns an array of objects with index data
      *
-     * @param string $table
-     *
      * @throws DatabaseException
      * @throws LogicException
      *
@@ -495,8 +465,6 @@ public function _indexData(string $table): array
     /**
      * Returns an array of objects with Foreign key data
      *
-     * @param string $table
-     *
      * @throws DatabaseException
      *
      * @return stdClass[]
@@ -585,8 +553,6 @@ public function error(): array
 
     /**
      * Insert ID
-     *
-     * @return int
      */
     public function insertID(): int
     {
@@ -595,8 +561,6 @@ public function insertID(): int
 
     /**
      * Begin Transaction
-     *
-     * @return bool
      */
     protected function _transBegin(): bool
     {
@@ -607,8 +571,6 @@ protected function _transBegin(): bool
 
     /**
      * Commit Transaction
-     *
-     * @return bool
      */
     protected function _transCommit(): bool
     {
@@ -623,8 +585,6 @@ protected function _transCommit(): bool
 
     /**
      * Rollback Transaction
-     *
-     * @return bool
      */
     protected function _transRollback(): bool
     {
diff --git a/system/Database/MySQLi/Forge.php b/system/Database/MySQLi/Forge.php
index fd9f705162d7..094ae54264f9 100644
--- a/system/Database/MySQLi/Forge.php
+++ b/system/Database/MySQLi/Forge.php
@@ -97,8 +97,6 @@ class Forge extends BaseForge
      * CREATE TABLE attributes
      *
      * @param array $attributes Associative array of table attributes
-     *
-     * @return string
      */
     protected function _createTableAttributes(array $attributes): string
     {
@@ -163,10 +161,6 @@ protected function _alterTable(string $alterType, string $table, $field)
 
     /**
      * Process column
-     *
-     * @param array $field
-     *
-     * @return string
      */
     protected function _processColumn(array $field): string
     {
@@ -192,8 +186,6 @@ protected function _processColumn(array $field): string
      * Process indexes
      *
      * @param string $table (ignored)
-     *
-     * @return string
      */
     protected function _processIndexes(string $table): string
     {
diff --git a/system/Database/MySQLi/PreparedQuery.php b/system/Database/MySQLi/PreparedQuery.php
index 8f5dcf66553c..cd351f2c51fa 100644
--- a/system/Database/MySQLi/PreparedQuery.php
+++ b/system/Database/MySQLi/PreparedQuery.php
@@ -26,9 +26,8 @@ class PreparedQuery extends BasePreparedQuery
      * NOTE: This version is based on SQL code. Child classes should
      * override this method.
      *
-     * @param string $sql
-     * @param array  $options Passed to the connection's prepare statement.
-     *                        Unused in the MySQLi driver.
+     * @param array $options Passed to the connection's prepare statement.
+     *                       Unused in the MySQLi driver.
      *
      * @return mixed
      */
@@ -49,10 +48,6 @@ public function _prepare(string $sql, array $options = [])
     /**
      * Takes a new set of data and runs it against the currently
      * prepared query. Upon success, will return a Results object.
-     *
-     * @param array $data
-     *
-     * @return bool
      */
     public function _execute(array $data): bool
     {
diff --git a/system/Database/MySQLi/Result.php b/system/Database/MySQLi/Result.php
index 04e91c8eee48..ab83b8545ddd 100644
--- a/system/Database/MySQLi/Result.php
+++ b/system/Database/MySQLi/Result.php
@@ -22,8 +22,6 @@ class Result extends BaseResult
 {
     /**
      * Gets the number of fields in the result set.
-     *
-     * @return int
      */
     public function getFieldCount(): int
     {
@@ -32,8 +30,6 @@ public function getFieldCount(): int
 
     /**
      * Generates an array of column names in the result set.
-     *
-     * @return array
      */
     public function getFieldNames(): array
     {
@@ -49,8 +45,6 @@ public function getFieldNames(): array
 
     /**
      * Generates an array of objects representing field meta-data.
-     *
-     * @return array
      */
     public function getFieldData(): array
     {
@@ -121,8 +115,6 @@ public function freeResult()
      * internally before fetching results to make sure the result set
      * starts at zero.
      *
-     * @param int $n
-     *
      * @return mixed
      */
     public function dataSeek(int $n = 0)
@@ -147,8 +139,6 @@ protected function fetchAssoc()
      *
      * Overridden by child classes.
      *
-     * @param string $className
-     *
      * @return bool|Entity|object
      */
     protected function fetchObject(string $className = 'stdClass')
diff --git a/system/Database/MySQLi/Utils.php b/system/Database/MySQLi/Utils.php
index 39f27e24b052..3fea64a0ebaf 100644
--- a/system/Database/MySQLi/Utils.php
+++ b/system/Database/MySQLi/Utils.php
@@ -36,8 +36,6 @@ class Utils extends BaseUtils
     /**
      * Platform dependent version of the backup function.
      *
-     * @param array|null $prefs
-     *
      * @return mixed
      */
     public function _backup(?array $prefs = null)
diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index 465b4ff3f7fc..f35ecf2cf85d 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -44,8 +44,6 @@ class Builder extends BaseBuilder
      * Checks if the ignore option is supported by
      * the Database Driver for the specific statement.
      *
-     * @param string $statement
-     *
      * @return string
      */
     protected function compileIgnore(string $statement)
@@ -62,7 +60,6 @@ protected function compileIgnore(string $statement)
     /**
      * ORDER BY
      *
-     * @param string $orderBy
      * @param string $direction ASC, DESC or RANDOM
      * @param bool   $escape
      *
@@ -91,9 +88,6 @@ public function orderBy(string $orderBy, string $direction = '', ?bool $escape =
     /**
      * Increments a numeric column by the specified value.
      *
-     * @param string $column
-     * @param int    $value
-     *
      * @throws DatabaseException
      *
      * @return mixed
@@ -110,9 +104,6 @@ public function increment(string $column, int $value = 1)
     /**
      * Decrements a numeric column by the specified value.
      *
-     * @param string $column
-     * @param int    $value
-     *
      * @throws DatabaseException
      *
      * @return mixed
@@ -186,8 +177,6 @@ public function replace(?array $set = null)
      * @param string $table         The table name
      * @param array  $keys          The insert keys
      * @param array  $unescapedKeys The insert values
-     *
-     * @return string
      */
     protected function _insert(string $table, array $keys, array $unescapedKeys): string
     {
@@ -202,8 +191,6 @@ protected function _insert(string $table, array $keys, array $unescapedKeys): st
      * @param string $table  Table name
      * @param array  $keys   INSERT keys
      * @param array  $values INSERT values
-     *
-     * @return string
      */
     protected function _insertBatch(string $table, array $keys, array $values): string
     {
@@ -217,7 +204,6 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
      *
      * @param mixed $where
      * @param int   $limit
-     * @param bool  $resetData
      *
      * @throws DatabaseException
      *
@@ -242,8 +228,6 @@ public function delete($where = '', ?int $limit = null, bool $resetData = true)
      * Generates a platform-specific LIMIT clause.
      *
      * @param string $sql SQL Query
-     *
-     * @return string
      */
     protected function _limit(string $sql, bool $offsetIgnore = false): string
     {
@@ -255,13 +239,8 @@ protected function _limit(string $sql, bool $offsetIgnore = false): string
      *
      * Generates a platform-specific update string from the supplied data
      *
-     * @param string $table
-     * @param array  $values
-     *
      * @throws DatabaseException
      *
-     * @return string
-     *
      * @internal param the $array update data
      * @internal param the $string table name
      */
@@ -284,8 +263,6 @@ protected function _update(string $table, array $values): string
      * @param string $table  Table name
      * @param array  $values Update data
      * @param string $index  WHERE key
-     *
-     * @return string
      */
     protected function _updateBatch(string $table, array $values, string $index): string
     {
@@ -323,8 +300,6 @@ protected function _updateBatch(string $table, array $values, string $index): st
      * Generates a platform-specific delete string from the supplied data
      *
      * @param string $table The table name
-     *
-     * @return string
      */
     protected function _delete(string $table): string
     {
@@ -342,8 +317,6 @@ protected function _delete(string $table): string
      * then this method maps to 'DELETE FROM table'
      *
      * @param string $table The table name
-     *
-     * @return string
      */
     protected function _truncate(string $table): string
     {
@@ -358,12 +331,6 @@ protected function _truncate(string $table): string
      *
      * @see https://www.postgresql.org/docs/9.2/static/functions-matching.html
      *
-     * @param string|null $prefix
-     * @param string      $column
-     * @param string|null $not
-     * @param string      $bind
-     * @param bool        $insensitiveSearch
-     *
      * @return string $like_statement
      */
     public function _like_statement(?string $prefix, string $column, ?string $not, string $bind, bool $insensitiveSearch = false): string
@@ -378,7 +345,6 @@ public function _like_statement(?string $prefix, string $column, ?string $not, s
      *
      * Generates the JOIN portion of the query
      *
-     * @param string $table
      * @param string $cond   The join condition
      * @param string $type   The type of join
      * @param bool   $escape Whether not to try to escape identifiers
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
index 74ad88664ade..b332128c5b8d 100644
--- a/system/Database/Postgre/Connection.php
+++ b/system/Database/Postgre/Connection.php
@@ -45,8 +45,6 @@ class Connection extends BaseConnection
     /**
      * Connect to the database.
      *
-     * @param bool $persistent
-     *
      * @return mixed
      */
     public function connect(bool $persistent = false)
@@ -108,10 +106,6 @@ protected function _close()
 
     /**
      * Select a specific database table to use.
-     *
-     * @param string $databaseName
-     *
-     * @return bool
      */
     public function setDatabase(string $databaseName): bool
     {
@@ -120,8 +114,6 @@ public function setDatabase(string $databaseName): bool
 
     /**
      * Returns a string containing the version of the database being used.
-     *
-     * @return string
      */
     public function getVersion(): string
     {
@@ -140,8 +132,6 @@ public function getVersion(): string
     /**
      * Executes the query against the database.
      *
-     * @param string $sql
-     *
      * @return mixed
      */
     public function execute(string $sql)
@@ -160,8 +150,6 @@ public function execute(string $sql)
 
     /**
      * Returns the total number of rows affected by this query.
-     *
-     * @return int
      */
     public function affectedRows(): int
     {
@@ -196,10 +184,6 @@ public function escape($str)
 
     /**
      * Platform-dependant string escape
-     *
-     * @param string $str
-     *
-     * @return string
      */
     protected function _escapeString(string $str): string
     {
@@ -212,10 +196,6 @@ protected function _escapeString(string $str): string
 
     /**
      * Generates the SQL for listing tables in a platform-dependent manner.
-     *
-     * @param bool $prefixLimit
-     *
-     * @return string
      */
     protected function _listTables(bool $prefixLimit = false): string
     {
@@ -232,10 +212,6 @@ protected function _listTables(bool $prefixLimit = false): string
 
     /**
      * Generates a platform-specific query string so that the column names can be fetched.
-     *
-     * @param string $table
-     *
-     * @return string
      */
     protected function _listColumns(string $table = ''): string
     {
@@ -249,8 +225,6 @@ protected function _listColumns(string $table = ''): string
     /**
      * Returns an array of objects with field data
      *
-     * @param string $table
-     *
      * @throws DatabaseException
      *
      * @return stdClass[]
@@ -285,8 +259,6 @@ public function _fieldData(string $table): array
     /**
      * Returns an array of objects with index data
      *
-     * @param string $table
-     *
      * @throws DatabaseException
      *
      * @return stdClass[]
@@ -328,8 +300,6 @@ public function _indexData(string $table): array
     /**
      * Returns an array of objects with Foreign key data
      *
-     * @param string $table
-     *
      * @throws DatabaseException
      *
      * @return stdClass[]
@@ -499,8 +469,6 @@ protected function buildDSN()
      * Set client encoding
      *
      * @param string $charset The client encoding to which the data will be converted.
-     *
-     * @return bool
      */
     protected function setClientEncoding(string $charset): bool
     {
@@ -509,8 +477,6 @@ protected function setClientEncoding(string $charset): bool
 
     /**
      * Begin Transaction
-     *
-     * @return bool
      */
     protected function _transBegin(): bool
     {
@@ -519,8 +485,6 @@ protected function _transBegin(): bool
 
     /**
      * Commit Transaction
-     *
-     * @return bool
      */
     protected function _transCommit(): bool
     {
@@ -529,8 +493,6 @@ protected function _transCommit(): bool
 
     /**
      * Rollback Transaction
-     *
-     * @return bool
      */
     protected function _transRollback(): bool
     {
@@ -543,8 +505,6 @@ protected function _transRollback(): bool
      * Overrides BaseConnection::isWriteType, adding additional read query types.
      *
      * @param string $sql An SQL query string
-     *
-     * @return bool
      */
     public function isWriteType($sql): bool
     {
diff --git a/system/Database/Postgre/Forge.php b/system/Database/Postgre/Forge.php
index 426e5a3606d7..17d2c29376cd 100644
--- a/system/Database/Postgre/Forge.php
+++ b/system/Database/Postgre/Forge.php
@@ -62,8 +62,6 @@ class Forge extends BaseForge
      * CREATE TABLE attributes
      *
      * @param array $attributes Associative array of table attributes
-     *
-     * @return string
      */
     protected function _createTableAttributes(array $attributes): string
     {
@@ -125,10 +123,6 @@ protected function _alterTable(string $alterType, string $table, $field)
 
     /**
      * Process column
-     *
-     * @param array $field
-     *
-     * @return string
      */
     protected function _processColumn(array $field): string
     {
@@ -145,8 +139,6 @@ protected function _processColumn(array $field): string
      *
      * Performs a data type mapping between different databases.
      *
-     * @param array $attributes
-     *
      * @return void
      */
     protected function _attributeType(array &$attributes)
@@ -179,9 +171,6 @@ protected function _attributeType(array &$attributes)
     /**
      * Field attribute AUTO_INCREMENT
      *
-     * @param array $attributes
-     * @param array $field
-     *
      * @return void
      */
     protected function _attributeAutoIncrement(array &$attributes, array &$field)
@@ -198,9 +187,6 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
      *
      * @param string $table    Table name
      * @param bool   $ifExists Whether to add an IF EXISTS condition
-     * @param bool   $cascade
-     *
-     * @return string
      */
     protected function _dropTable(string $table, bool $ifExists, bool $cascade): string
     {
diff --git a/system/Database/Postgre/PreparedQuery.php b/system/Database/Postgre/PreparedQuery.php
index 52256530e357..53e42b867f0f 100644
--- a/system/Database/Postgre/PreparedQuery.php
+++ b/system/Database/Postgre/PreparedQuery.php
@@ -43,9 +43,8 @@ class PreparedQuery extends BasePreparedQuery
      * NOTE: This version is based on SQL code. Child classes should
      * override this method.
      *
-     * @param string $sql
-     * @param array  $options Passed to the connection's prepare statement.
-     *                        Unused in the MySQLi driver.
+     * @param array $options Passed to the connection's prepare statement.
+     *                       Unused in the MySQLi driver.
      *
      * @throws Exception
      *
@@ -72,10 +71,6 @@ public function _prepare(string $sql, array $options = [])
     /**
      * Takes a new set of data and runs it against the currently
      * prepared query. Upon success, will return a Results object.
-     *
-     * @param array $data
-     *
-     * @return bool
      */
     public function _execute(array $data): bool
     {
@@ -101,10 +96,6 @@ public function _getResult()
     /**
      * Replaces the ? placeholders with $1, $2, etc parameters for use
      * within the prepared query.
-     *
-     * @param string $sql
-     *
-     * @return string
      */
     public function parameterize(string $sql): string
     {
diff --git a/system/Database/Postgre/Result.php b/system/Database/Postgre/Result.php
index feb5c1ca0584..fb4226d2e0c7 100644
--- a/system/Database/Postgre/Result.php
+++ b/system/Database/Postgre/Result.php
@@ -22,8 +22,6 @@ class Result extends BaseResult
 {
     /**
      * Gets the number of fields in the result set.
-     *
-     * @return int
      */
     public function getFieldCount(): int
     {
@@ -32,8 +30,6 @@ public function getFieldCount(): int
 
     /**
      * Generates an array of column names in the result set.
-     *
-     * @return array
      */
     public function getFieldNames(): array
     {
@@ -48,8 +44,6 @@ public function getFieldNames(): array
 
     /**
      * Generates an array of objects representing field meta-data.
-     *
-     * @return array
      */
     public function getFieldData(): array
     {
@@ -87,8 +81,6 @@ public function freeResult()
      * internally before fetching results to make sure the result set
      * starts at zero.
      *
-     * @param int $n
-     *
      * @return mixed
      */
     public function dataSeek(int $n = 0)
@@ -113,8 +105,6 @@ protected function fetchAssoc()
      *
      * Overridden by child classes.
      *
-     * @param string $className
-     *
      * @return bool|Entity|object
      */
     protected function fetchObject(string $className = 'stdClass')
diff --git a/system/Database/Postgre/Utils.php b/system/Database/Postgre/Utils.php
index 8c4d6d6967be..ba1df5d3b52a 100644
--- a/system/Database/Postgre/Utils.php
+++ b/system/Database/Postgre/Utils.php
@@ -36,8 +36,6 @@ class Utils extends BaseUtils
     /**
      * Platform dependent version of the backup function.
      *
-     * @param array|null $prefs
-     *
      * @return mixed
      */
     public function _backup(?array $prefs = null)
diff --git a/system/Database/PreparedQueryInterface.php b/system/Database/PreparedQueryInterface.php
index c40ef2f4d455..8e19bb053a90 100644
--- a/system/Database/PreparedQueryInterface.php
+++ b/system/Database/PreparedQueryInterface.php
@@ -30,8 +30,7 @@ public function execute(...$data);
      * Prepares the query against the database, and saves the connection
      * info necessary to execute the query later.
      *
-     * @param string $sql
-     * @param array  $options Passed to the connection's prepare statement.
+     * @param array $options Passed to the connection's prepare statement.
      *
      * @return mixed
      */
@@ -44,22 +43,16 @@ public function close();
 
     /**
      * Returns the SQL that has been prepared.
-     *
-     * @return string
      */
     public function getQueryString(): string;
 
     /**
      * Returns the error code created while executing this statement.
-     *
-     * @return int
      */
     public function getErrorCode(): int;
 
     /**
      * Returns the error message created while executing this statement.
-     *
-     * @return string
      */
     public function getErrorMessage(): string;
 }
diff --git a/system/Database/Query.php b/system/Database/Query.php
index 688ffb1323d5..8b9f82b282b9 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -86,8 +86,6 @@ class Query implements QueryInterface
 
     /**
      * BaseQuery constructor.
-     *
-     * @param ConnectionInterface $db
      */
     public function __construct(ConnectionInterface &$db)
     {
@@ -97,9 +95,7 @@ public function __construct(ConnectionInterface &$db)
     /**
      * Sets the raw query string to use for this statement.
      *
-     * @param string $sql
-     * @param mixed  $binds
-     * @param bool   $setEscape
+     * @param mixed $binds
      *
      * @return $this
      */
@@ -129,9 +125,6 @@ public function setQuery(string $sql, $binds = null, bool $setEscape = true)
     /**
      * Will store the variables to bind into the query later.
      *
-     * @param array $binds
-     * @param bool  $setEscape
-     *
      * @return $this
      */
     public function setBinds(array $binds, bool $setEscape = true)
@@ -153,8 +146,6 @@ public function setBinds(array $binds, bool $setEscape = true)
     /**
      * Returns the final, processed query string after binding, etal
      * has been performed.
-     *
-     * @return string
      */
     public function getQuery(): string
     {
@@ -172,7 +163,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 $start
      * @param float $end
      *
      * @return $this
@@ -193,9 +183,6 @@ public function setDuration(float $start, ?float $end = null)
     /**
      * Returns the start time in seconds with microseconds.
      *
-     * @param bool $returnRaw
-     * @param int  $decimals
-     *
      * @return float|string
      */
     public function getStartTime(bool $returnRaw = false, int $decimals = 6)
@@ -212,8 +199,6 @@ public function getStartTime(bool $returnRaw = false, int $decimals = 6)
      * the query has not been executed yet.
      *
      * @param int $decimals The accuracy of the returned time.
-     *
-     * @return string
      */
     public function getDuration(int $decimals = 6): string
     {
@@ -223,9 +208,6 @@ public function getDuration(int $decimals = 6): string
     /**
      * Stores the error description that happened for this query.
      *
-     * @param int    $code
-     * @param string $error
-     *
      * @return $this
      */
     public function setError(int $code, string $error)
@@ -238,8 +220,6 @@ public function setError(int $code, string $error)
 
     /**
      * Reports whether this statement created an error not.
-     *
-     * @return bool
      */
     public function hasError(): bool
     {
@@ -248,8 +228,6 @@ public function hasError(): bool
 
     /**
      * Returns the error code created while executing this statement.
-     *
-     * @return int
      */
     public function getErrorCode(): int
     {
@@ -258,8 +236,6 @@ public function getErrorCode(): int
 
     /**
      * Returns the error message created while executing this statement.
-     *
-     * @return string
      */
     public function getErrorMessage(): string
     {
@@ -268,8 +244,6 @@ public function getErrorMessage(): string
 
     /**
      * Determines if the statement is a write-type query or not.
-     *
-     * @return bool
      */
     public function isWriteType(): bool
     {
@@ -279,9 +253,6 @@ public function isWriteType(): bool
     /**
      * Swaps out one table prefix for a new one.
      *
-     * @param string $orig
-     * @param string $swap
-     *
      * @return $this
      */
     public function swapPrefix(string $orig, string $swap)
@@ -295,8 +266,6 @@ public function swapPrefix(string $orig, string $swap)
 
     /**
      * Returns the original SQL that was passed into the system.
-     *
-     * @return string
      */
     public function getOriginalQuery(): string
     {
@@ -347,11 +316,6 @@ protected function compileBinds()
 
     /**
      * Match bindings
-     *
-     * @param string $sql
-     * @param array  $binds
-     *
-     * @return string
      */
     protected function matchNamedBinds(string $sql, array $binds): string
     {
@@ -376,13 +340,6 @@ protected function matchNamedBinds(string $sql, array $binds): string
 
     /**
      * Match bindings
-     *
-     * @param string $sql
-     * @param array  $binds
-     * @param int    $bindCount
-     * @param int    $ml
-     *
-     * @return string
      */
     protected function matchSimpleBinds(string $sql, array $binds, int $bindCount, int $ml): string
     {
@@ -414,8 +371,6 @@ protected function matchSimpleBinds(string $sql, array $binds, int $bindCount, i
 
     /**
      * Returns string to display in debug toolbar
-     *
-     * @return string
      */
     public function debugToolbarDisplay(): string
     {
@@ -469,8 +424,6 @@ public function debugToolbarDisplay(): string
 
     /**
      * Return text representation of the query
-     *
-     * @return string
      */
     public function __toString(): string
     {
diff --git a/system/Database/QueryInterface.php b/system/Database/QueryInterface.php
index fd81ab7c4bc7..8e965fabf0b2 100644
--- a/system/Database/QueryInterface.php
+++ b/system/Database/QueryInterface.php
@@ -22,9 +22,7 @@ interface QueryInterface
     /**
      * Sets the raw query string to use for this statement.
      *
-     * @param string $sql
-     * @param mixed  $binds
-     * @param bool   $setEscape
+     * @param mixed $binds
      *
      * @return mixed
      */
@@ -43,7 +41,6 @@ public function getQuery();
      * for it's start and end values. If no end value is present, will
      * use the current time to determine total duration.
      *
-     * @param float $start
      * @param float $end
      *
      * @return mixed
@@ -55,53 +52,37 @@ public function setDuration(float $start, ?float $end = null);
      * the query has not been executed yet.
      *
      * @param int $decimals The accuracy of the returned time.
-     *
-     * @return string
      */
     public function getDuration(int $decimals = 6): string;
 
     /**
      * Stores the error description that happened for this query.
-     *
-     * @param int    $code
-     * @param string $error
      */
     public function setError(int $code, string $error);
 
     /**
      * Reports whether this statement created an error not.
-     *
-     * @return bool
      */
     public function hasError(): bool;
 
     /**
      * Returns the error code created while executing this statement.
-     *
-     * @return int
      */
     public function getErrorCode(): int;
 
     /**
      * Returns the error message created while executing this statement.
-     *
-     * @return string
      */
     public function getErrorMessage(): string;
 
     /**
      * Determines if the statement is a write-type query or not.
-     *
-     * @return bool
      */
     public function isWriteType(): bool;
 
     /**
      * Swaps out one table prefix for a new one.
      *
-     * @param string $orig
-     * @param string $swap
-     *
      * @return mixed
      */
     public function swapPrefix(string $orig, string $swap);
diff --git a/system/Database/ResultInterface.php b/system/Database/ResultInterface.php
index 9a0d79698623..b630ed678afa 100644
--- a/system/Database/ResultInterface.php
+++ b/system/Database/ResultInterface.php
@@ -22,8 +22,6 @@ interface ResultInterface
      * 'object', or a custom class name.
      *
      * @param string $type The row type. Either 'array', 'object', or a class name to use
-     *
-     * @return array
      */
     public function getResult(string $type = 'object'): array;
 
@@ -40,8 +38,6 @@ public function getCustomResultObject(string $className);
      * Returns the results as an array of arrays.
      *
      * If no results, an empty array is returned.
-     *
-     * @return array
      */
     public function getResultArray(): array;
 
@@ -49,8 +45,6 @@ public function getResultArray(): array;
      * Returns the results as an array of objects.
      *
      * If no results, an empty array is returned.
-     *
-     * @return array
      */
     public function getResultObject(): array;
 
@@ -72,9 +66,6 @@ public function getRow($n = 0, string $type = 'object');
      *
      * If row doesn't exists, returns null.
      *
-     * @param int    $n
-     * @param string $className
-     *
      * @return mixed
      */
     public function getCustomRowObject(int $n, string $className);
@@ -84,8 +75,6 @@ public function getCustomRowObject(int $n, string $className);
      *
      * If row doesn't exist, returns null.
      *
-     * @param int $n
-     *
      * @return mixed
      */
     public function getRowArray(int $n = 0);
@@ -95,8 +84,6 @@ public function getRowArray(int $n = 0);
      *
      * If row doesn't exist, returns null.
      *
-     * @param int $n
-     *
      * @return mixed
      */
     public function getRowObject(int $n = 0);
@@ -114,8 +101,6 @@ public function setRow($key, $value = null);
     /**
      * Returns the "first" row of the current results.
      *
-     * @param string $type
-     *
      * @return mixed
      */
     public function getFirstRow(string $type = 'object');
@@ -123,8 +108,6 @@ public function getFirstRow(string $type = 'object');
     /**
      * Returns the "last" row of the current results.
      *
-     * @param string $type
-     *
      * @return mixed
      */
     public function getLastRow(string $type = 'object');
@@ -132,8 +115,6 @@ public function getLastRow(string $type = 'object');
     /**
      * Returns the "next" row of the current results.
      *
-     * @param string $type
-     *
      * @return mixed
      */
     public function getNextRow(string $type = 'object');
@@ -141,8 +122,6 @@ public function getNextRow(string $type = 'object');
     /**
      * Returns the "previous" row of the current results.
      *
-     * @param string $type
-     *
      * @return mixed
      */
     public function getPreviousRow(string $type = 'object');
@@ -150,30 +129,22 @@ public function getPreviousRow(string $type = 'object');
     /**
      * Returns an unbuffered row and move the pointer to the next row.
      *
-     * @param string $type
-     *
      * @return mixed
      */
     public function getUnbufferedRow(string $type = 'object');
 
     /**
      * Gets the number of fields in the result set.
-     *
-     * @return int
      */
     public function getFieldCount(): int;
 
     /**
      * Generates an array of column names in the result set.
-     *
-     * @return array
      */
     public function getFieldNames(): array;
 
     /**
      * Generates an array of objects representing field meta-data.
-     *
-     * @return array
      */
     public function getFieldData(): array;
 
@@ -189,8 +160,6 @@ public function freeResult();
      * internally before fetching results to make sure the result set
      * starts at zero.
      *
-     * @param int $n
-     *
      * @return mixed
      */
     public function dataSeek(int $n = 0);
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index 8478293343fd..b2b4a877ef81 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -65,8 +65,6 @@ class Builder extends BaseBuilder
      *
      * Groups tables in FROM clauses if needed, so there is no confusion
      * about operator precedence.
-     *
-     * @return string
      */
     protected function _fromTables(): string
     {
@@ -88,8 +86,6 @@ protected function _fromTables(): string
      * then this method maps to 'DELETE FROM table'
      *
      * @param string $table The table name
-     *
-     * @return string
      */
     protected function _truncate(string $table): string
     {
@@ -101,7 +97,6 @@ protected function _truncate(string $table): string
      *
      * Generates the JOIN portion of the query
      *
-     * @param string $table
      * @param string $cond   The join condition
      * @param string $type   The type of join
      * @param bool   $escape Whether not to try to escape identifiers
@@ -184,8 +179,6 @@ public function join(string $table, string $cond, string $type = '', ?bool $esca
      * @param string $table         The table name
      * @param array  $keys          The insert keys
      * @param array  $unescapedKeys The insert values
-     *
-     * @return string
      */
     protected function _insert(string $table, array $keys, array $unescapedKeys): string
     {
@@ -204,8 +197,6 @@ protected function _insert(string $table, array $keys, array $unescapedKeys): st
      *
      * @param string $table  the Table name
      * @param array  $values the Update data
-     *
-     * @return string
      */
     protected function _update(string $table, array $values): string
     {
@@ -226,9 +217,6 @@ protected function _update(string $table, array $values): string
     /**
      * Increments a numeric column by the specified value.
      *
-     * @param string $column
-     * @param int    $value
-     *
      * @return bool
      */
     public function increment(string $column, int $value = 1)
@@ -248,9 +236,6 @@ public function increment(string $column, int $value = 1)
     /**
      * Decrements a numeric column by the specified value.
      *
-     * @param string $column
-     * @param int    $value
-     *
      * @return bool
      */
     public function decrement(string $column, int $value = 1)
@@ -269,10 +254,6 @@ public function decrement(string $column, int $value = 1)
 
     /**
      * Get full name of the table
-     *
-     * @param string $table
-     *
-     * @return string
      */
     private function getFullName(string $table): string
     {
@@ -296,8 +277,6 @@ private function getFullName(string $table): string
      *
      * @param string $fullTable full table name
      * @param string $insert    statement
-     *
-     * @return string
      */
     private function addIdentity(string $fullTable, string $insert): string
     {
@@ -306,11 +285,6 @@ private function addIdentity(string $fullTable, string $insert): string
 
     /**
      * Local implementation of limit
-     *
-     * @param string $sql
-     * @param bool   $offsetIgnore
-     *
-     * @return string
      */
     protected function _limit(string $sql, bool $offsetIgnore = false): string
     {
@@ -379,8 +353,6 @@ public function replace(?array $set = null)
      * @param string $table  The table name
      * @param array  $keys   The insert keys
      * @param array  $values The insert values
-     *
-     * @return string
      */
     protected function _replace(string $table, array $keys, array $values): string
     {
@@ -449,8 +421,6 @@ protected function _replace(string $table, array $keys, array $values): string
      * Handle float return value
      *
      * @param string $select Field name
-     * @param string $alias
-     * @param string $type
      *
      * @return BaseBuilder
      */
@@ -485,8 +455,6 @@ protected function maxMinAvgSum(string $select = '', string $alias = '', string
      * Delete statement
      *
      * @param string $table The table name
-     *
-     * @return string
      */
     protected function _delete(string $table): string
     {
@@ -498,9 +466,8 @@ protected function _delete(string $table): string
      *
      * Compiles a delete string and runs the query
      *
-     * @param mixed $where     The where clause
-     * @param int   $limit     The limit clause
-     * @param bool  $resetData
+     * @param mixed $where The where clause
+     * @param int   $limit The limit clause
      *
      * @throws DatabaseException
      *
@@ -541,8 +508,6 @@ public function delete($where = '', ?int $limit = null, bool $resetData = true)
      * Generates a query string based on which functions were used.
      *
      * @param mixed $selectOverride
-     *
-     * @return string
      */
     protected function compileSelect($selectOverride = false): string
     {
@@ -602,7 +567,6 @@ protected function compileSelect($selectOverride = false): string
      * @param string $qbKey  'QBWhere' or 'QBHaving'
      * @param mixed  $key
      * @param mixed  $value
-     * @param string $type
      * @param bool   $escape
      *
      * @return $this
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index a37c6119ae61..28d18af8d7d3 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -100,8 +100,6 @@ public function __construct($params)
     /**
      * Connect to the database.
      *
-     * @param bool $persistent
-     *
      * @throws DatabaseException
      *
      * @return mixed
@@ -173,10 +171,6 @@ protected function _close()
 
     /**
      * Platform-dependant string escape
-     *
-     * @param string $str
-     *
-     * @return string
      */
     protected function _escapeString(string $str): string
     {
@@ -185,8 +179,6 @@ protected function _escapeString(string $str): string
 
     /**
      * Insert ID
-     *
-     * @return int
      */
     public function insertID(): int
     {
@@ -195,10 +187,6 @@ public function insertID(): int
 
     /**
      * Generates the SQL for listing tables in a platform-dependent manner.
-     *
-     * @param bool $prefixLimit
-     *
-     * @return string
      */
     protected function _listTables(bool $prefixLimit = false): string
     {
@@ -217,10 +205,6 @@ protected function _listTables(bool $prefixLimit = false): string
 
     /**
      * Generates a platform-specific query string so that the column names can be fetched.
-     *
-     * @param string $table
-     *
-     * @return string
      */
     protected function _listColumns(string $table = ''): string
     {
@@ -233,8 +217,6 @@ protected function _listColumns(string $table = ''): string
     /**
      * Returns an array of objects with index data
      *
-     * @param string $table
-     *
      * @throws DatabaseException
      *
      * @return stdClass[]
@@ -275,8 +257,6 @@ public function _indexData(string $table): array
      * Returns an array of objects with Foreign key data
      * referenced_object_id  parent_object_id
      *
-     * @param string $table
-     *
      * @throws DatabaseException
      *
      * @return stdClass[]
@@ -345,8 +325,6 @@ protected function _enableForeignKeyChecks()
     /**
      * Returns an array of objects with field data
      *
-     * @param string $table
-     *
      * @throws DatabaseException
      *
      * @return stdClass[]
@@ -381,8 +359,6 @@ public function _fieldData(string $table): array
 
     /**
      * Begin Transaction
-     *
-     * @return bool
      */
     protected function _transBegin(): bool
     {
@@ -391,8 +367,6 @@ protected function _transBegin(): bool
 
     /**
      * Commit Transaction
-     *
-     * @return bool
      */
     protected function _transCommit(): bool
     {
@@ -401,8 +375,6 @@ protected function _transCommit(): bool
 
     /**
      * Rollback Transaction
-     *
-     * @return bool
      */
     protected function _transRollback(): bool
     {
@@ -445,8 +417,6 @@ public function error(): array
 
     /**
      * Returns the total number of rows affected by this query.
-     *
-     * @return int
      */
     public function affectedRows(): int
     {
@@ -456,8 +426,6 @@ public function affectedRows(): int
     /**
      * Select a specific database table to use.
      *
-     * @param string|null $databaseName
-     *
      * @return mixed
      */
     public function setDatabase(?string $databaseName = null)
@@ -483,8 +451,6 @@ public function setDatabase(?string $databaseName = null)
     /**
      * Executes the query against the database.
      *
-     * @param string $sql
-     *
      * @return mixed
      */
     public function execute(string $sql)
@@ -539,8 +505,6 @@ public function getError()
 
     /**
      * The name of the platform in use (MySQLi, mssql, etc)
-     *
-     * @return string
      */
     public function getPlatform(): string
     {
@@ -549,8 +513,6 @@ public function getPlatform(): string
 
     /**
      * Returns a string containing the version of the database being used.
-     *
-     * @return string
      */
     public function getVersion(): string
     {
@@ -571,8 +533,6 @@ public function getVersion(): string
      * Overrides BaseConnection::isWriteType, adding additional read query types.
      *
      * @param string $sql An SQL query string
-     *
-     * @return bool
      */
     public function isWriteType($sql): bool
     {
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
index 4a52695a653f..f1716cf6da69 100755
--- a/system/Database/SQLSRV/Forge.php
+++ b/system/Database/SQLSRV/Forge.php
@@ -100,8 +100,6 @@ class Forge extends BaseForge
      * CREATE TABLE attributes
      *
      * @param array $attributes Associative array of table attributes
-     *
-     * @return string
      */
     protected function _createTableAttributes(array $attributes): string
     {
@@ -194,9 +192,6 @@ protected function _alterTable(string $alterType, string $table, $field)
     /**
      * Drop index for table
      *
-     * @param string $table
-     * @param object $indexData
-     *
      * @return mixed
      */
     protected function _dropIndex(string $table, object $indexData)
@@ -212,10 +207,6 @@ protected function _dropIndex(string $table, object $indexData)
 
     /**
      * Process column
-     *
-     * @param array $field
-     *
-     * @return string
      */
     protected function _processColumn(array $field): string
     {
@@ -233,8 +224,6 @@ protected function _processColumn(array $field): string
      * Process foreign keys
      *
      * @param string $table Table name
-     *
-     * @return string
      */
     protected function _processForeignKeys(string $table): string
     {
@@ -273,8 +262,6 @@ protected function _processForeignKeys(string $table): string
      * Process primary keys
      *
      * @param string $table Table name
-     *
-     * @return string
      */
     protected function _processPrimaryKeys(string $table): string
     {
@@ -297,8 +284,6 @@ protected function _processPrimaryKeys(string $table): string
      *
      * Performs a data type mapping between different databases.
      *
-     * @param array $attributes
-     *
      * @return void
      */
     protected function _attributeType(array &$attributes)
@@ -339,9 +324,6 @@ protected function _attributeType(array &$attributes)
     /**
      * Field attribute AUTO_INCREMENT
      *
-     * @param array $attributes
-     * @param array $field
-     *
      * @return void
      */
     protected function _attributeAutoIncrement(array &$attributes, array &$field)
@@ -360,9 +342,6 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
      *
      * @param string $table    Table name
      * @param bool   $ifExists Whether to add an IF EXISTS condition
-     * @param bool   $cascade
-     *
-     * @return string
      */
     protected function _dropTable(string $table, bool $ifExists, bool $cascade): string
     {
diff --git a/system/Database/SQLSRV/PreparedQuery.php b/system/Database/SQLSRV/PreparedQuery.php
index 7972ba725298..e91fa78ea35f 100755
--- a/system/Database/SQLSRV/PreparedQuery.php
+++ b/system/Database/SQLSRV/PreparedQuery.php
@@ -41,8 +41,7 @@ class PreparedQuery extends BasePreparedQuery
      * NOTE: This version is based on SQL code. Child classes should
      * override this method.
      *
-     * @param string $sql
-     * @param array  $options Options takes an associative array;
+     * @param array $options Options takes an associative array;
      *
      * @throws Exception
      *
@@ -70,10 +69,6 @@ public function _prepare(string $sql, array $options = [])
     /**
      * Takes a new set of data and runs it against the currently
      * prepared query. Upon success, will return a Results object.
-     *
-     * @param array $data
-     *
-     * @return bool
      */
     public function _execute(array $data): bool
     {
@@ -102,10 +97,6 @@ public function _getResult()
 
     /**
      * Handle parameters
-     *
-     * @param string $queryString
-     *
-     * @return array
      */
     protected function parameterize(string $queryString): array
     {
diff --git a/system/Database/SQLSRV/Result.php b/system/Database/SQLSRV/Result.php
index 6330b58ba2ad..90db8ac0d4db 100755
--- a/system/Database/SQLSRV/Result.php
+++ b/system/Database/SQLSRV/Result.php
@@ -22,8 +22,6 @@ class Result extends BaseResult
 {
     /**
      * Gets the number of fields in the result set.
-     *
-     * @return int
      */
     public function getFieldCount(): int
     {
@@ -32,8 +30,6 @@ public function getFieldCount(): int
 
     /**
      * Generates an array of column names in the result set.
-     *
-     * @return array
      */
     public function getFieldNames(): array
     {
@@ -48,8 +44,6 @@ public function getFieldNames(): array
 
     /**
      * Generates an array of objects representing field meta-data.
-     *
-     * @return array
      */
     public function getFieldData(): array
     {
@@ -123,8 +117,6 @@ public function freeResult()
      * internally before fetching results to make sure the result set
      * starts at zero.
      *
-     * @param int $n
-     *
      * @return mixed
      */
     public function dataSeek(int $n = 0)
@@ -157,8 +149,6 @@ protected function fetchAssoc()
      *
      * Overridden by child classes.
      *
-     * @param string $className
-     *
      * @return bool|Entity|object
      */
     protected function fetchObject(string $className = 'stdClass')
diff --git a/system/Database/SQLSRV/Utils.php b/system/Database/SQLSRV/Utils.php
index 0776f3a68c45..da4ac8679b9e 100755
--- a/system/Database/SQLSRV/Utils.php
+++ b/system/Database/SQLSRV/Utils.php
@@ -36,8 +36,6 @@ class Utils extends BaseUtils
     /**
      * Platform dependent version of the backup function.
      *
-     * @param array|null $prefs
-     *
      * @return mixed
      */
     public function _backup(?array $prefs = null)
diff --git a/system/Database/SQLite3/Builder.php b/system/Database/SQLite3/Builder.php
index fd071957d04d..7ada68321a3c 100644
--- a/system/Database/SQLite3/Builder.php
+++ b/system/Database/SQLite3/Builder.php
@@ -58,8 +58,6 @@ class Builder extends BaseBuilder
      * @param string $table  the table name
      * @param array  $keys   the insert keys
      * @param array  $values the insert values
-     *
-     * @return string
      */
     protected function _replace(string $table, array $keys, array $values): string
     {
@@ -73,10 +71,6 @@ protected function _replace(string $table, array $keys, array $values): string
      *
      * If the database does not support the TRUNCATE statement,
      * then this method maps to 'DELETE FROM table'
-     *
-     * @param string $table
-     *
-     * @return string
      */
     protected function _truncate(string $table): string
     {
diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
index b4252e1a19a3..174f6df43758 100644
--- a/system/Database/SQLite3/Connection.php
+++ b/system/Database/SQLite3/Connection.php
@@ -40,8 +40,6 @@ class Connection extends BaseConnection
     /**
      * Connect to the database.
      *
-     * @param bool $persistent
-     *
      * @throws DatabaseException
      *
      * @return mixed
@@ -89,10 +87,6 @@ protected function _close()
 
     /**
      * Select a specific database table to use.
-     *
-     * @param string $databaseName
-     *
-     * @return bool
      */
     public function setDatabase(string $databaseName): bool
     {
@@ -101,8 +95,6 @@ public function setDatabase(string $databaseName): bool
 
     /**
      * Returns a string containing the version of the database being used.
-     *
-     * @return string
      */
     public function getVersion(): string
     {
@@ -118,8 +110,6 @@ public function getVersion(): string
     /**
      * Execute the query
      *
-     * @param string $sql
-     *
      * @return mixed \SQLite3Result object or bool
      */
     public function execute(string $sql)
@@ -140,8 +130,6 @@ public function execute(string $sql)
 
     /**
      * Returns the total number of rows affected by this query.
-     *
-     * @return int
      */
     public function affectedRows(): int
     {
@@ -150,10 +138,6 @@ public function affectedRows(): int
 
     /**
      * Platform-dependant string escape
-     *
-     * @param string $str
-     *
-     * @return string
      */
     protected function _escapeString(string $str): string
     {
@@ -162,10 +146,6 @@ protected function _escapeString(string $str): string
 
     /**
      * Generates the SQL for listing tables in a platform-dependent manner.
-     *
-     * @param bool $prefixLimit
-     *
-     * @return string
      */
     protected function _listTables(bool $prefixLimit = false): string
     {
@@ -178,10 +158,6 @@ protected function _listTables(bool $prefixLimit = false): string
 
     /**
      * Generates a platform-specific query string so that the column names can be fetched.
-     *
-     * @param string $table
-     *
-     * @return string
      */
     protected function _listColumns(string $table = ''): string
     {
@@ -237,8 +213,6 @@ public function getFieldNames(string $table)
     /**
      * Returns an array of objects with field data
      *
-     * @param string $table
-     *
      * @throws DatabaseException
      *
      * @return stdClass[]
@@ -274,8 +248,6 @@ public function _fieldData(string $table): array
     /**
      * Returns an array of objects with index data
      *
-     * @param string $table
-     *
      * @throws DatabaseException
      *
      * @return stdClass[]
@@ -319,8 +291,6 @@ public function _indexData(string $table): array
     /**
      * Returns an array of objects with Foreign key data
      *
-     * @param string $table
-     *
      * @return stdClass[]
      */
     public function _foreignKeyData(string $table): array
@@ -391,8 +361,6 @@ public function error(): array
 
     /**
      * Insert ID
-     *
-     * @return int
      */
     public function insertID(): int
     {
@@ -401,8 +369,6 @@ public function insertID(): int
 
     /**
      * Begin Transaction
-     *
-     * @return bool
      */
     protected function _transBegin(): bool
     {
@@ -411,8 +377,6 @@ protected function _transBegin(): bool
 
     /**
      * Commit Transaction
-     *
-     * @return bool
      */
     protected function _transCommit(): bool
     {
@@ -421,8 +385,6 @@ protected function _transCommit(): bool
 
     /**
      * Rollback Transaction
-     *
-     * @return bool
      */
     protected function _transRollback(): bool
     {
@@ -432,8 +394,6 @@ protected function _transRollback(): bool
     /**
      * Checks to see if the current install supports Foreign Keys
      * and has them enabled.
-     *
-     * @return bool
      */
     public function supportsForeignKeys(): bool
     {
diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
index 373c0bce0bf9..76cbf3a1e7cb 100644
--- a/system/Database/SQLite3/Forge.php
+++ b/system/Database/SQLite3/Forge.php
@@ -38,8 +38,6 @@ class Forge extends BaseForge
 
     /**
      * Constructor.
-     *
-     * @param BaseConnection $db
      */
     public function __construct(BaseConnection $db)
     {
@@ -54,10 +52,7 @@ public function __construct(BaseConnection $db)
     /**
      * Create database
      *
-     * @param string $dbName
-     * @param bool   $ifNotExists Whether to add IF NOT EXISTS condition
-     *
-     * @return bool
+     * @param bool $ifNotExists Whether to add IF NOT EXISTS condition
      */
     public function createDatabase(string $dbName, bool $ifNotExists = false): bool
     {
@@ -69,11 +64,7 @@ public function createDatabase(string $dbName, bool $ifNotExists = false): bool
     /**
      * Drop database
      *
-     * @param string $dbName
-     *
      * @throws DatabaseException
-     *
-     * @return bool
      */
     public function dropDatabase(string $dbName): bool
     {
@@ -142,10 +133,6 @@ protected function _alterTable(string $alterType, string $table, $field)
 
     /**
      * Process column
-     *
-     * @param array $field
-     *
-     * @return string
      */
     protected function _processColumn(array $field): string
     {
@@ -164,10 +151,6 @@ protected function _processColumn(array $field): string
 
     /**
      * Process indexes
-     *
-     * @param string $table
-     *
-     * @return array
      */
     protected function _processIndexes(string $table): array
     {
@@ -206,8 +189,6 @@ protected function _processIndexes(string $table): array
      *
      * Performs a data type mapping between different databases.
      *
-     * @param array $attributes
-     *
      * @return void
      */
     protected function _attributeType(array &$attributes)
@@ -226,9 +207,6 @@ protected function _attributeType(array &$attributes)
     /**
      * Field attribute AUTO_INCREMENT
      *
-     * @param array $attributes
-     * @param array $field
-     *
      * @return void
      */
     protected function _attributeAutoIncrement(array &$attributes, array &$field)
@@ -252,8 +230,6 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
      * @param string $foreignName Foreign name
      *
      * @throws DatabaseException
-     *
-     * @return bool
      */
     public function dropForeignKey(string $table, string $foreignName): bool
     {
diff --git a/system/Database/SQLite3/PreparedQuery.php b/system/Database/SQLite3/PreparedQuery.php
index 8c00c2b3d10e..c5ee89ec3e26 100644
--- a/system/Database/SQLite3/PreparedQuery.php
+++ b/system/Database/SQLite3/PreparedQuery.php
@@ -33,9 +33,8 @@ class PreparedQuery extends BasePreparedQuery
      * NOTE: This version is based on SQL code. Child classes should
      * override this method.
      *
-     * @param string $sql
-     * @param array  $options Passed to the connection's prepare statement.
-     *                        Unused in the MySQLi driver.
+     * @param array $options Passed to the connection's prepare statement.
+     *                       Unused in the MySQLi driver.
      *
      * @return mixed
      */
@@ -54,10 +53,6 @@ public function _prepare(string $sql, array $options = [])
      * prepared query. Upon success, will return a Results object.
      *
      * @todo finalize()
-     *
-     * @param array $data
-     *
-     * @return bool
      */
     public function _execute(array $data): bool
     {
diff --git a/system/Database/SQLite3/Result.php b/system/Database/SQLite3/Result.php
index 7485d36dca4b..b031645b09c2 100644
--- a/system/Database/SQLite3/Result.php
+++ b/system/Database/SQLite3/Result.php
@@ -24,8 +24,6 @@ class Result extends BaseResult
 {
     /**
      * Gets the number of fields in the result set.
-     *
-     * @return int
      */
     public function getFieldCount(): int
     {
@@ -34,8 +32,6 @@ public function getFieldCount(): int
 
     /**
      * Generates an array of column names in the result set.
-     *
-     * @return array
      */
     public function getFieldNames(): array
     {
@@ -50,8 +46,6 @@ public function getFieldNames(): array
 
     /**
      * Generates an array of objects representing field meta-data.
-     *
-     * @return array
      */
     public function getFieldData(): array
     {
@@ -98,8 +92,6 @@ public function freeResult()
      * internally before fetching results to make sure the result set
      * starts at zero.
      *
-     * @param int $n
-     *
      * @throws DatabaseException
      *
      * @return mixed
@@ -130,8 +122,6 @@ protected function fetchAssoc()
      *
      * Overridden by child classes.
      *
-     * @param string $className
-     *
      * @return bool|object
      */
     protected function fetchObject(string $className = 'stdClass')
diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php
index c4f6b77bf636..01e0fd729fe6 100644
--- a/system/Database/SQLite3/Table.php
+++ b/system/Database/SQLite3/Table.php
@@ -75,9 +75,6 @@ class Table
 
     /**
      * Table constructor.
-     *
-     * @param Connection $db
-     * @param Forge      $forge
      */
     public function __construct(Connection $db, Forge $forge)
     {
@@ -90,8 +87,6 @@ public function __construct(Connection $db, Forge $forge)
      * collects all of the information needed to
      * recreate this table.
      *
-     * @param string $table
-     *
      * @return Table
      */
     public function fromTable(string $table)
@@ -125,8 +120,6 @@ public function fromTable(string $table)
      * to finalize the action. It creates a temp table, creates the new
      * table with modifications, and copies the data over to the new table.
      * Resets the connection dataCache to be sure changes are collected.
-     *
-     * @return bool
      */
     public function run(): bool
     {
@@ -182,8 +175,6 @@ public function dropColumn($columns)
      * Modifies a field, including changing data type,
      * renaming, etc.
      *
-     * @param array $field
-     *
      * @return Table
      */
     public function modifyColumn(array $field)
@@ -202,8 +193,6 @@ public function modifyColumn(array $field)
      * Drops a foreign key from this table so that
      * it won't be recreated in the future.
      *
-     * @param string $column
-     *
      * @return Table
      */
     public function dropForeignKey(string $column)
diff --git a/system/Database/SQLite3/Utils.php b/system/Database/SQLite3/Utils.php
index 192b81846cc7..f0cc5dfcf2dc 100644
--- a/system/Database/SQLite3/Utils.php
+++ b/system/Database/SQLite3/Utils.php
@@ -29,8 +29,6 @@ class Utils extends BaseUtils
     /**
      * Platform dependent version of the backup function.
      *
-     * @param array|null $prefs
-     *
      * @return mixed
      */
     public function _backup(?array $prefs = null)
diff --git a/system/Database/Seeder.php b/system/Database/Seeder.php
index c809fbcd1a32..5e76f23a1a3e 100644
--- a/system/Database/Seeder.php
+++ b/system/Database/Seeder.php
@@ -73,9 +73,6 @@ class Seeder
 
     /**
      * Seeder constructor.
-     *
-     * @param Database            $config
-     * @param BaseConnection|null $db
      */
     public function __construct(Database $config, ?BaseConnection $db = null)
     {
@@ -101,8 +98,6 @@ public function __construct(Database $config, ?BaseConnection $db = null)
 
     /**
      * Gets the Faker Generator instance.
-     *
-     * @return Generator|null
      */
     public static function faker(): ?Generator
     {
@@ -116,8 +111,6 @@ public static function faker(): ?Generator
     /**
      * Loads the specified seeder and runs it.
      *
-     * @param string $class
-     *
      * @throws InvalidArgumentException
      *
      * @return void
@@ -163,8 +156,6 @@ public function call(string $class)
     /**
      * Sets the location of the directory that seed files can be located in.
      *
-     * @param string $path
-     *
      * @return $this
      */
     public function setPath(string $path)
@@ -177,8 +168,6 @@ public function setPath(string $path)
     /**
      * Sets the silent treatment.
      *
-     * @param bool $silent
-     *
      * @return $this
      */
     public function setSilent(bool $silent)
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index c1b262060d87..07218ed47ba2 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -66,10 +66,6 @@ class Exceptions
 
     /**
      * Constructor.
-     *
-     * @param ExceptionsConfig $config
-     * @param IncomingRequest  $request
-     * @param Response         $response
      */
     public function __construct(ExceptionsConfig $config, IncomingRequest $request, Response $response)
     {
@@ -105,8 +101,6 @@ public function initialize()
      * (Yay PHP7!). Will log the error, display it if display_errors is on,
      * and fire an event that allows custom actions to be taken at this point.
      *
-     * @param Throwable $exception
-     *
      * @codeCoverageIgnore
      */
     public function exceptionHandler(Throwable $exception)
@@ -147,11 +141,6 @@ public function exceptionHandler(Throwable $exception)
      *
      * This seems to be primarily when a user triggers it with trigger_error().
      *
-     * @param int         $severity
-     * @param string      $message
-     * @param string|null $file
-     * @param int|null    $line
-     *
      * @throws ErrorException
      */
     public function errorHandler(int $severity, string $message, ?string $file = null, ?int $line = null)
@@ -185,9 +174,6 @@ public function shutdownHandler()
      * Determines the view to display based on the exception thrown,
      * whether an HTTP or CLI request, etc.
      *
-     * @param Throwable $exception
-     * @param string    $templatePath
-     *
      * @return string The path and filename of the view file to use
      */
     protected function determineView(Throwable $exception, string $templatePath): string
@@ -215,9 +201,6 @@ protected function determineView(Throwable $exception, string $templatePath): st
 
     /**
      * Given an exception and status code will display the error to the client.
-     *
-     * @param Throwable $exception
-     * @param int       $statusCode
      */
     protected function render(Throwable $exception, int $statusCode)
     {
@@ -257,11 +240,6 @@ protected function render(Throwable $exception, int $statusCode)
 
     /**
      * Gathers the variables that will be made available to the view.
-     *
-     * @param Throwable $exception
-     * @param int       $statusCode
-     *
-     * @return array
      */
     protected function collectVars(Throwable $exception, int $statusCode): array
     {
@@ -285,8 +263,6 @@ protected function collectVars(Throwable $exception, int $statusCode): array
      * Mask sensitive data in the trace.
      *
      * @param array|object $trace
-     * @param array        $keysToMask
-     * @param string       $path
      */
     protected function maskSensitiveData(&$trace, array $keysToMask, string $path = '')
     {
@@ -316,10 +292,6 @@ protected function maskSensitiveData(&$trace, array $keysToMask, string $path =
 
     /**
      * Determines the HTTP status code and the exit status code for this request.
-     *
-     * @param Throwable $exception
-     *
-     * @return array
      */
     protected function determineCodes(Throwable $exception): array
     {
@@ -349,10 +321,6 @@ protected function determineCodes(Throwable $exception): array
      * Clean Path
      *
      * This makes nicer looking paths for the error output.
-     *
-     * @param string $file
-     *
-     * @return string
      */
     public static function cleanPath(string $file): string
     {
@@ -380,10 +348,6 @@ public static function cleanPath(string $file): string
     /**
      * Describes memory usage in real-world units. Intended for use
      * with memory_get_usage, etc.
-     *
-     * @param int $bytes
-     *
-     * @return string
      */
     public static function describeMemory(int $bytes): string
     {
@@ -400,10 +364,6 @@ public static function describeMemory(int $bytes): string
     /**
      * Creates a syntax-highlighted version of a PHP file.
      *
-     * @param string $file
-     * @param int    $lineNumber
-     * @param int    $lines
-     *
      * @return bool|string
      */
     public static function highlightFile(string $file, int $lineNumber, int $lines = 15)
diff --git a/system/Debug/Iterator.php b/system/Debug/Iterator.php
index 01a9d58a0104..62343745b17b 100644
--- a/system/Debug/Iterator.php
+++ b/system/Debug/Iterator.php
@@ -38,9 +38,6 @@ class Iterator
      * Tests are simply closures that the user can define any sequence of
      * things to happen during the test.
      *
-     * @param string  $name
-     * @param Closure $closure
-     *
      * @return $this
      */
     public function add(string $name, Closure $closure)
@@ -57,9 +54,6 @@ public function add(string $name, Closure $closure)
      * time to execute the desired number of iterations, and the approximate
      * memory usage used during those iterations.
      *
-     * @param int  $iterations
-     * @param bool $output
-     *
      * @return string|null
      */
     public function run(int $iterations = 1000, bool $output = true)
@@ -94,8 +88,6 @@ public function run(int $iterations = 1000, bool $output = true)
 
     /**
      * Get results.
-     *
-     * @return string
      */
     public function getReport(): string
     {
diff --git a/system/Debug/Timer.php b/system/Debug/Timer.php
index fc26abae1aaf..5783c77aae72 100644
--- a/system/Debug/Timer.php
+++ b/system/Debug/Timer.php
@@ -103,8 +103,6 @@ public function getElapsedTime(string $name, int $decimals = 4)
      * Returns the array of timers, with the duration pre-calculated for you.
      *
      * @param int $decimals Number of decimal places
-     *
-     * @return array
      */
     public function getTimers(int $decimals = 4): array
     {
@@ -123,10 +121,6 @@ public function getTimers(int $decimals = 4): array
 
     /**
      * Checks whether or not a timer with the specified name exists.
-     *
-     * @param string $name
-     *
-     * @return bool
      */
     public function has(string $name): bool
     {
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index df266710d150..3cf1196891e2 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -51,8 +51,6 @@ class Toolbar
 
     /**
      * Constructor
-     *
-     * @param ToolbarConfig $config
      */
     public function __construct(ToolbarConfig $config)
     {
@@ -73,10 +71,7 @@ public function __construct(ToolbarConfig $config)
     /**
      * Returns all the data required by Debug Bar
      *
-     * @param float             $startTime App start time
-     * @param float             $totalTime
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
+     * @param float $startTime App start time
      *
      * @return string JSON encoded data
      */
@@ -177,14 +172,6 @@ public function run(float $startTime, float $totalTime, RequestInterface $reques
 
     /**
      * Called within the view to display the timeline itself.
-     *
-     * @param array $collectors
-     * @param float $startTime
-     * @param int   $segmentCount
-     * @param int   $segmentDuration
-     * @param array $styles
-     *
-     * @return string
      */
     protected function renderTimeline(array $collectors, float $startTime, int $segmentCount, int $segmentDuration, array &$styles): string
     {
@@ -219,8 +206,6 @@ protected function renderTimeline(array $collectors, float $startTime, int $segm
      * Returns a sorted array of timeline data arrays from the collectors.
      *
      * @param array $collectors
-     *
-     * @return array
      */
     protected function collectTimelineData($collectors): array
     {
@@ -243,8 +228,6 @@ protected function collectTimelineData($collectors): array
     /**
      * Returns an array of data from all of the modules
      * that should be displayed in the 'Vars' tab.
-     *
-     * @return array
      */
     protected function collectVarData(): array
     {
@@ -263,11 +246,6 @@ protected function collectVarData(): array
 
     /**
      * Rounds a number to the nearest incremental value.
-     *
-     * @param float $number
-     * @param int   $increments
-     *
-     * @return float
      */
     protected function roundTo(float $number, int $increments = 5): float
     {
@@ -422,8 +400,6 @@ public function respond()
      *
      * @param string $data   JSON encoded Toolbar data
      * @param string $format html, json, xml
-     *
-     * @return string
      */
     protected function format(string $data, string $format = 'html'): string
     {
diff --git a/system/Debug/Toolbar/Collectors/BaseCollector.php b/system/Debug/Toolbar/Collectors/BaseCollector.php
index 7a77e79aa649..5d8d39ff169f 100644
--- a/system/Debug/Toolbar/Collectors/BaseCollector.php
+++ b/system/Debug/Toolbar/Collectors/BaseCollector.php
@@ -60,10 +60,6 @@ class BaseCollector
 
     /**
      * Gets the Collector's title.
-     *
-     * @param bool $safe
-     *
-     * @return string
      */
     public function getTitle(bool $safe = false): string
     {
@@ -76,8 +72,6 @@ public function getTitle(bool $safe = false): string
 
     /**
      * Returns any information that should be shown next to the title.
-     *
-     * @return string
      */
     public function getTitleDetails(): string
     {
@@ -86,8 +80,6 @@ public function getTitleDetails(): string
 
     /**
      * Does this collector need it's own tab?
-     *
-     * @return bool
      */
     public function hasTabContent(): bool
     {
@@ -96,8 +88,6 @@ public function hasTabContent(): bool
 
     /**
      * Does this collector have a label?
-     *
-     * @return bool
      */
     public function hasLabel(): bool
     {
@@ -106,8 +96,6 @@ public function hasLabel(): bool
 
     /**
      * Does this collector have information for the timeline?
-     *
-     * @return bool
      */
     public function hasTimelineData(): bool
     {
@@ -117,8 +105,6 @@ public function hasTimelineData(): bool
     /**
      * Grabs the data for the timeline, properly formatted,
      * or returns an empty array.
-     *
-     * @return array
      */
     public function timelineData(): array
     {
@@ -132,8 +118,6 @@ public function timelineData(): array
     /**
      * Does this Collector have data that should be shown in the
      * 'Vars' tab?
-     *
-     * @return bool
      */
     public function hasVarData(): bool
     {
@@ -173,8 +157,6 @@ public function getVarData()
      *      'start'     => 10       // milliseconds
      *      'duration'  => 15       // milliseconds
      *  ]
-     *
-     * @return array
      */
     protected function formatTimelineData(): array
     {
@@ -195,10 +177,6 @@ public function display()
      * Clean Path
      *
      * This makes nicer looking paths for the error output.
-     *
-     * @param string $file
-     *
-     * @return string
      */
     public function cleanPath(string $file): string
     {
@@ -217,8 +195,6 @@ public function getBadgeValue()
      * Does this collector have any data collected?
      *
      * If not, then the toolbar button won't get shown.
-     *
-     * @return bool
      */
     public function isEmpty(): bool
     {
@@ -230,8 +206,6 @@ public function isEmpty(): bool
      * be SVG, or a base-64 encoded.
      *
      * Recommended dimensions are 24px x 24px
-     *
-     * @return string
      */
     public function icon(): string
     {
@@ -240,8 +214,6 @@ public function icon(): string
 
     /**
      * Return settings as an array.
-     *
-     * @return array
      */
     public function getAsArray(): array
     {
diff --git a/system/Debug/Toolbar/Collectors/Config.php b/system/Debug/Toolbar/Collectors/Config.php
index 1233d76260a5..faf7a19b7391 100644
--- a/system/Debug/Toolbar/Collectors/Config.php
+++ b/system/Debug/Toolbar/Collectors/Config.php
@@ -22,8 +22,6 @@ class Config
 {
     /**
      * Return toolbar config values as an array.
-     *
-     * @return array
      */
     public static function display(): array
     {
diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 1f9fa37d7215..6fd5b263f4a3 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -73,8 +73,6 @@ public function __construct()
      * The static method used during Events to collect
      * data.
      *
-     * @param Query $query
-     *
      * @internal param $ array \CodeIgniter\Database\Query
      */
     public static function collect(Query $query)
@@ -122,8 +120,6 @@ protected function formatTimelineData(): array
 
     /**
      * Returns the data of this collector to be formatted in the toolbar
-     *
-     * @return array
      */
     public function display(): array
     {
@@ -139,8 +135,6 @@ public function display(): array
 
     /**
      * Gets the "badge" value for the button.
-     *
-     * @return int
      */
     public function getBadgeValue(): int
     {
@@ -160,8 +154,6 @@ public function getTitleDetails(): string
 
     /**
      * Does this collector have any data collected?
-     *
-     * @return bool
      */
     public function isEmpty(): bool
     {
@@ -172,8 +164,6 @@ public function isEmpty(): bool
      * Display the icon.
      *
      * Icon from https://icons8.com - 1em package
-     *
-     * @return string
      */
     public function icon(): string
     {
diff --git a/system/Debug/Toolbar/Collectors/Events.php b/system/Debug/Toolbar/Collectors/Events.php
index 741cb5a927d9..b8c59f4566bb 100644
--- a/system/Debug/Toolbar/Collectors/Events.php
+++ b/system/Debug/Toolbar/Collectors/Events.php
@@ -69,8 +69,6 @@ public function __construct()
     /**
      * Child classes should implement this to return the timeline data
      * formatted for correct usage.
-     *
-     * @return array
      */
     protected function formatTimelineData(): array
     {
@@ -92,8 +90,6 @@ protected function formatTimelineData(): array
 
     /**
      * Returns the data of this collector to be formatted in the toolbar
-     *
-     * @return array
      */
     public function display(): array
     {
@@ -127,8 +123,6 @@ public function display(): array
 
     /**
      * Gets the "badge" value for the button.
-     *
-     * @return int
      */
     public function getBadgeValue(): int
     {
@@ -139,8 +133,6 @@ public function getBadgeValue(): int
      * Display the icon.
      *
      * Icon from https://icons8.com - 1em package
-     *
-     * @return string
      */
     public function icon(): string
     {
diff --git a/system/Debug/Toolbar/Collectors/Files.php b/system/Debug/Toolbar/Collectors/Files.php
index 16be0e90a15e..d476154db1c3 100644
--- a/system/Debug/Toolbar/Collectors/Files.php
+++ b/system/Debug/Toolbar/Collectors/Files.php
@@ -42,8 +42,6 @@ class Files extends BaseCollector
 
     /**
      * Returns any information that should be shown next to the title.
-     *
-     * @return string
      */
     public function getTitleDetails(): string
     {
@@ -52,8 +50,6 @@ public function getTitleDetails(): string
 
     /**
      * Returns the data of this collector to be formatted in the toolbar
-     *
-     * @return array
      */
     public function display(): array
     {
@@ -88,8 +84,6 @@ public function display(): array
 
     /**
      * Displays the number of included files as a badge in the tab button.
-     *
-     * @return int
      */
     public function getBadgeValue(): int
     {
@@ -100,8 +94,6 @@ public function getBadgeValue(): int
      * Display the icon.
      *
      * Icon from https://icons8.com - 1em package
-     *
-     * @return string
      */
     public function icon(): string
     {
diff --git a/system/Debug/Toolbar/Collectors/History.php b/system/Debug/Toolbar/Collectors/History.php
index 5a8053ca46b7..3c0f4268f65e 100644
--- a/system/Debug/Toolbar/Collectors/History.php
+++ b/system/Debug/Toolbar/Collectors/History.php
@@ -103,8 +103,6 @@ public function setFiles(int $current, int $limit = 20)
 
     /**
      * Returns the data of this collector to be formatted in the toolbar
-     *
-     * @return array
      */
     public function display(): array
     {
@@ -113,8 +111,6 @@ public function display(): array
 
     /**
      * Displays the number of included files as a badge in the tab button.
-     *
-     * @return int
      */
     public function getBadgeValue(): int
     {
@@ -123,8 +119,6 @@ public function getBadgeValue(): int
 
     /**
      * Return true if there are no history files.
-     *
-     * @return bool
      */
     public function isEmpty(): bool
     {
@@ -135,8 +129,6 @@ public function isEmpty(): bool
      * Display the icon.
      *
      * Icon from https://icons8.com - 1em package
-     *
-     * @return string
      */
     public function icon(): string
     {
diff --git a/system/Debug/Toolbar/Collectors/Logs.php b/system/Debug/Toolbar/Collectors/Logs.php
index dfa91da6854e..42d7307ab9d1 100644
--- a/system/Debug/Toolbar/Collectors/Logs.php
+++ b/system/Debug/Toolbar/Collectors/Logs.php
@@ -51,8 +51,6 @@ class Logs extends BaseCollector
 
     /**
      * Returns the data of this collector to be formatted in the toolbar
-     *
-     * @return array
      */
     public function display(): array
     {
@@ -63,8 +61,6 @@ public function display(): array
 
     /**
      * Does this collector actually have any data to display?
-     *
-     * @return bool
      */
     public function isEmpty(): bool
     {
@@ -77,8 +73,6 @@ public function isEmpty(): bool
      * Display the icon.
      *
      * Icon from https://icons8.com - 1em package
-     *
-     * @return string
      */
     public function icon(): string
     {
diff --git a/system/Debug/Toolbar/Collectors/Routes.php b/system/Debug/Toolbar/Collectors/Routes.php
index 945c80cb6148..060d8b995872 100644
--- a/system/Debug/Toolbar/Collectors/Routes.php
+++ b/system/Debug/Toolbar/Collectors/Routes.php
@@ -49,8 +49,6 @@ class Routes extends BaseCollector
      * Returns the data of this collector to be formatted in the toolbar
      *
      * @throws ReflectionException
-     *
-     * @return array
      */
     public function display(): array
     {
@@ -135,8 +133,6 @@ public function display(): array
 
     /**
      * Returns a count of all the routes in the system.
-     *
-     * @return int
      */
     public function getBadgeValue(): int
     {
@@ -149,8 +145,6 @@ public function getBadgeValue(): int
      * Display the icon.
      *
      * Icon from https://icons8.com - 1em package
-     *
-     * @return string
      */
     public function icon(): string
     {
diff --git a/system/Debug/Toolbar/Collectors/Timers.php b/system/Debug/Toolbar/Collectors/Timers.php
index ec09a0fe3e05..cfce9e617594 100644
--- a/system/Debug/Toolbar/Collectors/Timers.php
+++ b/system/Debug/Toolbar/Collectors/Timers.php
@@ -45,8 +45,6 @@ class Timers extends BaseCollector
     /**
      * Child classes should implement this to return the timeline data
      * formatted for correct usage.
-     *
-     * @return array
      */
     protected function formatTimelineData(): array
     {
diff --git a/system/Debug/Toolbar/Collectors/Views.php b/system/Debug/Toolbar/Collectors/Views.php
index b716ffa3b178..75fea1d6cc6d 100644
--- a/system/Debug/Toolbar/Collectors/Views.php
+++ b/system/Debug/Toolbar/Collectors/Views.php
@@ -84,8 +84,6 @@ public function __construct()
     /**
      * Child classes should implement this to return the timeline data
      * formatted for correct usage.
-     *
-     * @return array
      */
     protected function formatTimelineData(): array
     {
@@ -120,8 +118,6 @@ protected function formatTimelineData(): array
      *          'bar' => 'baz'
      *      ],
      *  ];
-     *
-     * @return array
      */
     public function getVarData(): array
     {
@@ -133,8 +129,6 @@ public function getVarData(): array
 
     /**
      * Returns a count of all views.
-     *
-     * @return int
      */
     public function getBadgeValue(): int
     {
@@ -145,8 +139,6 @@ public function getBadgeValue(): int
      * Display the icon.
      *
      * Icon from https://icons8.com - 1em package
-     *
-     * @return string
      */
     public function icon(): string
     {
diff --git a/system/Email/Email.php b/system/Email/Email.php
index 569bdb2b82f0..3ce079879293 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -1317,6 +1317,8 @@ protected function buildMessage()
     }
 
     /**
+     * @param mixed $type
+     *
      * @return bool
      */
     protected function attachmentsHaveMultipart($type)
diff --git a/system/Encryption/Encryption.php b/system/Encryption/Encryption.php
index 1663abe93eab..0b5925902f84 100644
--- a/system/Encryption/Encryption.php
+++ b/system/Encryption/Encryption.php
@@ -179,8 +179,6 @@ public function __get($key)
      * __isset() magic, providing checking for some of our protected properties
      *
      * @param string $key Property name
-     *
-     * @return bool
      */
     public function __isset($key): bool
     {
diff --git a/system/Encryption/Exceptions/EncryptionException.php b/system/Encryption/Exceptions/EncryptionException.php
index 808e7c472ac5..d226fd5dd08b 100644
--- a/system/Encryption/Exceptions/EncryptionException.php
+++ b/system/Encryption/Exceptions/EncryptionException.php
@@ -35,8 +35,6 @@ public static function forNoDriverRequested()
     /**
      * Thrown when the handler requested is not available.
      *
-     * @param string $handler
-     *
      * @return static
      */
     public static function forNoHandlerAvailable(string $handler)
diff --git a/system/Encryption/Handlers/BaseHandler.php b/system/Encryption/Handlers/BaseHandler.php
index 7c332b8f7217..9fb28dff1c25 100644
--- a/system/Encryption/Handlers/BaseHandler.php
+++ b/system/Encryption/Handlers/BaseHandler.php
@@ -29,8 +29,6 @@ abstract class BaseHandler implements EncrypterInterface
 
     /**
      * Constructor
-     *
-     * @param Encryption|null $config
      */
     public function __construct(?Encryption $config = null)
     {
@@ -78,8 +76,6 @@ public function __get($key)
      * __isset() magic, providing checking for some of our properties
      *
      * @param string $key Property name
-     *
-     * @return bool
      */
     public function __isset($key): bool
     {
diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index 4d6c31f41f73..74339dd6eefe 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -111,8 +111,6 @@ class Entity implements JsonSerializable
 
     /**
      * Allows filling in Entity parameters during construction.
-     *
-     * @param array|null $data
      */
     public function __construct(?array $data = null)
     {
@@ -151,8 +149,6 @@ public function fill(?array $data = null)
      * @param bool $onlyChanged If true, only return values that have changed since object creation
      * @param bool $cast        If true, properties will be casted.
      * @param bool $recursive   If true, inner entities will be casted as array as well.
-     *
-     * @return array
      */
     public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recursive = false): array
     {
@@ -197,8 +193,6 @@ public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recu
      *
      * @param bool $onlyChanged If true, only return values that have changed since object creation
      * @param bool $recursive   If true, inner entities will be casted as array as well.
-     *
-     * @return array
      */
     public function toRawArray(bool $onlyChanged = false, bool $recursive = false): array
     {
@@ -257,8 +251,6 @@ public function syncOriginal()
      * properties have changed.
      *
      * @param string $key
-     *
-     * @return bool
      */
     public function hasChanged(?string $key = null): bool
     {
@@ -283,8 +275,6 @@ public function hasChanged(?string $key = null): bool
     /**
      * Set raw data array without any mutations
      *
-     * @param array $data
-     *
      * @return $this
      */
     public function setAttributes(array $data)
@@ -300,8 +290,6 @@ public function setAttributes(array $data)
      * Checks the datamap to see if this column name is being mapped,
      * and returns the mapped name, if any, or the original name.
      *
-     * @param string $key
-     *
      * @return mixed|string
      */
     protected function mapProperty(string $key)
@@ -405,7 +393,6 @@ protected function castAs($value, string $attribute, string $method = 'get')
      * Cast as JSON
      *
      * @param mixed $value
-     * @param bool  $asArray
      *
      * @throws CastException
      *
@@ -429,8 +416,6 @@ public function jsonSerialize()
     /**
      * Change the value of the private $_cast property
      *
-     * @param bool|null $cast
-     *
      * @return bool|Entity
      */
     public function cast(?bool $cast = null)
@@ -453,7 +438,6 @@ public function cast(?bool $cast = null)
      *  $this->my_property = $p;
      *  $this->setMyProperty() = $p;
      *
-     * @param string     $key
      * @param mixed|null $value
      *
      * @throws Exception
@@ -499,8 +483,6 @@ public function __set(string $key, $value = null)
      *  $p = $this->my_property
      *  $p = $this->getMyProperty()
      *
-     * @param string $key
-     *
      * @throws Exception
      *
      * @return mixed
@@ -541,10 +523,6 @@ public function __get(string $key)
     /**
      * Returns true if a property exists names $key, or a getter method
      * exists named like for __get().
-     *
-     * @param string $key
-     *
-     * @return bool
      */
     public function __isset(string $key): bool
     {
@@ -561,10 +539,6 @@ public function __isset(string $key): bool
 
     /**
      * Unsets an attribute property.
-     *
-     * @param string $key
-     *
-     * @return void
      */
     public function __unset(string $key): void
     {
diff --git a/system/Entity/Exceptions/CastException.php b/system/Entity/Exceptions/CastException.php
index 296a8a833ca5..2cda4d72238d 100644
--- a/system/Entity/Exceptions/CastException.php
+++ b/system/Entity/Exceptions/CastException.php
@@ -21,8 +21,6 @@ class CastException extends FrameworkException
     /**
      * Thrown when the cast class does not extends BaseCast.
      *
-     * @param string $class
-     *
      * @return static
      */
     public static function forInvalidInterface(string $class)
@@ -33,8 +31,6 @@ public static function forInvalidInterface(string $class)
     /**
      * Thrown when the Json format is invalid.
      *
-     * @param int $error
-     *
      * @return static
      */
     public static function forInvalidJsonFormat(int $error)
@@ -63,8 +59,6 @@ public static function forInvalidJsonFormat(int $error)
     /**
      * Thrown when the cast method is not `get` or `set`.
      *
-     * @param string $method
-     *
      * @return static
      */
     public static function forInvalidMethod(string $method)
diff --git a/system/Events/Events.php b/system/Events/Events.php
index 0b25f22c7d4b..d32ff339126b 100644
--- a/system/Events/Events.php
+++ b/system/Events/Events.php
@@ -139,8 +139,6 @@ public static function on($eventName, $callback, $priority = EVENT_PRIORITY_NORM
      *
      * @param string $eventName
      * @param mixed  $arguments
-     *
-     * @return bool
      */
     public static function trigger($eventName, ...$arguments): bool
     {
@@ -177,8 +175,6 @@ public static function trigger($eventName, ...$arguments): bool
      * sorted by priority.
      *
      * @param string $eventName
-     *
-     * @return array
      */
     public static function listeners($eventName): array
     {
@@ -204,10 +200,7 @@ public static function listeners($eventName): array
      * If the listener couldn't be found, returns FALSE, else TRUE if
      * it was removed.
      *
-     * @param string   $eventName
-     * @param callable $listener
-     *
-     * @return bool
+     * @param string $eventName
      */
     public static function removeListener($eventName, callable $listener): bool
     {
@@ -251,8 +244,6 @@ public static function removeAllListeners($eventName = null)
     /**
      * Sets the path to the file that routes are read from.
      *
-     * @param array $files
-     *
      * @return void
      */
     public static function setFiles(array $files)
@@ -275,8 +266,6 @@ public function getFiles()
      * simply logged. Useful during testing when you don't actually want
      * the tests to run.
      *
-     * @param bool $choice
-     *
      * @return void
      */
     public static function simulate(bool $choice = true)
diff --git a/system/Exceptions/DebugTraceableTrait.php b/system/Exceptions/DebugTraceableTrait.php
index 5c83d93d42a9..b5fb691d78b7 100644
--- a/system/Exceptions/DebugTraceableTrait.php
+++ b/system/Exceptions/DebugTraceableTrait.php
@@ -24,10 +24,6 @@ trait DebugTraceableTrait
     /**
      * Tweaks the exception's constructor to assign the file/line to where
      * it is actually raised rather than were it is instantiated.
-     *
-     * @param string         $message
-     * @param int            $code
-     * @param Throwable|null $previous
      */
     final public function __construct(string $message = '', int $code = 0, ?Throwable $previous = null)
     {
diff --git a/system/Files/File.php b/system/Files/File.php
index 579e412075e1..d116aa927912 100644
--- a/system/Files/File.php
+++ b/system/Files/File.php
@@ -38,9 +38,6 @@ class File extends SplFileInfo
     /**
      * Run our SplFileInfo constructor with an optional verification
      * that the path is really a file.
-     *
-     * @param string $path
-     * @param bool   $checkFile
      */
     public function __construct(string $path, bool $checkFile = false)
     {
@@ -68,8 +65,6 @@ public function getSize()
     /**
      * Retrieve the file size by unit.
      *
-     * @param string $unit
-     *
      * @return int|string
      */
     public function getSizeByUnit(string $unit = 'b')
@@ -89,8 +84,6 @@ public function getSizeByUnit(string $unit = 'b')
     /**
      * Attempts to determine the file extension based on the trusted
      * getType() method. If the mime type is unknown, will return null.
-     *
-     * @return string|null
      */
     public function guessExtension(): ?string
     {
@@ -122,8 +115,6 @@ public function getMimeType(): string
     /**
      * Generates a random names based on a simple hash and the time, with
      * the correct file extension attached.
-     *
-     * @return string
      */
     public function getRandomName(): string
     {
@@ -136,10 +127,6 @@ public function getRandomName(): string
     /**
      * Moves a file to a new location.
      *
-     * @param string      $targetPath
-     * @param string|null $name
-     * @param bool        $overwrite
-     *
      * @return File
      */
     public function move(string $targetPath, ?string $name = null, bool $overwrite = false)
@@ -167,12 +154,6 @@ public function move(string $targetPath, ?string $name = null, bool $overwrite =
      * First, it checks whether the delimiter is present in the filename, if it is, then it checks whether the
      * last element is an integer as there may be cases that the delimiter may be present in the filename.
      * For the all other cases, it appends an integer starting from zero before the file's extension.
-     *
-     * @param string $destination
-     * @param string $delimiter
-     * @param int    $i
-     *
-     * @return string
      */
     public function getDestination(string $destination, string $delimiter = '_', int $i = 0): string
     {
diff --git a/system/Filters/Exceptions/FilterException.php b/system/Filters/Exceptions/FilterException.php
index 6bdef40555df..04bb36bdc2c5 100644
--- a/system/Filters/Exceptions/FilterException.php
+++ b/system/Filters/Exceptions/FilterException.php
@@ -23,8 +23,6 @@ class FilterException extends ConfigException implements ExceptionInterface
      * Thrown when the provided alias is not within
      * the list of configured filter aliases.
      *
-     * @param string $alias
-     *
      * @return static
      */
     public static function forNoAlias(string $alias)
@@ -35,8 +33,6 @@ public static function forNoAlias(string $alias)
     /**
      * Thrown when the filter class does not implement FilterInterface.
      *
-     * @param string $class
-     *
      * @return static
      */
     public static function forIncorrectInterface(string $class)
diff --git a/system/Filters/FilterInterface.php b/system/Filters/FilterInterface.php
index ffadc19e70f2..32a18de74682 100644
--- a/system/Filters/FilterInterface.php
+++ b/system/Filters/FilterInterface.php
@@ -29,8 +29,7 @@ interface FilterInterface
      * sent back to the client, allowing for error pages,
      * redirects, etc.
      *
-     * @param RequestInterface $request
-     * @param null             $arguments
+     * @param null $arguments
      *
      * @return mixed
      */
@@ -42,9 +41,7 @@ public function before(RequestInterface $request, $arguments = null);
      * to stop execution of other after filters, short of
      * throwing an Exception or Error.
      *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @param null              $arguments
+     * @param null $arguments
      *
      * @return mixed
      */
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index b6cc9bb98cd0..42ba65617954 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -98,10 +98,7 @@ class Filters
     /**
      * Constructor.
      *
-     * @param FiltersConfig     $config
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @param Modules|null      $modules
+     * @param FiltersConfig $config
      */
     public function __construct($config, RequestInterface $request, ResponseInterface $response, ?Modules $modules = null)
     {
@@ -143,8 +140,6 @@ private function discoverFilters()
 
     /**
      * Set the response explicity.
-     *
-     * @param ResponseInterface $response
      */
     public function setResponse(ResponseInterface $response)
     {
@@ -155,9 +150,6 @@ public function setResponse(ResponseInterface $response)
      * Runs through all of the filters for the specified
      * uri and position.
      *
-     * @param string $uri
-     * @param string $position
-     *
      * @throws FilterException
      *
      * @return mixed|RequestInterface|ResponseInterface
@@ -281,8 +273,6 @@ public function reset(): self
 
     /**
      * Returns the processed filters array.
-     *
-     * @return array
      */
     public function getFilters(): array
     {
@@ -291,8 +281,6 @@ public function getFilters(): array
 
     /**
      * Returns the filtersClass array.
-     *
-     * @return array
      */
     public function getFiltersClass(): array
     {
@@ -304,11 +292,6 @@ public function getFiltersClass(): array
      * MUST be called prior to initialize();
      * Intended for use within routes files.
      *
-     * @param string      $class
-     * @param string|null $alias
-     * @param string      $when
-     * @param string      $section
-     *
      * @return $this
      */
     public function addFilter(string $class, ?string $alias = null, string $when = 'before', string $section = 'globals')
@@ -337,9 +320,6 @@ public function addFilter(string $class, ?string $alias = null, string $when = '
      * after the filter name, followed by a comma-separated list of arguments that
      * are passed to the filter when executed.
      *
-     * @param string $name
-     * @param string $when
-     *
      * @return Filters
      */
     public function enableFilter(string $name, string $when = 'before')
@@ -377,8 +357,6 @@ public function enableFilter(string $name, string $when = 'before')
     /**
      * Returns the arguments for a specified key, or all.
      *
-     * @param string|null $key
-     *
      * @return mixed
      */
     public function getArguments(?string $key = null)
@@ -495,8 +473,6 @@ protected function processFilters(?string $uri = null)
     /**
      * Maps filter aliases to the equivalent filter classes
      *
-     * @param string $position
-     *
      * @throws FilterException
      *
      * @return void
diff --git a/system/Filters/Honeypot.php b/system/Filters/Honeypot.php
index f4046d1cd84f..1b16e982a683 100644
--- a/system/Filters/Honeypot.php
+++ b/system/Filters/Honeypot.php
@@ -25,8 +25,7 @@ class Honeypot implements FilterInterface
      * Checks if Honeypot field is empty; if not
      * then the requester is a bot
      *
-     * @param RequestInterface $request
-     * @param array|null       $arguments
+     * @param array|null $arguments
      *
      * @return void
      */
@@ -41,9 +40,7 @@ public function before(RequestInterface $request, $arguments = null)
     /**
      * Attach a honeypot to the current response.
      *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @param array|null        $arguments
+     * @param array|null $arguments
      *
      * @return void
      */
diff --git a/system/Format/Exceptions/FormatException.php b/system/Format/Exceptions/FormatException.php
index c22626f4ad1d..5fef64eae2a1 100644
--- a/system/Format/Exceptions/FormatException.php
+++ b/system/Format/Exceptions/FormatException.php
@@ -25,8 +25,6 @@ class FormatException extends RuntimeException implements ExceptionInterface
     /**
      * Thrown when the instantiated class does not exist.
      *
-     * @param string $class
-     *
      * @return FormatException
      */
     public static function forInvalidFormatter(string $class)
@@ -51,8 +49,6 @@ public static function forInvalidJSON(?string $error = null)
      * Thrown when the supplied MIME type has no
      * defined Formatter class.
      *
-     * @param string $mime
-     *
      * @return FormatException
      */
     public static function forInvalidMime(string $mime)
diff --git a/system/Format/Format.php b/system/Format/Format.php
index c95ae291cf9d..db05aca146d5 100644
--- a/system/Format/Format.php
+++ b/system/Format/Format.php
@@ -28,8 +28,6 @@ class Format
 
     /**
      * Constructor.
-     *
-     * @param FormatConfig $config
      */
     public function __construct(FormatConfig $config)
     {
@@ -49,11 +47,7 @@ public function getConfig()
     /**
      * A Factory method to return the appropriate formatter for the given mime type.
      *
-     * @param string $mime
-     *
      * @throws FormatException
-     *
-     * @return FormatterInterface
      */
     public function getFormatter(string $mime): FormatterInterface
     {
diff --git a/system/Format/XMLFormatter.php b/system/Format/XMLFormatter.php
index 0fad104e89d0..b32e148a7da9 100644
--- a/system/Format/XMLFormatter.php
+++ b/system/Format/XMLFormatter.php
@@ -55,7 +55,6 @@ public function format($data)
      *
      * @see http://www.codexworld.com/convert-array-to-xml-in-php/
      *
-     * @param array            $data
      * @param SimpleXMLElement $output
      */
     protected function arrayToXML(array $data, &$output)
diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
index c8b59256dff9..b8db857fce54 100644
--- a/system/HTTP/CLIRequest.php
+++ b/system/HTTP/CLIRequest.php
@@ -52,8 +52,6 @@ class CLIRequest extends Request
 
     /**
      * Constructor
-     *
-     * @param App $config
      */
     public function __construct(App $config)
     {
@@ -81,8 +79,6 @@ public function __construct(App $config)
      *
      *      // Routes to /users/21/profile (index is removed for routing sake)
      *      // with the option foo = bar.
-     *
-     * @return string
      */
     public function getPath(): string
     {
@@ -94,8 +90,6 @@ public function getPath(): string
     /**
      * Returns an associative array of all CLI options found, with
      * their values.
-     *
-     * @return array
      */
     public function getOptions(): array
     {
@@ -104,8 +98,6 @@ public function getOptions(): array
 
     /**
      * Returns the path segments.
-     *
-     * @return array
      */
     public function getSegments(): array
     {
@@ -115,8 +107,6 @@ public function getSegments(): array
     /**
      * Returns the value for a single CLI option that was passed in.
      *
-     * @param string $key
-     *
      * @return string|null
      */
     public function getOption(string $key)
@@ -135,10 +125,6 @@ public function getOption(string $key)
      *      ];
      *
      *      getOptionString() = '-foo bar -baz "queue some stuff"'
-     *
-     * @param bool $useLongOpts
-     *
-     * @return string
      */
     public function getOptionString(bool $useLongOpts = false): string
     {
@@ -206,8 +192,6 @@ protected function parseCommand()
 
     /**
      * Determines if this request was made from the command line (CLI).
-     *
-     * @return bool
      */
     public function isCLI(): bool
     {
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index c6df75354b83..3be8214d42b4 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -79,10 +79,7 @@ class CURLRequest extends Request
      *  - timeout
      *  - any other request options to use as defaults.
      *
-     * @param App               $config
-     * @param URI               $uri
      * @param ResponseInterface $response
-     * @param array             $options
      */
     public function __construct(App $config, URI $uri, ?ResponseInterface $response = null, array $options = [])
     {
@@ -106,10 +103,6 @@ public function __construct(App $config, URI $uri, ?ResponseInterface $response
      * URL, it will be merged with $this->baseURI to form a complete URL.
      *
      * @param string $method
-     * @param string $url
-     * @param array  $options
-     *
-     * @return ResponseInterface
      */
     public function request($method, string $url, array $options = []): ResponseInterface
     {
@@ -126,11 +119,6 @@ public function request($method, string $url, array $options = []): ResponseInte
 
     /**
      * Convenience method for sending a GET request.
-     *
-     * @param string $url
-     * @param array  $options
-     *
-     * @return ResponseInterface
      */
     public function get(string $url, array $options = []): ResponseInterface
     {
@@ -139,11 +127,6 @@ public function get(string $url, array $options = []): ResponseInterface
 
     /**
      * Convenience method for sending a DELETE request.
-     *
-     * @param string $url
-     * @param array  $options
-     *
-     * @return ResponseInterface
      */
     public function delete(string $url, array $options = []): ResponseInterface
     {
@@ -152,11 +135,6 @@ public function delete(string $url, array $options = []): ResponseInterface
 
     /**
      * Convenience method for sending a HEAD request.
-     *
-     * @param string $url
-     * @param array  $options
-     *
-     * @return ResponseInterface
      */
     public function head(string $url, array $options = []): ResponseInterface
     {
@@ -165,11 +143,6 @@ public function head(string $url, array $options = []): ResponseInterface
 
     /**
      * Convenience method for sending an OPTIONS request.
-     *
-     * @param string $url
-     * @param array  $options
-     *
-     * @return ResponseInterface
      */
     public function options(string $url, array $options = []): ResponseInterface
     {
@@ -178,11 +151,6 @@ public function options(string $url, array $options = []): ResponseInterface
 
     /**
      * Convenience method for sending a PATCH request.
-     *
-     * @param string $url
-     * @param array  $options
-     *
-     * @return ResponseInterface
      */
     public function patch(string $url, array $options = []): ResponseInterface
     {
@@ -191,11 +159,6 @@ public function patch(string $url, array $options = []): ResponseInterface
 
     /**
      * Convenience method for sending a POST request.
-     *
-     * @param string $url
-     * @param array  $options
-     *
-     * @return ResponseInterface
      */
     public function post(string $url, array $options = []): ResponseInterface
     {
@@ -204,11 +167,6 @@ public function post(string $url, array $options = []): ResponseInterface
 
     /**
      * Convenience method for sending a PUT request.
-     *
-     * @param string $url
-     * @param array  $options
-     *
-     * @return ResponseInterface
      */
     public function put(string $url, array $options = []): ResponseInterface
     {
@@ -218,9 +176,7 @@ public function put(string $url, array $options = []): ResponseInterface
     /**
      * Set the HTTP Authentication.
      *
-     * @param string $username
-     * @param string $password
-     * @param string $type     basic or digest
+     * @param string $type basic or digest
      *
      * @return $this
      */
@@ -238,8 +194,7 @@ public function setAuth(string $username, string $password, string $type = 'basi
     /**
      * Set form data to be sent.
      *
-     * @param array $params
-     * @param bool  $multipart Set TRUE if you are sending CURLFiles
+     * @param bool $multipart Set TRUE if you are sending CURLFiles
      *
      * @return $this
      */
@@ -271,8 +226,6 @@ public function setJSON($data)
     /**
      * Sets the correct settings based on the options array
      * passed in.
-     *
-     * @param array $options
      */
     protected function parseOptions(array $options)
     {
@@ -304,10 +257,6 @@ protected function parseOptions(array $options)
     /**
      * If the $url is a relative URL, will attempt to create
      * a full URL by prepending $this->baseURI to it.
-     *
-     * @param string $url
-     *
-     * @return string
      */
     protected function prepareURL(string $url): string
     {
@@ -327,8 +276,6 @@ protected function prepareURL(string $url): string
      * since users expect a different answer here.
      *
      * @param bool|false $upper Whether to return in upper or lower case.
-     *
-     * @return string
      */
     public function getMethod(bool $upper = false): string
     {
@@ -338,9 +285,6 @@ public function getMethod(bool $upper = false): string
     /**
      * Fires the actual cURL request.
      *
-     * @param string $method
-     * @param string $url
-     *
      * @return ResponseInterface
      */
     public function send(string $method, string $url)
@@ -408,10 +352,6 @@ public function send(string $method, string $url)
     /**
      * Takes all headers current part of this request and adds them
      * to the cURL request.
-     *
-     * @param array $curlOptions
-     *
-     * @return array
      */
     protected function applyRequestHeaders(array $curlOptions = []): array
     {
@@ -441,11 +381,6 @@ protected function applyRequestHeaders(array $curlOptions = []): array
 
     /**
      * Apply method
-     *
-     * @param string $method
-     * @param array  $curlOptions
-     *
-     * @return array
      */
     protected function applyMethod(string $method, array $curlOptions): array
     {
@@ -475,10 +410,6 @@ protected function applyMethod(string $method, array $curlOptions): array
 
     /**
      * Apply body
-     *
-     * @param array $curlOptions
-     *
-     * @return array
      */
     protected function applyBody(array $curlOptions = []): array
     {
@@ -492,8 +423,6 @@ protected function applyBody(array $curlOptions = []): array
     /**
      * Parses the header retrieved from the cURL response into
      * our Response object.
-     *
-     * @param array $headers
      */
     protected function setResponseHeaders(array $headers = [])
     {
@@ -520,9 +449,6 @@ protected function setResponseHeaders(array $headers = [])
     /**
      * Set CURL options
      *
-     * @param array $curlOptions
-     * @param array $config
-     *
      * @throws InvalidArgumentException
      *
      * @return array
@@ -681,10 +607,6 @@ protected function setCURLOptions(array $curlOptions = [], array $config = [])
      * and grabbing the output.
      *
      * @codeCoverageIgnore
-     *
-     * @param array $curlOptions
-     *
-     * @return string
      */
     protected function sendRequest(array $curlOptions = []): string
     {
diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index 19b194842acb..ed19d2d9b020 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -196,8 +196,6 @@ class ContentSecurityPolicy
      * Constructor.
      *
      * Stores our default values from the Config file.
-     *
-     * @param ContentSecurityPolicyConfig $config
      */
     public function __construct(ContentSecurityPolicyConfig $config)
     {
@@ -213,8 +211,6 @@ public function __construct(ContentSecurityPolicyConfig $config)
      *
      * Should be called just prior to sending the response to the user agent.
      *
-     * @param ResponseInterface $response
-     *
      * @return void
      */
     public function finalize(ResponseInterface &$response)
@@ -230,8 +226,6 @@ public function finalize(ResponseInterface &$response)
      * determine what errors need to be addressed before you turn on
      * all filtering.
      *
-     * @param bool $value
-     *
      * @return $this
      */
     public function reportOnly(bool $value = true)
@@ -249,7 +243,6 @@ public function reportOnly(bool $value = true)
      * @see http://www.w3.org/TR/CSP/#directive-base-uri
      *
      * @param array|string $uri
-     * @param bool|null    $explicitReporting
      *
      * @return $this
      */
@@ -271,7 +264,6 @@ public function addBaseURI($uri, ?bool $explicitReporting = null)
      * @see http://www.w3.org/TR/CSP/#directive-child-src
      *
      * @param array|string $uri
-     * @param bool|null    $explicitReporting
      *
      * @return $this
      */
@@ -292,7 +284,6 @@ public function addChildSrc($uri, ?bool $explicitReporting = null)
      * @see http://www.w3.org/TR/CSP/#directive-connect-src
      *
      * @param array|string $uri
-     * @param bool|null    $explicitReporting
      *
      * @return $this
      */
@@ -313,7 +304,6 @@ public function addConnectSrc($uri, ?bool $explicitReporting = null)
      * @see http://www.w3.org/TR/CSP/#directive-default-src
      *
      * @param array|string $uri
-     * @param bool|null    $explicitReporting
      *
      * @return $this
      */
@@ -333,7 +323,6 @@ public function setDefaultSrc($uri, ?bool $explicitReporting = null)
      * @see http://www.w3.org/TR/CSP/#directive-font-src
      *
      * @param array|string $uri
-     * @param bool|null    $explicitReporting
      *
      * @return $this
      */
@@ -351,7 +340,6 @@ public function addFontSrc($uri, ?bool $explicitReporting = null)
      * @see http://www.w3.org/TR/CSP/#directive-form-action
      *
      * @param array|string $uri
-     * @param bool|null    $explicitReporting
      *
      * @return $this
      */
@@ -369,7 +357,6 @@ public function addFormAction($uri, ?bool $explicitReporting = null)
      * @see http://www.w3.org/TR/CSP/#directive-frame-ancestors
      *
      * @param array|string $uri
-     * @param bool|null    $explicitReporting
      *
      * @return $this
      */
@@ -387,7 +374,6 @@ public function addFrameAncestor($uri, ?bool $explicitReporting = null)
      * @see http://www.w3.org/TR/CSP/#directive-frame-src
      *
      * @param array|string $uri
-     * @param bool|null    $explicitReporting
      *
      * @return $this
      */
@@ -405,7 +391,6 @@ public function addFrameSrc($uri, ?bool $explicitReporting = null)
      * @see http://www.w3.org/TR/CSP/#directive-img-src
      *
      * @param array|string $uri
-     * @param bool|null    $explicitReporting
      *
      * @return $this
      */
@@ -423,7 +408,6 @@ public function addImageSrc($uri, ?bool $explicitReporting = null)
      * @see http://www.w3.org/TR/CSP/#directive-media-src
      *
      * @param array|string $uri
-     * @param bool|null    $explicitReporting
      *
      * @return $this
      */
@@ -441,7 +425,6 @@ public function addMediaSrc($uri, ?bool $explicitReporting = null)
      * @see https://www.w3.org/TR/CSP/#directive-manifest-src
      *
      * @param array|string $uri
-     * @param bool|null    $explicitReporting
      *
      * @return $this
      */
@@ -459,7 +442,6 @@ public function addManifestSrc($uri, ?bool $explicitReporting = null)
      * @see http://www.w3.org/TR/CSP/#directive-object-src
      *
      * @param array|string $uri
-     * @param bool|null    $explicitReporting
      *
      * @return $this
      */
@@ -476,8 +458,7 @@ public function addObjectSrc($uri, ?bool $explicitReporting = null)
      *
      * @see http://www.w3.org/TR/CSP/#directive-plugin-types
      *
-     * @param array|string $mime              One or more plugin mime types, separate by spaces
-     * @param bool|null    $explicitReporting
+     * @param array|string $mime One or more plugin mime types, separate by spaces
      *
      * @return $this
      */
@@ -494,8 +475,6 @@ public function addPluginType($mime, ?bool $explicitReporting = null)
      *
      * @see http://www.w3.org/TR/CSP/#directive-report-uri
      *
-     * @param string $uri
-     *
      * @return $this
      */
     public function setReportURI(string $uri)
@@ -511,8 +490,7 @@ public function setReportURI(string $uri)
      *
      * @see http://www.w3.org/TR/CSP/#directive-sandbox
      *
-     * @param array|string $flags             An array of sandbox flags that can be added to the directive.
-     * @param bool|null    $explicitReporting
+     * @param array|string $flags An array of sandbox flags that can be added to the directive.
      *
      * @return $this
      */
@@ -530,7 +508,6 @@ public function addSandbox($flags, ?bool $explicitReporting = null)
      * @see http://www.w3.org/TR/CSP/#directive-connect-src
      *
      * @param array|string $uri
-     * @param bool|null    $explicitReporting
      *
      * @return $this
      */
@@ -548,7 +525,6 @@ public function addScriptSrc($uri, ?bool $explicitReporting = null)
      * @see http://www.w3.org/TR/CSP/#directive-connect-src
      *
      * @param array|string $uri
-     * @param bool|null    $explicitReporting
      *
      * @return $this
      */
@@ -563,8 +539,6 @@ public function addStyleSrc($uri, ?bool $explicitReporting = null)
      * Sets whether the user agents should rewrite URL schemes, changing
      * HTTP to HTTPS.
      *
-     * @param bool $value
-     *
      * @return $this
      */
     public function upgradeInsecureRequests(bool $value = true)
@@ -578,8 +552,6 @@ public function upgradeInsecureRequests(bool $value = true)
      * DRY method to add an string or array to a class property.
      *
      * @param array|string $options
-     * @param string       $target
-     * @param bool|null    $explicitReporting
      *
      * @return void
      */
@@ -604,8 +576,6 @@ protected function addOption($options, string $target, ?bool $explicitReporting
      * placeholders with actual nonces, that we'll then add to our
      * headers.
      *
-     * @param ResponseInterface $response
-     *
      * @return void
      */
     protected function generateNonces(ResponseInterface &$response)
@@ -650,8 +620,6 @@ protected function generateNonces(ResponseInterface &$response)
      * Content-Security-Policy and Content-Security-Policy-Report-Only headers
      * with their values to the response object.
      *
-     * @param ResponseInterface $response
-     *
      * @return void
      */
     protected function buildHeaders(ResponseInterface &$response)
@@ -736,7 +704,6 @@ protected function buildHeaders(ResponseInterface &$response)
      * array might have options that are geared toward either the regular or the
      * reportOnly header, since it's viable to have both simultaneously.
      *
-     * @param string            $name
      * @param array|string|null $values
      *
      * @return void
diff --git a/system/HTTP/DownloadResponse.php b/system/HTTP/DownloadResponse.php
index bc1825442769..ed343dbe4b08 100644
--- a/system/HTTP/DownloadResponse.php
+++ b/system/HTTP/DownloadResponse.php
@@ -71,9 +71,6 @@ class DownloadResponse extends Response
 
     /**
      * Constructor.
-     *
-     * @param string $filename
-     * @param bool   $setMime
      */
     public function __construct(string $filename, bool $setMime)
     {
@@ -88,8 +85,6 @@ public function __construct(string $filename, bool $setMime)
 
     /**
      * set download for binary string.
-     *
-     * @param string $binary
      */
     public function setBinary(string $binary)
     {
@@ -102,8 +97,6 @@ public function setBinary(string $binary)
 
     /**
      * set download for file.
-     *
-     * @param string $filepath
      */
     public function setFilePath(string $filepath)
     {
@@ -117,8 +110,6 @@ public function setFilePath(string $filepath)
     /**
      * set name for the download.
      *
-     * @param string $filename
-     *
      * @return $this
      */
     public function setFileName(string $filename)
@@ -130,8 +121,6 @@ public function setFileName(string $filename)
 
     /**
      * get content length.
-     *
-     * @return int
      */
     public function getContentLength(): int
     {
@@ -170,8 +159,6 @@ private function setContentTypeByMimeType()
 
     /**
      * get download filename.
-     *
-     * @return string
      */
     private function getDownloadFileName(): string
     {
@@ -197,8 +184,6 @@ private function getDownloadFileName(): string
 
     /**
      * get Content-Disposition Header string.
-     *
-     * @return string
      */
     private function getContentDisposition(): string
     {
@@ -222,9 +207,6 @@ private function getContentDisposition(): string
     /**
      * Disallows status changing.
      *
-     * @param int    $code
-     * @param string $reason
-     *
      * @throws DownloadException
      */
     public function setStatusCode(int $code, string $reason = '')
@@ -236,9 +218,6 @@ public function setStatusCode(int $code, string $reason = '')
      * Sets the Content Type header for this response with the mime type
      * and, optionally, the charset.
      *
-     * @param string $mime
-     * @param string $charset
-     *
      * @return ResponseInterface
      */
     public function setContentType(string $mime, string $charset = 'UTF-8')
@@ -268,8 +247,6 @@ public function noCache(): self
     /**
      * Disables cache configuration.
      *
-     * @param array $options
-     *
      * @throws DownloadException
      */
     public function setCache(array $options = [])
diff --git a/system/HTTP/Exceptions/HTTPException.php b/system/HTTP/Exceptions/HTTPException.php
index cfed948a117f..966c3c7fd7e5 100644
--- a/system/HTTP/Exceptions/HTTPException.php
+++ b/system/HTTP/Exceptions/HTTPException.php
@@ -33,8 +33,6 @@ public static function forMissingCurl()
     /**
      * For CurlRequest
      *
-     * @param string $cert
-     *
      * @return HTTPException
      */
     public static function forSSLCertNotFound(string $cert)
@@ -45,8 +43,6 @@ public static function forSSLCertNotFound(string $cert)
     /**
      * For CurlRequest
      *
-     * @param string $key
-     *
      * @return HTTPException
      */
     public static function forInvalidSSLKey(string $key)
@@ -57,9 +53,6 @@ public static function forInvalidSSLKey(string $key)
     /**
      * For CurlRequest
      *
-     * @param string $errorNum
-     * @param string $error
-     *
      * @return HTTPException
      *
      * @codeCoverageIgnore
@@ -72,8 +65,6 @@ public static function forCurlError(string $errorNum, string $error)
     /**
      * For IncomingRequest
      *
-     * @param string $type
-     *
      * @return HTTPException
      */
     public static function forInvalidNegotiationType(string $type)
@@ -84,8 +75,6 @@ public static function forInvalidNegotiationType(string $type)
     /**
      * For Message
      *
-     * @param string $protocols
-     *
      * @return HTTPException
      */
     public static function forInvalidHTTPProtocol(string $protocols)
@@ -106,8 +95,6 @@ public static function forEmptySupportedNegotiations()
     /**
      * For RedirectResponse
      *
-     * @param string $route
-     *
      * @return HTTPException
      */
     public static function forInvalidRedirectRoute(string $route)
@@ -128,8 +115,6 @@ public static function forMissingResponseStatus()
     /**
      * For Response
      *
-     * @param int $code
-     *
      * @return HTTPException
      */
     public static function forInvalidStatusCode(int $code)
@@ -140,8 +125,6 @@ public static function forInvalidStatusCode(int $code)
     /**
      * For Response
      *
-     * @param int $code
-     *
      * @return HTTPException
      */
     public static function forUnkownStatusCode(int $code)
@@ -152,8 +135,6 @@ public static function forUnkownStatusCode(int $code)
     /**
      * For URI
      *
-     * @param string $uri
-     *
      * @return HTTPException
      */
     public static function forUnableToParseURI(string $uri)
@@ -164,8 +145,6 @@ public static function forUnableToParseURI(string $uri)
     /**
      * For URI
      *
-     * @param int $segment
-     *
      * @return HTTPException
      */
     public static function forURISegmentOutOfRange(int $segment)
@@ -176,8 +155,6 @@ public static function forURISegmentOutOfRange(int $segment)
     /**
      * For URI
      *
-     * @param int $port
-     *
      * @return HTTPException
      */
     public static function forInvalidPort(int $port)
@@ -208,8 +185,6 @@ public static function forAlreadyMoved()
     /**
      * For Uploaded file move
      *
-     * @param string|null $path
-     *
      * @return HTTPException
      */
     public static function forInvalidFile(?string $path = null)
@@ -220,10 +195,6 @@ public static function forInvalidFile(?string $path = null)
     /**
      * For Uploaded file move
      *
-     * @param string $source
-     * @param string $target
-     * @param string $error
-     *
      * @return HTTPException
      */
     public static function forMoveFailed(string $source, string $target, string $error)
@@ -234,8 +205,6 @@ public static function forMoveFailed(string $source, string $target, string $err
     /**
      * For Invalid SameSite attribute setting
      *
-     * @param string $samesite
-     *
      * @return HTTPException
      *
      * @deprecated Use `CookieException::forInvalidSameSite()` instead.
diff --git a/system/HTTP/Files/FileCollection.php b/system/HTTP/Files/FileCollection.php
index 208717c82850..10e58c2eb824 100644
--- a/system/HTTP/Files/FileCollection.php
+++ b/system/HTTP/Files/FileCollection.php
@@ -48,8 +48,6 @@ public function all()
     /**
      * Attempts to get a single file from the collection of uploaded files.
      *
-     * @param string $name
-     *
      * @return UploadedFile|null
      */
     public function getFile(string $name)
@@ -77,8 +75,6 @@ public function getFile(string $name)
     /**
      * Verify if a file exist in the collection of uploaded files and is have been uploaded with multiple option.
      *
-     * @param string $name
-     *
      * @return array|null
      */
     public function getFileMultiple(string $name)
@@ -110,8 +106,6 @@ public function getFileMultiple(string $name)
      * this request.
      *
      * @param string $fileID The name of the uploaded file (from the input)
-     *
-     * @return bool
      */
     public function hasFile(string $fileID): bool
     {
@@ -165,8 +159,6 @@ protected function populateFiles()
      * Given a file array, will create UploadedFile instances. Will
      * loop over an array and create objects for each.
      *
-     * @param array $array
-     *
      * @return array|UploadedFile
      */
     protected function createFileObject(array $array)
@@ -202,10 +194,6 @@ protected function createFileObject(array $array)
      * of this method.
      *
      * @see http://php.net/manual/en/reserved.variables.files.php#118294
-     *
-     * @param array $data
-     *
-     * @return array
      */
     protected function fixFilesArray(array $data): array
     {
diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
index 0fbdea83dcb6..17e9130694fe 100644
--- a/system/HTTP/Files/UploadedFile.php
+++ b/system/HTTP/Files/UploadedFile.php
@@ -163,8 +163,6 @@ public function move(string $targetPath, ?string $name = null, bool $overwrite =
      * create file target path if
      * the set path does not exist
      *
-     * @param string $path
-     *
      * @return string The path set or created.
      */
     protected function setPath(string $path): string
@@ -185,8 +183,6 @@ protected function setPath(string $path): string
      * Returns whether the file has been moved or not. If it has,
      * the move() method will not work and certain properties, like
      * the tempName, will no longer be available.
-     *
-     * @return bool
      */
     public function hasMoved(): bool
     {
@@ -215,8 +211,6 @@ public function getError(): int
 
     /**
      * Get error string
-     *
-     * @return string
      */
     public function getErrorString(): string
     {
@@ -262,8 +256,6 @@ public function getName(): string
 
     /**
      * Returns the name of the file as provided by the client during upload.
-     *
-     * @return string
      */
     public function getClientName(): string
     {
@@ -272,8 +264,6 @@ public function getClientName(): string
 
     /**
      * Gets the temporary filename where the file was uploaded to.
-     *
-     * @return string
      */
     public function getTempName(): string
     {
@@ -301,8 +291,6 @@ public function getExtension(): string
      * mime type. In contrast to getExtension, this method will return
      * an empty string if it fails to determine an extension instead of
      * falling back to the unsecure clientExtension.
-     *
-     * @return string
      */
     public function guessExtension(): string
     {
@@ -313,8 +301,6 @@ public function guessExtension(): string
      * Returns the original file extension, based on the file name that
      * was uploaded. This is NOT a trusted source.
      * For a trusted version, use guessExtension() instead.
-     *
-     * @return string
      */
     public function getClientExtension(): string
     {
@@ -324,8 +310,6 @@ public function getClientExtension(): string
     /**
      * Returns whether the file was uploaded successfully, based on whether
      * it was uploaded via HTTP and has no errors.
-     *
-     * @return bool
      */
     public function isValid(): bool
     {
diff --git a/system/HTTP/Files/UploadedFileInterface.php b/system/HTTP/Files/UploadedFileInterface.php
index c6a06e4e45ed..37c18554a106 100644
--- a/system/HTTP/Files/UploadedFileInterface.php
+++ b/system/HTTP/Files/UploadedFileInterface.php
@@ -69,8 +69,6 @@ public function move(string $targetPath, ?string $name = null);
      * Returns whether the file has been moved or not. If it has,
      * the move() method will not work and certain properties, like
      * the tempName, will no longer be available.
-     *
-     * @return bool
      */
     public function hasMoved(): bool;
 
@@ -108,8 +106,6 @@ public function getName(): string;
 
     /**
      * Gets the temporary filename where the file was uploaded to.
-     *
-     * @return string
      */
     public function getTempName(): string;
 
@@ -117,8 +113,6 @@ public function getTempName(): string;
      * Returns the original file extension, based on the file name that
      * was uploaded. This is NOT a trusted source.
      * For a trusted version, use guessExtension() instead.
-     *
-     * @return string
      */
     public function getClientExtension(): string;
 
@@ -126,16 +120,12 @@ public function getClientExtension(): string;
      * Returns the mime type as provided by the client.
      * This is NOT a trusted value.
      * For a trusted version, use getMimeType() instead.
-     *
-     * @return string
      */
     public function getClientMimeType(): string;
 
     /**
      * Returns whether the file was uploaded successfully, based on whether
      * it was uploaded via HTTP and has no errors.
-     *
-     * @return bool
      */
     public function isValid(): bool;
 
@@ -145,12 +135,6 @@ public function isValid(): bool;
      * First, it checks whether the delimiter is present in the filename, if it is, then it checks whether the
      * last element is an integer as there may be cases that the delimiter may be present in the filename.
      * For the all other cases, it appends an integer starting from zero before the file's extension.
-     *
-     * @param string $destination
-     * @param string $delimiter
-     * @param int    $i
-     *
-     * @return string
      */
     public function getDestination(string $destination, string $delimiter = '_', int $i = 0): string;
 }
diff --git a/system/HTTP/Header.php b/system/HTTP/Header.php
index 402eabf65e9b..9cab888d4473 100644
--- a/system/HTTP/Header.php
+++ b/system/HTTP/Header.php
@@ -36,7 +36,6 @@ class Header
     /**
      * Header constructor. name is mandatory, if a value is provided, it will be set.
      *
-     * @param string            $name
      * @param array|string|null $value
      */
     public function __construct(string $name, $value = null)
@@ -47,8 +46,6 @@ public function __construct(string $name, $value = null)
 
     /**
      * Returns the name of the header, in the same case it was set.
-     *
-     * @return string
      */
     public function getName(): string
     {
@@ -69,8 +66,6 @@ public function getValue()
     /**
      * Sets the name of the header, overwriting any previous value.
      *
-     * @param string $name
-     *
      * @return $this
      */
     public function setName(string $name)
@@ -179,8 +174,6 @@ public function getValueLine(): string
     /**
      * Returns a representation of the entire header string, including
      * the header name and all values converted to the proper format.
-     *
-     * @return string
      */
     public function __toString(): string
     {
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 2357bf2da8ac..4dec7ebc610f 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -188,9 +188,6 @@ public function detectLocale($config)
      * Sets up our URI object based on the information we have. This is
      * either provided by the user in the baseURL Config setting, or
      * determined from the environment as needed.
-     *
-     * @param string $protocol
-     * @param string $baseURL
      */
     protected function detectURI(string $protocol, string $baseURL)
     {
@@ -204,10 +201,6 @@ protected function detectURI(string $protocol, string $baseURL)
     /**
      * Detects the relative path based on
      * the URIProtocol Config setting.
-     *
-     * @param string $protocol
-     *
-     * @return string
      */
     public function detectPath(string $protocol = ''): string
     {
@@ -293,8 +286,6 @@ protected function parseRequestURI(): string
      * Parse QUERY_STRING
      *
      * Will parse QUERY_STRING and automatically detect the URI from it.
-     *
-     * @return string
      */
     protected function parseQueryString(): string
     {
@@ -323,12 +314,6 @@ protected function parseQueryString(): string
     /**
      * Provides a convenient way to work with the Negotiate class
      * for content negotiation.
-     *
-     * @param string $type
-     * @param array  $supported
-     * @param bool   $strictMatch
-     *
-     * @return string
      */
     public function negotiate(string $type, array $supported, bool $strictMatch = false): string
     {
@@ -355,8 +340,6 @@ public function negotiate(string $type, array $supported, bool $strictMatch = fa
 
     /**
      * Determines if this request was made from the command line (CLI).
-     *
-     * @return bool
      */
     public function isCLI(): bool
     {
@@ -365,8 +348,6 @@ public function isCLI(): bool
 
     /**
      * Test to see if a request contains the HTTP_X_REQUESTED_WITH header.
-     *
-     * @return bool
      */
     public function isAJAX(): bool
     {
@@ -376,8 +357,6 @@ public function isAJAX(): bool
     /**
      * Attempts to detect if the current connection is secure through
      * a few different methods.
-     *
-     * @return bool
      */
     public function isSecure(): bool
     {
@@ -440,8 +419,6 @@ public function setPath(string $path, ?App $config = null)
     /**
      * Returns the path relative to SCRIPT_NAME,
      * running detection as necessary.
-     *
-     * @return string
      */
     public function getPath(): string
     {
@@ -455,8 +432,6 @@ public function getPath(): string
     /**
      * Sets the locale string for this request.
      *
-     * @param string $locale
-     *
      * @return IncomingRequest
      */
     public function setLocale(string $locale)
@@ -476,8 +451,6 @@ public function setLocale(string $locale)
     /**
      * Gets the current locale, with a fallback to the default
      * locale if none is set.
-     *
-     * @return string
      */
     public function getLocale(): string
     {
@@ -486,8 +459,6 @@ public function getLocale(): string
 
     /**
      * Returns the default locale as set in Config\App.php
-     *
-     * @return string
      */
     public function getDefaultLocale(): string
     {
@@ -682,8 +653,6 @@ public function getUserAgent()
      * with redirect_with_input(). It first checks for the data in the old
      * POST data, then the old GET data and finally check for dot arrays
      *
-     * @param string $key
-     *
      * @return mixed
      */
     public function getOldInput(string $key)
@@ -729,8 +698,6 @@ public function getOldInput(string $key)
     /**
      * Returns an array of all files that have been uploaded with this
      * request. Each file is represented by an UploadedFile instance.
-     *
-     * @return array
      */
     public function getFiles(): array
     {
@@ -745,8 +712,6 @@ public function getFiles(): array
      * Verify if a file exist, by the name of the input field used to upload it, in the collection
      * of uploaded files and if is have been uploaded with multiple option.
      *
-     * @param string $fileID
-     *
      * @return array|null
      */
     public function getFileMultiple(string $fileID)
@@ -762,8 +727,6 @@ public function getFileMultiple(string $fileID)
      * Retrieves a single file by the name of the input field used
      * to upload it.
      *
-     * @param string $fileID
-     *
      * @return UploadedFile|null
      */
     public function getFile(string $fileID)
@@ -780,10 +743,6 @@ public function getFile(string $fileID)
      *
      * Do some final cleaning of the URI and return it, currently only used in static::_parse_request_uri()
      *
-     * @param string $uri
-     *
-     * @return string
-     *
      * @deprecated Use URI::removeDotSegments() directly
      */
     protected function removeRelativeDirectory(string $uri): string
diff --git a/system/HTTP/Message.php b/system/HTTP/Message.php
index 37c2e7d19c20..99a4e39588b9 100644
--- a/system/HTTP/Message.php
+++ b/system/HTTP/Message.php
@@ -71,8 +71,6 @@ public function getHeaders(): array
      * Returns a single header object. If multiple headers with the same
      * name exist, then will return an array of header objects.
      *
-     * @param string $name
-     *
      * @return array|Header|null
      *
      * @deprecated Use Message::header() to make room for PSR-7
@@ -86,10 +84,6 @@ public function getHeader(string $name)
 
     /**
      * Determines whether a header exists.
-     *
-     * @param string $name
-     *
-     * @return bool
      */
     public function hasHeader(string $name): bool
     {
@@ -108,10 +102,6 @@ public function hasHeader(string $name): bool
      * NOTE: Not all header values may be appropriately represented using
      * comma concatenation. For such headers, use getHeader() instead
      * and supply your own delimiter when concatenating.
-     *
-     * @param string $name
-     *
-     * @return string
      */
     public function getHeaderLine(string $name): string
     {
@@ -126,8 +116,6 @@ public function getHeaderLine(string $name): string
 
     /**
      * Returns the HTTP Protocol Version.
-     *
-     * @return string
      */
     public function getProtocolVersion(): string
     {
diff --git a/system/HTTP/MessageInterface.php b/system/HTTP/MessageInterface.php
index d5cd77066723..2addc2b2a80a 100644
--- a/system/HTTP/MessageInterface.php
+++ b/system/HTTP/MessageInterface.php
@@ -61,7 +61,6 @@ public function header($name);
     /**
      * Sets a header and it's value.
      *
-     * @param string            $name
      * @param array|string|null $value
      *
      * @return $this
@@ -71,8 +70,6 @@ public function setHeader(string $name, $value);
     /**
      * Removes a header from the list of headers we track.
      *
-     * @param string $name
-     *
      * @return $this
      */
     public function removeHeader(string $name);
@@ -81,9 +78,6 @@ public function removeHeader(string $name);
      * Adds an additional header value to any headers that accept
      * multiple values (i.e. are an array or implement ArrayAccess)
      *
-     * @param string      $name
-     * @param string|null $value
-     *
      * @return $this
      */
     public function appendHeader(string $name, ?string $value);
@@ -92,9 +86,6 @@ public function appendHeader(string $name, ?string $value);
      * Adds an additional header value to any headers that accept
      * multiple values (i.e. are an array or implement ArrayAccess)
      *
-     * @param string $name
-     * @param string $value
-     *
      * @return $this
      */
     public function prependHeader(string $name, string $value);
@@ -102,8 +93,6 @@ public function prependHeader(string $name, string $value);
     /**
      * Sets the HTTP protocol version.
      *
-     * @param string $version
-     *
      * @throws HTTPException For invalid protocols
      *
      * @return $this
diff --git a/system/HTTP/MessageTrait.php b/system/HTTP/MessageTrait.php
index 9f2cd2447e37..e4fb73841c1d 100644
--- a/system/HTTP/MessageTrait.php
+++ b/system/HTTP/MessageTrait.php
@@ -134,7 +134,6 @@ public function header($name)
     /**
      * Sets a header and it's value.
      *
-     * @param string            $name
      * @param array|string|null $value
      *
      * @return $this
@@ -162,8 +161,6 @@ public function setHeader(string $name, $value): self
     /**
      * Removes a header from the list of headers we track.
      *
-     * @param string $name
-     *
      * @return $this
      */
     public function removeHeader(string $name): self
@@ -178,9 +175,6 @@ public function removeHeader(string $name): self
      * Adds an additional header value to any headers that accept
      * multiple values (i.e. are an array or implement ArrayAccess)
      *
-     * @param string      $name
-     * @param string|null $value
-     *
      * @return $this
      */
     public function appendHeader(string $name, ?string $value): self
@@ -198,9 +192,6 @@ public function appendHeader(string $name, ?string $value): self
      * Adds an additional header value to any headers that accept
      * multiple values (i.e. are an array or implement ArrayAccess)
      *
-     * @param string $name
-     * @param string $value
-     *
      * @return $this
      */
     public function prependHeader(string $name, string $value): self
@@ -215,10 +206,6 @@ public function prependHeader(string $name, string $value): self
     /**
      * Takes a header name in any case, and returns the
      * normal-case version of the header.
-     *
-     * @param string $name
-     *
-     * @return string
      */
     protected function getHeaderName(string $name): string
     {
@@ -228,8 +215,6 @@ protected function getHeaderName(string $name): string
     /**
      * Sets the HTTP protocol version.
      *
-     * @param string $version
-     *
      * @throws HTTPException For invalid protocols
      *
      * @return $this
diff --git a/system/HTTP/Negotiate.php b/system/HTTP/Negotiate.php
index ef87f738c1ad..b379a6e16999 100644
--- a/system/HTTP/Negotiate.php
+++ b/system/HTTP/Negotiate.php
@@ -33,8 +33,6 @@ class Negotiate
 
     /**
      * Constructor
-     *
-     * @param RequestInterface|null $request
      */
     public function __construct(?RequestInterface $request = null)
     {
@@ -46,8 +44,6 @@ public function __construct(?RequestInterface $request = null)
     /**
      * Stores the request instance to grab the headers from.
      *
-     * @param RequestInterface $request
-     *
      * @return $this
      */
     public function setRequest(RequestInterface $request)
@@ -65,11 +61,8 @@ public function setRequest(RequestInterface $request)
      * If no match is found, the first, highest-ranking client requested
      * type is returned.
      *
-     * @param array $supported
-     * @param bool  $strictMatch If TRUE, will return an empty string when no match found.
-     *                           If FALSE, will return the first supported element.
-     *
-     * @return string
+     * @param bool $strictMatch If TRUE, will return an empty string when no match found.
+     *                          If FALSE, will return the first supported element.
      */
     public function media(array $supported, bool $strictMatch = false): string
     {
@@ -83,10 +76,6 @@ public function media(array $supported, bool $strictMatch = false): string
      *
      * If no match is found, the first, highest-ranking client requested
      * type is returned.
-     *
-     * @param array $supported
-     *
-     * @return string
      */
     public function charset(array $supported): string
     {
@@ -108,10 +97,6 @@ public function charset(array $supported): string
      *
      * If no match is found, the first, highest-ranking client requested
      * type is returned.
-     *
-     * @param array $supported
-     *
-     * @return string
      */
     public function encoding(array $supported = []): string
     {
@@ -127,10 +112,6 @@ public function encoding(array $supported = []): string
      *
      * If no match is found, the first, highest-ranking client requested
      * type is returned.
-     *
-     * @param array $supported
-     *
-     * @return string
      */
     public function language(array $supported): string
     {
@@ -195,10 +176,6 @@ protected function getBestMatch(array $supported, ?string $header = null, bool $
      * Parses an Accept* header into it's multiple values.
      *
      * This is based on code from Aura.Accept library.
-     *
-     * @param string $header
-     *
-     * @return array
      */
     public function parseHeader(string $header): array
     {
@@ -277,12 +254,7 @@ public function parseHeader(string $header): array
     /**
      * Match-maker
      *
-     * @param array  $acceptable
-     * @param string $supported
-     * @param bool   $enforceTypes
-     * @param bool   $matchLocales
-     *
-     * @return bool
+     * @param bool $matchLocales
      */
     protected function match(array $acceptable, string $supported, bool $enforceTypes = false, $matchLocales = false): bool
     {
@@ -313,11 +285,6 @@ protected function match(array $acceptable, string $supported, bool $enforceType
     /**
      * Checks two Accept values with matching 'values' to see if their
      * 'params' are the same.
-     *
-     * @param array $acceptable
-     * @param array $supported
-     *
-     * @return bool
      */
     protected function matchParameters(array $acceptable, array $supported): bool
     {
@@ -339,11 +306,6 @@ protected function matchParameters(array $acceptable, array $supported): bool
     /**
      * Compares the types/subtypes of an acceptable Media type and
      * the supported string.
-     *
-     * @param array $acceptable
-     * @param array $supported
-     *
-     * @return bool
      */
     public function matchTypes(array $acceptable, array $supported): bool
     {
@@ -369,11 +331,6 @@ public function matchTypes(array $acceptable, array $supported): bool
     /**
      * Will match locales against their broader pairs, so that fr-FR would
      * match a supported localed of fr
-     *
-     * @param array $acceptable
-     * @param array $supported
-     *
-     * @return bool
      */
     public function matchLocales(array $acceptable, array $supported): bool
     {
diff --git a/system/HTTP/RedirectResponse.php b/system/HTTP/RedirectResponse.php
index 3ff94ce94080..54e1ae12f36d 100644
--- a/system/HTTP/RedirectResponse.php
+++ b/system/HTTP/RedirectResponse.php
@@ -24,9 +24,8 @@ class RedirectResponse extends Response
      * Sets the URI to redirect to and, optionally, the HTTP status code to use.
      * If no code is provided it will be automatically determined.
      *
-     * @param string   $uri    The URI to redirect to
-     * @param int|null $code   HTTP status code
-     * @param string   $method
+     * @param string   $uri  The URI to redirect to
+     * @param int|null $code HTTP status code
      *
      * @return $this
      */
@@ -45,11 +44,6 @@ public function to(string $uri, ?int $code = null, string $method = 'auto')
      * Sets the URI to redirect to but as a reverse-routed or named route
      * instead of a raw URI.
      *
-     * @param string $route
-     * @param array  $params
-     * @param int    $code
-     * @param string $method
-     *
      * @throws HTTPException
      *
      * @return $this
@@ -71,9 +65,6 @@ public function route(string $route, array $params = [], int $code = 302, string
      * Example:
      *  return redirect()->back();
      *
-     * @param int|null $code
-     * @param string   $method
-     *
      * @return $this
      */
     public function back(?int $code = null, string $method = 'auto')
@@ -115,7 +106,6 @@ public function withInput()
     /**
      * Adds a key and message to the session as Flashdata.
      *
-     * @param string       $key
      * @param array|string $message
      *
      * @return $this
diff --git a/system/HTTP/Request.php b/system/HTTP/Request.php
index d6db28d59007..6294295db4df 100644
--- a/system/HTTP/Request.php
+++ b/system/HTTP/Request.php
@@ -72,8 +72,6 @@ public function __construct($config = null)
      * @param string $ip    IP Address
      * @param string $which IP protocol: 'ipv4' or 'ipv6'
      *
-     * @return bool
-     *
      * @deprecated Use Validation instead
      *
      * @codeCoverageIgnore
@@ -88,8 +86,6 @@ public function isValidIP(?string $ip = null, ?string $which = null): bool
      *
      * @param bool $upper Whether to return in upper or lower case.
      *
-     * @return string
-     *
      * @deprecated The $upper functionality will be removed and this will revert to its PSR-7 equivalent
      *
      * @codeCoverageIgnore
@@ -102,8 +98,6 @@ public function getMethod(bool $upper = false): string
     /**
      * Sets the request method. Used when spoofing the request.
      *
-     * @param string $method
-     *
      * @return Request
      *
      * @deprecated Use withMethod() instead for immutability
diff --git a/system/HTTP/RequestInterface.php b/system/HTTP/RequestInterface.php
index a1f77b64613a..e7bc14a3f361 100644
--- a/system/HTTP/RequestInterface.php
+++ b/system/HTTP/RequestInterface.php
@@ -34,8 +34,6 @@ public function getIPAddress(): string;
      * @param string $ip    IP Address
      * @param string $which IP protocol: 'ipv4' or 'ipv6'
      *
-     * @return bool
-     *
      * @deprecated Use Validation instead
      */
     public function isValidIP(string $ip, ?string $which = null): bool;
@@ -46,8 +44,6 @@ public function isValidIP(string $ip, ?string $which = null): bool;
      *
      * @param bool $upper Whether to return in upper or lower case.
      *
-     * @return string
-     *
      * @deprecated The $upper functionality will be removed and this will revert to its PSR-7 equivalent
      */
     public function getMethod(bool $upper = false): string;
diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php
index 9a6e151997a7..50444a481acf 100644
--- a/system/HTTP/RequestTrait.php
+++ b/system/HTTP/RequestTrait.php
@@ -186,8 +186,7 @@ public function getEnv($index = null, $filter = null, $flags = null)
     /**
      * Allows manually setting the value of PHP global, like $_GET, $_POST, etc.
      *
-     * @param string $method
-     * @param mixed  $value
+     * @param mixed $value
      *
      * @return $this
      */
@@ -303,8 +302,6 @@ public function fetchGlobal(string $method, $index = null, ?int $filter = null,
     /**
      * Saves a copy of the current state of one of several PHP globals
      * so we can retrieve them later.
-     *
-     * @param string $method
      */
     protected function populateGlobals(string $method)
     {
diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php
index a96829cc0df4..70f31bd35f72 100644
--- a/system/HTTP/Response.php
+++ b/system/HTTP/Response.php
@@ -191,8 +191,6 @@ public function __construct($config)
      * Note that this is not a part of the interface so
      * should not be relied on outside of internal testing.
      *
-     * @param bool $pretend
-     *
      * @return $this
      */
     public function pretend(bool $pretend = true)
@@ -224,9 +222,6 @@ public function getStatusCode(): int
      *
      * @see http://tools.ietf.org/html/rfc7231#section-6
      * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
-     *
-     * @return string
-     *
      * @deprecated Use getReasonPhrase()
      *
      * @codeCoverageIgnore
diff --git a/system/HTTP/ResponseInterface.php b/system/HTTP/ResponseInterface.php
index 92b38c688782..c1d615c515a8 100644
--- a/system/HTTP/ResponseInterface.php
+++ b/system/HTTP/ResponseInterface.php
@@ -141,9 +141,6 @@ public function setStatusCode(int $code, string $reason = '');
      *
      * @see http://tools.ietf.org/html/rfc7231#section-6
      * @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
-     *
-     * @return string
-     *
      * @deprecated Use getReasonPhrase()
      */
     public function getReason(): string;
@@ -155,8 +152,6 @@ public function getReason(): string;
     /**
      * Sets the date header
      *
-     * @param DateTime $date
-     *
      * @return ResponseInterface
      */
     public function setDate(DateTime $date);
@@ -174,8 +169,6 @@ public function setLastModified($date);
     /**
      * Set the Link Header
      *
-     * @param PagerInterface $pager
-     *
      * @see http://tools.ietf.org/html/rfc5988
      *
      * @return Response
@@ -188,9 +181,6 @@ public function setLink(PagerInterface $pager);
      * Sets the Content Type header for this response with the mime type
      * and, optionally, the charset.
      *
-     * @param string $mime
-     * @param string $charset
-     *
      * @return ResponseInterface
      */
     public function setContentType(string $mime, string $charset = 'UTF-8');
@@ -203,7 +193,6 @@ public function setContentType(string $mime, string $charset = 'UTF-8');
      * Converts the $body into JSON and sets the Content Type header.
      *
      * @param array|string $body
-     * @param bool         $unencoded
      *
      * @return $this
      */
@@ -272,8 +261,6 @@ public function noCache();
      *  - proxy-revalidate
      *  - no-transform
      *
-     * @param array $options
-     *
      * @return ResponseInterface
      */
     public function setCache(array $options = []);
@@ -339,21 +326,12 @@ public function setCookie(
 
     /**
      * Checks to see if the Response has a specified cookie or not.
-     *
-     * @param string      $name
-     * @param string|null $value
-     * @param string      $prefix
-     *
-     * @return bool
      */
     public function hasCookie(string $name, ?string $value = null, string $prefix = ''): bool;
 
     /**
      * Returns the cookie
      *
-     * @param string|null $name
-     * @param string      $prefix
-     *
      * @return Cookie|Cookie[]|null
      */
     public function getCookie(?string $name = null, string $prefix = '');
@@ -361,11 +339,6 @@ public function getCookie(?string $name = null, string $prefix = '');
     /**
      * Sets a cookie to be deleted when the response is sent.
      *
-     * @param string $name
-     * @param string $domain
-     * @param string $path
-     * @param string $prefix
-     *
      * @return $this
      */
     public function deleteCookie(string $name = '', string $domain = '', string $path = '/', string $prefix = '');
@@ -384,9 +357,8 @@ public function getCookies();
     /**
      * Perform a redirect to a new URL, in two flavors: header or location.
      *
-     * @param string $uri    The URI to redirect to
-     * @param string $method
-     * @param int    $code   The type of redirection, defaults to 302
+     * @param string $uri  The URI to redirect to
+     * @param int    $code The type of redirection, defaults to 302
      *
      * @throws HTTPException For invalid status code.
      *
diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
index 2bb0cac68aa3..2b1205a5d47a 100644
--- a/system/HTTP/ResponseTrait.php
+++ b/system/HTTP/ResponseTrait.php
@@ -169,8 +169,6 @@ public function setStatusCode(int $code, string $reason = '')
     /**
      * Sets the date header
      *
-     * @param DateTime $date
-     *
      * @return Response
      */
     public function setDate(DateTime $date)
@@ -185,8 +183,6 @@ public function setDate(DateTime $date)
     /**
      * Set the Link Header
      *
-     * @param PagerInterface $pager
-     *
      * @see http://tools.ietf.org/html/rfc5988
      *
      * @return Response
@@ -220,9 +216,6 @@ public function setLink(PagerInterface $pager)
      * Sets the Content Type header for this response with the mime type
      * and, optionally, the charset.
      *
-     * @param string $mime
-     * @param string $charset
-     *
      * @return Response
      */
     public function setContentType(string $mime, string $charset = 'UTF-8')
@@ -242,7 +235,6 @@ public function setContentType(string $mime, string $charset = 'UTF-8')
      * Converts the $body into JSON and sets the Content Type header.
      *
      * @param array|string $body
-     * @param bool         $unencoded
      *
      * @return $this
      */
@@ -376,8 +368,6 @@ public function noCache()
      *  - proxy-revalidate
      *  - no-transform
      *
-     * @param array $options
-     *
      * @return Response
      */
     public function setCache(array $options = [])
@@ -499,9 +489,8 @@ public function sendBody()
     /**
      * Perform a redirect to a new URL, in two flavors: header or location.
      *
-     * @param string $uri    The URI to redirect to
-     * @param string $method
-     * @param int    $code   The type of redirection, defaults to 302
+     * @param string $uri  The URI to redirect to
+     * @param int    $code The type of redirection, defaults to 302
      *
      * @throws HTTPException For invalid status code.
      *
@@ -609,12 +598,6 @@ public function getCookieStore()
 
     /**
      * Checks to see if the Response has a specified cookie or not.
-     *
-     * @param string      $name
-     * @param string|null $value
-     * @param string      $prefix
-     *
-     * @return bool
      */
     public function hasCookie(string $name, ?string $value = null, string $prefix = ''): bool
     {
@@ -626,9 +609,6 @@ public function hasCookie(string $name, ?string $value = null, string $prefix =
     /**
      * Returns the cookie
      *
-     * @param string|null $name
-     * @param string      $prefix
-     *
      * @return Cookie|Cookie[]|null
      */
     public function getCookie(?string $name = null, string $prefix = '')
@@ -651,11 +631,6 @@ public function getCookie(?string $name = null, string $prefix = '')
     /**
      * Sets a cookie to be deleted when the response is sent.
      *
-     * @param string $name
-     * @param string $domain
-     * @param string $path
-     * @param string $prefix
-     *
      * @return $this
      */
     public function deleteCookie(string $name = '', string $domain = '', string $path = '/', string $prefix = '')
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index a0a867553182..f6eec4e80a4a 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -143,8 +143,6 @@ class URI
      * @param string $path
      * @param string $query
      * @param string $fragment
-     *
-     * @return string
      */
     public static function createURIString(?string $scheme = null, ?string $authority = null, ?string $path = null, ?string $query = null, ?string $fragment = null): string
     {
@@ -179,10 +177,6 @@ public static function createURIString(?string $scheme = null, ?string $authorit
      *
      * @see http://tools.ietf.org/html/rfc3986#section-5.2.4
      *
-     * @param string $path
-     *
-     * @return string
-     *
      * @internal
      */
     public static function removeDotSegments(string $path): string
@@ -246,8 +240,6 @@ public function __construct(?string $uri = null)
      * If $silent == true, then will not throw exceptions and will
      * attempt to continue gracefully.
      *
-     * @param bool $silent
-     *
      * @return URI
      */
     public function setSilent(bool $silent = true)
@@ -261,8 +253,6 @@ public function setSilent(bool $silent = true)
      * If $raw == true, then will use parseStr() method
      * instead of native parse_str() function.
      *
-     * @param bool $raw
-     *
      * @return URI
      */
     public function useRawQueryString(bool $raw = true)
@@ -275,8 +265,6 @@ public function useRawQueryString(bool $raw = true)
     /**
      * Sets and overwrites any current URI information.
      *
-     * @param string|null $uri
-     *
      * @return URI
      */
     public function setURI(?string $uri = null)
@@ -335,8 +323,6 @@ public function getScheme(): string
      *
      * @see https://tools.ietf.org/html/rfc3986#section-3.2
      *
-     * @param bool $ignorePort
-     *
      * @return string The URI authority, in "[user-info@]host[:port]" format.
      */
     public function getAuthority(bool $ignorePort = false): string
@@ -397,8 +383,6 @@ public function getUserInfo()
      * Temporarily sets the URI to show a password in userInfo. Will
      * reset itself after the first call to authority().
      *
-     * @param bool $val
-     *
      * @return URI
      */
     public function showPassword(bool $val = true)
@@ -478,10 +462,6 @@ public function getPath(): string
 
     /**
      * Retrieve the query string
-     *
-     * @param array $options
-     *
-     * @return string
      */
     public function getQuery(array $options = []): string
     {
@@ -516,8 +496,6 @@ public function getQuery(array $options = []): string
 
     /**
      * Retrieve a URI fragment
-     *
-     * @return string
      */
     public function getFragment(): string
     {
@@ -526,8 +504,6 @@ public function getFragment(): string
 
     /**
      * Returns the segments of the path as an array.
-     *
-     * @return array
      */
     public function getSegments(): array
     {
@@ -560,8 +536,7 @@ public function getSegment(int $number, string $default = ''): string
      * Set the value of a specific segment of the URI path.
      * Allows to set only existing segments or add new one.
      *
-     * @param int   $number
-     * @param mixed $value  (string or int)
+     * @param mixed $value (string or int)
      *
      * @return $this
      */
@@ -587,8 +562,6 @@ public function setSegment(int $number, $value)
 
     /**
      * Returns the total number of segments.
-     *
-     * @return int
      */
     public function getTotalSegments(): int
     {
@@ -602,8 +575,6 @@ public function getTotalSegments(): int
      * assumes URIs with the same host as baseURL should
      * be relative to the project's configuration.
      * This aspect of __toString() is deprecated and should be avoided.
-     *
-     * @return string
      */
     public function __toString(): string
     {
@@ -642,8 +613,6 @@ public function __toString(): string
     /**
      * Parses the given string and saves the appropriate authority pieces.
      *
-     * @param string $str
-     *
      * @return $this
      */
     public function setAuthority(string $str)
@@ -672,8 +641,6 @@ public function setAuthority(string $str)
      *
      * @see https://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml
      *
-     * @param string $str
-     *
      * @return $this
      */
     public function setScheme(string $str)
@@ -705,8 +672,6 @@ public function setUserInfo(string $user, string $pass)
     /**
      * Sets the host name to use.
      *
-     * @param string $str
-     *
      * @return $this
      */
     public function setHost(string $str)
@@ -745,8 +710,6 @@ public function setPort(?int $port = null)
     /**
      * Sets the path portion of the URI.
      *
-     * @param string $path
-     *
      * @return $this
      */
     public function setPath(string $path)
@@ -780,8 +743,6 @@ public function refreshPath()
      * Sets the query portion of the URI, while attempting
      * to clean the various parts of the query keys and values.
      *
-     * @param string $query
-     *
      * @return $this
      */
     public function setQuery(string $query)
@@ -812,8 +773,6 @@ public function setQuery(string $query)
      * A convenience method to pass an array of items in as the Query
      * portion of the URI.
      *
-     * @param array $query
-     *
      * @return URI
      */
     public function setQueryArray(array $query)
@@ -826,8 +785,7 @@ public function setQueryArray(array $query)
     /**
      * Adds a single new element to the query vars.
      *
-     * @param string $key
-     * @param mixed  $value
+     * @param mixed $value
      *
      * @return $this
      */
@@ -884,8 +842,6 @@ public function keepQuery(...$params)
      *
      * @see https://tools.ietf.org/html/rfc3986#section-3.5
      *
-     * @param string $string
-     *
      * @return $this
      */
     public function setFragment(string $string)
@@ -899,10 +855,6 @@ public function setFragment(string $string)
      * Encodes any dangerous characters, and removes dot segments.
      * While dot segments have valid uses according to the spec,
      * this URI class does not allow them.
-     *
-     * @param string|null $path
-     *
-     * @return string
      */
     protected function filterPath(?string $path = null): string
     {
@@ -937,8 +889,6 @@ static function (array $matches) {
 
     /**
      * Saves our parts from a parse_url call.
-     *
-     * @param array $parts
      */
     protected function applyParts(array $parts)
     {
@@ -990,8 +940,6 @@ protected function applyParts(array $parts)
      *
      * @see http://tools.ietf.org/html/rfc3986#section-5.2
      *
-     * @param string $uri
-     *
      * @return URI
      */
     public function resolveRelativeURI(string $uri)
@@ -1052,8 +1000,6 @@ public function resolveRelativeURI(string $uri)
      *
      * @param URI $base
      * @param URI $reference
-     *
-     * @return string
      */
     protected function mergePaths(self $base, self $reference): string
     {
@@ -1076,10 +1022,6 @@ protected function mergePaths(self $base, self $reference): string
     /**
      * This is equivalent to the native PHP parse_str() function.
      * This version allows the dot to be used as a key of the query string.
-     *
-     * @param string $query
-     *
-     * @return array
      */
     protected function parseStr(string $query): array
     {
diff --git a/system/HTTP/UserAgent.php b/system/HTTP/UserAgent.php
index 4c85398ae991..89db334b64b3 100644
--- a/system/HTTP/UserAgent.php
+++ b/system/HTTP/UserAgent.php
@@ -99,8 +99,6 @@ class UserAgent
      * Constructor
      *
      * Sets the User Agent and runs the compilation routine
-     *
-     * @param UserAgents|null $config
      */
     public function __construct(?UserAgents $config = null)
     {
@@ -116,8 +114,6 @@ public function __construct(?UserAgents $config = null)
      * Is Browser
      *
      * @param string $key
-     *
-     * @return bool
      */
     public function isBrowser(?string $key = null): bool
     {
@@ -138,8 +134,6 @@ public function isBrowser(?string $key = null): bool
      * Is Robot
      *
      * @param string $key
-     *
-     * @return bool
      */
     public function isRobot(?string $key = null): bool
     {
@@ -160,8 +154,6 @@ public function isRobot(?string $key = null): bool
      * Is Mobile
      *
      * @param string $key
-     *
-     * @return bool
      */
     public function isMobile(?string $key = null): bool
     {
@@ -180,8 +172,6 @@ public function isMobile(?string $key = null): bool
 
     /**
      * Is this a referral from another site?
-     *
-     * @return bool
      */
     public function isReferral(): bool
     {
@@ -201,8 +191,6 @@ public function isReferral(): bool
 
     /**
      * Agent String
-     *
-     * @return string
      */
     public function getAgentString(): string
     {
@@ -211,8 +199,6 @@ public function getAgentString(): string
 
     /**
      * Get Platform
-     *
-     * @return string
      */
     public function getPlatform(): string
     {
@@ -221,8 +207,6 @@ public function getPlatform(): string
 
     /**
      * Get Browser Name
-     *
-     * @return string
      */
     public function getBrowser(): string
     {
@@ -231,8 +215,6 @@ public function getBrowser(): string
 
     /**
      * Get the Browser Version
-     *
-     * @return string
      */
     public function getVersion(): string
     {
@@ -241,8 +223,6 @@ public function getVersion(): string
 
     /**
      * Get The Robot Name
-     *
-     * @return string
      */
     public function getRobot(): string
     {
@@ -251,8 +231,6 @@ public function getRobot(): string
 
     /**
      * Get the Mobile Device
-     *
-     * @return string
      */
     public function getMobile(): string
     {
@@ -261,8 +239,6 @@ public function getMobile(): string
 
     /**
      * Get the referrer
-     *
-     * @return string
      */
     public function getReferrer(): string
     {
@@ -272,8 +248,6 @@ public function getReferrer(): string
     /**
      * Parse a custom user-agent string
      *
-     * @param string $string
-     *
      * @return void
      */
     public function parse(string $string)
@@ -313,8 +287,6 @@ protected function compileData()
 
     /**
      * Set the Platform
-     *
-     * @return bool
      */
     protected function setPlatform(): bool
     {
@@ -335,8 +307,6 @@ protected function setPlatform(): bool
 
     /**
      * Set the Browser
-     *
-     * @return bool
      */
     protected function setBrowser(): bool
     {
@@ -358,8 +328,6 @@ protected function setBrowser(): bool
 
     /**
      * Set the Robot
-     *
-     * @return bool
      */
     protected function setRobot(): bool
     {
@@ -380,8 +348,6 @@ protected function setRobot(): bool
 
     /**
      * Set the Mobile Device
-     *
-     * @return bool
      */
     protected function setMobile(): bool
     {
@@ -401,8 +367,6 @@ protected function setMobile(): bool
 
     /**
      * Outputs the original Agent String when cast as a string.
-     *
-     * @return string
      */
     public function __toString(): string
     {
diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php
index e144e278335c..a06d4bb96c6e 100644
--- a/system/Helpers/array_helper.php
+++ b/system/Helpers/array_helper.php
@@ -16,9 +16,6 @@
      * Searches an array through dot syntax. Supports
      * wildcard searches, like foo.*.bar
      *
-     * @param string $index
-     * @param array  $array
-     *
      * @return mixed
      */
     function dot_array_search(string $index, array $array)
@@ -40,9 +37,6 @@ function dot_array_search(string $index, array $array)
      *
      * @internal This should not be used on its own.
      *
-     * @param array $indexes
-     * @param array $array
-     *
      * @return mixed
      */
     function _array_search_dot(array $indexes, array $array)
@@ -99,7 +93,6 @@ function _array_search_dot(array $indexes, array $array)
      * Returns the value of an element at a key in an array of uncertain depth.
      *
      * @param mixed $key
-     * @param array $array
      *
      * @return mixed|null
      */
@@ -144,8 +137,6 @@ function array_deep_search($key, array $array)
      * @param array $array       the reference of the array to be sorted
      * @param array $sortColumns an associative array of columns to sort
      *                           after and their sorting flags
-     *
-     * @return bool
      */
     function array_sort_by_multiple_keys(array &$array, array $sortColumns): bool
     {
diff --git a/system/Helpers/cookie_helper.php b/system/Helpers/cookie_helper.php
index c5d582c65cd3..7eeed052b2e1 100755
--- a/system/Helpers/cookie_helper.php
+++ b/system/Helpers/cookie_helper.php
@@ -56,7 +56,6 @@ function set_cookie(
      * Fetch an item from the $_COOKIE array
      *
      * @param string $index
-     * @param bool   $xssClean
      *
      * @return mixed
      *
@@ -94,12 +93,6 @@ function delete_cookie($name, string $domain = '', string $path = '/', string $p
 if (! function_exists('has_cookie')) {
     /**
      * Checks if a cookie exists by name.
-     *
-     * @param string      $name
-     * @param string|null $value
-     * @param string      $prefix
-     *
-     * @return bool
      */
     function has_cookie(string $name, ?string $value = null, string $prefix = ''): bool
     {
diff --git a/system/Helpers/date_helper.php b/system/Helpers/date_helper.php
index 1312f6110348..31fcdfb90a52 100644
--- a/system/Helpers/date_helper.php
+++ b/system/Helpers/date_helper.php
@@ -21,8 +21,6 @@
      * @param string $timezone
      *
      * @throws Exception
-     *
-     * @return int
      */
     function now(?string $timezone = null): int
     {
@@ -51,8 +49,6 @@ function now(?string $timezone = null): int
      * @param string $country A two-letter ISO 3166-1 compatible country code (for listIdentifiers)
      *
      * @throws Exception
-     *
-     * @return string
      */
     function timezone_select(string $class = '', string $default = '', int $what = DateTimeZone::ALL, ?string $country = null): string
     {
diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php
index e7383059205d..52341b848e06 100644
--- a/system/Helpers/filesystem_helper.php
+++ b/system/Helpers/filesystem_helper.php
@@ -23,8 +23,6 @@
      * @param int    $directoryDepth Depth of directories to traverse
      *                               (0 = fully recursive, 1 = current dir, etc)
      * @param bool   $hidden         Whether to show hidden files
-     *
-     * @return array
      */
     function directory_map(string $sourceDir, int $directoryDepth = 0, bool $hidden = false): array
     {
@@ -66,13 +64,9 @@ function directory_map(string $sourceDir, int $directoryDepth = 0, bool $hidden
      * Recursively copies the files and directories of the origin directory
      * into the target directory, i.e. "mirror" its contents.
      *
-     * @param string $originDir
-     * @param string $targetDir
-     * @param bool   $overwrite Whether individual files overwrite on collision
+     * @param bool $overwrite Whether individual files overwrite on collision
      *
      * @throws InvalidArgumentException
-     *
-     * @return void
      */
     function directory_mirror(string $originDir, string $targetDir, bool $overwrite = true): void
     {
@@ -115,8 +109,6 @@ function directory_mirror(string $originDir, string $targetDir, bool $overwrite
      * @param string $path File path
      * @param string $data Data to write
      * @param string $mode fopen() mode (default: 'wb')
-     *
-     * @return bool
      */
     function write_file(string $path, string $data, string $mode = 'wb'): bool
     {
@@ -154,8 +146,6 @@ function write_file(string $path, string $data, string $mode = 'wb'): bool
      * @param bool   $delDir Whether to delete any directories found in the path
      * @param bool   $htdocs Whether to skip deleting .htaccess and index page files
      * @param bool   $hidden Whether to include hidden files (files beginning with a period)
-     *
-     * @return bool
      */
     function delete_files(string $path, bool $delDir = false, bool $htdocs = false, bool $hidden = false): bool
     {
@@ -202,8 +192,6 @@ function delete_files(string $path, bool $delDir = false, bool $htdocs = false,
      * @param string    $sourceDir   Path to source
      * @param bool|null $includePath Whether to include the path as part of the filename; false for no path, null for a relative path, true for full path
      * @param bool      $hidden      Whether to include hidden files (files beginning with a period)
-     *
-     * @return array
      */
     function get_filenames(string $sourceDir, ?bool $includePath = false, bool $hidden = false): array
     {
@@ -252,8 +240,6 @@ function get_filenames(string $sourceDir, ?bool $includePath = false, bool $hidd
      * @param string $sourceDir    Path to source
      * @param bool   $topLevelOnly Look only at the top level directory specified?
      * @param bool   $recursion    Internal variable to determine recursion status - do not use in calls
-     *
-     * @return array
      */
     function get_dir_file_info(string $sourceDir, bool $topLevelOnly = true, bool $recursion = false): array
     {
@@ -362,8 +348,6 @@ function get_file_info(string $file, $returnedValues = ['name', 'server_path', '
      * standard symbolic notation representing that value
      *
      * @param int $perms Permissions
-     *
-     * @return string
      */
     function symbolic_permissions(int $perms): string
     {
@@ -412,8 +396,6 @@ function symbolic_permissions(int $perms): string
      * a three character string representing the file's octal permissions
      *
      * @param int $perms Permissions
-     *
-     * @return string
      */
     function octal_permissions(int $perms): string
     {
@@ -425,9 +407,6 @@ function octal_permissions(int $perms): string
     /**
      * Checks if two files both exist and have identical hashes
      *
-     * @param string $file1
-     * @param string $file2
-     *
      * @return bool Same or not
      */
     function same_file(string $file1, string $file2): bool
@@ -440,10 +419,7 @@ function same_file(string $file1, string $file2): bool
     /**
      * Set Realpath
      *
-     * @param string $path
-     * @param bool   $checkExistence Checks to see if the path exists
-     *
-     * @return string
+     * @param bool $checkExistence Checks to see if the path exists
      */
     function set_realpath(string $path, bool $checkExistence = false): string
     {
diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
index c0c5416931e6..bb4f6cd8060f 100644
--- a/system/Helpers/form_helper.php
+++ b/system/Helpers/form_helper.php
@@ -23,8 +23,6 @@
      * @param string       $action     the URI segments of the form destination
      * @param array|string $attributes a key/value pair of attributes, or string representation
      * @param array        $hidden     a key/value pair hidden data
-     *
-     * @return string
      */
     function form_open(string $action = '', $attributes = [], array $hidden = []): string
     {
@@ -84,8 +82,6 @@ function form_open(string $action = '', $attributes = [], array $hidden = []): s
      * @param string       $action     The URI segments of the form destination
      * @param array|string $attributes A key/value pair of attributes, or the same as a string
      * @param array        $hidden     A key/value pair hidden data
-     *
-     * @return string
      */
     function form_open_multipart(string $action = '', $attributes = [], array $hidden = []): string
     {
@@ -106,11 +102,8 @@ function form_open_multipart(string $action = '', $attributes = [], array $hidde
      * Generates hidden fields. You can pass a simple key/value string or
      * an associative array with multiple values.
      *
-     * @param array|string $name      Field name or associative array to create multiple fields
-     * @param array|string $value     Field value
-     * @param bool         $recursing
-     *
-     * @return string
+     * @param array|string $name  Field name or associative array to create multiple fields
+     * @param array|string $value Field value
      */
     function form_hidden($name, $value = '', bool $recursing = false): string
     {
@@ -146,12 +139,8 @@ function form_hidden($name, $value = '', bool $recursing = false): string
      * Text Input Field. If 'type' is passed in the $type field, it will be
      * used as the input type, for making 'email', 'phone', etc input fields.
      *
-     * @param mixed  $data
-     * @param string $value
-     * @param mixed  $extra
-     * @param string $type
-     *
-     * @return string
+     * @param mixed $data
+     * @param mixed $extra
      */
     function form_input($data = '', string $value = '', $extra = '', string $type = 'text'): string
     {
@@ -171,11 +160,8 @@ function form_input($data = '', string $value = '', $extra = '', string $type =
      *
      * Identical to the input function but adds the "password" type
      *
-     * @param mixed  $data
-     * @param string $value
-     * @param mixed  $extra
-     *
-     * @return string
+     * @param mixed $data
+     * @param mixed $extra
      */
     function form_password($data = '', string $value = '', $extra = ''): string
     {
@@ -194,11 +180,8 @@ function form_password($data = '', string $value = '', $extra = ''): string
      *
      * Identical to the input function but adds the "file" type
      *
-     * @param mixed  $data
-     * @param string $value
-     * @param mixed  $extra
-     *
-     * @return string
+     * @param mixed $data
+     * @param mixed $extra
      */
     function form_upload($data = '', string $value = '', $extra = ''): string
     {
@@ -221,11 +204,8 @@ function form_upload($data = '', string $value = '', $extra = ''): string
     /**
      * Textarea field
      *
-     * @param mixed  $data
-     * @param string $value
-     * @param mixed  $extra
-     *
-     * @return string
+     * @param mixed $data
+     * @param mixed $extra
      */
     function form_textarea($data = '', string $value = '', $extra = ''): string
     {
@@ -261,11 +241,7 @@ function form_textarea($data = '', string $value = '', $extra = ''): string
      * Multi-select menu
      *
      * @param mixed $name
-     * @param array $options
-     * @param array $selected
      * @param mixed $extra
-     *
-     * @return string
      */
     function form_multiselect($name = '', array $options = [], array $selected = [], $extra = ''): string
     {
@@ -287,8 +263,6 @@ function form_multiselect($name = '', array $options = [], array $selected = [],
      * @param mixed $options
      * @param mixed $selected
      * @param mixed $extra
-     *
-     * @return string
      */
     function form_dropdown($data = '', $options = [], $selected = [], $extra = ''): string
     {
@@ -364,12 +338,8 @@ function form_dropdown($data = '', $options = [], $selected = [], $extra = ''):
     /**
      * Checkbox Field
      *
-     * @param mixed  $data
-     * @param string $value
-     * @param bool   $checked
-     * @param mixed  $extra
-     *
-     * @return string
+     * @param mixed $data
+     * @param mixed $extra
      */
     function form_checkbox($data = '', string $value = '', bool $checked = false, $extra = ''): string
     {
@@ -402,12 +372,8 @@ function form_checkbox($data = '', string $value = '', bool $checked = false, $e
     /**
      * Radio Button
      *
-     * @param mixed  $data
-     * @param string $value
-     * @param bool   $checked
-     * @param mixed  $extra
-     *
-     * @return string
+     * @param mixed $data
+     * @param mixed $extra
      */
     function form_radio($data = '', string $value = '', bool $checked = false, $extra = ''): string
     {
@@ -424,11 +390,8 @@ function form_radio($data = '', string $value = '', bool $checked = false, $extr
     /**
      * Submit Button
      *
-     * @param mixed  $data
-     * @param string $value
-     * @param mixed  $extra
-     *
-     * @return string
+     * @param mixed $data
+     * @param mixed $extra
      */
     function form_submit($data = '', string $value = '', $extra = ''): string
     {
@@ -440,11 +403,8 @@ function form_submit($data = '', string $value = '', $extra = ''): string
     /**
      * Reset Button
      *
-     * @param mixed  $data
-     * @param string $value
-     * @param mixed  $extra
-     *
-     * @return string
+     * @param mixed $data
+     * @param mixed $extra
      */
     function form_reset($data = '', string $value = '', $extra = ''): string
     {
@@ -456,11 +416,8 @@ function form_reset($data = '', string $value = '', $extra = ''): string
     /**
      * Form Button
      *
-     * @param mixed  $data
-     * @param string $content
-     * @param mixed  $extra
-     *
-     * @return string
+     * @param mixed $data
+     * @param mixed $extra
      */
     function form_button($data = '', string $content = '', $extra = ''): string
     {
@@ -487,8 +444,6 @@ function form_button($data = '', string $content = '', $extra = ''): string
      * @param string $labelText  The text to appear onscreen
      * @param string $id         The id the label applies to
      * @param array  $attributes Additional attributes
-     *
-     * @return string
      */
     function form_label(string $labelText = '', string $id = '', array $attributes = []): string
     {
@@ -515,12 +470,6 @@ function form_label(string $labelText = '', string $id = '', array $attributes =
      * The <datalist> element specifies a list of pre-defined options for an <input> element.
      * Users will see a drop-down list of pre-defined options as they input data.
      * The list attribute of the <input> element, must refer to the id attribute of the <datalist> element.
-     *
-     * @param string $name
-     * @param string $value
-     * @param array  $options
-     *
-     * @return string
      */
     function form_datalist(string $name, string $value, array $options): string
     {
@@ -552,8 +501,6 @@ function form_datalist(string $name, string $value, array $options): string
      *
      * @param string $legendText The legend text
      * @param array  $attributes Additional attributes
-     *
-     * @return string
      */
     function form_fieldset(string $legendText = '', array $attributes = []): string
     {
@@ -570,10 +517,6 @@ function form_fieldset(string $legendText = '', array $attributes = []): string
 if (! function_exists('form_fieldset_close')) {
     /**
      * Fieldset Close Tag
-     *
-     * @param string $extra
-     *
-     * @return string
      */
     function form_fieldset_close(string $extra = ''): string
     {
@@ -584,10 +527,6 @@ function form_fieldset_close(string $extra = ''): string
 if (! function_exists('form_close')) {
     /**
      * Form Close Tag
-     *
-     * @param string $extra
-     *
-     * @return string
      */
     function form_close(string $extra = ''): string
     {
@@ -629,12 +568,6 @@ function set_value(string $field, $default = '', bool $htmlEscape = true)
      *
      * Let's you set the selected value of a <select> menu via data in the POST array.
      * If Form Validation is active it retrieves the info from the validation class
-     *
-     * @param string $field
-     * @param string $value
-     * @param bool   $default
-     *
-     * @return string
      */
     function set_select(string $field, string $value = '', bool $default = false): string
     {
@@ -672,12 +605,6 @@ function set_select(string $field, string $value = '', bool $default = false): s
      *
      * Let's you set the selected value of a checkbox via the value in the POST array.
      * If Form Validation is active it retrieves the info from the validation class
-     *
-     * @param string $field
-     * @param string $value
-     * @param bool   $default
-     *
-     * @return string
      */
     function set_checkbox(string $field, string $value = '', bool $default = false): string
     {
@@ -716,12 +643,6 @@ function set_checkbox(string $field, string $value = '', bool $default = false):
      *
      * Let's you set the selected value of a radio field via info in the POST array.
      * If Form Validation is active it retrieves the info from the validation class
-     *
-     * @param string $field
-     * @param string $value
-     * @param bool   $default
-     *
-     * @return string
      */
     function set_radio(string $field, string $value = '', bool $default = false): string
     {
@@ -766,8 +687,6 @@ function set_radio(string $field, string $value = '', bool $default = false): st
      *
      * @param array|string $attributes List of attributes
      * @param array        $default    Default values
-     *
-     * @return string
      */
     function parse_form_attributes($attributes, array $default): string
     {
diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
index 036c7c5d69cf..dc175afe4e93 100755
--- a/system/Helpers/html_helper.php
+++ b/system/Helpers/html_helper.php
@@ -22,10 +22,7 @@
      * Generates an HTML unordered list from an single or
      * multi-dimensional array.
      *
-     * @param array $list
      * @param mixed $attributes HTML attributes string, array, object
-     *
-     * @return string
      */
     function ul(array $list, $attributes = ''): string
     {
@@ -39,10 +36,7 @@ function ul(array $list, $attributes = ''): string
      *
      * Generates an HTML ordered list from an single or multi-dimensional array.
      *
-     * @param array $list
      * @param mixed $attributes HTML attributes string, array, object
-     *
-     * @return string
      */
     function ol(array $list, $attributes = ''): string
     {
@@ -56,12 +50,8 @@ function ol(array $list, $attributes = ''): string
      *
      * Generates an HTML ordered list from an single or multi-dimensional array.
      *
-     * @param string $type
-     * @param mixed  $list
-     * @param mixed  $attributes string, array, object
-     * @param int    $depth
-     *
-     * @return string
+     * @param mixed $list
+     * @param mixed $attributes string, array, object
      */
     function _list(string $type = 'ul', $list = [], $attributes = '', int $depth = 0): string
     {
@@ -102,8 +92,6 @@ function _list(string $type = 'ul', $list = [], $attributes = '', int $depth = 0
      * @param array|string        $src        Image source URI, or array of attributes and values
      * @param bool                $indexPage  Whether to treat $src as a routed URI string
      * @param array|object|string $attributes Additional HTML attributes
-     *
-     * @return string
      */
     function img($src = '', bool $indexPage = false, $attributes = ''): string
     {
@@ -152,8 +140,6 @@ function img($src = '', bool $indexPage = false, $attributes = ''): string
      *
      * @param string      $path Image source path
      * @param string|null $mime MIME type to use, or null to guess
-     *
-     * @return string
      */
     function img_data(string $path, ?string $mime = null): string
     {
@@ -187,8 +173,6 @@ function img_data(string $path, ?string $mime = null): string
      * All values are saved in the doctypes config file.
      *
      * @param string $type The doctype to be generated
-     *
-     * @return string
      */
     function doctype(string $type = 'html5'): string
     {
@@ -207,8 +191,6 @@ function doctype(string $type = 'html5'): string
      *
      * @param mixed $src       Script source or an array
      * @param bool  $indexPage Should indexPage be added to the JS path
-     *
-     * @return string
      */
     function script_tag($src = '', bool $indexPage = false): string
     {
@@ -239,15 +221,8 @@ function script_tag($src = '', bool $indexPage = false): string
      *
      * Generates link to a CSS file
      *
-     * @param mixed  $href      Stylesheet href or an array
-     * @param string $rel
-     * @param string $type
-     * @param string $title
-     * @param string $media
-     * @param bool   $indexPage should indexPage be added to the CSS path.
-     * @param string $hreflang
-     *
-     * @return string
+     * @param mixed $href      Stylesheet href or an array
+     * @param bool  $indexPage should indexPage be added to the CSS path.
      */
     function link_tag($href = '', string $rel = 'stylesheet', string $type = 'text/css', string $title = '', string $media = '', bool $indexPage = false, string $hreflang = ''): string
     {
@@ -306,10 +281,6 @@ function link_tag($href = '', string $rel = 'stylesheet', string $type = 'text/c
      * @param mixed  $src                Either a source string or an array of sources
      * @param string $unsupportedMessage The message to display if the media tag is not supported by the browser
      * @param string $attributes         HTML attributes
-     * @param array  $tracks
-     * @param bool   $indexPage
-     *
-     * @return string
      */
     function video($src, string $unsupportedMessage = '', string $attributes = '', array $tracks = [], bool $indexPage = false): string
     {
@@ -358,10 +329,6 @@ function video($src, string $unsupportedMessage = '', string $attributes = '', a
      * @param mixed  $src                Either a source string or an array of sources
      * @param string $unsupportedMessage The message to display if the media tag is not supported by the browser.
      * @param string $attributes         HTML attributes
-     * @param array  $tracks
-     * @param bool   $indexPage
-     *
-     * @return string
      */
     function audio($src, string $unsupportedMessage = '', string $attributes = '', array $tracks = [], bool $indexPage = false): string
     {
@@ -403,13 +370,7 @@ function audio($src, string $unsupportedMessage = '', string $attributes = '', a
     /**
      * Generate media based tag
      *
-     * @param string $name
-     * @param array  $types
      * @param string $unsupportedMessage The message to display if the media tag is not supported by the browser.
-     * @param string $attributes
-     * @param array  $tracks
-     *
-     * @return string
      */
     function _media(string $name, array $types = [], string $unsupportedMessage = '', string $attributes = '', array $tracks = []): string
     {
@@ -451,9 +412,6 @@ function _media(string $name, array $types = [], string $unsupportedMessage = ''
      * @param string $src        The path of the media resource
      * @param string $type       The MIME-type of the resource with optional codecs parameters
      * @param string $attributes HTML attributes
-     * @param bool   $indexPage
-     *
-     * @return string
      */
     function source(string $src, string $type = 'unknown', string $attributes = '', bool $indexPage = false): string
     {
@@ -479,12 +437,7 @@ function source(string $src, string $type = 'unknown', string $attributes = '',
      * Generates a track element to specify timed tracks. The tracks are
      * formatted in WebVTT format.
      *
-     * @param string $src         The path of the .VTT file
-     * @param string $kind
-     * @param string $srcLanguage
-     * @param string $label
-     *
-     * @return string
+     * @param string $src The path of the .VTT file
      */
     function track(string $src, string $kind, string $srcLanguage, string $label): string
     {
@@ -507,10 +460,6 @@ function track(string $src, string $kind, string $srcLanguage, string $label): s
      * @param string $data       A resource URL
      * @param string $type       Content-type of the resource
      * @param string $attributes HTML attributes
-     * @param array  $params
-     * @param bool   $indexPage
-     *
-     * @return string
      */
     function object(string $data, string $type = 'unknown', string $attributes = '', array $params = [], bool $indexPage = false): string
     {
@@ -544,8 +493,6 @@ function object(string $data, string $type = 'unknown', string $attributes = '',
      * @param string $value      The value of the parameter
      * @param string $type       The MIME-type
      * @param string $attributes HTML attributes
-     *
-     * @return string
      */
     function param(string $name, string $value, string $type = 'ref', string $attributes = ''): string
     {
@@ -565,9 +512,6 @@ function param(string $name, string $value, string $type = 'ref', string $attrib
      * @param string $src        The path of the resource to embed
      * @param string $type       MIME-type
      * @param string $attributes HTML attributes
-     * @param bool   $indexPage
-     *
-     * @return string
      */
     function embed(string $src, string $type = 'unknown', string $attributes = '', bool $indexPage = false): string
     {
@@ -585,8 +529,6 @@ function embed(string $src, string $type = 'unknown', string $attributes = '', b
     /**
      * Test the protocol of a URI.
      *
-     * @param string $url
-     *
      * @return false|int
      */
     function _has_protocol(string $url)
@@ -598,10 +540,6 @@ function _has_protocol(string $url)
 if (! function_exists('_space_indent')) {
     /**
      * Provide space indenting.
-     *
-     * @param int $depth
-     *
-     * @return string
      */
     function _space_indent(int $depth = 2): string
     {
diff --git a/system/Helpers/inflector_helper.php b/system/Helpers/inflector_helper.php
index a017a3fd060c..ad632a3f12c8 100755
--- a/system/Helpers/inflector_helper.php
+++ b/system/Helpers/inflector_helper.php
@@ -18,8 +18,6 @@
      * Takes a plural word and makes it singular
      *
      * @param string $string Input string
-     *
-     * @return string
      */
     function singular(string $string): string
     {
@@ -79,8 +77,6 @@ function singular(string $string): string
      * Takes a singular word and makes it plural
      *
      * @param string $string Input string
-     *
-     * @return string
      */
     function plural(string $string): string
     {
@@ -133,8 +129,6 @@ function plural(string $string): string
      *
      * @param int    $count  Number of items
      * @param string $string Input string
-     *
-     * @return string
      */
     function counted(int $count, string $string): string
     {
@@ -152,8 +146,6 @@ function counted(int $count, string $string): string
      * underscores and converts them to camel case.
      *
      * @param string $string Input string
-     *
-     * @return string
      */
     function camelize(string $string): string
     {
@@ -170,8 +162,6 @@ function camelize(string $string): string
      * which is camel case with an uppercase first letter.
      *
      * @param string $string Input string
-     *
-     * @return string
      */
     function pascalize(string $string): string
     {
@@ -186,8 +176,6 @@ function pascalize(string $string): string
      * Takes multiple words separated by spaces and underscores them
      *
      * @param string $string Input string
-     *
-     * @return string
      */
     function underscore(string $string): string
     {
@@ -206,8 +194,6 @@ function underscore(string $string): string
      *
      * @param string $string    Input string
      * @param string $separator Input separator
-     *
-     * @return string
      */
     function humanize(string $string, string $separator = '_'): string
     {
@@ -222,8 +208,6 @@ function humanize(string $string, string $separator = '_'): string
      * Checks if the given word has a plural version.
      *
      * @param string $word Word to check
-     *
-     * @return bool
      */
     function is_pluralizable(string $word): bool
     {
@@ -289,8 +273,6 @@ function is_pluralizable(string $word): bool
      * Replaces underscores with dashes in the string.
      *
      * @param string $string Input string
-     *
-     * @return string
      */
     function dasherize(string $string): string
     {
@@ -305,8 +287,6 @@ function dasherize(string $string): string
      * sequence such as 1st, 2nd, 3rd, 4th.
      *
      * @param int $integer The integer to determine the suffix
-     *
-     * @return string
      */
     function ordinal(int $integer): string
     {
@@ -334,8 +314,6 @@ function ordinal(int $integer): string
      * such as 1st, 2nd, 3rd, 4th.
      *
      * @param int $integer The integer to ordinalize
-     *
-     * @return string
      */
     function ordinalize(int $integer): string
     {
diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
index 382ff0c01fc1..6e1391556c49 100644
--- a/system/Helpers/number_helper.php
+++ b/system/Helpers/number_helper.php
@@ -17,8 +17,7 @@
     /**
      * Formats a numbers as bytes, based on size, and adds the appropriate suffix
      *
-     * @param mixed  $num       Will be cast as int
-     * @param int    $precision
+     * @param mixed  $num    Will be cast as int
      * @param string $locale
      *
      * @return bool|string
@@ -70,9 +69,7 @@ function number_to_size($num, int $precision = 1, ?string $locale = null)
      *
      * @see https://simple.wikipedia.org/wiki/Names_for_large_numbers
      *
-     * @param string      $num
-     * @param int         $precision
-     * @param string|null $locale
+     * @param string $num
      *
      * @return bool|string
      */
@@ -116,12 +113,8 @@ function number_to_amount($num, int $precision = 0, ?string $locale = null)
 
 if (! function_exists('number_to_currency')) {
     /**
-     * @param float  $num
-     * @param string $currency
      * @param string $locale
      * @param int    $fraction
-     *
-     * @return string
      */
     function number_to_currency(float $num, string $currency, ?string $locale = null, ?int $fraction = null): string
     {
@@ -137,13 +130,6 @@ function number_to_currency(float $num, string $currency, ?string $locale = null
     /**
      * A general purpose, locale-aware, number_format method.
      * Used by all of the functions of the number_helper.
-     *
-     * @param float       $num
-     * @param int         $precision
-     * @param string|null $locale
-     * @param array       $options
-     *
-     * @return string
      */
     function format_number(float $num, int $precision = 1, ?string $locale = null, array $options = []): string
     {
@@ -193,8 +179,6 @@ function format_number(float $num, int $precision = 1, ?string $locale = null, a
      * Convert a number to a roman numeral.
      *
      * @param string $num it will convert to int
-     *
-     * @return string|null
      */
     function number_to_roman(string $num): ?string
     {
diff --git a/system/Helpers/security_helper.php b/system/Helpers/security_helper.php
index 0c457971197d..eba12de59ad8 100644
--- a/system/Helpers/security_helper.php
+++ b/system/Helpers/security_helper.php
@@ -16,10 +16,6 @@
 if (! function_exists('sanitize_filename')) {
     /**
      * Sanitize a filename to use in a URI.
-     *
-     * @param string $filename
-     *
-     * @return string
      */
     function sanitize_filename(string $filename): string
     {
@@ -30,10 +26,6 @@ function sanitize_filename(string $filename): string
 if (! function_exists('strip_image_tags')) {
     /**
      * Strip Image Tags
-     *
-     * @param string $str
-     *
-     * @return string
      */
     function strip_image_tags(string $str): string
     {
@@ -51,10 +43,6 @@ function strip_image_tags(string $str): string
 if (! function_exists('encode_php_tags')) {
     /**
      * Convert PHP tags to entities
-     *
-     * @param string $str
-     *
-     * @return string
      */
     function encode_php_tags(string $str): string
     {
diff --git a/system/Helpers/test_helper.php b/system/Helpers/test_helper.php
index 38b72519fd56..e20054ab6893 100644
--- a/system/Helpers/test_helper.php
+++ b/system/Helpers/test_helper.php
@@ -20,6 +20,7 @@
      *
      * @param Model|object|string $model     Instance or name of the model
      * @param array|null          $overrides Overriding data to pass to Fabricator::setOverrides()
+     * @param mixed               $persist
      *
      * @return array|object
      */
diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index ee399627d8e5..2c2171a9a8d4 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -19,11 +19,7 @@
      *
      * Limits a string to X number of words.
      *
-     * @param string $str
-     * @param int    $limit
      * @param string $endChar the end character. Usually an ellipsis
-     *
-     * @return string
      */
     function word_limiter(string $str, int $limit = 100, string $endChar = '&#8230;'): string
     {
@@ -48,11 +44,7 @@ function word_limiter(string $str, int $limit = 100, string $endChar = '&#8230;'
      * Limits the string based on the character count.  Preserves complete words
      * so the character count may not be exactly as specified.
      *
-     * @param string $str
-     * @param int    $n
      * @param string $endChar the end character. Usually an ellipsis
-     *
-     * @return string
      */
     function character_limiter(string $str, int $n = 500, string $endChar = '&#8230;'): string
     {
@@ -86,10 +78,6 @@ function character_limiter(string $str, int $n = 500, string $endChar = '&#8230;
      * High ASCII to Entities
      *
      * Converts high ASCII text and MS Word special characters to character entities
-     *
-     * @param string $str
-     *
-     * @return string
      */
     function ascii_to_entities(string $str): string
     {
@@ -138,11 +126,6 @@ function ascii_to_entities(string $str): string
      * Entities to ASCII
      *
      * Converts character entities back to ASCII
-     *
-     * @param string $str
-     * @param bool   $all
-     *
-     * @return string
      */
     function entities_to_ascii(string $str, bool $all = true): string
     {
@@ -186,8 +169,6 @@ function entities_to_ascii(string $str, bool $all = true): string
      * @param string $str         the text string
      * @param array  $censored    the array of censored words
      * @param string $replacement the optional replacement value
-     *
-     * @return string
      */
     function word_censor(string $str, array $censored, string $replacement = ''): string
     {
@@ -239,8 +220,6 @@ function word_censor(string $str, array $censored, string $replacement = ''): st
      * Colorizes code strings
      *
      * @param string $str the text string
-     *
-     * @return string
      */
     function highlight_code(string $str): string
     {
@@ -309,8 +288,6 @@ function highlight_code(string $str): string
      * @param string $phrase   the phrase you'd like to highlight
      * @param string $tagOpen  the opening tag to precede the phrase with
      * @param string $tagClose the closing tag to end the phrase with
-     *
-     * @return string
      */
     function highlight_phrase(string $str, string $phrase, string $tagOpen = '<mark>', string $tagClose = '</mark>'): string
     {
@@ -323,8 +300,6 @@ function highlight_phrase(string $str, string $phrase, string $tagOpen = '<mark>
      * Convert Accented Foreign Characters to ASCII
      *
      * @param string $str Input string
-     *
-     * @return string
      */
     function convert_accented_characters(string $str): string
     {
@@ -359,8 +334,6 @@ function convert_accented_characters(string $str): string
      *
      * @param string $str     the text string
      * @param int    $charlim = 76    the number of characters to wrap at
-     *
-     * @return string
      */
     function word_wrap(string $str, int $charlim = 76): string
     {
@@ -498,10 +471,6 @@ function strip_slashes($str)
      * Strip Quotes
      *
      * Removes single and double quotes from a string
-     *
-     * @param string $str
-     *
-     * @return string
      */
     function strip_quotes(string $str): string
     {
@@ -514,10 +483,6 @@ function strip_quotes(string $str): string
      * Quotes to Entities
      *
      * Converts single and double quotes to entities
-     *
-     * @param string $str
-     *
-     * @return string
      */
     function quotes_to_entities(string $str): string
     {
@@ -537,10 +502,6 @@ function quotes_to_entities(string $str): string
      * becomes:
      *
      * http://www.some-site.com/index.php
-     *
-     * @param string $str
-     *
-     * @return string
      */
     function reduce_double_slashes(string $str): string
     {
@@ -560,11 +521,8 @@ function reduce_double_slashes(string $str): string
      *
      * Fred, Bill, Joe, Jimmy
      *
-     * @param string $str
      * @param string $character the character you wish to reduce
      * @param bool   $trim      TRUE/FALSE - whether to trim the character from the beginning/end
-     *
-     * @return string
      */
     function reduce_multiples(string $str, string $character = ',', bool $trim = false): string
     {
@@ -582,8 +540,6 @@ function reduce_multiples(string $str, string $character = ',', bool $trim = fal
      *
      * @param string $type Type of random string.  basic, alpha, alnum, numeric, nozero, md5, sha1, and crypto
      * @param int    $len  Number of characters
-     *
-     * @return string
      */
     function random_string(string $type = 'alnum', int $len = 8): string
     {
@@ -634,8 +590,6 @@ function random_string(string $type = 'alnum', int $len = 8): string
      * @param string $str       Required
      * @param string $separator What should the duplicate number be appended with
      * @param int    $first     Which number should be used for the first dupe increment
-     *
-     * @return string
      */
     function increment_string(string $str, string $separator = '_', int $first = 1): string
     {
@@ -654,8 +608,6 @@ function increment_string(string $str, string $separator = '_', int $first = 1):
      * @phpstan-ignore-next-line
      *
      * @param string (as many parameters as needed)
-     *
-     * @return string
      */
     function alternator(): string
     {
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
index c5af264ebe03..8d089083eddd 100644
--- a/system/Helpers/url_helper.php
+++ b/system/Helpers/url_helper.php
@@ -24,12 +24,9 @@
      *
      * @internal Outside of the framework this should not be used directly.
      *
-     * @param string   $relativePath May include queries or fragments
-     * @param App|null $config
+     * @param string $relativePath May include queries or fragments
      *
      * @throws InvalidArgumentException For invalid paths or config
-     *
-     * @return URI
      */
     function _get_uri(string $relativePath = '', ?App $config = null): URI
     {
@@ -77,11 +74,8 @@ function _get_uri(string $relativePath = '', ?App $config = null): URI
     /**
      * Returns a site URL as defined by the App config.
      *
-     * @param mixed       $relativePath URI string or array of URI segments
-     * @param string|null $scheme
-     * @param App|null    $config       Alternate configuration to use
-     *
-     * @return string
+     * @param mixed    $relativePath URI string or array of URI segments
+     * @param App|null $config       Alternate configuration to use
      */
     function site_url($relativePath = '', ?string $scheme = null, ?App $config = null): string
     {
@@ -103,8 +97,6 @@ function site_url($relativePath = '', ?string $scheme = null, ?App $config = nul
      *
      * @param mixed  $relativePath URI string or array of URI segments
      * @param string $scheme
-     *
-     * @return string
      */
     function base_url($relativePath = '', ?string $scheme = null): string
     {
@@ -151,8 +143,6 @@ function current_url(bool $returnObject = false, ?IncomingRequest $request = nul
      * If that's not available, however, we'll use a sanitized url from $_SERVER['HTTP_REFERER']
      * which can be set by the user so is untrusted and not set by certain browsers/servers.
      *
-     * @param bool $returnObject
-     *
      * @return mixed|string|URI
      */
     function previous_url(bool $returnObject = false)
@@ -175,8 +165,6 @@ function previous_url(bool $returnObject = false)
      * Returns the path part of the current URL
      *
      * @param bool $relative Whether the resulting path should be relative to baseURL
-     *
-     * @return string
      */
     function uri_string(bool $relative = false): string
     {
@@ -193,8 +181,6 @@ function uri_string(bool $relative = false): string
      * Returns the "index_page" from your config file
      *
      * @param App|null $altConfig Alternate configuration to use
-     *
-     * @return string
      */
     function index_page(?App $altConfig = null): string
     {
@@ -215,8 +201,6 @@ function index_page(?App $altConfig = null): string
      * @param string   $title      The link title
      * @param mixed    $attributes Any attributes
      * @param App|null $altConfig  Alternate configuration to use
-     *
-     * @return string
      */
     function anchor($uri = '', string $title = '', $attributes = '', ?App $altConfig = null): string
     {
@@ -250,8 +234,6 @@ function anchor($uri = '', string $title = '', $attributes = '', ?App $altConfig
      * @param string   $title      the link title
      * @param mixed    $attributes any attributes
      * @param App|null $altConfig  Alternate configuration to use
-     *
-     * @return string
      */
     function anchor_popup($uri = '', string $title = '', $attributes = false, ?App $altConfig = null): string
     {
@@ -301,8 +283,6 @@ function anchor_popup($uri = '', string $title = '', $attributes = false, ?App $
      * @param string $email      the email address
      * @param string $title      the link title
      * @param mixed  $attributes any attributes
-     *
-     * @return string
      */
     function mailto(string $email, string $title = '', $attributes = ''): string
     {
@@ -323,8 +303,6 @@ function mailto(string $email, string $title = '', $attributes = ''): string
      * @param string $email      the email address
      * @param string $title      the link title
      * @param mixed  $attributes any attributes
-     *
-     * @return string
      */
     function safe_mailto(string $email, string $title = '', $attributes = ''): string
     {
@@ -418,8 +396,6 @@ function safe_mailto(string $email, string $title = '', $attributes = ''): strin
      * @param string $str   the string
      * @param string $type  the type: email, url, or both
      * @param bool   $popup whether to create pop-up links
-     *
-     * @return string
      */
     function auto_link(string $str, string $type = 'both', bool $popup = false): string
     {
@@ -464,8 +440,6 @@ function auto_link(string $str, string $type = 'both', bool $popup = false): str
      *
      * @param string $str    the URL
      * @param bool   $secure set true if you want to force https://
-     *
-     * @return string
      */
     function prep_url(string $str = '', bool $secure = false): string
     {
@@ -497,8 +471,6 @@ function prep_url(string $str = '', bool $secure = false): string
      * @param string $str       Input string
      * @param string $separator Word separator (usually '-' or '_')
      * @param bool   $lowercase Whether to transform the output string to lowercase
-     *
-     * @return string
      */
     function url_title(string $str, string $separator = '-', bool $lowercase = false): string
     {
@@ -536,8 +508,6 @@ function url_title(string $str, string $separator = '-', bool $lowercase = false
      * @param string $str       Input string
      * @param string $separator Word separator (usually '-' or '_')
      * @param bool   $lowercase Whether to transform the output string to lowercase
-     *
-     * @return string
      */
     function mb_url_title(string $str, string $separator = '-', bool $lowercase = false): string
     {
@@ -552,12 +522,9 @@ function mb_url_title(string $str, string $separator = '-', bool $lowercase = fa
      * Get the full, absolute URL to a controller method
      * (with additional arguments)
      *
-     * @param string $controller
-     * @param mixed  ...$args
+     * @param mixed ...$args
      *
      * @throws RouterException
-     *
-     * @return string
      */
     function url_to(string $controller, ...$args): string
     {
@@ -583,10 +550,6 @@ function url_to(string $controller, ...$args): string
      *
      * Example:
      *   if (url_is('admin*)) ...
-     *
-     * @param string $path
-     *
-     * @return bool
      */
     function url_is(string $path): bool
     {
diff --git a/system/Helpers/xml_helper.php b/system/Helpers/xml_helper.php
index 28d1e3d1ad65..ece282013721 100644
--- a/system/Helpers/xml_helper.php
+++ b/system/Helpers/xml_helper.php
@@ -14,11 +14,6 @@
 if (! function_exists('xml_convert')) {
     /**
      * Convert Reserved XML characters to Entities
-     *
-     * @param string $str
-     * @param bool   $protectAll
-     *
-     * @return string
      */
     function xml_convert(string $str, bool $protectAll = false): string
     {
diff --git a/system/Honeypot/Honeypot.php b/system/Honeypot/Honeypot.php
index 5f44528ca482..178f56621618 100644
--- a/system/Honeypot/Honeypot.php
+++ b/system/Honeypot/Honeypot.php
@@ -31,8 +31,6 @@ class Honeypot
     /**
      * Constructor.
      *
-     * @param HoneypotConfig $config
-     *
      * @throws HoneypotException
      */
     public function __construct(HoneypotConfig $config)
@@ -58,8 +56,6 @@ public function __construct(HoneypotConfig $config)
 
     /**
      * Checks the request if honeypot field has data.
-     *
-     * @param RequestInterface $request
      */
     public function hasContent(RequestInterface $request)
     {
@@ -68,8 +64,6 @@ public function hasContent(RequestInterface $request)
 
     /**
      * Attaches Honeypot template to response.
-     *
-     * @param ResponseInterface $response
      */
     public function attachHoneypot(ResponseInterface $response)
     {
@@ -83,10 +77,6 @@ public function attachHoneypot(ResponseInterface $response)
     /**
      * Prepares the template by adding label
      * content and field name.
-     *
-     * @param string $template
-     *
-     * @return string
      */
     protected function prepareTemplate(string $template): string
     {
diff --git a/system/I18n/Exceptions/I18nException.php b/system/I18n/Exceptions/I18nException.php
index 0909a5e653af..a0af50782889 100644
--- a/system/I18n/Exceptions/I18nException.php
+++ b/system/I18n/Exceptions/I18nException.php
@@ -22,8 +22,6 @@ class I18nException extends FrameworkException
      * Thrown when createFromFormat fails to receive a valid
      * DateTime back from DateTime::createFromFormat.
      *
-     * @param string $format
-     *
      * @return static
      */
     public static function forInvalidFormat(string $format)
@@ -35,8 +33,6 @@ public static function forInvalidFormat(string $format)
      * Thrown when the numeric representation of the month falls
      * outside the range of allowed months.
      *
-     * @param string $month
-     *
      * @return static
      */
     public static function forInvalidMonth(string $month)
@@ -48,8 +44,6 @@ public static function forInvalidMonth(string $month)
      * Thrown when the supplied day falls outside the range
      * of allowed days.
      *
-     * @param string $day
-     *
      * @return static
      */
     public static function forInvalidDay(string $day)
@@ -61,9 +55,6 @@ public static function forInvalidDay(string $day)
      * Thrown when the day provided falls outside the allowed
      * last day for the given month.
      *
-     * @param string $lastDay
-     * @param string $day
-     *
      * @return static
      */
     public static function forInvalidOverDay(string $lastDay, string $day)
@@ -75,8 +66,6 @@ public static function forInvalidOverDay(string $lastDay, string $day)
      * Thrown when the supplied hour falls outside the
      * range of allowed hours.
      *
-     * @param string $hour
-     *
      * @return static
      */
     public static function forInvalidHour(string $hour)
@@ -88,8 +77,6 @@ public static function forInvalidHour(string $hour)
      * Thrown when the supplied minutes falls outside the
      * range of allowed minutes.
      *
-     * @param string $minutes
-     *
      * @return static
      */
     public static function forInvalidMinutes(string $minutes)
@@ -101,8 +88,6 @@ public static function forInvalidMinutes(string $minutes)
      * Thrown when the supplied seconds falls outside the
      * range of allowed seconds.
      *
-     * @param string $seconds
-     *
      * @return static
      */
     public static function forInvalidSeconds(string $seconds)
diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index 5f72edf36e3c..27d6ccc3ad5c 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -70,9 +70,7 @@ class Time extends DateTime
     /**
      * Time constructor.
      *
-     * @param string|null              $time
      * @param DateTimeZone|string|null $timezone
-     * @param string|null              $locale
      *
      * @throws Exception
      */
@@ -109,7 +107,6 @@ public function __construct(?string $time = null, $timezone = null, ?string $loc
      * Returns a new Time instance with the timezone set.
      *
      * @param DateTimeZone|string|null $timezone
-     * @param string|null              $locale
      *
      * @throws Exception
      *
@@ -126,9 +123,7 @@ public static function now($timezone = null, ?string $locale = null)
      * Example:
      *  $time = Time::parse('first day of December 2008');
      *
-     * @param string                   $datetime
      * @param DateTimeZone|string|null $timezone
-     * @param string|null              $locale
      *
      * @throws Exception
      *
@@ -143,7 +138,6 @@ public static function parse(string $datetime, $timezone = null, ?string $locale
      * Return a new time with the time set to midnight.
      *
      * @param DateTimeZone|string|null $timezone
-     * @param string|null              $locale
      *
      * @throws Exception
      *
@@ -158,7 +152,6 @@ public static function today($timezone = null, ?string $locale = null)
      * Returns an instance set to midnight yesterday morning.
      *
      * @param DateTimeZone|string|null $timezone
-     * @param string|null              $locale
      *
      * @throws Exception
      *
@@ -173,7 +166,6 @@ public static function yesterday($timezone = null, ?string $locale = null)
      * Returns an instance set to midnight tomorrow morning.
      *
      * @param DateTimeZone|string|null $timezone
-     * @param string|null              $locale
      *
      * @throws Exception
      *
@@ -188,11 +180,7 @@ public static function tomorrow($timezone = null, ?string $locale = null)
      * Returns a new instance based on the year, month and day. If any of those three
      * are left empty, will default to the current value.
      *
-     * @param int|null                 $year
-     * @param int|null                 $month
-     * @param int|null                 $day
      * @param DateTimeZone|string|null $timezone
-     * @param string|null              $locale
      *
      * @throws Exception
      *
@@ -206,11 +194,7 @@ public static function createFromDate(?int $year = null, ?int $month = null, ?in
     /**
      * Returns a new instance with the date set to today, and the time set to the values passed in.
      *
-     * @param int|null                 $hour
-     * @param int|null                 $minutes
-     * @param int|null                 $seconds
      * @param DateTimeZone|string|null $timezone
-     * @param string|null              $locale
      *
      * @throws Exception
      *
@@ -224,14 +208,7 @@ public static function createFromTime(?int $hour = null, ?int $minutes = null, ?
     /**
      * Returns a new instance with the date time values individually set.
      *
-     * @param int|null                 $year
-     * @param int|null                 $month
-     * @param int|null                 $day
-     * @param int|null                 $hour
-     * @param int|null                 $minutes
-     * @param int|null                 $seconds
      * @param DateTimeZone|string|null $timezone
-     * @param string|null              $locale
      *
      * @throws Exception
      *
@@ -273,9 +250,7 @@ public static function createFromFormat($format, $datetime, $timeZone = null)
     /**
      * Returns a new instance with the datetime set based on the provided UNIX timestamp.
      *
-     * @param int                      $timestamp
      * @param DateTimeZone|string|null $timezone
-     * @param string|null              $locale
      *
      * @throws Exception
      *
@@ -289,9 +264,6 @@ public static function createFromTimestamp(int $timestamp, $timezone = null, ?st
     /**
      * Takes an instance of DateTimeInterface and returns an instance of Time with it's same values.
      *
-     * @param DateTimeInterface $dateTime
-     * @param string|null       $locale
-     *
      * @throws Exception
      *
      * @return Time
@@ -307,9 +279,6 @@ public static function createFromInstance(DateTimeInterface $dateTime, ?string $
     /**
      * Takes an instance of DateTime and returns an instance of Time with it's same values.
      *
-     * @param DateTime    $dateTime
-     * @param string|null $locale
-     *
      * @throws Exception
      *
      * @return Time
@@ -347,7 +316,6 @@ public function toDateTime()
      *
      * @param DateTimeInterface|string|Time|null $datetime
      * @param DateTimeZone|string|null           $timezone
-     * @param string|null                        $locale
      *
      * @throws Exception
      */
@@ -372,8 +340,6 @@ public static function setTestNow($datetime = null, $timezone = null, ?string $l
 
     /**
      * Returns whether we have a testNow instance saved.
-     *
-     * @return bool
      */
     public static function hasTestNow(): bool
     {
@@ -388,8 +354,6 @@ public static function hasTestNow(): bool
      * Returns the localized Year
      *
      * @throws Exception
-     *
-     * @return string
      */
     public function getYear(): string
     {
@@ -400,8 +364,6 @@ public function getYear(): string
      * Returns the localized Month
      *
      * @throws Exception
-     *
-     * @return string
      */
     public function getMonth(): string
     {
@@ -412,8 +374,6 @@ public function getMonth(): string
      * Return the localized day of the month.
      *
      * @throws Exception
-     *
-     * @return string
      */
     public function getDay(): string
     {
@@ -424,8 +384,6 @@ public function getDay(): string
      * Return the localized hour (in 24-hour format).
      *
      * @throws Exception
-     *
-     * @return string
      */
     public function getHour(): string
     {
@@ -436,8 +394,6 @@ public function getHour(): string
      * Return the localized minutes in the hour.
      *
      * @throws Exception
-     *
-     * @return string
      */
     public function getMinute(): string
     {
@@ -448,8 +404,6 @@ public function getMinute(): string
      * Return the localized seconds
      *
      * @throws Exception
-     *
-     * @return string
      */
     public function getSecond(): string
     {
@@ -460,8 +414,6 @@ public function getSecond(): string
      * Return the index of the day of the week
      *
      * @throws Exception
-     *
-     * @return string
      */
     public function getDayOfWeek(): string
     {
@@ -472,8 +424,6 @@ public function getDayOfWeek(): string
      * Return the index of the day of the year
      *
      * @throws Exception
-     *
-     * @return string
      */
     public function getDayOfYear(): string
     {
@@ -484,8 +434,6 @@ public function getDayOfYear(): string
      * Return the index of the week in the month
      *
      * @throws Exception
-     *
-     * @return string
      */
     public function getWeekOfMonth(): string
     {
@@ -496,8 +444,6 @@ public function getWeekOfMonth(): string
      * Return the index of the week in the year
      *
      * @throws Exception
-     *
-     * @return string
      */
     public function getWeekOfYear(): string
     {
@@ -524,8 +470,6 @@ public function getAge()
      * Returns the number of the current quarter for the year.
      *
      * @throws Exception
-     *
-     * @return string
      */
     public function getQuarter(): string
     {
@@ -534,8 +478,6 @@ public function getQuarter(): string
 
     /**
      * Are we in daylight savings time currently?
-     *
-     * @return bool
      */
     public function getDst(): bool
     {
@@ -559,8 +501,6 @@ public function getDst(): bool
     /**
      * Returns boolean whether the passed timezone is the same as
      * the local timezone.
-     *
-     * @return bool
      */
     public function getLocal(): bool
     {
@@ -571,8 +511,6 @@ public function getLocal(): bool
 
     /**
      * Returns boolean whether object is in UTC.
-     *
-     * @return bool
      */
     public function getUtc(): bool
     {
@@ -581,8 +519,6 @@ public function getUtc(): bool
 
     /**
      * Returns the name of the current timezone.
-     *
-     * @return string
      */
     public function getTimezoneName(): string
     {
@@ -710,8 +646,7 @@ public function setSecond($value)
     /**
      * Helper method to do the heavy lifting of the 'setX' methods.
      *
-     * @param string $name
-     * @param int    $value
+     * @param int $value
      *
      * @throws Exception
      *
@@ -774,8 +709,6 @@ public function setTimestamp($timestamp)
     /**
      * Returns a new Time instance with $seconds added to the time.
      *
-     * @param int $seconds
-     *
      * @return static
      */
     public function addSeconds(int $seconds)
@@ -788,8 +721,6 @@ public function addSeconds(int $seconds)
     /**
      * Returns a new Time instance with $minutes added to the time.
      *
-     * @param int $minutes
-     *
      * @return static
      */
     public function addMinutes(int $minutes)
@@ -802,8 +733,6 @@ public function addMinutes(int $minutes)
     /**
      * Returns a new Time instance with $hours added to the time.
      *
-     * @param int $hours
-     *
      * @return static
      */
     public function addHours(int $hours)
@@ -816,8 +745,6 @@ public function addHours(int $hours)
     /**
      * Returns a new Time instance with $days added to the time.
      *
-     * @param int $days
-     *
      * @return static
      */
     public function addDays(int $days)
@@ -830,8 +757,6 @@ public function addDays(int $days)
     /**
      * Returns a new Time instance with $months added to the time.
      *
-     * @param int $months
-     *
      * @return static
      */
     public function addMonths(int $months)
@@ -844,8 +769,6 @@ public function addMonths(int $months)
     /**
      * Returns a new Time instance with $years added to the time.
      *
-     * @param int $years
-     *
      * @return static
      */
     public function addYears(int $years)
@@ -858,8 +781,6 @@ public function addYears(int $years)
     /**
      * Returns a new Time instance with $seconds subtracted from the time.
      *
-     * @param int $seconds
-     *
      * @return static
      */
     public function subSeconds(int $seconds)
@@ -872,8 +793,6 @@ public function subSeconds(int $seconds)
     /**
      * Returns a new Time instance with $minutes subtracted from the time.
      *
-     * @param int $minutes
-     *
      * @return static
      */
     public function subMinutes(int $minutes)
@@ -886,8 +805,6 @@ public function subMinutes(int $minutes)
     /**
      * Returns a new Time instance with $hours subtracted from the time.
      *
-     * @param int $hours
-     *
      * @return static
      */
     public function subHours(int $hours)
@@ -900,8 +817,6 @@ public function subHours(int $hours)
     /**
      * Returns a new Time instance with $days subtracted from the time.
      *
-     * @param int $days
-     *
      * @return static
      */
     public function subDays(int $days)
@@ -914,8 +829,6 @@ public function subDays(int $days)
     /**
      * Returns a new Time instance with $months subtracted from the time.
      *
-     * @param int $months
-     *
      * @return static
      */
     public function subMonths(int $months)
@@ -928,8 +841,6 @@ public function subMonths(int $months)
     /**
      * Returns a new Time instance with $hours subtracted from the time.
      *
-     * @param int $years
-     *
      * @return static
      */
     public function subYears(int $years)
@@ -996,8 +907,6 @@ public function toTimeString()
     /**
      * Returns the localized value of this instance in $format.
      *
-     * @param string|null $format
-     *
      * @throws Exception
      *
      * @return bool|string
@@ -1020,11 +929,8 @@ public function toLocalizedString(?string $format = null)
      * converted to UTC and compared that way.
      *
      * @param DateTimeInterface|string|Time $testTime
-     * @param string|null                   $timezone
      *
      * @throws Exception
-     *
-     * @return bool
      */
     public function equals($testTime, ?string $timezone = null): bool
     {
@@ -1041,11 +947,8 @@ public function equals($testTime, ?string $timezone = null): bool
      * Ensures that the times are identical, taking timezone into account.
      *
      * @param DateTimeInterface|string|Time $testTime
-     * @param string|null                   $timezone
      *
      * @throws Exception
-     *
-     * @return bool
      */
     public function sameAs($testTime, ?string $timezone = null): bool
     {
@@ -1067,12 +970,9 @@ public function sameAs($testTime, ?string $timezone = null): bool
      * Determines if the current instance's time is before $testTime,
      * after converting to UTC.
      *
-     * @param mixed       $testTime
-     * @param string|null $timezone
+     * @param mixed $testTime
      *
      * @throws Exception
-     *
-     * @return bool
      */
     public function isBefore($testTime, ?string $timezone = null): bool
     {
@@ -1086,12 +986,9 @@ public function isBefore($testTime, ?string $timezone = null): bool
      * Determines if the current instance's time is after $testTime,
      * after converting in UTC.
      *
-     * @param mixed       $testTime
-     * @param string|null $timezone
+     * @param mixed $testTime
      *
      * @throws Exception
-     *
-     * @return bool
      */
     public function isAfter($testTime, ?string $timezone = null): bool
     {
@@ -1163,8 +1060,7 @@ public function humanize()
     }
 
     /**
-     * @param mixed       $testTime
-     * @param string|null $timezone
+     * @param mixed $testTime
      *
      * @throws Exception
      *
@@ -1185,8 +1081,7 @@ public function difference($testTime, ?string $timezone = null)
     /**
      * Returns a Time instance with the timezone converted to UTC.
      *
-     * @param mixed       $time
-     * @param string|null $timezone
+     * @param mixed $time
      *
      * @throws Exception
      *
@@ -1227,10 +1122,6 @@ public function getCalendar()
 
     /**
      * Check a time string to see if it includes a relative date (like 'next Tuesday').
-     *
-     * @param string $time
-     *
-     * @return bool
      */
     protected static function hasRelativeKeywords(string $time): bool
     {
@@ -1246,8 +1137,6 @@ protected static function hasRelativeKeywords(string $time): bool
      * Outputs a short format version of the datetime.
      *
      * @throws Exception
-     *
-     * @return string
      */
     public function __toString(): string
     {
@@ -1281,8 +1170,6 @@ public function __get($name)
      * Allow for property-type checking to any getX method...
      *
      * @param string $name
-     *
-     * @return bool
      */
     public function __isset($name): bool
     {
diff --git a/system/I18n/TimeDifference.php b/system/I18n/TimeDifference.php
index 85656a8ca941..2fcd09bd38e0 100644
--- a/system/I18n/TimeDifference.php
+++ b/system/I18n/TimeDifference.php
@@ -99,9 +99,6 @@ class TimeDifference
     /**
      * Note: both parameters are required to be in the same timezone. No timezone
      * shifting is done internally.
-     *
-     * @param DateTime $currentTime
-     * @param DateTime $testTime
      */
     public function __construct(DateTime $currentTime, DateTime $testTime)
     {
@@ -117,8 +114,6 @@ public function __construct(DateTime $currentTime, DateTime $testTime)
     /**
      * Returns the number of years of difference between the two.
      *
-     * @param bool $raw
-     *
      * @return float|int
      */
     public function getYears(bool $raw = false)
@@ -135,8 +130,6 @@ public function getYears(bool $raw = false)
     /**
      * Returns the number of months difference between the two dates.
      *
-     * @param bool $raw
-     *
      * @return float|int
      */
     public function getMonths(bool $raw = false)
@@ -153,8 +146,6 @@ public function getMonths(bool $raw = false)
     /**
      * Returns the number of weeks difference between the two dates.
      *
-     * @param bool $raw
-     *
      * @return float|int
      */
     public function getWeeks(bool $raw = false)
@@ -171,8 +162,6 @@ public function getWeeks(bool $raw = false)
     /**
      * Returns the number of days difference between the two dates.
      *
-     * @param bool $raw
-     *
      * @return float|int
      */
     public function getDays(bool $raw = false)
@@ -189,8 +178,6 @@ public function getDays(bool $raw = false)
     /**
      * Returns the number of hours difference between the two dates.
      *
-     * @param bool $raw
-     *
      * @return float|int
      */
     public function getHours(bool $raw = false)
@@ -207,8 +194,6 @@ public function getHours(bool $raw = false)
     /**
      * Returns the number of minutes difference between the two dates.
      *
-     * @param bool $raw
-     *
      * @return float|int
      */
     public function getMinutes(bool $raw = false)
@@ -225,8 +210,6 @@ public function getMinutes(bool $raw = false)
     /**
      * Returns the number of seconds difference between the two dates.
      *
-     * @param bool $raw
-     *
      * @return int
      */
     public function getSeconds(bool $raw = false)
@@ -242,10 +225,6 @@ public function getSeconds(bool $raw = false)
 
     /**
      * Convert the time to human readable format
-     *
-     * @param string|null $locale
-     *
-     * @return string
      */
     public function humanize(?string $locale = null): string
     {
diff --git a/system/Images/Handlers/BaseHandler.php b/system/Images/Handlers/BaseHandler.php
index 887b6d4fd7e9..9e6217f5c564 100644
--- a/system/Images/Handlers/BaseHandler.php
+++ b/system/Images/Handlers/BaseHandler.php
@@ -136,8 +136,6 @@ public function __construct($config = null)
      * Sets another image for this handler to work on.
      * Keeps us from needing to continually instantiate the handler.
      *
-     * @param string $path
-     *
      * @return $this
      */
     public function withFile(string $path)
@@ -236,10 +234,7 @@ public function withResource()
     /**
      * Resize the image
      *
-     * @param int    $width
-     * @param int    $height
-     * @param bool   $maintainRatio If true, will get the closest match possible while keeping aspect ratio true.
-     * @param string $masterDim
+     * @param bool $maintainRatio If true, will get the closest match possible while keeping aspect ratio true.
      *
      * @return BaseHandler
      */
@@ -266,12 +261,8 @@ public function resize(int $width, int $height, bool $maintainRatio = false, str
      * is not provided, that value will be set the appropriate value based on offsets and
      * image dimensions.
      *
-     * @param int|null $width
-     * @param int|null $height
-     * @param int|null $x             X-axis coord to start cropping from the left of image
-     * @param int|null $y             Y-axis coord to start cropping from the top of image
-     * @param bool     $maintainRatio
-     * @param string   $masterDim
+     * @param int|null $x X-axis coord to start cropping from the left of image
+     * @param int|null $y Y-axis coord to start cropping from the top of image
      *
      * @return $this
      */
@@ -313,8 +304,6 @@ public function convert(int $imageType)
     /**
      * Rotates the image on the current canvas.
      *
-     * @param float $angle
-     *
      * @return $this
      */
     public function rotate(float $angle)
@@ -349,10 +338,6 @@ public function rotate(float $angle)
     /**
      * Flattens transparencies, default white background
      *
-     * @param int $red
-     * @param int $green
-     * @param int $blue
-     *
      * @return $this
      */
     public function flatten(int $red = 255, int $green = 255, int $blue = 255)
@@ -366,10 +351,6 @@ public function flatten(int $red = 255, int $green = 255, int $blue = 255)
     /**
      * Handler-specific method to flattening an image's transparencies.
      *
-     * @param int $red
-     * @param int $green
-     * @param int $blue
-     *
      * @return $this
      *
      * @internal
@@ -379,8 +360,6 @@ abstract protected function _flatten(int $red = 255, int $green = 255, int $blue
     /**
      * Handler-specific method to handle rotating an image in 90 degree increments.
      *
-     * @param int $angle
-     *
      * @return mixed
      */
     abstract protected function _rotate(int $angle);
@@ -407,8 +386,6 @@ public function flip(string $dir = 'vertical')
      * Handler-specific method to handle flipping an image along its
      * horizontal or vertical axis.
      *
-     * @param string $direction
-     *
      * @return $this
      */
     abstract protected function _flip(string $direction);
@@ -428,9 +405,6 @@ abstract protected function _flip(string $direction);
      *  - fontSize
      *  - shadowOffset
      *
-     * @param string $text
-     * @param array  $options
-     *
      * @return $this
      */
     public function text(string $text, array $options = [])
@@ -446,17 +420,12 @@ public function text(string $text, array $options = [])
 
     /**
      * Handler-specific method for overlaying text on an image.
-     *
-     * @param string $text
-     * @param array  $options
      */
     abstract protected function _text(string $text, array $options = []);
 
     /**
      * Handles the actual resizing of the image.
      *
-     * @param bool $maintainRatio
-     *
      * @return $this
      */
     abstract public function _resize(bool $maintainRatio = false);
@@ -574,9 +543,7 @@ public function getEXIF(?string $key = null, bool $silent = false)
      *  - bottom
      *  - bottom-right
      *
-     * @param int    $width
-     * @param int    $height
-     * @param string $position
+     * @param int $height
      *
      * @return BaseHandler
      */
@@ -603,8 +570,6 @@ public function fit(int $width, ?int $height = null, string $position = 'center'
      * @param float|int|null $height
      * @param float|int      $origWidth
      * @param float|int      $origHeight
-     *
-     * @return array
      */
     protected function calcAspectRatio($width, $height = null, $origWidth = 0, $origHeight = 0): array
     {
@@ -648,8 +613,6 @@ protected function calcAspectRatio($width, $height = null, $origWidth = 0, $orig
      * @param float|int $origWidth
      * @param float|int $origHeight
      * @param string    $position
-     *
-     * @return array
      */
     protected function calcCropCoords($width, $height, $origWidth, $origHeight, $position): array
     {
@@ -724,9 +687,6 @@ abstract public function getVersion();
      *    $image->resize(100, 200, true)
      *          ->save($target);
      *
-     * @param string|null $target
-     * @param int         $quality
-     *
      * @return bool
      */
     abstract public function save(?string $target = null, int $quality = 90);
@@ -734,8 +694,6 @@ abstract public function save(?string $target = null, int $quality = 90);
     /**
      * Does the driver-specific processing of the image.
      *
-     * @param string $action
-     *
      * @return mixed
      */
     abstract protected function process(string $action);
@@ -744,9 +702,6 @@ abstract protected function process(string $action);
      * Provide access to the Image class' methods if they don't exist
      * on the handler itself.
      *
-     * @param string $name
-     * @param array  $args
-     *
      * @return mixed
      */
     public function __call(string $name, array $args = [])
diff --git a/system/Images/Handlers/GDHandler.php b/system/Images/Handlers/GDHandler.php
index 7dac610b3557..db86d2fb5bc6 100644
--- a/system/Images/Handlers/GDHandler.php
+++ b/system/Images/Handlers/GDHandler.php
@@ -41,10 +41,6 @@ public function __construct($config = null)
     /**
      * Handles the rotation of an image resource.
      * Doesn't save the image, but replaces the current resource.
-     *
-     * @param int $angle
-     *
-     * @return bool
      */
     protected function _rotate(int $angle): bool
     {
@@ -72,10 +68,6 @@ protected function _rotate(int $angle): bool
     /**
      * Flattens transparencies
      *
-     * @param int $red
-     * @param int $green
-     * @param int $blue
-     *
      * @return $this
      */
     public function _flatten(int $red = 255, int $green = 255, int $blue = 255)
@@ -107,8 +99,6 @@ public function _flatten(int $red = 255, int $green = 255, int $blue = 255)
     /**
      * Flips an image along it's vertical or horizontal axis.
      *
-     * @param string $direction
-     *
      * @return $this
      */
     public function _flip(string $direction)
@@ -163,8 +153,6 @@ public function _crop()
     /**
      * Handles all of the grunt work of resizing, etc.
      *
-     * @param string $action
-     *
      * @return $this
      */
     protected function process(string $action)
@@ -219,11 +207,6 @@ protected function process(string $action)
      * Example:
      *    $image->resize(100, 200, true)
      *          ->save();
-     *
-     * @param string|null $target
-     * @param int         $quality
-     *
-     * @return bool
      */
     public function save(?string $target = null, int $quality = 90): bool
     {
@@ -303,9 +286,6 @@ public function save(?string $target = null, int $quality = 90): bool
      * This simply creates an image resource handle
      * based on the type of image being processed
      *
-     * @param string $path
-     * @param string $imageType
-     *
      * @return bool|resource
      */
     protected function createImage(string $path = '', string $imageType = '')
@@ -388,9 +368,6 @@ protected function getImageResource(string $path, int $imageType)
     /**
      * Add text overlay to an image.
      *
-     * @param string $text
-     * @param array  $options
-     *
      * @return void
      */
     protected function _text(string $text, array $options = [])
@@ -468,9 +445,7 @@ protected function _text(string $text, array $options = [])
     /**
      * Handler-specific method for overlaying text on an image.
      *
-     * @param string $text
-     * @param array  $options
-     * @param bool   $isShadow Whether we are drawing the dropshadow or actual text
+     * @param bool $isShadow Whether we are drawing the dropshadow or actual text
      *
      * @return void
      */
diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php
index 2ae46284237d..09a9d4a84a2d 100644
--- a/system/Images/Handlers/ImageMagickHandler.php
+++ b/system/Images/Handlers/ImageMagickHandler.php
@@ -58,8 +58,6 @@ public function __construct($config = null)
     /**
      * Handles the actual resizing of the image.
      *
-     * @param bool $maintainRatio
-     *
      * @throws Exception
      *
      * @return ImageMagickHandler
@@ -112,8 +110,6 @@ public function _crop()
      * Handles the rotation of an image resource.
      * Doesn't save the image, but replaces the current resource.
      *
-     * @param int $angle
-     *
      * @throws Exception
      *
      * @return $this
@@ -135,10 +131,6 @@ protected function _rotate(int $angle)
     /**
      * Flattens transparencies, default white background
      *
-     * @param int $red
-     * @param int $green
-     * @param int $blue
-     *
      * @throws Exception
      *
      * @return $this
@@ -160,8 +152,6 @@ public function _flatten(int $red = 255, int $green = 255, int $blue = 255)
     /**
      * Flips an image along it's vertical or horizontal axis.
      *
-     * @param string $direction
-     *
      * @throws Exception
      *
      * @return $this
@@ -182,8 +172,6 @@ public function _flip(string $direction)
 
     /**
      * Get driver version
-     *
-     * @return string
      */
     public function getVersion(): string
     {
@@ -198,9 +186,6 @@ public function getVersion(): string
     /**
      * Handles all of the grunt work of resizing, etc.
      *
-     * @param string $action
-     * @param int    $quality
-     *
      * @throws Exception
      *
      * @return array Lines of output from shell command
@@ -246,11 +231,6 @@ protected function process(string $action, int $quality = 100): array
      * Example:
      *    $image->resize(100, 200, true)
      *          ->save();
-     *
-     * @param string|null $target
-     * @param int         $quality
-     *
-     * @return bool
      */
     public function save(?string $target = null, int $quality = 90): bool
     {
@@ -346,9 +326,6 @@ protected function supportedFormatCheck()
     /**
      * Handler-specific method for overlaying text on an image.
      *
-     * @param string $text
-     * @param array  $options
-     *
      * @throws Exception
      */
     protected function _text(string $text, array $options = [])
diff --git a/system/Images/Image.php b/system/Images/Image.php
index 11b6a8175174..2eca30f92cab 100644
--- a/system/Images/Image.php
+++ b/system/Images/Image.php
@@ -64,8 +64,6 @@ class Image extends File
      * @param string      $targetPath The directory to store the file in
      * @param string|null $targetName The new name of the copied file.
      * @param int         $perms      File permissions to be applied after copy.
-     *
-     * @return bool
      */
     public function copy(string $targetPath, ?string $targetName = null, int $perms = 0644): bool
     {
@@ -95,8 +93,6 @@ public function copy(string $targetPath, ?string $targetName = null, int $perms
      *
      * A helper function that gets info about the file
      *
-     * @param bool $return
-     *
      * @return array|bool
      */
     public function getProperties(bool $return = false)
diff --git a/system/Images/ImageHandlerInterface.php b/system/Images/ImageHandlerInterface.php
index 1f98cff153e4..2b924720d2dd 100644
--- a/system/Images/ImageHandlerInterface.php
+++ b/system/Images/ImageHandlerInterface.php
@@ -19,10 +19,7 @@ interface ImageHandlerInterface
     /**
      * Resize the image
      *
-     * @param int    $width
-     * @param int    $height
-     * @param bool   $maintainRatio If true, will get the closest match possible while keeping aspect ratio true.
-     * @param string $masterDim
+     * @param bool $maintainRatio If true, will get the closest match possible while keeping aspect ratio true.
      *
      * @return $this
      */
@@ -33,12 +30,8 @@ public function resize(int $width, int $height, bool $maintainRatio = false, str
      * is not provided, that value will be set the appropriate value based on offsets and
      * image dimensions.
      *
-     * @param int|null $width
-     * @param int|null $height
-     * @param int|null $x             X-axis coord to start cropping from the left of image
-     * @param int|null $y             Y-axis coord to start cropping from the top of image
-     * @param bool     $maintainRatio
-     * @param string   $masterDim
+     * @param int|null $x X-axis coord to start cropping from the left of image
+     * @param int|null $y Y-axis coord to start cropping from the top of image
      *
      * @return $this
      */
@@ -57,8 +50,6 @@ public function convert(int $imageType);
     /**
      * Rotates the image on the current canvas.
      *
-     * @param float $angle
-     *
      * @return $this
      */
     public function rotate(float $angle);
@@ -66,10 +57,6 @@ public function rotate(float $angle);
     /**
      * Flattens transparencies, default white background
      *
-     * @param int $red
-     * @param int $green
-     * @param int $blue
-     *
      * @return $this
      */
     public function flatten(int $red = 255, int $green = 255, int $blue = 255);
@@ -115,10 +102,6 @@ public function flip(string $dir = 'vertical');
      *  - bottom
      *  - bottom-right
      *
-     * @param int    $width
-     * @param int    $height
-     * @param string $position
-     *
      * @return $this
      */
     public function fit(int $width, int $height, string $position);
@@ -138,9 +121,6 @@ public function fit(int $width, int $height, string $position);
      *  - fontSize
      *  - shadowOffset
      *
-     * @param string $text
-     * @param array  $options
-     *
      * @return $this
      */
     public function text(string $text, array $options = []);
@@ -153,7 +133,6 @@ public function text(string $text, array $options = []);
      *          ->save($target);
      *
      * @param string $target
-     * @param int    $quality
      *
      * @return bool
      */
diff --git a/system/Language/Language.php b/system/Language/Language.php
index 226e16a895f3..a6797f74ed9e 100644
--- a/system/Language/Language.php
+++ b/system/Language/Language.php
@@ -65,8 +65,6 @@ public function __construct(string $locale)
     /**
      * Sets the current locale to use when performing string lookups.
      *
-     * @param string $locale
-     *
      * @return $this
      */
     public function setLocale(?string $locale = null)
@@ -78,9 +76,6 @@ public function setLocale(?string $locale = null)
         return $this;
     }
 
-    /**
-     * @return string
-     */
     public function getLocale(): string
     {
         return $this->locale;
@@ -90,10 +85,7 @@ public function getLocale(): string
      * Parses the language string for a file, loads the file, if necessary,
      * getting the line.
      *
-     * @param string $line Line.
-     * @param array  $args Arguments.
-     *
-     * @return string|string[] Returns line.
+     * @return string|string[]
      */
     public function getLine(string $line, array $args = [])
     {
@@ -162,11 +154,6 @@ protected function getTranslationOutput(string $locale, string $file, string $pa
     /**
      * Parses the language string which should include the
      * filename as the first segment (separated by period).
-     *
-     * @param string $line
-     * @param string $locale
-     *
-     * @return array
      */
     protected function parseLine(string $line, string $locale): array
     {
@@ -177,19 +164,16 @@ protected function parseLine(string $line, string $locale): array
             $this->load($file, $locale);
         }
 
-        return [
-            $file,
-            $line,
-        ];
+        return [$file, $line];
     }
 
     /**
      * Advanced message formatting.
      *
-     * @param array|string $message Message.
-     * @param array        $args    Arguments.
+     * @param array|string $message
+     * @param string[]     $args
      *
-     * @return array|string Returns formatted message.
+     * @return array|string
      */
     protected function formatMessage($message, array $args = [])
     {
@@ -213,10 +197,6 @@ protected function formatMessage($message, array $args = [])
      * will return the file's contents, otherwise will merge with
      * the existing language lines.
      *
-     * @param string $file
-     * @param string $locale
-     * @param bool   $return
-     *
      * @return array|void
      */
     protected function load(string $file, string $locale, bool $return = false)
@@ -255,10 +235,6 @@ protected function load(string $file, string $locale, bool $return = false)
     /**
      * A simple method for including files that can be
      * overridden during testing.
-     *
-     * @param string $path
-     *
-     * @return array
      */
     protected function requireFile(string $path): array
     {
diff --git a/system/Log/Handlers/BaseHandler.php b/system/Log/Handlers/BaseHandler.php
index 5f03c7264f5b..97d1281deb1a 100644
--- a/system/Log/Handlers/BaseHandler.php
+++ b/system/Log/Handlers/BaseHandler.php
@@ -32,8 +32,6 @@ abstract class BaseHandler implements HandlerInterface
 
     /**
      * Constructor
-     *
-     * @param array $config
      */
     public function __construct(array $config)
     {
@@ -43,10 +41,6 @@ public function __construct(array $config)
     /**
      * Checks whether the Handler will handle logging items of this
      * log Level.
-     *
-     * @param string $level
-     *
-     * @return bool
      */
     public function canHandle(string $level): bool
     {
@@ -61,17 +55,11 @@ public function canHandle(string $level): bool
      *
      * @param string $level
      * @param string $message
-     *
-     * @return bool
      */
     abstract public function handle($level, $message): bool;
 
     /**
      * Stores the date format to use while logging messages.
-     *
-     * @param string $format
-     *
-     * @return HandlerInterface
      */
     public function setDateFormat(string $format): HandlerInterface
     {
diff --git a/system/Log/Handlers/ChromeLoggerHandler.php b/system/Log/Handlers/ChromeLoggerHandler.php
index 25d541efb4bc..3d03e79f104e 100644
--- a/system/Log/Handlers/ChromeLoggerHandler.php
+++ b/system/Log/Handlers/ChromeLoggerHandler.php
@@ -76,8 +76,6 @@ class ChromeLoggerHandler extends BaseHandler
 
     /**
      * Constructor
-     *
-     * @param array $config
      */
     public function __construct(array $config = [])
     {
@@ -94,8 +92,6 @@ public function __construct(array $config = [])
      *
      * @param string $level
      * @param string $message
-     *
-     * @return bool
      */
     public function handle($level, $message): bool
     {
diff --git a/system/Log/Handlers/ErrorlogHandler.php b/system/Log/Handlers/ErrorlogHandler.php
index 078b1cd11727..a3c9dfabb6e8 100644
--- a/system/Log/Handlers/ErrorlogHandler.php
+++ b/system/Log/Handlers/ErrorlogHandler.php
@@ -64,8 +64,6 @@ public function __construct(array $config = [])
      *
      * @param string $level
      * @param string $message
-     *
-     * @return bool
      */
     public function handle($level, $message): bool
     {
@@ -77,11 +75,6 @@ public function handle($level, $message): bool
     /**
      * Extracted call to `error_log()` in order to be tested.
      *
-     * @param string $message
-     * @param int    $messageType
-     *
-     * @return bool
-     *
      * @codeCoverageIgnore
      */
     protected function errorLog(string $message, int $messageType): bool
diff --git a/system/Log/Handlers/FileHandler.php b/system/Log/Handlers/FileHandler.php
index 2e519a1448c0..1fc929077d45 100644
--- a/system/Log/Handlers/FileHandler.php
+++ b/system/Log/Handlers/FileHandler.php
@@ -42,8 +42,6 @@ class FileHandler extends BaseHandler
 
     /**
      * Constructor
-     *
-     * @param array $config
      */
     public function __construct(array $config = [])
     {
@@ -67,8 +65,6 @@ public function __construct(array $config = [])
      * @param string $message
      *
      * @throws Exception
-     *
-     * @return bool
      */
     public function handle($level, $message): bool
     {
diff --git a/system/Log/Handlers/HandlerInterface.php b/system/Log/Handlers/HandlerInterface.php
index 978c36a56fc9..7b809a320d65 100644
--- a/system/Log/Handlers/HandlerInterface.php
+++ b/system/Log/Handlers/HandlerInterface.php
@@ -24,26 +24,18 @@ interface HandlerInterface
      *
      * @param string $level
      * @param string $message
-     *
-     * @return bool
      */
     public function handle($level, $message): bool;
 
     /**
      * Checks whether the Handler will handle logging items of this
      * log Level.
-     *
-     * @param string $level
-     *
-     * @return bool
      */
     public function canHandle(string $level): bool;
 
     /**
      * Sets the preferred date format to use when logging.
      *
-     * @param string $format
-     *
      * @return HandlerInterface
      */
     public function setDateFormat(string $format);
diff --git a/system/Log/Logger.php b/system/Log/Logger.php
index 85f56ed186bb..cfceeb3f5449 100644
--- a/system/Log/Logger.php
+++ b/system/Log/Logger.php
@@ -113,7 +113,6 @@ class Logger implements LoggerInterface
      * Constructor.
      *
      * @param \Config\Logger $config
-     * @param bool           $debug
      *
      * @throws RuntimeException
      */
@@ -154,9 +153,6 @@ public function __construct($config, bool $debug = CI_DEBUG)
      * System is unusable.
      *
      * @param string $message
-     * @param array  $context
-     *
-     * @return bool
      */
     public function emergency($message, array $context = []): bool
     {
@@ -170,9 +166,6 @@ public function emergency($message, array $context = []): bool
      * trigger the SMS alerts and wake you up.
      *
      * @param string $message
-     * @param array  $context
-     *
-     * @return bool
      */
     public function alert($message, array $context = []): bool
     {
@@ -185,9 +178,6 @@ public function alert($message, array $context = []): bool
      * Example: Application component unavailable, unexpected exception.
      *
      * @param string $message
-     * @param array  $context
-     *
-     * @return bool
      */
     public function critical($message, array $context = []): bool
     {
@@ -199,9 +189,6 @@ public function critical($message, array $context = []): bool
      * be logged and monitored.
      *
      * @param string $message
-     * @param array  $context
-     *
-     * @return bool
      */
     public function error($message, array $context = []): bool
     {
@@ -215,9 +202,6 @@ public function error($message, array $context = []): bool
      * that are not necessarily wrong.
      *
      * @param string $message
-     * @param array  $context
-     *
-     * @return bool
      */
     public function warning($message, array $context = []): bool
     {
@@ -228,9 +212,6 @@ public function warning($message, array $context = []): bool
      * Normal but significant events.
      *
      * @param string $message
-     * @param array  $context
-     *
-     * @return bool
      */
     public function notice($message, array $context = []): bool
     {
@@ -243,9 +224,6 @@ public function notice($message, array $context = []): bool
      * Example: User logs in, SQL logs.
      *
      * @param string $message
-     * @param array  $context
-     *
-     * @return bool
      */
     public function info($message, array $context = []): bool
     {
@@ -256,9 +234,6 @@ public function info($message, array $context = []): bool
      * Detailed debug information.
      *
      * @param string $message
-     * @param array  $context
-     *
-     * @return bool
      */
     public function debug($message, array $context = []): bool
     {
@@ -270,9 +245,6 @@ public function debug($message, array $context = []): bool
      *
      * @param mixed  $level
      * @param string $message
-     * @param array  $context
-     *
-     * @return bool
      */
     public function log($level, $message, array $context = []): bool
     {
@@ -341,7 +313,6 @@ public function log($level, $message, array $context = []): bool
      * {line}
      *
      * @param mixed $message
-     * @param array $context
      *
      * @return mixed
      */
@@ -402,8 +373,6 @@ protected function interpolate($message, array $context = [])
      * Determines the file and line that the logging call
      * was made from by analyzing the backtrace.
      * Find the earliest stack frame that is part of our logging system.
-     *
-     * @return array
      */
     public function determineFile(): array
     {
@@ -452,10 +421,6 @@ public function determineFile(): array
      *  /var/www/site/app/Controllers/Home.php
      *      becomes:
      *  APPPATH/Controllers/Home.php
-     *
-     * @param string $file
-     *
-     * @return string
      */
     protected function cleanFileNames(string $file): string
     {
diff --git a/system/Model.php b/system/Model.php
index a18953020d0c..8c36b5d5ace8 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -286,8 +286,6 @@ protected function doInsertBatch(?array $set = null, ?bool $escape = null, int $
      *
      * @param array|int|string|null $id   ID
      * @param array|null            $data Data
-     *
-     * @return bool
      */
     protected function doUpdate($id = null, $data = null): bool
     {
@@ -603,8 +601,6 @@ public function set($key, ?string $value = '', ?bool $escape = null)
      * If this method return false insert operation will be executed
      *
      * @param array|object $data Data
-     *
-     * @return bool
      */
     protected function shouldUpdate($data): bool
     {
@@ -652,8 +648,6 @@ public function insert($data = null, bool $returnID = true)
      * @param array|object|null     $data Data
      *
      * @throws ReflectionException
-     *
-     * @return bool
      */
     public function update($id = null, $data = null): bool
     {
@@ -721,8 +715,6 @@ public function __get(string $name)
      * Checks for the existence of properties across this model, builder, and db connection.
      *
      * @param string $name Name
-     *
-     * @return bool
      */
     public function __isset(string $name): bool
     {
@@ -778,8 +770,6 @@ public function __call(string $name, array $params)
      *
      * @throws ReflectionException
      *
-     * @return array
-     *
      * @codeCoverageIgnore
      *
      * @deprecated since 4.1
diff --git a/system/Modules/Modules.php b/system/Modules/Modules.php
index f8de857c6fc0..ade3e693ceea 100644
--- a/system/Modules/Modules.php
+++ b/system/Modules/Modules.php
@@ -41,10 +41,6 @@ class Modules
 
     /**
      * Should the application auto-discover the requested resource.
-     *
-     * @param string $alias
-     *
-     * @return bool
      */
     public function shouldDiscover(string $alias): bool
     {
diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
index d1375781688f..a23f710f3c73 100644
--- a/system/Pager/Pager.php
+++ b/system/Pager/Pager.php
@@ -64,9 +64,6 @@ class Pager implements PagerInterface
 
     /**
      * Constructor.
-     *
-     * @param PagerConfig       $config
-     * @param RendererInterface $view
      */
     public function __construct(PagerConfig $config, RendererInterface $view)
     {
@@ -77,10 +74,7 @@ public function __construct(PagerConfig $config, RendererInterface $view)
     /**
      * Handles creating and displaying the
      *
-     * @param string $group
      * @param string $template The output template alias to render.
-     *
-     * @return string
      */
     public function links(string $group = 'default', string $template = 'default_full'): string
     {
@@ -91,11 +85,6 @@ public function links(string $group = 'default', string $template = 'default_ful
 
     /**
      * Creates simple Next/Previous links, instead of full pagination.
-     *
-     * @param string $group
-     * @param string $template
-     *
-     * @return string
      */
     public function simpleLinks(string $group = 'default', string $template = 'default_simple'): string
     {
@@ -108,14 +97,9 @@ public function simpleLinks(string $group = 'default', string $template = 'defau
      * Allows for a simple, manual, form of pagination where all of the data
      * is provided by the user. The URL is the current URI.
      *
-     * @param int         $page
-     * @param int|null    $perPage
-     * @param int         $total
      * @param string      $template The output template alias to render.
      * @param int         $segment  (whether page number is provided by URI segment)
      * @param string|null $group    optional group (i.e. if we'd like to define custom path)
-     *
-     * @return string
      */
     public function makeLinks(int $page, ?int $perPage, int $total, string $template = 'default_full', int $segment = 0, ?string $group = 'default'): string
     {
@@ -129,11 +113,6 @@ public function makeLinks(int $page, ?int $perPage, int $total, string $template
     /**
      * Does the actual work of displaying the view file. Used internally
      * by links(), simpleLinks(), and makeLinks().
-     *
-     * @param string $group
-     * @param string $template
-     *
-     * @return string
      */
     protected function displayLinks(string $group, string $template): string
     {
@@ -150,12 +129,6 @@ protected function displayLinks(string $group, string $template): string
      * Stores a set of pagination data for later display. Most commonly used
      * by the model to automate the process.
      *
-     * @param string   $group
-     * @param int      $page
-     * @param int|null $perPage
-     * @param int      $total
-     * @param int      $segment
-     *
      * @return $this
      */
     public function store(string $group, int $page, ?int $perPage, int $total, int $segment = 0)
@@ -184,9 +157,6 @@ public function store(string $group, int $page, ?int $perPage, int $total, int $
     /**
      * Sets segment for a group.
      *
-     * @param int    $number
-     * @param string $group
-     *
      * @return mixed
      */
     public function setSegment(int $number, string $group = 'default')
@@ -199,9 +169,6 @@ public function setSegment(int $number, string $group = 'default')
     /**
      * Sets the path that an aliased group of links will use.
      *
-     * @param string $path
-     * @param string $group
-     *
      * @return mixed
      */
     public function setPath(string $path, string $group = 'default')
@@ -215,10 +182,6 @@ public function setPath(string $path, string $group = 'default')
 
     /**
      * Returns the total number of items in data store.
-     *
-     * @param string $group
-     *
-     * @return int
      */
     public function getTotal(string $group = 'default'): int
     {
@@ -229,10 +192,6 @@ public function getTotal(string $group = 'default'): int
 
     /**
      * Returns the total number of pages.
-     *
-     * @param string $group
-     *
-     * @return int
      */
     public function getPageCount(string $group = 'default'): int
     {
@@ -243,10 +202,6 @@ public function getPageCount(string $group = 'default'): int
 
     /**
      * Returns the number of the current page of results.
-     *
-     * @param string $group
-     *
-     * @return int
      */
     public function getCurrentPage(string $group = 'default'): int
     {
@@ -257,10 +212,6 @@ public function getCurrentPage(string $group = 'default'): int
 
     /**
      * Tells whether this group of results has any more pages of results.
-     *
-     * @param string $group
-     *
-     * @return bool
      */
     public function hasMore(string $group = 'default'): bool
     {
@@ -272,8 +223,6 @@ public function hasMore(string $group = 'default'): bool
     /**
      * Returns the last page, if we have a total that we can calculate with.
      *
-     * @param string $group
-     *
      * @return int|null
      */
     public function getLastPage(string $group = 'default')
@@ -289,10 +238,6 @@ public function getLastPage(string $group = 'default')
 
     /**
      * Determines the first page # that should be shown.
-     *
-     * @param string $group
-     *
-     * @return int
      */
     public function getFirstPage(string $group = 'default'): int
     {
@@ -305,10 +250,6 @@ public function getFirstPage(string $group = 'default'): int
     /**
      * Returns the URI for a specific page for the specified group.
      *
-     * @param int|null $page
-     * @param string   $group
-     * @param bool     $returnObject
-     *
      * @return string|URI
      */
     public function getPageURI(?int $page = null, string $group = 'default', bool $returnObject = false)
@@ -344,9 +285,6 @@ public function getPageURI(?int $page = null, string $group = 'default', bool $r
     /**
      * Returns the full URI to the next page of results, or null.
      *
-     * @param string $group
-     * @param bool   $returnObject
-     *
      * @return string|null
      */
     public function getNextPageURI(string $group = 'default', bool $returnObject = false)
@@ -371,9 +309,6 @@ public function getNextPageURI(string $group = 'default', bool $returnObject = f
     /**
      * Returns the full URL to the previous page of results, or null.
      *
-     * @param string $group
-     * @param bool   $returnObject
-     *
      * @return string|null
      */
     public function getPreviousPageURI(string $group = 'default', bool $returnObject = false)
@@ -397,10 +332,6 @@ public function getPreviousPageURI(string $group = 'default', bool $returnObject
 
     /**
      * Returns the number of results per page that should be shown.
-     *
-     * @param string $group
-     *
-     * @return int
      */
     public function getPerPage(string $group = 'default'): int
     {
@@ -414,10 +345,6 @@ public function getPerPage(string $group = 'default'): int
      * total, per_page, current_page, last_page, next_url, prev_url, from, to.
      * Does not include the actual data. This data is suitable for adding
      * a 'data' object to with the result set and converting to JSON.
-     *
-     * @param string $group
-     *
-     * @return array
      */
     public function getDetails(string $group = 'default'): array
     {
@@ -437,8 +364,6 @@ public function getDetails(string $group = 'default'): array
     /**
      * Sets only allowed queries on pagination links.
      *
-     * @param array $queries
-     *
      * @return Pager
      */
     public function only(array $queries): self
@@ -451,8 +376,7 @@ public function only(array $queries): self
     /**
      * Ensures that an array exists for the group specified.
      *
-     * @param string $group
-     * @param int    $perPage
+     * @param int $perPage
      */
     protected function ensureGroup(string $group, ?int $perPage = null)
     {
@@ -478,8 +402,6 @@ protected function ensureGroup(string $group, ?int $perPage = null)
 
     /**
      * Calculating the current page
-     *
-     * @param string $group
      */
     protected function calculateCurrentPage(string $group)
     {
diff --git a/system/Pager/PagerInterface.php b/system/Pager/PagerInterface.php
index 1a8268d43a18..73c15473e78e 100644
--- a/system/Pager/PagerInterface.php
+++ b/system/Pager/PagerInterface.php
@@ -21,20 +21,12 @@ interface PagerInterface
     /**
      * Handles creating and displaying the
      *
-     * @param string $group
      * @param string $template The output template alias to render.
-     *
-     * @return string
      */
     public function links(string $group = 'default', string $template = 'default'): string;
 
     /**
      * Creates simple Next/Previous links, instead of full pagination.
-     *
-     * @param string $group
-     * @param string $template
-     *
-     * @return string
      */
     public function simpleLinks(string $group = 'default', string $template = 'default'): string;
 
@@ -42,12 +34,7 @@ public function simpleLinks(string $group = 'default', string $template = 'defau
      * Allows for a simple, manual, form of pagination where all of the data
      * is provided by the user. The URL is the current URI.
      *
-     * @param int    $page
-     * @param int    $perPage
-     * @param int    $total
      * @param string $template The output template alias to render.
-     *
-     * @return string
      */
     public function makeLinks(int $page, int $perPage, int $total, string $template = 'default'): string;
 
@@ -55,11 +42,6 @@ public function makeLinks(int $page, int $perPage, int $total, string $template
      * Stores a set of pagination data for later display. Most commonly used
      * by the model to automate the process.
      *
-     * @param string $group
-     * @param int    $page
-     * @param int    $perPage
-     * @param int    $total
-     *
      * @return mixed
      */
     public function store(string $group, int $page, int $perPage, int $total);
@@ -67,56 +49,35 @@ public function store(string $group, int $page, int $perPage, int $total);
     /**
      * Sets the path that an aliased group of links will use.
      *
-     * @param string $path
-     * @param string $group
-     *
      * @return mixed
      */
     public function setPath(string $path, string $group = 'default');
 
     /**
      * Returns the total number of pages.
-     *
-     * @param string $group
-     *
-     * @return int
      */
     public function getPageCount(string $group = 'default'): int;
 
     /**
      * Returns the number of the current page of results.
-     *
-     * @param string $group
-     *
-     * @return int
      */
     public function getCurrentPage(string $group = 'default'): int;
 
     /**
      * Returns the URI for a specific page for the specified group.
      *
-     * @param int|null $page
-     * @param string   $group
-     * @param bool     $returnObject
-     *
      * @return string|URI
      */
     public function getPageURI(?int $page = null, string $group = 'default', bool $returnObject = false);
 
     /**
      * Tells whether this group of results has any more pages of results.
-     *
-     * @param string $group
-     *
-     * @return bool
      */
     public function hasMore(string $group = 'default'): bool;
 
     /**
      * Returns the first page.
      *
-     * @param string $group
-     *
      * @return int
      */
     public function getFirstPage(string $group = 'default');
@@ -124,8 +85,6 @@ public function getFirstPage(string $group = 'default');
     /**
      * Returns the last page, if we have a total that we can calculate with.
      *
-     * @param string $group
-     *
      * @return int|null
      */
     public function getLastPage(string $group = 'default');
@@ -133,8 +92,6 @@ public function getLastPage(string $group = 'default');
     /**
      * Returns the full URI to the next page of results, or null.
      *
-     * @param string $group
-     *
      * @return string|null
      */
     public function getNextPageURI(string $group = 'default');
@@ -142,18 +99,12 @@ public function getNextPageURI(string $group = 'default');
     /**
      * Returns the full URL to the previous page of results, or null.
      *
-     * @param string $group
-     *
      * @return string|null
      */
     public function getPreviousPageURI(string $group = 'default');
 
     /**
      * Returns the number of results per page that should be shown.
-     *
-     * @param string $group
-     *
-     * @return int
      */
     public function getPerPage(string $group = 'default'): int;
 
@@ -162,10 +113,6 @@ public function getPerPage(string $group = 'default'): int;
      * total, per_page, current_page, last_page, next_url, prev_url, from, to.
      * Does not include the actual data. This data is suitable for adding
      * a 'data' object to with the result set and converting to JSON.
-     *
-     * @param string $group
-     *
-     * @return array
      */
     public function getDetails(string $group = 'default'): array;
 }
diff --git a/system/Pager/PagerRenderer.php b/system/Pager/PagerRenderer.php
index 681e7c697211..e1f20a5492a6 100644
--- a/system/Pager/PagerRenderer.php
+++ b/system/Pager/PagerRenderer.php
@@ -80,8 +80,6 @@ class PagerRenderer
 
     /**
      * Constructor.
-     *
-     * @param array $details
      */
     public function __construct(array $details)
     {
@@ -100,8 +98,6 @@ public function __construct(array $details)
      * side of the current page. Adjusts the first and last counts
      * to reflect it.
      *
-     * @param int|null $count
-     *
      * @return PagerRenderer
      */
     public function setSurroundCount(?int $count = null)
@@ -113,8 +109,6 @@ public function setSurroundCount(?int $count = null)
 
     /**
      * Checks to see if there is a "previous" page before our "first" page.
-     *
-     * @return bool
      */
     public function hasPrevious(): bool
     {
@@ -149,8 +143,6 @@ public function getPrevious()
 
     /**
      * Checks to see if there is a "next" page after our "last" page.
-     *
-     * @return bool
      */
     public function hasNext(): bool
     {
@@ -185,8 +177,6 @@ public function getNext()
 
     /**
      * Returns the URI of the first page.
-     *
-     * @return string
      */
     public function getFirst(): string
     {
@@ -203,8 +193,6 @@ public function getFirst(): string
 
     /**
      * Returns the URI of the last page.
-     *
-     * @return string
      */
     public function getLast(): string
     {
@@ -221,8 +209,6 @@ public function getLast(): string
 
     /**
      * Returns the URI of the current page.
-     *
-     * @return string
      */
     public function getCurrent(): string
     {
@@ -242,8 +228,6 @@ public function getCurrent(): string
      * is represented by another array containing of the URI the link
      * should go to, the title (number) of the link, and a boolean
      * value representing whether this link is active or not.
-     *
-     * @return array
      */
     public function links(): array
     {
@@ -282,8 +266,6 @@ protected function updatePages(?int $count = null)
 
     /**
      * Checks to see if there is a "previous" page before our "first" page.
-     *
-     * @return bool
      */
     public function hasPreviousPage(): bool
     {
@@ -316,8 +298,6 @@ public function getPreviousPage()
 
     /**
      * Checks to see if there is a "next" page after our "last" page.
-     *
-     * @return bool
      */
     public function hasNextPage(): bool
     {
@@ -350,8 +330,6 @@ public function getNextPage()
 
     /**
      * Returns the page number of the first page.
-     *
-     * @return int
      */
     public function getFirstPageNumber(): int
     {
@@ -360,8 +338,6 @@ public function getFirstPageNumber(): int
 
     /**
      * Returns the page number of the current page.
-     *
-     * @return int
      */
     public function getCurrentPageNumber(): int
     {
@@ -370,8 +346,6 @@ public function getCurrentPageNumber(): int
 
     /**
      * Returns the page number of the last page.
-     *
-     * @return int
      */
     public function getLastPageNumber(): int
     {
@@ -380,8 +354,6 @@ public function getLastPageNumber(): int
 
     /**
      * Returns total number of pages.
-     *
-     * @return int
      */
     public function getPageCount(): int
     {
@@ -390,8 +362,6 @@ public function getPageCount(): int
 
     /**
      * Returns the previous page number.
-     *
-     * @return int|null
      */
     public function getPreviousPageNumber(): ?int
     {
@@ -400,8 +370,6 @@ public function getPreviousPageNumber(): ?int
 
     /**
      * Returns the next page number.
-     *
-     * @return int|null
      */
     public function getNextPageNumber(): ?int
     {
diff --git a/system/RESTful/BaseResource.php b/system/RESTful/BaseResource.php
index 0c7bc37f16c4..d699230b6fa5 100644
--- a/system/RESTful/BaseResource.php
+++ b/system/RESTful/BaseResource.php
@@ -30,10 +30,6 @@ abstract class BaseResource extends Controller
 
     /**
      * Constructor.
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     * @param LoggerInterface   $logger
      */
     public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
     {
diff --git a/system/RESTful/ResourceController.php b/system/RESTful/ResourceController.php
index da72be0ea849..3dae1b80d253 100644
--- a/system/RESTful/ResourceController.php
+++ b/system/RESTful/ResourceController.php
@@ -101,8 +101,6 @@ public function delete($id = null)
     /**
      * Set/change the expected response representation for returned objects
      *
-     * @param string $format
-     *
      * @return void
      */
     public function setFormat(string $format = 'json')
diff --git a/system/Router/Exceptions/RouterException.php b/system/Router/Exceptions/RouterException.php
index bd657a335ded..8c469d967b78 100644
--- a/system/Router/Exceptions/RouterException.php
+++ b/system/Router/Exceptions/RouterException.php
@@ -42,9 +42,6 @@ public static function forMissingDefaultRoute()
     /**
      * Throw when controller or its method is not found.
      *
-     * @param string $controller
-     * @param string $method
-     *
      * @return RouterException
      */
     public static function forControllerNotFound(string $controller, string $method)
@@ -55,8 +52,6 @@ public static function forControllerNotFound(string $controller, string $method)
     /**
      * Throw when route is not valid.
      *
-     * @param string $route
-     *
      * @return RouterException
      */
     public static function forInvalidRoute(string $route)
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 639df606dd9a..a5b5a52c17af 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -212,9 +212,6 @@ class RouteCollection implements RouteCollectionInterface
 
     /**
      * Constructor
-     *
-     * @param FileLocator $locator
-     * @param Modules     $moduleConfig
      */
     public function __construct(FileLocator $locator, Modules $moduleConfig)
     {
@@ -231,9 +228,6 @@ public function __construct(FileLocator $locator, Modules $moduleConfig)
      * multiple placeholders added at once.
      *
      * @param array|string $placeholder
-     * @param string|null  $pattern
-     *
-     * @return RouteCollectionInterface
      */
     public function addPlaceholder($placeholder, ?string $pattern = null): RouteCollectionInterface
     {
@@ -249,10 +243,6 @@ public function addPlaceholder($placeholder, ?string $pattern = null): RouteColl
     /**
      * Sets the default namespace to use for Controllers when no other
      * namespace has been specified.
-     *
-     * @param string $value
-     *
-     * @return RouteCollectionInterface
      */
     public function setDefaultNamespace(string $value): RouteCollectionInterface
     {
@@ -265,10 +255,6 @@ public function setDefaultNamespace(string $value): RouteCollectionInterface
     /**
      * Sets the default controller to use when no other controller has been
      * specified.
-     *
-     * @param string $value
-     *
-     * @return RouteCollectionInterface
      */
     public function setDefaultController(string $value): RouteCollectionInterface
     {
@@ -280,10 +266,6 @@ public function setDefaultController(string $value): RouteCollectionInterface
     /**
      * Sets the default method to call on the controller when no other
      * method has been set in the route.
-     *
-     * @param string $value
-     *
-     * @return RouteCollectionInterface
      */
     public function setDefaultMethod(string $value): RouteCollectionInterface
     {
@@ -298,10 +280,6 @@ public function setDefaultMethod(string $value): RouteCollectionInterface
      * create more meaning and make it easier for the search engine to
      * find words and meaning in the URI for better SEO. But it
      * doesn't work well with PHP method names....
-     *
-     * @param bool $value
-     *
-     * @return RouteCollectionInterface
      */
     public function setTranslateURIDashes(bool $value): RouteCollectionInterface
     {
@@ -317,10 +295,6 @@ public function setTranslateURIDashes(bool $value): RouteCollectionInterface
      * defined routes.
      *
      * If FALSE, will stop searching and do NO automatic routing.
-     *
-     * @param bool $value
-     *
-     * @return RouteCollectionInterface
      */
     public function setAutoRoute(bool $value): RouteCollectionInterface
     {
@@ -337,8 +311,6 @@ public function setAutoRoute(bool $value): RouteCollectionInterface
      * This setting is passed to the Router class and handled there.
      *
      * @param callable|null $callable
-     *
-     * @return RouteCollectionInterface
      */
     public function set404Override($callable = null): RouteCollectionInterface
     {
@@ -391,10 +363,6 @@ protected function discoverRoutes()
     /**
      * Sets the default constraint to be used in the system. Typically
      * for use with the 'resource' method.
-     *
-     * @param string $placeholder
-     *
-     * @return RouteCollectionInterface
      */
     public function setDefaultConstraint(string $placeholder): RouteCollectionInterface
     {
@@ -407,8 +375,6 @@ public function setDefaultConstraint(string $placeholder): RouteCollectionInterf
 
     /**
      * Returns the name of the default controller. With Namespace.
-     *
-     * @return string
      */
     public function getDefaultController(): string
     {
@@ -417,8 +383,6 @@ public function getDefaultController(): string
 
     /**
      * Returns the name of the default method to use within the controller.
-     *
-     * @return string
      */
     public function getDefaultMethod(): string
     {
@@ -427,8 +391,6 @@ public function getDefaultMethod(): string
 
     /**
      * Returns the default namespace as set in the Routes config file.
-     *
-     * @return string
      */
     public function getDefaultNamespace(): string
     {
@@ -437,8 +399,6 @@ public function getDefaultNamespace(): string
 
     /**
      * Returns the current value of the translateURIDashes setting.
-     *
-     * @return bool
      */
     public function shouldTranslateURIDashes(): bool
     {
@@ -447,8 +407,6 @@ public function shouldTranslateURIDashes(): bool
 
     /**
      * Returns the flag that tells whether to autoRoute URI against Controllers.
-     *
-     * @return bool
      */
     public function shouldAutoRoute(): bool
     {
@@ -457,10 +415,6 @@ public function shouldAutoRoute(): bool
 
     /**
      * Returns the raw array of available routes.
-     *
-     * @param string|null $verb
-     *
-     * @return array
      */
     public function getRoutes(?string $verb = null): array
     {
@@ -509,11 +463,6 @@ public function getRoutes(?string $verb = null): array
 
     /**
      * Returns one or all routes options
-     *
-     * @param string|null $from
-     * @param string|null $verb
-     *
-     * @return array
      */
     public function getRoutesOptions(?string $from = null, ?string $verb = null): array
     {
@@ -524,8 +473,6 @@ public function getRoutesOptions(?string $from = null, ?string $verb = null): ar
 
     /**
      * Returns the current HTTP Verb being used.
-     *
-     * @return string
      */
     public function getHTTPVerb(): string
     {
@@ -536,8 +483,6 @@ public function getHTTPVerb(): string
      * Sets the current HTTP verb.
      * Used primarily for testing.
      *
-     * @param string $verb
-     *
      * @return $this
      */
     public function setHTTPVerb(string $verb)
@@ -551,11 +496,6 @@ public function setHTTPVerb(string $verb)
      * A shortcut method to add a number of routes at a single time.
      * It does not allow any options to be set on the route, or to
      * define the method used.
-     *
-     * @param array      $routes
-     * @param array|null $options
-     *
-     * @return RouteCollectionInterface
      */
     public function map(array $routes = [], ?array $options = null): RouteCollectionInterface
     {
@@ -572,11 +512,7 @@ public function map(array $routes = [], ?array $options = null): RouteCollection
      * Example:
      *      $routes->add('news', 'Posts::index');
      *
-     * @param string       $from
      * @param array|string $to
-     * @param array|null   $options
-     *
-     * @return RouteCollectionInterface
      */
     public function add(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
@@ -612,10 +548,6 @@ public function addRedirect(string $from, string $to, int $status = 302)
 
     /**
      * Determines if the route is a redirecting route.
-     *
-     * @param string $from
-     *
-     * @return bool
      */
     public function isRedirect(string $from): bool
     {
@@ -631,10 +563,6 @@ public function isRedirect(string $from): bool
 
     /**
      * Grabs the HTTP status code from a redirecting Route.
-     *
-     * @param string $from
-     *
-     * @return int
      */
     public function getRedirectCode(string $from): int
     {
@@ -730,8 +658,6 @@ public function group(string $name, ...$params)
      *
      * @param string     $name    The name of the resource/controller to route to.
      * @param array|null $options An list of possible ways to customize the routing.
-     *
-     * @return RouteCollectionInterface
      */
     public function resource(string $name, ?array $options = null): RouteCollectionInterface
     {
@@ -825,8 +751,6 @@ public function resource(string $name, ?array $options = null): RouteCollectionI
      *
      * @param string     $name    The name of the controller to route to.
      * @param array|null $options An list of possible ways to customize the routing.
-     *
-     * @return RouteCollectionInterface
      */
     public function presenter(string $name, ?array $options = null): RouteCollectionInterface
     {
@@ -899,12 +823,7 @@ public function presenter(string $name, ?array $options = null): RouteCollection
      * Example:
      *  $route->match( ['get', 'post'], 'users/(:num)', 'users/$1);
      *
-     * @param array        $verbs
-     * @param string       $from
      * @param array|string $to
-     * @param array|null   $options
-     *
-     * @return RouteCollectionInterface
      */
     public function match(array $verbs = [], string $from = '', $to = '', ?array $options = null): RouteCollectionInterface
     {
@@ -924,11 +843,7 @@ public function match(array $verbs = [], string $from = '', $to = '', ?array $op
     /**
      * Specifies a route that is only available to GET requests.
      *
-     * @param string       $from
      * @param array|string $to
-     * @param array|null   $options
-     *
-     * @return RouteCollectionInterface
      */
     public function get(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
@@ -940,11 +855,7 @@ public function get(string $from, $to, ?array $options = null): RouteCollectionI
     /**
      * Specifies a route that is only available to POST requests.
      *
-     * @param string       $from
      * @param array|string $to
-     * @param array|null   $options
-     *
-     * @return RouteCollectionInterface
      */
     public function post(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
@@ -956,11 +867,7 @@ public function post(string $from, $to, ?array $options = null): RouteCollection
     /**
      * Specifies a route that is only available to PUT requests.
      *
-     * @param string       $from
      * @param array|string $to
-     * @param array|null   $options
-     *
-     * @return RouteCollectionInterface
      */
     public function put(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
@@ -972,11 +879,7 @@ public function put(string $from, $to, ?array $options = null): RouteCollectionI
     /**
      * Specifies a route that is only available to DELETE requests.
      *
-     * @param string       $from
      * @param array|string $to
-     * @param array|null   $options
-     *
-     * @return RouteCollectionInterface
      */
     public function delete(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
@@ -988,11 +891,7 @@ public function delete(string $from, $to, ?array $options = null): RouteCollecti
     /**
      * Specifies a route that is only available to HEAD requests.
      *
-     * @param string       $from
      * @param array|string $to
-     * @param array|null   $options
-     *
-     * @return RouteCollectionInterface
      */
     public function head(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
@@ -1004,11 +903,7 @@ public function head(string $from, $to, ?array $options = null): RouteCollection
     /**
      * Specifies a route that is only available to PATCH requests.
      *
-     * @param string       $from
      * @param array|string $to
-     * @param array|null   $options
-     *
-     * @return RouteCollectionInterface
      */
     public function patch(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
@@ -1020,11 +915,7 @@ public function patch(string $from, $to, ?array $options = null): RouteCollectio
     /**
      * Specifies a route that is only available to OPTIONS requests.
      *
-     * @param string       $from
      * @param array|string $to
-     * @param array|null   $options
-     *
-     * @return RouteCollectionInterface
      */
     public function options(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
@@ -1036,11 +927,7 @@ public function options(string $from, $to, ?array $options = null): RouteCollect
     /**
      * Specifies a route that is only available to command-line requests.
      *
-     * @param string       $from
      * @param array|string $to
-     * @param array|null   $options
-     *
-     * @return RouteCollectionInterface
      */
     public function cli(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
@@ -1051,11 +938,6 @@ public function cli(string $from, $to, ?array $options = null): RouteCollectionI
 
     /**
      * Limits the routes to a specified ENVIRONMENT or they won't run.
-     *
-     * @param string  $env
-     * @param Closure $callback
-     *
-     * @return RouteCollectionInterface
      */
     public function environment(string $env, Closure $callback): RouteCollectionInterface
     {
@@ -1079,8 +961,7 @@ public function environment(string $env, Closure $callback): RouteCollectionInte
      *      // Equals 'path/$param1/$param2'
      *      reverseRoute('Controller::method', $param1, $param2);
      *
-     * @param string $search
-     * @param mixed  ...$params
+     * @param mixed ...$params
      *
      * @return false|string
      */
@@ -1136,10 +1017,6 @@ public function reverseRoute(string $search, ...$params)
 
     /**
      * Replaces the {locale} tag with the current application locale
-     *
-     * @param string $route
-     *
-     * @return string
      */
     protected function localizeRoute(string $route): string
     {
@@ -1148,11 +1025,6 @@ protected function localizeRoute(string $route): string
 
     /**
      * Checks a route (using the "from") to see if it's filtered or not.
-     *
-     * @param string      $search
-     * @param string|null $verb
-     *
-     * @return bool
      */
     public function isFiltered(string $search, ?string $verb = null): bool
     {
@@ -1170,11 +1042,6 @@ public function isFiltered(string $search, ?string $verb = null): bool
      *    'role:admin,manager'
      *
      * has a filter of "role", with parameters of ['admin', 'manager'].
-     *
-     * @param string      $search
-     * @param string|null $verb
-     *
-     * @return string
      */
     public function getFilterForRoute(string $search, ?string $verb = null): string
     {
@@ -1186,12 +1053,7 @@ public function getFilterForRoute(string $search, ?string $verb = null): string
     /**
      * Given a
      *
-     * @param string     $from
-     * @param array|null $params
-     *
      * @throws RouterException
-     *
-     * @return string
      */
     protected function fillRouteParams(string $from, ?array $params = null): string
     {
@@ -1223,10 +1085,7 @@ protected function fillRouteParams(string $from, ?array $params = null): string
      * the request method(s) that this route will work for. They can be separated
      * by a pipe character "|" if there is more than one.
      *
-     * @param string       $verb
-     * @param string       $from
      * @param array|string $to
-     * @param array|null   $options
      */
     protected function create(string $verb, string $from, $to, ?array $options = null)
     {
@@ -1338,8 +1197,6 @@ static function ($m) use ($i) {
      * on this page request.
      *
      * @param mixed $subdomains
-     *
-     * @return bool
      */
     private function checkSubdomains($subdomains): bool
     {
@@ -1426,10 +1283,6 @@ public function resetRoutes()
 
     /**
      * Load routes options based on verb
-     *
-     * @param string|null $verb
-     *
-     * @return array
      */
     protected function loadRoutesOptions(?string $verb = null): array
     {
diff --git a/system/Router/RouteCollectionInterface.php b/system/Router/RouteCollectionInterface.php
index d07328479214..2a376f61ef32 100644
--- a/system/Router/RouteCollectionInterface.php
+++ b/system/Router/RouteCollectionInterface.php
@@ -28,7 +28,6 @@ interface RouteCollectionInterface
     /**
      * Adds a single route to the collection.
      *
-     * @param string       $from
      * @param array|string $to
      * @param array        $options
      *
@@ -55,8 +54,6 @@ public function addPlaceholder($placeholder, ?string $pattern = null);
      * Sets the default namespace to use for Controllers when no other
      * namespace has been specified.
      *
-     * @param string $value
-     *
      * @return mixed
      */
     public function setDefaultNamespace(string $value);
@@ -65,8 +62,6 @@ public function setDefaultNamespace(string $value);
      * Sets the default controller to use when no other controller has been
      * specified.
      *
-     * @param string $value
-     *
      * @return mixed
      */
     public function setDefaultController(string $value);
@@ -75,8 +70,6 @@ public function setDefaultController(string $value);
      * Sets the default method to call on the controller when no other
      * method has been set in the route.
      *
-     * @param string $value
-     *
      * @return mixed
      */
     public function setDefaultMethod(string $value);
@@ -88,8 +81,6 @@ public function setDefaultMethod(string $value);
      * find words and meaning in the URI for better SEO. But it
      * doesn't work well with PHP method names....
      *
-     * @param bool $value
-     *
      * @return mixed
      */
     public function setTranslateURIDashes(bool $value);
@@ -102,8 +93,6 @@ public function setTranslateURIDashes(bool $value);
      *
      * If FALSE, will stop searching and do NO automatic routing.
      *
-     * @param bool $value
-     *
      * @return RouteCollectionInterface
      */
     public function setAutoRoute(bool $value): self;
@@ -184,8 +173,7 @@ public function getHTTPVerb();
      *      // Equals 'path/$param1/$param2'
      *      reverseRoute('Controller::method', $param1, $param2);
      *
-     * @param string $search
-     * @param array  ...$params
+     * @param array ...$params
      *
      * @return false|string
      */
@@ -193,19 +181,11 @@ public function reverseRoute(string $search, ...$params);
 
     /**
      * Determines if the route is a redirecting route.
-     *
-     * @param string $from
-     *
-     * @return bool
      */
     public function isRedirect(string $from): bool;
 
     /**
      * Grabs the HTTP status code from a redirecting Route.
-     *
-     * @param string $from
-     *
-     * @return int
      */
     public function getRedirectCode(string $from): int;
 }
diff --git a/system/Router/Router.php b/system/Router/Router.php
index 292e11bf47c8..aa29abebc56a 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -105,8 +105,7 @@ class Router implements RouterInterface
     /**
      * Stores a reference to the RouteCollection object.
      *
-     * @param RouteCollectionInterface $routes
-     * @param Request                  $request
+     * @param Request $request
      */
     public function __construct(RouteCollectionInterface $routes, ?Request $request = null)
     {
@@ -120,8 +119,6 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request
     }
 
     /**
-     * @param string|null $uri
-     *
      * @throws PageNotFoundException
      * @throws RedirectException
      *
@@ -190,8 +187,6 @@ public function controllerName()
     /**
      * Returns the name of the method to run in the
      * chosen container.
-     *
-     * @return string
      */
     public function methodName(): string
     {
@@ -228,8 +223,6 @@ public function get404Override()
      * Returns the binds that have been matched and collected
      * during the parsing process as an array, ready to send to
      * instance->method(...$params).
-     *
-     * @return array
      */
     public function params(): array
     {
@@ -241,8 +234,6 @@ public function params(): array
      * if any. Relative to APPPATH.'Controllers'.
      *
      * Only used when auto-routing is turned on.
-     *
-     * @return string
      */
     public function directory(): string
     {
@@ -443,8 +434,6 @@ protected function checkRoutes(string $uri): bool
     /**
      * Attempts to match a URI path against Controllers and directories
      * found in APPPATH/Controllers, to find a matching route.
-     *
-     * @param string $uri
      */
     public function autoRoute(string $uri)
     {
@@ -582,9 +571,7 @@ protected function scanControllers(array $segments): array
     /**
      * Sets the sub-directory that the controller is in.
      *
-     * @param string|null $dir
-     * @param bool        $append
-     * @param bool        $validate if true, checks to make sure $dir consists of only PSR4 compliant segments
+     * @param bool $validate if true, checks to make sure $dir consists of only PSR4 compliant segments
      */
     public function setDirectory(?string $dir = null, bool $append = false, bool $validate = true)
     {
@@ -615,10 +602,6 @@ public function setDirectory(?string $dir = null, bool $append = false, bool $va
      * Returns true if the supplied $segment string represents a valid PSR-4 compliant namespace/directory segment
      *
      * regex comes from https://www.php.net/manual/en/language.variables.basics.php
-     *
-     * @param string $segment
-     *
-     * @return bool
      */
     private function isValidSegment(string $segment): bool
     {
diff --git a/system/Router/RouterInterface.php b/system/Router/RouterInterface.php
index 5a208240ce8c..e252b56decc8 100644
--- a/system/Router/RouterInterface.php
+++ b/system/Router/RouterInterface.php
@@ -21,8 +21,7 @@ interface RouterInterface
     /**
      * Stores a reference to the RouteCollection object.
      *
-     * @param RouteCollectionInterface $routes
-     * @param Request                  $request
+     * @param Request $request
      */
     public function __construct(RouteCollectionInterface $routes, ?Request $request = null);
 
diff --git a/system/Security/Security.php b/system/Security/Security.php
index bbc25372633f..eca76b483fcb 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -122,8 +122,6 @@ class Security implements SecurityInterface
      *
      * Stores our configuration and fires off the init() method to setup
      * initial state.
-     *
-     * @param App $config
      */
     public function __construct(App $config)
     {
@@ -153,8 +151,6 @@ public function __construct(App $config)
     /**
      * CSRF Verify
      *
-     * @param RequestInterface $request
-     *
      * @throws SecurityException
      *
      * @return $this|false
@@ -171,8 +167,6 @@ public function CSRFVerify(RequestInterface $request)
     /**
      * Returns the CSRF Hash.
      *
-     * @return string|null
-     *
      * @deprecated Use `CodeIgniter\Security\Security::getHash()` instead of using this method.
      *
      * @codeCoverageIgnore
@@ -185,8 +179,6 @@ public function getCSRFHash(): ?string
     /**
      * Returns the CSRF Token Name.
      *
-     * @return string
-     *
      * @deprecated Use `CodeIgniter\Security\Security::getTokenName()` instead of using this method.
      *
      * @codeCoverageIgnore
@@ -199,8 +191,6 @@ public function getCSRFTokenName(): string
     /**
      * CSRF Verify
      *
-     * @param RequestInterface $request
-     *
      * @throws SecurityException
      *
      * @return $this|false
@@ -257,8 +247,6 @@ public function verify(RequestInterface $request)
 
     /**
      * Returns the CSRF Hash.
-     *
-     * @return string|null
      */
     public function getHash(): ?string
     {
@@ -267,8 +255,6 @@ public function getHash(): ?string
 
     /**
      * Returns the CSRF Token Name.
-     *
-     * @return string
      */
     public function getTokenName(): string
     {
@@ -277,8 +263,6 @@ public function getTokenName(): string
 
     /**
      * Returns the CSRF Header Name.
-     *
-     * @return string
      */
     public function getHeaderName(): string
     {
@@ -287,8 +271,6 @@ public function getHeaderName(): string
 
     /**
      * Returns the CSRF Cookie Name.
-     *
-     * @return string
      */
     public function getCookieName(): string
     {
@@ -298,8 +280,6 @@ public function getCookieName(): string
     /**
      * Check if CSRF cookie is expired.
      *
-     * @return bool
-     *
      * @deprecated
      *
      * @codeCoverageIgnore
@@ -311,8 +291,6 @@ public function isExpired(): bool
 
     /**
      * Check if request should be redirect on failure.
-     *
-     * @return bool
      */
     public function shouldRedirect(): bool
     {
@@ -332,8 +310,6 @@ public function shouldRedirect(): bool
      *
      * @param string $str          Input file name
      * @param bool   $relativePath Whether to preserve paths
-     *
-     * @return string
      */
     public function sanitizeFilename(string $str, bool $relativePath = false): string
     {
@@ -389,8 +365,6 @@ public function sanitizeFilename(string $str, bool $relativePath = false): strin
 
     /**
      * Generates the CSRF Hash.
-     *
-     * @return string
      */
     protected function generateHash(): string
     {
@@ -415,8 +389,6 @@ protected function generateHash(): string
     /**
      * CSRF Send Cookie
      *
-     * @param RequestInterface $request
-     *
      * @return false|Security
      */
     protected function sendCookie(RequestInterface $request)
@@ -436,8 +408,6 @@ protected function sendCookie(RequestInterface $request)
      * Extracted for this to be unit tested.
      *
      * @codeCoverageIgnore
-     *
-     * @return void
      */
     protected function doSendCookie(): void
     {
diff --git a/system/Security/SecurityInterface.php b/system/Security/SecurityInterface.php
index 97c1c2b23db5..8dfefbc92008 100644
--- a/system/Security/SecurityInterface.php
+++ b/system/Security/SecurityInterface.php
@@ -22,8 +22,6 @@ interface SecurityInterface
     /**
      * CSRF Verify
      *
-     * @param RequestInterface $request
-     *
      * @throws SecurityException
      *
      * @return $this|false
@@ -32,45 +30,33 @@ public function verify(RequestInterface $request);
 
     /**
      * Returns the CSRF Hash.
-     *
-     * @return string|null
      */
     public function getHash(): ?string;
 
     /**
      * Returns the CSRF Token Name.
-     *
-     * @return string
      */
     public function getTokenName(): string;
 
     /**
      * Returns the CSRF Header Name.
-     *
-     * @return string
      */
     public function getHeaderName(): string;
 
     /**
      * Returns the CSRF Cookie Name.
-     *
-     * @return string
      */
     public function getCookieName(): string;
 
     /**
      * Check if CSRF cookie is expired.
      *
-     * @return bool
-     *
      * @deprecated
      */
     public function isExpired(): bool;
 
     /**
      * Check if request should be redirect on failure.
-     *
-     * @return bool
      */
     public function shouldRedirect(): bool;
 
@@ -87,8 +73,6 @@ public function shouldRedirect(): bool;
      *
      * @param string $str          Input file name
      * @param bool   $relativePath Whether to preserve paths
-     *
-     * @return string
      */
     public function sanitizeFilename(string $str, bool $relativePath = false): string;
 }
diff --git a/system/Session/Handlers/ArrayHandler.php b/system/Session/Handlers/ArrayHandler.php
index 2718b7204cc6..f3db062eb7fe 100644
--- a/system/Session/Handlers/ArrayHandler.php
+++ b/system/Session/Handlers/ArrayHandler.php
@@ -30,8 +30,6 @@ class ArrayHandler extends BaseHandler
      * @param string $name     Session cookie name
      *
      * @throws Exception
-     *
-     * @return bool
      */
     public function open($savePath, $name): bool
     {
@@ -59,8 +57,6 @@ public function read($sessionID): string
      *
      * @param string $sessionID   Session ID
      * @param string $sessionData Serialized session data
-     *
-     * @return bool
      */
     public function write($sessionID, $sessionData): bool
     {
@@ -71,8 +67,6 @@ public function write($sessionID, $sessionData): bool
      * Close
      *
      * Releases locks and closes file descriptor.
-     *
-     * @return bool
      */
     public function close(): bool
     {
@@ -85,8 +79,6 @@ public function close(): bool
      * Destroys the current session.
      *
      * @param string $sessionID
-     *
-     * @return bool
      */
     public function destroy($sessionID): bool
     {
@@ -99,8 +91,6 @@ public function destroy($sessionID): bool
      * Deletes expired sessions
      *
      * @param int $maxlifetime Maximum lifetime of sessions
-     *
-     * @return bool
      */
     public function gc($maxlifetime): bool
     {
diff --git a/system/Session/Handlers/BaseHandler.php b/system/Session/Handlers/BaseHandler.php
index 856a5bc88002..e5663abc5f85 100644
--- a/system/Session/Handlers/BaseHandler.php
+++ b/system/Session/Handlers/BaseHandler.php
@@ -102,9 +102,6 @@ abstract class BaseHandler implements SessionHandlerInterface
 
     /**
      * Constructor
-     *
-     * @param AppConfig $config
-     * @param string    $ipAddress
      */
     public function __construct(AppConfig $config, string $ipAddress)
     {
@@ -121,8 +118,6 @@ public function __construct(AppConfig $config, string $ipAddress)
     /**
      * Internal method to force removal of a cookie by the client
      * when session_destroy() is called.
-     *
-     * @return bool
      */
     protected function destroyCookie(): bool
     {
@@ -141,10 +136,6 @@ protected function destroyCookie(): bool
      * A dummy method allowing drivers with no locking functionality
      * (databases other than PostgreSQL and MySQL) to act as if they
      * do acquire a lock.
-     *
-     * @param string $sessionID
-     *
-     * @return bool
      */
     protected function lockSession(string $sessionID): bool
     {
@@ -155,8 +146,6 @@ protected function lockSession(string $sessionID): bool
 
     /**
      * Releases the lock, if any.
-     *
-     * @return bool
      */
     protected function releaseLock(): bool
     {
@@ -175,8 +164,6 @@ protected function releaseLock(): bool
      * To work around the problem, the drivers will call this method
      * so that the INI is set just in time for the error message to
      * be properly generated.
-     *
-     * @return bool
      */
     protected function fail(): bool
     {
diff --git a/system/Session/Handlers/DatabaseHandler.php b/system/Session/Handlers/DatabaseHandler.php
index c9e922839ec9..01c127e1e125 100644
--- a/system/Session/Handlers/DatabaseHandler.php
+++ b/system/Session/Handlers/DatabaseHandler.php
@@ -59,9 +59,6 @@ class DatabaseHandler extends BaseHandler
 
     /**
      * Constructor
-     *
-     * @param AppConfig $config
-     * @param string    $ipAddress
      */
     public function __construct(AppConfig $config, string $ipAddress)
     {
@@ -98,8 +95,6 @@ public function __construct(AppConfig $config, string $ipAddress)
      * @param string $name     Session cookie name
      *
      * @throws Exception
-     *
-     * @return bool
      */
     public function open($savePath, $name): bool
     {
@@ -171,8 +166,6 @@ public function read($sessionID): string
      *
      * @param string $sessionID   Session ID
      * @param string $sessionData Serialized session data
-     *
-     * @return bool
      */
     public function write($sessionID, $sessionData): bool
     {
@@ -231,8 +224,6 @@ public function write($sessionID, $sessionData): bool
      * Close
      *
      * Releases locks and closes file descriptor.
-     *
-     * @return bool
      */
     public function close(): bool
     {
@@ -245,8 +236,6 @@ public function close(): bool
      * Destroys the current session.
      *
      * @param string $sessionID
-     *
-     * @return bool
      */
     public function destroy($sessionID): bool
     {
@@ -277,8 +266,6 @@ public function destroy($sessionID): bool
      * Deletes expired sessions
      *
      * @param int $maxlifetime Maximum lifetime of sessions
-     *
-     * @return bool
      */
     public function gc($maxlifetime): bool
     {
@@ -290,10 +277,6 @@ public function gc($maxlifetime): bool
 
     /**
      * Lock the session.
-     *
-     * @param string $sessionID
-     *
-     * @return bool
      */
     protected function lockSession(string $sessionID): bool
     {
@@ -325,8 +308,6 @@ protected function lockSession(string $sessionID): bool
 
     /**
      * Releases the lock, if any.
-     *
-     * @return bool
      */
     protected function releaseLock(): bool
     {
diff --git a/system/Session/Handlers/FileHandler.php b/system/Session/Handlers/FileHandler.php
index d6a6cb26170f..0f5653739dc3 100644
--- a/system/Session/Handlers/FileHandler.php
+++ b/system/Session/Handlers/FileHandler.php
@@ -64,9 +64,6 @@ class FileHandler extends BaseHandler
 
     /**
      * Constructor
-     *
-     * @param AppConfig $config
-     * @param string    $ipAddress
      */
     public function __construct(AppConfig $config, string $ipAddress)
     {
@@ -99,8 +96,6 @@ public function __construct(AppConfig $config, string $ipAddress)
      * @param string $name     Session cookie name
      *
      * @throws Exception
-     *
-     * @return bool
      */
     public function open($savePath, $name): bool
     {
@@ -188,8 +183,6 @@ public function read($sessionID)
      *
      * @param string $sessionID   Session ID
      * @param string $sessionData Serialized session data
-     *
-     * @return bool
      */
     public function write($sessionID, $sessionData): bool
     {
@@ -237,8 +230,6 @@ public function write($sessionID, $sessionData): bool
      * Close
      *
      * Releases locks and closes file descriptor.
-     *
-     * @return bool
      */
     public function close(): bool
     {
@@ -261,8 +252,6 @@ public function close(): bool
      * Destroys the current session.
      *
      * @param string $sessionId Session ID
-     *
-     * @return bool
      */
     public function destroy($sessionId): bool
     {
@@ -287,8 +276,6 @@ public function destroy($sessionId): bool
      * Deletes expired sessions
      *
      * @param int $maxlifetime Maximum lifetime of sessions
-     *
-     * @return bool
      */
     public function gc($maxlifetime): bool
     {
diff --git a/system/Session/Handlers/MemcachedHandler.php b/system/Session/Handlers/MemcachedHandler.php
index a6bca2ce6946..dab3e61d4b06 100644
--- a/system/Session/Handlers/MemcachedHandler.php
+++ b/system/Session/Handlers/MemcachedHandler.php
@@ -51,9 +51,6 @@ class MemcachedHandler extends BaseHandler
     /**
      * Constructor
      *
-     * @param AppConfig $config
-     * @param string    $ipAddress
-     *
      * @throws SessionException
      */
     public function __construct(AppConfig $config, string $ipAddress)
@@ -82,8 +79,6 @@ public function __construct(AppConfig $config, string $ipAddress)
      *
      * @param string $savePath Server path(s)
      * @param string $name     Session cookie name, unused
-     *
-     * @return bool
      */
     public function open($savePath, $name): bool
     {
@@ -161,8 +156,6 @@ public function read($sessionID): string
      *
      * @param string $sessionID   Session ID
      * @param string $sessionData Serialized session data
-     *
-     * @return bool
      */
     public function write($sessionID, $sessionData): bool
     {
@@ -203,8 +196,6 @@ public function write($sessionID, $sessionData): bool
      * Close
      *
      * Releases locks and closes connection.
-     *
-     * @return bool
      */
     public function close(): bool
     {
@@ -231,8 +222,6 @@ public function close(): bool
      * Destroys the current session.
      *
      * @param string $sessionId Session ID
-     *
-     * @return bool
      */
     public function destroy($sessionId): bool
     {
@@ -251,8 +240,6 @@ public function destroy($sessionId): bool
      * Deletes expired sessions
      *
      * @param int $maxlifetime Maximum lifetime of sessions
-     *
-     * @return bool
      */
     public function gc($maxlifetime): bool
     {
@@ -266,8 +253,6 @@ public function gc($maxlifetime): bool
      * Acquires an (emulated) lock.
      *
      * @param string $sessionID Session ID
-     *
-     * @return bool
      */
     protected function lockSession(string $sessionID): bool
     {
@@ -311,8 +296,6 @@ protected function lockSession(string $sessionID): bool
      * Release lock
      *
      * Releases a previously acquired lock
-     *
-     * @return bool
      */
     protected function releaseLock(): bool
     {
diff --git a/system/Session/Handlers/RedisHandler.php b/system/Session/Handlers/RedisHandler.php
index 98b3c93522d5..c066813b7969 100644
--- a/system/Session/Handlers/RedisHandler.php
+++ b/system/Session/Handlers/RedisHandler.php
@@ -60,9 +60,6 @@ class RedisHandler extends BaseHandler
     /**
      * Constructor
      *
-     * @param AppConfig $config
-     * @param string    $ipAddress
-     *
      * @throws Exception
      */
     public function __construct(AppConfig $config, string $ipAddress)
@@ -107,8 +104,6 @@ public function __construct(AppConfig $config, string $ipAddress)
      *
      * @param string $savePath Server path
      * @param string $name     Session cookie name, unused
-     *
-     * @return bool
      */
     public function open($savePath, $name): bool
     {
@@ -168,8 +163,6 @@ public function read($sessionID): string
      *
      * @param string $sessionID   Session ID
      * @param string $sessionData Serialized session data
-     *
-     * @return bool
      */
     public function write($sessionID, $sessionData): bool
     {
@@ -211,8 +204,6 @@ public function write($sessionID, $sessionData): bool
      * Close
      *
      * Releases locks and closes connection.
-     *
-     * @return bool
      */
     public function close(): bool
     {
@@ -247,8 +238,6 @@ public function close(): bool
      * Destroys the current session.
      *
      * @param string $sessionID
-     *
-     * @return bool
      */
     public function destroy($sessionID): bool
     {
@@ -269,8 +258,6 @@ public function destroy($sessionID): bool
      * Deletes expired sessions
      *
      * @param int $maxlifetime Maximum lifetime of sessions
-     *
-     * @return bool
      */
     public function gc($maxlifetime): bool
     {
@@ -284,8 +271,6 @@ public function gc($maxlifetime): bool
      * Acquires an (emulated) lock.
      *
      * @param string $sessionID Session ID
-     *
-     * @return bool
      */
     protected function lockSession(string $sessionID): bool
     {
@@ -336,8 +321,6 @@ protected function lockSession(string $sessionID): bool
      * Release lock
      *
      * Releases a previously acquired lock
-     *
-     * @return bool
      */
     protected function releaseLock(): bool
     {
diff --git a/system/Session/Session.php b/system/Session/Session.php
index b77d581d6206..f95d57ca990a 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -163,9 +163,6 @@ class Session implements SessionInterface
      * Constructor.
      *
      * Extract configuration settings and save them here.
-     *
-     * @param SessionHandlerInterface $driver
-     * @param App                     $config
      */
     public function __construct(SessionHandlerInterface $driver, App $config)
     {
@@ -506,8 +503,6 @@ public function get(?string $key = null)
      * Returns whether an index exists in the session array.
      *
      * @param string $key Identifier of the session property we are interested in.
-     *
-     * @return bool
      */
     public function has(string $key): bool
     {
@@ -592,8 +587,6 @@ public function __get(string $key)
      * Mostly used by internal PHP functions, users should stick to has()
      *
      * @param string $key Identifier of the session property to remove.
-     *
-     * @return bool
      */
     public function __isset(string $key): bool
     {
@@ -867,8 +860,6 @@ public function unmarkTempdata($key)
 
     /**
      * Retrieve the keys of all session data that have been marked as temporary data.
-     *
-     * @return array
      */
     public function getTempKeys(): array
     {
diff --git a/system/Session/SessionInterface.php b/system/Session/SessionInterface.php
index 7f2319d2c941..f485f64da163 100644
--- a/system/Session/SessionInterface.php
+++ b/system/Session/SessionInterface.php
@@ -61,8 +61,6 @@ public function get(?string $key = null);
      * Returns whether an index exists in the session array.
      *
      * @param string $key Identifier of the session property we are interested in.
-     *
-     * @return bool
      */
     public function has(string $key): bool;
 
@@ -181,8 +179,6 @@ public function unmarkTempdata($key);
 
     /**
      * Retrieve the keys of all session data that have been marked as temporary data.
-     *
-     * @return array
      */
     public function getTempKeys(): array;
 }
diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
index ecd6d2a04d4d..50a28e13d2da 100644
--- a/system/Test/CIUnitTestCase.php
+++ b/system/Test/CIUnitTestCase.php
@@ -270,8 +270,6 @@ protected function tearDown(): void
      * methods for setUp or tearDown.
      *
      * @param string $stage 'setUp' or 'tearDown'
-     *
-     * @return void
      */
     private function callTraitMethods(string $stage): void
     {
@@ -345,7 +343,6 @@ protected function mockSession()
      * Custom function to hook into CodeIgniter's Logging mechanism
      * to check if certain messages were logged during code execution.
      *
-     * @param string      $level
      * @param string|null $expectedMessage
      *
      * @throws Exception
@@ -369,11 +366,7 @@ public function assertLogged(string $level, $expectedMessage = null)
      * Hooks into CodeIgniter's Events system to check if a specific
      * event was triggered or not.
      *
-     * @param string $eventName
-     *
      * @throws Exception
-     *
-     * @return bool
      */
     public function assertEventTriggered(string $eventName): bool
     {
@@ -398,8 +391,7 @@ public function assertEventTriggered(string $eventName): bool
      * Hooks into xdebug's headers capture, looking for a specific header
      * emitted
      *
-     * @param string $header     The leading portion of the header we are looking for
-     * @param bool   $ignoreCase
+     * @param string $header The leading portion of the header we are looking for
      *
      * @throws Exception
      */
@@ -427,8 +419,7 @@ public function assertHeaderEmitted(string $header, bool $ignoreCase = false): v
      * Hooks into xdebug's headers capture, looking for a specific header
      * emitted
      *
-     * @param string $header     The leading portion of the header we don't want to find
-     * @param bool   $ignoreCase
+     * @param string $header The leading portion of the header we don't want to find
      *
      * @throws Exception
      */
@@ -459,10 +450,7 @@ public function assertHeaderNotEmitted(string $header, bool $ignoreCase = false)
      * where the result is close but not exactly equal to the
      * expected time, for reasons beyond our control.
      *
-     * @param int    $expected
-     * @param mixed  $actual
-     * @param string $message
-     * @param int    $tolerance
+     * @param mixed $actual
      *
      * @throws Exception
      */
@@ -479,10 +467,8 @@ public function assertCloseEnough(int $expected, $actual, string $message = '',
      * where the result is close but not exactly equal to the
      * expected time, for reasons beyond our control.
      *
-     * @param mixed  $expected
-     * @param mixed  $actual
-     * @param string $message
-     * @param int    $tolerance
+     * @param mixed $expected
+     * @param mixed $actual
      *
      * @throws Exception
      *
@@ -531,8 +517,7 @@ protected function createApplication()
     /**
      * Return first matching emitted header.
      *
-     * @param string $header     Identifier of the header of interest
-     * @param bool   $ignoreCase
+     * @param string $header Identifier of the header of interest
      *
      * @return string|null The value of the header found, null if not found
      */
diff --git a/system/Test/Constraints/SeeInDatabase.php b/system/Test/Constraints/SeeInDatabase.php
index eef8bd5be24b..f662f8fdc047 100644
--- a/system/Test/Constraints/SeeInDatabase.php
+++ b/system/Test/Constraints/SeeInDatabase.php
@@ -38,9 +38,6 @@ class SeeInDatabase extends Constraint
 
     /**
      * SeeInDatabase constructor.
-     *
-     * @param ConnectionInterface $db
-     * @param array               $data
      */
     public function __construct(ConnectionInterface $db, array $data)
     {
@@ -52,8 +49,6 @@ public function __construct(ConnectionInterface $db, array $data)
      * Check if data is found in the table
      *
      * @param mixed $table
-     *
-     * @return bool
      */
     public function matches($table): bool
     {
@@ -64,8 +59,6 @@ public function matches($table): bool
      * Get the description of the failure
      *
      * @param mixed $table
-     *
-     * @return string
      */
     public function failureDescription($table): string
     {
@@ -79,10 +72,6 @@ public function failureDescription($table): string
 
     /**
      * Gets additional records similar to $data.
-     *
-     * @param string $table
-     *
-     * @return string
      */
     protected function getAdditionalInfo(string $table): string
     {
@@ -121,8 +110,6 @@ protected function getAdditionalInfo(string $table): string
      * Gets a string representation of the constraint
      *
      * @param int $options
-     *
-     * @return string
      */
     public function toString($options = 0): string
     {
diff --git a/system/Test/ControllerResponse.php b/system/Test/ControllerResponse.php
index a8635cc39a7a..2a90e4dd0bb9 100644
--- a/system/Test/ControllerResponse.php
+++ b/system/Test/ControllerResponse.php
@@ -54,8 +54,6 @@ public function __construct()
     /**
      * Sets the response.
      *
-     * @param ResponseInterface $response
-     *
      * @return $this
      *
      * @deprecated Will revert to parent::setResponse() in a future release (no $body updates)
@@ -72,8 +70,6 @@ public function setResponse(ResponseInterface $response)
     /**
      * Sets the body and updates the DOM.
      *
-     * @param string $body
-     *
      * @return $this
      *
      * @deprecated Use response()->setBody() instead
diff --git a/system/Test/ControllerTestTrait.php b/system/Test/ControllerTestTrait.php
index 0035e3125d4f..c5e255b732e4 100644
--- a/system/Test/ControllerTestTrait.php
+++ b/system/Test/ControllerTestTrait.php
@@ -126,8 +126,6 @@ protected function setUpControllerTestTrait(): void
     /**
      * Loads the specified controller, and generates any needed dependencies.
      *
-     * @param string $name
-     *
      * @return mixed
      */
     public function controller(string $name)
@@ -145,8 +143,7 @@ public function controller(string $name)
     /**
      * Runs the specified method on the controller and returns the results.
      *
-     * @param string $method
-     * @param array  $params
+     * @param array $params
      *
      * @throws InvalidArgumentException
      *
@@ -275,8 +272,6 @@ public function withLogger($logger)
     /**
      * Set the controller's URI, with method chaining.
      *
-     * @param string $uri
-     *
      * @return mixed
      */
     public function withUri(string $uri)
diff --git a/system/Test/ControllerTester.php b/system/Test/ControllerTester.php
index 2c8f806ce071..a8bccc3cdd22 100644
--- a/system/Test/ControllerTester.php
+++ b/system/Test/ControllerTester.php
@@ -126,8 +126,6 @@ protected function setUpControllerTester(): void
     /**
      * Loads the specified controller, and generates any needed dependencies.
      *
-     * @param string $name
-     *
      * @return mixed
      */
     public function controller(string $name)
@@ -145,8 +143,7 @@ public function controller(string $name)
     /**
      * Runs the specified method on the controller and returns the results.
      *
-     * @param string $method
-     * @param array  $params
+     * @param array $params
      *
      * @throws InvalidArgumentException
      *
@@ -271,8 +268,6 @@ public function withLogger($logger)
     /**
      * Set the controller's URI, with method chaining.
      *
-     * @param string $uri
-     *
      * @return mixed
      */
     public function withUri(string $uri)
diff --git a/system/Test/DOMParser.php b/system/Test/DOMParser.php
index de5af99b526d..90062f05c158 100644
--- a/system/Test/DOMParser.php
+++ b/system/Test/DOMParser.php
@@ -48,8 +48,6 @@ public function __construct()
 
     /**
      * Returns the body of the current document.
-     *
-     * @return string
      */
     public function getBody(): string
     {
@@ -59,8 +57,6 @@ public function getBody(): string
     /**
      * Sets a string as the body that we want to work with.
      *
-     * @param string $content
-     *
      * @return $this
      */
     public function withString(string $content)
@@ -90,8 +86,6 @@ public function withString(string $content)
      * Loads the contents of a file as a string
      * so that we can work with it.
      *
-     * @param string $path
-     *
      * @return DOMParser
      */
     public function withFile(string $path)
@@ -110,8 +104,6 @@ public function withFile(string $path)
      *
      * @param string $search
      * @param string $element
-     *
-     * @return bool
      */
     public function see(?string $search = null, ?string $element = null): bool
     {
@@ -130,10 +122,7 @@ 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
-     * @param string|null $element
-     *
-     * @return bool
+     * @param string $search
      */
     public function dontSee(?string $search = null, ?string $element = null): bool
     {
@@ -143,10 +132,6 @@ public function dontSee(?string $search = null, ?string $element = null): bool
     /**
      * Checks to see if an element with the matching CSS specifier
      * is found within the current DOM.
-     *
-     * @param string $element
-     *
-     * @return bool
      */
     public function seeElement(string $element): bool
     {
@@ -155,10 +140,6 @@ public function seeElement(string $element): bool
 
     /**
      * Checks to see if the element is available within the result.
-     *
-     * @param string $element
-     *
-     * @return bool
      */
     public function dontSeeElement(string $element): bool
     {
@@ -168,11 +149,6 @@ public function dontSeeElement(string $element): bool
     /**
      * Determines if a link with the specified text is found
      * within the results.
-     *
-     * @param string      $text
-     * @param string|null $details
-     *
-     * @return bool
      */
     public function seeLink(string $text, ?string $details = null): bool
     {
@@ -181,11 +157,6 @@ public function seeLink(string $text, ?string $details = null): bool
 
     /**
      * Checks for an input named $field with a value of $value.
-     *
-     * @param string $field
-     * @param string $value
-     *
-     * @return bool
      */
     public function seeInField(string $field, string $value): bool
     {
@@ -196,10 +167,6 @@ public function seeInField(string $field, string $value): bool
 
     /**
      * Checks for checkboxes that are currently checked.
-     *
-     * @param string $element
-     *
-     * @return bool
      */
     public function seeCheckboxIsChecked(string $element): bool
     {
@@ -214,10 +181,6 @@ public function seeCheckboxIsChecked(string $element): bool
     /**
      * Search the DOM using an XPath expression.
      *
-     * @param string|null $search
-     * @param string      $element
-     * @param array       $paths
-     *
      * @return DOMNodeList
      */
     protected function doXPath(?string $search, string $element, array $paths = [])
@@ -271,8 +234,6 @@ protected function doXPath(?string $search, string $element, array $paths = [])
     /**
      * Look for the a selector  in the passed text.
      *
-     * @param string $selector
-     *
      * @return array
      */
     public function parseSelector(string $selector)
diff --git a/system/Test/DatabaseTestTrait.php b/system/Test/DatabaseTestTrait.php
index 8d87cfc9b376..2dc69aeb4b9b 100644
--- a/system/Test/DatabaseTestTrait.php
+++ b/system/Test/DatabaseTestTrait.php
@@ -200,8 +200,6 @@ protected function runSeeds()
     /**
      * Seeds that database with a specific seeder.
      *
-     * @param string $name
-     *
      * @return void
      */
     public function seed(string $name)
@@ -241,8 +239,6 @@ protected function clearInsertCache()
     /**
      * Loads the Builder class appropriate for the current database.
      *
-     * @param string $tableName
-     *
      * @return BaseBuilder
      */
     public function loadBuilder(string $tableName)
@@ -256,10 +252,6 @@ public function loadBuilder(string $tableName)
      * Fetches a single column from a database row with criteria
      * matching $where.
      *
-     * @param string $table
-     * @param string $column
-     * @param array  $where
-     *
      * @throws DatabaseException
      *
      * @return bool
@@ -284,9 +276,6 @@ public function grabFromDatabase(string $table, string $column, array $where)
      * Asserts that records that match the conditions in $where DO
      * exist in the database.
      *
-     * @param string $table
-     * @param array  $where
-     *
      * @throws DatabaseException
      *
      * @return void
@@ -301,9 +290,6 @@ public function seeInDatabase(string $table, array $where)
      * Asserts that records that match the conditions in $where do
      * not exist in the database.
      *
-     * @param string $table
-     * @param array  $where
-     *
      * @return void
      */
     public function dontSeeInDatabase(string $table, array $where)
@@ -319,9 +305,6 @@ public function dontSeeInDatabase(string $table, array $where)
      * Inserts a row into to the database. This row will be removed
      * after the test has run.
      *
-     * @param string $table
-     * @param array  $data
-     *
      * @return bool
      */
     public function hasInDatabase(string $table, array $data)
@@ -338,10 +321,6 @@ public function hasInDatabase(string $table, array $data)
      * Asserts that the number of rows in the database that match $where
      * is equal to $expected.
      *
-     * @param int    $expected
-     * @param string $table
-     * @param array  $where
-     *
      * @throws DatabaseException
      *
      * @return void
diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
index 09ba75f9a73a..65fc10131d04 100644
--- a/system/Test/Fabricator.php
+++ b/system/Test/Fabricator.php
@@ -145,8 +145,6 @@ public static function resetCounts()
      * Get the count for a specific table
      *
      * @param string $table Name of the target table
-     *
-     * @return int
      */
     public static function getCount(string $table): int
     {
@@ -204,8 +202,6 @@ public function getModel()
 
     /**
      * Returns the locale
-     *
-     * @return string
      */
     public function getLocale(): string
     {
@@ -214,8 +210,6 @@ public function getLocale(): string
 
     /**
      * Returns the Faker generator
-     *
-     * @return Generator
      */
     public function getFaker(): Generator
     {
@@ -224,8 +218,6 @@ public function getFaker(): Generator
 
     /**
      * Return and reset tempOverrides
-     *
-     * @return array
      */
     public function getOverrides(): array
     {
@@ -257,8 +249,6 @@ public function setOverrides(array $overrides = [], $persist = true): self
 
     /**
      * Returns the current formatters
-     *
-     * @return array|null
      */
     public function getFormatters(): ?array
     {
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index 6385b307a3d8..1f188075e5cd 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -148,10 +148,6 @@ public function skipEvents()
      * Calls a single URI, executes it, and returns a FeatureResponse
      * instance that can be used to run many assertions against.
      *
-     * @param string     $method
-     * @param string     $path
-     * @param array|null $params
-     *
      * @throws Exception
      * @throws RedirectException
      *
@@ -226,9 +222,6 @@ public function call(string $method, string $path, ?array $params = null)
     /**
      * Performs a GET request.
      *
-     * @param string     $path
-     * @param array|null $params
-     *
      * @throws Exception
      * @throws RedirectException
      *
@@ -242,9 +235,6 @@ public function get(string $path, ?array $params = null)
     /**
      * Performs a POST request.
      *
-     * @param string     $path
-     * @param array|null $params
-     *
      * @throws Exception
      * @throws RedirectException
      *
@@ -258,9 +248,6 @@ public function post(string $path, ?array $params = null)
     /**
      * Performs a PUT request
      *
-     * @param string     $path
-     * @param array|null $params
-     *
      * @throws Exception
      * @throws RedirectException
      *
@@ -274,9 +261,6 @@ public function put(string $path, ?array $params = null)
     /**
      * Performss a PATCH request
      *
-     * @param string     $path
-     * @param array|null $params
-     *
      * @throws Exception
      * @throws RedirectException
      *
@@ -290,9 +274,6 @@ public function patch(string $path, ?array $params = null)
     /**
      * Performs a DELETE request.
      *
-     * @param string     $path
-     * @param array|null $params
-     *
      * @throws Exception
      * @throws RedirectException
      *
@@ -306,9 +287,6 @@ public function delete(string $path, ?array $params = null)
     /**
      * Performs an OPTIONS request.
      *
-     * @param string     $path
-     * @param array|null $params
-     *
      * @throws Exception
      * @throws RedirectException
      *
@@ -322,11 +300,6 @@ public function options(string $path, ?array $params = null)
     /**
      * Setup a Request object to use so that CodeIgniter
      * won't try to auto-populate some of the items.
-     *
-     * @param string      $method
-     * @param string|null $path
-     *
-     * @return IncomingRequest
      */
     protected function setupRequest(string $method, ?string $path = null): IncomingRequest
     {
@@ -349,8 +322,6 @@ protected function setupRequest(string $method, ?string $path = null): IncomingR
     /**
      * Setup the custom request's headers
      *
-     * @param IncomingRequest $request
-     *
      * @return IncomingRequest
      */
     protected function setupHeaders(IncomingRequest $request)
@@ -370,10 +341,6 @@ protected function setupHeaders(IncomingRequest $request)
      *
      * Always populate the GET vars based on the URI.
      *
-     * @param string     $method
-     * @param Request    $request
-     * @param array|null $params
-     *
      * @throws ReflectionException
      *
      * @return Request
@@ -403,11 +370,8 @@ protected function populateGlobals(string $method, Request $request, ?array $par
      * This allows the body to be formatted in a way that the controller is going to
      * expect as in the case of testing a JSON or XML API.
      *
-     * @param Request    $request
-     * @param array|null $params  The parameters to be formatted and put in the body. If this is empty, it will get the
-     *                            what has been loaded into the request global of the request class.
-     *
-     * @return Request
+     * @param array|null $params The parameters to be formatted and put in the body. If this is empty, it will get the
+     *                           what has been loaded into the request global of the request class.
      */
     protected function setRequestBody(Request $request, ?array $params = null): Request
     {
diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php
index 936532515132..b44ff8c65491 100644
--- a/system/Test/FeatureTestTrait.php
+++ b/system/Test/FeatureTestTrait.php
@@ -138,10 +138,6 @@ public function skipEvents()
      * Calls a single URI, executes it, and returns a TestResponse
      * instance that can be used to run many assertions against.
      *
-     * @param string     $method
-     * @param string     $path
-     * @param array|null $params
-     *
      * @throws RedirectException
      * @throws Exception
      *
@@ -216,9 +212,6 @@ public function call(string $method, string $path, ?array $params = null)
     /**
      * Performs a GET request.
      *
-     * @param string     $path
-     * @param array|null $params
-     *
      * @throws RedirectException
      * @throws Exception
      *
@@ -232,9 +225,6 @@ public function get(string $path, ?array $params = null)
     /**
      * Performs a POST request.
      *
-     * @param string     $path
-     * @param array|null $params
-     *
      * @throws RedirectException
      * @throws Exception
      *
@@ -248,9 +238,6 @@ public function post(string $path, ?array $params = null)
     /**
      * Performs a PUT request
      *
-     * @param string     $path
-     * @param array|null $params
-     *
      * @throws RedirectException
      * @throws Exception
      *
@@ -264,9 +251,6 @@ public function put(string $path, ?array $params = null)
     /**
      * Performss a PATCH request
      *
-     * @param string     $path
-     * @param array|null $params
-     *
      * @throws RedirectException
      * @throws Exception
      *
@@ -280,9 +264,6 @@ public function patch(string $path, ?array $params = null)
     /**
      * Performs a DELETE request.
      *
-     * @param string     $path
-     * @param array|null $params
-     *
      * @throws RedirectException
      * @throws Exception
      *
@@ -296,9 +277,6 @@ public function delete(string $path, ?array $params = null)
     /**
      * Performs an OPTIONS request.
      *
-     * @param string     $path
-     * @param array|null $params
-     *
      * @throws RedirectException
      * @throws Exception
      *
@@ -312,11 +290,6 @@ public function options(string $path, ?array $params = null)
     /**
      * Setup a Request object to use so that CodeIgniter
      * won't try to auto-populate some of the items.
-     *
-     * @param string      $method
-     * @param string|null $path
-     *
-     * @return IncomingRequest
      */
     protected function setupRequest(string $method, ?string $path = null): IncomingRequest
     {
@@ -342,8 +315,6 @@ protected function setupRequest(string $method, ?string $path = null): IncomingR
     /**
      * Setup the custom request's headers
      *
-     * @param IncomingRequest $request
-     *
      * @return IncomingRequest
      */
     protected function setupHeaders(IncomingRequest $request)
@@ -363,10 +334,6 @@ protected function setupHeaders(IncomingRequest $request)
      *
      * Always populate the GET vars based on the URI.
      *
-     * @param string     $method
-     * @param Request    $request
-     * @param array|null $params
-     *
      * @throws ReflectionException
      *
      * @return Request
@@ -396,11 +363,8 @@ protected function populateGlobals(string $method, Request $request, ?array $par
      * This allows the body to be formatted in a way that the controller is going to
      * expect as in the case of testing a JSON or XML API.
      *
-     * @param Request    $request
-     * @param array|null $params  The parameters to be formatted and put in the body. If this is empty, it will get the
-     *                            what has been loaded into the request global of the request class.
-     *
-     * @return Request
+     * @param array|null $params The parameters to be formatted and put in the body. If this is empty, it will get the
+     *                           what has been loaded into the request global of the request class.
      */
     protected function setRequestBody(Request $request, ?array $params = null): Request
     {
diff --git a/system/Test/FilterTestTrait.php b/system/Test/FilterTestTrait.php
index 903360851d80..0240eac92607 100644
--- a/system/Test/FilterTestTrait.php
+++ b/system/Test/FilterTestTrait.php
@@ -84,8 +84,6 @@ trait FilterTestTrait
 
     /**
      * Initializes dependencies once.
-     *
-     * @return void
      */
     protected function setUpFilterTestTrait(): void
     {
@@ -125,8 +123,6 @@ protected function setUpFilterTestTrait(): void
      *
      * @param FilterInterface|string $filter   The filter instance, class, or alias
      * @param string                 $position "before" or "after"
-     *
-     * @return Closure
      */
     protected function getFilterCaller($filter, string $position): Closure
     {
@@ -206,8 +202,6 @@ protected function getFiltersForRoute(string $route, string $position): array
      * @param string $route    The route to test
      * @param string $position "before" or "after"
      * @param string $alias    Alias for the anticipated filter
-     *
-     * @return void
      */
     protected function assertFilter(string $route, string $position, string $alias): void
     {
diff --git a/system/Test/Mock/MockCache.php b/system/Test/Mock/MockCache.php
index 995687c9db00..e6bc200fdd1f 100644
--- a/system/Test/Mock/MockCache.php
+++ b/system/Test/Mock/MockCache.php
@@ -237,8 +237,6 @@ public function getMetaData(string $key)
 
     /**
      * Determines if the driver is supported on this system.
-     *
-     * @return bool
      */
     public function isSupported(): bool
     {
diff --git a/system/Test/Mock/MockCommon.php b/system/Test/Mock/MockCommon.php
index 4b76b7e8a925..d8ba461312cf 100644
--- a/system/Test/Mock/MockCommon.php
+++ b/system/Test/Mock/MockCommon.php
@@ -17,8 +17,6 @@
      * You can set the return value for testing.
      *
      * @param bool $newReturn return value to set
-     *
-     * @return bool
      */
     function is_cli(?bool $newReturn = null): bool
     {
diff --git a/system/Test/Mock/MockConnection.php b/system/Test/Mock/MockConnection.php
index 89726bd05a99..099a8b735d20 100644
--- a/system/Test/Mock/MockConnection.php
+++ b/system/Test/Mock/MockConnection.php
@@ -39,10 +39,7 @@ public function shouldReturn(string $method, $return)
      * Should automatically handle different connections for read/write
      * queries if needed.
      *
-     * @param string $sql
-     * @param mixed  ...$binds
-     * @param bool   $setEscapeFlags
-     * @param string $queryClass
+     * @param mixed ...$binds
      *
      * @return BaseResult|bool|Query
      *
@@ -89,8 +86,6 @@ public function query(string $sql, $binds = null, bool $setEscapeFlags = true, s
     /**
      * Connect to the database.
      *
-     * @param bool $persistent
-     *
      * @return mixed
      */
     public function connect(bool $persistent = false)
@@ -109,8 +104,6 @@ public function connect(bool $persistent = false)
     /**
      * Keep or establish the connection if no queries have been sent for
      * a length of time exceeding the server's idle timeout.
-     *
-     * @return bool
      */
     public function reconnect(): bool
     {
@@ -120,8 +113,6 @@ public function reconnect(): bool
     /**
      * Select a specific database table to use.
      *
-     * @param string $databaseName
-     *
      * @return mixed
      */
     public function setDatabase(string $databaseName)
@@ -133,8 +124,6 @@ public function setDatabase(string $databaseName)
 
     /**
      * Returns a string containing the version of the database being used.
-     *
-     * @return string
      */
     public function getVersion(): string
     {
@@ -144,8 +133,6 @@ public function getVersion(): string
     /**
      * Executes the query against the database.
      *
-     * @param string $sql
-     *
      * @return mixed
      */
     protected function execute(string $sql)
@@ -155,8 +142,6 @@ protected function execute(string $sql)
 
     /**
      * Returns the total number of rows affected by this query.
-     *
-     * @return int
      */
     public function affectedRows(): int
     {
@@ -169,21 +154,17 @@ public function affectedRows(): int
      * Must return an array with keys 'code' and 'message':
      *
      *  return ['code' => null, 'message' => null);
-     *
-     * @return array
      */
     public function error(): array
     {
         return [
-            'code'    => null,
-            'message' => null,
+            'code'    => 0,
+            'message' => '',
         ];
     }
 
     /**
      * Insert ID
-     *
-     * @return int
      */
     public function insertID(): int
     {
@@ -192,10 +173,6 @@ public function insertID(): int
 
     /**
      * Generates the SQL for listing tables in a platform-dependent manner.
-     *
-     * @param bool $constrainByPrefix
-     *
-     * @return string
      */
     protected function _listTables(bool $constrainByPrefix = false): string
     {
@@ -204,41 +181,22 @@ protected function _listTables(bool $constrainByPrefix = false): string
 
     /**
      * Generates a platform-specific query string so that the column names can be fetched.
-     *
-     * @param string $table
-     *
-     * @return string
      */
     protected function _listColumns(string $table = ''): string
     {
         return '';
     }
 
-    /**
-     * @param string $table
-     *
-     * @return array
-     */
     protected function _fieldData(string $table): array
     {
         return [];
     }
 
-    /**
-     * @param string $table
-     *
-     * @return array
-     */
     protected function _indexData(string $table): array
     {
         return [];
     }
 
-    /**
-     * @param string $table
-     *
-     * @return array
-     */
     protected function _foreignKeyData(string $table): array
     {
         return [];
@@ -253,8 +211,6 @@ protected function _close()
 
     /**
      * Begin Transaction
-     *
-     * @return bool
      */
     protected function _transBegin(): bool
     {
@@ -263,8 +219,6 @@ protected function _transBegin(): bool
 
     /**
      * Commit Transaction
-     *
-     * @return bool
      */
     protected function _transCommit(): bool
     {
@@ -273,8 +227,6 @@ protected function _transCommit(): bool
 
     /**
      * Rollback Transaction
-     *
-     * @return bool
      */
     protected function _transRollback(): bool
     {
diff --git a/system/Test/Mock/MockLanguage.php b/system/Test/Mock/MockLanguage.php
index 7602973918db..267114e2a824 100644
--- a/system/Test/Mock/MockLanguage.php
+++ b/system/Test/Mock/MockLanguage.php
@@ -28,10 +28,6 @@ class MockLanguage extends Language
      * 'requireFile()' method to allow easy overrides
      * during testing.
      *
-     * @param array       $data
-     * @param string      $file
-     * @param string|null $locale
-     *
      * @return $this
      */
     public function setData(string $file, array $data, ?string $locale = null)
@@ -44,10 +40,6 @@ public function setData(string $file, array $data, ?string $locale = null)
     /**
      * Provides an override that allows us to set custom
      * data to be returned easily during testing.
-     *
-     * @param string $path
-     *
-     * @return array
      */
     protected function requireFile(string $path): array
     {
diff --git a/system/Test/Mock/MockResult.php b/system/Test/Mock/MockResult.php
index ad1f9d3768e4..0aaa340a95de 100644
--- a/system/Test/Mock/MockResult.php
+++ b/system/Test/Mock/MockResult.php
@@ -17,8 +17,6 @@ class MockResult extends BaseResult
 {
     /**
      * Gets the number of fields in the result set.
-     *
-     * @return int
      */
     public function getFieldCount(): int
     {
@@ -27,8 +25,6 @@ public function getFieldCount(): int
 
     /**
      * Generates an array of column names in the result set.
-     *
-     * @return array
      */
     public function getFieldNames(): array
     {
@@ -37,8 +33,6 @@ public function getFieldNames(): array
 
     /**
      * Generates an array of objects representing field meta-data.
-     *
-     * @return array
      */
     public function getFieldData(): array
     {
@@ -94,8 +88,6 @@ protected function fetchObject($className = 'stdClass')
 
     /**
      * Gets the number of fields in the result set.
-     *
-     * @return int
      */
     public function getNumRows(): int
     {
diff --git a/system/Test/TestLogger.php b/system/Test/TestLogger.php
index db29fbedb26f..22d9f811cfc2 100644
--- a/system/Test/TestLogger.php
+++ b/system/Test/TestLogger.php
@@ -23,9 +23,6 @@ class TestLogger extends Logger
      *
      * @param string $level
      * @param string $message
-     * @param array  $context
-     *
-     * @return bool
      */
     public function log($level, $message, array $context = []): bool
     {
@@ -58,7 +55,6 @@ public function log($level, $message, array $context = []): bool
     /**
      * Used by CIUnitTestCase class to provide ->assertLogged() methods.
      *
-     * @param string $level
      * @param string $message
      *
      * @return bool
diff --git a/system/Test/TestResponse.php b/system/Test/TestResponse.php
index 63c8ab0edad8..d91f00080b14 100644
--- a/system/Test/TestResponse.php
+++ b/system/Test/TestResponse.php
@@ -54,8 +54,6 @@ class TestResponse extends TestCase
 
     /**
      * Stores or the Response and parses the body in the DOM.
-     *
-     * @param ResponseInterface $response
      */
     public function __construct(ResponseInterface $response)
     {
@@ -69,8 +67,6 @@ public function __construct(ResponseInterface $response)
     /**
      * Sets the request.
      *
-     * @param RequestInterface $request
-     *
      * @return $this
      */
     public function setRequest(RequestInterface $request)
@@ -83,8 +79,6 @@ public function setRequest(RequestInterface $request)
     /**
      * Sets the Response and updates the DOM.
      *
-     * @param ResponseInterface $response
-     *
      * @return $this
      */
     public function setResponse(ResponseInterface $response)
@@ -127,8 +121,6 @@ public function response()
     /**
      * Boils down the possible responses into a boolean valid/not-valid
      * response type.
-     *
-     * @return bool
      */
     public function isOK(): bool
     {
@@ -146,8 +138,6 @@ public function isOK(): bool
     /**
      * Asserts that the status is a specific value.
      *
-     * @param int $code
-     *
      * @throws Exception
      */
     public function assertStatus(int $code)
@@ -181,8 +171,6 @@ public function assertNotOK()
 
     /**
      * Returns whether or not the Response was a redirect or RedirectResponse
-     *
-     * @return bool
      */
     public function isRedirect(): bool
     {
@@ -205,8 +193,6 @@ public function assertRedirect()
      * Assert that a given response was a redirect
      * and it was redirect to a specific URI.
      *
-     * @param string $uri
-     *
      * @throws Exception
      */
     public function assertRedirectTo(string $uri)
@@ -235,8 +221,6 @@ public function assertNotRedirect()
 
     /**
      * Returns the URL set for redirection.
-     *
-     * @return string|null
      */
     public function getRedirectUrl(): ?string
     {
@@ -262,8 +246,7 @@ public function getRedirectUrl(): ?string
     /**
      * Asserts that an SESSION key has been set and, optionally, test it's value.
      *
-     * @param string $key
-     * @param mixed  $value
+     * @param mixed $value
      *
      * @throws Exception
      */
@@ -285,8 +268,6 @@ public function assertSessionHas(string $key, $value = null)
     /**
      * Asserts the session is missing $key.
      *
-     * @param string $key
-     *
      * @throws Exception
      */
     public function assertSessionMissing(string $key)
@@ -301,7 +282,6 @@ public function assertSessionMissing(string $key)
     /**
      * Asserts that the Response contains a specific header.
      *
-     * @param string      $key
      * @param string|null $value
      *
      * @throws Exception
@@ -318,8 +298,6 @@ public function assertHeader(string $key, $value = null)
     /**
      * Asserts the Response headers does not contain the specified header.
      *
-     * @param string $key
-     *
      * @throws Exception
      */
     public function assertHeaderMissing(string $key)
@@ -334,9 +312,7 @@ public function assertHeaderMissing(string $key)
     /**
      * Asserts that the response has the specified cookie.
      *
-     * @param string      $key
      * @param string|null $value
-     * @param string      $prefix
      *
      * @throws Exception
      */
@@ -347,8 +323,6 @@ public function assertCookie(string $key, $value = null, string $prefix = '')
 
     /**
      * Assert the Response does not have the specified cookie set.
-     *
-     * @param string $key
      */
     public function assertCookieMissing(string $key)
     {
@@ -358,9 +332,6 @@ public function assertCookieMissing(string $key)
     /**
      * Asserts that a cookie exists and has an expired time.
      *
-     * @param string $key
-     * @param string $prefix
-     *
      * @throws Exception
      */
     public function assertCookieExpired(string $key, string $prefix = '')
@@ -392,9 +363,6 @@ public function getJSON()
     /**
      * Test that the response contains a matching JSON fragment.
      *
-     * @param array $fragment
-     * @param bool  $strict
-     *
      * @throws Exception
      */
     public function assertJSONFragment(array $fragment, bool $strict = false)
@@ -454,9 +422,6 @@ public function getXML()
     /**
      * Assert that the desired text can be found in the result body.
      *
-     * @param string|null $search
-     * @param string|null $element
-     *
      * @throws Exception
      */
     public function assertSee(?string $search = null, ?string $element = null)
@@ -467,9 +432,6 @@ public function assertSee(?string $search = null, ?string $element = null)
     /**
      * Asserts that we do not see the specified text.
      *
-     * @param string|null $search
-     * @param string|null $element
-     *
      * @throws Exception
      */
     public function assertDontSee(?string $search = null, ?string $element = null)
@@ -480,8 +442,6 @@ public function assertDontSee(?string $search = null, ?string $element = null)
     /**
      * Assert that we see an element selected via a CSS selector.
      *
-     * @param string $search
-     *
      * @throws Exception
      */
     public function assertSeeElement(string $search)
@@ -492,8 +452,6 @@ public function assertSeeElement(string $search)
     /**
      * Assert that we do not see an element selected via a CSS selector.
      *
-     * @param string $search
-     *
      * @throws Exception
      */
     public function assertDontSeeElement(string $search)
@@ -504,9 +462,6 @@ public function assertDontSeeElement(string $search)
     /**
      * Assert that we see a link with the matching text and/or class.
      *
-     * @param string      $text
-     * @param string|null $details
-     *
      * @throws Exception
      */
     public function assertSeeLink(string $text, ?string $details = null)
@@ -517,9 +472,6 @@ public function assertSeeLink(string $text, ?string $details = null)
     /**
      * Assert that we see an input with name/value.
      *
-     * @param string      $field
-     * @param string|null $value
-     *
      * @throws Exception
      */
     public function assertSeeInField(string $field, ?string $value = null)
diff --git a/system/Throttle/Throttler.php b/system/Throttle/Throttler.php
index a7c4a01209ca..fe0679a0217b 100644
--- a/system/Throttle/Throttler.php
+++ b/system/Throttle/Throttler.php
@@ -58,8 +58,6 @@ class Throttler implements ThrottlerInterface
 
     /**
      * Constructor.
-     *
-     * @param CacheInterface $cache
      */
     public function __construct(CacheInterface $cache)
     {
@@ -69,8 +67,6 @@ public function __construct(CacheInterface $cache)
     /**
      * Returns the number of seconds until the next available token will
      * be released for usage.
-     *
-     * @return int
      */
     public function getTokenTime(): int
     {
@@ -93,8 +89,6 @@ public function getTokenTime(): int
      * @param int    $seconds  The time it takes the "bucket" to completely refill
      * @param int    $cost     The number of tokens this action uses.
      *
-     * @return bool
-     *
      * @internal param int $maxRequests
      */
     public function check(string $key, int $capacity, int $seconds, int $cost = 1): bool
@@ -161,8 +155,6 @@ public function remove(string $key): self
     /**
      * Used during testing to set the current timestamp to use.
      *
-     * @param int $time
-     *
      * @return $this
      */
     public function setTestTime(int $time)
@@ -174,8 +166,6 @@ public function setTestTime(int $time)
 
     /**
      * Return the test time, defaulting to current.
-     *
-     * @return int
      */
     public function time(): int
     {
diff --git a/system/Throttle/ThrottlerInterface.php b/system/Throttle/ThrottlerInterface.php
index d3cd9d24995a..2fffcb7a4e78 100644
--- a/system/Throttle/ThrottlerInterface.php
+++ b/system/Throttle/ThrottlerInterface.php
@@ -39,8 +39,6 @@ public function check(string $key, int $capacity, int $seconds, int $cost);
     /**
      * Returns the number of seconds until the next available token will
      * be released for usage.
-     *
-     * @return int
      */
     public function getTokenTime(): int;
 }
diff --git a/system/Typography/Typography.php b/system/Typography/Typography.php
index ed613222e490..9ad2dd3914c8 100644
--- a/system/Typography/Typography.php
+++ b/system/Typography/Typography.php
@@ -69,10 +69,7 @@ class Typography
      *     - Converts double dashes into em-dashes.
      *  - Converts two spaces into entities
      *
-     * @param string $str
-     * @param bool   $reduceLinebreaks whether to reduce more then two consecutive newlines to two
-     *
-     * @return string
+     * @param bool $reduceLinebreaks whether to reduce more then two consecutive newlines to two
      */
     public function autoTypography(string $str, bool $reduceLinebreaks = false): string
     {
@@ -228,10 +225,6 @@ public function autoTypography(string $str, bool $reduceLinebreaks = false): str
      * This function mainly converts double and single quotes
      * to curly entities, but it also converts em-dashes,
      * double spaces, and ampersands
-     *
-     * @param string $str
-     *
-     * @return string
      */
     public function formatCharacters(string $str): string
     {
@@ -283,10 +276,6 @@ public function formatCharacters(string $str): string
      * Format Newlines
      *
      * Converts newline characters into either <p> tags or <br />
-     *
-     * @param string $str
-     *
-     * @return string
      */
     protected function formatNewLines(string $str): string
     {
@@ -320,10 +309,6 @@ protected function formatNewLines(string $str): string
      * We don't want quotes converted within tags so we'll temporarily convert them to {@DQ} and {@SQ}
      * and we don't want double dashes converted to emdash entities, so they are marked with {@DD}
      * likewise double spaces are converted to {@NBS} to prevent entity conversion
-     *
-     * @param array $match
-     *
-     * @return string
      */
     protected function protectCharacters(array $match): string
     {
@@ -332,10 +317,6 @@ protected function protectCharacters(array $match): string
 
     /**
      * Convert newlines to HTML line breaks except within PRE tags
-     *
-     * @param string $str
-     *
-     * @return string
      */
     public function nl2brExceptPre(string $str): string
     {
diff --git a/system/Validation/CreditCardRules.php b/system/Validation/CreditCardRules.php
index f9765a6b0bbb..8632dfc8f47e 100644
--- a/system/Validation/CreditCardRules.php
+++ b/system/Validation/CreditCardRules.php
@@ -169,11 +169,6 @@ class CreditCardRules
      *  $rules = [
      *      'cc_num' => 'valid_cc_number[visa]'
      *  ];
-     *
-     * @param string|null $ccNumber
-     * @param string      $type
-     *
-     * @return bool
      */
     public function valid_cc_number(?string $ccNumber, string $type): bool
     {
@@ -243,8 +238,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
-     *
-     * @return bool
      */
     protected function isValidLuhn(?string $number = null): bool
     {
diff --git a/system/Validation/FileRules.php b/system/Validation/FileRules.php
index 30a76d1a9dbd..ea1a6f678379 100644
--- a/system/Validation/FileRules.php
+++ b/system/Validation/FileRules.php
@@ -43,11 +43,6 @@ public function __construct(?RequestInterface $request = null)
 
     /**
      * Verifies that $name is the name of a valid uploaded file.
-     *
-     * @param string|null $blank
-     * @param string      $name
-     *
-     * @return bool
      */
     public function uploaded(?string $blank, string $name): bool
     {
@@ -79,11 +74,6 @@ public function uploaded(?string $blank, string $name): bool
 
     /**
      * Verifies if the file's size in Kilobytes is no larger than the parameter.
-     *
-     * @param string|null $blank
-     * @param string      $params
-     *
-     * @return bool
      */
     public function max_size(?string $blank, string $params): bool
     {
@@ -120,11 +110,6 @@ public function max_size(?string $blank, string $params): bool
     /**
      * Uses the mime config file to determine if a file is considered an "image",
      * which for our purposes basically means that it's a raster image or svg.
-     *
-     * @param string|null $blank
-     * @param string      $params
-     *
-     * @return bool
      */
     public function is_image(?string $blank, string $params): bool
     {
@@ -160,11 +145,6 @@ public function is_image(?string $blank, string $params): bool
 
     /**
      * Checks to see if an uploaded file's mime type matches one in the parameter.
-     *
-     * @param string|null $blank
-     * @param string      $params
-     *
-     * @return bool
      */
     public function mime_in(?string $blank, string $params): bool
     {
@@ -196,11 +176,6 @@ public function mime_in(?string $blank, string $params): bool
 
     /**
      * Checks to see if an uploaded file's extension matches one in the parameter.
-     *
-     * @param string|null $blank
-     * @param string      $params
-     *
-     * @return bool
      */
     public function ext_in(?string $blank, string $params): bool
     {
@@ -233,11 +208,6 @@ public function ext_in(?string $blank, string $params): bool
     /**
      * Checks an uploaded file to verify that the dimensions are within
      * a specified allowable dimension.
-     *
-     * @param string|null $blank
-     * @param string      $params
-     *
-     * @return bool
      */
     public function max_dims(?string $blank, string $params): bool
     {
diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index 3dd0b0d514db..6ee13c3f31df 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -20,10 +20,6 @@ class FormatRules
 {
     /**
      * Alpha
-     *
-     * @param string|null $str
-     *
-     * @return bool
      */
     public function alpha(?string $str = null): bool
     {
@@ -49,10 +45,6 @@ public function alpha_space(?string $value = null): bool
 
     /**
      * Alphanumeric with underscores and dashes
-     *
-     * @param string|null $str
-     *
-     * @return bool
      */
     public function alpha_dash(?string $str = null): bool
     {
@@ -79,10 +71,6 @@ public function alpha_numeric_punct($str)
 
     /**
      * Alphanumeric
-     *
-     * @param string|null $str
-     *
-     * @return bool
      */
     public function alpha_numeric(?string $str = null): bool
     {
@@ -91,10 +79,6 @@ public function alpha_numeric(?string $str = null): bool
 
     /**
      * Alphanumeric w/ spaces
-     *
-     * @param string|null $str
-     *
-     * @return bool
      */
     public function alpha_numeric_space(?string $str = null): bool
     {
@@ -109,8 +93,6 @@ public function alpha_numeric_space(?string $str = null): bool
      * it doesn't convert numbers into strings.
      *
      * @param string|null $str
-     *
-     * @return bool
      */
     public function string($str = null): bool
     {
@@ -119,10 +101,6 @@ public function string($str = null): bool
 
     /**
      * Decimal number
-     *
-     * @param string|null $str
-     *
-     * @return bool
      */
     public function decimal(?string $str = null): bool
     {
@@ -132,10 +110,6 @@ public function decimal(?string $str = null): bool
 
     /**
      * String of hexidecimal characters
-     *
-     * @param string|null $str
-     *
-     * @return bool
      */
     public function hex(?string $str = null): bool
     {
@@ -144,10 +118,6 @@ public function hex(?string $str = null): bool
 
     /**
      * Integer
-     *
-     * @param string|null $str
-     *
-     * @return bool
      */
     public function integer(?string $str = null): bool
     {
@@ -156,10 +126,6 @@ public function integer(?string $str = null): bool
 
     /**
      * Is a Natural number  (0,1,2,3, etc.)
-     *
-     * @param string|null $str
-     *
-     * @return bool
      */
     public function is_natural(?string $str = null): bool
     {
@@ -168,10 +134,6 @@ public function is_natural(?string $str = null): bool
 
     /**
      * Is a Natural number, but not a zero  (1,2,3, etc.)
-     *
-     * @param string|null $str
-     *
-     * @return bool
      */
     public function is_natural_no_zero(?string $str = null): bool
     {
@@ -180,10 +142,6 @@ public function is_natural_no_zero(?string $str = null): bool
 
     /**
      * Numeric
-     *
-     * @param string|null $str
-     *
-     * @return bool
      */
     public function numeric(?string $str = null): bool
     {
@@ -193,11 +151,6 @@ public function numeric(?string $str = null): bool
 
     /**
      * Compares value against a regular expression pattern.
-     *
-     * @param string|null $str
-     * @param string      $pattern
-     *
-     * @return bool
      */
     public function regex_match(?string $str, string $pattern): bool
     {
@@ -215,8 +168,6 @@ public function regex_match(?string $str, string $pattern): bool
      * @see http://php.net/manual/en/datetimezone.listidentifiers.php
      *
      * @param string $str
-     *
-     * @return bool
      */
     public function timezone(?string $str = null): bool
     {
@@ -230,8 +181,6 @@ public function timezone(?string $str = null): bool
      * as defined by RFC 2045 http://www.faqs.org/rfcs/rfc2045
      *
      * @param string $str
-     *
-     * @return bool
      */
     public function valid_base64(?string $str = null): bool
     {
@@ -242,8 +191,6 @@ public function valid_base64(?string $str = null): bool
      * Valid JSON
      *
      * @param string $str
-     *
-     * @return bool
      */
     public function valid_json(?string $str = null): bool
     {
@@ -256,8 +203,6 @@ public function valid_json(?string $str = null): bool
      * Checks for a correctly formatted email address
      *
      * @param string $str
-     *
-     * @return bool
      */
     public function valid_email(?string $str = null): bool
     {
@@ -276,8 +221,6 @@ public function valid_email(?string $str = null): bool
      *     valid_emails[one@example.com,two@example.com]
      *
      * @param string $str
-     *
-     * @return bool
      */
     public function valid_emails(?string $str = null): bool
     {
@@ -300,8 +243,6 @@ public function valid_emails(?string $str = null): bool
      *
      * @param string $ip    IP Address
      * @param string $which IP protocol: 'ipv4' or 'ipv6'
-     *
-     * @return bool
      */
     public function valid_ip(?string $ip = null, ?string $which = null): bool
     {
@@ -330,8 +271,6 @@ public function valid_ip(?string $ip = null, ?string $which = null): bool
      * Checks a URL to ensure it's formed correctly.
      *
      * @param string $str
-     *
-     * @return bool
      */
     public function valid_url(?string $str = null): bool
     {
@@ -357,8 +296,6 @@ public function valid_url(?string $str = null): bool
      *
      * @param string $str
      * @param string $format
-     *
-     * @return bool
      */
     public function valid_date(?string $str = null, ?string $format = null): bool
     {
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
index 31f9c6cf9b03..1336e9fb87f3 100644
--- a/system/Validation/Rules.php
+++ b/system/Validation/Rules.php
@@ -23,10 +23,7 @@ class Rules
      * The value does not match another field in $data.
      *
      * @param string $str
-     * @param string $field
-     * @param array  $data  Other field/value pairs
-     *
-     * @return bool
+     * @param array  $data Other field/value pairs
      */
     public function differs(?string $str, string $field, array $data): bool
     {
@@ -41,9 +38,6 @@ public function differs(?string $str, string $field, array $data): bool
      * Equals the static value provided.
      *
      * @param string $str
-     * @param string $val
-     *
-     * @return bool
      */
     public function equals(?string $str, string $val): bool
     {
@@ -55,9 +49,6 @@ public function equals(?string $str, string $val): bool
      * $val = "5" (one) | "5,8,12" (multiple values)
      *
      * @param string $str
-     * @param string $val
-     *
-     * @return bool
      */
     public function exact_length(?string $str, string $val): bool
     {
@@ -76,9 +67,6 @@ public function exact_length(?string $str, string $val): bool
      * Greater than
      *
      * @param string $str
-     * @param string $min
-     *
-     * @return bool
      */
     public function greater_than(?string $str, string $min): bool
     {
@@ -89,9 +77,6 @@ public function greater_than(?string $str, string $min): bool
      * Equal to or Greater than
      *
      * @param string $str
-     * @param string $min
-     *
-     * @return bool
      */
     public function greater_than_equal_to(?string $str, string $min): bool
     {
@@ -108,10 +93,6 @@ public function greater_than_equal_to(?string $str, string $min): bool
      *    is_not_unique[menu.id,active,1]
      *
      * @param string $str
-     * @param string $field
-     * @param array  $data
-     *
-     * @return bool
      */
     public function is_not_unique(?string $str, string $field, array $data): bool
     {
@@ -139,9 +120,6 @@ public function is_not_unique(?string $str, string $field, array $data): bool
      * Value should be within an array of values
      *
      * @param string $value
-     * @param string $list
-     *
-     * @return bool
      */
     public function in_list(?string $value, string $list): bool
     {
@@ -160,10 +138,6 @@ public function in_list(?string $value, string $list): bool
      *    is_unique[users.email,id,5]
      *
      * @param string $str
-     * @param string $field
-     * @param array  $data
-     *
-     * @return bool
      */
     public function is_unique(?string $str, string $field, array $data): bool
     {
@@ -191,9 +165,6 @@ public function is_unique(?string $str, string $field, array $data): bool
      * Less than
      *
      * @param string $str
-     * @param string $max
-     *
-     * @return bool
      */
     public function less_than(?string $str, string $max): bool
     {
@@ -204,9 +175,6 @@ public function less_than(?string $str, string $max): bool
      * Equal to or Less than
      *
      * @param string $str
-     * @param string $max
-     *
-     * @return bool
      */
     public function less_than_equal_to(?string $str, string $max): bool
     {
@@ -217,10 +185,7 @@ public function less_than_equal_to(?string $str, string $max): bool
      * Matches the value of another field in $data.
      *
      * @param string $str
-     * @param string $field
-     * @param array  $data  Other field/value pairs
-     *
-     * @return bool
+     * @param array  $data Other field/value pairs
      */
     public function matches(?string $str, string $field, array $data): bool
     {
@@ -235,9 +200,6 @@ public function matches(?string $str, string $field, array $data): bool
      * Returns true if $str is $val or fewer characters in length.
      *
      * @param string $str
-     * @param string $val
-     *
-     * @return bool
      */
     public function max_length(?string $str, string $val): bool
     {
@@ -248,9 +210,6 @@ public function max_length(?string $str, string $val): bool
      * Returns true if $str is at least $val length.
      *
      * @param string $str
-     * @param string $val
-     *
-     * @return bool
      */
     public function min_length(?string $str, string $val): bool
     {
@@ -261,9 +220,6 @@ public function min_length(?string $str, string $val): bool
      * Does not equal the static value provided.
      *
      * @param string $str
-     * @param string $val
-     *
-     * @return bool
      */
     public function not_equals(?string $str, string $val): bool
     {
@@ -274,9 +230,6 @@ public function not_equals(?string $str, string $val): bool
      * Value should not be within an array of values.
      *
      * @param string $value
-     * @param string $list
-     *
-     * @return bool
      */
     public function not_in_list(?string $value, string $list): bool
     {
@@ -310,8 +263,6 @@ public function required($str = null): bool
      * @param string|null $str
      * @param string|null $fields List of fields that we should check if present
      * @param array       $data   Complete list of fields from the form
-     *
-     * @return bool
      */
     public function required_with($str = null, ?string $fields = null, array $data = []): bool
     {
@@ -353,10 +304,6 @@ public function required_with($str = null, ?string $fields = null, array $data =
      *     required_without[id,email]
      *
      * @param string|null $str
-     * @param string|null $fields
-     * @param array       $data
-     *
-     * @return bool
      */
     public function required_without($str = null, ?string $fields = null, array $data = []): bool
     {
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 1b72e639fe19..a41e1ebc558f 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -86,8 +86,7 @@ class Validation implements ValidationInterface
     /**
      * Validation constructor.
      *
-     * @param ValidationConfig  $config
-     * @param RendererInterface $view
+     * @param ValidationConfig $config
      */
     public function __construct($config, RendererInterface $view)
     {
@@ -105,8 +104,6 @@ public function __construct($config, RendererInterface $view)
      * @param array|null  $data    The array of data to validate.
      * @param string|null $group   The predefined group of rules to apply.
      * @param string|null $dbGroup The database group to use.
-     *
-     * @return bool
      */
     public function run(?array $data = null, ?string $group = null, ?string $dbGroup = null): bool
     {
@@ -163,10 +160,7 @@ public function run(?array $data = null, ?string $group = null, ?string $dbGroup
      * determining whether validation was successful or not.
      *
      * @param mixed    $value
-     * @param string   $rule
      * @param string[] $errors
-     *
-     * @return bool
      */
     public function check($value, string $rule, array $errors = []): bool
     {
@@ -181,13 +175,9 @@ public function check($value, string $rule, array $errors = []): bool
      * the error to $this->errors and moves on to the next,
      * so that we can collect all of the first errors.
      *
-     * @param string       $field
-     * @param string|null  $label
      * @param array|string $value
      * @param array|null   $rules
      * @param array        $data
-     *
-     * @return bool
      */
     protected function processRules(string $field, ?string $label, $value, $rules = null, ?array $data = null): bool
     {
@@ -317,8 +307,6 @@ protected function processRules(string $field, ?string $label, $value, $rules =
      * array values.
      *
      * @param IncomingRequest|RequestInterface $request
-     *
-     * @return ValidationInterface
      */
     public function withRequest(RequestInterface $request): ValidationInterface
     {
@@ -351,11 +339,6 @@ public function withRequest(RequestInterface $request): ValidationInterface
      *        'rule' => 'message'
      *    ]
      *
-     * @param string      $field
-     * @param string|null $label
-     * @param string      $rules
-     * @param array       $errors
-     *
      * @return $this
      */
     public function setRule(string $field, ?string $label, string $rules, array $errors = [])
@@ -388,10 +371,7 @@ public function setRule(string $field, ?string $label, string $rules, array $err
      *        ],
      *    ]
      *
-     * @param array $rules
      * @param array $errors // An array of custom error messages
-     *
-     * @return ValidationInterface
      */
     public function setRules(array $rules, array $errors = []): ValidationInterface
     {
@@ -417,8 +397,6 @@ public function setRules(array $rules, array $errors = []): ValidationInterface
 
     /**
      * Returns all of the rules currently defined.
-     *
-     * @return array
      */
     public function getRules(): array
     {
@@ -427,10 +405,6 @@ public function getRules(): array
 
     /**
      * Checks to see if the rule for key $field has been set or not.
-     *
-     * @param string $field
-     *
-     * @return bool
      */
     public function hasRule(string $field): bool
     {
@@ -479,10 +453,6 @@ public function setRuleGroup(string $group)
 
     /**
      * Returns the rendered HTML of the errors as defined in $template.
-     *
-     * @param string $template
-     *
-     * @return string
      */
     public function listErrors(string $template = 'list'): string
     {
@@ -497,11 +467,6 @@ public function listErrors(string $template = 'list'): string
 
     /**
      * Displays a single error in formatted HTML as defined in the $template view.
-     *
-     * @param string $field
-     * @param string $template
-     *
-     * @return string
      */
     public function showError(string $field, string $template = 'single'): string
     {
@@ -541,8 +506,6 @@ protected function loadRuleSets()
      * same format used with setRules(). Additionally, check
      * for {group}_errors for an array of custom error messages.
      *
-     * @param string|null $group
-     *
      * @return array|ValidationException|null
      */
     public function loadRuleGroup(?string $group = null)
@@ -586,11 +549,6 @@ public function loadRuleGroup(?string $group = null)
      * The value of {id} would be replaced with the actual id in the form data:
      *
      *  'required|is_unique[users,email,id,13]'
-     *
-     * @param array $rules
-     * @param array $data
-     *
-     * @return array
      */
     protected function fillPlaceholders(array $rules, array $data): array
     {
@@ -625,10 +583,6 @@ protected function fillPlaceholders(array $rules, array $data): array
 
     /**
      * Checks to see if an error exists for the given field.
-     *
-     * @param string $field
-     *
-     * @return bool
      */
     public function hasError(string $field): bool
     {
@@ -681,11 +635,6 @@ public function getErrors(): array
 
     /**
      * Sets the error for a specific field. Used by custom validation methods.
-     *
-     * @param string $field
-     * @param string $error
-     *
-     * @return ValidationInterface
      */
     public function setError(string $field, string $error): ValidationInterface
     {
@@ -697,13 +646,8 @@ public function setError(string $field, string $error): ValidationInterface
     /**
      * Attempts to find the appropriate error message
      *
-     * @param string      $rule
-     * @param string      $field
-     * @param string|null $label
-     * @param string      $param
-     * @param string      $value The value that caused the validation to fail.
-     *
-     * @return string
+     * @param string $param
+     * @param string $value The value that caused the validation to fail.
      */
     protected function getErrorMessage(string $rule, string $field, ?string $label = null, ?string $param = null, ?string $value = null): string
     {
@@ -725,10 +669,6 @@ protected function getErrorMessage(string $rule, string $field, ?string $label =
 
     /**
      * Split rules string by pipe operator.
-     *
-     * @param string $rules
-     *
-     * @return array
      */
     protected function splitRules(string $rules): array
     {
@@ -750,8 +690,6 @@ protected function splitRules(string $rules): array
     /**
      * Resets the class to a blank slate. Should be called whenever
      * you need to process more than one array.
-     *
-     * @return ValidationInterface
      */
     public function reset(): ValidationInterface
     {
diff --git a/system/Validation/ValidationInterface.php b/system/Validation/ValidationInterface.php
index 44a6729f3072..dc0679a3e328 100644
--- a/system/Validation/ValidationInterface.php
+++ b/system/Validation/ValidationInterface.php
@@ -24,8 +24,6 @@ interface ValidationInterface
      *
      * @param array  $data  The array of data to validate.
      * @param string $group The pre-defined group of rules to apply.
-     *
-     * @return bool
      */
     public function run(?array $data = null, ?string $group = null): bool;
 
@@ -44,38 +42,21 @@ public function check($value, string $rule, array $errors = []): bool;
     /**
      * Takes a Request object and grabs the input data to use from its
      * array values.
-     *
-     * @param RequestInterface $request
-     *
-     * @return ValidationInterface
      */
     public function withRequest(RequestInterface $request): ValidationInterface;
 
     /**
      * Stores the rules that should be used to validate the items.
-     *
-     * @param array $rules
-     * @param array $messages
-     *
-     * @return ValidationInterface
      */
     public function setRules(array $rules, array $messages = []): ValidationInterface;
 
     /**
      * Checks to see if the rule for key $field has been set or not.
-     *
-     * @param string $field
-     *
-     * @return bool
      */
     public function hasRule(string $field): bool;
 
     /**
      * Returns the error for a specified $field (or empty string if not set).
-     *
-     * @param string $field
-     *
-     * @return string
      */
     public function getError(string $field): string;
 
@@ -94,19 +75,12 @@ public function getErrors(): array;
 
     /**
      * Sets the error for a specific field. Used by custom validation methods.
-     *
-     * @param string $alias
-     * @param string $error
-     *
-     * @return ValidationInterface
      */
     public function setError(string $alias, string $error): ValidationInterface;
 
     /**
      * Resets the class to a blank slate. Should be called whenever
      * you need to process more than one array.
-     *
-     * @return ValidationInterface
      */
     public function reset(): ValidationInterface;
 }
diff --git a/system/View/Cell.php b/system/View/Cell.php
index 5453bcf37bfb..7affd2742049 100644
--- a/system/View/Cell.php
+++ b/system/View/Cell.php
@@ -53,8 +53,6 @@ class Cell
 
     /**
      * Cell constructor.
-     *
-     * @param CacheInterface $cache
      */
     public function __construct(CacheInterface $cache)
     {
@@ -64,14 +62,9 @@ public function __construct(CacheInterface $cache)
     /**
      * Render a cell, returning its body as a string.
      *
-     * @param string      $library
-     * @param null        $params
-     * @param int         $ttl
-     * @param string|null $cacheName
+     * @param null $params
      *
      * @throws ReflectionException
-     *
-     * @return string
      */
     public function render(string $library, $params = null, int $ttl = 0, ?string $cacheName = null): string
     {
@@ -191,10 +184,6 @@ public function prepareParams($params)
     /**
      * Given the library string, attempts to determine the class and method
      * to call.
-     *
-     * @param string $library
-     *
-     * @return array
      */
     protected function determineClass(string $library): array
     {
diff --git a/system/View/Filters.php b/system/View/Filters.php
index 0a24389d607f..86fd23c4b0a6 100644
--- a/system/View/Filters.php
+++ b/system/View/Filters.php
@@ -21,10 +21,6 @@ class Filters
 {
     /**
      * Returns $value as all lowercase with the first letter capitalized.
-     *
-     * @param string $value
-     *
-     * @return string
      */
     public static function capitalize(string $value): string
     {
@@ -34,10 +30,7 @@ public static function capitalize(string $value): string
     /**
      * Formats a date into the given $format.
      *
-     * @param mixed  $value
-     * @param string $format
-     *
-     * @return string
+     * @param mixed $value
      */
     public static function date($value, string $format): string
     {
@@ -56,7 +49,6 @@ public static function date($value, string $format): string
      *      my_date|date_modify(+1 day)
      *
      * @param string $value
-     * @param string $adjustment
      *
      * @return false|int
      */
@@ -70,10 +62,7 @@ public static function date_modify($value, string $adjustment)
     /**
      * Returns the given default value if $value is empty or undefined.
      *
-     * @param mixed  $value
-     * @param string $default
-     *
-     * @return string
+     * @param mixed $value
      */
     public static function default($value, string $default): string
     {
@@ -86,9 +75,6 @@ public static function default($value, string $default): string
      * Escapes the given value with our `esc()` helper function.
      *
      * @param string $value
-     * @param string $context
-     *
-     * @return string
      */
     public static function esc($value, string $context = 'html'): string
     {
@@ -97,12 +83,6 @@ public static function esc($value, string $context = 'html'): string
 
     /**
      * Returns an excerpt of the given string.
-     *
-     * @param string $value
-     * @param string $phrase
-     * @param int    $radius
-     *
-     * @return string
      */
     public static function excerpt(string $value, string $phrase, int $radius = 100): string
     {
@@ -113,11 +93,6 @@ public static function excerpt(string $value, string $phrase, int $radius = 100)
 
     /**
      * Highlights a given phrase within the text using '<mark></mark>' tags.
-     *
-     * @param string $value
-     * @param string $phrase
-     *
-     * @return string
      */
     public static function highlight(string $value, string $phrase): string
     {
@@ -130,8 +105,6 @@ public static function highlight(string $value, string $phrase): string
      * Highlights code samples with HTML/CSS.
      *
      * @param string $value
-     *
-     * @return string
      */
     public static function highlight_code($value): string
     {
@@ -145,9 +118,6 @@ public static function highlight_code($value): string
      * Will break at word break so may be more or less than $limit.
      *
      * @param string $value
-     * @param int    $limit
-     *
-     * @return string
      */
     public static function limit_chars($value, int $limit = 500): string
     {
@@ -160,9 +130,6 @@ public static function limit_chars($value, int $limit = 500): string
      * Limits the number of words to $limit, and trails of with an ellipsis.
      *
      * @param string $value
-     * @param int    $limit
-     *
-     * @return string
      */
     public static function limit_words($value, int $limit = 100): string
     {
@@ -174,12 +141,7 @@ public static function limit_words($value, int $limit = 100): string
     /**
      * Returns the $value displayed in a localized manner.
      *
-     * @param float|int   $value
-     * @param int         $precision
-     * @param string      $type
-     * @param string|null $locale
-     *
-     * @return string
+     * @param float|int $value
      */
     public static function local_number($value, string $type = 'decimal', int $precision = 4, ?string $locale = null): string
     {
@@ -201,12 +163,8 @@ public static function local_number($value, string $type = 'decimal', int $preci
     /**
      * Returns the $value displayed as a currency string.
      *
-     * @param float|int   $value
-     * @param string      $currency
-     * @param string|null $locale
-     * @param int         $fraction
-     *
-     * @return string
+     * @param float|int $value
+     * @param int       $fraction
      */
     public static function local_currency($value, string $currency, ?string $locale = null, $fraction = null): string
     {
@@ -224,10 +182,6 @@ public static function local_currency($value, string $currency, ?string $locale
     /**
      * Returns a string with all instances of newline character (\n)
      * converted to an HTML <br/> tag.
-     *
-     * @param string $value
-     *
-     * @return string
      */
     public static function nl2br(string $value): string
     {
@@ -239,10 +193,6 @@ public static function nl2br(string $value): string
     /**
      * Takes a body of text and uses the auto_typography() method to
      * turn it into prettier, easier-to-read, prose.
-     *
-     * @param string $value
-     *
-     * @return string
      */
     public static function prose(string $value): string
     {
@@ -258,9 +208,7 @@ public static function prose(string $value): string
      *  - ceil      always rounds up
      *  - floor     always rounds down
      *
-     * @param string $value
-     * @param mixed  $precision
-     * @param string $type
+     * @param mixed $precision
      *
      * @return float|string
      */
@@ -288,10 +236,6 @@ public static function round(string $value, $precision = 2, string $type = 'comm
 
     /**
      * Returns a "title case" version of the string.
-     *
-     * @param string $value
-     *
-     * @return string
      */
     public static function title(string $value): string
     {
diff --git a/system/View/Parser.php b/system/View/Parser.php
index 7187a3ce850a..080a30c35674 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -60,7 +60,6 @@ class Parser extends View
     /**
      * Constructor
      *
-     * @param ViewConfig      $config
      * @param string          $viewPath
      * @param mixed           $loader
      * @param bool            $debug
@@ -80,11 +79,8 @@ public function __construct(ViewConfig $config, ?string $viewPath = null, $loade
      * Parses pseudo-variables contained in the specified template view,
      * replacing them with any data that has already been set.
      *
-     * @param string $view
-     * @param array  $options
-     * @param bool   $saveData
-     *
-     * @return string
+     * @param array $options
+     * @param bool  $saveData
      */
     public function render(string $view, ?array $options = null, ?bool $saveData = null): string
     {
@@ -143,11 +139,8 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
      * Parses pseudo-variables contained in the specified string,
      * replacing them with any data that has already been set.
      *
-     * @param string $template
-     * @param array  $options
-     * @param bool   $saveData
-     *
-     * @return string
+     * @param array $options
+     * @param bool  $saveData
      */
     public function renderString(string $template, ?array $options = null, ?bool $saveData = null): string
     {
@@ -179,11 +172,8 @@ public function renderString(string $template, ?array $options = null, ?bool $sa
      * so that the variable is correctly handled within the
      * parsing itself, and contexts (including raw) are respected.
      *
-     * @param array  $data
      * @param string $context The context to escape it for: html, css, js, url, raw
      *                        If 'raw', no escaping will happen
-     *
-     * @return RendererInterface
      */
     public function setData(array $data = [], ?string $context = null): RendererInterface
     {
@@ -213,11 +203,7 @@ public function setData(array $data = [], ?string $context = null): RendererInte
      * Parses pseudo-variables contained in the specified template,
      * replacing them with the data in the second param
      *
-     * @param string $template
-     * @param array  $data
-     * @param array  $options  Future options
-     *
-     * @return string
+     * @param array $options Future options
      */
     protected function parse(string $template, array $data = [], ?array $options = null): string
     {
@@ -261,11 +247,6 @@ protected function parse(string $template, array $data = [], ?array $options = n
 
     /**
      * Parse a single key/value, extracting it
-     *
-     * @param string $key
-     * @param string $val
-     *
-     * @return array
      */
     protected function parseSingle(string $key, string $val): array
     {
@@ -278,12 +259,6 @@ protected function parseSingle(string $key, string $val): array
      * Parse a tag pair
      *
      * Parses tag pairs: {some_tag} string... {/some_tag}
-     *
-     * @param string $variable
-     * @param array  $data
-     * @param string $template
-     *
-     * @return array
      */
     protected function parsePair(string $variable, array $data, string $template): array
     {
@@ -371,10 +346,6 @@ protected function parsePair(string $variable, array $data, string $template): a
      * Removes any comments from the file. Comments are wrapped in {# #} symbols:
      *
      *      {# This is a comment #}
-     *
-     * @param string $template
-     *
-     * @return string
      */
     protected function parseComments(string $template): string
     {
@@ -384,10 +355,6 @@ protected function parseComments(string $template): string
     /**
      * Extracts noparse blocks, inserting a hash in its place so that
      * those blocks of the page are not touched by parsing.
-     *
-     * @param string $template
-     *
-     * @return string
      */
     protected function extractNoparse(string $template): string
     {
@@ -411,10 +378,6 @@ protected function extractNoparse(string $template): string
 
     /**
      * Re-inserts the noparsed contents back into the template.
-     *
-     * @param string $template
-     *
-     * @return string
      */
     public function insertNoparse(string $template): string
     {
@@ -434,10 +397,6 @@ public function insertNoparse(string $template): string
      *  - if
      *  - elseif
      *  - else
-     *
-     * @param string $template
-     *
-     * @return string
      */
     protected function parseConditionals(string $template): string
     {
@@ -488,8 +447,6 @@ protected function parseConditionals(string $template): string
      *
      * @param string $leftDelimiter
      * @param string $rightDelimiter
-     *
-     * @return RendererInterface
      */
     public function setDelimiters($leftDelimiter = '{', $rightDelimiter = '}'): RendererInterface
     {
@@ -506,9 +463,6 @@ public function setDelimiters($leftDelimiter = '{', $rightDelimiter = '}'): Rend
      * @param mixed  $pattern
      * @param string $content
      * @param string $template
-     * @param bool   $escape
-     *
-     * @return string
      */
     protected function replaceSingle($pattern, $content, $template, bool $escape = false): string
     {
@@ -535,12 +489,6 @@ protected function replaceSingle($pattern, $content, $template, bool $escape = f
 
     /**
      * Callback used during parse() to apply any filters to the value.
-     *
-     * @param array  $matches
-     * @param string $replace
-     * @param bool   $escape
-     *
-     * @return string
      */
     protected function prepareReplacement(array $matches, string $replace, bool $escape = true): string
     {
@@ -560,8 +508,6 @@ protected function prepareReplacement(array $matches, string $replace, bool $esc
     /**
      * Checks the placeholder the view provided to see if we need to provide any autoescaping.
      *
-     * @param string $key
-     *
      * @return false|string
      */
     public function shouldAddEscaping(string $key)
@@ -596,11 +542,6 @@ public function shouldAddEscaping(string $key)
     /**
      * Given a set of filters, will apply each of the filters in turn
      * to $replace, and return the modified string.
-     *
-     * @param string $replace
-     * @param array  $filters
-     *
-     * @return string
      */
     protected function applyFilters(string $replace, array $filters): string
     {
@@ -644,8 +585,6 @@ protected function applyFilters(string $replace, array $filters): string
      * Scans the template for any parser plugins, and attempts to execute them.
      * Plugins are delimited by {+ ... +}
      *
-     * @param string $template
-     *
      * @return string
      */
     protected function parsePlugins(string $template)
@@ -699,10 +638,6 @@ protected function parsePlugins(string $template)
     /**
      * Makes a new plugin available during the parsing of the template.
      *
-     * @param string   $alias
-     * @param callable $callback
-     * @param bool     $isPair
-     *
      * @return $this
      */
     public function addPlugin(string $alias, callable $callback, bool $isPair = false)
@@ -715,8 +650,6 @@ public function addPlugin(string $alias, callable $callback, bool $isPair = fals
     /**
      * Removes a plugin from the available plugins.
      *
-     * @param string $alias
-     *
      * @return $this
      */
     public function removePlugin(string $alias)
diff --git a/system/View/Plugins.php b/system/View/Plugins.php
index b58951b8de20..d0e170071a6a 100644
--- a/system/View/Plugins.php
+++ b/system/View/Plugins.php
@@ -41,10 +41,6 @@ public static function previousURL()
 
     /**
      * Wrap helper function to use as view plugin.
-     *
-     * @param array $params
-     *
-     * @return string
      */
     public static function mailto(array $params = []): string
     {
@@ -57,10 +53,6 @@ public static function mailto(array $params = []): string
 
     /**
      * Wrap helper function to use as view plugin.
-     *
-     * @param array $params
-     *
-     * @return string
      */
     public static function safeMailto(array $params = []): string
     {
@@ -73,10 +65,6 @@ public static function safeMailto(array $params = []): string
 
     /**
      * Wrap helper function to use as view plugin.
-     *
-     * @param array $params
-     *
-     * @return string
      */
     public static function lang(array $params = []): string
     {
@@ -87,10 +75,6 @@ public static function lang(array $params = []): string
 
     /**
      * Wrap helper function to use as view plugin.
-     *
-     * @param array $params
-     *
-     * @return string
      */
     public static function ValidationErrors(array $params = []): string
     {
@@ -105,8 +89,6 @@ public static function ValidationErrors(array $params = []): string
     /**
      * Wrap helper function to use as view plugin.
      *
-     * @param array $params
-     *
      * @return false|string
      */
     public static function route(array $params = [])
@@ -116,10 +98,6 @@ public static function route(array $params = [])
 
     /**
      * Wrap helper function to use as view plugin.
-     *
-     * @param array $params
-     *
-     * @return string
      */
     public static function siteURL(array $params = []): string
     {
diff --git a/system/View/RendererInterface.php b/system/View/RendererInterface.php
index bc7e4208b274..409a5a76d3ba 100644
--- a/system/View/RendererInterface.php
+++ b/system/View/RendererInterface.php
@@ -22,13 +22,10 @@ interface RendererInterface
      * Builds the output based upon a file name and any
      * data that has already been set.
      *
-     * @param string $view
-     * @param array  $options  Reserved for 3rd-party uses since
-     *                         it might be needed to pass additional info
-     *                         to other template engines.
-     * @param bool   $saveData Whether to save data for subsequent calls
-     *
-     * @return string
+     * @param array $options  Reserved for 3rd-party uses since
+     *                        it might be needed to pass additional info
+     *                        to other template engines.
+     * @param bool  $saveData Whether to save data for subsequent calls
      */
     public function render(string $view, ?array $options = null, bool $saveData = false): string;
 
@@ -41,15 +38,12 @@ public function render(string $view, ?array $options = null, bool $saveData = fa
      *                         it might be needed to pass additional info
      *                         to other template engines.
      * @param bool   $saveData Whether to save data for subsequent calls
-     *
-     * @return string
      */
     public function renderString(string $view, ?array $options = null, bool $saveData = false): string;
 
     /**
      * Sets several pieces of view data at once.
      *
-     * @param array  $data
      * @param string $context The context to escape it for: html, css, js, url
      *                        If 'raw', no escaping will happen
      *
@@ -60,7 +54,6 @@ public function setData(array $data = [], ?string $context = null);
     /**
      * Sets a single piece of view data.
      *
-     * @param string $name
      * @param mixed  $value
      * @param string $context The context to escape it for: html, css, js, url
      *                        If 'raw' no escaping will happen
diff --git a/system/View/Table.php b/system/View/Table.php
index 5093d88047da..8eab66bbd8a1 100644
--- a/system/View/Table.php
+++ b/system/View/Table.php
@@ -222,8 +222,6 @@ public function addRow()
      *
      * Ensures a standard associative array format for all cell data
      *
-     * @param array $args
-     *
      * @return array
      */
     protected function _prepArgs(array $args)
diff --git a/system/View/View.php b/system/View/View.php
index d90fe8dd9234..966dcf0feacb 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -137,11 +137,7 @@ class View implements RendererInterface
     /**
      * Constructor
      *
-     * @param ViewConfig       $config
-     * @param string|null      $viewPath
-     * @param FileLocator|null $loader
-     * @param bool|null        $debug
-     * @param LoggerInterface  $logger
+     * @param LoggerInterface $logger
      */
     public function __construct(ViewConfig $config, ?string $viewPath = null, ?FileLocator $loader = null, ?bool $debug = null, ?LoggerInterface $logger = null)
     {
@@ -168,8 +164,6 @@ public function __construct(ViewConfig $config, ?string $viewPath = null, ?FileL
      * @param bool|null  $saveData If true, saves data for subsequent calls,
      *                             if false, cleans the data after displaying,
      *                             if null, uses the config setting.
-     *
-     * @return string
      */
     public function render(string $view, ?array $options = null, ?bool $saveData = null): string
     {
@@ -283,8 +277,6 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
      * @param bool|null  $saveData If true, saves data for subsequent calls,
      *                             if false, cleans the data after displaying,
      *                             if null, uses the config setting.
-     *
-     * @return string
      */
     public function renderString(string $view, ?array $options = null, ?bool $saveData = null): string
     {
@@ -312,11 +304,6 @@ public function renderString(string $view, ?array $options = null, ?bool $saveDa
 
     /**
      * Extract first bit of a long string and add ellipsis
-     *
-     * @param string $string
-     * @param int    $length
-     *
-     * @return string
      */
     public function excerpt(string $string, int $length = 20): string
     {
@@ -326,11 +313,8 @@ public function excerpt(string $string, int $length = 20): string
     /**
      * Sets several pieces of view data at once.
      *
-     * @param array  $data
      * @param string $context The context to escape it for: html, css, js, url
      *                        If null, no escaping will happen
-     *
-     * @return RendererInterface
      */
     public function setData(array $data = [], ?string $context = null): RendererInterface
     {
@@ -347,12 +331,9 @@ public function setData(array $data = [], ?string $context = null): RendererInte
     /**
      * Sets a single piece of view data.
      *
-     * @param string $name
      * @param mixed  $value
      * @param string $context The context to escape it for: html, css, js, url
      *                        If null, no escaping will happen
-     *
-     * @return RendererInterface
      */
     public function setVar(string $name, $value = null, ?string $context = null): RendererInterface
     {
@@ -368,8 +349,6 @@ public function setVar(string $name, $value = null, ?string $context = null): Re
 
     /**
      * Removes all of the view data from the system.
-     *
-     * @return RendererInterface
      */
     public function resetData(): RendererInterface
     {
@@ -380,8 +359,6 @@ public function resetData(): RendererInterface
 
     /**
      * Returns the current data that will be displayed in the view.
-     *
-     * @return array
      */
     public function getData(): array
     {
@@ -391,8 +368,6 @@ public function getData(): array
     /**
      * Specifies that the current view should extend an existing layout.
      *
-     * @param string $layout
-     *
      * @return void
      */
     public function extend(string $layout)
@@ -443,8 +418,6 @@ public function endSection()
 
     /**
      * Renders a section's contents.
-     *
-     * @param string $sectionName
      */
     public function renderSection(string $sectionName)
     {
@@ -463,11 +436,7 @@ public function renderSection(string $sectionName)
     /**
      * Used within layout views to include additional views.
      *
-     * @param string     $view
-     * @param array|null $options
-     * @param bool       $saveData
-     *
-     * @return string
+     * @param bool $saveData
      */
     public function include(string $view, ?array $options = null, $saveData = true): string
     {
@@ -477,8 +446,6 @@ public function include(string $view, ?array $options = null, $saveData = true):
     /**
      * Returns the performance data that might have been collected
      * during the execution. Used primarily in the Debug Toolbar.
-     *
-     * @return array
      */
     public function getPerformanceData(): array
     {
@@ -488,10 +455,6 @@ public function getPerformanceData(): array
     /**
      * Logs performance data for rendering a view.
      *
-     * @param float  $start
-     * @param float  $end
-     * @param string $view
-     *
      * @return void
      */
     protected function logPerformance(float $start, float $end, string $view)
diff --git a/tests/_support/Autoloader/FatalLocator.php b/tests/_support/Autoloader/FatalLocator.php
index ba5cadca48bd..9c30fb9c89b6 100644
--- a/tests/_support/Autoloader/FatalLocator.php
+++ b/tests/_support/Autoloader/FatalLocator.php
@@ -51,12 +51,6 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
      *      'app/Modules/foo/Config/Routes.php',
      *      'app/Modules/bar/Config/Routes.php',
      *  ]
-     *
-     * @param string $path
-     * @param string $ext
-     * @param bool   $prioritizeApp
-     *
-     * @return array
      */
     public function search(string $path, string $ext = 'php', bool $prioritizeApp = true): array
     {
diff --git a/tests/_support/Commands/Unsuffixable.php b/tests/_support/Commands/Unsuffixable.php
index 65a48e0efb16..36a752e25891 100644
--- a/tests/_support/Commands/Unsuffixable.php
+++ b/tests/_support/Commands/Unsuffixable.php
@@ -64,8 +64,6 @@ class Unsuffixable extends BaseCommand
 
     /**
      * Actually execute a command.
-     *
-     * @param array $params
      */
     public function run(array $params)
     {
diff --git a/tests/_support/Config/Services.php b/tests/_support/Config/Services.php
index bdff42cf54c0..4a942a053433 100644
--- a/tests/_support/Config/Services.php
+++ b/tests/_support/Config/Services.php
@@ -27,7 +27,6 @@ class Services extends BaseServices
      * The URI class provides a way to model and manipulate URIs.
      *
      * @param string $uri
-     * @param bool   $getShared
      *
      * @return URI
      */
diff --git a/tests/_support/Log/Handlers/TestHandler.php b/tests/_support/Log/Handlers/TestHandler.php
index f34d2855ee4b..50fd95054b7e 100644
--- a/tests/_support/Log/Handlers/TestHandler.php
+++ b/tests/_support/Log/Handlers/TestHandler.php
@@ -46,8 +46,6 @@ public function __construct(array $config)
      *
      * @param $level
      * @param $message
-     *
-     * @return bool
      */
     public function handle($level, $message): bool
     {
diff --git a/tests/_support/Services.php b/tests/_support/Services.php
index 7d554fc4e6e2..e6a8e53e6858 100644
--- a/tests/_support/Services.php
+++ b/tests/_support/Services.php
@@ -39,7 +39,6 @@ public static function reset()
     /**
      * Inject mock object for testing.
      *
-     * @param string $name
      * @param $mock
      */
     public static function injectMock(string $name, $mock)
@@ -50,9 +49,6 @@ public static function injectMock(string $name, $mock)
 
     /**
      * Returns a service
-     *
-     * @param string $name
-     * @param array  $arguments
      */
     public static function __callStatic(string $name, array $arguments)
     {
diff --git a/tests/system/Cache/Handlers/BaseHandlerTest.php b/tests/system/Cache/Handlers/BaseHandlerTest.php
index d7a0471e60c3..5965666a5810 100644
--- a/tests/system/Cache/Handlers/BaseHandlerTest.php
+++ b/tests/system/Cache/Handlers/BaseHandlerTest.php
@@ -22,6 +22,8 @@ final class BaseHandlerTest extends CIUnitTestCase
 {
     /**
      * @dataProvider invalidTypeProvider
+     *
+     * @param mixed $input
      */
     public function testValidateKeyInvalidType($input)
     {
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index ba3b9df464f8..de912e4b5e84 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -270,6 +270,9 @@ public function testIsSupported()
 
     /**
      * @dataProvider modeProvider
+     *
+     * @param mixed $int
+     * @param mixed $string
      */
     public function testSaveMode($int, $string)
     {
diff --git a/tests/system/Commands/GenerateKeyTest.php b/tests/system/Commands/GenerateKeyTest.php
index fec7c07d8c9d..2691bca89180 100644
--- a/tests/system/Commands/GenerateKeyTest.php
+++ b/tests/system/Commands/GenerateKeyTest.php
@@ -58,8 +58,6 @@ protected function tearDown(): void
 
     /**
      * Gets buffer contents then releases it.
-     *
-     * @return string
      */
     protected function getBuffer(): string
     {
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index c666c9c51335..1ce1e7ab61a2 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -439,6 +439,9 @@ public function testForceHttpsNullRequestAndResponse()
 
     /**
      * @dataProvider dirtyPathsProvider
+     *
+     * @param mixed $input
+     * @param mixed $expected
      */
     public function testCleanPathActuallyCleaningThePaths($input, $expected)
     {
diff --git a/tests/system/CommonSingleServiceTest.php b/tests/system/CommonSingleServiceTest.php
index a25896d24661..1dca6f823ab8 100644
--- a/tests/system/CommonSingleServiceTest.php
+++ b/tests/system/CommonSingleServiceTest.php
@@ -23,10 +23,6 @@ final class CommonSingleServiceTest extends CIUnitTestCase
 {
     /**
      * @dataProvider serviceNamesProvider
-     *
-     * @param string $service
-     *
-     * @return void
      */
     public function testSingleServiceWithNoParamsSupplied(string $service): void
     {
@@ -39,10 +35,6 @@ public function testSingleServiceWithNoParamsSupplied(string $service): void
 
     /**
      * @dataProvider serviceNamesProvider
-     *
-     * @param string $service
-     *
-     * @return void
      */
     public function testSingleServiceWithAtLeastOneParamSupplied(string $service): void
     {
diff --git a/tests/system/Config/MimesTest.php b/tests/system/Config/MimesTest.php
index d0161b4a859e..cbd389882fcf 100644
--- a/tests/system/Config/MimesTest.php
+++ b/tests/system/Config/MimesTest.php
@@ -50,6 +50,7 @@ public function extensionsList()
      *
      * @param $expected
      * @param $ext
+     * @param mixed $mime
      */
     public function testGuessExtensionFromType($expected, $mime)
     {
@@ -84,6 +85,9 @@ public function mimesList()
 
     /**
      * @dataProvider mimesList
+     *
+     * @param mixed $expected
+     * @param mixed $ext
      */
     public function testGuessTypeFromExtension($expected, $ext)
     {
diff --git a/tests/system/Cookie/CookieTest.php b/tests/system/Cookie/CookieTest.php
index 53d4343e43ec..781373755529 100644
--- a/tests/system/Cookie/CookieTest.php
+++ b/tests/system/Cookie/CookieTest.php
@@ -141,8 +141,6 @@ public function testExpirationTime(): void
      * @dataProvider invalidExpiresProvider
      *
      * @param mixed $expires
-     *
-     * @return void
      */
     public function testInvalidExpires($expires): void
     {
@@ -165,11 +163,6 @@ public static function invalidExpiresProvider(): iterable
 
     /**
      * @dataProvider setCookieHeaderProvider
-     *
-     * @param string $header
-     * @param array  $changed
-     *
-     * @return void
      */
     public function testSetCookieHeaderCreation(string $header, array $changed): void
     {
diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php
index 8805ff5a6fc8..f53beadcd8e9 100644
--- a/tests/system/Database/BaseQueryTest.php
+++ b/tests/system/Database/BaseQueryTest.php
@@ -182,6 +182,9 @@ public function queryTypes()
 
     /**
      * @dataProvider queryTypes
+     *
+     * @param mixed $expected
+     * @param mixed $sql
      */
     public function testIsWriteType($expected, $sql)
     {
diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php
index dea884273f9c..653c837058aa 100644
--- a/tests/system/Database/Builder/WhereTest.php
+++ b/tests/system/Database/Builder/WhereTest.php
@@ -225,6 +225,8 @@ public function provideInvalidKeys()
 
     /**
      * @dataProvider provideInvalidKeys
+     *
+     * @param mixed $key
      */
     public function testWhereInvalidKeyThrowInvalidArgumentException($key)
     {
@@ -245,6 +247,8 @@ public function provideInvalidValues()
 
     /**
      * @dataProvider provideInvalidValues
+     *
+     * @param mixed $values
      */
     public function testWhereInEmptyValuesThrowInvalidArgumentException($values)
     {
diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php
index e6fcdd18f158..115ae335c5e1 100644
--- a/tests/system/Debug/ExceptionsTest.php
+++ b/tests/system/Debug/ExceptionsTest.php
@@ -27,6 +27,9 @@ public function testNew()
 
     /**
      * @dataProvider dirtyPathsProvider
+     *
+     * @param mixed $file
+     * @param mixed $expected
      */
     public function testCleanPaths($file, $expected)
     {
diff --git a/tests/system/Email/EmailTest.php b/tests/system/Email/EmailTest.php
index b933412de71f..e4fc3ec26780 100644
--- a/tests/system/Email/EmailTest.php
+++ b/tests/system/Email/EmailTest.php
@@ -39,6 +39,8 @@ public function autoClearProvider()
 
     /**
      * @dataProvider autoClearProvider
+     *
+     * @param mixed $autoClear
      */
     public function testEmailSendWithClearance($autoClear)
     {
diff --git a/tests/system/Format/XMLFormatterTest.php b/tests/system/Format/XMLFormatterTest.php
index c42660648ea8..5e0d7fda9340 100644
--- a/tests/system/Format/XMLFormatterTest.php
+++ b/tests/system/Format/XMLFormatterTest.php
@@ -100,9 +100,6 @@ public function testValidatingXmlTags()
     }
 
     /**
-     * @param string $expected
-     * @param array  $input
-     *
      * @dataProvider invalidTagsProvider
      */
     public function testValidatingInvalidTags(string $expected, array $input)
diff --git a/tests/system/HTTP/CLIRequestTest.php b/tests/system/HTTP/CLIRequestTest.php
index 904b40353c40..7940624e68bb 100644
--- a/tests/system/HTTP/CLIRequestTest.php
+++ b/tests/system/HTTP/CLIRequestTest.php
@@ -514,6 +514,10 @@ public function ipAddressChecks()
 
     /**
      * @dataProvider ipAddressChecks
+     *
+     * @param mixed      $expected
+     * @param mixed      $address
+     * @param mixed|null $type
      */
     public function testValidIPAddress($expected, $address, $type = null)
     {
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 0975b873bde5..a64445232aba 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -576,6 +576,9 @@ public function providePathChecks()
 
     /**
      * @dataProvider providePathChecks
+     *
+     * @param mixed $path
+     * @param mixed $detectPath
      */
     public function testExtensionPHP($path, $detectPath)
     {
diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php
index 73b6c6162214..38361fdb1ce4 100644
--- a/tests/system/HTTP/MessageTest.php
+++ b/tests/system/HTTP/MessageTest.php
@@ -213,6 +213,8 @@ public function provideArrayHeaderValue()
 
     /**
      * @dataProvider provideArrayHeaderValue
+     *
+     * @param mixed $arrayHeaderValue
      */
     public function testSetHeaderWithExistingArrayValuesAppendStringValue($arrayHeaderValue)
     {
@@ -224,6 +226,8 @@ public function testSetHeaderWithExistingArrayValuesAppendStringValue($arrayHead
 
     /**
      * @dataProvider provideArrayHeaderValue
+     *
+     * @param mixed $arrayHeaderValue
      */
     public function testSetHeaderWithExistingArrayValuesAppendArrayValue($arrayHeaderValue)
     {
diff --git a/tests/system/HTTP/RequestTest.php b/tests/system/HTTP/RequestTest.php
index 7a6920c55eae..d75cd0ed8665 100644
--- a/tests/system/HTTP/RequestTest.php
+++ b/tests/system/HTTP/RequestTest.php
@@ -581,6 +581,10 @@ public function ipAddressChecks()
 
     /**
      * @dataProvider ipAddressChecks
+     *
+     * @param mixed      $expected
+     * @param mixed      $address
+     * @param mixed|null $type
      */
     public function testValidIPAddress($expected, $address, $type = null)
     {
diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php
index ebcbae35e0f9..89cb106ed607 100644
--- a/tests/system/HTTP/URITest.php
+++ b/tests/system/HTTP/URITest.php
@@ -338,6 +338,9 @@ public function invalidPaths()
 
     /**
      * @dataProvider invalidPaths
+     *
+     * @param mixed $path
+     * @param mixed $expected
      */
     public function testPathGetsFiltered($path, $expected)
     {
@@ -449,6 +452,9 @@ public function authorityInfo()
 
     /**
      * @dataProvider authorityInfo
+     *
+     * @param mixed $url
+     * @param mixed $expected
      */
     public function testAuthorityReturnsExceptedValues($url, $expected)
     {
@@ -472,6 +478,9 @@ public function defaultPorts()
 
     /**
      * @dataProvider defaultPorts
+     *
+     * @param mixed $scheme
+     * @param mixed $port
      */
     public function testAuthorityRemovesDefaultPorts($scheme, $port)
     {
@@ -593,6 +602,9 @@ public function defaultDots()
 
     /**
      * @dataProvider defaultDots
+     *
+     * @param mixed $path
+     * @param mixed $expected
      */
     public function testRemoveDotSegments($path, $expected)
     {
@@ -631,6 +643,9 @@ public function defaultResolutions()
 
     /**
      * @dataProvider defaultResolutions
+     *
+     * @param mixed $rel
+     * @param mixed $expected
      */
     public function testResolveRelativeURI($rel, $expected)
     {
@@ -646,6 +661,9 @@ public function testResolveRelativeURI($rel, $expected)
     /**
      * @dataProvider defaultResolutions
      * @group        single
+     *
+     * @param mixed $rel
+     * @param mixed $expected
      */
     public function testResolveRelativeURIHTTPS($rel, $expected)
     {
diff --git a/tests/system/Helpers/ArrayHelperTest.php b/tests/system/Helpers/ArrayHelperTest.php
index 2afe59a1369e..f6ae751e1bda 100644
--- a/tests/system/Helpers/ArrayHelperTest.php
+++ b/tests/system/Helpers/ArrayHelperTest.php
@@ -176,6 +176,9 @@ public function testArrayDotIgnoresLastWildcard()
 
     /**
      * @dataProvider deepSearchProvider
+     *
+     * @param mixed $key
+     * @param mixed $expected
      */
     public function testArrayDeepSearch($key, $expected)
     {
@@ -212,6 +215,10 @@ public function testArrayDeepSearchReturnNullEmptyArray()
 
     /**
      * @dataProvider sortByMultipleKeysProvider
+     *
+     * @param mixed $data
+     * @param mixed $sortColumns
+     * @param mixed $expected
      */
     public function testArraySortByMultipleKeysWithArray($data, $sortColumns, $expected)
     {
@@ -223,6 +230,10 @@ public function testArraySortByMultipleKeysWithArray($data, $sortColumns, $expec
 
     /**
      * @dataProvider sortByMultipleKeysProvider
+     *
+     * @param mixed $data
+     * @param mixed $sortColumns
+     * @param mixed $expected
      */
     public function testArraySortByMultipleKeysWithObjects($data, $sortColumns, $expected)
     {
@@ -239,6 +250,10 @@ public function testArraySortByMultipleKeysWithObjects($data, $sortColumns, $exp
 
     /**
      * @dataProvider sortByMultipleKeysProvider
+     *
+     * @param mixed $data
+     * @param mixed $sortColumns
+     * @param mixed $expected
      */
     public function testArraySortByMultipleKeysFailsEmptyParameter($data, $sortColumns, $expected)
     {
@@ -261,6 +276,8 @@ public function testArraySortByMultipleKeysFailsEmptyParameter($data, $sortColum
 
     /**
      * @dataProvider sortByMultipleKeysProvider
+     *
+     * @param mixed $data
      */
     public function testArraySortByMultipleKeysFailsInconsistentArraySizes($data)
     {
@@ -365,8 +382,6 @@ public static function sortByMultipleKeysProvider()
      *
      * @param iterable $input
      * @param iterable $expected
-     *
-     * @return void
      */
     public function testArrayFlattening($input, $expected): void
     {
diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php
index b761b5af8fce..bb74696181a4 100644
--- a/tests/system/Helpers/URLHelper/MiscUrlTest.php
+++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php
@@ -161,6 +161,11 @@ public function anchorNormalPatterns()
 
     /**
      * @dataProvider anchorNormalPatterns
+     *
+     * @param mixed $expected
+     * @param mixed $uri
+     * @param mixed $title
+     * @param mixed $attributes
      */
     public function testAnchor($expected = '', $uri = '', $title = '', $attributes = '')
     {
@@ -222,6 +227,11 @@ public function anchorNoindexPatterns()
 
     /**
      * @dataProvider anchorNoindexPatterns
+     *
+     * @param mixed $expected
+     * @param mixed $uri
+     * @param mixed $title
+     * @param mixed $attributes
      */
     public function testAnchorNoindex($expected = '', $uri = '', $title = '', $attributes = '')
     {
@@ -274,6 +284,11 @@ public function anchorSubpagePatterns()
 
     /**
      * @dataProvider anchorSubpagePatterns
+     *
+     * @param mixed $expected
+     * @param mixed $uri
+     * @param mixed $title
+     * @param mixed $attributes
      */
     public function testAnchorTargetted($expected = '', $uri = '', $title = '', $attributes = '')
     {
@@ -315,6 +330,11 @@ public function anchorExamplePatterns()
 
     /**
      * @dataProvider anchorExamplePatterns
+     *
+     * @param mixed $expected
+     * @param mixed $uri
+     * @param mixed $title
+     * @param mixed $attributes
      */
     public function testAnchorExamples($expected = '', $uri = '', $title = '', $attributes = '')
     {
@@ -369,6 +389,11 @@ public function anchorPopupPatterns()
 
     /**
      * @dataProvider anchorPopupPatterns
+     *
+     * @param mixed $expected
+     * @param mixed $uri
+     * @param mixed $title
+     * @param mixed $attributes
      */
     public function testAnchorPopup($expected = '', $uri = '', $title = '', $attributes = false)
     {
@@ -404,6 +429,11 @@ public function mailtoPatterns()
 
     /**
      * @dataProvider mailtoPatterns
+     *
+     * @param mixed $expected
+     * @param mixed $email
+     * @param mixed $title
+     * @param mixed $attributes
      */
     public function testMailto($expected = '', $email = '', $title = '', $attributes = '')
     {
@@ -440,6 +470,11 @@ public function safeMailtoPatterns()
 
     /**
      * @dataProvider safeMailtoPatterns
+     *
+     * @param mixed $expected
+     * @param mixed $email
+     * @param mixed $title
+     * @param mixed $attributes
      */
     public function testSafeMailto($expected = '', $email = '', $title = '', $attributes = '')
     {
@@ -493,6 +528,9 @@ public function autolinkUrls()
 
     /**
      * @dataProvider autolinkUrls
+     *
+     * @param mixed $in
+     * @param mixed $out
      */
     public function testAutoLinkUrl($in, $out)
     {
@@ -539,6 +577,9 @@ public function autolinkEmails()
 
     /**
      * @dataProvider autolinkEmails
+     *
+     * @param mixed $in
+     * @param mixed $out
      */
     public function testAutoLinkEmail($in, $out)
     {
@@ -585,6 +626,9 @@ public function autolinkBoth()
 
     /**
      * @dataProvider autolinkBoth
+     *
+     * @param mixed $in
+     * @param mixed $out
      */
     public function testAutolinkBoth($in, $out)
     {
@@ -631,6 +675,9 @@ public function autolinkPopup()
 
     /**
      * @dataProvider autolinkPopup
+     *
+     * @param mixed $in
+     * @param mixed $out
      */
     public function testAutoLinkPopup($in, $out)
     {
diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php
index 072c5a2eb1c1..0dd8b3d69adc 100644
--- a/tests/system/Language/LanguageTest.php
+++ b/tests/system/Language/LanguageTest.php
@@ -244,6 +244,8 @@ public function MessageBundles()
      * but we can at least try loading them ... more accurate code coverage?
      *
      * @dataProvider MessageBundles
+     *
+     * @param mixed $bundle
      */
     public function testBundleUniqueKeys($bundle)
     {
diff --git a/tests/system/Log/Handlers/ErrorlogHandlerTest.php b/tests/system/Log/Handlers/ErrorlogHandlerTest.php
index f30d67ccdaa4..d564fab7e660 100644
--- a/tests/system/Log/Handlers/ErrorlogHandlerTest.php
+++ b/tests/system/Log/Handlers/ErrorlogHandlerTest.php
@@ -35,8 +35,6 @@ public function testErrorLoggingWithErrorLog(): void
     }
 
     /**
-     * @param array $config
-     *
      * @return MockObject&ErrorlogHandler
      */
     private function getMockedHandler(array $config = [])
diff --git a/tests/system/Models/DeleteModelTest.php b/tests/system/Models/DeleteModelTest.php
index 9b04f2c13a46..ecd09b2ed76c 100644
--- a/tests/system/Models/DeleteModelTest.php
+++ b/tests/system/Models/DeleteModelTest.php
@@ -134,6 +134,8 @@ public function testOnlyDeleted(): void
      * Exception should not be thrown because condition was explicity set
      *
      * @dataProvider emptyPkValues
+     *
+     * @param mixed $emptyValue
      */
     public function testDontThrowExceptionWhenSoftDeleteConditionIsSetWithEmptyValue($emptyValue): void
     {
@@ -146,6 +148,8 @@ public function testDontThrowExceptionWhenSoftDeleteConditionIsSetWithEmptyValue
 
     /**
      * @dataProvider emptyPkValues
+     *
+     * @param mixed $emptyValue
      */
     public function testThrowExceptionWhenSoftDeleteParamIsEmptyValue($emptyValue): void
     {
@@ -158,6 +162,8 @@ public function testThrowExceptionWhenSoftDeleteParamIsEmptyValue($emptyValue):
 
     /**
      * @dataProvider emptyPkValues
+     *
+     * @param mixed $emptyValue
      */
     public function testDontDeleteRowsWhenSoftDeleteParamIsEmpty($emptyValue): void
     {
diff --git a/tests/system/Models/FindModelTest.php b/tests/system/Models/FindModelTest.php
index 928117a213ad..bf06422d8f5f 100644
--- a/tests/system/Models/FindModelTest.php
+++ b/tests/system/Models/FindModelTest.php
@@ -156,6 +156,9 @@ public function testFirst(): void
 
     /**
      * @dataProvider provideGroupBy
+     *
+     * @param mixed $groupBy
+     * @param mixed $total
      */
     public function testFirstAggregate($groupBy, $total): void
     {
@@ -179,6 +182,9 @@ public static function provideGroupBy(): iterable
 
     /**
      * @dataProvider provideAggregateAndGroupBy
+     *
+     * @param mixed $aggregate
+     * @param mixed $groupBy
      */
     public function testFirstRespectsSoftDeletes($aggregate, $groupBy): void
     {
@@ -212,6 +218,9 @@ public function testFirstRespectsSoftDeletes($aggregate, $groupBy): void
 
     /**
      * @dataProvider provideAggregateAndGroupBy
+     *
+     * @param mixed $aggregate
+     * @param mixed $groupBy
      */
     public function testFirstRecoverTempUseSoftDeletes($aggregate, $groupBy): void
     {
diff --git a/tests/system/Models/GeneralModelTest.php b/tests/system/Models/GeneralModelTest.php
index 93a3cfc4300d..a896764290b2 100644
--- a/tests/system/Models/GeneralModelTest.php
+++ b/tests/system/Models/GeneralModelTest.php
@@ -46,11 +46,6 @@ protected function tearDown(): void
 
     /**
      * Create an instance of Model for use in testing.
-     *
-     * @param string              $modelName
-     * @param BaseConnection|null $db
-     *
-     * @return Model
      */
     private function createModel(string $modelName, ?BaseConnection $db = null): Model
     {
@@ -160,8 +155,6 @@ public function testInitialize(): void
 
             /**
              * Marks the model as initialized.
-             *
-             * @return void
              */
             protected function initialize(): void
             {
diff --git a/tests/system/Models/LiveModelTestCase.php b/tests/system/Models/LiveModelTestCase.php
index 34e0c334418b..d8052967f290 100644
--- a/tests/system/Models/LiveModelTestCase.php
+++ b/tests/system/Models/LiveModelTestCase.php
@@ -49,11 +49,6 @@ protected function tearDown(): void
 
     /**
      * Create an instance of Model for use in testing.
-     *
-     * @param string              $modelName
-     * @param BaseConnection|null $db
-     *
-     * @return Model
      */
     protected function createModel(string $modelName, ?BaseConnection $db = null): Model
     {
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index 609a6a5106df..8220f1857485 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -1577,6 +1577,8 @@ public function provideRouteDefaultNamespace()
 
     /**
      * @dataProvider provideRouteDefaultNamespace
+     *
+     * @param mixed $namespace
      */
     public function testAutoRoutesControllerNameReturnsFQCN($namespace)
     {
@@ -1592,6 +1594,8 @@ public function testAutoRoutesControllerNameReturnsFQCN($namespace)
 
     /**
      * @dataProvider provideRouteDefaultNamespace
+     *
+     * @param mixed $namespace
      */
     public function testRoutesControllerNameReturnsFQCN($namespace)
     {
diff --git a/tests/system/Test/DOMParserTest.php b/tests/system/Test/DOMParserTest.php
index 1e6d07c6c4e0..7eeee05e4385 100644
--- a/tests/system/Test/DOMParserTest.php
+++ b/tests/system/Test/DOMParserTest.php
@@ -89,6 +89,8 @@ public function provideText()
 
     /**
      * @dataProvider provideText
+     *
+     * @param mixed $text
      */
     public function testSeeText($text)
     {
@@ -135,6 +137,8 @@ public function testSeeFail()
 
     /**
      * @dataProvider provideText
+     *
+     * @param mixed $text
      */
     public function testSeeElement($text)
     {
diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php
index 74e7bcef24a2..70952b89b96d 100644
--- a/tests/system/Test/FeatureTestTraitTest.php
+++ b/tests/system/Test/FeatureTestTraitTest.php
@@ -293,6 +293,10 @@ public function provideRoutesData()
 
     /**
      * @dataProvider provideRoutesData
+     *
+     * @param mixed $from
+     * @param mixed $to
+     * @param mixed $httpGet
      */
     public function testOpenCliRoutesFromHttpGot404($from, $to, $httpGet)
     {
diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php
index a225b8291c61..61b3076bc34b 100644
--- a/tests/system/Validation/CreditCardRulesTest.php
+++ b/tests/system/Validation/CreditCardRulesTest.php
@@ -1220,9 +1220,6 @@ public function creditCardProvider()
      * Used to generate fake credit card numbers that will still pass the Luhn
      * check used to validate the card so we can be sure the cards are recognized correctly.
      *
-     * @param int $prefix
-     * @param int $length
-     *
      * @return string
      */
     protected function generateCardNum(int $prefix, int $length)
diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php
index 89a078171ee0..725824607748 100644
--- a/tests/system/Validation/FormatRulesTest.php
+++ b/tests/system/Validation/FormatRulesTest.php
@@ -895,6 +895,7 @@ public function decimalProvider()
      *
      * @param $str
      * @param $expected
+     * @param mixed $first
      */
     public function testNatural($first, $expected)
     {
@@ -940,6 +941,7 @@ public function naturalProvider()
      *
      * @param $str
      * @param $expected
+     * @param mixed $first
      */
     public function testNaturalNoZero($first, $expected)
     {
@@ -985,6 +987,7 @@ public function naturalZeroProvider()
      *
      * @param $str
      * @param $expected
+     * @param mixed $first
      */
     public function testBase64($first, $expected)
     {
@@ -1022,6 +1025,7 @@ public function base64Provider()
      *
      * @param $str
      * @param $expected
+     * @param mixed $first
      */
     public function testJson($first, $expected)
     {
diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
index 6ab0d9c8e465..f4f171b87bbb 100644
--- a/tests/system/Validation/RulesTest.php
+++ b/tests/system/Validation/RulesTest.php
@@ -1053,6 +1053,8 @@ public function testExactLengthReturnsFalseWhenLong()
      *
      * @param $str
      * @param $expected
+     * @param mixed $first
+     * @param mixed $second
      */
     public function testGreaterThan($first, $second, $expected)
     {
@@ -1108,6 +1110,8 @@ public function greaterThanProvider()
      *
      * @param $str
      * @param $expected
+     * @param mixed $first
+     * @param mixed $second
      */
     public function testGreaterThanEqual($first, $second, $expected)
     {
@@ -1168,6 +1172,8 @@ public function greaterThanEqualProvider()
      *
      * @param $str
      * @param $expected
+     * @param mixed $first
+     * @param mixed $second
      */
     public function testLessThan($first, $second, $expected)
     {
@@ -1228,6 +1234,8 @@ public function lessThanProvider()
      *
      * @param $str
      * @param $expected
+     * @param mixed $first
+     * @param mixed $second
      */
     public function testLessEqualThan($first, $second, $expected)
     {
@@ -1386,6 +1394,7 @@ public function inListProvider()
      *
      * @param $check
      * @param $expected
+     * @param mixed $field
      */
     public function testRequiredWith($field, $check, $expected = false)
     {
@@ -1469,6 +1478,7 @@ public function requiredWithProvider()
      *
      * @param $check
      * @param $expected
+     * @param mixed $field
      */
     public function testRequiredWithout($field, $check, $expected = false)
     {
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index 583ff28ee221..836b892a2931 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -294,6 +294,10 @@ public function testRunGroupWithCustomErrorMessage()
 
     /**
      * @dataProvider rulesSetupProvider
+     *
+     * @param mixed $rules
+     * @param mixed $expected
+     * @param mixed $errors
      */
     public function testRulesSetup($rules, $expected, $errors = [])
     {
@@ -626,6 +630,10 @@ public function testTagReplacement()
 
     /**
      * @dataProvider arrayFieldDataProvider
+     *
+     * @param mixed $body
+     * @param mixed $rules
+     * @param mixed $results
      */
     public function testRulesForArrayField($body, $rules, $results)
     {
@@ -865,12 +873,6 @@ public function testTranslatedLabelTagReplacement()
      * @dataProvider dotNotationForIfExistProvider
      *
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/4521
-     *
-     * @param bool  $expected
-     * @param array $rules
-     * @param array $data
-     *
-     * @return void
      */
     public function testDotNotationOnIfExistRule(bool $expected, array $rules, array $data): void
     {
@@ -937,12 +939,6 @@ public function dotNotationForIfExistProvider()
      * @dataProvider validationArrayDataCaseProvider
      *
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/4510
-     *
-     * @param bool  $expected
-     * @param array $rules
-     * @param array $data
-     *
-     * @return void
      */
     public function testValidationOfArrayData(bool $expected, array $rules, array $data): void
     {
diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php
index dc45de761c76..98c6c56ed9b4 100644
--- a/tests/system/View/ParserTest.php
+++ b/tests/system/View/ParserTest.php
@@ -402,6 +402,9 @@ public function escValueTypes()
 
     /**
      * @dataProvider escValueTypes
+     *
+     * @param mixed      $value
+     * @param mixed|null $expected
      */
     public function testEscHandling($value, $expected = null)
     {
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 46ccb75356fb..4a5643ec923d 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -226,13 +226,17 @@ public function __construct()
             'no_spaces_around_offset'                     => ['positions' => ['inside', 'outside']],
             'no_spaces_inside_parenthesis'                => true,
             'no_superfluous_elseif'                       => true,
-            'no_superfluous_phpdoc_tags'                  => false,
-            'no_trailing_comma_in_list_call'              => true,
-            'no_trailing_comma_in_singleline_array'       => true,
-            'no_trailing_whitespace'                      => true,
-            'no_trailing_whitespace_in_comment'           => true,
-            'no_trailing_whitespace_in_string'            => true,
-            'no_unneeded_control_parentheses'             => [
+            'no_superfluous_phpdoc_tags'                  => [
+                'allow_mixed'         => true,
+                'allow_unused_params' => true,
+                'remove_inheritdoc'   => false,
+            ],
+            'no_trailing_comma_in_list_call'        => true,
+            'no_trailing_comma_in_singleline_array' => true,
+            'no_trailing_whitespace'                => true,
+            'no_trailing_whitespace_in_comment'     => true,
+            'no_trailing_whitespace_in_string'      => true,
+            'no_unneeded_control_parentheses'       => [
                 'statements' => [
                     'break',
                     'clone',
@@ -305,6 +309,7 @@ public function __construct()
                 'methods'   => [],
             ],
             'php_unit_test_class_requires_covers' => false,
+            'phpdoc_add_missing_param_annotation' => ['only_untyped' => true],
             'phpdoc_align'                        => [
                 'align' => 'vertical',
                 'tags'  => [

From 2a0980801b2c1886a7aaad9dcf38d175628e0c44 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Sat, 24 Jul 2021 20:20:13 +0800
Subject: [PATCH 0100/2325] Update to phpdoc v3.1 (#4961)

---
 .github/workflows/deploy-apidocs.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/deploy-apidocs.yml b/.github/workflows/deploy-apidocs.yml
index fd40e7aa13c1..0454e5c9f769 100644
--- a/.github/workflows/deploy-apidocs.yml
+++ b/.github/workflows/deploy-apidocs.yml
@@ -16,6 +16,7 @@ jobs:
     name: Deploy to api
     if: github.repository == 'codeigniter4/CodeIgniter4'
     runs-on: ubuntu-20.04
+
     steps:
       - name: Setup credentials
         run: |
@@ -37,19 +38,18 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          # phpDocumentor v3.0 does not have support yet for PHP 8.0
-          php-version: '7.4'
-          extensions: intl
+          php-version: '8.0'
+          coverage: none
 
       - name: Install GraphViz for phpDocumentor
         run: |
           sudo apt-get install -yq graphviz
 
-      - name: Download phpDocumentor v3.0
+      - name: Download phpDocumentor v3.1
         run: |
           cd ./source
           curl \
-            -L https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.0.0/phpDocumentor.phar \
+            -L https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.1.0/phpDocumentor.phar \
             -o admin/phpDocumentor.phar
 
       - name: Prepare API repo
@@ -69,5 +69,7 @@ jobs:
         working-directory: api
         run: |
           git add .
-          git commit -m "Updated API for commit ${GITHUB_SHA}"
-          git push origin master
+          if ! git diff-index --quiet HEAD; then
+            git commit -m "Updated API for commit ${GITHUB_SHA}"
+            git push origin master
+          fi

From 1652b3b394983503ae49d84b559c40df3c6cb445 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sat, 24 Jul 2021 16:13:19 +0700
Subject: [PATCH 0101/2325] [Rector] Apply FuncGetArgsToVariadicParamRector

---
 rector.php                       | 2 ++
 system/Helpers/text_helper.php   | 4 +---
 system/Test/ReflectionHelper.php | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/rector.php b/rector.php
index 3af242c492e6..01af6d75a89d 100644
--- a/rector.php
+++ b/rector.php
@@ -23,6 +23,7 @@
 use Rector\CodeQuality\Rector\Return_\SimplifyUselessVariableRector;
 use Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector;
 use Rector\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector;
+use Rector\CodingStyle\Rector\ClassMethod\FuncGetArgsToVariadicParamRector;
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
 use Rector\Core\Configuration\Option;
 use Rector\Core\ValueObject\PhpVersion;
@@ -109,4 +110,5 @@
     $services->set(SimplifyRegexPatternRector::class);
     $services->set(RemoveExtraParametersRector::class);
     $services->set(RemoveUnusedVariableAssignRector::class);
+    $services->set(FuncGetArgsToVariadicParamRector::class);
 };
diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index 2c2171a9a8d4..5ed6d21190ba 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -609,7 +609,7 @@ function increment_string(string $str, string $separator = '_', int $first = 1):
      *
      * @param string (as many parameters as needed)
      */
-    function alternator(): string
+    function alternator(...$args): string
     {
         static $i;
 
@@ -619,8 +619,6 @@ function alternator(): string
             return '';
         }
 
-        $args = func_get_args();
-
         return $args[($i++ % count($args))];
     }
 }
diff --git a/system/Test/ReflectionHelper.php b/system/Test/ReflectionHelper.php
index db41e2c10553..4eb474ad0ecb 100644
--- a/system/Test/ReflectionHelper.php
+++ b/system/Test/ReflectionHelper.php
@@ -39,9 +39,7 @@ public static function getPrivateMethodInvoker($obj, $method)
         $refMethod->setAccessible(true);
         $obj = (gettype($obj) === 'object') ? $obj : null;
 
-        return static function () use ($obj, $refMethod) {
-            $args = func_get_args();
-
+        return static function (...$args) use ($obj, $refMethod) {
             return $refMethod->invokeArgs($obj, $args);
         };
     }

From d422154d2f6d38af40fe3409fd396e8104270de9 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sat, 24 Jul 2021 19:05:15 +0700
Subject: [PATCH 0102/2325] update @param and phpstan handling

---
 system/Helpers/text_helper.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index 5ed6d21190ba..23f674be9eb3 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -605,9 +605,7 @@ function increment_string(string $str, string $separator = '_', int $first = 1):
      *
      * Allows strings to be alternated. See docs...
      *
-     * @phpstan-ignore-next-line
-     *
-     * @param string (as many parameters as needed)
+     * @param string ...$args (as many parameters as needed)
      */
     function alternator(...$args): string
     {

From 9c6de352c4e16800ce8e1b1508c7ca355937931f Mon Sep 17 00:00:00 2001
From: Mostafa Khudair <mostafakhudair@gmail.com>
Date: Sat, 24 Jul 2021 20:26:03 +0200
Subject: [PATCH 0103/2325] Optimize Filters

---
 system/Filters/CSRF.php         |  9 ++-------
 system/Filters/DebugToolbar.php |  9 ++-------
 system/Filters/Honeypot.php     | 12 ++++++------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/system/Filters/CSRF.php b/system/Filters/CSRF.php
index 518fdc48124b..9d17b5e6e241 100644
--- a/system/Filters/CSRF.php
+++ b/system/Filters/CSRF.php
@@ -11,9 +11,7 @@
 
 namespace CodeIgniter\Filters;
 
-use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
-use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Security\Exceptions\SecurityException;
 use Config\Services;
@@ -37,8 +35,7 @@ class CSRF implements FilterInterface
      * sent back to the client, allowing for error pages,
      * redirects, etc.
      *
-     * @param IncomingRequest|RequestInterface $request
-     * @param array|null                       $arguments
+     * @param array|null $arguments
      *
      * @throws SecurityException
      *
@@ -66,9 +63,7 @@ public function before(RequestInterface $request, $arguments = null)
     /**
      * We don't have anything to do here.
      *
-     * @param IncomingRequest|RequestInterface $request
-     * @param Response|ResponseInterface       $response
-     * @param array|null                       $arguments
+     * @param array|null $arguments
      *
      * @return mixed
      */
diff --git a/system/Filters/DebugToolbar.php b/system/Filters/DebugToolbar.php
index 941685ebe8ff..cc57cd50b81e 100644
--- a/system/Filters/DebugToolbar.php
+++ b/system/Filters/DebugToolbar.php
@@ -11,9 +11,7 @@
 
 namespace CodeIgniter\Filters;
 
-use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
-use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
 use Config\Services;
 
@@ -25,8 +23,7 @@ class DebugToolbar implements FilterInterface
     /**
      * We don't need to do anything here.
      *
-     * @param IncomingRequest|RequestInterface $request
-     * @param array|null                       $arguments
+     * @param array|null $arguments
      *
      * @return void
      */
@@ -38,9 +35,7 @@ public function before(RequestInterface $request, $arguments = null)
      * If the debug flag is set (CI_DEBUG) then collect performance
      * and debug information and display it in a toolbar.
      *
-     * @param IncomingRequest|RequestInterface $request
-     * @param Response|ResponseInterface       $response
-     * @param array|null                       $arguments
+     * @param array|null $arguments
      *
      * @return void
      */
diff --git a/system/Filters/Honeypot.php b/system/Filters/Honeypot.php
index 1b16e982a683..022999bcfac3 100644
--- a/system/Filters/Honeypot.php
+++ b/system/Filters/Honeypot.php
@@ -22,17 +22,18 @@
 class Honeypot implements FilterInterface
 {
     /**
-     * Checks if Honeypot field is empty; if not
-     * then the requester is a bot
+     * Checks if Honeypot field is empty, if not then the
+     * requester is a bot
      *
      * @param array|null $arguments
      *
+     * @throws HoneypotException
+     *
      * @return void
      */
     public function before(RequestInterface $request, $arguments = null)
     {
-        $honeypot = Services::honeypot(new \Config\Honeypot());
-        if ($honeypot->hasContent($request)) {
+        if (Services::honeypot()->hasContent($request)) {
             throw HoneypotException::isBot();
         }
     }
@@ -46,7 +47,6 @@ public function before(RequestInterface $request, $arguments = null)
      */
     public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
     {
-        $honeypot = Services::honeypot(new \Config\Honeypot());
-        $honeypot->attachHoneypot($response);
+        Services::honeypot()->attachHoneypot($response);
     }
 }

From dc0f0d577d3c1be54016700c76dacc662452030d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Jul 2021 02:08:35 +0000
Subject: [PATCH 0104/2325] Update rector/rector requirement from 0.11.37 to
 0.11.40 (#4967)

---
 composer.json         | 2 +-
 phpstan.neon.dist     | 1 +
 system/Files/File.php | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 6e22b4d569f6..648f7b4fc88b 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "phpstan/phpstan": "^0.12.91",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.37",
+        "rector/rector": "0.11.40",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 0dec90aa847f..c077de4dc9c3 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -9,6 +9,7 @@ services:
 			- phpstan.rules.rule
 
 parameters:
+	reportUnmatchedIgnoredErrors: false
 	tmpDir: build/phpstan
 	level: 5
 	paths:
diff --git a/system/Files/File.php b/system/Files/File.php
index d116aa927912..d42aa71f4f99 100644
--- a/system/Files/File.php
+++ b/system/Files/File.php
@@ -161,7 +161,7 @@ public function getDestination(string $destination, string $delimiter = '_', int
             $info      = pathinfo($destination);
             $extension = isset($info['extension']) ? '.' . $info['extension'] : '';
             if (strpos($info['filename'], $delimiter) !== false) {
-                $parts = explode($delimiter, $info['filename']);
+                $parts = explode($delimiter, $info['filename']); // @phpstan-ignore-line
                 if (is_numeric(end($parts))) {
                     $i = end($parts);
                     array_pop($parts);

From 9f6daac286352f6247bb12e2a2b0fee174217b63 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 27 Jul 2021 22:34:57 +0800
Subject: [PATCH 0105/2325] Fix API repo preparation step

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

diff --git a/.github/workflows/deploy-apidocs.yml b/.github/workflows/deploy-apidocs.yml
index 0454e5c9f769..4edf916d1a27 100644
--- a/.github/workflows/deploy-apidocs.yml
+++ b/.github/workflows/deploy-apidocs.yml
@@ -55,9 +55,9 @@ jobs:
       - name: Prepare API repo
         working-directory: api
         run: |
-          rm -rf api/docs*
-          mkdir -p api/docs
           git reset --hard master
+          rm -rfv api/docs
+          mkdir --parents --verbose api/docs
 
       - name: Build API in source repo
         working-directory: source

From 087c115dd65081065f5969523d3c353a4f6d4d4f Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 27 Jul 2021 23:18:32 +0800
Subject: [PATCH 0106/2325] Fix phpstan error properly

---
 phpstan.neon.dist     |  1 -
 system/Files/File.php | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index c077de4dc9c3..0dec90aa847f 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -9,7 +9,6 @@ services:
 			- phpstan.rules.rule
 
 parameters:
-	reportUnmatchedIgnoredErrors: false
 	tmpDir: build/phpstan
 	level: 5
 	paths:
diff --git a/system/Files/File.php b/system/Files/File.php
index d42aa71f4f99..132822043f33 100644
--- a/system/Files/File.php
+++ b/system/Files/File.php
@@ -100,9 +100,7 @@ public function guessExtension(): ?string
     public function getMimeType(): string
     {
         if (! function_exists('finfo_open')) {
-            // @codeCoverageIgnoreStart
-            return $this->originalMimeType ?? 'application/octet-stream';
-            // @codeCoverageIgnoreEnd
+            return $this->originalMimeType ?? 'application/octet-stream'; // @codeCoverageIgnore
         }
 
         $finfo    = finfo_open(FILEINFO_MIME_TYPE);
@@ -157,21 +155,27 @@ public function move(string $targetPath, ?string $name = null, bool $overwrite =
      */
     public function getDestination(string $destination, string $delimiter = '_', int $i = 0): string
     {
+        if ($delimiter === '') {
+            $delimiter = '_';
+        }
+
         while (is_file($destination)) {
             $info      = pathinfo($destination);
             $extension = isset($info['extension']) ? '.' . $info['extension'] : '';
+
             if (strpos($info['filename'], $delimiter) !== false) {
-                $parts = explode($delimiter, $info['filename']); // @phpstan-ignore-line
+                $parts = explode($delimiter, $info['filename']);
+
                 if (is_numeric(end($parts))) {
                     $i = end($parts);
                     array_pop($parts);
                     $parts[]     = ++$i;
-                    $destination = $info['dirname'] . '/' . implode($delimiter, $parts) . $extension;
+                    $destination = $info['dirname'] . DIRECTORY_SEPARATOR . implode($delimiter, $parts) . $extension;
                 } else {
-                    $destination = $info['dirname'] . '/' . $info['filename'] . $delimiter . ++$i . $extension;
+                    $destination = $info['dirname'] . DIRECTORY_SEPARATOR . $info['filename'] . $delimiter . ++$i . $extension;
                 }
             } else {
-                $destination = $info['dirname'] . '/' . $info['filename'] . $delimiter . ++$i . $extension;
+                $destination = $info['dirname'] . DIRECTORY_SEPARATOR . $info['filename'] . $delimiter . ++$i . $extension;
             }
         }
 

From 7f6783e0d174c31604309d423b29b3e2880fa4f1 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 27 Jul 2021 23:19:38 +0800
Subject: [PATCH 0107/2325] Add tests for File::getDestination

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

diff --git a/tests/system/Files/FileTest.php b/tests/system/Files/FileTest.php
index ec911eaa107c..6ff5b77fd3bc 100644
--- a/tests/system/Files/FileTest.php
+++ b/tests/system/Files/FileTest.php
@@ -89,4 +89,20 @@ public function testThrowsExceptionIfNotAFile()
 
         new File(SYSTEMPATH . 'Commoner.php', true);
     }
+
+    public function testGetDestination(): void
+    {
+        $file = new File(SYSTEMPATH . 'Common.php');
+        copy(SYSTEMPATH . 'Common.php', SYSTEMPATH . 'Common_Copy.php');
+
+        $this->assertSame(SYSTEMPATH . 'Common_Copy_1.php', $file->getDestination(SYSTEMPATH . 'Common_Copy.php', ''));
+        $this->assertSame(SYSTEMPATH . 'Common_1.php', $file->getDestination(SYSTEMPATH . 'Common.php'));
+        $this->assertSame(SYSTEMPATH . 'Common_Copy_5.php', $file->getDestination(SYSTEMPATH . 'Common_Copy_5.php'));
+
+        copy(SYSTEMPATH . 'Common_Copy.php', SYSTEMPATH . 'Common_Copy_5.php');
+        $this->assertSame(SYSTEMPATH . 'Common_Copy_6.php', $file->getDestination(SYSTEMPATH . 'Common_Copy_5.php'));
+
+        unlink(SYSTEMPATH . 'Common_Copy.php');
+        unlink(SYSTEMPATH . 'Common_Copy_5.php');
+    }
 }

From 91bf8a630de4988f2245a710958d979c5197f5bd Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 26 Jul 2021 09:37:09 +0700
Subject: [PATCH 0108/2325] [Rector] Apply
 MakeInheritedMethodVisibilitySameAsParentRector

---
 rector.php                                    | 2 ++
 system/Database/MySQLi/Connection.php         | 8 ++++----
 system/Database/Postgre/Builder.php           | 2 +-
 system/Database/Postgre/Connection.php        | 8 ++++----
 system/Database/SQLSRV/Connection.php         | 8 ++++----
 system/Database/SQLite3/Connection.php        | 8 ++++----
 system/Images/Handlers/GDHandler.php          | 4 ++--
 system/Images/Handlers/ImageMagickHandler.php | 4 ++--
 system/Test/Constraints/SeeInDatabase.php     | 4 ++--
 system/Test/Mock/MockIncomingRequest.php      | 2 +-
 system/Test/Mock/MockSecurity.php             | 2 +-
 11 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/rector.php b/rector.php
index 01af6d75a89d..32b09bd95311 100644
--- a/rector.php
+++ b/rector.php
@@ -24,6 +24,7 @@
 use Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector;
 use Rector\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector;
 use Rector\CodingStyle\Rector\ClassMethod\FuncGetArgsToVariadicParamRector;
+use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector;
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
 use Rector\Core\Configuration\Option;
 use Rector\Core\ValueObject\PhpVersion;
@@ -111,4 +112,5 @@
     $services->set(RemoveExtraParametersRector::class);
     $services->set(RemoveUnusedVariableAssignRector::class);
     $services->set(FuncGetArgsToVariadicParamRector::class);
+    $services->set(MakeInheritedMethodVisibilitySameAsParentRector::class);
 };
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
index 03a18178d322..779636808eb0 100644
--- a/system/Database/MySQLi/Connection.php
+++ b/system/Database/MySQLi/Connection.php
@@ -271,7 +271,7 @@ public function getVersion(): string
      *
      * @return mixed
      */
-    public function execute(string $sql)
+    protected function execute(string $sql)
     {
         while ($this->connID->more_results()) {
             $this->connID->next_result();
@@ -391,7 +391,7 @@ protected function _listColumns(string $table = ''): string
      *
      * @return stdClass[]
      */
-    public function _fieldData(string $table): array
+    protected function _fieldData(string $table): array
     {
         $table = $this->protectIdentifiers($table, true, null, false);
 
@@ -424,7 +424,7 @@ public function _fieldData(string $table): array
      *
      * @return stdClass[]
      */
-    public function _indexData(string $table): array
+    protected function _indexData(string $table): array
     {
         $table = $this->protectIdentifiers($table, true, null, false);
 
@@ -469,7 +469,7 @@ public function _indexData(string $table): array
      *
      * @return stdClass[]
      */
-    public function _foreignKeyData(string $table): array
+    protected function _foreignKeyData(string $table): array
     {
         $sql = '
                     SELECT
diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index f35ecf2cf85d..45f73749d5f4 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -333,7 +333,7 @@ protected function _truncate(string $table): string
      *
      * @return string $like_statement
      */
-    public function _like_statement(?string $prefix, string $column, ?string $not, string $bind, bool $insensitiveSearch = false): string
+    protected function _like_statement(?string $prefix, string $column, ?string $not, string $bind, bool $insensitiveSearch = false): string
     {
         $op = $insensitiveSearch === true ? 'ILIKE' : 'LIKE';
 
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
index b332128c5b8d..83e8fd3110c0 100644
--- a/system/Database/Postgre/Connection.php
+++ b/system/Database/Postgre/Connection.php
@@ -134,7 +134,7 @@ public function getVersion(): string
      *
      * @return mixed
      */
-    public function execute(string $sql)
+    protected function execute(string $sql)
     {
         try {
             return pg_query($this->connID, $sql);
@@ -229,7 +229,7 @@ protected function _listColumns(string $table = ''): string
      *
      * @return stdClass[]
      */
-    public function _fieldData(string $table): array
+    protected function _fieldData(string $table): array
     {
         $sql = 'SELECT "column_name", "data_type", "character_maximum_length", "numeric_precision", "column_default"
 			FROM "information_schema"."columns"
@@ -263,7 +263,7 @@ public function _fieldData(string $table): array
      *
      * @return stdClass[]
      */
-    public function _indexData(string $table): array
+    protected function _indexData(string $table): array
     {
         $sql = 'SELECT "indexname", "indexdef"
 			FROM "pg_indexes"
@@ -304,7 +304,7 @@ public function _indexData(string $table): array
      *
      * @return stdClass[]
      */
-    public function _foreignKeyData(string $table): array
+    protected function _foreignKeyData(string $table): array
     {
         $sql = 'SELECT
             tc.constraint_name, tc.table_name, kcu.column_name,
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index 28d18af8d7d3..b124fd8b9d2c 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -221,7 +221,7 @@ protected function _listColumns(string $table = ''): string
      *
      * @return stdClass[]
      */
-    public function _indexData(string $table): array
+    protected function _indexData(string $table): array
     {
         $sql = 'EXEC sp_helpindex ' . $this->escape($table);
 
@@ -261,7 +261,7 @@ public function _indexData(string $table): array
      *
      * @return stdClass[]
      */
-    public function _foreignKeyData(string $table): array
+    protected function _foreignKeyData(string $table): array
     {
         $sql = 'SELECT '
                 . 'f.name as constraint_name, '
@@ -329,7 +329,7 @@ protected function _enableForeignKeyChecks()
      *
      * @return stdClass[]
      */
-    public function _fieldData(string $table): array
+    protected function _fieldData(string $table): array
     {
         $sql = 'SELECT COLUMN_NAME, DATA_TYPE, CHARACTER_MAXIMUM_LENGTH, NUMERIC_PRECISION, COLUMN_DEFAULT
 			FROM INFORMATION_SCHEMA.COLUMNS
@@ -453,7 +453,7 @@ public function setDatabase(?string $databaseName = null)
      *
      * @return mixed
      */
-    public function execute(string $sql)
+    protected function execute(string $sql)
     {
         $stmt = ($this->scrollable === false || $this->isWriteType($sql)) ?
             sqlsrv_query($this->connID, $sql) :
diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
index 174f6df43758..759ad6f76db1 100644
--- a/system/Database/SQLite3/Connection.php
+++ b/system/Database/SQLite3/Connection.php
@@ -112,7 +112,7 @@ public function getVersion(): string
      *
      * @return mixed \SQLite3Result object or bool
      */
-    public function execute(string $sql)
+    protected function execute(string $sql)
     {
         try {
             return $this->isWriteType($sql)
@@ -217,7 +217,7 @@ public function getFieldNames(string $table)
      *
      * @return stdClass[]
      */
-    public function _fieldData(string $table): array
+    protected function _fieldData(string $table): array
     {
         if (false === $query = $this->query('PRAGMA TABLE_INFO(' . $this->protectIdentifiers($table, true, null, false) . ')')) {
             throw new DatabaseException(lang('Database.failGetFieldData'));
@@ -252,7 +252,7 @@ public function _fieldData(string $table): array
      *
      * @return stdClass[]
      */
-    public function _indexData(string $table): array
+    protected function _indexData(string $table): array
     {
         // Get indexes
         // Don't use PRAGMA index_list, so we can preserve index order
@@ -293,7 +293,7 @@ public function _indexData(string $table): array
      *
      * @return stdClass[]
      */
-    public function _foreignKeyData(string $table): array
+    protected function _foreignKeyData(string $table): array
     {
         if ($this->supportsForeignKeys() !== true) {
             return [];
diff --git a/system/Images/Handlers/GDHandler.php b/system/Images/Handlers/GDHandler.php
index db86d2fb5bc6..a3f0a0eb88df 100644
--- a/system/Images/Handlers/GDHandler.php
+++ b/system/Images/Handlers/GDHandler.php
@@ -70,7 +70,7 @@ protected function _rotate(int $angle): bool
      *
      * @return $this
      */
-    public function _flatten(int $red = 255, int $green = 255, int $blue = 255)
+    protected function _flatten(int $red = 255, int $green = 255, int $blue = 255)
     {
         $srcImg = $this->createImage();
 
@@ -101,7 +101,7 @@ public function _flatten(int $red = 255, int $green = 255, int $blue = 255)
      *
      * @return $this
      */
-    public function _flip(string $direction)
+    protected function _flip(string $direction)
     {
         $srcImg = $this->createImage();
 
diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php
index 09a9d4a84a2d..5ec6a23cc4f7 100644
--- a/system/Images/Handlers/ImageMagickHandler.php
+++ b/system/Images/Handlers/ImageMagickHandler.php
@@ -135,7 +135,7 @@ protected function _rotate(int $angle)
      *
      * @return $this
      */
-    public function _flatten(int $red = 255, int $green = 255, int $blue = 255)
+    protected function _flatten(int $red = 255, int $green = 255, int $blue = 255)
     {
         $flatten = "-background 'rgb({$red},{$green},{$blue})' -flatten";
 
@@ -156,7 +156,7 @@ public function _flatten(int $red = 255, int $green = 255, int $blue = 255)
      *
      * @return $this
      */
-    public function _flip(string $direction)
+    protected function _flip(string $direction)
     {
         $angle = $direction === 'horizontal' ? '-flop' : '-flip';
 
diff --git a/system/Test/Constraints/SeeInDatabase.php b/system/Test/Constraints/SeeInDatabase.php
index f662f8fdc047..dbed1e42de1c 100644
--- a/system/Test/Constraints/SeeInDatabase.php
+++ b/system/Test/Constraints/SeeInDatabase.php
@@ -50,7 +50,7 @@ public function __construct(ConnectionInterface $db, array $data)
      *
      * @param mixed $table
      */
-    public function matches($table): bool
+    protected function matches($table): bool
     {
         return $this->db->table($table)->where($this->data)->countAllResults() > 0;
     }
@@ -60,7 +60,7 @@ public function matches($table): bool
      *
      * @param mixed $table
      */
-    public function failureDescription($table): string
+    protected function failureDescription($table): string
     {
         return sprintf(
             "a row in the table [%s] matches the attributes \n%s\n\n%s",
diff --git a/system/Test/Mock/MockIncomingRequest.php b/system/Test/Mock/MockIncomingRequest.php
index 39d739c1abb0..522965f46998 100644
--- a/system/Test/Mock/MockIncomingRequest.php
+++ b/system/Test/Mock/MockIncomingRequest.php
@@ -20,7 +20,7 @@ class MockIncomingRequest extends IncomingRequest
     //        // Don't do anything... force the tester to manually set the headers they want.
     //    }
 
-    public function detectURI($protocol, $baseURL)
+    protected function detectURI($protocol, $baseURL)
     {
         // Do nothing...
     }
diff --git a/system/Test/Mock/MockSecurity.php b/system/Test/Mock/MockSecurity.php
index e9776ffd872b..3f802a7d79f6 100644
--- a/system/Test/Mock/MockSecurity.php
+++ b/system/Test/Mock/MockSecurity.php
@@ -16,7 +16,7 @@
 
 class MockSecurity extends Security
 {
-    public function sendCookie(RequestInterface $request)
+    protected function sendCookie(RequestInterface $request)
     {
         $_COOKIE['csrf_cookie_name'] = $this->hash;
 

From 07ea12ac94cceb5139c1d75e8590a89ffd01c8f5 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Wed, 28 Jul 2021 08:57:54 +0700
Subject: [PATCH 0109/2325] update changelog for breaking changes method

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

diff --git a/user_guide_src/source/changelogs/v4.1.4.rst b/user_guide_src/source/changelogs/v4.1.4.rst
index e431b242c06b..f5f7fb7d33b9 100644
--- a/user_guide_src/source/changelogs/v4.1.4.rst
+++ b/user_guide_src/source/changelogs/v4.1.4.rst
@@ -4,3 +4,31 @@ Version 4.1.4
 Release Date: Not released
 
 **4.1.4 release of CodeIgniter4**
+
+Breaking Changes:
+
+The following methods were changed from "public" to "protected" to match their parent class methods and better align with their uses:
+
+* CodeIgniter4\Database\MySQLi\Connection::execute()
+* CodeIgniter4\Database\MySQLi\Connection::_fieldData()
+* CodeIgniter4\Database\MySQLi\Connection::_indexData()
+* CodeIgniter4\Database\MySQLi\Connection::_foreignKeyData()
+* CodeIgniter4\Database\Postgre\Builder::_like_statement()
+* CodeIgniter4\Database\Postgre\Connection::execute()
+* CodeIgniter4\Database\Postgre\Connection::_fieldData()
+* CodeIgniter4\Database\Postgre\Connection::_indexData()
+* CodeIgniter4\Database\Postgre\Connection::_foreignKeyData()
+* CodeIgniter4\Database\SQLSRV\Connection::execute()
+* CodeIgniter4\Database\SQLSRV\Connection::_fieldData()
+* CodeIgniter4\Database\SQLSRV\Connection::_indexData()
+* CodeIgniter4\Database\SQLSRV\Connection::_foreignKeyData()
+* CodeIgniter4\Database\SQLite3\Connection::execute()
+* CodeIgniter4\Database\SQLite3\Connection::_fieldData()
+* CodeIgniter4\Database\SQLite3\Connection::_indexData()
+* CodeIgniter4\Database\SQLite3\Connection::_foreignKeyData()
+* CodeIgniter4\Images\Handlers\GDHandler::_flatten()
+* CodeIgniter4\Images\Handlers\GDHandler::_flip()
+* CodeIgniter4\Images\Handlers\ImageMagickHandler::_flatten()
+* CodeIgniter4\Images\Handlers\ImageMagickHandler::_flip()
+* CodeIgniter4\Test\Mock\MockIncomingRequest::detectURI()
+* CodeIgniter4\Test\Mock\MockSecurity.php::sendCookie()

From ea6469b85278dbad1e1f34f90864c212db6f77d1 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sun, 25 Jul 2021 00:38:26 +0800
Subject: [PATCH 0110/2325] Manual cleanup of comments and docblocks

---
 phpstan.neon.dist                             |   3 -
 system/API/ResponseTrait.php                  |  39 +-
 system/Autoloader/Autoloader.php              |   4 -
 system/Autoloader/FileLocator.php             |   5 -
 system/BaseModel.php                          |  17 +-
 system/CLI/BaseCommand.php                    |   6 +-
 system/CLI/CLI.php                            |  47 +-
 system/CLI/Commands.php                       |   2 -
 system/CLI/Console.php                        |   8 +-
 system/CLI/GeneratorTrait.php                 |   2 -
 system/Cache/CacheFactory.php                 |   2 -
 system/Cache/Handlers/DummyHandler.php        |  69 +--
 system/Cache/Handlers/FileHandler.php         |  82 +---
 system/Cache/Handlers/MemcachedHandler.php    |  71 +--
 system/Cache/Handlers/PredisHandler.php       |  74 +--
 system/Cache/Handlers/RedisHandler.php        |  72 +--
 system/Cache/Handlers/WincacheHandler.php     |  67 +--
 system/CodeIgniter.php                        |   4 -
 system/Commands/Database/CreateDatabase.php   |   2 -
 system/Commands/Database/Migrate.php          |  15 +-
 system/Commands/Database/MigrateRefresh.php   |   2 -
 system/Commands/Database/MigrateRollback.php  |  10 +-
 system/Commands/Database/MigrateStatus.php    |   2 -
 system/Commands/Database/Seed.php             |   2 -
 system/Commands/Encryption/GenerateKey.php    |   6 +-
 .../Commands/Housekeeping/ClearDebugbar.php   |   2 -
 system/Commands/Server/Serve.php              |   4 -
 system/Commands/Utilities/Environment.php     |   4 -
 system/ComposerScripts.php                    |   2 -
 system/Config/BaseConfig.php                  |   4 +-
 system/Config/BaseService.php                 |   2 -
 system/Config/Config.php                      |   2 -
 system/Config/View.php                        |   2 -
 system/Cookie/Cookie.php                      |   4 -
 system/Database/BaseBuilder.php               | 457 +++---------------
 system/Database/BaseConnection.php            |  60 +--
 system/Database/BasePreparedQuery.php         |  15 +-
 system/Database/BaseResult.php                |   4 -
 system/Database/BaseUtils.php                 |  24 +-
 system/Database/Config.php                    |   3 +-
 system/Database/Database.php                  |  10 -
 system/Database/Forge.php                     | 128 +----
 system/Database/MigrationRunner.php           |  90 +---
 system/Database/ModelFactory.php              |   6 +-
 system/Database/MySQLi/Connection.php         |  12 +-
 system/Database/MySQLi/Result.php             |   4 -
 system/Database/Postgre/Builder.php           |  58 +--
 system/Database/Postgre/Connection.php        |  18 +-
 system/Database/Postgre/Forge.php             |  39 +-
 system/Database/Postgre/Result.php            |   4 -
 system/Database/PreparedQueryInterface.php    |   4 -
 system/Database/Query.php                     |  21 +-
 system/Database/QueryInterface.php            |   2 -
 system/Database/ResultInterface.php           |   4 +-
 system/Database/SQLSRV/Builder.php            |  65 +--
 system/Database/SQLSRV/Connection.php         |  60 +--
 system/Database/SQLSRV/Forge.php              |  68 +--
 system/Database/SQLSRV/Result.php             |   6 -
 system/Database/SQLite3/Builder.php           |   6 -
 system/Database/SQLite3/Connection.php        |  10 +-
 system/Database/SQLite3/Forge.php             |  36 +-
 system/Database/SQLite3/PreparedQuery.php     |   2 +-
 system/Database/SQLite3/Result.php            |   2 -
 system/Database/SQLite3/Table.php             |  14 +-
 system/Database/Seeder.php                    |   6 +-
 system/Debug/Toolbar.php                      |  24 +-
 system/Email/Email.php                        | 117 +----
 system/Encryption/Encryption.php              |  15 -
 system/Encryption/Handlers/SodiumHandler.php  |   2 -
 system/Events/Events.php                      |  10 -
 system/Filters/DebugToolbar.php               |   4 -
 system/Filters/Filters.php                    |   8 -
 system/Filters/Honeypot.php                   |   4 -
 system/HTTP/ContentSecurityPolicy.php         |  10 -
 system/HTTP/UserAgent.php                     |   4 -
 system/Helpers/cookie_helper.php              |   2 -
 system/Images/Handlers/BaseHandler.php        |   5 +-
 system/Images/Handlers/GDHandler.php          |   9 +-
 system/Model.php                              |  58 +--
 system/RESTful/BaseResource.php               |   7 -
 system/RESTful/ResourceController.php         |   2 -
 system/Router/RouteCollection.php             |   2 -
 system/Session/Session.php                    |   4 -
 system/Test/DatabaseTestTrait.php             |   8 -
 system/Test/FilterTestTrait.php               |   6 -
 system/View/Table.php                         |   8 -
 system/View/View.php                          |  21 +-
 87 files changed, 361 insertions(+), 1846 deletions(-)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 0dec90aa847f..3847a2f02a69 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -32,16 +32,13 @@ parameters:
 		- '#Access to an undefined property CodeIgniter\\Database\\Forge::\$dropConstraintStr#'
 		- '#Access to an undefined property CodeIgniter\\Database\\BaseConnection::\$mysqli|\$schema#'
 		- '#Access to an undefined property CodeIgniter\\Database\\ConnectionInterface::(\$DBDriver|\$connID|\$likeEscapeStr|\$likeEscapeChar|\$escapeChar|\$protectIdentifiers|\$schema)#'
-		- '#Access to protected property CodeIgniter\\Database\\BaseConnection::(\$DBDebug|\$DBPrefix|\$swapPre|\$charset|\$DBCollat|\$database)#'
 		- '#Call to an undefined method CodeIgniter\\Database\\BaseConnection::_(disable|enable)ForeignKeyChecks\(\)#'
-		- '#Call to an undefined method CodeIgniter\\Database\\BaseConnection::supportsForeignKeys\(\)#'
 		- '#Call to an undefined method CodeIgniter\\Router\\RouteCollectionInterface::(getDefaultNamespace|isFiltered|getFilterForRoute|getRoutesOptions)\(\)#'
 		- '#Cannot access property [\$a-z_]+ on ((bool\|)?object\|resource)#'
 		- '#Cannot call method [a-zA-Z_]+\(\) on ((bool\|)?object\|resource)#'
 		- '#Method CodeIgniter\\Router\\RouteCollectionInterface::getRoutes\(\) invoked with 1 parameter, 0 required#'
 		- '#Method CodeIgniter\\Validation\\ValidationInterface::run\(\) invoked with 3 parameters, 0-2 required#'
 		- '#Negated boolean expression is always (true|false)#'
-		- '#Parameter \#1 \$db of class CodeIgniter\\Database\\SQLite3\\Table constructor expects CodeIgniter\\Database\\SQLite3\\Connection, CodeIgniter\\Database\\BaseConnection given#'
 		- '#Return type \(bool\) of method CodeIgniter\\HTTP\\Files\\UploadedFile::move\(\) should be compatible with return type \(CodeIgniter\\Files\\File\) of method CodeIgniter\\Files\\File::move\(\)#'
 	parallel:
 		processTimeout: 300.0
diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
index f1be275cc9c9..56848ea608de 100644
--- a/system/API/ResponseTrait.php
+++ b/system/API/ResponseTrait.php
@@ -17,8 +17,6 @@
 use Config\Services;
 
 /**
- * Response trait.
- *
  * Provides common, more readable, methods to provide
  * consistent HTTP responses under a variety of common
  * situations when working as an API.
@@ -32,7 +30,7 @@ trait ResponseTrait
      * Allows child classes to override the
      * status code that is used in their API.
      *
-     * @var array
+     * @var array<string, int>
      */
     protected $codes = [
         'created'                   => 201,
@@ -86,21 +84,15 @@ trait ResponseTrait
      * to match the requested format, with proper content-type and status code.
      *
      * @param array|string|null $data
-     * @param int               $status
      *
      * @return mixed
      */
     public function respond($data = null, ?int $status = null, string $message = '')
     {
-        // If data is null and status code not provided, exit and bail
         if ($data === null && $status === null) {
             $status = 404;
-
-            // Create the output var here in case of $this->response([]);
             $output = null;
-        }
-        // If data is null but status provided, keep the output empty.
-        elseif ($data === null && is_numeric($status)) {
+        } elseif ($data === null && is_numeric($status)) {
             $output = null;
         } else {
             $status = empty($status) ? 200 : $status;
@@ -151,8 +143,7 @@ public function fail($messages, int $status = 400, ?string $code = null, string
     /**
      * Used after successfully creating a new resource.
      *
-     * @param mixed  $data    Data.
-     * @param string $message Message.
+     * @param mixed $data
      *
      * @return mixed
      */
@@ -164,8 +155,7 @@ public function respondCreated($data = null, string $message = '')
     /**
      * Used after a resource has been successfully deleted.
      *
-     * @param mixed  $data    Data.
-     * @param string $message Message.
+     * @param mixed $data
      *
      * @return mixed
      */
@@ -177,8 +167,7 @@ public function respondDeleted($data = null, string $message = '')
     /**
      * Used after a resource has been successfully updated.
      *
-     * @param mixed  $data    Data.
-     * @param string $message Message.
+     * @param mixed $data
      *
      * @return mixed
      */
@@ -191,8 +180,6 @@ public function respondUpdated($data = null, string $message = '')
      * Used after a command has been successfully executed but there is no
      * meaningful reply to send back to the client.
      *
-     * @param string $message Message.
-     *
      * @return mixed
      */
     public function respondNoContent(string $message = 'No Content')
@@ -205,8 +192,6 @@ public function respondNoContent(string $message = 'No Content')
      * or had bad authorization credentials. User is encouraged to try again
      * with the proper information.
      *
-     * @param string $code
-     *
      * @return mixed
      */
     public function failUnauthorized(string $description = 'Unauthorized', ?string $code = null, string $message = '')
@@ -218,8 +203,6 @@ public function failUnauthorized(string $description = 'Unauthorized', ?string $
      * Used when access is always denied to this resource and no amount
      * of trying again will help.
      *
-     * @param string $code
-     *
      * @return mixed
      */
     public function failForbidden(string $description = 'Forbidden', ?string $code = null, string $message = '')
@@ -230,8 +213,6 @@ public function failForbidden(string $description = 'Forbidden', ?string $code =
     /**
      * Used when a specified resource cannot be found.
      *
-     * @param string $code
-     *
      * @return mixed
      */
     public function failNotFound(string $description = 'Not Found', ?string $code = null, string $message = '')
@@ -242,8 +223,6 @@ public function failNotFound(string $description = 'Not Found', ?string $code =
     /**
      * Used when the data provided by the client cannot be validated.
      *
-     * @param string $code
-     *
      * @return mixed
      *
      * @deprecated Use failValidationErrors instead
@@ -268,8 +247,6 @@ public function failValidationErrors($errors, ?string $code = null, string $mess
     /**
      * Use when trying to create a new resource and it already exists.
      *
-     * @param string $code
-     *
      * @return mixed
      */
     public function failResourceExists(string $description = 'Conflict', ?string $code = null, string $message = '')
@@ -282,8 +259,6 @@ public function failResourceExists(string $description = 'Conflict', ?string $co
      * Not Found, because here we know the data previously existed, but is now gone,
      * where Not Found means we simply cannot find any information about it.
      *
-     * @param string $code
-     *
      * @return mixed
      */
     public function failResourceGone(string $description = 'Gone', ?string $code = null, string $message = '')
@@ -294,8 +269,6 @@ public function failResourceGone(string $description = 'Gone', ?string $code = n
     /**
      * Used when the user has made too many requests for the resource recently.
      *
-     * @param string $code
-     *
      * @return mixed
      */
     public function failTooManyRequests(string $description = 'Too Many Requests', ?string $code = null, string $message = '')
@@ -371,8 +344,6 @@ protected function format($data = null)
     /**
      * Sets the format the response should be in.
      *
-     * @param string $format
-     *
      * @return $this
      */
     public function setResponseFormat(?string $format = null)
diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
index dfe1c72a5573..3472756ad4dd 100644
--- a/system/Autoloader/Autoloader.php
+++ b/system/Autoloader/Autoloader.php
@@ -17,8 +17,6 @@
 use InvalidArgumentException;
 
 /**
- * CodeIgniter Autoloader
- *
  * An autoloader that uses both PSR4 autoloading, and traditional classmaps.
  *
  * Given a foo-bar package of classes in the file system at the following paths:
@@ -296,8 +294,6 @@ public function sanitizeFilename(string $filename): string
 
     /**
      * Locates autoload information from Composer, if available.
-     *
-     * @return void
      */
     protected function discoverComposerNamespaces()
     {
diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index 882815b213d2..6fa8109bf992 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -12,8 +12,6 @@
 namespace CodeIgniter\Autoloader;
 
 /**
- * Class FileLocator
- *
  * Allows loading non-class files in a namespaced manner.
  * Works with Helpers, Views, etc.
  */
@@ -26,9 +24,6 @@ class FileLocator
      */
     protected $autoloader;
 
-    /**
-     * Constructor
-     */
     public function __construct(Autoloader $autoloader)
     {
         $this->autoloader = $autoloader;
diff --git a/system/BaseModel.php b/system/BaseModel.php
index 172776c6586d..1d777506976f 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -29,8 +29,6 @@
 use stdClass;
 
 /**
- * Class Model
- *
  * The BaseModel class provides a number of convenient features that
  * makes working with a databases less painful. Extending this class
  * provide means of implementing various database systems
@@ -288,11 +286,6 @@ abstract class BaseModel
      */
     protected $afterDelete = [];
 
-    /**
-     * BaseModel constructor.
-     *
-     * @param ValidationInterface|null $validation Validation
-     */
     public function __construct(?ValidationInterface $validation = null)
     {
         $this->tempReturnType     = $this->returnType;
@@ -431,8 +424,6 @@ abstract protected function doPurgeDeleted();
      * Works with the find* methods to return only the rows that
      * have been deleted.
      * This methods works only with dbCalls
-     *
-     * @return void
      */
     abstract protected function doOnlyDeleted();
 
@@ -500,8 +491,6 @@ abstract public function countAllResults(bool $reset = true, bool $test = false)
      * @param Closure $userFunc Callback Function
      *
      * @throws DataException
-     *
-     * @return void
      */
     abstract public function chunk(int $size, Closure $userFunc);
 
@@ -829,8 +818,8 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
      * Updates a single record in the database. If an object is provided,
      * it will attempt to convert it into an array.
      *
-     * @param array|int|string|null $id   ID
-     * @param array|object|null     $data Data
+     * @param array|int|string|null $id
+     * @param array|object|null     $data
      *
      * @throws ReflectionException
      */
@@ -987,7 +976,7 @@ public function delete($id = null, bool $purge = false)
      * Permanently deletes all rows that have been marked as deleted
      * through soft deletes (deleted = 1)
      *
-     * @return bool|mixed
+     * @return mixed
      */
     public function purgeDeleted()
     {
diff --git a/system/CLI/BaseCommand.php b/system/CLI/BaseCommand.php
index 62957f76a4e4..8f843c4f5c73 100644
--- a/system/CLI/BaseCommand.php
+++ b/system/CLI/BaseCommand.php
@@ -87,9 +87,6 @@ abstract class BaseCommand
      */
     protected $commands;
 
-    /**
-     * BaseCommand constructor.
-     */
     public function __construct(LoggerInterface $logger, Commands $commands)
     {
         $this->logger   = $logger;
@@ -98,7 +95,8 @@ public function __construct(LoggerInterface $logger, Commands $commands)
 
     /**
      * Actually execute a command.
-     * This has to be over-ridden in any concrete implementation.
+     *
+     * @param array<string, mixed> $params
      */
     abstract public function run(array $params);
 
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index 48218009833e..b463aa6a3016 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -60,7 +60,7 @@ class CLI
     /**
      * Foreground color list
      *
-     * @var array
+     * @var array<string, string>
      */
     protected static $foreground_colors = [
         'black'        => '0;30',
@@ -85,7 +85,7 @@ class CLI
     /**
      * Background color list
      *
-     * @var array
+     * @var array<string, string>
      */
     protected static $background_colors = [
         'black'      => '40',
@@ -164,9 +164,7 @@ public static function init()
         } else {
             // If the command is being called from a controller
             // we need to define STDOUT ourselves
-            // @codeCoverageIgnoreStart
-            define('STDOUT', 'php://output');
-            // @codeCoverageIgnoreEnd
+            define('STDOUT', 'php://output'); // @codeCoverageIgnore
         }
     }
 
@@ -312,10 +310,6 @@ public static function print(string $text = '', ?string $foreground = null, ?str
 
     /**
      * Outputs a string to the cli on it's own line.
-     *
-     * @param string $text       The text to output
-     * @param string $foreground
-     * @param string $background
      */
     public static function write(string $text = '', ?string $foreground = null, ?string $background = null)
     {
@@ -333,8 +327,6 @@ public static function write(string $text = '', ?string $foreground = null, ?str
 
     /**
      * Outputs an error to the CLI using STDERR instead of STDOUT
-     *
-     * @param string $text The text to output, or array of errors
      */
     public static function error(string $text, string $foreground = 'light_red', ?string $background = null)
     {
@@ -402,10 +394,6 @@ public static function isWindows(): bool
 
     /**
      * Enter a number of empty lines
-     *
-     * @param int $num Number of lines to output
-     *
-     * @return void
      */
     public static function newLine(int $num = 1)
     {
@@ -418,8 +406,6 @@ public static function newLine(int $num = 1)
     /**
      * Clears the screen of output
      *
-     * @return void
-     *
      * @codeCoverageIgnore
      */
     public static function clearScreen()
@@ -496,8 +482,6 @@ public static function color(string $text, string $foreground, ?string $backgrou
     /**
      * Get the number of characters in string having encoded characters
      * and ignores styles set by the color() function
-     *
-     * @param string $string
      */
     public static function strlen(?string $string): int
     {
@@ -533,9 +517,7 @@ public static function streamSupports(string $function, $resource): bool
             return function_exists($function);
         }
 
-        // @codeCoverageIgnoreStart
-        return function_exists($function) && @$function($resource);
-        // @codeCoverageIgnoreEnd
+        return function_exists($function) && @$function($resource); // @codeCoverageIgnore
     }
 
     /**
@@ -599,7 +581,7 @@ public static function getHeight(int $default = 32): int
     /**
      * Populates the CLI's dimensions.
      *
-     * @return void
+     * @codeCoverageIgnore
      */
     public static function generateDimensions()
     {
@@ -607,7 +589,6 @@ public static function generateDimensions()
             if (static::isWindows()) {
                 // Shells such as `Cygwin` and `Git bash` returns incorrect values
                 // when executing `mode CON`, so we use `tput` instead
-                // @codeCoverageIgnoreStart
                 if (getenv('TERM') || (($shell = getenv('SHELL')) && preg_match('/(?:bash|zsh)(?:\.exe)?$/', $shell))) {
                     static::$height = (int) exec('tput lines');
                     static::$width  = (int) exec('tput cols');
@@ -623,26 +604,20 @@ public static function generateDimensions()
                         static::$width  = (int) $matches[2];
                     }
                 }
-                // @codeCoverageIgnoreEnd
             } elseif (($size = exec('stty size')) && preg_match('/(\d+)\s+(\d+)/', $size, $matches)) {
                 static::$height = (int) $matches[1];
                 static::$width  = (int) $matches[2];
             } else {
-                // @codeCoverageIgnoreStart
                 static::$height = (int) exec('tput lines');
                 static::$width  = (int) exec('tput cols');
-                // @codeCoverageIgnoreEnd
             }
-        }
-        // @codeCoverageIgnoreStart
-        catch (Throwable $e) {
+        } catch (Throwable $e) {
             // Reset the dimensions so that the default values will be returned later.
             // Then let the developer know of the error.
             static::$height = null;
             static::$width  = null;
             log_message('error', $e->getMessage());
         }
-        // @codeCoverageIgnoreEnd
     }
 
     /**
@@ -686,8 +661,6 @@ public static function showProgress($thisStep = 1, int $totalSteps = 10)
      * If an int is passed into $pad_left, then all strings after the first
      * will padded with that many spaces to the left. Useful when printing
      * short descriptions that need to start on an existing line.
-     *
-     * @param string $string
      */
     public static function wrap(?string $string = null, int $max = 0, int $padLeft = 0): string
     {
@@ -789,7 +762,7 @@ public static function getURI(): string
      *
      * **IMPORTANT:** The index here is one-based instead of zero-based.
      *
-     * @return mixed|null
+     * @return mixed
      */
     public static function getSegment(int $index)
     {
@@ -808,7 +781,7 @@ public static function getSegments(): array
      * Gets a single command-line option. Returns TRUE if the option
      * exists, but doesn't have a value, and is simply acting as a flag.
      *
-     * @return bool|mixed|null
+     * @return mixed
      */
     public static function getOption(string $name)
     {
@@ -870,8 +843,6 @@ public static function getOptionString(bool $useLongOpts = false, bool $trim = f
      *
      * @param array $tbody List of rows
      * @param array $thead List of columns
-     *
-     * @return void
      */
     public static function table(array $tbody, array $thead = [])
     {
@@ -969,8 +940,6 @@ public static function table(array $tbody, array $thead = [])
      * solution down the road.
      *
      * @param resource $handle
-     *
-     * @return void
      */
     protected static function fwrite($handle, string $string)
     {
diff --git a/system/CLI/Commands.php b/system/CLI/Commands.php
index 872b7b103b9d..3f84f33d918f 100644
--- a/system/CLI/Commands.php
+++ b/system/CLI/Commands.php
@@ -76,8 +76,6 @@ public function getCommands()
     /**
      * Discovers all commands in the framework and within user code,
      * and collects instances of them to work with.
-     *
-     * @return void
      */
     public function discoverCommands()
     {
diff --git a/system/CLI/Console.php b/system/CLI/Console.php
index dfbd5e2ad162..0bf8a0f7ce0a 100644
--- a/system/CLI/Console.php
+++ b/system/CLI/Console.php
@@ -12,9 +12,6 @@
 namespace CodeIgniter\CLI;
 
 use CodeIgniter\CodeIgniter;
-use CodeIgniter\HTTP\RequestInterface;
-use CodeIgniter\HTTP\Response;
-use CodeIgniter\HTTP\ResponseInterface;
 use Exception;
 
 /**
@@ -29,9 +26,6 @@ class Console
      */
     protected $app;
 
-    /**
-     * Console constructor.
-     */
     public function __construct(CodeIgniter $app)
     {
         $this->app = $app;
@@ -42,7 +36,7 @@ public function __construct(CodeIgniter $app)
      *
      * @throws Exception
      *
-     * @return mixed|RequestInterface|Response|ResponseInterface
+     * @return mixed
      */
     public function run(bool $useSafeOutput = false)
     {
diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php
index 2e1e1ca04bf0..b0668a49f4d2 100644
--- a/system/CLI/GeneratorTrait.php
+++ b/system/CLI/GeneratorTrait.php
@@ -228,8 +228,6 @@ protected function qualifyClassName(): string
     /**
      * Gets the generator view as defined in the `Config\Generators::$views`,
      * with fallback to `$template` when the defined view does not exist.
-     *
-     * @param array $data Data to be passed to the view.
      */
     protected function renderTemplate(array $data = []): string
     {
diff --git a/system/Cache/CacheFactory.php b/system/Cache/CacheFactory.php
index 3ca101ff9d8c..720fae0e4c6c 100644
--- a/system/Cache/CacheFactory.php
+++ b/system/Cache/CacheFactory.php
@@ -16,8 +16,6 @@
 use Config\Cache;
 
 /**
- * Class Cache
- *
  * A factory for loading the desired
  */
 class CacheFactory
diff --git a/system/Cache/Handlers/DummyHandler.php b/system/Cache/Handlers/DummyHandler.php
index 99158038ebc7..fd4f1b503111 100644
--- a/system/Cache/Handlers/DummyHandler.php
+++ b/system/Cache/Handlers/DummyHandler.php
@@ -19,18 +19,14 @@
 class DummyHandler extends BaseHandler
 {
     /**
-     * Takes care of any handler-specific setup that must be done.
+     * {@inheritDoc}
      */
     public function initialize()
     {
     }
 
     /**
-     * Attempts to fetch an item from the cache store.
-     *
-     * @param string $key Cache item name
-     *
-     * @return null
+     * {@inheritDoc}
      */
     public function get(string $key)
     {
@@ -38,13 +34,7 @@ public function get(string $key)
     }
 
     /**
-     * Get an item from the cache, or execute the given Closure and store the result.
-     *
-     * @param string  $key      Cache item name
-     * @param int     $ttl      Time to live
-     * @param Closure $callback Callback return value
-     *
-     * @return null
+     * {@inheritDoc}
      */
     public function remember(string $key, int $ttl, Closure $callback)
     {
@@ -52,13 +42,7 @@ public function remember(string $key, int $ttl, Closure $callback)
     }
 
     /**
-     * Saves an item to the cache store.
-     *
-     * @param string $key   Cache item name
-     * @param mixed  $value The data to save
-     * @param int    $ttl   Time To Live, in seconds (default 60)
-     *
-     * @return bool Success or failure
+     * {@inheritDoc}
      */
     public function save(string $key, $value, int $ttl = 60)
     {
@@ -66,11 +50,7 @@ public function save(string $key, $value, int $ttl = 60)
     }
 
     /**
-     * Deletes a specific item from the cache store.
-     *
-     * @param string $key Cache item name
-     *
-     * @return bool Success or failure
+     * {@inheritDoc}
      */
     public function delete(string $key)
     {
@@ -78,11 +58,7 @@ public function delete(string $key)
     }
 
     /**
-     * Deletes items from the cache store matching a given pattern.
-     *
-     * @param string $pattern Cache items glob-style pattern
-     *
-     * @return int The number of deleted items
+     * {@inheritDoc}
      */
     public function deleteMatching(string $pattern)
     {
@@ -90,12 +66,7 @@ public function deleteMatching(string $pattern)
     }
 
     /**
-     * Performs atomic incrementation of a raw stored value.
-     *
-     * @param string $key    Cache ID
-     * @param int    $offset Step/value to increase by
-     *
-     * @return bool
+     * {@inheritDoc}
      */
     public function increment(string $key, int $offset = 1)
     {
@@ -103,12 +74,7 @@ public function increment(string $key, int $offset = 1)
     }
 
     /**
-     * Performs atomic decrementation of a raw stored value.
-     *
-     * @param string $key    Cache ID
-     * @param int    $offset Step/value to increase by
-     *
-     * @return bool
+     * {@inheritDoc}
      */
     public function decrement(string $key, int $offset = 1)
     {
@@ -116,9 +82,7 @@ public function decrement(string $key, int $offset = 1)
     }
 
     /**
-     * Will delete all items in the entire cache.
-     *
-     * @return bool Success or failure
+     * {@inheritDoc}
      */
     public function clean()
     {
@@ -126,12 +90,7 @@ public function clean()
     }
 
     /**
-     * Returns information on the entire cache.
-     *
-     * The information returned and the structure of the data
-     * varies depending on the handler.
-     *
-     * @return null
+     * {@inheritDoc}
      */
     public function getCacheInfo()
     {
@@ -139,11 +98,7 @@ public function getCacheInfo()
     }
 
     /**
-     * Returns detailed information about the specific item in the cache.
-     *
-     * @param string $key Cache item name.
-     *
-     * @return null
+     * {@inheritDoc}
      */
     public function getMetaData(string $key)
     {
@@ -151,7 +106,7 @@ public function getMetaData(string $key)
     }
 
     /**
-     * Determines if the driver is supported on this system.
+     * {@inheritDoc}
      */
     public function isSupported(): bool
     {
diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php
index 8dec7c62fb3f..db2e5d6574ee 100644
--- a/system/Cache/Handlers/FileHandler.php
+++ b/system/Cache/Handlers/FileHandler.php
@@ -43,8 +43,6 @@ class FileHandler extends BaseHandler
     protected $mode;
 
     /**
-     * Constructor.
-     *
      * @throws CacheException
      */
     public function __construct(Cache $config)
@@ -68,18 +66,14 @@ public function __construct(Cache $config)
     }
 
     /**
-     * Takes care of any handler-specific setup that must be done.
+     * {@inheritDoc}
      */
     public function initialize()
     {
     }
 
     /**
-     * Attempts to fetch an item from the cache store.
-     *
-     * @param string $key Cache item name
-     *
-     * @return mixed
+     * {@inheritDoc}
      */
     public function get(string $key)
     {
@@ -90,13 +84,7 @@ public function get(string $key)
     }
 
     /**
-     * Saves an item to the cache store.
-     *
-     * @param string $key   Cache item name
-     * @param mixed  $value The data to save
-     * @param int    $ttl   Time To Live, in seconds (default 60)
-     *
-     * @return bool Success or failure
+     * {@inheritDoc}
      */
     public function save(string $key, $value, int $ttl = 60)
     {
@@ -111,12 +99,12 @@ public function save(string $key, $value, int $ttl = 60)
         if ($this->writeFile($this->path . $key, serialize($contents))) {
             try {
                 chmod($this->path . $key, $this->mode);
-            }
-            // @codeCoverageIgnoreStart
-            catch (Throwable $e) {
+
+                // @codeCoverageIgnoreStart
+            } catch (Throwable $e) {
                 log_message('debug', 'Failed to set mode on cache file: ' . $e->getMessage());
+                // @codeCoverageIgnoreEnd
             }
-            // @codeCoverageIgnoreEnd
 
             return true;
         }
@@ -125,11 +113,7 @@ public function save(string $key, $value, int $ttl = 60)
     }
 
     /**
-     * Deletes a specific item from the cache store.
-     *
-     * @param string $key Cache item name
-     *
-     * @return bool Success or failure
+     * {@inheritDoc}
      */
     public function delete(string $key)
     {
@@ -139,11 +123,7 @@ public function delete(string $key)
     }
 
     /**
-     * Deletes items from the cache store matching a given pattern.
-     *
-     * @param string $pattern Cache items glob-style pattern
-     *
-     * @return int The number of deleted items
+     * {@inheritDoc}
      */
     public function deleteMatching(string $pattern)
     {
@@ -159,12 +139,7 @@ public function deleteMatching(string $pattern)
     }
 
     /**
-     * Performs atomic incrementation of a raw stored value.
-     *
-     * @param string $key    Cache ID
-     * @param int    $offset Step/value to increase by
-     *
-     * @return bool
+     * {@inheritDoc}
      */
     public function increment(string $key, int $offset = 1)
     {
@@ -186,12 +161,7 @@ public function increment(string $key, int $offset = 1)
     }
 
     /**
-     * Performs atomic decrementation of a raw stored value.
-     *
-     * @param string $key    Cache ID
-     * @param int    $offset Step/value to increase by
-     *
-     * @return bool
+     * {@inheritDoc}
      */
     public function decrement(string $key, int $offset = 1)
     {
@@ -213,9 +183,7 @@ public function decrement(string $key, int $offset = 1)
     }
 
     /**
-     * Will delete all items in the entire cache.
-     *
-     * @return bool Success or failure
+     * {@inheritDoc}
      */
     public function clean()
     {
@@ -223,12 +191,7 @@ public function clean()
     }
 
     /**
-     * Returns information on the entire cache.
-     *
-     * The information returned and the structure of the data
-     * varies depending on the handler.
-     *
-     * @return array|false
+     * {@inheritDoc}
      */
     public function getCacheInfo()
     {
@@ -236,14 +199,7 @@ public function getCacheInfo()
     }
 
     /**
-     * Returns detailed information about the specific item in the cache.
-     *
-     * @param string $key Cache item name.
-     *
-     * @return array|false|null
-     *                          Returns null if the item does not exist, otherwise array<string, mixed>
-     *                          with at least the 'expire' key for absolute epoch expiry (or null).
-     *                          Some handlers may return false when an item does not exist, which is deprecated.
+     * {@inheritDoc}
      */
     public function getMetaData(string $key)
     {
@@ -261,7 +217,7 @@ public function getMetaData(string $key)
     }
 
     /**
-     * Determines if the driver is supported on this system.
+     * {@inheritDoc}
      */
     public function isSupported(): bool
     {
@@ -272,7 +228,7 @@ public function isSupported(): bool
      * Does the heavy lifting of actually retrieving the file and
      * verifying it's age.
      *
-     * @return bool|mixed
+     * @return mixed
      */
     protected function getItem(string $filename)
     {
@@ -328,8 +284,6 @@ protected function writeFile($path, $data, $mode = 'wb')
     }
 
     /**
-     * Delete Files
-     *
      * Deletes all files contained in the supplied directory path.
      * Files must be writable or owned by the system in order to be deleted.
      * If the second parameter is set to TRUE, any directories contained
@@ -365,8 +319,6 @@ protected function deleteFiles(string $path, bool $delDir = false, bool $htdocs
     }
 
     /**
-     * Get Directory File Information
-     *
      * Reads the specified directory and builds an array containing the filenames,
      * filesize, dates, and permissions
      *
@@ -409,8 +361,6 @@ protected function getDirFileInfo(string $sourceDir, bool $topLevelOnly = true,
     }
 
     /**
-     * Get File Info
-     *
      * Given a file and path, returns the name, path, size, date modified
      * Second parameter allows you to explicitly declare what information you want returned
      * Options are: name, server_path, size, date, readable, writable, executable, fileperms
diff --git a/system/Cache/Handlers/MemcachedHandler.php b/system/Cache/Handlers/MemcachedHandler.php
index 56f6579ced31..07cd85b3a29a 100644
--- a/system/Cache/Handlers/MemcachedHandler.php
+++ b/system/Cache/Handlers/MemcachedHandler.php
@@ -41,9 +41,6 @@ class MemcachedHandler extends BaseHandler
         'raw'    => false,
     ];
 
-    /**
-     * Constructor.
-     */
     public function __construct(Cache $config)
     {
         $this->prefix = $config->prefix;
@@ -54,8 +51,6 @@ public function __construct(Cache $config)
     }
 
     /**
-     * Class destructor
-     *
      * Closes the connection to Memcache(d) if present.
      */
     public function __destruct()
@@ -68,12 +63,10 @@ public function __destruct()
     }
 
     /**
-     * Takes care of any handler-specific setup that must be done.
+     * {@inheritDoc}
      */
     public function initialize()
     {
-        // Try to connect to Memcache or Memcached, if an issue occurs throw a CriticalError exception,
-        // so that the CacheFactory can attempt to initiate the next cache handler.
         try {
             if (class_exists(Memcached::class)) {
                 // Create new instance of Memcached
@@ -130,11 +123,7 @@ public function initialize()
     }
 
     /**
-     * Attempts to fetch an item from the cache store.
-     *
-     * @param string $key Cache item name
-     *
-     * @return mixed
+     * {@inheritDoc}
      */
     public function get(string $key)
     {
@@ -161,13 +150,7 @@ public function get(string $key)
     }
 
     /**
-     * Saves an item to the cache store.
-     *
-     * @param string $key   Cache item name
-     * @param mixed  $value The data to save
-     * @param int    $ttl   Time To Live, in seconds (default 60)
-     *
-     * @return bool Success or failure
+     * {@inheritDoc}
      */
     public function save(string $key, $value, int $ttl = 60)
     {
@@ -194,11 +177,7 @@ public function save(string $key, $value, int $ttl = 60)
     }
 
     /**
-     * Deletes a specific item from the cache store.
-     *
-     * @param string $key Cache item name
-     *
-     * @return bool Success or failure
+     * {@inheritDoc}
      */
     public function delete(string $key)
     {
@@ -208,11 +187,7 @@ public function delete(string $key)
     }
 
     /**
-     * Deletes items from the cache store matching a given pattern.
-     *
-     * @param string $pattern Cache items glob-style pattern
-     *
-     * @throws Exception
+     * {@inheritDoc}
      */
     public function deleteMatching(string $pattern)
     {
@@ -220,12 +195,7 @@ public function deleteMatching(string $pattern)
     }
 
     /**
-     * Performs atomic incrementation of a raw stored value.
-     *
-     * @param string $key    Cache ID
-     * @param int    $offset Step/value to increase by
-     *
-     * @return false|int
+     * {@inheritDoc}
      */
     public function increment(string $key, int $offset = 1)
     {
@@ -240,12 +210,7 @@ public function increment(string $key, int $offset = 1)
     }
 
     /**
-     * Performs atomic decrementation of a raw stored value.
-     *
-     * @param string $key    Cache ID
-     * @param int    $offset Step/value to increase by
-     *
-     * @return false|int
+     * {@inheritDoc}
      */
     public function decrement(string $key, int $offset = 1)
     {
@@ -261,9 +226,7 @@ public function decrement(string $key, int $offset = 1)
     }
 
     /**
-     * Will delete all items in the entire cache.
-     *
-     * @return bool Success or failure
+     * {@inheritDoc}
      */
     public function clean()
     {
@@ -271,12 +234,7 @@ public function clean()
     }
 
     /**
-     * Returns information on the entire cache.
-     *
-     * The information returned and the structure of the data
-     * varies depending on the handler.
-     *
-     * @return array|false
+     * {@inheritDoc}
      */
     public function getCacheInfo()
     {
@@ -284,14 +242,7 @@ public function getCacheInfo()
     }
 
     /**
-     * Returns detailed information about the specific item in the cache.
-     *
-     * @param string $key Cache item name.
-     *
-     * @return array|false|null
-     *                          Returns null if the item does not exist, otherwise array<string, mixed>
-     *                          with at least the 'expire' key for absolute epoch expiry (or null).
-     *                          Some handlers may return false when an item does not exist, which is deprecated.
+     * {@inheritDoc}
      */
     public function getMetaData(string $key)
     {
@@ -313,7 +264,7 @@ public function getMetaData(string $key)
     }
 
     /**
-     * Determines if the driver is supported on this system.
+     * {@inheritDoc}
      */
     public function isSupported(): bool
     {
diff --git a/system/Cache/Handlers/PredisHandler.php b/system/Cache/Handlers/PredisHandler.php
index 100c19f8f292..374b3895ed05 100644
--- a/system/Cache/Handlers/PredisHandler.php
+++ b/system/Cache/Handlers/PredisHandler.php
@@ -42,9 +42,6 @@ class PredisHandler extends BaseHandler
      */
     protected $redis;
 
-    /**
-     * Constructor.
-     */
     public function __construct(Cache $config)
     {
         $this->prefix = $config->prefix;
@@ -55,30 +52,20 @@ public function __construct(Cache $config)
     }
 
     /**
-     * Takes care of any handler-specific setup that must be done.
+     * {@inheritDoc}
      */
     public function initialize()
     {
-        // Try to connect to Redis, if an issue occurs throw a CriticalError exception,
-        // so that the CacheFactory can attempt to initiate the next cache handler.
         try {
-            // Create a new instance of Predis\Client
             $this->redis = new Client($this->config, ['prefix' => $this->prefix]);
-
-            // Check if the connection is valid by trying to get the time.
             $this->redis->time();
         } catch (Exception $e) {
-            // thrown if can't connect to redis server.
             throw new CriticalError('Cache: Predis connection refused (' . $e->getMessage() . ').');
         }
     }
 
     /**
-     * Attempts to fetch an item from the cache store.
-     *
-     * @param string $key Cache item name
-     *
-     * @return mixed
+     * {@inheritDoc}
      */
     public function get(string $key)
     {
@@ -112,13 +99,7 @@ public function get(string $key)
     }
 
     /**
-     * Saves an item to the cache store.
-     *
-     * @param string $key   Cache item name
-     * @param mixed  $value The data to save
-     * @param int    $ttl   Time To Live, in seconds (default 60)
-     *
-     * @return bool Success or failure
+     * {@inheritDoc}
      */
     public function save(string $key, $value, int $ttl = 60)
     {
@@ -152,11 +133,7 @@ public function save(string $key, $value, int $ttl = 60)
     }
 
     /**
-     * Deletes a specific item from the cache store.
-     *
-     * @param string $key Cache item name
-     *
-     * @return bool Success or failure
+     * {@inheritDoc}
      */
     public function delete(string $key)
     {
@@ -166,11 +143,7 @@ public function delete(string $key)
     }
 
     /**
-     * Deletes items from the cache store matching a given pattern.
-     *
-     * @param string $pattern Cache items glob-style pattern
-     *
-     * @return int The number of deleted items
+     * {@inheritDoc}
      */
     public function deleteMatching(string $pattern)
     {
@@ -184,12 +157,7 @@ public function deleteMatching(string $pattern)
     }
 
     /**
-     * Performs atomic incrementation of a raw stored value.
-     *
-     * @param string $key    Cache ID
-     * @param int    $offset Step/value to increase by
-     *
-     * @return int
+     * {@inheritDoc}
      */
     public function increment(string $key, int $offset = 1)
     {
@@ -199,12 +167,7 @@ public function increment(string $key, int $offset = 1)
     }
 
     /**
-     * Performs atomic decrementation of a raw stored value.
-     *
-     * @param string $key    Cache ID
-     * @param int    $offset Step/value to increase by
-     *
-     * @return int
+     * {@inheritDoc}
      */
     public function decrement(string $key, int $offset = 1)
     {
@@ -214,9 +177,7 @@ public function decrement(string $key, int $offset = 1)
     }
 
     /**
-     * Will delete all items in the entire cache.
-     *
-     * @return bool Success or failure
+     * {@inheritDoc}
      */
     public function clean()
     {
@@ -224,12 +185,7 @@ public function clean()
     }
 
     /**
-     * Returns information on the entire cache.
-     *
-     * The information returned and the structure of the data
-     * varies depending on the handler.
-     *
-     * @return array
+     * {@inheritDoc}
      */
     public function getCacheInfo()
     {
@@ -237,13 +193,7 @@ public function getCacheInfo()
     }
 
     /**
-     * Returns detailed information about the specific item in the cache.
-     *
-     * @param string $key Cache item name.
-     *
-     * @return array|false|null
-     *                          Returns null if the item does not exist, otherwise array<string, mixed>
-     *                          with at least the 'expire' key for absolute epoch expiry (or null).
+     * {@inheritDoc}
      */
     public function getMetaData(string $key)
     {
@@ -266,10 +216,10 @@ public function getMetaData(string $key)
     }
 
     /**
-     * Determines if the driver is supported on this system.
+     * {@inheritDoc}
      */
     public function isSupported(): bool
     {
-        return class_exists('\Predis\Client');
+        return class_exists('Predis\Client');
     }
 }
diff --git a/system/Cache/Handlers/RedisHandler.php b/system/Cache/Handlers/RedisHandler.php
index bf39e1f7b7ae..553825f615e8 100644
--- a/system/Cache/Handlers/RedisHandler.php
+++ b/system/Cache/Handlers/RedisHandler.php
@@ -41,9 +41,6 @@ class RedisHandler extends BaseHandler
      */
     protected $redis;
 
-    /**
-     * Constructor.
-     */
     public function __construct(Cache $config)
     {
         $this->prefix = $config->prefix;
@@ -54,8 +51,6 @@ public function __construct(Cache $config)
     }
 
     /**
-     * Class destructor
-     *
      * Closes the connection to Redis if present.
      */
     public function __destruct()
@@ -66,7 +61,7 @@ public function __destruct()
     }
 
     /**
-     * Takes care of any handler-specific setup that must be done.
+     * {@inheritDoc}
      */
     public function initialize()
     {
@@ -74,8 +69,6 @@ public function initialize()
 
         $this->redis = new Redis();
 
-        // Try to connect to Redis, if an issue occurs throw a CriticalError exception,
-        // so that the CacheFactory can attempt to initiate the next cache handler.
         try {
             // Note:: If Redis is your primary cache choice, and it is "offline", every page load will end up been delayed by the timeout duration.
             // I feel like some sort of temporary flag should be set, to indicate that we think Redis is "offline", allowing us to bypass the timeout for a set period of time.
@@ -99,18 +92,12 @@ public function initialize()
                 throw new CriticalError('Cache: Redis select database failed.');
             }
         } catch (RedisException $e) {
-            // $this->redis->connect() can sometimes throw a RedisException.
-            // We need to convert the exception into a CriticalError exception and throw it.
             throw new CriticalError('Cache: RedisException occurred with message (' . $e->getMessage() . ').');
         }
     }
 
     /**
-     * Attempts to fetch an item from the cache store.
-     *
-     * @param string $key Cache item name
-     *
-     * @return mixed
+     * {@inheritDoc}
      */
     public function get(string $key)
     {
@@ -140,13 +127,7 @@ public function get(string $key)
     }
 
     /**
-     * Saves an item to the cache store.
-     *
-     * @param string $key   Cache item name
-     * @param mixed  $value The data to save
-     * @param int    $ttl   Time To Live, in seconds (default 60)
-     *
-     * @return bool Success or failure
+     * {@inheritDoc}
      */
     public function save(string $key, $value, int $ttl = 60)
     {
@@ -182,11 +163,7 @@ public function save(string $key, $value, int $ttl = 60)
     }
 
     /**
-     * Deletes a specific item from the cache store.
-     *
-     * @param string $key Cache item name
-     *
-     * @return bool Success or failure
+     * {@inheritDoc}
      */
     public function delete(string $key)
     {
@@ -196,11 +173,7 @@ public function delete(string $key)
     }
 
     /**
-     * Deletes items from the cache store matching a given pattern.
-     *
-     * @param string $pattern Cache items glob-style pattern
-     *
-     * @return int The number of deleted items
+     * {@inheritDoc}
      */
     public function deleteMatching(string $pattern)
     {
@@ -223,12 +196,7 @@ public function deleteMatching(string $pattern)
     }
 
     /**
-     * Performs atomic incrementation of a raw stored value.
-     *
-     * @param string $key    Cache ID
-     * @param int    $offset Step/value to increase by
-     *
-     * @return int
+     * {@inheritDoc}
      */
     public function increment(string $key, int $offset = 1)
     {
@@ -238,12 +206,7 @@ public function increment(string $key, int $offset = 1)
     }
 
     /**
-     * Performs atomic decrementation of a raw stored value.
-     *
-     * @param string $key    Cache ID
-     * @param int    $offset Step/value to increase by
-     *
-     * @return int
+     * {@inheritDoc}
      */
     public function decrement(string $key, int $offset = 1)
     {
@@ -253,9 +216,7 @@ public function decrement(string $key, int $offset = 1)
     }
 
     /**
-     * Will delete all items in the entire cache.
-     *
-     * @return bool Success or failure
+     * {@inheritDoc}
      */
     public function clean()
     {
@@ -263,12 +224,7 @@ public function clean()
     }
 
     /**
-     * Returns information on the entire cache.
-     *
-     * The information returned and the structure of the data
-     * varies depending on the handler.
-     *
-     * @return array
+     * {@inheritDoc}
      */
     public function getCacheInfo()
     {
@@ -276,13 +232,7 @@ public function getCacheInfo()
     }
 
     /**
-     * Returns detailed information about the specific item in the cache.
-     *
-     * @param string $key Cache item name.
-     *
-     * @return array|null
-     *                    Returns null if the item does not exist, otherwise array<string, mixed>
-     *                    with at least the 'expire' key for absolute epoch expiry (or null).
+     * {@inheritDoc}
      */
     public function getMetaData(string $key)
     {
@@ -304,7 +254,7 @@ public function getMetaData(string $key)
     }
 
     /**
-     * Determines if the driver is supported on this system.
+     * {@inheritDoc}
      */
     public function isSupported(): bool
     {
diff --git a/system/Cache/Handlers/WincacheHandler.php b/system/Cache/Handlers/WincacheHandler.php
index 58062292941a..368408af7217 100644
--- a/system/Cache/Handlers/WincacheHandler.php
+++ b/system/Cache/Handlers/WincacheHandler.php
@@ -21,27 +21,20 @@
  */
 class WincacheHandler extends BaseHandler
 {
-    /**
-     * Constructor.
-     */
     public function __construct(Cache $config)
     {
         $this->prefix = $config->prefix;
     }
 
     /**
-     * Takes care of any handler-specific setup that must be done.
+     * {@inheritDoc}
      */
     public function initialize()
     {
     }
 
     /**
-     * Attempts to fetch an item from the cache store.
-     *
-     * @param string $key Cache item name
-     *
-     * @return mixed
+     * {@inheritDoc}
      */
     public function get(string $key)
     {
@@ -55,13 +48,7 @@ public function get(string $key)
     }
 
     /**
-     * Saves an item to the cache store.
-     *
-     * @param string $key   Cache item name
-     * @param mixed  $value The data to save
-     * @param int    $ttl   Time To Live, in seconds (default 60)
-     *
-     * @return bool Success or failure
+     * {@inheritDoc}
      */
     public function save(string $key, $value, int $ttl = 60)
     {
@@ -71,11 +58,7 @@ public function save(string $key, $value, int $ttl = 60)
     }
 
     /**
-     * Deletes a specific item from the cache store.
-     *
-     * @param string $key Cache item name
-     *
-     * @return bool Success or failure
+     * {@inheritDoc}
      */
     public function delete(string $key)
     {
@@ -85,11 +68,7 @@ public function delete(string $key)
     }
 
     /**
-     * Deletes items from the cache store matching a given pattern.
-     *
-     * @param string $pattern Cache items glob-style pattern
-     *
-     * @throws Exception
+     * {@inheritDoc}
      */
     public function deleteMatching(string $pattern)
     {
@@ -97,12 +76,7 @@ public function deleteMatching(string $pattern)
     }
 
     /**
-     * Performs atomic incrementation of a raw stored value.
-     *
-     * @param string $key    Cache ID
-     * @param int    $offset Step/value to increase by
-     *
-     * @return false|int
+     * {@inheritDoc}
      */
     public function increment(string $key, int $offset = 1)
     {
@@ -112,12 +86,7 @@ public function increment(string $key, int $offset = 1)
     }
 
     /**
-     * Performs atomic decrementation of a raw stored value.
-     *
-     * @param string $key    Cache ID
-     * @param int    $offset Step/value to increase by
-     *
-     * @return false|int
+     * {@inheritDoc}
      */
     public function decrement(string $key, int $offset = 1)
     {
@@ -127,9 +96,7 @@ public function decrement(string $key, int $offset = 1)
     }
 
     /**
-     * Will delete all items in the entire cache.
-     *
-     * @return bool Success or failure
+     * {@inheritDoc}
      */
     public function clean()
     {
@@ -137,12 +104,7 @@ public function clean()
     }
 
     /**
-     * Returns information on the entire cache.
-     *
-     * The information returned and the structure of the data
-     * varies depending on the handler.
-     *
-     * @return array|false
+     * {@inheritDoc}
      */
     public function getCacheInfo()
     {
@@ -150,14 +112,7 @@ public function getCacheInfo()
     }
 
     /**
-     * Returns detailed information about the specific item in the cache.
-     *
-     * @param string $key Cache item name.
-     *
-     * @return array|false|null
-     *                          Returns null if the item does not exist, otherwise array<string, mixed>
-     *                          with at least the 'expire' key for absolute epoch expiry (or null).
-     *                          Some handlers may return false when an item does not exist, which is deprecated.
+     * {@inheritDoc}
      */
     public function getMetaData(string $key)
     {
@@ -180,7 +135,7 @@ public function getMetaData(string $key)
     }
 
     /**
-     * Determines if the driver is supported on this system.
+     * {@inheritDoc}
      */
     public function isSupported(): bool
     {
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index ffb52e86a503..7034f710b8ac 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -194,8 +194,6 @@ public function initialize()
      *
      * @throws FrameworkException
      *
-     * @return void
-     *
      * @codeCoverageIgnore
      */
     protected function resolvePlatformExtensions()
@@ -609,8 +607,6 @@ public function displayCache(Cache $config)
 
     /**
      * Tells the app that the final output should be cached.
-     *
-     * @return void
      */
     public static function cache(int $time)
     {
diff --git a/system/Commands/Database/CreateDatabase.php b/system/Commands/Database/CreateDatabase.php
index c442c5bea785..17e1e51bb68b 100644
--- a/system/Commands/Database/CreateDatabase.php
+++ b/system/Commands/Database/CreateDatabase.php
@@ -72,8 +72,6 @@ class CreateDatabase extends BaseCommand
 
     /**
      * Creates a new database.
-     *
-     * @return void
      */
     public function run(array $params)
     {
diff --git a/system/Commands/Database/Migrate.php b/system/Commands/Database/Migrate.php
index 095e9927223a..91a699b346d6 100644
--- a/system/Commands/Database/Migrate.php
+++ b/system/Commands/Database/Migrate.php
@@ -63,8 +63,6 @@ class Migrate extends BaseCommand
 
     /**
      * Ensures that all migrations have been run.
-     *
-     * @return void
      */
     public function run(array $params)
     {
@@ -77,12 +75,9 @@ public function run(array $params)
         $group     = $params['g'] ?? CLI::getOption('g');
 
         try {
-            // Check for 'all' namespaces
             if (array_key_exists('all', $params) || CLI::getOption('all')) {
                 $runner->setNamespace(null);
-            }
-            // Check for a specified namespace
-            elseif ($namespace) {
+            } elseif ($namespace) {
                 $runner->setNamespace($namespace);
             }
 
@@ -97,11 +92,11 @@ public function run(array $params)
             }
 
             CLI::write('Done migrations.', 'green');
-        }
-        // @codeCoverageIgnoreStart
-        catch (Throwable $e) {
+
+            // @codeCoverageIgnoreStart
+        } catch (Throwable $e) {
             $this->showError($e);
+            // @codeCoverageIgnoreEnd
         }
-        // @codeCoverageIgnoreEnd
     }
 }
diff --git a/system/Commands/Database/MigrateRefresh.php b/system/Commands/Database/MigrateRefresh.php
index 27c59f499865..689c75424f80 100644
--- a/system/Commands/Database/MigrateRefresh.php
+++ b/system/Commands/Database/MigrateRefresh.php
@@ -64,8 +64,6 @@ class MigrateRefresh extends BaseCommand
     /**
      * Does a rollback followed by a latest to refresh the current state
      * of the database.
-     *
-     * @return void
      */
     public function run(array $params)
     {
diff --git a/system/Commands/Database/MigrateRollback.php b/system/Commands/Database/MigrateRollback.php
index 9f67808d175c..17434da4b56d 100644
--- a/system/Commands/Database/MigrateRollback.php
+++ b/system/Commands/Database/MigrateRollback.php
@@ -65,8 +65,6 @@ class MigrateRollback extends BaseCommand
     /**
      * Runs all of the migrations in reverse order, until they have
      * all been unapplied.
-     *
-     * @return void
      */
     public function run(array $params)
     {
@@ -102,11 +100,11 @@ public function run(array $params)
             }
 
             CLI::write('Done rolling back migrations.', 'green');
-        }
-        // @codeCoverageIgnoreStart
-        catch (Throwable $e) {
+
+            // @codeCoverageIgnoreStart
+        } catch (Throwable $e) {
             $this->showError($e);
+            // @codeCoverageIgnoreEnd
         }
-        // @codeCoverageIgnoreEnd
     }
 }
diff --git a/system/Commands/Database/MigrateStatus.php b/system/Commands/Database/MigrateStatus.php
index 28144cd1d144..91b52950b2b4 100644
--- a/system/Commands/Database/MigrateStatus.php
+++ b/system/Commands/Database/MigrateStatus.php
@@ -76,8 +76,6 @@ class MigrateStatus extends BaseCommand
      * Displays a list of all migrations and whether they've been run or not.
      *
      * @param array<string, mixed> $params
-     *
-     * @return void
      */
     public function run(array $params)
     {
diff --git a/system/Commands/Database/Seed.php b/system/Commands/Database/Seed.php
index b71b954e8c1b..adfdd0a5f701 100644
--- a/system/Commands/Database/Seed.php
+++ b/system/Commands/Database/Seed.php
@@ -63,8 +63,6 @@ class Seed extends BaseCommand
 
     /**
      * Passes to Seeder to populate the database.
-     *
-     * @return void
      */
     public function run(array $params)
     {
diff --git a/system/Commands/Encryption/GenerateKey.php b/system/Commands/Encryption/GenerateKey.php
index 23555b4e6d9a..c43713efe893 100644
--- a/system/Commands/Encryption/GenerateKey.php
+++ b/system/Commands/Encryption/GenerateKey.php
@@ -63,8 +63,6 @@ class GenerateKey extends BaseCommand
 
     /**
      * Actually execute the command.
-     *
-     * @return void
      */
     public function run(array $params)
     {
@@ -72,9 +70,7 @@ public function run(array $params)
         if (in_array($prefix, [null, true], true)) {
             $prefix = 'hex2bin';
         } elseif (! in_array($prefix, ['hex2bin', 'base64'], true)) {
-            // @codeCoverageIgnoreStart
-            $prefix = CLI::prompt('Please provide a valid prefix to use.', ['hex2bin', 'base64'], 'required');
-            // @codeCoverageIgnoreEnd
+            $prefix = CLI::prompt('Please provide a valid prefix to use.', ['hex2bin', 'base64'], 'required'); // @codeCoverageIgnore
         }
 
         $length = $params['length'] ?? CLI::getOption('length');
diff --git a/system/Commands/Housekeeping/ClearDebugbar.php b/system/Commands/Housekeeping/ClearDebugbar.php
index ee7986466295..da6f76a47b55 100644
--- a/system/Commands/Housekeeping/ClearDebugbar.php
+++ b/system/Commands/Housekeeping/ClearDebugbar.php
@@ -50,8 +50,6 @@ class ClearDebugbar extends BaseCommand
 
     /**
      * Actually runs the command.
-     *
-     * @return void
      */
     public function run(array $params)
     {
diff --git a/system/Commands/Server/Serve.php b/system/Commands/Server/Serve.php
index 4d1d64e6c071..2dc9e5ddc8d8 100644
--- a/system/Commands/Server/Serve.php
+++ b/system/Commands/Server/Serve.php
@@ -85,10 +85,6 @@ class Serve extends BaseCommand
 
     /**
      * Run the server
-     *
-     * @param array $params Parameters
-     *
-     * @return void
      */
     public function run(array $params)
     {
diff --git a/system/Commands/Utilities/Environment.php b/system/Commands/Utilities/Environment.php
index b9081742d4ac..5586de575dbd 100644
--- a/system/Commands/Utilities/Environment.php
+++ b/system/Commands/Utilities/Environment.php
@@ -79,10 +79,6 @@ final class Environment extends BaseCommand
 
     /**
      * {@inheritDoc}
-     *
-     * @param array<string, mixed> $params
-     *
-     * @return void
      */
     public function run(array $params)
     {
diff --git a/system/ComposerScripts.php b/system/ComposerScripts.php
index 791b4506db6d..6972395b5444 100644
--- a/system/ComposerScripts.php
+++ b/system/ComposerScripts.php
@@ -63,8 +63,6 @@ final class ComposerScripts
     /**
      * This static method is called by Composer after every update event,
      * i.e., `composer install`, `composer update`, `composer remove`.
-     *
-     * @return void
      */
     public static function postUpdate()
     {
diff --git a/system/Config/BaseConfig.php b/system/Config/BaseConfig.php
index d06b930d65b3..c543492f3348 100644
--- a/system/Config/BaseConfig.php
+++ b/system/Config/BaseConfig.php
@@ -168,9 +168,7 @@ protected function registerProperties()
         foreach (static::$registrars as $callable) {
             // ignore non-applicable registrars
             if (! method_exists($callable, $shortName)) {
-                // @codeCoverageIgnoreStart
-                continue;
-                // @codeCoverageIgnoreEnd
+                continue; // @codeCoverageIgnore
             }
 
             $properties = $callable::$shortName();
diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
index d67af9304176..d390807fc51f 100644
--- a/system/Config/BaseService.php
+++ b/system/Config/BaseService.php
@@ -269,8 +269,6 @@ public static function serviceExists(string $name): ?string
 
     /**
      * Reset shared instances and mocks for testing.
-     *
-     * @param bool $initAutoloader Initializes autoloader instance
      */
     public static function reset(bool $initAutoloader = false)
     {
diff --git a/system/Config/Config.php b/system/Config/Config.php
index 6f52869b5a76..307f7ad82288 100644
--- a/system/Config/Config.php
+++ b/system/Config/Config.php
@@ -12,8 +12,6 @@
 namespace CodeIgniter\Config;
 
 /**
- * Class Config
- *
  * @deprecated Use CodeIgniter\Config\Factories::config()
  */
 class Config
diff --git a/system/Config/View.php b/system/Config/View.php
index 0699f45ceaf6..5a8baeac2d6a 100644
--- a/system/Config/View.php
+++ b/system/Config/View.php
@@ -87,8 +87,6 @@ class View extends BaseConfig
     ];
 
     /**
-     * Constructor.
-     *
      * Merge the built-in and developer-configured filters and plugins,
      * with preference to the developer ones.
      */
diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php
index 3895e3ee2609..3b8e62dd9fb3 100644
--- a/system/Cookie/Cookie.php
+++ b/system/Cookie/Cookie.php
@@ -596,8 +596,6 @@ public function offsetGet($offset)
      * @param mixed  $value
      *
      * @throws LogicException
-     *
-     * @return void
      */
     public function offsetSet($offset, $value)
     {
@@ -610,8 +608,6 @@ public function offsetSet($offset, $value)
      * @param string $offset
      *
      * @throws LogicException
-     *
-     * @return void
      */
     public function offsetUnset($offset)
     {
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 1dbd91312ad2..7c3253c52685 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -287,8 +287,6 @@ public function db(): ConnectionInterface
     /**
      * Sets a test mode status.
      *
-     * @param bool $mode Mode to set
-     *
      * @return $this
      */
     public function testMode(bool $mode = true)
@@ -331,12 +329,9 @@ public function ignore(bool $ignore = true)
     }
 
     /**
-     * Select
-     *
      * Generates the SELECT portion of the query
      *
      * @param array|string $select
-     * @param bool         $escape
      *
      * @return $this
      */
@@ -376,13 +371,8 @@ public function select($select = '*', ?bool $escape = null)
     }
 
     /**
-     * Select Max
-     *
      * Generates a SELECT MAX(field) portion of a query
      *
-     * @param string $select The field
-     * @param string $alias  An alias
-     *
      * @return $this
      */
     public function selectMax(string $select = '', string $alias = '')
@@ -391,13 +381,8 @@ public function selectMax(string $select = '', string $alias = '')
     }
 
     /**
-     * Select Min
-     *
      * Generates a SELECT MIN(field) portion of a query
      *
-     * @param string $select The field
-     * @param string $alias  An alias
-     *
      * @return $this
      */
     public function selectMin(string $select = '', string $alias = '')
@@ -406,13 +391,8 @@ public function selectMin(string $select = '', string $alias = '')
     }
 
     /**
-     * Select Average
-     *
      * Generates a SELECT AVG(field) portion of a query
      *
-     * @param string $select The field
-     * @param string $alias  An alias
-     *
      * @return $this
      */
     public function selectAvg(string $select = '', string $alias = '')
@@ -421,13 +401,8 @@ public function selectAvg(string $select = '', string $alias = '')
     }
 
     /**
-     * Select Sum
-     *
      * Generates a SELECT SUM(field) portion of a query
      *
-     * @param string $select The field
-     * @param string $alias  An alias
-     *
      * @return $this
      */
     public function selectSum(string $select = '', string $alias = '')
@@ -436,13 +411,8 @@ public function selectSum(string $select = '', string $alias = '')
     }
 
     /**
-     * Select Count
-     *
      * Generates a SELECT COUNT(field) portion of a query
      *
-     * @param string $select The field
-     * @param string $alias  An alias
-     *
      * @return $this
      */
     public function selectCount(string $select = '', string $alias = '')
@@ -458,8 +428,6 @@ public function selectCount(string $select = '', string $alias = '')
      * @used-by selectAvg()
      * @used-by selectSum()
      *
-     * @param string $select Field name
-     *
      * @throws DatabaseException
      * @throws DataException
      *
@@ -508,8 +476,6 @@ protected function createAliasFromTable(string $item): string
     }
 
     /**
-     * DISTINCT
-     *
      * Sets a flag which tells the query string compiler to add DISTINCT
      *
      * @return $this
@@ -522,12 +488,9 @@ public function distinct(bool $val = true)
     }
 
     /**
-     * From
-     *
      * Generates the FROM portion of the query
      *
-     * @param mixed $from      can be a string or array
-     * @param bool  $overwrite Should we remove the first table existing?
+     * @param array|string $from
      *
      * @return $this
      */
@@ -561,14 +524,8 @@ public function from($from, bool $overwrite = false)
     }
 
     /**
-     * JOIN
-     *
      * Generates the JOIN portion of the query
      *
-     * @param string $cond   The join condition
-     * @param string $type   The type of join
-     * @param bool   $escape Whether not to try to escape identifiers
-     *
      * @return $this
      */
     public function join(string $table, string $cond, string $type = '', ?bool $escape = null)
@@ -636,14 +593,11 @@ public function join(string $table, string $cond, string $type = '', ?bool $esca
     }
 
     /**
-     * WHERE
-     *
      * Generates the WHERE portion of the query.
      * Separates multiple calls with 'AND'.
      *
      * @param mixed $key
      * @param mixed $value
-     * @param bool  $escape
      *
      * @return $this
      */
@@ -670,17 +624,13 @@ public function orWhere($key, $value = null, ?bool $escape = null)
     }
 
     /**
-     * WHERE, HAVING
-     *
      * @used-by where()
      * @used-by orWhere()
      * @used-by having()
      * @used-by orHaving()
      *
-     * @param string $qbKey  'QBWhere' or 'QBHaving'
-     * @param mixed  $key
-     * @param mixed  $value
-     * @param bool   $escape
+     * @param mixed $key
+     * @param mixed $value
      *
      * @return $this
      */
@@ -744,14 +694,10 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
     }
 
     /**
-     * WHERE IN
-     *
      * Generates a WHERE field IN('item', 'item') SQL query,
      * joined with 'AND' if appropriate.
      *
-     * @param string               $key    The field to search
      * @param array|Closure|string $values The values searched on, or anonymous function with subquery
-     * @param bool                 $escape
      *
      * @return $this
      */
@@ -761,14 +707,10 @@ public function whereIn(?string $key = null, $values = null, ?bool $escape = nul
     }
 
     /**
-     * OR WHERE IN
-     *
      * Generates a WHERE field IN('item', 'item') SQL query,
      * joined with 'OR' if appropriate.
      *
-     * @param string               $key    The field to search
      * @param array|Closure|string $values The values searched on, or anonymous function with subquery
-     * @param bool                 $escape
      *
      * @return $this
      */
@@ -778,14 +720,10 @@ public function orWhereIn(?string $key = null, $values = null, ?bool $escape = n
     }
 
     /**
-     * WHERE NOT IN
-     *
      * Generates a WHERE field NOT IN('item', 'item') SQL query,
      * joined with 'AND' if appropriate.
      *
-     * @param string               $key    The field to search
      * @param array|Closure|string $values The values searched on, or anonymous function with subquery
-     * @param bool                 $escape
      *
      * @return $this
      */
@@ -795,14 +733,10 @@ public function whereNotIn(?string $key = null, $values = null, ?bool $escape =
     }
 
     /**
-     * OR WHERE NOT IN
-     *
      * Generates a WHERE field NOT IN('item', 'item') SQL query,
      * joined with 'OR' if appropriate.
      *
-     * @param string               $key    The field to search
      * @param array|Closure|string $values The values searched on, or anonymous function with subquery
-     * @param bool                 $escape
      *
      * @return $this
      */
@@ -812,14 +746,10 @@ public function orWhereNotIn(?string $key = null, $values = null, ?bool $escape
     }
 
     /**
-     * HAVING IN
-     *
      * Generates a HAVING field IN('item', 'item') SQL query,
      * joined with 'AND' if appropriate.
      *
-     * @param string               $key    The field to search
      * @param array|Closure|string $values The values searched on, or anonymous function with subquery
-     * @param bool                 $escape
      *
      * @return $this
      */
@@ -829,14 +759,10 @@ public function havingIn(?string $key = null, $values = null, ?bool $escape = nu
     }
 
     /**
-     * OR HAVING IN
-     *
      * Generates a HAVING field IN('item', 'item') SQL query,
      * joined with 'OR' if appropriate.
      *
-     * @param string               $key    The field to search
      * @param array|Closure|string $values The values searched on, or anonymous function with subquery
-     * @param bool                 $escape
      *
      * @return $this
      */
@@ -846,14 +772,10 @@ public function orHavingIn(?string $key = null, $values = null, ?bool $escape =
     }
 
     /**
-     * HAVING NOT IN
-     *
      * Generates a HAVING field NOT IN('item', 'item') SQL query,
      * joined with 'AND' if appropriate.
      *
-     * @param string               $key    The field to search
      * @param array|Closure|string $values The values searched on, or anonymous function with subquery
-     * @param bool                 $escape
      *
      * @return $this
      */
@@ -863,14 +785,10 @@ public function havingNotIn(?string $key = null, $values = null, ?bool $escape =
     }
 
     /**
-     * OR HAVING NOT IN
-     *
      * Generates a HAVING field NOT IN('item', 'item') SQL query,
      * joined with 'OR' if appropriate.
      *
-     * @param string               $key    The field to search
      * @param array|Closure|string $values The values searched on, or anonymous function with subquery
-     * @param bool                 $escape
      *
      * @return $this
      */
@@ -880,18 +798,12 @@ public function orHavingNotIn(?string $key = null, $values = null, ?bool $escape
     }
 
     /**
-     * Internal WHERE IN
-     *
      * @used-by WhereIn()
      * @used-by orWhereIn()
      * @used-by whereNotIn()
      * @used-by orWhereNotIn()
      *
-     * @param string             $key    The field to search
      * @param array|Closure|null $values The values searched on, or anonymous function with subquery
-     * @param bool               $not    If the statement would be IN or NOT IN
-     * @param bool               $escape
-     * @param string             $clause (Internal use only)
      *
      * @throws InvalidArgumentException
      *
@@ -903,9 +815,8 @@ protected function _whereIn(?string $key = null, $values = null, bool $not = fal
             if (CI_DEBUG) {
                 throw new InvalidArgumentException(sprintf('%s() expects $key to be a non-empty string', debug_backtrace(0, 2)[1]['function']));
             }
-            // @codeCoverageIgnoreStart
-            return $this;
-            // @codeCoverageIgnoreEnd
+
+            return $this; // @codeCoverageIgnore
         }
 
         if ($values === null || (! is_array($values) && ! ($values instanceof Closure))) {
@@ -949,14 +860,10 @@ protected function _whereIn(?string $key = null, $values = null, bool $not = fal
     }
 
     /**
-     * LIKE
-     *
      * Generates a %LIKE% portion of the query.
      * Separates multiple calls with 'AND'.
      *
      * @param mixed $field
-     * @param bool  $escape
-     * @param bool  $insensitiveSearch IF true, will force a case-insensitive search
      *
      * @return $this
      */
@@ -966,14 +873,10 @@ public function like($field, string $match = '', string $side = 'both', ?bool $e
     }
 
     /**
-     * NOT LIKE
-     *
      * Generates a NOT LIKE portion of the query.
      * Separates multiple calls with 'AND'.
      *
      * @param mixed $field
-     * @param bool  $escape
-     * @param bool  $insensitiveSearch IF true, will force a case-insensitive search
      *
      * @return $this
      */
@@ -983,14 +886,10 @@ public function notLike($field, string $match = '', string $side = 'both', ?bool
     }
 
     /**
-     * OR LIKE
-     *
      * Generates a %LIKE% portion of the query.
      * Separates multiple calls with 'OR'.
      *
      * @param mixed $field
-     * @param bool  $escape
-     * @param bool  $insensitiveSearch IF true, will force a case-insensitive search
      *
      * @return $this
      */
@@ -1000,14 +899,10 @@ public function orLike($field, string $match = '', string $side = 'both', ?bool
     }
 
     /**
-     * OR NOT LIKE
-     *
      * Generates a NOT LIKE portion of the query.
      * Separates multiple calls with 'OR'.
      *
      * @param mixed $field
-     * @param bool  $escape
-     * @param bool  $insensitiveSearch IF true, will force a case-insensitive search
      *
      * @return $this
      */
@@ -1017,13 +912,10 @@ public function orNotLike($field, string $match = '', string $side = 'both', ?bo
     }
 
     /**
-     * LIKE with HAVING clause
-     *
      * Generates a %LIKE% portion of the query.
      * Separates multiple calls with 'AND'.
      *
      * @param mixed $field
-     * @param bool  $escape
      *
      * @return $this
      */
@@ -1033,13 +925,10 @@ public function havingLike($field, string $match = '', string $side = 'both', ?b
     }
 
     /**
-     * NOT LIKE with HAVING clause
-     *
      * Generates a NOT LIKE portion of the query.
      * Separates multiple calls with 'AND'.
      *
      * @param mixed $field
-     * @param bool  $escape
      *
      * @return $this
      */
@@ -1049,13 +938,10 @@ public function notHavingLike($field, string $match = '', string $side = 'both',
     }
 
     /**
-     * OR LIKE with HAVING clause
-     *
      * Generates a %LIKE% portion of the query.
      * Separates multiple calls with 'OR'.
      *
      * @param mixed $field
-     * @param bool  $escape
      *
      * @return $this
      */
@@ -1065,13 +951,10 @@ public function orHavingLike($field, string $match = '', string $side = 'both',
     }
 
     /**
-     * OR NOT LIKE with HAVING clause
-     *
      * Generates a NOT LIKE portion of the query.
      * Separates multiple calls with 'OR'.
      *
      * @param mixed $field
-     * @param bool  $escape
      *
      * @return $this
      */
@@ -1081,8 +964,6 @@ public function orNotHavingLike($field, string $match = '', string $side = 'both
     }
 
     /**
-     * Internal LIKE
-     *
      * @used-by like()
      * @used-by orLike()
      * @used-by notLike()
@@ -1092,10 +973,7 @@ public function orNotHavingLike($field, string $match = '', string $side = 'both
      * @used-by notHavingLike()
      * @used-by orNotHavingLike()
      *
-     * @param mixed  $field
-     * @param bool   $escape
-     * @param bool   $insensitiveSearch IF true, will force a case-insensitive search
-     * @param string $clause            (Internal use only)
+     * @param mixed $field
      *
      * @return $this
      */
@@ -1106,9 +984,7 @@ protected function _like($field, string $match = '', string $type = 'AND ', stri
         }
 
         $escape = is_bool($escape) ? $escape : $this->db->protectIdentifiers;
-
-        // lowercase $side in case somebody writes e.g. 'BEFORE' instead of 'before' (doh)
-        $side = strtolower($side);
+        $side   = strtolower($side);
 
         foreach ($field as $k => $v) {
             if ($insensitiveSearch === true) {
@@ -1145,8 +1021,6 @@ protected function _like($field, string $match = '', string $type = 'AND ', stri
 
     /**
      * Platform independent LIKE statement builder.
-     *
-     * @return string $like_statement
      */
     protected function _like_statement(?string $prefix, string $column, ?string $not, string $bind, bool $insensitiveSearch = false): string
     {
@@ -1297,8 +1171,6 @@ protected function groupEndPrepare(string $clause = 'QBWhere')
     }
 
     /**
-     * Group_get_type
-     *
      * @used-by groupStart()
      * @used-by _like()
      * @used-by whereHaving()
@@ -1316,10 +1188,7 @@ protected function groupGetType(string $type): string
     }
 
     /**
-     * GROUP BY
-     *
      * @param array|string $by
-     * @param bool         $escape
      *
      * @return $this
      */
@@ -1350,13 +1219,10 @@ public function groupBy($by, ?bool $escape = null)
     }
 
     /**
-     * HAVING
-     *
      * Separates multiple calls with 'AND'.
      *
      * @param array|string $key
      * @param mixed        $value
-     * @param bool         $escape
      *
      * @return $this
      */
@@ -1366,13 +1232,10 @@ public function having($key, $value = null, ?bool $escape = null)
     }
 
     /**
-     * OR HAVING
-     *
      * Separates multiple calls with 'OR'.
      *
      * @param array|string $key
      * @param mixed        $value
-     * @param bool         $escape
      *
      * @return $this
      */
@@ -1382,24 +1245,21 @@ public function orHaving($key, $value = null, ?bool $escape = null)
     }
 
     /**
-     * ORDER BY
-     *
      * @param string $direction ASC, DESC or RANDOM
-     * @param bool   $escape
      *
      * @return $this
      */
     public function orderBy(string $orderBy, string $direction = '', ?bool $escape = null)
     {
+        if (empty($orderBy)) {
+            return $this;
+        }
+
         $direction = strtoupper(trim($direction));
 
         if ($direction === 'RANDOM') {
             $direction = '';
-
-            // Do we have a seed value?
-            $orderBy = ctype_digit($orderBy) ? sprintf($this->randomKeyword[1], $orderBy) : $this->randomKeyword[0];
-        } elseif (empty($orderBy)) {
-            return $this;
+            $orderBy   = ctype_digit($orderBy) ? sprintf($this->randomKeyword[1], $orderBy) : $this->randomKeyword[0];
         } elseif ($direction !== '') {
             $direction = in_array($direction, ['ASC', 'DESC'], true) ? ' ' . $direction : '';
         }
@@ -1419,14 +1279,12 @@ public function orderBy(string $orderBy, string $direction = '', ?bool $escape =
 
             foreach (explode(',', $orderBy) as $field) {
                 $qbOrderBy[] = ($direction === '' && preg_match('/\s+(ASC|DESC)$/i', rtrim($field), $match, PREG_OFFSET_CAPTURE))
-                    ?
-                    [
+                    ? [
                         'field'     => ltrim(substr($field, 0, $match[0][1])),
                         'direction' => ' ' . $match[1][0],
                         'escape'    => true,
                     ]
-                    :
-                    [
+                    : [
                         'field'     => trim($field),
                         'direction' => $direction,
                         'escape'    => true,
@@ -1440,11 +1298,6 @@ public function orderBy(string $orderBy, string $direction = '', ?bool $escape =
     }
 
     /**
-     * LIMIT
-     *
-     * @param int|null $value  LIMIT value
-     * @param int|null $offset OFFSET value
-     *
      * @return $this
      */
     public function limit(?int $value = null, ?int $offset = 0)
@@ -1463,8 +1316,6 @@ public function limit(?int $value = null, ?int $offset = 0)
     /**
      * Sets the OFFSET value
      *
-     * @param int $offset OFFSET value
-     *
      * @return $this
      */
     public function offset(int $offset)
@@ -1477,11 +1328,7 @@ public function offset(int $offset)
     }
 
     /**
-     * LIMIT string
-     *
      * Generates a platform-specific LIMIT clause.
-     *
-     * @param string $sql SQL Query
      */
     protected function _limit(string $sql, bool $offsetIgnore = false): string
     {
@@ -1489,13 +1336,11 @@ protected function _limit(string $sql, bool $offsetIgnore = false): string
     }
 
     /**
-     * The "set" function.
-     *
      * Allows key/value pairs to be set for insert(), update() or replace().
      *
      * @param array|object|string $key    Field name, or an array of field/value pairs
-     * @param string              $value  Field value, if $key is a single field
-     * @param bool                $escape Whether to escape values and identifiers
+     * @param string|null         $value  Field value, if $key is a single field
+     * @param bool|null           $escape Whether to escape values and identifiers
      *
      * @return $this
      */
@@ -1511,7 +1356,8 @@ public function set($key, ?string $value = '', ?bool $escape = null)
 
         foreach ($key as $k => $v) {
             if ($escape) {
-                $bind                                                           = $this->setBind($k, $v, $escape);
+                $bind = $this->setBind($k, $v, $escape);
+
                 $this->QBSet[$this->db->protectIdentifiers($k, false, $escape)] = ":{$bind}:";
             } else {
                 $this->QBSet[$this->db->protectIdentifiers($k, false, $escape)] = $v;
@@ -1522,8 +1368,7 @@ public function set($key, ?string $value = '', ?bool $escape = null)
     }
 
     /**
-     * Returns the previously set() data, alternatively resetting it
-     * if needed.
+     * Returns the previously set() data, alternatively resetting it if needed.
      */
     public function getSetData(bool $clean = false): array
     {
@@ -1537,11 +1382,7 @@ public function getSetData(bool $clean = false): array
     }
 
     /**
-     * Get SELECT query string
-     *
      * Compiles a SELECT query string and returns the sql.
-     *
-     * @param bool $reset TRUE: resets QB values; FALSE: leave QB values alone
      */
     public function getCompiledSelect(bool $reset = true): string
     {
@@ -1571,15 +1412,9 @@ protected function compileFinalQuery(string $sql): string
     }
 
     /**
-     * Get
-     *
      * Compiles the select statement based on the other functions called
      * and runs the query
      *
-     * @param int  $limit  The limit clause
-     * @param int  $offset The offset clause
-     * @param bool $reset  Are we want to clear query builder values?
-     *
      * @return false|ResultInterface
      */
     public function get(?int $limit = null, int $offset = 0, bool $reset = true)
@@ -1603,27 +1438,24 @@ public function get(?int $limit = null, int $offset = 0, bool $reset = true)
     }
 
     /**
-     * "Count All" query
-     *
      * Generates a platform-specific query string that counts all records in
      * the particular table
      *
-     * @param bool $reset Are we want to clear query builder values?
-     *
-     * @return int|string when $test = true
+     * @return int|string
      */
     public function countAll(bool $reset = true)
     {
         $table = $this->QBFrom[0];
 
         $sql = $this->countString . $this->db->escapeIdentifiers('numrows') . ' FROM ' .
-                $this->db->protectIdentifiers($table, true, null, false);
+            $this->db->protectIdentifiers($table, true, null, false);
 
         if ($this->testMode) {
             return $sql;
         }
 
         $query = $this->db->query($sql, null, false);
+
         if (empty($query->getResult())) {
             return 0;
         }
@@ -1638,12 +1470,10 @@ public function countAll(bool $reset = true)
     }
 
     /**
-     * "Count All Results" query
-     *
      * Generates a platform-specific query string that counts all records
      * returned by an Query Builder query.
      *
-     * @return int|string when $test = true
+     * @return int|string
      */
     public function countAllResults(bool $reset = true)
     {
@@ -1651,19 +1481,23 @@ public function countAllResults(bool $reset = true)
         // on Microsoft SQL Server) and ultimately unnecessary
         // for selecting COUNT(*) ...
         $orderBy = [];
+
         if (! empty($this->QBOrderBy)) {
-            $orderBy         = $this->QBOrderBy;
+            $orderBy = $this->QBOrderBy;
+
             $this->QBOrderBy = null;
         }
 
         // We cannot use a LIMIT when getting the single row COUNT(*) result
-        $limit         = $this->QBLimit;
+        $limit = $this->QBLimit;
+
         $this->QBLimit = false;
 
         if ($this->QBDistinct === true || ! empty($this->QBGroupBy)) {
             // We need to backup the original SELECT in case DBPrefix is used
             $select = $this->QBSelect;
             $sql    = $this->countString . $this->db->protectIdentifiers('numrows') . "\nFROM (\n" . $this->compileSelect() . "\n) CI_count_all_results";
+
             // Restore SELECT part
             $this->QBSelect = $select;
             unset($select);
@@ -1679,18 +1513,14 @@ public function countAllResults(bool $reset = true)
 
         if ($reset === true) {
             $this->resetSelect();
-        }
-        // If we've previously reset the QBOrderBy values, get them back
-        elseif (! isset($this->QBOrderBy)) {
+        } elseif (! isset($this->QBOrderBy)) {
             $this->QBOrderBy = $orderBy;
         }
 
         // Restore the LIMIT setting
         $this->QBLimit = $limit;
 
-        $row = (! $result instanceof ResultInterface)
-            ? null
-            : $result->getRow();
+        $row = ! $result instanceof ResultInterface ? null : $result->getRow();
 
         if (empty($row)) {
             return 0;
@@ -1700,8 +1530,6 @@ public function countAllResults(bool $reset = true)
     }
 
     /**
-     * Get compiled 'where' condition string
-     *
      * Compiles the set conditions and returns the sql statement
      *
      * @return array
@@ -1712,14 +1540,9 @@ public function getCompiledQBWhere()
     }
 
     /**
-     * Get_Where
-     *
      * Allows the where clause, limit and offset to be added directly
      *
-     * @param array|string $where  Where condition
-     * @param int          $limit  Limit value
-     * @param int          $offset Offset value
-     * @param bool         $reset  Are we want to clear query builder values?
+     * @param array|string $where
      *
      * @return ResultInterface
      */
@@ -1748,14 +1571,8 @@ public function getWhere($where = null, ?int $limit = null, ?int $offset = 0, bo
     }
 
     /**
-     * Insert_Batch
-     *
      * Compiles batch insert strings and runs the queries
      *
-     * @param array $set       An associative array of insert values
-     * @param bool  $escape    Whether to escape values and identifiers
-     * @param int   $batchSize Batch size
-     *
      * @throws DatabaseException
      *
      * @return false|int Number of rows inserted or FALSE on failure
@@ -1767,9 +1584,8 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
                 if (CI_DEBUG) {
                     throw new DatabaseException('You must use the "set" method to update an entry.');
                 }
-                // @codeCoverageIgnoreStart
-                return false;
-                // @codeCoverageIgnoreEnd
+
+                return false; // @codeCoverageIgnore
             }
         } else {
             if (empty($set)) {
@@ -1785,7 +1601,6 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
 
         $table = $this->QBFrom[0];
 
-        // Batch this baby
         $affectedRows = 0;
 
         for ($i = 0, $total = count($this->QBSet); $i < $total; $i += $batchSize) {
@@ -1807,13 +1622,7 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
     }
 
     /**
-     * Insert batch statement
-     *
      * Generates a platform-specific insert string from the supplied data.
-     *
-     * @param string $table  Table name
-     * @param array  $keys   INSERT keys
-     * @param array  $values INSERT values
      */
     protected function _insertBatch(string $table, array $keys, array $values): string
     {
@@ -1821,10 +1630,9 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
     }
 
     /**
-     * The "setInsertBatch" function.  Allows key/value pairs to be set for batch inserts
+     * Allows key/value pairs to be set for batch inserts
      *
      * @param mixed $key
-     * @param bool  $escape
      *
      * @return $this|null
      */
@@ -1871,12 +1679,8 @@ public function setInsertBatch($key, string $value = '', ?bool $escape = null)
     }
 
     /**
-     * Get INSERT query string
-     *
      * Compiles an insert query and returns the sql
      *
-     * @param bool $reset TRUE: reset QB values; FALSE: leave QB values alone
-     *
      * @throws DatabaseException
      *
      * @return bool|string
@@ -1888,12 +1692,7 @@ public function getCompiledInsert(bool $reset = true)
         }
 
         $sql = $this->_insert(
-            $this->db->protectIdentifiers(
-                $this->QBFrom[0],
-                true,
-                null,
-                false
-            ),
+            $this->db->protectIdentifiers($this->QBFrom[0], true, null, false),
             array_keys($this->QBSet),
             array_values($this->QBSet)
         );
@@ -1906,13 +1705,8 @@ public function getCompiledInsert(bool $reset = true)
     }
 
     /**
-     * Insert
-     *
      * Compiles an insert string and runs the query
      *
-     * @param array $set    An associative array of insert values
-     * @param bool  $escape Whether to escape values and identifiers
-     *
      * @throws DatabaseException
      *
      * @return bool|Query
@@ -1928,12 +1722,7 @@ public function insert(?array $set = null, ?bool $escape = null)
         }
 
         $sql = $this->_insert(
-            $this->db->protectIdentifiers(
-                $this->QBFrom[0],
-                true,
-                $escape,
-                false
-            ),
+            $this->db->protectIdentifiers($this->QBFrom[0], true, $escape, false),
             array_keys($this->QBSet),
             array_values($this->QBSet)
         );
@@ -1953,8 +1742,6 @@ public function insert(?array $set = null, ?bool $escape = null)
     }
 
     /**
-     * Validate Insert
-     *
      * This method is used by both insert() and getCompiledInsert() to
      * validate that the there data is actually being set and that table
      * has been chosen to be inserted into.
@@ -1967,22 +1754,15 @@ protected function validateInsert(): bool
             if (CI_DEBUG) {
                 throw new DatabaseException('You must use the "set" method to update an entry.');
             }
-            // @codeCoverageIgnoreStart
-            return false;
-            // @codeCoverageIgnoreEnd
+
+            return false; // @codeCoverageIgnore
         }
 
         return true;
     }
 
     /**
-     * Insert statement
-     *
      * Generates a platform-specific insert string from the supplied data
-     *
-     * @param string $table         The table name
-     * @param array  $keys          The insert keys
-     * @param array  $unescapedKeys The insert values
      */
     protected function _insert(string $table, array $keys, array $unescapedKeys): string
     {
@@ -1990,12 +1770,8 @@ protected function _insert(string $table, array $keys, array $unescapedKeys): st
     }
 
     /**
-     * Replace
-     *
      * Compiles an replace into string and runs the query
      *
-     * @param array $set An associative array of insert values
-     *
      * @throws DatabaseException
      *
      * @return BaseResult|false|Query|string
@@ -2010,9 +1786,8 @@ public function replace(?array $set = null)
             if (CI_DEBUG) {
                 throw new DatabaseException('You must use the "set" method to update an entry.');
             }
-            // @codeCoverageIgnoreStart
-            return false;
-            // @codeCoverageIgnoreEnd
+
+            return false; // @codeCoverageIgnore
         }
 
         $table = $this->QBFrom[0];
@@ -2025,13 +1800,7 @@ public function replace(?array $set = null)
     }
 
     /**
-     * Replace statement
-     *
      * Generates a platform-specific replace string from the supplied data
-     *
-     * @param string $table  The table name
-     * @param array  $keys   The insert keys
-     * @param array  $values The insert values
      */
     protected function _replace(string $table, array $keys, array $values): string
     {
@@ -2039,8 +1808,6 @@ protected function _replace(string $table, array $keys, array $values): string
     }
 
     /**
-     * FROM tables
-     *
      * Groups tables in FROM clauses if needed, so there is no confusion
      * about operator precedence.
      *
@@ -2052,12 +1819,8 @@ protected function _fromTables(): string
     }
 
     /**
-     * Get UPDATE query string
-     *
      * Compiles an update query and returns the sql
      *
-     * @param bool $reset TRUE: reset QB values; FALSE: leave QB values alone
-     *
      * @return bool|string
      */
     public function getCompiledUpdate(bool $reset = true)
@@ -2076,17 +1839,11 @@ public function getCompiledUpdate(bool $reset = true)
     }
 
     /**
-     * UPDATE
-     *
      * Compiles an update string and runs the query.
      *
-     * @param array $set   An associative array of update values
      * @param mixed $where
-     * @param int   $limit
      *
      * @throws DatabaseException
-     *
-     * @return bool TRUE on success, FALSE on failure
      */
     public function update(?array $set = null, $where = null, ?int $limit = null): bool
     {
@@ -2131,12 +1888,7 @@ public function update(?array $set = null, $where = null, ?int $limit = null): b
     }
 
     /**
-     * Update statement
-     *
      * Generates a platform-specific update string from the supplied data
-     *
-     * @param string $table  the Table name
-     * @param array  $values the Update data
      */
     protected function _update(string $table, array $values): string
     {
@@ -2147,14 +1899,12 @@ protected function _update(string $table, array $values): string
         }
 
         return 'UPDATE ' . $this->compileIgnore('update') . $table . ' SET ' . implode(', ', $valStr)
-                . $this->compileWhereHaving('QBWhere')
-                . $this->compileOrderBy()
-                . ($this->QBLimit ? $this->_limit(' ', true) : '');
+            . $this->compileWhereHaving('QBWhere')
+            . $this->compileOrderBy()
+            . ($this->QBLimit ? $this->_limit(' ', true) : '');
     }
 
     /**
-     * Validate Update
-     *
      * This method is used by both update() and getCompiledUpdate() to
      * validate that data is actually being set and that a table has been
      * chosen to be update.
@@ -2167,23 +1917,16 @@ protected function validateUpdate(): bool
             if (CI_DEBUG) {
                 throw new DatabaseException('You must use the "set" method to update an entry.');
             }
-            // @codeCoverageIgnoreStart
-            return false;
-            // @codeCoverageIgnoreEnd
+
+            return false; // @codeCoverageIgnore
         }
 
         return true;
     }
 
     /**
-     * Update_Batch
-     *
      * Compiles an update string and runs the query
      *
-     * @param array  $set       An associative array of update values
-     * @param string $index     The where key
-     * @param int    $batchSize The size of the batch to run
-     *
      * @throws DatabaseException
      *
      * @return mixed Number of rows affected, SQL string, or FALSE on failure
@@ -2194,9 +1937,8 @@ public function updateBatch(?array $set = null, ?string $index = null, int $batc
             if (CI_DEBUG) {
                 throw new DatabaseException('You must specify an index to match on for batch updates.');
             }
-            // @codeCoverageIgnoreStart
-            return false;
-            // @codeCoverageIgnoreEnd
+
+            return false; // @codeCoverageIgnore
         }
 
         if ($set === null) {
@@ -2204,18 +1946,16 @@ public function updateBatch(?array $set = null, ?string $index = null, int $batc
                 if (CI_DEBUG) {
                     throw new DatabaseException('You must use the "set" method to update an entry.');
                 }
-                // @codeCoverageIgnoreStart
-                return false;
-                // @codeCoverageIgnoreEnd
+
+                return false; // @codeCoverageIgnore
             }
         } else {
             if (empty($set)) {
                 if (CI_DEBUG) {
                     throw new DatabaseException('updateBatch() called with no data');
                 }
-                // @codeCoverageIgnoreStart
-                return false;
-                // @codeCoverageIgnoreEnd
+
+                return false; // @codeCoverageIgnore
             }
 
             $this->setUpdateBatch($set, $index);
@@ -2223,7 +1963,6 @@ public function updateBatch(?array $set = null, ?string $index = null, int $batc
 
         $table = $this->QBFrom[0];
 
-        // Batch this baby
         $affectedRows = 0;
         $savedSQL     = [];
         $savedQBWhere = $this->QBWhere;
@@ -2251,13 +1990,7 @@ public function updateBatch(?array $set = null, ?string $index = null, int $batc
     }
 
     /**
-     * Update_Batch statement
-     *
      * Generates a platform-specific batch update string from the supplied data
-     *
-     * @param string $table  Table name
-     * @param array  $values Update data
-     * @param string $index  WHERE key
      */
     protected function _updateBatch(string $table, array $values, string $index): string
     {
@@ -2278,8 +2011,8 @@ protected function _updateBatch(string $table, array $values, string $index): st
 
         foreach ($final as $k => $v) {
             $cases .= $k . " = CASE \n"
-                    . implode("\n", $v) . "\n"
-                    . 'ELSE ' . $k . ' END, ';
+                . implode("\n", $v) . "\n"
+                . 'ELSE ' . $k . ' END, ';
         }
 
         $this->where($index . ' IN(' . implode(',', $ids) . ')', null, false);
@@ -2288,10 +2021,9 @@ protected function _updateBatch(string $table, array $values, string $index): st
     }
 
     /**
-     * The "setUpdateBatch" function.  Allows key/value pairs to be set for batch updating
+     * Allows key/value pairs to be set for batch updating
      *
      * @param array|object $key
-     * @param bool         $escape
      *
      * @throws DatabaseException
      *
@@ -2334,8 +2066,6 @@ public function setUpdateBatch($key, string $index = '', ?bool $escape = null)
     }
 
     /**
-     * Empty Table
-     *
      * Compiles a delete string and runs "DELETE FROM table"
      *
      * @return bool|string TRUE on success, FALSE on failure, string on testMode
@@ -2356,8 +2086,6 @@ public function emptyTable()
     }
 
     /**
-     * Truncate
-     *
      * Compiles a truncate string and runs the query
      * If the database does not support the truncate() command
      * This function maps to "DELETE FROM table"
@@ -2380,14 +2108,10 @@ public function truncate()
     }
 
     /**
-     * Truncate statement
-     *
      * Generates a platform-specific truncate string from the supplied data
      *
      * If the database does not support the truncate() command,
      * then this method maps to 'DELETE FROM table'
-     *
-     * @param string $table The table name
      */
     protected function _truncate(string $table): string
     {
@@ -2395,11 +2119,7 @@ protected function _truncate(string $table): string
     }
 
     /**
-     * Get DELETE query string
-     *
      * Compiles a delete query string and returns the sql
-     *
-     * @param bool $reset TRUE: reset QB values; FALSE: leave QB values alone
      */
     public function getCompiledDelete(bool $reset = true): string
     {
@@ -2410,12 +2130,9 @@ public function getCompiledDelete(bool $reset = true): string
     }
 
     /**
-     * Delete
-     *
      * Compiles a delete string and runs the query
      *
-     * @param mixed $where The where clause
-     * @param int   $limit The limit clause
+     * @param mixed $where
      *
      * @throws DatabaseException
      *
@@ -2433,9 +2150,8 @@ public function delete($where = '', ?int $limit = null, bool $resetData = true)
             if (CI_DEBUG) {
                 throw new DatabaseException('Deletes are not allowed unless they contain a "where" or "like" clause.');
             }
-            // @codeCoverageIgnoreStart
-            return false;
-            // @codeCoverageIgnoreEnd
+
+            return false; // @codeCoverageIgnore
         }
 
         $sql = $this->_delete($table);
@@ -2488,11 +2204,7 @@ public function decrement(string $column, int $value = 1)
     }
 
     /**
-     * Delete statement
-     *
      * Generates a platform-specific delete string from the supplied data
-     *
-     * @param string $table The table name
      */
     protected function _delete(string $table): string
     {
@@ -2500,8 +2212,6 @@ protected function _delete(string $table): string
     }
 
     /**
-     * Track Aliases
-     *
      * Used to track SQL statements written with aliased tables.
      *
      * @param array|string $table The table to inspect
@@ -2547,7 +2257,6 @@ protected function trackAliases($table)
      */
     protected function compileSelect($selectOverride = false): string
     {
-        // Write the "select" portion of the query
         if ($selectOverride !== false) {
             $sql = $selectOverride;
         } else {
@@ -2568,21 +2277,19 @@ protected function compileSelect($selectOverride = false): string
             }
         }
 
-        // Write the "FROM" portion of the query
         if (! empty($this->QBFrom)) {
             $sql .= "\nFROM " . $this->_fromTables();
         }
 
-        // Write the "JOIN" portion of the query
         if (! empty($this->QBJoin)) {
             $sql .= "\n" . implode("\n", $this->QBJoin);
         }
 
         $sql .= $this->compileWhereHaving('QBWhere')
-                . $this->compileGroupBy()
-                . $this->compileWhereHaving('QBHaving')
-                . $this->compileOrderBy(); // ORDER BY
-        // LIMIT
+            . $this->compileGroupBy()
+            . $this->compileWhereHaving('QBHaving')
+            . $this->compileOrderBy();
+
         if ($this->QBLimit) {
             return $this->_limit($sql . "\n");
         }
@@ -2591,8 +2298,6 @@ protected function compileSelect($selectOverride = false): string
     }
 
     /**
-     * Compile Ignore Statement
-     *
      * Checks if the ignore option is supported by
      * the Database Driver for the specific statement.
      *
@@ -2600,9 +2305,7 @@ protected function compileSelect($selectOverride = false): string
      */
     protected function compileIgnore(string $statement)
     {
-        if ($this->QBIgnore
-            && isset($this->supportedIgnoreStatements[$statement])
-        ) {
+        if ($this->QBIgnore && isset($this->supportedIgnoreStatements[$statement])) {
             return trim($this->supportedIgnoreStatements[$statement]) . ' ';
         }
 
@@ -2610,8 +2313,6 @@ protected function compileIgnore(string $statement)
     }
 
     /**
-     * Compile WHERE, HAVING statements
-     *
      * Escapes identifiers in WHERE and HAVING statements at execution time.
      *
      * Required so that aliases are tracked properly, regardless of whether
@@ -2647,7 +2348,7 @@ protected function compileWhereHaving(string $qbKey): string
 
                 foreach ($conditions as &$condition) {
                     if (($op = $this->getOperator($condition)) === false
-                            || ! preg_match('/^(\(?)(.*)(' . preg_quote($op, '/') . ')\s*(.*(?<!\)))?(\)?)$/i', $condition, $matches)
+                        || ! preg_match('/^(\(?)(.*)(' . preg_quote($op, '/') . ')\s*(.*(?<!\)))?(\)?)$/i', $condition, $matches)
                     ) {
                         continue;
                     }
@@ -2674,29 +2375,25 @@ protected function compileWhereHaving(string $qbKey): string
                     }
 
                     $condition = $matches[1] . $this->db->protectIdentifiers(trim($matches[2]))
-                            . ' ' . trim($matches[3]) . $matches[4] . $matches[5];
+                        . ' ' . trim($matches[3]) . $matches[4] . $matches[5];
                 }
 
                 $qbkey = implode('', $conditions);
             }
 
             return ($qbKey === 'QBHaving' ? "\nHAVING " : "\nWHERE ")
-                    . implode("\n", $this->{$qbKey});
+                . implode("\n", $this->{$qbKey});
         }
 
         return '';
     }
 
     /**
-     * Compile GROUP BY
-     *
      * Escapes identifiers in GROUP BY statements at execution time.
      *
      * Required so that aliases are tracked properly, regardless of whether
      * groupBy() is called prior to from(), join() and prefixTable is added
      * only if needed.
-     *
-     * @return string SQL statement
      */
     protected function compileGroupBy(): string
     {
@@ -2719,15 +2416,11 @@ protected function compileGroupBy(): string
     }
 
     /**
-     * Compile ORDER BY
-     *
      * Escapes identifiers in ORDER BY statements at execution time.
      *
      * Required so that aliases are tracked properly, regardless of whether
      * orderBy() is called prior to from(), join() and prefixTable is added
      * only if needed.
-     *
-     * @return string SQL statement
      */
     protected function compileOrderBy(): string
     {
@@ -2751,13 +2444,11 @@ protected function compileOrderBy(): string
     }
 
     /**
-     * Object to Array
-     *
      * Takes an object as input and converts the class variables to array key/vals
      *
-     * @param mixed $object
+     * @param object $object
      *
-     * @return mixed
+     * @return array
      */
     protected function objectToArray($object)
     {
@@ -2778,13 +2469,11 @@ protected function objectToArray($object)
     }
 
     /**
-     * Object to Array
-     *
      * Takes an object as input and converts the class variables to array key/vals
      *
-     * @param mixed $object
+     * @param object $object
      *
-     * @return mixed
+     * @return array
      */
     protected function batchObjectToArray($object)
     {
@@ -2811,8 +2500,6 @@ protected function batchObjectToArray($object)
     }
 
     /**
-     * Is literal
-     *
      * Determines if a string represents a literal value or a field name
      */
     protected function isLiteral(string $str): bool
@@ -2837,8 +2524,6 @@ protected function isLiteral(string $str): bool
     }
 
     /**
-     * Reset Query Builder values.
-     *
      * Publicly-visible method to reset the QB values.
      *
      * @return $this
@@ -2855,8 +2540,6 @@ public function resetQuery()
      * Resets the query builder values.  Called by the get() function
      *
      * @param array $qbResetItems An array of fields to reset
-     *
-     * @return void
      */
     protected function resetRun(array $qbResetItems)
     {
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 36637441674a..80cc2b962191 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -17,7 +17,33 @@
 use Throwable;
 
 /**
- * Class BaseConnection
+ * @property array      $aliasedTables
+ * @property string     $charset
+ * @property bool       $compress
+ * @property float      $connectDuration
+ * @property float      $connectTime
+ * @property string     $database
+ * @property string     $DBCollat
+ * @property bool       $DBDebug
+ * @property string     $DBDriver
+ * @property string     $DBPrefix
+ * @property string     $DSN
+ * @property mixed      $encrypt
+ * @property array      $failover
+ * @property string     $hostname
+ * @property mixed      $lastQuery
+ * @property string     $password
+ * @property bool       $pConnect
+ * @property int|string $port
+ * @property bool       $pretend
+ * @property string     $queryClass
+ * @property array      $reservedIdentifiers
+ * @property bool       $strictOn
+ * @property string     $subdriver
+ * @property string     $swapPre
+ * @property int        $transDepth
+ * @property bool       $transFailure
+ * @property bool       $transStatus
  */
 abstract class BaseConnection implements ConnectionInterface
 {
@@ -316,7 +342,7 @@ public function __construct(array $params)
      *
      * @throws DatabaseException
      *
-     * @return mixed|void
+     * @return mixed
      */
     public function initialize()
     {
@@ -391,8 +417,6 @@ abstract public function connect(bool $persistent = false);
 
     /**
      * Close the database connection.
-     *
-     * @return void
      */
     public function close()
     {
@@ -643,8 +667,6 @@ public function simpleQuery(string $sql)
      * Disable Transactions
      *
      * This permits transactions to be disabled at run-time.
-     *
-     * @return void
      */
     public function transOff()
     {
@@ -704,7 +726,6 @@ public function transComplete(): bool
                 $this->transStatus = true;
             }
 
-            //            log_message('debug', 'DB Transaction Failure');
             return false;
         }
 
@@ -840,8 +861,6 @@ public function table($tableName)
      *                     ->get();
      *           })
      *
-     * @param array $options Passed to the prepare() method
-     *
      * @return BasePreparedQuery|null
      */
     public function prepare(Closure $func, array $options = [])
@@ -862,9 +881,7 @@ public function prepare(Closure $func, array $options = [])
         }
 
         $class = str_ireplace('Connection', 'PreparedQuery', static::class);
-        /**
-         * @var BasePreparedQuery $class
-         */
+        /** @var BasePreparedQuery $class */
         $class = new $class($this);
 
         return $class->prepare($sql, $options);
@@ -931,7 +948,6 @@ public function getConnectDuration(int $decimals = 6): string
      * the correct identifiers.
      *
      * @param array|string $item
-     * @param bool         $protectIdentifiers
      *
      * @return array|string
      */
@@ -1131,8 +1147,6 @@ public function escapeIdentifiers($item)
     /**
      * Prepends a database prefix if one exists in configuration
      *
-     * @param string $table the table
-     *
      * @throws DatabaseException
      */
     public function prefixTable(string $table = ''): string
@@ -1280,8 +1294,6 @@ public function callFunction(string $functionName, ...$params): bool
     /**
      * Returns an array of table names
      *
-     * @param bool $constrainByPrefix = FALSE
-     *
      * @throws DatabaseException
      *
      * @return array|bool
@@ -1304,7 +1316,8 @@ public function listTables(bool $constrainByPrefix = false)
         }
 
         $this->dataCache['table_names'] = [];
-        $query                          = $this->query($sql);
+
+        $query = $this->query($sql);
 
         foreach ($query->getResultArray() as $row) {
             // Do we know from which column to get the table name?
@@ -1341,8 +1354,6 @@ public function tableExists(string $tableName): bool
     /**
      * Fetch Field Names
      *
-     * @param string $table Table name
-     *
      * @throws DatabaseException
      *
      * @return array|false
@@ -1366,7 +1377,8 @@ public function getFieldNames(string $table)
             return false;
         }
 
-        $query                                  = $this->query($sql);
+        $query = $this->query($sql);
+
         $this->dataCache['field_names'][$table] = [];
 
         foreach ($query->getResultArray() as $row) {
@@ -1399,8 +1411,6 @@ public function fieldExists(string $fieldName, string $tableName): bool
     /**
      * Returns an object with field data
      *
-     * @param string $table the table name
-     *
      * @return array
      */
     public function getFieldData(string $table)
@@ -1411,8 +1421,6 @@ public function getFieldData(string $table)
     /**
      * Returns an object with key data
      *
-     * @param string $table the table name
-     *
      * @return array
      */
     public function getIndexData(string $table)
@@ -1423,8 +1431,6 @@ public function getIndexData(string $table)
     /**
      * Returns an object with foreign key data
      *
-     * @param string $table the table name
-     *
      * @return array
      */
     public function getForeignKeyData(string $table)
diff --git a/system/Database/BasePreparedQuery.php b/system/Database/BasePreparedQuery.php
index 8cc50491269e..faf83d854d7b 100644
--- a/system/Database/BasePreparedQuery.php
+++ b/system/Database/BasePreparedQuery.php
@@ -55,9 +55,6 @@ abstract class BasePreparedQuery implements PreparedQueryInterface
      */
     protected $db;
 
-    /**
-     * Constructor.
-     */
     public function __construct(BaseConnection $db)
     {
         $this->db = &$db;
@@ -70,8 +67,6 @@ public function __construct(BaseConnection $db)
      * NOTE: This version is based on SQL code. Child classes should
      * override this method.
      *
-     * @param array $options Passed to the connection's prepare statement.
-     *
      * @return mixed
      */
     public function prepare(string $sql, array $options = [], string $queryClass = 'CodeIgniter\\Database\\Query')
@@ -81,9 +76,7 @@ public function prepare(string $sql, array $options = [], string $queryClass = '
         // need to replace our named placeholders (:name)
         $sql = preg_replace('/:[^\s,)]+/', '?', $sql);
 
-        /**
-         * @var Query $query
-         */
+        /** @var Query $query */
         $query = new $queryClass($this->db);
 
         $query->setQuery($sql);
@@ -100,8 +93,6 @@ public function prepare(string $sql, array $options = [], string $queryClass = '
     /**
      * The database-dependent portion of the prepare statement.
      *
-     * @param array $options Passed to the connection's prepare statement.
-     *
      * @return mixed
      */
     abstract public function _prepare(string $sql, array $options = []);
@@ -110,8 +101,6 @@ abstract public function _prepare(string $sql, array $options = []);
      * Takes a new set of data and runs it against the currently
      * prepared query. Upon success, will return a Results object.
      *
-     * @param array $data
-     *
      * @return ResultInterface
      */
     public function execute(...$data)
@@ -152,8 +141,6 @@ abstract public function _getResult();
 
     /**
      * Explicitly closes the statement.
-     *
-     * @return void
      */
     public function close()
     {
diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php
index 46e66f2434e7..3adbb592b24c 100644
--- a/system/Database/BaseResult.php
+++ b/system/Database/BaseResult.php
@@ -109,8 +109,6 @@ public function getResult(string $type = 'object'): array
     /**
      * Returns the results as an array of custom objects.
      *
-     * @param string $className The name of the class to use.
-     *
      * @return mixed
      */
     public function getCustomResultObject(string $className)
@@ -484,8 +482,6 @@ abstract public function getFieldData(): array;
 
     /**
      * Frees the current result.
-     *
-     * @return void
      */
     abstract public function freeResult();
 
diff --git a/system/Database/BaseUtils.php b/system/Database/BaseUtils.php
index 24753ff176d1..5af2b54dbad7 100644
--- a/system/Database/BaseUtils.php
+++ b/system/Database/BaseUtils.php
@@ -195,11 +195,6 @@ public function repairTable(string $tableName)
     /**
      * Generate CSV from a query result object
      *
-     * @param ResultInterface $query     Query result object
-     * @param string          $delim     Delimiter (default: ,)
-     * @param string          $newline   Newline character (default: \n)
-     * @param string          $enclosure Enclosure (default: ")
-     *
      * @return string
      */
     public function getCSVFromResult(ResultInterface $query, string $delim = ',', string $newline = "\n", string $enclosure = '"')
@@ -228,28 +223,21 @@ public function getCSVFromResult(ResultInterface $query, string $delim = ',', st
 
     /**
      * Generate XML data from a query result object
-     *
-     * @param ResultInterface $query  Query result object
-     * @param array           $params Any preferences
      */
     public function getXMLFromResult(ResultInterface $query, array $params = []): string
     {
-        // Set our default values
         foreach (['root' => 'root', 'element' => 'element', 'newline' => "\n", 'tab' => "\t"] as $key => $val) {
             if (! isset($params[$key])) {
                 $params[$key] = $val;
             }
         }
 
-        // Create variables for convenience
         $root    = $params['root'];
         $newline = $params['newline'];
         $tab     = $params['tab'];
         $element = $params['element'];
 
-        // Load the xml helper
         helper('xml');
-        // Generate the result
         $xml = '<' . $root . '>' . $newline;
 
         while ($row = $query->getUnbufferedRow()) {
@@ -278,14 +266,10 @@ public function getXMLFromResult(ResultInterface $query, array $params = []): st
      */
     public function backup($params = [])
     {
-        // If the parameters have not been submitted as an
-        // array then we know that it is simply the table
-        // name, which is a valid short cut.
         if (is_string($params)) {
             $params = ['tables' => $params];
         }
 
-        // Set up our default preferences
         $prefs = [
             'tables'             => [],
             'ignore'             => [],
@@ -297,7 +281,6 @@ public function backup($params = [])
             'foreign_key_checks' => true,
         ];
 
-        // Did the user submit any preferences? If so set them....
         if (! empty($params)) {
             foreach (array_keys($prefs) as $key) {
                 if (isset($params[$key])) {
@@ -306,19 +289,14 @@ public function backup($params = [])
             }
         }
 
-        // Are we backing up a complete database or individual tables?
-        // If no table names were submitted we'll fetch the entire table list
         if (empty($prefs['tables'])) {
             $prefs['tables'] = $this->db->listTables();
         }
 
-        // Validate the format
         if (! in_array($prefs['format'], ['gzip', 'txt'], true)) {
             $prefs['format'] = 'txt';
         }
 
-        // Is the encoder supported? If not, we'll either issue an
-        // error or use plain text depending on the debug settings
         if ($prefs['format'] === 'gzip' && ! function_exists('gzencode')) {
             if ($this->db->DBDebug) {
                 throw new DatabaseException('The file compression format you chose is not supported by your server.');
@@ -327,7 +305,7 @@ public function backup($params = [])
             $prefs['format'] = 'txt';
         }
 
-        if ($prefs['format'] === 'txt') { // Was a text file requested?
+        if ($prefs['format'] === 'txt') {
             return $this->_backup($prefs);
         }
 
diff --git a/system/Database/Config.php b/system/Database/Config.php
index 4e7deec45c52..6d2e82bf1109 100644
--- a/system/Database/Config.php
+++ b/system/Database/Config.php
@@ -38,8 +38,7 @@ class Config extends BaseConfig
     /**
      * Creates the default
      *
-     * @param array|string $group     The name of the connection group to use,
-     *                                or an array of configuration settings.
+     * @param array|string $group     The name of the connection group to use, or an array of configuration settings.
      * @param bool         $getShared Whether to return a shared instance of the connection.
      *
      * @return BaseConnection
diff --git a/system/Database/Database.php b/system/Database/Database.php
index 3d3774925a96..0d3c26c2e84b 100644
--- a/system/Database/Database.php
+++ b/system/Database/Database.php
@@ -38,8 +38,6 @@ class Database
      * @throws InvalidArgumentException
      *
      * @return mixed
-     *
-     * @internal param bool $useBuilder
      */
     public function load(array $params = [], string $alias = '')
     {
@@ -47,17 +45,14 @@ public function load(array $params = [], string $alias = '')
             throw new InvalidArgumentException('You must supply the parameter: alias.');
         }
 
-        // Handle universal DSN connection string
         if (! empty($params['DSN']) && strpos($params['DSN'], '://') !== false) {
             $params = $this->parseDSN($params);
         }
 
-        // No DB specified? Beat them senseless...
         if (empty($params['DBDriver'])) {
             throw new InvalidArgumentException('You have not selected a database type to connect to.');
         }
 
-        // Store the connection
         $this->connections[$alias] = $this->initDriver($params['DBDriver'], 'Connection', $params);
 
         return $this->connections[$alias];
@@ -68,7 +63,6 @@ public function load(array $params = [], string $alias = '')
      */
     public function loadForge(ConnectionInterface $db): object
     {
-        // Initialize database connection if not exists.
         if (! $db->connID) {
             $db->initialize();
         }
@@ -81,7 +75,6 @@ public function loadForge(ConnectionInterface $db): object
      */
     public function loadUtils(ConnectionInterface $db): object
     {
-        // Initialize database connection if not exists.
         if (! $db->connID) {
             $db->initialize();
         }
@@ -112,7 +105,6 @@ protected function parseDSN(array $params): array
             'database' => isset($dsn['path']) ? rawurldecode(substr($dsn['path'], 1)) : '',
         ];
 
-        // Do we have additional config items set?
         if (! empty($dsn['query'])) {
             parse_str($dsn['query'], $extra);
 
@@ -131,8 +123,6 @@ protected function parseDSN(array $params): array
     /**
      * Initialize database driver.
      *
-     * @param string       $driver   Database driver name (e.g. 'MySQLi')
-     * @param string       $class    Database class name (e.g. 'Forge')
      * @param array|object $argument
      */
     protected function initDriver(string $driver, string $class, $argument): object
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 8f6b7b820ae1..4e3048290d42 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -220,7 +220,6 @@ public function createDatabase(string $dbName, bool $ifNotExists = false): bool
 
             return true;
         } catch (Throwable $e) {
-            // @phpstan-ignore-next-line
             if ($this->db->DBDebug) {
                 throw new DatabaseException('Unable to create the specified database.', 0, $e);
             }
@@ -387,11 +386,6 @@ public function addForeignKey(string $fieldName = '', string $tableName = '', st
     }
 
     /**
-     * Foreign Key Drop
-     *
-     * @param string $table       Table name
-     * @param string $foreignName Foreign name
-     *
      * @throws DatabaseException
      *
      * @return BaseResult|bool|false|mixed|Query
@@ -416,12 +410,6 @@ public function dropForeignKey(string $table, string $foreignName)
     }
 
     /**
-     * Create Table
-     *
-     * @param string $table       Table name
-     * @param bool   $ifNotExists Whether to add IF NOT EXISTS condition
-     * @param array  $attributes  Associative array of table attributes
-     *
      * @throws DatabaseException
      *
      * @return mixed
@@ -470,12 +458,6 @@ public function createTable(string $table, bool $ifNotExists = false, array $att
     }
 
     /**
-     * Create Table
-     *
-     * @param string $table       Table name
-     * @param bool   $ifNotExists Whether to add 'IF NOT EXISTS' condition
-     * @param array  $attributes  Associative array of table attributes
-     *
      * @return mixed
      */
     protected function _createTable(string $table, bool $ifNotExists, array $attributes)
@@ -504,7 +486,6 @@ protected function _createTable(string $table, bool $ifNotExists, array $attribu
         $columns .= $this->_processPrimaryKeys($table);
         $columns .= $this->_processForeignKeys($table);
 
-        // Are indexes created from within the CREATE TABLE statement? (e.g. in MySQL)
         if ($this->createTableKeys === true) {
             $indexes = $this->_processIndexes($table);
             if (is_string($indexes)) {
@@ -512,7 +493,6 @@ protected function _createTable(string $table, bool $ifNotExists, array $attribu
             }
         }
 
-        // createTableStr will usually have the following format: "%s %s (%s\n)"
         return sprintf(
             $this->createTableStr . '%s',
             $sql,
@@ -522,11 +502,6 @@ protected function _createTable(string $table, bool $ifNotExists, array $attribu
         );
     }
 
-    /**
-     * CREATE TABLE attributes
-     *
-     * @param array $attributes Associative array of table attributes
-     */
     protected function _createTableAttributes(array $attributes): string
     {
         $sql = '';
@@ -541,12 +516,6 @@ protected function _createTableAttributes(array $attributes): string
     }
 
     /**
-     * Drop Table
-     *
-     * @param string $tableName Table name
-     * @param bool   $ifExists  Whether to add an IF EXISTS condition
-     * @param bool   $cascade   Whether to add an CASCADE condition
-     *
      * @throws DatabaseException
      *
      * @return mixed
@@ -561,7 +530,6 @@ public function dropTable(string $tableName, bool $ifExists = false, bool $casca
             return false;
         }
 
-        // If the prefix is already starting the table name, remove it...
         if ($this->db->DBPrefix && strpos($tableName, $this->db->DBPrefix) === 0) {
             $tableName = substr($tableName, strlen($this->db->DBPrefix));
         }
@@ -576,7 +544,6 @@ public function dropTable(string $tableName, bool $ifExists = false, bool $casca
 
         $this->db->enableForeignKeyChecks();
 
-        // Update table list cache
         if ($query && ! empty($this->db->dataCache['table_names'])) {
             $key = array_search(
                 strtolower($this->db->DBPrefix . $tableName),
@@ -593,14 +560,8 @@ public function dropTable(string $tableName, bool $ifExists = false, bool $casca
     }
 
     /**
-     * Drop Table
-     *
      * Generates a platform-specific DROP TABLE string
      *
-     * @param string $table    Table name
-     * @param bool   $ifExists Whether to add an IF EXISTS condition
-     * @param bool   $cascade  Whether to add an CASCADE condition
-     *
      * @return bool|string
      */
     protected function _dropTable(string $table, bool $ifExists, bool $cascade)
@@ -621,11 +582,6 @@ protected function _dropTable(string $table, bool $ifExists, bool $cascade)
     }
 
     /**
-     * Rename Table
-     *
-     * @param string $tableName    Old table name
-     * @param string $newTableName New table name
-     *
      * @throws DatabaseException
      *
      * @return mixed
@@ -666,10 +622,7 @@ public function renameTable(string $tableName, string $newTableName)
     }
 
     /**
-     * Column Add
-     *
-     * @param string       $table Table name
-     * @param array|string $field Column definition
+     * @param array|string $field
      *
      * @throws DatabaseException
      */
@@ -704,10 +657,7 @@ public function addColumn(string $table, $field): bool
     }
 
     /**
-     * Column Drop
-     *
-     * @param string       $table      Table name
-     * @param array|string $columnName Column name Array or comma separated
+     * @param array|string $columnName
      *
      * @throws DatabaseException
      *
@@ -728,10 +678,7 @@ public function dropColumn(string $table, $columnName)
     }
 
     /**
-     * Column Modify
-     *
-     * @param string       $table Table name
-     * @param array|string $field Column definition
+     * @param array|string $field
      *
      * @throws DatabaseException
      */
@@ -772,11 +719,7 @@ public function modifyColumn(string $table, $field): bool
     }
 
     /**
-     * ALTER TABLE
-     *
-     * @param string $alterType ALTER type
-     * @param string $table     Table name
-     * @param mixed  $fields    Column definition
+     * @param mixed $fields
      *
      * @return false|string|string[]
      */
@@ -899,20 +842,16 @@ protected function _processFields(bool $createTable = false): array
     protected function _processColumn(array $field): string
     {
         return $this->db->escapeIdentifiers($field['name'])
-               . ' ' . $field['type'] . $field['length']
-               . $field['unsigned']
-               . $field['default']
-               . $field['null']
-               . $field['auto_increment']
-               . $field['unique'];
+            . ' ' . $field['type'] . $field['length']
+            . $field['unsigned']
+            . $field['default']
+            . $field['null']
+            . $field['auto_increment']
+            . $field['unique'];
     }
 
     /**
-     * Field attribute TYPE
-     *
      * Performs a data type mapping between different databases.
-     *
-     * @return void
      */
     protected function _attributeType(array &$attributes)
     {
@@ -920,8 +859,6 @@ protected function _attributeType(array &$attributes)
     }
 
     /**
-     * Field attribute UNSIGNED
-     *
      * Depending on the unsigned property value:
      *
      *    - TRUE will always set $field['unsigned'] to 'UNSIGNED'
@@ -930,8 +867,6 @@ protected function _attributeType(array &$attributes)
      *        if $attributes['TYPE'] is found in the array
      *    - array(TYPE => UTYPE) will change $field['type'],
      *        from TYPE to UTYPE in case of a match
-     *
-     * @return void|null
      */
     protected function _attributeUnsigned(array &$attributes, array &$field)
     {
@@ -963,11 +898,6 @@ protected function _attributeUnsigned(array &$attributes, array &$field)
         $field['unsigned'] = ($this->unsigned === true) ? ' UNSIGNED' : '';
     }
 
-    /**
-     * Field attribute DEFAULT
-     *
-     * @return void|null
-     */
     protected function _attributeDefault(array &$attributes, array &$field)
     {
         if ($this->default === false) {
@@ -987,11 +917,6 @@ protected function _attributeDefault(array &$attributes, array &$field)
         }
     }
 
-    /**
-     * Field attribute UNIQUE
-     *
-     * @return void
-     */
     protected function _attributeUnique(array &$attributes, array &$field)
     {
         if (! empty($attributes['UNIQUE']) && $attributes['UNIQUE'] === true) {
@@ -999,11 +924,6 @@ protected function _attributeUnique(array &$attributes, array &$field)
         }
     }
 
-    /**
-     * Field attribute AUTO_INCREMENT
-     *
-     * @return void
-     */
     protected function _attributeAutoIncrement(array &$attributes, array &$field)
     {
         if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
@@ -1013,11 +933,6 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
         }
     }
 
-    /**
-     * Process primary keys
-     *
-     * @param string $table Table name
-     */
     protected function _processPrimaryKeys(string $table): string
     {
         $sql = '';
@@ -1036,11 +951,6 @@ protected function _processPrimaryKeys(string $table): string
         return $sql;
     }
 
-    /**
-     * Process indexes
-     *
-     * @return array|string
-     */
     protected function _processIndexes(string $table)
     {
         $sqls = [];
@@ -1053,31 +963,27 @@ protected function _processIndexes(string $table)
                     unset($this->keys[$i][$i2]);
                 }
             }
+
             if (count($this->keys[$i]) <= 0) {
                 continue;
             }
 
             if (in_array($i, $this->uniqueKeys, true)) {
                 $sqls[] = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table)
-                          . ' ADD CONSTRAINT ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
-                          . ' UNIQUE (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
+                    . ' ADD CONSTRAINT ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
+                    . ' UNIQUE (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
 
                 continue;
             }
 
             $sqls[] = 'CREATE INDEX ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
-                      . ' ON ' . $this->db->escapeIdentifiers($table)
-                      . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
+                . ' ON ' . $this->db->escapeIdentifiers($table)
+                . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
         }
 
         return $sqls;
     }
 
-    /**
-     * Process foreign keys
-     *
-     * @param string $table Table name
-     */
     protected function _processForeignKeys(string $table): string
     {
         $sql = '';
@@ -1111,11 +1017,7 @@ protected function _processForeignKeys(string $table): string
     }
 
     /**
-     * Reset
-     *
      * Resets table creation vars
-     *
-     * @return void
      */
     public function reset()
     {
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
index 5669c2a6d9a0..517688889ec6 100644
--- a/system/Database/MigrationRunner.php
+++ b/system/Database/MigrationRunner.php
@@ -165,29 +165,23 @@ public function latest(?string $group = null)
 
         $this->ensureTable();
 
-        // Set database group if not null
         if ($group !== null) {
             $this->groupFilter = $group;
             $this->setGroup($group);
         }
 
-        // Locate the migrations
         $migrations = $this->findMigrations();
 
-        // If nothing was found then we're done
         if (empty($migrations)) {
             return true;
         }
 
-        // Remove any migrations already in the history
         foreach ($this->getHistory((string) $group) as $history) {
             unset($migrations[$this->getObjectUid($history)]);
         }
 
-        // Start a new batch
         $batch = $this->getLastBatch() + 1;
 
-        // Run each migration
         foreach ($migrations as $migration) {
             if ($this->migrate('up', $migration)) {
                 if ($this->groupSkip === true) {
@@ -197,9 +191,7 @@ public function latest(?string $group = null)
                 }
 
                 $this->addHistory($migration, $batch);
-            }
-            // If a migration failed then try to back out what was done
-            else {
+            } else {
                 $this->regress(-1);
 
                 $message = lang('Migrations.generalFault');
@@ -246,20 +238,16 @@ public function regress(int $targetBatch = 0, ?string $group = null)
 
         $this->ensureTable();
 
-        // Get all the batches
         $batches = $this->getBatches();
 
-        // Convert a relative batch to its absolute
         if ($targetBatch < 0) {
             $targetBatch = $batches[count($batches) - 1 + $targetBatch] ?? 0;
         }
 
-        // If the goal was rollback then check if it is done
         if (empty($batches) && $targetBatch === 0) {
             return true;
         }
 
-        // Make sure $targetBatch is found
         if ($targetBatch !== 0 && ! in_array($targetBatch, $batches, true)) {
             $message = lang('Migrations.batchNotFound') . $targetBatch;
 
@@ -272,28 +260,21 @@ public function regress(int $targetBatch = 0, ?string $group = null)
             throw new RuntimeException($message);
         }
 
-        // Save the namespace to restore it after loading migrations
         $tmpNamespace = $this->namespace;
 
-        // Get all migrations
         $this->namespace = null;
         $allMigrations   = $this->findMigrations();
 
-        // Gather migrations down through each batch until reaching the target
         $migrations = [];
 
         while ($batch = array_pop($batches)) {
-            // Check if reached target
             if ($batch <= $targetBatch) {
                 break;
             }
 
-            // Get the migrations from each history
             foreach ($this->getBatchHistory($batch, 'desc') as $history) {
-                // Create a UID from the history to match its migration
                 $uid = $this->getObjectUid($history);
 
-                // Make sure the migration is still available
                 if (! isset($allMigrations[$uid])) {
                     $message = lang('Migrations.gap') . ' ' . $history->version;
 
@@ -306,20 +287,16 @@ public function regress(int $targetBatch = 0, ?string $group = null)
                     throw new RuntimeException($message);
                 }
 
-                // Add the history and put it on the list
                 $migration          = $allMigrations[$uid];
                 $migration->history = $history;
                 $migrations[]       = $migration;
             }
         }
 
-        // Run each migration
         foreach ($migrations as $migration) {
             if ($this->migrate('down', $migration)) {
                 $this->removeHistory($migration->history);
-            }
-            // If a migration failed then quit so as not to ruin the whole batch
-            else {
+            } else {
                 $message = lang('Migrations.generalFault');
 
                 if ($this->silent) {
@@ -336,7 +313,6 @@ public function regress(int $targetBatch = 0, ?string $group = null)
         $data['method'] = 'regress';
         Events::trigger('migrate', $data);
 
-        // Restore the namespace
         $this->namespace = $tmpNamespace;
 
         return true;
@@ -358,13 +334,11 @@ public function force(string $path, string $namespace, ?string $group = null)
 
         $this->ensureTable();
 
-        // Set database group if not null
         if ($group !== null) {
             $this->groupFilter = $group;
             $this->setGroup($group);
         }
 
-        // Create and validate the migration
         $migration = $this->migrationFromFile($path, $namespace);
         if (empty($migration)) {
             $message = lang('Migrations.notFound');
@@ -378,7 +352,6 @@ public function force(string $path, string $namespace, ?string $group = null)
             throw new RuntimeException($message);
         }
 
-        // Check the history for a match
         $method = 'up';
         $this->setNamespace($migration->namespace);
 
@@ -390,9 +363,7 @@ public function force(string $path, string $namespace, ?string $group = null)
             }
         }
 
-        // up
         if ($method === 'up') {
-            // Start a new batch
             $batch = $this->getLastBatch() + 1;
 
             if ($this->migrate('up', $migration) && $this->groupSkip === false) {
@@ -402,16 +373,12 @@ public function force(string $path, string $namespace, ?string $group = null)
             }
 
             $this->groupSkip = false;
-        }
-
-        // down
-        elseif ($this->migrate('down', $migration)) {
+        } elseif ($this->migrate('down', $migration)) {
             $this->removeHistory($migration->history);
 
             return true;
         }
 
-        // If it came this far the migration failed
         $message = lang('Migrations.generalFault');
 
         if ($this->silent) {
@@ -430,10 +397,7 @@ public function force(string $path, string $namespace, ?string $group = null)
      */
     public function findMigrations(): array
     {
-        // If a namespace is set then use it, otherwise load all namespaces from the autoloader
         $namespaces = $this->namespace ? [$this->namespace] : array_keys(Services::autoloader()->getNamespace());
-
-        // Collect the migrations to run by their sortable UID
         $migrations = [];
 
         foreach ($namespaces as $namespace) {
@@ -450,34 +414,23 @@ public function findMigrations(): array
 
     /**
      * Retrieves a list of available migration scripts for one namespace
-     *
-     * @param string $namespace The namespace to search for migrations
-     *
-     * @return array List of unsorted migrations from the namespace
      */
     public function findNamespaceMigrations(string $namespace): array
     {
         $migrations = [];
         $locator    = Services::locator(true);
 
-        // If $this->path contains a valid directory use it.
         if (! empty($this->path)) {
             helper('filesystem');
             $dir   = rtrim($this->path, DIRECTORY_SEPARATOR) . '/';
             $files = get_filenames($dir, true);
-        }
-        // Otherwise use FileLocator to search files in the subdirectory of the namespace
-        else {
+        } else {
             $files = $locator->listNamespaceFiles($namespace, '/Database/Migrations/');
         }
 
-        // Load all *_*.php files in the migrations path
-        // We can't use glob if we want it to be testable....
         foreach ($files as $file) {
-            // Clean up the file path
             $file = empty($this->path) ? $file : $this->path . str_replace($this->path, '', $file);
 
-            // Create the migration object from the file and save it
             if ($migration = $this->migrationFromFile($file, $namespace)) {
                 $migrations[] = $migration;
             }
@@ -489,9 +442,6 @@ public function findNamespaceMigrations(string $namespace): array
     /**
      * Create a migration object from a file path.
      *
-     * @param string $path The path to the file
-     * @param string $path The namespace of the target migration
-     *
      * @return false|object Returns the migration object, or false on failure
      */
     protected function migrationFromFile(string $path, string $namespace)
@@ -500,20 +450,16 @@ protected function migrationFromFile(string $path, string $namespace)
             return false;
         }
 
-        // Remove the extension
         $name = basename($path, '.php');
 
-        // Filter out non-migration files
         if (! preg_match($this->regex, $name)) {
             return false;
         }
 
         $locator = Services::locator(true);
 
-        // Create migration object using stdClass
         $migration = new stdClass();
 
-        // Get migration version number
         $migration->version   = $this->getMigrationNumber($name);
         $migration->name      = $this->getMigrationName($name);
         $migration->path      = $path;
@@ -525,11 +471,8 @@ protected function migrationFromFile(string $path, string $namespace)
     }
 
     /**
-     * Set namespace.
      * Allows other scripts to modify on the fly as needed.
      *
-     * @param string $namespace or null for "all"
-     *
      * @return MigrationRunner
      */
     public function setNamespace(?string $namespace)
@@ -540,7 +483,6 @@ public function setNamespace(?string $namespace)
     }
 
     /**
-     * Set database Group.
      * Allows other scripts to modify on the fly as needed.
      *
      * @return MigrationRunner
@@ -553,8 +495,6 @@ public function setGroup(string $group)
     }
 
     /**
-     * Set migration Name.
-     *
      * @return MigrationRunner
      */
     public function setName(string $name)
@@ -579,8 +519,6 @@ public function setSilent(bool $silent)
 
     /**
      * Extracts the migration number from a filename
-     *
-     * @return string Numeric portion of a migration filename
      */
     protected function getMigrationNumber(string $migration): string
     {
@@ -591,8 +529,6 @@ protected function getMigrationNumber(string $migration): string
 
     /**
      * Extracts the migration class name from a filename
-     *
-     * @return string text portion of a migration filename
      */
     protected function getMigrationName(string $migration): string
     {
@@ -615,8 +551,6 @@ public function getObjectUid($object): string
 
     /**
      * Retrieves messages formatted for CLI output
-     *
-     * @return array Current migration version
      */
     public function getCliMessages(): array
     {
@@ -637,8 +571,6 @@ public function clearCliMessages()
 
     /**
      * Truncates the history table.
-     *
-     * @return void
      */
     public function clearHistory()
     {
@@ -651,8 +583,6 @@ public function clearHistory()
      * Add a history to the table.
      *
      * @param object $migration
-     *
-     * @return void
      */
     protected function addHistory($migration, int $batch)
     {
@@ -680,8 +610,6 @@ protected function addHistory($migration, int $batch)
      * Removes a single history
      *
      * @param object $history
-     *
-     * @return void
      */
     protected function removeHistory($history)
     {
@@ -725,7 +653,7 @@ public function getHistory(string $group = 'default'): array
     /**
      * Returns the migration history for a single batch.
      *
-     * @param mixed $order
+     * @param string $order
      */
     public function getBatchHistory(int $batch, $order = 'asc'): array
     {
@@ -781,7 +709,6 @@ public function getLastBatch(): int
      */
     public function getBatchStart(int $batch): string
     {
-        // Convert a relative batch to its absolute
         if ($batch < 0) {
             $batches = $this->getBatches();
             $batch   = $batches[count($batches) - 1] ?? 0;
@@ -803,7 +730,6 @@ public function getBatchStart(int $batch): string
      */
     public function getBatchEnd(int $batch): string
     {
-        // Convert a relative batch to its absolute
         if ($batch < 0) {
             $batches = $this->getBatches();
             $batch   = $batches[count($batches) - 1] ?? 0;
@@ -903,12 +829,9 @@ protected function migrate($direction, $migration): bool
             throw new RuntimeException($message);
         }
 
-        // Initialize migration
         $instance = new $class();
-        // Determine DBGroup to use
-        $group = $instance->getDBGroup() ?? config('Database')->defaultGroup;
+        $group    = $instance->getDBGroup() ?? config('Database')->defaultGroup;
 
-        // Skip tests db group when not running in testing environment
         if (ENVIRONMENT !== 'testing' && $group === 'tests' && $this->groupFilter !== 'tests') {
             // @codeCoverageIgnoreStart
             $this->groupSkip = true;
@@ -917,7 +840,6 @@ protected function migrate($direction, $migration): bool
             // @codeCoverageIgnoreEnd
         }
 
-        // Skip migration if group filtering was set
         if ($direction === 'up' && $this->groupFilter !== null && $this->groupFilter !== $group) {
             $this->groupSkip = true;
 
diff --git a/system/Database/ModelFactory.php b/system/Database/ModelFactory.php
index cd1b4e9ea554..ae088124d9f7 100644
--- a/system/Database/ModelFactory.php
+++ b/system/Database/ModelFactory.php
@@ -25,11 +25,7 @@ class ModelFactory
     /**
      * Creates new Model instances or returns a shared instance
      *
-     * @param string              $name       Model name, namespace optional
-     * @param bool                $getShared  Use shared instance
-     * @param ConnectionInterface $connection
-     *
-     * @return mixed|null
+     * @return mixed
      */
     public static function get(string $name, bool $getShared = true, ?ConnectionInterface $connection = null)
     {
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
index 779636808eb0..756057528450 100644
--- a/system/Database/MySQLi/Connection.php
+++ b/system/Database/MySQLi/Connection.php
@@ -209,8 +209,6 @@ public function connect(bool $persistent = false)
     /**
      * Keep or establish the connection if no queries have been sent for
      * a length of time exceeding the server's idle timeout.
-     *
-     * @return void
      */
     public function reconnect()
     {
@@ -220,8 +218,6 @@ public function reconnect()
 
     /**
      * Close the database connection.
-     *
-     * @return void
      */
     protected function _close()
     {
@@ -294,11 +290,7 @@ protected function execute(string $sql)
     }
 
     /**
-     * Prep the query
-     *
-     * If needed, each database adapter can prep the query string
-     *
-     * @param string $sql an SQL query
+     * Prep the query. If needed, each database adapter can prep the query string
      */
     protected function prepQuery(string $sql): string
     {
@@ -534,7 +526,7 @@ protected function _enableForeignKeyChecks()
      * Must return this format: ['code' => string|int, 'message' => string]
      * intval(code) === 0 means "no error".
      *
-     * @return array<string,int|string>
+     * @return array<string, int|string>
      */
     public function error(): array
     {
diff --git a/system/Database/MySQLi/Result.php b/system/Database/MySQLi/Result.php
index ab83b8545ddd..b115697e65b9 100644
--- a/system/Database/MySQLi/Result.php
+++ b/system/Database/MySQLi/Result.php
@@ -99,8 +99,6 @@ public function getFieldData(): array
 
     /**
      * Frees the current result.
-     *
-     * @return void
      */
     public function freeResult()
     {
@@ -152,8 +150,6 @@ protected function fetchObject(string $className = 'stdClass')
 
     /**
      * Returns the number of rows in the resultID (i.e., mysqli_result object)
-     *
-     * @return int number of rows in a query result
      */
     public function getNumRows(): int
     {
diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index 45f73749d5f4..2b7a5b3dee06 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -61,7 +61,6 @@ protected function compileIgnore(string $statement)
      * ORDER BY
      *
      * @param string $direction ASC, DESC or RANDOM
-     * @param bool   $escape
      *
      * @return BaseBuilder
      */
@@ -118,8 +117,6 @@ public function decrement(string $column, int $value = 1)
     }
 
     /**
-     * Replace
-     *
      * Compiles an replace into string and runs the query.
      * Because PostgreSQL doesn't support the replace into command,
      * we simply do a DELETE and an INSERT on the first key/value
@@ -143,9 +140,8 @@ public function replace(?array $set = null)
             if (CI_DEBUG) {
                 throw new DatabaseException('You must use the "set" method to update an entry.');
             }
-            // @codeCoverageIgnoreStart
-            return false;
-            // @codeCoverageIgnoreEnd
+
+            return false; // @codeCoverageIgnore
         }
 
         $table = $this->QBFrom[0];
@@ -170,13 +166,7 @@ public function replace(?array $set = null)
     }
 
     /**
-     * Insert statement
-     *
      * Generates a platform-specific insert string from the supplied data
-     *
-     * @param string $table         The table name
-     * @param array  $keys          The insert keys
-     * @param array  $unescapedKeys The insert values
      */
     protected function _insert(string $table, array $keys, array $unescapedKeys): string
     {
@@ -184,13 +174,7 @@ protected function _insert(string $table, array $keys, array $unescapedKeys): st
     }
 
     /**
-     * Insert batch statement
-     *
      * Generates a platform-specific insert string from the supplied data.
-     *
-     * @param string $table  Table name
-     * @param array  $keys   INSERT keys
-     * @param array  $values INSERT values
      */
     protected function _insertBatch(string $table, array $keys, array $values): string
     {
@@ -198,20 +182,13 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
     }
 
     /**
-     * Delete
-     *
      * Compiles a delete string and runs the query
      *
      * @param mixed $where
-     * @param int   $limit
      *
      * @throws DatabaseException
      *
      * @return mixed
-     *
-     * @internal param $bool
-     * @internal param the $mixed limit clause
-     * @internal param the $mixed where clause
      */
     public function delete($where = '', ?int $limit = null, bool $resetData = true)
     {
@@ -223,11 +200,7 @@ public function delete($where = '', ?int $limit = null, bool $resetData = true)
     }
 
     /**
-     * LIMIT string
-     *
      * Generates a platform-specific LIMIT clause.
-     *
-     * @param string $sql SQL Query
      */
     protected function _limit(string $sql, bool $offsetIgnore = false): string
     {
@@ -235,14 +208,9 @@ protected function _limit(string $sql, bool $offsetIgnore = false): string
     }
 
     /**
-     * Update statement
-     *
      * Generates a platform-specific update string from the supplied data
      *
      * @throws DatabaseException
-     *
-     * @internal param the $array update data
-     * @internal param the $string table name
      */
     protected function _update(string $table, array $values): string
     {
@@ -256,13 +224,7 @@ protected function _update(string $table, array $values): string
     }
 
     /**
-     * Update_Batch statement
-     *
      * Generates a platform-specific batch update string from the supplied data
-     *
-     * @param string $table  Table name
-     * @param array  $values Update data
-     * @param string $index  WHERE key
      */
     protected function _updateBatch(string $table, array $values, string $index): string
     {
@@ -295,11 +257,7 @@ protected function _updateBatch(string $table, array $values, string $index): st
     }
 
     /**
-     * Delete statement
-     *
      * Generates a platform-specific delete string from the supplied data
-     *
-     * @param string $table The table name
      */
     protected function _delete(string $table): string
     {
@@ -309,14 +267,10 @@ protected function _delete(string $table): string
     }
 
     /**
-     * Truncate statement
-     *
      * Generates a platform-specific truncate string from the supplied data
      *
      * If the database does not support the truncate() command,
      * then this method maps to 'DELETE FROM table'
-     *
-     * @param string $table The table name
      */
     protected function _truncate(string $table): string
     {
@@ -330,8 +284,6 @@ protected function _truncate(string $table): string
      * searches according to the current locale.
      *
      * @see https://www.postgresql.org/docs/9.2/static/functions-matching.html
-     *
-     * @return string $like_statement
      */
     protected function _like_statement(?string $prefix, string $column, ?string $not, string $bind, bool $insensitiveSearch = false): string
     {
@@ -341,14 +293,8 @@ protected function _like_statement(?string $prefix, string $column, ?string $not
     }
 
     /**
-     * JOIN
-     *
      * Generates the JOIN portion of the query
      *
-     * @param string $cond   The join condition
-     * @param string $type   The type of join
-     * @param bool   $escape Whether not to try to escape identifiers
-     *
      * @return BaseBuilder
      */
     public function join(string $table, string $cond, string $type = '', ?bool $escape = null)
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
index 83e8fd3110c0..54b02dd1ca2c 100644
--- a/system/Database/Postgre/Connection.php
+++ b/system/Database/Postgre/Connection.php
@@ -84,8 +84,6 @@ public function connect(bool $persistent = false)
     /**
      * Keep or establish the connection if no queries have been sent for
      * a length of time exceeding the server's idle timeout.
-     *
-     * @return void
      */
     public function reconnect()
     {
@@ -96,8 +94,6 @@ public function reconnect()
 
     /**
      * Close the database connection.
-     *
-     * @return void
      */
     protected function _close()
     {
@@ -203,8 +199,8 @@ protected function _listTables(bool $prefixLimit = false): string
 
         if ($prefixLimit !== false && $this->DBPrefix !== '') {
             return $sql . ' AND "table_name" LIKE \''
-                    . $this->escapeLikeString($this->DBPrefix) . "%' "
-                    . sprintf($this->likeEscapeStr, $this->likeEscapeChar);
+                . $this->escapeLikeString($this->DBPrefix) . "%' "
+                . sprintf($this->likeEscapeStr, $this->likeEscapeChar);
         }
 
         return $sql;
@@ -365,7 +361,7 @@ protected function _enableForeignKeyChecks()
      * Must return this format: ['code' => string|int, 'message' => string]
      * intval(code) === 0 means "no error".
      *
-     * @return array<string,int|string>
+     * @return array<string, int|string>
      */
     public function error(): array
     {
@@ -376,8 +372,6 @@ public function error(): array
     }
 
     /**
-     * Insert ID
-     *
      * @return int|string
      */
     public function insertID()
@@ -415,8 +409,6 @@ public function insertID()
 
     /**
      * Build a DSN from the provided parameters
-     *
-     * @return void
      */
     protected function buildDSN()
     {
@@ -467,8 +459,6 @@ protected function buildDSN()
 
     /**
      * Set client encoding
-     *
-     * @param string $charset The client encoding to which the data will be converted.
      */
     protected function setClientEncoding(string $charset): bool
     {
@@ -504,7 +494,7 @@ protected function _transRollback(): bool
      *
      * Overrides BaseConnection::isWriteType, adding additional read query types.
      *
-     * @param string $sql An SQL query string
+     * @param mixed $sql
      */
     public function isWriteType($sql): bool
     {
diff --git a/system/Database/Postgre/Forge.php b/system/Database/Postgre/Forge.php
index 17d2c29376cd..2f1a0769bd07 100644
--- a/system/Database/Postgre/Forge.php
+++ b/system/Database/Postgre/Forge.php
@@ -69,11 +69,7 @@ protected function _createTableAttributes(array $attributes): string
     }
 
     /**
-     * ALTER TABLE
-     *
-     * @param string $alterType ALTER type
-     * @param string $table     Table name
-     * @param mixed  $field     Column definition
+     * @param mixed $field
      *
      * @return array|bool|string
      */
@@ -93,28 +89,28 @@ protected function _alterTable(string $alterType, string $table, $field)
 
             if (version_compare($this->db->getVersion(), '8', '>=') && isset($data['type'])) {
                 $sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
-                        . " TYPE {$data['type']}{$data['length']}";
+                    . " TYPE {$data['type']}{$data['length']}";
             }
 
             if (! empty($data['default'])) {
                 $sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
-                        . " SET DEFAULT {$data['default']}";
+                    . " SET DEFAULT {$data['default']}";
             }
 
             if (isset($data['null'])) {
                 $sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
-                        . ($data['null'] === true ? ' DROP' : ' SET') . ' NOT NULL';
+                    . ($data['null'] === true ? ' DROP' : ' SET') . ' NOT NULL';
             }
 
             if (! empty($data['new_name'])) {
                 $sqls[] = $sql . ' RENAME COLUMN ' . $this->db->escapeIdentifiers($data['name'])
-                        . ' TO ' . $this->db->escapeIdentifiers($data['new_name']);
+                    . ' TO ' . $this->db->escapeIdentifiers($data['new_name']);
             }
 
             if (! empty($data['comment'])) {
                 $sqls[] = 'COMMENT ON COLUMN' . $this->db->escapeIdentifiers($table)
-                        . '.' . $this->db->escapeIdentifiers($data['name'])
-                        . " IS {$data['comment']}";
+                    . '.' . $this->db->escapeIdentifiers($data['name'])
+                    . " IS {$data['comment']}";
             }
         }
 
@@ -127,19 +123,15 @@ protected function _alterTable(string $alterType, string $table, $field)
     protected function _processColumn(array $field): string
     {
         return $this->db->escapeIdentifiers($field['name'])
-                . ' ' . $field['type'] . $field['length']
-                . $field['default']
-                . $field['null']
-                . $field['auto_increment']
-                . $field['unique'];
+            . ' ' . $field['type'] . $field['length']
+            . $field['default']
+            . $field['null']
+            . $field['auto_increment']
+            . $field['unique'];
     }
 
     /**
-     * Field attribute TYPE
-     *
      * Performs a data type mapping between different databases.
-     *
-     * @return void
      */
     protected function _attributeType(array &$attributes)
     {
@@ -170,8 +162,6 @@ protected function _attributeType(array &$attributes)
 
     /**
      * Field attribute AUTO_INCREMENT
-     *
-     * @return void
      */
     protected function _attributeAutoIncrement(array &$attributes, array &$field)
     {
@@ -181,12 +171,7 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
     }
 
     /**
-     * Drop Table
-     *
      * Generates a platform-specific DROP TABLE string
-     *
-     * @param string $table    Table name
-     * @param bool   $ifExists Whether to add an IF EXISTS condition
      */
     protected function _dropTable(string $table, bool $ifExists, bool $cascade): string
     {
diff --git a/system/Database/Postgre/Result.php b/system/Database/Postgre/Result.php
index fb4226d2e0c7..6f0fd9ac4ea1 100644
--- a/system/Database/Postgre/Result.php
+++ b/system/Database/Postgre/Result.php
@@ -65,8 +65,6 @@ public function getFieldData(): array
 
     /**
      * Frees the current result.
-     *
-     * @return void
      */
     public function freeResult()
     {
@@ -118,8 +116,6 @@ protected function fetchObject(string $className = 'stdClass')
 
     /**
      * Returns the number of rows in the resultID (i.e., PostgreSQL query result resource)
-     *
-     * @return int The number of rows in the query result
      */
     public function getNumRows(): int
     {
diff --git a/system/Database/PreparedQueryInterface.php b/system/Database/PreparedQueryInterface.php
index 8e19bb053a90..318141027a9e 100644
--- a/system/Database/PreparedQueryInterface.php
+++ b/system/Database/PreparedQueryInterface.php
@@ -20,8 +20,6 @@ interface PreparedQueryInterface
      * Takes a new set of data and runs it against the currently
      * prepared query. Upon success, will return a Results object.
      *
-     * @param array $data
-     *
      * @return ResultInterface
      */
     public function execute(...$data);
@@ -30,8 +28,6 @@ public function execute(...$data);
      * Prepares the query against the database, and saves the connection
      * info necessary to execute the query later.
      *
-     * @param array $options Passed to the connection's prepare statement.
-     *
      * @return mixed
      */
     public function prepare(string $sql, array $options = []);
diff --git a/system/Database/Query.php b/system/Database/Query.php
index 8b9f82b282b9..7f0873fdc40f 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -84,9 +84,6 @@ class Query implements QueryInterface
      */
     public $db;
 
-    /**
-     * BaseQuery constructor.
-     */
     public function __construct(ConnectionInterface &$db)
     {
         $this->db = $db;
@@ -131,10 +128,7 @@ public function setBinds(array $binds, bool $setEscape = true)
     {
         if ($setEscape) {
             array_walk($binds, static function (&$item) {
-                $item = [
-                    $item,
-                    true,
-                ];
+                $item = [$item, true];
             });
         }
 
@@ -275,8 +269,6 @@ public function getOriginalQuery(): string
     /**
      * Escapes and inserts any binds into the finalQueryString object.
      *
-     * @return void
-     *
      * @see https://regex101.com/r/EUEhay/4
      */
     protected function compileBinds()
@@ -306,9 +298,7 @@ protected function compileBinds()
             $binds = array_reverse($binds);
         }
 
-        // We'll need marker length later
-        $ml = strlen($this->bindMarker);
-
+        $ml  = strlen($this->bindMarker);
         $sql = $hasNamedBinds ? $this->matchNamedBinds($sql, $binds) : $this->matchSimpleBinds($sql, $binds, $bindCount, $ml);
 
         $this->finalQueryString = $sql;
@@ -343,7 +333,6 @@ protected function matchNamedBinds(string $sql, array $binds): string
      */
     protected function matchSimpleBinds(string $sql, array $binds, int $bindCount, int $ml): string
     {
-        // Make sure not to replace a chunk inside a string that happens to match the bind marker
         if ($c = preg_match_all("/'[^']*'/", $sql, $matches)) {
             $c = preg_match_all('/' . preg_quote($this->bindMarker, '/') . '/i', str_replace($matches[0], str_replace($this->bindMarker, str_repeat(' ', $ml), $matches[0]), $sql, $c), $matches, PREG_OFFSET_CAPTURE);
 
@@ -351,18 +340,18 @@ protected function matchSimpleBinds(string $sql, array $binds, int $bindCount, i
             if ($bindCount !== $c) {
                 return $sql;
             }
-        }
-        // Number of binds must match bindMarkers in the string.
-        elseif (($c = preg_match_all('/' . preg_quote($this->bindMarker, '/') . '/i', $sql, $matches, PREG_OFFSET_CAPTURE)) !== $bindCount) {
+        } elseif (($c = preg_match_all('/' . preg_quote($this->bindMarker, '/') . '/i', $sql, $matches, PREG_OFFSET_CAPTURE)) !== $bindCount) {
             return $sql;
         }
 
         do {
             $c--;
             $escapedValue = $binds[$c][1] ? $this->db->escape($binds[$c][0]) : $binds[$c][0];
+
             if (is_array($escapedValue)) {
                 $escapedValue = '(' . implode(',', $escapedValue) . ')';
             }
+
             $sql = substr_replace($sql, $escapedValue, $matches[0][$c][1], $ml);
         } while ($c !== 0);
 
diff --git a/system/Database/QueryInterface.php b/system/Database/QueryInterface.php
index 8e965fabf0b2..4f40f004f7e8 100644
--- a/system/Database/QueryInterface.php
+++ b/system/Database/QueryInterface.php
@@ -41,8 +41,6 @@ public function getQuery();
      * 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 mixed
      */
     public function setDuration(float $start, ?float $end = null);
diff --git a/system/Database/ResultInterface.php b/system/Database/ResultInterface.php
index b630ed678afa..b676ea096998 100644
--- a/system/Database/ResultInterface.php
+++ b/system/Database/ResultInterface.php
@@ -92,7 +92,7 @@ public function getRowObject(int $n = 0);
      * Assigns an item into a particular column slot.
      *
      * @param string $key
-     * @param null   $value
+     * @param mixed  $value
      *
      * @return mixed
      */
@@ -150,8 +150,6 @@ public function getFieldData(): array;
 
     /**
      * Frees the current result.
-     *
-     * @return void
      */
     public function freeResult();
 
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index b2b4a877ef81..049f47a33fea 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -61,8 +61,6 @@ class Builder extends BaseBuilder
     public $keyPermission = false;
 
     /**
-     * FROM tables
-     *
      * Groups tables in FROM clauses if needed, so there is no confusion
      * about operator precedence.
      */
@@ -78,14 +76,10 @@ protected function _fromTables(): string
     }
 
     /**
-     * Truncate statement
-     *
      * Generates a platform-specific truncate string from the supplied data
      *
      * If the database does not support the truncate() command,
      * then this method maps to 'DELETE FROM table'
-     *
-     * @param string $table The table name
      */
     protected function _truncate(string $table): string
     {
@@ -93,14 +87,8 @@ protected function _truncate(string $table): string
     }
 
     /**
-     * JOIN
-     *
      * Generates the JOIN portion of the query
      *
-     * @param string $cond   The join condition
-     * @param string $type   The type of join
-     * @param bool   $escape Whether not to try to escape identifiers
-     *
      * @return $this
      */
     public function join(string $table, string $cond, string $type = '', ?bool $escape = null)
@@ -169,16 +157,9 @@ public function join(string $table, string $cond, string $type = '', ?bool $esca
     }
 
     /**
-     * Insert statement
-     *
      * Generates a platform-specific insert string from the supplied data
-     * auto-enable
-     *
-     * @todo implement check for this instad static $insertKeyPermission
      *
-     * @param string $table         The table name
-     * @param array  $keys          The insert keys
-     * @param array  $unescapedKeys The insert values
+     * @todo implement check for this instead static $insertKeyPermission
      */
     protected function _insert(string $table, array $keys, array $unescapedKeys): string
     {
@@ -191,12 +172,7 @@ protected function _insert(string $table, array $keys, array $unescapedKeys): st
     }
 
     /**
-     * Update statement
-     *
      * Generates a platform-specific update string from the supplied data
-     *
-     * @param string $table  the Table name
-     * @param array  $values the Update data
      */
     protected function _update(string $table, array $values): string
     {
@@ -209,7 +185,7 @@ protected function _update(string $table, array $values): string
         $fullTableName = $this->getFullName($table);
 
         $statement = 'UPDATE ' . (empty($this->QBLimit) ? '' : 'TOP(' . $this->QBLimit . ') ') . $fullTableName . ' SET '
-                . implode(', ', $valstr) . $this->compileWhereHaving('QBWhere') . $this->compileOrderBy();
+            . implode(', ', $valstr) . $this->compileWhereHaving('QBWhere') . $this->compileOrderBy();
 
         return $this->keyPermission ? $this->addIdentity($fullTableName, $statement) : $statement;
     }
@@ -274,9 +250,6 @@ private function getFullName(string $table): string
 
     /**
      * Add permision statements for index value inserts
-     *
-     * @param string $fullTable full table name
-     * @param string $insert    statement
      */
     private function addIdentity(string $fullTable, string $insert): string
     {
@@ -302,12 +275,8 @@ protected function _limit(string $sql, bool $offsetIgnore = false): string
     }
 
     /**
-     * Replace
-     *
      * Compiles a replace into string and runs the query
      *
-     * @param array|null $set An associative array of insert values
-     *
      * @throws DatabaseException
      *
      * @return mixed
@@ -344,15 +313,8 @@ public function replace(?array $set = null)
     }
 
     /**
-     * Replace statement
-     *
      * Generates a platform-specific replace string from the supplied data
-     *
      * on match delete and insert
-     *
-     * @param string $table  The table name
-     * @param array  $keys   The insert keys
-     * @param array  $values The insert values
      */
     protected function _replace(string $table, array $keys, array $values): string
     {
@@ -420,8 +382,6 @@ protected function _replace(string $table, array $keys, array $values): string
      *
      * Handle float return value
      *
-     * @param string $select Field name
-     *
      * @return BaseBuilder
      */
     protected function maxMinAvgSum(string $select = '', string $alias = '', string $type = 'MAX')
@@ -453,8 +413,6 @@ protected function maxMinAvgSum(string $select = '', string $alias = '', string
 
     /**
      * Delete statement
-     *
-     * @param string $table The table name
      */
     protected function _delete(string $table): string
     {
@@ -462,12 +420,9 @@ protected function _delete(string $table): string
     }
 
     /**
-     * Delete
-     *
      * Compiles a delete string and runs the query
      *
-     * @param mixed $where The where clause
-     * @param int   $limit The limit clause
+     * @param mixed $where
      *
      * @throws DatabaseException
      *
@@ -507,7 +462,7 @@ public function delete($where = '', ?int $limit = null, bool $resetData = true)
      *
      * Generates a query string based on which functions were used.
      *
-     * @param mixed $selectOverride
+     * @param bool $selectOverride
      */
     protected function compileSelect($selectOverride = false): string
     {
@@ -564,10 +519,8 @@ protected function compileSelect($selectOverride = false): string
     /**
      * WHERE, HAVING
      *
-     * @param string $qbKey  'QBWhere' or 'QBHaving'
-     * @param mixed  $key
-     * @param mixed  $value
-     * @param bool   $escape
+     * @param mixed $key
+     * @param mixed $value
      *
      * @return $this
      */
@@ -631,15 +584,9 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
     }
 
     /**
-     * Get
-     *
      * Compiles the select statement based on the other functions called
      * and runs the query
      *
-     * @param int  $limit  The limit clause
-     * @param int  $offset The offset clause
-     * @param bool $reset  Are we want to clear query builder values?
-     *
      * @return ResultInterface
      */
     public function get(?int $limit = null, int $offset = 0, bool $reset = true)
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index b124fd8b9d2c..24aa409ed1de 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -82,12 +82,8 @@ class Connection extends BaseConnection
 
     /**
      * Class constructor
-     *
-     * @param array $params
-     *
-     * @return void
      */
-    public function __construct($params)
+    public function __construct(array $params)
     {
         parent::__construct($params);
 
@@ -150,8 +146,6 @@ public function connect(bool $persistent = false)
     /**
      * Keep or establish the connection if no queries have been sent for
      * a length of time exceeding the server's idle timeout.
-     *
-     * @return void
      */
     public function reconnect()
     {
@@ -161,8 +155,6 @@ public function reconnect()
 
     /**
      * Close the database connection.
-     *
-     * @return void
      */
     protected function _close()
     {
@@ -191,13 +183,13 @@ public function insertID(): int
     protected function _listTables(bool $prefixLimit = false): string
     {
         $sql = 'SELECT [TABLE_NAME] AS "name"'
-                . ' FROM [INFORMATION_SCHEMA].[TABLES] '
-                . ' WHERE '
-                . " [TABLE_SCHEMA] = '" . $this->schema . "'    ";
+            . ' FROM [INFORMATION_SCHEMA].[TABLES] '
+            . ' WHERE '
+            . " [TABLE_SCHEMA] = '" . $this->schema . "'    ";
 
         if ($prefixLimit === true && $this->DBPrefix !== '') {
             $sql .= " AND [TABLE_NAME] LIKE '" . $this->escapeLikeString($this->DBPrefix) . "%' "
-                    . sprintf($this->likeEscapeStr, $this->likeEscapeChar);
+                . sprintf($this->likeEscapeStr, $this->likeEscapeChar);
         }
 
         return $sql;
@@ -209,9 +201,9 @@ protected function _listTables(bool $prefixLimit = false): string
     protected function _listColumns(string $table = ''): string
     {
         return 'SELECT [COLUMN_NAME] '
-                . ' FROM [INFORMATION_SCHEMA].[COLUMNS]'
-                . ' WHERE  [TABLE_NAME] = ' . $this->escape($this->DBPrefix . $table)
-                . ' AND [TABLE_SCHEMA] = ' . $this->escape($this->schema);
+            . ' FROM [INFORMATION_SCHEMA].[COLUMNS]'
+            . ' WHERE  [TABLE_NAME] = ' . $this->escape($this->DBPrefix . $table)
+            . ' AND [TABLE_SCHEMA] = ' . $this->escape($this->schema);
     }
 
     /**
@@ -264,27 +256,27 @@ protected function _indexData(string $table): array
     protected function _foreignKeyData(string $table): array
     {
         $sql = 'SELECT '
-                . 'f.name as constraint_name, '
-                . 'OBJECT_NAME (f.parent_object_id) as table_name, '
-                . 'COL_NAME(fc.parent_object_id,fc.parent_column_id) column_name, '
-                . 'OBJECT_NAME(f.referenced_object_id) foreign_table_name, '
-                . 'COL_NAME(fc.referenced_object_id,fc.referenced_column_id) foreign_column_name '
-                . 'FROM  '
-                . 'sys.foreign_keys AS f '
-                . 'INNER JOIN  '
-                . 'sys.foreign_key_columns AS fc  '
-                . 'ON f.OBJECT_ID = fc.constraint_object_id '
-                . 'INNER JOIN  '
-                . 'sys.tables t  '
-                . 'ON t.OBJECT_ID = fc.referenced_object_id '
-                . 'WHERE  '
-                . 'OBJECT_NAME (f.parent_object_id) = ' . $this->escape($table);
+            . 'f.name as constraint_name, '
+            . 'OBJECT_NAME (f.parent_object_id) as table_name, '
+            . 'COL_NAME(fc.parent_object_id,fc.parent_column_id) column_name, '
+            . 'OBJECT_NAME(f.referenced_object_id) foreign_table_name, '
+            . 'COL_NAME(fc.referenced_object_id,fc.referenced_column_id) foreign_column_name '
+            . 'FROM  '
+            . 'sys.foreign_keys AS f '
+            . 'INNER JOIN  '
+            . 'sys.foreign_key_columns AS fc  '
+            . 'ON f.OBJECT_ID = fc.constraint_object_id '
+            . 'INNER JOIN  '
+            . 'sys.tables t  '
+            . 'ON t.OBJECT_ID = fc.referenced_object_id '
+            . 'WHERE  '
+            . 'OBJECT_NAME (f.parent_object_id) = ' . $this->escape($table);
 
         if (($query = $this->query($sql)) === false) {
             throw new DatabaseException(lang('Database.failGetForeignKeyData'));
         }
-        $query = $query->getResultObject();
 
+        $query  = $query->getResultObject();
         $retVal = [];
 
         foreach ($query as $row) {
@@ -386,7 +378,7 @@ protected function _transRollback(): bool
      * Must return this format: ['code' => string|int, 'message' => string]
      * intval(code) === 0 means "no error".
      *
-     * @return array<string,int|string>
+     * @return array<string, int|string>
      */
     public function error(): array
     {
@@ -532,7 +524,7 @@ public function getVersion(): string
      *
      * Overrides BaseConnection::isWriteType, adding additional read query types.
      *
-     * @param string $sql An SQL query string
+     * @param mixed $sql
      */
     public function isWriteType($sql): bool
     {
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
index f1716cf6da69..ab5c3f2d5316 100755
--- a/system/Database/SQLSRV/Forge.php
+++ b/system/Database/SQLSRV/Forge.php
@@ -98,8 +98,6 @@ class Forge extends BaseForge
 
     /**
      * CREATE TABLE attributes
-     *
-     * @param array $attributes Associative array of table attributes
      */
     protected function _createTableAttributes(array $attributes): string
     {
@@ -107,11 +105,7 @@ protected function _createTableAttributes(array $attributes): string
     }
 
     /**
-     * ALTER TABLE
-     *
-     * @param string $alterType ALTER type
-     * @param string $table     Table name
-     * @param mixed  $field     Column definition
+     * @param mixed $field
      *
      * @return false|string|string[]
      */
@@ -159,29 +153,28 @@ protected function _alterTable(string $alterType, string $table, $field)
 
             if (isset($data['type'])) {
                 $sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
-                        . " {$data['type']}{$data['length']}";
+                    . " {$data['type']}{$data['length']}";
             }
 
             if (! empty($data['default'])) {
                 $sqls[] = $sql . ' ALTER COLUMN ADD CONSTRAINT ' . $this->db->escapeIdentifiers($data['name']) . '_def'
-                        . " DEFAULT {$data['default']} FOR " . $this->db->escapeIdentifiers($data['name']);
+                    . " DEFAULT {$data['default']} FOR " . $this->db->escapeIdentifiers($data['name']);
             }
 
             if (isset($data['null'])) {
                 $sqls[] = $sql . ' ALTER COLUMN ' . $this->db->escapeIdentifiers($data['name'])
-                        . ($data['null'] === true ? ' DROP' : '') . " {$data['type']}{$data['length']} NOT NULL";
+                    . ($data['null'] === true ? ' DROP' : '') . " {$data['type']}{$data['length']} NOT NULL";
             }
 
             if (! empty($data['comment'])) {
                 $sqls[] = 'EXEC sys.sp_addextendedproperty '
-                        . "@name=N'Caption', @value=N'" . $data['comment'] . "' , "
-                        . "@level0type=N'SCHEMA',@level0name=N'" . $this->db->schema . "', "
-                        . "@level1type=N'TABLE',@level1name=N'" . $this->db->escapeIdentifiers($table) . "', "
-                        . "@level2type=N'COLUMN',@level2name=N'" . $this->db->escapeIdentifiers($data['name']) . "'";
+                    . "@name=N'Caption', @value=N'" . $data['comment'] . "' , "
+                    . "@level0type=N'SCHEMA',@level0name=N'" . $this->db->schema . "', "
+                    . "@level1type=N'TABLE',@level1name=N'" . $this->db->escapeIdentifiers($table) . "', "
+                    . "@level2type=N'COLUMN',@level2name=N'" . $this->db->escapeIdentifiers($data['name']) . "'";
             }
 
             if (! empty($data['new_name'])) {
-                // EXEC sp_rename '[dbo].[db_misc].[value]', 'valueasdasd', 'COLUMN';
                 $sqls[] = "EXEC sp_rename  '[" . $this->db->schema . '].[' . $table . '].[' . $data['name'] . "]' , '" . $data['new_name'] . "', 'COLUMN';";
             }
         }
@@ -211,13 +204,13 @@ protected function _dropIndex(string $table, object $indexData)
     protected function _processColumn(array $field): string
     {
         return $this->db->escapeIdentifiers($field['name'])
-                . (empty($field['new_name']) ? '' : ' ' . $this->db->escapeIdentifiers($field['new_name']))
-                . ' ' . $field['type'] . $field['length']
-                . $field['default']
-                . $field['null']
-                . $field['auto_increment']
-                . '' // (empty($field['comment']) ? '' : ' COMMENT ' . $field['comment'])
-                . $field['unique'];
+            . (empty($field['new_name']) ? '' : ' ' . $this->db->escapeIdentifiers($field['new_name']))
+            . ' ' . $field['type'] . $field['length']
+            . $field['default']
+            . $field['null']
+            . $field['auto_increment']
+            . ''
+            . $field['unique'];
     }
 
     /**
@@ -229,21 +222,15 @@ protected function _processForeignKeys(string $table): string
     {
         $sql = '';
 
-        $allowActions = [
-            'CASCADE',
-            'SET NULL',
-            'NO ACTION',
-            'RESTRICT',
-            'SET DEFAULT',
-        ];
+        $allowActions = ['CASCADE', 'SET NULL', 'NO ACTION', 'RESTRICT', 'SET DEFAULT'];
 
         if ($this->foreignKeys !== []) {
             foreach ($this->foreignKeys as $field => $fkey) {
                 $nameIndex = $table . '_' . $field . '_foreign';
 
                 $sql .= ",\n\t CONSTRAINT " . $this->db->escapeIdentifiers($nameIndex)
-                        . ' FOREIGN KEY (' . $this->db->escapeIdentifiers($field) . ') '
-                        . ' REFERENCES ' . $this->db->escapeIdentifiers($this->db->getPrefix() . $fkey['table']) . ' (' . $this->db->escapeIdentifiers($fkey['field']) . ')';
+                    . ' FOREIGN KEY (' . $this->db->escapeIdentifiers($field) . ') '
+                    . ' REFERENCES ' . $this->db->escapeIdentifiers($this->db->getPrefix() . $fkey['table']) . ' (' . $this->db->escapeIdentifiers($fkey['field']) . ')';
 
                 if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true)) {
                     $sql .= ' ON DELETE ' . $fkey['onDelete'];
@@ -273,18 +260,14 @@ protected function _processPrimaryKeys(string $table): string
 
         if ($this->primaryKeys !== []) {
             $sql = ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers('pk_' . $table)
-                    . ' PRIMARY KEY(' . implode(', ', $this->db->escapeIdentifiers($this->primaryKeys)) . ')';
+                . ' PRIMARY KEY(' . implode(', ', $this->db->escapeIdentifiers($this->primaryKeys)) . ')';
         }
 
         return $sql ?? '';
     }
 
     /**
-     * Field attribute TYPE
-     *
      * Performs a data type mapping between different databases.
-     *
-     * @return void
      */
     protected function _attributeType(array &$attributes)
     {
@@ -301,17 +284,13 @@ protected function _attributeType(array &$attributes)
 
             case 'INTEGER':
                 $attributes['TYPE'] = 'INT';
-
                 break;
 
             case 'ENUM':
                 $attributes['TYPE']       = 'TEXT';
                 $attributes['CONSTRAINT'] = null;
-
                 break;
-            /* case 'DATETIME':
-              $attributes['TYPE'] = 'TIMESTAMP';
-              break; */
+
             case 'TIMESTAMP':
                 $attributes['TYPE'] = 'DATETIME';
                 break;
@@ -323,8 +302,6 @@ protected function _attributeType(array &$attributes)
 
     /**
      * Field attribute AUTO_INCREMENT
-     *
-     * @return void
      */
     protected function _attributeAutoIncrement(array &$attributes, array &$field)
     {
@@ -334,14 +311,9 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
     }
 
     /**
-     * Drop Table
-     *
      * Generates a platform-specific DROP TABLE string
      *
      * @todo Support for cascade
-     *
-     * @param string $table    Table name
-     * @param bool   $ifExists Whether to add an IF EXISTS condition
      */
     protected function _dropTable(string $table, bool $ifExists, bool $cascade): string
     {
diff --git a/system/Database/SQLSRV/Result.php b/system/Database/SQLSRV/Result.php
index 90db8ac0d4db..2a55e452ac09 100755
--- a/system/Database/SQLSRV/Result.php
+++ b/system/Database/SQLSRV/Result.php
@@ -101,8 +101,6 @@ public function getFieldData(): array
 
     /**
      * Frees the current result.
-     *
-     * @return void
      */
     public function freeResult()
     {
@@ -147,8 +145,6 @@ protected function fetchAssoc()
     /**
      * Returns the result set as an object.
      *
-     * Overridden by child classes.
-     *
      * @return bool|Entity|object
      */
     protected function fetchObject(string $className = 'stdClass')
@@ -162,8 +158,6 @@ protected function fetchObject(string $className = 'stdClass')
 
     /**
      * Returns the number of rows in the resultID (i.e., SQLSRV query result resource)
-     *
-     * @return int Returns the number of rows retrieved on success
      */
     public function getNumRows(): int
     {
diff --git a/system/Database/SQLite3/Builder.php b/system/Database/SQLite3/Builder.php
index 7ada68321a3c..588d2d0958e2 100644
--- a/system/Database/SQLite3/Builder.php
+++ b/system/Database/SQLite3/Builder.php
@@ -54,10 +54,6 @@ class Builder extends BaseBuilder
      * Replace statement
      *
      * Generates a platform-specific replace string from the supplied data
-     *
-     * @param string $table  the table name
-     * @param array  $keys   the insert keys
-     * @param array  $values the insert values
      */
     protected function _replace(string $table, array $keys, array $values): string
     {
@@ -65,8 +61,6 @@ protected function _replace(string $table, array $keys, array $values): string
     }
 
     /**
-     * Truncate statement
-     *
      * Generates a platform-specific truncate string from the supplied data
      *
      * If the database does not support the TRUNCATE statement,
diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
index 759ad6f76db1..39fbca8bcfea 100644
--- a/system/Database/SQLite3/Connection.php
+++ b/system/Database/SQLite3/Connection.php
@@ -66,8 +66,6 @@ public function connect(bool $persistent = false)
     /**
      * Keep or establish the connection if no queries have been sent for
      * a length of time exceeding the server's idle timeout.
-     *
-     * @return void
      */
     public function reconnect()
     {
@@ -77,8 +75,6 @@ public function reconnect()
 
     /**
      * Close the database connection.
-     *
-     * @return void
      */
     protected function _close()
     {
@@ -165,10 +161,6 @@ protected function _listColumns(string $table = ''): string
     }
 
     /**
-     * Fetch Field Names
-     *
-     * @param string $table Table name
-     *
      * @throws DatabaseException
      *
      * @return array|false
@@ -349,7 +341,7 @@ protected function _enableForeignKeyChecks()
      * Must return this format: ['code' => string|int, 'message' => string]
      * intval(code) === 0 means "no error".
      *
-     * @return array<string,int|string>
+     * @return array<string, int|string>
      */
     public function error(): array
     {
diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
index 76cbf3a1e7cb..4d118d04eb62 100644
--- a/system/Database/SQLite3/Forge.php
+++ b/system/Database/SQLite3/Forge.php
@@ -20,6 +20,11 @@
  */
 class Forge extends BaseForge
 {
+    /**
+     * @var Connection
+     */
+    protected $db;
+
     /**
      * UNSIGNED support
      *
@@ -98,11 +103,7 @@ public function dropDatabase(string $dbName): bool
     }
 
     /**
-     * ALTER TABLE
-     *
-     * @param string $alterType ALTER type
-     * @param string $table     Table name
-     * @param mixed  $field     Column definition
+     * @param mixed $field
      *
      * @return array|string|null
      */
@@ -142,11 +143,11 @@ protected function _processColumn(array $field): string
         }
 
         return $this->db->escapeIdentifiers($field['name'])
-               . ' ' . $field['type']
-               . $field['auto_increment']
-               . $field['null']
-               . $field['unique']
-               . $field['default'];
+            . ' ' . $field['type']
+            . $field['auto_increment']
+            . $field['null']
+            . $field['unique']
+            . $field['default'];
     }
 
     /**
@@ -170,15 +171,15 @@ protected function _processIndexes(string $table): array
 
             if (in_array($i, $this->uniqueKeys, true)) {
                 $sqls[] = 'CREATE UNIQUE INDEX ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
-                          . ' ON ' . $this->db->escapeIdentifiers($table)
-                          . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
+                    . ' ON ' . $this->db->escapeIdentifiers($table)
+                    . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
 
                 continue;
             }
 
             $sqls[] = 'CREATE INDEX ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
-                      . ' ON ' . $this->db->escapeIdentifiers($table)
-                      . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
+                . ' ON ' . $this->db->escapeIdentifiers($table)
+                . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
         }
 
         return $sqls;
@@ -188,8 +189,6 @@ protected function _processIndexes(string $table): array
      * Field attribute TYPE
      *
      * Performs a data type mapping between different databases.
-     *
-     * @return void
      */
     protected function _attributeType(array &$attributes)
     {
@@ -206,8 +205,6 @@ protected function _attributeType(array &$attributes)
 
     /**
      * Field attribute AUTO_INCREMENT
-     *
-     * @return void
      */
     protected function _attributeAutoIncrement(array &$attributes, array &$field)
     {
@@ -226,9 +223,6 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
     /**
      * Foreign Key Drop
      *
-     * @param string $table       Table name
-     * @param string $foreignName Foreign name
-     *
      * @throws DatabaseException
      */
     public function dropForeignKey(string $table, string $foreignName): bool
diff --git a/system/Database/SQLite3/PreparedQuery.php b/system/Database/SQLite3/PreparedQuery.php
index c5ee89ec3e26..7dada92b6226 100644
--- a/system/Database/SQLite3/PreparedQuery.php
+++ b/system/Database/SQLite3/PreparedQuery.php
@@ -36,7 +36,7 @@ class PreparedQuery extends BasePreparedQuery
      * @param array $options Passed to the connection's prepare statement.
      *                       Unused in the MySQLi driver.
      *
-     * @return mixed
+     * @return $this
      */
     public function _prepare(string $sql, array $options = [])
     {
diff --git a/system/Database/SQLite3/Result.php b/system/Database/SQLite3/Result.php
index b031645b09c2..6ad8e5dc939f 100644
--- a/system/Database/SQLite3/Result.php
+++ b/system/Database/SQLite3/Result.php
@@ -76,8 +76,6 @@ public function getFieldData(): array
 
     /**
      * Frees the current result.
-     *
-     * @return void
      */
     public function freeResult()
     {
diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php
index 01e0fd729fe6..8f04c0f645f1 100644
--- a/system/Database/SQLite3/Table.php
+++ b/system/Database/SQLite3/Table.php
@@ -93,9 +93,8 @@ public function fromTable(string $table)
     {
         $this->prefixedTableName = $table;
 
-        // Remove the prefix, if any, since it's
-        // already been added by the time we get here...
-        $prefix = $this->db->DBPrefix; // @phpstan-ignore-line
+        $prefix = $this->db->DBPrefix;
+
         if (! empty($prefix) && strpos($table, $prefix) === 0) {
             $table = substr($table, strlen($prefix));
         }
@@ -155,8 +154,6 @@ public function run(): bool
      */
     public function dropColumn($columns)
     {
-        //unset($this->fields[$column]);
-
         if (is_string($columns)) {
             $columns = explode(',', $columns);
         }
@@ -261,8 +258,6 @@ protected function createTable()
             }
         }
 
-        // Foreign Keys
-
         return $this->forge->createTable($this->tableName);
     }
 
@@ -270,8 +265,6 @@ protected function createTable()
      * Copies data from our old table to the new one,
      * taking care map data correctly based on any columns
      * that have been renamed.
-     *
-     * @return void
      */
     protected function copyData()
     {
@@ -286,7 +279,6 @@ protected function copyData()
         $exFields  = implode(', ', $exFields);
         $newFields = implode(', ', $newFields);
 
-        // @phpstan-ignore-next-line
         $this->db->query("INSERT INTO {$this->prefixedTableName}({$newFields}) SELECT {$exFields} FROM {$this->db->DBPrefix}temp_{$this->tableName}");
     }
 
@@ -353,8 +345,6 @@ protected function formatKeys($keys)
     /**
      * Attempts to drop all indexes and constraints
      * from the database for this table.
-     *
-     * @return void|null
      */
     protected function dropIndexes()
     {
diff --git a/system/Database/Seeder.php b/system/Database/Seeder.php
index 5e76f23a1a3e..b6127af2cd91 100644
--- a/system/Database/Seeder.php
+++ b/system/Database/Seeder.php
@@ -112,8 +112,6 @@ public static function faker(): ?Generator
      * Loads the specified seeder and runs it.
      *
      * @throws InvalidArgumentException
-     *
-     * @return void
      */
     public function call(string $class)
     {
@@ -140,9 +138,7 @@ public function call(string $class)
             // @codeCoverageIgnoreEnd
         }
 
-        /**
-         * @var Seeder
-         */
+        /** @var Seeder $seeder */
         $seeder = new $class($this->config);
         $seeder->setSilent($this->silent)->run();
 
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 3cf1196891e2..6e6a0a8fc88f 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -27,8 +27,6 @@
 use Kint\Kint;
 
 /**
- * Debug Toolbar
- *
  * Displays a toolbar with bits of stats to aid a developer in debugging.
  *
  * Inspiration: http://prophiler.fabfuel.de
@@ -49,9 +47,6 @@ class Toolbar
      */
     protected $collectors = [];
 
-    /**
-     * Constructor
-     */
     public function __construct(ToolbarConfig $config)
     {
         $this->config = $config;
@@ -261,8 +256,6 @@ protected function roundTo(float $number, int $increments = 5): float
      * @param ResponseInterface $response
      *
      * @global \CodeIgniter\CodeIgniter $app
-     *
-     * @return void
      */
     public function prepare(?RequestInterface $request = null, ?ResponseInterface $response = null)
     {
@@ -321,13 +314,13 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
             $kintScript         = substr($kintScript, 0, strpos($kintScript, '</style>') + 8);
 
             $script = PHP_EOL
-                    . '<script type="text/javascript" {csp-script-nonce} id="debugbar_loader" '
-                    . 'data-time="' . $time . '" '
-                    . 'src="' . site_url() . '?debugbar"></script>'
-                    . '<script type="text/javascript" {csp-script-nonce} id="debugbar_dynamic_script"></script>'
-                    . '<style type="text/css" {csp-style-nonce} id="debugbar_dynamic_style"></style>'
-                    . $kintScript
-                    . PHP_EOL;
+                . '<script type="text/javascript" {csp-script-nonce} id="debugbar_loader" '
+                . 'data-time="' . $time . '" '
+                . 'src="' . site_url() . '?debugbar"></script>'
+                . '<script type="text/javascript" {csp-script-nonce} id="debugbar_dynamic_script"></script>'
+                . '<style type="text/css" {csp-style-nonce} id="debugbar_dynamic_style"></style>'
+                . $kintScript
+                . PHP_EOL;
 
             if (strpos($response->getBody(), '<head>') !== false) {
                 $response->setBody(preg_replace('/<head>/', '<head>' . $script, $response->getBody(), 1));
@@ -397,9 +390,6 @@ public function respond()
 
     /**
      * Format output
-     *
-     * @param string $data   JSON encoded Toolbar data
-     * @param string $format html, json, xml
      */
     protected function format(string $data, string $format = 'html'): string
     {
diff --git a/system/Email/Email.php b/system/Email/Email.php
index 3ce079879293..c07f79d80df6 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -337,8 +337,6 @@ class Email
     ];
 
     /**
-     * Base charsets
-     *
      * Character sets valid for 7-bit encoding,
      * excluding language suffix.
      *
@@ -386,10 +384,6 @@ class Email
     protected static $func_overload;
 
     /**
-     * Constructor - Sets Email Preferences
-     *
-     * The constructor can be passed an array of config values
-     *
      * @param array|null $config
      */
     public function __construct($config = null)
@@ -434,8 +428,6 @@ public function initialize($config)
     }
 
     /**
-     * Initialize the Email Data
-     *
      * @param bool $clearAttachments
      *
      * @return Email
@@ -463,8 +455,6 @@ public function clear($clearAttachments = false)
     }
 
     /**
-     * Set FROM
-     *
      * @param string      $from
      * @param string      $name
      * @param string|null $returnPath Return-Path
@@ -485,15 +475,12 @@ public function setFrom($from, $name = '', $returnPath = null)
             }
         }
 
-        // Store the plain text values
         $this->tmpArchive['fromEmail'] = $from;
         $this->tmpArchive['fromName']  = $name;
 
-        // prepare the display name
         if ($name !== '') {
             // only use Q encoding if there are characters that would require it
             if (! preg_match('/[\200-\377]/', $name)) {
-                // add slashes for non-printing characters, slashes, and double quotes, and surround it in double quotes
                 $name = '"' . addcslashes($name, "\0..\37\177'\"\\") . '"';
             } else {
                 $name = $this->prepQEncoding($name);
@@ -511,8 +498,6 @@ public function setFrom($from, $name = '', $returnPath = null)
     }
 
     /**
-     * Set Reply-to
-     *
      * @param string $replyto
      * @param string $name
      *
@@ -533,7 +518,6 @@ public function setReplyTo($replyto, $name = '')
 
             // only use Q encoding if there are characters that would require it
             if (! preg_match('/[\200-\377]/', $name)) {
-                // add slashes for non-printing characters, slashes, and double quotes, and surround it in double quotes
                 $name = '"' . addcslashes($name, "\0..\37\177'\"\\") . '"';
             } else {
                 $name = $this->prepQEncoding($name);
@@ -548,8 +532,6 @@ public function setReplyTo($replyto, $name = '')
     }
 
     /**
-     * Set Recipients
-     *
      * @param array|string $to
      *
      * @return Email
@@ -573,8 +555,6 @@ public function setTo($to)
     }
 
     /**
-     * Set CC
-     *
      * @param string $cc
      *
      * @return Email
@@ -599,8 +579,6 @@ public function setCC($cc)
     }
 
     /**
-     * Set BCC
-     *
      * @param string $bcc
      * @param string $limit
      *
@@ -630,8 +608,6 @@ public function setBCC($bcc, $limit = '')
     }
 
     /**
-     * Set Email Subject
-     *
      * @param string $subject
      *
      * @return Email
@@ -647,8 +623,6 @@ public function setSubject($subject)
     }
 
     /**
-     * Set Body
-     *
      * @param string $body
      *
      * @return Email
@@ -661,8 +635,6 @@ public function setMessage($body)
     }
 
     /**
-     * Assign file attachments
-     *
      * @param string      $file        Can be local path, URL or buffered content
      * @param string      $disposition 'attachment'
      * @param string|null $newname
@@ -695,10 +667,7 @@ public function attach($file, $disposition = '', $newname = null, $mime = '')
         }
 
         // declare names on their own, to make phpcbf happy
-        $namesAttached = [
-            $file,
-            $newname,
-        ];
+        $namesAttached = [$file, $newname];
 
         $this->attachments[] = [
             'name'        => $namesAttached,
@@ -714,7 +683,6 @@ public function attach($file, $disposition = '', $newname = null, $mime = '')
 
     /**
      * Set and return attachment Content-ID
-     *
      * Useful for attached inline pictures
      *
      * @param string $filename
@@ -737,8 +705,6 @@ public function setAttachmentCID($filename)
     }
 
     /**
-     * Add a Header Item
-     *
      * @param string $header
      * @param string $value
      *
@@ -752,8 +718,6 @@ public function setHeader($header, $value)
     }
 
     /**
-     * Convert a String to an Array
-     *
      * @param string $email
      *
      * @return array
@@ -768,8 +732,6 @@ protected function stringToArray($email)
     }
 
     /**
-     * Set Multipart Value
-     *
      * @param string $str
      *
      * @return Email
@@ -782,8 +744,6 @@ public function setAltMessage($str)
     }
 
     /**
-     * Set Mailtype
-     *
      * @param string $type
      *
      * @return Email
@@ -796,8 +756,6 @@ public function setMailType($type = 'text')
     }
 
     /**
-     * Set Wordwrap
-     *
      * @param bool $wordWrap
      *
      * @return Email
@@ -810,8 +768,6 @@ public function setWordWrap($wordWrap = true)
     }
 
     /**
-     * Set Protocol
-     *
      * @param string $protocol
      *
      * @return Email
@@ -824,8 +780,6 @@ public function setProtocol($protocol = 'mail')
     }
 
     /**
-     * Set Priority
-     *
      * @param int $n
      *
      * @return Email
@@ -838,8 +792,6 @@ public function setPriority($n = 3)
     }
 
     /**
-     * Set Newline Character
-     *
      * @param string $newline
      *
      * @return Email
@@ -852,8 +804,6 @@ public function setNewline($newline = "\n")
     }
 
     /**
-     * Set CRLF
-     *
      * @param string $CRLF
      *
      * @return Email
@@ -866,8 +816,6 @@ public function setCRLF($CRLF = "\n")
     }
 
     /**
-     * Get the Message ID
-     *
      * @return string
      */
     protected function getMessageID()
@@ -878,8 +826,6 @@ protected function getMessageID()
     }
 
     /**
-     * Get Mail Protocol
-     *
      * @return string
      */
     protected function getProtocol()
@@ -894,8 +840,6 @@ protected function getProtocol()
     }
 
     /**
-     * Get Mail Encoding
-     *
      * @return string
      */
     protected function getEncoding()
@@ -916,8 +860,6 @@ protected function getEncoding()
     }
 
     /**
-     * Get content type (text/html/attachment)
-     *
      * @return string
      */
     protected function getContentType()
@@ -949,8 +891,6 @@ protected function setDate()
     }
 
     /**
-     * Mime message
-     *
      * @return string
      */
     protected function getMimeMessage()
@@ -959,8 +899,6 @@ protected function getMimeMessage()
     }
 
     /**
-     * Validate Email Address
-     *
      * @param array|string $email
      *
      * @return bool
@@ -985,8 +923,6 @@ public function validateEmail($email)
     }
 
     /**
-     * Email Validation
-     *
      * @param string $email
      *
      * @return bool
@@ -1002,8 +938,6 @@ public function isValidEmail($email)
     }
 
     /**
-     * Clean Extended Email Address: Joe Smith <joe@smith.com>
-     *
      * @param array|string $email
      *
      * @return array|string
@@ -1028,6 +962,7 @@ public function cleanEmail($email)
      *
      * Provides the raw message for use in plain-text headers of
      * HTML-formatted emails.
+     *
      * If the user hasn't specified his own alternative message
      * it creates one by stripping the HTML
      *
@@ -1046,15 +981,12 @@ protected function getAltMessage()
             $body = str_replace(str_repeat("\n", $i), "\n\n", $body);
         }
 
-        // Reduce multiple spaces
         $body = preg_replace('| +|', ' ', $body);
 
         return ($this->wordWrap) ? $this->wordWrap($body, 76) : $body;
     }
 
     /**
-     * Word Wrap
-     *
      * @param string   $str
      * @param int|null $charlim Line-length limit
      *
@@ -1062,21 +994,16 @@ protected function getAltMessage()
      */
     public function wordWrap($str, $charlim = null)
     {
-        // Set the character limit, if not already present
         if (empty($charlim)) {
             $charlim = empty($this->wrapChars) ? 76 : $this->wrapChars;
         }
 
-        // Standardize newlines
         if (strpos($str, "\r") !== false) {
             $str = str_replace(["\r\n", "\r"], "\n", $str);
         }
 
-        // Reduce multiple spaces at end of line
         $str = preg_replace('| +\n|', "\n", $str);
 
-        // If the current word is surrounded by {unwrap} tags we'll
-        // strip the entire chunk and replace it with a marker.
         $unwrap = [];
 
         if (preg_match_all('|\{unwrap\}(.+?)\{/unwrap\}|s', $str, $matches)) {
@@ -1095,8 +1022,6 @@ public function wordWrap($str, $charlim = null)
         $output = '';
 
         foreach (explode("\n", $str) as $line) {
-            // Is the line within the allowed character count?
-            // If so we'll join it to the output and continue
             if (static::strlen($line) <= $charlim) {
                 $output .= $line . $this->newline;
 
@@ -1106,18 +1031,14 @@ public function wordWrap($str, $charlim = null)
             $temp = '';
 
             do {
-                // If the over-length word is a URL we won't wrap it
                 if (preg_match('!\[url.+\]|://|www\.!', $line)) {
                     break;
                 }
 
-                // Trim the word down
                 $temp .= static::substr($line, 0, $charlim - 1);
                 $line = static::substr($line, $charlim - 1);
             } while (static::strlen($line) > $charlim);
 
-            // If $temp contains data it means we had to split up an over-length
-            // word into smaller chunks so we'll add it back to our current line
             if ($temp !== '') {
                 $output .= $temp . $this->newline;
             }
@@ -1125,7 +1046,6 @@ public function wordWrap($str, $charlim = null)
             $output .= $line . $this->newline;
         }
 
-        // Put our markers back
         if ($unwrap) {
             foreach ($unwrap as $key => $val) {
                 $output = str_replace('{{unwrapped' . $key . '}}', $val, $output);
@@ -1333,13 +1253,9 @@ protected function attachmentsHaveMultipart($type)
     }
 
     /**
-     * Prepares attachment string
-     *
      * @param string      $body      Message body to append to
      * @param string      $boundary  Multipart boundary
      * @param string|null $multipart When provided, only attachments of this type will be processed
-     *
-     * @return void
      */
     protected function appendAttachments(&$body, $boundary, $multipart = null)
     {
@@ -1366,8 +1282,6 @@ protected function appendAttachments(&$body, $boundary, $multipart = null)
     }
 
     /**
-     * Prep Quoted Printable
-     *
      * Prepares string for Quoted-Printable Content-Transfer-Encoding
      * Refer to RFC 2045 http://www.ietf.org/rfc/rfc2045.txt
      *
@@ -1531,8 +1445,6 @@ protected function prepQuotedPrintable($str)
     }
 
     /**
-     * Prep Q Encoding
-     *
      * Performs "Q Encoding" on a string for use in email headers.
      * It's related but not identical to quoted-printable, so it has its
      * own method.
@@ -1600,8 +1512,6 @@ protected function prepQEncoding($str)
     }
 
     /**
-     * Send Email
-     *
      * @param bool $autoClear
      *
      * @return bool
@@ -1822,9 +1732,7 @@ protected function sendWithSendmail()
 
         $from = $this->validateEmailForShell($from) ? '-f ' . $from : '';
 
-        // is popen() enabled?
         if (! function_usable('popen') || false === ($fp = @popen($this->mailPath . ' -oi ' . $from . ' -t', 'w'))) {
-            // server probably has popen disabled, so nothing we can do to get a verbose error.
             return false;
         }
 
@@ -1912,8 +1820,6 @@ protected function sendWithSmtp()
     }
 
     /**
-     * SMTP End
-     *
      * Shortcut to send RSET or QUIT depending on keep-alive
      */
     protected function SMTPEnd()
@@ -1922,8 +1828,6 @@ protected function SMTPEnd()
     }
 
     /**
-     * SMTP Connect
-     *
      * @return bool|string
      */
     protected function SMTPConnect()
@@ -1977,8 +1881,6 @@ protected function SMTPConnect()
     }
 
     /**
-     * Send SMTP command
-     *
      * @param string $cmd
      * @param string $data
      *
@@ -2053,8 +1955,6 @@ protected function sendCommand($cmd, $data = '')
     }
 
     /**
-     * SMTP Authenticate
-     *
      * @return bool
      */
     protected function SMTPAuthenticate()
@@ -2108,8 +2008,6 @@ protected function SMTPAuthenticate()
     }
 
     /**
-     * Send SMTP data
-     *
      * @param string $data
      *
      * @return bool
@@ -2153,8 +2051,6 @@ protected function sendData($data)
     }
 
     /**
-     * Get SMTP data
-     *
      * @return string
      */
     protected function getSMTPData()
@@ -2173,8 +2069,6 @@ protected function getSMTPData()
     }
 
     /**
-     * Get Hostname
-     *
      * There are only two legal types of hostname - either a fully
      * qualified domain name (eg: "mail.example.com") or an IP literal
      * (eg: "[1.2.3.4]").
@@ -2198,8 +2092,6 @@ protected function getHostname()
     }
 
     /**
-     * Get Debug Message
-     *
      * @param array $include List of raw data chunks to include in the output
      *                       Valid options are: 'headers', 'subject', 'body'
      *
@@ -2230,8 +2122,6 @@ public function printDebugger($include = ['headers', 'subject', 'body'])
     }
 
     /**
-     * Set Message
-     *
      * @param string $msg
      */
     protected function setErrorMessage($msg)
@@ -2253,9 +2143,6 @@ protected function mimeTypes($ext = '')
         return ! empty($mime) ? $mime : 'application/x-unknown-content-type';
     }
 
-    /**
-     * Destructor
-     */
     public function __destruct()
     {
         if (is_resource($this->SMTPConnect)) {
diff --git a/system/Encryption/Encryption.php b/system/Encryption/Encryption.php
index 0b5925902f84..35c3568120ca 100644
--- a/system/Encryption/Encryption.php
+++ b/system/Encryption/Encryption.php
@@ -76,13 +76,7 @@ class Encryption
     protected $handlers = [];
 
     /**
-     * Class constructor
-     *
-     * @param EncryptionConfig $config Configuration parameters
-     *
      * @throws EncryptionException
-     *
-     * @return void
      */
     public function __construct(?EncryptionConfig $config = null)
     {
@@ -92,16 +86,13 @@ public function __construct(?EncryptionConfig $config = null)
         $this->driver = $config->driver;
         $this->digest = $config->digest ?? 'SHA512';
 
-        // Map what we have installed
         $this->handlers = [
             'OpenSSL' => extension_loaded('openssl'),
             // the SodiumHandler uses some API (like sodium_pad) that is available only on v1.0.14+
             'Sodium' => extension_loaded('sodium') && version_compare(SODIUM_LIBRARY_VERSION, '1.0.14', '>='),
         ];
 
-        // If requested driver is not active, bail
         if (! in_array($this->driver, $this->drivers, true) || (array_key_exists($this->driver, $this->handlers) && ! $this->handlers[$this->driver])) {
-            // this should never happen in travis-ci
             throw EncryptionException::forNoHandlerAvailable($this->driver);
         }
     }
@@ -109,27 +100,22 @@ public function __construct(?EncryptionConfig $config = null)
     /**
      * Initialize or re-initialize an encrypter
      *
-     * @param EncryptionConfig $config Configuration parameters
-     *
      * @throws EncryptionException
      *
      * @return EncrypterInterface
      */
     public function initialize(?EncryptionConfig $config = null)
     {
-        // override config?
         if ($config) {
             $this->key    = $config->key;
             $this->driver = $config->driver;
             $this->digest = $config->digest ?? 'SHA512';
         }
 
-        // Insist on a driver
         if (empty($this->driver)) {
             throw EncryptionException::forNoDriverRequested();
         }
 
-        // Check for an unknown driver
         if (! in_array($this->driver, $this->drivers, true)) {
             throw EncryptionException::forUnKnownHandler($this->driver);
         }
@@ -138,7 +124,6 @@ public function initialize(?EncryptionConfig $config = null)
             throw EncryptionException::forNeedsStarterKey();
         }
 
-        // Derive a secret key for the encrypter
         $this->hmacKey = bin2hex(\hash_hkdf($this->digest, $this->key));
 
         $handlerName     = 'CodeIgniter\\Encryption\\Handlers\\' . $this->driver . 'Handler';
diff --git a/system/Encryption/Handlers/SodiumHandler.php b/system/Encryption/Handlers/SodiumHandler.php
index f6903a3bed6b..9dc4cdbdec44 100644
--- a/system/Encryption/Handlers/SodiumHandler.php
+++ b/system/Encryption/Handlers/SodiumHandler.php
@@ -113,8 +113,6 @@ public function decrypt($data, $params = null)
      * @param array|string|null $params
      *
      * @throws EncryptionException If key is empty
-     *
-     * @return void
      */
     protected function parseParams($params)
     {
diff --git a/system/Events/Events.php b/system/Events/Events.php
index d32ff339126b..a0d9c7616451 100644
--- a/system/Events/Events.php
+++ b/system/Events/Events.php
@@ -63,8 +63,6 @@ class Events
 
     /**
      * Ensures that we have a events file ready.
-     *
-     * @return void
      */
     public static function initialize()
     {
@@ -113,8 +111,6 @@ public static function initialize()
      * @param string   $eventName
      * @param callable $callback
      * @param int      $priority
-     *
-     * @return void
      */
     public static function on($eventName, $callback, $priority = EVENT_PRIORITY_NORMAL)
     {
@@ -229,8 +225,6 @@ public static function removeListener($eventName, callable $listener): bool
      * removed, otherwise all listeners for all events are removed.
      *
      * @param string|null $eventName
-     *
-     * @return void
      */
     public static function removeAllListeners($eventName = null)
     {
@@ -243,8 +237,6 @@ public static function removeAllListeners($eventName = null)
 
     /**
      * Sets the path to the file that routes are read from.
-     *
-     * @return void
      */
     public static function setFiles(array $files)
     {
@@ -265,8 +257,6 @@ public function getFiles()
      * Turns simulation on or off. When on, events will not be triggered,
      * simply logged. Useful during testing when you don't actually want
      * the tests to run.
-     *
-     * @return void
      */
     public static function simulate(bool $choice = true)
     {
diff --git a/system/Filters/DebugToolbar.php b/system/Filters/DebugToolbar.php
index cc57cd50b81e..ae4c09c8bf9c 100644
--- a/system/Filters/DebugToolbar.php
+++ b/system/Filters/DebugToolbar.php
@@ -24,8 +24,6 @@ class DebugToolbar implements FilterInterface
      * We don't need to do anything here.
      *
      * @param array|null $arguments
-     *
-     * @return void
      */
     public function before(RequestInterface $request, $arguments = null)
     {
@@ -36,8 +34,6 @@ public function before(RequestInterface $request, $arguments = null)
      * and debug information and display it in a toolbar.
      *
      * @param array|null $arguments
-     *
-     * @return void
      */
     public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
     {
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index 42ba65617954..bce502a3f4e9 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -372,8 +372,6 @@ public function getArguments(?string $key = null)
      * Add any applicable (not excluded) global filter settings to the mix.
      *
      * @param string $uri
-     *
-     * @return void
      */
     protected function processGlobals(?string $uri = null)
     {
@@ -417,8 +415,6 @@ protected function processGlobals(?string $uri = null)
 
     /**
      * Add any method-specific filters to the mix.
-     *
-     * @return void
      */
     protected function processMethods()
     {
@@ -440,8 +436,6 @@ protected function processMethods()
      * Add any applicable configured filters to the mix.
      *
      * @param string $uri
-     *
-     * @return void
      */
     protected function processFilters(?string $uri = null)
     {
@@ -474,8 +468,6 @@ protected function processFilters(?string $uri = null)
      * Maps filter aliases to the equivalent filter classes
      *
      * @throws FilterException
-     *
-     * @return void
      */
     protected function processAliasesToClass(string $position)
     {
diff --git a/system/Filters/Honeypot.php b/system/Filters/Honeypot.php
index 022999bcfac3..539513e7cb8a 100644
--- a/system/Filters/Honeypot.php
+++ b/system/Filters/Honeypot.php
@@ -28,8 +28,6 @@ class Honeypot implements FilterInterface
      * @param array|null $arguments
      *
      * @throws HoneypotException
-     *
-     * @return void
      */
     public function before(RequestInterface $request, $arguments = null)
     {
@@ -42,8 +40,6 @@ public function before(RequestInterface $request, $arguments = null)
      * Attach a honeypot to the current response.
      *
      * @param array|null $arguments
-     *
-     * @return void
      */
     public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
     {
diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index ed19d2d9b020..3b18fc8bf1df 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -210,8 +210,6 @@ public function __construct(ContentSecurityPolicyConfig $config)
      * Compiles and sets the appropriate headers in the request.
      *
      * Should be called just prior to sending the response to the user agent.
-     *
-     * @return void
      */
     public function finalize(ResponseInterface &$response)
     {
@@ -552,8 +550,6 @@ public function upgradeInsecureRequests(bool $value = true)
      * DRY method to add an string or array to a class property.
      *
      * @param array|string $options
-     *
-     * @return void
      */
     protected function addOption($options, string $target, ?bool $explicitReporting = null)
     {
@@ -575,8 +571,6 @@ protected function addOption($options, string $target, ?bool $explicitReporting
      * Scans the body of the request message and replaces any nonce
      * placeholders with actual nonces, that we'll then add to our
      * headers.
-     *
-     * @return void
      */
     protected function generateNonces(ResponseInterface &$response)
     {
@@ -619,8 +613,6 @@ protected function generateNonces(ResponseInterface &$response)
      * Based on the current state of the elements, will add the appropriate
      * Content-Security-Policy and Content-Security-Policy-Report-Only headers
      * with their values to the response object.
-     *
-     * @return void
      */
     protected function buildHeaders(ResponseInterface &$response)
     {
@@ -705,8 +697,6 @@ protected function buildHeaders(ResponseInterface &$response)
      * reportOnly header, since it's viable to have both simultaneously.
      *
      * @param array|string|null $values
-     *
-     * @return void
      */
     protected function addToHeader(string $name, $values = null)
     {
diff --git a/system/HTTP/UserAgent.php b/system/HTTP/UserAgent.php
index 89db334b64b3..10088111cec1 100644
--- a/system/HTTP/UserAgent.php
+++ b/system/HTTP/UserAgent.php
@@ -247,8 +247,6 @@ public function getReferrer(): string
 
     /**
      * Parse a custom user-agent string
-     *
-     * @return void
      */
     public function parse(string $string)
     {
@@ -271,8 +269,6 @@ public function parse(string $string)
 
     /**
      * Compile the User Agent Data
-     *
-     * @return void
      */
     protected function compileData()
     {
diff --git a/system/Helpers/cookie_helper.php b/system/Helpers/cookie_helper.php
index 7eeed052b2e1..e47a86356dbf 100755
--- a/system/Helpers/cookie_helper.php
+++ b/system/Helpers/cookie_helper.php
@@ -80,8 +80,6 @@ function get_cookie($index, bool $xssClean = false)
      * @param string $path   the cookie path
      * @param string $prefix the cookie prefix
      *
-     * @return void
-     *
      * @see \CodeIgniter\HTTP\Response::deleteCookie()
      */
     function delete_cookie($name, string $domain = '', string $path = '/', string $prefix = '')
diff --git a/system/Images/Handlers/BaseHandler.php b/system/Images/Handlers/BaseHandler.php
index 9e6217f5c564..3e0d81c2dc68 100644
--- a/system/Images/Handlers/BaseHandler.php
+++ b/system/Images/Handlers/BaseHandler.php
@@ -720,13 +720,10 @@ public function __call(string $name, array $args = [])
      *
      * This function lets us re-proportion the width/height
      * if users choose to maintain the aspect ratio when resizing.
-     *
-     * @return void
      */
     protected function reproportion()
     {
-        if (($this->width === 0 && $this->height === 0) || $this->image()->origWidth === 0 || $this->image()->origHeight === 0 || (! ctype_digit((string) $this->width) && ! ctype_digit((string) $this->height)) || ! ctype_digit((string) $this->image()->origWidth) || ! ctype_digit((string) $this->image()->origHeight)
-        ) {
+        if (($this->width === 0 && $this->height === 0) || $this->image()->origWidth === 0 || $this->image()->origHeight === 0 || (! ctype_digit((string) $this->width) && ! ctype_digit((string) $this->height)) || ! ctype_digit((string) $this->image()->origWidth) || ! ctype_digit((string) $this->image()->origHeight)) {
             return;
         }
 
diff --git a/system/Images/Handlers/GDHandler.php b/system/Images/Handlers/GDHandler.php
index a3f0a0eb88df..02d61c40a007 100644
--- a/system/Images/Handlers/GDHandler.php
+++ b/system/Images/Handlers/GDHandler.php
@@ -30,12 +30,9 @@ public function __construct($config = null)
     {
         parent::__construct($config);
 
-        // We should never see this, so can't test it
-        // @codeCoverageIgnoreStart
         if (! extension_loaded('gd')) {
-            throw ImageException::forMissingExtension('GD');
+            throw ImageException::forMissingExtension('GD'); // @codeCoverageIgnore
         }
-        // @codeCoverageIgnoreEnd
     }
 
     /**
@@ -367,8 +364,6 @@ protected function getImageResource(string $path, int $imageType)
 
     /**
      * Add text overlay to an image.
-     *
-     * @return void
      */
     protected function _text(string $text, array $options = [])
     {
@@ -446,8 +441,6 @@ protected function _text(string $text, array $options = [])
      * Handler-specific method for overlaying text on an image.
      *
      * @param bool $isShadow Whether we are drawing the dropshadow or actual text
-     *
-     * @return void
      */
     protected function textOverlay(string $text, array $options = [], bool $isShadow = false)
     {
diff --git a/system/Model.php b/system/Model.php
index 8c36b5d5ace8..3617f83f69cb 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -29,8 +29,6 @@
 use ReflectionProperty;
 
 /**
- * Class Model
- *
  * The Model class extends BaseModel and provides additional
  * convenient features that makes working with a SQL database
  * table less painful.
@@ -40,7 +38,7 @@
  *      - allow intermingling calls to the builder
  *      - removes the need to use Result object directly in most cases
  *
- * @mixin    BaseBuilder
+ * @mixin BaseBuilder
  *
  * @property BaseConnection $db
  */
@@ -91,12 +89,6 @@ class Model extends BaseModel
      */
     protected $escape = [];
 
-    /**
-     * Model constructor.
-     *
-     * @param ConnectionInterface|null $db         DB Connection
-     * @param ValidationInterface|null $validation Validation
-     */
     public function __construct(?ConnectionInterface &$db = null, ?ValidationInterface $validation = null)
     {
         /**
@@ -284,8 +276,8 @@ protected function doInsertBatch(?array $set = null, ?bool $escape = null, int $
      * Updates a single record in $this->table.
      * This methods works only with dbCalls
      *
-     * @param array|int|string|null $id   ID
-     * @param array|null            $data Data
+     * @param array|int|string|null $id
+     * @param array|null            $data
      */
     protected function doUpdate($id = null, $data = null): bool
     {
@@ -385,8 +377,6 @@ protected function doPurgeDeleted()
      * Works with the find* methods to return only the rows that
      * have been deleted.
      * This methods works only with dbCalls
-     *
-     * @return void
      */
     protected function doOnlyDeleted()
     {
@@ -467,12 +457,7 @@ public function getIdValue($data)
      * determine the rows to operate on.
      * This methods works only with dbCalls
      *
-     * @param int     $size     Size
-     * @param Closure $userFunc Callback Function
-     *
      * @throws DataException
-     *
-     * @return void
      */
     public function chunk(int $size, Closure $userFunc)
     {
@@ -506,9 +491,6 @@ public function chunk(int $size, Closure $userFunc)
     /**
      * Override countAllResults to account for soft deleted accounts.
      *
-     * @param bool $reset Reset
-     * @param bool $test  Test
-     *
      * @return mixed
      */
     public function countAllResults(bool $reset = true, bool $test = false)
@@ -530,8 +512,6 @@ public function countAllResults(bool $reset = true, bool $test = false)
     /**
      * Provides a shared instance of the Query Builder.
      *
-     * @param string|null $table Table name
-     *
      * @throws ModelException
      *
      * @return BaseBuilder
@@ -577,9 +557,9 @@ public function builder(?string $table = null)
      * data here. This allows it to be used with any of the other
      * builder methods and still get validated data, like replace.
      *
-     * @param mixed       $key    Field name, or an array of field/value pairs
-     * @param string|null $value  Field value, if $key is a single field
-     * @param bool|null   $escape Whether to escape values and identifiers
+     * @param array|string $key    Field name, or an array of field/value pairs
+     * @param string|null  $value  Field value, if $key is a single field
+     * @param bool|null    $escape Whether to escape values and identifiers
      *
      * @return $this
      */
@@ -616,7 +596,7 @@ protected function shouldUpdate($data): bool
      * Inserts data into the database. If an object is provided,
      * it will attempt to convert it to an array.
      *
-     * @param array|object|null $data     Data
+     * @param array|object|null $data
      * @param bool              $returnID Whether insert ID should be returned or not.
      *
      * @throws ReflectionException
@@ -644,8 +624,8 @@ public function insert($data = null, bool $returnID = true)
      * Updates a single record in the database. If an object is provided,
      * it will attempt to convert it into an array.
      *
-     * @param array|int|string|null $id   ID
-     * @param array|object|null     $data Data
+     * @param array|int|string|null $id
+     * @param array|object|null     $data
      *
      * @throws ReflectionException
      */
@@ -670,9 +650,8 @@ public function update($id = null, $data = null): bool
      * Takes a class an returns an array of it's public and protected
      * properties as an array with raw values.
      *
-     * @param object|string $data        Data
-     * @param bool          $onlyChanged Only Changed Property
-     * @param bool          $recursive   If true, inner entities will be casted as array as well
+     * @param object|string $data
+     * @param bool          $recursive If true, inner entities will be casted as array as well
      *
      * @throws ReflectionException
      *
@@ -683,8 +662,10 @@ protected function objectToRawArray($data, bool $onlyChanged = true, bool $recur
         $properties = parent::objectToRawArray($data, $onlyChanged);
 
         // Always grab the primary key otherwise updates will fail.
-        if (method_exists($data, 'toRawArray') && (! empty($properties) && ! empty($this->primaryKey) && ! in_array($this->primaryKey, $properties, true)
-                && ! empty($data->{$this->primaryKey}))) {
+        if (
+            method_exists($data, 'toRawArray') && (! empty($properties) && ! empty($this->primaryKey) && ! in_array($this->primaryKey, $properties, true)
+            && ! empty($data->{$this->primaryKey}))
+        ) {
             $properties[$this->primaryKey] = $data->{$this->primaryKey};
         }
 
@@ -729,9 +710,6 @@ public function __isset(string $name): bool
      * Provides direct access to method in the builder (if available)
      * and the database connection.
      *
-     * @param string $name   Name
-     * @param array  $params Params
-     *
      * @return $this|null
      */
     public function __call(string $name, array $params)
@@ -763,10 +741,8 @@ public function __call(string $name, array $params)
      * Takes a class an returns an array of it's public and protected
      * properties as an array suitable for use in creates and updates.
      *
-     * @param object|string $data        Data
-     * @param string|null   $primaryKey  Primary Key
-     * @param string        $dateFormat  Date Format
-     * @param bool          $onlyChanged Only Changed
+     * @param object|string $data
+     * @param string|null   $primaryKey
      *
      * @throws ReflectionException
      *
diff --git a/system/RESTful/BaseResource.php b/system/RESTful/BaseResource.php
index d699230b6fa5..65ad21251a3d 100644
--- a/system/RESTful/BaseResource.php
+++ b/system/RESTful/BaseResource.php
@@ -34,8 +34,6 @@ abstract class BaseResource extends Controller
     public function initController(RequestInterface $request, ResponseInterface $response, LoggerInterface $logger)
     {
         parent::initController($request, $response, $logger);
-
-        // instantiate our model, if needed
         $this->setModel($this->modelName);
     }
 
@@ -44,23 +42,18 @@ public function initController(RequestInterface $request, ResponseInterface $res
      * Given either the name or the object, determine the other.
      *
      * @param object|string|null $which
-     *
-     * @return void
      */
     public function setModel($which = null)
     {
-        // save what we have been given
         if ($which) {
             $this->model     = is_object($which) ? $which : null;
             $this->modelName = is_object($which) ? null : $which;
         }
 
-        // make a model object if needed
         if (empty($this->model) && ! empty($this->modelName) && class_exists($this->modelName)) {
             $this->model = model($this->modelName);
         }
 
-        // determine model name if needed
         if (! empty($this->model) && empty($this->modelName)) {
             $this->modelName = get_class($this->model);
         }
diff --git a/system/RESTful/ResourceController.php b/system/RESTful/ResourceController.php
index 3dae1b80d253..809545c1513b 100644
--- a/system/RESTful/ResourceController.php
+++ b/system/RESTful/ResourceController.php
@@ -100,8 +100,6 @@ public function delete($id = null)
 
     /**
      * Set/change the expected response representation for returned objects
-     *
-     * @return void
      */
     public function setFormat(string $format = 'json')
     {
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index a5b5a52c17af..7a9ab5010872 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -588,8 +588,6 @@ public function getRedirectCode(string $from): int
      *
      * @param string         $name      The name to group/prefix the routes with.
      * @param array|callable ...$params
-     *
-     * @return void
      */
     public function group(string $name, ...$params)
     {
diff --git a/system/Session/Session.php b/system/Session/Session.php
index f95d57ca990a..808e5fd65f49 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -339,8 +339,6 @@ protected function configure()
      *
      * So we were forced to make changes, and OF COURSE something was
      * going to break and now we have this pile of shit. -- Narf
-     *
-     * @return void
      */
     protected function configureSidLength()
     {
@@ -514,8 +512,6 @@ public function has(string $key): bool
      *
      * @param string $key  Identifier of the session property we are interested in.
      * @param array  $data value to be pushed to existing session key.
-     *
-     * @return void
      */
     public function push(string $key, array $data)
     {
diff --git a/system/Test/DatabaseTestTrait.php b/system/Test/DatabaseTestTrait.php
index 2dc69aeb4b9b..4ad164cd272d 100644
--- a/system/Test/DatabaseTestTrait.php
+++ b/system/Test/DatabaseTestTrait.php
@@ -199,8 +199,6 @@ protected function runSeeds()
 
     /**
      * Seeds that database with a specific seeder.
-     *
-     * @return void
      */
     public function seed(string $name)
     {
@@ -277,8 +275,6 @@ public function grabFromDatabase(string $table, string $column, array $where)
      * exist in the database.
      *
      * @throws DatabaseException
-     *
-     * @return void
      */
     public function seeInDatabase(string $table, array $where)
     {
@@ -289,8 +285,6 @@ public function seeInDatabase(string $table, array $where)
     /**
      * Asserts that records that match the conditions in $where do
      * not exist in the database.
-     *
-     * @return void
      */
     public function dontSeeInDatabase(string $table, array $where)
     {
@@ -322,8 +316,6 @@ public function hasInDatabase(string $table, array $data)
      * is equal to $expected.
      *
      * @throws DatabaseException
-     *
-     * @return void
      */
     public function seeNumRecords(int $expected, string $table, array $where)
     {
diff --git a/system/Test/FilterTestTrait.php b/system/Test/FilterTestTrait.php
index 0240eac92607..680515ed107b 100644
--- a/system/Test/FilterTestTrait.php
+++ b/system/Test/FilterTestTrait.php
@@ -221,8 +221,6 @@ protected function assertFilter(string $route, string $position, string $alias):
      * @param string $route    The route to test
      * @param string $position "before" or "after"
      * @param string $alias    Alias for the anticipated filter
-     *
-     * @return void
      */
     protected function assertNotFilter(string $route, string $position, string $alias)
     {
@@ -241,8 +239,6 @@ protected function assertNotFilter(string $route, string $position, string $alia
      *
      * @param string $route    The route to test
      * @param string $position "before" or "after"
-     *
-     * @return void
      */
     protected function assertHasFilters(string $route, string $position)
     {
@@ -260,8 +256,6 @@ protected function assertHasFilters(string $route, string $position)
      *
      * @param string $route    The route to test
      * @param string $position "before" or "after"
-     *
-     * @return void
      */
     protected function assertNotHasFilters(string $route, string $position)
     {
diff --git a/system/View/Table.php b/system/View/Table.php
index 8eab66bbd8a1..d57a7092de00 100644
--- a/system/View/Table.php
+++ b/system/View/Table.php
@@ -87,8 +87,6 @@ class Table
      * Set the template from the table config file if it exists
      *
      * @param array $config (default: array())
-     *
-     * @return void
      */
     public function __construct($config = [])
     {
@@ -404,8 +402,6 @@ public function clear()
      * Set table data from a database result object
      *
      * @param BaseResult $object Database result object
-     *
-     * @return void
      */
     protected function _setFromDBResult($object)
     {
@@ -423,8 +419,6 @@ protected function _setFromDBResult($object)
      * Set table data from an array
      *
      * @param array $data
-     *
-     * @return void
      */
     protected function _setFromArray($data)
     {
@@ -439,8 +433,6 @@ protected function _setFromArray($data)
 
     /**
      * Compile Template
-     *
-     * @return void
      */
     protected function _compileTemplate()
     {
diff --git a/system/View/View.php b/system/View/View.php
index 966dcf0feacb..cba8c70c06f6 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -134,11 +134,6 @@ class View implements RendererInterface
      */
     protected $sectionStack = [];
 
-    /**
-     * Constructor
-     *
-     * @param LoggerInterface $logger
-     */
     public function __construct(ViewConfig $config, ?string $viewPath = null, ?FileLocator $loader = null, ?bool $debug = null, ?LoggerInterface $logger = null)
     {
         $this->config   = $config;
@@ -331,14 +326,14 @@ public function setData(array $data = [], ?string $context = null): RendererInte
     /**
      * Sets a single piece of view data.
      *
-     * @param mixed  $value
-     * @param string $context The context to escape it for: html, css, js, url
-     *                        If null, no escaping will happen
+     * @param mixed       $value
+     * @param string|null $context The context to escape it for: html, css, js, url
+     *                             If null, no escaping will happen
      */
     public function setVar(string $name, $value = null, ?string $context = null): RendererInterface
     {
         if ($context) {
-            $value = \esc($value, $context);
+            $value = esc($value, $context);
         }
 
         $this->tempData        = $this->tempData ?? $this->data;
@@ -367,8 +362,6 @@ public function getData(): array
 
     /**
      * Specifies that the current view should extend an existing layout.
-     *
-     * @return void
      */
     public function extend(string $layout)
     {
@@ -379,8 +372,6 @@ public function extend(string $layout)
      * Starts holds content for a section within the layout.
      *
      * @param string $name Section name
-     *
-     * @return void
      */
     public function section(string $name)
     {
@@ -395,8 +386,6 @@ public function section(string $name)
      * Captures the last section
      *
      * @throws RuntimeException
-     *
-     * @return void
      */
     public function endSection()
     {
@@ -454,8 +443,6 @@ public function getPerformanceData(): array
 
     /**
      * Logs performance data for rendering a view.
-     *
-     * @return void
      */
     protected function logPerformance(float $start, float $end, string $view)
     {

From 31bfbbaa510853ddd730944dc6af203791f23e1b Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sun, 25 Jul 2021 00:44:13 +0800
Subject: [PATCH 0111/2325] Fix notice in pre-commit hook

---
 admin/pre-commit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/pre-commit b/admin/pre-commit
index 46b36987da2a..d05724d58146 100644
--- a/admin/pre-commit
+++ b/admin/pre-commit
@@ -69,7 +69,7 @@ if [ "$FILES" != "" ]; then
         php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no --diff
     fi
 
-    if [ $? != 0]; then
+    if [ $? != 0 ]; then
         echo "Files in system, tests, utils, or root are not following the coding standards. Please fix them before commit."
         exit 1
     fi

From 3ab3adeabedc41f4cbb762591d13f4555caa2acd Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 29 Jul 2021 00:15:42 +0800
Subject: [PATCH 0112/2325] Delete `docs` directly, not `api/docs` (#4976)

---
 .github/workflows/deploy-apidocs.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/deploy-apidocs.yml b/.github/workflows/deploy-apidocs.yml
index 4edf916d1a27..b3aab2a1c83a 100644
--- a/.github/workflows/deploy-apidocs.yml
+++ b/.github/workflows/deploy-apidocs.yml
@@ -32,7 +32,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: codeigniter4/api
-          token: ${{ secrets.ACCESS_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           path: api
 
       - name: Setup PHP
@@ -41,10 +41,6 @@ jobs:
           php-version: '8.0'
           coverage: none
 
-      - name: Install GraphViz for phpDocumentor
-        run: |
-          sudo apt-get install -yq graphviz
-
       - name: Download phpDocumentor v3.1
         run: |
           cd ./source
@@ -56,8 +52,8 @@ jobs:
         working-directory: api
         run: |
           git reset --hard master
-          rm -rfv api/docs
-          mkdir --parents --verbose api/docs
+          rm -rfv docs
+          mkdir --parents --verbose docs
 
       - name: Build API in source repo
         working-directory: source

From cb4fe4d8a841070b27f38629798d2399e1d27a59 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 29 Jul 2021 00:18:19 +0800
Subject: [PATCH 0113/2325] Revert to use `ACCESS_TOKEN`

---
 .github/workflows/deploy-apidocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-apidocs.yml b/.github/workflows/deploy-apidocs.yml
index b3aab2a1c83a..3b441e36485d 100644
--- a/.github/workflows/deploy-apidocs.yml
+++ b/.github/workflows/deploy-apidocs.yml
@@ -32,7 +32,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: codeigniter4/api
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.ACCESS_TOKEN }}
           path: api
 
       - name: Setup PHP

From f730dbada303307b663fb7da8a74294375d10fd4 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Thu, 29 Jul 2021 09:00:08 +0700
Subject: [PATCH 0114/2325] [Rector] Apply Rector:
 RemoveDuplicatedArrayKeyRector

---
 rector.php                                    |  2 +
 tests/system/Helpers/InflectorHelperTest.php  |  6 ---
 .../system/Validation/CreditCardRulesTest.php | 45 -------------------
 3 files changed, 2 insertions(+), 51 deletions(-)

diff --git a/rector.php b/rector.php
index 32b09bd95311..6f47b388576d 100644
--- a/rector.php
+++ b/rector.php
@@ -28,6 +28,7 @@
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
 use Rector\Core\Configuration\Option;
 use Rector\Core\ValueObject\PhpVersion;
+use Rector\DeadCode\Rector\Array_\RemoveDuplicatedArrayKeyRector;
 use Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector;
 use Rector\DeadCode\Rector\Concat\RemoveConcatAutocastRector;
 use Rector\DeadCode\Rector\Foreach_\RemoveUnusedForeachKeyRector;
@@ -113,4 +114,5 @@
     $services->set(RemoveUnusedVariableAssignRector::class);
     $services->set(FuncGetArgsToVariadicParamRector::class);
     $services->set(MakeInheritedMethodVisibilitySameAsParentRector::class);
+    $services->set(RemoveDuplicatedArrayKeyRector::class);
 };
diff --git a/tests/system/Helpers/InflectorHelperTest.php b/tests/system/Helpers/InflectorHelperTest.php
index 9085edf4a395..81939b461c7f 100755
--- a/tests/system/Helpers/InflectorHelperTest.php
+++ b/tests/system/Helpers/InflectorHelperTest.php
@@ -244,12 +244,6 @@ public function testDasherize()
     public function testOrdinal()
     {
         $suffixes = [
-            'st' => 1,
-            'nd' => 2,
-            'rd' => 3,
-            'th' => 4,
-            'th' => 11,
-            'th' => 20,
             'st' => 21,
             'nd' => 22,
             'rd' => 23,
diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php
index 61b3076bc34b..fe912f9684d7 100644
--- a/tests/system/Validation/CreditCardRulesTest.php
+++ b/tests/system/Validation/CreditCardRulesTest.php
@@ -148,46 +148,6 @@ public function creditCardProvider()
                 '6011 0009 9013 9424',
                 true,
             ],
-            'jcb1' => [
-                'jcb',
-                '3530 1113 3330 0000',
-                true,
-            ],
-            'jcb2' => [
-                'jcb',
-                '3566 0020 2036 0505',
-                true,
-            ],
-            'mastercard1' => [
-                'mastercard',
-                '5555 5555 5555 4444',
-                true,
-            ],
-            'mastercard2' => [
-                'mastercard',
-                '5105 1051 0510 5100',
-                true,
-            ],
-            'visa1' => [
-                'visa',
-                '4111 1111 1111 1111',
-                true,
-            ],
-            'visa2' => [
-                'visa',
-                '4012 8888 8888 1881',
-                true,
-            ],
-            'visa3' => [
-                'visa',
-                '4222 2222 2222 2',
-                true,
-            ],
-            'dankort1' => [
-                'dankort',
-                '5019 7170 1010 3742',
-                true,
-            ],
             'unionpay1' => [
                 'unionpay',
                 $this->generateCardNum(62, 16),
@@ -1203,11 +1163,6 @@ public function creditCardProvider()
                 $this->generateCardNum(500, 16),
                 true,
             ],
-            'hsbc' => [
-                'hsbc',
-                $this->generateCardNum(56, 16),
-                true,
-            ],
             'hsbc' => [
                 'hsbc',
                 $this->generateCardNum(57, 16),

From 241abc9194c74677247bbee13686839b89b8d8e0 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Thu, 29 Jul 2021 10:11:25 +0700
Subject: [PATCH 0115/2325] remove key in creditCardProvider

---
 .../system/Validation/CreditCardRulesTest.php | 479 ++++++++++--------
 1 file changed, 262 insertions(+), 217 deletions(-)

diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php
index fe912f9684d7..21182127266a 100644
--- a/tests/system/Validation/CreditCardRulesTest.php
+++ b/tests/system/Validation/CreditCardRulesTest.php
@@ -83,1087 +83,1132 @@ public function testValidCCNumber($type, $number, $expected = false)
     public function creditCardProvider()
     {
         return [
-            'null_test' => [
+            [
                 'amex',
                 null,
                 false,
             ],
-            'random_test' => [
+            [
                 'amex',
                 $this->generateCardNum('37', 16),
                 false,
             ],
-            'invalid_type' => [
+            [
                 'shorty',
                 '1111 1111 1111 1111',
                 false,
             ],
-            'invalid_length' => [
+            [
                 'amex',
                 '',
                 false,
             ],
-            'not_numeric' => [
+            [
                 'amex',
                 'abcd efgh ijkl mnop',
                 false,
             ],
-            'bad_length' => [
+            [
                 'amex',
                 '3782 8224 6310 0051',
                 false,
             ],
-            'bad_prefix' => [
+            [
                 'amex',
                 '3582 8224 6310 0051',
                 false,
             ],
-            'amex1' => [
+            [
                 'amex',
                 '3782 8224 6310 005',
                 true,
             ],
-            'amex2' => [
+            [
                 'amex',
                 '3714 4963 5398 431',
                 true,
             ],
-            'dinersclub1' => [
+            [
                 'dinersclub',
                 '3056 9309 0259 04',
                 true,
             ],
-            'dinersculb2' => [
+            [
                 'dinersclub',
                 '3852 0000 0232 37',
                 true,
             ],
-            'discover1' => [
+            [
                 'discover',
                 '6011 1111 1111 1117',
                 true,
             ],
-            'discover2' => [
+            [
                 'discover',
                 '6011 0009 9013 9424',
                 true,
             ],
-            'unionpay1' => [
+            [
+                'jcb',
+                '3530 1113 3330 0000',
+                true,
+            ],
+            [
+                'jcb',
+                '3566 0020 2036 0505',
+                true,
+            ],
+            [
+                'mastercard',
+                '5555 5555 5555 4444',
+                true,
+            ],
+            [
+                'mastercard',
+                '5105 1051 0510 5100',
+                true,
+            ],
+            [
+                'visa',
+                '4111 1111 1111 1111',
+                true,
+            ],
+            [
+                'visa',
+                '4012 8888 8888 1881',
+                true,
+            ],
+            [
+                'visa',
+                '4222 2222 2222 2',
+                true,
+            ],
+            [
+                'dankort',
+                '5019 7170 1010 3742',
+                true,
+            ],
+            [
                 'unionpay',
                 $this->generateCardNum(62, 16),
                 true,
             ],
-            'unionpay2' => [
+            [
                 'unionpay',
                 $this->generateCardNum(62, 17),
                 true,
             ],
-            'unionpay3' => [
+            [
                 'unionpay',
                 $this->generateCardNum(62, 18),
                 true,
             ],
-            'unionpay4' => [
+            [
                 'unionpay',
                 $this->generateCardNum(62, 19),
                 true,
             ],
-            'unionpay5' => [
+            [
                 'unionpay',
                 $this->generateCardNum(63, 19),
                 false,
             ],
-            'carteblanche1' => [
+            [
                 'carteblanche',
                 $this->generateCardNum(300, 14),
                 true,
             ],
-            'carteblanche2' => [
+            [
                 'carteblanche',
                 $this->generateCardNum(301, 14),
                 true,
             ],
-            'carteblanche3' => [
+            [
                 'carteblanche',
                 $this->generateCardNum(302, 14),
                 true,
             ],
-            'carteblanche4' => [
+            [
                 'carteblanche',
                 $this->generateCardNum(303, 14),
                 true,
             ],
-            'carteblanche5' => [
+            [
                 'carteblanche',
                 $this->generateCardNum(304, 14),
                 true,
             ],
-            'carteblanche6' => [
+            [
                 'carteblanche',
                 $this->generateCardNum(305, 14),
                 true,
             ],
-            'carteblanche7' => [
+            [
                 'carteblanche',
                 $this->generateCardNum(306, 14),
                 false,
             ],
-            'dinersclub3' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(300, 14),
                 true,
             ],
-            'dinersclub4' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(301, 14),
                 true,
             ],
-            'dinersclub5' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(302, 14),
                 true,
             ],
-            'dinersclub6' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(303, 14),
                 true,
             ],
-            'dinersclub7' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(304, 14),
                 true,
             ],
-            'dinersclub8' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(305, 14),
                 true,
             ],
-            'dinersclub9' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(309, 14),
                 true,
             ],
-            'dinersclub10' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(36, 14),
                 true,
             ],
-            'dinersclub11' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(38, 14),
                 true,
             ],
-            'dinersclub12' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(39, 14),
                 true,
             ],
-            'dinersclub13' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(54, 14),
                 true,
             ],
-            'dinersclub14' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(55, 14),
                 true,
             ],
-            'dinersclub15' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(300, 16),
                 true,
             ],
-            'dinersclub16' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(301, 16),
                 true,
             ],
-            'dinersclub17' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(302, 16),
                 true,
             ],
-            'dinersclub18' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(303, 16),
                 true,
             ],
-            'dinersclub19' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(304, 16),
                 true,
             ],
-            'dinersclub20' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(305, 16),
                 true,
             ],
-            'dinersclub21' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(309, 16),
                 true,
             ],
-            'dinersclub22' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(36, 16),
                 true,
             ],
-            'dinersclub23' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(38, 16),
                 true,
             ],
-            'dinersclub24' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(39, 16),
                 true,
             ],
-            'dinersclub25' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(54, 16),
                 true,
             ],
-            'dinersclub26' => [
+            [
                 'dinersclub',
                 $this->generateCardNum(55, 16),
                 true,
             ],
-            'discover3' => [
+            [
                 'discover',
                 $this->generateCardNum(6011, 16),
                 true,
             ],
-            'discover4' => [
+            [
                 'discover',
                 $this->generateCardNum(622, 16),
                 true,
             ],
-            'discover5' => [
+            [
                 'discover',
                 $this->generateCardNum(644, 16),
                 true,
             ],
-            'discover6' => [
+            [
                 'discover',
                 $this->generateCardNum(645, 16),
                 true,
             ],
-            'discover7' => [
+            [
                 'discover',
                 $this->generateCardNum(656, 16),
                 true,
             ],
-            'discover8' => [
+            [
                 'discover',
                 $this->generateCardNum(647, 16),
                 true,
             ],
-            'discover9' => [
+            [
                 'discover',
                 $this->generateCardNum(648, 16),
                 true,
             ],
-            'discover10' => [
+            [
                 'discover',
                 $this->generateCardNum(649, 16),
                 true,
             ],
-            'discover11' => [
+            [
                 'discover',
                 $this->generateCardNum(65, 16),
                 true,
             ],
-            'discover12' => [
+            [
                 'discover',
                 $this->generateCardNum(6011, 19),
                 true,
             ],
-            'discover13' => [
+            [
                 'discover',
                 $this->generateCardNum(622, 19),
                 true,
             ],
-            'discover14' => [
+            [
                 'discover',
                 $this->generateCardNum(644, 19),
                 true,
             ],
-            'discover15' => [
+            [
                 'discover',
                 $this->generateCardNum(645, 19),
                 true,
             ],
-            'discover16' => [
+            [
                 'discover',
                 $this->generateCardNum(656, 19),
                 true,
             ],
-            'discover17' => [
+            [
                 'discover',
                 $this->generateCardNum(647, 19),
                 true,
             ],
-            'discover18' => [
+            [
                 'discover',
                 $this->generateCardNum(648, 19),
                 true,
             ],
-            'discover19' => [
+            [
                 'discover',
                 $this->generateCardNum(649, 19),
                 true,
             ],
-            'discover20' => [
+            [
                 'discover',
                 $this->generateCardNum(65, 19),
                 true,
             ],
-            'interpayment1' => [
+            [
                 'interpayment',
                 $this->generateCardNum(4, 16),
                 true,
             ],
-            'interpayment2' => [
+            [
                 'interpayment',
                 $this->generateCardNum(4, 17),
                 true,
             ],
-            'interpayment3' => [
+            [
                 'interpayment',
                 $this->generateCardNum(4, 18),
                 true,
             ],
-            'interpayment4' => [
+            [
                 'interpayment',
                 $this->generateCardNum(4, 19),
                 true,
             ],
-            'jcb1' => [
+            [
                 'jcb',
                 $this->generateCardNum(352, 16),
                 true,
             ],
-            'jcb2' => [
+            [
                 'jcb',
                 $this->generateCardNum(353, 16),
                 true,
             ],
-            'jcb3' => [
+            [
                 'jcb',
                 $this->generateCardNum(354, 16),
                 true,
             ],
-            'jcb4' => [
+            [
                 'jcb',
                 $this->generateCardNum(355, 16),
                 true,
             ],
-            'jcb5' => [
+            [
                 'jcb',
                 $this->generateCardNum(356, 16),
                 true,
             ],
-            'jcb6' => [
+            [
                 'jcb',
                 $this->generateCardNum(357, 16),
                 true,
             ],
-            'jcb7' => [
+            [
                 'jcb',
                 $this->generateCardNum(358, 16),
                 true,
             ],
-            'maestro1' => [
+            [
                 'maestro',
                 $this->generateCardNum(50, 12),
                 true,
             ],
-            'maestro2' => [
+            [
                 'maestro',
                 $this->generateCardNum(56, 12),
                 true,
             ],
-            'maestro3' => [
+            [
                 'maestro',
                 $this->generateCardNum(57, 12),
                 true,
             ],
-            'maestro4' => [
+            [
                 'maestro',
                 $this->generateCardNum(58, 12),
                 true,
             ],
-            'maestro5' => [
+            [
                 'maestro',
                 $this->generateCardNum(59, 12),
                 true,
             ],
-            'maestro6' => [
+            [
                 'maestro',
                 $this->generateCardNum(60, 12),
                 true,
             ],
-            'maestro7' => [
+            [
                 'maestro',
                 $this->generateCardNum(61, 12),
                 true,
             ],
-            'maestro8' => [
+            [
                 'maestro',
                 $this->generateCardNum(62, 12),
                 true,
             ],
-            'maestro9' => [
+            [
                 'maestro',
                 $this->generateCardNum(63, 12),
                 true,
             ],
-            'maestro10' => [
+            [
                 'maestro',
                 $this->generateCardNum(64, 12),
                 true,
             ],
-            'maestro11' => [
+            [
                 'maestro',
                 $this->generateCardNum(65, 12),
                 true,
             ],
-            'maestro12' => [
+            [
                 'maestro',
                 $this->generateCardNum(66, 12),
                 true,
             ],
-            'maestro13' => [
+            [
                 'maestro',
                 $this->generateCardNum(67, 12),
                 true,
             ],
-            'maestro14' => [
+            [
                 'maestro',
                 $this->generateCardNum(68, 12),
                 true,
             ],
-            'maestro15' => [
+            [
                 'maestro',
                 $this->generateCardNum(69, 12),
                 true,
             ],
-            'maestro16' => [
+            [
                 'maestro',
                 $this->generateCardNum(50, 13),
                 true,
             ],
-            'maestro17' => [
+            [
                 'maestro',
                 $this->generateCardNum(56, 13),
                 true,
             ],
-            'maestro18' => [
+            [
                 'maestro',
                 $this->generateCardNum(57, 13),
                 true,
             ],
-            'maestro19' => [
+            [
                 'maestro',
                 $this->generateCardNum(58, 13),
                 true,
             ],
-            'maestro20' => [
+            [
                 'maestro',
                 $this->generateCardNum(59, 13),
                 true,
             ],
-            'maestro21' => [
+            [
                 'maestro',
                 $this->generateCardNum(60, 13),
                 true,
             ],
-            'maestro22' => [
+            [
                 'maestro',
                 $this->generateCardNum(61, 13),
                 true,
             ],
-            'maestro23' => [
+            [
                 'maestro',
                 $this->generateCardNum(62, 13),
                 true,
             ],
-            'maestro24' => [
+            [
                 'maestro',
                 $this->generateCardNum(63, 13),
                 true,
             ],
-            'maestro25' => [
+            [
                 'maestro',
                 $this->generateCardNum(64, 13),
                 true,
             ],
-            'maestro26' => [
+            [
                 'maestro',
                 $this->generateCardNum(65, 13),
                 true,
             ],
-            'maestro27' => [
+            [
                 'maestro',
                 $this->generateCardNum(66, 13),
                 true,
             ],
-            'maestro28' => [
+            [
                 'maestro',
                 $this->generateCardNum(67, 13),
                 true,
             ],
-            'maestro29' => [
+            [
                 'maestro',
                 $this->generateCardNum(68, 13),
                 true,
             ],
-            'maestro30' => [
+            [
                 'maestro',
                 $this->generateCardNum(69, 13),
                 true,
             ],
-            'maestro31' => [
+            [
                 'maestro',
                 $this->generateCardNum(50, 14),
                 true,
             ],
-            'maestro32' => [
+            [
                 'maestro',
                 $this->generateCardNum(56, 14),
                 true,
             ],
-            'maestro33' => [
+            [
                 'maestro',
                 $this->generateCardNum(57, 14),
                 true,
             ],
-            'maestro34' => [
+            [
                 'maestro',
                 $this->generateCardNum(58, 14),
                 true,
             ],
-            'maestro35' => [
+            [
                 'maestro',
                 $this->generateCardNum(59, 14),
                 true,
             ],
-            'maestro36' => [
+            [
                 'maestro',
                 $this->generateCardNum(60, 14),
                 true,
             ],
-            'maestro37' => [
+            [
                 'maestro',
                 $this->generateCardNum(61, 14),
                 true,
             ],
-            'maestro38' => [
+            [
                 'maestro',
                 $this->generateCardNum(62, 14),
                 true,
             ],
-            'maestro39' => [
+            [
                 'maestro',
                 $this->generateCardNum(63, 14),
                 true,
             ],
-            'maestro40' => [
+            [
                 'maestro',
                 $this->generateCardNum(64, 14),
                 true,
             ],
-            'maestro41' => [
+            [
                 'maestro',
                 $this->generateCardNum(65, 14),
                 true,
             ],
-            'maestro42' => [
+            [
                 'maestro',
                 $this->generateCardNum(66, 14),
                 true,
             ],
-            'maestro43' => [
+            [
                 'maestro',
                 $this->generateCardNum(67, 14),
                 true,
             ],
-            'maestro44' => [
+            [
                 'maestro',
                 $this->generateCardNum(68, 14),
                 true,
             ],
-            'maestro45' => [
+            [
                 'maestro',
                 $this->generateCardNum(69, 14),
                 true,
             ],
-            'maestro46' => [
+            [
                 'maestro',
                 $this->generateCardNum(50, 15),
                 true,
             ],
-            'maestro47' => [
+            [
                 'maestro',
                 $this->generateCardNum(56, 15),
                 true,
             ],
-            'maestro48' => [
+            [
                 'maestro',
                 $this->generateCardNum(57, 15),
                 true,
             ],
-            'maestro49' => [
+            [
                 'maestro',
                 $this->generateCardNum(58, 15),
                 true,
             ],
-            'maestro50' => [
+            [
                 'maestro',
                 $this->generateCardNum(59, 15),
                 true,
             ],
-            'maestro51' => [
+            [
                 'maestro',
                 $this->generateCardNum(60, 15),
                 true,
             ],
-            'maestro52' => [
+            [
                 'maestro',
                 $this->generateCardNum(61, 15),
                 true,
             ],
-            'maestro53' => [
+            [
                 'maestro',
                 $this->generateCardNum(62, 15),
                 true,
             ],
-            'maestro54' => [
+            [
                 'maestro',
                 $this->generateCardNum(63, 15),
                 true,
             ],
-            'maestro55' => [
+            [
                 'maestro',
                 $this->generateCardNum(64, 15),
                 true,
             ],
-            'maestro56' => [
+            [
                 'maestro',
                 $this->generateCardNum(65, 15),
                 true,
             ],
-            'maestro57' => [
+            [
                 'maestro',
                 $this->generateCardNum(66, 15),
                 true,
             ],
-            'maestro58' => [
+            [
                 'maestro',
                 $this->generateCardNum(67, 15),
                 true,
             ],
-            'maestro59' => [
+            [
                 'maestro',
                 $this->generateCardNum(68, 15),
                 true,
             ],
-            'maestro60' => [
+            [
                 'maestro',
                 $this->generateCardNum(69, 15),
                 true,
             ],
-            'maestro61' => [
+            [
                 'maestro',
                 $this->generateCardNum(50, 16),
                 true,
             ],
-            'maestro62' => [
+            [
                 'maestro',
                 $this->generateCardNum(56, 16),
                 true,
             ],
-            'maestro63' => [
+            [
                 'maestro',
                 $this->generateCardNum(57, 16),
                 true,
             ],
-            'maestro64' => [
+            [
                 'maestro',
                 $this->generateCardNum(58, 16),
                 true,
             ],
-            'maestro65' => [
+            [
                 'maestro',
                 $this->generateCardNum(59, 16),
                 true,
             ],
-            'maestro66' => [
+            [
                 'maestro',
                 $this->generateCardNum(60, 16),
                 true,
             ],
-            'maestro67' => [
+            [
                 'maestro',
                 $this->generateCardNum(61, 16),
                 true,
             ],
-            'maestro68' => [
+            [
                 'maestro',
                 $this->generateCardNum(62, 16),
                 true,
             ],
-            'maestro69' => [
+            [
                 'maestro',
                 $this->generateCardNum(63, 16),
                 true,
             ],
-            'maestro70' => [
+            [
                 'maestro',
                 $this->generateCardNum(64, 16),
                 true,
             ],
-            'maestro71' => [
+            [
                 'maestro',
                 $this->generateCardNum(65, 16),
                 true,
             ],
-            'maestro72' => [
+            [
                 'maestro',
                 $this->generateCardNum(66, 16),
                 true,
             ],
-            'maestro73' => [
+            [
                 'maestro',
                 $this->generateCardNum(67, 16),
                 true,
             ],
-            'maestro74' => [
+            [
                 'maestro',
                 $this->generateCardNum(68, 16),
                 true,
             ],
-            'maestro75' => [
+            [
                 'maestro',
                 $this->generateCardNum(69, 16),
                 true,
             ],
-            'maestro91' => [
+            [
                 'maestro',
                 $this->generateCardNum(50, 18),
                 true,
             ],
-            'maestro92' => [
+            [
                 'maestro',
                 $this->generateCardNum(56, 18),
                 true,
             ],
-            'maestro93' => [
+            [
                 'maestro',
                 $this->generateCardNum(57, 18),
                 true,
             ],
-            'maestro94' => [
+            [
                 'maestro',
                 $this->generateCardNum(58, 18),
                 true,
             ],
-            'maestro95' => [
+            [
                 'maestro',
                 $this->generateCardNum(59, 18),
                 true,
             ],
-            'maestro96' => [
+            [
                 'maestro',
                 $this->generateCardNum(60, 18),
                 true,
             ],
-            'maestro97' => [
+            [
                 'maestro',
                 $this->generateCardNum(61, 18),
                 true,
             ],
-            'maestro98' => [
+            [
                 'maestro',
                 $this->generateCardNum(62, 18),
                 true,
             ],
-            'maestro99' => [
+            [
                 'maestro',
                 $this->generateCardNum(63, 18),
                 true,
             ],
-            'maestro100' => [
+            [
                 'maestro',
                 $this->generateCardNum(64, 18),
                 true,
             ],
-            'maestro101' => [
+            [
                 'maestro',
                 $this->generateCardNum(65, 18),
                 true,
             ],
-            'maestro102' => [
+            [
                 'maestro',
                 $this->generateCardNum(66, 18),
                 true,
             ],
-            'maestro103' => [
+            [
                 'maestro',
                 $this->generateCardNum(67, 18),
                 true,
             ],
-            'maestro104' => [
+            [
                 'maestro',
                 $this->generateCardNum(68, 18),
                 true,
             ],
-            'maestro105' => [
+            [
                 'maestro',
                 $this->generateCardNum(69, 18),
                 true,
             ],
-            'maestro106' => [
+            [
                 'maestro',
                 $this->generateCardNum(50, 19),
                 true,
             ],
-            'maestro107' => [
+            [
                 'maestro',
                 $this->generateCardNum(56, 19),
                 true,
             ],
-            'maestro108' => [
+            [
                 'maestro',
                 $this->generateCardNum(57, 19),
                 true,
             ],
-            'maestro109' => [
+            [
                 'maestro',
                 $this->generateCardNum(58, 19),
                 true,
             ],
-            'maestro110' => [
+            [
                 'maestro',
                 $this->generateCardNum(59, 19),
                 true,
             ],
-            'maestro111' => [
+            [
                 'maestro',
                 $this->generateCardNum(60, 19),
                 true,
             ],
-            'maestro112' => [
+            [
                 'maestro',
                 $this->generateCardNum(61, 19),
                 true,
             ],
-            'maestro113' => [
+            [
                 'maestro',
                 $this->generateCardNum(62, 19),
                 true,
             ],
-            'maestro114' => [
+            [
                 'maestro',
                 $this->generateCardNum(63, 19),
                 true,
             ],
-            'maestro115' => [
+            [
                 'maestro',
                 $this->generateCardNum(64, 19),
                 true,
             ],
-            'maestro116' => [
+            [
                 'maestro',
                 $this->generateCardNum(65, 19),
                 true,
             ],
-            'maestro117' => [
+            [
                 'maestro',
                 $this->generateCardNum(66, 19),
                 true,
             ],
-            'maestro118' => [
+            [
                 'maestro',
                 $this->generateCardNum(67, 19),
                 true,
             ],
-            'maestro119' => [
+            [
                 'maestro',
                 $this->generateCardNum(68, 19),
                 true,
             ],
-            'maestro120' => [
+            [
                 'maestro',
                 $this->generateCardNum(69, 19),
                 true,
             ],
-            'dankort1' => [
+            [
                 'dankort',
                 $this->generateCardNum(5019, 16),
                 true,
             ],
-            'dankort2' => [
+            [
                 'dankort',
                 $this->generateCardNum(4175, 16),
                 true,
             ],
-            'dankort3' => [
+            [
                 'dankort',
                 $this->generateCardNum(4571, 16),
                 true,
             ],
-            'dankort4' => [
+            [
                 'dankort',
                 $this->generateCardNum(4, 16),
                 true,
             ],
-            'mir1' => [
+            [
                 'mir',
                 $this->generateCardNum(2200, 16),
                 true,
             ],
-            'mir2' => [
+            [
                 'mir',
                 $this->generateCardNum(2201, 16),
                 true,
             ],
-            'mir3' => [
+            [
                 'mir',
                 $this->generateCardNum(2202, 16),
                 true,
             ],
-            'mir4' => [
+            [
                 'mir',
                 $this->generateCardNum(2203, 16),
                 true,
             ],
-            'mir5' => [
+            [
                 'mir',
                 $this->generateCardNum(2204, 16),
                 true,
             ],
-            'mastercard1' => [
+            [
                 'mastercard',
                 $this->generateCardNum(51, 16),
                 true,
             ],
-            'mastercard2' => [
+            [
                 'mastercard',
                 $this->generateCardNum(52, 16),
                 true,
             ],
-            'mastercard3' => [
+            [
                 'mastercard',
                 $this->generateCardNum(53, 16),
                 true,
             ],
-            'mastercard4' => [
+            [
                 'mastercard',
                 $this->generateCardNum(54, 16),
                 true,
             ],
-            'mastercard5' => [
+            [
                 'mastercard',
                 $this->generateCardNum(55, 16),
                 true,
             ],
-            'mastercard6' => [
+            [
                 'mastercard',
                 $this->generateCardNum(22, 16),
                 true,
             ],
-            'mastercard7' => [
+            [
                 'mastercard',
                 $this->generateCardNum(23, 16),
                 true,
             ],
-            'mastercard8' => [
+            [
                 'mastercard',
                 $this->generateCardNum(24, 16),
                 true,
             ],
-            'mastercard9' => [
+            [
                 'mastercard',
                 $this->generateCardNum(25, 16),
                 true,
             ],
-            'mastercard10' => [
+            [
                 'mastercard',
                 $this->generateCardNum(26, 16),
                 true,
             ],
-            'mastercard11' => [
+            [
                 'mastercard',
                 $this->generateCardNum(27, 16),
                 true,
             ],
-            'visa1' => [
+            [
                 'visa',
                 $this->generateCardNum(4, 13),
                 true,
             ],
-            'visa2' => [
+            [
                 'visa',
                 $this->generateCardNum(4, 16),
                 true,
             ],
-            'visa3' => [
+            [
                 'visa',
                 $this->generateCardNum(4, 19),
                 true,
             ],
-            'uatp' => [
+            [
                 'uatp',
                 $this->generateCardNum(1, 15),
                 true,
             ],
-            'verve1' => [
+            [
                 'verve',
                 $this->generateCardNum(506, 16),
                 true,
             ],
-            'verve2' => [
+            [
                 'verve',
                 $this->generateCardNum(650, 16),
                 true,
             ],
-            'verve3' => [
+            [
                 'verve',
                 $this->generateCardNum(506, 19),
                 true,
             ],
-            'verve4' => [
+            [
                 'verve',
                 $this->generateCardNum(650, 19),
                 true,
             ],
-            'cibc1' => [
+            [
                 'cibc',
                 $this->generateCardNum(4506, 16),
                 true,
             ],
-            'rbc1' => [
+            [
                 'rbc',
                 $this->generateCardNum(45, 16),
                 true,
             ],
-            'tdtrust' => [
+            [
                 'tdtrust',
                 $this->generateCardNum(589297, 16),
                 true,
             ],
-            'scotia1' => [
+            [
                 'scotia',
                 $this->generateCardNum(4536, 16),
                 true,
             ],
-            'bmoabm1' => [
+            [
                 'bmoabm',
                 $this->generateCardNum(500, 16),
                 true,
             ],
-            'hsbc' => [
+            [
+                'hsbc',
+                $this->generateCardNum(56, 16),
+                true,
+            ],
+            [
                 'hsbc',
                 $this->generateCardNum(57, 16),
                 false,

From b254cf190e8650a806fc4f863d78223ccf337c05 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Thu, 29 Jul 2021 10:19:38 +0700
Subject: [PATCH 0116/2325] using dataProvider for Ordinal test

---
 tests/system/Helpers/InflectorHelperTest.php | 30 +++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/tests/system/Helpers/InflectorHelperTest.php b/tests/system/Helpers/InflectorHelperTest.php
index 81939b461c7f..e949b83bc707 100755
--- a/tests/system/Helpers/InflectorHelperTest.php
+++ b/tests/system/Helpers/InflectorHelperTest.php
@@ -241,19 +241,29 @@ public function testDasherize()
         }
     }
 
-    public function testOrdinal()
+    public function provideOrdinal()
     {
-        $suffixes = [
-            'st' => 21,
-            'nd' => 22,
-            'rd' => 23,
-            'th' => 24,
+        return [
+            ['st', 1],
+            ['nd', 2],
+            ['rd', 3],
+            ['th', 4],
+            ['th', 11],
+            ['th', 20],
+            ['st', 21],
+            ['nd', 22],
+            ['rd', 23],
+            ['th', 24],
         ];
+    }
 
-        foreach ($suffixes as $suffix => $number) {
-            $ordinal = ordinal($number);
-            $this->assertSame($suffix, $ordinal);
-        }
+    /**
+     * @dataProvider provideOrdinal
+     */
+    public function testOrdinal(string $suffix, int $number)
+    {
+        $ordinal = ordinal($number);
+        $this->assertSame($suffix, $ordinal);
     }
 
     public function testOrdinalize()

From 3908d0cba5ac170059147c6a5e41e5a39f917ea7 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Thu, 29 Jul 2021 10:34:47 +0700
Subject: [PATCH 0117/2325] Update tests/system/Helpers/InflectorHelperTest.php

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 tests/system/Helpers/InflectorHelperTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/system/Helpers/InflectorHelperTest.php b/tests/system/Helpers/InflectorHelperTest.php
index e949b83bc707..86ff1e2e9f58 100755
--- a/tests/system/Helpers/InflectorHelperTest.php
+++ b/tests/system/Helpers/InflectorHelperTest.php
@@ -262,8 +262,7 @@ public function provideOrdinal()
      */
     public function testOrdinal(string $suffix, int $number)
     {
-        $ordinal = ordinal($number);
-        $this->assertSame($suffix, $ordinal);
+        $this->assertSame($suffix, ordinal($number));
     }
 
     public function testOrdinalize()

From cba23285957692e8a2be7a73a36e593238461a9f Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sat, 31 Jul 2021 20:46:52 +0700
Subject: [PATCH 0118/2325] index Credit card provider

---
 .../system/Validation/CreditCardRulesTest.php | 452 +++++++++---------
 1 file changed, 226 insertions(+), 226 deletions(-)

diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php
index 21182127266a..a1e8f74d8a27 100644
--- a/tests/system/Validation/CreditCardRulesTest.php
+++ b/tests/system/Validation/CreditCardRulesTest.php
@@ -83,1132 +83,1132 @@ public function testValidCCNumber($type, $number, $expected = false)
     public function creditCardProvider()
     {
         return [
-            [
+            'null_test' => [
                 'amex',
                 null,
                 false,
             ],
-            [
+            'random_test' => [
                 'amex',
                 $this->generateCardNum('37', 16),
                 false,
             ],
-            [
+            'invalid_type' => [
                 'shorty',
                 '1111 1111 1111 1111',
                 false,
             ],
-            [
+            'invalid_length' => [
                 'amex',
                 '',
                 false,
             ],
-            [
+            'not_numeric' => [
                 'amex',
                 'abcd efgh ijkl mnop',
                 false,
             ],
-            [
+            'bad_length' => [
                 'amex',
                 '3782 8224 6310 0051',
                 false,
             ],
-            [
+            'bad_prefix' => [
                 'amex',
                 '3582 8224 6310 0051',
                 false,
             ],
-            [
+            'amex1' => [
                 'amex',
                 '3782 8224 6310 005',
                 true,
             ],
-            [
+            'amex2' => [
                 'amex',
                 '3714 4963 5398 431',
                 true,
             ],
-            [
+            'dinersclub1' => [
                 'dinersclub',
                 '3056 9309 0259 04',
                 true,
             ],
-            [
+            'dinersculb2' => [
                 'dinersclub',
                 '3852 0000 0232 37',
                 true,
             ],
-            [
+            'discover1' => [
                 'discover',
                 '6011 1111 1111 1117',
                 true,
             ],
-            [
+            'discover2' => [
                 'discover',
                 '6011 0009 9013 9424',
                 true,
             ],
-            [
+            'jcb8' => [
                 'jcb',
                 '3530 1113 3330 0000',
                 true,
             ],
-            [
+            'jcb9' => [
                 'jcb',
                 '3566 0020 2036 0505',
                 true,
             ],
-            [
+            'mastercard12' => [
                 'mastercard',
                 '5555 5555 5555 4444',
                 true,
             ],
-            [
+            'mastercard13' => [
                 'mastercard',
                 '5105 1051 0510 5100',
                 true,
             ],
-            [
+            'visa4' => [
                 'visa',
                 '4111 1111 1111 1111',
                 true,
             ],
-            [
+            'visa5' => [
                 'visa',
                 '4012 8888 8888 1881',
                 true,
             ],
-            [
+            'visa6' => [
                 'visa',
                 '4222 2222 2222 2',
                 true,
             ],
-            [
+            'dankort5' => [
                 'dankort',
                 '5019 7170 1010 3742',
                 true,
             ],
-            [
+            'unionpay1' => [
                 'unionpay',
                 $this->generateCardNum(62, 16),
                 true,
             ],
-            [
+            'unionpay2' => [
                 'unionpay',
                 $this->generateCardNum(62, 17),
                 true,
             ],
-            [
+            'unionpay3' => [
                 'unionpay',
                 $this->generateCardNum(62, 18),
                 true,
             ],
-            [
+            'unionpay4' => [
                 'unionpay',
                 $this->generateCardNum(62, 19),
                 true,
             ],
-            [
+            'unionpay5' => [
                 'unionpay',
                 $this->generateCardNum(63, 19),
                 false,
             ],
-            [
+            'carteblanche1' => [
                 'carteblanche',
                 $this->generateCardNum(300, 14),
                 true,
             ],
-            [
+            'carteblanche2' => [
                 'carteblanche',
                 $this->generateCardNum(301, 14),
                 true,
             ],
-            [
+            'carteblanche3' => [
                 'carteblanche',
                 $this->generateCardNum(302, 14),
                 true,
             ],
-            [
+            'carteblanche4' => [
                 'carteblanche',
                 $this->generateCardNum(303, 14),
                 true,
             ],
-            [
+            'carteblanche5' => [
                 'carteblanche',
                 $this->generateCardNum(304, 14),
                 true,
             ],
-            [
+            'carteblanche6' => [
                 'carteblanche',
                 $this->generateCardNum(305, 14),
                 true,
             ],
-            [
+            'carteblanche7' => [
                 'carteblanche',
                 $this->generateCardNum(306, 14),
                 false,
             ],
-            [
+            'dinersclub3' => [
                 'dinersclub',
                 $this->generateCardNum(300, 14),
                 true,
             ],
-            [
+            'dinersclub4' => [
                 'dinersclub',
                 $this->generateCardNum(301, 14),
                 true,
             ],
-            [
+            'dinersclub5' => [
                 'dinersclub',
                 $this->generateCardNum(302, 14),
                 true,
             ],
-            [
+            'dinersclub6' => [
                 'dinersclub',
                 $this->generateCardNum(303, 14),
                 true,
             ],
-            [
+            'dinersclub7' => [
                 'dinersclub',
                 $this->generateCardNum(304, 14),
                 true,
             ],
-            [
+            'dinersclub8' => [
                 'dinersclub',
                 $this->generateCardNum(305, 14),
                 true,
             ],
-            [
+            'dinersclub9' => [
                 'dinersclub',
                 $this->generateCardNum(309, 14),
                 true,
             ],
-            [
+            'dinersclub10' => [
                 'dinersclub',
                 $this->generateCardNum(36, 14),
                 true,
             ],
-            [
+            'dinersclub11' => [
                 'dinersclub',
                 $this->generateCardNum(38, 14),
                 true,
             ],
-            [
+            'dinersclub12' => [
                 'dinersclub',
                 $this->generateCardNum(39, 14),
                 true,
             ],
-            [
+            'dinersclub13' => [
                 'dinersclub',
                 $this->generateCardNum(54, 14),
                 true,
             ],
-            [
+            'dinersclub14' => [
                 'dinersclub',
                 $this->generateCardNum(55, 14),
                 true,
             ],
-            [
+            'dinersclub15' => [
                 'dinersclub',
                 $this->generateCardNum(300, 16),
                 true,
             ],
-            [
+            'dinersclub16' => [
                 'dinersclub',
                 $this->generateCardNum(301, 16),
                 true,
             ],
-            [
+            'dinersclub17' => [
                 'dinersclub',
                 $this->generateCardNum(302, 16),
                 true,
             ],
-            [
+            'dinersclub18' => [
                 'dinersclub',
                 $this->generateCardNum(303, 16),
                 true,
             ],
-            [
+            'dinersclub19' => [
                 'dinersclub',
                 $this->generateCardNum(304, 16),
                 true,
             ],
-            [
+            'dinersclub20' => [
                 'dinersclub',
                 $this->generateCardNum(305, 16),
                 true,
             ],
-            [
+            'dinersclub21' => [
                 'dinersclub',
                 $this->generateCardNum(309, 16),
                 true,
             ],
-            [
+            'dinersclub22' => [
                 'dinersclub',
                 $this->generateCardNum(36, 16),
                 true,
             ],
-            [
+            'dinersclub23' => [
                 'dinersclub',
                 $this->generateCardNum(38, 16),
                 true,
             ],
-            [
+            'dinersclub24' => [
                 'dinersclub',
                 $this->generateCardNum(39, 16),
                 true,
             ],
-            [
+            'dinersclub25' => [
                 'dinersclub',
                 $this->generateCardNum(54, 16),
                 true,
             ],
-            [
+            'dinersclub26' => [
                 'dinersclub',
                 $this->generateCardNum(55, 16),
                 true,
             ],
-            [
+            'discover3' => [
                 'discover',
                 $this->generateCardNum(6011, 16),
                 true,
             ],
-            [
+            'discover4' => [
                 'discover',
                 $this->generateCardNum(622, 16),
                 true,
             ],
-            [
+            'discover5' => [
                 'discover',
                 $this->generateCardNum(644, 16),
                 true,
             ],
-            [
+            'discover6' => [
                 'discover',
                 $this->generateCardNum(645, 16),
                 true,
             ],
-            [
+            'discover7' => [
                 'discover',
                 $this->generateCardNum(656, 16),
                 true,
             ],
-            [
+            'discover8' => [
                 'discover',
                 $this->generateCardNum(647, 16),
                 true,
             ],
-            [
+            'discover9' => [
                 'discover',
                 $this->generateCardNum(648, 16),
                 true,
             ],
-            [
+            'discover10' => [
                 'discover',
                 $this->generateCardNum(649, 16),
                 true,
             ],
-            [
+            'discover11' => [
                 'discover',
                 $this->generateCardNum(65, 16),
                 true,
             ],
-            [
+            'discover12' => [
                 'discover',
                 $this->generateCardNum(6011, 19),
                 true,
             ],
-            [
+            'discover13' => [
                 'discover',
                 $this->generateCardNum(622, 19),
                 true,
             ],
-            [
+            'discover14' => [
                 'discover',
                 $this->generateCardNum(644, 19),
                 true,
             ],
-            [
+            'discover15' => [
                 'discover',
                 $this->generateCardNum(645, 19),
                 true,
             ],
-            [
+            'discover16' => [
                 'discover',
                 $this->generateCardNum(656, 19),
                 true,
             ],
-            [
+            'discover17' => [
                 'discover',
                 $this->generateCardNum(647, 19),
                 true,
             ],
-            [
+            'discover18' => [
                 'discover',
                 $this->generateCardNum(648, 19),
                 true,
             ],
-            [
+            'discover19' => [
                 'discover',
                 $this->generateCardNum(649, 19),
                 true,
             ],
-            [
+            'discover20' => [
                 'discover',
                 $this->generateCardNum(65, 19),
                 true,
             ],
-            [
+            'interpayment1' => [
                 'interpayment',
                 $this->generateCardNum(4, 16),
                 true,
             ],
-            [
+            'interpayment2' => [
                 'interpayment',
                 $this->generateCardNum(4, 17),
                 true,
             ],
-            [
+            'interpayment3' => [
                 'interpayment',
                 $this->generateCardNum(4, 18),
                 true,
             ],
-            [
+            'interpayment4' => [
                 'interpayment',
                 $this->generateCardNum(4, 19),
                 true,
             ],
-            [
+            'jcb1' => [
                 'jcb',
                 $this->generateCardNum(352, 16),
                 true,
             ],
-            [
+            'jcb2' => [
                 'jcb',
                 $this->generateCardNum(353, 16),
                 true,
             ],
-            [
+            'jcb3' => [
                 'jcb',
                 $this->generateCardNum(354, 16),
                 true,
             ],
-            [
+            'jcb4' => [
                 'jcb',
                 $this->generateCardNum(355, 16),
                 true,
             ],
-            [
+            'jcb5' => [
                 'jcb',
                 $this->generateCardNum(356, 16),
                 true,
             ],
-            [
+            'jcb6' => [
                 'jcb',
                 $this->generateCardNum(357, 16),
                 true,
             ],
-            [
+            'jcb7' => [
                 'jcb',
                 $this->generateCardNum(358, 16),
                 true,
             ],
-            [
+            'maestro1' => [
                 'maestro',
                 $this->generateCardNum(50, 12),
                 true,
             ],
-            [
+            'maestro2' => [
                 'maestro',
                 $this->generateCardNum(56, 12),
                 true,
             ],
-            [
+            'maestro3' => [
                 'maestro',
                 $this->generateCardNum(57, 12),
                 true,
             ],
-            [
+            'maestro4' => [
                 'maestro',
                 $this->generateCardNum(58, 12),
                 true,
             ],
-            [
+            'maestro5' => [
                 'maestro',
                 $this->generateCardNum(59, 12),
                 true,
             ],
-            [
+            'maestro6' => [
                 'maestro',
                 $this->generateCardNum(60, 12),
                 true,
             ],
-            [
+            'maestro7' => [
                 'maestro',
                 $this->generateCardNum(61, 12),
                 true,
             ],
-            [
+            'maestro8' => [
                 'maestro',
                 $this->generateCardNum(62, 12),
                 true,
             ],
-            [
+            'maestro9' => [
                 'maestro',
                 $this->generateCardNum(63, 12),
                 true,
             ],
-            [
+            'maestro10' => [
                 'maestro',
                 $this->generateCardNum(64, 12),
                 true,
             ],
-            [
+            'maestro11' => [
                 'maestro',
                 $this->generateCardNum(65, 12),
                 true,
             ],
-            [
+            'maestro12' => [
                 'maestro',
                 $this->generateCardNum(66, 12),
                 true,
             ],
-            [
+            'maestro13' => [
                 'maestro',
                 $this->generateCardNum(67, 12),
                 true,
             ],
-            [
+            'maestro14' => [
                 'maestro',
                 $this->generateCardNum(68, 12),
                 true,
             ],
-            [
+            'maestro15' => [
                 'maestro',
                 $this->generateCardNum(69, 12),
                 true,
             ],
-            [
+            'maestro16' => [
                 'maestro',
                 $this->generateCardNum(50, 13),
                 true,
             ],
-            [
+            'maestro17' => [
                 'maestro',
                 $this->generateCardNum(56, 13),
                 true,
             ],
-            [
+            'maestro18' => [
                 'maestro',
                 $this->generateCardNum(57, 13),
                 true,
             ],
-            [
+            'maestro19' => [
                 'maestro',
                 $this->generateCardNum(58, 13),
                 true,
             ],
-            [
+            'maestro20' => [
                 'maestro',
                 $this->generateCardNum(59, 13),
                 true,
             ],
-            [
+            'maestro21' => [
                 'maestro',
                 $this->generateCardNum(60, 13),
                 true,
             ],
-            [
+            'maestro22' => [
                 'maestro',
                 $this->generateCardNum(61, 13),
                 true,
             ],
-            [
+            'maestro23' => [
                 'maestro',
                 $this->generateCardNum(62, 13),
                 true,
             ],
-            [
+            'maestro24' => [
                 'maestro',
                 $this->generateCardNum(63, 13),
                 true,
             ],
-            [
+            'maestro25' => [
                 'maestro',
                 $this->generateCardNum(64, 13),
                 true,
             ],
-            [
+            'maestro26' => [
                 'maestro',
                 $this->generateCardNum(65, 13),
                 true,
             ],
-            [
+            'maestro27' => [
                 'maestro',
                 $this->generateCardNum(66, 13),
                 true,
             ],
-            [
+            'maestro28' => [
                 'maestro',
                 $this->generateCardNum(67, 13),
                 true,
             ],
-            [
+            'maestro29' => [
                 'maestro',
                 $this->generateCardNum(68, 13),
                 true,
             ],
-            [
+            'maestro30' => [
                 'maestro',
                 $this->generateCardNum(69, 13),
                 true,
             ],
-            [
+            'maestro31' => [
                 'maestro',
                 $this->generateCardNum(50, 14),
                 true,
             ],
-            [
+            'maestro32' => [
                 'maestro',
                 $this->generateCardNum(56, 14),
                 true,
             ],
-            [
+            'maestro33' => [
                 'maestro',
                 $this->generateCardNum(57, 14),
                 true,
             ],
-            [
+            'maestro34' => [
                 'maestro',
                 $this->generateCardNum(58, 14),
                 true,
             ],
-            [
+            'maestro35' => [
                 'maestro',
                 $this->generateCardNum(59, 14),
                 true,
             ],
-            [
+            'maestro36' => [
                 'maestro',
                 $this->generateCardNum(60, 14),
                 true,
             ],
-            [
+            'maestro37' => [
                 'maestro',
                 $this->generateCardNum(61, 14),
                 true,
             ],
-            [
+            'maestro38' => [
                 'maestro',
                 $this->generateCardNum(62, 14),
                 true,
             ],
-            [
+            'maestro39' => [
                 'maestro',
                 $this->generateCardNum(63, 14),
                 true,
             ],
-            [
+            'maestro40' => [
                 'maestro',
                 $this->generateCardNum(64, 14),
                 true,
             ],
-            [
+            'maestro41' => [
                 'maestro',
                 $this->generateCardNum(65, 14),
                 true,
             ],
-            [
+            'maestro42' => [
                 'maestro',
                 $this->generateCardNum(66, 14),
                 true,
             ],
-            [
+            'maestro43' => [
                 'maestro',
                 $this->generateCardNum(67, 14),
                 true,
             ],
-            [
+            'maestro44' => [
                 'maestro',
                 $this->generateCardNum(68, 14),
                 true,
             ],
-            [
+            'maestro45' => [
                 'maestro',
                 $this->generateCardNum(69, 14),
                 true,
             ],
-            [
+            'maestro46' => [
                 'maestro',
                 $this->generateCardNum(50, 15),
                 true,
             ],
-            [
+            'maestro47' => [
                 'maestro',
                 $this->generateCardNum(56, 15),
                 true,
             ],
-            [
+            'maestro48' => [
                 'maestro',
                 $this->generateCardNum(57, 15),
                 true,
             ],
-            [
+            'maestro49' => [
                 'maestro',
                 $this->generateCardNum(58, 15),
                 true,
             ],
-            [
+            'maestro50' => [
                 'maestro',
                 $this->generateCardNum(59, 15),
                 true,
             ],
-            [
+            'maestro51' => [
                 'maestro',
                 $this->generateCardNum(60, 15),
                 true,
             ],
-            [
+            'maestro52' => [
                 'maestro',
                 $this->generateCardNum(61, 15),
                 true,
             ],
-            [
+            'maestro53' => [
                 'maestro',
                 $this->generateCardNum(62, 15),
                 true,
             ],
-            [
+            'maestro54' => [
                 'maestro',
                 $this->generateCardNum(63, 15),
                 true,
             ],
-            [
+            'maestro55' => [
                 'maestro',
                 $this->generateCardNum(64, 15),
                 true,
             ],
-            [
+            'maestro56' => [
                 'maestro',
                 $this->generateCardNum(65, 15),
                 true,
             ],
-            [
+            'maestro57' => [
                 'maestro',
                 $this->generateCardNum(66, 15),
                 true,
             ],
-            [
+            'maestro58' => [
                 'maestro',
                 $this->generateCardNum(67, 15),
                 true,
             ],
-            [
+            'maestro59' => [
                 'maestro',
                 $this->generateCardNum(68, 15),
                 true,
             ],
-            [
+            'maestro60' => [
                 'maestro',
                 $this->generateCardNum(69, 15),
                 true,
             ],
-            [
+            'maestro61' => [
                 'maestro',
                 $this->generateCardNum(50, 16),
                 true,
             ],
-            [
+            'maestro62' => [
                 'maestro',
                 $this->generateCardNum(56, 16),
                 true,
             ],
-            [
+            'maestro63' => [
                 'maestro',
                 $this->generateCardNum(57, 16),
                 true,
             ],
-            [
+            'maestro64' => [
                 'maestro',
                 $this->generateCardNum(58, 16),
                 true,
             ],
-            [
+            'maestro65' => [
                 'maestro',
                 $this->generateCardNum(59, 16),
                 true,
             ],
-            [
+            'maestro66' => [
                 'maestro',
                 $this->generateCardNum(60, 16),
                 true,
             ],
-            [
+            'maestro67' => [
                 'maestro',
                 $this->generateCardNum(61, 16),
                 true,
             ],
-            [
+            'maestro68' => [
                 'maestro',
                 $this->generateCardNum(62, 16),
                 true,
             ],
-            [
+            'maestro69' => [
                 'maestro',
                 $this->generateCardNum(63, 16),
                 true,
             ],
-            [
+            'maestro70' => [
                 'maestro',
                 $this->generateCardNum(64, 16),
                 true,
             ],
-            [
+            'maestro71' => [
                 'maestro',
                 $this->generateCardNum(65, 16),
                 true,
             ],
-            [
+            'maestro72' => [
                 'maestro',
                 $this->generateCardNum(66, 16),
                 true,
             ],
-            [
+            'maestro73' => [
                 'maestro',
                 $this->generateCardNum(67, 16),
                 true,
             ],
-            [
+            'maestro74' => [
                 'maestro',
                 $this->generateCardNum(68, 16),
                 true,
             ],
-            [
+            'maestro75' => [
                 'maestro',
                 $this->generateCardNum(69, 16),
                 true,
             ],
-            [
+            'maestro91' => [
                 'maestro',
                 $this->generateCardNum(50, 18),
                 true,
             ],
-            [
+            'maestro92' => [
                 'maestro',
                 $this->generateCardNum(56, 18),
                 true,
             ],
-            [
+            'maestro93' => [
                 'maestro',
                 $this->generateCardNum(57, 18),
                 true,
             ],
-            [
+            'maestro94' => [
                 'maestro',
                 $this->generateCardNum(58, 18),
                 true,
             ],
-            [
+            'maestro95' => [
                 'maestro',
                 $this->generateCardNum(59, 18),
                 true,
             ],
-            [
+            'maestro96' => [
                 'maestro',
                 $this->generateCardNum(60, 18),
                 true,
             ],
-            [
+            'maestro97' => [
                 'maestro',
                 $this->generateCardNum(61, 18),
                 true,
             ],
-            [
+            'maestro98' => [
                 'maestro',
                 $this->generateCardNum(62, 18),
                 true,
             ],
-            [
+            'maestro99' => [
                 'maestro',
                 $this->generateCardNum(63, 18),
                 true,
             ],
-            [
+            'maestro100' => [
                 'maestro',
                 $this->generateCardNum(64, 18),
                 true,
             ],
-            [
+            'maestro101' => [
                 'maestro',
                 $this->generateCardNum(65, 18),
                 true,
             ],
-            [
+            'maestro102' => [
                 'maestro',
                 $this->generateCardNum(66, 18),
                 true,
             ],
-            [
+            'maestro103' => [
                 'maestro',
                 $this->generateCardNum(67, 18),
                 true,
             ],
-            [
+            'maestro104' => [
                 'maestro',
                 $this->generateCardNum(68, 18),
                 true,
             ],
-            [
+            'maestro105' => [
                 'maestro',
                 $this->generateCardNum(69, 18),
                 true,
             ],
-            [
+            'maestro106' => [
                 'maestro',
                 $this->generateCardNum(50, 19),
                 true,
             ],
-            [
+            'maestro107' => [
                 'maestro',
                 $this->generateCardNum(56, 19),
                 true,
             ],
-            [
+            'maestro108' => [
                 'maestro',
                 $this->generateCardNum(57, 19),
                 true,
             ],
-            [
+            'maestro109' => [
                 'maestro',
                 $this->generateCardNum(58, 19),
                 true,
             ],
-            [
+            'maestro110' => [
                 'maestro',
                 $this->generateCardNum(59, 19),
                 true,
             ],
-            [
+            'maestro111' => [
                 'maestro',
                 $this->generateCardNum(60, 19),
                 true,
             ],
-            [
+            'maestro112' => [
                 'maestro',
                 $this->generateCardNum(61, 19),
                 true,
             ],
-            [
+            'maestro113' => [
                 'maestro',
                 $this->generateCardNum(62, 19),
                 true,
             ],
-            [
+            'maestro114' => [
                 'maestro',
                 $this->generateCardNum(63, 19),
                 true,
             ],
-            [
+            'maestro115' => [
                 'maestro',
                 $this->generateCardNum(64, 19),
                 true,
             ],
-            [
+            'maestro116' => [
                 'maestro',
                 $this->generateCardNum(65, 19),
                 true,
             ],
-            [
+            'maestro117' => [
                 'maestro',
                 $this->generateCardNum(66, 19),
                 true,
             ],
-            [
+            'maestro118' => [
                 'maestro',
                 $this->generateCardNum(67, 19),
                 true,
             ],
-            [
+            'maestro119' => [
                 'maestro',
                 $this->generateCardNum(68, 19),
                 true,
             ],
-            [
+            'maestro120' => [
                 'maestro',
                 $this->generateCardNum(69, 19),
                 true,
             ],
-            [
+            'dankort1' => [
                 'dankort',
                 $this->generateCardNum(5019, 16),
                 true,
             ],
-            [
+            'dankort2' => [
                 'dankort',
                 $this->generateCardNum(4175, 16),
                 true,
             ],
-            [
+            'dankort3' => [
                 'dankort',
                 $this->generateCardNum(4571, 16),
                 true,
             ],
-            [
+            'dankort4' => [
                 'dankort',
                 $this->generateCardNum(4, 16),
                 true,
             ],
-            [
+            'mir1' => [
                 'mir',
                 $this->generateCardNum(2200, 16),
                 true,
             ],
-            [
+            'mir2' => [
                 'mir',
                 $this->generateCardNum(2201, 16),
                 true,
             ],
-            [
+            'mir3' => [
                 'mir',
                 $this->generateCardNum(2202, 16),
                 true,
             ],
-            [
+            'mir4' => [
                 'mir',
                 $this->generateCardNum(2203, 16),
                 true,
             ],
-            [
+            'mir5' => [
                 'mir',
                 $this->generateCardNum(2204, 16),
                 true,
             ],
-            [
+            'mastercard1' => [
                 'mastercard',
                 $this->generateCardNum(51, 16),
                 true,
             ],
-            [
+            'mastercard2' => [
                 'mastercard',
                 $this->generateCardNum(52, 16),
                 true,
             ],
-            [
+            'mastercard3' => [
                 'mastercard',
                 $this->generateCardNum(53, 16),
                 true,
             ],
-            [
+            'mastercard4' => [
                 'mastercard',
                 $this->generateCardNum(54, 16),
                 true,
             ],
-            [
+            'mastercard5' => [
                 'mastercard',
                 $this->generateCardNum(55, 16),
                 true,
             ],
-            [
+            'mastercard6' => [
                 'mastercard',
                 $this->generateCardNum(22, 16),
                 true,
             ],
-            [
+            'mastercard7' => [
                 'mastercard',
                 $this->generateCardNum(23, 16),
                 true,
             ],
-            [
+            'mastercard8' => [
                 'mastercard',
                 $this->generateCardNum(24, 16),
                 true,
             ],
-            [
+            'mastercard9' => [
                 'mastercard',
                 $this->generateCardNum(25, 16),
                 true,
             ],
-            [
+            'mastercard10' => [
                 'mastercard',
                 $this->generateCardNum(26, 16),
                 true,
             ],
-            [
+            'mastercard11' => [
                 'mastercard',
                 $this->generateCardNum(27, 16),
                 true,
             ],
-            [
+            'visa1' => [
                 'visa',
                 $this->generateCardNum(4, 13),
                 true,
             ],
-            [
+            'visa2' => [
                 'visa',
                 $this->generateCardNum(4, 16),
                 true,
             ],
-            [
+            'visa3' => [
                 'visa',
                 $this->generateCardNum(4, 19),
                 true,
             ],
-            [
+            'uatp' => [
                 'uatp',
                 $this->generateCardNum(1, 15),
                 true,
             ],
-            [
+            'verve1' => [
                 'verve',
                 $this->generateCardNum(506, 16),
                 true,
             ],
-            [
+            'verve2' => [
                 'verve',
                 $this->generateCardNum(650, 16),
                 true,
             ],
-            [
+            'verve3' => [
                 'verve',
                 $this->generateCardNum(506, 19),
                 true,
             ],
-            [
+            'verve4' => [
                 'verve',
                 $this->generateCardNum(650, 19),
                 true,
             ],
-            [
+            'cibc1' => [
                 'cibc',
                 $this->generateCardNum(4506, 16),
                 true,
             ],
-            [
+            'rbc1' => [
                 'rbc',
                 $this->generateCardNum(45, 16),
                 true,
             ],
-            [
+            'tdtrust' => [
                 'tdtrust',
                 $this->generateCardNum(589297, 16),
                 true,
             ],
-            [
+            'scotia1' => [
                 'scotia',
                 $this->generateCardNum(4536, 16),
                 true,
             ],
-            [
+            'bmoabm1' => [
                 'bmoabm',
                 $this->generateCardNum(500, 16),
                 true,
             ],
-            [
+            'hsbc1' => [
                 'hsbc',
                 $this->generateCardNum(56, 16),
                 true,
             ],
-            [
+            'hsbc2' => [
                 'hsbc',
                 $this->generateCardNum(57, 16),
                 false,

From aa96117dc68a93a4ce2746cbb501903e5dc7b893 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Aug 2021 16:47:37 +0000
Subject: [PATCH 0119/2325] Update rector/rector requirement from 0.11.40 to
 0.11.42 (#4984)

---
 composer.json                          | 2 +-
 rector.php                             | 2 --
 tests/system/API/ResponseTraitTest.php | 6 +++---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 648f7b4fc88b..077bad29c198 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "phpstan/phpstan": "^0.12.91",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.40",
+        "rector/rector": "0.11.42",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {
diff --git a/rector.php b/rector.php
index 6f47b388576d..3f65b0a273e6 100644
--- a/rector.php
+++ b/rector.php
@@ -22,7 +22,6 @@
 use Rector\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector;
 use Rector\CodeQuality\Rector\Return_\SimplifyUselessVariableRector;
 use Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector;
-use Rector\CodeQualityStrict\Rector\Variable\MoveVariableDeclarationNearReferenceRector;
 use Rector\CodingStyle\Rector\ClassMethod\FuncGetArgsToVariadicParamRector;
 use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector;
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
@@ -106,7 +105,6 @@
     $services->set(RemoveErrorSuppressInTryCatchStmtsRector::class);
     $services->set(TernaryToNullCoalescingRector::class);
     $services->set(ListToArrayDestructRector::class);
-    $services->set(MoveVariableDeclarationNearReferenceRector::class);
     $services->set(RemoveVarTagFromClassConstantRector::class);
     $services->set(AddPregQuoteDelimiterRector::class);
     $services->set(SimplifyRegexPatternRector::class);
diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
index 4f6e5a097bdf..fd35469dd5ec 100644
--- a/tests/system/API/ResponseTraitTest.php
+++ b/tests/system/API/ResponseTraitTest.php
@@ -429,9 +429,9 @@ public function testServerError()
         $controller = $this->makeController();
         $controller->failServerError('Nope.', 'FAT-CHANCE', 'A custom reason.');
 
-        $this::assertEquals('A custom reason.', $this->response->getReason());
-        $this::assertEquals(500, $this->response->getStatusCode());
-        $this::assertEquals($this->formatter->format([
+        $this->assertSame('A custom reason.', $this->response->getReason());
+        $this->assertSame(500, $this->response->getStatusCode());
+        $this->assertSame($this->formatter->format([
             'status'   => 500,
             'error'    => 'FAT-CHANCE',
             'messages' => [

From fc52b058487ef6ef7274e6e7e02ccbb3f6ff73e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Aug 2021 16:40:20 +0000
Subject: [PATCH 0120/2325] Update rector/rector requirement from 0.11.42 to
 0.11.43 (#4985)

---
 composer.json                              | 2 +-
 system/Cache/Handlers/MemcachedHandler.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 077bad29c198..5a591c7ed877 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "phpstan/phpstan": "^0.12.91",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.42",
+        "rector/rector": "0.11.43",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {
diff --git a/system/Cache/Handlers/MemcachedHandler.php b/system/Cache/Handlers/MemcachedHandler.php
index 07cd85b3a29a..7684dffdbbbe 100644
--- a/system/Cache/Handlers/MemcachedHandler.php
+++ b/system/Cache/Handlers/MemcachedHandler.php
@@ -138,7 +138,7 @@ public function get(string $key)
             }
         } elseif ($this->memcached instanceof Memcache) {
             $flags = false;
-            $data  = $this->memcached->get($key, $flags); // @phpstan-ignore-line
+            $data  = $this->memcached->get($key, $flags);
 
             // check for unmatched key (i.e. $flags is untouched)
             if ($flags === false) {

From 781aa9eb0a89afeaafb58c8422faf6ac776b51fa Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Fri, 6 Aug 2021 19:51:19 +0800
Subject: [PATCH 0121/2325] Remove override (#4991)

---
 .no-header.php-cs-fixer.dist.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.no-header.php-cs-fixer.dist.php b/.no-header.php-cs-fixer.dist.php
index 4bee79703546..b7e082dff72d 100644
--- a/.no-header.php-cs-fixer.dist.php
+++ b/.no-header.php-cs-fixer.dist.php
@@ -23,9 +23,7 @@
         __DIR__ . '/public',
     ]);
 
-$overrides = [
-    'no_blank_lines_after_phpdoc' => false,
-];
+$overrides = [];
 
 $options = [
     'cacheFile' => 'build/.no-header.php-cs-fixer.cache',

From 5f09c247320c966f12a889a0821684daeb82f9bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Aug 2021 17:55:41 +0000
Subject: [PATCH 0122/2325] Update rector/rector requirement from 0.11.43 to
 0.11.46 (#4995)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 5a591c7ed877..4dd874b1bb1d 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "phpstan/phpstan": "^0.12.91",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.43",
+        "rector/rector": "0.11.46",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {

From 77b79109dda59c8974f89a99bec96fcec2f2868f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Aug 2021 10:13:28 +0800
Subject: [PATCH 0123/2325] Update rector/rector requirement from 0.11.46 to
 0.11.47 (#4997)

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.11.46...0.11.47)

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

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 4dd874b1bb1d..224164546dc3 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "phpstan/phpstan": "^0.12.91",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.46",
+        "rector/rector": "0.11.47",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {

From dcb54b3e1f6f470930c2dfaf06bd5ae1ee1e8bee Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 13 Aug 2021 16:48:41 +0800
Subject: [PATCH 0124/2325] Add SpaceAfterCommentFixer

---
 .no-header.php-cs-fixer.dist.php              |  11 +-
 .php-cs-fixer.dist.php                        |  11 +-
 system/BaseModel.php                          |   2 +-
 system/Cache/Handlers/MemcachedHandler.php    |   2 +-
 system/Common.php                             |   4 +-
 system/Database/BaseConnection.php            |   2 +-
 system/Debug/Exceptions.php                   |   2 +-
 system/Entity/Entity.php                      |   4 +-
 system/HTTP/Files/UploadedFile.php            |   4 +-
 system/Helpers/inflector_helper.php           |   2 +-
 system/Router/RouteCollection.php             |   2 +-
 system/Test/DOMParser.php                     |   2 +-
 system/View/Parser.php                        |   2 +-
 system/View/View.php                          |   2 +-
 .../20160428212500_Create_test_tables.php     |   6 +-
 .../_support/Database/Seeds/CITestSeeder.php  |   2 +-
 tests/system/Cache/CacheFactoryTest.php       |   6 +-
 .../Cache/Handlers/RedisHandlerTest.php       |  16 +--
 tests/system/Database/Live/GetTest.php        | 134 +++++++++---------
 tests/system/HTTP/CLIRequestTest.php          |   2 +-
 tests/system/HTTP/RequestTest.php             |   2 +-
 tests/system/Helpers/HTMLHelperTest.php       |   2 +-
 tests/system/Router/RouteCollectionTest.php   |   2 +-
 tests/system/View/ParserTest.php              |   2 +-
 tests/system/View/ViewTest.php                |   2 +-
 .../Comment/SpaceAfterCommentStartFixer.php   |  95 +++++++++++++
 26 files changed, 216 insertions(+), 107 deletions(-)
 create mode 100644 utils/PhpCsFixer/Fixer/Comment/SpaceAfterCommentStartFixer.php

diff --git a/.no-header.php-cs-fixer.dist.php b/.no-header.php-cs-fixer.dist.php
index b7e082dff72d..8f7eb0a71cf1 100644
--- a/.no-header.php-cs-fixer.dist.php
+++ b/.no-header.php-cs-fixer.dist.php
@@ -14,6 +14,7 @@
 use Nexus\CsConfig\Factory;
 use PhpCsFixer\Finder;
 use Utils\PhpCsFixer\CodeIgniter4;
+use Utils\PhpCsFixer\Fixer\Comment\SpaceAfterCommentStartFixer;
 
 $finder = Finder::create()
     ->files()
@@ -26,8 +27,14 @@
 $overrides = [];
 
 $options = [
-    'cacheFile' => 'build/.no-header.php-cs-fixer.cache',
-    'finder'    => $finder,
+    'cacheFile'    => 'build/.no-header.php-cs-fixer.cache',
+    'finder'       => $finder,
+    'customFixers' => [
+        new SpaceAfterCommentStartFixer(),
+    ],
+    'customRules' => [
+        'CodeIgniter4/space_after_comment_start' => true,
+    ],
 ];
 
 return Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects();
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 15db678cbd35..95478343a53a 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -14,6 +14,7 @@
 use Nexus\CsConfig\Factory;
 use PhpCsFixer\Finder;
 use Utils\PhpCsFixer\CodeIgniter4;
+use Utils\PhpCsFixer\Fixer\Comment\SpaceAfterCommentStartFixer;
 
 $finder = Finder::create()
     ->files()
@@ -34,8 +35,14 @@
 $overrides = [];
 
 $options = [
-    'cacheFile' => 'build/.php-cs-fixer.cache',
-    'finder'    => $finder,
+    'cacheFile'    => 'build/.php-cs-fixer.cache',
+    'finder'       => $finder,
+    'customFixers' => [
+        new SpaceAfterCommentStartFixer(),
+    ],
+    'customRules' => [
+        'CodeIgniter4/space_after_comment_start' => true,
+    ],
 ];
 
 return Factory::create(new CodeIgniter4(), $overrides, $options)->forLibrary(
diff --git a/system/BaseModel.php b/system/BaseModel.php
index 1d777506976f..e57ac4fec6bd 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -1327,7 +1327,7 @@ public function validate($data): bool
             return true;
         }
 
-        //Validation requires array, so cast away.
+        // Validation requires array, so cast away.
         if (is_object($data)) {
             $data = (array) $data;
         }
diff --git a/system/Cache/Handlers/MemcachedHandler.php b/system/Cache/Handlers/MemcachedHandler.php
index 7684dffdbbbe..2667abca92a6 100644
--- a/system/Cache/Handlers/MemcachedHandler.php
+++ b/system/Cache/Handlers/MemcachedHandler.php
@@ -220,7 +220,7 @@ public function decrement(string $key, int $offset = 1)
 
         $key = static::validateKey($key, $this->prefix);
 
-        //FIXME: third parameter isn't other handler actions.
+        // FIXME: third parameter isn't other handler actions.
         // @phpstan-ignore-next-line
         return $this->memcached->decrement($key, $offset, $offset, 60);
     }
diff --git a/system/Common.php b/system/Common.php
index 4a3a6102e4de..129a3374738e 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -978,8 +978,8 @@ function single_service(string $name, ...$params)
 }
 
 if (! function_exists('slash_item')) {
-    //Unlike CI3, this function is placed here because
-    //it's not a config, or part of a config.
+    // Unlike CI3, this function is placed here because
+    // it's not a config, or part of a config.
     /**
      * Fetch a config file item with slash appended (if not empty)
      *
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 80cc2b962191..c7bec269c472 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -461,7 +461,7 @@ abstract public function reconnect();
      */
     public function getConnection(?string $alias = null)
     {
-        //@todo work with read/write connections
+        // @todo work with read/write connections
         return $this->connID;
     }
 
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index 07218ed47ba2..5950148984ef 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -85,7 +85,7 @@ public function __construct(ExceptionsConfig $config, IncomingRequest $request,
      */
     public function initialize()
     {
-        //Set the Exception Handler
+        // Set the Exception Handler
         set_exception_handler([$this, 'exceptionHandler']);
 
         // Set the Error Handler
diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index 74339dd6eefe..03f6327f8142 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -353,7 +353,7 @@ protected function castAs($value, string $attribute, string $method = 'get')
             $type = substr($type, 1);
         }
 
-        //In order not to create a separate handler for the
+        // In order not to create a separate handler for the
         // json-array type, we transform the required one.
         $type = $type === 'json-array' ? 'json[array]' : $type;
 
@@ -363,7 +363,7 @@ protected function castAs($value, string $attribute, string $method = 'get')
 
         $params = [];
 
-        //Attempt to retrieve additional parameters if specified
+        // Attempt to retrieve additional parameters if specified
         // type[param, param2,param3]
         if (preg_match('/^(.+)\[(.+)\]$/', $type, $matches)) {
             $type   = $matches[1];
diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
index 17e9130694fe..6455a5106d8d 100644
--- a/system/HTTP/Files/UploadedFile.php
+++ b/system/HTTP/Files/UploadedFile.php
@@ -127,7 +127,7 @@ public function __construct(string $path, string $originalName, ?string $mimeTyp
     public function move(string $targetPath, ?string $name = null, bool $overwrite = false)
     {
         $targetPath = rtrim($targetPath, '/') . '/';
-        $targetPath = $this->setPath($targetPath); //set the target path
+        $targetPath = $this->setPath($targetPath); // set the target path
 
         if ($this->hasMoved) {
             throw HTTPException::forAlreadyMoved();
@@ -169,7 +169,7 @@ protected function setPath(string $path): string
     {
         if (! is_dir($path)) {
             mkdir($path, 0777, true);
-            //create the index.html file
+            // create the index.html file
             if (! is_file($path . 'index.html')) {
                 $file = fopen($path . 'index.html', 'x+b');
                 fclose($file);
diff --git a/system/Helpers/inflector_helper.php b/system/Helpers/inflector_helper.php
index ad632a3f12c8..b4d38015564f 100755
--- a/system/Helpers/inflector_helper.php
+++ b/system/Helpers/inflector_helper.php
@@ -27,7 +27,7 @@ function singular(string $string): string
             return $result;
         }
 
-        //Arranged in order.
+        // Arranged in order.
         $singularRules = [
             '/(matr)ices$/'                                                   => '\1ix',
             '/(vert|ind)ices$/'                                               => '\1ex',
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 7a9ab5010872..b3a3f8e75f56 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1155,7 +1155,7 @@ static function ($m) use ($i) {
             $from = str_ireplace(':' . $tag, $pattern, $from);
         }
 
-        //If is redirect, No processing
+        // If is redirect, No processing
         if (! isset($options['redirect']) && is_string($to)) {
             // If no namespace found, add the default namespace
             if (strpos($to, '\\') === false || strpos($to, '\\') > 0) {
diff --git a/system/Test/DOMParser.php b/system/Test/DOMParser.php
index 90062f05c158..531adf737364 100644
--- a/system/Test/DOMParser.php
+++ b/system/Test/DOMParser.php
@@ -64,7 +64,7 @@ public function withString(string $content)
         // converts all special characters to utf-8
         $content = mb_convert_encoding($content, 'HTML-ENTITIES', 'UTF-8');
 
-        //turning off some errors
+        // turning off some errors
         libxml_use_internal_errors(true);
 
         if (! $this->dom->loadHTML($content)) {
diff --git a/system/View/Parser.php b/system/View/Parser.php
index 080a30c35674..c58f2b427dc5 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -333,7 +333,7 @@ protected function parsePair(string $variable, array $data, string $template): a
                 $str .= $out;
             }
 
-            //Escape | character from filters as it's handled as OR in regex
+            // Escape | character from filters as it's handled as OR in regex
             $escapedMatch = preg_replace('/(?<!\\\\)\\|/', '\\|', $match[0]);
 
             $replace['#' . $escapedMatch . '#s'] = $str;
diff --git a/system/View/View.php b/system/View/View.php
index cba8c70c06f6..6005b5f40582 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -375,7 +375,7 @@ public function extend(string $layout)
      */
     public function section(string $name)
     {
-        //Saved to prevent BC.
+        // Saved to prevent BC.
         $this->currentSection = $name;
         $this->sectionStack[] = $name;
 
diff --git a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
index b79866b446ae..07b61cdd2451 100644
--- a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
+++ b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
@@ -45,9 +45,9 @@ public function up()
             'value' => ['type' => 'VARCHAR', 'constraint' => 400, 'null' => true],
         ])->addKey('id', true)->createTable('misc', true);
 
-        //Database Type test table
-        //missing types :
-        //TINYINT,MEDIUMINT,BIT,YEAR,BINARY , VARBINARY, TINYTEXT,LONGTEXT,YEAR,JSON,Spatial data types
+        // Database Type test table
+        // missing types :
+        // TINYINT,MEDIUMINT,BIT,YEAR,BINARY , VARBINARY, TINYTEXT,LONGTEXT,YEAR,JSON,Spatial data types
         // id must be interger else SQLite3 error on not null for autoinc field
         $data_type_fields = [
             'id'              => ['type' => 'INTEGER', 'constraint' => 20, 'auto_increment' => true],
diff --git a/tests/_support/Database/Seeds/CITestSeeder.php b/tests/_support/Database/Seeds/CITestSeeder.php
index 2f90f86cdee9..0319896159ab 100644
--- a/tests/_support/Database/Seeds/CITestSeeder.php
+++ b/tests/_support/Database/Seeds/CITestSeeder.php
@@ -110,7 +110,7 @@ public function run()
             ],
         ];
 
-        //set SQL times to more correct format
+        // set SQL times to more correct format
         if ($this->db->DBDriver === 'SQLite3') {
             $data['type_test'][0]['type_date']      = '2020/01/11';
             $data['type_test'][0]['type_time']      = '15:22:00';
diff --git a/tests/system/Cache/CacheFactoryTest.php b/tests/system/Cache/CacheFactoryTest.php
index 237554d5e5fd..ec978504fcfb 100644
--- a/tests/system/Cache/CacheFactoryTest.php
+++ b/tests/system/Cache/CacheFactoryTest.php
@@ -30,7 +30,7 @@ protected function setUp(): void
 
         $this->cacheFactory = new CacheFactory();
 
-        //Initialize path
+        // Initialize path
         $this->config = new Cache();
         $this->config->storePath .= self::$directory;
     }
@@ -98,7 +98,7 @@ public function testGetDummyHandler()
 
         $this->assertInstanceOf(DummyHandler::class, $this->cacheFactory->getHandler($this->config));
 
-        //Initialize path
+        // Initialize path
         $this->config = new Cache();
         $this->config->storePath .= self::$directory;
     }
@@ -117,7 +117,7 @@ public function testHandlesBadHandler()
             $this->assertInstanceOf(DummyHandler::class, $this->cacheFactory->getHandler($this->config, 'wincache', 'wincache'));
         }
 
-        //Initialize path
+        // Initialize path
         $this->config = new Cache();
         $this->config->storePath .= self::$directory;
     }
diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php
index 9c0a13147c5c..66f3c7fd2244 100644
--- a/tests/system/Cache/Handlers/RedisHandlerTest.php
+++ b/tests/system/Cache/Handlers/RedisHandlerTest.php
@@ -157,14 +157,14 @@ public function testDeleteMatchingSuffix()
         $this->assertSame('keys=90', $dbInfo[0]);
     }
 
-    //FIXME: I don't like all Hash logic very much. It's wasting memory.
-    //public function testIncrement()
-    //{
-    //}
-
-    //public function testDecrement()
-    //{
-    //}
+    // FIXME: I don't like all Hash logic very much. It's wasting memory.
+    // public function testIncrement()
+    // {
+    // }
+
+    // public function testDecrement()
+    // {
+    // }
 
     public function testClean()
     {
diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php
index e361ce2bafc4..16424c252d29 100644
--- a/tests/system/Database/Live/GetTest.php
+++ b/tests/system/Database/Live/GetTest.php
@@ -93,79 +93,79 @@ public function testGetFieldData()
         $typeTest = $this->db->table('type_test')->get()->getFieldData();
 
         if ($this->db->DBDriver === 'SQLite3') {
-            $this->assertSame('integer', $typeTest[0]->type_name); //INTEGER AUTO INC
-            $this->assertSame('text', $typeTest[1]->type_name);  //VARCHAR
-            $this->assertSame('text', $typeTest[2]->type_name);  //CHAR
-            $this->assertSame('text', $typeTest[3]->type_name);  //TEXT
-            $this->assertSame('integer', $typeTest[4]->type_name);  //SMALLINT
-            $this->assertSame('integer', $typeTest[5]->type_name);  //INTEGER
-            $this->assertSame('float', $typeTest[6]->type_name);  //FLOAT
-            $this->assertSame('float', $typeTest[7]->type_name);  //NUMERIC
-            $this->assertSame('text', $typeTest[8]->type_name);  //DATE
-            $this->assertSame('text', $typeTest[9]->type_name);  //TIME
-            $this->assertSame('text', $typeTest[10]->type_name);  //DATETIME
-            $this->assertSame('text', $typeTest[11]->type_name);  //TIMESTAMP
-            $this->assertSame('integer', $typeTest[12]->type_name);  //BIGINT
-            $this->assertSame('float', $typeTest[13]->type_name);  //REAL
-            $this->assertSame('text', $typeTest[14]->type_name);  //ENUM
-            $this->assertSame('text', $typeTest[15]->type_name);  //SET
-            $this->assertSame('text', $typeTest[16]->type_name);  //MEDIUMTEXT
-            $this->assertSame('float', $typeTest[17]->type_name);  //DOUBLE
-            $this->assertSame('float', $typeTest[18]->type_name);  //DECIMAL
-            $this->assertSame('text', $typeTest[19]->type_name);  //BLOB
+            $this->assertSame('integer', $typeTest[0]->type_name); // INTEGER AUTO INC
+            $this->assertSame('text', $typeTest[1]->type_name);  // VARCHAR
+            $this->assertSame('text', $typeTest[2]->type_name);  // CHAR
+            $this->assertSame('text', $typeTest[3]->type_name);  // TEXT
+            $this->assertSame('integer', $typeTest[4]->type_name);  // SMALLINT
+            $this->assertSame('integer', $typeTest[5]->type_name);  // INTEGER
+            $this->assertSame('float', $typeTest[6]->type_name);  // FLOAT
+            $this->assertSame('float', $typeTest[7]->type_name);  // NUMERIC
+            $this->assertSame('text', $typeTest[8]->type_name);  // DATE
+            $this->assertSame('text', $typeTest[9]->type_name);  // TIME
+            $this->assertSame('text', $typeTest[10]->type_name);  // DATETIME
+            $this->assertSame('text', $typeTest[11]->type_name);  // TIMESTAMP
+            $this->assertSame('integer', $typeTest[12]->type_name);  // BIGINT
+            $this->assertSame('float', $typeTest[13]->type_name);  // REAL
+            $this->assertSame('text', $typeTest[14]->type_name);  // ENUM
+            $this->assertSame('text', $typeTest[15]->type_name);  // SET
+            $this->assertSame('text', $typeTest[16]->type_name);  // MEDIUMTEXT
+            $this->assertSame('float', $typeTest[17]->type_name);  // DOUBLE
+            $this->assertSame('float', $typeTest[18]->type_name);  // DECIMAL
+            $this->assertSame('text', $typeTest[19]->type_name);  // BLOB
         }
         if ($this->db->DBDriver === 'MySQLi') {
-            $this->assertSame('long', $typeTest[0]->type_name); //INTEGER AUTOINC
-            $this->assertSame('var_string', $typeTest[1]->type_name);  //VARCHAR
-            $this->assertSame('string', $typeTest[2]->type_name);  //CHAR
-            $this->assertSame('blob', $typeTest[3]->type_name);  //TEXT
-            $this->assertSame('short', $typeTest[4]->type_name);  //SMALLINT
-            $this->assertSame('long', $typeTest[5]->type_name);  //INTEGER
-            $this->assertSame('float', $typeTest[6]->type_name);  //FLOAT
-            $this->assertSame('newdecimal', $typeTest[7]->type_name);  //NUMERIC
-            $this->assertSame('date', $typeTest[8]->type_name);  //DATE
-            $this->assertSame('time', $typeTest[9]->type_name);  //TIME
-            $this->assertSame('datetime', $typeTest[10]->type_name);  //DATETIME
-            $this->assertSame('timestamp', $typeTest[11]->type_name);  //TIMESTAMP
-            $this->assertSame('longlong', $typeTest[12]->type_name); //BIGINT
-            $this->assertSame('double', $typeTest[13]->type_name);  //REAL
-            $this->assertSame('string', $typeTest[14]->type_name);  //ENUM
-            $this->assertSame('string', $typeTest[15]->type_name);  //SET
-            $this->assertSame('blob', $typeTest[16]->type_name);  //MEDIUMTEXT
-            $this->assertSame('double', $typeTest[17]->type_name);  //DOUBLE
-            $this->assertSame('newdecimal', $typeTest[18]->type_name);  //DECIMAL
-            $this->assertSame('blob', $typeTest[19]->type_name);  //BLOB
+            $this->assertSame('long', $typeTest[0]->type_name); // INTEGER AUTOINC
+            $this->assertSame('var_string', $typeTest[1]->type_name);  // VARCHAR
+            $this->assertSame('string', $typeTest[2]->type_name);  // CHAR
+            $this->assertSame('blob', $typeTest[3]->type_name);  // TEXT
+            $this->assertSame('short', $typeTest[4]->type_name);  // SMALLINT
+            $this->assertSame('long', $typeTest[5]->type_name);  // INTEGER
+            $this->assertSame('float', $typeTest[6]->type_name);  // FLOAT
+            $this->assertSame('newdecimal', $typeTest[7]->type_name);  // NUMERIC
+            $this->assertSame('date', $typeTest[8]->type_name);  // DATE
+            $this->assertSame('time', $typeTest[9]->type_name);  // TIME
+            $this->assertSame('datetime', $typeTest[10]->type_name);  // DATETIME
+            $this->assertSame('timestamp', $typeTest[11]->type_name);  // TIMESTAMP
+            $this->assertSame('longlong', $typeTest[12]->type_name); // BIGINT
+            $this->assertSame('double', $typeTest[13]->type_name);  // REAL
+            $this->assertSame('string', $typeTest[14]->type_name);  // ENUM
+            $this->assertSame('string', $typeTest[15]->type_name);  // SET
+            $this->assertSame('blob', $typeTest[16]->type_name);  // MEDIUMTEXT
+            $this->assertSame('double', $typeTest[17]->type_name);  // DOUBLE
+            $this->assertSame('newdecimal', $typeTest[18]->type_name);  // DECIMAL
+            $this->assertSame('blob', $typeTest[19]->type_name);  // BLOB
         }
         if ($this->db->DBDriver === 'Postgre') {
-            $this->assertSame('int4', $typeTest[0]->type_name); //INTEGER AUTOINC
-            $this->assertSame('varchar', $typeTest[1]->type_name);  //VARCHAR
-            $this->assertSame('bpchar', $typeTest[2]->type_name);  //CHAR
-            $this->assertSame('text', $typeTest[3]->type_name);  //TEXT
-            $this->assertSame('int2', $typeTest[4]->type_name);  //SMALLINT
-            $this->assertSame('int4', $typeTest[5]->type_name);  //INTEGER
-            $this->assertSame('float8', $typeTest[6]->type_name);  //FLOAT
-            $this->assertSame('numeric', $typeTest[7]->type_name);  //NUMERIC
-            $this->assertSame('date', $typeTest[8]->type_name);  //DATE
-            $this->assertSame('time', $typeTest[9]->type_name);  //TIME
-            $this->assertSame('timestamp', $typeTest[10]->type_name);  //DATETIME
-            $this->assertSame('timestamp', $typeTest[11]->type_name);  //TIMESTAMP
-            $this->assertSame('int8', $typeTest[12]->type_name); //BIGINT
+            $this->assertSame('int4', $typeTest[0]->type_name); // INTEGER AUTOINC
+            $this->assertSame('varchar', $typeTest[1]->type_name);  // VARCHAR
+            $this->assertSame('bpchar', $typeTest[2]->type_name);  // CHAR
+            $this->assertSame('text', $typeTest[3]->type_name);  // TEXT
+            $this->assertSame('int2', $typeTest[4]->type_name);  // SMALLINT
+            $this->assertSame('int4', $typeTest[5]->type_name);  // INTEGER
+            $this->assertSame('float8', $typeTest[6]->type_name);  // FLOAT
+            $this->assertSame('numeric', $typeTest[7]->type_name);  // NUMERIC
+            $this->assertSame('date', $typeTest[8]->type_name);  // DATE
+            $this->assertSame('time', $typeTest[9]->type_name);  // TIME
+            $this->assertSame('timestamp', $typeTest[10]->type_name);  // DATETIME
+            $this->assertSame('timestamp', $typeTest[11]->type_name);  // TIMESTAMP
+            $this->assertSame('int8', $typeTest[12]->type_name); // BIGINT
         }
         if ($this->db->DBDriver === 'SQLSRV') {
-            $this->assertSame('int', $typeTest[0]->type_name); //INTEGER AUTOINC
-            $this->assertSame('varchar', $typeTest[1]->type_name);  //VARCHAR
-            $this->assertSame('char', $typeTest[2]->type_name);  //CHAR
-            $this->assertSame('text', $typeTest[3]->type_name);  //TEXT
-            $this->assertSame('smallint', $typeTest[4]->type_name);  //SMALLINT
-            $this->assertSame('int', $typeTest[5]->type_name);  //INTEGER
-            $this->assertSame('float', $typeTest[6]->type_name);  //FLOAT
-            $this->assertSame('numeric', $typeTest[7]->type_name);  //NUMERIC
-            $this->assertNull($typeTest[8]->type_name);  //DATE
-            $this->assertNull($typeTest[9]->type_name);  //TIME
-            $this->assertNull($typeTest[10]->type_name);  //DATETIME
-            $this->assertSame('bigint', $typeTest[11]->type_name); //BIGINT
-            $this->assertSame('real', $typeTest[12]->type_name);  //REAL
-            $this->assertSame('decimal', $typeTest[13]->type_name);  //DECIMAL
+            $this->assertSame('int', $typeTest[0]->type_name); // INTEGER AUTOINC
+            $this->assertSame('varchar', $typeTest[1]->type_name);  // VARCHAR
+            $this->assertSame('char', $typeTest[2]->type_name);  // CHAR
+            $this->assertSame('text', $typeTest[3]->type_name);  // TEXT
+            $this->assertSame('smallint', $typeTest[4]->type_name);  // SMALLINT
+            $this->assertSame('int', $typeTest[5]->type_name);  // INTEGER
+            $this->assertSame('float', $typeTest[6]->type_name);  // FLOAT
+            $this->assertSame('numeric', $typeTest[7]->type_name);  // NUMERIC
+            $this->assertNull($typeTest[8]->type_name);  // DATE
+            $this->assertNull($typeTest[9]->type_name);  // TIME
+            $this->assertNull($typeTest[10]->type_name);  // DATETIME
+            $this->assertSame('bigint', $typeTest[11]->type_name); // BIGINT
+            $this->assertSame('real', $typeTest[12]->type_name);  // REAL
+            $this->assertSame('decimal', $typeTest[13]->type_name);  // DECIMAL
         }
     }
 
diff --git a/tests/system/HTTP/CLIRequestTest.php b/tests/system/HTTP/CLIRequestTest.php
index 7940624e68bb..c31bace6b554 100644
--- a/tests/system/HTTP/CLIRequestTest.php
+++ b/tests/system/HTTP/CLIRequestTest.php
@@ -604,7 +604,7 @@ public function testGetIPAddressThruProxyOutofSubnet()
         $this->assertSame('192.168.5.21', $this->request->getIPAddress());
     }
 
-    //FIXME getIPAddress should have more testing, to 100% code coverage
+    // FIXME getIPAddress should have more testing, to 100% code coverage
 
     public function testMethodReturnsRightStuff()
     {
diff --git a/tests/system/HTTP/RequestTest.php b/tests/system/HTTP/RequestTest.php
index d75cd0ed8665..e4ad2d6bf340 100644
--- a/tests/system/HTTP/RequestTest.php
+++ b/tests/system/HTTP/RequestTest.php
@@ -671,7 +671,7 @@ public function testGetIPAddressThruProxyOutofSubnet()
         $this->assertSame('192.168.5.21', $this->request->getIPAddress());
     }
 
-    //FIXME getIPAddress should have more testing, to 100% code coverage
+    // FIXME getIPAddress should have more testing, to 100% code coverage
 
     public function testMethodReturnsRightStuff()
     {
diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index 71c145fc26da..c5665ea94e05 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -35,7 +35,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        //URL is needed by the HTML Helper.
+        // URL is needed by the HTML Helper.
         helper('url');
         helper('html');
 
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index 8220f1857485..8f586a4fcbb8 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -950,7 +950,7 @@ public function testAddRedirect()
     {
         $routes = $this->getCollector();
 
-        //The second parameter is either the new URI to redirect to, or the name of a named route.
+        // The second parameter is either the new URI to redirect to, or the name of a named route.
         $routes->addRedirect('users', 'users/index', 307);
 
         $expected = [
diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php
index 98c6c56ed9b4..547d9b549d0f 100644
--- a/tests/system/View/ParserTest.php
+++ b/tests/system/View/ParserTest.php
@@ -953,7 +953,7 @@ public function testRenderStringSavingData()
         $this->parser->setData(['testString' => 'Hello World']);
         $this->assertSame($expected, $this->parser->renderString($pattern, [], false));
         $this->assertArrayNotHasKey('testString', $this->parser->getData());
-        //last set data is not saved
+        // last set data is not saved
         $this->parser->setData(['testString' => 'Hello World']);
         $this->assertSame($expected, $this->parser->renderString($pattern, [], true));
         $this->assertArrayHasKey('testString', $this->parser->getData());
diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php
index 6003e5134b6a..7abeff5793e6 100644
--- a/tests/system/View/ViewTest.php
+++ b/tests/system/View/ViewTest.php
@@ -232,7 +232,7 @@ public function testRenderStringSavingData()
         $view     = new View($this->config, $this->viewsDir, $this->loader);
         $expected = '<h1>Hello World</h1>';
 
-        //I think saveData is sava current data, is not clean already set data.
+        // I think saveData is sava current data, is not clean already set data.
         $view->setVar('testString', 'Hello World');
         $this->assertSame($expected, $view->renderString('<h1><?= $testString ?></h1>', [], false));
         $this->assertArrayNotHasKey('testString', $view->getData());
diff --git a/utils/PhpCsFixer/Fixer/Comment/SpaceAfterCommentStartFixer.php b/utils/PhpCsFixer/Fixer/Comment/SpaceAfterCommentStartFixer.php
new file mode 100644
index 000000000000..d7322c32d308
--- /dev/null
+++ b/utils/PhpCsFixer/Fixer/Comment/SpaceAfterCommentStartFixer.php
@@ -0,0 +1,95 @@
+<?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 Utils\PhpCsFixer\Fixer\Comment;
+
+use PhpCsFixer\AbstractFixer;
+use PhpCsFixer\FixerDefinition\CodeSample;
+use PhpCsFixer\FixerDefinition\FixerDefinition;
+use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
+use PhpCsFixer\Preg;
+use PhpCsFixer\Tokenizer\Token;
+use PhpCsFixer\Tokenizer\Tokens;
+use SplFileInfo;
+
+/**
+ * @internal
+ */
+final class SpaceAfterCommentStartFixer extends AbstractFixer
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function getName(): string
+    {
+        return 'CodeIgniter4/' . parent::getName();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getDefinition(): FixerDefinitionInterface
+    {
+        return new FixerDefinition(
+            'There should be a single whitespace after the comment start',
+            [new CodeSample("<?php\n    //this is a comment\n")]
+        );
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isCandidate(Tokens $tokens): bool
+    {
+        return $tokens->isTokenKindFound(T_COMMENT);
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * Must run after NoEmptyCommentFixer
+     */
+    public function getPriority(): int
+    {
+        return 3;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function applyFix(SplFileInfo $file, Tokens $tokens): void
+    {
+        for ($index = 1, $count = $tokens->count(); $index < $count; $index++) {
+            /** @var Token $token */
+            $token = $tokens[$index];
+
+            if (! $token->isGivenKind(T_COMMENT)) {
+                continue;
+            }
+
+            $comment = $token->getContent();
+
+            if (substr($comment, 0, 2) !== '//') {
+                continue;
+            }
+
+            if (Preg::match('/^\/\/(?!\s+)(.+)/', $comment, $matches) !== 1) {
+                continue;
+            }
+
+            if (Preg::match('/\-+/', $matches[1]) === 1 || Preg::match('/\=+/', $matches[1]) === 1) {
+                continue;
+            }
+
+            $tokens[$index] = new Token([T_COMMENT, '// ' . $matches[1]]);
+        }
+    }
+}

From 7e8fc189217bf22e405842f47afd922f67c44b1f Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sat, 14 Aug 2021 18:50:09 +0700
Subject: [PATCH 0125/2325] [Rector] Apply Rector: RemoveDoubleAssignRector

---
 rector.php                                         | 2 ++
 tests/system/HTTP/IncomingRequestDetectingTest.php | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/rector.php b/rector.php
index 3f65b0a273e6..22e33e3d0730 100644
--- a/rector.php
+++ b/rector.php
@@ -28,6 +28,7 @@
 use Rector\Core\Configuration\Option;
 use Rector\Core\ValueObject\PhpVersion;
 use Rector\DeadCode\Rector\Array_\RemoveDuplicatedArrayKeyRector;
+use Rector\DeadCode\Rector\Assign\RemoveDoubleAssignRector;
 use Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector;
 use Rector\DeadCode\Rector\Concat\RemoveConcatAutocastRector;
 use Rector\DeadCode\Rector\Foreach_\RemoveUnusedForeachKeyRector;
@@ -113,4 +114,5 @@
     $services->set(FuncGetArgsToVariadicParamRector::class);
     $services->set(MakeInheritedMethodVisibilitySameAsParentRector::class);
     $services->set(RemoveDuplicatedArrayKeyRector::class);
+    $services->set(RemoveDoubleAssignRector::class);
 };
diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php
index dfb963d05c34..a28fd86525da 100644
--- a/tests/system/HTTP/IncomingRequestDetectingTest.php
+++ b/tests/system/HTTP/IncomingRequestDetectingTest.php
@@ -152,7 +152,6 @@ public function testPathPathInfo()
 
     public function testPathPathInfoGlobal()
     {
-        $this->request->uri = '/index.php/woot?code=good#pos';
         $this->request->uri = '/index.php/woot?code=good#pos';
         $this->request->setGlobal('server', [
             'PATH_INFO' => 'silliness',

From 0c38916535d4bbb14caff220bc815f008e7e8c16 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 17 Aug 2021 18:14:12 +0700
Subject: [PATCH 0126/2325] [Rector] Apply Rector dead code set list

---
 composer.json                                 |  2 +-
 rector.php                                    | 60 ++++++++++++++-----
 system/Database/Forge.php                     | 20 +++----
 system/Database/MySQLi/Result.php             |  2 +-
 system/Database/SQLSRV/Connection.php         |  6 +-
 system/Database/SQLSRV/Forge.php              | 22 ++++---
 system/Debug/Toolbar.php                      |  9 +--
 system/Debug/Toolbar/Collectors/Files.php     |  2 +-
 system/Events/Events.php                      |  4 +-
 system/Filters/Filters.php                    |  4 --
 system/HTTP/URI.php                           |  3 -
 system/Helpers/html_helper.php                | 18 ++----
 system/Helpers/text_helper.php                |  6 +-
 system/Log/Logger.php                         |  2 +-
 system/Pager/Pager.php                        |  2 -
 system/Pager/PagerRenderer.php                |  6 +-
 system/Router/RouteCollectionInterface.php    |  4 --
 system/Router/Router.php                      |  6 --
 system/Security/Security.php                  |  8 ++-
 system/Session/Session.php                    |  4 +-
 system/Test/Fabricator.php                    |  6 --
 system/Test/Mock/MockBuilder.php              |  5 --
 system/Throttle/Throttler.php                 |  2 -
 system/Validation/Rules.php                   |  4 +-
 tests/system/API/ResponseTraitTest.php        |  4 +-
 .../system/Cache/Handlers/FileHandlerTest.php |  2 +-
 tests/system/Cookie/CookieStoreTest.php       |  2 +-
 tests/system/Database/Live/UpdateTest.php     |  4 --
 tests/system/Events/EventsTest.php            |  2 +-
 tests/system/Pager/PagerTest.php              | 10 ++--
 tests/system/Session/SessionTest.php          |  4 +-
 31 files changed, 110 insertions(+), 125 deletions(-)

diff --git a/composer.json b/composer.json
index 224164546dc3..26fd890bf6bc 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "phpstan/phpstan": "^0.12.91",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.47",
+        "rector/rector": "0.11.48",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {
diff --git a/rector.php b/rector.php
index 22e33e3d0730..7ed60ffb1382 100644
--- a/rector.php
+++ b/rector.php
@@ -27,13 +27,14 @@
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
 use Rector\Core\Configuration\Option;
 use Rector\Core\ValueObject\PhpVersion;
-use Rector\DeadCode\Rector\Array_\RemoveDuplicatedArrayKeyRector;
-use Rector\DeadCode\Rector\Assign\RemoveDoubleAssignRector;
-use Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector;
-use Rector\DeadCode\Rector\Concat\RemoveConcatAutocastRector;
-use Rector\DeadCode\Rector\Foreach_\RemoveUnusedForeachKeyRector;
-use Rector\DeadCode\Rector\Property\RemoveUnusedPrivatePropertyRector;
-use Rector\DeadCode\Rector\Switch_\RemoveDuplicatedCaseInSwitchRector;
+use Rector\DeadCode\Rector\Cast\RecastingRemovalRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector;
+use Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector;
+use Rector\DeadCode\Rector\Expression\RemoveDeadStmtRector;
+use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector;
+use Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector;
+use Rector\DeadCode\Rector\StaticCall\RemoveParentCallWithoutParentRector;
 use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector;
 use Rector\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector;
 use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
@@ -51,6 +52,7 @@
 use Utils\Rector\UnderscoreToCamelCaseVariableNameRector;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
+    $containerConfigurator->import(SetList::DEAD_CODE);
     $containerConfigurator->import(SetList::PHP_73);
 
     $parameters = $containerConfigurator->parameters();
@@ -72,6 +74,43 @@
         __DIR__ . '/tests/_support',
         JsonThrowOnErrorRector::class,
         StringifyStrNeedlesRector::class,
+
+        // requires php 8
+        RemoveUnusedPromotedPropertyRector::class,
+
+        // currently buggy on call inside assign, wait for next release
+        RemoveParentCallWithoutParentRector::class,
+
+        // private method called via getPrivateMethodInvoker
+        RemoveUnusedPrivateMethodRector::class => [
+            __DIR__ . '/system/Entity/Entity.php',
+            __DIR__ . '/tests/system/Test/ReflectionHelperTest.php',
+        ],
+
+        // call on purpose for nothing happen check
+        RemoveEmptyMethodCallRector::class => [
+            __DIR__ . '/tests',
+        ],
+
+        // currently buggy on class implements ArrayAccess, wait for next release
+        RemoveDeadStmtRector::class => [
+            __DIR__ . '/tests/system/Cookie/CookieTest.php',
+        ],
+
+        // check on constant compare
+        UnwrapFutureCompatibleIfPhpVersionRector::class => [
+            __DIR__ . '/system/CodeIgniter.php',
+        ],
+
+        // check context ResponseTrait
+        RemoveUselessReturnTagRector::class => [
+            __DIR__ . '/system/HTTP/MessageTrait.php',
+        ],
+
+        // casted to Entity via EntityTest->getCastEntity()
+        RecastingRemovalRector::class => [
+            __DIR__ . '/tests/system/Entity/EntityTest.php',
+        ],
     ]);
 
     // auto import fully qualified class names
@@ -92,17 +131,13 @@
     $services->set(SimplifyStrposLowerRector::class);
     $services->set(CombineIfRector::class);
     $services->set(SimplifyIfReturnBoolRector::class);
-    $services->set(RemoveDuplicatedCaseInSwitchRector::class);
     $services->set(InlineIfToExplicitIfRector::class);
     $services->set(PreparedValueToEarlyReturnRector::class);
     $services->set(ShortenElseIfRector::class);
-    $services->set(RemoveUnusedForeachKeyRector::class);
     $services->set(SimplifyIfElseToTernaryRector::class);
     $services->set(UnusedForeachValueToArrayKeysRector::class);
-    $services->set(RemoveConcatAutocastRector::class);
     $services->set(ChangeArrayPushToArrayAssignRector::class);
     $services->set(UnnecessaryTernaryExpressionRector::class);
-    $services->set(RemoveUnusedPrivatePropertyRector::class);
     $services->set(RemoveErrorSuppressInTryCatchStmtsRector::class);
     $services->set(TernaryToNullCoalescingRector::class);
     $services->set(ListToArrayDestructRector::class);
@@ -110,9 +145,6 @@
     $services->set(AddPregQuoteDelimiterRector::class);
     $services->set(SimplifyRegexPatternRector::class);
     $services->set(RemoveExtraParametersRector::class);
-    $services->set(RemoveUnusedVariableAssignRector::class);
     $services->set(FuncGetArgsToVariadicParamRector::class);
     $services->set(MakeInheritedMethodVisibilitySameAsParentRector::class);
-    $services->set(RemoveDuplicatedArrayKeyRector::class);
-    $services->set(RemoveDoubleAssignRector::class);
 };
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 4e3048290d42..ba3423a890ea 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -996,20 +996,18 @@ protected function _processForeignKeys(string $table): string
             'SET DEFAULT',
         ];
 
-        if ($this->foreignKeys !== []) {
-            foreach ($this->foreignKeys as $field => $fkey) {
-                $nameIndex = $table . '_' . $field . '_foreign';
+        foreach ($this->foreignKeys as $field => $fkey) {
+            $nameIndex = $table . '_' . $field . '_foreign';
 
-                $sql .= ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers($nameIndex)
-                    . ' FOREIGN KEY(' . $this->db->escapeIdentifiers($field) . ') REFERENCES ' . $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['table']) . ' (' . $this->db->escapeIdentifiers($fkey['field']) . ')';
+            $sql .= ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers($nameIndex)
+                . ' FOREIGN KEY(' . $this->db->escapeIdentifiers($field) . ') REFERENCES ' . $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['table']) . ' (' . $this->db->escapeIdentifiers($fkey['field']) . ')';
 
-                if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true)) {
-                    $sql .= ' ON DELETE ' . $fkey['onDelete'];
-                }
+            if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true)) {
+                $sql .= ' ON DELETE ' . $fkey['onDelete'];
+            }
 
-                if ($fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $allowActions, true)) {
-                    $sql .= ' ON UPDATE ' . $fkey['onUpdate'];
-                }
+            if ($fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $allowActions, true)) {
+                $sql .= ' ON UPDATE ' . $fkey['onUpdate'];
             }
         }
 
diff --git a/system/Database/MySQLi/Result.php b/system/Database/MySQLi/Result.php
index b115697e65b9..7eab7d86c685 100644
--- a/system/Database/MySQLi/Result.php
+++ b/system/Database/MySQLi/Result.php
@@ -89,7 +89,7 @@ public function getFieldData(): array
             $retVal[$i]->type        = $data->type;
             $retVal[$i]->type_name   = in_array($data->type, [1, 247], true) ? 'char' : ($dataTypes[$data->type] ?? null);
             $retVal[$i]->max_length  = $data->max_length;
-            $retVal[$i]->primary_key = (int) ($data->flags & 2);
+            $retVal[$i]->primary_key = $data->flags & 2;
             $retVal[$i]->length      = $data->length;
             $retVal[$i]->default     = $data->def;
         }
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index 24aa409ed1de..f09a96d69213 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -354,7 +354,7 @@ protected function _fieldData(string $table): array
      */
     protected function _transBegin(): bool
     {
-        return (bool) sqlsrv_begin_transaction($this->connID);
+        return sqlsrv_begin_transaction($this->connID);
     }
 
     /**
@@ -362,7 +362,7 @@ protected function _transBegin(): bool
      */
     protected function _transCommit(): bool
     {
-        return (bool) sqlsrv_commit($this->connID);
+        return sqlsrv_commit($this->connID);
     }
 
     /**
@@ -370,7 +370,7 @@ protected function _transCommit(): bool
      */
     protected function _transRollback(): bool
     {
-        return (bool) sqlsrv_rollback($this->connID);
+        return sqlsrv_rollback($this->connID);
     }
 
     /**
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
index ab5c3f2d5316..43131698703f 100755
--- a/system/Database/SQLSRV/Forge.php
+++ b/system/Database/SQLSRV/Forge.php
@@ -224,21 +224,19 @@ protected function _processForeignKeys(string $table): string
 
         $allowActions = ['CASCADE', 'SET NULL', 'NO ACTION', 'RESTRICT', 'SET DEFAULT'];
 
-        if ($this->foreignKeys !== []) {
-            foreach ($this->foreignKeys as $field => $fkey) {
-                $nameIndex = $table . '_' . $field . '_foreign';
+        foreach ($this->foreignKeys as $field => $fkey) {
+            $nameIndex = $table . '_' . $field . '_foreign';
 
-                $sql .= ",\n\t CONSTRAINT " . $this->db->escapeIdentifiers($nameIndex)
-                    . ' FOREIGN KEY (' . $this->db->escapeIdentifiers($field) . ') '
-                    . ' REFERENCES ' . $this->db->escapeIdentifiers($this->db->getPrefix() . $fkey['table']) . ' (' . $this->db->escapeIdentifiers($fkey['field']) . ')';
+            $sql .= ",\n\t CONSTRAINT " . $this->db->escapeIdentifiers($nameIndex)
+                . ' FOREIGN KEY (' . $this->db->escapeIdentifiers($field) . ') '
+                . ' REFERENCES ' . $this->db->escapeIdentifiers($this->db->getPrefix() . $fkey['table']) . ' (' . $this->db->escapeIdentifiers($fkey['field']) . ')';
 
-                if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true)) {
-                    $sql .= ' ON DELETE ' . $fkey['onDelete'];
-                }
+            if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true)) {
+                $sql .= ' ON DELETE ' . $fkey['onDelete'];
+            }
 
-                if ($fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $allowActions, true)) {
-                    $sql .= ' ON UPDATE ' . $fkey['onUpdate'];
-                }
+            if ($fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $allowActions, true)) {
+                $sql .= ' ON UPDATE ' . $fkey['onUpdate'];
             }
         }
 
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 6e6a0a8fc88f..16432054d2e2 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -66,17 +66,14 @@ public function __construct(ToolbarConfig $config)
     /**
      * Returns all the data required by Debug Bar
      *
-     * @param float $startTime App start time
+     * @param float           $startTime App start time
+     * @param IncomingRequest $request
+     * @param Response        $response
      *
      * @return string JSON encoded data
      */
     public function run(float $startTime, float $totalTime, RequestInterface $request, ResponseInterface $response): string
     {
-        /**
-         * @var IncomingRequest $request
-         * @var Response        $response
-         */
-
         // Data items used within the view.
         $data['url']             = current_url();
         $data['method']          = $request->getMethod(true);
diff --git a/system/Debug/Toolbar/Collectors/Files.php b/system/Debug/Toolbar/Collectors/Files.php
index d476154db1c3..d6aefd2c3fe9 100644
--- a/system/Debug/Toolbar/Collectors/Files.php
+++ b/system/Debug/Toolbar/Collectors/Files.php
@@ -45,7 +45,7 @@ class Files extends BaseCollector
      */
     public function getTitleDetails(): string
     {
-        return '( ' . (int) count(get_included_files()) . ' )';
+        return '( ' . count(get_included_files()) . ' )';
     }
 
     /**
diff --git a/system/Events/Events.php b/system/Events/Events.php
index a0d9c7616451..ac08107459ca 100644
--- a/system/Events/Events.php
+++ b/system/Events/Events.php
@@ -71,9 +71,7 @@ public static function initialize()
             return;
         }
 
-        /**
-         * @var Modules
-         */
+        /** @var Modules $config */
         $config = config('Modules');
         $events = APPPATH . 'Config' . DIRECTORY_SEPARATOR . 'Events.php';
         $files  = [];
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index bce502a3f4e9..9e3a0aa7913d 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -254,8 +254,6 @@ public function initialize(?string $uri = null)
      * Restores instance to its pre-initialized state.
      * Most useful for testing so the service can be
      * re-initialized to a different path.
-     *
-     * @return $this
      */
     public function reset(): self
     {
@@ -427,8 +425,6 @@ protected function processMethods()
 
         if (array_key_exists($method, $this->config->methods)) {
             $this->filters['before'] = array_merge($this->filters['before'], $this->config->methods[$method]);
-
-            return;
         }
     }
 
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index f6eec4e80a4a..c7bdbb135354 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -997,9 +997,6 @@ public function resolveRelativeURI(string $uri)
      * Section 5.2
      *
      * @see http://tools.ietf.org/html/rfc3986#section-5.2.3
-     *
-     * @param URI $base
-     * @param URI $reference
      */
     protected function mergePaths(self $base, self $reference): string
     {
diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
index dc175afe4e93..a1a51af11955 100755
--- a/system/Helpers/html_helper.php
+++ b/system/Helpers/html_helper.php
@@ -304,10 +304,8 @@ function video($src, string $unsupportedMessage = '', string $attributes = '', a
 
         $video .= ">\n";
 
-        if (! empty($tracks)) {
-            foreach ($tracks as $track) {
-                $video .= _space_indent() . $track . "\n";
-            }
+        foreach ($tracks as $track) {
+            $video .= _space_indent() . $track . "\n";
         }
 
         if (! empty($unsupportedMessage)) {
@@ -352,10 +350,8 @@ function audio($src, string $unsupportedMessage = '', string $attributes = '', a
 
         $audio .= '>';
 
-        if (! empty($tracks)) {
-            foreach ($tracks as $track) {
-                $audio .= "\n" . _space_indent() . $track;
-            }
+        foreach ($tracks as $track) {
+            $audio .= "\n" . _space_indent() . $track;
         }
 
         if (! empty($unsupportedMessage)) {
@@ -388,10 +384,8 @@ function _media(string $name, array $types = [], string $unsupportedMessage = ''
             $media .= _space_indent() . $option . "\n";
         }
 
-        if (! empty($tracks)) {
-            foreach ($tracks as $track) {
-                $media .= _space_indent() . $track . "\n";
-            }
+        foreach ($tracks as $track) {
+            $media .= _space_indent() . $track . "\n";
         }
 
         if (! empty($unsupportedMessage)) {
diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index 23f674be9eb3..5f0738421908 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -395,10 +395,8 @@ function word_wrap(string $str, int $charlim = 76): string
         }
 
         // Put our markers back
-        if (! empty($unwrap)) {
-            foreach ($unwrap as $key => $val) {
-                $output = str_replace('{{unwrapped' . $key . '}}', $val, $output);
-            }
+        foreach ($unwrap as $key => $val) {
+            $output = str_replace('{{unwrapped' . $key . '}}', $val, $output);
         }
 
         // remove any trailing newline
diff --git a/system/Log/Logger.php b/system/Log/Logger.php
index cfceeb3f5449..cee971161f36 100644
--- a/system/Log/Logger.php
+++ b/system/Log/Logger.php
@@ -282,7 +282,7 @@ public function log($level, $message, array $context = []): bool
             }
 
             /**
-             * @var HandlerInterface
+             * @var HandlerInterface $handler
              */
             $handler = $this->handlers[$className];
 
diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
index a23f710f3c73..a653485633aa 100644
--- a/system/Pager/Pager.php
+++ b/system/Pager/Pager.php
@@ -363,8 +363,6 @@ public function getDetails(string $group = 'default'): array
 
     /**
      * Sets only allowed queries on pagination links.
-     *
-     * @return Pager
      */
     public function only(array $queries): self
     {
diff --git a/system/Pager/PagerRenderer.php b/system/Pager/PagerRenderer.php
index e1f20a5492a6..8c70314dc99f 100644
--- a/system/Pager/PagerRenderer.php
+++ b/system/Pager/PagerRenderer.php
@@ -239,7 +239,7 @@ public function links(): array
             $uri     = $this->segment === 0 ? $uri->addQuery($this->pageSelector, $i) : $uri->setSegment($this->segment, $i);
             $links[] = [
                 'uri'    => URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment()),
-                'title'  => (int) $i,
+                'title'  => $i,
                 'active' => ($i === $this->current),
             ];
         }
@@ -260,8 +260,8 @@ protected function updatePages(?int $count = null)
             return;
         }
 
-        $this->first = $this->current - $count > 0 ? (int) ($this->current - $count) : 1;
-        $this->last  = $this->current + $count <= $this->pageCount ? (int) ($this->current + $count) : (int) $this->pageCount;
+        $this->first = $this->current - $count > 0 ? $this->current - $count : 1;
+        $this->last  = $this->current + $count <= $this->pageCount ? $this->current + $count : (int) $this->pageCount;
     }
 
     /**
diff --git a/system/Router/RouteCollectionInterface.php b/system/Router/RouteCollectionInterface.php
index 2a376f61ef32..da25077da0fb 100644
--- a/system/Router/RouteCollectionInterface.php
+++ b/system/Router/RouteCollectionInterface.php
@@ -92,8 +92,6 @@ public function setTranslateURIDashes(bool $value);
      * defined routes.
      *
      * If FALSE, will stop searching and do NO automatic routing.
-     *
-     * @return RouteCollectionInterface
      */
     public function setAutoRoute(bool $value): self;
 
@@ -105,8 +103,6 @@ public function setAutoRoute(bool $value): self;
      * This setting is passed to the Router class and handled there.
      *
      * @param callable|null $callable
-     *
-     * @return RouteCollectionInterface
      */
     public function set404Override($callable = null): self;
 
diff --git a/system/Router/Router.php b/system/Router/Router.php
index aa29abebc56a..a5ccef2c2e3b 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -268,8 +268,6 @@ public function getMatchedRouteOptions()
      * it a blank.
      *
      * @param string $page
-     *
-     * @return $this
      */
     public function setIndexPage($page): self
     {
@@ -281,10 +279,6 @@ public function setIndexPage($page): self
     /**
      * Tells the system whether we should translate URI dashes or not
      * in the URI from a dash to an underscore.
-     *
-     * @param bool|false $val
-     *
-     * @return $this
      */
     public function setTranslateURIDashes(bool $val = false): self
     {
diff --git a/system/Security/Security.php b/system/Security/Security.php
index eca76b483fcb..59a24a0cbd0f 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -125,7 +125,9 @@ class Security implements SecurityInterface
      */
     public function __construct(App $config)
     {
-        /** @var SecurityConfig */
+        /**
+         * @var SecurityConfig $security
+         */
         $security = config('Security');
 
         // Store CSRF-related configurations
@@ -134,7 +136,9 @@ public function __construct(App $config)
         $this->regenerate = $security->regenerate ?? $config->CSRFRegenerate ?? $this->regenerate;
         $rawCookieName    = $security->cookieName ?? $config->CSRFCookieName ?? $this->cookieName;
 
-        /** @var CookieConfig */
+        /**
+         * @var CookieConfig $cookie
+         */
         $cookie = config('Cookie');
 
         $cookiePrefix     = $cookie->prefix ?? $config->cookiePrefix;
diff --git a/system/Session/Session.php b/system/Session/Session.php
index 808e5fd65f49..7850fc534266 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -182,7 +182,9 @@ public function __construct(SessionHandlerInterface $driver, App $config)
         $this->cookieSecure   = $config->cookieSecure ?? $this->cookieSecure;
         $this->cookieSameSite = $config->cookieSameSite ?? $this->cookieSameSite;
 
-        /** @var CookieConfig */
+        /**
+         * @var CookieConfig $cookie
+         */
         $cookie = config('Cookie');
 
         $this->cookie = new Cookie($this->sessionCookieName, '', [
diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
index 65fc10131d04..0fb013cb1820 100644
--- a/system/Test/Fabricator.php
+++ b/system/Test/Fabricator.php
@@ -233,8 +233,6 @@ public function getOverrides(): array
      *
      * @param array $overrides Array of [field => value]
      * @param bool  $persist   Whether these overrides should persist through the next operation
-     *
-     * @return $this
      */
     public function setOverrides(array $overrides = [], $persist = true): self
     {
@@ -259,8 +257,6 @@ public function getFormatters(): ?array
      * Set the formatters to use. Will attempt to autodetect if none are available.
      *
      * @param array|null $formatters Array of [field => formatter], or null to detect
-     *
-     * @return $this
      */
     public function setFormatters(?array $formatters = null): self
     {
@@ -277,8 +273,6 @@ public function setFormatters(?array $formatters = null): self
 
     /**
      * Try to identify the appropriate Faker formatter for each field.
-     *
-     * @return $this
      */
     protected function detectFormatters(): self
     {
diff --git a/system/Test/Mock/MockBuilder.php b/system/Test/Mock/MockBuilder.php
index a47d76b0f561..63002436b4e4 100644
--- a/system/Test/Mock/MockBuilder.php
+++ b/system/Test/Mock/MockBuilder.php
@@ -12,12 +12,7 @@
 namespace CodeIgniter\Test\Mock;
 
 use CodeIgniter\Database\BaseBuilder;
-use CodeIgniter\Database\ConnectionInterface;
 
 class MockBuilder extends BaseBuilder
 {
-    public function __construct($tableName, ConnectionInterface &$db, ?array $options = null)
-    {
-        parent::__construct($tableName, $db, $options);
-    }
 }
diff --git a/system/Throttle/Throttler.php b/system/Throttle/Throttler.php
index fe0679a0217b..0bdf8a95522d 100644
--- a/system/Throttle/Throttler.php
+++ b/system/Throttle/Throttler.php
@@ -139,8 +139,6 @@ public function check(string $key, int $capacity, int $seconds, int $cost = 1):
 
     /**
      * @param string $key The name of the bucket
-     *
-     * @return $this
      */
     public function remove(string $key): self
     {
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
index 1336e9fb87f3..20f558e52be2 100644
--- a/system/Validation/Rules.php
+++ b/system/Validation/Rules.php
@@ -113,7 +113,7 @@ public function is_not_unique(?string $str, string $field, array $data): bool
             $row = $row->where($whereField, $whereValue);
         }
 
-        return (bool) ($row->get()->getRow() !== null);
+        return $row->get()->getRow() !== null;
     }
 
     /**
@@ -158,7 +158,7 @@ public function is_unique(?string $str, string $field, array $data): bool
             $row = $row->where("{$ignoreField} !=", $ignoreValue);
         }
 
-        return (bool) ($row->get()->getRow() === null);
+        return $row->get()->getRow() === null;
     }
 
     /**
diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
index fd35469dd5ec..b63b7362a600 100644
--- a/tests/system/API/ResponseTraitTest.php
+++ b/tests/system/API/ResponseTraitTest.php
@@ -64,8 +64,8 @@ protected function makeController(array $userConfig = [], string $uri = 'http://
         }
 
         if ($this->request === null) {
-            $this->request  = new MockIncomingRequest((object) $config, new URI($uri), null, new UserAgent());
-            $this->response = new MockResponse((object) $config);
+            $this->request  = new MockIncomingRequest($config, new URI($uri), null, new UserAgent());
+            $this->response = new MockResponse($config);
         }
 
         // Insert headers into request.
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index de912e4b5e84..ea5a095631e0 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -345,7 +345,7 @@ public function __construct()
     public function getFileInfoTest()
     {
         $tmpHandle = tmpfile();
-        stream_get_meta_data($tmpHandle)['uri'];
+        stream_get_meta_data($tmpHandle);
 
         return $this->getFileInfo(stream_get_meta_data($tmpHandle)['uri'], [
             'name',
diff --git a/tests/system/Cookie/CookieStoreTest.php b/tests/system/Cookie/CookieStoreTest.php
index a73403fba6e1..2c588fb3391e 100644
--- a/tests/system/Cookie/CookieStoreTest.php
+++ b/tests/system/Cookie/CookieStoreTest.php
@@ -110,7 +110,7 @@ public function testCookieDispatching(): void
         $prod = $cookies['prod']->getOptions();
 
         /**
-         * @var MockObject&CookieStore
+         * @var MockObject&CookieStore $store
          */
         $store = $this->getMockBuilder(CookieStore::class)
             ->setConstructorArgs([$cookies])
diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index 665a7f675fe3..f047f16a7bfd 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -58,8 +58,6 @@ public function testUpdateSetsAllWithoutWhereAndLimit()
             // This DB doesn't support Where and Limit together
             // but we don't want it called a "Risky" test.
             $this->assertTrue(true);
-
-            return;
         }
     }
 
@@ -95,8 +93,6 @@ public function testUpdateWithWhereAndLimit()
             // This DB doesn't support Where and Limit together
             // but we don't want it called a "Risky" test.
             $this->assertTrue(true);
-
-            return;
         }
     }
 
diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php
index 65fd7df6365e..222722b1448d 100644
--- a/tests/system/Events/EventsTest.php
+++ b/tests/system/Events/EventsTest.php
@@ -48,7 +48,7 @@ protected function tearDown(): void
     public function testInitialize()
     {
         /**
-         * @var Modules
+         * @var Modules $config
          */
         $config          = config('Modules');
         $config->aliases = [];
diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index 99d2bf7102bd..72deb09c2c4c 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -241,7 +241,7 @@ public function testGetNextURIUsesCurrentURI()
         $expected = current_url(true);
         $expected = (string) $expected->setQuery('page_foo=3');
 
-        $this->assertSame((string) $expected, $this->pager->getNextPageURI('foo'));
+        $this->assertSame($expected, $this->pager->getNextPageURI('foo'));
     }
 
     public function testGetNextURIReturnsNullOnLastPage()
@@ -270,7 +270,7 @@ public function testGetPreviousURIUsesCurrentURI()
         $expected = current_url(true);
         $expected = (string) $expected->setQuery('page_foo=1');
 
-        $this->assertSame((string) $expected, $this->pager->getPreviousPageURI('foo'));
+        $this->assertSame($expected, $this->pager->getPreviousPageURI('foo'));
     }
 
     public function testGetNextURIReturnsNullOnFirstPage()
@@ -292,7 +292,7 @@ public function testGetNextURIWithQueryStringUsesCurrentURI()
 
         $this->pager->store('foo', $_GET['page_foo'] - 1, 12, 70);
 
-        $this->assertSame((string) $expected, $this->pager->getNextPageURI('foo'));
+        $this->assertSame($expected, $this->pager->getNextPageURI('foo'));
     }
 
     public function testGetPreviousURIWithQueryStringUsesCurrentURI()
@@ -306,7 +306,7 @@ public function testGetPreviousURIWithQueryStringUsesCurrentURI()
 
         $this->pager->store('foo', $_GET['page_foo'] + 1, 12, 70);
 
-        $this->assertSame((string) $expected, $this->pager->getPreviousPageURI('foo'));
+        $this->assertSame($expected, $this->pager->getPreviousPageURI('foo'));
     }
 
     public function testGetOnlyQueries()
@@ -453,7 +453,7 @@ public function testBasedURI()
         $expected = current_url(true);
         $expected = (string) $expected->setQuery('page_foo=1');
 
-        $this->assertSame((string) $expected, $this->pager->getPreviousPageURI('foo'));
+        $this->assertSame($expected, $this->pager->getPreviousPageURI('foo'));
     }
 
     public function testAccessPageMoreThanPageCountGetLastPage()
diff --git a/tests/system/Session/SessionTest.php b/tests/system/Session/SessionTest.php
index b6989b299db0..bb5afaacf515 100644
--- a/tests/system/Session/SessionTest.php
+++ b/tests/system/Session/SessionTest.php
@@ -180,9 +180,9 @@ public function testGetReturnsItemValueisZero()
         $session = $this->getInstance();
         $session->start();
 
-        $session->set('foo', (int) 0);
+        $session->set('foo', 0);
 
-        $this->assertSame((int) 0, $session->get('foo'));
+        $this->assertSame(0, $session->get('foo'));
     }
 
     public function testGetReturnsAllWithNoKeys()

From 377eddb29b5c4220fee970a0c556ea44274f7460 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 17 Aug 2021 19:08:35 +0700
Subject: [PATCH 0127/2325] use single line @var

---
 system/Security/Security.php | 8 ++------
 system/Session/Session.php   | 4 +---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/system/Security/Security.php b/system/Security/Security.php
index 59a24a0cbd0f..aa6cf6edabad 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -125,9 +125,7 @@ class Security implements SecurityInterface
      */
     public function __construct(App $config)
     {
-        /**
-         * @var SecurityConfig $security
-         */
+        /** @var SecurityConfig $security */
         $security = config('Security');
 
         // Store CSRF-related configurations
@@ -136,9 +134,7 @@ public function __construct(App $config)
         $this->regenerate = $security->regenerate ?? $config->CSRFRegenerate ?? $this->regenerate;
         $rawCookieName    = $security->cookieName ?? $config->CSRFCookieName ?? $this->cookieName;
 
-        /**
-         * @var CookieConfig $cookie
-         */
+        /** @var CookieConfig $cookie */
         $cookie = config('Cookie');
 
         $cookiePrefix     = $cookie->prefix ?? $config->cookiePrefix;
diff --git a/system/Session/Session.php b/system/Session/Session.php
index 7850fc534266..27ba502aea36 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -182,9 +182,7 @@ public function __construct(SessionHandlerInterface $driver, App $config)
         $this->cookieSecure   = $config->cookieSecure ?? $this->cookieSecure;
         $this->cookieSameSite = $config->cookieSameSite ?? $this->cookieSameSite;
 
-        /**
-         * @var CookieConfig $cookie
-         */
+        /** @var CookieConfig $cookie */
         $cookie = config('Cookie');
 
         $this->cookie = new Cookie($this->sessionCookieName, '', [

From 5c8d1ae2462cffbae0b604b8f5d71968896e0c22 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Wed, 18 Aug 2021 10:31:32 +0800
Subject: [PATCH 0128/2325] Make Cookie compatible with ArrayAccess

---
 system/Cookie/Cookie.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php
index 3b8e62dd9fb3..150d42069949 100644
--- a/system/Cookie/Cookie.php
+++ b/system/Cookie/Cookie.php
@@ -17,6 +17,7 @@
 use DateTimeInterface;
 use InvalidArgumentException;
 use LogicException;
+use ReturnTypeWillChange;
 
 /**
  * A `Cookie` class represents an immutable HTTP cookie value object.
@@ -562,11 +563,9 @@ public function withRaw(bool $raw = true)
     /**
      * Whether an offset exists.
      *
-     * @param string $offset
-     *
-     * @return bool
+     * @param mixed $offset
      */
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return $offset === 'expire' ? true : property_exists($this, $offset);
     }
@@ -574,12 +573,13 @@ public function offsetExists($offset)
     /**
      * Offset to retrieve.
      *
-     * @param string $offset
+     * @param mixed $offset
      *
      * @throws InvalidArgumentException
      *
      * @return mixed
      */
+    #[ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         if (! $this->offsetExists($offset)) {
@@ -592,12 +592,12 @@ public function offsetGet($offset)
     /**
      * Offset to set.
      *
-     * @param string $offset
-     * @param mixed  $value
+     * @param mixed $offset
+     * @param mixed $value
      *
      * @throws LogicException
      */
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         throw new LogicException(sprintf('Cannot set values of properties of %s as it is immutable.', static::class));
     }
@@ -605,11 +605,11 @@ public function offsetSet($offset, $value)
     /**
      * Offset to unset.
      *
-     * @param string $offset
+     * @param mixed $offset
      *
      * @throws LogicException
      */
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         throw new LogicException(sprintf('Cannot unset values of properties of %s as it is immutable.', static::class));
     }

From d1ed808512a8695dc10f42c96856c8ed328c39cd Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Wed, 18 Aug 2021 10:33:33 +0800
Subject: [PATCH 0129/2325] Replace deprecated FILTER_SANITIZE_STRING

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

diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index b3a3f8e75f56..e975a1ac86b9 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -246,7 +246,7 @@ public function addPlaceholder($placeholder, ?string $pattern = null): RouteColl
      */
     public function setDefaultNamespace(string $value): RouteCollectionInterface
     {
-        $this->defaultNamespace = filter_var($value, FILTER_SANITIZE_STRING);
+        $this->defaultNamespace = esc(strip_tags($value));
         $this->defaultNamespace = rtrim($this->defaultNamespace, '\\') . '\\';
 
         return $this;
@@ -258,7 +258,7 @@ public function setDefaultNamespace(string $value): RouteCollectionInterface
      */
     public function setDefaultController(string $value): RouteCollectionInterface
     {
-        $this->defaultController = filter_var($value, FILTER_SANITIZE_STRING);
+        $this->defaultController = esc(strip_tags($value));
 
         return $this;
     }
@@ -269,7 +269,7 @@ public function setDefaultController(string $value): RouteCollectionInterface
      */
     public function setDefaultMethod(string $value): RouteCollectionInterface
     {
-        $this->defaultMethod = filter_var($value, FILTER_SANITIZE_STRING);
+        $this->defaultMethod = esc(strip_tags($value));
 
         return $this;
     }
@@ -1090,7 +1090,7 @@ protected function create(string $verb, string $from, $to, ?array $options = nul
         $overwrite = false;
         $prefix    = $this->group === null ? '' : $this->group . '/';
 
-        $from = filter_var($prefix . $from, FILTER_SANITIZE_STRING);
+        $from = esc(strip_tags($prefix . $from));
 
         // While we want to add a route within a group of '/',
         // it doesn't work with matching, so remove them...

From eb11804cde7375641f437d63e45f235f3f084583 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 18 Aug 2021 11:04:16 +0800
Subject: [PATCH 0130/2325] Make CookieStore compatible with
 IteratorAggregate::getIterator

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

diff --git a/system/Cookie/CookieStore.php b/system/Cookie/CookieStore.php
index 8ef45c970f59..87dc472d1fe5 100644
--- a/system/Cookie/CookieStore.php
+++ b/system/Cookie/CookieStore.php
@@ -207,7 +207,7 @@ public function count(): int
      *
      * @return Traversable<string, Cookie>
      */
-    public function getIterator()
+    public function getIterator(): Traversable
     {
         return new ArrayIterator($this->cookies);
     }

From a4ff0e9525ef65e74d5fd3499fdaadae518e8e88 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 19 Aug 2021 22:59:20 +0800
Subject: [PATCH 0131/2325] Make the session handlers all compatible with
 SessionHandlerInterface (#5012)

---
 rector.php                                   |   5 +
 system/Session/Handlers/ArrayHandler.php     |  60 ++++----
 system/Session/Handlers/BaseHandler.php      |   6 +-
 system/Session/Handlers/DatabaseHandler.php  | 101 ++++++-------
 system/Session/Handlers/FileHandler.php      | 145 +++++++++----------
 system/Session/Handlers/MemcachedHandler.php |  97 ++++++-------
 system/Session/Handlers/RedisHandler.php     | 108 +++++++-------
 7 files changed, 233 insertions(+), 289 deletions(-)

diff --git a/rector.php b/rector.php
index 7ed60ffb1382..a3db0f19c5ac 100644
--- a/rector.php
+++ b/rector.php
@@ -111,6 +111,11 @@
         RecastingRemovalRector::class => [
             __DIR__ . '/tests/system/Entity/EntityTest.php',
         ],
+
+        // session handlers have the gc() method with underscored parameter `$max_lifetime`
+        UnderscoreToCamelCaseVariableNameRector::class => [
+            __DIR__ . '/system/Session/Handlers',
+        ],
     ]);
 
     // auto import fully qualified class names
diff --git a/system/Session/Handlers/ArrayHandler.php b/system/Session/Handlers/ArrayHandler.php
index f3db062eb7fe..31951a788e65 100644
--- a/system/Session/Handlers/ArrayHandler.php
+++ b/system/Session/Handlers/ArrayHandler.php
@@ -11,7 +11,7 @@
 
 namespace CodeIgniter\Session\Handlers;
 
-use Exception;
+use ReturnTypeWillChange;
 
 /**
  * Session handler using static array for storage.
@@ -22,51 +22,43 @@ class ArrayHandler extends BaseHandler
     protected static $cache = [];
 
     /**
-     * Open
+     * Re-initialize existing session, or creates a new one.
      *
-     * Ensures we have an initialized database connection.
-     *
-     * @param string $savePath Path to session files' directory
-     * @param string $name     Session cookie name
-     *
-     * @throws Exception
+     * @param string $path The path where to store/retrieve the session
+     * @param string $name The session name
      */
-    public function open($savePath, $name): bool
+    public function open($path, $name): bool
     {
         return true;
     }
 
     /**
-     * Read
+     * Reads the session data from the session storage, and returns the results.
      *
-     * Reads session data and acquires a lock
+     * @param string $id The session ID
      *
-     * @param string $sessionID Session ID
-     *
-     * @return string Serialized session data
+     * @return false|string Returns an encoded string of the read data.
+     *                      If nothing was read, it must return false.
      */
-    public function read($sessionID): string
+    #[ReturnTypeWillChange]
+    public function read($id)
     {
         return '';
     }
 
     /**
-     * Write
-     *
-     * Writes (create / update) session data
+     * Writes the session data to the session storage.
      *
-     * @param string $sessionID   Session ID
-     * @param string $sessionData Serialized session data
+     * @param string $id   The session ID
+     * @param string $data The encoded session data
      */
-    public function write($sessionID, $sessionData): bool
+    public function write($id, $data): bool
     {
         return true;
     }
 
     /**
-     * Close
-     *
-     * Releases locks and closes file descriptor.
+     * Closes the current session.
      */
     public function close(): bool
     {
@@ -74,26 +66,26 @@ public function close(): bool
     }
 
     /**
-     * Destroy
-     *
-     * Destroys the current session.
+     * Destroys a session
      *
-     * @param string $sessionID
+     * @param string $id The session ID being destroyed
      */
-    public function destroy($sessionID): bool
+    public function destroy($id): bool
     {
         return true;
     }
 
     /**
-     * Garbage Collector
+     * Cleans up expired sessions.
      *
-     * Deletes expired sessions
+     * @param int $max_lifetime Sessions that have not updated
+     *                          for the last max_lifetime seconds will be removed.
      *
-     * @param int $maxlifetime Maximum lifetime of sessions
+     * @return false|int Returns the number of deleted sessions on success, or false on failure.
      */
-    public function gc($maxlifetime): bool
+    #[ReturnTypeWillChange]
+    public function gc($max_lifetime)
     {
-        return true;
+        return 1;
     }
 }
diff --git a/system/Session/Handlers/BaseHandler.php b/system/Session/Handlers/BaseHandler.php
index e5663abc5f85..984b0fe7c3f6 100644
--- a/system/Session/Handlers/BaseHandler.php
+++ b/system/Session/Handlers/BaseHandler.php
@@ -100,9 +100,6 @@ abstract class BaseHandler implements SessionHandlerInterface
      */
     protected $ipAddress;
 
-    /**
-     * Constructor
-     */
     public function __construct(AppConfig $config, string $ipAddress)
     {
         $this->cookiePrefix = $config->cookiePrefix;
@@ -155,12 +152,11 @@ protected function releaseLock(): bool
     }
 
     /**
-     * Fail
-     *
      * Drivers other than the 'files' one don't (need to) use the
      * session.save_path INI setting, but that leads to confusing
      * error messages emitted by PHP when open() or write() fail,
      * as the message contains session.save_path ...
+     *
      * To work around the problem, the drivers will call this method
      * so that the INI is set just in time for the error message to
      * be properly generated.
diff --git a/system/Session/Handlers/DatabaseHandler.php b/system/Session/Handlers/DatabaseHandler.php
index 01c127e1e125..18da544d2873 100644
--- a/system/Session/Handlers/DatabaseHandler.php
+++ b/system/Session/Handlers/DatabaseHandler.php
@@ -15,7 +15,7 @@
 use CodeIgniter\Session\Exceptions\SessionException;
 use Config\App as AppConfig;
 use Config\Database;
-use Exception;
+use ReturnTypeWillChange;
 
 /**
  * Session handler using current Database for storage
@@ -58,27 +58,24 @@ class DatabaseHandler extends BaseHandler
     protected $rowExists = false;
 
     /**
-     * Constructor
+     * @throws SessionException
      */
     public function __construct(AppConfig $config, string $ipAddress)
     {
         parent::__construct($config, $ipAddress);
-
-        // Determine Table
         $this->table = $config->sessionSavePath;
 
         if (empty($this->table)) {
             throw SessionException::forMissingDatabaseTable();
         }
 
-        // Get DB Connection
         // @phpstan-ignore-next-line
         $this->DBGroup = $config->sessionDBGroup ?? config(Database::class)->defaultGroup;
 
         $this->db = Database::connect($this->DBGroup);
 
-        // Determine Database type
         $driver = strtolower(get_class($this->db));
+
         if (strpos($driver, 'mysql') !== false) {
             $this->platform = 'mysql';
         } elseif (strpos($driver, 'postgre') !== false) {
@@ -87,16 +84,12 @@ public function __construct(AppConfig $config, string $ipAddress)
     }
 
     /**
-     * Open
-     *
-     * Ensures we have an initialized database connection.
-     *
-     * @param string $savePath Path to session files' directory
-     * @param string $name     Session cookie name
+     * Re-initialize existing session, or creates a new one.
      *
-     * @throws Exception
+     * @param string $path The path where to store/retrieve the session
+     * @param string $name The session name
      */
-    public function open($savePath, $name): bool
+    public function open($path, $name): bool
     {
         if (empty($this->db->connID)) {
             $this->db->initialize();
@@ -106,30 +99,29 @@ public function open($savePath, $name): bool
     }
 
     /**
-     * Read
+     * Reads the session data from the session storage, and returns the results.
      *
-     * Reads session data and acquires a lock
+     * @param string $id The session ID
      *
-     * @param string $sessionID Session ID
-     *
-     * @return string Serialized session data
+     * @return false|string Returns an encoded string of the read data.
+     *                      If nothing was read, it must return false.
      */
-    public function read($sessionID): string
+    #[ReturnTypeWillChange]
+    public function read($id)
     {
-        if ($this->lockSession($sessionID) === false) {
+        if ($this->lockSession($id) === false) {
             $this->fingerprint = md5('');
 
             return '';
         }
 
-        // Needed by write() to detect session_regenerate_id() calls
         if (! isset($this->sessionID)) {
-            $this->sessionID = $sessionID;
+            $this->sessionID = $id;
         }
 
         $builder = $this->db->table($this->table)
             ->select($this->platform === 'postgre' ? "encode(data, 'base64') AS data" : 'data')
-            ->where('id', $sessionID);
+            ->where('id', $id);
 
         if ($this->matchIP) {
             $builder = $builder->where('ip_address', $this->ipAddress);
@@ -160,70 +152,63 @@ public function read($sessionID): string
     }
 
     /**
-     * Write
-     *
-     * Writes (create / update) session data
+     * Writes the session data to the session storage.
      *
-     * @param string $sessionID   Session ID
-     * @param string $sessionData Serialized session data
+     * @param string $id   The session ID
+     * @param string $data The encoded session data
      */
-    public function write($sessionID, $sessionData): bool
+    public function write($id, $data): bool
     {
         if ($this->lock === false) {
             return $this->fail();
         }
 
-        // Was the ID regenerated?
-        if ($sessionID !== $this->sessionID) {
+        if ($this->sessionID !== $id) {
             $this->rowExists = false;
-            $this->sessionID = $sessionID;
+            $this->sessionID = $id;
         }
 
         if ($this->rowExists === false) {
             $insertData = [
-                'id'         => $sessionID,
+                'id'         => $id,
                 'ip_address' => $this->ipAddress,
                 'timestamp'  => 'now()',
-                'data'       => $this->platform === 'postgre' ? '\x' . bin2hex($sessionData) : $sessionData,
+                'data'       => $this->platform === 'postgre' ? '\x' . bin2hex($data) : $data,
             ];
 
             if (! $this->db->table($this->table)->insert($insertData)) {
                 return $this->fail();
             }
 
-            $this->fingerprint = md5($sessionData);
+            $this->fingerprint = md5($data);
             $this->rowExists   = true;
 
             return true;
         }
 
-        $builder = $this->db->table($this->table)->where('id', $sessionID);
+        $builder = $this->db->table($this->table)->where('id', $id);
 
         if ($this->matchIP) {
             $builder = $builder->where('ip_address', $this->ipAddress);
         }
 
-        $updateData = [
-            'timestamp' => 'now()',
-        ];
+        $updateData = ['timestamp' => 'now()'];
 
-        if ($this->fingerprint !== md5($sessionData)) {
-            $updateData['data'] = ($this->platform === 'postgre') ? '\x' . bin2hex($sessionData) : $sessionData;
+        if ($this->fingerprint !== md5($data)) {
+            $updateData['data'] = ($this->platform === 'postgre') ? '\x' . bin2hex($data) : $data;
         }
 
         if (! $builder->update($updateData)) {
             return $this->fail();
         }
 
-        $this->fingerprint = md5($sessionData);
+        $this->fingerprint = md5($data);
 
         return true;
     }
 
     /**
-     * Close
-     *
-     * Releases locks and closes file descriptor.
+     * Closes the current session.
      */
     public function close(): bool
     {
@@ -231,16 +216,14 @@ public function close(): bool
     }
 
     /**
-     * Destroy
-     *
-     * Destroys the current session.
+     * Destroys a session
      *
-     * @param string $sessionID
+     * @param string $id The session ID being destroyed
      */
-    public function destroy($sessionID): bool
+    public function destroy($id): bool
     {
         if ($this->lock) {
-            $builder = $this->db->table($this->table)->where('id', $sessionID);
+            $builder = $this->db->table($this->table)->where('id', $id);
 
             if ($this->matchIP) {
                 $builder = $builder->where('ip_address', $this->ipAddress);
@@ -261,18 +244,20 @@ public function destroy($sessionID): bool
     }
 
     /**
-     * Garbage Collector
+     * Cleans up expired sessions.
      *
-     * Deletes expired sessions
+     * @param int $max_lifetime Sessions that have not updated
+     *                          for the last max_lifetime seconds will be removed.
      *
-     * @param int $maxlifetime Maximum lifetime of sessions
+     * @return false|int Returns the number of deleted sessions on success, or false on failure.
      */
-    public function gc($maxlifetime): bool
+    #[ReturnTypeWillChange]
+    public function gc($max_lifetime)
     {
         $separator = $this->platform === 'postgre' ? '\'' : ' ';
-        $interval  = implode($separator, ['', "{$maxlifetime} second", '']);
+        $interval  = implode($separator, ['', "{$max_lifetime} second", '']);
 
-        return $this->db->table($this->table)->delete("timestamp < now() - INTERVAL {$interval}") ? true : $this->fail();
+        return $this->db->table($this->table)->delete("timestamp < now() - INTERVAL {$interval}") ? 1 : $this->fail();
     }
 
     /**
diff --git a/system/Session/Handlers/FileHandler.php b/system/Session/Handlers/FileHandler.php
index 0f5653739dc3..9a6d2de7eb34 100644
--- a/system/Session/Handlers/FileHandler.php
+++ b/system/Session/Handlers/FileHandler.php
@@ -13,7 +13,7 @@
 
 use CodeIgniter\Session\Exceptions\SessionException;
 use Config\App as AppConfig;
-use Exception;
+use ReturnTypeWillChange;
 
 /**
  * Session handler using file system for storage
@@ -62,9 +62,6 @@ class FileHandler extends BaseHandler
      */
     protected $sessionIDRegex = '';
 
-    /**
-     * Constructor
-     */
     public function __construct(AppConfig $config, string $ipAddress)
     {
         parent::__construct($config, $ipAddress);
@@ -88,70 +85,67 @@ public function __construct(AppConfig $config, string $ipAddress)
     }
 
     /**
-     * Open
+     * Re-initialize existing session, or creates a new one.
      *
-     * Sanitizes the save_path directory.
+     * @param string $path The path where to store/retrieve the session
+     * @param string $name The session name
      *
-     * @param string $savePath Path to session files' directory
-     * @param string $name     Session cookie name
-     *
-     * @throws Exception
+     * @throws SessionException
      */
-    public function open($savePath, $name): bool
+    public function open($path, $name): bool
     {
-        if (! is_dir($savePath)) {
-            if (! mkdir($savePath, 0700, true)) {
-                throw SessionException::forInvalidSavePath($this->savePath);
-            }
-        } elseif (! is_writable($savePath)) {
+        if (! is_dir($path) && ! mkdir($path, 0700, true)) {
+            throw SessionException::forInvalidSavePath($this->savePath);
+        }
+
+        if (! is_writable($path)) {
             throw SessionException::forWriteProtectedSavePath($this->savePath);
         }
 
-        $this->savePath = $savePath;
-        $this->filePath = $this->savePath . '/'
-                          . $name // we'll use the session cookie name as a prefix to avoid collisions
-                          . ($this->matchIP ? md5($this->ipAddress) : '');
+        $this->savePath = $path;
+
+        // we'll use the session name as prefix to avoid collisions
+        $this->filePath = $this->savePath . '/' . $name . ($this->matchIP ? md5($this->ipAddress) : '');
 
         return true;
     }
 
     /**
-     * Read
+     * Reads the session data from the session storage, and returns the results.
      *
-     * Reads session data and acquires a lock
+     * @param string $id The session ID
      *
-     * @param string $sessionID Session ID
-     *
-     * @return bool|string Serialized session data
+     * @return false|string Returns an encoded string of the read data.
+     *                      If nothing was read, it must return false.
      */
-    public function read($sessionID)
+    #[ReturnTypeWillChange]
+    public function read($id)
     {
         // This might seem weird, but PHP 5.6 introduced session_reset(),
         // which re-reads session data
         if ($this->fileHandle === null) {
-            $this->fileNew = ! is_file($this->filePath . $sessionID);
+            $this->fileNew = ! is_file($this->filePath . $id);
 
-            if (($this->fileHandle = fopen($this->filePath . $sessionID, 'c+b')) === false) {
-                $this->logger->error("Session: Unable to open file '" . $this->filePath . $sessionID . "'.");
+            if (($this->fileHandle = fopen($this->filePath . $id, 'c+b')) === false) {
+                $this->logger->error("Session: Unable to open file '" . $this->filePath . $id . "'.");
 
                 return false;
             }
 
             if (flock($this->fileHandle, LOCK_EX) === false) {
-                $this->logger->error("Session: Unable to obtain lock for file '" . $this->filePath . $sessionID . "'.");
+                $this->logger->error("Session: Unable to obtain lock for file '" . $this->filePath . $id . "'.");
                 fclose($this->fileHandle);
                 $this->fileHandle = null;
 
                 return false;
             }
 
-            // Needed by write() to detect session_regenerate_id() calls
             if (! isset($this->sessionID)) {
-                $this->sessionID = $sessionID;
+                $this->sessionID = $id;
             }
 
             if ($this->fileNew) {
-                chmod($this->filePath . $sessionID, 0600);
+                chmod($this->filePath . $id, 0600);
                 $this->fingerprint = md5('');
 
                 return '';
@@ -160,43 +154,42 @@ public function read($sessionID)
             rewind($this->fileHandle);
         }
 
-        $sessionData = '';
-        clearstatcache();    // Address https://github.com/codeigniter4/CodeIgniter4/issues/2056
+        $data   = '';
+        $buffer = 0;
+        clearstatcache(); // Address https://github.com/codeigniter4/CodeIgniter4/issues/2056
 
-        for ($read = 0, $length = filesize($this->filePath . $sessionID); $read < $length; $read += strlen($buffer)) {
+        for ($read = 0, $length = filesize($this->filePath . $id); $read < $length; $read += strlen($buffer)) {
             if (($buffer = fread($this->fileHandle, $length - $read)) === false) {
                 break;
             }
 
-            $sessionData .= $buffer;
+            $data .= $buffer;
         }
 
-        $this->fingerprint = md5($sessionData);
+        $this->fingerprint = md5($data);
 
-        return $sessionData;
+        return $data;
     }
 
     /**
-     * Write
-     *
-     * Writes (create / update) session data
+     * Writes the session data to the session storage.
      *
-     * @param string $sessionID   Session ID
-     * @param string $sessionData Serialized session data
+     * @param string $id   The session ID
+     * @param string $data The encoded session data
      */
-    public function write($sessionID, $sessionData): bool
+    public function write($id, $data): bool
     {
         // If the two IDs don't match, we have a session_regenerate_id() call
-        if ($sessionID !== $this->sessionID) {
-            $this->sessionID = $sessionID;
+        if ($id !== $this->sessionID) {
+            $this->sessionID = $id;
         }
 
         if (! is_resource($this->fileHandle)) {
             return false;
         }
 
-        if ($this->fingerprint === md5($sessionData)) {
-            return ($this->fileNew) ? true : touch($this->filePath . $sessionID);
+        if ($this->fingerprint === md5($data)) {
+            return ($this->fileNew) ? true : touch($this->filePath . $id);
         }
 
         if (! $this->fileNew) {
@@ -204,32 +197,30 @@ public function write($sessionID, $sessionData): bool
             rewind($this->fileHandle);
         }
 
-        if (($length = strlen($sessionData)) > 0) {
+        if (($length = strlen($data)) > 0) {
             $result = null;
 
             for ($written = 0; $written < $length; $written += $result) {
-                if (($result = fwrite($this->fileHandle, substr($sessionData, $written))) === false) {
+                if (($result = fwrite($this->fileHandle, substr($data, $written))) === false) {
                     break;
                 }
             }
 
             if (! is_int($result)) {
-                $this->fingerprint = md5(substr($sessionData, 0, $written));
+                $this->fingerprint = md5(substr($data, 0, $written));
                 $this->logger->error('Session: Unable to write data.');
 
                 return false;
             }
         }
 
-        $this->fingerprint = md5($sessionData);
+        $this->fingerprint = md5($data);
 
         return true;
     }
 
     /**
-     * Close
-     *
-     * Releases locks and closes file descriptor.
+     * Closes the current session.
      */
     public function close(): bool
     {
@@ -239,45 +230,45 @@ public function close(): bool
 
             $this->fileHandle = null;
             $this->fileNew    = false;
-
-            return true;
         }
 
         return true;
     }
 
     /**
-     * Destroy
+     * Destroys a session
      *
-     * Destroys the current session.
-     *
-     * @param string $sessionId Session ID
+     * @param string $id The session ID being destroyed
      */
-    public function destroy($sessionId): bool
+    public function destroy($id): bool
     {
         if ($this->close()) {
-            return is_file($this->filePath . $sessionId)
-                ? (unlink($this->filePath . $sessionId) && $this->destroyCookie()) : true;
+            return is_file($this->filePath . $id)
+                ? (unlink($this->filePath . $id) && $this->destroyCookie())
+                : true;
         }
 
         if ($this->filePath !== null) {
             clearstatcache();
 
-            return is_file($this->filePath . $sessionId)
-                ? (unlink($this->filePath . $sessionId) && $this->destroyCookie()) : true;
+            return is_file($this->filePath . $id)
+                ? (unlink($this->filePath . $id) && $this->destroyCookie())
+                : true;
         }
 
         return false;
     }
 
     /**
-     * Garbage Collector
+     * Cleans up expired sessions.
      *
-     * Deletes expired sessions
+     * @param int $max_lifetime Sessions that have not updated
+     *                          for the last max_lifetime seconds will be removed.
      *
-     * @param int $maxlifetime Maximum lifetime of sessions
+     * @return false|int Returns the number of deleted sessions on success, or false on failure.
      */
-    public function gc($maxlifetime): bool
+    #[ReturnTypeWillChange]
+    public function gc($max_lifetime)
     {
         if (! is_dir($this->savePath) || ($directory = opendir($this->savePath)) === false) {
             $this->logger->debug("Session: Garbage collector couldn't list files under directory '" . $this->savePath . "'.");
@@ -285,17 +276,17 @@ public function gc($maxlifetime): bool
             return false;
         }
 
-        $ts = time() - $maxlifetime;
+        $ts = time() - $max_lifetime;
 
-        $pattern = $this->matchIP === true
-            ? '[0-9a-f]{32}'
-            : '';
+        $pattern = $this->matchIP === true ? '[0-9a-f]{32}' : '';
 
         $pattern = sprintf(
             '#\A%s' . $pattern . $this->sessionIDRegex . '\z#',
             preg_quote($this->cookieName, '#')
         );
 
+        $collected = 0;
+
         while (($file = readdir($directory)) !== false) {
             // If the filename doesn't match this pattern, it's either not a session file or is not ours
             if (! preg_match($pattern, $file)
@@ -307,11 +298,12 @@ public function gc($maxlifetime): bool
             }
 
             unlink($this->savePath . DIRECTORY_SEPARATOR . $file);
+            $collected++;
         }
 
         closedir($directory);
 
-        return true;
+        return $collected;
     }
 
     /**
@@ -328,7 +320,6 @@ protected function configureSessionIDRegex()
             ini_set('session.sid_length', (string) $SIDLength);
         }
 
-        // Yes, 4,5,6 are the only known possible values as of 2016-10-27
         switch ($bitsPerCharacter) {
             case 4:
                 $this->sessionIDRegex = '[0-9a-f]';
diff --git a/system/Session/Handlers/MemcachedHandler.php b/system/Session/Handlers/MemcachedHandler.php
index dab3e61d4b06..5e963bf5048a 100644
--- a/system/Session/Handlers/MemcachedHandler.php
+++ b/system/Session/Handlers/MemcachedHandler.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Session\Exceptions\SessionException;
 use Config\App as AppConfig;
 use Memcached;
+use ReturnTypeWillChange;
 
 /**
  * Session handler using Memcache for persistence
@@ -49,8 +50,6 @@ class MemcachedHandler extends BaseHandler
     protected $sessionExpiration = 7200;
 
     /**
-     * Constructor
-     *
      * @throws SessionException
      */
     public function __construct(AppConfig $config, string $ipAddress)
@@ -73,14 +72,12 @@ public function __construct(AppConfig $config, string $ipAddress)
     }
 
     /**
-     * Open
-     *
-     * Sanitizes save_path and initializes connections.
+     * Re-initialize existing session, or creates a new one.
      *
-     * @param string $savePath Server path(s)
-     * @param string $name     Session cookie name, unused
+     * @param string $path The path where to store/retrieve the session
+     * @param string $name The session name
      */
-    public function open($savePath, $name): bool
+    public function open($path, $name): bool
     {
         $this->memcached = new Memcached();
         $this->memcached->setOption(Memcached::OPT_BINARY_PROTOCOL, true); // required for touch() usage
@@ -91,8 +88,7 @@ public function open($savePath, $name): bool
             $serverList[] = $server['host'] . ':' . $server['port'];
         }
 
-        if (! preg_match_all('#,?([^,:]+)\:(\d{1,5})(?:\:(\d+))?#', $this->savePath, $matches, PREG_SET_ORDER)
-        ) {
+        if (! preg_match_all('#,?([^,:]+)\:(\d{1,5})(?:\:(\d+))?#', $this->savePath, $matches, PREG_SET_ORDER)) {
             $this->memcached = null;
             $this->logger->error('Session: Invalid Memcached save path format: ' . $this->savePath);
 
@@ -124,60 +120,57 @@ public function open($savePath, $name): bool
     }
 
     /**
-     * Read
-     *
-     * Reads session data and acquires a lock
+     * Reads the session data from the session storage, and returns the results.
      *
-     * @param string $sessionID Session ID
+     * @param string $id The session ID
      *
-     * @return string Serialized session data
+     * @return false|string Returns an encoded string of the read data.
+     *                      If nothing was read, it must return false.
      */
-    public function read($sessionID): string
+    #[ReturnTypeWillChange]
+    public function read($id)
     {
-        if (isset($this->memcached) && $this->lockSession($sessionID)) {
-            // Needed by write() to detect session_regenerate_id() calls
+        if (isset($this->memcached) && $this->lockSession($id)) {
             if (! isset($this->sessionID)) {
-                $this->sessionID = $sessionID;
+                $this->sessionID = $id;
             }
 
-            $sessionData       = (string) $this->memcached->get($this->keyPrefix . $sessionID);
-            $this->fingerprint = md5($sessionData);
+            $data = (string) $this->memcached->get($this->keyPrefix . $id);
+
+            $this->fingerprint = md5($data);
 
-            return $sessionData;
+            return $data;
         }
 
         return '';
     }
 
     /**
-     * Write
-     *
-     * Writes (create / update) session data
+     * Writes the session data to the session storage.
      *
-     * @param string $sessionID   Session ID
-     * @param string $sessionData Serialized session data
+     * @param string $id   The session ID
+     * @param string $data The encoded session data
      */
-    public function write($sessionID, $sessionData): bool
+    public function write($id, $data): bool
     {
         if (! isset($this->memcached)) {
             return false;
         }
 
-        // Was the ID regenerated?
-        if ($sessionID !== $this->sessionID) {
-            if (! $this->releaseLock() || ! $this->lockSession($sessionID)) {
+        if ($this->sessionID !== $id) {
+            if (! $this->releaseLock() || ! $this->lockSession($id)) {
                 return false;
             }
 
             $this->fingerprint = md5('');
-            $this->sessionID   = $sessionID;
+            $this->sessionID   = $id;
         }
 
         if (isset($this->lockKey)) {
             $this->memcached->replace($this->lockKey, time(), 300);
 
-            if ($this->fingerprint !== ($fingerprint = md5($sessionData))) {
-                if ($this->memcached->set($this->keyPrefix . $sessionID, $sessionData, $this->sessionExpiration)) {
+            if ($this->fingerprint !== ($fingerprint = md5($data))) {
+                if ($this->memcached->set($this->keyPrefix . $id, $data, $this->sessionExpiration)) {
                     $this->fingerprint = $fingerprint;
 
                     return true;
@@ -186,16 +179,14 @@ public function write($sessionID, $sessionData): bool
                 return false;
             }
 
-            return $this->memcached->touch($this->keyPrefix . $sessionID, $this->sessionExpiration);
+            return $this->memcached->touch($this->keyPrefix . $id, $this->sessionExpiration);
         }
 
         return false;
     }
 
     /**
-     * Close
-     *
-     * Releases locks and closes connection.
+     * Closes the current session.
      */
     public function close(): bool
     {
@@ -217,16 +208,14 @@ public function close(): bool
     }
 
     /**
-     * Destroy
-     *
-     * Destroys the current session.
+     * Destroys a session
      *
-     * @param string $sessionId Session ID
+     * @param string $id The session ID being destroyed
      */
-    public function destroy($sessionId): bool
+    public function destroy($id): bool
     {
         if (isset($this->memcached, $this->lockKey)) {
-            $this->memcached->delete($this->keyPrefix . $sessionId);
+            $this->memcached->delete($this->keyPrefix . $id);
 
             return $this->destroyCookie();
         }
@@ -235,22 +224,21 @@ public function destroy($sessionId): bool
     }
 
     /**
-     * Garbage Collector
+     * Cleans up expired sessions.
      *
-     * Deletes expired sessions
+     * @param int $max_lifetime Sessions that have not updated
+     *                          for the last max_lifetime seconds will be removed.
      *
-     * @param int $maxlifetime Maximum lifetime of sessions
+     * @return false|int Returns the number of deleted sessions on success, or false on failure.
      */
-    public function gc($maxlifetime): bool
+    #[ReturnTypeWillChange]
+    public function gc($max_lifetime)
     {
-        // Not necessary, Memcached takes care of that.
-        return true;
+        return 1;
     }
 
     /**
-     * Get lock
-     *
-     * Acquires an (emulated) lock.
+     * Acquires an emulated lock.
      *
      * @param string $sessionID Session ID
      */
@@ -260,7 +248,6 @@ protected function lockSession(string $sessionID): bool
             return $this->memcached->replace($this->lockKey, time(), 300);
         }
 
-        // 30 attempts to obtain a lock, in case another request already has it
         $lockKey = $this->keyPrefix . $sessionID . ':lock';
         $attempt = 0;
 
@@ -293,8 +280,6 @@ protected function lockSession(string $sessionID): bool
     }
 
     /**
-     * Release lock
-     *
      * Releases a previously acquired lock
      */
     protected function releaseLock(): bool
diff --git a/system/Session/Handlers/RedisHandler.php b/system/Session/Handlers/RedisHandler.php
index c066813b7969..8ed7b8c052b8 100644
--- a/system/Session/Handlers/RedisHandler.php
+++ b/system/Session/Handlers/RedisHandler.php
@@ -13,9 +13,9 @@
 
 use CodeIgniter\Session\Exceptions\SessionException;
 use Config\App as AppConfig;
-use Exception;
 use Redis;
 use RedisException;
+use ReturnTypeWillChange;
 
 /**
  * Session handler using Redis for persistence
@@ -58,9 +58,7 @@ class RedisHandler extends BaseHandler
     protected $sessionExpiration = 7200;
 
     /**
-     * Constructor
-     *
-     * @throws Exception
+     * @throws SessionException
      */
     public function __construct(AppConfig $config, string $ipAddress)
     {
@@ -72,8 +70,8 @@ public function __construct(AppConfig $config, string $ipAddress)
 
         if (preg_match('#(?:tcp://)?([^:?]+)(?:\:(\d+))?(\?.+)?#', $this->savePath, $matches)) {
             if (! isset($matches[3])) {
-                $matches[3] = '';
-            } // Just to avoid undefined index notices below
+                $matches[3] = ''; // Just to avoid undefined index notices below
+            }
 
             $this->savePath = [
                 'host'     => $matches[1],
@@ -98,14 +96,12 @@ public function __construct(AppConfig $config, string $ipAddress)
     }
 
     /**
-     * Open
+     * Re-initialize existing session, or creates a new one.
      *
-     * Sanitizes save_path and initializes connection.
-     *
-     * @param string $savePath Server path
-     * @param string $name     Session cookie name, unused
+     * @param string $path The path where to store/retrieve the session
+     * @param string $name The session name
      */
-    public function open($savePath, $name): bool
+    public function open($path, $name): bool
     {
         if (empty($this->savePath)) {
             return false;
@@ -129,62 +125,63 @@ public function open($savePath, $name): bool
     }
 
     /**
-     * Read
+     * Reads the session data from the session storage, and returns the results.
      *
-     * Reads session data and acquires a lock
+     * @param string $id The session ID
      *
-     * @param string $sessionID Session ID
-     *
-     * @return string Serialized session data
+     * @return false|string Returns an encoded string of the read data.
+     *                      If nothing was read, it must return false.
      */
-    public function read($sessionID): string
+    #[ReturnTypeWillChange]
+    public function read($id)
     {
-        if (isset($this->redis) && $this->lockSession($sessionID)) {
-            // Needed by write() to detect session_regenerate_id() calls
+        if (isset($this->redis) && $this->lockSession($id)) {
             if (! isset($this->sessionID)) {
-                $this->sessionID = $sessionID;
+                $this->sessionID = ${$id};
             }
 
-            $sessionData                               = $this->redis->get($this->keyPrefix . $sessionID);
-            is_string($sessionData) ? $this->keyExists = true : $sessionData = '';
+            $data = $this->redis->get($this->keyPrefix . $id);
+
+            if (is_string($data)) {
+                $this->keyExists = true;
+            } else {
+                $data = '';
+            }
 
-            $this->fingerprint = md5($sessionData);
+            $this->fingerprint = md5($data);
 
-            return $sessionData;
+            return $data;
         }
 
         return '';
     }
 
     /**
-     * Write
+     * Writes the session data to the session storage.
      *
-     * Writes (create / update) session data
-     *
-     * @param string $sessionID   Session ID
-     * @param string $sessionData Serialized session data
+     * @param string $id   The session ID
+     * @param string $data The encoded session data
      */
-    public function write($sessionID, $sessionData): bool
+    public function write($id, $data): bool
     {
         if (! isset($this->redis)) {
             return false;
         }
 
-        // Was the ID regenerated?
-        if ($sessionID !== $this->sessionID) {
-            if (! $this->releaseLock() || ! $this->lockSession($sessionID)) {
+        if ($this->sessionID !== $id) {
+            if (! $this->releaseLock() || ! $this->lockSession($id)) {
                 return false;
             }
 
             $this->keyExists = false;
-            $this->sessionID = $sessionID;
+            $this->sessionID = $id;
         }
 
         if (isset($this->lockKey)) {
             $this->redis->expire($this->lockKey, 300);
 
-            if ($this->fingerprint !== ($fingerprint = md5($sessionData)) || $this->keyExists === false) {
-                if ($this->redis->set($this->keyPrefix . $sessionID, $sessionData, $this->sessionExpiration)) {
+            if ($this->fingerprint !== ($fingerprint = md5($data)) || $this->keyExists === false) {
+                if ($this->redis->set($this->keyPrefix . $id, $data, $this->sessionExpiration)) {
                     $this->fingerprint = $fingerprint;
                     $this->keyExists   = true;
 
@@ -194,22 +191,21 @@ public function write($sessionID, $sessionData): bool
                 return false;
             }
 
-            return $this->redis->expire($this->keyPrefix . $sessionID, $this->sessionExpiration);
+            return $this->redis->expire($this->keyPrefix . $id, $this->sessionExpiration);
         }
 
         return false;
     }
 
     /**
-     * Close
-     *
-     * Releases locks and closes connection.
+     * Closes the current session.
      */
     public function close(): bool
     {
         if (isset($this->redis)) {
             try {
                 $pingReply = $this->redis->ping();
+
                 // @phpstan-ignore-next-line
                 if (($pingReply === true) || ($pingReply === '+PONG')) {
                     if (isset($this->lockKey)) {
@@ -233,16 +229,14 @@ public function close(): bool
     }
 
     /**
-     * Destroy
-     *
-     * Destroys the current session.
+     * Destroys a session
      *
-     * @param string $sessionID
+     * @param string $id The session ID being destroyed
      */
-    public function destroy($sessionID): bool
+    public function destroy($id): bool
     {
         if (isset($this->redis, $this->lockKey)) {
-            if (($result = $this->redis->del($this->keyPrefix . $sessionID)) !== 1) {
+            if (($result = $this->redis->del($this->keyPrefix . $id)) !== 1) {
                 $this->logger->debug('Session: Redis::del() expected to return 1, got ' . var_export($result, true) . ' instead.');
             }
 
@@ -253,22 +247,21 @@ public function destroy($sessionID): bool
     }
 
     /**
-     * Garbage Collector
+     * Cleans up expired sessions.
      *
-     * Deletes expired sessions
+     * @param int $max_lifetime Sessions that have not updated
+     *                          for the last max_lifetime seconds will be removed.
      *
-     * @param int $maxlifetime Maximum lifetime of sessions
+     * @return false|int Returns the number of deleted sessions on success, or false on failure.
      */
-    public function gc($maxlifetime): bool
+    #[ReturnTypeWillChange]
+    public function gc($max_lifetime)
     {
-        // Not necessary, Redis takes care of that.
-        return true;
+        return 1;
     }
 
     /**
-     * Get lock
-     *
-     * Acquires an (emulated) lock.
+     * Acquires an emulated lock.
      *
      * @param string $sessionID Session ID
      */
@@ -281,7 +274,6 @@ protected function lockSession(string $sessionID): bool
             return $this->redis->expire($this->lockKey, 300);
         }
 
-        // 30 attempts to obtain a lock, in case another request already has it
         $lockKey = $this->keyPrefix . $sessionID . ':lock';
         $attempt = 0;
 
@@ -318,8 +310,6 @@ protected function lockSession(string $sessionID): bool
     }
 
     /**
-     * Release lock
-     *
      * Releases a previously acquired lock
      */
     protected function releaseLock(): bool

From 9b4fbce55ee7d5bd7a517816d683cf6dd1192f54 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Fri, 20 Aug 2021 20:58:31 +0800
Subject: [PATCH 0132/2325] Make CITestStreamFilter compatible with
 php_user_filter (#5014)

---
 system/Test/Filters/CITestStreamFilter.php | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/system/Test/Filters/CITestStreamFilter.php b/system/Test/Filters/CITestStreamFilter.php
index 39ab2f7ca444..46e895ab19b8 100644
--- a/system/Test/Filters/CITestStreamFilter.php
+++ b/system/Test/Filters/CITestStreamFilter.php
@@ -14,7 +14,6 @@
 use php_user_filter;
 
 /**
- * Class to extract an output snapshot.
  * Used to capture output during unit testing, so that it can
  * be used in assertions.
  */
@@ -28,16 +27,15 @@ class CITestStreamFilter extends php_user_filter
     public static $buffer = '';
 
     /**
-     * Output filtering - catch it all.
+     * This method is called whenever data is read from or written to the
+     * attached stream (such as with fread() or fwrite()).
      *
      * @param resource $in
      * @param resource $out
      * @param int      $consumed
      * @param bool     $closing
-     *
-     * @return int
      */
-    public function filter($in, $out, &$consumed, $closing)
+    public function filter($in, $out, &$consumed, $closing): int
     {
         while ($bucket = stream_bucket_make_writeable($in)) {
             static::$buffer .= $bucket->data;
@@ -45,11 +43,8 @@ public function filter($in, $out, &$consumed, $closing)
             $consumed += $bucket->datalen;
         }
 
-        // @phpstan-ignore-next-line
         return PSFS_PASS_ON;
     }
 }
 
-// @codeCoverageIgnoreStart
-stream_filter_register('CITestStreamFilter', 'CodeIgniter\Test\Filters\CITestStreamFilter');
-// @codeCoverageIgnoreEnd
+stream_filter_register('CITestStreamFilter', CITestStreamFilter::class); // @codeCoverageIgnore

From d8b43eb25fc09f7c2da595703b8216cb19b5ee16 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Aug 2021 23:54:58 +0000
Subject: [PATCH 0133/2325] Update rector/rector requirement from 0.11.48 to
 0.11.49 (#5018)

---
 composer.json                     |  2 +-
 rector.php                        | 22 ++++++---------------
 system/Common.php                 | 32 ++++++++++++++-----------------
 system/Test/DatabaseTestTrait.php | 10 ++++------
 system/Test/FeatureTestCase.php   |  6 ++----
 5 files changed, 27 insertions(+), 45 deletions(-)

diff --git a/composer.json b/composer.json
index 26fd890bf6bc..2287474c27de 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "phpstan/phpstan": "^0.12.91",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.48",
+        "rector/rector": "0.11.49",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {
diff --git a/rector.php b/rector.php
index a3db0f19c5ac..cbce74ea213d 100644
--- a/rector.php
+++ b/rector.php
@@ -30,11 +30,9 @@
 use Rector\DeadCode\Rector\Cast\RecastingRemovalRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector;
-use Rector\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector;
-use Rector\DeadCode\Rector\Expression\RemoveDeadStmtRector;
+use Rector\DeadCode\Rector\If_\RemoveUnusedNonEmptyArrayBeforeForeachRector;
 use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector;
 use Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector;
-use Rector\DeadCode\Rector\StaticCall\RemoveParentCallWithoutParentRector;
 use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector;
 use Rector\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector;
 use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
@@ -78,9 +76,6 @@
         // requires php 8
         RemoveUnusedPromotedPropertyRector::class,
 
-        // currently buggy on call inside assign, wait for next release
-        RemoveParentCallWithoutParentRector::class,
-
         // private method called via getPrivateMethodInvoker
         RemoveUnusedPrivateMethodRector::class => [
             __DIR__ . '/system/Entity/Entity.php',
@@ -92,21 +87,11 @@
             __DIR__ . '/tests',
         ],
 
-        // currently buggy on class implements ArrayAccess, wait for next release
-        RemoveDeadStmtRector::class => [
-            __DIR__ . '/tests/system/Cookie/CookieTest.php',
-        ],
-
         // check on constant compare
         UnwrapFutureCompatibleIfPhpVersionRector::class => [
             __DIR__ . '/system/CodeIgniter.php',
         ],
 
-        // check context ResponseTrait
-        RemoveUselessReturnTagRector::class => [
-            __DIR__ . '/system/HTTP/MessageTrait.php',
-        ],
-
         // casted to Entity via EntityTest->getCastEntity()
         RecastingRemovalRector::class => [
             __DIR__ . '/tests/system/Entity/EntityTest.php',
@@ -116,6 +101,11 @@
         UnderscoreToCamelCaseVariableNameRector::class => [
             __DIR__ . '/system/Session/Handlers',
         ],
+
+        // check on $_SESSION
+        RemoveUnusedNonEmptyArrayBeforeForeachRector::class => [
+            __DIR__ . '/system/Debug/Toolbar.php',
+        ],
     ]);
 
     // auto import fully qualified class names
diff --git a/system/Common.php b/system/Common.php
index 129a3374738e..19be6398a8e1 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -471,9 +471,9 @@ function force_https(int $duration = 31536000, ?RequestInterface $request = null
         $baseURL = config(App::class)->baseURL;
 
         if (strpos($baseURL, 'https://') === 0) {
-            $baseURL = (string) substr($baseURL, strlen('https://'));
+            $baseURL = substr($baseURL, strlen('https://'));
         } elseif (strpos($baseURL, 'http://') === 0) {
-            $baseURL = (string) substr($baseURL, strlen('http://'));
+            $baseURL = substr($baseURL, strlen('http://'));
         }
 
         $uri = URI::createURIString(
@@ -601,18 +601,16 @@ function helper($filenames)
             else {
                 $paths = $loader->search('Helpers/' . $filename);
 
-                if (! empty($paths)) {
-                    foreach ($paths as $path) {
-                        if (strpos($path, APPPATH) === 0) {
-                            // @codeCoverageIgnoreStart
-                            $appHelper = $path;
-                        // @codeCoverageIgnoreEnd
-                        } elseif (strpos($path, SYSTEMPATH) === 0) {
-                            $systemHelper = $path;
-                        } else {
-                            $localIncludes[] = $path;
-                            $loaded[]        = $filename;
-                        }
+                foreach ($paths as $path) {
+                    if (strpos($path, APPPATH) === 0) {
+                        // @codeCoverageIgnoreStart
+                        $appHelper = $path;
+                    // @codeCoverageIgnoreEnd
+                    } elseif (strpos($path, SYSTEMPATH) === 0) {
+                        $systemHelper = $path;
+                    } else {
+                        $localIncludes[] = $path;
+                        $loaded[]        = $filename;
                     }
                 }
 
@@ -636,10 +634,8 @@ function helper($filenames)
         }
 
         // Now actually include all of the files
-        if (! empty($includes)) {
-            foreach ($includes as $path) {
-                include_once $path;
-            }
+        foreach ($includes as $path) {
+            include_once $path;
         }
     }
 }
diff --git a/system/Test/DatabaseTestTrait.php b/system/Test/DatabaseTestTrait.php
index 4ad164cd272d..d15a5fb44480 100644
--- a/system/Test/DatabaseTestTrait.php
+++ b/system/Test/DatabaseTestTrait.php
@@ -225,12 +225,10 @@ public static function resetMigrationSeedCount()
      */
     protected function clearInsertCache()
     {
-        if (! empty($this->insertCache)) {
-            foreach ($this->insertCache as $row) {
-                $this->db->table($row[0])
-                    ->where($row[1])
-                    ->delete();
-            }
+        foreach ($this->insertCache as $row) {
+            $this->db->table($row[0])
+                ->where($row[1])
+                ->delete();
         }
     }
 
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index 1f188075e5cd..87423271cd63 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -326,10 +326,8 @@ protected function setupRequest(string $method, ?string $path = null): IncomingR
      */
     protected function setupHeaders(IncomingRequest $request)
     {
-        if (! empty($this->headers)) {
-            foreach ($this->headers as $name => $value) {
-                $request->setHeader($name, $value);
-            }
+        foreach ($this->headers as $name => $value) {
+            $request->setHeader($name, $value);
         }
 
         return $request;

From 4d0110fc151350bccc52438b04cc3c5bcc455ff9 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 26 Aug 2021 09:29:47 +0800
Subject: [PATCH 0134/2325] Make Time compatible with DateTime (#5022)

---
 system/I18n/Time.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index 27d6ccc3ad5c..919a5a391534 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -21,10 +21,9 @@
 use IntlCalendar;
 use IntlDateFormatter;
 use Locale;
+use ReturnTypeWillChange;
 
 /**
- * Class Time
- *
  * A localized date/time package inspired
  * by Nesbot/Carbon and CakePHP/Chronos.
  *
@@ -232,19 +231,20 @@ public static function create(?int $year = null, ?int $month = null, ?int $day =
      *
      * @param string                   $format
      * @param string                   $datetime
-     * @param DateTimeZone|string|null $timeZone
+     * @param DateTimeZone|string|null $timezone
      *
      * @throws Exception
      *
      * @return Time
      */
-    public static function createFromFormat($format, $datetime, $timeZone = null)
+    #[ReturnTypeWillChange]
+    public static function createFromFormat($format, $datetime, $timezone = null)
     {
         if (! $date = parent::createFromFormat($format, $datetime)) {
             throw I18nException::forInvalidFormat($format);
         }
 
-        return new self($date->format('Y-m-d H:i:s'), $timeZone);
+        return new self($date->format('Y-m-d H:i:s'), $timezone);
     }
 
     /**
@@ -679,6 +679,7 @@ protected function setValue(string $name, $value)
      *
      * @return Time
      */
+    #[ReturnTypeWillChange]
     public function setTimezone($timezone)
     {
         $timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
@@ -695,6 +696,7 @@ public function setTimezone($timezone)
      *
      * @return Time
      */
+    #[ReturnTypeWillChange]
     public function setTimestamp($timestamp)
     {
         $time = date('Y-m-d H:i:s', $timestamp);
@@ -1181,7 +1183,7 @@ public function __isset($name): bool
     /**
      * This is called when we unserialize the Time object.
      */
-    public function __wakeup()
+    public function __wakeup(): void
     {
         /**
          * Prior to unserialization, this is a string.

From dae39bf75f9b087355baeeca6341ecd656e2a791 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Thu, 26 Aug 2021 15:49:20 +0000
Subject: [PATCH 0135/2325] Apply PHP Copy/Paste Detector

---
 .github/workflows/test-phpcpd.yml  |  43 +++++++++++
 system/Database/SQLSRV/Builder.php | 120 +----------------------------
 2 files changed, 44 insertions(+), 119 deletions(-)
 create mode 100644 .github/workflows/test-phpcpd.yml

diff --git a/.github/workflows/test-phpcpd.yml b/.github/workflows/test-phpcpd.yml
new file mode 100644
index 000000000000..fcc66f7d682c
--- /dev/null
+++ b/.github/workflows/test-phpcpd.yml
@@ -0,0 +1,43 @@
+# When a PR is opened or a push is made, check code
+# for duplication with PHP Copy/Paste Detector.
+name: PHPCPD
+
+on:
+  pull_request:
+    branches:
+      - 'develop'
+      - '4.*'
+    paths:
+      - 'app/**'
+      - 'public/**'
+      - 'system/**'
+      - '.github/workflows/test-phpcpd.yml'
+  push:
+    branches:
+      - 'develop'
+      - '4.*'
+    paths:
+      - 'app/**'
+      - 'public/**'
+      - 'system/**'
+      - '.github/workflows/test-phpcpd.yml'
+
+jobs:
+  build:
+    name: Duplicate Code Detection
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.0'
+          tools: phive
+          extensions: intl, json, mbstring, xml
+
+      - name: Detect code duplication
+        run: |
+            sudo phive --no-progress install --global --trust-gpg-keys 4AA394086372C20A phpcpd 
+            phpcpd --exclude system/Test --exclude system/ThirdParty --exclude system/Database/SQLSRV/Builder.php app/ public/ system/
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index 049f47a33fea..aaed5680dfc0 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -11,7 +11,6 @@
 
 namespace CodeIgniter\Database\SQLSRV;
 
-use Closure;
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\Exceptions\DataException;
@@ -93,57 +92,7 @@ protected function _truncate(string $table): string
      */
     public function join(string $table, string $cond, string $type = '', ?bool $escape = null)
     {
-        if ($type !== '') {
-            $type = strtoupper(trim($type));
-
-            if (! in_array($type, $this->joinTypes, true)) {
-                $type = '';
-            } else {
-                $type .= ' ';
-            }
-        }
-
-        // Extract any aliases that might exist. We use this information
-        // in the protectIdentifiers to know whether to add a table prefix
-        $this->trackAliases($table);
-
-        if (! is_bool($escape)) {
-            $escape = $this->db->protectIdentifiers;
-        }
-
-        if (! $this->hasOperator($cond)) {
-            $cond = ' USING (' . ($escape ? $this->db->escapeIdentifiers($cond) : $cond) . ')';
-        } elseif ($escape === false) {
-            $cond = ' ON ' . $cond;
-        } else {
-            // Split multiple conditions
-            if (preg_match_all('/\sAND\s|\sOR\s/i', $cond, $joints, PREG_OFFSET_CAPTURE)) {
-                $conditions = [];
-                $joints     = $joints[0];
-                array_unshift($joints, ['', 0]);
-
-                for ($i = count($joints) - 1, $pos = strlen($cond); $i >= 0; $i--) {
-                    $joints[$i][1] += strlen($joints[$i][0]); // offset
-                    $conditions[$i] = substr($cond, $joints[$i][1], $pos - $joints[$i][1]);
-                    $pos            = $joints[$i][1] - strlen($joints[$i][0]);
-                    $joints[$i]     = $joints[$i][0];
-                }
-
-                ksort($conditions);
-            } else {
-                $conditions = [$cond];
-                $joints     = [''];
-            }
-
-            $cond = ' ON ';
-
-            foreach ($conditions as $i => $condition) {
-                $operator = $this->getOperator($condition);
-
-                $cond .= $joints[$i];
-                $cond .= preg_match('/(\(*)?([\[\]\w\.\'-]+)' . preg_quote($operator, '/') . '(.*)/i', $condition, $match) ? $match[1] . $this->db->protectIdentifiers($match[2]) . $operator . $this->db->protectIdentifiers($match[3]) : $condition;
-            }
-        }
+        parent::join($table, $cond, $type, $escape);
 
         // Do we want to escape the table name?
         if ($escape === true) {
@@ -516,73 +465,6 @@ protected function compileSelect($selectOverride = false): string
         return $sql;
     }
 
-    /**
-     * WHERE, HAVING
-     *
-     * @param mixed $key
-     * @param mixed $value
-     *
-     * @return $this
-     */
-    protected function whereHaving(string $qbKey, $key, $value = null, string $type = 'AND ', ?bool $escape = null)
-    {
-        if (! is_array($key)) {
-            $key = [$key => $value];
-        }
-
-        // If the escape value was not set will base it on the global setting
-        if (! is_bool($escape)) {
-            $escape = $this->db->protectIdentifiers;
-        }
-
-        foreach ($key as $k => $v) {
-            $prefix = empty($this->{$qbKey}) ? $this->groupGetType('') : $this->groupGetType($type);
-
-            if ($v !== null) {
-                $op = $this->getOperator($k, true);
-
-                if (! empty($op)) {
-                    $k = trim($k);
-
-                    end($op);
-
-                    $op = trim(current($op));
-
-                    if (substr($k, -1 * strlen($op)) === $op) {
-                        $k = rtrim(strrev(preg_replace(strrev('/' . $op . '/'), strrev(''), strrev($k), 1)));
-                    }
-                }
-
-                $bind = $this->setBind($k, $v, $escape);
-
-                if (empty($op)) {
-                    $k .= ' =';
-                } else {
-                    $k .= " {$op}";
-                }
-
-                if ($v instanceof Closure) {
-                    $builder = $this->cleanClone();
-                    $v       = '(' . str_replace("\n", ' ', $v($builder)->getCompiledSelect()) . ')';
-                } else {
-                    $v = " :{$bind}:";
-                }
-            } elseif (! $this->hasOperator($k) && $qbKey !== 'QBHaving') {
-                // value appears not to have been set, assign the test to IS NULL
-                $k .= ' IS NULL';
-            } elseif (preg_match('/\s*(!?=|<>|IS(?:\s+NOT)?)\s*$/i', $k, $match, PREG_OFFSET_CAPTURE)) {
-                $k = substr($k, 0, $match[0][1]) . ($match[1][0] === '=' ? ' IS NULL' : ' IS NOT NULL');
-            }
-
-            $this->{$qbKey}[] = [
-                'condition' => $prefix . $k . $v,
-                'escape'    => $escape,
-            ];
-        }
-
-        return $this;
-    }
-
     /**
      * Compiles the select statement based on the other functions called
      * and runs the query

From 4272b8ea5cb157e641fd482113797baa13a2f89b Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Fri, 27 Aug 2021 21:10:08 +0800
Subject: [PATCH 0136/2325] Update dependabot config (#5027)

---
 .github/dependabot.yml                 | 25 +++++++++++++++----------
 .github/workflows/deploy-framework.yml |  8 ++++----
 .github/workflows/test-phpstan.yml     |  4 ++--
 .github/workflows/test-phpunit.yml     |  6 +++---
 .github/workflows/test-rector.yml      |  2 +-
 5 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 6532121074ad..d3afefe5c9fd 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,13 +1,18 @@
 version: 2
+
 updates:
-- package-ecosystem: composer
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
+  - package-ecosystem: 'composer'
+    directory: '/'
+    schedule:
+      interval: 'daily'
+    open-pull-requests-limit: 10
 
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    # Check for updates to GitHub Actions every weekday
-    interval: "daily"
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'daily'
+    ignore:
+      - dependency-name: '*'
+        update-types:
+          - 'version-update:semver-minor'
+          - 'version-update:semver-patch'
diff --git a/.github/workflows/deploy-framework.yml b/.github/workflows/deploy-framework.yml
index fff563878b2e..226cf242ed59 100644
--- a/.github/workflows/deploy-framework.yml
+++ b/.github/workflows/deploy-framework.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   framework:
     name: Deploy to framework
-    if: (github.repository == 'codeigniter4/CodeIgniter4')
+    if: github.repository == 'codeigniter4/CodeIgniter4'
     runs-on: ubuntu-latest
     steps:
       - name: Identify
@@ -36,7 +36,7 @@ jobs:
         run: ./source/.github/scripts/deploy-framework ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/framework ${GITHUB_REF##*/}
 
       - name: Release
-        uses: actions/github-script@v4.0.2
+        uses: actions/github-script@v4
         with:
           github-token: ${{secrets.ACCESS_TOKEN}}
           script: |
@@ -54,7 +54,7 @@ jobs:
 
   appstarter:
     name: Deploy to appstarter
-    if: (github.repository == 'codeigniter4/CodeIgniter4')
+    if: github.repository == 'codeigniter4/CodeIgniter4'
     runs-on: ubuntu-latest
     steps:
       - name: Identify
@@ -81,7 +81,7 @@ jobs:
         run: ./source/.github/scripts/deploy-appstarter ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/appstarter ${GITHUB_REF##*/}
 
       - name: Release
-        uses: actions/github-script@v4.0.2
+        uses: actions/github-script@v4
         with:
           github-token: ${{secrets.ACCESS_TOKEN}}
           script: |
diff --git a/.github/workflows/test-phpstan.yml b/.github/workflows/test-phpstan.yml
index 86b68b058ea1..0e59e3bf4e3a 100644
--- a/.github/workflows/test-phpstan.yml
+++ b/.github/workflows/test-phpstan.yml
@@ -54,7 +54,7 @@ jobs:
         run: mkdir -p ${{ steps.composer-cache.outputs.dir }}
 
       - name: Cache composer dependencies
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -64,7 +64,7 @@ jobs:
         run: mkdir -p build/phpstan
 
       - name: Cache PHPStan result cache directory
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2
         with:
           path: build/phpstan
           key: ${{ runner.os }}-phpstan-${{ github.sha }}
diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 9b9da589720f..5dd68a65eac1 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -44,9 +44,9 @@ jobs:
         db-platforms: ['MySQLi', 'Postgre', 'SQLite3', 'SQLSRV']
         mysql-versions: ['5.7']
         include:
-          - php-versions: 7.4
+          - php-versions: '7.4'
             db-platforms: MySQLi
-            mysql-versions: 8.0
+            mysql-versions: '8.0'
 
     services:
       mysql:
@@ -113,7 +113,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache dependencies
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2
         with:
           path: ${{ steps.composercache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
diff --git a/.github/workflows/test-rector.yml b/.github/workflows/test-rector.yml
index e1420c965f37..0d7262ceb4ea 100644
--- a/.github/workflows/test-rector.yml
+++ b/.github/workflows/test-rector.yml
@@ -58,7 +58,7 @@ jobs:
         run: mkdir -p ${{ steps.composer-cache.outputs.dir }}
 
       - name: Cache composer dependencies
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

From 82d39def0bd386242855726b697f53a1f2d6e4b9 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Fri, 27 Aug 2021 21:11:49 +0800
Subject: [PATCH 0137/2325] Add `ReturnTypeWillChange` attribute to Entity
 (#5028)

---
 system/Entity/Entity.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index 03f6327f8142..482d092912f4 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -27,6 +27,7 @@
 use CodeIgniter\I18n\Time;
 use Exception;
 use JsonSerializable;
+use ReturnTypeWillChange;
 
 /**
  * Entity encapsulation, for use with CodeIgniter\Model
@@ -406,8 +407,9 @@ private function castAsJson($value, bool $asArray = false)
     /**
      * Support for json_encode()
      *
-     * @return array|mixed
+     * @return array
      */
+    #[ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->toArray();

From 7be28cdfc31613c0adb10171bc4db6c7cf26c2b0 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Fri, 27 Aug 2021 21:13:05 +0800
Subject: [PATCH 0138/2325] Replace unused Entity private method (#5029)

---
 rector.php                         |  1 -
 system/Entity/Entity.php           | 14 ----------
 tests/system/Entity/EntityTest.php | 43 +++++++++++++++++-------------
 3 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/rector.php b/rector.php
index cbce74ea213d..552c6341cb0b 100644
--- a/rector.php
+++ b/rector.php
@@ -78,7 +78,6 @@
 
         // private method called via getPrivateMethodInvoker
         RemoveUnusedPrivateMethodRector::class => [
-            __DIR__ . '/system/Entity/Entity.php',
             __DIR__ . '/tests/system/Test/ReflectionHelperTest.php',
         ],
 
diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index 482d092912f4..7d44adf3e14c 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -390,20 +390,6 @@ protected function castAs($value, string $attribute, string $method = 'get')
         return $handlers[$type]::$method($value, $params);
     }
 
-    /**
-     * Cast as JSON
-     *
-     * @param mixed $value
-     *
-     * @throws CastException
-     *
-     * @return mixed
-     */
-    private function castAsJson($value, bool $asArray = false)
-    {
-        return JsonCast::get($value, $asArray ? ['array'] : []);
-    }
-
     /**
      * Support for json_encode()
      *
diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php
index 0928279ac514..69d0546510bd 100644
--- a/tests/system/Entity/EntityTest.php
+++ b/tests/system/Entity/EntityTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Entity;
 
+use Closure;
 use CodeIgniter\Entity\Exceptions\CastException;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\I18n\Time;
@@ -589,54 +590,60 @@ public function testCastAsJSONErrorUTF8()
 
     public function testCastAsJSONSyntaxError()
     {
-        $entity = new Entity();
-
-        $method = $this->getPrivateMethodInvoker($entity, 'castAsJson');
-
         $this->expectException(CastException::class);
         $this->expectExceptionMessage('Syntax error, malformed JSON');
 
-        $method('{ this is bad string', true);
+        (Closure::bind(static function (string $value) {
+            $entity = new Entity();
+            $entity->casts['dummy'] = 'json[array]';
+
+            return $entity->castAs($value, 'dummy');
+        }, null, Entity::class))('{ this is bad string');
     }
 
     public function testCastAsJSONAnotherErrorDepth()
     {
-        $entity = new Entity();
-
-        $method = $this->getPrivateMethodInvoker($entity, 'castAsJson');
-
         $this->expectException(CastException::class);
         $this->expectExceptionMessage('Maximum stack depth exceeded');
 
         $string = '{' . str_repeat('"test":{', 513) . '"test":"value"' . str_repeat('}', 513) . '}';
 
-        $method($string, true);
+        (Closure::bind(static function (string $value) {
+            $entity = new Entity();
+            $entity->casts['dummy'] = 'json[array]';
+
+            return $entity->castAs($value, 'dummy');
+        }, null, Entity::class))($string);
     }
 
     public function testCastAsJSONControlCharCheck()
     {
-        $entity = new Entity();
-        $method = $this->getPrivateMethodInvoker($entity, 'castAsJson');
-
         $this->expectException(CastException::class);
         $this->expectExceptionMessage('Unexpected control character found');
 
         $string = "{\n\t\"property1\": \"The quick brown fox\njumps over the lazy dog\",\n\t\"property2\":\"value2\"\n}";
 
-        $method($string, true);
+        (Closure::bind(static function (string $value) {
+            $entity = new Entity();
+            $entity->casts['dummy'] = 'json[array]';
+
+            return $entity->castAs($value, 'dummy');
+        }, null, Entity::class))($string);
     }
 
     public function testCastAsJSONStateMismatch()
     {
-        $entity = new Entity();
-        $method = $this->getPrivateMethodInvoker($entity, 'castAsJson');
-
         $this->expectException(CastException::class);
         $this->expectExceptionMessage('Underflow or the modes mismatch');
 
         $string = '[{"name":"jack","product_id":"1234"]';
 
-        $method($string, true);
+        (Closure::bind(static function (string $value) {
+            $entity = new Entity();
+            $entity->casts['dummy'] = 'json[array]';
+
+            return $entity->castAs($value, 'dummy');
+        }, null, Entity::class))($string);
     }
 
     public function testCastSetter()

From d50f8ecf7b6b02af46535880099e4af4d70f2fd7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Aug 2021 15:02:14 +0000
Subject: [PATCH 0139/2325] Update rector/rector requirement from 0.11.49 to
 0.11.52

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.11.49...0.11.52)

---
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 2287474c27de..66a38a215e5c 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "phpstan/phpstan": "^0.12.91",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.49",
+        "rector/rector": "0.11.52",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {

From 60d5dc86c11501ac32ce6250d36cbbec0cbb95ba Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Fri, 27 Aug 2021 18:39:15 +0000
Subject: [PATCH 0140/2325] Restore join code

---
 system/Database/SQLSRV/Builder.php | 52 +++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index aaed5680dfc0..cda4fac8a825 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -92,7 +92,57 @@ protected function _truncate(string $table): string
      */
     public function join(string $table, string $cond, string $type = '', ?bool $escape = null)
     {
-        parent::join($table, $cond, $type, $escape);
+        if ($type !== '') {
+            $type = strtoupper(trim($type));
+
+            if (! in_array($type, $this->joinTypes, true)) {
+                $type = '';
+            } else {
+                $type .= ' ';
+            }
+        }
+
+        // Extract any aliases that might exist. We use this information
+        // in the protectIdentifiers to know whether to add a table prefix
+        $this->trackAliases($table);
+
+        if (! is_bool($escape)) {
+            $escape = $this->db->protectIdentifiers;
+        }
+
+        if (! $this->hasOperator($cond)) {
+            $cond = ' USING (' . ($escape ? $this->db->escapeIdentifiers($cond) : $cond) . ')';
+        } elseif ($escape === false) {
+            $cond = ' ON ' . $cond;
+        } else {
+            // Split multiple conditions
+            if (preg_match_all('/\sAND\s|\sOR\s/i', $cond, $joints, PREG_OFFSET_CAPTURE)) {
+                $conditions = [];
+                $joints     = $joints[0];
+                array_unshift($joints, ['', 0]);
+
+                for ($i = count($joints) - 1, $pos = strlen($cond); $i >= 0; $i--) {
+                    $joints[$i][1] += strlen($joints[$i][0]); // offset
+                    $conditions[$i] = substr($cond, $joints[$i][1], $pos - $joints[$i][1]);
+                    $pos            = $joints[$i][1] - strlen($joints[$i][0]);
+                    $joints[$i]     = $joints[$i][0];
+                }
+
+                ksort($conditions);
+            } else {
+                $conditions = [$cond];
+                $joints     = [''];
+            }
+
+            $cond = ' ON ';
+
+            foreach ($conditions as $i => $condition) {
+                $operator = $this->getOperator($condition);
+
+                $cond .= $joints[$i];
+                $cond .= preg_match('/(\(*)?([\[\]\w\.\'-]+)' . preg_quote($operator, '/') . '(.*)/i', $condition, $match) ? $match[1] . $this->db->protectIdentifiers($match[2]) . $operator . $this->db->protectIdentifiers($match[3]) : $condition;
+            }
+        }
 
         // Do we want to escape the table name?
         if ($escape === true) {

From 3cbb61772f1e48779e91abc478111f993f416c9f Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sat, 28 Aug 2021 09:33:43 +0700
Subject: [PATCH 0141/2325] clean up rector.php config skip

---
 rector.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/rector.php b/rector.php
index 552c6341cb0b..77b014df2559 100644
--- a/rector.php
+++ b/rector.php
@@ -30,7 +30,6 @@
 use Rector\DeadCode\Rector\Cast\RecastingRemovalRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector;
-use Rector\DeadCode\Rector\If_\RemoveUnusedNonEmptyArrayBeforeForeachRector;
 use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector;
 use Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector;
 use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector;
@@ -100,11 +99,6 @@
         UnderscoreToCamelCaseVariableNameRector::class => [
             __DIR__ . '/system/Session/Handlers',
         ],
-
-        // check on $_SESSION
-        RemoveUnusedNonEmptyArrayBeforeForeachRector::class => [
-            __DIR__ . '/system/Debug/Toolbar.php',
-        ],
     ]);
 
     // auto import fully qualified class names

From c79a2cb3d880d3fc34f01aeca1024e406101c28f Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sun, 29 Aug 2021 18:27:16 +0800
Subject: [PATCH 0142/2325] Fix broken apt installation

---
 .github/workflows/test-phpunit.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 5dd68a65eac1..35dc86f8b4d1 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -107,6 +107,7 @@ jobs:
         run: |
           sudo apt-get install --reinstall libgs9-common fonts-noto-mono libgs9:amd64 libijs-0.35:amd64 fonts-urw-base35 ghostscript poppler-data libjbig2dec0:amd64 gsfonts libopenjp2-7:amd64 fonts-droid-fallback ttf-dejavu-core
           sudo apt-get install -y imagemagick
+          sudo apt-get install --fix-broken
 
       - name: Get composer cache directory
         id: composercache

From a63061769fb350a316e42a0b36a063e0fa8da7c7 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Mon, 30 Aug 2021 22:53:31 +0800
Subject: [PATCH 0143/2325] Make File compatible with SplFileInfo (#5040)

---
 system/Files/File.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/system/Files/File.php b/system/Files/File.php
index 132822043f33..40d1247e7541 100644
--- a/system/Files/File.php
+++ b/system/Files/File.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Files\Exceptions\FileException;
 use CodeIgniter\Files\Exceptions\FileNotFoundException;
 use Config\Mimes;
+use ReturnTypeWillChange;
 use SplFileInfo;
 
 /**
@@ -29,8 +30,6 @@ class File extends SplFileInfo
     protected $size;
 
     /**
-     * Original MimeType
-     *
      * @var string|null
      */
     protected $originalMimeType;
@@ -38,6 +37,8 @@ class File extends SplFileInfo
     /**
      * Run our SplFileInfo constructor with an optional verification
      * that the path is really a file.
+     *
+     * @throws FileNotFoundException
      */
     public function __construct(string $path, bool $checkFile = false)
     {
@@ -55,8 +56,9 @@ public function __construct(string $path, bool $checkFile = false)
      * the file in the $_FILES array if available, as PHP calculates this based
      * on the actual size transmitted.
      *
-     * @return int The file size in bytes
+     * @return false|int The file size in bytes, or false on failure
      */
+    #[ReturnTypeWillChange]
     public function getSize()
     {
         return $this->size ?? ($this->size = parent::getSize());
@@ -65,7 +67,7 @@ public function getSize()
     /**
      * Retrieve the file size by unit.
      *
-     * @return int|string
+     * @return false|int|string
      */
     public function getSizeByUnit(string $unit = 'b')
     {

From ffcf115daf1c7263245d2ccdda5ce2895c54ceba Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Mon, 30 Aug 2021 22:55:10 +0800
Subject: [PATCH 0144/2325] Update documentation code samples (#5039)

---
 env                                           |   2 +-
 user_guide_src/source/cli/cli_commands.rst    |  11 +-
 user_guide_src/source/cli/cli_library.rst     |   9 +-
 user_guide_src/source/cli/cli_request.rst     |   2 +-
 .../source/database/configuration.rst         |  50 +++---
 user_guide_src/source/database/connecting.rst |   2 +-
 user_guide_src/source/database/examples.rst   |  12 +-
 user_guide_src/source/database/metadata.rst   |  34 ++--
 user_guide_src/source/database/queries.rst    |  70 ++++----
 .../source/database/query_builder.rst         |  21 ++-
 user_guide_src/source/database/results.rst    |  62 +++----
 .../source/database/transactions.rst          |  13 +-
 user_guide_src/source/dbmgmt/forge.rst        |  72 ++++-----
 user_guide_src/source/dbmgmt/migration.rst    |  17 +-
 .../source/extending/core_classes.rst         |   5 +-
 user_guide_src/source/extending/events.rst    |   4 +-
 .../source/general/common_functions.rst       |  16 +-
 user_guide_src/source/general/errors.rst      |  16 +-
 user_guide_src/source/general/helpers.rst     |   7 +-
 user_guide_src/source/general/logging.rst     |  10 +-
 user_guide_src/source/general/modules.rst     |   3 +-
 .../source/helpers/array_helper.rst           |   8 +-
 .../source/helpers/cookie_helper.rst          |   2 +-
 user_guide_src/source/helpers/date_helper.rst |   2 +-
 .../source/helpers/filesystem_helper.rst      |  45 +++---
 user_guide_src/source/helpers/form_helper.rst |  44 ++---
 user_guide_src/source/helpers/html_helper.rst |  43 +++--
 .../source/helpers/inflector_helper.rst       |   4 +-
 user_guide_src/source/helpers/text_helper.rst |  14 +-
 user_guide_src/source/helpers/url_helper.rst  |  30 ++--
 user_guide_src/source/helpers/xml_helper.rst  |   2 +-
 .../source/incoming/content_negotiation.rst   |   4 +-
 .../source/incoming/controllers.rst           |  26 ++-
 user_guide_src/source/incoming/filters.rst    |   9 +-
 .../source/incoming/incomingrequest.rst       |  64 ++++----
 user_guide_src/source/incoming/message.rst    |   2 +-
 user_guide_src/source/incoming/request.rst    |  21 ++-
 user_guide_src/source/incoming/routing.rst    |  42 ++---
 .../installation/upgrade_configuration.rst    |  30 ++--
 .../installation/upgrade_migrations.rst       |  24 +--
 user_guide_src/source/libraries/caching.rst   |  15 +-
 .../source/libraries/curlrequest.rst          |  29 ++--
 user_guide_src/source/libraries/email.rst     |  28 ++--
 user_guide_src/source/libraries/files.rst     |  14 +-
 user_guide_src/source/libraries/honeypot.rst  |  18 +--
 user_guide_src/source/libraries/images.rst    |   4 +-
 .../source/libraries/pagination.rst           |   6 +-
 user_guide_src/source/libraries/security.rst  |  14 +-
 user_guide_src/source/libraries/sessions.rst  |  40 ++---
 user_guide_src/source/libraries/throttler.rst |  18 +--
 user_guide_src/source/libraries/time.rst      | 152 +++++++++---------
 .../source/libraries/typography.rst           |   2 +-
 .../source/libraries/uploaded_files.rst       |  15 +-
 user_guide_src/source/libraries/uri.rst       |   7 +-
 .../source/libraries/user_agent.rst           |  58 +++----
 .../source/libraries/validation.rst           | 103 ++++++------
 user_guide_src/source/models/entities.rst     |  35 ++--
 user_guide_src/source/models/model.rst        |  47 +++---
 .../source/outgoing/api_responses.rst         |   9 +-
 .../source/outgoing/localization.rst          |   6 +-
 user_guide_src/source/outgoing/response.rst   |  12 +-
 user_guide_src/source/outgoing/table.rst      |  31 ++--
 .../source/outgoing/view_parser.rst           |  58 +++----
 user_guide_src/source/outgoing/views.rst      |  10 +-
 user_guide_src/source/testing/benchmark.rst   |  18 +--
 user_guide_src/source/testing/database.rst    |   8 +-
 user_guide_src/source/testing/debugging.rst   |  10 +-
 user_guide_src/source/testing/feature.rst     |  22 ++-
 user_guide_src/source/testing/overview.rst    |   4 +-
 user_guide_src/source/testing/response.rst    |   8 +-
 user_guide_src/source/tutorial/conclusion.rst |   2 +-
 .../source/tutorial/create_news_items.rst     |  19 +--
 .../source/tutorial/news_section.rst          |   5 +-
 .../source/tutorial/static_pages.rst          |   3 +-
 74 files changed, 762 insertions(+), 922 deletions(-)

diff --git a/env b/env
index 1106ce46f932..38eabf203988 100644
--- a/env
+++ b/env
@@ -26,7 +26,7 @@
 # app.sessionDriver = 'CodeIgniter\Session\Handlers\FileHandler'
 # app.sessionCookieName = 'ci_session'
 # app.sessionExpiration = 7200
-# app.sessionSavePath = NULL
+# app.sessionSavePath = null
 # app.sessionMatchIP = false
 # app.sessionTimeToUpdate = 300
 # app.sessionRegenerateDestroy = false
diff --git a/user_guide_src/source/cli/cli_commands.rst b/user_guide_src/source/cli/cli_commands.rst
index 65e0f89209fc..6f0fe21ee4bd 100644
--- a/user_guide_src/source/cli/cli_commands.rst
+++ b/user_guide_src/source/cli/cli_commands.rst
@@ -187,12 +187,9 @@ be familiar with when creating your own commands. It also has a :doc:`Logger </g
 
         A convenience method to maintain a consistent and clear error output to the CLI::
 
-            try
-            {
+            try {
                 . . .
-            }
-            catch (\Exception $e)
-            {
+            } catch (\Exception $e) {
                 $this->showError($e);
             }
 
@@ -208,8 +205,8 @@ be familiar with when creating your own commands. It also has a :doc:`Logger </g
         A method to calculate padding for $key => $value array output. The padding can be used to output a will formatted table in CLI::
 
             $pad = $this->getPad($this->options, 6);
-            foreach ($this->options as $option => $description)
-            {
+
+            foreach ($this->options as $option => $description) {
                 CLI::write($tab . CLI::color(str_pad($option, $pad), 'green') . $description, 'yellow');
             }
 
diff --git a/user_guide_src/source/cli/cli_library.rst b/user_guide_src/source/cli/cli_library.rst
index 1697c8409358..d7ddc0993015 100644
--- a/user_guide_src/source/cli/cli_library.rst
+++ b/user_guide_src/source/cli/cli_library.rst
@@ -119,8 +119,7 @@ Instead it prints it to the screen wherever the cursor is currently. This allows
 the same line, from different calls. This is especially helpful when you want to show a status, do something, then
 print "Done" on the same line::
 
-    for ($i = 0; $i <= 10; $i++)
-    {
+    for ($i = 0; $i <= 10; $i++) {
         CLI::print($i);
     }
 
@@ -172,8 +171,7 @@ every line after the first line, so that you will have a crisp column edge on th
     // to determine the width of the left column
     $maxlen = max(array_map('strlen', $titles));
 
-    for ($i=0; $i < count($titles); $i++)
-    {
+    for ($i = 0; $i < count($titles); $i++) {
         CLI::write(
             // Display the title on the left of the row
             $titles[$i] . '   ' .
@@ -227,8 +225,7 @@ pass ``false`` as the first parameter and the progress bar will be removed.
     $totalSteps = count($tasks);
     $currStep   = 1;
 
-    foreach ($tasks as $task)
-    {
+    foreach ($tasks as $task) {
         CLI::showProgress($currStep++, $totalSteps);
         $task->run();
     }
diff --git a/user_guide_src/source/cli/cli_request.rst b/user_guide_src/source/cli/cli_request.rst
index 6932294aa2e0..0fa29f2735ab 100644
--- a/user_guide_src/source/cli/cli_request.rst
+++ b/user_guide_src/source/cli/cli_request.rst
@@ -37,7 +37,7 @@ Returns the value of a specific command line argument deemed to be an option::
 
     // command line: php index.php users 21 profile --foo bar
     echo $request->getOption('foo');  // bar
-    echo $request->getOption('notthere'); // NULL
+    echo $request->getOption('notthere'); // null
 
 **getOptionString()**
 
diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst
index 38be6c16efa5..53b2c3f932b0 100644
--- a/user_guide_src/source/database/configuration.rst
+++ b/user_guide_src/source/database/configuration.rst
@@ -22,14 +22,14 @@ prototype::
         'database' => 'database_name',
         'DBDriver' => 'MySQLi',
         'DBPrefix' => '',
-        'pConnect' => TRUE,
-        'DBDebug'  => TRUE,
+        'pConnect' => true,
+        'DBDebug'  => true,
         'charset'  => 'utf8',
         'DBCollat' => 'utf8_general_ci',
         'swapPre'  => '',
-        'encrypt'  => FALSE,
-        'compress' => FALSE,
-        'strictOn' => FALSE,
+        'encrypt'  => false,
+        'compress' => false,
+        'strictOn' => false,
         'failover' => [],
     ];
 
@@ -80,14 +80,14 @@ These failovers can be specified by setting the failover for a connection like t
             'database' => '',
             'DBDriver' => 'MySQLi',
             'DBPrefix' => '',
-            'pConnect' => TRUE,
-            'DBDebug'  => TRUE,
+            'pConnect' => true,
+            'DBDebug'  => true,
             'charset'  => 'utf8',
             'DBCollat' => 'utf8_general_ci',
             'swapPre'  => '',
-            'encrypt'  => FALSE,
-            'compress' => FALSE,
-            'strictOn' => FALSE
+            'encrypt'  => false,
+            'compress' => false,
+            'strictOn' => false,
         ],
         [
             'hostname' => 'localhost2',
@@ -96,14 +96,14 @@ These failovers can be specified by setting the failover for a connection like t
             'database' => '',
             'DBDriver' => 'MySQLi',
             'DBPrefix' => '',
-            'pConnect' => TRUE,
-            'DBDebug'  => TRUE,
+            'pConnect' => true,
+            'DBDebug'  => true,
             'charset'  => 'utf8',
             'DBCollat' => 'utf8_general_ci',
             'swapPre'  => '',
-            'encrypt'  => FALSE,
-            'compress' => FALSE,
-            'strictOn' => FALSE
+            'encrypt'  => false,
+            'compress' => false,
+            'strictOn' => false,
         ]
     ];
 
@@ -123,14 +123,14 @@ example, to set up a "test" environment you would do this::
         'database' => 'database_name',
         'DBDriver' => 'MySQLi',
         'DBPrefix' => '',
-        'pConnect' => TRUE,
-        'DBDebug'  => TRUE,
+        'pConnect' => true,
+        'DBDebug'  => true,
         'charset'  => 'utf8',
         'DBCollat' => 'utf8_general_ci',
         'swapPre'  => '',
-        'compress' => FALSE,
-        'encrypt'  => FALSE,
-        'strictOn' => FALSE,
+        'compress' => false,
+        'encrypt'  => false,
+        'strictOn' => false,
         'failover' => []
     );
 
@@ -188,8 +188,8 @@ Explanation of Values:
 **DBPrefix**    An optional table prefix which will added to the table name when running
                 :doc:`Query Builder <query_builder>` queries. This permits multiple CodeIgniter
                 installations to share one database.
-**pConnect**    TRUE/FALSE (boolean) - Whether to use a persistent connection.
-**DBDebug**     TRUE/FALSE (boolean) - Whether database errors should be displayed.
+**pConnect**    true/false (boolean) - Whether to use a persistent connection.
+**DBDebug**     true/false (boolean) - Whether database errors should be displayed.
 **charset**     The character set used in communicating with the database.
 **DBCollat**    The character collation used in communicating with the database
 
@@ -201,7 +201,7 @@ Explanation of Values:
 **schema**      The database schema, default value varies by driver. Used by PostgreSQL and SQLSRV drivers.
 **encrypt**     Whether or not to use an encrypted connection.
 
-                - 'sqlsrv' and 'pdo/sqlsrv' drivers accept TRUE/FALSE
+                - 'sqlsrv' and 'pdo/sqlsrv' drivers accept true/false
                 - 'MySQLi' and 'pdo/mysql' drivers accept an array with the following options:
 
                     - 'ssl_key'    - Path to the private key file
@@ -209,10 +209,10 @@ Explanation of Values:
                     - 'ssl_ca'     - Path to the certificate authority file
                     - 'ssl_capath' - Path to a directory containing trusted CA certificates in PEM format
                     - 'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':')
-                    - 'ssl_verify' - TRUE/FALSE; Whether to verify the server certificate or not ('MySQLi' only)
+                    - 'ssl_verify' - true/false; Whether to verify the server certificate or not ('MySQLi' only)
 
 **compress**    Whether or not to use client compression (MySQL only).
-**strictOn**    TRUE/FALSE (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL
+**strictOn**    true/false (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL
                 while developing an application.
 **port**        The database port number. To use this value you have to add a line to the database config array.
                 ::
diff --git a/user_guide_src/source/database/connecting.rst b/user_guide_src/source/database/connecting.rst
index 994f6537766c..65a3ed086d27 100644
--- a/user_guide_src/source/database/connecting.rst
+++ b/user_guide_src/source/database/connecting.rst
@@ -27,7 +27,7 @@ Available Parameters
 --------------------
 
 #. The database group name, a string that must match the config class' property name. Default value is ``$config->defaultGroup``.
-#. TRUE/FALSE (boolean). Whether to return the shared connection (see
+#. true/false (boolean). Whether to return the shared connection (see
    Connecting to Multiple Databases below).
 
 Manually Connecting to a Database
diff --git a/user_guide_src/source/database/examples.rst b/user_guide_src/source/database/examples.rst
index 84358ac9963d..de41c39f1366 100644
--- a/user_guide_src/source/database/examples.rst
+++ b/user_guide_src/source/database/examples.rst
@@ -28,11 +28,10 @@ Standard Query With Multiple Results (Object Version)
 
 ::
 
-    $query = $db->query('SELECT name, title, email FROM my_table');
+    $query   = $db->query('SELECT name, title, email FROM my_table');
     $results = $query->getResult();
 
-    foreach ($results as $row)
-    {
+    foreach ($results as $row) {
         echo $row->title;
         echo $row->name;
         echo $row->email;
@@ -51,8 +50,7 @@ Standard Query With Multiple Results (Array Version)
     $query   = $db->query('SELECT name, title, email FROM my_table');
     $results = $query->getResultArray();
 
-    foreach ($results as $row)
-    {
+    foreach ($results as $row) {
         echo $row['title'];
         echo $row['name'];
         echo $row['email'];
@@ -102,8 +100,7 @@ means of retrieving data::
 
     $query = $db->table('table_name')->get();
 
-    foreach ($query->getResult() as $row)
-    {
+    foreach ($query->getResult() as $row) {
         echo $row->title;
     }
 
@@ -124,4 +121,3 @@ Query Builder Insert
 
     $db->table('mytable')->insert($data);
     // Produces: INSERT INTO mytable (title, name, date) VALUES ('{$title}', '{$name}', '{$date}')
-
diff --git a/user_guide_src/source/database/metadata.rst b/user_guide_src/source/database/metadata.rst
index 60439f9d1a81..fd19a1aa35b5 100644
--- a/user_guide_src/source/database/metadata.rst
+++ b/user_guide_src/source/database/metadata.rst
@@ -22,8 +22,7 @@ you are currently connected to. Example::
 
     $tables = $db->listTables();
 
-    foreach ($tables as $table)
-    {
+    foreach ($tables as $table) {
         echo $table;
     }
 
@@ -35,10 +34,9 @@ Determine If a Table Exists
 **$db->tableExists();**
 
 Sometimes it's helpful to know whether a particular table exists before
-running an operation on it. Returns a boolean TRUE/FALSE. Usage example::
+running an operation on it. Returns a boolean true/false. Usage example::
 
-    if ($db->tableExists('table_name'))
-    {
+    if ($db->tableExists('table_name')) {
         // some code...
     }
 
@@ -60,8 +58,7 @@ two ways:
 
     $fields = $db->getFieldNames('table_name');
 
-    foreach ($fields as $field)
-    {
+    foreach ($fields as $field) {
         echo $field;
     }
 
@@ -70,8 +67,7 @@ calling the function from your query result object::
 
     $query = $db->query('SELECT * FROM some_table');
 
-    foreach ($query->getFieldNames() as $field)
-    {
+    foreach ($query->getFieldNames() as $field) {
         echo $field;
     }
 
@@ -81,10 +77,9 @@ Determine If a Field is Present in a Table
 **$db->fieldExists()**
 
 Sometimes it's helpful to know whether a particular field exists before
-performing an action. Returns a boolean TRUE/FALSE. Usage example::
+performing an action. Returns a boolean true/false. Usage example::
 
-    if ($db->fieldExists('field_name', 'table_name'))
-    {
+    if ($db->fieldExists('field_name', 'table_name')) {
         // some code...
     }
 
@@ -108,8 +103,7 @@ Usage example::
 
     $fields = $db->getFieldData('table_name');
 
-    foreach ($fields as $field)
-    {
+    foreach ($fields as $field) {
         echo $field->name;
         echo $field->type;
         echo $field->max_length;
@@ -141,11 +135,10 @@ Usage example::
 
     $keys = $db->getIndexData('table_name');
 
-    foreach ($keys as $key)
-    {
-    echo $key->name;
-    echo $key->type;
-    echo $key->fields; // array of field names
+    foreach ($keys as $key) {
+        echo $key->name;
+        echo $key->type;
+        echo $key->fields; // array of field names
     }
 
 The key types may be unique to the database you are using.
@@ -160,8 +153,7 @@ Usage example::
 
     $keys = $db->getForeignKeyData('table_name');
 
-    foreach ($keys as $key)
-    {
+    foreach ($keys as $key) {
         echo $key->constraint_name;
         echo $key->table_name;
         echo $key->column_name;
diff --git a/user_guide_src/source/database/queries.rst b/user_guide_src/source/database/queries.rst
index 93a54f01d861..366b264cc45c 100644
--- a/user_guide_src/source/database/queries.rst
+++ b/user_guide_src/source/database/queries.rst
@@ -20,7 +20,7 @@ To submit a query, use the **query** function::
 The ``query()`` function returns a database result **object** when "read"
 type queries are run which you can use to :doc:`show your
 results <results>`. When "write" type queries are run it simply
-returns TRUE or FALSE depending on success or failure. When retrieving
+returns true or false depending on success or failure. When retrieving
 data you will typically assign the query to your own variable, like
 this::
 
@@ -36,19 +36,16 @@ compile bind data, or store your query for debugging. It simply lets you
 submit a query. Most users will rarely use this function.
 
 It returns whatever the database drivers "execute" function returns.
-That typically is TRUE/FALSE on success or failure for write type queries
+That typically is true/false on success or failure for write type queries
 such as INSERT, DELETE or UPDATE statements (which is what it really
 should be used for) and a resource/object on success for queries with
 fetchable results.
 
 ::
 
-    if ($db->simpleQuery('YOUR QUERY'))
-    {
+    if ($db->simpleQuery('YOUR QUERY')) {
         echo "Success!";
-    }
-    else
-    {
+    } else {
         echo "Query failed!";
     }
 
@@ -94,9 +91,9 @@ identifier you can use::
 
 This function will also add a table prefix to your table, assuming you
 have a prefix specified in your database config file. To enable the
-prefixing set TRUE (boolean) via the second parameter::
+prefixing set true (boolean) via the second parameter::
 
-    $db->protectIdentifiers('table_name', TRUE);
+    $db->protectIdentifiers('table_name', true);
 
 ****************
 Escaping Queries
@@ -173,7 +170,7 @@ placeholders in the query::
         $db->query($sql, [
             'id'     => 3,
             'status' => 'live',
-            'name'   => 'Rick'
+            'name'   => 'Rick',
         ]);
 
 .. note:: Each name in the query MUST be surrounded by colons.
@@ -188,8 +185,7 @@ If you need to get the last error that has occurred, the ``error()`` method
 will return an array containing its code and message. Here's a quick
 example::
 
-    if ( ! $db->simpleQuery('SELECT `example_field` FROM `example_table`'))
-    {
+    if ( ! $db->simpleQuery('SELECT `example_field` FROM `example_table`')) {
         $error = $db->error(); // Has keys 'code' and 'message'
     }
 
@@ -214,14 +210,12 @@ a query object. Query objects are automatically generated by any of the "final"
 run a query. The query is not actually run, and the values don't matter since they're never applied, acting instead
 as placeholders. This returns a PreparedQuery object::
 
-    $pQuery = $db->prepare(function($db)
-    {
-        return $db->table('user')
-                  ->insert([
-                       'name'    => 'x',
-                       'email'   => 'y',
-                       'country' => 'US'
-                  ]);
+    $pQuery = $db->prepare(function ($db) {
+        return $db->table('user')->insert([
+            'name'    => 'x',
+            'email'   => 'y',
+            'country' => 'US'
+        ]);
     });
 
 If you don't want to use the Query Builder you can create the Query object manually using question marks for
@@ -229,8 +223,7 @@ value placeholders::
 
     use CodeIgniter\Database\Query;
 
-    $pQuery = $db->prepare(function($db)
-    {
+    $pQuery = $db->prepare(function ($db) {
         $sql = "INSERT INTO user (name, email, country) VALUES (?, ?, ?)";
 
         return (new Query($db))->setQuery($sql);
@@ -241,8 +234,7 @@ array through in the second parameter::
 
     use CodeIgniter\Database\Query;
 
-    $pQuery = $db->prepare(function($db)
-    {
+    $pQuery = $db->prepare(function ($db) {
         $sql = "INSERT INTO user (name, email, country) VALUES (?, ?, ?)";
 
         return (new Query($db))->setQuery($sql);
@@ -257,14 +249,12 @@ placeholders in the query. They must also be passed in the same order as the pla
 query::
 
     // Prepare the Query
-    $pQuery = $db->prepare(function($db)
-    {
-        return $db->table('user')
-                  ->insert([
-                       'name'    => 'x',
-                       'email'   => 'y',
-                       'country' => 'US'
-                  ]);
+    $pQuery = $db->prepare(function ($db) {
+        return $db->table('user')->insert([
+            'name'    => 'x',
+            'email'   => 'y',
+            'country' => 'US'
+        ]);
     });
 
     // Collect the Data
@@ -307,7 +297,7 @@ Working with Query Objects
 **************************
 
 Internally, all queries are processed and stored as instances of
-\CodeIgniter\Database\Query. This class is responsible for binding
+``CodeIgniter\Database\Query``. This class is responsible for binding
 the parameters, otherwise preparing the query, and storing performance
 data about its query.
 
@@ -317,7 +307,7 @@ When you just need to retrieve the last Query object, use the
 getLastQuery() method::
 
     $query = $db->getLastQuery();
-    echo (string)$query;
+    echo (string) $query;
 
 The Query Class
 ===============
@@ -335,7 +325,7 @@ query that was sent to the database::
 
 This same value can be retrieved by casting the Query object to a string::
 
-    $sql = (string)$query;
+    $sql = (string) $query;
 
 **getOriginalQuery()**
 
@@ -349,10 +339,9 @@ binds in it, or prefixes swapped out, etc::
 If an error was encountered during the execution of this query this method
 will return true::
 
-    if ($query->hasError())
-    {
-        echo 'Code: '. $query->getErrorCode();
-        echo 'Error: '. $query->getErrorMessage();
+    if ($query->hasError()) {
+        echo 'Code: ' . $query->getErrorCode();
+        echo 'Error: ' . $query->getErrorMessage();
     }
 
 **isWriteType()**
@@ -360,8 +349,7 @@ will return true::
 Returns true if the query was determined to be a write-type query (i.e.,
 INSERT, UPDATE, DELETE, etc)::
 
-    if ($query->isWriteType())
-    {
+    if ($query->isWriteType()) {
         // ... do something
     }
 
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 62e3aa29b0c9..78c1b3731fd5 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -60,8 +60,7 @@ $query, which can be used to show the results::
 
     $query = $builder->get();
 
-    foreach ($query->getResult() as $row)
-    {
+    foreach ($query->getResult() as $row) {
         echo $row->title;
     }
 
@@ -310,7 +309,7 @@ methods:
 
     ::
 
-        $builder->where('advance_amount <', function(BaseBuilder $builder) {
+        $builder->where('advance_amount <', function (BaseBuilder $builder) {
             return $builder->select('MAX(advance_amount)', false)->from('orders')->where('id >', 2);
         });
         // Produces: WHERE "advance_amount" < (SELECT MAX(advance_amount) FROM "orders" WHERE "id" > 2)
@@ -341,7 +340,7 @@ You can use subqueries instead of an array of values.
 
     ::
 
-        $builder->whereIn('id', function(BaseBuilder $builder) {
+        $builder->whereIn('id', function (BaseBuilder $builder) {
             return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
         });
         // Produces: WHERE "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
@@ -361,7 +360,7 @@ You can use subqueries instead of an array of values.
 
     ::
 
-        $builder->orWhereIn('id', function(BaseBuilder $builder) {
+        $builder->orWhereIn('id', function (BaseBuilder $builder) {
             return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
         });
 
@@ -382,7 +381,7 @@ You can use subqueries instead of an array of values.
 
     ::
 
-        $builder->whereNotIn('id', function(BaseBuilder $builder) {
+        $builder->whereNotIn('id', function (BaseBuilder $builder) {
             return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
         });
 
@@ -404,7 +403,7 @@ You can use subqueries instead of an array of values.
 
     ::
 
-        $builder->orWhereNotIn('id', function(BaseBuilder $builder) {
+        $builder->orWhereNotIn('id', function (BaseBuilder $builder) {
             return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
         });
 
@@ -545,7 +544,7 @@ You can use subqueries instead of an array of values.
 
 ::
 
-    $builder->havingIn('id', function(BaseBuilder $builder) {
+    $builder->havingIn('id', function (BaseBuilder $builder) {
         return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
     });
     // Produces: HAVING "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
@@ -565,7 +564,7 @@ You can use subqueries instead of an array of values.
 
 ::
 
-    $builder->orHavingIn('id', function(BaseBuilder $builder) {
+    $builder->orHavingIn('id', function (BaseBuilder $builder) {
         return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
     });
 
@@ -586,7 +585,7 @@ You can use subqueries instead of an array of values.
 
 ::
 
-    $builder->havingNotIn('id', function(BaseBuilder $builder) {
+    $builder->havingNotIn('id', function (BaseBuilder $builder) {
         return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
     });
 
@@ -608,7 +607,7 @@ You can use subqueries instead of an array of values.
 
 ::
 
-    $builder->orHavingNotIn('id', function(BaseBuilder $builder) {
+    $builder->orHavingNotIn('id', function (BaseBuilder $builder) {
         return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
     });
 
diff --git a/user_guide_src/source/database/results.rst b/user_guide_src/source/database/results.rst
index 79445da9e529..e3e573d5c460 100644
--- a/user_guide_src/source/database/results.rst
+++ b/user_guide_src/source/database/results.rst
@@ -20,8 +20,7 @@ loop, like this::
 
     $query = $db->query("YOUR QUERY");
 
-    foreach ($query->getResult() as $row)
-    {
+    foreach ($query->getResult() as $row) {
         echo $row->title;
         echo $row->name;
         echo $row->body;
@@ -34,8 +33,7 @@ as an array of arrays::
 
     $query = $db->query("YOUR QUERY");
 
-    foreach ($query->getResult('array') as $row)
-    {
+    foreach ($query->getResult('array') as $row) {
         echo $row['title'];
         echo $row['name'];
         echo $row['body'];
@@ -50,8 +48,7 @@ instantiate for each result object
 
     $query = $db->query("SELECT * FROM users;");
 
-    foreach ($query->getResult('User') as $user)
-    {
+    foreach ($query->getResult('User') as $user) {
         echo $user->name; // access attributes
         echo $user->reverseName(); // or methods defined on the 'User' class
     }
@@ -66,8 +63,7 @@ loop, like this::
 
     $query = $db->query("YOUR QUERY");
 
-    foreach ($query->getResultArray() as $row)
-    {
+    foreach ($query->getResultArray() as $row) {
         echo $row['title'];
         echo $row['name'];
         echo $row['body'];
@@ -87,8 +83,7 @@ one row, it returns only the first row. The result is returned as an
 
     $row = $query->getRow();
 
-    if (isset($row))
-    {
+    if (isset($row)) {
         echo $row->title;
         echo $row->name;
         echo $row->body;
@@ -117,8 +112,7 @@ Example::
 
     $row = $query->getRowArray();
 
-    if (isset($row))
-    {
+    if (isset($row)) {
         echo $row['title'];
         echo $row['name'];
         echo $row['body'];
@@ -159,8 +153,7 @@ it returns the current row and moves the internal data pointer ahead.
 
     $query = $db->query("YOUR QUERY");
 
-    while ($row = $query->getUnbufferedRow())
-    {
+    while ($row = $query->getUnbufferedRow()) {
         echo $row->title;
         echo $row->name;
         echo $row->body;
@@ -201,16 +194,14 @@ Example::
 
         public function __set($name, $value)
         {
-            if ($name === 'lastLogin')
-            {
+            if ($name === 'lastLogin') {
                 $this->lastLogin = DateTime::createFromFormat('U', $value);
             }
         }
 
         public function __get($name)
         {
-            if (isset($this->$name))
-            {
+            if (isset($this->$name)) {
                 return $this->$name;
             }
         }
@@ -231,8 +222,7 @@ Example::
 
     $rows = $query->getCustomResultObject('User');
 
-    foreach ($rows as $row)
-    {
+    foreach ($rows as $row) {
         echo $row->id;
         echo $row->email;
         echo $row->last_login('Y-m-d');
@@ -249,8 +239,7 @@ Example::
 
     $row = $query->getCustomRowObject(0, 'User');
 
-    if (isset($row))
-    {
+    if (isset($row)) {
         echo $row->email;               // access attributes
         echo $row->last_login('Y-m-d'); // access class methods
     }
@@ -308,8 +297,7 @@ Example::
 
     $query = $thisdb->query('SELECT title FROM my_table');
 
-    foreach ($query->getResult() as $row)
-    {
+    foreach ($query->getResult() as $row) {
         echo $row->title;
     }
 
@@ -327,7 +315,7 @@ This method sets the internal pointer for the next result row to be
 fetched. It is only useful in combination with ``getUnbufferedRow()``.
 
 It accepts a positive integer value, which defaults to 0 and returns
-TRUE on success or FALSE on failure.
+true on success or false on failure.
 
 ::
 
@@ -335,7 +323,7 @@ TRUE on success or FALSE on failure.
     $query->dataSeek(5); // Skip the first 5 rows
     $row = $query->getUnbufferedRow();
 
-.. note:: Not all database drivers support this feature and will return FALSE.
+.. note:: Not all database drivers support this feature and will return false.
     Most notably - you won't be able to use it with PDO.
 
 ***************
@@ -388,7 +376,7 @@ Class Reference
 
         :param	int	$n: Index of the query results row to be returned
         :param	string	$type: Type of the requested result - array, object, or class name
-        :returns:	The requested row or NULL if it doesn't exist
+        :returns:	The requested row or null if it doesn't exist
         :rtype:	mixed
 
         A wrapper for the ``getRowArray()``, ``getRowObject()`` and
@@ -399,7 +387,7 @@ Class Reference
     .. php:method:: getUnbufferedRow([$type = 'object'])
 
         :param	string	$type: Type of the requested result - array, object, or class name
-        :returns:	Next row from the result set or NULL if it doesn't exist
+        :returns:	Next row from the result set or null if it doesn't exist
         :rtype:	mixed
 
         Fetches the next result row and returns it in the
@@ -410,7 +398,7 @@ Class Reference
     .. php:method:: getRowArray([$n = 0])
 
         :param	int	$n: Index of the query results row to be returned
-        :returns:	The requested row or NULL if it doesn't exist
+        :returns:	The requested row or null if it doesn't exist
         :rtype:	array
 
         Returns the requested result row as an associative array.
@@ -420,7 +408,7 @@ Class Reference
     .. php:method:: getRowObject([$n = 0])
 
         :param	int	$n: Index of the query results row to be returned
-                :returns:	The requested row or NULL if it doesn't exist
+                :returns:	The requested row or null if it doesn't exist
         :rtype:	stdClass
 
         Returns the requested result row as an object of type
@@ -432,7 +420,7 @@ Class Reference
 
         :param	int	$n: Index of the results row to return
         :param	string	$class_name: Class name for the resulting row
-        :returns:	The requested row or NULL if it doesn't exist
+        :returns:	The requested row or null if it doesn't exist
         :rtype:	$type
 
         Returns the requested result row as an instance of the
@@ -441,14 +429,14 @@ Class Reference
     .. php:method:: dataSeek([$n = 0])
 
         :param	int	$n: Index of the results row to be returned next
-        :returns:	TRUE on success, FALSE on failure
+        :returns:	true on success, false on failure
         :rtype:	bool
 
         Moves the internal results row pointer to the desired offset.
 
         Usage: see `Result Helper Methods`_.
 
-    .. php:method:: setRow($key[, $value = NULL])
+    .. php:method:: setRow($key[, $value = null])
 
         :param	mixed	$key: Column name or array of key/value pairs
         :param	mixed	$value: Value to assign to the column, $key is a single field name
@@ -459,7 +447,7 @@ Class Reference
     .. php:method:: getNextRow([$type = 'object'])
 
         :param	string	$type: Type of the requested result - array, object, or class name
-        :returns:	Next row of result set, or NULL if it doesn't exist
+        :returns:	Next row of result set, or null if it doesn't exist
         :rtype:	mixed
 
         Returns the next row from the result set.
@@ -467,7 +455,7 @@ Class Reference
     .. php:method:: getPreviousRow([$type = 'object'])
 
         :param	string	$type: Type of the requested result - array, object, or class name
-        :returns:	Previous row of result set, or NULL if it doesn't exist
+        :returns:	Previous row of result set, or null if it doesn't exist
         :rtype:	mixed
 
         Returns the previous row from the result set.
@@ -475,7 +463,7 @@ Class Reference
     .. php:method:: getFirstRow([$type = 'object'])
 
         :param	string	$type: Type of the requested result - array, object, or class name
-        :returns:	First row of result set, or NULL if it doesn't exist
+        :returns:	First row of result set, or null if it doesn't exist
         :rtype:	mixed
 
         Returns the first row from the result set.
@@ -483,7 +471,7 @@ Class Reference
     .. php:method:: getLastRow([$type = 'object'])
 
         :param	string	$type: Type of the requested result - array, object, or class name
-        :returns:	Last row of result set, or NULL if it doesn't exist
+        :returns:	Last row of result set, or null if it doesn't exist
         :rtype:	mixed
 
         Returns the last row from the result set.
diff --git a/user_guide_src/source/database/transactions.rst b/user_guide_src/source/database/transactions.rst
index 014b1f4ce8e5..a3c8ba9f9866 100644
--- a/user_guide_src/source/database/transactions.rst
+++ b/user_guide_src/source/database/transactions.rst
@@ -74,8 +74,7 @@ debugging is turned off, you can manage your own errors like this::
     $this->db->query('ANOTHER QUERY...');
     $this->db->transComplete();
 
-    if ($this->db->transStatus() === FALSE)
-    {
+    if ($this->db->transStatus() === false) {
         // generate an error... or use the log_message() function to log your error
     }
 
@@ -86,7 +85,6 @@ Transactions are enabled by default. If you would like to disable transactions y
 can do so using ``$this->db->transOff()``::
 
     $this->db->transOff();
-
     $this->db->transStart();
     $this->db->query('AN SQL QUERY...');
     $this->db->transComplete();
@@ -100,7 +98,7 @@ Test Mode
 You can optionally put the transaction system into "test mode", which
 will cause your queries to be rolled back -- even if the queries produce
 a valid result. To use test mode simply set the first parameter in the
-``$this->db->transStart()`` function to TRUE::
+``$this->db->transStart()`` function to true::
 
     $this->db->transStart(true); // Query will be rolled back
     $this->db->query('AN SQL QUERY...');
@@ -117,12 +115,9 @@ If you would like to run transactions manually you can do so as follows::
     $this->db->query('ANOTHER QUERY...');
     $this->db->query('AND YET ANOTHER QUERY...');
 
-    if ($this->db->transStatus() === FALSE)
-    {
+    if ($this->db->transStatus() === false) {
         $this->db->transRollback();
-    }
-    else
-    {
+    } else {
         $this->db->transCommit();
     }
 
diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index 13ee31402ef6..aba92fc634b2 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -34,29 +34,27 @@ Creating and Dropping Databases
 **$forge->createDatabase('db_name')**
 
 Permits you to create the database specified in the first parameter.
-Returns TRUE/FALSE based on success or failure::
+Returns true/false based on success or failure::
 
-	if ($forge->createDatabase('my_db'))
-	{
+	if ($forge->createDatabase('my_db')) {
 		echo 'Database created!';
 	}
 
-An optional second parameter set to TRUE will add IF EXISTS statement
+An optional second parameter set to true will add IF EXISTS statement
 or will check if a database exists before create it (depending on DBMS).
 
 ::
 
-	$forge->createDatabase('my_db', TRUE);
+	$forge->createDatabase('my_db', true);
 	// gives CREATE DATABASE IF NOT EXISTS my_db
 	// or will check if a database exists
 
 **$forge->dropDatabase('db_name')**
 
 Permits you to drop the database specified in the first parameter.
-Returns TRUE/FALSE based on success or failure::
+Returns true/false based on success or failure::
 
-	if ($forge->dropDatabase('my_db'))
-	{
+	if ($forge->dropDatabase('my_db')) {
 		echo 'Database deleted!';
 	}
 
@@ -115,8 +113,8 @@ Additionally, the following key/values can be used:
 
 -  unsigned/true : to generate "UNSIGNED" in the field definition.
 -  default/value : to generate a default value in the field definition.
--  null/true : to generate "NULL" in the field definition. Without this,
-   the field will default to "NOT NULL".
+-  null/true : to generate "null" in the field definition. Without this,
+   the field will default to "NOT null".
 -  auto_increment/true : generates an auto_increment flag on the
    field. Note that the field type must be a type that supports this,
    such as integer.
@@ -191,8 +189,8 @@ Adding Keys
 
 Generally speaking, you'll want your table to have Keys. This is
 accomplished with $forge->addKey('field'). The optional second
-parameter set to TRUE will make it a primary key and the third
-parameter set to TRUE will make it a unique key. Note that addKey()
+parameter set to true will make it a primary key and the third
+parameter set to true will make it a unique key. Note that addKey()
 must be followed by a call to createTable().
 
 Multiple column non-primary keys must be sent as an array. Sample output
@@ -200,11 +198,11 @@ below is for MySQL.
 
 ::
 
-	$forge->addKey('blog_id', TRUE);
+	$forge->addKey('blog_id', true);
 	// gives PRIMARY KEY `blog_id` (`blog_id`)
 
-	$forge->addKey('blog_id', TRUE);
-	$forge->addKey('site_id', TRUE);
+	$forge->addKey('blog_id', true);
+	$forge->addKey('site_id', true);
 	// gives PRIMARY KEY `blog_id_site_id` (`blog_id`, `site_id`)
 
 	$forge->addKey('blog_name');
@@ -213,7 +211,7 @@ below is for MySQL.
 	$forge->addKey(['blog_name', 'blog_label']);
 	// gives KEY `blog_name_blog_label` (`blog_name`, `blog_label`)
 
-	$forge->addKey(['blog_id', 'uri'], FALSE, TRUE);
+	$forge->addKey(['blog_id', 'uri'], false, true);
 	// gives UNIQUE KEY `blog_id_uri` (`blog_id`, `uri`)
 
 To make code reading more objective it is also possible to add primary
@@ -251,18 +249,18 @@ with
 	$forge->createTable('table_name');
 	// gives CREATE TABLE table_name
 
-An optional second parameter set to TRUE adds an "IF NOT EXISTS" clause
+An optional second parameter set to true adds an "IF NOT EXISTS" clause
 into the definition
 
 ::
 
-	$forge->createTable('table_name', TRUE);
+	$forge->createTable('table_name', true);
 	// gives CREATE TABLE IF NOT EXISTS table_name
 
 You could also pass optional table attributes, such as MySQL's ``ENGINE``::
 
 	$attributes = ['ENGINE' => 'InnoDB'];
-	$forge->createTable('table_name', FALSE, $attributes);
+	$forge->createTable('table_name', false, $attributes);
 	// produces: CREATE TABLE `table_name` (...) ENGINE = InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci
 
 .. note:: Unless you specify the ``CHARACTER SET`` and/or ``COLLATE`` attributes,
@@ -343,7 +341,7 @@ Examples::
 
 	// Will place the new column at the start of the table definition:
 	$fields = [
-		'preferences' => ['type' => 'TEXT', 'first' => TRUE]
+		'preferences' => ['type' => 'TEXT', 'first' => true]
 	];
 
 Dropping Columns From a Table
@@ -394,7 +392,7 @@ Class Reference
 
 		:param	string	$table: Table name to add the column to
 		:param	array	$field: Column definition(s)
-		:returns:	TRUE on success, FALSE on failure
+		:returns:	true on success, false on failure
 		:rtype:	bool
 
 		Adds a column to a table. Usage:  See `Adding a Column to a Table`_.
@@ -407,11 +405,11 @@ Class Reference
 
                 Adds a field to the set that will be used to create a table. Usage:  See `Adding fields`_.
 
-	.. php:method:: addKey($key[, $primary = FALSE[, $unique = FALSE]])
+	.. php:method:: addKey($key[, $primary = false[, $unique = false]])
 
 		:param	mixed	$key: Name of a key field or an array of fields
-		:param	bool	$primary: Set to TRUE if it should be a primary key or a regular one
-		:param	bool	$unique: Set to TRUE if it should be a unique key or a regular one
+		:param	bool	$primary: Set to true if it should be a primary key or a regular one
+		:param	bool	$unique: Set to true if it should be a unique key or a regular one
 		:returns:	\CodeIgniter\Database\Forge instance (method chaining)
 		:rtype:	\CodeIgniter\Database\Forge
 
@@ -433,21 +431,21 @@ Class Reference
 
 		Adds a unique key to the set that will be used to create a table. Usage:  See `Adding Keys`_.
 
-	.. php:method:: createDatabase($dbName[, $ifNotExists = FALSE])
+	.. php:method:: createDatabase($dbName[, $ifNotExists = false])
 
 		:param	string	$db_name: Name of the database to create
-		:param	string	$ifNotExists: Set to TRUE to add an 'IF NOT EXISTS' clause or check if database exists
-		:returns:	TRUE on success, FALSE on failure
+		:param	string	$ifNotExists: Set to true to add an 'IF NOT EXISTS' clause or check if database exists
+		:returns:	true on success, false on failure
 		:rtype:	bool
 
 		Creates a new database. Usage:  See `Creating and Dropping Databases`_.
 
-	.. php:method:: createTable($table[, $if_not_exists = FALSE[, array $attributes = []]])
+	.. php:method:: createTable($table[, $if_not_exists = false[, array $attributes = []]])
 
 		:param	string	$table: Name of the table to create
-		:param	string	$if_not_exists: Set to TRUE to add an 'IF NOT EXISTS' clause
+		:param	string	$if_not_exists: Set to true to add an 'IF NOT EXISTS' clause
 		:param	string	$attributes: An associative array of table attributes
-		:returns:  Query object on success, FALSE on failure
+		:returns:  Query object on success, false on failure
 		:rtype:	mixed
 
 		Creates a new table. Usage:  See `Creating a table`_.
@@ -456,7 +454,7 @@ Class Reference
 
 		:param	string	$table: Table name
 		:param	mixed	$column_names: Comma-delimited string or an array of column names
-		:returns:	TRUE on success, FALSE on failure
+		:returns:	true on success, false on failure
 		:rtype:	bool
 
 		Drops single or multiple columns from a table. Usage:  See `Dropping Columns From a Table`_.
@@ -464,16 +462,16 @@ Class Reference
 	.. php:method:: dropDatabase($dbName)
 
 		:param	string	$dbName: Name of the database to drop
-		:returns:	TRUE on success, FALSE on failure
+		:returns:	true on success, false on failure
 		:rtype:	bool
 
 		Drops a database. Usage:  See `Creating and Dropping Databases`_.
 
-	.. php:method:: dropTable($table_name[, $if_exists = FALSE])
+	.. php:method:: dropTable($table_name[, $if_exists = false])
 
 		:param	string	$table: Name of the table to drop
-		:param	string	$if_exists: Set to TRUE to add an 'IF EXISTS' clause
-		:returns:	TRUE on success, FALSE on failure
+		:param	string	$if_exists: Set to true to add an 'IF EXISTS' clause
+		:returns:	true on success, false on failure
 		:rtype:	bool
 
 		Drops a table. Usage:  See `Dropping a table`_.
@@ -482,7 +480,7 @@ Class Reference
 
 		:param	string	$table: Table name
 		:param	array	$field: Column definition(s)
-		:returns:	TRUE on success, FALSE on failure
+		:returns:	true on success, false on failure
 		:rtype:	bool
 
 		Modifies a table column. Usage:  See `Modifying a Column in a Table`_.
@@ -491,7 +489,7 @@ Class Reference
 
 		:param	string	$table: Current of the table
 		:param	string	$new_table_name: New name of the table
-		:returns:  Query object on success, FALSE on failure
+		:returns:  Query object on success, false on failure
 		:rtype:	mixed
 
 		Renames a table. Usage:  See `Renaming a table`_.
diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst
index 031c01992e9c..9da3e2d3e9b3 100644
--- a/user_guide_src/source/dbmgmt/migration.rst
+++ b/user_guide_src/source/dbmgmt/migration.rst
@@ -174,12 +174,9 @@ to update the schema::
 		{
 			$migrate = \Config\Services::migrations();
 
-			try
-			{
+			try {
 				$migrate->latest();
-			}
-			catch (\Throwable $e)
-			{
+			} catch (\Throwable $e) {
 				// Do something with the error here...
 			}
 		}
@@ -321,8 +318,8 @@ Class Reference
 		:returns:	``true`` on success, ``false`` on failure
 		:rtype:	bool
 
-		This forces a single file to migrate regardless of order or batches. Method "up" or "down" is detected based on whether it has already been migrated. 
-		
+		This forces a single file to migrate regardless of order or batches. Method "up" or "down" is detected based on whether it has already been migrated.
+
 		.. note:: This method is recommended only for testing and could cause data consistency issues.
 
 	.. php:method:: setNamespace($namespace)
@@ -333,8 +330,7 @@ Class Reference
 
 	  Sets the namespace the library should look for migration files::
 
-	    $migration->setNamespace($namespace)
-	              ->latest();
+	    $migration->setNamespace($namespace)->latest();
 	.. php:method:: setGroup($group)
 
 	  :param  string  $group: database group name.
@@ -343,5 +339,4 @@ Class Reference
 
 	  Sets the group the library should look for migration files::
 
-	    $migration->setGroup($group)
-	              ->latest();
+	    $migration->setGroup($group)->latest();
diff --git a/user_guide_src/source/extending/core_classes.rst b/user_guide_src/source/extending/core_classes.rst
index 6f9a83d9d28c..6d7b0c9a3b64 100644
--- a/user_guide_src/source/extending/core_classes.rst
+++ b/user_guide_src/source/extending/core_classes.rst
@@ -64,8 +64,7 @@ Then  you would modify the ``routes`` service to load your class instead::
 
 	public static function routes(bool $getShared = true)
 	{
-		if ($getShared)
-		{
+		if ($getShared) {
 			return static::getSharedInstance('routes');
 		}
 
@@ -107,6 +106,8 @@ If you need to use a constructor in your class make sure you extend the parent c
         public function __construct()
         {
             parent::__construct();
+
+            // your code here
         }
     }
 
diff --git a/user_guide_src/source/extending/events.rst b/user_guide_src/source/extending/events.rst
index 1ee0e0150b94..f2190ee55473 100644
--- a/user_guide_src/source/extending/events.rst
+++ b/user_guide_src/source/extending/events.rst
@@ -42,7 +42,7 @@ In this example, whenever the **pre_controller** event is executed, an instance
 	Events::on('pre_system', 'SomeClass::someMethod');
 
 	// Use a Closure
-	Events::on('pre_system', function(...$params)
+	Events::on('pre_system', function (...$params)
 	{
 		. . .
 	});
@@ -81,7 +81,7 @@ given the arguments in the same order as defined::
 
 	\CodeIgniter\Events\Events::trigger('some_events', $foo, $bar, $baz);
 
-	Events::on('some_event', function($foo, $bar, $baz) {
+	Events::on('some_event', function ($foo, $bar, $baz) {
 		...
 	});
 
diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index 5bbf71fccdea..8d006197bcfe 100755
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -268,18 +268,18 @@ Miscellaneous Functions
 .. php:function:: function_usable ( $function_name )
 
     :param string $function_name: Function to check for
-    :returns: TRUE if the function exists and is safe to call, FALSE otherwise.
+    :returns: true if the function exists and is safe to call, false otherwise.
     :rtype: bool
 
 .. php:function:: is_cli ()
 
-    :returns: TRUE if the script is being executed from the command line or FALSE otherwise.
+    :returns: true if the script is being executed from the command line or false otherwise.
     :rtype: bool
 
 .. php:function:: is_really_writable ( $file )
 
     :param string $file: The filename being checked.
-    :returns: TRUE if you can write to the file, FALSE otherwise.
+    :returns: true if you can write to the file, false otherwise.
     :rtype: bool
 
 .. php:function:: log_message ($level, $message [, $context])
@@ -287,7 +287,7 @@ Miscellaneous Functions
     :param   string   $level: The level of severity
     :param   string   $message: The message that is to be logged.
     :param   array    $context: An associative array of tags and their values that should be replaced in $message
-    :returns: TRUE if was logged successfully or FALSE if there was a problem logging it
+    :returns: true if was logged successfully or false if there was a problem logging it
     :rtype: bool
 
     Logs a message using the Log Handlers defined in **app/Config/Logger.php**.
@@ -331,14 +331,14 @@ Miscellaneous Functions
         // Go to a named/reverse-routed URI
         return redirect('named_route');
 
-.. php:function:: remove_invisible_characters($str[, $urlEncoded = TRUE])
+.. php:function:: remove_invisible_characters($str[, $urlEncoded = true])
 
     :param    string    $str: Input string
     :param    bool    $urlEncoded: Whether to remove URL-encoded characters as well
     :returns:    Sanitized string
     :rtype:    string
 
-    This function prevents inserting NULL characters between ASCII
+    This function prevents inserting null characters between ASCII
     characters, like Java\\0script.
 
     Example::
@@ -386,7 +386,7 @@ Miscellaneous Functions
 .. php:function:: slash_item ( $item )
 
     :param string $item: Config item name
-    :returns: The configuration item or NULL if the item doesn't exist
+    :returns: The configuration item or null if the item doesn't exist
     :rtype:  string|null
 
     Fetch a config file item with slash appended (if not empty)
@@ -394,7 +394,7 @@ Miscellaneous Functions
 .. php:function:: stringify_attributes ( $attributes [, $js] )
 
     :param   mixed    $attributes: string, array of key value pairs, or object
-    :param   boolean  $js: TRUE if values do not need quotes (Javascript-style)
+    :param   boolean  $js: true if values do not need quotes (Javascript-style)
     :returns: String containing the attribute key/value pairs, comma-separated
     :rtype: string
 
diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst
index b02dce2d77d4..410e58236a8d 100644
--- a/user_guide_src/source/general/errors.rst
+++ b/user_guide_src/source/general/errors.rst
@@ -24,12 +24,9 @@ execution is then sent to the error handler which displays the appropriate error
 
 If you are calling a method that might throw an exception, you can catch that exception using a ``try/catch`` block::
 
-    try
-    {
+    try {
         $user = $userModel->find($id);
-    }
-    catch (\Exception $e)
-    {
+    } catch (\Exception $e) {
         die($e->getMessage());
     }
 
@@ -40,16 +37,14 @@ In the example above, we catch any type of Exception. If we only want to watch f
 a ``UnknownFileException``, we can specify that in the catch parameter. Any other exceptions that are thrown and are
 not child classes of the caught exception will be passed on to the error handler::
 
-    catch (\CodeIgniter\UnknownFileException $e)
-    {
+    catch (\CodeIgniter\UnknownFileException $e) {
         // do something here...
     }
 
 This can be handy for handling the error yourself, or for performing cleanup before the script ends. If you want
 the error handler to function as normal, you can throw a new exception within the catch block::
 
-    catch (\CodeIgniter\UnknownFileException $e)
-    {
+    catch (\CodeIgniter\UnknownFileException $e) {
         // do something here...
 
         throw new \RuntimeException($e->getMessage(), $e->getCode(), $e);
@@ -98,8 +93,7 @@ This is used to signal a 404, Page Not Found error. When thrown, the system will
 If, in ``Config/Routes.php``, you have specified a 404 Override, that will be called instead of the standard
 404 page::
 
-    if (! $page = $pageModel->find($id))
-    {
+    if (! $page = $pageModel->find($id)) {
         throw \CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound();
     }
 
diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst
index 02dd4a017d20..65d63d942631 100644
--- a/user_guide_src/source/general/helpers.rst
+++ b/user_guide_src/source/general/helpers.rst
@@ -122,10 +122,8 @@ functions::
     {
         $needle = is_array($needle) ? $needle : [$needle];
 
-        foreach ($needle as $item)
-        {
-            if (in_array($item, $haystack))
-            {
+        foreach ($needle as $item) {
+            if (in_array($item, $haystack, true)) {
                 return true;
             }
         }
@@ -137,6 +135,7 @@ functions::
     function random_element($array)
     {
         shuffle($array);
+
         return array_pop($array);
     }
 
diff --git a/user_guide_src/source/general/logging.rst b/user_guide_src/source/general/logging.rst
index 32953792a136..6a6ca1e49e0e 100644
--- a/user_guide_src/source/general/logging.rst
+++ b/user_guide_src/source/general/logging.rst
@@ -10,8 +10,7 @@ You can log information to the local log files by using the ``log_message()`` me
 the "level" of the error in the first parameter, indicating what type of message it is (debug, error, etc).
 The second parameter is the message itself::
 
-    if ($some_var == '')
-    {
+    if ($some_var === '') {
         log_message('error', 'Some variable did not contain a value.');
     }
 
@@ -107,12 +106,9 @@ If you want to log an Exception or an Error, you can use the key of 'exception',
 Exception or Error itself. A string will be generated from that object containing the error message, the
 file name and line number. You must still provide the exception placeholder in the message::
 
-    try
-    {
+    try {
         // Something throws error here
-    }
-    catch (\Exception $e)
-    {
+    } catch (\Exception $e) {
         log_message('error', '[ERROR] {exception}', ['exception' => $e]);
     }
 
diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst
index 35d72532670c..b744f30c0441 100644
--- a/user_guide_src/source/general/modules.rst
+++ b/user_guide_src/source/general/modules.rst
@@ -154,8 +154,7 @@ but must be specified within the Routes file itself::
 
 To reduce the amount of typing needed here, the **group** routing feature is helpful::
 
-    $routes->group('blog', ['namespace' => 'Acme\Blog\Controllers'], function($routes)
-    {
+    $routes->group('blog', ['namespace' => 'Acme\Blog\Controllers'], function ($routes) {
         $routes->get('/', 'Blog::index');
     });
 
diff --git a/user_guide_src/source/helpers/array_helper.rst b/user_guide_src/source/helpers/array_helper.rst
index 3ccdee76dd6d..2457790e4ad6 100644
--- a/user_guide_src/source/helpers/array_helper.rst
+++ b/user_guide_src/source/helpers/array_helper.rst
@@ -33,10 +33,10 @@ The following functions are available:
         $data = [
             'foo' => [
                 'buzz' => [
-                    'fizz' => 11
+                    'fizz' => 11,
                 ],
                 'bar' => [
-                    'baz' => 23
+                    'baz' => 23,
                 ]
             ]
         ]
@@ -61,10 +61,10 @@ The following functions are available:
 
         $data = [
             'foo' => [
-                'bar.baz' => 23
+                'bar.baz' => 23,
             ],
             'foo.bar' => [
-                'baz' => 43
+                'baz' => 43,
             ],
         ];
 
diff --git a/user_guide_src/source/helpers/cookie_helper.rst b/user_guide_src/source/helpers/cookie_helper.rst
index 702598d0a0d5..4175bb2b99c4 100755
--- a/user_guide_src/source/helpers/cookie_helper.rst
+++ b/user_guide_src/source/helpers/cookie_helper.rst
@@ -42,7 +42,7 @@ The following functions are available:
 
     :param	string	$index: Cookie name
     :param	bool	$xss_clean: Whether to apply XSS filtering to the returned value
-    :returns:	The cookie value or NULL if not found
+    :returns:	The cookie value or null if not found
     :rtype:	mixed
 
     This helper function gives you friendlier syntax to get browser
diff --git a/user_guide_src/source/helpers/date_helper.rst b/user_guide_src/source/helpers/date_helper.rst
index 2c483668c067..0b7aeead3329 100644
--- a/user_guide_src/source/helpers/date_helper.rst
+++ b/user_guide_src/source/helpers/date_helper.rst
@@ -20,7 +20,7 @@ Available Functions
 
 The following functions are available:
 
-.. php:function:: now([$timezone = NULL])
+.. php:function:: now([$timezone = null])
 
     :param	string	$timezone: Timezone
     :returns:	UNIX timestamp
diff --git a/user_guide_src/source/helpers/filesystem_helper.rst b/user_guide_src/source/helpers/filesystem_helper.rst
index 5cfffae21f33..fc91a70f111e 100644
--- a/user_guide_src/source/helpers/filesystem_helper.rst
+++ b/user_guide_src/source/helpers/filesystem_helper.rst
@@ -22,7 +22,7 @@ Available Functions
 
 The following functions are available:
 
-.. php:function:: directory_map($source_dir[, $directory_depth = 0[, $hidden = FALSE]])
+.. php:function:: directory_map($source_dir[, $directory_depth = 0[, $hidden = false]])
 
     :param	string  $source_dir: Path to the source directory
     :param	int	    $directory_depth: Depth of directories to traverse (0 = fully recursive, 1 = current dir, etc)
@@ -46,7 +46,7 @@ The following functions are available:
     hidden directories will be skipped. To override this behavior, you may
     set a third parameter to true (boolean)::
 
-        $map = directory_map('./mydirectory/', FALSE, TRUE);
+        $map = directory_map('./mydirectory/', false, true);
 
     Each folder name will be an array index, while its contained files will
     be numerically indexed. Here is an example of a typical array::
@@ -91,12 +91,9 @@ The following functions are available:
 
     Example::
 
-        try
-        {     
+        try {     
             directory_mirror($uploadedImages, FCPATH . 'images/');
-        }
-        catch (Throwable $e)
-        {     
+        } catch (Throwable $e) {     
             echo 'Failed to export uploads!';
         }
 
@@ -107,7 +104,7 @@ The following functions are available:
     :param	string	$path: File path
     :param	string	$data: Data to write to file
     :param	string	$mode: ``fopen()`` mode
-    :returns:	TRUE if the write was successful, FALSE in case of an error
+    :returns:	true if the write was successful, false in case of an error
     :rtype:	bool
 
     Writes data to the file specified in the path. If the file does not exist then the
@@ -116,12 +113,10 @@ The following functions are available:
     Example::
 
         $data = 'Some file data';
-        if ( ! write_file('./path/to/file.php', $data))
-        {     
+
+        if ( ! write_file('./path/to/file.php', $data)) {     
             echo 'Unable to write the file';
-        }
-        else
-        {     
+        } else {     
             echo 'File written!';
         }
 
@@ -142,13 +137,13 @@ The following functions are available:
 
     .. note:: This function acquires an exclusive lock on the file while writing to it.
 
-.. php:function:: delete_files($path[, $delDir = FALSE[, $htdocs = FALSE[, $hidden = FALSE]]])
+.. php:function:: delete_files($path[, $delDir = false[, $htdocs = false[, $hidden = false]]])
 
     :param	string	$path: Directory path
     :param	bool	$delDir: Whether to also delete directories
     :param	bool	$htdocs: Whether to skip deleting .htaccess and index page files
     :param  bool    $hidden: Whether to also delete hidden files (files beginning with a period)
-    :returns:	TRUE on success, FALSE in case of an error
+    :returns:	true on success, false in case of an error
     :rtype:	bool
 
     Deletes ALL files contained in the supplied path.
@@ -157,16 +152,16 @@ The following functions are available:
 
         delete_files('./path/to/directory/');
 
-    If the second parameter is set to TRUE, any directories contained within the supplied
+    If the second parameter is set to true, any directories contained within the supplied
     root path will be deleted as well.
 
     Example::
 
-        delete_files('./path/to/directory/', TRUE);
+        delete_files('./path/to/directory/', true);
 
     .. note:: The files must be writable or owned by the system in order to be deleted.
 
-.. php:function:: get_filenames($source_dir[, $include_path = FALSE])
+.. php:function:: get_filenames($source_dir[, $include_path = false])
 
     :param	string	$source_dir: Directory path
     :param	bool|null	$include_path: Whether to include the path as part of the filename; false for no path, null for the path relative to $source_dir, true for the full path
@@ -192,7 +187,7 @@ The following functions are available:
 
     Reads the specified directory and builds an array containing the filenames, filesize,
     dates, and permissions. Sub-folders contained within the specified path are only read
-    if forced by sending the second parameter to FALSE, as this can be an intensive
+    if forced by sending the second parameter to false, as this can be an intensive
     operation.
 
     Example::
@@ -203,7 +198,7 @@ The following functions are available:
 
     :param	string	        $file: File path
     :param	array|string    $returned_values: What type of info to return to be passed as array or comma separated string
-    :returns:	An array containing info on the specified file or FALSE on failure
+    :returns:	An array containing info on the specified file or false on failure
     :rtype:	array
 
     Given a file and path, returns (optionally) the *name*, *path*, *size* and *date modified*
@@ -252,7 +247,7 @@ The following functions are available:
 
         echo same_file($newFile, $oldFile) ? 'Same!' : 'Different!';
 
-.. php:function:: set_realpath($path[, $check_existence = FALSE])
+.. php:function:: set_realpath($path[, $check_existence = false])
 
     :param	string	$path: Path
     :param	bool	$check_existence: Whether to check if the path actually exists
@@ -269,12 +264,12 @@ The following functions are available:
         echo set_realpath($file); // Prints '/etc/php5/apache2/php.ini'
 
         $non_existent_file = '/path/to/non-exist-file.txt';
-        echo set_realpath($non_existent_file, TRUE);	// Shows an error, as the path cannot be resolved
-        echo set_realpath($non_existent_file, FALSE);	// Prints '/path/to/non-exist-file.txt'
+        echo set_realpath($non_existent_file, true);	// Shows an error, as the path cannot be resolved
+        echo set_realpath($non_existent_file, false);	// Prints '/path/to/non-exist-file.txt'
 
         $directory = '/etc/php5';
         echo set_realpath($directory);	// Prints '/etc/php5/'
 
         $non_existent_directory = '/path/to/nowhere';
-        echo set_realpath($non_existent_directory, TRUE);	// Shows an error, as the path cannot be resolved
-        echo set_realpath($non_existent_directory, FALSE);	// Prints '/path/to/nowhere'
+        echo set_realpath($non_existent_directory, true);	// Shows an error, as the path cannot be resolved
+        echo set_realpath($non_existent_directory, false);	// Prints '/path/to/nowhere'
diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst
index f9b37070a652..f54b1166a05e 100644
--- a/user_guide_src/source/helpers/form_helper.rst
+++ b/user_guide_src/source/helpers/form_helper.rst
@@ -151,7 +151,7 @@ The following functions are available:
         $data = [
             'name'  => 'John Doe',
             'email' => 'john@example.com',
-            'url'   => 'http://example.com'
+            'url'   => 'http://example.com',
         ];
 
         echo form_hidden($data);
@@ -169,7 +169,7 @@ The following functions are available:
         $data = [
             'name'  => 'John Doe',
             'email' => 'john@example.com',
-            'url'   => 'http://example.com'
+            'url'   => 'http://example.com',
         ];
 
         echo form_hidden('my_array', $data);
@@ -189,7 +189,7 @@ The following functions are available:
             'name'  => 'email',
             'id'    => 'hiddenemail',
             'value' => 'john@example.com',
-            'class' => 'hiddenemail'
+            'class' => 'hiddenemail',
         ];
 
         echo form_input($data);
@@ -223,7 +223,7 @@ The following functions are available:
             'value'     => 'johndoe',
             'maxlength' => '100',
             'size'      => '50',
-            'style'     => 'width:50%'
+            'style'     => 'width:50%',
         ];
 
         echo form_input($data);
@@ -237,12 +237,12 @@ The following functions are available:
     If you would like your form to contain some additional data, like
     JavaScript, you can pass it as a string in the third parameter::
 
-        $js = 'onClick="some_function()"';
+        $js = 'onClick="some_function ()"';
         echo form_input('username', 'johndoe', $js);
 
     Or you can pass it as an array::
 
-        $js = ['onClick' => 'some_function();'];
+        $js = ['onClick' => 'some_function ();'];
         echo form_input('username', 'johndoe', $js);
 
     To support the expanded range of HTML5 input fields, you can pass an input type in as the fourth parameter::
@@ -442,7 +442,7 @@ The following functions are available:
         echo form_fieldset_close($string);
         // Would produce: </fieldset></div></div>
 
-.. php:function:: form_checkbox([$data = ''[, $value = ''[, $checked = FALSE[, $extra = '']]]])
+.. php:function:: form_checkbox([$data = ''[, $value = ''[, $checked = false[, $extra = '']]]])
 
     :param	array	$data: Field attributes data
     :param	string	$value: Field value
@@ -453,10 +453,10 @@ The following functions are available:
 
     Lets you generate a checkbox field. Simple example::
 
-        echo form_checkbox('newsletter', 'accept', TRUE);
+        echo form_checkbox('newsletter', 'accept', true);
         // Would produce:  <input type="checkbox" name="newsletter" value="accept" checked="checked" />
 
-    The third parameter contains a boolean TRUE/FALSE to determine whether
+    The third parameter contains a boolean true/false to determine whether
     the box should be checked or not.
 
     Similar to the other form functions in this helper, you can also pass an
@@ -466,7 +466,7 @@ The following functions are available:
             'name'    => 'newsletter',
             'id'      => 'newsletter',
             'value'   => 'accept',
-            'checked' => TRUE,
+            'checked' => true,
             'style'   => 'margin:10px'
         ];
 
@@ -478,14 +478,14 @@ The following functions are available:
     fourth parameter::
 
         $js = 'onClick="some_function()"';
-        echo form_checkbox('newsletter', 'accept', TRUE, $js);
+        echo form_checkbox('newsletter', 'accept', true, $js);
 
     Or you can pass it as an array::
 
         $js = ['onClick' => 'some_function();'];
-        echo form_checkbox('newsletter', 'accept', TRUE, $js);
+        echo form_checkbox('newsletter', 'accept', true, $js);
 
-.. php:function:: form_radio([$data = ''[, $value = ''[, $checked = FALSE[, $extra = '']]]])
+.. php:function:: form_radio([$data = ''[, $value = ''[, $checked = false[, $extra = '']]]])
 
     :param	array	$data: Field attributes data
     :param	string	$value: Field value
@@ -573,7 +573,7 @@ The following functions are available:
             'id'      => 'button',
             'value'   => 'true',
             'type'    => 'reset',
-            'content' => 'Reset'
+            'content' => 'Reset',
         ];
 
         echo form_button($data);
@@ -599,7 +599,7 @@ The following functions are available:
         echo form_close($string);
         // Would produce:  </form> </div></div>
 
-.. php:function:: set_value($field[, $default = ''[, $html_escape = TRUE]])
+.. php:function:: set_value($field[, $default = ''[, $html_escape = true]])
 
     :param	string	$field: Field name
     :param	string	$default: Default value
@@ -620,7 +620,7 @@ The following functions are available:
 
     The above form will show "0" when loaded for the first time.
 
-.. php:function:: set_select($field[, $value = ''[, $default = FALSE]])
+.. php:function:: set_select($field[, $value = ''[, $default = false]])
 
     :param	string	$field: Field name
     :param	string	$value: Value to check for
@@ -633,17 +633,17 @@ The following functions are available:
 
     The first parameter must contain the name of the select menu, the second
     parameter must contain the value of each item, and the third (optional)
-    parameter lets you set an item as the default (use boolean TRUE/FALSE).
+    parameter lets you set an item as the default (use boolean true/false).
 
     Example::
 
         <select name="myselect">
-            <option value="one" <?= set_select('myselect', 'one', TRUE) ?>>One</option>
+            <option value="one" <?= set_select('myselect', 'one', true) ?>>One</option>
             <option value="two" <?= set_select('myselect', 'two') ?>>Two</option>
             <option value="three" <?= set_select('myselect', 'three') ?>>Three</option>
         </select>
 
-.. php:function:: set_checkbox($field[, $value = ''[, $default = FALSE]])
+.. php:function:: set_checkbox($field[, $value = ''[, $default = false]])
 
     :param	string	$field: Field name
     :param	string	$value: Value to check for
@@ -655,14 +655,14 @@ The following functions are available:
 
     The first parameter must contain the name of the checkbox, the second
     parameter must contain its value, and the third (optional) parameter
-    lets you set an item as the default (use boolean TRUE/FALSE).
+    lets you set an item as the default (use boolean true/false).
 
     Example::
 
         <input type="checkbox" name="mycheck" value="1" <?= set_checkbox('mycheck', '1') ?> />
         <input type="checkbox" name="mycheck" value="2" <?= set_checkbox('mycheck', '2') ?> />
 
-.. php:function:: set_radio($field[, $value = ''[, $default = FALSE]])
+.. php:function:: set_radio($field[, $value = ''[, $default = false]])
 
     :param	string	$field: Field name
     :param	string	$value: Value to check for
@@ -675,7 +675,7 @@ The following functions are available:
 
     Example::
 
-        <input type="radio" name="myradio" value="1" <?= set_radio('myradio', '1', TRUE) ?> />
+        <input type="radio" name="myradio" value="1" <?= set_radio('myradio', '1', true) ?> />
         <input type="radio" name="myradio" value="2" <?= set_radio('myradio', '2') ?> />
 
     .. note:: If you are using the Form Validation class, you must always specify
diff --git a/user_guide_src/source/helpers/html_helper.rst b/user_guide_src/source/helpers/html_helper.rst
index 72a9ed9640a9..a477b9cbd311 100755
--- a/user_guide_src/source/helpers/html_helper.rst
+++ b/user_guide_src/source/helpers/html_helper.rst
@@ -59,7 +59,7 @@ The following functions are available:
             'width'  => '200',
             'height' => '200',
             'title'  => 'That was quite a night',
-            'rel'    => 'lightbox'
+            'rel'    => 'lightbox',
         ];
 
         img($imageProperties);
@@ -126,7 +126,7 @@ The following functions are available:
             'href'  => 'css/printer.css',
             'rel'   => 'stylesheet',
             'type'  => 'text/css',
-            'media' => 'print'
+            'media' => 'print',
         ];
 
         echo link_tag($link);
@@ -171,12 +171,12 @@ The following functions are available:
             'red',
             'blue',
             'green',
-            'yellow'
+            'yellow',
         ];
 
         $attributes = [
             'class' => 'boldlist',
-            'id'    => 'mylist'
+            'id'    => 'mylist',
         ];
 
         echo ul($list, $attributes);
@@ -196,14 +196,14 @@ The following functions are available:
 
         $attributes = [
             'class' => 'boldlist',
-            'id'    => 'mylist'
+            'id'    => 'mylist',
         ];
 
         $list = [
             'colors' => [
                 'red',
                 'blue',
-                'green'
+                'green',
             ],
             'shapes' => [
                 'round',
@@ -211,8 +211,8 @@ The following functions are available:
                 'circles' => [
                     'ellipse',
                     'oval',
-                    'sphere'
-                ]
+                    'sphere',
+                ],
             ],
             'moods'  => [
                 'happy',
@@ -220,11 +220,11 @@ The following functions are available:
                     'defeated' => [
                         'dejected',
                         'disheartened',
-                        'depressed'
+                        'depressed',
                     ],
                     'annoyed',
                     'cross',
-                    'angry'
+                    'angry',
                 ]
             ]
         ];
@@ -300,30 +300,26 @@ The following functions are available:
     Permits you to generate HTML video element from simple or
     source arrays. Example::
 
-        $tracks =
-        [
+        $tracks = [
             track('subtitles_no.vtt', 'subtitles', 'no', 'Norwegian No'),
             track('subtitles_yes.vtt', 'subtitles', 'yes', 'Norwegian Yes')
         ];
 
         echo video('test.mp4', 'Your browser does not support the video tag.', 'controls');
 
-        echo video
-        (
+        echo video(
             'http://www.codeigniter.com/test.mp4',
             'Your browser does not support the video tag.',
             'controls',
             $tracks
         );
 
-        echo video
-        (
-            [
-              source('movie.mp4', 'video/mp4', 'class="test"'),
-              source('movie.ogg', 'video/ogg'),
-              source('movie.mov', 'video/quicktime'),
-              source('movie.ogv', 'video/ogv; codecs=dirac, speex')
-            ],
+        echo video([
+            source('movie.mp4', 'video/mp4', 'class="test"'),
+            source('movie.ogg', 'video/ogg'),
+            source('movie.mov', 'video/quicktime'),
+            source('movie.ogv', 'video/ogv; codecs=dirac, speex')
+        ],
             'Your browser does not support the video tag.',
             'class="test" controls',
             $tracks
@@ -408,8 +404,7 @@ The following functions are available:
 
         echo object('movie.swf', 'application/x-shockwave-flash', 'class="test"');
 
-        echo object
-        (
+        echo object(
             'movie.swf',
             'application/x-shockwave-flash',
             'class="test"',
diff --git a/user_guide_src/source/helpers/inflector_helper.rst b/user_guide_src/source/helpers/inflector_helper.rst
index f006869d0625..fdc70a4cd92d 100755
--- a/user_guide_src/source/helpers/inflector_helper.rst
+++ b/user_guide_src/source/helpers/inflector_helper.rst
@@ -105,12 +105,12 @@ The following functions are available:
 .. php:function:: is_pluralizable($word)
 
     :param	string	$word: Input string
-    :returns:	TRUE if the word is countable or FALSE if not
+    :returns:	true if the word is countable or false if not
     :rtype:	bool
 
     Checks if the given word has a plural version. Example::
 
-        is_pluralizable('equipment'); // Returns FALSE
+        is_pluralizable('equipment'); // Returns false
 
 .. php:function:: dasherize($string)
 
diff --git a/user_guide_src/source/helpers/text_helper.rst b/user_guide_src/source/helpers/text_helper.rst
index 4e45620b253d..6b875e3d7e36 100755
--- a/user_guide_src/source/helpers/text_helper.rst
+++ b/user_guide_src/source/helpers/text_helper.rst
@@ -72,8 +72,7 @@ The following functions are available:
     Allows two or more items to be alternated between, when cycling through
     a loop. Example::
 
-        for ($i = 0; $i < 10; $i++)
-        {     
+        for ($i = 0; $i < 10; $i++) {     
             echo alternator('string one', 'string two');
         }
 
@@ -82,8 +81,7 @@ The following functions are available:
 
     ::
 
-        for ($i = 0; $i < 10; $i++)
-        {     
+        for ($i = 0; $i < 10; $i++) {     
             echo alternator('one', 'two', 'three', 'four', 'five');
         }
 
@@ -132,7 +130,7 @@ The following functions are available:
         and handle string inputs. This however makes it just an
         alias for ``stripslashes()``.
 
-.. php:function:: reduce_multiples($str[, $character = ''[, $trim = FALSE]])
+.. php:function:: reduce_multiples($str[, $character = ''[, $trim = false]])
 
     :param	string	$str: Text to search in
     :param	string	$character: Character to reduce
@@ -146,11 +144,11 @@ The following functions are available:
         $string = "Fred, Bill,, Joe, Jimmy";
         $string = reduce_multiples($string, ","); // results in "Fred, Bill, Joe, Jimmy"
 
-    If the third parameter is set to TRUE it will remove occurrences of the
+    If the third parameter is set to true it will remove occurrences of the
     character at the beginning and the end of the string. Example::
 
         $string = ",Fred, Bill,, Joe, Jimmy,";
-        $string = reduce_multiples($string, ", ", TRUE); // results in "Fred, Bill, Joe, Jimmy"
+        $string = reduce_multiples($string, ", ", true); // results in "Fred, Bill, Joe, Jimmy"
 
 .. php:function:: quotes_to_entities($str)
 
@@ -234,7 +232,7 @@ The following functions are available:
 
         $string = ascii_to_entities($string);
 
-.. php:function:: entities_to_ascii($str[, $all = TRUE])
+.. php:function:: entities_to_ascii($str[, $all = true])
 
     :param	string	$str: Input string
     :param	bool	$all: Whether to convert unsafe entities as well
diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst
index 1c1ca5866ef8..16cd6e4534df 100644
--- a/user_guide_src/source/helpers/url_helper.rst
+++ b/user_guide_src/source/helpers/url_helper.rst
@@ -17,7 +17,7 @@ Available Functions
 
 The following functions are available:
 
-.. php:function:: site_url([$uri = ''[, $protocol = NULL[, $altConfig = NULL]]])
+.. php:function:: site_url([$uri = ''[, $protocol = null[, $altConfig = null]]])
 
     :param  mixed         $uri: URI string or array of URI segments
     :param  string        $protocol: Protocol, e.g., 'http' or 'https'
@@ -51,7 +51,7 @@ The following functions are available:
     different site than yours, which contains different configuration preferences.
     We use this for unit testing the framework itself.
 
-.. php:function:: base_url([$uri = ''[, $protocol = NULL]])
+.. php:function:: base_url([$uri = ''[, $protocol = null]])
 
     :param  mixed   $uri: URI string or array of URI segments
     :param  string  $protocol: Protocol, e.g., 'http' or 'https'
@@ -127,13 +127,13 @@ The following functions are available:
         /blog/comments/123
 
     Or with the optional relative parameter::
-    
+
         app.baseURL = http://some-site.com/subfolder/
 
         uri_string(); // "/subfolder/blog/comments/123"
         uri_string(true); // "blog/comments/123"
 
-.. php:function:: index_page([$altConfig = NULL])
+.. php:function:: index_page([$altConfig = null])
 
     :param \\Config\\App $altConfig: Alternate configuration to use
     :returns: 'index_page' value
@@ -149,7 +149,7 @@ The following functions are available:
     different site than yours, which contains different configuration preferences.
     We use this for unit testing the framework itself.
 
-.. php:function:: anchor([$uri = ''[, $title = ''[, $attributes = ''[, $altConfig = NULL]]]])
+.. php:function:: anchor([$uri = ''[, $title = ''[, $attributes = ''[, $altConfig = null]]]])
 
     :param  mixed         $uri: URI string or array of URI segments
     :param  string        $title: Anchor title
@@ -194,7 +194,7 @@ The following functions are available:
 
     .. note:: Attributes passed into the anchor function are automatically escaped to protected against XSS attacks.
 
-.. php:function:: anchor_popup([$uri = ''[, $title = ''[, $attributes = FALSE[, $altConfig = NULL]]]])
+.. php:function:: anchor_popup([$uri = ''[, $title = ''[, $attributes = false[, $altConfig = null]]]])
 
     :param  string          $uri: URI string
     :param  string          $title: Anchor title
@@ -219,7 +219,7 @@ The following functions are available:
             'resizable'   => 'yes',
             'screenx'     => 0,
             'screeny'     => 0,
-            'window_name' => '_blank'
+            'window_name' => '_blank',
         ];
 
         echo anchor_popup('news/local/123', 'Click Me!', $atts);
@@ -277,7 +277,7 @@ The following functions are available:
     version of the *mailto* tag using ordinal numbers written with JavaScript to
     help prevent the e-mail address from being harvested by spam bots.
 
-.. php:function:: auto_link($str[, $type = 'both'[, $popup = FALSE]])
+.. php:function:: auto_link($str[, $type = 'both'[, $popup = false]])
 
     :param  string  $str: Input string
     :param  string  $type: Link type ('email', 'url' or 'both')
@@ -304,13 +304,13 @@ The following functions are available:
         $string = auto_link($string, 'email');
 
     The third parameter determines whether links are shown in a new window.
-    The value can be TRUE or FALSE (boolean)::
+    The value can be true or false (boolean)::
 
-        $string = auto_link($string, 'both', TRUE);
+        $string = auto_link($string, 'both', true);
 
     .. note:: The only URLs recognized are those that start with "www." or with "://".
 
-.. php:function:: url_title($str[, $separator = '-'[, $lowercase = FALSE]])
+.. php:function:: url_title($str[, $separator = '-'[, $lowercase = false]])
 
     :param  string  $str: Input string
     :param  string  $separator: Word separator (usually '-' or '_')
@@ -336,15 +336,15 @@ The following functions are available:
         // Produces: Whats_wrong_with_CSS
 
     The third parameter determines whether or not lowercase characters are
-    forced. By default they are not. Options are boolean TRUE/FALSE.
+    forced. By default they are not. Options are boolean true/false.
 
     Example::
 
         $title     = "What's wrong with CSS?";
-        $url_title = url_title($title, '-', TRUE);
+        $url_title = url_title($title, '-', true);
         // Produces: whats-wrong-with-css
 
-.. php:function:: mb_url_title($str[, $separator = '-'[, $lowercase = FALSE]])
+.. php:function:: mb_url_title($str[, $separator = '-'[, $lowercase = false]])
 
     :param  string  $str: Input string
     :param  string  $separator: Word separator (usually '-' or '_')
@@ -358,7 +358,7 @@ The following functions are available:
 .. php:function:: prep_url([$str = ''[, $secure = false]])
 
     :param  string   $str: URL string
-    :param  boolean  $secure: TRUE for https://
+    :param  boolean  $secure: true for https://
     :returns: Protocol-prefixed URL string
     :rtype: string
 
diff --git a/user_guide_src/source/helpers/xml_helper.rst b/user_guide_src/source/helpers/xml_helper.rst
index 72d4b7c5c7a9..4f7ff453384a 100644
--- a/user_guide_src/source/helpers/xml_helper.rst
+++ b/user_guide_src/source/helpers/xml_helper.rst
@@ -22,7 +22,7 @@ Available Functions
 
 The following functions are available:
 
-.. php:function:: xml_convert($str[, $protect_all = FALSE])
+.. php:function:: xml_convert($str[, $protect_all = false])
 
     :param string $str: the text string to convert
     :param bool $protect_all: Whether to protect all content that looks like a potential entity instead of just numbered entities, e.g., &foo;
diff --git a/user_guide_src/source/incoming/content_negotiation.rst b/user_guide_src/source/incoming/content_negotiation.rst
index 0b95b51f9a8c..11940b82092a 100644
--- a/user_guide_src/source/incoming/content_negotiation.rst
+++ b/user_guide_src/source/incoming/content_negotiation.rst
@@ -52,7 +52,7 @@ be able to return data as raw HTML, JSON, or XML. This list should be provided i
     $supported = [
         'application/json',
         'text/html',
-        'application/xml'
+        'application/xml',
     ];
 
     $format = $request->negotiate('media', $supported);
@@ -84,7 +84,7 @@ and German you would do something like::
 
     $supported = [
         'en',
-        'de'
+        'de',
     ];
 
     $lang = $request->negotiate('language', $supported);
diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 8270b1c0701a..49075fc84500 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -224,12 +224,9 @@ be passed as a parameter to the ``_remap()`` method::
 
     public function _remap($method)
     {
-        if ($method === 'some_method')
-        {
+        if ($method === 'some_method') {
             return $this->$method();
-        }
-        else
-        {
+        } else {
             return $this->default_method();
         }
     }
@@ -242,10 +239,11 @@ Example::
     public function _remap($method, ...$params)
     {
         $method = 'process_'.$method;
-        if (method_exists($this, $method))
-        {
+
+        if (method_exists($this, $method)) {
             return $this->$method(...$params);
         }
+
         throw \CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound();
     }
 
@@ -321,8 +319,7 @@ An instance of the :doc:`Logger <../general/logging>` class is available as a cl
 A convenience method for forcing a method to be accessed via HTTPS is available within all
 controllers::
 
-    if (! $this->request->isSecure())
-    {
+    if (! $this->request->isSecure()) {
         $this->forceHTTPS();
     }
 
@@ -330,9 +327,8 @@ By default, and in modern browsers that support the HTTP Strict Transport Securi
 call should force the browser to convert non-HTTPS calls to HTTPS calls for one year. You can
 modify this by passing the duration (in seconds) as the first parameter::
 
-    if (! $this->request->isSecure())
-    {
-        $this->forceHTTPS(31536000);    // one year
+    if (! $this->request->isSecure()) {
+        $this->forceHTTPS(31536000); // one year
     }
 
 .. note:: A number of :doc:`time-based constants </general/common_functions>` are always available for you to use, including YEAR, MONTH, and more.
@@ -367,8 +363,7 @@ rule and message array formats, as well as available rules.::
         if (! $this->validate([
             'email' => "required|is_unique[users.email,id,{$userID}]",
             'name'  => 'required|alpha_numeric_spaces'
-        ]))
-        {
+        ])) {
             return view('users/update', [
                 'errors' => $this->validator->getErrors()
             ]);
@@ -382,8 +377,7 @@ the $rules array with the name of the group as defined in ``Config\Validation.ph
 
     public function updateUser(int $userID)
     {
-        if (! $this->validate('userRules'))
-        {
+        if (! $this->validate('userRules')) {
             return view('users/update', [
                 'errors' => $this->validator->getErrors()
             ]);
diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index ce7ddcbc582b..a95333516503 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -67,8 +67,7 @@ This is typically used to perform redirects, like in this example::
     {
         $auth = service('auth');
 
-        if (! $auth->isLoggedIn())
-        {
+        if (! $auth->isLoggedIn()) {
             return redirect()->to(site_url('login'));
         }
     }
@@ -128,7 +127,7 @@ run on every request. Filters can be specified by adding their alias to either t
         'before' => [
             'csrf',
         ],
-        'after'  => [],
+        'after' => [],
     ];
 
 There are times where you want to apply a filter to almost every request, but have a few that should be left alone.
@@ -140,7 +139,7 @@ an array with the 'except' key and a uri to match as the value alongside the ali
         'before' => [
             'csrf' => ['except' => 'api/*'],
         ],
-        'after'  => [],
+        'after' => [],
     ];
 
 Any place you can use a URI in the filter settings, you can use a regular expression or, like in this example, use
@@ -152,7 +151,7 @@ URI's you can use an array of URI patterns::
         'before' => [
             'csrf' => ['except' => ['foo/*', 'bar/*']],
         ],
-        'after'  => [],
+        'after' => [],
     ];
 
 $methods
diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index 968872c9f218..50b152d5dd14 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -25,8 +25,7 @@ An instance of the request class already populated for you if the current class
     {
         public function index()
         {
-            if ($this->request->isAJAX())
-            {
+            if ($this->request->isAJAX()) {
                 // ...
             }
         }
@@ -63,19 +62,17 @@ A request could be of several types, including an AJAX request or a request from
 be checked with the ``isAJAX()`` and ``isCLI()`` methods::
 
     // Check for AJAX request.
-    if ($request->isAJAX())
-    {
+    if ($request->isAJAX()) {
         // ...
     }
 
     // Check for CLI Request
-    if ($request->isCLI())
-    {
+    if ($request->isCLI()) {
         // ...
     }
 
-.. note:: The ``isAJAX()`` method depends on the ``X-Requested-With`` header, 
-    which in some cases is not sent by default in XHR requests via JavaScript (i.e., fetch). 
+.. note:: The ``isAJAX()`` method depends on the ``X-Requested-With`` header,
+    which in some cases is not sent by default in XHR requests via JavaScript (i.e., fetch).
     See the :doc:`AJAX Requests </general/ajax>` section on how to avoid this problem.
 
 You can check the HTTP method that this request represents with the ``method()`` method::
@@ -91,8 +88,7 @@ uppercase version by wrapping the call in ``str_to_upper()``::
 
 You can also check if the request was made through and HTTPS connection with the ``isSecure()`` method::
 
-    if (! $request->isSecure())
-    {
+    if (! $request->isSecure()) {
         force_https();
     }
 
@@ -106,7 +102,7 @@ will return null if the item doesn't exist, and you can have the data filtered.
 use data without having to test whether an item exists first. In other words, normally you might do something
 like this::
 
-    $something = isset($_POST['foo']) ? $_POST['foo'] : NULL;
+    $something = isset($_POST['foo']) ? $_POST['foo'] : null;
 
 With CodeIgniter’s built in methods you can simply do this::
 
@@ -236,8 +232,7 @@ specified header object in a case-insensitive manner if it exists. If not, then
 
 You can always use ``hasHeader()`` to see if the header existed in this request::
 
-    if ($request->hasHeader('DNT'))
-    {
+    if ($request->hasHeader('DNT')) {
         // Don't track something...
     }
 
@@ -298,8 +293,7 @@ and uses best practices to minimize any security risks.
     $files = $request->getFiles();
 
     // Grab the file by name given in HTML form
-    if ($files->hasFile('uploadedFile'))
-    {
+    if ($files->hasFile('uploadedFile')) {
         $file = $files->getFile('uploadedfile');
 
         // Generate a new secure name
@@ -308,9 +302,9 @@ and uses best practices to minimize any security risks.
         // Move the file to it's new home
         $file->move('/path/to/dir', $name);
 
-        echo $file->getSize('mb');      // 1.23
-        echo $file->getExtension();     // jpg
-        echo $file->getType();          // image/jpg
+        echo $file->getSize('mb'); // 1.23
+        echo $file->getExtension(); // jpg
+        echo $file->getType(); // image/jpg
     }
 
 You can retrieve a single file uploaded on its own, based on the filename given in the HTML file input::
@@ -386,9 +380,9 @@ The methods provided by the parent classes that are available are:
     .. php:method:: getVar([$index = null[, $filter = null[, $flags = null]]])
 
         :param  string  $index: The name of the variable/key to look for.
-        :param  int     $filter: The type of filter to apply. A list of filters can be found 
+        :param  int     $filter: The type of filter to apply. A list of filters can be found
                         `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param  int     $flags: Flags to apply. A list of flags can be found 
+        :param  int     $flags: Flags to apply. A list of flags can be found
                         `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
         :returns:   $_REQUEST if no parameters supplied, otherwise the REQUEST value if found, or null if not
         :rtype: mixed|null
@@ -411,7 +405,7 @@ The methods provided by the parent classes that are available are:
         first parameter to null while setting the second parameter to the filter
         you want to use::
 
-            $request->getVar(null, FILTER_SANITIZE_STRING); 
+            $request->getVar(null, FILTER_SANITIZE_STRING);
             // returns all POST items with string sanitation
 
         To return an array of multiple POST parameters, pass all the required keys as an array::
@@ -426,9 +420,9 @@ The methods provided by the parent classes that are available are:
     .. php:method:: getGet([$index = null[, $filter = null[, $flags = null]]])
 
         :param  string  $index: The name of the variable/key to look for.
-        :param  int     $filter: The type of filter to apply. A list of filters can be 
+        :param  int     $filter: The type of filter to apply. A list of filters can be
                         found `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param  int     $flags: Flags to apply. A list of flags can be found 
+        :param  int     $flags: Flags to apply. A list of flags can be found
                         `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
         :returns:       $_GET if no parameters supplied, otherwise the GET value if found, or null if not
         :rtype: mixed|null
@@ -438,9 +432,9 @@ The methods provided by the parent classes that are available are:
     .. php:method:: getPost([$index = null[, $filter = null[, $flags = null]]])
 
         :param  string  $index: The name of the variable/key to look for.
-        :param  int     $filter: The type of filter to apply. A list of filters can be 
+        :param  int     $filter: The type of filter to apply. A list of filters can be
                         found `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param  int     $flags: Flags to apply. A list of flags can be found 
+        :param  int     $flags: Flags to apply. A list of flags can be found
                         `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
         :returns:       $_POST if no parameters supplied, otherwise the POST value if found, or null if not
         :rtype: mixed|null
@@ -450,9 +444,9 @@ The methods provided by the parent classes that are available are:
     .. php:method:: getPostGet([$index = null[, $filter = null[, $flags = null]]])
 
         :param  string  $index: The name of the variable/key to look for.
-        :param  int     $filter: The type of filter to apply. A list of filters can be 
+        :param  int     $filter: The type of filter to apply. A list of filters can be
                         found `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param  int     $flags: Flags to apply. A list of flags can be found 
+        :param  int     $flags: Flags to apply. A list of flags can be found
                         `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
         :returns:       $_POST if no parameters supplied, otherwise the POST value if found, or null if not
         :rtype: mixed|null
@@ -466,9 +460,9 @@ The methods provided by the parent classes that are available are:
     .. php:method:: getGetPost([$index = null[, $filter = null[, $flags = null]]])
 
         :param  string  $index: The name of the variable/key to look for.
-        :param  int     $filter: The type of filter to apply. A list of filters can be 
+        :param  int     $filter: The type of filter to apply. A list of filters can be
                         found `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param  int     $flags: Flags to apply. A list of flags can be found 
+        :param  int     $flags: Flags to apply. A list of flags can be found
                         `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
         :returns:       $_POST if no parameters supplied, otherwise the POST value if found, or null if not
         :rtype: mixed|null
@@ -483,9 +477,9 @@ The methods provided by the parent classes that are available are:
         :noindex:
 
         :param	mixed	$index: COOKIE name
-        :param  int     $filter: The type of filter to apply. A list of filters can be 
+        :param  int     $filter: The type of filter to apply. A list of filters can be
                         found `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param  int     $flags: Flags to apply. A list of flags can be found 
+        :param  int     $flags: Flags to apply. A list of flags can be found
                         `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
         :returns:	    $_COOKIE if no parameters supplied, otherwise the COOKIE value if found or null if not
         :rtype:	mixed
@@ -507,11 +501,11 @@ The methods provided by the parent classes that are available are:
         :noindex:
 
         :param	mixed	$index: Value name
-        :param  int     $filter: The type of filter to apply. A list of filters can be 
+        :param  int     $filter: The type of filter to apply. A list of filters can be
                         found `here <https://www.php.net/manual/en/filter.filters.php>`__.
-        :param  int     $flags: Flags to apply. A list of flags can be found 
+        :param  int     $flags: Flags to apply. A list of flags can be found
                         `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
-        :returns:	    $_SERVER item value if found, NULL if not
+        :returns:	    $_SERVER item value if found, null if not
         :rtype:	mixed
 
         This method is identical to the ``getPost()``, ``getGet()`` and ``getCookie()``
@@ -527,7 +521,7 @@ The methods provided by the parent classes that are available are:
 
     .. php:method:: getUserAgent([$filter = null])
 
-        :param  int $filter: The type of filter to apply. A list of filters can be 
+        :param  int $filter: The type of filter to apply. A list of filters can be
                     found `here <https://www.php.net/manual/en/filter.filters.php>`__.
         :returns:  The User Agent string, as found in the SERVER data, or null if not found.
         :rtype: mixed
diff --git a/user_guide_src/source/incoming/message.rst b/user_guide_src/source/incoming/message.rst
index 91ebd2ae789c..317f7823b8d2 100644
--- a/user_guide_src/source/incoming/message.rst
+++ b/user_guide_src/source/incoming/message.rst
@@ -123,7 +123,7 @@ Class Reference
     .. php:method:: hasHeader($name)
 
         :param  string  $name: The name of the header you want to see if it exists.
-        :returns: Returns TRUE if it exists, FALSE otherwise.
+        :returns: Returns true if it exists, false otherwise.
         :rtype: bool
 
     .. php:method:: getHeaderLine($name)
diff --git a/user_guide_src/source/incoming/request.rst b/user_guide_src/source/incoming/request.rst
index 7c4df0d5309b..1fdbce30d5ee 100644
--- a/user_guide_src/source/incoming/request.rst
+++ b/user_guide_src/source/incoming/request.rst
@@ -1,5 +1,5 @@
 Request Class
-****************************************************
+*************
 
 The request class is an object-oriented representation of an HTTP request. This is meant to
 work for both incoming, such as a request to the application from a browser, and outgoing requests,
@@ -11,7 +11,7 @@ See the documentation for the :doc:`IncomingRequest Class </incoming/incomingreq
 :doc:`CURLRequest Class </libraries/curlrequest>` for more usage details.
 
 Class Reference
-============================================================
+===============
 
 .. php:class:: CodeIgniter\\HTTP\\Request
 
@@ -46,19 +46,16 @@ Class Reference
 
             ::
 
-                if ( ! $request->isValidIP($ip))
-                {
+                if ( ! $request->isValidIP($ip)) {
                     echo 'Not Valid';
-                }
-                else
-                {
+                } else {
                     echo 'Valid';
                 }
 
         Accepts an optional second string parameter of 'ipv4' or 'ipv6' to specify
         an IP format. The default checks for both formats.
 
-    .. php:method:: getMethod([$upper = FALSE])
+    .. php:method:: getMethod([$upper = false])
 
 		.. important:: Use of the ``$upper`` parameter is deprecated.
 
@@ -70,8 +67,8 @@ Class Reference
         in uppercase or lowercase.
         ::
 
-            echo $request->getMethod(TRUE); // Outputs: POST
-            echo $request->getMethod(FALSE); // Outputs: post
+            echo $request->getMethod(true); // Outputs: POST
+            echo $request->getMethod(false); // Outputs: post
             echo $request->getMethod(); // Outputs: post
 
     .. php:method:: setMethod($method)
@@ -85,7 +82,7 @@ Class Reference
         :param    mixed     $index: Value name
         :param    int       $filter: The type of filter to apply. A list of filters can be found `here <https://www.php.net/manual/en/filter.filters.php>`__.
         :param    int|array $flags: Flags to apply. A list of flags can be found `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
-        :returns: $_SERVER item value if found, NULL if not
+        :returns: $_SERVER item value if found, null if not
         :rtype:   mixed
 
         This method is identical to the ``post()``, ``get()`` and ``cookie()`` methods from the
@@ -104,7 +101,7 @@ Class Reference
         :param    mixed     $index: Value name
         :param    int       $filter: The type of filter to apply. A list of filters can be found `here <https://www.php.net/manual/en/filter.filters.php>`__.
         :param    int|array $flags: Flags to apply. A list of flags can be found `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
-        :returns: $_ENV item value if found, NULL if not
+        :returns: $_ENV item value if found, null if not
         :rtype:   mixed
 
         This method is identical to the ``post()``, ``get()`` and ``cookie()`` methods from the
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 6b8c194d67d1..d03d59ddf263 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -103,7 +103,7 @@ Note that a single ``(:any)`` will match multiple segments in the URL if present
 
 	$routes->add('product/(:any)', 'Catalog::productLookup/$1');
 
-will match product/123, product/123/456, product/123/456/789 and so on. The implementation in the 
+will match product/123, product/123/456, product/123/456/789 and so on. The implementation in the
 Controller should take into account the maximum parameters::
 
     public function productLookup($seg1 = false, $seg2 = false, $seg3 = false) {
@@ -112,7 +112,7 @@ Controller should take into account the maximum parameters::
         echo $seg3; // false in first and second, 789 in third
     }
 
-If matching multiple segments is not the intended behavior, ``(:segment)`` should be used when defining the 
+If matching multiple segments is not the intended behavior, ``(:segment)`` should be used when defining the
 routes. With the examples URLs from above::
 
 	$routes->add('product/(:segment)', 'Catalog::productLookup/$1');
@@ -171,9 +171,9 @@ You can use an anonymous function, or Closure, as the destination that a route m
 executed when the user visits that URI. This is handy for quickly executing small tasks, or even just showing
 a simple view::
 
-    $routes->add('feed', function()
-    {
+    $routes->add('feed', function () {
         $rss = new RSSFeeder();
+
         return $rss->feed('general');
     });
 
@@ -185,7 +185,7 @@ the ``map()`` method. Instead of calling the ``add()`` method for each route tha
 define an array of routes and then pass it as the first parameter to the ``map()`` method::
 
     $routes = [];
-    $routes['product/(:num)']      = 'Catalog::productLookupById';
+    $routes['product/(:num)'] = 'Catalog::productLookupById';
     $routes['product/(:alphanum)'] = 'Catalog::productLookupByName';
 
     $collection->map($routes);
@@ -216,8 +216,7 @@ You can group your routes under a common name with the ``group()`` method. The g
 appears prior to the routes defined inside of the group. This allows you to reduce the typing needed to build out an
 extensive set of routes that all share the opening string, like when building an admin area::
 
-    $routes->group('admin', function($routes)
-    {
+    $routes->group('admin', function ($routes) {
         $routes->add('users', 'Admin\Users::index');
         $routes->add('blog', 'Admin\Blog::index');
     });
@@ -226,8 +225,7 @@ This would prefix the 'users' and 'blog" URIs with "admin", handling URLs like `
 
 If you need to assign options to a group, like a `namespace <#assigning-namespace>`_, do it before the callback::
 
-    $routes->group('api', ['namespace' => 'App\API\v1'], function($routes)
-    {
+    $routes->group('api', ['namespace' => 'App\API\v1'], function ($routes) {
         $routes->resource('users');
     });
 
@@ -236,8 +234,7 @@ This would handle a resource route to the ``App\API\v1\Users`` controller with t
 You can also use a specific `filter <filters.html>`_ for a group of routes. This will always
 run the filter before or after the controller. This is especially handy during authentication or api logging::
 
-    $routes->group('api', ['filter' => 'api-auth'], function($routes)
-    {
+    $routes->group('api', ['filter' => 'api-auth'], function ($routes) {
         $routes->resource('users');
     });
 
@@ -245,21 +242,18 @@ The value for the filter must match one of the aliases defined within ``app/Conf
 
 It is possible to nest groups within groups for finer organization if you need it::
 
-    $routes->group('admin', function($routes)
-    {
-        $routes->group('users', function($routes)
-        {
+    $routes->group('admin', function ($routes) {
+        $routes->group('users', function ($routes) {
             $routes->add('list', 'Admin\Users::list');
         });
-
     });
 
-This would handle the URL at ``admin/users/list``. Note that options passed to the outer ``group()`` (for example 
+This would handle the URL at ``admin/users/list``. Note that options passed to the outer ``group()`` (for example
 ``namespace`` and ``filter``) are not merged with the inner ``group()`` options.
 
-At some point, you may want to group routes for the purpose of applying filters or other route 
-config options like namespace, subdomain, etc. Without necessarily needing to add a prefix to the group, you can pass 
-an empty string in place of the prefix and the routes in the group will be routed as though the group never existed but with the 
+At some point, you may want to group routes for the purpose of applying filters or other route
+config options like namespace, subdomain, etc. Without necessarily needing to add a prefix to the group, you can pass
+an empty string in place of the prefix and the routes in the group will be routed as though the group never existed but with the
 given route config options.
 
 Environment Restrictions
@@ -270,8 +264,7 @@ tools that only the developer can use on their local machines that are not reach
 This can be done with the ``environment()`` method. The first parameter is the name of the environment. Any
 routes defined within this closure are only accessible from the given environment::
 
-    $routes->environment('development', function($routes)
-    {
+    $routes->environment('development', function ($routes) {
         $routes->add('builder', 'Tools\Builder::index');
     });
 
@@ -354,7 +347,7 @@ can modify the generated routes, or further restrict them. The ``$options`` arra
     $routes->match(['get', 'put'], 'from', 'to', $options);
     $routes->resource('photos', $options);
     $routes->map($array, $options);
-    $routes->group('name', $options, function());
+    $routes->group('name', $options, function ());
 
 Applying Filters
 ----------------
@@ -545,7 +538,7 @@ a valid class/method pair, just like you would show in any route, or a Closure::
     $routes->set404Override('App\Errors::show404');
 
     // Will display a custom view
-    $routes->set404Override(function()
+    $routes->set404Override(function ()
     {
         echo view('my_errors/not_found.html');
     });
@@ -563,4 +556,3 @@ For an example of use lowering the priority see :ref:`priority`::
 
     // to disable
     $routes->setPrioritize(false);
-
diff --git a/user_guide_src/source/installation/upgrade_configuration.rst b/user_guide_src/source/installation/upgrade_configuration.rst
index 18908f7a72c2..de8eee5c53c5 100644
--- a/user_guide_src/source/installation/upgrade_configuration.rst
+++ b/user_guide_src/source/installation/upgrade_configuration.rst
@@ -22,16 +22,16 @@ What has been changed
 Upgrade Guide
 =============
 
-1. You have to change the values in the default CI4 config files according to the 
+1. You have to change the values in the default CI4 config files according to the
    changes in the CI3 files. The config names are pretty much the same as in CI3.
-2. If you are using custom config files in your CI3 project you have to create those 
-   files as new php classes in your CI4 project in ``app/Config/``. These classes 
+2. If you are using custom config files in your CI3 project you have to create those
+   files as new php classes in your CI4 project in ``app/Config/``. These classes
    should be in the ``Config`` namespace and should extend ``CodeIgniter\Config\BaseConfig``.
-3. Once you have created all custom config classes, you have to copy the variables 
+3. Once you have created all custom config classes, you have to copy the variables
    from the CI3 config into the new CI4 config class as public class properties.
-4. Now, you have to change the config fetching syntax everywhere you fetch config 
-   values. The CI3 syntax is something like ``$this->config->item('item_name');``. 
-   You have to change this into ``config('MyConfigFile')->item_name;``. Alternatively, 
+4. Now, you have to change the config fetching syntax everywhere you fetch config
+   values. The CI3 syntax is something like ``$this->config->item('item_name');``.
+   You have to change this into ``config('MyConfigFile')->item_name;``. Alternatively,
    you can use the object-oriented approach: ``CodeIgniter\Config\Config::get('MyConfigFile')->item_name;``
 
 Code Example
@@ -54,14 +54,14 @@ Codeigniter Version 4.x
 
 Path: ``app/Config``::
 
-    <?php
+   <?php
 
-    namespace Config;
+   namespace Config;
 
-    use CodeIgniter\Config\BaseConfig;
+   use CodeIgniter\Config\BaseConfig;
 
-    class CustomClass extends BaseConfig
-    {
-        public $siteName  = 'My Great Site';
-        public $siteEmail = 'webmaster@example.com';
-    }
+   class CustomClass extends BaseConfig
+   {
+      public $siteName  = 'My Great Site';
+      public $siteEmail = 'webmaster@example.com';
+   }
diff --git a/user_guide_src/source/installation/upgrade_migrations.rst b/user_guide_src/source/installation/upgrade_migrations.rst
index c0d0446c1412..2124a67d60b0 100644
--- a/user_guide_src/source/installation/upgrade_migrations.rst
+++ b/user_guide_src/source/installation/upgrade_migrations.rst
@@ -57,8 +57,8 @@ Path: ``application/migrations``::
                 'blog_id' => array(
                     'type' => 'INT',
                     'constraint' => 5,
-                    'unsigned' => TRUE,
-                    'auto_increment' => TRUE,
+                    'unsigned' => true,
+                    'auto_increment' => true,
                 ),
                 'blog_title' => array(
                     'type' => 'VARCHAR',
@@ -66,10 +66,10 @@ Path: ``application/migrations``::
                 ),
                 'blog_description' => array(
                     'type' => 'TEXT',
-                    'null' => TRUE,
+                    'null' => true,
                 ),
             ));
-            $this->dbforge->add_key('blog_id', TRUE);
+            $this->dbforge->add_key('blog_id', true);
             $this->dbforge->create_table('blog');
         }
 
@@ -96,18 +96,18 @@ Path: ``app/Database/Migrations``::
         {
             $this->forge->addField([
                 'blog_id' => [
-                        'type'           => 'INT',
-                        'constraint'     => 5,
-                        'unsigned'       => true,
-                        'auto_increment' => true,
+                    'type'           => 'INT',
+                    'constraint'     => 5,
+                    'unsigned'       => true,
+                    'auto_increment' => true,
                 ],
                 'blog_title' => [
-                        'type'       => 'VARCHAR',
-                        'constraint' => '100',
+                    'type'       => 'VARCHAR',
+                    'constraint' => '100',
                 ],
                 'blog_description' => [
-                        'type' => 'TEXT',
-                        'null' => true,
+                    'type' => 'TEXT',
+                    'null' => true,
                 ],
             ]);
             $this->forge->addKey('blog_id', true);
diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst
index 87d213839f5f..6f373e9aafa4 100644
--- a/user_guide_src/source/libraries/caching.rst
+++ b/user_guide_src/source/libraries/caching.rst
@@ -19,8 +19,7 @@ The following example shows a common usage pattern within your controllers.
 
 ::
 
-    if (! $foo = cache('foo'))
-    {
+    if (! $foo = cache('foo')) {
         echo 'Saving to the cache!<br />';
         $foo = 'foobarbaz!';
 
@@ -93,7 +92,7 @@ Class Reference
     :rtype: mixed
 
     This method will attempt to fetch an item from the cache store. If the
-    item does not exist, the method will return NULL.
+    item does not exist, the method will return null.
 
     Example::
 
@@ -106,7 +105,7 @@ Class Reference
     :param Closure $callback: Callback to invoke when the cache item returns null
     :returns: The value of the cache item
     :rtype: mixed
-    
+
     Gets an item from the cache. If ``null`` was returned, this will invoke the callback
     and save the result. Either way, this will return the value.
 
@@ -136,7 +135,7 @@ Class Reference
     :rtype: bool
 
     This method will delete a specific item from the cache store. If item
-    deletion fails, the method will return FALSE.
+    deletion fails, the method will return false.
 
     Example::
 
@@ -174,7 +173,7 @@ Class Reference
     Example::
 
         // 'iterator' has a value of 2
-        $cache->increment('iterator');    // 'iterator' is now 3
+        $cache->increment('iterator'); // 'iterator' is now 3
         $cache->increment('iterator', 3); // 'iterator' is now 6
 
 .. php:method:: decrement($key[, $offset = 1]): mixed
@@ -189,7 +188,7 @@ Class Reference
     Example::
 
         // 'iterator' has a value of 6
-        $cache->decrement('iterator');    // 'iterator' is now 5
+        $cache->decrement('iterator'); // 'iterator' is now 5
         $cache->decrement('iterator', 2); // 'iterator' is now 3
 
 .. php:method:: clean()
@@ -198,7 +197,7 @@ Class Reference
     :rtype: bool
 
     This method will 'clean' the entire cache. If the deletion of the
-    cache files fails, the method will return FALSE.
+    cache files fails, the method will return false.
 
     Example::
 
diff --git a/user_guide_src/source/libraries/curlrequest.rst b/user_guide_src/source/libraries/curlrequest.rst
index 6b5d15dea487..08dc0c0a41c9 100644
--- a/user_guide_src/source/libraries/curlrequest.rst
+++ b/user_guide_src/source/libraries/curlrequest.rst
@@ -34,7 +34,7 @@ The options are described later in this document::
 
 	$options = [
 		'baseURI' => 'http://example.com/api/v1/',
-		'timeout'  => 3
+		'timeout'  => 3,
 	];
 	$client = \Config\Services::curlrequest($options);
 
@@ -67,7 +67,7 @@ a Response instance to you. This takes the HTTP method, the url and an array of
 	$client = \Config\Services::curlrequest();
 
 	$response = $client->request('GET', 'https://api.github.com/user', [
-		'auth' => ['user', 'pass']
+		'auth' => ['user', 'pass'],
 	]);
 
 Since the response is an instance of ``CodeIgniter\HTTP\Response`` you have all of the normal information
@@ -97,7 +97,7 @@ set a base URI, and then make all requests with that client using relative URLs.
 when working with APIs::
 
 	$client = \Config\Services::curlrequest([
-		'baseURI' => 'https://example.com/api/v1/'
+		'baseURI' => 'https://example.com/api/v1/',
 	]);
 
 	// GET http:example.com/api/v1/photos
@@ -130,8 +130,8 @@ methods. The most commonly used methods let you determine the response itself.
 
 You can get the status code and reason phrase of the response::
 
-	$code   = $response->getStatusCode();    // 200
-	$reason = $response->getReason();      // OK
+	$code   = $response->getStatusCode(); // 200
+	$reason = $response->getReason(); // OK
 
 You can retrieve headers from the response::
 
@@ -139,8 +139,7 @@ You can retrieve headers from the response::
 	echo $response->getHeaderLine('Content-Type');
 
 	// Get all headers
-	foreach ($response->getHeaders() as $name => $value)
-	{
+	foreach ($response->getHeaders() as $name => $value) {
 		echo $name .': '. $response->getHeaderLine($name) ."\n";
 	}
 
@@ -151,8 +150,7 @@ The body can be retrieved using the ``getBody()`` method::
 The body is the raw body provided by the remote getServer. If the content type requires formatting, you will need
 to ensure that your script handles that::
 
-	if (strpos($response->getHeader('content-type'), 'application/json') !== false)
-	{
+	if (strpos($response->getHeader('content-type'), 'application/json') !== false) {
 		$body = json_decode($body);
 	}
 
@@ -208,8 +206,7 @@ body
 There are two ways to set the body of the request for request types that support them, like PUT, OR POST.
 The first way is to use the ``setBody()`` method::
 
-	$client->setBody($body)
-	       ->request('put', 'http://example.com');
+	$client->setBody($body) ->request('put', 'http://example.com');
 
 The second method is by passing a ``body`` option in. This is provided to maintain Guzzle API compatibility,
 and functions the exact same way as the previous example. The value must be a string::
@@ -275,8 +272,8 @@ if it's not already set::
 	$client->request('POST', '/post', [
 		'form_params' => [
 			'foo' => 'bar',
-			'baz' => ['hi', 'there']
-		]
+			'baz' => ['hi', 'there'],
+		],
 	]);
 
 .. note:: ``form_params`` cannot be used with the ``multipart`` option. You will need to use one or the other.
@@ -294,8 +291,8 @@ representing the header field values::
 		'headers' => [
 			'User-Agent' => 'testing/1.0',
 			'Accept'     => 'application/json',
-			'X-Foo'      => ['Bar', 'Baz']
-		]
+			'X-Foo'      => ['Bar', 'Baz'],
+		],
 	]);
 
 If headers are passed into the constructor they are treated as default values that will be overridden later by any
@@ -337,7 +334,7 @@ has been disabled. Any files that you want to send must be passed as instances o
 
 	$post_data = [
 		'foo'      => 'bar',
-		'userfile' => new \CURLFile('/path/to/file.txt')
+		'userfile' => new \CURLFile('/path/to/file.txt'),
 	];
 
 .. note:: ``multipart`` cannot be used with the ``form_params`` option. You can only use one or the other. Use
diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index f92be8500db6..55604ad6bbee 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -128,24 +128,24 @@ Preference          Default Value          Options                      Descript
 **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.
+**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
                                                                         ``STARTTLS`` command to the server. Connection on port 465 should
                                                                         set this to blank.
-**wordWrap**        TRUE                   TRUE or FALSE (boolean)      Enable word-wrap.
+**wordWrap**        true                   true or false (boolean)      Enable word-wrap.
 **wrapChars**       76                                                  Character count to wrap at.
 **mailType**        text                   text or html                 Type of mail. If you send HTML email you must send it as a complete web
                                                                         page. Make sure you don't have any relative links or relative image
                                                                         paths otherwise they will not work.
 **charset**         utf-8                                               Character set (utf-8, iso-8859-1, etc.).
-**validate**        TRUE                   TRUE or FALSE (boolean)      Whether to validate the email address.
+**validate**        true                   true or false (boolean)      Whether to validate the email address.
 **priority**        3                      1, 2, 3, 4, 5                Email Priority. 1 = highest. 5 = lowest. 3 = normal.
 **CRLF**            \\n                    "\\r\\n" or "\\n" or "\\r"   Newline character. (Use "\\r\\n" to comply with RFC 822).
 **newline**         \\n                    "\\r\\n" or "\\n" or "\\r"   Newline character. (Use "\\r\\n" to comply with RFC 822).
-**BCCBatchMode**    FALSE                  TRUE or FALSE (boolean)      Enable BCC Batch Mode.
+**BCCBatchMode**    false                  true or false (boolean)      Enable BCC Batch Mode.
 **BCCBatchSize**    200                    None                         Number of emails in each BCC batch.
-**DSN**             FALSE                  TRUE or FALSE (boolean)      Enable notify message from server
+**DSN**             false                  true or false (boolean)      Enable notify message from server
 =================== ====================== ============================ =======================================================================
 
 Overriding Word Wrapping
@@ -320,7 +320,7 @@ Class Reference
 				$email->send();
 			}
 
-		If you set the parameter to TRUE any attachments will be cleared as
+		If you set the parameter to true any attachments will be cleared as
 		well::
 
 			$email->clear(true);
@@ -328,10 +328,10 @@ Class Reference
 	.. php:method:: send($autoClear = true)
 
 		:param	bool	$autoClear: Whether to clear message data automatically
-		:returns:	TRUE on success, FALSE on failure
+		:returns:	true on success, false on failure
 		:rtype:	bool
 
-		The e-mail sending method. Returns boolean TRUE or FALSE based on
+		The e-mail sending method. Returns boolean true or false based on
 		success or failure, enabling it to be used conditionally::
 
 			if (! $email->send())
@@ -340,7 +340,7 @@ Class Reference
 			}
 
 		This method will automatically clear all parameters if the request was
-		successful. To stop this behaviour pass FALSE::
+		successful. To stop this behaviour pass false::
 
 			if ($email->send(false))
 			{
@@ -352,7 +352,7 @@ Class Reference
 
 		.. note:: If ``BCCBatchMode`` is enabled, and there are more than
 			``BCCBatchSize`` recipients, this method will always return
-			boolean ``TRUE``.
+			boolean ``true``.
 
 	.. php:method:: attach($filename[, $disposition = ''[, $newname = null[, $mime = '']]])
 
@@ -395,7 +395,7 @@ Class Reference
 	.. php:method:: setAttachmentCID($filename)
 
 		:param	string	$filename: Existing attachment filename
-		:returns:	Attachment Content-ID or FALSE if not found
+		:returns:	Attachment Content-ID or false if not found
 		:rtype:	string
 
 		Sets and returns an attachment's Content-ID, which enables your to embed an inline
@@ -404,8 +404,8 @@ Class Reference
 
 			$filename = '/img/photo1.jpg';
 			$email->attach($filename);
-			foreach ($list as $address)
-			{
+
+			foreach ($list as $address) {
 				$email->setTo($address);
 				$cid = $email->setAttachmentCID($filename);
 				$email->setMessage('<img src="cid:'. $cid .'" alt="photo1" />');
@@ -428,7 +428,7 @@ Class Reference
 
 		Example::
 
-			// You need to pass FALSE while sending in order for the email data
+			// You need to pass false while sending in order for the email data
 			// to not be cleared - if that happens, printDebugger() would have
 			// nothing to output.
 			$email->send(false);
diff --git a/user_guide_src/source/libraries/files.rst b/user_guide_src/source/libraries/files.rst
index e6482642d698..9b29767d4d19 100644
--- a/user_guide_src/source/libraries/files.rst
+++ b/user_guide_src/source/libraries/files.rst
@@ -36,12 +36,10 @@ Once you have an instance, you have the full power of the SplFileInfo class at t
     echo $file->getPerms();
 
     // Write CSV rows to it.
-    if ($file->isWritable())
-    {
+    if ($file->isWritable()) {
         $csv = $file->openFile('w');
 
-        foreach ($rows as $row)
-        {
+        foreach ($rows as $row) {
             $csv->fputcsv($row);
         }
     }
@@ -63,16 +61,16 @@ method. This is especially useful to rename files when moving it so that the fil
 
 Returns the size of the uploaded file in bytes::
 
-	$size     = $file->getSize();      // 256901
+	$size     = $file->getSize(); // 256901
 
 **getSizeByUnit()**
 
 Returns the size of the uploaded file default in bytes. You can pass in either 'kb' or 'mb' as the first parameter to get
 the results in kilobytes or megabytes, respectively::
 
-	$bytes     = $file->getSizeByUnit();      // 256901
-	$kilobytes = $file->getSizeByUnit('kb');  // 250.880
-	$megabytes = $file->getSizeByUnit('mb');  // 0.245
+	$bytes     = $file->getSizeByUnit(); // 256901
+	$kilobytes = $file->getSizeByUnit('kb'); // 250.880
+	$megabytes = $file->getSizeByUnit('mb'); // 0.245
 
 **getMimeType()**
 
diff --git a/user_guide_src/source/libraries/honeypot.rst b/user_guide_src/source/libraries/honeypot.rst
index ec780ea2218b..959a2278178e 100644
--- a/user_guide_src/source/libraries/honeypot.rst
+++ b/user_guide_src/source/libraries/honeypot.rst
@@ -18,15 +18,15 @@ To enable a Honeypot, changes have to be made to the ``app/Config/Filters.php``.
 from the ``$globals`` array, like...::
 
     public $globals = [
-            'before' => [
-                'honeypot'
-                // 'csrf',
-            ],
-            'after'  => [
-                'toolbar',
-                'honeypot'
-            ]
-        ];
+        'before' => [
+            'honeypot'
+            // 'csrf',
+        ],
+        'after' => [
+            'toolbar',
+            'honeypot',
+        ],
+    ];
 
 A sample Honeypot filter is bundled, as ``system/Filters/Honeypot.php``.
 If it is not suitable, make your own at ``app/Filters/Honeypot.php``,
diff --git a/user_guide_src/source/libraries/images.rst b/user_guide_src/source/libraries/images.rst
index 7dc782c15902..d22f3eba9af6 100644
--- a/user_guide_src/source/libraries/images.rst
+++ b/user_guide_src/source/libraries/images.rst
@@ -135,9 +135,7 @@ error upon failure, like this::
             ->withFile('/path/to/image/mypic.jpg')
             ->fit(100, 100, 'center')
             ->save('/path/to/image/mypic_thumb.jpg');
-	}
-	catch (CodeIgniter\Images\ImageException $e)
-	{
+	} catch (CodeIgniter\Images\ImageException $e) {
 		echo $e->getMessage();
 	}
 
diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index c575579d2169..dc5b605c8d72 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -90,7 +90,7 @@ methods to keep the data separate::
         $data = [
             'users' => $userModel->paginate(10, 'group1'),
             'pages' => $pageModel->paginate(15, 'group2'),
-            'pager' => $userModel->pager
+            'pager' => $userModel->pager,
         ];
 
         echo view('users/index', $data);
@@ -189,7 +189,7 @@ that is used by editing **app/Config/Pager.php**::
 
     public $templates = [
         'default_full'   => 'CodeIgniter\Pager\Views\default_full',
-        'default_simple' => 'CodeIgniter\Pager\Views\default_simple'
+        'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
     ];
 
 This setting stores the alias and :doc:`namespaced view paths </outgoing/views>` for the view that
@@ -304,7 +304,7 @@ title, which is just the number, and a boolean that tells whether the link is th
 	$link = [
 		'active' => false,
 		'uri'    => 'http://example.com/foo?page=2',
-		'title'  => 1
+		'title'  => 1,
 	];
 
 In the code presented for the standard pagination structure, the methods ``getPrevious()`` and ``getNext()`` are used to obtain the links to the previous and next pagination groups respectively.
diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index b52b7aafeb21..0e4d540dd899 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -28,9 +28,9 @@ and enabling the `csrf` filter globally::
 
 	public $globals = [
 		'before' => [
-			//'honeypot'
-			'csrf'
-		]
+			// 'honeypot',
+			'csrf',
+		],
 	];
 
 Select URIs can be whitelisted from CSRF protection (for example API
@@ -39,16 +39,16 @@ by adding them as exceptions in the filter::
 
 	public $globals = [
 		'before' => [
-			'csrf' => ['except' => ['api/record/save']]
-		]
+			'csrf' => ['except' => ['api/record/save']],
+		],
 	];
 
 Regular expressions are also supported (case-insensitive)::
 
     public $globals = [
 		'before' => [
-			'csrf' => ['except' => ['api/record/[0-9]+']]
-		]
+			'csrf' => ['except' => ['api/record/[0-9]+']],
+		],
 	];
 
 If you use the :doc:`form helper <../helpers/form_helper>`, then
diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
index 2020430012aa..ac4a20719b8c 100644
--- a/user_guide_src/source/libraries/sessions.rst
+++ b/user_guide_src/source/libraries/sessions.rst
@@ -145,7 +145,7 @@ variable, you will do this::
 
 	$name = $session->get('name');
 
-.. note:: The ``get()`` method returns NULL if the item you are trying
+.. note:: The ``get()`` method returns null if the item you are trying
 	to access does not exist.
 
 If you want to retrieve all of the existing userdata, you can simply
@@ -180,7 +180,7 @@ an example::
 	$newdata = [
 		'username'  => 'johndoe',
 		'email'     => 'johndoe@some-site.com',
-		'logged_in' => TRUE
+		'logged_in' => true,
 	];
 
 	$session->set($newdata);
@@ -193,8 +193,8 @@ supports this syntax::
 If you want to verify that a session value exists, simply check with
 ``isset()``::
 
-	// returns FALSE if the 'some_name' item doesn't exist or is NULL,
-	// TRUE otherwise:
+	// returns false if the 'some_name' item doesn't exist or is null,
+	// true otherwise:
 	isset($_SESSION['some_name'])
 
 Or you can call ``has()``::
@@ -287,7 +287,7 @@ Or to get an array with all flashdata, simply omit the key parameter::
 
 	$session->getFlashdata();
 
-.. note:: The ``getFlashdata()`` method returns NULL if the item cannot be
+.. note:: The ``getFlashdata()`` method returns null if the item cannot be
 	found.
 
 If you find that you need to preserve a flashdata variable through an
@@ -325,7 +325,7 @@ you want them all to have the same expiry time or not::
 	// will do so after only 240 seconds
 	$session->markAsTempdata([
 		'item'	=> 300,
-		'item2'	=> 240
+		'item2'	=> 240,
 	]);
 
 To add tempdata::
@@ -339,8 +339,8 @@ Or alternatively, using the ``setTempdata()`` method::
 
 You can also pass an array to ``setTempdata()``::
 
-	$tempdata = ['newuser' => TRUE, 'message' => 'Thanks for joining!'];
-	$session->setTempdata($tempdata, NULL, $expire);
+	$tempdata = ['newuser' => true, 'message' => 'Thanks for joining!'];
+	$session->setTempdata($tempdata, null, $expire);
 
 .. note:: If the expiration is omitted or set to 0, the default
 	time-to-live value of 300 seconds (or 5 minutes) will be used.
@@ -363,7 +363,7 @@ And of course, if you want to retrieve all existing tempdata::
 
 	$session->getTempdata();
 
-.. note:: The ``getTempdata()`` method returns NULL if the item cannot be
+.. note:: The ``getTempdata()`` method returns null if the item cannot be
 	found.
 
 If you need to remove a tempdata value before it expires, you can directly
@@ -441,14 +441,14 @@ Preference                     Default                                      Opti
 **sessionCookieName**          ci_session                                   [A-Za-z\_-] characters only                       The name used for the session cookie.
 **sessionExpiration**          7200 (2 hours)                               Time in seconds (integer)                         The number of seconds you would like the session to last.
                                                                                                                               If you would like a non-expiring session (until browser is closed) set the value to zero: 0
-**sessionSavePath**            NULL                                         None                                              Specifies the storage location, depends on the driver being used.
-**sessionMatchIP**             FALSE                                        TRUE/FALSE (boolean)                              Whether to validate the user's IP address when reading the session cookie.
+**sessionSavePath**            null                                         None                                              Specifies the storage location, depends on the driver being used.
+**sessionMatchIP**             false                                        true/false (boolean)                              Whether to validate the user's IP address when reading the session cookie.
                                                                                                                               Note that some ISPs dynamically changes the IP, so if you want a non-expiring session you
-                                                                                                                              will likely set this to FALSE.
+                                                                                                                              will likely set this to false.
 **sessionTimeToUpdate**        300                                          Time in seconds (integer)                         This option controls how often the session class will regenerate itself and create a new
                                                                                                                               session ID. Setting it to 0 will disable session ID regeneration.
-**sessionRegenerateDestroy**   FALSE                                        TRUE/FALSE (boolean)                              Whether to destroy session data associated with the old session ID when auto-regenerating
-                                                                                                                              the session ID. When set to FALSE, the data will be later deleted by the garbage collector.
+**sessionRegenerateDestroy**   false                                        true/false (boolean)                              Whether to destroy session data associated with the old session ID when auto-regenerating
+                                                                                                                              the session ID. When set to false, the data will be later deleted by the garbage collector.
 ============================== ============================================ ================================================= ============================================================================================
 
 .. note:: As a last resort, the Session library will try to fetch PHP's
@@ -579,10 +579,10 @@ And then of course, create the database table ...
 For MySQL::
 
 	CREATE TABLE IF NOT EXISTS `ci_sessions` (
-		`id` varchar(128) NOT NULL,
-		`ip_address` varchar(45) NOT NULL,
-		`timestamp` timestamp DEFAULT CURRENT_TIMESTAMP NOT NULL,
-		`data` blob NOT NULL,
+		`id` varchar(128) NOT null,
+		`ip_address` varchar(45) NOT null,
+		`timestamp` timestamp DEFAULT CURRENT_TIMESTAMP NOT null,
+		`data` blob NOT null,
 		KEY `ci_sessions_timestamp` (`timestamp`)
 	);
 
@@ -600,10 +600,10 @@ For PostgreSQL::
 You will also need to add a PRIMARY KEY **depending on your 'sessionMatchIP'
 setting**. The examples below work both on MySQL and PostgreSQL::
 
-	// When sessionMatchIP = TRUE
+	// When sessionMatchIP = true
 	ALTER TABLE ci_sessions ADD PRIMARY KEY (id, ip_address);
 
-	// When sessionMatchIP = FALSE
+	// When sessionMatchIP = false
 	ALTER TABLE ci_sessions ADD PRIMARY KEY (id);
 
 	// To drop a previously created primary key (use when changing the setting)
diff --git a/user_guide_src/source/libraries/throttler.rst b/user_guide_src/source/libraries/throttler.rst
index cdefb935ba1d..22d7829899cd 100644
--- a/user_guide_src/source/libraries/throttler.rst
+++ b/user_guide_src/source/libraries/throttler.rst
@@ -67,8 +67,7 @@ along the lines of::
          * This is a demo implementation of using the Throttler class
          * to implement rate limiting for your application.
          *
-         * @param RequestInterface|\CodeIgniter\HTTP\IncomingRequest $request
-         * @param array|null                                         $arguments
+         * @param array|null $arguments
          *
          * @return mixed
          */
@@ -79,8 +78,7 @@ along the lines of::
             // Restrict an IP address to no more
             // than 1 request per second across the
             // entire site.
-            if ($throttler->check($request->getIPAddress(), 60, MINUTE) === false)
-            {
+            if ($throttler->check($request->getIPAddress(), 60, MINUTE) === false) {
                 return Services::response()->setStatusCode(429);
             }
         }
@@ -88,9 +86,7 @@ along the lines of::
         /**
          * We don't have anything to do here.
          *
-         * @param RequestInterface|\CodeIgniter\HTTP\IncomingRequest $request
-         * @param ResponseInterface|\CodeIgniter\HTTP\Response       $response
-         * @param array|null                                         $arguments
+         * @param array|null $arguments
          *
          * @return mixed
          */
@@ -116,13 +112,13 @@ filter::
 
 	public $aliases = [
 		...
-		'throttle' => \App\Filters\Throttle::class
+		'throttle' => \App\Filters\Throttle::class,
 	];
 
 Next, we assign it to all POST requests made on the site::
 
     public $methods = [
-        'post' => ['throttle', 'CSRF']
+        'post' => ['throttle', 'CSRF'],
     ];
 
 And that's all there is to it. Now all POST requests made on the site will have to be rate limited.
@@ -137,7 +133,7 @@ Class Reference
     :param int $capacity: The number of tokens the bucket holds
     :param int $seconds: The number of seconds it takes for a bucket to completely fill
     :param int $cost: The number of tokens that are spent on this action
-    :returns: TRUE if action can be performed, FALSE if not
+    :returns: true if action can be performed, false if not
     :rtype: bool
 
     Checks to see if there are any tokens left within the bucket, or if too many have
@@ -149,7 +145,7 @@ Class Reference
     :returns: The number of seconds until another token should be available.
     :rtype: integer
 
-    After ``check()`` has been run and returned FALSE, this method can be used
+    After ``check()`` has been run and returned false, this method can be used
     to determine the time until a new token should be available and the action can be
     tried again. In this case, the minimum enforced wait time is one second.
 
diff --git a/user_guide_src/source/libraries/time.rst b/user_guide_src/source/libraries/time.rst
index d964892eb91c..12f3a9f38e7e 100644
--- a/user_guide_src/source/libraries/time.rst
+++ b/user_guide_src/source/libraries/time.rst
@@ -85,8 +85,8 @@ Given separate inputs for **year**, **month**, and **day**, will return a new in
 are not provided, it will use the current value to fill it in. Accepts strings for the timezone and locale in the
 fourth and fifth parameters::
 
-    $today       = Time::createFromDate();            // Uses current year, month, and day
-    $anniversary = Time::createFromDate(2018);  // Uses current month and day
+    $today       = Time::createFromDate(); // Uses current year, month, and day
+    $anniversary = Time::createFromDate(2018); // Uses current month and day
     $date        = Time::createFromDate(2018, 3, 15, 'America/Chicago', 'en_US');
 
 createFromTime()
@@ -96,8 +96,8 @@ Like **createFromDate** except it is only concerned with the **hours**, **minute
 current day for the date portion of the Time instance. Accepts strings for the timezone and locale in the
 fourth and fifth parameters::
 
-    $lunch  = Time::createFromTime(11, 30)       // 11:30 am today
-    $dinner = Time::createFromTime(18, 00, 00)  // 6:00 pm today
+    $lunch  = Time::createFromTime(11, 30); // 11:30 am today
+    $dinner = Time::createFromTime(18, 00, 00); // 6:00 pm today
     $time   = Time::createFromTime($hour, $minutes, $seconds, $timezone, $locale);
 
 create()
@@ -160,7 +160,7 @@ A full listing of values can be found `here <https://unicode-org.github.io/icu-d
 ::
 
     $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
-    echo $time->toLocalizedString('MMM d, yyyy');   // March 9, 2016
+    echo $time->toLocalizedString('MMM d, yyyy'); // March 9, 2016
 
 toDateTimeString()
 ------------------
@@ -169,7 +169,7 @@ This is the first of three helper methods to work with the IntlDateFormatter wit
 This will return a string formatted as you would commonly use for datetime columns in a database (Y-m-d H:i:s)::
 
     $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
-    echo $time->toDateTimeString();     // 2016-03-09 12:00:00
+    echo $time->toDateTimeString(); // 2016-03-09 12:00:00
 
 toDateString()
 --------------
@@ -177,7 +177,7 @@ toDateString()
 Displays just the date portion of the Time::
 
     $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
-    echo $time->toDateString();     // 2016-03-09
+    echo $time->toDateString(); // 2016-03-09
 
 toTimeString()
 --------------
@@ -185,7 +185,7 @@ toTimeString()
 Displays just the time portion of the value::
 
     $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
-    echo $time->toTimeString();     // 12:00:00
+    echo $time->toTimeString(); // 12:00:00
 
 humanize()
 ----------
@@ -197,7 +197,7 @@ human readable format that is geared towards being easily understood. It can cre
     // Assume current time is: March 10, 2017 (America/Chicago)
     $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
 
-    echo $time->humanize();     // 1 year ago
+    echo $time->humanize(); // 1 year ago
 
 The exact time displayed is determined in the following manner:
 
@@ -234,37 +234,37 @@ The following basic getters exist::
 
     $time = Time::parse('August 12, 2016 4:15:23pm');
 
-    echo $time->getYear();      // 2016
-    echo $time->getMonth();     // 8
-    echo $time->getDay();       // 12
-    echo $time->getHour();      // 16
-    echo $time->getMinute();    // 15
-    echo $time->getSecond();    // 23
+    echo $time->getYear(); // 2016
+    echo $time->getMonth(); // 8
+    echo $time->getDay(); // 12
+    echo $time->getHour(); // 16
+    echo $time->getMinute(); // 15
+    echo $time->getSecond(); // 23
 
-    echo $time->year;           // 2016
-    echo $time->month;          // 8
-    echo $time->day;            // 12
-    echo $time->hour;           // 16
-    echo $time->minute;         // 15
-    echo $time->second;         // 23
+    echo $time->year; // 2016
+    echo $time->month; // 8
+    echo $time->day; // 12
+    echo $time->hour; // 16
+    echo $time->minute; // 15
+    echo $time->second; // 23
 
 In addition to these, a number of methods exist to provide additional information about the date::
 
     $time = Time::parse('August 12, 2016 4:15:23pm');
 
-    echo $time->getDayOfWeek();     // 6 - but may vary based on locale's starting day of the week
-    echo $time->getDayOfYear();     // 225
-    echo $time->getWeekOfMonth();   // 2
-    echo $time->getWeekOfYear();    // 33
-    echo $time->getTimestamp();     // 1471018523 - UNIX timestamp
-    echo $time->getQuarter();       // 3
+    echo $time->getDayOfWeek(); // 6 - but may vary based on locale's starting day of the week
+    echo $time->getDayOfYear(); // 225
+    echo $time->getWeekOfMonth(); // 2
+    echo $time->getWeekOfYear(); // 33
+    echo $time->getTimestamp(); // 1471018523 - UNIX timestamp
+    echo $time->getQuarter(); // 3
 
-    echo $time->dayOfWeek;          // 6
-    echo $time->dayOfYear;          // 225
-    echo $time->weekOfMonth;        // 2
-    echo $time->weekOfYear;         // 33
-    echo $time->timestamp;          // 1471018523
-    echo $time->quarter;            // 3
+    echo $time->dayOfWeek; // 6
+    echo $time->dayOfYear; // 225
+    echo $time->weekOfMonth; // 2
+    echo $time->weekOfYear; // 33
+    echo $time->timestamp; // 1471018523
+    echo $time->quarter; // 3
 
 getAge()
 --------
@@ -274,32 +274,32 @@ the age of someone based on their birthday::
 
     $time = Time::parse('5 years ago');
 
-    echo $time->getAge();   // 5
-    echo $time->age;        // 5
+    echo $time->getAge(); // 5
+    echo $time->age; // 5
 
 getDST()
 --------
 
 Returns boolean true/false based on whether the Time instance is currently observing Daylight Savings Time::
 
-    echo Time::createFromDate(2012, 1, 1)->getDst();     // false
-    echo Time::createFromDate(2012, 9, 1)->dst;     // true
+    echo Time::createFromDate(2012, 1, 1)->getDst(); // false
+    echo Time::createFromDate(2012, 9, 1)->dst; // true
 
 getLocal()
 ----------
 
 Returns boolean true if the Time instance is in the same timezone as the application is currently running in::
 
-    echo Time::now()->getLocal();       // true
-    echo Time::now('Europe/London');    // false
+    echo Time::now()->getLocal(); // true
+    echo Time::now('Europe/London'); // false
 
 getUtc()
 --------
 
 Returns boolean true if the Time instance is in UTC time::
 
-    echo Time::now('America/Chicago')->getUtc();    // false
-    echo Time::now('UTC')->utc;                     // true
+    echo Time::now('America/Chicago')->getUtc(); // false
+    echo Time::now('UTC')->utc; // true
 
 getTimezone()
 -------------
@@ -318,8 +318,8 @@ getTimezoneName()
 
 Returns the full `timezone string <https://www.php.net/manual/en/timezones.php>`__ of the Time instance::
 
-    echo Time::now('America/Chicago')->getTimezoneName();   // America/Chicago
-    echo Time::now('Europe/London')->timezoneName;          // Europe/London
+    echo Time::now('America/Chicago')->getTimezoneName(); // America/Chicago
+    echo Time::now('Europe/London')->timezoneName; // Europe/London
 
 Setters
 =======
@@ -334,11 +334,11 @@ thrown.
 ::
 
     $time = $time->setYear(2017);
-    $time = $time->setMonthNumber(4);           // April
+    $time = $time->setMonthNumber(4); // April
     $time = $time->setMonthLongName('April');
-    $time = $time->setMonthShortName('Feb');    // February
+    $time = $time->setMonthShortName('Feb'); // February
     $time = $time->setDay(25);
-    $time = $time->setHour(14);                 // 2:00 pm
+    $time = $time->setHour(14); // 2:00 pm
     $time = $time->setMinute(30);
     $time = $time->setSecond(54);
 
@@ -348,13 +348,13 @@ setTimezone()
 Converts the time from it's current timezone into the new one::
 
     $time  = Time::parse('13 May 2020 10:00', 'America/Chicago');
-    $time2 = $time->setTimezone('Europe/London');           // Returns new instance converted to new timezone
+    $time2 = $time->setTimezone('Europe/London'); // Returns new instance converted to new timezone
 
-    echo $time->getTimezoneName();   // American/Chicago
-    echo $time2->getTimezoneName();  // Europe/London
+    echo $time->getTimezoneName(); // American/Chicago
+    echo $time2->getTimezoneName(); // Europe/London
 
-    echo $time->toDateTimeString();   // 2020-05-13 10:00:00
-    echo $time2->toDateTimeString();   // 2020-05-13 18:00:00
+    echo $time->toDateTimeString(); // 2020-05-13 10:00:00
+    echo $time2->toDateTimeString(); // 2020-05-13 18:00:00
 
 setTimestamp()
 --------------
@@ -364,8 +364,8 @@ Returns a new instance with the date set to the new timestamp::
     $time = Time::parse('May 10, 2017', 'America/Chicago');
     $time2 = $time->setTimestamp(strtotime('April 1, 2017'));
 
-    echo $time->toDateTimeString();     // 2017-05-10 00:00:00
-    echo $time2->toDateTimeString();     // 2017-04-01 00:00:00
+    echo $time->toDateTimeString(); // 2017-05-10 00:00:00
+    echo $time2->toDateTimeString(); // 2017-04-01 00:00:00
 
 Modifying the Value
 ===================
@@ -405,13 +405,13 @@ that way::
     $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
     $time2 = Time::parse('January 11, 2017 03:50:00', 'Europe/London');
 
-    $time1->equals($time2);    // true
+    $time1->equals($time2); // true
 
 The value being tested against can be a Time instance, a DateTime instance, or a string with the full date time in
 a manner that a new DateTime instance can understand. When passing a string as the first parameter, you can pass
 a timezone string in as the second parameter. If no timezone is given, the system default will be used::
 
-    $time1->equals('January 11, 2017 03:50:00', 'Europe/London');  // true
+    $time1->equals('January 11, 2017 03:50:00', 'Europe/London'); // true
 
 sameAs()
 --------
@@ -423,7 +423,7 @@ all identical::
     $time2 = Time::parse('January 11, 2017 03:50:00', 'Europe/London');
 
     $time1->sameAs($time2);    // false
-    $time2->sameAs('January 10, 2017 21:50:00', 'America/Chicago');    // true
+    $time2->sameAs('January 10, 2017 21:50:00', 'America/Chicago'); // true
 
 isBefore()
 ----------
@@ -434,14 +434,14 @@ both times::
     $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
     $time2 = Time::parse('January 11, 2017 03:50:00', 'America/Chicago');
 
-    $time1->isBefore($time2);  // true
-    $time2->isBefore($time1);  // false
+    $time1->isBefore($time2); // true
+    $time2->isBefore($time1); // false
 
 The value being tested against can be a Time instance, a DateTime instance, or a string with the full date time in
 a manner that a new DateTime instance can understand. When passing a string as the first parameter, you can pass
 a timezone string in as the second parameter. If no timezone is given, the system default will be used::
 
-    $time1->isBefore('March 15, 2013', 'America/Chicago');  // false
+    $time1->isBefore('March 15, 2013', 'America/Chicago'); // false
 
 isAfter()
 ---------
@@ -451,8 +451,8 @@ Works exactly the same as **isBefore()** except checks if the time is after the
     $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
     $time2 = Time::parse('January 11, 2017 03:50:00', 'America/Chicago');
 
-    $time1->isAfter($time2);  // false
-    $time2->isAfter($time1);  // true
+    $time1->isAfter($time2); // false
+    $time2->isAfter($time1); // true
 
 Viewing Differences
 ===================
@@ -476,23 +476,23 @@ the original time::
 
     $diff = $current->difference($test);
 
-    echo $diff->getYears();     // -7
-    echo $diff->getMonths();    // -84
-    echo $diff->getWeeks();     // -365
-    echo $diff->getDays();      // -2557
-    echo $diff->getHours();     // -61368
-    echo $diff->getMinutes();   // -3682080
-    echo $diff->getSeconds();   // -220924800
+    echo $diff->getYears(); // -7
+    echo $diff->getMonths(); // -84
+    echo $diff->getWeeks(); // -365
+    echo $diff->getDays(); // -2557
+    echo $diff->getHours(); // -61368
+    echo $diff->getMinutes(); // -3682080
+    echo $diff->getSeconds(); // -220924800
 
 You can use either **getX()** methods, or access the calculate values as if they were properties::
 
-    echo $diff->years;     // -7
-    echo $diff->months;    // -84
-    echo $diff->weeks;     // -365
-    echo $diff->days;      // -2557
-    echo $diff->hours;     // -61368
-    echo $diff->minutes;   // -3682080
-    echo $diff->seconds;   // -220924800
+    echo $diff->years;   // -7
+    echo $diff->months; // -84
+    echo $diff->weeks; // -365
+    echo $diff->days; // -2557
+    echo $diff->hours; // -61368
+    echo $diff->minutes; // -3682080
+    echo $diff->seconds; // -220924800
 
 humanize()
 ----------
@@ -506,7 +506,7 @@ human readable format that is geared towards being easily understood. It can cre
 
     $diff = $current->difference($test)
 
-    echo $diff->humanize();     // 1 year ago
+    echo $diff->humanize(); // 1 year ago
 
 The exact time displayed is determined in the following manner:
 
diff --git a/user_guide_src/source/libraries/typography.rst b/user_guide_src/source/libraries/typography.rst
index 7d53f61f820e..e449c6371148 100644
--- a/user_guide_src/source/libraries/typography.rst
+++ b/user_guide_src/source/libraries/typography.rst
@@ -26,7 +26,7 @@ The following functions are available:
 
 **autoTypography()**
 
-.. php:function:: autoTypography($str[, $reduce_linebreaks = FALSE])
+.. php:function:: autoTypography($str[, $reduce_linebreaks = false])
 
 	:param	string	$str: Input string
 	:param	bool	$reduce_linebreaks: Whether to reduce multiple instances of double newlines to two
diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index 3e76fb74c905..c4067f3e8eb6 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -110,11 +110,10 @@ In controller::
     {
        foreach($imagefile['images'] as $img)
        {
-          if ($img->isValid() && ! $img->hasMoved())
-          {
-               $newName = $img->getRandomName();
-               $img->move(WRITEPATH.'uploads', $newName);
-          }
+			if ($img->isValid() && ! $img->hasMoved()) {
+				$newName = $img->getRandomName();
+				$img->move(WRITEPATH.'uploads', $newName);
+			}
        }
     }
 
@@ -155,8 +154,7 @@ Verify A File
 
 You can check that a file was actually uploaded via HTTP with no errors by calling the ``isValid()`` method::
 
-	if (! $file->isValid())
-	{
+	if (! $file->isValid()) {
 		throw new \RuntimeException($file->getErrorString().'('.$file->getError().')');
 	}
 
@@ -230,8 +228,7 @@ By default, the original filename was used. You can specify a new filename by pa
 Once the file has been removed the temporary file is deleted. You can check if a file has been moved already with
 the ``hasMoved()`` method, which returns a boolean::
 
-    if ($file->isValid() && ! $file->hasMoved())
-    {
+    if ($file->isValid() && ! $file->hasMoved()) {
         $file->move($path);
     }
 
diff --git a/user_guide_src/source/libraries/uri.rst b/user_guide_src/source/libraries/uri.rst
index 649685db71ec..e8b7c0cefd57 100644
--- a/user_guide_src/source/libraries/uri.rst
+++ b/user_guide_src/source/libraries/uri.rst
@@ -211,8 +211,8 @@ you can use the ``stripQuery()`` and ``keepQuery()`` methods to change the actua
     // Leaves just the 'foo' variable
     $uri->keepQuery('foo');
 
-.. note:: By default ``setQuery()`` and ``setQueryArray()`` methods uses native ``parse_str()`` function to prepare data. 
-	If you want to use more liberal rules (which allow key names to contain dots), you can use a special method 
+.. note:: By default ``setQuery()`` and ``setQueryArray()`` methods uses native ``parse_str()`` function to prepare data.
+	If you want to use more liberal rules (which allow key names to contain dots), you can use a special method
 	``useRawQueryString()`` beforehand.
 
 Fragment
@@ -238,8 +238,7 @@ what the values of the segments are. The segments start at 1 being the furthest
 	// URI = http://example.com/users/15/profile
 
 	// Prints '15'
-	if ($uri->getSegment(1) == 'users')
-	{
+	if ($uri->getSegment(1) == 'users') {
 		echo $uri->getSegment(2);
 	}
 
diff --git a/user_guide_src/source/libraries/user_agent.rst b/user_guide_src/source/libraries/user_agent.rst
index e1d0d155b3af..f8cf92f72064 100644
--- a/user_guide_src/source/libraries/user_agent.rst
+++ b/user_guide_src/source/libraries/user_agent.rst
@@ -39,20 +39,13 @@ is available::
 
 	$agent = $this->request->getUserAgent();
 
-	if ($agent->isBrowser())
-	{
+	if ($agent->isBrowser()) {
 		$currentAgent = $agent->getBrowser().' '.$agent->getVersion();
-	}
-	elseif ($agent->isRobot())
-	{
+	} elseif ($agent->isRobot()) {
 		$currentAgent = $this->agent->robot();
-	}
-	elseif ($agent->isMobile())
-	{
+	} elseif ($agent->isMobile()) {
 		$currentAgent = $agent->getMobile();
-	}
-	else
-	{
+	} else {
 		$currentAgent = 'Unidentified User Agent';
 	}
 
@@ -66,21 +59,18 @@ Class Reference
 
 .. php:class:: CodeIgniter\\HTTP\\UserAgent
 
-	.. php:method:: isBrowser([$key = NULL])
+	.. php:method:: isBrowser([$key = null])
 
 		:param	string	$key: Optional browser name
-    		:returns:	TRUE if the user agent is a (specified) browser, FALSE if not
+    		:returns:	true if the user agent is a (specified) browser, false if not
     		:rtype:	bool
 
-    		Returns TRUE/FALSE (boolean) if the user agent is a known web browser.
+    		Returns true/false (boolean) if the user agent is a known web browser.
     		::
 
-			if ($agent->isBrowser('Safari'))
-			{
+			if ($agent->isBrowser('Safari')) {
 				echo 'You are using Safari.';
-			}
-			elseif ($agent->isBrowser())
-			{
+			} elseif ($agent->isBrowser()) {
 				echo 'You are using a browser.';
 			}
 
@@ -88,35 +78,30 @@ Class Reference
 				  You can find this list in **app/Config/UserAgents.php** if you want to add new
 				  browsers or change the strings.
 
-	.. php:method:: isMobile([$key = NULL])
+	.. php:method:: isMobile([$key = null])
 
 		:param	string	$key: Optional mobile device name
-    		:returns:	TRUE if the user agent is a (specified) mobile device, FALSE if not
+    		:returns:	true if the user agent is a (specified) mobile device, false if not
     		:rtype:	bool
 
-    		Returns TRUE/FALSE (boolean) if the user agent is a known mobile device.
+    		Returns true/false (boolean) if the user agent is a known mobile device.
     		::
 
-			if ($agent->isMobile('iphone'))
-			{
+			if ($agent->isMobile('iphone')) {
 				echo view('iphone/home');
-			}
-			elseif ($agent->isMobile())
-			{
+			} elseif ($agent->isMobile()) {
 				echo view('mobile/home');
-			}
-			else
-			{
+			} else {
 				echo view('web/home');
 			}
 
-	.. php:method:: isRobot([$key = NULL])
+	.. php:method:: isRobot([$key = null])
 
 		:param	string	$key: Optional robot name
-    		:returns:	TRUE if the user agent is a (specified) robot, FALSE if not
+    		:returns:	true if the user agent is a (specified) robot, false if not
     		:rtype:	bool
 
-    		Returns TRUE/FALSE (boolean) if the user agent is a known robot.
+    		Returns true/false (boolean) if the user agent is a known robot.
 
     		.. note:: The user agent library only contains the most common robot definitions. It is not a complete list of bots.
     				  There are hundreds of them so searching for each one would not be very efficient. If you find that some bots
@@ -125,10 +110,10 @@ Class Reference
 
 	.. php:method:: isReferral()
 
-		:returns:	TRUE if the user agent is a referral, FALSE if not
+		:returns:	true if the user agent is a referral, false if not
 		:rtype:	bool
 
-		Returns TRUE/FALSE (boolean) if the user agent was referred from another site.
+		Returns true/false (boolean) if the user agent was referred from another site.
 
 	.. php:method:: getBrowser()
 
@@ -172,8 +157,7 @@ Class Reference
 
 		The referrer, if the user agent was referred from another site. Typically you'll test for this as follows::
 
-			if ($agent->isReferral())
-			{
+			if ($agent->isReferral()) {
 				echo $agent->referrer();
 			}
 
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index ddfcf406f260..940a95953819 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -132,14 +132,11 @@ this code and save it to your **app/Controllers/** folder::
         {
             helper(['form', 'url']);
 
-            if (! $this->validate([]))
-            {
+            if (! $this->validate([])) {
                 echo view('Signup', [
                     'validation' => $this->validator,
                 ]);
-            }
-            else
-            {
+            } else {
                 echo view('Success');
             }
         }
@@ -227,14 +224,14 @@ Like, ``setRule()``, but accepts an array of field names and their rules::
 
     $validation->setRules([
         'username' => 'required',
-        'password' => 'required|min_length[10]'
+        'password' => 'required|min_length[10]',
     ]);
 
 To give a labeled error message you can set up as::
 
     $validation->setRules([
         'username' => ['label' => 'Username', 'rules' => 'required'],
-        'password' => ['label' => 'Password', 'rules' => 'required|min_length[10]']
+        'password' => ['label' => 'Password', 'rules' => 'required|min_length[10]'],
     ]);
 
 withRequest()
@@ -245,8 +242,7 @@ data that was input from an HTTP Request. If desired, you can pass an instance o
 current Request object and it will take all of the input data and set it as the
 data to be validated::
 
-    $validation->withRequest($this->request)
-               ->run();
+    $validation->withRequest($this->request)->run();
 
 Working with Validation
 ************************************************
@@ -262,29 +258,29 @@ easily validate your data::
         'name' => 'Joe Smith',
         'friends' => [
             [
-                'name' => 'Fred Flinstone'
+                'name' => 'Fred Flinstone',
             ],
             [
-                'name' => 'Wilma'
-            ]
+                'name' => 'Wilma',
+            ],
         ]
     ]
 
     // Joe Smith
     $validation->setRules([
-        'contacts.name' => 'required'
+        'contacts.name' => 'required',
     ]);
 
     // Fred Flintsone & Wilma
     $validation->setRules([
-        'contacts.friends.name' => 'required'
+        'contacts.friends.name' => 'required',
     ]);
 
 You can use the '*' wildcard symbol to match any one level of the array::
 
     // Fred Flintsone & Wilma
     $validation->setRules([
-        'contacts.*.name' => 'required'
+        'contacts.*.name' => 'required',
     ]);
 
 "dot array syntax" can also be useful when you have single dimension array data.
@@ -294,11 +290,11 @@ For example, data returned by multi select dropdown::
     'user_ids' => [
         1,
         2,
-        3
+        3,
     ]
     // Rule
     $validation->setRules([
-        'user_ids.*' => 'required'
+        'user_ids.*' => 'required',
     ]);
 
 Validate 1 Value
@@ -331,7 +327,7 @@ rules. As shown earlier, the validation array will have this prototype::
             'username'     => 'required',
             'password'     => 'required',
             'pass_confirm' => 'required|matches[password]',
-            'email'        => 'required|valid_email'
+            'email'        => 'required|valid_email',
         ];
     }
 
@@ -349,7 +345,7 @@ be used for any errors when this group is used::
             'username'     => 'required',
             'password'     => 'required',
             'pass_confirm' => 'required|matches[password]',
-            'email'        => 'required|valid_email'
+            'email'        => 'required|valid_email',
         ];
 
         public $signup_errors = [
@@ -357,8 +353,8 @@ be used for any errors when this group is used::
                 'required'    => 'You must choose a username.',
             ],
             'email'    => [
-                'valid_email' => 'Please check the Email field. It does not appear to be valid.'
-            ]
+                'valid_email' => 'Please check the Email field. It does not appear to be valid.',
+            ],
         ];
     }
 
@@ -370,14 +366,14 @@ Or pass all settings in an array::
             'username' => [
                 'rules'  => 'required',
                 'errors' => [
-                    'required' => 'You must choose a Username.'
-                ]
+                    'required' => 'You must choose a Username.',
+                ],
             ],
             'email'    => [
                 'rules'  => 'required|valid_email',
                 'errors' => [
-                    'valid_email' => 'Please check the Email field. It does not appear to be valid.'
-                ]
+                    'valid_email' => 'Please check the Email field. It does not appear to be valid.',
+                ],
             ],
         ];
     }
@@ -411,10 +407,11 @@ rules after one another, you might need to call ``$validation->reset()`` before
 errors from previous run. Be aware that ``reset()`` will invalidate any data, rule or custom error
 you previously set, so ``setRules()``, ``setRuleGroup()`` etc. need to be repeated::
 
-    for ($userAccounts as $user) {
+    foreach ($userAccounts as $user) {
         $validation->reset();
         $validation->setRules($userAccountRules);
-        if (!$validation->run($user)) {
+
+        if (! $validation->run($user)) {
             // handle validation errors
         }
     }
@@ -428,7 +425,7 @@ the name of the field (or array key) that was passed in as $data surrounded by c
 replaced by the **value** of the matched incoming field. An example should clarify this::
 
     $validation->setRules([
-        'email' => 'required|valid_email|is_unique[users.email,id,{id}]'
+        'email' => 'required|valid_email|is_unique[users.email,id,{id}]',
     ]);
 
 In this set of rules, it states that the email address should be unique in the database, except for the row
@@ -436,13 +433,13 @@ that has an id matching the placeholder's value. Assuming that the form POST dat
 
     $_POST = [
         'id' => 4,
-        'email' => 'foo@example.com'
+        'email' => 'foo@example.com',
     ];
 
 then the ``{id}`` placeholder would be replaced with the number **4**, giving this revised rule::
 
     $validation->setRules([
-        'email' => 'required|valid_email|is_unique[users.email,id,4]'
+        'email' => 'required|valid_email|is_unique[users.email,id,4]',
     ]);
 
 So it will ignore the row in the database that has ``id=4`` when it verifies the email is unique.
@@ -482,8 +479,8 @@ As the last parameter::
                 'required' => 'All accounts must have usernames provided',
             ],
             'password' => [
-                'min_length' => 'Your password is too short. You want to get hacked?'
-            ]
+                'min_length' => 'Your password is too short. You want to get hacked?',
+            ],
         ]
     );
 
@@ -494,15 +491,15 @@ Or as a labeled style::
                 'label'  => 'Username',
                 'rules'  => 'required|is_unique[users.username]',
                 'errors' => [
-                    'required' => 'All accounts must have {field} provided'
-                ]
+                    'required' => 'All accounts must have {field} provided',
+                ],
             ],
             'password' => [
                 'label'  => 'Password',
                 'rules'  => 'required|min_length[10]',
                 'errors' => [
-                    'min_length' => 'Your {field} is too short. You want to get hacked?'
-                ]
+                    'min_length' => 'Your {field} is too short. You want to get hacked?',
+                ],
             ]
         ]
     );
@@ -529,16 +526,16 @@ We can simply use the language lines defined in this file, like this::
                 'label'  => 'Rules.username',
                 'rules'  => 'required|is_unique[users.username]',
                 'errors' => [
-                    'required' => 'Rules.username.required'
-                ]
+                    'required' => 'Rules.username.required',
+                ],
             ],
             'password' => [
                 'label'  => 'Rules.password',
                 'rules'  => 'required|min_length[10]',
                 'errors' => [
-                    'min_length' => 'Rules.password.min_length'
-                ]
-            ]
+                    'min_length' => 'Rules.password.min_length',
+                ],
+            ],
         ]
     );
 
@@ -572,8 +569,7 @@ Check If Error Exists
 
 You can check to see if an error exists with the ``hasError()`` method. The only parameter is the field name::
 
-    if ($validation->hasError('username'))
-    {
+    if ($validation->hasError('username')) {
         echo $validation->getError('username');
     }
 
@@ -623,7 +619,7 @@ short alias they can be referenced by. If we were to add our example file from a
     public $templates = [
         'list'    => 'CodeIgniter\Validation\Views\list',
         'single'  => 'CodeIgniter\Validation\Views\single',
-        'my_list' => '_errors_list'
+        'my_list' => '_errors_list',
     ];
 
 Specifying the Template
@@ -667,7 +663,7 @@ a boolean true or false value signifying true if it passed the test or false if
     {
         public function even(string $str): bool
         {
-            return (int)$str % 2 == 0;
+            return (int) $str % 2 == 0;
         }
     }
 
@@ -677,9 +673,9 @@ second parameter::
 
     public function even(string $str, string &$error = null): bool
     {
-        if ((int)$str % 2 != 0)
-        {
+        if ((int) $str % 2 !== 0) {
             $error = lang('myerrors.evenError');
+
             return false;
         }
 
@@ -689,7 +685,7 @@ second parameter::
 Your new custom rule could now be used just like any other rule::
 
     $this->validate($request, [
-        'foo' => 'required|even'
+        'foo' => 'required|even',
     ]);
 
 Allowing Parameters
@@ -708,8 +704,7 @@ for rules like ``require_with`` that needs to check the value of another submitt
         // search field is present or not.
         $present = $this->required($str ?? '');
 
-        if ($present)
-        {
+        if ($present) {
             return true;
         }
 
@@ -718,10 +713,8 @@ for rules like ``require_with`` that needs to check the value of another submitt
         // as $fields is the lis
         $requiredFields = [];
 
-        foreach ($fields as $field)
-        {
-            if (array_key_exists($field, $data))
-            {
+        foreach ($fields as $field) {
+            if (array_key_exists($field, $data)) {
                 $requiredFields[] = $field;
             }
         }
@@ -887,7 +880,7 @@ file upload related rules::
 
     // In the controller
     $this->validate([
-        'avatar' => 'uploaded[avatar]|max_size[avatar,1024]'
+        'avatar' => 'uploaded[avatar]|max_size[avatar,1024]',
     ]);
 
 ======================= ========== ============================================= ===================================================
diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst
index 0d8ae47377bc..247c0fdce0e3 100644
--- a/user_guide_src/source/models/entities.rst
+++ b/user_guide_src/source/models/entities.rst
@@ -68,7 +68,7 @@ Create the model first at **app/Models/UserModel.php** so that we can interact w
     {
         protected $table         = 'users';
         protected $allowedFields = [
-            'username', 'email', 'password'
+            'username', 'email', 'password',
         ];
         protected $returnType    = 'App\Entities\User';
         protected $useTimestamps = true;
@@ -93,10 +93,11 @@ Now that all of the pieces are in place, you would work with the Entity class as
 
     // Updating
     unset($user->username);
-    if (! isset($user->username)
-    {
+
+    if (! isset($user->username) {
         $user->username = 'something new';
     }
+
     $userModel->save($user);
 
     // Create
@@ -160,7 +161,7 @@ the attributes directly, allowing you to enforce any business logic or data conv
 Here's an updated User entity to provide some examples of how this could be used::
 
     <?php
-    
+
     namespace App\Entities;
 
     use CodeIgniter\Entity\Entity;
@@ -230,7 +231,7 @@ with the Entity class' data mapping features.
 As an example, imagine you have the simplified User Entity that is used throughout your application::
 
     <?php
-    
+
     namespace App\Entities;
 
     use CodeIgniter\Entity\Entity;
@@ -239,7 +240,7 @@ As an example, imagine you have the simplified User Entity that is used througho
     {
         protected $attributes = [
             'id' => null,
-            'name' => null,        // Represents a username
+            'name' => null, // Represents a username
             'email' => null,
             'password' => null,
             'created_at' => null,
@@ -257,7 +258,7 @@ property from ``$name`` to ``$full_name``, but that would require changes throug
 simply map the ``full_name`` column in the database to the ``$name`` property, and be done with the Entity changes::
 
     <?php
-    
+
     namespace App\Entities;
 
     use CodeIgniter\Entity\Entity;
@@ -266,7 +267,7 @@ simply map the ``full_name`` column in the database to the ``$name`` property, a
     {
         protected $attributes = [
             'id' => null,
-            'name' => null,        // Represents a username
+            'name' => null, // Represents a username
             'email' => null,
             'password' => null,
             'created_at' => null,
@@ -301,7 +302,7 @@ of helpful methods in an immutable, localized way.
 You can define which properties are automatically converted by adding the name to the **options['dates']** array::
 
     <?php
-    
+
     namespace App\Entities;
 
     use CodeIgniter\Entity\Entity;
@@ -336,7 +337,7 @@ Add a question mark at the beginning of type to mark property as nullable, i.e.,
 For example, if you had a User entity with an **is_banned** property, you can cast it as a boolean::
 
     <?php
-    
+
     namespace App\Entities;
 
     use CodeIgniter\Entity\Entity;
@@ -344,7 +345,7 @@ For example, if you had a User entity with an **is_banned** property, you can ca
     class User extends Entity
     {
         protected $casts = [
-            'is_banned' => 'boolean',
+            'is_banned'          => 'boolean',
             'is_banned_nullable' => '?boolean',
         ];
     }
@@ -367,7 +368,7 @@ Unlike the rest of the data types that you can cast properties into, the:
 the value whenever the property is set::
 
     <?php
-    
+
     namespace App\Entities;
 
     use CodeIgniter\Entity\Entity;
@@ -400,7 +401,7 @@ a simpler alternative will result in a string that uses less space and is more e
 by humans::
 
     <?php
-    
+
     namespace App\Entities;
 
     use CodeIgniter\Entity\Entity;
@@ -429,7 +430,7 @@ Let's say the class will be located in the 'app/Entity/Cast' directory::
     <?php
 
     namespace App\Entity\Cast;
-    
+
     use CodeIgniter\Entity\Cast\BaseCast;
 
     //The class must inherit the CodeIgniter\Entity\Cast\BaseCast class
@@ -476,7 +477,7 @@ Now you need to register it::
 If you don't need to change values when getting or setting a value. Then just don't implement the appropriate method::
 
     use CodeIgniter\Entity\Cast\BaseCast;
-    
+
     class CastBase64 extends BaseCast
     {
         public static function get($value, array $params = [])
@@ -506,7 +507,7 @@ Additional parameters are indicated in square brackets and listed with a comma.
     ];
 
     use CodeIgniter\Entity\Cast\BaseCast;
-    
+
     class SomeHandler extends BaseCast
     {
         public static function get($value, array $params = [])
@@ -542,4 +543,4 @@ attribute to check::
 
 Or to check the whole entity for changed values omit the parameter::
 
-    $user->hasChanged();       // true
+    $user->hasChanged(); // true
diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index f2b852432298..8326f6e84bcc 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -172,7 +172,7 @@ is used with methods like ``find()`` to know what column to match the specified
 **$useAutoIncrement**
 
 Specifies if the table uses an auto-increment feature for ``$primaryKey``. If set to ``false``
-then you are responsible for providing primary key value for every record in the table. This 
+then you are responsible for providing primary key value for every record in the table. This
 feature may be handy when we want to implement 1:1 relation or use UUIDs for our model.
 
 .. note:: If you set ``$useAutoIncrement`` to ``false`` then make sure to set your primary
@@ -321,7 +321,7 @@ Returns the first row in the result set. This is best used in combination with t
 
 **withDeleted()**
 
-If $useSoftDeletes is true, then the find* methods will not return any rows where 'deleted_at IS NOT NULL'.
+If $useSoftDeletes is true, then the find* methods will not return any rows where 'deleted_at IS NOT null'.
 To temporarily override this, you can use the withDeleted() method prior to calling the find* method.
 ::
 
@@ -329,16 +329,14 @@ To temporarily override this, you can use the withDeleted() method prior to call
     $activeUsers = $userModel->findAll();
 
     // Gets all rows
-    $allUsers = $userModel->withDeleted()
-                          ->findAll();
+    $allUsers = $userModel->withDeleted()->findAll();
 
 **onlyDeleted()**
 
 Whereas withDeleted() will return both deleted and not-deleted rows, this method modifies
 the next find* methods to return only soft deleted rows::
 
-    $deletedUsers = $userModel->onlyDeleted()
-                              ->findAll();
+    $deletedUsers = $userModel->onlyDeleted()->findAll();
 
 Saving Data
 -----------
@@ -351,7 +349,7 @@ the array's values are the values to save for that key::
 
     $data = [
         'username' => 'darth',
-        'email'    => 'd.vader@theempire.com'
+        'email'    => 'd.vader@theempire.com',
     ];
 
     $userModel->insert($data);
@@ -364,7 +362,7 @@ of the columns in a $table, while the array's values are the values to save for
 
     $data = [
         'username' => 'darth',
-        'email'    => 'd.vader@theempire.com'
+        'email'    => 'd.vader@theempire.com',
     ];
 
     $userModel->update($id, $data);
@@ -372,7 +370,7 @@ of the columns in a $table, while the array's values are the values to save for
 Multiple records may be updated with a single call by passing an array of primary keys as the first parameter::
 
     $data = [
-        'active' => 1
+        'active' => 1,
     ];
 
     $userModel->update([1, 2, 3], $data);
@@ -396,7 +394,7 @@ automatically, based on whether it finds an array key matching the $primaryKey v
     // Does an insert()
     $data = [
         'username' => 'darth',
-        'email'    => 'd.vader@theempire.com'
+        'email'    => 'd.vader@theempire.com',
     ];
 
     $userModel->save($data);
@@ -405,7 +403,7 @@ automatically, based on whether it finds an array key matching the $primaryKey v
     $data = [
         'id'       => 3,
         'username' => 'darth',
-        'email'    => 'd.vader@theempire.com'
+        'email'    => 'd.vader@theempire.com',
     ];
     $userModel->save($data);
 
@@ -427,16 +425,14 @@ simplest, they might look like this::
 
         public function __get($key)
         {
-            if (property_exists($this, $key))
-            {
+            if (property_exists($this, $key)) {
                 return $this->$key;
             }
         }
 
         public function __set($key, $value)
         {
-            if (property_exists($this, $key))
-            {
+            if (property_exists($this, $key)) {
                 $this->$key = $value;
             }
         }
@@ -514,13 +510,13 @@ be applied. If you have custom error message that you want to use, place them in
             'username'     => 'required|alpha_numeric_space|min_length[3]',
             'email'        => 'required|valid_email|is_unique[users.email]',
             'password'     => 'required|min_length[8]',
-            'pass_confirm' => 'required_with[password]|matches[password]'
+            'pass_confirm' => 'required_with[password]|matches[password]',
         ];
 
         protected $validationMessages = [
             'email'        => [
-                'is_unique' => 'Sorry. That email has already been taken. Please choose another.'
-            ]
+                'is_unique' => 'Sorry. That email has already been taken. Please choose another.',
+            ],
         ];
     }
 
@@ -537,7 +533,7 @@ The other way to set the validation rules to fields by functions,
 
         $fieldName = 'username';
         $fieldRules = 'required|alpha_numeric_space|min_length[3]';
-        
+
         $model->setValidationRule($fieldName, $fieldRules);
 
 .. php:function:: setValidationRules($validationRules)
@@ -751,8 +747,7 @@ parameter is a Closure that will be called for each row of data.
 This is best used during cronjobs, data exports, or other large tasks.
 ::
 
-    $userModel->chunk(100, function ($data)
-    {
+    $userModel->chunk(100, function ($data) {
         // do something.
         // $data is a single row of data.
     });
@@ -804,7 +799,7 @@ Additionally, each model may allow (default) or deny callbacks class-wide by set
 You may also change this setting temporarily for a single model call sing the ``allowCallbacks()`` method::
 
     $model->allowCallbacks(false)->find(1); // No callbacks triggered
-    $model->find(1);                        // Callbacks subject to original property value
+    $model->find(1); // Callbacks subject to original property value
 
 Event Parameters
 ----------------
@@ -854,13 +849,15 @@ boolean, ``returnData``::
     protected function checkCache(array $data)
     {
         // Check if the requested item is already in our cache
-        if (isset($data['id']) && $item = $this->getCachedItem($data['id']]))
-        {
+        if (isset($data['id']) && $item = $this->getCachedItem($data['id']])) {
             $data['data']       = $item;
             $data['returnData'] = true;
 
             return $data;
-    // ...
+        }
+
+        // ...
+    }
 
 Manual Model Creation
 =====================
diff --git a/user_guide_src/source/outgoing/api_responses.rst b/user_guide_src/source/outgoing/api_responses.rst
index 8d570144cf4c..4758fe4f02bb 100644
--- a/user_guide_src/source/outgoing/api_responses.rst
+++ b/user_guide_src/source/outgoing/api_responses.rst
@@ -85,7 +85,7 @@ format both XML and JSON responses::
 
         public $supportedResponseFormats = [
             'application/json',
-            'application/xml'
+            'application/xml',
         ];
 
 This is the array that is used during :doc:`Content Negotiation </incoming/content_negotiation>` to determine which
@@ -98,7 +98,7 @@ support both JSON and XML::
 
     public $formatters = [
         'application/json' => \CodeIgniter\Format\JSONFormatter::class,
-        'application/xml'  => \CodeIgniter\Format\XMLFormatter::class
+        'application/xml'  => \CodeIgniter\Format\XMLFormatter::class,
     ];
 
 So, if your request asks for JSON formatted data in an **Accept** header, the data array you pass any of the
@@ -167,8 +167,8 @@ Class Reference
 	        'code'     => '321a',
 	        'messages' => [
 	            'Error message 1',
-	            'Error message 2'
-	        ]
+	            'Error message 2',
+	        ],
 	    ];
 
 .. php:method:: respondCreated($data = null[, string $message = ''])
@@ -317,4 +317,3 @@ Class Reference
     ::
 
     	return $this->failServerError('Server error.');
-
diff --git a/user_guide_src/source/outgoing/localization.rst b/user_guide_src/source/outgoing/localization.rst
index 20287bfba2ad..97d3fbdf6d5e 100644
--- a/user_guide_src/source/outgoing/localization.rst
+++ b/user_guide_src/source/outgoing/localization.rst
@@ -125,7 +125,7 @@ It also support nested definition::
 
     'language_key' => [
         'nested' => [
-            'key' => 'The actual message to be shown.'
+            'key' => 'The actual message to be shown.',
         ],
     ],
 
@@ -278,8 +278,8 @@ Language files also allow nested arrays to make working with lists, etc... easie
             'Grapes',
             'Lemons',
             'Oranges',
-            'Strawberries'
-        ]
+            'Strawberries',
+        ],
     ];
 
     // Displays "Apples, Bananas, Grapes, Lemons, Oranges, Strawberries"
diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
index e48a5af6cd08..060e2cd28291 100644
--- a/user_guide_src/source/outgoing/response.rst
+++ b/user_guide_src/source/outgoing/response.rst
@@ -37,7 +37,7 @@ You can set format an array into either JSON or XML and set the content type hea
 
     $data = [
         'success' => true,
-        'id' => 123
+        'id' => 123,
     ];
 
     return $this->response->setJSON($data);
@@ -80,10 +80,10 @@ to your computer. This sets the appropriate headers to make it happen.
 The first parameter is the **name you want the downloaded file to be named**, the second parameter is the
 file data.
 
-If you set the second parameter to NULL and ``$filename`` is an existing, readable
+If you set the second parameter to null and ``$filename`` is an existing, readable
 file path, then its content will be read instead.
 
-If you set the third parameter to boolean TRUE, then the actual file MIME type
+If you set the third parameter to boolean true, then the actual file MIME type
 (based on the filename extension) will be sent, so that if your browser has a
 handler for that type - it can use it.
 
@@ -394,7 +394,7 @@ The methods provided by the parent class that are available are:
         followed by the response body. For the main application response, you do not need to call
         this as it is handled automatically by CodeIgniter.
 
-    .. php:method:: setCookie($name = ''[, $value = ''[, $expire = ''[, $domain = ''[, $path = '/'[, $prefix = ''[, $secure = FALSE[, $httponly = FALSE[, $samesite = null]]]]]]]])
+    .. php:method:: setCookie($name = ''[, $value = ''[, $expire = ''[, $domain = ''[, $path = '/'[, $prefix = ''[, $secure = false[, $httponly = false[, $samesite = null]]]]]]]])
 
         :param mixed $name: Cookie name or an array of parameters
         :param string $value: Cookie value
@@ -423,8 +423,8 @@ The methods provided by the parent class that are available are:
                 'domain' => '.some-domain.com',
                 'path'   => '/',
                 'prefix' => 'myprefix_',
-                'secure' => TRUE,
-                'httponly' => FALSE,
+                'secure' => true,
+                'httponly' => false,
                 'samesite' => 'Lax'
             ];
 
diff --git a/user_guide_src/source/outgoing/table.rst b/user_guide_src/source/outgoing/table.rst
index 781788491ddf..334658d08380 100644
--- a/user_guide_src/source/outgoing/table.rst
+++ b/user_guide_src/source/outgoing/table.rst
@@ -136,7 +136,7 @@ example, only the table opening tag is being changed::
 	];
 
 	$table->setTemplate($template);
-	
+
 You can also set defaults for these by passing an array of template settings
 to the Table constructor.::
 
@@ -153,7 +153,7 @@ Class Reference
 
 .. php:class:: Table
 
-	.. attribute:: $function = NULL
+	.. attribute:: $function = null
 
 		Allows you to specify a native PHP function or a valid function array object to be applied to all cell data.
 		::
@@ -170,7 +170,7 @@ Class Reference
 
 			<td>Fred</td><td>&lt;strong&gt;Blue&lt;/strong&gt;</td><td>Small</td>
 
-	.. php:method:: generate([$tableData = NULL])
+	.. php:method:: generate([$tableData = null])
 
 		:param	mixed	$tableData: Data to populate the table rows with
 		:returns:	HTML table
@@ -213,7 +213,7 @@ Class Reference
 
 			$table->setFooting(['Subtotal', $subtotal, $notes]);
 
-	.. php:method:: addRow([$args = array()[, ...]])
+	.. php:method:: addRow([$args = [] [, ...]])
 
 		:param	mixed	$args: An array or multiple strings containing the row values
 		:returns:	Table instance (method chaining)
@@ -267,16 +267,16 @@ Class Reference
 	.. php:method:: setTemplate($template)
 
 		:param	array	$template: An associative array containing template values
-		:returns:	TRUE on success, FALSE on failure
+		:returns:	true on success, false on failure
 		:rtype:	bool
 
 		Permits you to set your template. You can submit a full or partial template.
 		::
 
 			$template = [
-				'table_open'  => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">'
+				'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">'
 			];
-		
+
 			$table->setTemplate($template);
 
 	.. php:method:: setEmpty($value)
@@ -304,21 +304,20 @@ Class Reference
 
 			$table = new \CodeIgniter\View\Table();
 
-
 			$table->setCaption('Preferences')
-                            ->setHeading('Name', 'Color', 'Size')
-                            ->addRow('Fred', 'Blue', 'Small')
-                            ->addRow('Mary', 'Red', 'Large')
-                            ->addRow('John', 'Green', 'Medium');
+				->setHeading('Name', 'Color', 'Size')
+				->addRow('Fred', 'Blue', 'Small')
+				->addRow('Mary', 'Red', 'Large')
+				->addRow('John', 'Green', 'Medium');
 
 			echo $table->generate();
 
 			$table->clear();
 
 			$table->setCaption('Shipping')
-                            ->setHeading('Name', 'Day', 'Delivery')
-                            ->addRow('Fred', 'Wednesday', 'Express')
-                            ->addRow('Mary', 'Monday', 'Air')
-                            ->addRow('John', 'Saturday', 'Overnight');
+				->setHeading('Name', 'Day', 'Delivery')
+				->addRow('Fred', 'Wednesday', 'Express')
+				->addRow('Mary', 'Monday', 'Air')
+				->addRow('John', 'Saturday', 'Overnight');
 
 			echo $table->generate();
diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index 6ba136e11536..37c20c82e11e 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -89,7 +89,7 @@ like this::
 
 	$data = [
 		'blog_title'   => 'My Blog Title',
-		'blog_heading' => 'My Blog Heading'
+		'blog_heading' => 'My Blog Heading',
 	];
 
 	echo $parser->setData($data)
@@ -194,8 +194,8 @@ corresponding to your variable pair data. Consider this example::
 			['title' => 'Title 2', 'body' => 'Body 2'],
 			['title' => 'Title 3', 'body' => 'Body 3'],
 			['title' => 'Title 4', 'body' => 'Body 4'],
-			['title' => 'Title 5', 'body' => 'Body 5']
-		]
+			['title' => 'Title 5', 'body' => 'Body 5'],
+		],
 	];
 
 	echo $parser->setData($data)
@@ -214,11 +214,11 @@ method::
 	$data = [
 		'blog_title'   => 'My Blog Title',
 		'blog_heading' => 'My Blog Heading',
-		'blog_entries' => $query->getResultArray()
+		'blog_entries' => $query->getResultArray(),
 	];
 
 	echo $parser->setData($data)
-	             ->render('blog_template');
+	            ->render('blog_template');
 
 If the array you are trying to loop over contains objects instead of arrays,
 the parser will first look for an ``asArray`` method on the object. If it exists,
@@ -240,12 +240,13 @@ an associative array of values, like a record from a database::
 		'blog_title'   => 'My Blog Title',
 		'blog_heading' => 'My Blog Heading',
 		'blog_entry'   => [
-			'title' => 'Title 1', 'body' => 'Body 1'
-		]
+			'title' => 'Title 1',
+			'body' => 'Body 1',
+		],
 	];
 
 	echo $parser->setData($data)
-	             ->render('blog_template');
+	            ->render('blog_template');
 
 The value for the pseudo-variable ``blog_entry`` is an associative
 array. The key/value pairs defined inside it will be exposed inside
@@ -292,7 +293,7 @@ The following example is not impacted by cascading::
 
 	$data = [
 		'name'     => 'George',
-		'location' => [ 'city' => 'Red City', 'planet' => 'Mars' ]
+		'location' => ['city' => 'Red City', 'planet' => 'Mars'],
 	];
 
 	echo $parser->setData($data)->renderString($template);
@@ -304,7 +305,7 @@ This example gives different results, depending on cascading::
 
 	$data = [
 		'name'     => 'George',
-		'location' => [ 'city' => 'Red City', 'planet' => 'Mars' ]
+		'location' => ['city' => 'Red City', 'planet' => 'Mars'],
 	];
 
 	echo $parser->setData($data)->renderString($template, ['cascadeData'=>false]);
@@ -540,7 +541,7 @@ used within the template file. The value is any valid PHP callable, including st
 
 	public $plugins = [
 		'foo'	=> '\Some\Class::methodName',
-		'bar'	=> function($str, array $params=[]) {
+		'bar'	=> function ($str, array $params=[]) {
 			return $str;
 		},
 	];
@@ -553,7 +554,7 @@ Any closures that are being used must be defined in the config file's constructo
 
         public function __construct()
         {
-            $this->plugins['bar'] = function(array $params=[]) {
+            $this->plugins['bar'] = function (array $params=[]) {
                 return $params[0] ?? '';
             };
 
@@ -605,10 +606,10 @@ template, the original pseudo-variable is shown in the result::
 	$data = [
 		'title'     => 'Mr',
 		'firstname' => 'John',
-		'lastname'  => 'Doe'
+		'lastname'  => 'Doe',
 	];
 	echo $parser->setData($data)
-	             ->renderString($template);
+	            ->renderString($template);
 
 	// Result: Hello, John {initials} Doe
 
@@ -623,11 +624,11 @@ pair tag, but the closing variable pair tag is not rendered properly::
 		'lastname'  => 'Doe',
 		'titles'    => [
 			['degree' => 'BSc'],
-			['degree' => 'PhD']
-		]
+			['degree' => 'PhD'],
+		],
 	];
 	echo $parser->setData($data)
-	             ->renderString($template);
+	            ->renderString($template);
 
 	// Result: Hello, John Doe (Mr{degree} {/degrees})
 
@@ -652,7 +653,7 @@ An example with the iteration controlled in the view::
 		]
 	];
 	echo $parser->setData($data)
-	             ->renderString($template);
+	            ->renderString($template);
 
 Result::
 
@@ -671,17 +672,16 @@ using a view fragment::
 		['title' => 'Second Link', 'link' => '/second'],
 	];
 
-	foreach ($data1 as $menuItem)
-	{
+	foreach ($data1 as $menuItem),{
 		$temp .= $parser->setData($menuItem)->renderString($template1);
 	}
 
 	$template2 = '<ul>{menuitems}</ul>';
 	$data = [
-		'menuitems' => $temp
+		'menuitems' => $temp,
 	];
 	echo $parser->setData($data)
-	             ->renderString($template2);
+	            ->renderString($template2);
 
 Result::
 
@@ -710,12 +710,12 @@ Class Reference
 
         Options supported:
 
-	        -   ``cache`` - the time in seconds, to save a view's results
-	        -   ``cache_name`` - the ID used to save/retrieve a cached view result; defaults to the viewpath
-	        -   ``cascadeData`` - true if the data pairs in effect when a nested or loop substitution occurs should be propagated
-	        -   ``saveData`` - true if the view data parameter should be retained for subsequent calls
-	        -   ``leftDelimiter`` - the left delimiter to use in pseudo-variable syntax
-	        -   ``rightDelimiter`` - the right delimiter to use in pseudo-variable syntax
+	        - ``cache`` - the time in seconds, to save a view's results
+	        - ``cache_name`` - the ID used to save/retrieve a cached view result; defaults to the viewpath
+	        - ``cascadeData`` - true if the data pairs in effect when a nested or loop substitution occurs should be propagated
+	        - ``saveData`` - true if the view data parameter should be retained for subsequent calls
+	        - ``leftDelimiter`` - the left delimiter to use in pseudo-variable syntax
+	        - ``rightDelimiter`` - the right delimiter to use in pseudo-variable syntax
 
 		Any conditional substitutions are performed first, then remaining
 		substitutions are performed for each data pair.
@@ -770,6 +770,6 @@ Class Reference
     		:returns: The Renderer, for method chaining
     		:rtype: CodeIgniter\\View\\RendererInterface.
 
-    		Over-ride the substitution field delimiters::
+    		Override the substitution field delimiters::
 
 			$renderer->setDelimiters('[',']');
diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst
index 97485ba84774..0ea2001fe724 100644
--- a/user_guide_src/source/outgoing/views.rst
+++ b/user_guide_src/source/outgoing/views.rst
@@ -80,7 +80,7 @@ content view, and a footer view. That might look something like this::
 		public function index()
 		{
 			$data = [
-				'page_title' => 'Your title'
+				'page_title' => 'Your title',
 			];
 
 			echo view('header');
@@ -137,7 +137,7 @@ Here's an example::
 	$data = [
 		'title'   => 'My title',
 		'heading' => 'My Heading',
-		'message' => 'My Message'
+		'message' => 'My Message',
 	];
 
 	echo view('blogview', $data);
@@ -181,7 +181,7 @@ into the `$option` array in the third parameter.
 	$data = [
 		'title'   => 'My title',
 		'heading' => 'My Heading',
-		'message' => 'My Message'
+		'message' => 'My Message',
 	];
 
 	echo view('blogview', $data, ['saveData' => true]);
@@ -208,8 +208,8 @@ Here’s a simple example. Add this to your controller::
 		{
 			$data = [
 				'todo_list' => ['Clean House', 'Call Mom', 'Run Errands'],
-				'title'     => "My Real Title",
-				'heading'   => "My Real Heading"
+				'title'     => 'My Real Title',
+				'heading'   => 'My Real Heading',
 			];
 
 			echo view('blogview', $data);
diff --git a/user_guide_src/source/testing/benchmark.rst b/user_guide_src/source/testing/benchmark.rst
index 3f2a760d9428..780dcfe8ac08 100644
--- a/user_guide_src/source/testing/benchmark.rst
+++ b/user_guide_src/source/testing/benchmark.rst
@@ -57,7 +57,7 @@ This returns an array of benchmark information, including start, end, and durati
         'render view'  => [
             'start'    => 1234567890,
             'end'      => 1345678920,
-            'duration' => 15.4315      // number of seconds
+            'duration' => 15.4315, // number of seconds
         ]
     ]
 
@@ -97,18 +97,14 @@ this test by. The second parameter is the Closure, itself::
     $iterator = new \CodeIgniter\Benchmark\Iterator();
 
     // Add a new task
-    $iterator->add('single_concat', function()
-        {
-            $str = 'Some basic'.'little'.'string concatenation test.';
-        }
-    );
+    $iterator->add('single_concat', function () {
+        $str = 'Some basic'.'little'.'string concatenation test.';
+    });
 
     // Add another task
-    $iterator->add('double', function($a='little')
-        {
-            $str = "Some basic {$little} string test.";
-        }
-    );
+    $iterator->add('double', function ($a = 'little') {
+        $str = "Some basic {$little} string test.";
+    });
 
 Running the Tasks
 =================
diff --git a/user_guide_src/source/testing/database.rst b/user_guide_src/source/testing/database.rst
index 31f96b5bb565..86b91537917e 100644
--- a/user_guide_src/source/testing/database.rst
+++ b/user_guide_src/source/testing/database.rst
@@ -163,7 +163,7 @@ Asserts that a row with criteria matching the key/value pairs in ``$criteria`` D
 
     $criteria = [
         'email'  => 'joe@example.com',
-        'active' => 1
+        'active' => 1,
     ];
     $this->dontSeeInDatabase('users', $criteria);
 
@@ -174,7 +174,7 @@ Asserts that a row with criteria matching the key/value pairs in ``$criteria`` D
 
     $criteria = [
         'email'  => 'joe@example.com',
-        'active' => 1
+        'active' => 1,
     ];
     $this->seeInDatabase('users', $criteria);
 
@@ -194,7 +194,7 @@ array with the data to insert into the table.
 
     $data = [
         'email' => 'joe@example.com',
-        'name'  => 'Joe Cool'
+        'name'  => 'Joe Cool',
     ];
     $this->hasInDatabase('users', $data);
 
@@ -204,6 +204,6 @@ Asserts that a number of matching rows are found in the database that match ``$c
 ::
 
     $criteria = [
-        'active' => 1
+        'active' => 1,
     ];
     $this->seeNumRecords(2, 'users', $criteria);
diff --git a/user_guide_src/source/testing/debugging.rst b/user_guide_src/source/testing/debugging.rst
index afeb9deaade6..6149ceac9a54 100644
--- a/user_guide_src/source/testing/debugging.rst
+++ b/user_guide_src/source/testing/debugging.rst
@@ -79,7 +79,7 @@ the **app/Config/Toolbar.php** configuration file::
         \CodeIgniter\Debug\Toolbar\Collectors\Database::class,
         \CodeIgniter\Debug\Toolbar\Collectors\Logs::class,
         \CodeIgniter\Debug\Toolbar\Collectors\Views::class,
-         \CodeIgniter\Debug\Toolbar\Collectors\Cache::class,
+        \CodeIgniter\Debug\Toolbar\Collectors\Cache::class,
         \CodeIgniter\Debug\Toolbar\Collectors\Files::class,
         \CodeIgniter\Debug\Toolbar\Collectors\Routes::class,
         \CodeIgniter\Debug\Toolbar\Collectors\Events::class,
@@ -182,7 +182,7 @@ it to sort it correctly and display the correct information. The inner arrays mu
         'name'      => '',     // Name displayed on the left of the timeline
         'component' => '',     // Name of the Component listed in the middle of timeline
         'start'     => 0.00,   // start time, like microtime(true)
-        'duration'  => 0.00    // duration, like mircrotime(true) - microtime(true)
+        'duration'  => 0.00,   // duration, like mircrotime(true) - microtime(true)
     ];
 
 Providing Vars
@@ -199,10 +199,10 @@ outer array's key is the name of the section on the Vars tab::
     $data = [
         'section 1' => [
             'foo' => 'bar',
-            'bar' => 'baz'
+            'bar' => 'baz',
         ],
         'section 2' => [
             'foo' => 'bar',
-            'bar' => 'baz'
-        ]
+            'bar' => 'baz',
+        ],
      ];
diff --git a/user_guide_src/source/testing/feature.rst b/user_guide_src/source/testing/feature.rst
index 6abc1ff228ce..6ec786c67079 100644
--- a/user_guide_src/source/testing/feature.rst
+++ b/user_guide_src/source/testing/feature.rst
@@ -61,7 +61,7 @@ populated, while a **post** request would have the **$_POST** array populated.
 
     // Submit a form
     $result = $this->call('post', 'contact'), [
-        'name' => 'Fred Flintstone',
+        'name'  => 'Fred Flintstone',
         'email' => 'flintyfred@example.com'
     ]);
 
@@ -83,11 +83,10 @@ You can use a custom collection of routes by passing an array of "routes" into t
 override any existing routes in the system::
 
     $routes = [
-       [ 'get', 'users', 'UserController::list' ]
-     ];
+        ['get', 'users', 'UserController::list'],
+    ];
 
-    $result = $this->withRoutes($routes)
-        ->get('users');
+    $result = $this->withRoutes($routes)->get('users');
 
 Each of the "routes" is a 3 element array containing the HTTP verb (or "add" for all),
 the URI to match, and the routing destination.
@@ -102,11 +101,10 @@ that the current values of ``$_SESSION`` should be used. This is handy for testi
 ::
 
     $values = [
-        'logged_in' => 123
+        'logged_in' => 123,
     ];
 
-    $result = $this->withSession($values)
-        ->get('admin');
+    $result = $this->withSession($values)->get('admin');
 
     // Or...
 
@@ -121,7 +119,7 @@ You can set header values with the ``withHeaders()`` method. This takes an array
 passed as a header into the call.::
 
     $headers = [
-        'CONTENT_TYPE' => 'application/json'
+        'CONTENT_TYPE' => 'application/json',
     ];
 
     $result = $this->withHeaders($headers)->post('users');
@@ -132,8 +130,7 @@ Bypassing Events
 Events are handy to use in your application, but can be problematic during testing. Especially events that are used
 to send out emails. You can tell the system to skip any event handling with the ``skipEvents()`` method::
 
-    $result = $this->skipEvents()
-        ->post('users', $userInfo);
+    $result = $this->skipEvents()->post('users', $userInfo);
 
 Formatting The Request
 -----------------------
@@ -145,8 +142,7 @@ This is useful when testing JSON or XML API's so that you can set the request in
 ::
 
     // If your feature test contains this:
-    $result = $this->withBodyFormat('json')
-        ->post('users', $userInfo);
+    $result = $this->withBodyFormat('json')->post('users', $userInfo);
 
     // Your controller can then get the parameters passed in with:
     $userInfo = $this->request->getJson();
diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst
index e19403542a6e..28e99b9b4bbc 100644
--- a/user_guide_src/source/testing/overview.rst
+++ b/user_guide_src/source/testing/overview.rst
@@ -195,7 +195,7 @@ Ensure that something you expected to be logged actually was::
 
 Ensure that an event you expected to be triggered actually was::
 
-    Events::on('foo', function($arg) use(&$result) {
+    Events::on('foo', function ($arg) use(&$result) {
         $result = $arg;
     });
 
@@ -384,5 +384,5 @@ An example demonstrating this inside one of your test cases::
     {
         CLI::write('first.');
         $expected = "first.\n";
-        $this->assertEquals($expected, CITestStreamFilter::$buffer);
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
diff --git a/user_guide_src/source/testing/response.rst b/user_guide_src/source/testing/response.rst
index a5cc1749f58d..4152feff03d1 100644
--- a/user_guide_src/source/testing/response.rst
+++ b/user_guide_src/source/testing/response.rst
@@ -40,8 +40,7 @@ Returns a boolean true/false based on whether the response is perceived to be "o
 a response status code in the 200 or 300's.
 ::
 
-    if ($result->isOK())
-    {
+    if ($result->isOK()) {
         ...
     }
 
@@ -57,8 +56,7 @@ This assertion simply uses the **isOK()** method to test a response. **assertNot
 Returns a boolean true/false based on whether the response is a redirected response.
 ::
 
-    if ($result->isRedirect())
-    {
+    if ($result->isRedirect()) {
         ...
     }
 
@@ -314,7 +312,7 @@ Asserts that $fragment is found within the JSON response. It does not need to ma
 
     // Response body is this:
     [
-        'config' => ['key-a', 'key-b']
+        'config' => ['key-a', 'key-b'],
     ]
 
     // Is true
diff --git a/user_guide_src/source/tutorial/conclusion.rst b/user_guide_src/source/tutorial/conclusion.rst
index 613b56b7e24f..afb38465904b 100644
--- a/user_guide_src/source/tutorial/conclusion.rst
+++ b/user_guide_src/source/tutorial/conclusion.rst
@@ -1,5 +1,5 @@
 Conclusion
-###############################################################################
+##########
 
 This tutorial did not cover all of the things you might expect of a
 full-fledged content management system, but it introduced you to the
diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index d7a1ed8b321e..6b8dd53bd458 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -1,5 +1,5 @@
 Create news items
-###############################################################################
+#################
 
 You now know how you can read data from a database using CodeIgniter, but
 you haven't written any information to the database yet. In this section,
@@ -7,7 +7,7 @@ you'll expand your news controller and model created earlier to include
 this functionality.
 
 Create a form
--------------------------------------------------------
+-------------
 
 To input data into the database, you need to create a form where you can
 input the information to be stored. This means you'll be needing a form
@@ -50,21 +50,18 @@ validation <../libraries/validation>` library to do this.
         $model = new NewsModel();
 
         if ($this->request->getMethod() === 'post' && $this->validate([
-                'title' => 'required|min_length[3]|max_length[255]',
-                'body'  => 'required',
-            ]))
-        {
+            'title' => 'required|min_length[3]|max_length[255]',
+            'body'  => 'required',
+        ])) {
             $model->save([
                 'title' => $this->request->getPost('title'),
-                'slug'  => url_title($this->request->getPost('title'), '-', TRUE),
+                'slug'  => url_title($this->request->getPost('title'), '-', true),
                 'body'  => $this->request->getPost('body'),
             ]);
 
             echo view('news/success');
-            
-        }
-        else
-        {
+
+        } else {
             echo view('templates/header', ['title' => 'Create a news item']);
             echo view('news/create');
             echo view('templates/footer');
diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
index 3ee34cfa1ba8..054b030e61e9 100644
--- a/user_guide_src/source/tutorial/news_section.rst
+++ b/user_guide_src/source/tutorial/news_section.rst
@@ -107,8 +107,7 @@ following code to your model.
 
     public function getNews($slug = false)
     {
-        if ($slug === false)
-        {
+        if ($slug === false) {
             return $this->findAll();
         }
 
@@ -243,7 +242,7 @@ add some code to the controller and create a new view. Go back to the
 
 ::
 
-    public function view($slug = NULL)
+    public function view($slug = null)
     {
         $model = new NewsModel();
 
diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
index a68a7e9d249a..54dfdce6a369 100644
--- a/user_guide_src/source/tutorial/static_pages.rst
+++ b/user_guide_src/source/tutorial/static_pages.rst
@@ -129,8 +129,7 @@ in the ``Pages`` controller created above:
 
     public function view($page = 'home')
     {
-        if ( ! is_file(APPPATH.'/Views/pages/'.$page.'.php'))
-        {
+        if ( ! is_file(APPPATH.'/Views/pages/'.$page.'.php')) {
             // Whoops, we don't have a page for that!
             throw new \CodeIgniter\Exceptions\PageNotFoundException($page);
         }

From b24b48345144715df038dd14f8a188e43a1122ec Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 31 Aug 2021 13:52:11 +0700
Subject: [PATCH 0145/2325] [Rector] Apply Rector:
 FixClassCaseSensitivityNameRector

---
 rector.php                                       |  2 ++
 .../system/Cache/Handlers/PredisHandlerTest.php  |  4 ++--
 tests/system/Config/DotEnvTest.php               | 16 ++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/rector.php b/rector.php
index 77b014df2559..054ed3ea09ad 100644
--- a/rector.php
+++ b/rector.php
@@ -20,6 +20,7 @@
 use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector;
+use Rector\CodeQuality\Rector\Name\FixClassCaseSensitivityNameRector;
 use Rector\CodeQuality\Rector\Return_\SimplifyUselessVariableRector;
 use Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector;
 use Rector\CodingStyle\Rector\ClassMethod\FuncGetArgsToVariadicParamRector;
@@ -135,4 +136,5 @@
     $services->set(RemoveExtraParametersRector::class);
     $services->set(FuncGetArgsToVariadicParamRector::class);
     $services->set(MakeInheritedMethodVisibilitySameAsParentRector::class);
+    $services->set(FixClassCaseSensitivityNameRector::class);
 };
diff --git a/tests/system/Cache/Handlers/PredisHandlerTest.php b/tests/system/Cache/Handlers/PredisHandlerTest.php
index 22106c6c09aa..df6dfdbfbaef 100644
--- a/tests/system/Cache/Handlers/PredisHandlerTest.php
+++ b/tests/system/Cache/Handlers/PredisHandlerTest.php
@@ -62,10 +62,10 @@ public function testNew()
 
     public function testDestruct()
     {
-        $this->PredisHandler = new PRedisHandler($this->config);
+        $this->PredisHandler = new PredisHandler($this->config);
         $this->PredisHandler->initialize();
 
-        $this->assertInstanceOf(PRedisHandler::class, $this->PredisHandler);
+        $this->assertInstanceOf(PredisHandler::class, $this->PredisHandler);
     }
 
     /**
diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php
index 9943d20d3a73..dbdb1c1c6743 100644
--- a/tests/system/Config/DotEnvTest.php
+++ b/tests/system/Config/DotEnvTest.php
@@ -123,7 +123,7 @@ public function testLoadsUnreadableFile()
 
     public function testQuotedDotenvLoadsEnvironmentVars()
     {
-        $dotenv = new Dotenv($this->fixturesFolder, 'quoted.env');
+        $dotenv = new DotEnv($this->fixturesFolder, 'quoted.env');
         $dotenv->load();
         $this->assertSame('bar', getenv('QFOO'));
         $this->assertSame('baz', getenv('QBAR'));
@@ -138,13 +138,13 @@ public function testSpacedValuesWithoutQuotesThrowsException()
         $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage('.env values containing spaces must be surrounded by quotes.');
 
-        $dotenv = new Dotenv($this->fixturesFolder, 'spaced-wrong.env');
+        $dotenv = new DotEnv($this->fixturesFolder, 'spaced-wrong.env');
         $dotenv->load();
     }
 
     public function testLoadsServerGlobals()
     {
-        $dotenv = new Dotenv($this->fixturesFolder, '.env');
+        $dotenv = new DotEnv($this->fixturesFolder, '.env');
         $dotenv->load();
 
         $this->assertSame('bar', $_SERVER['FOO']);
@@ -155,7 +155,7 @@ public function testLoadsServerGlobals()
 
     public function testNamespacedVariables()
     {
-        $dotenv = new Dotenv($this->fixturesFolder, '.env');
+        $dotenv = new DotEnv($this->fixturesFolder, '.env');
         $dotenv->load();
 
         $this->assertSame('complex', $_SERVER['SimpleConfig.simple.name']);
@@ -164,7 +164,7 @@ public function testNamespacedVariables()
     public function testLoadsGetServerVar()
     {
         $_SERVER['SER_VAR'] = 'TT';
-        $dotenv             = new Dotenv($this->fixturesFolder, 'nested.env');
+        $dotenv             = new DotEnv($this->fixturesFolder, 'nested.env');
         $dotenv->load();
 
         $this->assertSame('TT', $_ENV['NVAR7']);
@@ -172,7 +172,7 @@ public function testLoadsGetServerVar()
 
     public function testLoadsEnvGlobals()
     {
-        $dotenv = new Dotenv($this->fixturesFolder);
+        $dotenv = new DotEnv($this->fixturesFolder);
         $dotenv->load();
         $this->assertSame('bar', $_ENV['FOO']);
         $this->assertSame('baz', $_ENV['BAR']);
@@ -182,7 +182,7 @@ public function testLoadsEnvGlobals()
 
     public function testNestedEnvironmentVars()
     {
-        $dotenv = new Dotenv($this->fixturesFolder, 'nested.env');
+        $dotenv = new DotEnv($this->fixturesFolder, 'nested.env');
         $dotenv->load();
         $this->assertSame('{$NVAR1} {$NVAR2}', $_ENV['NVAR3']); // not resolved
         $this->assertSame('Hello World!', $_ENV['NVAR4']);
@@ -192,7 +192,7 @@ public function testNestedEnvironmentVars()
 
     public function testDotenvAllowsSpecialCharacters()
     {
-        $dotenv = new Dotenv($this->fixturesFolder, 'specialchars.env');
+        $dotenv = new DotEnv($this->fixturesFolder, 'specialchars.env');
         $dotenv->load();
         $this->assertSame('$a6^C7k%zs+e^.jvjXk', getenv('SPVAR1'));
         $this->assertSame('?BUty3koaV3%GA*hMAwH}B', getenv('SPVAR2'));

From ab580bae7197fc04467d8269745850e0cfbb00bf Mon Sep 17 00:00:00 2001
From: Alex Schmitz <40514119+sfadschm@users.noreply.github.com>
Date: Tue, 31 Aug 2021 12:33:14 +0200
Subject: [PATCH 0146/2325] Fix key casting in form_dropdown helper. (#5035)

---
 system/Helpers/form_helper.php          |  6 +++++-
 tests/system/Helpers/FormHelperTest.php | 28 +++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
index bb4f6cd8060f..e33ec2e89137 100644
--- a/system/Helpers/form_helper.php
+++ b/system/Helpers/form_helper.php
@@ -298,7 +298,7 @@ function form_dropdown($data = '', $options = [], $selected = [], $extra = ''):
             }
         }
 
-        // standardize selected as strings, like  the option keys will be.
+        // Standardize selected as strings, like the option keys will be
         foreach ($selected as $key => $item) {
             $selected[$key] = (string) $item;
         }
@@ -308,6 +308,7 @@ function form_dropdown($data = '', $options = [], $selected = [], $extra = ''):
         $form     = '<select ' . rtrim(parse_form_attributes($data, $defaults)) . $extra . $multiple . ">\n";
 
         foreach ($options as $key => $val) {
+            // Keys should always be strings for strict comparison
             $key = (string) $key;
 
             if (is_array($val)) {
@@ -318,6 +319,9 @@ function form_dropdown($data = '', $options = [], $selected = [], $extra = ''):
                 $form .= '<optgroup label="' . $key . "\">\n";
 
                 foreach ($val as $optgroupKey => $optgroupVal) {
+                    // Keys should always be strings for strict comparison
+                    $optgroupKey = (string) $optgroupKey;
+
                     $sel = in_array($optgroupKey, $selected, true) ? ' selected="selected"' : '';
                     $form .= '<option value="' . htmlspecialchars($optgroupKey) . '"' . $sel . '>' . $optgroupVal . "</option>\n";
                 }
diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
index e7a669847ed9..4a1ef8fcddcd 100644
--- a/tests/system/Helpers/FormHelperTest.php
+++ b/tests/system/Helpers/FormHelperTest.php
@@ -435,6 +435,34 @@ public function testFormDropdownUnselected()
         $this->assertSame($expected, form_dropdown('cars', $options));
     }
 
+    public function testFormDropdownKeyCasting()
+    {
+        $options = [
+            'Swedish Cars' => [
+                '1' => 'Volvo',
+                '2' => 'Saab',
+            ],
+            2 => [
+                3   => 'Mercedes',
+                '4' => 'Audi',
+            ],
+        ];
+        $selected = [2];
+        $expected = <<<EOH
+            <select name="cars">
+            <optgroup label="Swedish Cars">
+            <option value="1">Volvo</option>
+            <option value="2" selected="selected">Saab</option>
+            </optgroup>
+            <optgroup label="2">
+            <option value="3">Mercedes</option>
+            <option value="4">Audi</option>
+            </optgroup>
+            </select>\n
+            EOH;
+        $this->assertSame($expected, form_dropdown('cars', $options, $selected));
+    }
+
     public function testFormDropdownInferred()
     {
         $options = [

From cca4660e54acad5e77820a218bc0b4a1d16cebca Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Tue, 31 Aug 2021 20:40:48 +0800
Subject: [PATCH 0147/2325] Bump to php-cs-fixer v3.1 (#5045)

---
 tests/system/API/ResponseTraitTest.php             |  4 ++--
 tests/system/ControllerTest.php                    |  4 ++--
 tests/system/Database/Live/GetTest.php             |  2 +-
 tests/system/Database/Migrations/MigrationTest.php |  2 +-
 tests/system/Entity/EntityTest.php                 | 14 +++++++-------
 tests/system/Events/EventsTest.php                 |  2 +-
 tests/system/Models/GeneralModelTest.php           |  4 ++--
 tests/system/Models/InsertModelTest.php            |  4 ++--
 tests/system/Models/SaveModelTest.php              |  6 +++---
 tests/system/Models/UpdateModelTest.php            |  6 +++---
 tests/system/View/ParserTest.php                   |  4 ++--
 utils/PhpCsFixer/CodeIgniter4.php                  |  7 ++++---
 12 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
index b63b7362a600..958be5434689 100644
--- a/tests/system/API/ResponseTraitTest.php
+++ b/tests/system/API/ResponseTraitTest.php
@@ -82,7 +82,7 @@ protected function makeController(array $userConfig = [], string $uri = 'http://
         }
 
         // Create the controller class finally.
-        $controller = new class($this->request, $this->response, $this->formatter) {
+        $controller = new class ($this->request, $this->response, $this->formatter) {
             use ResponseTrait;
 
             protected $request;
@@ -524,7 +524,7 @@ public function testFormatByRequestNegotiateIfFormatIsNotJsonOrXML()
         $request  = new MockIncomingRequest($config, new URI($config->baseURL), null, new UserAgent());
         $response = new MockResponse($config);
 
-        $controller = new class($request, $response) {
+        $controller = new class ($request, $response) {
             use ResponseTrait;
 
             protected $request;
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index d10a9038089c..3d7c205eec0b 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -85,7 +85,7 @@ public function testConstructorHTTPS()
         $original = $_SERVER;
         $_SERVER  = ['HTTPS' => 'on'];
         // make sure we can instantiate one
-        $this->controller         = new class() extends Controller {
+        $this->controller         = new class () extends Controller {
             protected $forceHTTPS = 1;
         };
         $this->controller->initController($this->request, $this->response, $this->logger);
@@ -169,7 +169,7 @@ public function testValidateWithStringRulesFoundUseMessagesParameter()
 
     public function testHelpers()
     {
-        $this->controller      = new class() extends Controller {
+        $this->controller      = new class () extends Controller {
             protected $helpers = [
                 'cookie',
                 'text',
diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php
index 16424c252d29..a2f1aa4f9b89 100644
--- a/tests/system/Database/Live/GetTest.php
+++ b/tests/system/Database/Live/GetTest.php
@@ -227,7 +227,7 @@ public function testGetRowWithReturnType()
 
     public function testGetRowWithCustomReturnType()
     {
-        $testClass = new class() {};
+        $testClass = new class () {};
 
         $user = $this->db->table('user')->get()->getRow(0, get_class($testClass));
 
diff --git a/tests/system/Database/Migrations/MigrationTest.php b/tests/system/Database/Migrations/MigrationTest.php
index 5f89716279a2..1c1561044be0 100644
--- a/tests/system/Database/Migrations/MigrationTest.php
+++ b/tests/system/Database/Migrations/MigrationTest.php
@@ -29,7 +29,7 @@ protected function setUp(): void
 
     public function testDBGroup()
     {
-        $migration             = new class() extends Migration {
+        $migration             = new class () extends Migration {
             protected $DBGroup = 'tests';
 
             public function up()
diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php
index 69d0546510bd..c995f5d7c191 100644
--- a/tests/system/Entity/EntityTest.php
+++ b/tests/system/Entity/EntityTest.php
@@ -762,7 +762,7 @@ public function testAsArraySwapped()
 
     public function testToArraySkipAttributesWithUnderscoreInFirstCharacter()
     {
-        $entity                   = new class() extends Entity {
+        $entity                   = new class () extends Entity {
             protected $attributes = [
                 '_foo' => null,
                 'bar'  => null,
@@ -923,7 +923,7 @@ public function testJsonSerializableEntity()
 
     protected function getEntity()
     {
-        return new class() extends Entity {
+        return new class () extends Entity {
             protected $attributes = [
                 'foo'        => null,
                 'bar'        => null,
@@ -963,7 +963,7 @@ public function getFakeBar()
 
     protected function getMappedEntity()
     {
-        return new class() extends Entity {
+        return new class () extends Entity {
             protected $attributes = [
                 'foo'    => null,
                 'simple' => null,
@@ -994,7 +994,7 @@ protected function getSimple()
 
     protected function getSwappedEntity()
     {
-        return new class() extends Entity {
+        return new class () extends Entity {
             protected $attributes = [
                 'foo' => 'foo',
                 'bar' => 'bar',
@@ -1015,7 +1015,7 @@ protected function getSwappedEntity()
 
     protected function getCastEntity($data = null): Entity
     {
-        return new class($data) extends Entity {
+        return new class ($data) extends Entity {
             protected $attributes = [
                 'first'      => null,
                 'second'     => null,
@@ -1074,7 +1074,7 @@ public function setSeventh($seventh)
 
     protected function getCastNullableEntity()
     {
-        return new class() extends Entity {
+        return new class () extends Entity {
             protected $attributes = [
                 'string_null'           => null,
                 'string_empty'          => null,
@@ -1104,7 +1104,7 @@ protected function getCastNullableEntity()
 
     protected function getCustomCastEntity()
     {
-        return new class() extends Entity {
+        return new class () extends Entity {
             protected $attributes = [
                 'first'  => null,
                 'second' => null,
diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php
index 222722b1448d..bb3b3e87a827 100644
--- a/tests/system/Events/EventsTest.php
+++ b/tests/system/Events/EventsTest.php
@@ -280,7 +280,7 @@ public function testHandleEventCallableInternalFunc()
 
     public function testHandleEventCallableClass()
     {
-        $box = new class() {
+        $box = new class () {
             public $logged;
 
             public function hold(string $value)
diff --git a/tests/system/Models/GeneralModelTest.php b/tests/system/Models/GeneralModelTest.php
index a896764290b2..cc41c453603b 100644
--- a/tests/system/Models/GeneralModelTest.php
+++ b/tests/system/Models/GeneralModelTest.php
@@ -104,7 +104,7 @@ public function testSetAllowedFields(): void
             'updated_at',
         ];
 
-        $model                       = new class() extends Model {
+        $model                       = new class () extends Model {
             protected $allowedFields = [
                 'id',
                 'created_at',
@@ -147,7 +147,7 @@ public function testBuilderWithParameterIgnoresShared(): void
 
     public function testInitialize(): void
     {
-        $model = new class() extends Model {
+        $model = new class () extends Model {
             /**
              * @var bool
              */
diff --git a/tests/system/Models/InsertModelTest.php b/tests/system/Models/InsertModelTest.php
index 93a47999d45f..38b86eb67e30 100644
--- a/tests/system/Models/InsertModelTest.php
+++ b/tests/system/Models/InsertModelTest.php
@@ -157,7 +157,7 @@ public function testInsertResultFail(): void
 
     public function testInsertBatchNewEntityWithDateTime(): void
     {
-        $entity = new class() extends Entity {
+        $entity = new class () extends Entity {
             protected $id;
             protected $name;
             protected $email;
@@ -215,7 +215,7 @@ public function testInsertEntityWithNoDataExceptionNoAllowedData(): void
     {
         $this->createModel(UserModel::class);
 
-        $entity = new class() extends Entity {
+        $entity = new class () extends Entity {
             protected $id;
             protected $name;
             protected $email;
diff --git a/tests/system/Models/SaveModelTest.php b/tests/system/Models/SaveModelTest.php
index 59963c3e4946..17f56a4cb88c 100644
--- a/tests/system/Models/SaveModelTest.php
+++ b/tests/system/Models/SaveModelTest.php
@@ -208,7 +208,7 @@ public function testEmptySaveData(): void
 
     public function testSaveNewEntityWithDateTime(): void
     {
-        $entity = new class() extends Entity {
+        $entity = new class () extends Entity {
             protected $id;
             protected $name;
             protected $email;
@@ -242,7 +242,7 @@ public function testSaveNewEntityWithDateTime(): void
 
     public function testSaveNewEntityWithDate(): void
     {
-        $entity = new class() extends Entity {
+        $entity = new class () extends Entity {
             protected $id;
             protected $name;
             protected $created_at;
@@ -258,7 +258,7 @@ public function testSaveNewEntityWithDate(): void
             ];
         };
 
-        $testModel                   = new class() extends Model {
+        $testModel                   = new class () extends Model {
             protected $table         = 'empty';
             protected $allowedFields = [
                 'name',
diff --git a/tests/system/Models/UpdateModelTest.php b/tests/system/Models/UpdateModelTest.php
index 50847b620c8a..619028a748aa 100644
--- a/tests/system/Models/UpdateModelTest.php
+++ b/tests/system/Models/UpdateModelTest.php
@@ -158,7 +158,7 @@ public function testUpdateBatchValidationFail(): void
 
     public function testUpdateBatchWithEntity(): void
     {
-        $entity1 = new class() extends Entity {
+        $entity1 = new class () extends Entity {
             protected $id;
             protected $name;
             protected $email;
@@ -178,7 +178,7 @@ public function testUpdateBatchWithEntity(): void
             ];
         };
 
-        $entity2 = new class() extends Entity {
+        $entity2 = new class () extends Entity {
             protected $id;
             protected $name;
             protected $email;
@@ -307,7 +307,7 @@ public function testUpdateWithEntityNoAllowedFields(): void
     {
         $this->createModel(UserModel::class);
 
-        $entity = new class() extends Entity {
+        $entity = new class () extends Entity {
             protected $id;
             protected $name;
             protected $email;
diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php
index 547d9b549d0f..a7a97f00c51a 100644
--- a/tests/system/View/ParserTest.php
+++ b/tests/system/View/ParserTest.php
@@ -262,7 +262,7 @@ public function testParseLoopObjectProperties()
 
     public function testParseLoopEntityProperties()
     {
-        $power             = new class() extends Entity {
+        $power             = new class () extends Entity {
             public $foo    = 'bar';
             protected $bar = 'baz';
 
@@ -292,7 +292,7 @@ public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recu
 
     public function testParseLoopEntityObjectProperties()
     {
-        $power                    = new class() extends Entity {
+        $power                    = new class () extends Entity {
             protected $attributes = [
                 'foo'     => 'bar',
                 'bar'     => 'baz',
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
index 4a5643ec923d..05e83b544270 100644
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ b/utils/PhpCsFixer/CodeIgniter4.php
@@ -73,8 +73,6 @@ public function __construct()
             'cast_spaces'                 => ['space' => 'single'],
             'class_attributes_separation' => [
                 'elements' => [
-                    // 'const' => 'one_if_phpdoc', // @todo Enable in php-cs-fixer v3.1
-                    // 'property' => 'one_if_phpdoc', // @todo Enable in php-cs-fixer v3.1
                     'method' => 'one',
                 ],
             ],
@@ -82,8 +80,8 @@ public function __construct()
                 'multi_line_extends_each_single_line' => true,
                 'single_item_single_line'             => true,
                 'single_line'                         => true,
+                'space_before_parenthesis'            => true,
             ],
-            'class_keyword_remove'       => false,
             'clean_namespace'            => true,
             'combine_consecutive_issets' => true,
             'combine_consecutive_unsets' => true,
@@ -103,6 +101,7 @@ public function __construct()
             'constant_case'                        => ['case' => 'lower'],
             'date_time_immutable'                  => false,
             'declare_equal_normalize'              => ['space' => 'none'],
+            'declare_parentheses'                  => true,
             'declare_strict_types'                 => false,
             'dir_constant'                         => true,
             'doctrine_annotation_array_assignment' => false,
@@ -115,6 +114,7 @@ public function __construct()
                 'shorten_simple_statements_only' => false,
             ],
             'elseif'            => true,
+            'empty_loop_body'   => ['style' => 'braces'],
             'encoding'          => true,
             'ereg_to_preg'      => true,
             'error_suppression' => [
@@ -519,6 +519,7 @@ public function __construct()
                 'elements'      => ['arrays'],
             ],
             'trim_array_spaces'               => true,
+            'types_spaces'                    => ['space' => 'none'],
             'unary_operator_spaces'           => true,
             'use_arrow_functions'             => false, // requires PHP7.4+
             'visibility_required'             => ['elements' => ['const', 'method', 'property']],

From 4ab9d66b530ec798f2b06a551a2cab8797161f5d Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 2 Sep 2021 12:32:07 +0800
Subject: [PATCH 0148/2325] Switch to official coding standard (#5038)

* Switch to official coding standard

* Update .no-header.php-cs-fixer.dist.php

Co-authored-by: Abdul Malik Ikhsan <samsonasik@gmail.com>
---
 .github/workflows/test-phpunit.yml            |   2 +-
 .no-header.php-cs-fixer.dist.php              |  16 +-
 .php-cs-fixer.dist.php                        |  13 +-
 admin/framework/composer.json                 |   5 +-
 app/Config/Services.php                       |  19 +-
 composer.json                                 |   5 +-
 system/Database/BaseConnection.php            |   2 +-
 system/Email/Email.php                        |   4 +-
 system/Session/Session.php                    |   2 +-
 system/Test/Mock/MockIncomingRequest.php      |   5 -
 system/Typography/Typography.php              |   4 +-
 tests/system/CLI/CLITest.php                  |  17 +-
 .../system/Cache/Handlers/FileHandlerTest.php |   4 +-
 tests/system/Config/ServicesTest.php          |  11 -
 tests/system/I18n/TimeTest.php                |  13 -
 tests/system/Test/TestCaseTest.php            |  10 -
 utils/PhpCsFixer/CodeIgniter4.php             | 540 ------------------
 .../Comment/SpaceAfterCommentStartFixer.php   |  95 ---
 18 files changed, 48 insertions(+), 719 deletions(-)
 delete mode 100644 utils/PhpCsFixer/CodeIgniter4.php
 delete mode 100644 utils/PhpCsFixer/Fixer/Comment/SpaceAfterCommentStartFixer.php

diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 35dc86f8b4d1..c093190233cb 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -123,7 +123,7 @@ jobs:
       - name: Install dependencies
         run: |
           composer update --ansi --no-interaction
-          composer remove --ansi --dev --unused -W rector/rector phpstan/phpstan friendsofphp/php-cs-fixer nexusphp/cs-config
+          composer remove --ansi --dev --unused -W rector/rector phpstan/phpstan friendsofphp/php-cs-fixer nexusphp/cs-config codeigniter/coding-standard
           php -r 'file_put_contents("vendor/laminas/laminas-zendframework-bridge/src/autoload.php", "");'
         env:
           COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
diff --git a/.no-header.php-cs-fixer.dist.php b/.no-header.php-cs-fixer.dist.php
index 8f7eb0a71cf1..acfdbf48e1b7 100644
--- a/.no-header.php-cs-fixer.dist.php
+++ b/.no-header.php-cs-fixer.dist.php
@@ -11,10 +11,11 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+use CodeIgniter\CodingStandard\CodeIgniter4;
 use Nexus\CsConfig\Factory;
+use Nexus\CsConfig\Fixer\Comment\SpaceAfterCommentStartFixer;
+use Nexus\CsConfig\FixerGenerator;
 use PhpCsFixer\Finder;
-use Utils\PhpCsFixer\CodeIgniter4;
-use Utils\PhpCsFixer\Fixer\Comment\SpaceAfterCommentStartFixer;
 
 $finder = Finder::create()
     ->files()
@@ -22,18 +23,17 @@
         __DIR__ . '/admin',
         __DIR__ . '/app',
         __DIR__ . '/public',
-    ]);
+    ])
+    ->notName('#Logger\.php$#');
 
 $overrides = [];
 
 $options = [
     'cacheFile'    => 'build/.no-header.php-cs-fixer.cache',
     'finder'       => $finder,
-    'customFixers' => [
-        new SpaceAfterCommentStartFixer(),
-    ],
-    'customRules' => [
-        'CodeIgniter4/space_after_comment_start' => true,
+    'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
+    'customRules'  => [
+        SpaceAfterCommentStartFixer::name() => true,
     ],
 ];
 
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 95478343a53a..f362a830f99e 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -11,10 +11,11 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+use CodeIgniter\CodingStandard\CodeIgniter4;
 use Nexus\CsConfig\Factory;
+use Nexus\CsConfig\Fixer\Comment\SpaceAfterCommentStartFixer;
+use Nexus\CsConfig\FixerGenerator;
 use PhpCsFixer\Finder;
-use Utils\PhpCsFixer\CodeIgniter4;
-use Utils\PhpCsFixer\Fixer\Comment\SpaceAfterCommentStartFixer;
 
 $finder = Finder::create()
     ->files()
@@ -37,11 +38,9 @@
 $options = [
     'cacheFile'    => 'build/.php-cs-fixer.cache',
     'finder'       => $finder,
-    'customFixers' => [
-        new SpaceAfterCommentStartFixer(),
-    ],
-    'customRules' => [
-        'CodeIgniter4/space_after_comment_start' => true,
+    'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
+    'customRules'  => [
+        SpaceAfterCommentStartFixer::name() => true,
     ],
 ];
 
diff --git a/admin/framework/composer.json b/admin/framework/composer.json
index d65d30bdbed5..6e3852d2af79 100644
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@@ -15,10 +15,11 @@
         "psr/log": "^1.1"
     },
     "require-dev": {
+        "codeigniter/coding-standard": "^1.1",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "^3.0",
+        "friendsofphp/php-cs-fixer": "^3.1",
         "mikey179/vfsstream": "^1.6",
-        "nexusphp/cs-config": "^3.1",
+        "nexusphp/cs-config": "^3.3",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1"
     },
diff --git a/app/Config/Services.php b/app/Config/Services.php
index 946be65a11c2..df7c8ad08600 100644
--- a/app/Config/Services.php
+++ b/app/Config/Services.php
@@ -19,13 +19,14 @@
  */
 class Services extends BaseService
 {
-    // public static function example($getShared = true)
-    // {
-    //     if ($getShared)
-    //     {
-    //         return static::getSharedInstance('example');
-    //     }
-    //
-    //     return new \CodeIgniter\Example();
-    // }
+    /*
+     * public static function example($getShared = true)
+     * {
+     *     if ($getShared) {
+     *         return static::getSharedInstance('example');
+     *     }
+     *
+     *     return new \CodeIgniter\Example();
+     * }
+     */
 }
diff --git a/composer.json b/composer.json
index 66a38a215e5c..7b9d50b8e620 100644
--- a/composer.json
+++ b/composer.json
@@ -15,10 +15,11 @@
         "psr/log": "^1.1"
     },
     "require-dev": {
+        "codeigniter/coding-standard": "^1.1",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "^3.0",
+        "friendsofphp/php-cs-fixer": "^3.1",
         "mikey179/vfsstream": "^1.6",
-        "nexusphp/cs-config": "^3.1",
+        "nexusphp/cs-config": "^3.3",
         "nexusphp/tachycardia": "^1.0",
         "phpstan/phpstan": "^0.12.91",
         "phpunit/phpunit": "^9.1",
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index c7bec269c472..70bde67b6d50 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -1004,7 +1004,7 @@ public function protectIdentifiers($item, bool $prefixSingle = false, ?bool $pro
             // we have nothing more to do other than escape the item
             //
             // NOTE: The ! empty() condition prevents this method
-            //       from breaking when QB isn't enabled.
+            // from breaking when QB isn't enabled.
             if (! empty($this->aliasedTables) && in_array($parts[0], $this->aliasedTables, true)) {
                 if ($protectIdentifiers === true) {
                     foreach ($parts as $key => $val) {
diff --git a/system/Email/Email.php b/system/Email/Email.php
index c07f79d80df6..966c08e6f830 100644
--- a/system/Email/Email.php
+++ b/system/Email/Email.php
@@ -1459,8 +1459,8 @@ protected function prepQEncoding($str)
 
         if ($this->charset === 'UTF-8') {
             // Note: We used to have mb_encode_mimeheader() as the first choice
-            //       here, but it turned out to be buggy and unreliable. DO NOT
-            //       re-add it! -- Narf
+            // here, but it turned out to be buggy and unreliable. DO NOT
+            // re-add it! -- Narf
             if (extension_loaded('iconv')) {
                 $output = @iconv_mime_encode('', $str, [
                     'scheme'           => 'Q',
diff --git a/system/Session/Session.php b/system/Session/Session.php
index 27ba502aea36..5fc1bda6005e 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -565,7 +565,7 @@ public function __set(string $key, $value)
     public function __get(string $key)
     {
         // Note: Keep this order the same, just in case somebody wants to
-        //       use 'session_id' as a session data key, for whatever reason
+        // use 'session_id' as a session data key, for whatever reason
         if (isset($_SESSION[$key])) {
             return $_SESSION[$key];
         }
diff --git a/system/Test/Mock/MockIncomingRequest.php b/system/Test/Mock/MockIncomingRequest.php
index 522965f46998..05c9587d4170 100644
--- a/system/Test/Mock/MockIncomingRequest.php
+++ b/system/Test/Mock/MockIncomingRequest.php
@@ -15,11 +15,6 @@
 
 class MockIncomingRequest extends IncomingRequest
 {
-    //    public function populateHeaders()
-    //    {
-    //        // Don't do anything... force the tester to manually set the headers they want.
-    //    }
-
     protected function detectURI($protocol, $baseURL)
     {
         // Do nothing...
diff --git a/system/Typography/Typography.php b/system/Typography/Typography.php
index 9ad2dd3914c8..a5ecebd69ddc 100644
--- a/system/Typography/Typography.php
+++ b/system/Typography/Typography.php
@@ -155,12 +155,12 @@ public function autoTypography(string $str, bool $reduceLinebreaks = false): str
                 continue;
             }
 
-            //  Force a newline to make sure end tags get processed by _format_newlines()
+            // Force a newline to make sure end tags get processed by _format_newlines()
             if ($i === $c) {
                 $chunks[$i] .= "\n";
             }
 
-            //  Convert Newlines into <p> and <br /> tags
+            // Convert Newlines into <p> and <br /> tags
             $str .= $this->formatNewLines($chunks[$i]);
         }
 
diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php
index 51dbe3611684..68008ccc1e4d 100644
--- a/tests/system/CLI/CLITest.php
+++ b/tests/system/CLI/CLITest.php
@@ -75,14 +75,15 @@ public function testWait()
         // The problem: if the block below is enabled, the phpunit tests
         // go catatonic when it is executed, presumably because of
         // the CLI::input() waiting for a key press
-        //      // test the press any key to continue...
-        //      stream_filter_register('CLITestKeyboardFilter', 'CodeIgniter\CLI\CLITestKeyboardFilter');
-        //      $spoofer = stream_filter_append(STDIN, 'CLITestKeyboardFilter');
-        //      $time = time();
-        //      CLITestKeyboardFilter::$spoofed = ' ';
-        //      CLI::wait(0);
-        //      stream_filter_remove($spoofer);
-        //      $this->assertEquals(0, time() - $time);
+        //
+        // // test the press any key to continue...
+        // stream_filter_register('CLITestKeyboardFilter', 'CodeIgniter\CLI\CLITestKeyboardFilter');
+        // $spoofer = stream_filter_append(STDIN, 'CLITestKeyboardFilter');
+        // $time = time();
+        // CLITestKeyboardFilter::$spoofed = ' ';
+        // CLI::wait(0);
+        // stream_filter_remove($spoofer);
+        // $this->assertEquals(0, time() - $time);
     }
 
     public function testIsWindows()
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index ea5a095631e0..bfd379ae9d8f 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -221,8 +221,8 @@ public function testDecrement()
         $this->fileHandler->save(self::$key1, 10);
         $this->fileHandler->save(self::$key2, 'value');
 
-        //  Line following commented out to force the cache to add a zero entry for key3
-        //      $this->fileHandler->save(self::$key3, 0);
+        // Line following commented out to force the cache to add a zero entry for key3
+        // $this->fileHandler->save(self::$key3, 0);
 
         $this->assertSame(9, $this->fileHandler->decrement(self::$key1, 1));
         $this->assertFalse($this->fileHandler->decrement(self::$key2, 1));
diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php
index 44d65b1ebfc7..6733ee06fff6 100644
--- a/tests/system/Config/ServicesTest.php
+++ b/tests/system/Config/ServicesTest.php
@@ -147,17 +147,6 @@ public function testNewImage()
         $this->assertInstanceOf(ImageHandlerInterface::class, $actual);
     }
 
-    //  public function testNewMigrationRunner()
-    //  {
-    //      //FIXME - docs aren't clear about setting this up to just make sure that the service
-    //      // returns a MigrationRunner
-    //      $config = new \Config\Migrations();
-    //      $db = new \CodeIgniter\Database\MockConnection([]);
-    //      $this->expectException('InvalidArgumentException');
-    //      $actual = Services::migrations($config, $db);
-    //      $this->assertInstanceOf(\CodeIgniter\Database\MigrationRunner::class, $actual);
-    //  }
-    //
     public function testNewNegotiatorWithNullConfig()
     {
         $actual = Services::negotiator(null);
diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php
index 70b5ca05fbd7..2da8e5accbf3 100644
--- a/tests/system/I18n/TimeTest.php
+++ b/tests/system/I18n/TimeTest.php
@@ -643,19 +643,6 @@ public function testToFormattedDateString()
         $this->assertSame('May 10, 2017', $time->toFormattedDateString());
     }
 
-    /**
-     * Unfortunately, ubuntu 14.04 (on TravisCI) fails this test and
-     * shows a numeric version of the month instead of the textual version.
-     * Confirmed on CentOS 7 as well.
-     * Example: format 'MMM' for November returns 'M02' instead of 'Nov'
-     * Not sure what the fix is just yet....
-     */
-    //    public function testToFormattedDateString()
-    //    {
-    //        $time = Time::parse('February 10, 2017', 'America/Chicago');
-    //        $this->assertEquals('Feb 10, 2017', $time->toFormattedDateString());
-    //    }
-
     public function testToTimeString()
     {
         $time = Time::parse('January 10, 2017 13:20:33', 'America/Chicago');
diff --git a/tests/system/Test/TestCaseTest.php b/tests/system/Test/TestCaseTest.php
index a2c798d21cc6..5db2832fa12d 100644
--- a/tests/system/Test/TestCaseTest.php
+++ b/tests/system/Test/TestCaseTest.php
@@ -22,15 +22,6 @@
  */
 final class TestCaseTest extends CIUnitTestCase
 {
-    //  protected function tearDown(): void
-    //  {
-    //      $buffer = ob_clean();
-    //      if (ob_get_level() > 0)
-    //      {
-    //          ob_end_clean();
-    //      }
-    //  }
-    //
     public function testGetPrivatePropertyWithObject()
     {
         $obj    = new __TestForReflectionHelper();
@@ -86,7 +77,6 @@ public function testPHPUnitHeadersEmitted()
         $response->send();
         ob_end_clean();
 
-        // Did PHPunit do its thing?
         $this->assertHeaderEmitted('Content-type: text/html;');
         $this->assertHeaderNotEmitted('Set-Cookie: foo=bar;');
     }
diff --git a/utils/PhpCsFixer/CodeIgniter4.php b/utils/PhpCsFixer/CodeIgniter4.php
deleted file mode 100644
index 05e83b544270..000000000000
--- a/utils/PhpCsFixer/CodeIgniter4.php
+++ /dev/null
@@ -1,540 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * This file is part of CodeIgniter 4 framework.
- *
- * (c) CodeIgniter Foundation <admin@codeigniter.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Utils\PhpCsFixer;
-
-use Nexus\CsConfig\Ruleset\AbstractRuleset;
-
-/**
- * Defines the ruleset used for the CodeIgniter4 organization.
- *
- * @internal
- */
-final class CodeIgniter4 extends AbstractRuleset
-{
-    public function __construct()
-    {
-        $this->name = 'CodeIgniter4 Revised Coding Standards';
-
-        $this->rules = [
-            'align_multiline_comment' => ['comment_type' => 'phpdocs_only'],
-            'array_indentation'       => true,
-            'array_push'              => true,
-            'array_syntax'            => ['syntax' => 'short'],
-            'backtick_to_shell_exec'  => true,
-            'binary_operator_spaces'  => [
-                'default'   => 'single_space',
-                'operators' => [
-                    '='  => 'align_single_space_minimal',
-                    '=>' => 'align_single_space_minimal',
-                    '||' => 'align_single_space_minimal',
-                    '.=' => 'align_single_space_minimal',
-                ],
-            ],
-            'blank_line_after_namespace'   => true,
-            'blank_line_after_opening_tag' => true,
-            'blank_line_before_statement'  => [
-                'statements' => [
-                    'case',
-                    'continue',
-                    'declare',
-                    'default',
-                    'do',
-                    'exit',
-                    'for',
-                    'foreach',
-                    'goto',
-                    'return',
-                    'switch',
-                    'throw',
-                    'try',
-                    'while',
-                    'yield',
-                    'yield_from',
-                ],
-            ],
-            'braces' => [
-                'allow_single_line_anonymous_class_with_empty_body' => true,
-                'allow_single_line_closure'                         => true,
-                'position_after_anonymous_constructs'               => 'same',
-                'position_after_control_structures'                 => 'same',
-                'position_after_functions_and_oop_constructs'       => 'next',
-            ],
-            'cast_spaces'                 => ['space' => 'single'],
-            'class_attributes_separation' => [
-                'elements' => [
-                    'method' => 'one',
-                ],
-            ],
-            'class_definition' => [
-                'multi_line_extends_each_single_line' => true,
-                'single_item_single_line'             => true,
-                'single_line'                         => true,
-                'space_before_parenthesis'            => true,
-            ],
-            'clean_namespace'            => true,
-            'combine_consecutive_issets' => true,
-            'combine_consecutive_unsets' => true,
-            'combine_nested_dirname'     => true,
-            'comment_to_phpdoc'          => [
-                'ignored_tags' => [
-                    'todo',
-                    'codeCoverageIgnore',
-                    'codeCoverageIgnoreStart',
-                    'codeCoverageIgnoreEnd',
-                    'phpstan-ignore-line',
-                    'phpstan-ignore-next-line',
-                ],
-            ],
-            'compact_nullable_typehint'            => true,
-            'concat_space'                         => ['spacing' => 'one'],
-            'constant_case'                        => ['case' => 'lower'],
-            'date_time_immutable'                  => false,
-            'declare_equal_normalize'              => ['space' => 'none'],
-            'declare_parentheses'                  => true,
-            'declare_strict_types'                 => false,
-            'dir_constant'                         => true,
-            'doctrine_annotation_array_assignment' => false,
-            'doctrine_annotation_braces'           => false,
-            'doctrine_annotation_indentation'      => false,
-            'doctrine_annotation_spaces'           => false,
-            'echo_tag_syntax'                      => [
-                'format'                         => 'short',
-                'long_function'                  => 'echo',
-                'shorten_simple_statements_only' => false,
-            ],
-            'elseif'            => true,
-            'empty_loop_body'   => ['style' => 'braces'],
-            'encoding'          => true,
-            'ereg_to_preg'      => true,
-            'error_suppression' => [
-                'mute_deprecation_error'         => true,
-                'noise_remaining_usages'         => false,
-                'noise_remaining_usages_exclude' => [],
-            ],
-            'escape_implicit_backslashes' => [
-                'double_quoted'  => true,
-                'heredoc_syntax' => true,
-                'single_quoted'  => false,
-            ],
-            'explicit_indirect_variable' => true,
-            'explicit_string_variable'   => true,
-            'final_class'                => false,
-            'final_internal_class'       => [
-                'annotation_exclude'                         => ['@no-final'],
-                'annotation_include'                         => ['@internal'],
-                'consider_absent_docblock_as_internal_class' => false,
-            ],
-            'final_public_method_for_abstract_class' => false,
-            'fopen_flag_order'                       => true,
-            'fopen_flags'                            => ['b_mode' => true],
-            'full_opening_tag'                       => true,
-            'fully_qualified_strict_types'           => true,
-            'function_declaration'                   => ['closure_function_spacing' => 'one'],
-            'function_to_constant'                   => [
-                'functions' => [
-                    'get_called_class',
-                    'get_class',
-                    'get_class_this',
-                    'php_sapi_name',
-                    'phpversion',
-                    'pi',
-                ],
-            ],
-            'function_typehint_space'          => true,
-            'general_phpdoc_annotation_remove' => [
-                'annotations' => [
-                    'author',
-                    'package',
-                    'subpackage',
-                ],
-            ],
-            'general_phpdoc_tag_rename' => [
-                'case_sensitive' => false,
-                'fix_annotation' => true,
-                'fix_inline'     => true,
-                'replacements'   => ['inheritDocs' => 'inheritDoc'],
-            ],
-            'global_namespace_import'     => false,
-            'group_import'                => false,
-            'header_comment'              => false, // false by default
-            'heredoc_indentation'         => ['indentation' => 'start_plus_one'],
-            'heredoc_to_nowdoc'           => true,
-            'implode_call'                => true,
-            'include'                     => true,
-            'increment_style'             => ['style' => 'post'],
-            'indentation_type'            => true,
-            'is_null'                     => true,
-            'lambda_not_used_import'      => true,
-            'line_ending'                 => true,
-            'linebreak_after_opening_tag' => true,
-            'list_syntax'                 => ['syntax' => 'short'],
-            'logical_operators'           => true,
-            'lowercase_cast'              => true,
-            'lowercase_keywords'          => true,
-            'lowercase_static_reference'  => true,
-            'magic_constant_casing'       => true,
-            'magic_method_casing'         => true,
-            'mb_str_functions'            => false,
-            'method_argument_space'       => [
-                'after_heredoc'                    => false,
-                'keep_multiple_spaces_after_comma' => false,
-                'on_multiline'                     => 'ensure_fully_multiline',
-            ],
-            'method_chaining_indentation'                 => true,
-            'modernize_types_casting'                     => true,
-            'multiline_comment_opening_closing'           => true,
-            'multiline_whitespace_before_semicolons'      => ['strategy' => 'no_multi_line'],
-            'native_constant_invocation'                  => false,
-            'native_function_casing'                      => true,
-            'native_function_invocation'                  => false,
-            'native_function_type_declaration_casing'     => true,
-            'new_with_braces'                             => true,
-            'no_alias_functions'                          => ['sets' => ['@all']],
-            'no_alias_language_construct_call'            => true,
-            'no_alternative_syntax'                       => false,
-            'no_binary_string'                            => true,
-            'no_blank_lines_after_class_opening'          => true,
-            'no_blank_lines_after_phpdoc'                 => true,
-            'no_blank_lines_before_namespace'             => false, // conflicts with `single_blank_line_before_namespace`
-            'no_break_comment'                            => ['comment_text' => 'no break'],
-            'no_closing_tag'                              => true,
-            'no_empty_comment'                            => true,
-            'no_empty_phpdoc'                             => true,
-            'no_empty_statement'                          => true,
-            'no_extra_blank_lines'                        => ['tokens' => ['extra']],
-            'no_homoglyph_names'                          => true,
-            'no_leading_import_slash'                     => true,
-            'no_leading_namespace_whitespace'             => true,
-            'no_mixed_echo_print'                         => ['use' => 'echo'],
-            'no_multiline_whitespace_around_double_arrow' => true,
-            'no_null_property_initialization'             => true,
-            'no_php4_constructor'                         => true,
-            'no_short_bool_cast'                          => true,
-            'no_singleline_whitespace_before_semicolons'  => true,
-            'no_spaces_after_function_name'               => true,
-            'no_spaces_around_offset'                     => ['positions' => ['inside', 'outside']],
-            'no_spaces_inside_parenthesis'                => true,
-            'no_superfluous_elseif'                       => true,
-            'no_superfluous_phpdoc_tags'                  => [
-                'allow_mixed'         => true,
-                'allow_unused_params' => true,
-                'remove_inheritdoc'   => false,
-            ],
-            'no_trailing_comma_in_list_call'        => true,
-            'no_trailing_comma_in_singleline_array' => true,
-            'no_trailing_whitespace'                => true,
-            'no_trailing_whitespace_in_comment'     => true,
-            'no_trailing_whitespace_in_string'      => true,
-            'no_unneeded_control_parentheses'       => [
-                'statements' => [
-                    'break',
-                    'clone',
-                    'continue',
-                    'echo_print',
-                    'return',
-                    'switch_case',
-                    'yield',
-                ],
-            ],
-            'no_unneeded_curly_braces'                         => ['namespaces' => true],
-            'no_unneeded_final_method'                         => ['private_methods' => true],
-            'no_unreachable_default_argument_value'            => true,
-            'no_unset_cast'                                    => true,
-            'no_unset_on_property'                             => false,
-            'no_unused_imports'                                => true,
-            'no_useless_else'                                  => true,
-            'no_useless_return'                                => true,
-            'no_useless_sprintf'                               => true,
-            'no_whitespace_before_comma_in_array'              => ['after_heredoc' => true],
-            'no_whitespace_in_blank_line'                      => true,
-            'non_printable_character'                          => ['use_escape_sequences_in_strings' => true],
-            'normalize_index_brace'                            => true,
-            'not_operator_with_space'                          => false,
-            'not_operator_with_successor_space'                => true,
-            'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
-            'object_operator_without_whitespace'               => true,
-            'operator_linebreak'                               => ['only_booleans' => true, 'position' => 'beginning'],
-            'ordered_class_elements'                           => false,
-            'ordered_imports'                                  => [
-                'sort_algorithm' => 'alpha',
-                'imports_order'  => ['class', 'function', 'const'],
-            ],
-            'ordered_interfaces' => false,
-            'ordered_traits'     => false,
-            'php_unit_construct' => [
-                'assertions' => [
-                    'assertSame',
-                    'assertEquals',
-                    'assertNotEquals',
-                    'assertNotSame',
-                ],
-            ],
-            'php_unit_dedicate_assert'               => ['target' => 'newest'],
-            'php_unit_dedicate_assert_internal_type' => ['target' => 'newest'],
-            'php_unit_expectation'                   => ['target' => 'newest'],
-            'php_unit_fqcn_annotation'               => true,
-            'php_unit_internal_class'                => ['types' => ['normal', 'final']],
-            'php_unit_method_casing'                 => ['case' => 'camel_case'],
-            'php_unit_mock'                          => ['target' => 'newest'],
-            'php_unit_mock_short_will_return'        => true,
-            'php_unit_namespaced'                    => ['target' => 'newest'],
-            'php_unit_no_expectation_annotation'     => [
-                'target'          => 'newest',
-                'use_class_const' => true,
-            ],
-            'php_unit_set_up_tear_down_visibility' => true,
-            'php_unit_size_class'                  => false,
-            'php_unit_strict'                      => [
-                'assertions' => [
-                    'assertAttributeEquals',
-                    'assertAttributeNotEquals',
-                    'assertEquals',
-                    'assertNotEquals',
-                ],
-            ],
-            'php_unit_test_annotation'               => ['style' => 'prefix'],
-            'php_unit_test_case_static_method_calls' => [
-                'call_type' => 'this',
-                'methods'   => [],
-            ],
-            'php_unit_test_class_requires_covers' => false,
-            'phpdoc_add_missing_param_annotation' => ['only_untyped' => true],
-            'phpdoc_align'                        => [
-                'align' => 'vertical',
-                'tags'  => [
-                    'method',
-                    'param',
-                    'property',
-                    'return',
-                    'throws',
-                    'type',
-                    'var',
-                ],
-            ],
-            'phpdoc_annotation_without_dot' => false,
-            'phpdoc_indent'                 => true,
-            'phpdoc_inline_tag_normalizer'  => [
-                'tags' => [
-                    'example',
-                    'id',
-                    'internal',
-                    'inheritdoc',
-                    'inheritdocs',
-                    'link',
-                    'source',
-                    'toc',
-                    'tutorial',
-                ],
-            ],
-            'phpdoc_line_span' => [
-                'const'    => 'multi',
-                'method'   => 'multi',
-                'property' => 'multi',
-            ],
-            'phpdoc_no_access'    => true,
-            'phpdoc_no_alias_tag' => [
-                'replacements' => [
-                    'property-read'  => 'property',
-                    'property-write' => 'property',
-                    'type'           => 'var',
-                    'link'           => 'see',
-                ],
-            ],
-            'phpdoc_no_empty_return'       => false,
-            'phpdoc_no_package'            => true,
-            'phpdoc_no_useless_inheritdoc' => true,
-            'phpdoc_order'                 => true,
-            'phpdoc_order_by_value'        => [
-                'annotations' => [
-                    'author',
-                    'covers',
-                    'coversNothing',
-                    'dataProvider',
-                    'depends',
-                    'group',
-                    'internal',
-                    'method',
-                    'property',
-                    'property-read',
-                    'property-write',
-                    'requires',
-                    'throws',
-                    'uses',
-                ],
-            ],
-            'phpdoc_return_self_reference' => [
-                'replacements' => [
-                    'this'    => '$this',
-                    '@this'   => '$this',
-                    '$self'   => 'self',
-                    '@self'   => 'self',
-                    '$static' => 'static',
-                    '@static' => 'static',
-                ],
-            ],
-            'phpdoc_scalar' => [
-                'types' => [
-                    'boolean',
-                    'callback',
-                    'double',
-                    'integer',
-                    'real',
-                    'str',
-                ],
-            ],
-            'phpdoc_separation'                             => true,
-            'phpdoc_single_line_var_spacing'                => true,
-            'phpdoc_summary'                                => false,
-            'phpdoc_tag_casing'                             => ['tags' => ['inheritDoc']],
-            'phpdoc_tag_type'                               => ['tags' => ['inheritDoc' => 'inline']],
-            'phpdoc_to_comment'                             => false,
-            'phpdoc_to_param_type'                          => false,
-            'phpdoc_to_property_type'                       => false,
-            'phpdoc_to_return_type'                         => false,
-            'phpdoc_trim'                                   => true,
-            'phpdoc_trim_consecutive_blank_line_separation' => true,
-            'phpdoc_types'                                  => ['groups' => ['simple', 'alias', 'meta']],
-            'phpdoc_types_order'                            => [
-                'null_adjustment' => 'always_last',
-                'sort_algorithm'  => 'alpha',
-            ],
-            'phpdoc_var_annotation_correct_order' => true,
-            'phpdoc_var_without_name'             => true,
-            'pow_to_exponentiation'               => true,
-            'protected_to_private'                => true,
-            'psr_autoloading'                     => ['dir' => null],
-            'random_api_migration'                => [
-                'replacements' => [
-                    'getrandmax' => 'mt_getrandmax',
-                    'rand'       => 'mt_rand',
-                    'srand'      => 'mt_srand',
-                ],
-            ],
-            'regular_callable_call'              => true,
-            'return_assignment'                  => true,
-            'return_type_declaration'            => ['space_before' => 'none'],
-            'self_accessor'                      => false,
-            'self_static_accessor'               => true,
-            'semicolon_after_instruction'        => false,
-            'set_type_to_cast'                   => true,
-            'short_scalar_cast'                  => true,
-            'simple_to_complex_string_variable'  => true,
-            'simplified_if_return'               => true,
-            'simplified_null_return'             => false,
-            'single_blank_line_at_eof'           => true,
-            'single_blank_line_before_namespace' => true,
-            'single_class_element_per_statement' => ['elements' => ['const', 'property']],
-            'single_import_per_statement'        => true,
-            'single_line_after_imports'          => true,
-            'single_line_comment_style'          => ['comment_types' => ['asterisk', 'hash']],
-            'single_line_throw'                  => false,
-            'single_quote'                       => ['strings_containing_single_quote_chars' => false],
-            'single_space_after_construct'       => [
-                'constructs' => [
-                    'abstract',
-                    'as',
-                    'attribute',
-                    'break',
-                    'case',
-                    'catch',
-                    'class',
-                    'clone',
-                    'comment',
-                    'const',
-                    'const_import',
-                    'continue',
-                    'do',
-                    'echo',
-                    'else',
-                    'elseif',
-                    'extends',
-                    'final',
-                    'finally',
-                    'for',
-                    'foreach',
-                    'function',
-                    'function_import',
-                    'global',
-                    'goto',
-                    'if',
-                    'implements',
-                    'include',
-                    'include_once',
-                    'instanceof',
-                    'insteadof',
-                    'interface',
-                    'match',
-                    'named_argument',
-                    'new',
-                    'open_tag_with_echo',
-                    'php_doc',
-                    'php_open',
-                    'print',
-                    'private',
-                    'protected',
-                    'public',
-                    'require',
-                    'require_once',
-                    'return',
-                    'static',
-                    'throw',
-                    'trait',
-                    'try',
-                    'use',
-                    'use_lambda',
-                    'use_trait',
-                    'var',
-                    'while',
-                    'yield',
-                    'yield_from',
-                ],
-            ],
-            'single_trait_insert_per_statement' => true,
-            'space_after_semicolon'             => ['remove_in_empty_for_expressions' => true],
-            'standardize_increment'             => true,
-            'standardize_not_equals'            => true,
-            'static_lambda'                     => true,
-            'strict_comparison'                 => true,
-            'strict_param'                      => true,
-            'string_line_ending'                => true,
-            'switch_case_semicolon_to_colon'    => true,
-            'switch_case_space'                 => true,
-            'switch_continue_to_break'          => true,
-            'ternary_operator_spaces'           => true,
-            'ternary_to_elvis_operator'         => true,
-            'ternary_to_null_coalescing'        => true,
-            'trailing_comma_in_multiline'       => [
-                'after_heredoc' => true,
-                'elements'      => ['arrays'],
-            ],
-            'trim_array_spaces'               => true,
-            'types_spaces'                    => ['space' => 'none'],
-            'unary_operator_spaces'           => true,
-            'use_arrow_functions'             => false, // requires PHP7.4+
-            'visibility_required'             => ['elements' => ['const', 'method', 'property']],
-            'void_return'                     => false, // changes method signature
-            'whitespace_after_comma_in_array' => true,
-            'yoda_style'                      => [
-                'equal'                => false,
-                'identical'            => null,
-                'less_and_greater'     => false,
-                'always_move_variable' => false,
-            ],
-        ];
-
-        $this->requiredPHPVersion = 70300;
-
-        $this->autoActivateIsRiskyAllowed = true;
-    }
-}
diff --git a/utils/PhpCsFixer/Fixer/Comment/SpaceAfterCommentStartFixer.php b/utils/PhpCsFixer/Fixer/Comment/SpaceAfterCommentStartFixer.php
deleted file mode 100644
index d7322c32d308..000000000000
--- a/utils/PhpCsFixer/Fixer/Comment/SpaceAfterCommentStartFixer.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?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 Utils\PhpCsFixer\Fixer\Comment;
-
-use PhpCsFixer\AbstractFixer;
-use PhpCsFixer\FixerDefinition\CodeSample;
-use PhpCsFixer\FixerDefinition\FixerDefinition;
-use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
-use PhpCsFixer\Preg;
-use PhpCsFixer\Tokenizer\Token;
-use PhpCsFixer\Tokenizer\Tokens;
-use SplFileInfo;
-
-/**
- * @internal
- */
-final class SpaceAfterCommentStartFixer extends AbstractFixer
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function getName(): string
-    {
-        return 'CodeIgniter4/' . parent::getName();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getDefinition(): FixerDefinitionInterface
-    {
-        return new FixerDefinition(
-            'There should be a single whitespace after the comment start',
-            [new CodeSample("<?php\n    //this is a comment\n")]
-        );
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isCandidate(Tokens $tokens): bool
-    {
-        return $tokens->isTokenKindFound(T_COMMENT);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * Must run after NoEmptyCommentFixer
-     */
-    public function getPriority(): int
-    {
-        return 3;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function applyFix(SplFileInfo $file, Tokens $tokens): void
-    {
-        for ($index = 1, $count = $tokens->count(); $index < $count; $index++) {
-            /** @var Token $token */
-            $token = $tokens[$index];
-
-            if (! $token->isGivenKind(T_COMMENT)) {
-                continue;
-            }
-
-            $comment = $token->getContent();
-
-            if (substr($comment, 0, 2) !== '//') {
-                continue;
-            }
-
-            if (Preg::match('/^\/\/(?!\s+)(.+)/', $comment, $matches) !== 1) {
-                continue;
-            }
-
-            if (Preg::match('/\-+/', $matches[1]) === 1 || Preg::match('/\=+/', $matches[1]) === 1) {
-                continue;
-            }
-
-            $tokens[$index] = new Token([T_COMMENT, '// ' . $matches[1]]);
-        }
-    }
-}

From b855bca99b0c374643f6626a97686e0dee5a2c4a Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 3 Sep 2021 20:57:36 +0800
Subject: [PATCH 0149/2325] Apply NoCodeSeparatorCommentFixer

---
 .no-header.php-cs-fixer.dist.php | 2 ++
 .php-cs-fixer.dist.php           | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.no-header.php-cs-fixer.dist.php b/.no-header.php-cs-fixer.dist.php
index acfdbf48e1b7..12acddb81087 100644
--- a/.no-header.php-cs-fixer.dist.php
+++ b/.no-header.php-cs-fixer.dist.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\CodingStandard\CodeIgniter4;
 use Nexus\CsConfig\Factory;
+use Nexus\CsConfig\Fixer\Comment\NoCodeSeparatorCommentFixer;
 use Nexus\CsConfig\Fixer\Comment\SpaceAfterCommentStartFixer;
 use Nexus\CsConfig\FixerGenerator;
 use PhpCsFixer\Finder;
@@ -33,6 +34,7 @@
     'finder'       => $finder,
     'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
     'customRules'  => [
+        NoCodeSeparatorCommentFixer::name() => true,
         SpaceAfterCommentStartFixer::name() => true,
     ],
 ];
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index f362a830f99e..3c9e05fe3b74 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\CodingStandard\CodeIgniter4;
 use Nexus\CsConfig\Factory;
+use Nexus\CsConfig\Fixer\Comment\NoCodeSeparatorCommentFixer;
 use Nexus\CsConfig\Fixer\Comment\SpaceAfterCommentStartFixer;
 use Nexus\CsConfig\FixerGenerator;
 use PhpCsFixer\Finder;
@@ -40,6 +41,7 @@
     'finder'       => $finder,
     'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
     'customRules'  => [
+        NoCodeSeparatorCommentFixer::name() => true,
         SpaceAfterCommentStartFixer::name() => true,
     ],
 ];

From 1cbdeac15c34e7bb85a70906324cb2195edba452 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Sat, 4 Sep 2021 22:19:17 +0800
Subject: [PATCH 0150/2325] Fixes and enhancements to Exceptions

---
 system/Debug/Exceptions.php           | 101 ++++++++++++--------------
 tests/system/Debug/ExceptionsTest.php |  53 ++++++++++++--
 2 files changed, 91 insertions(+), 63 deletions(-)

diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index 5950148984ef..04556c5c4f20 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -19,7 +19,6 @@
 use Config\Paths;
 use ErrorException;
 use Throwable;
-use function error_reporting;
 
 /**
  * Exceptions manager
@@ -64,17 +63,11 @@ class Exceptions
      */
     protected $response;
 
-    /**
-     * Constructor.
-     */
     public function __construct(ExceptionsConfig $config, IncomingRequest $request, Response $response)
     {
         $this->ob_level = ob_get_level();
-
         $this->viewPath = rtrim($config->errorViewPath, '\\/ ') . DIRECTORY_SEPARATOR;
-
-        $this->config = $config;
-
+        $this->config   = $config;
         $this->request  = $request;
         $this->response = $response;
     }
@@ -82,17 +75,13 @@ public function __construct(ExceptionsConfig $config, IncomingRequest $request,
     /**
      * Responsible for registering the error, exception and shutdown
      * handling of our application.
+     *
+     * @codeCoverageIgnore
      */
     public function initialize()
     {
-        // Set the Exception Handler
         set_exception_handler([$this, 'exceptionHandler']);
-
-        // Set the Error Handler
         set_error_handler([$this, 'errorHandler']);
-
-        // Set the handler for shutdown to catch Parse errors
-        // Do we need this in PHP7?
         register_shutdown_function([$this, 'shutdownHandler']);
     }
 
@@ -105,12 +94,8 @@ public function initialize()
      */
     public function exceptionHandler(Throwable $exception)
     {
-        [
-            $statusCode,
-            $exitCode,
-        ] = $this->determineCodes($exception);
+        [$statusCode, $exitCode] = $this->determineCodes($exception);
 
-        // Log it
         if ($this->config->log === true && ! in_array($statusCode, $this->config->ignoreCodes, true)) {
             log_message('critical', $exception->getMessage() . "\n{trace}", [
                 'trace' => $exception->getTraceAsString(),
@@ -119,8 +104,7 @@ public function exceptionHandler(Throwable $exception)
 
         if (! is_cli()) {
             $this->response->setStatusCode($statusCode);
-            $header = "HTTP/{$this->request->getProtocolVersion()} {$this->response->getStatusCode()} {$this->response->getReason()}";
-            header($header, true, $statusCode);
+            header(sprintf('HTTP/%s %s %s', $this->request->getProtocolVersion(), $this->response->getStatusCode(), $this->response->getReasonPhrase()), true, $statusCode);
 
             if (strpos($this->request->getHeaderLine('accept'), 'text/html') === false) {
                 $this->respond(ENVIRONMENT === 'development' ? $this->collectVars($exception, $statusCode) : '', $statusCode)->send();
@@ -142,6 +126,8 @@ public function exceptionHandler(Throwable $exception)
      * This seems to be primarily when a user triggers it with trigger_error().
      *
      * @throws ErrorException
+     *
+     * @codeCoverageIgnore
      */
     public function errorHandler(int $severity, string $message, ?string $file = null, ?int $line = null)
     {
@@ -149,24 +135,27 @@ public function errorHandler(int $severity, string $message, ?string $file = nul
             return;
         }
 
-        // Convert it to an exception and pass it along.
         throw new ErrorException($message, 0, $severity, $file, $line);
     }
 
     /**
      * Checks to see if any errors have happened during shutdown that
      * need to be caught and handle them.
+     *
+     * @codeCoverageIgnore
      */
     public function shutdownHandler()
     {
         $error = error_get_last();
 
-        // If we've got an error that hasn't been displayed, then convert
-        // it to an Exception and use the Exception handler to display it
-        // to the user.
-        // Fatal Error?
-        if ($error !== null && in_array($error['type'], [E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE], true)) {
-            $this->exceptionHandler(new ErrorException($error['message'], $error['type'], 0, $error['file'], $error['line']));
+        if ($error === null) {
+            return;
+        }
+
+        ['type' => $type, 'message' => $message, 'file' => $file, 'line' => $line] = $error;
+
+        if (in_array($type, [E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE], true)) {
+            $this->exceptionHandler(new ErrorException($message, $type, 0, $file, $line));
         }
     }
 
@@ -222,20 +211,25 @@ protected function render(Throwable $exception, int $statusCode)
             $viewFile = $altPath . $altView;
         }
 
-        // Prepare the vars
-        $vars = $this->collectVars($exception, $statusCode);
-        extract($vars);
+        if (! isset($viewFile)) {
+            echo 'The error view files were not found. Cannot render exception trace.';
+
+            exit(1);
+        }
 
-        // Render it
         if (ob_get_level() > $this->ob_level + 1) {
             ob_end_clean();
         }
 
-        ob_start();
-        include $viewFile; // @phpstan-ignore-line
-        $buffer = ob_get_contents();
-        ob_end_clean();
-        echo $buffer;
+        echo(function () use ($exception, $statusCode, $viewFile): string {
+            $vars = $this->collectVars($exception, $statusCode);
+            extract($vars, EXTR_SKIP);
+
+            ob_start();
+            include $viewFile;
+
+            return ob_get_clean();
+        })();
     }
 
     /**
@@ -244,7 +238,8 @@ protected function render(Throwable $exception, int $statusCode)
     protected function collectVars(Throwable $exception, int $statusCode): array
     {
         $trace = $exception->getTrace();
-        if (! empty($this->config->sensitiveDataInTrace)) {
+
+        if ($this->config->sensitiveDataInTrace !== []) {
             $this->maskSensitiveData($trace, $this->config->sensitiveDataInTrace);
         }
 
@@ -279,11 +274,11 @@ protected function maskSensitiveData(&$trace, array $keysToMask, string $path =
             }
         }
 
-        if (! is_iterable($trace) && is_object($trace)) {
+        if (is_object($trace)) {
             $trace = get_object_vars($trace);
         }
 
-        if (is_iterable($trace)) {
+        if (is_array($trace)) {
             foreach ($trace as $pathKey => $subarray) {
                 $this->maskSensitiveData($subarray, $keysToMask, $path . '/' . $pathKey);
             }
@@ -298,19 +293,18 @@ protected function determineCodes(Throwable $exception): array
         $statusCode = abs($exception->getCode());
 
         if ($statusCode < 100 || $statusCode > 599) {
-            $exitStatus = $statusCode + EXIT__AUTO_MIN; // 9 is EXIT__AUTO_MIN
-            if ($exitStatus > EXIT__AUTO_MAX) { // 125 is EXIT__AUTO_MAX
-                $exitStatus = EXIT_ERROR; // EXIT_ERROR
+            $exitStatus = $statusCode + EXIT__AUTO_MIN;
+
+            if ($exitStatus > EXIT__AUTO_MAX) {
+                $exitStatus = EXIT_ERROR;
             }
+
             $statusCode = 500;
         } else {
-            $exitStatus = 1; // EXIT_ERROR
+            $exitStatus = EXIT_ERROR;
         }
 
-        return [
-            $statusCode ?: 500,
-            $exitStatus,
-        ];
+        return [$statusCode, $exitStatus];
     }
 
     //--------------------------------------------------------------------
@@ -318,8 +312,6 @@ protected function determineCodes(Throwable $exception): array
     //--------------------------------------------------------------------
 
     /**
-     * Clean Path
-     *
      * This makes nicer looking paths for the error output.
      */
     public static function cleanPath(string $file): string
@@ -354,6 +346,7 @@ public static function describeMemory(int $bytes): string
         if ($bytes < 1024) {
             return $bytes . 'B';
         }
+
         if ($bytes < 1048576) {
             return round($bytes / 1024, 2) . 'KB';
         }
@@ -390,18 +383,16 @@ public static function highlightFile(string $file, int $lineNumber, int $lines =
         $source = str_replace(["\r\n", "\r"], "\n", $source);
         $source = explode("\n", highlight_string($source, true));
         $source = str_replace('<br />', "\n", $source[1]);
-
         $source = explode("\n", str_replace("\r\n", "\n", $source));
 
         // Get just the part to show
-        $start = $lineNumber - (int) round($lines / 2);
-        $start = $start < 0 ? 0 : $start;
+        $start = max($lineNumber - (int) round($lines / 2), 0);
 
         // Get just the lines we need to display, while keeping line numbers...
         $source = array_splice($source, $start, $lines, true); // @phpstan-ignore-line
 
         // Used to format the line number in the source
-        $format = '% ' . strlen(sprintf('%s', $start + $lines)) . 'd';
+        $format = '% ' . strlen((string) ($start + $lines)) . 'd';
 
         $out = '';
         // Because the highlighting may have an uneven number
@@ -412,11 +403,11 @@ public static function highlightFile(string $file, int $lineNumber, int $lines =
 
         foreach ($source as $n => $row) {
             $spans += substr_count($row, '<span') - substr_count($row, '</span');
-
             $row = str_replace(["\r", "\n"], ['', ''], $row);
 
             if (($n + $start + 1) === $lineNumber) {
                 preg_match_all('#<[^>]+>#', $row, $tags);
+
                 $out .= sprintf(
                     "<span class='line highlight'><span class='number'>{$format}</span> %s\n</span>%s",
                     $n + $start + 1,
diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php
index 115ae335c5e1..9bfcbb93c08b 100644
--- a/tests/system/Debug/ExceptionsTest.php
+++ b/tests/system/Debug/ExceptionsTest.php
@@ -11,27 +11,64 @@
 
 namespace CodeIgniter\Debug;
 
+use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\ReflectionHelper;
+use Config\Exceptions as ExceptionsConfig;
 use Config\Services;
+use RuntimeException;
 
 /**
  * @internal
  */
 final class ExceptionsTest extends CIUnitTestCase
 {
-    public function testNew()
+    use ReflectionHelper;
+
+    /**
+     * @var Exceptions
+     */
+    private $exception;
+
+    protected function setUp(): void
     {
-        $actual = new Exceptions(new \Config\Exceptions(), Services::request(), Services::response());
-        $this->assertInstanceOf(Exceptions::class, $actual);
+        $this->exception = new Exceptions(new ExceptionsConfig(), Services::request(), Services::response());
+    }
+
+    public function testDetermineViews(): void
+    {
+        $determineView = $this->getPrivateMethodInvoker($this->exception, 'determineView');
+
+        $this->assertSame('error_404.php', $determineView(PageNotFoundException::forControllerNotFound('Foo', 'bar'), ''));
+        $this->assertSame('error_exception.php', $determineView(new RuntimeException('Exception'), ''));
+        $this->assertSame('error_404.php', $determineView(new RuntimeException('foo', 404), 'app/Views/errors/cli'));
+    }
+
+    public function testCollectVars(): void
+    {
+        $vars = $this->getPrivateMethodInvoker($this->exception, 'collectVars')(new RuntimeException('This.'), 404);
+
+        $this->assertIsArray($vars);
+        $this->assertCount(7, $vars);
+
+        foreach (['title', 'type', 'code', 'message', 'file', 'line', 'trace'] as $key) {
+            $this->assertArrayHasKey($key, $vars);
+        }
+    }
+
+    public function testDetermineCodes(): void
+    {
+        $determineCodes = $this->getPrivateMethodInvoker($this->exception, 'determineCodes');
+
+        $this->assertSame([500, 9], $determineCodes(new RuntimeException('This.')));
+        $this->assertSame([500, 1], $determineCodes(new RuntimeException('That.', 600)));
+        $this->assertSame([404, 1], $determineCodes(new RuntimeException('There.', 404)));
     }
 
     /**
      * @dataProvider dirtyPathsProvider
-     *
-     * @param mixed $file
-     * @param mixed $expected
      */
-    public function testCleanPaths($file, $expected)
+    public function testCleanPaths(string $file, string $expected): void
     {
         $this->assertSame($expected, Exceptions::cleanPath($file));
     }
@@ -40,7 +77,7 @@ public function dirtyPathsProvider()
     {
         $ds = DIRECTORY_SEPARATOR;
 
-        return [
+        yield from [
             [
                 APPPATH . 'Config' . $ds . 'App.php',
                 'APPPATH' . $ds . 'Config' . $ds . 'App.php',

From a355c3bf40c9cc82f618d9a0aea5373be3692415 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Sat, 4 Sep 2021 22:20:36 +0800
Subject: [PATCH 0151/2325] Add entry to changelog for initial PHP 8.1 changes

---
 user_guide_src/source/changelogs/v4.1.4.rst | 67 +++++++++++++--------
 1 file changed, 42 insertions(+), 25 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.1.4.rst b/user_guide_src/source/changelogs/v4.1.4.rst
index f5f7fb7d33b9..daca6b616294 100644
--- a/user_guide_src/source/changelogs/v4.1.4.rst
+++ b/user_guide_src/source/changelogs/v4.1.4.rst
@@ -7,28 +7,45 @@ Release Date: Not released
 
 Breaking Changes:
 
-The following methods were changed from "public" to "protected" to match their parent class methods and better align with their uses:
-
-* CodeIgniter4\Database\MySQLi\Connection::execute()
-* CodeIgniter4\Database\MySQLi\Connection::_fieldData()
-* CodeIgniter4\Database\MySQLi\Connection::_indexData()
-* CodeIgniter4\Database\MySQLi\Connection::_foreignKeyData()
-* CodeIgniter4\Database\Postgre\Builder::_like_statement()
-* CodeIgniter4\Database\Postgre\Connection::execute()
-* CodeIgniter4\Database\Postgre\Connection::_fieldData()
-* CodeIgniter4\Database\Postgre\Connection::_indexData()
-* CodeIgniter4\Database\Postgre\Connection::_foreignKeyData()
-* CodeIgniter4\Database\SQLSRV\Connection::execute()
-* CodeIgniter4\Database\SQLSRV\Connection::_fieldData()
-* CodeIgniter4\Database\SQLSRV\Connection::_indexData()
-* CodeIgniter4\Database\SQLSRV\Connection::_foreignKeyData()
-* CodeIgniter4\Database\SQLite3\Connection::execute()
-* CodeIgniter4\Database\SQLite3\Connection::_fieldData()
-* CodeIgniter4\Database\SQLite3\Connection::_indexData()
-* CodeIgniter4\Database\SQLite3\Connection::_foreignKeyData()
-* CodeIgniter4\Images\Handlers\GDHandler::_flatten()
-* CodeIgniter4\Images\Handlers\GDHandler::_flip()
-* CodeIgniter4\Images\Handlers\ImageMagickHandler::_flatten()
-* CodeIgniter4\Images\Handlers\ImageMagickHandler::_flip()
-* CodeIgniter4\Test\Mock\MockIncomingRequest::detectURI()
-* CodeIgniter4\Test\Mock\MockSecurity.php::sendCookie()
+- The following methods were changed from "public" to "protected" to match their parent class methods and better align with their uses:
+
+* ``CodeIgniter\Database\MySQLi\Connection::execute()``
+* ``CodeIgniter\Database\MySQLi\Connection::_fieldData()``
+* ``CodeIgniter\Database\MySQLi\Connection::_indexData()``
+* ``CodeIgniter\Database\MySQLi\Connection::_foreignKeyData()``
+* ``CodeIgniter\Database\Postgre\Builder::_like_statement()``
+* ``CodeIgniter\Database\Postgre\Connection::execute()``
+* ``CodeIgniter\Database\Postgre\Connection::_fieldData()``
+* ``CodeIgniter\Database\Postgre\Connection::_indexData()``
+* ``CodeIgniter\Database\Postgre\Connection::_foreignKeyData()``
+* ``CodeIgniter\Database\SQLSRV\Connection::execute()``
+* ``CodeIgniter\Database\SQLSRV\Connection::_fieldData()``
+* ``CodeIgniter\Database\SQLSRV\Connection::_indexData()``
+* ``CodeIgniter\Database\SQLSRV\Connection::_foreignKeyData()``
+* ``CodeIgniter\Database\SQLite3\Connection::execute()``
+* ``CodeIgniter\Database\SQLite3\Connection::_fieldData()``
+* ``CodeIgniter\Database\SQLite3\Connection::_indexData()``
+* ``CodeIgniter\Database\SQLite3\Connection::_foreignKeyData()``
+* ``CodeIgniter\Images\Handlers\GDHandler::_flatten()``
+* ``CodeIgniter\Images\Handlers\GDHandler::_flip()``
+* ``CodeIgniter\Images\Handlers\ImageMagickHandler::_flatten()``
+* ``CodeIgniter\Images\Handlers\ImageMagickHandler::_flip()``
+* ``CodeIgniter\Test\Mock\MockIncomingRequest::detectURI()``
+* ``CodeIgniter\Test\Mock\MockSecurity.php::sendCookie()``
+
+- To be compatible with the strict inheritance checks of PHP 8.1, the following method signatures were added return types to match their parents' signatures whenever possible:
+
+* ``CodeIgniter\Cookie\Cookie::offsetExists()``
+* ``CodeIgniter\Cookie\Cookie::offsetSet()``
+* ``CodeIgniter\Cookie\Cookie::offsetUnset()``
+* ``CodeIgniter\Cookie\CookieStore::getIterator()``
+* ``CodeIgniter\I18n\Time::__wakeup()``
+* ``CodeIgniter\Test\Filters\CITestStreamFilter::filter()``
+
+- Related to the strict inheritance checks of PHP 8.1, the following session handlers implementing ``SessionHandlerInterface`` have their public methods modified to match the interface:
+
+* ``CodeIgniter\Session\Handlers\ArrayHandler``
+* ``CodeIgniter\Session\Handlers\DatabaseHandler``
+* ``CodeIgniter\Session\Handlers\FileHandler``
+* ``CodeIgniter\Session\Handlers\MemcachedHandler``
+* ``CodeIgniter\Session\Handlers\RedisHandler``

From 8207b2f3f2bdddbb9e99813053303f210ad68d5c Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Sun, 5 Sep 2021 20:05:46 +0800
Subject: [PATCH 0152/2325] Fix entity name generation when bundled in model

---
 system/Commands/Generators/ModelGenerator.php | 22 ++++---
 .../Commands/Generators/Views/entity.tpl.php  |  6 +-
 .../Commands/Generators/Views/model.tpl.php   | 46 +++++++--------
 tests/system/Commands/ModelGeneratorTest.php  | 57 ++++++++++++++-----
 4 files changed, 80 insertions(+), 51 deletions(-)

diff --git a/system/Commands/Generators/ModelGenerator.php b/system/Commands/Generators/ModelGenerator.php
index 1ad8a75e1f8c..b4b7ffcda2ca 100644
--- a/system/Commands/Generators/ModelGenerator.php
+++ b/system/Commands/Generators/ModelGenerator.php
@@ -92,14 +92,17 @@ public function run(array $params)
     protected function prepare(string $class): string
     {
         $table   = $this->getOption('table');
-        $DBGroup = $this->getOption('dbgroup');
+        $dbGroup = $this->getOption('dbgroup');
         $return  = $this->getOption('return');
 
-        $baseClass = strtolower(str_replace(trim(implode('\\', array_slice(explode('\\', $class), 0, -1)), '\\') . '\\', '', $class));
-        $baseClass = strpos($baseClass, 'model') ? str_replace('model', '', $baseClass) : $baseClass;
+        $baseClass = class_basename($class);
 
-        $table   = is_string($table) ? $table : plural($baseClass);
-        $DBGroup = is_string($DBGroup) ? $DBGroup : 'default';
+        if (preg_match('/^(\S+)Model$/i', $baseClass, $match) === 1) {
+            $baseClass = $match[1];
+        }
+
+        $table   = is_string($table) ? $table : plural(strtolower($baseClass));
+        $dbGroup = is_string($dbGroup) ? $dbGroup : 'default';
         $return  = is_string($return) ? $return : 'array';
 
         if (! in_array($return, ['array', 'object', 'entity'], true)) {
@@ -112,17 +115,20 @@ protected function prepare(string $class): string
         if ($return === 'entity') {
             $return = str_replace('Models', 'Entities', $class);
 
-            if ($pos = strpos($return, 'Model')) {
-                $return = substr($return, 0, $pos);
+            if (preg_match('/^(\S+)Model$/i', $return, $match) === 1) {
+                $return = $match[1];
 
                 if ($this->getOption('suffix')) {
                     $return .= 'Entity';
                 }
             }
 
+            $return = '\\' . trim($return, '\\') . '::class';
             $this->call('make:entity', array_merge([$baseClass], $this->params));
+        } else {
+            $return = "'{$return}'";
         }
 
-        return $this->parseTemplate($class, ['{table}', '{DBGroup}', '{return}'], [$table, $DBGroup, $return]);
+        return $this->parseTemplate($class, ['{table}', '{dbGroup}', '{return}'], [$table, $dbGroup, $return]);
     }
 }
diff --git a/system/Commands/Generators/Views/entity.tpl.php b/system/Commands/Generators/Views/entity.tpl.php
index 6623e2f14bbb..c74c776f4ad3 100644
--- a/system/Commands/Generators/Views/entity.tpl.php
+++ b/system/Commands/Generators/Views/entity.tpl.php
@@ -7,10 +7,6 @@
 class {class} extends Entity
 {
     protected $datamap = [];
-    protected $dates   = [
-        'created_at',
-        'updated_at',
-        'deleted_at',
-    ];
+    protected $dates   = ['created_at', 'updated_at', 'deleted_at'];
     protected $casts   = [];
 }
diff --git a/system/Commands/Generators/Views/model.tpl.php b/system/Commands/Generators/Views/model.tpl.php
index 088ecb7e1161..5fc5ed9ba428 100644
--- a/system/Commands/Generators/Views/model.tpl.php
+++ b/system/Commands/Generators/Views/model.tpl.php
@@ -6,22 +6,22 @@
 
 class {class} extends Model
 {
-    protected $DBGroup              = '{DBGroup}';
-    protected $table                = '{table}';
-    protected $primaryKey           = 'id';
-    protected $useAutoIncrement     = true;
-    protected $insertID             = 0;
-    protected $returnType           = '{return}';
-    protected $useSoftDeletes       = false;
-    protected $protectFields        = true;
-    protected $allowedFields        = [];
+    protected $DBGroup          = '{dbGroup}';
+    protected $table            = '{table}';
+    protected $primaryKey       = 'id';
+    protected $useAutoIncrement = true;
+    protected $insertID         = 0;
+    protected $returnType       = {return};
+    protected $useSoftDeletes   = false;
+    protected $protectFields    = true;
+    protected $allowedFields    = [];
 
     // Dates
-    protected $useTimestamps        = false;
-    protected $dateFormat           = 'datetime';
-    protected $createdField         = 'created_at';
-    protected $updatedField         = 'updated_at';
-    protected $deletedField         = 'deleted_at';
+    protected $useTimestamps = false;
+    protected $dateFormat    = 'datetime';
+    protected $createdField  = 'created_at';
+    protected $updatedField  = 'updated_at';
+    protected $deletedField  = 'deleted_at';
 
     // Validation
     protected $validationRules      = [];
@@ -30,13 +30,13 @@ class {class} extends Model
     protected $cleanValidationRules = true;
 
     // Callbacks
-    protected $allowCallbacks       = true;
-    protected $beforeInsert         = [];
-    protected $afterInsert          = [];
-    protected $beforeUpdate         = [];
-    protected $afterUpdate          = [];
-    protected $beforeFind           = [];
-    protected $afterFind            = [];
-    protected $beforeDelete         = [];
-    protected $afterDelete          = [];
+    protected $allowCallbacks = true;
+    protected $beforeInsert   = [];
+    protected $afterInsert    = [];
+    protected $beforeUpdate   = [];
+    protected $afterUpdate    = [];
+    protected $beforeFind     = [];
+    protected $afterFind      = [];
+    protected $beforeDelete   = [];
+    protected $afterDelete    = [];
 }
diff --git a/tests/system/Commands/ModelGeneratorTest.php b/tests/system/Commands/ModelGeneratorTest.php
index 68e001103fb5..2d00460c53ee 100644
--- a/tests/system/Commands/ModelGeneratorTest.php
+++ b/tests/system/Commands/ModelGeneratorTest.php
@@ -19,10 +19,11 @@
  */
 final class ModelGeneratorTest extends CIUnitTestCase
 {
-    protected $streamFilter;
+    private $streamFilter;
 
     protected function setUp(): void
     {
+        parent::setUp();
         CITestStreamFilter::$buffer = '';
 
         $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
@@ -31,16 +32,18 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
+        parent::tearDown();
         stream_filter_remove($this->streamFilter);
 
         $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
         $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
+
         if (is_file($file)) {
             unlink($file);
         }
     }
 
-    protected function getFileContent(string $filepath): string
+    private function getFileContent(string $filepath): string
     {
         if (! is_file($filepath)) {
             return '';
@@ -51,14 +54,14 @@ protected function getFileContent(string $filepath): string
 
     public function testGenerateModel()
     {
-        command('make:model user -table users');
+        command('make:model user --table users');
         $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
         $file = APPPATH . 'Models/User.php';
         $this->assertFileExists($file);
         $this->assertStringContainsString('extends Model', $this->getFileContent($file));
-        $this->assertStringContainsString('protected $table                = \'users\';', $this->getFileContent($file));
-        $this->assertStringContainsString('protected $DBGroup              = \'default\';', $this->getFileContent($file));
-        $this->assertStringContainsString('protected $returnType           = \'array\';', $this->getFileContent($file));
+        $this->assertStringContainsString('protected $table            = \'users\';', $this->getFileContent($file));
+        $this->assertStringContainsString('protected $DBGroup          = \'default\';', $this->getFileContent($file));
+        $this->assertStringContainsString('protected $returnType       = \'array\';', $this->getFileContent($file));
     }
 
     public function testGenerateModelWithOptionTable()
@@ -67,7 +70,7 @@ public function testGenerateModelWithOptionTable()
         $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
         $file = APPPATH . 'Models/Cars.php';
         $this->assertFileExists($file);
-        $this->assertStringContainsString('protected $table                = \'utilisateur\';', $this->getFileContent($file));
+        $this->assertStringContainsString('protected $table            = \'utilisateur\';', $this->getFileContent($file));
     }
 
     public function testGenerateModelWithOptionDBGroup()
@@ -76,43 +79,48 @@ public function testGenerateModelWithOptionDBGroup()
         $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
         $file = APPPATH . 'Models/User.php';
         $this->assertFileExists($file);
-        $this->assertStringContainsString('protected $DBGroup              = \'testing\';', $this->getFileContent($file));
+        $this->assertStringContainsString('protected $DBGroup          = \'testing\';', $this->getFileContent($file));
     }
 
     public function testGenerateModelWithOptionReturnArray()
     {
-        command('make:model user -return array');
+        command('make:model user --return array');
         $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
         $file = APPPATH . 'Models/User.php';
         $this->assertFileExists($file);
-        $this->assertStringContainsString('protected $returnType           = \'array\';', $this->getFileContent($file));
+        $this->assertStringContainsString('protected $returnType       = \'array\';', $this->getFileContent($file));
     }
 
     public function testGenerateModelWithOptionReturnObject()
     {
-        command('make:model user -return object');
+        command('make:model user --return object');
         $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
         $file = APPPATH . 'Models/User.php';
         $this->assertFileExists($file);
-        $this->assertStringContainsString('protected $returnType           = \'object\';', $this->getFileContent($file));
+        $this->assertStringContainsString('protected $returnType       = \'object\';', $this->getFileContent($file));
     }
 
     public function testGenerateModelWithOptionReturnEntity()
     {
-        command('make:model user -return entity');
+        command('make:model user --return entity');
         $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
+
         $file = APPPATH . 'Models/User.php';
         $this->assertFileExists($file);
-        $this->assertStringContainsString('protected $returnType           = \'App\Entities\User\';', $this->getFileContent($file));
+        $this->assertStringContainsString('protected $returnType       = \App\Entities\User::class;', $this->getFileContent($file));
+
         if (is_file($file)) {
             unlink($file);
         }
+
         $file = APPPATH . 'Entities/User.php';
         $this->assertFileExists($file);
         $dir = dirname($file);
+
         if (is_file($file)) {
             unlink($file);
         }
+
         if (is_dir($dir)) {
             rmdir($dir);
         }
@@ -120,13 +128,32 @@ public function testGenerateModelWithOptionReturnEntity()
 
     public function testGenerateModelWithOptionSuffix()
     {
-        command('make:model user -suffix -return entity');
+        command('make:model user --suffix --return entity');
 
         $model  = APPPATH . 'Models/UserModel.php';
         $entity = APPPATH . 'Entities/UserEntity.php';
 
         $this->assertFileExists($model);
         $this->assertFileExists($entity);
+
+        unlink($model);
+        unlink($entity);
+        rmdir(dirname($entity));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5050
+     */
+    public function testGenerateModelWithSuffixAndMixedPascalCasedName()
+    {
+        command('make:model MyTable --suffix --return entity');
+
+        $model  = APPPATH . 'Models/MyTableModel.php';
+        $entity = APPPATH . 'Entities/MyTableEntity.php';
+
+        $this->assertFileExists($model);
+        $this->assertFileExists($entity);
+
         unlink($model);
         unlink($entity);
         rmdir(dirname($entity));

From f4bb2657125e5d10ec5c2b43e55a764f5da4b02f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 6 Sep 2021 11:08:46 +0900
Subject: [PATCH 0153/2325] docs: fix indentation of the list

---
 user_guide_src/source/changelogs/v4.1.4.rst | 68 ++++++++++-----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.1.4.rst b/user_guide_src/source/changelogs/v4.1.4.rst
index daca6b616294..79b9b881fd82 100644
--- a/user_guide_src/source/changelogs/v4.1.4.rst
+++ b/user_guide_src/source/changelogs/v4.1.4.rst
@@ -9,43 +9,43 @@ Breaking Changes:
 
 - The following methods were changed from "public" to "protected" to match their parent class methods and better align with their uses:
 
-* ``CodeIgniter\Database\MySQLi\Connection::execute()``
-* ``CodeIgniter\Database\MySQLi\Connection::_fieldData()``
-* ``CodeIgniter\Database\MySQLi\Connection::_indexData()``
-* ``CodeIgniter\Database\MySQLi\Connection::_foreignKeyData()``
-* ``CodeIgniter\Database\Postgre\Builder::_like_statement()``
-* ``CodeIgniter\Database\Postgre\Connection::execute()``
-* ``CodeIgniter\Database\Postgre\Connection::_fieldData()``
-* ``CodeIgniter\Database\Postgre\Connection::_indexData()``
-* ``CodeIgniter\Database\Postgre\Connection::_foreignKeyData()``
-* ``CodeIgniter\Database\SQLSRV\Connection::execute()``
-* ``CodeIgniter\Database\SQLSRV\Connection::_fieldData()``
-* ``CodeIgniter\Database\SQLSRV\Connection::_indexData()``
-* ``CodeIgniter\Database\SQLSRV\Connection::_foreignKeyData()``
-* ``CodeIgniter\Database\SQLite3\Connection::execute()``
-* ``CodeIgniter\Database\SQLite3\Connection::_fieldData()``
-* ``CodeIgniter\Database\SQLite3\Connection::_indexData()``
-* ``CodeIgniter\Database\SQLite3\Connection::_foreignKeyData()``
-* ``CodeIgniter\Images\Handlers\GDHandler::_flatten()``
-* ``CodeIgniter\Images\Handlers\GDHandler::_flip()``
-* ``CodeIgniter\Images\Handlers\ImageMagickHandler::_flatten()``
-* ``CodeIgniter\Images\Handlers\ImageMagickHandler::_flip()``
-* ``CodeIgniter\Test\Mock\MockIncomingRequest::detectURI()``
-* ``CodeIgniter\Test\Mock\MockSecurity.php::sendCookie()``
+    * ``CodeIgniter\Database\MySQLi\Connection::execute()``
+    * ``CodeIgniter\Database\MySQLi\Connection::_fieldData()``
+    * ``CodeIgniter\Database\MySQLi\Connection::_indexData()``
+    * ``CodeIgniter\Database\MySQLi\Connection::_foreignKeyData()``
+    * ``CodeIgniter\Database\Postgre\Builder::_like_statement()``
+    * ``CodeIgniter\Database\Postgre\Connection::execute()``
+    * ``CodeIgniter\Database\Postgre\Connection::_fieldData()``
+    * ``CodeIgniter\Database\Postgre\Connection::_indexData()``
+    * ``CodeIgniter\Database\Postgre\Connection::_foreignKeyData()``
+    * ``CodeIgniter\Database\SQLSRV\Connection::execute()``
+    * ``CodeIgniter\Database\SQLSRV\Connection::_fieldData()``
+    * ``CodeIgniter\Database\SQLSRV\Connection::_indexData()``
+    * ``CodeIgniter\Database\SQLSRV\Connection::_foreignKeyData()``
+    * ``CodeIgniter\Database\SQLite3\Connection::execute()``
+    * ``CodeIgniter\Database\SQLite3\Connection::_fieldData()``
+    * ``CodeIgniter\Database\SQLite3\Connection::_indexData()``
+    * ``CodeIgniter\Database\SQLite3\Connection::_foreignKeyData()``
+    * ``CodeIgniter\Images\Handlers\GDHandler::_flatten()``
+    * ``CodeIgniter\Images\Handlers\GDHandler::_flip()``
+    * ``CodeIgniter\Images\Handlers\ImageMagickHandler::_flatten()``
+    * ``CodeIgniter\Images\Handlers\ImageMagickHandler::_flip()``
+    * ``CodeIgniter\Test\Mock\MockIncomingRequest::detectURI()``
+    * ``CodeIgniter\Test\Mock\MockSecurity.php::sendCookie()``
 
 - To be compatible with the strict inheritance checks of PHP 8.1, the following method signatures were added return types to match their parents' signatures whenever possible:
 
-* ``CodeIgniter\Cookie\Cookie::offsetExists()``
-* ``CodeIgniter\Cookie\Cookie::offsetSet()``
-* ``CodeIgniter\Cookie\Cookie::offsetUnset()``
-* ``CodeIgniter\Cookie\CookieStore::getIterator()``
-* ``CodeIgniter\I18n\Time::__wakeup()``
-* ``CodeIgniter\Test\Filters\CITestStreamFilter::filter()``
+    * ``CodeIgniter\Cookie\Cookie::offsetExists()``
+    * ``CodeIgniter\Cookie\Cookie::offsetSet()``
+    * ``CodeIgniter\Cookie\Cookie::offsetUnset()``
+    * ``CodeIgniter\Cookie\CookieStore::getIterator()``
+    * ``CodeIgniter\I18n\Time::__wakeup()``
+    * ``CodeIgniter\Test\Filters\CITestStreamFilter::filter()``
 
 - Related to the strict inheritance checks of PHP 8.1, the following session handlers implementing ``SessionHandlerInterface`` have their public methods modified to match the interface:
 
-* ``CodeIgniter\Session\Handlers\ArrayHandler``
-* ``CodeIgniter\Session\Handlers\DatabaseHandler``
-* ``CodeIgniter\Session\Handlers\FileHandler``
-* ``CodeIgniter\Session\Handlers\MemcachedHandler``
-* ``CodeIgniter\Session\Handlers\RedisHandler``
+    * ``CodeIgniter\Session\Handlers\ArrayHandler``
+    * ``CodeIgniter\Session\Handlers\DatabaseHandler``
+    * ``CodeIgniter\Session\Handlers\FileHandler``
+    * ``CodeIgniter\Session\Handlers\MemcachedHandler``
+    * ``CodeIgniter\Session\Handlers\RedisHandler``

From 0ae2594f9d7651e1fe442383a823e56fc29caeb4 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Mon, 6 Sep 2021 15:09:53 +0000
Subject: [PATCH 0154/2325] Prep for 4.1.4 release

---
 CHANGELOG.md                                  |  7 ++
 system/CodeIgniter.php                        |  2 +-
 user_guide_src/source/changelogs/v4.1.4.rst   | 51 +++++-----
 user_guide_src/source/conf.py                 |  2 +-
 .../source/installation/upgrade_414.rst       | 95 +++++++++++++++++++
 .../source/installation/upgrading.rst         |  1 +
 6 files changed, 132 insertions(+), 26 deletions(-)
 create mode 100644 user_guide_src/source/installation/upgrade_414.rst

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24249162d792..74513d243589 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [v4.1.4](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.4) (2021-09-06)
+
+This release focuses on code style. All changes (except those noted below) are cosmetic to bring the code in line with the new
+[CodeIgniter Coding Standard](https://github.com/CodeIgniter/coding-standard) (based on PSR-12).
+
+*Note: Full changelog forthcoming.*
+
 ## [v4.1.3](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.3) (2021-06-06)
 
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.2...v4.1.3)
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 7034f710b8ac..4350876bd3a2 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -44,7 +44,7 @@ class CodeIgniter
     /**
      * The current version of CodeIgniter Framework
      */
-    public const CI_VERSION = '4.1.3';
+    public const CI_VERSION = '4.1.4';
 
     private const MIN_PHP_VERSION = '7.3';
 
diff --git a/user_guide_src/source/changelogs/v4.1.4.rst b/user_guide_src/source/changelogs/v4.1.4.rst
index f5f7fb7d33b9..4ce8aa41587e 100644
--- a/user_guide_src/source/changelogs/v4.1.4.rst
+++ b/user_guide_src/source/changelogs/v4.1.4.rst
@@ -1,34 +1,37 @@
 Version 4.1.4
 =============
 
-Release Date: Not released
+Release Date: September 6, 2021
 
 **4.1.4 release of CodeIgniter4**
 
+This release focuses on code style. All changes (except those noted below) are cosmetic to bring the code in line with the new
+`CodeIgniter Coding Standard <https://github.com/CodeIgniter/coding-standard>`_ (based on PSR-12).
+
 Breaking Changes:
 
 The following methods were changed from "public" to "protected" to match their parent class methods and better align with their uses:
 
-* CodeIgniter4\Database\MySQLi\Connection::execute()
-* CodeIgniter4\Database\MySQLi\Connection::_fieldData()
-* CodeIgniter4\Database\MySQLi\Connection::_indexData()
-* CodeIgniter4\Database\MySQLi\Connection::_foreignKeyData()
-* CodeIgniter4\Database\Postgre\Builder::_like_statement()
-* CodeIgniter4\Database\Postgre\Connection::execute()
-* CodeIgniter4\Database\Postgre\Connection::_fieldData()
-* CodeIgniter4\Database\Postgre\Connection::_indexData()
-* CodeIgniter4\Database\Postgre\Connection::_foreignKeyData()
-* CodeIgniter4\Database\SQLSRV\Connection::execute()
-* CodeIgniter4\Database\SQLSRV\Connection::_fieldData()
-* CodeIgniter4\Database\SQLSRV\Connection::_indexData()
-* CodeIgniter4\Database\SQLSRV\Connection::_foreignKeyData()
-* CodeIgniter4\Database\SQLite3\Connection::execute()
-* CodeIgniter4\Database\SQLite3\Connection::_fieldData()
-* CodeIgniter4\Database\SQLite3\Connection::_indexData()
-* CodeIgniter4\Database\SQLite3\Connection::_foreignKeyData()
-* CodeIgniter4\Images\Handlers\GDHandler::_flatten()
-* CodeIgniter4\Images\Handlers\GDHandler::_flip()
-* CodeIgniter4\Images\Handlers\ImageMagickHandler::_flatten()
-* CodeIgniter4\Images\Handlers\ImageMagickHandler::_flip()
-* CodeIgniter4\Test\Mock\MockIncomingRequest::detectURI()
-* CodeIgniter4\Test\Mock\MockSecurity.php::sendCookie()
+* CodeIgniter\Database\MySQLi\Connection::execute()
+* CodeIgniter\Database\MySQLi\Connection::_fieldData()
+* CodeIgniter\Database\MySQLi\Connection::_indexData()
+* CodeIgniter\Database\MySQLi\Connection::_foreignKeyData()
+* CodeIgniter\Database\Postgre\Builder::_like_statement()
+* CodeIgniter\Database\Postgre\Connection::execute()
+* CodeIgniter\Database\Postgre\Connection::_fieldData()
+* CodeIgniter\Database\Postgre\Connection::_indexData()
+* CodeIgniter\Database\Postgre\Connection::_foreignKeyData()
+* CodeIgniter\Database\SQLSRV\Connection::execute()
+* CodeIgniter\Database\SQLSRV\Connection::_fieldData()
+* CodeIgniter\Database\SQLSRV\Connection::_indexData()
+* CodeIgniter\Database\SQLSRV\Connection::_foreignKeyData()
+* CodeIgniter\Database\SQLite3\Connection::execute()
+* CodeIgniter\Database\SQLite3\Connection::_fieldData()
+* CodeIgniter\Database\SQLite3\Connection::_indexData()
+* CodeIgniter\Database\SQLite3\Connection::_foreignKeyData()
+* CodeIgniter\Images\Handlers\GDHandler::_flatten()
+* CodeIgniter\Images\Handlers\GDHandler::_flip()
+* CodeIgniter\Images\Handlers\ImageMagickHandler::_flatten()
+* CodeIgniter\Images\Handlers\ImageMagickHandler::_flip()
+* CodeIgniter\Test\Mock\MockIncomingRequest::detectURI()
+* CodeIgniter\Test\Mock\MockSecurity.php::sendCookie()
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 63fd4dcf46bc..f341ddfc25c4 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -24,7 +24,7 @@
 version = '4.1'
 
 # The full version, including alpha/beta/rc tags.
-release = '4.1.3'
+release = '4.1.4'
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/user_guide_src/source/installation/upgrade_414.rst b/user_guide_src/source/installation/upgrade_414.rst
new file mode 100644
index 000000000000..8f84809fb664
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_414.rst
@@ -0,0 +1,95 @@
+#############################
+Upgrading from 4.1.3 to 4.1.4
+#############################
+
+This release focuses on code style. All changes (except those noted below) are cosmetic to bring the code in line with the new
+`CodeIgniter Coding Standard <https://github.com/CodeIgniter/coding-standard>`_ (based on PSR-12).
+
+**Method Scope**
+
+The following methods were changed from "public" to "protected" to match their parent class methods and better align with their uses.
+If you relied on any of these methods being public (highly unlikely) adjust your code accordingly::
+
+* ``CodeIgniter\Database\MySQLi\Connection::execute()``
+* ``CodeIgniter\Database\MySQLi\Connection::_fieldData()``
+* ``CodeIgniter\Database\MySQLi\Connection::_indexData()``
+* ``CodeIgniter\Database\MySQLi\Connection::_foreignKeyData()``
+* ``CodeIgniter\Database\Postgre\Builder::_like_statement()``
+* ``CodeIgniter\Database\Postgre\Connection::execute()``
+* ``CodeIgniter\Database\Postgre\Connection::_fieldData()``
+* ``CodeIgniter\Database\Postgre\Connection::_indexData()``
+* ``CodeIgniter\Database\Postgre\Connection::_foreignKeyData()``
+* ``CodeIgniter\Database\SQLSRV\Connection::execute()``
+* ``CodeIgniter\Database\SQLSRV\Connection::_fieldData()``
+* ``CodeIgniter\Database\SQLSRV\Connection::_indexData()``
+* ``CodeIgniter\Database\SQLSRV\Connection::_foreignKeyData()``
+* ``CodeIgniter\Database\SQLite3\Connection::execute()``
+* ``CodeIgniter\Database\SQLite3\Connection::_fieldData()``
+* ``CodeIgniter\Database\SQLite3\Connection::_indexData()``
+* ``CodeIgniter\Database\SQLite3\Connection::_foreignKeyData()``
+* ``CodeIgniter\Images\Handlers\GDHandler::_flatten()``
+* ``CodeIgniter\Images\Handlers\GDHandler::_flip()``
+* ``CodeIgniter\Images\Handlers\ImageMagickHandler::_flatten()``
+* ``CodeIgniter\Images\Handlers\ImageMagickHandler::_flip()``
+* ``CodeIgniter\Test\Mock\MockIncomingRequest::detectURI()``
+* ``CodeIgniter\Test\Mock\MockSecurity.php::sendCookie()``
+
+
+Project Files
+=============
+
+Numerous 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>`_.
+
+.. note:: Except in very rare cases for bug fixes, no changes made to files for the project space
+    will break your application. All changes noted here are optional until the next major version,
+    and any mandatory changes will be covered in the sections above.
+
+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:
+
+* ``app/Config/App.php``
+* ``app/Config/Autoload.php``
+* ``app/Config/Cookie.php``
+* ``app/Config/Events.php``
+* ``app/Config/Exceptions.php``
+* ``app/Config/Security.php``
+* ``app/Views/errors/html/*``
+* ``env``
+* ``spark``
+
+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 affect on the runtime:
+
+* ``app/Config/App.php``
+* ``app/Config/Autoload.php``
+* ``app/Config/ContentSecurityPolicy.php``
+* ``app/Config/Cookie.php``
+* ``app/Config/Events.php``
+* ``app/Config/Exceptions.php``
+* ``app/Config/Logger.php``
+* ``app/Config/Mimes.php``
+* ``app/Config/Modules.php``
+* ``app/Config/Security.php``
+* ``app/Controllers/BaseController.php``
+* ``app/Views/errors/html/debug.css``
+* ``app/Views/errors/html/error_404.php``
+* ``app/Views/errors/html/error_exception.php``
+* ``app/Views/welcome_message.php``
+* ``composer.json``
+* ``contributing/guidelines.rst``
+* ``env``
+* ``phpstan.neon.dist``
+* ``phpunit.xml.dist``
+* ``public/.htaccess``
+* ``public/index.php``
+* ``rector.php``
+* ``spark``
diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index 333f0a0f8e66..64696e691dc7 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -8,6 +8,7 @@ upgrading from.
 .. toctree::
     :titlesonly:
 
+    Upgrading from 4.1.3 to 4.1.4 <upgrade_414>
     Upgrading from 4.1.2 to 4.1.3 <upgrade_413>
     Upgrading from 4.1.1 to 4.1.2 <upgrade_412>
     Upgrading from 4.0.5 to 4.1.0 or 4.1.1 <upgrade_410>

From 62bf3abfd36d4aafa9a3200ac890eb66a15af0f4 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Sat, 4 Sep 2021 22:20:36 +0800
Subject: [PATCH 0155/2325] Add entry to changelog for initial PHP 8.1 changes

---
 user_guide_src/source/changelogs/v4.1.4.rst | 67 +++++++++++++--------
 1 file changed, 42 insertions(+), 25 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.1.4.rst b/user_guide_src/source/changelogs/v4.1.4.rst
index 4ce8aa41587e..14c7a99e5e62 100644
--- a/user_guide_src/source/changelogs/v4.1.4.rst
+++ b/user_guide_src/source/changelogs/v4.1.4.rst
@@ -10,28 +10,45 @@ This release focuses on code style. All changes (except those noted below) are c
 
 Breaking Changes:
 
-The following methods were changed from "public" to "protected" to match their parent class methods and better align with their uses:
-
-* CodeIgniter\Database\MySQLi\Connection::execute()
-* CodeIgniter\Database\MySQLi\Connection::_fieldData()
-* CodeIgniter\Database\MySQLi\Connection::_indexData()
-* CodeIgniter\Database\MySQLi\Connection::_foreignKeyData()
-* CodeIgniter\Database\Postgre\Builder::_like_statement()
-* CodeIgniter\Database\Postgre\Connection::execute()
-* CodeIgniter\Database\Postgre\Connection::_fieldData()
-* CodeIgniter\Database\Postgre\Connection::_indexData()
-* CodeIgniter\Database\Postgre\Connection::_foreignKeyData()
-* CodeIgniter\Database\SQLSRV\Connection::execute()
-* CodeIgniter\Database\SQLSRV\Connection::_fieldData()
-* CodeIgniter\Database\SQLSRV\Connection::_indexData()
-* CodeIgniter\Database\SQLSRV\Connection::_foreignKeyData()
-* CodeIgniter\Database\SQLite3\Connection::execute()
-* CodeIgniter\Database\SQLite3\Connection::_fieldData()
-* CodeIgniter\Database\SQLite3\Connection::_indexData()
-* CodeIgniter\Database\SQLite3\Connection::_foreignKeyData()
-* CodeIgniter\Images\Handlers\GDHandler::_flatten()
-* CodeIgniter\Images\Handlers\GDHandler::_flip()
-* CodeIgniter\Images\Handlers\ImageMagickHandler::_flatten()
-* CodeIgniter\Images\Handlers\ImageMagickHandler::_flip()
-* CodeIgniter\Test\Mock\MockIncomingRequest::detectURI()
-* CodeIgniter\Test\Mock\MockSecurity.php::sendCookie()
+- The following methods were changed from "public" to "protected" to match their parent class methods and better align with their uses:
+
+* ``CodeIgniter\Database\MySQLi\Connection::execute()``
+* ``CodeIgniter\Database\MySQLi\Connection::_fieldData()``
+* ``CodeIgniter\Database\MySQLi\Connection::_indexData()``
+* ``CodeIgniter\Database\MySQLi\Connection::_foreignKeyData()``
+* ``CodeIgniter\Database\Postgre\Builder::_like_statement()``
+* ``CodeIgniter\Database\Postgre\Connection::execute()``
+* ``CodeIgniter\Database\Postgre\Connection::_fieldData()``
+* ``CodeIgniter\Database\Postgre\Connection::_indexData()``
+* ``CodeIgniter\Database\Postgre\Connection::_foreignKeyData()``
+* ``CodeIgniter\Database\SQLSRV\Connection::execute()``
+* ``CodeIgniter\Database\SQLSRV\Connection::_fieldData()``
+* ``CodeIgniter\Database\SQLSRV\Connection::_indexData()``
+* ``CodeIgniter\Database\SQLSRV\Connection::_foreignKeyData()``
+* ``CodeIgniter\Database\SQLite3\Connection::execute()``
+* ``CodeIgniter\Database\SQLite3\Connection::_fieldData()``
+* ``CodeIgniter\Database\SQLite3\Connection::_indexData()``
+* ``CodeIgniter\Database\SQLite3\Connection::_foreignKeyData()``
+* ``CodeIgniter\Images\Handlers\GDHandler::_flatten()``
+* ``CodeIgniter\Images\Handlers\GDHandler::_flip()``
+* ``CodeIgniter\Images\Handlers\ImageMagickHandler::_flatten()``
+* ``CodeIgniter\Images\Handlers\ImageMagickHandler::_flip()``
+* ``CodeIgniter\Test\Mock\MockIncomingRequest::detectURI()``
+* ``CodeIgniter\Test\Mock\MockSecurity.php::sendCookie()``
+
+- To be compatible with the strict inheritance checks of PHP 8.1, the following method signatures were added return types to match their parents' signatures whenever possible:
+
+* ``CodeIgniter\Cookie\Cookie::offsetExists()``
+* ``CodeIgniter\Cookie\Cookie::offsetSet()``
+* ``CodeIgniter\Cookie\Cookie::offsetUnset()``
+* ``CodeIgniter\Cookie\CookieStore::getIterator()``
+* ``CodeIgniter\I18n\Time::__wakeup()``
+* ``CodeIgniter\Test\Filters\CITestStreamFilter::filter()``
+
+- Related to the strict inheritance checks of PHP 8.1, the following session handlers implementing ``SessionHandlerInterface`` have their public methods modified to match the interface:
+
+* ``CodeIgniter\Session\Handlers\ArrayHandler``
+* ``CodeIgniter\Session\Handlers\DatabaseHandler``
+* ``CodeIgniter\Session\Handlers\FileHandler``
+* ``CodeIgniter\Session\Handlers\MemcachedHandler``
+* ``CodeIgniter\Session\Handlers\RedisHandler``

From 26b7a909c0733de105a1b2a13d7f5199de9f30c0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 6 Sep 2021 11:08:46 +0900
Subject: [PATCH 0156/2325] docs: fix indentation of the list

---
 user_guide_src/source/changelogs/v4.1.4.rst | 68 ++++++++++-----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.1.4.rst b/user_guide_src/source/changelogs/v4.1.4.rst
index 14c7a99e5e62..58cfe82b61ac 100644
--- a/user_guide_src/source/changelogs/v4.1.4.rst
+++ b/user_guide_src/source/changelogs/v4.1.4.rst
@@ -12,43 +12,43 @@ Breaking Changes:
 
 - The following methods were changed from "public" to "protected" to match their parent class methods and better align with their uses:
 
-* ``CodeIgniter\Database\MySQLi\Connection::execute()``
-* ``CodeIgniter\Database\MySQLi\Connection::_fieldData()``
-* ``CodeIgniter\Database\MySQLi\Connection::_indexData()``
-* ``CodeIgniter\Database\MySQLi\Connection::_foreignKeyData()``
-* ``CodeIgniter\Database\Postgre\Builder::_like_statement()``
-* ``CodeIgniter\Database\Postgre\Connection::execute()``
-* ``CodeIgniter\Database\Postgre\Connection::_fieldData()``
-* ``CodeIgniter\Database\Postgre\Connection::_indexData()``
-* ``CodeIgniter\Database\Postgre\Connection::_foreignKeyData()``
-* ``CodeIgniter\Database\SQLSRV\Connection::execute()``
-* ``CodeIgniter\Database\SQLSRV\Connection::_fieldData()``
-* ``CodeIgniter\Database\SQLSRV\Connection::_indexData()``
-* ``CodeIgniter\Database\SQLSRV\Connection::_foreignKeyData()``
-* ``CodeIgniter\Database\SQLite3\Connection::execute()``
-* ``CodeIgniter\Database\SQLite3\Connection::_fieldData()``
-* ``CodeIgniter\Database\SQLite3\Connection::_indexData()``
-* ``CodeIgniter\Database\SQLite3\Connection::_foreignKeyData()``
-* ``CodeIgniter\Images\Handlers\GDHandler::_flatten()``
-* ``CodeIgniter\Images\Handlers\GDHandler::_flip()``
-* ``CodeIgniter\Images\Handlers\ImageMagickHandler::_flatten()``
-* ``CodeIgniter\Images\Handlers\ImageMagickHandler::_flip()``
-* ``CodeIgniter\Test\Mock\MockIncomingRequest::detectURI()``
-* ``CodeIgniter\Test\Mock\MockSecurity.php::sendCookie()``
+    * ``CodeIgniter\Database\MySQLi\Connection::execute()``
+    * ``CodeIgniter\Database\MySQLi\Connection::_fieldData()``
+    * ``CodeIgniter\Database\MySQLi\Connection::_indexData()``
+    * ``CodeIgniter\Database\MySQLi\Connection::_foreignKeyData()``
+    * ``CodeIgniter\Database\Postgre\Builder::_like_statement()``
+    * ``CodeIgniter\Database\Postgre\Connection::execute()``
+    * ``CodeIgniter\Database\Postgre\Connection::_fieldData()``
+    * ``CodeIgniter\Database\Postgre\Connection::_indexData()``
+    * ``CodeIgniter\Database\Postgre\Connection::_foreignKeyData()``
+    * ``CodeIgniter\Database\SQLSRV\Connection::execute()``
+    * ``CodeIgniter\Database\SQLSRV\Connection::_fieldData()``
+    * ``CodeIgniter\Database\SQLSRV\Connection::_indexData()``
+    * ``CodeIgniter\Database\SQLSRV\Connection::_foreignKeyData()``
+    * ``CodeIgniter\Database\SQLite3\Connection::execute()``
+    * ``CodeIgniter\Database\SQLite3\Connection::_fieldData()``
+    * ``CodeIgniter\Database\SQLite3\Connection::_indexData()``
+    * ``CodeIgniter\Database\SQLite3\Connection::_foreignKeyData()``
+    * ``CodeIgniter\Images\Handlers\GDHandler::_flatten()``
+    * ``CodeIgniter\Images\Handlers\GDHandler::_flip()``
+    * ``CodeIgniter\Images\Handlers\ImageMagickHandler::_flatten()``
+    * ``CodeIgniter\Images\Handlers\ImageMagickHandler::_flip()``
+    * ``CodeIgniter\Test\Mock\MockIncomingRequest::detectURI()``
+    * ``CodeIgniter\Test\Mock\MockSecurity.php::sendCookie()``
 
 - To be compatible with the strict inheritance checks of PHP 8.1, the following method signatures were added return types to match their parents' signatures whenever possible:
 
-* ``CodeIgniter\Cookie\Cookie::offsetExists()``
-* ``CodeIgniter\Cookie\Cookie::offsetSet()``
-* ``CodeIgniter\Cookie\Cookie::offsetUnset()``
-* ``CodeIgniter\Cookie\CookieStore::getIterator()``
-* ``CodeIgniter\I18n\Time::__wakeup()``
-* ``CodeIgniter\Test\Filters\CITestStreamFilter::filter()``
+    * ``CodeIgniter\Cookie\Cookie::offsetExists()``
+    * ``CodeIgniter\Cookie\Cookie::offsetSet()``
+    * ``CodeIgniter\Cookie\Cookie::offsetUnset()``
+    * ``CodeIgniter\Cookie\CookieStore::getIterator()``
+    * ``CodeIgniter\I18n\Time::__wakeup()``
+    * ``CodeIgniter\Test\Filters\CITestStreamFilter::filter()``
 
 - Related to the strict inheritance checks of PHP 8.1, the following session handlers implementing ``SessionHandlerInterface`` have their public methods modified to match the interface:
 
-* ``CodeIgniter\Session\Handlers\ArrayHandler``
-* ``CodeIgniter\Session\Handlers\DatabaseHandler``
-* ``CodeIgniter\Session\Handlers\FileHandler``
-* ``CodeIgniter\Session\Handlers\MemcachedHandler``
-* ``CodeIgniter\Session\Handlers\RedisHandler``
+    * ``CodeIgniter\Session\Handlers\ArrayHandler``
+    * ``CodeIgniter\Session\Handlers\DatabaseHandler``
+    * ``CodeIgniter\Session\Handlers\FileHandler``
+    * ``CodeIgniter\Session\Handlers\MemcachedHandler``
+    * ``CodeIgniter\Session\Handlers\RedisHandler``

From f1cdeff536a12d903f38a5f39ad84fa9dd55f5ae Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Tue, 7 Sep 2021 01:51:29 +0000
Subject: [PATCH 0157/2325] Replace pasted content

---
 .../source/installation/upgrade_414.rst       | 58 +------------------
 1 file changed, 3 insertions(+), 55 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_414.rst b/user_guide_src/source/installation/upgrade_414.rst
index 8f84809fb664..613823132351 100644
--- a/user_guide_src/source/installation/upgrade_414.rst
+++ b/user_guide_src/source/installation/upgrade_414.rst
@@ -38,58 +38,6 @@ If you relied on any of these methods being public (highly unlikely) adjust your
 Project Files
 =============
 
-Numerous 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>`_.
-
-.. note:: Except in very rare cases for bug fixes, no changes made to files for the project space
-    will break your application. All changes noted here are optional until the next major version,
-    and any mandatory changes will be covered in the sections above.
-
-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:
-
-* ``app/Config/App.php``
-* ``app/Config/Autoload.php``
-* ``app/Config/Cookie.php``
-* ``app/Config/Events.php``
-* ``app/Config/Exceptions.php``
-* ``app/Config/Security.php``
-* ``app/Views/errors/html/*``
-* ``env``
-* ``spark``
-
-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 affect on the runtime:
-
-* ``app/Config/App.php``
-* ``app/Config/Autoload.php``
-* ``app/Config/ContentSecurityPolicy.php``
-* ``app/Config/Cookie.php``
-* ``app/Config/Events.php``
-* ``app/Config/Exceptions.php``
-* ``app/Config/Logger.php``
-* ``app/Config/Mimes.php``
-* ``app/Config/Modules.php``
-* ``app/Config/Security.php``
-* ``app/Controllers/BaseController.php``
-* ``app/Views/errors/html/debug.css``
-* ``app/Views/errors/html/error_404.php``
-* ``app/Views/errors/html/error_exception.php``
-* ``app/Views/welcome_message.php``
-* ``composer.json``
-* ``contributing/guidelines.rst``
-* ``env``
-* ``phpstan.neon.dist``
-* ``phpunit.xml.dist``
-* ``public/.htaccess``
-* ``public/index.php``
-* ``rector.php``
-* ``spark``
+All files in the project space were reformatted with the new coding style. This will not affect
+existing code but you may want to apply the updated coding style to your own projects to keep
+them in line with the framework's version of these files.

From 09609d5ab050e89d26dac6e93a465a27aff66254 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Sun, 13 Jun 2021 23:37:10 -0500
Subject: [PATCH 0158/2325] New mock() test helper and expanded MockCache with
 assertions.

---
 system/Cache/CacheFactory.php             | 18 ++++-
 system/Exceptions/TestException.php       | 25 ++++++
 system/Helpers/test_helper.php            | 32 +++++++-
 system/Language/en/Test.php               | 15 ++++
 system/Test/Mock/MockCache.php            | 98 +++++++++++++++++------
 tests/system/Cache/CacheMockTest.php      | 46 +++++++++++
 user_guide_src/source/testing/index.rst   |  3 +-
 user_guide_src/source/testing/mocking.rst | 53 ++++++++++++
 8 files changed, 260 insertions(+), 30 deletions(-)
 create mode 100644 system/Exceptions/TestException.php
 create mode 100644 system/Language/en/Test.php
 create mode 100644 tests/system/Cache/CacheMockTest.php
 create mode 100644 user_guide_src/source/testing/mocking.rst

diff --git a/system/Cache/CacheFactory.php b/system/Cache/CacheFactory.php
index 720fae0e4c6c..875dcd3f7bcd 100644
--- a/system/Cache/CacheFactory.php
+++ b/system/Cache/CacheFactory.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Cache\Exceptions\CacheException;
 use CodeIgniter\Exceptions\CriticalError;
+use CodeIgniter\Test\Mock\MockCache;
 use Config\Cache;
 
 /**
@@ -20,6 +21,20 @@
  */
 class CacheFactory
 {
+    /**
+     * The class to use when mocking
+     *
+     * @var string
+     */
+    public static $mockClass = MockCache::class;
+
+    /**
+     * The service to inject the mock as
+     *
+     * @var string
+     */
+    public static $mockServiceName = 'cache';
+
     /**
      * Attempts to create the desired cache handler, based upon the
      *
@@ -42,14 +57,12 @@ public static function getHandler(Cache $config, ?string $handler = null, ?strin
             throw CacheException::forHandlerNotFound();
         }
 
-        // Get an instance of our handler.
         $adapter = new $config->validHandlers[$handler]($config);
 
         if (! $adapter->isSupported()) {
             $adapter = new $config->validHandlers[$backup]($config);
 
             if (! $adapter->isSupported()) {
-                // Log stuff here, don't throw exception. No need to raise a fuss.
                 // Fall back to the dummy adapter.
                 $adapter = new $config->validHandlers['dummy']();
             }
@@ -60,7 +73,6 @@ public static function getHandler(Cache $config, ?string $handler = null, ?strin
         try {
             $adapter->initialize();
         } catch (CriticalError $e) {
-            // log the fact that an exception occurred as well what handler we are resorting to
             log_message('critical', $e->getMessage() . ' Resorting to using ' . $backup . ' handler.');
 
             // get the next best cache handler (or dummy if the $backup also fails)
diff --git a/system/Exceptions/TestException.php b/system/Exceptions/TestException.php
new file mode 100644
index 000000000000..a1c4c51cf814
--- /dev/null
+++ b/system/Exceptions/TestException.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Exceptions;
+
+/**
+ * Exception for automatic logging.
+ */
+class TestException extends CriticalError
+{
+    use DebugTraceableTrait;
+
+    public static function forInvalidMockClass(string $name)
+    {
+        return new static(lang('Test.invalidMockClass', [$name]));
+    }
+}
diff --git a/system/Helpers/test_helper.php b/system/Helpers/test_helper.php
index e20054ab6893..a73446a0ac5f 100644
--- a/system/Helpers/test_helper.php
+++ b/system/Helpers/test_helper.php
@@ -9,8 +9,10 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+use CodeIgniter\Exceptions\TestException;
 use CodeIgniter\Model;
 use CodeIgniter\Test\Fabricator;
+use Config\Services;
 
 // CodeIgniter Test Helpers
 
@@ -20,16 +22,14 @@
      *
      * @param Model|object|string $model     Instance or name of the model
      * @param array|null          $overrides Overriding data to pass to Fabricator::setOverrides()
-     * @param mixed               $persist
+     * @param bool                $persist
      *
      * @return array|object
      */
     function fake($model, ?array $overrides = null, $persist = true)
     {
-        // Get a model-appropriate Fabricator instance
         $fabricator = new Fabricator($model);
 
-        // Set overriding data, if necessary
         if ($overrides) {
             $fabricator->setOverrides($overrides);
         }
@@ -41,3 +41,29 @@ function fake($model, ?array $overrides = null, $persist = true)
         return $fabricator->make();
     }
 }
+
+if (! function_exists('mock')) {
+    /**
+     * Used within our test suite to mock certain system tools.
+     * All tools using this MUST use the MockableTrait
+     *
+     * @param string $className Fully qualified class name
+     */
+    function mock(string $className)
+    {
+        $mockClass   = $className::$mockClass;
+        $mockService = $className::$mockServiceName;
+
+        if (empty($mockClass) || ! class_exists($mockClass)) {
+            throw TestException::forInvalidMockClass($mockClass);
+        }
+
+        $mock = new $mockClass();
+
+        if (! empty($mockService)) {
+            Services::injectMock($mockService, $mock);
+        }
+
+        return $mock;
+    }
+}
diff --git a/system/Language/en/Test.php b/system/Language/en/Test.php
new file mode 100644
index 000000000000..a3f5d7ef6f02
--- /dev/null
+++ b/system/Language/en/Test.php
@@ -0,0 +1,15 @@
+<?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.
+ */
+
+// Testing language settings
+return [
+    'invalidMockClass' => '{0} is not a valid Mock class',
+];
diff --git a/system/Test/Mock/MockCache.php b/system/Test/Mock/MockCache.php
index e6bc200fdd1f..a2b1c12cd68f 100644
--- a/system/Test/Mock/MockCache.php
+++ b/system/Test/Mock/MockCache.php
@@ -14,6 +14,7 @@
 use Closure;
 use CodeIgniter\Cache\CacheInterface;
 use CodeIgniter\Cache\Handlers\BaseHandler;
+use PHPUnit\Framework\Assert;
 
 class MockCache extends BaseHandler implements CacheInterface
 {
@@ -31,6 +32,13 @@ class MockCache extends BaseHandler implements CacheInterface
      */
     protected $expirations = [];
 
+    /**
+     * If true, will not cache any data.
+     *
+     * @var bool
+     */
+    protected $bypass = false;
+
     /**
      * Takes care of any handler-specific setup that must be done.
      */
@@ -49,16 +57,12 @@ public function get(string $key)
     {
         $key = static::validateKey($key, $this->prefix);
 
-        return $this->cache[$key] ?? null;
+        return array_key_exists($key, $this->cache) ? $this->cache[$key] : null;
     }
 
     /**
      * Get an item from the cache, or execute the given Closure and store the result.
      *
-     * @param string  $key      Cache item name
-     * @param int     $ttl      Time to live
-     * @param Closure $callback Callback return value
-     *
      * @return mixed
      */
     public function remember(string $key, int $ttl, Closure $callback)
@@ -89,6 +93,10 @@ public function remember(string $key, int $ttl, Closure $callback)
      */
     public function save(string $key, $value, int $ttl = 60, bool $raw = false)
     {
+        if ($this->bypass) {
+            return false;
+        }
+
         $key = static::validateKey($key, $this->prefix);
 
         $this->cache[$key]       = $value;
@@ -100,8 +108,6 @@ public function save(string $key, $value, int $ttl = 60, bool $raw = false)
     /**
      * Deletes a specific item from the cache store.
      *
-     * @param string $key Cache item name
-     *
      * @return bool
      */
     public function delete(string $key)
@@ -120,8 +126,6 @@ public function delete(string $key)
     /**
      * Deletes items from the cache store matching a given pattern.
      *
-     * @param string $pattern Cache items glob-style pattern
-     *
      * @return int
      */
     public function deleteMatching(string $pattern)
@@ -141,9 +145,6 @@ public function deleteMatching(string $pattern)
     /**
      * Performs atomic incrementation of a raw stored value.
      *
-     * @param string $key    Cache ID
-     * @param int    $offset Step/value to increase by
-     *
      * @return bool
      */
     public function increment(string $key, int $offset = 1)
@@ -163,9 +164,6 @@ public function increment(string $key, int $offset = 1)
     /**
      * Performs atomic decrementation of a raw stored value.
      *
-     * @param string $key    Cache ID
-     * @param int    $offset Step/value to increase by
-     *
      * @return bool
      */
     public function decrement(string $key, int $offset = 1)
@@ -212,10 +210,7 @@ public function getCacheInfo()
     /**
      * Returns detailed information about the specific item in the cache.
      *
-     * @param string $key Cache item name.
-     *
-     * @return array|null
-     *                    Returns null if the item does not exist, otherwise array<string, mixed>
+     * @return array|null Returns null if the item does not exist, otherwise array<string, mixed>
      *                    with at least the 'expire' key for absolute epoch expiry (or null).
      */
     public function getMetaData(string $key)
@@ -230,16 +225,73 @@ public function getMetaData(string $key)
             return null;
         }
 
-        return [
-            'expire' => $this->expirations[$key],
-        ];
+        return ['expire' => $this->expirations[$key]];
     }
 
     /**
-     * Determines if the driver is supported on this system.
+     * Determine if the driver is supported on this system.
      */
     public function isSupported(): bool
     {
         return true;
     }
+
+    //--------------------------------------------------------------------
+    // Test Helpers
+    //--------------------------------------------------------------------
+
+    /**
+     * Instructs the class to ignore all
+     * requests to cache an item, and always "miss"
+     * when checked for existing data.
+     *
+     * @return $this
+     */
+    public function bypass(bool $bypass = true)
+    {
+        $this->clean();
+        $this->bypass = $bypass;
+
+        return $this;
+    }
+
+    //--------------------------------------------------------------------
+    // Additional Assertions
+    //--------------------------------------------------------------------
+
+    /**
+     * Asserts that the cache has an item named $key.
+     * The value is not checked since storing false or null
+     * values is valid.
+     */
+    public function assertHas(string $key)
+    {
+        Assert::assertNotNull($this->get($key), "The cache does not have an item named: `{$key}`");
+    }
+
+    /**
+     * Asserts that the cache has an item named $key with a value matching $value.
+     *
+     * @param mixed $value
+     */
+    public function assertHasValue(string $key, $value = null)
+    {
+        $item = $this->get($key);
+
+        // Let assertHas handle throwing the error for consistency
+        // if the key is not found
+        if (empty($item)) {
+            $this->assertHas($key);
+        }
+
+        Assert::assertEquals($value, $this->get($key), "The cached item `{$key}` does not equal match expectation. Found: " . print_r($value, true));
+    }
+
+    /**
+     * Asserts that the cache does NOT have an item named $key.
+     */
+    public function assertMissing(string $key)
+    {
+        Assert::assertFalse(array_key_exists($key, $this->cache), "The cached item named `{$key}` exists.");
+    }
 }
diff --git a/tests/system/Cache/CacheMockTest.php b/tests/system/Cache/CacheMockTest.php
new file mode 100644
index 000000000000..860623478693
--- /dev/null
+++ b/tests/system/Cache/CacheMockTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cache;
+
+use CodeIgniter\Cache\Handlers\BaseHandler;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\Mock\MockCache;
+
+/**
+ * @internal
+ */
+final class CacheMockTest extends CIUnitTestCase
+{
+    public function testMockReturnsMockCacheClass()
+    {
+        $this->assertInstanceOf(BaseHandler::class, service('cache'));
+
+        $mock = mock(CacheFactory::class);
+        $this->assertInstanceOf(MockCache::class, $mock);
+        $this->assertInstanceOf(MockCache::class, service('cache'));
+    }
+
+    public function testMockCaching()
+    {
+        $mock = mock(CacheFactory::class);
+
+        // Ensure it stores the value normally
+        $mock->save('foo', 'bar');
+        $mock->assertHas('foo');
+        $mock->assertHasValue('foo', 'bar');
+
+        // Try it again with bypass on
+        $mock->bypass();
+        $mock->save('foo', 'bar');
+        $mock->assertMissing('foo');
+    }
+}
diff --git a/user_guide_src/source/testing/index.rst b/user_guide_src/source/testing/index.rst
index 878cc9918355..949a68b99b51 100644
--- a/user_guide_src/source/testing/index.rst
+++ b/user_guide_src/source/testing/index.rst
@@ -2,7 +2,7 @@
 Testing
 #######
 
-CodeIgniter ships with a number of tools to help you test and debug your application thoroughly. 
+CodeIgniter ships with a number of tools to help you test and debug your application thoroughly.
 The following sections should get you quickly testing your applications.
 
 .. toctree::
@@ -16,3 +16,4 @@ The following sections should get you quickly testing your applications.
     response
     benchmark
     debugging
+    Mocking <mocking>
diff --git a/user_guide_src/source/testing/mocking.rst b/user_guide_src/source/testing/mocking.rst
new file mode 100644
index 000000000000..ea0a30922dd4
--- /dev/null
+++ b/user_guide_src/source/testing/mocking.rst
@@ -0,0 +1,53 @@
+######################
+Mocking System Classes
+######################
+
+Several classes within the framework provide mocked versions of the classes that can be used during testing. These classes
+can take the place of the normal class during test execution, often providing additional assertions to test that actions
+have taken place (or not taken place) during the execution of the test. This might be checking data gets cached correctly,
+emails were sent correctly, etc.
+
+.. contents::
+    :local:
+    :depth: 1
+
+Cache
+=====
+
+You can mock the cache with the ``mock()`` method, using the ``CacheFactory`` as its only parameter.
+::
+
+    $mock = mock(CodeIgniter\Cache\CacheFactory::class);
+
+While this returns an instance of ``CodeIgniter\Test\Mock\MockCache`` that you can use directly, it also inserts the
+mock into the Service class, so any calls within your code to ``service('cache')`` or ``Config\Services::cache()`` will
+use the mocked class within its place.
+
+When using this in more than one test method within a single file you should call either the ``clean()`` or ``bypass()``
+methods during the test ``setUp()`` to ensure a clean slate when your tests run.
+
+Additional Methods
+------------------
+
+You can instruct the mocked cache handler to never do any caching with the ``bypass()`` method. This will emulate
+using the dummy handler and ensures that your test does not rely on cached data for your tests.
+::
+
+    $mock = mock(CodeIgniter\Cache\CacheFactory::class);
+    // Never cache any items during this test.
+    $mock->bypass();
+
+Available Assertions
+--------------------
+
+The following new assertions are available on the mocked class for using during testing:
+::
+
+    $mock = mock(CodeIgniter\Cache\CacheFactory::class);
+
+    // Assert that a cached item named $key exists
+    $mock->assertHas($key);
+    // Assert that a cached item named $key exists with a value of $value
+    $mock->assertHasValue($key, $value);
+    // Assert that a cached item named $key does NOT exist
+    $mock->assertMissing($key);

From 8710e3ed949661e96fe089a94c1776317ab6bb21 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Wed, 16 Jun 2021 22:30:50 -0500
Subject: [PATCH 0159/2325] Updated assert to assertArrayNotHasKey per
 suggestion.

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

diff --git a/system/Test/Mock/MockCache.php b/system/Test/Mock/MockCache.php
index a2b1c12cd68f..ebdacccbbef5 100644
--- a/system/Test/Mock/MockCache.php
+++ b/system/Test/Mock/MockCache.php
@@ -284,7 +284,7 @@ public function assertHasValue(string $key, $value = null)
             $this->assertHas($key);
         }
 
-        Assert::assertEquals($value, $this->get($key), "The cached item `{$key}` does not equal match expectation. Found: " . print_r($value, true));
+        Assert::assertSame($value, $this->get($key), "The cached item `{$key}` does not equal match expectation. Found: " . print_r($value, true));
     }
 
     /**
@@ -292,6 +292,6 @@ public function assertHasValue(string $key, $value = null)
      */
     public function assertMissing(string $key)
     {
-        Assert::assertFalse(array_key_exists($key, $this->cache), "The cached item named `{$key}` exists.");
+        Assert::assertArrayNotHasKey($key, $this->cache, "The cached item named `{$key}` exists.");
     }
 }

From d2e9a64b00d0bdb83fd8cac259a3f374d606b896 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Mon, 14 Jun 2021 08:13:52 -0500
Subject: [PATCH 0160/2325] Update system/Helpers/test_helper.php

Co-authored-by: MGatner <mgatner@icloud.com>
---
 system/Helpers/test_helper.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/system/Helpers/test_helper.php b/system/Helpers/test_helper.php
index a73446a0ac5f..fe6b06794ccd 100644
--- a/system/Helpers/test_helper.php
+++ b/system/Helpers/test_helper.php
@@ -45,14 +45,13 @@ function fake($model, ?array $overrides = null, $persist = true)
 if (! function_exists('mock')) {
     /**
      * Used within our test suite to mock certain system tools.
-     * All tools using this MUST use the MockableTrait
      *
      * @param string $className Fully qualified class name
      */
     function mock(string $className)
     {
         $mockClass   = $className::$mockClass;
-        $mockService = $className::$mockServiceName;
+        $mockService = $className::$mockServiceName ?? '';
 
         if (empty($mockClass) || ! class_exists($mockClass)) {
             throw TestException::forInvalidMockClass($mockClass);

From 0a2b74b2ecaa3802f3009a0df826499eaefce76a Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Mon, 14 Jun 2021 08:17:05 -0500
Subject: [PATCH 0161/2325] Update user_guide_src/source/testing/mocking.rst

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/testing/mocking.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/testing/mocking.rst b/user_guide_src/source/testing/mocking.rst
index ea0a30922dd4..03b464cf6570 100644
--- a/user_guide_src/source/testing/mocking.rst
+++ b/user_guide_src/source/testing/mocking.rst
@@ -2,7 +2,7 @@
 Mocking System Classes
 ######################
 
-Several classes within the framework provide mocked versions of the classes that can be used during testing. These classes
+Several components within the framework provide mocked versions of their classes that can be used during testing. These classes
 can take the place of the normal class during test execution, often providing additional assertions to test that actions
 have taken place (or not taken place) during the execution of the test. This might be checking data gets cached correctly,
 emails were sent correctly, etc.

From 944152fe130554a1529d8070bb2ec285975519aa Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Sun, 23 May 2021 19:09:49 +0000
Subject: [PATCH 0162/2325] Add Publisher

---
 system/Language/en/Publisher.php              |  17 +
 .../Exceptions/PublisherException.php         |  32 +
 system/Publisher/Publisher.php                | 713 ++++++++++++++++++
 tests/_support/Publishers/TestPublisher.php   |  16 +
 4 files changed, 778 insertions(+)
 create mode 100644 system/Language/en/Publisher.php
 create mode 100644 system/Publisher/Exceptions/PublisherException.php
 create mode 100644 system/Publisher/Publisher.php
 create mode 100644 tests/_support/Publishers/TestPublisher.php

diff --git a/system/Language/en/Publisher.php b/system/Language/en/Publisher.php
new file mode 100644
index 000000000000..ada599074efe
--- /dev/null
+++ b/system/Language/en/Publisher.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * This file is part of the 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.
+ */
+
+// Publisher language settings
+return [
+	'expectedFile'      => 'Publisher::{0} expects a valid file.',
+	'expectedDirectory' => 'Publisher::{0} expects a valid directory.',
+	'collision'         => 'Publisher encountered an unexpected {0} while copying {1} to {2}.',
+];
diff --git a/system/Publisher/Exceptions/PublisherException.php b/system/Publisher/Exceptions/PublisherException.php
new file mode 100644
index 000000000000..23a4b54d3e57
--- /dev/null
+++ b/system/Publisher/Exceptions/PublisherException.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Publisher\Exceptions;
+
+use CodeIgniter\Exceptions\FrameworkException;
+
+class PublisherException extends FrameworkException
+{
+	public static function forExpectedDirectory(string $caller)
+	{
+		return new static(lang('Publisher.expectedDirectory', [$caller]));
+	}
+
+	public static function forExpectedFile(string $caller)
+	{
+		return new static(lang('Publisher.expectedFile', [$caller]));
+	}
+
+	public static function forCollision(string $from, string $to)
+	{
+		return new static(lang('Publisher.collision', [filetype($to), $from, $to]));
+	}
+}
diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php
new file mode 100644
index 000000000000..8f599d3292b6
--- /dev/null
+++ b/system/Publisher/Publisher.php
@@ -0,0 +1,713 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Publisher;
+
+use CodeIgniter\Autoloader\FileLocator;
+use CodeIgniter\Files\File;
+use CodeIgniter\HTTP\URI;
+use CodeIgniter\Publisher\Exceptions\PublisherException;
+use Throwable;
+
+/**
+ * Publisher Class
+ *
+ * Publishers read in file paths from a variety
+ * of sources and copy the files out to different
+ * destinations.
+ * This class acts both as a base for individual
+ * publication directives as well as the mode of
+ * discovery for said instances.
+ * In this class a "file" is a full path to a
+ * verified file while a "path" is relative to
+ * to its source or destination and may indicate
+ * either a file or directory fo unconfirmed
+ * existence.
+ * Class failures throw a PublisherException,
+ * but some underlying methods may percolate
+ * different exceptions, like FileException,
+ * FileNotFoundException, InvalidArgumentException.
+ * Write operations will catch all errors in the
+ * file-specific $errors property to minimize
+ * impact of partial batch operations.
+ */
+class Publisher
+{
+	/**
+	 * Array of discovered Publishers.
+	 *
+	 * @var array<string,self[]|null>
+	 */
+	private static $discovered = [];
+
+	/**
+	 * Directory to use for methods
+	 * that need temporary storage.
+	 * Created on-the-fly as needed.
+	 *
+	 * @var string|null
+	 */
+	private $scratch;
+
+	/**
+	 * The current list of files.
+	 *
+	 * @var string[]
+	 */
+	private $files = [];
+
+	/**
+	 * Exceptions for specific files
+	 * from the last write operation.
+	 *
+	 * @var array<string,Throwable>
+	 */
+	private $errors = [];
+
+	/**
+	 * Base path to use for the source.
+	 *
+	 * @var string
+	 */
+	protected $source = ROOTPATH;
+
+	/**
+	 * Base path to use for the destination.
+	 *
+	 * @var string
+	 */
+	protected $destination = FCPATH;
+
+	/**
+	 * Discovers and returns all Publishers
+	 * in the specified namespace directory.
+	 *
+	 * @return self[]
+	 */
+	public static function discover($directory = 'Publishers'): array
+	{
+		if (isset(self::$discovered[$directory]))
+		{
+			return self::$discovered[$directory];
+		}
+		self::$discovered[$directory] = [];
+
+		/** @var FileLocator $locator */
+		$locator = service('locator');
+
+		if ([] === $files = $locator->listFiles($directory))
+		{
+			return [];
+		}
+
+		// Loop over each file checking to see if it is a Primer
+		foreach ($files as $file)
+		{
+			$className = $locator->findQualifiedNameFromPath($file);
+
+			if (is_string($className) && class_exists($className) && is_a($className, self::class, true))
+			{
+				self::$discovered[$directory][] = new $className();
+			}
+		}
+		sort(self::$discovered[$directory]);
+
+		return self::$discovered[$directory];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Resolves a full path and verifies
+	 * it is an actual directory.
+	 *
+	 * @param string $directory
+	 *
+	 * @return string
+	 */
+	private static function resolveDirectory(string $directory): string
+	{
+		if (! is_dir($directory = set_realpath($directory)))
+		{
+			$caller = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1];
+			throw PublisherException::forExpectedDirectory($caller['function']);
+		}
+
+		return $directory;
+	}
+
+	/**
+	 * Resolves a full path and verifies
+	 * it is an actual file.
+	 *
+	 * @param string $file
+	 *
+	 * @return string
+	 */
+	private static function resolveFile(string $file): string
+	{
+		if (! is_file($file = set_realpath($file)))
+		{
+			$caller = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1];
+			throw PublisherException::forExpectedFile($caller['function']);
+		}
+
+		return $file;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Filters an array of files, removing files not
+	 * part of the given directory (recursive).
+	 *
+	 * @param string[] $files
+	 * @param string $directory
+	 *
+	 * @return string[]
+	 */
+	private static function filterFiles(array $files, string $directory): array
+	{
+		$directory = self::resolveDirectory($directory);
+
+		return array_filter($files, function ($value) use ($directory) {
+			return strpos($value, $directory) === 0;
+		});
+	}
+
+	/**
+	 * Returns any files whose basename matches
+	 * the given pattern.
+	 *
+	 * @param string[] $files
+	 * @param string $pattern Regex or pseudo-regex string
+	 *
+	 * @return string[]
+	 */
+	private static function matchFiles(array $files, string $pattern)
+	{
+		// Convert pseudo-regex into their true form
+		if (@preg_match($pattern, null) === false) // @phpstan-ignore-line
+		{
+			$pattern = str_replace(
+				['#', '.', '*', '?'],
+				['\#', '\.', '.*', '.'],
+				$pattern
+			);
+			$pattern = "#{$pattern}#";
+		}
+
+		return array_filter($files, function ($value) use ($pattern) {
+			return (bool) preg_match($pattern, basename($value));
+		});
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes a directory and all its files
+	 * and subdirectories.
+	 *
+	 * @param string $directory
+	 *
+	 * @return void
+	 */
+	private static function wipeDirectory(string $directory)
+	{
+		if (is_dir($directory))
+		{
+			// Try a few times in case of lingering locks
+			$attempts = 10;
+			while ((bool) $attempts && ! delete_files($directory, true, false, true))
+			{
+				$attempts--;
+				usleep(100000); // .1s
+			}
+
+			@rmdir($directory);
+		}
+	}
+
+	/**
+	 * Copies a file with directory creation
+	 * and identical file awareness.
+	 * Intentionally allows errors.
+	 *
+	 * @param string $from
+	 * @param string $to
+	 * @param bool $replace
+	 *
+	 * @return void
+	 *
+	 * @throws PublisherException For unresolvable collisions
+	 */
+	private static function safeCopyFile(string $from, string $to, bool $replace): void
+	{
+		// Check for an existing file
+		if (file_exists($to))
+		{
+			// If not replacing or if files are identical then consider successful
+			if (! $replace || same_file($from, $to))
+			{
+				return;
+			}
+
+			// If it is a directory then do not try to remove it
+			if (is_dir($to))
+			{
+				throw PublisherException::forCollision($from, $to);
+			}
+
+			// Try to remove anything else
+			unlink($to);
+		}
+
+		// Allow copy() to throw errors
+		copy($from, $to);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Loads the helper and verifies the
+	 * source and destination directories.
+	 *
+	 * @param string|null $source
+	 * @param string|null $destination
+	 */
+	public function __construct(string $source = null, string $destination = null)
+	{
+		helper(['filesystem']);
+
+		$this->source      = self::resolveDirectory($source ?? $this->source);
+		$this->destination = self::resolveDirectory($destination ?? $this->destination);
+	}
+
+	/**
+	 * Cleans up any temporary files
+	 * in the scratch space.
+	 */
+	public function __destruct()
+	{
+		if (isset($this->scratch))
+		{
+			self::wipeDirectory($this->scratch);
+
+			$this->scratch = null;
+		}
+	}
+
+	/**
+	 * Reads in file sources and copies out
+	 * the files to their destinations.
+	 * This method should be reimplemented by
+	 * child classes intended for discovery.
+	 *
+	 * @return void
+	 */
+	public function publish()
+	{
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the temporary workspace,
+	 * creating it if necessary.
+	 *
+	 * @return string
+	 */
+	protected function getScratch(): string
+	{
+		if (is_null($this->scratch))
+		{
+			$this->scratch = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . bin2hex(random_bytes(6)) . DIRECTORY_SEPARATOR;
+			mkdir($this->scratch, 0700);
+		}
+
+		return $this->scratch;
+	}
+
+	/**
+	 * Returns any errors from the last
+	 * write operation.
+	 *
+	 * @return array<string,Throwable>
+	 */
+	public function getErrors(): array
+	{
+		return $this->errors;
+	}
+
+	/**
+	 * Optimizes and returns the
+	 * current file list.
+	 *
+	 * @return string[]
+	 */
+	public function getFiles(): array
+	{
+		$this->files = array_unique($this->files, SORT_STRING);
+		sort($this->files, SORT_STRING);
+
+		return $this->files;
+	}
+
+	/**
+	 * Sets the file list directly.
+	 * Files are still subject to verification.
+	 * This works as a "reset" method with [].
+	 *
+	 * @param string[] $files  A new file list to use
+	 *
+	 * @return $this
+	 */
+	public function setFiles(array $files)
+	{
+		$this->files = [];
+
+		return $this->addFiles($files);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Verifies and adds files to the list.
+	 *
+	 * @param string[] $files
+	 *
+	 * @return $this
+	 */
+	public function addFiles(array $files)
+	{
+		foreach ($files as $file)
+		{
+			$this->addFile($file);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Verifies and adds a single file
+	 * to the file list.
+	 *
+	 * @param string $file
+	 *
+	 * @return $this
+	 */
+	public function addFile(string $file)
+	{
+		$this->files[] = self::resolveFile($file);
+
+		return $this;
+	}
+
+	/**
+	 * Removes files from the list.
+	 *
+	 * @param string[] $files
+	 *
+	 * @return $this
+	 */
+	public function removeFiles(array $files)
+	{
+		$this->files = array_diff($this->files, $files);
+
+		return $this;
+	}
+
+	/**
+	 * Removes a single file from the list.
+	 *
+	 * @param string $file
+	 *
+	 * @return $this
+	 */
+	public function removeFile(string $file)
+	{
+		return $this->removeFiles([$file]);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Verifies and adds files from each
+	 * directory to the list.
+	 *
+	 * @param string[] $directories
+	 * @param bool $recursive
+	 *
+	 * @return $this
+	 */
+	public function addDirectories(array $directories, bool $recursive = false)
+	{
+		foreach ($directories as $directory)
+		{
+			$this->addDirectory($directory, $recursive);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Verifies and adds all files
+	 * from a directory.
+	 *
+	 * @param string $directory
+	 * @param bool $recursive
+	 *
+	 * @return $this
+	 */
+	public function addDirectory(string $directory, bool $recursive = false)
+	{
+		$directory = self::resolveDirectory($directory);
+
+		// Map the directory to depth 2 to so directories become arrays
+		foreach (directory_map($directory, 2, true) as $key => $path)
+		{
+			if (is_string($path))
+			{
+				$this->addFile($directory . $path);
+			}
+			elseif ($recursive && is_array($path))
+			{
+				$this->addDirectory($directory . $key, true);
+			}
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Verifies and adds paths to the list.
+	 *
+	 * @param string[] $paths
+	 * @param bool $recursive
+	 *
+	 * @return $this
+	 */
+	public function addPaths(array $paths, bool $recursive = true)
+	{
+		foreach ($paths as $path)
+		{
+			$this->addPath($path, $recursive);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Adds a single path to the file list.
+	 *
+	 * @param string $path
+	 * @param bool $recursive
+	 *
+	 * @return $this
+	 */
+	public function addPath(string $path, bool $recursive = true)
+	{
+		$full = $this->source . $path;
+
+		// Test for a directory
+		try
+		{
+			$directory = self::resolveDirectory($full);
+		}
+		catch (PublisherException $e)
+		{
+			return $this->addFile($full);
+		}
+
+		return $this->addDirectory($full, $recursive);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Downloads and stages files from
+	 * an array of URIs.
+	 *
+	 * @param string[] $uris
+	 *
+	 * @return $this
+	 */
+	public function addUris(array $uris)
+	{
+		foreach ($uris as $uri)
+		{
+			$this->addUri($uri);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Downloads a file from the URI
+	 * and adds it to the file list.
+	 *
+	 * @param string $uri Because HTTP\URI is stringable it will still be accepted
+	 *
+	 * @return $this
+	 */
+	public function addUri(string $uri)
+	{
+		// Figure out a good filename (using URI strips queries and fragments)
+		$file = $this->getScratch() . basename((new URI($uri))->getPath());
+
+		// Get the content and write it to the scratch space
+		$response = service('curlrequest')->get($uri);
+		write_file($file, $response->getBody());
+
+		return $this->addFile($file);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes any files from the list that match
+	 * the supplied pattern (within the optional scope).
+	 *
+	 * @param string $pattern    Regex or pseudo-regex string
+	 * @param string|null $scope A directory to limit the scope
+	 *
+	 * @return $this
+	 */
+	public function removePattern(string $pattern, string $scope = null)
+	{
+		if ($pattern === '')
+		{
+			return $this;
+		}
+
+		// Start with all files or those in scope
+		$files = is_null($scope)
+			? $this->files
+			: self::filterFiles($this->files, $scope);
+
+		// Remove any files that match the pattern
+		return $this->removeFiles(self::matchFiles($files, $pattern));
+	}
+
+	/**
+	 * Keeps only the files from the list that match
+	 * the supplied pattern (within the optional scope).
+	 *
+	 * @param string $pattern    Regex or pseudo-regex string
+	 * @param string|null $scope A directory to limit the scope
+	 *
+	 * @return $this
+	 */
+	public function retainPattern(string $pattern, string $scope = null)
+	{
+		if ($pattern === '')
+		{
+			return $this;
+		}
+
+		// Start with all files or those in scope
+		$files = is_null($scope)
+			? $this->files
+			: self::filterFiles($this->files, $scope);
+
+		// Match the pattern within the scoped files
+		$matched = self::matchFiles($files, $pattern);
+
+		// ... and remove their inverse
+		return $this->removeFiles(array_diff($files, $matched));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes the destination and all its files and folders.
+	 *
+	 * @return $this
+	 */
+	public function wipe()
+	{
+		self::wipeDirectory($this->destination);
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Copies all files into the destination.
+	 * Does not create directory structure.
+	 *
+	 * @param bool $replace Whether to overwrite existing files.
+	 *
+	 * @return boolean Whether all files were copied successfully
+	 */
+	public function copy(bool $replace = true): bool
+	{
+		$this->errors = [];
+
+		foreach ($this->getFiles() as $file)
+		{
+			$to = $this->destination . basename($file);
+
+			try
+			{
+				self::safeCopyFile($file, $to, $replace);
+			}
+			catch (Throwable $e)
+			{
+				$this->errors[$file] = $e;
+			}
+		}
+
+		return $this->errors === [];
+	}
+
+	/**
+	 * Merges all files into the destination.
+	 * Creates a mirrored directory structure
+	 * only for files from source.
+	 *
+	 * @param bool $replace Whether to overwrite existing files.
+	 *
+	 * @return boolean Whether all files were copied successfully
+	 */
+	public function merge(bool $replace = true): bool
+	{
+		$this->errors = [];
+
+		// Get the file from source for special handling
+		$sourced = self::matchFiles($this->getFiles(), $this->source);
+
+		// Handle everything else with a flat copy
+		$this->files = array_diff($this->files, $sourced);
+		$this->copy($replace);
+
+		// Copy each sourced file to its relative destination
+		foreach ($sourced as $file)
+		{
+			// Resolve the destination path
+			$to = $this->destination . substr($file, strlen($this->source));
+
+			try
+			{
+				self::safeCopyFile($file, $to, $replace);
+			}
+			catch (Throwable $e)
+			{
+				$this->errors[$file] = $e;
+			}
+		}
+
+		return $this->errors === [];
+	}
+}
diff --git a/tests/_support/Publishers/TestPublisher.php b/tests/_support/Publishers/TestPublisher.php
new file mode 100644
index 000000000000..8ef30ca90024
--- /dev/null
+++ b/tests/_support/Publishers/TestPublisher.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Tests\Support\Publishers;
+
+use CodeIgniter\Publisher\Publisher;
+
+class TestPublisher extends Publisher
+{
+	/**
+	 * Runs the defined Operations.
+	 */
+	public function publish()
+	{
+		$this->downloadFromUrls($urls)->mergeToDirectory(FCPATH . 'assets');
+	}
+}

From b2a16e9d402ab80aaa73150ffff2ee47d5a3e8da Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Mon, 24 May 2021 01:10:02 +0000
Subject: [PATCH 0163/2325] Add tests

---
 system/Publisher/Publisher.php                |  18 +-
 tests/system/Publisher/PublisherInputTest.php | 472 ++++++++++++++++++
 .../system/Publisher/PublisherOutputTest.php  | 202 ++++++++
 .../system/Publisher/PublisherSupportTest.php | 199 ++++++++
 4 files changed, 887 insertions(+), 4 deletions(-)
 create mode 100644 tests/system/Publisher/PublisherInputTest.php
 create mode 100644 tests/system/Publisher/PublisherOutputTest.php
 create mode 100644 tests/system/Publisher/PublisherSupportTest.php

diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php
index 8f599d3292b6..d7f797e00312 100644
--- a/system/Publisher/Publisher.php
+++ b/system/Publisher/Publisher.php
@@ -108,8 +108,8 @@ public static function discover($directory = 'Publishers'): array
 			return [];
 		}
 
-		// Loop over each file checking to see if it is a Primer
-		foreach ($files as $file)
+		// Loop over each file checking to see if it is a Publisher
+		foreach (array_unique($files) as $file)
 		{
 			$className = $locator->findQualifiedNameFromPath($file);
 
@@ -228,8 +228,10 @@ private static function wipeDirectory(string $directory)
 			$attempts = 10;
 			while ((bool) $attempts && ! delete_files($directory, true, false, true))
 			{
+				// @codeCoverageIgnoreStart
 				$attempts--;
 				usleep(100000); // .1s
+				// @codeCoverageIgnoreEnd
 			}
 
 			@rmdir($directory);
@@ -270,6 +272,13 @@ private static function safeCopyFile(string $from, string $to, bool $replace): v
 			unlink($to);
 		}
 
+		// Make sure the directory exists
+		$directory = pathinfo($to, PATHINFO_DIRNAME);
+		if (! is_dir($directory))
+		{
+			mkdir($directory, 0775, true);
+		}
+
 		// Allow copy() to throw errors
 		copy($from, $to);
 	}
@@ -311,10 +320,11 @@ public function __destruct()
 	 * This method should be reimplemented by
 	 * child classes intended for discovery.
 	 *
-	 * @return void
+	 * @return bool
 	 */
 	public function publish()
 	{
+		return $this->addPath('/')->merge(true);
 	}
 
 	//--------------------------------------------------------------------
@@ -686,7 +696,7 @@ public function merge(bool $replace = true): bool
 		$this->errors = [];
 
 		// Get the file from source for special handling
-		$sourced = self::matchFiles($this->getFiles(), $this->source);
+		$sourced = self::filterFiles($this->getFiles(), $this->source);
 
 		// Handle everything else with a flat copy
 		$this->files = array_diff($this->files, $sourced);
diff --git a/tests/system/Publisher/PublisherInputTest.php b/tests/system/Publisher/PublisherInputTest.php
new file mode 100644
index 000000000000..553a92b14c53
--- /dev/null
+++ b/tests/system/Publisher/PublisherInputTest.php
@@ -0,0 +1,472 @@
+<?php namespace CodeIgniter\Pager;
+
+use CodeIgniter\Publisher\Exceptions\PublisherException;
+use CodeIgniter\Publisher\Publisher;
+use CodeIgniter\Test\CIUnitTestCase;
+use Tests\Support\Publishers\TestPublisher;
+
+class PublisherInputTest extends CIUnitTestCase
+{
+	/**
+	 * A known, valid file
+	 *
+	 * @var string
+	 */
+	private $file = SUPPORTPATH . 'Files/baker/banana.php';
+
+	/**
+	 * A known, valid directory
+	 *
+	 * @var string
+	 */
+	private $directory = SUPPORTPATH . 'Files/able/';
+
+	/**
+	 * Initialize the helper, since some
+	 * tests call static methods before
+	 * the constructor would load it.
+	 */
+	public static function setUpBeforeClass(): void
+	{
+		parent::setUpBeforeClass();
+
+		helper(['filesystem']);
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testAddFile()
+	{
+		$publisher = new Publisher();
+		$this->assertSame([], $this->getPrivateProperty($publisher, 'files'));
+
+		$publisher->addFile($this->file);
+		$this->assertSame([$this->file], $this->getPrivateProperty($publisher, 'files'));
+	}
+
+	public function testAddFileMissing()
+	{
+		$publisher = new Publisher();
+
+		$this->expectException(PublisherException::class);
+		$this->expectExceptionMessage(lang('Publisher.expectedFile', ['addFile']));
+
+		$publisher->addFile('TheHillsAreAlive.bmp');
+	}
+
+	public function testAddFileDirectory()
+	{
+		$publisher = new Publisher();
+
+		$this->expectException(PublisherException::class);
+		$this->expectExceptionMessage(lang('Publisher.expectedFile', ['addFile']));
+
+		$publisher->addFile($this->directory);
+	}
+
+	public function testAddFiles()
+	{
+		$publisher = new Publisher();
+		$files     = [
+			$this->file,
+			$this->file,
+		];
+
+		$publisher->addFiles($files);
+		$this->assertSame($files, $this->getPrivateProperty($publisher, 'files'));
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testGetFiles()
+	{
+		$publisher = new Publisher();
+		$publisher->addFile($this->file);
+
+		$this->assertSame([$this->file], $publisher->getFiles());
+	}
+
+	public function testGetFilesSorts()
+	{
+		$publisher = new Publisher();
+		$files     = [
+			$this->file,
+			$this->directory . 'apple.php',
+		];
+
+		$publisher->addFiles($files);
+
+		$this->assertSame(array_reverse($files), $publisher->getFiles());
+	}
+
+	public function testGetFilesUniques()
+	{
+		$publisher = new Publisher();
+		$files     = [
+			$this->file,
+			$this->file,
+		];
+
+		$publisher->addFiles($files);
+		$this->assertSame([$this->file], $publisher->getFiles());
+	}
+
+	public function testSetFiles()
+	{
+		$publisher = new Publisher();
+
+		$publisher->setFiles([$this->file]);
+		$this->assertSame([$this->file], $publisher->getFiles());
+	}
+
+	public function testSetFilesInvalid()
+	{
+		$publisher = new Publisher();
+
+		$this->expectException(PublisherException::class);
+		$this->expectExceptionMessage(lang('Publisher.expectedFile', ['addFile']));
+
+		$publisher->setFiles(['flerb']);
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testRemoveFile()
+	{
+		$publisher = new Publisher();
+		$files     = [
+			$this->file,
+			$this->directory . 'apple.php',
+		];
+
+		$publisher->addFiles($files);
+
+		$publisher->removeFile($this->file);
+
+		$this->assertSame([$this->directory . 'apple.php'], $publisher->getFiles());
+	}
+
+	public function testRemoveFiles()
+	{
+		$publisher = new Publisher();
+		$files     = [
+			$this->file,
+			$this->directory . 'apple.php',
+		];
+
+		$publisher->addFiles($files);
+
+		$publisher->removeFiles($files);
+
+		$this->assertSame([], $publisher->getFiles());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testAddDirectoryInvalid()
+	{
+		$publisher = new Publisher();
+
+		$this->expectException(PublisherException::class);
+		$this->expectExceptionMessage(lang('Publisher.expectedDirectory', ['addDirectory']));
+
+		$publisher->addDirectory($this->file);
+	}
+
+	public function testAddDirectory()
+	{
+		$publisher = new Publisher();
+		$expected  = [
+			$this->directory . 'apple.php',
+			$this->directory . 'fig_3.php',
+			$this->directory . 'prune_ripe.php',
+		];
+
+		$publisher->addDirectory($this->directory);
+
+		$this->assertSame($expected, $publisher->getFiles());
+	}
+
+	public function testAddDirectoryRecursive()
+	{
+		$publisher = new Publisher();
+		$expected  = [
+			$this->directory . 'apple.php',
+			$this->directory . 'fig_3.php',
+			$this->directory . 'prune_ripe.php',
+			SUPPORTPATH . 'Files/baker/banana.php',
+		];
+
+		$publisher->addDirectory(SUPPORTPATH . 'Files', true);
+
+		$this->assertSame($expected, $publisher->getFiles());
+	}
+
+	public function testAddDirectories()
+	{
+		$publisher = new Publisher();
+		$expected  = [
+			$this->directory . 'apple.php',
+			$this->directory . 'fig_3.php',
+			$this->directory . 'prune_ripe.php',
+			SUPPORTPATH . 'Files/baker/banana.php',
+		];
+
+		$publisher->addDirectories([
+			$this->directory,
+			SUPPORTPATH . 'Files/baker',
+		]);
+
+		$this->assertSame($expected, $publisher->getFiles());
+	}
+
+	public function testAddDirectoriesRecursive()
+	{
+		$publisher = new Publisher();
+		$expected  = [
+			$this->directory . 'apple.php',
+			$this->directory . 'fig_3.php',
+			$this->directory . 'prune_ripe.php',
+			SUPPORTPATH . 'Files/baker/banana.php',
+			SUPPORTPATH . 'Log/Handlers/TestHandler.php',
+		];
+
+		$publisher->addDirectories([
+			SUPPORTPATH . 'Files',
+			SUPPORTPATH . 'Log',
+		], true);
+
+		$this->assertSame($expected, $publisher->getFiles());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testAddPathFile()
+	{
+		$publisher = new Publisher(SUPPORTPATH . 'Files');
+
+		$publisher->addPath('baker/banana.php');
+
+		$this->assertSame([$this->file], $publisher->getFiles());
+	}
+
+	public function testAddPathFileRecursiveDoesNothing()
+	{
+		$publisher = new Publisher(SUPPORTPATH . 'Files');
+
+		$publisher->addPath('baker/banana.php', true);
+
+		$this->assertSame([$this->file], $publisher->getFiles());
+	}
+
+	public function testAddPathDirectory()
+	{
+		$publisher = new Publisher(SUPPORTPATH . 'Files');
+
+		$expected = [
+			$this->directory . 'apple.php',
+			$this->directory . 'fig_3.php',
+			$this->directory . 'prune_ripe.php',
+		];
+
+		$publisher->addPath('able');
+
+		$this->assertSame($expected, $publisher->getFiles());
+	}
+
+	public function testAddPathDirectoryRecursive()
+	{
+		$publisher = new Publisher(SUPPORTPATH);
+
+		$expected = [
+			$this->directory . 'apple.php',
+			$this->directory . 'fig_3.php',
+			$this->directory . 'prune_ripe.php',
+			SUPPORTPATH . 'Files/baker/banana.php',
+		];
+
+		$publisher->addPath('Files');
+
+		$this->assertSame($expected, $publisher->getFiles());
+	}
+
+	public function testAddPaths()
+	{
+		$publisher = new Publisher(SUPPORTPATH . 'Files');
+
+		$expected = [
+			$this->directory . 'apple.php',
+			$this->directory . 'fig_3.php',
+			$this->directory . 'prune_ripe.php',
+			SUPPORTPATH . 'Files/baker/banana.php',
+		];
+
+		$publisher->addPaths([
+			'able',
+			'baker/banana.php',
+		]);
+
+		$this->assertSame($expected, $publisher->getFiles());
+	}
+
+	public function testAddPathsRecursive()
+	{
+		$publisher = new Publisher(SUPPORTPATH);
+
+		$expected = [
+			$this->directory . 'apple.php',
+			$this->directory . 'fig_3.php',
+			$this->directory . 'prune_ripe.php',
+			SUPPORTPATH . 'Files/baker/banana.php',
+			SUPPORTPATH . 'Log/Handlers/TestHandler.php',
+		];
+
+		$publisher->addPaths([
+			'Files',
+			'Log',
+		], true);
+
+		$this->assertSame($expected, $publisher->getFiles());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testAddUri()
+	{
+		$publisher = new Publisher();
+		$publisher->addUri('https://raw.githubusercontent.com/codeigniter4/CodeIgniter4/develop/composer.json');
+
+		$scratch = $this->getPrivateProperty($publisher, 'scratch');
+
+		$this->assertSame([$scratch . 'composer.json'], $publisher->getFiles());
+	}
+
+	public function testAddUris()
+	{
+		$publisher = new Publisher();
+		$publisher->addUris([
+			'https://raw.githubusercontent.com/codeigniter4/CodeIgniter4/develop/LICENSE',
+			'https://raw.githubusercontent.com/codeigniter4/CodeIgniter4/develop/composer.json',
+		]);
+
+		$scratch = $this->getPrivateProperty($publisher, 'scratch');
+
+		$this->assertSame([$scratch . 'LICENSE', $scratch . 'composer.json'], $publisher->getFiles());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testRemovePatternEmpty()
+	{
+		$publisher = new Publisher();
+		$publisher->addDirectory(SUPPORTPATH . 'Files', true);
+
+		$files = $publisher->getFiles();
+
+		$publisher->removePattern('');
+
+		$this->assertSame($files, $publisher->getFiles());
+	}
+
+	public function testRemovePatternRegex()
+	{
+		$publisher = new Publisher();
+		$publisher->addDirectory(SUPPORTPATH . 'Files', true);
+
+		$expected = [
+			$this->directory . 'apple.php',
+			SUPPORTPATH . 'Files/baker/banana.php',
+		];
+
+		$publisher->removePattern('#[a-z]+_.*#');
+
+		$this->assertSame($expected, $publisher->getFiles());
+	}
+
+	public function testRemovePatternPseudo()
+	{
+		$publisher = new Publisher();
+		$publisher->addDirectory(SUPPORTPATH . 'Files', true);
+
+		$expected = [
+			$this->directory . 'apple.php',
+			SUPPORTPATH . 'Files/baker/banana.php',
+		];
+
+		$publisher->removePattern('*_*.php');
+
+		$this->assertSame($expected, $publisher->getFiles());
+	}
+
+	public function testRemovePatternScope()
+	{
+		$publisher = new Publisher();
+		$publisher->addDirectory(SUPPORTPATH . 'Files', true);
+
+		$expected = [
+			SUPPORTPATH . 'Files/baker/banana.php',
+		];
+
+		$publisher->removePattern('*.php', $this->directory);
+
+		$this->assertSame($expected, $publisher->getFiles());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testRetainPatternEmpty()
+	{
+		$publisher = new Publisher();
+		$publisher->addDirectory(SUPPORTPATH . 'Files', true);
+
+		$files = $publisher->getFiles();
+
+		$publisher->retainPattern('');
+
+		$this->assertSame($files, $publisher->getFiles());
+	}
+
+	public function testRetainPatternRegex()
+	{
+		$publisher = new Publisher();
+		$publisher->addDirectory(SUPPORTPATH . 'Files', true);
+
+		$expected = [
+			$this->directory . 'fig_3.php',
+			$this->directory . 'prune_ripe.php',
+		];
+
+		$publisher->retainPattern('#[a-z]+_.*#');
+
+		$this->assertSame($expected, $publisher->getFiles());
+	}
+
+	public function testRetainPatternPseudo()
+	{
+		$publisher = new Publisher();
+		$publisher->addDirectory(SUPPORTPATH . 'Files', true);
+
+		$expected = [
+			$this->directory . 'fig_3.php',
+		];
+
+		$publisher->retainPattern('*_?.php');
+
+		$this->assertSame($expected, $publisher->getFiles());
+	}
+
+	public function testRetainPatternScope()
+	{
+		$publisher = new Publisher();
+		$publisher->addDirectory(SUPPORTPATH . 'Files', true);
+
+		$expected = [
+			$this->directory . 'fig_3.php',
+			SUPPORTPATH . 'Files/baker/banana.php',
+		];
+
+		$publisher->retainPattern('*_?.php', $this->directory);
+
+		$this->assertSame($expected, $publisher->getFiles());
+	}
+}
diff --git a/tests/system/Publisher/PublisherOutputTest.php b/tests/system/Publisher/PublisherOutputTest.php
new file mode 100644
index 000000000000..5183d188d6b9
--- /dev/null
+++ b/tests/system/Publisher/PublisherOutputTest.php
@@ -0,0 +1,202 @@
+<?php namespace CodeIgniter\Pager;
+
+use CodeIgniter\Publisher\Exceptions\PublisherException;
+use CodeIgniter\Publisher\Publisher;
+use CodeIgniter\Test\CIUnitTestCase;
+use Tests\Support\Publishers\TestPublisher;
+use org\bovigo\vfs\vfsStream;
+use org\bovigo\vfs\vfsStreamDirectory;
+
+class PublisherOutputTest extends CIUnitTestCase
+{
+	/**
+	 * Files to seed to VFS
+	 *
+	 * @var array
+	 */
+	private $structure;
+
+	/**
+	 * Virtual destination
+	 *
+	 * @var vfsStreamDirectory
+	 */
+	private $root;
+
+	/**
+	 * A known, valid file
+	 *
+	 * @var string
+	 */
+	private $file = SUPPORTPATH . 'Files/baker/banana.php';
+
+	/**
+	 * A known, valid directory
+	 *
+	 * @var string
+	 */
+	private $directory = SUPPORTPATH . 'Files/able/';
+
+	/**
+	 * Initialize the helper, since some
+	 * tests call static methods before
+	 * the constructor would load it.
+	 */
+	public static function setUpBeforeClass(): void
+	{
+		parent::setUpBeforeClass();
+
+		helper(['filesystem']);
+	}
+
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		$this->structure = [
+			'able'          => [
+				'apple.php' => 'Once upon a midnight dreary',
+				'bazam'     => 'While I pondered weak and weary',
+			],
+			'boo'           => [
+				'far' => 'Upon a tome of long-forgotten lore',
+				'faz' => 'There came a tapping up on the door',
+			],
+			'AnEmptyFolder' => [],
+			'simpleFile'    => 'A tap-tap-tapping upon my door',
+			'.hidden'       => 'There is no spoon',
+		];
+
+		$this->root = vfsStream::setup('root', null, $this->structure);
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testCopy()
+	{
+		$publisher = new Publisher($this->directory, $this->root->url());
+		$publisher->addFile($this->file);
+
+		$this->assertFileDoesNotExist($this->root->url() . '/banana.php');
+
+		$result = $publisher->copy(false);
+
+		$this->assertTrue($result);
+		$this->assertFileExists($this->root->url() . '/banana.php');
+	}
+
+	public function testCopyReplace()
+	{
+		$file      = $this->directory . 'apple.php';
+		$publisher = new Publisher($this->directory, $this->root->url() . '/able');
+		$publisher->addFile($file);
+
+		$this->assertFileExists($this->root->url() . '/able/apple.php');
+		$this->assertFalse(same_file($file, $this->root->url() . '/able/apple.php'));
+
+		$result = $publisher->copy(true);
+
+		$this->assertTrue($result);
+		$this->assertTrue(same_file($file, $this->root->url() . '/able/apple.php'));
+	}
+
+	public function testCopyIgnoresSame()
+	{
+		$publisher = new Publisher($this->directory, $this->root->url());
+		$publisher->addFile($this->file);
+
+		copy($this->file, $this->root->url() . '/banana.php');
+
+		$result = $publisher->copy(false);
+		$this->assertTrue($result);
+
+		$result = $publisher->copy(true);
+		$this->assertTrue($result);
+	}
+
+	public function testCopyIgnoresCollision()
+	{
+		$publisher = new Publisher($this->directory, $this->root->url());
+
+		mkdir($this->root->url() . '/banana.php');
+
+		$result = $publisher->addFile($this->file)->copy(false);
+		$errors = $publisher->getErrors();
+
+		$this->assertTrue($result);
+		$this->assertSame([], $errors);
+	}
+
+	public function testCopyCollides()
+	{
+		$publisher = new Publisher($this->directory, $this->root->url());
+		$expected  = lang('Publisher.collision', ['dir', $this->file, $this->root->url() . '/banana.php']);
+
+		mkdir($this->root->url() . '/banana.php');
+
+		$result = $publisher->addFile($this->file)->copy(true);
+		$errors = $publisher->getErrors();
+
+		$this->assertFalse($result);
+		$this->assertCount(1, $errors);
+		$this->assertSame([$this->file], array_keys($errors));
+		$this->assertSame($expected, $errors[$this->file]->getMessage());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testMerge()
+	{
+		$publisher = new Publisher(SUPPORTPATH . 'Files', $this->root->url());
+
+		$this->assertFileDoesNotExist($this->root->url() . '/able/fig_3.php');
+		$this->assertDirectoryDoesNotExist($this->root->url() . '/baker');
+
+		$result = $publisher->addPath('/')->merge(false);
+
+		$this->assertTrue($result);
+		$this->assertFileExists($this->root->url() . '/able/fig_3.php');
+		$this->assertDirectoryExists($this->root->url() . '/baker');
+	}
+
+	public function testMergeReplace()
+	{
+		$this->assertFalse(same_file($this->directory . 'apple.php', $this->root->url() . '/able/apple.php'));
+		$publisher = new Publisher(SUPPORTPATH . 'Files', $this->root->url());
+
+		$result = $publisher->addPath('/')->merge(true);
+
+		$this->assertTrue($result);
+		$this->assertTrue(same_file($this->directory . 'apple.php', $this->root->url() . '/able/apple.php'));
+	}
+
+	public function testMergeCollides()
+	{
+		$publisher = new Publisher(SUPPORTPATH . 'Files', $this->root->url());
+		$expected  = lang('Publisher.collision', ['dir', $this->directory . 'fig_3.php', $this->root->url() . '/able/fig_3.php']);
+
+		mkdir($this->root->url() . '/able/fig_3.php');
+
+		$result = $publisher->addPath('/')->merge(true);
+		$errors = $publisher->getErrors();
+
+		$this->assertFalse($result);
+		$this->assertCount(1, $errors);
+		$this->assertSame([$this->directory . 'fig_3.php'], array_keys($errors));
+		$this->assertSame($expected, $errors[$this->directory . 'fig_3.php']->getMessage());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testPublish()
+	{
+		$publisher = new Publisher(SUPPORTPATH . 'Files', $this->root->url());
+
+		$result = $publisher->publish();
+
+		$this->assertTrue($result);
+		$this->assertFileExists($this->root->url() . '/able/fig_3.php');
+		$this->assertDirectoryExists($this->root->url() . '/baker');
+		$this->assertTrue(same_file($this->directory . 'apple.php', $this->root->url() . '/able/apple.php'));
+	}
+}
diff --git a/tests/system/Publisher/PublisherSupportTest.php b/tests/system/Publisher/PublisherSupportTest.php
new file mode 100644
index 000000000000..5592c02fc4ca
--- /dev/null
+++ b/tests/system/Publisher/PublisherSupportTest.php
@@ -0,0 +1,199 @@
+<?php namespace CodeIgniter\Pager;
+
+use CodeIgniter\Publisher\Exceptions\PublisherException;
+use CodeIgniter\Publisher\Publisher;
+use CodeIgniter\Test\CIUnitTestCase;
+use Tests\Support\Publishers\TestPublisher;
+
+class PublisherSupportTest extends CIUnitTestCase
+{
+	/**
+	 * A known, valid file
+	 *
+	 * @var string
+	 */
+	private $file = SUPPORTPATH . 'Files/baker/banana.php';
+
+	/**
+	 * A known, valid directory
+	 *
+	 * @var string
+	 */
+	private $directory = SUPPORTPATH . 'Files/able/';
+
+	/**
+	 * Initialize the helper, since some
+	 * tests call static methods before
+	 * the constructor would load it.
+	 */
+	public static function setUpBeforeClass(): void
+	{
+		parent::setUpBeforeClass();
+
+		helper(['filesystem']);
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testDiscoverDefault()
+	{
+		$result = Publisher::discover();
+
+		$this->assertCount(1, $result);
+		$this->assertInstanceOf(TestPublisher::class, $result[0]);
+	}
+
+	public function testDiscoverNothing()
+	{
+		$result = Publisher::discover('Nothing');
+
+		$this->assertSame([], $result);
+	}
+
+	public function testDiscoverStores()
+	{
+		$publisher = Publisher::discover()[0];
+		$publisher->addFile($this->file);
+
+		$result = Publisher::discover();
+		$this->assertSame($publisher, $result[0]);
+		$this->assertSame([$this->file], $result[0]->getFiles());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testResolveDirectoryDirectory()
+	{
+		$method = $this->getPrivateMethodInvoker(Publisher::class, 'resolveDirectory');
+
+		$this->assertSame($this->directory, $method($this->directory));
+	}
+
+	public function testResolveDirectoryFile()
+	{
+		$method = $this->getPrivateMethodInvoker(Publisher::class, 'resolveDirectory');
+
+		$this->expectException(PublisherException::class);
+		$this->expectExceptionMessage(lang('Publisher.expectedDirectory', ['invokeArgs']));
+
+		$method($this->file);
+	}
+
+	public function testResolveDirectorySymlink()
+	{
+		// Create a symlink to test
+		$link = sys_get_temp_dir() . DIRECTORY_SEPARATOR . bin2hex(random_bytes(4));
+		symlink($this->directory, $link);
+
+		$method = $this->getPrivateMethodInvoker(Publisher::class, 'resolveDirectory');
+
+		$this->assertSame($this->directory, $method($link));
+
+		unlink($link);
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testResolveFileFile()
+	{
+		$method = $this->getPrivateMethodInvoker(Publisher::class, 'resolveFile');
+
+		$this->assertSame($this->file, $method($this->file));
+	}
+
+	public function testResolveFileSymlink()
+	{
+		// Create a symlink to test
+		$link = sys_get_temp_dir() . DIRECTORY_SEPARATOR . bin2hex(random_bytes(4));
+		symlink($this->file, $link);
+
+		$method = $this->getPrivateMethodInvoker(Publisher::class, 'resolveFile');
+
+		$this->assertSame($this->file, $method($link));
+
+		unlink($link);
+	}
+
+	public function testResolveFileDirectory()
+	{
+		$method = $this->getPrivateMethodInvoker(Publisher::class, 'resolveFile');
+
+		$this->expectException(PublisherException::class);
+		$this->expectExceptionMessage(lang('Publisher.expectedFile', ['invokeArgs']));
+
+		$method($this->directory);
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testGetScratch()
+	{
+		$publisher = new Publisher();
+		$this->assertNull($this->getPrivateProperty($publisher, 'scratch'));
+
+		$method  = $this->getPrivateMethodInvoker($publisher, 'getScratch');
+		$scratch = $method();
+
+		$this->assertIsString($scratch);
+		$this->assertDirectoryExists($scratch);
+		$this->assertDirectoryIsWritable($scratch);
+		$this->assertNotNull($this->getPrivateProperty($publisher, 'scratch'));
+
+		// Directory and contents should be removed on __destruct()
+		$file = $scratch . 'obvious_statement.txt';
+		file_put_contents($file, 'Bananas are a most peculiar fruit');
+
+		$publisher->__destruct();
+
+		$this->assertFileDoesNotExist($file);
+		$this->assertDirectoryDoesNotExist($scratch);
+	}
+
+	public function testGetErrors()
+	{
+		$publisher = new Publisher();
+		$this->assertSame([], $publisher->getErrors());
+
+		$expected = [
+			$this->file => PublisherException::forCollision($this->file, $this->file),
+		];
+
+		$this->setPrivateProperty($publisher, 'errors', $expected);
+
+		$this->assertSame($expected, $publisher->getErrors());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testWipeDirectory()
+	{
+		$directory = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . bin2hex(random_bytes(6));
+		mkdir($directory, 0700);
+		$this->assertDirectoryExists($directory);
+
+		$method = $this->getPrivateMethodInvoker(Publisher::class, 'wipeDirectory');
+		$method($directory);
+
+		$this->assertDirectoryDoesNotExist($directory);
+	}
+
+	public function testWipeIgnoresFiles()
+	{
+		$method = $this->getPrivateMethodInvoker(Publisher::class, 'wipeDirectory');
+		$method($this->file);
+
+		$this->assertFileExists($this->file);
+	}
+
+	public function testWipe()
+	{
+		$directory = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . bin2hex(random_bytes(6));
+		mkdir($directory, 0700);
+		$this->assertDirectoryExists($directory);
+
+		$publisher = new Publisher($this->directory, $directory);
+		$publisher->wipe();
+
+		$this->assertDirectoryDoesNotExist($directory);
+	}
+}

From 291594c041d334722702b224e98405974c66baf2 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Mon, 24 May 2021 15:51:16 -0400
Subject: [PATCH 0164/2325] Apply suggestions from code review

Co-authored-by: Mostafa Khudair <59371810+mostafakhudair@users.noreply.github.com>
---
 system/Language/en/Publisher.php              |   4 +-
 .../Exceptions/PublisherException.php         |  10 +-
 system/Publisher/Publisher.php                | 125 ++++++++----------
 3 files changed, 60 insertions(+), 79 deletions(-)

diff --git a/system/Language/en/Publisher.php b/system/Language/en/Publisher.php
index ada599074efe..cb5ce81f10a4 100644
--- a/system/Language/en/Publisher.php
+++ b/system/Language/en/Publisher.php
@@ -11,7 +11,7 @@
 
 // Publisher language settings
 return [
-	'expectedFile'      => 'Publisher::{0} expects a valid file.',
-	'expectedDirectory' => 'Publisher::{0} expects a valid directory.',
 	'collision'         => 'Publisher encountered an unexpected {0} while copying {1} to {2}.',
+	'expectedDirectory' => 'Publisher::{0} expects a valid directory.',
+	'expectedFile'      => 'Publisher::{0} expects a valid file.',
 ];
diff --git a/system/Publisher/Exceptions/PublisherException.php b/system/Publisher/Exceptions/PublisherException.php
index 23a4b54d3e57..81f9bb4b7174 100644
--- a/system/Publisher/Exceptions/PublisherException.php
+++ b/system/Publisher/Exceptions/PublisherException.php
@@ -15,6 +15,11 @@
 
 class PublisherException extends FrameworkException
 {
+	public static function forCollision(string $from, string $to)
+	{
+		return new static(lang('Publisher.collision', [filetype($to), $from, $to]));
+	}
+
 	public static function forExpectedDirectory(string $caller)
 	{
 		return new static(lang('Publisher.expectedDirectory', [$caller]));
@@ -24,9 +29,4 @@ public static function forExpectedFile(string $caller)
 	{
 		return new static(lang('Publisher.expectedFile', [$caller]));
 	}
-
-	public static function forCollision(string $from, string $to)
-	{
-		return new static(lang('Publisher.collision', [filetype($to), $from, $to]));
-	}
 }
diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php
index d7f797e00312..b2e9de8d577b 100644
--- a/system/Publisher/Publisher.php
+++ b/system/Publisher/Publisher.php
@@ -20,24 +20,18 @@
 /**
  * Publisher Class
  *
- * Publishers read in file paths from a variety
- * of sources and copy the files out to different
- * destinations.
- * This class acts both as a base for individual
- * publication directives as well as the mode of
- * discovery for said instances.
- * In this class a "file" is a full path to a
- * verified file while a "path" is relative to
- * to its source or destination and may indicate
- * either a file or directory fo unconfirmed
- * existence.
- * Class failures throw a PublisherException,
- * but some underlying methods may percolate
- * different exceptions, like FileException,
- * FileNotFoundException, InvalidArgumentException.
- * Write operations will catch all errors in the
- * file-specific $errors property to minimize
- * impact of partial batch operations.
+ * Publishers read in file paths from a variety of sources and copy
+ * the files out to different destinations. This class acts both as
+ * a base for individual publication directives as well as the mode
+ * of discovery for said instances. In this class a "file" is a full
+ * path to a verified file while a "path" is relative to its source
+ * or destination and may indicate either a file or directory of
+ * unconfirmed existence.
+ * class failures throw the PublisherException, but some underlying
+ * methods may percolate different exceptions, like FileException,
+ * FileNotFoundException or InvalidArgumentException.
+ * Write operations will catch all errors in the file-specific
+ * $errors property to minimize impact of partial batch operations.
  */
 class Publisher
 {
@@ -90,14 +84,17 @@ class Publisher
 	 * Discovers and returns all Publishers
 	 * in the specified namespace directory.
 	 *
+	 * @param string $directory
+	 *
 	 * @return self[]
 	 */
-	public static function discover($directory = 'Publishers'): array
+	public static function discover(string $directory = 'Publishers'): array
 	{
 		if (isset(self::$discovered[$directory]))
 		{
 			return self::$discovered[$directory];
 		}
+	
 		self::$discovered[$directory] = [];
 
 		/** @var FileLocator $locator */
@@ -145,8 +142,7 @@ private static function resolveDirectory(string $directory): string
 	}
 
 	/**
-	 * Resolves a full path and verifies
-	 * it is an actual file.
+	 * Resolves a full path and verifies it is an actual file.
 	 *
 	 * @param string $file
 	 *
@@ -184,11 +180,10 @@ private static function filterFiles(array $files, string $directory): array
 	}
 
 	/**
-	 * Returns any files whose basename matches
-	 * the given pattern.
+	 * Returns any files whose `basename` matches the given pattern.
 	 *
-	 * @param string[] $files
-	 * @param string $pattern Regex or pseudo-regex string
+	 * @param array<string> $files
+	 * @param string        $pattern Regex or pseudo-regex string
 	 *
 	 * @return string[]
 	 */
@@ -239,13 +234,12 @@ private static function wipeDirectory(string $directory)
 	}
 
 	/**
-	 * Copies a file with directory creation
-	 * and identical file awareness.
+	 * Copies a file with directory creation and identical file awareness.
 	 * Intentionally allows errors.
 	 *
-	 * @param string $from
-	 * @param string $to
-	 * @param bool $replace
+	 * @param string  $from
+	 * @param string  $to
+	 * @param boolean $replace
 	 *
 	 * @return void
 	 *
@@ -301,8 +295,7 @@ public function __construct(string $source = null, string $destination = null)
 	}
 
 	/**
-	 * Cleans up any temporary files
-	 * in the scratch space.
+	 * Cleans up any temporary files in the scratch space.
 	 */
 	public function __destruct()
 	{
@@ -315,14 +308,13 @@ public function __destruct()
 	}
 
 	/**
-	 * Reads in file sources and copies out
-	 * the files to their destinations.
-	 * This method should be reimplemented by
-	 * child classes intended for discovery.
+	 * Reads files in the sources and copies them out to their destinations.
+	 * This method should be reimplemented by child classes intended for
+	 * discovery.
 	 *
-	 * @return bool
+	 * @return boolean
 	 */
-	public function publish()
+	public function publish(): bool
 	{
 		return $this->addPath('/')->merge(true);
 	}
@@ -347,8 +339,7 @@ protected function getScratch(): string
 	}
 
 	/**
-	 * Returns any errors from the last
-	 * write operation.
+	 * Returns errors from the last write operation if any.
 	 *
 	 * @return array<string,Throwable>
 	 */
@@ -358,8 +349,7 @@ public function getErrors(): array
 	}
 
 	/**
-	 * Optimizes and returns the
-	 * current file list.
+	 * Optimizes and returns the current file list.
 	 *
 	 * @return string[]
 	 */
@@ -372,11 +362,10 @@ public function getFiles(): array
 	}
 
 	/**
-	 * Sets the file list directly.
-	 * Files are still subject to verification.
+	 * Sets the file list directly, files are still subject to verification.
 	 * This works as a "reset" method with [].
 	 *
-	 * @param string[] $files  A new file list to use
+	 * @param string[] $files The new file list to use
 	 *
 	 * @return $this
 	 */
@@ -407,8 +396,7 @@ public function addFiles(array $files)
 	}
 
 	/**
-	 * Verifies and adds a single file
-	 * to the file list.
+	 * Verifies and adds a single file to the file list.
 	 *
 	 * @param string $file
 	 *
@@ -469,11 +457,10 @@ public function addDirectories(array $directories, bool $recursive = false)
 	}
 
 	/**
-	 * Verifies and adds all files
-	 * from a directory.
+	 * Verifies and adds all files from a directory.
 	 *
-	 * @param string $directory
-	 * @param bool $recursive
+	 * @param string  $directory
+	 * @param boolean $recursive
 	 *
 	 * @return $this
 	 */
@@ -520,8 +507,8 @@ public function addPaths(array $paths, bool $recursive = true)
 	/**
 	 * Adds a single path to the file list.
 	 *
-	 * @param string $path
-	 * @param bool $recursive
+	 * @param string  $path
+	 * @param boolean $recursive
 	 *
 	 * @return $this
 	 */
@@ -563,8 +550,7 @@ public function addUris(array $uris)
 	}
 
 	/**
-	 * Downloads a file from the URI
-	 * and adds it to the file list.
+	 * Downloads a file from the URI, and adds it to the file list.
 	 *
 	 * @param string $uri Because HTTP\URI is stringable it will still be accepted
 	 *
@@ -576,8 +562,7 @@ public function addUri(string $uri)
 		$file = $this->getScratch() . basename((new URI($uri))->getPath());
 
 		// Get the content and write it to the scratch space
-		$response = service('curlrequest')->get($uri);
-		write_file($file, $response->getBody());
+		write_file($file, service('curlrequest')->get($uri)->getBody());
 
 		return $this->addFile($file);
 	}
@@ -585,11 +570,11 @@ public function addUri(string $uri)
 	//--------------------------------------------------------------------
 
 	/**
-	 * Removes any files from the list that match
-	 * the supplied pattern (within the optional scope).
+	 * Removes any files from the list that match the supplied pattern
+	 * (within the optional scope).
 	 *
-	 * @param string $pattern    Regex or pseudo-regex string
-	 * @param string|null $scope A directory to limit the scope
+	 * @param string      $pattern Regex or pseudo-regex string
+	 * @param string|null $scope The directory to limit the scope
 	 *
 	 * @return $this
 	 */
@@ -601,9 +586,7 @@ public function removePattern(string $pattern, string $scope = null)
 		}
 
 		// Start with all files or those in scope
-		$files = is_null($scope)
-			? $this->files
-			: self::filterFiles($this->files, $scope);
+		$files = is_null($scope) ? $this->files : self::filterFiles($this->files, $scope);
 
 		// Remove any files that match the pattern
 		return $this->removeFiles(self::matchFiles($files, $pattern));
@@ -611,9 +594,9 @@ public function removePattern(string $pattern, string $scope = null)
 
 	/**
 	 * Keeps only the files from the list that match
-	 * the supplied pattern (within the optional scope).
+	 * (within the optional scope).
 	 *
-	 * @param string $pattern    Regex or pseudo-regex string
+	 * @param string      $pattern Regex or pseudo-regex string
 	 * @param string|null $scope A directory to limit the scope
 	 *
 	 * @return $this
@@ -654,10 +637,9 @@ public function wipe()
 	//--------------------------------------------------------------------
 
 	/**
-	 * Copies all files into the destination.
-	 * Does not create directory structure.
+	 * Copies all files into the destination, does not create directory structure.
 	 *
-	 * @param bool $replace Whether to overwrite existing files.
+	 * @param boolean $replace Whether to overwrite existing files.
 	 *
 	 * @return boolean Whether all files were copied successfully
 	 */
@@ -684,10 +666,9 @@ public function copy(bool $replace = true): bool
 
 	/**
 	 * Merges all files into the destination.
-	 * Creates a mirrored directory structure
-	 * only for files from source.
+	 * Creates a mirrored directory structure only for files from source.
 	 *
-	 * @param bool $replace Whether to overwrite existing files.
+	 * @param boolean $replace Whether to overwrite existing files.
 	 *
 	 * @return boolean Whether all files were copied successfully
 	 */

From c18a08fae8102dbbae8ebed7250218d31b86a074 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Tue, 25 May 2021 16:13:09 +0000
Subject: [PATCH 0165/2325] Apply additional suggestions

---
 system/Publisher/Publisher.php              | 48 ++++++++-------------
 tests/_support/Publishers/TestPublisher.php |  2 +-
 2 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php
index b2e9de8d577b..640dd779756e 100644
--- a/system/Publisher/Publisher.php
+++ b/system/Publisher/Publisher.php
@@ -43,8 +43,7 @@ class Publisher
 	private static $discovered = [];
 
 	/**
-	 * Directory to use for methods
-	 * that need temporary storage.
+	 * Directory to use for methods that need temporary storage.
 	 * Created on-the-fly as needed.
 	 *
 	 * @var string|null
@@ -59,8 +58,7 @@ class Publisher
 	private $files = [];
 
 	/**
-	 * Exceptions for specific files
-	 * from the last write operation.
+	 * Exceptions for specific files from the last write operation.
 	 *
 	 * @var array<string,Throwable>
 	 */
@@ -81,8 +79,7 @@ class Publisher
 	protected $destination = FCPATH;
 
 	/**
-	 * Discovers and returns all Publishers
-	 * in the specified namespace directory.
+	 * Discovers and returns all Publishers in the specified namespace directory.
 	 *
 	 * @param string $directory
 	 *
@@ -115,6 +112,7 @@ public static function discover(string $directory = 'Publishers'): array
 				self::$discovered[$directory][] = new $className();
 			}
 		}
+
 		sort(self::$discovered[$directory]);
 
 		return self::$discovered[$directory];
@@ -123,8 +121,7 @@ public static function discover(string $directory = 'Publishers'): array
 	//--------------------------------------------------------------------
 
 	/**
-	 * Resolves a full path and verifies
-	 * it is an actual directory.
+	 * Resolves a full path and verifies it is an actual directory.
 	 *
 	 * @param string $directory
 	 *
@@ -162,11 +159,10 @@ private static function resolveFile(string $file): string
 	//--------------------------------------------------------------------
 
 	/**
-	 * Filters an array of files, removing files not
-	 * part of the given directory (recursive).
+	 * Removes files that are not part of the given directory (recursive).
 	 *
 	 * @param string[] $files
-	 * @param string $directory
+	 * @param string   $directory
 	 *
 	 * @return string[]
 	 */
@@ -207,15 +203,14 @@ private static function matchFiles(array $files, string $pattern)
 
 	//--------------------------------------------------------------------
 
-	/**
-	 * Removes a directory and all its files
-	 * and subdirectories.
+	/*
+	 * Removes a directory and all its files and subdirectories.
 	 *
 	 * @param string $directory
 	 *
 	 * @return void
 	 */
-	private static function wipeDirectory(string $directory)
+	private static function wipeDirectory(string $directory): void
 	{
 		if (is_dir($directory))
 		{
@@ -267,8 +262,7 @@ private static function safeCopyFile(string $from, string $to, bool $replace): v
 		}
 
 		// Make sure the directory exists
-		$directory = pathinfo($to, PATHINFO_DIRNAME);
-		if (! is_dir($directory))
+		if (! is_dir($directory = pathinfo($to, PATHINFO_DIRNAME)))
 		{
 			mkdir($directory, 0775, true);
 		}
@@ -280,8 +274,7 @@ private static function safeCopyFile(string $from, string $to, bool $replace): v
 	//--------------------------------------------------------------------
 
 	/**
-	 * Loads the helper and verifies the
-	 * source and destination directories.
+	 * Loads the helper and verifies the source and destination directories.
 	 *
 	 * @param string|null $source
 	 * @param string|null $destination
@@ -322,8 +315,7 @@ public function publish(): bool
 	//--------------------------------------------------------------------
 
 	/**
-	 * Returns the temporary workspace,
-	 * creating it if necessary.
+	 * Returns the temporary workspace, creating it if necessary.
 	 *
 	 * @return string
 	 */
@@ -532,8 +524,7 @@ public function addPath(string $path, bool $recursive = true)
 	//--------------------------------------------------------------------
 
 	/**
-	 * Downloads and stages files from
-	 * an array of URIs.
+	 * Downloads and stages files from an array of URIs.
 	 *
 	 * @param string[] $uris
 	 *
@@ -609,15 +600,10 @@ public function retainPattern(string $pattern, string $scope = null)
 		}
 
 		// Start with all files or those in scope
-		$files = is_null($scope)
-			? $this->files
-			: self::filterFiles($this->files, $scope);
-
-		// Match the pattern within the scoped files
-		$matched = self::matchFiles($files, $pattern);
+		$files = is_null($scope) ? $this->files : self::filterFiles($this->files, $scope);
 
-		// ... and remove their inverse
-		return $this->removeFiles(array_diff($files, $matched));
+		// Matches the pattern within the scoped files and remove their inverse.
+		return $this->removeFiles(array_diff($files, self::matchFiles($files, $pattern)));
 	}
 
 	//--------------------------------------------------------------------
diff --git a/tests/_support/Publishers/TestPublisher.php b/tests/_support/Publishers/TestPublisher.php
index 8ef30ca90024..fdb3547478d1 100644
--- a/tests/_support/Publishers/TestPublisher.php
+++ b/tests/_support/Publishers/TestPublisher.php
@@ -9,7 +9,7 @@ class TestPublisher extends Publisher
 	/**
 	 * Runs the defined Operations.
 	 */
-	public function publish()
+	public function publish(): bool
 	{
 		$this->downloadFromUrls($urls)->mergeToDirectory(FCPATH . 'assets');
 	}

From ea6ca9fec0b2a74d789b2b6b3e2961c567f46544 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Thu, 27 May 2021 20:15:37 +0000
Subject: [PATCH 0166/2325] Add Guide, tweak class

---
 system/Publisher/Publisher.php                |  95 +++-
 tests/_support/Publishers/TestPublisher.php   |  55 ++-
 .../system/Publisher/PublisherOutputTest.php  |  26 +-
 .../system/Publisher/PublisherSupportTest.php |  17 +-
 user_guide_src/source/libraries/publisher.rst | 437 ++++++++++++++++++
 5 files changed, 598 insertions(+), 32 deletions(-)
 create mode 100644 user_guide_src/source/libraries/publisher.rst

diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php
index 640dd779756e..b9e5cca24e90 100644
--- a/system/Publisher/Publisher.php
+++ b/system/Publisher/Publisher.php
@@ -15,6 +15,7 @@
 use CodeIgniter\Files\File;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\Publisher\Exceptions\PublisherException;
+use RuntimeException;
 use Throwable;
 
 /**
@@ -64,6 +65,13 @@ class Publisher
 	 */
 	private $errors = [];
 
+	/**
+	 * List of file published curing the last write operation.
+	 *
+	 * @var string[]
+	 */
+	private $published = [];
+
 	/**
 	 * Base path to use for the source.
 	 *
@@ -85,7 +93,7 @@ class Publisher
 	 *
 	 * @return self[]
 	 */
-	public static function discover(string $directory = 'Publishers'): array
+	final public static function discover(string $directory = 'Publishers'): array
 	{
 		if (isset(self::$discovered[$directory]))
 		{
@@ -301,7 +309,7 @@ public function __destruct()
 	}
 
 	/**
-	 * Reads files in the sources and copies them out to their destinations.
+	 * Reads files from the sources and copies them out to their destinations.
 	 * This method should be reimplemented by child classes intended for
 	 * discovery.
 	 *
@@ -309,17 +317,42 @@ public function __destruct()
 	 */
 	public function publish(): bool
 	{
+		if ($this->source === ROOTPATH && $this->destination === FCPATH)
+		{
+			throw new RuntimeException('Child classes of Publisher should provide their own source and destination or publish method.');
+		}
+
 		return $this->addPath('/')->merge(true);
 	}
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Returns the source directory.
+	 *
+	 * @return string
+	 */
+	final public function getSource(): string
+	{
+		return $this->source;
+	}
+
+	/**
+	 * Returns the destination directory.
+	 *
+	 * @return string
+	 */
+	final public function getDestination(): string
+	{
+		return $this->destination;
+	}
+
 	/**
 	 * Returns the temporary workspace, creating it if necessary.
 	 *
 	 * @return string
 	 */
-	protected function getScratch(): string
+	final public function getScratch(): string
 	{
 		if (is_null($this->scratch))
 		{
@@ -335,17 +368,27 @@ protected function getScratch(): string
 	 *
 	 * @return array<string,Throwable>
 	 */
-	public function getErrors(): array
+	final public function getErrors(): array
 	{
 		return $this->errors;
 	}
 
+	/**
+	 * Returns the files published by the last write operation.
+	 *
+	 * @return string[]
+	 */
+	final public function getPublished(): array
+	{
+		return $this->published;
+	}
+
 	/**
 	 * Optimizes and returns the current file list.
 	 *
 	 * @return string[]
 	 */
-	public function getFiles(): array
+	final public function getFiles(): array
 	{
 		$this->files = array_unique($this->files, SORT_STRING);
 		sort($this->files, SORT_STRING);
@@ -353,6 +396,8 @@ public function getFiles(): array
 		return $this->files;
 	}
 
+	//--------------------------------------------------------------------
+
 	/**
 	 * Sets the file list directly, files are still subject to verification.
 	 * This works as a "reset" method with [].
@@ -361,15 +406,13 @@ public function getFiles(): array
 	 *
 	 * @return $this
 	 */
-	public function setFiles(array $files)
+	final public function setFiles(array $files)
 	{
 		$this->files = [];
 
 		return $this->addFiles($files);
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Verifies and adds files to the list.
 	 *
@@ -377,7 +420,7 @@ public function setFiles(array $files)
 	 *
 	 * @return $this
 	 */
-	public function addFiles(array $files)
+	final public function addFiles(array $files)
 	{
 		foreach ($files as $file)
 		{
@@ -394,7 +437,7 @@ public function addFiles(array $files)
 	 *
 	 * @return $this
 	 */
-	public function addFile(string $file)
+	final public function addFile(string $file)
 	{
 		$this->files[] = self::resolveFile($file);
 
@@ -408,7 +451,7 @@ public function addFile(string $file)
 	 *
 	 * @return $this
 	 */
-	public function removeFiles(array $files)
+	final public function removeFiles(array $files)
 	{
 		$this->files = array_diff($this->files, $files);
 
@@ -422,7 +465,7 @@ public function removeFiles(array $files)
 	 *
 	 * @return $this
 	 */
-	public function removeFile(string $file)
+	final public function removeFile(string $file)
 	{
 		return $this->removeFiles([$file]);
 	}
@@ -438,7 +481,7 @@ public function removeFile(string $file)
 	 *
 	 * @return $this
 	 */
-	public function addDirectories(array $directories, bool $recursive = false)
+	final public function addDirectories(array $directories, bool $recursive = false)
 	{
 		foreach ($directories as $directory)
 		{
@@ -456,7 +499,7 @@ public function addDirectories(array $directories, bool $recursive = false)
 	 *
 	 * @return $this
 	 */
-	public function addDirectory(string $directory, bool $recursive = false)
+	final public function addDirectory(string $directory, bool $recursive = false)
 	{
 		$directory = self::resolveDirectory($directory);
 
@@ -486,7 +529,7 @@ public function addDirectory(string $directory, bool $recursive = false)
 	 *
 	 * @return $this
 	 */
-	public function addPaths(array $paths, bool $recursive = true)
+	final public function addPaths(array $paths, bool $recursive = true)
 	{
 		foreach ($paths as $path)
 		{
@@ -504,7 +547,7 @@ public function addPaths(array $paths, bool $recursive = true)
 	 *
 	 * @return $this
 	 */
-	public function addPath(string $path, bool $recursive = true)
+	final public function addPath(string $path, bool $recursive = true)
 	{
 		$full = $this->source . $path;
 
@@ -530,7 +573,7 @@ public function addPath(string $path, bool $recursive = true)
 	 *
 	 * @return $this
 	 */
-	public function addUris(array $uris)
+	final public function addUris(array $uris)
 	{
 		foreach ($uris as $uri)
 		{
@@ -547,7 +590,7 @@ public function addUris(array $uris)
 	 *
 	 * @return $this
 	 */
-	public function addUri(string $uri)
+	final public function addUri(string $uri)
 	{
 		// Figure out a good filename (using URI strips queries and fragments)
 		$file = $this->getScratch() . basename((new URI($uri))->getPath());
@@ -569,7 +612,7 @@ public function addUri(string $uri)
 	 *
 	 * @return $this
 	 */
-	public function removePattern(string $pattern, string $scope = null)
+	final public function removePattern(string $pattern, string $scope = null)
 	{
 		if ($pattern === '')
 		{
@@ -592,7 +635,7 @@ public function removePattern(string $pattern, string $scope = null)
 	 *
 	 * @return $this
 	 */
-	public function retainPattern(string $pattern, string $scope = null)
+	final public function retainPattern(string $pattern, string $scope = null)
 	{
 		if ($pattern === '')
 		{
@@ -613,7 +656,7 @@ public function retainPattern(string $pattern, string $scope = null)
 	 *
 	 * @return $this
 	 */
-	public function wipe()
+	final public function wipe()
 	{
 		self::wipeDirectory($this->destination);
 
@@ -629,9 +672,9 @@ public function wipe()
 	 *
 	 * @return boolean Whether all files were copied successfully
 	 */
-	public function copy(bool $replace = true): bool
+	final public function copy(bool $replace = true): bool
 	{
-		$this->errors = [];
+		$this->errors = $this->published = [];
 
 		foreach ($this->getFiles() as $file)
 		{
@@ -640,6 +683,7 @@ public function copy(bool $replace = true): bool
 			try
 			{
 				self::safeCopyFile($file, $to, $replace);
+				$this->published[] = $to;
 			}
 			catch (Throwable $e)
 			{
@@ -658,9 +702,9 @@ public function copy(bool $replace = true): bool
 	 *
 	 * @return boolean Whether all files were copied successfully
 	 */
-	public function merge(bool $replace = true): bool
+	final public function merge(bool $replace = true): bool
 	{
-		$this->errors = [];
+		$this->errors = $this->published = [];
 
 		// Get the file from source for special handling
 		$sourced = self::filterFiles($this->getFiles(), $this->source);
@@ -678,6 +722,7 @@ public function merge(bool $replace = true): bool
 			try
 			{
 				self::safeCopyFile($file, $to, $replace);
+				$this->published[] = $to;
 			}
 			catch (Throwable $e)
 			{
diff --git a/tests/_support/Publishers/TestPublisher.php b/tests/_support/Publishers/TestPublisher.php
index fdb3547478d1..9192c3899b83 100644
--- a/tests/_support/Publishers/TestPublisher.php
+++ b/tests/_support/Publishers/TestPublisher.php
@@ -4,13 +4,62 @@
 
 use CodeIgniter\Publisher\Publisher;
 
-class TestPublisher extends Publisher
+final class TestPublisher extends Publisher
 {
 	/**
-	 * Runs the defined Operations.
+	 * Fakes an error on the given file.
+	 *
+	 * @return $this
+	 */
+	public static function setError(string $file)
+	{
+		self::$error = $file;
+	}
+
+	/**
+	 * A file to cause an error
+	 *
+	 * @var string
+	 */
+	private static $error = '';
+
+	/**
+	 * Base path to use for the source.
+	 *
+	 * @var string
+	 */
+	protected $source = SUPPORTPATH . 'Files';
+
+	/**
+	 * Base path to use for the destination.
+	 *
+	 * @var string
+	 */
+	protected $destination = WRITEPATH;
+
+	/**
+	 * Fakes a publish event so no files are actually copied.
 	 */
 	public function publish(): bool
 	{
-		$this->downloadFromUrls($urls)->mergeToDirectory(FCPATH . 'assets');
+		$this->errors = $this->published = [];
+
+		$this->addPath('');
+
+		// Copy each sourced file to its relative destination
+		foreach ($this->getFiles() as $file)
+		{
+			if ($file === self::$error)
+			{
+				$this->errors[$file] = new RuntimeException('Have an error, dear.');
+			}
+			else
+			{
+				// Resolve the destination path
+				$this->published[] = $this->destination . substr($file, strlen($this->source));
+			}
+		}
+
+		return $this->errors === [];
 	}
 }
diff --git a/tests/system/Publisher/PublisherOutputTest.php b/tests/system/Publisher/PublisherOutputTest.php
index 5183d188d6b9..0f416440b803 100644
--- a/tests/system/Publisher/PublisherOutputTest.php
+++ b/tests/system/Publisher/PublisherOutputTest.php
@@ -112,6 +112,7 @@ public function testCopyIgnoresSame()
 
 		$result = $publisher->copy(true);
 		$this->assertTrue($result);
+		$this->assertSame([$this->root->url() . '/banana.php'], $publisher->getPublished());
 	}
 
 	public function testCopyIgnoresCollision()
@@ -121,10 +122,10 @@ public function testCopyIgnoresCollision()
 		mkdir($this->root->url() . '/banana.php');
 
 		$result = $publisher->addFile($this->file)->copy(false);
-		$errors = $publisher->getErrors();
 
 		$this->assertTrue($result);
-		$this->assertSame([], $errors);
+		$this->assertSame([], $publisher->getErrors());
+		$this->assertSame([$this->root->url() . '/banana.php'], $publisher->getPublished());
 	}
 
 	public function testCopyCollides()
@@ -140,6 +141,7 @@ public function testCopyCollides()
 		$this->assertFalse($result);
 		$this->assertCount(1, $errors);
 		$this->assertSame([$this->file], array_keys($errors));
+		$this->assertSame([], $publisher->getPublished());
 		$this->assertSame($expected, $errors[$this->file]->getMessage());
 	}
 
@@ -148,6 +150,12 @@ public function testCopyCollides()
 	public function testMerge()
 	{
 		$publisher = new Publisher(SUPPORTPATH . 'Files', $this->root->url());
+		$expected  = [
+			$this->root->url() . '/able/apple.php',
+			$this->root->url() . '/able/fig_3.php',
+			$this->root->url() . '/able/prune_ripe.php',
+			$this->root->url() . '/baker/banana.php',
+		];
 
 		$this->assertFileDoesNotExist($this->root->url() . '/able/fig_3.php');
 		$this->assertDirectoryDoesNotExist($this->root->url() . '/baker');
@@ -157,23 +165,36 @@ public function testMerge()
 		$this->assertTrue($result);
 		$this->assertFileExists($this->root->url() . '/able/fig_3.php');
 		$this->assertDirectoryExists($this->root->url() . '/baker');
+		$this->assertSame($expected, $publisher->getPublished());
 	}
 
 	public function testMergeReplace()
 	{
 		$this->assertFalse(same_file($this->directory . 'apple.php', $this->root->url() . '/able/apple.php'));
 		$publisher = new Publisher(SUPPORTPATH . 'Files', $this->root->url());
+		$expected  = [
+			$this->root->url() . '/able/apple.php',
+			$this->root->url() . '/able/fig_3.php',
+			$this->root->url() . '/able/prune_ripe.php',
+			$this->root->url() . '/baker/banana.php',
+		];
 
 		$result = $publisher->addPath('/')->merge(true);
 
 		$this->assertTrue($result);
 		$this->assertTrue(same_file($this->directory . 'apple.php', $this->root->url() . '/able/apple.php'));
+		$this->assertSame($expected, $publisher->getPublished());
 	}
 
 	public function testMergeCollides()
 	{
 		$publisher = new Publisher(SUPPORTPATH . 'Files', $this->root->url());
 		$expected  = lang('Publisher.collision', ['dir', $this->directory . 'fig_3.php', $this->root->url() . '/able/fig_3.php']);
+		$published = [
+			$this->root->url() . '/able/apple.php',
+			$this->root->url() . '/able/prune_ripe.php',
+			$this->root->url() . '/baker/banana.php',
+		];
 
 		mkdir($this->root->url() . '/able/fig_3.php');
 
@@ -183,6 +204,7 @@ public function testMergeCollides()
 		$this->assertFalse($result);
 		$this->assertCount(1, $errors);
 		$this->assertSame([$this->directory . 'fig_3.php'], array_keys($errors));
+		$this->assertSame($published, $publisher->getPublished());
 		$this->assertSame($expected, $errors[$this->directory . 'fig_3.php']->getMessage());
 	}
 
diff --git a/tests/system/Publisher/PublisherSupportTest.php b/tests/system/Publisher/PublisherSupportTest.php
index 5592c02fc4ca..f17be3460432 100644
--- a/tests/system/Publisher/PublisherSupportTest.php
+++ b/tests/system/Publisher/PublisherSupportTest.php
@@ -126,13 +126,26 @@ public function testResolveFileDirectory()
 
 	//--------------------------------------------------------------------
 
+	public function testGetSource()
+	{
+		$publisher = new Publisher(ROOTPATH);
+
+		$this->assertSame(ROOTPATH, $publisher->getSource());
+	}
+
+	public function testGetDestination()
+	{
+		$publisher = new Publisher(ROOTPATH, SUPPORTPATH);
+
+		$this->assertSame(SUPPORTPATH, $publisher->getDestination());
+	}
+
 	public function testGetScratch()
 	{
 		$publisher = new Publisher();
 		$this->assertNull($this->getPrivateProperty($publisher, 'scratch'));
 
-		$method  = $this->getPrivateMethodInvoker($publisher, 'getScratch');
-		$scratch = $method();
+		$scratch = $publisher->getScratch();
 
 		$this->assertIsString($scratch);
 		$this->assertDirectoryExists($scratch);
diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
new file mode 100644
index 000000000000..ef97e0b52f95
--- /dev/null
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -0,0 +1,437 @@
+#########
+Publisher
+#########
+
+The Publisher library provides a means to copy files within a project using robust detection and error checking.
+
+.. contents::
+    :local:
+    :depth: 2
+
+*******************
+Loading the Library
+*******************
+
+Because Publisher instances are specific to their source and destination this library is not available
+through ``Services`` but should be instantiated or extended directly. E.g.
+
+	$publisher = new \CodeIgniter\Publisher\Publisher();
+
+*****************
+Concept and Usage
+*****************
+
+``Publisher`` solves a handful of common problems when working within a backend framework:
+
+* How do I maintain project assets with version dependencies?
+* How do I manage uploads and other "dynamic" files that need to be web accessible?
+* How can I update my project when the framework or modules change?
+* How can components inject new content into existing projects?
+
+At its most basic, publishing amounts to copying a file or files into a project. ``Publisher`` uses fluent-style
+command chaining to read, filter, and process input files, then copies or merges them into the target destination.
+You may use ``Publisher`` on demand in your Controllers or other components, or you may stage publications by extending
+the class and leveraging its discovery with ``spark publish``.
+
+On Demand
+=========
+
+Access ``Publisher`` directly by instantiating a new instance of the class::
+
+	$publisher = new \CodeIgniter\Publisher\Publisher();
+
+By default the source and destination will be set to ``ROOTPATH`` and ``FCPATH`` respectively, giving ``Publisher``
+easy access to take any file from your project and make it web-accessible. Alternatively you may pass a new source
+or source and destination into the constructor::
+
+	$vendorPublisher = new Publisher(ROOTPATH . 'vendor');
+	$filterPublisher = new Publisher('/path/to/module/Filters', APPPATH . 'Filters');
+
+Once the source and destination are set you may start adding relative input files::
+
+	$frameworkPublisher = new Publisher(ROOTPATH . 'vendor/codeigniter4/codeigniter4');
+
+	// All "path" commands are relative to $source
+	$frameworkPublisher->addPath('app/Config/Cookie.php');
+
+	// You may also add from outside the source, but the files will not be merged into subdirectories
+	$frameworkPublisher->addFiles([
+		'/opt/mail/susan',
+		'/opt/mail/ubuntu',
+	]);
+	$frameworkPublisher->addDirectory(SUPPORTPATH . 'Images');
+
+Once all the files are staged use one of the output commands (**copy()** or **merge()**) to process the staged files
+to their destination(s)::
+
+	// Place all files into $destination
+	$frameworkPublisher->copy();
+
+	// Place all files into $destination, overwriting existing files
+	$frameworkPublisher->copy(true);
+
+	// Place files into their relative $destination directories, overwriting and saving the boolean result
+	$result = $frameworkPublisher->merge(true);
+
+See the Library Reference for a full description of available methods.
+
+Automation and Discovery
+========================
+
+You may have regular publication tasks embedded as part of your application deployment or upkeep. ``Publisher`` leverages
+the powerful ``Autoloader`` to locate any child classes primed for publication::
+
+	use CodeIgniter\CLI\CLI;
+	use CodeIgniter\Publisher\Publisher;
+	
+	foreach (Publisher::discover() as $publisher)
+	{
+		$result = $publisher->publish();
+
+		if ($result === false)
+		{
+			CLI::write(get_class($publisher) . ' failed to publish!', 'red');
+		}
+	}
+
+By default ``discover()`` will search for the "Publishers" directory across all namespaces, but you may specify a
+different directory and it will return any child classes found::
+
+	$memePublishers = Publisher::discover('CatGIFs');
+
+Most of the time you will not need to handle your own discovery, just use the provided "publish" command::
+
+	> php spark publish
+
+By default on your class extension ``publish()`` will add all files from your ``$source`` and merge them
+out to your destination, overwriting on collision.
+
+********
+Examples
+********
+
+Here are a handful of example use cases and their implementations to help you get started publishing.
+
+File Sync Example
+=================
+
+You want to display a "photo of the day" image on your homepage. You have a feed for daily photos but you
+need to get the actual file into a browsable location in your project at **public/images/daily_photo.jpg**.
+You can set up :doc:`Custom Command </cli/cli_commands>` to run daily that will handle this for you::
+
+	namespace App\Commands;
+
+	use CodeIgniter\CLI\BaseCommand;
+	use CodeIgniter\Publisher\Publisher;
+	use Throwable;
+
+	class DailyPhoto extends BaseCommand
+	{
+		protected $group       = 'Publication';
+		protected $name        = 'publish:daily';
+		protected $description = 'Publishes the latest daily photo to the homepage.';
+
+		public function run(array $params)
+		{
+			$publisher = new Publisher('/path/to/photos/', FCPATH . 'assets/images');
+
+			try
+			{
+				$publisher->addPath('daily_photo.jpg')->copy($replace = true);
+			}
+			catch (Throwable $e)
+			{
+				$this->showError($e);
+			}
+		}
+	}
+
+Now running ``spark publish:daily`` will keep your homepage's image up-to-date. What if the photo is
+coming from an external API? You can use ``addUri()`` in place of ``addPath()`` to download the remote
+resource and publish it out instead::
+
+	$publisher->addUri('https://example.com/feeds/daily_photo.jpg')->copy($replace = true);
+
+Asset Dependencies Example
+==========================
+
+You want to integrate the frontend library "Bootstrap" into your project, but the frequent updates makes it a hassle
+to keep up with. You can create a publication definition in your project to sync frontend assets by adding extending
+``Publisher`` in your project. So **app/Publishers/BootstrapPublisher.php** might look like this::
+
+	namespace App\Publishers;
+
+	use CodeIgniter\Publisher\Publisher;
+
+	class BootstrapPublisher extends Publisher
+	{
+		/**
+		 * Tell Publisher where to get the files.
+		 * Since we will use Composer to download
+		 * them we point to the "vendor" directory.
+		 *
+		 * @var string
+		 */
+		protected $source = 'vendor/twbs/bootstrap/';
+
+		/**
+		 * FCPATH is always the default destination,
+		 * but we may want them to go in a sub-folder
+		 * to keep things organized.
+		 *
+		 * @var string
+		 */
+		protected $destination = FCPATH . 'bootstrap';
+
+		/**
+		 * Use the "publish" method to indicate that this
+		 * class is ready to be discovered and automated.
+		 *
+		 * @return boolean
+		 */
+		public function publish(): bool
+		{
+			return $this
+				// Add all the files relative to $source			
+				->addPath('dist')
+
+				// Indicate we only want the minimized versions
+				->retainPattern('*.min.*)
+
+				// Merge-and-replace to retain the original directory structure
+				->merge(true);
+		}
+
+Now add the dependency via Composer and call ``spark publish`` to run the publication::
+
+	> composer require twbs/bootstrap
+	> php spark publish
+
+... and you'll end up with something like this:
+
+	public/.htaccess
+	public/favicon.ico
+	public/index.php
+	public/robots.txt
+	public/
+		bootstrap/
+			css/
+				bootstrap.min.css
+				bootstrap-utilities.min.css.map
+				bootstrap-grid.min.css
+				bootstrap.rtl.min.css
+				bootstrap.min.css.map
+				bootstrap-reboot.min.css
+				bootstrap-utilities.min.css
+				bootstrap-reboot.rtl.min.css
+				bootstrap-grid.min.css.map
+			js/
+				bootstrap.esm.min.js
+				bootstrap.bundle.min.js.map
+				bootstrap.bundle.min.js
+				bootstrap.min.js
+				bootstrap.esm.min.js.map
+				bootstrap.min.js.map
+
+Module Deployment Example
+=========================
+
+You want to allow developers using your popular authentication module the ability to expand on the default behavior
+of your Migration, Controller, and Model. You can create your own module "publish" command to inject these components
+into an application for use::
+
+	namespace Math\Auth\Commands;
+
+	use CodeIgniter\CLI\BaseCommand;
+	use CodeIgniter\Publisher\Publisher;
+	use Throwable;
+
+	class Publish extends BaseCommand
+	{
+		protected $group       = 'Auth';
+		protected $name        = 'auth:publish';
+		protected $description = 'Publish Auth components into the current application.';
+
+		public function run(array $params)
+		{
+			// Use the Autoloader to figure out the module path
+			$source = service('autoloader')->getNamespace('Math\\Auth');
+
+			$publisher = new Publisher($source, APPATH);
+
+			try
+			{
+				// Add only the desired components
+				$publisher->addPaths([
+					'Controllers',
+					'Database/Migrations',
+					'Models',
+				])->merge(false); // Be careful not to overwrite anything
+			}
+			catch (Throwable $e)
+			{
+				$this->showError($e);
+				return;
+			}
+
+			// If publication succeeded then update namespaces
+			foreach ($publisher->getFiles as $original)
+			{
+				// Get the location of the new file
+				$file = str_replace($source, APPPATH, $original);
+
+				// Replace the namespace
+				$contents = file_get_contents($file);
+				$contents = str_replace('namespace Math\\Auth', 'namespace ' . APP_NAMESPACE, );
+				file_put_contents($file, $contents);
+			}
+		}
+	}
+
+Now when your module users run ``php spark auth:publish`` they will have the following added to their project::
+
+	app/Controllers/AuthController.php
+	app/Database/Migrations/2017-11-20-223112_create_auth_tables.php.php
+	app/Models/LoginModel.php
+	app/Models/UserModel.php
+
+*****************
+Library Reference
+*****************
+
+Support Methods
+===============
+
+**[static] discover(string $directory = 'Publishers'): Publisher[]**
+
+Discovers and returns all Publishers in the specified namespace directory. For example, if both
+**app/Publishers/FrameworkPublisher.php** and **myModule/src/Publishers/AssetPublisher.php** exist and are
+extensions of ``Publisher`` then ``Publisher::discover()`` would return an instance of each.
+
+**publish(): bool**
+
+Processes the full input-process-output chain. By default this is the equivalent of calling ``addPath($source)``
+and ``merge(true)`` but child classes will typically provide their own implementation. ``publish()`` is called
+on all discovered Publishers when running ``spark publish``.
+Returns success or failure.
+
+**getScratch(): string**
+
+Returns the temporary workspace, creating it if necessary. Some operations use intermediate storage to stage
+files and changes, and this provides the path to a transient, writable directory that you may use as well.
+
+**getErrors(): array<string,Throwable>**
+
+Returns any errors from the last write operation. The array keys are the files that caused the error, and the
+values are the Throwable that was caught. Use ``getMessage()`` on the Throwable to get the error message.
+
+**getFiles(): string[]**
+
+Returns an array of all the loaded input files.
+
+Inputting Files
+===============
+
+**setFiles(array $files)**
+
+Sets the list of input files to the provided string array of file paths.
+
+**addFile(string $file)**
+**addFiles(array $files)**
+
+Adds the file or files to the current list of input files. Files are absolute paths to actual files.
+
+**removeFile(string $file)**
+**removeFiles(array $files)**
+
+Removes the file or files from the current list of input files.
+
+**addDirectory(string $directory, bool $recursive = false)**
+**addDirectories(array $directories, bool $recursive = false)**
+
+Adds all files from the directory or directories, optionally recursing into sub-directories. Directories are
+absolute paths to actual directories.
+
+**addPath(string $path, bool $recursive = true)**
+**addPaths(array $path, bool $recursive = true)**
+
+Adds all files indicated by the relative paths. Paths are references to actual files or directories relative
+to ``$source``. If the relative path resolves to a directory then ``$recursive`` will include sub-directories.
+
+**addUri(string $uri)**
+**addUris(array $uris)**
+
+Downloads the contents of a URI using ``CURLRequest`` into the scratch workspace then adds the resulting
+file to the list.
+
+.. note:: The CURL request made is a simple ``GET`` and uses the response body for the file contents. Some
+	remote files may need a custom request to be handled properly.
+
+Filtering Files
+===============
+
+**removePattern(string $pattern, string $scope = null)**
+**retainPattern(string $pattern, string $scope = null)**
+
+Filters the current file list through the pattern (and optional scope), removing or retaining matched
+files. ``$pattern`` may be a complete regex (like ``'#[A-Za-z]+\.php#'``) or a pseudo-regex similar
+to ``glob()`` (like ``*.css``).
+If a ``$scope`` is provided then only files in or under that directory will be considered (i.e. files
+outside of ``$scope`` are always retained). When no scope is provided then all files are subject.
+
+Examples::
+
+	$publisher = new Publisher(APPPATH . 'Config');
+	$publisher->addPath('/', true); // Adds all Config files and directories
+
+	$publisher->removePattern('*tion.php'); // Would remove Encryption.php, Validation.php, and boot/production.php
+	$publisher->removePattern('*tion.php', APPPATH . 'Config/boot'); // Would only remove boot/production.php
+
+	$publisher->retainPattern('#A.+php$#'); // Would keep only Autoload.php
+	$publisher->retainPattern('#d.+php$#', APPPATH . 'Config/boot'); // Would keep everything but boot/production.php and boot/testing.php
+
+Outputting Files
+================
+
+**wipe()**
+
+Removes all files, directories, and sub-directories from ``$destination``.
+
+.. important:: Use wisely.
+
+**copy(bool $replace = true): bool**
+
+Copies all files into the ``$destination``. This does not recreate the directory structure, so every file
+from the current list will end up in the same destination directory. Using ``$replace`` will cause files
+to overwrite when there is already an existing file. Returns success or failure, use ``getPublished()``
+and ``getErrors()`` to troubleshoot failures.
+Be mindful of duplicate basename collisions, for example::
+
+	$publisher = new Publisher('/home/source', '/home/destination');
+	$publisher->addPaths([
+		'pencil/lead.png',
+		'metal/lead.png',
+	]);
+
+	// This is bad! Only one file will remain at /home/destination/lead.png
+	$publisher->copy(true);
+
+**merge(bool $replace = true): bool**
+
+Copies all files into the ``$destination`` in appropriate relative sub-directories. Any files that
+match ``$source`` will be placed into their equivalent directories in ``$destination``, effectively
+creating a "mirror" or "rsync" operation. Using ``$replace`` will cause files
+to overwrite when there is already an existing file; since directories are merged this will not
+affect other files in the destination. Returns success or failure, use ``getPublished()`` and
+``getErrors()`` to troubleshoot failures.
+
+Example::
+
+	$publisher = new Publisher('/home/source', '/home/destination');
+	$publisher->addPaths([
+		'pencil/lead.png',
+		'metal/lead.png',
+	]);
+
+	// Results in "/home/destination/pencil/lead.png" and "/home/destination/metal/lead.png"
+	$publisher->merge();

From 7d4cc0b4820b9f6d45a73de9e45d17d506c33004 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Sat, 29 May 2021 15:18:50 +0000
Subject: [PATCH 0167/2325] Add Publish command

---
 system/Commands/Utilities/Publish.php         | 114 ++++++++++++++++++
 system/Language/en/Publisher.php              |   5 +
 system/Publisher/Publisher.php                |   1 +
 tests/_support/Publishers/TestPublisher.php   |  29 ++---
 tests/system/Commands/PublishCommandTest.php  |  52 ++++++++
 user_guide_src/source/libraries/publisher.rst |   7 +-
 6 files changed, 181 insertions(+), 27 deletions(-)
 create mode 100644 system/Commands/Utilities/Publish.php
 create mode 100644 tests/system/Commands/PublishCommandTest.php

diff --git a/system/Commands/Utilities/Publish.php b/system/Commands/Utilities/Publish.php
new file mode 100644
index 000000000000..b9665286f348
--- /dev/null
+++ b/system/Commands/Utilities/Publish.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Utilities;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\Publisher\Publisher;
+
+/**
+ * Discovers all Publisher classes from the "Publishers/" directory
+ * across namespaces. Executes `publish()` from each instance, parsing
+ * each result.
+ */
+class Publish extends BaseCommand
+{
+	/**
+	 * The group the command is lumped under
+	 * when listing commands.
+	 *
+	 * @var string
+	 */
+	protected $group = 'CodeIgniter';
+
+	/**
+	 * The Command's name
+	 *
+	 * @var string
+	 */
+	protected $name = 'publish';
+
+	/**
+	 * The Command's short description
+	 *
+	 * @var string
+	 */
+	protected $description = 'Discovers and executes all predefined Publisher classes.';
+
+	/**
+	 * The Command's usage
+	 *
+	 * @var string
+	 */
+	protected $usage = 'publish [directory]';
+
+	/**
+	 * The Command's arguments
+	 *
+	 * @var array<string, string>
+	 */
+	protected $arguments = [
+		'directory' => '[Optional] The directory to scan within each namespace. Default: "Publishers".',
+	];
+
+	/**
+	 * the Command's Options
+	 *
+	 * @var array
+	 */
+	protected $options = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Displays the help for the spark cli script itself.
+	 *
+	 * @param array $params
+	 */
+	public function run(array $params)
+	{
+		$directory = array_shift($params) ?? 'Publishers';
+
+		if ([] === $publishers = Publisher::discover($directory))
+		{
+			CLI::write(lang('Publisher.publishMissing', [$directory]));
+			return;
+		}
+
+		foreach ($publishers as $publisher)
+		{
+			if ($publisher->publish())
+			{
+				CLI::write(lang('Publisher.publishSuccess', [
+					get_class($publisher),
+					count($publisher->getPublished()),
+					$publisher->getDestination(),
+				]), 'green');
+			}
+			else
+			{
+				CLI::error(lang('Publisher.publishFailure', [
+					get_class($publisher),
+					$publisher->getDestination(),
+				]), 'light_gray', 'red');
+
+				foreach ($publisher->getErrors() as $file => $exception)
+				{
+					CLI::write($file);
+					CLI::newLine();
+
+					$this->showError($exception);
+				}
+			}
+		}
+	}
+}
diff --git a/system/Language/en/Publisher.php b/system/Language/en/Publisher.php
index cb5ce81f10a4..934342b4f98c 100644
--- a/system/Language/en/Publisher.php
+++ b/system/Language/en/Publisher.php
@@ -14,4 +14,9 @@
 	'collision'         => 'Publisher encountered an unexpected {0} while copying {1} to {2}.',
 	'expectedDirectory' => 'Publisher::{0} expects a valid directory.',
 	'expectedFile'      => 'Publisher::{0} expects a valid file.',
+
+	// Publish Command
+	'publishMissing'    => 'No Publisher classes detected in {0} across all namespaces.',
+	'publishSuccess'    => '{0} published {1} file(s) to {2}.',
+	'publishFailure'    => '{0} failed to publish to {1}!',
 ];
diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php
index b9e5cca24e90..7018df15c7d1 100644
--- a/system/Publisher/Publisher.php
+++ b/system/Publisher/Publisher.php
@@ -317,6 +317,7 @@ public function __destruct()
 	 */
 	public function publish(): bool
 	{
+		// Safeguard against accidental misuse
 		if ($this->source === ROOTPATH && $this->destination === FCPATH)
 		{
 			throw new RuntimeException('Child classes of Publisher should provide their own source and destination or publish method.');
diff --git a/tests/_support/Publishers/TestPublisher.php b/tests/_support/Publishers/TestPublisher.php
index 9192c3899b83..cf1eefa7ede6 100644
--- a/tests/_support/Publishers/TestPublisher.php
+++ b/tests/_support/Publishers/TestPublisher.php
@@ -3,6 +3,7 @@
 namespace Tests\Support\Publishers;
 
 use CodeIgniter\Publisher\Publisher;
+use RuntimeException;
 
 final class TestPublisher extends Publisher
 {
@@ -11,17 +12,17 @@ final class TestPublisher extends Publisher
 	 *
 	 * @return $this
 	 */
-	public static function setError(string $file)
+	public static function setResult(bool $result)
 	{
-		self::$error = $file;
+		self::$result = $result;
 	}
 
 	/**
-	 * A file to cause an error
+	 * Return value for publish()
 	 *
-	 * @var string
+	 * @var boolean
 	 */
-	private static $error = '';
+	private static $result = true;
 
 	/**
 	 * Base path to use for the source.
@@ -42,24 +43,8 @@ public static function setError(string $file)
 	 */
 	public function publish(): bool
 	{
-		$this->errors = $this->published = [];
-
 		$this->addPath('');
 
-		// Copy each sourced file to its relative destination
-		foreach ($this->getFiles() as $file)
-		{
-			if ($file === self::$error)
-			{
-				$this->errors[$file] = new RuntimeException('Have an error, dear.');
-			}
-			else
-			{
-				// Resolve the destination path
-				$this->published[] = $this->destination . substr($file, strlen($this->source));
-			}
-		}
-
-		return $this->errors === [];
+		return self::$result;
 	}
 }
diff --git a/tests/system/Commands/PublishCommandTest.php b/tests/system/Commands/PublishCommandTest.php
new file mode 100644
index 000000000000..44f2de25f85a
--- /dev/null
+++ b/tests/system/Commands/PublishCommandTest.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace CodeIgniter\Commands;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\Filters\CITestStreamFilter;
+use Tests\Support\Publishers\TestPublisher;
+
+final class PublishCommandTest extends CIUnitTestCase
+{
+	private $streamFilter;
+
+	protected function setUp(): void
+	{
+		parent::setUp();
+		CITestStreamFilter::$buffer = '';
+
+		$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+		$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+	}
+
+	protected function tearDown(): void
+	{
+		parent::tearDown();
+
+		stream_filter_remove($this->streamFilter);
+		TestPublisher::setResult(true);
+	}
+
+	public function testDefault()
+	{
+		command('publish');
+
+		$this->assertStringContainsString(lang('Publisher.publishSuccess', [
+			TestPublisher::class,
+			0,
+			WRITEPATH,
+		]), CITestStreamFilter::$buffer);
+	}
+
+	public function testFailure()
+	{
+		TestPublisher::setResult(false);
+
+		command('publish');
+
+		$this->assertStringContainsString(lang('Publisher.publishFailure', [
+			TestPublisher::class,
+			WRITEPATH,
+		]), CITestStreamFilter::$buffer);
+	}
+}
diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
index ef97e0b52f95..23f7c2d9e97e 100644
--- a/user_guide_src/source/libraries/publisher.rst
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -246,7 +246,7 @@ into an application for use::
 	use CodeIgniter\Publisher\Publisher;
 	use Throwable;
 
-	class Publish extends BaseCommand
+	class AuthPublish extends BaseCommand
 	{
 		protected $group       = 'Auth';
 		protected $name        = 'auth:publish';
@@ -275,11 +275,8 @@ into an application for use::
 			}
 
 			// If publication succeeded then update namespaces
-			foreach ($publisher->getFiles as $original)
+			foreach ($publisher->getPublished() as $file)
 			{
-				// Get the location of the new file
-				$file = str_replace($source, APPPATH, $original);
-
 				// Replace the namespace
 				$contents = file_get_contents($file);
 				$contents = str_replace('namespace Math\\Auth', 'namespace ' . APP_NAMESPACE, );

From 461942d3eb6fdd7f9e384f16bd4fc0852c176646 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Sat, 29 May 2021 15:43:14 +0000
Subject: [PATCH 0168/2325] Fix test bleeding

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

diff --git a/tests/system/Publisher/PublisherSupportTest.php b/tests/system/Publisher/PublisherSupportTest.php
index f17be3460432..2aff0e34d1f6 100644
--- a/tests/system/Publisher/PublisherSupportTest.php
+++ b/tests/system/Publisher/PublisherSupportTest.php
@@ -53,7 +53,7 @@ public function testDiscoverNothing()
 	public function testDiscoverStores()
 	{
 		$publisher = Publisher::discover()[0];
-		$publisher->addFile($this->file);
+		$publisher->setFiles([])->addFile($this->file);
 
 		$result = Publisher::discover();
 		$this->assertSame($publisher, $result[0]);

From 746ed2c7ce7fc487d31f4959e5b90dfb1b1adbb0 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Sat, 29 May 2021 20:17:28 +0000
Subject: [PATCH 0169/2325] Fix UG format

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

diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
index 23f7c2d9e97e..c30bce720815 100644
--- a/user_guide_src/source/libraries/publisher.rst
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -119,6 +119,8 @@ You want to display a "photo of the day" image on your homepage. You have a feed
 need to get the actual file into a browsable location in your project at **public/images/daily_photo.jpg**.
 You can set up :doc:`Custom Command </cli/cli_commands>` to run daily that will handle this for you::
 
+	<?php
+
 	namespace App\Commands;
 
 	use CodeIgniter\CLI\BaseCommand;
@@ -159,6 +161,8 @@ You want to integrate the frontend library "Bootstrap" into your project, but th
 to keep up with. You can create a publication definition in your project to sync frontend assets by adding extending
 ``Publisher`` in your project. So **app/Publishers/BootstrapPublisher.php** might look like this::
 
+	<?php
+
 	namespace App\Publishers;
 
 	use CodeIgniter\Publisher\Publisher;
@@ -207,7 +211,7 @@ Now add the dependency via Composer and call ``spark publish`` to run the public
 	> composer require twbs/bootstrap
 	> php spark publish
 
-... and you'll end up with something like this:
+... and you'll end up with something like this::
 
 	public/.htaccess
 	public/favicon.ico
@@ -240,6 +244,8 @@ You want to allow developers using your popular authentication module the abilit
 of your Migration, Controller, and Model. You can create your own module "publish" command to inject these components
 into an application for use::
 
+	<?php
+
 	namespace Math\Auth\Commands;
 
 	use CodeIgniter\CLI\BaseCommand;

From 0beb5c5274f0ffede4d4b91b64bf2a5c179b571b Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Tue, 1 Jun 2021 14:44:25 +0000
Subject: [PATCH 0170/2325] Implement review changes

---
 system/Commands/Utilities/Publish.php         |  5 ++---
 .../Exceptions/PublisherException.php         | 21 +++++++++++++++++++
 tests/_support/Publishers/TestPublisher.php   |  2 --
 user_guide_src/source/libraries/index.rst     |  1 +
 user_guide_src/source/libraries/publisher.rst | 18 +++++++++-------
 5 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/system/Commands/Utilities/Publish.php b/system/Commands/Utilities/Publish.php
index b9665286f348..15448fc90db3 100644
--- a/system/Commands/Utilities/Publish.php
+++ b/system/Commands/Utilities/Publish.php
@@ -49,7 +49,7 @@ class Publish extends BaseCommand
 	 *
 	 * @var string
 	 */
-	protected $usage = 'publish [directory]';
+	protected $usage = 'publish [<directory>]';
 
 	/**
 	 * The Command's arguments
@@ -104,9 +104,8 @@ public function run(array $params)
 				foreach ($publisher->getErrors() as $file => $exception)
 				{
 					CLI::write($file);
+					CLI::error($exception->getMessage());
 					CLI::newLine();
-
-					$this->showError($exception);
 				}
 			}
 		}
diff --git a/system/Publisher/Exceptions/PublisherException.php b/system/Publisher/Exceptions/PublisherException.php
index 81f9bb4b7174..8144fcfeac02 100644
--- a/system/Publisher/Exceptions/PublisherException.php
+++ b/system/Publisher/Exceptions/PublisherException.php
@@ -13,18 +13,39 @@
 
 use CodeIgniter\Exceptions\FrameworkException;
 
+/**
+ * Publisher Exception Class
+ *
+ * Handles exceptions related to actions taken by a Publisher.
+ */
 class PublisherException extends FrameworkException
 {
+	/**
+	 * Throws when a file should be overwritten yet cannot.
+	 *
+	 * @param string $from The source file
+	 * @param string $to   The destination file
+	 */
 	public static function forCollision(string $from, string $to)
 	{
 		return new static(lang('Publisher.collision', [filetype($to), $from, $to]));
 	}
 
+	/**
+	 * Throws when an object is expected to be a directory but is not or is missing.
+	 *
+	 * @param string $caller The method causing the exception
+	 */
 	public static function forExpectedDirectory(string $caller)
 	{
 		return new static(lang('Publisher.expectedDirectory', [$caller]));
 	}
 
+	/**
+	 * Throws when an object is expected to be a file but is not or is missing.
+	 *
+	 * @param string $caller The method causing the exception
+	 */
 	public static function forExpectedFile(string $caller)
 	{
 		return new static(lang('Publisher.expectedFile', [$caller]));
diff --git a/tests/_support/Publishers/TestPublisher.php b/tests/_support/Publishers/TestPublisher.php
index cf1eefa7ede6..47c987a0285a 100644
--- a/tests/_support/Publishers/TestPublisher.php
+++ b/tests/_support/Publishers/TestPublisher.php
@@ -9,8 +9,6 @@ final class TestPublisher extends Publisher
 {
 	/**
 	 * Fakes an error on the given file.
-	 *
-	 * @return $this
 	 */
 	public static function setResult(bool $result)
 	{
diff --git a/user_guide_src/source/libraries/index.rst b/user_guide_src/source/libraries/index.rst
index 3af27e900ce5..9f977e91d604 100644
--- a/user_guide_src/source/libraries/index.rst
+++ b/user_guide_src/source/libraries/index.rst
@@ -14,6 +14,7 @@ Library Reference
     honeypot
     images
     pagination
+    publisher
     security
     sessions
     throttler
diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
index c30bce720815..57abcfcd6925 100644
--- a/user_guide_src/source/libraries/publisher.rst
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -44,11 +44,12 @@ By default the source and destination will be set to ``ROOTPATH`` and ``FCPATH``
 easy access to take any file from your project and make it web-accessible. Alternatively you may pass a new source
 or source and destination into the constructor::
 
+	use CodeIgniter\Publisher\Publisher;
+	
 	$vendorPublisher = new Publisher(ROOTPATH . 'vendor');
 	$filterPublisher = new Publisher('/path/to/module/Filters', APPPATH . 'Filters');
 
-Once the source and destination are set you may start adding relative input files::
-
+	// Once the source and destination are set you may start adding relative input files
 	$frameworkPublisher = new Publisher(ROOTPATH . 'vendor/codeigniter4/codeigniter4');
 
 	// All "path" commands are relative to $source
@@ -73,7 +74,7 @@ to their destination(s)::
 	// Place files into their relative $destination directories, overwriting and saving the boolean result
 	$result = $frameworkPublisher->merge(true);
 
-See the Library Reference for a full description of available methods.
+See the :ref:`reference` for a full description of available methods.
 
 Automation and Discovery
 ========================
@@ -90,7 +91,7 @@ the powerful ``Autoloader`` to locate any child classes primed for publication::
 
 		if ($result === false)
 		{
-			CLI::write(get_class($publisher) . ' failed to publish!', 'red');
+			CLI::error(get_class($publisher) . ' failed to publish!', 'red');
 		}
 	}
 
@@ -139,7 +140,7 @@ You can set up :doc:`Custom Command </cli/cli_commands>` to run daily that will
 
 			try
 			{
-				$publisher->addPath('daily_photo.jpg')->copy($replace = true);
+				$publisher->addPath('daily_photo.jpg')->copy(true); // `true` to enable overwrites
 			}
 			catch (Throwable $e)
 			{
@@ -152,7 +153,7 @@ Now running ``spark publish:daily`` will keep your homepage's image up-to-date.
 coming from an external API? You can use ``addUri()`` in place of ``addPath()`` to download the remote
 resource and publish it out instead::
 
-	$publisher->addUri('https://example.com/feeds/daily_photo.jpg')->copy($replace = true);
+	$publisher->addUri('https://example.com/feeds/daily_photo.jpg')->copy(true);
 
 Asset Dependencies Example
 ==========================
@@ -161,8 +162,6 @@ You want to integrate the frontend library "Bootstrap" into your project, but th
 to keep up with. You can create a publication definition in your project to sync frontend assets by adding extending
 ``Publisher`` in your project. So **app/Publishers/BootstrapPublisher.php** might look like this::
 
-	<?php
-
 	namespace App\Publishers;
 
 	use CodeIgniter\Publisher\Publisher;
@@ -205,6 +204,7 @@ to keep up with. You can create a publication definition in your project to sync
 				// Merge-and-replace to retain the original directory structure
 				->merge(true);
 		}
+	}
 
 Now add the dependency via Composer and call ``spark publish`` to run the publication::
 
@@ -298,6 +298,8 @@ Now when your module users run ``php spark auth:publish`` they will have the fol
 	app/Models/LoginModel.php
 	app/Models/UserModel.php
 
+.. _reference:
+
 *****************
 Library Reference
 *****************

From 6484cb6304e141e0c8f420ec3866a9212f711aec Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Tue, 1 Jun 2021 17:23:22 +0000
Subject: [PATCH 0171/2325] Tweak formatting

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

diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
index 57abcfcd6925..1cb27b54aa2b 100644
--- a/user_guide_src/source/libraries/publisher.rst
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -162,6 +162,8 @@ You want to integrate the frontend library "Bootstrap" into your project, but th
 to keep up with. You can create a publication definition in your project to sync frontend assets by adding extending
 ``Publisher`` in your project. So **app/Publishers/BootstrapPublisher.php** might look like this::
 
+	<?php
+	
 	namespace App\Publishers;
 
 	use CodeIgniter\Publisher\Publisher;
@@ -195,11 +197,11 @@ to keep up with. You can create a publication definition in your project to sync
 		public function publish(): bool
 		{
 			return $this
-				// Add all the files relative to $source			
+				// Add all the files relative to $source
 				->addPath('dist')
 
 				// Indicate we only want the minimized versions
-				->retainPattern('*.min.*)
+				->retainPattern('*.min.*')
 
 				// Merge-and-replace to retain the original directory structure
 				->merge(true);

From 55e79f6ef4a2181608fc57ce8b346645cf565b3e Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Tue, 8 Jun 2021 16:22:12 +0000
Subject: [PATCH 0172/2325] Add Publisher restrictions

---
 app/Config/Publisher.php                      |  28 ++++
 system/Config/Publisher.php                   |  42 ++++++
 system/Language/en/Publisher.php              |   8 +-
 .../Exceptions/PublisherException.php         |  22 +++
 system/Publisher/Publisher.php                | 131 +++++++++++-------
 tests/_support/Config/Registrar.php           |  14 ++
 tests/system/Publisher/PublisherInputTest.php |   2 +-
 .../system/Publisher/PublisherOutputTest.php  |   5 +-
 .../Publisher/PublisherRestrictionsTest.php   | 108 +++++++++++++++
 .../system/Publisher/PublisherSupportTest.php |   3 +-
 user_guide_src/source/libraries/publisher.rst |  16 ++-
 11 files changed, 325 insertions(+), 54 deletions(-)
 create mode 100644 app/Config/Publisher.php
 create mode 100644 system/Config/Publisher.php
 create mode 100644 tests/system/Publisher/PublisherRestrictionsTest.php

diff --git a/app/Config/Publisher.php b/app/Config/Publisher.php
new file mode 100644
index 000000000000..2588eea2abac
--- /dev/null
+++ b/app/Config/Publisher.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\Publisher as BasePublisher;
+
+/**
+ * Publisher Configuration
+ *
+ * Defines basic security restrictions for the Publisher class
+ * to prevent abuse by injecting malicious files into a project.
+ */
+class Publisher extends BasePublisher
+{
+	/**
+	 * A list of allowed destinations with a (pseudo-)regex
+	 * of allowed files for each destination.
+	 * Attempts to publish to directories not in this list will
+	 * result in a PublisherException. Files that do no fit the
+	 * pattern will cause copy/merge to fail.
+	 *
+	 * @var array<string,string>
+	 */
+	public $restrictions = [
+		ROOTPATH => '*',
+		FCPATH   => '#\.(?css|js|map|htm?|xml|json|webmanifest|tff|eot|woff?|gif|jpe?g|tiff?|png|webp|bmp|ico|svg)$#i',
+	];
+}
diff --git a/system/Config/Publisher.php b/system/Config/Publisher.php
new file mode 100644
index 000000000000..651600ef9c06
--- /dev/null
+++ b/system/Config/Publisher.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Config;
+
+/**
+ * Publisher Configuration
+ *
+ * Defines basic security restrictions for the Publisher class
+ * to prevent abuse by injecting malicious files into a project.
+ */
+class Publisher extends BaseConfig
+{
+	/**
+	 * A list of allowed destinations with a (pseudo-)regex
+	 * of allowed files for each destination.
+	 * Attempts to publish to directories not in this list will
+	 * result in a PublisherException. Files that do no fit the
+	 * pattern will cause copy/merge to fail.
+	 *
+	 * @var array<string,string>
+	 */
+	public $restrictions = [
+		ROOTPATH => '*',
+		FCPATH   => '#\.(?css|js|map|htm?|xml|json|webmanifest|tff|eot|woff?|gif|jpe?g|tiff?|png|webp|bmp|ico|svg)$#i',
+	];
+
+	/**
+	 * Disables Registrars to prevent modules from altering the restrictions.
+	 */
+	final protected function registerProperties()
+	{
+	}
+}
diff --git a/system/Language/en/Publisher.php b/system/Language/en/Publisher.php
index 934342b4f98c..2d7ae8418b25 100644
--- a/system/Language/en/Publisher.php
+++ b/system/Language/en/Publisher.php
@@ -11,9 +11,11 @@
 
 // Publisher language settings
 return [
-	'collision'         => 'Publisher encountered an unexpected {0} while copying {1} to {2}.',
-	'expectedDirectory' => 'Publisher::{0} expects a valid directory.',
-	'expectedFile'      => 'Publisher::{0} expects a valid file.',
+	'collision'             => 'Publisher encountered an unexpected {0} while copying {1} to {2}.',
+	'expectedDirectory'     => 'Publisher::{0} expects a valid directory.',
+	'expectedFile'          => 'Publisher::{0} expects a valid file.',
+	'destinationNotAllowed' => 'Destination is not on the allowed list of Publisher directories: {0}',
+	'fileNotAllowed'        => '{0} fails the following restriction for {1}: {2}',
 
 	// Publish Command
 	'publishMissing'    => 'No Publisher classes detected in {0} across all namespaces.',
diff --git a/system/Publisher/Exceptions/PublisherException.php b/system/Publisher/Exceptions/PublisherException.php
index 8144fcfeac02..d54420881ec7 100644
--- a/system/Publisher/Exceptions/PublisherException.php
+++ b/system/Publisher/Exceptions/PublisherException.php
@@ -50,4 +50,26 @@ public static function forExpectedFile(string $caller)
 	{
 		return new static(lang('Publisher.expectedFile', [$caller]));
 	}
+
+	/**
+	 * Throws when given a destination that is not in the list of allowed directories.
+	 *
+	 * @param string $destination
+	 */
+	public static function forDestinationNotAllowed(string $destination)
+	{
+		return new static(lang('Publisher.destinationNotAllowed', [$destination]));
+	}
+
+	/**
+	 * Throws when a file fails to match the allowed pattern for its destination.
+	 *
+	 * @param string $file
+	 * @param string $directory
+	 * @param string $pattern
+	 */
+	public static function forFileNotAllowed(string $file, string $directory, string $pattern)
+	{
+		return new static(lang('Publisher.fileNotAllowed', [$file, $directory, $pattern]));
+	}
 }
diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php
index 7018df15c7d1..1bfd4b91768d 100644
--- a/system/Publisher/Publisher.php
+++ b/system/Publisher/Publisher.php
@@ -72,6 +72,14 @@ class Publisher
 	 */
 	private $published = [];
 
+	/**
+	 * List of allowed directories and their allowed files regex.
+	 * Restrictions are intentionally private to prevent overriding.
+	 *
+	 * @var array<string,string>
+	 */
+	private $restrictions;
+
 	/**
 	 * Base path to use for the source.
 	 *
@@ -134,6 +142,8 @@ final public static function discover(string $directory = 'Publishers'): array
 	 * @param string $directory
 	 *
 	 * @return string
+	 *
+	 * @throws PublisherException
 	 */
 	private static function resolveDirectory(string $directory): string
 	{
@@ -152,6 +162,8 @@ private static function resolveDirectory(string $directory): string
 	 * @param string $file
 	 *
 	 * @return string
+	 *
+	 * @throws PublisherException
 	 */
 	private static function resolveFile(string $file): string
 	{
@@ -191,7 +203,7 @@ private static function filterFiles(array $files, string $directory): array
 	 *
 	 * @return string[]
 	 */
-	private static function matchFiles(array $files, string $pattern)
+	private static function matchFiles(array $files, string $pattern): array
 	{
 		// Convert pseudo-regex into their true form
 		if (@preg_match($pattern, null) === false) // @phpstan-ignore-line
@@ -236,49 +248,6 @@ private static function wipeDirectory(string $directory): void
 		}
 	}
 
-	/**
-	 * Copies a file with directory creation and identical file awareness.
-	 * Intentionally allows errors.
-	 *
-	 * @param string  $from
-	 * @param string  $to
-	 * @param boolean $replace
-	 *
-	 * @return void
-	 *
-	 * @throws PublisherException For unresolvable collisions
-	 */
-	private static function safeCopyFile(string $from, string $to, bool $replace): void
-	{
-		// Check for an existing file
-		if (file_exists($to))
-		{
-			// If not replacing or if files are identical then consider successful
-			if (! $replace || same_file($from, $to))
-			{
-				return;
-			}
-
-			// If it is a directory then do not try to remove it
-			if (is_dir($to))
-			{
-				throw PublisherException::forCollision($from, $to);
-			}
-
-			// Try to remove anything else
-			unlink($to);
-		}
-
-		// Make sure the directory exists
-		if (! is_dir($directory = pathinfo($to, PATHINFO_DIRNAME)))
-		{
-			mkdir($directory, 0775, true);
-		}
-
-		// Allow copy() to throw errors
-		copy($from, $to);
-	}
-
 	//--------------------------------------------------------------------
 
 	/**
@@ -293,6 +262,20 @@ public function __construct(string $source = null, string $destination = null)
 
 		$this->source      = self::resolveDirectory($source ?? $this->source);
 		$this->destination = self::resolveDirectory($destination ?? $this->destination);
+
+		// Restrictions are intentionally not injected to prevent overriding
+		$this->restrictions = config('Publisher')->restrictions;
+
+		// Make sure the destination is allowed
+		foreach (array_keys($this->restrictions) as $directory)
+		{
+			if (strpos($this->destination, $directory) === 0)
+			{
+				return;
+			}
+		}
+
+		throw PublisherException::forDestinationNotAllowed($this->destination);
 	}
 
 	/**
@@ -314,6 +297,8 @@ public function __destruct()
 	 * discovery.
 	 *
 	 * @return boolean
+	 *
+	 * @throws RuntimeException
 	 */
 	public function publish(): bool
 	{
@@ -683,7 +668,7 @@ final public function copy(bool $replace = true): bool
 
 			try
 			{
-				self::safeCopyFile($file, $to, $replace);
+				$this->safeCopyFile($file, $to, $replace);
 				$this->published[] = $to;
 			}
 			catch (Throwable $e)
@@ -707,7 +692,7 @@ final public function merge(bool $replace = true): bool
 	{
 		$this->errors = $this->published = [];
 
-		// Get the file from source for special handling
+		// Get the files from source for special handling
 		$sourced = self::filterFiles($this->getFiles(), $this->source);
 
 		// Handle everything else with a flat copy
@@ -722,7 +707,7 @@ final public function merge(bool $replace = true): bool
 
 			try
 			{
-				self::safeCopyFile($file, $to, $replace);
+				$this->safeCopyFile($file, $to, $replace);
 				$this->published[] = $to;
 			}
 			catch (Throwable $e)
@@ -733,4 +718,56 @@ final public function merge(bool $replace = true): bool
 
 		return $this->errors === [];
 	}
+
+	/**
+	 * Copies a file with directory creation and identical file awareness.
+	 * Intentionally allows errors.
+	 *
+	 * @param string  $from
+	 * @param string  $to
+	 * @param boolean $replace
+	 *
+	 * @return void
+	 *
+	 * @throws PublisherException For collisions and restriction violations
+	 */
+	private function safeCopyFile(string $from, string $to, bool $replace): void
+	{
+		// Verify this is an allowed file for its destination
+		foreach ($this->restrictions as $directory => $pattern)
+		{
+			if (strpos($to, $directory) === 0 && self::matchFiles([$to], $pattern) === [])
+			{
+				throw PublisherException::forFileNotAllowed($from, $directory, $pattern);
+			}
+		}
+
+		// Check for an existing file
+		if (file_exists($to))
+		{
+			// If not replacing or if files are identical then consider successful
+			if (! $replace || same_file($from, $to))
+			{
+				return;
+			}
+
+			// If it is a directory then do not try to remove it
+			if (is_dir($to))
+			{
+				throw PublisherException::forCollision($from, $to);
+			}
+
+			// Try to remove anything else
+			unlink($to);
+		}
+
+		// Make sure the directory exists
+		if (! is_dir($directory = pathinfo($to, PATHINFO_DIRNAME)))
+		{
+			mkdir($directory, 0775, true);
+		}
+
+		// Allow copy() to throw errors
+		copy($from, $to);
+	}
 }
diff --git a/tests/_support/Config/Registrar.php b/tests/_support/Config/Registrar.php
index 4a9f3b0fe981..15e8f54ff92d 100644
--- a/tests/_support/Config/Registrar.php
+++ b/tests/_support/Config/Registrar.php
@@ -121,4 +121,18 @@ public static function Database()
 
         return $config;
     }
+
+    /**
+     * Demonstrates Publisher security.
+     *
+     * @see PublisherRestrictionsTest::testRegistrarsNotAllowed()
+     *
+     * @return array
+     */
+    public static function Publisher()
+    {
+        return [
+            'restrictions' => [SUPPORTPATH => '*'],
+        ];
+    }
 }
diff --git a/tests/system/Publisher/PublisherInputTest.php b/tests/system/Publisher/PublisherInputTest.php
index 553a92b14c53..e7450f5c02a9 100644
--- a/tests/system/Publisher/PublisherInputTest.php
+++ b/tests/system/Publisher/PublisherInputTest.php
@@ -1,4 +1,4 @@
-<?php namespace CodeIgniter\Pager;
+<?php
 
 use CodeIgniter\Publisher\Exceptions\PublisherException;
 use CodeIgniter\Publisher\Publisher;
diff --git a/tests/system/Publisher/PublisherOutputTest.php b/tests/system/Publisher/PublisherOutputTest.php
index 0f416440b803..489058a1c099 100644
--- a/tests/system/Publisher/PublisherOutputTest.php
+++ b/tests/system/Publisher/PublisherOutputTest.php
@@ -1,4 +1,4 @@
-<?php namespace CodeIgniter\Pager;
+<?php
 
 use CodeIgniter\Publisher\Exceptions\PublisherException;
 use CodeIgniter\Publisher\Publisher;
@@ -68,6 +68,9 @@ protected function setUp(): void
 		];
 
 		$this->root = vfsStream::setup('root', null, $this->structure);
+
+		// Add root to the list of allowed destinations
+		config('Publisher')->restrictions[$this->root->url()] = '*';
 	}
 
 	//--------------------------------------------------------------------
diff --git a/tests/system/Publisher/PublisherRestrictionsTest.php b/tests/system/Publisher/PublisherRestrictionsTest.php
new file mode 100644
index 000000000000..27db2e9429a9
--- /dev/null
+++ b/tests/system/Publisher/PublisherRestrictionsTest.php
@@ -0,0 +1,108 @@
+<?php
+
+use CodeIgniter\Publisher\Exceptions\PublisherException;
+use CodeIgniter\Publisher\Publisher;
+use CodeIgniter\Test\CIUnitTestCase;
+
+/**
+ * Publisher Restrictions Test
+ *
+ * Tests that the restrictions defined in the configuration
+ * file properly prevent disallowed actions.
+ */
+class PublisherRestrictionsTest extends CIUnitTestCase
+{
+	/**
+	 * @see Tests\Support\Config\Registrars::Publisher()
+	 */
+	public function testRegistrarsNotAllowed()
+	{
+		$this->assertArrayNotHasKey(SUPPORTPATH, config('Publisher')->restrictions);
+	}
+
+	public function testImmutableRestrictions()
+	{
+		$publisher = new Publisher();
+
+		// Try to "hack" the Publisher by adding our desired destination to the config
+		config('Publisher')->restrictions[SUPPORTPATH] = '*';
+
+		$restrictions = $this->getPrivateProperty($publisher, 'restrictions');
+
+		$this->assertArrayNotHasKey(SUPPORTPATH, $restrictions);
+	}
+
+	/**
+	 * @dataProvider fileProvider
+	 */
+	public function testDefaultPublicRestrictions(string $path)
+	{
+		$publisher = new Publisher(ROOTPATH, FCPATH);
+		$pattern   = config('Publisher')->restrictions[FCPATH];
+
+		// Use the scratch space to create a file
+		$file = $publisher->getScratch() . $path;
+		file_put_contents($file, 'To infinity and beyond!');
+
+		$result = $publisher->addFile($file)->merge();
+		$this->assertFalse($result);
+
+		$errors = $publisher->getErrors();
+		$this->assertCount(1, $errors);
+		$this->assertSame([$file], array_keys($errors));
+
+		$expected = lang('Publisher.fileNotAllowed', [$file, FCPATH, $pattern]);
+		$this->assertSame($expected, $errors[$file]->getMessage());
+	}
+
+	public function fileProvider()
+	{
+		yield 'php'  => ['index.php'];
+		yield 'exe'  => ['cat.exe'];
+		yield 'flat' => ['banana'];
+	}
+
+	/**
+	 * @dataProvider destinationProvider
+	 */
+	public function testDestinations(string $destination, bool $allowed)
+	{
+		config('Publisher')->restrictions = [
+			APPPATH                   => '',
+			FCPATH                    => '',
+			SUPPORTPATH . 'Files'     => '',
+			SUPPORTPATH . 'Files/../' => '',
+		];
+
+		if (! $allowed)
+		{
+			$this->expectException(PublisherException::class);
+			$this->expectExceptionMessage(lang('Publisher.destinationNotAllowed', [$destination]));
+		}
+
+		$publisher = new Publisher(null, $destination);
+		$this->assertInstanceOf(Publisher::class, $publisher);
+	}
+
+	public function destinationProvider()
+	{
+		return [
+			'explicit' => [
+				APPPATH,
+				true,
+			],
+			'subdirectory' => [
+				APPPATH . 'Config',
+				true,
+			],
+			'relative' => [
+				SUPPORTPATH . 'Files/able/../',
+				true,
+			],
+			'parent' => [
+				SUPPORTPATH,
+				false,
+			],
+		];
+	}
+}
diff --git a/tests/system/Publisher/PublisherSupportTest.php b/tests/system/Publisher/PublisherSupportTest.php
index 2aff0e34d1f6..42f22d721525 100644
--- a/tests/system/Publisher/PublisherSupportTest.php
+++ b/tests/system/Publisher/PublisherSupportTest.php
@@ -1,4 +1,4 @@
-<?php namespace CodeIgniter\Pager;
+<?php
 
 use CodeIgniter\Publisher\Exceptions\PublisherException;
 use CodeIgniter\Publisher\Publisher;
@@ -203,6 +203,7 @@ public function testWipe()
 		$directory = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . bin2hex(random_bytes(6));
 		mkdir($directory, 0700);
 		$this->assertDirectoryExists($directory);
+		config('Publisher')->restrictions[$directory] = ''; // Allow the directory
 
 		$publisher = new Publisher($this->directory, $directory);
 		$publisher->wipe();
diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
index 1cb27b54aa2b..84b430ba144b 100644
--- a/user_guide_src/source/libraries/publisher.rst
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -107,6 +107,20 @@ Most of the time you will not need to handle your own discovery, just use the pr
 By default on your class extension ``publish()`` will add all files from your ``$source`` and merge them
 out to your destination, overwriting on collision.
 
+Security
+========
+
+In order to prevent modules from injecting malicious code into your projects, ``Publisher`` contains a config file
+that defines which directories and file patterns are allowed as destinations. By default, files may only be published
+to your project (to prevent access to the rest of the filesystem), and the **public/** folder (``FCPATH``) will only
+receive files with the following extensions:
+* Web assets: css, scss, js, map
+* Non-executable web files: htm, html, xml, json, webmanifest
+* Fonts: tff, eot, woff
+* Images: gif, jpg, jpeg, tiff, png, webp, bmp, ico, svg
+
+If you need to add or adjust the security for your project then alter the ``$restrictions`` property of ``Config\Publisher``.
+
 ********
 Examples
 ********
@@ -159,7 +173,7 @@ Asset Dependencies Example
 ==========================
 
 You want to integrate the frontend library "Bootstrap" into your project, but the frequent updates makes it a hassle
-to keep up with. You can create a publication definition in your project to sync frontend assets by adding extending
+to keep up with. You can create a publication definition in your project to sync frontend assets by extending
 ``Publisher`` in your project. So **app/Publishers/BootstrapPublisher.php** might look like this::
 
 	<?php

From d5a70be1bdd1ebb1af2b63d60284ac8cc251a983 Mon Sep 17 00:00:00 2001
From: Gianluigi Vizzielli <22755275+Vizzielli@users.noreply.github.com>
Date: Sat, 12 Jun 2021 13:25:40 +0200
Subject: [PATCH 0173/2325] Graphic fix on some screen res

Before: https://prnt.sc/1559re2
After: https://prnt.sc/1559uou
---
 app/Views/welcome_message.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Views/welcome_message.php b/app/Views/welcome_message.php
index 7050aa91174a..9ee2e427c308 100644
--- a/app/Views/welcome_message.php
+++ b/app/Views/welcome_message.php
@@ -163,7 +163,7 @@
 			color: rgba(200, 200, 200, 1);
 			padding: .25rem 1.75rem;
 		}
-		@media (max-width: 559px) {
+		@media (max-width: 629px) {
 			header ul {
 				padding: 0;
 			}

From 0b1470eaf86ba6c416ff766973bd62f7004fbdda Mon Sep 17 00:00:00 2001
From: Toto Prayogo <totoprayogo1916@gmail.com>
Date: Tue, 15 Jun 2021 11:30:43 +0700
Subject: [PATCH 0174/2325] rename `application` to `app`

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

diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
index ac4a20719b8c..1472afa4000c 100644
--- a/user_guide_src/source/libraries/sessions.rst
+++ b/user_guide_src/source/libraries/sessions.rst
@@ -610,7 +610,7 @@ setting**. The examples below work both on MySQL and PostgreSQL::
 	ALTER TABLE ci_sessions DROP PRIMARY KEY;
 
 You can choose the Database group to use by adding a new line to the
-**application\Config\App.php** file with the name of the group to use::
+**app/Config/App.php** file with the name of the group to use::
 
   public $sessionDBGroup = 'groupName';
 

From 9dbb7d8471fb106d35a756dc328c49b4897173fd Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Tue, 22 Jun 2021 00:27:38 +0800
Subject: [PATCH 0175/2325] Make CLI detection as interface independent as
 possible

---
 system/Common.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/system/Common.php b/system/Common.php
index 19be6398a8e1..4dfcd2cee170 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -644,22 +644,14 @@ function helper($filenames)
     /**
      * Check if PHP was invoked from the command line.
      *
-     * @codeCoverageIgnore Cannot be tested fully as PHPUnit always run in CLI
+     * @codeCoverageIgnore Cannot be tested fully as PHPUnit always run in php-cli
      */
     function is_cli(): bool
     {
-        if (PHP_SAPI === 'cli') {
-            return true;
-        }
-
         if (defined('STDIN')) {
             return true;
         }
 
-        if (stristr(PHP_SAPI, 'cgi') && getenv('TERM')) {
-            return true;
-        }
-
         if (! isset($_SERVER['REMOTE_ADDR'], $_SERVER['HTTP_USER_AGENT']) && isset($_SERVER['argv']) && count($_SERVER['argv']) > 0) {
             return true;
         }

From 6a5b2f6c2a315e4e0ba2f4112cd7e0424ee73164 Mon Sep 17 00:00:00 2001
From: sclubricants <vaughnb@scoil.com>
Date: Mon, 21 Jun 2021 09:31:14 -0700
Subject: [PATCH 0176/2325] Added MySQLi resultMode and updated user guide

---
 system/Database/MySQLi/Connection.php      | 15 ++++++++++-
 user_guide_src/source/database/results.rst | 30 ++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
index 756057528450..78652c25b3f3 100644
--- a/system/Database/MySQLi/Connection.php
+++ b/system/Database/MySQLi/Connection.php
@@ -58,6 +58,19 @@ class Connection extends BaseConnection
      */
     public $mysqli;
 
+    /**
+     * MySQLi constant
+     *
+     * For unbuffered queries use `MYSQLI_USE_RESULT`.
+     *
+     * Default mode for buffered queries uses `MYSQLI_STORE_RESULT`.
+     *
+     * @var int
+     */
+    public $resultMode = MYSQLI_STORE_RESULT;
+
+    //--------------------------------------------------------------------
+
     /**
      * Connect to the database.
      *
@@ -277,7 +290,7 @@ protected function execute(string $sql)
         }
 
         try {
-            return $this->connID->query($this->prepQuery($sql));
+            return $this->connID->query($this->prepQuery($sql), $this->resultMode);
         } catch (mysqli_sql_exception $e) {
             log_message('error', $e->getMessage());
 
diff --git a/user_guide_src/source/database/results.rst b/user_guide_src/source/database/results.rst
index e3e573d5c460..018c5184cc1b 100644
--- a/user_guide_src/source/database/results.rst
+++ b/user_guide_src/source/database/results.rst
@@ -159,6 +159,36 @@ it returns the current row and moves the internal data pointer ahead.
         echo $row->body;
     }
 
+For use with MySQLi you may set MySQLi's result mode to 
+``MYSQLI_USE_RESULT`` for maximum memory savings. Use of this is not 
+generally recommended but it can be beneficial in some circumstances 
+such as writing large queries to csv. If you change the result mode 
+be aware of the tradeoffs associated with it.
+
+::
+
+    $db->resultMode = MYSQLI_USE_RESULT; // for unbuffered results
+
+    $query = $db->query("YOUR QUERY");
+
+    $file = new \CodeIgniter\Files\File(WRITEPATH.'data.csv');
+
+    $csv = $file->openFile('w');
+
+    while ($row = $query->getUnbufferedRow('array'))
+    {	
+    	$csv->fputcsv($row);
+    }
+
+    $db->resultMode = MYSQLI_STORE_RESULT; // return to default mode
+
+.. note:: When using ``MYSQLI_USE_RESULT`` all subsequent calls on the same  
+    connection will result in error until all records have been fetched or 
+    a ``freeResult()`` call has been made. The ``getNumRows()`` method will only 
+    return the number of rows based on the current position of the data pointer. 
+    MyISAM tables will remain locked until all the records have been fetched 
+    or a ``freeResult()`` call has been made.
+
 You can optionally pass 'object' (default) or 'array' in order to specify
 the returned value's type::
 

From b0c76eda8f55f44aee8a2444a322f93c5f12d29a Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Wed, 23 Jun 2021 17:57:44 +0200
Subject: [PATCH 0177/2325] Sort timeline elements by start and duration.

---
 system/Debug/Toolbar.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 16432054d2e2..32e1f951a3df 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -213,6 +213,12 @@ protected function collectTimelineData($collectors): array
         }
 
         // Sort it
+        $sortArray = [
+          array_column($data, 'start'), SORT_NUMERIC, SORT_ASC,
+          array_column($data, 'duration'), SORT_NUMERIC, SORT_DESC,
+          &$data
+        ];
+        array_multisort(...$sortArray);
 
         return $data;
     }

From f00ced2d1990e3429d1fd6a5ef2d7b2281d89ed0 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Thu, 24 Jun 2021 21:57:34 +0800
Subject: [PATCH 0178/2325] Namespace extracted by GeneratorTrait should always
 end in backslash

---
 system/CLI/GeneratorTrait.php                 |  6 +++---
 .../system/Commands/CommandGeneratorTest.php  | 20 +++++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/system/CLI/GeneratorTrait.php b/system/CLI/GeneratorTrait.php
index b0668a49f4d2..51706b477cd4 100644
--- a/system/CLI/GeneratorTrait.php
+++ b/system/CLI/GeneratorTrait.php
@@ -215,14 +215,14 @@ protected function qualifyClassName(): string
         // Trims input, normalize separators, and ensure that all paths are in Pascalcase.
         $class = ltrim(implode('\\', array_map('pascalize', explode('\\', str_replace('/', '\\', trim($class))))), '\\/');
 
-        // Gets the namespace from input.
-        $namespace = trim(str_replace('/', '\\', $this->getOption('namespace') ?? APP_NAMESPACE), '\\');
+        // Gets the namespace from input. Don't forget the ending backslash!
+        $namespace = trim(str_replace('/', '\\', $this->getOption('namespace') ?? APP_NAMESPACE), '\\') . '\\';
 
         if (strncmp($class, $namespace, strlen($namespace)) === 0) {
             return $class; // @codeCoverageIgnore
         }
 
-        return $namespace . '\\' . $this->directory . '\\' . str_replace('/', '\\', $class);
+        return $namespace . $this->directory . '\\' . str_replace('/', '\\', $class);
     }
 
     /**
diff --git a/tests/system/Commands/CommandGeneratorTest.php b/tests/system/Commands/CommandGeneratorTest.php
index abe3ce4c7e6e..1d5dd6d116c4 100644
--- a/tests/system/Commands/CommandGeneratorTest.php
+++ b/tests/system/Commands/CommandGeneratorTest.php
@@ -132,4 +132,24 @@ public function testGeneratorPreservesCaseButChangesComponentName(): void
         $this->assertStringContainsString('File created: ', CITestStreamFilter::$buffer);
         $this->assertFileExists(APPPATH . 'Controllers/TestModuleController.php');
     }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4857
+     */
+    public function testGeneratorIsNotConfusedWithNamespaceLikeClassNames(): void
+    {
+        $time = time();
+        $notExists = true;
+        command('make:migration App_Lesson');
+
+        // we got 5 chances to prove that the file created went to app/Database/Migrations
+        foreach (range(0, 4) as $increment) {
+            $expectedFile = sprintf('%sDatabase/Migrations/%s_AppLesson.php', APPPATH, gmdate('Y-m-d-His', $time + $increment));
+            clearstatcache(true, $expectedFile);
+
+            $notExists = $notExists && ! is_file($expectedFile);
+        }
+
+        $this->assertFalse($notExists, 'Creating migration file for class "AppLesson" did not go to "app/Database/Migrations"');
+    }
 }

From b12cfd5b16820d795fe32604d4596394285e68e3 Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Fri, 25 Jun 2021 19:10:40 +0200
Subject: [PATCH 0179/2325] Fix bug with respecting TTL in Predis and File
 cache

---
 system/Cache/Handlers/FileHandler.php                |  2 +-
 system/Cache/Handlers/PredisHandler.php              |  4 +++-
 tests/system/Cache/Handlers/FileHandlerTest.php      | 12 ++++++++++++
 tests/system/Cache/Handlers/MemcachedHandlerTest.php | 12 ++++++++++++
 tests/system/Cache/Handlers/PredisHandlerTest.php    | 12 ++++++++++++
 tests/system/Cache/Handlers/RedisHandlerTest.php     | 12 ++++++++++++
 6 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php
index db2e5d6574ee..b6b1cb9c3525 100644
--- a/system/Cache/Handlers/FileHandler.php
+++ b/system/Cache/Handlers/FileHandler.php
@@ -210,7 +210,7 @@ public function getMetaData(string $key)
         }
 
         return [
-            'expire' => $data['time'] + $data['ttl'],
+            'expire' => $data['ttl'] > 0 ? $data['time'] + $data['ttl'] : null,
             'mtime'  => filemtime($this->path . $key),
             'data'   => $data['data'],
         ];
diff --git a/system/Cache/Handlers/PredisHandler.php b/system/Cache/Handlers/PredisHandler.php
index 374b3895ed05..5d1f37cdfc24 100644
--- a/system/Cache/Handlers/PredisHandler.php
+++ b/system/Cache/Handlers/PredisHandler.php
@@ -127,7 +127,9 @@ public function save(string $key, $value, int $ttl = 60)
             return false;
         }
 
-        $this->redis->expireat($key, time() + $ttl);
+        if ($ttl) {
+            $this->redis->expireat($key, time() + $ttl);
+        }
 
         return true;
     }
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index bfd379ae9d8f..0f9f9a10eadf 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -156,6 +156,18 @@ public function testSaveExcessiveKeyLength()
         unlink($file);
     }
 
+    public function testSavePermanent()
+    {
+        $this->assertTrue($this->fileHandler->save(self::$key1, 'value', 0));
+        $metaData = $this->fileHandler->getMetaData(self::$key1);
+
+        $this->assertSame(null, $metaData['expire']);
+        $this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
+        $this->assertSame('value', $metaData['data']);
+
+        $this->assertTrue($this->fileHandler->delete(self::$key1));
+    }
+
     public function testDelete()
     {
         $this->fileHandler->save(self::$key1, 'value');
diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
index f83708bd8c98..9afbdf742236 100644
--- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php
+++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
@@ -102,6 +102,18 @@ public function testSave()
         $this->assertTrue($this->memcachedHandler->save(self::$key1, 'value'));
     }
 
+    public function testSavePermanent()
+    {
+        $this->assertTrue($this->memcachedHandler->save(self::$key1, 'value', 0));
+        $metaData = $this->memcachedHandler->getMetaData(self::$key1);
+
+        $this->assertSame(null, $metaData['expire']);
+        $this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
+        $this->assertSame('value', $metaData['data']);
+
+        $this->assertTrue($this->memcachedHandler->delete(self::$key1));
+    }
+
     public function testDelete()
     {
         $this->memcachedHandler->save(self::$key1, 'value');
diff --git a/tests/system/Cache/Handlers/PredisHandlerTest.php b/tests/system/Cache/Handlers/PredisHandlerTest.php
index df6dfdbfbaef..867babcddc2a 100644
--- a/tests/system/Cache/Handlers/PredisHandlerTest.php
+++ b/tests/system/Cache/Handlers/PredisHandlerTest.php
@@ -109,6 +109,18 @@ public function testSave()
         $this->assertTrue($this->PredisHandler->save(self::$key1, 'value'));
     }
 
+    public function testSavePermanent()
+    {
+        $this->assertTrue($this->PredisHandler->save(self::$key1, 'value', 0));
+        $metaData = $this->PredisHandler->getMetaData(self::$key1);
+
+        $this->assertSame(null, $metaData['expire']);
+        $this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
+        $this->assertSame('value', $metaData['data']);
+
+        $this->assertTrue($this->PredisHandler->delete(self::$key1));
+    }
+
     public function testDelete()
     {
         $this->PredisHandler->save(self::$key1, 'value');
diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php
index 66f3c7fd2244..b3f8cebbb422 100644
--- a/tests/system/Cache/Handlers/RedisHandlerTest.php
+++ b/tests/system/Cache/Handlers/RedisHandlerTest.php
@@ -109,6 +109,18 @@ public function testSave()
         $this->assertTrue($this->redisHandler->save(self::$key1, 'value'));
     }
 
+    public function testSavePermanent()
+    {
+        $this->assertTrue($this->redisHandler->save(self::$key1, 'value', 0));
+        $metaData = $this->redisHandler->getMetaData(self::$key1);
+
+        $this->assertSame(null, $metaData['expire']);
+        $this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
+        $this->assertSame('value', $metaData['data']);
+
+        $this->assertTrue($this->redisHandler->delete(self::$key1));
+    }
+
     public function testDelete()
     {
         $this->redisHandler->save(self::$key1, 'value');

From 788a3325fe914298b02dd98acc68a11f9751ce68 Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Sat, 26 Jun 2021 11:00:32 +0200
Subject: [PATCH 0180/2325] Fix database session bug with timestamp in MySQLi

---
 system/Session/Handlers/DatabaseHandler.php   |   9 +-
 .../20160428212500_Create_test_tables.php     |  29 ++++
 .../_support/Database/Seeds/CITestSeeder.php  |  18 +++
 tests/system/Database/Live/MetadataTest.php   |   4 +
 .../Session/Handlers/DatabaseHandlerTest.php  | 141 ++++++++++++++++++
 5 files changed, 196 insertions(+), 5 deletions(-)
 create mode 100644 tests/system/Session/Handlers/DatabaseHandlerTest.php

diff --git a/system/Session/Handlers/DatabaseHandler.php b/system/Session/Handlers/DatabaseHandler.php
index 18da544d2873..ebfdfc119d5e 100644
--- a/system/Session/Handlers/DatabaseHandler.php
+++ b/system/Session/Handlers/DatabaseHandler.php
@@ -172,11 +172,10 @@ public function write($id, $data): bool
             $insertData = [
                 'id'         => $id,
                 'ip_address' => $this->ipAddress,
-                'timestamp'  => 'now()',
                 'data'       => $this->platform === 'postgre' ? '\x' . bin2hex($data) : $data,
             ];
 
-            if (! $this->db->table($this->table)->insert($insertData)) {
+            if (! $this->db->table($this->table)->set('timestamp', 'now()', false)->insert($insertData)) {
                 return $this->fail();
             }
 
@@ -192,13 +191,13 @@ public function write($id, $data): bool
             $builder = $builder->where('ip_address', $this->ipAddress);
         }
 
-        $updateData = ['timestamp' => 'now()'];
+        $updateData = [];
 
         if ($this->fingerprint !== md5($data)) {
             $updateData['data'] = ($this->platform === 'postgre') ? '\x' . bin2hex($data) : $data;
         }
 
-        if (! $builder->update($updateData)) {
+        if (! $builder->set('timestamp', 'now()', false)->update($updateData)) {
             return $this->fail();
         }
 
@@ -257,7 +256,7 @@ public function gc($max_lifetime)
         $separator = $this->platform === 'postgre' ? '\'' : ' ';
         $interval  = implode($separator, ['', "{$max_lifetime} second", '']);
 
-        return $this->db->table($this->table)->delete("timestamp < now() - INTERVAL {$interval}") ? 1 : $this->fail();
+        return $this->db->table($this->table)->where('timestamp <', "now() - INTERVAL {$interval}", false)->delete() ? true : $this->fail();
     }
 
     /**
diff --git a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
index 07b61cdd2451..5b414de228a7 100644
--- a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
+++ b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
@@ -127,6 +127,31 @@ public function up()
             'ip'  => ['type' => 'VARCHAR', 'constraint' => 100],
             'ip2' => ['type' => 'VARCHAR', 'constraint' => 100],
         ])->createTable('ip_table', true);
+
+        // Database session table
+        if ($this->db->DBDriver === 'MySQLi') {
+            $this->forge->addField([
+                'id'         => ['type' => 'VARCHAR', 'constraint' => 128, 'null' => false],
+                'ip_address' => ['type' => 'VARCHAR', 'constraint' => 45, 'null' => false],
+                'timestamp timestamp DEFAULT CURRENT_TIMESTAMP NOT NULL',
+                'data' => ['type' => 'BLOB', 'null' => false],
+            ]);
+            $this->forge->addKey('id', true);
+            $this->forge->addKey('timestamp');
+            $this->forge->createTable('ci_sessions', true);
+        }
+
+        if ($this->db->DBDriver === 'Postgre') {
+            $this->forge->addField([
+                'id' => ['type' => 'VARCHAR', 'constraint' => 128, 'null' => false],
+                'ip_address inet NOT NULL',
+                'timestamp timestamptz DEFAULT CURRENT_TIMESTAMP NOT NULL',
+                "data bytea DEFAULT '' NOT NULL",
+            ]);
+            $this->forge->addKey('id', true);
+            $this->forge->addKey('timestamp');
+            $this->forge->createTable('ci_sessions', true);
+        }
     }
 
     public function down()
@@ -140,5 +165,9 @@ public function down()
         $this->forge->dropTable('stringifypkey', true);
         $this->forge->dropTable('without_auto_increment', true);
         $this->forge->dropTable('ip_table', true);
+
+        if (in_array($this->db->DBDriver, ['MySQLi', 'Postgre'], true)) {
+            $this->forge->dropTable('ci_sessions', true);
+        }
     }
 }
diff --git a/tests/_support/Database/Seeds/CITestSeeder.php b/tests/_support/Database/Seeds/CITestSeeder.php
index 0319896159ab..ae4b2af3b0b7 100644
--- a/tests/_support/Database/Seeds/CITestSeeder.php
+++ b/tests/_support/Database/Seeds/CITestSeeder.php
@@ -146,6 +146,24 @@ public function run()
             );
         }
 
+        if ($this->db->DBDriver === 'MySQLi') {
+            $data['ci_sessions'][] = [
+                'id'         => '1f5o06b43phsnnf8if6bo33b635e4p2o',
+                'ip_address' => '127.0.0.1',
+                'timestamp'  => '2021-06-25 21:54:14',
+                'data'       => '__ci_last_regenerate|i:1624650854;_ci_previous_url|s:40:\"http://localhost/index.php/home/index\";',
+            ];
+        }
+
+        if ($this->db->DBDriver === 'Postgre') {
+            $data['ci_sessions'][] = [
+                'id'         => '1f5o06b43phsnnf8if6bo33b635e4p2o',
+                'ip_address' => '127.0.0.1',
+                'timestamp'  => '2021-06-25 21:54:14.991403+02',
+                'data'       => '\x' . bin2hex('__ci_last_regenerate|i:1624650854;_ci_previous_url|s:40:\"http://localhost/index.php/home/index\";'),
+            ];
+        }
+
         foreach ($data as $table => $dummy_data) {
             $this->db->table($table)->truncate();
 
diff --git a/tests/system/Database/Live/MetadataTest.php b/tests/system/Database/Live/MetadataTest.php
index e59b28f7b724..8c6806c4d86e 100644
--- a/tests/system/Database/Live/MetadataTest.php
+++ b/tests/system/Database/Live/MetadataTest.php
@@ -52,6 +52,10 @@ protected function setUp(): void
             $prefix . 'without_auto_increment',
             $prefix . 'ip_table',
         ];
+
+        if (in_array($this->db->DBDriver, ['MySQLi', 'Postgre'], true)) {
+            $this->expectedTables[] = $prefix . 'ci_sessions';
+        }
     }
 
     public function testListTables()
diff --git a/tests/system/Session/Handlers/DatabaseHandlerTest.php b/tests/system/Session/Handlers/DatabaseHandlerTest.php
new file mode 100644
index 000000000000..7e69bf8e6c73
--- /dev/null
+++ b/tests/system/Session/Handlers/DatabaseHandlerTest.php
@@ -0,0 +1,141 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Session\Handlers;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use CodeIgniter\Test\ReflectionHelper;
+use Config\App as AppConfig;
+use Config\Database as DatabaseConfig;
+
+/**
+ * @internal
+ */
+final class DatabaseHandlerTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+    use ReflectionHelper;
+
+    protected $refresh = true;
+
+    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        if (! in_array(config(DatabaseConfig::class)->tests['DBDriver'], ['MySQLi', 'Postgre'], true)) {
+            $this->markTestSkipped('Database Session Handler requires database driver to be MySQLi or Postgre');
+        }
+    }
+
+    protected function getInstance($options = [])
+    {
+        $defaults = [
+            'sessionDriver'            => 'CodeIgniter\Session\Handlers\DatabaseHandler',
+            'sessionCookieName'        => 'ci_session',
+            'sessionExpiration'        => 7200,
+            'sessionSavePath'          => 'ci_sessions',
+            'sessionMatchIP'           => false,
+            'sessionTimeToUpdate'      => 300,
+            'sessionRegenerateDestroy' => false,
+            'cookieDomain'             => '',
+            'cookiePrefix'             => '',
+            'cookiePath'               => '/',
+            'cookieSecure'             => false,
+            'cookieSameSite'           => 'Lax',
+        ];
+
+        $config    = array_merge($defaults, $options);
+        $appConfig = new AppConfig();
+
+        foreach ($config as $key => $c) {
+            $appConfig->{$key} = $c;
+        }
+
+        return new DatabaseHandler($appConfig, '127.0.0.1');
+    }
+
+    public function testOpen()
+    {
+        $handler = $this->getInstance();
+        $this->assertTrue($handler->open('ci_sessions', 'ci_session'));
+    }
+
+    public function testReadSuccess()
+    {
+        $handler  = $this->getInstance();
+        $expected = '__ci_last_regenerate|i:1624650854;_ci_previous_url|s:40:\"http://localhost/index.php/home/index\";';
+        $this->assertSame($expected, $handler->read('1f5o06b43phsnnf8if6bo33b635e4p2o'));
+
+        $this->assertTrue($this->getPrivateProperty($handler, 'rowExists'));
+        $this->assertSame('1483201a66afd2bd671e4a67dc6ecf24', $this->getPrivateProperty($handler, 'fingerprint'));
+    }
+
+    public function testReadFailure()
+    {
+        $handler = $this->getInstance();
+        $this->assertSame('', $handler->read('123456b43phsnnf8if6bo33b635e4321'));
+
+        $this->assertFalse($this->getPrivateProperty($handler, 'rowExists'));
+        $this->assertSame('d41d8cd98f00b204e9800998ecf8427e', $this->getPrivateProperty($handler, 'fingerprint'));
+    }
+
+    public function testWriteInsert()
+    {
+        $handler = $this->getInstance();
+
+        $this->setPrivateProperty($handler, 'lock', true);
+
+        $data = '__ci_last_regenerate|i:1624650854;_ci_previous_url|s:40:\"http://localhost/index.php/home/index\";';
+        $this->assertTrue($handler->write('555556b43phsnnf8if6bo33b635e4444', $data));
+
+        $this->setPrivateProperty($handler, 'lock', false);
+
+        $row = $this->db->table('ci_sessions')
+            ->getWhere(['id' => '555556b43phsnnf8if6bo33b635e4444'])
+            ->getRow();
+
+        $this->assertGreaterThan(time() - 100, strtotime($row->timestamp));
+        $this->assertSame('1483201a66afd2bd671e4a67dc6ecf24', $this->getPrivateProperty($handler, 'fingerprint'));
+    }
+
+    public function testWriteUpdate()
+    {
+        $handler = $this->getInstance();
+
+        $this->setPrivateProperty($handler, 'sessionID', '1f5o06b43phsnnf8if6bo33b635e4p2o');
+        $this->setPrivateProperty($handler, 'rowExists', true);
+
+        $lockSession = $this->getPrivateMethodInvoker($handler, 'lockSession');
+        $lockSession('1f5o06b43phsnnf8if6bo33b635e4p2o');
+
+        $data = '__ci_last_regenerate|i:1624650854;_ci_previous_url|s:40:\"http://localhost/index.php/home/index\";';
+        $this->assertTrue($handler->write('1f5o06b43phsnnf8if6bo33b635e4p2o', $data));
+
+        $releaseLock = $this->getPrivateMethodInvoker($handler, 'releaseLock');
+        $releaseLock();
+
+        $row = $this->db->table('ci_sessions')
+            ->getWhere(['id' => '1f5o06b43phsnnf8if6bo33b635e4p2o'])
+            ->getRow();
+
+        $this->assertGreaterThan(time() - 100, strtotime($row->timestamp));
+        $this->assertSame('1483201a66afd2bd671e4a67dc6ecf24', $this->getPrivateProperty($handler, 'fingerprint'));
+    }
+
+    public function testGC()
+    {
+        $handler = $this->getInstance();
+        $this->assertTrue($handler->gc(3600));
+    }
+}

From 860003281275d68dd3b849a783036b5293452cf8 Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Sat, 26 Jun 2021 11:14:18 +0200
Subject: [PATCH 0181/2325] Fix for generating session table structure via
 migrations

---
 .../Generators/MigrationGenerator.php         |  9 +++----
 .../Generators/Views/migration.tpl.php        | 24 ++++++++++++-------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/system/Commands/Generators/MigrationGenerator.php b/system/Commands/Generators/MigrationGenerator.php
index 1cd931e9e460..24ab3ea72330 100644
--- a/system/Commands/Generators/MigrationGenerator.php
+++ b/system/Commands/Generators/MigrationGenerator.php
@@ -101,10 +101,11 @@ protected function prepare(string $class): string
             $table   = $this->getOption('table');
             $DBGroup = $this->getOption('dbgroup');
 
-            $data['session'] = true;
-            $data['table']   = is_string($table) ? $table : 'ci_sessions';
-            $data['DBGroup'] = is_string($DBGroup) ? $DBGroup : 'default';
-            $data['matchIP'] = config('App')->sessionMatchIP;
+            $data['session']  = true;
+            $data['table']    = is_string($table) ? $table : 'ci_sessions';
+            $data['DBGroup']  = is_string($DBGroup) ? $DBGroup : 'default';
+            $data['DBDriver'] = config('Database')->{$data['DBGroup']}['DBDriver'];
+            $data['matchIP']  = config('App')->sessionMatchIP;
         }
 
         return $this->parseTemplate($class, [], [], $data);
diff --git a/system/Commands/Generators/Views/migration.tpl.php b/system/Commands/Generators/Views/migration.tpl.php
index 436ee85e04cc..321895e670c2 100644
--- a/system/Commands/Generators/Views/migration.tpl.php
+++ b/system/Commands/Generators/Views/migration.tpl.php
@@ -12,17 +12,23 @@ class {class} extends Migration
     public function up()
     {
         $this->forge->addField([
-            'id'         => ['type' => 'VARCHAR', 'constraint' => 128, 'null' => false],
+            'id' => ['type' => 'VARCHAR', 'constraint' => 128, 'null' => false],
+<?php if ($DBDriver === 'MySQLi'): ?>
             'ip_address' => ['type' => 'VARCHAR', 'constraint' => 45, 'null' => false],
-            'timestamp'  => ['type' => 'INT', 'unsigned' => true, 'null' => false, 'default' => 0],
-            'data'       => ['type' => 'TEXT', 'null' => false, 'default' => ''],
+            'timestamp timestamp DEFAULT CURRENT_TIMESTAMP NOT NULL',
+            'data' => ['type' => 'BLOB', 'null' => false],
+ <?php elseif ($DBDriver === 'Postgre'): ?>
+            'ip_address inet NOT NULL',
+            'timestamp timestamptz DEFAULT CURRENT_TIMESTAMP NOT NULL',
+            "data bytea DEFAULT '' NOT NULL",
+<?php endif; ?>
         ]);
-    <?php if ($matchIP) : ?>
-    $this->forge->addKey(['id', 'ip_address'], true);
-    <?php else: ?>
-    $this->forge->addKey('id', true);
-    <?php endif ?>
-    $this->forge->addKey('timestamp');
+<?php if ($matchIP) : ?>
+        $this->forge->addKey(['id', 'ip_address'], true);
+<?php else: ?>
+        $this->forge->addKey('id', true);
+<?php endif ?>
+        $this->forge->addKey('timestamp');
         $this->forge->createTable('<?= $table ?>', true);
     }
 

From bacda111b9a1cfe019de22a0420493ac39f80b21 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Sun, 13 Jun 2021 23:05:43 +0000
Subject: [PATCH 0182/2325] Implement FileCollection

---
 system/Files/Exceptions/FileException.php     |  20 +
 system/Files/FileCollection.php               | 386 +++++++++++++
 system/Language/en/Files.php                  |   6 +-
 system/Language/en/Publisher.php              |   2 -
 .../Exceptions/PublisherException.php         |  20 -
 system/Publisher/Publisher.php                | 308 +---------
 tests/system/Files/FileCollectionTest.php     | 536 ++++++++++++++++++
 tests/system/Publisher/PublisherInputTest.php | 338 +----------
 .../system/Publisher/PublisherSupportTest.php |  68 +--
 user_guide_src/source/libraries/files.rst     |  96 ++++
 user_guide_src/source/libraries/publisher.rst |  56 +-
 11 files changed, 1066 insertions(+), 770 deletions(-)
 create mode 100644 system/Files/FileCollection.php
 create mode 100644 tests/system/Files/FileCollectionTest.php

diff --git a/system/Files/Exceptions/FileException.php b/system/Files/Exceptions/FileException.php
index bbbdc1a3cbb1..40e9fdc20f41 100644
--- a/system/Files/Exceptions/FileException.php
+++ b/system/Files/Exceptions/FileException.php
@@ -23,4 +23,24 @@ public static function forUnableToMove(?string $from = null, ?string $to = null,
     {
         return new static(lang('Files.cannotMove', [$from, $to, $error]));
     }
+
+	/**
+	 * Throws when an item is expected to be a directory but is not or is missing.
+	 *
+	 * @param string $caller The method causing the exception
+	 */
+	public static function forExpectedDirectory(string $caller)
+	{
+		return new static(lang('Files.expectedDirectory', [$caller]));
+	}
+
+	/**
+	 * Throws when an item is expected to be a file but is not or is missing.
+	 *
+	 * @param string $caller The method causing the exception
+	 */
+	public static function forExpectedFile(string $caller)
+	{
+		return new static(lang('Files.expectedFile', [$caller]));
+	}
 }
diff --git a/system/Files/FileCollection.php b/system/Files/FileCollection.php
new file mode 100644
index 000000000000..bf4eeaf6b836
--- /dev/null
+++ b/system/Files/FileCollection.php
@@ -0,0 +1,386 @@
+<?php
+
+/**
+ * This file is part of the CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Files;
+
+use CodeIgniter\Files\Exceptions\FileException;
+use CodeIgniter\Files\Exceptions\FileNotFoundException;
+use Countable;
+use Generator;
+use InvalidArgumentException;
+use IteratorAggregate;
+use Traversable;
+
+/**
+ * File Collection Class
+ *
+ * Representation for a group of files, with utilities for locating,
+ * filtering, and ordering them.
+ */
+class FileCollection implements Countable, IteratorAggregate
+{
+	/**
+	 * The current list of file paths.
+	 *
+	 * @var string[]
+	 */
+	protected $files = [];
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Resolves a full path and verifies it is an actual directory.
+	 *
+	 * @param string $directory
+	 *
+	 * @return string
+	 *
+	 * @throws FileException
+	 */
+	protected static function resolveDirectory(string $directory): string
+	{
+		if (! is_dir($directory = set_realpath($directory)))
+		{
+			$caller = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1];
+			throw FileException::forExpectedDirectory($caller['function']);
+		}
+
+		return $directory;
+	}
+
+	/**
+	 * Resolves a full path and verifies it is an actual file.
+	 *
+	 * @param string $file
+	 *
+	 * @return string
+	 *
+	 * @throws FileException
+	 */
+	protected static function resolveFile(string $file): string
+	{
+		if (! is_file($file = set_realpath($file)))
+		{
+			$caller = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1];
+			throw FileException::forExpectedFile($caller['function']);
+		}
+
+		return $file;
+	}
+
+	/**
+	 * Removes files that are not part of the given directory (recursive).
+	 *
+	 * @param string[] $files
+	 * @param string   $directory
+	 *
+	 * @return string[]
+	 */
+	protected static function filterFiles(array $files, string $directory): array
+	{
+		$directory = self::resolveDirectory($directory);
+
+		return array_filter($files, function ($value) use ($directory) {
+			return strpos($value, $directory) === 0;
+		});
+	}
+
+	/**
+	 * Returns any files whose `basename` matches the given pattern.
+	 *
+	 * @param string[] $files
+	 * @param string   $pattern Regex or pseudo-regex string
+	 *
+	 * @return string[]
+	 */
+	protected static function matchFiles(array $files, string $pattern): array
+	{
+		// Convert pseudo-regex into their true form
+		if (@preg_match($pattern, null) === false) // @phpstan-ignore-line
+		{
+			$pattern = str_replace(
+				['#', '.', '*', '?'],
+				['\#', '\.', '.*', '.'],
+				$pattern
+			);
+			$pattern = "#{$pattern}#";
+		}
+
+		return array_filter($files, function ($value) use ($pattern) {
+			return (bool) preg_match($pattern, basename($value));
+		});
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Loads the Filesystem helper and stores initial files.
+	 *
+	 * @param string[] $files
+	 */
+	public function __construct(array $files = [])
+	{
+		helper(['filesystem']);
+
+		$this->set($files);
+	}
+
+	/**
+	 * Optimizes and returns the current file list.
+	 *
+	 * @return string[]
+	 */
+	public function get(): array
+	{
+		$this->files = array_unique($this->files, SORT_STRING);
+		sort($this->files, SORT_STRING);
+
+		return $this->files;
+	}
+
+	/**
+	 * Sets the file list directly, files are still subject to verification.
+	 * This works as a "reset" method with [].
+	 *
+	 * @param string[] $files The new file list to use
+	 *
+	 * @return $this
+	 */
+	public function set(array $files)
+	{
+		$this->files = [];
+
+		return $this->addFiles($files);
+	}
+
+	/**
+	 * Adds an array/single file or directory to the list.
+	 *
+	 * @param string|string[] $paths
+	 * @param boolean         $recursive
+	 *
+	 * @return $this
+	 */
+	public function add($paths, bool $recursive = true)
+	{
+		if (! is_array($paths))
+		{
+			$paths = [$paths];
+		}
+
+		foreach ($paths as $path)
+		{
+			if (! is_string($path))
+			{
+				throw new InvalidArgumentException('FileCollection paths must be strings.');
+			}
+
+			// Test for a directory
+			try
+			{
+				$directory = self::resolveDirectory($path);
+			}
+			catch (FileException $e)
+			{
+				return $this->addFile($path);
+			}
+
+			$this->addDirectory($path, $recursive);
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Verifies and adds files to the list.
+	 *
+	 * @param string[] $files
+	 *
+	 * @return $this
+	 */
+	public function addFiles(array $files)
+	{
+		foreach ($files as $file)
+		{
+			$this->addFile($file);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Verifies and adds a single file to the file list.
+	 *
+	 * @param string $file
+	 *
+	 * @return $this
+	 */
+	public function addFile(string $file)
+	{
+		$this->files[] = self::resolveFile($file);
+
+		return $this;
+	}
+
+	/**
+	 * Removes files from the list.
+	 *
+	 * @param string[] $files
+	 *
+	 * @return $this
+	 */
+	public function removeFiles(array $files)
+	{
+		$this->files = array_diff($this->files, $files);
+
+		return $this;
+	}
+
+	/**
+	 * Removes a single file from the list.
+	 *
+	 * @param string $file
+	 *
+	 * @return $this
+	 */
+	public function removeFile(string $file)
+	{
+		return $this->removeFiles([$file]);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Verifies and adds files from each
+	 * directory to the list.
+	 *
+	 * @param string[] $directories
+	 * @param bool $recursive
+	 *
+	 * @return $this
+	 */
+	public function addDirectories(array $directories, bool $recursive = false)
+	{
+		foreach ($directories as $directory)
+		{
+			$this->addDirectory($directory, $recursive);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Verifies and adds all files from a directory.
+	 *
+	 * @param string  $directory
+	 * @param boolean $recursive
+	 *
+	 * @return $this
+	 */
+	public function addDirectory(string $directory, bool $recursive = false)
+	{
+		$directory = self::resolveDirectory($directory);
+
+		// Map the directory to depth 2 to so directories become arrays
+		foreach (directory_map($directory, 2, true) as $key => $path)
+		{
+			if (is_string($path))
+			{
+				$this->addFile($directory . $path);
+			}
+			elseif ($recursive && is_array($path))
+			{
+				$this->addDirectory($directory . $key, true);
+			}
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Removes any files from the list that match the supplied pattern
+	 * (within the optional scope).
+	 *
+	 * @param string      $pattern Regex or pseudo-regex string
+	 * @param string|null $scope The directory to limit the scope
+	 *
+	 * @return $this
+	 */
+	public function removePattern(string $pattern, string $scope = null)
+	{
+		if ($pattern === '')
+		{
+			return $this;
+		}
+
+		// Start with all files or those in scope
+		$files = is_null($scope) ? $this->files : self::filterFiles($this->files, $scope);
+
+		// Remove any files that match the pattern
+		return $this->removeFiles(self::matchFiles($files, $pattern));
+	}
+
+	/**
+	 * Keeps only the files from the list that match
+	 * (within the optional scope).
+	 *
+	 * @param string      $pattern Regex or pseudo-regex string
+	 * @param string|null $scope A directory to limit the scope
+	 *
+	 * @return $this
+	 */
+	public function retainPattern(string $pattern, string $scope = null)
+	{
+		if ($pattern === '')
+		{
+			return $this;
+		}
+
+		// Start with all files or those in scope
+		$files = is_null($scope) ? $this->files : self::filterFiles($this->files, $scope);
+
+		// Matches the pattern within the scoped files and remove their inverse.
+		return $this->removeFiles(array_diff($files, self::matchFiles($files, $pattern)));
+	}
+
+	//--------------------------------------------------------------------
+
+    /**
+     * Returns the current number of files in the collection.
+     * Fulfills Countable.
+     *
+     * @return int
+     */
+    public function count(): int
+    {
+        return count($this->files);
+    }
+
+    /**
+     * Yields as an Iterator for the current files.
+     * Fulfills IteratorAggregate.
+     *
+     * @throws FileNotFoundException
+     *
+     * @return Generator<File>
+     */
+    public function getIterator(): Generator
+    {
+    	foreach ($this->get() as $file)
+    	{
+    		yield new File($file, true);
+    	}
+    }
+}
diff --git a/system/Language/en/Files.php b/system/Language/en/Files.php
index 924e98ea354a..bcbc39d7e349 100644
--- a/system/Language/en/Files.php
+++ b/system/Language/en/Files.php
@@ -11,6 +11,8 @@
 
 // Files language settings
 return [
-    'fileNotFound' => 'File not found: {0}',
-    'cannotMove'   => 'Could not move file {0} to {1} ({2}).',
+    'fileNotFound'      => 'File not found: {0}',
+    'cannotMove'        => 'Could not move file {0} to {1} ({2}).',
+	'expectedDirectory' => '{0} expects a valid directory.',
+	'expectedFile'      => '{0} expects a valid file.',
 ];
diff --git a/system/Language/en/Publisher.php b/system/Language/en/Publisher.php
index 2d7ae8418b25..77d805a78ff2 100644
--- a/system/Language/en/Publisher.php
+++ b/system/Language/en/Publisher.php
@@ -12,8 +12,6 @@
 // Publisher language settings
 return [
 	'collision'             => 'Publisher encountered an unexpected {0} while copying {1} to {2}.',
-	'expectedDirectory'     => 'Publisher::{0} expects a valid directory.',
-	'expectedFile'          => 'Publisher::{0} expects a valid file.',
 	'destinationNotAllowed' => 'Destination is not on the allowed list of Publisher directories: {0}',
 	'fileNotAllowed'        => '{0} fails the following restriction for {1}: {2}',
 
diff --git a/system/Publisher/Exceptions/PublisherException.php b/system/Publisher/Exceptions/PublisherException.php
index d54420881ec7..c3e85a994ebe 100644
--- a/system/Publisher/Exceptions/PublisherException.php
+++ b/system/Publisher/Exceptions/PublisherException.php
@@ -31,26 +31,6 @@ public static function forCollision(string $from, string $to)
 		return new static(lang('Publisher.collision', [filetype($to), $from, $to]));
 	}
 
-	/**
-	 * Throws when an object is expected to be a directory but is not or is missing.
-	 *
-	 * @param string $caller The method causing the exception
-	 */
-	public static function forExpectedDirectory(string $caller)
-	{
-		return new static(lang('Publisher.expectedDirectory', [$caller]));
-	}
-
-	/**
-	 * Throws when an object is expected to be a file but is not or is missing.
-	 *
-	 * @param string $caller The method causing the exception
-	 */
-	public static function forExpectedFile(string $caller)
-	{
-		return new static(lang('Publisher.expectedFile', [$caller]));
-	}
-
 	/**
 	 * Throws when given a destination that is not in the list of allowed directories.
 	 *
diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php
index 1bfd4b91768d..1f28bc331baf 100644
--- a/system/Publisher/Publisher.php
+++ b/system/Publisher/Publisher.php
@@ -12,7 +12,7 @@
 namespace CodeIgniter\Publisher;
 
 use CodeIgniter\Autoloader\FileLocator;
-use CodeIgniter\Files\File;
+use CodeIgniter\Files\FileCollection;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\Publisher\Exceptions\PublisherException;
 use RuntimeException;
@@ -28,13 +28,13 @@
  * path to a verified file while a "path" is relative to its source
  * or destination and may indicate either a file or directory of
  * unconfirmed existence.
- * class failures throw the PublisherException, but some underlying
+ * Class failures throw the PublisherException, but some underlying
  * methods may percolate different exceptions, like FileException,
  * FileNotFoundException or InvalidArgumentException.
  * Write operations will catch all errors in the file-specific
  * $errors property to minimize impact of partial batch operations.
  */
-class Publisher
+class Publisher extends FileCollection
 {
 	/**
 	 * Array of discovered Publishers.
@@ -51,13 +51,6 @@ class Publisher
 	 */
 	private $scratch;
 
-	/**
-	 * The current list of files.
-	 *
-	 * @var string[]
-	 */
-	private $files = [];
-
 	/**
 	 * Exceptions for specific files from the last write operation.
 	 *
@@ -94,6 +87,8 @@ class Publisher
 	 */
 	protected $destination = FCPATH;
 
+	//--------------------------------------------------------------------
+
 	/**
 	 * Discovers and returns all Publishers in the specified namespace directory.
 	 *
@@ -134,95 +129,6 @@ final public static function discover(string $directory = 'Publishers'): array
 		return self::$discovered[$directory];
 	}
 
-	//--------------------------------------------------------------------
-
-	/**
-	 * Resolves a full path and verifies it is an actual directory.
-	 *
-	 * @param string $directory
-	 *
-	 * @return string
-	 *
-	 * @throws PublisherException
-	 */
-	private static function resolveDirectory(string $directory): string
-	{
-		if (! is_dir($directory = set_realpath($directory)))
-		{
-			$caller = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1];
-			throw PublisherException::forExpectedDirectory($caller['function']);
-		}
-
-		return $directory;
-	}
-
-	/**
-	 * Resolves a full path and verifies it is an actual file.
-	 *
-	 * @param string $file
-	 *
-	 * @return string
-	 *
-	 * @throws PublisherException
-	 */
-	private static function resolveFile(string $file): string
-	{
-		if (! is_file($file = set_realpath($file)))
-		{
-			$caller = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1];
-			throw PublisherException::forExpectedFile($caller['function']);
-		}
-
-		return $file;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Removes files that are not part of the given directory (recursive).
-	 *
-	 * @param string[] $files
-	 * @param string   $directory
-	 *
-	 * @return string[]
-	 */
-	private static function filterFiles(array $files, string $directory): array
-	{
-		$directory = self::resolveDirectory($directory);
-
-		return array_filter($files, function ($value) use ($directory) {
-			return strpos($value, $directory) === 0;
-		});
-	}
-
-	/**
-	 * Returns any files whose `basename` matches the given pattern.
-	 *
-	 * @param array<string> $files
-	 * @param string        $pattern Regex or pseudo-regex string
-	 *
-	 * @return string[]
-	 */
-	private static function matchFiles(array $files, string $pattern): array
-	{
-		// Convert pseudo-regex into their true form
-		if (@preg_match($pattern, null) === false) // @phpstan-ignore-line
-		{
-			$pattern = str_replace(
-				['#', '.', '*', '?'],
-				['\#', '\.', '.*', '.'],
-				$pattern
-			);
-			$pattern = "#{$pattern}#";
-		}
-
-		return array_filter($files, function ($value) use ($pattern) {
-			return (bool) preg_match($pattern, basename($value));
-		});
-	}
-
-	//--------------------------------------------------------------------
-
 	/*
 	 * Removes a directory and all its files and subdirectories.
 	 *
@@ -305,7 +211,7 @@ public function publish(): bool
 		// Safeguard against accidental misuse
 		if ($this->source === ROOTPATH && $this->destination === FCPATH)
 		{
-			throw new RuntimeException('Child classes of Publisher should provide their own source and destination or publish method.');
+			throw new RuntimeException('Child classes of Publisher should provide their own publish method or a source and destination.');
 		}
 
 		return $this->addPath('/')->merge(true);
@@ -369,142 +275,6 @@ final public function getPublished(): array
 		return $this->published;
 	}
 
-	/**
-	 * Optimizes and returns the current file list.
-	 *
-	 * @return string[]
-	 */
-	final public function getFiles(): array
-	{
-		$this->files = array_unique($this->files, SORT_STRING);
-		sort($this->files, SORT_STRING);
-
-		return $this->files;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Sets the file list directly, files are still subject to verification.
-	 * This works as a "reset" method with [].
-	 *
-	 * @param string[] $files The new file list to use
-	 *
-	 * @return $this
-	 */
-	final public function setFiles(array $files)
-	{
-		$this->files = [];
-
-		return $this->addFiles($files);
-	}
-
-	/**
-	 * Verifies and adds files to the list.
-	 *
-	 * @param string[] $files
-	 *
-	 * @return $this
-	 */
-	final public function addFiles(array $files)
-	{
-		foreach ($files as $file)
-		{
-			$this->addFile($file);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Verifies and adds a single file to the file list.
-	 *
-	 * @param string $file
-	 *
-	 * @return $this
-	 */
-	final public function addFile(string $file)
-	{
-		$this->files[] = self::resolveFile($file);
-
-		return $this;
-	}
-
-	/**
-	 * Removes files from the list.
-	 *
-	 * @param string[] $files
-	 *
-	 * @return $this
-	 */
-	final public function removeFiles(array $files)
-	{
-		$this->files = array_diff($this->files, $files);
-
-		return $this;
-	}
-
-	/**
-	 * Removes a single file from the list.
-	 *
-	 * @param string $file
-	 *
-	 * @return $this
-	 */
-	final public function removeFile(string $file)
-	{
-		return $this->removeFiles([$file]);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Verifies and adds files from each
-	 * directory to the list.
-	 *
-	 * @param string[] $directories
-	 * @param bool $recursive
-	 *
-	 * @return $this
-	 */
-	final public function addDirectories(array $directories, bool $recursive = false)
-	{
-		foreach ($directories as $directory)
-		{
-			$this->addDirectory($directory, $recursive);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Verifies and adds all files from a directory.
-	 *
-	 * @param string  $directory
-	 * @param boolean $recursive
-	 *
-	 * @return $this
-	 */
-	final public function addDirectory(string $directory, bool $recursive = false)
-	{
-		$directory = self::resolveDirectory($directory);
-
-		// Map the directory to depth 2 to so directories become arrays
-		foreach (directory_map($directory, 2, true) as $key => $path)
-		{
-			if (is_string($path))
-			{
-				$this->addFile($directory . $path);
-			}
-			elseif ($recursive && is_array($path))
-			{
-				$this->addDirectory($directory . $key, true);
-			}
-		}
-
-		return $this;
-	}
-
 	//--------------------------------------------------------------------
 
 	/**
@@ -535,19 +305,9 @@ final public function addPaths(array $paths, bool $recursive = true)
 	 */
 	final public function addPath(string $path, bool $recursive = true)
 	{
-		$full = $this->source . $path;
-
-		// Test for a directory
-		try
-		{
-			$directory = self::resolveDirectory($full);
-		}
-		catch (PublisherException $e)
-		{
-			return $this->addFile($full);
-		}
+		$this->add($this->source . $path, $recursive);
 
-		return $this->addDirectory($full, $recursive);
+		return $this;
 	}
 
 	//--------------------------------------------------------------------
@@ -589,54 +349,6 @@ final public function addUri(string $uri)
 
 	//--------------------------------------------------------------------
 
-	/**
-	 * Removes any files from the list that match the supplied pattern
-	 * (within the optional scope).
-	 *
-	 * @param string      $pattern Regex or pseudo-regex string
-	 * @param string|null $scope The directory to limit the scope
-	 *
-	 * @return $this
-	 */
-	final public function removePattern(string $pattern, string $scope = null)
-	{
-		if ($pattern === '')
-		{
-			return $this;
-		}
-
-		// Start with all files or those in scope
-		$files = is_null($scope) ? $this->files : self::filterFiles($this->files, $scope);
-
-		// Remove any files that match the pattern
-		return $this->removeFiles(self::matchFiles($files, $pattern));
-	}
-
-	/**
-	 * Keeps only the files from the list that match
-	 * (within the optional scope).
-	 *
-	 * @param string      $pattern Regex or pseudo-regex string
-	 * @param string|null $scope A directory to limit the scope
-	 *
-	 * @return $this
-	 */
-	final public function retainPattern(string $pattern, string $scope = null)
-	{
-		if ($pattern === '')
-		{
-			return $this;
-		}
-
-		// Start with all files or those in scope
-		$files = is_null($scope) ? $this->files : self::filterFiles($this->files, $scope);
-
-		// Matches the pattern within the scoped files and remove their inverse.
-		return $this->removeFiles(array_diff($files, self::matchFiles($files, $pattern)));
-	}
-
-	//--------------------------------------------------------------------
-
 	/**
 	 * Removes the destination and all its files and folders.
 	 *
@@ -662,7 +374,7 @@ final public function copy(bool $replace = true): bool
 	{
 		$this->errors = $this->published = [];
 
-		foreach ($this->getFiles() as $file)
+		foreach ($this->get() as $file)
 		{
 			$to = $this->destination . basename($file);
 
@@ -693,7 +405,7 @@ final public function merge(bool $replace = true): bool
 		$this->errors = $this->published = [];
 
 		// Get the files from source for special handling
-		$sourced = self::filterFiles($this->getFiles(), $this->source);
+		$sourced = self::filterFiles($this->get(), $this->source);
 
 		// Handle everything else with a flat copy
 		$this->files = array_diff($this->files, $sourced);
diff --git a/tests/system/Files/FileCollectionTest.php b/tests/system/Files/FileCollectionTest.php
new file mode 100644
index 000000000000..3e77941d5d2f
--- /dev/null
+++ b/tests/system/Files/FileCollectionTest.php
@@ -0,0 +1,536 @@
+<?php
+
+use CodeIgniter\Files\Exceptions\FileException;
+use CodeIgniter\Files\File;
+use CodeIgniter\Files\FileCollection;
+use CodeIgniter\Test\CIUnitTestCase;
+
+class FileCollectionTest extends CIUnitTestCase
+{
+	/**
+	 * A known, valid file
+	 *
+	 * @var string
+	 */
+	private $file = SUPPORTPATH . 'Files/baker/banana.php';
+
+	/**
+	 * A known, valid directory
+	 *
+	 * @var string
+	 */
+	private $directory = SUPPORTPATH . 'Files/able/';
+
+	/**
+	 * Initialize the helper, since some
+	 * tests call static methods before
+	 * the constructor would load it.
+	 */
+	public static function setUpBeforeClass(): void
+	{
+		parent::setUpBeforeClass();
+
+		helper(['filesystem']);
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testResolveDirectoryDirectory()
+	{
+		$method = $this->getPrivateMethodInvoker(FileCollection::class, 'resolveDirectory');
+
+		$this->assertSame($this->directory, $method($this->directory));
+	}
+
+	public function testResolveDirectoryFile()
+	{
+		$method = $this->getPrivateMethodInvoker(FileCollection::class, 'resolveDirectory');
+
+		$this->expectException(FileException::class);
+		$this->expectExceptionMessage(lang('Files.expectedDirectory', ['invokeArgs']));
+
+		$method($this->file);
+	}
+
+	public function testResolveDirectorySymlink()
+	{
+		// Create a symlink to test
+		$link = sys_get_temp_dir() . DIRECTORY_SEPARATOR . bin2hex(random_bytes(4));
+		symlink($this->directory, $link);
+
+		$method = $this->getPrivateMethodInvoker(FileCollection::class, 'resolveDirectory');
+
+		$this->assertSame($this->directory, $method($link));
+
+		unlink($link);
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testResolveFileFile()
+	{
+		$method = $this->getPrivateMethodInvoker(FileCollection::class, 'resolveFile');
+
+		$this->assertSame($this->file, $method($this->file));
+	}
+
+	public function testResolveFileSymlink()
+	{
+		// Create a symlink to test
+		$link = sys_get_temp_dir() . DIRECTORY_SEPARATOR . bin2hex(random_bytes(4));
+		symlink($this->file, $link);
+
+		$method = $this->getPrivateMethodInvoker(FileCollection::class, 'resolveFile');
+
+		$this->assertSame($this->file, $method($link));
+
+		unlink($link);
+	}
+
+	public function testResolveFileDirectory()
+	{
+		$method = $this->getPrivateMethodInvoker(FileCollection::class, 'resolveFile');
+
+		$this->expectException(FileException::class);
+		$this->expectExceptionMessage(lang('Files.expectedFile', ['invokeArgs']));
+
+		$method($this->directory);
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testAddStringFile()
+	{
+		$files = new FileCollection();
+
+		$files->add(SUPPORTPATH . 'Files/baker/banana.php');
+
+		$this->assertSame([$this->file], $files->get());
+	}
+
+	public function testAddStringFileRecursiveDoesNothing()
+	{
+		$files = new FileCollection();
+
+		$files->add(SUPPORTPATH . 'Files/baker/banana.php', true);
+
+		$this->assertSame([$this->file], $files->get());
+	}
+
+	public function testAddStringDirectory()
+	{
+		$files = new FileCollection();
+
+		$expected = [
+			$this->directory . 'apple.php',
+			$this->directory . 'fig_3.php',
+			$this->directory . 'prune_ripe.php',
+		];
+
+		$files->add(SUPPORTPATH . 'Files/able');
+
+		$this->assertSame($expected, $files->get());
+	}
+
+	public function testAddStringDirectoryRecursive()
+	{
+		$files = new FileCollection();
+
+		$expected = [
+			$this->directory . 'apple.php',
+			$this->directory . 'fig_3.php',
+			$this->directory . 'prune_ripe.php',
+			SUPPORTPATH . 'Files/baker/banana.php',
+		];
+
+		$files->add(SUPPORTPATH . 'Files');
+
+		$this->assertSame($expected, $files->get());
+	}
+
+	public function testAddArray()
+	{
+		$files = new FileCollection();
+
+		$expected = [
+			$this->directory . 'apple.php',
+			$this->directory . 'fig_3.php',
+			$this->directory . 'prune_ripe.php',
+			SUPPORTPATH . 'Files/baker/banana.php',
+		];
+
+		$files->add([
+			SUPPORTPATH . 'Files/able',
+			SUPPORTPATH . 'Files/baker/banana.php',
+		]);
+
+		$this->assertSame($expected, $files->get());
+	}
+
+	public function testAddArrayRecursive()
+	{
+		$files = new FileCollection();
+
+		$expected = [
+			$this->directory . 'apple.php',
+			$this->directory . 'fig_3.php',
+			$this->directory . 'prune_ripe.php',
+			SUPPORTPATH . 'Files/baker/banana.php',
+			SUPPORTPATH . 'Log/Handlers/TestHandler.php',
+		];
+
+		$files->add([
+			SUPPORTPATH . 'Files',
+			SUPPORTPATH . 'Log',
+		], true);
+
+		$this->assertSame($expected, $files->get());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testAddFile()
+	{
+		$collection = new FileCollection();
+		$this->assertSame([], $this->getPrivateProperty($collection, 'files'));
+
+		$collection->addFile($this->file);
+		$this->assertSame([$this->file], $this->getPrivateProperty($collection, 'files'));
+	}
+
+	public function testAddFileMissing()
+	{
+		$collection = new FileCollection();
+
+		$this->expectException(FileException::class);
+		$this->expectExceptionMessage(lang('Files.expectedFile', ['addFile']));
+
+		$collection->addFile('TheHillsAreAlive.bmp');
+	}
+
+	public function testAddFileDirectory()
+	{
+		$collection = new FileCollection();
+
+		$this->expectException(FileException::class);
+		$this->expectExceptionMessage(lang('Files.expectedFile', ['addFile']));
+
+		$collection->addFile($this->directory);
+	}
+
+	public function testAddFiles()
+	{
+		$collection = new FileCollection();
+		$files     = [
+			$this->file,
+			$this->file,
+		];
+
+		$collection->addFiles($files);
+		$this->assertSame($files, $this->getPrivateProperty($collection, 'files'));
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testGet()
+	{
+		$collection = new FileCollection();
+		$collection->addFile($this->file);
+
+		$this->assertSame([$this->file], $collection->get());
+	}
+
+	public function testGetSorts()
+	{
+		$collection = new FileCollection();
+		$files     = [
+			$this->file,
+			$this->directory . 'apple.php',
+		];
+
+		$collection->addFiles($files);
+
+		$this->assertSame(array_reverse($files), $collection->get());
+	}
+
+	public function testGetUniques()
+	{
+		$collection = new FileCollection();
+		$files     = [
+			$this->file,
+			$this->file,
+		];
+
+		$collection->addFiles($files);
+		$this->assertSame([$this->file], $collection->get());
+	}
+
+	public function testSet()
+	{
+		$collection = new FileCollection();
+
+		$collection->set([$this->file]);
+		$this->assertSame([$this->file], $collection->get());
+	}
+
+	public function testSetInvalid()
+	{
+		$collection = new FileCollection();
+
+		$this->expectException(FileException::class);
+		$this->expectExceptionMessage(lang('Files.expectedFile', ['addFile']));
+
+		$collection->set(['flerb']);
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testRemoveFile()
+	{
+		$collection = new FileCollection();
+		$files     = [
+			$this->file,
+			$this->directory . 'apple.php',
+		];
+
+		$collection->addFiles($files);
+
+		$collection->removeFile($this->file);
+
+		$this->assertSame([$this->directory . 'apple.php'], $collection->get());
+	}
+
+	public function testRemoveFiles()
+	{
+		$collection = new FileCollection();
+		$files     = [
+			$this->file,
+			$this->directory . 'apple.php',
+		];
+
+		$collection->addFiles($files);
+
+		$collection->removeFiles($files);
+
+		$this->assertSame([], $collection->get());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testAddDirectoryInvalid()
+	{
+		$collection = new FileCollection();
+
+		$this->expectException(FileException::class);
+		$this->expectExceptionMessage(lang('Files.expectedDirectory', ['addDirectory']));
+
+		$collection->addDirectory($this->file);
+	}
+
+	public function testAddDirectory()
+	{
+		$collection = new FileCollection();
+		$expected  = [
+			$this->directory . 'apple.php',
+			$this->directory . 'fig_3.php',
+			$this->directory . 'prune_ripe.php',
+		];
+
+		$collection->addDirectory($this->directory);
+
+		$this->assertSame($expected, $collection->get());
+	}
+
+	public function testAddDirectoryRecursive()
+	{
+		$collection = new FileCollection();
+		$expected  = [
+			$this->directory . 'apple.php',
+			$this->directory . 'fig_3.php',
+			$this->directory . 'prune_ripe.php',
+			SUPPORTPATH . 'Files/baker/banana.php',
+		];
+
+		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+
+		$this->assertSame($expected, $collection->get());
+	}
+
+	public function testAddDirectories()
+	{
+		$collection = new FileCollection();
+		$expected  = [
+			$this->directory . 'apple.php',
+			$this->directory . 'fig_3.php',
+			$this->directory . 'prune_ripe.php',
+			SUPPORTPATH . 'Files/baker/banana.php',
+		];
+
+		$collection->addDirectories([
+			$this->directory,
+			SUPPORTPATH . 'Files/baker',
+		]);
+
+		$this->assertSame($expected, $collection->get());
+	}
+
+	public function testAddDirectoriesRecursive()
+	{
+		$collection = new FileCollection();
+		$expected  = [
+			$this->directory . 'apple.php',
+			$this->directory . 'fig_3.php',
+			$this->directory . 'prune_ripe.php',
+			SUPPORTPATH . 'Files/baker/banana.php',
+			SUPPORTPATH . 'Log/Handlers/TestHandler.php',
+		];
+
+		$collection->addDirectories([
+			SUPPORTPATH . 'Files',
+			SUPPORTPATH . 'Log',
+		], true);
+
+		$this->assertSame($expected, $collection->get());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testRemovePatternEmpty()
+	{
+		$collection = new FileCollection();
+		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+
+		$files = $collection->get();
+
+		$collection->removePattern('');
+
+		$this->assertSame($files, $collection->get());
+	}
+
+	public function testRemovePatternRegex()
+	{
+		$collection = new FileCollection();
+		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+
+		$expected = [
+			$this->directory . 'apple.php',
+			SUPPORTPATH . 'Files/baker/banana.php',
+		];
+
+		$collection->removePattern('#[a-z]+_.*#');
+
+		$this->assertSame($expected, $collection->get());
+	}
+
+	public function testRemovePatternPseudo()
+	{
+		$collection = new FileCollection();
+		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+
+		$expected = [
+			$this->directory . 'apple.php',
+			SUPPORTPATH . 'Files/baker/banana.php',
+		];
+
+		$collection->removePattern('*_*.php');
+
+		$this->assertSame($expected, $collection->get());
+	}
+
+	public function testRemovePatternScope()
+	{
+		$collection = new FileCollection();
+		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+
+		$expected = [
+			SUPPORTPATH . 'Files/baker/banana.php',
+		];
+
+		$collection->removePattern('*.php', $this->directory);
+
+		$this->assertSame($expected, $collection->get());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testRetainPatternEmpty()
+	{
+		$collection = new FileCollection();
+		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+
+		$files = $collection->get();
+
+		$collection->retainPattern('');
+
+		$this->assertSame($files, $collection->get());
+	}
+
+	public function testRetainPatternRegex()
+	{
+		$collection = new FileCollection();
+		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+
+		$expected = [
+			$this->directory . 'fig_3.php',
+			$this->directory . 'prune_ripe.php',
+		];
+
+		$collection->retainPattern('#[a-z]+_.*#');
+
+		$this->assertSame($expected, $collection->get());
+	}
+
+	public function testRetainPatternPseudo()
+	{
+		$collection = new FileCollection();
+		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+
+		$expected = [
+			$this->directory . 'fig_3.php',
+		];
+
+		$collection->retainPattern('*_?.php');
+
+		$this->assertSame($expected, $collection->get());
+	}
+
+	public function testRetainPatternScope()
+	{
+		$collection = new FileCollection();
+		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+
+		$expected = [
+			$this->directory . 'fig_3.php',
+			SUPPORTPATH . 'Files/baker/banana.php',
+		];
+
+		$collection->retainPattern('*_?.php', $this->directory);
+
+		$this->assertSame($expected, $collection->get());
+	}
+
+	//--------------------------------------------------------------------
+
+	public function testCount()
+	{
+		$collection = new FileCollection();
+		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+
+		$this->assertCount(4, $collection);
+	}
+
+	public function testIterable()
+	{
+		$collection = new FileCollection();
+		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+
+		$count = 0;
+		foreach ($collection as $file)
+		{
+			$this->assertInstanceOf(File::class, $file);
+			$count++;
+		}
+
+		$this->assertSame($count, 4);
+	}	
+}
diff --git a/tests/system/Publisher/PublisherInputTest.php b/tests/system/Publisher/PublisherInputTest.php
index e7450f5c02a9..29d48ef78816 100644
--- a/tests/system/Publisher/PublisherInputTest.php
+++ b/tests/system/Publisher/PublisherInputTest.php
@@ -35,219 +35,13 @@ public static function setUpBeforeClass(): void
 
 	//--------------------------------------------------------------------
 
-	public function testAddFile()
-	{
-		$publisher = new Publisher();
-		$this->assertSame([], $this->getPrivateProperty($publisher, 'files'));
-
-		$publisher->addFile($this->file);
-		$this->assertSame([$this->file], $this->getPrivateProperty($publisher, 'files'));
-	}
-
-	public function testAddFileMissing()
-	{
-		$publisher = new Publisher();
-
-		$this->expectException(PublisherException::class);
-		$this->expectExceptionMessage(lang('Publisher.expectedFile', ['addFile']));
-
-		$publisher->addFile('TheHillsAreAlive.bmp');
-	}
-
-	public function testAddFileDirectory()
-	{
-		$publisher = new Publisher();
-
-		$this->expectException(PublisherException::class);
-		$this->expectExceptionMessage(lang('Publisher.expectedFile', ['addFile']));
-
-		$publisher->addFile($this->directory);
-	}
-
-	public function testAddFiles()
-	{
-		$publisher = new Publisher();
-		$files     = [
-			$this->file,
-			$this->file,
-		];
-
-		$publisher->addFiles($files);
-		$this->assertSame($files, $this->getPrivateProperty($publisher, 'files'));
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetFiles()
-	{
-		$publisher = new Publisher();
-		$publisher->addFile($this->file);
-
-		$this->assertSame([$this->file], $publisher->getFiles());
-	}
-
-	public function testGetFilesSorts()
-	{
-		$publisher = new Publisher();
-		$files     = [
-			$this->file,
-			$this->directory . 'apple.php',
-		];
-
-		$publisher->addFiles($files);
-
-		$this->assertSame(array_reverse($files), $publisher->getFiles());
-	}
-
-	public function testGetFilesUniques()
-	{
-		$publisher = new Publisher();
-		$files     = [
-			$this->file,
-			$this->file,
-		];
-
-		$publisher->addFiles($files);
-		$this->assertSame([$this->file], $publisher->getFiles());
-	}
-
-	public function testSetFiles()
-	{
-		$publisher = new Publisher();
-
-		$publisher->setFiles([$this->file]);
-		$this->assertSame([$this->file], $publisher->getFiles());
-	}
-
-	public function testSetFilesInvalid()
-	{
-		$publisher = new Publisher();
-
-		$this->expectException(PublisherException::class);
-		$this->expectExceptionMessage(lang('Publisher.expectedFile', ['addFile']));
-
-		$publisher->setFiles(['flerb']);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRemoveFile()
-	{
-		$publisher = new Publisher();
-		$files     = [
-			$this->file,
-			$this->directory . 'apple.php',
-		];
-
-		$publisher->addFiles($files);
-
-		$publisher->removeFile($this->file);
-
-		$this->assertSame([$this->directory . 'apple.php'], $publisher->getFiles());
-	}
-
-	public function testRemoveFiles()
-	{
-		$publisher = new Publisher();
-		$files     = [
-			$this->file,
-			$this->directory . 'apple.php',
-		];
-
-		$publisher->addFiles($files);
-
-		$publisher->removeFiles($files);
-
-		$this->assertSame([], $publisher->getFiles());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAddDirectoryInvalid()
-	{
-		$publisher = new Publisher();
-
-		$this->expectException(PublisherException::class);
-		$this->expectExceptionMessage(lang('Publisher.expectedDirectory', ['addDirectory']));
-
-		$publisher->addDirectory($this->file);
-	}
-
-	public function testAddDirectory()
-	{
-		$publisher = new Publisher();
-		$expected  = [
-			$this->directory . 'apple.php',
-			$this->directory . 'fig_3.php',
-			$this->directory . 'prune_ripe.php',
-		];
-
-		$publisher->addDirectory($this->directory);
-
-		$this->assertSame($expected, $publisher->getFiles());
-	}
-
-	public function testAddDirectoryRecursive()
-	{
-		$publisher = new Publisher();
-		$expected  = [
-			$this->directory . 'apple.php',
-			$this->directory . 'fig_3.php',
-			$this->directory . 'prune_ripe.php',
-			SUPPORTPATH . 'Files/baker/banana.php',
-		];
-
-		$publisher->addDirectory(SUPPORTPATH . 'Files', true);
-
-		$this->assertSame($expected, $publisher->getFiles());
-	}
-
-	public function testAddDirectories()
-	{
-		$publisher = new Publisher();
-		$expected  = [
-			$this->directory . 'apple.php',
-			$this->directory . 'fig_3.php',
-			$this->directory . 'prune_ripe.php',
-			SUPPORTPATH . 'Files/baker/banana.php',
-		];
-
-		$publisher->addDirectories([
-			$this->directory,
-			SUPPORTPATH . 'Files/baker',
-		]);
-
-		$this->assertSame($expected, $publisher->getFiles());
-	}
-
-	public function testAddDirectoriesRecursive()
-	{
-		$publisher = new Publisher();
-		$expected  = [
-			$this->directory . 'apple.php',
-			$this->directory . 'fig_3.php',
-			$this->directory . 'prune_ripe.php',
-			SUPPORTPATH . 'Files/baker/banana.php',
-			SUPPORTPATH . 'Log/Handlers/TestHandler.php',
-		];
-
-		$publisher->addDirectories([
-			SUPPORTPATH . 'Files',
-			SUPPORTPATH . 'Log',
-		], true);
-
-		$this->assertSame($expected, $publisher->getFiles());
-	}
-
-	//--------------------------------------------------------------------
-
 	public function testAddPathFile()
 	{
 		$publisher = new Publisher(SUPPORTPATH . 'Files');
 
 		$publisher->addPath('baker/banana.php');
 
-		$this->assertSame([$this->file], $publisher->getFiles());
+		$this->assertSame([$this->file], $publisher->get());
 	}
 
 	public function testAddPathFileRecursiveDoesNothing()
@@ -256,7 +50,7 @@ public function testAddPathFileRecursiveDoesNothing()
 
 		$publisher->addPath('baker/banana.php', true);
 
-		$this->assertSame([$this->file], $publisher->getFiles());
+		$this->assertSame([$this->file], $publisher->get());
 	}
 
 	public function testAddPathDirectory()
@@ -271,7 +65,7 @@ public function testAddPathDirectory()
 
 		$publisher->addPath('able');
 
-		$this->assertSame($expected, $publisher->getFiles());
+		$this->assertSame($expected, $publisher->get());
 	}
 
 	public function testAddPathDirectoryRecursive()
@@ -287,7 +81,7 @@ public function testAddPathDirectoryRecursive()
 
 		$publisher->addPath('Files');
 
-		$this->assertSame($expected, $publisher->getFiles());
+		$this->assertSame($expected, $publisher->get());
 	}
 
 	public function testAddPaths()
@@ -306,7 +100,7 @@ public function testAddPaths()
 			'baker/banana.php',
 		]);
 
-		$this->assertSame($expected, $publisher->getFiles());
+		$this->assertSame($expected, $publisher->get());
 	}
 
 	public function testAddPathsRecursive()
@@ -326,7 +120,7 @@ public function testAddPathsRecursive()
 			'Log',
 		], true);
 
-		$this->assertSame($expected, $publisher->getFiles());
+		$this->assertSame($expected, $publisher->get());
 	}
 
 	//--------------------------------------------------------------------
@@ -338,7 +132,7 @@ public function testAddUri()
 
 		$scratch = $this->getPrivateProperty($publisher, 'scratch');
 
-		$this->assertSame([$scratch . 'composer.json'], $publisher->getFiles());
+		$this->assertSame([$scratch . 'composer.json'], $publisher->get());
 	}
 
 	public function testAddUris()
@@ -351,122 +145,6 @@ public function testAddUris()
 
 		$scratch = $this->getPrivateProperty($publisher, 'scratch');
 
-		$this->assertSame([$scratch . 'LICENSE', $scratch . 'composer.json'], $publisher->getFiles());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRemovePatternEmpty()
-	{
-		$publisher = new Publisher();
-		$publisher->addDirectory(SUPPORTPATH . 'Files', true);
-
-		$files = $publisher->getFiles();
-
-		$publisher->removePattern('');
-
-		$this->assertSame($files, $publisher->getFiles());
-	}
-
-	public function testRemovePatternRegex()
-	{
-		$publisher = new Publisher();
-		$publisher->addDirectory(SUPPORTPATH . 'Files', true);
-
-		$expected = [
-			$this->directory . 'apple.php',
-			SUPPORTPATH . 'Files/baker/banana.php',
-		];
-
-		$publisher->removePattern('#[a-z]+_.*#');
-
-		$this->assertSame($expected, $publisher->getFiles());
-	}
-
-	public function testRemovePatternPseudo()
-	{
-		$publisher = new Publisher();
-		$publisher->addDirectory(SUPPORTPATH . 'Files', true);
-
-		$expected = [
-			$this->directory . 'apple.php',
-			SUPPORTPATH . 'Files/baker/banana.php',
-		];
-
-		$publisher->removePattern('*_*.php');
-
-		$this->assertSame($expected, $publisher->getFiles());
-	}
-
-	public function testRemovePatternScope()
-	{
-		$publisher = new Publisher();
-		$publisher->addDirectory(SUPPORTPATH . 'Files', true);
-
-		$expected = [
-			SUPPORTPATH . 'Files/baker/banana.php',
-		];
-
-		$publisher->removePattern('*.php', $this->directory);
-
-		$this->assertSame($expected, $publisher->getFiles());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRetainPatternEmpty()
-	{
-		$publisher = new Publisher();
-		$publisher->addDirectory(SUPPORTPATH . 'Files', true);
-
-		$files = $publisher->getFiles();
-
-		$publisher->retainPattern('');
-
-		$this->assertSame($files, $publisher->getFiles());
-	}
-
-	public function testRetainPatternRegex()
-	{
-		$publisher = new Publisher();
-		$publisher->addDirectory(SUPPORTPATH . 'Files', true);
-
-		$expected = [
-			$this->directory . 'fig_3.php',
-			$this->directory . 'prune_ripe.php',
-		];
-
-		$publisher->retainPattern('#[a-z]+_.*#');
-
-		$this->assertSame($expected, $publisher->getFiles());
-	}
-
-	public function testRetainPatternPseudo()
-	{
-		$publisher = new Publisher();
-		$publisher->addDirectory(SUPPORTPATH . 'Files', true);
-
-		$expected = [
-			$this->directory . 'fig_3.php',
-		];
-
-		$publisher->retainPattern('*_?.php');
-
-		$this->assertSame($expected, $publisher->getFiles());
-	}
-
-	public function testRetainPatternScope()
-	{
-		$publisher = new Publisher();
-		$publisher->addDirectory(SUPPORTPATH . 'Files', true);
-
-		$expected = [
-			$this->directory . 'fig_3.php',
-			SUPPORTPATH . 'Files/baker/banana.php',
-		];
-
-		$publisher->retainPattern('*_?.php', $this->directory);
-
-		$this->assertSame($expected, $publisher->getFiles());
+		$this->assertSame([$scratch . 'LICENSE', $scratch . 'composer.json'], $publisher->get());
 	}
 }
diff --git a/tests/system/Publisher/PublisherSupportTest.php b/tests/system/Publisher/PublisherSupportTest.php
index 42f22d721525..081b831f1241 100644
--- a/tests/system/Publisher/PublisherSupportTest.php
+++ b/tests/system/Publisher/PublisherSupportTest.php
@@ -53,75 +53,11 @@ public function testDiscoverNothing()
 	public function testDiscoverStores()
 	{
 		$publisher = Publisher::discover()[0];
-		$publisher->setFiles([])->addFile($this->file);
+		$publisher->set([])->addFile($this->file);
 
 		$result = Publisher::discover();
 		$this->assertSame($publisher, $result[0]);
-		$this->assertSame([$this->file], $result[0]->getFiles());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testResolveDirectoryDirectory()
-	{
-		$method = $this->getPrivateMethodInvoker(Publisher::class, 'resolveDirectory');
-
-		$this->assertSame($this->directory, $method($this->directory));
-	}
-
-	public function testResolveDirectoryFile()
-	{
-		$method = $this->getPrivateMethodInvoker(Publisher::class, 'resolveDirectory');
-
-		$this->expectException(PublisherException::class);
-		$this->expectExceptionMessage(lang('Publisher.expectedDirectory', ['invokeArgs']));
-
-		$method($this->file);
-	}
-
-	public function testResolveDirectorySymlink()
-	{
-		// Create a symlink to test
-		$link = sys_get_temp_dir() . DIRECTORY_SEPARATOR . bin2hex(random_bytes(4));
-		symlink($this->directory, $link);
-
-		$method = $this->getPrivateMethodInvoker(Publisher::class, 'resolveDirectory');
-
-		$this->assertSame($this->directory, $method($link));
-
-		unlink($link);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testResolveFileFile()
-	{
-		$method = $this->getPrivateMethodInvoker(Publisher::class, 'resolveFile');
-
-		$this->assertSame($this->file, $method($this->file));
-	}
-
-	public function testResolveFileSymlink()
-	{
-		// Create a symlink to test
-		$link = sys_get_temp_dir() . DIRECTORY_SEPARATOR . bin2hex(random_bytes(4));
-		symlink($this->file, $link);
-
-		$method = $this->getPrivateMethodInvoker(Publisher::class, 'resolveFile');
-
-		$this->assertSame($this->file, $method($link));
-
-		unlink($link);
-	}
-
-	public function testResolveFileDirectory()
-	{
-		$method = $this->getPrivateMethodInvoker(Publisher::class, 'resolveFile');
-
-		$this->expectException(PublisherException::class);
-		$this->expectExceptionMessage(lang('Publisher.expectedFile', ['invokeArgs']));
-
-		$method($this->directory);
+		$this->assertSame([$this->file], $result[0]->get());
 	}
 
 	//--------------------------------------------------------------------
diff --git a/user_guide_src/source/libraries/files.rst b/user_guide_src/source/libraries/files.rst
index 9b29767d4d19..ad2c8671a4d5 100644
--- a/user_guide_src/source/libraries/files.rst
+++ b/user_guide_src/source/libraries/files.rst
@@ -107,3 +107,99 @@ The move() method returns a new File instance that for the relocated file, so yo
 resulting location is needed::
 
     $file = $file->move(WRITEPATH.'uploads');
+
+****************
+File Collections
+****************
+
+Working with groups of files can be cumbersome, so the framework supplies the ``FileCollection`` class to facilitate
+locating and working with groups of files across the filesystem. At its most basic, ``FileCollection`` is an index
+of files you set or build::
+
+	$files = new FileCollection([
+		FCPATH . 'index.php',
+		ROOTPATH . 'spark',
+	]);
+	$files->addDirectory(APPPATH . 'Filters');
+
+After you have input the files you would like to work with you may remove files or use the filtering commands to remove
+or retain files matching a certain regex or glob-style pattern::
+
+	$files->removeFile(APPPATH . 'Filters/DevelopToolbar');
+
+	$files->removePattern('#\.gitkeep#');
+	$files->retainPattern('*.php');
+
+When your collection is complete, you can use ``get()`` to retrieve the final list of file paths, or take advantage of
+``FileCollection`` being countable and iterable to work directly with each ``File``::
+
+	echo 'My files: ' . implode(PHP_EOL, $files->get());
+	echo 'I have ' . count($files) . ' files!';
+
+	foreach ($files as $file)
+	{
+		echo 'Moving ' . $file->getBasename() . ', ' . $file->getSizeByUnit('mb');
+		$file->move(WRITABLE . $file->getRandomName()); 
+	}
+
+Below are the specific methods for working with a ``FileCollection``.
+
+Inputting Files
+===============
+
+**set(array $files)**
+
+Sets the list of input files to the provided string array of file paths.
+
+**add(string[]|string $paths, bool $recursive = true)**
+
+Adds all files indicated by the path or array of paths. If the path resolves to a directory then ``$recursive``
+will include sub-directories.
+
+**addFile(string $file)**
+**addFiles(array $files)**
+
+Adds the file or files to the current list of input files. Files are absolute paths to actual files.
+
+**removeFile(string $file)**
+**removeFiles(array $files)**
+
+Removes the file or files from the current list of input files.
+
+**addDirectory(string $directory, bool $recursive = false)**
+**addDirectories(array $directories, bool $recursive = false)**
+
+Adds all files from the directory or directories, optionally recursing into sub-directories. Directories are
+absolute paths to actual directories.
+
+Filtering Files
+===============
+
+**removePattern(string $pattern, string $scope = null)**
+**retainPattern(string $pattern, string $scope = null)**
+
+Filters the current file list through the pattern (and optional scope), removing or retaining matched
+files. ``$pattern`` may be a complete regex (like ``'#[A-Za-z]+\.php#'``) or a pseudo-regex similar
+to ``glob()`` (like ``*.css``).
+If a ``$scope`` is provided then only files in or under that directory will be considered (i.e. files
+outside of ``$scope`` are always retained). When no scope is provided then all files are subject.
+
+Examples::
+
+	$files = new FileCollection();
+	$files->add(APPPATH . 'Config', true); // Adds all Config files and directories
+
+	$files->removePattern('*tion.php'); // Would remove Encryption.php, Validation.php, and boot/production.php
+	$files->removePattern('*tion.php', APPPATH . 'Config/boot'); // Would only remove boot/production.php
+
+	$files->retainPattern('#A.+php$#'); // Would keep only Autoload.php
+	$files->retainPattern('#d.+php$#', APPPATH . 'Config/boot'); // Would keep everything but boot/production.php and boot/testing.php
+
+Retrieving Files
+================
+
+**get(): string[]**
+
+Returns an array of all the loaded input files.
+
+.. note:: ``FileCollection`` is an ``IteratorAggregate`` so you can work with it directly (e.g. ``foreach ($collection as $file)``).
diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
index 84b430ba144b..dc2ec08347a8 100644
--- a/user_guide_src/source/libraries/publisher.rst
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -28,8 +28,8 @@ Concept and Usage
 * How can I update my project when the framework or modules change?
 * How can components inject new content into existing projects?
 
-At its most basic, publishing amounts to copying a file or files into a project. ``Publisher`` uses fluent-style
-command chaining to read, filter, and process input files, then copies or merges them into the target destination.
+At its most basic, publishing amounts to copying a file or files into a project. ``Publisher`` extends ``FileCollection``
+to enact fluent-style command chaining to read, filter, and process input files, then copies or merges them into the target destination.
 You may use ``Publisher`` on demand in your Controllers or other components, or you may stage publications by extending
 the class and leveraging its discovery with ``spark publish``.
 
@@ -320,6 +320,8 @@ Now when your module users run ``php spark auth:publish`` they will have the fol
 Library Reference
 *****************
 
+.. note:: ``Publisher`` is an extension of :doc:`FileCollection </libraries/files>` so has access to all those methods for reading and filtering files.
+
 Support Methods
 ===============
 
@@ -346,33 +348,6 @@ files and changes, and this provides the path to a transient, writable directory
 Returns any errors from the last write operation. The array keys are the files that caused the error, and the
 values are the Throwable that was caught. Use ``getMessage()`` on the Throwable to get the error message.
 
-**getFiles(): string[]**
-
-Returns an array of all the loaded input files.
-
-Inputting Files
-===============
-
-**setFiles(array $files)**
-
-Sets the list of input files to the provided string array of file paths.
-
-**addFile(string $file)**
-**addFiles(array $files)**
-
-Adds the file or files to the current list of input files. Files are absolute paths to actual files.
-
-**removeFile(string $file)**
-**removeFiles(array $files)**
-
-Removes the file or files from the current list of input files.
-
-**addDirectory(string $directory, bool $recursive = false)**
-**addDirectories(array $directories, bool $recursive = false)**
-
-Adds all files from the directory or directories, optionally recursing into sub-directories. Directories are
-absolute paths to actual directories.
-
 **addPath(string $path, bool $recursive = true)**
 **addPaths(array $path, bool $recursive = true)**
 
@@ -388,29 +363,6 @@ file to the list.
 .. note:: The CURL request made is a simple ``GET`` and uses the response body for the file contents. Some
 	remote files may need a custom request to be handled properly.
 
-Filtering Files
-===============
-
-**removePattern(string $pattern, string $scope = null)**
-**retainPattern(string $pattern, string $scope = null)**
-
-Filters the current file list through the pattern (and optional scope), removing or retaining matched
-files. ``$pattern`` may be a complete regex (like ``'#[A-Za-z]+\.php#'``) or a pseudo-regex similar
-to ``glob()`` (like ``*.css``).
-If a ``$scope`` is provided then only files in or under that directory will be considered (i.e. files
-outside of ``$scope`` are always retained). When no scope is provided then all files are subject.
-
-Examples::
-
-	$publisher = new Publisher(APPPATH . 'Config');
-	$publisher->addPath('/', true); // Adds all Config files and directories
-
-	$publisher->removePattern('*tion.php'); // Would remove Encryption.php, Validation.php, and boot/production.php
-	$publisher->removePattern('*tion.php', APPPATH . 'Config/boot'); // Would only remove boot/production.php
-
-	$publisher->retainPattern('#A.+php$#'); // Would keep only Autoload.php
-	$publisher->retainPattern('#d.+php$#', APPPATH . 'Config/boot'); // Would keep everything but boot/production.php and boot/testing.php
-
 Outputting Files
 ================
 

From 7ace2ccab301c91697ba1258ad40d1a955698c93 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Tue, 15 Jun 2021 13:29:46 +0000
Subject: [PATCH 0183/2325] Implement define()

---
 system/Files/FileCollection.php           | 14 ++++++++--
 tests/system/Files/FileCollectionTest.php | 32 +++++++++++++++++++++++
 user_guide_src/source/libraries/files.rst | 31 +++++++++++++++++++---
 3 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/system/Files/FileCollection.php b/system/Files/FileCollection.php
index bf4eeaf6b836..fcf2451d357d 100644
--- a/system/Files/FileCollection.php
+++ b/system/Files/FileCollection.php
@@ -122,7 +122,7 @@ protected static function matchFiles(array $files, string $pattern): array
 	//--------------------------------------------------------------------
 
 	/**
-	 * Loads the Filesystem helper and stores initial files.
+	 * Loads the Filesystem helper and adds any initial files.
 	 *
 	 * @param string[] $files
 	 */
@@ -130,7 +130,17 @@ public function __construct(array $files = [])
 	{
 		helper(['filesystem']);
 
-		$this->set($files);
+		$this->add($files)->define();
+	}
+
+	/**
+	 * Applies any initial inputs after the constructor.
+	 * This method is a stub to be implemented by child classes.
+	 *
+	 * @return void
+	 */
+	protected function define(): void
+	{
 	}
 
 	/**
diff --git a/tests/system/Files/FileCollectionTest.php b/tests/system/Files/FileCollectionTest.php
index 3e77941d5d2f..a650bc464b01 100644
--- a/tests/system/Files/FileCollectionTest.php
+++ b/tests/system/Files/FileCollectionTest.php
@@ -99,6 +99,38 @@ public function testResolveFileDirectory()
 
 	//--------------------------------------------------------------------
 
+	public function testConstructorAddsFiles()
+	{
+		$expected = [
+			$this->directory . 'apple.php',
+			$this->file,
+		];
+
+		$collection = new class([$this->file]) extends FileCollection {
+
+			protected $files = [
+				SUPPORTPATH . 'Files/able/apple.php',
+			];
+		};
+
+		$this->assertSame($expected, $collection->get());
+	}
+
+	public function testConstructorCallsDefine()
+	{
+		$collection = new class([$this->file]) extends FileCollection {
+
+			protected function define(): void
+			{
+				$this->add(SUPPORTPATH . 'Files/baker/banana.php');
+			}
+		};
+
+		$this->assertSame([$this->file], $collection->get());
+	}
+
+	//--------------------------------------------------------------------
+
 	public function testAddStringFile()
 	{
 		$files = new FileCollection();
diff --git a/user_guide_src/source/libraries/files.rst b/user_guide_src/source/libraries/files.rst
index ad2c8671a4d5..68950b9a3d5f 100644
--- a/user_guide_src/source/libraries/files.rst
+++ b/user_guide_src/source/libraries/files.rst
@@ -144,12 +144,37 @@ When your collection is complete, you can use ``get()`` to retrieve the final li
 
 Below are the specific methods for working with a ``FileCollection``.
 
-Inputting Files
-===============
+Starting a Collection
+=====================
+
+**__construct(string[] $files = [])**
+
+The constructor accepts an optional array of file paths to use as the initial collection. These are passed to
+**add()** so any files supplied by child classes in the **$files** will remain.
+
+**define()**
+
+Allows child classes to define their own initial files. This method is called by the constructor and allows
+predefined collections without having to use their methods. Example::
+
+	class ConfigCollection extends \CodeIgniter\Files\FileCollection
+	{
+		protected function define(): void {
+
+			$this->add(APPPATH . 'Config', true)->retainPattern('*.php');
+		}
+	}
+
+Now you may use the ``ConfigCollection`` anywhere in your project to access all App Config files without
+having to re-call the collection methods every time.
 
 **set(array $files)**
 
-Sets the list of input files to the provided string array of file paths.
+Sets the list of input files to the provided string array of file paths. This will remove any existing
+files from the collection, so ``$collection->set([])`` is essentially a hard reset.
+
+Inputting Files
+===============
 
 **add(string[]|string $paths, bool $recursive = true)**
 

From e19f3928f3d43c03d3cf63b47b1bb4b33a5aa1ae Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Tue, 15 Jun 2021 13:43:37 +0000
Subject: [PATCH 0184/2325] Declare final methods

---
 system/Files/FileCollection.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/Files/FileCollection.php b/system/Files/FileCollection.php
index fcf2451d357d..f7e7c67324c7 100644
--- a/system/Files/FileCollection.php
+++ b/system/Files/FileCollection.php
@@ -45,7 +45,7 @@ class FileCollection implements Countable, IteratorAggregate
 	 *
 	 * @throws FileException
 	 */
-	protected static function resolveDirectory(string $directory): string
+	final protected static function resolveDirectory(string $directory): string
 	{
 		if (! is_dir($directory = set_realpath($directory)))
 		{
@@ -65,7 +65,7 @@ protected static function resolveDirectory(string $directory): string
 	 *
 	 * @throws FileException
 	 */
-	protected static function resolveFile(string $file): string
+	final protected static function resolveFile(string $file): string
 	{
 		if (! is_file($file = set_realpath($file)))
 		{
@@ -84,7 +84,7 @@ protected static function resolveFile(string $file): string
 	 *
 	 * @return string[]
 	 */
-	protected static function filterFiles(array $files, string $directory): array
+	final protected static function filterFiles(array $files, string $directory): array
 	{
 		$directory = self::resolveDirectory($directory);
 
@@ -101,7 +101,7 @@ protected static function filterFiles(array $files, string $directory): array
 	 *
 	 * @return string[]
 	 */
-	protected static function matchFiles(array $files, string $pattern): array
+	final protected static function matchFiles(array $files, string $pattern): array
 	{
 		// Convert pseudo-regex into their true form
 		if (@preg_match($pattern, null) === false) // @phpstan-ignore-line

From 096b5bdd5f11a69f35c35010f89cc77182c2c294 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Tue, 15 Jun 2021 11:12:53 -0400
Subject: [PATCH 0185/2325] Apply suggestions from code review

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 system/Files/FileCollection.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/Files/FileCollection.php b/system/Files/FileCollection.php
index f7e7c67324c7..4231c5776642 100644
--- a/system/Files/FileCollection.php
+++ b/system/Files/FileCollection.php
@@ -88,7 +88,7 @@ final protected static function filterFiles(array $files, string $directory): ar
 	{
 		$directory = self::resolveDirectory($directory);
 
-		return array_filter($files, function ($value) use ($directory) {
+		return array_filter($files, static function (string $value) use ($directory): bool {
 			return strpos($value, $directory) === 0;
 		});
 	}
@@ -114,7 +114,7 @@ final protected static function matchFiles(array $files, string $pattern): array
 			$pattern = "#{$pattern}#";
 		}
 
-		return array_filter($files, function ($value) use ($pattern) {
+		return array_filter($files, static function ($value) use ($pattern) {
 			return (bool) preg_match($pattern, basename($value));
 		});
 	}
@@ -150,7 +150,7 @@ protected function define(): void
 	 */
 	public function get(): array
 	{
-		$this->files = array_unique($this->files, SORT_STRING);
+		$this->files = array_unique($this->files);
 		sort($this->files, SORT_STRING);
 
 		return $this->files;

From d1408104b967840efd4b2e889f1570bcf71630e2 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Wed, 23 Jun 2021 13:47:27 +0000
Subject: [PATCH 0186/2325] Implement review suggestions

---
 system/Files/FileCollection.php | 14 +++++++++++++-
 system/Publisher/Publisher.php  | 14 ++++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/system/Files/FileCollection.php b/system/Files/FileCollection.php
index 4231c5776642..cc11cf8a7962 100644
--- a/system/Files/FileCollection.php
+++ b/system/Files/FileCollection.php
@@ -34,6 +34,8 @@ class FileCollection implements Countable, IteratorAggregate
 	 */
 	protected $files = [];
 
+	//--------------------------------------------------------------------
+	// Support Methods
 	//--------------------------------------------------------------------
 
 	/**
@@ -104,7 +106,7 @@ final protected static function filterFiles(array $files, string $directory): ar
 	final protected static function matchFiles(array $files, string $pattern): array
 	{
 		// Convert pseudo-regex into their true form
-		if (@preg_match($pattern, null) === false) // @phpstan-ignore-line
+		if (@preg_match($pattern, '') === false)
 		{
 			$pattern = str_replace(
 				['#', '.', '*', '?'],
@@ -119,6 +121,8 @@ final protected static function matchFiles(array $files, string $pattern): array
 		});
 	}
 
+	//--------------------------------------------------------------------
+	// Class Core
 	//--------------------------------------------------------------------
 
 	/**
@@ -209,6 +213,8 @@ public function add($paths, bool $recursive = true)
 		return $this;
 	}
 
+	//--------------------------------------------------------------------
+	// File Handling
 	//--------------------------------------------------------------------
 
 	/**
@@ -268,6 +274,8 @@ public function removeFile(string $file)
 		return $this->removeFiles([$file]);
 	}
 
+	//--------------------------------------------------------------------
+	// Directory Handling
 	//--------------------------------------------------------------------
 
 	/**
@@ -317,6 +325,8 @@ public function addDirectory(string $directory, bool $recursive = false)
 		return $this;
 	}
 
+	//--------------------------------------------------------------------
+	// Filtering
 	//--------------------------------------------------------------------
 
 	/**
@@ -366,6 +376,8 @@ public function retainPattern(string $pattern, string $scope = null)
 	}
 
 	//--------------------------------------------------------------------
+	// Interface Methods
+	//--------------------------------------------------------------------
 
     /**
      * Returns the current number of files in the collection.
diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php
index 1f28bc331baf..ab4484cdea0b 100644
--- a/system/Publisher/Publisher.php
+++ b/system/Publisher/Publisher.php
@@ -87,6 +87,8 @@ class Publisher extends FileCollection
 	 */
 	protected $destination = FCPATH;
 
+	//--------------------------------------------------------------------
+	// Support Methods
 	//--------------------------------------------------------------------
 
 	/**
@@ -154,6 +156,8 @@ private static function wipeDirectory(string $directory): void
 		}
 	}
 
+	//--------------------------------------------------------------------
+	// Class Core
 	//--------------------------------------------------------------------
 
 	/**
@@ -217,6 +221,8 @@ public function publish(): bool
 		return $this->addPath('/')->merge(true);
 	}
 
+	//--------------------------------------------------------------------
+	// Property Accessors
 	//--------------------------------------------------------------------
 
 	/**
@@ -275,6 +281,8 @@ final public function getPublished(): array
 		return $this->published;
 	}
 
+	//--------------------------------------------------------------------
+	// Additional Handlers
 	//--------------------------------------------------------------------
 
 	/**
@@ -310,8 +318,6 @@ final public function addPath(string $path, bool $recursive = true)
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Downloads and stages files from an array of URIs.
 	 *
@@ -347,6 +353,8 @@ final public function addUri(string $uri)
 		return $this->addFile($file);
 	}
 
+	//--------------------------------------------------------------------
+	// Write Methods
 	//--------------------------------------------------------------------
 
 	/**
@@ -361,8 +369,6 @@ final public function wipe()
 		return $this;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Copies all files into the destination, does not create directory structure.
 	 *

From a6d10631092a066d1965afebb9bcb316f842abb7 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Thu, 24 Jun 2021 07:57:49 -0400
Subject: [PATCH 0187/2325] Update system/Files/FileCollection.php

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 system/Files/FileCollection.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/system/Files/FileCollection.php b/system/Files/FileCollection.php
index cc11cf8a7962..128d884940d5 100644
--- a/system/Files/FileCollection.php
+++ b/system/Files/FileCollection.php
@@ -185,10 +185,7 @@ public function set(array $files)
 	 */
 	public function add($paths, bool $recursive = true)
 	{
-		if (! is_array($paths))
-		{
-			$paths = [$paths];
-		}
+		$paths = (array) $paths;
 
 		foreach ($paths as $path)
 		{

From 28bf8467495d9d66eace5bd647bb120b625af53c Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Thu, 24 Jun 2021 07:58:26 -0400
Subject: [PATCH 0188/2325] Update user_guide_src/source/libraries/files.rst

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/libraries/files.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/libraries/files.rst b/user_guide_src/source/libraries/files.rst
index 68950b9a3d5f..ba52138052f5 100644
--- a/user_guide_src/source/libraries/files.rst
+++ b/user_guide_src/source/libraries/files.rst
@@ -159,8 +159,8 @@ predefined collections without having to use their methods. Example::
 
 	class ConfigCollection extends \CodeIgniter\Files\FileCollection
 	{
-		protected function define(): void {
-
+		protected function define(): void
+		{
 			$this->add(APPPATH . 'Config', true)->retainPattern('*.php');
 		}
 	}

From 8d5aca773b88ecf818310aeda4462dc544d7189f Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Thu, 24 Jun 2021 07:59:38 -0400
Subject: [PATCH 0189/2325] Update tests/system/Files/FileCollectionTest.php

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

diff --git a/tests/system/Files/FileCollectionTest.php b/tests/system/Files/FileCollectionTest.php
index a650bc464b01..ae2df9178f5f 100644
--- a/tests/system/Files/FileCollectionTest.php
+++ b/tests/system/Files/FileCollectionTest.php
@@ -118,7 +118,7 @@ public function testConstructorAddsFiles()
 
 	public function testConstructorCallsDefine()
 	{
-		$collection = new class([$this->file]) extends FileCollection {
+		$collection = new class() extends FileCollection {
 
 			protected function define(): void
 			{

From 22aa7d22d421cb78ab6683de1fa14c5e2e79960a Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Sun, 27 Jun 2021 07:42:27 +0200
Subject: [PATCH 0190/2325] Update docblock for redirect function [ci skip]

---
 system/Common.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/system/Common.php b/system/Common.php
index 4dfcd2cee170..bacac6ac0e4b 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -811,9 +811,7 @@ function old(string $key, $default = null, $escape = 'html')
     /**
      * Convenience method that works with the current global $request and
      * $router instances to redirect using named/reverse-routed routes
-     * to determine the URL to go to. If nothing is found, will treat
-     * as a traditional redirect and pass the string in, letting
-     * $response->redirect() determine the correct method and code.
+     * to determine the URL to go to.
      *
      * If more control is needed, you must use $response->redirect explicitly.
      *

From bde51819f3797727ad24d8c0c47078c17787a829 Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Sun, 27 Jun 2021 08:30:52 +0200
Subject: [PATCH 0191/2325] Fix mysqli ssl connection - certificate is not
 required to establish a secure connection

---
 system/Database/MySQLi/Connection.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
index 78652c25b3f3..965d539be878 100644
--- a/system/Database/MySQLi/Connection.php
+++ b/system/Database/MySQLi/Connection.php
@@ -156,7 +156,6 @@ public function connect(bool $persistent = false)
                     }
                 }
 
-                $clientFlags += MYSQLI_CLIENT_SSL;
                 $this->mysqli->ssl_set(
                     $ssl['key'] ?? null,
                     $ssl['cert'] ?? null,
@@ -165,6 +164,8 @@ public function connect(bool $persistent = false)
                     $ssl['cipher'] ?? null
                 );
             }
+
+            $clientFlags += MYSQLI_CLIENT_SSL;
         }
 
         try {

From 1db19c952676aa772ab50670aea967484ec6a6f9 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Mon, 28 Jun 2021 09:02:59 +0200
Subject: [PATCH 0192/2325] Structure debug toolbar timeline with collapsible
 elements.

---
 system/Debug/Toolbar.php               | 92 +++++++++++++++++++++++---
 system/Debug/Toolbar/Views/toolbar.css | 25 ++++++-
 system/Debug/Toolbar/Views/toolbar.js  | 22 ++++++
 3 files changed, 127 insertions(+), 12 deletions(-)

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 32e1f951a3df..6a5ece61a373 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -149,7 +149,7 @@ public function run(float $startTime, float $totalTime, RequestInterface $reques
 
         $data['vars']['response'] = [
             'statusCode'  => $response->getStatusCode(),
-            'reason'      => esc($response->getReason()),
+            'reason'      => esc($response->getReasonPhrase()),
             'contentType' => esc($response->getHeaderLine('content-type')),
         ];
 
@@ -166,17 +166,38 @@ public function run(float $startTime, float $totalTime, RequestInterface $reques
      * Called within the view to display the timeline itself.
      */
     protected function renderTimeline(array $collectors, float $startTime, int $segmentCount, int $segmentDuration, array &$styles): string
+    {
+        $rows       = $this->collectTimelineData($collectors);
+        $output     = '';
+        $styleCount = 0;
+
+        // Use recursive render function
+        return $this->renderTimelineRecursive($rows, $startTime, $segmentCount, $segmentDuration, $styles, $styleCount);
+    }
+
+    /**
+     * Recursively renders timeline elements and their children.
+     */
+    protected function renderTimelineRecursive(array $rows, float $startTime, int $segmentCount, int $segmentDuration, array &$styles, int &$styleCount, int $level = 0, bool $isChild = false): string
     {
         $displayTime = $segmentCount * $segmentDuration;
-        $rows        = $this->collectTimelineData($collectors);
-        $output      = '';
-        $styleCount  = 0;
+
+        $output = '';
 
         foreach ($rows as $row) {
-            $output .= '<tr>';
-            $output .= "<td>{$row['name']}</td>";
-            $output .= "<td>{$row['component']}</td>";
-            $output .= "<td class='debug-bar-alignRight'>" . number_format($row['duration'] * 1000, 2) . ' ms</td>';
+            $hasChildren = isset($row['children']) && ! empty($row['children']);
+
+            $open = $row['name'] === 'Controller';
+
+            if ($hasChildren) {
+                $output .= '<tr class="timeline-parent' . ($open ? ' timeline-parent-open' : '') . '" id="timeline-' . $styleCount . '_parent" onclick="ciDebugBar.toggleChildRows(\'timeline-' . $styleCount . '\');">';
+            } else {
+                $output .= '<tr>';
+            }
+
+            $output .= '<td class="' . ($isChild ? 'debug-bar-width30' : '') . '" style="--level: ' . $level . ';">' . ($hasChildren ? '<nav></nav>' : '') . $row['name'] . '</td>';
+            $output .= '<td class="' . ($isChild ? 'debug-bar-width10' : '') . '">' . $row['component'] . '</td>';
+            $output .= '<td class="' . ($isChild ? 'debug-bar-width10 ' : '') . 'debug-bar-alignRight">' . number_format($row['duration'] * 1000, 2) . ' ms</td>';
             $output .= "<td class='debug-bar-noverflow' colspan='{$segmentCount}'>";
 
             $offset = ((((float) $row['start'] - $startTime) * 1000) / $displayTime) * 100;
@@ -189,6 +210,19 @@ protected function renderTimeline(array $collectors, float $startTime, int $segm
             $output .= '</tr>';
 
             $styleCount++;
+
+            // Add children if any
+            if ($hasChildren) {
+                $output .= '<tr class="child-row" id="timeline-' . ($styleCount - 1) . '_children" style="' . ($open ? '' : 'display: none;') . '">';
+                $output .= '<td colspan="' . ($segmentCount + 3) . '" class="child-container">';
+                $output .= '<table class="timeline">';
+                $output .= '<tbody>';
+                $output .= $this->renderTimelineRecursive($row['children'], $startTime, $segmentCount, $segmentDuration, $styles, $styleCount, $level + 1, true);
+                $output .= '</tbody>';
+                $output .= '</table>';
+                $output .= '</td>';
+                $output .= '</tr>';
+            }
         }
 
         return $output;
@@ -214,15 +248,51 @@ protected function collectTimelineData($collectors): array
 
         // Sort it
         $sortArray = [
-          array_column($data, 'start'), SORT_NUMERIC, SORT_ASC,
-          array_column($data, 'duration'), SORT_NUMERIC, SORT_DESC,
-          &$data
+            array_column($data, 'start'), SORT_NUMERIC, SORT_ASC,
+            array_column($data, 'duration'), SORT_NUMERIC, SORT_DESC,
+            &$data,
         ];
+
         array_multisort(...$sortArray);
 
+        // Add end time to each element
+        array_walk($data, static function (&$row) {
+            $row['end'] = $row['start'] + $row['duration'];
+        });
+
+        // Group it
+        $data = $this->structureTimelineData($data);
+
         return $data;
     }
 
+    /**
+     * Arranges the already sorted timeline data into a parent => child structure.
+     */
+    protected function structureTimelineData(array $elements): array
+    {
+        // We define ourselves as the first element of the array
+        $element = array_shift($elements);
+
+        // If we have children behind us, collect and attach them to us
+        while (! empty($elements) && $elements[array_key_first($elements)]['end'] <= $element['end']) {
+            $element['children'][] = array_shift($elements);
+        }
+
+        // Make sure our children know whether they have children, too
+        if (isset($element['children'])) {
+            $element['children'] = $this->structureTimelineData($element['children']);
+        }
+
+        // If we have no younger siblings, we can return
+        if (empty($elements)) {
+            return [$element];
+        }
+
+        // Make sure our younger siblings know their relatives, too
+        return array_merge([$element], $this->structureTimelineData($elements));
+    }
+
     /**
      * Returns an array of data from all of the modules
      * that should be displayed in the 'Vars' tab.
diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
index f881dd18d6ec..bc8b4ac44ef7 100644
--- a/system/Debug/Toolbar/Views/toolbar.css
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -186,6 +186,22 @@
   #debug-bar .timeline {
     margin-left: 0;
     width: 100%; }
+    #debug-bar .timeline tr.timeline-parent {
+      cursor: pointer; }
+      #debug-bar .timeline tr.timeline-parent td:first-child nav {
+        background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxwYXRoIGQ9Ik02IDdoMThsLTkgMTV6bTAgMzBoMThsLTkgMTV6bTAgNDVoMThsLTktMTV6bTAgMzBoMThsLTktMTV6bTAgMTJsMTggMThtLTE4IDBsMTgtMTgiIGZpbGw9IiM1NTUiLz48cGF0aCBkPSJNNiAxMjZsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSIjNTU1Ii8+PC9zdmc+") no-repeat scroll 0 0/15px 75px transparent;
+        background-position: 0 25%;
+        display: inline-block;
+        height: 15px;
+        width: 15px;
+        margin-right: 3px;
+        vertical-align: middle; }
+      #debug-bar .timeline tr.timeline-parent.timeline-parent-open td:first-child nav {
+        background-position: 0 75%; }
+    #debug-bar .timeline tr.timeline-parent.timeline-parent-open {
+      background-color: #DFDFDF; }
+    #debug-bar .timeline tr.child-row:hover {
+      background: transparent; }
     #debug-bar .timeline th {
       border-left: 1px solid;
       font-size: 12px;
@@ -200,7 +216,14 @@
       padding: 5px;
       position: relative; }
       #debug-bar .timeline td:first-child {
-        border-left: 0; }
+        border-left: 0;
+        max-width: none; }
+      #debug-bar .timeline td.child-container {
+        padding: 0px; }
+        #debug-bar .timeline td.child-container .timeline{
+          margin: 0px; }
+          #debug-bar .timeline td.child-container td:first-child:not(.child-container){
+            padding-left: calc(5px + 10px * var(--level)); }
     #debug-bar .timeline .timer {
       border-radius: 4px;
       -moz-border-radius: 4px;
diff --git a/system/Debug/Toolbar/Views/toolbar.js b/system/Debug/Toolbar/Views/toolbar.js
index 563cf21cd682..690535f2de0d 100644
--- a/system/Debug/Toolbar/Views/toolbar.js
+++ b/system/Debug/Toolbar/Views/toolbar.js
@@ -141,6 +141,28 @@ var ciDebugBar = {
 		}
 	},
 
+	/**
+	 * Toggle display of timeline child elements
+	 *
+	 * @param obj
+	 */
+	toggleChildRows : function (obj) {
+		if (typeof obj == 'string')
+		{
+			par = document.getElementById(obj + '_parent')
+			obj = document.getElementById(obj + '_children');
+		}
+
+		if (par && obj)
+		{
+			obj.style.display = obj.style.display == 'none' ? '' : 'none';
+			par.classList.toggle('timeline-parent-open');
+		}
+	},
+
+
+	//--------------------------------------------------------------------
+
 	/**
 	 *   Toggle tool bar from full to icon and icon to full
 	 */

From bd15c27f935c8704cb4b9a74bdeb50ec51c4bf9d Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Tue, 29 Jun 2021 23:28:18 -0500
Subject: [PATCH 0193/2325] Updated Query Build custom string option for where
 to remove make it clear the values do not get escaped.

---
 user_guide_src/source/database/queries.rst       |  1 +
 user_guide_src/source/database/query_builder.rst | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/user_guide_src/source/database/queries.rst b/user_guide_src/source/database/queries.rst
index 366b264cc45c..af15bacea038 100644
--- a/user_guide_src/source/database/queries.rst
+++ b/user_guide_src/source/database/queries.rst
@@ -15,6 +15,7 @@ Regular Queries
 
 To submit a query, use the **query** function::
 
+    $db = db_connect();
     $db->query('YOUR QUERY HERE');
 
 The ``query()`` function returns a database result **object** when "read"
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 78c1b3731fd5..342da67461e3 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -244,7 +244,10 @@ This function enables you to set **WHERE** clauses using one of four
 methods:
 
 .. note:: All values passed to this function are escaped automatically,
-    producing safer queries.
+    producing safer queries, except when using a custom string.
+
+.. note:: ``$builder->where()`` accepts an optional third parameter. If you set it to
+    ``false``, CodeIgniter will not try to protect your field or table names.
 
 #. **Simple key/value method:**
 
@@ -294,15 +297,18 @@ methods:
 #. **Custom string:**
     You can write your own clauses manually::
 
+
         $where = "name='Joe' AND status='boss' OR status='active'";
         $builder->where($where);
 
-    ``$builder->where()`` accepts an optional third parameter. If you set it to
-    ``false``, CodeIgniter will not try to protect your field or table names.
+    If you are using user-supplied data within the string, you MUST escape the
+    data manually. Failure to do so could result in SQL injections.
+::
 
-    ::
+        $name = $builder->db->escape('Joe');
+        $where = "name={$name} AND status='boss' OR status='active'";
+        $builder->where($where);
 
-        $builder->where('MATCH (field) AGAINST ("value")', null, false);
 
 #. **Subqueries:**
     You can use an anonymous function to create a subquery.

From 61c01ed40bc3231c61033f31134b8f4f1581cc22 Mon Sep 17 00:00:00 2001
From: Ferenc <qury@vipmail.hu>
Date: Fri, 2 Jul 2021 19:13:54 +0100
Subject: [PATCH 0194/2325] Finalize SQLSRV schema support for 4.2

---
 system/Database/SQLSRV/Builder.php            | 98 +++++++++++++++++--
 system/Database/SQLSRV/Connection.php         |  2 +-
 system/Database/SQLSRV/Forge.php              | 92 +++++++++++++----
 system/Database/SQLSRV/Utils.php              |  8 ++
 .../Database/Live/PreparedQueryTest.php       |  6 +-
 .../Migrations/MigrationRunnerTest.php        |  5 +-
 6 files changed, 181 insertions(+), 30 deletions(-)

diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index cda4fac8a825..d4fe5a85b540 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -170,6 +170,16 @@ protected function _insert(string $table, array $keys, array $unescapedKeys): st
         return $this->keyPermission ? $this->addIdentity($fullTableName, $statement) : $statement;
     }
 
+    /**
+     * Insert batch statement
+     *
+     * Generates a platform-specific insert string from the supplied data.
+     */
+    protected function _insertBatch(string $table, array $keys, array $values): string
+    {
+        return 'INSERT ' . $this->compileIgnore('insert') . 'INTO ' . $this->getFullName($table) . ' (' . implode(', ', $keys) . ') VALUES ' . implode(', ', $values);
+    }
+
     /**
      * Generates a platform-specific update string from the supplied data
      */
@@ -183,12 +193,48 @@ protected function _update(string $table, array $values): string
 
         $fullTableName = $this->getFullName($table);
 
-        $statement = 'UPDATE ' . (empty($this->QBLimit) ? '' : 'TOP(' . $this->QBLimit . ') ') . $fullTableName . ' SET '
-            . implode(', ', $valstr) . $this->compileWhereHaving('QBWhere') . $this->compileOrderBy();
+        $statement = sprintf('UPDATE %s%s SET ', empty($this->QBLimit) ? '' : 'TOP(' . $this->QBLimit . ') ', $fullTableName);
+
+        $statement .= implode(', ', $valstr)
+            . $this->compileWhereHaving('QBWhere')
+            . $this->compileOrderBy();
 
         return $this->keyPermission ? $this->addIdentity($fullTableName, $statement) : $statement;
     }
 
+    /**
+     * Update_Batch statement
+     *
+     * Generates a platform-specific batch update string from the supplied data
+     */
+    protected function _updateBatch(string $table, array $values, string $index): string
+    {
+        $ids   = [];
+        $final = [];
+
+        foreach ($values as $val) {
+            $ids[] = $val[$index];
+
+            foreach (array_keys($val) as $field) {
+                if ($field !== $index) {
+                    $final[$field][] = 'WHEN ' . $index . ' = ' . $val[$index] . ' THEN ' . $val[$field];
+                }
+            }
+        }
+
+        $cases = '';
+
+        foreach ($final as $k => $v) {
+            $cases .= $k . " = CASE \n"
+                . implode("\n", $v) . "\n"
+                . 'ELSE ' . $k . ' END, ';
+        }
+
+        $this->where($index . ' IN(' . implode(',', $ids) . ')', null, false);
+
+        return 'UPDATE ' . $this->compileIgnore('update') . ' ' . $this->getFullName($table) . ' SET ' . substr($cases, 0, -2) . $this->compileWhereHaving('QBWhere');
+    }
+
     /**
      * Increments a numeric column by the specified value.
      *
@@ -203,6 +249,7 @@ public function increment(string $column, int $value = 1)
         } else {
             $values = [$column => "{$column} + {$value}"];
         }
+
         $sql = $this->_update($this->QBFrom[0], $values);
 
         return $this->db->query($sql, $this->binds, false);
@@ -222,6 +269,7 @@ public function decrement(string $column, int $value = 1)
         } else {
             $values = [$column => "{$column} + {$value}"];
         }
+
         $sql = $this->_update($this->QBFrom[0], $values);
 
         return $this->db->query($sql, $this->binds, false);
@@ -304,9 +352,10 @@ public function replace(?array $set = null)
             return $sql;
         }
 
-        $this->db->simpleQuery('SET IDENTITY_INSERT ' . $this->db->escapeIdentifiers($table) . ' ON');
+        $this->db->simpleQuery('SET IDENTITY_INSERT ' . $this->getFullName($table) . ' ON');
+
         $result = $this->db->query($sql, $this->binds, false);
-        $this->db->simpleQuery('SET IDENTITY_INSERT ' . $this->db->escapeIdentifiers($table) . ' OFF');
+        $this->db->simpleQuery('SET IDENTITY_INSERT ' . $this->getFullName($table) . ' OFF');
 
         return $result;
     }
@@ -410,6 +459,40 @@ protected function maxMinAvgSum(string $select = '', string $alias = '', string
         return $this;
     }
 
+    /**
+     * "Count All" query
+     *
+     * Generates a platform-specific query string that counts all records in
+     * the particular table
+     *
+     * @param bool $reset Are we want to clear query builder values?
+     *
+     * @return int|string when $test = true
+     */
+    public function countAll(bool $reset = true)
+    {
+        $table = $this->QBFrom[0];
+
+        $sql = $this->countString . $this->db->escapeIdentifiers('numrows') . ' FROM ' . $this->getFullName($table);
+
+        if ($this->testMode) {
+            return $sql;
+        }
+
+        $query = $this->db->query($sql, null, false);
+        if (empty($query->getResult())) {
+            return 0;
+        }
+
+        $query = $query->getRow();
+
+        if ($reset === true) {
+            $this->resetSelect();
+        }
+
+        return (int) $query->numrows;
+    }
+
     /**
      * Delete statement
      */
@@ -504,9 +587,10 @@ protected function compileSelect($selectOverride = false): string
         }
 
         $sql .= $this->compileWhereHaving('QBWhere')
-                . $this->compileGroupBy()
-                . $this->compileWhereHaving('QBHaving')
-                . $this->compileOrderBy(); // ORDER BY
+            . $this->compileGroupBy()
+            . $this->compileWhereHaving('QBHaving')
+            . $this->compileOrderBy(); // ORDER BY
+
         // LIMIT
         if ($this->QBLimit) {
             $sql = $this->_limit($sql . "\n");
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index f09a96d69213..3c86839d2e88 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -215,7 +215,7 @@ protected function _listColumns(string $table = ''): string
      */
     protected function _indexData(string $table): array
     {
-        $sql = 'EXEC sp_helpindex ' . $this->escape($table);
+        $sql = 'EXEC sp_helpindex ' . $this->escape($this->schema . '.' . $table);
 
         if (($query = $this->query($sql)) === false) {
             throw new DatabaseException(lang('Database.failGetIndexData'));
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
index 43131698703f..aa646ccf2d6f 100755
--- a/system/Database/SQLSRV/Forge.php
+++ b/system/Database/SQLSRV/Forge.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Database\SQLSRV;
 
+use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Database\Forge as BaseForge;
 
 /**
@@ -23,7 +24,7 @@ class Forge extends BaseForge
      *
      * @var string
      */
-    protected $dropConstraintStr = 'ALTER TABLE %s DROP CONSTRAINT %s';
+    protected $dropConstraintStr;
 
     /**
      * CREATE DATABASE IF statement
@@ -61,7 +62,7 @@ class Forge extends BaseForge
      *
      * @var string
      */
-    protected $renameTableStr = 'EXEC sp_rename %s , %s ;';
+    protected $renameTableStr;
 
     /**
      * UNSIGNED support
@@ -80,21 +81,32 @@ class Forge extends BaseForge
      *
      * @var string
      */
-    protected $createTableIfStr = "IF NOT EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nCREATE TABLE";
+    protected $createTableIfStr;
 
     /**
      * CREATE TABLE statement
      *
      * @var string
      */
-    protected $createTableStr = "%s %s (%s\n) ";
+    protected $createTableStr;
 
-    /**
-     * DROP TABLE IF statement
-     *
-     * @var string
-     */
-    protected $_drop_table_if = "IF EXISTS (SELECT * FROM sysobjects WHERE ID = object_id(N'%s') AND OBJECTPROPERTY(id, N'IsUserTable') = 1)\nDROP TABLE";
+    public function __construct(BaseConnection $db)
+    {
+        parent::__construct($db);
+
+        $this->createTableIfStr = 'IF NOT EXISTS'
+            . '(SELECT t.name, s.name as schema_name, t.type_desc '
+            . 'FROM sys.tables t '
+            . 'INNER JOIN sys.schemas s on s.schema_id = t.schema_id '
+            . "WHERE s.name=N'" . $this->db->schema . "' "
+            . "AND t.name=REPLACE(N'%s', '\"', '') "
+            . "AND t.type_desc='USER_TABLE')\nCREATE TABLE ";
+
+        $this->createTableStr = '%s ' . $this->db->escapeIdentifiers($this->db->schema) . ".%s (%s\n) ";
+        $this->renameTableStr = 'EXEC sp_rename [' . $this->db->escapeIdentifiers($this->db->schema) . '.%s] , %s ;';
+
+        $this->dropConstraintStr = 'ALTER TABLE ' . $this->db->escapeIdentifiers($this->db->schema) . '.%s DROP CONSTRAINT %s';
+    }
 
     /**
      * CREATE TABLE attributes
@@ -111,9 +123,6 @@ protected function _createTableAttributes(array $attributes): string
      */
     protected function _alterTable(string $alterType, string $table, $field)
     {
-        if ($alterType === 'ADD') {
-            return parent::_alterTable($alterType, $table, $field);
-        }
 
         // Handle DROP here
         if ($alterType === 'DROP') {
@@ -133,7 +142,7 @@ protected function _alterTable(string $alterType, string $table, $field)
                 }
             }
 
-            $sql = 'ALTER TABLE [' . $table . '] DROP ';
+            $sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($this->db->schema) . '.' . $this->db->escapeIdentifiers($table) . ' DROP ';
 
             $fields = array_map(static function ($item) {
                 return 'COLUMN [' . trim($item) . ']';
@@ -142,10 +151,19 @@ protected function _alterTable(string $alterType, string $table, $field)
             return $sql . implode(',', $fields);
         }
 
-        $sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
+        $sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($this->db->schema) . '.' . $this->db->escapeIdentifiers($table);
+        $sql .= ($alterType === 'ADD') ? 'ADD ' : ' ';
 
         $sqls = [];
 
+        if ($alterType === 'ADD') {
+            foreach ($field as $data) {
+                $sqls[] = $sql . ($data['_literal'] !== false ? $data['_literal'] : $this->_processColumn($data));
+            }
+
+            return $sqls;
+        }
+
         foreach ($field as $data) {
             if ($data['_literal'] !== false) {
                 return false;
@@ -198,6 +216,46 @@ protected function _dropIndex(string $table, object $indexData)
         return $this->db->simpleQuery($sql);
     }
 
+    /**
+     * Process indexes
+     *
+     * @return array|string
+     */
+    protected function _processIndexes(string $table)
+    {
+        $sqls = [];
+
+        for ($i = 0, $c = count($this->keys); $i < $c; $i++) {
+            $this->keys[$i] = (array) $this->keys[$i];
+
+            for ($i2 = 0, $c2 = count($this->keys[$i]); $i2 < $c2; $i2++) {
+                if (! isset($this->fields[$this->keys[$i][$i2]])) {
+                    unset($this->keys[$i][$i2]);
+                }
+            }
+
+            if (count($this->keys[$i]) <= 0) {
+                continue;
+            }
+
+            if (in_array($i, $this->uniqueKeys, true)) {
+                $sqls[] = 'ALTER TABLE '
+                    . $this->db->escapeIdentifiers($this->db->schema) . '.' . $this->db->escapeIdentifiers($table)
+                    . ' ADD CONSTRAINT ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
+                    . ' UNIQUE (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
+
+                continue;
+            }
+
+            $sqls[] = 'CREATE INDEX '
+                . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
+                . ' ON ' . $this->db->escapeIdentifiers($this->db->schema) . '.' . $this->db->escapeIdentifiers($table)
+                . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
+        }
+
+        return $sqls;
+    }
+
     /**
      * Process column
      */
@@ -229,7 +287,7 @@ protected function _processForeignKeys(string $table): string
 
             $sql .= ",\n\t CONSTRAINT " . $this->db->escapeIdentifiers($nameIndex)
                 . ' FOREIGN KEY (' . $this->db->escapeIdentifiers($field) . ') '
-                . ' REFERENCES ' . $this->db->escapeIdentifiers($this->db->getPrefix() . $fkey['table']) . ' (' . $this->db->escapeIdentifiers($fkey['field']) . ')';
+                . ' REFERENCES ' . $this->db->escapeIdentifiers($this->db->schema) . '.' . $this->db->escapeIdentifiers($this->db->getPrefix() . $fkey['table']) . ' (' . $this->db->escapeIdentifiers($fkey['field']) . ')';
 
             if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true)) {
                 $sql .= ' ON DELETE ' . $fkey['onDelete'];
@@ -245,8 +303,6 @@ protected function _processForeignKeys(string $table): string
 
     /**
      * Process primary keys
-     *
-     * @param string $table Table name
      */
     protected function _processPrimaryKeys(string $table): string
     {
diff --git a/system/Database/SQLSRV/Utils.php b/system/Database/SQLSRV/Utils.php
index da4ac8679b9e..cf94d3dad783 100755
--- a/system/Database/SQLSRV/Utils.php
+++ b/system/Database/SQLSRV/Utils.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Database\SQLSRV;
 
 use CodeIgniter\Database\BaseUtils;
+use CodeIgniter\Database\ConnectionInterface;
 use CodeIgniter\Database\Exceptions\DatabaseException;
 
 /**
@@ -33,6 +34,13 @@ class Utils extends BaseUtils
      */
     protected $optimizeTable = 'ALTER INDEX all ON %s REORGANIZE';
 
+    public function __construct(ConnectionInterface &$db)
+    {
+        parent::__construct($db);
+
+        $this->optimizeTable = 'ALTER INDEX all ON  ' . $this->db->schema . '.%s REORGANIZE';
+    }
+
     /**
      * Platform dependent version of the backup function.
      *
diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php
index b71c0498f80e..06999ea93f4c 100644
--- a/tests/system/Database/Live/PreparedQueryTest.php
+++ b/tests/system/Database/Live/PreparedQueryTest.php
@@ -50,7 +50,7 @@ public function testPrepareReturnsPreparedQuery()
 
         if ($this->db->DBDriver === 'SQLSRV') {
             $database = $this->db->getDatabase();
-            $expected = "INSERT INTO {$ec}{$database}{$ec}.{$ec}dbo{$ec}.{$ec}{$pre}user{$ec} ({$ec}name{$ec},{$ec}email{$ec}) VALUES ({$placeholders})";
+            $expected = "INSERT INTO {$ec}{$database}{$ec}.{$ec}{$this->db->schema}{$ec}.{$ec}{$pre}user{$ec} ({$ec}name{$ec},{$ec}email{$ec}) VALUES ({$placeholders})";
         } else {
             $expected = "INSERT INTO {$ec}{$pre}user{$ec} ({$ec}name{$ec}, {$ec}email{$ec}) VALUES ({$placeholders})";
         }
@@ -107,6 +107,10 @@ public function testExecuteRunsQueryAndReturnsManualResultObject()
         $query = $this->db->prepare(static function ($db) {
             $sql = "INSERT INTO {$db->DBPrefix}user (name, email, country) VALUES (?, ?, ?)";
 
+            if ($db->DBDriver === 'SQLSRV') {
+                $sql = "INSERT INTO {$db->schema}.{$db->DBPrefix}user (name, email, country) VALUES (?, ?, ?)";
+            }
+
             return (new Query($db))->setQuery($sql);
         });
 
diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php
index 9dee57a3434e..fa867c7e1f0e 100644
--- a/tests/system/Database/Migrations/MigrationRunnerTest.php
+++ b/tests/system/Database/Migrations/MigrationRunnerTest.php
@@ -93,7 +93,7 @@ public function testGetHistory()
         ];
 
         if ($this->db->DBDriver === 'SQLSRV') {
-            $this->db->simpleQuery('SET IDENTITY_INSERT ' . $this->db->prefixTable('migrations') . ' ON');
+            $this->db->simpleQuery('SET IDENTITY_INSERT ' . $this->db->escapeIdentifiers($this->db->schema) . '.' . $this->db->prefixTable('migrations') . ' ON');
         }
 
         $this->hasInDatabase('migrations', $expected);
@@ -110,8 +110,7 @@ public function testGetHistory()
         $this->assertSame($expected, $history);
 
         if ($this->db->DBDriver === 'SQLSRV') {
-            $this->db->simpleQuery('SET IDENTITY_INSERT ' . $this->db->prefixTable('migrations') . ' OFF');
-
+            $this->db->simpleQuery('SET IDENTITY_INSERT ' . $this->db->escapeIdentifiers($this->db->schema) . '.' . $this->db->prefixTable('migrations') . ' OFF');
             $db = $this->getPrivateProperty($runner, 'db');
             $db->table('migrations')->delete(['id' => 4]);
         }

From 906daf8a1d92a910a8d997d26f2f8508a8875ca6 Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Sun, 4 Jul 2021 10:38:37 +0200
Subject: [PATCH 0195/2325] Update Throttler docs [ci skip]

---
 user_guide_src/source/libraries/throttler.rst | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/libraries/throttler.rst b/user_guide_src/source/libraries/throttler.rst
index 22d7829899cd..298825acf8f2 100644
--- a/user_guide_src/source/libraries/throttler.rst
+++ b/user_guide_src/source/libraries/throttler.rst
@@ -75,10 +75,9 @@ along the lines of::
         {
             $throttler = Services::throttler();
 
-            // Restrict an IP address to no more
-            // than 1 request per second across the
-            // entire site.
-            if ($throttler->check($request->getIPAddress(), 60, MINUTE) === false) {
+            // Restrict an IP address to no more than 1 request
+            // per second across the entire site.
+            if ($throttler->check(md5($request->getIPAddress()), 60, MINUTE) === false) {
                 return Services::response()->setStatusCode(429);
             }
         }

From 03d778c864666f4d2d2361c3a4eb2bf33daed54e Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Sun, 4 Jul 2021 11:34:23 +0200
Subject: [PATCH 0196/2325] Fix getVar method when trying to get variable that
 does not exists

---
 system/HTTP/IncomingRequest.php           | 4 ++++
 tests/system/HTTP/IncomingRequestTest.php | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 4dec7ebc610f..21894949cb29 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -535,6 +535,10 @@ public function getJsonVar(string $index, bool $assoc = false, ?int $filter = nu
 
         $data = dot_array_search($index, $this->getJSON(true));
 
+        if ($data === null) {
+            return null;
+        }
+
         if (! is_array($data)) {
             $filter = $filter ?? FILTER_DEFAULT;
             $flags  = is_array($flags) ? $flags : (is_numeric($flags) ? (int) $flags : 0);
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index a64445232aba..4e837436ef12 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -247,7 +247,7 @@ public function testNegotiatesNot()
 
     public function testNegotiatesCharset()
     {
-        //      $_SERVER['HTTP_ACCEPT_CHARSET'] = 'iso-8859-5, unicode-1-1;q=0.8';
+        // $_SERVER['HTTP_ACCEPT_CHARSET'] = 'iso-8859-5, unicode-1-1;q=0.8';
         $this->request->setHeader('Accept-Charset', 'iso-8859-5, unicode-1-1;q=0.8');
 
         $this->assertSame(strtolower($this->request->config->charset), $this->request->negotiate('charset', ['iso-8859', 'unicode-1-2']));
@@ -299,6 +299,7 @@ public function testCanGetAVariableFromJson()
         $request = new IncomingRequest($config, new URI(), $json, new UserAgent());
 
         $this->assertSame('bar', $request->getJsonVar('foo'));
+        $this->assertNull($request->getJsonVar('notExists'));
         $jsonVar = $request->getJsonVar('baz');
         $this->assertIsObject($jsonVar);
         $this->assertSame('buzz', $jsonVar->fizz);
@@ -354,6 +355,7 @@ public function testGetVarWorksWithJson()
 
         $this->assertSame('bar', $request->getVar('foo'));
         $this->assertSame('buzz', $request->getVar('fizz'));
+        $this->assertNull($request->getVar('notExists'));
 
         $multiple = $request->getVar(['foo', 'fizz']);
         $this->assertIsArray($multiple);

From abd07f95ec89ca8eeb691609ab207ae972741d47 Mon Sep 17 00:00:00 2001
From: Michal Sniatala <michal@sniatala.pl>
Date: Sun, 4 Jul 2021 21:20:17 +0200
Subject: [PATCH 0197/2325] Update tests/system/HTTP/IncomingRequestTest.php

Co-authored-by: MGatner <mgatner@icloud.com>
---
 tests/system/HTTP/IncomingRequestTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 4e837436ef12..6f6172af54a7 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -300,6 +300,7 @@ public function testCanGetAVariableFromJson()
 
         $this->assertSame('bar', $request->getJsonVar('foo'));
         $this->assertNull($request->getJsonVar('notExists'));
+
         $jsonVar = $request->getJsonVar('baz');
         $this->assertIsObject($jsonVar);
         $this->assertSame('buzz', $jsonVar->fizz);

From 1182e065a22a079c2aff605558b64137cf0b6025 Mon Sep 17 00:00:00 2001
From: Michal Sniatala <michal@sniatala.pl>
Date: Sun, 4 Jul 2021 21:20:23 +0200
Subject: [PATCH 0198/2325] Update tests/system/HTTP/IncomingRequestTest.php

Co-authored-by: MGatner <mgatner@icloud.com>
---
 tests/system/HTTP/IncomingRequestTest.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 6f6172af54a7..1e975359a120 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -342,11 +342,7 @@ public function testGetJsonVarCanFilter()
 
     public function testGetVarWorksWithJson()
     {
-        $jsonObj = [
-            'foo'  => 'bar',
-            'fizz' => 'buzz',
-        ];
-        $json = json_encode($jsonObj);
+        $json = json_encode(['foo' => 'bar', 'fizz' => 'buzz']);
 
         $config          = new App();
         $config->baseURL = 'http://example.com/';

From 57c53427c4c38e9f0a2ead4211efe4a4b6af999c Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Tue, 6 Jul 2021 12:34:23 +0200
Subject: [PATCH 0199/2325] Do not overwrite startTime.

---
 system/CodeIgniter.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 4350876bd3a2..4fd3596f94f3 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -490,7 +490,9 @@ protected function bootstrapEnvironment()
      */
     protected function startBenchmark()
     {
-        $this->startTime = microtime(true);
+        if($this->startTime === null) {
+            $this->startTime = microtime(true);
+        }
 
         $this->benchmark = Services::timer();
         $this->benchmark->start('total_execution', $this->startTime);

From d263210eef0516d7dd44e90b9910ae32c15b8cf9 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Sun, 4 Jul 2021 18:22:15 +0200
Subject: [PATCH 0200/2325] Enable general benchmarking for filters.

Fix copy paste.
---
 system/CodeIgniter.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 4fd3596f94f3..f18fc38384b6 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -357,7 +357,7 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
     {
         $routeFilter = $this->tryToRouteIt($routes);
 
-        // Run "before" filters
+        // Start up the filters
         $filters = Services::filters();
 
         // If any filters were specified within the routes file,
@@ -371,7 +371,10 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
 
         // Never run filters when running through Spark cli
         if (! defined('SPARKED')) {
+            // Run "before" filters
+            $this->benchmark->start('before_filters');
             $possibleResponse = $filters->run($uri, 'before');
+            $this->benchmark->stop('before_filters');
 
             // If a ResponseInterface instance is returned then send it back to the client and stop
             if ($possibleResponse instanceof ResponseInterface) {
@@ -410,8 +413,11 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
         // Never run filters when running through Spark cli
         if (! defined('SPARKED')) {
             $filters->setResponse($this->response);
+
             // Run "after" filters
+            $this->benchmark->start('after_filters');
             $response = $filters->run($uri, 'after');
+            $this->benchmark->stop('after_filters');
         } else {
             $response = $this->response;
 

From 3a6cf804692a91fe0f0c58352ad131d9d1c25bf8 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Mon, 5 Jul 2021 09:24:42 +0200
Subject: [PATCH 0201/2325] Add toolbar timer styles to sass files.

---
 admin/css/debug-toolbar/toolbar.scss   | 53 ++++++++++++++++++++++++++
 system/Debug/Toolbar/Views/toolbar.css | 36 ++++++++---------
 2 files changed, 71 insertions(+), 18 deletions(-)

diff --git a/admin/css/debug-toolbar/toolbar.scss b/admin/css/debug-toolbar/toolbar.scss
index 8669d0ac12ff..d06731db6ffe 100644
--- a/admin/css/debug-toolbar/toolbar.scss
+++ b/admin/css/debug-toolbar/toolbar.scss
@@ -326,6 +326,23 @@
 
 			&:first-child {
 				border-left: 0;
+				max-width: none;
+			}
+
+			&.child-container {
+				padding: 0px;
+
+				.timeline {
+					margin: 0px;
+
+					td {
+						&:first-child {
+							&:not(.child-container) {
+								padding-left: calc(5px + 10px * var(--level));
+							}
+						}
+					}
+				}
 			}
 		}
 
@@ -336,6 +353,42 @@
 			position: absolute;
 			top: 30%;
 		}
+
+		.timeline-parent{
+			cursor: pointer;
+
+			td {
+				&:first-child {
+					nav {
+						background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxwYXRoIGQ9Ik02IDdoMThsLTkgMTV6bTAgMzBoMThsLTkgMTV6bTAgNDVoMThsLTktMTV6bTAgMzBoMThsLTktMTV6bTAgMTJsMTggMThtLTE4IDBsMTgtMTgiIGZpbGw9IiM1NTUiLz48cGF0aCBkPSJNNiAxMjZsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSIjNTU1Ii8+PC9zdmc+") no-repeat scroll 0 0/15px 75px transparent;
+						background-position: 0 25%;
+						display: inline-block;
+						height: 15px;
+						width: 15px;
+						margin-right: 3px;
+						vertical-align: middle;
+					}
+				}
+			}
+		}
+
+		.timeline-parent-open {
+			background-color: #DFDFDF;
+
+			td {
+				&:first-child {
+					nav {
+						background-position: 0 75%;
+					}
+				}
+			}
+		}
+
+		.child-row {
+			&:hover {
+				background: transparent;
+			}
+		}
 	}
 
 	// The "Routes" tab
diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
index bc8b4ac44ef7..bd080de2b1c8 100644
--- a/system/Debug/Toolbar/Views/toolbar.css
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -186,22 +186,6 @@
   #debug-bar .timeline {
     margin-left: 0;
     width: 100%; }
-    #debug-bar .timeline tr.timeline-parent {
-      cursor: pointer; }
-      #debug-bar .timeline tr.timeline-parent td:first-child nav {
-        background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxwYXRoIGQ9Ik02IDdoMThsLTkgMTV6bTAgMzBoMThsLTkgMTV6bTAgNDVoMThsLTktMTV6bTAgMzBoMThsLTktMTV6bTAgMTJsMTggMThtLTE4IDBsMTgtMTgiIGZpbGw9IiM1NTUiLz48cGF0aCBkPSJNNiAxMjZsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSIjNTU1Ii8+PC9zdmc+") no-repeat scroll 0 0/15px 75px transparent;
-        background-position: 0 25%;
-        display: inline-block;
-        height: 15px;
-        width: 15px;
-        margin-right: 3px;
-        vertical-align: middle; }
-      #debug-bar .timeline tr.timeline-parent.timeline-parent-open td:first-child nav {
-        background-position: 0 75%; }
-    #debug-bar .timeline tr.timeline-parent.timeline-parent-open {
-      background-color: #DFDFDF; }
-    #debug-bar .timeline tr.child-row:hover {
-      background: transparent; }
     #debug-bar .timeline th {
       border-left: 1px solid;
       font-size: 12px;
@@ -220,9 +204,9 @@
         max-width: none; }
       #debug-bar .timeline td.child-container {
         padding: 0px; }
-        #debug-bar .timeline td.child-container .timeline{
+        #debug-bar .timeline td.child-container .timeline {
           margin: 0px; }
-          #debug-bar .timeline td.child-container td:first-child:not(.child-container){
+          #debug-bar .timeline td.child-container .timeline td:first-child:not(.child-container) {
             padding-left: calc(5px + 10px * var(--level)); }
     #debug-bar .timeline .timer {
       border-radius: 4px;
@@ -232,6 +216,22 @@
       padding: 5px;
       position: absolute;
       top: 30%; }
+    #debug-bar .timeline .timeline-parent {
+      cursor: pointer; }
+      #debug-bar .timeline .timeline-parent td:first-child nav {
+        background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxwYXRoIGQ9Ik02IDdoMThsLTkgMTV6bTAgMzBoMThsLTkgMTV6bTAgNDVoMThsLTktMTV6bTAgMzBoMThsLTktMTV6bTAgMTJsMTggMThtLTE4IDBsMTgtMTgiIGZpbGw9IiM1NTUiLz48cGF0aCBkPSJNNiAxMjZsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSIjNTU1Ii8+PC9zdmc+") no-repeat scroll 0 0/15px 75px transparent;
+        background-position: 0 25%;
+        display: inline-block;
+        height: 15px;
+        width: 15px;
+        margin-right: 3px;
+        vertical-align: middle; }
+    #debug-bar .timeline .timeline-parent-open {
+      background-color: #DFDFDF; }
+      #debug-bar .timeline .timeline-parent-open td:first-child nav {
+        background-position: 0 75%; }
+    #debug-bar .timeline .child-row:hover {
+      background: transparent; }
   #debug-bar .route-params,
   #debug-bar .route-params-item {
     vertical-align: top; }

From 971f511899fde371a3bc5c6470d5cc27a8b8bca4 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Wed, 7 Jul 2021 13:21:55 +0200
Subject: [PATCH 0202/2325] Unify scss styling and switch to spaces.

---
 admin/css/debug-toolbar/_graphic-charter.scss |  18 +-
 admin/css/debug-toolbar/_mixins.scss          |  13 +-
 admin/css/debug-toolbar/_theme-dark.scss      | 257 +++---
 admin/css/debug-toolbar/_theme-light.scss     | 250 +++---
 admin/css/debug-toolbar/toolbar.scss          | 838 +++++++++---------
 system/Debug/Toolbar/Views/toolbar.css        |  23 +-
 6 files changed, 718 insertions(+), 681 deletions(-)

diff --git a/admin/css/debug-toolbar/_graphic-charter.scss b/admin/css/debug-toolbar/_graphic-charter.scss
index 9e88e7177551..522f07f6e255 100644
--- a/admin/css/debug-toolbar/_graphic-charter.scss
+++ b/admin/css/debug-toolbar/_graphic-charter.scss
@@ -2,19 +2,19 @@
 // ========================================================================== */
 
 // Themes
-$t-dark: #252525;
+$t-dark:  #252525;
 $t-light: #FFFFFF;
 
 // Glossy colors
-$g-blue: #5BC0DE;
-$g-gray: #434343;
-$g-green: #9ACE25;
+$g-blue:   #5BC0DE;
+$g-gray:   #434343;
+$g-green:  #9ACE25;
 $g-orange: #DD8615;
-$g-red: #DD4814;
+$g-red:    #DD4814;
 
 // Matt colors
-$m-blue: #D8EAF0;
-$m-gray: #DFDFDF;
-$m-green: #DFF0D8;
+$m-blue:   #D8EAF0;
+$m-gray:   #DFDFDF;
+$m-green:  #DFF0D8;
 $m-orange: #FDC894;
-$m-red: #EF9090;
+$m-red:    #EF9090;
diff --git a/admin/css/debug-toolbar/_mixins.scss b/admin/css/debug-toolbar/_mixins.scss
index c5bde5f5f6da..69af2b67c475 100644
--- a/admin/css/debug-toolbar/_mixins.scss
+++ b/admin/css/debug-toolbar/_mixins.scss
@@ -2,12 +2,13 @@
 // ========================================================================== */
 
 @mixin border-radius($radius) {
-					border-radius: $radius;
-		 -moz-border-radius: $radius;
-	-webkit-border-radius: $radius;
+            border-radius: $radius;
+       -moz-border-radius: $radius;
+    -webkit-border-radius: $radius;
 }
+
 @mixin box-shadow($left, $top, $radius, $color) {
-					box-shadow: $left $top $radius $color;
-		 -moz-box-shadow: $left $top $radius $color;
-	-webkit-box-shadow: $left $top $radius $color;
+            box-shadow: $left $top $radius $color;
+       -moz-box-shadow: $left $top $radius $color;
+    -webkit-box-shadow: $left $top $radius $color;
 }
diff --git a/admin/css/debug-toolbar/_theme-dark.scss b/admin/css/debug-toolbar/_theme-dark.scss
index 56d4a4bbbac3..b41e8fb086af 100644
--- a/admin/css/debug-toolbar/_theme-dark.scss
+++ b/admin/css/debug-toolbar/_theme-dark.scss
@@ -12,11 +12,14 @@
 // ========================================================================== */
 
 #debug-icon {
-	background-color: $t-dark;
-	@include box-shadow(0, 0, 4px, $m-gray);
-	a:active, a:link, a:visited {
-		color: $g-orange;
-	}
+    background-color: $t-dark;
+    @include box-shadow(0, 0, 4px, $m-gray);
+
+    a:active,
+    a:link,
+    a:visited {
+        color: $g-orange;
+    }
 }
 
 
@@ -24,119 +27,130 @@
 // ========================================================================== */
 
 #debug-bar {
- 	background-color: $t-dark;
- 	color: $m-gray;
-
-	// Reset to prevent conflict with other CSS files
- 	h1,
-	h2,
-	h3,
-	p,
-	a,
-	button,
-	table,
-	thead,
-	tr,
-	td,
-	button,
-	.toolbar {
-		background-color: transparent;
- 		color: $m-gray;
- 	}
-
-	// Buttons
-	button {
-		background-color: $t-dark;
-	}
-
-	// Tables
- 	table {
- 		strong {
-			color: $m-orange;
- 		}
- 		tbody tr {
- 			&:hover {
- 				background-color: $g-gray;
- 			}
- 			&.current {
- 				background-color: $m-orange;
-				td {
-					color: $t-dark;
-				}
-				&:hover td {
-	 				background-color: $g-red;
-					color: $t-light;
-	 			}
- 			}
- 		}
- 	}
-
-	// The toolbar
- 	.toolbar {
- 		background-color: $g-gray;
- 		@include box-shadow(0, 0, 4px, $g-gray);
-		img {
-			filter: brightness(0) invert(1);
-		}
- 	}
-
-	// Fixed top
-	&.fixed-top {
-		& .toolbar {
-			@include box-shadow(0, 0, 4px, $g-gray);
-		}
-		.tab {
-			@include box-shadow(0, 1px, 4px, $g-gray);
-		}
-	}
-
-	// "Muted" elements
-	.muted {
- 		color: $m-gray;
- 		td {
- 			color: $g-gray;
- 		}
- 		&:hover td {
- 			color: $m-gray;
- 		}
- 	}
-
-	// The toolbar preferences
-	#toolbar-position,
-	#toolbar-theme, {
-		filter: brightness(0) invert(0.6);
-	}
-
-	// The toolbar menus
- 	.ci-label {
- 		&.active {
- 			background-color: $t-dark;
- 		}
- 		&:hover {
- 			background-color: $t-dark;
- 		}
- 		.badge {
- 			background-color: $g-blue;
- 			color: $m-gray;
- 		}
- 	}
-
-	// The tabs container
- 	.tab {
- 		background-color: $t-dark;
-		@include box-shadow(0, -1px, 4px, $g-gray);
- 	}
-
-	// The "Timeline" tab
-	.timeline {
- 		th,
-		td {
- 			border-color: $g-gray;
- 		}
- 		.timer {
- 			background-color: $g-orange;
- 		}
- 	}
+    background-color: $t-dark;
+    color: $m-gray;
+
+    // Reset to prevent conflict with other CSS files
+    h1,
+    h2,
+    h3,
+    p,
+    a,
+    button,
+    table,
+    thead,
+    tr,
+    td,
+    button,
+    .toolbar {
+        background-color: transparent;
+        color: $m-gray;
+    }
+
+    // Buttons
+    button {
+        background-color: $t-dark;
+    }
+
+    // Tables
+    table {
+        strong {
+            color: $m-orange;
+        }
+
+        tbody tr {
+            &:hover {
+                background-color: $g-gray;
+            }
+
+            &.current {
+                background-color: $m-orange;
+
+                td {
+                    color: $t-dark;
+                }
+
+                &:hover td {
+                    background-color: $g-red;
+                    color: $t-light;
+                }
+            }
+        }
+    }
+
+    // The toolbar
+    .toolbar {
+        background-color: $g-gray;
+        @include box-shadow(0, 0, 4px, $g-gray);
+
+        img {
+            filter: brightness(0) invert(1);
+        }
+    }
+
+    // Fixed top
+    &.fixed-top {
+        .toolbar {
+            @include box-shadow(0, 0, 4px, $g-gray);
+        }
+
+        .tab {
+            @include box-shadow(0, 1px, 4px, $g-gray);
+        }
+    }
+
+    // "Muted" elements
+    .muted {
+        color: $m-gray;
+
+        td {
+            color: $g-gray;
+        }
+
+        &:hover td {
+            color: $m-gray;
+        }
+    }
+
+    // The toolbar preferences
+    #toolbar-position,
+    #toolbar-theme {
+        filter: brightness(0) invert(0.6);
+    }
+
+    // The toolbar menus
+    .ci-label {
+        &.active {
+            background-color: $t-dark;
+        }
+
+        &:hover {
+            background-color: $t-dark;
+        }
+
+        .badge {
+            background-color: $g-blue;
+            color: $m-gray;
+        }
+    }
+
+    // The tabs container
+    .tab {
+        background-color: $t-dark;
+        @include box-shadow(0, -1px, 4px, $g-gray);
+    }
+
+    // The "Timeline" tab
+    .timeline {
+        th,
+        td {
+            border-color: $g-gray;
+        }
+
+        .timer {
+            background-color: $g-orange;
+        }
+    }
 }
 
 
@@ -144,9 +158,10 @@
 // ========================================================================== */
 
 .debug-view.show-view {
-	border-color: $g-orange;
+    border-color: $g-orange;
 }
+
 .debug-view-path {
-	background-color: $m-orange;
-	color: $g-gray;
+    background-color: $m-orange;
+    color: $g-gray;
 }
diff --git a/admin/css/debug-toolbar/_theme-light.scss b/admin/css/debug-toolbar/_theme-light.scss
index 744997a4080d..7148cd4c4f6f 100644
--- a/admin/css/debug-toolbar/_theme-light.scss
+++ b/admin/css/debug-toolbar/_theme-light.scss
@@ -12,11 +12,14 @@
 // ========================================================================== */
 
 #debug-icon {
-	background-color: $t-light;
-	@include box-shadow(0, 0, 4px, $m-gray);
-	a:active, a:link, a:visited {
-		color: $g-orange;
-	}
+    background-color: $t-light;
+    @include box-shadow(0, 0, 4px, $m-gray);
+
+    a:active,
+    a:link,
+    a:visited {
+        color: $g-orange;
+    }
 }
 
 
@@ -24,116 +27,126 @@
 // ========================================================================== */
 
 #debug-bar {
- 	background-color: $t-light;
- 	color: $g-gray;
-
-	// Reset to prevent conflict with other CSS files */
- 	h1,
-	h2,
-	h3,
-	p,
-	a,
-	button,
-	table,
-	thead,
-	tr,
-	td,
-	button,
-	.toolbar {
-		background-color: transparent;
-		color: $g-gray;
-	}
-
-	// Buttons
-	button {
-		background-color: $t-light;
-	}
-
-	// Tables
- 	table {
- 		strong {
- 			color: $m-orange;
- 		}
- 		tbody tr {
- 			&:hover {
- 				background-color: $m-gray;
- 			}
- 			&.current {
- 				background-color: $m-orange;
-				&:hover td {
-	 				background-color: $g-red;
-					color: $t-light;
-	 			}
- 			}
- 		}
- 	}
-
-	// The toolbar
- 	.toolbar {
- 		background-color: $t-light;
- 		@include box-shadow(0, 0, 4px, $m-gray);
-		img {
-			filter: brightness(0) invert(0.4);
-		}
- 	}
-
-	// Fixed top
-	&.fixed-top {
-		& .toolbar {
-			@include box-shadow(0, 0, 4px, $m-gray);
-		}
-		.tab {
-			@include box-shadow(0, 1px, 4px, $m-gray);
-		}
-	}
-
-	// "Muted" elements
- 	.muted {
- 		color: $g-gray;
- 		td {
- 			color: $m-gray;
- 		}
- 		&:hover td {
- 			color: $g-gray;
- 		}
- 	}
-
-	// The toolbar preferences
-	#toolbar-position,
-	#toolbar-theme, {
-		filter: brightness(0) invert(0.6);
-	}
-
-	// The toolbar menus
- 	.ci-label {
- 		&.active {
- 			background-color: $m-gray;
- 		}
- 		&:hover {
- 			background-color: $m-gray;
- 		}
- 		.badge {
- 			background-color: $g-blue;
-			color: $t-light;
- 		}
- 	}
-
-	// The tabs container
- 	.tab {
- 		background-color: $t-light;
-		@include box-shadow(0, -1px, 4px, $m-gray);
- 	}
-
-	// The "Timeline" tab
-	.timeline {
- 		th,
-		td {
- 			border-color: $m-gray;
- 		}
- 		.timer {
- 			background-color: $g-orange;
- 		}
- 	}
+    background-color: $t-light;
+    color: $g-gray;
+
+    // Reset to prevent conflict with other CSS files
+    h1,
+    h2,
+    h3,
+    p,
+    a,
+    button,
+    table,
+    thead,
+    tr,
+    td,
+    button,
+    .toolbar {
+        background-color: transparent;
+        color: $g-gray;
+    }
+
+    // Buttons
+    button {
+        background-color: $t-light;
+    }
+
+    // Tables
+    table {
+        strong {
+            color: $m-orange;
+        }
+
+        tbody tr {
+            &:hover {
+                background-color: $m-gray;
+            }
+
+            &.current {
+                background-color: $m-orange;
+
+                &:hover td {
+                    background-color: $g-red;
+                    color: $t-light;
+                }
+            }
+        }
+    }
+
+    // The toolbar
+    .toolbar {
+        background-color: $t-light;
+        @include box-shadow(0, 0, 4px, $m-gray);
+
+        img {
+            filter: brightness(0) invert(0.4);
+        }
+    }
+
+    // Fixed top
+    &.fixed-top {
+        .toolbar {
+            @include box-shadow(0, 0, 4px, $m-gray);
+        }
+
+        .tab {
+            @include box-shadow(0, 1px, 4px, $m-gray);
+        }
+    }
+
+    // "Muted" elements
+    .muted {
+        color: $g-gray;
+
+        td {
+            color: $m-gray;
+        }
+
+        &:hover td {
+            color: $g-gray;
+        }
+    }
+
+    // The toolbar preferences
+    #toolbar-position,
+    #toolbar-theme {
+        filter: brightness(0) invert(0.6);
+    }
+
+    // The toolbar menus
+    .ci-label {
+        &.active {
+            background-color: $m-gray;
+        }
+
+        &:hover {
+            background-color: $m-gray;
+        }
+
+        .badge {
+            background-color: $g-blue;
+            color: $t-light;
+        }
+    }
+
+    // The tabs container
+    .tab {
+        background-color: $t-light;
+        @include box-shadow(0, -1px, 4px, $m-gray);
+    }
+
+    // The "Timeline" tab
+    .timeline {
+        th,
+        td {
+            border-color: $m-gray;
+        }
+
+        .timer {
+            background-color: $g-orange;
+        }
+    }
 }
 
 
@@ -141,9 +154,10 @@
 // ========================================================================== */
 
 .debug-view.show-view {
-	border-color: $g-orange;
+    border-color: $g-orange;
 }
+
 .debug-view-path {
-	background-color: $m-orange;
-	color: $g-gray;
+    background-color: $m-orange;
+    color: $g-gray;
 }
diff --git a/admin/css/debug-toolbar/toolbar.scss b/admin/css/debug-toolbar/toolbar.scss
index d06731db6ffe..0f07005ad9ab 100644
--- a/admin/css/debug-toolbar/toolbar.scss
+++ b/admin/css/debug-toolbar/toolbar.scss
@@ -1,8 +1,8 @@
 /*! CodeIgniter 4 - Debug bar
  * ============================================================================
- * Forum: 	https://forum.codeigniter.com
- * Github:	https://github.com/codeigniter4/codeigniter4
- * Slack: 	https://codeigniterchat.slack.com
+ * Forum:     https://forum.codeigniter.com
+ * Github:    https://github.com/codeigniter4/codeigniter4
+ * Slack:     https://codeigniterchat.slack.com
  * Website: https://codeigniter.com
  */
 
@@ -17,38 +17,38 @@
 // ========================================================================== */
 
 #debug-icon {
-	// Position
-	bottom: 0;
-	position: fixed;
-	right: 0;
-	z-index: 10000;
-
-	// Size
-	height: 36px;
-	width: 36px;
-
-	// Spacing
-	margin: 0px;
-	padding: 0px;
-
-	// Content
-	clear: both;
-	text-align: center;
-
-	a svg {
-		margin: 8px;
-		max-width: 20px;
-		max-height: 20px;
-	}
-
-	&.fixed-top {
-		bottom: auto;
-		top: 0;
-	}
-
-	.debug-bar-ndisplay {
-		display: none;
-	}
+    // Position
+    bottom: 0;
+    position: fixed;
+    right: 0;
+    z-index: 10000;
+
+    // Size
+    height: 36px;
+    width: 36px;
+
+    // Spacing
+    margin: 0px;
+    padding: 0px;
+
+    // Content
+    clear: both;
+    text-align: center;
+
+    a svg {
+        margin: 8px;
+        max-width: 20px;
+        max-height: 20px;
+    }
+
+    &.fixed-top {
+        bottom: auto;
+        top: 0;
+    }
+
+    .debug-bar-ndisplay {
+        display: none;
+    }
 }
 
 
@@ -56,352 +56,352 @@
 // ========================================================================== */
 
 #debug-bar {
-	// Position
-	bottom: 0;
-	left: 0;
-	position: fixed;
-	right: 0;
-	z-index: 10000;
-
-	// Size
-	height: 36px;
-
-	// Spacing
-	line-height: 36px;
-
-	// Typography
-	font-family: $base-font;
-	font-size: $base-size;
-	font-weight: 400;
-
-	// General elements
-	h1 {
-		bottom: 0;
-		display: inline-block;
-		font-size: $base-size - 2;
-		font-weight: normal;
-		margin: 0 16px 0 0;
-		padding: 0;
-		position: absolute;
-		right: 30px;
-		text-align: left;
-		top: 0;
-
-		svg {
-			width: 16px;
-			margin-right: 5px;
-		}
-	}
-
-	h2 {
-		font-size: $base-size;
-		margin: 0;
-		padding: 5px 0 10px 0;
-
-		span {
-			font-size: 13px;
-		}
-	}
-
-	h3 {
-		font-size: $base-size - 4;
-		font-weight: 200;
-		margin: 0 0 0 10px;
-		padding: 0;
-		text-transform: uppercase;
-	}
-
-	p {
-		font-size: $base-size - 4;
-		margin: 0 0 0 15px;
-		padding: 0;
-	}
-
-	a {
-		text-decoration: none;
-
-		&:hover {
-			text-decoration: underline;
-		}
-	}
-
-	button {
-		border: 1px solid;
-		@include border-radius(4px);
-		cursor: pointer;
-		line-height: 15px;
-
-		&:hover {
-			text-decoration: underline;
-		}
-	}
-
-	table {
-		border-collapse: collapse;
-		font-size: $base-size - 2;
-		line-height: normal;
-		margin: 5px 10px 15px 10px; // Tables indentation
-		width: calc(100% - 10px); // Make sure it still fits the container, even with the margins
-
-		strong {
-			font-weight: 500;
-		}
-
-		th {
-			display: table-cell;
-			font-weight: 600;
-			padding-bottom: 0.7em;
-			text-align: left;
-		}
-
-		tr {
-			border: none;
-		}
-
-		td {
-			border: none;
-			display: table-cell;
-			margin: 0;
-			text-align: left;
-
-			&:first-child {
-				max-width: 20%;
-
-				&.narrow {
-					width: 7em;
-				}
-			}
-		}
-	}
-
-	td[data-debugbar-route] {
-		form {
-			display: none;
-		}
-
-		&:hover {
-			form {
-				display: block;
-			}
-
-			&>div {
-				display: none;
-			}
-		}
-
-		input[type=text] {
-			padding: 2px;
-		}
-	}
-
-	// The toolbar
-	.toolbar {
-		display: flex;
-		overflow: hidden;
-		overflow-y: auto;
-		padding: 0 12px 0 12px;
-		/* give room for OS X scrollbar */
-		white-space: nowrap;
-		z-index: 10000;
-	}
-
-	// Fixed top
-	&.fixed-top {
-		bottom: auto;
-		top: 0;
-
-		.tab {
-			bottom: auto;
-			top: 36px;
-		}
-	}
-
-	// The toolbar preferences
-	#toolbar-position,
-	#toolbar-theme {
-		a {
-			// float: left;
-			padding: 0 6px;
-			display: inline-flex;
-			vertical-align: top;
-
-			&:hover {
-				text-decoration: none;
-			}
-		}
-	}
-
-	// The "Open/Close" toggle
-	#debug-bar-link {
-		bottom: 0;
-		display: inline-block;
-		font-size: $base-size;
-		line-height: 36px;
-		padding: 6px;
-		position: absolute;
-		right: 10px;
-		top: 0;
-		width: 24px;
-	}
-
-	// The toolbar menus
-	.ci-label {
-		display: inline-flex;
-		font-size: $base-size - 2;
-		// vertical-align: baseline;
-
-		&:hover {
-			cursor: pointer;
-		}
-
-		a {
-			color: inherit;
-			display: flex;
-			letter-spacing: normal;
-			padding: 0 10px;
-			text-decoration: none;
-			align-items: center;
-		}
-
-		// The toolbar icons
-		img {
-			// clear: left;
-			// display: inline-block;
-			// float: left;
-			margin: 6px 3px 6px 0;
-			width: 16px !important;
-		}
-
-		// The toolbar notification badges
-		.badge {
-			@include border-radius(12px);
-			display: inline-block;
-			font-size: 75%;
-			font-weight: bold;
-			line-height: 12px;
-			margin-left: 5px;
-			padding: 2px 5px;
-			text-align: center;
-			vertical-align: baseline;
-			white-space: nowrap;
-		}
-	}
-
-	// The tabs container
-	.tab {
-		bottom: 35px;
-		display: none;
-		left: 0;
-		max-height: 62%;
-		overflow: hidden;
-		overflow-y: auto;
-		padding: 1em 2em;
-		position: fixed;
-		right: 0;
-		z-index: 9999;
-	}
-
-	// The "Timeline" tab
-	.timeline {
-		margin-left: 0;
-		width: 100%;
-
-		th {
-			border-left: 1px solid;
-			font-size: $base-size - 4;
-			font-weight: 200;
-			padding: 5px 5px 10px 5px;
-			position: relative;
-			text-align: left;
-
-			&:first-child {
-				border-left: 0;
-			}
-		}
-
-		td {
-			border-left: 1px solid;
-			padding: 5px;
-			position: relative;
-
-			&:first-child {
-				border-left: 0;
-				max-width: none;
-			}
-
-			&.child-container {
-				padding: 0px;
-
-				.timeline {
-					margin: 0px;
-
-					td {
-						&:first-child {
-							&:not(.child-container) {
-								padding-left: calc(5px + 10px * var(--level));
-							}
-						}
-					}
-				}
-			}
-		}
-
-		.timer {
-			@include border-radius(4px);
-			display: inline-block;
-			padding: 5px;
-			position: absolute;
-			top: 30%;
-		}
-
-		.timeline-parent{
-			cursor: pointer;
-
-			td {
-				&:first-child {
-					nav {
-						background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxwYXRoIGQ9Ik02IDdoMThsLTkgMTV6bTAgMzBoMThsLTkgMTV6bTAgNDVoMThsLTktMTV6bTAgMzBoMThsLTktMTV6bTAgMTJsMTggMThtLTE4IDBsMTgtMTgiIGZpbGw9IiM1NTUiLz48cGF0aCBkPSJNNiAxMjZsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSIjNTU1Ii8+PC9zdmc+") no-repeat scroll 0 0/15px 75px transparent;
-						background-position: 0 25%;
-						display: inline-block;
-						height: 15px;
-						width: 15px;
-						margin-right: 3px;
-						vertical-align: middle;
-					}
-				}
-			}
-		}
-
-		.timeline-parent-open {
-			background-color: #DFDFDF;
-
-			td {
-				&:first-child {
-					nav {
-						background-position: 0 75%;
-					}
-				}
-			}
-		}
-
-		.child-row {
-			&:hover {
-				background: transparent;
-			}
-		}
-	}
-
-	// The "Routes" tab
-	.route-params,
-	.route-params-item {
-		vertical-align: top;
-
-		td:first-child {
-			font-style: italic;
-			padding-left: 1em;
-			text-align: right;
-		}
-	}
+    // Position
+    bottom: 0;
+    left: 0;
+    position: fixed;
+    right: 0;
+    z-index: 10000;
+
+    // Size
+    height: 36px;
+
+    // Spacing
+    line-height: 36px;
+
+    // Typography
+    font-family: $base-font;
+    font-size: $base-size;
+    font-weight: 400;
+
+    // General elements
+    h1 {
+        bottom: 0;
+        display: inline-block;
+        font-size: $base-size - 2;
+        font-weight: normal;
+        margin: 0 16px 0 0;
+        padding: 0;
+        position: absolute;
+        right: 30px;
+        text-align: left;
+        top: 0;
+
+        svg {
+            width: 16px;
+            margin-right: 5px;
+        }
+    }
+
+    h2 {
+        font-size: $base-size;
+        margin: 0;
+        padding: 5px 0 10px 0;
+
+        span {
+            font-size: 13px;
+        }
+    }
+
+    h3 {
+        font-size: $base-size - 4;
+        font-weight: 200;
+        margin: 0 0 0 10px;
+        padding: 0;
+        text-transform: uppercase;
+    }
+
+    p {
+        font-size: $base-size - 4;
+        margin: 0 0 0 15px;
+        padding: 0;
+    }
+
+    a {
+        text-decoration: none;
+
+        &:hover {
+            text-decoration: underline;
+        }
+    }
+
+    button {
+        border: 1px solid;
+        @include border-radius(4px);
+        cursor: pointer;
+        line-height: 15px;
+
+        &:hover {
+            text-decoration: underline;
+        }
+    }
+
+    table {
+        border-collapse: collapse;
+        font-size: $base-size - 2;
+        line-height: normal;
+
+        // Tables indentation
+        margin: 5px 10px 15px 10px;
+
+        // Make sure it still fits the container, even with the margins
+        width: calc(100% - 10px);
+
+        strong {
+            font-weight: 500;
+        }
+
+        th {
+            display: table-cell;
+            font-weight: 600;
+            padding-bottom: 0.7em;
+            text-align: left;
+        }
+
+        tr {
+            border: none;
+        }
+
+        td {
+            border: none;
+            display: table-cell;
+            margin: 0;
+            text-align: left;
+
+            &:first-child {
+                max-width: 20%;
+
+                &.narrow {
+                    width: 7em;
+                }
+            }
+        }
+    }
+
+    td[data-debugbar-route] {
+        form {
+            display: none;
+        }
+
+        &:hover {
+            form {
+                display: block;
+            }
+
+            &>div {
+                display: none;
+            }
+        }
+
+        input[type=text] {
+            padding: 2px;
+        }
+    }
+
+    // The toolbar
+    .toolbar {
+        display: flex;
+        overflow: hidden;
+        overflow-y: auto;
+        padding: 0 12px 0 12px;
+        
+        // Give room for OS X scrollbar
+        white-space: nowrap;
+        z-index: 10000;
+    }
+
+    // Fixed top
+    &.fixed-top {
+        bottom: auto;
+        top: 0;
+
+        .tab {
+            bottom: auto;
+            top: 36px;
+        }
+    }
+
+    // The toolbar preferences
+    #toolbar-position,
+    #toolbar-theme {
+        a {
+            padding: 0 6px;
+            display: inline-flex;
+            vertical-align: top;
+
+            &:hover {
+                text-decoration: none;
+            }
+        }
+    }
+
+    // The "Open/Close" toggle
+    #debug-bar-link {
+        bottom: 0;
+        display: inline-block;
+        font-size: $base-size;
+        line-height: 36px;
+        padding: 6px;
+        position: absolute;
+        right: 10px;
+        top: 0;
+        width: 24px;
+    }
+
+    // The toolbar menus
+    .ci-label {
+        display: inline-flex;
+        font-size: $base-size - 2;
+
+        &:hover {
+            cursor: pointer;
+        }
+
+        a {
+            color: inherit;
+            display: flex;
+            letter-spacing: normal;
+            padding: 0 10px;
+            text-decoration: none;
+            align-items: center;
+        }
+
+        // The toolbar icons
+        img {
+            margin: 6px 3px 6px 0;
+            width: 16px !important;
+        }
+
+        // The toolbar notification badges
+        .badge {
+            @include border-radius(12px);
+            display: inline-block;
+            font-size: 75%;
+            font-weight: bold;
+            line-height: 12px;
+            margin-left: 5px;
+            padding: 2px 5px;
+            text-align: center;
+            vertical-align: baseline;
+            white-space: nowrap;
+        }
+    }
+
+    // The tabs container
+    .tab {
+        bottom: 35px;
+        display: none;
+        left: 0;
+        max-height: 62%;
+        overflow: hidden;
+        overflow-y: auto;
+        padding: 1em 2em;
+        position: fixed;
+        right: 0;
+        z-index: 9999;
+    }
+
+    // The "Timeline" tab
+    .timeline {
+        margin-left: 0;
+        width: 100%;
+
+        th {
+            border-left: 1px solid;
+            font-size: $base-size - 4;
+            font-weight: 200;
+            padding: 5px 5px 10px 5px;
+            position: relative;
+            text-align: left;
+
+            &:first-child {
+                border-left: 0;
+            }
+        }
+
+        td {
+            border-left: 1px solid;
+            padding: 5px;
+            position: relative;
+
+            &:first-child {
+                border-left: 0;
+                max-width: none;
+            }
+
+            &.child-container {
+                padding: 0px;
+
+                .timeline {
+                    margin: 0px;
+
+                    td {
+                        &:first-child {
+                            &:not(.child-container) {
+                                padding-left: calc(5px + 10px * var(--level));
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        .timer {
+            @include border-radius(4px);
+            display: inline-block;
+            padding: 5px;
+            position: absolute;
+            top: 30%;
+        }
+
+        .timeline-parent {
+            cursor: pointer;
+
+            td {
+                &:first-child {
+                    nav {
+                        background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxwYXRoIGQ9Ik02IDdoMThsLTkgMTV6bTAgMzBoMThsLTkgMTV6bTAgNDVoMThsLTktMTV6bTAgMzBoMThsLTktMTV6bTAgMTJsMTggMThtLTE4IDBsMTgtMTgiIGZpbGw9IiM1NTUiLz48cGF0aCBkPSJNNiAxMjZsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSIjNTU1Ii8+PC9zdmc+") no-repeat scroll 0 0/15px 75px transparent;
+                        background-position: 0 25%;
+                        display: inline-block;
+                        height: 15px;
+                        width: 15px;
+                        margin-right: 3px;
+                        vertical-align: middle;
+                    }
+                }
+            }
+        }
+
+        .timeline-parent-open {
+            background-color: #DFDFDF;
+
+            td {
+                &:first-child {
+                    nav {
+                        background-position: 0 75%;
+                    }
+                }
+            }
+        }
+
+        .child-row {
+            &:hover {
+                background: transparent;
+            }
+        }
+    }
+
+    // The "Routes" tab
+    .route-params,
+    .route-params-item {
+        vertical-align: top;
+
+        td:first-child {
+            font-style: italic;
+            padding-left: 1em;
+            text-align: right;
+        }
+    }
 }
 
 
@@ -409,21 +409,21 @@
 // ========================================================================== */
 
 .debug-view.show-view {
-	border: 1px solid;
-	margin: 4px;
+    border: 1px solid;
+    margin: 4px;
 }
 
 .debug-view-path {
-	font-family: monospace;
-	font-size: $base-size - 4;
-	letter-spacing: normal;
-	min-height: 16px;
-	padding: 2px;
-	text-align: left;
+    font-family: monospace;
+    font-size: $base-size - 4;
+    letter-spacing: normal;
+    min-height: 16px;
+    padding: 2px;
+    text-align: left;
 }
 
 .show-view .debug-view-path {
-	display: block !important;
+    display: block !important;
 }
 
 
@@ -431,17 +431,17 @@
 // ========================================================================== */
 
 @media screen and (max-width: 1024px) {
-	#debug-bar {
-		.ci-label {
-			img {
-				margin: unset
-			}
-		}
-	}
-
-	.hide-sm {
-		display: none !important;
-	}
+    #debug-bar {
+        .ci-label {
+            img {
+                margin: unset
+            }
+        }
+    }
+
+    .hide-sm {
+        display: none !important;
+    }
 }
 
 
@@ -453,22 +453,22 @@
 
 // If the browser supports "prefers-color-scheme" and the scheme is "Dark"
 @media (prefers-color-scheme: dark) {
-	@import '_theme-dark';
+    @import '_theme-dark';
 }
 
 // If we force the "Dark" theme
 #toolbarContainer.dark {
-	@import '_theme-dark';
+    @import '_theme-dark';
 
-	td[data-debugbar-route] input[type=text] {
-		background: #000;
-		color: #fff;
-	}
+    td[data-debugbar-route] input[type=text] {
+        background: #000;
+        color: #fff;
+    }
 }
 
 // If we force the "Light" theme
 #toolbarContainer.light {
-	@import '_theme-light';
+    @import '_theme-light';
 }
 
 
@@ -476,41 +476,41 @@
 // ========================================================================== */
 
 .debug-bar-width30 {
-	width: 30%;
+    width: 30%;
 }
 
 .debug-bar-width10 {
-	width: 10%;
+    width: 10%;
 }
 
 .debug-bar-width70p {
-	width: 70px;
+    width: 70px;
 }
 
 .debug-bar-width140p {
-	width: 140px;
+    width: 140px;
 }
 
 .debug-bar-width20e {
-	width: 20em;
+    width: 20em;
 }
 
 .debug-bar-width6r {
-	width: 6rem;
+    width: 6rem;
 }
 
 .debug-bar-ndisplay {
-	display: none;
+    display: none;
 }
 
 .debug-bar-alignRight {
-	text-align: right;
+    text-align: right;
 }
 
 .debug-bar-alignLeft {
-	text-align: left;
+    text-align: left;
 }
 
 .debug-bar-noverflow {
-	overflow: hidden;
-}
\ No newline at end of file
+    overflow: hidden;
+}
diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
index bd080de2b1c8..f42cd2089027 100644
--- a/system/Debug/Toolbar/Views/toolbar.css
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -1,8 +1,8 @@
 /*! CodeIgniter 4 - Debug bar
  * ============================================================================
- * Forum: 	https://forum.codeigniter.com
- * Github:	https://github.com/codeigniter4/codeigniter4
- * Slack: 	https://codeigniterchat.slack.com
+ * Forum:     https://forum.codeigniter.com
+ * Github:    https://github.com/codeigniter4/codeigniter4
+ * Slack:     https://codeigniterchat.slack.com
  * Website: https://codeigniter.com
  */
 #debug-icon {
@@ -117,7 +117,6 @@
     overflow: hidden;
     overflow-y: auto;
     padding: 0 12px 0 12px;
-    /* give room for OS X scrollbar */
     white-space: nowrap;
     z-index: 10000; }
   #debug-bar.fixed-top {
@@ -267,7 +266,9 @@
   box-shadow: 0 0 4px #DFDFDF;
   -moz-box-shadow: 0 0 4px #DFDFDF;
   -webkit-box-shadow: 0 0 4px #DFDFDF; }
-  #debug-icon a:active, #debug-icon a:link, #debug-icon a:visited {
+  #debug-icon a:active,
+  #debug-icon a:link,
+  #debug-icon a:visited {
     color: #DD8615; }
 
 #debug-bar {
@@ -353,7 +354,9 @@
     box-shadow: 0 0 4px #DFDFDF;
     -moz-box-shadow: 0 0 4px #DFDFDF;
     -webkit-box-shadow: 0 0 4px #DFDFDF; }
-    #debug-icon a:active, #debug-icon a:link, #debug-icon a:visited {
+    #debug-icon a:active,
+    #debug-icon a:link,
+    #debug-icon a:visited {
       color: #DD8615; }
   #debug-bar {
     background-color: #252525;
@@ -437,7 +440,9 @@
   box-shadow: 0 0 4px #DFDFDF;
   -moz-box-shadow: 0 0 4px #DFDFDF;
   -webkit-box-shadow: 0 0 4px #DFDFDF; }
-  #toolbarContainer.dark #debug-icon a:active, #toolbarContainer.dark #debug-icon a:link, #toolbarContainer.dark #debug-icon a:visited {
+  #toolbarContainer.dark #debug-icon a:active,
+  #toolbarContainer.dark #debug-icon a:link,
+  #toolbarContainer.dark #debug-icon a:visited {
     color: #DD8615; }
 
 #toolbarContainer.dark #debug-bar {
@@ -528,7 +533,9 @@
   box-shadow: 0 0 4px #DFDFDF;
   -moz-box-shadow: 0 0 4px #DFDFDF;
   -webkit-box-shadow: 0 0 4px #DFDFDF; }
-  #toolbarContainer.light #debug-icon a:active, #toolbarContainer.light #debug-icon a:link, #toolbarContainer.light #debug-icon a:visited {
+  #toolbarContainer.light #debug-icon a:active,
+  #toolbarContainer.light #debug-icon a:link,
+  #toolbarContainer.light #debug-icon a:visited {
     color: #DD8615; }
 
 #toolbarContainer.light #debug-bar {

From 23227e98368483a6b1b02d60c07b712e3b41edc2 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Wed, 7 Jul 2021 19:41:05 +0200
Subject: [PATCH 0203/2325] Replace file header.

---
 admin/css/debug-toolbar/toolbar.scss   | 13 +++++++------
 system/Debug/Toolbar/Views/toolbar.css | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/admin/css/debug-toolbar/toolbar.scss b/admin/css/debug-toolbar/toolbar.scss
index 0f07005ad9ab..c73510182ac7 100644
--- a/admin/css/debug-toolbar/toolbar.scss
+++ b/admin/css/debug-toolbar/toolbar.scss
@@ -1,9 +1,10 @@
-/*! CodeIgniter 4 - Debug bar
- * ============================================================================
- * Forum:     https://forum.codeigniter.com
- * Github:    https://github.com/codeigniter4/codeigniter4
- * Slack:     https://codeigniterchat.slack.com
- * Website: https://codeigniter.com
+/**
+ * This file is part of the 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.
  */
 
 // IMPORTS
diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
index f42cd2089027..34b686385fd7 100644
--- a/system/Debug/Toolbar/Views/toolbar.css
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -1,9 +1,10 @@
-/*! CodeIgniter 4 - Debug bar
- * ============================================================================
- * Forum:     https://forum.codeigniter.com
- * Github:    https://github.com/codeigniter4/codeigniter4
- * Slack:     https://codeigniterchat.slack.com
- * Website: https://codeigniter.com
+/**
+ * This file is part of the 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.
  */
 #debug-icon {
   bottom: 0;

From 9f9119e3584fa86c0795f9dc9a55e959609dca21 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Sat, 3 Jul 2021 23:35:28 +0000
Subject: [PATCH 0204/2325] Implement Deptrac

---
 .github/workflows/test-deptrac.yml |  82 ++++++++++
 depfile.yaml                       | 232 +++++++++++++++++++++++++++++
 2 files changed, 314 insertions(+)
 create mode 100644 .github/workflows/test-deptrac.yml
 create mode 100644 depfile.yaml

diff --git a/.github/workflows/test-deptrac.yml b/.github/workflows/test-deptrac.yml
new file mode 100644
index 000000000000..9a9179b501d8
--- /dev/null
+++ b/.github/workflows/test-deptrac.yml
@@ -0,0 +1,82 @@
+# When a PR is opened or a push is made, perform an
+# architectural inspection on the code using Deptrac.
+name: Deptrac
+
+on:
+  pull_request:
+    branches:
+      - 'develop'
+      - '4.*'
+    paths:
+      - 'app/**'
+      - 'system/**'
+      - 'composer.json'
+      - 'depfile.yaml'
+      - '.github/workflows/test-deptrac.yml'
+  push:
+    branches:
+      - 'develop'
+      - '4.*'
+    paths:
+      - 'app/**'
+      - 'system/**'
+      - 'composer.json'
+      - 'depfile.yaml'
+      - '.github/workflows/test-deptrac.yml'
+
+jobs:
+  build:
+    name: PHP ${{ matrix.php-versions }} Architectural Inspection
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        php-versions: ['7.4', '8.0']
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          tools: composer, pecl, phive, phpunit
+          extensions: intl, json, mbstring, gd, mysqlnd, xdebug, xml, sqlite3
+
+      - name: Use latest Composer
+        run: composer self-update
+
+      - name: Validate composer.json
+        run: composer validate --strict
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Create composer cache directory
+        run: mkdir -p ${{ steps.composer-cache.outputs.dir }}
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Create Deptrac cache directory
+        run: mkdir -p build/
+
+      - name: Cache Deptrac results
+        uses: actions/cache@v2
+        with:
+          path: build
+          key: ${{ runner.os }}-deptrac-${{ github.sha }}
+          restore-keys: ${{ runner.os }}-deptrac-
+
+      - name: Install dependencies
+        run: composer update --ansi --no-interaction
+
+      - name: Run architectural inspection
+        run: |
+            sudo phive --no-progress install --global qossmic/deptrac --trust-gpg-keys B8F640134AB1782E
+            deptrac analyze --cache-file=build/deptrac.cache
diff --git a/depfile.yaml b/depfile.yaml
new file mode 100644
index 000000000000..147099379891
--- /dev/null
+++ b/depfile.yaml
@@ -0,0 +1,232 @@
+# Defines the layers for each framework
+# component and their allowed interactions.
+# The following components are exempt
+# due to their global nature:
+#   - CLI & Commands
+#   - Config
+#   - Debug
+#   - Exception
+#   - Service
+#   - Validation\FormatRules
+paths:
+  - ./app
+  - ./system
+exclude_files:
+  - '#.*test.*#i'
+layers:
+  - name: API
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\API\\.*
+  - name: Cache
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\Cache\\.*
+  - name: Controller
+    collectors:
+      - type: className
+        regex: ^CodeIgniter\\Controller$
+  - name: Cookie
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\Cookie\\.*
+  - name: Database
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\Database\\.*
+  - name: Email
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\Email\\.*
+  - name: Encryption
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\Encryption\\.*
+  - name: Entity
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\Entity\\.*
+  - name: Events
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\Events\\.*
+  - name: Files
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\Files\\.*
+  - name: Filters
+    collectors:
+      - type: bool
+        must:
+        - type: className
+          regex: ^Codeigniter\\Filters\\Filter.*
+  - name: Format
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\Format\\.*
+  - name: Honeypot
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\.*Honeypot.* # includes the Filter
+  - name: HTTP
+    collectors:
+      - type: bool
+        must:
+        - type: className
+          regex: ^Codeigniter\\HTTP\\.*
+        must_not:
+        - type: className
+          regex: (Exception|URI)
+  - name: I18n
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\I18n\\.*
+  - name: Images
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\Images\\.*
+  - name: Language
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\Language\\.*
+  - name: Log
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\Log\\.*
+  - name: Model
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\.*Model$
+  - name: Modules
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\Modules\\.*
+  - name: Pager
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\Pager\\.*
+  - name: Publisher
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\Publisher\\.*
+  - name: RESTful
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\RESTful\\.*
+  - name: Router
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\Router\\.*
+  - name: Security
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\Security\\.*
+  - name: Session
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\Session\\.*
+  - name: Throttle
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\Throttle\\.*
+  - name: Typography
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\Typography\\.*
+  - name: URI
+    collectors:
+      - type: className
+        regex: ^CodeIgniter\\HTTP\\URI$
+  - name: Validation
+    collectors:
+      - type: bool
+        must:
+        - type: className
+          regex: ^Codeigniter\\Validation\\.*
+        must_not:
+        - type: className
+          regex: ^Codeigniter\\Validation\\FormatRules$
+  - name: View
+    collectors:
+      - type: className
+        regex: ^Codeigniter\\View\\.*
+ruleset:
+  API:
+    - Format
+    - HTTP
+  Controller:
+    - HTTP
+    - Validation
+  Database:
+    - Entity
+    - Events
+  Email:
+    - Events
+  Entity:
+    - I18n
+  Filters:
+    - HTTP
+  Honeypot:
+    - Filters
+    - HTTP
+  HTTP:
+    - Cookie
+    - Files
+    - URI
+  Images:
+    - Files
+  Model:
+    - Database
+    - I18n
+    - Pager
+    - Validation
+  Pager:
+    - URI
+    - View
+  Publisher:
+    - Files
+    - URI
+  RESTful: # @todo Transitive Dependency
+    - API
+    - Controller
+    - Format
+    - HTTP
+    - Validation
+  Router:
+    - HTTP
+  Security:
+    - Cookie
+    - HTTP
+  Session:
+    - Cookie
+    - Database
+  Throttle:
+    - Cache
+  Validation:
+    - HTTP
+  View:
+    - Cache
+skip_violations:
+  # Individual class exemptions
+  CodeIgniter\Entity\Cast\URICast:
+    - CodeIgniter\HTTP\URI
+  CodeIgniter\Log\Handlers\ChromeLoggerHandler:
+    - CodeIgniter\HTTP\ResponseInterface
+  CodeIgniter\View\Table:
+    - CodeIgniter\Database\BaseResult
+  CodeIgniter\View\Plugins:
+    - CodeIgniter\HTTP\URI
+
+  # BC changes that should be fixed
+  CodeIgniter\HTTP\ResponseTrait:
+    - CodeIgniter\Pager\PagerInterface
+  CodeIgniter\HTTP\ResponseInterface:
+    - CodeIgniter\Pager\PagerInterface
+  CodeIgniter\HTTP\Response:
+    - CodeIgniter\Pager\PagerInterface
+  CodeIgniter\HTTP\RedirectResponse:
+    - CodeIgniter\Pager\PagerInterface
+  CodeIgniter\HTTP\DownloadResponse:
+    - CodeIgniter\Pager\PagerInterface
+  CodeIgniter\Validation\Validation:
+    - CodeIgniter\View\RendererInterface

From d27708ce186e41f07314fdf890cda8b3d42aa2ad Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Thu, 15 Jul 2021 15:34:20 +0000
Subject: [PATCH 0205/2325] Simplify Action workflow

---
 .github/workflows/test-deptrac.yml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/test-deptrac.yml b/.github/workflows/test-deptrac.yml
index 9a9179b501d8..0698809319fe 100644
--- a/.github/workflows/test-deptrac.yml
+++ b/.github/workflows/test-deptrac.yml
@@ -26,12 +26,8 @@ on:
 
 jobs:
   build:
-    name: PHP ${{ matrix.php-versions }} Architectural Inspection
+    name: Architectural Inspection
     runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: false
-      matrix:
-        php-versions: ['7.4', '8.0']
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -39,13 +35,10 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php-versions }}
-          tools: composer, pecl, phive, phpunit
+          php-version: '8.0'
+          tools: composer, phive
           extensions: intl, json, mbstring, gd, mysqlnd, xdebug, xml, sqlite3
 
-      - name: Use latest Composer
-        run: composer self-update
-
       - name: Validate composer.json
         run: composer validate --strict
 

From 91ca8f36081abbc81b8d5954dc17841454327732 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Thu, 15 Jul 2021 15:43:44 +0000
Subject: [PATCH 0206/2325] Implement transitive dependencies

---
 depfile.yaml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/depfile.yaml b/depfile.yaml
index 147099379891..c1d8b87c3db2 100644
--- a/depfile.yaml
+++ b/depfile.yaml
@@ -186,12 +186,9 @@ ruleset:
   Publisher:
     - Files
     - URI
-  RESTful: # @todo Transitive Dependency
-    - API
-    - Controller
-    - Format
-    - HTTP
-    - Validation
+  RESTful:
+    - +API
+    - +Controller
   Router:
     - HTTP
   Security:

From 6e64994e6cd4569406ff6c052735cfddfda75efd Mon Sep 17 00:00:00 2001
From: "monken,wu" <610877102@mail.nknu.edu.tw>
Date: Tue, 20 Jul 2021 02:13:39 +0800
Subject: [PATCH 0207/2325] fix entity-datamap guide wrong (#4937)

---
 system/Entity/Entity.php                  | 2 +-
 user_guide_src/source/models/entities.rst | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index 7d44adf3e14c..a98395172e23 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -41,7 +41,7 @@ class Entity implements JsonSerializable
      *
      * Example:
      *  $datamap = [
-     *      'db_name' => 'class_name'
+     *      'class_name' => 'db_name'
      *  ];
      */
     protected $datamap = [];
diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst
index 247c0fdce0e3..eec2447adf06 100644
--- a/user_guide_src/source/models/entities.rst
+++ b/user_guide_src/source/models/entities.rst
@@ -275,13 +275,13 @@ simply map the ``full_name`` column in the database to the ``$name`` property, a
         ];
 
         protected $datamap = [
-            'full_name' => 'name',
+            'name' => 'full_name',
         ];
     }
 
 By adding our new database name to the ``$datamap`` array, we can tell the class what class property the database column
-should be accessible through. The key of the array is the name of the column in the database, where the value in the array
-is class property to map it to.
+should be accessible through. The key of the array is class property to map it to, where the value in the array is the
+name of the column in the database.
 
 In this example, when the model sets the ``full_name`` field on the User class, it actually assigns that value to the
 class' ``$name`` property, so it can be set and retrieved through ``$user->name``. The value will still be accessible

From eeaae2a2186189cfe8ed99653c5c010487dcdf02 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Fri, 23 Jul 2021 21:16:56 +0800
Subject: [PATCH 0208/2325] Fix splitting of string rules (#4957)

---
 system/Validation/Validation.php           | 43 +++++++++++----
 tests/system/Validation/ValidationTest.php | 64 ++++++++++++++++++++++
 2 files changed, 96 insertions(+), 11 deletions(-)

diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index a41e1ebc558f..027b0018e842 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -672,20 +672,41 @@ protected function getErrorMessage(string $rule, string $field, ?string $label =
      */
     protected function splitRules(string $rules): array
     {
-        $nonEscapeBracket = '((?<!\\\\)(?:\\\\\\\\)*[\[\]])';
-        $pipeNotInBracket = sprintf(
-            '/\|(?=(?:[^\[\]]*%s[^\[\]]*%s)*(?![^\[\]]*%s))/',
-            $nonEscapeBracket,
-            $nonEscapeBracket,
-            $nonEscapeBracket
-        );
+        if (strpos($rules, '|') === false) {
+            return [$rules];
+        }
 
-        $_rules = preg_split($pipeNotInBracket, $rules);
+        $string = $rules;
+        $rules  = [];
+        $length = strlen($string);
+        $cursor = 0;
 
-        return array_unique($_rules);
-    }
+        while ($cursor < $length) {
+            $pos = strpos($string, '|', $cursor);
+
+            if ($pos === false) {
+                // we're in the last rule
+                $pos = $length;
+            }
+
+            $rule = substr($string, $cursor, $pos - $cursor);
 
-    // Misc
+            while (
+                (substr_count($rule, '[') - substr_count($rule, '\['))
+                !== (substr_count($rule, ']') - substr_count($rule, '\]'))
+            ) {
+                // the pipe is inside the brackets causing the closing bracket to
+                // not be included. so, we adjust the rule to include that portion.
+                $pos  = strpos($string, '|', $cursor + strlen($rule) + 1) ?: $length;
+                $rule = substr($string, $cursor, $pos - $cursor);
+            }
+
+            $rules[] = $rule;
+            $cursor += strlen($rule) + 1; // +1 to exclude the pipe
+        }
+
+        return array_unique($rules);
+    }
 
     /**
      * Resets the class to a blank slate. Should be called whenever
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index 836b892a2931..5e3217654e47 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -984,4 +984,68 @@ public function validationArrayDataCaseProvider(): iterable
             ]],
         ];
     }
+
+    /**
+     * @dataProvider provideStringRulesCases
+     *
+     * @param string $input
+     * @param array  $expected
+     *
+     * @return void
+     *
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4929
+     */
+    public function testSplittingOfComplexStringRules(string $input, array $expected): void
+    {
+        $splitter = $this->getPrivateMethodInvoker($this->validation, 'splitRules');
+        $this->assertSame($expected, $splitter($input));
+    }
+
+    public function provideStringRulesCases(): iterable
+    {
+        yield [
+            'required',
+            ['required'],
+        ];
+
+        yield [
+            'required|numeric',
+            ['required', 'numeric'],
+        ];
+
+        yield [
+            'required|max_length[500]|hex',
+            ['required', 'max_length[500]', 'hex'],
+        ];
+
+        yield [
+            'required|numeric|regex_match[/[a-zA-Z]+/]',
+            ['required', 'numeric', 'regex_match[/[a-zA-Z]+/]'],
+        ];
+
+        yield [
+            'required|max_length[500]|regex_match[/^;"\'{}\[\]^<>=/]',
+            ['required', 'max_length[500]', 'regex_match[/^;"\'{}\[\]^<>=/]'],
+        ];
+
+        yield [
+            'regex_match[/^;"\'{}\[\]^<>=/]|regex_match[/[^a-z0-9.\|_]+/]',
+            ['regex_match[/^;"\'{}\[\]^<>=/]', 'regex_match[/[^a-z0-9.\|_]+/]'],
+        ];
+
+        yield [
+            'required|regex_match[/^(01[2689]|09)[0-9]{8}$/]|numeric',
+            ['required', 'regex_match[/^(01[2689]|09)[0-9]{8}$/]', 'numeric'],
+        ];
+
+        yield [
+            'required|regex_match[/^[0-9]{4}[\-\.\[\/][0-9]{2}[\-\.\[\/][0-9]{2}/]|max_length[10]',
+            ['required', 'regex_match[/^[0-9]{4}[\-\.\[\/][0-9]{2}[\-\.\[\/][0-9]{2}/]', 'max_length[10]'],
+        ];
+
+        yield [
+            'required|regex_match[/^(01|2689|09)[0-9]{8}$/]|numeric',
+            ['required', 'regex_match[/^(01|2689|09)[0-9]{8}$/]', 'numeric'],
+        ];
+    }
 }

From cc24a929ea7cec4dce0b106bb3c98c458f508e05 Mon Sep 17 00:00:00 2001
From: Wolf <wortmann@icue-medien.de>
Date: Mon, 2 Aug 2021 14:16:47 +0200
Subject: [PATCH 0209/2325] CLI: Prompt: Introduce promptByKey method

---
 system/CLI/CLI.php                        | 49 ++++++++++++++++++++---
 user_guide_src/source/cli/cli_library.rst | 34 +++++++++++++++-
 2 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index b463aa6a3016..3ddd544c229c 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -241,25 +241,64 @@ public static function prompt(string $field, $options = null, $validation = null
             if (empty($opts)) {
                 $extraOutput = $extraOutputDefault;
             } else {
-                $extraOutput  = ' [' . $extraOutputDefault . ', ' . implode(', ', $opts) . ']';
-                $validation[] = 'in_list[' . implode(',', $options) . ']';
+                $extraOutput  = '[' . $extraOutputDefault . ', ' . implode(', ', $opts) . ']';
+                $validation[] = 'in_list[' . implode(', ', $options) . ']';
             }
 
             $default = $options[0];
         }
 
-        static::fwrite(STDOUT, $field . $extraOutput . ': ');
+        static::fwrite(STDOUT, $field . (trim($field) ? ' ' : '') . $extraOutput . ': ');
 
         // Read the input from keyboard.
         $input = trim(static::input()) ?: $default;
 
         if ($validation) {
-            while (! static::validate($field, $input, $validation)) {
+            while (! static::validate(trim($field), $input, $validation)) {
                 $input = static::prompt($field, $options, $validation);
             }
         }
 
-        return empty($input) ? '' : $input;
+        return $input;
+    }
+
+    /**
+     * prompt(), but based on the option's key
+     *
+     * @param array|string      $text       Output "field" text or an one or two value array where the first value is the text before listing the options
+     *                                      and the second value the text before asking to select one option. Provide empty string to omit
+     * @param array             $options    A list of options (array(key => description)), the first option will be the default value
+     * @param array|string|null $validation Validation rules
+     *
+     * @return string The selected key of $options
+     *
+     * @codeCoverageIgnore
+     */
+    public static function promptByKey($text, array $options, $validation = null): string
+    {
+        if (is_string($text)) {
+            $text = [$text];
+        } elseif (! is_array($text)) {
+            throw new InvalidArgumentException('$text can only be of type string|array');
+        }
+
+        if (! $options) {
+            throw new InvalidArgumentException('No options to select from were provided');
+        }
+
+        if ($line = array_shift($text)) {
+            CLI::write($line);
+        }
+
+        // +2 for the square brackets around the key
+        $keyMaxLength = max(array_map('mb_strwidth', array_keys($options))) + 2;
+
+        foreach ($options as $key => $description) {
+            $name = str_pad('  [' . $key . ']  ', $keyMaxLength + 4, ' ');
+            CLI::write(CLI::color($name, 'green') . CLI::wrap($description, 125, $keyMaxLength + 4));
+        }
+
+        return static::prompt(PHP_EOL . array_shift($text), array_keys($options), $validation);
     }
 
     /**
diff --git a/user_guide_src/source/cli/cli_library.rst b/user_guide_src/source/cli/cli_library.rst
index d7ddc0993015..41638272eaa5 100644
--- a/user_guide_src/source/cli/cli_library.rst
+++ b/user_guide_src/source/cli/cli_library.rst
@@ -38,7 +38,7 @@ Getting Input from the User
 
 Sometimes you need to ask the user for more information. They might not have provided optional command-line
 arguments, or the script may have encountered an existing file and needs confirmation before overwriting. This is
-handled with the ``prompt()`` method.
+handled with the ``prompt()`` or ``promptByKey()`` method.
 
 You can provide a question by passing it in as the first parameter::
 
@@ -61,6 +61,38 @@ Validation rules can also be written in the array syntax.::
 
 	$email = CLI::prompt('What is your email?', null, ['required', 'valid_email']);
 
+
+**promptByKey()**
+
+Predefined answers (options) for prompt sometimes need to be described or are too complex to select via their value.
+``promptByKey()`` allows the user to select an option by its key instead of its value::
+
+    $fruit = CLI::promptByKey('These are your choices:', ['The red apple', 'The plump orange', 'The ripe banana']);
+
+    //These are your choices:
+    //  [0]  The red apple
+    //  [1]  The plump orange
+    //  [2]  The ripe banana
+    //
+    //[0, 1, 2]:
+
+Named keys are also possible::
+
+    $fruit = CLI::promptByKey(['These are your choices:', 'Which would you like?'], [
+        'apple' => 'The red apple',
+        'orange' => 'The plump orange',
+        'banana' => 'The ripe banana'
+    ]);
+
+    //These are your choices:
+    //  [apple]   The red apple
+    //  [orange]  The plump orange
+    //  [banana]  The ripe banana
+    //
+    //Which would you like? [apple, orange, banana]:
+
+Finally, you can pass :ref:`validation <validation>` rules to the answer input as the third parameter, the acceptable answers are automatically restricted to the passed options.
+
 Providing Feedback
 ==================
 

From c5f82f77157345c9d15057997798111af9b7e4b3 Mon Sep 17 00:00:00 2001
From: Wolf <wortmann@icue-medien.de>
Date: Mon, 2 Aug 2021 16:31:59 +0200
Subject: [PATCH 0210/2325] CLI: Prompt: Change color of default value to green

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

diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index 3ddd544c229c..ea1e1ad85611 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -228,13 +228,13 @@ public static function prompt(string $field, $options = null, $validation = null
         }
 
         if (is_string($options)) {
-            $extraOutput = ' [' . static::color($options, 'white') . ']';
+            $extraOutput = ' [' . static::color($options, 'green') . ']';
             $default     = $options;
         }
 
         if (is_array($options) && $options) {
             $opts               = $options;
-            $extraOutputDefault = static::color($opts[0], 'white');
+            $extraOutputDefault = static::color($opts[0], 'green');
 
             unset($opts[0]);
 

From 5561492918feb6f8e3136a33f61990bd10385675 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Fri, 6 Aug 2021 21:07:03 +0800
Subject: [PATCH 0211/2325] Fix adding foreign keys with only string fields
 (#4988)

---
 system/Database/Forge.php                     | 19 ++++++++--
 .../20160428212500_Create_test_tables.php     |  2 -
 tests/system/Database/Live/ForgeTest.php      | 37 +++++++++++++++++++
 3 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index ba3423a890ea..256010e68d2d 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -351,12 +351,25 @@ public function addField($field)
                     throw new InvalidArgumentException('Field information is required for that operation.');
                 }
 
-                $this->fields[] = $field;
+                $fieldName = explode(' ', $field, 2)[0];
+                $fieldName = trim($fieldName, '`\'"');
+
+                $this->fields[$fieldName] = $field;
             }
         }
 
         if (is_array($field)) {
-            $this->fields = array_merge($this->fields, $field);
+            foreach ($field as $idx => $f) {
+                if (is_string($f)) {
+                    $this->addField($f);
+
+                    continue;
+                }
+
+                if (is_array($f)) {
+                    $this->fields = array_merge($this->fields, [$idx => $f]);
+                }
+            }
         }
 
         return $this;
@@ -761,7 +774,7 @@ protected function _processFields(bool $createTable = false): array
         $fields = [];
 
         foreach ($this->fields as $key => $attributes) {
-            if (is_int($key) && ! is_array($attributes)) {
+            if (! is_array($attributes)) {
                 $fields[] = ['_literal' => $attributes];
 
                 continue;
diff --git a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
index 5b414de228a7..294accbdb898 100644
--- a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
+++ b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
@@ -137,7 +137,6 @@ public function up()
                 'data' => ['type' => 'BLOB', 'null' => false],
             ]);
             $this->forge->addKey('id', true);
-            $this->forge->addKey('timestamp');
             $this->forge->createTable('ci_sessions', true);
         }
 
@@ -149,7 +148,6 @@ public function up()
                 "data bytea DEFAULT '' NOT NULL",
             ]);
             $this->forge->addKey('id', true);
-            $this->forge->addKey('timestamp');
             $this->forge->createTable('ci_sessions', true);
         }
     }
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 69812f98444b..2eaaa9f2af7b 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -427,6 +427,43 @@ public function testForeignKey()
         $this->forge->dropTable('forge_test_users', true);
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4986
+     */
+    public function testForeignKeyAddingWithStringFields()
+    {
+        if ($this->db->DBDriver !== 'MySQLi') {
+            $this->markTestSkipped('Testing only on MySQLi but fix expands to all DBs.');
+        }
+
+        $attributes = ['ENGINE' => 'InnoDB'];
+
+        $this->forge->addField([
+            '`id` INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY',
+            '`name` VARCHAR(255) NOT NULL',
+        ])->createTable('forge_test_users', true, $attributes);
+
+        $this->forge
+            ->addField([
+                '`id` INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY',
+                '`users_id` INT(11) NOT NULL',
+                '`name` VARCHAR(255) NOT NULL',
+            ])
+            ->addForeignKey('users_id', 'forge_test_users', 'id', 'CASCADE', 'CASCADE')
+            ->createTable('forge_test_invoices', true, $attributes);
+
+        $foreignKeyData = $this->db->getForeignKeyData('forge_test_invoices')[0];
+
+        $this->assertSame($this->db->DBPrefix . 'forge_test_invoices_users_id_foreign', $foreignKeyData->constraint_name);
+        $this->assertSame('users_id', $foreignKeyData->column_name);
+        $this->assertSame('id', $foreignKeyData->foreign_column_name);
+        $this->assertSame($this->db->DBPrefix . 'forge_test_invoices', $foreignKeyData->table_name);
+        $this->assertSame($this->db->DBPrefix . 'forge_test_users', $foreignKeyData->foreign_table_name);
+
+        $this->forge->dropTable('forge_test_invoices', true);
+        $this->forge->dropTable('forge_test_users', true);
+    }
+
     public function testForeignKeyFieldNotExistException()
     {
         $this->expectException(DatabaseException::class);

From 68a9a353a34b6e34b190d6c3db547990b30b3973 Mon Sep 17 00:00:00 2001
From: Paulo Esteves <pjesteves@outlook.pt>
Date: Sun, 15 Aug 2021 00:27:10 +0100
Subject: [PATCH 0212/2325] Fix lang() function is overriding locale

---
 system/Common.php                      | 21 +++++++++++++++++++--
 tests/system/Language/LanguageTest.php | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/system/Common.php b/system/Common.php
index bacac6ac0e4b..bdea46b26564 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -717,8 +717,25 @@ function is_really_writable(string $file): bool
      */
     function lang(string $line, array $args = [], ?string $locale = null)
     {
-        return Services::language($locale)
-            ->getLine($line, $args);
+        $language = Services::language();
+
+        //Get active locale
+        $activeLocale = $language->getLocale();
+
+        if ($locale && $locale != $activeLocale)
+        {
+            $language->setLocale($locale);
+        }
+
+        $line = $language->getLine($line, $args);
+
+        if ($locale && $locale != $activeLocale)
+        {
+            //Reset to active locale
+            $language->setLocale($activeLocale);
+        }
+
+        return $line;
     }
 }
 
diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php
index 0dd8b3d69adc..ace99172aac4 100644
--- a/tests/system/Language/LanguageTest.php
+++ b/tests/system/Language/LanguageTest.php
@@ -271,6 +271,25 @@ public function testBaseFallbacks()
         $this->assertSame('More.shootMe', $this->lang->getLine('More.shootMe'));
     }
 
+    /**
+     * Test if after using lang() with a locale the Language class keep the locale after return the $line
+     */
+    public function testLangKeepLocale()
+    {
+        $this->lang = Services::language('en', true);
+
+        lang('Language.languageGetLineInvalidArgumentException');
+        $this->assertEquals('en', $this->lang->getLocale());
+
+        lang('Language.languageGetLineInvalidArgumentException', [], 'ru');
+        $this->assertEquals('en', $this->lang->getLocale());
+
+        lang('Language.languageGetLineInvalidArgumentException');
+        $this->assertEquals('en', $this->lang->getLocale());
+    }
+
+    //--------------------------------------------------------------------
+
     /**
      * Testing base locale vs variants, with fallback to English.
      *

From ef2c3b4400f058a00411bee0cac7d417dd7bfaa0 Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Sun, 4 Jul 2021 10:20:59 +0200
Subject: [PATCH 0213/2325] Fix bug with handling boolean values in set()
 method in BaseBuilder and Model class

---
 system/Database/BaseBuilder.php               |  4 +-
 system/Database/SQLSRV/Forge.php              |  4 +
 system/Database/SQLite3/Forge.php             |  4 +
 system/Model.php                              |  8 +-
 .../20160428212500_Create_test_tables.php     |  1 +
 .../_support/Database/Seeds/CITestSeeder.php  |  4 +-
 tests/system/Database/Builder/UpdateTest.php  | 74 +++++++++++++++++++
 tests/system/Database/Live/UpdateTest.php     | 19 +++++
 .../source/installation/upgrade_420.rst       | 12 +++
 9 files changed, 123 insertions(+), 7 deletions(-)
 create mode 100644 user_guide_src/source/installation/upgrade_420.rst

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 7c3253c52685..43cedc8f09eb 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1339,12 +1339,12 @@ protected function _limit(string $sql, bool $offsetIgnore = false): string
      * Allows key/value pairs to be set for insert(), update() or replace().
      *
      * @param array|object|string $key    Field name, or an array of field/value pairs
-     * @param string|null         $value  Field value, if $key is a single field
+     * @param mixed               $value  Field value, if $key is a single field
      * @param bool|null           $escape Whether to escape values and identifiers
      *
      * @return $this
      */
-    public function set($key, ?string $value = '', ?bool $escape = null)
+    public function set($key, $value = '', ?bool $escape = null)
     {
         $key = $this->objectToArray($key);
 
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
index aa646ccf2d6f..28dfe38c9a05 100755
--- a/system/Database/SQLSRV/Forge.php
+++ b/system/Database/SQLSRV/Forge.php
@@ -349,6 +349,10 @@ protected function _attributeType(array &$attributes)
                 $attributes['TYPE'] = 'DATETIME';
                 break;
 
+            case 'BOOLEAN':
+                $attributes['TYPE'] = 'BIT';
+                break;
+
             default:
                 break;
         }
diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
index 4d118d04eb62..3275322beb92 100644
--- a/system/Database/SQLite3/Forge.php
+++ b/system/Database/SQLite3/Forge.php
@@ -198,6 +198,10 @@ protected function _attributeType(array &$attributes)
                 $attributes['TYPE'] = 'TEXT';
                 break;
 
+            case 'BOOLEAN':
+                $attributes['TYPE'] = 'INT';
+                break;
+
             default:
                 break;
         }
diff --git a/system/Model.php b/system/Model.php
index 3617f83f69cb..580c691247f6 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -557,13 +557,13 @@ public function builder(?string $table = null)
      * data here. This allows it to be used with any of the other
      * builder methods and still get validated data, like replace.
      *
-     * @param array|string $key    Field name, or an array of field/value pairs
-     * @param string|null  $value  Field value, if $key is a single field
-     * @param bool|null    $escape Whether to escape values and identifiers
+     * @param mixed     $key    Field name, or an array of field/value pairs
+     * @param mixed     $value  Field value, if $key is a single field
+     * @param bool|null $escape Whether to escape values and identifiers
      *
      * @return $this
      */
-    public function set($key, ?string $value = '', ?bool $escape = null)
+    public function set($key, $value = '', ?bool $escape = null)
     {
         $data = is_array($key) ? $key : [$key => $value];
 
diff --git a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
index 294accbdb898..cf517e988ebc 100644
--- a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
+++ b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
@@ -70,6 +70,7 @@ public function up()
             'type_double'     => ['type' => 'DOUBLE', 'null' => true],
             'type_decimal'    => ['type' => 'DECIMAL', 'constraint' => '18,4', 'null' => true],
             'type_blob'       => ['type' => 'BLOB', 'null' => true],
+            'type_boolean'    => ['type' => 'BOOLEAN', 'null' => true],
         ];
 
         if ($this->db->DBDriver === 'Postgre') {
diff --git a/tests/_support/Database/Seeds/CITestSeeder.php b/tests/_support/Database/Seeds/CITestSeeder.php
index ae4b2af3b0b7..372697aaa6ba 100644
--- a/tests/_support/Database/Seeds/CITestSeeder.php
+++ b/tests/_support/Database/Seeds/CITestSeeder.php
@@ -106,6 +106,7 @@ public function run()
                     'type_datetime'   => '2020-06-18T05:12:24.000+02:00',
                     'type_timestamp'  => '2019-07-18T21:53:21.000+02:00',
                     'type_bigint'     => 2342342,
+                    'type_boolean'    => 1,
                 ],
             ],
         ];
@@ -119,7 +120,8 @@ public function run()
         }
 
         if ($this->db->DBDriver === 'Postgre') {
-            $data['type_test'][0]['type_time'] = '15:22:00';
+            $data['type_test'][0]['type_time']    = '15:22:00';
+            $data['type_test'][0]['type_boolean'] = true;
             unset(
                 $data['type_test'][0]['type_enum'],
                 $data['type_test'][0]['type_set'],
diff --git a/tests/system/Database/Builder/UpdateTest.php b/tests/system/Database/Builder/UpdateTest.php
index 801324d01f79..6d4cc84973c1 100644
--- a/tests/system/Database/Builder/UpdateTest.php
+++ b/tests/system/Database/Builder/UpdateTest.php
@@ -99,6 +99,80 @@ public function testUpdateWithSet()
         $this->assertSame($expectedBinds, $builder->getBinds());
     }
 
+    public function testUpdateWithSetAsInt()
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
+
+        $builder->testMode()->set('age', 22)->where('id', 1)->update(null, null, null);
+
+        $expectedSQL   = 'UPDATE "jobs" SET "age" = 22 WHERE "id" = 1';
+        $expectedBinds = [
+            'age' => [
+                22,
+                true,
+            ],
+            'id' => [
+                1,
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledUpdate()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testUpdateWithSetAsBoolean()
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
+
+        $builder->testMode()->set('manager', true)->where('id', 1)->update(null, null, null);
+
+        $expectedSQL   = 'UPDATE "jobs" SET "manager" = 1 WHERE "id" = 1';
+        $expectedBinds = [
+            'manager' => [
+                true,
+                true,
+            ],
+            'id' => [
+                1,
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledUpdate()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
+    public function testUpdateWithSetAsArray()
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
+
+        $builder->testMode()->set(['name' => 'Programmer', 'age' => 22, 'manager' => true])->where('id', 1)->update(null, null, null);
+
+        $expectedSQL   = 'UPDATE "jobs" SET "name" = \'Programmer\', "age" = 22, "manager" = 1 WHERE "id" = 1';
+        $expectedBinds = [
+            'name' => [
+                'Programmer',
+                true,
+            ],
+            'age' => [
+                22,
+                true,
+            ],
+            'manager' => [
+                true,
+                true,
+            ],
+            'id' => [
+                1,
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledUpdate()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
     public function testUpdateThrowsExceptionWithNoData()
     {
         $builder = new BaseBuilder('jobs', $this->db);
diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index f047f16a7bfd..c0f1bd3575d4 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -211,4 +211,23 @@ public function testSetWithoutEscape()
             'description' => 'Developer',
         ]);
     }
+
+    public function testSetWithBoolean()
+    {
+        $this->db->table('type_test')
+            ->set('type_boolean', false)
+            ->update();
+
+        $this->seeInDatabase('type_test', [
+            'type_boolean' => false,
+        ]);
+
+        $this->db->table('type_test')
+            ->set('type_boolean', true)
+            ->update();
+
+        $this->seeInDatabase('type_test', [
+            'type_boolean' => true,
+        ]);
+    }
 }
diff --git a/user_guide_src/source/installation/upgrade_420.rst b/user_guide_src/source/installation/upgrade_420.rst
new file mode 100644
index 000000000000..a306b4978347
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_420.rst
@@ -0,0 +1,12 @@
+#############################
+Upgrading from 4.1.3 to 4.2.0
+#############################
+
+**Changes for set() method in BaseBuilder and Model class**
+
+The casting for the ``$value`` parameter has been removed to fix a bug where passing parameters as array and string
+to the ``set()`` method were handled differently. If you extended the ``BaseBuilder`` class or ``Model`` class yourself
+and modified the ``set()`` method, then you need to change its definition from
+``public function set($key, ?string $value = '', ?bool $escape = null)`` to
+``public function set($key, $value = '', ?bool $escape = null)``.
+

From c6a913731c982547a5f2008f7d4628bdbab1ae98 Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Sun, 4 Jul 2021 10:31:25 +0200
Subject: [PATCH 0214/2325] Update method definition in the user guide

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

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 342da67461e3..3494325e5084 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -1726,7 +1726,7 @@ Class Reference
     .. php:method:: set($key[, $value = ''[, $escape = null]])
 
         :param mixed $key: Field name, or an array of field/value pairs
-        :param string $value: Field value, if $key is a single field
+        :param mixed $value: Field value, if $key is a single field
         :param bool	$escape: Whether to escape values and identifiers
         :returns: ``BaseBuilder`` instance (method chaining)
         :rtype:	``BaseBuilder``

From e8ddf0e6d5d2de027afa05317bd9e5950522e125 Mon Sep 17 00:00:00 2001
From: michalsn <michal@sniatala.pl>
Date: Fri, 23 Jul 2021 09:53:19 +0200
Subject: [PATCH 0215/2325] add to toctree

---
 user_guide_src/source/changelogs/index.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide_src/source/changelogs/index.rst b/user_guide_src/source/changelogs/index.rst
index 038d259e4189..a997a57f0c3f 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.2.0
     v4.1.4
     v4.1.3
     v4.1.2

From 1c51f25e8a4c2684fcd4b6b29c27a122af56d7ba Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Tue, 17 Aug 2021 14:53:13 +0000
Subject: [PATCH 0216/2325] Add config for cache keys

---
 app/Config/Cache.php                           | 15 +++++++++++++++
 system/Cache/Handlers/BaseHandler.php          | 10 +++++++---
 .../system/Cache/Handlers/BaseHandlerTest.php  | 10 ++++++++++
 user_guide_src/source/changelogs/v4.2.0.rst    | 18 ++++++++++++++++++
 4 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 user_guide_src/source/changelogs/v4.2.0.rst

diff --git a/app/Config/Cache.php b/app/Config/Cache.php
index ce1db4d7f24e..3c725c469754 100644
--- a/app/Config/Cache.php
+++ b/app/Config/Cache.php
@@ -2,6 +2,7 @@
 
 namespace Config;
 
+use CodeIgniter\Cache\Handlers\BaseHandler;
 use CodeIgniter\Cache\Handlers\DummyHandler;
 use CodeIgniter\Cache\Handlers\FileHandler;
 use CodeIgniter\Cache\Handlers\MemcachedHandler;
@@ -97,6 +98,20 @@ class Cache extends BaseConfig
      */
     public $ttl = 60;
 
+    /**
+     * --------------------------------------------------------------------------
+     * Reserved Characters
+     * --------------------------------------------------------------------------
+     *
+     * A string of reserved characters that will not be allowed in keys or tags.
+     * Strings that violate this restriction will cause handlers to throw.
+     * Default: {}()/\@:
+     * Note: The default set is required for PSR-6 compliance.
+     *
+     * @var string
+     */
+    public $reservedCharacters = '{}()/\@:';
+
     /**
      * --------------------------------------------------------------------------
      * File settings
diff --git a/system/Cache/Handlers/BaseHandler.php b/system/Cache/Handlers/BaseHandler.php
index cae03b901664..57120208ceeb 100644
--- a/system/Cache/Handlers/BaseHandler.php
+++ b/system/Cache/Handlers/BaseHandler.php
@@ -22,8 +22,10 @@
 abstract class BaseHandler implements CacheInterface
 {
     /**
-     * Reserved characters that cannot be used in a key or tag.
+     * Reserved characters that cannot be used in a key or tag. May be overridden by the config.
      * From https://github.com/symfony/cache-contracts/blob/c0446463729b89dd4fa62e9aeecc80287323615d/ItemInterface.php#L43
+     *
+     * @deprecated in favor of the Cache config
      */
     public const RESERVED_CHARACTERS = '{}()/\@:';
 
@@ -58,8 +60,10 @@ public static function validateKey($key, $prefix = ''): string
         if ($key === '') {
             throw new InvalidArgumentException('Cache key cannot be empty.');
         }
-        if (strpbrk($key, self::RESERVED_CHARACTERS) !== false) {
-            throw new InvalidArgumentException('Cache key contains reserved characters ' . self::RESERVED_CHARACTERS);
+
+        $reserved = config('Cache')->reservedCharacters ?? self::RESERVED_CHARACTERS;
+        if ($reserved && strpbrk($key, $reserved) !== false) {
+            throw new InvalidArgumentException('Cache key contains reserved characters ' . $reserved);
         }
 
         // If the key with prefix exceeds the length then return the hashed version
diff --git a/tests/system/Cache/Handlers/BaseHandlerTest.php b/tests/system/Cache/Handlers/BaseHandlerTest.php
index 5965666a5810..73f46620b559 100644
--- a/tests/system/Cache/Handlers/BaseHandlerTest.php
+++ b/tests/system/Cache/Handlers/BaseHandlerTest.php
@@ -44,6 +44,16 @@ public function invalidTypeProvider(): array
         ];
     }
 
+    public function testValidateKeyUsesConfig()
+    {
+    	config('Cache')->reservedCharacters = 'b';
+
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Cache key contains reserved characters b');
+
+        BaseHandler::validateKey('banana');
+    }
+
     public function testValidateKeySuccess()
     {
         $string = 'banana';
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
new file mode 100644
index 000000000000..c1a7d2673ab1
--- /dev/null
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -0,0 +1,18 @@
+Version 4.2.0
+=============
+
+Release Date: Not released
+
+**4.2.0 release of CodeIgniter4**
+
+Enhancements:
+
+- Added Cache config for reserved characters
+
+Changes:
+
+Deprecations:
+
+- Deprecated ``CodeIgniter\\Cache\\Handlers\\BaseHandler::RESERVED_CHARACTERS`` in favor of the new config property
+
+Bugs Fixed:

From 18f24101d1ae8704d76f535fb921f9dd31cb9384 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Wed, 18 Aug 2021 07:49:41 -0400
Subject: [PATCH 0217/2325] Update app/Config/Cache.php

---
 app/Config/Cache.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Config/Cache.php b/app/Config/Cache.php
index 3c725c469754..2d1fea90c9d1 100644
--- a/app/Config/Cache.php
+++ b/app/Config/Cache.php
@@ -2,7 +2,6 @@
 
 namespace Config;
 
-use CodeIgniter\Cache\Handlers\BaseHandler;
 use CodeIgniter\Cache\Handlers\DummyHandler;
 use CodeIgniter\Cache\Handlers\FileHandler;
 use CodeIgniter\Cache\Handlers\MemcachedHandler;

From 39ad669599517f6db23d73cb87f756252f6bb3bf Mon Sep 17 00:00:00 2001
From: MonkenWu <610877102@mail.nknu.edu.tw>
Date: Wed, 14 Jul 2021 01:34:15 +0800
Subject: [PATCH 0218/2325] =?UTF-8?q?=EF=BB=BFFix=20bug=20with=20DB-Forge?=
 =?UTF-8?q?=20composite=20foreign=20keys?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 system/Database/Forge.php                |  54 +++++++---
 system/Database/SQLSRV/Forge.php         |  29 ++---
 tests/system/Database/Live/ForgeTest.php | 129 +++++++++++++++++++++++
 user_guide_src/source/dbmgmt/forge.rst   |  14 ++-
 4 files changed, 193 insertions(+), 33 deletions(-)

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 256010e68d2d..39d4384a98ae 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -378,21 +378,35 @@ public function addField($field)
     /**
      * Add Foreign Key
      *
+     * @param string|string[] $fieldName
+     * @param string|string[] $tableField
+     *
      * @throws DatabaseException
      *
      * @return Forge
      */
-    public function addForeignKey(string $fieldName = '', string $tableName = '', string $tableField = '', string $onUpdate = '', string $onDelete = '')
+    public function addForeignKey($fieldName = '', string $tableName = '', $tableField = '', string $onUpdate = '', string $onDelete = '')
     {
-        if (! isset($this->fields[$fieldName])) {
-            throw new DatabaseException(lang('Database.fieldNotExists', [$fieldName]));
+        $fieldName  = (array) $fieldName;
+        $tableField = (array) $tableField;
+        $errorNames = [];
+
+        foreach ($fieldName as $name) {
+            if (! isset($this->fields[$name])) {
+                $errorNames[] = $name;
+            }
+        }
+
+        if ($errorNames !== []) {
+            throw new DatabaseException(lang('Database.fieldNotExists', $errorNames));
         }
 
-        $this->foreignKeys[$fieldName] = [
-            'table'    => $tableName,
-            'field'    => $tableField,
-            'onDelete' => strtoupper($onDelete),
-            'onUpdate' => strtoupper($onUpdate),
+        $this->foreignKeys[] = [
+            'field'          => $fieldName,
+            'referenceTable' => $tableName,
+            'referenceField' => $tableField,
+            'onDelete'       => strtoupper($onDelete),
+            'onUpdate'       => strtoupper($onUpdate),
         ];
 
         return $this;
@@ -1009,18 +1023,24 @@ protected function _processForeignKeys(string $table): string
             'SET DEFAULT',
         ];
 
-        foreach ($this->foreignKeys as $field => $fkey) {
-            $nameIndex = $table . '_' . $field . '_foreign';
+        if ($this->foreignKeys !== []) {
+            foreach ($this->foreignKeys as $fkey) {
+                $nameIndex            = $table . '_' . implode('_', $fkey['field']) . '_foreign';
+                $nameIndexFilled      = $this->db->escapeIdentifiers($nameIndex);
+                $foreignKeyFilled     = implode(', ', $this->db->escapeIdentifiers($fkey['field']));
+                $referenceTableFilled = $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['referenceTable']);
+                $referenceFieldFilled = implode(', ', $this->db->escapeIdentifiers($fkey['referenceField']));
 
-            $sql .= ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers($nameIndex)
-                . ' FOREIGN KEY(' . $this->db->escapeIdentifiers($field) . ') REFERENCES ' . $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['table']) . ' (' . $this->db->escapeIdentifiers($fkey['field']) . ')';
+                $formatSql = ",\n\tCONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s)";
+                $sql .= sprintf($formatSql, $nameIndexFilled, $foreignKeyFilled, $referenceTableFilled, $referenceFieldFilled);
 
-            if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true)) {
-                $sql .= ' ON DELETE ' . $fkey['onDelete'];
-            }
+                if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true)) {
+                    $sql .= ' ON DELETE ' . $fkey['onDelete'];
+                }
 
-            if ($fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $allowActions, true)) {
-                $sql .= ' ON UPDATE ' . $fkey['onUpdate'];
+                if ($fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $allowActions, true)) {
+                    $sql .= ' ON UPDATE ' . $fkey['onUpdate'];
+                }
             }
         }
 
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
index 28dfe38c9a05..3fed6c48962f 100755
--- a/system/Database/SQLSRV/Forge.php
+++ b/system/Database/SQLSRV/Forge.php
@@ -282,19 +282,24 @@ protected function _processForeignKeys(string $table): string
 
         $allowActions = ['CASCADE', 'SET NULL', 'NO ACTION', 'RESTRICT', 'SET DEFAULT'];
 
-        foreach ($this->foreignKeys as $field => $fkey) {
-            $nameIndex = $table . '_' . $field . '_foreign';
-
-            $sql .= ",\n\t CONSTRAINT " . $this->db->escapeIdentifiers($nameIndex)
-                . ' FOREIGN KEY (' . $this->db->escapeIdentifiers($field) . ') '
-                . ' REFERENCES ' . $this->db->escapeIdentifiers($this->db->schema) . '.' . $this->db->escapeIdentifiers($this->db->getPrefix() . $fkey['table']) . ' (' . $this->db->escapeIdentifiers($fkey['field']) . ')';
-
-            if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true)) {
-                $sql .= ' ON DELETE ' . $fkey['onDelete'];
-            }
+        if ($this->foreignKeys !== []) {
+            foreach ($this->foreignKeys as $fkey) {
+                $nameIndex            = $table . '_' . implode('_', $fkey['field']) . '_foreign';
+                $nameIndexFilled      = $this->db->escapeIdentifiers($nameIndex);
+                $foreignKeyFilled     = implode(', ', $this->db->escapeIdentifiers($fkey['field']));
+                $referenceTableFilled = $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['referenceTable']);
+                $referenceFieldFilled = implode(', ', $this->db->escapeIdentifiers($fkey['referenceField']));
+
+                $formatSql = ",\n\tCONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s)";
+                $sql .= sprintf($formatSql, $nameIndexFilled, $foreignKeyFilled, $referenceTableFilled, $referenceFieldFilled);
+
+                if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true)) {
+                    $sql .= ' ON DELETE ' . $fkey['onDelete'];
+                }
 
-            if ($fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $allowActions, true)) {
-                $sql .= ' ON UPDATE ' . $fkey['onUpdate'];
+                if ($fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $allowActions, true)) {
+                    $sql .= ' ON UPDATE ' . $fkey['onUpdate'];
+                }
             }
         }
 
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 2eaaa9f2af7b..dadcd753e3b5 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -464,6 +464,135 @@ public function testForeignKeyAddingWithStringFields()
         $this->forge->dropTable('forge_test_users', true);
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4310
+     */
+    public function testCompositeForeignKey()
+    {
+        $attributes = [];
+
+        if ($this->db->DBDriver === 'MySQLi') {
+            $attributes = ['ENGINE' => 'InnoDB'];
+        }
+
+        $this->forge->addField([
+            'id' => [
+                'type'       => 'INTEGER',
+                'constraint' => 11,
+            ],
+            'second_id' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 50,
+            ],
+            'name' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+            ],
+        ]);
+        $this->forge->addPrimaryKey(['id', 'second_id']);
+        $this->forge->createTable('forge_test_users', true, $attributes);
+
+        $this->forge->addField([
+            'id' => [
+                'type'       => 'INTEGER',
+                'constraint' => 11,
+            ],
+            'users_id' => [
+                'type'       => 'INTEGER',
+                'constraint' => 11,
+            ],
+            'users_second_id' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 50,
+            ],
+            'name' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+            ],
+        ]);
+        $this->forge->addPrimaryKey('id');
+        $this->forge->addForeignKey(['users_id', 'users_second_id'], 'forge_test_users', ['id', 'second_id'], 'CASCADE', 'CASCADE');
+
+        $this->forge->createTable('forge_test_invoices', true, $attributes);
+
+        $foreignKeyData = $this->db->getForeignKeyData('forge_test_invoices');
+
+        if ($this->db->DBDriver === 'SQLite3') {
+            $this->assertSame($foreignKeyData[0]->constraint_name, 'users_id to db_forge_test_users.id');
+            $this->assertSame($foreignKeyData[0]->sequence, 0);
+            $this->assertSame($foreignKeyData[1]->constraint_name, 'users_second_id to db_forge_test_users.second_id');
+            $this->assertSame($foreignKeyData[1]->sequence, 1);
+        } else {
+            $haystack = ['users_id', 'users_second_id'];
+            $this->assertSame($foreignKeyData[0]->constraint_name, $this->db->DBPrefix . 'forge_test_invoices_users_id_users_second_id_foreign');
+            $this->assertContains($foreignKeyData[0]->column_name, $haystack);
+
+            $secondIdKey = $this->db->DBDriver === 'Postgre' ? 2 : 1;
+            $this->assertSame($foreignKeyData[$secondIdKey]->constraint_name, $this->db->DBPrefix . 'forge_test_invoices_users_id_users_second_id_foreign');
+            $this->assertContains($foreignKeyData[$secondIdKey]->column_name, $haystack);
+        }
+        $this->assertSame($foreignKeyData[0]->table_name, $this->db->DBPrefix . 'forge_test_invoices');
+        $this->assertSame($foreignKeyData[0]->foreign_table_name, $this->db->DBPrefix . 'forge_test_users');
+
+        $this->forge->dropTable('forge_test_invoices', true);
+        $this->forge->dropTable('forge_test_users', true);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4310
+     */
+    public function testCompositeForeignKeyFieldNotExistException()
+    {
+        $this->expectException(DatabaseException::class);
+        $this->expectExceptionMessage('Field `user_id, user_second_id` not found.');
+
+        $attributes = [];
+
+        if ($this->db->DBDriver === 'MySQLi') {
+            $attributes = ['ENGINE' => 'InnoDB'];
+        }
+
+        $this->forge->addField([
+            'id' => [
+                'type'       => 'INTEGER',
+                'constraint' => 11,
+            ],
+            'second_id' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 50,
+            ],
+            'name' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+            ],
+        ]);
+        $this->forge->addPrimaryKey(['id', 'second_id']);
+        $this->forge->createTable('forge_test_users', true, $attributes);
+
+        $this->forge->addField([
+            'id' => [
+                'type'       => 'INTEGER',
+                'constraint' => 11,
+            ],
+            'users_id' => [
+                'type'       => 'INTEGER',
+                'constraint' => 11,
+            ],
+            'users_second_id' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 50,
+            ],
+            'name' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+            ],
+        ]);
+        $this->forge->addKey('id', true);
+        $this->forge->addForeignKey(['user_id', 'user_second_id'], 'forge_test_users', ['id', 'second_id'], 'CASCADE', 'CASCADE');
+
+        $this->forge->createTable('forge_test_invoices', true, $attributes);
+    }
+
     public function testForeignKeyFieldNotExistException()
     {
         $this->expectException(DatabaseException::class);
diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index aba92fc634b2..e16b5ee1e92f 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -230,13 +230,19 @@ Adding Foreign Keys
 Foreign Keys help to enforce relationships and actions across your tables. For tables that support Foreign Keys,
 you may add them directly in forge::
 
-        $forge->addForeignKey('users_id','users','id');
-        // gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`) REFERENCES `users`(`id`)
+	$forge->addForeignKey('users_id','users','id');
+	// gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`) REFERENCES `users`(`id`)
+
+	$forge->addForeignKey(['users_id', 'users_name'],'users',['id', 'name']);
+	// gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`, `users_name`) REFERENCES `users`(`id`, `name`)
 
 You can specify the desired action for the "on delete" and "on update" properties of the constraint::
 
-        $forge->addForeignKey('users_id','users','id','CASCADE','CASCADE');
-        // gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`) REFERENCES `users`(`id`) ON DELETE CASCADE ON UPDATE CASCADE
+	$forge->addForeignKey('users_id','users','id','CASCADE','CASCADE');
+	// gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`) REFERENCES `users`(`id`) ON DELETE CASCADE ON UPDATE CASCADE
+
+	$forge->addForeignKey(['users_id', 'users_name'],'users',['id', 'name'],'CASCADE','CASCADE');
+	// gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`, `users_name`) REFERENCES `users`(`id`, `name`) ON DELETE CASCADE ON UPDATE CASCADE
 
 Creating a table
 ================

From 19de0150cce1291747656314b4cc03fb57e95bd3 Mon Sep 17 00:00:00 2001
From: MonkenWu <610877102@mail.nknu.edu.tw>
Date: Fri, 23 Jul 2021 17:33:05 +0800
Subject: [PATCH 0219/2325] =?UTF-8?q?=EF=BB=BFcreate=20new=20changelog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index c1a7d2673ab1..22a94202a69f 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -8,6 +8,7 @@ Release Date: Not released
 Enhancements:
 
 - Added Cache config for reserved characters
+- The ``addForeignKey`` function of the ``Forge`` class can now define composite foreign keys in an array
 
 Changes:
 

From 82e9c49092b4fa95f9ec8f3947fa951b64192a3c Mon Sep 17 00:00:00 2001
From: MonkenWu <610877102@mail.nknu.edu.tw>
Date: Tue, 27 Jul 2021 22:09:58 +0800
Subject: [PATCH 0220/2325] fix composition foreign keys exception and add new
 test case

---
 system/Database/Forge.php                | 2 ++
 tests/system/Database/Live/ForgeTest.php | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 39d4384a98ae..cd471138db71 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -398,6 +398,8 @@ public function addForeignKey($fieldName = '', string $tableName = '', $tableFie
         }
 
         if ($errorNames !== []) {
+            $errorNames[0] = implode(', ',$errorNames);
+
             throw new DatabaseException(lang('Database.fieldNotExists', $errorNames));
         }
 
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index dadcd753e3b5..531f166f2b7d 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -372,6 +372,8 @@ public function testDropTableWithEmptyName()
 
     public function testForeignKey()
     {
+        $this->forge->dropTable('forge_test_users', true);
+
         $attributes = [];
 
         if ($this->db->DBDriver === 'MySQLi') {
@@ -639,6 +641,8 @@ public function testForeignKeyFieldNotExistException()
 
     public function testDropForeignKey()
     {
+        $this->forge->dropTable('forge_test_users', true);
+
         $attributes = [];
 
         if ($this->db->DBDriver === 'MySQLi') {

From 1734b5ff34596fcc4209ab7bed8524a2ea30ba53 Mon Sep 17 00:00:00 2001
From: MonkenWu <610877102@mail.nknu.edu.tw>
Date: Wed, 18 Aug 2021 14:45:31 +0800
Subject: [PATCH 0221/2325] Modify the parameters in "assertSame"

---
 tests/system/Database/Live/ForgeTest.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 531f166f2b7d..d459bc92e391 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -520,21 +520,21 @@ public function testCompositeForeignKey()
         $foreignKeyData = $this->db->getForeignKeyData('forge_test_invoices');
 
         if ($this->db->DBDriver === 'SQLite3') {
-            $this->assertSame($foreignKeyData[0]->constraint_name, 'users_id to db_forge_test_users.id');
-            $this->assertSame($foreignKeyData[0]->sequence, 0);
-            $this->assertSame($foreignKeyData[1]->constraint_name, 'users_second_id to db_forge_test_users.second_id');
-            $this->assertSame($foreignKeyData[1]->sequence, 1);
+            $this->assertSame('users_id to db_forge_test_users.id', $foreignKeyData[0]->constraint_name);
+            $this->assertSame(0, $foreignKeyData[0]->sequence);
+            $this->assertSame('users_second_id to db_forge_test_users.second_id', $foreignKeyData[1]->constraint_name);
+            $this->assertSame(1, $foreignKeyData[1]->sequence);
         } else {
             $haystack = ['users_id', 'users_second_id'];
-            $this->assertSame($foreignKeyData[0]->constraint_name, $this->db->DBPrefix . 'forge_test_invoices_users_id_users_second_id_foreign');
+            $this->assertSame($this->db->DBPrefix . 'forge_test_invoices_users_id_users_second_id_foreign', $foreignKeyData[0]->constraint_name);
             $this->assertContains($foreignKeyData[0]->column_name, $haystack);
 
             $secondIdKey = $this->db->DBDriver === 'Postgre' ? 2 : 1;
-            $this->assertSame($foreignKeyData[$secondIdKey]->constraint_name, $this->db->DBPrefix . 'forge_test_invoices_users_id_users_second_id_foreign');
+            $this->assertSame($this->db->DBPrefix . 'forge_test_invoices_users_id_users_second_id_foreign', $foreignKeyData[$secondIdKey]->constraint_name);
             $this->assertContains($foreignKeyData[$secondIdKey]->column_name, $haystack);
         }
-        $this->assertSame($foreignKeyData[0]->table_name, $this->db->DBPrefix . 'forge_test_invoices');
-        $this->assertSame($foreignKeyData[0]->foreign_table_name, $this->db->DBPrefix . 'forge_test_users');
+        $this->assertSame($this->db->DBPrefix . 'forge_test_invoices', $foreignKeyData[0]->table_name);
+        $this->assertSame($this->db->DBPrefix . 'forge_test_users', $foreignKeyData[0]->foreign_table_name);
 
         $this->forge->dropTable('forge_test_invoices', true);
         $this->forge->dropTable('forge_test_users', true);

From eb3ed2b8005c01e43dd9cc8a38bb6d9ef359bf0c Mon Sep 17 00:00:00 2001
From: Mostafa Khudair <mostafakhudair@gmail.com>
Date: Fri, 20 Aug 2021 15:17:27 +0200
Subject: [PATCH 0222/2325] Add missing make:config command config view file

---
 app/Config/Generators.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Config/Generators.php b/app/Config/Generators.php
index c47153d47042..11214fdc6e55 100644
--- a/app/Config/Generators.php
+++ b/app/Config/Generators.php
@@ -27,6 +27,7 @@ class Generators extends BaseConfig
      */
     public $views = [
         'make:command'      => 'CodeIgniter\Commands\Generators\Views\command.tpl.php',
+        'make:config'       => 'CodeIgniter\Commands\Generators\Views\config.tpl.php',
         'make:controller'   => 'CodeIgniter\Commands\Generators\Views\controller.tpl.php',
         'make:entity'       => 'CodeIgniter\Commands\Generators\Views\entity.tpl.php',
         'make:filter'       => 'CodeIgniter\Commands\Generators\Views\filter.tpl.php',

From 86f507621842e53c14fad6917a6642e6a87d13e2 Mon Sep 17 00:00:00 2001
From: Mostafa Khudair <59371810+mostafakhudair@users.noreply.github.com>
Date: Tue, 24 Aug 2021 15:25:18 +0200
Subject: [PATCH 0223/2325] [Userguide] Add missing generator's command (#5019)

* Add missing make:validation command

* fix shot title
---
 user_guide_src/source/cli/cli_generators.rst | 21 ++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/user_guide_src/source/cli/cli_generators.rst b/user_guide_src/source/cli/cli_generators.rst
index f7d0ea380fb3..210226b51edc 100644
--- a/user_guide_src/source/cli/cli_generators.rst
+++ b/user_guide_src/source/cli/cli_generators.rst
@@ -205,6 +205,27 @@ Options:
 * ``--suffix``: Append the component suffix to the generated class name.
 * ``--force``: Set this flag to overwrite existing files on destination.
 
+make:validation
+---------------
+
+Creates a new validation file.
+
+Usage:
+======
+::
+
+    make:validation <name> [options]
+
+Argument:
+=========
+* ``name``: The name of the validation class. **[REQUIRED]**
+
+Options:
+========
+* ``--namespace``: Set the root namespace. Defaults to value of ``APP_NAMESPACE``.
+* ``--suffix``: Append the component suffix to the generated class name.
+* ``--force``: Set this flag to overwrite existing files on destination.
+
 .. note:: Do you need to have the generated code in a subfolder? Let's say if you want to create a controller
     class to reside in the ``Admin`` subfolder of the main ``Controllers`` folder, you will just need
     to prepend the subfolder to the class name, like this: ``php spark make:controller admin/login``. This

From bf84d197690de9a3e53df1cf97753cddf485187f Mon Sep 17 00:00:00 2001
From: Mostafa Khudair <mostafakhudair@gmail.com>
Date: Thu, 26 Aug 2021 11:21:06 +0200
Subject: [PATCH 0224/2325] fix make:migration command options

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

diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst
index 9da3e2d3e9b3..88b2a2c1e106 100644
--- a/user_guide_src/source/dbmgmt/migration.rst
+++ b/user_guide_src/source/dbmgmt/migration.rst
@@ -258,8 +258,11 @@ creates is the Pascal case version of the filename.
 
 You can use (make:migration) with the following options:
 
-- ``-n`` - to choose namespace, otherwise the value of ``APP_NAMESPACE`` will be used.
-- ``-force`` - If a similarly named migration file is present in destination, this will be overwritten.
+- ``--session``   - Generates the migration file for database sessions.
+- ``--table``     - Table name to use for database sessions. Default: ``ci_sessions``.
+- ``--dbgroup``   - Database group to use for database sessions. Default: ``default``.
+- ``--namespace`` - Set root namespace. Default: ``APP_NAMESPACE``.
+- ``--suffix``    - Append the component title to the class name.
 
 *********************
 Migration Preferences

From d8c35c179906b529fae60752aec80b80edec43ca Mon Sep 17 00:00:00 2001
From: Mostafa Khudair <mostafakhudair@gmail.com>
Date: Wed, 25 Aug 2021 20:33:45 +0200
Subject: [PATCH 0225/2325] Fix wrong cli command option

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

diff --git a/user_guide_src/source/dbmgmt/seeds.rst b/user_guide_src/source/dbmgmt/seeds.rst
index 53a2635ed782..f30bc807ddbb 100644
--- a/user_guide_src/source/dbmgmt/seeds.rst
+++ b/user_guide_src/source/dbmgmt/seeds.rst
@@ -125,15 +125,13 @@ Using the command line, you can easily generate seed files.
 
 ::
 
-	// This command will create a UserSeeder seed file
-	// located at app/Database/Seeds/ directory.
-	> php spark make:seeder UserSeeder
+	> php spark make:seeder user --suffix
+	// Output: UserSeeder.php file located at app/Database/Seeds directory.
 
-You can supply the **root** namespace where the seed file will be stored by supplying the ``-n`` option::
+You can supply the **root** namespace where the seed file will be stored by supplying the ``--namespace`` option::
 
-	> php spark make:seeder MySeeder -n Acme\Blog
+	> php spark make:seeder MySeeder --namespace Acme\Blog
 
-If ``Acme\Blog`` is mapped to ``app/Blog`` directory, then this command will save the
-seed file to ``app/Blog/Database/Seeds/``.
+If ``Acme\Blog`` is mapped to ``app/Blog`` directory, then this command will generate ``MySeeder.php`` at ``app/Blog/Database/Seeds`` directory.
 
 Supplying the ``--force`` option will overwrite existing files in destination.

From 107df929b02548351b8c1d589b855252634b0d23 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 7 Sep 2021 23:30:27 +0800
Subject: [PATCH 0226/2325] Fix coding style violations in 4.2

---
 app/Config/Publisher.php                      |  26 +-
 system/CodeIgniter.php                        |   2 +-
 system/Commands/Utilities/Publish.php         | 153 ++-
 system/Common.php                             |  10 +-
 system/Config/Publisher.php                   |  44 +-
 system/Database/Forge.php                     |  30 +-
 system/Database/MySQLi/Connection.php         |   2 -
 system/Database/SQLSRV/Forge.php              |  32 +-
 system/Debug/Toolbar.php                      |   1 -
 system/Files/Exceptions/FileException.php     |  36 +-
 system/Files/FileCollection.php               | 678 ++++++------
 system/Language/en/Files.php                  |   4 +-
 system/Language/en/Publisher.php              |  20 +-
 .../Exceptions/PublisherException.php         |  60 +-
 system/Publisher/Publisher.php                | 861 ++++++++--------
 system/Session/Handlers/DatabaseHandler.php   |   2 +-
 tests/_support/Publishers/TestPublisher.php   |  86 +-
 .../system/Cache/Handlers/BaseHandlerTest.php |   2 +-
 .../system/Cache/Handlers/FileHandlerTest.php |   2 +-
 .../Cache/Handlers/MemcachedHandlerTest.php   |   2 +-
 .../Cache/Handlers/PredisHandlerTest.php      |   2 +-
 .../Cache/Handlers/RedisHandlerTest.php       |   2 +-
 .../system/Commands/CommandGeneratorTest.php  |   2 +-
 tests/system/Commands/PublishCommandTest.php  |  94 +-
 tests/system/Files/FileCollectionTest.php     | 964 +++++++++---------
 tests/system/Language/LanguageTest.php        |   8 +-
 tests/system/Publisher/PublisherInputTest.php | 280 ++---
 .../system/Publisher/PublisherOutputTest.php  | 440 ++++----
 .../Publisher/PublisherRestrictionsTest.php   | 200 ++--
 .../system/Publisher/PublisherSupportTest.php | 274 ++---
 .../Session/Handlers/DatabaseHandlerTest.php  |   2 +-
 tests/system/Validation/ValidationTest.php    |   5 -
 32 files changed, 2120 insertions(+), 2206 deletions(-)

diff --git a/app/Config/Publisher.php b/app/Config/Publisher.php
index 2588eea2abac..f3768bc577b4 100644
--- a/app/Config/Publisher.php
+++ b/app/Config/Publisher.php
@@ -12,17 +12,17 @@
  */
 class Publisher extends BasePublisher
 {
-	/**
-	 * A list of allowed destinations with a (pseudo-)regex
-	 * of allowed files for each destination.
-	 * Attempts to publish to directories not in this list will
-	 * result in a PublisherException. Files that do no fit the
-	 * pattern will cause copy/merge to fail.
-	 *
-	 * @var array<string,string>
-	 */
-	public $restrictions = [
-		ROOTPATH => '*',
-		FCPATH   => '#\.(?css|js|map|htm?|xml|json|webmanifest|tff|eot|woff?|gif|jpe?g|tiff?|png|webp|bmp|ico|svg)$#i',
-	];
+    /**
+     * A list of allowed destinations with a (pseudo-)regex
+     * of allowed files for each destination.
+     * Attempts to publish to directories not in this list will
+     * result in a PublisherException. Files that do no fit the
+     * pattern will cause copy/merge to fail.
+     *
+     * @var array<string,string>
+     */
+    public $restrictions = [
+        ROOTPATH => '*',
+        FCPATH   => '#\.(?css|js|map|htm?|xml|json|webmanifest|tff|eot|woff?|gif|jpe?g|tiff?|png|webp|bmp|ico|svg)$#i',
+    ];
 }
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index f18fc38384b6..aee11790f406 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -496,7 +496,7 @@ protected function bootstrapEnvironment()
      */
     protected function startBenchmark()
     {
-        if($this->startTime === null) {
+        if ($this->startTime === null) {
             $this->startTime = microtime(true);
         }
 
diff --git a/system/Commands/Utilities/Publish.php b/system/Commands/Utilities/Publish.php
index 15448fc90db3..cfed0472c439 100644
--- a/system/Commands/Utilities/Publish.php
+++ b/system/Commands/Utilities/Publish.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Commands\Utilities;
@@ -22,92 +22,83 @@
  */
 class Publish extends BaseCommand
 {
-	/**
-	 * The group the command is lumped under
-	 * when listing commands.
-	 *
-	 * @var string
-	 */
-	protected $group = 'CodeIgniter';
+    /**
+     * The group the command is lumped under
+     * when listing commands.
+     *
+     * @var string
+     */
+    protected $group = 'CodeIgniter';
 
-	/**
-	 * The Command's name
-	 *
-	 * @var string
-	 */
-	protected $name = 'publish';
+    /**
+     * The Command's name
+     *
+     * @var string
+     */
+    protected $name = 'publish';
 
-	/**
-	 * The Command's short description
-	 *
-	 * @var string
-	 */
-	protected $description = 'Discovers and executes all predefined Publisher classes.';
+    /**
+     * The Command's short description
+     *
+     * @var string
+     */
+    protected $description = 'Discovers and executes all predefined Publisher classes.';
 
-	/**
-	 * The Command's usage
-	 *
-	 * @var string
-	 */
-	protected $usage = 'publish [<directory>]';
+    /**
+     * The Command's usage
+     *
+     * @var string
+     */
+    protected $usage = 'publish [<directory>]';
 
-	/**
-	 * The Command's arguments
-	 *
-	 * @var array<string, string>
-	 */
-	protected $arguments = [
-		'directory' => '[Optional] The directory to scan within each namespace. Default: "Publishers".',
-	];
+    /**
+     * The Command's arguments
+     *
+     * @var array<string, string>
+     */
+    protected $arguments = [
+        'directory' => '[Optional] The directory to scan within each namespace. Default: "Publishers".',
+    ];
 
-	/**
-	 * the Command's Options
-	 *
-	 * @var array
-	 */
-	protected $options = [];
+    /**
+     * the Command's Options
+     *
+     * @var array
+     */
+    protected $options = [];
 
-	//--------------------------------------------------------------------
+    /**
+     * Displays the help for the spark cli script itself.
+     */
+    public function run(array $params)
+    {
+        $directory = array_shift($params) ?? 'Publishers';
 
-	/**
-	 * Displays the help for the spark cli script itself.
-	 *
-	 * @param array $params
-	 */
-	public function run(array $params)
-	{
-		$directory = array_shift($params) ?? 'Publishers';
+        if ([] === $publishers = Publisher::discover($directory)) {
+            CLI::write(lang('Publisher.publishMissing', [$directory]));
 
-		if ([] === $publishers = Publisher::discover($directory))
-		{
-			CLI::write(lang('Publisher.publishMissing', [$directory]));
-			return;
-		}
+            return;
+        }
 
-		foreach ($publishers as $publisher)
-		{
-			if ($publisher->publish())
-			{
-				CLI::write(lang('Publisher.publishSuccess', [
-					get_class($publisher),
-					count($publisher->getPublished()),
-					$publisher->getDestination(),
-				]), 'green');
-			}
-			else
-			{
-				CLI::error(lang('Publisher.publishFailure', [
-					get_class($publisher),
-					$publisher->getDestination(),
-				]), 'light_gray', 'red');
+        foreach ($publishers as $publisher) {
+            if ($publisher->publish()) {
+                CLI::write(lang('Publisher.publishSuccess', [
+                    get_class($publisher),
+                    count($publisher->getPublished()),
+                    $publisher->getDestination(),
+                ]), 'green');
+            } else {
+                CLI::error(lang('Publisher.publishFailure', [
+                    get_class($publisher),
+                    $publisher->getDestination(),
+                ]), 'light_gray', 'red');
 
-				foreach ($publisher->getErrors() as $file => $exception)
-				{
-					CLI::write($file);
-					CLI::error($exception->getMessage());
-					CLI::newLine();
-				}
-			}
-		}
-	}
+                foreach ($publisher->getErrors() as $file => $exception) {
+                    CLI::write($file);
+                    CLI::error($exception->getMessage());
+                    CLI::newLine();
+                }
+            }
+        }
+    }
 }
diff --git a/system/Common.php b/system/Common.php
index bdea46b26564..9979b30534b2 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -719,19 +719,17 @@ function lang(string $line, array $args = [], ?string $locale = null)
     {
         $language = Services::language();
 
-        //Get active locale
+        // Get active locale
         $activeLocale = $language->getLocale();
 
-        if ($locale && $locale != $activeLocale)
-        {
+        if ($locale && $locale !== $activeLocale) {
             $language->setLocale($locale);
         }
 
         $line = $language->getLine($line, $args);
 
-        if ($locale && $locale != $activeLocale)
-        {
-            //Reset to active locale
+        if ($locale && $locale !== $activeLocale) {
+            // Reset to active locale
             $language->setLocale($activeLocale);
         }
 
diff --git a/system/Config/Publisher.php b/system/Config/Publisher.php
index 651600ef9c06..608e87afef8e 100644
--- a/system/Config/Publisher.php
+++ b/system/Config/Publisher.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Config;
@@ -19,24 +19,24 @@
  */
 class Publisher extends BaseConfig
 {
-	/**
-	 * A list of allowed destinations with a (pseudo-)regex
-	 * of allowed files for each destination.
-	 * Attempts to publish to directories not in this list will
-	 * result in a PublisherException. Files that do no fit the
-	 * pattern will cause copy/merge to fail.
-	 *
-	 * @var array<string,string>
-	 */
-	public $restrictions = [
-		ROOTPATH => '*',
-		FCPATH   => '#\.(?css|js|map|htm?|xml|json|webmanifest|tff|eot|woff?|gif|jpe?g|tiff?|png|webp|bmp|ico|svg)$#i',
-	];
+    /**
+     * A list of allowed destinations with a (pseudo-)regex
+     * of allowed files for each destination.
+     * Attempts to publish to directories not in this list will
+     * result in a PublisherException. Files that do no fit the
+     * pattern will cause copy/merge to fail.
+     *
+     * @var array<string,string>
+     */
+    public $restrictions = [
+        ROOTPATH => '*',
+        FCPATH   => '#\.(?css|js|map|htm?|xml|json|webmanifest|tff|eot|woff?|gif|jpe?g|tiff?|png|webp|bmp|ico|svg)$#i',
+    ];
 
-	/**
-	 * Disables Registrars to prevent modules from altering the restrictions.
-	 */
-	final protected function registerProperties()
-	{
-	}
+    /**
+     * Disables Registrars to prevent modules from altering the restrictions.
+     */
+    final protected function registerProperties()
+    {
+    }
 }
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index cd471138db71..c05b0c760876 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -398,7 +398,7 @@ public function addForeignKey($fieldName = '', string $tableName = '', $tableFie
         }
 
         if ($errorNames !== []) {
-            $errorNames[0] = implode(', ',$errorNames);
+            $errorNames[0] = implode(', ', $errorNames);
 
             throw new DatabaseException(lang('Database.fieldNotExists', $errorNames));
         }
@@ -1025,24 +1025,22 @@ protected function _processForeignKeys(string $table): string
             'SET DEFAULT',
         ];
 
-        if ($this->foreignKeys !== []) {
-            foreach ($this->foreignKeys as $fkey) {
-                $nameIndex            = $table . '_' . implode('_', $fkey['field']) . '_foreign';
-                $nameIndexFilled      = $this->db->escapeIdentifiers($nameIndex);
-                $foreignKeyFilled     = implode(', ', $this->db->escapeIdentifiers($fkey['field']));
-                $referenceTableFilled = $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['referenceTable']);
-                $referenceFieldFilled = implode(', ', $this->db->escapeIdentifiers($fkey['referenceField']));
+        foreach ($this->foreignKeys as $fkey) {
+            $nameIndex            = $table . '_' . implode('_', $fkey['field']) . '_foreign';
+            $nameIndexFilled      = $this->db->escapeIdentifiers($nameIndex);
+            $foreignKeyFilled     = implode(', ', $this->db->escapeIdentifiers($fkey['field']));
+            $referenceTableFilled = $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['referenceTable']);
+            $referenceFieldFilled = implode(', ', $this->db->escapeIdentifiers($fkey['referenceField']));
 
-                $formatSql = ",\n\tCONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s)";
-                $sql .= sprintf($formatSql, $nameIndexFilled, $foreignKeyFilled, $referenceTableFilled, $referenceFieldFilled);
+            $formatSql = ",\n\tCONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s)";
+            $sql .= sprintf($formatSql, $nameIndexFilled, $foreignKeyFilled, $referenceTableFilled, $referenceFieldFilled);
 
-                if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true)) {
-                    $sql .= ' ON DELETE ' . $fkey['onDelete'];
-                }
+            if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true)) {
+                $sql .= ' ON DELETE ' . $fkey['onDelete'];
+            }
 
-                if ($fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $allowActions, true)) {
-                    $sql .= ' ON UPDATE ' . $fkey['onUpdate'];
-                }
+            if ($fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $allowActions, true)) {
+                $sql .= ' ON UPDATE ' . $fkey['onUpdate'];
             }
         }
 
diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
index 965d539be878..62881620c46b 100644
--- a/system/Database/MySQLi/Connection.php
+++ b/system/Database/MySQLi/Connection.php
@@ -69,8 +69,6 @@ class Connection extends BaseConnection
      */
     public $resultMode = MYSQLI_STORE_RESULT;
 
-    //--------------------------------------------------------------------
-
     /**
      * Connect to the database.
      *
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
index 3fed6c48962f..ae920ceae152 100755
--- a/system/Database/SQLSRV/Forge.php
+++ b/system/Database/SQLSRV/Forge.php
@@ -282,24 +282,22 @@ protected function _processForeignKeys(string $table): string
 
         $allowActions = ['CASCADE', 'SET NULL', 'NO ACTION', 'RESTRICT', 'SET DEFAULT'];
 
-        if ($this->foreignKeys !== []) {
-            foreach ($this->foreignKeys as $fkey) {
-                $nameIndex            = $table . '_' . implode('_', $fkey['field']) . '_foreign';
-                $nameIndexFilled      = $this->db->escapeIdentifiers($nameIndex);
-                $foreignKeyFilled     = implode(', ', $this->db->escapeIdentifiers($fkey['field']));
-                $referenceTableFilled = $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['referenceTable']);
-                $referenceFieldFilled = implode(', ', $this->db->escapeIdentifiers($fkey['referenceField']));
-
-                $formatSql = ",\n\tCONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s)";
-                $sql .= sprintf($formatSql, $nameIndexFilled, $foreignKeyFilled, $referenceTableFilled, $referenceFieldFilled);
-
-                if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true)) {
-                    $sql .= ' ON DELETE ' . $fkey['onDelete'];
-                }
+        foreach ($this->foreignKeys as $fkey) {
+            $nameIndex            = $table . '_' . implode('_', $fkey['field']) . '_foreign';
+            $nameIndexFilled      = $this->db->escapeIdentifiers($nameIndex);
+            $foreignKeyFilled     = implode(', ', $this->db->escapeIdentifiers($fkey['field']));
+            $referenceTableFilled = $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['referenceTable']);
+            $referenceFieldFilled = implode(', ', $this->db->escapeIdentifiers($fkey['referenceField']));
+
+            $formatSql = ",\n\tCONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s)";
+            $sql .= sprintf($formatSql, $nameIndexFilled, $foreignKeyFilled, $referenceTableFilled, $referenceFieldFilled);
+
+            if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true)) {
+                $sql .= ' ON DELETE ' . $fkey['onDelete'];
+            }
 
-                if ($fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $allowActions, true)) {
-                    $sql .= ' ON UPDATE ' . $fkey['onUpdate'];
-                }
+            if ($fkey['onUpdate'] !== false && in_array($fkey['onUpdate'], $allowActions, true)) {
+                $sql .= ' ON UPDATE ' . $fkey['onUpdate'];
             }
         }
 
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 6a5ece61a373..ef877cd2f365 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -168,7 +168,6 @@ public function run(float $startTime, float $totalTime, RequestInterface $reques
     protected function renderTimeline(array $collectors, float $startTime, int $segmentCount, int $segmentDuration, array &$styles): string
     {
         $rows       = $this->collectTimelineData($collectors);
-        $output     = '';
         $styleCount = 0;
 
         // Use recursive render function
diff --git a/system/Files/Exceptions/FileException.php b/system/Files/Exceptions/FileException.php
index 40e9fdc20f41..03af1bc57b08 100644
--- a/system/Files/Exceptions/FileException.php
+++ b/system/Files/Exceptions/FileException.php
@@ -24,23 +24,23 @@ public static function forUnableToMove(?string $from = null, ?string $to = null,
         return new static(lang('Files.cannotMove', [$from, $to, $error]));
     }
 
-	/**
-	 * Throws when an item is expected to be a directory but is not or is missing.
-	 *
-	 * @param string $caller The method causing the exception
-	 */
-	public static function forExpectedDirectory(string $caller)
-	{
-		return new static(lang('Files.expectedDirectory', [$caller]));
-	}
+    /**
+     * Throws when an item is expected to be a directory but is not or is missing.
+     *
+     * @param string $caller The method causing the exception
+     */
+    public static function forExpectedDirectory(string $caller)
+    {
+        return new static(lang('Files.expectedDirectory', [$caller]));
+    }
 
-	/**
-	 * Throws when an item is expected to be a file but is not or is missing.
-	 *
-	 * @param string $caller The method causing the exception
-	 */
-	public static function forExpectedFile(string $caller)
-	{
-		return new static(lang('Files.expectedFile', [$caller]));
-	}
+    /**
+     * Throws when an item is expected to be a file but is not or is missing.
+     *
+     * @param string $caller The method causing the exception
+     */
+    public static function forExpectedFile(string $caller)
+    {
+        return new static(lang('Files.expectedFile', [$caller]));
+    }
 }
diff --git a/system/Files/FileCollection.php b/system/Files/FileCollection.php
index 128d884940d5..0b1714425ba9 100644
--- a/system/Files/FileCollection.php
+++ b/system/Files/FileCollection.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Files;
@@ -17,7 +17,6 @@
 use Generator;
 use InvalidArgumentException;
 use IteratorAggregate;
-use Traversable;
 
 /**
  * File Collection Class
@@ -27,360 +26,324 @@
  */
 class FileCollection implements Countable, IteratorAggregate
 {
-	/**
-	 * The current list of file paths.
-	 *
-	 * @var string[]
-	 */
-	protected $files = [];
-
-	//--------------------------------------------------------------------
-	// Support Methods
-	//--------------------------------------------------------------------
-
-	/**
-	 * Resolves a full path and verifies it is an actual directory.
-	 *
-	 * @param string $directory
-	 *
-	 * @return string
-	 *
-	 * @throws FileException
-	 */
-	final protected static function resolveDirectory(string $directory): string
-	{
-		if (! is_dir($directory = set_realpath($directory)))
-		{
-			$caller = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1];
-			throw FileException::forExpectedDirectory($caller['function']);
-		}
-
-		return $directory;
-	}
-
-	/**
-	 * Resolves a full path and verifies it is an actual file.
-	 *
-	 * @param string $file
-	 *
-	 * @return string
-	 *
-	 * @throws FileException
-	 */
-	final protected static function resolveFile(string $file): string
-	{
-		if (! is_file($file = set_realpath($file)))
-		{
-			$caller = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1];
-			throw FileException::forExpectedFile($caller['function']);
-		}
-
-		return $file;
-	}
-
-	/**
-	 * Removes files that are not part of the given directory (recursive).
-	 *
-	 * @param string[] $files
-	 * @param string   $directory
-	 *
-	 * @return string[]
-	 */
-	final protected static function filterFiles(array $files, string $directory): array
-	{
-		$directory = self::resolveDirectory($directory);
-
-		return array_filter($files, static function (string $value) use ($directory): bool {
-			return strpos($value, $directory) === 0;
-		});
-	}
-
-	/**
-	 * Returns any files whose `basename` matches the given pattern.
-	 *
-	 * @param string[] $files
-	 * @param string   $pattern Regex or pseudo-regex string
-	 *
-	 * @return string[]
-	 */
-	final protected static function matchFiles(array $files, string $pattern): array
-	{
-		// Convert pseudo-regex into their true form
-		if (@preg_match($pattern, '') === false)
-		{
-			$pattern = str_replace(
-				['#', '.', '*', '?'],
-				['\#', '\.', '.*', '.'],
-				$pattern
-			);
-			$pattern = "#{$pattern}#";
-		}
-
-		return array_filter($files, static function ($value) use ($pattern) {
-			return (bool) preg_match($pattern, basename($value));
-		});
-	}
-
-	//--------------------------------------------------------------------
-	// Class Core
-	//--------------------------------------------------------------------
-
-	/**
-	 * Loads the Filesystem helper and adds any initial files.
-	 *
-	 * @param string[] $files
-	 */
-	public function __construct(array $files = [])
-	{
-		helper(['filesystem']);
-
-		$this->add($files)->define();
-	}
-
-	/**
-	 * Applies any initial inputs after the constructor.
-	 * This method is a stub to be implemented by child classes.
-	 *
-	 * @return void
-	 */
-	protected function define(): void
-	{
-	}
-
-	/**
-	 * Optimizes and returns the current file list.
-	 *
-	 * @return string[]
-	 */
-	public function get(): array
-	{
-		$this->files = array_unique($this->files);
-		sort($this->files, SORT_STRING);
-
-		return $this->files;
-	}
-
-	/**
-	 * Sets the file list directly, files are still subject to verification.
-	 * This works as a "reset" method with [].
-	 *
-	 * @param string[] $files The new file list to use
-	 *
-	 * @return $this
-	 */
-	public function set(array $files)
-	{
-		$this->files = [];
-
-		return $this->addFiles($files);
-	}
-
-	/**
-	 * Adds an array/single file or directory to the list.
-	 *
-	 * @param string|string[] $paths
-	 * @param boolean         $recursive
-	 *
-	 * @return $this
-	 */
-	public function add($paths, bool $recursive = true)
-	{
-		$paths = (array) $paths;
-
-		foreach ($paths as $path)
-		{
-			if (! is_string($path))
-			{
-				throw new InvalidArgumentException('FileCollection paths must be strings.');
-			}
-
-			// Test for a directory
-			try
-			{
-				$directory = self::resolveDirectory($path);
-			}
-			catch (FileException $e)
-			{
-				return $this->addFile($path);
-			}
-
-			$this->addDirectory($path, $recursive);
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	// File Handling
-	//--------------------------------------------------------------------
-
-	/**
-	 * Verifies and adds files to the list.
-	 *
-	 * @param string[] $files
-	 *
-	 * @return $this
-	 */
-	public function addFiles(array $files)
-	{
-		foreach ($files as $file)
-		{
-			$this->addFile($file);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Verifies and adds a single file to the file list.
-	 *
-	 * @param string $file
-	 *
-	 * @return $this
-	 */
-	public function addFile(string $file)
-	{
-		$this->files[] = self::resolveFile($file);
-
-		return $this;
-	}
-
-	/**
-	 * Removes files from the list.
-	 *
-	 * @param string[] $files
-	 *
-	 * @return $this
-	 */
-	public function removeFiles(array $files)
-	{
-		$this->files = array_diff($this->files, $files);
-
-		return $this;
-	}
-
-	/**
-	 * Removes a single file from the list.
-	 *
-	 * @param string $file
-	 *
-	 * @return $this
-	 */
-	public function removeFile(string $file)
-	{
-		return $this->removeFiles([$file]);
-	}
-
-	//--------------------------------------------------------------------
-	// Directory Handling
-	//--------------------------------------------------------------------
-
-	/**
-	 * Verifies and adds files from each
-	 * directory to the list.
-	 *
-	 * @param string[] $directories
-	 * @param bool $recursive
-	 *
-	 * @return $this
-	 */
-	public function addDirectories(array $directories, bool $recursive = false)
-	{
-		foreach ($directories as $directory)
-		{
-			$this->addDirectory($directory, $recursive);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Verifies and adds all files from a directory.
-	 *
-	 * @param string  $directory
-	 * @param boolean $recursive
-	 *
-	 * @return $this
-	 */
-	public function addDirectory(string $directory, bool $recursive = false)
-	{
-		$directory = self::resolveDirectory($directory);
-
-		// Map the directory to depth 2 to so directories become arrays
-		foreach (directory_map($directory, 2, true) as $key => $path)
-		{
-			if (is_string($path))
-			{
-				$this->addFile($directory . $path);
-			}
-			elseif ($recursive && is_array($path))
-			{
-				$this->addDirectory($directory . $key, true);
-			}
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-	// Filtering
-	//--------------------------------------------------------------------
-
-	/**
-	 * Removes any files from the list that match the supplied pattern
-	 * (within the optional scope).
-	 *
-	 * @param string      $pattern Regex or pseudo-regex string
-	 * @param string|null $scope The directory to limit the scope
-	 *
-	 * @return $this
-	 */
-	public function removePattern(string $pattern, string $scope = null)
-	{
-		if ($pattern === '')
-		{
-			return $this;
-		}
-
-		// Start with all files or those in scope
-		$files = is_null($scope) ? $this->files : self::filterFiles($this->files, $scope);
-
-		// Remove any files that match the pattern
-		return $this->removeFiles(self::matchFiles($files, $pattern));
-	}
-
-	/**
-	 * Keeps only the files from the list that match
-	 * (within the optional scope).
-	 *
-	 * @param string      $pattern Regex or pseudo-regex string
-	 * @param string|null $scope A directory to limit the scope
-	 *
-	 * @return $this
-	 */
-	public function retainPattern(string $pattern, string $scope = null)
-	{
-		if ($pattern === '')
-		{
-			return $this;
-		}
-
-		// Start with all files or those in scope
-		$files = is_null($scope) ? $this->files : self::filterFiles($this->files, $scope);
-
-		// Matches the pattern within the scoped files and remove their inverse.
-		return $this->removeFiles(array_diff($files, self::matchFiles($files, $pattern)));
-	}
-
-	//--------------------------------------------------------------------
-	// Interface Methods
-	//--------------------------------------------------------------------
+    /**
+     * The current list of file paths.
+     *
+     * @var string[]
+     */
+    protected $files = [];
+
+    //--------------------------------------------------------------------
+    // Support Methods
+    //--------------------------------------------------------------------
+
+    /**
+     * Resolves a full path and verifies it is an actual directory.
+     *
+     * @throws FileException
+     */
+    final protected static function resolveDirectory(string $directory): string
+    {
+        if (! is_dir($directory = set_realpath($directory))) {
+            $caller = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1];
+
+            throw FileException::forExpectedDirectory($caller['function']);
+        }
+
+        return $directory;
+    }
+
+    /**
+     * Resolves a full path and verifies it is an actual file.
+     *
+     * @throws FileException
+     */
+    final protected static function resolveFile(string $file): string
+    {
+        if (! is_file($file = set_realpath($file))) {
+            $caller = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1];
+
+            throw FileException::forExpectedFile($caller['function']);
+        }
+
+        return $file;
+    }
+
+    /**
+     * Removes files that are not part of the given directory (recursive).
+     *
+     * @param string[] $files
+     *
+     * @return string[]
+     */
+    final protected static function filterFiles(array $files, string $directory): array
+    {
+        $directory = self::resolveDirectory($directory);
+
+        return array_filter($files, static function (string $value) use ($directory): bool {
+            return strpos($value, $directory) === 0;
+        });
+    }
+
+    /**
+     * Returns any files whose `basename` matches the given pattern.
+     *
+     * @param string[] $files
+     * @param string   $pattern Regex or pseudo-regex string
+     *
+     * @return string[]
+     */
+    final protected static function matchFiles(array $files, string $pattern): array
+    {
+        // Convert pseudo-regex into their true form
+        if (@preg_match($pattern, '') === false) {
+            $pattern = str_replace(
+                ['#', '.', '*', '?'],
+                ['\#', '\.', '.*', '.'],
+                $pattern
+            );
+            $pattern = "#{$pattern}#";
+        }
+
+        return array_filter($files, static function ($value) use ($pattern) {
+            return (bool) preg_match($pattern, basename($value));
+        });
+    }
+
+    //--------------------------------------------------------------------
+    // Class Core
+    //--------------------------------------------------------------------
+
+    /**
+     * Loads the Filesystem helper and adds any initial files.
+     *
+     * @param string[] $files
+     */
+    public function __construct(array $files = [])
+    {
+        helper(['filesystem']);
+
+        $this->add($files)->define();
+    }
+
+    /**
+     * Applies any initial inputs after the constructor.
+     * This method is a stub to be implemented by child classes.
+     */
+    protected function define(): void
+    {
+    }
+
+    /**
+     * Optimizes and returns the current file list.
+     *
+     * @return string[]
+     */
+    public function get(): array
+    {
+        $this->files = array_unique($this->files);
+        sort($this->files, SORT_STRING);
+
+        return $this->files;
+    }
+
+    /**
+     * Sets the file list directly, files are still subject to verification.
+     * This works as a "reset" method with [].
+     *
+     * @param string[] $files The new file list to use
+     *
+     * @return $this
+     */
+    public function set(array $files)
+    {
+        $this->files = [];
+
+        return $this->addFiles($files);
+    }
+
+    /**
+     * Adds an array/single file or directory to the list.
+     *
+     * @param string|string[] $paths
+     *
+     * @return $this
+     */
+    public function add($paths, bool $recursive = true)
+    {
+        $paths = (array) $paths;
+
+        foreach ($paths as $path) {
+            if (! is_string($path)) {
+                throw new InvalidArgumentException('FileCollection paths must be strings.');
+            }
+
+            try {
+                // Test for a directory
+                self::resolveDirectory($path);
+            } catch (FileException $e) {
+                return $this->addFile($path);
+            }
+
+            $this->addDirectory($path, $recursive);
+        }
+
+        return $this;
+    }
+
+    //--------------------------------------------------------------------
+    // File Handling
+    //--------------------------------------------------------------------
+
+    /**
+     * Verifies and adds files to the list.
+     *
+     * @param string[] $files
+     *
+     * @return $this
+     */
+    public function addFiles(array $files)
+    {
+        foreach ($files as $file) {
+            $this->addFile($file);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Verifies and adds a single file to the file list.
+     *
+     * @return $this
+     */
+    public function addFile(string $file)
+    {
+        $this->files[] = self::resolveFile($file);
+
+        return $this;
+    }
+
+    /**
+     * Removes files from the list.
+     *
+     * @param string[] $files
+     *
+     * @return $this
+     */
+    public function removeFiles(array $files)
+    {
+        $this->files = array_diff($this->files, $files);
+
+        return $this;
+    }
+
+    /**
+     * Removes a single file from the list.
+     *
+     * @return $this
+     */
+    public function removeFile(string $file)
+    {
+        return $this->removeFiles([$file]);
+    }
+
+    //--------------------------------------------------------------------
+    // Directory Handling
+    //--------------------------------------------------------------------
+
+    /**
+     * Verifies and adds files from each
+     * directory to the list.
+     *
+     * @param string[] $directories
+     *
+     * @return $this
+     */
+    public function addDirectories(array $directories, bool $recursive = false)
+    {
+        foreach ($directories as $directory) {
+            $this->addDirectory($directory, $recursive);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Verifies and adds all files from a directory.
+     *
+     * @return $this
+     */
+    public function addDirectory(string $directory, bool $recursive = false)
+    {
+        $directory = self::resolveDirectory($directory);
+
+        // Map the directory to depth 2 to so directories become arrays
+        foreach (directory_map($directory, 2, true) as $key => $path) {
+            if (is_string($path)) {
+                $this->addFile($directory . $path);
+            } elseif ($recursive && is_array($path)) {
+                $this->addDirectory($directory . $key, true);
+            }
+        }
+
+        return $this;
+    }
+
+    //--------------------------------------------------------------------
+    // Filtering
+    //--------------------------------------------------------------------
+
+    /**
+     * Removes any files from the list that match the supplied pattern
+     * (within the optional scope).
+     *
+     * @param string      $pattern Regex or pseudo-regex string
+     * @param string|null $scope   The directory to limit the scope
+     *
+     * @return $this
+     */
+    public function removePattern(string $pattern, ?string $scope = null)
+    {
+        if ($pattern === '') {
+            return $this;
+        }
+
+        // Start with all files or those in scope
+        $files = $scope === null ? $this->files : self::filterFiles($this->files, $scope);
+
+        // Remove any files that match the pattern
+        return $this->removeFiles(self::matchFiles($files, $pattern));
+    }
+
+    /**
+     * Keeps only the files from the list that match
+     * (within the optional scope).
+     *
+     * @param string      $pattern Regex or pseudo-regex string
+     * @param string|null $scope   A directory to limit the scope
+     *
+     * @return $this
+     */
+    public function retainPattern(string $pattern, ?string $scope = null)
+    {
+        if ($pattern === '') {
+            return $this;
+        }
+
+        // Start with all files or those in scope
+        $files = $scope === null ? $this->files : self::filterFiles($this->files, $scope);
+
+        // Matches the pattern within the scoped files and remove their inverse.
+        return $this->removeFiles(array_diff($files, self::matchFiles($files, $pattern)));
+    }
+
+    //--------------------------------------------------------------------
+    // Interface Methods
+    //--------------------------------------------------------------------
 
     /**
      * Returns the current number of files in the collection.
      * Fulfills Countable.
-     *
-     * @return int
      */
     public function count(): int
     {
@@ -397,9 +360,8 @@ public function count(): int
      */
     public function getIterator(): Generator
     {
-    	foreach ($this->get() as $file)
-    	{
-    		yield new File($file, true);
-    	}
+        foreach ($this->get() as $file) {
+            yield new File($file, true);
+        }
     }
 }
diff --git a/system/Language/en/Files.php b/system/Language/en/Files.php
index bcbc39d7e349..03fa776e4822 100644
--- a/system/Language/en/Files.php
+++ b/system/Language/en/Files.php
@@ -13,6 +13,6 @@
 return [
     'fileNotFound'      => 'File not found: {0}',
     'cannotMove'        => 'Could not move file {0} to {1} ({2}).',
-	'expectedDirectory' => '{0} expects a valid directory.',
-	'expectedFile'      => '{0} expects a valid file.',
+    'expectedDirectory' => '{0} expects a valid directory.',
+    'expectedFile'      => '{0} expects a valid file.',
 ];
diff --git a/system/Language/en/Publisher.php b/system/Language/en/Publisher.php
index 77d805a78ff2..f335b98423f7 100644
--- a/system/Language/en/Publisher.php
+++ b/system/Language/en/Publisher.php
@@ -1,22 +1,22 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 // Publisher language settings
 return [
-	'collision'             => 'Publisher encountered an unexpected {0} while copying {1} to {2}.',
-	'destinationNotAllowed' => 'Destination is not on the allowed list of Publisher directories: {0}',
-	'fileNotAllowed'        => '{0} fails the following restriction for {1}: {2}',
+    'collision'             => 'Publisher encountered an unexpected {0} while copying {1} to {2}.',
+    'destinationNotAllowed' => 'Destination is not on the allowed list of Publisher directories: {0}',
+    'fileNotAllowed'        => '{0} fails the following restriction for {1}: {2}',
 
-	// Publish Command
-	'publishMissing'    => 'No Publisher classes detected in {0} across all namespaces.',
-	'publishSuccess'    => '{0} published {1} file(s) to {2}.',
-	'publishFailure'    => '{0} failed to publish to {1}!',
+    // Publish Command
+    'publishMissing' => 'No Publisher classes detected in {0} across all namespaces.',
+    'publishSuccess' => '{0} published {1} file(s) to {2}.',
+    'publishFailure' => '{0} failed to publish to {1}!',
 ];
diff --git a/system/Publisher/Exceptions/PublisherException.php b/system/Publisher/Exceptions/PublisherException.php
index c3e85a994ebe..535d3a757d15 100644
--- a/system/Publisher/Exceptions/PublisherException.php
+++ b/system/Publisher/Exceptions/PublisherException.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Publisher\Exceptions;
@@ -20,36 +20,30 @@
  */
 class PublisherException extends FrameworkException
 {
-	/**
-	 * Throws when a file should be overwritten yet cannot.
-	 *
-	 * @param string $from The source file
-	 * @param string $to   The destination file
-	 */
-	public static function forCollision(string $from, string $to)
-	{
-		return new static(lang('Publisher.collision', [filetype($to), $from, $to]));
-	}
+    /**
+     * Throws when a file should be overwritten yet cannot.
+     *
+     * @param string $from The source file
+     * @param string $to   The destination file
+     */
+    public static function forCollision(string $from, string $to)
+    {
+        return new static(lang('Publisher.collision', [filetype($to), $from, $to]));
+    }
 
-	/**
-	 * Throws when given a destination that is not in the list of allowed directories.
-	 *
-	 * @param string $destination
-	 */
-	public static function forDestinationNotAllowed(string $destination)
-	{
-		return new static(lang('Publisher.destinationNotAllowed', [$destination]));
-	}
+    /**
+     * Throws when given a destination that is not in the list of allowed directories.
+     */
+    public static function forDestinationNotAllowed(string $destination)
+    {
+        return new static(lang('Publisher.destinationNotAllowed', [$destination]));
+    }
 
-	/**
-	 * Throws when a file fails to match the allowed pattern for its destination.
-	 *
-	 * @param string $file
-	 * @param string $directory
-	 * @param string $pattern
-	 */
-	public static function forFileNotAllowed(string $file, string $directory, string $pattern)
-	{
-		return new static(lang('Publisher.fileNotAllowed', [$file, $directory, $pattern]));
-	}
+    /**
+     * Throws when a file fails to match the allowed pattern for its destination.
+     */
+    public static function forFileNotAllowed(string $file, string $directory, string $pattern)
+    {
+        return new static(lang('Publisher.fileNotAllowed', [$file, $directory, $pattern]));
+    }
 }
diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php
index ab4484cdea0b..38e990776ef3 100644
--- a/system/Publisher/Publisher.php
+++ b/system/Publisher/Publisher.php
@@ -1,12 +1,12 @@
 <?php
 
 /**
- * This file is part of the CodeIgniter 4 framework.
+ * 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.
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Publisher;
@@ -19,8 +19,6 @@
 use Throwable;
 
 /**
- * Publisher Class
- *
  * Publishers read in file paths from a variety of sources and copy
  * the files out to different destinations. This class acts both as
  * a base for individual publication directives as well as the mode
@@ -28,464 +26,413 @@
  * path to a verified file while a "path" is relative to its source
  * or destination and may indicate either a file or directory of
  * unconfirmed existence.
+ *
  * Class failures throw the PublisherException, but some underlying
  * methods may percolate different exceptions, like FileException,
  * FileNotFoundException or InvalidArgumentException.
+ *
  * Write operations will catch all errors in the file-specific
  * $errors property to minimize impact of partial batch operations.
  */
 class Publisher extends FileCollection
 {
-	/**
-	 * Array of discovered Publishers.
-	 *
-	 * @var array<string,self[]|null>
-	 */
-	private static $discovered = [];
-
-	/**
-	 * Directory to use for methods that need temporary storage.
-	 * Created on-the-fly as needed.
-	 *
-	 * @var string|null
-	 */
-	private $scratch;
-
-	/**
-	 * Exceptions for specific files from the last write operation.
-	 *
-	 * @var array<string,Throwable>
-	 */
-	private $errors = [];
-
-	/**
-	 * List of file published curing the last write operation.
-	 *
-	 * @var string[]
-	 */
-	private $published = [];
-
-	/**
-	 * List of allowed directories and their allowed files regex.
-	 * Restrictions are intentionally private to prevent overriding.
-	 *
-	 * @var array<string,string>
-	 */
-	private $restrictions;
-
-	/**
-	 * Base path to use for the source.
-	 *
-	 * @var string
-	 */
-	protected $source = ROOTPATH;
-
-	/**
-	 * Base path to use for the destination.
-	 *
-	 * @var string
-	 */
-	protected $destination = FCPATH;
-
-	//--------------------------------------------------------------------
-	// Support Methods
-	//--------------------------------------------------------------------
-
-	/**
-	 * Discovers and returns all Publishers in the specified namespace directory.
-	 *
-	 * @param string $directory
-	 *
-	 * @return self[]
-	 */
-	final public static function discover(string $directory = 'Publishers'): array
-	{
-		if (isset(self::$discovered[$directory]))
-		{
-			return self::$discovered[$directory];
-		}
-	
-		self::$discovered[$directory] = [];
-
-		/** @var FileLocator $locator */
-		$locator = service('locator');
-
-		if ([] === $files = $locator->listFiles($directory))
-		{
-			return [];
-		}
-
-		// Loop over each file checking to see if it is a Publisher
-		foreach (array_unique($files) as $file)
-		{
-			$className = $locator->findQualifiedNameFromPath($file);
-
-			if (is_string($className) && class_exists($className) && is_a($className, self::class, true))
-			{
-				self::$discovered[$directory][] = new $className();
-			}
-		}
-
-		sort(self::$discovered[$directory]);
-
-		return self::$discovered[$directory];
-	}
-
-	/*
-	 * Removes a directory and all its files and subdirectories.
-	 *
-	 * @param string $directory
-	 *
-	 * @return void
-	 */
-	private static function wipeDirectory(string $directory): void
-	{
-		if (is_dir($directory))
-		{
-			// Try a few times in case of lingering locks
-			$attempts = 10;
-			while ((bool) $attempts && ! delete_files($directory, true, false, true))
-			{
-				// @codeCoverageIgnoreStart
-				$attempts--;
-				usleep(100000); // .1s
-				// @codeCoverageIgnoreEnd
-			}
-
-			@rmdir($directory);
-		}
-	}
-
-	//--------------------------------------------------------------------
-	// Class Core
-	//--------------------------------------------------------------------
-
-	/**
-	 * Loads the helper and verifies the source and destination directories.
-	 *
-	 * @param string|null $source
-	 * @param string|null $destination
-	 */
-	public function __construct(string $source = null, string $destination = null)
-	{
-		helper(['filesystem']);
-
-		$this->source      = self::resolveDirectory($source ?? $this->source);
-		$this->destination = self::resolveDirectory($destination ?? $this->destination);
-
-		// Restrictions are intentionally not injected to prevent overriding
-		$this->restrictions = config('Publisher')->restrictions;
-
-		// Make sure the destination is allowed
-		foreach (array_keys($this->restrictions) as $directory)
-		{
-			if (strpos($this->destination, $directory) === 0)
-			{
-				return;
-			}
-		}
-
-		throw PublisherException::forDestinationNotAllowed($this->destination);
-	}
-
-	/**
-	 * Cleans up any temporary files in the scratch space.
-	 */
-	public function __destruct()
-	{
-		if (isset($this->scratch))
-		{
-			self::wipeDirectory($this->scratch);
-
-			$this->scratch = null;
-		}
-	}
-
-	/**
-	 * Reads files from the sources and copies them out to their destinations.
-	 * This method should be reimplemented by child classes intended for
-	 * discovery.
-	 *
-	 * @return boolean
-	 *
-	 * @throws RuntimeException
-	 */
-	public function publish(): bool
-	{
-		// Safeguard against accidental misuse
-		if ($this->source === ROOTPATH && $this->destination === FCPATH)
-		{
-			throw new RuntimeException('Child classes of Publisher should provide their own publish method or a source and destination.');
-		}
-
-		return $this->addPath('/')->merge(true);
-	}
-
-	//--------------------------------------------------------------------
-	// Property Accessors
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the source directory.
-	 *
-	 * @return string
-	 */
-	final public function getSource(): string
-	{
-		return $this->source;
-	}
-
-	/**
-	 * Returns the destination directory.
-	 *
-	 * @return string
-	 */
-	final public function getDestination(): string
-	{
-		return $this->destination;
-	}
-
-	/**
-	 * Returns the temporary workspace, creating it if necessary.
-	 *
-	 * @return string
-	 */
-	final public function getScratch(): string
-	{
-		if (is_null($this->scratch))
-		{
-			$this->scratch = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . bin2hex(random_bytes(6)) . DIRECTORY_SEPARATOR;
-			mkdir($this->scratch, 0700);
-		}
-
-		return $this->scratch;
-	}
-
-	/**
-	 * Returns errors from the last write operation if any.
-	 *
-	 * @return array<string,Throwable>
-	 */
-	final public function getErrors(): array
-	{
-		return $this->errors;
-	}
-
-	/**
-	 * Returns the files published by the last write operation.
-	 *
-	 * @return string[]
-	 */
-	final public function getPublished(): array
-	{
-		return $this->published;
-	}
-
-	//--------------------------------------------------------------------
-	// Additional Handlers
-	//--------------------------------------------------------------------
-
-	/**
-	 * Verifies and adds paths to the list.
-	 *
-	 * @param string[] $paths
-	 * @param bool $recursive
-	 *
-	 * @return $this
-	 */
-	final public function addPaths(array $paths, bool $recursive = true)
-	{
-		foreach ($paths as $path)
-		{
-			$this->addPath($path, $recursive);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Adds a single path to the file list.
-	 *
-	 * @param string  $path
-	 * @param boolean $recursive
-	 *
-	 * @return $this
-	 */
-	final public function addPath(string $path, bool $recursive = true)
-	{
-		$this->add($this->source . $path, $recursive);
-
-		return $this;
-	}
-
-	/**
-	 * Downloads and stages files from an array of URIs.
-	 *
-	 * @param string[] $uris
-	 *
-	 * @return $this
-	 */
-	final public function addUris(array $uris)
-	{
-		foreach ($uris as $uri)
-		{
-			$this->addUri($uri);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Downloads a file from the URI, and adds it to the file list.
-	 *
-	 * @param string $uri Because HTTP\URI is stringable it will still be accepted
-	 *
-	 * @return $this
-	 */
-	final public function addUri(string $uri)
-	{
-		// Figure out a good filename (using URI strips queries and fragments)
-		$file = $this->getScratch() . basename((new URI($uri))->getPath());
-
-		// Get the content and write it to the scratch space
-		write_file($file, service('curlrequest')->get($uri)->getBody());
-
-		return $this->addFile($file);
-	}
-
-	//--------------------------------------------------------------------
-	// Write Methods
-	//--------------------------------------------------------------------
-
-	/**
-	 * Removes the destination and all its files and folders.
-	 *
-	 * @return $this
-	 */
-	final public function wipe()
-	{
-		self::wipeDirectory($this->destination);
-
-		return $this;
-	}
-
-	/**
-	 * Copies all files into the destination, does not create directory structure.
-	 *
-	 * @param boolean $replace Whether to overwrite existing files.
-	 *
-	 * @return boolean Whether all files were copied successfully
-	 */
-	final public function copy(bool $replace = true): bool
-	{
-		$this->errors = $this->published = [];
-
-		foreach ($this->get() as $file)
-		{
-			$to = $this->destination . basename($file);
-
-			try
-			{
-				$this->safeCopyFile($file, $to, $replace);
-				$this->published[] = $to;
-			}
-			catch (Throwable $e)
-			{
-				$this->errors[$file] = $e;
-			}
-		}
-
-		return $this->errors === [];
-	}
-
-	/**
-	 * Merges all files into the destination.
-	 * Creates a mirrored directory structure only for files from source.
-	 *
-	 * @param boolean $replace Whether to overwrite existing files.
-	 *
-	 * @return boolean Whether all files were copied successfully
-	 */
-	final public function merge(bool $replace = true): bool
-	{
-		$this->errors = $this->published = [];
-
-		// Get the files from source for special handling
-		$sourced = self::filterFiles($this->get(), $this->source);
-
-		// Handle everything else with a flat copy
-		$this->files = array_diff($this->files, $sourced);
-		$this->copy($replace);
-
-		// Copy each sourced file to its relative destination
-		foreach ($sourced as $file)
-		{
-			// Resolve the destination path
-			$to = $this->destination . substr($file, strlen($this->source));
-
-			try
-			{
-				$this->safeCopyFile($file, $to, $replace);
-				$this->published[] = $to;
-			}
-			catch (Throwable $e)
-			{
-				$this->errors[$file] = $e;
-			}
-		}
-
-		return $this->errors === [];
-	}
-
-	/**
-	 * Copies a file with directory creation and identical file awareness.
-	 * Intentionally allows errors.
-	 *
-	 * @param string  $from
-	 * @param string  $to
-	 * @param boolean $replace
-	 *
-	 * @return void
-	 *
-	 * @throws PublisherException For collisions and restriction violations
-	 */
-	private function safeCopyFile(string $from, string $to, bool $replace): void
-	{
-		// Verify this is an allowed file for its destination
-		foreach ($this->restrictions as $directory => $pattern)
-		{
-			if (strpos($to, $directory) === 0 && self::matchFiles([$to], $pattern) === [])
-			{
-				throw PublisherException::forFileNotAllowed($from, $directory, $pattern);
-			}
-		}
-
-		// Check for an existing file
-		if (file_exists($to))
-		{
-			// If not replacing or if files are identical then consider successful
-			if (! $replace || same_file($from, $to))
-			{
-				return;
-			}
-
-			// If it is a directory then do not try to remove it
-			if (is_dir($to))
-			{
-				throw PublisherException::forCollision($from, $to);
-			}
-
-			// Try to remove anything else
-			unlink($to);
-		}
-
-		// Make sure the directory exists
-		if (! is_dir($directory = pathinfo($to, PATHINFO_DIRNAME)))
-		{
-			mkdir($directory, 0775, true);
-		}
-
-		// Allow copy() to throw errors
-		copy($from, $to);
-	}
+    /**
+     * Array of discovered Publishers.
+     *
+     * @var array<string, self[]|null>
+     */
+    private static $discovered = [];
+
+    /**
+     * Directory to use for methods that need temporary storage.
+     * Created on-the-fly as needed.
+     *
+     * @var string|null
+     */
+    private $scratch;
+
+    /**
+     * Exceptions for specific files from the last write operation.
+     *
+     * @var array<string, Throwable>
+     */
+    private $errors = [];
+
+    /**
+     * List of file published curing the last write operation.
+     *
+     * @var string[]
+     */
+    private $published = [];
+
+    /**
+     * List of allowed directories and their allowed files regex.
+     * Restrictions are intentionally private to prevent overriding.
+     *
+     * @var array<string,string>
+     */
+    private $restrictions;
+
+    /**
+     * Base path to use for the source.
+     *
+     * @var string
+     */
+    protected $source = ROOTPATH;
+
+    /**
+     * Base path to use for the destination.
+     *
+     * @var string
+     */
+    protected $destination = FCPATH;
+
+    //--------------------------------------------------------------------
+    // Support Methods
+    //--------------------------------------------------------------------
+
+    /**
+     * Discovers and returns all Publishers in the specified namespace directory.
+     *
+     * @return self[]
+     */
+    final public static function discover(string $directory = 'Publishers'): array
+    {
+        if (isset(self::$discovered[$directory])) {
+            return self::$discovered[$directory];
+        }
+
+        self::$discovered[$directory] = [];
+
+        /** @var FileLocator $locator */
+        $locator = service('locator');
+
+        if ([] === $files = $locator->listFiles($directory)) {
+            return [];
+        }
+
+        // Loop over each file checking to see if it is a Publisher
+        foreach (array_unique($files) as $file) {
+            $className = $locator->findQualifiedNameFromPath($file);
+
+            if (is_string($className) && class_exists($className) && is_a($className, self::class, true)) {
+                self::$discovered[$directory][] = new $className();
+            }
+        }
+
+        sort(self::$discovered[$directory]);
+
+        return self::$discovered[$directory];
+    }
+
+    /**
+     * Removes a directory and all its files and subdirectories.
+     */
+    private static function wipeDirectory(string $directory): void
+    {
+        if (is_dir($directory)) {
+            // Try a few times in case of lingering locks
+            $attempts = 10;
+
+            while ((bool) $attempts && ! delete_files($directory, true, false, true)) {
+                // @codeCoverageIgnoreStart
+                $attempts--;
+                usleep(100000); // .1s
+                // @codeCoverageIgnoreEnd
+            }
+
+            @rmdir($directory);
+        }
+    }
+
+    //--------------------------------------------------------------------
+    // Class Core
+    //--------------------------------------------------------------------
+
+    /**
+     * Loads the helper and verifies the source and destination directories.
+     */
+    public function __construct(?string $source = null, ?string $destination = null)
+    {
+        helper(['filesystem']);
+
+        $this->source      = self::resolveDirectory($source ?? $this->source);
+        $this->destination = self::resolveDirectory($destination ?? $this->destination);
+
+        // Restrictions are intentionally not injected to prevent overriding
+        $this->restrictions = config('Publisher')->restrictions;
+
+        // Make sure the destination is allowed
+        foreach (array_keys($this->restrictions) as $directory) {
+            if (strpos($this->destination, $directory) === 0) {
+                return;
+            }
+        }
+
+        throw PublisherException::forDestinationNotAllowed($this->destination);
+    }
+
+    /**
+     * Cleans up any temporary files in the scratch space.
+     */
+    public function __destruct()
+    {
+        if (isset($this->scratch)) {
+            self::wipeDirectory($this->scratch);
+
+            $this->scratch = null;
+        }
+    }
+
+    /**
+     * Reads files from the sources and copies them out to their destinations.
+     * This method should be reimplemented by child classes intended for
+     * discovery.
+     *
+     * @throws RuntimeException
+     */
+    public function publish(): bool
+    {
+        // Safeguard against accidental misuse
+        if ($this->source === ROOTPATH && $this->destination === FCPATH) {
+            throw new RuntimeException('Child classes of Publisher should provide their own publish method or a source and destination.');
+        }
+
+        return $this->addPath('/')->merge(true);
+    }
+
+    //--------------------------------------------------------------------
+    // Property Accessors
+    //--------------------------------------------------------------------
+
+    /**
+     * Returns the source directory.
+     */
+    final public function getSource(): string
+    {
+        return $this->source;
+    }
+
+    /**
+     * Returns the destination directory.
+     */
+    final public function getDestination(): string
+    {
+        return $this->destination;
+    }
+
+    /**
+     * Returns the temporary workspace, creating it if necessary.
+     */
+    final public function getScratch(): string
+    {
+        if ($this->scratch === null) {
+            $this->scratch = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . bin2hex(random_bytes(6)) . DIRECTORY_SEPARATOR;
+            mkdir($this->scratch, 0700);
+        }
+
+        return $this->scratch;
+    }
+
+    /**
+     * Returns errors from the last write operation if any.
+     *
+     * @return array<string,Throwable>
+     */
+    final public function getErrors(): array
+    {
+        return $this->errors;
+    }
+
+    /**
+     * Returns the files published by the last write operation.
+     *
+     * @return string[]
+     */
+    final public function getPublished(): array
+    {
+        return $this->published;
+    }
+
+    //--------------------------------------------------------------------
+    // Additional Handlers
+    //--------------------------------------------------------------------
+
+    /**
+     * Verifies and adds paths to the list.
+     *
+     * @param string[] $paths
+     *
+     * @return $this
+     */
+    final public function addPaths(array $paths, bool $recursive = true)
+    {
+        foreach ($paths as $path) {
+            $this->addPath($path, $recursive);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Adds a single path to the file list.
+     *
+     * @return $this
+     */
+    final public function addPath(string $path, bool $recursive = true)
+    {
+        $this->add($this->source . $path, $recursive);
+
+        return $this;
+    }
+
+    /**
+     * Downloads and stages files from an array of URIs.
+     *
+     * @param string[] $uris
+     *
+     * @return $this
+     */
+    final public function addUris(array $uris)
+    {
+        foreach ($uris as $uri) {
+            $this->addUri($uri);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Downloads a file from the URI, and adds it to the file list.
+     *
+     * @param string $uri Because HTTP\URI is stringable it will still be accepted
+     *
+     * @return $this
+     */
+    final public function addUri(string $uri)
+    {
+        // Figure out a good filename (using URI strips queries and fragments)
+        $file = $this->getScratch() . basename((new URI($uri))->getPath());
+
+        // Get the content and write it to the scratch space
+        write_file($file, service('curlrequest')->get($uri)->getBody());
+
+        return $this->addFile($file);
+    }
+
+    //--------------------------------------------------------------------
+    // Write Methods
+    //--------------------------------------------------------------------
+
+    /**
+     * Removes the destination and all its files and folders.
+     *
+     * @return $this
+     */
+    final public function wipe()
+    {
+        self::wipeDirectory($this->destination);
+
+        return $this;
+    }
+
+    /**
+     * Copies all files into the destination, does not create directory structure.
+     *
+     * @param bool $replace Whether to overwrite existing files.
+     *
+     * @return bool Whether all files were copied successfully
+     */
+    final public function copy(bool $replace = true): bool
+    {
+        $this->errors = $this->published = [];
+
+        foreach ($this->get() as $file) {
+            $to = $this->destination . basename($file);
+
+            try {
+                $this->safeCopyFile($file, $to, $replace);
+                $this->published[] = $to;
+            } catch (Throwable $e) {
+                $this->errors[$file] = $e;
+            }
+        }
+
+        return $this->errors === [];
+    }
+
+    /**
+     * Merges all files into the destination.
+     * Creates a mirrored directory structure only for files from source.
+     *
+     * @param bool $replace Whether to overwrite existing files.
+     *
+     * @return bool Whether all files were copied successfully
+     */
+    final public function merge(bool $replace = true): bool
+    {
+        $this->errors = $this->published = [];
+
+        // Get the files from source for special handling
+        $sourced = self::filterFiles($this->get(), $this->source);
+
+        // Handle everything else with a flat copy
+        $this->files = array_diff($this->files, $sourced);
+        $this->copy($replace);
+
+        // Copy each sourced file to its relative destination
+        foreach ($sourced as $file) {
+            // Resolve the destination path
+            $to = $this->destination . substr($file, strlen($this->source));
+
+            try {
+                $this->safeCopyFile($file, $to, $replace);
+                $this->published[] = $to;
+            } catch (Throwable $e) {
+                $this->errors[$file] = $e;
+            }
+        }
+
+        return $this->errors === [];
+    }
+
+    /**
+     * Copies a file with directory creation and identical file awareness.
+     * Intentionally allows errors.
+     *
+     * @throws PublisherException For collisions and restriction violations
+     */
+    private function safeCopyFile(string $from, string $to, bool $replace): void
+    {
+        // Verify this is an allowed file for its destination
+        foreach ($this->restrictions as $directory => $pattern) {
+            if (strpos($to, $directory) === 0 && self::matchFiles([$to], $pattern) === []) {
+                throw PublisherException::forFileNotAllowed($from, $directory, $pattern);
+            }
+        }
+
+        // Check for an existing file
+        if (file_exists($to)) {
+            // If not replacing or if files are identical then consider successful
+            if (! $replace || same_file($from, $to)) {
+                return;
+            }
+
+            // If it is a directory then do not try to remove it
+            if (is_dir($to)) {
+                throw PublisherException::forCollision($from, $to);
+            }
+
+            // Try to remove anything else
+            unlink($to);
+        }
+
+        // Make sure the directory exists
+        if (! is_dir($directory = pathinfo($to, PATHINFO_DIRNAME))) {
+            mkdir($directory, 0775, true);
+        }
+
+        // Allow copy() to throw errors
+        copy($from, $to);
+    }
 }
diff --git a/system/Session/Handlers/DatabaseHandler.php b/system/Session/Handlers/DatabaseHandler.php
index ebfdfc119d5e..f0164d2dfc3c 100644
--- a/system/Session/Handlers/DatabaseHandler.php
+++ b/system/Session/Handlers/DatabaseHandler.php
@@ -256,7 +256,7 @@ public function gc($max_lifetime)
         $separator = $this->platform === 'postgre' ? '\'' : ' ';
         $interval  = implode($separator, ['', "{$max_lifetime} second", '']);
 
-        return $this->db->table($this->table)->where('timestamp <', "now() - INTERVAL {$interval}", false)->delete() ? true : $this->fail();
+        return $this->db->table($this->table)->where('timestamp <', "now() - INTERVAL {$interval}", false)->delete() ? 1 : $this->fail();
     }
 
     /**
diff --git a/tests/_support/Publishers/TestPublisher.php b/tests/_support/Publishers/TestPublisher.php
index 47c987a0285a..357e50f17e1a 100644
--- a/tests/_support/Publishers/TestPublisher.php
+++ b/tests/_support/Publishers/TestPublisher.php
@@ -1,48 +1,56 @@
 <?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\Publishers;
 
 use CodeIgniter\Publisher\Publisher;
-use RuntimeException;
 
 final class TestPublisher extends Publisher
 {
-	/**
-	 * Fakes an error on the given file.
-	 */
-	public static function setResult(bool $result)
-	{
-		self::$result = $result;
-	}
-
-	/**
-	 * Return value for publish()
-	 *
-	 * @var boolean
-	 */
-	private static $result = true;
-
-	/**
-	 * Base path to use for the source.
-	 *
-	 * @var string
-	 */
-	protected $source = SUPPORTPATH . 'Files';
-
-	/**
-	 * Base path to use for the destination.
-	 *
-	 * @var string
-	 */
-	protected $destination = WRITEPATH;
-
-	/**
-	 * Fakes a publish event so no files are actually copied.
-	 */
-	public function publish(): bool
-	{
-		$this->addPath('');
-
-		return self::$result;
-	}
+    /**
+     * Fakes an error on the given file.
+     */
+    public static function setResult(bool $result)
+    {
+        self::$result = $result;
+    }
+
+    /**
+     * Return value for publish()
+     *
+     * @var bool
+     */
+    private static $result = true;
+
+    /**
+     * Base path to use for the source.
+     *
+     * @var string
+     */
+    protected $source = SUPPORTPATH . 'Files';
+
+    /**
+     * Base path to use for the destination.
+     *
+     * @var string
+     */
+    protected $destination = WRITEPATH;
+
+    /**
+     * Fakes a publish event so no files are actually copied.
+     */
+    public function publish(): bool
+    {
+        $this->addPath('');
+
+        return self::$result;
+    }
 }
diff --git a/tests/system/Cache/Handlers/BaseHandlerTest.php b/tests/system/Cache/Handlers/BaseHandlerTest.php
index 73f46620b559..b2ebb61e01ef 100644
--- a/tests/system/Cache/Handlers/BaseHandlerTest.php
+++ b/tests/system/Cache/Handlers/BaseHandlerTest.php
@@ -46,7 +46,7 @@ public function invalidTypeProvider(): array
 
     public function testValidateKeyUsesConfig()
     {
-    	config('Cache')->reservedCharacters = 'b';
+        config('Cache')->reservedCharacters = 'b';
 
         $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage('Cache key contains reserved characters b');
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index 0f9f9a10eadf..5b53a9532b8b 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -161,7 +161,7 @@ public function testSavePermanent()
         $this->assertTrue($this->fileHandler->save(self::$key1, 'value', 0));
         $metaData = $this->fileHandler->getMetaData(self::$key1);
 
-        $this->assertSame(null, $metaData['expire']);
+        $this->assertNull($metaData['expire']);
         $this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
         $this->assertSame('value', $metaData['data']);
 
diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
index 9afbdf742236..63a3994d1756 100644
--- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php
+++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
@@ -107,7 +107,7 @@ public function testSavePermanent()
         $this->assertTrue($this->memcachedHandler->save(self::$key1, 'value', 0));
         $metaData = $this->memcachedHandler->getMetaData(self::$key1);
 
-        $this->assertSame(null, $metaData['expire']);
+        $this->assertNull($metaData['expire']);
         $this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
         $this->assertSame('value', $metaData['data']);
 
diff --git a/tests/system/Cache/Handlers/PredisHandlerTest.php b/tests/system/Cache/Handlers/PredisHandlerTest.php
index 867babcddc2a..3bcafae48fe2 100644
--- a/tests/system/Cache/Handlers/PredisHandlerTest.php
+++ b/tests/system/Cache/Handlers/PredisHandlerTest.php
@@ -114,7 +114,7 @@ public function testSavePermanent()
         $this->assertTrue($this->PredisHandler->save(self::$key1, 'value', 0));
         $metaData = $this->PredisHandler->getMetaData(self::$key1);
 
-        $this->assertSame(null, $metaData['expire']);
+        $this->assertNull($metaData['expire']);
         $this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
         $this->assertSame('value', $metaData['data']);
 
diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php
index b3f8cebbb422..d254cd65af97 100644
--- a/tests/system/Cache/Handlers/RedisHandlerTest.php
+++ b/tests/system/Cache/Handlers/RedisHandlerTest.php
@@ -114,7 +114,7 @@ public function testSavePermanent()
         $this->assertTrue($this->redisHandler->save(self::$key1, 'value', 0));
         $metaData = $this->redisHandler->getMetaData(self::$key1);
 
-        $this->assertSame(null, $metaData['expire']);
+        $this->assertNull($metaData['expire']);
         $this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
         $this->assertSame('value', $metaData['data']);
 
diff --git a/tests/system/Commands/CommandGeneratorTest.php b/tests/system/Commands/CommandGeneratorTest.php
index 1d5dd6d116c4..c878b969d5e9 100644
--- a/tests/system/Commands/CommandGeneratorTest.php
+++ b/tests/system/Commands/CommandGeneratorTest.php
@@ -138,7 +138,7 @@ public function testGeneratorPreservesCaseButChangesComponentName(): void
      */
     public function testGeneratorIsNotConfusedWithNamespaceLikeClassNames(): void
     {
-        $time = time();
+        $time      = time();
         $notExists = true;
         command('make:migration App_Lesson');
 
diff --git a/tests/system/Commands/PublishCommandTest.php b/tests/system/Commands/PublishCommandTest.php
index 44f2de25f85a..ea7b09e73511 100644
--- a/tests/system/Commands/PublishCommandTest.php
+++ b/tests/system/Commands/PublishCommandTest.php
@@ -1,52 +1,64 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 use Tests\Support\Publishers\TestPublisher;
 
+/**
+ * @internal
+ */
 final class PublishCommandTest extends CIUnitTestCase
 {
-	private $streamFilter;
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-		CITestStreamFilter::$buffer = '';
-
-		$this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-		$this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-	}
-
-	protected function tearDown(): void
-	{
-		parent::tearDown();
-
-		stream_filter_remove($this->streamFilter);
-		TestPublisher::setResult(true);
-	}
-
-	public function testDefault()
-	{
-		command('publish');
-
-		$this->assertStringContainsString(lang('Publisher.publishSuccess', [
-			TestPublisher::class,
-			0,
-			WRITEPATH,
-		]), CITestStreamFilter::$buffer);
-	}
-
-	public function testFailure()
-	{
-		TestPublisher::setResult(false);
-
-		command('publish');
-
-		$this->assertStringContainsString(lang('Publisher.publishFailure', [
-			TestPublisher::class,
-			WRITEPATH,
-		]), CITestStreamFilter::$buffer);
-	}
+    private $streamFilter;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        CITestStreamFilter::$buffer = '';
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        stream_filter_remove($this->streamFilter);
+        TestPublisher::setResult(true);
+    }
+
+    public function testDefault()
+    {
+        command('publish');
+
+        $this->assertStringContainsString(lang('Publisher.publishSuccess', [
+            TestPublisher::class,
+            0,
+            WRITEPATH,
+        ]), CITestStreamFilter::$buffer);
+    }
+
+    public function testFailure()
+    {
+        TestPublisher::setResult(false);
+
+        command('publish');
+
+        $this->assertStringContainsString(lang('Publisher.publishFailure', [
+            TestPublisher::class,
+            WRITEPATH,
+        ]), CITestStreamFilter::$buffer);
+    }
 }
diff --git a/tests/system/Files/FileCollectionTest.php b/tests/system/Files/FileCollectionTest.php
index ae2df9178f5f..5621151842e2 100644
--- a/tests/system/Files/FileCollectionTest.php
+++ b/tests/system/Files/FileCollectionTest.php
@@ -1,568 +1,556 @@
 <?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.
+ */
+
 use CodeIgniter\Files\Exceptions\FileException;
 use CodeIgniter\Files\File;
 use CodeIgniter\Files\FileCollection;
 use CodeIgniter\Test\CIUnitTestCase;
 
-class FileCollectionTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class FileCollectionTest extends CIUnitTestCase
 {
-	/**
-	 * A known, valid file
-	 *
-	 * @var string
-	 */
-	private $file = SUPPORTPATH . 'Files/baker/banana.php';
-
-	/**
-	 * A known, valid directory
-	 *
-	 * @var string
-	 */
-	private $directory = SUPPORTPATH . 'Files/able/';
-
-	/**
-	 * Initialize the helper, since some
-	 * tests call static methods before
-	 * the constructor would load it.
-	 */
-	public static function setUpBeforeClass(): void
-	{
-		parent::setUpBeforeClass();
-
-		helper(['filesystem']);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testResolveDirectoryDirectory()
-	{
-		$method = $this->getPrivateMethodInvoker(FileCollection::class, 'resolveDirectory');
-
-		$this->assertSame($this->directory, $method($this->directory));
-	}
-
-	public function testResolveDirectoryFile()
-	{
-		$method = $this->getPrivateMethodInvoker(FileCollection::class, 'resolveDirectory');
-
-		$this->expectException(FileException::class);
-		$this->expectExceptionMessage(lang('Files.expectedDirectory', ['invokeArgs']));
-
-		$method($this->file);
-	}
-
-	public function testResolveDirectorySymlink()
-	{
-		// Create a symlink to test
-		$link = sys_get_temp_dir() . DIRECTORY_SEPARATOR . bin2hex(random_bytes(4));
-		symlink($this->directory, $link);
-
-		$method = $this->getPrivateMethodInvoker(FileCollection::class, 'resolveDirectory');
-
-		$this->assertSame($this->directory, $method($link));
-
-		unlink($link);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testResolveFileFile()
-	{
-		$method = $this->getPrivateMethodInvoker(FileCollection::class, 'resolveFile');
-
-		$this->assertSame($this->file, $method($this->file));
-	}
-
-	public function testResolveFileSymlink()
-	{
-		// Create a symlink to test
-		$link = sys_get_temp_dir() . DIRECTORY_SEPARATOR . bin2hex(random_bytes(4));
-		symlink($this->file, $link);
-
-		$method = $this->getPrivateMethodInvoker(FileCollection::class, 'resolveFile');
-
-		$this->assertSame($this->file, $method($link));
-
-		unlink($link);
-	}
-
-	public function testResolveFileDirectory()
-	{
-		$method = $this->getPrivateMethodInvoker(FileCollection::class, 'resolveFile');
-
-		$this->expectException(FileException::class);
-		$this->expectExceptionMessage(lang('Files.expectedFile', ['invokeArgs']));
-
-		$method($this->directory);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testConstructorAddsFiles()
-	{
-		$expected = [
-			$this->directory . 'apple.php',
-			$this->file,
-		];
-
-		$collection = new class([$this->file]) extends FileCollection {
-
-			protected $files = [
-				SUPPORTPATH . 'Files/able/apple.php',
-			];
-		};
-
-		$this->assertSame($expected, $collection->get());
-	}
-
-	public function testConstructorCallsDefine()
-	{
-		$collection = new class() extends FileCollection {
-
-			protected function define(): void
-			{
-				$this->add(SUPPORTPATH . 'Files/baker/banana.php');
-			}
-		};
-
-		$this->assertSame([$this->file], $collection->get());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAddStringFile()
-	{
-		$files = new FileCollection();
-
-		$files->add(SUPPORTPATH . 'Files/baker/banana.php');
-
-		$this->assertSame([$this->file], $files->get());
-	}
-
-	public function testAddStringFileRecursiveDoesNothing()
-	{
-		$files = new FileCollection();
-
-		$files->add(SUPPORTPATH . 'Files/baker/banana.php', true);
-
-		$this->assertSame([$this->file], $files->get());
-	}
-
-	public function testAddStringDirectory()
-	{
-		$files = new FileCollection();
-
-		$expected = [
-			$this->directory . 'apple.php',
-			$this->directory . 'fig_3.php',
-			$this->directory . 'prune_ripe.php',
-		];
-
-		$files->add(SUPPORTPATH . 'Files/able');
-
-		$this->assertSame($expected, $files->get());
-	}
-
-	public function testAddStringDirectoryRecursive()
-	{
-		$files = new FileCollection();
-
-		$expected = [
-			$this->directory . 'apple.php',
-			$this->directory . 'fig_3.php',
-			$this->directory . 'prune_ripe.php',
-			SUPPORTPATH . 'Files/baker/banana.php',
-		];
-
-		$files->add(SUPPORTPATH . 'Files');
+    /**
+     * A known, valid file
+     *
+     * @var string
+     */
+    private $file = SUPPORTPATH . 'Files/baker/banana.php';
+
+    /**
+     * A known, valid directory
+     *
+     * @var string
+     */
+    private $directory = SUPPORTPATH . 'Files/able/';
+
+    /**
+     * Initialize the helper, since some
+     * tests call static methods before
+     * the constructor would load it.
+     */
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
 
-		$this->assertSame($expected, $files->get());
-	}
+        helper(['filesystem']);
+    }
+
+    public function testResolveDirectoryDirectory()
+    {
+        $method = $this->getPrivateMethodInvoker(FileCollection::class, 'resolveDirectory');
 
-	public function testAddArray()
-	{
-		$files = new FileCollection();
+        $this->assertSame($this->directory, $method($this->directory));
+    }
 
-		$expected = [
-			$this->directory . 'apple.php',
-			$this->directory . 'fig_3.php',
-			$this->directory . 'prune_ripe.php',
-			SUPPORTPATH . 'Files/baker/banana.php',
-		];
+    public function testResolveDirectoryFile()
+    {
+        $method = $this->getPrivateMethodInvoker(FileCollection::class, 'resolveDirectory');
 
-		$files->add([
-			SUPPORTPATH . 'Files/able',
-			SUPPORTPATH . 'Files/baker/banana.php',
-		]);
+        $this->expectException(FileException::class);
+        $this->expectExceptionMessage(lang('Files.expectedDirectory', ['invokeArgs']));
+
+        $method($this->file);
+    }
 
-		$this->assertSame($expected, $files->get());
-	}
+    public function testResolveDirectorySymlink()
+    {
+        // Create a symlink to test
+        $link = sys_get_temp_dir() . DIRECTORY_SEPARATOR . bin2hex(random_bytes(4));
+        symlink($this->directory, $link);
 
-	public function testAddArrayRecursive()
-	{
-		$files = new FileCollection();
+        $method = $this->getPrivateMethodInvoker(FileCollection::class, 'resolveDirectory');
 
-		$expected = [
-			$this->directory . 'apple.php',
-			$this->directory . 'fig_3.php',
-			$this->directory . 'prune_ripe.php',
-			SUPPORTPATH . 'Files/baker/banana.php',
-			SUPPORTPATH . 'Log/Handlers/TestHandler.php',
-		];
+        $this->assertSame($this->directory, $method($link));
 
-		$files->add([
-			SUPPORTPATH . 'Files',
-			SUPPORTPATH . 'Log',
-		], true);
+        unlink($link);
+    }
+
+    public function testResolveFileFile()
+    {
+        $method = $this->getPrivateMethodInvoker(FileCollection::class, 'resolveFile');
 
-		$this->assertSame($expected, $files->get());
-	}
+        $this->assertSame($this->file, $method($this->file));
+    }
 
-	//--------------------------------------------------------------------
+    public function testResolveFileSymlink()
+    {
+        // Create a symlink to test
+        $link = sys_get_temp_dir() . DIRECTORY_SEPARATOR . bin2hex(random_bytes(4));
+        symlink($this->file, $link);
 
-	public function testAddFile()
-	{
-		$collection = new FileCollection();
-		$this->assertSame([], $this->getPrivateProperty($collection, 'files'));
+        $method = $this->getPrivateMethodInvoker(FileCollection::class, 'resolveFile');
 
-		$collection->addFile($this->file);
-		$this->assertSame([$this->file], $this->getPrivateProperty($collection, 'files'));
-	}
+        $this->assertSame($this->file, $method($link));
+
+        unlink($link);
+    }
+
+    public function testResolveFileDirectory()
+    {
+        $method = $this->getPrivateMethodInvoker(FileCollection::class, 'resolveFile');
+
+        $this->expectException(FileException::class);
+        $this->expectExceptionMessage(lang('Files.expectedFile', ['invokeArgs']));
 
-	public function testAddFileMissing()
-	{
-		$collection = new FileCollection();
+        $method($this->directory);
+    }
 
-		$this->expectException(FileException::class);
-		$this->expectExceptionMessage(lang('Files.expectedFile', ['addFile']));
+    public function testConstructorAddsFiles()
+    {
+        $expected = [
+            $this->directory . 'apple.php',
+            $this->file,
+        ];
+
+        $collection          = new class ([$this->file]) extends FileCollection {
+            protected $files = [
+                SUPPORTPATH . 'Files/able/apple.php',
+            ];
+        };
+
+        $this->assertSame($expected, $collection->get());
+    }
+
+    public function testConstructorCallsDefine()
+    {
+        $collection = new class () extends FileCollection {
+            protected function define(): void
+            {
+                $this->add(SUPPORTPATH . 'Files/baker/banana.php');
+            }
+        };
 
-		$collection->addFile('TheHillsAreAlive.bmp');
-	}
+        $this->assertSame([$this->file], $collection->get());
+    }
 
-	public function testAddFileDirectory()
-	{
-		$collection = new FileCollection();
+    public function testAddStringFile()
+    {
+        $files = new FileCollection();
 
-		$this->expectException(FileException::class);
-		$this->expectExceptionMessage(lang('Files.expectedFile', ['addFile']));
+        $files->add(SUPPORTPATH . 'Files/baker/banana.php');
 
-		$collection->addFile($this->directory);
-	}
+        $this->assertSame([$this->file], $files->get());
+    }
 
-	public function testAddFiles()
-	{
-		$collection = new FileCollection();
-		$files     = [
-			$this->file,
-			$this->file,
-		];
+    public function testAddStringFileRecursiveDoesNothing()
+    {
+        $files = new FileCollection();
 
-		$collection->addFiles($files);
-		$this->assertSame($files, $this->getPrivateProperty($collection, 'files'));
-	}
+        $files->add(SUPPORTPATH . 'Files/baker/banana.php', true);
 
-	//--------------------------------------------------------------------
+        $this->assertSame([$this->file], $files->get());
+    }
 
-	public function testGet()
-	{
-		$collection = new FileCollection();
-		$collection->addFile($this->file);
-
-		$this->assertSame([$this->file], $collection->get());
-	}
+    public function testAddStringDirectory()
+    {
+        $files = new FileCollection();
 
-	public function testGetSorts()
-	{
-		$collection = new FileCollection();
-		$files     = [
-			$this->file,
-			$this->directory . 'apple.php',
-		];
-
-		$collection->addFiles($files);
-
-		$this->assertSame(array_reverse($files), $collection->get());
-	}
-
-	public function testGetUniques()
-	{
-		$collection = new FileCollection();
-		$files     = [
-			$this->file,
-			$this->file,
-		];
-
-		$collection->addFiles($files);
-		$this->assertSame([$this->file], $collection->get());
-	}
-
-	public function testSet()
-	{
-		$collection = new FileCollection();
-
-		$collection->set([$this->file]);
-		$this->assertSame([$this->file], $collection->get());
-	}
-
-	public function testSetInvalid()
-	{
-		$collection = new FileCollection();
-
-		$this->expectException(FileException::class);
-		$this->expectExceptionMessage(lang('Files.expectedFile', ['addFile']));
-
-		$collection->set(['flerb']);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testRemoveFile()
-	{
-		$collection = new FileCollection();
-		$files     = [
-			$this->file,
-			$this->directory . 'apple.php',
-		];
-
-		$collection->addFiles($files);
-
-		$collection->removeFile($this->file);
-
-		$this->assertSame([$this->directory . 'apple.php'], $collection->get());
-	}
-
-	public function testRemoveFiles()
-	{
-		$collection = new FileCollection();
-		$files     = [
-			$this->file,
-			$this->directory . 'apple.php',
-		];
-
-		$collection->addFiles($files);
-
-		$collection->removeFiles($files);
-
-		$this->assertSame([], $collection->get());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAddDirectoryInvalid()
-	{
-		$collection = new FileCollection();
-
-		$this->expectException(FileException::class);
-		$this->expectExceptionMessage(lang('Files.expectedDirectory', ['addDirectory']));
-
-		$collection->addDirectory($this->file);
-	}
-
-	public function testAddDirectory()
-	{
-		$collection = new FileCollection();
-		$expected  = [
-			$this->directory . 'apple.php',
-			$this->directory . 'fig_3.php',
-			$this->directory . 'prune_ripe.php',
-		];
-
-		$collection->addDirectory($this->directory);
-
-		$this->assertSame($expected, $collection->get());
-	}
-
-	public function testAddDirectoryRecursive()
-	{
-		$collection = new FileCollection();
-		$expected  = [
-			$this->directory . 'apple.php',
-			$this->directory . 'fig_3.php',
-			$this->directory . 'prune_ripe.php',
-			SUPPORTPATH . 'Files/baker/banana.php',
-		];
+        $expected = [
+            $this->directory . 'apple.php',
+            $this->directory . 'fig_3.php',
+            $this->directory . 'prune_ripe.php',
+        ];
 
-		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+        $files->add(SUPPORTPATH . 'Files/able');
 
-		$this->assertSame($expected, $collection->get());
-	}
+        $this->assertSame($expected, $files->get());
+    }
 
-	public function testAddDirectories()
-	{
-		$collection = new FileCollection();
-		$expected  = [
-			$this->directory . 'apple.php',
-			$this->directory . 'fig_3.php',
-			$this->directory . 'prune_ripe.php',
-			SUPPORTPATH . 'Files/baker/banana.php',
-		];
+    public function testAddStringDirectoryRecursive()
+    {
+        $files = new FileCollection();
 
-		$collection->addDirectories([
-			$this->directory,
-			SUPPORTPATH . 'Files/baker',
-		]);
+        $expected = [
+            $this->directory . 'apple.php',
+            $this->directory . 'fig_3.php',
+            $this->directory . 'prune_ripe.php',
+            SUPPORTPATH . 'Files/baker/banana.php',
+        ];
+
+        $files->add(SUPPORTPATH . 'Files');
+
+        $this->assertSame($expected, $files->get());
+    }
+
+    public function testAddArray()
+    {
+        $files = new FileCollection();
+
+        $expected = [
+            $this->directory . 'apple.php',
+            $this->directory . 'fig_3.php',
+            $this->directory . 'prune_ripe.php',
+            SUPPORTPATH . 'Files/baker/banana.php',
+        ];
+
+        $files->add([
+            SUPPORTPATH . 'Files/able',
+            SUPPORTPATH . 'Files/baker/banana.php',
+        ]);
+
+        $this->assertSame($expected, $files->get());
+    }
+
+    public function testAddArrayRecursive()
+    {
+        $files = new FileCollection();
+
+        $expected = [
+            $this->directory . 'apple.php',
+            $this->directory . 'fig_3.php',
+            $this->directory . 'prune_ripe.php',
+            SUPPORTPATH . 'Files/baker/banana.php',
+            SUPPORTPATH . 'Log/Handlers/TestHandler.php',
+        ];
+
+        $files->add([
+            SUPPORTPATH . 'Files',
+            SUPPORTPATH . 'Log',
+        ], true);
+
+        $this->assertSame($expected, $files->get());
+    }
+
+    public function testAddFile()
+    {
+        $collection = new FileCollection();
+        $this->assertSame([], $this->getPrivateProperty($collection, 'files'));
+
+        $collection->addFile($this->file);
+        $this->assertSame([$this->file], $this->getPrivateProperty($collection, 'files'));
+    }
 
-		$this->assertSame($expected, $collection->get());
-	}
+    public function testAddFileMissing()
+    {
+        $collection = new FileCollection();
+
+        $this->expectException(FileException::class);
+        $this->expectExceptionMessage(lang('Files.expectedFile', ['addFile']));
+
+        $collection->addFile('TheHillsAreAlive.bmp');
+    }
+
+    public function testAddFileDirectory()
+    {
+        $collection = new FileCollection();
+
+        $this->expectException(FileException::class);
+        $this->expectExceptionMessage(lang('Files.expectedFile', ['addFile']));
+
+        $collection->addFile($this->directory);
+    }
+
+    public function testAddFiles()
+    {
+        $collection = new FileCollection();
+        $files      = [
+            $this->file,
+            $this->file,
+        ];
+
+        $collection->addFiles($files);
+        $this->assertSame($files, $this->getPrivateProperty($collection, 'files'));
+    }
+
+    public function testGet()
+    {
+        $collection = new FileCollection();
+        $collection->addFile($this->file);
+
+        $this->assertSame([$this->file], $collection->get());
+    }
+
+    public function testGetSorts()
+    {
+        $collection = new FileCollection();
+        $files      = [
+            $this->file,
+            $this->directory . 'apple.php',
+        ];
+
+        $collection->addFiles($files);
+
+        $this->assertSame(array_reverse($files), $collection->get());
+    }
+
+    public function testGetUniques()
+    {
+        $collection = new FileCollection();
+        $files      = [
+            $this->file,
+            $this->file,
+        ];
+
+        $collection->addFiles($files);
+        $this->assertSame([$this->file], $collection->get());
+    }
+
+    public function testSet()
+    {
+        $collection = new FileCollection();
+
+        $collection->set([$this->file]);
+        $this->assertSame([$this->file], $collection->get());
+    }
+
+    public function testSetInvalid()
+    {
+        $collection = new FileCollection();
+
+        $this->expectException(FileException::class);
+        $this->expectExceptionMessage(lang('Files.expectedFile', ['addFile']));
+
+        $collection->set(['flerb']);
+    }
+
+    public function testRemoveFile()
+    {
+        $collection = new FileCollection();
+        $files      = [
+            $this->file,
+            $this->directory . 'apple.php',
+        ];
+
+        $collection->addFiles($files);
+
+        $collection->removeFile($this->file);
+
+        $this->assertSame([$this->directory . 'apple.php'], $collection->get());
+    }
+
+    public function testRemoveFiles()
+    {
+        $collection = new FileCollection();
+        $files      = [
+            $this->file,
+            $this->directory . 'apple.php',
+        ];
+
+        $collection->addFiles($files);
+
+        $collection->removeFiles($files);
+
+        $this->assertSame([], $collection->get());
+    }
+
+    public function testAddDirectoryInvalid()
+    {
+        $collection = new FileCollection();
+
+        $this->expectException(FileException::class);
+        $this->expectExceptionMessage(lang('Files.expectedDirectory', ['addDirectory']));
+
+        $collection->addDirectory($this->file);
+    }
+
+    public function testAddDirectory()
+    {
+        $collection = new FileCollection();
+        $expected   = [
+            $this->directory . 'apple.php',
+            $this->directory . 'fig_3.php',
+            $this->directory . 'prune_ripe.php',
+        ];
+
+        $collection->addDirectory($this->directory);
+
+        $this->assertSame($expected, $collection->get());
+    }
+
+    public function testAddDirectoryRecursive()
+    {
+        $collection = new FileCollection();
+        $expected   = [
+            $this->directory . 'apple.php',
+            $this->directory . 'fig_3.php',
+            $this->directory . 'prune_ripe.php',
+            SUPPORTPATH . 'Files/baker/banana.php',
+        ];
+
+        $collection->addDirectory(SUPPORTPATH . 'Files', true);
+
+        $this->assertSame($expected, $collection->get());
+    }
+
+    public function testAddDirectories()
+    {
+        $collection = new FileCollection();
+        $expected   = [
+            $this->directory . 'apple.php',
+            $this->directory . 'fig_3.php',
+            $this->directory . 'prune_ripe.php',
+            SUPPORTPATH . 'Files/baker/banana.php',
+        ];
 
-	public function testAddDirectoriesRecursive()
-	{
-		$collection = new FileCollection();
-		$expected  = [
-			$this->directory . 'apple.php',
-			$this->directory . 'fig_3.php',
-			$this->directory . 'prune_ripe.php',
-			SUPPORTPATH . 'Files/baker/banana.php',
-			SUPPORTPATH . 'Log/Handlers/TestHandler.php',
-		];
+        $collection->addDirectories([
+            $this->directory,
+            SUPPORTPATH . 'Files/baker',
+        ]);
 
-		$collection->addDirectories([
-			SUPPORTPATH . 'Files',
-			SUPPORTPATH . 'Log',
-		], true);
+        $this->assertSame($expected, $collection->get());
+    }
 
-		$this->assertSame($expected, $collection->get());
-	}
+    public function testAddDirectoriesRecursive()
+    {
+        $collection = new FileCollection();
+        $expected   = [
+            $this->directory . 'apple.php',
+            $this->directory . 'fig_3.php',
+            $this->directory . 'prune_ripe.php',
+            SUPPORTPATH . 'Files/baker/banana.php',
+            SUPPORTPATH . 'Log/Handlers/TestHandler.php',
+        ];
 
-	//--------------------------------------------------------------------
+        $collection->addDirectories([
+            SUPPORTPATH . 'Files',
+            SUPPORTPATH . 'Log',
+        ], true);
 
-	public function testRemovePatternEmpty()
-	{
-		$collection = new FileCollection();
-		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+        $this->assertSame($expected, $collection->get());
+    }
 
-		$files = $collection->get();
+    public function testRemovePatternEmpty()
+    {
+        $collection = new FileCollection();
+        $collection->addDirectory(SUPPORTPATH . 'Files', true);
 
-		$collection->removePattern('');
+        $files = $collection->get();
 
-		$this->assertSame($files, $collection->get());
-	}
+        $collection->removePattern('');
 
-	public function testRemovePatternRegex()
-	{
-		$collection = new FileCollection();
-		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+        $this->assertSame($files, $collection->get());
+    }
 
-		$expected = [
-			$this->directory . 'apple.php',
-			SUPPORTPATH . 'Files/baker/banana.php',
-		];
+    public function testRemovePatternRegex()
+    {
+        $collection = new FileCollection();
+        $collection->addDirectory(SUPPORTPATH . 'Files', true);
 
-		$collection->removePattern('#[a-z]+_.*#');
+        $expected = [
+            $this->directory . 'apple.php',
+            SUPPORTPATH . 'Files/baker/banana.php',
+        ];
 
-		$this->assertSame($expected, $collection->get());
-	}
+        $collection->removePattern('#[a-z]+_.*#');
 
-	public function testRemovePatternPseudo()
-	{
-		$collection = new FileCollection();
-		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+        $this->assertSame($expected, $collection->get());
+    }
 
-		$expected = [
-			$this->directory . 'apple.php',
-			SUPPORTPATH . 'Files/baker/banana.php',
-		];
+    public function testRemovePatternPseudo()
+    {
+        $collection = new FileCollection();
+        $collection->addDirectory(SUPPORTPATH . 'Files', true);
 
-		$collection->removePattern('*_*.php');
+        $expected = [
+            $this->directory . 'apple.php',
+            SUPPORTPATH . 'Files/baker/banana.php',
+        ];
 
-		$this->assertSame($expected, $collection->get());
-	}
+        $collection->removePattern('*_*.php');
 
-	public function testRemovePatternScope()
-	{
-		$collection = new FileCollection();
-		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+        $this->assertSame($expected, $collection->get());
+    }
 
-		$expected = [
-			SUPPORTPATH . 'Files/baker/banana.php',
-		];
+    public function testRemovePatternScope()
+    {
+        $collection = new FileCollection();
+        $collection->addDirectory(SUPPORTPATH . 'Files', true);
 
-		$collection->removePattern('*.php', $this->directory);
+        $expected = [
+            SUPPORTPATH . 'Files/baker/banana.php',
+        ];
 
-		$this->assertSame($expected, $collection->get());
-	}
+        $collection->removePattern('*.php', $this->directory);
 
-	//--------------------------------------------------------------------
+        $this->assertSame($expected, $collection->get());
+    }
 
-	public function testRetainPatternEmpty()
-	{
-		$collection = new FileCollection();
-		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+    public function testRetainPatternEmpty()
+    {
+        $collection = new FileCollection();
+        $collection->addDirectory(SUPPORTPATH . 'Files', true);
 
-		$files = $collection->get();
+        $files = $collection->get();
 
-		$collection->retainPattern('');
+        $collection->retainPattern('');
 
-		$this->assertSame($files, $collection->get());
-	}
+        $this->assertSame($files, $collection->get());
+    }
 
-	public function testRetainPatternRegex()
-	{
-		$collection = new FileCollection();
-		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+    public function testRetainPatternRegex()
+    {
+        $collection = new FileCollection();
+        $collection->addDirectory(SUPPORTPATH . 'Files', true);
 
-		$expected = [
-			$this->directory . 'fig_3.php',
-			$this->directory . 'prune_ripe.php',
-		];
+        $expected = [
+            $this->directory . 'fig_3.php',
+            $this->directory . 'prune_ripe.php',
+        ];
 
-		$collection->retainPattern('#[a-z]+_.*#');
+        $collection->retainPattern('#[a-z]+_.*#');
 
-		$this->assertSame($expected, $collection->get());
-	}
+        $this->assertSame($expected, $collection->get());
+    }
 
-	public function testRetainPatternPseudo()
-	{
-		$collection = new FileCollection();
-		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+    public function testRetainPatternPseudo()
+    {
+        $collection = new FileCollection();
+        $collection->addDirectory(SUPPORTPATH . 'Files', true);
 
-		$expected = [
-			$this->directory . 'fig_3.php',
-		];
+        $expected = [
+            $this->directory . 'fig_3.php',
+        ];
 
-		$collection->retainPattern('*_?.php');
+        $collection->retainPattern('*_?.php');
 
-		$this->assertSame($expected, $collection->get());
-	}
+        $this->assertSame($expected, $collection->get());
+    }
 
-	public function testRetainPatternScope()
-	{
-		$collection = new FileCollection();
-		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+    public function testRetainPatternScope()
+    {
+        $collection = new FileCollection();
+        $collection->addDirectory(SUPPORTPATH . 'Files', true);
 
-		$expected = [
-			$this->directory . 'fig_3.php',
-			SUPPORTPATH . 'Files/baker/banana.php',
-		];
+        $expected = [
+            $this->directory . 'fig_3.php',
+            SUPPORTPATH . 'Files/baker/banana.php',
+        ];
 
-		$collection->retainPattern('*_?.php', $this->directory);
+        $collection->retainPattern('*_?.php', $this->directory);
 
-		$this->assertSame($expected, $collection->get());
-	}
+        $this->assertSame($expected, $collection->get());
+    }
 
-	//--------------------------------------------------------------------
+    public function testCount()
+    {
+        $collection = new FileCollection();
+        $collection->addDirectory(SUPPORTPATH . 'Files', true);
 
-	public function testCount()
-	{
-		$collection = new FileCollection();
-		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+        $this->assertCount(4, $collection);
+    }
 
-		$this->assertCount(4, $collection);
-	}
+    public function testIterable()
+    {
+        $collection = new FileCollection();
+        $collection->addDirectory(SUPPORTPATH . 'Files', true);
 
-	public function testIterable()
-	{
-		$collection = new FileCollection();
-		$collection->addDirectory(SUPPORTPATH . 'Files', true);
+        $count = 0;
 
-		$count = 0;
-		foreach ($collection as $file)
-		{
-			$this->assertInstanceOf(File::class, $file);
-			$count++;
-		}
+        foreach ($collection as $file) {
+            $this->assertInstanceOf(File::class, $file);
+            $count++;
+        }
 
-		$this->assertSame($count, 4);
-	}	
+        $this->assertSame($count, 4);
+    }
 }
diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php
index ace99172aac4..fcf4beea6257 100644
--- a/tests/system/Language/LanguageTest.php
+++ b/tests/system/Language/LanguageTest.php
@@ -279,17 +279,15 @@ public function testLangKeepLocale()
         $this->lang = Services::language('en', true);
 
         lang('Language.languageGetLineInvalidArgumentException');
-        $this->assertEquals('en', $this->lang->getLocale());
+        $this->assertSame('en', $this->lang->getLocale());
 
         lang('Language.languageGetLineInvalidArgumentException', [], 'ru');
-        $this->assertEquals('en', $this->lang->getLocale());
+        $this->assertSame('en', $this->lang->getLocale());
 
         lang('Language.languageGetLineInvalidArgumentException');
-        $this->assertEquals('en', $this->lang->getLocale());
+        $this->assertSame('en', $this->lang->getLocale());
     }
 
-    //--------------------------------------------------------------------
-
     /**
      * Testing base locale vs variants, with fallback to English.
      *
diff --git a/tests/system/Publisher/PublisherInputTest.php b/tests/system/Publisher/PublisherInputTest.php
index 29d48ef78816..a6f6b8eec582 100644
--- a/tests/system/Publisher/PublisherInputTest.php
+++ b/tests/system/Publisher/PublisherInputTest.php
@@ -1,150 +1,156 @@
 <?php
 
-use CodeIgniter\Publisher\Exceptions\PublisherException;
+/**
+ * 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.
+ */
+
 use CodeIgniter\Publisher\Publisher;
 use CodeIgniter\Test\CIUnitTestCase;
-use Tests\Support\Publishers\TestPublisher;
 
-class PublisherInputTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class PublisherInputTest extends CIUnitTestCase
 {
-	/**
-	 * A known, valid file
-	 *
-	 * @var string
-	 */
-	private $file = SUPPORTPATH . 'Files/baker/banana.php';
-
-	/**
-	 * A known, valid directory
-	 *
-	 * @var string
-	 */
-	private $directory = SUPPORTPATH . 'Files/able/';
-
-	/**
-	 * Initialize the helper, since some
-	 * tests call static methods before
-	 * the constructor would load it.
-	 */
-	public static function setUpBeforeClass(): void
-	{
-		parent::setUpBeforeClass();
-
-		helper(['filesystem']);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testAddPathFile()
-	{
-		$publisher = new Publisher(SUPPORTPATH . 'Files');
-
-		$publisher->addPath('baker/banana.php');
-
-		$this->assertSame([$this->file], $publisher->get());
-	}
-
-	public function testAddPathFileRecursiveDoesNothing()
-	{
-		$publisher = new Publisher(SUPPORTPATH . 'Files');
-
-		$publisher->addPath('baker/banana.php', true);
-
-		$this->assertSame([$this->file], $publisher->get());
-	}
-
-	public function testAddPathDirectory()
-	{
-		$publisher = new Publisher(SUPPORTPATH . 'Files');
-
-		$expected = [
-			$this->directory . 'apple.php',
-			$this->directory . 'fig_3.php',
-			$this->directory . 'prune_ripe.php',
-		];
-
-		$publisher->addPath('able');
-
-		$this->assertSame($expected, $publisher->get());
-	}
-
-	public function testAddPathDirectoryRecursive()
-	{
-		$publisher = new Publisher(SUPPORTPATH);
-
-		$expected = [
-			$this->directory . 'apple.php',
-			$this->directory . 'fig_3.php',
-			$this->directory . 'prune_ripe.php',
-			SUPPORTPATH . 'Files/baker/banana.php',
-		];
-
-		$publisher->addPath('Files');
-
-		$this->assertSame($expected, $publisher->get());
-	}
-
-	public function testAddPaths()
-	{
-		$publisher = new Publisher(SUPPORTPATH . 'Files');
-
-		$expected = [
-			$this->directory . 'apple.php',
-			$this->directory . 'fig_3.php',
-			$this->directory . 'prune_ripe.php',
-			SUPPORTPATH . 'Files/baker/banana.php',
-		];
-
-		$publisher->addPaths([
-			'able',
-			'baker/banana.php',
-		]);
-
-		$this->assertSame($expected, $publisher->get());
-	}
-
-	public function testAddPathsRecursive()
-	{
-		$publisher = new Publisher(SUPPORTPATH);
-
-		$expected = [
-			$this->directory . 'apple.php',
-			$this->directory . 'fig_3.php',
-			$this->directory . 'prune_ripe.php',
-			SUPPORTPATH . 'Files/baker/banana.php',
-			SUPPORTPATH . 'Log/Handlers/TestHandler.php',
-		];
-
-		$publisher->addPaths([
-			'Files',
-			'Log',
-		], true);
-
-		$this->assertSame($expected, $publisher->get());
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * A known, valid file
+     *
+     * @var string
+     */
+    private $file = SUPPORTPATH . 'Files/baker/banana.php';
+
+    /**
+     * A known, valid directory
+     *
+     * @var string
+     */
+    private $directory = SUPPORTPATH . 'Files/able/';
+
+    /**
+     * Initialize the helper, since some
+     * tests call static methods before
+     * the constructor would load it.
+     */
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+
+        helper(['filesystem']);
+    }
+
+    public function testAddPathFile()
+    {
+        $publisher = new Publisher(SUPPORTPATH . 'Files');
+
+        $publisher->addPath('baker/banana.php');
+
+        $this->assertSame([$this->file], $publisher->get());
+    }
+
+    public function testAddPathFileRecursiveDoesNothing()
+    {
+        $publisher = new Publisher(SUPPORTPATH . 'Files');
+
+        $publisher->addPath('baker/banana.php', true);
+
+        $this->assertSame([$this->file], $publisher->get());
+    }
+
+    public function testAddPathDirectory()
+    {
+        $publisher = new Publisher(SUPPORTPATH . 'Files');
+
+        $expected = [
+            $this->directory . 'apple.php',
+            $this->directory . 'fig_3.php',
+            $this->directory . 'prune_ripe.php',
+        ];
+
+        $publisher->addPath('able');
+
+        $this->assertSame($expected, $publisher->get());
+    }
+
+    public function testAddPathDirectoryRecursive()
+    {
+        $publisher = new Publisher(SUPPORTPATH);
+
+        $expected = [
+            $this->directory . 'apple.php',
+            $this->directory . 'fig_3.php',
+            $this->directory . 'prune_ripe.php',
+            SUPPORTPATH . 'Files/baker/banana.php',
+        ];
+
+        $publisher->addPath('Files');
+
+        $this->assertSame($expected, $publisher->get());
+    }
+
+    public function testAddPaths()
+    {
+        $publisher = new Publisher(SUPPORTPATH . 'Files');
+
+        $expected = [
+            $this->directory . 'apple.php',
+            $this->directory . 'fig_3.php',
+            $this->directory . 'prune_ripe.php',
+            SUPPORTPATH . 'Files/baker/banana.php',
+        ];
+
+        $publisher->addPaths([
+            'able',
+            'baker/banana.php',
+        ]);
+
+        $this->assertSame($expected, $publisher->get());
+    }
+
+    public function testAddPathsRecursive()
+    {
+        $publisher = new Publisher(SUPPORTPATH);
+
+        $expected = [
+            $this->directory . 'apple.php',
+            $this->directory . 'fig_3.php',
+            $this->directory . 'prune_ripe.php',
+            SUPPORTPATH . 'Files/baker/banana.php',
+            SUPPORTPATH . 'Log/Handlers/TestHandler.php',
+        ];
+
+        $publisher->addPaths([
+            'Files',
+            'Log',
+        ], true);
+
+        $this->assertSame($expected, $publisher->get());
+    }
 
-	public function testAddUri()
-	{
-		$publisher = new Publisher();
-		$publisher->addUri('https://raw.githubusercontent.com/codeigniter4/CodeIgniter4/develop/composer.json');
+    public function testAddUri()
+    {
+        $publisher = new Publisher();
+        $publisher->addUri('https://raw.githubusercontent.com/codeigniter4/CodeIgniter4/develop/composer.json');
 
-		$scratch = $this->getPrivateProperty($publisher, 'scratch');
+        $scratch = $this->getPrivateProperty($publisher, 'scratch');
 
-		$this->assertSame([$scratch . 'composer.json'], $publisher->get());
-	}
+        $this->assertSame([$scratch . 'composer.json'], $publisher->get());
+    }
 
-	public function testAddUris()
-	{
-		$publisher = new Publisher();
-		$publisher->addUris([
-			'https://raw.githubusercontent.com/codeigniter4/CodeIgniter4/develop/LICENSE',
-			'https://raw.githubusercontent.com/codeigniter4/CodeIgniter4/develop/composer.json',
-		]);
+    public function testAddUris()
+    {
+        $publisher = new Publisher();
+        $publisher->addUris([
+            'https://raw.githubusercontent.com/codeigniter4/CodeIgniter4/develop/LICENSE',
+            'https://raw.githubusercontent.com/codeigniter4/CodeIgniter4/develop/composer.json',
+        ]);
 
-		$scratch = $this->getPrivateProperty($publisher, 'scratch');
+        $scratch = $this->getPrivateProperty($publisher, 'scratch');
 
-		$this->assertSame([$scratch . 'LICENSE', $scratch . 'composer.json'], $publisher->get());
-	}
+        $this->assertSame([$scratch . 'LICENSE', $scratch . 'composer.json'], $publisher->get());
+    }
 }
diff --git a/tests/system/Publisher/PublisherOutputTest.php b/tests/system/Publisher/PublisherOutputTest.php
index 489058a1c099..512e051f7663 100644
--- a/tests/system/Publisher/PublisherOutputTest.php
+++ b/tests/system/Publisher/PublisherOutputTest.php
@@ -1,227 +1,231 @@
 <?php
 
-use CodeIgniter\Publisher\Exceptions\PublisherException;
+/**
+ * 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.
+ */
+
 use CodeIgniter\Publisher\Publisher;
 use CodeIgniter\Test\CIUnitTestCase;
-use Tests\Support\Publishers\TestPublisher;
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamDirectory;
 
-class PublisherOutputTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class PublisherOutputTest extends CIUnitTestCase
 {
-	/**
-	 * Files to seed to VFS
-	 *
-	 * @var array
-	 */
-	private $structure;
-
-	/**
-	 * Virtual destination
-	 *
-	 * @var vfsStreamDirectory
-	 */
-	private $root;
-
-	/**
-	 * A known, valid file
-	 *
-	 * @var string
-	 */
-	private $file = SUPPORTPATH . 'Files/baker/banana.php';
-
-	/**
-	 * A known, valid directory
-	 *
-	 * @var string
-	 */
-	private $directory = SUPPORTPATH . 'Files/able/';
-
-	/**
-	 * Initialize the helper, since some
-	 * tests call static methods before
-	 * the constructor would load it.
-	 */
-	public static function setUpBeforeClass(): void
-	{
-		parent::setUpBeforeClass();
-
-		helper(['filesystem']);
-	}
-
-	protected function setUp(): void
-	{
-		parent::setUp();
-
-		$this->structure = [
-			'able'          => [
-				'apple.php' => 'Once upon a midnight dreary',
-				'bazam'     => 'While I pondered weak and weary',
-			],
-			'boo'           => [
-				'far' => 'Upon a tome of long-forgotten lore',
-				'faz' => 'There came a tapping up on the door',
-			],
-			'AnEmptyFolder' => [],
-			'simpleFile'    => 'A tap-tap-tapping upon my door',
-			'.hidden'       => 'There is no spoon',
-		];
-
-		$this->root = vfsStream::setup('root', null, $this->structure);
-
-		// Add root to the list of allowed destinations
-		config('Publisher')->restrictions[$this->root->url()] = '*';
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testCopy()
-	{
-		$publisher = new Publisher($this->directory, $this->root->url());
-		$publisher->addFile($this->file);
-
-		$this->assertFileDoesNotExist($this->root->url() . '/banana.php');
-
-		$result = $publisher->copy(false);
-
-		$this->assertTrue($result);
-		$this->assertFileExists($this->root->url() . '/banana.php');
-	}
-
-	public function testCopyReplace()
-	{
-		$file      = $this->directory . 'apple.php';
-		$publisher = new Publisher($this->directory, $this->root->url() . '/able');
-		$publisher->addFile($file);
-
-		$this->assertFileExists($this->root->url() . '/able/apple.php');
-		$this->assertFalse(same_file($file, $this->root->url() . '/able/apple.php'));
-
-		$result = $publisher->copy(true);
-
-		$this->assertTrue($result);
-		$this->assertTrue(same_file($file, $this->root->url() . '/able/apple.php'));
-	}
-
-	public function testCopyIgnoresSame()
-	{
-		$publisher = new Publisher($this->directory, $this->root->url());
-		$publisher->addFile($this->file);
-
-		copy($this->file, $this->root->url() . '/banana.php');
-
-		$result = $publisher->copy(false);
-		$this->assertTrue($result);
-
-		$result = $publisher->copy(true);
-		$this->assertTrue($result);
-		$this->assertSame([$this->root->url() . '/banana.php'], $publisher->getPublished());
-	}
-
-	public function testCopyIgnoresCollision()
-	{
-		$publisher = new Publisher($this->directory, $this->root->url());
-
-		mkdir($this->root->url() . '/banana.php');
-
-		$result = $publisher->addFile($this->file)->copy(false);
-
-		$this->assertTrue($result);
-		$this->assertSame([], $publisher->getErrors());
-		$this->assertSame([$this->root->url() . '/banana.php'], $publisher->getPublished());
-	}
-
-	public function testCopyCollides()
-	{
-		$publisher = new Publisher($this->directory, $this->root->url());
-		$expected  = lang('Publisher.collision', ['dir', $this->file, $this->root->url() . '/banana.php']);
-
-		mkdir($this->root->url() . '/banana.php');
-
-		$result = $publisher->addFile($this->file)->copy(true);
-		$errors = $publisher->getErrors();
-
-		$this->assertFalse($result);
-		$this->assertCount(1, $errors);
-		$this->assertSame([$this->file], array_keys($errors));
-		$this->assertSame([], $publisher->getPublished());
-		$this->assertSame($expected, $errors[$this->file]->getMessage());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testMerge()
-	{
-		$publisher = new Publisher(SUPPORTPATH . 'Files', $this->root->url());
-		$expected  = [
-			$this->root->url() . '/able/apple.php',
-			$this->root->url() . '/able/fig_3.php',
-			$this->root->url() . '/able/prune_ripe.php',
-			$this->root->url() . '/baker/banana.php',
-		];
-
-		$this->assertFileDoesNotExist($this->root->url() . '/able/fig_3.php');
-		$this->assertDirectoryDoesNotExist($this->root->url() . '/baker');
-
-		$result = $publisher->addPath('/')->merge(false);
-
-		$this->assertTrue($result);
-		$this->assertFileExists($this->root->url() . '/able/fig_3.php');
-		$this->assertDirectoryExists($this->root->url() . '/baker');
-		$this->assertSame($expected, $publisher->getPublished());
-	}
-
-	public function testMergeReplace()
-	{
-		$this->assertFalse(same_file($this->directory . 'apple.php', $this->root->url() . '/able/apple.php'));
-		$publisher = new Publisher(SUPPORTPATH . 'Files', $this->root->url());
-		$expected  = [
-			$this->root->url() . '/able/apple.php',
-			$this->root->url() . '/able/fig_3.php',
-			$this->root->url() . '/able/prune_ripe.php',
-			$this->root->url() . '/baker/banana.php',
-		];
-
-		$result = $publisher->addPath('/')->merge(true);
-
-		$this->assertTrue($result);
-		$this->assertTrue(same_file($this->directory . 'apple.php', $this->root->url() . '/able/apple.php'));
-		$this->assertSame($expected, $publisher->getPublished());
-	}
-
-	public function testMergeCollides()
-	{
-		$publisher = new Publisher(SUPPORTPATH . 'Files', $this->root->url());
-		$expected  = lang('Publisher.collision', ['dir', $this->directory . 'fig_3.php', $this->root->url() . '/able/fig_3.php']);
-		$published = [
-			$this->root->url() . '/able/apple.php',
-			$this->root->url() . '/able/prune_ripe.php',
-			$this->root->url() . '/baker/banana.php',
-		];
-
-		mkdir($this->root->url() . '/able/fig_3.php');
-
-		$result = $publisher->addPath('/')->merge(true);
-		$errors = $publisher->getErrors();
-
-		$this->assertFalse($result);
-		$this->assertCount(1, $errors);
-		$this->assertSame([$this->directory . 'fig_3.php'], array_keys($errors));
-		$this->assertSame($published, $publisher->getPublished());
-		$this->assertSame($expected, $errors[$this->directory . 'fig_3.php']->getMessage());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testPublish()
-	{
-		$publisher = new Publisher(SUPPORTPATH . 'Files', $this->root->url());
-
-		$result = $publisher->publish();
-
-		$this->assertTrue($result);
-		$this->assertFileExists($this->root->url() . '/able/fig_3.php');
-		$this->assertDirectoryExists($this->root->url() . '/baker');
-		$this->assertTrue(same_file($this->directory . 'apple.php', $this->root->url() . '/able/apple.php'));
-	}
+    /**
+     * Files to seed to VFS
+     *
+     * @var array
+     */
+    private $structure;
+
+    /**
+     * Virtual destination
+     *
+     * @var vfsStreamDirectory
+     */
+    private $root;
+
+    /**
+     * A known, valid file
+     *
+     * @var string
+     */
+    private $file = SUPPORTPATH . 'Files/baker/banana.php';
+
+    /**
+     * A known, valid directory
+     *
+     * @var string
+     */
+    private $directory = SUPPORTPATH . 'Files/able/';
+
+    /**
+     * Initialize the helper, since some
+     * tests call static methods before
+     * the constructor would load it.
+     */
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+
+        helper(['filesystem']);
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->structure = [
+            'able' => [
+                'apple.php' => 'Once upon a midnight dreary',
+                'bazam'     => 'While I pondered weak and weary',
+            ],
+            'boo' => [
+                'far' => 'Upon a tome of long-forgotten lore',
+                'faz' => 'There came a tapping up on the door',
+            ],
+            'AnEmptyFolder' => [],
+            'simpleFile'    => 'A tap-tap-tapping upon my door',
+            '.hidden'       => 'There is no spoon',
+        ];
+
+        $this->root = vfsStream::setup('root', null, $this->structure);
+
+        // Add root to the list of allowed destinations
+        config('Publisher')->restrictions[$this->root->url()] = '*';
+    }
+
+    public function testCopy()
+    {
+        $publisher = new Publisher($this->directory, $this->root->url());
+        $publisher->addFile($this->file);
+
+        $this->assertFileDoesNotExist($this->root->url() . '/banana.php');
+
+        $result = $publisher->copy(false);
+
+        $this->assertTrue($result);
+        $this->assertFileExists($this->root->url() . '/banana.php');
+    }
+
+    public function testCopyReplace()
+    {
+        $file      = $this->directory . 'apple.php';
+        $publisher = new Publisher($this->directory, $this->root->url() . '/able');
+        $publisher->addFile($file);
+
+        $this->assertFileExists($this->root->url() . '/able/apple.php');
+        $this->assertFalse(same_file($file, $this->root->url() . '/able/apple.php'));
+
+        $result = $publisher->copy(true);
+
+        $this->assertTrue($result);
+        $this->assertTrue(same_file($file, $this->root->url() . '/able/apple.php'));
+    }
+
+    public function testCopyIgnoresSame()
+    {
+        $publisher = new Publisher($this->directory, $this->root->url());
+        $publisher->addFile($this->file);
+
+        copy($this->file, $this->root->url() . '/banana.php');
+
+        $result = $publisher->copy(false);
+        $this->assertTrue($result);
+
+        $result = $publisher->copy(true);
+        $this->assertTrue($result);
+        $this->assertSame([$this->root->url() . '/banana.php'], $publisher->getPublished());
+    }
+
+    public function testCopyIgnoresCollision()
+    {
+        $publisher = new Publisher($this->directory, $this->root->url());
+
+        mkdir($this->root->url() . '/banana.php');
+
+        $result = $publisher->addFile($this->file)->copy(false);
+
+        $this->assertTrue($result);
+        $this->assertSame([], $publisher->getErrors());
+        $this->assertSame([$this->root->url() . '/banana.php'], $publisher->getPublished());
+    }
+
+    public function testCopyCollides()
+    {
+        $publisher = new Publisher($this->directory, $this->root->url());
+        $expected  = lang('Publisher.collision', ['dir', $this->file, $this->root->url() . '/banana.php']);
+
+        mkdir($this->root->url() . '/banana.php');
+
+        $result = $publisher->addFile($this->file)->copy(true);
+        $errors = $publisher->getErrors();
+
+        $this->assertFalse($result);
+        $this->assertCount(1, $errors);
+        $this->assertSame([$this->file], array_keys($errors));
+        $this->assertSame([], $publisher->getPublished());
+        $this->assertSame($expected, $errors[$this->file]->getMessage());
+    }
+
+    public function testMerge()
+    {
+        $publisher = new Publisher(SUPPORTPATH . 'Files', $this->root->url());
+        $expected  = [
+            $this->root->url() . '/able/apple.php',
+            $this->root->url() . '/able/fig_3.php',
+            $this->root->url() . '/able/prune_ripe.php',
+            $this->root->url() . '/baker/banana.php',
+        ];
+
+        $this->assertFileDoesNotExist($this->root->url() . '/able/fig_3.php');
+        $this->assertDirectoryDoesNotExist($this->root->url() . '/baker');
+
+        $result = $publisher->addPath('/')->merge(false);
+
+        $this->assertTrue($result);
+        $this->assertFileExists($this->root->url() . '/able/fig_3.php');
+        $this->assertDirectoryExists($this->root->url() . '/baker');
+        $this->assertSame($expected, $publisher->getPublished());
+    }
+
+    public function testMergeReplace()
+    {
+        $this->assertFalse(same_file($this->directory . 'apple.php', $this->root->url() . '/able/apple.php'));
+        $publisher = new Publisher(SUPPORTPATH . 'Files', $this->root->url());
+        $expected  = [
+            $this->root->url() . '/able/apple.php',
+            $this->root->url() . '/able/fig_3.php',
+            $this->root->url() . '/able/prune_ripe.php',
+            $this->root->url() . '/baker/banana.php',
+        ];
+
+        $result = $publisher->addPath('/')->merge(true);
+
+        $this->assertTrue($result);
+        $this->assertTrue(same_file($this->directory . 'apple.php', $this->root->url() . '/able/apple.php'));
+        $this->assertSame($expected, $publisher->getPublished());
+    }
+
+    public function testMergeCollides()
+    {
+        $publisher = new Publisher(SUPPORTPATH . 'Files', $this->root->url());
+        $expected  = lang('Publisher.collision', ['dir', $this->directory . 'fig_3.php', $this->root->url() . '/able/fig_3.php']);
+        $published = [
+            $this->root->url() . '/able/apple.php',
+            $this->root->url() . '/able/prune_ripe.php',
+            $this->root->url() . '/baker/banana.php',
+        ];
+
+        mkdir($this->root->url() . '/able/fig_3.php');
+
+        $result = $publisher->addPath('/')->merge(true);
+        $errors = $publisher->getErrors();
+
+        $this->assertFalse($result);
+        $this->assertCount(1, $errors);
+        $this->assertSame([$this->directory . 'fig_3.php'], array_keys($errors));
+        $this->assertSame($published, $publisher->getPublished());
+        $this->assertSame($expected, $errors[$this->directory . 'fig_3.php']->getMessage());
+    }
+
+    public function testPublish()
+    {
+        $publisher = new Publisher(SUPPORTPATH . 'Files', $this->root->url());
+
+        $result = $publisher->publish();
+
+        $this->assertTrue($result);
+        $this->assertFileExists($this->root->url() . '/able/fig_3.php');
+        $this->assertDirectoryExists($this->root->url() . '/baker');
+        $this->assertTrue(same_file($this->directory . 'apple.php', $this->root->url() . '/able/apple.php'));
+    }
 }
diff --git a/tests/system/Publisher/PublisherRestrictionsTest.php b/tests/system/Publisher/PublisherRestrictionsTest.php
index 27db2e9429a9..692e49d7680b 100644
--- a/tests/system/Publisher/PublisherRestrictionsTest.php
+++ b/tests/system/Publisher/PublisherRestrictionsTest.php
@@ -1,5 +1,14 @@
 <?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.
+ */
+
 use CodeIgniter\Publisher\Exceptions\PublisherException;
 use CodeIgniter\Publisher\Publisher;
 use CodeIgniter\Test\CIUnitTestCase;
@@ -9,100 +18,103 @@
  *
  * Tests that the restrictions defined in the configuration
  * file properly prevent disallowed actions.
+ *
+ * @internal
  */
-class PublisherRestrictionsTest extends CIUnitTestCase
+final class PublisherRestrictionsTest extends CIUnitTestCase
 {
-	/**
-	 * @see Tests\Support\Config\Registrars::Publisher()
-	 */
-	public function testRegistrarsNotAllowed()
-	{
-		$this->assertArrayNotHasKey(SUPPORTPATH, config('Publisher')->restrictions);
-	}
-
-	public function testImmutableRestrictions()
-	{
-		$publisher = new Publisher();
-
-		// Try to "hack" the Publisher by adding our desired destination to the config
-		config('Publisher')->restrictions[SUPPORTPATH] = '*';
-
-		$restrictions = $this->getPrivateProperty($publisher, 'restrictions');
-
-		$this->assertArrayNotHasKey(SUPPORTPATH, $restrictions);
-	}
-
-	/**
-	 * @dataProvider fileProvider
-	 */
-	public function testDefaultPublicRestrictions(string $path)
-	{
-		$publisher = new Publisher(ROOTPATH, FCPATH);
-		$pattern   = config('Publisher')->restrictions[FCPATH];
-
-		// Use the scratch space to create a file
-		$file = $publisher->getScratch() . $path;
-		file_put_contents($file, 'To infinity and beyond!');
-
-		$result = $publisher->addFile($file)->merge();
-		$this->assertFalse($result);
-
-		$errors = $publisher->getErrors();
-		$this->assertCount(1, $errors);
-		$this->assertSame([$file], array_keys($errors));
-
-		$expected = lang('Publisher.fileNotAllowed', [$file, FCPATH, $pattern]);
-		$this->assertSame($expected, $errors[$file]->getMessage());
-	}
-
-	public function fileProvider()
-	{
-		yield 'php'  => ['index.php'];
-		yield 'exe'  => ['cat.exe'];
-		yield 'flat' => ['banana'];
-	}
-
-	/**
-	 * @dataProvider destinationProvider
-	 */
-	public function testDestinations(string $destination, bool $allowed)
-	{
-		config('Publisher')->restrictions = [
-			APPPATH                   => '',
-			FCPATH                    => '',
-			SUPPORTPATH . 'Files'     => '',
-			SUPPORTPATH . 'Files/../' => '',
-		];
-
-		if (! $allowed)
-		{
-			$this->expectException(PublisherException::class);
-			$this->expectExceptionMessage(lang('Publisher.destinationNotAllowed', [$destination]));
-		}
-
-		$publisher = new Publisher(null, $destination);
-		$this->assertInstanceOf(Publisher::class, $publisher);
-	}
-
-	public function destinationProvider()
-	{
-		return [
-			'explicit' => [
-				APPPATH,
-				true,
-			],
-			'subdirectory' => [
-				APPPATH . 'Config',
-				true,
-			],
-			'relative' => [
-				SUPPORTPATH . 'Files/able/../',
-				true,
-			],
-			'parent' => [
-				SUPPORTPATH,
-				false,
-			],
-		];
-	}
+    /**
+     * @see Tests\Support\Config\Registrars::Publisher()
+     */
+    public function testRegistrarsNotAllowed()
+    {
+        $this->assertArrayNotHasKey(SUPPORTPATH, config('Publisher')->restrictions);
+    }
+
+    public function testImmutableRestrictions()
+    {
+        $publisher = new Publisher();
+
+        // Try to "hack" the Publisher by adding our desired destination to the config
+        config('Publisher')->restrictions[SUPPORTPATH] = '*';
+
+        $restrictions = $this->getPrivateProperty($publisher, 'restrictions');
+
+        $this->assertArrayNotHasKey(SUPPORTPATH, $restrictions);
+    }
+
+    /**
+     * @dataProvider fileProvider
+     */
+    public function testDefaultPublicRestrictions(string $path)
+    {
+        $publisher = new Publisher(ROOTPATH, FCPATH);
+        $pattern   = config('Publisher')->restrictions[FCPATH];
+
+        // Use the scratch space to create a file
+        $file = $publisher->getScratch() . $path;
+        file_put_contents($file, 'To infinity and beyond!');
+
+        $result = $publisher->addFile($file)->merge();
+        $this->assertFalse($result);
+
+        $errors = $publisher->getErrors();
+        $this->assertCount(1, $errors);
+        $this->assertSame([$file], array_keys($errors));
+
+        $expected = lang('Publisher.fileNotAllowed', [$file, FCPATH, $pattern]);
+        $this->assertSame($expected, $errors[$file]->getMessage());
+    }
+
+    public function fileProvider()
+    {
+        yield 'php' => ['index.php'];
+
+        yield 'exe' => ['cat.exe'];
+
+        yield 'flat' => ['banana'];
+    }
+
+    /**
+     * @dataProvider destinationProvider
+     */
+    public function testDestinations(string $destination, bool $allowed)
+    {
+        config('Publisher')->restrictions = [
+            APPPATH                   => '',
+            FCPATH                    => '',
+            SUPPORTPATH . 'Files'     => '',
+            SUPPORTPATH . 'Files/../' => '',
+        ];
+
+        if (! $allowed) {
+            $this->expectException(PublisherException::class);
+            $this->expectExceptionMessage(lang('Publisher.destinationNotAllowed', [$destination]));
+        }
+
+        $publisher = new Publisher(null, $destination);
+        $this->assertInstanceOf(Publisher::class, $publisher);
+    }
+
+    public function destinationProvider()
+    {
+        return [
+            'explicit' => [
+                APPPATH,
+                true,
+            ],
+            'subdirectory' => [
+                APPPATH . 'Config',
+                true,
+            ],
+            'relative' => [
+                SUPPORTPATH . 'Files/able/../',
+                true,
+            ],
+            'parent' => [
+                SUPPORTPATH,
+                false,
+            ],
+        ];
+    }
 }
diff --git a/tests/system/Publisher/PublisherSupportTest.php b/tests/system/Publisher/PublisherSupportTest.php
index 081b831f1241..43be04406891 100644
--- a/tests/system/Publisher/PublisherSupportTest.php
+++ b/tests/system/Publisher/PublisherSupportTest.php
@@ -1,149 +1,155 @@
 <?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.
+ */
+
 use CodeIgniter\Publisher\Exceptions\PublisherException;
 use CodeIgniter\Publisher\Publisher;
 use CodeIgniter\Test\CIUnitTestCase;
 use Tests\Support\Publishers\TestPublisher;
 
-class PublisherSupportTest extends CIUnitTestCase
+/**
+ * @internal
+ */
+final class PublisherSupportTest extends CIUnitTestCase
 {
-	/**
-	 * A known, valid file
-	 *
-	 * @var string
-	 */
-	private $file = SUPPORTPATH . 'Files/baker/banana.php';
-
-	/**
-	 * A known, valid directory
-	 *
-	 * @var string
-	 */
-	private $directory = SUPPORTPATH . 'Files/able/';
-
-	/**
-	 * Initialize the helper, since some
-	 * tests call static methods before
-	 * the constructor would load it.
-	 */
-	public static function setUpBeforeClass(): void
-	{
-		parent::setUpBeforeClass();
-
-		helper(['filesystem']);
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testDiscoverDefault()
-	{
-		$result = Publisher::discover();
-
-		$this->assertCount(1, $result);
-		$this->assertInstanceOf(TestPublisher::class, $result[0]);
-	}
-
-	public function testDiscoverNothing()
-	{
-		$result = Publisher::discover('Nothing');
-
-		$this->assertSame([], $result);
-	}
-
-	public function testDiscoverStores()
-	{
-		$publisher = Publisher::discover()[0];
-		$publisher->set([])->addFile($this->file);
-
-		$result = Publisher::discover();
-		$this->assertSame($publisher, $result[0]);
-		$this->assertSame([$this->file], $result[0]->get());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testGetSource()
-	{
-		$publisher = new Publisher(ROOTPATH);
-
-		$this->assertSame(ROOTPATH, $publisher->getSource());
-	}
-
-	public function testGetDestination()
-	{
-		$publisher = new Publisher(ROOTPATH, SUPPORTPATH);
-
-		$this->assertSame(SUPPORTPATH, $publisher->getDestination());
-	}
-
-	public function testGetScratch()
-	{
-		$publisher = new Publisher();
-		$this->assertNull($this->getPrivateProperty($publisher, 'scratch'));
-
-		$scratch = $publisher->getScratch();
-
-		$this->assertIsString($scratch);
-		$this->assertDirectoryExists($scratch);
-		$this->assertDirectoryIsWritable($scratch);
-		$this->assertNotNull($this->getPrivateProperty($publisher, 'scratch'));
-
-		// Directory and contents should be removed on __destruct()
-		$file = $scratch . 'obvious_statement.txt';
-		file_put_contents($file, 'Bananas are a most peculiar fruit');
-
-		$publisher->__destruct();
-
-		$this->assertFileDoesNotExist($file);
-		$this->assertDirectoryDoesNotExist($scratch);
-	}
-
-	public function testGetErrors()
-	{
-		$publisher = new Publisher();
-		$this->assertSame([], $publisher->getErrors());
-
-		$expected = [
-			$this->file => PublisherException::forCollision($this->file, $this->file),
-		];
-
-		$this->setPrivateProperty($publisher, 'errors', $expected);
-
-		$this->assertSame($expected, $publisher->getErrors());
-	}
-
-	//--------------------------------------------------------------------
-
-	public function testWipeDirectory()
-	{
-		$directory = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . bin2hex(random_bytes(6));
-		mkdir($directory, 0700);
-		$this->assertDirectoryExists($directory);
-
-		$method = $this->getPrivateMethodInvoker(Publisher::class, 'wipeDirectory');
-		$method($directory);
+    /**
+     * A known, valid file
+     *
+     * @var string
+     */
+    private $file = SUPPORTPATH . 'Files/baker/banana.php';
+
+    /**
+     * A known, valid directory
+     *
+     * @var string
+     */
+    private $directory = SUPPORTPATH . 'Files/able/';
+
+    /**
+     * Initialize the helper, since some
+     * tests call static methods before
+     * the constructor would load it.
+     */
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+
+        helper(['filesystem']);
+    }
+
+    public function testDiscoverDefault()
+    {
+        $result = Publisher::discover();
+
+        $this->assertCount(1, $result);
+        $this->assertInstanceOf(TestPublisher::class, $result[0]);
+    }
+
+    public function testDiscoverNothing()
+    {
+        $result = Publisher::discover('Nothing');
+
+        $this->assertSame([], $result);
+    }
+
+    public function testDiscoverStores()
+    {
+        $publisher = Publisher::discover()[0];
+        $publisher->set([])->addFile($this->file);
+
+        $result = Publisher::discover();
+        $this->assertSame($publisher, $result[0]);
+        $this->assertSame([$this->file], $result[0]->get());
+    }
+
+    public function testGetSource()
+    {
+        $publisher = new Publisher(ROOTPATH);
+
+        $this->assertSame(ROOTPATH, $publisher->getSource());
+    }
+
+    public function testGetDestination()
+    {
+        $publisher = new Publisher(ROOTPATH, SUPPORTPATH);
+
+        $this->assertSame(SUPPORTPATH, $publisher->getDestination());
+    }
+
+    public function testGetScratch()
+    {
+        $publisher = new Publisher();
+        $this->assertNull($this->getPrivateProperty($publisher, 'scratch'));
+
+        $scratch = $publisher->getScratch();
+
+        $this->assertIsString($scratch);
+        $this->assertDirectoryExists($scratch);
+        $this->assertDirectoryIsWritable($scratch);
+        $this->assertNotNull($this->getPrivateProperty($publisher, 'scratch'));
+
+        // Directory and contents should be removed on __destruct()
+        $file = $scratch . 'obvious_statement.txt';
+        file_put_contents($file, 'Bananas are a most peculiar fruit');
+
+        $publisher->__destruct();
+
+        $this->assertFileDoesNotExist($file);
+        $this->assertDirectoryDoesNotExist($scratch);
+    }
+
+    public function testGetErrors()
+    {
+        $publisher = new Publisher();
+        $this->assertSame([], $publisher->getErrors());
+
+        $expected = [
+            $this->file => PublisherException::forCollision($this->file, $this->file),
+        ];
+
+        $this->setPrivateProperty($publisher, 'errors', $expected);
+
+        $this->assertSame($expected, $publisher->getErrors());
+    }
+
+    public function testWipeDirectory()
+    {
+        $directory = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . bin2hex(random_bytes(6));
+        mkdir($directory, 0700);
+        $this->assertDirectoryExists($directory);
 
-		$this->assertDirectoryDoesNotExist($directory);
-	}
+        $method = $this->getPrivateMethodInvoker(Publisher::class, 'wipeDirectory');
+        $method($directory);
+
+        $this->assertDirectoryDoesNotExist($directory);
+    }
 
-	public function testWipeIgnoresFiles()
-	{
-		$method = $this->getPrivateMethodInvoker(Publisher::class, 'wipeDirectory');
-		$method($this->file);
+    public function testWipeIgnoresFiles()
+    {
+        $method = $this->getPrivateMethodInvoker(Publisher::class, 'wipeDirectory');
+        $method($this->file);
 
-		$this->assertFileExists($this->file);
-	}
+        $this->assertFileExists($this->file);
+    }
 
-	public function testWipe()
-	{
-		$directory = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . bin2hex(random_bytes(6));
-		mkdir($directory, 0700);
-		$this->assertDirectoryExists($directory);
-		config('Publisher')->restrictions[$directory] = ''; // Allow the directory
+    public function testWipe()
+    {
+        $directory = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . bin2hex(random_bytes(6));
+        mkdir($directory, 0700);
+        $this->assertDirectoryExists($directory);
+        config('Publisher')->restrictions[$directory] = ''; // Allow the directory
 
-		$publisher = new Publisher($this->directory, $directory);
-		$publisher->wipe();
+        $publisher = new Publisher($this->directory, $directory);
+        $publisher->wipe();
 
-		$this->assertDirectoryDoesNotExist($directory);
-	}
+        $this->assertDirectoryDoesNotExist($directory);
+    }
 }
diff --git a/tests/system/Session/Handlers/DatabaseHandlerTest.php b/tests/system/Session/Handlers/DatabaseHandlerTest.php
index 7e69bf8e6c73..e001af8eeec8 100644
--- a/tests/system/Session/Handlers/DatabaseHandlerTest.php
+++ b/tests/system/Session/Handlers/DatabaseHandlerTest.php
@@ -136,6 +136,6 @@ public function testWriteUpdate()
     public function testGC()
     {
         $handler = $this->getInstance();
-        $this->assertTrue($handler->gc(3600));
+        $this->assertSame(1, $handler->gc(3600));
     }
 }
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index 5e3217654e47..1b21fe394659 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -988,11 +988,6 @@ public function validationArrayDataCaseProvider(): iterable
     /**
      * @dataProvider provideStringRulesCases
      *
-     * @param string $input
-     * @param array  $expected
-     *
-     * @return void
-     *
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/4929
      */
     public function testSplittingOfComplexStringRules(string $input, array $expected): void

From 692709227bc2e118aec5c669cc0e4db70146cd15 Mon Sep 17 00:00:00 2001
From: Terrorboy <z9n@kakao.com>
Date: Wed, 8 Sep 2021 22:42:47 +0900
Subject: [PATCH 0227/2325] Fix variable variable `$$id` in RedisHandler

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

diff --git a/system/Session/Handlers/RedisHandler.php b/system/Session/Handlers/RedisHandler.php
index 8ed7b8c052b8..ce6e7bde5180 100644
--- a/system/Session/Handlers/RedisHandler.php
+++ b/system/Session/Handlers/RedisHandler.php
@@ -137,7 +137,7 @@ public function read($id)
     {
         if (isset($this->redis) && $this->lockSession($id)) {
             if (! isset($this->sessionID)) {
-                $this->sessionID = ${$id};
+                $this->sessionID = $id;
             }
 
             $data = $this->redis->get($this->keyPrefix . $id);

From 4cd35992e62ef9590f611169cc7fe93902d5eb45 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Wed, 8 Sep 2021 14:20:01 +0000
Subject: [PATCH 0228/2325] Ignore CPD file

---
 .github/workflows/test-phpcpd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-phpcpd.yml b/.github/workflows/test-phpcpd.yml
index fcc66f7d682c..93a27ddf6e28 100644
--- a/.github/workflows/test-phpcpd.yml
+++ b/.github/workflows/test-phpcpd.yml
@@ -40,4 +40,4 @@ jobs:
       - name: Detect code duplication
         run: |
             sudo phive --no-progress install --global --trust-gpg-keys 4AA394086372C20A phpcpd 
-            phpcpd --exclude system/Test --exclude system/ThirdParty --exclude system/Database/SQLSRV/Builder.php app/ public/ system/
+            phpcpd --exclude system/Test --exclude system/ThirdParty --exclude system/Database/SQLSRV/Builder.php system/Database/SQLSRV/Forge.php app/ public/ system/

From ca5537eb2770587e263ac81008fa2d4590e98437 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Wed, 8 Sep 2021 14:22:26 +0000
Subject: [PATCH 0229/2325] Fix typo

---
 .github/workflows/test-phpcpd.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-phpcpd.yml b/.github/workflows/test-phpcpd.yml
index 93a27ddf6e28..d78edbea1f0e 100644
--- a/.github/workflows/test-phpcpd.yml
+++ b/.github/workflows/test-phpcpd.yml
@@ -40,4 +40,4 @@ jobs:
       - name: Detect code duplication
         run: |
             sudo phive --no-progress install --global --trust-gpg-keys 4AA394086372C20A phpcpd 
-            phpcpd --exclude system/Test --exclude system/ThirdParty --exclude system/Database/SQLSRV/Builder.php system/Database/SQLSRV/Forge.php app/ public/ system/
+            phpcpd --exclude system/Test --exclude system/ThirdParty --exclude system/Database/SQLSRV/Builder.php --exclude system/Database/SQLSRV/Forge.php app/ public/ system/

From 0c2a8119400bf7f64a2fe53eec9c745f25644c7b Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Wed, 8 Sep 2021 22:58:39 +0800
Subject: [PATCH 0230/2325] Update 'updated_at' when enabled in replace()

---
 system/BaseModel.php                     |  4 +++
 system/Database/Postgre/Builder.php      | 23 ++++++++-----
 system/Database/SQLSRV/Builder.php       |  4 +--
 tests/system/Models/ReplaceModelTest.php | 44 ++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 11 deletions(-)
 create mode 100644 tests/system/Models/ReplaceModelTest.php

diff --git a/system/BaseModel.php b/system/BaseModel.php
index e57ac4fec6bd..29c6d1075949 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -1031,6 +1031,10 @@ public function replace(?array $data = null, bool $returnSQL = false)
             return false;
         }
 
+        if ($this->useTimestamps && $this->updatedField && ! array_key_exists($this->updatedField, (array) $data)) {
+            $data[$this->updatedField] = $this->setDate();
+        }
+
         return $this->doReplace($data, $returnSQL);
     }
 
diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index 2b7a5b3dee06..1006ab20012e 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -39,8 +39,6 @@ class Builder extends BaseBuilder
     ];
 
     /**
-     * Compile Ignore Statement
-     *
      * Checks if the ignore option is supported by
      * the Database Driver for the specific statement.
      *
@@ -122,13 +120,11 @@ public function decrement(string $column, int $value = 1)
      * we simply do a DELETE and an INSERT on the first key/value
      * combo, assuming that it's either the primary key or a unique key.
      *
-     * @param array $set An associative array of insert values
+     * @param array|null $set An associative array of insert values
      *
      * @throws DatabaseException
      *
      * @return mixed
-     *
-     * @internal
      */
     public function replace(?array $set = null)
     {
@@ -145,18 +141,27 @@ public function replace(?array $set = null)
         }
 
         $table = $this->QBFrom[0];
+        $set   = $this->binds;
+
+        array_walk($set, static function (array &$item) {
+            $item = $item[0];
+        });
 
         $key   = array_key_first($set);
         $value = $set[$key];
 
         $builder = $this->db->table($table);
-        $exists  = $builder->where("{$key} = {$value}", null, false)->get()->getFirstRow();
+        $exists  = $builder->where($key, $value, true)->get()->getFirstRow();
 
-        if (empty($exists)) {
+        if (empty($exists) && $this->testMode) {
+            $result = $this->getCompiledInsert();
+        } elseif (empty($exists)) {
             $result = $builder->insert($set);
+        } elseif ($this->testMode) {
+            $result = $this->where($key, $value, true)->getCompiledUpdate();
         } else {
-            array_pop($set);
-            $result = $builder->update($set, "{$key} = {$value}");
+            array_shift($set);
+            $result = $builder->where($key, $value, true)->update($set);
         }
 
         unset($builder);
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index cda4fac8a825..851f7fd07860 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -348,9 +348,9 @@ protected function _replace(string $table, array $keys, array $values): string
         $bingo  = [];
 
         foreach ($common as $v) {
-            $k = array_search($v, $escKeyFields, true);
+            $k = array_search($v, $keys, true);
 
-            $bingo[$keyFields[$k]] = $binds[trim($values[$k], ':')];
+            $bingo[$keys[$k]] = $binds[trim($values[$k], ':')];
         }
 
         // Querying existing data
diff --git a/tests/system/Models/ReplaceModelTest.php b/tests/system/Models/ReplaceModelTest.php
new file mode 100644
index 000000000000..cfa5b8af8573
--- /dev/null
+++ b/tests/system/Models/ReplaceModelTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Models;
+
+use Tests\Support\Models\UserModel;
+
+/**
+ * @internal
+ */
+final class ReplaceModelTest extends LiveModelTestCase
+{
+    public function testReplaceRespectsUseTimestamps(): void
+    {
+        $this->createModel(UserModel::class);
+
+        $data = [
+            'name'    => 'Amanda Holmes',
+            'email'   => 'amanda@holmes.com',
+            'country' => 'US',
+        ];
+
+        $id = $this->model->insert($data);
+
+        $data['id']      = $id;
+        $data['country'] = 'UK';
+
+        $sql = $this->model->replace($data, true);
+        $this->assertStringNotContainsString('updated_at', $sql);
+
+        $this->model = $this->createModel(UserModel::class);
+        $this->setPrivateProperty($this->model, 'useTimestamps', true);
+        $sql = $this->model->replace($data, true);
+        $this->assertStringContainsString('updated_at', $sql);
+    }
+}

From e023f02587863201f6e27aa87df082b50469ba72 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 9 Sep 2021 07:44:47 +0800
Subject: [PATCH 0231/2325] Document new coding style guide

* Document new coding style guide

* Update contributing/styleguide.md

Co-authored-by: MGatner <mgatner@icloud.com>

Co-authored-by: MGatner <mgatner@icloud.com>
---
 contributing/README.rst     |   2 +-
 contributing/styleguide.md  | 259 ++++++++++++++++++++++++++++
 contributing/styleguide.rst | 327 ------------------------------------
 3 files changed, 260 insertions(+), 328 deletions(-)
 create mode 100644 contributing/styleguide.md
 delete mode 100644 contributing/styleguide.rst

diff --git a/contributing/README.rst b/contributing/README.rst
index b5539f8a8ae1..0e73b9e5d759 100644
--- a/contributing/README.rst
+++ b/contributing/README.rst
@@ -8,7 +8,7 @@ Contributing to CodeIgniter
 - `Contribution CSS <./css.rst>`_
 - `Framework internals <./internals.rst>`_
 - `CodeIgniter documentation <./documentation.rst>`_
-- `PHP Style Guide <./styleguide.rst>`_
+- `CodeIgniter Coding Style Guide <./styleguide.md>`_
 - `Developer's Certificate of Origin <../DCO.txt>`_
 
 CodeIgniter is a community driven project and accepts contributions of code
diff --git a/contributing/styleguide.md b/contributing/styleguide.md
new file mode 100644
index 000000000000..d746e672d33e
--- /dev/null
+++ b/contributing/styleguide.md
@@ -0,0 +1,259 @@
+# CodeIgniter Coding Style Guide
+
+This document declares a set of coding conventions and rules to be followed when contributing PHP code
+to the CodeIgniter project.
+
+**Note:**
+> While we would recommend it, there's no requirement that you follow these conventions and rules in your
+own projects. Usage is discretionary within your projects but strictly enforceable within the framework.
+
+We follow the [PSR-12: Extended Coding Style][psr12] plus a set of our own
+styling conventions.
+
+The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD NOT", "RECOMMENDED",
+"MAY", and "OPTIONAL" in this document are to be interpreted as described in [RFC 2119](http://tools.ietf.org/html/rfc2119).
+
+_Portions of the following rules are from and attributed to [PSR-12][psr12]. Even if we do not copy all the rules to this coding style guide explicitly, such uncopied rules SHALL still apply._
+
+[psr12]: https://www.php-fig.org/psr/psr-12/
+## Implementation
+
+Our team uses [PHP CS Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) to apply coding standard fixes automatically. If you would like to leverage these tools yourself visit the [Official CodeIgniter Coding Standard](https://github.com/CodeIgniter/coding-standard) repository for details.
+
+## General
+
+### Files
+
+- All PHP files MUST use the Unix LF (linefeed) line ending only.
+- All PHP files MUST end with a non-blank line, terminated with a single LF.
+- The closing `?>` tag MUST be omitted from files containing only PHP.
+
+### Lines
+
+- There MUST NOT be a hard limit on line length.
+- The soft limit on line length MUST be 120 characters.
+- Lines SHOULD NOT be longer than 80 characters; lines longer than that SHOULD be split into multiple subsequent lines of no more than 80 characters each.
+- There MUST NOT be trailing whitespace at the end of lines.
+- Blank lines MAY be added to improve readability and to indicate related blocks of code except where explicitly forbidden.
+- There MUST NOT be more than one statement per line.
+
+### Indenting
+
+- Code MUST use an indent of 4 spaces for each indent level, and MUST NOT use tabs for indenting.
+
+### Keywords and Types
+
+- All PHP reserved [keywords][1] and [types][2] MUST be in lower case.
+- Any new types and keywords added to future PHP versions MUST be in lower case.
+- Short form of type keywords MUST be used i.e. `bool` instead of `boolean`, `int` instead of `integer` etc.
+
+[1]: http://php.net/manual/en/reserved.keywords.php
+[2]: http://php.net/manual/en/reserved.other-reserved-words.php
+
+## Declare Statements, Namespace, and Import Statements
+
+The header of a PHP file may consist of a number of different blocks. If present, each of the blocks below
+MUST be separated by a single blank line, and MUST NOT contain a blank line. Each block MUST be in the order
+listed below, although blocks that are not relevant may be omitted.
+
+- Opening `<?php` tag.
+- File-level docblock.
+- One or more declare statements.
+- The namespace declaration of the file.
+- One or more class-based `use` import statements.
+- One or more function-based `use` import statements.
+- One or more constant-based `use` import statements.
+- The remainder of the code in the file.
+
+When a file contains a mix of HTML and PHP, any of the above sections may still be used. If so, they MUST be
+present at the top of the file, even if the remainder of the code consists of a closing PHP tag and then a
+mixture of HTML and PHP.
+
+When the opening `<?php` tag is on the first line of the file, it MUST be on its own line with no other
+statements unless it is a file containing markup outside of PHP opening and closing tags.
+
+Import statements MUST never begin with a leading backslash as they must always be fully qualified.
+
+## Classes, Properties, and Methods
+
+The term "class" refers to all classes, interfaces, and traits.
+
+- Any closing brace MUST NOT be followed by any comment or statement on the same line.
+- When instantiating a new class, parentheses MUST always be present even when there are no arguments passed to the constructor.
+
+### Extends and Implements
+
+- The `extends` and `implements` keywords MUST be declared on the same line as the class name.
+- Lists of `implements` and, in the case of interfaces, `extends` MAY be split across multiple lines,
+	where each subsequent line is indented once. When doing so, the first item in the list MUST be on
+	the next line, and there MUST be only one interface per line.
+
+- The opening brace for the class MUST go on its own line; the closing brace for the class MUST go on the next line after the body.
+- Opening braces MUST be on their own line and MUST NOT be preceded or followed by a blank line.
+- Closing braces MUST be on their own line and MUST NOT be preceded by a blank line.
+
+### Using traits
+
+- The `use` keyword used inside the classes to implement traits MUST be declared on the next line after the opening brace.
+- Each individual trait that is imported into a class MUST be included one-per-line and each inclusion MUST have its own use import statement.
+- When the class has nothing after the use import statement, the class closing brace MUST be on the next line after the use import statement.
+- Otherwise, it MUST have a blank line after the use import statement.
+- When using the insteadof and as operators they must be used as follows taking note of indentation, spacing, and new lines.
+
+### Properties and Constants
+
+- Visibility MUST be declared on all properties.
+- Visibility MUST be declared on all constants if your project PHP minimum version supports constant visibilities (PHP 7.1 or later).
+- The `var` keyword MUST NOT be used to declare a property.
+- here MUST NOT be more than one property declared per statement.
+- Property names MUST NOT be prefixed with a single underscore to indicate protected or private visibility. That is, an underscore prefix explicitly has no meaning.
+- There MUST be a space between type declaration and property name.
+
+### Methods and Functions
+
+- Visibility MUST be declared on all methods.
+- Method names MUST NOT be prefixed with a single underscore to indicate protected or private visibility. That is, an underscore prefix explicitly has no meaning.
+- Method and function names MUST NOT be declared with space after the method name. The opening brace MUST go on its own line, and the closing brace MUST go on the next line following the body. There MUST NOT be a space after the opening parenthesis, and there MUST NOT be a space before the closing parenthesis.
+
+### Method and Function Arguments
+
+- In the argument list, there MUST NOT be a space before each comma, and there MUST be one space after each comma.
+- Argument lists MAY be split across multiple lines, where each subsequent line is indented once. When doing so, the first item in the list MUST be on the next line, and there MUST be only one argument per line.
+- When the argument list is split across multiple lines, the closing parenthesis and opening brace MUST be placed together on their own line with one space between them.
+- When you have a return type declaration present, there MUST be one space after the colon followed by the type declaration. The colon and declaration MUST be on the same line as the argument list closing parenthesis with no spaces between the two characters.
+- In nullable type declarations, there MUST NOT be a space between the question mark and the type.
+- When using the reference operator & before an argument, there MUST NOT be a space after it.
+- There MUST NOT be a space between the variadic three dot operator and the argument name.
+- When combining both the reference operator and the variadic three dot operator, there MUST NOT be any space between the two of them.
+
+### `abstract`, `final`, and `static`
+
+- When present, the `abstract` and `final` declarations MUST precede the visibility declaration.
+- When present, the `static` declaration MUST come after the visibility declaration.
+
+### Method and Function Calls
+
+- When making a method or function call, there MUST NOT be a space between the method or function name
+and the opening parenthesis, there MUST NOT be a space after the opening parenthesis, and there MUST NOT be a
+space before the closing parenthesis. In the argument list, there MUST NOT be a space before each comma, and
+there MUST be one space after each comma.
+- Argument lists MAY be split across multiple lines, where each subsequent line is indented once. When doing
+so, the first item in the list MUST be on the next line, and there MUST be only one argument per line. A
+single argument being split across multiple lines (as might be the case with an anonymous function or array)
+does not constitute splitting the argument list itself.
+
+## Control Structures
+
+The general style rules for control structures are as follows:
+
+- There MUST be one space after the control structure keyword
+- There MUST NOT be a space after the opening parenthesis
+- There MUST NOT be a space before the closing parenthesis
+- There MUST be one space between the closing parenthesis and the opening brace
+- The structure body MUST be indented once
+- The body MUST be on the next line after the opening brace
+- The closing brace MUST be on the next line after the body
+
+The body of each structure MUST be enclosed by braces. This standardizes how the structures look and reduces the likelihood of introducing errors as new lines get added to the body.
+
+### `if`, `elseif`, `else`
+
+- The keyword `elseif` SHOULD be used instead of else if so that all control keywords look like single words.
+- Expressions in parentheses MAY be split across multiple lines, where each subsequent line is indented at
+least once. When doing so, the first condition MUST be on the next line. The closing parenthesis and opening
+brace MUST be placed together on their own line with one space between them. Boolean operators between
+conditions MUST always be at the beginning or at the end of the line, not a mix of both.
+
+### `switch`, `case`
+
+- There MUST be a comment such as `// no break` when fall-through is intentional in a non-empty case body.
+- Expressions in parentheses MAY be split across multiple lines, where each subsequent line is indented at
+least once. When doing so, the first condition MUST be on the next line. The closing parenthesis and opening
+brace MUST be placed together on their own line with one space between them. Boolean operators between
+conditions MUST always be at the beginning or at the end of the line, not a mix of both.
+
+### `while`, `do while`
+
+- Expressions in parentheses MAY be split across multiple lines, where each subsequent line is indented at
+least once. When doing so, the first condition MUST be on the next line. The closing parenthesis and opening
+brace MUST be placed together on their own line with one space between them. Boolean operators between
+conditions MUST always be at the beginning or at the end of the line, not a mix of both.
+
+## Operators
+
+- Style rules for operators are grouped by arity (the number of operands they take).
+- When space is permitted around an operator, multiple spaces MAY be used for readability purposes.
+- All operators not described here are left undefined.
+
+### Unary operators
+
+- The increment/decrement operators MUST NOT have any space between the operator and operand.
+- Type casting operators MUST NOT have any space within the parentheses.
+
+### Binary operators
+
+- All binary arithmetic, comparison, assignment, bitwise, logical, string, and type operators MUST be preceded and followed by at least one space.
+
+### Ternary operators
+
+- The conditional operator, also known simply as the ternary operator, MUST be preceded and followed by at least one space around both the `?` and `:` characters.
+- When the middle operand of the conditional operator is omitted, the operator MUST follow the same style rules as other binary comparison operators.
+
+**Note:**
+> All the preceding rules are quoted from PSR-12. You may visit its website to view the code block samples.
+
+## Custom Conventions
+
+### File Naming
+
+- Files containing PHP code SHOULD end with a ".php" extension.
+- Files containing templates SHOULD end with a ".tpl" extension.
+- Files containing classes, interfaces, or traits MUST have their base name exactly matching the name
+of the classes they declare.
+- Files declaring procedural functions SHOULD be written in snake_case format.
+
+### Naming of Structural Elements
+
+- Constants MUST be declared in UPPERCASE_SEPARATED_WITH_UNDERSCORES.
+- Class names MUST be declared in PascalCase.
+- Method and property names MUST be declared in camelCase.
+- Procedural functions MUST be in snake_case.
+- Abbreviations/acronyms/initialisms SHOULD be written in their own natural format.
+
+### Logical Operators
+
+- The negation operator `!` SHOULD have one space from its argument.
+```diff
+-!$result
++! $result
+```
+
+- Use parentheses to clarify potentially confusing logical expressions.
+
+### PHP Docblocks (PHPDoc)
+
+- There SHOULD be no useless PHPDoc annotations.
+```diff
+-/**
+- * @param string $data Data
+- * @return void
+- */
+  public function analyse(string $data): void {};
+```
+
+### PHPUnit Assertions
+
+- As much as possible, you SHOULD always use the strict version of assertions.
+```diff
+-$this->assertEquals(12, (int) $axis);
++$this->assertSame(12, (int) $axis);
+```
+
+- Use the dedicated assertion instead of using internal types.
+```diff
+-$this->assertSame(true, is_cli());
++$this->assertTrue(is_cli());
+
+-$this->assertTrue(array_key_exists('foo', $array));
++$this->assertArrayHasKey('foo', $array);
+```
diff --git a/contributing/styleguide.rst b/contributing/styleguide.rst
deleted file mode 100644
index a500d663fe11..000000000000
--- a/contributing/styleguide.rst
+++ /dev/null
@@ -1,327 +0,0 @@
-######################
-PHP Coding Style Guide
-######################
-
-The following document declares a set of coding convention rules to be
-followed when contributing PHP code to the CodeIgniter project.
-
-Some of these rules, like naming conventions for example, *may* be
-incorporated into the framework's logic and therefore be functionally
-enforced (which would be separately documented), but while we would
-recommend it, there's no requirement that you follow these conventions in
-your own applications.
-
-The `PHP Interop Group <http://www.php-fig.org/>`_ has proposed a number of
-canonical recommendations for PHP code style. CodeIgniter is not a member of
-of PHP-FIG. We commend their efforts to unite the PHP community,
-but no not agree with all of their recommendations.
-
-PSR-2 is PHP-FIG's Coding Style Guide. We do not claim conformance with it,
-although there are a lot of similarities. The differences will be pointed out
-below.
-
-The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD",
-"SHOULD NOT", "RECOMMENDED",  "MAY", and "OPTIONAL" in this document are to
-be interpreted as described in `RFC 2119 <http://www.ietf.org/rfc/rfc2119.txt>`_.
-
-*Note: When used below, the term "class" refers to all kinds of classes,
-interfaces and traits.*
-
-*****
-Files
-*****
-
-Formatting
-==========
-
-- Files MUST use UTF-8 character set encoding without BOM.
-- Files MUST use UNIX line endings (LF: `\n`).
-- Files MUST end with a single empty line (i.e. LF: `\n`).
-
-Structure
-=========
-
-- A single file SHOULD NOT declare more than one class.
-  Examples where we feel that more than one class in a source file
-  is appropriate:
-
-    -   `system/Debug/CustomExceptions` contains a number of CodeIgniter
-        exceptions and errors, that we want to use for a consistent
-        experience across applications.
-        If we stick with the purist route, then each of the 13+/- custom
-        exceptions would require an additional file, which would have a
-        performance impact at times.
-    -   `system/HTTP/Response` provides a RedirectException, used with the
-        Response class.
-    -   `system/Router/Router` similarly provides a RedirectException, used with
-        the Router class.
-
-- Files SHOULD either declare symbols (i.e. classes, functions, constants)
-  or execute non-declarative logic, but SHOULD NOT do both.
-
-Naming
-======
-
-- File names MUST end with a ".php" name extension and MUST NOT have
-  multiple name extensions.
-- Files declaring classes, interfaces or traits MUST have names exactly matching
-  the classes that they declare (obviously excluding the ".php" name extension).
-- Files declaring functions SHOULD be named in *snake_case.php*.
-
-*************************************
-Whitespace, indentation and alignment
-*************************************
-
-- Best practice: indentation SHOULD use only tabs.
-- Best practice: alignment SHOULD use only spaces.
-- If using tabs for anything, you MUST set the tab spacing to 4.
-
-This will accommodate the widest range of developer environment options,
-while maintaining consistency of code appearance.
-
-Following the "best practice" above,
-the following code block would have a single tab at the beginning of
-each line containing braces, and two tabs at the beginning of the
-nested statements. No alignment is implied::
-
-    {
-        $first = 1;
-        $second = 2;
-        $third = 3;
-    }
-
-Following the "best practice" above,
-the following code block would use spaces to have the assignment
-operators line up with each other::
-
-    {
-        $first  = 1;
-        $second = 2;
-        $third  = 3;
-    }
-
-.. note:: Our indenting and alignment convention differs from PSR-2, which
-    **only** uses spaces for both indenting and alignment.
-
-- Unnecessary whitespace characters MUST NOT be present anywhere within a
-  script.
-
-  That includes trailing whitespace after a line of code, two or
-  more spaces used when only one is necessary (excluding alignment), as
-  well as any other whitespace usage that is not functionally required or
-  explicitly described in this document.
-
-.. note:: With conforming tab settings, alignment spacing should
-    be preserved in all development environments.
-    A pull request that deals only with tabs or spaces for alignment
-    will not be favorably considered.
-
-****
-Code
-****
-
-PHP tags
-========
-
-- Opening tags MUST only use the `<?php` and `<?=` forms.
-
-  - Scripts producing output SHOULD use the "short echo" `<?=` tag.
-  - Scripts declaring and/or using conditional logic SHOULD use the "long"
-    `<?php` tag.
-
-- Closing `?>` tags SHOULD NOT be used, unless the intention is to start
-  direct output.
-
-  - Scripts that don't produce output MUST NOT use the closing `?>` tag.
-
-Namespaces and classes
-======================
-
-- Class names and namespaces SHOULD be declared in `UpperCamelCase`,
-  also called `StudlyCaps`, unless
-  another form is *functionally* required.
-
-  - Abbreviations in namespaces, class names and method names SHOULD be
-    written in capital letters (e.g. PHP).
-
-- Class constants MUST be declared in `CAPITALS_SEPARATED_BY_UNDERSCORES`.
-- Class methods, property names and other variables MUST be declared in
-  `lowerCamelCase()`.
-- Class methods and properties MUST have visibility declarations (i.e.
-  `public`, `private` or `protected`).
-
-Methods
--------
-
-To maintain consistency between core classes, class properties MUST
-be private or protected, and the following public methods
-MUST be used for each such property "x"
-
-- `getX()` when the method returns returns a property value, or null if not set
-- `setX(value)` changes a property value, doesn't return anything, and can
-  throw exceptions
-- `hasX()` returns a boolean to if a property exists
-- `newX()` creates an instance of a/the component object and returns it,
-  and can throw exceptions
-- `isX()` returns true/false for boolean properties
-
-- Methods SHOULD use type hints and return type hints
-
-Procedural code
-===============
-
-- Function and variable names SHOULD be declared in `snake_case()` (all
-  lowercase letters, separated by underscores), unless another form is
-  *functionally* required.
-- Constants MUST be declared in `CAPITALS_SEPARATED_BY_UNDERSCORES`.
-
-Keywords
-========
-
-- All keywords MUST be written in lowercase letters. This includes "scalar"
-  types, but does NOT include core PHP classes such as `stdClass` or
-  `Exception`.
-- Adjacent keywords are separated by a single space character.
-- The keywords `require`, `require_once`, `include`, `include_once` MUST
-  be followed by a single space character and MUST NOT be followed by a
-  parenthesis anywhere within the declaration.
-- The `function` keyword MUST be immediately followed by either an opening
-  parenthesis or a single space and a function name.
-- Other keywords not explicitly mentioned in this section MUST be separated
-  by a single space character from any printable characters around them and
-  on the same line.
-
-Operators
-=========
-
-- The single dot concatenation, incrementing, decrementing, error
-  suppression operators and references MUST NOT be separated from their
-  subjects.
-- Other operators not explicitly mentioned in this section MUST be
-  separated by a single space character from any printable characters
-  around them and on the same line.
-- An operator MUST NOT be the last set of printable characters on a line.
-- An operator MAY be the first set of printable characters on a line.
-
-Logical Operators
-=================
-
--   Use the symbol versions (**||** and **&&**) of the logical operators
-    instead of the word versions (**OR** and **AND**).
-
-        -   This is consistent with other programming languages
-        -   It avoids the problem of the assignment operator (**=**) having
-            higher precedence::
-
-                $result = true && false; // $result is false, expected
-                $result = true AND false; // $result is true, evaluated as "($result = true) AND false"
-                $result = (true AND false); // $result is false
-
--   The logical negation operator MUST be separated from its argument by a
-    single space, as in **! $result** instead of **!$result**
--   If there is potential confusion with a logical expression, then use
-    parentheses for clarity, as shown above.
-
-Control Structures
-==================
-
--   Control structures, such as **if/else** statements, **for/foreach** statements, or
-    **while/do** statements, MUST use a brace-surrounded block for their body
-    segments.
-
-    Good control structure examples::
-
-        if ( $foo )
-        {
-            $bar += $baz;
-        }
-        else
-        {
-            $baz = 'bar';
-        }
-
-    Not-acceptable control structures::
-
-        if ( $foo ) $bar = $oneThing + $anotherThing + $yetAnotherThing + $evenMore;
-
-        if ( $foo ) $bar += $baz;
-        else $baz = 'bar';
-
-Docblocks
-=========
-
-We use phpDocumentor (phpdoc) to generate the API docs, for all of the source
-code inside the `system` folder.
-
-It wants to see a file summary docblock at the top of a PHP file,
-before any PHP statements, and then a docblock before each documentable
-component, namely any class/interface/trait, and all public and protected
-methods/functions/variables. The docblock for a method or function
-is expected to describe the parameters, return value, and any exceptions
-thrown.
-
-Deviations from the above are considered errors by phpdoc.
-
-An example::
-
-    <?php
-
-    namespace CodeIgniter\Fruit;
-
-    use CodeIgniter\Config\BaseConfig;
-
-    /**
-     * Base class for entities in the CodeIgniter\Fruit module.
-     */
-    abstract class BaseFruit
-    {
-      /**
-        * The group a fruit belongs to.
-        *
-        * @var string
-        */
-      protected $group;
-
-      /**
-        * Fruit constructor.
-        *
-        * @param BaseConfig       $config
-        */
-      public function __construct(BaseConfig $Config)
-      {
-              $this->group   = 'Unknown';
-      }
-
-      /**
-        * Model a fruit ripening over time.
-        *
-        * @param	array	$params
-        */
-      abstract public function ripen(array $params);
-    }
-
-Other
-=====
-
-- Argument separators (comma: `,`) MUST NOT be preceded by a whitespace
-  character and MUST be followed by a space character or a newline
-  (LF: `\n`).
-- Semi-colons (i.e. `;`) MUST NOT be preceded by a whitespace character
-  and MUST be followed by a newline (LF: `\n`).
-
-- Opening parentheses SHOULD NOT be followed by a space character.
-- Closing parentheses SHOULD NOT be preceded by a space character.
-
-- Opening square brackets SHOULD NOT be followed by a space character,
-  unless when using the "short array" declaration syntax.
-- Closing square brackets SHOULD NOT be preceded by a space character,
-  unless when using the "short array" declaration syntax.
-
-- A curly brace SHOULD be the only printable character on a line, unless:
-
-  - When declaring an anonymous function.
-  - Inside a "variable variable" (i.e. `${$foo}` or `${'foo'.$bar}`).
-  - Around a variable in a double-quoted string (i.e. `"Foo {$bar}"`).
-
-.. note:: Our control structures braces convention differs from PSR-2.
-    We use "Allman style" notation instead.

From 31653be8c2ddd7cdb315d5fc6feac63d25570b1e Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 9 Sep 2021 07:45:29 +0800
Subject: [PATCH 0232/2325] Update to phpdocumentor v3.1.1

---
 .github/workflows/deploy-apidocs.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/deploy-apidocs.yml b/.github/workflows/deploy-apidocs.yml
index 3b441e36485d..a7117d8f1f6a 100644
--- a/.github/workflows/deploy-apidocs.yml
+++ b/.github/workflows/deploy-apidocs.yml
@@ -41,12 +41,9 @@ jobs:
           php-version: '8.0'
           coverage: none
 
-      - name: Download phpDocumentor v3.1
-        run: |
-          cd ./source
-          curl \
-            -L https://github.com/phpDocumentor/phpDocumentor/releases/download/v3.1.0/phpDocumentor.phar \
-            -o admin/phpDocumentor.phar
+      - name: Download latest phpDocumentor
+        working-directory: source
+        run: phive install --no-progress --trust-gpg-keys 67F861C3D889C656 --target ./admin phpDocumentor
 
       - name: Prepare API repo
         working-directory: api

From a0cbea707550c2bfad30e38520a4bfe1c574c023 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 9 Sep 2021 09:40:51 +0800
Subject: [PATCH 0233/2325] Add phive to tools in workflow

---
 .github/workflows/deploy-apidocs.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-apidocs.yml b/.github/workflows/deploy-apidocs.yml
index a7117d8f1f6a..53b358d27f4b 100644
--- a/.github/workflows/deploy-apidocs.yml
+++ b/.github/workflows/deploy-apidocs.yml
@@ -39,11 +39,12 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: '8.0'
+          tools: phive
           coverage: none
 
       - name: Download latest phpDocumentor
         working-directory: source
-        run: phive install --no-progress --trust-gpg-keys 67F861C3D889C656 --target ./admin phpDocumentor
+        run: sudo phive install --no-progress --trust-gpg-keys 67F861C3D889C656 --target ./admin phpDocumentor
 
       - name: Prepare API repo
         working-directory: api

From a68a267a0d666b2e39fe6d87b31f1551cb4788fa Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 9 Sep 2021 09:42:51 +0800
Subject: [PATCH 0234/2325] Fix interchanged command options

---
 .github/workflows/deploy-apidocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-apidocs.yml b/.github/workflows/deploy-apidocs.yml
index 53b358d27f4b..5c4d2a12458f 100644
--- a/.github/workflows/deploy-apidocs.yml
+++ b/.github/workflows/deploy-apidocs.yml
@@ -44,7 +44,7 @@ jobs:
 
       - name: Download latest phpDocumentor
         working-directory: source
-        run: sudo phive install --no-progress --trust-gpg-keys 67F861C3D889C656 --target ./admin phpDocumentor
+        run: sudo phive --no-progress install --trust-gpg-keys 67F861C3D889C656 --target ./admin phpDocumentor
 
       - name: Prepare API repo
         working-directory: api

From 27b9f3113585b37000d08b837e98ce578c744f3c Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 9 Sep 2021 09:50:42 +0800
Subject: [PATCH 0235/2325] Fix path resolution

---
 .github/workflows/deploy-apidocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-apidocs.yml b/.github/workflows/deploy-apidocs.yml
index 5c4d2a12458f..4704b4f31696 100644
--- a/.github/workflows/deploy-apidocs.yml
+++ b/.github/workflows/deploy-apidocs.yml
@@ -44,7 +44,7 @@ jobs:
 
       - name: Download latest phpDocumentor
         working-directory: source
-        run: sudo phive --no-progress install --trust-gpg-keys 67F861C3D889C656 --target ./admin phpDocumentor
+        run: sudo phive --no-progress install --trust-gpg-keys 67F861C3D889C656 --target admin phpDocumentor
 
       - name: Prepare API repo
         working-directory: api

From 501d823a0556c7e532facc12a00d9fbbe0037aac Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 9 Sep 2021 09:53:58 +0800
Subject: [PATCH 0236/2325] Remove phar extension

---
 .github/workflows/deploy-apidocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-apidocs.yml b/.github/workflows/deploy-apidocs.yml
index 4704b4f31696..3e19f09de6ad 100644
--- a/.github/workflows/deploy-apidocs.yml
+++ b/.github/workflows/deploy-apidocs.yml
@@ -56,7 +56,7 @@ jobs:
       - name: Build API in source repo
         working-directory: source
         run: |
-          php admin/phpDocumentor.phar run --ansi --verbose
+          php admin/phpDocumentor run --ansi --verbose
           cp -R ${GITHUB_WORKSPACE}/source/api/build/* ${GITHUB_WORKSPACE}/api/docs
 
       - name: Deploy to API repo

From 7a6899c443983afb4b95b919d1f5437caf0589cb Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 9 Sep 2021 10:13:20 +0800
Subject: [PATCH 0237/2325] Fix faulty phive installation of phpDocumentor

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

diff --git a/.github/workflows/deploy-apidocs.yml b/.github/workflows/deploy-apidocs.yml
index 3e19f09de6ad..4a7d20dd502b 100644
--- a/.github/workflows/deploy-apidocs.yml
+++ b/.github/workflows/deploy-apidocs.yml
@@ -44,7 +44,7 @@ jobs:
 
       - name: Download latest phpDocumentor
         working-directory: source
-        run: sudo phive --no-progress install --trust-gpg-keys 67F861C3D889C656 --target admin phpDocumentor
+        run: sudo phive --no-progress install --global --trust-gpg-keys 67F861C3D889C656 phpDocumentor
 
       - name: Prepare API repo
         working-directory: api
@@ -56,7 +56,7 @@ jobs:
       - name: Build API in source repo
         working-directory: source
         run: |
-          php admin/phpDocumentor run --ansi --verbose
+          phpDocumentor run --ansi --verbose
           cp -R ${GITHUB_WORKSPACE}/source/api/build/* ${GITHUB_WORKSPACE}/api/docs
 
       - name: Deploy to API repo

From 9390c69cd91d9e98b9c3884eaf900091fcfacf1f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 10 Sep 2021 11:05:27 +0900
Subject: [PATCH 0238/2325] docs: fix RST format

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

diff --git a/user_guide_src/source/installation/upgrade_414.rst b/user_guide_src/source/installation/upgrade_414.rst
index 613823132351..d3e19b0a9954 100644
--- a/user_guide_src/source/installation/upgrade_414.rst
+++ b/user_guide_src/source/installation/upgrade_414.rst
@@ -8,7 +8,7 @@ This release focuses on code style. All changes (except those noted below) are c
 **Method Scope**
 
 The following methods were changed from "public" to "protected" to match their parent class methods and better align with their uses.
-If you relied on any of these methods being public (highly unlikely) adjust your code accordingly::
+If you relied on any of these methods being public (highly unlikely) adjust your code accordingly:
 
 * ``CodeIgniter\Database\MySQLi\Connection::execute()``
 * ``CodeIgniter\Database\MySQLi\Connection::_fieldData()``

From ee3e1e704aa89b471a06d564f213a65921c0f59e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 10 Sep 2021 11:06:37 +0900
Subject: [PATCH 0239/2325] docs: update coding-standard links

---
 .../source/installation/repositories.rst      | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/user_guide_src/source/installation/repositories.rst b/user_guide_src/source/installation/repositories.rst
index 18bd3e7c6a18..b585ca8e8f6b 100644
--- a/user_guide_src/source/installation/repositories.rst
+++ b/user_guide_src/source/installation/repositories.rst
@@ -6,17 +6,15 @@ The CodeIgniter 4 open source project has its own
 
 There are several development repositories, of interest to potential contributors:
 
-+------------------+--------------+-----------------------------------------------------------------+
-| Repository       | Audience     | Description                                                     |
-+==================+==============+=================================================================+
-| CodeIgniter4     | contributors | Project codebase, including tests & user guide sources          |
-+------------------+--------------+-----------------------------------------------------------------+
-| translations     | developers   | System message translations                                     |
-+------------------+--------------+-----------------------------------------------------------------+
-| coding-standard  | contributors | Coding style conventions & rules                                |
-+------------------+--------------+-----------------------------------------------------------------+
-|                  |              |                                                                 |
-+------------------+--------------+-----------------------------------------------------------------+
++---------------------------------------------------------------------+--------------+-----------------------------------------------------------------+
+| Repository                                                          | Audience     | Description                                                     |
++=====================================================================+==============+=================================================================+
+| CodeIgniter4                                                        | contributors | Project codebase, including tests & user guide sources          |
++---------------------------------------------------------------------+--------------+-----------------------------------------------------------------+
+| translations                                                        | developers   | System message translations                                     |
++---------------------------------------------------------------------+--------------+-----------------------------------------------------------------+
+| `coding-standard <https://github.com/CodeIgniter/coding-standard>`_ | contributors | Coding style conventions & rules                                |
++---------------------------------------------------------------------+--------------+-----------------------------------------------------------------+
 
 There are also several deployment repositories, referenced in the installation directions.
 The deployment repositories are built automatically when a new version is released, and they
@@ -32,8 +30,6 @@ are not directly contributed to.
 +------------------+--------------+-----------------------------------------------------------------+
 | userguide        | anyone       | Pre-built user guide                                            |
 +------------------+--------------+-----------------------------------------------------------------+
-|                  |              |                                                                 |
-+------------------+--------------+-----------------------------------------------------------------+
 
 In all the above, the latest version of a repository can be downloaded
 by selecting the "releases" link in the secondary navbar inside
@@ -50,7 +46,7 @@ These correspond to the repositories mentioned above:
 - `codeigniter4/framework <https://packagist.org/packages/codeigniter4/framework>`_
 - `codeigniter4/appstarter <https://packagist.org/packages/codeigniter4/appstarter>`_
 - `codeigniter4/translations <https://packagist.org/packages/codeigniter4/translations>`_
-- `codeigniter4/coding-standard <https://packagist.org/packages/codeigniter4/codeigniter4-standard>`_
+- `codeigniter/coding-standard  <https://packagist.org/packages/codeigniter/coding-standard>`_
 
 See the :doc:`Installation </installation/index>` page for more information.
 

From 831c693bdb7a29cc109c9a17606066563fd5db4f Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 10 Sep 2021 09:07:32 +0700
Subject: [PATCH 0240/2325] Update to latest laminas-escaper 2.9.0

---
 .github/workflows/test-phpunit.yml | 1 -
 admin/framework/composer.json      | 2 +-
 composer.json                      | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index c093190233cb..aa7d584991a6 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -124,7 +124,6 @@ jobs:
         run: |
           composer update --ansi --no-interaction
           composer remove --ansi --dev --unused -W rector/rector phpstan/phpstan friendsofphp/php-cs-fixer nexusphp/cs-config codeigniter/coding-standard
-          php -r 'file_put_contents("vendor/laminas/laminas-zendframework-bridge/src/autoload.php", "");'
         env:
           COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
 
diff --git a/admin/framework/composer.json b/admin/framework/composer.json
index 6e3852d2af79..6c02a4b71eb9 100644
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@@ -11,7 +11,7 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "kint-php/kint": "^3.3",
-        "laminas/laminas-escaper": "^2.8",
+        "laminas/laminas-escaper": "^2.9",
         "psr/log": "^1.1"
     },
     "require-dev": {
diff --git a/composer.json b/composer.json
index 7b9d50b8e620..43768c06c524 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "kint-php/kint": "^3.3",
-        "laminas/laminas-escaper": "^2.8",
+        "laminas/laminas-escaper": "^2.9",
         "psr/log": "^1.1"
     },
     "require-dev": {

From de4c6abd162a54833f85c12c7adeaecf99d43076 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 10 Sep 2021 13:56:11 +0900
Subject: [PATCH 0241/2325] docs: add session table change for upgrade

---
 .../source/installation/upgrade_420.rst         | 17 ++++++++++++++++-
 .../source/installation/upgrading.rst           |  1 +
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/installation/upgrade_420.rst b/user_guide_src/source/installation/upgrade_420.rst
index a306b4978347..cfbcbdbf1aeb 100644
--- a/user_guide_src/source/installation/upgrade_420.rst
+++ b/user_guide_src/source/installation/upgrade_420.rst
@@ -1,5 +1,5 @@
 #############################
-Upgrading from 4.1.3 to 4.2.0
+Upgrading from 4.1.4 to 4.2.0
 #############################
 
 **Changes for set() method in BaseBuilder and Model class**
@@ -10,3 +10,18 @@ and modified the ``set()`` method, then you need to change its definition from
 ``public function set($key, ?string $value = '', ?bool $escape = null)`` to
 ``public function set($key, $value = '', ?bool $escape = null)``.
 
+**Session DatabaseHandler's database table change**
+
+The types of the following columns in the session table have been changed for optimization.
+
+- MySQL
+    - ``timestamp``
+- PostgreSQL
+    - ``ip_address``
+    - ``timestamp``
+    - ``data``
+
+Update the definition of the session table. See the :doc:`/libraries/sessions` for the new definition.
+
+The change was introduced in v4.1.2. But due to `a bug <https://github.com/codeigniter4/CodeIgniter4/issues/4807>`_,
+the DatabaseHandler Driver did not work properly.
diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index 64696e691dc7..b6ef428e8b47 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -8,6 +8,7 @@ upgrading from.
 .. toctree::
     :titlesonly:
 
+    Upgrading from 4.1.4 to 4.2.0 <upgrade_420>
     Upgrading from 4.1.3 to 4.1.4 <upgrade_414>
     Upgrading from 4.1.2 to 4.1.3 <upgrade_413>
     Upgrading from 4.1.1 to 4.1.2 <upgrade_412>

From 5e6b4a3dffa4023956f69a79e7c98cf5b0297cb0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 10 Sep 2021 16:16:40 +0900
Subject: [PATCH 0242/2325] docs: update PSR Compliance (PSR-12)

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

diff --git a/user_guide_src/source/intro/psr.rst b/user_guide_src/source/intro/psr.rst
index 92f47fc235f0..a7ab555b7a11 100644
--- a/user_guide_src/source/intro/psr.rst
+++ b/user_guide_src/source/intro/psr.rst
@@ -10,13 +10,13 @@ status of our compliance with the various accepted, and some draft, proposals.
 **PSR-1: Basic Coding Standard**
 
 This recommendation covers basic class, method, and file-naming standards. Our
-`style guide <https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/styleguide.rst>`_
+`style guide <https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/styleguide.md>`_
 meets PSR-1 and adds its own requirements on top of it.
 
-**PSR-2: Coding Style Guide**
+**PSR-12: Extended Coding Style**
 
-This PSR was fairly controversial when it first came out. CodeIgniter meets many of the recommendations within,
-but does not, and will not, meet all of them.
+Our
+`style guide <https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/styleguide.md>`_ follows the recommendation plus a set of our own styling conventions.
 
 **PSR-3: Logger Interface**
 

From 152c4050dfde9d697f861563b36135a0539b9796 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Sep 2021 18:54:18 +0000
Subject: [PATCH 0243/2325] Update rector/rector requirement from 0.11.52 to
 0.11.53 (#5071)

---
 composer.json                    | 2 +-
 system/Helpers/number_helper.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 43768c06c524..13454e9d77ec 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^0.12.91",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.52",
+        "rector/rector": "0.11.53",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {
diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
index 6e1391556c49..d7f49c15f852 100644
--- a/system/Helpers/number_helper.php
+++ b/system/Helpers/number_helper.php
@@ -26,7 +26,7 @@ function number_to_size($num, int $precision = 1, ?string $locale = null)
     {
         // Strip any formatting & ensure numeric input
         try {
-            $num = 0 + str_replace(',', '', $num); // @phpstan-ignore-line
+            $num = 0 + str_replace(',', '', $num);
         } catch (ErrorException $ee) {
             return false;
         }

From 151cc63e855ade9585d22b5ab28978373b2f5ba6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 11 Sep 2021 23:07:58 +0900
Subject: [PATCH 0244/2325] docs: fix view_parser

---
 .../source/outgoing/view_parser.rst           | 568 +++++++++---------
 1 file changed, 284 insertions(+), 284 deletions(-)

diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index 37c20c82e11e..96b5440887b5 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -12,32 +12,32 @@ It can parse simple variables or variable tag pairs.
 
 Pseudo-variable names or control constructs are enclosed in braces, like this::
 
-	<html>
-	<head>
-		<title>{blog_title}</title>
-	</head>
-	<body>
-		<h3>{blog_heading}</h3>
+    <html>
+    <head>
+        <title>{blog_title}</title>
+    </head>
+    <body>
+        <h3>{blog_heading}</h3>
 
-		{blog_entries}
-			<h5>{title}</h5>
-			<p>{body}</p>
-		{/blog_entries}
+        {blog_entries}
+            <h5>{title}</h5>
+            <p>{body}</p>
+        {/blog_entries}
 
-	</body>
-	</html>
+    </body>
+    </html>
 
 These variables are not actual PHP variables, but rather plain text
 representations that allow you to eliminate PHP from your templates
 (view files).
 
 .. note:: CodeIgniter does **not** require you to use this class since
-	using pure PHP in your view pages (for instance using the
-	:doc:`View renderer </outgoing/view_renderer>` )
-	lets them run a little faster.
-	However, some developers prefer to use some form of template engine if
-	they work with designers who they feel would find some
-	confusion working with PHP.
+    using pure PHP in your view pages (for instance using the
+    :doc:`View renderer </outgoing/view_renderer>` )
+    lets them run a little faster.
+    However, some developers prefer to use some form of template engine if
+    they work with designers who they feel would find some
+    confusion working with PHP.
 
 ***************************
 Using the View Parser Class
@@ -45,12 +45,12 @@ Using the View Parser Class
 
 The simplest method to load the parser class is through its service::
 
-	$parser = \Config\Services::parser();
+    $parser = \Config\Services::parser();
 
 Alternately, if you are not using the ``Parser`` class as your default renderer, you
 can instantiate it directly::
 
-	$parser = new \CodeIgniter\View\Parser();
+    $parser = new \CodeIgniter\View\Parser();
 
 Then you can use any of the three standard rendering methods that it provides:
 **render(viewpath, options, save)**, **setVar(name, value, context)** and
@@ -87,13 +87,13 @@ Parser templates
 You can use the ``render()`` method to parse (or render) simple templates,
 like this::
 
-	$data = [
-		'blog_title'   => 'My Blog Title',
-		'blog_heading' => 'My Blog Heading',
-	];
+    $data = [
+        'blog_title'   => 'My Blog Title',
+        'blog_heading' => 'My Blog Heading',
+    ];
 
-	echo $parser->setData($data)
-	             ->render('blog_template');
+    echo $parser->setData($data)
+                ->render('blog_template');
 
 View parameters are passed to ``setData()`` as an associative
 array of data to be replaced in the template. In the above example, the
@@ -110,18 +110,18 @@ Several options can be passed to the ``render()`` or ``renderString()`` methods.
 
 -   ``cache`` - the time in seconds, to save a view's results; ignored for renderString()
 -   ``cache_name`` - the ID used to save/retrieve a cached view result; defaults to the viewpath;
-		ignored for renderString()
+    ignored for renderString()
 -   ``saveData`` - true if the view data parameters should be retained for subsequent calls;
-		default is **false**
--	``cascadeData`` - true if pseudo-variable settings should be passed on to nested
-		substitutions; default is **true**
+    default is **false**
+-   ``cascadeData`` - true if pseudo-variable settings should be passed on to nested
+    substitutions; default is **true**
 
 ::
 
-	echo $parser->render('blog_template', [
-		'cache'      => HOUR,
-		'cache_name' => 'something_unique',
-	]);
+    echo $parser->render('blog_template', [
+        'cache'      => HOUR,
+        'cache_name' => 'something_unique',
+    ]);
 
 ***********************
 Substitution Variations
@@ -134,12 +134,12 @@ The **simple substitution** performed by the parser is a one-to-one
 replacement of pseudo-variables where the corresponding data parameter
 has either a scalar or string value, as in this example::
 
-	$template = '<head><title>{blog_title}</title></head>';
-	$data     = ['blog_title' => 'My ramblings'];
+    $template = '<head><title>{blog_title}</title></head>';
+    $data     = ['blog_title' => 'My ramblings'];
 
-	echo $parser->setData($data)->renderString($template);
+    echo $parser->setData($data)->renderString($template);
 
-	// Result: <head><title>My ramblings</title></head>
+    // Result: <head><title>My ramblings</title></head>
 
 The ``Parser`` takes substitution a lot further with "variable pairs",
 used for nested substitutions or looping, and with some advanced
@@ -147,9 +147,9 @@ constructs for conditional substitution.
 
 When the parser executes, it will generally
 
--	handle any conditional substitutions
--	handle any nested/looping substitutions
--	handle the remaining single substitutions
+- handle any conditional substitutions
+- handle any nested/looping substitutions
+- handle the remaining single substitutions
 
 Loop Substitutions
 ==================
@@ -162,20 +162,20 @@ you would like an entire block of variables to be repeated, with each
 iteration containing new values? Consider the template example we showed
 at the top of the page::
 
-	<html>
-	<head>
-		<title>{blog_title}</title>
-	</head>
-	<body>
-		<h3>{blog_heading}</h3>
+    <html>
+    <head>
+        <title>{blog_title}</title>
+    </head>
+    <body>
+        <h3>{blog_heading}</h3>
 
-		{blog_entries}
-			<h5>{title}</h5>
-			<p>{body}</p>
-		{/blog_entries}
+        {blog_entries}
+            <h5>{title}</h5>
+            <p>{body}</p>
+        {/blog_entries}
 
-	</body>
-	</html>
+    </body>
+    </html>
 
 In the above code you'll notice a pair of variables: {blog_entries}
 data... {/blog_entries}. In a case like this, the entire chunk of data
@@ -186,20 +186,20 @@ Parsing variable pairs is done using the identical code shown above to
 parse single variables, except, you will add a multi-dimensional array
 corresponding to your variable pair data. Consider this example::
 
-	$data = [
-		'blog_title'   => 'My Blog Title',
-		'blog_heading' => 'My Blog Heading',
-		'blog_entries' => [
-			['title' => 'Title 1', 'body' => 'Body 1'],
-			['title' => 'Title 2', 'body' => 'Body 2'],
-			['title' => 'Title 3', 'body' => 'Body 3'],
-			['title' => 'Title 4', 'body' => 'Body 4'],
-			['title' => 'Title 5', 'body' => 'Body 5'],
-		],
-	];
-
-	echo $parser->setData($data)
-	             ->render('blog_template');
+    $data = [
+        'blog_title'   => 'My Blog Title',
+        'blog_heading' => 'My Blog Heading',
+        'blog_entries' => [
+            ['title' => 'Title 1', 'body' => 'Body 1'],
+            ['title' => 'Title 2', 'body' => 'Body 2'],
+            ['title' => 'Title 3', 'body' => 'Body 3'],
+            ['title' => 'Title 4', 'body' => 'Body 4'],
+            ['title' => 'Title 5', 'body' => 'Body 5'],
+        ],
+    ];
+
+    echo $parser->setData($data)
+                ->render('blog_template');
 
 The value for the pseudo-variable ``blog_entries`` is a sequential
 array of associative arrays. The outer level does not have keys associated
@@ -209,16 +209,16 @@ If your "pair" data is coming from a database result, which is already a
 multi-dimensional array, you can simply use the database ``getResultArray()``
 method::
 
-	$query = $db->query("SELECT * FROM blog");
+    $query = $db->query("SELECT * FROM blog");
 
-	$data = [
-		'blog_title'   => 'My Blog Title',
-		'blog_heading' => 'My Blog Heading',
-		'blog_entries' => $query->getResultArray(),
-	];
+    $data = [
+        'blog_title'   => 'My Blog Title',
+        'blog_heading' => 'My Blog Heading',
+        'blog_entries' => $query->getResultArray(),
+    ];
 
-	echo $parser->setData($data)
-	            ->render('blog_template');
+    echo $parser->setData($data)
+                ->render('blog_template');
 
 If the array you are trying to loop over contains objects instead of arrays,
 the parser will first look for an ``asArray`` method on the object. If it exists,
@@ -236,17 +236,17 @@ Nested Substitutions
 A nested substitution happens when the value for a pseudo-variable is
 an associative array of values, like a record from a database::
 
-	$data = [
-		'blog_title'   => 'My Blog Title',
-		'blog_heading' => 'My Blog Heading',
-		'blog_entry'   => [
-			'title' => 'Title 1',
-			'body' => 'Body 1',
-		],
-	];
+    $data = [
+        'blog_title'   => 'My Blog Title',
+        'blog_heading' => 'My Blog Heading',
+        'blog_entry'   => [
+            'title' => 'Title 1',
+            'body'  => 'Body 1',
+        ],
+    ];
 
-	echo $parser->setData($data)
-	            ->render('blog_template');
+    echo $parser->setData($data)
+                ->render('blog_template');
 
 The value for the pseudo-variable ``blog_entry`` is an associative
 array. The key/value pairs defined inside it will be exposed inside
@@ -254,13 +254,13 @@ the variable pair loop for that variable.
 
 A ``blog_template`` that might work for the above::
 
-	<h1>{blog_title} - {blog_heading}</h1>
-	{blog_entry}
-		<div>
-			<h2>{title}</h2>
-			<p>{body}</p>
-		</div>
-	{/blog_entry}
+    <h1>{blog_title} - {blog_heading}</h1>
+    {blog_entry}
+        <div>
+            <h2>{title}</h2>
+            <p>{body}</p>
+        </div>
+    {/blog_entry}
 
 If you would like the other pseudo-variables accessible inside the "blog_entry"
 scope, then make sure that the "cascadeData" option is set to true.
@@ -273,13 +273,13 @@ comments in a ``{#  #}`` symbols.
 
 ::
 
-	{# This comment is removed during parsing. #}
-	{blog_entry}
-		<div>
-			<h2>{title}</h2>
-			<p>{body}</p>
-		</div>
-	{/blog_entry}
+    {# This comment is removed during parsing. #}
+    {blog_entry}
+        <div>
+            <h2>{title}</h2>
+            <p>{body}</p>
+        </div>
+    {/blog_entry}
 
 Cascading Data
 ==============
@@ -289,30 +289,30 @@ data pairs into the inner substitution.
 
 The following example is not impacted by cascading::
 
-	$template = '{name} lives in {location}{city} on {planet}{/location}.';
+    $template = '{name} lives in {location}{city} on {planet}{/location}.';
 
-	$data = [
-		'name'     => 'George',
-		'location' => ['city' => 'Red City', 'planet' => 'Mars'],
-	];
+    $data = [
+        'name'     => 'George',
+        'location' => ['city' => 'Red City', 'planet' => 'Mars'],
+    ];
 
-	echo $parser->setData($data)->renderString($template);
-	// Result: George lives in Red City on Mars.
+    echo $parser->setData($data)->renderString($template);
+    // Result: George lives in Red City on Mars.
 
 This example gives different results, depending on cascading::
 
-	$template = '{location}{name} lives in {city} on {planet}{/location}.';
+    $template = '{location}{name} lives in {city} on {planet}{/location}.';
 
-	$data = [
-		'name'     => 'George',
-		'location' => ['city' => 'Red City', 'planet' => 'Mars'],
-	];
+    $data = [
+        'name'     => 'George',
+        'location' => ['city' => 'Red City', 'planet' => 'Mars'],
+    ];
 
-	echo $parser->setData($data)->renderString($template, ['cascadeData'=>false]);
-	// Result: {name} lives in Red City on Mars.
+    echo $parser->setData($data)->renderString($template, ['cascadeData'=>false]);
+    // Result: {name} lives in Red City on Mars.
 
-	echo $parser->setData($data)->renderString($template, ['cascadeData'=>true]);
-	// Result: George lives in Red City on Mars.
+    echo $parser->setData($data)->renderString($template, ['cascadeData'=>true]);
+    // Result: George lives in Red City on Mars.
 
 Preventing Parsing
 ==================
@@ -322,9 +322,9 @@ section will stay exactly as it is, with no variable substitution, looping, etc,
 
 ::
 
-	{noparse}
-		<h1>Untouched Code</h1>
-	{/noparse}
+    {noparse}
+        <h1>Untouched Code</h1>
+    {/noparse}
 
 Conditional Logic
 =================
@@ -332,15 +332,15 @@ Conditional Logic
 The Parser class supports some basic conditionals to handle ``if``, ``else``, and ``elseif`` syntax. All ``if``
 blocks must be closed with an ``endif`` tag::
 
-	{if $role=='admin'}
-		<h1>Welcome, Admin!</h1>
-	{endif}
+    {if $role=='admin'}
+        <h1>Welcome, Admin!</h1>
+    {endif}
 
 This simple block is converted to the following during parsing::
 
-	<?php if ($role=='admin'): ?>
-		<h1>Welcome, Admin!</h1>
-	<?php endif ?>
+    <?php if ($role=='admin'): ?>
+        <h1>Welcome, Admin!</h1>
+    <?php endif ?>
 
 All variables used within if statements must have been previously set with the same name. Other than that, it is
 treated exactly like a standard PHP conditional, and all standard PHP rules would apply here. You can use any
@@ -348,16 +348,16 @@ of the comparison operators you would normally, like ``==``, ``===``, ``!==``, `
 
 ::
 
-	{if $role=='admin'}
-		<h1>Welcome, Admin</h1>
-	{elseif $role=='moderator'}
-		<h1>Welcome, Moderator</h1>
-	{else}
-		<h1>Welcome, User</h1>
-	{endif}
+    {if $role=='admin'}
+        <h1>Welcome, Admin</h1>
+    {elseif $role=='moderator'}
+        <h1>Welcome, Moderator</h1>
+    {else}
+        <h1>Welcome, User</h1>
+    {endif}
 
 .. note:: In the background, conditionals are parsed using an **eval()**, so you must ensure that you take
-	care with the user data that is used within conditionals, or you could open your application up to security risks.
+    care with the user data that is used within conditionals, or you could open your application up to security risks.
 
 Escaping Data
 =============
@@ -367,13 +367,13 @@ supports several different contexts, like general **html**, when it's in an HTML
 else is specified, the data will be assumed to be in an HTML context. You can specify the context used by using the **esc**
 filter::
 
-	{ user_styles | esc(css) }
-	<a href="{ user_link | esc(attr) }">{ title }</a>
+    { user_styles | esc(css) }
+    <a href="{ user_link | esc(attr) }">{ title }</a>
 
 There will be times when you absolutely need something to used and NOT escaped. You can do this by adding exclamation
 marks to the opening and closing braces::
 
-	{! unescaped_var !}
+    {! unescaped_var !}
 
 Filters
 =======
@@ -385,17 +385,17 @@ need to format the same data differently in several sections on the same page.
 
 Filters are commands that come after the pseudo-variable name, and are separated by the pipe symbol, ``|``::
 
-	// -55 is displayed as 55
-	{ value|abs  }
+    // -55 is displayed as 55
+    { value|abs }
 
 If the parameter takes any arguments, they must be separated by commas and enclosed in parentheses::
 
-	{ created_at|date(Y-m-d) }
+    { created_at|date(Y-m-d) }
 
 Multiple filters can be applied to the value by piping multiple ones together. They are processed in order, from
 left to right::
 
-	{ created_at|date_modify(+5 days)|date(Y-m-d) }
+    { created_at|date_modify(+5 days)|date(Y-m-d) }
 
 Provided Filters
 ----------------
@@ -473,10 +473,10 @@ You can easily create your own filters by editing **app/Config/View.php** and ad
 ``$filters`` array. Each key is the name of the filter is called by in the view, and its value is any valid PHP
 callable::
 
-	public $filters = [
-		'abs'        => '\CodeIgniter\View\Filters::abs',
-		'capitalize' => '\CodeIgniter\View\Filters::capitalize',
-	];
+    public $filters = [
+        'abs'        => '\CodeIgniter\View\Filters::abs',
+        'capitalize' => '\CodeIgniter\View\Filters::capitalize',
+    ];
 
 PHP Native functions as Filters
 -------------------------------
@@ -485,9 +485,9 @@ You can use native php function as filters by editing **app/Config/View.php** an
 ``$filters`` array.Each key is the name of the native PHP function is called by in the view, and its value is any valid native PHP
 function prefixed with::
 
-	public $filters = [
-		'str_repeat' => '\str_repeat',
-	];
+    public $filters = [
+        'str_repeat' => '\str_repeat',
+    ];
 
 Parser Plugins
 ==============
@@ -495,7 +495,7 @@ Parser Plugins
 Plugins allow you to extend the parser, adding custom features for each project. They can be any PHP callable, making
 them very simple to implement. Within templates, plugins are specified by ``{+ +}`` tags::
 
-	{+ foo +} inner content {+ /foo +}
+    {+ foo +} inner content {+ /foo +}
 
 This example shows a plugin named **foo**. It can manipulate any of the content between its opening and closing tags.
 In this example, it could work with the text " inner content ". Plugins are processed before any pseudo-variable
@@ -503,16 +503,16 @@ replacements happen.
 
 While plugins will often consist of tag pairs, like shown above, they can also be a single tag, with no closing tag::
 
-	{+ foo +}
+    {+ foo +}
 
 Opening tags can also contain parameters that can customize how the plugin works. The parameters are represented as
 key/value pairs::
 
-	{+ foo bar=2 baz="x y" }
+    {+ foo bar=2 baz="x y" }
 
 Parameters can also be single values::
 
-	{+ include somefile.php +}
+    {+ include somefile.php +}
 
 Provided Plugins
 ----------------
@@ -520,14 +520,14 @@ Provided Plugins
 The following plugins are available when using the parser:
 
 ==================== ========================== ================================================================================== ================================================================
-Plugin               Arguments                  Description                                                           			   Example
+Plugin               Arguments                  Description                                                                          Example
 ==================== ========================== ================================================================================== ================================================================
 current_url                                     Alias for the current_url helper function.                                         {+ current_url +}
-previous_url                                    Alias for the previous_url helper function.                           		       {+ previous_url +}
+previous_url                                    Alias for the previous_url helper function.                                          {+ previous_url +}
 siteURL                                         Alias for the site_url helper function.                                            {+ siteURL "login" +}
-mailto               email, title, attributes   Alias for the mailto helper function.                                 		       {+ mailto email=foo@example.com title="Stranger Things" +}
-safe_mailto          email, title, attributes   Alias for the safe_mailto helper function.                            		       {+ safe_mailto email=foo@example.com title="Stranger Things" +}
-lang                 language string            Alias for the lang helper function.                                    		       {+ lang number.terabyteAbbr +}
+mailto               email, title, attributes   Alias for the mailto helper function.                                                {+ mailto email=foo@example.com title="Stranger Things" +}
+safe_mailto          email, title, attributes   Alias for the safe_mailto helper function.                                           {+ safe_mailto email=foo@example.com title="Stranger Things" +}
+lang                 language string            Alias for the lang helper function.                                                   {+ lang number.terabyteAbbr +}
 validation_errors    fieldname(optional)        Returns either error string for the field (if specified) or all validation errors. {+ validation_errors +} , {+ validation_errors field="email" +}
 route                route name                 Alias for the route_to helper function.                                            {+ route "login" +}
 ==================== ========================== ================================================================================== ================================================================
@@ -539,12 +539,12 @@ At its simplest, all you need to do to register a new plugin and make it ready f
 **app/Config/View.php**, under the **$plugins** array. The key is the name of the plugin that is
 used within the template file. The value is any valid PHP callable, including static class methods, and closures::
 
-	public $plugins = [
-		'foo'	=> '\Some\Class::methodName',
-		'bar'	=> function ($str, array $params=[]) {
-			return $str;
-		},
-	];
+    public $plugins = [
+        'foo' => '\Some\Class::methodName',
+        'bar' => function ($str, array $params=[]) {
+            return $str;
+        },
+    ];
 
 Any closures that are being used must be defined in the config file's constructor::
 
@@ -565,21 +565,21 @@ Any closures that are being used must be defined in the config file's constructo
 If the callable is on its own, it is treated as a single tag, not a open/close one. It will be replaced by
 the return value from the plugin::
 
-	public $plugins = [
-		'foo'	=> '\Some\Class::methodName'
-	];
+    public $plugins = [
+        'foo' => '\Some\Class::methodName'
+    ];
 
-	// Tag is replaced by the return value of Some\Class::methodName static function.
-	{+ foo +}
+    // Tag is replaced by the return value of Some\Class::methodName static function.
+    {+ foo +}
 
 If the callable is wrapped in an array, it is treated as an open/close tag pair that can operate on any of
 the content between its tags::
 
-	public $plugins = [
-		'foo' => ['\Some\Class::methodName']
-	];
+    public $plugins = [
+        'foo' => ['\Some\Class::methodName']
+    ];
 
-	{+ foo +} inner content {+ /foo +}
+    {+ foo +} inner content {+ /foo +}
 
 ***********
 Usage Notes
@@ -588,49 +588,49 @@ Usage Notes
 If you include substitution parameters that are not referenced in your
 template, they are ignored::
 
-	$template = 'Hello, {firstname} {lastname}';
-	$data = [
-		'title' => 'Mr',
-		'firstname' => 'John',
-		'lastname' => 'Doe'
-	];
-	echo $parser->setData($data)
-	             ->renderString($template);
+    $template = 'Hello, {firstname} {lastname}';
+    $data = [
+        'title'     => 'Mr',
+        'firstname' => 'John',
+        'lastname'  => 'Doe'
+    ];
+    echo $parser->setData($data)
+                ->renderString($template);
 
-	// Result: Hello, John Doe
+    // Result: Hello, John Doe
 
 If you do not include a substitution parameter that is referenced in your
 template, the original pseudo-variable is shown in the result::
 
-	$template = 'Hello, {firstname} {initials} {lastname}';
-	$data = [
-		'title'     => 'Mr',
-		'firstname' => 'John',
-		'lastname'  => 'Doe',
-	];
-	echo $parser->setData($data)
-	            ->renderString($template);
+    $template = 'Hello, {firstname} {initials} {lastname}';
+    $data = [
+        'title'     => 'Mr',
+        'firstname' => 'John',
+        'lastname'  => 'Doe',
+    ];
+    echo $parser->setData($data)
+                ->renderString($template);
 
-	// Result: Hello, John {initials} Doe
+    // Result: Hello, John {initials} Doe
 
 If you provide a string substitution parameter when an array is expected,
 i.e., for a variable pair, the substitution is done for the opening variable
 pair tag, but the closing variable pair tag is not rendered properly::
 
-	$template = 'Hello, {firstname} {lastname} ({degrees}{degree} {/degrees})';
-	$data = [
-		'degrees'   => 'Mr',
-		'firstname' => 'John',
-		'lastname'  => 'Doe',
-		'titles'    => [
-			['degree' => 'BSc'],
-			['degree' => 'PhD'],
-		],
-	];
-	echo $parser->setData($data)
-	            ->renderString($template);
-
-	// Result: Hello, John Doe (Mr{degree} {/degrees})
+    $template = 'Hello, {firstname} {lastname} ({degrees}{degree} {/degrees})';
+    $data = [
+        'degrees'   => 'Mr',
+        'firstname' => 'John',
+        'lastname'  => 'Doe',
+        'titles'    => [
+            ['degree' => 'BSc'],
+            ['degree' => 'PhD'],
+        ],
+    ];
+    echo $parser->setData($data)
+                ->renderString($template);
+
+    // Result: Hello, John Doe (Mr{degree} {/degrees})
 
 View Fragments
 ==============
@@ -642,53 +642,53 @@ of in the view.
 
 An example with the iteration controlled in the view::
 
-	$template = '<ul>{menuitems}
-		<li><a href="{link}">{title}</a></li>
-	{/menuitems}</ul>';
+    $template = '<ul>{menuitems}
+        <li><a href="{link}">{title}</a></li>
+    {/menuitems}</ul>';
 
-	$data = [
-		'menuitems' => [
-			['title' => 'First Link', 'link' => '/first'],
-			['title' => 'Second Link', 'link' => '/second'],
-		]
-	];
-	echo $parser->setData($data)
-	            ->renderString($template);
+    $data = [
+        'menuitems' => [
+            ['title' => 'First Link', 'link' => '/first'],
+            ['title' => 'Second Link', 'link' => '/second'],
+        ]
+    ];
+    echo $parser->setData($data)
+                ->renderString($template);
 
 Result::
 
-	<ul>
-		<li><a href="/first">First Link</a></li>
-		<li><a href="/second">Second Link</a></li>
-	</ul>
+    <ul>
+        <li><a href="/first">First Link</a></li>
+        <li><a href="/second">Second Link</a></li>
+    </ul>
 
 An example with the iteration controlled in the controller,
 using a view fragment::
 
-	$temp = '';
-	$template1 = '<li><a href="{link}">{title}</a></li>';
-	$data1 = [
-		['title' => 'First Link', 'link' => '/first'],
-		['title' => 'Second Link', 'link' => '/second'],
-	];
+    $temp = '';
+    $template1 = '<li><a href="{link}">{title}</a></li>';
+    $data1 = [
+        ['title' => 'First Link', 'link' => '/first'],
+        ['title' => 'Second Link', 'link' => '/second'],
+    ];
 
-	foreach ($data1 as $menuItem),{
-		$temp .= $parser->setData($menuItem)->renderString($template1);
-	}
+    foreach ($data1 as $menuItem),{
+        $temp .= $parser->setData($menuItem)->renderString($template1);
+    }
 
-	$template2 = '<ul>{menuitems}</ul>';
-	$data = [
-		'menuitems' => $temp,
-	];
-	echo $parser->setData($data)
-	            ->renderString($template2);
+    $template2 = '<ul>{menuitems}</ul>';
+    $data = [
+        'menuitems' => $temp,
+    ];
+    echo $parser->setData($data)
+                ->renderString($template2);
 
 Result::
 
-	<ul>
-		<li><a href="/first">First Link</a></li>
-		<li><a href="/second">Second Link</a></li>
-	</ul>
+    <ul>
+        <li><a href="/first">First Link</a></li>
+        <li><a href="/second">Second Link</a></li>
+    </ul>
 
 ***************
 Class Reference
@@ -696,80 +696,80 @@ Class Reference
 
 .. php:class:: CodeIgniter\\View\\Parser
 
-	.. php:method:: render($view[, $options[, $saveData=false]])
+    .. php:method:: render($view[, $options[, $saveData=false]])
 
-		:param  string  $view: File name of the view source
-		:param  array   $options: Array of options, as key/value pairs
-		:param  boolean $saveData: If true, will save data for use with any other calls, if false, will clean the data after rendering the view.
-		:returns: The rendered text for the chosen view
-		:rtype: string
+        :param  string  $view: File name of the view source
+        :param  array   $options: Array of options, as key/value pairs
+        :param  boolean $saveData: If true, will save data for use with any other calls, if false, will clean the data after rendering the view.
+        :returns: The rendered text for the chosen view
+        :rtype: string
 
-    		Builds the output based upon a file name and any data that has already been set::
+        Builds the output based upon a file name and any data that has already been set::
 
-			echo $parser->render('myview');
+            echo $parser->render('myview');
 
         Options supported:
 
-	        - ``cache`` - the time in seconds, to save a view's results
-	        - ``cache_name`` - the ID used to save/retrieve a cached view result; defaults to the viewpath
-	        - ``cascadeData`` - true if the data pairs in effect when a nested or loop substitution occurs should be propagated
-	        - ``saveData`` - true if the view data parameter should be retained for subsequent calls
-	        - ``leftDelimiter`` - the left delimiter to use in pseudo-variable syntax
-	        - ``rightDelimiter`` - the right delimiter to use in pseudo-variable syntax
+            - ``cache`` - the time in seconds, to save a view's results
+            - ``cache_name`` - the ID used to save/retrieve a cached view result; defaults to the viewpath
+            - ``cascadeData`` - true if the data pairs in effect when a nested or loop substitution occurs should be propagated
+            - ``saveData`` - true if the view data parameter should be retained for subsequent calls
+            - ``leftDelimiter`` - the left delimiter to use in pseudo-variable syntax
+            - ``rightDelimiter`` - the right delimiter to use in pseudo-variable syntax
 
-		Any conditional substitutions are performed first, then remaining
-		substitutions are performed for each data pair.
+        Any conditional substitutions are performed first, then remaining
+        substitutions are performed for each data pair.
 
-	.. php:method:: renderString($template[, $options[, $saveData=false]])
+    .. php:method:: renderString($template[, $options[, $saveData=false]])
 
-		:param  string  $template: View source provided as a string
-    		:param  array   $options: Array of options, as key/value pairs
-    		:param  boolean $saveData: If true, will save data for use with any other calls, if false, will clean the data after rendering the view.
-    		:returns: The rendered text for the chosen view
-    		:rtype: string
+        :param  string  $template: View source provided as a string
+        :param  array   $options: Array of options, as key/value pairs
+        :param  boolean $saveData: If true, will save data for use with any other calls, if false, will clean the data after rendering the view.
+        :returns: The rendered text for the chosen view
+        :rtype: string
 
-    		Builds the output based upon a provided template source and any data that has already been set::
+        Builds the output based upon a provided template source and any data that has already been set::
 
-			echo $parser->render('myview');
+            echo $parser->render('myview');
 
         Options supported, and behavior, as above.
 
-	.. php:method:: setData([$data[, $context=null]])
+    .. php:method:: setData([$data[, $context=null]])
 
-		:param  array   $data: Array of view data strings, as key/value pairs
-    		:param  string  $context: The context to use for data escaping.
-    		:returns: The Renderer, for method chaining
-    		:rtype: CodeIgniter\\View\\RendererInterface.
+        :param  array   $data: Array of view data strings, as key/value pairs
+        :param  string  $context: The context to use for data escaping.
+        :returns: The Renderer, for method chaining
+        :rtype: CodeIgniter\\View\\RendererInterface.
 
-    		Sets several pieces of view data at once::
+        Sets several pieces of view data at once::
 
-			$renderer->setData(['name'=>'George', 'position'=>'Boss']);
+            $renderer->setData(['name'=>'George', 'position'=>'Boss']);
 
         Supported escape contexts: html, css, js, url, or attr or raw.
-		If 'raw', no escaping will happen.
+        If 'raw', no escaping will happen.
 
-	.. php:method:: setVar($name[, $value=null[, $context=null]])
+    .. php:method:: setVar($name[, $value=null[, $context=null]])
 
-		:param  string  $name: Name of the view data variable
-    		:param  mixed   $value: The value of this view data
-    		:param  string  $context: The context to use for data escaping.
-    		:returns: The Renderer, for method chaining
-    		:rtype: CodeIgniter\\View\\RendererInterface.
+        :param  string  $name: Name of the view data variable
+        :param  mixed   $value: The value of this view data
+        :param  string  $context: The context to use for data escaping.
+        :returns: The Renderer, for method chaining
+        :rtype: CodeIgniter\\View\\RendererInterface.
 
-    		Sets a single piece of view data::
+        Sets a single piece of view data::
 
-			$renderer->setVar('name','Joe','html');
+            $renderer->setVar('name','Joe','html');
 
         Supported escape contexts: html, css, js, url, attr or raw.
-		If 'raw', no escaping will happen.
+        If 'raw', no escaping will happen.
 
-	.. php:method:: setDelimiters($leftDelimiter = '{', $rightDelimiter = '}')
+    .. php:method:: setDelimiters($leftDelimiter = '{', $rightDelimiter = '}')
 
-		:param  string  $leftDelimiter: Left delimiter for substitution fields
-    		:param  string  $rightDelimiter: right delimiter for substitution fields
-    		:returns: The Renderer, for method chaining
-    		:rtype: CodeIgniter\\View\\RendererInterface.
+        :param  string  $leftDelimiter: Left delimiter for substitution fields
+        :param  string  $rightDelimiter: right delimiter for substitution fields
+        :returns: The Renderer, for method chaining
+        :rtype: CodeIgniter\\View\\RendererInterface.
 
-    		Override the substitution field delimiters::
+        Override the substitution field delimiters::
 
-			$renderer->setDelimiters('[',']');
+            $renderer->setDelimiters('[',']');

From 642924553c84dce8cda11e3cf59a7151aaf573f6 Mon Sep 17 00:00:00 2001
From: Niklas Schmolke <niklas.schmolke@nexserv.de>
Date: Mon, 12 Apr 2021 17:26:37 +0200
Subject: [PATCH 0245/2325] Added upgrade guidelines

---
 .../source/installation/upgrade_database.rst  |  68 ++++++++
 .../source/installation/upgrade_emails.rst    |  60 +++++++
 .../installation/upgrade_encryption.rst       |  51 ++++++
 .../installation/upgrade_file_upload.rst      | 108 ++++++++++++
 .../installation/upgrade_html_tables.rst      |  55 ++++++
 .../installation/upgrade_localization.rst     |  66 ++++++++
 .../installation/upgrade_pagination.rst       |  62 +++++++
 .../source/installation/upgrade_responses.rst |  47 ++++++
 .../source/installation/upgrade_routing.rst   |  77 +++++++++
 .../source/installation/upgrade_security.rst  |  71 ++++++++
 .../source/installation/upgrade_sessions.rst  |  53 ++++++
 .../installation/upgrade_validations.rst      | 159 ++++++++++++++++++
 .../installation/upgrade_view_parser.rst      |  56 ++++++
 13 files changed, 933 insertions(+)
 create mode 100644 user_guide_src/source/installation/upgrade_database.rst
 create mode 100644 user_guide_src/source/installation/upgrade_emails.rst
 create mode 100644 user_guide_src/source/installation/upgrade_encryption.rst
 create mode 100644 user_guide_src/source/installation/upgrade_file_upload.rst
 create mode 100644 user_guide_src/source/installation/upgrade_html_tables.rst
 create mode 100644 user_guide_src/source/installation/upgrade_localization.rst
 create mode 100644 user_guide_src/source/installation/upgrade_pagination.rst
 create mode 100644 user_guide_src/source/installation/upgrade_responses.rst
 create mode 100644 user_guide_src/source/installation/upgrade_routing.rst
 create mode 100644 user_guide_src/source/installation/upgrade_security.rst
 create mode 100644 user_guide_src/source/installation/upgrade_sessions.rst
 create mode 100644 user_guide_src/source/installation/upgrade_validations.rst
 create mode 100644 user_guide_src/source/installation/upgrade_view_parser.rst

diff --git a/user_guide_src/source/installation/upgrade_database.rst b/user_guide_src/source/installation/upgrade_database.rst
new file mode 100644
index 000000000000..2c6a05e987f5
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_database.rst
@@ -0,0 +1,68 @@
+Upgrade Database
+################
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+Documentations
+==============
+
+- `Database Reference Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/database/index.html>`_
+- `Working with Databases Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/database/index.html>`_
+
+
+What has been changed
+=====================
+- The functionality in CI4 is basically the same as in CI4.
+- The method names have changed to camelCase and the query builder now needs to be initialized before you can run queries on it.
+
+Upgrade Guide
+=============
+1. Add your database credentials to ``app/Config/Database.php``. The options are pretty much the same as in CI3 only some names have changed slightly.
+2. Everywhere you have used the database you have to replace ``$this->load->database();`` with ``$db = \Config\Database::connect();``.
+3. If you use multiple databases use the following code to load additional databases ``$db = \Config\Database::connect('group_name');``.
+4. Now you have to change all database queries. The most important change here is to replace ``$this->db`` with just ``$db`` and adjust the method name and ``$db``. Here are some examples:
+
+- ``$this->db->query('YOUR QUERY HERE');`` to ``$db->query('YOUR QUERY HERE');``
+- ``$this->db->simple_query('YOUR QUERY')`` to ``$db->simpleQuery('YOUR QUERY')``
+- ``$this->db->escape("something")`` to ``$db->escape("something");``
+- ``$this->db->affected_rows();`` to ``$db->affectedRows();``
+- ``$query->result();`` to ``$query->getResult();``
+- ``$query->result_array();`` to ``$query->getResultArray();``
+- ``echo $this->db->count_all('my_table');`` to ``echo $db->table('my_table')->countAll();``
+
+5. To use the new Query Builder Class you have to initialize the builder ``$builder = $db->table('mytable');`` after that you can run the queries on the ``$builder``. Here are some examples:
+
+- ``$this->db->get()`` to ``$builder->get();``
+- ``$this->db->get_where('mytable', array('id' => $id), $limit, $offset);`` to ``$builder->getWhere(['id' => $id], $limit, $offset);``
+- ``$this->db->select('title, content, date');`` to ``$builder->select('title, content, date');``
+- ``$this->db->select_max('age');`` to ``$builder->selectMax('age');``
+- ``$this->db->join('comments', 'comments.id = blogs.id');`` to ``$builder->join('comments', 'comments.id = blogs.id');``
+- ``$this->db->having('user_id',  45);`` to ``$builder->having('user_id',  45);``
+
+
+Code Example
+============
+
+Codeigniter Version 3.11
+------------------------
+::
+
+   $query = $this->db->select('title')
+                ->where('id', $id)
+                ->limit(10, 20)
+                ->get('mytable');
+
+Codeigniter Version 4.x
+-----------------------
+::
+
+    $builder = $db->table('mytable');
+
+    $query = $builder->select('title')
+                 ->where('id', $id)
+                 ->limit(10, 20)
+                 ->get();
+
diff --git a/user_guide_src/source/installation/upgrade_emails.rst b/user_guide_src/source/installation/upgrade_emails.rst
new file mode 100644
index 000000000000..b0007289020e
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_emails.rst
@@ -0,0 +1,60 @@
+Upgrade Emails
+##############
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+Documentations
+==============
+
+- `Email Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/email.html>`_
+- `Email Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/outgoing/email.html>`_
+
+
+What has been changed
+=====================
+- Only small things like the method names and the loading of the library have changed.
+
+Upgrade Guide
+=============
+1. Within your class change the ``$this->load->library('email');`` to ``$email = \Config\Services::email();``.
+2. From that on you have to replace every line starting with ``$this->email`` to ``$email``.
+3. The methods in the Email class are named slightly different. All methods, except for ``send()``, ``attach()``, ``printDebugger()`` and ``clear()`` have a ``set`` as prefix followed by the previous method name. ``bcc()`` is now ``setBcc()`` and so on.
+4. The config attributes in ``app/Config/Email.php`` have changed. You should have a look at the `Email Class Documentation <http://codeigniter.com/user_guide/libraries/email.html#setting-email-preferences>`_ to have a list of the new attributes.
+
+Code Example
+============
+
+Codeigniter Version 3.11
+------------------------
+::
+
+    $this->load->library('email');
+
+    $this->email->from('your@example.com', 'Your Name');
+    $this->email->to('someone@example.com');
+    $this->email->cc('another@another-example.com');
+    $this->email->bcc('them@their-example.com');
+
+    $this->email->subject('Email Test');
+    $this->email->message('Testing the email class.');
+
+    $this->email->send();
+
+Codeigniter Version 4.x
+-----------------------
+::
+
+    $email = \Config\Services::email();
+
+    $email->setFrom('your@example.com', 'Your Name');
+    $email->setTo('someone@example.com');
+    $email->setCC('another@another-example.com');
+    $email->setBCC('them@their-example.com');
+
+    $email->setSubject('Email Test');
+    $email->setMessage('Testing the email class.');
+
+    $email->send();
diff --git a/user_guide_src/source/installation/upgrade_encryption.rst b/user_guide_src/source/installation/upgrade_encryption.rst
new file mode 100644
index 000000000000..ee1365cd5c42
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_encryption.rst
@@ -0,0 +1,51 @@
+Upgrade Encryption
+##################
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+Documentations
+==============
+
+- `Encryption Library Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/encryption.html>`_
+- `Encryption Service Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/libraries/encryption.html>`_
+
+
+What has been changed
+=====================
+- The support for ``MCrypt`` has been dropped, as that has been deprecated as of PHP 7.2.
+
+Upgrade Guide
+=============
+1. Within your configs the ``$config['encryption_key'] = 'abc123';`` moved from ``application/config/config.php`` to ``public $key = 'abc123';`` in ``app/Config/Encryption.php``.
+2. Wherever you have used the encryption library you have to replace ``$this->load->library('encryption');`` with ``$encrypter = \Config\Services::encrypter();`` and change the methods for encryption and decrypting like in the following code example.
+
+Code Example
+============
+
+Codeigniter Version 3.11
+------------------------
+::
+
+    $this->load->library('encryption');
+
+    $plain_text = 'This is a plain-text message!';
+    $ciphertext = $this->encryption->encrypt($plain_text);
+
+    // Outputs: This is a plain-text message!
+    echo $this->encryption->decrypt($ciphertext);
+
+
+Codeigniter Version 4.x
+-----------------------
+::
+
+    $encrypter = \Config\Services::encrypter();
+
+    $plainText = 'This is a plain-text message!';
+    $ciphertext = $encrypter->encrypt($plainText);
+
+    // Outputs: This is a plain-text message!
+    echo $encrypter->decrypt($ciphertext);
diff --git a/user_guide_src/source/installation/upgrade_file_upload.rst b/user_guide_src/source/installation/upgrade_file_upload.rst
new file mode 100644
index 000000000000..069164dd2f68
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_file_upload.rst
@@ -0,0 +1,108 @@
+Upgrade Working with Uploaded Files
+###################################
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+Documentations
+==============
+- `Output Class Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/file_uploading.html>`_
+- `Working with Uploaded Files Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/libraries/uploaded_files.html>`_
+
+What has been changed
+=====================
+- The functionality of the file upload has changed a lot. You can now check if the file got uploaded without errors and moving / storing files is simpler.
+
+Upgrade Guide
+=============
+In CI4 you access uploaded files with ``$file = $this->request->getFile('userfile')``. From there you can validate if the file got uploaded successfully with ``$file->isValid()``.
+To store the file you could use ``$path = $this->request->getFile('userfile')->store('head_img/', 'user_name.jpg');`` This will store the file in ``writable/uploads/head_img/user_name.jpg``.
+
+You have to change your file uploading code to match the new methods.
+
+Code Example
+============
+
+Codeigniter Version 3.11
+------------------------
+::
+
+    <?php
+
+    class Upload extends CI_Controller {
+
+            public function __construct()
+            {
+                    parent::__construct();
+                    $this->load->helper(array('form', 'url'));
+            }
+
+            public function index()
+            {
+                    $this->load->view('upload_form', array('error' => ' ' ));
+            }
+
+            public function do_upload()
+            {
+                    $config['upload_path']          = './uploads/';
+                    $config['allowed_types']        = 'gif|jpg|png';
+                    $config['max_size']             = 100;
+                    $config['max_width']            = 1024;
+                    $config['max_height']           = 768;
+
+                    $this->load->library('upload', $config);
+
+                    if ( ! $this->upload->do_upload('userfile'))
+                    {
+                            $error = array('error' => $this->upload->display_errors());
+
+                            $this->load->view('upload_form', $error);
+                    }
+                    else
+                    {
+                            $data = array('upload_data' => $this->upload->data());
+
+                            $this->load->view('upload_success', $data);
+                    }
+            }
+    }
+    ?>
+
+Codeigniter Version 4.x
+-----------------------
+::
+
+    <?php
+
+    namespace App\Controllers;
+
+    class Upload extends BaseController {
+
+            public function index()
+            {
+                    echo view('upload_form', ['error' => ' ']);
+            }
+
+            public function do_upload()
+            {
+                    $this->validate([
+                        'userfile' => 'uploaded[userfile]|max_size[userfile,1024]|mime_in[userfile,image/png,image/jpg,image/gif]|max_dims[userfile,1024,768]'
+                    ]);
+
+                    $file = $this->request->getFile('userfile');
+
+                    if ( ! $path = $file->store())
+                    {
+                            echo view('upload_form', ['error' => "upload failed"]);
+                    }
+                    else
+                    {
+                            $data = ['upload_file_path' => $path];
+
+                            echo view('upload_success', $data);
+                    }
+            }
+    }
+    ?>
diff --git a/user_guide_src/source/installation/upgrade_html_tables.rst b/user_guide_src/source/installation/upgrade_html_tables.rst
new file mode 100644
index 000000000000..82d75f143584
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_html_tables.rst
@@ -0,0 +1,55 @@
+Upgrade HTML Tables
+###################
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+Documentations
+==============
+
+- `HTML Table Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/table.html>`_
+- `HTML Table Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/outgoing/table.html>`_
+
+
+What has been changed
+=====================
+- Only small things like the method names and the loading of the library have changed.
+
+Upgrade Guide
+=============
+1. Within your class change the ``$this->load->library('table');`` to ``$table = new \CodeIgniter\View\Table();``.
+2. From that on you have to replace every line starting with ``$this->table`` to ``$table``. For example: ``echo $this->table->generate($query);`` will become ``echo $table->generate($query);``
+3. The methods in the HTML Table class could be named slightly different. The most important change in the naming is the switch from underscored method names to camelCase. The method ``set_heading()`` from version 3 is now named ``setHeading()`` and so on.
+
+Code Example
+============
+
+Codeigniter Version 3.11
+------------------------
+::
+
+    $this->load->library('table');
+
+    $this->table->set_heading('Name', 'Color', 'Size');
+
+    $this->table->add_row('Fred', 'Blue', 'Small');
+    $this->table->add_row('Mary', 'Red', 'Large');
+    $this->table->add_row('John', 'Green', 'Medium');
+
+    echo $this->table->generate();
+
+Codeigniter Version 4.x
+-----------------------
+::
+
+    $table = new \CodeIgniter\View\Table();
+
+    $table->setHeading('Name', 'Color', 'Size');
+
+    $table->addRow('Fred', 'Blue', 'Small');
+    $table->addRow('Mary', 'Red', 'Large');
+    $table->addRow('John', 'Green', 'Medium');
+
+    echo $table->generate();
diff --git a/user_guide_src/source/installation/upgrade_localization.rst b/user_guide_src/source/installation/upgrade_localization.rst
new file mode 100644
index 000000000000..14c6f7099f44
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_localization.rst
@@ -0,0 +1,66 @@
+Upgrade Localization
+####################
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+Documentations
+==============
+
+- `Language Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/language.html>`_
+- `Localization Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/outgoing/localization.html>`_
+
+
+What has been changed
+=====================
+- In CI4 the language files return the language lines as array.
+
+Upgrade Guide
+=============
+1. Specify the default language in *Config/App.php*:::
+
+    public $defaultLocale = 'en';
+
+2. Now move your language files to ``app/Language/<locale>/``.
+3. After that you have to change the syntax within the language files. Below in the Code Example you will see how the language array within the file should look like.
+4. Remove from every file the language loader ``$this->lang->load($file, $lang);``.
+5. Replace the method to load the language line ``$this->lang->line('error_email_missing')`` with ``echo lang('Errors.errorEmailMissing');``.
+
+Code Example
+============
+
+Codeigniter Version 3.11
+------------------------
+::
+
+    $lang['error_email_missing'] = 'You must submit an email address';
+    $lang['error_url_missing'] = 'You must submit a URL';
+    $lang['error_username_missing'] = 'You must submit a username';
+
+    ...
+
+    $this->lang->load('error', $lang);
+    echo $this->lang->line('error_email_missing');
+
+Codeigniter Version 4.x
+-----------------------
+::
+
+    return [
+        'errorEmailMissing'    => 'You must submit an email address',
+        'errorURLMissing'      => 'You must submit a URL',
+        'errorUsernameMissing' => 'You must submit a username',
+        'nested'               => [
+            'error' => [
+                'message' => 'A specific error message',
+            ],
+        ],
+    ];
+
+    ...
+
+    echo lang('Errors.errorEmailMissing');
+
+
diff --git a/user_guide_src/source/installation/upgrade_pagination.rst b/user_guide_src/source/installation/upgrade_pagination.rst
new file mode 100644
index 000000000000..bb5ffedbc632
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_pagination.rst
@@ -0,0 +1,62 @@
+Upgrade Pagination
+##################
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+Documentations
+==============
+
+- `Pagination Class Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/pagination.html>`_
+- `Pagination Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/libraries/pagination.html>`_
+
+
+What has been changed
+=====================
+- In CI4 the pagination is a built-in method in the Model class. You have to change the views and also the controller in order to use the new pagination library.
+
+Upgrade Guide
+=============
+1. Within the views change to following:
+
+- ``<?php echo $this->pagination->create_links(); ?>`` to ``<?= $pager->links() ?>``
+
+2. Within the controller you have to make the following changes:
+
+- You can use the built-in ``paginate()`` method on every Model. Have a look at the code example below to see how you setup the pagination on a specific model.
+
+
+Code Example
+============
+
+Codeigniter Version 3.11
+------------------------
+::
+
+    $this->load->library('pagination');
+    $config['base_url'] = base_url().'users/index/';
+    $config['total_rows'] = $this->db->count_all('users');
+    $config['per_page'] = 10;
+    $config['uri_segment'] = 3;
+    $config['attributes'] = array('class' => 'pagination-link');
+    $this->pagination->initialize($config);
+
+    $data['users'] = $this->user_model->get_users(FALSE, $config['per_page'], $offset);
+
+    $this->load->view('posts/index', $data);
+
+Codeigniter Version 4.x
+-----------------------
+::
+
+    $model = new \App\Models\UserModel();
+
+    $data = [
+        'users' => $model->paginate(10),
+        'pager' => $model->pager,
+    ];
+
+    echo view('users/index', $data);
+
diff --git a/user_guide_src/source/installation/upgrade_responses.rst b/user_guide_src/source/installation/upgrade_responses.rst
new file mode 100644
index 000000000000..c0ba918cbb68
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_responses.rst
@@ -0,0 +1,47 @@
+Upgrade HTTP Responses
+######################
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+Documentations
+==============
+- `Output Class Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/output.html>`_
+- `HTTP Responses Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/outgoing/response.html>`_
+
+What has been changed
+=====================
+- The methods have been renamed
+
+Upgrade Guide
+=============
+1. The methods in the HTML Responses class are named slightly different. The most important change in the naming is the switch from underscored method names to camelCase. The method ``set_content_type()`` from version 3 is now named ``setContentType()`` and so on.
+2. In the most cases you have to change ``$this->output`` to ``$this->response`` followed by the method. You can find all methods `here <http://codeigniter.com/user_guide/outgoing/response.html>`_.
+
+Code Example
+============
+
+Codeigniter Version 3.11
+------------------------
+::
+
+    $this->output->set_status_header(404);
+
+    ...
+
+    $this->output
+        ->set_content_type('application/json')
+        ->set_output(json_encode(array('foo' => 'bar')));
+
+Codeigniter Version 4.x
+-----------------------
+::
+
+    $this->response->setStatusCode(404)
+               ->setBody($body);
+
+    ...
+
+    return $this->response->setJSON(['foo' => 'bar']);
diff --git a/user_guide_src/source/installation/upgrade_routing.rst b/user_guide_src/source/installation/upgrade_routing.rst
new file mode 100644
index 000000000000..575a0699561d
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_routing.rst
@@ -0,0 +1,77 @@
+Upgrade Routing
+##################
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+Documentations
+==============
+
+- `URI Routing Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/general/routing.html>`_
+- `URI Routing Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/incoming/routing.html>`_
+
+
+What has been changed
+=====================
+- In CI4 the routing is no longer configured by setting the routes as array.
+
+Upgrade Guide
+=============
+1. You have to change the syntax of each routing line and append it in ``app/Config/Routes.php``. For example:
+
+- ``$route['journals'] = 'blogs';`` to ``$routes->add('journals', 'App\Blogs');`` this would map to the ``index()`` method in the "Blogs" class.
+- ``$route['product/(:any)'] = 'catalog/product_lookup';`` to ``$routes->add('product/(:any)', 'Catalog::productLookup');``
+- ``$route['login/(.+)'] = 'auth/login/$1';`` to ``$routes->add('login/(.+)', 'Auth::login/$1');``
+
+Code Example
+============
+
+Codeigniter Version 3.11
+------------------------
+Path: ``application/config/routes.php``::
+
+    <?php
+    defined('BASEPATH') OR exit('No direct script access allowed');
+
+    $route['posts/index'] = 'posts/index';
+    $route['teams/create'] = 'teams/create';
+    $route['teams/update'] = 'teams/update';
+
+    $route['posts/create'] = 'posts/create';
+    $route['posts/update'] = 'posts/update';
+    $route['drivers/create'] = 'drivers/create';
+    $route['drivers/update'] = 'drivers/update';
+    $route['posts/(:any)'] = 'posts/view/$1';
+
+Codeigniter Version 4.x
+-----------------------
+Path: ``app/Config/Routes.php``::
+
+    <?php
+
+    namespace Config;
+
+    // Create a new instance of our RouteCollection class.
+    $routes = Services::routes();
+
+    // Load the system's routing file first, so that the app and ENVIRONMENT
+    // can override as needed.
+    if (file_exists(SYSTEMPATH . 'Config/Routes.php'))
+    {
+        require SYSTEMPATH . 'Config/Routes.php';
+    }
+
+    ...
+
+    $routes->add('posts', 'posts::index');
+    $routes->add('teams/create', 'teams::create');
+    $routes->add('teams/edit/(:any)', 'teams::edit/$1');
+
+    $routes->add('posts/create', 'posts::create');
+    $routes->add('posts/edit/(:any)', 'posts::edit/$1');
+    $routes->add('drivers/create', 'drivers::create');
+    $routes->add('drivers/edit/(:any)', 'drivers::edit/$1');
+    $routes->add('posts/(:any)', 'posts::view/$1');
+
diff --git a/user_guide_src/source/installation/upgrade_security.rst b/user_guide_src/source/installation/upgrade_security.rst
new file mode 100644
index 000000000000..88f4814ddb12
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_security.rst
@@ -0,0 +1,71 @@
+Upgrade Security
+################
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+Documentations
+==============
+
+- `Security Class Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/security.html>`_
+- `Security Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/libraries/security.html>`_
+
+.. note::
+    If you use the `form helper </user_guide/helpers/form_helper.html>`_, then form_open() will automatically insert a hidden csrf field in your forms. So you do not have to upgrade this by yourself.
+
+What has been changed
+=====================
+- The method to implement csrf tokens to html forms has been changed.
+
+Upgrade Guide
+=============
+1. To enable csrf protection in CI4 you have to enable it in ``app/Config/Filters.php``::
+
+    public $globals = [
+        'before' => [
+                //'honeypot'
+                'csrf'
+        ]
+    ];
+
+2. Within you html forms you have to remove the csrf input which looks similar to ``<input type="hidden" name="<?=$csrf['name'];?>" value="<?=$csrf['hash'];?>" />``.
+3. Now within your html forms you have to add ``<?= csrf_field() ?>`` somewhere in the form body, unless you are using `form_open()``.
+
+Code Example
+============
+
+Codeigniter Version 3.11
+------------------------
+::
+
+    $csrf = array(
+            'name' => $this->security->get_csrf_token_name(),
+            'hash' => $this->security->get_csrf_hash()
+    );
+
+    ...
+
+    <form>
+        <input name="name" type="text">
+        <input name="email" type="text">
+        <input name="password" type="password">
+
+        <input type="hidden" name="<?=$csrf['name'];?>" value="<?=$csrf['hash'];?>" />
+        <input type="submit" value="Save">
+    </form>
+
+Codeigniter Version 4.x
+-----------------------
+::
+
+    <form>
+        <input name="name" type="text">
+        <input name="email" type="text">
+        <input name="password" type="password">
+
+        <?= csrf_field() ?>
+        <input type="submit" value="Save">
+    </form>
+
diff --git a/user_guide_src/source/installation/upgrade_sessions.rst b/user_guide_src/source/installation/upgrade_sessions.rst
new file mode 100644
index 000000000000..e3d7b4da343b
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_sessions.rst
@@ -0,0 +1,53 @@
+Upgrade Sessions
+################
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+Documentations
+==============
+
+- `Session Library Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/sessions.html>`_
+- `Session Library Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/libraries/sessions.html>`_
+
+
+What has been changed
+=====================
+- Only small things like the method names and the loading of the library have changed.
+
+Upgrade Guide
+=============
+1. Wherever you use the Session Library replace ``$this->load->library('session');`` with ``$session = \Config\Services::session();``.
+2. From that on you have to replace every line starting with ``$this->session`` with ``$session`` followed by the new method name.
+
+- To access session data use the syntax ``$session->item`` or ``$session->get('item')`` instead of the CI3 syntax ``$this->session->name``.
+- To set data use ``$session->set($array);`` instead of ``$this->session->set_userdata($array);``.
+- To remove data use ``unset($_SESSION['some_name']);`` or ``$session->remove('some_name');`` instead of ``$this->session->unset_userdata('some_name');``.
+- To mark session data as flasdata, which will only be available for the next request, use ``$session->markAsFlashdata('item');`` instead of ``$this->session->mark_as_flash('item');```
+
+Code Example
+============
+
+Codeigniter Version 3.11
+------------------------
+::
+
+    $this->load->library('session');
+
+    $_SESSION['item'];
+    $this->session->item;
+    $this->session->userdata('item');
+
+Codeigniter Version 4.x
+-----------------------
+::
+
+    $session = \Config\Services::session();
+
+    $_SESSION['item'];
+    $session->get('item');
+    $session->item;
+    session('item');
+
diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
new file mode 100644
index 000000000000..020952a1d9c6
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_validations.rst
@@ -0,0 +1,159 @@
+Upgrade Validations
+###################
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+Documentations of Library
+=========================
+
+- `Form Validation Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/form_validation.html>`_
+- `Validation Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/libraries/validation.html>`_
+
+
+What has been changed
+=====================
+
+
+Upgrade Guide
+=============
+1. Within the view which contains the form you have to change:
+
+- ``<?php echo validation_errors(); ?>`` to ``<?= $validation->listErrors() ?>``
+- ``<?php echo form_open('form'); ?>`` to ``<?= form_open('form') ?>``
+
+2. Within the controller you have to change the following:
+
+- ``$this->load->helper(array('form', 'url'));`` to ``helper(['form', 'url']);``
+- remove the line ``$this->load->library('form_validation');``
+- ``if($this->form_validation->run() == FALSE)`` to ``if (! $this->validate([]))``
+- ``$this->load->view('myform');`` to ``echo view('myform', ['validation' => $this->validator,]);``
+
+3. You have to change the validation rules. The new syntax is to set the rules as array in the controller::
+
+    $input = $this->validate([
+        'name' => 'required|min_length[3]',
+        'email' => 'required|valid_email',
+        'phone' => 'required|numeric|max_length[10]'
+    ]);
+
+Code Example
+============
+
+Codeigniter Version 3.11
+------------------------
+Path: ``application/views``::
+
+    <html>
+    <head>
+        <title>My Form</title>
+    </head>
+    <body>
+
+        <?php echo validation_errors(); ?>
+
+        <?php echo form_open('form'); ?>
+
+        <h5>Username</h5>
+        <input type="text" name="username" value="" size="50" />
+
+        <h5>Password</h5>
+        <input type="text" name="password" value="" size="50" />
+
+        <h5>Password Confirm</h5>
+        <input type="text" name="passconf" value="" size="50" />
+
+        <h5>Email Address</h5>
+        <input type="text" name="email" value="" size="50" />
+
+        <div><input type="submit" value="Submit" /></div>
+
+        </form>
+
+    </body>
+    </html>
+
+Path: ``application/controllers/``::
+
+    <?php
+
+    class Form extends CI_Controller {
+
+            public function index()
+            {
+                    $this->load->helper(array('form', 'url'));
+
+                    $this->load->library('form_validation');
+
+                    if ($this->form_validation->run() == FALSE)
+                    {
+                            $this->load->view('myform');
+                    }
+                    else
+                    {
+                            $this->load->view('formsuccess');
+                    }
+            }
+    }
+
+Codeigniter Version 4.x
+-----------------------
+Path: ``app/Views``::
+
+    <html>
+    <head>
+        <title>My Form</title>
+    </head>
+    <body>
+
+        <?= $validation->listErrors() ?>
+
+        <?= form_open('form') ?>
+
+        <h5>Username</h5>
+        <input type="text" name="username" value="" size="50" />
+
+        <h5>Password</h5>
+        <input type="text" name="password" value="" size="50" />
+
+        <h5>Password Confirm</h5>
+        <input type="text" name="passconf" value="" size="50" />
+
+        <h5>Email Address</h5>
+        <input type="text" name="email" value="" size="50" />
+
+        <div><input type="submit" value="Submit" /></div>
+
+        </form>
+
+    </body>
+    </html>
+
+Path: ``app/Controllers/``::
+
+    <?php
+
+    namespace App\Controllers;
+
+    use CodeIgniter\Controller;
+
+    class Form extends Controller
+    {
+        public function index()
+        {
+            helper(['form', 'url']);
+
+            if (! $this->validate([]))
+            {
+                echo view('Signup', [
+                    'validation' => $this->validator,
+                ]);
+            }
+            else
+            {
+                echo view('Success');
+            }
+        }
+    }
\ No newline at end of file
diff --git a/user_guide_src/source/installation/upgrade_view_parser.rst b/user_guide_src/source/installation/upgrade_view_parser.rst
new file mode 100644
index 000000000000..3b23a4ea1d0b
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_view_parser.rst
@@ -0,0 +1,56 @@
+Upgrade View Parser
+###################
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+Documentations
+==============
+
+- `Template Parser Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/parser.html>`_
+- `View Parser Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/outgoing/view_parser.html>`_
+
+
+What has been changed
+=====================
+- You have to change the implementation and loading of the Parser Library.
+- The Views can copied from CI3. Usually no changes there are required.
+
+Upgrade Guide
+=============
+1. Wherever you use the View Parser Library replace ``$this->load->library('parser');`` with ``$parser = \Config\Services::parser();``.
+2. You have to change the render part in your controller from ``$this->parser->parse('blog_template', $data);`` to ``echo $parser->setData($data)->render('blog_template');``.
+
+Code Example
+============
+
+Codeigniter Version 3.11
+------------------------
+::
+
+    $this->load->library('parser');
+
+    $data = array(
+        'blog_title' => 'My Blog Title',
+        'blog_heading' => 'My Blog Heading'
+    );
+
+    $this->parser
+        ->parse('blog_template', $data);
+
+Codeigniter Version 4.x
+-----------------------
+::
+
+    $parser = \Config\Services::parser();
+
+    $data = [
+        'blog_title'   => 'My Blog Title',
+        'blog_heading' => 'My Blog Heading'
+    ];
+
+    echo $parser->setData($data)
+        ->render('blog_template');
+

From 446974f285e0dec3f221b80a34518d8463abb5ed Mon Sep 17 00:00:00 2001
From: Niklas Schmolke <niklas.schmolke@nexserv.de>
Date: Mon, 12 Apr 2021 17:27:11 +0200
Subject: [PATCH 0246/2325] Updated upgrade_migrations.rst

Signed-off-by: Niklas Schmolke <niklas.schmolke@nexserv.de>
---
 .../installation/upgrade_migrations.rst       | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/user_guide_src/source/installation/upgrade_migrations.rst b/user_guide_src/source/installation/upgrade_migrations.rst
index 2124a67d60b0..f21243a2b565 100644
--- a/user_guide_src/source/installation/upgrade_migrations.rst
+++ b/user_guide_src/source/installation/upgrade_migrations.rst
@@ -119,3 +119,22 @@ Path: ``app/Database/Migrations``::
             $this->forge->dropTable('blog');
         }
     }
+
+Search & Replace
+================
+
+You can use to following table to search & replace your old CI3 files.
+
++------------------------------+----------------------------+
+|  Search                      | Replace                    |
++==============================+============================+
+| extends CI_Migration         | extends Migration          |
++------------------------------+----------------------------+
+| $this->dbforge->add_field    | $this->forge->addField     |
++------------------------------+----------------------------+
+| $this->dbforge->add_key      | $this->forge->addKey       |
++------------------------------+----------------------------+
+| $this->dbforge->create_table | $this->forge->createTable  |
++------------------------------+----------------------------+
+| $this->dbforge->drop_table   | $this->forge->dropTable    |
++------------------------------+----------------------------+

From c9d969443ce2ea97d17b0d408818ad484bdebbb6 Mon Sep 17 00:00:00 2001
From: nschmolke <79579458+nschmolke@users.noreply.github.com>
Date: Wed, 14 Apr 2021 14:42:21 +0200
Subject: [PATCH 0247/2325] Apply suggestions from code review

Co-authored-by: Toto <totoprayogo1916@gmail.com>
---
 user_guide_src/source/installation/upgrade_database.rst     | 5 ++---
 user_guide_src/source/installation/upgrade_emails.rst       | 4 ++--
 user_guide_src/source/installation/upgrade_encryption.rst   | 2 +-
 user_guide_src/source/installation/upgrade_file_upload.rst  | 2 +-
 user_guide_src/source/installation/upgrade_html_tables.rst  | 2 +-
 user_guide_src/source/installation/upgrade_localization.rst | 3 +--
 user_guide_src/source/installation/upgrade_pagination.rst   | 3 +--
 user_guide_src/source/installation/upgrade_responses.rst    | 4 ++--
 user_guide_src/source/installation/upgrade_routing.rst      | 3 +--
 user_guide_src/source/installation/upgrade_security.rst     | 3 +--
 user_guide_src/source/installation/upgrade_sessions.rst     | 3 +--
 user_guide_src/source/installation/upgrade_validations.rst  | 4 ++--
 user_guide_src/source/installation/upgrade_view_parser.rst  | 3 +--
 13 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_database.rst b/user_guide_src/source/installation/upgrade_database.rst
index 2c6a05e987f5..3472aef4d69e 100644
--- a/user_guide_src/source/installation/upgrade_database.rst
+++ b/user_guide_src/source/installation/upgrade_database.rst
@@ -10,12 +10,12 @@ Documentations
 ==============
 
 - `Database Reference Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/database/index.html>`_
-- `Working with Databases Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/database/index.html>`_
+- :doc:`Working with Databases Documentation Codeigniter 4.X </database/index>`
 
 
 What has been changed
 =====================
-- The functionality in CI4 is basically the same as in CI4.
+- The functionality in CI3 is basically the same as in CI4.
 - The method names have changed to camelCase and the query builder now needs to be initialized before you can run queries on it.
 
 Upgrade Guide
@@ -65,4 +65,3 @@ Codeigniter Version 4.x
                  ->where('id', $id)
                  ->limit(10, 20)
                  ->get();
-
diff --git a/user_guide_src/source/installation/upgrade_emails.rst b/user_guide_src/source/installation/upgrade_emails.rst
index b0007289020e..0915948afabd 100644
--- a/user_guide_src/source/installation/upgrade_emails.rst
+++ b/user_guide_src/source/installation/upgrade_emails.rst
@@ -10,7 +10,7 @@ Documentations
 ==============
 
 - `Email Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/email.html>`_
-- `Email Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/outgoing/email.html>`_
+- :doc:`Email Documentation Codeigniter 4.X </libraries/email>`
 
 
 What has been changed
@@ -22,7 +22,7 @@ Upgrade Guide
 1. Within your class change the ``$this->load->library('email');`` to ``$email = \Config\Services::email();``.
 2. From that on you have to replace every line starting with ``$this->email`` to ``$email``.
 3. The methods in the Email class are named slightly different. All methods, except for ``send()``, ``attach()``, ``printDebugger()`` and ``clear()`` have a ``set`` as prefix followed by the previous method name. ``bcc()`` is now ``setBcc()`` and so on.
-4. The config attributes in ``app/Config/Email.php`` have changed. You should have a look at the `Email Class Documentation <http://codeigniter.com/user_guide/libraries/email.html#setting-email-preferences>`_ to have a list of the new attributes.
+4. The config attributes in ``app/Config/Email.php`` have changed. You should have a look at the `Email Class Documentation </libraries/email.html#setting-email-preferences>`__ to have a list of the new attributes.
 
 Code Example
 ============
diff --git a/user_guide_src/source/installation/upgrade_encryption.rst b/user_guide_src/source/installation/upgrade_encryption.rst
index ee1365cd5c42..4ca341017b5d 100644
--- a/user_guide_src/source/installation/upgrade_encryption.rst
+++ b/user_guide_src/source/installation/upgrade_encryption.rst
@@ -10,7 +10,7 @@ Documentations
 ==============
 
 - `Encryption Library Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/encryption.html>`_
-- `Encryption Service Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/libraries/encryption.html>`_
+- :doc:`Encryption Service Documentation Codeigniter 4.X </libraries/encryption>`
 
 
 What has been changed
diff --git a/user_guide_src/source/installation/upgrade_file_upload.rst b/user_guide_src/source/installation/upgrade_file_upload.rst
index 069164dd2f68..194c94374846 100644
--- a/user_guide_src/source/installation/upgrade_file_upload.rst
+++ b/user_guide_src/source/installation/upgrade_file_upload.rst
@@ -9,7 +9,7 @@ Upgrade Working with Uploaded Files
 Documentations
 ==============
 - `Output Class Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/file_uploading.html>`_
-- `Working with Uploaded Files Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/libraries/uploaded_files.html>`_
+- :doc:`Working with Uploaded Files Documentation Codeigniter 4.X </libraries/uploaded_files>`
 
 What has been changed
 =====================
diff --git a/user_guide_src/source/installation/upgrade_html_tables.rst b/user_guide_src/source/installation/upgrade_html_tables.rst
index 82d75f143584..f8563c0ca9a5 100644
--- a/user_guide_src/source/installation/upgrade_html_tables.rst
+++ b/user_guide_src/source/installation/upgrade_html_tables.rst
@@ -10,7 +10,7 @@ Documentations
 ==============
 
 - `HTML Table Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/table.html>`_
-- `HTML Table Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/outgoing/table.html>`_
+- :doc:`HTML Table Documentation Codeigniter 4.X </outgoing/table>`
 
 
 What has been changed
diff --git a/user_guide_src/source/installation/upgrade_localization.rst b/user_guide_src/source/installation/upgrade_localization.rst
index 14c6f7099f44..c6336ac700d9 100644
--- a/user_guide_src/source/installation/upgrade_localization.rst
+++ b/user_guide_src/source/installation/upgrade_localization.rst
@@ -10,7 +10,7 @@ Documentations
 ==============
 
 - `Language Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/language.html>`_
-- `Localization Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/outgoing/localization.html>`_
+- :doc:`Localization Documentation Codeigniter 4.X </outgoing/localization>`
 
 
 What has been changed
@@ -63,4 +63,3 @@ Codeigniter Version 4.x
 
     echo lang('Errors.errorEmailMissing');
 
-
diff --git a/user_guide_src/source/installation/upgrade_pagination.rst b/user_guide_src/source/installation/upgrade_pagination.rst
index bb5ffedbc632..a44240b8d4d5 100644
--- a/user_guide_src/source/installation/upgrade_pagination.rst
+++ b/user_guide_src/source/installation/upgrade_pagination.rst
@@ -10,7 +10,7 @@ Documentations
 ==============
 
 - `Pagination Class Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/pagination.html>`_
-- `Pagination Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/libraries/pagination.html>`_
+- :doc:`Pagination Documentation Codeigniter 4.X </libraries/pagination>`
 
 
 What has been changed
@@ -59,4 +59,3 @@ Codeigniter Version 4.x
     ];
 
     echo view('users/index', $data);
-
diff --git a/user_guide_src/source/installation/upgrade_responses.rst b/user_guide_src/source/installation/upgrade_responses.rst
index c0ba918cbb68..a8ea5961b279 100644
--- a/user_guide_src/source/installation/upgrade_responses.rst
+++ b/user_guide_src/source/installation/upgrade_responses.rst
@@ -9,7 +9,7 @@ Upgrade HTTP Responses
 Documentations
 ==============
 - `Output Class Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/output.html>`_
-- `HTTP Responses Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/outgoing/response.html>`_
+- :doc:`HTTP Responses Documentation Codeigniter 4.X </outgoing/response>`
 
 What has been changed
 =====================
@@ -18,7 +18,7 @@ What has been changed
 Upgrade Guide
 =============
 1. The methods in the HTML Responses class are named slightly different. The most important change in the naming is the switch from underscored method names to camelCase. The method ``set_content_type()`` from version 3 is now named ``setContentType()`` and so on.
-2. In the most cases you have to change ``$this->output`` to ``$this->response`` followed by the method. You can find all methods `here <http://codeigniter.com/user_guide/outgoing/response.html>`_.
+2. In the most cases you have to change ``$this->output`` to ``$this->response`` followed by the method. You can find all methods :doc:`here </outgoing/response>`.
 
 Code Example
 ============
diff --git a/user_guide_src/source/installation/upgrade_routing.rst b/user_guide_src/source/installation/upgrade_routing.rst
index 575a0699561d..3c55995d8a17 100644
--- a/user_guide_src/source/installation/upgrade_routing.rst
+++ b/user_guide_src/source/installation/upgrade_routing.rst
@@ -10,7 +10,7 @@ Documentations
 ==============
 
 - `URI Routing Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/general/routing.html>`_
-- `URI Routing Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/incoming/routing.html>`_
+- :doc:`URI Routing Documentation Codeigniter 4.X </incoming/routing>`
 
 
 What has been changed
@@ -74,4 +74,3 @@ Path: ``app/Config/Routes.php``::
     $routes->add('drivers/create', 'drivers::create');
     $routes->add('drivers/edit/(:any)', 'drivers::edit/$1');
     $routes->add('posts/(:any)', 'posts::view/$1');
-
diff --git a/user_guide_src/source/installation/upgrade_security.rst b/user_guide_src/source/installation/upgrade_security.rst
index 88f4814ddb12..e07331e8b752 100644
--- a/user_guide_src/source/installation/upgrade_security.rst
+++ b/user_guide_src/source/installation/upgrade_security.rst
@@ -10,7 +10,7 @@ Documentations
 ==============
 
 - `Security Class Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/security.html>`_
-- `Security Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/libraries/security.html>`_
+- :doc:`Security Documentation Codeigniter 4.X </libraries/security>`
 
 .. note::
     If you use the `form helper </user_guide/helpers/form_helper.html>`_, then form_open() will automatically insert a hidden csrf field in your forms. So you do not have to upgrade this by yourself.
@@ -68,4 +68,3 @@ Codeigniter Version 4.x
         <?= csrf_field() ?>
         <input type="submit" value="Save">
     </form>
-
diff --git a/user_guide_src/source/installation/upgrade_sessions.rst b/user_guide_src/source/installation/upgrade_sessions.rst
index e3d7b4da343b..77e25a6fd091 100644
--- a/user_guide_src/source/installation/upgrade_sessions.rst
+++ b/user_guide_src/source/installation/upgrade_sessions.rst
@@ -10,7 +10,7 @@ Documentations
 ==============
 
 - `Session Library Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/sessions.html>`_
-- `Session Library Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/libraries/sessions.html>`_
+- :doc:`Session Library Documentation Codeigniter 4.X </libraries/sessions>`
 
 
 What has been changed
@@ -50,4 +50,3 @@ Codeigniter Version 4.x
     $session->get('item');
     $session->item;
     session('item');
-
diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
index 020952a1d9c6..b0e58106d9f4 100644
--- a/user_guide_src/source/installation/upgrade_validations.rst
+++ b/user_guide_src/source/installation/upgrade_validations.rst
@@ -10,7 +10,7 @@ Documentations of Library
 =========================
 
 - `Form Validation Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/form_validation.html>`_
-- `Validation Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/libraries/validation.html>`_
+- :doc:`Validation Documentation Codeigniter 4.X </libraries/validation>`
 
 
 What has been changed
@@ -156,4 +156,4 @@ Path: ``app/Controllers/``::
                 echo view('Success');
             }
         }
-    }
\ No newline at end of file
+    }
diff --git a/user_guide_src/source/installation/upgrade_view_parser.rst b/user_guide_src/source/installation/upgrade_view_parser.rst
index 3b23a4ea1d0b..b6c335fd3df5 100644
--- a/user_guide_src/source/installation/upgrade_view_parser.rst
+++ b/user_guide_src/source/installation/upgrade_view_parser.rst
@@ -10,7 +10,7 @@ Documentations
 ==============
 
 - `Template Parser Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/parser.html>`_
-- `View Parser Documentation Codeigniter 4.X <http://codeigniter.com/user_guide/outgoing/view_parser.html>`_
+- :doc:`View Parser Documentation Codeigniter 4.X </outgoing/view_parser>`
 
 
 What has been changed
@@ -53,4 +53,3 @@ Codeigniter Version 4.x
 
     echo $parser->setData($data)
         ->render('blog_template');
-

From 6192271268eedaac022f02f18a2dc5e1cd48427a Mon Sep 17 00:00:00 2001
From: nschmolke <79579458+nschmolke@users.noreply.github.com>
Date: Mon, 19 Apr 2021 14:15:34 +0200
Subject: [PATCH 0248/2325] Apply suggestions from code review

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 user_guide_src/source/installation/upgrade_file_upload.rst  | 4 ++--
 user_guide_src/source/installation/upgrade_localization.rst | 3 ++-
 user_guide_src/source/installation/upgrade_security.rst     | 4 ++--
 user_guide_src/source/installation/upgrade_validations.rst  | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_file_upload.rst b/user_guide_src/source/installation/upgrade_file_upload.rst
index 194c94374846..2bfbd99765fa 100644
--- a/user_guide_src/source/installation/upgrade_file_upload.rst
+++ b/user_guide_src/source/installation/upgrade_file_upload.rst
@@ -47,7 +47,7 @@ Codeigniter Version 3.11
             public function do_upload()
             {
                     $config['upload_path']          = './uploads/';
-                    $config['allowed_types']        = 'gif|jpg|png';
+                    $config['allowed_types']        = 'png|jpg|gif';
                     $config['max_size']             = 100;
                     $config['max_width']            = 1024;
                     $config['max_height']           = 768;
@@ -88,7 +88,7 @@ Codeigniter Version 4.x
             public function do_upload()
             {
                     $this->validate([
-                        'userfile' => 'uploaded[userfile]|max_size[userfile,1024]|mime_in[userfile,image/png,image/jpg,image/gif]|max_dims[userfile,1024,768]'
+                        'userfile' => 'uploaded[userfile]|max_size[userfile,100]|mime_in[userfile,image/png,image/jpg,image/gif]|ext_in[userfile,png,jpg,gif]|max_dims[userfile,1024,768]'
                     ]);
 
                     $file = $this->request->getFile('userfile');
diff --git a/user_guide_src/source/installation/upgrade_localization.rst b/user_guide_src/source/installation/upgrade_localization.rst
index c6336ac700d9..5c6125851a92 100644
--- a/user_guide_src/source/installation/upgrade_localization.rst
+++ b/user_guide_src/source/installation/upgrade_localization.rst
@@ -35,6 +35,7 @@ Codeigniter Version 3.11
 ------------------------
 ::
 
+    // error.php
     $lang['error_email_missing'] = 'You must submit an email address';
     $lang['error_url_missing'] = 'You must submit a URL';
     $lang['error_username_missing'] = 'You must submit a username';
@@ -48,6 +49,7 @@ Codeigniter Version 4.x
 -----------------------
 ::
 
+    // Errors.php
     return [
         'errorEmailMissing'    => 'You must submit an email address',
         'errorURLMissing'      => 'You must submit a URL',
@@ -62,4 +64,3 @@ Codeigniter Version 4.x
     ...
 
     echo lang('Errors.errorEmailMissing');
-
diff --git a/user_guide_src/source/installation/upgrade_security.rst b/user_guide_src/source/installation/upgrade_security.rst
index e07331e8b752..7b8f51d4fbc0 100644
--- a/user_guide_src/source/installation/upgrade_security.rst
+++ b/user_guide_src/source/installation/upgrade_security.rst
@@ -30,7 +30,7 @@ Upgrade Guide
         ]
     ];
 
-2. Within you html forms you have to remove the csrf input which looks similar to ``<input type="hidden" name="<?=$csrf['name'];?>" value="<?=$csrf['hash'];?>" />``.
+2. Within you html forms you have to remove the csrf input which looks similar to ``<input type="hidden" name="<?= $csrf['name'] ?>" value="<?= $csrf['hash'] ?>" />``.
 3. Now within your html forms you have to add ``<?= csrf_field() ?>`` somewhere in the form body, unless you are using `form_open()``.
 
 Code Example
@@ -52,7 +52,7 @@ Codeigniter Version 3.11
         <input name="email" type="text">
         <input name="password" type="password">
 
-        <input type="hidden" name="<?=$csrf['name'];?>" value="<?=$csrf['hash'];?>" />
+        <input type="hidden" name="<?= $csrf['name'] ?>" value="<?= $csrf['hash'] ?>" />
         <input type="submit" value="Save">
     </form>
 
diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
index b0e58106d9f4..44a7a9bd1e31 100644
--- a/user_guide_src/source/installation/upgrade_validations.rst
+++ b/user_guide_src/source/installation/upgrade_validations.rst
@@ -147,13 +147,13 @@ Path: ``app/Controllers/``::
 
             if (! $this->validate([]))
             {
-                echo view('Signup', [
+                echo view('myform', [
                     'validation' => $this->validator,
                 ]);
             }
             else
             {
-                echo view('Success');
+                echo view('formsuccess');
             }
         }
     }

From e492274c4187e1f85d02b1d82639ac48cc3098ec Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Tue, 29 Jun 2021 23:46:37 -0500
Subject: [PATCH 0249/2325] Using common helper methods in place of fully
 qualified Service calls.

---
 user_guide_src/source/installation/upgrade_database.rst    | 4 ++--
 user_guide_src/source/installation/upgrade_emails.rst      | 4 ++--
 user_guide_src/source/installation/upgrade_encryption.rst  | 4 ++--
 user_guide_src/source/installation/upgrade_sessions.rst    | 4 ++--
 user_guide_src/source/installation/upgrade_view_parser.rst | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_database.rst b/user_guide_src/source/installation/upgrade_database.rst
index 3472aef4d69e..0ebc8f75277f 100644
--- a/user_guide_src/source/installation/upgrade_database.rst
+++ b/user_guide_src/source/installation/upgrade_database.rst
@@ -21,8 +21,8 @@ What has been changed
 Upgrade Guide
 =============
 1. Add your database credentials to ``app/Config/Database.php``. The options are pretty much the same as in CI3 only some names have changed slightly.
-2. Everywhere you have used the database you have to replace ``$this->load->database();`` with ``$db = \Config\Database::connect();``.
-3. If you use multiple databases use the following code to load additional databases ``$db = \Config\Database::connect('group_name');``.
+2. Everywhere you have used the database you have to replace ``$this->load->database();`` with ``$db = db_connect();``.
+3. If you use multiple databases use the following code to load additional databases ``$db = db_connect('group_name');``.
 4. Now you have to change all database queries. The most important change here is to replace ``$this->db`` with just ``$db`` and adjust the method name and ``$db``. Here are some examples:
 
 - ``$this->db->query('YOUR QUERY HERE');`` to ``$db->query('YOUR QUERY HERE');``
diff --git a/user_guide_src/source/installation/upgrade_emails.rst b/user_guide_src/source/installation/upgrade_emails.rst
index 0915948afabd..1a65f279cfa7 100644
--- a/user_guide_src/source/installation/upgrade_emails.rst
+++ b/user_guide_src/source/installation/upgrade_emails.rst
@@ -19,7 +19,7 @@ What has been changed
 
 Upgrade Guide
 =============
-1. Within your class change the ``$this->load->library('email');`` to ``$email = \Config\Services::email();``.
+1. Within your class change the ``$this->load->library('email');`` to ``$email = service('email');``.
 2. From that on you have to replace every line starting with ``$this->email`` to ``$email``.
 3. The methods in the Email class are named slightly different. All methods, except for ``send()``, ``attach()``, ``printDebugger()`` and ``clear()`` have a ``set`` as prefix followed by the previous method name. ``bcc()`` is now ``setBcc()`` and so on.
 4. The config attributes in ``app/Config/Email.php`` have changed. You should have a look at the `Email Class Documentation </libraries/email.html#setting-email-preferences>`__ to have a list of the new attributes.
@@ -47,7 +47,7 @@ Codeigniter Version 4.x
 -----------------------
 ::
 
-    $email = \Config\Services::email();
+    $email = service('email');
 
     $email->setFrom('your@example.com', 'Your Name');
     $email->setTo('someone@example.com');
diff --git a/user_guide_src/source/installation/upgrade_encryption.rst b/user_guide_src/source/installation/upgrade_encryption.rst
index 4ca341017b5d..7dadbba63e85 100644
--- a/user_guide_src/source/installation/upgrade_encryption.rst
+++ b/user_guide_src/source/installation/upgrade_encryption.rst
@@ -20,7 +20,7 @@ What has been changed
 Upgrade Guide
 =============
 1. Within your configs the ``$config['encryption_key'] = 'abc123';`` moved from ``application/config/config.php`` to ``public $key = 'abc123';`` in ``app/Config/Encryption.php``.
-2. Wherever you have used the encryption library you have to replace ``$this->load->library('encryption');`` with ``$encrypter = \Config\Services::encrypter();`` and change the methods for encryption and decrypting like in the following code example.
+2. Wherever you have used the encryption library you have to replace ``$this->load->library('encryption');`` with ``$encrypter = service('encrypter');`` and change the methods for encryption and decrypting like in the following code example.
 
 Code Example
 ============
@@ -42,7 +42,7 @@ Codeigniter Version 4.x
 -----------------------
 ::
 
-    $encrypter = \Config\Services::encrypter();
+    $encrypter = service('encrypter');
 
     $plainText = 'This is a plain-text message!';
     $ciphertext = $encrypter->encrypt($plainText);
diff --git a/user_guide_src/source/installation/upgrade_sessions.rst b/user_guide_src/source/installation/upgrade_sessions.rst
index 77e25a6fd091..84757dbfd665 100644
--- a/user_guide_src/source/installation/upgrade_sessions.rst
+++ b/user_guide_src/source/installation/upgrade_sessions.rst
@@ -19,7 +19,7 @@ What has been changed
 
 Upgrade Guide
 =============
-1. Wherever you use the Session Library replace ``$this->load->library('session');`` with ``$session = \Config\Services::session();``.
+1. Wherever you use the Session Library replace ``$this->load->library('session');`` with ``$session = session();``.
 2. From that on you have to replace every line starting with ``$this->session`` with ``$session`` followed by the new method name.
 
 - To access session data use the syntax ``$session->item`` or ``$session->get('item')`` instead of the CI3 syntax ``$this->session->name``.
@@ -44,7 +44,7 @@ Codeigniter Version 4.x
 -----------------------
 ::
 
-    $session = \Config\Services::session();
+    $session = session();
 
     $_SESSION['item'];
     $session->get('item');
diff --git a/user_guide_src/source/installation/upgrade_view_parser.rst b/user_guide_src/source/installation/upgrade_view_parser.rst
index b6c335fd3df5..f3147bbcd6fd 100644
--- a/user_guide_src/source/installation/upgrade_view_parser.rst
+++ b/user_guide_src/source/installation/upgrade_view_parser.rst
@@ -20,7 +20,7 @@ What has been changed
 
 Upgrade Guide
 =============
-1. Wherever you use the View Parser Library replace ``$this->load->library('parser');`` with ``$parser = \Config\Services::parser();``.
+1. Wherever you use the View Parser Library replace ``$this->load->library('parser');`` with ``$parser = service('parser');``.
 2. You have to change the render part in your controller from ``$this->parser->parse('blog_template', $data);`` to ``echo $parser->setData($data)->render('blog_template');``.
 
 Code Example
@@ -44,7 +44,7 @@ Codeigniter Version 4.x
 -----------------------
 ::
 
-    $parser = \Config\Services::parser();
+    $parser = service('parser');
 
     $data = [
         'blog_title'   => 'My Blog Title',

From 24ed44417d6f4d42e125a21753b2cdd1540b3595 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 12:19:29 +0900
Subject: [PATCH 0250/2325] docs: fix indentation of lists

---
 .../source/installation/upgrade_migrations.rst       |  8 ++++----
 .../source/installation/upgrade_pagination.rst       |  4 ++--
 .../source/installation/upgrade_validations.rst      | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_migrations.rst b/user_guide_src/source/installation/upgrade_migrations.rst
index f21243a2b565..13a0082ff983 100644
--- a/user_guide_src/source/installation/upgrade_migrations.rst
+++ b/user_guide_src/source/installation/upgrade_migrations.rst
@@ -30,10 +30,10 @@ Upgrade Guide
 6. Replace ``extends CI_Migration`` with ``extends Migration``.
 7. The method names within the ``Forge`` class has been changed to use camelCase. For example:
 
-- ``$this->dbforge->add_field`` to ``$this->forge->addField``
-- ``$this->dbforge->add_key`` to ``$this->forge->addKey``
-- ``$this->dbforge->create_table`` to ``$this->forge->addTable``
-- ``$this->dbforge->drop_table`` to ``$this->forge->addTable``
+    - ``$this->dbforge->add_field`` to ``$this->forge->addField``
+    - ``$this->dbforge->add_key`` to ``$this->forge->addKey``
+    - ``$this->dbforge->create_table`` to ``$this->forge->addTable``
+    - ``$this->dbforge->drop_table`` to ``$this->forge->addTable``
 
 8. (optional) You can change the array syntax from ``array(...)`` to ``[...]``
 
diff --git a/user_guide_src/source/installation/upgrade_pagination.rst b/user_guide_src/source/installation/upgrade_pagination.rst
index a44240b8d4d5..29fa4f968633 100644
--- a/user_guide_src/source/installation/upgrade_pagination.rst
+++ b/user_guide_src/source/installation/upgrade_pagination.rst
@@ -21,11 +21,11 @@ Upgrade Guide
 =============
 1. Within the views change to following:
 
-- ``<?php echo $this->pagination->create_links(); ?>`` to ``<?= $pager->links() ?>``
+    - ``<?php echo $this->pagination->create_links(); ?>`` to ``<?= $pager->links() ?>``
 
 2. Within the controller you have to make the following changes:
 
-- You can use the built-in ``paginate()`` method on every Model. Have a look at the code example below to see how you setup the pagination on a specific model.
+    - You can use the built-in ``paginate()`` method on every Model. Have a look at the code example below to see how you setup the pagination on a specific model.
 
 
 Code Example
diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
index 44a7a9bd1e31..da04af513351 100644
--- a/user_guide_src/source/installation/upgrade_validations.rst
+++ b/user_guide_src/source/installation/upgrade_validations.rst
@@ -21,15 +21,15 @@ Upgrade Guide
 =============
 1. Within the view which contains the form you have to change:
 
-- ``<?php echo validation_errors(); ?>`` to ``<?= $validation->listErrors() ?>``
-- ``<?php echo form_open('form'); ?>`` to ``<?= form_open('form') ?>``
+    - ``<?php echo validation_errors(); ?>`` to ``<?= $validation->listErrors() ?>``
+    - ``<?php echo form_open('form'); ?>`` to ``<?= form_open('form') ?>``
 
 2. Within the controller you have to change the following:
 
-- ``$this->load->helper(array('form', 'url'));`` to ``helper(['form', 'url']);``
-- remove the line ``$this->load->library('form_validation');``
-- ``if($this->form_validation->run() == FALSE)`` to ``if (! $this->validate([]))``
-- ``$this->load->view('myform');`` to ``echo view('myform', ['validation' => $this->validator,]);``
+    - ``$this->load->helper(array('form', 'url'));`` to ``helper(['form', 'url']);``
+    - remove the line ``$this->load->library('form_validation');``
+    - ``if($this->form_validation->run() == FALSE)`` to ``if (! $this->validate([]))``
+    - ``$this->load->view('myform');`` to ``echo view('myform', ['validation' => $this->validator,]);``
 
 3. You have to change the validation rules. The new syntax is to set the rules as array in the controller::
 

From a407185d98b74d3059ebafe6b18003787da65b7f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 12:19:54 +0900
Subject: [PATCH 0251/2325] docs: add links to each upgrade page

---
 .../source/installation/upgrade_4xx.rst           | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst
index 676e76110306..dcf19217b277 100644
--- a/user_guide_src/source/installation/upgrade_4xx.rst
+++ b/user_guide_src/source/installation/upgrade_4xx.rst
@@ -134,8 +134,21 @@ Upgrading Libraries
 .. toctree::
     :titlesonly:
 
-    upgrade_migrations
     upgrade_configuration
+    upgrade_database
+    upgrade_emails
+    upgrade_encryption
+    upgrade_file_upload
+    upgrade_html_tables
+    upgrade_localization
+    upgrade_migrations
+    upgrade_pagination
+    upgrade_responses
+    upgrade_routing
+    upgrade_security
+    upgrade_sessions
+    upgrade_validations
+    upgrade_view_parser
 
 .. note::
     More upgrade guides coming soon

From a5ff5a7ea7dae0c1f633ab75d9f9d2c2886e67e7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 12:21:05 +0900
Subject: [PATCH 0252/2325] docs: replace HTML with HTTP

https://github.com/codeigniter4/CodeIgniter4/pull/4565#discussion_r633463661
---
 user_guide_src/source/installation/upgrade_responses.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/installation/upgrade_responses.rst b/user_guide_src/source/installation/upgrade_responses.rst
index a8ea5961b279..15cf10aae0a7 100644
--- a/user_guide_src/source/installation/upgrade_responses.rst
+++ b/user_guide_src/source/installation/upgrade_responses.rst
@@ -17,7 +17,7 @@ What has been changed
 
 Upgrade Guide
 =============
-1. The methods in the HTML Responses class are named slightly different. The most important change in the naming is the switch from underscored method names to camelCase. The method ``set_content_type()`` from version 3 is now named ``setContentType()`` and so on.
+1. The methods in the HTTP Responses class are named slightly different. The most important change in the naming is the switch from underscored method names to camelCase. The method ``set_content_type()`` from version 3 is now named ``setContentType()`` and so on.
 2. In the most cases you have to change ``$this->output`` to ``$this->response`` followed by the method. You can find all methods :doc:`here </outgoing/response>`.
 
 Code Example

From c04075456e0cd3c0f8429143f5941a4985ca76df Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 12:26:10 +0900
Subject: [PATCH 0253/2325] docs: remove unneeded code

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

diff --git a/user_guide_src/source/installation/upgrade_responses.rst b/user_guide_src/source/installation/upgrade_responses.rst
index 15cf10aae0a7..6b5cc1b4ef7b 100644
--- a/user_guide_src/source/installation/upgrade_responses.rst
+++ b/user_guide_src/source/installation/upgrade_responses.rst
@@ -39,8 +39,7 @@ Codeigniter Version 4.x
 -----------------------
 ::
 
-    $this->response->setStatusCode(404)
-               ->setBody($body);
+    $this->response->setStatusCode(404);
 
     ...
 

From afb1832a2602e1efa5dcd75fe5401e13e4ae0e71 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 13:19:10 +0900
Subject: [PATCH 0254/2325] docs: remove unneeded change instruction

---
 user_guide_src/source/installation/upgrade_validations.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
index da04af513351..b518e4fd8b36 100644
--- a/user_guide_src/source/installation/upgrade_validations.rst
+++ b/user_guide_src/source/installation/upgrade_validations.rst
@@ -22,7 +22,6 @@ Upgrade Guide
 1. Within the view which contains the form you have to change:
 
     - ``<?php echo validation_errors(); ?>`` to ``<?= $validation->listErrors() ?>``
-    - ``<?php echo form_open('form'); ?>`` to ``<?= form_open('form') ?>``
 
 2. Within the controller you have to change the following:
 

From e9669b7fd59c6f1a616625a0c366e8b9015afe1a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 13:20:37 +0900
Subject: [PATCH 0255/2325] docs: fix coding style

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

diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
index b518e4fd8b36..e5029a1b012e 100644
--- a/user_guide_src/source/installation/upgrade_validations.rst
+++ b/user_guide_src/source/installation/upgrade_validations.rst
@@ -27,7 +27,7 @@ Upgrade Guide
 
     - ``$this->load->helper(array('form', 'url'));`` to ``helper(['form', 'url']);``
     - remove the line ``$this->load->library('form_validation');``
-    - ``if($this->form_validation->run() == FALSE)`` to ``if (! $this->validate([]))``
+    - ``if ($this->form_validation->run() == FALSE)`` to ``if (! $this->validate([]))``
     - ``$this->load->view('myform');`` to ``echo view('myform', ['validation' => $this->validator,]);``
 
 3. You have to change the validation rules. The new syntax is to set the rules as array in the controller::

From f0b4ba4e91ea64737b77670ef7c61490d02ea638 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 13:28:30 +0900
Subject: [PATCH 0256/2325] docs: add about validation rule setting

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

diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
index e5029a1b012e..d498da5eaedc 100644
--- a/user_guide_src/source/installation/upgrade_validations.rst
+++ b/user_guide_src/source/installation/upgrade_validations.rst
@@ -86,6 +86,8 @@ Path: ``application/controllers/``::
 
                     $this->load->library('form_validation');
 
+                    // Set validation rules
+
                     if ($this->form_validation->run() == FALSE)
                     {
                             $this->load->view('myform');
@@ -144,8 +146,9 @@ Path: ``app/Controllers/``::
         {
             helper(['form', 'url']);
 
-            if (! $this->validate([]))
-            {
+            if (! $this->validate([
+                // Validation rules
+            ])) {
                 echo view('myform', [
                     'validation' => $this->validator,
                 ]);

From 2479e2d36570ccb0f45b7defe164424829f7e86d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 13:29:43 +0900
Subject: [PATCH 0257/2325] docs: rename variable to more appropriate name

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

diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
index d498da5eaedc..3dddcf177ff1 100644
--- a/user_guide_src/source/installation/upgrade_validations.rst
+++ b/user_guide_src/source/installation/upgrade_validations.rst
@@ -32,8 +32,8 @@ Upgrade Guide
 
 3. You have to change the validation rules. The new syntax is to set the rules as array in the controller::
 
-    $input = $this->validate([
         'name' => 'required|min_length[3]',
+    $isValid = $this->validate([
         'email' => 'required|valid_email',
         'phone' => 'required|numeric|max_length[10]'
     ]);

From 3b02a1e0d2d86d3c4c83a400e1f9163fe37ad42d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 13:31:24 +0900
Subject: [PATCH 0258/2325] docs: fix coding style

---
 user_guide_src/source/installation/upgrade_validations.rst | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
index 3dddcf177ff1..f26cd53d1b5a 100644
--- a/user_guide_src/source/installation/upgrade_validations.rst
+++ b/user_guide_src/source/installation/upgrade_validations.rst
@@ -32,8 +32,8 @@ Upgrade Guide
 
 3. You have to change the validation rules. The new syntax is to set the rules as array in the controller::
 
-        'name' => 'required|min_length[3]',
     $isValid = $this->validate([
+        'name'  => 'required|min_length[3]',
         'email' => 'required|valid_email',
         'phone' => 'required|numeric|max_length[10]'
     ]);
@@ -152,9 +152,7 @@ Path: ``app/Controllers/``::
                 echo view('myform', [
                     'validation' => $this->validator,
                 ]);
-            }
-            else
-            {
+            } else {
                 echo view('formsuccess');
             }
         }

From 9af8a8952cc5bfed67e70f98f4e7d61effbe34d5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 13:39:06 +0900
Subject: [PATCH 0259/2325] docs: fix and add "What has been changed"

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

diff --git a/user_guide_src/source/installation/upgrade_pagination.rst b/user_guide_src/source/installation/upgrade_pagination.rst
index 29fa4f968633..012e0c6b7544 100644
--- a/user_guide_src/source/installation/upgrade_pagination.rst
+++ b/user_guide_src/source/installation/upgrade_pagination.rst
@@ -15,7 +15,10 @@ Documentations
 
 What has been changed
 =====================
-- In CI4 the pagination is a built-in method in the Model class. You have to change the views and also the controller in order to use the new pagination library.
+- You have to change the views and also the controller in order to use the new pagination library.
+- If you want to customize the pagination links, you need to create View Templates.
+- In CI4 the pagination uses the actual page number only. You can't use the starting index (offset) for the items which is the default in CI3.
+- If you use ``CodeIgniter\Model``, you can use the built-in method in the Model class.
 
 Upgrade Guide
 =============

From be5f610970692e3fcd358429465f81ee2a64c5d2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 13:46:54 +0900
Subject: [PATCH 0260/2325] docs: add link to CodeIgniter\Model

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

diff --git a/user_guide_src/source/installation/upgrade_pagination.rst b/user_guide_src/source/installation/upgrade_pagination.rst
index 012e0c6b7544..8151e82465e5 100644
--- a/user_guide_src/source/installation/upgrade_pagination.rst
+++ b/user_guide_src/source/installation/upgrade_pagination.rst
@@ -18,7 +18,7 @@ What has been changed
 - You have to change the views and also the controller in order to use the new pagination library.
 - If you want to customize the pagination links, you need to create View Templates.
 - In CI4 the pagination uses the actual page number only. You can't use the starting index (offset) for the items which is the default in CI3.
-- If you use ``CodeIgniter\Model``, you can use the built-in method in the Model class.
+- If you use :doc:`CodeIgnite\\Model </models/model>`, you can use the built-in method in the Model class.
 
 Upgrade Guide
 =============

From 81658aaa77f84250c3524c3bdb6bb3fbe96fe061 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 13:47:38 +0900
Subject: [PATCH 0261/2325] docs: fix coding style

---
 user_guide_src/source/installation/upgrade_routing.rst  | 3 +--
 user_guide_src/source/installation/upgrade_security.rst | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_routing.rst b/user_guide_src/source/installation/upgrade_routing.rst
index 3c55995d8a17..4b30b24f7f2c 100644
--- a/user_guide_src/source/installation/upgrade_routing.rst
+++ b/user_guide_src/source/installation/upgrade_routing.rst
@@ -58,8 +58,7 @@ Path: ``app/Config/Routes.php``::
 
     // Load the system's routing file first, so that the app and ENVIRONMENT
     // can override as needed.
-    if (file_exists(SYSTEMPATH . 'Config/Routes.php'))
-    {
+    if (file_exists(SYSTEMPATH . 'Config/Routes.php')) {
         require SYSTEMPATH . 'Config/Routes.php';
     }
 
diff --git a/user_guide_src/source/installation/upgrade_security.rst b/user_guide_src/source/installation/upgrade_security.rst
index 7b8f51d4fbc0..d272a7609236 100644
--- a/user_guide_src/source/installation/upgrade_security.rst
+++ b/user_guide_src/source/installation/upgrade_security.rst
@@ -25,8 +25,8 @@ Upgrade Guide
 
     public $globals = [
         'before' => [
-                //'honeypot'
-                'csrf'
+                //'honeypot',
+                'csrf',
         ]
     ];
 
@@ -41,8 +41,8 @@ Codeigniter Version 3.11
 ::
 
     $csrf = array(
-            'name' => $this->security->get_csrf_token_name(),
-            'hash' => $this->security->get_csrf_hash()
+        'name' => $this->security->get_csrf_token_name(),
+        'hash' => $this->security->get_csrf_hash()
     );
 
     ...

From a8380fa724021e977b1104ca937cb99bbbe30146 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 13:47:53 +0900
Subject: [PATCH 0262/2325] docs: add "What has been changed"

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

diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
index f26cd53d1b5a..d3301c4cb37f 100644
--- a/user_guide_src/source/installation/upgrade_validations.rst
+++ b/user_guide_src/source/installation/upgrade_validations.rst
@@ -15,7 +15,10 @@ Documentations of Library
 
 What has been changed
 =====================
-
+- If you want to change validation error display, you have to set CI4 validation View templates.
+- CI4 validation has no Callbacks nor Callable in CI3.
+- CI4 validation format rules do not permit empty string.
+- CI4 validation never changes your data.
 
 Upgrade Guide
 =============

From 1f74b171e76ab6564b54f87cffe48a0d718f32f8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 13:49:17 +0900
Subject: [PATCH 0263/2325] docs: fix coding style

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

diff --git a/user_guide_src/source/installation/upgrade_security.rst b/user_guide_src/source/installation/upgrade_security.rst
index d272a7609236..d72de56f334f 100644
--- a/user_guide_src/source/installation/upgrade_security.rst
+++ b/user_guide_src/source/installation/upgrade_security.rst
@@ -25,8 +25,8 @@ Upgrade Guide
 
     public $globals = [
         'before' => [
-                //'honeypot',
-                'csrf',
+            //'honeypot',
+            'csrf',
         ]
     ];
 

From 1a7ec9bfb66859060a5c80d92f29cb5d192e6d06 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 14:05:39 +0900
Subject: [PATCH 0264/2325] docs: fix indentation of lists

---
 .../source/installation/upgrade_database.rst  | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_database.rst b/user_guide_src/source/installation/upgrade_database.rst
index 0ebc8f75277f..798b24a1c6c0 100644
--- a/user_guide_src/source/installation/upgrade_database.rst
+++ b/user_guide_src/source/installation/upgrade_database.rst
@@ -25,22 +25,22 @@ Upgrade Guide
 3. If you use multiple databases use the following code to load additional databases ``$db = db_connect('group_name');``.
 4. Now you have to change all database queries. The most important change here is to replace ``$this->db`` with just ``$db`` and adjust the method name and ``$db``. Here are some examples:
 
-- ``$this->db->query('YOUR QUERY HERE');`` to ``$db->query('YOUR QUERY HERE');``
-- ``$this->db->simple_query('YOUR QUERY')`` to ``$db->simpleQuery('YOUR QUERY')``
-- ``$this->db->escape("something")`` to ``$db->escape("something");``
-- ``$this->db->affected_rows();`` to ``$db->affectedRows();``
-- ``$query->result();`` to ``$query->getResult();``
-- ``$query->result_array();`` to ``$query->getResultArray();``
-- ``echo $this->db->count_all('my_table');`` to ``echo $db->table('my_table')->countAll();``
+    - ``$this->db->query('YOUR QUERY HERE');`` to ``$db->query('YOUR QUERY HERE');``
+    - ``$this->db->simple_query('YOUR QUERY')`` to ``$db->simpleQuery('YOUR QUERY')``
+    - ``$this->db->escape("something")`` to ``$db->escape("something");``
+    - ``$this->db->affected_rows();`` to ``$db->affectedRows();``
+    - ``$query->result();`` to ``$query->getResult();``
+    - ``$query->result_array();`` to ``$query->getResultArray();``
+    - ``echo $this->db->count_all('my_table');`` to ``echo $db->table('my_table')->countAll();``
 
 5. To use the new Query Builder Class you have to initialize the builder ``$builder = $db->table('mytable');`` after that you can run the queries on the ``$builder``. Here are some examples:
 
-- ``$this->db->get()`` to ``$builder->get();``
-- ``$this->db->get_where('mytable', array('id' => $id), $limit, $offset);`` to ``$builder->getWhere(['id' => $id], $limit, $offset);``
-- ``$this->db->select('title, content, date');`` to ``$builder->select('title, content, date');``
-- ``$this->db->select_max('age');`` to ``$builder->selectMax('age');``
-- ``$this->db->join('comments', 'comments.id = blogs.id');`` to ``$builder->join('comments', 'comments.id = blogs.id');``
-- ``$this->db->having('user_id',  45);`` to ``$builder->having('user_id',  45);``
+    - ``$this->db->get()`` to ``$builder->get();``
+    - ``$this->db->get_where('mytable', array('id' => $id), $limit, $offset);`` to ``$builder->getWhere(['id' => $id], $limit, $offset);``
+    - ``$this->db->select('title, content, date');`` to ``$builder->select('title, content, date');``
+    - ``$this->db->select_max('age');`` to ``$builder->selectMax('age');``
+    - ``$this->db->join('comments', 'comments.id = blogs.id');`` to ``$builder->join('comments', 'comments.id = blogs.id');``
+    - ``$this->db->having('user_id',  45);`` to ``$builder->having('user_id',  45);``
 
 
 Code Example

From dea1374475832220576fcd6b22ae7b1f03725e74 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 14:05:55 +0900
Subject: [PATCH 0265/2325] docs: fix RST format

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

diff --git a/user_guide_src/source/installation/upgrade_security.rst b/user_guide_src/source/installation/upgrade_security.rst
index d72de56f334f..4f2b8107a96b 100644
--- a/user_guide_src/source/installation/upgrade_security.rst
+++ b/user_guide_src/source/installation/upgrade_security.rst
@@ -31,7 +31,7 @@ Upgrade Guide
     ];
 
 2. Within you html forms you have to remove the csrf input which looks similar to ``<input type="hidden" name="<?= $csrf['name'] ?>" value="<?= $csrf['hash'] ?>" />``.
-3. Now within your html forms you have to add ``<?= csrf_field() ?>`` somewhere in the form body, unless you are using `form_open()``.
+3. Now within your html forms you have to add ``<?= csrf_field() ?>`` somewhere in the form body, unless you are using ``form_open()``.
 
 Code Example
 ============

From 2359ae455736516b28c12e4db4993964d003b1f4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 14:06:25 +0900
Subject: [PATCH 0266/2325] docs: fix coding style

---
 .../installation/upgrade_file_upload.rst      | 103 +++++++++---------
 .../installation/upgrade_localization.rst     |   4 +-
 .../installation/upgrade_validations.rst      |  26 ++---
 3 files changed, 65 insertions(+), 68 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_file_upload.rst b/user_guide_src/source/installation/upgrade_file_upload.rst
index 2bfbd99765fa..e93884f7fa81 100644
--- a/user_guide_src/source/installation/upgrade_file_upload.rst
+++ b/user_guide_src/source/installation/upgrade_file_upload.rst
@@ -33,42 +33,41 @@ Codeigniter Version 3.11
 
     class Upload extends CI_Controller {
 
-            public function __construct()
+        public function __construct()
+        {
+            parent::__construct();
+            $this->load->helper(array('form', 'url'));
+        }
+
+        public function index()
+        {
+            $this->load->view('upload_form', array('error' => ' ' ));
+        }
+
+        public function do_upload()
+        {
+            $config['upload_path']   = './uploads/';
+            $config['allowed_types'] = 'png|jpg|gif';
+            $config['max_size']      = 100;
+            $config['max_width']     = 1024;
+            $config['max_height']    = 768;
+
+            $this->load->library('upload', $config);
+
+            if ( ! $this->upload->do_upload('userfile'))
             {
-                    parent::__construct();
-                    $this->load->helper(array('form', 'url'));
-            }
+                $error = array('error' => $this->upload->display_errors());
 
-            public function index()
-            {
-                    $this->load->view('upload_form', array('error' => ' ' ));
+                $this->load->view('upload_form', $error);
             }
-
-            public function do_upload()
+            else
             {
-                    $config['upload_path']          = './uploads/';
-                    $config['allowed_types']        = 'png|jpg|gif';
-                    $config['max_size']             = 100;
-                    $config['max_width']            = 1024;
-                    $config['max_height']           = 768;
-
-                    $this->load->library('upload', $config);
-
-                    if ( ! $this->upload->do_upload('userfile'))
-                    {
-                            $error = array('error' => $this->upload->display_errors());
-
-                            $this->load->view('upload_form', $error);
-                    }
-                    else
-                    {
-                            $data = array('upload_data' => $this->upload->data());
-
-                            $this->load->view('upload_success', $data);
-                    }
+                $data = array('upload_data' => $this->upload->data());
+
+                $this->load->view('upload_success', $data);
             }
+        }
     }
-    ?>
 
 Codeigniter Version 4.x
 -----------------------
@@ -80,29 +79,27 @@ Codeigniter Version 4.x
 
     class Upload extends BaseController {
 
-            public function index()
-            {
-                    echo view('upload_form', ['error' => ' ']);
-            }
+        public function index()
+        {
+            echo view('upload_form', ['error' => ' ']);
+        }
 
-            public function do_upload()
-            {
-                    $this->validate([
-                        'userfile' => 'uploaded[userfile]|max_size[userfile,100]|mime_in[userfile,image/png,image/jpg,image/gif]|ext_in[userfile,png,jpg,gif]|max_dims[userfile,1024,768]'
-                    ]);
-
-                    $file = $this->request->getFile('userfile');
-
-                    if ( ! $path = $file->store())
-                    {
-                            echo view('upload_form', ['error' => "upload failed"]);
-                    }
-                    else
-                    {
-                            $data = ['upload_file_path' => $path];
-
-                            echo view('upload_success', $data);
-                    }
+        public function do_upload()
+        {
+            $this->validate([
+                'userfile' => 'uploaded[userfile]|max_size[userfile,100]'
+                               . '|mime_in[userfile,image/png,image/jpg,image/gif]'
+                               . '|ext_in[userfile,png,jpg,gif]|max_dims[userfile,1024,768]'
+            ]);
+
+            $file = $this->request->getFile('userfile');
+
+            if (! $path = $file->store()) {
+                echo view('upload_form', ['error' => "upload failed"]);
+            } else {
+                $data = ['upload_file_path' => $path];
+
+                echo view('upload_success', $data);
             }
+        }
     }
-    ?>
diff --git a/user_guide_src/source/installation/upgrade_localization.rst b/user_guide_src/source/installation/upgrade_localization.rst
index 5c6125851a92..bb01d0057228 100644
--- a/user_guide_src/source/installation/upgrade_localization.rst
+++ b/user_guide_src/source/installation/upgrade_localization.rst
@@ -36,8 +36,8 @@ Codeigniter Version 3.11
 ::
 
     // error.php
-    $lang['error_email_missing'] = 'You must submit an email address';
-    $lang['error_url_missing'] = 'You must submit a URL';
+    $lang['error_email_missing']    = 'You must submit an email address';
+    $lang['error_url_missing']      = 'You must submit a URL';
     $lang['error_username_missing'] = 'You must submit a username';
 
     ...
diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
index d3301c4cb37f..0bc0928ee32e 100644
--- a/user_guide_src/source/installation/upgrade_validations.rst
+++ b/user_guide_src/source/installation/upgrade_validations.rst
@@ -83,23 +83,23 @@ Path: ``application/controllers/``::
 
     class Form extends CI_Controller {
 
-            public function index()
-            {
-                    $this->load->helper(array('form', 'url'));
+        public function index()
+        {
+            $this->load->helper(array('form', 'url'));
 
-                    $this->load->library('form_validation');
+            $this->load->library('form_validation');
 
-                    // Set validation rules
+            // Set validation rules
 
-                    if ($this->form_validation->run() == FALSE)
-                    {
-                            $this->load->view('myform');
-                    }
-                    else
-                    {
-                            $this->load->view('formsuccess');
-                    }
+            if ($this->form_validation->run() == FALSE)
+            {
+                    $this->load->view('myform');
             }
+            else
+            {
+                    $this->load->view('formsuccess');
+            }
+        }
     }
 
 Codeigniter Version 4.x

From c453fa7152249885867c369bec12b505cd3c9a95 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 15:35:59 +0900
Subject: [PATCH 0267/2325] docs: small fixes for entities

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

diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst
index eec2447adf06..10828c0dc56b 100644
--- a/user_guide_src/source/models/entities.rst
+++ b/user_guide_src/source/models/entities.rst
@@ -70,7 +70,7 @@ Create the model first at **app/Models/UserModel.php** so that we can interact w
         protected $allowedFields = [
             'username', 'email', 'password',
         ];
-        protected $returnType    = 'App\Entities\User';
+        protected $returnType    = \App\Entities\User::class;
         protected $useTimestamps = true;
     }
 
@@ -464,7 +464,7 @@ Now you need to register it::
 
         //Bind the type to the handler
         protected $castHandlers = [
-            'base64' => 'App\Entity\Cast\CastBase64',
+            'base64' => \App\Entity\Cast\CastBase64::class,
         ];
     }
 
@@ -496,16 +496,18 @@ Additional parameters are indicated in square brackets and listed with a comma.
 
 ::
 
-    //Defining a type with parameters
+    // Defining a type with parameters
     protected $casts = [
         'some_attribute' => 'class[App\SomeClass, param2, param3]',
     ];
 
-    //Bind the type to the handler
+    // Bind the type to the handler
     protected $castHandlers = [
         'class' => 'SomeHandler',
     ];
 
+::
+
     use CodeIgniter\Entity\Cast\BaseCast;
 
     class SomeHandler extends BaseCast
@@ -535,7 +537,7 @@ Checking for Changed Attributes
 You can check if an Entity attribute has changed since it was created. The only parameter is the name of the
 attribute to check::
 
-    $user = new User();
+    $user = new \App\Entities\User();
     $user->hasChanged('name'); // false
 
     $user->name = 'Fred';

From 9d1570ae60f5e03bd4cd3f06bd998819b4d59027 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 16:10:26 +0900
Subject: [PATCH 0268/2325] docs: fix db_forge

---
 user_guide_src/source/dbmgmt/forge.rst | 386 +++++++++++++------------
 1 file changed, 199 insertions(+), 187 deletions(-)

diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index e16b5ee1e92f..6cbdfe506e8a 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -13,16 +13,16 @@ Initializing the Forge Class
 ****************************
 
 .. important:: In order to initialize the Forge class, your database
-	driver must already be running, since the forge class relies on it.
+    driver must already be running, since the forge class relies on it.
 
 Load the Forge Class as follows::
 
-	$forge = \Config\Database::forge();
+    $forge = \Config\Database::forge();
 
 You can also pass another database group name to the DB Forge loader, in case
 the database you want to manage isn't the default one::
 
-	$this->myforge = \Config\Database::forge('other_db');
+    $this->myforge = \Config\Database::forge('other_db');
 
 In the above example, we're passing the name of a different database group
 to connect to as the first parameter.
@@ -36,27 +36,27 @@ Creating and Dropping Databases
 Permits you to create the database specified in the first parameter.
 Returns true/false based on success or failure::
 
-	if ($forge->createDatabase('my_db')) {
-		echo 'Database created!';
-	}
+    if ($forge->createDatabase('my_db')) {
+        echo 'Database created!';
+    }
 
 An optional second parameter set to true will add IF EXISTS statement
 or will check if a database exists before create it (depending on DBMS).
 
 ::
 
-	$forge->createDatabase('my_db', true);
-	// gives CREATE DATABASE IF NOT EXISTS my_db
-	// or will check if a database exists
+    $forge->createDatabase('my_db', true);
+    // gives CREATE DATABASE IF NOT EXISTS my_db
+    // or will check if a database exists
 
 **$forge->dropDatabase('db_name')**
 
 Permits you to drop the database specified in the first parameter.
 Returns true/false based on success or failure::
 
-	if ($forge->dropDatabase('my_db')) {
-		echo 'Database deleted!';
-	}
+    if ($forge->dropDatabase('my_db')) {
+        echo 'Database deleted!';
+    }
 
 Creating Databases in the Command Line
 ======================================
@@ -67,7 +67,7 @@ will complain that the database creation has failed.
 
 To start, just type the command and the name of the database (e.g., ``foo``)::
 
-	php spark db:create foo
+    php spark db:create foo
 
 If everything went fine, you should expect the ``Database "foo" successfully created.`` message displayed.
 
@@ -76,12 +76,12 @@ for the file where the database will be created using the ``--ext`` option. Vali
 ``sqlite`` and defaults to ``db``. Remember that these should not be preceded by a period.
 ::
 
-	php spark db:create foo --ext sqlite
-	// will create the db file in WRITEPATH/foo.sqlite
+    php spark db:create foo --ext sqlite
+    // will create the db file in WRITEPATH/foo.sqlite
 
 .. note:: When using the special SQLite3 database name ``:memory:``, expect that the command will still
-	produce a success message but no database file is created. This is because SQLite3 will just use
-	an in-memory database.
+    produce a success message but no database file is created. This is because SQLite3 will just use
+    an in-memory database.
 
 ****************************
 Creating and Dropping Tables
@@ -101,13 +101,13 @@ also require a 'constraint' key.
 
 ::
 
-	$fields = [
-		'users' => [
-			'type'       => 'VARCHAR',
-			'constraint' => 100,
-		],
-	];
-	// will translate to "users VARCHAR(100)" when the field is added.
+    $fields = [
+        'users' => [
+            'type'       => 'VARCHAR',
+            'constraint' => 100,
+        ],
+    ];
+    // will translate to "users VARCHAR(100)" when the field is added.
 
 Additionally, the following key/values can be used:
 
@@ -122,33 +122,33 @@ Additionally, the following key/values can be used:
 
 ::
 
-	$fields = [
-		'id'          => [
-			'type'           => 'INT',
-			'constraint'     => 5,
-			'unsigned'       => true,
-			'auto_increment' => true
-		],
-		'title'       => [
-			'type'           => 'VARCHAR',
-			'constraint'     => '100',
-			'unique'         => true,
-		],
-		'author'      => [
-			'type'           =>'VARCHAR',
-			'constraint'     => 100,
-			'default'        => 'King of Town',
-		],
-		'description' => [
-			'type'           => 'TEXT',
-			'null'           => true,
-		],
-		'status'      => [
-			'type'           => 'ENUM',
-			'constraint'     => ['publish', 'pending', 'draft'],
-			'default'        => 'pending',
-		],
-	];
+    $fields = [
+        'id'          => [
+            'type'           => 'INT',
+            'constraint'     => 5,
+            'unsigned'       => true,
+            'auto_increment' => true
+        ],
+        'title'       => [
+            'type'           => 'VARCHAR',
+            'constraint'     => '100',
+            'unique'         => true,
+        ],
+        'author'      => [
+            'type'           =>'VARCHAR',
+            'constraint'     => 100,
+            'default'        => 'King of Town',
+        ],
+        'description' => [
+            'type'           => 'TEXT',
+            'null'           => true,
+        ],
+        'status'      => [
+            'type'           => 'ENUM',
+            'constraint'     => ['publish', 'pending', 'draft'],
+            'default'        => 'pending',
+        ],
+    ];
 
 After the fields have been defined, they can be added using
 ``$forge->addField($fields);`` followed by a call to the
@@ -166,7 +166,7 @@ string into the field definitions with addField()
 
 ::
 
-	$forge->addField("label varchar(100) NOT NULL DEFAULT 'default label'");
+    $forge->addField("label varchar(100) NOT NULL DEFAULT 'default label'");
 
 .. note:: Passing raw strings as fields cannot be followed by ``addKey()`` calls on those fields.
 
@@ -181,8 +181,8 @@ Primary Key.
 
 ::
 
-	$forge->addField('id');
-	// gives id INT(9) NOT NULL AUTO_INCREMENT
+    $forge->addField('id');
+    // gives id INT(9) NOT NULL AUTO_INCREMENT
 
 Adding Keys
 ===========
@@ -198,30 +198,30 @@ below is for MySQL.
 
 ::
 
-	$forge->addKey('blog_id', true);
-	// gives PRIMARY KEY `blog_id` (`blog_id`)
+    $forge->addKey('blog_id', true);
+    // gives PRIMARY KEY `blog_id` (`blog_id`)
 
-	$forge->addKey('blog_id', true);
-	$forge->addKey('site_id', true);
-	// gives PRIMARY KEY `blog_id_site_id` (`blog_id`, `site_id`)
+    $forge->addKey('blog_id', true);
+    $forge->addKey('site_id', true);
+    // gives PRIMARY KEY `blog_id_site_id` (`blog_id`, `site_id`)
 
-	$forge->addKey('blog_name');
-	// gives KEY `blog_name` (`blog_name`)
+    $forge->addKey('blog_name');
+    // gives KEY `blog_name` (`blog_name`)
 
-	$forge->addKey(['blog_name', 'blog_label']);
-	// gives KEY `blog_name_blog_label` (`blog_name`, `blog_label`)
+    $forge->addKey(['blog_name', 'blog_label']);
+    // gives KEY `blog_name_blog_label` (`blog_name`, `blog_label`)
 
-	$forge->addKey(['blog_id', 'uri'], false, true);
-	// gives UNIQUE KEY `blog_id_uri` (`blog_id`, `uri`)
+    $forge->addKey(['blog_id', 'uri'], false, true);
+    // gives UNIQUE KEY `blog_id_uri` (`blog_id`, `uri`)
 
 To make code reading more objective it is also possible to add primary
 and unique keys with specific methods::
 
-	$forge->addPrimaryKey('blog_id');
-	// gives PRIMARY KEY `blog_id` (`blog_id`)
+    $forge->addPrimaryKey('blog_id');
+    // gives PRIMARY KEY `blog_id` (`blog_id`)
 
-	$forge->addUniqueKey(['blog_id', 'uri']);
-	// gives UNIQUE KEY `blog_id_uri` (`blog_id`, `uri`)
+    $forge->addUniqueKey(['blog_id', 'uri']);
+    // gives UNIQUE KEY `blog_id_uri` (`blog_id`, `uri`)
 
 
 Adding Foreign Keys
@@ -230,19 +230,19 @@ Adding Foreign Keys
 Foreign Keys help to enforce relationships and actions across your tables. For tables that support Foreign Keys,
 you may add them directly in forge::
 
-	$forge->addForeignKey('users_id','users','id');
-	// gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`) REFERENCES `users`(`id`)
+    $forge->addForeignKey('users_id','users','id');
+    // gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`) REFERENCES `users`(`id`)
 
-	$forge->addForeignKey(['users_id', 'users_name'],'users',['id', 'name']);
-	// gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`, `users_name`) REFERENCES `users`(`id`, `name`)
+    $forge->addForeignKey(['users_id', 'users_name'],'users',['id', 'name']);
+    // gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`, `users_name`) REFERENCES `users`(`id`, `name`)
 
 You can specify the desired action for the "on delete" and "on update" properties of the constraint::
 
-	$forge->addForeignKey('users_id','users','id','CASCADE','CASCADE');
-	// gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`) REFERENCES `users`(`id`) ON DELETE CASCADE ON UPDATE CASCADE
+    $forge->addForeignKey('users_id','users','id','CASCADE','CASCADE');
+    // gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`) REFERENCES `users`(`id`) ON DELETE CASCADE ON UPDATE CASCADE
 
-	$forge->addForeignKey(['users_id', 'users_name'],'users',['id', 'name'],'CASCADE','CASCADE');
-	// gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`, `users_name`) REFERENCES `users`(`id`, `name`) ON DELETE CASCADE ON UPDATE CASCADE
+    $forge->addForeignKey(['users_id', 'users_name'],'users',['id', 'name'],'CASCADE','CASCADE');
+    // gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`, `users_name`) REFERENCES `users`(`id`, `name`) ON DELETE CASCADE ON UPDATE CASCADE
 
 Creating a table
 ================
@@ -252,26 +252,26 @@ with
 
 ::
 
-	$forge->createTable('table_name');
-	// gives CREATE TABLE table_name
+    $forge->createTable('table_name');
+    // gives CREATE TABLE table_name
 
 An optional second parameter set to true adds an "IF NOT EXISTS" clause
 into the definition
 
 ::
 
-	$forge->createTable('table_name', true);
-	// gives CREATE TABLE IF NOT EXISTS table_name
+    $forge->createTable('table_name', true);
+    // gives CREATE TABLE IF NOT EXISTS table_name
 
 You could also pass optional table attributes, such as MySQL's ``ENGINE``::
 
-	$attributes = ['ENGINE' => 'InnoDB'];
-	$forge->createTable('table_name', false, $attributes);
-	// produces: CREATE TABLE `table_name` (...) ENGINE = InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci
+    $attributes = ['ENGINE' => 'InnoDB'];
+    $forge->createTable('table_name', false, $attributes);
+    // produces: CREATE TABLE `table_name` (...) ENGINE = InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci
 
 .. note:: Unless you specify the ``CHARACTER SET`` and/or ``COLLATE`` attributes,
-	``createTable()`` will always add them with your configured *charset*
-	and *DBCollat* values, as long as they are not empty (MySQL only).
+    ``createTable()`` will always add them with your configured *charset*
+    and *DBCollat* values, as long as they are not empty (MySQL only).
 
 Dropping a table
 ================
@@ -280,19 +280,19 @@ Execute a DROP TABLE statement and optionally add an IF EXISTS clause.
 
 ::
 
-	// Produces: DROP TABLE table_name
-	$forge->dropTable('table_name');
+    // Produces: DROP TABLE table_name
+    $forge->dropTable('table_name');
 
-	// Produces: DROP TABLE IF EXISTS table_name
-	$forge->dropTable('table_name', true);
+    // Produces: DROP TABLE IF EXISTS table_name
+    $forge->dropTable('table_name', true);
 
 A third parameter can be passed to add a "CASCADE" option, which might be required for some
 drivers to handle removal of tables with foreign keys.
 
 ::
 
-	// Produces: DROP TABLE table_name CASCADE
-	$forge->dropTable('table_name', false, true);
+    // Produces: DROP TABLE table_name CASCADE
+    $forge->dropTable('table_name', false, true);
 
 Dropping a Foreign Key
 ======================
@@ -301,8 +301,8 @@ Execute a DROP FOREIGN KEY.
 
 ::
 
-	// Produces: ALTER TABLE 'tablename' DROP FOREIGN KEY 'users_foreign'
-	$forge->dropForeignKey('tablename','users_foreign');
+    // Produces: ALTER TABLE 'tablename' DROP FOREIGN KEY 'users_foreign'
+    $forge->dropForeignKey('tablename','users_foreign');
 
 Renaming a table
 ================
@@ -311,8 +311,8 @@ Executes a TABLE rename
 
 ::
 
-	$forge->renameTable('old_table_name', 'new_table_name');
-	// gives ALTER TABLE old_table_name RENAME TO new_table_name
+    $forge->renameTable('old_table_name', 'new_table_name');
+    // gives ALTER TABLE old_table_name RENAME TO new_table_name
 
 ****************
 Modifying Tables
@@ -329,26 +329,26 @@ number of additional fields.
 
 ::
 
-	$fields = [
-		'preferences' => ['type' => 'TEXT']
-	];
-	$forge->addColumn('table_name', $fields);
-	// Executes: ALTER TABLE table_name ADD preferences TEXT
+    $fields = [
+        'preferences' => ['type' => 'TEXT']
+    ];
+    $forge->addColumn('table_name', $fields);
+    // Executes: ALTER TABLE table_name ADD preferences TEXT
 
 If you are using MySQL or CUBIRD, then you can take advantage of their
 AFTER and FIRST clauses to position the new column.
 
 Examples::
 
-	// Will place the new column after the `another_field` column:
-	$fields = [
-		'preferences' => ['type' => 'TEXT', 'after' => 'another_field']
-	];
+    // Will place the new column after the `another_field` column:
+    $fields = [
+        'preferences' => ['type' => 'TEXT', 'after' => 'another_field']
+    ];
 
-	// Will place the new column at the start of the table definition:
-	$fields = [
-		'preferences' => ['type' => 'TEXT', 'first' => true]
-	];
+    // Will place the new column at the start of the table definition:
+    $fields = [
+        'preferences' => ['type' => 'TEXT', 'first' => true]
+    ];
 
 Dropping Columns From a Table
 ==============================
@@ -359,7 +359,7 @@ Used to remove a column from a table.
 
 ::
 
-	$forge->dropColumn('table_name', 'column_to_drop'); // to drop one single column
+    $forge->dropColumn('table_name', 'column_to_drop'); // to drop one single column
 
 Used to remove multiple columns from a table.
 
@@ -379,14 +379,14 @@ change the name, you can add a "name" key into the field defining array.
 
 ::
 
-	$fields = [
-		'old_name' => [
-			'name' => 'new_name',
-			'type' => 'TEXT',
-		],
-	];
-	$forge->modifyColumn('table_name', $fields);
-	// gives ALTER TABLE table_name CHANGE old_name new_name TEXT
+    $fields = [
+        'old_name' => [
+            'name' => 'new_name',
+            'type' => 'TEXT',
+        ],
+    ];
+    $forge->modifyColumn('table_name', $fields);
+    // gives ALTER TABLE table_name CHANGE old_name new_name TEXT
 
 ***************
 Class Reference
@@ -394,108 +394,120 @@ Class Reference
 
 .. php:class:: CodeIgniter\\Database\\Forge
 
-	.. php:method:: addColumn($table[, $field = []])
+    .. php:method:: addColumn($table[, $field = []])
 
-		:param	string	$table: Table name to add the column to
-		:param	array	$field: Column definition(s)
-		:returns:	true on success, false on failure
-		:rtype:	bool
+        :param    string    $table: Table name to add the column to
+        :param    array    $field: Column definition(s)
+        :returns:    true on success, false on failure
+        :rtype:    bool
 
-		Adds a column to a table. Usage:  See `Adding a Column to a Table`_.
+        Adds a column to a table. Usage:  See `Adding a Column to a Table`_.
 
-	.. php:method:: addField($field)
+    .. php:method:: addField($field)
 
-		:param	array	$field: Field definition to add
-		:returns:	\CodeIgniter\Database\Forge instance (method chaining)
-		:rtype:	\CodeIgniter\Database\Forge
+        :param    array    $field: Field definition to add
+        :returns:    \CodeIgniter\Database\Forge instance (method chaining)
+        :rtype:    \CodeIgniter\Database\Forge
 
                 Adds a field to the set that will be used to create a table. Usage:  See `Adding fields`_.
 
-	.. php:method:: addKey($key[, $primary = false[, $unique = false]])
+    .. php:method:: addForeignKey($fieldName, $tableName, $tableField[, $onUpdate = '', $onDelete = ''])
 
-		:param	mixed	$key: Name of a key field or an array of fields
-		:param	bool	$primary: Set to true if it should be a primary key or a regular one
-		:param	bool	$unique: Set to true if it should be a unique key or a regular one
-		:returns:	\CodeIgniter\Database\Forge instance (method chaining)
-		:rtype:	\CodeIgniter\Database\Forge
+        :param    string|string[]    $fieldName: Name of a key field or an array of fields
+        :param    string    $tableName: Name of a parent table
+        :param    string|string[]    $tableField: Name of a parent table field or an array of fields
+        :param    string    $onUpdate: Desired action for the “on update”
+        :param    string    $onDelete: Desired action for the “on delete”
+        :returns:    \CodeIgniter\Database\Forge instance (method chaining)
+        :rtype:    \CodeIgniter\Database\Forge
 
-		Adds a key to the set that will be used to create a table. Usage:  See `Adding Keys`_.
+        Adds a foreign key to the set that will be used to create a table. Usage:  See `Adding Foreign Keys`_.
 
-	.. php:method:: addPrimaryKey($key)
+    .. php:method:: addKey($key[, $primary = false[, $unique = false]])
 
-		:param	mixed	$key: Name of a key field or an array of fields
-		:returns:	\CodeIgniter\Database\Forge instance (method chaining)
-		:rtype:	\CodeIgniter\Database\Forge
+        :param    mixed    $key: Name of a key field or an array of fields
+        :param    bool    $primary: Set to true if it should be a primary key or a regular one
+        :param    bool    $unique: Set to true if it should be a unique key or a regular one
+        :returns:    \CodeIgniter\Database\Forge instance (method chaining)
+        :rtype:    \CodeIgniter\Database\Forge
 
-		Adds a primary key to the set that will be used to create a table. Usage:  See `Adding Keys`_.
+        Adds a key to the set that will be used to create a table. Usage:  See `Adding Keys`_.
 
-	.. php:method:: addUniqueKey($key)
+    .. php:method:: addPrimaryKey($key)
 
-		:param	mixed	$key: Name of a key field or an array of fields
-		:returns:	\CodeIgniter\Database\Forge instance (method chaining)
-		:rtype:	\CodeIgniter\Database\Forge
+        :param    mixed    $key: Name of a key field or an array of fields
+        :returns:    \CodeIgniter\Database\Forge instance (method chaining)
+        :rtype:    \CodeIgniter\Database\Forge
 
-		Adds a unique key to the set that will be used to create a table. Usage:  See `Adding Keys`_.
+        Adds a primary key to the set that will be used to create a table. Usage:  See `Adding Keys`_.
 
-	.. php:method:: createDatabase($dbName[, $ifNotExists = false])
+    .. php:method:: addUniqueKey($key)
 
-		:param	string	$db_name: Name of the database to create
-		:param	string	$ifNotExists: Set to true to add an 'IF NOT EXISTS' clause or check if database exists
-		:returns:	true on success, false on failure
-		:rtype:	bool
+        :param    mixed    $key: Name of a key field or an array of fields
+        :returns:    \CodeIgniter\Database\Forge instance (method chaining)
+        :rtype:    \CodeIgniter\Database\Forge
 
-		Creates a new database. Usage:  See `Creating and Dropping Databases`_.
+        Adds a unique key to the set that will be used to create a table. Usage:  See `Adding Keys`_.
 
-	.. php:method:: createTable($table[, $if_not_exists = false[, array $attributes = []]])
+    .. php:method:: createDatabase($dbName[, $ifNotExists = false])
 
-		:param	string	$table: Name of the table to create
-		:param	string	$if_not_exists: Set to true to add an 'IF NOT EXISTS' clause
-		:param	string	$attributes: An associative array of table attributes
-		:returns:  Query object on success, false on failure
-		:rtype:	mixed
+        :param    string    $db_name: Name of the database to create
+        :param    string    $ifNotExists: Set to true to add an 'IF NOT EXISTS' clause or check if database exists
+        :returns:    true on success, false on failure
+        :rtype:    bool
 
-		Creates a new table. Usage:  See `Creating a table`_.
+        Creates a new database. Usage:  See `Creating and Dropping Databases`_.
 
-	.. php:method:: dropColumn($table, $column_name)
+    .. php:method:: createTable($table[, $if_not_exists = false[, array $attributes = []]])
 
-		:param	string	$table: Table name
-		:param	mixed	$column_names: Comma-delimited string or an array of column names
-		:returns:	true on success, false on failure
-		:rtype:	bool
+        :param    string    $table: Name of the table to create
+        :param    string    $if_not_exists: Set to true to add an 'IF NOT EXISTS' clause
+        :param    string    $attributes: An associative array of table attributes
+        :returns:  Query object on success, false on failure
+        :rtype:    mixed
 
-		Drops single or multiple columns from a table. Usage:  See `Dropping Columns From a Table`_.
+        Creates a new table. Usage:  See `Creating a table`_.
 
-	.. php:method:: dropDatabase($dbName)
+    .. php:method:: dropColumn($table, $column_name)
 
-		:param	string	$dbName: Name of the database to drop
-		:returns:	true on success, false on failure
-		:rtype:	bool
+        :param    string    $table: Table name
+        :param    mixed    $column_names: Comma-delimited string or an array of column names
+        :returns:    true on success, false on failure
+        :rtype:    bool
 
-		Drops a database. Usage:  See `Creating and Dropping Databases`_.
+        Drops single or multiple columns from a table. Usage:  See `Dropping Columns From a Table`_.
 
-	.. php:method:: dropTable($table_name[, $if_exists = false])
+    .. php:method:: dropDatabase($dbName)
 
-		:param	string	$table: Name of the table to drop
-		:param	string	$if_exists: Set to true to add an 'IF EXISTS' clause
-		:returns:	true on success, false on failure
-		:rtype:	bool
+        :param    string    $dbName: Name of the database to drop
+        :returns:    true on success, false on failure
+        :rtype:    bool
 
-		Drops a table. Usage:  See `Dropping a table`_.
+        Drops a database. Usage:  See `Creating and Dropping Databases`_.
 
-	.. php:method:: modifyColumn($table, $field)
+    .. php:method:: dropTable($table_name[, $if_exists = false])
 
-		:param	string	$table: Table name
-		:param	array	$field: Column definition(s)
-		:returns:	true on success, false on failure
-		:rtype:	bool
+        :param    string    $table: Name of the table to drop
+        :param    string    $if_exists: Set to true to add an 'IF EXISTS' clause
+        :returns:    true on success, false on failure
+        :rtype:    bool
 
-		Modifies a table column. Usage:  See `Modifying a Column in a Table`_.
+        Drops a table. Usage:  See `Dropping a table`_.
 
-	.. php:method:: renameTable($table_name, $new_table_name)
+    .. php:method:: modifyColumn($table, $field)
 
-		:param	string	$table: Current of the table
-		:param	string	$new_table_name: New name of the table
-		:returns:  Query object on success, false on failure
-		:rtype:	mixed
+        :param    string    $table: Table name
+        :param    array    $field: Column definition(s)
+        :returns:    true on success, false on failure
+        :rtype:    bool
 
-		Renames a table. Usage:  See `Renaming a table`_.
+        Modifies a table column. Usage:  See `Modifying a Column in a Table`_.
+
+    .. php:method:: renameTable($table_name, $new_table_name)
+
+        :param    string    $table: Current of the table
+        :param    string    $new_table_name: New name of the table
+        :returns:  Query object on success, false on failure
+        :rtype:    mixed
+
+        Renames a table. Usage:  See `Renaming a table`_.

From 1b55d7bc98e334578da7f707ce4676689423bbed Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 22:12:13 +0900
Subject: [PATCH 0269/2325] docs: add about upgrading migration table

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

diff --git a/user_guide_src/source/installation/upgrade_migrations.rst b/user_guide_src/source/installation/upgrade_migrations.rst
index 13a0082ff983..66bfcbaabc1d 100644
--- a/user_guide_src/source/installation/upgrade_migrations.rst
+++ b/user_guide_src/source/installation/upgrade_migrations.rst
@@ -15,6 +15,8 @@ What has been changed
 =====================
 
 - First of all, the sequential naming (``001_create_users``, ``002_create_posts``) of migrations is not longer supported. Version 4 of CodeIgniter only supports the timestamp scheme (``20121031100537_create_users``, ``20121031500638_create_posts``) . If you have used sequential naming you have to rename each migration file.
+- The migration table definition was changed. If you upgrade from CI3 to CI4 and use the same database,
+  You need to upgrade the migration table definition and its data.
 - The migration procedure has been also changed. You can now migrate the database with a simple CLI command::
 
     > php spark migrate
@@ -36,6 +38,12 @@ Upgrade Guide
     - ``$this->dbforge->drop_table`` to ``$this->forge->addTable``
 
 8. (optional) You can change the array syntax from ``array(...)`` to ``[...]``
+9. Upgrade the migration table, if you use the same database.
+
+    - **(development)** Run the CI4 migration in the development environment or so with brand new database, to create the new migration table.
+    - **(development)** Export the migration table.
+    - **(production)** Drop (or rename) the existing CI3 migration table.
+    - **(production)** Import the new migration table and the data.
 
 Code Example
 ============

From 04a31f00f6b293bf82587179cab9bd93e54ebb86 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Sep 2021 22:13:09 +0900
Subject: [PATCH 0270/2325] docs: rename v4.2.0 to v4.1.5

---
 user_guide_src/source/changelogs/index.rst                    | 2 +-
 user_guide_src/source/changelogs/{v4.2.0.rst => v4.1.5.rst}   | 4 ++--
 .../source/installation/{upgrade_420.rst => upgrade_415.rst}  | 2 +-
 user_guide_src/source/installation/upgrading.rst              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename user_guide_src/source/changelogs/{v4.2.0.rst => v4.1.5.rst} (88%)
 rename user_guide_src/source/installation/{upgrade_420.rst => upgrade_415.rst} (97%)

diff --git a/user_guide_src/source/changelogs/index.rst b/user_guide_src/source/changelogs/index.rst
index a997a57f0c3f..2ec12f649150 100644
--- a/user_guide_src/source/changelogs/index.rst
+++ b/user_guide_src/source/changelogs/index.rst
@@ -12,7 +12,7 @@ See all the changes.
 .. toctree::
     :titlesonly:
 
-    v4.2.0
+    v4.1.5
     v4.1.4
     v4.1.3
     v4.1.2
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.1.5.rst
similarity index 88%
rename from user_guide_src/source/changelogs/v4.2.0.rst
rename to user_guide_src/source/changelogs/v4.1.5.rst
index 22a94202a69f..b57f3b79a85a 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.1.5.rst
@@ -1,9 +1,9 @@
-Version 4.2.0
+Version 4.1.5
 =============
 
 Release Date: Not released
 
-**4.2.0 release of CodeIgniter4**
+**4.1.5 release of CodeIgniter4**
 
 Enhancements:
 
diff --git a/user_guide_src/source/installation/upgrade_420.rst b/user_guide_src/source/installation/upgrade_415.rst
similarity index 97%
rename from user_guide_src/source/installation/upgrade_420.rst
rename to user_guide_src/source/installation/upgrade_415.rst
index cfbcbdbf1aeb..bb075023e7bc 100644
--- a/user_guide_src/source/installation/upgrade_420.rst
+++ b/user_guide_src/source/installation/upgrade_415.rst
@@ -1,5 +1,5 @@
 #############################
-Upgrading from 4.1.4 to 4.2.0
+Upgrading from 4.1.4 to 4.1.5
 #############################
 
 **Changes for set() method in BaseBuilder and Model class**
diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index b6ef428e8b47..0264b6eaa3bb 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -8,7 +8,7 @@ upgrading from.
 .. toctree::
     :titlesonly:
 
-    Upgrading from 4.1.4 to 4.2.0 <upgrade_420>
+    Upgrading from 4.1.4 to 4.1.5 <upgrade_415>
     Upgrading from 4.1.3 to 4.1.4 <upgrade_414>
     Upgrading from 4.1.2 to 4.1.3 <upgrade_413>
     Upgrading from 4.1.1 to 4.1.2 <upgrade_412>

From a7d7de65c2747dcc20939aaef8fded199c22605c Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 13 Sep 2021 13:48:08 +0700
Subject: [PATCH 0271/2325] [Rector] Clean up rector skip config

---
 rector.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/rector.php b/rector.php
index 054ed3ea09ad..931b89304416 100644
--- a/rector.php
+++ b/rector.php
@@ -28,7 +28,6 @@
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
 use Rector\Core\Configuration\Option;
 use Rector\Core\ValueObject\PhpVersion;
-use Rector\DeadCode\Rector\Cast\RecastingRemovalRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector;
 use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector;
@@ -91,11 +90,6 @@
             __DIR__ . '/system/CodeIgniter.php',
         ],
 
-        // casted to Entity via EntityTest->getCastEntity()
-        RecastingRemovalRector::class => [
-            __DIR__ . '/tests/system/Entity/EntityTest.php',
-        ],
-
         // session handlers have the gc() method with underscored parameter `$max_lifetime`
         UnderscoreToCamelCaseVariableNameRector::class => [
             __DIR__ . '/system/Session/Handlers',

From 419eb39a63cad50aee155783399bd0350c1efeae Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 13 Sep 2021 15:58:28 +0900
Subject: [PATCH 0272/2325] docs: fix query_builder RST format

---
 .../source/database/query_builder.rst         | 106 +++++++-----------
 1 file changed, 40 insertions(+), 66 deletions(-)

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 3494325e5084..45380416fdac 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -259,9 +259,7 @@ methods:
     Notice that the equal sign is added for you.
 
     If you use multiple function calls they will be chained together with
-    AND between them:
-
-    ::
+    AND between them::
 
         $builder->where('name', $name);
         $builder->where('title', $title);
@@ -271,9 +269,7 @@ methods:
 #. **Custom key/value method:**
 
     You can include an operator in the first parameter in order to
-    control the comparison:
-
-    ::
+    control the comparison::
 
         $builder->where('name !=', $name);
         $builder->where('id <', $id);
@@ -287,33 +283,30 @@ methods:
         $builder->where($array);
         // Produces: WHERE name = 'Joe' AND title = 'boss' AND status = 'active'
 
-    You can include your own operators using this method as well:
-
-    ::
+    You can include your own operators using this method as well::
 
         $array = ['name !=' => $name, 'id <' => $id, 'date >' => $date];
         $builder->where($array);
 
 #. **Custom string:**
-    You can write your own clauses manually::
 
+    You can write your own clauses manually::
 
         $where = "name='Joe' AND status='boss' OR status='active'";
         $builder->where($where);
 
     If you are using user-supplied data within the string, you MUST escape the
     data manually. Failure to do so could result in SQL injections.
-::
+
+    ::
 
         $name = $builder->db->escape('Joe');
         $where = "name={$name} AND status='boss' OR status='active'";
         $builder->where($where);
 
-
 #. **Subqueries:**
-    You can use an anonymous function to create a subquery.
 
-    ::
+    You can use an anonymous function to create a subquery::
 
         $builder->where('advance_amount <', function (BaseBuilder $builder) {
             return $builder->select('MAX(advance_amount)', false)->from('orders')->where('id >', 2);
@@ -323,48 +316,38 @@ methods:
 **$builder->orWhere()**
 
 This function is identical to the one above, except that multiple
-instances are joined by OR
-
-    ::
+instances are joined by OR::
 
-        $builder->where('name !=', $name);
-        $builder->orWhere('id >', $id);
-        // Produces: WHERE name != 'Joe' OR id > 50
+    $builder->where('name !=', $name);
+    $builder->orWhere('id >', $id);
+    // Produces: WHERE name != 'Joe' OR id > 50
 
 **$builder->whereIn()**
 
 Generates a WHERE field IN ('item', 'item') SQL query joined with AND if
-appropriate
-
-    ::
+appropriate::
 
-        $names = ['Frank', 'Todd', 'James'];
-        $builder->whereIn('username', $names);
-        // Produces: WHERE username IN ('Frank', 'Todd', 'James')
-
-You can use subqueries instead of an array of values.
+    $names = ['Frank', 'Todd', 'James'];
+    $builder->whereIn('username', $names);
+    // Produces: WHERE username IN ('Frank', 'Todd', 'James')
 
-    ::
+You can use subqueries instead of an array of values::
 
-        $builder->whereIn('id', function (BaseBuilder $builder) {
-            return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
-        });
-        // Produces: WHERE "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
+    $builder->whereIn('id', function (BaseBuilder $builder) {
+        return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
+    });
+    // Produces: WHERE "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
 
 **$builder->orWhereIn()**
 
 Generates a ``WHERE field IN ('item', 'item')`` SQL query joined with OR if
-appropriate
-
-    ::
+appropriate::
 
         $names = ['Frank', 'Todd', 'James'];
         $builder->orWhereIn('username', $names);
         // Produces: OR username IN ('Frank', 'Todd', 'James')
 
-You can use subqueries instead of an array of values.
-
-    ::
+You can use subqueries instead of an array of values::
 
         $builder->orWhereIn('id', function (BaseBuilder $builder) {
             return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
@@ -375,45 +358,36 @@ You can use subqueries instead of an array of values.
 **$builder->whereNotIn()**
 
 Generates a WHERE field NOT IN ('item', 'item') SQL query joined with
-AND if appropriate
+AND if appropriate::
 
-    ::
-
-        $names = ['Frank', 'Todd', 'James'];
-        $builder->whereNotIn('username', $names);
-        // Produces: WHERE username NOT IN ('Frank', 'Todd', 'James')
+    $names = ['Frank', 'Todd', 'James'];
+    $builder->whereNotIn('username', $names);
+    // Produces: WHERE username NOT IN ('Frank', 'Todd', 'James')
 
-You can use subqueries instead of an array of values.
+You can use subqueries instead of an array of values::
 
-    ::
-
-        $builder->whereNotIn('id', function (BaseBuilder $builder) {
-            return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
-        });
-
-        // Produces: WHERE "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
+    $builder->whereNotIn('id', function (BaseBuilder $builder) {
+        return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
+    });
 
+    // Produces: WHERE "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
 
 **$builder->orWhereNotIn()**
 
 Generates a ``WHERE field NOT IN ('item', 'item')`` SQL query joined with OR
-if appropriate
+if appropriate::
 
-    ::
+    $names = ['Frank', 'Todd', 'James'];
+    $builder->orWhereNotIn('username', $names);
+    // Produces: OR username NOT IN ('Frank', 'Todd', 'James')
 
-        $names = ['Frank', 'Todd', 'James'];
-        $builder->orWhereNotIn('username', $names);
-        // Produces: OR username NOT IN ('Frank', 'Todd', 'James')
+You can use subqueries instead of an array of values::
 
-You can use subqueries instead of an array of values.
-
-    ::
-
-        $builder->orWhereNotIn('id', function (BaseBuilder $builder) {
-            return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
-        });
+    $builder->orWhereNotIn('id', function (BaseBuilder $builder) {
+        return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
+    });
 
-        // Produces: OR "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
+    // Produces: OR "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
 
 ************************
 Looking for Similar Data

From e4194f4273cc9550df43dd8f3691b134171192d0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 13 Sep 2021 15:58:54 +0900
Subject: [PATCH 0273/2325] docs: fix controller classnames in sample code

---
 .../source/installation/upgrade_routing.rst    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_routing.rst b/user_guide_src/source/installation/upgrade_routing.rst
index 4b30b24f7f2c..7243d41345db 100644
--- a/user_guide_src/source/installation/upgrade_routing.rst
+++ b/user_guide_src/source/installation/upgrade_routing.rst
@@ -64,12 +64,12 @@ Path: ``app/Config/Routes.php``::
 
     ...
 
-    $routes->add('posts', 'posts::index');
-    $routes->add('teams/create', 'teams::create');
-    $routes->add('teams/edit/(:any)', 'teams::edit/$1');
-
-    $routes->add('posts/create', 'posts::create');
-    $routes->add('posts/edit/(:any)', 'posts::edit/$1');
-    $routes->add('drivers/create', 'drivers::create');
-    $routes->add('drivers/edit/(:any)', 'drivers::edit/$1');
-    $routes->add('posts/(:any)', 'posts::view/$1');
+    $routes->add('posts', 'Posts::index');
+    $routes->add('teams/create', 'Teams::create');
+    $routes->add('teams/edit/(:any)', 'Teams::edit/$1');
+
+    $routes->add('posts/create', 'Posts::create');
+    $routes->add('posts/edit/(:any)', 'Posts::edit/$1');
+    $routes->add('drivers/create', 'Drivers::create');
+    $routes->add('drivers/edit/(:any)', 'Drivers::edit/$1');
+    $routes->add('posts/(:any)', 'Posts::view/$1');

From 6b5b8dec061541cefb35d760a15fbd53147eba3f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 13 Sep 2021 15:59:45 +0900
Subject: [PATCH 0274/2325] docs: small fixes for configuration

---
 .../source/general/configuration.rst          | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst
index ee1486d91056..5f43477bbaaf 100644
--- a/user_guide_src/source/general/configuration.rst
+++ b/user_guide_src/source/general/configuration.rst
@@ -124,9 +124,9 @@ To save on typing, you can reuse variables that you've already specified in the
 variable name within ``${...}``
 ::
 
-        BASE_DIR="/var/webroot/project-root"
-        CACHE_DIR="${BASE_DIR}/cache"
-        TMP_DIR="${BASE_DIR}/tmp"
+    BASE_DIR="/var/webroot/project-root"
+    CACHE_DIR="${BASE_DIR}/cache"
+    TMP_DIR="${BASE_DIR}/tmp"
 
 Namespaced Variables
 ====================
@@ -262,17 +262,17 @@ wish to supply an additional template to ``Pager`` without overwriting whatever
 already configured. In **src/Config/Registrar.php** there would be a ``Registrar`` class with
 the single ``Pager()`` method (note the case-sensitivity)::
 
-	class Registrar
-	{
-		public static function Pager(): array
-		{
-			return [
-				'templates' => [
-					'module_pager' => 'MyModule\Views\Pager',
-				],
-			];
-		}
-	}
+    class Registrar
+    {
+        public static function Pager(): array
+        {
+            return [
+                'templates' => [
+                    'module_pager' => 'MyModule\Views\Pager',
+                ],
+            ];
+        }
+    }
 
 Registrar methods must always return an array, with keys corresponding to the properties
 of the target config file. Existing values are merged, and Registrar properties have
@@ -337,4 +337,3 @@ by treating ``RegionalSales`` as a "registrar". The resulting configuration prop
 
     $target   = 45;
     $campaign = "Winter Wonderland";
-

From 7823fe8d281630cb8230d3c9d024a7446bb2a136 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Tue, 14 Sep 2021 23:05:23 +0000
Subject: [PATCH 0275/2325] Ignore unroutable responses

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

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index aee11790f406..1bcb12a627b9 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -19,6 +19,7 @@
 use CodeIgniter\HTTP\CLIRequest;
 use CodeIgniter\HTTP\DownloadResponse;
 use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\Request;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
@@ -929,6 +930,11 @@ public function storePreviousURL($uri)
             return;
         }
 
+        // Ignore unroutable responses
+        if ($this->response instanceof DownloadResponse || $this->response instanceof RedirectResponse) {
+            return;
+        }
+
         // This is mainly needed during testing...
         if (is_string($uri)) {
             $uri = new URI($uri);

From 8e1b2805ce6e59a6bfc430a2cada8f7e19b787f6 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Wed, 15 Sep 2021 01:47:19 +0000
Subject: [PATCH 0276/2325] Add tests

---
 system/CodeIgniter.php           |  4 ++--
 tests/system/CodeIgniterTest.php | 23 ++++++++++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 1bcb12a627b9..1ac65c4663cd 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -922,8 +922,8 @@ protected function gatherOutput(?Cache $cacheConfig = null, $returned = null)
     public function storePreviousURL($uri)
     {
         // Ignore CLI requests
-        if (is_cli()) {
-            return;
+        if (is_cli() && ENVIRONMENT !== 'testing') {
+            return; // @codeCoverageIgnore
         }
         // Ignore AJAX requests
         if (method_exists($this->request, 'isAJAX') && $this->request->isAJAX()) {
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index af0488f3c7f5..0a3ad80921d7 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -345,7 +345,24 @@ public function testRunRedirectionWithHTTPCode303()
         $this->assertSame(303, $response->getStatusCode());
     }
 
-    public function testRunRedirectionWithHTTPCode301()
+    public function testStoresPreviousURL()
+    {
+        $_SERVER['argv'] = ['index.php', '/'];
+        $_SERVER['argc'] = 2;
+
+        // Inject mock router.
+        $router = Services::router(null, Services::request(), false);
+        Services::injectMock('router', $router);
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run();
+        ob_get_clean();
+
+        $this->assertArrayHasKey('_ci_previous_url', $_SESSION);
+        $this->assertSame('http://example.com/index.php', $_SESSION['_ci_previous_url']);
+    }
+
+    public function testNotStoresPreviousURL()
     {
         $_SERVER['argv'] = ['index.php', 'example'];
         $_SERVER['argc'] = 2;
@@ -364,8 +381,8 @@ public function testRunRedirectionWithHTTPCode301()
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run();
         ob_get_clean();
-        $response = $this->getPrivateProperty($this->codeigniter, 'response');
-        $this->assertSame(301, $response->getStatusCode());
+
+        $this->assertArrayNotHasKey('_ci_previous_url', $_SESSION);
     }
 
     /**

From 9b202fcc4e3f4ba2c0d47d258a72d3fd4c13ec83 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 15 Sep 2021 12:08:27 +0900
Subject: [PATCH 0277/2325] docs: fix indentation

---
 user_guide_src/source/dbmgmt/migration.rst | 227 +++++++++++----------
 1 file changed, 114 insertions(+), 113 deletions(-)

diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst
index 88b2a2c1e106..027c12d3dc70 100644
--- a/user_guide_src/source/dbmgmt/migration.rst
+++ b/user_guide_src/source/dbmgmt/migration.rst
@@ -43,41 +43,41 @@ migrations go in the **app/Database/Migrations/** directory and have names such
 as *20121031100537_add_blog.php*.
 ::
 
-	<?php
-
-	namespace App\Database\Migrations;
-
-	use CodeIgniter\Database\Migration;
-
-	class AddBlog extends Migration
-	{
-		public function up()
-		{
-			$this->forge->addField([
-				'blog_id'          => [
-					'type'           => 'INT',
-					'constraint'     => 5,
-					'unsigned'       => true,
-					'auto_increment' => true,
-				],
-				'blog_title'       => [
-					'type'       => 'VARCHAR',
-					'constraint' => '100',
-				],
-				'blog_description' => [
-					'type' => 'TEXT',
-					'null' => true,
-				],
-			]);
-			$this->forge->addKey('blog_id', true);
-			$this->forge->createTable('blog');
-		}
-
-		public function down()
-		{
-			$this->forge->dropTable('blog');
-		}
-	}
+    <?php
+
+    namespace App\Database\Migrations;
+
+    use CodeIgniter\Database\Migration;
+
+    class AddBlog extends Migration
+    {
+        public function up()
+        {
+            $this->forge->addField([
+                'blog_id'          => [
+                    'type'           => 'INT',
+                    'constraint'     => 5,
+                    'unsigned'       => true,
+                    'auto_increment' => true,
+                ],
+                'blog_title'       => [
+                    'type'       => 'VARCHAR',
+                    'constraint' => '100',
+                ],
+                'blog_description' => [
+                    'type' => 'TEXT',
+                    'null' => true,
+                ],
+            ]);
+            $this->forge->addKey('blog_id', true);
+            $this->forge->createTable('blog');
+        }
+
+        public function down()
+        {
+            $this->forge->dropTable('blog');
+        }
+    }
 
 The database connection and the database Forge class are both available to you through
 ``$this->db`` and ``$this->forge``, respectively.
@@ -94,14 +94,14 @@ To temporarily bypass the foreign key checks while running migrations, use the `
 
 ::
 
-	public function up()
-	{
-		$this->db->disableForeignKeyChecks()
+    public function up()
+    {
+        $this->db->disableForeignKeyChecks()
 
-		// Migration rules would go here..
+        // Migration rules would go here..
 
-		$this->db->enableForeignKeyChecks();
-	}
+        $this->db->enableForeignKeyChecks();
+    }
 
 Database Groups
 ===============
@@ -114,26 +114,26 @@ another database is used for mission critical data. You can ensure that migratio
 against the proper group by setting the ``$DBGroup`` property on your migration. This name must
 match the name of the database group exactly::
 
-	<?php
+    <?php
 
-	namespace App\Database\Migrations;
+    namespace App\Database\Migrations;
 
-	use CodeIgniter\Database\Migration;
+    use CodeIgniter\Database\Migration;
 
-	class AddBlog extends Migration
-	{
-		protected $DBGroup = 'alternate_db_group';
+    class AddBlog extends Migration
+    {
+        protected $DBGroup = 'alternate_db_group';
 
-		public function up()
-		{
-			// ...
-		}
+        public function up()
+        {
+            // ...
+        }
 
-		public function down()
-		{
-			// ...
-		}
-	}
+        public function down()
+        {
+            // ...
+        }
+    }
 
 Namespaces
 ==========
@@ -148,10 +148,10 @@ Each namespace has its own version sequence, this will help you upgrade and down
 For example, assume that we have the following namespaces defined in our Autoload
 configuration file::
 
-	$psr4 = [
-		'App'       => APPPATH,
-		'MyCompany' => ROOTPATH . 'MyCompany',
-	];
+    $psr4 = [
+        'App'       => APPPATH,
+        'MyCompany' => ROOTPATH . 'MyCompany',
+    ];
 
 This will look for any migrations located at both **APPPATH/Database/Migrations** and
 **ROOTPATH/MyCompany/Database/Migrations**. This makes it simple to include migrations in your
@@ -164,23 +164,23 @@ Usage Example
 In this example some simple code is placed in **app/Controllers/Migrate.php**
 to update the schema::
 
-	<?php
+    <?php
 
-	namespace App\Controllers;
+    namespace App\Controllers;
 
-	class Migrate extends \CodeIgniter\Controller
-	{
-		public function index()
-		{
-			$migrate = \Config\Services::migrations();
+    class Migrate extends \CodeIgniter\Controller
+    {
+        public function index()
+        {
+            $migrate = \Config\Services::migrations();
 
-			try {
-				$migrate->latest();
-			} catch (\Throwable $e) {
-				// Do something with the error here...
-			}
-		}
-	}
+            try {
+                $migrate->latest();
+            } catch (\Throwable $e) {
+                // Do something with the error here...
+            }
+        }
+    }
 
 *******************
 Command-Line Tools
@@ -284,62 +284,63 @@ Class Reference
 
 .. php:class:: CodeIgniter\\Database\\MigrationRunner
 
-	.. php:method:: findMigrations()
+    .. php:method:: findMigrations()
 
-		:returns:	An array of migration files
-		:rtype:	array
+        :returns:    An array of migration files
+        :rtype:    array
 
-		An array of migration filenames are returned that are found in the **path** property.
+        An array of migration filenames are returned that are found in the **path** property.
 
-	.. php:method:: latest($group)
+    .. php:method:: latest($group)
 
-		:param	mixed	$group: database group name, if null default database group will be used.
-		:returns:	``true`` on success, ``false`` on failure
-		:rtype:	bool
+        :param    mixed    $group: database group name, if null default database group will be used.
+        :returns:    ``true`` on success, ``false`` on failure
+        :rtype:    bool
 
-		This locates migrations for a namespace (or all namespaces), determines which migrations
-		have not yet been run, and runs them in order of their version (namespaces intermingled).
+        This locates migrations for a namespace (or all namespaces), determines which migrations
+        have not yet been run, and runs them in order of their version (namespaces intermingled).
 
-	.. php:method:: regress($batch, $group)
+    .. php:method:: regress($batch, $group)
 
-		:param	mixed	$batch: previous batch to migrate down to; 1+ specifies the batch, 0 reverts all, negative refers to the relative batch (e.g., -3 means "three batches back")
-		:param	mixed	$group: database group name, if null default database group will be used.
-		:returns:	``true`` on success, ``false`` on failure or no migrations are found
-		:rtype:	bool
+        :param    mixed    $batch: previous batch to migrate down to; 1+ specifies the batch, 0 reverts all, negative refers to the relative batch (e.g., -3 means "three batches back")
+        :param    mixed    $group: database group name, if null default database group will be used.
+        :returns:    ``true`` on success, ``false`` on failure or no migrations are found
+        :rtype:    bool
 
-		Regress can be used to roll back changes to a previous state, batch by batch.
-		::
+        Regress can be used to roll back changes to a previous state, batch by batch.
+        ::
 
-			$migration->regress(5);
-			$migration->regress(-1);
+            $migration->regress(5);
+            $migration->regress(-1);
 
-	.. php:method:: force($path, $namespace, $group)
+    .. php:method:: force($path, $namespace, $group)
 
-		:param	mixed	$path:  path to a valid migration file.
-		:param	mixed	$namespace: namespace of the provided migration.
-		:param	mixed	$group: database group name, if null default database group will be used.
-		:returns:	``true`` on success, ``false`` on failure
-		:rtype:	bool
+        :param    mixed    $path:  path to a valid migration file.
+        :param    mixed    $namespace: namespace of the provided migration.
+        :param    mixed    $group: database group name, if null default database group will be used.
+        :returns:    ``true`` on success, ``false`` on failure
+        :rtype:    bool
 
-		This forces a single file to migrate regardless of order or batches. Method "up" or "down" is detected based on whether it has already been migrated.
+        This forces a single file to migrate regardless of order or batches. Method "up" or "down" is detected based on whether it has already been migrated.
 
-		.. note:: This method is recommended only for testing and could cause data consistency issues.
+        .. note:: This method is recommended only for testing and could cause data consistency issues.
 
-	.. php:method:: setNamespace($namespace)
+    .. php:method:: setNamespace($namespace)
 
-	  :param  string  $namespace: application namespace.
-	  :returns:   The current MigrationRunner instance
-	  :rtype:     CodeIgniter\\Database\\MigrationRunner
+        :param  string  $namespace: application namespace.
+        :returns:   The current MigrationRunner instance
+        :rtype:     CodeIgniter\\Database\\MigrationRunner
 
-	  Sets the namespace the library should look for migration files::
+        Sets the namespace the library should look for migration files::
 
-	    $migration->setNamespace($namespace)->latest();
-	.. php:method:: setGroup($group)
+            $migration->setNamespace($namespace)->latest();
 
-	  :param  string  $group: database group name.
-	  :returns:   The current MigrationRunner instance
-	  :rtype:     CodeIgniter\\Database\\MigrationRunner
+    .. php:method:: setGroup($group)
 
-	  Sets the group the library should look for migration files::
+        :param  string  $group: database group name.
+        :returns:   The current MigrationRunner instance
+        :rtype:     CodeIgniter\\Database\\MigrationRunner
 
-	    $migration->setGroup($group)->latest();
+        Sets the group the library should look for migration files::
+
+            $migration->setGroup($group)->latest();

From 094b95a62fdd627b761268053e2c93444d89a68e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 15 Sep 2021 12:09:00 +0900
Subject: [PATCH 0278/2325] docs: add new line at end of file

---
 user_guide_src/source/database/call_function.rst | 2 +-
 user_guide_src/source/database/index.rst         | 2 +-
 user_guide_src/source/general/ajax.rst           | 2 +-
 user_guide_src/source/helpers/number_helper.rst  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/database/call_function.rst b/user_guide_src/source/database/call_function.rst
index 6c0453146cd6..9617c2361df0 100644
--- a/user_guide_src/source/database/call_function.rst
+++ b/user_guide_src/source/database/call_function.rst
@@ -40,4 +40,4 @@ The result ID can be accessed from within your result object, like this::
 
     $query = $db->query("SOME QUERY");
 
-    $query->resultID;
\ No newline at end of file
+    $query->resultID;
diff --git a/user_guide_src/source/database/index.rst b/user_guide_src/source/database/index.rst
index 62002afd00a8..73cd1a4ecff9 100644
--- a/user_guide_src/source/database/index.rst
+++ b/user_guide_src/source/database/index.rst
@@ -20,4 +20,4 @@ patterns. The database functions offer clear, simple syntax.
     Getting MetaData <metadata>
     Custom Function Calls <call_function>
     Database Events <events>
-    Database Utilities <utilities>
\ No newline at end of file
+    Database Utilities <utilities>
diff --git a/user_guide_src/source/general/ajax.rst b/user_guide_src/source/general/ajax.rst
index 6324930b199b..710406b41272 100644
--- a/user_guide_src/source/general/ajax.rst
+++ b/user_guide_src/source/general/ajax.rst
@@ -50,4 +50,4 @@ React
 
 .. code-block:: javascript
 
-    axios.get("your url", {headers: {'Content-Type': 'application/json'}})
\ No newline at end of file
+    axios.get("your url", {headers: {'Content-Type': 'application/json'}})
diff --git a/user_guide_src/source/helpers/number_helper.rst b/user_guide_src/source/helpers/number_helper.rst
index 2c6c5045ac77..ae5f8238b156 100644
--- a/user_guide_src/source/helpers/number_helper.rst
+++ b/user_guide_src/source/helpers/number_helper.rst
@@ -115,4 +115,4 @@ The following functions are available:
         echo number_to_roman(2534);  // Returns MMDXXXIV
 
     This function only handles numbers in the range 1 through 3999.
-    It will return null for any value outside that range .
\ No newline at end of file
+    It will return null for any value outside that range.

From 7610085940b2831d9d63bc62c26505a61b51b04b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 15 Sep 2021 12:09:35 +0900
Subject: [PATCH 0279/2325] docs: replace tab with space

---
 user_guide_src/source/testing/controllers.rst | 46 +++++++++----------
 user_guide_src/source/testing/feature.rst     |  6 +--
 user_guide_src/source/testing/overview.rst    | 26 +++++------
 user_guide_src/source/testing/response.rst    |  8 ++--
 4 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/user_guide_src/source/testing/controllers.rst b/user_guide_src/source/testing/controllers.rst
index 464a06c5fbcd..4333ad26ec0e 100644
--- a/user_guide_src/source/testing/controllers.rst
+++ b/user_guide_src/source/testing/controllers.rst
@@ -209,13 +209,13 @@ on an unfiltered route you could add it to the Config::
     {
         use FilterTestTrait;
 
-		protected function testFilterFailsOnAdminRoute()
-		{
-			$this->filtersConfig->globals['before'] = ['admin-only-filter'];
+        protected function testFilterFailsOnAdminRoute()
+        {
+            $this->filtersConfig->globals['before'] = ['admin-only-filter'];
 
-			$this->assertHasFilters('unfiltered/route', 'before');
-		}
-	...
+            $this->assertHasFilters('unfiltered/route', 'before');
+        }
+    ...
 
 Checking Routes
 ---------------
@@ -227,14 +227,14 @@ a large performance advantage over Controller and HTTP Testing.
 
 .. php:function:: getFiltersForRoute($route, $position)
 
-    :param	string	$route: The URI to check
-    :param	string	$position: The filter method to check, "before" or "after"
-	:returns:	Aliases for each filter that would have run
-	:rtype:	string[]
+    :param    string    $route: The URI to check
+    :param    string    $position: The filter method to check, "before" or "after"
+    :returns:    Aliases for each filter that would have run
+    :rtype:    string[]
 
     Usage example::
 
-		$result = $this->getFiltersForRoute('/', 'after'); // ['toolbar']
+        $result = $this->getFiltersForRoute('/', 'after'); // ['toolbar']
 
 Calling Filter Methods
 ----------------------
@@ -245,22 +245,22 @@ method using these properties to test your Filter code safely and check the resu
 
 .. php:function:: getFilterCaller($filter, $position)
 
-    :param	FilterInterface|string	$filter: The filter instance, class, or alias
-    :param	string	$position: The filter method to run, "before" or "after"
-	:returns:	A callable method to run the simulated Filter event
-	:rtype:	Closure
+    :param    FilterInterface|string    $filter: The filter instance, class, or alias
+    :param    string    $position: The filter method to run, "before" or "after"
+    :returns:    A callable method to run the simulated Filter event
+    :rtype:    Closure
 
     Usage example::
 
-		protected function testUnauthorizedAccessRedirects()
-		{
-			$caller = $this->getFilterCaller('permission', 'before');
-			$result = $caller('MayEditWidgets');
+        protected function testUnauthorizedAccessRedirects()
+        {
+            $caller = $this->getFilterCaller('permission', 'before');
+            $result = $caller('MayEditWidgets');
+
+            $this->assertInstanceOf('CodeIgniter\HTTP\RedirectResponse', $result);
+        }
 
-			$this->assertInstanceOf('CodeIgniter\HTTP\RedirectResponse', $result);
-		}
-	
-	Notice how the ``Closure`` can take input parameters which are passed to your filter method.
+    Notice how the ``Closure`` can take input parameters which are passed to your filter method.
 
 Assertions
 ----------
diff --git a/user_guide_src/source/testing/feature.rst b/user_guide_src/source/testing/feature.rst
index 6ec786c67079..c48c24b221c5 100644
--- a/user_guide_src/source/testing/feature.rst
+++ b/user_guide_src/source/testing/feature.rst
@@ -29,20 +29,20 @@ are called if you implement your own methods.
 
     class TestFoo extends FeatureTestCase
     {
-    	use DatabaseTestTrait, FeatureTestTrait;
+        use DatabaseTestTrait, FeatureTestTrait;
 
         protected function setUp(): void
         {
             parent::setUp();
 
-			$this->myClassMethod();
+            $this->myClassMethod();
         }
 
         protected function tearDown(): void
         {
             parent::tearDown();
 
-			$this->anotherClassMethod();
+            $this->anotherClassMethod();
         }
     }
 
diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst
index 28e99b9b4bbc..f237acc03412 100644
--- a/user_guide_src/source/testing/overview.rst
+++ b/user_guide_src/source/testing/overview.rst
@@ -159,19 +159,19 @@ to run named for the trait itself. For example, if you needed to add authenticat
 of your test cases you could create an authentication trait with a set up method to fake a
 logged in user::
 
-	trait AuthTrait
-	{
-		protected setUpAuthTrait()
-		{
-			$user = $this->createFakeUser();
-			$this->logInUser($user);
-		}
-	...
-
-	class AuthenticationFeatureTest
-	{
-		use AuthTrait;
-	...
+    trait AuthTrait
+    {
+        protected setUpAuthTrait()
+        {
+            $user = $this->createFakeUser();
+            $this->logInUser($user);
+        }
+    ...
+
+    class AuthenticationFeatureTest
+    {
+        use AuthTrait;
+    ...
 
 
 Additional Assertions
diff --git a/user_guide_src/source/testing/response.rst b/user_guide_src/source/testing/response.rst
index 4152feff03d1..e5e0f34852ff 100644
--- a/user_guide_src/source/testing/response.rst
+++ b/user_guide_src/source/testing/response.rst
@@ -7,8 +7,8 @@ from your test cases. Usually a ``TestResponse`` will be provided for you as a r
 `Controller Tests <controllers.html>`_ or `HTTP Feature Tests <feature.html>`_, but you can always
 create your own directly using any ``ResponseInterface``::
 
-	$result = new \CodeIgniter\Test\TestResponse($response);
-	$result->assertOK();
+    $result = new \CodeIgniter\Test\TestResponse($response);
+    $result->assertOK();
 
 Testing the Response
 ====================
@@ -299,8 +299,8 @@ This method will return the body of the response as a JSON string::
 
 You can use this method to determine if ``$response`` actually holds JSON content::
 
-	// Verify the response is JSON
-	$this->assertTrue($result->getJSON() !== false)
+    // Verify the response is JSON
+    $this->assertTrue($result->getJSON() !== false)
 
 .. note:: Be aware that the JSON string will be pretty-printed in the result.
 

From b57266c4be8e0c5a2e9fe5f9046cf5305ee169d6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 15 Sep 2021 12:10:10 +0900
Subject: [PATCH 0280/2325] docs: fix typo in Factories

---
 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 8aa779220aed..8bcef3e09610 100644
--- a/system/Config/Factories.php
+++ b/system/Config/Factories.php
@@ -17,7 +17,7 @@
 /**
  * Factories for creating instances.
  *
- * Factories allows dynamic loading of components by their path
+ * Factories allow dynamic loading of components by their path
  * and name. The "shared instance" implementation provides a
  * large performance boost and helps keep code clean of lengthy
  * instantiation checks.

From 0261a26622b6353114af72a8a03de0e5b069f4f1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 15 Sep 2021 14:39:46 +0900
Subject: [PATCH 0281/2325] docs: fix api responses

* docs: add a space before and after `=`

* docs: replace tab with space

* docs: fix description and RST format

* docs: add `$this->` and empty line
---
 .../source/outgoing/api_responses.rst         | 93 +++++++++++--------
 1 file changed, 52 insertions(+), 41 deletions(-)

diff --git a/user_guide_src/source/outgoing/api_responses.rst b/user_guide_src/source/outgoing/api_responses.rst
index 4758fe4f02bb..99e89783f7d5 100644
--- a/user_guide_src/source/outgoing/api_responses.rst
+++ b/user_guide_src/source/outgoing/api_responses.rst
@@ -43,29 +43,40 @@ In this example, an HTTP status code of 201 is returned, with the generic status
 exist for the most common use cases::
 
     // Generic response method
-    respond($data, 200);
+    $this->respond($data, 200);
+
     // Generic failure response
-    fail($errors, 400);
+    $this->fail($errors, 400);
+
     // Item created response
-    respondCreated($data);
+    $this->respondCreated($data);
+
     // Item successfully deleted
-    respondDeleted($data);
+    $this->respondDeleted($data);
+
     // Command executed by no response required
-    respondNoContent($message);
+    $this->respondNoContent($message);
+
     // Client isn't authorized
-    failUnauthorized($description);
+    $this->failUnauthorized($description);
+
     // Forbidden action
-    failForbidden($description);
+    $this->failForbidden($description);
+
     // Resource Not Found
-    failNotFound($description);
+    $this->failNotFound($description);
+
     // Data did not validate
-    failValidationError($description);
+    $this->failValidationError($description);
+
     // Resource already exists
-    failResourceExists($description);
+    $this->failResourceExists($description);
+
     // Resource previously deleted
-    failResourceGone($description);
+    $this->failResourceGone($description);
+
     // Client made too many requests
-    failTooManyRequests($description);
+    $this->failTooManyRequests($description);
 
 ***********************
 Handling Response Types
@@ -74,10 +85,10 @@ Handling Response Types
 When you pass your data in any of these methods, they will determine the data type to format the results as based on
 the following criteria:
 
-* If $data is a string, it will be treated as HTML to send back to the client.
-* If $data is an array, it will be formatted according to the controller's ``$this->format`` value. If that is empty
-    it will try to negotiate the content type with what the client asked for, defaulting to JSON
-    if nothing else has been specified within Config\API.php, the ``$supportedResponseFormats`` property.
+* If data is a string, it will be treated as HTML to send back to the client.
+* If data is an array, it will be formatted according to the controller's ``$this->format`` value. If that is empty,
+  it will try to negotiate the content type with what the client asked for, defaulting to JSON
+  if nothing else has been specified within **Config/Format.php**, the ``$supportedResponseFormats`` property.
 
 To define the formatter that is used, edit **Config/Format.php**. The ``$supportedResponseFormats`` contains a list of
 mime types that your application can automatically format the response for. By default, the system knows how to
@@ -119,7 +130,7 @@ Class Reference
     return $this->setResponseFormat('json')->respond(['error' => false]);
 
 
-.. php:method:: respond($data[, $statusCode=200[, $message='']])
+.. php:method:: respond($data[, $statusCode = 200[, $message = '']])
 
     :param mixed  $data: The data to return to the client. Either string or array.
     :param int    $statusCode: The HTTP status code to return. Defaults to 200
@@ -138,7 +149,7 @@ Class Reference
     .. note:: Since it sets the status code and body on the active Response instance, this should always
         be the final method in the script execution.
 
-.. php:method:: fail($messages[, int $status=400[, string $code=null[, string $message='']]])
+.. php:method:: fail($messages[, int $status = 400[, string $code = null[, string $message = '']]])
 
     :param mixed $messages: A string or array of strings that contain error messages encountered.
     :param int   $status: The HTTP status code to return. Defaults to 400.
@@ -162,14 +173,14 @@ Class Reference
     The response is an array with two elements: ``error`` and ``messages``. The ``error`` element contains the status
     code of the error. The ``messages`` element contains an array of error messages. It would look something like::
 
-	    $response = [
-	        'status'   => 400,
-	        'code'     => '321a',
-	        'messages' => [
-	            'Error message 1',
-	            'Error message 2',
-	        ],
-	    ];
+        $response = [
+            'status'   => 400,
+            'code'     => '321a',
+            'messages' => [
+                'Error message 1',
+                'Error message 2',
+            ],
+        ];
 
 .. php:method:: respondCreated($data = null[, string $message = ''])
 
@@ -179,8 +190,8 @@ Class Reference
 
     Sets the appropriate status code to use when a new resource was created, typically 201.::
 
-	    $user = $userModel->insert($data);
-	    return $this->respondCreated($user);
+        $user = $userModel->insert($data);
+        return $this->respondCreated($user);
 
 .. php:method:: respondDeleted($data = null[, string $message = ''])
 
@@ -192,8 +203,8 @@ Class Reference
 
     ::
 
-	    $user = $userModel->delete($id);
-	    return $this->respondDeleted(['id' => $id]);
+        $user = $userModel->delete($id);
+        return $this->respondDeleted(['id' => $id]);
 
 .. php:method:: respondNoContent(string $message = 'No Content')
 
@@ -205,10 +216,10 @@ Class Reference
 
     ::
 
-	    sleep(1);
-	    return $this->respondNoContent();
+        sleep(1);
+        return $this->respondNoContent();
 
-.. php:method:: failUnauthorized(string $description = 'Unauthorized'[, string $code=null[, string $message = '']])
+.. php:method:: failUnauthorized(string $description = 'Unauthorized'[, string $code = null[, string $message = '']])
 
     :param string  $description: The error message to show the user.
     :param string $code: A custom, API-specific, error code.
@@ -220,7 +231,7 @@ Class Reference
 
     ::
 
-	    return $this->failUnauthorized('Invalid Auth token');
+        return $this->failUnauthorized('Invalid Auth token');
 
 .. php:method:: failForbidden(string $description = 'Forbidden'[, string $code=null[, string $message = '']])
 
@@ -235,7 +246,7 @@ Class Reference
 
     ::
 
-    	return $this->failForbidden('Invalid API endpoint.');
+        return $this->failForbidden('Invalid API endpoint.');
 
 .. php:method:: failNotFound(string $description = 'Not Found'[, string $code=null[, string $message = '']])
 
@@ -248,7 +259,7 @@ Class Reference
 
     ::
 
-    	return $this->failNotFound('User 13 cannot be found.');
+        return $this->failNotFound('User 13 cannot be found.');
 
 .. php:method:: failValidationErrors($errors[, string $code=null[, string $message = '']])
 
@@ -261,7 +272,7 @@ Class Reference
 
     ::
 
-    	return $this->failValidationErrors($validation->getErrors());
+        return $this->failValidationErrors($validation->getErrors());
 
 .. php:method:: failResourceExists(string $description = 'Conflict'[, string $code=null[, string $message = '']])
 
@@ -275,7 +286,7 @@ Class Reference
 
     ::
 
-    	return $this->failResourceExists('A user already exists with that email.');
+        return $this->failResourceExists('A user already exists with that email.');
 
 .. php:method:: failResourceGone(string $description = 'Gone'[, string $code=null[, string $message = '']])
 
@@ -289,7 +300,7 @@ Class Reference
 
     ::
 
-    	return $this->failResourceGone('That user has been previously deleted.');
+        return $this->failResourceGone('That user has been previously deleted.');
 
 .. php:method:: failTooManyRequests(string $description = 'Too Many Requests'[, string $code=null[, string $message = '']])
 
@@ -303,7 +314,7 @@ Class Reference
 
     ::
 
-    	return $this->failTooManyRequests('You must wait 15 seconds before making another request.');
+        return $this->failTooManyRequests('You must wait 15 seconds before making another request.');
 
 .. php:method:: failServerError(string $description = 'Internal Server Error'[, string $code = null[, string $message = '']])
 
@@ -316,4 +327,4 @@ Class Reference
 
     ::
 
-    	return $this->failServerError('Server error.');
+        return $this->failServerError('Server error.');

From 3ab742eb6ab6d655e357c8a35493d2b84d63c643 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 15 Sep 2021 18:42:02 +0900
Subject: [PATCH 0282/2325] chore: remove --using-cache=no from php-cs-fixer

---
 admin/pre-commit | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/pre-commit b/admin/pre-commit
index d05724d58146..ffa9936ca9c9 100644
--- a/admin/pre-commit
+++ b/admin/pre-commit
@@ -52,9 +52,9 @@ if [ "$FILES" != "" ]; then
     # Run on whole codebase to skip on unnecessary filtering
     # Run first on app, admin, public
     if [ -d /proc/cygdrive ]; then
-        ./vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no --diff --config=.no-header.php-cs-fixer.dist.php
+        ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.no-header.php-cs-fixer.dist.php
     else
-        php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no --diff --config=.no-header.php-cs-fixer.dist.php
+        php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.no-header.php-cs-fixer.dist.php
     fi
 
     if [ $? != 0 ]; then
@@ -64,9 +64,9 @@ if [ "$FILES" != "" ]; then
 
     # Next, run on system, tests, utils, and root PHP files
     if [ -d /proc/cygdrive ]; then
-        ./vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no --diff
+        ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff
     else
-        php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --using-cache=no --diff
+        php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff
     fi
 
     if [ $? != 0 ]; then

From ec6288615fb5f19bd4c00a7926d70ab04cf239d7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 16 Sep 2021 21:50:52 +0900
Subject: [PATCH 0283/2325] docs: fix cli library

---
 user_guide_src/source/cli/cli_library.rst | 28 +++++++++++++++++------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/user_guide_src/source/cli/cli_library.rst b/user_guide_src/source/cli/cli_library.rst
index 41638272eaa5..6ba08ab80554 100644
--- a/user_guide_src/source/cli/cli_library.rst
+++ b/user_guide_src/source/cli/cli_library.rst
@@ -59,7 +59,7 @@ Finally, you can pass :ref:`validation <validation>` rules to the answer input a
 
 Validation rules can also be written in the array syntax.::
 
-	$email = CLI::prompt('What is your email?', null, ['required', 'valid_email']);
+    $email = CLI::prompt('What is your email?', null, ['required', 'valid_email']);
 
 
 **promptByKey()**
@@ -199,6 +199,15 @@ on the right with their descriptions. By default, this will wrap back to the lef
 doesn't allow things to line up in columns. In cases like this, you can pass in a number of spaces to pad
 every line after the first line, so that you will have a crisp column edge on the left::
 
+    $titles = [
+        'task1a',
+        'task1abc',
+    ];
+    $descriptions = [
+        'Lorem Ipsum is simply dummy text of the printing and typesetting industry.',
+        "Lorem Ipsum has been the industry's standard dummy text ever since the",
+    ];
+
     // Determine the maximum length of all titles
     // to determine the width of the left column
     $maxlen = max(array_map('strlen', $titles));
@@ -206,7 +215,11 @@ every line after the first line, so that you will have a crisp column edge on th
     for ($i = 0; $i < count($titles); $i++) {
         CLI::write(
             // Display the title on the left of the row
-            $titles[$i] . '   ' .
+            substr(
+                $titles[$i] . str_repeat(' ', $maxlen + 3),
+                0,
+                $maxlen + 3
+            ) .
             // Wrap the descriptions in a right-hand column
             // with its left side 3 characters wider than
             // the longest item on the left.
@@ -218,11 +231,12 @@ Would create something like this:
 
 .. code-block:: none
 
-    task1a   Lorem Ipsum is simply dummy
-               text of the printing and typesetting
-               industry.
-    task1abc   Lorem Ipsum has been the industry's
-               standard dummy text ever since the
+    task1a     Lorem Ipsum is simply dummy
+               text of the printing and
+               typesetting industry.
+    task1abc   Lorem Ipsum has been the
+               industry's standard dummy
+               text ever since the
 
 **newLine()**
 

From 640a11e3731205ddf6c882734c08d8db23cb4fa7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 16 Sep 2021 21:52:39 +0900
Subject: [PATCH 0284/2325] chore: add `composer cs` and `composer cs-fix`

---
 composer.json | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 13454e9d77ec..25ec1512ad23 100644
--- a/composer.json
+++ b/composer.json
@@ -60,7 +60,21 @@
             "bash -c \"if [ -f admin/setup.sh ]; then bash admin/setup.sh; fi\""
         ],
         "analyze": "phpstan analyse",
-        "test": "phpunit"
+        "test": "phpunit",
+        "cs": [
+            "php-cs-fixer fix --verbose --dry-run --diff --config=.no-header.php-cs-fixer.dist.php",
+            "php-cs-fixer fix --verbose --dry-run --diff"
+        ],
+        "cs-fix": [
+            "php-cs-fixer fix --verbose --diff --config=.no-header.php-cs-fixer.dist.php",
+            "php-cs-fixer fix --verbose --diff"
+        ]
+    },
+    "scripts-descriptions": {
+        "analyze": "Run static analysis",
+        "test": "Run unit tests",
+        "cs": "Check the coding style",
+        "cs-fix": "Fix the coding style"
     },
     "support": {
         "forum": "http://forum.codeigniter.com/",

From 8f81ebad484ba10f64cb5d4194b43a048165ce43 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 17 Sep 2021 05:11:14 +0700
Subject: [PATCH 0285/2325] [Rector] Apply Rector:
 SimplifyEmptyArrayCheckRector

---
 rector.php           | 2 ++
 system/View/Cell.php | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/rector.php b/rector.php
index 931b89304416..aa9546d37ca9 100644
--- a/rector.php
+++ b/rector.php
@@ -9,6 +9,7 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+use Rector\CodeQuality\Rector\BooleanAnd\SimplifyEmptyArrayCheckRector;
 use Rector\CodeQuality\Rector\Expression\InlineIfToExplicitIfRector;
 use Rector\CodeQuality\Rector\For_\ForToForeachRector;
 use Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector;
@@ -131,4 +132,5 @@
     $services->set(FuncGetArgsToVariadicParamRector::class);
     $services->set(MakeInheritedMethodVisibilitySameAsParentRector::class);
     $services->set(FixClassCaseSensitivityNameRector::class);
+    $services->set(SimplifyEmptyArrayCheckRector::class);
 };
diff --git a/system/View/Cell.php b/system/View/Cell.php
index 7affd2742049..50168a153be6 100644
--- a/system/View/Cell.php
+++ b/system/View/Cell.php
@@ -174,7 +174,7 @@ public function prepareParams($params)
             unset($newParams);
         }
 
-        if (is_array($params) && empty($params)) {
+        if ($params === []) {
             return [];
         }
 

From e9c452e3c92e77f2ec07c43bee7fc7f70d4bc9f2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 17 Sep 2021 18:04:30 +0900
Subject: [PATCH 0286/2325] docs: replace tab with space

---
 .../source/extending/basecontroller.rst       |  38 ++--
 .../source/extending/core_classes.rst         |  16 +-
 .../source/helpers/cookie_helper.rst          |  28 +--
 user_guide_src/source/helpers/xml_helper.rst  |   2 +-
 .../source/incoming/controllers.rst           |   2 +-
 .../source/libraries/curlrequest.rst          | 196 +++++++++---------
 .../source/outgoing/alternative_php.rst       |  28 +--
 7 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/user_guide_src/source/extending/basecontroller.rst b/user_guide_src/source/extending/basecontroller.rst
index 424329257fc1..bd5a76bf2386 100644
--- a/user_guide_src/source/extending/basecontroller.rst
+++ b/user_guide_src/source/extending/basecontroller.rst
@@ -6,16 +6,16 @@ CodeIgniter's core Controller should not be changed, but a default class extensi
 **app/Controllers/BaseController.php**. Any new controllers you make should extend ``BaseController`` to take
 advantage of preloaded components and any additional functionality you provide::
 
-	<?php
+    <?php
 
-	namespace App\Controllers;
+    namespace App\Controllers;
 
-	use CodeIgniter\Controller;
+    use CodeIgniter\Controller;
 
-	class Home extends BaseController
-	{
-		// ...
-	}
+    class Home extends BaseController
+    {
+        // ...
+    }
 
 Preloading Components
 =====================
@@ -24,18 +24,18 @@ The base controller is a great place to load any helpers, models, libraries, ser
 use every time your project runs. Helpers should be added to the pre-defined ``$helpers`` array. For example, if
 you want the HTML and Text helpers universally available::
 
-	protected $helpers = ['html', 'text'];
+    protected $helpers = ['html', 'text'];
 
 Any other components to load or data to process should be added to the constructor ``initController()``. For
 example, if your project uses the Session Library heavily you may want to initiate it here::
 
-	public function initController(...)
-	{
-		// Do Not Edit This Line
-		parent::initController($request, $response, $logger);
-		
-		$this->session = \Config\Services::session();
-	}
+    public function initController(...)
+    {
+        // Do Not Edit This Line
+        parent::initController($request, $response, $logger);
+        
+        $this->session = \Config\Services::session();
+    }
 
 Additional Methods
 ==================
@@ -54,7 +54,7 @@ the public controllers and make ``AdminController`` for any administrative contr
 If you do not want to use the base controller you may bypass it by having your controllers extend the system
 Controller instead::
 
-	class Home extends \CodeIgniter\Controller
-	{
-	
-	}
+    class Home extends \CodeIgniter\Controller
+    {
+    
+    }
diff --git a/user_guide_src/source/extending/core_classes.rst b/user_guide_src/source/extending/core_classes.rst
index 6d7b0c9a3b64..2e856f1eeaed 100644
--- a/user_guide_src/source/extending/core_classes.rst
+++ b/user_guide_src/source/extending/core_classes.rst
@@ -62,14 +62,14 @@ the core system class, you would create your class like this::
 
 Then  you would modify the ``routes`` service to load your class instead::
 
-	public static function routes(bool $getShared = true)
-	{
-		if ($getShared) {
-			return static::getSharedInstance('routes');
-		}
-
-		return new RouteCollection(static::locator(), config('Modules'));
-	}
+    public static function routes(bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('routes');
+        }
+
+        return new RouteCollection(static::locator(), config('Modules'));
+    }
 
 Extending Core Classes
 ======================
diff --git a/user_guide_src/source/helpers/cookie_helper.rst b/user_guide_src/source/helpers/cookie_helper.rst
index 4175bb2b99c4..2a7f0e6e6c43 100755
--- a/user_guide_src/source/helpers/cookie_helper.rst
+++ b/user_guide_src/source/helpers/cookie_helper.rst
@@ -22,16 +22,16 @@ The following functions are available:
 
 .. php:function:: set_cookie($name[, $value = ''[, $expire = ''[, $domain = ''[, $path = '/'[, $prefix = ''[, $secure = false[, $httpOnly = false[, $sameSite = '']]]]]]]])
 
-    :param	mixed	$name: Cookie name *or* associative array of all of the parameters available to this function
-    :param	string	$value: Cookie value
-    :param	int	$expire: Number of seconds until expiration
-    :param	string	$domain: Cookie domain (usually: .yourdomain.com)
-    :param	string	$path: Cookie path
-    :param	string	$prefix: Cookie name prefix
-    :param	bool	$secure: Whether to only send the cookie through HTTPS
-    :param	bool	$httpOnly: Whether to hide the cookie from JavaScript
-    :param	string	$sameSite: The value for the SameSite cookie parameter. If null, the default from `config/App.php` is used
-    :rtype:	void
+    :param    mixed    $name: Cookie name *or* associative array of all of the parameters available to this function
+    :param    string    $value: Cookie value
+    :param    int    $expire: Number of seconds until expiration
+    :param    string    $domain: Cookie domain (usually: .yourdomain.com)
+    :param    string    $path: Cookie path
+    :param    string    $prefix: Cookie name prefix
+    :param    bool    $secure: Whether to only send the cookie through HTTPS
+    :param    bool    $httpOnly: Whether to hide the cookie from JavaScript
+    :param    string    $sameSite: The value for the SameSite cookie parameter. If null, the default from `config/App.php` is used
+    :rtype:    void
 
     This helper function gives you friendlier syntax to set browser
     cookies. Refer to the :doc:`Response Library </outgoing/response>` for
@@ -40,10 +40,10 @@ The following functions are available:
 
 .. php:function:: get_cookie($index[, $xssClean = false])
 
-    :param	string	$index: Cookie name
-    :param	bool	$xss_clean: Whether to apply XSS filtering to the returned value
-    :returns:	The cookie value or null if not found
-    :rtype:	mixed
+    :param    string    $index: Cookie name
+    :param    bool    $xss_clean: Whether to apply XSS filtering to the returned value
+    :returns:    The cookie value or null if not found
+    :rtype:    mixed
 
     This helper function gives you friendlier syntax to get browser
     cookies. Refer to the :doc:`IncomingRequest Library </incoming/incomingrequest>` for
diff --git a/user_guide_src/source/helpers/xml_helper.rst b/user_guide_src/source/helpers/xml_helper.rst
index 4f7ff453384a..ebccaca79f91 100644
--- a/user_guide_src/source/helpers/xml_helper.rst
+++ b/user_guide_src/source/helpers/xml_helper.rst
@@ -27,7 +27,7 @@ The following functions are available:
     :param string $str: the text string to convert
     :param bool $protect_all: Whether to protect all content that looks like a potential entity instead of just numbered entities, e.g., &foo;
     :returns: XML-converted string
-    :rtype:	string
+    :rtype:    string
 
     Takes a string as input and converts the following reserved XML
     characters to entities:
diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 49075fc84500..dfca82fea06e 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -262,7 +262,7 @@ if you were to define a method like this for the `Helloworld` controller::
 
 then trying to access it using the following URL will not work::
 
-	example.com/index.php/helloworld/utility/
+    example.com/index.php/helloworld/utility/
 
 Organizing Your Controllers into Sub-directories
 ================================================
diff --git a/user_guide_src/source/libraries/curlrequest.rst b/user_guide_src/source/libraries/curlrequest.rst
index 08dc0c0a41c9..c9c69ea7ae08 100644
--- a/user_guide_src/source/libraries/curlrequest.rst
+++ b/user_guide_src/source/libraries/curlrequest.rst
@@ -27,27 +27,27 @@ The library can be loaded either manually or through the :doc:`Services class </
 
 To load with the Services class call the ``curlrequest()`` method::
 
-	$client = \Config\Services::curlrequest();
+    $client = \Config\Services::curlrequest();
 
 You can pass in an array of default options as the first parameter to modify how cURL will handle the request.
 The options are described later in this document::
 
-	$options = [
-		'baseURI' => 'http://example.com/api/v1/',
-		'timeout'  => 3,
-	];
-	$client = \Config\Services::curlrequest($options);
+    $options = [
+        'baseURI' => 'http://example.com/api/v1/',
+        'timeout'  => 3,
+    ];
+    $client = \Config\Services::curlrequest($options);
 
 When creating the class manually, you need to pass a few dependencies in. The first parameter is an
 instance of the ``Config\App`` class. The second parameter is a URI instance. The third
 parameter is a Response object. The fourth parameter is the optional ``$options`` array::
 
-	$client = new \CodeIgniter\HTTP\CURLRequest(
-		new \Config\App(),
-		new \CodeIgniter\HTTP\URI(),
-		new \CodeIgniter\HTTP\Response(new \Config\App()),
-		$options
-	);
+    $client = new \CodeIgniter\HTTP\CURLRequest(
+        new \Config\App(),
+        new \CodeIgniter\HTTP\URI(),
+        new \CodeIgniter\HTTP\Response(new \Config\App()),
+        $options
+    );
 
 ************************
 Working with the Library
@@ -64,19 +64,19 @@ Most communication is done through the ``request()`` method, which fires off the
 a Response instance to you. This takes the HTTP method, the url and an array of options as the parameters.
 ::
 
-	$client = \Config\Services::curlrequest();
+    $client = \Config\Services::curlrequest();
 
-	$response = $client->request('GET', 'https://api.github.com/user', [
-		'auth' => ['user', 'pass'],
-	]);
+    $response = $client->request('GET', 'https://api.github.com/user', [
+        'auth' => ['user', 'pass'],
+    ]);
 
 Since the response is an instance of ``CodeIgniter\HTTP\Response`` you have all of the normal information
 available to you::
 
-	echo $response->getStatusCode();
-	echo $response->getBody();
-	echo $response->getHeader('Content-Type');
-	$language = $response->negotiateLanguage(['en', 'fr']);
+    echo $response->getStatusCode();
+    echo $response->getBody();
+    echo $response->getHeader('Content-Type');
+    $language = $response->negotiateLanguage(['en', 'fr']);
 
 While the ``request()`` method is the most flexible, you can also use the following shortcut methods. They
 each take the URL as the first parameter and an array of options as the second::
@@ -96,31 +96,31 @@ A ``baseURI`` can be set as one of the options during the instantiation of the c
 set a base URI, and then make all requests with that client using relative URLs. This is especially handy
 when working with APIs::
 
-	$client = \Config\Services::curlrequest([
-		'baseURI' => 'https://example.com/api/v1/',
-	]);
+    $client = \Config\Services::curlrequest([
+        'baseURI' => 'https://example.com/api/v1/',
+    ]);
 
-	// GET http:example.com/api/v1/photos
-	$client->get('photos');
+    // GET http:example.com/api/v1/photos
+    $client->get('photos');
 
-	// GET http:example.com/api/v1/photos/13
-	$client->delete('photos/13');
+    // GET http:example.com/api/v1/photos/13
+    $client->delete('photos/13');
 
 When a relative URI is provided to the ``request()`` method or any of the shortcut methods, it will be combined
 with the baseURI according to the rules described by
 `RFC 2986, section 2 <https://tools.ietf.org/html/rfc3986#section-5.2>`_. To save you some time, here are some
 examples of how the combinations are resolved.
 
-	=====================   ================   ========================
-	baseURI                 URI                Result
-	=====================   ================   ========================
-	`http://foo.com`        /bar               `http://foo.com/bar`
-	`http://foo.com/foo`    /bar               `http://foo.com/bar`
-	`http://foo.com/foo`    bar                `http://foo.com/bar`
-	`http://foo.com/foo/`   bar                `http://foo.com/foo/bar`
-	`http://foo.com`        `http://baz.com`   `http://baz.com`
-	`http://foo.com/?bar`   bar                `http://foo.com/bar`
-	=====================   ================   ========================
+    =====================   ================   ========================
+    baseURI                 URI                Result
+    =====================   ================   ========================
+    `http://foo.com`        /bar               `http://foo.com/bar`
+    `http://foo.com/foo`    /bar               `http://foo.com/bar`
+    `http://foo.com/foo`    bar                `http://foo.com/bar`
+    `http://foo.com/foo/`   bar                `http://foo.com/foo/bar`
+    `http://foo.com`        `http://baz.com`   `http://baz.com`
+    `http://foo.com/?bar`   bar                `http://foo.com/bar`
+    =====================   ================   ========================
 
 Using Responses
 ===============
@@ -130,29 +130,29 @@ methods. The most commonly used methods let you determine the response itself.
 
 You can get the status code and reason phrase of the response::
 
-	$code   = $response->getStatusCode(); // 200
-	$reason = $response->getReason(); // OK
+    $code   = $response->getStatusCode(); // 200
+    $reason = $response->getReason(); // OK
 
 You can retrieve headers from the response::
 
-	// Get a header line
-	echo $response->getHeaderLine('Content-Type');
+    // Get a header line
+    echo $response->getHeaderLine('Content-Type');
 
-	// Get all headers
-	foreach ($response->getHeaders() as $name => $value) {
-		echo $name .': '. $response->getHeaderLine($name) ."\n";
-	}
+    // Get all headers
+    foreach ($response->getHeaders() as $name => $value) {
+        echo $name .': '. $response->getHeaderLine($name) ."\n";
+    }
 
 The body can be retrieved using the ``getBody()`` method::
 
-	$body = $response->getBody();
+    $body = $response->getBody();
 
 The body is the raw body provided by the remote getServer. If the content type requires formatting, you will need
 to ensure that your script handles that::
 
-	if (strpos($response->getHeader('content-type'), 'application/json') !== false) {
-		$body = json_decode($body);
-	}
+    if (strpos($response->getHeader('content-type'), 'application/json') !== false) {
+        $body = json_decode($body);
+    }
 
 ***************
 Request Options
@@ -169,23 +169,23 @@ allows you to modify how that works.
 
 If you set the value to ``false``, then it will not follow any redirects at all::
 
-	$client->request('GET', 'http://example.com', ['allow_redirects' => false]);
+    $client->request('GET', 'http://example.com', ['allow_redirects' => false]);
 
 Setting it to ``true`` will apply the default settings to the request::
 
-	$client->request('GET', 'http://example.com', ['allow_redirects' => true]);
+    $client->request('GET', 'http://example.com', ['allow_redirects' => true]);
 
-	// Sets the following defaults:
-	'max'       => 5, // Maximum number of redirects to follow before stopping
-	'strict'    => true, // Ensure POST requests stay POST requests through redirects
-	'protocols' => ['http', 'https'] // Restrict redirects to one or more protocols
+    // Sets the following defaults:
+    'max'       => 5, // Maximum number of redirects to follow before stopping
+    'strict'    => true, // Ensure POST requests stay POST requests through redirects
+    'protocols' => ['http', 'https'] // Restrict redirects to one or more protocols
 
 You can pass in array as the value of the ``allow_redirects`` option to specify new settings in place of the defaults::
 
-	$client->request('GET', 'http://example.com', ['allow_redirects' => [
-		'max'       => 10,
-		'protocols' => ['https'] // Force HTTPS domains only.
-	]]);
+    $client->request('GET', 'http://example.com', ['allow_redirects' => [
+        'max'       => 10,
+        'protocols' => ['https'] // Force HTTPS domains only.
+    ]]);
 
 .. note:: Following redirects does not work when PHP is in safe_mode or open_basedir is enabled.
 
@@ -198,7 +198,7 @@ Digest authentication - this simply passes the username and password along for y
 array where the first element is the username, and the second is the password. The third parameter should be
 the type of authentication to use, either ``basic`` or ``digest``::
 
-	$client->request('GET', 'http://example.com', ['auth' => ['username', 'password', 'digest']]);
+    $client->request('GET', 'http://example.com', ['auth' => ['username', 'password', 'digest']]);
 
 body
 ====
@@ -206,12 +206,12 @@ body
 There are two ways to set the body of the request for request types that support them, like PUT, OR POST.
 The first way is to use the ``setBody()`` method::
 
-	$client->setBody($body) ->request('put', 'http://example.com');
+    $client->setBody($body) ->request('put', 'http://example.com');
 
 The second method is by passing a ``body`` option in. This is provided to maintain Guzzle API compatibility,
 and functions the exact same way as the previous example. The value must be a string::
 
-	$client->request('put', 'http://example.com', ['body' => $body]);
+    $client->request('put', 'http://example.com', ['body' => $body]);
 
 cert
 ====
@@ -229,7 +229,7 @@ By default, CodeIgniter does not impose a limit for cURL to attempt to connect t
 modify this value, you can do so by passing the amount of time in seconds with the ``connect_timeout`` option.
 You can pass 0 to wait indefinitely::
 
-	$response->request('GET', 'http://example.com', ['connect_timeout' => 0]);
+    $response->request('GET', 'http://example.com', ['connect_timeout' => 0]);
 
 cookie
 ======
@@ -238,7 +238,7 @@ This specifies the filename that CURL should use to read cookie values from, and
 to save cookie values to. This is done using the CURL_COOKIEJAR and CURL_COOKIEFILE options.
 An example::
 
-	$response->request('GET', 'http://example.com', ['cookie' => WRITEPATH . 'CookieSaver.txt']);
+    $response->request('GET', 'http://example.com', ['cookie' => WRITEPATH . 'CookieSaver.txt']);
 
 debug
 =====
@@ -248,19 +248,19 @@ script execution. This is done by passing CURLOPT_VERBOSE and echoing the output
 server via ``spark serve`` you will see the output in the console. Otherwise, the output will be written to
 the server's error log.
 
-	$response->request('GET', 'http://example.com', ['debug' => true]);
+    $response->request('GET', 'http://example.com', ['debug' => true]);
 
 You can pass a filename as the value for debug to have the output written to a file::
 
-	$response->request('GET', 'http://example.com', ['debug' => '/usr/local/curl_log.txt']);
+    $response->request('GET', 'http://example.com', ['debug' => '/usr/local/curl_log.txt']);
 
 delay
 =====
 
 Allows you to pause a number of milliseconds before sending the request::
 
-	// Delay for 2 seconds
-	$response->request('GET', 'http://example.com', ['delay' => 2000]);
+    // Delay for 2 seconds
+    $response->request('GET', 'http://example.com', ['delay' => 2000]);
 
 form_params
 ===========
@@ -269,12 +269,12 @@ You can send form data in an application/x-www-form-urlencoded POST request by p
 the ``form_params`` option. This will set the ``Content-Type`` header to ``application/x-www-form-urlencoded``
 if it's not already set::
 
-	$client->request('POST', '/post', [
-		'form_params' => [
-			'foo' => 'bar',
-			'baz' => ['hi', 'there'],
-		],
-	]);
+    $client->request('POST', '/post', [
+        'form_params' => [
+            'foo' => 'bar',
+            'baz' => ['hi', 'there'],
+        ],
+    ]);
 
 .. note:: ``form_params`` cannot be used with the ``multipart`` option. You will need to use one or the other.
         Use ``form_params`` for ``application/x-www-form-urlencoded`` request, and ``multipart`` for ``multipart/form-data``
@@ -287,13 +287,13 @@ While you can set any headers this request needs by using the ``setHeader()`` me
 array of headers in as an option. Each key is the name of a header, and each value is a string or array of strings
 representing the header field values::
 
-	$client->request('get', '/', [
-		'headers' => [
-			'User-Agent' => 'testing/1.0',
-			'Accept'     => 'application/json',
-			'X-Foo'      => ['Bar', 'Baz'],
-		],
-	]);
+    $client->request('get', '/', [
+        'headers' => [
+            'User-Agent' => 'testing/1.0',
+            'Accept'     => 'application/json',
+            'X-Foo'      => ['Bar', 'Baz'],
+        ],
+    ]);
 
 If headers are passed into the constructor they are treated as default values that will be overridden later by any
 further headers arrays or calls to ``setHeader()``.
@@ -318,7 +318,7 @@ The ``json`` option is used to easily upload JSON encoded data as the body of a
 of ``application/json`` is added, overwriting any Content-Type that might be already set. The data provided to
 this option can be any value that ``json_encode()`` accepts::
 
-	$response = $client->request('PUT', '/put', ['json' => ['foo' => 'bar']]);
+    $response = $client->request('PUT', '/put', ['json' => ['foo' => 'bar']]);
 
 .. note:: This option does not allow for any customization of the ``json_encode()`` function, or the Content-Type
         header. If you need that ability, you will need to encode the data manually, passing it through the ``setBody()``
@@ -332,10 +332,10 @@ the `CURLFile Class <https://www.php.net/manual/en/class.curlfile.php>`_. The va
 of POST data to send. For safer usage, the legacy method of uploading files by prefixing their name with an `@`
 has been disabled. Any files that you want to send must be passed as instances of CURLFile::
 
-	$post_data = [
-		'foo'      => 'bar',
-		'userfile' => new \CURLFile('/path/to/file.txt'),
-	];
+    $post_data = [
+        'foo'      => 'bar',
+        'userfile' => new \CURLFile('/path/to/file.txt'),
+    ];
 
 .. note:: ``multipart`` cannot be used with the ``form_params`` option. You can only use one or the other. Use
         ``form_params`` for ``application/x-www-form-urlencoded`` requests, and ``multipart`` for ``multipart/form-data``
@@ -346,8 +346,8 @@ query
 
 You can pass along data to send as query string variables by passing an associative array as the ``query`` option::
 
-	// Send a GET request to /get?foo=bar
-	$client->request('GET', '/get', ['query' => ['foo' => 'bar']]);
+    // Send a GET request to /get?foo=bar
+    $client->request('GET', '/get', ['query' => ['foo' => 'bar']]);
 
 timeout
 =======
@@ -355,14 +355,14 @@ timeout
 By default, cURL functions are allowed to run as long as they take, with no time limit. You can modify this with the ``timeout``
 option. The value should be the number of seconds you want the functions to execute for. Use 0 to wait indefinitely::
 
-	$response->request('GET', 'http://example.com', ['timeout' => 5]);
+    $response->request('GET', 'http://example.com', ['timeout' => 5]);
 
 user_agent
 ==========
 
 Allows specifying the User Agent for requests::
 
-	$response->request('GET', 'http://example.com', ['user_agent' => 'CodeIgniter Framework v4']);
+    $response->request('GET', 'http://example.com', ['user_agent' => 'CodeIgniter Framework v4']);
 
 verify
 ======
@@ -373,14 +373,14 @@ will disable the certificate verification (this is insecure, and allows man-in-t
 to a string that contains the path to a CA bundle to enable verification with a custom certificate. The default value
 is true::
 
-	// Use the system's CA bundle (this is the default setting)
-	$client->request('GET', '/', ['verify' => true]);
+    // Use the system's CA bundle (this is the default setting)
+    $client->request('GET', '/', ['verify' => true]);
 
-	// Use a custom SSL certificate on disk.
-	$client->request('GET', '/', ['verify' => '/path/to/cert.pem']);
+    // Use a custom SSL certificate on disk.
+    $client->request('GET', '/', ['verify' => '/path/to/cert.pem']);
 
-	// Disable validation entirely. (Insecure!)
-	$client->request('GET', '/', ['verify' => false]);
+    // Disable validation entirely. (Insecure!)
+    $client->request('GET', '/', ['verify' => false]);
 
 version
 =======
@@ -388,5 +388,5 @@ version
 To set the HTTP protocol to use, you can pass a string or float with the version number (typically either 1.0
 or 1.1, 2.0 is currently unsupported.)::
 
-	// Force HTTP/1.0
-	$client->request('GET', '/', ['version' => 1.0]);
+    // Force HTTP/1.0
+    $client->request('GET', '/', ['version' => 1.0]);
diff --git a/user_guide_src/source/outgoing/alternative_php.rst b/user_guide_src/source/outgoing/alternative_php.rst
index 702953fee287..70a86e2ebb75 100644
--- a/user_guide_src/source/outgoing/alternative_php.rst
+++ b/user_guide_src/source/outgoing/alternative_php.rst
@@ -15,11 +15,11 @@ Alternative Echos
 
 Normally to echo, or print out a variable you would do this::
 
-	<?php echo $variable; ?>
+    <?php echo $variable; ?>
 
 With the alternative syntax you can instead do it this way::
 
-	<?= $variable ?>
+    <?= $variable ?>
 
 Alternative Control Structures
 ==============================
@@ -27,15 +27,15 @@ Alternative Control Structures
 Controls structures, like if, for, foreach, and while can be written in
 a simplified format as well. Here is an example using ``foreach``::
 
-	<ul>
+    <ul>
 
-	<?php foreach ($todo as $item) : ?>
+    <?php foreach ($todo as $item) : ?>
 
-		<li><?= $item ?></li>
+        <li><?= $item ?></li>
 
-	<?php endforeach ?>
+    <?php endforeach ?>
 
-	</ul>
+    </ul>
 
 Notice that there are no braces. Instead, the end brace is replaced with
 ``endforeach``. Each of the control structures listed above has a similar
@@ -46,16 +46,16 @@ Also notice that instead of using a semicolon after each structure
 
 Here is another example, using ``if``/``elseif``/``else``. Notice the colons::
 
-	<?php if ($username === 'sally') : ?>
+    <?php if ($username === 'sally') : ?>
 
-		<h3>Hi Sally</h3>
+        <h3>Hi Sally</h3>
 
-	<?php elseif ($username === 'joe') : ?>
+    <?php elseif ($username === 'joe') : ?>
 
-		<h3>Hi Joe</h3>
+        <h3>Hi Joe</h3>
 
-	<?php else : ?>
+    <?php else : ?>
 
-		<h3>Hi unknown user</h3>
+        <h3>Hi unknown user</h3>
 
-	<?php endif ?>
+    <?php endif ?>

From dc5a313f3f3c6e281f003b27d99123e5ad6ac95c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 21 Sep 2021 14:19:13 +0900
Subject: [PATCH 0287/2325] docs: replace tab with space

---
 user_guide_src/source/helpers/text_helper.rst | 158 +++----
 user_guide_src/source/libraries/email.rst     | 396 +++++++++---------
 .../source/libraries/encryption.rst           | 172 ++++----
 user_guide_src/source/libraries/images.rst    | 166 ++++----
 user_guide_src/source/libraries/publisher.rst | 388 ++++++++---------
 user_guide_src/source/libraries/sessions.rst  | 268 ++++++------
 .../source/libraries/user_agent.rst           | 178 ++++----
 user_guide_src/source/outgoing/table.rst      | 340 +++++++--------
 user_guide_src/source/outgoing/views.rst      | 164 ++++----
 9 files changed, 1115 insertions(+), 1115 deletions(-)

diff --git a/user_guide_src/source/helpers/text_helper.rst b/user_guide_src/source/helpers/text_helper.rst
index 6b875e3d7e36..98a6f3b9e332 100755
--- a/user_guide_src/source/helpers/text_helper.rst
+++ b/user_guide_src/source/helpers/text_helper.rst
@@ -21,10 +21,10 @@ The following functions are available:
 
 .. php:function:: random_string([$type = 'alnum'[, $len = 8]])
 
-    :param	string	$type: Randomization type
-    :param	int	$len: Output string length
-    :returns:	A random string
-    :rtype:	string
+    :param    string    $type: Randomization type
+    :param    int    $len: Output string length
+    :returns:    A random string
+    :rtype:    string
 
     Generates a random string based on the type and length you specify.
     Useful for creating passwords or generating random hashes.
@@ -47,11 +47,11 @@ The following functions are available:
 
 .. php:function:: increment_string($str[, $separator = '_'[, $first = 1]])
 
-    :param	string	$str: Input string
-    :param	string	$separator: Separator to append a duplicate number with
-    :param	int	$first: Starting number
-    :returns:	An incremented string
-    :rtype:	string
+    :param    string    $str: Input string
+    :param    string    $separator: Separator to append a duplicate number with
+    :param    int    $first: Starting number
+    :returns:    An incremented string
+    :rtype:    string
 
     Increments a string by appending a number to it or increasing the
     number. Useful for creating "copies" or a file or duplicating database
@@ -65,9 +65,9 @@ The following functions are available:
 
 .. php:function:: alternator($args)
 
-    :param	mixed	$args: A variable number of arguments
-    :returns:	Alternated string(s)
-    :rtype:	mixed
+    :param    mixed    $args: A variable number of arguments
+    :returns:    Alternated string(s)
+    :rtype:    mixed
 
     Allows two or more items to be alternated between, when cycling through
     a loop. Example::
@@ -90,9 +90,9 @@ The following functions are available:
 
 .. php:function:: reduce_double_slashes($str)
 
-    :param	string	$str: Input string
-    :returns:	A string with normalized slashes
-    :rtype:	string
+    :param    string    $str: Input string
+    :returns:    A string with normalized slashes
+    :rtype:    string
 
     Converts double slashes in a string to a single slash, except those
     found in URL protocol prefixes (e.g., http&#58;//).
@@ -104,9 +104,9 @@ The following functions are available:
 
 .. php:function:: strip_slashes($data)
 
-    :param	mixed	$data: Input string or an array of strings
-    :returns:	String(s) with stripped slashes
-    :rtype:	mixed
+    :param    mixed    $data: Input string or an array of strings
+    :returns:    String(s) with stripped slashes
+    :rtype:    mixed
 
     Removes any slashes from an array of strings.
 
@@ -132,11 +132,11 @@ The following functions are available:
 
 .. php:function:: reduce_multiples($str[, $character = ''[, $trim = false]])
 
-    :param	string	$str: Text to search in
-    :param	string	$character: Character to reduce
-    :param	bool	$trim: Whether to also trim the specified character
-    :returns:	Reduced string
-    :rtype:	string
+    :param    string    $str: Text to search in
+    :param    string    $character: Character to reduce
+    :param    bool    $trim: Whether to also trim the specified character
+    :returns:    Reduced string
+    :rtype:    string
 
     Reduces multiple instances of a particular character occurring directly
     after each other. Example::
@@ -152,9 +152,9 @@ The following functions are available:
 
 .. php:function:: quotes_to_entities($str)
 
-    :param	string	$str: Input string
-    :returns:	String with quotes converted to HTML entities
-    :rtype:	string
+    :param    string    $str: Input string
+    :returns:    String with quotes converted to HTML entities
+    :rtype:    string
 
     Converts single and double quotes in a string to the corresponding HTML
     entities. Example::
@@ -164,9 +164,9 @@ The following functions are available:
 
 .. php:function:: strip_quotes($str)
 
-    :param	string	$str: Input string
-    :returns:	String with quotes stripped
-    :rtype:	string
+    :param    string    $str: Input string
+    :returns:    String with quotes stripped
+    :rtype:    string
 
     Removes single and double quotes from a string. Example::
 
@@ -175,11 +175,11 @@ The following functions are available:
 
 .. php:function:: word_limiter($str[, $limit = 100[, $end_char = '&#8230;']])
 
-    :param	string	$str: Input string
-    :param	int	$limit: Limit
-    :param	string	$end_char: End character (usually an ellipsis)
-    :returns:	Word-limited string
-    :rtype:	string
+    :param    string    $str: Input string
+    :param    int    $limit: Limit
+    :param    string    $end_char: End character (usually an ellipsis)
+    :returns:    Word-limited string
+    :rtype:    string
 
     Truncates a string to the number of *words* specified. Example::
 
@@ -192,11 +192,11 @@ The following functions are available:
 
 .. php:function:: character_limiter($str[, $n = 500[, $end_char = '&#8230;']])
 
-    :param	string	$str: Input string
-    :param	int	$n: Number of characters
-    :param	string	$end_char: End character (usually an ellipsis)
-    :returns:	Character-limited string
-    :rtype:	string
+    :param    string    $str: Input string
+    :param    int    $n: Number of characters
+    :param    string    $end_char: End character (usually an ellipsis)
+    :returns:    Character-limited string
+    :rtype:    string
 
     Truncates a string to the number of *characters* specified. It
     maintains the integrity of words so the character count may be slightly
@@ -216,9 +216,9 @@ The following functions are available:
 
 .. php:function:: ascii_to_entities($str)
 
-    :param	string	$str: Input string
-    :returns:	A string with ASCII values converted to entities
-    :rtype:	string
+    :param    string    $str: Input string
+    :returns:    A string with ASCII values converted to entities
+    :rtype:    string
 
     Converts ASCII values to character entities, including high ASCII and MS
     Word characters that can cause problems when used in a web page, so that
@@ -234,19 +234,19 @@ The following functions are available:
 
 .. php:function:: entities_to_ascii($str[, $all = true])
 
-    :param	string	$str: Input string
-    :param	bool	$all: Whether to convert unsafe entities as well
-    :returns:	A string with HTML entities converted to ASCII characters
-    :rtype:	string
+    :param    string    $str: Input string
+    :param    bool    $all: Whether to convert unsafe entities as well
+    :returns:    A string with HTML entities converted to ASCII characters
+    :rtype:    string
 
     This function does the opposite of :php:func:`ascii_to_entities()`.
     It turns character entities back into ASCII.
 
 .. php:function:: convert_accented_characters($str)
 
-    :param	string	$str: Input string
-    :returns:	A string with accented characters converted
-    :rtype:	string
+    :param    string    $str: Input string
+    :returns:    A string with accented characters converted
+    :rtype:    string
 
     Transliterates high ASCII characters to low ASCII equivalents. Useful
     when non-English characters need to be used where only standard ASCII
@@ -262,11 +262,11 @@ The following functions are available:
 
 .. php:function:: word_censor($str, $censored[, $replacement = ''])
 
-    :param	string	$str: Input string
-    :param	array	$censored: List of bad words to censor
-    :param	string	$replacement: What to replace bad words with
-    :returns:	Censored string
-    :rtype:	string
+    :param    string    $str: Input string
+    :param    array    $censored: List of bad words to censor
+    :param    string    $replacement: What to replace bad words with
+    :returns:    Censored string
+    :rtype:    string
 
     Enables you to censor words within a text string. The first parameter
     will contain the original string. The second will contain an array of
@@ -281,9 +281,9 @@ The following functions are available:
 
 .. php:function:: highlight_code($str)
 
-    :param	string	$str: Input string
-    :returns:	String with code highlighted via HTML
-    :rtype:	string
+    :param    string    $str: Input string
+    :returns:    String with code highlighted via HTML
+    :rtype:    string
 
     Colorizes a string of code (PHP, HTML, etc.). Example::
 
@@ -294,12 +294,12 @@ The following functions are available:
 
 .. php:function:: highlight_phrase($str, $phrase[, $tag_open = '<mark>'[, $tag_close = '</mark>']])
 
-    :param	string	$str: Input string
-    :param	string	$phrase: Phrase to highlight
-    :param	string	$tag_open: Opening tag used for the highlight
-    :param	string	$tag_close: Closing tag for the highlight
-    :returns:	String with a phrase highlighted via HTML
-    :rtype:	string
+    :param    string    $str: Input string
+    :param    string    $phrase: Phrase to highlight
+    :param    string    $tag_open: Opening tag used for the highlight
+    :param    string    $tag_close: Closing tag for the highlight
+    :returns:    String with a phrase highlighted via HTML
+    :rtype:    string
 
     Will highlight a phrase within a text string. The first parameter will
     contain the original string, the second will contain the phrase you wish
@@ -327,10 +327,10 @@ The following functions are available:
 
 .. php:function:: word_wrap($str[, $charlim = 76])
 
-    :param	string	$str: Input string
-    :param	int	$charlim: Character limit
-    :returns:	Word-wrapped string
-    :rtype:	string
+    :param    string    $str: Input string
+    :param    int    $charlim: Character limit
+    :returns:    Word-wrapped string
+    :rtype:    string
 
     Wraps text at the specified *character* count while maintaining
     complete words.
@@ -350,12 +350,12 @@ The following functions are available:
 
 .. php:function:: ellipsize($str, $max_length[, $position = 1[, $ellipsis = '&hellip;']])
 
-    :param	string	$str: Input string
-    :param	int	$max_length: String length limit
-    :param	mixed	$position: Position to split at (int or float)
-    :param	string	$ellipsis: What to use as the ellipsis character
-    :returns:	Ellipsized string
-    :rtype:	string
+    :param    string    $str: Input string
+    :param    int    $max_length: String length limit
+    :param    mixed    $position: Position to split at (int or float)
+    :param    string    $ellipsis: What to use as the ellipsis character
+    :returns:    Ellipsized string
+    :rtype:    string
 
     This function will strip tags from a string, split it at a defined
     maximum length, and insert an ellipsis.
@@ -380,12 +380,12 @@ The following functions are available:
 
 .. php:function:: excerpt($text, $phrase = false, $radius = 100, $ellipsis = '...')
 
-    :param	string	$text: Text to extract an excerpt
-    :param	string	$phrase: Phrase or word to extract the text around
-    :param	int		$radius: Number of characters before and after $phrase
-    :param	string	$ellipsis: What to use as the ellipsis character
-    :returns:	Excerpt.
-    :rtype:		string
+    :param    string    $text: Text to extract an excerpt
+    :param    string    $phrase: Phrase or word to extract the text around
+    :param    int        $radius: Number of characters before and after $phrase
+    :param    string    $ellipsis: What to use as the ellipsis character
+    :returns:    Excerpt.
+    :rtype:        string
 
     This function will extract $radius number of characters before and after the
     central $phrase with an ellipsis before and after.
diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index 55604ad6bbee..f57f3cf93d8d 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -32,17 +32,17 @@ set your preferences in the **app/Config/Email.php** file.
 
 Here is a basic example demonstrating how you might send email::
 
-	$email = \Config\Services::email();
+    $email = \Config\Services::email();
 
-	$email->setFrom('your@example.com', 'Your Name');
-	$email->setTo('someone@example.com');
-	$email->setCC('another@another-example.com');
-	$email->setBCC('them@their-example.com');
+    $email->setFrom('your@example.com', 'Your Name');
+    $email->setTo('someone@example.com');
+    $email->setCC('another@another-example.com');
+    $email->setBCC('them@their-example.com');
 
-	$email->setSubject('Email Test');
-	$email->setMessage('Testing the email class.');
+    $email->setSubject('Email Test');
+    $email->setMessage('Testing the email class.');
 
-	$email->send();
+    $email->send();
 
 Setting Email Preferences
 =========================
@@ -56,15 +56,15 @@ Preferences are set by passing an array of preference values to the
 email initialize method. Here is an example of how you might set some
 preferences::
 
-	$config['protocol'] = 'sendmail';
-	$config['mailPath'] = '/usr/sbin/sendmail';
-	$config['charset']  = 'iso-8859-1';
-	$config['wordWrap'] = true;
+    $config['protocol'] = 'sendmail';
+    $config['mailPath'] = '/usr/sbin/sendmail';
+    $config['charset']  = 'iso-8859-1';
+    $config['wordWrap'] = true;
 
-	$email->initialize($config);
+    $email->initialize($config);
 
 .. note:: Most of the preferences have default values that will be used
-	if you do not set them.
+    if you do not set them.
 
 Setting Email Preferences in a Config File
 ------------------------------------------
@@ -157,13 +157,13 @@ causing it to become un-clickable by the person receiving it.
 CodeIgniter lets you manually override word wrapping within part of your
 message like this::
 
-	The text of your email that
-	gets wrapped normally.
+    The text of your email that
+    gets wrapped normally.
 
-	{unwrap}http://example.com/a_long_link_that_should_not_be_wrapped.html{/unwrap}
+    {unwrap}http://example.com/a_long_link_that_should_not_be_wrapped.html{/unwrap}
 
-	More text that will be
-	wrapped normally.
+    More text that will be
+    wrapped normally.
 
 
 Place the item you do not want word-wrapped between: {unwrap} {/unwrap}
@@ -174,266 +174,266 @@ Class Reference
 
 .. php:class:: CodeIgniter\\Email\\Email
 
-	.. php:method:: setFrom($from[, $name = ''[, $returnPath = null]])
+    .. php:method:: setFrom($from[, $name = ''[, $returnPath = null]])
 
-		:param	string	$from: "From" e-mail address
-		:param	string	$name: "From" display name
-		:param	string	$returnPath: Optional email address to redirect undelivered e-mail to
-		:returns:	CodeIgniter\\Email\\Email instance (method chaining)
-		:rtype:	CodeIgniter\\Email\\Email
+        :param    string    $from: "From" e-mail address
+        :param    string    $name: "From" display name
+        :param    string    $returnPath: Optional email address to redirect undelivered e-mail to
+        :returns:    CodeIgniter\\Email\\Email instance (method chaining)
+        :rtype:    CodeIgniter\\Email\\Email
 
-		Sets the email address and name of the person sending the email::
+        Sets the email address and name of the person sending the email::
 
-			$email->setFrom('you@example.com', 'Your Name');
+            $email->setFrom('you@example.com', 'Your Name');
 
-		You can also set a Return-Path, to help redirect undelivered mail::
+        You can also set a Return-Path, to help redirect undelivered mail::
 
-			$email->setFrom('you@example.com', 'Your Name', 'returned_emails@example.com');
+            $email->setFrom('you@example.com', 'Your Name', 'returned_emails@example.com');
 
-		.. note:: Return-Path can't be used if you've configured 'smtp' as
-			your protocol.
+        .. note:: Return-Path can't be used if you've configured 'smtp' as
+            your protocol.
 
-	.. php:method:: setReplyTo($replyto[, $name = ''])
+    .. php:method:: setReplyTo($replyto[, $name = ''])
 
-		:param	string	$replyto: E-mail address for replies
-		:param	string	$name: Display name for the reply-to e-mail address
-		:returns:	CodeIgniter\\Email\\Email instance (method chaining)
-		:rtype:	CodeIgniter\\Email\\Email
+        :param    string    $replyto: E-mail address for replies
+        :param    string    $name: Display name for the reply-to e-mail address
+        :returns:    CodeIgniter\\Email\\Email instance (method chaining)
+        :rtype:    CodeIgniter\\Email\\Email
 
-		Sets the reply-to address. If the information is not provided the
-		information in the `setFrom <#setFrom>`_ method is used. Example::
+        Sets the reply-to address. If the information is not provided the
+        information in the `setFrom <#setFrom>`_ method is used. Example::
 
-			$email->setReplyTo('you@example.com', 'Your Name');
+            $email->setReplyTo('you@example.com', 'Your Name');
 
-	.. php:method:: setTo($to)
+    .. php:method:: setTo($to)
 
-		:param	mixed	$to: Comma-delimited string or an array of e-mail addresses
-		:returns:	CodeIgniter\\Email\\Email instance (method chaining)
-		:rtype:	CodeIgniter\\Email\\Email
+        :param    mixed    $to: Comma-delimited string or an array of e-mail addresses
+        :returns:    CodeIgniter\\Email\\Email instance (method chaining)
+        :rtype:    CodeIgniter\\Email\\Email
 
-		Sets the email address(s) of the recipient(s). Can be a single e-mail,
-		a comma-delimited list or an array::
+        Sets the email address(s) of the recipient(s). Can be a single e-mail,
+        a comma-delimited list or an array::
 
-			$email->setTo('someone@example.com');
+            $email->setTo('someone@example.com');
 
-		::
+        ::
 
-			$email->setTo('one@example.com, two@example.com, three@example.com');
+            $email->setTo('one@example.com, two@example.com, three@example.com');
 
-		::
+        ::
 
-			$email->setTo(['one@example.com', 'two@example.com', 'three@example.com']);
+            $email->setTo(['one@example.com', 'two@example.com', 'three@example.com']);
 
-	.. php:method:: setCC($cc)
+    .. php:method:: setCC($cc)
 
-		:param	mixed	$cc: Comma-delimited string or an array of e-mail addresses
-		:returns:	CodeIgniter\\Email\\Email instance (method chaining)
-		:rtype:	CodeIgniter\\Email\\Email
+        :param    mixed    $cc: Comma-delimited string or an array of e-mail addresses
+        :returns:    CodeIgniter\\Email\\Email instance (method chaining)
+        :rtype:    CodeIgniter\\Email\\Email
 
-		Sets the CC email address(s). Just like the "to", can be a single e-mail,
-		a comma-delimited list or an array.
+        Sets the CC email address(s). Just like the "to", can be a single e-mail,
+        a comma-delimited list or an array.
 
-	.. php:method:: setBCC($bcc[, $limit = ''])
+    .. php:method:: setBCC($bcc[, $limit = ''])
 
-		:param	mixed	$bcc: Comma-delimited string or an array of e-mail addresses
-		:param	int	$limit: Maximum number of e-mails to send per batch
-		:returns:	CodeIgniter\\Email\\Email instance (method chaining)
-		:rtype:	CodeIgniter\\Email\\Email
+        :param    mixed    $bcc: Comma-delimited string or an array of e-mail addresses
+        :param    int    $limit: Maximum number of e-mails to send per batch
+        :returns:    CodeIgniter\\Email\\Email instance (method chaining)
+        :rtype:    CodeIgniter\\Email\\Email
 
-		Sets the BCC email address(s). Just like the ``setTo()`` method, can be a single
-		e-mail, a comma-delimited list or an array.
+        Sets the BCC email address(s). Just like the ``setTo()`` method, can be a single
+        e-mail, a comma-delimited list or an array.
 
-		If ``$limit`` is set, "batch mode" will be enabled, which will send
-		the emails to batches, with each batch not exceeding the specified
-		``$limit``.
+        If ``$limit`` is set, "batch mode" will be enabled, which will send
+        the emails to batches, with each batch not exceeding the specified
+        ``$limit``.
 
-	.. php:method:: setSubject($subject)
+    .. php:method:: setSubject($subject)
 
-		:param	string	$subject: E-mail subject line
-		:returns:	CodeIgniter\\Email\\Email instance (method chaining)
-		:rtype:	CodeIgniter\\Email\\Email
+        :param    string    $subject: E-mail subject line
+        :returns:    CodeIgniter\\Email\\Email instance (method chaining)
+        :rtype:    CodeIgniter\\Email\\Email
 
-		Sets the email subject::
+        Sets the email subject::
 
-			$email->setSubject('This is my subject');
+            $email->setSubject('This is my subject');
 
-	.. php:method:: setMessage($body)
+    .. php:method:: setMessage($body)
 
-		:param	string	$body: E-mail message body
-		:returns:	CodeIgniter\\Email\\Email instance (method chaining)
-		:rtype:	CodeIgniter\\Email\\Email
+        :param    string    $body: E-mail message body
+        :returns:    CodeIgniter\\Email\\Email instance (method chaining)
+        :rtype:    CodeIgniter\\Email\\Email
 
-		Sets the e-mail message body::
+        Sets the e-mail message body::
 
-			$email->setMessage('This is my message');
+            $email->setMessage('This is my message');
 
-	.. php:method:: setAltMessage($str)
+    .. php:method:: setAltMessage($str)
 
-		:param	string	$str: Alternative e-mail message body
-		:returns:	CodeIgniter\\Email\\Email instance (method chaining)
-		:rtype:	CodeIgniter\\Email\\Email
+        :param    string    $str: Alternative e-mail message body
+        :returns:    CodeIgniter\\Email\\Email instance (method chaining)
+        :rtype:    CodeIgniter\\Email\\Email
 
-		Sets the alternative e-mail message body::
+        Sets the alternative e-mail message body::
 
-			$email->setAltMessage('This is the alternative message');
+            $email->setAltMessage('This is the alternative message');
 
-		This is an optional message string which can be used if you send
-		HTML formatted email. It lets you specify an alternative message
-		with no HTML formatting which is added to the header string for
-		people who do not accept HTML email. If you do not set your own
-		message CodeIgniter will extract the message from your HTML email
-		and strip the tags.
+        This is an optional message string which can be used if you send
+        HTML formatted email. It lets you specify an alternative message
+        with no HTML formatting which is added to the header string for
+        people who do not accept HTML email. If you do not set your own
+        message CodeIgniter will extract the message from your HTML email
+        and strip the tags.
 
-	.. php:method:: setHeader($header, $value)
-		:noindex:
+    .. php:method:: setHeader($header, $value)
+        :noindex:
 
-		:param	string	$header: Header name
-		:param	string	$value: Header value
-		:returns:	CodeIgniter\\Email\\Email instance (method chaining)
-		:rtype: CodeIgniter\\Email\\Email
+        :param    string    $header: Header name
+        :param    string    $value: Header value
+        :returns:    CodeIgniter\\Email\\Email instance (method chaining)
+        :rtype: CodeIgniter\\Email\\Email
 
-		Appends additional headers to the e-mail::
+        Appends additional headers to the e-mail::
 
-			$email->setHeader('Header1', 'Value1');
-			$email->setHeader('Header2', 'Value2');
+            $email->setHeader('Header1', 'Value1');
+            $email->setHeader('Header2', 'Value2');
 
-	.. php:method:: clear($clearAttachments = false)
+    .. php:method:: clear($clearAttachments = false)
 
-		:param	bool	$clearAttachments: Whether or not to clear attachments
-		:returns:	CodeIgniter\\Email\\Email instance (method chaining)
-		:rtype: CodeIgniter\\Email\\Email
+        :param    bool    $clearAttachments: Whether or not to clear attachments
+        :returns:    CodeIgniter\\Email\\Email instance (method chaining)
+        :rtype: CodeIgniter\\Email\\Email
 
-		Initializes all the email variables to an empty state. This method
-		is intended for use if you run the email sending method in a loop,
-		permitting the data to be reset between cycles.
+        Initializes all the email variables to an empty state. This method
+        is intended for use if you run the email sending method in a loop,
+        permitting the data to be reset between cycles.
 
-		::
+        ::
 
-			foreach ($list as $name => $address)
-			{
-				$email->clear();
+            foreach ($list as $name => $address)
+            {
+                $email->clear();
 
-				$email->setTo($address);
-				$email->setFrom('your@example.com');
-				$email->setSubject('Here is your info '.$name);
-				$email->setMessage('Hi ' . $name . ' Here is the info you requested.');
-				$email->send();
-			}
+                $email->setTo($address);
+                $email->setFrom('your@example.com');
+                $email->setSubject('Here is your info '.$name);
+                $email->setMessage('Hi ' . $name . ' Here is the info you requested.');
+                $email->send();
+            }
 
-		If you set the parameter to true any attachments will be cleared as
-		well::
+        If you set the parameter to true any attachments will be cleared as
+        well::
 
-			$email->clear(true);
+            $email->clear(true);
 
-	.. php:method:: send($autoClear = true)
+    .. php:method:: send($autoClear = true)
 
-		:param	bool	$autoClear: Whether to clear message data automatically
-		:returns:	true on success, false on failure
-		:rtype:	bool
+        :param    bool    $autoClear: Whether to clear message data automatically
+        :returns:    true on success, false on failure
+        :rtype:    bool
 
-		The e-mail sending method. Returns boolean true or false based on
-		success or failure, enabling it to be used conditionally::
+        The e-mail sending method. Returns boolean true or false based on
+        success or failure, enabling it to be used conditionally::
 
-			if (! $email->send())
-			{
-				// Generate error
-			}
+            if (! $email->send())
+            {
+                // Generate error
+            }
 
-		This method will automatically clear all parameters if the request was
-		successful. To stop this behaviour pass false::
+        This method will automatically clear all parameters if the request was
+        successful. To stop this behaviour pass false::
 
-			if ($email->send(false))
-			{
-				// Parameters won't be cleared
-			}
+            if ($email->send(false))
+            {
+                // Parameters won't be cleared
+            }
 
-		.. note:: In order to use the ``printDebugger()`` method, you need
-			to avoid clearing the email parameters.
+        .. note:: In order to use the ``printDebugger()`` method, you need
+            to avoid clearing the email parameters.
 
-		.. note:: If ``BCCBatchMode`` is enabled, and there are more than
-			``BCCBatchSize`` recipients, this method will always return
-			boolean ``true``.
+        .. note:: If ``BCCBatchMode`` is enabled, and there are more than
+            ``BCCBatchSize`` recipients, this method will always return
+            boolean ``true``.
 
-	.. php:method:: attach($filename[, $disposition = ''[, $newname = null[, $mime = '']]])
+    .. php:method:: attach($filename[, $disposition = ''[, $newname = null[, $mime = '']]])
 
-		:param	string	$filename: File name
-		:param	string	$disposition: 'disposition' of the attachment. Most
-			email clients make their own decision regardless of the MIME
-			specification used here. https://www.iana.org/assignments/cont-disp/cont-disp.xhtml
-		:param	string	$newname: Custom file name to use in the e-mail
-		:param	string	$mime: MIME type to use (useful for buffered data)
-		:returns:	CodeIgniter\\Email\\Email instance (method chaining)
-		:rtype:	CodeIgniter\\Email\\Email
+        :param    string    $filename: File name
+        :param    string    $disposition: 'disposition' of the attachment. Most
+            email clients make their own decision regardless of the MIME
+            specification used here. https://www.iana.org/assignments/cont-disp/cont-disp.xhtml
+        :param    string    $newname: Custom file name to use in the e-mail
+        :param    string    $mime: MIME type to use (useful for buffered data)
+        :returns:    CodeIgniter\\Email\\Email instance (method chaining)
+        :rtype:    CodeIgniter\\Email\\Email
 
-		Enables you to send an attachment. Put the file path/name in the first
-		parameter. For multiple attachments use the method multiple times.
-		For example::
+        Enables you to send an attachment. Put the file path/name in the first
+        parameter. For multiple attachments use the method multiple times.
+        For example::
 
-			$email->attach('/path/to/photo1.jpg');
-			$email->attach('/path/to/photo2.jpg');
-			$email->attach('/path/to/photo3.jpg');
+            $email->attach('/path/to/photo1.jpg');
+            $email->attach('/path/to/photo2.jpg');
+            $email->attach('/path/to/photo3.jpg');
 
-		To use the default disposition (attachment), leave the second parameter blank,
-		otherwise use a custom disposition::
+        To use the default disposition (attachment), leave the second parameter blank,
+        otherwise use a custom disposition::
 
-			$email->attach('image.jpg', 'inline');
+            $email->attach('image.jpg', 'inline');
 
-		You can also use a URL::
+        You can also use a URL::
 
-			$email->attach('http://example.com/filename.pdf');
+            $email->attach('http://example.com/filename.pdf');
 
-		If you'd like to use a custom file name, you can use the third parameter::
+        If you'd like to use a custom file name, you can use the third parameter::
 
-			$email->attach('filename.pdf', 'attachment', 'report.pdf');
+            $email->attach('filename.pdf', 'attachment', 'report.pdf');
 
-		If you need to use a buffer string instead of a real - physical - file you can
-		use the first parameter as buffer, the third parameter as file name and the fourth
-		parameter as mime-type::
+        If you need to use a buffer string instead of a real - physical - file you can
+        use the first parameter as buffer, the third parameter as file name and the fourth
+        parameter as mime-type::
 
-			$email->attach($buffer, 'attachment', 'report.pdf', 'application/pdf');
+            $email->attach($buffer, 'attachment', 'report.pdf', 'application/pdf');
 
-	.. php:method:: setAttachmentCID($filename)
+    .. php:method:: setAttachmentCID($filename)
 
-		:param	string	$filename: Existing attachment filename
-		:returns:	Attachment Content-ID or false if not found
-		:rtype:	string
+        :param    string    $filename: Existing attachment filename
+        :returns:    Attachment Content-ID or false if not found
+        :rtype:    string
 
-		Sets and returns an attachment's Content-ID, which enables your to embed an inline
-		(picture) attachment into HTML. First parameter must be the already attached file name.
-		::
+        Sets and returns an attachment's Content-ID, which enables your to embed an inline
+        (picture) attachment into HTML. First parameter must be the already attached file name.
+        ::
 
-			$filename = '/img/photo1.jpg';
-			$email->attach($filename);
+            $filename = '/img/photo1.jpg';
+            $email->attach($filename);
 
-			foreach ($list as $address) {
-				$email->setTo($address);
-				$cid = $email->setAttachmentCID($filename);
-				$email->setMessage('<img src="cid:'. $cid .'" alt="photo1" />');
-				$email->send();
-			}
+            foreach ($list as $address) {
+                $email->setTo($address);
+                $cid = $email->setAttachmentCID($filename);
+                $email->setMessage('<img src="cid:'. $cid .'" alt="photo1" />');
+                $email->send();
+            }
 
-		.. note:: Content-ID for each e-mail must be re-created for it to be unique.
+        .. note:: Content-ID for each e-mail must be re-created for it to be unique.
 
-	.. php:method:: printDebugger($include = ['headers', 'subject', 'body'])
+    .. php:method:: printDebugger($include = ['headers', 'subject', 'body'])
 
-		:param	array	$include: Which parts of the message to print out
-		:returns:	Formatted debug data
-		:rtype:	string
+        :param    array    $include: Which parts of the message to print out
+        :returns:    Formatted debug data
+        :rtype:    string
 
-		Returns a string containing any server messages, the email headers, and
-		the email message. Useful for debugging.
+        Returns a string containing any server messages, the email headers, and
+        the email message. Useful for debugging.
 
-		You can optionally specify which parts of the message should be printed.
-		Valid options are: **headers**, **subject**, **body**.
+        You can optionally specify which parts of the message should be printed.
+        Valid options are: **headers**, **subject**, **body**.
 
-		Example::
+        Example::
 
-			// You need to pass false while sending in order for the email data
-			// to not be cleared - if that happens, printDebugger() would have
-			// nothing to output.
-			$email->send(false);
+            // You need to pass false while sending in order for the email data
+            // to not be cleared - if that happens, printDebugger() would have
+            // nothing to output.
+            $email->send(false);
 
-			// Will only print the email headers, excluding the message subject and body
-			$email->printDebugger(['headers']);
+            // Will only print the email headers, excluding the message subject and body
+            $email->printDebugger(['headers']);
 
-		.. note:: By default, all of the raw data will be printed.
+        .. note:: By default, all of the raw data will be printed.
diff --git a/user_guide_src/source/libraries/encryption.rst b/user_guide_src/source/libraries/encryption.rst
index 36185183ca4e..54fb1fb333a7 100644
--- a/user_guide_src/source/libraries/encryption.rst
+++ b/user_guide_src/source/libraries/encryption.rst
@@ -3,9 +3,9 @@ Encryption Service
 ##################
 
 .. important:: DO NOT use this or any other *encryption* library for
-	password storage! Passwords must be *hashed* instead, and you
-	should do that through PHP's `Password Hashing extension
-	<https://www.php.net/password>`_.
+    password storage! Passwords must be *hashed* instead, and you
+    should do that through PHP's `Password Hashing extension
+    <https://www.php.net/password>`_.
 
 The Encryption Service provides two-way symmetric (secret key) data encryption.
 The service will instantiate and/or initialize an
@@ -47,11 +47,11 @@ Assuming you have set your starting key (see :ref:`configuration`),
 encrypting and decrypting data is simple - pass the appropriate string to ``encrypt()``
 and/or ``decrypt()`` methods::
 
-	$plainText = 'This is a plain-text message!';
-	$ciphertext = $encrypter->encrypt($plainText);
+    $plainText = 'This is a plain-text message!';
+    $ciphertext = $encrypter->encrypt($plainText);
 
-	// Outputs: This is a plain-text message!
-	echo $encrypter->decrypt($ciphertext);
+    // Outputs: This is a plain-text message!
+    echo $encrypter->decrypt($ciphertext);
 
 And that's it! The Encryption library will do everything necessary
 for the whole process to be cryptographically secure out-of-the-box.
@@ -101,12 +101,12 @@ nor the output of a hashing function, etc. To create a proper key,
 you can use the Encryption library's ``createKey()`` method.
 ::
 
-	// $key will be assigned a 32-byte (256-bit) random key
-	$key = \CodeIgniter\Encryption\Encryption::createKey();
+    // $key will be assigned a 32-byte (256-bit) random key
+    $key = \CodeIgniter\Encryption\Encryption::createKey();
 
-	// for the SodiumHandler, you can use either:
-	$key = sodium_crypto_secretbox_keygen();
-	$key = \CodeIgniter\Encryption\Encryption::createKey(SODIUM_CRYPTO_SECRETBOX_KEYBYTES);
+    // for the SodiumHandler, you can use either:
+    $key = sodium_crypto_secretbox_keygen();
+    $key = \CodeIgniter\Encryption\Encryption::createKey(SODIUM_CRYPTO_SECRETBOX_KEYBYTES);
 
 The key can be stored in ``app/Config/Encryption.php``, or you can design
 a storage mechanism of your own and pass the key dynamically when encrypting/decrypting.
@@ -114,7 +114,7 @@ a storage mechanism of your own and pass the key dynamically when encrypting/dec
 To save your key to your ``app/Config/Encryption.php``, open the file
 and set::
 
-	public $key = 'YOUR KEY';
+    public $key = 'YOUR KEY';
 
 Encoding Keys or Results
 ------------------------
@@ -124,18 +124,18 @@ is hard to deal with (i.e., a copy-paste may damage it), so you may use
 ``bin2hex()``, or ``base64_encode`` to work with the key in
 a more friendly manner. For example::
 
-	// Get a hex-encoded representation of the key:
-	$encoded = bin2hex(\CodeIgniter\Encryption\Encryption::createKey(32));
+    // Get a hex-encoded representation of the key:
+    $encoded = bin2hex(\CodeIgniter\Encryption\Encryption::createKey(32));
 
-	// Put the same value with hex2bin(),
-	// so that it is still passed as binary to the library:
-	$key = hex2bin('your-hex-encoded-key');
+    // Put the same value with hex2bin(),
+    // so that it is still passed as binary to the library:
+    $key = hex2bin('your-hex-encoded-key');
 
 You might find the same technique useful for the results
 of encryption::
 
-	// Encrypt some text & make the results text
-	$encoded = base64_encode($encrypter->encrypt($plaintext));
+    // Encrypt some text & make the results text
+    $encoded = base64_encode($encrypter->encrypt($plaintext));
 
 Using Prefixes in Storing Keys
 ------------------------------
@@ -147,20 +147,20 @@ intelligently parse the key and still pass a binary string to
 the library.
 ::
 
-	// In Encryption, you may use
-	public $key = 'hex2bin:<your-hex-encoded-key>'
+    // In Encryption, you may use
+    public $key = 'hex2bin:<your-hex-encoded-key>'
 
-	// or
-	public $key = 'base64:<your-base64-encoded-key>'
+    // or
+    public $key = 'base64:<your-base64-encoded-key>'
 
 Similarly, you can use these prefixes in your ``.env`` file, too!
 ::
 
-	// For hex2bin
-	encryption.key = hex2bin:<your-hex-encoded-key>
+    // For hex2bin
+    encryption.key = hex2bin:<your-hex-encoded-key>
 
-	// or
-	encryption.key = base64:<your-base64-encoded-key>
+    // or
+    encryption.key = base64:<your-base64-encoded-key>
 
 Padding
 =======
@@ -177,11 +177,11 @@ message prior to encryption, and removed after decryption. Padding is configurab
 ``$blockSize`` property of ``Config\Encryption``. This value should be greater than zero.
 
 .. important:: You are advised not to devise your own padding implementation. You must always use
-	the more secure implementation of a library. Also, passwords should not be padded. Usage of
-	padding in order to hide the length of a password is not recommended. A client willing to send
-	a password to a server should hash it instead (even with a single iteration of the hash function).
-	This ensures that the length of the transmitted data is constant, and that the server doesn't
-	effortlessly get a copy of the password.
+    the more secure implementation of a library. Also, passwords should not be padded. Usage of
+    padding in order to hide the length of a password is not recommended. A client willing to send
+    a password to a server should hash it instead (even with a single iteration of the hash function).
+    This ensures that the length of the transmitted data is constant, and that the server doesn't
+    effortlessly get a copy of the password.
 
 Encryption Handler Notes
 ========================
@@ -209,8 +209,8 @@ a shared-key, such as symmetric encryption, Sodium uses the XSalsa20 algorithm t
 HMAC-SHA512 for the authentication.
 
 .. note:: CodeIgniter's ``SodiumHandler`` uses ``sodium_memzero`` in every encryption or decryption
-	session. After each session, the message (whether plaintext or ciphertext) and starter key are
-	wiped out from the buffers. You may need to provide again the key before starting a new session.
+    session. After each session, the message (whether plaintext or ciphertext) and starter key are
+    wiped out from the buffers. You may need to provide again the key before starting a new session.
 
 Message Length
 ==============
@@ -246,78 +246,78 @@ Class Reference
 
 .. php:class:: CodeIgniter\\Encryption\\Encryption
 
-	.. php:staticmethod:: createKey([$length = 32])
+    .. php:staticmethod:: createKey([$length = 32])
 
-		:param int $length: Output length
-		:returns: A pseudo-random cryptographic key with the specified length, or ``false`` on failure
-		:rtype:	string
+        :param int $length: Output length
+        :returns: A pseudo-random cryptographic key with the specified length, or ``false`` on failure
+        :rtype:    string
 
-		Creates a cryptographic key by fetching random data from
-		the operating system's sources (*i.e.* ``/dev/urandom``).
+        Creates a cryptographic key by fetching random data from
+        the operating system's sources (*i.e.* ``/dev/urandom``).
 
-	.. php:method:: initialize([Encryption $config = null])
+    .. php:method:: initialize([Encryption $config = null])
 
-		:param Config\\Encryption $config: Configuration parameters
-		:returns: ``CodeIgniter\Encryption\EncrypterInterface`` instance
-		:rtype:	``CodeIgniter\Encryption\EncrypterInterface``
-		:throws: ``CodeIgniter\Encryption\Exceptions\EncryptionException``
+        :param Config\\Encryption $config: Configuration parameters
+        :returns: ``CodeIgniter\Encryption\EncrypterInterface`` instance
+        :rtype:    ``CodeIgniter\Encryption\EncrypterInterface``
+        :throws: ``CodeIgniter\Encryption\Exceptions\EncryptionException``
 
-		Initializes (configures) the library to use different settings.
+        Initializes (configures) the library to use different settings.
 
-		Example::
+        Example::
 
-			$encrypter = $encryption->initialize(['cipher' => '3des']);
+            $encrypter = $encryption->initialize(['cipher' => '3des']);
 
-		Please refer to the :ref:`configuration` section for detailed info.
+        Please refer to the :ref:`configuration` section for detailed info.
 
 .. php:interface:: CodeIgniter\\Encryption\\EncrypterInterface
 
-	.. php:method:: encrypt($data[, $params = null])
+    .. php:method:: encrypt($data[, $params = null])
 
-		:param string $data: Data to encrypt
-		:param array|string|null $params: Configuration parameters (key)
-		:returns: Encrypted data
-		:rtype:	string
-		:throws: ``CodeIgniter\Encryption\Exceptions\EncryptionException``
+        :param string $data: Data to encrypt
+        :param array|string|null $params: Configuration parameters (key)
+        :returns: Encrypted data
+        :rtype:    string
+        :throws: ``CodeIgniter\Encryption\Exceptions\EncryptionException``
 
-		Encrypts the input data and returns its ciphertext.
+        Encrypts the input data and returns its ciphertext.
 
-		If you pass parameters as the second argument, the ``key`` element
-		will be used as the starting key for this operation if ``$params``
-		is an array; or the starting key may be passed as a string.
+        If you pass parameters as the second argument, the ``key`` element
+        will be used as the starting key for this operation if ``$params``
+        is an array; or the starting key may be passed as a string.
 
-		If you are using the SodiumHandler and want to pass a different ``blockSize``
-		on runtime, pass the ``blockSize`` key in the ``$params`` array.
+        If you are using the SodiumHandler and want to pass a different ``blockSize``
+        on runtime, pass the ``blockSize`` key in the ``$params`` array.
 
-		Examples::
+        Examples::
 
-			$ciphertext = $encrypter->encrypt('My secret message');
-			$ciphertext = $encrypter->encrypt('My secret message', ['key' => 'New secret key']);
-			$ciphertext = $encrypter->encrypt('My secret message', ['key' => 'New secret key', 'blockSize' => 32]);
-			$ciphertext = $encrypter->encrypt('My secret message', 'New secret key');
-			$ciphertext = $encrypter->encrypt('My secret message', ['blockSize' => 32]);
+            $ciphertext = $encrypter->encrypt('My secret message');
+            $ciphertext = $encrypter->encrypt('My secret message', ['key' => 'New secret key']);
+            $ciphertext = $encrypter->encrypt('My secret message', ['key' => 'New secret key', 'blockSize' => 32]);
+            $ciphertext = $encrypter->encrypt('My secret message', 'New secret key');
+            $ciphertext = $encrypter->encrypt('My secret message', ['blockSize' => 32]);
 
-	.. php:method:: decrypt($data[, $params = null])
+    .. php:method:: decrypt($data[, $params = null])
 
-		:param string $data: Data to decrypt
-		:param array|string|null $params: Configuration parameters (key)
-		:returns: Decrypted data
-		:rtype:	string
-		:throws: ``CodeIgniter\Encryption\Exceptions\EncryptionException``
+        :param string $data: Data to decrypt
+        :param array|string|null $params: Configuration parameters (key)
+        :returns: Decrypted data
+        :rtype:    string
+        :throws: ``CodeIgniter\Encryption\Exceptions\EncryptionException``
 
-		Decrypts the input data and returns it in plain-text.
+        Decrypts the input data and returns it in plain-text.
 
-		If you pass parameters as the second argument, the ``key`` element
-		will be used as the starting key for this operation if ``$params``
-		is an array; or the starting key may be passed as a string.
+        If you pass parameters as the second argument, the ``key`` element
+        will be used as the starting key for this operation if ``$params``
+        is an array; or the starting key may be passed as a string.
 
-		If you are using the SodiumHandler and want to pass a different ``blockSize``
-		on runtime, pass the ``blockSize`` key in the ``$params`` array.
+        If you are using the SodiumHandler and want to pass a different ``blockSize``
+        on runtime, pass the ``blockSize`` key in the ``$params`` array.
 
-		Examples::
+        Examples::
 
-			echo $encrypter->decrypt($ciphertext);
-			echo $encrypter->decrypt($ciphertext, ['key' => 'New secret key']);
-			echo $encrypter->decrypt($ciphertext, ['key' => 'New secret key', 'blockSize' => 32]);
-			echo $encrypter->decrypt($ciphertext, 'New secret key');
-			echo $encrypter->decrypt($ciphertext, ['blockSize' => 32]);
+            echo $encrypter->decrypt($ciphertext);
+            echo $encrypter->decrypt($ciphertext, ['key' => 'New secret key']);
+            echo $encrypter->decrypt($ciphertext, ['key' => 'New secret key', 'blockSize' => 32]);
+            echo $encrypter->decrypt($ciphertext, 'New secret key');
+            echo $encrypter->decrypt($ciphertext, ['blockSize' => 32]);
diff --git a/user_guide_src/source/libraries/images.rst b/user_guide_src/source/libraries/images.rst
index d22f3eba9af6..bd71be9657f2 100644
--- a/user_guide_src/source/libraries/images.rst
+++ b/user_guide_src/source/libraries/images.rst
@@ -24,7 +24,7 @@ Initializing the Class
 Like most other classes in CodeIgniter, the image class is initialized
 in your controller by calling the Services class::
 
-	$image = \Config\Services::image();
+    $image = \Config\Services::image();
 
 You can pass the alias for the image library you wish to use into the
 Service function::
@@ -52,10 +52,10 @@ identical. You will set some preferences corresponding to the action you
 intend to perform, then call one of the available processing functions.
 For example, to create an image thumbnail you'll do this::
 
-	$image = \Config\Services::image()
-		->withFile('/path/to/image/mypic.jpg')
-		->fit(100, 100, 'center')
-		->save('/path/to/image/mypic_thumb.jpg');
+    $image = \Config\Services::image()
+        ->withFile('/path/to/image/mypic.jpg')
+        ->fit(100, 100, 'center')
+        ->save('/path/to/image/mypic_thumb.jpg');
 
 The above code tells the library to look for an image
 called *mypic.jpg* located in the source_image folder, then create a
@@ -69,25 +69,25 @@ needed before saving. The original image is left untouched, and a new image
 is used and passed through each method, applying the results on top of the
 previous results::
 
-	$image = \Config\Services::image()
-		->withFile('/path/to/image/mypic.jpg')
-		->reorient()
-		->rotate(90)
-		->crop(100, 100, 0, 0)
-		->save('/path/to/image/mypic_thumb.jpg');
+    $image = \Config\Services::image()
+        ->withFile('/path/to/image/mypic.jpg')
+        ->reorient()
+        ->rotate(90)
+        ->crop(100, 100, 0, 0)
+        ->save('/path/to/image/mypic_thumb.jpg');
 
 This example would take the same image and first fix any mobile phone orientation issues,
 rotate the image by 90 degrees, and then crop the result into a 100x100 pixel image,
 starting at the top left corner. The result would be saved as the thumbnail.
 
 .. note:: In order for the image class to be allowed to do any
-	processing, the folder containing the image files must have write
-	permissions.
+    processing, the folder containing the image files must have write
+    permissions.
 
 .. note:: Image processing can require a considerable amount of server
-	memory for some operations. If you are experiencing out of memory errors
-	while processing images you may need to limit their maximum size, and/or
-	adjust PHP memory limits.
+    memory for some operations. If you are experiencing out of memory errors
+    while processing images you may need to limit their maximum size, and/or
+    adjust PHP memory limits.
 
 Image Quality
 =============
@@ -96,20 +96,20 @@ Image Quality
 quality. Values range from 0 to 100 with 90 being the framework default. This parameter
 only applies to JPEG images and will be ignored otherwise::
 
-	$image = \Config\Services::image()
-		->withFile('/path/to/image/mypic.jpg')
-		// processing methods
-		->save('/path/to/image/my_low_quality_pic.jpg', 10);
+    $image = \Config\Services::image()
+        ->withFile('/path/to/image/mypic.jpg')
+        // processing methods
+        ->save('/path/to/image/my_low_quality_pic.jpg', 10);
 
 .. note:: Higher quality will result in larger file sizes. See also https://www.php.net/manual/en/function.imagejpeg.php
 
 If you are only interested in changing the image quality without doing any processing.
 You will need to include the image resource or you will end up with an exact copy::
 
-	$image = \Config\Services::image()
-		->withFile('/path/to/image/mypic.jpg')
-		->withResource()
-		->save('/path/to/image/my_low_quality_pic.jpg', 10);
+    $image = \Config\Services::image()
+        ->withFile('/path/to/image/mypic.jpg')
+        ->withResource()
+        ->save('/path/to/image/my_low_quality_pic.jpg', 10);
 
 Processing Methods
 ==================
@@ -130,14 +130,14 @@ If they fail they will throw a ``CodeIgniter\Images\ImageException`` that contai
 the error message. A good practice is to catch the exceptions, showing an
 error upon failure, like this::
 
-	try {
+    try {
         $image = \Config\Services::image()
             ->withFile('/path/to/image/mypic.jpg')
             ->fit(100, 100, 'center')
             ->save('/path/to/image/mypic_thumb.jpg');
-	} catch (CodeIgniter\Images\ImageException $e) {
-		echo $e->getMessage();
-	}
+    } catch (CodeIgniter\Images\ImageException $e) {
+        echo $e->getMessage();
+    }
 
 Cropping Images
 ---------------
@@ -158,34 +158,34 @@ To take a 50x50 pixel square out of the center of an image, you would need to fi
 offset values::
 
     $info = \Config\Services::image('imagick')
-		->withFile('/path/to/image/mypic.jpg')
-		->getFile()
-		->getProperties(true);
+        ->withFile('/path/to/image/mypic.jpg')
+        ->getFile()
+        ->getProperties(true);
 
     $xOffset = ($info['width'] / 2) - 25;
     $yOffset = ($info['height'] / 2) - 25;
 
     \Config\Services::image('imagick')
-		->withFile('/path/to/image/mypic.jpg')
-		->crop(50, 50, $xOffset, $yOffset)
-		->save('/path/to/new/image.jpg');
+        ->withFile('/path/to/image/mypic.jpg')
+        ->crop(50, 50, $xOffset, $yOffset)
+        ->save('/path/to/new/image.jpg');
 
 Converting Images
 -----------------
 
 The ``convert()`` method changes the library's internal indicator for the desired file format. This doesn't touch the actual image resource, but indicates to ``save()`` what format to use::
 
-	convert(int $imageType)
+    convert(int $imageType)
 
 - **$imageType** is one of PHP's image type constants (see for example https://www.php.net/manual/en/function.image-type-to-mime-type.php)::
 
-	\Config\Services::image()
-		->withFile('/path/to/image/mypic.jpg')
-		->convert(IMAGETYPE_PNG)
-		->save('/path/to/new/image.png');
+    \Config\Services::image()
+        ->withFile('/path/to/image/mypic.jpg')
+        ->convert(IMAGETYPE_PNG)
+        ->save('/path/to/new/image.png');
 
 .. note:: ImageMagick already saves files in the type
-	indicated by their extension, ignoring **$imageType**
+    indicated by their extension, ignoring **$imageType**
 
 Fitting Images
 --------------
@@ -206,10 +206,10 @@ The ``fit()`` method aims to help simplify cropping a portion of an image in a "
 
 This provides a much simpler way to crop that will always maintain the aspect ratio::
 
-	\Config\Services::image('imagick')
-		->withFile('/path/to/image/mypic.jpg')
-		->fit(100, 150, 'left')
-		->save('/path/to/new/image.jpg');
+    \Config\Services::image('imagick')
+        ->withFile('/path/to/image/mypic.jpg')
+        ->fit(100, 150, 'left')
+        ->save('/path/to/new/image.jpg');
 
 Flattening Images
 -----------------
@@ -228,15 +228,15 @@ The ``flatten()`` method aims to add a background color behind transparent image
 
 ::
 
-	\Config\Services::image('imagick')
-		->withFile('/path/to/image/mypic.png')
-		->flatten()
-		->save('/path/to/new/image.jpg');
+    \Config\Services::image('imagick')
+        ->withFile('/path/to/image/mypic.png')
+        ->flatten()
+        ->save('/path/to/new/image.jpg');
 
-	\Config\Services::image('imagick')
-		->withFile('/path/to/image/mypic.png')
-		->flatten(25,25,112)
-		->save('/path/to/new/image.jpg');
+    \Config\Services::image('imagick')
+        ->withFile('/path/to/image/mypic.png')
+        ->flatten(25,25,112)
+        ->save('/path/to/new/image.jpg');
 
 Flipping Images
 ---------------
@@ -249,17 +249,17 @@ Images can be flipped along either their horizontal or vertical axis::
 
 ::
 
-	\Config\Services::image('imagick')
-		->withFile('/path/to/image/mypic.jpg')
-		->flip('horizontal')
-		->save('/path/to/new/image.jpg');
+    \Config\Services::image('imagick')
+        ->withFile('/path/to/image/mypic.jpg')
+        ->flip('horizontal')
+        ->save('/path/to/new/image.jpg');
 
 Resizing Images
 ---------------
 
 Images can be resized to fit any dimension you require with the resize() method::
 
-	resize(int $width, int $height, bool $maintainRatio = false, string $masterDim = 'auto')
+    resize(int $width, int $height, bool $maintainRatio = false, string $masterDim = 'auto')
 
 - **$width** is the desired width of the new image in pixels
 - **$height** is the desired height of the new image in pixels
@@ -272,22 +272,22 @@ while the other dimension will be altered to match the original image's aspect r
 
 ::
 
-	\Config\Services::image('imagick')
-		->withFile('/path/to/image/mypic.jpg')
-		->resize(200, 100, true, 'height')
-		->save('/path/to/new/image.jpg');
+    \Config\Services::image('imagick')
+        ->withFile('/path/to/image/mypic.jpg')
+        ->resize(200, 100, true, 'height')
+        ->save('/path/to/new/image.jpg');
 
 Rotating Images
 ---------------
 
 The rotate() method allows you to rotate an image in 90 degree increments::
 
-	rotate(float $angle)
+    rotate(float $angle)
 
 - **$angle** is the number of degrees to rotate. One of '90', '180', '270'.
 
 .. note:: While the $angle parameter accepts a float, it will convert it to an integer during the process.
-		If the value is any other than the three values listed above, it will throw a CodeIgniter\Images\ImageException.
+        If the value is any other than the three values listed above, it will throw a CodeIgniter\Images\ImageException.
 
 Adding a Text Watermark
 -----------------------
@@ -298,36 +298,36 @@ products.
 
 ::
 
-	text(string $text, array $options = [])
+    text(string $text, array $options = [])
 
 The first parameter is the string of text that you wish to display. The second parameter is an array of options
 that allow you to specify how the text should be displayed::
 
-	\Config\Services::image('imagick')
-		->withFile('/path/to/image/mypic.jpg')
-		->text('Copyright 2017 My Photo Co', [
-		    'color'      => '#fff',
-		    'opacity'    => 0.5,
-		    'withShadow' => true,
-		    'hAlign'     => 'center',
-		    'vAlign'     => 'bottom',
-		    'fontSize'   => 20
-		])
-		->save('/path/to/new/image.jpg');
+    \Config\Services::image('imagick')
+        ->withFile('/path/to/image/mypic.jpg')
+        ->text('Copyright 2017 My Photo Co', [
+            'color'      => '#fff',
+            'opacity'    => 0.5,
+            'withShadow' => true,
+            'hAlign'     => 'center',
+            'vAlign'     => 'bottom',
+            'fontSize'   => 20
+        ])
+        ->save('/path/to/new/image.jpg');
 
 The possible options that are recognized are as follows:
 
 - color         Text Color (hex number), i.e., #ff0000
-- opacity		A number between 0 and 1 that represents the opacity of the text.
-- withShadow	Boolean value whether to display a shadow or not.
+- opacity        A number between 0 and 1 that represents the opacity of the text.
+- withShadow    Boolean value whether to display a shadow or not.
 - shadowColor   Color of the shadow (hex number)
-- shadowOffset	How many pixels to offset the shadow. Applies to both the vertical and horizontal values.
+- shadowOffset    How many pixels to offset the shadow. Applies to both the vertical and horizontal values.
 - hAlign        Horizontal alignment: left, center, right
 - vAlign        Vertical alignment: top, middle, bottom
-- hOffset		Additional offset on the x axis, in pixels
-- vOffset		Additional offset on the y axis, in pixels
-- fontPath		The full server path to the TTF font you wish to use. System font will be used if none is given.
-- fontSize		The font size to use. When using the GD handler with the system font, valid values are between 1-5.
+- hOffset        Additional offset on the x axis, in pixels
+- vOffset        Additional offset on the y axis, in pixels
+- fontPath        The full server path to the TTF font you wish to use. System font will be used if none is given.
+- fontSize        The font size to use. When using the GD handler with the system font, valid values are between 1-5.
 
 .. note:: The ImageMagick driver does not recognize full server path for fontPath. Instead, simply provide the
-		name of one of the installed system fonts that you wish to use, i.e., Calibri.
+        name of one of the installed system fonts that you wish to use, i.e., Calibri.
diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
index dc2ec08347a8..fd75c09e99e4 100644
--- a/user_guide_src/source/libraries/publisher.rst
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -15,7 +15,7 @@ Loading the Library
 Because Publisher instances are specific to their source and destination this library is not available
 through ``Services`` but should be instantiated or extended directly. E.g.
 
-	$publisher = new \CodeIgniter\Publisher\Publisher();
+    $publisher = new \CodeIgniter\Publisher\Publisher();
 
 *****************
 Concept and Usage
@@ -38,41 +38,41 @@ On Demand
 
 Access ``Publisher`` directly by instantiating a new instance of the class::
 
-	$publisher = new \CodeIgniter\Publisher\Publisher();
+    $publisher = new \CodeIgniter\Publisher\Publisher();
 
 By default the source and destination will be set to ``ROOTPATH`` and ``FCPATH`` respectively, giving ``Publisher``
 easy access to take any file from your project and make it web-accessible. Alternatively you may pass a new source
 or source and destination into the constructor::
 
-	use CodeIgniter\Publisher\Publisher;
-	
-	$vendorPublisher = new Publisher(ROOTPATH . 'vendor');
-	$filterPublisher = new Publisher('/path/to/module/Filters', APPPATH . 'Filters');
+    use CodeIgniter\Publisher\Publisher;
+    
+    $vendorPublisher = new Publisher(ROOTPATH . 'vendor');
+    $filterPublisher = new Publisher('/path/to/module/Filters', APPPATH . 'Filters');
 
-	// Once the source and destination are set you may start adding relative input files
-	$frameworkPublisher = new Publisher(ROOTPATH . 'vendor/codeigniter4/codeigniter4');
+    // Once the source and destination are set you may start adding relative input files
+    $frameworkPublisher = new Publisher(ROOTPATH . 'vendor/codeigniter4/codeigniter4');
 
-	// All "path" commands are relative to $source
-	$frameworkPublisher->addPath('app/Config/Cookie.php');
+    // All "path" commands are relative to $source
+    $frameworkPublisher->addPath('app/Config/Cookie.php');
 
-	// You may also add from outside the source, but the files will not be merged into subdirectories
-	$frameworkPublisher->addFiles([
-		'/opt/mail/susan',
-		'/opt/mail/ubuntu',
-	]);
-	$frameworkPublisher->addDirectory(SUPPORTPATH . 'Images');
+    // You may also add from outside the source, but the files will not be merged into subdirectories
+    $frameworkPublisher->addFiles([
+        '/opt/mail/susan',
+        '/opt/mail/ubuntu',
+    ]);
+    $frameworkPublisher->addDirectory(SUPPORTPATH . 'Images');
 
 Once all the files are staged use one of the output commands (**copy()** or **merge()**) to process the staged files
 to their destination(s)::
 
-	// Place all files into $destination
-	$frameworkPublisher->copy();
+    // Place all files into $destination
+    $frameworkPublisher->copy();
 
-	// Place all files into $destination, overwriting existing files
-	$frameworkPublisher->copy(true);
+    // Place all files into $destination, overwriting existing files
+    $frameworkPublisher->copy(true);
 
-	// Place files into their relative $destination directories, overwriting and saving the boolean result
-	$result = $frameworkPublisher->merge(true);
+    // Place files into their relative $destination directories, overwriting and saving the boolean result
+    $result = $frameworkPublisher->merge(true);
 
 See the :ref:`reference` for a full description of available methods.
 
@@ -82,27 +82,27 @@ Automation and Discovery
 You may have regular publication tasks embedded as part of your application deployment or upkeep. ``Publisher`` leverages
 the powerful ``Autoloader`` to locate any child classes primed for publication::
 
-	use CodeIgniter\CLI\CLI;
-	use CodeIgniter\Publisher\Publisher;
-	
-	foreach (Publisher::discover() as $publisher)
-	{
-		$result = $publisher->publish();
+    use CodeIgniter\CLI\CLI;
+    use CodeIgniter\Publisher\Publisher;
+    
+    foreach (Publisher::discover() as $publisher)
+    {
+        $result = $publisher->publish();
 
-		if ($result === false)
-		{
-			CLI::error(get_class($publisher) . ' failed to publish!', 'red');
-		}
-	}
+        if ($result === false)
+        {
+            CLI::error(get_class($publisher) . ' failed to publish!', 'red');
+        }
+    }
 
 By default ``discover()`` will search for the "Publishers" directory across all namespaces, but you may specify a
 different directory and it will return any child classes found::
 
-	$memePublishers = Publisher::discover('CatGIFs');
+    $memePublishers = Publisher::discover('CatGIFs');
 
 Most of the time you will not need to handle your own discovery, just use the provided "publish" command::
 
-	> php spark publish
+    > php spark publish
 
 By default on your class extension ``publish()`` will add all files from your ``$source`` and merge them
 out to your destination, overwriting on collision.
@@ -134,40 +134,40 @@ You want to display a "photo of the day" image on your homepage. You have a feed
 need to get the actual file into a browsable location in your project at **public/images/daily_photo.jpg**.
 You can set up :doc:`Custom Command </cli/cli_commands>` to run daily that will handle this for you::
 
-	<?php
+    <?php
 
-	namespace App\Commands;
+    namespace App\Commands;
 
-	use CodeIgniter\CLI\BaseCommand;
-	use CodeIgniter\Publisher\Publisher;
-	use Throwable;
+    use CodeIgniter\CLI\BaseCommand;
+    use CodeIgniter\Publisher\Publisher;
+    use Throwable;
 
-	class DailyPhoto extends BaseCommand
-	{
-		protected $group       = 'Publication';
-		protected $name        = 'publish:daily';
-		protected $description = 'Publishes the latest daily photo to the homepage.';
+    class DailyPhoto extends BaseCommand
+    {
+        protected $group       = 'Publication';
+        protected $name        = 'publish:daily';
+        protected $description = 'Publishes the latest daily photo to the homepage.';
 
-		public function run(array $params)
-		{
-			$publisher = new Publisher('/path/to/photos/', FCPATH . 'assets/images');
+        public function run(array $params)
+        {
+            $publisher = new Publisher('/path/to/photos/', FCPATH . 'assets/images');
 
-			try
-			{
-				$publisher->addPath('daily_photo.jpg')->copy(true); // `true` to enable overwrites
-			}
-			catch (Throwable $e)
-			{
-				$this->showError($e);
-			}
-		}
-	}
+            try
+            {
+                $publisher->addPath('daily_photo.jpg')->copy(true); // `true` to enable overwrites
+            }
+            catch (Throwable $e)
+            {
+                $this->showError($e);
+            }
+        }
+    }
 
 Now running ``spark publish:daily`` will keep your homepage's image up-to-date. What if the photo is
 coming from an external API? You can use ``addUri()`` in place of ``addPath()`` to download the remote
 resource and publish it out instead::
 
-	$publisher->addUri('https://example.com/feeds/daily_photo.jpg')->copy(true);
+    $publisher->addUri('https://example.com/feeds/daily_photo.jpg')->copy(true);
 
 Asset Dependencies Example
 ==========================
@@ -176,82 +176,82 @@ You want to integrate the frontend library "Bootstrap" into your project, but th
 to keep up with. You can create a publication definition in your project to sync frontend assets by extending
 ``Publisher`` in your project. So **app/Publishers/BootstrapPublisher.php** might look like this::
 
-	<?php
-	
-	namespace App\Publishers;
-
-	use CodeIgniter\Publisher\Publisher;
-
-	class BootstrapPublisher extends Publisher
-	{
-		/**
-		 * Tell Publisher where to get the files.
-		 * Since we will use Composer to download
-		 * them we point to the "vendor" directory.
-		 *
-		 * @var string
-		 */
-		protected $source = 'vendor/twbs/bootstrap/';
-
-		/**
-		 * FCPATH is always the default destination,
-		 * but we may want them to go in a sub-folder
-		 * to keep things organized.
-		 *
-		 * @var string
-		 */
-		protected $destination = FCPATH . 'bootstrap';
-
-		/**
-		 * Use the "publish" method to indicate that this
-		 * class is ready to be discovered and automated.
-		 *
-		 * @return boolean
-		 */
-		public function publish(): bool
-		{
-			return $this
-				// Add all the files relative to $source
-				->addPath('dist')
-
-				// Indicate we only want the minimized versions
-				->retainPattern('*.min.*')
-
-				// Merge-and-replace to retain the original directory structure
-				->merge(true);
-		}
-	}
+    <?php
+    
+    namespace App\Publishers;
+
+    use CodeIgniter\Publisher\Publisher;
+
+    class BootstrapPublisher extends Publisher
+    {
+        /**
+         * Tell Publisher where to get the files.
+         * Since we will use Composer to download
+         * them we point to the "vendor" directory.
+         *
+         * @var string
+         */
+        protected $source = 'vendor/twbs/bootstrap/';
+
+        /**
+         * FCPATH is always the default destination,
+         * but we may want them to go in a sub-folder
+         * to keep things organized.
+         *
+         * @var string
+         */
+        protected $destination = FCPATH . 'bootstrap';
+
+        /**
+         * Use the "publish" method to indicate that this
+         * class is ready to be discovered and automated.
+         *
+         * @return boolean
+         */
+        public function publish(): bool
+        {
+            return $this
+                // Add all the files relative to $source
+                ->addPath('dist')
+
+                // Indicate we only want the minimized versions
+                ->retainPattern('*.min.*')
+
+                // Merge-and-replace to retain the original directory structure
+                ->merge(true);
+        }
+    }
 
 Now add the dependency via Composer and call ``spark publish`` to run the publication::
 
-	> composer require twbs/bootstrap
-	> php spark publish
+    > composer require twbs/bootstrap
+    > php spark publish
 
 ... and you'll end up with something like this::
 
-	public/.htaccess
-	public/favicon.ico
-	public/index.php
-	public/robots.txt
-	public/
-		bootstrap/
-			css/
-				bootstrap.min.css
-				bootstrap-utilities.min.css.map
-				bootstrap-grid.min.css
-				bootstrap.rtl.min.css
-				bootstrap.min.css.map
-				bootstrap-reboot.min.css
-				bootstrap-utilities.min.css
-				bootstrap-reboot.rtl.min.css
-				bootstrap-grid.min.css.map
-			js/
-				bootstrap.esm.min.js
-				bootstrap.bundle.min.js.map
-				bootstrap.bundle.min.js
-				bootstrap.min.js
-				bootstrap.esm.min.js.map
-				bootstrap.min.js.map
+    public/.htaccess
+    public/favicon.ico
+    public/index.php
+    public/robots.txt
+    public/
+        bootstrap/
+            css/
+                bootstrap.min.css
+                bootstrap-utilities.min.css.map
+                bootstrap-grid.min.css
+                bootstrap.rtl.min.css
+                bootstrap.min.css.map
+                bootstrap-reboot.min.css
+                bootstrap-utilities.min.css
+                bootstrap-reboot.rtl.min.css
+                bootstrap-grid.min.css.map
+            js/
+                bootstrap.esm.min.js
+                bootstrap.bundle.min.js.map
+                bootstrap.bundle.min.js
+                bootstrap.min.js
+                bootstrap.esm.min.js.map
+                bootstrap.min.js.map
 
 Module Deployment Example
 =========================
@@ -260,59 +260,59 @@ You want to allow developers using your popular authentication module the abilit
 of your Migration, Controller, and Model. You can create your own module "publish" command to inject these components
 into an application for use::
 
-	<?php
-
-	namespace Math\Auth\Commands;
-
-	use CodeIgniter\CLI\BaseCommand;
-	use CodeIgniter\Publisher\Publisher;
-	use Throwable;
-
-	class AuthPublish extends BaseCommand
-	{
-		protected $group       = 'Auth';
-		protected $name        = 'auth:publish';
-		protected $description = 'Publish Auth components into the current application.';
-
-		public function run(array $params)
-		{
-			// Use the Autoloader to figure out the module path
-			$source = service('autoloader')->getNamespace('Math\\Auth');
-
-			$publisher = new Publisher($source, APPATH);
-
-			try
-			{
-				// Add only the desired components
-				$publisher->addPaths([
-					'Controllers',
-					'Database/Migrations',
-					'Models',
-				])->merge(false); // Be careful not to overwrite anything
-			}
-			catch (Throwable $e)
-			{
-				$this->showError($e);
-				return;
-			}
-
-			// If publication succeeded then update namespaces
-			foreach ($publisher->getPublished() as $file)
-			{
-				// Replace the namespace
-				$contents = file_get_contents($file);
-				$contents = str_replace('namespace Math\\Auth', 'namespace ' . APP_NAMESPACE, );
-				file_put_contents($file, $contents);
-			}
-		}
-	}
+    <?php
+
+    namespace Math\Auth\Commands;
+
+    use CodeIgniter\CLI\BaseCommand;
+    use CodeIgniter\Publisher\Publisher;
+    use Throwable;
+
+    class AuthPublish extends BaseCommand
+    {
+        protected $group       = 'Auth';
+        protected $name        = 'auth:publish';
+        protected $description = 'Publish Auth components into the current application.';
+
+        public function run(array $params)
+        {
+            // Use the Autoloader to figure out the module path
+            $source = service('autoloader')->getNamespace('Math\\Auth');
+
+            $publisher = new Publisher($source, APPATH);
+
+            try
+            {
+                // Add only the desired components
+                $publisher->addPaths([
+                    'Controllers',
+                    'Database/Migrations',
+                    'Models',
+                ])->merge(false); // Be careful not to overwrite anything
+            }
+            catch (Throwable $e)
+            {
+                $this->showError($e);
+                return;
+            }
+
+            // If publication succeeded then update namespaces
+            foreach ($publisher->getPublished() as $file)
+            {
+                // Replace the namespace
+                $contents = file_get_contents($file);
+                $contents = str_replace('namespace Math\\Auth', 'namespace ' . APP_NAMESPACE, );
+                file_put_contents($file, $contents);
+            }
+        }
+    }
 
 Now when your module users run ``php spark auth:publish`` they will have the following added to their project::
 
-	app/Controllers/AuthController.php
-	app/Database/Migrations/2017-11-20-223112_create_auth_tables.php.php
-	app/Models/LoginModel.php
-	app/Models/UserModel.php
+    app/Controllers/AuthController.php
+    app/Database/Migrations/2017-11-20-223112_create_auth_tables.php.php
+    app/Models/LoginModel.php
+    app/Models/UserModel.php
 
 .. _reference:
 
@@ -361,7 +361,7 @@ Downloads the contents of a URI using ``CURLRequest`` into the scratch workspace
 file to the list.
 
 .. note:: The CURL request made is a simple ``GET`` and uses the response body for the file contents. Some
-	remote files may need a custom request to be handled properly.
+    remote files may need a custom request to be handled properly.
 
 Outputting Files
 ================
@@ -380,14 +380,14 @@ to overwrite when there is already an existing file. Returns success or failure,
 and ``getErrors()`` to troubleshoot failures.
 Be mindful of duplicate basename collisions, for example::
 
-	$publisher = new Publisher('/home/source', '/home/destination');
-	$publisher->addPaths([
-		'pencil/lead.png',
-		'metal/lead.png',
-	]);
+    $publisher = new Publisher('/home/source', '/home/destination');
+    $publisher->addPaths([
+        'pencil/lead.png',
+        'metal/lead.png',
+    ]);
 
-	// This is bad! Only one file will remain at /home/destination/lead.png
-	$publisher->copy(true);
+    // This is bad! Only one file will remain at /home/destination/lead.png
+    $publisher->copy(true);
 
 **merge(bool $replace = true): bool**
 
@@ -400,11 +400,11 @@ affect other files in the destination. Returns success or failure, use ``getPubl
 
 Example::
 
-	$publisher = new Publisher('/home/source', '/home/destination');
-	$publisher->addPaths([
-		'pencil/lead.png',
-		'metal/lead.png',
-	]);
+    $publisher = new Publisher('/home/source', '/home/destination');
+    $publisher->addPaths([
+        'pencil/lead.png',
+        'metal/lead.png',
+    ]);
 
-	// Results in "/home/destination/pencil/lead.png" and "/home/destination/metal/lead.png"
-	$publisher->merge();
+    // Results in "/home/destination/pencil/lead.png" and "/home/destination/metal/lead.png"
+    $publisher->merge();
diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
index 1472afa4000c..b2efd60b7025 100644
--- a/user_guide_src/source/libraries/sessions.rst
+++ b/user_guide_src/source/libraries/sessions.rst
@@ -23,7 +23,7 @@ class should be magically initialized.
 
 To access and initialize the session::
 
-	$session = \Config\Services::session($config);
+    $session = \Config\Services::session($config);
 
 The ``$config`` parameter is optional - your application configuration.
 If not provided, the services register will instantiate your default
@@ -31,14 +31,14 @@ one.
 
 Once loaded, the Sessions library object will be available using::
 
-	$session
+    $session
 
 Alternatively, you can use the helper function that will use the default
 configuration options. This version is a little friendlier to read,
 but does not take any configuration options.
 ::
 
-	$session = session();
+    $session = session();
 
 How do Sessions work?
 =====================
@@ -58,7 +58,7 @@ data, but the process of reading, writing, and updating a session is
 automatic.
 
 .. note:: Under CLI, the Session library will automatically halt itself,
-	as this is a concept based entirely on the HTTP protocol.
+    as this is a concept based entirely on the HTTP protocol.
 
 A note about concurrency
 ------------------------
@@ -117,45 +117,45 @@ Retrieving Session Data
 Any piece of information from the session array is available through the
 ``$_SESSION`` superglobal::
 
-	$_SESSION['item']
+    $_SESSION['item']
 
 Or through the conventional accessor method::
 
-	$session->get('item');
+    $session->get('item');
 
 Or through the magic getter::
 
-	$session->item
+    $session->item
 
 Or even through the session helper method::
 
-	session('item');
+    session('item');
 
 Where ``item`` is the array key corresponding to the item you wish to fetch.
 For example, to assign a previously stored 'name' item to the ``$name``
 variable, you will do this::
 
-	$name = $_SESSION['name'];
+    $name = $_SESSION['name'];
 
-	// or:
+    // or:
 
-	$name = $session->name
+    $name = $session->name
 
-	// or:
+    // or:
 
-	$name = $session->get('name');
+    $name = $session->get('name');
 
 .. note:: The ``get()`` method returns null if the item you are trying
-	to access does not exist.
+    to access does not exist.
 
 If you want to retrieve all of the existing userdata, you can simply
 omit the item key (magic getter only works for single property values)::
 
-	$_SESSION
+    $_SESSION
 
-	// or:
+    // or:
 
-	$session->get();
+    $session->get();
 
 Adding Session Data
 ===================
@@ -172,34 +172,34 @@ The former userdata method is deprecated,
 but you can pass an array containing your new session data to the
 ``set()`` method::
 
-	$session->set($array);
+    $session->set($array);
 
 Where ``$array`` is an associative array containing your new data. Here's
 an example::
 
-	$newdata = [
-		'username'  => 'johndoe',
-		'email'     => 'johndoe@some-site.com',
-		'logged_in' => true,
-	];
+    $newdata = [
+        'username'  => 'johndoe',
+        'email'     => 'johndoe@some-site.com',
+        'logged_in' => true,
+    ];
 
-	$session->set($newdata);
+    $session->set($newdata);
 
 If you want to add session data one value at a time, ``set()`` also
 supports this syntax::
 
-	$session->set('some_name', 'some_value');
+    $session->set('some_name', 'some_value');
 
 If you want to verify that a session value exists, simply check with
 ``isset()``::
 
-	// returns false if the 'some_name' item doesn't exist or is null,
-	// true otherwise:
-	isset($_SESSION['some_name'])
+    // returns false if the 'some_name' item doesn't exist or is null,
+    // true otherwise:
+    isset($_SESSION['some_name'])
 
 Or you can call ``has()``::
 
-	$session->has('some_name');
+    $session->has('some_name');
 
 Pushing new value to session data
 =================================
@@ -215,26 +215,26 @@ Removing Session Data
 Just as with any other variable, unsetting a value in ``$_SESSION`` can be
 done through ``unset()``::
 
-	unset($_SESSION['some_name']);
+    unset($_SESSION['some_name']);
 
-	// or multiple values:
+    // or multiple values:
 
-	unset(
-		$_SESSION['some_name'],
-		$_SESSION['another_name']
-	);
+    unset(
+        $_SESSION['some_name'],
+        $_SESSION['another_name']
+    );
 
 Also, just as ``set()`` can be used to add information to a
 session, ``remove()`` can be used to remove it, by passing the
 session key. For example, if you wanted to remove 'some_name' from your
 session data array::
 
-	$session->remove('some_name');
+    $session->remove('some_name');
 
 This method also accepts an array of item keys to unset::
 
-	$array_items = ['username', 'email'];
-	$session->remove($array_items);
+    $array_items = ['username', 'email'];
+    $session->remove($array_items);
 
 Flashdata
 =========
@@ -250,21 +250,21 @@ managed inside the CodeIgniter session handler.
 
 To mark an existing item as "flashdata"::
 
-	$session->markAsFlashdata('item');
+    $session->markAsFlashdata('item');
 
 If you want to mark multiple items as flashdata, simply pass the keys as an
 array::
 
-	$session->markAsFlashdata(['item', 'item2']);
+    $session->markAsFlashdata(['item', 'item2']);
 
 To add flashdata::
 
-	$_SESSION['item'] = 'value';
-	$session->markAsFlashdata('item');
+    $_SESSION['item'] = 'value';
+    $session->markAsFlashdata('item');
 
 Or alternatively, using the ``setFlashdata()`` method::
 
-	$session->setFlashdata('item', 'value');
+    $session->setFlashdata('item', 'value');
 
 You can also pass an array to ``setFlashdata()``, in the same manner as
 ``set()``.
@@ -272,23 +272,23 @@ You can also pass an array to ``setFlashdata()``, in the same manner as
 Reading flashdata variables is the same as reading regular session data
 through ``$_SESSION``::
 
-	$_SESSION['item']
+    $_SESSION['item']
 
 .. important:: The ``get()`` method WILL return flashdata items when
-	retrieving a single item by key. It will not return flashdata when
-	grabbing all userdata from the session, however.
+    retrieving a single item by key. It will not return flashdata when
+    grabbing all userdata from the session, however.
 
 However, if you want to be sure that you're reading "flashdata" (and not
 any other kind), you can also use the ``getFlashdata()`` method::
 
-	$session->getFlashdata('item');
+    $session->getFlashdata('item');
 
 Or to get an array with all flashdata, simply omit the key parameter::
 
-	$session->getFlashdata();
+    $session->getFlashdata();
 
 .. note:: The ``getFlashdata()`` method returns null if the item cannot be
-	found.
+    found.
 
 If you find that you need to preserve a flashdata variable through an
 additional request, you can do so using the ``keepFlashdata()`` method.
@@ -296,8 +296,8 @@ You can either pass a single item or an array of flashdata items to keep.
 
 ::
 
-	$session->keepFlashdata('item');
-	$session->keepFlashdata(['item1', 'item2', 'item3']);
+    $session->keepFlashdata('item');
+    $session->keepFlashdata(['item1', 'item2', 'item3']);
 
 Tempdata
 ========
@@ -312,71 +312,71 @@ CodeIgniter session handler.
 To mark an existing item as "tempdata", simply pass its key and expiry time
 (in seconds!) to the ``markAsTempdata()`` method::
 
-	// 'item' will be erased after 300 seconds
-	$session->markAsTempdata('item', 300);
+    // 'item' will be erased after 300 seconds
+    $session->markAsTempdata('item', 300);
 
 You can mark multiple items as tempdata in two ways, depending on whether
 you want them all to have the same expiry time or not::
 
-	// Both 'item' and 'item2' will expire after 300 seconds
-	$session->markAsTempdata(['item', 'item2'], 300);
+    // Both 'item' and 'item2' will expire after 300 seconds
+    $session->markAsTempdata(['item', 'item2'], 300);
 
-	// 'item' will be erased after 300 seconds, while 'item2'
-	// will do so after only 240 seconds
-	$session->markAsTempdata([
-		'item'	=> 300,
-		'item2'	=> 240,
-	]);
+    // 'item' will be erased after 300 seconds, while 'item2'
+    // will do so after only 240 seconds
+    $session->markAsTempdata([
+        'item'    => 300,
+        'item2'    => 240,
+    ]);
 
 To add tempdata::
 
-	$_SESSION['item'] = 'value';
-	$session->markAsTempdata('item', 300); // Expire in 5 minutes
+    $_SESSION['item'] = 'value';
+    $session->markAsTempdata('item', 300); // Expire in 5 minutes
 
 Or alternatively, using the ``setTempdata()`` method::
 
-	$session->setTempdata('item', 'value', 300);
+    $session->setTempdata('item', 'value', 300);
 
 You can also pass an array to ``setTempdata()``::
 
-	$tempdata = ['newuser' => true, 'message' => 'Thanks for joining!'];
-	$session->setTempdata($tempdata, null, $expire);
+    $tempdata = ['newuser' => true, 'message' => 'Thanks for joining!'];
+    $session->setTempdata($tempdata, null, $expire);
 
 .. note:: If the expiration is omitted or set to 0, the default
-	time-to-live value of 300 seconds (or 5 minutes) will be used.
+    time-to-live value of 300 seconds (or 5 minutes) will be used.
 
 To read a tempdata variable, again you can just access it through the
 ``$_SESSION`` superglobal array::
 
-	$_SESSION['item']
+    $_SESSION['item']
 
 .. important:: The ``get()`` method WILL return tempdata items when
-	retrieving a single item by key. It will not return tempdata when
-	grabbing all userdata from the session, however.
+    retrieving a single item by key. It will not return tempdata when
+    grabbing all userdata from the session, however.
 
 Or if you want to be sure that you're reading "tempdata" (and not any
 other kind), you can also use the ``getTempdata()`` method::
 
-	$session->getTempdata('item');
+    $session->getTempdata('item');
 
 And of course, if you want to retrieve all existing tempdata::
 
-	$session->getTempdata();
+    $session->getTempdata();
 
 .. note:: The ``getTempdata()`` method returns null if the item cannot be
-	found.
+    found.
 
 If you need to remove a tempdata value before it expires, you can directly
 unset it from the ``$_SESSION`` array::
 
-	unset($_SESSION['item']);
+    unset($_SESSION['item']);
 
 However, this won't remove the marker that makes this specific item to be
 tempdata (it will be invalidated on the next HTTP request), so if you
 intend to reuse that same key in the same request, you'd want to use
 ``removeTempdata()``::
 
-	$session->removeTempdata('item');
+    $session->removeTempdata('item');
 
 Destroying a Session
 ====================
@@ -386,16 +386,16 @@ simply use either PHP's `session_destroy() <https://www.php.net/session_destroy>
 function, or the library's ``destroy()`` method. Both will work in exactly the
 same way::
 
-	session_destroy();
+    session_destroy();
 
-	// or
+    // or
 
-	$session->destroy();
+    $session->destroy();
 
 .. note:: This must be the last session-related operation that you do
-	during the same request. All session data (including flashdata and
-	tempdata) will be destroyed permanently and functions will be
-	unusable during the same request after you destroy the session.
+    during the same request. All session data (including flashdata and
+    tempdata) will be destroyed permanently and functions will be
+    unusable during the same request after you destroy the session.
 
 You may also use the ``stop()`` method to completely kill the session
 by removing the old session_id, destroying all data, and destroying
@@ -452,11 +452,11 @@ Preference                     Default                                      Opti
 ============================== ============================================ ================================================= ============================================================================================
 
 .. note:: As a last resort, the Session library will try to fetch PHP's
-	session related INI settings, as well as legacy CI settings such as
-	'sess_expire_on_close' when any of the above is not configured.
-	However, you should never rely on this behavior as it can cause
-	unexpected results or be changed in the future. Please configure
-	everything properly.
+    session related INI settings, as well as legacy CI settings such as
+    'sess_expire_on_close' when any of the above is not configured.
+    However, you should never rely on this behavior as it can cause
+    unexpected results or be changed in the future. Please configure
+    everything properly.
 
 In addition to the values above, the cookie and native drivers apply the
 following configuration values shared by the :doc:`IncomingRequest </incoming/incomingrequest>` and
@@ -472,9 +472,9 @@ Preference           Default         Description
 ==================== =============== ===========================================================================
 
 .. note:: The 'cookieHTTPOnly' setting doesn't have an effect on sessions.
-	Instead the HttpOnly parameter is always enabled, for security
-	reasons. Additionally, the 'cookiePrefix' setting is completely
-	ignored.
+    Instead the HttpOnly parameter is always enabled, for security
+    reasons. Additionally, the 'cookiePrefix' setting is completely
+    ignored.
 
 Session Drivers
 ***************
@@ -533,9 +533,9 @@ permissions will probably break your application.
 Instead, you should do something like this, depending on your environment
 ::
 
-	mkdir /<path to your application directory>/Writable/sessions/
-	chmod 0700 /<path to your application directory>/Writable/sessions/
-	chown www-data /<path to your application directory>/Writable/sessions/
+    mkdir /<path to your application directory>/Writable/sessions/
+    chmod 0700 /<path to your application directory>/Writable/sessions/
+    chown www-data /<path to your application directory>/Writable/sessions/
 
 Bonus Tip
 ---------
@@ -571,43 +571,43 @@ table that we already mentioned and then set it as your
 For example, if you would like to use 'ci_sessions' as your table name,
 you would do this::
 
-	public $sessionDriver   = 'CodeIgniter\Session\Handlers\DatabaseHandler';
-	public $sessionSavePath = 'ci_sessions';
+    public $sessionDriver   = 'CodeIgniter\Session\Handlers\DatabaseHandler';
+    public $sessionSavePath = 'ci_sessions';
 
 And then of course, create the database table ...
 
 For MySQL::
 
-	CREATE TABLE IF NOT EXISTS `ci_sessions` (
-		`id` varchar(128) NOT null,
-		`ip_address` varchar(45) NOT null,
-		`timestamp` timestamp DEFAULT CURRENT_TIMESTAMP NOT null,
-		`data` blob NOT null,
-		KEY `ci_sessions_timestamp` (`timestamp`)
-	);
+    CREATE TABLE IF NOT EXISTS `ci_sessions` (
+        `id` varchar(128) NOT null,
+        `ip_address` varchar(45) NOT null,
+        `timestamp` timestamp DEFAULT CURRENT_TIMESTAMP NOT null,
+        `data` blob NOT null,
+        KEY `ci_sessions_timestamp` (`timestamp`)
+    );
 
 For PostgreSQL::
 
-	CREATE TABLE "ci_sessions" (
-		"id" varchar(128) NOT NULL,
-		"ip_address" inet NOT NULL,
-		"timestamp" timestamptz DEFAULT CURRENT_TIMESTAMP NOT NULL,
-		"data" bytea DEFAULT '' NOT NULL
-	);
+    CREATE TABLE "ci_sessions" (
+        "id" varchar(128) NOT NULL,
+        "ip_address" inet NOT NULL,
+        "timestamp" timestamptz DEFAULT CURRENT_TIMESTAMP NOT NULL,
+        "data" bytea DEFAULT '' NOT NULL
+    );
 
-	CREATE INDEX "ci_sessions_timestamp" ON "ci_sessions" ("timestamp");
+    CREATE INDEX "ci_sessions_timestamp" ON "ci_sessions" ("timestamp");
 
 You will also need to add a PRIMARY KEY **depending on your 'sessionMatchIP'
 setting**. The examples below work both on MySQL and PostgreSQL::
 
-	// When sessionMatchIP = true
-	ALTER TABLE ci_sessions ADD PRIMARY KEY (id, ip_address);
+    // When sessionMatchIP = true
+    ALTER TABLE ci_sessions ADD PRIMARY KEY (id, ip_address);
 
-	// When sessionMatchIP = false
-	ALTER TABLE ci_sessions ADD PRIMARY KEY (id);
+    // When sessionMatchIP = false
+    ALTER TABLE ci_sessions ADD PRIMARY KEY (id);
 
-	// To drop a previously created primary key (use when changing the setting)
-	ALTER TABLE ci_sessions DROP PRIMARY KEY;
+    // To drop a previously created primary key (use when changing the setting)
+    ALTER TABLE ci_sessions DROP PRIMARY KEY;
 
 You can choose the Database group to use by adding a new line to the
 **app/Config/App.php** file with the name of the group to use::
@@ -624,19 +624,19 @@ This command will take the **sessionSavePath** and **sessionMatchIP** settings i
 when it generates the code.
 
 .. important:: Only MySQL and PostgreSQL databases are officially
-	supported, due to lack of advisory locking mechanisms on other
-	platforms. Using sessions without locks can cause all sorts of
-	problems, especially with heavy usage of AJAX, and we will not
-	support such cases. Use ``session_write_close()`` after you've
-	done processing session data if you're having performance
-	issues.
+    supported, due to lack of advisory locking mechanisms on other
+    platforms. Using sessions without locks can cause all sorts of
+    problems, especially with heavy usage of AJAX, and we will not
+    support such cases. Use ``session_write_close()`` after you've
+    done processing session data if you're having performance
+    issues.
 
 RedisHandler Driver
 ===================
 
 .. note:: Since Redis doesn't have a locking mechanism exposed, locks for
-	this driver are emulated by a separate value that is kept for up
-	to 300 seconds.
+    this driver are emulated by a separate value that is kept for up
+    to 300 seconds.
 
 Redis is a storage engine typically used for caching and popular because
 of its high performance, which is also probably your reason to use the
@@ -656,24 +656,24 @@ The format here is a bit different and complicated at the same time. It is
 best explained by the *phpredis* extension's README file, so we'll simply
 link you to it:
 
-	https://github.com/phpredis/phpredis
+    https://github.com/phpredis/phpredis
 
 .. warning:: CodeIgniter's Session library does NOT use the actual 'redis'
-	``session.save_handler``. Take note **only** of the path format in
-	the link above.
+    ``session.save_handler``. Take note **only** of the path format in
+    the link above.
 
 For the most common case however, a simple ``host:port`` pair should be
 sufficient::
 
-	public $sessionDiver    = 'CodeIgniter\Session\Handlers\RedisHandler';
-	public $sessionSavePath = 'tcp://localhost:6379';
+    public $sessionDiver    = 'CodeIgniter\Session\Handlers\RedisHandler';
+    public $sessionSavePath = 'tcp://localhost:6379';
 
 MemcachedHandler Driver
 =======================
 
 .. note:: Since Memcached doesn't have a locking mechanism exposed, locks
-	for this driver are emulated by a separate value that is kept for
-	up to 300 seconds.
+    for this driver are emulated by a separate value that is kept for
+    up to 300 seconds.
 
 The 'MemcachedHandler' driver is very similar to the 'RedisHandler' one in all of its
 properties, except perhaps for availability, because PHP's `Memcached
@@ -693,8 +693,8 @@ considered as it may result in loss of sessions.
 The ``$sessionSavePath`` format is fairly straightforward here,
 being just a ``host:port`` pair::
 
-	public $sessionDriver   = 'CodeIgniter\Session\Handlers\MemcachedHandler';
-	public $sessionSavePath = 'localhost:11211';
+    public $sessionDriver   = 'CodeIgniter\Session\Handlers\MemcachedHandler';
+    public $sessionSavePath = 'localhost:11211';
 
 Bonus Tip
 ---------
@@ -706,6 +706,6 @@ to note that we haven't tested if that is reliable.
 If you want to experiment with this feature (on your own risk), simply
 separate the multiple server paths with commas::
 
-	// localhost will be given higher priority (5) here,
-	// compared to 192.0.2.1 with a weight of 1.
-	public $sessionSavePath = 'localhost:11211:5,192.0.2.1:11211:1';
+    // localhost will be given higher priority (5) here,
+    // compared to 192.0.2.1 with a weight of 1.
+    public $sessionSavePath = 'localhost:11211:5,192.0.2.1:11211:1';
diff --git a/user_guide_src/source/libraries/user_agent.rst b/user_guide_src/source/libraries/user_agent.rst
index f8cf92f72064..327a943f9749 100644
--- a/user_guide_src/source/libraries/user_agent.rst
+++ b/user_guide_src/source/libraries/user_agent.rst
@@ -20,7 +20,7 @@ The User Agent class is always available directly from the current :doc:`Incomin
 By default, you will have a request instance in your controller that you can retrieve the
 User Agent class from::
 
-	$agent = $this->request->getUserAgent();
+    $agent = $this->request->getUserAgent();
 
 User Agent Definitions
 ======================
@@ -37,21 +37,21 @@ whether the user agent browsing your site is a web browser, a mobile
 device, or a robot. It will also gather the platform information if it
 is available::
 
-	$agent = $this->request->getUserAgent();
+    $agent = $this->request->getUserAgent();
 
-	if ($agent->isBrowser()) {
-		$currentAgent = $agent->getBrowser().' '.$agent->getVersion();
-	} elseif ($agent->isRobot()) {
-		$currentAgent = $this->agent->robot();
-	} elseif ($agent->isMobile()) {
-		$currentAgent = $agent->getMobile();
-	} else {
-		$currentAgent = 'Unidentified User Agent';
-	}
+    if ($agent->isBrowser()) {
+        $currentAgent = $agent->getBrowser().' '.$agent->getVersion();
+    } elseif ($agent->isRobot()) {
+        $currentAgent = $this->agent->robot();
+    } elseif ($agent->isMobile()) {
+        $currentAgent = $agent->getMobile();
+    } else {
+        $currentAgent = 'Unidentified User Agent';
+    }
 
-	echo $currentAgent;
+    echo $currentAgent;
 
-	echo $agent->getPlatform(); // Platform info (Windows, Linux, Mac, etc.)
+    echo $agent->getPlatform(); // Platform info (Windows, Linux, Mac, etc.)
 
 ***************
 Class Reference
@@ -59,120 +59,120 @@ Class Reference
 
 .. php:class:: CodeIgniter\\HTTP\\UserAgent
 
-	.. php:method:: isBrowser([$key = null])
+    .. php:method:: isBrowser([$key = null])
 
-		:param	string	$key: Optional browser name
-    		:returns:	true if the user agent is a (specified) browser, false if not
-    		:rtype:	bool
+        :param    string    $key: Optional browser name
+        :returns:    true if the user agent is a (specified) browser, false if not
+        :rtype:    bool
 
-    		Returns true/false (boolean) if the user agent is a known web browser.
-    		::
+        Returns true/false (boolean) if the user agent is a known web browser.
+        ::
 
-			if ($agent->isBrowser('Safari')) {
-				echo 'You are using Safari.';
-			} elseif ($agent->isBrowser()) {
-				echo 'You are using a browser.';
-			}
+            if ($agent->isBrowser('Safari')) {
+                echo 'You are using Safari.';
+            } elseif ($agent->isBrowser()) {
+                echo 'You are using a browser.';
+            }
 
-		.. note:: The string "Safari" in this example is an array key in the list of browser definitions.
-				  You can find this list in **app/Config/UserAgents.php** if you want to add new
-				  browsers or change the strings.
+        .. note:: The string "Safari" in this example is an array key in the list of browser definitions.
+                  You can find this list in **app/Config/UserAgents.php** if you want to add new
+                  browsers or change the strings.
 
-	.. php:method:: isMobile([$key = null])
+    .. php:method:: isMobile([$key = null])
 
-		:param	string	$key: Optional mobile device name
-    		:returns:	true if the user agent is a (specified) mobile device, false if not
-    		:rtype:	bool
+        :param    string    $key: Optional mobile device name
+        :returns:    true if the user agent is a (specified) mobile device, false if not
+        :rtype:    bool
 
-    		Returns true/false (boolean) if the user agent is a known mobile device.
-    		::
+        Returns true/false (boolean) if the user agent is a known mobile device.
+        ::
 
-			if ($agent->isMobile('iphone')) {
-				echo view('iphone/home');
-			} elseif ($agent->isMobile()) {
-				echo view('mobile/home');
-			} else {
-				echo view('web/home');
-			}
+            if ($agent->isMobile('iphone')) {
+                echo view('iphone/home');
+            } elseif ($agent->isMobile()) {
+                echo view('mobile/home');
+            } else {
+                echo view('web/home');
+            }
 
-	.. php:method:: isRobot([$key = null])
+    .. php:method:: isRobot([$key = null])
 
-		:param	string	$key: Optional robot name
-    		:returns:	true if the user agent is a (specified) robot, false if not
-    		:rtype:	bool
+        :param    string    $key: Optional robot name
+        :returns:    true if the user agent is a (specified) robot, false if not
+        :rtype:    bool
 
-    		Returns true/false (boolean) if the user agent is a known robot.
+        Returns true/false (boolean) if the user agent is a known robot.
 
-    		.. note:: The user agent library only contains the most common robot definitions. It is not a complete list of bots.
-    				  There are hundreds of them so searching for each one would not be very efficient. If you find that some bots
-    				  that commonly visit your site are missing from the list you can add them to your
-    				  **app/Config/UserAgents.php** file.
+        .. note:: The user agent library only contains the most common robot definitions. It is not a complete list of bots.
+                  There are hundreds of them so searching for each one would not be very efficient. If you find that some bots
+                  that commonly visit your site are missing from the list you can add them to your
+                  **app/Config/UserAgents.php** file.
 
-	.. php:method:: isReferral()
+    .. php:method:: isReferral()
 
-		:returns:	true if the user agent is a referral, false if not
-		:rtype:	bool
+        :returns:    true if the user agent is a referral, false if not
+        :rtype:    bool
 
-		Returns true/false (boolean) if the user agent was referred from another site.
+        Returns true/false (boolean) if the user agent was referred from another site.
 
-	.. php:method:: getBrowser()
+    .. php:method:: getBrowser()
 
-		:returns:	Detected browser or an empty string
-		:rtype:	string
+        :returns:    Detected browser or an empty string
+        :rtype:    string
 
-		Returns a string containing the name of the web browser viewing your site.
+        Returns a string containing the name of the web browser viewing your site.
 
-	.. php:method:: getVersion()
+    .. php:method:: getVersion()
 
-		:returns:	Detected browser version or an empty string
-		:rtype:	string
+        :returns:    Detected browser version or an empty string
+        :rtype:    string
 
-		Returns a string containing the version number of the web browser viewing your site.
+        Returns a string containing the version number of the web browser viewing your site.
 
-	.. php:method:: getMobile()
+    .. php:method:: getMobile()
 
-		:returns:	Detected mobile device brand or an empty string
-		:rtype:	string
+        :returns:    Detected mobile device brand or an empty string
+        :rtype:    string
 
-		Returns a string containing the name of the mobile device viewing your site.
+        Returns a string containing the name of the mobile device viewing your site.
 
-	.. php:method:: getRobot()
+    .. php:method:: getRobot()
 
-		:returns:	Detected robot name or an empty string
-		:rtype:	string
+        :returns:    Detected robot name or an empty string
+        :rtype:    string
 
-		Returns a string containing the name of the robot viewing your site.
+        Returns a string containing the name of the robot viewing your site.
 
-	.. php:method:: getPlatform()
+    .. php:method:: getPlatform()
 
-		:returns:	Detected operating system or an empty string
-		:rtype:	string
+        :returns:    Detected operating system or an empty string
+        :rtype:    string
 
-		Returns a string containing the platform viewing your site (Linux, Windows, OS X, etc.).
+        Returns a string containing the platform viewing your site (Linux, Windows, OS X, etc.).
 
-	.. php:method:: getReferrer()
+    .. php:method:: getReferrer()
 
-		:returns:	Detected referrer or an empty string
-		:rtype:	string
+        :returns:    Detected referrer or an empty string
+        :rtype:    string
 
-		The referrer, if the user agent was referred from another site. Typically you'll test for this as follows::
+        The referrer, if the user agent was referred from another site. Typically you'll test for this as follows::
 
-			if ($agent->isReferral()) {
-				echo $agent->referrer();
-			}
+            if ($agent->isReferral()) {
+                echo $agent->referrer();
+            }
 
-	.. php:method:: getAgentString()
+    .. php:method:: getAgentString()
 
-		:returns:	Full user agent string or an empty string
-		:rtype:	string
+        :returns:    Full user agent string or an empty string
+        :rtype:    string
 
-		Returns a string containing the full user agent string. Typically it will be something like this::
+        Returns a string containing the full user agent string. Typically it will be something like this::
 
-			Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.0.4) Gecko/20060613 Camino/1.0.2
+            Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.0.4) Gecko/20060613 Camino/1.0.2
 
-	.. php:method:: parse($string)
+    .. php:method:: parse($string)
 
-		:param	string	$string: A custom user-agent string
-    		:rtype:	void
+        :param    string    $string: A custom user-agent string
+        :rtype:    void
 
-    		Parses a custom user-agent string, different from the one reported by the current visitor.
+        Parses a custom user-agent string, different from the one reported by the current visitor.
diff --git a/user_guide_src/source/outgoing/table.rst b/user_guide_src/source/outgoing/table.rst
index 334658d08380..0c8810fdb277 100644
--- a/user_guide_src/source/outgoing/table.rst
+++ b/user_guide_src/source/outgoing/table.rst
@@ -18,7 +18,7 @@ Initializing the Class
 The Table class is not provided as a service, and should be instantiated
 "normally", for instance::
 
-	$table = new \CodeIgniter\View\Table();
+    $table = new \CodeIgniter\View\Table();
 
 Examples
 ========
@@ -30,16 +30,16 @@ method described in the function reference below).
 
 ::
 
-	$table = new \CodeIgniter\View\Table();
+    $table = new \CodeIgniter\View\Table();
 
-	$data = [
-		['Name', 'Color', 'Size'],
-		['Fred', 'Blue',  'Small'],
-		['Mary', 'Red',   'Large'],
-		['John', 'Green', 'Medium'],
-	];
+    $data = [
+        ['Name', 'Color', 'Size'],
+        ['Fred', 'Blue',  'Small'],
+        ['Mary', 'Red',   'Large'],
+        ['John', 'Green', 'Medium'],
+    ];
 
-	echo $table->generate($data);
+    echo $table->generate($data);
 
 Here is an example of a table created from a database query result. The
 table class will automatically generate the headings based on the table
@@ -48,37 +48,37 @@ method described in the class reference below).
 
 ::
 
-	$table = new \CodeIgniter\View\Table();
+    $table = new \CodeIgniter\View\Table();
 
-	$query = $db->query('SELECT * FROM my_table');
+    $query = $db->query('SELECT * FROM my_table');
 
-	echo $table->generate($query);
+    echo $table->generate($query);
 
 Here is an example showing how you might create a table using discrete
 parameters::
 
-	$table = new \CodeIgniter\View\Table();
+    $table = new \CodeIgniter\View\Table();
 
-	$table->setHeading('Name', 'Color', 'Size');
+    $table->setHeading('Name', 'Color', 'Size');
 
-	$table->addRow('Fred', 'Blue', 'Small');
-	$table->addRow('Mary', 'Red', 'Large');
-	$table->addRow('John', 'Green', 'Medium');
+    $table->addRow('Fred', 'Blue', 'Small');
+    $table->addRow('Mary', 'Red', 'Large');
+    $table->addRow('John', 'Green', 'Medium');
 
-	echo $table->generate();
+    echo $table->generate();
 
 Here is the same example, except instead of individual parameters,
 arrays are used::
 
-	$table = new \CodeIgniter\View\Table();
+    $table = new \CodeIgniter\View\Table();
 
-	$table->setHeading(array('Name', 'Color', 'Size'));
+    $table->setHeading(array('Name', 'Color', 'Size'));
 
-	$table->addRow(['Fred', 'Blue', 'Small']);
-	$table->addRow(['Mary', 'Red', 'Large']);
-	$table->addRow(['John', 'Green', 'Medium']);
+    $table->addRow(['Fred', 'Blue', 'Small']);
+    $table->addRow(['Mary', 'Red', 'Large']);
+    $table->addRow(['John', 'Green', 'Medium']);
 
-	echo $table->generate();
+    echo $table->generate();
 
 Changing the Look of Your Table
 ===============================
@@ -86,65 +86,65 @@ Changing the Look of Your Table
 The Table Class permits you to set a table template with which you can
 specify the design of your layout. Here is the template prototype::
 
-	$template = [
-		'table_open'         => '<table border="0" cellpadding="4" cellspacing="0">',
+    $template = [
+        'table_open'         => '<table border="0" cellpadding="4" cellspacing="0">',
 
-		'thead_open'         => '<thead>',
-		'thead_close'        => '</thead>',
+        'thead_open'         => '<thead>',
+        'thead_close'        => '</thead>',
 
-		'heading_row_start'  => '<tr>',
-		'heading_row_end'    => '</tr>',
-		'heading_cell_start' => '<th>',
-		'heading_cell_end'   => '</th>',
+        'heading_row_start'  => '<tr>',
+        'heading_row_end'    => '</tr>',
+        'heading_cell_start' => '<th>',
+        'heading_cell_end'   => '</th>',
 
-		'tfoot_open'         => '<tfoot>',
-		'tfoot_close'        => '</tfoot>',
+        'tfoot_open'         => '<tfoot>',
+        'tfoot_close'        => '</tfoot>',
 
-		'footing_row_start'  => '<tr>',
-		'footing_row_end'    => '</tr>',
-		'footing_cell_start' => '<td>',
-		'footing_cell_end'   => '</td>',
+        'footing_row_start'  => '<tr>',
+        'footing_row_end'    => '</tr>',
+        'footing_cell_start' => '<td>',
+        'footing_cell_end'   => '</td>',
 
-		'tbody_open'         => '<tbody>',
-		'tbody_close'        => '</tbody>',
+        'tbody_open'         => '<tbody>',
+        'tbody_close'        => '</tbody>',
 
-		'row_start'          => '<tr>',
-		'row_end'            => '</tr>',
-		'cell_start'         => '<td>',
-		'cell_end'           => '</td>',
+        'row_start'          => '<tr>',
+        'row_end'            => '</tr>',
+        'cell_start'         => '<td>',
+        'cell_end'           => '</td>',
 
-		'row_alt_start'      => '<tr>',
-		'row_alt_end'        => '</tr>',
-		'cell_alt_start'     => '<td>',
-		'cell_alt_end'       => '</td>',
+        'row_alt_start'      => '<tr>',
+        'row_alt_end'        => '</tr>',
+        'cell_alt_start'     => '<td>',
+        'cell_alt_end'       => '</td>',
 
-		'table_close'        => '</table>'
-	];
+        'table_close'        => '</table>'
+    ];
 
-	$table->setTemplate($template);
+    $table->setTemplate($template);
 
 .. note:: You'll notice there are two sets of "row" blocks in the
-	template. These permit you to create alternating row colors or design
-	elements that alternate with each iteration of the row data.
+    template. These permit you to create alternating row colors or design
+    elements that alternate with each iteration of the row data.
 
 You are NOT required to submit a complete template. If you only need to
 change parts of the layout you can simply submit those elements. In this
 example, only the table opening tag is being changed::
 
-	$template = [
-		'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">'
-	];
+    $template = [
+        'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">'
+    ];
 
-	$table->setTemplate($template);
+    $table->setTemplate($template);
 
 You can also set defaults for these by passing an array of template settings
 to the Table constructor.::
 
-	$customSettings = [
-		'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">'
-	];
+    $customSettings = [
+        'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">'
+    ];
 
-	$table = new \CodeIgniter\View\Table($customSettings);
+    $table = new \CodeIgniter\View\Table($customSettings);
 
 
 ***************
@@ -153,171 +153,171 @@ Class Reference
 
 .. php:class:: Table
 
-	.. attribute:: $function = null
+    .. attribute:: $function = null
 
-		Allows you to specify a native PHP function or a valid function array object to be applied to all cell data.
-		::
+        Allows you to specify a native PHP function or a valid function array object to be applied to all cell data.
+        ::
 
-			$table = new \CodeIgniter\View\Table();
+            $table = new \CodeIgniter\View\Table();
 
-			$table->setHeading('Name', 'Color', 'Size');
-			$table->addRow('Fred', '<strong>Blue</strong>', 'Small');
+            $table->setHeading('Name', 'Color', 'Size');
+            $table->addRow('Fred', '<strong>Blue</strong>', 'Small');
 
-			$table->function = 'htmlspecialchars';
-			echo $table->generate();
+            $table->function = 'htmlspecialchars';
+            echo $table->generate();
 
-		In the above example, all cell data would be run through PHP's :php:func:`htmlspecialchars()` function, resulting in::
+        In the above example, all cell data would be run through PHP's :php:func:`htmlspecialchars()` function, resulting in::
 
-			<td>Fred</td><td>&lt;strong&gt;Blue&lt;/strong&gt;</td><td>Small</td>
+            <td>Fred</td><td>&lt;strong&gt;Blue&lt;/strong&gt;</td><td>Small</td>
 
-	.. php:method:: generate([$tableData = null])
+    .. php:method:: generate([$tableData = null])
 
-		:param	mixed	$tableData: Data to populate the table rows with
-		:returns:	HTML table
-		:rtype:	string
+        :param    mixed    $tableData: Data to populate the table rows with
+        :returns:    HTML table
+        :rtype:    string
 
-		Returns a string containing the generated table. Accepts an optional parameter which can be an array or a database result object.
+        Returns a string containing the generated table. Accepts an optional parameter which can be an array or a database result object.
 
-	.. php:method:: setCaption($caption)
+    .. php:method:: setCaption($caption)
 
-		:param	string	$caption: Table caption
-		:returns:	Table instance (method chaining)
-		:rtype:	Table
+        :param    string    $caption: Table caption
+        :returns:    Table instance (method chaining)
+        :rtype:    Table
 
-		Permits you to add a caption to the table.
-		::
+        Permits you to add a caption to the table.
+        ::
 
-			$table->setCaption('Colors');
+            $table->setCaption('Colors');
 
-	.. php:method:: setHeading([$args = [] [, ...]])
+    .. php:method:: setHeading([$args = [] [, ...]])
 
-		:param	mixed	$args: An array or multiple strings containing the table column titles
-		:returns:	Table instance (method chaining)
-		:rtype:	Table
+        :param    mixed    $args: An array or multiple strings containing the table column titles
+        :returns:    Table instance (method chaining)
+        :rtype:    Table
 
-		Permits you to set the table heading. You can submit an array or discrete params::
+        Permits you to set the table heading. You can submit an array or discrete params::
 
-			$table->setHeading('Name', 'Color', 'Size'); // or
+            $table->setHeading('Name', 'Color', 'Size'); // or
 
-			$table->setHeading(['Name', 'Color', 'Size']);
+            $table->setHeading(['Name', 'Color', 'Size']);
 
-	.. php:method:: setFooting([$args = [] [, ...]])
+    .. php:method:: setFooting([$args = [] [, ...]])
 
-		:param	mixed	$args: An array or multiple strings containing the table footing values
-		:returns:	Table instance (method chaining)
-		:rtype:	Table
+        :param    mixed    $args: An array or multiple strings containing the table footing values
+        :returns:    Table instance (method chaining)
+        :rtype:    Table
 
-		Permits you to set the table footing. You can submit an array or discrete params::
+        Permits you to set the table footing. You can submit an array or discrete params::
 
-			$table->setFooting('Subtotal', $subtotal, $notes); // or
+            $table->setFooting('Subtotal', $subtotal, $notes); // or
 
-			$table->setFooting(['Subtotal', $subtotal, $notes]);
+            $table->setFooting(['Subtotal', $subtotal, $notes]);
 
-	.. php:method:: addRow([$args = [] [, ...]])
+    .. php:method:: addRow([$args = [] [, ...]])
 
-		:param	mixed	$args: An array or multiple strings containing the row values
-		:returns:	Table instance (method chaining)
-		:rtype:	Table
+        :param    mixed    $args: An array or multiple strings containing the row values
+        :returns:    Table instance (method chaining)
+        :rtype:    Table
 
-		Permits you to add a row to your table. You can submit an array or discrete params::
+        Permits you to add a row to your table. You can submit an array or discrete params::
 
-			$table->addRow('Blue', 'Red', 'Green'); // or
+            $table->addRow('Blue', 'Red', 'Green'); // or
 
-			$table->addRow(['Blue', 'Red', 'Green']);
+            $table->addRow(['Blue', 'Red', 'Green']);
 
-		If you would like to set an individual cell's tag attributes, you can use an associative array for that cell.
-		The associative key **data** defines the cell's data. Any other key => val pairs are added as key='val' attributes to the tag::
+        If you would like to set an individual cell's tag attributes, you can use an associative array for that cell.
+        The associative key **data** defines the cell's data. Any other key => val pairs are added as key='val' attributes to the tag::
 
-			$cell = ['data' => 'Blue', 'class' => 'highlight', 'colspan' => 2];
-			$table->addRow($cell, 'Red', 'Green');
+            $cell = ['data' => 'Blue', 'class' => 'highlight', 'colspan' => 2];
+            $table->addRow($cell, 'Red', 'Green');
 
-			// generates
-			// <td class='highlight' colspan='2'>Blue</td><td>Red</td><td>Green</td>
+            // generates
+            // <td class='highlight' colspan='2'>Blue</td><td>Red</td><td>Green</td>
 
-	.. php:method:: makeColumns([$array = [] [, $columnLimit = 0]])
+    .. php:method:: makeColumns([$array = [] [, $columnLimit = 0]])
 
-		:param	array	$array: An array containing multiple rows' data
-		:param	int	$columnLimit: Count of columns in the table
-		:returns:	An array of HTML table columns
-		:rtype:	array
+        :param    array    $array: An array containing multiple rows' data
+        :param    int    $columnLimit: Count of columns in the table
+        :returns:    An array of HTML table columns
+        :rtype:    array
 
-		This method takes a one-dimensional array as input and creates a multi-dimensional array with a depth equal to the number of columns desired.
-		This allows a single array with many elements to be displayed in a table that has a fixed column count. Consider this example::
+        This method takes a one-dimensional array as input and creates a multi-dimensional array with a depth equal to the number of columns desired.
+        This allows a single array with many elements to be displayed in a table that has a fixed column count. Consider this example::
 
-			$list = ['one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve'];
+            $list = ['one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve'];
 
-			$newList = $table->makeColumns($list, 3);
+            $newList = $table->makeColumns($list, 3);
 
-			$table->generate($newList);
+            $table->generate($newList);
 
-			// Generates a table with this prototype
+            // Generates a table with this prototype
 
-			<table border="0" cellpadding="4" cellspacing="0">
-			<tr>
-			<td>one</td><td>two</td><td>three</td>
-			</tr><tr>
-			<td>four</td><td>five</td><td>six</td>
-			</tr><tr>
-			<td>seven</td><td>eight</td><td>nine</td>
-			</tr><tr>
-			<td>ten</td><td>eleven</td><td>twelve</td></tr>
-			</table>
+            <table border="0" cellpadding="4" cellspacing="0">
+            <tr>
+            <td>one</td><td>two</td><td>three</td>
+            </tr><tr>
+            <td>four</td><td>five</td><td>six</td>
+            </tr><tr>
+            <td>seven</td><td>eight</td><td>nine</td>
+            </tr><tr>
+            <td>ten</td><td>eleven</td><td>twelve</td></tr>
+            </table>
 
 
-	.. php:method:: setTemplate($template)
+    .. php:method:: setTemplate($template)
 
-		:param	array	$template: An associative array containing template values
-		:returns:	true on success, false on failure
-		:rtype:	bool
+        :param    array    $template: An associative array containing template values
+        :returns:    true on success, false on failure
+        :rtype:    bool
 
-		Permits you to set your template. You can submit a full or partial template.
-		::
+        Permits you to set your template. You can submit a full or partial template.
+        ::
 
-			$template = [
-				'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">'
-			];
+            $template = [
+                'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">'
+            ];
 
-			$table->setTemplate($template);
+            $table->setTemplate($template);
 
-	.. php:method:: setEmpty($value)
+    .. php:method:: setEmpty($value)
 
-		:param	mixed	$value: Value to put in empty cells
-		:returns:	Table instance (method chaining)
-		:rtype:	Table
+        :param    mixed    $value: Value to put in empty cells
+        :returns:    Table instance (method chaining)
+        :rtype:    Table
 
-		Lets you set a default value for use in any table cells that are empty.
-		You might, for example, set a non-breaking space::
+        Lets you set a default value for use in any table cells that are empty.
+        You might, for example, set a non-breaking space::
 
-			$table->setEmpty("&nbsp;");
+            $table->setEmpty("&nbsp;");
 
-	.. php:method:: clear()
+    .. php:method:: clear()
 
-		:returns:	Table instance (method chaining)
-		:rtype:	Table
+        :returns:    Table instance (method chaining)
+        :rtype:    Table
 
-		Lets you clear the table heading, row data and caption. If
-		you need to show multiple tables with different data you
-		should to call this method after each table has been
-		generated to clear the previous table information.
+        Lets you clear the table heading, row data and caption. If
+        you need to show multiple tables with different data you
+        should to call this method after each table has been
+        generated to clear the previous table information.
 
-		Example ::
+        Example ::
 
-			$table = new \CodeIgniter\View\Table();
+            $table = new \CodeIgniter\View\Table();
 
-			$table->setCaption('Preferences')
-				->setHeading('Name', 'Color', 'Size')
-				->addRow('Fred', 'Blue', 'Small')
-				->addRow('Mary', 'Red', 'Large')
-				->addRow('John', 'Green', 'Medium');
+            $table->setCaption('Preferences')
+                ->setHeading('Name', 'Color', 'Size')
+                ->addRow('Fred', 'Blue', 'Small')
+                ->addRow('Mary', 'Red', 'Large')
+                ->addRow('John', 'Green', 'Medium');
 
-			echo $table->generate();
+            echo $table->generate();
 
-			$table->clear();
+            $table->clear();
 
-			$table->setCaption('Shipping')
-				->setHeading('Name', 'Day', 'Delivery')
-				->addRow('Fred', 'Wednesday', 'Express')
-				->addRow('Mary', 'Monday', 'Air')
-				->addRow('John', 'Saturday', 'Overnight');
+            $table->setCaption('Shipping')
+                ->setHeading('Name', 'Day', 'Delivery')
+                ->addRow('Fred', 'Wednesday', 'Express')
+                ->addRow('Mary', 'Monday', 'Air')
+                ->addRow('John', 'Saturday', 'Overnight');
 
-			echo $table->generate();
+            echo $table->generate();
diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst
index 0ea2001fe724..19121c98b86a 100644
--- a/user_guide_src/source/outgoing/views.rst
+++ b/user_guide_src/source/outgoing/views.rst
@@ -21,14 +21,14 @@ Creating a View
 
 Using your text editor, create a file called ``BlogView.php`` and put this in it::
 
-	<html>
+    <html>
         <head>
             <title>My Blog</title>
         </head>
         <body>
             <h1>Welcome to my Blog!</h1>
         </body>
-	</html>
+    </html>
 
 Then save the file in your **app/Views** directory.
 
@@ -37,7 +37,7 @@ Displaying a View
 
 To load and display a particular view file you will use the following function::
 
-	echo view('name');
+    echo view('name');
 
 Where *name* is the name of your view file.
 
@@ -45,21 +45,21 @@ Where *name* is the name of your view file.
 
 Now, open the controller file you made earlier called ``Blog.php``, and replace the echo statement with the view function::
 
-	<?php
+    <?php
 
-	namespace App\Controllers;
+    namespace App\Controllers;
 
-	class Blog extends \CodeIgniter\Controller
-	{
-		public function index()
-		{
-			echo view('BlogView');
-		}
-	}
+    class Blog extends \CodeIgniter\Controller
+    {
+        public function index()
+        {
+            echo view('BlogView');
+        }
+    }
 
 If you visit your site using the URL you did earlier you should see your new view. The URL was similar to this::
 
-	example.com/index.php/blog/
+    example.com/index.php/blog/
 
 .. note:: While all of the examples show echo the view directly, you can also return the output from the view, instead,
     and it will be appended to any captured output.
@@ -71,24 +71,24 @@ CodeIgniter will intelligently handle multiple calls to ``view()`` from within a
 call happens they will be appended together. For example, you may wish to have a header view, a menu view, a
 content view, and a footer view. That might look something like this::
 
-	<?php
+    <?php
 
-	namespace App\Controllers;
+    namespace App\Controllers;
 
-	class Page extends \CodeIgniter\Controller
-	{
-		public function index()
-		{
-			$data = [
-				'page_title' => 'Your title',
-			];
+    class Page extends \CodeIgniter\Controller
+    {
+        public function index()
+        {
+            $data = [
+                'page_title' => 'Your title',
+            ];
 
-			echo view('header');
-			echo view('menu');
-			echo view('content', $data);
-			echo view('footer');
-		}
-	}
+            echo view('header');
+            echo view('menu');
+            echo view('content', $data);
+            echo view('footer');
+        }
+    }
 
 In the example above, we are using "dynamically added data", which you will see below.
 
@@ -98,7 +98,7 @@ Storing Views within Sub-directories
 Your view files can also be stored within sub-directories if you prefer that type of organization.
 When doing so you will need to include the directory name loading the view. Example::
 
-	echo view('directory_name/file_name');
+    echo view('directory_name/file_name');
 
 Namespaced Views
 ================
@@ -134,41 +134,41 @@ Adding Dynamic Data to the View
 Data is passed from the controller to the view by way of an array in the second parameter of the view function.
 Here's an example::
 
-	$data = [
-		'title'   => 'My title',
-		'heading' => 'My Heading',
-		'message' => 'My Message',
-	];
+    $data = [
+        'title'   => 'My title',
+        'heading' => 'My Heading',
+        'message' => 'My Message',
+    ];
 
-	echo view('blogview', $data);
+    echo view('blogview', $data);
 
 Let's try it with your controller file. Open it and add this code::
 
-	<?php
+    <?php
 
-	namespace App\Controllers;
+    namespace App\Controllers;
 
-	class Blog extends \CodeIgniter\Controller
-	{
-		public function index()
-		{
-			$data['title']   = "My Real Title";
-			$data['heading'] = "My Real Heading";
+    class Blog extends \CodeIgniter\Controller
+    {
+        public function index()
+        {
+            $data['title']   = "My Real Title";
+            $data['heading'] = "My Real Heading";
 
-			echo view('blogview', $data);
-		}
-	}
+            echo view('blogview', $data);
+        }
+    }
 
 Now open your view file and change the text to variables that correspond to the array keys in your data::
 
-	<html>
+    <html>
         <head>
             <title><?= $title ?></title>
         </head>
         <body>
             <h1><?= $heading ?></h1>
         </body>
-	</html>
+    </html>
 
 Then load the page at the URL you've been using and you should see the variables replaced.
 
@@ -178,13 +178,13 @@ other views, potentially causing issues. If you would prefer the data to persist
 into the `$option` array in the third parameter.
 ::
 
-	$data = [
-		'title'   => 'My title',
-		'heading' => 'My Heading',
-		'message' => 'My Message',
-	];
+    $data = [
+        'title'   => 'My title',
+        'heading' => 'My Heading',
+        'message' => 'My Message',
+    ];
 
-	echo view('blogview', $data, ['saveData' => true]);
+    echo view('blogview', $data, ['saveData' => true]);
 
 Additionally, if you would like the default functionality of the view function to be that it does save the data
 between calls, you can set ``$saveData`` to **true** in **app/Config/Views.php**.
@@ -198,42 +198,42 @@ typically be in the form of a multi-dimensional array.
 
 Here’s a simple example. Add this to your controller::
 
-	<?php
+    <?php
 
-	namespace App\Controllers;
+    namespace App\Controllers;
 
-	class Blog extends \CodeIgniter\Controller
-	{
-		public function index()
-		{
-			$data = [
-				'todo_list' => ['Clean House', 'Call Mom', 'Run Errands'],
-				'title'     => 'My Real Title',
-				'heading'   => 'My Real Heading',
-			];
+    class Blog extends \CodeIgniter\Controller
+    {
+        public function index()
+        {
+            $data = [
+                'todo_list' => ['Clean House', 'Call Mom', 'Run Errands'],
+                'title'     => 'My Real Title',
+                'heading'   => 'My Real Heading',
+            ];
 
-			echo view('blogview', $data);
-		}
-	}
+            echo view('blogview', $data);
+        }
+    }
 
 Now open your view file and create a loop::
 
-	<html>
-	<head>
-		<title><?= $title ?></title>
-	</head>
-	<body>
-		<h1><?= $heading ?></h1>
+    <html>
+    <head>
+        <title><?= $title ?></title>
+    </head>
+    <body>
+        <h1><?= $heading ?></h1>
 
-		<h3>My Todo List</h3>
+        <h3>My Todo List</h3>
 
-		<ul>
-		<?php foreach ($todo_list as $item):?>
+        <ul>
+        <?php foreach ($todo_list as $item):?>
 
-			<li><?= $item ?></li>
+            <li><?= $item ?></li>
 
-		<?php endforeach;?>
-		</ul>
+        <?php endforeach;?>
+        </ul>
 
-	</body>
-	</html>
+    </body>
+    </html>

From ec5a92540fe674afbca9253aa2056fd479456b14 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 21 Sep 2021 20:10:58 +0900
Subject: [PATCH 0288/2325] docs: replace tabs with spaces

---
 user_guide_src/ghpages.rst                    |  10 +-
 .../source/database/query_builder.rst         | 280 +++++++++---------
 user_guide_src/source/helpers/form_helper.rst | 220 +++++++-------
 3 files changed, 255 insertions(+), 255 deletions(-)

diff --git a/user_guide_src/ghpages.rst b/user_guide_src/ghpages.rst
index 1d7719c1193c..4699d38f978d 100644
--- a/user_guide_src/ghpages.rst
+++ b/user_guide_src/ghpages.rst
@@ -26,19 +26,19 @@ Re-generating the User Guide
 In the ``user_guide_src`` folder, you generate a conventional user guide,
 for testing, using the command::
 
-	make html
+    make html
 
 An additional target has been configured, which will generate the same
 HTML but inside the ``html`` folder of the second repo clone::
 
-	make ghpages
+    make ghpages
 
 After making this target, update the online user guide by switching to
 the ``CodeIgniter4-guide/html`` folder, and then::
 
-	git add .
-	git commit -S -m "Suitable comment"
-	git push origin gh-pages
+    git add .
+    git commit -S -m "Suitable comment"
+    git push origin gh-pages
 
 Process
 =======
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 45380416fdac..26fcba73e4ee 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -627,7 +627,7 @@ searches.
 
         $builder->havingLike('title', 'match', 'before'); // Produces: HAVING `title` LIKE '%match' ESCAPE '!'
         $builder->havingLike('title', 'match', 'after');  // Produces: HAVING `title` LIKE 'match%' ESCAPE '!'
-        $builder->havingLike('title', 'match', 'both');	  // Produces: HAVING `title` LIKE '%match%' ESCAPE '!'
+        $builder->havingLike('title', 'match', 'both');   // Produces: HAVING `title` LIKE '%match%' ESCAPE '!'
 
 #. **Associative array method:**
 
@@ -1046,9 +1046,9 @@ is an example using an array::
     $builder->update($data);
     // Produces:
     //
-    //	UPDATE mytable
-    //	SET title = '{$title}', name = '{$name}', date = '{$date}'
-    //	WHERE id = $id
+    // UPDATE mytable
+    // SET title = '{$title}', name = '{$name}', date = '{$date}'
+    // WHERE id = $id
 
 Or you can supply an object::
 
@@ -1238,8 +1238,8 @@ Class Reference
 
     .. php:method:: db()
 
-        :returns: The database connection in use
-        :rtype:	``ConnectionInterface``
+        :returns:   The database connection in use
+        :rtype:     ``ConnectionInterface``
 
         Returns the current database connection from ``$db``. Useful for
         accessing ``ConnectionInterface`` methods that are not directly
@@ -1247,8 +1247,8 @@ Class Reference
 
     .. php:method:: resetQuery()
 
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Resets the current Query Builder state. Useful when you want
         to build a query that can be canceled under certain conditions.
@@ -1256,8 +1256,8 @@ Class Reference
     .. php:method:: countAllResults([$reset = true])
 
         :param bool $reset: Whether to reset values for SELECTs
-        :returns: Number of rows in the query result
-        :rtype:	int
+        :returns:   Number of rows in the query result
+        :rtype:     int
 
         Generates a platform-specific query string that counts
         all records returned by an Query Builder query.
@@ -1265,8 +1265,8 @@ Class Reference
     .. php:method:: countAll([$reset = true])
 
         :param bool $reset: Whether to reset values for SELECTs
-        :returns: Number of rows in the query result
-        :rtype:	int
+        :returns:   Number of rows in the query result
+        :rtype:     int
 
         Generates a platform-specific query string that counts
         all records in the particular table.
@@ -1277,7 +1277,7 @@ Class Reference
         :param int $offset: The OFFSET clause
         :param bool $reset: Do we want to clear query builder values?
         :returns: ``\CodeIgniter\Database\ResultInterface`` instance (method chaining)
-        :rtype:	``\CodeIgniter\Database\ResultInterface``
+        :rtype:    ``\CodeIgniter\Database\ResultInterface``
 
         Compiles and runs ``SELECT`` statement based on the already
         called Query Builder methods.
@@ -1288,8 +1288,8 @@ Class Reference
         :param int $limit: The LIMIT clause
         :param int $offset: The OFFSET clause
         :param bool $reset: Do we want to clear query builder values?
-        :returns: ``\CodeIgniter\Database\ResultInterface`` instance (method chaining)
-        :rtype:	``\CodeIgniter\Database\ResultInterface``
+        :returns:   ``\CodeIgniter\Database\ResultInterface`` instance (method chaining)
+        :rtype:     ``\CodeIgniter\Database\ResultInterface``
 
         Same as ``get()``, but also allows the WHERE to be added directly.
 
@@ -1297,8 +1297,8 @@ Class Reference
 
         :param string $select: The SELECT portion of a query
         :param bool $escape: Whether to escape values and identifiers
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds a ``SELECT`` clause to a query.
 
@@ -1306,8 +1306,8 @@ Class Reference
 
         :param string $select: Field to compute the average of
         :param string $alias: Alias for the resulting value name
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds a ``SELECT AVG(field)`` clause to a query.
 
@@ -1315,8 +1315,8 @@ Class Reference
 
         :param string $select: Field to compute the maximum of
         :param string $alias: Alias for the resulting value name
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds a ``SELECT MAX(field)`` clause to a query.
 
@@ -1324,8 +1324,8 @@ Class Reference
 
         :param string $select: Field to compute the minimum of
         :param string $alias: Alias for the resulting value name
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds a ``SELECT MIN(field)`` clause to a query.
 
@@ -1333,8 +1333,8 @@ Class Reference
 
         :param string $select: Field to compute the sum of
         :param string $alias: Alias for the resulting value name
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds a ``SELECT SUM(field)`` clause to a query.
 
@@ -1342,16 +1342,16 @@ Class Reference
 
         :param string $select: Field to compute the average of
         :param string $alias: Alias for the resulting value name
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds a ``SELECT COUNT(field)`` clause to a query.
 
     .. php:method:: distinct([$val = true])
 
         :param bool $val: Desired value of the "distinct" flag
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Sets a flag which tells the query builder to add
         a ``DISTINCT`` clause to the ``SELECT`` portion of the query.
@@ -1359,9 +1359,9 @@ Class Reference
     .. php:method:: from($from[, $overwrite = false])
 
         :param mixed $from: Table name(s); string or array
-        :param bool	$overwrite: Should we remove the first table existing?
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :param bool    $overwrite: Should we remove the first table existing?
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Specifies the ``FROM`` clause of a query.
 
@@ -1370,9 +1370,9 @@ Class Reference
         :param string $table: Table name to join
         :param string $cond: The JOIN ON condition
         :param string $type: The JOIN type
-        :param bool	$escape: Whether to escape values and identifiers
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :param bool    $escape: Whether to escape values and identifiers
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds a ``JOIN`` clause to a query.
 
@@ -1380,9 +1380,9 @@ Class Reference
 
         :param mixed $key: Name of field to compare, or associative array
         :param mixed $value: If a single key, compared to this value
-        :param bool	$escape: Whether to escape values and identifiers
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :param bool    $escape: Whether to escape values and identifiers
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Generates the ``WHERE`` portion of the query. Separates multiple calls with ``AND``.
 
@@ -1391,8 +1391,8 @@ Class Reference
         :param mixed $key: Name of field to compare, or associative array
         :param mixed $value: If a single key, compared to this value
         :param bool $escape: Whether to escape values and identifiers
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Generates the ``WHERE`` portion of the query. Separates multiple calls with ``OR``.
 
@@ -1401,8 +1401,8 @@ Class Reference
         :param string $key: The field to search
         :param array|Closure $values: Array of target values, or anonymous function for subquery
         :param bool $escape: Whether to escape values and identifiers
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Generates a ``WHERE`` field ``IN('item', 'item')`` SQL query, joined with ``OR`` if appropriate.
 
@@ -1411,8 +1411,8 @@ Class Reference
         :param string $key: The field to search
         :param array|Closure $values: Array of target values, or anonymous function for subquery
         :param bool $escape: Whether to escape values and identifiers
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Generates a ``WHERE`` field ``NOT IN('item', 'item')`` SQL query, joined with ``OR`` if appropriate.
 
@@ -1421,8 +1421,8 @@ Class Reference
         :param string $key: Name of field to examine
         :param array|Closure $values: Array of target values, or anonymous function for subquery
         :param bool $escape: Whether to escape values and identifiers
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Generates a ``WHERE`` field ``IN('item', 'item')`` SQL query, joined with ``AND`` if appropriate.
 
@@ -1430,44 +1430,44 @@ Class Reference
 
         :param string $key: Name of field to examine
         :param array|Closure $values: Array of target values, or anonymous function for subquery
-        :param bool	$escape: Whether to escape values and identifiers
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :param bool    $escape: Whether to escape values and identifiers
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Generates a ``WHERE`` field ``NOT IN('item', 'item')`` SQL query, joined with ``AND`` if appropriate.
 
     .. php:method:: groupStart()
 
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Starts a group expression, using ``AND`` for the conditions inside it.
 
     .. php:method:: orGroupStart()
 
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Starts a group expression, using ``OR`` for the conditions inside it.
 
     .. php:method:: notGroupStart()
 
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Starts a group expression, using ``AND NOT`` for the conditions inside it.
 
     .. php:method:: orNotGroupStart()
 
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Starts a group expression, using ``OR NOT`` for the conditions inside it.
 
     .. php:method:: groupEnd()
 
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Ends a group expression.
 
@@ -1476,10 +1476,10 @@ Class Reference
         :param string $field: Field name
         :param string $match: Text portion to match
         :param string $side: Which side of the expression to put the '%' wildcard on
-        :param bool	$escape: Whether to escape values and identifiers
+        :param bool    $escape: Whether to escape values and identifiers
         :param bool $insensitiveSearch: Whether to force a case-insensitive search
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds a ``LIKE`` clause to a query, separating multiple calls with ``AND``.
 
@@ -1488,10 +1488,10 @@ Class Reference
         :param string $field: Field name
         :param string $match: Text portion to match
         :param string $side: Which side of the expression to put the '%' wildcard on
-        :param bool	$escape: Whether to escape values and identifiers
+        :param bool    $escape: Whether to escape values and identifiers
         :param bool $insensitiveSearch: Whether to force a case-insensitive search
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds a ``LIKE`` clause to a query, separating multiple class with ``OR``.
 
@@ -1500,10 +1500,10 @@ Class Reference
         :param string $field: Field name
         :param string $match: Text portion to match
         :param string $side: Which side of the expression to put the '%' wildcard on
-        :param bool	$escape: Whether to escape values and identifiers
+        :param bool    $escape: Whether to escape values and identifiers
         :param bool $insensitiveSearch: Whether to force a case-insensitive search
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds a ``NOT LIKE`` clause to a query, separating multiple calls with ``AND``.
 
@@ -1512,10 +1512,10 @@ Class Reference
         :param string $field: Field name
         :param string $match: Text portion to match
         :param string $side: Which side of the expression to put the '%' wildcard on
-        :param bool	$escape: Whether to escape values and identifiers
+        :param bool    $escape: Whether to escape values and identifiers
         :param bool $insensitiveSearch: Whether to force a case-insensitive search
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds a ``NOT LIKE`` clause to a query, separating multiple calls with ``OR``.
 
@@ -1524,8 +1524,8 @@ Class Reference
         :param mixed $key: Identifier (string) or associative array of field/value pairs
         :param string $value: Value sought if $key is an identifier
         :param string $escape: Whether to escape values and identifiers
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds a ``HAVING`` clause to a query, separating multiple calls with ``AND``.
 
@@ -1534,8 +1534,8 @@ Class Reference
         :param mixed $key: Identifier (string) or associative array of field/value pairs
         :param string $value: Value sought if $key is an identifier
         :param string $escape: Whether to escape values and identifiers
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds a ``HAVING`` clause to a query, separating multiple calls with ``OR``.
 
@@ -1543,9 +1543,9 @@ Class Reference
 
         :param string $key: The field to search
         :param array|Closure $values: Array of target values, or anonymous function for subquery
-        :param bool	$escape: Whether to escape values and identifiers
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :param bool    $escape: Whether to escape values and identifiers
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Generates a ``HAVING`` field IN('item', 'item') SQL query, joined with ``OR`` if appropriate.
 
@@ -1553,9 +1553,9 @@ Class Reference
 
         :param string $key: The field to search
         :param array|Closure $values: Array of target values, or anonymous function for subquery
-        :param bool	$escape: Whether to escape values and identifiers
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :param bool    $escape: Whether to escape values and identifiers
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Generates a ``HAVING`` field ``NOT IN('item', 'item')`` SQL query, joined with ``OR`` if appropriate.
 
@@ -1564,8 +1564,8 @@ Class Reference
         :param string $key: Name of field to examine
         :param array|Closure $values: Array of target values, or anonymous function for subquery
         :param bool $escape: Whether to escape values and identifiers
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Generates a ``HAVING`` field ``IN('item', 'item')`` SQL query, joined with ``AND`` if appropriate.
 
@@ -1575,8 +1575,8 @@ Class Reference
         :param array|Closure $values: Array of target values, or anonymous function for subquery
         :param bool $escape: Whether to escape values and identifiers
         :param bool $insensitiveSearch: Whether to force a case-insensitive search
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Generates a ``HAVING`` field ``NOT IN('item', 'item')`` SQL query, joined with ``AND`` if appropriate.
 
@@ -1585,10 +1585,10 @@ Class Reference
         :param string $field: Field name
         :param string $match: Text portion to match
         :param string $side: Which side of the expression to put the '%' wildcard on
-        :param bool	$escape: Whether to escape values and identifiers
+        :param bool    $escape: Whether to escape values and identifiers
         :param bool $insensitiveSearch: Whether to force a case-insensitive search
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds a ``LIKE`` clause to a ``HAVING`` part of the query, separating multiple calls with ``AND``.
 
@@ -1597,10 +1597,10 @@ Class Reference
         :param string $field: Field name
         :param string $match: Text portion to match
         :param string $side: Which side of the expression to put the '%' wildcard on
-        :param bool	$escape: Whether to escape values and identifiers
+        :param bool    $escape: Whether to escape values and identifiers
         :param bool $insensitiveSearch: Whether to force a case-insensitive search
         :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :rtype:    ``BaseBuilder``
 
         Adds a ``LIKE`` clause to a ``HAVING`` part of the query, separating multiple class with ``OR``.
 
@@ -1609,10 +1609,10 @@ Class Reference
         :param string $field: Field name
         :param string $match: Text portion to match
         :param string $side: Which side of the expression to put the '%' wildcard on
-        :param bool	$escape: Whether to escape values and identifiers
+        :param bool    $escape: Whether to escape values and identifiers
         :param bool $insensitiveSearch: Whether to force a case-insensitive search
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds a ``NOT LIKE`` clause to a ``HAVING`` part of the query, separating multiple calls with ``AND``.
 
@@ -1621,52 +1621,52 @@ Class Reference
         :param string $field: Field name
         :param string $match: Text portion to match
         :param string $side: Which side of the expression to put the '%' wildcard on
-        :param bool	$escape: Whether to escape values and identifiers
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :param bool    $escape: Whether to escape values and identifiers
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds a ``NOT LIKE`` clause to a ``HAVING`` part of the query, separating multiple calls with ``OR``.
 
     .. php:method:: havingGroupStart()
 
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Starts a group expression for ``HAVING`` clause, using ``AND`` for the conditions inside it.
 
     .. php:method:: orHavingGroupStart()
 
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Starts a group expression for ``HAVING`` clause, using ``OR`` for the conditions inside it.
 
     .. php:method:: notHavingGroupStart()
 
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Starts a group expression for ``HAVING`` clause, using ``AND NOT`` for the conditions inside it.
 
     .. php:method:: orNotHavingGroupStart()
 
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Starts a group expression for ``HAVING`` clause, using ``OR NOT`` for the conditions inside it.
 
     .. php:method:: havingGroupEnd()
 
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Ends a group expression for ``HAVING`` clause.
 
     .. php:method:: groupBy($by[, $escape = null])
 
         :param mixed $by: Field(s) to group by; string or array
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds a ``GROUP BY`` clause to a query.
 
@@ -1674,9 +1674,9 @@ Class Reference
 
         :param string $orderby: Field to order by
         :param string $direction: The order requested - ASC, DESC or random
-        :param bool	$escape: Whether to escape values and identifiers
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :param bool    $escape: Whether to escape values and identifiers
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds an ``ORDER BY`` clause to a query.
 
@@ -1684,16 +1684,16 @@ Class Reference
 
         :param int $value: Number of rows to limit the results to
         :param int $offset: Number of rows to skip
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds ``LIMIT`` and ``OFFSET`` clauses to a query.
 
     .. php:method:: offset($offset)
 
         :param int $offset: Number of rows to skip
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds an ``OFFSET`` clause to a query.
 
@@ -1701,9 +1701,9 @@ Class Reference
 
         :param mixed $key: Field name, or an array of field/value pairs
         :param mixed $value: Field value, if $key is a single field
-        :param bool	$escape: Whether to escape values and identifiers
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :param bool    $escape: Whether to escape values and identifiers
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds field/value pairs to be passed later to ``insert()``, ``update()`` or ``replace()``.
 
@@ -1711,8 +1711,8 @@ Class Reference
 
         :param array $set: An associative array of field/value pairs
         :param bool $escape: Whether to escape values and identifiers
-        :returns: ``true`` on success, ``false`` on failure
-        :rtype:	bool
+        :returns:   ``true`` on success, ``false`` on failure
+        :rtype:     bool
 
         Compiles and executes an ``INSERT`` statement.
 
@@ -1722,7 +1722,7 @@ Class Reference
         :param bool $escape: Whether to escape values and identifiers
         :param int $batch_size: Count of rows to insert at once
         :returns: Number of rows inserted or ``false`` on failure
-        :rtype:	int|false
+        :rtype:    int|false
 
         Compiles and executes batch ``INSERT`` statements.
 
@@ -1735,8 +1735,8 @@ Class Reference
         :param mixed $key: Field name or an array of field/value pairs
         :param string $value: Field value, if $key is a single field
         :param bool $escape: Whether to escape values and identifiers
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds field/value pairs to be inserted in a table later via ``insertBatch()``.
 
@@ -1745,8 +1745,8 @@ Class Reference
         :param array $set: An associative array of field/value pairs
         :param string $where: The WHERE clause
         :param int $limit: The LIMIT clause
-        :returns: ``true`` on success, ``false`` on failure
-        :rtype:	bool
+        :returns:   ``true`` on success, ``false`` on failure
+        :rtype:     bool
 
         Compiles and executes an ``UPDATE`` statement.
 
@@ -1755,8 +1755,8 @@ Class Reference
         :param array $set: Field name, or an associative array of field/value pairs
         :param string $value: Field value, if $set is a single field
         :param int $batch_size: Count of conditions to group in a single query
-        :returns: Number of rows updated or ``false`` on failure
-        :rtype:	int|false
+        :returns:   Number of rows updated or ``false`` on failure
+        :rtype:     int|false
 
         Compiles and executes batch ``UPDATE`` statements.
 
@@ -1768,9 +1768,9 @@ Class Reference
 
         :param mixed $key: Field name or an array of field/value pairs
         :param string $value: Field value, if $key is a single field
-        :param bool	$escape: Whether to escape values and identifiers
-        :returns: ``BaseBuilder`` instance (method chaining)
-        :rtype:	``BaseBuilder``
+        :param bool    $escape: Whether to escape values and identifiers
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
 
         Adds field/value pairs to be updated in a table later via ``updateBatch()``.
 
@@ -1778,7 +1778,7 @@ Class Reference
 
         :param array $set: An associative array of field/value pairs
         :returns: ``true`` on success, ``false`` on failure
-        :rtype:	bool
+        :rtype:    bool
 
         Compiles and executes a ``REPLACE`` statement.
 
@@ -1787,8 +1787,8 @@ Class Reference
         :param string $where: The WHERE clause
         :param int $limit: The LIMIT clause
         :param bool $reset_data: true to reset the query "write" clause
-        :returns: ``BaseBuilder`` instance (method chaining) or ``false`` on failure
-        :rtype:	``BaseBuilder|false``
+        :returns:   ``BaseBuilder`` instance (method chaining) or ``false`` on failure
+        :rtype:     ``BaseBuilder|false``
 
         Compiles and executes a ``DELETE`` query.
 
@@ -1812,8 +1812,8 @@ Class Reference
 
     .. php:method:: truncate()
 
-        :returns: ``true`` on success, ``false`` on failure, string on test mode
-        :rtype:	bool|string
+        :returns:   ``true`` on success, ``false`` on failure, string on test mode
+        :rtype:     bool|string
 
         Executes a ``TRUNCATE`` statement on a table.
 
@@ -1823,7 +1823,7 @@ Class Reference
     .. php:method:: emptyTable()
 
         :returns: ``true`` on success, ``false`` on failure
-        :rtype:	bool
+        :rtype:    bool
 
         Deletes all records from a table via a ``DELETE`` statement.
 
@@ -1831,7 +1831,7 @@ Class Reference
 
         :param bool $reset: Whether to reset the current QB values or not
         :returns: The compiled SQL statement as a string
-        :rtype:	string
+        :rtype:    string
 
         Compiles a ``SELECT`` statement and returns it as a string.
 
@@ -1839,7 +1839,7 @@ Class Reference
 
         :param bool $reset: Whether to reset the current QB values or not
         :returns: The compiled SQL statement as a string
-        :rtype:	string
+        :rtype:     string
 
         Compiles an ``INSERT`` statement and returns it as a string.
 
@@ -1847,7 +1847,7 @@ Class Reference
 
         :param bool $reset: Whether to reset the current QB values or not
         :returns: The compiled SQL statement as a string
-        :rtype:	string
+        :rtype:    string
 
         Compiles an ``UPDATE`` statement and returns it as a string.
 
@@ -1855,6 +1855,6 @@ Class Reference
 
         :param bool $reset: Whether to reset the current QB values or not
         :returns: The compiled SQL statement as a string
-        :rtype:	string
+        :rtype:    string
 
         Compiles a ``DELETE`` statement and returns it as a string.
diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst
index f54b1166a05e..685c7e7041ea 100644
--- a/user_guide_src/source/helpers/form_helper.rst
+++ b/user_guide_src/source/helpers/form_helper.rst
@@ -48,11 +48,11 @@ The following functions are available:
 
 .. php:function:: form_open([$action = ''[, $attributes = ''[, $hidden = []]]])
 
-    :param	string	$action: Form action/target URI string
-    :param	mixed	$attributes: HTML attributes, as an array or escaped string
-    :param	array	$hidden: An array of hidden fields' definitions
-    :returns:	An HTML form opening tag
-    :rtype:	string
+    :param    string    $action: Form action/target URI string
+    :param    mixed    $attributes: HTML attributes, as an array or escaped string
+    :param    array    $hidden: An array of hidden fields' definitions
+    :returns:    An HTML form opening tag
+    :rtype:    string
 
     Creates an opening form tag with a site URL **built from your config preferences**.
     It will optionally let you add form attributes and hidden input fields, and
@@ -123,11 +123,11 @@ The following functions are available:
 
 .. php:function:: form_open_multipart([$action = ''[, $attributes = ''[, $hidden = []]]])
 
-    :param	string	$action: Form action/target URI string
-    :param	mixed	$attributes: HTML attributes, as an array or escaped string
-    :param	array	$hidden: An array of hidden fields' definitions
-    :returns:	An HTML multipart form opening tag
-    :rtype:	string
+    :param    string    $action: Form action/target URI string
+    :param    mixed    $attributes: HTML attributes, as an array or escaped string
+    :param    array    $hidden: An array of hidden fields' definitions
+    :returns:    An HTML multipart form opening tag
+    :rtype:    string
 
     This function is identical to :php:func:`form_open()` above,
     except that it adds a *multipart* attribute, which is necessary if you
@@ -135,10 +135,10 @@ The following functions are available:
 
 .. php:function:: form_hidden($name[, $value = ''])
 
-    :param	string	$name: Field name
-    :param	string	$value: Field value
-    :returns:	An HTML hidden input field tag
-    :rtype:	string
+    :param    string    $name: Field name
+    :param    string    $value: Field value
+    :returns:    An HTML hidden input field tag
+    :rtype:    string
 
     Lets you generate hidden input fields. You can either submit a
     name/value string to create one field::
@@ -202,12 +202,12 @@ The following functions are available:
 
 .. php:function:: form_input([$data = ''[, $value = ''[, $extra = ''[, $type = 'text']]]])
 
-    :param	array	$data: Field attributes data
-    :param	string	$value: Field value
-    :param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
+    :param    array    $data: Field attributes data
+    :param    string    $value: Field value
+    :param    mixed    $extra: Extra attributes to be added to the tag either as an array or a literal string
     :param  string  $type: The type of input field. i.e., 'text', 'email', 'number', etc.
-    :returns:	An HTML text input field tag
-    :rtype:	string
+    :returns:    An HTML text input field tag
+    :rtype:    string
 
     Lets you generate a standard text input field. You can minimally pass
     the field name and value in the first and second parameter::
@@ -257,22 +257,22 @@ The following functions are available:
 
 .. php:function:: form_password([$data = ''[, $value = ''[, $extra = '']]])
 
-    :param	array	$data: Field attributes data
-    :param	string	$value: Field value
-    :param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
-    :returns:	An HTML password input field tag
-    :rtype:	string
+    :param    array    $data: Field attributes data
+    :param    string    $value: Field value
+    :param    mixed    $extra: Extra attributes to be added to the tag either as an array or a literal string
+    :returns:    An HTML password input field tag
+    :rtype:    string
 
     This function is identical in all respects to the :php:func:`form_input()`
     function above except that it uses the "password" input type.
 
 .. php:function:: form_upload([$data = ''[, $value = ''[, $extra = '']]])
 
-    :param	array	$data: Field attributes data
-    :param	string	$value: Field value
-    :param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
-    :returns:	An HTML file upload input field tag
-    :rtype:	string
+    :param    array    $data: Field attributes data
+    :param    string    $value: Field value
+    :param    mixed    $extra: Extra attributes to be added to the tag either as an array or a literal string
+    :returns:    An HTML file upload input field tag
+    :rtype:    string
 
     This function is identical in all respects to the :php:func:`form_input()`
     function above except that it uses the "file" input type, allowing it to
@@ -280,11 +280,11 @@ The following functions are available:
 
 .. php:function:: form_textarea([$data = ''[, $value = ''[, $extra = '']]])
 
-    :param	array	$data: Field attributes data
-    :param	string	$value: Field value
-    :param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
-    :returns:	An HTML textarea tag
-    :rtype:	string
+    :param    array    $data: Field attributes data
+    :param    string    $value: Field value
+    :param    mixed    $extra: Extra attributes to be added to the tag either as an array or a literal string
+    :returns:    An HTML textarea tag
+    :rtype:    string
 
     This function is identical in all respects to the :php:func:`form_input()`
     function above except that it generates a "textarea" type.
@@ -294,12 +294,12 @@ The following functions are available:
 
 .. php:function:: form_dropdown([$name = ''[, $options = [][, $selected = [][, $extra = '']]]])
 
-    :param	string	$name: Field name
-    :param	array	$options: An associative array of options to be listed
-    :param	array	$selected: List of fields to mark with the *selected* attribute
-    :param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
-    :returns:	An HTML dropdown select field tag
-    :rtype:	string
+    :param    string    $name: Field name
+    :param    array    $options: An associative array of options to be listed
+    :param    array    $selected: List of fields to mark with the *selected* attribute
+    :param    mixed    $extra: Extra attributes to be added to the tag either as an array or a literal string
+    :returns:    An HTML dropdown select field tag
+    :rtype:    string
 
     Lets you create a standard drop-down field. The first parameter will
     contain the name of the field, the second parameter will contain an
@@ -365,12 +365,12 @@ The following functions are available:
 
 .. php:function:: form_multiselect([$name = ''[, $options = [][, $selected = [][, $extra = '']]]])
 
-    :param	string	$name: Field name
-    :param	array	$options: An associative array of options to be listed
-    :param	array	$selected: List of fields to mark with the *selected* attribute
-    :param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
-    :returns:	An HTML dropdown multiselect field tag
-    :rtype:	string
+    :param    string    $name: Field name
+    :param    array    $options: An associative array of options to be listed
+    :param    array    $selected: List of fields to mark with the *selected* attribute
+    :param    mixed    $extra: Extra attributes to be added to the tag either as an array or a literal string
+    :returns:    An HTML dropdown multiselect field tag
+    :rtype:    string
 
     Lets you create a standard multiselect field. The first parameter will
     contain the name of the field, the second parameter will contain an
@@ -383,10 +383,10 @@ The following functions are available:
 
 .. php:function:: form_fieldset([$legend_text = ''[, $attributes = []]])
 
-    :param	string	$legend_text: Text to put in the <legend> tag
-    :param	array	$attributes: Attributes to be set on the <fieldset> tag
-    :returns:	An HTML fieldset opening tag
-    :rtype:	string
+    :param    string    $legend_text: Text to put in the <legend> tag
+    :param    array    $attributes: Attributes to be set on the <fieldset> tag
+    :returns:    An HTML fieldset opening tag
+    :rtype:    string
 
     Lets you generate fieldset/legend fields.
 
@@ -409,8 +409,8 @@ The following functions are available:
     second parameter if you prefer to set additional attributes::
 
         $attributes = [
-            'id'	=> 'address_info',
-            'class'	=> 'address_info'
+            'id'    => 'address_info',
+            'class' => 'address_info'
         ];
 
         echo form_fieldset('Address Information', $attributes);
@@ -428,9 +428,9 @@ The following functions are available:
 
 .. php:function:: form_fieldset_close([$extra = ''])
 
-    :param	string	$extra: Anything to append after the closing tag, *as is*
-    :returns:	An HTML fieldset closing tag
-    :rtype:	string
+    :param    string    $extra: Anything to append after the closing tag, *as is*
+    :returns:    An HTML fieldset closing tag
+    :rtype:    string
 
     Produces a closing </fieldset> tag. The only advantage to using this
     function is it permits you to pass data to it which will be added below
@@ -444,12 +444,12 @@ The following functions are available:
 
 .. php:function:: form_checkbox([$data = ''[, $value = ''[, $checked = false[, $extra = '']]]])
 
-    :param	array	$data: Field attributes data
-    :param	string	$value: Field value
-    :param	bool	$checked: Whether to mark the checkbox as being *checked*
-    :param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
-    :returns:	An HTML checkbox input tag
-    :rtype:	string
+    :param    array    $data: Field attributes data
+    :param    string    $value: Field value
+    :param    bool    $checked: Whether to mark the checkbox as being *checked*
+    :param    mixed    $extra: Extra attributes to be added to the tag either as an array or a literal string
+    :returns:    An HTML checkbox input tag
+    :rtype:    string
 
     Lets you generate a checkbox field. Simple example::
 
@@ -487,23 +487,23 @@ The following functions are available:
 
 .. php:function:: form_radio([$data = ''[, $value = ''[, $checked = false[, $extra = '']]]])
 
-    :param	array	$data: Field attributes data
-    :param	string	$value: Field value
-    :param	bool	$checked: Whether to mark the radio button as being *checked*
-    :param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
-    :returns:	An HTML radio input tag
-    :rtype:	string
+    :param    array    $data: Field attributes data
+    :param    string    $value: Field value
+    :param    bool    $checked: Whether to mark the radio button as being *checked*
+    :param    mixed    $extra: Extra attributes to be added to the tag either as an array or a literal string
+    :returns:    An HTML radio input tag
+    :rtype:    string
 
     This function is identical in all respects to the :php:func:`form_checkbox()`
     function above except that it uses the "radio" input type.
 
 .. php:function:: form_label([$label_text = ''[, $id = ''[, $attributes = []]]])
 
-    :param	string	$label_text: Text to put in the <label> tag
-    :param	string	$id: ID of the form element that we're making a label for
-    :param	string	$attributes: HTML attributes
-    :returns:	An HTML field label tag
-    :rtype:	string
+    :param    string    $label_text: Text to put in the <label> tag
+    :param    string    $id: ID of the form element that we're making a label for
+    :param    string    $attributes: HTML attributes
+    :returns:    An HTML field label tag
+    :rtype:    string
 
     Lets you generate a <label>. Simple example::
 
@@ -525,11 +525,11 @@ The following functions are available:
 
 .. php:function:: form_submit([$data = ''[, $value = ''[, $extra = '']]])
 
-    :param	string	$data: Button name
-    :param	string	$value: Button value
-    :param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
-    :returns:	An HTML input submit tag
-    :rtype:	string
+    :param    string    $data: Button name
+    :param    string    $value: Button value
+    :param    mixed    $extra: Extra attributes to be added to the tag either as an array or a literal string
+    :returns:    An HTML input submit tag
+    :rtype:    string
 
     Lets you generate a standard submit button. Simple example::
 
@@ -542,22 +542,22 @@ The following functions are available:
 
 .. php:function:: form_reset([$data = ''[, $value = ''[, $extra = '']]])
 
-    :param	string	$data: Button name
-    :param	string	$value: Button value
-    :param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
-    :returns:	An HTML input reset button tag
-    :rtype:	string
+    :param    string    $data: Button name
+    :param    string    $value: Button value
+    :param    mixed    $extra: Extra attributes to be added to the tag either as an array or a literal string
+    :returns:    An HTML input reset button tag
+    :rtype:    string
 
     Lets you generate a standard reset button. Use is identical to
     :func:`form_submit()`.
 
 .. php:function:: form_button([$data = ''[, $content = ''[, $extra = '']]])
 
-    :param	string	$data: Button name
-    :param	string	$content: Button label
-    :param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
-    :returns:	An HTML button tag
-    :rtype:	string
+    :param    string    $data: Button name
+    :param    string    $content: Button label
+    :param    mixed    $extra: Extra attributes to be added to the tag either as an array or a literal string
+    :returns:    An HTML button tag
+    :rtype:    string
 
     Lets you generate a standard button element. You can minimally pass the
     button name and content in the first and second parameter::
@@ -587,9 +587,9 @@ The following functions are available:
 
 .. php:function:: form_close([$extra = ''])
 
-    :param	string	$extra: Anything to append after the closing tag, *as is*
-    :returns:	An HTML form closing tag
-    :rtype:	string
+    :param    string    $extra: Anything to append after the closing tag, *as is*
+    :returns:    An HTML form closing tag
+    :rtype:    string
 
     Produces a closing </form> tag. The only advantage to using this
     function is it permits you to pass data to it which will be added below
@@ -601,11 +601,11 @@ The following functions are available:
 
 .. php:function:: set_value($field[, $default = ''[, $html_escape = true]])
 
-    :param	string	$field: Field name
-    :param	string	$default: Default value
-    :param  bool	$html_escape: Whether to turn off HTML escaping of the value
-    :returns:	Field value
-    :rtype:	string
+    :param    string    $field: Field name
+    :param    string    $default: Default value
+    :param  bool    $html_escape: Whether to turn off HTML escaping of the value
+    :returns:    Field value
+    :rtype:    string
 
     Permits you to set the value of an input form or textarea. You must
     supply the field name via the first parameter of the function. The
@@ -622,11 +622,11 @@ The following functions are available:
 
 .. php:function:: set_select($field[, $value = ''[, $default = false]])
 
-    :param	string	$field: Field name
-    :param	string	$value: Value to check for
-    :param	string	$default: Whether the value is also a default one
-    :returns:	'selected' attribute or an empty string
-    :rtype:	string
+    :param    string    $field: Field name
+    :param    string    $value: Value to check for
+    :param    string    $default: Whether the value is also a default one
+    :returns:    'selected' attribute or an empty string
+    :rtype:    string
 
     If you use a <select> menu, this function permits you to display the
     menu item that was selected.
@@ -645,11 +645,11 @@ The following functions are available:
 
 .. php:function:: set_checkbox($field[, $value = ''[, $default = false]])
 
-    :param	string	$field: Field name
-    :param	string	$value: Value to check for
-    :param	string	$default: Whether the value is also a default one
-    :returns:	'checked' attribute or an empty string
-    :rtype:	string
+    :param    string    $field: Field name
+    :param    string    $value: Value to check for
+    :param    string    $default: Whether the value is also a default one
+    :returns:    'checked' attribute or an empty string
+    :rtype:    string
 
     Permits you to display a checkbox in the state it was submitted.
 
@@ -664,11 +664,11 @@ The following functions are available:
 
 .. php:function:: set_radio($field[, $value = ''[, $default = false]])
 
-    :param	string	$field: Field name
-    :param	string	$value: Value to check for
-    :param	string	$default: Whether the value is also a default one
-    :returns:	'checked' attribute or an empty string
-    :rtype:	string
+    :param    string    $field: Field name
+    :param    string    $value: Value to check for
+    :param    string    $default: Whether the value is also a default one
+    :returns:    'checked' attribute or an empty string
+    :rtype:    string
 
     Permits you to display radio buttons in the state they were submitted.
     This function is identical to the :php:func:`set_checkbox()` function above.

From 1d0c6916a5dc4dab34d25a5d406c41b308e225f9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 22 Sep 2021 16:46:53 +0900
Subject: [PATCH 0289/2325] docs: describe in detail how to add a service

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

diff --git a/user_guide_src/source/extending/core_classes.rst b/user_guide_src/source/extending/core_classes.rst
index 2e856f1eeaed..a51c9e825b34 100644
--- a/user_guide_src/source/extending/core_classes.rst
+++ b/user_guide_src/source/extending/core_classes.rst
@@ -60,7 +60,7 @@ the core system class, you would create your class like this::
         // ...
     }
 
-Then  you would modify the ``routes`` service to load your class instead::
+Then you would add the ``routes`` service in **app/Config/Services.php** to load your class instead::
 
     public static function routes(bool $getShared = true)
     {

From fd824042df6be1375d6ea8ae5919a3d61c109b4b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 22 Sep 2021 16:47:55 +0900
Subject: [PATCH 0290/2325] docs: update debugging

---
 user_guide_src/source/testing/debugging.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/testing/debugging.rst b/user_guide_src/source/testing/debugging.rst
index 6149ceac9a54..4f6ffdce9e3f 100644
--- a/user_guide_src/source/testing/debugging.rst
+++ b/user_guide_src/source/testing/debugging.rst
@@ -60,9 +60,10 @@ Enabling the Toolbar
 ====================
 
 The toolbar is enabled by default in any environment *except* production. It will be shown whenever the
-constant CI_DEBUG is defined and it's value is positive. This is defined in the boot files (i.e.
-app/Config/Boot/development.php) and can be modified there to determine what environments it shows
-itself in.
+constant CI_DEBUG is defined and its value is truthy. This is defined in the boot files (e.g.
+**app/Config/Boot/development.php**) and can be modified there to determine what environment to show.
+
+.. note:: The Debug Toolbar is not displayed when your ``baseURL`` setting (in **app/Config/App.php** or ``app.baseURL`` in **.env**) does not match your actual URL.
 
 The toolbar itself is displayed as an :doc:`After Filter </incoming/filters>`. You can stop it from ever
 running by removing it from the ``$globals`` property of **app/Config/Filters.php**.

From 526bbc4bbac7c6882591eab374c5d8e7ae98c419 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 23 Sep 2021 10:40:59 +0900
Subject: [PATCH 0291/2325] fix: database query binding when sql has two colons

fixes #5114
---
 system/Database/Query.php               |  3 ++-
 tests/system/Database/BaseQueryTest.php | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/system/Database/Query.php b/system/Database/Query.php
index 7f0873fdc40f..9085d02a3884 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -275,7 +275,8 @@ protected function compileBinds()
     {
         $sql = $this->finalQueryString;
 
-        $hasNamedBinds = preg_match('/:((?!=).+):/', $sql) === 1;
+        $hasNamedBinds = strpos($sql, '?') === false
+            && preg_match('/:((?!=).+):/', $sql) === 1;
 
         if (empty($this->binds)
             || empty($this->bindMarker)
diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php
index f53beadcd8e9..c9f905bc136d 100644
--- a/tests/system/Database/BaseQueryTest.php
+++ b/tests/system/Database/BaseQueryTest.php
@@ -238,6 +238,23 @@ public function testBindingAutoEscapesParameters()
         $this->assertSame($expected, $query->getQuery());
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5114
+     */
+    public function testBindingWithTwoColons()
+    {
+        $query = new Query($this->db);
+
+        $query->setQuery(
+            "SELECT mytable.id, DATE_FORMAT(mytable.created_at,'%d/%m/%Y %H:%i:%s') AS created_at_uk FROM mytable WHERE mytable.id = ?",
+            [1]
+        );
+
+        $expected = "SELECT mytable.id, DATE_FORMAT(mytable.created_at,'%d/%m/%Y %H:%i:%s') AS created_at_uk FROM mytable WHERE mytable.id = 1";
+
+        $this->assertSame($expected, $query->getQuery());
+    }
+
     public function testNamedBinds()
     {
         $query = new Query($this->db);

From 48af1d6c41cbd94d81d505446a8c0025a9cb679c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 23 Sep 2021 11:01:09 +0900
Subject: [PATCH 0292/2325] refactor: intorduce explaining variable

---
 system/Database/Query.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/Database/Query.php b/system/Database/Query.php
index 9085d02a3884..ab5ea871d111 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -275,12 +275,13 @@ protected function compileBinds()
     {
         $sql = $this->finalQueryString;
 
-        $hasNamedBinds = strpos($sql, '?') === false
+        $hasBinds      = strpos($sql, $this->bindMarker) !== false;
+        $hasNamedBinds = ! $hasBinds
             && preg_match('/:((?!=).+):/', $sql) === 1;
 
         if (empty($this->binds)
             || empty($this->bindMarker)
-            || (! $hasNamedBinds && strpos($sql, $this->bindMarker) === false)
+            || (! $hasNamedBinds && ! $hasBinds)
         ) {
             return;
         }

From 7aa0b94ed6ef1d103ba62ac90f41dbdd52e396b4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 23 Sep 2021 11:04:02 +0900
Subject: [PATCH 0293/2325] refactor: remove unneeded `()` in regex

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

diff --git a/system/Database/Query.php b/system/Database/Query.php
index ab5ea871d111..1b8443c25cf8 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -277,7 +277,7 @@ protected function compileBinds()
 
         $hasBinds      = strpos($sql, $this->bindMarker) !== false;
         $hasNamedBinds = ! $hasBinds
-            && preg_match('/:((?!=).+):/', $sql) === 1;
+            && preg_match('/:(?!=).+:/', $sql) === 1;
 
         if (empty($this->binds)
             || empty($this->bindMarker)

From 984373748ad2514812356c307d70acce6bac4aaf Mon Sep 17 00:00:00 2001
From: Najdanovic Ivan <najdanovicivan@gmail.com>
Date: Thu, 23 Sep 2021 14:26:45 +0200
Subject: [PATCH 0294/2325] IncomingRequest - Trim trailing slash

---
 system/Router/Router.php           |  2 +-
 tests/system/Router/RouterTest.php | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/system/Router/Router.php b/system/Router/Router.php
index a5ccef2c2e3b..ea59b2217b23 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -330,7 +330,7 @@ protected function checkRoutes(string $uri): bool
 
         $uri = $uri === '/'
             ? $uri
-            : ltrim($uri, '/ ');
+            : trim($uri, '/ ');
 
         // Loop through the route array looking for wildcards
         foreach ($routes as $key => $val) {
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index 82ea515f600b..3ef8a9e257d5 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -103,6 +103,16 @@ public function testURIMapsToController()
         $this->assertSame('index', $router->methodName());
     }
 
+    public function testURIWithTrailingSlashMapsToController()
+    {
+        $router = new Router($this->collection, $this->request);
+
+        $router->handle('users/');
+
+        $this->assertSame('\Users', $router->controllerName());
+        $this->assertSame('index', $router->methodName());
+    }
+
     public function testURIMapsToControllerAltMethod()
     {
         $router = new Router($this->collection, $this->request);
@@ -166,6 +176,16 @@ public function testURIMapsParamsWithMany()
         $this->assertSame(['123', 'abc', 'FOO'], $router->params());
     }
 
+    public function testURIWithTrailingSlashMapsParamsWithMany()
+    {
+        $router = new Router($this->collection, $this->request);
+
+        $router->handle('objects/123/sort/abc/FOO/');
+
+        $this->assertSame('objectsSortCreate', $router->methodName());
+        $this->assertSame(['123', 'abc', 'FOO'], $router->params());
+    }
+
     public function testClosures()
     {
         $router = new Router($this->collection, $this->request);

From 2277e6df816d98b7057f19b5c6f5bec2864d3315 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 24 Sep 2021 07:33:58 +0900
Subject: [PATCH 0295/2325] docs: update https://regex101.com/ link

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

diff --git a/system/Database/Query.php b/system/Database/Query.php
index 1b8443c25cf8..441ac0a82fc2 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -269,7 +269,7 @@ public function getOriginalQuery(): string
     /**
      * Escapes and inserts any binds into the finalQueryString object.
      *
-     * @see https://regex101.com/r/EUEhay/4
+     * @see https://regex101.com/r/EUEhay/5
      */
     protected function compileBinds()
     {

From f5b59de29063724cd771f0cc633a4ac708464d3e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 24 Sep 2021 12:03:36 +0900
Subject: [PATCH 0296/2325] docs: fix reference link

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

diff --git a/user_guide_src/source/installation/upgrade_models.rst b/user_guide_src/source/installation/upgrade_models.rst
index 15e5bb47c54d..6b4f78a2b856 100644
--- a/user_guide_src/source/installation/upgrade_models.rst
+++ b/user_guide_src/source/installation/upgrade_models.rst
@@ -33,7 +33,7 @@ Example: You have a version 3 model located in ``application/models/users/user_c
 The new Model in CI4 has a lot of built-in methods. For example, the ``find($id)`` method. With this you can find data where the primary key is equal to ``$id``.
 Inserting data is also easier than before. In CI4 there is an ``insert($data)`` method. You can optionally make use of all those built-in methods and migrate your code to the new methods.
 
-You can find more information to those methods `here </models/model.html>`_.
+You can find more information to those methods :doc:`here </models/model>`.
 
 Code Example
 ============

From 101629d00b75818a7321eba17dca3d7e263dab08 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 24 Sep 2021 12:05:22 +0900
Subject: [PATCH 0297/2325] docs: fix indentation of list

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

diff --git a/user_guide_src/source/installation/upgrade_sessions.rst b/user_guide_src/source/installation/upgrade_sessions.rst
index 84757dbfd665..3aa085a016ff 100644
--- a/user_guide_src/source/installation/upgrade_sessions.rst
+++ b/user_guide_src/source/installation/upgrade_sessions.rst
@@ -22,10 +22,10 @@ Upgrade Guide
 1. Wherever you use the Session Library replace ``$this->load->library('session');`` with ``$session = session();``.
 2. From that on you have to replace every line starting with ``$this->session`` with ``$session`` followed by the new method name.
 
-- To access session data use the syntax ``$session->item`` or ``$session->get('item')`` instead of the CI3 syntax ``$this->session->name``.
-- To set data use ``$session->set($array);`` instead of ``$this->session->set_userdata($array);``.
-- To remove data use ``unset($_SESSION['some_name']);`` or ``$session->remove('some_name');`` instead of ``$this->session->unset_userdata('some_name');``.
-- To mark session data as flasdata, which will only be available for the next request, use ``$session->markAsFlashdata('item');`` instead of ``$this->session->mark_as_flash('item');```
+    - To access session data use the syntax ``$session->item`` or ``$session->get('item')`` instead of the CI3 syntax ``$this->session->name``.
+    - To set data use ``$session->set($array);`` instead of ``$this->session->set_userdata($array);``.
+    - To remove data use ``unset($_SESSION['some_name']);`` or ``$session->remove('some_name');`` instead of ``$this->session->unset_userdata('some_name');``.
+    - To mark session data as flasdata, which will only be available for the next request, use ``$session->markAsFlashdata('item');`` instead of ``$this->session->mark_as_flash('item');```
 
 Code Example
 ============

From 55183fc10f51ffb713385f6391be579bb68c210f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 24 Sep 2021 12:07:08 +0900
Subject: [PATCH 0298/2325] chore: remove unintended dead code

fixes #5107
---
 admin/pre-commit | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/admin/pre-commit b/admin/pre-commit
index ffa9936ca9c9..582b8bd4f92d 100644
--- a/admin/pre-commit
+++ b/admin/pre-commit
@@ -3,15 +3,6 @@
 PROJECT=`php -r "echo dirname(dirname(dirname(realpath('$0'))));"`
 STAGED_FILES_CMD=`git diff --cached --name-only --diff-filter=ACMR HEAD | grep \\\\.php$`
 
-# Determine if a file list is passed
-if [ "$#" -eq 1 ]; then
-    oIFS=$IFS
-    IFS='
-    '
-    SFILES="$1"
-    IFS=$oIFS
-fi
-
 SFILES=${SFILES:-$STAGED_FILES_CMD}
 
 echo "Starting CodeIgniter precommit..."

From c29aaff528355da7b7d7378b8b7601f436962b15 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 24 Sep 2021 12:12:15 +0900
Subject: [PATCH 0299/2325] docs: add about CI3's Input and CI4's
 IncommingRequest, CI3's Output and CI4's Response

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

diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst
index dcf19217b277..bfc38a852778 100644
--- a/user_guide_src/source/installation/upgrade_4xx.rst
+++ b/user_guide_src/source/installation/upgrade_4xx.rst
@@ -127,6 +127,8 @@ Upgrading Libraries
   `Trackback <http://codeigniter.com/userguide3/libraries/trackback.html>`_,
   `XML-RPC /-Server <http://codeigniter.com/userguide3/libraries/xmlrpc.html>`_,
   and `Zip Encoding <http://codeigniter.com/userguide3/libraries/zip.html>`_.
+- CI3's `Input <http://codeigniter.com/userguide3/libraries/input.html>`_ corresponds to CI4's :doc:`IncomingRequest </incoming/incomingrequest>`.
+- CI3's `Output <http://codeigniter.com/userguide3/libraries/output.html>`_ corresponds to CI4's :doc:`Responses </outgoing/response>`.
 - All the other libraries, which exist in both CodeIgniter versions, can be upgraded with some adjustments.
   The most important and mostly used libraries received an Upgrade Guide, which will help you with simple
   steps and examples to adjust your code.

From c05f5a6dae2b08e9ebf82d5f7888dd8fcbff5813 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 24 Sep 2021 14:11:24 +0900
Subject: [PATCH 0300/2325] docs: replace tabs with spaces

---
 user_guide_src/source/database/results.rst    | 112 +++++++-------
 user_guide_src/source/dbmgmt/seeds.rst        | 110 +++++++-------
 user_guide_src/source/extending/events.rst    |  44 +++---
 .../source/helpers/filesystem_helper.rst      | 100 ++++++-------
 user_guide_src/source/libraries/uri.rst       | 138 +++++++++---------
 5 files changed, 252 insertions(+), 252 deletions(-)

diff --git a/user_guide_src/source/database/results.rst b/user_guide_src/source/database/results.rst
index 018c5184cc1b..809de018d3c3 100644
--- a/user_guide_src/source/database/results.rst
+++ b/user_guide_src/source/database/results.rst
@@ -176,8 +176,8 @@ be aware of the tradeoffs associated with it.
     $csv = $file->openFile('w');
 
     while ($row = $query->getUnbufferedRow('array'))
-    {	
-    	$csv->fputcsv($row);
+    {
+        $csv->fputcsv($row);
     }
 
     $db->resultMode = MYSQLI_STORE_RESULT; // return to default mode
@@ -364,9 +364,9 @@ Class Reference
 
     .. php:method:: getResult([$type = 'object'])
 
-        :param	string	$type: Type of requested results - array, object, or class name
-        :returns:	Array containing the fetched rows
-        :rtype:	array
+        :param    string    $type: Type of requested results - array, object, or class name
+        :returns:    Array containing the fetched rows
+        :rtype:    array
 
         A wrapper for the ``getResultArray()``, ``getResultObject()``
         and ``getCustomResultObject()`` methods.
@@ -375,8 +375,8 @@ Class Reference
 
     .. php:method:: getResultArray()
 
-        :returns:	Array containing the fetched rows
-        :rtype:	array
+        :returns:    Array containing the fetched rows
+        :rtype:    array
 
         Returns the query results as an array of rows, where each
         row is itself an associative array.
@@ -385,8 +385,8 @@ Class Reference
 
     .. php:method:: getResultObject()
 
-        :returns:	Array containing the fetched rows
-        :rtype:	array
+        :returns:    Array containing the fetched rows
+        :rtype:    array
 
         Returns the query results as an array of rows, where each
         row is an object of type ``stdClass``.
@@ -395,19 +395,19 @@ Class Reference
 
     .. php:method:: getCustomResultObject($class_name)
 
-        :param	string	$class_name: Class name for the resulting rows
-        :returns:	Array containing the fetched rows
-        :rtype:	array
+        :param    string    $class_name: Class name for the resulting rows
+        :returns:    Array containing the fetched rows
+        :rtype:    array
 
         Returns the query results as an array of rows, where each
         row is an instance of the specified class.
 
     .. php:method:: getRow([$n = 0[, $type = 'object']])
 
-        :param	int	$n: Index of the query results row to be returned
-        :param	string	$type: Type of the requested result - array, object, or class name
-        :returns:	The requested row or null if it doesn't exist
-        :rtype:	mixed
+        :param    int    $n: Index of the query results row to be returned
+        :param    string    $type: Type of the requested result - array, object, or class name
+        :returns:    The requested row or null if it doesn't exist
+        :rtype:    mixed
 
         A wrapper for the ``getRowArray()``, ``getRowObject()`` and
         ``getCustomRowObject()`` methods.
@@ -416,9 +416,9 @@ Class Reference
 
     .. php:method:: getUnbufferedRow([$type = 'object'])
 
-        :param	string	$type: Type of the requested result - array, object, or class name
-        :returns:	Next row from the result set or null if it doesn't exist
-        :rtype:	mixed
+        :param    string    $type: Type of the requested result - array, object, or class name
+        :returns:    Next row from the result set or null if it doesn't exist
+        :rtype:    mixed
 
         Fetches the next result row and returns it in the
         requested form.
@@ -427,9 +427,9 @@ Class Reference
 
     .. php:method:: getRowArray([$n = 0])
 
-        :param	int	$n: Index of the query results row to be returned
-        :returns:	The requested row or null if it doesn't exist
-        :rtype:	array
+        :param    int    $n: Index of the query results row to be returned
+        :returns:    The requested row or null if it doesn't exist
+        :rtype:    array
 
         Returns the requested result row as an associative array.
 
@@ -437,9 +437,9 @@ Class Reference
 
     .. php:method:: getRowObject([$n = 0])
 
-        :param	int	$n: Index of the query results row to be returned
-                :returns:	The requested row or null if it doesn't exist
-        :rtype:	stdClass
+        :param    int    $n: Index of the query results row to be returned
+                :returns:    The requested row or null if it doesn't exist
+        :rtype:    stdClass
 
         Returns the requested result row as an object of type
         ``stdClass``.
@@ -448,19 +448,19 @@ Class Reference
 
     .. php:method:: getCustomRowObject($n, $type)
 
-        :param	int	$n: Index of the results row to return
-        :param	string	$class_name: Class name for the resulting row
-        :returns:	The requested row or null if it doesn't exist
-        :rtype:	$type
+        :param    int    $n: Index of the results row to return
+        :param    string    $class_name: Class name for the resulting row
+        :returns:    The requested row or null if it doesn't exist
+        :rtype:    $type
 
         Returns the requested result row as an instance of the
         requested class.
 
     .. php:method:: dataSeek([$n = 0])
 
-        :param	int	$n: Index of the results row to be returned next
-        :returns:	true on success, false on failure
-        :rtype:	bool
+        :param    int    $n: Index of the results row to be returned next
+        :returns:    true on success, false on failure
+        :rtype:    bool
 
         Moves the internal results row pointer to the desired offset.
 
@@ -468,48 +468,48 @@ Class Reference
 
     .. php:method:: setRow($key[, $value = null])
 
-        :param	mixed	$key: Column name or array of key/value pairs
-        :param	mixed	$value: Value to assign to the column, $key is a single field name
-        :rtype:	void
+        :param    mixed    $key: Column name or array of key/value pairs
+        :param    mixed    $value: Value to assign to the column, $key is a single field name
+        :rtype:    void
 
         Assigns a value to a particular column.
 
     .. php:method:: getNextRow([$type = 'object'])
 
-        :param	string	$type: Type of the requested result - array, object, or class name
-        :returns:	Next row of result set, or null if it doesn't exist
-        :rtype:	mixed
+        :param    string    $type: Type of the requested result - array, object, or class name
+        :returns:    Next row of result set, or null if it doesn't exist
+        :rtype:    mixed
 
         Returns the next row from the result set.
 
     .. php:method:: getPreviousRow([$type = 'object'])
 
-        :param	string	$type: Type of the requested result - array, object, or class name
-        :returns:	Previous row of result set, or null if it doesn't exist
-        :rtype:	mixed
+        :param    string    $type: Type of the requested result - array, object, or class name
+        :returns:    Previous row of result set, or null if it doesn't exist
+        :rtype:    mixed
 
         Returns the previous row from the result set.
 
     .. php:method:: getFirstRow([$type = 'object'])
 
-        :param	string	$type: Type of the requested result - array, object, or class name
-        :returns:	First row of result set, or null if it doesn't exist
-        :rtype:	mixed
+        :param    string    $type: Type of the requested result - array, object, or class name
+        :returns:    First row of result set, or null if it doesn't exist
+        :rtype:    mixed
 
         Returns the first row from the result set.
 
     .. php:method:: getLastRow([$type = 'object'])
 
-        :param	string	$type: Type of the requested result - array, object, or class name
-        :returns:	Last row of result set, or null if it doesn't exist
-        :rtype:	mixed
+        :param    string    $type: Type of the requested result - array, object, or class name
+        :returns:    Last row of result set, or null if it doesn't exist
+        :rtype:    mixed
 
         Returns the last row from the result set.
 
     .. php:method:: getFieldCount()
 
-        :returns:	Number of fields in the result set
-        :rtype:	int
+        :returns:    Number of fields in the result set
+        :rtype:    int
 
         Returns the number of fields in the result set.
 
@@ -517,30 +517,30 @@ Class Reference
 
     .. php:method:: getFieldNames()
 
-        :returns:	Array of column names
-        :rtype:	array
+        :returns:    Array of column names
+        :rtype:    array
 
         Returns an array containing the field names in the
         result set.
 
     .. php:method:: getFieldData()
 
-        :returns:	Array containing field meta-data
-        :rtype:	array
+        :returns:    Array containing field meta-data
+        :rtype:    array
 
         Generates an array of ``stdClass`` objects containing
         field meta-data.
 
     .. php:method:: getNumRows()
 
-        :returns:	Number of rows in result set
-        :rtype:	int
+        :returns:    Number of rows in result set
+        :rtype:    int
 
         Returns number of rows returned by the query
 
     .. php:method:: freeResult()
 
-        :rtype:	void
+        :rtype:    void
 
         Frees a result set.
 
diff --git a/user_guide_src/source/dbmgmt/seeds.rst b/user_guide_src/source/dbmgmt/seeds.rst
index f30bc807ddbb..95afc23104b7 100644
--- a/user_guide_src/source/dbmgmt/seeds.rst
+++ b/user_guide_src/source/dbmgmt/seeds.rst
@@ -13,28 +13,28 @@ connection and the forge through ``$this->db`` and ``$this->forge``, respectivel
 stored within the **app/Database/Seeds** directory. The name of the file must match the name of the class.
 ::
 
-	<?php
+    <?php
 
-	namespace App\Database\Seeds;
+    namespace App\Database\Seeds;
 
-	use CodeIgniter\Database\Seeder;
+    use CodeIgniter\Database\Seeder;
 
-	class SimpleSeeder extends Seeder
-	{
-		public function run()
-		{
-			$data = [
-				'username' => 'darth',
-				'email'    => 'darth@theempire.com'
-			];
+    class SimpleSeeder extends Seeder
+    {
+        public function run()
+        {
+            $data = [
+                'username' => 'darth',
+                'email'    => 'darth@theempire.com'
+            ];
 
-			// Simple Queries
-			$this->db->query("INSERT INTO users (username, email) VALUES(:username:, :email:)", $data);
+            // Simple Queries
+            $this->db->query("INSERT INTO users (username, email) VALUES(:username:, :email:)", $data);
 
-			// Using Query Builder
-			$this->db->table('users')->insert($data);
-		}
-	}
+            // Using Query Builder
+            $this->db->table('users')->insert($data);
+        }
+    }
 
 Nesting Seeders
 ===============
@@ -42,30 +42,30 @@ Nesting Seeders
 Seeders can call other seeders, with the **call()** method. This allows you to easily organize a central seeder,
 but organize the tasks into separate seeder files::
 
-	<?php
+    <?php
 
-	namespace App\Database\Seeds;
+    namespace App\Database\Seeds;
 
-	use CodeIgniter\Database\Seeder;
+    use CodeIgniter\Database\Seeder;
 
-	class TestSeeder extends Seeder
-	{
-		public function run()
-		{
-			$this->call('UserSeeder');
-			$this->call('CountrySeeder');
-			$this->call('JobSeeder');
-		}
-	}
+    class TestSeeder extends Seeder
+    {
+        public function run()
+        {
+            $this->call('UserSeeder');
+            $this->call('CountrySeeder');
+            $this->call('JobSeeder');
+        }
+    }
 
 You can also use a fully-qualified class name in the **call()** method, allowing you to keep your seeders
 anywhere the autoloader can find them. This is great for more modular code bases::
 
-	public function run()
-	{
-		$this->call('UserSeeder');
-		$this->call('My\Database\Seeds\CountrySeeder');
-	}
+    public function run()
+    {
+        $this->call('UserSeeder');
+        $this->call('My\Database\Seeds\CountrySeeder');
+    }
 
 Using Faker
 ===========
@@ -75,7 +75,7 @@ the `Faker library <https://github.com/fakerphp/faker>`_.
 
 To install Faker into your project::
 
-	> composer require --dev fakerphp/faker
+    > composer require --dev fakerphp/faker
 
 After installation, an instance of ``Faker\Generator`` is available in the main ``Seeder``
 class and is accessible by all child seeders. You must use the static method ``faker()``
@@ -83,32 +83,32 @@ to access the instance.
 
 ::
 
-	<?php
+    <?php
 
-	namespace App\Database\Seeds;
+    namespace App\Database\Seeds;
 
-	use CodeIgniter\Database\Seeder;
+    use CodeIgniter\Database\Seeder;
 
-	class UserSeeder extends Seeder
-	{
-		public function run()
-		{
-			$model = model('UserModel');
+    class UserSeeder extends Seeder
+    {
+        public function run()
+        {
+            $model = model('UserModel');
 
-			$model->insert([
-				'email'      => static::faker()->email,
-				'ip_address' => static::faker()->ipv4,
-			]);
-		}
-	}
+            $model->insert([
+                'email'      => static::faker()->email,
+                'ip_address' => static::faker()->ipv4,
+            ]);
+        }
+    }
 
 Using Seeders
 =============
 
 You can grab a copy of the main seeder through the database config class::
 
-	$seeder = \Config\Database::seeder();
-	$seeder->call('TestSeeder');
+    $seeder = \Config\Database::seeder();
+    $seeder->call('TestSeeder');
 
 Command Line Seeding
 --------------------
@@ -116,7 +116,7 @@ Command Line Seeding
 You can also seed data from the command line, as part of the Migrations CLI tools, if you don't want to create
 a dedicated controller::
 
-	> php spark db:seed TestSeeder
+    > php spark db:seed TestSeeder
 
 Creating Seed Files
 -------------------
@@ -125,12 +125,12 @@ Using the command line, you can easily generate seed files.
 
 ::
 
-	> php spark make:seeder user --suffix
-	// Output: UserSeeder.php file located at app/Database/Seeds directory.
+    > php spark make:seeder user --suffix
+    // Output: UserSeeder.php file located at app/Database/Seeds directory.
 
 You can supply the **root** namespace where the seed file will be stored by supplying the ``--namespace`` option::
 
-	> php spark make:seeder MySeeder --namespace Acme\Blog
+    > php spark make:seeder MySeeder --namespace Acme\Blog
 
 If ``Acme\Blog`` is mapped to ``app/Blog`` directory, then this command will generate ``MySeeder.php`` at ``app/Blog/Database/Seeds`` directory.
 
diff --git a/user_guide_src/source/extending/events.rst b/user_guide_src/source/extending/events.rst
index f2190ee55473..79a8636b4bc7 100644
--- a/user_guide_src/source/extending/events.rst
+++ b/user_guide_src/source/extending/events.rst
@@ -23,29 +23,29 @@ Most events are defined within the **app/Config/Events.php** file. You can subsc
 the Events class' ``on()`` method. The first parameter is the name of the event to subscribe to. The second parameter is
 a callable that will be run when that event is triggered::
 
-	use CodeIgniter\Events\Events;
+    use CodeIgniter\Events\Events;
 
-	Events::on('pre_system', ['MyClass', 'MyFunction']);
+    Events::on('pre_system', ['MyClass', 'MyFunction']);
 
 In this example, whenever the **pre_controller** event is executed, an instance of ``MyClass`` is created and the
 ``MyFunction`` method is run. Note that the second parameter can be *any* form of
 `callable <https://www.php.net/manual/en/function.is-callable.php>`_ that PHP recognizes::
 
-	// Call a standalone function
-	Events::on('pre_system', 'some_function');
+    // Call a standalone function
+    Events::on('pre_system', 'some_function');
 
-	// Call on an instance method
-	$user = new User();
-	Events::on('pre_system', [$user, 'some_method']);
+    // Call on an instance method
+    $user = new User();
+    Events::on('pre_system', [$user, 'some_method']);
 
-	// Call on a static method
-	Events::on('pre_system', 'SomeClass::someMethod');
+    // Call on a static method
+    Events::on('pre_system', 'SomeClass::someMethod');
 
-	// Use a Closure
-	Events::on('pre_system', function (...$params)
-	{
-		. . .
-	});
+    // Use a Closure
+    Events::on('pre_system', function (...$params)
+    {
+        . . .
+    });
 
 Setting Priorities
 ------------------
@@ -61,9 +61,9 @@ Any subscribers with the same priority will be executed in the order they were d
 Three constants are defined for your use, that set some helpful ranges on the values. You are not required to use these
 but you might find they aid readability::
 
-	define('EVENT_PRIORITY_LOW', 200);
-	define('EVENT_PRIORITY_NORMAL', 100);
-	define('EVENT_PRIORITY_HIGH', 10);
+    define('EVENT_PRIORITY_LOW', 200);
+    define('EVENT_PRIORITY_NORMAL', 100);
+    define('EVENT_PRIORITY_HIGH', 10);
 
 Once sorted, all subscribers are executed in order. If any subscriber returns a boolean false value, then execution of
 the subscribers will stop.
@@ -74,16 +74,16 @@ Publishing your own Events
 The Events library makes it simple for you to create events in your own code, also. To use this feature, you would simply
 need to call the ``trigger()`` method on the **Events** class with the name of the event::
 
-	\CodeIgniter\Events\Events::trigger('some_event');
+    \CodeIgniter\Events\Events::trigger('some_event');
 
 You can pass any number of arguments to the subscribers by adding them as additional parameters. Subscribers will be
 given the arguments in the same order as defined::
 
-	\CodeIgniter\Events\Events::trigger('some_events', $foo, $bar, $baz);
+    \CodeIgniter\Events\Events::trigger('some_events', $foo, $bar, $baz);
 
-	Events::on('some_event', function ($foo, $bar, $baz) {
-		...
-	});
+    Events::on('some_event', function ($foo, $bar, $baz) {
+        ...
+    });
 
 Simulating Events
 =================
diff --git a/user_guide_src/source/helpers/filesystem_helper.rst b/user_guide_src/source/helpers/filesystem_helper.rst
index fc91a70f111e..2d884aeee08d 100644
--- a/user_guide_src/source/helpers/filesystem_helper.rst
+++ b/user_guide_src/source/helpers/filesystem_helper.rst
@@ -24,11 +24,11 @@ The following functions are available:
 
 .. php:function:: directory_map($source_dir[, $directory_depth = 0[, $hidden = false]])
 
-    :param	string  $source_dir: Path to the source directory
-    :param	int	    $directory_depth: Depth of directories to traverse (0 = fully recursive, 1 = current dir, etc)
-    :param	bool	$hidden: Whether to include hidden paths
-    :returns:	An array of files
-    :rtype:	array
+    :param    string  $source_dir: Path to the source directory
+    :param    int   $directory_depth: Depth of directories to traverse (0 = fully recursive, 1 = current dir, etc)
+    :param    bool    $hidden: Whether to include hidden paths
+    :returns:    An array of files
+    :rtype:    array
 
     Examples::
 
@@ -82,9 +82,9 @@ The following functions are available:
 
 .. php:function:: directory_mirror($original, $target[, $overwrite = true])
 
-    :param	string	$original: Original source directory
-    :param	string	$target: Target destination directory
-    :param	bool	$overwrite: Whether individual files overwrite on collision
+    :param    string    $original: Original source directory
+    :param    string    $target: Target destination directory
+    :param    bool    $overwrite: Whether individual files overwrite on collision
 
     Recursively copies the files and directories of the origin directory
     into the target directory, i.e. "mirror" its contents.
@@ -101,11 +101,11 @@ The following functions are available:
 
 .. php:function:: write_file($path, $data[, $mode = 'wb'])
 
-    :param	string	$path: File path
-    :param	string	$data: Data to write to file
-    :param	string	$mode: ``fopen()`` mode
-    :returns:	true if the write was successful, false in case of an error
-    :rtype:	bool
+    :param    string    $path: File path
+    :param    string    $data: Data to write to file
+    :param    string    $mode: ``fopen()`` mode
+    :returns:    true if the write was successful, false in case of an error
+    :rtype:    bool
 
     Writes data to the file specified in the path. If the file does not exist then the
     function will create it.
@@ -139,12 +139,12 @@ The following functions are available:
 
 .. php:function:: delete_files($path[, $delDir = false[, $htdocs = false[, $hidden = false]]])
 
-    :param	string	$path: Directory path
-    :param	bool	$delDir: Whether to also delete directories
-    :param	bool	$htdocs: Whether to skip deleting .htaccess and index page files
+    :param    string    $path: Directory path
+    :param    bool    $delDir: Whether to also delete directories
+    :param    bool    $htdocs: Whether to skip deleting .htaccess and index page files
     :param  bool    $hidden: Whether to also delete hidden files (files beginning with a period)
-    :returns:	true on success, false in case of an error
-    :rtype:	bool
+    :returns:    true on success, false in case of an error
+    :rtype:    bool
 
     Deletes ALL files contained in the supplied path.
 
@@ -163,11 +163,11 @@ The following functions are available:
 
 .. php:function:: get_filenames($source_dir[, $include_path = false])
 
-    :param	string	$source_dir: Directory path
-    :param	bool|null	$include_path: Whether to include the path as part of the filename; false for no path, null for the path relative to $source_dir, true for the full path
-    :param	bool	$hidden: Whether to include hidden files (files beginning with a period)
-    :returns:	An array of file names
-    :rtype:	array
+    :param    string    $source_dir: Directory path
+    :param    bool|null    $include_path: Whether to include the path as part of the filename; false for no path, null for the path relative to $source_dir, true for the full path
+    :param    bool    $hidden: Whether to include hidden files (files beginning with a period)
+    :returns:    An array of file names
+    :rtype:    array
 
     Takes a server path as input and returns an array containing the names of all files
     contained within it. The file path can optionally be added to the file names by setting
@@ -180,10 +180,10 @@ The following functions are available:
 
 .. php:function:: get_dir_file_info($source_dir, $top_level_only)
 
-    :param	string	$source_dir: Directory path
-    :param	bool	$top_level_only: Whether to look only at the specified directory (excluding sub-directories)
-    :returns:	An array containing info on the supplied directory's contents
-    :rtype:	array
+    :param    string    $source_dir: Directory path
+    :param    bool    $top_level_only: Whether to look only at the specified directory (excluding sub-directories)
+    :returns:    An array containing info on the supplied directory's contents
+    :rtype:    array
 
     Reads the specified directory and builds an array containing the filenames, filesize,
     dates, and permissions. Sub-folders contained within the specified path are only read
@@ -196,10 +196,10 @@ The following functions are available:
 
 .. php:function:: get_file_info($file[, $returned_values = ['name', 'server_path', 'size', 'date']])
 
-    :param	string	        $file: File path
-    :param	array|string    $returned_values: What type of info to return to be passed as array or comma separated string
-    :returns:	An array containing info on the specified file or false on failure
-    :rtype:	array
+    :param    string        $file: File path
+    :param    array|string  $returned_values: What type of info to return to be passed as array or comma separated string
+    :returns:    An array containing info on the specified file or false on failure
+    :rtype:    array
 
     Given a file and path, returns (optionally) the *name*, *path*, *size* and *date modified*
     information attributes for a file. Second parameter allows you to explicitly declare what
@@ -210,9 +210,9 @@ The following functions are available:
 
 .. php:function:: symbolic_permissions($perms)
 
-    :param	int	$perms: Permissions
-    :returns:	Symbolic permissions string
-    :rtype:	string
+    :param    int    $perms: Permissions
+    :returns:    Symbolic permissions string
+    :rtype:    string
 
     Takes numeric permissions (such as is returned by ``fileperms()``) and returns
     standard symbolic notation of file permissions.
@@ -223,9 +223,9 @@ The following functions are available:
 
 .. php:function:: octal_permissions($perms)
 
-    :param	int	$perms: Permissions
-    :returns:	Octal permissions string
-    :rtype:	string
+    :param    int    $perms: Permissions
+    :returns:    Octal permissions string
+    :rtype:    string
 
     Takes numeric permissions (such as is returned by ``fileperms()``) and returns
     a three character octal notation of file permissions.
@@ -236,10 +236,10 @@ The following functions are available:
 
 .. php:function:: same_file($file1, $file2)
 
-    :param	string	$file1: Path to the first file
-    :param	string	$file2: Path to the second file
-    :returns:	Whether both files exist with identical hashes
-    :rtype:	boolean
+    :param    string    $file1: Path to the first file
+    :param    string    $file2: Path to the second file
+    :returns:    Whether both files exist with identical hashes
+    :rtype:    boolean
 
     Compares two files to see if they are the same (based on their MD5 hash).
 
@@ -249,10 +249,10 @@ The following functions are available:
 
 .. php:function:: set_realpath($path[, $check_existence = false])
 
-    :param	string	$path: Path
-    :param	bool	$check_existence: Whether to check if the path actually exists
-    :returns:	An absolute path
-    :rtype:	string
+    :param    string    $path: Path
+    :param    bool    $check_existence: Whether to check if the path actually exists
+    :returns:    An absolute path
+    :rtype:    string
 
     This function will return a server path without symbolic links or
     relative directory structures. An optional second argument will
@@ -264,12 +264,12 @@ The following functions are available:
         echo set_realpath($file); // Prints '/etc/php5/apache2/php.ini'
 
         $non_existent_file = '/path/to/non-exist-file.txt';
-        echo set_realpath($non_existent_file, true);	// Shows an error, as the path cannot be resolved
-        echo set_realpath($non_existent_file, false);	// Prints '/path/to/non-exist-file.txt'
+        echo set_realpath($non_existent_file, true);    // Shows an error, as the path cannot be resolved
+        echo set_realpath($non_existent_file, false);   // Prints '/path/to/non-exist-file.txt'
 
         $directory = '/etc/php5';
-        echo set_realpath($directory);	// Prints '/etc/php5/'
+        echo set_realpath($directory);  // Prints '/etc/php5/'
 
         $non_existent_directory = '/path/to/nowhere';
-        echo set_realpath($non_existent_directory, true);	// Shows an error, as the path cannot be resolved
-        echo set_realpath($non_existent_directory, false);	// Prints '/path/to/nowhere'
+        echo set_realpath($non_existent_directory, true);   // Shows an error, as the path cannot be resolved
+        echo set_realpath($non_existent_directory, false);  // Prints '/path/to/nowhere'
diff --git a/user_guide_src/source/libraries/uri.rst b/user_guide_src/source/libraries/uri.rst
index e8b7c0cefd57..4f5e9dda6fb6 100644
--- a/user_guide_src/source/libraries/uri.rst
+++ b/user_guide_src/source/libraries/uri.rst
@@ -16,17 +16,17 @@ Creating URI instances
 
 Creating a URI instance is as simple as creating a new class instance::
 
-	$uri = new \CodeIgniter\HTTP\URI();
+    $uri = new \CodeIgniter\HTTP\URI();
 
 Alternatively, you can use the ``service()`` function to return an instance for you::
 
-	$uri = service('uri');
+    $uri = service('uri');
 
 When you create the new instance, you can pass a full or partial URL in the constructor and it will be parsed
 into its appropriate sections::
 
-	$uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path');
-	$uri = service('uri', 'http://www.example.com/some/path');
+    $uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path');
+    $uri = service('uri', 'http://www.example.com/some/path');
 
 The Current URI
 ---------------
@@ -34,14 +34,14 @@ The Current URI
 Many times, all you really want is an object representing the current URL of this request.
 You can use one of the functions available in the **url_helper**::
 
-	$uri = current_url(true);
+    $uri = current_url(true);
 
 You must pass ``true`` as the first parameter, otherwise, it will return the string representation of the current URL.
 This URI is based on the path (relative to your ``baseURL``) as determined by the current request object and
 your settings in ``Config\App`` (baseURL, indexPage, and forceGlobalSecureRequests).
 Assuming that you're in a controller that extends ``CodeIgniter\Controller`` you can get this relative path::
 
-	$path = $this->request->getPath();
+    $path = $this->request->getPath();
 
 ===========
 URI Strings
@@ -50,20 +50,20 @@ URI Strings
 Many times, all you really want is to get a string representation of a URI. This is easy to do by simply casting
 the URI as a string::
 
-	$uri = current_url(true);
-	echo (string) $uri;  // http://example.com/index.php
+    $uri = current_url(true);
+    echo (string) $uri;  // http://example.com/index.php
 
 If you know the pieces of the URI and just want to ensure it's all formatted correctly, you can generate a string
 using the URI class' static ``createURIString()`` method::
 
-	$uriString = URI::createURIString($scheme, $authority, $path, $query, $fragment);
+    $uriString = URI::createURIString($scheme, $authority, $path, $query, $fragment);
 
-	// Creates: http://exmample.com/some/path?foo=bar#first-heading
-	echo URI::createURIString('http', 'example.com', 'some/path', 'foo=bar', 'first-heading');
+    // Creates: http://exmample.com/some/path?foo=bar#first-heading
+    echo URI::createURIString('http', 'example.com', 'some/path', 'foo=bar', 'first-heading');
 
 .. important:: When ``URI`` is cast to a string, it will attempt to adjust project URLs to the
-	settings defined in ``Config\App``. If you need the exact, unaltered string representation
-	then use ``URI::createURIString()`` instead.
+    settings defined in ``Config\App``. If you need the exact, unaltered string representation
+    then use ``URI::createURIString()`` instead.
 
 
 =============
@@ -92,23 +92,23 @@ the host and the port number. You can retrieve all of these pieces as one single
 method, or you can manipulate the individual parts.
 ::
 
-	$uri = new \CodeIgniter\HTTP\URI('ftp://user:password@example.com:21/some/path');
+    $uri = new \CodeIgniter\HTTP\URI('ftp://user:password@example.com:21/some/path');
 
-	echo $uri->getAuthority();  // user@example.com:21
+    echo $uri->getAuthority();  // user@example.com:21
 
 By default, this will not display the password portion since you wouldn't want to show that to anyone. If you want
 to show the password, you can use the ``showPassword()`` method. This URI instance will continue to show that password
 until you turn it off again, so always make sure that you turn it off as soon as you are finished with it::
 
-	echo $uri->getAuthority();  // user@example.com:21
-	echo $uri->showPassword()->getAuthority();   // user:password@example.com:21
+    echo $uri->getAuthority();  // user@example.com:21
+    echo $uri->showPassword()->getAuthority();   // user:password@example.com:21
 
-	// Turn password display off again.
-	$uri->showPassword(false);
+    // Turn password display off again.
+    $uri->showPassword(false);
 
 If you do not want to display the port, pass in ``true`` as the only parameter::
 
-	echo $uri->getAuthority(true);  // user@example.com
+    echo $uri->getAuthority(true);  // user@example.com
 
 .. note:: If the current port is the default port for the scheme it will never be displayed.
 
@@ -118,12 +118,12 @@ Userinfo
 The userinfo section is simply the username and password that you might see with an FTP URI. While you can get
 this as part of the Authority, you can also retrieve it yourself::
 
-	echo $uri->getUserInfo();   // user
+    echo $uri->getUserInfo();   // user
 
 By default, it will not display the password, but you can override that with the ``showPassword()`` method::
 
-	echo $uri->showPassword()->getUserInfo();   // user:password
-	$uri->showPassword(false);
+    echo $uri->showPassword()->getUserInfo();   // user:password
+    $uri->showPassword(false);
 
 Host
 ----
@@ -131,10 +131,10 @@ Host
 The host portion of the URI is typically the domain name of the URL. This can be easily set and retrieved with the
 ``getHost()`` and ``setHost()`` methods::
 
-	$uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path');
+    $uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path');
 
-	echo $uri->getHost();   // www.example.com
-	echo $uri->setHost('anotherexample.com')->getHost();    // anotherexample.com
+    echo $uri->getHost();   // www.example.com
+    echo $uri->setHost('anotherexample.com')->getHost();    // anotherexample.com
 
 Port
 ----
@@ -142,10 +142,10 @@ Port
 The port is an integer number between 0 and 65535. Each sheme has a default value associated with it.
 ::
 
-	$uri = new \CodeIgniter\HTTP\URI('ftp://user:password@example.com:21/some/path');
+    $uri = new \CodeIgniter\HTTP\URI('ftp://user:password@example.com:21/some/path');
 
-	echo $uri->getPort();   // 21
-	echo $uri->setPort(2201)->getPort(); // 2201
+    echo $uri->getPort();   // 21
+    echo $uri->setPort(2201)->getPort(); // 2201
 
 When using the ``setPort()`` method, the port will be checked that it is within the valid range and assigned.
 
@@ -155,13 +155,13 @@ Path
 The path are all of the segments within the site itself. As expected, the ``getPath()`` and ``setPath()`` methods
 can be used to manipulate it::
 
-	$uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path');
+    $uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path');
 
-	echo $uri->getPath();   // 'some/path'
-	echo $uri->setPath('another/path')->getPath();  // 'another/path'
+    echo $uri->getPath();   // 'some/path'
+    echo $uri->setPath('another/path')->getPath();  // 'another/path'
 
 .. note:: When setting the path this way, or any other way the class allows, it is sanitized to encode any dangerous
-	characters, and remove dot segments for safety.
+    characters, and remove dot segments for safety.
 
 Query
 -----
@@ -170,10 +170,10 @@ The query variables can be manipulated through the class using simple string rep
 be set as a string currently.
 ::
 
-	$uri = new \CodeIgniter\HTTP\URI('http://www.example.com?foo=bar');
+    $uri = new \CodeIgniter\HTTP\URI('http://www.example.com?foo=bar');
 
-	echo $uri->getQuery();  // 'foo=bar'
-	$uri->setQuery('foo=bar&bar=baz');
+    echo $uri->getQuery();  // 'foo=bar'
+    $uri->setQuery('foo=bar&bar=baz');
 
 .. note:: Query values cannot contain fragments. An InvalidArgumentException will be thrown if it does.
 
@@ -212,8 +212,8 @@ you can use the ``stripQuery()`` and ``keepQuery()`` methods to change the actua
     $uri->keepQuery('foo');
 
 .. note:: By default ``setQuery()`` and ``setQueryArray()`` methods uses native ``parse_str()`` function to prepare data.
-	If you want to use more liberal rules (which allow key names to contain dots), you can use a special method
-	``useRawQueryString()`` beforehand.
+    If you want to use more liberal rules (which allow key names to contain dots), you can use a special method
+    ``useRawQueryString()`` beforehand.
 
 Fragment
 --------
@@ -222,10 +222,10 @@ Fragments are the portion at the end of the URL, preceded by the pound-sign (#).
 to an on-page anchor. Media URI's can make use of them in various other ways.
 ::
 
-	$uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path#first-heading');
+    $uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path#first-heading');
 
-	echo $uri->getFragment();   // 'first-heading'
-	echo $uri->setFragment('second-heading')->getFragment();    // 'second-heading'
+    echo $uri->getFragment();   // 'first-heading'
+    echo $uri->setFragment('second-heading')->getFragment();    // 'second-heading'
 
 ============
 URI Segments
@@ -235,43 +235,43 @@ Each section of the path between the slashes is a single segment. The URI class
 what the values of the segments are. The segments start at 1 being the furthest left of the path.
 ::
 
-	// URI = http://example.com/users/15/profile
+    // URI = http://example.com/users/15/profile
 
-	// Prints '15'
-	if ($uri->getSegment(1) == 'users') {
-		echo $uri->getSegment(2);
-	}
+    // Prints '15'
+    if ($uri->getSegment(1) == 'users') {
+        echo $uri->getSegment(2);
+    }
 
 You can also set a different default value for a particular segment by using the second parameter of the ``getSegment()`` method. The default is empty string.
 ::
 
-	// URI = http://example.com/users/15/profile
+    // URI = http://example.com/users/15/profile
 
-	// will print 'profile'
-	echo $uri->getSegment(3, 'foo');
-	// will print 'bar'
-	echo $uri->getSegment(4, 'bar');
-	// will throw an exception
-	echo $uri->getSegment(5, 'baz');
-	// will print 'baz'
-	echo $uri->setSilent()->getSegment(5, 'baz');
-	// will print '' (empty string)
-	echo $uri->setSilent()->getSegment(5);
+    // will print 'profile'
+    echo $uri->getSegment(3, 'foo');
+    // will print 'bar'
+    echo $uri->getSegment(4, 'bar');
+    // will throw an exception
+    echo $uri->getSegment(5, 'baz');
+    // will print 'baz'
+    echo $uri->setSilent()->getSegment(5, 'baz');
+    // will print '' (empty string)
+    echo $uri->setSilent()->getSegment(5);
 
 You can get a count of the total segments::
 
-	$total = $uri->getTotalSegments(); // 3
+    $total = $uri->getTotalSegments(); // 3
 
 Finally, you can retrieve an array of all of the segments::
 
-	$segments = $uri->getSegments();
+    $segments = $uri->getSegments();
 
-	// $segments =
-	[
-		0 => 'users',
-		1 => '15',
-		2 => 'profile'
-	]
+    // $segments =
+    [
+        0 => 'users',
+        1 => '15',
+        2 => 'profile'
+    ]
 
 ===========================
 Disable Throwing Exceptions
@@ -281,8 +281,8 @@ By default, some methods of this class may throw an exception. If you want to di
 that will prevent throwing exceptions.
 ::
 
-	// Disable throwing exceptions
-	$uri->setSilent();
+    // Disable throwing exceptions
+    $uri->setSilent();
 
-	// Enable throwing exceptions (default)
-	$uri->setSilent(false);
+    // Enable throwing exceptions (default)
+    $uri->setSilent(false);

From c9ea136fa07849aed91ade14c42dd720a4afeed6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 24 Sep 2021 14:30:58 +0900
Subject: [PATCH 0301/2325] docs: add SECURITY.md

copied from https://github.com/codeigniter4/cache/blob/develop/SECURITY.md
---
 SECURITY.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000000..7879188492b5
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,26 @@
+# Security Policy
+
+The development team and community take all security issues seriously. **Please do not make public any uncovered flaws.**
+
+## Reporting a Vulnerability
+
+Thank you for improving the security of our code! Any assistance in removing security flaws will be acknowledged.
+
+**Please report security flaws by emailing the development team directly: security@codeigniter.com**.
+
+The lead maintainer will acknowledge your email within 48 hours, and will send a more detailed response within 48 hours indicating
+the next steps in handling your report. After the initial reply to your report, the security team will endeavor to keep you informed of the
+progress towards a fix and full announcement, and may ask for additional information or guidance.
+
+## Disclosure Policy
+
+When the security team receives a security bug report, they will assign it to a primary handler.
+This person will coordinate the fix and release process, involving the following steps:
+
+- Confirm the problem and determine the affected versions.
+- Audit code to find any potential similar problems.
+- Prepare fixes for all releases still under maintenance. These fixes will be released as fast as possible.
+
+## Comments on this Policy
+
+If you have suggestions on how this process could be improved please submit a Pull Request.

From 5b0c4d0b16d3f0894d10dee2ee12421de963a6a7 Mon Sep 17 00:00:00 2001
From: Stefan Bauer <sba@gmx.ch>
Date: Fri, 24 Sep 2021 10:15:47 +0200
Subject: [PATCH 0302/2325] fix typo

cancelled not canceled
---
 user_guide_src/source/database/query_builder.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 26fcba73e4ee..70aece2d3d84 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -1251,7 +1251,7 @@ Class Reference
         :rtype:     ``BaseBuilder``
 
         Resets the current Query Builder state. Useful when you want
-        to build a query that can be canceled under certain conditions.
+        to build a query that can be cancelled under certain conditions.
 
     .. php:method:: countAllResults([$reset = true])
 

From 49e206fe59cf08fa808c3fbb3ae8103008dd0503 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 24 Sep 2021 17:22:00 +0900
Subject: [PATCH 0303/2325] docs: add missing @param type Clouser

---
 system/Router/RouteCollection.php          | 22 +++++++++++-----------
 system/Router/RouteCollectionInterface.php |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index e975a1ac86b9..87aeaa0486a0 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -512,7 +512,7 @@ public function map(array $routes = [], ?array $options = null): RouteCollection
      * Example:
      *      $routes->add('news', 'Posts::index');
      *
-     * @param array|string $to
+     * @param array|Closure|string $to
      */
     public function add(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
@@ -821,7 +821,7 @@ public function presenter(string $name, ?array $options = null): RouteCollection
      * Example:
      *  $route->match( ['get', 'post'], 'users/(:num)', 'users/$1);
      *
-     * @param array|string $to
+     * @param array|Closure|string $to
      */
     public function match(array $verbs = [], string $from = '', $to = '', ?array $options = null): RouteCollectionInterface
     {
@@ -841,7 +841,7 @@ public function match(array $verbs = [], string $from = '', $to = '', ?array $op
     /**
      * Specifies a route that is only available to GET requests.
      *
-     * @param array|string $to
+     * @param array|Closure|string $to
      */
     public function get(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
@@ -853,7 +853,7 @@ public function get(string $from, $to, ?array $options = null): RouteCollectionI
     /**
      * Specifies a route that is only available to POST requests.
      *
-     * @param array|string $to
+     * @param array|Closure|string $to
      */
     public function post(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
@@ -865,7 +865,7 @@ public function post(string $from, $to, ?array $options = null): RouteCollection
     /**
      * Specifies a route that is only available to PUT requests.
      *
-     * @param array|string $to
+     * @param array|Closure|string $to
      */
     public function put(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
@@ -877,7 +877,7 @@ public function put(string $from, $to, ?array $options = null): RouteCollectionI
     /**
      * Specifies a route that is only available to DELETE requests.
      *
-     * @param array|string $to
+     * @param array|Closure|string $to
      */
     public function delete(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
@@ -889,7 +889,7 @@ public function delete(string $from, $to, ?array $options = null): RouteCollecti
     /**
      * Specifies a route that is only available to HEAD requests.
      *
-     * @param array|string $to
+     * @param array|Closure|string $to
      */
     public function head(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
@@ -901,7 +901,7 @@ public function head(string $from, $to, ?array $options = null): RouteCollection
     /**
      * Specifies a route that is only available to PATCH requests.
      *
-     * @param array|string $to
+     * @param array|Closure|string $to
      */
     public function patch(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
@@ -913,7 +913,7 @@ public function patch(string $from, $to, ?array $options = null): RouteCollectio
     /**
      * Specifies a route that is only available to OPTIONS requests.
      *
-     * @param array|string $to
+     * @param array|Closure|string $to
      */
     public function options(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
@@ -925,7 +925,7 @@ public function options(string $from, $to, ?array $options = null): RouteCollect
     /**
      * Specifies a route that is only available to command-line requests.
      *
-     * @param array|string $to
+     * @param array|Closure|string $to
      */
     public function cli(string $from, $to, ?array $options = null): RouteCollectionInterface
     {
@@ -1083,7 +1083,7 @@ protected function fillRouteParams(string $from, ?array $params = null): string
      * the request method(s) that this route will work for. They can be separated
      * by a pipe character "|" if there is more than one.
      *
-     * @param array|string $to
+     * @param array|Closure|string $to
      */
     protected function create(string $verb, string $from, $to, ?array $options = null)
     {
diff --git a/system/Router/RouteCollectionInterface.php b/system/Router/RouteCollectionInterface.php
index da25077da0fb..a55b5d80a0b9 100644
--- a/system/Router/RouteCollectionInterface.php
+++ b/system/Router/RouteCollectionInterface.php
@@ -28,8 +28,8 @@ interface RouteCollectionInterface
     /**
      * Adds a single route to the collection.
      *
-     * @param array|string $to
-     * @param array        $options
+     * @param array|Closure|string $to
+     * @param array                $options
      *
      * @return mixed
      */

From bc94d3ada7741a75ceb76dc362d091c05c099c41 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 24 Sep 2021 17:28:17 +0900
Subject: [PATCH 0304/2325] feat: add classname filter

---
 system/Filters/Filters.php         |  4 +++-
 tests/system/Router/RouterTest.php | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index 9e3a0aa7913d..04fd0e9d0a75 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -334,7 +334,9 @@ public function enableFilter(string $name, string $when = 'before')
             $this->arguments[$name] = $params;
         }
 
-        if (! array_key_exists($name, $this->config->aliases)) {
+        if (class_exists($name)) {
+            $this->config->aliases[$name] = $name;
+        } elseif (! array_key_exists($name, $this->config->aliases)) {
             throw FilterException::forNoAlias($name);
         }
 
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index 3ef8a9e257d5..dd6ca83ad6fd 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -16,6 +16,7 @@
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Modules;
+use Tests\Support\Filters\Customfilter;
 
 /**
  * @internal
@@ -529,6 +530,20 @@ static function (RouteCollection $routes) {
         $this->assertSame('api-auth', $router->getFilter());
     }
 
+    public function testRouteWorksWithClassnameFilter()
+    {
+        $collection = $this->collection;
+
+        $collection->add('foo', 'TestController::foo', ['filter' => Customfilter::class]);
+        $router = new Router($collection, $this->request);
+
+        $router->handle('foo');
+
+        $this->assertSame('\TestController', $router->controllerName());
+        $this->assertSame('foo', $router->methodName());
+        $this->assertSame('Tests\Support\Filters\Customfilter', $router->getFilter());
+    }
+
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/1240
      */

From 9134c6483870f3fc2d4ea9510420b4294ad79384 Mon Sep 17 00:00:00 2001
From: puschie286 <christoph286@googlemail.com>
Date: Fri, 24 Sep 2021 14:45:35 +0200
Subject: [PATCH 0305/2325] Ensure page validity

~ get valid page after validation in pager
---
 system/BaseModel.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/BaseModel.php b/system/BaseModel.php
index 29c6d1075949..5380c31e2107 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -1082,6 +1082,7 @@ public function paginate(?int $perPage = null, string $group = 'default', ?int $
         $page = $page >= 1 ? $page : $pager->getCurrentPage($group);
         // Store it in the Pager library, so it can be paginated in the views.
         $this->pager = $pager->store($group, $page, $perPage, $this->countAllResults(false), $segment);
+        $page        = $pager->getCurrentPage( $group );
         $perPage     = $this->pager->getPerPage($group);
         $offset      = ($page - 1) * $perPage;
 

From 4e4b2d31802ce54af4de57b3f0fcc09052665666 Mon Sep 17 00:00:00 2001
From: puschie286 <christoph286@googlemail.com>
Date: Fri, 24 Sep 2021 14:47:46 +0200
Subject: [PATCH 0306/2325] style adjustment

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

diff --git a/system/BaseModel.php b/system/BaseModel.php
index 5380c31e2107..c15ecc8d5473 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -1082,7 +1082,7 @@ public function paginate(?int $perPage = null, string $group = 'default', ?int $
         $page = $page >= 1 ? $page : $pager->getCurrentPage($group);
         // Store it in the Pager library, so it can be paginated in the views.
         $this->pager = $pager->store($group, $page, $perPage, $this->countAllResults(false), $segment);
-        $page        = $pager->getCurrentPage( $group );
+        $page        = $pager->getCurrentPage($group);
         $perPage     = $this->pager->getPerPage($group);
         $offset      = ($page - 1) * $perPage;
 

From f5b6b95b56b4d24db41538284f2b6dbd5cb0048b Mon Sep 17 00:00:00 2001
From: puschie286 <christoph286@googlemail.com>
Date: Fri, 24 Sep 2021 15:44:07 +0200
Subject: [PATCH 0307/2325] test for page out of range

+ add test function for page lower/higher than available pages
---
 tests/system/Models/PaginateModelTest.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/system/Models/PaginateModelTest.php b/tests/system/Models/PaginateModelTest.php
index d5901bd702c4..91de295098c1 100644
--- a/tests/system/Models/PaginateModelTest.php
+++ b/tests/system/Models/PaginateModelTest.php
@@ -70,4 +70,16 @@ public function testPaginateWithoutDeleted(): void
         $this->assertCount(3, $data);
         $this->assertSame(3, $this->model->pager->getDetails()['total']);
     }
+	
+	public function testPaginatePageOutOfRange(): void
+    {
+    	$this->createModel(ValidModel::class);
+    	$pager = $this->model->pager;
+    	// check underflow
+    	$this->model->paginate(1,'default', -500);
+    	$this->assertSame(1, $pager->getCurrentPage());
+    	// check overflow
+    	$this->model->paginate(1, 'default', 500);
+    	$this->assertSame($pager->getPageCount(),$pager->getCurrentPage());
+    }
 }

From dd1b0d130395de8c3eca18297273bd22d617bb39 Mon Sep 17 00:00:00 2001
From: puschie286 <christoph286@googlemail.com>
Date: Fri, 24 Sep 2021 16:04:08 +0200
Subject: [PATCH 0308/2325] Fix test

~ use reference instead of (uninitialized) variable
- remove comments
---
 tests/system/Models/PaginateModelTest.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tests/system/Models/PaginateModelTest.php b/tests/system/Models/PaginateModelTest.php
index 91de295098c1..5a7bb4755927 100644
--- a/tests/system/Models/PaginateModelTest.php
+++ b/tests/system/Models/PaginateModelTest.php
@@ -74,12 +74,9 @@ public function testPaginateWithoutDeleted(): void
 	public function testPaginatePageOutOfRange(): void
     {
     	$this->createModel(ValidModel::class);
-    	$pager = $this->model->pager;
-    	// check underflow
     	$this->model->paginate(1,'default', -500);
-    	$this->assertSame(1, $pager->getCurrentPage());
-    	// check overflow
+    	$this->assertSame(1, $this->model->pager->getCurrentPage());
     	$this->model->paginate(1, 'default', 500);
-    	$this->assertSame($pager->getPageCount(),$pager->getCurrentPage());
+    	$this->assertSame($this->model->pager->getPageCount(),$this->model->pager->getCurrentPage());
     }
 }

From 98bad0a885a47744cb262c445db550d9d6d90db2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 24 Sep 2021 17:31:19 +0900
Subject: [PATCH 0309/2325] feat: add multiple filters for a route

---
 app/Config/Feature.php             | 27 +++++++++++++++++++++++++++
 system/CodeIgniter.php             | 21 +++++++++++++++++----
 system/Filters/Filters.php         | 20 ++++++++++++++++++++
 system/Router/RouteCollection.php  | 23 +++++++++++++++++++++++
 system/Router/Router.php           | 30 +++++++++++++++++++++++++++++-
 tests/system/CodeIgniterTest.php   | 24 ++++++++++++++++++++++++
 tests/system/Router/RouterTest.php | 19 +++++++++++++++++++
 7 files changed, 159 insertions(+), 5 deletions(-)
 create mode 100644 app/Config/Feature.php

diff --git a/app/Config/Feature.php b/app/Config/Feature.php
new file mode 100644
index 000000000000..af42534ac423
--- /dev/null
+++ b/app/Config/Feature.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+/**
+ * Enable/disable backward compatibility breaking features.
+ */
+class Feature extends BaseConfig
+{
+    /**
+     * Enable multiple filters for a route or not
+     *
+     * If you enable this:
+     *   - CodeIgniter\CodeIgniter::handleRequest() uses:
+     *     - CodeIgniter\Filters\Filters::enableFilters(), instead of enableFilter()
+     *   - CodeIgniter\CodeIgniter::tryToRouteIt() uses:
+     *     - CodeIgniter\Router\Router::getFilters(), instead of getFilter()
+     *   - CodeIgniter\Router\Router::handle() uses:
+     *     - property $filtersInfo, instead of $filterInfo
+     *     - CodeIgniter\Router\RouteCollection::getFiltersForRoute(), instead of getFilterForRoute()
+     *
+     * @var bool
+     */
+    public $multipleFilters = false;
+}
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 1ac65c4663cd..7a99f926121a 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -364,8 +364,15 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
         // If any filters were specified within the routes file,
         // we need to ensure it's active for the current request
         if ($routeFilter !== null) {
-            $filters->enableFilter($routeFilter, 'before');
-            $filters->enableFilter($routeFilter, 'after');
+            $multipleFiltersEnabled = config('Feature')->multipleFilters ?? false;
+            if ($multipleFiltersEnabled) {
+                $filters->enableFilters($routeFilter, 'before');
+                $filters->enableFilters($routeFilter, 'after');
+            } else {
+                // for backward compatibility
+                $filters->enableFilter($routeFilter, 'before');
+                $filters->enableFilter($routeFilter, 'after');
+            }
         }
 
         $uri = $this->determinePath();
@@ -690,7 +697,7 @@ public function displayPerformanceMetrics(string $output): string
      *
      * @throws RedirectException
      *
-     * @return string|null
+     * @return string|string[]|null
      */
     protected function tryToRouteIt(?RouteCollectionInterface $routes = null)
     {
@@ -719,7 +726,13 @@ protected function tryToRouteIt(?RouteCollectionInterface $routes = null)
 
         $this->benchmark->stop('routing');
 
-        return $this->router->getFilter();
+        // for backward compatibility
+        $multipleFiltersEnabled = config('Feature')->multipleFilters ?? false;
+        if (! $multipleFiltersEnabled) {
+            return $this->router->getFilter();
+        }
+
+        return $this->router->getFilters();
     }
 
     /**
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index 04fd0e9d0a75..c81dadf3330f 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -319,6 +319,8 @@ public function addFilter(string $class, ?string $alias = null, string $when = '
      * are passed to the filter when executed.
      *
      * @return Filters
+     *
+     * @deprecated Use enableFilters(). This method will be private.
      */
     public function enableFilter(string $name, string $when = 'before')
     {
@@ -354,6 +356,24 @@ public function enableFilter(string $name, string $when = 'before')
         return $this;
     }
 
+    /**
+     * Ensures that specific filters is on and enabled for the current request.
+     *
+     * Filters can have "arguments". This is done by placing a colon immediately
+     * after the filter name, followed by a comma-separated list of arguments that
+     * are passed to the filter when executed.
+     *
+     * @return Filters
+     */
+    public function enableFilters(array $names, string $when = 'before')
+    {
+        foreach ($names as $filter) {
+            $this->enableFilter($filter, $when);
+        }
+
+        return $this;
+    }
+
     /**
      * Returns the arguments for a specified key, or all.
      *
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 87aeaa0486a0..1dcbfe9f590d 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1040,6 +1040,8 @@ public function isFiltered(string $search, ?string $verb = null): bool
      *    'role:admin,manager'
      *
      * has a filter of "role", with parameters of ['admin', 'manager'].
+     *
+     * @deprecated Use getFiltersForRoute()
      */
     public function getFilterForRoute(string $search, ?string $verb = null): string
     {
@@ -1048,6 +1050,27 @@ public function getFilterForRoute(string $search, ?string $verb = null): string
         return $options[$search]['filter'] ?? '';
     }
 
+    /**
+     * Returns the filters that should be applied for a single route, along
+     * with any parameters it might have. Parameters are found by splitting
+     * the parameter name on a colon to separate the filter name from the parameter list,
+     * and the splitting the result on commas. So:
+     *
+     *    'role:admin,manager'
+     *
+     * has a filter of "role", with parameters of ['admin', 'manager'].
+     */
+    public function getFiltersForRoute(string $search, ?string $verb = null): array
+    {
+        $options = $this->loadRoutesOptions($verb);
+
+        if (is_string($options[$search]['filter'])) {
+            return [$options[$search]['filter']];
+        }
+
+        return $options[$search]['filter'] ?? [];
+    }
+
     /**
      * Given a
      *
diff --git a/system/Router/Router.php b/system/Router/Router.php
index ea59b2217b23..621c54a5e9dd 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -99,9 +99,19 @@ class Router implements RouterInterface
      * if the matched route should be filtered.
      *
      * @var string|null
+     *
+     * @deprecated Use $filtersInfo
      */
     protected $filterInfo;
 
+    /**
+     * The filter info from Route Collection
+     * if the matched route should be filtered.
+     *
+     * @var string[]
+     */
+    protected $filtersInfo = [];
+
     /**
      * Stores a reference to the RouteCollection object.
      *
@@ -144,7 +154,13 @@ public function handle(?string $uri = null)
 
         if ($this->checkRoutes($uri)) {
             if ($this->collection->isFiltered($this->matchedRoute[0])) {
-                $this->filterInfo = $this->collection->getFilterForRoute($this->matchedRoute[0]);
+                $multipleFiltersEnabled = config('Feature')->multipleFilters ?? false;
+                if ($multipleFiltersEnabled) {
+                    $this->filtersInfo = $this->collection->getFiltersForRoute($this->matchedRoute[0]);
+                } else {
+                    // for backward compatibility
+                    $this->filterInfo = $this->collection->getFilterForRoute($this->matchedRoute[0]);
+                }
             }
 
             return $this->controller;
@@ -166,12 +182,24 @@ public function handle(?string $uri = null)
      * Returns the filter info for the matched route, if any.
      *
      * @return string
+     *
+     * @deprecated Use getFilters()
      */
     public function getFilter()
     {
         return $this->filterInfo;
     }
 
+    /**
+     * Returns the filter info for the matched route, if any.
+     *
+     * @return string[]
+     */
+    public function getFilters(): array
+    {
+        return $this->filtersInfo;
+    }
+
     /**
      * Returns the name of the matched controller.
      *
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index 0a3ad80921d7..0e6de8eadda0 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -17,6 +17,7 @@
 use CodeIgniter\Test\Mock\MockCodeIgniter;
 use Config\App;
 use Config\Modules;
+use Tests\Support\Filters\Customfilter;
 
 /**
  * @backupGlobals enabled
@@ -172,6 +173,29 @@ public function testControllersCanReturnResponseObject()
         $this->assertStringContainsString("You want to see 'about' page.", $output);
     }
 
+    public function testControllersRunFilterByClassName()
+    {
+        $_SERVER['argv'] = ['index.php', 'pages/about'];
+        $_SERVER['argc'] = 2;
+
+        $_SERVER['REQUEST_URI'] = '/pages/about';
+
+        // Inject mock router.
+        $routes = Services::routes();
+        $routes->add('pages/about', static function () {
+            return Services::request()->url;
+        }, ['filter' => Customfilter::class]);
+
+        $router = Services::router($routes, Services::request());
+        Services::injectMock('router', $router);
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run();
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString('http://hellowworld.com', $output);
+    }
+
     public function testResponseConfigEmpty()
     {
         $_SERVER['argv'] = ['index.php', '/'];
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index dd6ca83ad6fd..0c264fbdc43b 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -544,6 +544,25 @@ public function testRouteWorksWithClassnameFilter()
         $this->assertSame('Tests\Support\Filters\Customfilter', $router->getFilter());
     }
 
+    public function testRouteWorksWithMultipleFilters()
+    {
+        $feature                  = config('Feature');
+        $feature->multipleFilters = true;
+
+        $collection = $this->collection;
+
+        $collection->add('foo', 'TestController::foo', ['filter' => ['filter1', 'filter2:param']]);
+        $router = new Router($collection, $this->request);
+
+        $router->handle('foo');
+
+        $this->assertSame('\TestController', $router->controllerName());
+        $this->assertSame('foo', $router->methodName());
+        $this->assertSame(['filter1', 'filter2:param'], $router->getFilters());
+
+        $feature->multipleFilters = false;
+    }
+
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/1240
      */

From 69d33822e94680f6e9a1b31c75f4a59f8534af97 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 24 Sep 2021 17:35:48 +0900
Subject: [PATCH 0310/2325] docs: add multiple filters for a route and
 classname filter

---
 user_guide_src/source/incoming/routing.rst    | 28 +++++++++++++++++--
 .../source/installation/upgrade_415.rst       | 28 +++++++++++++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index d03d59ddf263..8c959d87cdbf 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -352,15 +352,37 @@ can modify the generated routes, or further restrict them. The ``$options`` arra
 Applying Filters
 ----------------
 
-You can alter the behavior of specific routes by supplying a filter to run before or after the controller. This is especially handy during authentication or api logging::
+You can alter the behavior of specific routes by supplying filters to run before or after the controller. This is especially handy during authentication or api logging.
+The value for the filter can be a string or an array of strings:
+
+* matching the aliases defined in ``app/Config/Filters.php``.
+* filter classnames
+
+See `Controller filters <filters.html>`_ for more information on setting up filters.
+
+**Alias filter**
+
+You specify an alias defined in ``app/Config/Filters.php`` for the filter value::
 
     $routes->add('admin',' AdminController::index', ['filter' => 'admin-auth']);
 
-The value for the filter must match one of the aliases defined within ``app/Config/Filters.php``. You may also supply arguments to be passed to the filter's ``before()`` and ``after()`` methods::
+You may also supply arguments to be passed to the alias filter's ``before()`` and ``after()`` methods::
 
     $routes->add('users/delete/(:segment)', 'AdminController::index', ['filter' => 'admin-auth:dual,noreturn']);
 
-See `Controller filters <filters.html>`_ for more information on setting up filters.
+**Classname filter**
+
+You specify a filter classname for the filter value::
+
+    $routes->add('admin',' AdminController::index', ['filter' => \App\Filters\SomeFilter::class]);
+
+**Multiple filters**
+
+.. important:: *Multiple filters* is disabled by default. Because it breaks backward compatibility. If you want to use it, you need to configure. See *Multiple filters for a route* in :doc:`/installation/upgrade_415` for the details.
+
+You specify an array for the filter value::
+
+    $routes->add('admin',' AdminController::index', ['filter' => ['admin-auth', \App\Filters\SomeFilter::class]]);
 
 Assigning Namespace
 -------------------
diff --git a/user_guide_src/source/installation/upgrade_415.rst b/user_guide_src/source/installation/upgrade_415.rst
index bb075023e7bc..b05d0d0030a6 100644
--- a/user_guide_src/source/installation/upgrade_415.rst
+++ b/user_guide_src/source/installation/upgrade_415.rst
@@ -25,3 +25,31 @@ Update the definition of the session table. See the :doc:`/libraries/sessions` f
 
 The change was introduced in v4.1.2. But due to `a bug <https://github.com/codeigniter4/CodeIgniter4/issues/4807>`_,
 the DatabaseHandler Driver did not work properly.
+
+**Multiple filters for a route**
+
+A new feature to set multiple filters for a route.
+
+.. important:: This feature is disabled by default. Because it breaks backward compatibility.
+
+If you want to use this, you need to set the property ``$multipleFilters`` ``true`` in ``app/Config/Feature.php``.
+If you enable it:
+
+- ``CodeIgniter\CodeIgniter::handleRequest()`` uses
+    - ``CodeIgniter\Filters\Filters::enableFilters()``, instead of ``enableFilter()``
+- ``CodeIgniter\CodeIgniter::tryToRouteIt()`` uses
+    - ``CodeIgniter\Router\Router::getFilters()``, instead of ``getFilter()``
+- ``CodeIgniter\Router\Router::handle()`` uses
+    - the property ``$filtersInfo``, instead of ``$filterInfo``
+    - ``CodeIgniter\Router\RouteCollection::getFiltersForRoute()``, instead of ``getFilterForRoute()``
+
+If you extended the above classes, then you need to change them.
+
+The following methods and a property have been deprecated:
+
+- ``CodeIgniter\Filters\Filters::enableFilter()``
+- ``CodeIgniter\Router\Router::getFilter()``
+- ``CodeIgniter\Router\RouteCollection::getFilterForRoute()``
+- ``CodeIgniter\Router\RouteCollection``'s property ``$filterInfo``
+
+See *Applying Filters* in :doc:`Routing </incoming/routing>` for the functionality.

From 3ee6632e8f7b2787f72a356f80da5b5abf154e3f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 25 Sep 2021 11:20:39 +0900
Subject: [PATCH 0311/2325] chore: suppress phpstan error for
 CodeIgniter\\Router\\RouteCollectionInterface

---
 phpstan.neon.dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 3847a2f02a69..8861b753fe26 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -33,7 +33,7 @@ parameters:
 		- '#Access to an undefined property CodeIgniter\\Database\\BaseConnection::\$mysqli|\$schema#'
 		- '#Access to an undefined property CodeIgniter\\Database\\ConnectionInterface::(\$DBDriver|\$connID|\$likeEscapeStr|\$likeEscapeChar|\$escapeChar|\$protectIdentifiers|\$schema)#'
 		- '#Call to an undefined method CodeIgniter\\Database\\BaseConnection::_(disable|enable)ForeignKeyChecks\(\)#'
-		- '#Call to an undefined method CodeIgniter\\Router\\RouteCollectionInterface::(getDefaultNamespace|isFiltered|getFilterForRoute|getRoutesOptions)\(\)#'
+		- '#Call to an undefined method CodeIgniter\\Router\\RouteCollectionInterface::(getDefaultNamespace|isFiltered|getFilterForRoute|getFiltersForRoute|getRoutesOptions)\(\)#'
 		- '#Cannot access property [\$a-z_]+ on ((bool\|)?object\|resource)#'
 		- '#Cannot call method [a-zA-Z_]+\(\) on ((bool\|)?object\|resource)#'
 		- '#Method CodeIgniter\\Router\\RouteCollectionInterface::getRoutes\(\) invoked with 1 parameter, 0 required#'

From 562c1776c2eda7054601a713c21cfd4293fd3154 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 25 Sep 2021 19:40:39 +0900
Subject: [PATCH 0312/2325] docs: replace tabs with spaces

---
 .../source/helpers/inflector_helper.rst       |  70 ++++++------
 user_guide_src/source/libraries/files.rst     |  82 ++++++-------
 user_guide_src/source/libraries/security.rst  |  48 ++++----
 .../source/libraries/typography.rst           |  56 ++++-----
 .../source/libraries/uploaded_files.rst       | 108 +++++++++---------
 5 files changed, 182 insertions(+), 182 deletions(-)

diff --git a/user_guide_src/source/helpers/inflector_helper.rst b/user_guide_src/source/helpers/inflector_helper.rst
index fdc70a4cd92d..31e603b2941d 100755
--- a/user_guide_src/source/helpers/inflector_helper.rst
+++ b/user_guide_src/source/helpers/inflector_helper.rst
@@ -22,9 +22,9 @@ The following functions are available:
 
 .. php:function:: singular($string)
 
-    :param	string	$string: Input string
-    :returns:	A singular word
-    :rtype:	string
+    :param    string    $string: Input string
+    :returns:    A singular word
+    :rtype:    string
 
     Changes a plural word to singular. Example::
 
@@ -32,9 +32,9 @@ The following functions are available:
 
 .. php:function:: plural($string)
 
-    :param	string	$string: Input string
-    :returns:	A plural word
-    :rtype:	string
+    :param    string    $string: Input string
+    :returns:    A plural word
+    :rtype:    string
 
     Changes a singular word to plural. Example::
 
@@ -42,10 +42,10 @@ The following functions are available:
 
 .. php:function:: counted($count, $string)
 
-    :param	int 	$count:  Number of items
-    :param	string	$string: Input string
-    :returns:	A singular or plural phrase
-    :rtype:	string
+    :param    int     $count:  Number of items
+    :param    string    $string: Input string
+    :returns:    A singular or plural phrase
+    :rtype:    string
 
     Changes a word and its count to a phrase. Example::
 
@@ -53,9 +53,9 @@ The following functions are available:
 
 .. php:function:: camelize($string)
 
-    :param	string	$string: Input string
-    :returns:	Camel case string
-    :rtype:	string
+    :param    string    $string: Input string
+    :returns:    Camel case string
+    :rtype:    string
 
     Changes a string of words separated by spaces or underscores to camel
     case. Example::
@@ -64,9 +64,9 @@ The following functions are available:
 
 .. php:function:: pascalize($string)
 
-    :param	string	$string: Input string
-    :returns:	Pascal case string
-    :rtype:	string
+    :param    string    $string: Input string
+    :returns:    Pascal case string
+    :rtype:    string
 
     Changes a string of words separated by spaces or underscores to Pascal
     case, which is camel case with the first letter capitalized. Example::
@@ -75,9 +75,9 @@ The following functions are available:
 
 .. php:function:: underscore($string)
 
-    :param	string	$string: Input string
-    :returns:	String containing underscores instead of spaces
-    :rtype:	string
+    :param    string    $string: Input string
+    :returns:    String containing underscores instead of spaces
+    :rtype:    string
 
     Takes multiple words separated by spaces and underscores them.
     Example::
@@ -86,10 +86,10 @@ The following functions are available:
 
 .. php:function:: humanize($string[, $separator = '_'])
 
-    :param	string	$string: Input string
-    :param	string	$separator: Input separator
-    :returns:	Humanized string
-    :rtype:	string
+    :param    string    $string: Input string
+    :param    string    $separator: Input separator
+    :returns:    Humanized string
+    :rtype:    string
 
     Takes multiple words separated by underscores and adds spaces between
     them. Each word is capitalized.
@@ -104,9 +104,9 @@ The following functions are available:
 
 .. php:function:: is_pluralizable($word)
 
-    :param	string	$word: Input string
-    :returns:	true if the word is countable or false if not
-    :rtype:	bool
+    :param    string    $word: Input string
+    :returns:    true if the word is countable or false if not
+    :rtype:    bool
 
     Checks if the given word has a plural version. Example::
 
@@ -114,9 +114,9 @@ The following functions are available:
 
 .. php:function:: dasherize($string)
 
-    :param	string	$string: Input string
-    :returns:	Dasherized string
-    :rtype:	string
+    :param    string    $string: Input string
+    :returns:    Dasherized string
+    :rtype:    string
 
     Replaces underscores with dashes in the string. Example::
 
@@ -124,9 +124,9 @@ The following functions are available:
 
 .. php:function:: ordinal($integer)
 
-    :param	int	$integer: The integer to determine the suffix
-    :returns:	Ordinal suffix
-    :rtype:	string
+    :param    int    $integer: The integer to determine the suffix
+    :returns:    Ordinal suffix
+    :rtype:    string
 
     Returns the suffix that should be added to a
     number to denote the position such as
@@ -136,9 +136,9 @@ The following functions are available:
 
 .. php:function:: ordinalize($integer)
 
-    :param	int	$integer: The integer to ordinalize
-    :returns:	Ordinalized integer
-    :rtype:	string
+    :param    int    $integer: The integer to ordinalize
+    :returns:    Ordinalized integer
+    :rtype:    string
 
     Turns a number into an ordinal string used
     to denote the position such as 1st, 2nd, 3rd, 4th.
diff --git a/user_guide_src/source/libraries/files.rst b/user_guide_src/source/libraries/files.rst
index ba52138052f5..76b2e8a6acd8 100644
--- a/user_guide_src/source/libraries/files.rst
+++ b/user_guide_src/source/libraries/files.rst
@@ -54,32 +54,32 @@ In addition to all of the methods in the SplFileInfo class, you get some new too
 You can generate a cryptographically secure random filename, with the current timestamp prepended, with the ``getRandomName()``
 method. This is especially useful to rename files when moving it so that the filename is unguessable::
 
-	// Generates something like: 1465965676_385e33f741.jpg
-	$newName = $file->getRandomName();
+    // Generates something like: 1465965676_385e33f741.jpg
+    $newName = $file->getRandomName();
 
 **getSize()**
 
 Returns the size of the uploaded file in bytes::
 
-	$size     = $file->getSize(); // 256901
+    $size     = $file->getSize(); // 256901
 
 **getSizeByUnit()**
 
 Returns the size of the uploaded file default in bytes. You can pass in either 'kb' or 'mb' as the first parameter to get
 the results in kilobytes or megabytes, respectively::
 
-	$bytes     = $file->getSizeByUnit(); // 256901
-	$kilobytes = $file->getSizeByUnit('kb'); // 250.880
-	$megabytes = $file->getSizeByUnit('mb'); // 0.245
+    $bytes     = $file->getSizeByUnit(); // 256901
+    $kilobytes = $file->getSizeByUnit('kb'); // 250.880
+    $megabytes = $file->getSizeByUnit('mb'); // 0.245
 
 **getMimeType()**
 
 Retrieve the media type (mime type) of the file. Uses methods that are considered as secure as possible when determining
 the type of file::
 
-	$type = $file->getMimeType();
+    $type = $file->getMimeType();
 
-	echo $type; // image/png
+    echo $type; // image/png
 
 **guessExtension()**
 
@@ -87,8 +87,8 @@ Attempts to determine the file extension based on the trusted ``getMimeType()``
 will return null. This is often a more trusted source than simply using the extension provided by the filename. Uses
 the values in **app/Config/Mimes.php** to determine extension::
 
-	// Returns 'jpg' (WITHOUT the period)
-	$ext = $file->guessExtension();
+    // Returns 'jpg' (WITHOUT the period)
+    $ext = $file->guessExtension();
 
 Moving Files
 ------------
@@ -96,12 +96,12 @@ Moving Files
 Each file can be moved to its new location with the aptly named ``move()`` method. This takes the directory to move
 the file to as the first parameter::
 
-	$file->move(WRITEPATH.'uploads');
+    $file->move(WRITEPATH.'uploads');
 
 By default, the original filename was used. You can specify a new filename by passing it as the second parameter::
 
-	$newName = $file->getRandomName();
-	$file->move(WRITEPATH.'uploads', $newName);
+    $newName = $file->getRandomName();
+    $file->move(WRITEPATH.'uploads', $newName);
 
 The move() method returns a new File instance that for the relocated file, so you must capture the result if the
 resulting location is needed::
@@ -116,31 +116,31 @@ Working with groups of files can be cumbersome, so the framework supplies the ``
 locating and working with groups of files across the filesystem. At its most basic, ``FileCollection`` is an index
 of files you set or build::
 
-	$files = new FileCollection([
-		FCPATH . 'index.php',
-		ROOTPATH . 'spark',
-	]);
-	$files->addDirectory(APPPATH . 'Filters');
+    $files = new FileCollection([
+        FCPATH . 'index.php',
+        ROOTPATH . 'spark',
+    ]);
+    $files->addDirectory(APPPATH . 'Filters');
 
 After you have input the files you would like to work with you may remove files or use the filtering commands to remove
 or retain files matching a certain regex or glob-style pattern::
 
-	$files->removeFile(APPPATH . 'Filters/DevelopToolbar');
+    $files->removeFile(APPPATH . 'Filters/DevelopToolbar');
 
-	$files->removePattern('#\.gitkeep#');
-	$files->retainPattern('*.php');
+    $files->removePattern('#\.gitkeep#');
+    $files->retainPattern('*.php');
 
 When your collection is complete, you can use ``get()`` to retrieve the final list of file paths, or take advantage of
 ``FileCollection`` being countable and iterable to work directly with each ``File``::
 
-	echo 'My files: ' . implode(PHP_EOL, $files->get());
-	echo 'I have ' . count($files) . ' files!';
+    echo 'My files: ' . implode(PHP_EOL, $files->get());
+    echo 'I have ' . count($files) . ' files!';
 
-	foreach ($files as $file)
-	{
-		echo 'Moving ' . $file->getBasename() . ', ' . $file->getSizeByUnit('mb');
-		$file->move(WRITABLE . $file->getRandomName()); 
-	}
+    foreach ($files as $file)
+    {
+        echo 'Moving ' . $file->getBasename() . ', ' . $file->getSizeByUnit('mb');
+        $file->move(WRITABLE . $file->getRandomName());
+    }
 
 Below are the specific methods for working with a ``FileCollection``.
 
@@ -157,13 +157,13 @@ The constructor accepts an optional array of file paths to use as the initial co
 Allows child classes to define their own initial files. This method is called by the constructor and allows
 predefined collections without having to use their methods. Example::
 
-	class ConfigCollection extends \CodeIgniter\Files\FileCollection
-	{
-		protected function define(): void
-		{
-			$this->add(APPPATH . 'Config', true)->retainPattern('*.php');
-		}
-	}
+    class ConfigCollection extends \CodeIgniter\Files\FileCollection
+    {
+        protected function define(): void
+        {
+            $this->add(APPPATH . 'Config', true)->retainPattern('*.php');
+        }
+    }
 
 Now you may use the ``ConfigCollection`` anywhere in your project to access all App Config files without
 having to re-call the collection methods every time.
@@ -211,14 +211,14 @@ outside of ``$scope`` are always retained). When no scope is provided then all f
 
 Examples::
 
-	$files = new FileCollection();
-	$files->add(APPPATH . 'Config', true); // Adds all Config files and directories
+    $files = new FileCollection();
+    $files->add(APPPATH . 'Config', true); // Adds all Config files and directories
 
-	$files->removePattern('*tion.php'); // Would remove Encryption.php, Validation.php, and boot/production.php
-	$files->removePattern('*tion.php', APPPATH . 'Config/boot'); // Would only remove boot/production.php
+    $files->removePattern('*tion.php'); // Would remove Encryption.php, Validation.php, and boot/production.php
+    $files->removePattern('*tion.php', APPPATH . 'Config/boot'); // Would only remove boot/production.php
 
-	$files->retainPattern('#A.+php$#'); // Would keep only Autoload.php
-	$files->retainPattern('#d.+php$#', APPPATH . 'Config/boot'); // Would keep everything but boot/production.php and boot/testing.php
+    $files->retainPattern('#A.+php$#'); // Would keep only Autoload.php
+    $files->retainPattern('#d.+php$#', APPPATH . 'Config/boot'); // Would keep everything but boot/production.php and boot/testing.php
 
 Retrieving Files
 ================
diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index 0e4d540dd899..0a16f99e022a 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -17,7 +17,7 @@ as it runs as a filter and has no manual interaction.
 
 If you find a case where you do need direct access though, you may load it through the Services file::
 
-	$security = \Config\Services::security();
+    $security = \Config\Services::security();
 
 *********************************
 Cross-site request forgery (CSRF)
@@ -26,30 +26,30 @@ Cross-site request forgery (CSRF)
 You can enable CSRF protection by altering your **app/Config/Filters.php**
 and enabling the `csrf` filter globally::
 
-	public $globals = [
-		'before' => [
-			// 'honeypot',
-			'csrf',
-		],
-	];
+    public $globals = [
+        'before' => [
+            // 'honeypot',
+            'csrf',
+        ],
+    ];
 
 Select URIs can be whitelisted from CSRF protection (for example API
 endpoints expecting externally POSTed content). You can add these URIs
 by adding them as exceptions in the filter::
 
-	public $globals = [
-		'before' => [
-			'csrf' => ['except' => ['api/record/save']],
-		],
-	];
+    public $globals = [
+        'before' => [
+            'csrf' => ['except' => ['api/record/save']],
+        ],
+    ];
 
 Regular expressions are also supported (case-insensitive)::
 
     public $globals = [
-		'before' => [
-			'csrf' => ['except' => ['api/record/[0-9]+']],
-		],
-	];
+        'before' => [
+            'csrf' => ['except' => ['api/record/[0-9]+']],
+        ],
+    ];
 
 If you use the :doc:`form helper <../helpers/form_helper>`, then
 :func:`form_open()` will automatically insert a hidden csrf field in
@@ -57,13 +57,13 @@ your forms. If not, then you can use the always available ``csrf_token()``
 and ``csrf_hash()`` functions
 ::
 
-	<input type="hidden" name="<?= csrf_token() ?>" value="<?= csrf_hash() ?>" />
+    <input type="hidden" name="<?= csrf_token() ?>" value="<?= csrf_hash() ?>" />
 
 Additionally, you can use the ``csrf_field()`` method to generate this
 hidden input field for you::
 
-	// Generates: <input type="hidden" name="{csrf_token}" value="{csrf_hash}" />
-	<?= csrf_field() ?>
+    // Generates: <input type="hidden" name="{csrf_token}" value="{csrf_hash}" />
+    <?= csrf_field() ?>
 
 When sending a JSON request the CSRF token can also be passed as one of the parameters.
 The next way to pass the CSRF token is a special Http header that's name is available by
@@ -72,8 +72,8 @@ The next way to pass the CSRF token is a special Http header that's name is avai
 Additionally, you can use the ``csrf_meta()`` method to generate this handy
 meta tag for you::
 
-	// Generates: <meta name="{csrf_header}" content="{csrf_hash}" />
-	<?= csrf_meta() ?>
+    // Generates: <meta name="{csrf_header}" content="{csrf_hash}" />
+    <?= csrf_meta() ?>
 
 The order of checking the availability of the CSRF token is as follows:
 
@@ -89,14 +89,14 @@ navigation, multiple tabs/windows, asynchronous actions, etc). You
 may alter this behavior by editing the following config parameter value in
 **app/Config/Security.php**::
 
-	public $regenerate  = true;
+    public $regenerate  = true;
 
 When a request fails the CSRF validation check, it will redirect to the previous page by default,
 setting an ``error`` flash message that you can display to the end user. This provides a nicer experience
 than simply crashing. This can be turned off by editing the following config parameter value in
 **app/Config/Security.php**::
 
-	public $redirect = false;
+    public $redirect = false;
 
 Even when the redirect value is **true**, AJAX calls will not redirect, but will throw an error.
 
@@ -116,4 +116,4 @@ If it is acceptable for the user input to include relative paths, e.g., file/in/
 the second optional parameter, $relative_path to true.
 ::
 
-	$path = $security->sanitizeFilename($request->getVar('filepath'));
+    $path = $security->sanitizeFilename($request->getVar('filepath'));
diff --git a/user_guide_src/source/libraries/typography.rst b/user_guide_src/source/libraries/typography.rst
index e449c6371148..24e52419df35 100644
--- a/user_guide_src/source/libraries/typography.rst
+++ b/user_guide_src/source/libraries/typography.rst
@@ -28,51 +28,51 @@ The following functions are available:
 
 .. php:function:: autoTypography($str[, $reduce_linebreaks = false])
 
-	:param	string	$str: Input string
-	:param	bool	$reduce_linebreaks: Whether to reduce multiple instances of double newlines to two
-	:returns:	HTML-formatted typography-safe string
-	:rtype: string
+    :param    string    $str: Input string
+    :param    bool    $reduce_linebreaks: Whether to reduce multiple instances of double newlines to two
+    :returns:    HTML-formatted typography-safe string
+    :rtype: string
 
-	Formats text so that it is semantically and typographically correct
-	HTML.
+    Formats text so that it is semantically and typographically correct
+    HTML.
 
-	Usage example::
+    Usage example::
 
-		$string = $typography->autoTypography($string);
+        $string = $typography->autoTypography($string);
 
-	.. note:: Typographic formatting can be processor intensive, particularly if
-		you have a lot of content being formatted. If you choose to use this
-		function you may want to consider :doc:`caching <../general/caching>` your
-		pages.
+    .. note:: Typographic formatting can be processor intensive, particularly if
+        you have a lot of content being formatted. If you choose to use this
+        function you may want to consider :doc:`caching <../general/caching>` your
+        pages.
 
 **formatCharacters()**
 
 .. php:function:: formatCharacters($str)
 
-	:param	string	$str: Input string
-	:returns:	String with formatted characters.
-	:rtype:	string
+    :param    string    $str: Input string
+    :returns:    String with formatted characters.
+    :rtype:    string
 
-	This function mainly converts double and single quotes
-	to curly entities, but it also converts em-dashes,
-	double spaces, and ampersands.
+    This function mainly converts double and single quotes
+    to curly entities, but it also converts em-dashes,
+    double spaces, and ampersands.
 
-	Usage example::
+    Usage example::
 
-		$string = $typography->formatCharacters($string);
+        $string = $typography->formatCharacters($string);
 
 **nl2brExceptPre()**
 
 .. php:function:: nl2brExceptPre($str)
 
-	:param	string	$str: Input string
-	:returns:	String with HTML-formatted line breaks
-	:rtype:	string
+    :param    string    $str: Input string
+    :returns:    String with HTML-formatted line breaks
+    :rtype:    string
 
-	Converts newlines to <br /> tags unless they appear within <pre> tags.
-	This function is identical to the native PHP ``nl2br()`` function,
-	except that it ignores <pre> tags.
+    Converts newlines to <br /> tags unless they appear within <pre> tags.
+    This function is identical to the native PHP ``nl2br()`` function,
+    except that it ignores <pre> tags.
 
-	Usage example::
+    Usage example::
 
-		$string = $typography->nl2brExceptPre($string);
+        $string = $typography->nl2brExceptPre($string);
diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index c4067f3e8eb6..7a88c91ac4e7 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -6,7 +6,7 @@ CodeIgniter makes working with files uploaded through a form much simpler and mo
 array directly. This extends the :doc:`File class </libraries/files>` and thus gains all of the features of that class.
 
 .. note:: This is not the same as the File Uploading class in previous versions of CodeIgniter. This provides a raw
-	interface to the uploaded files with a few small features.
+    interface to the uploaded files with a few small features.
 
 .. contents::
     :local:
@@ -27,49 +27,49 @@ common interface.
 Files are accessed through the current ``IncomingRequest`` instance. To retrieve all files that were uploaded with this
 request, use ``getFiles()``. This will return an array of files represented by instances of ``CodeIgniter\HTTP\Files\UploadedFile``::
 
-	$files = $this->request->getFiles();
+    $files = $this->request->getFiles();
 
 Of course, there are multiple ways to name the file input, and anything but the simplest can create strange results.
 The array returns in a manner that you would expect. With the simplest usage, a single file might be submitted like::
 
-	<input type="file" name="avatar" />
+    <input type="file" name="avatar" />
 
 Which would return a simple array like::
 
-	[
-		'avatar' => // UploadedFile instance
-	]
+    [
+        'avatar' => // UploadedFile instance
+    ]
 
 If you used an array notation for the name, the input would look something like::
 
-	<input type="file" name="my-form[details][avatar]" />
+    <input type="file" name="my-form[details][avatar]" />
 
 The array returned by ``getFiles()`` would look more like this::
 
-	[
-		'my-form' => [
-			'details' => [
-				'avatar' => // UploadedFile instance
-			]
-		]
-	]
+    [
+        'my-form' => [
+            'details' => [
+                'avatar' => // UploadedFile instance
+            ]
+        ]
+    ]
 
 In some cases, you may specify an array of files to upload::
 
-	Upload an avatar: <input type="file" name="my-form[details][avatars][]" />
-	Upload an avatar: <input type="file" name="my-form[details][avatars][]" />
+    Upload an avatar: <input type="file" name="my-form[details][avatars][]" />
+    Upload an avatar: <input type="file" name="my-form[details][avatars][]" />
 
 In this case, the returned array of files would be more like::
 
-	[
-		'my-form' => [
-			'details' => [
-				'avatar' => [
-					0 => /* UploadedFile instance */,
-					1 => /* UploadedFile instance */
-			]
-		]
-	]
+    [
+        'my-form' => [
+            'details' => [
+                'avatar' => [
+                    0 => /* UploadedFile instance */,
+                    1 => /* UploadedFile instance */
+            ]
+        ]
+    ]
 
 Single File
 -----------
@@ -81,22 +81,22 @@ Simplest usage
 
 With the simplest usage, a single file might be submitted like::
 
-	<input type="file" name="userfile" />
+    <input type="file" name="userfile" />
 
 Which would return a simple file instance like::
 
-	$file = $this->request->getFile('userfile');
+    $file = $this->request->getFile('userfile');
 
 Array notation
 ^^^^^^^^^^^^^^
 
 If you used an array notation for the name, the input would look something like::
 
-	<input type="file" name="my-form[details][avatar]" />
+    <input type="file" name="my-form[details][avatar]" />
 
 For get the file instance::
 
-	$file = $this->request->getFile('my-form.details.avatar');
+    $file = $this->request->getFile('my-form.details.avatar');
 
 Multiple files
 ^^^^^^^^^^^^^^
@@ -110,10 +110,10 @@ In controller::
     {
        foreach($imagefile['images'] as $img)
        {
-			if ($img->isValid() && ! $img->hasMoved()) {
-				$newName = $img->getRandomName();
-				$img->move(WRITEPATH.'uploads', $newName);
-			}
+            if ($img->isValid() && ! $img->hasMoved()) {
+                $newName = $img->getRandomName();
+                $img->move(WRITEPATH.'uploads', $newName);
+            }
        }
     }
 
@@ -122,23 +122,23 @@ where the **images** is a loop from the form field name
 If there are multiple files with the same name you can use ``getFile()`` ro retrieve every file individually::
 In controller::
 
-	$file1 = $this->request->getFile('images.0');
-	$file2 = $this->request->getFile('images.1');
+    $file1 = $this->request->getFile('images.0');
+    $file2 = $this->request->getFile('images.1');
 
 You might find it easier to use ``getFileMultiple()``, to get an array of uploaded files with the same name::
 
-	$files = $this->request->getFileMultiple('images');
+    $files = $this->request->getFileMultiple('images');
 
 
 Another example::
 
-	Upload an avatar: <input type="file" name="my-form[details][avatars][]" />
-	Upload an avatar: <input type="file" name="my-form[details][avatars][]" />
+    Upload an avatar: <input type="file" name="my-form[details][avatars][]" />
+    Upload an avatar: <input type="file" name="my-form[details][avatars][]" />
 
 In controller::
 
-	$file1 = $this->request->getFile('my-form.details.avatars.0');
-	$file2 = $this->request->getFile('my-form.details.avatars.1');
+    $file1 = $this->request->getFile('my-form.details.avatars.0');
+    $file2 = $this->request->getFile('my-form.details.avatars.1');
 
 .. note:: using ``getFiles()`` is more appropriate
 
@@ -154,9 +154,9 @@ Verify A File
 
 You can check that a file was actually uploaded via HTTP with no errors by calling the ``isValid()`` method::
 
-	if (! $file->isValid()) {
-		throw new \RuntimeException($file->getErrorString().'('.$file->getError().')');
-	}
+    if (! $file->isValid()) {
+        throw new \RuntimeException($file->getErrorString().'('.$file->getError().')');
+    }
 
 As seen in this example, if a file had an upload error, you can retrieve the error code (an integer) and the error
 message with the ``getError()`` and ``getErrorString()`` methods. The following errors can be discovered through
@@ -179,7 +179,7 @@ You can retrieve the original filename provided by the client with the ``getName
 filename sent by the client, and should not be trusted. If the file has been moved, this will return the final name of
 the moved file::
 
-	$name = $file->getName();
+    $name = $file->getName();
 
 **getClientName()**
 
@@ -191,7 +191,7 @@ Always returns the original name of the uploaded file as sent by the client, eve
 
 To get the full path of the temp file that was created during the upload, you can use the ``getTempName()`` method::
 
-	$tempfile = $file->getTempName();
+    $tempfile = $file->getTempName();
 
 Other File Info
 ---------------
@@ -201,16 +201,16 @@ Other File Info
 Returns the original file extension, based on the file name that was uploaded. This is NOT a trusted source. For a
 trusted version, use ``guessExtension()`` instead::
 
-	$ext = $file->getClientExtension();
+    $ext = $file->getClientExtension();
 
 **getClientMimeType()**
 
 Returns the mime type (mime type) of the file as provided by the client. This is NOT a trusted value. For a trusted
 version, use ``getMimeType()`` instead::
 
-	$type = $file->getClientMimeType();
+    $type = $file->getClientMimeType();
 
-	echo $type; // image/png
+    echo $type; // image/png
 
 Moving Files
 ------------
@@ -218,12 +218,12 @@ Moving Files
 Each file can be moved to its new location with the aptly named ``move()`` method. This takes the directory to move
 the file to as the first parameter::
 
-	$file->move(WRITEPATH.'uploads');
+    $file->move(WRITEPATH.'uploads');
 
 By default, the original filename was used. You can specify a new filename by passing it as the second parameter::
 
-	$newName = $file->getRandomName();
-	$file->move(WRITEPATH.'uploads', $newName);
+    $newName = $file->getRandomName();
+    $file->move(WRITEPATH.'uploads', $newName);
 
 Once the file has been removed the temporary file is deleted. You can check if a file has been moved already with
 the ``hasMoved()`` method, which returns a boolean::
@@ -245,17 +245,17 @@ Each file can be moved to its new location with the aptly named ``store()`` meth
 
 With the simplest usage, a single file might be submitted like::
 
-	<input type="file" name="userfile" />
+    <input type="file" name="userfile" />
 
 By default, upload files are saved in writable/uploads directory. The YYYYMMDD folder
 and random file name will be created. Returns a file path::
 
-	$path = $this->request->getFile('userfile')->store();
+    $path = $this->request->getFile('userfile')->store();
 
 You can specify a directory to move the file to as the first parameter. A new filename by
 passing it as the second parameter::
 
-	$path = $this->request->getFile('userfile')->store('head_img/', 'user_name.jpg');
+    $path = $this->request->getFile('userfile')->store('head_img/', 'user_name.jpg');
 
 Moving an uploaded file can fail, with an HTTPException, under several circumstances:
 

From 4aa04fbce4aaaf571e42d1a61a230e7d032389ed Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 26 Sep 2021 10:38:44 +0900
Subject: [PATCH 0313/2325] fix: fixed the problem that _createTable does not
 take into account that it returns true.

---
 system/Database/Forge.php                     |  2 +
 .../system/Database/Forge/CreateTableTest.php | 42 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 tests/system/Database/Forge/CreateTableTest.php

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index c05b0c760876..1fdb63ac8bb6 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -466,6 +466,8 @@ public function createTable(string $table, bool $ifNotExists = false, array $att
 
                 return false;
             }
+
+            return true;
         }
 
         if (($result = $this->db->query($sql)) !== false) {
diff --git a/tests/system/Database/Forge/CreateTableTest.php b/tests/system/Database/Forge/CreateTableTest.php
new file mode 100644
index 000000000000..1138ef525924
--- /dev/null
+++ b/tests/system/Database/Forge/CreateTableTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Forge;
+
+use CodeIgniter\Database\Forge;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\Mock\MockConnection;
+
+/**
+ * @internal
+ */
+final class CreateTableTest extends CIUnitTestCase
+{
+    public function testCreateTableWithExists()
+    {
+        $dbMock = $this->getMockBuilder(MockConnection::class)
+            ->setConstructorArgs([[]])
+            ->setMethods(['listTables'])
+            ->getMock();
+        $dbMock->expects($this->any())
+            ->method('listTables')
+            ->willReturn(['foo']);
+
+        $forge                          = new class ($dbMock) extends Forge {
+            protected $createTableIfStr = false;
+        };
+
+        $forge->addField('id');
+        $actual = $forge->createTable('foo', true);
+
+        $this->assertTrue($actual);
+    }
+}

From 851c04d3324d7395ba81e828691668fe2805f565 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 26 Sep 2021 20:19:15 +0900
Subject: [PATCH 0314/2325] Fix Forge test

---
 system/Database/Forge.php                       | 2 +-
 tests/system/Database/Forge/CreateTableTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 1fdb63ac8bb6..8a0666a9d1af 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -489,7 +489,7 @@ public function createTable(string $table, bool $ifNotExists = false, array $att
     }
 
     /**
-     * @return mixed
+     * @return bool|string
      */
     protected function _createTable(string $table, bool $ifNotExists, array $attributes)
     {
diff --git a/tests/system/Database/Forge/CreateTableTest.php b/tests/system/Database/Forge/CreateTableTest.php
index 1138ef525924..1a1f521c3cbb 100644
--- a/tests/system/Database/Forge/CreateTableTest.php
+++ b/tests/system/Database/Forge/CreateTableTest.php
@@ -24,7 +24,7 @@ public function testCreateTableWithExists()
     {
         $dbMock = $this->getMockBuilder(MockConnection::class)
             ->setConstructorArgs([[]])
-            ->setMethods(['listTables'])
+            ->onlyMethods(['listTables'])
             ->getMock();
         $dbMock->expects($this->any())
             ->method('listTables')

From 09e876c85dc6125654fc6bf85f50bbe9dedb2eba Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Sun, 26 Sep 2021 15:07:12 +0200
Subject: [PATCH 0315/2325] Adjust orange color in debug toolbar

---
 admin/css/debug-toolbar/_theme-dark.scss  | 2 +-
 admin/css/debug-toolbar/_theme-light.scss | 2 +-
 system/Debug/Toolbar/Views/toolbar.css    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/css/debug-toolbar/_theme-dark.scss b/admin/css/debug-toolbar/_theme-dark.scss
index b41e8fb086af..801b75664f22 100644
--- a/admin/css/debug-toolbar/_theme-dark.scss
+++ b/admin/css/debug-toolbar/_theme-dark.scss
@@ -55,7 +55,7 @@
     // Tables
     table {
         strong {
-            color: $m-orange;
+            color: $g-orange;
         }
 
         tbody tr {
diff --git a/admin/css/debug-toolbar/_theme-light.scss b/admin/css/debug-toolbar/_theme-light.scss
index 7148cd4c4f6f..41dbb9175fde 100644
--- a/admin/css/debug-toolbar/_theme-light.scss
+++ b/admin/css/debug-toolbar/_theme-light.scss
@@ -55,7 +55,7 @@
     // Tables
     table {
         strong {
-            color: $m-orange;
+            color: $g-orange;
         }
 
         tbody tr {
diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
index 34b686385fd7..92ab89f85164 100644
--- a/system/Debug/Toolbar/Views/toolbar.css
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -379,7 +379,7 @@
     #debug-bar button {
       background-color: #252525; }
     #debug-bar table strong {
-      color: #FDC894; }
+      color: #DD8615; }
     #debug-bar table tbody tr:hover {
       background-color: #434343; }
     #debug-bar table tbody tr.current {

From 89ea7c3eca779f37774575bd814e01d05367ba9e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 27 Sep 2021 19:28:41 +0900
Subject: [PATCH 0316/2325] docs: replace tabs with spaces

---
 user_guide_src/source/helpers/date_helper.rst | 18 ++++-----
 .../source/helpers/number_helper.rst          | 18 ++++-----
 .../source/helpers/security_helper.rst        | 18 ++++-----
 .../source/incoming/incomingrequest.rst       | 40 +++++++++----------
 user_guide_src/source/intro/index.rst         | 12 +++---
 .../source/libraries/pagination.rst           | 16 ++++----
 user_guide_src/source/models/model.rst        | 10 ++---
 user_guide_src/source/tutorial/index.rst      | 12 +++---
 8 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/user_guide_src/source/helpers/date_helper.rst b/user_guide_src/source/helpers/date_helper.rst
index 0b7aeead3329..876a09bfbae6 100644
--- a/user_guide_src/source/helpers/date_helper.rst
+++ b/user_guide_src/source/helpers/date_helper.rst
@@ -22,9 +22,9 @@ The following functions are available:
 
 .. php:function:: now([$timezone = null])
 
-    :param	string	$timezone: Timezone
-    :returns:	UNIX timestamp
-    :rtype:	int
+    :param    string    $timezone: Timezone
+    :returns:    UNIX timestamp
+    :rtype:    int
 
     Returns the current time as a UNIX timestamp, referenced either to your server's
     local time or any PHP supported timezone, based on the "time reference" setting
@@ -41,12 +41,12 @@ The following functions are available:
 
 .. php:function:: timezone_select([$class = '', $default = '', $what = \DateTimeZone::ALL, $country = null])
 
-    :param	string	$class: Optional class to apply to the select field
-    :param	string	$default: Default value for initial selection
-    :param	int	$what: DateTimeZone class constants (see `listIdentifiers <https://www.php.net/manual/en/datetimezone.listidentifiers.php>`_)
-    :param	string	$country: A two-letter ISO 3166-1 compatible country code (see `listIdentifiers <https://www.php.net/manual/en/datetimezone.listidentifiers.php>`_)
-    :returns:	Preformatted HTML select field
-    :rtype:	string
+    :param    string    $class: Optional class to apply to the select field
+    :param    string    $default: Default value for initial selection
+    :param    int    $what: DateTimeZone class constants (see `listIdentifiers <https://www.php.net/manual/en/datetimezone.listidentifiers.php>`_)
+    :param    string    $country: A two-letter ISO 3166-1 compatible country code (see `listIdentifiers <https://www.php.net/manual/en/datetimezone.listidentifiers.php>`_)
+    :returns:    Preformatted HTML select field
+    :rtype:    string
 
     Generates a `select` form field of available timezones (optionally filtered by `$what` and `$country`).
     You can supply an option class to apply to the field to make formatting easier, as well as a default
diff --git a/user_guide_src/source/helpers/number_helper.rst b/user_guide_src/source/helpers/number_helper.rst
index ae5f8238b156..eeca3a00614f 100644
--- a/user_guide_src/source/helpers/number_helper.rst
+++ b/user_guide_src/source/helpers/number_helper.rst
@@ -29,10 +29,10 @@ The following functions are available:
 
 .. php:function:: number_to_size($num[, $precision = 1[, $locale = null])
 
-    :param	mixed	$num: Number of bytes
-    :param	int	$precision: Floating point precision
-    :returns:	Formatted data size string, or false if the provided value is not numeric
-    :rtype:	string
+    :param      mixed     $num: Number of bytes
+    :param      int       $precision: Floating point precision
+    :returns:   Formatted data size string, or false if the provided value is not numeric
+    :rtype:     string
 
     Formats numbers as bytes, based on size, and adds the appropriate
     suffix. Examples::
@@ -64,11 +64,11 @@ The following functions are available:
 
 .. php:function:: number_to_amount($num[, $precision = 1[, $locale = null])
 
-    :param	mixed	$num: Number to format
-    :param	int	$precision: Floating point precision
-    :param  string $locale: The locale to use for formatting
-    :returns:	A human-readable version of the string, or false if the provided value is not numeric
-    :rtype:	string
+    :param      mixed     $num: Number to format
+    :param      int       $precision: Floating point precision
+    :param      string    $locale: The locale to use for formatting
+    :returns:   A human-readable version of the string, or false if the provided value is not numeric
+    :rtype:     string
 
     Converts a number into a human-readable version, like **123.4 trillion**
     for numbers up to the quadrillions. Examples::
diff --git a/user_guide_src/source/helpers/security_helper.rst b/user_guide_src/source/helpers/security_helper.rst
index 87b7eae51560..b0d93bf81eec 100644
--- a/user_guide_src/source/helpers/security_helper.rst
+++ b/user_guide_src/source/helpers/security_helper.rst
@@ -21,9 +21,9 @@ The following functions are available:
 
 .. php:function:: sanitize_filename($filename)
 
-    :param	string	$filename: Filename
-    :returns:	Sanitized file name
-    :rtype:	string
+    :param    string    $filename: Filename
+    :returns:    Sanitized file name
+    :rtype:    string
 
     Provides protection against directory traversal.
 
@@ -33,9 +33,9 @@ The following functions are available:
 
 .. php:function:: strip_image_tags($str)
 
-    :param	string	$str: Input string
-    :returns:	The input string with no image tags
-    :rtype:	string
+    :param    string    $str: Input string
+    :returns:    The input string with no image tags
+    :rtype:    string
 
     This is a security function that will strip image tags from a string.
     It leaves the image URL as plain text.
@@ -46,9 +46,9 @@ The following functions are available:
 
 .. php:function:: encode_php_tags($str)
 
-    :param	string	$str: Input string
-    :returns:	Safely formatted string
-    :rtype:	string
+    :param    string    $str: Input string
+    :returns:    Safely formatted string
+    :rtype:    string
 
     This is a security function that converts PHP tags to entities.
 
diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index 50b152d5dd14..e9f494961233 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -272,15 +272,15 @@ You can work with the current URI string (the path relative to your baseURL) usi
 Note that this relative path on the shared instance of ``IncomingRequest`` is what the :doc:`URL Helper </helpers/url_helper>`
 functions use, so this is a helpful way to "spoof" an incoming request for testing::
 
-	class MyMenuTest extends CIUnitTestCase
-	{
-		public function testActiveLinkUsesCurrentUrl()
-		{
-			service('request')->setPath('users/list');
-			$menu = new MyMenu();
-			$this->assertTrue('users/list', $menu->getActiveLink());
-		}
-	}
+    class MyMenuTest extends CIUnitTestCase
+    {
+        public function testActiveLinkUsesCurrentUrl()
+        {
+            service('request')->setPath('users/list');
+            $menu = new MyMenu();
+            $this->assertTrue('users/list', $menu->getActiveLink());
+        }
+    }
 
 Uploaded Files
 --------------
@@ -476,13 +476,13 @@ The methods provided by the parent classes that are available are:
     .. php:method:: getCookie([$index = null[, $filter = null[, $flags = null]]])
         :noindex:
 
-        :param	mixed	$index: COOKIE name
+        :param    mixed    $index: COOKIE name
         :param  int     $filter: The type of filter to apply. A list of filters can be
                         found `here <https://www.php.net/manual/en/filter.filters.php>`__.
         :param  int     $flags: Flags to apply. A list of flags can be found
                         `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
-        :returns:	    $_COOKIE if no parameters supplied, otherwise the COOKIE value if found or null if not
-        :rtype:	mixed
+        :returns:        $_COOKIE if no parameters supplied, otherwise the COOKIE value if found or null if not
+        :rtype:    mixed
 
         This method is identical to ``getPost()`` and ``getGet()``, only it fetches cookie data::
 
@@ -500,13 +500,13 @@ The methods provided by the parent classes that are available are:
     .. php:method:: getServer([$index = null[, $filter = null[, $flags = null]]])
         :noindex:
 
-        :param	mixed	$index: Value name
+        :param    mixed    $index: Value name
         :param  int     $filter: The type of filter to apply. A list of filters can be
                         found `here <https://www.php.net/manual/en/filter.filters.php>`__.
         :param  int     $flags: Flags to apply. A list of flags can be found
                         `here <https://www.php.net/manual/en/filter.filters.flags.php>`__.
-        :returns:	    $_SERVER item value if found, null if not
-        :rtype:	mixed
+        :returns:        $_SERVER item value if found, null if not
+        :rtype:    mixed
 
         This method is identical to the ``getPost()``, ``getGet()`` and ``getCookie()``
         methods, only it fetches getServer data (``$_SERVER``)::
@@ -532,17 +532,17 @@ The methods provided by the parent classes that are available are:
 
     .. php:method:: getPath()
 
-        :returns:	    The current URI path relative to ``$_SERVER['SCRIPT_NAME']``
-        :rtype:	string
+        :returns:        The current URI path relative to ``$_SERVER['SCRIPT_NAME']``
+        :rtype:    string
 
         This is the safest method to determine the "current URI", since ``IncomingRequest::$uri``
         may not be aware of the complete App configuration for base URLs.
 
     .. php:method:: setPath($path)
 
-        :param	string	$path: The relative path to use as the current URI
-        :returns:	    This Incoming Request
-        :rtype:	IncomingRequest
+        :param    string    $path: The relative path to use as the current URI
+        :returns:        This Incoming Request
+        :rtype:    IncomingRequest
 
         Used mostly just for testing purposes, this allows you to set the relative path
         value for the current request instead of relying on URI detection. This will also
diff --git a/user_guide_src/source/intro/index.rst b/user_guide_src/source/intro/index.rst
index 1aa920d86838..2a815c7d6d2b 100644
--- a/user_guide_src/source/intro/index.rst
+++ b/user_guide_src/source/intro/index.rst
@@ -37,10 +37,10 @@ CodeIgniter is right for you if:
 -  You need clear, thorough documentation.
 
 .. toctree::
-	:hidden:
-	:titlesonly:
+    :hidden:
+    :titlesonly:
 
-	self
-	requirements
-	credits
-	psr
+    self
+    requirements
+    credits
+    psr
diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index dc5b605c8d72..8b47ac046d1f 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -154,9 +154,9 @@ Please note: ``$segment`` value cannot be greater than the number of URI segment
 
 If you in need to show many pagers on one page then additional parameter which will define a group could be helpful::
 
-	$pager = service('pager');
-	$pager->setPath('path/for/my-group', 'my-group'); // Additionally you could define path for every group.
-	$pager->makeLinks($page, $perPage, $total, 'template_name', $segment, 'my-group');
+    $pager = service('pager');
+    $pager->setPath('path/for/my-group', 'my-group'); // Additionally you could define path for every group.
+    $pager->makeLinks($page, $perPage, $total, 'template_name', $segment, 'my-group');
 
 Pagination library uses *page* query parameter for HTTP queries by default (if no group or *default* group name given) or *page_[groupName]* for custom group names.
 
@@ -301,11 +301,11 @@ result set.
 Returns an array of data about all of the numbered links. Each link's array contains the uri for the link, the
 title, which is just the number, and a boolean that tells whether the link is the current/active link or not::
 
-	$link = [
-		'active' => false,
-		'uri'    => 'http://example.com/foo?page=2',
-		'title'  => 1,
-	];
+    $link = [
+        'active' => false,
+        'uri'    => 'http://example.com/foo?page=2',
+        'title'  => 1,
+    ];
 
 In the code presented for the standard pagination structure, the methods ``getPrevious()`` and ``getNext()`` are used to obtain the links to the previous and next pagination groups respectively.
 
diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index 8326f6e84bcc..18545f92f1bf 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -85,13 +85,13 @@ extra steps without repeating the constructor parameters, for example extending
 
     class UserModel extends UserAuthModel
     {
-    	/**
-    	 * Called during initialization. Appends
-    	 * our custom field to the module's model.
-    	 */
+        /**
+         * Called during initialization. Appends
+         * our custom field to the module's model.
+         */
         protected function initialize()
         {
-        	$this->allowedFields[] = 'middlename';
+            $this->allowedFields[] = 'middlename';
         }
     }
 
diff --git a/user_guide_src/source/tutorial/index.rst b/user_guide_src/source/tutorial/index.rst
index 052ed9fa21d5..ab9e30ebad0d 100644
--- a/user_guide_src/source/tutorial/index.rst
+++ b/user_guide_src/source/tutorial/index.rst
@@ -42,13 +42,13 @@ through the following pages:
 Enjoy your exploration of the CodeIgniter framework.
 
 .. toctree::
-	:hidden:
-	:titlesonly:
+    :hidden:
+    :titlesonly:
 
-	static_pages
-	news_section
-	create_news_items
-	conclusion
+    static_pages
+    news_section
+    create_news_items
+    conclusion
 
 Getting Up and Running
 **********************

From d31e4396da39aad6066fe1329d5e710165e0e462 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Sep 2021 17:56:32 +0000
Subject: [PATCH 0317/2325] chore(deps-dev): update rector/rector requirement
 from 0.11.53 to 0.11.54 (#5144)

---
 composer.json                           | 2 +-
 system/Session/Handlers/BaseHandler.php | 6 +-----
 system/Session/Session.php              | 6 +-----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index 25ec1512ad23..5fc0bd26792a 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^0.12.91",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.53",
+        "rector/rector": "0.11.54",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {
diff --git a/system/Session/Handlers/BaseHandler.php b/system/Session/Handlers/BaseHandler.php
index 984b0fe7c3f6..f6fa57b23b68 100644
--- a/system/Session/Handlers/BaseHandler.php
+++ b/system/Session/Handlers/BaseHandler.php
@@ -121,11 +121,7 @@ protected function destroyCookie(): bool
         return setcookie(
             $this->cookieName,
             '',
-            1,
-            $this->cookiePath,
-            $this->cookieDomain,
-            $this->cookieSecure,
-            true
+            ['expires' => 1, 'path' => $this->cookiePath, 'domain' => $this->cookieDomain, 'secure' => $this->cookieSecure, 'httponly' => true]
         );
     }
 
diff --git a/system/Session/Session.php b/system/Session/Session.php
index 5fc1bda6005e..abeed407425b 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -271,11 +271,7 @@ public function stop()
         setcookie(
             $this->sessionCookieName,
             session_id(),
-            1,
-            $this->cookie->getPath(),
-            $this->cookie->getDomain(),
-            $this->cookie->isSecure(),
-            true
+            ['expires' => 1, 'path' => $this->cookie->getPath(), 'domain' => $this->cookie->getDomain(), 'secure' => $this->cookie->isSecure(), 'httponly' => true]
         );
 
         session_regenerate_id(true);

From 1e0d2b453e31667fdaa334bf0a7c96f9606f6bfa Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 28 Sep 2021 11:03:47 +0900
Subject: [PATCH 0318/2325] docs: fix sample code in user_agent.rst

* docs: fix sample code

* docs: fix sample code style
---
 user_guide_src/source/libraries/user_agent.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/libraries/user_agent.rst b/user_guide_src/source/libraries/user_agent.rst
index 327a943f9749..576798bf4b2a 100644
--- a/user_guide_src/source/libraries/user_agent.rst
+++ b/user_guide_src/source/libraries/user_agent.rst
@@ -40,9 +40,9 @@ is available::
     $agent = $this->request->getUserAgent();
 
     if ($agent->isBrowser()) {
-        $currentAgent = $agent->getBrowser().' '.$agent->getVersion();
+        $currentAgent = $agent->getBrowser() . ' ' . $agent->getVersion();
     } elseif ($agent->isRobot()) {
-        $currentAgent = $this->agent->robot();
+        $currentAgent = $agent->getRobot();
     } elseif ($agent->isMobile()) {
         $currentAgent = $agent->getMobile();
     } else {

From 8593c8eb018711022961fd27297804d36897eb04 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 28 Sep 2021 11:04:48 +0900
Subject: [PATCH 0319/2325] docs: replace tabs with spaces

---
 user_guide_src/README.rst                     | 42 +++++++++----------
 user_guide_src/source/helpers/test_helper.rst |  8 ++--
 user_guide_src/source/helpers/url_helper.rst  | 16 +++----
 user_guide_src/source/incoming/request.rst    |  6 +--
 user_guide_src/source/incoming/routing.rst    |  6 +--
 .../source/installation/upgrade_412.rst       | 14 +++----
 user_guide_src/source/libraries/throttler.rst |  8 ++--
 7 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/user_guide_src/README.rst b/user_guide_src/README.rst
index 7388e1104428..777ebb180530 100644
--- a/user_guide_src/README.rst
+++ b/user_guide_src/README.rst
@@ -22,15 +22,15 @@ or ``python3``.
 
 .. code-block:: bash
 
-	python --version
-	Python 2.7.17
+    python --version
+    Python 2.7.17
 
-	python3 --version
-	Python 3.6.9
+    python3 --version
+    Python 3.6.9
 
-	# For Windows using the Python Launcher
-	py -3 --version
-	Python 3.8.1
+    # For Windows using the Python Launcher
+    py -3 --version
+    Python 3.8.1
 
 If you're not on 3.5+, go ahead and install the latest 3.x version from
 `Python.org <https://www.python.org/downloads/>`_. Linux users should use their
@@ -48,15 +48,15 @@ Please take note that it should say ``python 3.x`` at the very end.
 
 .. code-block:: bash
 
-	pip --version
-	pip 9.0.1 from /usr/lib/python2.7/dist-packages (python 2.7)
+    pip --version
+    pip 9.0.1 from /usr/lib/python2.7/dist-packages (python 2.7)
 
-	pip3 --version
-	pip 9.0.1 from /usr/lib/python3/dist-packages (python 3.6)
+    pip3 --version
+    pip 9.0.1 from /usr/lib/python3/dist-packages (python 3.6)
 
-	# For Windows using the Python Launcher
-	py -3 -m pip --version
-	pip 20.0.2 from C:\Users\<username>\AppData\Local\Programs\Python\Python38\lib\site-packages\pip (python 3.8)
+    # For Windows using the Python Launcher
+    py -3 -m pip --version
+    pip 20.0.2 from C:\Users\<username>\AppData\Local\Programs\Python\Python38\lib\site-packages\pip (python 3.8)
 
 Linux
 ^^^^^
@@ -79,19 +79,19 @@ window as Python won't find all applications we just installed othervise.
 
 .. code-block:: bash
 
-	pip install -r user_guide_src/requirements.txt
+    pip install -r user_guide_src/requirements.txt
 
-	pip3 install -r user_guide_src/requirements.txt
+    pip3 install -r user_guide_src/requirements.txt
 
-	# For Windows using the Python Launcher
-	py -3 -m pip install -r user_guide_src/requirements.txt
+    # For Windows using the Python Launcher
+    py -3 -m pip install -r user_guide_src/requirements.txt
 
 It's time to wrap things up and generate the documentation.
 
 .. code-block:: bash
 
-	cd user_guide_src
-	make html
+    cd user_guide_src
+    make html
 
 Editing and Creating Documentation
 ==================================
@@ -111,7 +111,7 @@ you to regenerate as necessary if you want to "preview" your work. Generating
 the HTML is very simple. From the root directory of your user guide repo
 fork issue the command you used at the end of the installation instructions::
 
-	make html
+    make html
 
 You will see it do a whiz-bang compilation, at which point the fully rendered
 user guide and images will be in *build/html/*. After the HTML has been built,
diff --git a/user_guide_src/source/helpers/test_helper.rst b/user_guide_src/source/helpers/test_helper.rst
index 3261110c1588..4d98f005fb0a 100644
--- a/user_guide_src/source/helpers/test_helper.rst
+++ b/user_guide_src/source/helpers/test_helper.rst
@@ -21,10 +21,10 @@ The following functions are available:
 
 .. php:function:: fake($model, array $overrides = null)
 
-    :param	Model|object|string	$model: Instance or name of the model to use with Fabricator
-    :param	array|null $overrides: Overriding data to pass to Fabricator::setOverrides()
-    :returns:	A random fake item created and added to the database by Fabricator
-    :rtype:	object|array
+    :param    Model|object|string    $model: Instance or name of the model to use with Fabricator
+    :param    array|null $overrides: Overriding data to pass to Fabricator::setOverrides()
+    :returns:    A random fake item created and added to the database by Fabricator
+    :rtype:    object|array
 
     Uses ``CodeIgniter\Test\Fabricator`` to create a random item and add it to the database.
 
diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst
index 16cd6e4534df..780becac13d8 100644
--- a/user_guide_src/source/helpers/url_helper.rst
+++ b/user_guide_src/source/helpers/url_helper.rst
@@ -23,7 +23,7 @@ The following functions are available:
     :param  string        $protocol: Protocol, e.g., 'http' or 'https'
     :param  \\Config\\App $altConfig: Alternate configuration to use
     :returns: Site URL
-    :rtype:	string
+    :rtype:    string
 
     Returns your site URL, as specified in your config file. The index.php
     file (or whatever you have set as your site **indexPage** in your config
@@ -83,10 +83,10 @@ The following functions are available:
 
 .. php:function:: current_url([$returnObject = false[, $request = null]])
 
-    :param	boolean	$returnObject: True if you would like a URI instance returned, instead of a string.
-    :param	IncomingRequest|null	$request: An alternate request to use for path detection; useful for testing.
+    :param    boolean    $returnObject: True if you would like a URI instance returned, instead of a string.
+    :param    IncomingRequest|null    $request: An alternate request to use for path detection; useful for testing.
     :returns: The current URL
-    :rtype:	string|\\CodeIgniter\\HTTP\\URI
+    :rtype:    string|\\CodeIgniter\\HTTP\\URI
 
     Returns the full URL (including segments) of the page being currently
     viewed.
@@ -113,9 +113,9 @@ The following functions are available:
 
 .. php:function:: uri_string([$relative = false])
 
-    :param	boolean	$relative: True if you would like the string relative to baseURL
+    :param    boolean    $relative: True if you would like the string relative to baseURL
     :returns: A URI string
-    :rtype:	string
+    :rtype:    string
 
     Returns the path part of the current URL.
     For example, if your URL was this::
@@ -137,7 +137,7 @@ The following functions are available:
 
     :param \\Config\\App $altConfig: Alternate configuration to use
     :returns: 'index_page' value
-    :rtype:	string
+    :rtype:    string
 
     Returns your site **indexPage**, as specified in your config file.
     Example::
@@ -156,7 +156,7 @@ The following functions are available:
     :param  mixed         $attributes: HTML attributes
     :param  \\Config\\App $altConfig: Alternate configuration to use
     :returns: HTML hyperlink (anchor tag)
-    :rtype:	string
+    :rtype:    string
 
     Creates a standard HTML anchor link based on your local site URL.
 
diff --git a/user_guide_src/source/incoming/request.rst b/user_guide_src/source/incoming/request.rst
index 1fdbce30d5ee..27dce8c8267f 100644
--- a/user_guide_src/source/incoming/request.rst
+++ b/user_guide_src/source/incoming/request.rst
@@ -32,7 +32,7 @@ Class Reference
 
     .. php:method:: isValidIP($ip[, $which = ''])
 
-		.. important:: This method is deprecated.
+        .. important:: This method is deprecated.
 
         :param    string $ip: IP address
         :param    string $which: IP protocol ('ipv4' or 'ipv6')
@@ -57,7 +57,7 @@ Class Reference
 
     .. php:method:: getMethod([$upper = false])
 
-		.. important:: Use of the ``$upper`` parameter is deprecated.
+        .. important:: Use of the ``$upper`` parameter is deprecated.
 
         :param bool $upper: Whether to return the request method name in upper or lower case
         :returns: HTTP request method
@@ -120,7 +120,7 @@ Class Reference
         :param    string $method: Method name
         :param    mixed  $value:  Data to be added
         :returns: HTTP request method
-        :rtype:	Request
+        :rtype:    Request
 
         Allows manually setting the value of PHP global, like $_GET, $_POST, etc.
 
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index d03d59ddf263..8eb6ec067fcd 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -92,7 +92,7 @@ The ID will be set to “34”::
 A URL with “product” as the first segment, and anything in the second will be remapped to the “\Catalog” class
 and the “productLookup” method::
 
-	$routes->add('product/(:any)', 'Catalog::productLookup');
+    $routes->add('product/(:any)', 'Catalog::productLookup');
 
 A URL with “product” as the first segment, and a number in the second will be remapped to the “\Catalog” class
 and the “productLookupByID” method passing in the match as a variable to the method::
@@ -101,7 +101,7 @@ and the “productLookupByID” method passing in the match as a variable to the
 
 Note that a single ``(:any)`` will match multiple segments in the URL if present. For example the route::
 
-	$routes->add('product/(:any)', 'Catalog::productLookup/$1');
+    $routes->add('product/(:any)', 'Catalog::productLookup/$1');
 
 will match product/123, product/123/456, product/123/456/789 and so on. The implementation in the
 Controller should take into account the maximum parameters::
@@ -115,7 +115,7 @@ Controller should take into account the maximum parameters::
 If matching multiple segments is not the intended behavior, ``(:segment)`` should be used when defining the
 routes. With the examples URLs from above::
 
-	$routes->add('product/(:segment)', 'Catalog::productLookup/$1');
+    $routes->add('product/(:segment)', 'Catalog::productLookup/$1');
 
 will only match product/123 and generate 404 errors for other example.
 
diff --git a/user_guide_src/source/installation/upgrade_412.rst b/user_guide_src/source/installation/upgrade_412.rst
index 7bc2519b1416..ddee4cd6b241 100644
--- a/user_guide_src/source/installation/upgrade_412.rst
+++ b/user_guide_src/source/installation/upgrade_412.rst
@@ -15,13 +15,13 @@ and View Parser). Update your projects accordingly.
 Cache handlers had wildly different compatibility for keys. The updated cache drivers now pass
 all keys through validation, roughly matching PSR-6's recommendations:
 
-	A string of at least one character that uniquely identifies a cached item. Implementing libraries
-	MUST support keys consisting of the characters A-Z, a-z, 0-9, _, and . in any order in UTF-8 encoding
-	and a length of up to 64 characters. Implementing libraries MAY support additional characters and
-	encodings or longer lengths, but must support at least that minimum. Libraries are responsible for
-	their own escaping of key strings as appropriate, but MUST be able to return the original unmodified
-	key string. The following characters are reserved for future extensions and MUST NOT be supported by
-	implementing libraries: ``{}()/\@:``
+    A string of at least one character that uniquely identifies a cached item. Implementing libraries
+    MUST support keys consisting of the characters A-Z, a-z, 0-9, _, and . in any order in UTF-8 encoding
+    and a length of up to 64 characters. Implementing libraries MAY support additional characters and
+    encodings or longer lengths, but must support at least that minimum. Libraries are responsible for
+    their own escaping of key strings as appropriate, but MUST be able to return the original unmodified
+    key string. The following characters are reserved for future extensions and MUST NOT be supported by
+    implementing libraries: ``{}()/\@:``
 
 Update your projects to remove any invalid cache keys.
 
diff --git a/user_guide_src/source/libraries/throttler.rst b/user_guide_src/source/libraries/throttler.rst
index 298825acf8f2..f4fbc9a325f4 100644
--- a/user_guide_src/source/libraries/throttler.rst
+++ b/user_guide_src/source/libraries/throttler.rst
@@ -109,10 +109,10 @@ to apply only to POST requests, though API's might want to limit every request m
 this to incoming requests, you need to edit **/app/Config/Filters.php** and first add an alias to the
 filter::
 
-	public $aliases = [
-		...
-		'throttle' => \App\Filters\Throttle::class,
-	];
+    public $aliases = [
+        ...
+        'throttle' => \App\Filters\Throttle::class,
+    ];
 
 Next, we assign it to all POST requests made on the site::
 

From 72cd33009817a7db5941c63275e4e7face654f00 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Sep 2021 10:05:31 +0800
Subject: [PATCH 0320/2325] chore(deps): bump actions/github-script from v4 to
 v5

Bumps [actions/github-script](https://github.com/actions/github-script) from 4 to 5.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v4...v5)

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

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/deploy-framework.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy-framework.yml b/.github/workflows/deploy-framework.yml
index 226cf242ed59..5a65f3bd1cfc 100644
--- a/.github/workflows/deploy-framework.yml
+++ b/.github/workflows/deploy-framework.yml
@@ -36,7 +36,7 @@ jobs:
         run: ./source/.github/scripts/deploy-framework ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/framework ${GITHUB_REF##*/}
 
       - name: Release
-        uses: actions/github-script@v4
+        uses: actions/github-script@v5
         with:
           github-token: ${{secrets.ACCESS_TOKEN}}
           script: |
@@ -81,7 +81,7 @@ jobs:
         run: ./source/.github/scripts/deploy-appstarter ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/appstarter ${GITHUB_REF##*/}
 
       - name: Release
-        uses: actions/github-script@v4
+        uses: actions/github-script@v5
         with:
           github-token: ${{secrets.ACCESS_TOKEN}}
           script: |

From fbc5afa2651cdd55860df1033da90a8a75411bf5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 28 Sep 2021 11:07:17 +0900
Subject: [PATCH 0321/2325] test: fix a bug that caused
 `MemcachedHandlerTest::testGetMetaData()` to fail in rare cases

---
 tests/system/Cache/Handlers/MemcachedHandlerTest.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
index 63a3994d1756..c9fa840165ff 100644
--- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php
+++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
@@ -191,7 +191,14 @@ public function testGetMetaData()
         $this->assertFalse($this->memcachedHandler->getMetaData(self::$dummy));
 
         $actual = $this->memcachedHandler->getMetaData(self::$key1);
-        $this->assertLessThanOrEqual(60, $actual['expire'] - $time);
+
+        // This test is time-dependent, and depending on the timing,
+        // seconds in `$time` (e.g. 12:00:00.9999) and seconds of
+        // `$this->memcachedHandler->save()` (e.g. 12:00:01.0000)
+        // may be off by one second. In that case, the following calculation
+        // will result in maximum of (60 + 1).
+        $this->assertLessThanOrEqual(60 + 1, $actual['expire'] - $time);
+
         $this->assertLessThanOrEqual(1, $actual['mtime'] - $time);
         $this->assertSame('value', $actual['data']);
     }

From c5a6f04d3ffa0a79dbda6b9fb9e1683b4c3234b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Sep 2021 15:02:43 +0000
Subject: [PATCH 0322/2325] chore(deps-dev): update rector/rector requirement

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

---
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 5fc0bd26792a..dadf23fd4ad6 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^0.12.91",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.54",
+        "rector/rector": "0.11.55",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {

From fb5f6a1d1ada2428b01124f9941f990a80a0a3ec Mon Sep 17 00:00:00 2001
From: Felipe Soares Barbosa Silveira <felipeiturama@gmail.com>
Date: Tue, 28 Sep 2021 16:53:38 -0300
Subject: [PATCH 0323/2325] fix: link styleguide.md in CONTRIBUTING.md

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 600d42940dfa..7bad4e4f95b1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,7 +3,7 @@
 ## Contributions
 
 We expect all contributions to conform to our
-[style guide](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/styleguide.rst),
+[style guide]( https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/styleguide.md),
 be commented (inside the PHP source files), be documented (in the
 [user guide](https://codeigniter4.github.io/userguide/)), and unit tested (in
 the [test folder](https://github.com/codeigniter4/CodeIgniter4/tree/develop/tests)).
@@ -38,7 +38,7 @@ This might sound a bit tough, but it is required for us to maintain the quality
 
 ### PHP Style
 
-All code must meet the [Style Guide](./contributing/styleguide.rst).
+All code must meet the [Style Guide](./contributing/styleguide.md).
 This makes certain that all submitted code is of the same format as the existing code and ensures that the codebase will be as readable as possible.
 
 ### Documentation

From bd67621b5e75395e596d288b26ee1aa121957084 Mon Sep 17 00:00:00 2001
From: Felipe Soares Barbosa Silveira <felipeiturama@gmail.com>
Date: Tue, 28 Sep 2021 18:17:10 -0300
Subject: [PATCH 0324/2325] docs: fix lint

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7bad4e4f95b1..dd8085cdd913 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,7 +3,7 @@
 ## Contributions
 
 We expect all contributions to conform to our
-[style guide]( https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/styleguide.md),
+[style guide](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/styleguide.md),
 be commented (inside the PHP source files), be documented (in the
 [user guide](https://codeigniter4.github.io/userguide/)), and unit tested (in
 the [test folder](https://github.com/codeigniter4/CodeIgniter4/tree/develop/tests)).

From b911627475da8ce0a8adf8d92ec54646de81f0c7 Mon Sep 17 00:00:00 2001
From: Felipe Soares Barbosa Silveira <felipeiturama@gmail.com>
Date: Wed, 29 Sep 2021 02:12:23 -0300
Subject: [PATCH 0325/2325] docs: fix Google.com to DuckDuckGo.com

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

diff --git a/user_guide_src/source/tutorial/index.rst b/user_guide_src/source/tutorial/index.rst
index ab9e30ebad0d..b03163a3fb60 100644
--- a/user_guide_src/source/tutorial/index.rst
+++ b/user_guide_src/source/tutorial/index.rst
@@ -121,7 +121,7 @@ greeted by a screen looking something like this:
 There are a couple of things to note here:
 
 1. Hovering over the red header at the top reveals a ``search`` link that will open up
-   Google.com in a new tab and searching for the exception.
+   DuckDuckGo.com in a new tab and searching for the exception.
 2. Clicking the ``arguments`` link on any line in the Backtrace will expand a list of
    the arguments that were passed into that function call.
 

From 9ad7980d8c2f4e6167acd6b281c2841fd3aa2733 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Thu, 30 Sep 2021 01:26:07 +0200
Subject: [PATCH 0326/2325] Fix color not updated in several places of the
 precompiled CSS

---
 system/Debug/Toolbar/Views/toolbar.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
index 92ab89f85164..7382f4d7e60a 100644
--- a/system/Debug/Toolbar/Views/toolbar.css
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -292,7 +292,7 @@
   #debug-bar button {
     background-color: #FFFFFF; }
   #debug-bar table strong {
-    color: #FDC894; }
+    color: #DD8615; }
   #debug-bar table tbody tr:hover {
     background-color: #DFDFDF; }
   #debug-bar table tbody tr.current {
@@ -466,7 +466,7 @@
   #toolbarContainer.dark #debug-bar button {
     background-color: #252525; }
   #toolbarContainer.dark #debug-bar table strong {
-    color: #FDC894; }
+    color: #DD8615; }
   #toolbarContainer.dark #debug-bar table tbody tr:hover {
     background-color: #434343; }
   #toolbarContainer.dark #debug-bar table tbody tr.current {
@@ -559,7 +559,7 @@
   #toolbarContainer.light #debug-bar button {
     background-color: #FFFFFF; }
   #toolbarContainer.light #debug-bar table strong {
-    color: #FDC894; }
+    color: #DD8615; }
   #toolbarContainer.light #debug-bar table tbody tr:hover {
     background-color: #DFDFDF; }
   #toolbarContainer.light #debug-bar table tbody tr.current {

From 5d4f89d98e95332ea4588a018572e89e9227bbdb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 30 Sep 2021 07:26:46 +0800
Subject: [PATCH 0327/2325] chore(deps-dev): update rector/rector requirement

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

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

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index dadf23fd4ad6..0bf9fa554d2a 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^0.12.91",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.55",
+        "rector/rector": "0.11.56",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {

From aff1f3af17919e06e5cec264a4c83043ea619ab4 Mon Sep 17 00:00:00 2001
From: ytetsuro <phper.0o0@gmail.com>
Date: Thu, 30 Sep 2021 15:00:26 +0900
Subject: [PATCH 0328/2325] Fix `Model::__call` throwing
 `BadMethodCallException` on empty results

* fix: fixed builder method call when fail parent::__call.

* test: add test for Model::AffectedRows.

* style: ./vendor/bin/php-cs-fixer fix --verbose --diff

* docs: fix issue link.

* refactor: I made sure not to call magic method in the parent class.

* style: composer cs-fix

* style: removed unnecessary variable.

* docs: $this|null -> mixed
---
 system/Model.php                         | 21 ++++++--------
 tests/system/Models/AffectedRowsTest.php | 35 ++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 13 deletions(-)
 create mode 100644 tests/system/Models/AffectedRowsTest.php

diff --git a/system/Model.php b/system/Model.php
index 580c691247f6..8b6b97c86345 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -710,24 +710,19 @@ public function __isset(string $name): bool
      * Provides direct access to method in the builder (if available)
      * and the database connection.
      *
-     * @return $this|null
+     * @return mixed
      */
     public function __call(string $name, array $params)
     {
-        $result = parent::__call($name, $params);
+        $builder = $this->builder();
+        $result  = null;
 
-        if ($result === null && method_exists($builder = $this->builder(), $name)) {
+        if (method_exists($this->db, $name)) {
+            $result = $this->db->{$name}(...$params);
+        } elseif (method_exists($builder, $name)) {
             $result = $builder->{$name}(...$params);
-        }
-
-        if (empty($result)) {
-            if (! method_exists($this->builder(), $name)) {
-                $className = static::class;
-
-                throw new BadMethodCallException('Call to undefined method ' . $className . '::' . $name);
-            }
-
-            return $result;
+        } else {
+            throw new BadMethodCallException('Call to undefined method ' . static::class . '::' . $name);
         }
 
         if ($result instanceof BaseBuilder) {
diff --git a/tests/system/Models/AffectedRowsTest.php b/tests/system/Models/AffectedRowsTest.php
new file mode 100644
index 000000000000..c15d84be341d
--- /dev/null
+++ b/tests/system/Models/AffectedRowsTest.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Models;
+
+use Tests\Support\Models\UserModel;
+
+/**
+ * @internal
+ */
+final class AffectedRowsTest extends LiveModelTestCase
+{
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5137
+     */
+    public function testAffectedRowsWithEmptyUpdate(): void
+    {
+        $this->createModel(UserModel::class);
+        $notExistsId = -1;
+        $this->model
+            ->set('country', 'US')
+            ->where('id', $notExistsId)
+            ->update();
+
+        $this->assertSame(0, $this->model->affectedRows());
+    }
+}

From 9c07842adda5a9196e6203647d6d25cb793f512a Mon Sep 17 00:00:00 2001
From: daycry <daycry9@gmail.com>
Date: Fri, 1 Oct 2021 02:42:51 +0200
Subject: [PATCH 0329/2325] Allow validating object data

---
 system/Validation/Validation.php           |  2 ++
 tests/_support/Validation/TestRules.php    | 13 ++++++++++++
 tests/system/Validation/ValidationTest.php | 24 ++++++++++++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 027b0018e842..8bd14817e79d 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -291,6 +291,8 @@ protected function processRules(string $field, ?string $label, $value, $rules =
                 // if the $value is an array, convert it to as string representation
                 if (is_array($value)) {
                     $value = '[' . implode(', ', $value) . ']';
+                } elseif (is_object($value)) {
+                    $value = json_encode($value);
                 }
 
                 $this->errors[$field] = $error ?? $this->getErrorMessage($rule, $field, $label, $param, $value);
diff --git a/tests/_support/Validation/TestRules.php b/tests/_support/Validation/TestRules.php
index ca9b672f583e..507d17ef89bf 100644
--- a/tests/_support/Validation/TestRules.php
+++ b/tests/_support/Validation/TestRules.php
@@ -19,4 +19,17 @@ public function customError(string $str, ?string &$error = null)
 
         return false;
     }
+
+    public function check_object_rule(object $value, ?string $fields, array $data = [])
+    {
+        $find = false;
+
+        foreach ($value as $key => $val) {
+            if ($key === 'first') {
+                $find = true;
+            }
+        }
+
+        return $find;
+    }
 }
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index 1b21fe394659..ccbff3358f42 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -628,6 +628,30 @@ public function testTagReplacement()
         $this->assertSame($expected, $errors['Username']);
     }
 
+    public function testRulesForObjectField()
+    {
+        $this->validation->setRules([
+            'configuration' => 'required|check_object_rule',
+        ]);
+
+        $data = (object) ['configuration' => (object) ['first' => 1, 'second' => 2]];
+        $this->validation->run((array) $data);
+        $this->assertSame([], $this->validation->getErrors());
+
+        $this->validation->reset();
+
+        $this->validation->setRules([
+            'configuration' => 'required|check_object_rule',
+        ]);
+
+        $data = (object) ['configuration' => (object) ['first1' => 1, 'second' => 2]];
+        $this->validation->run((array) $data);
+
+        $this->assertSame([
+            'configuration' => 'Validation.check_object_rule',
+        ], $this->validation->getErrors());
+    }
+
     /**
      * @dataProvider arrayFieldDataProvider
      *

From 5a77890bbec55ff5a13eaa72391ad270762af38a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 1 Oct 2021 10:30:54 +0900
Subject: [PATCH 0330/2325] feat: `_` can be used as separators in environment
 variable names

database.default.hostname -> database_default_hostname
See https://github.com/codeigniter4/CodeIgniter4/issues/4026
---
 system/Config/BaseConfig.php      | 17 ++++++++++++++++-
 tests/system/Config/fixtures/.env | 11 +++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/system/Config/BaseConfig.php b/system/Config/BaseConfig.php
index c543492f3348..9b71a4963bab 100644
--- a/system/Config/BaseConfig.php
+++ b/system/Config/BaseConfig.php
@@ -115,24 +115,39 @@ protected function initEnvValue(&$property, string $name, string $prefix, string
      */
     protected function getEnvValue(string $property, string $prefix, string $shortPrefix)
     {
-        $shortPrefix = ltrim($shortPrefix, '\\');
+        $shortPrefix        = ltrim($shortPrefix, '\\');
+        $underscoreProperty = str_replace('.', '_', $property);
 
         switch (true) {
             case array_key_exists("{$shortPrefix}.{$property}", $_ENV):
                 return $_ENV["{$shortPrefix}.{$property}"];
 
+            case array_key_exists("{$shortPrefix}_{$underscoreProperty}", $_ENV):
+                return $_ENV["{$shortPrefix}_{$underscoreProperty}"];
+
             case array_key_exists("{$shortPrefix}.{$property}", $_SERVER):
                 return $_SERVER["{$shortPrefix}.{$property}"];
 
+            case array_key_exists("{$shortPrefix}_{$underscoreProperty}", $_SERVER):
+                return $_SERVER["{$shortPrefix}_{$underscoreProperty}"];
+
             case array_key_exists("{$prefix}.{$property}", $_ENV):
                 return $_ENV["{$prefix}.{$property}"];
 
+            case array_key_exists("{$prefix}_{$underscoreProperty}", $_ENV):
+                return $_ENV["{$prefix}_{$underscoreProperty}"];
+
             case array_key_exists("{$prefix}.{$property}", $_SERVER):
                 return $_SERVER["{$prefix}.{$property}"];
 
+            case array_key_exists("{$prefix}_{$underscoreProperty}", $_SERVER):
+                return $_SERVER["{$prefix}_{$underscoreProperty}"];
+
             default:
                 $value = getenv("{$shortPrefix}.{$property}");
+                $value = $value === false ? getenv("{$shortPrefix}_{$underscoreProperty}") : $value;
                 $value = $value === false ? getenv("{$prefix}.{$property}") : $value;
+                $value = $value === false ? getenv("{$prefix}_{$underscoreProperty}") : $value;
 
                 return $value === false ? null : $value;
         }
diff --git a/tests/system/Config/fixtures/.env b/tests/system/Config/fixtures/.env
index e8fa09bd40ed..9a570b9c35ba 100644
--- a/tests/system/Config/fixtures/.env
+++ b/tests/system/Config/fixtures/.env
@@ -6,15 +6,18 @@ NULL=
 
 SimpleConfig.onedeep=baz
 SimpleConfig.default.name=ci4
-SimpleConfig.simple.name=complex
+# Use underscore as separator
+SimpleConfig_simple_name=complex
 
-# for environment override testing
+## for environment override testing
 SimpleConfig.alpha=pow
 SimpleConfig.charliewrong=null
-SimpleConfig.notthere=missing
+# Use underscore as separator
+SimpleConfig_notthere=missing
 simpleconfig.delta=hubbahubba
 simpleconfig.foxtrot="true"
-simpleconfig.dessert="banana"
+# Use underscore as separator
+simpleconfig_dessert="banana"
 
 bravo=kazaam
 

From d97ee1d30e3bc0d7f045f1282517db6fb632d8db Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 1 Oct 2021 13:31:19 +0900
Subject: [PATCH 0331/2325] test: update test code

Because fixture `.env` was changed.
---
 tests/system/Config/DotEnvTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php
index dbdb1c1c6743..2aff090b9576 100644
--- a/tests/system/Config/DotEnvTest.php
+++ b/tests/system/Config/DotEnvTest.php
@@ -158,7 +158,7 @@ public function testNamespacedVariables()
         $dotenv = new DotEnv($this->fixturesFolder, '.env');
         $dotenv->load();
 
-        $this->assertSame('complex', $_SERVER['SimpleConfig.simple.name']);
+        $this->assertSame('complex', $_SERVER['SimpleConfig_simple_name']);
     }
 
     public function testLoadsGetServerVar()

From 742bf47c739f8b01f8dcc2f359914d0aa6cb7074 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 1 Oct 2021 17:02:07 +0900
Subject: [PATCH 0332/2325] docs: fix PHPUnit command example

$ vendor/bin/phpunit tests/system/HTTP/RequestTest
PHPUnit 9.5.9 by Sebastian Bergmann and contributors.

Cannot open file "tests/system/HTTP/RequestTest".
---
 tests/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/README.md b/tests/README.md
index ebeefbd15f50..0ae640f24844 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -47,7 +47,7 @@ directory name after phpunit. All core tests are stored under **tests/system**.
 
 Individual tests can be run by including the relative path to the test file.
 
-	> ./phpunit tests/system/HTTP/RequestTest
+	> ./phpunit tests/system/HTTP/RequestTest.php
 
 You can run the tests without running the live database tests.
 

From 204d13ffa32d27edcfba3a3df80eba2817de70d1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 2 Oct 2021 10:11:33 +0900
Subject: [PATCH 0333/2325] docs: fix 404 links to sytle guide

---
 contributing/guidelines.rst | 2 +-
 contributing/internals.rst  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contributing/guidelines.rst b/contributing/guidelines.rst
index 1f42a920fa6b..3ce3a9d4b103 100644
--- a/contributing/guidelines.rst
+++ b/contributing/guidelines.rst
@@ -11,7 +11,7 @@ PHP Style
 =========
 
 All code must conform to our `Style Guide
-<./styleguide.rst>`_, which is
+<./styleguide.md>`_, which is
 essentially the `Allman indent style
 <https://en.wikipedia.org/wiki/Indent_style#Allman_style>`_, with
 elaboration on naming and readable operators.
diff --git a/contributing/internals.rst b/contributing/internals.rst
index ba7f908f88e9..7f34bf41374e 100644
--- a/contributing/internals.rst
+++ b/contributing/internals.rst
@@ -70,7 +70,7 @@ The package itself will need its own sub-namespace
 that collects all related files into one grouping, like ``CodeIgniter\HTTP``.
 
 Files MUST be named the same as the class they hold, and they must match the
-:doc:`Style Guide <./styleguide.rst>`, meaning CamelCase class and file names.
+:doc:`Style Guide <./styleguide.md>`, meaning CamelCase class and file names.
 They should be in their own directory that matches the sub-namespace under the
 **system** directory.
 

From dd5c93163838624ba7921a1ca6e7169c58229372 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Sat, 2 Oct 2021 20:17:32 +0800
Subject: [PATCH 0334/2325] Fix debugbar styles printing

* Fix incorrect substr length

* Refactor toolbar
---
 system/Debug/Toolbar.php                      |  29 ++-
 system/Debug/Toolbar/Views/toolbar.tpl.php    |   9 +-
 .../Debug/Toolbar/Views/toolbarloader.js.php  | 165 +++++++++---------
 3 files changed, 98 insertions(+), 105 deletions(-)

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index ef877cd2f365..b59666aacc4c 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -406,6 +406,8 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
 
     /**
      * Inject debug toolbar into the response.
+     *
+     * @codeCoverageIgnore
      */
     public function respond()
     {
@@ -413,20 +415,20 @@ public function respond()
             return;
         }
 
-        // @codeCoverageIgnoreStart
         $request = Services::request();
 
         // If the request contains '?debugbar then we're
         // simply returning the loading script
         if ($request->getGet('debugbar') !== null) {
-            // Let the browser know that we are sending javascript
             header('Content-Type: application/javascript');
 
             ob_start();
             include $this->config->viewsPath . 'toolbarloader.js.php';
             $output = ob_get_clean();
+            $output = substr($output, 8, -10); // trim the script tags
+            echo $output;
 
-            exit($output);
+            exit;
         }
 
         // Otherwise, if it includes ?debugbar_time, then
@@ -435,29 +437,24 @@ public function respond()
             helper('security');
 
             // Negotiate the content-type to format the output
-            $format = $request->negotiate('media', [
-                'text/html',
-                'application/json',
-                'application/xml',
-            ]);
+            $format = $request->negotiate('media', ['text/html', 'application/json', 'application/xml']);
             $format = explode('/', $format)[1];
 
-            $file     = sanitize_filename('debugbar_' . $request->getGet('debugbar_time'));
-            $filename = WRITEPATH . 'debugbar/' . $file . '.json';
+            $filename = sanitize_filename('debugbar_' . $request->getGet('debugbar_time'));
+            $filename = WRITEPATH . 'debugbar/' . $filename . '.json';
 
-            // Show the toolbar
             if (is_file($filename)) {
-                $contents = $this->format(file_get_contents($filename), $format);
+                // Show the toolbar if it exists
+                echo $this->format(file_get_contents($filename), $format);
 
-                exit($contents);
+                exit;
             }
 
-            // File was not written or do not exists
+            // Filename not found
             http_response_code(404);
 
-            exit; // Exit here is needed to avoid load the index page
+            exit; // Exit here is needed to avoid loading the index page
         }
-        // @codeCoverageIgnoreEnd
     }
 
     /**
diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php
index 1c84ee541bd6..65cf2a4c3edf 100644
--- a/system/Debug/Toolbar/Views/toolbar.tpl.php
+++ b/system/Debug/Toolbar/Views/toolbar.tpl.php
@@ -265,10 +265,7 @@
 	</div>
 </div>
 <style type="text/css">
-	<?php foreach ($styles as $name => $style) : ?>
-	.<?= $name ?> {
-		<?= $style ?>
-	}
-
-	<?php endforeach ?>
+<?php foreach ($styles as $name => $style): ?>
+<?= sprintf(".%s { %s }\n", $name, $style) ?>
+<?php endforeach ?>
 </style>
diff --git a/system/Debug/Toolbar/Views/toolbarloader.js.php b/system/Debug/Toolbar/Views/toolbarloader.js.php
index 70242b5620bb..add85b52acda 100644
--- a/system/Debug/Toolbar/Views/toolbarloader.js.php
+++ b/system/Debug/Toolbar/Views/toolbarloader.js.php
@@ -1,93 +1,92 @@
-<?php if (ENVIRONMENT !== 'testing') : ?>
+<?php if (ENVIRONMENT === 'testing') {
+    return;
+} ?>
+<script>
 document.addEventListener('DOMContentLoaded', loadDoc, false);
 
 function loadDoc(time) {
-	if (isNaN(time)) {
-		time = document.getElementById("debugbar_loader").getAttribute("data-time");
-		localStorage.setItem('debugbar-time', time);
-	}
-
-	localStorage.setItem('debugbar-time-new', time);
-
-	var url = "<?= rtrim(site_url(), '/') ?>";
-
-	var xhttp = new XMLHttpRequest();
-	xhttp.onreadystatechange = function() {
-		if (this.readyState === 4 && this.status === 200) {
-			var toolbar = document.getElementById("toolbarContainer");
-			if (!toolbar) {
-				toolbar = document.createElement('div');
-				toolbar.setAttribute('id', 'toolbarContainer');
-				document.body.appendChild(toolbar);
-			}
-
-			// copy for easier manipulation
-			let responseText = this.responseText;
-
-			// get csp blocked parts
-			// the style block is the first and starts at 0
-			{
-				let PosBeg = responseText.indexOf( '>', responseText.indexOf( '<style' ) ) + 1;
-				let PosEnd = responseText.indexOf( '</style>', PosBeg );
-				document.getElementById( 'debugbar_dynamic_style' ).innerHTML = responseText.substr( PosBeg, PosEnd - PosBeg );
-				responseText = responseText.substr( PosEnd + 8 );
-			}
-			// the script block starts right after style blocks ended
-			{
-				let PosBeg = responseText.indexOf( '>', responseText.indexOf( '<script' ) ) + 1;
-				let PosEnd = responseText.indexOf( '</script>' );
-				document.getElementById( 'debugbar_dynamic_script' ).innerHTML = responseText.substr( PosBeg, PosEnd - PosBeg );
-				responseText = responseText.substr( PosEnd + 9 );
-			}
-			// check for last style block
-			{
-				let PosBeg = responseText.indexOf( '>', responseText.lastIndexOf( '<style' ) ) + 1;
-				let PosEnd = responseText.indexOf( '</style>', PosBeg );
-				document.getElementById( 'debugbar_dynamic_style' ).innerHTML += responseText.substr( PosBeg, PosEnd - PosBeg );
-				responseText = responseText.substr( 0, PosBeg + 8 );
-			}
-
-			toolbar.innerHTML = responseText;
-			if (typeof ciDebugBar === 'object') {
-				ciDebugBar.init();
-			}
-		} else if (this.readyState === 4 && this.status === 404) {
-			console.log('CodeIgniter DebugBar: File "WRITEPATH/debugbar/debugbar_' + time + '" not found.');
-		}
-	};
-
-	xhttp.open("GET", url + "?debugbar_time=" + time, true);
-	xhttp.send();
-}
+    if (isNaN(time)) {
+        time = document.getElementById("debugbar_loader").getAttribute("data-time");
+        localStorage.setItem('debugbar-time', time);
+    }
+
+    localStorage.setItem('debugbar-time-new', time);
+
+    let url = "<?= rtrim(site_url(), '/') ?>";
+    let xhttp = new XMLHttpRequest();
+
+    xhttp.onreadystatechange = function() {
+        if (this.readyState === 4 && this.status === 200) {
+            let toolbar = document.getElementById("toolbarContainer");
+
+            if (! toolbar) {
+                toolbar = document.createElement('div');
+                toolbar.setAttribute('id', 'toolbarContainer');
+                document.body.appendChild(toolbar);
+            }
+
+            let responseText = this.responseText;
+            let dynamicStyle = document.getElementById('debugbar_dynamic_style');
+            let dynamicScript = document.getElementById('debugbar_dynamic_script');
+
+            // get the first style block, copy contents to dynamic_style, then remove here
+            let start = responseText.indexOf('>', responseText.indexOf('<style')) + 1;
+            let end = responseText.indexOf('</style>', start);
+            dynamicStyle.innerHTML = responseText.substr(start, end - start);
+            responseText = responseText.substr(end + 8);
+
+            // get the first script after the first style, copy contents to dynamic_script, then remove here
+            start = responseText.indexOf('>', responseText.indexOf('<script')) + 1;
+            end = responseText.indexOf('\<\/script>', start);
+            dynamicScript.innerHTML = responseText.substr(start, end - start);
+            responseText = responseText.substr(end + 9);
 
-// Track all AJAX requests
-if (window.ActiveXObject) {
-	var oldXHR = new ActiveXObject('Microsoft.XMLHTTP');
-} else {
-	var oldXHR = window.XMLHttpRequest;
+            // check for last style block, append contents to dynamic_style, then remove here
+            start = responseText.indexOf('>', responseText.indexOf('<style')) + 1;
+            end = responseText.indexOf('</style>', start);
+            dynamicStyle.innerHTML += responseText.substr(start, end - start);
+            responseText = responseText.substr(0, start - 8);
+
+            toolbar.innerHTML = responseText;
+
+            if (typeof ciDebugBar === 'object') {
+                ciDebugBar.init();
+            }
+        } else if (this.readyState === 4 && this.status === 404) {
+            console.log('CodeIgniter DebugBar: File "WRITEPATH/debugbar/debugbar_' + time + '" not found.');
+        }
+    };
+
+    xhttp.open("GET", url + "?debugbar_time=" + time, true);
+    xhttp.send();
 }
 
+window.oldXHR = window.ActiveXObject
+    ? new ActiveXObject('Microsoft.XMLHTTP')
+    : window.XMLHttpRequest;
+
 function newXHR() {
-	var realXHR = new oldXHR();
-	realXHR.addEventListener("readystatechange", function() {
-		// Only success responses and URLs that do not contains "debugbar_time" are tracked
-		if (realXHR.readyState === 4 && realXHR.status.toString()[0] === '2' && realXHR.responseURL.indexOf('debugbar_time') === -1) {
-			if (realXHR.getAllResponseHeaders().indexOf("Debugbar-Time") >= 0) {
-    				var debugbarTime = realXHR.getResponseHeader('Debugbar-Time');
-
-				if (debugbarTime) {
-					var h2 = document.querySelector('#ci-history > h2');
-					if (h2) {
-						h2.innerHTML = 'History <small>You have new debug data.</small> <button onclick="loadDoc(' + debugbarTime + ')">Update</button>';
-						var badge = document.querySelector('a[data-tab="ci-history"] > span > .badge');
-						badge.className += ' active';
-					}
-				}
-			}
-		}
-	}, false);
-	return realXHR;
+    const realXHR = new window.oldXHR();
+
+    realXHR.addEventListener("readystatechange", function() {
+        // Only success responses and URLs that do not contains "debugbar_time" are tracked
+        if (realXHR.readyState === 4 && realXHR.status.toString()[0] === '2' && realXHR.responseURL.indexOf('debugbar_time') === -1) {
+            if (realXHR.getAllResponseHeaders().indexOf("Debugbar-Time") >= 0) {
+                let debugbarTime = realXHR.getResponseHeader('Debugbar-Time');
+
+                if (debugbarTime) {
+                    let h2 = document.querySelector('#ci-history > h2');
+
+                    if (h2) {
+                        h2.innerHTML = 'History <small>You have new debug data.</small> <button onclick="loadDoc(' + debugbarTime + ')">Update</button>';
+                        document.querySelector('a[data-tab="ci-history"] > span > .badge').className += ' active';
+                    }
+                }
+            }
+        }
+    }, false);
+    return realXHR;
 }
 
 window.XMLHttpRequest = newXHR;
-<?php endif; ?>
+</script>

From b5255ed5680c6cb31fd2a70f2fda2dc0e46252fa Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Oct 2021 07:54:02 +0900
Subject: [PATCH 0335/2325] test: add test for property name with underscore

---
 tests/system/Config/BaseConfigTest.php        | 4 ++++
 tests/system/Config/fixtures/.env             | 4 ++++
 tests/system/Config/fixtures/SimpleConfig.php | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php
index 872e7ce48b2f..4c2d4ba20ccb 100644
--- a/tests/system/Config/BaseConfigTest.php
+++ b/tests/system/Config/BaseConfigTest.php
@@ -94,6 +94,10 @@ public function testEnvironmentOverrides()
         $this->assertSame('banana', $config->dessert);
         // null property should not be affected
         $this->assertNull($config->QEMPTYSTR);
+        // property name with underscore
+        $this->assertSame('bar', $config->onedeep_value);
+        // array property name with underscore and key with underscore
+        $this->assertSame('foo', $config->one_deep['under_deep']);
     }
 
     public function testPrefixedValues()
diff --git a/tests/system/Config/fixtures/.env b/tests/system/Config/fixtures/.env
index 9a570b9c35ba..2f859cc9faca 100644
--- a/tests/system/Config/fixtures/.env
+++ b/tests/system/Config/fixtures/.env
@@ -18,6 +18,10 @@ simpleconfig.delta=hubbahubba
 simpleconfig.foxtrot="true"
 # Use underscore as separator
 simpleconfig_dessert="banana"
+# Properity name with undersocre
+SimpleConfig.onedeep_value=bar
+# Array properity name with undersocre and key name with undersocre
+SimpleConfig.one_deep.under_deep=foo
 
 bravo=kazaam
 
diff --git a/tests/system/Config/fixtures/SimpleConfig.php b/tests/system/Config/fixtures/SimpleConfig.php
index d2e13fbda3c0..d5d2665f657e 100644
--- a/tests/system/Config/fixtures/SimpleConfig.php
+++ b/tests/system/Config/fixtures/SimpleConfig.php
@@ -44,4 +44,8 @@ class SimpleConfig extends \CodeIgniter\Config\BaseConfig
 
     public $shortie;
     public $longie;
+    public $onedeep_value;
+    public $one_deep = [
+        'under_deep' => null,
+    ];
 }

From add60837ed50a6e4c0bb666153ded7c1847036ed Mon Sep 17 00:00:00 2001
From: ytetsuro <phper.0o0@gmail.com>
Date: Sun, 3 Oct 2021 12:53:03 +0900
Subject: [PATCH 0336/2325] Always escape identifiers in the `set()`,
 `setUpdateBatch()`, and `insertBatch()` in `BaseBuilder`

---
 system/BaseModel.php                          |  4 +-
 system/Database/BaseBuilder.php               | 12 ++--
 system/Model.php                              |  4 +-
 tests/system/Database/Builder/InsertTest.php  | 30 ++++++++++
 tests/system/Database/Builder/UpdateTest.php  | 57 ++++++++++++++++++-
 user_guide_src/source/changelogs/v4.1.5.rst   |  2 +
 .../source/database/query_builder.rst         | 10 ++--
 7 files changed, 102 insertions(+), 17 deletions(-)

diff --git a/system/BaseModel.php b/system/BaseModel.php
index 29c6d1075949..fb3b8549f856 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -366,7 +366,7 @@ abstract protected function doInsert(array $data);
      * This methods works only with dbCalls
      *
      * @param array|null $set       An associative array of insert values
-     * @param bool|null  $escape    Whether to escape values and identifiers
+     * @param bool|null  $escape    Whether to escape values
      * @param int        $batchSize The size of the batch to run
      * @param bool       $testing   True means only number of records is returned, false will execute the query
      *
@@ -763,7 +763,7 @@ public function insert($data = null, bool $returnID = true)
      * Compiles batch insert runs the queries, validating each row prior.
      *
      * @param array|null $set       an associative array of insert values
-     * @param bool|null  $escape    Whether to escape values and identifiers
+     * @param bool|null  $escape    Whether to escape values
      * @param int        $batchSize The size of the batch to run
      * @param bool       $testing   True means only number of records is returned, false will execute the query
      *
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 43cedc8f09eb..549e9ec180a0 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1340,7 +1340,7 @@ protected function _limit(string $sql, bool $offsetIgnore = false): string
      *
      * @param array|object|string $key    Field name, or an array of field/value pairs
      * @param mixed               $value  Field value, if $key is a single field
-     * @param bool|null           $escape Whether to escape values and identifiers
+     * @param bool|null           $escape Whether to escape values
      *
      * @return $this
      */
@@ -1358,9 +1358,9 @@ public function set($key, $value = '', ?bool $escape = null)
             if ($escape) {
                 $bind = $this->setBind($k, $v, $escape);
 
-                $this->QBSet[$this->db->protectIdentifiers($k, false, $escape)] = ":{$bind}:";
+                $this->QBSet[$this->db->protectIdentifiers($k, false)] = ":{$bind}:";
             } else {
-                $this->QBSet[$this->db->protectIdentifiers($k, false, $escape)] = $v;
+                $this->QBSet[$this->db->protectIdentifiers($k, false)] = $v;
             }
         }
 
@@ -1604,7 +1604,7 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
         $affectedRows = 0;
 
         for ($i = 0, $total = count($this->QBSet); $i < $total; $i += $batchSize) {
-            $sql = $this->_insertBatch($this->db->protectIdentifiers($table, true, $escape, false), $this->QBKeys, array_slice($this->QBSet, $i, $batchSize));
+            $sql = $this->_insertBatch($this->db->protectIdentifiers($table, true, null, false), $this->QBKeys, array_slice($this->QBSet, $i, $batchSize));
 
             if ($this->testMode) {
                 $affectedRows++;
@@ -1672,7 +1672,7 @@ public function setInsertBatch($key, string $value = '', ?bool $escape = null)
         }
 
         foreach ($keys as $k) {
-            $this->QBKeys[] = $this->db->protectIdentifiers($k, false, $escape);
+            $this->QBKeys[] = $this->db->protectIdentifiers($k, false);
         }
 
         return $this;
@@ -2052,7 +2052,7 @@ public function setUpdateBatch($key, string $index = '', ?bool $escape = null)
 
                 $bind = $this->setBind($k2, $v2, $escape);
 
-                $clean[$this->db->protectIdentifiers($k2, false, $escape)] = ":{$bind}:";
+                $clean[$this->db->protectIdentifiers($k2, false)] = ":{$bind}:";
             }
 
             if ($indexSet === false) {
diff --git a/system/Model.php b/system/Model.php
index 8b6b97c86345..c73e5c716778 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -251,7 +251,7 @@ protected function doInsert(array $data)
      * This methods works only with dbCalls
      *
      * @param array|null $set       An associative array of insert values
-     * @param bool|null  $escape    Whether to escape values and identifiers
+     * @param bool|null  $escape    Whether to escape values
      * @param int        $batchSize The size of the batch to run
      * @param bool       $testing   True means only number of records is returned, false will execute the query
      *
@@ -559,7 +559,7 @@ public function builder(?string $table = null)
      *
      * @param mixed     $key    Field name, or an array of field/value pairs
      * @param mixed     $value  Field value, if $key is a single field
-     * @param bool|null $escape Whether to escape values and identifiers
+     * @param bool|null $escape Whether to escape values
      *
      * @return $this
      */
diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php
index f2537543ac5e..d9c0c79e11e6 100644
--- a/tests/system/Database/Builder/InsertTest.php
+++ b/tests/system/Database/Builder/InsertTest.php
@@ -98,6 +98,36 @@ public function testInsertBatch()
         $this->assertSame($expected, str_replace("\n", ' ', $query->getQuery()));
     }
 
+    public function testInsertBatchWithoutEscape()
+    {
+        $builder = $this->db->table('jobs');
+
+        $insertData = [
+            [
+                'id'          => 2,
+                'name'        => '1 + 1',
+                'description' => '1 + 2',
+            ],
+            [
+                'id'          => 3,
+                'name'        => '2 + 1',
+                'description' => '2 + 2',
+            ],
+        ];
+
+        $this->db->shouldReturn('execute', 1)->shouldReturn('affectedRows', 1);
+        $builder->insertBatch($insertData, false);
+
+        $query = $this->db->getLastQuery();
+        $this->assertInstanceOf(Query::class, $query);
+
+        $raw = 'INSERT INTO "jobs" ("description", "id", "name") VALUES (:description:,:id:,:name:), (:description.1:,:id.1:,:name.1:)';
+        $this->assertSame($raw, str_replace("\n", ' ', $query->getOriginalQuery()));
+
+        $expected = 'INSERT INTO "jobs" ("description", "id", "name") VALUES (1 + 2,2,1 + 1), (2 + 2,3,2 + 1)';
+        $this->assertSame($expected, str_replace("\n", ' ', $query->getQuery()));
+    }
+
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/4345
      */
diff --git a/tests/system/Database/Builder/UpdateTest.php b/tests/system/Database/Builder/UpdateTest.php
index 6d4cc84973c1..1bf36ffe7b3e 100644
--- a/tests/system/Database/Builder/UpdateTest.php
+++ b/tests/system/Database/Builder/UpdateTest.php
@@ -235,6 +235,59 @@ public function testUpdateBatch()
         $this->assertSame($expected, $query->getQuery());
     }
 
+    public function testSetUpdateBatchWithoutEscape()
+    {
+        $builder = new BaseBuilder('jobs', $this->db);
+        $escape  = false;
+
+        $builder->setUpdateBatch([
+            [
+                'id'          => 2,
+                'name'        => 'SUBSTRING(name, 1)',
+                'description' => 'SUBSTRING(description, 3)',
+            ],
+            [
+                'id'          => 3,
+                'name'        => 'SUBSTRING(name, 2)',
+                'description' => 'SUBSTRING(description, 4)',
+            ],
+        ], 'id', $escape);
+
+        $this->db->shouldReturn('execute', 1)->shouldReturn('affectedRows', 1);
+        $builder->updateBatch(null, 'id');
+
+        $query = $this->db->getLastQuery();
+        $this->assertInstanceOf(MockQuery::class, $query);
+
+        $space = ' ';
+
+        $expected = <<<EOF
+            UPDATE "jobs" SET "name" = CASE{$space}
+            WHEN "id" = :id: THEN :name:
+            WHEN "id" = :id.1: THEN :name.1:
+            ELSE "name" END, "description" = CASE{$space}
+            WHEN "id" = :id: THEN :description:
+            WHEN "id" = :id.1: THEN :description.1:
+            ELSE "description" END
+            WHERE "id" IN(:id:,:id.1:)
+            EOF;
+
+        $this->assertSame($expected, $query->getOriginalQuery());
+
+        $expected = <<<EOF
+            UPDATE "jobs" SET "name" = CASE{$space}
+            WHEN "id" = 2 THEN SUBSTRING(name, 1)
+            WHEN "id" = 3 THEN SUBSTRING(name, 2)
+            ELSE "name" END, "description" = CASE{$space}
+            WHEN "id" = 2 THEN SUBSTRING(description, 3)
+            WHEN "id" = 3 THEN SUBSTRING(description, 4)
+            ELSE "description" END
+            WHERE "id" IN(2,3)
+            EOF;
+
+        $this->assertSame($expected, $query->getQuery());
+    }
+
     public function testUpdateBatchThrowsExceptionWithNoData()
     {
         $builder = new BaseBuilder('jobs', $this->db);
@@ -350,7 +403,7 @@ public function testSetWithoutEscape()
             ->where('id', 2)
             ->update(null, null, null);
 
-        $expectedSQL   = 'UPDATE "mytable" SET field = field+1 WHERE "id" = 2';
+        $expectedSQL   = 'UPDATE "mytable" SET "field" = field+1 WHERE "id" = 2';
         $expectedBinds = [
             'id' => [
                 2,
@@ -372,7 +425,7 @@ public function testSetWithAndWithoutEscape()
             ->where('id', 2)
             ->update(null, null, null);
 
-        $expectedSQL   = 'UPDATE "mytable" SET "foo" = \'bar\', field = field+1 WHERE "id" = 2';
+        $expectedSQL   = 'UPDATE "mytable" SET "foo" = \'bar\', "field" = field+1 WHERE "id" = 2';
         $expectedBinds = [
             'foo' => [
                 'bar',
diff --git a/user_guide_src/source/changelogs/v4.1.5.rst b/user_guide_src/source/changelogs/v4.1.5.rst
index b57f3b79a85a..6b9b75324c36 100644
--- a/user_guide_src/source/changelogs/v4.1.5.rst
+++ b/user_guide_src/source/changelogs/v4.1.5.rst
@@ -12,6 +12,8 @@ Enhancements:
 
 Changes:
 
+- Always escape identifiers in the ``set``, ``setUpdateBatch``, and ``insertBatch`` functions in ``BaseBuilder``.
+
 Deprecations:
 
 - Deprecated ``CodeIgniter\\Cache\\Handlers\\BaseHandler::RESERVED_CHARACTERS`` in favor of the new config property
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 26fcba73e4ee..dec9b65570b3 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -1701,7 +1701,7 @@ Class Reference
 
         :param mixed $key: Field name, or an array of field/value pairs
         :param mixed $value: Field value, if $key is a single field
-        :param bool    $escape: Whether to escape values and identifiers
+        :param bool    $escape: Whether to escape values
         :returns:   ``BaseBuilder`` instance (method chaining)
         :rtype:     ``BaseBuilder``
 
@@ -1710,7 +1710,7 @@ Class Reference
     .. php:method:: insert([$set = null[, $escape = null]])
 
         :param array $set: An associative array of field/value pairs
-        :param bool $escape: Whether to escape values and identifiers
+        :param bool $escape: Whether to escape values
         :returns:   ``true`` on success, ``false`` on failure
         :rtype:     bool
 
@@ -1719,7 +1719,7 @@ Class Reference
     .. php:method:: insertBatch([$set = null[, $escape = null[, $batch_size = 100]]])
 
         :param array $set: Data to insert
-        :param bool $escape: Whether to escape values and identifiers
+        :param bool $escape: Whether to escape values
         :param int $batch_size: Count of rows to insert at once
         :returns: Number of rows inserted or ``false`` on failure
         :rtype:    int|false
@@ -1734,7 +1734,7 @@ Class Reference
 
         :param mixed $key: Field name or an array of field/value pairs
         :param string $value: Field value, if $key is a single field
-        :param bool $escape: Whether to escape values and identifiers
+        :param bool $escape: Whether to escape values
         :returns:   ``BaseBuilder`` instance (method chaining)
         :rtype:     ``BaseBuilder``
 
@@ -1768,7 +1768,7 @@ Class Reference
 
         :param mixed $key: Field name or an array of field/value pairs
         :param string $value: Field value, if $key is a single field
-        :param bool    $escape: Whether to escape values and identifiers
+        :param bool    $escape: Whether to escape values
         :returns:   ``BaseBuilder`` instance (method chaining)
         :rtype:     ``BaseBuilder``
 

From a94745379701c89a6945c034e9f1693fb0e962f5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Oct 2021 12:53:47 +0900
Subject: [PATCH 0337/2325] docs: fix classname for testing

---
 user_guide_src/source/installation/upgrade_412.rst | 2 +-
 user_guide_src/source/testing/feature.rst          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_412.rst b/user_guide_src/source/installation/upgrade_412.rst
index ddee4cd6b241..37624bc7c6dc 100644
--- a/user_guide_src/source/installation/upgrade_412.rst
+++ b/user_guide_src/source/installation/upgrade_412.rst
@@ -44,7 +44,7 @@ method which you might want to override.
 
 The ``CodeIgniter\Test`` namespace has had significant improvements to help developers with their
 own test cases. Most notably test extensions have moved to Traits to make them easier to
-pick-and-choose across various test case needs. The ``DatabaseTestCase`` and ``FeatureTestCase``
+pick-and-choose across various test case needs. The ``CIDatabaseTestCase`` and ``FeatureTestCase``
 classes have been deprecated and their methods moved to ``DatabaseTestTrait`` and
 ``FeatureTestTrait`` respectively. Update your test cases to extend the main test case
 and use any traits you need. For example::
diff --git a/user_guide_src/source/testing/feature.rst b/user_guide_src/source/testing/feature.rst
index c48c24b221c5..5d68543d241a 100644
--- a/user_guide_src/source/testing/feature.rst
+++ b/user_guide_src/source/testing/feature.rst
@@ -14,7 +14,7 @@ and more.
 The Test Class
 ==============
 
-Feature testing requires that all of your test classes use the ``CodeIgniter\Test\DatabaseTestCase``
+Feature testing requires that all of your test classes use the ``CodeIgniter\Test\DatabaseTestTrait``
 and ``CodeIgniter\Test\FeatureTestTrait`` traits. Since these testing tools rely on proper database
 staging you must always ensure that ``parent::setUp()`` and ``parent::tearDown()``
 are called if you implement your own methods.
@@ -27,7 +27,7 @@ are called if you implement your own methods.
     use CodeIgniter\Test\DatabaseTestTrait;
     use CodeIgniter\Test\FeatureTestTrait;
 
-    class TestFoo extends FeatureTestCase
+    class TestFoo extends CIUnitTestCase
     {
         use DatabaseTestTrait, FeatureTestTrait;
 

From 56add793a949c5021a56b81f6ff7019ac1719f69 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Sun, 3 Oct 2021 05:56:18 +0200
Subject: [PATCH 0338/2325] Fix highlighting in database debug toolbar

---
 system/Database/Query.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/system/Database/Query.php b/system/Database/Query.php
index 441ac0a82fc2..01d27d8bdfff 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -372,23 +372,25 @@ public function debugToolbarDisplay(): string
             'FROM',
             'WHERE',
             'AND',
-            'LEFT&nbsp;JOIN',
-            'RIGHT&nbsp;JOIN',
+            'LEFT JOIN',
+            'RIGHT JOIN',
             'JOIN',
-            'ORDER&nbsp;BY',
-            'GROUP&nbsp;BY',
+            'ORDER BY',
+            'ASC',
+            'DESC',
+            'GROUP BY',
             'LIMIT',
             'INSERT',
             'INTO',
             'VALUES',
             'UPDATE',
-            'OR&nbsp;',
+            'OR',
             'HAVING',
             'OFFSET',
-            'NOT&nbsp;IN',
+            'NOT IN',
             'IN',
             'LIKE',
-            'NOT&nbsp;LIKE',
+            'NOT LIKE',
             'COUNT',
             'MAX',
             'MIN',
@@ -396,8 +398,6 @@ public function debugToolbarDisplay(): string
             'AS',
             'AVG',
             'SUM',
-            '(',
-            ')',
         ];
 
         if (empty($this->finalQueryString)) {
@@ -406,11 +406,11 @@ public function debugToolbarDisplay(): string
 
         $sql = $this->finalQueryString;
 
-        foreach ($highlight as $term) {
-            $sql = str_replace($term, '<strong>' . $term . '</strong>', $sql);
-        }
+        $search = '/\b(?:' . implode('|', $highlight) . ')\b/';
 
-        return $sql;
+        return preg_replace_callback($search, static function ($matches) {
+            return '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>';
+        }, $sql);
     }
 
     /**

From 343d58ed7047d57b8a6f4f841720e5a5da0c2823 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Oct 2021 17:52:44 +0900
Subject: [PATCH 0339/2325] docs: add about environment variable with dot

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

diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst
index 5f43477bbaaf..d5599e1a0f25 100644
--- a/user_guide_src/source/general/configuration.rst
+++ b/user_guide_src/source/general/configuration.rst
@@ -183,6 +183,13 @@ the value from **.env** replaces the configuration file value.
 
 .. note:: When using the *short prefix* the property names must still exactly match the class defined name.
 
+Some environments do not permit variable name with dots. In such case, you could also use ``_`` as a seperator.
+::
+
+    app_CSRFProtection = true
+    app_CSRFCookieName = csrf_cookie
+    app_CSPEnabled = true
+
 Environment Variables as Replacements for Data
 ==============================================
 

From 34ced57e631ac0d1c2f76807cff45b7e33fc5526 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 3 Oct 2021 18:09:01 +0900
Subject: [PATCH 0340/2325] fix: Fixed a problem with not run escape for
 identities  in like.

---
 system/Database/BaseBuilder.php            | 2 +-
 tests/system/Database/Builder/LikeTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 549e9ec180a0..e79c5383c49a 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1003,7 +1003,7 @@ protected function _like($field, string $match = '', string $type = 'AND ', stri
                 $bind = $this->setBind($k, "%{$v}%", $escape);
             }
 
-            $likeStatement = $this->_like_statement($prefix, $k, $not, $bind, $insensitiveSearch);
+            $likeStatement = $this->_like_statement($prefix, $this->db->protectIdentifiers($k, false, $escape), $not, $bind, $insensitiveSearch);
 
             // some platforms require an escape sequence definition for LIKE wildcards
             if ($escape === true && $this->db->likeEscapeStr !== '') {
diff --git a/tests/system/Database/Builder/LikeTest.php b/tests/system/Database/Builder/LikeTest.php
index 74a2d2fbbf81..ba7c176b7c90 100644
--- a/tests/system/Database/Builder/LikeTest.php
+++ b/tests/system/Database/Builder/LikeTest.php
@@ -172,7 +172,7 @@ public function testCaseInsensitiveLike()
 
         $builder->like('name', 'VELOPER', 'both', null, true);
 
-        $expectedSQL   = "SELECT * FROM \"job\" WHERE LOWER(name) LIKE '%veloper%' ESCAPE '!'";
+        $expectedSQL   = "SELECT * FROM \"job\" WHERE LOWER(\"name\") LIKE '%veloper%' ESCAPE '!'";
         $expectedBinds = [
             'name' => [
                 '%veloper%',

From f3bf3869284dc85be27e4c984c68dbcabfab3719 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Mon, 4 Oct 2021 12:17:27 +0800
Subject: [PATCH 0341/2325] Refactor/optimise starter's tests

---
 .../tests/_support/DatabaseTestCase.php       | 61 -------------------
 .../tests/_support/SessionTestCase.php        | 38 ------------
 .../tests/database/ExampleDatabaseTest.php    | 11 ++--
 .../tests/session/ExampleSessionTest.php      | 14 ++---
 admin/starter/tests/unit/HealthTest.php       | 23 +++----
 5 files changed, 18 insertions(+), 129 deletions(-)
 delete mode 100644 admin/starter/tests/_support/DatabaseTestCase.php
 delete mode 100644 admin/starter/tests/_support/SessionTestCase.php

diff --git a/admin/starter/tests/_support/DatabaseTestCase.php b/admin/starter/tests/_support/DatabaseTestCase.php
deleted file mode 100644
index fd067a585c87..000000000000
--- a/admin/starter/tests/_support/DatabaseTestCase.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Tests\Support;
-
-use CodeIgniter\Test\CIUnitTestCase;
-use CodeIgniter\Test\DatabaseTestTrait;
-
-/**
- * @internal
- */
-final class DatabaseTestCase extends CIUnitTestCase
-{
-    use DatabaseTestTrait;
-
-    /**
-     * Should the database be refreshed before each test?
-     *
-     * @var bool
-     */
-    protected $refresh = true;
-
-    /**
-     * The seed file(s) used for all tests within this test case.
-     * Should be fully-namespaced or relative to $basePath
-     *
-     * @var array|string
-     */
-    protected $seed = 'Tests\Support\Database\Seeds\ExampleSeeder';
-
-    /**
-     * The path to the seeds directory.
-     * Allows overriding the default application directories.
-     *
-     * @var string
-     */
-    protected $basePath = SUPPORTPATH . 'Database/';
-
-    /**
-     * The namespace(s) to help us find the migration classes.
-     * Empty is equivalent to running `spark migrate -all`.
-     * Note that running "all" runs migrations in date order,
-     * but specifying namespaces runs them in namespace order (then date)
-     *
-     * @var array|string|null
-     */
-    protected $namespace = 'Tests\Support';
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        // Extra code to run before each test
-    }
-
-    protected function tearDown(): void
-    {
-        parent::tearDown();
-
-        // Extra code to run after each test
-    }
-}
diff --git a/admin/starter/tests/_support/SessionTestCase.php b/admin/starter/tests/_support/SessionTestCase.php
deleted file mode 100644
index 08a071154494..000000000000
--- a/admin/starter/tests/_support/SessionTestCase.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Tests\Support;
-
-use CodeIgniter\Session\Handlers\ArrayHandler;
-use CodeIgniter\Session\SessionInterface;
-use CodeIgniter\Test\CIUnitTestCase;
-use CodeIgniter\Test\Mock\MockSession;
-
-/**
- * @internal
- */
-final class SessionTestCase extends CIUnitTestCase
-{
-    /**
-     * @var SessionInterface
-     */
-    protected $session;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->mockSession();
-    }
-
-    /**
-     * Pre-loads the mock session driver into $this->session.
-     *
-     * @var string
-     */
-    protected function mockSession()
-    {
-        $config        = config('App');
-        $this->session = new MockSession(new ArrayHandler($config, '0.0.0.0'), $config);
-        \Config\Services::injectMock('session', $this->session);
-    }
-}
diff --git a/admin/starter/tests/database/ExampleDatabaseTest.php b/admin/starter/tests/database/ExampleDatabaseTest.php
index 203b1261c7e0..5d13836f9dc6 100644
--- a/admin/starter/tests/database/ExampleDatabaseTest.php
+++ b/admin/starter/tests/database/ExampleDatabaseTest.php
@@ -1,18 +1,15 @@
 <?php
 
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
 use Tests\Support\Models\ExampleModel;
 
 /**
  * @internal
  */
-final class ExampleDatabaseTest extends \Tests\Support\DatabaseTestCase
+final class ExampleDatabaseTest extends CIUnitTestCase
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        // Extra code to run before each test
-    }
+    use DatabaseTestTrait;
 
     public function testModelFindAll()
     {
diff --git a/admin/starter/tests/session/ExampleSessionTest.php b/admin/starter/tests/session/ExampleSessionTest.php
index 65dd37c6b498..151036412146 100644
--- a/admin/starter/tests/session/ExampleSessionTest.php
+++ b/admin/starter/tests/session/ExampleSessionTest.php
@@ -1,21 +1,15 @@
 <?php
 
+use CodeIgniter\Test\CIUnitTestCase;
+
 /**
  * @internal
  */
-final class ExampleSessionTest extends \Tests\Support\SessionTestCase
+final class ExampleSessionTest extends CIUnitTestCase
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
-    }
-
     public function testSessionSimple()
     {
         $this->session->set('logged_in', 123);
-
-        $value = $this->session->get('logged_in');
-
-        $this->assertSame(123, $value);
+        $this->assertSame(123, $this->session->get('logged_in'));
     }
 }
diff --git a/admin/starter/tests/unit/HealthTest.php b/admin/starter/tests/unit/HealthTest.php
index f834ac605b40..ab3e2aa1d524 100644
--- a/admin/starter/tests/unit/HealthTest.php
+++ b/admin/starter/tests/unit/HealthTest.php
@@ -1,39 +1,36 @@
 <?php
 
+use CodeIgniter\Test\CIUnitTestCase;
+use Config\App;
 use Config\Services;
+use Tests\Support\Libraries\ConfigReader;
 
 /**
  * @internal
  */
-final class HealthTest extends \CodeIgniter\Test\CIUnitTestCase
+final class HealthTest extends CIUnitTestCase
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
-    }
-
     public function testIsDefinedAppPath()
     {
-        $test = defined('APPPATH');
-
-        $this->assertTrue($test);
+        $this->assertTrue(defined('APPPATH'));
     }
 
     public function testBaseUrlHasBeenSet()
     {
         $validation = Services::validation();
-        $env        = false;
+
+        $env = false;
 
         // Check the baseURL in .env
         if (is_file(HOMEPATH . '.env')) {
-            $env = (bool) preg_grep('/^app\.baseURL = ./', file(HOMEPATH . '.env'));
+            $env = preg_grep('/^app\.baseURL = ./', file(HOMEPATH . '.env')) !== false;
         }
 
         if ($env) {
             // BaseURL in .env is a valid URL?
             // phpunit.xml.dist sets app.baseURL in $_SERVER
             // So if you set app.baseURL in .env, it takes precedence
-            $config = new Config\App();
+            $config = new App();
             $this->assertTrue(
                 $validation->check($config->baseURL, 'valid_url'),
                 'baseURL "' . $config->baseURL . '" in .env is not valid URL'
@@ -42,7 +39,7 @@ public function testBaseUrlHasBeenSet()
 
         // Get the baseURL in app/Config/App.php
         // You can't use Config\App, because phpunit.xml.dist sets app.baseURL
-        $reader = new \Tests\Support\Libraries\ConfigReader();
+        $reader = new ConfigReader();
 
         // BaseURL in app/Config/App.php is a valid URL?
         $this->assertTrue(

From 5ffca3891a1a1dc1e2b4f9fa084ae7d58a7d7b88 Mon Sep 17 00:00:00 2001
From: Daniel Tiringer <tiringerdaniel@tutanota.com>
Date: Mon, 4 Oct 2021 11:56:15 +0200
Subject: [PATCH 0342/2325] Create static array for active connections

---
 system/Debug/Toolbar/Collectors/Database.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 6fd5b263f4a3..391032661ca4 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -61,6 +61,14 @@ class Database extends BaseCollector
      */
     protected static $queries = [];
 
+    /**
+     * Array of connections used in a collected set
+     * of queries.
+     *
+     * @var array
+     */
+    protected static $activeConnections = [];
+
     /**
      * Constructor
      */

From 0e89b019b1617736bf79de9d6ca57046c3823780 Mon Sep 17 00:00:00 2001
From: Daniel Tiringer <tiringerdaniel@tutanota.com>
Date: Mon, 4 Oct 2021 11:57:15 +0200
Subject: [PATCH 0343/2325] Add unique query connections to array

---
 system/Debug/Toolbar/Collectors/Database.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 391032661ca4..6b9c7adb0981 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -91,6 +91,12 @@ public static function collect(Query $query)
         $max = $config->maxQueries ?: 100;
 
         if (count(static::$queries) < $max) {
+            $connection = $query->db->getDatabase();
+
+            if (! in_array($connection, self::$activeConnections, true)) {
+                self::$activeConnections[] = $connection;
+            }
+
             static::$queries[] = $query;
         }
     }

From 7072f4393a2cc88d316e4ed3deee27695f03499c Mon Sep 17 00:00:00 2001
From: Daniel Tiringer <tiringerdaniel@tutanota.com>
Date: Mon, 4 Oct 2021 11:57:58 +0200
Subject: [PATCH 0344/2325] Display the count of active connections

---
 system/Debug/Toolbar/Collectors/Database.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 6b9c7adb0981..eca887626416 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -162,7 +162,8 @@ public function getBadgeValue(): int
      */
     public function getTitleDetails(): string
     {
-        return '(' . count(static::$queries) . ' Queries across ' . ($countConnection = count($this->connections)) . ' Connection' .
+        return '(' . count(static::$queries) . ' Queries across ' .
+                ($countConnection = count(self::$activeConnections)) . ' Connection' .
                 ($countConnection > 1 ? 's' : '') . ')';
     }
 

From dbd154f4f7e2f42d3dfed31a2d523b576b6eb76f Mon Sep 17 00:00:00 2001
From: Daniel Tiringer <53534182+danielTiringer@users.noreply.github.com>
Date: Mon, 4 Oct 2021 11:57:24 +0000
Subject: [PATCH 0345/2325] Format returned string

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 system/Debug/Toolbar/Collectors/Database.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index eca887626416..513eed59bd94 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -162,9 +162,14 @@ public function getBadgeValue(): int
      */
     public function getTitleDetails(): string
     {
-        return '(' . count(static::$queries) . ' Queries across ' .
-                ($countConnection = count(self::$activeConnections)) . ' Connection' .
-                ($countConnection > 1 ? 's' : '') . ')';
+        $connectionCount = count(static::$activeConnections);
+
+        return sprintf(
+            '(%d Queries across %d Connection%s)',
+            count(static::$queries),
+            $connectionCount,
+            $connectionCount > 1 ? 's' : ''
+        );
     }
 
     /**

From 1c866d3cab6f8699d30dca7de3eab97fc7847482 Mon Sep 17 00:00:00 2001
From: Daniel Tiringer <tiringerdaniel@tutanota.com>
Date: Mon, 4 Oct 2021 14:01:20 +0200
Subject: [PATCH 0346/2325] Properly pluralize the word query

---
 system/Debug/Toolbar/Collectors/Database.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 513eed59bd94..429e9d63fcc7 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -162,11 +162,13 @@ public function getBadgeValue(): int
      */
     public function getTitleDetails(): string
     {
+        $queryCount      = count(static::$queries);
         $connectionCount = count(static::$activeConnections);
 
         return sprintf(
-            '(%d Queries across %d Connection%s)',
-            count(static::$queries),
+            '(%d Quer%s across %d Connection%s)',
+            $queryCount,
+            $queryCount > 1 ? 'ies' : 'y',
             $connectionCount,
             $connectionCount > 1 ? 's' : ''
         );

From 31003a804f24b038ce85cf9edac6a117f47dbe75 Mon Sep 17 00:00:00 2001
From: puschie286 <puschie286@users.noreply.github.com>
Date: Mon, 4 Oct 2021 15:17:37 +0200
Subject: [PATCH 0347/2325] Update system/BaseModel.php

Co-authored-by: Mostafa Khudair <59371810+mostafakhudair@users.noreply.github.com>
---
 system/BaseModel.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/system/BaseModel.php b/system/BaseModel.php
index c15ecc8d5473..e0bf0bb8e2bb 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -1082,9 +1082,8 @@ public function paginate(?int $perPage = null, string $group = 'default', ?int $
         $page = $page >= 1 ? $page : $pager->getCurrentPage($group);
         // Store it in the Pager library, so it can be paginated in the views.
         $this->pager = $pager->store($group, $page, $perPage, $this->countAllResults(false), $segment);
-        $page        = $pager->getCurrentPage($group);
         $perPage     = $this->pager->getPerPage($group);
-        $offset      = ($page - 1) * $perPage;
+        $offset      = ($pager->getCurrentPage($group) - 1) * $perPage;
 
         return $this->findAll($perPage, $offset);
     }

From 31659b49f8fc74844470e08fc1157886b1f8880c Mon Sep 17 00:00:00 2001
From: puschie286 <christoph286@googlemail.com>
Date: Mon, 4 Oct 2021 15:19:00 +0200
Subject: [PATCH 0348/2325] Fix styling

~ cs-fix
---
 tests/system/Models/PaginateModelTest.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/system/Models/PaginateModelTest.php b/tests/system/Models/PaginateModelTest.php
index 5a7bb4755927..35e58221ecee 100644
--- a/tests/system/Models/PaginateModelTest.php
+++ b/tests/system/Models/PaginateModelTest.php
@@ -70,13 +70,13 @@ public function testPaginateWithoutDeleted(): void
         $this->assertCount(3, $data);
         $this->assertSame(3, $this->model->pager->getDetails()['total']);
     }
-	
-	public function testPaginatePageOutOfRange(): void
+
+    public function testPaginatePageOutOfRange(): void
     {
-    	$this->createModel(ValidModel::class);
-    	$this->model->paginate(1,'default', -500);
-    	$this->assertSame(1, $this->model->pager->getCurrentPage());
-    	$this->model->paginate(1, 'default', 500);
-    	$this->assertSame($this->model->pager->getPageCount(),$this->model->pager->getCurrentPage());
+        $this->createModel(ValidModel::class);
+        $this->model->paginate(1, 'default', -500);
+        $this->assertSame(1, $this->model->pager->getCurrentPage());
+        $this->model->paginate(1, 'default', 500);
+        $this->assertSame($this->model->pager->getPageCount(), $this->model->pager->getCurrentPage());
     }
 }

From 1054352c36b42485675d1ae4db12cf03bfca3384 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 5 Oct 2021 02:43:11 +0900
Subject: [PATCH 0349/2325] fix: An if that will never be reached.

sprint returns a string.
---
 system/Database/Forge.php                     |  9 +++-
 .../Database/Forge/DropForeignKeyTest.php     | 42 +++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 tests/system/Database/Forge/DropForeignKeyTest.php

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 8a0666a9d1af..501d2e3ade8d 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -160,6 +160,13 @@ class Forge
      */
     protected $default = ' DEFAULT ';
 
+    /**
+     * DROP CONSTRAINT statement
+     *
+     * @var string
+     */
+    protected $dropConstraintStr;
+
     /**
      * Constructor.
      */
@@ -427,7 +434,7 @@ public function dropForeignKey(string $table, string $foreignName)
             $this->db->escapeIdentifiers($this->db->DBPrefix . $foreignName)
         );
 
-        if ($sql === false) { // @phpstan-ignore-line
+        if ($sql === '') {
             if ($this->db->DBDebug) {
                 throw new DatabaseException('This feature is not available for the database you are using.');
             }
diff --git a/tests/system/Database/Forge/DropForeignKeyTest.php b/tests/system/Database/Forge/DropForeignKeyTest.php
new file mode 100644
index 000000000000..96c2d2790425
--- /dev/null
+++ b/tests/system/Database/Forge/DropForeignKeyTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Forge;
+
+use CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Database\Forge;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\Mock\MockConnection;
+
+/**
+ * @internal
+ */
+final class DropForeignKeyTest extends CIUnitTestCase
+{
+    protected $db;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->db = new MockConnection([]);
+    }
+
+    public function testDropForeignKeyWithEmptyDropConstraintStrProperty()
+    {
+        $this->setPrivateProperty($this->db, 'DBDebug', true);
+
+        $forge = new Forge($this->db);
+
+        $this->expectException(DatabaseException::class);
+
+        $forge->dropForeignKey('id', 'fail');
+    }
+}

From 3fd93f502721da0678a62946e94bbfeac808ed6c Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 5 Oct 2021 03:08:37 +0900
Subject: [PATCH 0350/2325] config: remove unneeded phpstan ignore.

---
 phpstan.neon.dist | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 3847a2f02a69..01554b99ebb7 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -29,7 +29,6 @@ parameters:
 		- system/ThirdParty/*
 		- system/Validation/Views/single.php
 	ignoreErrors:
-		- '#Access to an undefined property CodeIgniter\\Database\\Forge::\$dropConstraintStr#'
 		- '#Access to an undefined property CodeIgniter\\Database\\BaseConnection::\$mysqli|\$schema#'
 		- '#Access to an undefined property CodeIgniter\\Database\\ConnectionInterface::(\$DBDriver|\$connID|\$likeEscapeStr|\$likeEscapeChar|\$escapeChar|\$protectIdentifiers|\$schema)#'
 		- '#Call to an undefined method CodeIgniter\\Database\\BaseConnection::_(disable|enable)ForeignKeyChecks\(\)#'

From 91cde2973ba41bdc96cd4f978e30504b562502f2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 5 Oct 2021 08:07:53 +0900
Subject: [PATCH 0351/2325] docs: fix coding style in user guide

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

diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index 7a88c91ac4e7..094eacc1eafa 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -106,15 +106,13 @@ Multiple files
 
 In controller::
 
-    if($imagefile = $this->request->getFiles())
-    {
-       foreach($imagefile['images'] as $img)
-       {
+    if ($imagefile = $this->request->getFiles()) {
+        foreach($imagefile['images'] as $img) {
             if ($img->isValid() && ! $img->hasMoved()) {
                 $newName = $img->getRandomName();
                 $img->move(WRITEPATH.'uploads', $newName);
             }
-       }
+        }
     }
 
 where the **images** is a loop from the form field name

From 0c1a6a08db88d264aa123bedf30979a5527586aa Mon Sep 17 00:00:00 2001
From: Daniel Tiringer <tiringerdaniel@tutanota.com>
Date: Tue, 5 Oct 2021 07:40:38 +0200
Subject: [PATCH 0352/2325] Refresh connections instead of using a new variable

---
 system/Debug/Toolbar/Collectors/Database.php | 28 +++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 429e9d63fcc7..3686dd1dea76 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -61,20 +61,12 @@ class Database extends BaseCollector
      */
     protected static $queries = [];
 
-    /**
-     * Array of connections used in a collected set
-     * of queries.
-     *
-     * @var array
-     */
-    protected static $activeConnections = [];
-
     /**
      * Constructor
      */
     public function __construct()
     {
-        $this->connections = \Config\Database::getConnections();
+        $this->getConnections();
     }
 
     /**
@@ -91,12 +83,6 @@ public static function collect(Query $query)
         $max = $config->maxQueries ?: 100;
 
         if (count(static::$queries) < $max) {
-            $connection = $query->db->getDatabase();
-
-            if (! in_array($connection, self::$activeConnections, true)) {
-                self::$activeConnections[] = $connection;
-            }
-
             static::$queries[] = $query;
         }
     }
@@ -162,8 +148,10 @@ public function getBadgeValue(): int
      */
     public function getTitleDetails(): string
     {
+        $this->getConnections();
+
         $queryCount      = count(static::$queries);
-        $connectionCount = count(static::$activeConnections);
+        $connectionCount = count($this->connections);
 
         return sprintf(
             '(%d Quer%s across %d Connection%s)',
@@ -191,4 +179,12 @@ public function icon(): string
     {
         return 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADMSURBVEhLY6A3YExLSwsA4nIycQDIDIhRWEBqamo/UNF/SjDQjF6ocZgAKPkRiFeEhoYyQ4WIBiA9QAuWAPEHqBAmgLqgHcolGQD1V4DMgHIxwbCxYD+QBqcKINseKo6eWrBioPrtQBq/BcgY5ht0cUIYbBg2AJKkRxCNWkDQgtFUNJwtABr+F6igE8olGQD114HMgHIxAVDyAhA/AlpSA8RYUwoeXAPVex5qHCbIyMgwBCkAuQJIY00huDBUz/mUlBQDqHGjgBjAwAAACexpph6oHSQAAAAASUVORK5CYII=';
     }
+
+    /**
+     * Gets the connections from the database config
+     */
+    private function getConnections()
+    {
+        $this->connections = \Config\Database::getConnections();
+    }
 }

From 3cb9986c30b0b581a29c81ee883faf4f4134536e Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 5 Oct 2021 22:08:56 +0800
Subject: [PATCH 0353/2325] Add detector for tabs in RST files

---
 utils/check_tabs_in_rst.php | 71 +++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 utils/check_tabs_in_rst.php

diff --git a/utils/check_tabs_in_rst.php b/utils/check_tabs_in_rst.php
new file mode 100644
index 000000000000..abfd7cc9f558
--- /dev/null
+++ b/utils/check_tabs_in_rst.php
@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+require __DIR__ . '/../system/Test/bootstrap.php';
+
+use CodeIgniter\CLI\CLI;
+
+$rstFilesWithTabs = (string) shell_exec('git grep -EIPn "\t" -- "*.rst"');
+$rstFilesWithTabs = explode("\n", $rstFilesWithTabs);
+$rstFilesWithTabs = array_map(static function (string $line): array {
+    preg_match('/^(?P<file>[^:]+):(?P<line>[0-9]+):(?P<code>.+)$/', $line, $matches);
+
+    return [
+        'file' => $matches['file'],
+        'line' => $matches['line'],
+        'code' => $matches['code'],
+    ];
+}, array_filter($rstFilesWithTabs));
+
+$normalizedRstFilesWithTabs = [];
+
+foreach ($rstFilesWithTabs as ['file' => $file, 'line' => $line, 'code' => $code]) {
+    if (! isset($normalizedRstFilesWithTabs[$file])) {
+        $normalizedRstFilesWithTabs[$file] = [];
+    }
+
+    $normalizedRstFilesWithTabs[$file][] = ['line' => $line, 'code' => $code];
+}
+
+unset($rstFilesWithTabs);
+
+if ($normalizedRstFilesWithTabs !== []) {
+    printf(
+        "%s\n\n%s\n",
+        CLI::color('Tabs in RST files were detected:', 'white', 'red'),
+        implode("\n", array_map(
+            static function (string $file, array $parts): string {
+                return sprintf(
+                    "%s%s%s\n",
+                    CLI::color('* in ', 'light_red'),
+                    CLI::color($file, 'yellow'),
+                    implode("\n", array_map(static function (array $line): string {
+                        return sprintf(
+                            '%s | %s',
+                            str_pad($line['line'], 4, ' ', STR_PAD_LEFT),
+                            str_replace("\t", CLI::color('    ', 'black', 'red'), $line['code']),
+                        );
+                    }, $parts)),
+                );
+            },
+            array_keys($normalizedRstFilesWithTabs),
+            array_values($normalizedRstFilesWithTabs),
+        )),
+    );
+
+    exit(1);
+}
+
+CLI::write('No tabs in RST files were detected.', 'black', 'green');
+
+exit(0);

From b2cd58bee2718b3d4568af8c26bf4330baf844cf Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 5 Oct 2021 22:09:41 +0800
Subject: [PATCH 0354/2325] Add tab detector to workflows

---
 .github/workflows/test-userguide.yml | 12 ++++++++----
 admin/pre-commit                     | 14 +++++++++-----
 utils/check_tabs_in_rst.php          |  6 +++---
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test-userguide.yml b/.github/workflows/test-userguide.yml
index a1a1a25508a3..44cfa52c8b17 100644
--- a/.github/workflows/test-userguide.yml
+++ b/.github/workflows/test-userguide.yml
@@ -6,18 +6,22 @@ name: Test User Guide
 
 on:
   pull_request:
-    branches:
-      - 'develop'
-      - '4.*'
     paths:
       - 'user_guide_src/**'
+      - '.github/workflows/test-userguide.yml'
 
 jobs:
   syntax_check:
     name: Check User Guide syntax
     runs-on: ubuntu-20.04
+
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Detect usage of tabs in RST files
+        run: php utils/check_tabs_in_rst.php
+
       - uses: ammaraskar/sphinx-action@0.4
         with:
           docs-folder: user_guide_src
diff --git a/admin/pre-commit b/admin/pre-commit
index 582b8bd4f92d..4f1e7d11f544 100644
--- a/admin/pre-commit
+++ b/admin/pre-commit
@@ -1,15 +1,14 @@
 #!/bin/sh
 
 PROJECT=`php -r "echo dirname(dirname(dirname(realpath('$0'))));"`
-STAGED_FILES_CMD=`git diff --cached --name-only --diff-filter=ACMR HEAD | grep \\\\.php$`
-
-SFILES=${SFILES:-$STAGED_FILES_CMD}
+STAGED_PHP_FILES=`git diff --cached --name-only --diff-filter=ACMR HEAD | grep \\\\.php$`
+STAGED_RST_FILES=`git diff --cached --name-only --diff-filter=ACMR HEAD | grep \\\\.rst$`
 
 echo "Starting CodeIgniter precommit..."
 
-if [ "$SFILES" != "" ]; then
+if [ "$STAGED_PHP_FILES" != "" ]; then
     echo "Linting PHP code..."
-    for FILE in $SFILES; do
+    for FILE in $STAGED_PHP_FILES; do
         php -l -d display_errors=0 "$PROJECT/$FILE"
 
         if [ $? != 0 ]; then
@@ -66,4 +65,9 @@ if [ "$FILES" != "" ]; then
     fi
 fi
 
+if [ "$STAGED_RST_FILES" != "" ]; then
+    echo "Checking for tabs in RST files"
+    php ./utils/check_tabs_in_rst.php
+fi
+
 exit $?
diff --git a/utils/check_tabs_in_rst.php b/utils/check_tabs_in_rst.php
index abfd7cc9f558..a660aebcdc32 100644
--- a/utils/check_tabs_in_rst.php
+++ b/utils/check_tabs_in_rst.php
@@ -42,18 +42,18 @@
 if ($normalizedRstFilesWithTabs !== []) {
     printf(
         "%s\n\n%s\n",
-        CLI::color('Tabs in RST files were detected:', 'white', 'red'),
+        CLI::color('Tabs in RST files were detected:', 'light_gray', 'red'),
         implode("\n", array_map(
             static function (string $file, array $parts): string {
                 return sprintf(
-                    "%s%s%s\n",
+                    "%s%s\n%s\n",
                     CLI::color('* in ', 'light_red'),
                     CLI::color($file, 'yellow'),
                     implode("\n", array_map(static function (array $line): string {
                         return sprintf(
                             '%s | %s',
                             str_pad($line['line'], 4, ' ', STR_PAD_LEFT),
-                            str_replace("\t", CLI::color('    ', 'black', 'red'), $line['code']),
+                            str_replace("\t", CLI::color('....', 'light_gray', 'red'), $line['code']),
                         );
                     }, $parts)),
                 );

From 0d2b1d202eead7319e7fe8babde49e73e4ab0b99 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 5 Oct 2021 22:21:38 +0800
Subject: [PATCH 0355/2325] Fix tabs additionally detected in other RST files

---
 contributing/DCO.rst           | 36 ++++++++++----------
 contributing/documentation.rst | 60 +++++++++++++++++-----------------
 contributing/internals.rst     | 12 +++----
 3 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/contributing/DCO.rst b/contributing/DCO.rst
index c8f9b49c6f84..384f898ebdf2 100644
--- a/contributing/DCO.rst
+++ b/contributing/DCO.rst
@@ -4,24 +4,24 @@ Developer's Certificate of Origin 1.1
 
 By making a contribution to this project, I certify that:
 
-(1)	The contribution was created in whole or in part by me and I
-	have the right to submit it under the open source license
-	indicated in the file; or
+(1) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
 
-(2)	The contribution is based upon previous work that, to the best
-	of my knowledge, is covered under an appropriate open source
-	license and I have the right under that license to submit that
-	work with modifications, whether created in whole or in part
-	by me, under the same open source license (unless I am
-	permitted to submit under a different license), as indicated
-	in the file; or
+(2) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
 
-(3)	The contribution was provided directly to me by some other
-	person who certified (1), (2) or (3) and I have not modified
-	it.
+(3) The contribution was provided directly to me by some other
+    person who certified (1), (2) or (3) and I have not modified
+    it.
 
-(4)	I understand and agree that this project and the contribution
-	are public and that a record of the contribution (including all
-	personal information I submit with it, including my sign-off) is
-	maintained indefinitely and may be redistributed consistent with
-	this project or the open source license(s) involved.
+(4) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
diff --git a/contributing/documentation.rst b/contributing/documentation.rst
index bf7a56662f49..03164f183e6e 100644
--- a/contributing/documentation.rst
+++ b/contributing/documentation.rst
@@ -13,12 +13,12 @@ It is created automatically by inserting the following:
 
 ::
 
-	.. contents::
-		:local:
+    .. contents::
+        :local:
 
-	.. raw:: html
+    .. raw:: html
 
-	<div class="custom-index container"></div>
+    <div class="custom-index container"></div>
 
 .. contents::
   :local:
@@ -51,44 +51,44 @@ Headings are formed by using certain characters as underlines for a bit of
 text.  Major headings, like page titles and section headings also use
 overlines.  Other headings just use underlines, with the following hierarchy::
 
-	# with overline for page titles
-	* with overline for major sections
-	= for subsections
-	- for subsubsections
-	^ for subsubsubsections
-	" for subsubsubsubsections (!)
+    # with overline for page titles
+    * with overline for major sections
+    = for subsections
+    - for subsubsections
+    ^ for subsubsubsections
+    " for subsubsubsubsections (!)
 
 The :download:`TextMate ELDocs Bundle <./ELDocs.tmbundle.zip>` can help you
 create these with the following tab triggers::
 
-	title->
+    title->
 
-		##########
-		Page Title
-		##########
+        ##########
+        Page Title
+        ##########
 
-	sec->
+    sec->
 
-		*************
-		Major Section
-		*************
+        *************
+        Major Section
+        *************
 
-	sub->
+    sub->
 
-		Subsection
-		==========
+        Subsection
+        ==========
 
-	sss->
+    sss->
 
-		SubSubSection
-		-------------
+        SubSubSection
+        -------------
 
-	ssss->
+    ssss->
 
-		SubSubSubSection
-		^^^^^^^^^^^^^^^^
+        SubSubSubSection
+        ^^^^^^^^^^^^^^^^
 
-	sssss->
+    sssss->
 
-		SubSubSubSubSection (!)
-		"""""""""""""""""""""""
+        SubSubSubSubSection (!)
+        """""""""""""""""""""""
diff --git a/contributing/internals.rst b/contributing/internals.rst
index ba7f908f88e9..06f716cb95f8 100644
--- a/contributing/internals.rst
+++ b/contributing/internals.rst
@@ -16,12 +16,12 @@ Any dependencies must be able to be passed into the constructor. If you do need
 of the other core packages, you can create that in the constructor using the
 Services class, as long as you provide a way for dependencies to override that::
 
-	public function __construct(Foo $foo=null)
-	{
-		$this->foo = $foo instanceOf Foo
-			? $foo
-			: \Config\Services::foo();
-	}
+    public function __construct(Foo $foo=null)
+    {
+        $this->foo = $foo instanceOf Foo
+            ? $foo
+            : \Config\Services::foo();
+    }
 
 Type hinting
 ============

From 26b052ef9967d7f2355b05b62f25fc4c81cbed9a Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Mon, 4 Oct 2021 22:27:51 +0900
Subject: [PATCH 0356/2325] test: add dropKey test.

---
 tests/system/Database/Live/ForgeTest.php | 34 ++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index d459bc92e391..453562c95fa4 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -1068,4 +1068,38 @@ public function testDropMultipleColumnWithString()
 
         $this->forge->dropTable('forge_test_four', true);
     }
+
+    public function testDropKey()
+    {
+        $this->forge->dropTable('key_test_users', true);
+        $keyName = 'key_test_users_id';
+
+        $attributes = [];
+
+        if ($this->db->DBDriver === 'MySQLi') {
+            $keyName = 'id';
+            $attributes = ['ENGINE' => 'InnoDB'];
+        }
+
+        $this->forge->addField([
+            'id' => [
+                'type'       => 'INTEGER',
+                'constraint' => 11,
+            ],
+            'name' => [
+                'type'       => 'VARCHAR',
+                'constraint' => 255,
+            ],
+        ]);
+        $this->forge->addKey('id');
+        $this->forge->createTable('key_test_users', true, $attributes);
+
+        $this->forge->dropKey('key_test_users', $keyName);
+
+        $foreignKeyData = $this->db->getIndexData('key_test_users');
+
+        $this->assertEmpty($foreignKeyData);
+
+        $this->forge->dropTable('key_test_users', true);
+    }
 }

From c8f48ba62b5a9033c562fb166dba9727860d3cf2 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Mon, 4 Oct 2021 22:29:18 +0900
Subject: [PATCH 0357/2325] feat: add dropKey method.

---
 system/Database/Forge.php         | 24 ++++++++++++++++++++++++
 system/Database/MySQLi/Forge.php  | 23 +++++++++++++++++++++++
 system/Database/Postgre/Forge.php |  7 +++++++
 system/Database/SQLSRV/Forge.php  |  8 ++++++++
 system/Database/SQLite3/Forge.php |  7 +++++++
 5 files changed, 69 insertions(+)

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 501d2e3ade8d..fa0c5aa48643 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -421,6 +421,30 @@ public function addForeignKey($fieldName = '', string $tableName = '', $tableFie
         return $this;
     }
 
+    /**
+     * @throws DatabaseException
+     *
+     * @return BaseResult|bool|false|mixed|Query
+     */
+    public function dropKey(string $table, string $keyName)
+    {
+        $sql = sprintf(
+            $this->dropIndexStr,
+            $this->db->escapeIdentifiers($this->db->DBPrefix . $keyName),
+            $this->db->escapeIdentifiers($this->db->DBPrefix . $table),
+        );
+
+        if ($sql === false) { // @phpstan-ignore-line
+            if ($this->db->DBDebug) {
+                throw new DatabaseException('This feature is not available for the database you are using.');
+            }
+
+            return false;
+        }
+
+        return $this->db->query($sql);
+    }
+
     /**
      * @throws DatabaseException
      *
diff --git a/system/Database/MySQLi/Forge.php b/system/Database/MySQLi/Forge.php
index 094ae54264f9..2e67dad712ef 100644
--- a/system/Database/MySQLi/Forge.php
+++ b/system/Database/MySQLi/Forge.php
@@ -39,6 +39,13 @@ class Forge extends BaseForge
      */
     protected $dropConstraintStr = 'ALTER TABLE %s DROP FOREIGN KEY %s';
 
+    /**
+     * DROP INDEX statement
+     *
+     * @var string
+     */
+    protected $dropIndexStr = 'DROP INDEX %s ON %s';
+
     /**
      * CREATE TABLE keys flag
      *
@@ -220,4 +227,20 @@ protected function _processIndexes(string $table): string
 
         return $sql;
     }
+
+    /**
+     * @throws DatabaseException
+     *
+     * @return BaseResult|bool|false|mixed|Query
+     */
+    public function dropKey(string $table, string $keyName)
+    {
+        $sql = sprintf(
+            $this->dropIndexStr,
+            $this->db->escapeIdentifiers($keyName),
+            $this->db->escapeIdentifiers($this->db->DBPrefix . $table),
+        );
+
+        return $this->db->query($sql);
+    }
 }
diff --git a/system/Database/Postgre/Forge.php b/system/Database/Postgre/Forge.php
index 2f1a0769bd07..a050c6888e38 100644
--- a/system/Database/Postgre/Forge.php
+++ b/system/Database/Postgre/Forge.php
@@ -32,6 +32,13 @@ class Forge extends BaseForge
      */
     protected $dropConstraintStr = 'ALTER TABLE %s DROP CONSTRAINT %s';
 
+    /**
+     * DROP INDEX statement
+     *
+     * @var string
+     */
+    protected $dropIndexStr = 'DROP INDEX %s';
+
     /**
      * UNSIGNED support
      *
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
index ae920ceae152..14d297604cbe 100755
--- a/system/Database/SQLSRV/Forge.php
+++ b/system/Database/SQLSRV/Forge.php
@@ -26,6 +26,13 @@ class Forge extends BaseForge
      */
     protected $dropConstraintStr;
 
+    /**
+     * DROP INDEX statement
+     *
+     * @var string
+     */
+    protected $dropIndexStr;
+
     /**
      * CREATE DATABASE IF statement
      *
@@ -106,6 +113,7 @@ public function __construct(BaseConnection $db)
         $this->renameTableStr = 'EXEC sp_rename [' . $this->db->escapeIdentifiers($this->db->schema) . '.%s] , %s ;';
 
         $this->dropConstraintStr = 'ALTER TABLE ' . $this->db->escapeIdentifiers($this->db->schema) . '.%s DROP CONSTRAINT %s';
+        $this->dropIndexStr      = 'DROP INDEX %s ON ' . $this->db->escapeIdentifiers($this->db->schema) . '.%s';
     }
 
     /**
diff --git a/system/Database/SQLite3/Forge.php b/system/Database/SQLite3/Forge.php
index 3275322beb92..1f48f20bd54e 100644
--- a/system/Database/SQLite3/Forge.php
+++ b/system/Database/SQLite3/Forge.php
@@ -20,6 +20,13 @@
  */
 class Forge extends BaseForge
 {
+    /**
+     * DROP INDEX statement
+     *
+     * @var string
+     */
+    protected $dropIndexStr = 'DROP INDEX %s';
+
     /**
      * @var Connection
      */

From 328c8777d9b0a1cd06798b12c2c6e41c37b8f153 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Mon, 4 Oct 2021 22:30:04 +0900
Subject: [PATCH 0358/2325] style: compser cs-fix

---
 tests/system/Database/Live/ForgeTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 453562c95fa4..981269d12a08 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -1077,7 +1077,7 @@ public function testDropKey()
         $attributes = [];
 
         if ($this->db->DBDriver === 'MySQLi') {
-            $keyName = 'id';
+            $keyName    = 'id';
             $attributes = ['ENGINE' => 'InnoDB'];
         }
 

From 210a96f3ad59784f52e6fe5efc935279783e4822 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 5 Oct 2021 02:23:06 +0900
Subject: [PATCH 0359/2325] style: Fix for phpstan

---
 system/Database/Forge.php        | 15 ++++++++++++---
 system/Database/MySQLi/Forge.php | 13 +++----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index fa0c5aa48643..c4bd082b73c4 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -167,6 +167,13 @@ class Forge
      */
     protected $dropConstraintStr;
 
+    /**
+     * DROP INDEX statement
+     *
+     * @var string
+     */
+    protected $dropIndexStr = 'DROP INDEX %s ON %s';
+
     /**
      * Constructor.
      */
@@ -422,19 +429,21 @@ public function addForeignKey($fieldName = '', string $tableName = '', $tableFie
     }
 
     /**
+     * Drop Key
+     *
      * @throws DatabaseException
      *
      * @return BaseResult|bool|false|mixed|Query
      */
-    public function dropKey(string $table, string $keyName)
+    public function dropKey(string $table, string $fieldName)
     {
         $sql = sprintf(
             $this->dropIndexStr,
-            $this->db->escapeIdentifiers($this->db->DBPrefix . $keyName),
+            $this->db->escapeIdentifiers($this->db->DBPrefix . $fieldName),
             $this->db->escapeIdentifiers($this->db->DBPrefix . $table),
         );
 
-        if ($sql === false) { // @phpstan-ignore-line
+        if ($sql === '') {
             if ($this->db->DBDebug) {
                 throw new DatabaseException('This feature is not available for the database you are using.');
             }
diff --git a/system/Database/MySQLi/Forge.php b/system/Database/MySQLi/Forge.php
index 2e67dad712ef..3038f8a9165f 100644
--- a/system/Database/MySQLi/Forge.php
+++ b/system/Database/MySQLi/Forge.php
@@ -39,13 +39,6 @@ class Forge extends BaseForge
      */
     protected $dropConstraintStr = 'ALTER TABLE %s DROP FOREIGN KEY %s';
 
-    /**
-     * DROP INDEX statement
-     *
-     * @var string
-     */
-    protected $dropIndexStr = 'DROP INDEX %s ON %s';
-
     /**
      * CREATE TABLE keys flag
      *
@@ -229,15 +222,15 @@ protected function _processIndexes(string $table): string
     }
 
     /**
-     * @throws DatabaseException
+     * Drop Key
      *
      * @return BaseResult|bool|false|mixed|Query
      */
-    public function dropKey(string $table, string $keyName)
+    public function dropKey(string $table, string $fieldName)
     {
         $sql = sprintf(
             $this->dropIndexStr,
-            $this->db->escapeIdentifiers($keyName),
+            $this->db->escapeIdentifiers($fieldName),
             $this->db->escapeIdentifiers($this->db->DBPrefix . $table),
         );
 

From 022940a84d2d0588efcc01d98f839f9df70a83cb Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Wed, 6 Oct 2021 01:05:19 +0900
Subject: [PATCH 0360/2325] docs: add dropKey description.

---
 user_guide_src/source/changelogs/v4.1.5.rst |  1 +
 user_guide_src/source/dbmgmt/forge.rst      | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/user_guide_src/source/changelogs/v4.1.5.rst b/user_guide_src/source/changelogs/v4.1.5.rst
index 6b9b75324c36..328e45163cb3 100644
--- a/user_guide_src/source/changelogs/v4.1.5.rst
+++ b/user_guide_src/source/changelogs/v4.1.5.rst
@@ -9,6 +9,7 @@ Enhancements:
 
 - Added Cache config for reserved characters
 - The ``addForeignKey`` function of the ``Forge`` class can now define composite foreign keys in an array
+- The ``dropKey`` function of the ``Forge`` class can remove key
 
 Changes:
 
diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index 6cbdfe506e8a..d9b3bd631dbf 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -304,6 +304,17 @@ Execute a DROP FOREIGN KEY.
     // Produces: ALTER TABLE 'tablename' DROP FOREIGN KEY 'users_foreign'
     $forge->dropForeignKey('tablename','users_foreign');
 
+
+Dropping a Key
+======================
+
+Execute a DROP KEY.
+
+::
+
+    // Produces: DROP INDEX 'users_index' ON 'tablename'
+    $forge->dropKey('tablename','users_index');
+
 Renaming a table
 ================
 

From 19009ce705d9b780bdfd308446fc60854d507bfc Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Wed, 6 Oct 2021 01:13:31 +0900
Subject: [PATCH 0361/2325] refactor: The process of getting the prefix of the
 function was extracted to the method.

---
 system/Database/BaseConnection.php     | 11 +++++++++--
 system/Database/Postgre/Connection.php |  8 ++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 70bde67b6d50..9cb44e246296 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -1269,8 +1269,7 @@ protected function _escapeString(string $str): string
      */
     public function callFunction(string $functionName, ...$params): bool
     {
-        $driver = strtolower($this->DBDriver);
-        $driver = ($driver === 'postgre' ? 'pg' : $driver) . '_';
+        $driver = $this->getDriverFunctionPrefix();
 
         if (strpos($driver, $functionName) === false) {
             $functionName = $driver . $functionName;
@@ -1287,6 +1286,14 @@ public function callFunction(string $functionName, ...$params): bool
         return $functionName(...$params);
     }
 
+    /**
+     * Get the prefix of the function to access the DB.
+     */
+    protected function getDriverFunctionPrefix(): string
+    {
+        return strtolower($this->DBDriver) . '_';
+    }
+
     //--------------------------------------------------------------------
     // META Methods
     //--------------------------------------------------------------------
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
index 54b02dd1ca2c..a768e0ecf432 100644
--- a/system/Database/Postgre/Connection.php
+++ b/system/Database/Postgre/Connection.php
@@ -144,6 +144,14 @@ protected function execute(string $sql)
         return false;
     }
 
+    /**
+     * Get the prefix of the function to access the DB.
+     */
+    protected function getDriverFunctionPrefix(): string
+    {
+        return 'pg_';
+    }
+
     /**
      * Returns the total number of rows affected by this query.
      */

From 10ff5e908809c31fa411bf2e5db2e75a50f63031 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Wed, 6 Oct 2021 01:39:01 +0900
Subject: [PATCH 0362/2325] feat: Fixed an issue where an unnecessary prefix
 was given when the random number was a column.

---
 system/Database/BaseBuilder.php             |  1 +
 tests/system/Database/Builder/OrderTest.php | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 549e9ec180a0..d429819d9c38 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1260,6 +1260,7 @@ public function orderBy(string $orderBy, string $direction = '', ?bool $escape =
         if ($direction === 'RANDOM') {
             $direction = '';
             $orderBy   = ctype_digit($orderBy) ? sprintf($this->randomKeyword[1], $orderBy) : $this->randomKeyword[0];
+            $escape    = false;
         } elseif ($direction !== '') {
             $direction = in_array($direction, ['ASC', 'DESC'], true) ? ' ' . $direction : '';
         }
diff --git a/tests/system/Database/Builder/OrderTest.php b/tests/system/Database/Builder/OrderTest.php
index 3b3b6622c59f..64649822eb6d 100644
--- a/tests/system/Database/Builder/OrderTest.php
+++ b/tests/system/Database/Builder/OrderTest.php
@@ -61,4 +61,17 @@ public function testOrderRandom()
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
+
+    public function testOrderRandomWithRandomColumn()
+    {
+        $this->db->setPrefix('fail_');
+        $builder = new BaseBuilder('user', $this->db);
+        $this->setPrivateProperty($builder, 'randomKeyword', ['"SYSTEM"."RANDOM"']);
+
+        $builder->orderBy('name', 'random');
+
+        $expectedSQL = 'SELECT * FROM "fail_user" ORDER BY "SYSTEM"."RANDOM"';
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 }

From eff13348e3508c8490fd74b3cf776bf9c45f5df6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Oct 2021 02:32:24 +0000
Subject: [PATCH 0363/2325] chore(deps-dev): update rector/rector requirement
 from 0.11.56 to 0.11.57 (#5177)

---
 composer.json                | 2 +-
 system/HTTP/RequestTrait.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 0bf9fa554d2a..fd8b7198f11e 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^0.12.91",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.56",
+        "rector/rector": "0.11.57",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {
diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php
index 50444a481acf..c0bb005099ab 100644
--- a/system/HTTP/RequestTrait.php
+++ b/system/HTTP/RequestTrait.php
@@ -279,7 +279,7 @@ public function fetchGlobal(string $method, $index = null, ?int $filter = null,
                 $filter !== FILTER_DEFAULT
                 || (
                     (is_numeric($flags) && $flags !== 0)
-                    || is_array($flags) && count($flags) > 0
+                    || is_array($flags) && $flags !== []
                 )
             )
         ) {

From 21e3bca85e1b4ba9fbf633da8f2b50a64fc4bccf Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Oct 2021 12:53:54 +0900
Subject: [PATCH 0364/2325] docs: convert RST to MD

---
 CONTRIBUTING.md             |   6 +-
 contributing/DCO.md         |  21 ++++
 contributing/DCO.rst        |  27 -----
 contributing/README.md      |  82 ++++++++++++++
 contributing/README.rst     |  78 -------------
 contributing/css.md         |  45 ++++++++
 contributing/css.rst        |  45 --------
 contributing/guidelines.md  | 100 ++++++++++++++++
 contributing/guidelines.rst |  99 ----------------
 contributing/internals.md   | 163 ++++++++++++++++++++++++++
 contributing/internals.rst  | 148 ------------------------
 contributing/signing.md     |  72 ++++++++++++
 contributing/signing.rst    |  65 -----------
 contributing/workflow.md    | 220 ++++++++++++++++++++++++++++++++++++
 contributing/workflow.rst   | 206 ---------------------------------
 15 files changed, 706 insertions(+), 671 deletions(-)
 create mode 100644 contributing/DCO.md
 delete mode 100644 contributing/DCO.rst
 create mode 100644 contributing/README.md
 delete mode 100644 contributing/README.rst
 create mode 100644 contributing/css.md
 delete mode 100644 contributing/css.rst
 create mode 100644 contributing/guidelines.md
 delete mode 100644 contributing/guidelines.rst
 create mode 100644 contributing/internals.md
 delete mode 100644 contributing/internals.rst
 create mode 100644 contributing/signing.md
 delete mode 100644 contributing/signing.rst
 create mode 100644 contributing/workflow.md
 delete mode 100644 contributing/workflow.rst

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index dd8085cdd913..18abe9ce7468 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,7 +7,7 @@ We expect all contributions to conform to our
 be commented (inside the PHP source files), be documented (in the
 [user guide](https://codeigniter4.github.io/userguide/)), and unit tested (in
 the [test folder](https://github.com/codeigniter4/CodeIgniter4/tree/develop/tests)).
-There is a [Contributing to CodeIgniter](./contributing/README.rst) section in the repository which describes the contribution process; this page is an overview.
+There is a [Contributing to CodeIgniter](./contributing/README.md) section in the repository which describes the contribution process; this page is an overview.
 
 Note, we expect all code changes or bug-fixes to be accompanied by one or more tests added to our test suite
 to prove the code works. If pull requests are not accompanied by relevant tests, they will likely be closed.
@@ -24,7 +24,7 @@ Issues are a quick way to point out a bug. If you find a bug or documentation er
 2. The Issue has not already been fixed (check the develop branch or look for [closed Issues](https://github.com/codeigniter4/CodeIgniter4/issues?q=is%3Aissue+is%3Aclosed))
 3. It's not something really obvious that you can fix yourself
 
-Reporting Issues is helpful, but an even [better approach](./contributing/workflow.rst) is to send a
+Reporting Issues is helpful, but an even [better approach](./contributing/workflow.md) is to send a
 [Pull Request](https://help.github.com/en/articles/creating-a-pull-request), which is done by
 [Forking](https://help.github.com/en/articles/fork-a-repo) the main repository and making
 a [Commit](https://help.github.com/en/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project)
@@ -71,7 +71,7 @@ changes separate from each other and from whatever else you are doing with your
 
 ### Signing
 
-You must [GPG-sign](./contributing/signing.rst) your work, certifying that you either wrote the work or
+You must [GPG-sign](./contributing/signing.md) your work, certifying that you either wrote the work or
 otherwise have the right to pass it on to an open-source project. This is *not* just a "signed-off-by"
 commit, but instead, a digitally signed one.
 
diff --git a/contributing/DCO.md b/contributing/DCO.md
new file mode 100644
index 000000000000..d8a298c5c7dc
--- /dev/null
+++ b/contributing/DCO.md
@@ -0,0 +1,21 @@
+Developer's Certificate of Origin 1.1
+=====================================
+
+By making a contribution to this project, I certify that:
+
+1. The contribution was created in whole or in part by me and I have
+    the right to submit it under the open source license indicated in
+    the file; or
+2. The contribution is based upon previous work that, to the best of my
+    knowledge, is covered under an appropriate open source license and I
+    have the right under that license to submit that work with
+    modifications, whether created in whole or in part by me, under the
+    same open source license (unless I am permitted to submit under a
+    different license), as indicated in the file; or
+3. The contribution was provided directly to me by some other person
+    who certified (1), (2) or (3) and I have not modified it.
+4. I understand and agree that this project and the contribution are
+    public and that a record of the contribution (including all personal
+    information I submit with it, including my sign-off) is maintained
+    indefinitely and may be redistributed consistent with this project
+    or the open source license(s) involved.
diff --git a/contributing/DCO.rst b/contributing/DCO.rst
deleted file mode 100644
index 384f898ebdf2..000000000000
--- a/contributing/DCO.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-#####################################
-Developer's Certificate of Origin 1.1
-#####################################
-
-By making a contribution to this project, I certify that:
-
-(1) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(2) The contribution is based upon previous work that, to the best
-    of my knowledge, is covered under an appropriate open source
-    license and I have the right under that license to submit that
-    work with modifications, whether created in whole or in part
-    by me, under the same open source license (unless I am
-    permitted to submit under a different license), as indicated
-    in the file; or
-
-(3) The contribution was provided directly to me by some other
-    person who certified (1), (2) or (3) and I have not modified
-    it.
-
-(4) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including all
-    personal information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed consistent with
-    this project or the open source license(s) involved.
diff --git a/contributing/README.md b/contributing/README.md
new file mode 100644
index 000000000000..9169d72c8ad1
--- /dev/null
+++ b/contributing/README.md
@@ -0,0 +1,82 @@
+Contributing to CodeIgniter
+===========================
+
+-   [Contribution guidelines](./guidelines.md)
+-   [Contribution workflow](./workflow.md)
+-   [Contribution signing](./signing.md)
+-   [Contribution CSS](./css.md)
+-   [Framework internals](./internals.md)
+-   [CodeIgniter documentation](./documentation.rst)
+-   [CodeIgniter Coding Style Guide](./styleguide.md)
+-   [Developer's Certificate of Origin](../DCO.txt)
+
+CodeIgniter is a community driven project and accepts contributions of
+code and documentation from the community. These contributions are made
+in the form of Issues or [Pull
+Requests](https://help.github.com/articles/using-pull-requests/) on the
+[CodeIgniter4 repository](https://github.com/codeigniter4/CodeIgniter4)
+on GitHub.
+
+Issues are a quick way to point out a bug. If you find a bug or
+documentation error in CodeIgniter then please check a few things first:
+
+-   There is not already an open Issue
+-   The issue has already been fixed (check the develop branch, or look
+    for closed Issues)
+-   Is it something really obvious that you fix it yourself?
+
+Reporting issues is helpful but an even better approach is to send a
+Pull Request, which is done by "Forking" the main repository and
+committing to your own copy. This will require you to use the version
+control system called Git.
+
+Support
+-------
+
+Please note that GitHub is not for general support questions! If you are
+having trouble using a feature of CodeIgniter, ask for help on our
+[forums](http://forum.codeigniter.com/) instead.
+
+If you are not sure whether you are using something correctly or if you
+have found a bug, again - please ask on the forums first.
+
+Security
+--------
+
+Did you find a security issue in CodeIgniter?
+
+Please *don't* disclose it publicly, but e-mail us at
+<security@codeigniter.com>, or report it via our page on
+[HackerOne](https://hackerone.com/codeigniter).
+
+If you've found a critical vulnerability, we'd be happy to credit you in
+our
+[ChangeLog](https://codeigniter4.github.io/CodeIgniter4/changelogs/index.html).
+
+Tips for a Good Issue Report
+----------------------------
+
+Use a descriptive subject line (eg parser library chokes on commas)
+rather than a vague one (eg. your code broke).
+
+Address a single issue in a report.
+
+Identify the CodeIgniter version (eg 4.0.1) and the component if you
+know it (eg. parser library)
+
+Explain what you expected to happen, and what did happen. Include error
+messages and stacktrace, if any.
+
+Include short code segments if they help to explain. Use a pastebin or
+dropbox facility to include longer segments of code or screenshots - do
+not include them in the issue report itself. This means setting a
+reasonable expiry for those, until the issue is resolved or closed.
+
+If you know how to fix the issue, you can do so in your own fork &
+branch, and submit a pull request. The issue report information above
+should be part of that.
+
+If your issue report can describe the steps to reproduce the problem,
+that is great. If you can include a unit test that reproduces the
+problem, that is even better, as it gives whoever is fixing it a clearer
+target!
diff --git a/contributing/README.rst b/contributing/README.rst
deleted file mode 100644
index 0e73b9e5d759..000000000000
--- a/contributing/README.rst
+++ /dev/null
@@ -1,78 +0,0 @@
-###########################
-Contributing to CodeIgniter
-###########################
-
-- `Contribution guidelines <./guidelines.rst>`_
-- `Contribution workflow <./workflow.rst>`_
-- `Contribution signing <./signing.rst>`_
-- `Contribution CSS <./css.rst>`_
-- `Framework internals <./internals.rst>`_
-- `CodeIgniter documentation <./documentation.rst>`_
-- `CodeIgniter Coding Style Guide <./styleguide.md>`_
-- `Developer's Certificate of Origin <../DCO.txt>`_
-
-CodeIgniter is a community driven project and accepts contributions of code
-and documentation from the community. These contributions are made in the form
-of Issues or `Pull Requests <https://help.github.com/articles/using-pull-requests/>`_
-on the `CodeIgniter4 repository <https://github.com/codeigniter4/CodeIgniter4>`_ on GitHub.
-
-Issues are a quick way to point out a bug. If you find a bug or documentation
-error in CodeIgniter then please check a few things first:
-
-- There is not already an open Issue
-- The issue has already been fixed (check the develop branch, or look for
-  closed Issues)
-- Is it something really obvious that you fix it yourself?
-
-Reporting issues is helpful but an even better approach is to send a Pull
-Request, which is done by "Forking" the main repository and committing to your
-own copy. This will require you to use the version control system called Git.
-
-*******
-Support
-*******
-
-Please note that GitHub is not for general support questions! If you are
-having trouble using a feature of CodeIgniter, ask for help on our
-`forums <http://forum.codeigniter.com/>`_ instead.
-
-If you are not sure whether you are using something correctly or if you
-have found a bug, again - please ask on the forums first.
-
-********
-Security
-********
-
-Did you find a security issue in CodeIgniter?
-
-Please *don't* disclose it publicly, but e-mail us at security@codeigniter.com,
-or report it via our page on `HackerOne <https://hackerone.com/codeigniter>`_.
-
-If you've found a critical vulnerability, we'd be happy to credit you in our
-`ChangeLog <https://codeigniter4.github.io/CodeIgniter4/changelogs/index.html>`_.
-
-****************************
-Tips for a Good Issue Report
-****************************
-
-Use a descriptive subject line (eg parser library chokes on commas) rather than
-a vague one (eg. your code broke).
-
-Address a single issue in a report.
-
-Identify the CodeIgniter version (eg 4.0.1) and the component if you know it (eg. parser library)
-
-Explain what you expected to happen, and what did happen.
-Include error messages and stacktrace, if any.
-
-Include short code segments if they help to explain.
-Use a pastebin or dropbox facility to include longer segments of code or
-screenshots - do not include them in the issue report itself.
-This means setting a reasonable expiry for those, until the issue is resolved or closed.
-
-If you know how to fix the issue, you can do so in your own fork & branch, and submit a pull request.
-The issue report information above should be part of that.
-
-If your issue report can describe the steps to reproduce the problem, that is great.
-If you can include a unit test that reproduces the problem, that is even better,
-as it gives whoever is fixing it a clearer target!
diff --git a/contributing/css.md b/contributing/css.md
new file mode 100644
index 000000000000..d824dccaee03
--- /dev/null
+++ b/contributing/css.md
@@ -0,0 +1,45 @@
+Contribution CSS
+================
+
+CodeIgniter uses SASS to generate the debug toolbar's CSS. Therefore,
+you will need to install it first. You can find further instructions on
+the official website: <https://sass-lang.com/install>
+
+Compile SASS files
+------------------
+
+Open your terminal, and navigate to CodeIgniter's root folder. To
+generate the CSS file, use the following command:
+
+`sass --no-cache --sourcemap=none admin/css/debug-toolbar/toolbar.scss system/Debug/Toolbar/Views/toolbar.css`
+
+Details: 
+- `--no-cache` is a parameter defined to disable SASS cache,
+this prevents a "cache" folder from being created 
+- `--sourcemap=none` is a parameter which prevents soucemap files from being generated 
+- `admin/css/debug-toolbar/toolbar.scss` is the SASS source 
+- `system/Debug/Toolbar/Views/toolbar.css` is he CSS destination
+
+Color scheme
+------------
+
+**Themes**
+
+Dark: `#252525` / `rgb(37, 37, 37)`  
+Light: `#FFFFFF` / `rgb(255, 255, 255)`  
+
+**Glossy colors**
+
+Blue: `#5BC0DE` / `rgb(91, 192, 222)`  
+Gray: `#434343` / `rgb(67, 67, 67)`  
+Green: `#9ACE25` / `rgb(154, 206, 37)`  
+Orange: `#DD8615` / `rgb(221, 134, 21)`  
+Red: `#DD4814` / `rgb(221, 72, 20)`  
+
+**Matt colors**
+
+Blue: `#D8EAF0` / `rgb(216, 234, 240)`  
+Gray: `#DFDFDF` / `rgb(223, 223, 223)`  
+Green: `#DFF0D8` / `rgb(223, 240, 216)`  
+Orange: `#FDC894` / `rgb(253, 200, 148)`  
+Red: `#EF9090` / `rgb(239, 144, 144)`  
diff --git a/contributing/css.rst b/contributing/css.rst
deleted file mode 100644
index d7b047e1695c..000000000000
--- a/contributing/css.rst
+++ /dev/null
@@ -1,45 +0,0 @@
-================
-Contribution CSS
-================
-
-CodeIgniter uses SASS to generate the debug toolbar's CSS. Therefore, you
-will need to install it first. You can find further instructions on the
-official website: https://sass-lang.com/install
-
-Compile SASS files
-==================
-
-Open your terminal, and navigate to CodeIgniter's root folder. To generate
-the CSS file, use the following command: ``sass --no-cache --sourcemap=none admin/css/debug-toolbar/toolbar.scss system/Debug/Toolbar/Views/toolbar.css``
-
-Details:
-- ``--no-cache`` is a parameter defined to disable SASS cache, this prevents
-  a "cache" folder from being created
-- ``--sourcemap=none`` is a parameter which prevents soucemap files from
-  being generated
-- ``admin/css/debug-toolbar/toolbar.scss`` is the SASS source
-- ``system/Debug/Toolbar/Views/toolbar.css`` is he CSS destination
-
-Color scheme
-============
-
-**Themes**
-
-Dark: `#252525` / `rgb(37, 37, 37)`
-Light: `#FFFFFF` / `rgb(255, 255, 255)`
-
-**Glossy colors**
-
-Blue: `#5BC0DE` / `rgb(91, 192, 222)`
-Gray: `#434343` / `rgb(67, 67, 67)`
-Green: `#9ACE25` / `rgb(154, 206, 37)`
-Orange: `#DD8615` / `rgb(221, 134, 21)`
-Red: `#DD4814` / `rgb(221, 72, 20)`
-
-**Matt colors**
-
-Blue: `#D8EAF0` / `rgb(216, 234, 240)`
-Gray: `#DFDFDF` / `rgb(223, 223, 223)`
-Green: `#DFF0D8` / `rgb(223, 240, 216)`
-Orange: `#FDC894` / `rgb(253, 200, 148)`
-Red: `#EF9090` / `rgb(239, 144, 144)`
diff --git a/contributing/guidelines.md b/contributing/guidelines.md
new file mode 100644
index 000000000000..77e004d2d173
--- /dev/null
+++ b/contributing/guidelines.md
@@ -0,0 +1,100 @@
+Contribution Guidelines
+=======================
+
+Your Pull Requests (PRs) need to meet our guidelines. If a PR fails to
+pass these guidelines, it will be declined and you will need to
+re-submit when you’ve made the changes. This might sound a bit tough,
+but it is required for us to maintain quality of the code-base.
+
+PHP Style
+---------
+
+All code must conform to our [Style Guide](./styleguide.md), which is
+essentially the [Allman indent
+style](https://en.wikipedia.org/wiki/Indent_style#Allman_style), with
+elaboration on naming and readable operators.
+
+This makes certain that all code is the same format as the existing code
+and means it will be as readable as possible.
+
+Our Style Guide is similar to PSR-1 and PSR-2, from PHP-FIG, but not
+necessarily the same or compatible.
+
+Unit Testing
+------------
+
+Unit testing is expected for all CodeIgniter components. We use PHPunit,
+and run unit tests using travis-ci for each PR submitted or changed.
+
+In the CodeIgniter project, there is a `tests` folder, with a structure
+that parallels that of `system`.
+
+The normal practice would be to have a unit test class for each of the
+classes in `system`, named appropriately. For instance, the `BananaTest`
+class would test the `Banana` class. There will be occasions when it is
+more convenient to have separate classes to test different functionality
+of a single CodeIgniter component.
+
+See the [PHPUnit website](https://phpunit.de/) for more information.
+
+PHPdoc Comments
+---------------
+
+Source code should be commented using PHPdoc comments blocks. Thie means
+implementation comments to explain potentially confusing sections of
+code, and documentation comments before each public or protected
+class/interface/trait, method and variable.
+
+See the [phpDocumentor website](https://phpdoc.org/) for more
+information.
+
+Documentation
+-------------
+
+The User Guide is an essential component of the CodeIgniter framework.
+
+Each framework component or group of components needs a corresponding
+section in the User Guide. Some of the more fundamental components will
+show up in more than one place.
+
+Change Log
+----------
+
+The change-log, in the user guide root, needs to be kept up-to-date. Not
+all changes will need an entry in it, but new classes, major or BC
+changes to existing classes should. Once we have a stable release, bug
+fixes would appear in the changelog too.
+
+The changelog is independently maintained by the framework release
+manager Make sure that your PR descriptions help us decide if the
+contribution should be highlighted in the next release after it has been
+merged.
+
+PHP Compatibility
+-----------------
+
+CodeIgniter4 requires PHP 7.3.
+
+Backwards Compatibility
+-----------------------
+
+Generally, we aim to maintain backwards compatibility between minor
+versions of the framework. Any changes that break compatibility need a
+good reason to do so, and need to be pointed out in the
+[Upgrading](https://codeigniter4.github.io/userguide/installation/upgrading.html)
+guide.
+
+CodeIgniter4 itself represents a significant backwards compatibility
+break with earlier versions of the framework.
+
+Mergeability
+------------
+
+Your PRs need to be mergeable and GPG-signed before they will be
+considered.
+
+We suggest that you synchronize your repository's `develop` branch with
+that in the main repository, and then your feature branch and your
+develop branch, before submitting a PR. You will need to resolve any
+merge conflicts introduced by changes incorporated since you started
+working on your contribution.
diff --git a/contributing/guidelines.rst b/contributing/guidelines.rst
deleted file mode 100644
index 3ce3a9d4b103..000000000000
--- a/contributing/guidelines.rst
+++ /dev/null
@@ -1,99 +0,0 @@
-=======================
-Contribution Guidelines
-=======================
-
-Your Pull Requests (PRs) need to meet our guidelines. If a PR fails
-to pass these guidelines, it will be declined and you will need to re-submit
-when you’ve made the changes. This might sound a bit tough, but it is required
-for us to maintain quality of the code-base.
-
-PHP Style
-=========
-
-All code must conform to our `Style Guide
-<./styleguide.md>`_, which is
-essentially the `Allman indent style
-<https://en.wikipedia.org/wiki/Indent_style#Allman_style>`_, with
-elaboration on naming and readable operators.
-
-This makes certain that all code is the same format as the
-existing code and means it will be as readable as possible.
-
-Our Style Guide is similar to PSR-1 and PSR-2, from PHP-FIG,
-but not necessarily the same or compatible.
-
-Unit Testing
-============
-
-Unit testing is expected for all CodeIgniter components.
-We use PHPunit, and run unit tests using travis-ci
-for each PR submitted or changed.
-
-In the CodeIgniter project, there is a ``tests`` folder, with a structure that
-parallels that of ``system``.
-
-The normal practice would be to have a unit test class for each of the classes
-in ``system``, named appropriately. For instance, the ``BananaTest``
-class would test the ``Banana`` class. There will be occasions when
-it is more convenient to have separate classes to test different functionality
-of a single CodeIgniter component.
-
-See the `PHPUnit website <https://phpunit.de/>`_ for more information.
-
-PHPdoc Comments
-===============
-
-Source code should be commented using PHPdoc comments blocks.
-Thie means implementation comments to explain potentially confusing sections
-of code, and documentation comments before each public or protected
-class/interface/trait, method and variable.
-
-See the `phpDocumentor website <https://phpdoc.org/>`_ for more information.
-
-Documentation
-=============
-
-The User Guide is an essential component of the CodeIgniter framework.
-
-Each framework component or group of components needs a corresponding
-section in the User Guide. Some of the more fundamental components will
-show up in more than one place.
-
-Change Log
-==========
-
-The change-log, in the user guide root, needs to be kept up-to-date.
-Not all changes will need an entry in it, but new classes, major or BC changes
-to existing classes should. Once we have a stable release, bug fixes would
-appear in the changelog too.
-
-The changelog is independently maintained by the framework release manager
-Make sure that your PR descriptions help us decide if the contribution should
-be highlighted in the next release after it has been merged.
-
-PHP Compatibility
-=================
-
-CodeIgniter4 requires PHP 7.3.
-
-Backwards Compatibility
-=======================
-
-Generally, we aim to maintain backwards compatibility between minor
-versions of the framework. Any changes that break compatibility need
-a good reason to do so, and need to be pointed out in the
-`Upgrading <https://codeigniter4.github.io/userguide/installation/upgrading.html>`_ guide.
-
-CodeIgniter4 itself represents a significant backwards compatibility break
-with earlier versions of the framework.
-
-Mergeability
-============
-
-Your PRs need to be mergeable and GPG-signed before they will be considered.
-
-We suggest that you synchronize your repository's ``develop`` branch with
-that in the main repository, and then your feature branch and
-your develop branch, before submitting a PR.
-You will need to resolve any merge conflicts introduced by changes
-incorporated since you started working on your contribution.
diff --git a/contributing/internals.md b/contributing/internals.md
new file mode 100644
index 000000000000..4de3d739425d
--- /dev/null
+++ b/contributing/internals.md
@@ -0,0 +1,163 @@
+CodeIgniter Internals Overview
+==============================
+
+This guide should help contributors understand how the core of the
+framework works, and what needs to be done when creating new
+functionality. Specifically, it details the information needed to create
+new packages for the core.
+
+Dependencies
+------------
+
+All packages should be designed to be completely isolated from the rest
+of the packages, if possible. This will allow them to be used in
+projects outside of CodeIgniter. Basically, this means that any
+dependencies should be kept to a minimum. Any dependencies must be able
+to be passed into the constructor. If you do need to use one of the
+other core packages, you can create that in the constructor using the
+Services class, as long as you provide a way for dependencies to
+override that:
+
+```php
+    public function __construct(Foo $foo=null)
+    {
+        $this->foo = $foo instanceOf Foo
+            ? $foo
+            : \Config\Services::foo();
+    }
+```
+
+Type hinting
+------------
+
+PHP7 provides the ability to [type
+hint](http://php.net/manual/en/functions.arguments.php#functions.arguments.type-declaration)
+method parameters and return types. Use it where possible. Return type
+hinting is not always practical, but do try to make it work.
+
+At this time, we are not using strict type hinting.
+
+Abstractions
+------------
+
+The amount of abstraction required to implement a solution should be the
+minimal amount required. Every layer of abstraction brings additional
+levels of technical debt and unnecessary complexity. That said, don't be
+afraid to use it when it's needed and can help things.
+
+-   Don't create a new container class when an array will do just fine.
+-   Start simple, refactor as necessary to achieve clean separation of
+    code, but don't overdo it.
+
+Testing
+-------
+
+Any new packages submitted to the framework must be accompanied by unit
+tests. The target is 80%+ code coverage of all classes within the
+package.
+
+-   Test only public methods, not protected and private unless the
+    method really needs it due to complexity.
+-   Don't just test that the method works, but test for all fail states,
+    thrown exceptions, and other pathways through your code.
+
+You should be aware of the extra assertions that we have made,
+provisions for accessing private properties for testing, and mock
+services. We have also made a **CITestStreamFilter** to capture test
+output. Do check out similar tests in `tests/system/`, and read the
+"Testing" section in the user guide, before you dig in to your own.
+
+Some testing needs to be done in a separate process, in order to setup
+the PHP globals to mimic test situations properly. See
+`tests/system/HTTP/ResponseSendTest` for an example of this.
+
+Namespaces and Files
+--------------------
+
+All new packages should live under the `CodeIgniter` namespace. The
+package itself will need its own sub-namespace that collects all related
+files into one grouping, like `CodeIgniter\HTTP`.
+
+Files MUST be named the same as the class they hold, and they must match
+the Style Guide &lt;./styleguide.md&gt;, meaning CamelCase class and
+file names. They should be in their own directory that matches the
+sub-namespace under the **system** directory.
+
+Take the Router class as an example. The Router lives in the
+`CodeIgniter\Router` namespace. Its two main classes,
+**RouteCollection** and **Router**, are in the files
+**system/Router/RouteCollection.php** and **system/Router/Router.php**
+respectively.
+
+### Interfaces
+
+Most base classes should have an interface defined for them. At the very
+least this allows them to be easily mocked and passed to other classes
+as a dependency, without breaking the type-hinting. The interface names
+should match the name of the class with "Interface" appended to it, like
+`RouteCollectionInterface`.
+
+The Router package mentioned above includes the
+`CodeIgniter\Router\RouteCollectionInterface` and
+`CodeIgniter\Router\RouterInterface` interfaces to provide the
+abstractions for the two classes in the package.
+
+### Handlers
+
+When a package supports multiple "drivers", the convention is to place
+them in a **Handlers** directory, and name the child classes as
+Handlers. You will often find that creating a `BaseHandler`, that the
+child classes can extend, to be beneficial in keeping the code DRY.
+
+See the Log and Session packages for examples.
+
+Configuration
+-------------
+
+Should the package require user-configurable settings, you should create
+a new file just for that package under **app/Config**. The file name
+should generally match the package name.
+
+Autoloader
+----------
+
+All files within the package should be added to
+**system/Config/AutoloadConfig.php**, in the "classmap" property. This
+is only used for core framework files, and helps to minimize file system
+scans and keep performance high.
+
+Command-Line Support
+--------------------
+
+CodeIgniter has never been known for it's strong CLI support. However,
+if your package could benefit from it, create a new file under
+**system/Commands**. The class contained within is simply a controller
+that is intended for CLI usage only. The `index()` method should provide
+a list of available commands provided by that package.
+
+Routes must be added to **system/Config/Routes.php** using the `cli()`
+method to ensure it is not accessible through the browser, but is
+restricted to the CLI only.
+
+See the **MigrationsCommand** file for an example.
+
+Documentation
+-------------
+
+All packages must contain appropriate documentation that matches the
+tone and style of the rest of the user guide. In most cases, the top
+portion of the package's page should be treated in tutorial fashion,
+while the second half would be a class reference.
+
+Modification of the `env` file
+------------------------------
+
+CodeIgniter is shipped with a template `env` file to support adding
+secrets too sensitive to be stored in a version control system.
+Contributors adding new entries to the env file should always ensure
+that these entries are commented, i.e., starting with a hash (`#`). This
+is because we have spark commands that actually copy the template file
+to a `.env` file (which is actually the live version actually read by
+CodeIgniter for secrets) if the latter is missing. As much as possible,
+we do not want settings to go live unexpectedly without the user's
+knowledge.
diff --git a/contributing/internals.rst b/contributing/internals.rst
deleted file mode 100644
index 1389377b79bd..000000000000
--- a/contributing/internals.rst
+++ /dev/null
@@ -1,148 +0,0 @@
-##############################
-CodeIgniter Internals Overview
-##############################
-
-This guide should help contributors understand how the core of the framework works,
-and what needs to be done when creating new functionality. Specifically, it
-details the information needed to create new packages for the core.
-
-Dependencies
-============
-
-All packages should be designed to be completely isolated from the rest of the
-packages, if possible. This will allow them to be used in projects outside of CodeIgniter.
-Basically, this means that any dependencies should be kept to a minimum.
-Any dependencies must be able to be passed into the constructor. If you do need to use one
-of the other core packages, you can create that in the constructor using the
-Services class, as long as you provide a way for dependencies to override that::
-
-    public function __construct(Foo $foo=null)
-    {
-        $this->foo = $foo instanceOf Foo
-            ? $foo
-            : \Config\Services::foo();
-    }
-
-Type hinting
-============
-
-PHP7 provides the ability to `type hint <http://php.net/manual/en/functions.arguments.php#functions.arguments.type-declaration>`_
-method parameters and return types. Use it where possible. Return type hinting
-is not always practical, but do try to make it work.
-
-At this time, we are not using strict type hinting.
-
-Abstractions
-============
-
-The amount of abstraction required to implement a solution should be the minimal
-amount required. Every layer of abstraction brings additional levels of technical
-debt and unnecessary complexity. That said, don't be afraid to use it when it's
-needed and can help things.
-
-* Don't create a new container class when an array will do just fine.
-* Start simple, refactor as necessary to achieve clean separation of code, but don't overdo it.
-
-Testing
-=======
-
-Any new packages submitted to the framework must be accompanied by unit tests.
-The target is 80%+ code coverage of all classes within the package.
-
-* Test only public methods, not protected and private unless the method really needs it due to complexity.
-* Don't just test that the method works, but test for all fail states, thrown exceptions, and other pathways through your code.
-
-You should be aware of the extra assertions that we have made, provisions for
-accessing private properties for testing, and mock services.
-We have also made a **CITestStreamFilter** to capture test output.
-Do check out similar tests in ``tests/system/``, and read the "Testing" section
-in the user guide, before you dig in to your own.
-
-Some testing needs to be done in a separate process, in order to setup the
-PHP globals to mimic test situations properly. See
-``tests/system/HTTP/ResponseSendTest`` for an example of this.
-
-Namespaces and Files
-====================
-
-All new packages should live under the ``CodeIgniter`` namespace.
-The package itself will need its own sub-namespace
-that collects all related files into one grouping, like ``CodeIgniter\HTTP``.
-
-Files MUST be named the same as the class they hold, and they must match the
-:doc:`Style Guide <./styleguide.md>`, meaning CamelCase class and file names.
-They should be in their own directory that matches the sub-namespace under the
-**system** directory.
-
-Take the Router class as an example. The Router lives in the ``CodeIgniter\Router``
-namespace. Its two main classes,
-**RouteCollection** and **Router**, are in the files **system/Router/RouteCollection.php** and
-**system/Router/Router.php** respectively.
-
-Interfaces
-----------
-
-Most base classes should have an interface defined for them.
-At the very least this allows them to be easily mocked
-and passed to other classes as a dependency, without breaking the type-hinting.
-The interface names should match the name of the class with "Interface" appended
-to it, like ``RouteCollectionInterface``.
-
-The Router package mentioned above includes the
-``CodeIgniter\Router\RouteCollectionInterface`` and ``CodeIgniter\Router\RouterInterface``
-interfaces to provide the abstractions for the two classes in the package.
-
-Handlers
---------
-
-When a package supports multiple "drivers", the convention is to place them in
-a **Handlers** directory, and name the child classes as Handlers.
-You will often find that creating a ``BaseHandler``, that the child classes can
-extend, to be beneficial in keeping the code DRY.
-
-See the Log and Session packages for examples.
-
-Configuration
-=============
-
-Should the package require user-configurable settings, you should create a new
-file just for that package under **app/Config**.
-The file name should generally match the package name.
-
-Autoloader
-==========
-
-All files within the package should be added to **system/Config/AutoloadConfig.php**,
-in the "classmap" property. This is only used for core framework files, and helps
-to minimize file system scans and keep performance high.
-
-Command-Line Support
-====================
-
-CodeIgniter has never been known for it's strong CLI support. However, if your
-package could benefit from it, create a new file under **system/Commands**.
-The class contained within is simply a controller that is intended for CLI
-usage only. The ``index()`` method should provide a list of available commands
-provided by that package.
-
-Routes must be added to **system/Config/Routes.php** using the ``cli()`` method
-to ensure it is not accessible through the browser, but is restricted to the CLI only.
-
-See the **MigrationsCommand** file for an example.
-
-Documentation
-=============
-
-All packages must contain appropriate documentation that matches the tone and
-style of the rest of the user guide. In most cases, the top portion of the package's
-page should be treated in tutorial fashion, while the second half would be a class reference.
-
-Modification of the ``env`` file
-================================
-
-CodeIgniter is shipped with a template ``env`` file to support adding secrets too sensitive to
-be stored in a version control system. Contributors adding new entries to the env file should
-always ensure that these entries are commented, i.e., starting with a hash (``#``). This is
-because we have spark commands that actually copy the template file to a ``.env`` file (which
-is actually the live version actually read by CodeIgniter for secrets) if the latter is missing.
-As much as possible, we do not want settings to go live unexpectedly without the user's knowledge.
diff --git a/contributing/signing.md b/contributing/signing.md
new file mode 100644
index 000000000000..7d51aab5dd0a
--- /dev/null
+++ b/contributing/signing.md
@@ -0,0 +1,72 @@
+Contribution Signing
+====================
+
+We ask that contributions have code commits signed. **This is important
+in order to prove, as best we can, the provenance of contributions.**
+
+The developer pushing a commit as part of a PR isn't necessarily the
+person who committed it originally, if the commit is not signed. This
+distorts the commit history and makes it hard to tell where code came
+from.
+
+If a person "signs off" a commit, they are free to use any name,
+specifically one not their own. Again, the commit history cannot be
+relied on to determine the origin of the code, if one developer is
+spoofing another. A malicious person could commit bad code (for instance
+a virus) and make it look like another developer created it.
+
+The best solution, while not fool-proof, is to "securely sign" your
+commits. Such commits are digitally signed, with a GPG-key associated
+with your github account. It still isn't foolproof, because a malicious
+developer could create a bogus email and account, but it is more
+reliable than an unsigned or a "signed-off by" commit.
+
+If you don't sign your commits, we **may** accept your contribution,
+assuming it meets usefulness and contribution guidelines, but only if it
+isn't critical code and only after checking it carefully. If code
+performs an important role, we will insist that it be securely signed.
+
+Read below to find out how to sign your commits :)
+
+Secure Signing
+--------------
+
+To verify your commits, you will need to setup a GPG key, and attach it
+to your github account.
+
+See the [git
+tools](https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work) page
+for directions on doing this. The complete story is part of [Github
+help](https://help.github.com/categories/gpg/).
+
+The basic steps are
+
+-   [generate your GPG
+    key](https://help.github.com/articles/generating-a-new-gpg-key/),
+    and copy the ASCII representation of it.
+-   [Add your GPG key to your Github
+    account](https://help.github.com/articles/adding-a-new-gpg-key-to-your-github-account/).
+-   [Tell
+    Git](https://help.github.com/articles/telling-git-about-your-gpg-key/)
+    about your GPG key.
+-   [Set default
+    signing](https://help.github.com/articles/signing-commits-using-gpg/)
+    to have all of your commits securely signed automatically.
+-   Provide your GPG key passphrase, as prompted, when you do a commit.
+
+Depending on your IDE, you may have to do your Git commits from your Git
+bash shell to use the **-S** option to force the secure signing.
+
+Commit Messages
+---------------
+
+Regardless of how you sign a commit, commit messages are important too.
+They communicate the intent of a specific change, concisely. They make
+it easier to review code, and to find out why a change was made if the
+code history is examined later.
+
+The audience for your commit messages will be the codebase maintainers,
+any code reviewers, and debuggers trying to figure out when a bug might
+have been introduced.
+
+Make your commit messages meaningful.
diff --git a/contributing/signing.rst b/contributing/signing.rst
deleted file mode 100644
index 8d74c1a5aae6..000000000000
--- a/contributing/signing.rst
+++ /dev/null
@@ -1,65 +0,0 @@
-====================
-Contribution Signing
-====================
-
-We ask that contributions have code commits signed. **This is important in order
-to prove, as best we can, the provenance of contributions.**
-
-The developer pushing a commit as part of a PR isn't necessarily the person
-who committed it originally, if the commit is not signed. This distorts the
-commit history and makes it hard to tell where code came from.
-
-If a person "signs off" a commit, they are free to use any name, specifically
-one not their own. Again, the commit history cannot be relied on to determine
-the origin of the code, if one developer is spoofing another. A malicious person
-could commit bad code (for instance a virus) and make it look like another
-developer created it.
-
-The best solution, while not fool-proof, is to "securely sign" your
-commits. Such commits are digitally signed, with a GPG-key
-associated with your github account. It still isn't foolproof, because
-a malicious developer could create a bogus email and account, but it is
-more reliable than an unsigned or a "signed-off by" commit.
-
-If you don't sign your commits, we **may** accept your contribution,
-assuming it meets usefulness and contribution guidelines, but only
-if it isn't critical code and only after checking it carefully.
-If code performs an important role, we will insist that it be securely signed.
-
-Read below to find out how to sign your commits :)
-
-
-Secure Signing
-==============
-
-To verify your commits, you will need to
-setup a GPG key, and attach it to your github account.
-
-See the `git tools <https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work>`_
-page for directions on doing this. The complete story is part of
-`Github help <https://help.github.com/categories/gpg/>`_.
-
-The basic steps are
-
--  `generate your GPG key <https://help.github.com/articles/generating-a-new-gpg-key/>`_, and copy the ASCII representation of it.
--  `Add your GPG key to your Github account <https://help.github.com/articles/adding-a-new-gpg-key-to-your-github-account/>`_.
--   `Tell Git <https://help.github.com/articles/telling-git-about-your-gpg-key/>`_ about your GPG key.
--   `Set default signing <https://help.github.com/articles/signing-commits-using-gpg/>`_ to have all of your commits securely signed automatically.
--   Provide your GPG key passphrase, as prompted, when you do a commit.
-
-Depending on your IDE, you may have to do your Git commits from your Git bash shell
-to use the **-S** option to force the secure signing.
-
-Commit Messages
-===============
-
-Regardless of how you sign a commit, commit messages are important too.
-They communicate the intent of a specific change, concisely.
-They make it easier to review code, and to find out why a change was made
-if the code history is examined later.
-
-The audience for your commit messages will be the codebase maintainers, any
-code reviewers, and debuggers trying to figure out when a bug might have been
-introduced.
-
-Make your commit messages meaningful.
diff --git a/contributing/workflow.md b/contributing/workflow.md
new file mode 100644
index 000000000000..63eb38c1f348
--- /dev/null
+++ b/contributing/workflow.md
@@ -0,0 +1,220 @@
+Contribution Workflow
+=====================
+
+Much of the workflow for contributing to CodeIgniter (or any project)
+involves understanding how [Git](https://git-scm.com/) is used to manage
+a shared repository and contributions to it. Examples below use the Git
+bash shell, to be as platform neutral as possible. Your IDE may make
+some of these easier.
+
+Some conventions used below, which you will need to provide appropriate
+values for when you try these:
+
+    ALL_PROJECTS    // folder location with all your projects in subfolders, eg /lampp/htdocs
+    YOUR_PROJECT    // folder containing the project you are working on, inside ALL_PROJECTS
+    ORIGIN_URL      // the cloning URL for your repository fork
+    UPSTREAM_URL    // the cloning URL for the CodeIgniter4 repository
+
+Branching
+---------
+
+CodeIgniter uses the
+[Git-Flow](http://nvie.com/posts/a-successful-git-branching-model/)
+branching model, which requires all pull requests to be sent to the
+"develop" branch. This is where the next planned version will be
+developed. The "master" branch will always contain the latest stable
+version and is kept clean so a "hotfix" (e.g: an emergency security
+patch) can be applied to master to create a new version, without
+worrying about other features holding it up. For this reason, all
+commits need to be made to "develop" and any sent to "master" will be
+closed automatically. If you have multiple changes to submit, please
+place each change into their own branch on your fork.
+
+One thing at a time: a pull request should only contain one change. That
+does not mean only one commit, but one change - however many commits it
+took. The reason for this is that if you change X and Y but send a
+single pull request for both at the same time, we might really want X
+but disagree with Y, meaning we cannot merge the request. Using the
+Git-Flow branching model you can create new branches for both of these
+features and send two requests.
+
+Forking
+-------
+
+You work with a fork of the CodeIgniter4 repository. This is a copy of
+our repository, in your github account. You can make changes to your
+forked repository, while you cannot do the same with the shared one -
+you have to submit pull requests to it instead.
+
+[Creating a fork](https://help.github.com/articles/fork-a-repo/) is done
+through the Github website. Navigate to [our
+repository](https://github.com/codeigniter4/CodeIgniter4), click the
+**Fork** button in the top-right of the page, and choose which account
+or organization of yours should contain that fork.
+
+Cloning
+-------
+
+You *could* work on your repository using Github's web interface, but
+that is awkward. Most developers will clone their repository to their
+local system, and work with it there.
+
+On Github, navigate to your forked repository, click **Clone or
+download**, and copy the cloning URL shown. We will refer to this as
+ORIGIN\_URL.
+
+Clone your repository, leaving a local folder for you to work with:
+
+    cd ALL_PROJECTS
+    git clone ORIGIN_URL
+
+Synching
+--------
+
+Within your local repository, Git will have created an alias,
+**origin**, for the Github repository it is bound to. You want to create
+an alias for the shared repository as well, so that you can "synch" the
+two, making sure that your repository includes any other contributions
+that have been merged by us into the shared repo:
+
+    git remote add upstream UPSTREAM_URL
+
+Then synchronizing is done by pulling from us and pushing to you. This
+is normally done locally, so that you can resolve any merge conflicts.
+For instance, to synchronize **develop** branches:
+
+    git checkout develop
+    git pull upstream develop
+    git push origin develop
+
+You might get merge conflicts when you pull from upstream. It is your
+responsibility to resolve those locally, so that you can continue
+collaborating with the shared repository. Basically, the shared
+repository is updated in the order that contributions are merged into
+it, not in the order that they might have been submitted. If two PRs
+update the same piece of code, then the first one to be merged will take
+precedence, even if it causes problems for other contributions.
+
+It is a good idea to synchronize repositories when the shared one
+changes.
+
+Branching Revisited
+-------------------
+
+The top of this page talked about the **master** and **develop**
+branches. The *best practice* for your work is to create a *feature
+branch* locally, to hold a group of related changes (source, unit
+testing, documentation, change log, etc).
+
+This local branch should be named appropriately, for instance
+"fix/problem123" or "new/mind-reader". The slashes in these branch names
+is optional, and implies a sort of namespacing if used.
+
+For instance, make sure you are in the *develop* branch, and create a
+new feature branch, based on *develop*, for a new feature you are
+creating:
+
+    git checkout develop
+    git checkout -b new/mind-reader
+
+Saving changes only updates your local working area.
+
+Committing
+----------
+
+Your local changes need to be *committed* to save them in your local
+repository. This is where [contribution signing](./signing.md) comes
+in.
+
+You can have as many commits in a branch as you need to "get it right".
+For instance, to commit your work from a debugging session:
+
+    git add .
+    git commit -S -m "Find and fix the broken reference problem"
+
+Just make sure that your commits in a feature branch are all related.
+
+If you are working on two features at a time, then you will want to
+switch between them to keep the contributions separate. For instance:
+
+    git checkout new/mind-reader
+    // work away
+    git add .
+    git commit -S -m "Added adapter for abc"
+    git checkout fix/issue-123
+    // work away
+    git add .
+    git commit -S -m "Fixed problem in DEF\Something"
+    git checkout develop
+
+The last checkout makes sure that you end up in your *develop* branch as
+a starting point for your next session working with your repository.
+This is a good practice, as it is not always obvious which branch you
+are working in.
+
+Pushing Your Branch
+-------------------
+
+At some point, you will decide that your feature branch is complete, or
+that it could benefit from a review by fellow developers.
+
+**Note:**
+Remember to synch your local repo with the shared one before pushing!
+It is a lot easier to resolve conflicts at this stage.
+
+
+Synchronize your repository:
+
+    git checkout develop
+    git pull upstream develop
+    git push origin develop
+
+Bring your feature branch up to date:
+
+    git checkout new/mind-reader
+    git merge develop
+
+And finally push your local branch to your github repository:
+
+    git push origin new/mind-reader
+
+Pull Requests
+-------------
+
+On Github, you propose your changes one feature branch at a time, by
+switching to the branch you wish to contribute, and then clicking on
+"New pull request".
+
+Make sure the pull request is for the shared **develop** branch, or it
+may be rejected.
+
+Make sure that the PR title is helpful for the maintainers and other
+developers. Add any comments appropriate, for instance asking for
+review.
+
+<div class="admonition note">
+
+If you do not provide a title or description for your PR, the odds of it being summarily rejected
+
+:   rise astronomically.
+
+</div>
+
+When your PR is submitted, a continuous integration task will be
+triggered, running all the unit tests as well as any other checking we
+have configured for it. If the unit tests fail, or if there are merge
+conflicts, your PR will not be mergeable until those are fixed.
+
+Fix such changes locally, commit them properly, and then push your
+branch again. That will update the PR automatically, and re-run the CI
+tests. You don't need to raise a new PR.
+
+If your PR does not follow our contribution guidelines, or is
+incomplete, the codebase maintainers will comment on it, pointing out
+what needs fixing.
+
+Cleanup
+-------
+
+If your PR is accepted and merged into the shared repository, you can
+delete that branch in your github repository as well as locally.
diff --git a/contributing/workflow.rst b/contributing/workflow.rst
deleted file mode 100644
index a6cbfa8cae16..000000000000
--- a/contributing/workflow.rst
+++ /dev/null
@@ -1,206 +0,0 @@
-=====================
-Contribution Workflow
-=====================
-
-Much of the workflow for contributing to CodeIgniter (or any project) involves
-understanding how `Git <https://git-scm.com/>`_ is used to
-manage a shared repository and contributions to it.
-Examples below use the Git bash shell, to be as platform neutral as
-possible. Your IDE may make some of these easier.
-
-Some conventions used below, which you will need to provide appropriate
-values for when you try these::
-
-    ALL_PROJECTS    // folder location with all your projects in subfolders, eg /lampp/htdocs
-    YOUR_PROJECT    // folder containing the project you are working on, inside ALL_PROJECTS
-    ORIGIN_URL      // the cloning URL for your repository fork
-    UPSTREAM_URL    // the cloning URL for the CodeIgniter4 repository
-
-Branching
-=========
-
-CodeIgniter uses the `Git-Flow
-<http://nvie.com/posts/a-successful-git-branching-model/>`_ branching model,
-which requires all pull requests to be sent to the "develop" branch. This is
-where the next planned version will be developed. The "master" branch will
-always contain the latest stable version and is kept clean so a "hotfix" (e.g:
-an emergency security patch) can be applied to master to create a new version,
-without worrying about other features holding it up. For this reason, all
-commits need to be made to "develop" and any sent to "master" will be closed
-automatically. If you have multiple changes to submit, please place each
-change into their own branch on your fork.
-
-One thing at a time: a pull request should only contain one change. That does
-not mean only one commit, but one change - however many commits it took. The
-reason for this is that if you change X and Y but send a single pull request for both
-at the same time, we might really want X but disagree with Y, meaning we
-cannot merge the request. Using the Git-Flow branching model you can create
-new branches for both of these features and send two requests.
-
-Forking
-=======
-
-You work with a fork of the CodeIgniter4 repository. This is a copy of our repository,
-in your github account. You can make changes to your forked repository, while
-you cannot do the same with the shared one - you have to submit pull requests
-to it instead.
-
-`Creating a fork <https://help.github.com/articles/fork-a-repo/>`_ 
-is done through the Github website. Navigate to `our
-repository <https://github.com/codeigniter4/CodeIgniter4>`_,
-click the **Fork** button in the top-right of the page, and choose which account or
-organization of yours should contain that fork.
-
-Cloning
-=======
-
-You *could* work on your repository using Github's web interface, but that is
-awkward. Most developers will clone their repository to their local system,
-and work with it there.
-
-On Github, navigate to your forked repository, click **Clone or download**, and
-copy the cloning URL shown. We will refer to this as ORIGIN_URL.
-
-Clone your repository, leaving a local folder for you to work with::
-
-    cd ALL_PROJECTS
-    git clone ORIGIN_URL
-
-Synching
-========
-
-Within your local repository, Git will have created an alias, **origin**, for the
-Github repository it is bound to. You want to create an alias for the shared
-repository as well, so that you can "synch" the two, making sure that your repository
-includes any other contributions that have been merged by us into the shared repo::
-
-    git remote add upstream UPSTREAM_URL
-
-Then synchronizing is done by pulling from us and pushing to you. This is normally
-done locally, so that you can resolve any merge conflicts. For instance, to
-synchronize **develop** branches::
-
-    git checkout develop
-    git pull upstream develop
-    git push origin develop
-
-You might get merge conflicts when you pull from upstream. It is your responsibility
-to resolve those locally, so that you can continue collaborating with the shared
-repository. Basically, the shared repository is updated in the order that contributions
-are merged into it, not in the order that they might have been submitted.
-If two PRs update the same piece of code, then the first one to be merged
-will take precedence, even if it causes problems for other contributions.
-
-It is a good idea to synchronize repositories when the shared one changes.
-
-Branching Revisited
-===================
-
-The top of this page talked about the **master** and **develop** branches.
-The *best practice* for your work is to create a *feature branch* locally,
-to hold a group of related changes (source, unit testing, documentation,
-change log, etc). 
-
-This local branch should be named appropriately, for instance 
-"fix/problem123" or "new/mind-reader". The slashes in these branch names is
-optional, and implies a sort of namespacing if used.
-
-For instance, make sure you are in the *develop* branch, and create a
-new feature branch, based on *develop*, for a new feature you are creating::
-
-    git checkout develop
-    git checkout -b new/mind-reader
-
-Saving changes only updates your local working area.
-
-Committing
-==========
-
-Your local changes need to be *committed* to save them in your local repository.
-This is where `contribution signing <./signing.rst>`_ comes in.
-
-You can have as many commits in a branch as you need to "get it right".
-For instance, to commit your work from a debugging session::
-
-    git add .
-    git commit -S -m "Find and fix the broken reference problem"
-
-Just make sure that your commits in a feature branch are all related.
-
-If you are working on two features at a time, then you will want to switch
-between them to keep the contributions separate. For instance::
-
-    git checkout new/mind-reader
-    // work away
-    git add .
-    git commit -S -m "Added adapter for abc"
-    git checkout fix/issue-123
-    // work away
-    git add .
-    git commit -S -m "Fixed problem in DEF\Something"
-    git checkout develop
-
-The last checkout makes sure that you end up in your *develop* branch as a
-starting point for your next session working with your repository.
-This is a good practice, as it is not always obvious which branch you are working in.
-
-Pushing Your Branch
-===================
-
-At some point, you will decide that your feature branch is complete, or that
-it could benefit from a review by fellow developers.
-
-.. note::
-    Remember to synch your local repo with the shared one before pushing!
-    It is a lot easier to resolve conflicts at this stage.
-
-Synchronize your repository::
-
-    git checkout develop
-    git pull upstream develop
-    git push origin develop
-
-Bring your feature branch up to date::
-
-    git checkout new/mind-reader
-    git merge develop
-
-And finally push your local branch to your github repository::
-
-    git push origin new/mind-reader
-
-Pull Requests
-=============
-
-On Github, you propose your changes one feature branch at a time, by
-switching to the branch you wish to contribute, and then clicking
-on "New pull request".
-
-Make sure the pull request is for the shared **develop** branch, or it
-may be rejected.
-
-Make sure that the PR title is helpful for the maintainers and other developers.
-Add any comments appropriate, for instance asking for review.
-
-.. note::
-    If you do not provide a title or description for your PR, the odds of it being summarily rejected
-    rise astronomically.
-
-When your PR is submitted, a continuous integration task will be triggered,
-running all the unit tests as well as any other checking we have configured for it.
-If the unit tests fail, or if there are merge conflicts, your PR will not
-be mergeable until those are fixed.
-
-Fix such changes locally, commit them properly, and then push your branch again.
-That will update the PR automatically, and re-run the CI tests. You don't need
-to raise a new PR.
-
-If your PR does not follow our contribution guidelines, or is incomplete,
-the codebase maintainers will comment on it, pointing out what
-needs fixing.
-
-Cleanup
-=======
-
-If your PR is accepted and merged into the shared repository, you can delete
-that branch in your github repository as well as locally.
\ No newline at end of file

From 451cfe234f172d808fecfc192805a59b4114b87c Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 6 Oct 2021 15:13:34 +0800
Subject: [PATCH 0365/2325] Enable `no_alternative_syntax` rule

---
 .no-header.php-cs-fixer.dist.php | 5 ++++-
 .php-cs-fixer.dist.php           | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.no-header.php-cs-fixer.dist.php b/.no-header.php-cs-fixer.dist.php
index 12acddb81087..ebbe6789fdbd 100644
--- a/.no-header.php-cs-fixer.dist.php
+++ b/.no-header.php-cs-fixer.dist.php
@@ -27,7 +27,10 @@
     ])
     ->notName('#Logger\.php$#');
 
-$overrides = [];
+$overrides = [
+    // @TODO Remove once live in coding-standard
+    'no_alternative_syntax' => ['fix_non_monolithic_code' => false],
+];
 
 $options = [
     'cacheFile'    => 'build/.no-header.php-cs-fixer.cache',
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 3c9e05fe3b74..a7b41e4a642b 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -34,7 +34,10 @@
         __DIR__ . '/spark',
     ]);
 
-$overrides = [];
+$overrides = [
+    // @TODO Remove once live in coding-standard
+    'no_alternative_syntax' => ['fix_non_monolithic_code' => false],
+];
 
 $options = [
     'cacheFile'    => 'build/.php-cs-fixer.cache',

From a8e43c776814a141bd9223509eaa27c9b86c0bd0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 08:14:52 +0900
Subject: [PATCH 0366/2325] chore: add Database in bug report template

---
 .github/ISSUE_TEMPLATE/bug_report.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 02224130008f..dc6c9e37de1f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -35,5 +35,6 @@ screenshots you deem necessary.
 
 **Context**
  - OS: [e.g. Windows 99]
- - Web server [e.g. Apache 1.2.3]
- - PHP version [e.g. 6.5.4]
+ - Web server: [e.g. Apache 1.2.3]
+ - PHP version: [e.g. 6.5.4]
+ - Database:  [e.g. MySQL]

From ec0209dba6510a88f794df6fdccb4b06ff4838b9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 09:30:47 +0900
Subject: [PATCH 0367/2325] docs: move CONTRIBUTING.md contents to
 pull_request.md

---
 CONTRIBUTING.md              | 149 ----------------------------------
 contributing/pull_request.md | 150 +++++++++++++++++++++++++++++++++++
 2 files changed, 150 insertions(+), 149 deletions(-)
 create mode 100644 contributing/pull_request.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 18abe9ce7468..0ce39a98007f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,150 +1 @@
 # Contributing to CodeIgniter4
-
-## Contributions
-
-We expect all contributions to conform to our
-[style guide](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/styleguide.md),
-be commented (inside the PHP source files), be documented (in the
-[user guide](https://codeigniter4.github.io/userguide/)), and unit tested (in
-the [test folder](https://github.com/codeigniter4/CodeIgniter4/tree/develop/tests)).
-There is a [Contributing to CodeIgniter](./contributing/README.md) section in the repository which describes the contribution process; this page is an overview.
-
-Note, we expect all code changes or bug-fixes to be accompanied by one or more tests added to our test suite
-to prove the code works. If pull requests are not accompanied by relevant tests, they will likely be closed.
-Since we are a team of volunteers, we don't have any more time to work on the framework than you do. Please
-make it as painless for your contributions to be included as possible. If you need help with getting tests
-running on your local machines, ask for help on the forums. We would be happy to help out.
-
-The [Open Source Guide](https://opensource.guide/) is a good first read for those new to contributing to open source!
-## Issues
-
-Issues are a quick way to point out a bug. If you find a bug or documentation error in CodeIgniter then please make sure that:
-
-1. There is not already an open [Issue](https://github.com/codeigniter4/CodeIgniter4/issues)
-2. The Issue has not already been fixed (check the develop branch or look for [closed Issues](https://github.com/codeigniter4/CodeIgniter4/issues?q=is%3Aissue+is%3Aclosed))
-3. It's not something really obvious that you can fix yourself
-
-Reporting Issues is helpful, but an even [better approach](./contributing/workflow.md) is to send a
-[Pull Request](https://help.github.com/en/articles/creating-a-pull-request), which is done by
-[Forking](https://help.github.com/en/articles/fork-a-repo) the main repository and making
-a [Commit](https://help.github.com/en/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project)
-to your own copy of the project. This will require you to use the version control system called [Git](https://git-scm.com/).
-
-## Guidelines
-
-Before we look into how to contribute to CodeIgniter4, here are some guidelines. If your Pull Requests fail
-to pass these guidelines, they will be declined, and you will need to re-submit when you’ve made the changes.
-This might sound a bit tough, but it is required for us to maintain the quality of the codebase.
-
-### PHP Style
-
-All code must meet the [Style Guide](./contributing/styleguide.md).
-This makes certain that all submitted code is of the same format as the existing code and ensures that the codebase will be as readable as possible.
-
-### Documentation
-
-If you change anything that requires a change to documentation, then you will need to add to the documentation. New classes, methods, parameters, changing default values, etc. are all changes that require a change to documentation. Also, the [changelog](https://codeigniter4.github.io/CodeIgniter4/changelogs/index.html) must be updated for every change, and [PHPDoc](https://github.com/codeigniter4/CodeIgniter4/blob/develop/phpdoc.dist.xml) blocks must be maintained.
-
-### Compatibility
-
-CodeIgniter4 requires [PHP 7.3](https://php.net/releases/7_3_0.php).
-
-### Branching
-
-CodeIgniter4 uses the [Git-Flow](http://nvie.com/posts/a-successful-git-branching-model/) branching model
-which requires all Pull Requests to be sent to the __"develop"__ branch; this is where the next planned version will be developed.
-
-The __"master"__ branch will always contain the latest stable version and is kept clean so a "hotfix" (e.g. an
-emergency security patch) can be applied to the "master" branch to create a new version, without worrying
-about other features holding it up. For this reason, all commits need to be made to the "develop" branch,
-and any sent to the "master" branch will be closed automatically. If you have multiple changes to submit,
-please place all changes into their own branch on your fork.
-
-**One thing at a time:** A pull request should only contain one change. That does not mean only one commit,
-but one change - however many commits it took. The reason for this is that if you change X and Y,
-but send a pull request for both at the same time, we might really want X but disagree with Y,
-meaning we cannot merge the request. Using the Git-Flow branching model you can create new
-branches for both of these features and send two requests.
-
-A reminder: **please use separate branches for each of your PRs** - it will make it easier for you to keep
-changes separate from each other and from whatever else you are doing with your repository!
-
-### Signing
-
-You must [GPG-sign](./contributing/signing.md) your work, certifying that you either wrote the work or
-otherwise have the right to pass it on to an open-source project. This is *not* just a "signed-off-by"
-commit, but instead, a digitally signed one.
-
-### Static Analysis on PHP code
-
-We cannot, at all times, guarantee that all PHP code submitted on pull requests to be working well without
-actually running the code. For this reason, we make use of two static analysis tools, [PHPStan][1]
-and [Rector][2] to do the analysis for us.
-
-These tools have already been integrated into our CI/CD workflow to minimize unannounced bugs. Pull requests
-are expected that their code will pass these two. In your local machine, you can manually run these tools
-so that you can fix whatever errors that pop up with your submission.
-
-PHPStan is expected to scan the entire framework by running this command in your terminal:
-
-	vendor/bin/phpstan analyse
-
-Rector, on the other hand, can be run on the specific files you modified or added:
-
-	vendor/bin/rector process --dry-run path/to/file
-
-[1]: https://github.com/phpstan/phpstan-src
-[2]: https://github.com/rector/rector
-
-### Breaking Changes
-
-In general, any change that would disrupt existing uses of the framework is considered a "breaking change" and will not be favorably considered. A few specific examples to pay attention to:
-
-1. New classes/properties/constants in `system` are acceptable, but anything in the `app` directory that will be used in `system` should be backwards-compatible.
-2. Any changes to non-private methods must be backwards-compatible with the original definition.
-3. Deleting non-private properties or methods without prior deprecation notices is frowned upon and will likely be closed.
-4. Deleting or renaming public classes and interfaces, as well as those not marked as `@internal`, without prior deprecation notices or not providing fallback solutions will also not be favorably considered.
-
-## How-to Guide
-
-The best way to contribute is to fork the CodeIgniter4 repository, and "clone" that to your development area. That sounds like some jargon, but "forking" on GitHub means "making a copy of that repo to your account" and "cloning" means "copying that code to your environment so you can work on it".
-
-1. Set up Git ([Windows](https://git-scm.com/download/win), [Mac](https://git-scm.com/download/mac), & [Linux](https://git-scm.com/download/linux)).
-2. Go to the [CodeIgniter4 repository](https://github.com/codeigniter4/CodeIgniter4).
-3. [Fork](https://help.github.com/en/articles/fork-a-repo) it (to your Github account).
-4. [Clone](https://help.github.com/en/articles/cloning-a-repository) your CodeIgniter repository: `git@github.com:\<your-name>/CodeIgniter4.git`
-5. Create a new [branch](https://help.github.com/en/articles/about-branches) in your project for each set of changes you want to make.
-6. Fix existing bugs on the [Issue tracker](https://github.com/codeigniter4/CodeIgniter4/issues) after confirming that no one else is working on them.
-7. [Commit](https://help.github.com/en/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project) the changed files in your contribution branch.
-8. Commit messages are expected to be descriptive of what you changed specifically. Commit messages like
-"Fixes #1234" would be asked by the reviewer to be revised.
-9. If there are intermediate commits that are not meaningful to the overall PR, such as "Fixed error on style guide", "Fixed phpstan error", "Fixing mistake in code", and other related commits, it is advised to squash your commits so that we can have a clean commit history.
-10. If you have touched PHP code, run static analysis.
-11. Run unit tests on the specific file you modified. If there are no existing tests yet, please create one.
-12. Make sure the tests pass to have a higher chance of merging.
-13. [Push](https://docs.github.com/en/github/using-git/pushing-commits-to-a-remote-repository) your contribution branch to your fork.
-14. Send a [pull request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork).
-
-The codebase maintainers will now be alerted to the submission and someone from the team will respond. If your change fails to meet the guidelines, it will be rejected or feedback will be provided to help you improve it.
-
-Once the maintainer handling your pull request is satisfied with it they will approve the pull request and merge it into the "develop" branch. Your patch will now be part of the next release!
-
-### Keeping your fork up-to-date
-
-Unlike systems like Subversion, Git can have multiple remotes. A remote is the name for the URL of a Git repository. By default, your fork will have a remote named "origin", which points to your fork, but you can add another remote named "codeigniter", which points to `git://github.com/codeigniter4/CodeIgniter4.git`. This is a read-only remote, but you can pull from this develop branch to update your own.
-
-If you are using the command-line, you can do the following to update your fork to the latest changes:
-
-1. `git remote add codeigniter git://github.com/codeigniter4/CodeIgniter4.git`
-2. `git pull codeigniter develop`
-3. `git push origin develop`
-
-Your fork is now up to date. This should be done regularly and, at the least, before you submit a pull request.
-
-## Translations Installation
-
-If you wish to contribute to the system message translations,
-then fork and clone the [translations repository](https://github.com/codeigniter4/translations)
-separately from the codebase.
-
-These are two independent repositories!
diff --git a/contributing/pull_request.md b/contributing/pull_request.md
new file mode 100644
index 000000000000..206e268606a7
--- /dev/null
+++ b/contributing/pull_request.md
@@ -0,0 +1,150 @@
+# Sending a Pull Request
+
+## Contributions
+
+We expect all contributions to conform to our
+[style guide](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/styleguide.md),
+be commented (inside the PHP source files), be documented (in the
+[user guide](https://codeigniter4.github.io/userguide/)), and unit tested (in
+the [test folder](https://github.com/codeigniter4/CodeIgniter4/tree/develop/tests)).
+There is a [Contributing to CodeIgniter](./contributing/README.md) section in the repository which describes the contribution process; this page is an overview.
+
+Note, we expect all code changes or bug-fixes to be accompanied by one or more tests added to our test suite
+to prove the code works. If pull requests are not accompanied by relevant tests, they will likely be closed.
+Since we are a team of volunteers, we don't have any more time to work on the framework than you do. Please
+make it as painless for your contributions to be included as possible. If you need help with getting tests
+running on your local machines, ask for help on the forums. We would be happy to help out.
+
+The [Open Source Guide](https://opensource.guide/) is a good first read for those new to contributing to open source!
+## Issues
+
+Issues are a quick way to point out a bug. If you find a bug or documentation error in CodeIgniter then please make sure that:
+
+1. There is not already an open [Issue](https://github.com/codeigniter4/CodeIgniter4/issues)
+2. The Issue has not already been fixed (check the develop branch or look for [closed Issues](https://github.com/codeigniter4/CodeIgniter4/issues?q=is%3Aissue+is%3Aclosed))
+3. It's not something really obvious that you can fix yourself
+
+Reporting Issues is helpful, but an even [better approach](./contributing/workflow.md) is to send a
+[Pull Request](https://help.github.com/en/articles/creating-a-pull-request), which is done by
+[Forking](https://help.github.com/en/articles/fork-a-repo) the main repository and making
+a [Commit](https://help.github.com/en/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project)
+to your own copy of the project. This will require you to use the version control system called [Git](https://git-scm.com/).
+
+## Guidelines
+
+Before we look into how to contribute to CodeIgniter4, here are some guidelines. If your Pull Requests fail
+to pass these guidelines, they will be declined, and you will need to re-submit when you’ve made the changes.
+This might sound a bit tough, but it is required for us to maintain the quality of the codebase.
+
+### PHP Style
+
+All code must meet the [Style Guide](./contributing/styleguide.md).
+This makes certain that all submitted code is of the same format as the existing code and ensures that the codebase will be as readable as possible.
+
+### Documentation
+
+If you change anything that requires a change to documentation, then you will need to add to the documentation. New classes, methods, parameters, changing default values, etc. are all changes that require a change to documentation. Also, the [changelog](https://codeigniter4.github.io/CodeIgniter4/changelogs/index.html) must be updated for every change, and [PHPDoc](https://github.com/codeigniter4/CodeIgniter4/blob/develop/phpdoc.dist.xml) blocks must be maintained.
+
+### Compatibility
+
+CodeIgniter4 requires [PHP 7.3](https://php.net/releases/7_3_0.php).
+
+### Branching
+
+CodeIgniter4 uses the [Git-Flow](http://nvie.com/posts/a-successful-git-branching-model/) branching model
+which requires all Pull Requests to be sent to the __"develop"__ branch; this is where the next planned version will be developed.
+
+The __"master"__ branch will always contain the latest stable version and is kept clean so a "hotfix" (e.g. an
+emergency security patch) can be applied to the "master" branch to create a new version, without worrying
+about other features holding it up. For this reason, all commits need to be made to the "develop" branch,
+and any sent to the "master" branch will be closed automatically. If you have multiple changes to submit,
+please place all changes into their own branch on your fork.
+
+**One thing at a time:** A pull request should only contain one change. That does not mean only one commit,
+but one change - however many commits it took. The reason for this is that if you change X and Y,
+but send a pull request for both at the same time, we might really want X but disagree with Y,
+meaning we cannot merge the request. Using the Git-Flow branching model you can create new
+branches for both of these features and send two requests.
+
+A reminder: **please use separate branches for each of your PRs** - it will make it easier for you to keep
+changes separate from each other and from whatever else you are doing with your repository!
+
+### Signing
+
+You must [GPG-sign](./contributing/signing.md) your work, certifying that you either wrote the work or
+otherwise have the right to pass it on to an open-source project. This is *not* just a "signed-off-by"
+commit, but instead, a digitally signed one.
+
+### Static Analysis on PHP code
+
+We cannot, at all times, guarantee that all PHP code submitted on pull requests to be working well without
+actually running the code. For this reason, we make use of two static analysis tools, [PHPStan][1]
+and [Rector][2] to do the analysis for us.
+
+These tools have already been integrated into our CI/CD workflow to minimize unannounced bugs. Pull requests
+are expected that their code will pass these two. In your local machine, you can manually run these tools
+so that you can fix whatever errors that pop up with your submission.
+
+PHPStan is expected to scan the entire framework by running this command in your terminal:
+
+	vendor/bin/phpstan analyse
+
+Rector, on the other hand, can be run on the specific files you modified or added:
+
+	vendor/bin/rector process --dry-run path/to/file
+
+[1]: https://github.com/phpstan/phpstan-src
+[2]: https://github.com/rector/rector
+
+### Breaking Changes
+
+In general, any change that would disrupt existing uses of the framework is considered a "breaking change" and will not be favorably considered. A few specific examples to pay attention to:
+
+1. New classes/properties/constants in `system` are acceptable, but anything in the `app` directory that will be used in `system` should be backwards-compatible.
+2. Any changes to non-private methods must be backwards-compatible with the original definition.
+3. Deleting non-private properties or methods without prior deprecation notices is frowned upon and will likely be closed.
+4. Deleting or renaming public classes and interfaces, as well as those not marked as `@internal`, without prior deprecation notices or not providing fallback solutions will also not be favorably considered.
+
+## How-to Guide
+
+The best way to contribute is to fork the CodeIgniter4 repository, and "clone" that to your development area. That sounds like some jargon, but "forking" on GitHub means "making a copy of that repo to your account" and "cloning" means "copying that code to your environment so you can work on it".
+
+1. Set up Git ([Windows](https://git-scm.com/download/win), [Mac](https://git-scm.com/download/mac), & [Linux](https://git-scm.com/download/linux)).
+2. Go to the [CodeIgniter4 repository](https://github.com/codeigniter4/CodeIgniter4).
+3. [Fork](https://help.github.com/en/articles/fork-a-repo) it (to your Github account).
+4. [Clone](https://help.github.com/en/articles/cloning-a-repository) your CodeIgniter repository: `git@github.com:\<your-name>/CodeIgniter4.git`
+5. Create a new [branch](https://help.github.com/en/articles/about-branches) in your project for each set of changes you want to make.
+6. Fix existing bugs on the [Issue tracker](https://github.com/codeigniter4/CodeIgniter4/issues) after confirming that no one else is working on them.
+7. [Commit](https://help.github.com/en/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project) the changed files in your contribution branch.
+8. Commit messages are expected to be descriptive of what you changed specifically. Commit messages like
+   "Fixes #1234" would be asked by the reviewer to be revised.
+9. If there are intermediate commits that are not meaningful to the overall PR, such as "Fixed error on style guide", "Fixed phpstan error", "Fixing mistake in code", and other related commits, it is advised to squash your commits so that we can have a clean commit history.
+10. If you have touched PHP code, run static analysis.
+11. Run unit tests on the specific file you modified. If there are no existing tests yet, please create one.
+12. Make sure the tests pass to have a higher chance of merging.
+13. [Push](https://docs.github.com/en/github/using-git/pushing-commits-to-a-remote-repository) your contribution branch to your fork.
+14. Send a [pull request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork).
+
+The codebase maintainers will now be alerted to the submission and someone from the team will respond. If your change fails to meet the guidelines, it will be rejected or feedback will be provided to help you improve it.
+
+Once the maintainer handling your pull request is satisfied with it they will approve the pull request and merge it into the "develop" branch. Your patch will now be part of the next release!
+
+### Keeping your fork up-to-date
+
+Unlike systems like Subversion, Git can have multiple remotes. A remote is the name for the URL of a Git repository. By default, your fork will have a remote named "origin", which points to your fork, but you can add another remote named "codeigniter", which points to `git://github.com/codeigniter4/CodeIgniter4.git`. This is a read-only remote, but you can pull from this develop branch to update your own.
+
+If you are using the command-line, you can do the following to update your fork to the latest changes:
+
+1. `git remote add codeigniter git://github.com/codeigniter4/CodeIgniter4.git`
+2. `git pull codeigniter develop`
+3. `git push origin develop`
+
+Your fork is now up to date. This should be done regularly and, at the least, before you submit a pull request.
+
+## Translations Installation
+
+If you wish to contribute to the system message translations,
+then fork and clone the [translations repository](https://github.com/codeigniter4/translations)
+separately from the codebase.
+
+These are two independent repositories!

From d6c9a55ef93853e6d07e03f939ceb9803e72fbf2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 09:33:02 +0900
Subject: [PATCH 0368/2325] docs: move README.md links to pull_request.md

---
 contributing/README.md       | 9 ---------
 contributing/pull_request.md | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/contributing/README.md b/contributing/README.md
index 9169d72c8ad1..146ab4c097c5 100644
--- a/contributing/README.md
+++ b/contributing/README.md
@@ -1,15 +1,6 @@
 Contributing to CodeIgniter
 ===========================
 
--   [Contribution guidelines](./guidelines.md)
--   [Contribution workflow](./workflow.md)
--   [Contribution signing](./signing.md)
--   [Contribution CSS](./css.md)
--   [Framework internals](./internals.md)
--   [CodeIgniter documentation](./documentation.rst)
--   [CodeIgniter Coding Style Guide](./styleguide.md)
--   [Developer's Certificate of Origin](../DCO.txt)
-
 CodeIgniter is a community driven project and accepts contributions of
 code and documentation from the community. These contributions are made
 in the form of Issues or [Pull
diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index 206e268606a7..c0b7194badbb 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -1,5 +1,14 @@
 # Sending a Pull Request
 
+- [Contribution guidelines](./guidelines.md)
+- [Contribution workflow](./workflow.md)
+- [Contribution signing](./signing.md)
+- [Contribution CSS](./css.md)
+- [Framework internals](./internals.md)
+- [CodeIgniter documentation](./documentation.rst)
+- [CodeIgniter Coding Style Guide](./styleguide.md)
+- [Developer's Certificate of Origin](../DCO.txt)
+
 ## Contributions
 
 We expect all contributions to conform to our

From c86b41f675ade4c1cecf4d499b6cbced3d9b68b9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 09:35:28 +0900
Subject: [PATCH 0369/2325] docs: move README.md contents to bug_report.md

---
 contributing/README.md     | 64 -------------------------------------
 contributing/bug_report.md | 65 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 64 deletions(-)
 create mode 100644 contributing/bug_report.md

diff --git a/contributing/README.md b/contributing/README.md
index 146ab4c097c5..36b09302ddb2 100644
--- a/contributing/README.md
+++ b/contributing/README.md
@@ -7,67 +7,3 @@ in the form of Issues or [Pull
 Requests](https://help.github.com/articles/using-pull-requests/) on the
 [CodeIgniter4 repository](https://github.com/codeigniter4/CodeIgniter4)
 on GitHub.
-
-Issues are a quick way to point out a bug. If you find a bug or
-documentation error in CodeIgniter then please check a few things first:
-
--   There is not already an open Issue
--   The issue has already been fixed (check the develop branch, or look
-    for closed Issues)
--   Is it something really obvious that you fix it yourself?
-
-Reporting issues is helpful but an even better approach is to send a
-Pull Request, which is done by "Forking" the main repository and
-committing to your own copy. This will require you to use the version
-control system called Git.
-
-Support
--------
-
-Please note that GitHub is not for general support questions! If you are
-having trouble using a feature of CodeIgniter, ask for help on our
-[forums](http://forum.codeigniter.com/) instead.
-
-If you are not sure whether you are using something correctly or if you
-have found a bug, again - please ask on the forums first.
-
-Security
---------
-
-Did you find a security issue in CodeIgniter?
-
-Please *don't* disclose it publicly, but e-mail us at
-<security@codeigniter.com>, or report it via our page on
-[HackerOne](https://hackerone.com/codeigniter).
-
-If you've found a critical vulnerability, we'd be happy to credit you in
-our
-[ChangeLog](https://codeigniter4.github.io/CodeIgniter4/changelogs/index.html).
-
-Tips for a Good Issue Report
-----------------------------
-
-Use a descriptive subject line (eg parser library chokes on commas)
-rather than a vague one (eg. your code broke).
-
-Address a single issue in a report.
-
-Identify the CodeIgniter version (eg 4.0.1) and the component if you
-know it (eg. parser library)
-
-Explain what you expected to happen, and what did happen. Include error
-messages and stacktrace, if any.
-
-Include short code segments if they help to explain. Use a pastebin or
-dropbox facility to include longer segments of code or screenshots - do
-not include them in the issue report itself. This means setting a
-reasonable expiry for those, until the issue is resolved or closed.
-
-If you know how to fix the issue, you can do so in your own fork &
-branch, and submit a pull request. The issue report information above
-should be part of that.
-
-If your issue report can describe the steps to reproduce the problem,
-that is great. If you can include a unit test that reproduces the
-problem, that is even better, as it gives whoever is fixing it a clearer
-target!
diff --git a/contributing/bug_report.md b/contributing/bug_report.md
new file mode 100644
index 000000000000..59cf84d36f26
--- /dev/null
+++ b/contributing/bug_report.md
@@ -0,0 +1,65 @@
+# Reporting a Bug
+
+Issues are a quick way to point out a bug. If you find a bug or
+documentation error in CodeIgniter then please check a few things first:
+
+-   There is not already an open Issue
+-   The issue has already been fixed (check the develop branch, or look
+    for closed Issues)
+-   Is it something really obvious that you fix it yourself?
+
+Reporting issues is helpful but an even better approach is to send a
+Pull Request, which is done by "Forking" the main repository and
+committing to your own copy. This will require you to use the version
+control system called Git.
+
+Support
+-------
+
+Please note that GitHub is not for general support questions! If you are
+having trouble using a feature of CodeIgniter, ask for help on our
+[forums](http://forum.codeigniter.com/) instead.
+
+If you are not sure whether you are using something correctly or if you
+have found a bug, again - please ask on the forums first.
+
+Security
+--------
+
+Did you find a security issue in CodeIgniter?
+
+Please *don't* disclose it publicly, but e-mail us at
+<security@codeigniter.com>, or report it via our page on
+[HackerOne](https://hackerone.com/codeigniter).
+
+If you've found a critical vulnerability, we'd be happy to credit you in
+our
+[ChangeLog](https://codeigniter4.github.io/CodeIgniter4/changelogs/index.html).
+
+Tips for a Good Issue Report
+----------------------------
+
+Use a descriptive subject line (eg parser library chokes on commas)
+rather than a vague one (eg. your code broke).
+
+Address a single issue in a report.
+
+Identify the CodeIgniter version (eg 4.0.1) and the component if you
+know it (eg. parser library)
+
+Explain what you expected to happen, and what did happen. Include error
+messages and stacktrace, if any.
+
+Include short code segments if they help to explain. Use a pastebin or
+dropbox facility to include longer segments of code or screenshots - do
+not include them in the issue report itself. This means setting a
+reasonable expiry for those, until the issue is resolved or closed.
+
+If you know how to fix the issue, you can do so in your own fork &
+branch, and submit a pull request. The issue report information above
+should be part of that.
+
+If your issue report can describe the steps to reproduce the problem,
+that is great. If you can include a unit test that reproduces the
+problem, that is even better, as it gives whoever is fixing it a clearer
+target!

From 220e5fd567aec156638122eb2e7989170bb3e26e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 09:36:27 +0900
Subject: [PATCH 0370/2325] docs: add links to README.md

---
 contributing/README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contributing/README.md b/contributing/README.md
index 36b09302ddb2..9584811e9353 100644
--- a/contributing/README.md
+++ b/contributing/README.md
@@ -7,3 +7,7 @@ in the form of Issues or [Pull
 Requests](https://help.github.com/articles/using-pull-requests/) on the
 [CodeIgniter4 repository](https://github.com/codeigniter4/CodeIgniter4)
 on GitHub.
+
+- [Contributor Covenant Code of Conduct](../CODE_OF_CONDUCT.md)
+- [Reporting a Bug](./bug_report.md)
+- [Sending a Pull Request](./pull_request.md)

From defc08f074033a895fc66719428fefb08fcba65b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 09:39:55 +0900
Subject: [PATCH 0371/2325] docs: add small explanation and link to README

---
 CONTRIBUTING.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0ce39a98007f..3688517a265a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1 +1,6 @@
 # Contributing to CodeIgniter4
+
+CodeIgniter is a community driven project and accepts contributions of
+code and documentation from the community.
+
+If you'd like to contribute, please read the [Contributing to CodeIgniter](./contributing/README.md).

From 2f9c5a9485caf5bffdfd5b24799bc12f82c3c00d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 09:43:12 +0900
Subject: [PATCH 0372/2325] docs: move Issues section from pull_request.md to
 bug_report.md

---
 contributing/bug_report.md   | 14 ++++++++++++++
 contributing/pull_request.md | 13 -------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/contributing/bug_report.md b/contributing/bug_report.md
index 59cf84d36f26..2c0e2be33ec5 100644
--- a/contributing/bug_report.md
+++ b/contributing/bug_report.md
@@ -1,5 +1,19 @@
 # Reporting a Bug
 
+## Issues
+
+Issues are a quick way to point out a bug. If you find a bug or documentation error in CodeIgniter then please make sure that:
+
+1. There is not already an open [Issue](https://github.com/codeigniter4/CodeIgniter4/issues)
+2. The Issue has not already been fixed (check the develop branch or look for [closed Issues](https://github.com/codeigniter4/CodeIgniter4/issues?q=is%3Aissue+is%3Aclosed))
+3. It's not something really obvious that you can fix yourself
+
+Reporting Issues is helpful, but an even [better approach](./contributing/workflow.md) is to send a
+[Pull Request](https://help.github.com/en/articles/creating-a-pull-request), which is done by
+[Forking](https://help.github.com/en/articles/fork-a-repo) the main repository and making
+a [Commit](https://help.github.com/en/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project)
+to your own copy of the project. This will require you to use the version control system called [Git](https://git-scm.com/).
+
 Issues are a quick way to point out a bug. If you find a bug or
 documentation error in CodeIgniter then please check a few things first:
 
diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index c0b7194badbb..1648554718e3 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -25,19 +25,6 @@ make it as painless for your contributions to be included as possible. If you ne
 running on your local machines, ask for help on the forums. We would be happy to help out.
 
 The [Open Source Guide](https://opensource.guide/) is a good first read for those new to contributing to open source!
-## Issues
-
-Issues are a quick way to point out a bug. If you find a bug or documentation error in CodeIgniter then please make sure that:
-
-1. There is not already an open [Issue](https://github.com/codeigniter4/CodeIgniter4/issues)
-2. The Issue has not already been fixed (check the develop branch or look for [closed Issues](https://github.com/codeigniter4/CodeIgniter4/issues?q=is%3Aissue+is%3Aclosed))
-3. It's not something really obvious that you can fix yourself
-
-Reporting Issues is helpful, but an even [better approach](./contributing/workflow.md) is to send a
-[Pull Request](https://help.github.com/en/articles/creating-a-pull-request), which is done by
-[Forking](https://help.github.com/en/articles/fork-a-repo) the main repository and making
-a [Commit](https://help.github.com/en/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project)
-to your own copy of the project. This will require you to use the version control system called [Git](https://git-scm.com/).
 
 ## Guidelines
 

From b489553847d55c8ed28d6b59c19f9a398c6e0db3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 09:45:44 +0900
Subject: [PATCH 0373/2325] docs: remove deplicated contents

---
 contributing/bug_report.md | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/contributing/bug_report.md b/contributing/bug_report.md
index 2c0e2be33ec5..cb70e7e61590 100644
--- a/contributing/bug_report.md
+++ b/contributing/bug_report.md
@@ -14,19 +14,6 @@ Reporting Issues is helpful, but an even [better approach](./contributing/workfl
 a [Commit](https://help.github.com/en/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project)
 to your own copy of the project. This will require you to use the version control system called [Git](https://git-scm.com/).
 
-Issues are a quick way to point out a bug. If you find a bug or
-documentation error in CodeIgniter then please check a few things first:
-
--   There is not already an open Issue
--   The issue has already been fixed (check the develop branch, or look
-    for closed Issues)
--   Is it something really obvious that you fix it yourself?
-
-Reporting issues is helpful but an even better approach is to send a
-Pull Request, which is done by "Forking" the main repository and
-committing to your own copy. This will require you to use the version
-control system called Git.
-
 Support
 -------
 

From 290d474aa587fc6c0b045d51c2a77334d005394c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 09:46:52 +0900
Subject: [PATCH 0374/2325] docs: fix markdown style in bug_report.md

---
 contributing/bug_report.md | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/contributing/bug_report.md b/contributing/bug_report.md
index cb70e7e61590..bc37f1504fc8 100644
--- a/contributing/bug_report.md
+++ b/contributing/bug_report.md
@@ -14,8 +14,7 @@ Reporting Issues is helpful, but an even [better approach](./contributing/workfl
 a [Commit](https://help.github.com/en/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project)
 to your own copy of the project. This will require you to use the version control system called [Git](https://git-scm.com/).
 
-Support
--------
+## Support
 
 Please note that GitHub is not for general support questions! If you are
 having trouble using a feature of CodeIgniter, ask for help on our
@@ -24,8 +23,7 @@ having trouble using a feature of CodeIgniter, ask for help on our
 If you are not sure whether you are using something correctly or if you
 have found a bug, again - please ask on the forums first.
 
-Security
---------
+## Security
 
 Did you find a security issue in CodeIgniter?
 
@@ -37,8 +35,7 @@ If you've found a critical vulnerability, we'd be happy to credit you in
 our
 [ChangeLog](https://codeigniter4.github.io/CodeIgniter4/changelogs/index.html).
 
-Tips for a Good Issue Report
-----------------------------
+## Tips for a Good Issue Report
 
 Use a descriptive subject line (eg parser library chokes on commas)
 rather than a vague one (eg. your code broke).

From ad00bd1972a2b685aabcb3771b305b9320ba01f6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 09:48:06 +0900
Subject: [PATCH 0375/2325] docs: remove duplicated contents in the User Guide

---
 .../source/extending/contributing.rst         | 63 +------------------
 1 file changed, 1 insertion(+), 62 deletions(-)

diff --git a/user_guide_src/source/extending/contributing.rst b/user_guide_src/source/extending/contributing.rst
index 67479baf439d..dcb7753cc4d2 100644
--- a/user_guide_src/source/extending/contributing.rst
+++ b/user_guide_src/source/extending/contributing.rst
@@ -7,66 +7,5 @@ and documentation from the community. These contributions are made in the form
 of Issues or `Pull Requests <https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests>`_
 on the `CodeIgniter4 repository <https://github.com/codeigniter4/CodeIgniter4>`_ on GitHub.
 
-Issues are a quick way to point out a bug. If you find a bug or documentation
-error in CodeIgniter then please check a few things first:
-
-- There is not already an open Issue
-- The issue has already been fixed (check the develop branch, or look for
-  closed Issues)
-- Is it something really obvious that you fix it yourself?
-
-Reporting issues is helpful but an even better approach is to send a Pull
-Request, which is done by "Forking" the main repository and committing to your
-own copy. This will require you to use the version control system called Git.
-
-Please see the `Contributing to CodeIgniter4 <https://github.com/codeigniter4/CodeIgniter4/tree/develop/contributing>`_
+If you'd like to contribute, please see the `Contributing to CodeIgniter4 <https://github.com/codeigniter4/CodeIgniter4/tree/develop/contributing>`_
 section of our code repository.
-
-*******
-Support
-*******
-
-Please note that GitHub is not for general support questions! If you are
-having trouble using a feature, you can:
-
-- Start a new thread on the `forum <http://forum.codeigniter.com/>`_
-- Ask your questions on `Slack <https://codeigniterchat.slack.com/>`_
-
-If you are not sure whether you are using something correctly or if you
-have found a bug, again - please ask on the forums first.
-
-********
-Security
-********
-
-Did you find a security issue in CodeIgniter?
-
-Please *don't* disclose it publicly, but e-mail us at security@codeigniter.com,
-or report it via our page on `HackerOne <https://hackerone.com/codeigniter>`_.
-
-If you've found a critical vulnerability, we'd be happy to credit you in our
-`ChangeLog <../changelogs/index.html>`_.
-
-****************************
-Tips for a Good Issue Report
-****************************
-
-Use a descriptive subject line (eg parser library chokes on commas) rather than a vague one (e.g., your code broke).
-
-Address a single issue in a report.
-
-Identify the CodeIgniter version (eg 4.0.1) and the component if you know it (e.g., parser library)
-
-Explain what you expected to happen, and what did happen.
-Include error messages and stack trace, if any.
-
-Include short code segments if they help to explain.
-Use a pastebin or dropbox facility to include longer segments of code or screenshots - do not include them in the issue report itself.
-This means setting a reasonable expiry for those until the issue is resolved or closed.
-
-If you know how to fix the issue, you can do so in your own fork & branch, and submit a pull request.
-The issue report information above should be part of that.
-
-If your issue report can describe the steps to reproduce the problem, that is great.
-If you can include a unit test that reproduces the problem, that is even better, as it gives whoever is fixing
-it a clearer target!

From 2d9260d2ba8a09840c009c891d5f700b56956673 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 09:50:36 +0900
Subject: [PATCH 0376/2325] docs: remove DCO.txt and use DCO.md

---
 .gitattributes               |  1 -
 DCO.txt                      | 25 -------------------------
 contributing/pull_request.md |  2 +-
 3 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 DCO.txt

diff --git a/.gitattributes b/.gitattributes
index bf0e1f766d96..79c65323dade 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -14,7 +14,6 @@ contributing/ export-ignore
 .editorconfig export-ignore
 .nojekyll export-ignore export-ignore
 CODE_OF_CONDUCT.md export-ignore
-DCO.txt export-ignore
 PULL_REQUEST_TEMPLATE.md export-ignore
 stale.yml export-ignore
 Vagrantfile.dist export-ignore
diff --git a/DCO.txt b/DCO.txt
deleted file mode 100644
index a404c0d38b0d..000000000000
--- a/DCO.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(1)	The contribution was created in whole or in part by me and I
-	have the right to submit it under the open source license
-	indicated in the file; or
-
-(2)	The contribution is based upon previous work that, to the best
-	of my knowledge, is covered under an appropriate open source
-	license and I have the right under that license to submit that
-	work with modifications, whether created in whole or in part
-	by me, under the same open source license (unless I am
-	permitted to submit under a different license), as indicated
-	in the file; or
-
-(3)	The contribution was provided directly to me by some other
-	person who certified (1), (2) or (3) and I have not modified
-	it.
-
-(4)	I understand and agree that this project and the contribution
-	are public and that a record of the contribution (including all
-	personal information I submit with it, including my sign-off) is
-	maintained indefinitely and may be redistributed consistent with
-	this project or the open source license(s) involved.
diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index 1648554718e3..1b524f551dd3 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -7,7 +7,7 @@
 - [Framework internals](./internals.md)
 - [CodeIgniter documentation](./documentation.rst)
 - [CodeIgniter Coding Style Guide](./styleguide.md)
-- [Developer's Certificate of Origin](../DCO.txt)
+- [Developer's Certificate of Origin](./DCO.md)
 
 ## Contributions
 

From 6ce7ec5b409e3f8158e709feb761734a06def081 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 09:52:41 +0900
Subject: [PATCH 0377/2325] docs: move DCO.md link to the top

It is the most importatnt thing.
---
 contributing/pull_request.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index 1b524f551dd3..3ef772056919 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -1,5 +1,6 @@
 # Sending a Pull Request
 
+- [Developer's Certificate of Origin](./DCO.md)
 - [Contribution guidelines](./guidelines.md)
 - [Contribution workflow](./workflow.md)
 - [Contribution signing](./signing.md)
@@ -7,7 +8,6 @@
 - [Framework internals](./internals.md)
 - [CodeIgniter documentation](./documentation.rst)
 - [CodeIgniter Coding Style Guide](./styleguide.md)
-- [Developer's Certificate of Origin](./DCO.md)
 
 ## Contributions
 

From 49012c77c13f39fb18e998f6e3c129bb9a9de602 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 09:58:13 +0900
Subject: [PATCH 0378/2325] docs: move the links listed at the top to each
 section

---
 contributing/pull_request.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index 3ef772056919..d369c69d1e4c 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -1,13 +1,9 @@
 # Sending a Pull Request
 
 - [Developer's Certificate of Origin](./DCO.md)
-- [Contribution guidelines](./guidelines.md)
 - [Contribution workflow](./workflow.md)
-- [Contribution signing](./signing.md)
 - [Contribution CSS](./css.md)
 - [Framework internals](./internals.md)
-- [CodeIgniter documentation](./documentation.rst)
-- [CodeIgniter Coding Style Guide](./styleguide.md)
 
 ## Contributions
 
@@ -32,15 +28,21 @@ Before we look into how to contribute to CodeIgniter4, here are some guidelines.
 to pass these guidelines, they will be declined, and you will need to re-submit when you’ve made the changes.
 This might sound a bit tough, but it is required for us to maintain the quality of the codebase.
 
+- [Contribution guidelines](./guidelines.md)
+
 ### PHP Style
 
 All code must meet the [Style Guide](./contributing/styleguide.md).
 This makes certain that all submitted code is of the same format as the existing code and ensures that the codebase will be as readable as possible.
 
+- [CodeIgniter Coding Style Guide](./styleguide.md)
+
 ### Documentation
 
 If you change anything that requires a change to documentation, then you will need to add to the documentation. New classes, methods, parameters, changing default values, etc. are all changes that require a change to documentation. Also, the [changelog](https://codeigniter4.github.io/CodeIgniter4/changelogs/index.html) must be updated for every change, and [PHPDoc](https://github.com/codeigniter4/CodeIgniter4/blob/develop/phpdoc.dist.xml) blocks must be maintained.
 
+- [CodeIgniter documentation](./documentation.rst)
+
 ### Compatibility
 
 CodeIgniter4 requires [PHP 7.3](https://php.net/releases/7_3_0.php).
@@ -71,6 +73,8 @@ You must [GPG-sign](./contributing/signing.md) your work, certifying that you ei
 otherwise have the right to pass it on to an open-source project. This is *not* just a "signed-off-by"
 commit, but instead, a digitally signed one.
 
+- [Contribution signing](./signing.md)
+
 ### Static Analysis on PHP code
 
 We cannot, at all times, guarantee that all PHP code submitted on pull requests to be working well without

From 4e73ee859de5fbaac8081e5f6de49cc4dcfada8a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 10:02:09 +0900
Subject: [PATCH 0379/2325] docs: fix links to MD files

---
 contributing/bug_report.md   | 2 +-
 contributing/pull_request.md | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contributing/bug_report.md b/contributing/bug_report.md
index bc37f1504fc8..7a7b02c4dd7d 100644
--- a/contributing/bug_report.md
+++ b/contributing/bug_report.md
@@ -8,7 +8,7 @@ Issues are a quick way to point out a bug. If you find a bug or documentation er
 2. The Issue has not already been fixed (check the develop branch or look for [closed Issues](https://github.com/codeigniter4/CodeIgniter4/issues?q=is%3Aissue+is%3Aclosed))
 3. It's not something really obvious that you can fix yourself
 
-Reporting Issues is helpful, but an even [better approach](./contributing/workflow.md) is to send a
+Reporting Issues is helpful, but an even [better approach](./workflow.md) is to send a
 [Pull Request](https://help.github.com/en/articles/creating-a-pull-request), which is done by
 [Forking](https://help.github.com/en/articles/fork-a-repo) the main repository and making
 a [Commit](https://help.github.com/en/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project)
diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index d369c69d1e4c..83bf40433b34 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -12,7 +12,7 @@ We expect all contributions to conform to our
 be commented (inside the PHP source files), be documented (in the
 [user guide](https://codeigniter4.github.io/userguide/)), and unit tested (in
 the [test folder](https://github.com/codeigniter4/CodeIgniter4/tree/develop/tests)).
-There is a [Contributing to CodeIgniter](./contributing/README.md) section in the repository which describes the contribution process; this page is an overview.
+There is a [Contributing to CodeIgniter](./README.md) section in the repository which describes the contribution process; this page is an overview.
 
 Note, we expect all code changes or bug-fixes to be accompanied by one or more tests added to our test suite
 to prove the code works. If pull requests are not accompanied by relevant tests, they will likely be closed.
@@ -32,7 +32,7 @@ This might sound a bit tough, but it is required for us to maintain the quality
 
 ### PHP Style
 
-All code must meet the [Style Guide](./contributing/styleguide.md).
+All code must meet the [Style Guide](./styleguide.md).
 This makes certain that all submitted code is of the same format as the existing code and ensures that the codebase will be as readable as possible.
 
 - [CodeIgniter Coding Style Guide](./styleguide.md)
@@ -69,7 +69,7 @@ changes separate from each other and from whatever else you are doing with your
 
 ### Signing
 
-You must [GPG-sign](./contributing/signing.md) your work, certifying that you either wrote the work or
+You must [GPG-sign](./signing.md) your work, certifying that you either wrote the work or
 otherwise have the right to pass it on to an open-source project. This is *not* just a "signed-off-by"
 commit, but instead, a digitally signed one.
 

From 621fe1172ae28e7fdde60debf7aef645dee7148d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 10:10:07 +0900
Subject: [PATCH 0380/2325] docs: add deleted content from the User Guide

---
 contributing/bug_report.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/contributing/bug_report.md b/contributing/bug_report.md
index 7a7b02c4dd7d..c564a9a734f4 100644
--- a/contributing/bug_report.md
+++ b/contributing/bug_report.md
@@ -17,8 +17,10 @@ to your own copy of the project. This will require you to use the version contro
 ## Support
 
 Please note that GitHub is not for general support questions! If you are
-having trouble using a feature of CodeIgniter, ask for help on our
-[forums](http://forum.codeigniter.com/) instead.
+having trouble using a feature, you can:
+
+- Start a new thread on our [Forums](http://forum.codeigniter.com/)
+- Ask your questions on [Slack](https://codeigniterchat.slack.com/)
 
 If you are not sure whether you are using something correctly or if you
 have found a bug, again - please ask on the forums first.

From fb23acf311fed647938e7b18375cb19348b068fe Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 10:16:21 +0900
Subject: [PATCH 0381/2325] docs: remove "Allman indent style"

---
 contributing/guidelines.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/contributing/guidelines.md b/contributing/guidelines.md
index 77e004d2d173..566f86d2c14d 100644
--- a/contributing/guidelines.md
+++ b/contributing/guidelines.md
@@ -10,9 +10,7 @@ PHP Style
 ---------
 
 All code must conform to our [Style Guide](./styleguide.md), which is
-essentially the [Allman indent
-style](https://en.wikipedia.org/wiki/Indent_style#Allman_style), with
-elaboration on naming and readable operators.
+based on PSR-12.
 
 This makes certain that all code is the same format as the existing code
 and means it will be as readable as possible.

From 78dd812ba7ab50e9bee40778f7a889d72ef8655a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 10:19:51 +0900
Subject: [PATCH 0382/2325] docs: replace Github with GitHub

---
 contributing/pull_request.md |  2 +-
 contributing/signing.md      |  4 ++--
 contributing/workflow.md     | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index 83bf40433b34..747665d7734a 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -111,7 +111,7 @@ The best way to contribute is to fork the CodeIgniter4 repository, and "clone" t
 
 1. Set up Git ([Windows](https://git-scm.com/download/win), [Mac](https://git-scm.com/download/mac), & [Linux](https://git-scm.com/download/linux)).
 2. Go to the [CodeIgniter4 repository](https://github.com/codeigniter4/CodeIgniter4).
-3. [Fork](https://help.github.com/en/articles/fork-a-repo) it (to your Github account).
+3. [Fork](https://help.github.com/en/articles/fork-a-repo) it (to your GitHub account).
 4. [Clone](https://help.github.com/en/articles/cloning-a-repository) your CodeIgniter repository: `git@github.com:\<your-name>/CodeIgniter4.git`
 5. Create a new [branch](https://help.github.com/en/articles/about-branches) in your project for each set of changes you want to make.
 6. Fix existing bugs on the [Issue tracker](https://github.com/codeigniter4/CodeIgniter4/issues) after confirming that no one else is working on them.
diff --git a/contributing/signing.md b/contributing/signing.md
index 7d51aab5dd0a..5bd28fd2d4bc 100644
--- a/contributing/signing.md
+++ b/contributing/signing.md
@@ -36,7 +36,7 @@ to your github account.
 
 See the [git
 tools](https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work) page
-for directions on doing this. The complete story is part of [Github
+for directions on doing this. The complete story is part of [GitHub
 help](https://help.github.com/categories/gpg/).
 
 The basic steps are
@@ -44,7 +44,7 @@ The basic steps are
 -   [generate your GPG
     key](https://help.github.com/articles/generating-a-new-gpg-key/),
     and copy the ASCII representation of it.
--   [Add your GPG key to your Github
+-   [Add your GPG key to your GitHub
     account](https://help.github.com/articles/adding-a-new-gpg-key-to-your-github-account/).
 -   [Tell
     Git](https://help.github.com/articles/telling-git-about-your-gpg-key/)
diff --git a/contributing/workflow.md b/contributing/workflow.md
index 63eb38c1f348..1a75bcca6900 100644
--- a/contributing/workflow.md
+++ b/contributing/workflow.md
@@ -47,7 +47,7 @@ forked repository, while you cannot do the same with the shared one -
 you have to submit pull requests to it instead.
 
 [Creating a fork](https://help.github.com/articles/fork-a-repo/) is done
-through the Github website. Navigate to [our
+through the GitHub website. Navigate to [our
 repository](https://github.com/codeigniter4/CodeIgniter4), click the
 **Fork** button in the top-right of the page, and choose which account
 or organization of yours should contain that fork.
@@ -55,11 +55,11 @@ or organization of yours should contain that fork.
 Cloning
 -------
 
-You *could* work on your repository using Github's web interface, but
+You *could* work on your repository using GitHub's web interface, but
 that is awkward. Most developers will clone their repository to their
 local system, and work with it there.
 
-On Github, navigate to your forked repository, click **Clone or
+On GitHub, navigate to your forked repository, click **Clone or
 download**, and copy the cloning URL shown. We will refer to this as
 ORIGIN\_URL.
 
@@ -72,7 +72,7 @@ Synching
 --------
 
 Within your local repository, Git will have created an alias,
-**origin**, for the Github repository it is bound to. You want to create
+**origin**, for the GitHub repository it is bound to. You want to create
 an alias for the shared repository as well, so that you can "synch" the
 two, making sure that your repository includes any other contributions
 that have been merged by us into the shared repo:
@@ -181,7 +181,7 @@ And finally push your local branch to your github repository:
 Pull Requests
 -------------
 
-On Github, you propose your changes one feature branch at a time, by
+On GitHub, you propose your changes one feature branch at a time, by
 switching to the branch you wish to contribute, and then clicking on
 "New pull request".
 

From 2e2c2d42eaa2d31a1bce37c6afcbb9854612354b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 10:28:35 +0900
Subject: [PATCH 0383/2325] docs: move guidelines.md contents to
 pull_request.md

---
 contributing/guidelines.md   | 87 ------------------------------------
 contributing/pull_request.md | 82 +++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 87 deletions(-)

diff --git a/contributing/guidelines.md b/contributing/guidelines.md
index 566f86d2c14d..1c1f1d086744 100644
--- a/contributing/guidelines.md
+++ b/contributing/guidelines.md
@@ -1,98 +1,11 @@
 Contribution Guidelines
 =======================
 
-Your Pull Requests (PRs) need to meet our guidelines. If a PR fails to
-pass these guidelines, it will be declined and you will need to
-re-submit when you’ve made the changes. This might sound a bit tough,
-but it is required for us to maintain quality of the code-base.
-
 PHP Style
 ---------
 
-All code must conform to our [Style Guide](./styleguide.md), which is
-based on PSR-12.
-
-This makes certain that all code is the same format as the existing code
-and means it will be as readable as possible.
-
-Our Style Guide is similar to PSR-1 and PSR-2, from PHP-FIG, but not
-necessarily the same or compatible.
-
-Unit Testing
-------------
-
-Unit testing is expected for all CodeIgniter components. We use PHPunit,
-and run unit tests using travis-ci for each PR submitted or changed.
-
-In the CodeIgniter project, there is a `tests` folder, with a structure
-that parallels that of `system`.
-
-The normal practice would be to have a unit test class for each of the
-classes in `system`, named appropriately. For instance, the `BananaTest`
-class would test the `Banana` class. There will be occasions when it is
-more convenient to have separate classes to test different functionality
-of a single CodeIgniter component.
-
-See the [PHPUnit website](https://phpunit.de/) for more information.
-
-PHPdoc Comments
----------------
-
-Source code should be commented using PHPdoc comments blocks. Thie means
-implementation comments to explain potentially confusing sections of
-code, and documentation comments before each public or protected
-class/interface/trait, method and variable.
-
-See the [phpDocumentor website](https://phpdoc.org/) for more
-information.
-
 Documentation
 -------------
 
-The User Guide is an essential component of the CodeIgniter framework.
-
-Each framework component or group of components needs a corresponding
-section in the User Guide. Some of the more fundamental components will
-show up in more than one place.
-
-Change Log
-----------
-
-The change-log, in the user guide root, needs to be kept up-to-date. Not
-all changes will need an entry in it, but new classes, major or BC
-changes to existing classes should. Once we have a stable release, bug
-fixes would appear in the changelog too.
-
-The changelog is independently maintained by the framework release
-manager Make sure that your PR descriptions help us decide if the
-contribution should be highlighted in the next release after it has been
-merged.
-
 PHP Compatibility
 -----------------
-
-CodeIgniter4 requires PHP 7.3.
-
-Backwards Compatibility
------------------------
-
-Generally, we aim to maintain backwards compatibility between minor
-versions of the framework. Any changes that break compatibility need a
-good reason to do so, and need to be pointed out in the
-[Upgrading](https://codeigniter4.github.io/userguide/installation/upgrading.html)
-guide.
-
-CodeIgniter4 itself represents a significant backwards compatibility
-break with earlier versions of the framework.
-
-Mergeability
-------------
-
-Your PRs need to be mergeable and GPG-signed before they will be
-considered.
-
-We suggest that you synchronize your repository's `develop` branch with
-that in the main repository, and then your feature branch and your
-develop branch, before submitting a PR. You will need to resolve any
-merge conflicts introduced by changes incorporated since you started
-working on your contribution.
diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index 747665d7734a..f40c83ee15e6 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -30,6 +30,11 @@ This might sound a bit tough, but it is required for us to maintain the quality
 
 - [Contribution guidelines](./guidelines.md)
 
+Your Pull Requests (PRs) need to meet our guidelines. If a PR fails to
+pass these guidelines, it will be declined and you will need to
+re-submit when you’ve made the changes. This might sound a bit tough,
+but it is required for us to maintain quality of the code-base.
+
 ### PHP Style
 
 All code must meet the [Style Guide](./styleguide.md).
@@ -37,16 +42,93 @@ This makes certain that all submitted code is of the same format as the existing
 
 - [CodeIgniter Coding Style Guide](./styleguide.md)
 
+All code must conform to our [Style Guide](./styleguide.md), which is
+based on PSR-12.
+
+This makes certain that all code is the same format as the existing code
+and means it will be as readable as possible.
+
+Our Style Guide is similar to PSR-1 and PSR-2, from PHP-FIG, but not
+necessarily the same or compatible.
+
+### Unit Testing
+
+Unit testing is expected for all CodeIgniter components. We use PHPunit,
+and run unit tests using travis-ci for each PR submitted or changed.
+
+In the CodeIgniter project, there is a `tests` folder, with a structure
+that parallels that of `system`.
+
+The normal practice would be to have a unit test class for each of the
+classes in `system`, named appropriately. For instance, the `BananaTest`
+class would test the `Banana` class. There will be occasions when it is
+more convenient to have separate classes to test different functionality
+of a single CodeIgniter component.
+
+See the [PHPUnit website](https://phpunit.de/) for more information.
+
+### PHPdoc Comments
+
+Source code should be commented using PHPdoc comments blocks. Thie means
+implementation comments to explain potentially confusing sections of
+code, and documentation comments before each public or protected
+class/interface/trait, method and variable.
+
+See the [phpDocumentor website](https://phpdoc.org/) for more
+information.
+
 ### Documentation
 
 If you change anything that requires a change to documentation, then you will need to add to the documentation. New classes, methods, parameters, changing default values, etc. are all changes that require a change to documentation. Also, the [changelog](https://codeigniter4.github.io/CodeIgniter4/changelogs/index.html) must be updated for every change, and [PHPDoc](https://github.com/codeigniter4/CodeIgniter4/blob/develop/phpdoc.dist.xml) blocks must be maintained.
 
 - [CodeIgniter documentation](./documentation.rst)
 
+The User Guide is an essential component of the CodeIgniter framework.
+
+Each framework component or group of components needs a corresponding
+section in the User Guide. Some of the more fundamental components will
+show up in more than one place.
+
+### Change Log
+
+The change-log, in the user guide root, needs to be kept up-to-date. Not
+all changes will need an entry in it, but new classes, major or BC
+changes to existing classes should. Once we have a stable release, bug
+fixes would appear in the changelog too.
+
+The changelog is independently maintained by the framework release
+manager Make sure that your PR descriptions help us decide if the
+contribution should be highlighted in the next release after it has been
+merged.
+
 ### Compatibility
 
 CodeIgniter4 requires [PHP 7.3](https://php.net/releases/7_3_0.php).
 
+CodeIgniter4 requires PHP 7.3.
+
+### Backwards Compatibility
+
+Generally, we aim to maintain backwards compatibility between minor
+versions of the framework. Any changes that break compatibility need a
+good reason to do so, and need to be pointed out in the
+[Upgrading](https://codeigniter4.github.io/userguide/installation/upgrading.html)
+guide.
+
+CodeIgniter4 itself represents a significant backwards compatibility
+break with earlier versions of the framework.
+
+### Mergeability
+
+Your PRs need to be mergeable and GPG-signed before they will be
+considered.
+
+We suggest that you synchronize your repository's `develop` branch with
+that in the main repository, and then your feature branch and your
+develop branch, before submitting a PR. You will need to resolve any
+merge conflicts introduced by changes incorporated since you started
+working on your contribution.
+
 ### Branching
 
 CodeIgniter4 uses the [Git-Flow](http://nvie.com/posts/a-successful-git-branching-model/) branching model

From 4e3c8c1fcf9cf40df987e57b4689e9f5995c9897 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 10:29:53 +0900
Subject: [PATCH 0384/2325] docs: remove guidelines.md

---
 contributing/guidelines.md   | 11 -----------
 contributing/pull_request.md |  2 --
 2 files changed, 13 deletions(-)
 delete mode 100644 contributing/guidelines.md

diff --git a/contributing/guidelines.md b/contributing/guidelines.md
deleted file mode 100644
index 1c1f1d086744..000000000000
--- a/contributing/guidelines.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Contribution Guidelines
-=======================
-
-PHP Style
----------
-
-Documentation
--------------
-
-PHP Compatibility
------------------
diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index f40c83ee15e6..d456c6fe878a 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -28,8 +28,6 @@ Before we look into how to contribute to CodeIgniter4, here are some guidelines.
 to pass these guidelines, they will be declined, and you will need to re-submit when you’ve made the changes.
 This might sound a bit tough, but it is required for us to maintain the quality of the codebase.
 
-- [Contribution guidelines](./guidelines.md)
-
 Your Pull Requests (PRs) need to meet our guidelines. If a PR fails to
 pass these guidelines, it will be declined and you will need to
 re-submit when you’ve made the changes. This might sound a bit tough,

From 0255057e847290412ba99b540d8e3625782b0a7f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 10:52:36 +0900
Subject: [PATCH 0385/2325] docs: remove duplicated contents

---
 contributing/pull_request.md | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index d456c6fe878a..f98913751a25 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -24,27 +24,22 @@ The [Open Source Guide](https://opensource.guide/) is a good first read for thos
 
 ## Guidelines
 
-Before we look into how to contribute to CodeIgniter4, here are some guidelines. If your Pull Requests fail
-to pass these guidelines, they will be declined, and you will need to re-submit when you’ve made the changes.
-This might sound a bit tough, but it is required for us to maintain the quality of the codebase.
+Before we look into how to contribute to CodeIgniter4, here are some guidelines.
+Your Pull Requests (PRs) need to meet our guidelines.
 
-Your Pull Requests (PRs) need to meet our guidelines. If a PR fails to
-pass these guidelines, it will be declined and you will need to
-re-submit when you’ve made the changes. This might sound a bit tough,
-but it is required for us to maintain quality of the code-base.
+If your Pull Requests fail to pass these guidelines, they will be declined, 
+and you will need to re-submit when you’ve made the changes.
+This might sound a bit tough, but it is required for us to maintain the quality of the codebase.
 
 ### PHP Style
 
-All code must meet the [Style Guide](./styleguide.md).
-This makes certain that all submitted code is of the same format as the existing code and ensures that the codebase will be as readable as possible.
-
 - [CodeIgniter Coding Style Guide](./styleguide.md)
 
 All code must conform to our [Style Guide](./styleguide.md), which is
 based on PSR-12.
 
-This makes certain that all code is the same format as the existing code
-and means it will be as readable as possible.
+This makes certain that all submitted code is of the same format 
+as the existing code and ensures that the codebase will be as readable as possible.
 
 Our Style Guide is similar to PSR-1 and PSR-2, from PHP-FIG, but not
 necessarily the same or compatible.
@@ -103,8 +98,6 @@ merged.
 
 CodeIgniter4 requires [PHP 7.3](https://php.net/releases/7_3_0.php).
 
-CodeIgniter4 requires PHP 7.3.
-
 ### Backwards Compatibility
 
 Generally, we aim to maintain backwards compatibility between minor

From d45016593fdecec2b5ca80a5bf2b1e454de96b0d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 10:54:02 +0900
Subject: [PATCH 0386/2325] docs: replace PHPdoc with PHPDoc

---
 contributing/pull_request.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index f98913751a25..b4cff1977c49 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -60,9 +60,9 @@ of a single CodeIgniter component.
 
 See the [PHPUnit website](https://phpunit.de/) for more information.
 
-### PHPdoc Comments
+### PHPDoc Comments
 
-Source code should be commented using PHPdoc comments blocks. Thie means
+Source code should be commented using PHPDoc comments blocks. Thie means
 implementation comments to explain potentially confusing sections of
 code, and documentation comments before each public or protected
 class/interface/trait, method and variable.

From a976026185a9873b46ae968f595389a21261ac1c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 10:56:39 +0900
Subject: [PATCH 0387/2325] docs: move Breaking Changes section

---
 contributing/pull_request.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index b4cff1977c49..49f7c7b2e092 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -109,6 +109,15 @@ guide.
 CodeIgniter4 itself represents a significant backwards compatibility
 break with earlier versions of the framework.
 
+### Breaking Changes
+
+In general, any change that would disrupt existing uses of the framework is considered a "breaking change" and will not be favorably considered. A few specific examples to pay attention to:
+
+1. New classes/properties/constants in `system` are acceptable, but anything in the `app` directory that will be used in `system` should be backwards-compatible.
+2. Any changes to non-private methods must be backwards-compatible with the original definition.
+3. Deleting non-private properties or methods without prior deprecation notices is frowned upon and will likely be closed.
+4. Deleting or renaming public classes and interfaces, as well as those not marked as `@internal`, without prior deprecation notices or not providing fallback solutions will also not be favorably considered.
+
 ### Mergeability
 
 Your PRs need to be mergeable and GPG-signed before they will be
@@ -169,15 +178,6 @@ Rector, on the other hand, can be run on the specific files you modified or adde
 [1]: https://github.com/phpstan/phpstan-src
 [2]: https://github.com/rector/rector
 
-### Breaking Changes
-
-In general, any change that would disrupt existing uses of the framework is considered a "breaking change" and will not be favorably considered. A few specific examples to pay attention to:
-
-1. New classes/properties/constants in `system` are acceptable, but anything in the `app` directory that will be used in `system` should be backwards-compatible.
-2. Any changes to non-private methods must be backwards-compatible with the original definition.
-3. Deleting non-private properties or methods without prior deprecation notices is frowned upon and will likely be closed.
-4. Deleting or renaming public classes and interfaces, as well as those not marked as `@internal`, without prior deprecation notices or not providing fallback solutions will also not be favorably considered.
-
 ## How-to Guide
 
 The best way to contribute is to fork the CodeIgniter4 repository, and "clone" that to your development area. That sounds like some jargon, but "forking" on GitHub means "making a copy of that repo to your account" and "cloning" means "copying that code to your environment so you can work on it".

From c75c1946598d28f52bafcbaeb60bee44d4e1a4e2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 11:01:04 +0900
Subject: [PATCH 0388/2325] docs: replace change-log with changelog

---
 contributing/pull_request.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index 49f7c7b2e092..dff9f5a353b9 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -84,7 +84,7 @@ show up in more than one place.
 
 ### Change Log
 
-The change-log, in the user guide root, needs to be kept up-to-date. Not
+The changelog, in the user guide root, needs to be kept up-to-date. Not
 all changes will need an entry in it, but new classes, major or BC
 changes to existing classes should. Once we have a stable release, bug
 fixes would appear in the changelog too.

From a809546c1c95b9c54094ff46adfd4bf9ba0ce686 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 11:13:28 +0900
Subject: [PATCH 0389/2325] docs: remove unneeded sentenses

---
 contributing/pull_request.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index dff9f5a353b9..2edb6d285863 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -12,7 +12,6 @@ We expect all contributions to conform to our
 be commented (inside the PHP source files), be documented (in the
 [user guide](https://codeigniter4.github.io/userguide/)), and unit tested (in
 the [test folder](https://github.com/codeigniter4/CodeIgniter4/tree/develop/tests)).
-There is a [Contributing to CodeIgniter](./README.md) section in the repository which describes the contribution process; this page is an overview.
 
 Note, we expect all code changes or bug-fixes to be accompanied by one or more tests added to our test suite
 to prove the code works. If pull requests are not accompanied by relevant tests, they will likely be closed.

From efa9c9c725d74736c7452fa4be4665b1c9bb358c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 11:13:58 +0900
Subject: [PATCH 0390/2325] docs: fix typo

---
 contributing/pull_request.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index 2edb6d285863..b24bd4e49e60 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -61,7 +61,7 @@ See the [PHPUnit website](https://phpunit.de/) for more information.
 
 ### PHPDoc Comments
 
-Source code should be commented using PHPDoc comments blocks. Thie means
+Source code should be commented using PHPDoc comments blocks. This means
 implementation comments to explain potentially confusing sections of
 code, and documentation comments before each public or protected
 class/interface/trait, method and variable.

From 888ad54fbf741a61c6105ca0cf9b171b606ca24c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 11:14:30 +0900
Subject: [PATCH 0391/2325] docs: change the heading level

---
 contributing/pull_request.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index b24bd4e49e60..77e2e5c508a8 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -108,7 +108,7 @@ guide.
 CodeIgniter4 itself represents a significant backwards compatibility
 break with earlier versions of the framework.
 
-### Breaking Changes
+#### Breaking Changes
 
 In general, any change that would disrupt existing uses of the framework is considered a "breaking change" and will not be favorably considered. A few specific examples to pay attention to:
 

From 9db08d489ba6b94c8fe393e13d3644de6fbbede8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 11:18:48 +0900
Subject: [PATCH 0392/2325] docs: update Documentation section

---
 contributing/pull_request.md | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index 77e2e5c508a8..c17a75afa956 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -71,16 +71,21 @@ information.
 
 ### Documentation
 
-If you change anything that requires a change to documentation, then you will need to add to the documentation. New classes, methods, parameters, changing default values, etc. are all changes that require a change to documentation. Also, the [changelog](https://codeigniter4.github.io/CodeIgniter4/changelogs/index.html) must be updated for every change, and [PHPDoc](https://github.com/codeigniter4/CodeIgniter4/blob/develop/phpdoc.dist.xml) blocks must be maintained.
-
-- [CodeIgniter documentation](./documentation.rst)
-
 The User Guide is an essential component of the CodeIgniter framework.
 
 Each framework component or group of components needs a corresponding
 section in the User Guide. Some of the more fundamental components will
 show up in more than one place.
 
+If you change anything that requires a change to documentation, 
+then you will need to add to the documentation. 
+New classes, methods, parameters, changing default values, etc. 
+are all changes that require a change to documentation. 
+Also, the [changelog](https://codeigniter4.github.io/CodeIgniter4/changelogs/index.html) must be updated for every change, 
+and [PHPDoc](https://github.com/codeigniter4/CodeIgniter4/blob/develop/phpdoc.dist.xml) blocks must be maintained.
+
+See [Writing CodeIgniter Documentation](./documentation.rst).
+
 ### Change Log
 
 The changelog, in the user guide root, needs to be kept up-to-date. Not

From 2c1744d7a9a9b391295e003acdbaa013c47201a7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 11:25:34 +0900
Subject: [PATCH 0393/2325] docs: add about `composer cs-fix`

---
 contributing/pull_request.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index c17a75afa956..dc71cb91a760 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -40,8 +40,13 @@ based on PSR-12.
 This makes certain that all submitted code is of the same format 
 as the existing code and ensures that the codebase will be as readable as possible.
 
-Our Style Guide is similar to PSR-1 and PSR-2, from PHP-FIG, but not
-necessarily the same or compatible.
+You can fix most of the coding style violations by running this command in your terminal:
+
+	composer cs-fix
+
+You can check the coding style violations:
+
+	composer cs
 
 ### Unit Testing
 

From e6966eb14caa5d0a05781648ae142316b4fe878b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 11:30:27 +0900
Subject: [PATCH 0394/2325] docs: fix heading

---
 contributing/pull_request.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index dc71cb91a760..8ffedc10efbc 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -223,7 +223,7 @@ If you are using the command-line, you can do the following to update your fork
 
 Your fork is now up to date. This should be done regularly and, at the least, before you submit a pull request.
 
-## Translations Installation
+## Translating System Messages
 
 If you wish to contribute to the system message translations,
 then fork and clone the [translations repository](https://github.com/codeigniter4/translations)

From 313d55f98eee050ae9972b79021242d1ccc274f5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 11:34:13 +0900
Subject: [PATCH 0395/2325] docs: change MD heading style

---
 contributing/internals.md | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/contributing/internals.md b/contributing/internals.md
index 4de3d739425d..76ae7a6cafd5 100644
--- a/contributing/internals.md
+++ b/contributing/internals.md
@@ -1,13 +1,11 @@
-CodeIgniter Internals Overview
-==============================
+# CodeIgniter Internals Overview
 
 This guide should help contributors understand how the core of the
 framework works, and what needs to be done when creating new
 functionality. Specifically, it details the information needed to create
 new packages for the core.
 
-Dependencies
-------------
+## Dependencies
 
 All packages should be designed to be completely isolated from the rest
 of the packages, if possible. This will allow them to be used in
@@ -27,8 +25,7 @@ override that:
     }
 ```
 
-Type hinting
-------------
+## Type hinting
 
 PHP7 provides the ability to [type
 hint](http://php.net/manual/en/functions.arguments.php#functions.arguments.type-declaration)
@@ -37,8 +34,7 @@ hinting is not always practical, but do try to make it work.
 
 At this time, we are not using strict type hinting.
 
-Abstractions
-------------
+## Abstractions
 
 The amount of abstraction required to implement a solution should be the
 minimal amount required. Every layer of abstraction brings additional
@@ -49,8 +45,7 @@ afraid to use it when it's needed and can help things.
 -   Start simple, refactor as necessary to achieve clean separation of
     code, but don't overdo it.
 
-Testing
--------
+## Testing
 
 Any new packages submitted to the framework must be accompanied by unit
 tests. The target is 80%+ code coverage of all classes within the
@@ -71,8 +66,7 @@ Some testing needs to be done in a separate process, in order to setup
 the PHP globals to mimic test situations properly. See
 `tests/system/HTTP/ResponseSendTest` for an example of this.
 
-Namespaces and Files
---------------------
+## Namespaces and Files
 
 All new packages should live under the `CodeIgniter` namespace. The
 package itself will need its own sub-namespace that collects all related
@@ -111,23 +105,20 @@ child classes can extend, to be beneficial in keeping the code DRY.
 
 See the Log and Session packages for examples.
 
-Configuration
--------------
+## Configuration
 
 Should the package require user-configurable settings, you should create
 a new file just for that package under **app/Config**. The file name
 should generally match the package name.
 
-Autoloader
-----------
+## Autoloader
 
 All files within the package should be added to
 **system/Config/AutoloadConfig.php**, in the "classmap" property. This
 is only used for core framework files, and helps to minimize file system
 scans and keep performance high.
 
-Command-Line Support
---------------------
+## Command-Line Support
 
 CodeIgniter has never been known for it's strong CLI support. However,
 if your package could benefit from it, create a new file under
@@ -141,16 +132,14 @@ restricted to the CLI only.
 
 See the **MigrationsCommand** file for an example.
 
-Documentation
--------------
+## Documentation
 
 All packages must contain appropriate documentation that matches the
 tone and style of the rest of the user guide. In most cases, the top
 portion of the package's page should be treated in tutorial fashion,
 while the second half would be a class reference.
 
-Modification of the `env` file
-------------------------------
+## Modification of the `env` file
 
 CodeIgniter is shipped with a template `env` file to support adding
 secrets too sensitive to be stored in a version control system.

From c9490cc6ad21a485e73ecc39937262ea99d19d40 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 11:34:43 +0900
Subject: [PATCH 0396/2325] docs: fix heading level

---
 contributing/internals.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contributing/internals.md b/contributing/internals.md
index 76ae7a6cafd5..68640708de96 100644
--- a/contributing/internals.md
+++ b/contributing/internals.md
@@ -83,7 +83,7 @@ Take the Router class as an example. The Router lives in the
 **system/Router/RouteCollection.php** and **system/Router/Router.php**
 respectively.
 
-### Interfaces
+## Interfaces
 
 Most base classes should have an interface defined for them. At the very
 least this allows them to be easily mocked and passed to other classes
@@ -96,7 +96,7 @@ The Router package mentioned above includes the
 `CodeIgniter\Router\RouterInterface` interfaces to provide the
 abstractions for the two classes in the package.
 
-### Handlers
+## Handlers
 
 When a package supports multiple "drivers", the convention is to place
 them in a **Handlers** directory, and name the child classes as

From 4def26f46198ac81112a159bcdbd09a6c0dd41bc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 11:41:45 +0900
Subject: [PATCH 0397/2325] docs: fix MD style

---
 contributing/internals.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributing/internals.md b/contributing/internals.md
index 68640708de96..b183a7ad4da1 100644
--- a/contributing/internals.md
+++ b/contributing/internals.md
@@ -13,7 +13,7 @@ projects outside of CodeIgniter. Basically, this means that any
 dependencies should be kept to a minimum. Any dependencies must be able
 to be passed into the constructor. If you do need to use one of the
 other core packages, you can create that in the constructor using the
-Services class, as long as you provide a way for dependencies to
+`Services` class, as long as you provide a way for dependencies to
 override that:
 
 ```php

From 80d04ac7439476006556e604260156d4425e0487 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 11:44:13 +0900
Subject: [PATCH 0398/2325] docs: fix the part that failed to convert from RST

---
 contributing/workflow.md | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/contributing/workflow.md b/contributing/workflow.md
index 1a75bcca6900..ff0584c4ddd0 100644
--- a/contributing/workflow.md
+++ b/contributing/workflow.md
@@ -192,13 +192,10 @@ Make sure that the PR title is helpful for the maintainers and other
 developers. Add any comments appropriate, for instance asking for
 review.
 
-<div class="admonition note">
 
-If you do not provide a title or description for your PR, the odds of it being summarily rejected
-
-:   rise astronomically.
-
-</div>
+**Note:**
+> If you do not provide a title or description for your PR, the odds of it being summarily rejected
+rise astronomically.
 
 When your PR is submitted, a continuous integration task will be
 triggered, running all the unit tests as well as any other checking we

From c5e845bc94cbf0214102944d5f4c8708a22c52db Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 11:48:18 +0900
Subject: [PATCH 0399/2325] docs: update link title

---
 contributing/pull_request.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index 8ffedc10efbc..0e33f82e5140 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -3,7 +3,7 @@
 - [Developer's Certificate of Origin](./DCO.md)
 - [Contribution workflow](./workflow.md)
 - [Contribution CSS](./css.md)
-- [Framework internals](./internals.md)
+- [CodeIgniter Internals Overview](./internals.md)
 
 ## Contributions
 

From a7c23ac425bb020d711930b2adfb21ee0ed549d3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 11:57:30 +0900
Subject: [PATCH 0400/2325] docs: fix MD style

---
 contributing/workflow.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributing/workflow.md b/contributing/workflow.md
index ff0584c4ddd0..9d53713c5051 100644
--- a/contributing/workflow.md
+++ b/contributing/workflow.md
@@ -159,7 +159,7 @@ At some point, you will decide that your feature branch is complete, or
 that it could benefit from a review by fellow developers.
 
 **Note:**
-Remember to synch your local repo with the shared one before pushing!
+> Remember to synch your local repo with the shared one before pushing!
 It is a lot easier to resolve conflicts at this stage.
 
 

From 3b6956f2bbca055c6005ca836f86f7a865b6fad4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 12:31:48 +0900
Subject: [PATCH 0401/2325] docs: replace github with GitHub

---
 contributing/signing.md  | 4 ++--
 contributing/workflow.md | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/contributing/signing.md b/contributing/signing.md
index 5bd28fd2d4bc..fa1bab0272bb 100644
--- a/contributing/signing.md
+++ b/contributing/signing.md
@@ -17,7 +17,7 @@ a virus) and make it look like another developer created it.
 
 The best solution, while not fool-proof, is to "securely sign" your
 commits. Such commits are digitally signed, with a GPG-key associated
-with your github account. It still isn't foolproof, because a malicious
+with your GitHub account. It still isn't foolproof, because a malicious
 developer could create a bogus email and account, but it is more
 reliable than an unsigned or a "signed-off by" commit.
 
@@ -32,7 +32,7 @@ Secure Signing
 --------------
 
 To verify your commits, you will need to setup a GPG key, and attach it
-to your github account.
+to your GitHub account.
 
 See the [git
 tools](https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work) page
diff --git a/contributing/workflow.md b/contributing/workflow.md
index 9d53713c5051..dedce187fd48 100644
--- a/contributing/workflow.md
+++ b/contributing/workflow.md
@@ -42,7 +42,7 @@ Forking
 -------
 
 You work with a fork of the CodeIgniter4 repository. This is a copy of
-our repository, in your github account. You can make changes to your
+our repository, in your GitHub account. You can make changes to your
 forked repository, while you cannot do the same with the shared one -
 you have to submit pull requests to it instead.
 
@@ -174,7 +174,7 @@ Bring your feature branch up to date:
     git checkout new/mind-reader
     git merge develop
 
-And finally push your local branch to your github repository:
+And finally push your local branch to your GitHub repository:
 
     git push origin new/mind-reader
 
@@ -214,4 +214,4 @@ Cleanup
 -------
 
 If your PR is accepted and merged into the shared repository, you can
-delete that branch in your github repository as well as locally.
+delete that branch in your GitHub repository as well as locally.

From c8056ccb79e1b454796083d4e8e91b990e0c55f3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 12:47:06 +0900
Subject: [PATCH 0402/2325] docs: update heading

---
 contributing/workflow.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contributing/workflow.md b/contributing/workflow.md
index dedce187fd48..af55e5c2059a 100644
--- a/contributing/workflow.md
+++ b/contributing/workflow.md
@@ -68,8 +68,8 @@ Clone your repository, leaving a local folder for you to work with:
     cd ALL_PROJECTS
     git clone ORIGIN_URL
 
-Synching
---------
+Synching develop
+----------------
 
 Within your local repository, Git will have created an alias,
 **origin**, for the GitHub repository it is bound to. You want to create

From 06a562a072fa39ba1e55b3392ee07e8f7b16a64f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 12:47:41 +0900
Subject: [PATCH 0403/2325] docs: fix typo

---
 contributing/workflow.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributing/workflow.md b/contributing/workflow.md
index af55e5c2059a..beb70bd04293 100644
--- a/contributing/workflow.md
+++ b/contributing/workflow.md
@@ -159,7 +159,7 @@ At some point, you will decide that your feature branch is complete, or
 that it could benefit from a review by fellow developers.
 
 **Note:**
-> Remember to synch your local repo with the shared one before pushing!
+> Remember to sync your local repo with the shared one before pushing!
 It is a lot easier to resolve conflicts at this stage.
 
 

From ae4b3ea0c0490434694b7ca51209030f818159cc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 12:47:57 +0900
Subject: [PATCH 0404/2325] docs: update not to use `git pull`

---
 contributing/workflow.md | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/contributing/workflow.md b/contributing/workflow.md
index beb70bd04293..0b4b117e72c7 100644
--- a/contributing/workflow.md
+++ b/contributing/workflow.md
@@ -84,10 +84,11 @@ is normally done locally, so that you can resolve any merge conflicts.
 For instance, to synchronize **develop** branches:
 
     git checkout develop
-    git pull upstream develop
+    git fetch upstream
+    git merge upstream/develop
     git push origin develop
 
-You might get merge conflicts when you pull from upstream. It is your
+You might get merge conflicts when you merge. It is your
 responsibility to resolve those locally, so that you can continue
 collaborating with the shared repository. Basically, the shared
 repository is updated in the order that contributions are merged into
@@ -166,17 +167,18 @@ It is a lot easier to resolve conflicts at this stage.
 Synchronize your repository:
 
     git checkout develop
-    git pull upstream develop
+    git fetch upstream
+    git merge upstream/develop
     git push origin develop
 
 Bring your feature branch up to date:
 
     git checkout new/mind-reader
-    git merge develop
+    git rebase upstream/develop
 
 And finally push your local branch to your GitHub repository:
 
-    git push origin new/mind-reader
+    git push --force origin new/mind-reader
 
 Pull Requests
 -------------

From 93ad2589cf9b857f13754b07fffc3044047b5e7d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 13:09:09 +0900
Subject: [PATCH 0405/2325] docs: fix typo

---
 contributing/pull_request.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index 0e33f82e5140..95fbb9fb9dd5 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -194,7 +194,7 @@ The best way to contribute is to fork the CodeIgniter4 repository, and "clone" t
 1. Set up Git ([Windows](https://git-scm.com/download/win), [Mac](https://git-scm.com/download/mac), & [Linux](https://git-scm.com/download/linux)).
 2. Go to the [CodeIgniter4 repository](https://github.com/codeigniter4/CodeIgniter4).
 3. [Fork](https://help.github.com/en/articles/fork-a-repo) it (to your GitHub account).
-4. [Clone](https://help.github.com/en/articles/cloning-a-repository) your CodeIgniter repository: `git@github.com:\<your-name>/CodeIgniter4.git`
+4. [Clone](https://help.github.com/en/articles/cloning-a-repository) your CodeIgniter repository: `git@github.com:<your-name>/CodeIgniter4.git`
 5. Create a new [branch](https://help.github.com/en/articles/about-branches) in your project for each set of changes you want to make.
 6. Fix existing bugs on the [Issue tracker](https://github.com/codeigniter4/CodeIgniter4/issues) after confirming that no one else is working on them.
 7. [Commit](https://help.github.com/en/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project) the changed files in your contribution branch.
@@ -209,7 +209,7 @@ The best way to contribute is to fork the CodeIgniter4 repository, and "clone" t
 
 The codebase maintainers will now be alerted to the submission and someone from the team will respond. If your change fails to meet the guidelines, it will be rejected or feedback will be provided to help you improve it.
 
-Once the maintainer handling your pull request is satisfied with it they will approve the pull request and merge it into the "develop" branch. Your patch will now be part of the next release!
+Once the maintainer handling your pull request is satisfied with it, they will approve the pull request and merge it into the "develop" branch. Your patch will now be part of the next release!
 
 ### Keeping your fork up-to-date
 
@@ -221,7 +221,7 @@ If you are using the command-line, you can do the following to update your fork
 2. `git pull codeigniter develop`
 3. `git push origin develop`
 
-Your fork is now up to date. This should be done regularly and, at the least, before you submit a pull request.
+Your fork is now up-to-date. This should be done regularly and, at the least, before you submit a pull request.
 
 ## Translating System Messages
 

From 31e4cc2034116647f2e1e85c991fa9663ee02f62 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 13:12:02 +0900
Subject: [PATCH 0406/2325] docs: update not to use `git pull` and use
 `upstream` as remote name instead of `codeigniter`

---
 contributing/pull_request.md | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index 95fbb9fb9dd5..e2befe6733a6 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -213,13 +213,15 @@ Once the maintainer handling your pull request is satisfied with it, they will a
 
 ### Keeping your fork up-to-date
 
-Unlike systems like Subversion, Git can have multiple remotes. A remote is the name for the URL of a Git repository. By default, your fork will have a remote named "origin", which points to your fork, but you can add another remote named "codeigniter", which points to `git://github.com/codeigniter4/CodeIgniter4.git`. This is a read-only remote, but you can pull from this develop branch to update your own.
+Unlike systems like Subversion, Git can have multiple remotes. A remote is the name for the URL of a Git repository. By default, your fork will have a remote named "origin", which points to your fork, but you can add another remote named "upstream", which points to `git://github.com/codeigniter4/CodeIgniter4.git`. This is a read-only remote, but you can pull from this develop branch to update your own.
 
 If you are using the command-line, you can do the following to update your fork to the latest changes:
 
-1. `git remote add codeigniter git://github.com/codeigniter4/CodeIgniter4.git`
-2. `git pull codeigniter develop`
-3. `git push origin develop`
+1. `git remote add upstream git://github.com/codeigniter4/CodeIgniter4.git`
+2. `git fetch upstream`
+3. `git checkout develop`
+4. `git mrege upstream/develop`
+5. `git push origin develop`
 
 Your fork is now up-to-date. This should be done regularly and, at the least, before you submit a pull request.
 

From 797aa725d9ceb05ac80fe5163ab0a10700701f44 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 13:14:35 +0900
Subject: [PATCH 0407/2325] docs: fix typo

---
 contributing/workflow.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributing/workflow.md b/contributing/workflow.md
index 0b4b117e72c7..5056214f931a 100644
--- a/contributing/workflow.md
+++ b/contributing/workflow.md
@@ -68,7 +68,7 @@ Clone your repository, leaving a local folder for you to work with:
     cd ALL_PROJECTS
     git clone ORIGIN_URL
 
-Synching develop
+Syncing develop
 ----------------
 
 Within your local repository, Git will have created an alias,

From 07cc1ea12c01fb13c5d39e8a5b6fb31eef823d50 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 13:20:08 +0900
Subject: [PATCH 0408/2325] docs: change MD heading style

---
 contributing/DCO.md      |  3 +--
 contributing/README.md   |  3 +--
 contributing/css.md      |  9 +++------
 contributing/signing.md  |  9 +++------
 contributing/workflow.md | 30 ++++++++++--------------------
 5 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/contributing/DCO.md b/contributing/DCO.md
index d8a298c5c7dc..c3c806b0af1d 100644
--- a/contributing/DCO.md
+++ b/contributing/DCO.md
@@ -1,5 +1,4 @@
-Developer's Certificate of Origin 1.1
-=====================================
+# Developer's Certificate of Origin 1.1
 
 By making a contribution to this project, I certify that:
 
diff --git a/contributing/README.md b/contributing/README.md
index 9584811e9353..2df6e0870ebc 100644
--- a/contributing/README.md
+++ b/contributing/README.md
@@ -1,5 +1,4 @@
-Contributing to CodeIgniter
-===========================
+# Contributing to CodeIgniter
 
 CodeIgniter is a community driven project and accepts contributions of
 code and documentation from the community. These contributions are made
diff --git a/contributing/css.md b/contributing/css.md
index d824dccaee03..3108319a0e1b 100644
--- a/contributing/css.md
+++ b/contributing/css.md
@@ -1,12 +1,10 @@
-Contribution CSS
-================
+# Contribution CSS
 
 CodeIgniter uses SASS to generate the debug toolbar's CSS. Therefore,
 you will need to install it first. You can find further instructions on
 the official website: <https://sass-lang.com/install>
 
-Compile SASS files
-------------------
+## Compile SASS files
 
 Open your terminal, and navigate to CodeIgniter's root folder. To
 generate the CSS file, use the following command:
@@ -20,8 +18,7 @@ this prevents a "cache" folder from being created
 - `admin/css/debug-toolbar/toolbar.scss` is the SASS source 
 - `system/Debug/Toolbar/Views/toolbar.css` is he CSS destination
 
-Color scheme
-------------
+## Color scheme
 
 **Themes**
 
diff --git a/contributing/signing.md b/contributing/signing.md
index fa1bab0272bb..0755f6806ed2 100644
--- a/contributing/signing.md
+++ b/contributing/signing.md
@@ -1,5 +1,4 @@
-Contribution Signing
-====================
+# Contribution Signing
 
 We ask that contributions have code commits signed. **This is important
 in order to prove, as best we can, the provenance of contributions.**
@@ -28,8 +27,7 @@ performs an important role, we will insist that it be securely signed.
 
 Read below to find out how to sign your commits :)
 
-Secure Signing
---------------
+## Secure Signing
 
 To verify your commits, you will need to setup a GPG key, and attach it
 to your GitHub account.
@@ -57,8 +55,7 @@ The basic steps are
 Depending on your IDE, you may have to do your Git commits from your Git
 bash shell to use the **-S** option to force the secure signing.
 
-Commit Messages
----------------
+## Commit Messages
 
 Regardless of how you sign a commit, commit messages are important too.
 They communicate the intent of a specific change, concisely. They make
diff --git a/contributing/workflow.md b/contributing/workflow.md
index 5056214f931a..ea7528cecbce 100644
--- a/contributing/workflow.md
+++ b/contributing/workflow.md
@@ -1,5 +1,4 @@
-Contribution Workflow
-=====================
+# Contribution Workflow
 
 Much of the workflow for contributing to CodeIgniter (or any project)
 involves understanding how [Git](https://git-scm.com/) is used to manage
@@ -15,8 +14,7 @@ values for when you try these:
     ORIGIN_URL      // the cloning URL for your repository fork
     UPSTREAM_URL    // the cloning URL for the CodeIgniter4 repository
 
-Branching
----------
+## Branching
 
 CodeIgniter uses the
 [Git-Flow](http://nvie.com/posts/a-successful-git-branching-model/)
@@ -38,8 +36,7 @@ but disagree with Y, meaning we cannot merge the request. Using the
 Git-Flow branching model you can create new branches for both of these
 features and send two requests.
 
-Forking
--------
+## Forking
 
 You work with a fork of the CodeIgniter4 repository. This is a copy of
 our repository, in your GitHub account. You can make changes to your
@@ -52,8 +49,7 @@ repository](https://github.com/codeigniter4/CodeIgniter4), click the
 **Fork** button in the top-right of the page, and choose which account
 or organization of yours should contain that fork.
 
-Cloning
--------
+## Cloning
 
 You *could* work on your repository using GitHub's web interface, but
 that is awkward. Most developers will clone their repository to their
@@ -68,8 +64,7 @@ Clone your repository, leaving a local folder for you to work with:
     cd ALL_PROJECTS
     git clone ORIGIN_URL
 
-Syncing develop
-----------------
+## Syncing develop
 
 Within your local repository, Git will have created an alias,
 **origin**, for the GitHub repository it is bound to. You want to create
@@ -99,8 +94,7 @@ precedence, even if it causes problems for other contributions.
 It is a good idea to synchronize repositories when the shared one
 changes.
 
-Branching Revisited
--------------------
+## Branching Revisited
 
 The top of this page talked about the **master** and **develop**
 branches. The *best practice* for your work is to create a *feature
@@ -120,8 +114,7 @@ creating:
 
 Saving changes only updates your local working area.
 
-Committing
-----------
+## Committing
 
 Your local changes need to be *committed* to save them in your local
 repository. This is where [contribution signing](./signing.md) comes
@@ -153,8 +146,7 @@ a starting point for your next session working with your repository.
 This is a good practice, as it is not always obvious which branch you
 are working in.
 
-Pushing Your Branch
--------------------
+## Pushing Your Branch
 
 At some point, you will decide that your feature branch is complete, or
 that it could benefit from a review by fellow developers.
@@ -180,8 +172,7 @@ And finally push your local branch to your GitHub repository:
 
     git push --force origin new/mind-reader
 
-Pull Requests
--------------
+## Pull Requests
 
 On GitHub, you propose your changes one feature branch at a time, by
 switching to the branch you wish to contribute, and then clicking on
@@ -212,8 +203,7 @@ If your PR does not follow our contribution guidelines, or is
 incomplete, the codebase maintainers will comment on it, pointing out
 what needs fixing.
 
-Cleanup
--------
+## Cleanup
 
 If your PR is accepted and merged into the shared repository, you can
 delete that branch in your GitHub repository as well as locally.

From 200d6497c6f53f8b3289537bd26046507fc8f5d7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 13:22:24 +0900
Subject: [PATCH 0409/2325] docs: add blank line

---
 contributing/styleguide.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contributing/styleguide.md b/contributing/styleguide.md
index d746e672d33e..1b8b499048a2 100644
--- a/contributing/styleguide.md
+++ b/contributing/styleguide.md
@@ -16,6 +16,7 @@ The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "S
 _Portions of the following rules are from and attributed to [PSR-12][psr12]. Even if we do not copy all the rules to this coding style guide explicitly, such uncopied rules SHALL still apply._
 
 [psr12]: https://www.php-fig.org/psr/psr-12/
+
 ## Implementation
 
 Our team uses [PHP CS Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) to apply coding standard fixes automatically. If you would like to leverage these tools yourself visit the [Official CodeIgniter Coding Standard](https://github.com/CodeIgniter/coding-standard) repository for details.

From 181945290559a32046ae9f48fda0dd21d04f0ca5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 13:41:29 +0900
Subject: [PATCH 0410/2325] docs: add explanations to use the link only files

---
 contributing/pull_request.md | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index e2befe6733a6..2e343063c306 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -1,10 +1,5 @@
 # Sending a Pull Request
 
-- [Developer's Certificate of Origin](./DCO.md)
-- [Contribution workflow](./workflow.md)
-- [Contribution CSS](./css.md)
-- [CodeIgniter Internals Overview](./internals.md)
-
 ## Contributions
 
 We expect all contributions to conform to our
@@ -21,6 +16,12 @@ running on your local machines, ask for help on the forums. We would be happy to
 
 The [Open Source Guide](https://opensource.guide/) is a good first read for those new to contributing to open source!
 
+## CodeIgniter Internals Overview
+
+[CodeIgniter Internals Overview](./internals.md) should help contributors 
+understand how the core of the framework works. Specifically, it details the 
+information needed to create new packages for the core.
+
 ## Guidelines
 
 Before we look into how to contribute to CodeIgniter4, here are some guidelines.
@@ -103,6 +104,10 @@ manager Make sure that your PR descriptions help us decide if the
 contribution should be highlighted in the next release after it has been
 merged.
 
+### CSS
+
+See [Contribution CSS](./css.md).
+
 ### Compatibility
 
 CodeIgniter4 requires [PHP 7.3](https://php.net/releases/7_3_0.php).
@@ -161,10 +166,11 @@ changes separate from each other and from whatever else you are doing with your
 ### Signing
 
 You must [GPG-sign](./signing.md) your work, certifying that you either wrote the work or
-otherwise have the right to pass it on to an open-source project. This is *not* just a "signed-off-by"
-commit, but instead, a digitally signed one.
+otherwise have the right to pass it on to an open-source project. See [Developer's Certificate of Origin](./DCO.md).
+
+This is *not* just a "signed-off-by" commit, but instead, a digitally signed one.
 
-- [Contribution signing](./signing.md)
+See [Contribution signing](./signing.md) for details.
 
 ### Static Analysis on PHP code
 
@@ -211,6 +217,8 @@ The codebase maintainers will now be alerted to the submission and someone from
 
 Once the maintainer handling your pull request is satisfied with it, they will approve the pull request and merge it into the "develop" branch. Your patch will now be part of the next release!
 
+See [Contribution workflow](./workflow.md) for Git workflow details.
+
 ### Keeping your fork up-to-date
 
 Unlike systems like Subversion, Git can have multiple remotes. A remote is the name for the URL of a Git repository. By default, your fork will have a remote named "origin", which points to your fork, but you can add another remote named "upstream", which points to `git://github.com/codeigniter4/CodeIgniter4.git`. This is a read-only remote, but you can pull from this develop branch to update your own.

From 6215bae88a21f056ad5f4dc6ed69b09c45b4a4c6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 14:06:15 +0900
Subject: [PATCH 0411/2325] docs: remove "Keeping your fork up-to-date" section

It is not perfect. Updating develop branch only does not make sense.
workflow.md explains details.
---
 contributing/pull_request.md | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index 2e343063c306..a34004af4135 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -213,25 +213,11 @@ The best way to contribute is to fork the CodeIgniter4 repository, and "clone" t
 13. [Push](https://docs.github.com/en/github/using-git/pushing-commits-to-a-remote-repository) your contribution branch to your fork.
 14. Send a [pull request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork).
 
-The codebase maintainers will now be alerted to the submission and someone from the team will respond. If your change fails to meet the guidelines, it will be rejected or feedback will be provided to help you improve it.
-
-Once the maintainer handling your pull request is satisfied with it, they will approve the pull request and merge it into the "develop" branch. Your patch will now be part of the next release!
-
 See [Contribution workflow](./workflow.md) for Git workflow details.
 
-### Keeping your fork up-to-date
-
-Unlike systems like Subversion, Git can have multiple remotes. A remote is the name for the URL of a Git repository. By default, your fork will have a remote named "origin", which points to your fork, but you can add another remote named "upstream", which points to `git://github.com/codeigniter4/CodeIgniter4.git`. This is a read-only remote, but you can pull from this develop branch to update your own.
-
-If you are using the command-line, you can do the following to update your fork to the latest changes:
-
-1. `git remote add upstream git://github.com/codeigniter4/CodeIgniter4.git`
-2. `git fetch upstream`
-3. `git checkout develop`
-4. `git mrege upstream/develop`
-5. `git push origin develop`
+The codebase maintainers will now be alerted to the submission and someone from the team will respond. If your change fails to meet the guidelines, it will be rejected or feedback will be provided to help you improve it.
 
-Your fork is now up-to-date. This should be done regularly and, at the least, before you submit a pull request.
+Once the maintainer handling your pull request is satisfied with it, they will approve the pull request and merge it into the "develop" branch. Your patch will now be part of the next release!
 
 ## Translating System Messages
 

From e341970d37411de4d4939672f5280c1428d28954 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 14:49:22 +0900
Subject: [PATCH 0412/2325] docs: update/add PHP manual links, its description

Type hinting is out-of-dated word.
---
 contributing/internals.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/contributing/internals.md b/contributing/internals.md
index b183a7ad4da1..7fb2a7a6533e 100644
--- a/contributing/internals.md
+++ b/contributing/internals.md
@@ -27,12 +27,11 @@ override that:
 
 ## Type hinting
 
-PHP7 provides the ability to [type
-hint](http://php.net/manual/en/functions.arguments.php#functions.arguments.type-declaration)
-method parameters and return types. Use it where possible. Return type
-hinting is not always practical, but do try to make it work.
+PHP7 provides [Type declarations](https://www.php.net/manual/en/language.types.declarations.php)
+for method parameters and return types. Use it where possible. Return type
+declaration is not always practical, but do try to make it work.
 
-At this time, we are not using strict type hinting.
+At this time, we are not using [Strict typing](https://www.php.net/manual/en/language.types.declarations.php#language.types.declarations.strict).
 
 ## Abstractions
 

From be9f4c5557b96a6f0b8244f2de5a6e40ee2e81ab Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 5 Oct 2021 20:00:17 +0800
Subject: [PATCH 0413/2325] Add support for new fixers added in v3.2.0

---
 .no-header.php-cs-fixer.dist.php           | 12 ++++++++++--
 .php-cs-fixer.dist.php                     | 12 ++++++++++--
 system/Commands/Encryption/GenerateKey.php |  2 +-
 system/Validation/CreditCardRules.php      |  2 +-
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/.no-header.php-cs-fixer.dist.php b/.no-header.php-cs-fixer.dist.php
index ebbe6789fdbd..6e0a5c09602d 100644
--- a/.no-header.php-cs-fixer.dist.php
+++ b/.no-header.php-cs-fixer.dist.php
@@ -28,8 +28,16 @@
     ->notName('#Logger\.php$#');
 
 $overrides = [
-    // @TODO Remove once live in coding-standard
-    'no_alternative_syntax' => ['fix_non_monolithic_code' => false],
+    // @TODO Remove once these are live in coding-standard
+    'assign_null_coalescing_to_coalesce_equal' => false, // requires 7.4+
+    'control_structure_continuation_position'  => ['position' => 'same_line'],
+    'empty_loop_condition'                     => ['style' => 'while'],
+    'integer_literal_case'                     => true,
+    'modernize_strpos'                         => false, // requires 8.0+
+    'no_alternative_syntax'                    => ['fix_non_monolithic_code' => false],
+    'no_space_around_double_colon'             => true,
+    'octal_notation'                           => false, // requires 8.1+
+    'string_length_to_empty'                   => true,
 ];
 
 $options = [
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index a7b41e4a642b..2196640dae93 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -35,8 +35,16 @@
     ]);
 
 $overrides = [
-    // @TODO Remove once live in coding-standard
-    'no_alternative_syntax' => ['fix_non_monolithic_code' => false],
+    // @TODO Remove once these are live in coding-standard
+    'assign_null_coalescing_to_coalesce_equal' => false, // requires 7.4+
+    'control_structure_continuation_position'  => ['position' => 'same_line'],
+    'empty_loop_condition'                     => ['style' => 'while'],
+    'integer_literal_case'                     => true,
+    'modernize_strpos'                         => false, // requires 8.0+
+    'no_alternative_syntax'                    => ['fix_non_monolithic_code' => false],
+    'no_space_around_double_colon'             => true,
+    'octal_notation'                           => false, // requires 8.1+
+    'string_length_to_empty'                   => true,
 ];
 
 $options = [
diff --git a/system/Commands/Encryption/GenerateKey.php b/system/Commands/Encryption/GenerateKey.php
index c43713efe893..810f2dc92d39 100644
--- a/system/Commands/Encryption/GenerateKey.php
+++ b/system/Commands/Encryption/GenerateKey.php
@@ -125,7 +125,7 @@ protected function setNewEncryptionKey(string $key, array $params): bool
     {
         $currentKey = env('encryption.key', '');
 
-        if (strlen($currentKey) !== 0 && ! $this->confirmOverwrite($params)) {
+        if ($currentKey !== '' && ! $this->confirmOverwrite($params)) {
             // Not yet testable since it requires keyboard input
             // @codeCoverageIgnoreStart
             return false;
diff --git a/system/Validation/CreditCardRules.php b/system/Validation/CreditCardRules.php
index 8632dfc8f47e..9e18f4ef5cb9 100644
--- a/system/Validation/CreditCardRules.php
+++ b/system/Validation/CreditCardRules.php
@@ -189,7 +189,7 @@ public function valid_cc_number(?string $ccNumber, string $type): bool
         }
 
         // Make sure we have a valid length
-        if (strlen($ccNumber) === 0) {
+        if ((string) $ccNumber === '') {
             return false;
         }
 

From 9a2b3c2bc36954d145e85b5fea5bf657709aafea Mon Sep 17 00:00:00 2001
From: Daniel Tiringer <tiringerdaniel@tutanota.com>
Date: Thu, 7 Oct 2021 09:17:44 +0200
Subject: [PATCH 0414/2325] Change queries array structure and usage

---
 system/Debug/Toolbar/Collectors/Database.php | 36 +++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 3686dd1dea76..df0d86c447e7 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -57,7 +57,7 @@ class Database extends BaseCollector
      * The query instances that have been collected
      * through the DBQuery Event.
      *
-     * @var Query[]
+     * @var array
      */
     protected static $queries = [];
 
@@ -83,7 +83,19 @@ public static function collect(Query $query)
         $max = $config->maxQueries ?: 100;
 
         if (count(static::$queries) < $max) {
-            static::$queries[] = $query;
+            if (! in_array($query->getQuery(), array_column(static::$queries, 'string', null), true)) {
+                static::$queries[] = [
+                    'query'     => $query,
+                    'string'    => $query->getQuery(),
+                    'duplicate' => false,
+                ];
+            } else {
+                static::$queries[] = [
+                    'query'     => $query,
+                    'string'    => $query->getQuery(),
+                    'duplicate' => true,
+                ];
+            }
         }
     }
 
@@ -110,8 +122,8 @@ protected function formatTimelineData(): array
             $data[] = [
                 'name'      => 'Query',
                 'component' => 'Database',
-                'start'     => $query->getStartTime(true),
-                'duration'  => $query->getDuration(),
+                'start'     => $query['query']->getStartTime(true),
+                'duration'  => $query['query']->getDuration(),
             ];
         }
 
@@ -123,10 +135,11 @@ protected function formatTimelineData(): array
      */
     public function display(): array
     {
-        $data['queries'] = array_map(static function (Query $query) {
+        $data['queries'] = array_map(static function (array $query) {
             return [
-                'duration' => ((float) $query->getDuration(5) * 1000) . ' ms',
-                'sql'      => $query->debugToolbarDisplay(),
+                'class'    => isset($query['duplicate']) ? 'duplicate' : '',
+                'duration' => ((float) $query['query']->getDuration(5) * 1000) . ' ms',
+                'sql'      => $query['query']->debugToolbarDisplay(),
             ];
         }, static::$queries);
 
@@ -150,13 +163,18 @@ public function getTitleDetails(): string
     {
         $this->getConnections();
 
-        $queryCount      = count(static::$queries);
+        $queryCount  = count(static::$queries);
+        $uniqueCount = count(array_filter(static::$queries, static function ($query) {
+            return $query['duplicate'] === false;
+        }));
         $connectionCount = count($this->connections);
 
         return sprintf(
-            '(%d Quer%s across %d Connection%s)',
+            '(%d total Quer%s, %d %s unique across %d Connection%s)',
             $queryCount,
             $queryCount > 1 ? 'ies' : 'y',
+            $uniqueCount,
+            $uniqueCount > 1 ? 'of them' : '',
             $connectionCount,
             $connectionCount > 1 ? 's' : ''
         );

From c0344a9e91365e5ffb2fe0135c48f7a2e2c94922 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 17:16:22 +0900
Subject: [PATCH 0415/2325] docs: fix typo

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 contributing/pull_request.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index a34004af4135..515e0199a153 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -67,7 +67,7 @@ See the [PHPUnit website](https://phpunit.de/) for more information.
 
 ### PHPDoc Comments
 
-Source code should be commented using PHPDoc comments blocks. This means
+Source code should be commented using PHPDoc comment blocks. This means
 implementation comments to explain potentially confusing sections of
 code, and documentation comments before each public or protected
 class/interface/trait, method and variable.

From a8f24006aaf8c5fe343458e1730b9d320ad976a4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 17:17:14 +0900
Subject: [PATCH 0416/2325] docs: replace PHPunit with PHPunit

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 contributing/pull_request.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index 515e0199a153..e4764118d49e 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -51,7 +51,7 @@ You can check the coding style violations:
 
 ### Unit Testing
 
-Unit testing is expected for all CodeIgniter components. We use PHPunit,
+Unit testing is expected for all CodeIgniter components. We use PHPUnit,
 and run unit tests using travis-ci for each PR submitted or changed.
 
 In the CodeIgniter project, there is a `tests` folder, with a structure

From 4d999c18c5442459f436e8e422209a3e19e0754e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 17:18:13 +0900
Subject: [PATCH 0417/2325] docs: replace travis-ci with GitHub Actions

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 contributing/pull_request.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index e4764118d49e..a22ab2e23445 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -52,7 +52,7 @@ You can check the coding style violations:
 ### Unit Testing
 
 Unit testing is expected for all CodeIgniter components. We use PHPUnit,
-and run unit tests using travis-ci for each PR submitted or changed.
+and run unit tests using GitHub Actions for each PR submitted or changed.
 
 In the CodeIgniter project, there is a `tests` folder, with a structure
 that parallels that of `system`.

From 6de07bdadb3ed9d0bf1db20357e0d079f71e0607 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 17:44:27 +0900
Subject: [PATCH 0418/2325] docs: use `--force-with-lease` instead of `--force`

---
 contributing/workflow.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributing/workflow.md b/contributing/workflow.md
index ea7528cecbce..d15701f4b5f2 100644
--- a/contributing/workflow.md
+++ b/contributing/workflow.md
@@ -170,7 +170,7 @@ Bring your feature branch up to date:
 
 And finally push your local branch to your GitHub repository:
 
-    git push --force origin new/mind-reader
+    git push ---force-with-lease origin new/mind-reader
 
 ## Pull Requests
 

From 825962123f748ffb192e7322ab7ef8fbef974d7e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 18:05:20 +0900
Subject: [PATCH 0419/2325] docs: add not to add comments that are superficial,
 duplicated, or stating the obvious

---
 contributing/pull_request.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index a22ab2e23445..c8341a2e9e30 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -65,16 +65,24 @@ of a single CodeIgniter component.
 
 See the [PHPUnit website](https://phpunit.de/) for more information.
 
-### PHPDoc Comments
+### Comments
+
+#### PHPDoc Comments
 
 Source code should be commented using PHPDoc comment blocks. This means
 implementation comments to explain potentially confusing sections of
 code, and documentation comments before each public or protected
 class/interface/trait, method and variable.
 
+Do not add PHPDoc comments that are superficial, duplicated, or stating the obvious.
+
 See the [phpDocumentor website](https://phpdoc.org/) for more
 information.
 
+#### Code Comments
+
+Do not add comments that are superficial, duplicated, or stating the obvious.
+
 ### Documentation
 
 The User Guide is an essential component of the CodeIgniter framework.

From df74c1ecdc1c71dfa89d23aa61edc3e14d23dc0d Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Thu, 7 Oct 2021 11:33:58 +0200
Subject: [PATCH 0420/2325] Add unit test to ensure named binds don't get
 replaced in binded values

Using str_replace() instead of strtr() in Database\Query->matchNamedBinds() would make this test fail.

For this test to be effective, the overlapping marker (here :foobar:) has to be after the replaced string (here :content:) in the binds array.
---
 tests/system/Database/BaseQueryTest.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php
index c9f905bc136d..deec43c4f5bb 100644
--- a/tests/system/Database/BaseQueryTest.php
+++ b/tests/system/Database/BaseQueryTest.php
@@ -294,6 +294,20 @@ public function testSimilarNamedBinds()
         $this->assertSame($expected, $query->getQuery());
     }
 
+    public function testNamedBindsDontGetReplacedAgain()
+    {
+        $query = new Query($this->db);
+
+        $query->setQuery(
+            'SELECT * FROM posts WHERE content = :content: OR foobar = :foobar:',
+            ['content' => 'a placeholder looks like :foobar:', 'foobar' => 'bazqux']
+        );
+
+        $expected = "SELECT * FROM posts WHERE content = 'a placeholder looks like :foobar:' OR foobar = 'bazqux'";
+
+        $this->assertSame($expected, $query->getQuery());
+    }
+
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/1705
      */

From f85527a739ec73b26d3c2c56f8c4c77a3e40a049 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 19:21:41 +0900
Subject: [PATCH 0421/2325] docs: fix unneeded `-`

---
 contributing/workflow.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributing/workflow.md b/contributing/workflow.md
index d15701f4b5f2..7e9322016753 100644
--- a/contributing/workflow.md
+++ b/contributing/workflow.md
@@ -170,7 +170,7 @@ Bring your feature branch up to date:
 
 And finally push your local branch to your GitHub repository:
 
-    git push ---force-with-lease origin new/mind-reader
+    git push --force-with-lease origin new/mind-reader
 
 ## Pull Requests
 

From a14410e8a80973e93e5533419b09a6bfe12e4aba Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Oct 2021 19:22:46 +0900
Subject: [PATCH 0422/2325] docs: replace "Change Log" with Changelog

https://en.wikipedia.org/wiki/Changelog
---
 contributing/pull_request.md | 2 +-
 contributing/workflow.md     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index c8341a2e9e30..95e31e676809 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -100,7 +100,7 @@ and [PHPDoc](https://github.com/codeigniter4/CodeIgniter4/blob/develop/phpdoc.di
 
 See [Writing CodeIgniter Documentation](./documentation.rst).
 
-### Change Log
+### Changelog
 
 The changelog, in the user guide root, needs to be kept up-to-date. Not
 all changes will need an entry in it, but new classes, major or BC
diff --git a/contributing/workflow.md b/contributing/workflow.md
index 7e9322016753..670727a89653 100644
--- a/contributing/workflow.md
+++ b/contributing/workflow.md
@@ -99,7 +99,7 @@ changes.
 The top of this page talked about the **master** and **develop**
 branches. The *best practice* for your work is to create a *feature
 branch* locally, to hold a group of related changes (source, unit
-testing, documentation, change log, etc).
+testing, documentation, changelog, etc).
 
 This local branch should be named appropriately, for instance
 "fix/problem123" or "new/mind-reader". The slashes in these branch names

From e12b35e307973ccc880518d7ea428d168efcf3a1 Mon Sep 17 00:00:00 2001
From: Daniel Tiringer <53534182+danielTiringer@users.noreply.github.com>
Date: Thu, 7 Oct 2021 16:11:10 +0000
Subject: [PATCH 0423/2325] Simplify query addition to array

Co-authored-by: Lonnie Ezell <lonnieje@gmail.com>
---
 system/Debug/Toolbar/Collectors/Database.php | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index df0d86c447e7..92c939e64b11 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -83,19 +83,11 @@ public static function collect(Query $query)
         $max = $config->maxQueries ?: 100;
 
         if (count(static::$queries) < $max) {
-            if (! in_array($query->getQuery(), array_column(static::$queries, 'string', null), true)) {
-                static::$queries[] = [
-                    'query'     => $query,
-                    'string'    => $query->getQuery(),
-                    'duplicate' => false,
-                ];
-            } else {
-                static::$queries[] = [
-                    'query'     => $query,
-                    'string'    => $query->getQuery(),
-                    'duplicate' => true,
-                ];
-            }
+        static::$queries[] = [
+            'query'     => $query,
+            'string'    => $query->getQuery(),
+            'duplicate' => in_array($query->getQuery(), array_column(static::$queries, 'string', null), true),
+        ];
         }
     }
 

From 483bf94a2527acc7c9aa50730167a93276564566 Mon Sep 17 00:00:00 2001
From: Daniel Tiringer <tiringerdaniel@tutanota.com>
Date: Thu, 7 Oct 2021 18:15:39 +0200
Subject: [PATCH 0424/2325] Fix indentation

---
 system/Debug/Toolbar/Collectors/Database.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 92c939e64b11..978478ae2f59 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -83,11 +83,11 @@ public static function collect(Query $query)
         $max = $config->maxQueries ?: 100;
 
         if (count(static::$queries) < $max) {
-        static::$queries[] = [
-            'query'     => $query,
-            'string'    => $query->getQuery(),
-            'duplicate' => in_array($query->getQuery(), array_column(static::$queries, 'string', null), true),
-        ];
+            static::$queries[] = [
+                'query'     => $query,
+                'string'    => $query->getQuery(),
+                'duplicate' => in_array($query->getQuery(), array_column(static::$queries, 'string', null), true),
+            ];
         }
     }
 

From 60e559eceaf94803b0b499b0cbd32bc5bf540a80 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 8 Oct 2021 09:18:17 +0900
Subject: [PATCH 0425/2325] docs: add Generics annotation to `model()`

@phpstan-return is to suppress PHPStan error.
---
 system/Common.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/system/Common.php b/system/Common.php
index 9979b30534b2..0750fe38764e 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -23,6 +23,7 @@
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\HTTP\URI;
+use CodeIgniter\Model;
 use CodeIgniter\Session\Session;
 use CodeIgniter\Test\TestLogger;
 use Config\App;
@@ -776,7 +777,12 @@ function log_message(string $level, string $message, array $context = [])
     /**
      * More simple way of getting model instances from Factories
      *
-     * @return mixed
+     * @template T of Model
+     *
+     * @param class-string<T> $name
+     *
+     * @return T
+     * @phpstan-return Model
      */
     function model(string $name, bool $getShared = true, ?ConnectionInterface &$conn = null)
     {

From 6bbdf3d63ac6578ffd230af4d394337357cc62c3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 8 Oct 2021 13:02:55 +0900
Subject: [PATCH 0426/2325] docs: fix headings

Type hinting is an old word.
---
 contributing/internals.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributing/internals.md b/contributing/internals.md
index 7fb2a7a6533e..a819b0081994 100644
--- a/contributing/internals.md
+++ b/contributing/internals.md
@@ -25,7 +25,7 @@ override that:
     }
 ```
 
-## Type hinting
+## Type declarations
 
 PHP7 provides [Type declarations](https://www.php.net/manual/en/language.types.declarations.php)
 for method parameters and return types. Use it where possible. Return type

From 9f3afc6a144e77b3653a8d53d4a15e5bfa1307dc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 8 Oct 2021 13:03:55 +0900
Subject: [PATCH 0427/2325] docs: update the description of Type declarations

---
 contributing/internals.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contributing/internals.md b/contributing/internals.md
index a819b0081994..6ced5f56dc48 100644
--- a/contributing/internals.md
+++ b/contributing/internals.md
@@ -31,7 +31,10 @@ PHP7 provides [Type declarations](https://www.php.net/manual/en/language.types.d
 for method parameters and return types. Use it where possible. Return type
 declaration is not always practical, but do try to make it work.
 
-At this time, we are not using [Strict typing](https://www.php.net/manual/en/language.types.declarations.php#language.types.declarations.strict).
+At this time, shipped CI4 production code does not use 
+[Strict typing](https://www.php.net/manual/en/language.types.declarations.php#language.types.declarations.strict), 
+and will not be any time soon. However, in the development phase, 
+there are internal classes (in `utils/`) that are strictly typed.
 
 ## Abstractions
 

From 6b2e6d8d7a27407493bca0ac0cb7d204f28a690f Mon Sep 17 00:00:00 2001
From: Daniel Tiringer <tiringerdaniel@tutanota.com>
Date: Fri, 8 Oct 2021 08:22:31 +0200
Subject: [PATCH 0428/2325] Make variable for query string

---
 system/Debug/Toolbar/Collectors/Database.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 978478ae2f59..d63cb8aaf8bb 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -83,10 +83,12 @@ public static function collect(Query $query)
         $max = $config->maxQueries ?: 100;
 
         if (count(static::$queries) < $max) {
+            $queryString = $query->getQuery();
+
             static::$queries[] = [
                 'query'     => $query,
-                'string'    => $query->getQuery(),
-                'duplicate' => in_array($query->getQuery(), array_column(static::$queries, 'string', null), true),
+                'string'    => $queryString,
+                'duplicate' => in_array($queryString, array_column(static::$queries, 'string', null), true),
             ];
         }
     }

From 555ab2d5b83c4421d293e4d5b28d6b935faeb470 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 8 Oct 2021 16:50:25 +0900
Subject: [PATCH 0429/2325] docs: fix @return type

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

diff --git a/system/Filters/CSRF.php b/system/Filters/CSRF.php
index 9d17b5e6e241..02894491de8d 100644
--- a/system/Filters/CSRF.php
+++ b/system/Filters/CSRF.php
@@ -39,7 +39,7 @@ class CSRF implements FilterInterface
      *
      * @throws SecurityException
      *
-     * @return mixed
+     * @return mixed|void
      */
     public function before(RequestInterface $request, $arguments = null)
     {
@@ -65,7 +65,7 @@ public function before(RequestInterface $request, $arguments = null)
      *
      * @param array|null $arguments
      *
-     * @return mixed
+     * @return mixed|void
      */
     public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
     {

From bd49a5b9d1831d41725790a1ad3a5ce4ea2c5556 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 8 Oct 2021 16:51:27 +0900
Subject: [PATCH 0430/2325] docs: fix PHPDoc for Security

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

diff --git a/app/Config/Security.php b/app/Config/Security.php
index c4cf7a25f42e..82afb9396ec4 100644
--- a/app/Config/Security.php
+++ b/app/Config/Security.php
@@ -11,7 +11,7 @@ class Security extends BaseConfig
      * CSRF Token Name
      * --------------------------------------------------------------------------
      *
-     * Token name for Cross Site Request Forgery protection cookie.
+     * Token name for Cross Site Request Forgery protection.
      *
      * @var string
      */
@@ -22,7 +22,7 @@ class Security extends BaseConfig
      * CSRF Header Name
      * --------------------------------------------------------------------------
      *
-     * Token name for Cross Site Request Forgery protection cookie.
+     * Header name for Cross Site Request Forgery protection.
      *
      * @var string
      */
@@ -33,7 +33,7 @@ class Security extends BaseConfig
      * CSRF Cookie Name
      * --------------------------------------------------------------------------
      *
-     * Cookie name for Cross Site Request Forgery protection cookie.
+     * Cookie name for Cross Site Request Forgery protection.
      *
      * @var string
      */
diff --git a/system/Security/Security.php b/system/Security/Security.php
index aa6cf6edabad..0f508628e240 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -29,7 +29,7 @@ class Security implements SecurityInterface
     /**
      * CSRF Hash
      *
-     * Random hash for Cross Site Request Forgery protection cookie
+     * Random hash for Cross Site Request Forgery protection.
      *
      * @var string|null
      */
@@ -38,7 +38,7 @@ class Security implements SecurityInterface
     /**
      * CSRF Token Name
      *
-     * Token name for Cross Site Request Forgery protection cookie.
+     * Token name for Cross Site Request Forgery protection.
      *
      * @var string
      */
@@ -47,7 +47,7 @@ class Security implements SecurityInterface
     /**
      * CSRF Header Name
      *
-     * Token name for Cross Site Request Forgery protection cookie.
+     * Header name for Cross Site Request Forgery protection.
      *
      * @var string
      */
@@ -63,7 +63,7 @@ class Security implements SecurityInterface
     /**
      * CSRF Cookie Name
      *
-     * Cookie name for Cross Site Request Forgery protection cookie.
+     * Cookie name for Cross Site Request Forgery protection.
      *
      * @var string
      */

From b495847918290b91a0b5588e4358e9be9ad15aaa Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 8 Oct 2021 17:12:44 +0900
Subject: [PATCH 0431/2325] chore: remove coverage.txt

---
 tests/_support/coverage.txt | 70 -------------------------------------
 1 file changed, 70 deletions(-)
 delete mode 100644 tests/_support/coverage.txt

diff --git a/tests/_support/coverage.txt b/tests/_support/coverage.txt
deleted file mode 100644
index 0fb8b92bb758..000000000000
--- a/tests/_support/coverage.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-Code Coverage Report:        
-  2016-03-31 06:36:22        
-                             
- Summary:                    
-  Classes: 29.51% (18/61)    
-  Methods: 42.91% (227/529)  
-  Lines:   53.58% (1967/3671)
-
-\CodeIgniter::CodeIgniter
-  Methods:  28.57% ( 4/14)   Lines:  69.11% ( 85/123)
-\CodeIgniter::Controller
-  Methods:   0.00% ( 0/ 2)   Lines:  66.67% (  6/  9)
-\CodeIgniter\Autoloader::Autoloader
-  Methods:  42.86% ( 3/ 7)   Lines:  89.36% ( 42/ 47)
-\CodeIgniter\Autoloader::FileLocator
-  Methods: 100.00% ( 3/ 3)   Lines: 100.00% ( 39/ 39)
-\CodeIgniter\CLI::CLI
-  Methods:   6.25% ( 1/16)   Lines:   2.54% (  3/118)
-\CodeIgniter\Config::AutoloadConfig
-  Methods: 100.00% ( 1/ 1)   Lines: 100.00% ( 52/ 52)
-\CodeIgniter\Config::BaseConfig
-  Methods:  50.00% ( 1/ 2)   Lines:  83.33% ( 15/ 18)
-\CodeIgniter\Config::DotEnv
-  Methods:  62.50% ( 5/ 8)   Lines:  89.29% ( 50/ 56)
-\CodeIgniter\Database::BaseBuilder
-  Methods:  43.33% (39/90)   Lines:  62.25% (460/739)
-\CodeIgniter\Database::BaseConnection
-  Methods:   0.00% ( 0/17)   Lines:   3.33% (  2/ 60)
-\CodeIgniter\Database::BaseQuery
-  Methods:  64.71% (11/17)   Lines:  74.44% ( 67/ 90)
-\CodeIgniter\Debug::Exceptions
-  Methods:  10.00% ( 1/10)   Lines:   2.91% (  3/103)
-\CodeIgniter\Debug::Timer
-  Methods:  75.00% ( 3/ 4)   Lines:  95.24% ( 20/ 21)
-\CodeIgniter\HTTP::CLIRequest
-  Methods:  33.33% ( 2/ 6)   Lines:  40.00% ( 14/ 35)
-\CodeIgniter\HTTP::CURLRequest
-  Methods:  62.50% (10/16)   Lines:  68.49% (100/146)
-\CodeIgniter\HTTP::Header
-  Methods:  88.89% ( 8/ 9)   Lines:  96.88% ( 31/ 32)
-\CodeIgniter\HTTP::IncomingRequest
-  Methods:  60.00% ( 6/10)   Lines:  54.05% ( 40/ 74)
-\CodeIgniter\HTTP::Message
-  Methods:  78.57% (11/14)   Lines:  86.21% ( 50/ 58)
-\CodeIgniter\HTTP::Negotiate
-  Methods:  75.00% ( 9/12)   Lines:  87.65% ( 71/ 81)
-\CodeIgniter\HTTP::Request
-  Methods:  57.14% ( 4/ 7)   Lines:  45.79% ( 49/107)
-\CodeIgniter\HTTP::Response
-  Methods:  53.85% ( 7/13)   Lines:  79.01% ( 64/ 81)
-\CodeIgniter\HTTP::URI
-  Methods:  81.82% (27/33)   Lines:  93.44% (171/183)
-\CodeIgniter\HTTP\Files::FileCollection
-  Methods:  66.67% ( 4/ 6)   Lines:  96.49% ( 55/ 57)
-\CodeIgniter\HTTP\Files::UploadedFile
-  Methods:  42.86% ( 6/14)   Lines:  39.22% ( 20/ 51)
-\CodeIgniter\Hooks::Hooks
-  Methods:  66.67% ( 4/ 6)   Lines:  92.31% ( 36/ 39)
-\CodeIgniter\Log::Logger
-  Methods:  76.92% (10/13)   Lines:  92.05% ( 81/ 88)
-\CodeIgniter\Router::RouteCollection
-  Methods:  74.36% (29/39)   Lines:  79.64% (133/167)
-\CodeIgniter\Router::Router
-  Methods:  37.50% ( 6/16)   Lines:  78.57% ( 77/ 98)
-\CodeIgniter\Security::Security
-  Methods: 100.00% ( 6/ 6)   Lines: 100.00% ( 50/ 50)
-\CodeIgniter\View::View
-  Methods:  85.71% ( 6/ 7)   Lines:  97.14% ( 34/ 35)

From 0122ba671d7909758fd8e99fc58891088b3ae9d3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 8 Oct 2021 17:23:37 +0900
Subject: [PATCH 0432/2325] test: refactor property name

---
 .../Cache/Handlers/DummyHandlerTest.php       |  30 ++---
 .../system/Cache/Handlers/FileHandlerTest.php | 116 +++++++++---------
 .../Cache/Handlers/MemcachedHandlerTest.php   |  68 +++++-----
 .../Cache/Handlers/PredisHandlerTest.php      |  80 ++++++------
 .../Cache/Handlers/RedisHandlerTest.php       |  78 ++++++------
 5 files changed, 186 insertions(+), 186 deletions(-)

diff --git a/tests/system/Cache/Handlers/DummyHandlerTest.php b/tests/system/Cache/Handlers/DummyHandlerTest.php
index c0fc5eb20cf5..482205d68d20 100644
--- a/tests/system/Cache/Handlers/DummyHandlerTest.php
+++ b/tests/system/Cache/Handlers/DummyHandlerTest.php
@@ -18,27 +18,27 @@
  */
 final class DummyHandlerTest extends CIUnitTestCase
 {
-    private $dummyHandler;
+    private $handler;
 
     protected function setUp(): void
     {
-        $this->dummyHandler = new DummyHandler();
-        $this->dummyHandler->initialize();
+        $this->handler = new DummyHandler();
+        $this->handler->initialize();
     }
 
     public function testNew()
     {
-        $this->assertInstanceOf(DummyHandler::class, $this->dummyHandler);
+        $this->assertInstanceOf(DummyHandler::class, $this->handler);
     }
 
     public function testGet()
     {
-        $this->assertNull($this->dummyHandler->get('key'));
+        $this->assertNull($this->handler->get('key'));
     }
 
     public function testRemember()
     {
-        $dummyHandler = $this->dummyHandler->remember('key', 2, static function () {
+        $dummyHandler = $this->handler->remember('key', 2, static function () {
             return 'value';
         });
 
@@ -47,46 +47,46 @@ public function testRemember()
 
     public function testSave()
     {
-        $this->assertTrue($this->dummyHandler->save('key', 'value'));
+        $this->assertTrue($this->handler->save('key', 'value'));
     }
 
     public function testDelete()
     {
-        $this->assertTrue($this->dummyHandler->delete('key'));
+        $this->assertTrue($this->handler->delete('key'));
     }
 
     public function testDeleteMatching()
     {
-        $this->assertSame(0, $this->dummyHandler->deleteMatching('key*'));
+        $this->assertSame(0, $this->handler->deleteMatching('key*'));
     }
 
     public function testIncrement()
     {
-        $this->assertTrue($this->dummyHandler->increment('key'));
+        $this->assertTrue($this->handler->increment('key'));
     }
 
     public function testDecrement()
     {
-        $this->assertTrue($this->dummyHandler->decrement('key'));
+        $this->assertTrue($this->handler->decrement('key'));
     }
 
     public function testClean()
     {
-        $this->assertTrue($this->dummyHandler->clean());
+        $this->assertTrue($this->handler->clean());
     }
 
     public function testGetCacheInfo()
     {
-        $this->assertNull($this->dummyHandler->getCacheInfo());
+        $this->assertNull($this->handler->getCacheInfo());
     }
 
     public function testGetMetaData()
     {
-        $this->assertNull($this->dummyHandler->getMetaData('key'));
+        $this->assertNull($this->handler->getMetaData('key'));
     }
 
     public function testIsSupported()
     {
-        $this->assertTrue($this->dummyHandler->isSupported());
+        $this->assertTrue($this->handler->isSupported());
     }
 }
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index 5b53a9532b8b..f60c2d0f1248 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -35,7 +35,7 @@ private static function getKeyArray()
     }
 
     private static $dummy = 'dymmy';
-    private $fileHandler;
+    private $handler;
     private $config;
 
     protected function setUp(): void
@@ -54,8 +54,8 @@ protected function setUp(): void
             mkdir($this->config->file['storePath'], 0777, true);
         }
 
-        $this->fileHandler = new FileHandler($this->config);
-        $this->fileHandler->initialize();
+        $this->handler = new FileHandler($this->config);
+        $this->handler->initialize();
     }
 
     protected function tearDown(): void
@@ -78,7 +78,7 @@ protected function tearDown(): void
 
     public function testNew()
     {
-        $this->assertInstanceOf(FileHandler::class, $this->fileHandler);
+        $this->assertInstanceOf(FileHandler::class, $this->handler);
     }
 
     public function testNewWithNonWritablePath()
@@ -95,10 +95,10 @@ public function testSetDefaultPath()
         $config                    = new Cache();
         $config->file['storePath'] = null;
 
-        $this->fileHandler = new FileHandler($config);
-        $this->fileHandler->initialize();
+        $this->handler = new FileHandler($config);
+        $this->handler->initialize();
 
-        $this->assertInstanceOf(FileHandler::class, $this->fileHandler);
+        $this->assertInstanceOf(FileHandler::class, $this->handler);
     }
 
     /**
@@ -109,13 +109,13 @@ public function testSetDefaultPath()
      */
     public function testGet()
     {
-        $this->fileHandler->save(self::$key1, 'value', 2);
+        $this->handler->save(self::$key1, 'value', 2);
 
-        $this->assertSame('value', $this->fileHandler->get(self::$key1));
-        $this->assertNull($this->fileHandler->get(self::$dummy));
+        $this->assertSame('value', $this->handler->get(self::$key1));
+        $this->assertNull($this->handler->get(self::$dummy));
 
         CLI::wait(3);
-        $this->assertNull($this->fileHandler->get(self::$key1));
+        $this->assertNull($this->handler->get(self::$key1));
     }
 
     /**
@@ -126,23 +126,23 @@ public function testGet()
      */
     public function testRemember()
     {
-        $this->fileHandler->remember(self::$key1, 2, static function () {
+        $this->handler->remember(self::$key1, 2, static function () {
             return 'value';
         });
 
-        $this->assertSame('value', $this->fileHandler->get(self::$key1));
-        $this->assertNull($this->fileHandler->get(self::$dummy));
+        $this->assertSame('value', $this->handler->get(self::$key1));
+        $this->assertNull($this->handler->get(self::$dummy));
 
         CLI::wait(3);
-        $this->assertNull($this->fileHandler->get(self::$key1));
+        $this->assertNull($this->handler->get(self::$key1));
     }
 
     public function testSave()
     {
-        $this->assertTrue($this->fileHandler->save(self::$key1, 'value'));
+        $this->assertTrue($this->handler->save(self::$key1, 'value'));
 
         chmod($this->config->file['storePath'], 0444);
-        $this->assertFalse($this->fileHandler->save(self::$key2, 'value'));
+        $this->assertFalse($this->handler->save(self::$key2, 'value'));
     }
 
     public function testSaveExcessiveKeyLength()
@@ -150,7 +150,7 @@ public function testSaveExcessiveKeyLength()
         $key  = str_repeat('a', 260);
         $file = $this->config->file['storePath'] . DIRECTORY_SEPARATOR . md5($key);
 
-        $this->assertTrue($this->fileHandler->save($key, 'value'));
+        $this->assertTrue($this->handler->save($key, 'value'));
         $this->assertFileExists($file);
 
         unlink($file);
@@ -158,108 +158,108 @@ public function testSaveExcessiveKeyLength()
 
     public function testSavePermanent()
     {
-        $this->assertTrue($this->fileHandler->save(self::$key1, 'value', 0));
-        $metaData = $this->fileHandler->getMetaData(self::$key1);
+        $this->assertTrue($this->handler->save(self::$key1, 'value', 0));
+        $metaData = $this->handler->getMetaData(self::$key1);
 
         $this->assertNull($metaData['expire']);
         $this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
         $this->assertSame('value', $metaData['data']);
 
-        $this->assertTrue($this->fileHandler->delete(self::$key1));
+        $this->assertTrue($this->handler->delete(self::$key1));
     }
 
     public function testDelete()
     {
-        $this->fileHandler->save(self::$key1, 'value');
+        $this->handler->save(self::$key1, 'value');
 
-        $this->assertTrue($this->fileHandler->delete(self::$key1));
-        $this->assertFalse($this->fileHandler->delete(self::$dummy));
+        $this->assertTrue($this->handler->delete(self::$key1));
+        $this->assertFalse($this->handler->delete(self::$dummy));
     }
 
     public function testDeleteMatchingPrefix()
     {
         // Save 101 items to match on
         for ($i = 1; $i <= 101; $i++) {
-            $this->fileHandler->save('key_' . $i, 'value' . $i);
+            $this->handler->save('key_' . $i, 'value' . $i);
         }
 
         // check that there are 101 items is cache store
-        $this->assertCount(101, $this->fileHandler->getCacheInfo());
+        $this->assertCount(101, $this->handler->getCacheInfo());
 
         // Checking that given the prefix "key_1", deleteMatching deletes 13 keys:
         // (key_1, key_10, key_11, key_12, key_13, key_14, key_15, key_16, key_17, key_18, key_19, key_100, key_101)
-        $this->assertSame(13, $this->fileHandler->deleteMatching('key_1*'));
+        $this->assertSame(13, $this->handler->deleteMatching('key_1*'));
 
         // check that there remains (101 - 13) = 88 items is cache store
-        $this->assertCount(88, $this->fileHandler->getCacheInfo());
+        $this->assertCount(88, $this->handler->getCacheInfo());
 
         // Clear all files
-        $this->fileHandler->clean();
+        $this->handler->clean();
     }
 
     public function testDeleteMatchingSuffix()
     {
         // Save 101 items to match on
         for ($i = 1; $i <= 101; $i++) {
-            $this->fileHandler->save('key_' . $i, 'value' . $i);
+            $this->handler->save('key_' . $i, 'value' . $i);
         }
 
         // check that there are 101 items is cache store
-        $this->assertCount(101, $this->fileHandler->getCacheInfo());
+        $this->assertCount(101, $this->handler->getCacheInfo());
 
         // Checking that given the suffix "1", deleteMatching deletes 11 keys:
         // (key_1, key_11, key_21, key_31, key_41, key_51, key_61, key_71, key_81, key_91, key_101)
-        $this->assertSame(11, $this->fileHandler->deleteMatching('*1'));
+        $this->assertSame(11, $this->handler->deleteMatching('*1'));
 
         // check that there remains (101 - 13) = 88 items is cache store
-        $this->assertCount(90, $this->fileHandler->getCacheInfo());
+        $this->assertCount(90, $this->handler->getCacheInfo());
 
         // Clear all files
-        $this->fileHandler->clean();
+        $this->handler->clean();
     }
 
     public function testIncrement()
     {
-        $this->fileHandler->save(self::$key1, 1);
-        $this->fileHandler->save(self::$key2, 'value');
+        $this->handler->save(self::$key1, 1);
+        $this->handler->save(self::$key2, 'value');
 
-        $this->assertSame(11, $this->fileHandler->increment(self::$key1, 10));
-        $this->assertFalse($this->fileHandler->increment(self::$key2, 10));
-        $this->assertSame(10, $this->fileHandler->increment(self::$key3, 10));
+        $this->assertSame(11, $this->handler->increment(self::$key1, 10));
+        $this->assertFalse($this->handler->increment(self::$key2, 10));
+        $this->assertSame(10, $this->handler->increment(self::$key3, 10));
     }
 
     public function testDecrement()
     {
-        $this->fileHandler->save(self::$key1, 10);
-        $this->fileHandler->save(self::$key2, 'value');
+        $this->handler->save(self::$key1, 10);
+        $this->handler->save(self::$key2, 'value');
 
         // Line following commented out to force the cache to add a zero entry for key3
         // $this->fileHandler->save(self::$key3, 0);
 
-        $this->assertSame(9, $this->fileHandler->decrement(self::$key1, 1));
-        $this->assertFalse($this->fileHandler->decrement(self::$key2, 1));
-        $this->assertSame(-1, $this->fileHandler->decrement(self::$key3, 1));
+        $this->assertSame(9, $this->handler->decrement(self::$key1, 1));
+        $this->assertFalse($this->handler->decrement(self::$key2, 1));
+        $this->assertSame(-1, $this->handler->decrement(self::$key3, 1));
     }
 
     public function testClean()
     {
-        $this->fileHandler->save(self::$key1, 1);
-        $this->fileHandler->save(self::$key2, 'value');
+        $this->handler->save(self::$key1, 1);
+        $this->handler->save(self::$key2, 'value');
 
-        $this->assertTrue($this->fileHandler->clean());
+        $this->assertTrue($this->handler->clean());
 
-        $this->fileHandler->save(self::$key1, 1);
-        $this->fileHandler->save(self::$key2, 'value');
+        $this->handler->save(self::$key1, 1);
+        $this->handler->save(self::$key2, 'value');
     }
 
     public function testGetMetaData()
     {
         $time = time();
-        $this->fileHandler->save(self::$key1, 'value');
+        $this->handler->save(self::$key1, 'value');
 
-        $this->assertFalse($this->fileHandler->getMetaData(self::$dummy));
+        $this->assertFalse($this->handler->getMetaData(self::$dummy));
 
-        $actual = $this->fileHandler->getMetaData(self::$key1);
+        $actual = $this->handler->getMetaData(self::$key1);
         $this->assertLessThanOrEqual(60, $actual['expire'] - $time);
         $this->assertLessThanOrEqual(1, $actual['mtime'] - $time);
         $this->assertSame('value', $actual['data']);
@@ -267,9 +267,9 @@ public function testGetMetaData()
 
     public function testGetCacheInfo()
     {
-        $this->fileHandler->save(self::$key1, 'value');
+        $this->handler->save(self::$key1, 'value');
 
-        $actual = $this->fileHandler->getCacheInfo();
+        $actual = $this->handler->getCacheInfo();
         $this->assertArrayHasKey(self::$key1, $actual);
         $this->assertSame(self::$key1, $actual[self::$key1]['name']);
         $this->assertArrayHasKey('server_path', $actual[self::$key1]);
@@ -277,7 +277,7 @@ public function testGetCacheInfo()
 
     public function testIsSupported()
     {
-        $this->assertTrue($this->fileHandler->isSupported());
+        $this->assertTrue($this->handler->isSupported());
     }
 
     /**
@@ -292,10 +292,10 @@ public function testSaveMode($int, $string)
         $config               = new Cache();
         $config->file['mode'] = $int;
 
-        $this->fileHandler = new FileHandler($config);
-        $this->fileHandler->initialize();
+        $this->handler = new FileHandler($config);
+        $this->handler->initialize();
 
-        $this->fileHandler->save(self::$key1, 'value');
+        $this->handler->save(self::$key1, 'value');
 
         $file = $config->file['storePath'] . DIRECTORY_SEPARATOR . self::$key1;
         $mode = octal_permissions(fileperms($file));
diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
index c9fa840165ff..40fe5702e4e7 100644
--- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php
+++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
@@ -21,7 +21,7 @@
  */
 final class MemcachedHandlerTest extends CIUnitTestCase
 {
-    private $memcachedHandler;
+    private $handler;
     private static $key1 = 'key1';
     private static $key2 = 'key2';
     private static $key3 = 'key3';
@@ -44,21 +44,21 @@ protected function setUp(): void
 
         $this->config = new Cache();
 
-        $this->memcachedHandler = new MemcachedHandler($this->config);
+        $this->handler = new MemcachedHandler($this->config);
 
-        $this->memcachedHandler->initialize();
+        $this->handler->initialize();
     }
 
     protected function tearDown(): void
     {
         foreach (self::getKeyArray() as $key) {
-            $this->memcachedHandler->delete($key);
+            $this->handler->delete($key);
         }
     }
 
     public function testNew()
     {
-        $this->assertInstanceOf(MemcachedHandler::class, $this->memcachedHandler);
+        $this->assertInstanceOf(MemcachedHandler::class, $this->handler);
     }
 
     /**
@@ -69,13 +69,13 @@ public function testNew()
      */
     public function testGet()
     {
-        $this->memcachedHandler->save(self::$key1, 'value', 2);
+        $this->handler->save(self::$key1, 'value', 2);
 
-        $this->assertSame('value', $this->memcachedHandler->get(self::$key1));
-        $this->assertNull($this->memcachedHandler->get(self::$dummy));
+        $this->assertSame('value', $this->handler->get(self::$key1));
+        $this->assertNull($this->handler->get(self::$dummy));
 
         CLI::wait(3);
-        $this->assertNull($this->memcachedHandler->get(self::$key1));
+        $this->assertNull($this->handler->get(self::$key1));
     }
 
     /**
@@ -86,40 +86,40 @@ public function testGet()
      */
     public function testRemember()
     {
-        $this->memcachedHandler->remember(self::$key1, 2, static function () {
+        $this->handler->remember(self::$key1, 2, static function () {
             return 'value';
         });
 
-        $this->assertSame('value', $this->memcachedHandler->get(self::$key1));
-        $this->assertNull($this->memcachedHandler->get(self::$dummy));
+        $this->assertSame('value', $this->handler->get(self::$key1));
+        $this->assertNull($this->handler->get(self::$dummy));
 
         CLI::wait(3);
-        $this->assertNull($this->memcachedHandler->get(self::$key1));
+        $this->assertNull($this->handler->get(self::$key1));
     }
 
     public function testSave()
     {
-        $this->assertTrue($this->memcachedHandler->save(self::$key1, 'value'));
+        $this->assertTrue($this->handler->save(self::$key1, 'value'));
     }
 
     public function testSavePermanent()
     {
-        $this->assertTrue($this->memcachedHandler->save(self::$key1, 'value', 0));
-        $metaData = $this->memcachedHandler->getMetaData(self::$key1);
+        $this->assertTrue($this->handler->save(self::$key1, 'value', 0));
+        $metaData = $this->handler->getMetaData(self::$key1);
 
         $this->assertNull($metaData['expire']);
         $this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
         $this->assertSame('value', $metaData['data']);
 
-        $this->assertTrue($this->memcachedHandler->delete(self::$key1));
+        $this->assertTrue($this->handler->delete(self::$key1));
     }
 
     public function testDelete()
     {
-        $this->memcachedHandler->save(self::$key1, 'value');
+        $this->handler->save(self::$key1, 'value');
 
-        $this->assertTrue($this->memcachedHandler->delete(self::$key1));
-        $this->assertFalse($this->memcachedHandler->delete(self::$dummy));
+        $this->assertTrue($this->handler->delete(self::$key1));
+        $this->assertFalse($this->handler->delete(self::$dummy));
     }
 
     public function testDeleteMatching()
@@ -127,14 +127,14 @@ public function testDeleteMatching()
         // Not implemented for Memcached, should throw an exception
         $this->expectException(Exception::class);
 
-        $this->memcachedHandler->deleteMatching('key*');
+        $this->handler->deleteMatching('key*');
     }
 
     public function testIncrement()
     {
-        $this->memcachedHandler->save(self::$key1, 1);
+        $this->handler->save(self::$key1, 1);
 
-        $this->assertFalse($this->memcachedHandler->increment(self::$key1, 10));
+        $this->assertFalse($this->handler->increment(self::$key1, 10));
 
         $config                   = new Cache();
         $config->memcached['raw'] = true;
@@ -151,9 +151,9 @@ public function testIncrement()
 
     public function testDecrement()
     {
-        $this->memcachedHandler->save(self::$key1, 10);
+        $this->handler->save(self::$key1, 10);
 
-        $this->assertFalse($this->memcachedHandler->decrement(self::$key1, 1));
+        $this->assertFalse($this->handler->decrement(self::$key1, 1));
 
         $config                   = new Cache();
         $config->memcached['raw'] = true;
@@ -170,27 +170,27 @@ public function testDecrement()
 
     public function testClean()
     {
-        $this->memcachedHandler->save(self::$key1, 1);
-        $this->memcachedHandler->save(self::$key2, 'value');
+        $this->handler->save(self::$key1, 1);
+        $this->handler->save(self::$key2, 'value');
 
-        $this->assertTrue($this->memcachedHandler->clean());
+        $this->assertTrue($this->handler->clean());
     }
 
     public function testGetCacheInfo()
     {
-        $this->memcachedHandler->save(self::$key1, 'value');
+        $this->handler->save(self::$key1, 'value');
 
-        $this->assertIsArray($this->memcachedHandler->getCacheInfo());
+        $this->assertIsArray($this->handler->getCacheInfo());
     }
 
     public function testGetMetaData()
     {
         $time = time();
-        $this->memcachedHandler->save(self::$key1, 'value');
+        $this->handler->save(self::$key1, 'value');
 
-        $this->assertFalse($this->memcachedHandler->getMetaData(self::$dummy));
+        $this->assertFalse($this->handler->getMetaData(self::$dummy));
 
-        $actual = $this->memcachedHandler->getMetaData(self::$key1);
+        $actual = $this->handler->getMetaData(self::$key1);
 
         // This test is time-dependent, and depending on the timing,
         // seconds in `$time` (e.g. 12:00:00.9999) and seconds of
@@ -205,6 +205,6 @@ public function testGetMetaData()
 
     public function testIsSupported()
     {
-        $this->assertTrue($this->memcachedHandler->isSupported());
+        $this->assertTrue($this->handler->isSupported());
     }
 }
diff --git a/tests/system/Cache/Handlers/PredisHandlerTest.php b/tests/system/Cache/Handlers/PredisHandlerTest.php
index 3bcafae48fe2..a25e02cdf205 100644
--- a/tests/system/Cache/Handlers/PredisHandlerTest.php
+++ b/tests/system/Cache/Handlers/PredisHandlerTest.php
@@ -20,7 +20,7 @@
  */
 final class PredisHandlerTest extends CIUnitTestCase
 {
-    private $PredisHandler;
+    private $handler;
     private static $key1 = 'key1';
     private static $key2 = 'key2';
     private static $key3 = 'key3';
@@ -43,29 +43,29 @@ protected function setUp(): void
 
         $this->config = new Cache();
 
-        $this->PredisHandler = new PredisHandler($this->config);
+        $this->handler = new PredisHandler($this->config);
 
-        $this->PredisHandler->initialize();
+        $this->handler->initialize();
     }
 
     protected function tearDown(): void
     {
         foreach (self::getKeyArray() as $key) {
-            $this->PredisHandler->delete($key);
+            $this->handler->delete($key);
         }
     }
 
     public function testNew()
     {
-        $this->assertInstanceOf(PredisHandler::class, $this->PredisHandler);
+        $this->assertInstanceOf(PredisHandler::class, $this->handler);
     }
 
     public function testDestruct()
     {
-        $this->PredisHandler = new PredisHandler($this->config);
-        $this->PredisHandler->initialize();
+        $this->handler = new PredisHandler($this->config);
+        $this->handler->initialize();
 
-        $this->assertInstanceOf(PredisHandler::class, $this->PredisHandler);
+        $this->assertInstanceOf(PredisHandler::class, $this->handler);
     }
 
     /**
@@ -76,13 +76,13 @@ public function testDestruct()
      */
     public function testGet()
     {
-        $this->PredisHandler->save(self::$key1, 'value', 2);
+        $this->handler->save(self::$key1, 'value', 2);
 
-        $this->assertSame('value', $this->PredisHandler->get(self::$key1));
-        $this->assertNull($this->PredisHandler->get(self::$dummy));
+        $this->assertSame('value', $this->handler->get(self::$key1));
+        $this->assertNull($this->handler->get(self::$dummy));
 
         CLI::wait(3);
-        $this->assertNull($this->PredisHandler->get(self::$key1));
+        $this->assertNull($this->handler->get(self::$key1));
     }
 
     /**
@@ -93,101 +93,101 @@ public function testGet()
      */
     public function testRemember()
     {
-        $this->PredisHandler->remember(self::$key1, 2, static function () {
+        $this->handler->remember(self::$key1, 2, static function () {
             return 'value';
         });
 
-        $this->assertSame('value', $this->PredisHandler->get(self::$key1));
-        $this->assertNull($this->PredisHandler->get(self::$dummy));
+        $this->assertSame('value', $this->handler->get(self::$key1));
+        $this->assertNull($this->handler->get(self::$dummy));
 
         CLI::wait(3);
-        $this->assertNull($this->PredisHandler->get(self::$key1));
+        $this->assertNull($this->handler->get(self::$key1));
     }
 
     public function testSave()
     {
-        $this->assertTrue($this->PredisHandler->save(self::$key1, 'value'));
+        $this->assertTrue($this->handler->save(self::$key1, 'value'));
     }
 
     public function testSavePermanent()
     {
-        $this->assertTrue($this->PredisHandler->save(self::$key1, 'value', 0));
-        $metaData = $this->PredisHandler->getMetaData(self::$key1);
+        $this->assertTrue($this->handler->save(self::$key1, 'value', 0));
+        $metaData = $this->handler->getMetaData(self::$key1);
 
         $this->assertNull($metaData['expire']);
         $this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
         $this->assertSame('value', $metaData['data']);
 
-        $this->assertTrue($this->PredisHandler->delete(self::$key1));
+        $this->assertTrue($this->handler->delete(self::$key1));
     }
 
     public function testDelete()
     {
-        $this->PredisHandler->save(self::$key1, 'value');
+        $this->handler->save(self::$key1, 'value');
 
-        $this->assertTrue($this->PredisHandler->delete(self::$key1));
-        $this->assertFalse($this->PredisHandler->delete(self::$dummy));
+        $this->assertTrue($this->handler->delete(self::$key1));
+        $this->assertFalse($this->handler->delete(self::$dummy));
     }
 
     public function testDeleteMatchingPrefix()
     {
         // Save 101 items to match on
         for ($i = 1; $i <= 101; $i++) {
-            $this->PredisHandler->save('key_' . $i, 'value' . $i);
+            $this->handler->save('key_' . $i, 'value' . $i);
         }
 
         // check that there are 101 items is cache store
-        $this->assertSame('101', $this->PredisHandler->getCacheInfo()['Keyspace']['db0']['keys']);
+        $this->assertSame('101', $this->handler->getCacheInfo()['Keyspace']['db0']['keys']);
 
         // Checking that given the prefix "key_1", deleteMatching deletes 13 keys:
         // (key_1, key_10, key_11, key_12, key_13, key_14, key_15, key_16, key_17, key_18, key_19, key_100, key_101)
-        $this->assertSame(13, $this->PredisHandler->deleteMatching('key_1*'));
+        $this->assertSame(13, $this->handler->deleteMatching('key_1*'));
 
         // check that there remains (101 - 13) = 88 items is cache store
-        $this->assertSame('88', $this->PredisHandler->getCacheInfo()['Keyspace']['db0']['keys']);
+        $this->assertSame('88', $this->handler->getCacheInfo()['Keyspace']['db0']['keys']);
     }
 
     public function testDeleteMatchingSuffix()
     {
         // Save 101 items to match on
         for ($i = 1; $i <= 101; $i++) {
-            $this->PredisHandler->save('key_' . $i, 'value' . $i);
+            $this->handler->save('key_' . $i, 'value' . $i);
         }
 
         // check that there are 101 items is cache store
-        $this->assertSame('101', $this->PredisHandler->getCacheInfo()['Keyspace']['db0']['keys']);
+        $this->assertSame('101', $this->handler->getCacheInfo()['Keyspace']['db0']['keys']);
 
         // Checking that given the suffix "1", deleteMatching deletes 11 keys:
         // (key_1, key_11, key_21, key_31, key_41, key_51, key_61, key_71, key_81, key_91, key_101)
-        $this->assertSame(11, $this->PredisHandler->deleteMatching('*1'));
+        $this->assertSame(11, $this->handler->deleteMatching('*1'));
 
         // check that there remains (101 - 13) = 88 items is cache store
-        $this->assertSame('90', $this->PredisHandler->getCacheInfo()['Keyspace']['db0']['keys']);
+        $this->assertSame('90', $this->handler->getCacheInfo()['Keyspace']['db0']['keys']);
     }
 
     public function testClean()
     {
-        $this->PredisHandler->save(self::$key1, 1);
-        $this->PredisHandler->save(self::$key2, 'value');
+        $this->handler->save(self::$key1, 1);
+        $this->handler->save(self::$key2, 'value');
 
-        $this->assertTrue($this->PredisHandler->clean());
+        $this->assertTrue($this->handler->clean());
     }
 
     public function testGetCacheInfo()
     {
-        $this->PredisHandler->save(self::$key1, 'value');
+        $this->handler->save(self::$key1, 'value');
 
-        $this->assertIsArray($this->PredisHandler->getCacheInfo());
+        $this->assertIsArray($this->handler->getCacheInfo());
     }
 
     public function testGetMetaData()
     {
         $time = time();
-        $this->PredisHandler->save(self::$key1, 'value');
+        $this->handler->save(self::$key1, 'value');
 
-        $this->assertNull($this->PredisHandler->getMetaData(self::$dummy));
+        $this->assertNull($this->handler->getMetaData(self::$dummy));
 
-        $actual = $this->PredisHandler->getMetaData(self::$key1);
+        $actual = $this->handler->getMetaData(self::$key1);
         $this->assertLessThanOrEqual(60, $actual['expire'] - $time);
         $this->assertLessThanOrEqual(1, $actual['mtime'] - $time);
         $this->assertSame('value', $actual['data']);
@@ -195,6 +195,6 @@ public function testGetMetaData()
 
     public function testIsSupported()
     {
-        $this->assertTrue($this->PredisHandler->isSupported());
+        $this->assertTrue($this->handler->isSupported());
     }
 }
diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php
index d254cd65af97..cadcd811fd43 100644
--- a/tests/system/Cache/Handlers/RedisHandlerTest.php
+++ b/tests/system/Cache/Handlers/RedisHandlerTest.php
@@ -20,7 +20,7 @@
  */
 final class RedisHandlerTest extends CIUnitTestCase
 {
-    private $redisHandler;
+    private $handler;
     private static $key1 = 'key1';
     private static $key2 = 'key2';
     private static $key3 = 'key3';
@@ -43,29 +43,29 @@ protected function setUp(): void
 
         $this->config = new Cache();
 
-        $this->redisHandler = new RedisHandler($this->config);
+        $this->handler = new RedisHandler($this->config);
 
-        $this->redisHandler->initialize();
+        $this->handler->initialize();
     }
 
     protected function tearDown(): void
     {
         foreach (self::getKeyArray() as $key) {
-            $this->redisHandler->delete($key);
+            $this->handler->delete($key);
         }
     }
 
     public function testNew()
     {
-        $this->assertInstanceOf(RedisHandler::class, $this->redisHandler);
+        $this->assertInstanceOf(RedisHandler::class, $this->handler);
     }
 
     public function testDestruct()
     {
-        $this->redisHandler = new RedisHandler($this->config);
-        $this->redisHandler->initialize();
+        $this->handler = new RedisHandler($this->config);
+        $this->handler->initialize();
 
-        $this->assertInstanceOf(RedisHandler::class, $this->redisHandler);
+        $this->assertInstanceOf(RedisHandler::class, $this->handler);
     }
 
     /**
@@ -76,13 +76,13 @@ public function testDestruct()
      */
     public function testGet()
     {
-        $this->redisHandler->save(self::$key1, 'value', 2);
+        $this->handler->save(self::$key1, 'value', 2);
 
-        $this->assertSame('value', $this->redisHandler->get(self::$key1));
-        $this->assertNull($this->redisHandler->get(self::$dummy));
+        $this->assertSame('value', $this->handler->get(self::$key1));
+        $this->assertNull($this->handler->get(self::$dummy));
 
         CLI::wait(3);
-        $this->assertNull($this->redisHandler->get(self::$key1));
+        $this->assertNull($this->handler->get(self::$key1));
     }
 
     /**
@@ -93,59 +93,59 @@ public function testGet()
      */
     public function testRemember()
     {
-        $this->redisHandler->remember(self::$key1, 2, static function () {
+        $this->handler->remember(self::$key1, 2, static function () {
             return 'value';
         });
 
-        $this->assertSame('value', $this->redisHandler->get(self::$key1));
-        $this->assertNull($this->redisHandler->get(self::$dummy));
+        $this->assertSame('value', $this->handler->get(self::$key1));
+        $this->assertNull($this->handler->get(self::$dummy));
 
         CLI::wait(3);
-        $this->assertNull($this->redisHandler->get(self::$key1));
+        $this->assertNull($this->handler->get(self::$key1));
     }
 
     public function testSave()
     {
-        $this->assertTrue($this->redisHandler->save(self::$key1, 'value'));
+        $this->assertTrue($this->handler->save(self::$key1, 'value'));
     }
 
     public function testSavePermanent()
     {
-        $this->assertTrue($this->redisHandler->save(self::$key1, 'value', 0));
-        $metaData = $this->redisHandler->getMetaData(self::$key1);
+        $this->assertTrue($this->handler->save(self::$key1, 'value', 0));
+        $metaData = $this->handler->getMetaData(self::$key1);
 
         $this->assertNull($metaData['expire']);
         $this->assertLessThanOrEqual(1, $metaData['mtime'] - time());
         $this->assertSame('value', $metaData['data']);
 
-        $this->assertTrue($this->redisHandler->delete(self::$key1));
+        $this->assertTrue($this->handler->delete(self::$key1));
     }
 
     public function testDelete()
     {
-        $this->redisHandler->save(self::$key1, 'value');
+        $this->handler->save(self::$key1, 'value');
 
-        $this->assertTrue($this->redisHandler->delete(self::$key1));
-        $this->assertFalse($this->redisHandler->delete(self::$dummy));
+        $this->assertTrue($this->handler->delete(self::$key1));
+        $this->assertFalse($this->handler->delete(self::$dummy));
     }
 
     public function testDeleteMatchingPrefix()
     {
         // Save 101 items to match on
         for ($i = 1; $i <= 101; $i++) {
-            $this->redisHandler->save('key_' . $i, 'value' . $i);
+            $this->handler->save('key_' . $i, 'value' . $i);
         }
 
         // check that there are 101 items is cache store
-        $dbInfo = explode(',', $this->redisHandler->getCacheInfo()['db0']);
+        $dbInfo = explode(',', $this->handler->getCacheInfo()['db0']);
         $this->assertSame('keys=101', $dbInfo[0]);
 
         // Checking that given the prefix "key_1", deleteMatching deletes 13 keys:
         // (key_1, key_10, key_11, key_12, key_13, key_14, key_15, key_16, key_17, key_18, key_19, key_100, key_101)
-        $this->assertSame(13, $this->redisHandler->deleteMatching('key_1*'));
+        $this->assertSame(13, $this->handler->deleteMatching('key_1*'));
 
         // check that there remains (101 - 13) = 88 items is cache store
-        $dbInfo = explode(',', $this->redisHandler->getCacheInfo()['db0']);
+        $dbInfo = explode(',', $this->handler->getCacheInfo()['db0']);
         $this->assertSame('keys=88', $dbInfo[0]);
     }
 
@@ -153,19 +153,19 @@ public function testDeleteMatchingSuffix()
     {
         // Save 101 items to match on
         for ($i = 1; $i <= 101; $i++) {
-            $this->redisHandler->save('key_' . $i, 'value' . $i);
+            $this->handler->save('key_' . $i, 'value' . $i);
         }
 
         // check that there are 101 items is cache store
-        $dbInfo = explode(',', $this->redisHandler->getCacheInfo()['db0']);
+        $dbInfo = explode(',', $this->handler->getCacheInfo()['db0']);
         $this->assertSame('keys=101', $dbInfo[0]);
 
         // Checking that given the suffix "1", deleteMatching deletes 11 keys:
         // (key_1, key_11, key_21, key_31, key_41, key_51, key_61, key_71, key_81, key_91, key_101)
-        $this->assertSame(11, $this->redisHandler->deleteMatching('*1'));
+        $this->assertSame(11, $this->handler->deleteMatching('*1'));
 
         // check that there remains (101 - 13) = 88 items is cache store
-        $dbInfo = explode(',', $this->redisHandler->getCacheInfo()['db0']);
+        $dbInfo = explode(',', $this->handler->getCacheInfo()['db0']);
         $this->assertSame('keys=90', $dbInfo[0]);
     }
 
@@ -180,26 +180,26 @@ public function testDeleteMatchingSuffix()
 
     public function testClean()
     {
-        $this->redisHandler->save(self::$key1, 1);
+        $this->handler->save(self::$key1, 1);
 
-        $this->assertTrue($this->redisHandler->clean());
+        $this->assertTrue($this->handler->clean());
     }
 
     public function testGetCacheInfo()
     {
-        $this->redisHandler->save(self::$key1, 'value');
+        $this->handler->save(self::$key1, 'value');
 
-        $this->assertIsArray($this->redisHandler->getCacheInfo());
+        $this->assertIsArray($this->handler->getCacheInfo());
     }
 
     public function testGetMetaData()
     {
         $time = time();
-        $this->redisHandler->save(self::$key1, 'value');
+        $this->handler->save(self::$key1, 'value');
 
-        $this->assertNull($this->redisHandler->getMetaData(self::$dummy));
+        $this->assertNull($this->handler->getMetaData(self::$dummy));
 
-        $actual = $this->redisHandler->getMetaData(self::$key1);
+        $actual = $this->handler->getMetaData(self::$key1);
         $this->assertLessThanOrEqual(60, $actual['expire'] - $time);
         $this->assertLessThanOrEqual(1, $actual['mtime'] - $time);
         $this->assertSame('value', $actual['data']);
@@ -207,6 +207,6 @@ public function testGetMetaData()
 
     public function testIsSupported()
     {
-        $this->assertTrue($this->redisHandler->isSupported());
+        $this->assertTrue($this->handler->isSupported());
     }
 }

From b88211a0b6a89fa5306c0d14112eda4179241e43 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 8 Oct 2021 17:37:08 +0900
Subject: [PATCH 0433/2325] test: fix testGetMetaData()

Sometimes the test fails.

1) CodeIgniter\Cache\Handlers\FileHandlerTest::testGetMetaData
Failed asserting that 61 is equal to 60 or is less than 60.

/home/runner/work/CodeIgniter4/CodeIgniter4/tests/system/Cache/Handlers/FileHandlerTest.php:263
---
 .../Cache/Handlers/AbstractHandlerTest.php    | 49 +++++++++++++++++++
 .../system/Cache/Handlers/FileHandlerTest.php | 26 +++-------
 .../Cache/Handlers/MemcachedHandlerTest.php   | 32 ++----------
 .../Cache/Handlers/PredisHandlerTest.php      | 22 +--------
 .../Cache/Handlers/RedisHandlerTest.php       | 22 +--------
 5 files changed, 62 insertions(+), 89 deletions(-)
 create mode 100644 tests/system/Cache/Handlers/AbstractHandlerTest.php

diff --git a/tests/system/Cache/Handlers/AbstractHandlerTest.php b/tests/system/Cache/Handlers/AbstractHandlerTest.php
new file mode 100644
index 000000000000..7ff02a729b49
--- /dev/null
+++ b/tests/system/Cache/Handlers/AbstractHandlerTest.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Cache\Handlers;
+
+use CodeIgniter\Test\CIUnitTestCase;
+
+/**
+ * @internal
+ */
+abstract class AbstractHandlerTest extends CIUnitTestCase
+{
+    protected $handler;
+    protected static $key1  = 'key1';
+    protected static $key2  = 'key2';
+    protected static $key3  = 'key3';
+    protected static $dummy = 'dymmy';
+
+    public function testGetMetaDataMiss()
+    {
+        $this->assertNull($this->handler->getMetaData(self::$dummy));
+    }
+
+    public function testGetMetaData()
+    {
+        $time = time();
+        $this->handler->save(self::$key1, 'value');
+
+        $actual = $this->handler->getMetaData(self::$key1);
+
+        // This test is time-dependent, and depending on the timing,
+        // seconds in `$time` (e.g. 12:00:00.9999) and seconds of
+        // `$this->memcachedHandler->save()` (e.g. 12:00:01.0000)
+        // may be off by one second. In that case, the following calculation
+        // will result in maximum of (60 + 1).
+        $this->assertLessThanOrEqual(60 + 1, $actual['expire'] - $time);
+
+        $this->assertLessThanOrEqual(1, $actual['mtime'] - $time);
+        $this->assertSame('value', $actual['data']);
+    }
+}
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index f60c2d0f1248..3f82375354fe 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -12,18 +12,14 @@
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\CLI\CLI;
-use CodeIgniter\Test\CIUnitTestCase;
 use Config\Cache;
 
 /**
  * @internal
  */
-final class FileHandlerTest extends CIUnitTestCase
+final class FileHandlerTest extends AbstractHandlerTest
 {
     private static $directory = 'FileHandler';
-    private static $key1      = 'key1';
-    private static $key2      = 'key2';
-    private static $key3      = 'key3';
 
     private static function getKeyArray()
     {
@@ -34,8 +30,6 @@ private static function getKeyArray()
         ];
     }
 
-    private static $dummy = 'dymmy';
-    private $handler;
     private $config;
 
     protected function setUp(): void
@@ -252,19 +246,6 @@ public function testClean()
         $this->handler->save(self::$key2, 'value');
     }
 
-    public function testGetMetaData()
-    {
-        $time = time();
-        $this->handler->save(self::$key1, 'value');
-
-        $this->assertFalse($this->handler->getMetaData(self::$dummy));
-
-        $actual = $this->handler->getMetaData(self::$key1);
-        $this->assertLessThanOrEqual(60, $actual['expire'] - $time);
-        $this->assertLessThanOrEqual(1, $actual['mtime'] - $time);
-        $this->assertSame('value', $actual['data']);
-    }
-
     public function testGetCacheInfo()
     {
         $this->handler->save(self::$key1, 'value');
@@ -339,6 +320,11 @@ public function testFileHandler()
         $this->assertArrayHasKey('executable', $actual);
         $this->assertArrayHasKey('fileperms', $actual);
     }
+
+    public function testGetMetaDataMiss()
+    {
+        $this->assertFalse($this->handler->getMetaData(self::$dummy));
+    }
 }
 
 final class BaseTestFileHandler extends FileHandler
diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
index 40fe5702e4e7..af2e0a77775c 100644
--- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php
+++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
@@ -12,20 +12,14 @@
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\CLI\CLI;
-use CodeIgniter\Test\CIUnitTestCase;
 use Config\Cache;
 use Exception;
 
 /**
  * @internal
  */
-final class MemcachedHandlerTest extends CIUnitTestCase
+final class MemcachedHandlerTest extends AbstractHandlerTest
 {
-    private $handler;
-    private static $key1 = 'key1';
-    private static $key2 = 'key2';
-    private static $key3 = 'key3';
-
     private static function getKeyArray()
     {
         return [
@@ -35,7 +29,6 @@ private static function getKeyArray()
         ];
     }
 
-    private static $dummy = 'dymmy';
     private $config;
 
     protected function setUp(): void
@@ -183,28 +176,13 @@ public function testGetCacheInfo()
         $this->assertIsArray($this->handler->getCacheInfo());
     }
 
-    public function testGetMetaData()
+    public function testIsSupported()
     {
-        $time = time();
-        $this->handler->save(self::$key1, 'value');
-
-        $this->assertFalse($this->handler->getMetaData(self::$dummy));
-
-        $actual = $this->handler->getMetaData(self::$key1);
-
-        // This test is time-dependent, and depending on the timing,
-        // seconds in `$time` (e.g. 12:00:00.9999) and seconds of
-        // `$this->memcachedHandler->save()` (e.g. 12:00:01.0000)
-        // may be off by one second. In that case, the following calculation
-        // will result in maximum of (60 + 1).
-        $this->assertLessThanOrEqual(60 + 1, $actual['expire'] - $time);
-
-        $this->assertLessThanOrEqual(1, $actual['mtime'] - $time);
-        $this->assertSame('value', $actual['data']);
+        $this->assertTrue($this->handler->isSupported());
     }
 
-    public function testIsSupported()
+    public function testGetMetaDataMiss()
     {
-        $this->assertTrue($this->handler->isSupported());
+        $this->assertFalse($this->handler->getMetaData(self::$dummy));
     }
 }
diff --git a/tests/system/Cache/Handlers/PredisHandlerTest.php b/tests/system/Cache/Handlers/PredisHandlerTest.php
index a25e02cdf205..b91ecefa2e2b 100644
--- a/tests/system/Cache/Handlers/PredisHandlerTest.php
+++ b/tests/system/Cache/Handlers/PredisHandlerTest.php
@@ -12,19 +12,13 @@
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\CLI\CLI;
-use CodeIgniter\Test\CIUnitTestCase;
 use Config\Cache;
 
 /**
  * @internal
  */
-final class PredisHandlerTest extends CIUnitTestCase
+final class PredisHandlerTest extends AbstractHandlerTest
 {
-    private $handler;
-    private static $key1 = 'key1';
-    private static $key2 = 'key2';
-    private static $key3 = 'key3';
-
     private static function getKeyArray()
     {
         return [
@@ -34,7 +28,6 @@ private static function getKeyArray()
         ];
     }
 
-    private static $dummy = 'dymmy';
     private $config;
 
     protected function setUp(): void
@@ -180,19 +173,6 @@ public function testGetCacheInfo()
         $this->assertIsArray($this->handler->getCacheInfo());
     }
 
-    public function testGetMetaData()
-    {
-        $time = time();
-        $this->handler->save(self::$key1, 'value');
-
-        $this->assertNull($this->handler->getMetaData(self::$dummy));
-
-        $actual = $this->handler->getMetaData(self::$key1);
-        $this->assertLessThanOrEqual(60, $actual['expire'] - $time);
-        $this->assertLessThanOrEqual(1, $actual['mtime'] - $time);
-        $this->assertSame('value', $actual['data']);
-    }
-
     public function testIsSupported()
     {
         $this->assertTrue($this->handler->isSupported());
diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php
index cadcd811fd43..863d9efa3b59 100644
--- a/tests/system/Cache/Handlers/RedisHandlerTest.php
+++ b/tests/system/Cache/Handlers/RedisHandlerTest.php
@@ -12,19 +12,13 @@
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\CLI\CLI;
-use CodeIgniter\Test\CIUnitTestCase;
 use Config\Cache;
 
 /**
  * @internal
  */
-final class RedisHandlerTest extends CIUnitTestCase
+final class RedisHandlerTest extends AbstractHandlerTest
 {
-    private $handler;
-    private static $key1 = 'key1';
-    private static $key2 = 'key2';
-    private static $key3 = 'key3';
-
     private static function getKeyArray()
     {
         return [
@@ -34,7 +28,6 @@ private static function getKeyArray()
         ];
     }
 
-    private static $dummy = 'dymmy';
     private $config;
 
     protected function setUp(): void
@@ -192,19 +185,6 @@ public function testGetCacheInfo()
         $this->assertIsArray($this->handler->getCacheInfo());
     }
 
-    public function testGetMetaData()
-    {
-        $time = time();
-        $this->handler->save(self::$key1, 'value');
-
-        $this->assertNull($this->handler->getMetaData(self::$dummy));
-
-        $actual = $this->handler->getMetaData(self::$key1);
-        $this->assertLessThanOrEqual(60, $actual['expire'] - $time);
-        $this->assertLessThanOrEqual(1, $actual['mtime'] - $time);
-        $this->assertSame('value', $actual['data']);
-    }
-
     public function testIsSupported()
     {
         $this->assertTrue($this->handler->isSupported());

From 53d6c889bda64fe851f1dcd1999c4b775e444640 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 8 Oct 2021 19:27:34 +0900
Subject: [PATCH 0434/2325] test: add @TODO in comments

---
 system/Cache/Handlers/FileHandler.php      | 2 +-
 system/Cache/Handlers/MemcachedHandler.php | 2 +-
 system/Cache/Handlers/WincacheHandler.php  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php
index b6b1cb9c3525..a7df6971b4bc 100644
--- a/system/Cache/Handlers/FileHandler.php
+++ b/system/Cache/Handlers/FileHandler.php
@@ -206,7 +206,7 @@ public function getMetaData(string $key)
         $key = static::validateKey($key, $this->prefix);
 
         if (false === $data = $this->getItem($key)) {
-            return false; // This will return null in a future release
+            return false; // @TODO This will return null in a future release
         }
 
         return [
diff --git a/system/Cache/Handlers/MemcachedHandler.php b/system/Cache/Handlers/MemcachedHandler.php
index 2667abca92a6..93c8cc59e0b5 100644
--- a/system/Cache/Handlers/MemcachedHandler.php
+++ b/system/Cache/Handlers/MemcachedHandler.php
@@ -251,7 +251,7 @@ public function getMetaData(string $key)
 
         // if not an array, don't try to count for PHP7.2
         if (! is_array($stored) || count($stored) !== 3) {
-            return false; // This will return null in a future release
+            return false; // @TODO This will return null in a future release
         }
 
         [$data, $time, $limit] = $stored;
diff --git a/system/Cache/Handlers/WincacheHandler.php b/system/Cache/Handlers/WincacheHandler.php
index 368408af7217..b13ee30c3ff6 100644
--- a/system/Cache/Handlers/WincacheHandler.php
+++ b/system/Cache/Handlers/WincacheHandler.php
@@ -131,7 +131,7 @@ public function getMetaData(string $key)
             ];
         }
 
-        return false; // This will return null in a future release
+        return false; // @TODO This will return null in a future release
     }
 
     /**

From eccac7b6cf4738432a7e258dc5d4a56abcba6546 Mon Sep 17 00:00:00 2001
From: Daniel Tiringer <tiringerdaniel@tutanota.com>
Date: Fri, 8 Oct 2021 13:39:29 +0200
Subject: [PATCH 0435/2325] Add class and hover text to duplicates

---
 system/Debug/Toolbar/Collectors/Database.php | 5 ++++-
 system/Debug/Toolbar/Views/_database.tpl     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index d63cb8aaf8bb..c093068a9342 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -130,8 +130,11 @@ protected function formatTimelineData(): array
     public function display(): array
     {
         $data['queries'] = array_map(static function (array $query) {
+            $isDuplicate = $query['duplicate'] === true;
+
             return [
-                'class'    => isset($query['duplicate']) ? 'duplicate' : '',
+                'hover'    => $isDuplicate ? 'This query was called more than once.' : '',
+                'class'    => $isDuplicate ? 'duplicate' : '',
                 'duration' => ((float) $query['query']->getDuration(5) * 1000) . ' ms',
                 'sql'      => $query['query']->debugToolbarDisplay(),
             ];
diff --git a/system/Debug/Toolbar/Views/_database.tpl b/system/Debug/Toolbar/Views/_database.tpl
index b5cf1a43a7d7..a373b56b5256 100644
--- a/system/Debug/Toolbar/Views/_database.tpl
+++ b/system/Debug/Toolbar/Views/_database.tpl
@@ -7,7 +7,7 @@
     </thead>
     <tbody>
     {queries}
-        <tr>
+        <tr class="{class}" title="{hover}">
             <td class="narrow">{duration}</td>
             <td>{! sql !}</td>
         </tr>

From 027e41ba4a7441c201c368cafba67f937262a35f Mon Sep 17 00:00:00 2001
From: Daniel Tiringer <tiringerdaniel@tutanota.com>
Date: Fri, 8 Oct 2021 13:47:48 +0200
Subject: [PATCH 0436/2325] Add css class to mark duplicates

---
 system/Debug/Toolbar/Views/toolbar.css | 67 ++++++++------------------
 1 file changed, 20 insertions(+), 47 deletions(-)

diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
index 7382f4d7e60a..f0a5271535d4 100644
--- a/system/Debug/Toolbar/Views/toolbar.css
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -1,10 +1,9 @@
-/**
- * This file is part of the 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.
+/*! CodeIgniter 4 - Debug bar
+ * ============================================================================
+ * Forum: 	https://forum.codeigniter.com
+ * Github:	https://github.com/codeigniter4/codeigniter4
+ * Slack: 	https://codeigniterchat.slack.com
+ * Website: https://codeigniter.com
  */
 #debug-icon {
   bottom: 0;
@@ -118,6 +117,7 @@
     overflow: hidden;
     overflow-y: auto;
     padding: 0 12px 0 12px;
+    /* give room for OS X scrollbar */
     white-space: nowrap;
     z-index: 10000; }
   #debug-bar.fixed-top {
@@ -200,14 +200,7 @@
       padding: 5px;
       position: relative; }
       #debug-bar .timeline td:first-child {
-        border-left: 0;
-        max-width: none; }
-      #debug-bar .timeline td.child-container {
-        padding: 0px; }
-        #debug-bar .timeline td.child-container .timeline {
-          margin: 0px; }
-          #debug-bar .timeline td.child-container .timeline td:first-child:not(.child-container) {
-            padding-left: calc(5px + 10px * var(--level)); }
+        border-left: 0; }
     #debug-bar .timeline .timer {
       border-radius: 4px;
       -moz-border-radius: 4px;
@@ -216,22 +209,6 @@
       padding: 5px;
       position: absolute;
       top: 30%; }
-    #debug-bar .timeline .timeline-parent {
-      cursor: pointer; }
-      #debug-bar .timeline .timeline-parent td:first-child nav {
-        background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxwYXRoIGQ9Ik02IDdoMThsLTkgMTV6bTAgMzBoMThsLTkgMTV6bTAgNDVoMThsLTktMTV6bTAgMzBoMThsLTktMTV6bTAgMTJsMTggMThtLTE4IDBsMTgtMTgiIGZpbGw9IiM1NTUiLz48cGF0aCBkPSJNNiAxMjZsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSIjNTU1Ii8+PC9zdmc+") no-repeat scroll 0 0/15px 75px transparent;
-        background-position: 0 25%;
-        display: inline-block;
-        height: 15px;
-        width: 15px;
-        margin-right: 3px;
-        vertical-align: middle; }
-    #debug-bar .timeline .timeline-parent-open {
-      background-color: #DFDFDF; }
-      #debug-bar .timeline .timeline-parent-open td:first-child nav {
-        background-position: 0 75%; }
-    #debug-bar .timeline .child-row:hover {
-      background: transparent; }
   #debug-bar .route-params,
   #debug-bar .route-params-item {
     vertical-align: top; }
@@ -267,9 +244,7 @@
   box-shadow: 0 0 4px #DFDFDF;
   -moz-box-shadow: 0 0 4px #DFDFDF;
   -webkit-box-shadow: 0 0 4px #DFDFDF; }
-  #debug-icon a:active,
-  #debug-icon a:link,
-  #debug-icon a:visited {
+  #debug-icon a:active, #debug-icon a:link, #debug-icon a:visited {
     color: #DD8615; }
 
 #debug-bar {
@@ -292,7 +267,7 @@
   #debug-bar button {
     background-color: #FFFFFF; }
   #debug-bar table strong {
-    color: #DD8615; }
+    color: #FDC894; }
   #debug-bar table tbody tr:hover {
     background-color: #DFDFDF; }
   #debug-bar table tbody tr.current {
@@ -355,9 +330,7 @@
     box-shadow: 0 0 4px #DFDFDF;
     -moz-box-shadow: 0 0 4px #DFDFDF;
     -webkit-box-shadow: 0 0 4px #DFDFDF; }
-    #debug-icon a:active,
-    #debug-icon a:link,
-    #debug-icon a:visited {
+    #debug-icon a:active, #debug-icon a:link, #debug-icon a:visited {
       color: #DD8615; }
   #debug-bar {
     background-color: #252525;
@@ -379,7 +352,7 @@
     #debug-bar button {
       background-color: #252525; }
     #debug-bar table strong {
-      color: #DD8615; }
+      color: #FDC894; }
     #debug-bar table tbody tr:hover {
       background-color: #434343; }
     #debug-bar table tbody tr.current {
@@ -441,9 +414,7 @@
   box-shadow: 0 0 4px #DFDFDF;
   -moz-box-shadow: 0 0 4px #DFDFDF;
   -webkit-box-shadow: 0 0 4px #DFDFDF; }
-  #toolbarContainer.dark #debug-icon a:active,
-  #toolbarContainer.dark #debug-icon a:link,
-  #toolbarContainer.dark #debug-icon a:visited {
+  #toolbarContainer.dark #debug-icon a:active, #toolbarContainer.dark #debug-icon a:link, #toolbarContainer.dark #debug-icon a:visited {
     color: #DD8615; }
 
 #toolbarContainer.dark #debug-bar {
@@ -466,7 +437,7 @@
   #toolbarContainer.dark #debug-bar button {
     background-color: #252525; }
   #toolbarContainer.dark #debug-bar table strong {
-    color: #DD8615; }
+    color: #FDC894; }
   #toolbarContainer.dark #debug-bar table tbody tr:hover {
     background-color: #434343; }
   #toolbarContainer.dark #debug-bar table tbody tr.current {
@@ -534,9 +505,7 @@
   box-shadow: 0 0 4px #DFDFDF;
   -moz-box-shadow: 0 0 4px #DFDFDF;
   -webkit-box-shadow: 0 0 4px #DFDFDF; }
-  #toolbarContainer.light #debug-icon a:active,
-  #toolbarContainer.light #debug-icon a:link,
-  #toolbarContainer.light #debug-icon a:visited {
+  #toolbarContainer.light #debug-icon a:active, #toolbarContainer.light #debug-icon a:link, #toolbarContainer.light #debug-icon a:visited {
     color: #DD8615; }
 
 #toolbarContainer.light #debug-bar {
@@ -559,7 +528,7 @@
   #toolbarContainer.light #debug-bar button {
     background-color: #FFFFFF; }
   #toolbarContainer.light #debug-bar table strong {
-    color: #DD8615; }
+    color: #FDC894; }
   #toolbarContainer.light #debug-bar table tbody tr:hover {
     background-color: #DFDFDF; }
   #toolbarContainer.light #debug-bar table tbody tr.current {
@@ -645,3 +614,7 @@
 
 .debug-bar-noverflow {
   overflow: hidden; }
+
+#ci-database table tbody tr.duplicate {
+  background-color: #DD4814;
+}

From 4ea6493f4cd41b459419528056ebd86c0cb8b029 Mon Sep 17 00:00:00 2001
From: Daniel Tiringer <tiringerdaniel@tutanota.com>
Date: Fri, 8 Oct 2021 13:56:41 +0200
Subject: [PATCH 0437/2325] Correct the accidentally modified css

---
 system/Debug/Toolbar/Views/toolbar.css | 66 +++++++++++++++++++-------
 1 file changed, 48 insertions(+), 18 deletions(-)

diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
index f0a5271535d4..5f971ba7172a 100644
--- a/system/Debug/Toolbar/Views/toolbar.css
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -1,9 +1,10 @@
-/*! CodeIgniter 4 - Debug bar
- * ============================================================================
- * Forum: 	https://forum.codeigniter.com
- * Github:	https://github.com/codeigniter4/codeigniter4
- * Slack: 	https://codeigniterchat.slack.com
- * Website: https://codeigniter.com
+/**
+ * This file is part of the 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.
  */
 #debug-icon {
   bottom: 0;
@@ -117,7 +118,6 @@
     overflow: hidden;
     overflow-y: auto;
     padding: 0 12px 0 12px;
-    /* give room for OS X scrollbar */
     white-space: nowrap;
     z-index: 10000; }
   #debug-bar.fixed-top {
@@ -200,7 +200,14 @@
       padding: 5px;
       position: relative; }
       #debug-bar .timeline td:first-child {
-        border-left: 0; }
+        border-left: 0;
+        max-width: none; }
+      #debug-bar .timeline td.child-container {
+        padding: 0px; }
+        #debug-bar .timeline td.child-container .timeline {
+          margin: 0px; }
+          #debug-bar .timeline td.child-container .timeline td:first-child:not(.child-container) {
+            padding-left: calc(5px + 10px * var(--level)); }
     #debug-bar .timeline .timer {
       border-radius: 4px;
       -moz-border-radius: 4px;
@@ -209,6 +216,22 @@
       padding: 5px;
       position: absolute;
       top: 30%; }
+    #debug-bar .timeline .timeline-parent {
+      cursor: pointer; }
+      #debug-bar .timeline .timeline-parent td:first-child nav {
+        background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxwYXRoIGQ9Ik02IDdoMThsLTkgMTV6bTAgMzBoMThsLTkgMTV6bTAgNDVoMThsLTktMTV6bTAgMzBoMThsLTktMTV6bTAgMTJsMTggMThtLTE4IDBsMTgtMTgiIGZpbGw9IiM1NTUiLz48cGF0aCBkPSJNNiAxMjZsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSIjNTU1Ii8+PC9zdmc+") no-repeat scroll 0 0/15px 75px transparent;
+        background-position: 0 25%;
+        display: inline-block;
+        height: 15px;
+        width: 15px;
+        margin-right: 3px;
+        vertical-align: middle; }
+    #debug-bar .timeline .timeline-parent-open {
+      background-color: #DFDFDF; }
+      #debug-bar .timeline .timeline-parent-open td:first-child nav {
+        background-position: 0 75%; }
+    #debug-bar .timeline .child-row:hover {
+      background: transparent; }
   #debug-bar .route-params,
   #debug-bar .route-params-item {
     vertical-align: top; }
@@ -244,7 +267,9 @@
   box-shadow: 0 0 4px #DFDFDF;
   -moz-box-shadow: 0 0 4px #DFDFDF;
   -webkit-box-shadow: 0 0 4px #DFDFDF; }
-  #debug-icon a:active, #debug-icon a:link, #debug-icon a:visited {
+  #debug-icon a:active,
+  #debug-icon a:link,
+  #debug-icon a:visited {
     color: #DD8615; }
 
 #debug-bar {
@@ -267,7 +292,7 @@
   #debug-bar button {
     background-color: #FFFFFF; }
   #debug-bar table strong {
-    color: #FDC894; }
+    color: #DD8615; }
   #debug-bar table tbody tr:hover {
     background-color: #DFDFDF; }
   #debug-bar table tbody tr.current {
@@ -330,7 +355,9 @@
     box-shadow: 0 0 4px #DFDFDF;
     -moz-box-shadow: 0 0 4px #DFDFDF;
     -webkit-box-shadow: 0 0 4px #DFDFDF; }
-    #debug-icon a:active, #debug-icon a:link, #debug-icon a:visited {
+    #debug-icon a:active,
+    #debug-icon a:link,
+    #debug-icon a:visited {
       color: #DD8615; }
   #debug-bar {
     background-color: #252525;
@@ -352,7 +379,7 @@
     #debug-bar button {
       background-color: #252525; }
     #debug-bar table strong {
-      color: #FDC894; }
+      color: #DD8615; }
     #debug-bar table tbody tr:hover {
       background-color: #434343; }
     #debug-bar table tbody tr.current {
@@ -414,7 +441,9 @@
   box-shadow: 0 0 4px #DFDFDF;
   -moz-box-shadow: 0 0 4px #DFDFDF;
   -webkit-box-shadow: 0 0 4px #DFDFDF; }
-  #toolbarContainer.dark #debug-icon a:active, #toolbarContainer.dark #debug-icon a:link, #toolbarContainer.dark #debug-icon a:visited {
+  #toolbarContainer.dark #debug-icon a:active,
+  #toolbarContainer.dark #debug-icon a:link,
+  #toolbarContainer.dark #debug-icon a:visited {
     color: #DD8615; }
 
 #toolbarContainer.dark #debug-bar {
@@ -437,7 +466,7 @@
   #toolbarContainer.dark #debug-bar button {
     background-color: #252525; }
   #toolbarContainer.dark #debug-bar table strong {
-    color: #FDC894; }
+    color: #DD8615; }
   #toolbarContainer.dark #debug-bar table tbody tr:hover {
     background-color: #434343; }
   #toolbarContainer.dark #debug-bar table tbody tr.current {
@@ -505,7 +534,9 @@
   box-shadow: 0 0 4px #DFDFDF;
   -moz-box-shadow: 0 0 4px #DFDFDF;
   -webkit-box-shadow: 0 0 4px #DFDFDF; }
-  #toolbarContainer.light #debug-icon a:active, #toolbarContainer.light #debug-icon a:link, #toolbarContainer.light #debug-icon a:visited {
+  #toolbarContainer.light #debug-icon a:active,
+  #toolbarContainer.light #debug-icon a:link,
+  #toolbarContainer.light #debug-icon a:visited {
     color: #DD8615; }
 
 #toolbarContainer.light #debug-bar {
@@ -528,7 +559,7 @@
   #toolbarContainer.light #debug-bar button {
     background-color: #FFFFFF; }
   #toolbarContainer.light #debug-bar table strong {
-    color: #FDC894; }
+    color: #DD8615; }
   #toolbarContainer.light #debug-bar table tbody tr:hover {
     background-color: #DFDFDF; }
   #toolbarContainer.light #debug-bar table tbody tr.current {
@@ -616,5 +647,4 @@
   overflow: hidden; }
 
 #ci-database table tbody tr.duplicate {
-  background-color: #DD4814;
-}
+  background-color: #DD4814;}

From 674af492e9c9d07719fb73f86b984e606a60619f Mon Sep 17 00:00:00 2001
From: Daniel Tiringer <tiringerdaniel@tutanota.com>
Date: Fri, 8 Oct 2021 23:15:49 +0200
Subject: [PATCH 0438/2325] Use the hover colors to highlight duplicates

---
 system/Debug/Toolbar/Views/toolbar.css | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
index 5f971ba7172a..b5a223b55d70 100644
--- a/system/Debug/Toolbar/Views/toolbar.css
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -471,6 +471,8 @@
     background-color: #434343; }
   #toolbarContainer.dark #debug-bar table tbody tr.current {
     background-color: #FDC894; }
+  #toolbarContainer.dark #ci-database table tbody tr.duplicate {
+    background-color: #434343;}
     #toolbarContainer.dark #debug-bar table tbody tr.current td {
       color: #252525; }
     #toolbarContainer.dark #debug-bar table tbody tr.current:hover td {
@@ -564,6 +566,8 @@
     background-color: #DFDFDF; }
   #toolbarContainer.light #debug-bar table tbody tr.current {
     background-color: #FDC894; }
+  #toolbarContainer.light #ci-database table tbody tr.duplicate {
+    background-color: #DFDFDF;}
     #toolbarContainer.light #debug-bar table tbody tr.current:hover td {
       background-color: #DD4814;
       color: #FFFFFF; }
@@ -645,6 +649,3 @@
 
 .debug-bar-noverflow {
   overflow: hidden; }
-
-#ci-database table tbody tr.duplicate {
-  background-color: #DD4814;}

From b2560d56c5b0b048ba73d872be8340c78285af52 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 10 Oct 2021 22:15:35 +0900
Subject: [PATCH 0439/2325] docs: move PULL_REQUEST_TEMPLATE.md to .github/

---
 PULL_REQUEST_TEMPLATE.md => .github/PULL_REQUEST_TEMPLATE.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename PULL_REQUEST_TEMPLATE.md => .github/PULL_REQUEST_TEMPLATE.md (100%)

diff --git a/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from PULL_REQUEST_TEMPLATE.md
rename to .github/PULL_REQUEST_TEMPLATE.md

From 7f88eceabbcf0cb128992ffe27cc77d6abec5deb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 10 Oct 2021 22:16:54 +0900
Subject: [PATCH 0440/2325] docs: replace PHPdoc with PHPDoc

---
 .github/PULL_REQUEST_TEMPLATE.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index db5aeb9eca37..eb50d54c4c4f 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,7 +5,7 @@ Explain what you have changed, and why.
 
 **Checklist:**
 - [ ] Securely signed commits
-- [ ] Component(s) with PHPdocs
+- [ ] Component(s) with PHPDocs
 - [ ] Unit testing, with >80% coverage
 - [ ] User guide updated
 - [ ] Conforms to style guide
@@ -19,4 +19,3 @@ Explain what you have changed, and why.
 - Unsolicited pull requests will be considered, but there is no guarantee of acceptance
 - Pull requests should be from a feature branch in the contributor's fork of the repository
   to the develop branch of the project repository
-  

From aaab1bc0509d0677044d8175ed888bb696be515e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 11 Oct 2021 11:29:47 +0900
Subject: [PATCH 0441/2325] docs: update expression

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index eb50d54c4c4f..6204913fd437 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,7 +5,7 @@ Explain what you have changed, and why.
 
 **Checklist:**
 - [ ] Securely signed commits
-- [ ] Component(s) with PHPDocs
+- [ ] Component(s) with PHPDoc blocks, only if necessary or adds value
 - [ ] Unit testing, with >80% coverage
 - [ ] User guide updated
 - [ ] Conforms to style guide

From cb714b5b0c8c197e13c0373f5ac1221c549305aa Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Mon, 11 Oct 2021 17:03:05 +0800
Subject: [PATCH 0442/2325] Change behavior of `class_attributes_separation`
 rule

---
 .no-header.php-cs-fixer.dist.php              | 24 ++++++----
 .php-cs-fixer.dist.php                        | 24 ++++++----
 .../tests/_support/Models/ExampleModel.php    | 12 ++---
 .../tests/_support/Models/ExampleModel.php    | 12 ++---
 app/Config/Kint.php                           | 24 +++-------
 system/Test/Mock/MockAppConfig.php            | 44 ++++++++-----------
 system/Test/Mock/MockAutoload.php             |  3 +-
 system/Test/Mock/MockCLIConfig.php            | 40 +++++++----------
 system/Test/Mock/MockCURLRequest.php          |  1 -
 system/Test/Mock/MockConnection.php           |  2 -
 system/Test/Mock/MockServices.php             |  1 -
 tests/_support/Models/EntityModel.php         | 15 +++----
 tests/_support/Models/EventModel.php          | 13 ++----
 tests/_support/Models/FabricatorModel.php     | 15 +++----
 tests/_support/Models/JobModel.php            | 16 +++----
 tests/_support/Models/SecondaryModel.php      | 15 +++----
 tests/_support/Models/UserModel.php           | 19 +++-----
 tests/_support/Models/ValidErrorsModel.php    | 13 ++----
 tests/_support/Models/ValidModel.php          | 14 ++----
 .../Models/WithoutAutoIncrementModel.php      |  7 +--
 .../Commands/EnvironmentCommandTest.php       |  4 +-
 .../Commands/MigrationIntegrationTest.php     |  4 +-
 tests/system/Config/fixtures/Encryption.php   |  1 +
 tests/system/Config/fixtures/SimpleConfig.php |  4 +-
 tests/system/ControllerTest.php               |  1 +
 tests/system/Database/BaseConnectionTest.php  |  1 -
 tests/system/Database/ConfigTest.php          |  3 --
 tests/system/Database/Live/AliasTest.php      |  3 +-
 tests/system/Database/Live/BadQueryTest.php   |  3 +-
 tests/system/Database/Live/ConnectTest.php    |  2 -
 tests/system/Database/Live/CountTest.php      |  3 +-
 .../Live/DatabaseTestTraitCaseTest.php        |  3 +-
 tests/system/Database/Live/DeleteTest.php     |  3 +-
 tests/system/Database/Live/EmptyTest.php      |  3 +-
 tests/system/Database/Live/EscapeTest.php     |  1 -
 tests/system/Database/Live/ForgeTest.php      |  3 +-
 tests/system/Database/Live/FromTest.php       |  3 +-
 tests/system/Database/Live/GetNumRowsTest.php |  3 +-
 tests/system/Database/Live/GetTest.php        |  3 +-
 tests/system/Database/Live/GroupTest.php      |  3 +-
 tests/system/Database/Live/IncrementTest.php  |  3 +-
 tests/system/Database/Live/InsertTest.php     |  3 +-
 tests/system/Database/Live/JoinTest.php       |  3 +-
 tests/system/Database/Live/LikeTest.php       |  3 +-
 tests/system/Database/Live/LimitTest.php      |  4 +-
 tests/system/Database/Live/OrderTest.php      |  3 +-
 tests/system/Database/Live/SelectTest.php     |  3 +-
 tests/system/Database/Live/UpdateTest.php     |  3 +-
 tests/system/Database/Live/WhereTest.php      |  3 +-
 .../Database/Live/WriteTypeQueryTest.php      |  3 +-
 .../Migrations/MigrationRunnerTest.php        |  1 -
 tests/system/Entity/EntityTest.php            |  9 ----
 tests/system/HTTP/RedirectResponseTest.php    |  1 +
 tests/system/Models/InsertModelTest.php       |  2 -
 tests/system/Models/SaveModelTest.php         |  1 -
 tests/system/Models/UpdateModelTest.php       |  3 --
 tests/system/Pager/PagerTest.php              |  1 +
 .../Session/Handlers/DatabaseHandlerTest.php  |  3 +-
 .../system/Validation/CreditCardRulesTest.php |  1 +
 tests/system/Validation/FileRulesTest.php     |  1 +
 tests/system/Validation/FormatRulesTest.php   |  1 +
 tests/system/Validation/RulesTest.php         |  1 +
 tests/system/Validation/ValidationTest.php    |  1 +
 tests/system/View/ParserPluginTest.php        |  1 +
 64 files changed, 161 insertions(+), 265 deletions(-)

diff --git a/.no-header.php-cs-fixer.dist.php b/.no-header.php-cs-fixer.dist.php
index 6e0a5c09602d..a3030aa98f58 100644
--- a/.no-header.php-cs-fixer.dist.php
+++ b/.no-header.php-cs-fixer.dist.php
@@ -30,14 +30,22 @@
 $overrides = [
     // @TODO Remove once these are live in coding-standard
     'assign_null_coalescing_to_coalesce_equal' => false, // requires 7.4+
-    'control_structure_continuation_position'  => ['position' => 'same_line'],
-    'empty_loop_condition'                     => ['style' => 'while'],
-    'integer_literal_case'                     => true,
-    'modernize_strpos'                         => false, // requires 8.0+
-    'no_alternative_syntax'                    => ['fix_non_monolithic_code' => false],
-    'no_space_around_double_colon'             => true,
-    'octal_notation'                           => false, // requires 8.1+
-    'string_length_to_empty'                   => true,
+    'class_attributes_separation'              => [
+        'elements' => [
+            'const'        => 'none',
+            'property'     => 'none',
+            'method'       => 'one',
+            'trait_import' => 'none',
+        ],
+    ],
+    'control_structure_continuation_position' => ['position' => 'same_line'],
+    'empty_loop_condition'                    => ['style' => 'while'],
+    'integer_literal_case'                    => true,
+    'modernize_strpos'                        => false, // requires 8.0+
+    'no_alternative_syntax'                   => ['fix_non_monolithic_code' => false],
+    'no_space_around_double_colon'            => true,
+    'octal_notation'                          => false, // requires 8.1+
+    'string_length_to_empty'                  => true,
 ];
 
 $options = [
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 2196640dae93..743062d44a88 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -37,14 +37,22 @@
 $overrides = [
     // @TODO Remove once these are live in coding-standard
     'assign_null_coalescing_to_coalesce_equal' => false, // requires 7.4+
-    'control_structure_continuation_position'  => ['position' => 'same_line'],
-    'empty_loop_condition'                     => ['style' => 'while'],
-    'integer_literal_case'                     => true,
-    'modernize_strpos'                         => false, // requires 8.0+
-    'no_alternative_syntax'                    => ['fix_non_monolithic_code' => false],
-    'no_space_around_double_colon'             => true,
-    'octal_notation'                           => false, // requires 8.1+
-    'string_length_to_empty'                   => true,
+    'class_attributes_separation'              => [
+        'elements' => [
+            'const'        => 'none',
+            'property'     => 'none',
+            'method'       => 'one',
+            'trait_import' => 'none',
+        ],
+    ],
+    'control_structure_continuation_position' => ['position' => 'same_line'],
+    'empty_loop_condition'                    => ['style' => 'while'],
+    'integer_literal_case'                    => true,
+    'modernize_strpos'                        => false, // requires 8.0+
+    'no_alternative_syntax'                   => ['fix_non_monolithic_code' => false],
+    'no_space_around_double_colon'            => true,
+    'octal_notation'                          => false, // requires 8.1+
+    'string_length_to_empty'                  => true,
 ];
 
 $options = [
diff --git a/admin/module/tests/_support/Models/ExampleModel.php b/admin/module/tests/_support/Models/ExampleModel.php
index a71009e74f8b..f0687e9b1985 100644
--- a/admin/module/tests/_support/Models/ExampleModel.php
+++ b/admin/module/tests/_support/Models/ExampleModel.php
@@ -6,22 +6,18 @@
 
 class ExampleModel extends Model
 {
-    protected $table      = 'factories';
-    protected $primaryKey = 'id';
-
+    protected $table          = 'factories';
+    protected $primaryKey     = 'id';
     protected $returnType     = 'object';
     protected $useSoftDeletes = false;
-
-    protected $allowedFields = [
+    protected $allowedFields  = [
         'name',
         'uid',
         'class',
         'icon',
         'summary',
     ];
-
-    protected $useTimestamps = true;
-
+    protected $useTimestamps      = true;
     protected $validationRules    = [];
     protected $validationMessages = [];
     protected $skipValidation     = false;
diff --git a/admin/starter/tests/_support/Models/ExampleModel.php b/admin/starter/tests/_support/Models/ExampleModel.php
index a71009e74f8b..f0687e9b1985 100644
--- a/admin/starter/tests/_support/Models/ExampleModel.php
+++ b/admin/starter/tests/_support/Models/ExampleModel.php
@@ -6,22 +6,18 @@
 
 class ExampleModel extends Model
 {
-    protected $table      = 'factories';
-    protected $primaryKey = 'id';
-
+    protected $table          = 'factories';
+    protected $primaryKey     = 'id';
     protected $returnType     = 'object';
     protected $useSoftDeletes = false;
-
-    protected $allowedFields = [
+    protected $allowedFields  = [
         'name',
         'uid',
         'class',
         'icon',
         'summary',
     ];
-
-    protected $useTimestamps = true;
-
+    protected $useTimestamps      = true;
     protected $validationRules    = [];
     protected $validationMessages = [];
     protected $skipValidation     = false;
diff --git a/app/Config/Kint.php b/app/Config/Kint.php
index 4b52422af7d7..b1016ed57923 100644
--- a/app/Config/Kint.php
+++ b/app/Config/Kint.php
@@ -24,26 +24,19 @@ class Kint extends BaseConfig
     */
 
     public $plugins;
-
-    public $maxDepth = 6;
-
+    public $maxDepth          = 6;
     public $displayCalledFrom = true;
-
-    public $expanded = false;
+    public $expanded          = false;
 
     /*
     |--------------------------------------------------------------------------
     | RichRenderer Settings
     |--------------------------------------------------------------------------
     */
-    public $richTheme = 'aante-light.css';
-
+    public $richTheme  = 'aante-light.css';
     public $richFolder = false;
-
-    public $richSort = Renderer::SORT_FULL;
-
+    public $richSort   = Renderer::SORT_FULL;
     public $richObjectPlugins;
-
     public $richTabPlugins;
 
     /*
@@ -51,11 +44,8 @@ class Kint extends BaseConfig
     | CLI Settings
     |--------------------------------------------------------------------------
     */
-    public $cliColors = true;
-
-    public $cliForceUTF8 = false;
-
+    public $cliColors      = true;
+    public $cliForceUTF8   = false;
     public $cliDetectWidth = true;
-
-    public $cliMinWidth = 40;
+    public $cliMinWidth    = 40;
 }
diff --git a/system/Test/Mock/MockAppConfig.php b/system/Test/Mock/MockAppConfig.php
index 26fb350db12c..fe51c4d3202f 100644
--- a/system/Test/Mock/MockAppConfig.php
+++ b/system/Test/Mock/MockAppConfig.php
@@ -15,31 +15,25 @@
 
 class MockAppConfig extends App
 {
-    public $baseURL = 'http://example.com/';
-
-    public $uriProtocol = 'REQUEST_URI';
-
-    public $cookiePrefix   = '';
-    public $cookieDomain   = '';
-    public $cookiePath     = '/';
-    public $cookieSecure   = false;
-    public $cookieHTTPOnly = false;
-    public $cookieSameSite = 'Lax';
-
-    public $proxyIPs = '';
-
-    public $CSRFProtection  = false;
-    public $CSRFTokenName   = 'csrf_test_name';
-    public $CSRFHeaderName  = 'X-CSRF-TOKEN';
-    public $CSRFCookieName  = 'csrf_cookie_name';
-    public $CSRFExpire      = 7200;
-    public $CSRFRegenerate  = true;
-    public $CSRFExcludeURIs = ['http://example.com'];
-    public $CSRFRedirect    = false;
-    public $CSRFSameSite    = 'Lax';
-
-    public $CSPEnabled = false;
-
+    public $baseURL          = 'http://example.com/';
+    public $uriProtocol      = 'REQUEST_URI';
+    public $cookiePrefix     = '';
+    public $cookieDomain     = '';
+    public $cookiePath       = '/';
+    public $cookieSecure     = false;
+    public $cookieHTTPOnly   = false;
+    public $cookieSameSite   = 'Lax';
+    public $proxyIPs         = '';
+    public $CSRFProtection   = false;
+    public $CSRFTokenName    = 'csrf_test_name';
+    public $CSRFHeaderName   = 'X-CSRF-TOKEN';
+    public $CSRFCookieName   = 'csrf_cookie_name';
+    public $CSRFExpire       = 7200;
+    public $CSRFRegenerate   = true;
+    public $CSRFExcludeURIs  = ['http://example.com'];
+    public $CSRFRedirect     = false;
+    public $CSRFSameSite     = 'Lax';
+    public $CSPEnabled       = false;
     public $defaultLocale    = 'en';
     public $negotiateLocale  = false;
     public $supportedLocales = [
diff --git a/system/Test/Mock/MockAutoload.php b/system/Test/Mock/MockAutoload.php
index 26a92b2f811c..291974c65be3 100644
--- a/system/Test/Mock/MockAutoload.php
+++ b/system/Test/Mock/MockAutoload.php
@@ -15,8 +15,7 @@
 
 class MockAutoload extends Autoload
 {
-    public $psr4 = [];
-
+    public $psr4     = [];
     public $classmap = [];
 
     public function __construct()
diff --git a/system/Test/Mock/MockCLIConfig.php b/system/Test/Mock/MockCLIConfig.php
index 5c6e6b5db195..0e5f9c8dd64e 100644
--- a/system/Test/Mock/MockCLIConfig.php
+++ b/system/Test/Mock/MockCLIConfig.php
@@ -15,29 +15,23 @@
 
 class MockCLIConfig extends App
 {
-    public $baseURL = 'http://example.com/';
-
-    public $uriProtocol = 'REQUEST_URI';
-
-    public $cookiePrefix   = '';
-    public $cookieDomain   = '';
-    public $cookiePath     = '/';
-    public $cookieSecure   = false;
-    public $cookieHTTPOnly = false;
-    public $cookieSameSite = 'Lax';
-
-    public $proxyIPs = '';
-
-    public $CSRFProtection  = false;
-    public $CSRFTokenName   = 'csrf_test_name';
-    public $CSRFCookieName  = 'csrf_cookie_name';
-    public $CSRFExpire      = 7200;
-    public $CSRFRegenerate  = true;
-    public $CSRFExcludeURIs = ['http://example.com'];
-    public $CSRFSameSite    = 'Lax';
-
-    public $CSPEnabled = false;
-
+    public $baseURL          = 'http://example.com/';
+    public $uriProtocol      = 'REQUEST_URI';
+    public $cookiePrefix     = '';
+    public $cookieDomain     = '';
+    public $cookiePath       = '/';
+    public $cookieSecure     = false;
+    public $cookieHTTPOnly   = false;
+    public $cookieSameSite   = 'Lax';
+    public $proxyIPs         = '';
+    public $CSRFProtection   = false;
+    public $CSRFTokenName    = 'csrf_test_name';
+    public $CSRFCookieName   = 'csrf_cookie_name';
+    public $CSRFExpire       = 7200;
+    public $CSRFRegenerate   = true;
+    public $CSRFExcludeURIs  = ['http://example.com'];
+    public $CSRFSameSite     = 'Lax';
+    public $CSPEnabled       = false;
     public $defaultLocale    = 'en';
     public $negotiateLocale  = false;
     public $supportedLocales = [
diff --git a/system/Test/Mock/MockCURLRequest.php b/system/Test/Mock/MockCURLRequest.php
index 5b7344fe13e5..635db366234c 100644
--- a/system/Test/Mock/MockCURLRequest.php
+++ b/system/Test/Mock/MockCURLRequest.php
@@ -23,7 +23,6 @@
 class MockCURLRequest extends CURLRequest
 {
     public $curl_options;
-
     protected $output = '';
 
     public function setOutput($output)
diff --git a/system/Test/Mock/MockConnection.php b/system/Test/Mock/MockConnection.php
index 099a8b735d20..78bd405babad 100644
--- a/system/Test/Mock/MockConnection.php
+++ b/system/Test/Mock/MockConnection.php
@@ -19,9 +19,7 @@
 class MockConnection extends BaseConnection
 {
     protected $returnValues = [];
-
     public $database;
-
     public $lastQuery;
 
     public function shouldReturn(string $method, $return)
diff --git a/system/Test/Mock/MockServices.php b/system/Test/Mock/MockServices.php
index f02404a1b74e..f18700426811 100644
--- a/system/Test/Mock/MockServices.php
+++ b/system/Test/Mock/MockServices.php
@@ -19,7 +19,6 @@ class MockServices extends BaseService
     public $psr4 = [
         'Tests/Support' => TESTPATH . '_support/',
     ];
-
     public $classmap = [];
 
     public function __construct()
diff --git a/tests/_support/Models/EntityModel.php b/tests/_support/Models/EntityModel.php
index fb53549e8fa6..f2bbe35ccfd1 100644
--- a/tests/_support/Models/EntityModel.php
+++ b/tests/_support/Models/EntityModel.php
@@ -15,17 +15,12 @@
 
 class EntityModel extends Model
 {
-    protected $table = 'job';
-
-    protected $returnType = '\Tests\Support\Models\SimpleEntity';
-
+    protected $table          = 'job';
+    protected $returnType     = '\Tests\Support\Models\SimpleEntity';
     protected $useSoftDeletes = false;
-
-    protected $dateFormat = 'int';
-
-    protected $deletedField = 'deleted_at';
-
-    protected $allowedFields = [
+    protected $dateFormat     = 'int';
+    protected $deletedField   = 'deleted_at';
+    protected $allowedFields  = [
         'name',
         'description',
         'created_at',
diff --git a/tests/_support/Models/EventModel.php b/tests/_support/Models/EventModel.php
index 8b8a947efcc6..c3e0a145509b 100644
--- a/tests/_support/Models/EventModel.php
+++ b/tests/_support/Models/EventModel.php
@@ -15,21 +15,16 @@
 
 class EventModel extends Model
 {
-    protected $table = 'user';
-
-    protected $returnType = 'array';
-
+    protected $table          = 'user';
+    protected $returnType     = 'array';
     protected $useSoftDeletes = false;
-
-    protected $dateFormat = 'datetime';
-
-    protected $allowedFields = [
+    protected $dateFormat     = 'datetime';
+    protected $allowedFields  = [
         'name',
         'email',
         'country',
         'deleted_at',
     ];
-
     protected $beforeInsert = ['beforeInsertMethod'];
     protected $afterInsert  = ['afterInsertMethod'];
     protected $beforeUpdate = ['beforeUpdateMethod'];
diff --git a/tests/_support/Models/FabricatorModel.php b/tests/_support/Models/FabricatorModel.php
index 1c40e7e1464e..70efeeb5c942 100644
--- a/tests/_support/Models/FabricatorModel.php
+++ b/tests/_support/Models/FabricatorModel.php
@@ -16,17 +16,12 @@
 
 class FabricatorModel extends Model
 {
-    protected $table = 'job';
-
-    protected $returnType = 'object';
-
+    protected $table          = 'job';
+    protected $returnType     = 'object';
     protected $useSoftDeletes = true;
-
-    protected $useTimestamps = true;
-
-    protected $dateFormat = 'int';
-
-    protected $allowedFields = [
+    protected $useTimestamps  = true;
+    protected $dateFormat     = 'int';
+    protected $allowedFields  = [
         'name',
         'description',
     ];
diff --git a/tests/_support/Models/JobModel.php b/tests/_support/Models/JobModel.php
index 06b967af7a89..7f5044dddc61 100644
--- a/tests/_support/Models/JobModel.php
+++ b/tests/_support/Models/JobModel.php
@@ -15,20 +15,14 @@
 
 class JobModel extends Model
 {
-    protected $table = 'job';
-
-    protected $returnType = 'object';
-
+    protected $table          = 'job';
+    protected $returnType     = 'object';
     protected $useSoftDeletes = false;
-
-    protected $dateFormat = 'int';
-
-    protected $allowedFields = [
+    protected $dateFormat     = 'int';
+    protected $allowedFields  = [
         'name',
         'description',
     ];
-
-    public $name = '';
-
+    public $name        = '';
     public $description = '';
 }
diff --git a/tests/_support/Models/SecondaryModel.php b/tests/_support/Models/SecondaryModel.php
index b4ef155a5aa9..aff1c2646e14 100644
--- a/tests/_support/Models/SecondaryModel.php
+++ b/tests/_support/Models/SecondaryModel.php
@@ -15,17 +15,12 @@
 
 class SecondaryModel extends Model
 {
-    protected $table = 'secondary';
-
-    protected $primaryKey = 'id';
-
-    protected $returnType = 'object';
-
+    protected $table          = 'secondary';
+    protected $primaryKey     = 'id';
+    protected $returnType     = 'object';
     protected $useSoftDeletes = false;
-
-    protected $dateFormat = 'int';
-
-    protected $allowedFields = [
+    protected $dateFormat     = 'int';
+    protected $allowedFields  = [
         'key',
         'value',
     ];
diff --git a/tests/_support/Models/UserModel.php b/tests/_support/Models/UserModel.php
index 7e68c3441803..07c678fb5db5 100644
--- a/tests/_support/Models/UserModel.php
+++ b/tests/_support/Models/UserModel.php
@@ -15,24 +15,17 @@
 
 class UserModel extends Model
 {
-    protected $table = 'user';
-
+    protected $table         = 'user';
     protected $allowedFields = [
         'name',
         'email',
         'country',
         'deleted_at',
     ];
-
-    protected $returnType = 'object';
-
+    protected $returnType     = 'object';
     protected $useSoftDeletes = true;
-
-    protected $dateFormat = 'datetime';
-
-    public $name = '';
-
-    public $email = '';
-
-    public $country = '';
+    protected $dateFormat     = 'datetime';
+    public $name              = '';
+    public $email             = '';
+    public $country           = '';
 }
diff --git a/tests/_support/Models/ValidErrorsModel.php b/tests/_support/Models/ValidErrorsModel.php
index 04ff1a98f715..e05f801a6983 100644
--- a/tests/_support/Models/ValidErrorsModel.php
+++ b/tests/_support/Models/ValidErrorsModel.php
@@ -15,19 +15,14 @@
 
 class ValidErrorsModel extends Model
 {
-    protected $table = 'job';
-
-    protected $returnType = 'object';
-
+    protected $table          = 'job';
+    protected $returnType     = 'object';
     protected $useSoftDeletes = false;
-
-    protected $dateFormat = 'int';
-
-    protected $allowedFields = [
+    protected $dateFormat     = 'int';
+    protected $allowedFields  = [
         'name',
         'description',
     ];
-
     protected $validationRules = [
         'name' => [
             'required',
diff --git a/tests/_support/Models/ValidModel.php b/tests/_support/Models/ValidModel.php
index 730985ad8142..216f80cc3f87 100644
--- a/tests/_support/Models/ValidModel.php
+++ b/tests/_support/Models/ValidModel.php
@@ -15,19 +15,14 @@
 
 class ValidModel extends Model
 {
-    protected $table = 'job';
-
-    protected $returnType = 'object';
-
+    protected $table          = 'job';
+    protected $returnType     = 'object';
     protected $useSoftDeletes = false;
-
-    protected $dateFormat = 'int';
-
-    protected $allowedFields = [
+    protected $dateFormat     = 'int';
+    protected $allowedFields  = [
         'name',
         'description',
     ];
-
     protected $validationRules = [
         'name' => [
             'required',
@@ -35,7 +30,6 @@ class ValidModel extends Model
         ],
         'token' => 'permit_empty|in_list[{id}]',
     ];
-
     protected $validationMessages = [
         'name' => [
             'required'   => 'You forgot to name the baby.',
diff --git a/tests/_support/Models/WithoutAutoIncrementModel.php b/tests/_support/Models/WithoutAutoIncrementModel.php
index 248fd3af1134..dcbb8c4aba3c 100644
--- a/tests/_support/Models/WithoutAutoIncrementModel.php
+++ b/tests/_support/Models/WithoutAutoIncrementModel.php
@@ -15,14 +15,11 @@
 
 class WithoutAutoIncrementModel extends Model
 {
-    protected $table = 'without_auto_increment';
-
-    protected $primaryKey = 'key';
-
+    protected $table         = 'without_auto_increment';
+    protected $primaryKey    = 'key';
     protected $allowedFields = [
         'key',
         'value',
     ];
-
     protected $useAutoIncrement = false;
 }
diff --git a/tests/system/Commands/EnvironmentCommandTest.php b/tests/system/Commands/EnvironmentCommandTest.php
index bd7f04ff3121..e81fe65ec622 100644
--- a/tests/system/Commands/EnvironmentCommandTest.php
+++ b/tests/system/Commands/EnvironmentCommandTest.php
@@ -20,9 +20,7 @@
 final class EnvironmentCommandTest extends CIUnitTestCase
 {
     private $streamFilter;
-
-    private $envPath = ROOTPATH . '.env';
-
+    private $envPath       = ROOTPATH . '.env';
     private $backupEnvPath = ROOTPATH . '.env.backup';
 
     protected function setUp(): void
diff --git a/tests/system/Commands/MigrationIntegrationTest.php b/tests/system/Commands/MigrationIntegrationTest.php
index 77c047ef82ae..f2fca3405354 100644
--- a/tests/system/Commands/MigrationIntegrationTest.php
+++ b/tests/system/Commands/MigrationIntegrationTest.php
@@ -20,10 +20,8 @@
 final class MigrationIntegrationTest extends CIUnitTestCase
 {
     private $streamFilter;
-
     private $migrationFileFrom = SUPPORTPATH . 'Database/Migrations/20160428212500_Create_test_tables.php';
-
-    private $migrationFileTo = APPPATH . 'Database/Migrations/20160428212500_Create_test_tables.php';
+    private $migrationFileTo   = APPPATH . 'Database/Migrations/20160428212500_Create_test_tables.php';
 
     protected function setUp(): void
     {
diff --git a/tests/system/Config/fixtures/Encryption.php b/tests/system/Config/fixtures/Encryption.php
index 2793795f56ff..7a8a00bc03fe 100644
--- a/tests/system/Config/fixtures/Encryption.php
+++ b/tests/system/Config/fixtures/Encryption.php
@@ -15,6 +15,7 @@ class Encryption extends EncryptionConfig
 {
     private const HEX2BIN = 'hex2bin:84cf2c0811d5daf9e1c897825a3debce91f9a33391e639f72f7a4740b30675a2';
     private const BASE64  = 'base64:Psf8bUHRh1UJYG2M7e+5ec3MdjpKpzAr0twamcAvOcI=';
+
     public $key;
     public $driver = 'MCrypt';
 
diff --git a/tests/system/Config/fixtures/SimpleConfig.php b/tests/system/Config/fixtures/SimpleConfig.php
index d5d2665f657e..69f5590e90f1 100644
--- a/tests/system/Config/fixtures/SimpleConfig.php
+++ b/tests/system/Config/fixtures/SimpleConfig.php
@@ -25,7 +25,8 @@ class SimpleConfig extends \CodeIgniter\Config\BaseConfig
     public $simple = [
         'name' => null,
     ];
-    // properties for environment over-ride testing
+
+    // properties for environment override testing
     public $alpha   = 'one';
     public $bravo   = 'two';
     public $charlie = 'three';
@@ -41,7 +42,6 @@ class SimpleConfig extends \CodeIgniter\Config\BaseConfig
         'doctor'  => 'Bones',
         'comms'   => 'Uhuru',
     ];
-
     public $shortie;
     public $longie;
     public $onedeep_value;
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index 3d7c205eec0b..d4be0c503b7a 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -56,6 +56,7 @@ final class ControllerTest extends CIUnitTestCase
      * @var Response
      */
     protected $response;
+
     /**
      * @var LoggerInterface
      */
diff --git a/tests/system/Database/BaseConnectionTest.php b/tests/system/Database/BaseConnectionTest.php
index 85126836650f..7d2352a0e9b2 100644
--- a/tests/system/Database/BaseConnectionTest.php
+++ b/tests/system/Database/BaseConnectionTest.php
@@ -39,7 +39,6 @@ final class BaseConnectionTest extends CIUnitTestCase
         'strictOn' => true,
         'failover' => [],
     ];
-
     protected $failoverOptions = [
         'DSN'      => '',
         'hostname' => 'localhost',
diff --git a/tests/system/Database/ConfigTest.php b/tests/system/Database/ConfigTest.php
index d4f795dcc26b..0dc9a1619485 100644
--- a/tests/system/Database/ConfigTest.php
+++ b/tests/system/Database/ConfigTest.php
@@ -40,7 +40,6 @@ final class ConfigTest extends CIUnitTestCase
         'failover' => [],
         'port'     => 3306,
     ];
-
     protected $dsnGroup = [
         'DSN'      => 'MySQLi://user:pass@localhost:3306/dbname?DBPrefix=test_&pConnect=true&charset=latin1&DBCollat=latin1_swedish_ci',
         'hostname' => '',
@@ -60,7 +59,6 @@ final class ConfigTest extends CIUnitTestCase
         'failover' => [],
         'port'     => 3306,
     ];
-
     protected $dsnGroupPostgre = [
         'DSN'      => 'Postgre://user:pass@localhost:5432/dbname?DBPrefix=test_&connect_timeout=5&sslmode=1',
         'hostname' => '',
@@ -80,7 +78,6 @@ final class ConfigTest extends CIUnitTestCase
         'failover' => [],
         'port'     => 5432,
     ];
-
     protected $dsnGroupPostgreNative = [
         'DSN'      => 'pgsql:host=localhost;port=5432;dbname=database_name',
         'hostname' => '',
diff --git a/tests/system/Database/Live/AliasTest.php b/tests/system/Database/Live/AliasTest.php
index 0024625ce5b5..c032cd1b6546 100644
--- a/tests/system/Database/Live/AliasTest.php
+++ b/tests/system/Database/Live/AliasTest.php
@@ -24,8 +24,7 @@ final class AliasTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     public function testAlias()
     {
diff --git a/tests/system/Database/Live/BadQueryTest.php b/tests/system/Database/Live/BadQueryTest.php
index 44a2adb0a391..b7d7840525c6 100644
--- a/tests/system/Database/Live/BadQueryTest.php
+++ b/tests/system/Database/Live/BadQueryTest.php
@@ -25,8 +25,7 @@ final class BadQueryTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
     protected static $origDebug;
 
     /**
diff --git a/tests/system/Database/Live/ConnectTest.php b/tests/system/Database/Live/ConnectTest.php
index 680f03c94ca7..5ee18a6f25eb 100644
--- a/tests/system/Database/Live/ConnectTest.php
+++ b/tests/system/Database/Live/ConnectTest.php
@@ -27,9 +27,7 @@ final class ConnectTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $group1;
-
     protected $group2;
-
     protected $tests;
 
     protected function setUp(): void
diff --git a/tests/system/Database/Live/CountTest.php b/tests/system/Database/Live/CountTest.php
index bfe917cb2adc..d87833759f24 100644
--- a/tests/system/Database/Live/CountTest.php
+++ b/tests/system/Database/Live/CountTest.php
@@ -24,8 +24,7 @@ final class CountTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     public function testCountReturnsZeroWithNoResults()
     {
diff --git a/tests/system/Database/Live/DatabaseTestTraitCaseTest.php b/tests/system/Database/Live/DatabaseTestTraitCaseTest.php
index 8e917a7d30e9..3e9267b2b05d 100644
--- a/tests/system/Database/Live/DatabaseTestTraitCaseTest.php
+++ b/tests/system/Database/Live/DatabaseTestTraitCaseTest.php
@@ -24,8 +24,7 @@ final class DatabaseTestTraitCaseTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     public function testHasInDatabase()
     {
diff --git a/tests/system/Database/Live/DeleteTest.php b/tests/system/Database/Live/DeleteTest.php
index bd3cd7d6d05c..31b89412e78a 100644
--- a/tests/system/Database/Live/DeleteTest.php
+++ b/tests/system/Database/Live/DeleteTest.php
@@ -25,8 +25,7 @@ final class DeleteTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     public function testDeleteThrowExceptionWithNoCriteria()
     {
diff --git a/tests/system/Database/Live/EmptyTest.php b/tests/system/Database/Live/EmptyTest.php
index 5dfcec87e418..912f627911c6 100644
--- a/tests/system/Database/Live/EmptyTest.php
+++ b/tests/system/Database/Live/EmptyTest.php
@@ -24,8 +24,7 @@ final class EmptyTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     public function testEmpty()
     {
diff --git a/tests/system/Database/Live/EscapeTest.php b/tests/system/Database/Live/EscapeTest.php
index f5c3ff8b59c1..08265788d00e 100644
--- a/tests/system/Database/Live/EscapeTest.php
+++ b/tests/system/Database/Live/EscapeTest.php
@@ -24,7 +24,6 @@ final class EscapeTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = false;
-
     protected $char;
 
     protected function setUp(): void
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index d459bc92e391..1f8d8108d42d 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -29,8 +29,7 @@ final class ForgeTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     /**
      * @var Forge
diff --git a/tests/system/Database/Live/FromTest.php b/tests/system/Database/Live/FromTest.php
index 6a17f800e55a..5037dd717f71 100644
--- a/tests/system/Database/Live/FromTest.php
+++ b/tests/system/Database/Live/FromTest.php
@@ -24,8 +24,7 @@ final class FromTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     public function testFromCanAddTables()
     {
diff --git a/tests/system/Database/Live/GetNumRowsTest.php b/tests/system/Database/Live/GetNumRowsTest.php
index bfa982d5d6a5..791fef5acf39 100644
--- a/tests/system/Database/Live/GetNumRowsTest.php
+++ b/tests/system/Database/Live/GetNumRowsTest.php
@@ -22,8 +22,7 @@ final class GetNumRowsTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     /**
      * Added as instructed at https://codeigniter4.github.io/userguide/testing/database.html#the-test-class
diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php
index a2f1aa4f9b89..2682f12e57ca 100644
--- a/tests/system/Database/Live/GetTest.php
+++ b/tests/system/Database/Live/GetTest.php
@@ -25,8 +25,7 @@ final class GetTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     public function testGet()
     {
diff --git a/tests/system/Database/Live/GroupTest.php b/tests/system/Database/Live/GroupTest.php
index 9ef9da758fff..705172ac97f0 100644
--- a/tests/system/Database/Live/GroupTest.php
+++ b/tests/system/Database/Live/GroupTest.php
@@ -24,8 +24,7 @@ final class GroupTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     public function testGroupBy()
     {
diff --git a/tests/system/Database/Live/IncrementTest.php b/tests/system/Database/Live/IncrementTest.php
index d53732464f56..bb5faccf4e15 100644
--- a/tests/system/Database/Live/IncrementTest.php
+++ b/tests/system/Database/Live/IncrementTest.php
@@ -24,8 +24,7 @@ final class IncrementTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     public function testIncrement()
     {
diff --git a/tests/system/Database/Live/InsertTest.php b/tests/system/Database/Live/InsertTest.php
index 8ca40e2309ef..a5bd090b7578 100644
--- a/tests/system/Database/Live/InsertTest.php
+++ b/tests/system/Database/Live/InsertTest.php
@@ -24,8 +24,7 @@ final class InsertTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     public function testInsert()
     {
diff --git a/tests/system/Database/Live/JoinTest.php b/tests/system/Database/Live/JoinTest.php
index 7e35effcc852..b30c8ac8b9bb 100644
--- a/tests/system/Database/Live/JoinTest.php
+++ b/tests/system/Database/Live/JoinTest.php
@@ -24,8 +24,7 @@ final class JoinTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     public function testSimpleJoin()
     {
diff --git a/tests/system/Database/Live/LikeTest.php b/tests/system/Database/Live/LikeTest.php
index 999539e488fc..65261f2372fb 100644
--- a/tests/system/Database/Live/LikeTest.php
+++ b/tests/system/Database/Live/LikeTest.php
@@ -24,8 +24,7 @@ final class LikeTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     public function testLikeDefault()
     {
diff --git a/tests/system/Database/Live/LimitTest.php b/tests/system/Database/Live/LimitTest.php
index ee3f8c475b79..8673b5bc486d 100644
--- a/tests/system/Database/Live/LimitTest.php
+++ b/tests/system/Database/Live/LimitTest.php
@@ -22,9 +22,9 @@
 final class LimitTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
-    protected $refresh = true;
 
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $refresh = true;
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     public function testLimit()
     {
diff --git a/tests/system/Database/Live/OrderTest.php b/tests/system/Database/Live/OrderTest.php
index 9d87089b5e79..76f7e8374f32 100644
--- a/tests/system/Database/Live/OrderTest.php
+++ b/tests/system/Database/Live/OrderTest.php
@@ -24,8 +24,7 @@ final class OrderTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     public function testOrderAscending()
     {
diff --git a/tests/system/Database/Live/SelectTest.php b/tests/system/Database/Live/SelectTest.php
index 6224633847d6..fbfa3ca97052 100644
--- a/tests/system/Database/Live/SelectTest.php
+++ b/tests/system/Database/Live/SelectTest.php
@@ -24,8 +24,7 @@ final class SelectTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     public function testSelectAllByDefault()
     {
diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index c0f1bd3575d4..f7e2fb5e4b32 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -25,8 +25,7 @@ final class UpdateTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     public function testUpdateSetsAllWithoutWhere()
     {
diff --git a/tests/system/Database/Live/WhereTest.php b/tests/system/Database/Live/WhereTest.php
index ce87bbd3c7f4..76756e19a219 100644
--- a/tests/system/Database/Live/WhereTest.php
+++ b/tests/system/Database/Live/WhereTest.php
@@ -24,8 +24,7 @@ final class WhereTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     public function testWhereSimpleKeyValue()
     {
diff --git a/tests/system/Database/Live/WriteTypeQueryTest.php b/tests/system/Database/Live/WriteTypeQueryTest.php
index 31dd848c41a2..9ec6c1c1dbe3 100644
--- a/tests/system/Database/Live/WriteTypeQueryTest.php
+++ b/tests/system/Database/Live/WriteTypeQueryTest.php
@@ -25,8 +25,7 @@ final class WriteTypeQueryTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     public function testSet()
     {
diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php
index fa867c7e1f0e..27e14c51c0f7 100644
--- a/tests/system/Database/Migrations/MigrationRunnerTest.php
+++ b/tests/system/Database/Migrations/MigrationRunnerTest.php
@@ -33,7 +33,6 @@ final class MigrationRunnerTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-
     protected $root;
     protected $start;
     protected $config;
diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php
index c995f5d7c191..94d71849c679 100644
--- a/tests/system/Entity/EntityTest.php
+++ b/tests/system/Entity/EntityTest.php
@@ -930,14 +930,12 @@ protected function getEntity()
                 'default'    => 'sumfin',
                 'created_at' => null,
             ];
-
             protected $original = [
                 'foo'        => null,
                 'bar'        => null,
                 'default'    => 'sumfin',
                 'created_at' => null,
             ];
-
             protected $datamap = [
                 'createdAt' => 'created_at',
             ];
@@ -968,7 +966,6 @@ protected function getMappedEntity()
                 'foo'    => null,
                 'simple' => null,
             ];
-
             protected $_original = [
                 'foo'    => null,
                 'simple' => null,
@@ -999,12 +996,10 @@ protected function getSwappedEntity()
                 'foo' => 'foo',
                 'bar' => 'bar',
             ];
-
             protected $_original = [
                 'foo' => 'foo',
                 'bar' => 'bar',
             ];
-
             protected $datamap = [
                 'bar'          => 'foo',
                 'foo'          => 'bar',
@@ -1031,7 +1026,6 @@ protected function getCastEntity($data = null): Entity
                 'twelfth'    => null,
                 'thirteenth' => null,
             ];
-
             protected $_original = [
                 'first'      => null,
                 'second'     => null,
@@ -1082,7 +1076,6 @@ protected function getCastNullableEntity()
                 'integer_0'             => null,
                 'string_value_not_null' => 'value',
             ];
-
             protected $_original = [
                 'string_null'           => null,
                 'string_empty'          => null,
@@ -1111,7 +1104,6 @@ protected function getCustomCastEntity()
                 'third'  => null,
                 'fourth' => null,
             ];
-
             protected $_original = [
                 'first'  => null,
                 'second' => null,
@@ -1126,7 +1118,6 @@ protected function getCustomCastEntity()
                 'third'  => 'type[param1, param2,param3]',
                 'fourth' => '?type',
             ];
-
             protected $castHandlers = [
                 'base64'   => CastBase64::class,
                 'someType' => NotExtendsBaseCast::class,
diff --git a/tests/system/HTTP/RedirectResponseTest.php b/tests/system/HTTP/RedirectResponseTest.php
index 0e8e49a74588..ac2e8abaaba9 100644
--- a/tests/system/HTTP/RedirectResponseTest.php
+++ b/tests/system/HTTP/RedirectResponseTest.php
@@ -30,6 +30,7 @@ final class RedirectResponseTest extends CIUnitTestCase
      * @var RouteCollection
      */
     protected $routes;
+
     protected $request;
     protected $config;
 
diff --git a/tests/system/Models/InsertModelTest.php b/tests/system/Models/InsertModelTest.php
index 38b86eb67e30..521dec8fbadd 100644
--- a/tests/system/Models/InsertModelTest.php
+++ b/tests/system/Models/InsertModelTest.php
@@ -165,7 +165,6 @@ public function testInsertBatchNewEntityWithDateTime(): void
             protected $deleted;
             protected $created_at;
             protected $updated_at;
-
             protected $_options = [
                 'datamap' => [],
                 'dates'   => [
@@ -223,7 +222,6 @@ public function testInsertEntityWithNoDataExceptionNoAllowedData(): void
             protected $deleted;
             protected $created_at;
             protected $updated_at;
-
             protected $_options = [
                 'datamap' => [],
                 'dates'   => [
diff --git a/tests/system/Models/SaveModelTest.php b/tests/system/Models/SaveModelTest.php
index 17f56a4cb88c..48b63c14b211 100644
--- a/tests/system/Models/SaveModelTest.php
+++ b/tests/system/Models/SaveModelTest.php
@@ -216,7 +216,6 @@ public function testSaveNewEntityWithDateTime(): void
             protected $deleted;
             protected $created_at;
             protected $updated_at;
-
             protected $_options = [
                 'datamap' => [],
                 'dates'   => [
diff --git a/tests/system/Models/UpdateModelTest.php b/tests/system/Models/UpdateModelTest.php
index 619028a748aa..888c019eca1e 100644
--- a/tests/system/Models/UpdateModelTest.php
+++ b/tests/system/Models/UpdateModelTest.php
@@ -166,7 +166,6 @@ public function testUpdateBatchWithEntity(): void
             protected $deleted;
             protected $created_at;
             protected $updated_at;
-
             protected $_options = [
                 'datamap' => [],
                 'dates'   => [
@@ -186,7 +185,6 @@ public function testUpdateBatchWithEntity(): void
             protected $deleted;
             protected $created_at;
             protected $updated_at;
-
             protected $_options = [
                 'datamap' => [],
                 'dates'   => [
@@ -315,7 +313,6 @@ public function testUpdateWithEntityNoAllowedFields(): void
             protected $deleted;
             protected $created_at;
             protected $updated_at;
-
             protected $_options = [
                 'datamap' => [],
                 'dates'   => [
diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index 72deb09c2c4c..05b069d83c21 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -29,6 +29,7 @@ final class PagerTest extends CIUnitTestCase
      * @var \CodeIgniter\Pager\Pager
      */
     protected $pager;
+
     protected $config;
 
     protected function setUp(): void
diff --git a/tests/system/Session/Handlers/DatabaseHandlerTest.php b/tests/system/Session/Handlers/DatabaseHandlerTest.php
index e001af8eeec8..2349bc292bd8 100644
--- a/tests/system/Session/Handlers/DatabaseHandlerTest.php
+++ b/tests/system/Session/Handlers/DatabaseHandlerTest.php
@@ -26,8 +26,7 @@ final class DatabaseHandlerTest extends CIUnitTestCase
     use ReflectionHelper;
 
     protected $refresh = true;
-
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
     protected function setUp(): void
     {
diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php
index a1e8f74d8a27..7610ea4ee966 100644
--- a/tests/system/Validation/CreditCardRulesTest.php
+++ b/tests/system/Validation/CreditCardRulesTest.php
@@ -24,6 +24,7 @@ final class CreditCardRulesTest extends CIUnitTestCase
      * @var Validation
      */
     protected $validation;
+
     protected $config = [
         'ruleSets' => [
             Rules::class,
diff --git a/tests/system/Validation/FileRulesTest.php b/tests/system/Validation/FileRulesTest.php
index 0e4e70ec537f..e8da364367a7 100644
--- a/tests/system/Validation/FileRulesTest.php
+++ b/tests/system/Validation/FileRulesTest.php
@@ -24,6 +24,7 @@ final class FileRulesTest extends CIUnitTestCase
      * @var Validation
      */
     protected $validation;
+
     protected $config = [
         'ruleSets' => [
             Rules::class,
diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php
index 725824607748..eb457a0c3a2f 100644
--- a/tests/system/Validation/FormatRulesTest.php
+++ b/tests/system/Validation/FormatRulesTest.php
@@ -27,6 +27,7 @@ final class FormatRulesTest extends CIUnitTestCase
      * @var Validation
      */
     protected $validation;
+
     protected $config = [
         'ruleSets' => [
             Rules::class,
diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
index f4f171b87bbb..7fe8469fcbeb 100644
--- a/tests/system/Validation/RulesTest.php
+++ b/tests/system/Validation/RulesTest.php
@@ -31,6 +31,7 @@ final class RulesTest extends CIUnitTestCase
      * @var Validation
      */
     protected $validation;
+
     protected $config = [
         'ruleSets' => [
             Rules::class,
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index ccbff3358f42..8b77686fc3b5 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -29,6 +29,7 @@ final class ValidationTest extends CIUnitTestCase
      * @var Validation
      */
     protected $validation;
+
     protected $config = [
         'ruleSets' => [
             Rules::class,
diff --git a/tests/system/View/ParserPluginTest.php b/tests/system/View/ParserPluginTest.php
index df773a375df8..85de3e7898fa 100644
--- a/tests/system/View/ParserPluginTest.php
+++ b/tests/system/View/ParserPluginTest.php
@@ -24,6 +24,7 @@ final class ParserPluginTest extends CIUnitTestCase
      * @var Parser
      */
     protected $parser;
+
     /**
      * @var Validation
      */

From abe42861f6c4267f7b72082cac59a3a8023a16f1 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Mon, 11 Oct 2021 22:15:09 +0900
Subject: [PATCH 0443/2325] fix: fieldName -> keyName

---
 system/Database/Forge.php        | 6 +++---
 system/Database/MySQLi/Forge.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index c4bd082b73c4..8e0b7e43c7f3 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -433,13 +433,13 @@ public function addForeignKey($fieldName = '', string $tableName = '', $tableFie
      *
      * @throws DatabaseException
      *
-     * @return BaseResult|bool|false|mixed|Query
+     * @return bool
      */
-    public function dropKey(string $table, string $fieldName)
+    public function dropKey(string $table, string $keyName)
     {
         $sql = sprintf(
             $this->dropIndexStr,
-            $this->db->escapeIdentifiers($this->db->DBPrefix . $fieldName),
+            $this->db->escapeIdentifiers($this->db->DBPrefix . $keyName),
             $this->db->escapeIdentifiers($this->db->DBPrefix . $table),
         );
 
diff --git a/system/Database/MySQLi/Forge.php b/system/Database/MySQLi/Forge.php
index 3038f8a9165f..d00c26dd1ca7 100644
--- a/system/Database/MySQLi/Forge.php
+++ b/system/Database/MySQLi/Forge.php
@@ -224,13 +224,13 @@ protected function _processIndexes(string $table): string
     /**
      * Drop Key
      *
-     * @return BaseResult|bool|false|mixed|Query
+     * @return bool
      */
-    public function dropKey(string $table, string $fieldName)
+    public function dropKey(string $table, string $keyName)
     {
         $sql = sprintf(
             $this->dropIndexStr,
-            $this->db->escapeIdentifiers($fieldName),
+            $this->db->escapeIdentifiers($keyName),
             $this->db->escapeIdentifiers($this->db->DBPrefix . $table),
         );
 

From eda426ddd9df34bb9ed3b49f3c534d446af65674 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Mon, 11 Oct 2021 22:15:27 +0900
Subject: [PATCH 0444/2325] docs: remove unnecessary escape.

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

diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index d9b3bd631dbf..d7b3c4546825 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -312,7 +312,7 @@ Execute a DROP KEY.
 
 ::
 
-    // Produces: DROP INDEX 'users_index' ON 'tablename'
+    // Produces: DROP INDEX users_index ON tablename
     $forge->dropKey('tablename','users_index');
 
 Renaming a table

From 2126376e8998732fc7341517fe9e11ea39b788c0 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Mon, 11 Oct 2021 22:27:25 +0900
Subject: [PATCH 0445/2325] docs: remove single-quote escaping.

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

diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index 6cbdfe506e8a..a0c677d3162b 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -301,7 +301,7 @@ Execute a DROP FOREIGN KEY.
 
 ::
 
-    // Produces: ALTER TABLE 'tablename' DROP FOREIGN KEY 'users_foreign'
+    // Produces: ALTER TABLE tablename DROP FOREIGN KEY users_foreign
     $forge->dropForeignKey('tablename','users_foreign');
 
 Renaming a table

From 1d091fab3bdd259e9ace6327db0b2d03a90fcd28 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Tue, 12 Oct 2021 00:43:31 +0200
Subject: [PATCH 0446/2325] Add formatted query string to timeline.

Co-Authored-By: Daniel Tiringer <53534182+danielTiringer@users.noreply.github.com>
---
 system/Debug/Toolbar.php                     | 11 +++++++++++
 system/Debug/Toolbar/Collectors/Database.php |  1 +
 2 files changed, 12 insertions(+)

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index b59666aacc4c..2f2e7d0d92b4 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -273,6 +273,17 @@ protected function structureTimelineData(array $elements): array
         // We define ourselves as the first element of the array
         $element = array_shift($elements);
 
+        // If we are a query, add the formatted query string as our first child
+        if (array_key_exists('query', $element) && $element['query']) {
+            $element['children'][] = [
+                'name'      => $element['query'],
+                'component' => 'Query',
+                'start'     => $element['start'],
+                'duration'  => $element['duration'],
+                'end'       => $element['end'],
+            ];
+        }
+
         // If we have children behind us, collect and attach them to us
         while (! empty($elements) && $elements[array_key_first($elements)]['end'] <= $element['end']) {
             $element['children'][] = array_shift($elements);
diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index c093068a9342..d8445b80364f 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -118,6 +118,7 @@ protected function formatTimelineData(): array
                 'component' => 'Database',
                 'start'     => $query['query']->getStartTime(true),
                 'duration'  => $query['query']->getDuration(),
+                'query'     => $query['query']->debugToolbarDisplay(),
             ];
         }
 

From d02c38071f45d4d891624b7a4e9d931a7eaf4ab9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Oct 2021 09:17:08 +0900
Subject: [PATCH 0447/2325] docs: move contributing related contents from
 README.md to contributing/README.md

---
 README.md              | 8 +-------
 contributing/README.md | 6 ++++++
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 5d9d007b91e2..1bcfdfcb922d 100644
--- a/README.md
+++ b/README.md
@@ -71,13 +71,7 @@ to optional packages, with their own repository.
 
 We **are** accepting contributions from the community!
 
-We will try to manage the process somewhat, by adding a ["help wanted" label](https://github.com/codeigniter4/CodeIgniter4/labels/help%20wanted) to those that we are
-specifically interested in at any point in time. Join the discussion for those issues and let us know
-if you want to take the lead on one of them.
-
-At this time, we are not looking for out-of-scope contributions, only those that would be considered part of our controlled evolution!
-
-Please read the [*Contributing to CodeIgniter*](https://github.com/codeigniter4/CodeIgniter4/blob/develop/CONTRIBUTING.md) section in the user guide.
+Please read the [*Contributing to CodeIgniter*](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/README.md).
 
 ## Server Requirements
 
diff --git a/contributing/README.md b/contributing/README.md
index 2df6e0870ebc..7277eb1dc25d 100644
--- a/contributing/README.md
+++ b/contributing/README.md
@@ -7,6 +7,12 @@ Requests](https://help.github.com/articles/using-pull-requests/) on the
 [CodeIgniter4 repository](https://github.com/codeigniter4/CodeIgniter4)
 on GitHub.
 
+We will try to manage the process somewhat, by adding a ["help wanted" label](https://github.com/codeigniter4/CodeIgniter4/labels/help%20wanted) to those that we are
+specifically interested in at any point in time. Join the discussion for those issues and let us know
+if you want to take the lead on one of them.
+
+At this time, we are not looking for out-of-scope contributions, only those that would be considered part of our controlled evolution!
+
 - [Contributor Covenant Code of Conduct](../CODE_OF_CONDUCT.md)
 - [Reporting a Bug](./bug_report.md)
 - [Sending a Pull Request](./pull_request.md)

From 99a1a53905f7fc6b599fb6b6ee6f8e94cc8f9d0b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Oct 2021 09:18:54 +0900
Subject: [PATCH 0448/2325] docs: remove "we are not looking for out-of-scope
 contributions"

It seems it is out-of-dated.
---
 contributing/README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/contributing/README.md b/contributing/README.md
index 7277eb1dc25d..40796df376b3 100644
--- a/contributing/README.md
+++ b/contributing/README.md
@@ -11,8 +11,6 @@ We will try to manage the process somewhat, by adding a ["help wanted" label](ht
 specifically interested in at any point in time. Join the discussion for those issues and let us know
 if you want to take the lead on one of them.
 
-At this time, we are not looking for out-of-scope contributions, only those that would be considered part of our controlled evolution!
-
 - [Contributor Covenant Code of Conduct](../CODE_OF_CONDUCT.md)
 - [Reporting a Bug](./bug_report.md)
 - [Sending a Pull Request](./pull_request.md)

From c1f72de2af3a2bfeb5fdd9fcc815cfdb2866cb1b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Oct 2021 12:46:22 +0900
Subject: [PATCH 0449/2325] docs: remove unnecessary indentation

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

diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst
index 685c7e7041ea..be36f9c9dd09 100644
--- a/user_guide_src/source/helpers/form_helper.rst
+++ b/user_guide_src/source/helpers/form_helper.rst
@@ -103,7 +103,7 @@ The following functions are available:
         will return::
 
             <form action="http://example.com/index.php/u/sign-up" method="post" accept-charset="utf-8">
-                <input type="hidden" id="my-id" name="csrf_field" value="964ede6e0ae8a680f7b8eab69136717d" />
+            <input type="hidden" id="my-id" name="csrf_field" value="964ede6e0ae8a680f7b8eab69136717d" />
 
     **Adding Hidden Input Fields**
 

From 205cdfb2e707863138af0248446aa55d455ca3f1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Oct 2021 12:47:56 +0900
Subject: [PATCH 0450/2325] docs: add note to CSRF filter and HTTP method

---
 user_guide_src/source/helpers/form_helper.rst | 2 ++
 user_guide_src/source/libraries/security.rst  | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst
index be36f9c9dd09..f4e5b09c1af1 100644
--- a/user_guide_src/source/helpers/form_helper.rst
+++ b/user_guide_src/source/helpers/form_helper.rst
@@ -105,6 +105,8 @@ The following functions are available:
             <form action="http://example.com/index.php/u/sign-up" method="post" accept-charset="utf-8">
             <input type="hidden" id="my-id" name="csrf_field" value="964ede6e0ae8a680f7b8eab69136717d" />
 
+        .. note:: To use auto generation of CSRF field, you need to turn CSRF filter on to the form page. In most cases it is requested using the `GET` method.
+
     **Adding Hidden Input Fields**
 
         Hidden fields can be added by passing an associative array to the
diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index 0a16f99e022a..2d16a2a5b53a 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -53,7 +53,12 @@ Regular expressions are also supported (case-insensitive)::
 
 If you use the :doc:`form helper <../helpers/form_helper>`, then
 :func:`form_open()` will automatically insert a hidden csrf field in
-your forms. If not, then you can use the always available ``csrf_token()``
+your forms.
+
+.. note:: To use auto generation of CSRF field, you need to turn CSRF filter on to the form page.
+    In most cases it is requested using the `GET` method.
+
+If not, then you can use the always available ``csrf_token()``
 and ``csrf_hash()`` functions
 ::
 

From f562184c051fa7becc822b3995a2a9e76dbe3035 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Oct 2021 12:48:43 +0900
Subject: [PATCH 0451/2325] docs: fix typo

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

diff --git a/user_guide_src/source/installation/upgrade_security.rst b/user_guide_src/source/installation/upgrade_security.rst
index 4f2b8107a96b..61cf699658b2 100644
--- a/user_guide_src/source/installation/upgrade_security.rst
+++ b/user_guide_src/source/installation/upgrade_security.rst
@@ -30,7 +30,7 @@ Upgrade Guide
         ]
     ];
 
-2. Within you html forms you have to remove the csrf input which looks similar to ``<input type="hidden" name="<?= $csrf['name'] ?>" value="<?= $csrf['hash'] ?>" />``.
+2. Within your html forms you have to remove the csrf input which looks similar to ``<input type="hidden" name="<?= $csrf['name'] ?>" value="<?= $csrf['hash'] ?>" />``.
 3. Now within your html forms you have to add ``<?= csrf_field() ?>`` somewhere in the form body, unless you are using ``form_open()``.
 
 Code Example

From 33f4635244541a1b285a1bd93aad340e2fec3d97 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Oct 2021 12:49:35 +0900
Subject: [PATCH 0452/2325] docs: add headings

There are a lot of contents.
---
 user_guide_src/source/libraries/security.rst | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index 2d16a2a5b53a..758d16b54173 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -23,6 +23,9 @@ If you find a case where you do need direct access though, you may load it throu
 Cross-site request forgery (CSRF)
 *********************************
 
+Enable CSRF Protection
+======================
+
 You can enable CSRF protection by altering your **app/Config/Filters.php**
 and enabling the `csrf` filter globally::
 
@@ -51,6 +54,9 @@ Regular expressions are also supported (case-insensitive)::
         ],
     ];
 
+HTML Forms
+==========
+
 If you use the :doc:`form helper <../helpers/form_helper>`, then
 :func:`form_open()` will automatically insert a hidden csrf field in
 your forms.
@@ -80,12 +86,18 @@ meta tag for you::
     // Generates: <meta name="{csrf_header}" content="{csrf_hash}" />
     <?= csrf_meta() ?>
 
+The Order of Token Sent by Users
+================================
+
 The order of checking the availability of the CSRF token is as follows:
 
 1. ``$_POST`` array
-2. Http header
+2. HTTP header
 3. ``php://input`` (JSON request) - bare in mind that this approach is the slowest one since we have to decode JSON and then encode it again
 
+Tokens Regeneration
+===================
+
 Tokens may be either regenerated on every submission (default) or
 kept the same throughout the life of the CSRF cookie. The default
 regeneration of tokens provides stricter security, but may result
@@ -96,6 +108,9 @@ may alter this behavior by editing the following config parameter value in
 
     public $regenerate  = true;
 
+Redirection on Failure
+======================
+
 When a request fails the CSRF validation check, it will redirect to the previous page by default,
 setting an ``error`` flash message that you can display to the end user. This provides a nicer experience
 than simply crashing. This can be turned off by editing the following config parameter value in

From 69fbed9a5969a80bb17ffecf36272e19dd0496dd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Oct 2021 13:39:31 +0900
Subject: [PATCH 0453/2325] docs: remove unnecessary blank lines

---
 admin/README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/admin/README.md b/admin/README.md
index 52747ca3eeaa..9f36d2d72a48 100644
--- a/admin/README.md
+++ b/admin/README.md
@@ -9,7 +9,6 @@ This folder contains tools or docs useful for project maintainers.
     In addition to the framework source, it includes unit testing and documentation source.  
     The three repositories following are built from this one as part of the release workflow.  
     This repo is meant to be forked by contributors.
-
 -   **framework** is the released developer repository.  
     It contains all the main pieces of the framework that developers would use to
     build their apps, but not the framework unit testing or the user guide source.  
@@ -25,7 +24,6 @@ This folder contains tools or docs useful for project maintainers.
     framework releases.  
     It could be downloaded, forked or potentially composer-installed.  
     This is a read-only repository.
-
 -   **coding-standard** is the coding style standards repository.  
     It contains PHP CodeSniffer rules to ensure consistent code style
     within the framework itself.  

From aa81929094ebf4210154ebc2e1ed3f993ccd9a44 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Oct 2021 13:39:57 +0900
Subject: [PATCH 0454/2325] docs: update about coding-standard repository

---
 admin/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/README.md b/admin/README.md
index 9f36d2d72a48..1f5dd89bfcd1 100644
--- a/admin/README.md
+++ b/admin/README.md
@@ -24,8 +24,8 @@ This folder contains tools or docs useful for project maintainers.
     framework releases.  
     It could be downloaded, forked or potentially composer-installed.  
     This is a read-only repository.
--   **coding-standard** is the coding style standards repository.  
-    It contains PHP CodeSniffer rules to ensure consistent code style
+-   **coding-standard** <https://github.com/CodeIgniter/coding-standard> is the coding style standards repository.  
+    It contains PHP-CS-Fixer rules to ensure consistent code style
     within the framework itself.  
     It is meant to be composer-installed.
 -   **translations** is the repository holding official translations of

From cc0b7e996951d32b53874d81be8b90b6eb05e064 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Tue, 12 Oct 2021 09:41:44 +0200
Subject: [PATCH 0455/2325] Simplify query string output in timeline.

---
 system/Debug/Toolbar.php | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 2f2e7d0d92b4..491be10e5af6 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -185,16 +185,18 @@ protected function renderTimelineRecursive(array $rows, float $startTime, int $s
 
         foreach ($rows as $row) {
             $hasChildren = isset($row['children']) && ! empty($row['children']);
+            $isQuery     = isset($row['query']) && ! empty($row['query']);
 
+            // Open controller timeline by default
             $open = $row['name'] === 'Controller';
 
-            if ($hasChildren) {
+            if ($hasChildren || $isQuery) {
                 $output .= '<tr class="timeline-parent' . ($open ? ' timeline-parent-open' : '') . '" id="timeline-' . $styleCount . '_parent" onclick="ciDebugBar.toggleChildRows(\'timeline-' . $styleCount . '\');">';
             } else {
                 $output .= '<tr>';
             }
 
-            $output .= '<td class="' . ($isChild ? 'debug-bar-width30' : '') . '" style="--level: ' . $level . ';">' . ($hasChildren ? '<nav></nav>' : '') . $row['name'] . '</td>';
+            $output .= '<td class="' . ($isChild ? 'debug-bar-width30' : '') . '" style="--level: ' . $level . ';">' . (($hasChildren || $isQuery) ? '<nav></nav>' : '') . $row['name'] . '</td>';
             $output .= '<td class="' . ($isChild ? 'debug-bar-width10' : '') . '">' . $row['component'] . '</td>';
             $output .= '<td class="' . ($isChild ? 'debug-bar-width10 ' : '') . 'debug-bar-alignRight">' . number_format($row['duration'] * 1000, 2) . ' ms</td>';
             $output .= "<td class='debug-bar-noverflow' colspan='{$segmentCount}'>";
@@ -211,12 +213,22 @@ protected function renderTimelineRecursive(array $rows, float $startTime, int $s
             $styleCount++;
 
             // Add children if any
-            if ($hasChildren) {
+            if ($hasChildren || $isQuery) {
                 $output .= '<tr class="child-row" id="timeline-' . ($styleCount - 1) . '_children" style="' . ($open ? '' : 'display: none;') . '">';
                 $output .= '<td colspan="' . ($segmentCount + 3) . '" class="child-container">';
                 $output .= '<table class="timeline">';
                 $output .= '<tbody>';
-                $output .= $this->renderTimelineRecursive($row['children'], $startTime, $segmentCount, $segmentDuration, $styles, $styleCount, $level + 1, true);
+
+                if ($isQuery) {
+                    // Output query string if query
+                    $output .= '<tr>';
+                    $output .= '<td class="query-container" style="--level: ' . ($level + 1) . ';">' . $row['query'] . '</td>';
+                    $output .= '</tr>';
+                } else {
+                    // Recursively render children
+                    $output .= $this->renderTimelineRecursive($row['children'], $startTime, $segmentCount, $segmentDuration, $styles, $styleCount, $level + 1, true);
+                }
+
                 $output .= '</tbody>';
                 $output .= '</table>';
                 $output .= '</td>';
@@ -273,17 +285,6 @@ protected function structureTimelineData(array $elements): array
         // We define ourselves as the first element of the array
         $element = array_shift($elements);
 
-        // If we are a query, add the formatted query string as our first child
-        if (array_key_exists('query', $element) && $element['query']) {
-            $element['children'][] = [
-                'name'      => $element['query'],
-                'component' => 'Query',
-                'start'     => $element['start'],
-                'duration'  => $element['duration'],
-                'end'       => $element['end'],
-            ];
-        }
-
         // If we have children behind us, collect and attach them to us
         while (! empty($elements) && $elements[array_key_first($elements)]['end'] <= $element['end']) {
             $element['children'][] = array_shift($elements);

From 8d2678f0cd47789eac4162b052882c5deb1bfb08 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <40514119+sfadschm@users.noreply.github.com>
Date: Wed, 13 Oct 2021 07:25:43 +0200
Subject: [PATCH 0456/2325] Remove duplicate parentheses.

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 system/Debug/Toolbar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 491be10e5af6..2199559d362d 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -196,7 +196,7 @@ protected function renderTimelineRecursive(array $rows, float $startTime, int $s
                 $output .= '<tr>';
             }
 
-            $output .= '<td class="' . ($isChild ? 'debug-bar-width30' : '') . '" style="--level: ' . $level . ';">' . (($hasChildren || $isQuery) ? '<nav></nav>' : '') . $row['name'] . '</td>';
+            $output .= '<td class="' . ($isChild ? 'debug-bar-width30' : '') . '" style="--level: ' . $level . ';">' . ($hasChildren || $isQuery ? '<nav></nav>' : '') . $row['name'] . '</td>';
             $output .= '<td class="' . ($isChild ? 'debug-bar-width10' : '') . '">' . $row['component'] . '</td>';
             $output .= '<td class="' . ($isChild ? 'debug-bar-width10 ' : '') . 'debug-bar-alignRight">' . number_format($row['duration'] * 1000, 2) . ' ms</td>';
             $output .= "<td class='debug-bar-noverflow' colspan='{$segmentCount}'>";

From e393aac29dec267f11a454a2ef93f226f35f0db2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 13 Oct 2021 14:30:16 +0900
Subject: [PATCH 0457/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/helpers/form_helper.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst
index f4e5b09c1af1..e8788de0a499 100644
--- a/user_guide_src/source/helpers/form_helper.rst
+++ b/user_guide_src/source/helpers/form_helper.rst
@@ -105,7 +105,7 @@ The following functions are available:
             <form action="http://example.com/index.php/u/sign-up" method="post" accept-charset="utf-8">
             <input type="hidden" id="my-id" name="csrf_field" value="964ede6e0ae8a680f7b8eab69136717d" />
 
-        .. note:: To use auto generation of CSRF field, you need to turn CSRF filter on to the form page. In most cases it is requested using the `GET` method.
+        .. note:: To use auto-generation of CSRF field, you need to turn CSRF filter on to the form page. In most cases it is requested using the ``GET`` method.
 
     **Adding Hidden Input Fields**
 

From 105253c076a2da292d5bda59b69b36635a6ee018 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 13 Oct 2021 14:31:42 +0900
Subject: [PATCH 0458/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/installation/upgrade_security.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_security.rst b/user_guide_src/source/installation/upgrade_security.rst
index 61cf699658b2..5f2d8ecfdb66 100644
--- a/user_guide_src/source/installation/upgrade_security.rst
+++ b/user_guide_src/source/installation/upgrade_security.rst
@@ -30,8 +30,8 @@ Upgrade Guide
         ]
     ];
 
-2. Within your html forms you have to remove the csrf input which looks similar to ``<input type="hidden" name="<?= $csrf['name'] ?>" value="<?= $csrf['hash'] ?>" />``.
-3. Now within your html forms you have to add ``<?= csrf_field() ?>`` somewhere in the form body, unless you are using ``form_open()``.
+2. Within your HTML forms you have to remove the CSRF input field which looks similar to ``<input type="hidden" name="<?= $csrf['name'] ?>" value="<?= $csrf['hash'] ?>" />``.
+3. Now, within your HTML forms you have to add ``<?= csrf_field() ?>`` somewhere in the form body, unless you are using ``form_open()``.
 
 Code Example
 ============

From a790f87b1d6c2c38b904a18c130124da0d3342f2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 13 Oct 2021 14:31:50 +0900
Subject: [PATCH 0459/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/libraries/security.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index 758d16b54173..3e173aa4bc45 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -61,8 +61,8 @@ If you use the :doc:`form helper <../helpers/form_helper>`, then
 :func:`form_open()` will automatically insert a hidden csrf field in
 your forms.
 
-.. note:: To use auto generation of CSRF field, you need to turn CSRF filter on to the form page.
-    In most cases it is requested using the `GET` method.
+.. note:: To use auto-generation of CSRF field, you need to turn CSRF filter on to the form page.
+    In most cases it is requested using the ``GET`` method.
 
 If not, then you can use the always available ``csrf_token()``
 and ``csrf_hash()`` functions

From b3cda21155714546e64da3045003a95a57d96226 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 13 Oct 2021 14:34:12 +0900
Subject: [PATCH 0460/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/libraries/security.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index 3e173aa4bc45..3c2ad833f1d8 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -93,7 +93,7 @@ The order of checking the availability of the CSRF token is as follows:
 
 1. ``$_POST`` array
 2. HTTP header
-3. ``php://input`` (JSON request) - bare in mind that this approach is the slowest one since we have to decode JSON and then encode it again
+3. ``php://input`` (JSON request) - bear in mind that this approach is the slowest one since we have to decode JSON and then re-encode it
 
 Tokens Regeneration
 ===================

From 51c070fe496e891763cfc1025f8395ecc09a0c75 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 13 Oct 2021 14:34:20 +0900
Subject: [PATCH 0461/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/libraries/security.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index 3c2ad833f1d8..9497723c4b46 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -95,7 +95,7 @@ The order of checking the availability of the CSRF token is as follows:
 2. HTTP header
 3. ``php://input`` (JSON request) - bear in mind that this approach is the slowest one since we have to decode JSON and then re-encode it
 
-Tokens Regeneration
+Token Regeneration
 ===================
 
 Tokens may be either regenerated on every submission (default) or

From 125052ade293f46a30b7cc4d5363caf7709c1d9e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 14 Oct 2021 02:11:05 +0900
Subject: [PATCH 0462/2325] docs: Github -> GitHub

---
 README.md                                           | 4 ++--
 admin/css/debug-toolbar/_settings.scss              | 2 +-
 admin/framework/README.md                           | 2 +-
 admin/starter/README.md                             | 2 +-
 tests/_support/Config/Registrar.php                 | 2 +-
 user_guide_src/ghpages.rst                          | 2 +-
 user_guide_src/source/installation/repositories.rst | 6 +++---
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 1bcfdfcb922d..fa5194457cbc 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ CodeIgniter is developed completely on a volunteer basis. As such, please give u
 for your issues to be reviewed. If you haven't heard from one of the team in that time period,
 feel free to leave a comment on the issue so that it gets brought back to our attention.
 
-We use Github issues to track **BUGS** and to track approved **DEVELOPMENT** work packages.
+We use GitHub issues to track **BUGS** and to track approved **DEVELOPMENT** work packages.
 We use our [forum](http://forum.codeigniter.com) to provide SUPPORT and to discuss
 FEATURE REQUESTS.
 
@@ -54,7 +54,7 @@ If you raise an issue here that pertains to support or a feature request, it wil
 be closed! If you are not sure if you have found a bug, raise a thread on the forum first -
 someone else may have encountered the same thing.
 
-Before raising a new Github issue, please check that your bug hasn't already
+Before raising a new GitHub issue, please check that your bug hasn't already
 been reported or fixed.
 
 We use pull requests (PRs) for CONTRIBUTIONS to the repository.
diff --git a/admin/css/debug-toolbar/_settings.scss b/admin/css/debug-toolbar/_settings.scss
index 06a51de634bb..1bb1386a46a0 100644
--- a/admin/css/debug-toolbar/_settings.scss
+++ b/admin/css/debug-toolbar/_settings.scss
@@ -1,7 +1,7 @@
 // FONT
 // ========================================================================== */
 
-// Standard "sans-serif" font stack used by Github
+// Standard "sans-serif" font stack used by GitHub
 $base-font: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
 
 // Default size, all other styles are based on this size
diff --git a/admin/framework/README.md b/admin/framework/README.md
index 1f95a415d37a..6b7c6673e33a 100644
--- a/admin/framework/README.md
+++ b/admin/framework/README.md
@@ -28,7 +28,7 @@ framework are exposed.
 
 ## Repository Management
 
-We use Github issues, in our main repository, to track **BUGS** and to track approved **DEVELOPMENT** work packages.
+We use GitHub issues, in our main repository, to track **BUGS** and to track approved **DEVELOPMENT** work packages.
 We use our [forum](http://forum.codeigniter.com) to provide SUPPORT and to discuss
 FEATURE REQUESTS.
 
diff --git a/admin/starter/README.md b/admin/starter/README.md
index 41ce92110d7a..363e7c89f304 100644
--- a/admin/starter/README.md
+++ b/admin/starter/README.md
@@ -41,7 +41,7 @@ framework are exposed.
 
 ## Repository Management
 
-We use Github issues, in our main repository, to track **BUGS** and to track approved **DEVELOPMENT** work packages.
+We use GitHub issues, in our main repository, to track **BUGS** and to track approved **DEVELOPMENT** work packages.
 We use our [forum](http://forum.codeigniter.com) to provide SUPPORT and to discuss
 FEATURE REQUESTS.
 
diff --git a/tests/_support/Config/Registrar.php b/tests/_support/Config/Registrar.php
index 15e8f54ff92d..989b406655b1 100644
--- a/tests/_support/Config/Registrar.php
+++ b/tests/_support/Config/Registrar.php
@@ -111,7 +111,7 @@ public static function Database()
     {
         $config = [];
 
-        // Under Github Actions, we can set an ENV var named 'DB'
+        // Under GitHub Actions, we can set an ENV var named 'DB'
         // so that we can test against multiple databases.
         if ($group = getenv('DB')) {
             if (! empty(self::$dbConfig[$group])) {
diff --git a/user_guide_src/ghpages.rst b/user_guide_src/ghpages.rst
index 4699d38f978d..15619a060e0d 100644
--- a/user_guide_src/ghpages.rst
+++ b/user_guide_src/ghpages.rst
@@ -6,7 +6,7 @@ The intent is, eventually, for the in-progress user guide to be automatically
 generated as part of a PR merge. This writeup explains how it can be done manually
 in the meantime.
 
-The user guide takes advantage of Github pages, where the "gh-pages" branch of
+The user guide takes advantage of GitHub pages, where the "gh-pages" branch of
 a repo, containing HTML only, is accessible through `github.io
 <https://bcit-ci.github.io/CodeIgniter4>`_.
 
diff --git a/user_guide_src/source/installation/repositories.rst b/user_guide_src/source/installation/repositories.rst
index b585ca8e8f6b..9e4e0abc9db9 100644
--- a/user_guide_src/source/installation/repositories.rst
+++ b/user_guide_src/source/installation/repositories.rst
@@ -2,7 +2,7 @@ CodeIgniter Repositories
 ########################
 
 The CodeIgniter 4 open source project has its own
-`Github organization <https://github.com/codeigniter4>`_.
+`GitHub organization <https://github.com/codeigniter4>`_.
 
 There are several development repositories, of interest to potential contributors:
 
@@ -33,7 +33,7 @@ are not directly contributed to.
 
 In all the above, the latest version of a repository can be downloaded
 by selecting the "releases" link in the secondary navbar inside
-the "Code" tab of its Github repository page. The current (in development) version of each can
+the "Code" tab of its GitHub repository page. The current (in development) version of each can
 be cloned or downloaded by selecting the "Clone or download" dropdown
 button on the right-hand side if the repository homepage.
 
@@ -54,7 +54,7 @@ CodeIgniter 4 Projects
 ======================
 
 We maintain a `codeigniter4projects <https://github.com/codeigniter4projects>`_ organization
-on Github as well, with projects that are not part of the framework,
+on GitHub as well, with projects that are not part of the framework,
 but which showcase it or make it easier to work with!
 
 +------------------+--------------+-----------------------------------------------------------------+

From 101db1523eedcaa01c7580403b0b321becaac3ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Oct 2021 01:11:54 +0800
Subject: [PATCH 0463/2325] chore(deps-dev): update rector/rector requirement

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

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

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index fd8b7198f11e..8a8fdaf00aa2 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^0.12.91",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.57",
+        "rector/rector": "0.11.58",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {

From 00b6e325f63623b7ea1d21c7dce2f1987f063cd5 Mon Sep 17 00:00:00 2001
From: ytetsuro <phper.0o0@gmail.com>
Date: Fri, 15 Oct 2021 16:23:48 +0900
Subject: [PATCH 0464/2325] docs: add escape for identifiers.

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

diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index d7b3c4546825..66d7ebd75e09 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -312,7 +312,7 @@ Execute a DROP KEY.
 
 ::
 
-    // Produces: DROP INDEX users_index ON tablename
+    // Produces: DROP INDEX `users_index` ON `tablename`
     $forge->dropKey('tablename','users_index');
 
 Renaming a table

From 22a4c24798b7549ca9bc1c070039fbd03aa6c78d Mon Sep 17 00:00:00 2001
From: ytetsuro <phper.0o0@gmail.com>
Date: Fri, 15 Oct 2021 16:29:55 +0900
Subject: [PATCH 0465/2325] docs: add escape for identifiers.

---
 user_guide_src/source/dbmgmt/forge.rst | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index a0c677d3162b..6fedb1608af5 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -46,7 +46,7 @@ or will check if a database exists before create it (depending on DBMS).
 ::
 
     $forge->createDatabase('my_db', true);
-    // gives CREATE DATABASE IF NOT EXISTS my_db
+    // gives CREATE DATABASE IF NOT EXISTS `my_db`
     // or will check if a database exists
 
 **$forge->dropDatabase('db_name')**
@@ -182,7 +182,7 @@ Primary Key.
 ::
 
     $forge->addField('id');
-    // gives id INT(9) NOT NULL AUTO_INCREMENT
+    // gives `id` INT(9) NOT NULL AUTO_INCREMENT
 
 Adding Keys
 ===========
@@ -280,10 +280,10 @@ Execute a DROP TABLE statement and optionally add an IF EXISTS clause.
 
 ::
 
-    // Produces: DROP TABLE table_name
+    // Produces: DROP TABLE `table_name`
     $forge->dropTable('table_name');
 
-    // Produces: DROP TABLE IF EXISTS table_name
+    // Produces: DROP TABLE IF EXISTS `table_name`
     $forge->dropTable('table_name', true);
 
 A third parameter can be passed to add a "CASCADE" option, which might be required for some
@@ -291,7 +291,7 @@ drivers to handle removal of tables with foreign keys.
 
 ::
 
-    // Produces: DROP TABLE table_name CASCADE
+    // Produces: DROP TABLE `table_name` CASCADE
     $forge->dropTable('table_name', false, true);
 
 Dropping a Foreign Key
@@ -301,7 +301,7 @@ Execute a DROP FOREIGN KEY.
 
 ::
 
-    // Produces: ALTER TABLE tablename DROP FOREIGN KEY users_foreign
+    // Produces: ALTER TABLE `tablename` DROP FOREIGN KEY `users_foreign`
     $forge->dropForeignKey('tablename','users_foreign');
 
 Renaming a table
@@ -312,7 +312,7 @@ Executes a TABLE rename
 ::
 
     $forge->renameTable('old_table_name', 'new_table_name');
-    // gives ALTER TABLE old_table_name RENAME TO new_table_name
+    // gives ALTER TABLE `old_table_name` RENAME TO `new_table_name`
 
 ****************
 Modifying Tables
@@ -333,7 +333,7 @@ number of additional fields.
         'preferences' => ['type' => 'TEXT']
     ];
     $forge->addColumn('table_name', $fields);
-    // Executes: ALTER TABLE table_name ADD preferences TEXT
+    // Executes: ALTER TABLE `table_name` ADD `preferences` TEXT
 
 If you are using MySQL or CUBIRD, then you can take advantage of their
 AFTER and FIRST clauses to position the new column.
@@ -386,7 +386,7 @@ change the name, you can add a "name" key into the field defining array.
         ],
     ];
     $forge->modifyColumn('table_name', $fields);
-    // gives ALTER TABLE table_name CHANGE old_name new_name TEXT
+    // gives ALTER TABLE `table_name` CHANGE `old_name` `new_name` TEXT
 
 ***************
 Class Reference

From 2007d6434d9fc1d5cf30271c82a4459e92b403e2 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <40514119+sfadschm@users.noreply.github.com>
Date: Sat, 16 Oct 2021 17:04:50 +0200
Subject: [PATCH 0466/2325] [Debug] Improve keyword highlighting and escaping
 of query strings

* Sort highlighted keywords alphabetically.

* Add new composite keywords.

* Deconstruct composite keywords.

* Add basic test for query highlighting in toolbar.

* Ignore keywords in string values of queries.

* Use generic table and column names for tests.

* Add credits for regex pattern.

* Escape HTML entities when formatting query string.

* Use esc() for escaping query string.
---
 system/Database/Query.php               | 53 ++++++++++++++-----------
 tests/system/Database/BaseQueryTest.php | 33 +++++++++++++++
 2 files changed, 63 insertions(+), 23 deletions(-)

diff --git a/system/Database/Query.php b/system/Database/Query.php
index 01d27d8bdfff..a4bb1b2b9de5 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -367,46 +367,53 @@ public function debugToolbarDisplay(): string
     {
         // Key words we want bolded
         static $highlight = [
-            'SELECT',
-            'DISTINCT',
-            'FROM',
-            'WHERE',
             'AND',
-            'LEFT JOIN',
-            'RIGHT JOIN',
-            'JOIN',
-            'ORDER BY',
+            'AS',
             'ASC',
+            'AVG',
+            'BY',
+            'COUNT',
             'DESC',
-            'GROUP BY',
-            'LIMIT',
-            'INSERT',
-            'INTO',
-            'VALUES',
-            'UPDATE',
-            'OR',
+            'DISTINCT',
+            'FROM',
+            'GROUP',
             'HAVING',
-            'OFFSET',
-            'NOT IN',
             'IN',
+            'INNER',
+            'INSERT',
+            'INTO',
+            'IS',
+            'JOIN',
+            'LEFT',
             'LIKE',
-            'NOT LIKE',
-            'COUNT',
+            'LIMIT',
             'MAX',
             'MIN',
+            'NOT',
+            'NULL',
+            'OFFSET',
             'ON',
-            'AS',
-            'AVG',
+            'OR',
+            'ORDER',
+            'RIGHT',
+            'SELECT',
             'SUM',
+            'UPDATE',
+            'VALUES',
+            'WHERE',
         ];
 
         if (empty($this->finalQueryString)) {
             $this->compileBinds(); // @codeCoverageIgnore
         }
 
-        $sql = $this->finalQueryString;
+        $sql = esc($this->finalQueryString);
 
-        $search = '/\b(?:' . implode('|', $highlight) . ')\b/';
+        /**
+         * @see https://stackoverflow.com/a/20767160
+         * @see https://regex101.com/r/hUlrGN/4
+         */
+        $search = '/\b(?:' . implode('|', $highlight) . ')\b(?![^(&#039;)]*&#039;(?:(?:[^(&#039;)]*&#039;){2})*[^(&#039;)]*$)/';
 
         return preg_replace_callback($search, static function ($matches) {
             return '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>';
diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php
index deec43c4f5bb..fe942ffeb187 100644
--- a/tests/system/Database/BaseQueryTest.php
+++ b/tests/system/Database/BaseQueryTest.php
@@ -363,4 +363,37 @@ public function testSetQueryBinds()
 
         $this->assertSame($expected, $query->getQuery());
     }
+
+    public function queryKeywords()
+    {
+        return [
+            'highlightKeyWords' => [
+                '<strong>SELECT</strong> `a`.*, `b`.`id` <strong>AS</strong> `b_id` <strong>FROM</strong> `a` <strong>LEFT</strong> <strong>JOIN</strong> `b` <strong>ON</strong> `b`.`a_id` = `a`.`id` <strong>WHERE</strong> `b`.`id` <strong>IN</strong> (&#039;1&#039;) <strong>AND</strong> `a`.`deleted_at` <strong>IS</strong> <strong>NOT</strong> <strong>NULL</strong> <strong>LIMIT</strong> 1',
+                'SELECT `a`.*, `b`.`id` AS `b_id` FROM `a` LEFT JOIN `b` ON `b`.`a_id` = `a`.`id` WHERE `b`.`id` IN (\'1\') AND `a`.`deleted_at` IS NOT NULL LIMIT 1',
+            ],
+            'ignoreKeyWordsInValues' => [
+                '<strong>SELECT</strong> * <strong>FROM</strong> `a` <strong>WHERE</strong> `a`.`col` = &#039;SELECT escaped keyword in value&#039; <strong>LIMIT</strong> 1',
+                'SELECT * FROM `a` WHERE `a`.`col` = \'SELECT escaped keyword in value\' LIMIT 1',
+            ],
+            'escapeHtmlValues' => [
+                '<strong>SELECT</strong> &#039;&lt;s&gt;&#039; <strong>FROM</strong> dual',
+                'SELECT \'<s>\' FROM dual',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider queryKeywords
+     *
+     * @param mixed $expected
+     * @param mixed $sql
+     */
+    public function testHighlightQueryKeywords($expected, $sql)
+    {
+        $query = new Query($this->db);
+        $query->setQuery($sql);
+        $query->getQuery();
+
+        $this->assertSame($expected, $query->debugToolbarDisplay());
+    }
 }

From 26e0025df9c508972934fa64cbf1f3be728bc60a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 17 Oct 2021 00:11:01 +0900
Subject: [PATCH 0467/2325] Fix CSRF filter does not work when set it to only
 post

* refactor: case the existence of config files with if statements

To make it easier to know which parts to delete in the future.

* docs: fix PHPDoc explanation

* fix: bug that CSRF cookie is not sent just by calling csrf_hash()

When the CSRF filter was set to POST method, it did not work.

* refactor: replace deprecated method getHeader()

* refactor: extract method

* refactor: extract method

* refactor: extract method

* refactor: use $this->hash instead of $_COOKIE

* test: fix the timing for setting superglobals

* test: fix Cannot modify header information

ErrorException: Cannot modify header information - headers already sent by ...

* style: vendor/bin/rector process

* refactor: ensure instance

It becomes clear that it is `SecurityConfig`.

Co-authored-by: Abdul Malik Ikhsan <samsonasik@gmail.com>

* refactor: ensure instance

It becomes clear that it is `CookieConfig`.

Co-authored-by: Abdul Malik Ikhsan <samsonasik@gmail.com>

* refactor: when $cookie is null, Cookie::setDefaults($cookie) does nothing

* refactor: extract method

* fix: make private extracted methods

* fix: make private added property

* fix: fallback to the local properties

Takes care when a user removes properties in config classes.

* refactor: use $request instead of $_POST

Co-authored-by: Abdul Malik Ikhsan <samsonasik@gmail.com>
---
 app/Config/Security.php                     |   2 +-
 system/Security/Security.php                | 128 ++++++++++++++------
 tests/system/CommonFunctionsTest.php        |   3 +
 tests/system/CommonSingleServiceTest.php    |   6 +-
 tests/system/Config/ServicesTest.php        |   2 +
 tests/system/Helpers/SecurityHelperTest.php |   5 +
 tests/system/Security/SecurityTest.php      |  48 +++++---
 7 files changed, 135 insertions(+), 59 deletions(-)

diff --git a/app/Config/Security.php b/app/Config/Security.php
index 82afb9396ec4..01000ff52088 100644
--- a/app/Config/Security.php
+++ b/app/Config/Security.php
@@ -57,7 +57,7 @@ class Security extends BaseConfig
      * CSRF Regenerate
      * --------------------------------------------------------------------------
      *
-     * Regenerate CSRF Token on every request.
+     * Regenerate CSRF Token on every submission.
      *
      * @var bool
      */
diff --git a/system/Security/Security.php b/system/Security/Security.php
index 0f508628e240..7bf3b6689095 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -17,6 +17,7 @@
 use Config\App;
 use Config\Cookie as CookieConfig;
 use Config\Security as SecurityConfig;
+use Config\Services;
 
 /**
  * Class Security
@@ -77,8 +78,6 @@ class Security implements SecurityInterface
      * Defaults to two hours (in seconds).
      *
      * @var int
-     *
-     * @deprecated
      */
     protected $expires = 7200;
 
@@ -117,6 +116,18 @@ class Security implements SecurityInterface
      */
     protected $samesite = Cookie::SAMESITE_LAX;
 
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * CSRF Cookie Name without Prefix
+     *
+     * @var string
+     */
+    private $rawCookieName;
+
     /**
      * Constructor.
      *
@@ -125,27 +136,46 @@ class Security implements SecurityInterface
      */
     public function __construct(App $config)
     {
-        /** @var SecurityConfig $security */
+        /** @var SecurityConfig|null $security */
         $security = config('Security');
 
         // Store CSRF-related configurations
-        $this->tokenName  = $security->tokenName ?? $config->CSRFTokenName ?? $this->tokenName;
-        $this->headerName = $security->headerName ?? $config->CSRFHeaderName ?? $this->headerName;
-        $this->regenerate = $security->regenerate ?? $config->CSRFRegenerate ?? $this->regenerate;
-        $rawCookieName    = $security->cookieName ?? $config->CSRFCookieName ?? $this->cookieName;
+        if ($security instanceof SecurityConfig) {
+            $this->tokenName     = $security->tokenName ?? $this->tokenName;
+            $this->headerName    = $security->headerName ?? $this->headerName;
+            $this->regenerate    = $security->regenerate ?? $this->regenerate;
+            $this->rawCookieName = $security->cookieName ?? $this->rawCookieName;
+            $this->expires       = $security->expires ?? $this->expires;
+        } else {
+            // `Config/Security.php` is absence
+            $this->tokenName     = $config->CSRFTokenName ?? $this->tokenName;
+            $this->headerName    = $config->CSRFHeaderName ?? $this->headerName;
+            $this->regenerate    = $config->CSRFRegenerate ?? $this->regenerate;
+            $this->rawCookieName = $config->CSRFCookieName ?? $this->rawCookieName;
+            $this->expires       = $config->CSRFExpire ?? $this->expires;
+        }
 
-        /** @var CookieConfig $cookie */
-        $cookie = config('Cookie');
+        $this->configureCookie($config);
 
-        $cookiePrefix     = $cookie->prefix ?? $config->cookiePrefix;
-        $this->cookieName = $cookiePrefix . $rawCookieName;
+        $this->request = Services::request();
 
-        $expires = $security->expires ?? $config->CSRFExpire ?? 7200;
+        $this->generateHash();
+    }
+
+    private function configureCookie(App $config): void
+    {
+        /** @var CookieConfig|null $cookie */
+        $cookie = config('Cookie');
 
-        Cookie::setDefaults($cookie);
-        $this->cookie = new Cookie($rawCookieName, $this->generateHash(), [
-            'expires' => $expires === 0 ? 0 : time() + $expires,
-        ]);
+        if ($cookie instanceof CookieConfig) {
+            $cookiePrefix     = $cookie->prefix;
+            $this->cookieName = $cookiePrefix . $this->rawCookieName;
+            Cookie::setDefaults($cookie);
+        } else {
+            // `Config/Cookie.php` is absence
+            $cookiePrefix     = $config->cookiePrefix;
+            $this->cookieName = $cookiePrefix . $this->rawCookieName;
+        }
     }
 
     /**
@@ -202,26 +232,15 @@ public function verify(RequestInterface $request)
             return $this->sendCookie($request);
         }
 
-        // Does the token exist in POST, HEADER or optionally php:://input - json data.
-        if ($request->hasHeader($this->headerName) && ! empty($request->getHeader($this->headerName)->getValue())) {
-            $tokenName = $request->getHeader($this->headerName)->getValue();
-        } else {
-            $json = json_decode($request->getBody());
-
-            if (! empty($request->getBody()) && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
-                $tokenName = $json->{$this->tokenName} ?? null;
-            } else {
-                $tokenName = null;
-            }
-        }
-
-        $token = $_POST[$this->tokenName] ?? $tokenName;
+        $token = $this->getPostedToken($request);
 
         // Does the tokens exist in both the POST/POSTed JSON and COOKIE arrays and match?
-        if (! isset($token, $_COOKIE[$this->cookieName]) || ! hash_equals($token, $_COOKIE[$this->cookieName])) {
+        if (! isset($token, $this->hash) || ! hash_equals($this->hash, $token)) {
             throw SecurityException::forDisallowedAction();
         }
 
+        $json = json_decode($request->getBody());
+
         if (isset($_POST[$this->tokenName])) {
             // We kill this since we're done and we don't want to pollute the POST array.
             unset($_POST[$this->tokenName]);
@@ -237,14 +256,31 @@ public function verify(RequestInterface $request)
             unset($_COOKIE[$this->cookieName]);
         }
 
-        $this->cookie = $this->cookie->withValue($this->generateHash());
-        $this->sendCookie($request);
+        $this->generateHash();
 
         log_message('info', 'CSRF token verified.');
 
         return $this;
     }
 
+    private function getPostedToken(RequestInterface $request): ?string
+    {
+        // Does the token exist in POST, HEADER or optionally php:://input - json data.
+        if ($request->hasHeader($this->headerName) && ! empty($request->header($this->headerName)->getValue())) {
+            $tokenName = $request->header($this->headerName)->getValue();
+        } else {
+            $json = json_decode($request->getBody());
+
+            if (! empty($request->getBody()) && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
+                $tokenName = $json->{$this->tokenName} ?? null;
+            } else {
+                $tokenName = null;
+            }
+        }
+
+        return $request->getPost($this->tokenName) ?? $tokenName;
+    }
+
     /**
      * Returns the CSRF Hash.
      */
@@ -373,19 +409,37 @@ protected function generateHash(): string
             // We don't necessarily want to regenerate it with
             // each page load since a page could contain embedded
             // sub-pages causing this feature to fail
-            if (isset($_COOKIE[$this->cookieName])
-                && is_string($_COOKIE[$this->cookieName])
-                && preg_match('#^[0-9a-f]{32}$#iS', $_COOKIE[$this->cookieName]) === 1
-            ) {
+            if ($this->isHashInCookie()) {
                 return $this->hash = $_COOKIE[$this->cookieName];
             }
 
             $this->hash = bin2hex(random_bytes(16));
+
+            $this->saveHashInCookie();
         }
 
         return $this->hash;
     }
 
+    private function isHashInCookie(): bool
+    {
+        return isset($_COOKIE[$this->cookieName])
+        && is_string($_COOKIE[$this->cookieName])
+        && preg_match('#^[0-9a-f]{32}$#iS', $_COOKIE[$this->cookieName]) === 1;
+    }
+
+    private function saveHashInCookie()
+    {
+        $this->cookie = new Cookie(
+            $this->rawCookieName,
+            $this->hash,
+            [
+                'expires' => $this->expires === 0 ? 0 : time() + $this->expires,
+            ]
+        );
+        $this->sendCookie($this->request);
+    }
+
     /**
      * CSRF Send Cookie
      *
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 1ce1e7ab61a2..ad5ae969b1bc 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -22,6 +22,7 @@
 use CodeIgniter\Session\Session;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockIncomingRequest;
+use CodeIgniter\Test\Mock\MockSecurity;
 use CodeIgniter\Test\Mock\MockSession;
 use CodeIgniter\Test\TestLogger;
 use Config\App;
@@ -232,6 +233,8 @@ public function testAppTimezone()
 
     public function testCSRFToken()
     {
+        Services::injectMock('security', new MockSecurity(new App()));
+
         $this->assertSame('csrf_test_name', csrf_token());
     }
 
diff --git a/tests/system/CommonSingleServiceTest.php b/tests/system/CommonSingleServiceTest.php
index 1dca6f823ab8..ede9d9b0445e 100644
--- a/tests/system/CommonSingleServiceTest.php
+++ b/tests/system/CommonSingleServiceTest.php
@@ -13,6 +13,8 @@
 
 use CodeIgniter\Config\Services;
 use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\Mock\MockSecurity;
+use Config\App;
 use ReflectionClass;
 use ReflectionMethod;
 
@@ -26,6 +28,8 @@ final class CommonSingleServiceTest extends CIUnitTestCase
      */
     public function testSingleServiceWithNoParamsSupplied(string $service): void
     {
+        Services::injectMock('security', new MockSecurity(new App()));
+
         $service1 = single_service($service);
         $service2 = single_service($service);
 
@@ -90,7 +94,7 @@ public static function serviceNamesProvider(): iterable
                 continue;
             }
 
-            yield [$name];
+            yield $name => [$name];
         }
     }
 }
diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php
index 6733ee06fff6..2712bdce8dd5 100644
--- a/tests/system/Config/ServicesTest.php
+++ b/tests/system/Config/ServicesTest.php
@@ -397,6 +397,8 @@ public function testRouter()
 
     public function testSecurity()
     {
+        Services::injectMock('security', new MockSecurity(new App()));
+
         $result = Services::security();
         $this->assertInstanceOf(Security::class, $result);
     }
diff --git a/tests/system/Helpers/SecurityHelperTest.php b/tests/system/Helpers/SecurityHelperTest.php
index 3e1d8c332080..4d8169f6f712 100644
--- a/tests/system/Helpers/SecurityHelperTest.php
+++ b/tests/system/Helpers/SecurityHelperTest.php
@@ -12,6 +12,9 @@
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\Mock\MockSecurity;
+use Config\App;
+use Tests\Support\Config\Services as Services;
 
 /**
  * @internal
@@ -27,6 +30,8 @@ protected function setUp(): void
 
     public function testSanitizeFilenameSimpleSuccess()
     {
+        Services::injectMock('security', new MockSecurity(new App()));
+
         $this->assertSame('hello.doc', sanitize_filename('hello.doc'));
     }
 
diff --git a/tests/system/Security/SecurityTest.php b/tests/system/Security/SecurityTest.php
index aadb84aa775b..74e8621e3a34 100644
--- a/tests/system/Security/SecurityTest.php
+++ b/tests/system/Security/SecurityTest.php
@@ -41,7 +41,11 @@ protected function setUp(): void
 
     public function testBasicConfigIsSaved()
     {
-        $security = new Security(new MockAppConfig());
+        $config   = new MockAppConfig();
+        $security = $this->getMockBuilder(Security::class)
+            ->setConstructorArgs([$config])
+            ->onlyMethods(['doSendCookie'])
+            ->getMock();
 
         $hash = $security->getHash();
 
@@ -53,7 +57,11 @@ public function testHashIsReadFromCookie()
     {
         $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
 
-        $security = new Security(new MockAppConfig());
+        $config   = new MockAppConfig();
+        $security = $this->getMockBuilder(Security::class)
+            ->setConstructorArgs([$config])
+            ->onlyMethods(['doSendCookie'])
+            ->getMock();
 
         $this->assertSame('8b9218a55906f9dcc1dc263dce7f005a', $security->getHash());
     }
@@ -84,14 +92,14 @@ public function testCSRFVerifyPostThrowsExceptionOnNoMatch()
 
     public function testCSRFVerifyPostReturnsSelfOnMatch()
     {
-        $security = new MockSecurity(new MockAppConfig());
-        $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
-
         $_SERVER['REQUEST_METHOD']   = 'POST';
         $_POST['foo']                = 'bar';
         $_POST['csrf_test_name']     = '8b9218a55906f9dcc1dc263dce7f005a';
         $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
 
+        $security = new MockSecurity(new MockAppConfig());
+        $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+
         $this->assertInstanceOf(Security::class, $security->verify($request));
         $this->assertLogged('info', 'CSRF token verified.');
 
@@ -114,15 +122,15 @@ public function testCSRFVerifyHeaderThrowsExceptionOnNoMatch()
 
     public function testCSRFVerifyHeaderReturnsSelfOnMatch()
     {
+        $_SERVER['REQUEST_METHOD']   = 'POST';
+        $_POST['foo']                = 'bar';
+        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
+
         $security = new MockSecurity(new MockAppConfig());
         $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
 
         $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005a');
 
-        $_SERVER['REQUEST_METHOD']   = 'POST';
-        $_POST['foo']                = 'bar';
-        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
-
         $this->assertInstanceOf(Security::class, $security->verify($request));
         $this->assertLogged('info', 'CSRF token verified.');
 
@@ -145,14 +153,14 @@ public function testCSRFVerifyJsonThrowsExceptionOnNoMatch()
 
     public function testCSRFVerifyJsonReturnsSelfOnMatch()
     {
+        $_SERVER['REQUEST_METHOD']   = 'POST';
+        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
+
         $security = new MockSecurity(new MockAppConfig());
         $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
 
         $request->setBody('{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005a","foo":"bar"}');
 
-        $_SERVER['REQUEST_METHOD']   = 'POST';
-        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
-
         $this->assertInstanceOf(Security::class, $security->verify($request));
         $this->assertLogged('info', 'CSRF token verified.');
 
@@ -170,6 +178,10 @@ public function testSanitizeFilename()
 
     public function testRegenerateWithFalseSecurityRegenerateProperty()
     {
+        $_SERVER['REQUEST_METHOD']   = 'POST';
+        $_POST['csrf_test_name']     = '8b9218a55906f9dcc1dc263dce7f005a';
+        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
+
         $config             = new SecurityConfig();
         $config->regenerate = false;
         Factories::injectMock('config', 'Security', $config);
@@ -177,10 +189,6 @@ public function testRegenerateWithFalseSecurityRegenerateProperty()
         $security = new MockSecurity(new MockAppConfig());
         $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
 
-        $_SERVER['REQUEST_METHOD']   = 'POST';
-        $_POST['csrf_test_name']     = '8b9218a55906f9dcc1dc263dce7f005a';
-        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
-
         $oldHash = $security->getHash();
         $security->verify($request);
         $newHash = $security->getHash();
@@ -190,6 +198,10 @@ public function testRegenerateWithFalseSecurityRegenerateProperty()
 
     public function testRegenerateWithTrueSecurityRegenerateProperty()
     {
+        $_SERVER['REQUEST_METHOD']   = 'POST';
+        $_POST['csrf_test_name']     = '8b9218a55906f9dcc1dc263dce7f005a';
+        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
+
         $config             = new SecurityConfig();
         $config->regenerate = true;
         Factories::injectMock('config', 'Security', $config);
@@ -197,10 +209,6 @@ public function testRegenerateWithTrueSecurityRegenerateProperty()
         $security = new MockSecurity(new MockAppConfig());
         $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
 
-        $_SERVER['REQUEST_METHOD']   = 'POST';
-        $_POST['csrf_test_name']     = '8b9218a55906f9dcc1dc263dce7f005a';
-        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
-
         $oldHash = $security->getHash();
         $security->verify($request);
         $newHash = $security->getHash();

From f3424a5062eba1e05edbcb1f609756fdcfcb25f0 Mon Sep 17 00:00:00 2001
From: uraku <om.ur.xkk87@gmail.com>
Date: Sun, 17 Oct 2021 02:05:17 +0900
Subject: [PATCH 0468/2325] Fix GC issue when session lifetime is set to 0

* fix #4169 GC processing issues when session lifetime is 0

* Added description about the structure of the session library of the document.

* Apply suggestions from code review

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 system/Session/Session.php                   | 2 +-
 user_guide_src/source/libraries/sessions.rst | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/system/Session/Session.php b/system/Session/Session.php
index abeed407425b..ebfb6a94d082 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -306,7 +306,7 @@ protected function configure()
 
         if (! isset($this->sessionExpiration)) {
             $this->sessionExpiration = (int) ini_get('session.gc_maxlifetime');
-        } else {
+        } elseif ($this->sessionExpiration > 0) {
             ini_set('session.gc_maxlifetime', (string) $this->sessionExpiration);
         }
 
diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
index b2efd60b7025..d38ec66e8994 100644
--- a/user_guide_src/source/libraries/sessions.rst
+++ b/user_guide_src/source/libraries/sessions.rst
@@ -458,6 +458,12 @@ Preference                     Default                                      Opti
     unexpected results or be changed in the future. Please configure
     everything properly.
 
+.. note:: If ``sessionExpiration`` is set to ``0``, the ``session.gc_maxlifetime``
+    setting set by PHP in session management will be used as-is
+    (often the default value of ``1440``). This needs to be changed in
+    ``php.ini`` or via ``ini_set()`` as needed.
+
+
 In addition to the values above, the cookie and native drivers apply the
 following configuration values shared by the :doc:`IncomingRequest </incoming/incomingrequest>` and
 :doc:`Security <security>` classes:

From dfe4ad4c3d344fe272f214f771458e0895060986 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 17 Oct 2021 12:31:38 +0900
Subject: [PATCH 0469/2325] docs: small improvement in debugging

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

diff --git a/user_guide_src/source/testing/debugging.rst b/user_guide_src/source/testing/debugging.rst
index 4f6ffdce9e3f..fbd0f8eed440 100644
--- a/user_guide_src/source/testing/debugging.rst
+++ b/user_guide_src/source/testing/debugging.rst
@@ -19,7 +19,7 @@ and much, much more.
 Enabling Kint
 =============
 
-By default, Kint is enabled in **development** and **testing** environments only. This can be altered by modifying
+By default, Kint is enabled in **development** and **testing** :doc:`environments </general/environments>` only. This can be altered by modifying
 the ``$useKint`` value in the environment configuration section of the main **index.php** file::
 
     $useKint = true;
@@ -59,7 +59,7 @@ to help you debug and optimize.
 Enabling the Toolbar
 ====================
 
-The toolbar is enabled by default in any environment *except* production. It will be shown whenever the
+The toolbar is enabled by default in any :doc:`environment </general/environments>` *except* **production**. It will be shown whenever the
 constant CI_DEBUG is defined and its value is truthy. This is defined in the boot files (e.g.
 **app/Config/Boot/development.php**) and can be modified there to determine what environment to show.
 

From 59c79d9a1912c61cdc654bd63109e7c9bdbdc94c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 17 Oct 2021 17:59:56 +0900
Subject: [PATCH 0470/2325] fix: test failures on macOS

`var` is a symlink to `private/var` on macOS
---
 system/Publisher/Publisher.php                  | 1 +
 tests/system/Publisher/PublisherSupportTest.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php
index 38e990776ef3..7e47c136fd03 100644
--- a/system/Publisher/Publisher.php
+++ b/system/Publisher/Publisher.php
@@ -229,6 +229,7 @@ final public function getScratch(): string
         if ($this->scratch === null) {
             $this->scratch = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . bin2hex(random_bytes(6)) . DIRECTORY_SEPARATOR;
             mkdir($this->scratch, 0700);
+            $this->scratch = realpath($this->scratch) . DIRECTORY_SEPARATOR;
         }
 
         return $this->scratch;
diff --git a/tests/system/Publisher/PublisherSupportTest.php b/tests/system/Publisher/PublisherSupportTest.php
index 43be04406891..83a41b69e991 100644
--- a/tests/system/Publisher/PublisherSupportTest.php
+++ b/tests/system/Publisher/PublisherSupportTest.php
@@ -144,6 +144,7 @@ public function testWipe()
     {
         $directory = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . bin2hex(random_bytes(6));
         mkdir($directory, 0700);
+        $directory = realpath($directory);
         $this->assertDirectoryExists($directory);
         config('Publisher')->restrictions[$directory] = ''; // Allow the directory
 

From 59ae985f9db44d443b573db1183501d3e8e9caf1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 17 Oct 2021 22:55:21 +0900
Subject: [PATCH 0471/2325] Add `@group CacheLive` to tests

* test: add `@group CacheLive`

* docs: add about CacheLive
---
 tests/README.md                                      | 4 ++--
 tests/system/Cache/Handlers/MemcachedHandlerTest.php | 2 ++
 tests/system/Cache/Handlers/PredisHandlerTest.php    | 2 ++
 tests/system/Cache/Handlers/RedisHandlerTest.php     | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/README.md b/tests/README.md
index 0ae640f24844..438c2674f4bc 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -49,9 +49,9 @@ Individual tests can be run by including the relative path to the test file.
 
 	> ./phpunit tests/system/HTTP/RequestTest.php
 
-You can run the tests without running the live database tests.
+You can run the tests without running the live database and the live cache tests.
 
-	> ./phpunit --exclude-group DatabaseLive
+	> ./phpunit --exclude-group DatabaseLive,CacheLive
 
 ## Generating Code Coverage
 
diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
index af2e0a77775c..240225fd8bc0 100644
--- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php
+++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
@@ -16,6 +16,8 @@
 use Exception;
 
 /**
+ * @group CacheLive
+ *
  * @internal
  */
 final class MemcachedHandlerTest extends AbstractHandlerTest
diff --git a/tests/system/Cache/Handlers/PredisHandlerTest.php b/tests/system/Cache/Handlers/PredisHandlerTest.php
index b91ecefa2e2b..9b762f9c27f1 100644
--- a/tests/system/Cache/Handlers/PredisHandlerTest.php
+++ b/tests/system/Cache/Handlers/PredisHandlerTest.php
@@ -15,6 +15,8 @@
 use Config\Cache;
 
 /**
+ * @group CacheLive
+ *
  * @internal
  */
 final class PredisHandlerTest extends AbstractHandlerTest
diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php
index 863d9efa3b59..32d0cdf8223e 100644
--- a/tests/system/Cache/Handlers/RedisHandlerTest.php
+++ b/tests/system/Cache/Handlers/RedisHandlerTest.php
@@ -15,6 +15,8 @@
 use Config\Cache;
 
 /**
+ * @group CacheLive
+ *
  * @internal
  */
 final class RedisHandlerTest extends AbstractHandlerTest

From d10a6029cd766f0a44e468d4f91899dcf99a522e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Oct 2021 00:23:48 +0900
Subject: [PATCH 0472/2325] docs: hashed id (`encodeID()`) in CodeIgniter\Model
 has been removed

https://github.com/codeigniter4/CodeIgniter4/commit/f87ffec26b0d3dca7544a6e76e9110f03671dc54
---
 user_guide_src/source/incoming/routing.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 4bc619f1449f..5740898dd6a6 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -68,7 +68,7 @@ Placeholders Description
 (:num)       will match any integer.
 (:alpha)     will match any string of alphabetic characters
 (:alphanum)  will match any string of alphabetic characters or integers, or any combination of the two.
-(:hash)      is the same as **(:segment)**, but can be used to easily see which routes use hashed ids (see the :doc:`Model </models/model>` docs).
+(:hash)      is the same as **(:segment)**, but can be used to easily see which routes use hashed ids.
 ============ ===========================================================================================================
 
 .. note:: **{locale}** cannot be used as a placeholder or other part of the route, as it is reserved for use

From 52af51d1ffa588fc47aa71f725507ade8726b7df Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Oct 2021 13:56:53 +0900
Subject: [PATCH 0473/2325] docs: unify the decoration of app/Config/*.php

---
 user_guide_src/cilexer/pycilexer.egg-info/top_level.txt   | 1 +
 user_guide_src/source/concepts/structure.rst              | 2 +-
 user_guide_src/source/general/logging.rst                 | 6 +++---
 user_guide_src/source/general/modules.rst                 | 2 +-
 user_guide_src/source/helpers/cookie_helper.rst           | 2 +-
 user_guide_src/source/helpers/text_helper.rst             | 2 +-
 user_guide_src/source/incoming/controllers.rst            | 2 +-
 user_guide_src/source/incoming/filters.rst                | 2 +-
 user_guide_src/source/incoming/routing.rst                | 8 ++++----
 .../source/installation/installing_composer.rst           | 2 +-
 user_guide_src/source/installation/troubleshooting.rst    | 6 +++---
 user_guide_src/source/libraries/cookies.rst               | 2 +-
 user_guide_src/source/libraries/encryption.rst            | 6 +++---
 user_guide_src/source/libraries/honeypot.rst              | 4 ++--
 14 files changed, 24 insertions(+), 23 deletions(-)
 create mode 100644 user_guide_src/cilexer/pycilexer.egg-info/top_level.txt

diff --git a/user_guide_src/cilexer/pycilexer.egg-info/top_level.txt b/user_guide_src/cilexer/pycilexer.egg-info/top_level.txt
new file mode 100644
index 000000000000..2f88e1d75272
--- /dev/null
+++ b/user_guide_src/cilexer/pycilexer.egg-info/top_level.txt
@@ -0,0 +1 @@
+cilexer
diff --git a/user_guide_src/source/concepts/structure.rst b/user_guide_src/source/concepts/structure.rst
index 40c5f868ee73..14bb3a59304b 100644
--- a/user_guide_src/source/concepts/structure.rst
+++ b/user_guide_src/source/concepts/structure.rst
@@ -84,6 +84,6 @@ Modifying Directory Locations
 -----------------------------
 
 If you've relocated any of the main directories, you can change the configuration
-settings inside ``app/Config/Paths``.
+settings inside **app/Config/Paths.php**.
 
 Please read `Managing your Applications <../general/managing_apps.html>`_
diff --git a/user_guide_src/source/general/logging.rst b/user_guide_src/source/general/logging.rst
index 6a6ca1e49e0e..7fa706ce6a86 100644
--- a/user_guide_src/source/general/logging.rst
+++ b/user_guide_src/source/general/logging.rst
@@ -38,7 +38,7 @@ Configuration
 =============
 
 You can modify which levels are actually logged, as well as assign different Loggers to handle different levels, within
-the ``/app/Config/Logger.php`` configuration file.
+the **app/Config/Logger.php** configuration file.
 
 The ``threshold`` value of the config file determines which levels are logged across your application. If any levels
 are requested to be logged by the application, but the threshold doesn't allow them to log currently, they will be
@@ -140,8 +140,8 @@ You can use any other logger that you might like as long as it extends from eith
 that you can easily drop in use for any PSR3-compatible logger, or create your own.
 
 You must ensure that the third-party logger can be found by the system, by adding it to either
-the ``/app/Config/Autoload.php`` configuration file, or through another autoloader,
-like Composer. Next, you should modify ``/app/Config/Services.php`` to point the ``logger``
+the **app/Config/Autoload.php** configuration file, or through another autoloader,
+like Composer. Next, you should modify **app/Config/Services.php** to point the ``logger``
 alias to your new class name.
 
 Now, any call that is done through the ``log_message()`` function will use your library instead.
diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst
index b744f30c0441..6fc24ecad55d 100644
--- a/user_guide_src/source/general/modules.rst
+++ b/user_guide_src/source/general/modules.rst
@@ -73,7 +73,7 @@ would be used.
 
 Another approach provided by CodeIgniter is to autoload these *non-class* files like how you would autoload
 your classes. All we need to do is provide the list of paths to those files and include them in the
-``$files`` property of your ``app/Config/Autoload.php`` file.
+``$files`` property of your **app/Config/Autoload.php** file.
 
 ::
 
diff --git a/user_guide_src/source/helpers/cookie_helper.rst b/user_guide_src/source/helpers/cookie_helper.rst
index 2a7f0e6e6c43..c7df02f6461f 100755
--- a/user_guide_src/source/helpers/cookie_helper.rst
+++ b/user_guide_src/source/helpers/cookie_helper.rst
@@ -50,7 +50,7 @@ The following functions are available:
     detailed description of its use, as this function acts very
     similarly to ``IncomingRequest::getCookie()``, except it will also prepend
     the ``$cookiePrefix`` that you might've set in your
-    *app/Config/App.php* file.
+    **app/Config/App.php** file.
 
 .. php:function:: delete_cookie($name[, $domain = ''[, $path = '/'[, $prefix = '']]])
 
diff --git a/user_guide_src/source/helpers/text_helper.rst b/user_guide_src/source/helpers/text_helper.rst
index 98a6f3b9e332..d83fb54835ae 100755
--- a/user_guide_src/source/helpers/text_helper.rst
+++ b/user_guide_src/source/helpers/text_helper.rst
@@ -257,7 +257,7 @@ The following functions are available:
         $string = convert_accented_characters($string);
 
     .. note:: This function uses a companion config file
-        `app/Config/ForeignCharacters.php` to define the to and
+        **app/Config/ForeignCharacters.php** to define the to and
         from array for transliteration.
 
 .. php:function:: word_censor($str, $censored[, $replacement = ''])
diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index dfca82fea06e..516028d8c04d 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -288,7 +288,7 @@ one and place your controller classes within them.
 Each of your sub-directories may contain a default controller which will be
 called if the URL contains *only* the sub-directory. Simply put a controller
 in there that matches the name of your 'default_controller' as specified in
-your *app/Config/Routes.php* file.
+your **app/Config/Routes.php** file.
 
 CodeIgniter also permits you to remap your URIs using its :doc:`URI Routing <routing>` feature.
 
diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index a95333516503..259bb496e0b7 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -88,7 +88,7 @@ the final output, or even to filter the final output with a bad words filter.
 Configuring Filters
 *******************
 
-Once you've created your filters, you need to configure when they get run. This is done in ``app/Config/Filters.php``.
+Once you've created your filters, you need to configure when they get run. This is done in **app/Config/Filters.php**.
 This file contains four properties that allow you to configure exactly when the filters run.
 
 $aliases
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 5740898dd6a6..7e0e6d462f9b 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -238,7 +238,7 @@ run the filter before or after the controller. This is especially handy during a
         $routes->resource('users');
     });
 
-The value for the filter must match one of the aliases defined within ``app/Config/Filters.php``.
+The value for the filter must match one of the aliases defined within **app/Config/Filters.php**.
 
 It is possible to nest groups within groups for finer organization if you need it::
 
@@ -355,14 +355,14 @@ Applying Filters
 You can alter the behavior of specific routes by supplying filters to run before or after the controller. This is especially handy during authentication or api logging.
 The value for the filter can be a string or an array of strings:
 
-* matching the aliases defined in ``app/Config/Filters.php``.
+* matching the aliases defined in **app/Config/Filters.php**.
 * filter classnames
 
 See `Controller filters <filters.html>`_ for more information on setting up filters.
 
 **Alias filter**
 
-You specify an alias defined in ``app/Config/Filters.php`` for the filter value::
+You specify an alias defined in **app/Config/Filters.php** for the filter value::
 
     $routes->add('admin',' AdminController::index', ['filter' => 'admin-auth']);
 
@@ -477,7 +477,7 @@ Routes Configuration Options
 ============================
 
 The RoutesCollection class provides several options that affect all routes, and can be modified to meet your
-application's needs. These options are available at the top of `/app/Config/Routes.php`.
+application's needs. These options are available at the top of **app/Config/Routes.php**.
 
 Default Namespace
 -----------------
diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst
index 16e5d1b2015f..b63e34602425 100644
--- a/user_guide_src/source/installation/installing_composer.rst
+++ b/user_guide_src/source/installation/installing_composer.rst
@@ -140,7 +140,7 @@ Copy the ``env``, ``phpunit.xml.dist`` and ``spark`` files, from
 ``vendor/codeigniter4/framework`` to your project root
 
 You will have to adjust the system path to refer to the vendor one, e.g., ``ROOTPATH . '/vendor/codeigniter4/framework/system'``,
-- the ``$systemDirectory`` variable in ``app/Config/Paths.php``
+- the ``$systemDirectory`` variable in **app/Config/Paths.php**
 
 Upgrading
 ---------
diff --git a/user_guide_src/source/installation/troubleshooting.rst b/user_guide_src/source/installation/troubleshooting.rst
index dc15798d9839..a0b1684fda9d 100644
--- a/user_guide_src/source/installation/troubleshooting.rst
+++ b/user_guide_src/source/installation/troubleshooting.rst
@@ -30,11 +30,11 @@ Only the default page loads
 If you find that no matter what you put in your URL only your default
 page is loading, it might be that your server does not support the
 REQUEST_URI variable needed to serve search-engine friendly URLs. As a
-first step, open your *app/Config/App.php* file and look for
+first step, open your **app/Config/App.php** file and look for
 the URI Protocol information. It will recommend that you try a couple of
 alternate settings. If it still doesn't work after you've tried this
 you'll need to force CodeIgniter to add a question mark to your URLs. To
-do this open your *app/Config/App.php* file and change this::
+do this open your **app/Config/App.php** file and change this::
 
     public $indexPage = 'index.php';
 
@@ -72,7 +72,7 @@ Don't forget to reset the environment to "production" once you fix the problem!
 CodeIgniter Error Logs
 ----------------------
 
-CodeIgniter logs error messages, according to the settings in `app/Config/Logger.php`.
+CodeIgniter logs error messages, according to the settings in **app/Config/Logger.php**.
 
 You can adjust the error threshold to see more or fewer messages.
 
diff --git a/user_guide_src/source/libraries/cookies.rst b/user_guide_src/source/libraries/cookies.rst
index e935c56bb1e8..86d36dec9a25 100644
--- a/user_guide_src/source/libraries/cookies.rst
+++ b/user_guide_src/source/libraries/cookies.rst
@@ -431,7 +431,7 @@ Cookie Personalization
 
 Sane defaults are already in place inside the ``Cookie`` class to ensure the smooth creation of cookie
 objects. However, you may wish to define your own settings by changing the following settings in the
-``Config\Cookie`` class in ``app/Config/Cookie.php`` file.
+``Config\Cookie`` class in **app/Config/Cookie.php** file.
 
 ==================== ===================================== ========= =====================================================
 Setting              Options/ Types                        Default   Description
diff --git a/user_guide_src/source/libraries/encryption.rst b/user_guide_src/source/libraries/encryption.rst
index 54fb1fb333a7..2c8373743f35 100644
--- a/user_guide_src/source/libraries/encryption.rst
+++ b/user_guide_src/source/libraries/encryption.rst
@@ -62,7 +62,7 @@ You don't need to worry about it.
 Configuring the Library
 =======================
 
-The example above uses the configuration settings found in ``app/Config/Encryption.php``.
+The example above uses the configuration settings found in **app/Config/Encryption.php**.
 
 ========== ====================================================
 Option     Possible values (default in parentheses)
@@ -108,10 +108,10 @@ you can use the Encryption library's ``createKey()`` method.
     $key = sodium_crypto_secretbox_keygen();
     $key = \CodeIgniter\Encryption\Encryption::createKey(SODIUM_CRYPTO_SECRETBOX_KEYBYTES);
 
-The key can be stored in ``app/Config/Encryption.php``, or you can design
+The key can be stored in **app/Config/Encryption.php**, or you can design
 a storage mechanism of your own and pass the key dynamically when encrypting/decrypting.
 
-To save your key to your ``app/Config/Encryption.php``, open the file
+To save your key to your **app/Config/Encryption.php**, open the file
 and set::
 
     public $key = 'YOUR KEY';
diff --git a/user_guide_src/source/libraries/honeypot.rst b/user_guide_src/source/libraries/honeypot.rst
index 959a2278178e..471c0d520003 100644
--- a/user_guide_src/source/libraries/honeypot.rst
+++ b/user_guide_src/source/libraries/honeypot.rst
@@ -14,7 +14,7 @@ assumed the request is coming from a Bot, and you can throw a ``HoneypotExceptio
 Enabling Honeypot
 =====================
 
-To enable a Honeypot, changes have to be made to the ``app/Config/Filters.php``. Just uncomment honeypot
+To enable a Honeypot, changes have to be made to the **app/Config/Filters.php**. Just uncomment honeypot
 from the ``$globals`` array, like...::
 
     public $globals = [
@@ -36,7 +36,7 @@ Customizing Honeypot
 =====================
 
 Honeypot can be customized. The fields below can be set either in
-``app/Config/Honeypot.php`` or in ``.env``.
+**app/Config/Honeypot.php** or in ``.env``.
 
 * ``hidden`` - true|false to control visibility of the honeypot field; default is ``true``
 * ``label`` - HTML label for the honeypot field, default is 'Fill This Field'

From a2309e6c8b15840df432da8ed6a50e71eac15163 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Oct 2021 20:55:17 +0900
Subject: [PATCH 0474/2325] fix: add fallbacks for realpath() so VFS is
 supported

---
 system/Publisher/Publisher.php                  | 3 ++-
 tests/system/Publisher/PublisherSupportTest.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php
index 7e47c136fd03..a492a03e02c3 100644
--- a/system/Publisher/Publisher.php
+++ b/system/Publisher/Publisher.php
@@ -229,7 +229,8 @@ final public function getScratch(): string
         if ($this->scratch === null) {
             $this->scratch = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . bin2hex(random_bytes(6)) . DIRECTORY_SEPARATOR;
             mkdir($this->scratch, 0700);
-            $this->scratch = realpath($this->scratch) . DIRECTORY_SEPARATOR;
+            $this->scratch = realpath($this->scratch) ? realpath($this->scratch) . DIRECTORY_SEPARATOR
+                : $this->scratch . DIRECTORY_SEPARATOR;
         }
 
         return $this->scratch;
diff --git a/tests/system/Publisher/PublisherSupportTest.php b/tests/system/Publisher/PublisherSupportTest.php
index 83a41b69e991..de1fb29fbd93 100644
--- a/tests/system/Publisher/PublisherSupportTest.php
+++ b/tests/system/Publisher/PublisherSupportTest.php
@@ -144,7 +144,7 @@ public function testWipe()
     {
         $directory = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . bin2hex(random_bytes(6));
         mkdir($directory, 0700);
-        $directory = realpath($directory);
+        $directory = realpath($directory) ?: $directory;
         $this->assertDirectoryExists($directory);
         config('Publisher')->restrictions[$directory] = ''; // Allow the directory
 

From 24196f93168af1d5306e0d9b83bddd83a6b1c61e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 19 Oct 2021 11:34:07 +0900
Subject: [PATCH 0475/2325] test: remove invalid @runTestsInSeparateProcesses

It must be in the class PHPdoc.
---
 tests/system/Commands/MigrationIntegrationTest.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/system/Commands/MigrationIntegrationTest.php b/tests/system/Commands/MigrationIntegrationTest.php
index f2fca3405354..7dab2f1f8ef1 100644
--- a/tests/system/Commands/MigrationIntegrationTest.php
+++ b/tests/system/Commands/MigrationIntegrationTest.php
@@ -58,9 +58,6 @@ protected function tearDown(): void
         stream_filter_remove($this->streamFilter);
     }
 
-    /**
-     * @runTestsInSeparateProcesses
-     */
     public function testMigrationWithRollbackHasSameNameFormat(): void
     {
         command('migrate -n App');

From 34afde80f0435e5157db3d60600ee9d974d9f7ba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Oct 2021 15:03:11 +0000
Subject: [PATCH 0476/2325] chore(deps-dev): update rector/rector requirement

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

---
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 8a8fdaf00aa2..bc5e2a6fcaf2 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^0.12.91",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.58",
+        "rector/rector": "0.11.59",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {

From 9718fa0abb12c17cd4597f2edabd3cc4702cef34 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 20 Oct 2021 09:20:24 +0900
Subject: [PATCH 0477/2325] docs: improve tests/README.md

---
 tests/README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/README.md b/tests/README.md
index 438c2674f4bc..a67852b451bd 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -8,7 +8,7 @@ use to test your application. Those details can be found in the documentation.
 ## Requirements
 
 It is recommended to use the latest version of PHPUnit. At the time of this 
-writing we are running version 8.5.13. Support for this has been built into the 
+writing we are running version 9.5.10. Support for this has been built into the 
 **composer.json** file that ships with CodeIgniter and can easily be installed 
 via [Composer](https://getcomposer.org/) if you don't already have it installed globally.
 
@@ -27,11 +27,11 @@ A number of the tests use a running database.
 In order to set up the database edit the details for the `tests` group in 
 **app/Config/Database.php** or **phpunit.xml**. Make sure that you provide a database engine 
 that is currently running on your machine. More details on a test database setup are in the 
-*Docs>>Testing>>Testing Your Database* section of the documentation.
+[Testing Your Database](https://codeigniter.com/user_guide/testing/database.html) section of the documentation.
 
 If you want to run the tests without using live database you can 
-exclude @DatabaseLive group. Or make a copy of **phpunit.dist.xml** - 
-call it **phpunit.xml** - and comment out the <testsuite> named "database". This will make
+exclude `@DatabaseLive` group. Or make a copy of **phpunit.dist.xml** - 
+call it **phpunit.xml** - and comment out the `<testsuite>` named `Database`. This will make
 the tests run quite a bit faster.
 
 ## Running the tests

From 7a1cf38eeb04b4eec2ac760f561099823262f19d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 20 Oct 2021 21:46:42 +0900
Subject: [PATCH 0478/2325] docs: change the version of PHPUnit to major
 version only

Co-authored-by: MGatner <mgatner@icloud.com>
---
 tests/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/README.md b/tests/README.md
index a67852b451bd..0df329864c6b 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -8,7 +8,7 @@ use to test your application. Those details can be found in the documentation.
 ## Requirements
 
 It is recommended to use the latest version of PHPUnit. At the time of this 
-writing we are running version 9.5.10. Support for this has been built into the 
+writing we are running version 9.x. Support for this has been built into the 
 **composer.json** file that ships with CodeIgniter and can easily be installed 
 via [Composer](https://getcomposer.org/) if you don't already have it installed globally.
 

From ac7d3b6875a121d0626a04c0f59717045ea289b8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Oct 2021 00:32:45 +0900
Subject: [PATCH 0479/2325] docs: improve Form Validation Tutorial

Fixes #3017
---
 .../source/libraries/validation.rst           | 41 ++++++++++++++-----
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 940a95953819..d8df45d1c95c 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -150,9 +150,12 @@ To try your form, visit your site using a URL similar to this one::
     example.com/index.php/form/
 
 If you submit the form you should simply see the form reload. That's
-because you haven't set up any validation rules yet.
+because you haven't set up any validation rules in ``$this->validate()`` yet.
 
-.. note:: Since you haven't told the **Validation class** to validate anything
+The ``validate()`` method is a method in the Controller. It uses
+the **Validation class** inside. See *Validating data* in :doc:`/incoming/controllers`.
+
+.. note:: Since you haven't told the ``validate()`` method to validate anything
     yet, it **returns false** (boolean false) **by default**. The ``validate()``
     method only returns true if it has successfully applied your rules without
     any of them failing.
@@ -162,9 +165,9 @@ Explanation
 
 You'll notice several things about the above pages:
 
-The form (Signup.php) is a standard web form with a couple of exceptions:
+The form (**Signup.php**) is a standard web form with a couple of exceptions:
 
-#. It uses a form helper to create the form opening. Technically, this
+#. It uses a :doc:`form helper </helpers/form_helper>` to create the form opening. Technically, this
    isn't necessary. You could create the form using standard HTML.
    However, the benefit of using the helper is that it generates the
    action URL for you, based on the URL in your config file. This makes
@@ -177,15 +180,31 @@ The form (Signup.php) is a standard web form with a couple of exceptions:
    This function will return any error messages sent back by the
    validator. If there are no messages it returns an empty string.
 
-The controller (Form.php) has one method: ``index()``. This method
-uses the Controller-provided validate method and loads the form helper and URL
+The controller (**Form.php**) has one method: ``index()``. This method
+uses the Controller-provided ``validate()`` method and loads the form helper and URL
 helper used by your view files. It also runs the validation routine.
 Based on whether the validation was successful it either presents the
 form or the success page.
 
-Loading the Library
+Add Validation Rules
 ================================================
 
+Then add validation rules in the controller (**Form.php**)::
+
+            if (! $this->validate([
+                'username' => 'required',
+                'password' => 'required|min_length[10]',
+                'passconf' => 'required|matches[password]',
+                'email'    => 'required|valid_email',
+            ])) {
+                ...
+            }
+
+If you submit the form you should see the success page or the form with error messages.
+
+Loading the Library
+************************************************
+
 The library is loaded as a service named **validation**::
 
     $validation =  \Config\Services::validation();
@@ -197,7 +216,7 @@ for including multiple Rulesets, and collections of rules that can be easily reu
     the :doc:`Model </models/model>` provide methods to make validation even easier.
 
 Setting Validation Rules
-================================================
+************************************************
 
 CodeIgniter lets you set as many validation rules as you need for a
 given field, cascading them in order. To set validation rules you
@@ -205,7 +224,7 @@ will use the ``setRule()``, ``setRules()``, or ``withRequest()``
 methods.
 
 setRule()
----------
+=========
 
 This method sets a single rule. It takes the name of the field as
 the first parameter, an optional label and a string with a pipe-delimited list of rules
@@ -218,7 +237,7 @@ the data is taken directly from $_POST, then it must be an exact match for
 the form input name.
 
 setRules()
-----------
+==========
 
 Like, ``setRule()``, but accepts an array of field names and their rules::
 
@@ -235,7 +254,7 @@ To give a labeled error message you can set up as::
     ]);
 
 withRequest()
--------------
+=============
 
 One of the most common times you will use the validation library is when validating
 data that was input from an HTTP Request. If desired, you can pass an instance of the

From eb5d8c2ef8fdfacdc64c3a61a1469742d465e7b6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Oct 2021 00:33:17 +0900
Subject: [PATCH 0480/2325] docs: improve contributing docs

* docs: add link to tests/README.md

* docs: remove unneeded line breaks and spaces
---
 contributing/pull_request.md |  3 ++-
 contributing/signing.md      | 20 +++++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index 95e31e676809..d08bbd2e035c 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -63,7 +63,8 @@ class would test the `Banana` class. There will be occasions when it is
 more convenient to have separate classes to test different functionality
 of a single CodeIgniter component.
 
-See the [PHPUnit website](https://phpunit.de/) for more information.
+See [Running System Tests](../tests/README.md) 
+and the [PHPUnit website](https://phpunit.de/) for more information.
 
 ### Comments
 
diff --git a/contributing/signing.md b/contributing/signing.md
index 0755f6806ed2..ca84ef79a9a7 100644
--- a/contributing/signing.md
+++ b/contributing/signing.md
@@ -32,25 +32,19 @@ Read below to find out how to sign your commits :)
 To verify your commits, you will need to setup a GPG key, and attach it
 to your GitHub account.
 
-See the [git
-tools](https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work) page
-for directions on doing this. The complete story is part of [GitHub
-help](https://help.github.com/categories/gpg/).
+See the [git tools](https://git-scm.com/book/en/v2/Git-Tools-Signing-Your-Work) page
+for directions on doing this. The complete story is part of [GitHub help](https://help.github.com/categories/gpg/).
 
 The basic steps are
 
--   [generate your GPG
-    key](https://help.github.com/articles/generating-a-new-gpg-key/),
+- [generate your GPG key](https://help.github.com/articles/generating-a-new-gpg-key/),
     and copy the ASCII representation of it.
--   [Add your GPG key to your GitHub
-    account](https://help.github.com/articles/adding-a-new-gpg-key-to-your-github-account/).
--   [Tell
-    Git](https://help.github.com/articles/telling-git-about-your-gpg-key/)
+- [Add your GPG key to your GitHub account](https://help.github.com/articles/adding-a-new-gpg-key-to-your-github-account/).
+- [Tell Git](https://help.github.com/articles/telling-git-about-your-gpg-key/)
     about your GPG key.
--   [Set default
-    signing](https://help.github.com/articles/signing-commits-using-gpg/)
+- [Set default signing](https://help.github.com/articles/signing-commits-using-gpg/)
     to have all of your commits securely signed automatically.
--   Provide your GPG key passphrase, as prompted, when you do a commit.
+- Provide your GPG key passphrase, as prompted, when you do a commit.
 
 Depending on your IDE, you may have to do your Git commits from your Git
 bash shell to use the **-S** option to force the secure signing.

From 5e03647d34f8f66c2cf7ae7886ca50a8c53f3846 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Oct 2021 00:35:05 +0900
Subject: [PATCH 0481/2325] test: fix @var classname typo

---
 tests/system/RESTful/ResourceControllerTest.php | 3 ++-
 tests/system/RESTful/ResourcePresenterTest.php  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index 5f2e58994d10..185088da1505 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -19,6 +19,7 @@
 use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\HTTP\UserAgent;
+use CodeIgniter\Router\RouteCollection;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockCodeIgniter;
 use CodeIgniter\Test\Mock\MockResourceController;
@@ -45,7 +46,7 @@ final class ResourceControllerTest extends CIUnitTestCase
     protected $codeigniter;
 
     /**
-     * @var \CodeIgniter\Router\RoutesCollection
+     * @var RouteCollection
      */
     protected $routes;
 
diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php
index 2f0a332a57f9..e32ce9aba5d3 100644
--- a/tests/system/RESTful/ResourcePresenterTest.php
+++ b/tests/system/RESTful/ResourcePresenterTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\CodeIgniter;
 use CodeIgniter\Config\Services;
+use CodeIgniter\Router\RouteCollection;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockCodeIgniter;
 use CodeIgniter\Test\Mock\MockResourcePresenter;
@@ -39,7 +40,7 @@ final class ResourcePresenterTest extends CIUnitTestCase
     protected $codeigniter;
 
     /**
-     * @var \CodeIgniter\Router\RoutesCollection
+     * @var RouteCollection
      */
     protected $routes;
 

From 654c2b70770e2603d0c5d37014d5bfa7295d15af Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Oct 2021 00:35:37 +0900
Subject: [PATCH 0482/2325] docs: add warning about auto-routing and filters

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

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 7e0e6d462f9b..4392ecdba5b1 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -360,6 +360,13 @@ The value for the filter can be a string or an array of strings:
 
 See `Controller filters <filters.html>`_ for more information on setting up filters.
 
+.. Warning:: If you set filters to routes in **app/Config/Routes.php**
+    (not in **app/Config/Filters.php**), it is recommended to disable auto-routing.
+    When auto-routing is enabled, it may be possible that a controller can be accessed
+    via a different URL than the configured route,
+    in which case the filter you specified to the route will not be applied.
+    See :ref:`use-defined-routes-only` to disable auto-routing.
+
 **Alias filter**
 
 You specify an alias defined in **app/Config/Filters.php** for the filter value::
@@ -540,6 +547,8 @@ dash isn’t a valid class or method name character and would cause a fatal erro
 
     $routes->setTranslateURIDashes(true);
 
+.. _use-defined-routes-only:
+
 Use Defined Routes Only
 -----------------------
 

From 3ea7c9506e19b0c928b51b944592789325104835 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Oct 2021 15:44:27 +0000
Subject: [PATCH 0483/2325] chore(deps-dev): update rector/rector requirement
 (#5225)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index bc5e2a6fcaf2..d914b452e528 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^0.12.91",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.59",
+        "rector/rector": "0.11.60",
         "symplify/package-builder": "^9.3"
     },
     "suggest": {

From 22634300ebcf39343c310d9288de536e060ba606 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Oct 2021 11:00:39 +0900
Subject: [PATCH 0484/2325] feat: add Session based CSRF protection

---
 app/Config/Security.php                       |  11 +
 env                                           |   1 +
 system/Security/Security.php                  |  76 +++++-
 .../Security/SecurityCSRFSessionTest.php      | 225 ++++++++++++++++++
 4 files changed, 303 insertions(+), 10 deletions(-)
 create mode 100644 tests/system/Security/SecurityCSRFSessionTest.php

diff --git a/app/Config/Security.php b/app/Config/Security.php
index 01000ff52088..563cf2f3a86e 100644
--- a/app/Config/Security.php
+++ b/app/Config/Security.php
@@ -6,6 +6,17 @@
 
 class Security extends BaseConfig
 {
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Protection Method
+     * --------------------------------------------------------------------------
+     *
+     * Protection Method for Cross Site Request Forgery protection.
+     *
+     * @var string 'cookie' or 'session'
+     */
+    public $csrfProtection = 'cookie';
+
     /**
      * --------------------------------------------------------------------------
      * CSRF Token Name
diff --git a/env b/env
index 38eabf203988..0b6aa1720782 100644
--- a/env
+++ b/env
@@ -110,6 +110,7 @@
 # SECURITY
 #--------------------------------------------------------------------
 
+# security.csrfProtection = 'cookie'
 # security.tokenName = 'csrf_token_name'
 # security.headerName = 'X-CSRF-TOKEN'
 # security.cookieName = 'csrf_cookie_name'
diff --git a/system/Security/Security.php b/system/Security/Security.php
index 7bf3b6689095..cf55c3aeda5f 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Cookie\Cookie;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\Security\Exceptions\SecurityException;
+use CodeIgniter\Session\Session;
 use Config\App;
 use Config\Cookie as CookieConfig;
 use Config\Security as SecurityConfig;
@@ -27,6 +28,18 @@
  */
 class Security implements SecurityInterface
 {
+    public const CSRF_PROTECTION_COOKIE  = 'cookie';
+    public const CSRF_PROTECTION_SESSION = 'session';
+
+    /**
+     * CSRF Protection Method
+     *
+     * Protection Method for Cross Site Request Forgery protection.
+     *
+     * @var string 'cookie' or 'session'
+     */
+    protected $csrfProtection = self::CSRF_PROTECTION_COOKIE;
+
     /**
      * CSRF Hash
      *
@@ -128,6 +141,13 @@ class Security implements SecurityInterface
      */
     private $rawCookieName;
 
+    /**
+     * Session instance.
+     *
+     * @var Session
+     */
+    private $session;
+
     /**
      * Constructor.
      *
@@ -141,11 +161,12 @@ public function __construct(App $config)
 
         // Store CSRF-related configurations
         if ($security instanceof SecurityConfig) {
-            $this->tokenName     = $security->tokenName ?? $this->tokenName;
-            $this->headerName    = $security->headerName ?? $this->headerName;
-            $this->regenerate    = $security->regenerate ?? $this->regenerate;
-            $this->rawCookieName = $security->cookieName ?? $this->rawCookieName;
-            $this->expires       = $security->expires ?? $this->expires;
+            $this->csrfProtection = $security->csrfProtection ?? $this->csrfProtection;
+            $this->tokenName      = $security->tokenName ?? $this->tokenName;
+            $this->headerName     = $security->headerName ?? $this->headerName;
+            $this->regenerate     = $security->regenerate ?? $this->regenerate;
+            $this->rawCookieName  = $security->cookieName ?? $this->rawCookieName;
+            $this->expires        = $security->expires ?? $this->expires;
         } else {
             // `Config/Security.php` is absence
             $this->tokenName     = $config->CSRFTokenName ?? $this->tokenName;
@@ -155,13 +176,28 @@ public function __construct(App $config)
             $this->expires       = $config->CSRFExpire ?? $this->expires;
         }
 
-        $this->configureCookie($config);
+        if ($this->isCSRFCookie()) {
+            $this->configureCookie($config);
+        } else {
+            // Session based CSRF protection
+            $this->configureSession();
+        }
 
         $this->request = Services::request();
 
         $this->generateHash();
     }
 
+    private function isCSRFCookie(): bool
+    {
+        return $this->csrfProtection === self::CSRF_PROTECTION_COOKIE;
+    }
+
+    private function configureSession(): void
+    {
+        $this->session = Services::session();
+    }
+
     private function configureCookie(App $config): void
     {
         /** @var CookieConfig|null $cookie */
@@ -253,7 +289,12 @@ public function verify(RequestInterface $request)
 
         if ($this->regenerate) {
             $this->hash = null;
-            unset($_COOKIE[$this->cookieName]);
+            if ($this->isCSRFCookie()) {
+                unset($_COOKIE[$this->cookieName]);
+            } else {
+                // Session based CSRF protection
+                $this->session->remove($this->tokenName);
+            }
         }
 
         $this->generateHash();
@@ -409,13 +450,23 @@ protected function generateHash(): string
             // We don't necessarily want to regenerate it with
             // each page load since a page could contain embedded
             // sub-pages causing this feature to fail
-            if ($this->isHashInCookie()) {
-                return $this->hash = $_COOKIE[$this->cookieName];
+            if ($this->isCSRFCookie()) {
+                if ($this->isHashInCookie()) {
+                    return $this->hash = $_COOKIE[$this->cookieName];
+                }
+            } elseif ($this->session->has($this->tokenName)) {
+                // Session based CSRF protection
+                return $this->hash = $this->session->get($this->tokenName);
             }
 
             $this->hash = bin2hex(random_bytes(16));
 
-            $this->saveHashInCookie();
+            if ($this->isCSRFCookie()) {
+                $this->saveHashInCookie();
+            } else {
+                // Session based CSRF protection
+                $this->saveHashInSession();
+            }
         }
 
         return $this->hash;
@@ -467,4 +518,9 @@ protected function doSendCookie(): void
     {
         cookies([$this->cookie], false)->dispatch();
     }
+
+    private function saveHashInSession(): void
+    {
+        $this->session->set($this->tokenName, $this->hash);
+    }
 }
diff --git a/tests/system/Security/SecurityCSRFSessionTest.php b/tests/system/Security/SecurityCSRFSessionTest.php
new file mode 100644
index 000000000000..040f253b9774
--- /dev/null
+++ b/tests/system/Security/SecurityCSRFSessionTest.php
@@ -0,0 +1,225 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Security;
+
+use CodeIgniter\Config\Factories;
+use CodeIgniter\Config\Services;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\UserAgent;
+use CodeIgniter\Security\Exceptions\SecurityException;
+use CodeIgniter\Session\Handlers\ArrayHandler;
+use CodeIgniter\Session\Session;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\Mock\MockAppConfig;
+use CodeIgniter\Test\Mock\MockSession;
+use CodeIgniter\Test\TestLogger;
+use Config\App as AppConfig;
+use Config\Logger as LoggerConfig;
+use Config\Security as SecurityConfig;
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ *
+ * @internal
+ */
+final class SecurityCSRFSessionTest extends CIUnitTestCase
+{
+    /**
+     * @var string CSRF protection hash
+     */
+    private $hash = '8b9218a55906f9dcc1dc263dce7f005a';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $_SESSION = [];
+        Factories::reset();
+
+        $config                 = new SecurityConfig();
+        $config->csrfProtection = Security::CSRF_PROTECTION_SESSION;
+        Factories::injectMock('config', 'Security', $config);
+
+        $this->injectSession($this->hash);
+    }
+
+    private function createSession($options = []): Session
+    {
+        $defaults = [
+            'sessionDriver'            => 'CodeIgniter\Session\Handlers\FileHandler',
+            'sessionCookieName'        => 'ci_session',
+            'sessionExpiration'        => 7200,
+            'sessionSavePath'          => null,
+            'sessionMatchIP'           => false,
+            'sessionTimeToUpdate'      => 300,
+            'sessionRegenerateDestroy' => false,
+            'cookieDomain'             => '',
+            'cookiePrefix'             => '',
+            'cookiePath'               => '/',
+            'cookieSecure'             => false,
+            'cookieSameSite'           => 'Lax',
+        ];
+
+        $config    = array_merge($defaults, $options);
+        $appConfig = new AppConfig();
+
+        foreach ($config as $key => $c) {
+            $appConfig->{$key} = $c;
+        }
+
+        $session = new MockSession(new ArrayHandler($appConfig, '127.0.0.1'), $appConfig);
+        $session->setLogger(new TestLogger(new LoggerConfig()));
+
+        return $session;
+    }
+
+    private function injectSession(string $hash): void
+    {
+        $session = $this->createSession();
+        $session->set('csrf_test_name', $hash);
+        Services::injectMock('session', $session);
+    }
+
+    public function testHashIsReadFromSession()
+    {
+        $security = new Security(new MockAppConfig());
+
+        $this->assertSame($this->hash, $security->getHash());
+    }
+
+    public function testCSRFVerifyPostThrowsExceptionOnNoMatch()
+    {
+        $this->expectException(SecurityException::class);
+
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+        $_POST['csrf_test_name']   = '8b9218a55906f9dcc1dc263dce7f005b';
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+
+        $security = new Security(new MockAppConfig());
+
+        $security->verify($request);
+    }
+
+    public function testCSRFVerifyPostReturnsSelfOnMatch()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+        $_POST['foo']              = 'bar';
+        $_POST['csrf_test_name']   = '8b9218a55906f9dcc1dc263dce7f005a';
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+
+        $security = new Security(new MockAppConfig());
+
+        $this->assertInstanceOf(Security::class, $security->verify($request));
+        $this->assertLogged('info', 'CSRF token verified.');
+        $this->assertTrue(count($_POST) === 1);
+    }
+
+    public function testCSRFVerifyHeaderThrowsExceptionOnNoMatch()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005b');
+
+        $security = new Security(new MockAppConfig());
+
+        $this->expectException(SecurityException::class);
+        $security->verify($request);
+    }
+
+    public function testCSRFVerifyHeaderReturnsSelfOnMatch()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+        $_POST['foo']              = 'bar';
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005a');
+
+        $security = new Security(new MockAppConfig());
+
+        $this->assertInstanceOf(Security::class, $security->verify($request));
+        $this->assertLogged('info', 'CSRF token verified.');
+        $this->assertCount(1, $_POST);
+    }
+
+    public function testCSRFVerifyJsonThrowsExceptionOnNoMatch()
+    {
+        $this->expectException(SecurityException::class);
+
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request->setBody('{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005b"}');
+
+        $security = new Security(new MockAppConfig());
+
+        $security->verify($request);
+    }
+
+    public function testCSRFVerifyJsonReturnsSelfOnMatch()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request->setBody('{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005a","foo":"bar"}');
+
+        $security = new Security(new MockAppConfig());
+
+        $this->assertInstanceOf(Security::class, $security->verify($request));
+        $this->assertLogged('info', 'CSRF token verified.');
+        $this->assertTrue($request->getBody() === '{"foo":"bar"}');
+    }
+
+    public function testRegenerateWithFalseSecurityRegenerateProperty()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+        $_POST['csrf_test_name']   = '8b9218a55906f9dcc1dc263dce7f005a';
+
+        $config             = Factories::config('Security');
+        $config->regenerate = false;
+        Factories::injectMock('config', 'Security', $config);
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+
+        $security = new Security(new MockAppConfig());
+
+        $oldHash = $security->getHash();
+        $security->verify($request);
+        $newHash = $security->getHash();
+
+        $this->assertSame($oldHash, $newHash);
+    }
+
+    public function testRegenerateWithTrueSecurityRegenerateProperty()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+        $_POST['csrf_test_name']   = '8b9218a55906f9dcc1dc263dce7f005a';
+
+        $config             = Factories::config('Security');
+        $config->regenerate = true;
+        Factories::injectMock('config', 'Security', $config);
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+
+        $security = new Security(new MockAppConfig());
+
+        $oldHash = $security->getHash();
+        $security->verify($request);
+        $newHash = $security->getHash();
+
+        $this->assertNotSame($oldHash, $newHash);
+    }
+}

From 991c412adc6a9ba733474b94059fa4c558ec28c0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Oct 2021 11:01:48 +0900
Subject: [PATCH 0485/2325] refactor: add missing return type

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

diff --git a/system/Security/Security.php b/system/Security/Security.php
index cf55c3aeda5f..d6edbb23025a 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -479,7 +479,7 @@ private function isHashInCookie(): bool
         && preg_match('#^[0-9a-f]{32}$#iS', $_COOKIE[$this->cookieName]) === 1;
     }
 
-    private function saveHashInCookie()
+    private function saveHashInCookie(): void
     {
         $this->cookie = new Cookie(
             $this->rawCookieName,

From 537867a1471a3b8a360662a4a6df13dffb2d0f84 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Oct 2021 13:04:26 +0900
Subject: [PATCH 0486/2325] docs: add Session based CSRF Protection

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

diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index 9497723c4b46..3b48072fd84d 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -120,6 +120,22 @@ than simply crashing. This can be turned off by editing the following config par
 
 Even when the redirect value is **true**, AJAX calls will not redirect, but will throw an error.
 
+=======================
+CSRF Protection Methods
+=======================
+
+By default, the Cookie based CSRF Protection is used. It is
+`Double Submit Cookie <https://cheatsheetseries.owasp.org/cheatsheets/Cross-Site_Request_Forgery_Prevention_Cheat_Sheet.html#double-submit-cookie>`_
+on OWASP Cross-Site Request Forgery Prevention Cheat Sheet.
+
+You can also use Session based CSRF Protection. It is
+`Synchronizer Token Pattern <https://cheatsheetseries.owasp.org/cheatsheets/Cross-Site_Request_Forgery_Prevention_Cheat_Sheet.html#synchronizer-token-pattern>`_.
+
+You can set to use the Session based CSRF protection by editing the following config parameter value in
+**app/Config/Security.php**::
+
+    public $csrfProtection = 'session';
+
 *********************
 Other Helpful Methods
 *********************

From b2fb16a07e9f65f54139cfb36a9b7d59eb7bebff Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Oct 2021 14:12:11 +0900
Subject: [PATCH 0487/2325] docs: fix text decoration

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

diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index 3b48072fd84d..d788e2d2a808 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -118,7 +118,7 @@ than simply crashing. This can be turned off by editing the following config par
 
     public $redirect = false;
 
-Even when the redirect value is **true**, AJAX calls will not redirect, but will throw an error.
+Even when the redirect value is ``true``, AJAX calls will not redirect, but will throw an error.
 
 =======================
 CSRF Protection Methods
@@ -148,8 +148,8 @@ you might find helpful that are not related to the CSRF protection.
 Tries to sanitize filenames in order to prevent directory traversal attempts and other security threats, which is
 particularly useful for files that were supplied via user input. The first parameter is the path to sanitize.
 
-If it is acceptable for the user input to include relative paths, e.g., file/in/some/approved/folder.txt, you can set
-the second optional parameter, $relative_path to true.
+If it is acceptable for the user input to include relative paths, e.g., **file/in/some/approved/folder.txt**, you can set
+the second optional parameter, ``$relativePath`` to ``true``.
 ::
 
     $path = $security->sanitizeFilename($request->getVar('filepath'));

From 985134458b6a9eaf68be3ae0da02bc30a998bec7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 13 Oct 2021 09:36:51 +0900
Subject: [PATCH 0488/2325] chore: Security can depend on Session

For Session based CSRF Protection
---
 depfile.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/depfile.yaml b/depfile.yaml
index c1d8b87c3db2..2c87969f4fc4 100644
--- a/depfile.yaml
+++ b/depfile.yaml
@@ -193,6 +193,7 @@ ruleset:
     - HTTP
   Security:
     - Cookie
+    - Session
     - HTTP
   Session:
     - Cookie

From 562c12ef84a5a29f8eac5ff5e086696d5a18d9f1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Oct 2021 09:39:25 +0900
Subject: [PATCH 0489/2325] docs: update link for CSRF protection

Now Security class provides it.
---
 user_guide_src/source/concepts/security.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/concepts/security.rst b/user_guide_src/source/concepts/security.rst
index d13c47d73564..63581c9510dd 100644
--- a/user_guide_src/source/concepts/security.rst
+++ b/user_guide_src/source/concepts/security.rst
@@ -57,7 +57,7 @@ CodeIgniter provisions
 ----------------------
 
 - `Session <../libraries/sessions.html>`_ library
-- `HTTP library <../incoming/incomingrequest.html>`_ provides for CSRF validation
+- :doc:`Security </libraries/security>` library provides for CSRF validation
 - Easy to add third party authentication
 
 *****************************
@@ -162,7 +162,7 @@ CodeIgniter provisions
 ----------------------
 
 - Public folder, with application and system outside
-- `HTTP library <../incoming/incomingrequest.html>`_ provides for CSRF validation
+- :doc:`Security </libraries/security>` library provides for CSRF validation
 
 ************************************
 A8 Cross Site Request Forgery (CSRF)
@@ -181,7 +181,7 @@ OWASP recommendations
 CodeIgniter provisions
 ----------------------
 
-- `HTTP library <../incoming/incomingrequest.html>`_ provides for CSRF validation
+- :doc:`Security </libraries/security>` library provides for CSRF validation
 
 **********************************************
 A9 Using Components with Known Vulnerabilities

From 010fa6880792c4cc9fe23544d9f4ed10fde62d18 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Oct 2021 09:42:54 +0900
Subject: [PATCH 0490/2325] docs: fix sample code

The CSRF filter alias name is lower case.
---
 user_guide_src/source/libraries/throttler.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/throttler.rst b/user_guide_src/source/libraries/throttler.rst
index f4fbc9a325f4..bc13c16fc321 100644
--- a/user_guide_src/source/libraries/throttler.rst
+++ b/user_guide_src/source/libraries/throttler.rst
@@ -117,7 +117,7 @@ filter::
 Next, we assign it to all POST requests made on the site::
 
     public $methods = [
-        'post' => ['throttle', 'CSRF'],
+        'post' => ['throttle', 'csrf'],
     ];
 
 And that's all there is to it. Now all POST requests made on the site will have to be rate limited.

From 045c6ea0915b3724b25ff5b7125f8d978a0d47cd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Oct 2021 09:59:15 +0900
Subject: [PATCH 0491/2325] docs: remove Config\App.CSRFProtection which does
 not exist

---
 user_guide_src/source/general/configuration.rst | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst
index d5599e1a0f25..194079ef9995 100644
--- a/user_guide_src/source/general/configuration.rst
+++ b/user_guide_src/source/general/configuration.rst
@@ -165,7 +165,6 @@ the configuration class properties are left unchanged. In this usage, the prefix
 the full (case-sensitive) namespace of the class.
 ::
 
-    Config\App.CSRFProtection = true
     Config\App.CSRFCookieName = csrf_cookie
     Config\App.CSPEnabled = true
 
@@ -177,7 +176,6 @@ the configuration class name. If the short prefix matches the class name,
 the value from **.env** replaces the configuration file value.
 ::
 
-    app.CSRFProtection = true
     app.CSRFCookieName = csrf_cookie
     app.CSPEnabled = true
 
@@ -186,7 +184,6 @@ the value from **.env** replaces the configuration file value.
 Some environments do not permit variable name with dots. In such case, you could also use ``_`` as a seperator.
 ::
 
-    app_CSRFProtection = true
     app_CSRFCookieName = csrf_cookie
     app_CSPEnabled = true
 

From 485a0c3694be1c9cb9951eca8aa5740644c27756 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Oct 2021 10:03:33 +0900
Subject: [PATCH 0492/2325] docs: replace deprecated Config\App.CSRFCookieName

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

diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst
index 194079ef9995..8254b9fe44ea 100644
--- a/user_guide_src/source/general/configuration.rst
+++ b/user_guide_src/source/general/configuration.rst
@@ -165,7 +165,7 @@ the configuration class properties are left unchanged. In this usage, the prefix
 the full (case-sensitive) namespace of the class.
 ::
 
-    Config\App.CSRFCookieName = csrf_cookie
+    Config\App.forceGlobalSecureRequests = true
     Config\App.CSPEnabled = true
 
 
@@ -176,7 +176,7 @@ the configuration class name. If the short prefix matches the class name,
 the value from **.env** replaces the configuration file value.
 ::
 
-    app.CSRFCookieName = csrf_cookie
+    app.forceGlobalSecureRequests = true
     app.CSPEnabled = true
 
 .. note:: When using the *short prefix* the property names must still exactly match the class defined name.
@@ -184,7 +184,7 @@ the value from **.env** replaces the configuration file value.
 Some environments do not permit variable name with dots. In such case, you could also use ``_`` as a seperator.
 ::
 
-    app_CSRFCookieName = csrf_cookie
+    app_forceGlobalSecureRequests = true
     app_CSPEnabled = true
 
 Environment Variables as Replacements for Data

From e3eea9470beaa459dbc949ce3530438bf97ca913 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Oct 2021 10:10:37 +0900
Subject: [PATCH 0493/2325] docs: make @deprecated IncomingRequest::$enableCSRF
 that is not used

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

diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 21894949cb29..128d6ee1c432 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -51,6 +51,8 @@ class IncomingRequest extends Request
      * Set automatically based on Config setting.
      *
      * @var bool
+     *
+     * @deprecated Not used
      */
     protected $enableCSRF = false;
 

From 5d8724903c3190db7402f44d18c268183f397e8f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Oct 2021 10:11:54 +0900
Subject: [PATCH 0494/2325] test: remove $CSRFProtection properties in
 Mock*Config.php

It does not exist.
---
 system/Test/Mock/MockAppConfig.php | 1 -
 system/Test/Mock/MockCLIConfig.php | 1 -
 2 files changed, 2 deletions(-)

diff --git a/system/Test/Mock/MockAppConfig.php b/system/Test/Mock/MockAppConfig.php
index fe51c4d3202f..15aff95809f0 100644
--- a/system/Test/Mock/MockAppConfig.php
+++ b/system/Test/Mock/MockAppConfig.php
@@ -24,7 +24,6 @@ class MockAppConfig extends App
     public $cookieHTTPOnly   = false;
     public $cookieSameSite   = 'Lax';
     public $proxyIPs         = '';
-    public $CSRFProtection   = false;
     public $CSRFTokenName    = 'csrf_test_name';
     public $CSRFHeaderName   = 'X-CSRF-TOKEN';
     public $CSRFCookieName   = 'csrf_cookie_name';
diff --git a/system/Test/Mock/MockCLIConfig.php b/system/Test/Mock/MockCLIConfig.php
index 0e5f9c8dd64e..6eb0dd70a8b8 100644
--- a/system/Test/Mock/MockCLIConfig.php
+++ b/system/Test/Mock/MockCLIConfig.php
@@ -24,7 +24,6 @@ class MockCLIConfig extends App
     public $cookieHTTPOnly   = false;
     public $cookieSameSite   = 'Lax';
     public $proxyIPs         = '';
-    public $CSRFProtection   = false;
     public $CSRFTokenName    = 'csrf_test_name';
     public $CSRFCookieName   = 'csrf_cookie_name';
     public $CSRFExpire       = 7200;

From 2a9ab6a94bdf481a073877f6236e7cefe51af0c2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Oct 2021 17:08:47 +0900
Subject: [PATCH 0495/2325] docs: remove inappropriate samples

Validation library does not trim the data unlike CI3's.
Generally, HTML encoding should be done in Views.
---
 user_guide_src/source/libraries/validation.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index d8df45d1c95c..60cbec369b26 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -33,8 +33,7 @@ On the receiving end, the script must:
    be someone else's existing username, or perhaps even a reserved word.
    Etc.
 #. Sanitize the data for security.
-#. Pre-format the data if needed (Does the data need to be trimmed? HTML
-   encoded? Etc.)
+#. Pre-format the data if needed.
 #. Prep the data for insertion in the database.
 
 Although there is nothing terribly complex about the above process, it

From 02a747ff590c6ffe9aeed99725daee1ad261fb7b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Oct 2021 17:33:00 +0900
Subject: [PATCH 0496/2325] docs: decorate variables

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

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 60cbec369b26..10aa4cbd1135 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -232,7 +232,7 @@ that should be applied::
     $validation->setRule('username', 'Username', 'required');
 
 The **field name** must match the key of any data array that is sent in. If
-the data is taken directly from $_POST, then it must be an exact match for
+the data is taken directly from ``$_POST``, then it must be an exact match for
 the form input name.
 
 setRules()
@@ -439,7 +439,7 @@ Validation Placeholders
 
 The Validation class provides a simple method to replace parts of your rules based on data that's being passed into it. This
 sounds fairly obscure but can be especially handy with the ``is_unique`` validation rule. Placeholders are simply
-the name of the field (or array key) that was passed in as $data surrounded by curly brackets. It will be
+the name of the field (or array key) that was passed in as ``$data`` surrounded by curly brackets. It will be
 replaced by the **value** of the matched incoming field. An example should clarify this::
 
     $validation->setRules([
@@ -686,7 +686,7 @@ a boolean true or false value signifying true if it passed the test or false if
     }
 
 By default, the system will look within ``CodeIgniter\Language\en\Validation.php`` for the language strings used
-within errors. In custom rules, you may provide error messages by accepting a $error variable by reference in the
+within errors. In custom rules, you may provide error messages by accepting a ``$error`` variable by reference in the
 second parameter::
 
     public function even(string $str, string &$error = null): bool
@@ -710,7 +710,7 @@ Allowing Parameters
 ===================
 
 If your method needs to work with parameters, the function will need a minimum of three parameters: the string to validate,
-the parameter string, and an array with all of the data that was submitted the form. The $data array is especially handy
+the parameter string, and an array with all of the data that was submitted the form. The ``$data`` array is especially handy
 for rules like ``require_with`` that needs to check the value of another submitted field to base its result on::
 
     public function required_with($str, string $fields, array $data): bool

From 09612db82d36c5011172c04f695410668954f8b6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Oct 2021 17:33:57 +0900
Subject: [PATCH 0497/2325] docs: fix descrition aboug PHP native functions

When using native functions, it needs one or three params.
$rule($value) or $rule($value, $param, $data).
It seems there is no function to fit the API.

CI3's validation alters data. CI4 does not.
---
 user_guide_src/source/libraries/validation.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 10aa4cbd1135..1779877c50b1 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -928,6 +928,6 @@ is_image                Yes         Fails if the file cannot be determined to be
 
 The file validation rules apply for both single and multiple file uploads.
 
-.. note:: You can also use any native PHP functions that permit up
-    to two parameters, where at least one is required (to pass
-    the field data).
+.. note:: You can also use any native PHP functions that return boolean and
+    permit at least one parameter, the field data to validate.
+    The Validation library **never alters the data** to validate.

From fb30326e2a7c579fb7b9ff29557c4576e49e02c7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Oct 2021 15:09:09 +0900
Subject: [PATCH 0498/2325] docs: fix comment

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

diff --git a/system/Security/Security.php b/system/Security/Security.php
index d6edbb23025a..fc472fec6e99 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -270,7 +270,7 @@ public function verify(RequestInterface $request)
 
         $token = $this->getPostedToken($request);
 
-        // Does the tokens exist in both the POST/POSTed JSON and COOKIE arrays and match?
+        // Do the tokens match?
         if (! isset($token, $this->hash) || ! hash_equals($this->hash, $token)) {
             throw SecurityException::forDisallowedAction();
         }

From d67de2017ea7d2e1f3590b7fae9651aaa85bf289 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Oct 2021 15:11:02 +0900
Subject: [PATCH 0499/2325] feat: protect CSRF for PUT/PATCH/DELETE

Fixes #2913
---
 system/Security/Security.php                  | 10 ++++---
 .../Security/SecurityCSRFSessionTest.php      | 30 +++++++++++++++++--
 tests/system/Security/SecurityTest.php        |  2 +-
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/system/Security/Security.php b/system/Security/Security.php
index fc472fec6e99..01dd92b33c19 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -259,13 +259,15 @@ public function getCSRFTokenName(): string
      *
      * @throws SecurityException
      *
-     * @return $this|false
+     * @return $this
      */
     public function verify(RequestInterface $request)
     {
-        // If it's not a POST request we will set the CSRF cookie.
-        if (strtoupper($_SERVER['REQUEST_METHOD']) !== 'POST') {
-            return $this->sendCookie($request);
+        // Protects POST, PUT, DELETE, PATCH
+        $method           = strtoupper($_SERVER['REQUEST_METHOD']);
+        $methodsToProtect = ['POST', 'PUT', 'DELETE', 'PATCH'];
+        if (! in_array($method, $methodsToProtect, true)) {
+            return $this;
         }
 
         $token = $this->getPostedToken($request);
diff --git a/tests/system/Security/SecurityCSRFSessionTest.php b/tests/system/Security/SecurityCSRFSessionTest.php
index 040f253b9774..c0ec2c066c40 100644
--- a/tests/system/Security/SecurityCSRFSessionTest.php
+++ b/tests/system/Security/SecurityCSRFSessionTest.php
@@ -127,7 +127,7 @@ public function testCSRFVerifyPostReturnsSelfOnMatch()
         $this->assertTrue(count($_POST) === 1);
     }
 
-    public function testCSRFVerifyHeaderThrowsExceptionOnNoMatch()
+    public function testCSRFVerifyPOSTHeaderThrowsExceptionOnNoMatch()
     {
         $_SERVER['REQUEST_METHOD'] = 'POST';
 
@@ -140,7 +140,7 @@ public function testCSRFVerifyHeaderThrowsExceptionOnNoMatch()
         $security->verify($request);
     }
 
-    public function testCSRFVerifyHeaderReturnsSelfOnMatch()
+    public function testCSRFVerifyPOSTHeaderReturnsSelfOnMatch()
     {
         $_SERVER['REQUEST_METHOD'] = 'POST';
         $_POST['foo']              = 'bar';
@@ -155,6 +155,32 @@ public function testCSRFVerifyHeaderReturnsSelfOnMatch()
         $this->assertCount(1, $_POST);
     }
 
+    public function testCSRFVerifyPUTHeaderThrowsExceptionOnNoMatch()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'PUT';
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005b');
+
+        $security = new Security(new MockAppConfig());
+
+        $this->expectException(SecurityException::class);
+        $security->verify($request);
+    }
+
+    public function testCSRFVerifyPUTHeaderReturnsSelfOnMatch()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'PUT';
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005a');
+
+        $security = new Security(new MockAppConfig());
+
+        $this->assertInstanceOf(Security::class, $security->verify($request));
+        $this->assertLogged('info', 'CSRF token verified.');
+    }
+
     public function testCSRFVerifyJsonThrowsExceptionOnNoMatch()
     {
         $this->expectException(SecurityException::class);
diff --git a/tests/system/Security/SecurityTest.php b/tests/system/Security/SecurityTest.php
index 74e8621e3a34..eadcf5ff6326 100644
--- a/tests/system/Security/SecurityTest.php
+++ b/tests/system/Security/SecurityTest.php
@@ -66,7 +66,7 @@ public function testHashIsReadFromCookie()
         $this->assertSame('8b9218a55906f9dcc1dc263dce7f005a', $security->getHash());
     }
 
-    public function testCSRFVerifySetsCookieWhenNotPOST()
+    public function testGetHashSetsCookieWhenNotPOST()
     {
         $security = new MockSecurity(new MockAppConfig());
 

From adf02f0c2583139fee86869032485ef8e83251b6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Oct 2021 16:22:10 +0900
Subject: [PATCH 0500/2325] fix: HTTP Method Spoofing does not work correctly
 for Config\Filter::$methods and CSRF protection

---
 system/Filters/Filters.php   | 2 +-
 system/Security/Security.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index c81dadf3330f..70cf58986727 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -443,7 +443,7 @@ protected function processMethods()
         }
 
         // Request method won't be set for CLI-based requests
-        $method = strtolower($_SERVER['REQUEST_METHOD'] ?? 'cli');
+        $method = strtolower($this->request->getMethod()) ?? 'cli';
 
         if (array_key_exists($method, $this->config->methods)) {
             $this->filters['before'] = array_merge($this->filters['before'], $this->config->methods[$method]);
diff --git a/system/Security/Security.php b/system/Security/Security.php
index 01dd92b33c19..d9a44c4c9e6a 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -264,7 +264,7 @@ public function getCSRFTokenName(): string
     public function verify(RequestInterface $request)
     {
         // Protects POST, PUT, DELETE, PATCH
-        $method           = strtoupper($_SERVER['REQUEST_METHOD']);
+        $method           = strtoupper($request->getMethod());
         $methodsToProtect = ['POST', 'PUT', 'DELETE', 'PATCH'];
         if (! in_array($method, $methodsToProtect, true)) {
             return $this;

From f44ceba98c7586eb933abb20d079cd94f6435c6c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Oct 2021 18:17:38 +0900
Subject: [PATCH 0501/2325] test: fix test

CLIRequest should be used when CLI testing
---
 tests/system/Filters/FiltersTest.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index dbe88c4879c5..1b8b4b27d956 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -13,8 +13,10 @@
 
 use CodeIgniter\Config\Services;
 use CodeIgniter\Filters\Exceptions\FilterException;
+use CodeIgniter\HTTP\CLIRequest;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\Mock\MockAppConfig;
 
 require_once __DIR__ . '/fixtures/GoogleMe.php';
 require_once __DIR__ . '/fixtures/GoogleYou.php';
@@ -60,7 +62,8 @@ public function testProcessMethodDetectsCLI()
                 'cli' => ['foo'],
             ],
         ];
-        $filters = new Filters((object) $config, $this->request, $this->response);
+        $request = new CLIRequest(new MockAppConfig());
+        $filters = new Filters((object) $config, $request, $this->response);
 
         $expected = [
             'before' => ['foo'],

From fa78859639c6de7243db4975ea82deacb8b751db Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Oct 2021 18:19:31 +0900
Subject: [PATCH 0502/2325] test: fix tests

Request object should be created after setting super globals.
---
 tests/system/Filters/FiltersTest.php | 174 +++++++++++++++------------
 1 file changed, 94 insertions(+), 80 deletions(-)

diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index 1b8b4b27d956..dae4074cd134 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -50,7 +50,6 @@ protected function setUp(): void
 
         Services::autoloader()->addNamespace($defaults);
 
-        $this->request  = Services::request();
         $this->response = Services::response();
     }
 
@@ -83,7 +82,8 @@ public function testProcessMethodDetectsGetRequests()
                 'get' => ['foo'],
             ],
         ];
-        $filters = new Filters((object) $config, $this->request, $this->response);
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $expected = [
             'before' => ['foo'],
@@ -107,7 +107,8 @@ public function testProcessMethodRespectsMethod()
                 'get'  => ['bar'],
             ],
         ];
-        $filters = new Filters((object) $config, $this->request, $this->response);
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $expected = [
             'before' => ['bar'],
@@ -131,7 +132,8 @@ public function testProcessMethodIgnoresMethod()
                 'get'  => ['bar'],
             ],
         ];
-        $filters = new Filters((object) $config, $this->request, $this->response);
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $expected = [
             'before' => [],
@@ -161,8 +163,8 @@ public function testProcessMethodProcessGlobals()
                 ],
             ],
         ];
-
-        $filters = new Filters((object) $config, $this->request, $this->response);
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $expected = [
             'before' => [
@@ -210,8 +212,9 @@ public function testProcessMethodProcessGlobalsWithExcept(array $except)
                 ],
             ],
         ];
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'admin/foo/bar';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'admin/foo/bar';
 
         $expected = [
             'before' => [
@@ -240,8 +243,9 @@ public function testProcessMethodProcessesFiltersBefore()
                 ],
             ],
         ];
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'admin/foo/bar';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'admin/foo/bar';
 
         $expected = [
             'before' => ['foo'],
@@ -268,8 +272,9 @@ public function testProcessMethodProcessesFiltersAfter()
                 ],
             ],
         ];
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'users/foo/bar';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'users/foo/bar';
 
         $expected = [
             'before' => [],
@@ -314,8 +319,9 @@ public function testProcessMethodProcessesCombined()
                 ],
             ],
         ];
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'admin/foo/bar';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'admin/foo/bar';
 
         $expected = [
             'before' => [
@@ -355,8 +361,9 @@ public function testProcessMethodProcessesCombinedAfterForToolbar()
                 ],
             ],
         ];
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'admin/foo/bar';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'admin/foo/bar';
 
         $expected = [
             'before' => ['bar'],
@@ -381,8 +388,8 @@ public function testRunThrowsWithInvalidAlias()
                 'after'  => [],
             ],
         ];
-
-        $filters = new Filters((object) $config, $this->request, $this->response);
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $this->expectException(FilterException::class);
         $uri = 'admin/foo/bar';
@@ -401,9 +408,9 @@ public function testCustomFiltersLoad()
                 'after'  => [],
             ],
         ];
-
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'admin/foo/bar';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'admin/foo/bar';
 
         $request = $filters->run($uri, 'before');
 
@@ -421,8 +428,8 @@ public function testRunThrowsWithInvalidClassType()
                 'after'  => [],
             ],
         ];
-
-        $filters = new Filters((object) $config, $this->request, $this->response);
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $this->expectException(FilterException::class);
         $uri = 'admin/foo/bar';
@@ -441,9 +448,9 @@ public function testRunDoesBefore()
                 'after'  => [],
             ],
         ];
-
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'admin/foo/bar';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'admin/foo/bar';
 
         $request = $filters->run($uri, 'before');
 
@@ -461,9 +468,9 @@ public function testRunDoesAfter()
                 'after'  => ['google'],
             ],
         ];
-
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'admin/foo/bar';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'admin/foo/bar';
 
         $response = $filters->run($uri, 'after');
 
@@ -481,9 +488,9 @@ public function testShortCircuit()
                 'after'  => [],
             ],
         ];
-
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'admin/foo/bar';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'admin/foo/bar';
 
         $response = $filters->run($uri, 'before');
         $this->assertTrue($response instanceof ResponseInterface);
@@ -507,9 +514,9 @@ public function testOtherResult()
                 'after' => [],
             ],
         ];
-
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'admin/foo/bar';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'admin/foo/bar';
 
         $response = $filters->run($uri, 'before');
 
@@ -536,8 +543,9 @@ public function testBeforeExceptString()
                 ],
             ],
         ];
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'admin/foo/bar';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'admin/foo/bar';
 
         $expected = [
             'before' => [
@@ -569,8 +577,9 @@ public function testBeforeExceptInapplicable()
                 ],
             ],
         ];
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'admin/foo/bar';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'admin/foo/bar';
 
         $expected = [
             'before' => [
@@ -603,8 +612,9 @@ public function testAfterExceptString()
                 ],
             ],
         ];
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'admin/foo/bar';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'admin/foo/bar';
 
         $expected = [
             'before' => [
@@ -636,8 +646,9 @@ public function testAfterExceptInapplicable()
                 ],
             ],
         ];
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'admin/foo/bar';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'admin/foo/bar';
 
         $expected = [
             'before' => [
@@ -663,8 +674,8 @@ public function testAddFilter()
                 'after'  => [],
             ],
         ];
-
-        $filters = new Filters((object) $config, $this->request, $this->response);
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $filters = $filters->addFilter('Some\Class', 'some_alias');
 
@@ -679,9 +690,9 @@ public function testAddFilterSection()
     {
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
-        $config = [];
-
-        $filters = new Filters((object) $config, $this->request, $this->response);
+        $config        = [];
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $filters = $filters
             ->addFilter('Some\OtherClass', 'another', 'before', 'globals')
@@ -696,9 +707,9 @@ public function testInitializeTwice()
     {
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
-        $config = [];
-
-        $filters = new Filters((object) $config, $this->request, $this->response);
+        $config        = [];
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $filters = $filters
             ->addFilter('Some\OtherClass', 'another', 'before', 'globals')
@@ -721,8 +732,8 @@ public function testEnableFilter()
                 'after'  => [],
             ],
         ];
-
-        $filters = new Filters((object) $config, $this->request, $this->response);
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $filters = $filters->initialize('admin/foo/bar');
 
@@ -744,9 +755,9 @@ public function testEnableFilterWithArguments()
                 'after'  => [],
             ],
         ];
-
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $filters = $filters->initialize('admin/foo/bar');
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters       = $filters->initialize('admin/foo/bar');
 
         $filters->enableFilter('role:admin , super', 'before');
         $filters->enableFilter('role:admin , super', 'after');
@@ -775,8 +786,8 @@ public function testEnableFilterWithNoArguments()
                 'after'  => [],
             ],
         ];
-
-        $filters = new Filters((object) $config, $this->request, $this->response);
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $filters = $filters->initialize('admin/foo/bar');
 
@@ -807,8 +818,8 @@ public function testEnableNonFilter()
                 'after'  => [],
             ],
         ];
-
-        $filters = new Filters((object) $config, $this->request, $this->response);
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $filters = $filters->initialize('admin/foo/bar');
 
@@ -846,8 +857,9 @@ public function testMatchesURICaseInsensitively()
                 ],
             ],
         ];
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'admin/foo/bar';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'admin/foo/bar';
 
         $expected = [
             'before' => [
@@ -883,9 +895,9 @@ public function testFilterMatching()
                 ],
             ],
         ];
-
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'admin';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'admin';
 
         $expected = [
             'before' => [
@@ -922,9 +934,9 @@ public function testGlobalFilterMatching()
                 ],
             ],
         ];
-
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'admin';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'admin';
 
         $expected = [
             'before' => [
@@ -971,9 +983,9 @@ public function testCombinedFilterMatching()
                 ],
             ],
         ];
-
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'admin123';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'admin123';
 
         $expected = [
             'before' => [
@@ -1017,9 +1029,9 @@ public function testSegmentedFilterMatching()
                 ],
             ],
         ];
-
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'admin/123';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'admin/123';
 
         $expected = [
             'before' => [
@@ -1051,8 +1063,9 @@ public function testFilterAlitasMultiple()
                 ],
             ],
         ];
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'admin/foo/bar';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'admin/foo/bar';
 
         $request = $filters->run($uri, 'before');
         $this->assertSame('http://exampleMultipleURL.com', $request->url);
@@ -1074,7 +1087,8 @@ public function testFilterClass()
                 ],
             ],
         ];
-        $filters = new Filters((object) $config, $this->request, $this->response);
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $filters->run('admin/foo/bar', 'before');
         $expected = [
@@ -1101,9 +1115,9 @@ public function testReset()
                 ],
             ],
         ];
-
-        $filters = new Filters((object) $config, $this->request, $this->response);
-        $uri     = 'admin';
+        $this->request = Services::request();
+        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $uri           = 'admin';
 
         $this->assertSame(['foo'], $filters->initialize($uri)->getFilters()['before']);
         $this->assertSame([], $filters->reset()->getFilters()['before']);

From 11b5c265ae8e121fe8a2d6326ec742103422d8a6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Oct 2021 19:02:26 +0900
Subject: [PATCH 0503/2325] test: fix tests

Security object should be created after setting super globals.
---
 tests/system/Security/SecurityTest.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/system/Security/SecurityTest.php b/tests/system/Security/SecurityTest.php
index eadcf5ff6326..9f14e355b981 100644
--- a/tests/system/Security/SecurityTest.php
+++ b/tests/system/Security/SecurityTest.php
@@ -79,13 +79,13 @@ public function testGetHashSetsCookieWhenNotPOST()
 
     public function testCSRFVerifyPostThrowsExceptionOnNoMatch()
     {
-        $security = new MockSecurity(new MockAppConfig());
-        $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
-
         $_SERVER['REQUEST_METHOD']   = 'POST';
         $_POST['csrf_test_name']     = '8b9218a55906f9dcc1dc263dce7f005a';
         $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b';
 
+        $security = new MockSecurity(new MockAppConfig());
+        $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+
         $this->expectException(SecurityException::class);
         $security->verify($request);
     }
@@ -108,14 +108,14 @@ public function testCSRFVerifyPostReturnsSelfOnMatch()
 
     public function testCSRFVerifyHeaderThrowsExceptionOnNoMatch()
     {
+        $_SERVER['REQUEST_METHOD']   = 'POST';
+        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b';
+
         $security = new MockSecurity(new MockAppConfig());
         $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
 
         $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005a');
 
-        $_SERVER['REQUEST_METHOD']   = 'POST';
-        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b';
-
         $this->expectException(SecurityException::class);
         $security->verify($request);
     }
@@ -139,14 +139,14 @@ public function testCSRFVerifyHeaderReturnsSelfOnMatch()
 
     public function testCSRFVerifyJsonThrowsExceptionOnNoMatch()
     {
+        $_SERVER['REQUEST_METHOD']   = 'POST';
+        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b';
+
         $security = new MockSecurity(new MockAppConfig());
         $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
 
         $request->setBody('{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005a"}');
 
-        $_SERVER['REQUEST_METHOD']   = 'POST';
-        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b';
-
         $this->expectException(SecurityException::class);
         $security->verify($request);
     }

From 070cdb458dbbd771a2a9175f04f97c64a0ae9cb3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Oct 2021 11:25:33 +0900
Subject: [PATCH 0504/2325] docs: update user guide

---
 user_guide_src/source/changelogs/v4.1.5.rst     |  6 ++++++
 .../source/installation/upgrade_415.rst         | 17 +++++++++++++++++
 user_guide_src/source/libraries/security.rst    | 10 ++++++++++
 3 files changed, 33 insertions(+)

diff --git a/user_guide_src/source/changelogs/v4.1.5.rst b/user_guide_src/source/changelogs/v4.1.5.rst
index 328e45163cb3..3290763f0ed3 100644
--- a/user_guide_src/source/changelogs/v4.1.5.rst
+++ b/user_guide_src/source/changelogs/v4.1.5.rst
@@ -5,6 +5,12 @@ Release Date: Not released
 
 **4.1.5 release of CodeIgniter4**
 
+BREAKING:
+
+Fixed `a bug <https://github.com/codeigniter4/CodeIgniter4/issues/2913>`_ on CSRF protection.
+Now CSRF protection works on PUT/PATCH/DELETE requests when CSRF filter is applied.
+If you use such requests, you need to send CSRF token.
+
 Enhancements:
 
 - Added Cache config for reserved characters
diff --git a/user_guide_src/source/installation/upgrade_415.rst b/user_guide_src/source/installation/upgrade_415.rst
index b05d0d0030a6..c9a6eb07da6e 100644
--- a/user_guide_src/source/installation/upgrade_415.rst
+++ b/user_guide_src/source/installation/upgrade_415.rst
@@ -53,3 +53,20 @@ The following methods and a property have been deprecated:
 - ``CodeIgniter\Router\RouteCollection``'s property ``$filterInfo``
 
 See *Applying Filters* in :doc:`Routing </incoming/routing>` for the functionality.
+
+**CSRF Protection**
+
+Because of a bug fix,
+now CSRF protection works on not only **POST** but also **PUT/PATCH/DELETE** requests when CSRF filter is applied.
+
+When you use **PUT/PATCH/DELETE** requests, you need to send CSRF token. Or remove the CSRF filter
+for such requests if you don't need CSRF protection for them.
+
+If you want the same behavior as the previous version, set the CSRF filter like the following in **app/Config/Filters.php**::
+
+    public $methods = [
+        'get'  => ['csrf'],
+        'post' => ['csrf'],
+    ];
+
+Protecting **GET** method needs only when you use ``form_open()`` auto-generation of CSRF field.
diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index d788e2d2a808..48b97baf1f61 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -23,6 +23,9 @@ If you find a case where you do need direct access though, you may load it throu
 Cross-site request forgery (CSRF)
 *********************************
 
+.. warning:: The CSRF Protection is only available for **POST/PUT/PATCH/DELETE** requests.
+    Requests for other methods are not protected.
+
 Enable CSRF Protection
 ======================
 
@@ -54,6 +57,13 @@ Regular expressions are also supported (case-insensitive)::
         ],
     ];
 
+It is also possible to enable the CSRF filter only for specific methods::
+
+    public $methods = [
+        'get'  => ['csrf'],
+        'post' => ['csrf'],
+    ];
+
 HTML Forms
 ==========
 

From e19228acfbaac655256498ef746d16e47247bc6c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 22 Oct 2021 10:38:44 +0900
Subject: [PATCH 0505/2325] docs: improve Upgrading 4.1.5 page format

---
 .../source/installation/upgrade_415.rst       | 57 +++++++++++++------
 1 file changed, 40 insertions(+), 17 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_415.rst b/user_guide_src/source/installation/upgrade_415.rst
index c9a6eb07da6e..6c20797775af 100644
--- a/user_guide_src/source/installation/upgrade_415.rst
+++ b/user_guide_src/source/installation/upgrade_415.rst
@@ -2,7 +2,15 @@
 Upgrading from 4.1.4 to 4.1.5
 #############################
 
-**Changes for set() method in BaseBuilder and Model class**
+.. contents::
+    :local:
+    :depth: 1
+
+Breaking Changes
+================
+
+Changes for set() method in BaseBuilder and Model class
+-------------------------------------------------------
 
 The casting for the ``$value`` parameter has been removed to fix a bug where passing parameters as array and string
 to the ``set()`` method were handled differently. If you extended the ``BaseBuilder`` class or ``Model`` class yourself
@@ -10,7 +18,8 @@ and modified the ``set()`` method, then you need to change its definition from
 ``public function set($key, ?string $value = '', ?bool $escape = null)`` to
 ``public function set($key, $value = '', ?bool $escape = null)``.
 
-**Session DatabaseHandler's database table change**
+Session DatabaseHandler's database table change
+-----------------------------------------------
 
 The types of the following columns in the session table have been changed for optimization.
 
@@ -26,7 +35,29 @@ Update the definition of the session table. See the :doc:`/libraries/sessions` f
 The change was introduced in v4.1.2. But due to `a bug <https://github.com/codeigniter4/CodeIgniter4/issues/4807>`_,
 the DatabaseHandler Driver did not work properly.
 
-**Multiple filters for a route**
+CSRF Protection
+---------------
+
+Because of a bug fix,
+now CSRF protection works on not only **POST** but also **PUT/PATCH/DELETE** requests when CSRF filter is applied.
+
+When you use **PUT/PATCH/DELETE** requests, you need to send CSRF token. Or remove the CSRF filter
+for such requests if you don't need CSRF protection for them.
+
+If you want the same behavior as the previous version, set the CSRF filter like the following in **app/Config/Filters.php**::
+
+    public $methods = [
+        'get'  => ['csrf'],
+        'post' => ['csrf'],
+    ];
+
+Protecting **GET** method needs only when you use ``form_open()`` auto-generation of CSRF field.
+
+Breaking Enhancements
+=====================
+
+Multiple filters for a route
+----------------------------
 
 A new feature to set multiple filters for a route.
 
@@ -54,19 +85,11 @@ The following methods and a property have been deprecated:
 
 See *Applying Filters* in :doc:`Routing </incoming/routing>` for the functionality.
 
-**CSRF Protection**
-
-Because of a bug fix,
-now CSRF protection works on not only **POST** but also **PUT/PATCH/DELETE** requests when CSRF filter is applied.
-
-When you use **PUT/PATCH/DELETE** requests, you need to send CSRF token. Or remove the CSRF filter
-for such requests if you don't need CSRF protection for them.
-
-If you want the same behavior as the previous version, set the CSRF filter like the following in **app/Config/Filters.php**::
+Project Files
+=============
 
-    public $methods = [
-        'get'  => ['csrf'],
-        'post' => ['csrf'],
-    ];
+Content Changes
+---------------
 
-Protecting **GET** method needs only when you use ``form_open()`` auto-generation of CSRF field.
+All Changes
+-----------

From f98556127023f89354b3ec2276cd4757beadd577 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Sun, 24 Oct 2021 14:18:49 +0800
Subject: [PATCH 0506/2325] Rename toolbar loader to be a regular JS file

* Rename toolbar loader to be a regular JS file

* Use `str_replace` instead of `window.appUrl`
---
 system/Debug/Toolbar.php                                   | 4 ++--
 .../Views/{toolbarloader.js.php => toolbarloader.js}       | 7 +------
 2 files changed, 3 insertions(+), 8 deletions(-)
 rename system/Debug/Toolbar/Views/{toolbarloader.js.php => toolbarloader.js} (96%)

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 2199559d362d..b951e2ed9658 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -435,9 +435,9 @@ public function respond()
             header('Content-Type: application/javascript');
 
             ob_start();
-            include $this->config->viewsPath . 'toolbarloader.js.php';
+            include $this->config->viewsPath . 'toolbarloader.js';
             $output = ob_get_clean();
-            $output = substr($output, 8, -10); // trim the script tags
+            $output = str_replace('{url}', rtrim(site_url(), '/'), $output);
             echo $output;
 
             exit;
diff --git a/system/Debug/Toolbar/Views/toolbarloader.js.php b/system/Debug/Toolbar/Views/toolbarloader.js
similarity index 96%
rename from system/Debug/Toolbar/Views/toolbarloader.js.php
rename to system/Debug/Toolbar/Views/toolbarloader.js
index add85b52acda..7e5914354481 100644
--- a/system/Debug/Toolbar/Views/toolbarloader.js.php
+++ b/system/Debug/Toolbar/Views/toolbarloader.js
@@ -1,7 +1,3 @@
-<?php if (ENVIRONMENT === 'testing') {
-    return;
-} ?>
-<script>
 document.addEventListener('DOMContentLoaded', loadDoc, false);
 
 function loadDoc(time) {
@@ -12,7 +8,7 @@ function loadDoc(time) {
 
     localStorage.setItem('debugbar-time-new', time);
 
-    let url = "<?= rtrim(site_url(), '/') ?>";
+    let url = '{url}';
     let xhttp = new XMLHttpRequest();
 
     xhttp.onreadystatechange = function() {
@@ -89,4 +85,3 @@ function newXHR() {
 }
 
 window.XMLHttpRequest = newXHR;
-</script>

From 4876b4855e1568e3aad66c1c89525034f0996986 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sun, 24 Oct 2021 15:58:34 +0700
Subject: [PATCH 0507/2325] [HTTP] Update Http Status Description based on
 latest iana.org

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

diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php
index 70f31bd35f72..4efc6e804d3f 100644
--- a/system/HTTP/Response.php
+++ b/system/HTTP/Response.php
@@ -79,15 +79,15 @@ class Response extends Message implements MessageInterface, ResponseInterface
         410 => 'Gone',
         411 => 'Length Required',
         412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Long',
+        413 => 'Content Too Large', // https://www.iana.org/assignments/http-status-codes/http-status-codes.xml
+        414 => 'URI Too Long', // https://www.iana.org/assignments/http-status-codes/http-status-codes.xml
         415 => 'Unsupported Media Type',
         416 => 'Requested Range Not Satisfiable',
         417 => 'Expectation Failed',
         418 => "I'm a teapot", // April's Fools joke; http://www.ietf.org/rfc/rfc2324.txt
         // 419 (Authentication Timeout) is a non-standard status code with unknown origin
         421 => 'Misdirected Request', // http://www.iana.org/go/rfc7540 Section 9.1.2
-        422 => 'Unprocessable Entity', // http://www.iana.org/go/rfc4918
+        422 => 'Unprocessable Content', // https://www.iana.org/assignments/http-status-codes/http-status-codes.xml
         423 => 'Locked', // http://www.iana.org/go/rfc4918
         424 => 'Failed Dependency', // http://www.iana.org/go/rfc4918
         425 => 'Too Early', // https://datatracker.ietf.org/doc/draft-ietf-httpbis-replay/

From 1121abae4693ad3d36a85bc4a5edcce23709d43f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 25 Oct 2021 10:39:05 +0900
Subject: [PATCH 0508/2325] test: reduce the size of the method to be mocked

---
 system/Test/Mock/MockSecurity.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/system/Test/Mock/MockSecurity.php b/system/Test/Mock/MockSecurity.php
index 3f802a7d79f6..e24221c17b47 100644
--- a/system/Test/Mock/MockSecurity.php
+++ b/system/Test/Mock/MockSecurity.php
@@ -11,15 +11,12 @@
 
 namespace CodeIgniter\Test\Mock;
 
-use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\Security\Security;
 
 class MockSecurity extends Security
 {
-    protected function sendCookie(RequestInterface $request)
+    protected function doSendCookie(): void
     {
         $_COOKIE['csrf_cookie_name'] = $this->hash;
-
-        return $this;
     }
 }

From 6af9fc56ba06b42efe366bbde198c80cf5d6fabf Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 25 Oct 2021 10:41:16 +0900
Subject: [PATCH 0509/2325] test: add a test case

---
 tests/system/Security/SecurityTest.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/tests/system/Security/SecurityTest.php b/tests/system/Security/SecurityTest.php
index 9f14e355b981..ba6a4ada5024 100644
--- a/tests/system/Security/SecurityTest.php
+++ b/tests/system/Security/SecurityTest.php
@@ -66,7 +66,7 @@ public function testHashIsReadFromCookie()
         $this->assertSame('8b9218a55906f9dcc1dc263dce7f005a', $security->getHash());
     }
 
-    public function testGetHashSetsCookieWhenNotPOST()
+    public function testGetHashSetsCookieWhenGETWithoutCSRFCookie()
     {
         $security = new MockSecurity(new MockAppConfig());
 
@@ -77,6 +77,18 @@ public function testGetHashSetsCookieWhenNotPOST()
         $this->assertSame($_COOKIE['csrf_cookie_name'], $security->getHash());
     }
 
+    public function testGetHashReturnsCSRFCookieWhenGETWithCSRFCookie()
+    {
+        $_SERVER['REQUEST_METHOD']   = 'GET';
+        $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
+
+        $security = new MockSecurity(new MockAppConfig());
+
+        $security->verify(new Request(new MockAppConfig()));
+
+        $this->assertSame($_COOKIE['csrf_cookie_name'], $security->getHash());
+    }
+
     public function testCSRFVerifyPostThrowsExceptionOnNoMatch()
     {
         $_SERVER['REQUEST_METHOD']   = 'POST';

From 2a3767ad91c5387e67307d815264a99da8d18dc9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 25 Oct 2021 11:09:13 +0900
Subject: [PATCH 0510/2325] docs: fix format of testing/overview.rst

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

diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst
index f237acc03412..0a16a07b34ac 100644
--- a/user_guide_src/source/testing/overview.rst
+++ b/user_guide_src/source/testing/overview.rst
@@ -80,7 +80,7 @@ To test a new library, **Foo**, you would create a new file at **tests/app/Libra
         }
     }
 
-To test one of your models, you might end up with something like this in ``tests/app/Models/OneOfMyModelsTest.php``::
+To test one of your models, you might end up with something like this in **tests/app/Models/OneOfMyModelsTest.php**::
 
     <?php
 
@@ -203,7 +203,7 @@ Ensure that an event you expected to be triggered actually was::
 
     $this->assertEventTriggered('foo');
 
-**assertHeaderEmitted($header, $ignoreCase=false)**
+**assertHeaderEmitted($header, $ignoreCase = false)**
 
 Ensure that a header or cookie was actually emitted::
 
@@ -218,7 +218,7 @@ Ensure that a header or cookie was actually emitted::
 Note: the test case with this should be `run as a separate process
 in PHPunit <https://phpunit.readthedocs.io/en/7.4/annotations.html#runinseparateprocess>`_.
 
-**assertHeaderNotEmitted($header, $ignoreCase=false)**
+**assertHeaderNotEmitted($header, $ignoreCase = false)**
 
 Ensure that a header or cookie was not emitted::
 
@@ -233,7 +233,7 @@ Ensure that a header or cookie was not emitted::
 Note: the test case with this should be `run as a separate process
 in PHPunit <https://phpunit.readthedocs.io/en/7.4/annotations.html#runinseparateprocess>`_.
 
-**assertCloseEnough($expected, $actual, $message='', $tolerance=1)**
+**assertCloseEnough($expected, $actual, $message = '', $tolerance = 1)**
 
 For extended execution time testing, tests that the absolute difference
 between expected and actual time is within the prescribed tolerance.::
@@ -244,7 +244,7 @@ between expected and actual time is within the prescribed tolerance.::
 
 The above test will allow the actual time to be either 660 or 661 seconds.
 
-**assertCloseEnoughString($expected, $actual, $message='', $tolerance=1)**
+**assertCloseEnoughString($expected, $actual, $message = '', $tolerance = 1)**
 
 For extended execution time testing, tests that the absolute difference
 between expected and actual time, formatted as strings, is within the prescribed tolerance.::

From e2f4e59e253363b6a191a80e9a208a09f1371997 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 25 Oct 2021 11:14:07 +0900
Subject: [PATCH 0511/2325] docs: Zip file does not contain the user guide

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

diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst
index bfc38a852778..f28de5092e3d 100644
--- a/user_guide_src/source/installation/upgrade_4xx.rst
+++ b/user_guide_src/source/installation/upgrade_4xx.rst
@@ -30,7 +30,7 @@ General Adjustments
 
 **Downloads**
 
-- CI4 is still available as a ready-to-run zip or tarball, which includes the user guide (though in the `docs` subfolder).
+- CI4 is still available as a ready-to-run zip or tarball.
 - It can also be installed using Composer.
 
 **Namespaces**

From 024df6cbedfacfe509999abf85bdaa0ef957dfcc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 25 Oct 2021 11:32:34 +0900
Subject: [PATCH 0512/2325] fix: remove extra DIRECTORY_SEPARATOR

Co-authored-by: MGatner <mgatner@icloud.com>
---
 system/Publisher/Publisher.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php
index a492a03e02c3..dac7aa898f1a 100644
--- a/system/Publisher/Publisher.php
+++ b/system/Publisher/Publisher.php
@@ -230,7 +230,7 @@ final public function getScratch(): string
             $this->scratch = rtrim(sys_get_temp_dir(), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . bin2hex(random_bytes(6)) . DIRECTORY_SEPARATOR;
             mkdir($this->scratch, 0700);
             $this->scratch = realpath($this->scratch) ? realpath($this->scratch) . DIRECTORY_SEPARATOR
-                : $this->scratch . DIRECTORY_SEPARATOR;
+                : $this->scratch;
         }
 
         return $this->scratch;

From 7634d3a7a7f9f3bd8848e956a5797f9c40e78f02 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 25 Oct 2021 14:35:29 +0700
Subject: [PATCH 0513/2325] [Rector] Using LevelSetList::UP_TO_PHP_73

---
 rector.php                                  | 20 +++++++++++++++++++-
 tests/system/Autoloader/FileLocatorTest.php |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/rector.php b/rector.php
index aa9546d37ca9..fdd78a85e86c 100644
--- a/rector.php
+++ b/rector.php
@@ -37,11 +37,16 @@
 use Rector\EarlyReturn\Rector\If_\ChangeIfElseValueAssignToEarlyReturnRector;
 use Rector\EarlyReturn\Rector\If_\RemoveAlwaysElseRector;
 use Rector\EarlyReturn\Rector\Return_\PreparedValueToEarlyReturnRector;
+use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
+use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector;
+use Rector\Php70\Rector\FuncCall\RandomFunctionRector;
 use Rector\Php70\Rector\Ternary\TernaryToNullCoalescingRector;
+use Rector\Php71\Rector\FuncCall\CountOnNullRector;
 use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector;
 use Rector\Php71\Rector\List_\ListToArrayDestructRector;
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
+use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Utils\Rector\PassStrictParameterToFunctionParameterRector;
@@ -51,7 +56,7 @@
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $containerConfigurator->import(SetList::DEAD_CODE);
-    $containerConfigurator->import(SetList::PHP_73);
+    $containerConfigurator->import(LevelSetList::UP_TO_PHP_73);
 
     $parameters = $containerConfigurator->parameters();
 
@@ -95,6 +100,19 @@
         UnderscoreToCamelCaseVariableNameRector::class => [
             __DIR__ . '/system/Session/Handlers',
         ],
+
+        // may cause load view files directly when detecting class that
+        // make warning
+        StringClassNameToClassConstantRector::class,
+
+        // sometime too detail
+        CountOnNullRector::class,
+
+        // may not be unitialized on purpose
+        AddDefaultValueForUndefinedVariableRector::class,
+
+        // use mt_rand instead of random_int on purpose on non-cryptographically random
+        RandomFunctionRector::class,
     ]);
 
     // auto import fully qualified class names
diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php
index 8a8b91aeea90..c85e4c215ba2 100644
--- a/tests/system/Autoloader/FileLocatorTest.php
+++ b/tests/system/Autoloader/FileLocatorTest.php
@@ -261,7 +261,7 @@ public function testFindQNameFromPathWithoutCorrespondingNamespace()
     public function testGetClassNameFromClassFile()
     {
         $this->assertSame(
-            __CLASS__,
+            self::class,
             $this->locator->getClassname(__FILE__)
         );
     }

From dd72eef46b63a7fb87ef38e0a0be971de8d68bf6 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 25 Oct 2021 14:42:42 +0700
Subject: [PATCH 0514/2325] clean up existing already in set list

---
 rector.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/rector.php b/rector.php
index fdd78a85e86c..04e761cbf89e 100644
--- a/rector.php
+++ b/rector.php
@@ -40,10 +40,7 @@
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
 use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector;
 use Rector\Php70\Rector\FuncCall\RandomFunctionRector;
-use Rector\Php70\Rector\Ternary\TernaryToNullCoalescingRector;
 use Rector\Php71\Rector\FuncCall\CountOnNullRector;
-use Rector\Php71\Rector\FuncCall\RemoveExtraParametersRector;
-use Rector\Php71\Rector\List_\ListToArrayDestructRector;
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
 use Rector\Set\ValueObject\LevelSetList;
@@ -141,12 +138,9 @@
     $services->set(ChangeArrayPushToArrayAssignRector::class);
     $services->set(UnnecessaryTernaryExpressionRector::class);
     $services->set(RemoveErrorSuppressInTryCatchStmtsRector::class);
-    $services->set(TernaryToNullCoalescingRector::class);
-    $services->set(ListToArrayDestructRector::class);
     $services->set(RemoveVarTagFromClassConstantRector::class);
     $services->set(AddPregQuoteDelimiterRector::class);
     $services->set(SimplifyRegexPatternRector::class);
-    $services->set(RemoveExtraParametersRector::class);
     $services->set(FuncGetArgsToVariadicParamRector::class);
     $services->set(MakeInheritedMethodVisibilitySameAsParentRector::class);
     $services->set(FixClassCaseSensitivityNameRector::class);

From d1edaee437d256d9cc1e16c76c4fec2ba8de48c0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 19 Oct 2021 21:57:21 +0900
Subject: [PATCH 0515/2325] fix: reset unneeded headers to prevent request
 error

Fixes #4826
---
 system/HTTP/CURLRequest.php | 38 +++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 3be8214d42b4..3b4b3ef9a850 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -72,6 +72,16 @@ class CURLRequest extends Request
      */
     protected $delay = 0.0;
 
+    /**
+     * Request headers that are not shared between requests.
+     *
+     * @var string[]
+     */
+    private $unsharedHeaders = [
+        'Content-Length',
+        'Content-Type',
+    ];
+
     /**
      * Takes an array of options to set the following possible class properties:
      *
@@ -106,6 +116,11 @@ public function __construct(App $config, URI $uri, ?ResponseInterface $response
      */
     public function request($method, string $url, array $options = []): ResponseInterface
     {
+        // Reset unshared headers
+        foreach ($this->unsharedHeaders as $header) {
+            $this->removeHeader($header);
+        }
+
         $this->parseOptions($options);
 
         $url = $this->prepareURL($url);
@@ -379,6 +394,29 @@ protected function applyRequestHeaders(array $curlOptions = []): array
         return $curlOptions;
     }
 
+    /**
+     * Override
+     */
+    public function populateHeaders(): void
+    {
+        foreach (array_keys($_SERVER) as $key) {
+            if (sscanf($key, 'HTTP_%s', $header) === 1) {
+                // take SOME_HEADER and turn it into Some-Header
+                $header = str_replace('_', ' ', strtolower($header));
+                $header = str_replace(' ', '-', ucwords($header));
+
+                if (in_array($header, $this->unsharedHeaders, true)) {
+                    continue;
+                }
+
+                $this->setHeader($header, $_SERVER[$key]);
+
+                // Add us to the header map so we can find them case-insensitively
+                $this->headerMap[strtolower($header)] = $header;
+            }
+        }
+    }
+
     /**
      * Apply method
      */

From 245dade5a52217c9eff313e6caa76c4c8531490e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 19 Oct 2021 21:58:32 +0900
Subject: [PATCH 0516/2325] fix: reset unneeded configs

If you reset it at the beginning of the request(), you will not be able to use setForm().
---
 system/HTTP/CURLRequest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 3b4b3ef9a850..2a305fa1c802 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -129,6 +129,9 @@ public function request($method, string $url, array $options = []): ResponseInte
 
         $this->send($method, $url);
 
+        // Reset unshared configs
+        unset($this->config['multipart'], $this->config['form_params']);
+
         return $this->response;
     }
 

From fa3620b24ae7bb15c00ca4fb49e56d36a8f4c510 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 19 Oct 2021 22:03:44 +0900
Subject: [PATCH 0517/2325] test: add test for CURLRequest unshared headers

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

diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index c1ac77765a44..56420caa863f 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -220,6 +220,46 @@ public function testOptionHeadersNotUsingPopulate()
         $this->assertSame('', $request->header('Accept-Encoding')->getValue());
     }
 
+    public function testHeaderContentLengthNotSharedBetweenRequests()
+    {
+        $options = [
+            'base_uri' => 'http://www.foo.com/api/v1/',
+        ];
+        $request = $this->getRequest($options);
+
+        $request->post('example', [
+            'form_params' => [
+                'q' => 'keyword',
+            ],
+        ]);
+        $request->get('example');
+
+        $this->assertNull($request->header('Content-Length'));
+    }
+
+    /**
+     * @backupGlobals enabled
+     */
+    public function testHeaderContentLengthNotSharedBetweenClients()
+    {
+        $_SERVER['HTTP_CONTENT_LENGTH'] = '10';
+
+        $options = [
+            'base_uri' => 'http://www.foo.com/api/v1/',
+        ];
+        $request = $this->getRequest($options);
+        $request->post('example', [
+            'form_params' => [
+                'q' => 'keyword',
+            ],
+        ]);
+
+        $request = $this->getRequest($options);
+        $request->get('example');
+
+        $this->assertNull($request->header('Content-Length'));
+    }
+
     public function testOptionsDelay()
     {
         $options = [

From 4b51e01b5b039d277b41930482220521f7af9970 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 19 Oct 2021 22:03:59 +0900
Subject: [PATCH 0518/2325] test: fix test method names

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

diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index 56420caa863f..b46cec5ce992 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -176,7 +176,7 @@ public function testOptionsHeaders()
     /**
      * @backupGlobals enabled
      */
-    public function testOptionHeadersUsingPopulate()
+    public function testOptionsHeadersUsingPopulate()
     {
         $_SERVER['HTTP_HOST']            = 'site1.com';
         $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en-US';
@@ -199,7 +199,7 @@ public function testOptionHeadersUsingPopulate()
     /**
      * @backupGlobals enabled
      */
-    public function testOptionHeadersNotUsingPopulate()
+    public function testOptionsHeadersNotUsingPopulate()
     {
         $_SERVER['HTTP_HOST']            = 'site1.com';
         $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en-US';

From c497b28998eff9a0c7786237b53f7391bb741c50 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Mon, 25 Oct 2021 11:21:40 -0400
Subject: [PATCH 0519/2325] Switch PHPCPD to tool

---
 .github/workflows/test-phpcpd.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test-phpcpd.yml b/.github/workflows/test-phpcpd.yml
index d78edbea1f0e..f4215df01c0e 100644
--- a/.github/workflows/test-phpcpd.yml
+++ b/.github/workflows/test-phpcpd.yml
@@ -34,10 +34,8 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: '8.0'
-          tools: phive
-          extensions: intl, json, mbstring, xml
+          tools: phpcpd
+          extensions: dom, mbstring
 
       - name: Detect code duplication
-        run: |
-            sudo phive --no-progress install --global --trust-gpg-keys 4AA394086372C20A phpcpd 
-            phpcpd --exclude system/Test --exclude system/ThirdParty --exclude system/Database/SQLSRV/Builder.php --exclude system/Database/SQLSRV/Forge.php app/ public/ system/
+        run: phpcpd --exclude system/Test --exclude system/ThirdParty --exclude system/Database/SQLSRV/Builder.php --exclude system/Database/SQLSRV/Forge.php -- app/ public/ system/

From 0061d9d80cb404796e67ed25a7de55a695097a41 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 26 Oct 2021 12:56:03 +0900
Subject: [PATCH 0520/2325] docs: remove unnecessary headings

---
 user_guide_src/source/libraries/typography.rst | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/user_guide_src/source/libraries/typography.rst b/user_guide_src/source/libraries/typography.rst
index 24e52419df35..9b381a151cdc 100644
--- a/user_guide_src/source/libraries/typography.rst
+++ b/user_guide_src/source/libraries/typography.rst
@@ -24,8 +24,6 @@ Available static functions
 
 The following functions are available:
 
-**autoTypography()**
-
 .. php:function:: autoTypography($str[, $reduce_linebreaks = false])
 
     :param    string    $str: Input string
@@ -45,8 +43,6 @@ The following functions are available:
         function you may want to consider :doc:`caching <../general/caching>` your
         pages.
 
-**formatCharacters()**
-
 .. php:function:: formatCharacters($str)
 
     :param    string    $str: Input string
@@ -61,8 +57,6 @@ The following functions are available:
 
         $string = $typography->formatCharacters($string);
 
-**nl2brExceptPre()**
-
 .. php:function:: nl2brExceptPre($str)
 
     :param    string    $str: Input string

From 5a1c7808c94b73f096c606672d639545dee3f32e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 26 Oct 2021 12:56:57 +0900
Subject: [PATCH 0521/2325] docs: decorate HTML tags

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

diff --git a/user_guide_src/source/libraries/typography.rst b/user_guide_src/source/libraries/typography.rst
index 9b381a151cdc..0a4ded63a898 100644
--- a/user_guide_src/source/libraries/typography.rst
+++ b/user_guide_src/source/libraries/typography.rst
@@ -63,9 +63,9 @@ The following functions are available:
     :returns:    String with HTML-formatted line breaks
     :rtype:    string
 
-    Converts newlines to <br /> tags unless they appear within <pre> tags.
+    Converts newlines to ``<br />`` tags unless they appear within ``<pre>`` tags.
     This function is identical to the native PHP ``nl2br()`` function,
-    except that it ignores <pre> tags.
+    except that it ignores ``<pre>`` tags.
 
     Usage example::
 

From 4de18315b909eb89e38c5539b8c157e2f7f883e0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 27 Oct 2021 08:38:40 +0900
Subject: [PATCH 0522/2325] test: fix failed test

1) CodeIgniter\Commands\CreateDatabaseTest::testCreateDatabase
Failed asserting that 'Database ".../CodeIgniter4/writable/foobar.db" already exists.\n
\n
' contains "successfully created.".

.../CodeIgniter4/tests/system/Commands/CreateDatabaseTest.php:68
---
 tests/system/Commands/CreateDatabaseTest.php | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/tests/system/Commands/CreateDatabaseTest.php b/tests/system/Commands/CreateDatabaseTest.php
index aed4fd5c144e..3875a2f51e68 100644
--- a/tests/system/Commands/CreateDatabaseTest.php
+++ b/tests/system/Commands/CreateDatabaseTest.php
@@ -38,22 +38,17 @@ protected function setUp(): void
         $this->connection   = Database::connect();
 
         parent::setUp();
+
+        $file = WRITEPATH . 'foobar.db';
+        if (file_exists($file)) {
+            unlink($file);
+        }
     }
 
     protected function tearDown(): void
     {
         stream_filter_remove($this->streamFilter);
 
-        if ($this->connection instanceof Connection) {
-            $file = WRITEPATH . 'foobar.db';
-
-            if (file_exists($file)) {
-                unlink($file);
-            }
-        } else {
-            Database::forge()->dropDatabase('foobar');
-        }
-
         parent::tearDown();
     }
 

From 0923134ec7b31604208e192f4d209d739096029f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 27 Oct 2021 08:42:45 +0900
Subject: [PATCH 0523/2325] test: fix failed test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2) CodeIgniter\I18n\TimeTest::testToFormattedDateString
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'May 10, 2017'
+'5月 10, 2017'

.../CodeIgniter4/tests/system/I18n/TimeTest.php:643
---
 tests/system/I18n/TimeTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php
index 2da8e5accbf3..da1ef5b3c5ef 100644
--- a/tests/system/I18n/TimeTest.php
+++ b/tests/system/I18n/TimeTest.php
@@ -28,7 +28,7 @@ protected function setUp(): void
         parent::setUp();
 
         helper('date');
-        Locale::setDefault('America/Chicago');
+        Locale::setDefault('en_US');
     }
 
     public function testNewTimeNow()

From f1a9f3bb1985350ed527a02e514b980dffc4b5d7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 27 Oct 2021 11:28:12 +0900
Subject: [PATCH 0524/2325] test: fix setUp()

Drop database for non-SQLite connections.
---
 tests/system/Commands/CreateDatabaseTest.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tests/system/Commands/CreateDatabaseTest.php b/tests/system/Commands/CreateDatabaseTest.php
index 3875a2f51e68..1b6d28fdf0f8 100644
--- a/tests/system/Commands/CreateDatabaseTest.php
+++ b/tests/system/Commands/CreateDatabaseTest.php
@@ -12,7 +12,7 @@
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Database\BaseConnection;
-use CodeIgniter\Database\SQLite3\Connection;
+use CodeIgniter\Database\SQLite3\Connection as SQLite3Connection;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 use Config\Database;
@@ -39,9 +39,13 @@ protected function setUp(): void
 
         parent::setUp();
 
-        $file = WRITEPATH . 'foobar.db';
-        if (file_exists($file)) {
-            unlink($file);
+        if ($this->connection instanceof SQLite3Connection) {
+            $file = WRITEPATH . 'foobar.db';
+            if (file_exists($file)) {
+                unlink($file);
+            }
+        } else {
+            Database::forge()->dropDatabase('foobar');
         }
     }
 
@@ -65,7 +69,7 @@ public function testCreateDatabase()
 
     public function testSqliteDatabaseDuplicated()
     {
-        if (! $this->connection instanceof Connection) {
+        if (! $this->connection instanceof SQLite3Connection) {
             $this->markTestSkipped('Needs to run on SQLite3.');
         }
 
@@ -78,7 +82,7 @@ public function testSqliteDatabaseDuplicated()
 
     public function testOtherDriverDuplicatedDatabase()
     {
-        if ($this->connection instanceof Connection) {
+        if ($this->connection instanceof SQLite3Connection) {
             $this->markTestSkipped('Needs to run on non-SQLite3 drivers.');
         }
 

From ee2b89481b7255bc64e0a409a164bdb7ba252755 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 27 Oct 2021 11:33:58 +0800
Subject: [PATCH 0525/2325] Fix wrong helper path resolution

---
 system/Common.php                    |  16 +--
 tests/system/CommonFunctionsTest.php |  39 -------
 tests/system/CommonHelperTest.php    | 148 +++++++++++++++++++++++++++
 3 files changed, 153 insertions(+), 50 deletions(-)
 create mode 100644 tests/system/CommonHelperTest.php

diff --git a/system/Common.php b/system/Common.php
index 0750fe38764e..7c150a01c1d4 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -560,7 +560,7 @@ function helper($filenames)
     {
         static $loaded = [];
 
-        $loader = Services::locator(true);
+        $loader = Services::locator();
 
         if (! is_array($filenames)) {
             $filenames = [$filenames];
@@ -596,18 +596,14 @@ function helper($filenames)
 
                 $includes[] = $path;
                 $loaded[]   = $filename;
-            }
-
-            // No namespaces, so search in all available locations
-            else {
+            } else {
+                // No namespaces, so search in all available locations
                 $paths = $loader->search('Helpers/' . $filename);
 
                 foreach ($paths as $path) {
-                    if (strpos($path, APPPATH) === 0) {
-                        // @codeCoverageIgnoreStart
+                    if (strpos($path, APPPATH . 'Helpers' . DIRECTORY_SEPARATOR) === 0) {
                         $appHelper = $path;
-                    // @codeCoverageIgnoreEnd
-                    } elseif (strpos($path, SYSTEMPATH) === 0) {
+                    } elseif (strpos($path, SYSTEMPATH . 'Helpers' . DIRECTORY_SEPARATOR) === 0) {
                         $systemHelper = $path;
                     } else {
                         $localIncludes[] = $path;
@@ -617,10 +613,8 @@ function helper($filenames)
 
                 // App-level helpers should override all others
                 if (! empty($appHelper)) {
-                    // @codeCoverageIgnoreStart
                     $includes[] = $appHelper;
                     $loaded[]   = $filename;
-                    // @codeCoverageIgnoreEnd
                 }
 
                 // All namespaced files get added in next
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index ad5ae969b1bc..ba4c1e7a4e07 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -29,9 +29,7 @@
 use Config\Logger;
 use Config\Modules;
 use InvalidArgumentException;
-use RuntimeException;
 use stdClass;
-use Tests\Support\Autoloader\FatalLocator;
 use Tests\Support\Models\JobModel;
 
 /**
@@ -479,43 +477,6 @@ public function dirtyPathsProvider()
         ];
     }
 
-    public function testHelperWithFatalLocatorThrowsException()
-    {
-        // Replace the locator with one that will fail if it is called
-        $locator = new FatalLocator(Services::autoloader());
-        Services::injectMock('locator', $locator);
-
-        try {
-            helper('baguette');
-            $exception = false;
-        } catch (RuntimeException $e) {
-            $exception = true;
-        }
-
-        $this->assertTrue($exception);
-        Services::reset();
-    }
-
-    public function testHelperLoadsOnce()
-    {
-        // Load it the first time
-        helper('baguette');
-
-        // Replace the locator with one that will fail if it is called
-        $locator = new FatalLocator(Services::autoloader());
-        Services::injectMock('locator', $locator);
-
-        try {
-            helper('baguette');
-            $exception = false;
-        } catch (RuntimeException $e) {
-            $exception = true;
-        }
-
-        $this->assertFalse($exception);
-        Services::reset();
-    }
-
     public function testIsCli()
     {
         $this->assertIsBool(is_cli());
diff --git a/tests/system/CommonHelperTest.php b/tests/system/CommonHelperTest.php
new file mode 100644
index 000000000000..55d626cf966c
--- /dev/null
+++ b/tests/system/CommonHelperTest.php
@@ -0,0 +1,148 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter;
+
+use CodeIgniter\Autoloader\FileLocator;
+use CodeIgniter\Test\CIUnitTestCase;
+use Config\Services;
+use PHPUnit\Framework\MockObject\MockObject;
+use RuntimeException;
+use Tests\Support\Autoloader\FatalLocator;
+
+/**
+ * @internal
+ *
+ * @covers ::helper
+ */
+final class CommonHelperTest extends CIUnitTestCase
+{
+    private $dummyHelpers = [
+        APPPATH . 'Helpers' . DIRECTORY_SEPARATOR . 'foobarbaz_helper.php',
+        SYSTEMPATH . 'Helpers' . DIRECTORY_SEPARATOR . 'foobarbaz_helper.php',
+    ];
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->cleanUpDummyHelpers();
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        $this->cleanUpDummyHelpers();
+        Services::reset();
+    }
+
+    private function createDummyHelpers(): void
+    {
+        $text = <<<'PHP'
+            <?php
+
+            if (! function_exists('foo_bar_baz')) {
+            	function foo_bar_baz(): string
+            	{
+            		return __FILE__;
+            	}
+            }
+
+            PHP;
+
+        foreach ($this->dummyHelpers as $helper) {
+            file_put_contents($helper, $text);
+        }
+    }
+
+    private function cleanUpDummyHelpers(): void
+    {
+        foreach ($this->dummyHelpers as $helper) {
+            if (is_file($helper)) {
+                unlink($helper);
+            }
+        }
+    }
+
+    /**
+     * @return FileLocator&MockObject
+     */
+    private function getMockLocator()
+    {
+        return $this->getMockBuilder(FileLocator::class)
+            ->setConstructorArgs([Services::autoloader()])
+            ->onlyMethods(['search'])
+            ->getMock();
+    }
+
+    public function testHelperWithFatalLocatorThrowsException()
+    {
+        // Replace the locator with one that will fail if it is called
+        $locator = new FatalLocator(Services::autoloader());
+        Services::injectMock('locator', $locator);
+
+        try {
+            helper('baguette');
+            $exception = false;
+        } catch (RuntimeException $e) {
+            $exception = true;
+        }
+
+        $this->assertTrue($exception);
+        Services::reset();
+    }
+
+    public function testHelperLoadsOnce()
+    {
+        // Load it the first time
+        helper('baguette');
+
+        // Replace the locator with one that will fail if it is called
+        $locator = new FatalLocator(Services::autoloader());
+        Services::injectMock('locator', $locator);
+
+        try {
+            helper('baguette');
+            $exception = false;
+        } catch (RuntimeException $e) {
+            $exception = true;
+        }
+
+        $this->assertFalse($exception);
+        Services::reset();
+    }
+
+    public function testHelperLoadsAppHelperFirst(): void
+    {
+        foreach ($this->dummyHelpers as $helper) {
+            $this->assertFileDoesNotExist($helper, sprintf(
+                'The dummy helper file "%s" should not be existing before it is tested.',
+                $helper
+            ));
+        }
+
+        $this->createDummyHelpers();
+        $locator = $this->getMockLocator();
+        $locator->method('search')->with('Helpers/foobarbaz_helper')->willReturn($this->dummyHelpers);
+        Services::injectMock('locator', $locator);
+
+        helper('foobarbaz');
+
+        // this chunk is not needed really; just added so that IDEs will be happy
+        if (! function_exists('foo_bar_baz')) {
+            function foo_bar_baz(): string
+            {
+                return __FILE__;
+            }
+        }
+
+        $this->assertSame($this->dummyHelpers[0], foo_bar_baz());
+    }
+}

From d7c9ad2ce64f886ae7e50781daf9d679d5252380 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 27 Oct 2021 13:27:22 +0900
Subject: [PATCH 0526/2325] test: fix setUp()

Ensure the database exists.
---
 tests/system/Commands/CreateDatabaseTest.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/system/Commands/CreateDatabaseTest.php b/tests/system/Commands/CreateDatabaseTest.php
index 1b6d28fdf0f8..a00de5c437a1 100644
--- a/tests/system/Commands/CreateDatabaseTest.php
+++ b/tests/system/Commands/CreateDatabaseTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Database\Database as DatabaseFactory;
 use CodeIgniter\Database\SQLite3\Connection as SQLite3Connection;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
@@ -45,7 +46,11 @@ protected function setUp(): void
                 unlink($file);
             }
         } else {
-            Database::forge()->dropDatabase('foobar');
+            $util = (new DatabaseFactory())->loadUtils($this->connection);
+
+            if ($util->databaseExists('foobar')) {
+                Database::forge()->dropDatabase('foobar');
+            }
         }
     }
 

From f758702531514468d247796b4bef4d1eb864d697 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 28 Oct 2021 10:51:13 +0800
Subject: [PATCH 0527/2325] Apply suggestions from code review

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

diff --git a/tests/system/CommonHelperTest.php b/tests/system/CommonHelperTest.php
index 55d626cf966c..72e6075f7d1f 100644
--- a/tests/system/CommonHelperTest.php
+++ b/tests/system/CommonHelperTest.php
@@ -96,7 +96,6 @@ public function testHelperWithFatalLocatorThrowsException()
         }
 
         $this->assertTrue($exception);
-        Services::reset();
     }
 
     public function testHelperLoadsOnce()
@@ -116,7 +115,6 @@ public function testHelperLoadsOnce()
         }
 
         $this->assertFalse($exception);
-        Services::reset();
     }
 
     public function testHelperLoadsAppHelperFirst(): void

From 120a56a71826a7dbcef5ead218ac56ed292725e7 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 28 Oct 2021 10:52:58 +0800
Subject: [PATCH 0528/2325] Update tests/system/CommonHelperTest.php

---
 tests/system/CommonHelperTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/system/CommonHelperTest.php b/tests/system/CommonHelperTest.php
index 72e6075f7d1f..ed3d629266a4 100644
--- a/tests/system/CommonHelperTest.php
+++ b/tests/system/CommonHelperTest.php
@@ -33,6 +33,7 @@ final class CommonHelperTest extends CIUnitTestCase
     protected function setUp(): void
     {
         parent::setUp();
+        Services::reset();
         $this->cleanUpDummyHelpers();
     }
 

From 568d8a98e4b94f7ab44a78cc6afcfd6144ddeea8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 28 Oct 2021 11:53:57 +0900
Subject: [PATCH 0529/2325] docs: decorate `.env` with `**`

---
 user_guide_src/source/database/configuration.rst       | 4 ++--
 user_guide_src/source/general/common_functions.rst     | 2 +-
 user_guide_src/source/general/configuration.rst        | 8 ++++----
 user_guide_src/source/general/errors.rst               | 2 +-
 user_guide_src/source/installation/running.rst         | 4 ++--
 user_guide_src/source/installation/troubleshooting.rst | 2 +-
 user_guide_src/source/libraries/encryption.rst         | 2 +-
 user_guide_src/source/libraries/honeypot.rst           | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst
index 53b2c3f932b0..f1776d93151d 100644
--- a/user_guide_src/source/database/configuration.rst
+++ b/user_guide_src/source/database/configuration.rst
@@ -9,7 +9,7 @@ Database Configuration
 CodeIgniter has a config file that lets you store your database
 connection values (username, password, database name, etc.). The config
 file is located at **app/Config/Database.php**. You can also set
-database connection values in the .env file. See below for more details.
+database connection values in the **.env** file. See below for more details.
 
 The config settings are stored in a class property that is an array with this
 prototype::
@@ -162,7 +162,7 @@ within the class' constructor::
 Configuring With .env File
 --------------------------
 
-You can also save your configuration values within a ``.env`` file with the current server's
+You can also save your configuration values within a **.env** file with the current server's
 database settings. You only need to enter the values that change from what is in the
 default group's configuration settings. The values should be name following this format, where
 ``default`` is the group name::
diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index 8d006197bcfe..dd4c69a9915e 100755
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -63,7 +63,7 @@ Service Accessors
     or return a default value if it is not found. Will format boolean values
     to actual booleans instead of string representations.
 
-    Especially useful when used in conjunction with .env files for setting
+    Especially useful when used in conjunction with **.env** files for setting
     values that are specific to the environment itself, like database
     settings, API keys, etc.
 
diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst
index 8254b9fe44ea..ac31e6f3241a 100644
--- a/user_guide_src/source/general/configuration.rst
+++ b/user_guide_src/source/general/configuration.rst
@@ -191,15 +191,15 @@ Environment Variables as Replacements for Data
 ==============================================
 
 It is very important to always remember that environment variables contained in your **.env** are
-**only replacements for existing data**. This means that you cannot expect to fill your ``.env`` with all
+**only replacements for existing data**. This means that you cannot expect to fill your **.env** with all
 the replacements for your configurations but have nothing to receive these replacements in the
 related configuration file(s).
 
-The ``.env`` only serves to fill or replace the values in your configuration files. That said, your
+The **.env** only serves to fill or replace the values in your configuration files. That said, your
 configuration files should have a container or receiving property for those. Adding so many variables in
-your ``.env`` with nothing to contain them in the receiving end is useless.
+your **.env** with nothing to contain them in the receiving end is useless.
 
-Simply put, you cannot just put ``app.myNewConfig = foo`` in your ``.env`` and expect your ``Config\App``
+Simply put, you cannot just put ``app.myNewConfig = foo`` in your **.env** and expect your ``Config\App``
 to magically have that property and value at run time.
 
 Treating Environment Variables as Arrays
diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst
index 410e58236a8d..b7863b03010d 100644
--- a/user_guide_src/source/general/errors.rst
+++ b/user_guide_src/source/general/errors.rst
@@ -55,7 +55,7 @@ Configuration
 
 By default, CodeIgniter will display all errors in the ``development`` and ``testing`` environments, and will not
 display any errors in the ``production`` environment. You can change this by setting the ``CI_ENVIRONMENT`` variable
-in the ``.env`` file.
+in the **.env** file.
 
 .. important:: Disabling error reporting DOES NOT stop logs from being written if there are errors.
 
diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst
index 4d00260ffcea..bb4b99aa468f 100644
--- a/user_guide_src/source/installation/running.rst
+++ b/user_guide_src/source/installation/running.rst
@@ -17,11 +17,11 @@ Initial Configuration & Set Up
 
 #. Open the **app/Config/App.php** file with a text editor and
    set your base URL. If you need more flexibility, the baseURL may
-   be set within the ``.env`` file as **app.baseURL="http://example.com/"**.
+   be set within the **.env** file as ``app.baseURL="http://example.com/"``.
    (Always use a trailing slash on your base URL!)
 #. If you intend to use a database, open the
    **app/Config/Database.php** file with a text editor and set your
-   database settings. Alternately, these could be set in your ``.env`` file.
+   database settings. Alternately, these could be set in your **.env** file.
 
 One additional measure to take in production environments is to disable
 PHP error reporting and any other development-only functionality. In
diff --git a/user_guide_src/source/installation/troubleshooting.rst b/user_guide_src/source/installation/troubleshooting.rst
index a0b1684fda9d..ff30759efcad 100644
--- a/user_guide_src/source/installation/troubleshooting.rst
+++ b/user_guide_src/source/installation/troubleshooting.rst
@@ -65,7 +65,7 @@ unrecoverable error, which we don't want to show to the viewer of
 the webapp, for better security.
 
 You can see the error in the debug toolbar display by setting your environment to
-"development" (in `.env`), and reloading the page.
+"development" (in **.env**), and reloading the page.
 
 Don't forget to reset the environment to "production" once you fix the problem!
 
diff --git a/user_guide_src/source/libraries/encryption.rst b/user_guide_src/source/libraries/encryption.rst
index 2c8373743f35..2c45e7ad79d9 100644
--- a/user_guide_src/source/libraries/encryption.rst
+++ b/user_guide_src/source/libraries/encryption.rst
@@ -153,7 +153,7 @@ the library.
     // or
     public $key = 'base64:<your-base64-encoded-key>'
 
-Similarly, you can use these prefixes in your ``.env`` file, too!
+Similarly, you can use these prefixes in your **.env** file, too!
 ::
 
     // For hex2bin
diff --git a/user_guide_src/source/libraries/honeypot.rst b/user_guide_src/source/libraries/honeypot.rst
index 471c0d520003..0b9114456cf0 100644
--- a/user_guide_src/source/libraries/honeypot.rst
+++ b/user_guide_src/source/libraries/honeypot.rst
@@ -36,7 +36,7 @@ Customizing Honeypot
 =====================
 
 Honeypot can be customized. The fields below can be set either in
-**app/Config/Honeypot.php** or in ``.env``.
+**app/Config/Honeypot.php** or in **.env**.
 
 * ``hidden`` - true|false to control visibility of the honeypot field; default is ``true``
 * ``label`` - HTML label for the honeypot field, default is 'Fill This Field'

From d263558af1dcc0148a58b3edb134df919e941b67 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 28 Oct 2021 12:16:52 +0800
Subject: [PATCH 0530/2325] Update tests/system/CommonHelperTest.php

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

diff --git a/tests/system/CommonHelperTest.php b/tests/system/CommonHelperTest.php
index ed3d629266a4..18e0a1022f8d 100644
--- a/tests/system/CommonHelperTest.php
+++ b/tests/system/CommonHelperTest.php
@@ -32,8 +32,8 @@ final class CommonHelperTest extends CIUnitTestCase
 
     protected function setUp(): void
     {
-        parent::setUp();
         Services::reset();
+        parent::setUp();
         $this->cleanUpDummyHelpers();
     }
 

From e307ef566c6f5d1ddeb611275cbba66faa490b89 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 28 Oct 2021 13:29:33 +0900
Subject: [PATCH 0531/2325] fix: remove populateHeaders() not to share request
 headers form browser between CURL requests

---
 system/HTTP/CURLRequest.php           | 37 ++-------------------------
 tests/system/HTTP/CURLRequestTest.php | 23 -----------------
 2 files changed, 2 insertions(+), 58 deletions(-)

diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 2a305fa1c802..0b6b1cfb9005 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -368,27 +368,17 @@ public function send(string $method, string $url)
     }
 
     /**
-     * Takes all headers current part of this request and adds them
-     * to the cURL request.
+     * Adds $this->headers to the cURL request.
      */
     protected function applyRequestHeaders(array $curlOptions = []): array
     {
         if (empty($this->headers)) {
-            $this->populateHeaders();
-            // Otherwise, it will corrupt the request
-            $this->removeHeader('Host');
-            $this->removeHeader('Accept-Encoding');
-        }
-
-        $headers = $this->headers();
-
-        if (empty($headers)) {
             return $curlOptions;
         }
 
         $set = [];
 
-        foreach (array_keys($headers) as $name) {
+        foreach (array_keys($this->headers) as $name) {
             $set[] = $name . ': ' . $this->getHeaderLine($name);
         }
 
@@ -397,29 +387,6 @@ protected function applyRequestHeaders(array $curlOptions = []): array
         return $curlOptions;
     }
 
-    /**
-     * Override
-     */
-    public function populateHeaders(): void
-    {
-        foreach (array_keys($_SERVER) as $key) {
-            if (sscanf($key, 'HTTP_%s', $header) === 1) {
-                // take SOME_HEADER and turn it into Some-Header
-                $header = str_replace('_', ' ', strtolower($header));
-                $header = str_replace(' ', '-', ucwords($header));
-
-                if (in_array($header, $this->unsharedHeaders, true)) {
-                    continue;
-                }
-
-                $this->setHeader($header, $_SERVER[$key]);
-
-                // Add us to the header map so we can find them case-insensitively
-                $this->headerMap[strtolower($header)] = $header;
-            }
-        }
-    }
-
     /**
      * Apply method
      */
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index b46cec5ce992..33fb4d2adfdb 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -173,29 +173,6 @@ public function testOptionsHeaders()
         $this->assertSame('apple', $request->header('fruit')->getValue());
     }
 
-    /**
-     * @backupGlobals enabled
-     */
-    public function testOptionsHeadersUsingPopulate()
-    {
-        $_SERVER['HTTP_HOST']            = 'site1.com';
-        $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en-US';
-        $_SERVER['HTTP_ACCEPT_ENCODING'] = 'gzip, deflate, br';
-
-        $options = [
-            'base_uri' => 'http://www.foo.com/api/v1/',
-        ];
-
-        $request = $this->getRequest($options);
-        $request->get('example');
-        // we fill the Accept-Language header from _SERVER when no headers are defined for the request
-        $this->assertSame('en-US', $request->header('Accept-Language')->getValue());
-        // but we skip Host header - since it would corrupt the request
-        $this->assertNull($request->header('Host'));
-        // and Accept-Encoding
-        $this->assertNull($request->header('Accept-Encoding'));
-    }
-
     /**
      * @backupGlobals enabled
      */

From 0b18ab84474ef9733487fd3b48eea135b0cd4569 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 28 Oct 2021 17:10:54 +0900
Subject: [PATCH 0532/2325] style: change global_namespace_import to true in
 php-cs-fixer

https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/2.19/doc/rules/import/global_namespace_import.rst
---
 tests/_support/Commands/AppInfo.php        |  3 ++-
 tests/_support/Commands/InvalidCommand.php |  3 ++-
 tests/_support/Controllers/Popcorn.php     |  3 ++-
 tests/_support/Widgets/SomeWidget.php      |  4 +++-
 tests/system/I18n/TimeTest.php             | 20 ++++++++++----------
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/tests/_support/Commands/AppInfo.php b/tests/_support/Commands/AppInfo.php
index 562cc9dd3847..e7bf3093e658 100644
--- a/tests/_support/Commands/AppInfo.php
+++ b/tests/_support/Commands/AppInfo.php
@@ -14,6 +14,7 @@
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\CodeIgniter;
+use RuntimeException;
 
 class AppInfo extends BaseCommand
 {
@@ -31,7 +32,7 @@ public function bomb()
     {
         try {
             CLI::color('test', 'white', 'Background');
-        } catch (\RuntimeException $oops) {
+        } catch (RuntimeException $oops) {
             $this->showError($oops);
         }
     }
diff --git a/tests/_support/Commands/InvalidCommand.php b/tests/_support/Commands/InvalidCommand.php
index a6d13d6fe494..5b4acf936b08 100644
--- a/tests/_support/Commands/InvalidCommand.php
+++ b/tests/_support/Commands/InvalidCommand.php
@@ -14,6 +14,7 @@
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\CodeIgniter;
+use ReflectionException;
 
 class InvalidCommand extends BaseCommand
 {
@@ -23,7 +24,7 @@ class InvalidCommand extends BaseCommand
 
     public function __construct()
     {
-        throw new \ReflectionException();
+        throw new ReflectionException();
     }
 
     public function run(array $params)
diff --git a/tests/_support/Controllers/Popcorn.php b/tests/_support/Controllers/Popcorn.php
index a0aa972c635f..71a316685a32 100644
--- a/tests/_support/Controllers/Popcorn.php
+++ b/tests/_support/Controllers/Popcorn.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\API\ResponseTrait;
 use CodeIgniter\Controller;
+use RuntimeException;
 
 /**
  * This is a testing only controller, intended to blow up in multiple
@@ -34,7 +35,7 @@ public function pop()
 
     public function popper()
     {
-        throw new \RuntimeException('Surprise', 500);
+        throw new RuntimeException('Surprise', 500);
     }
 
     public function weasel()
diff --git a/tests/_support/Widgets/SomeWidget.php b/tests/_support/Widgets/SomeWidget.php
index 380449f14b9b..c6e2b3da8652 100644
--- a/tests/_support/Widgets/SomeWidget.php
+++ b/tests/_support/Widgets/SomeWidget.php
@@ -11,7 +11,9 @@
 
 namespace Tests\Support\Widgets;
 
+use stdClass;
+
 // Extends a trivial class to test the instanceOf directive
-class SomeWidget extends \stdClass
+class SomeWidget extends stdClass
 {
 }
diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php
index da1ef5b3c5ef..e1e683c98d07 100644
--- a/tests/system/I18n/TimeTest.php
+++ b/tests/system/I18n/TimeTest.php
@@ -90,7 +90,7 @@ public function testTimeWithDateTimeZone()
             'yyyy-MM-dd HH:mm:ss'
         );
 
-        $time = new Time('now', new \DateTimeZone('Europe/London'), 'fr_FR');
+        $time = new Time('now', new DateTimeZone('Europe/London'), 'fr_FR');
 
         $this->assertSame($formatter->format($time), (string) $time);
     }
@@ -101,13 +101,13 @@ public function testToDateTime()
 
         $obj = $time->toDateTime();
 
-        $this->assertInstanceOf(\DateTime::class, $obj);
+        $this->assertInstanceOf(DateTime::class, $obj);
     }
 
     public function testNow()
     {
         $time  = Time::now();
-        $time1 = new \DateTime();
+        $time1 = new DateTime();
 
         $this->assertInstanceOf(Time::class, $time);
         $this->assertSame($time->getTimestamp(), $time1->getTimestamp());
@@ -116,7 +116,7 @@ public function testNow()
     public function testParse()
     {
         $time  = Time::parse('next Tuesday', 'America/Chicago');
-        $time1 = new \DateTime('now', new \DateTimeZone('America/Chicago'));
+        $time1 = new DateTime('now', new DateTimeZone('America/Chicago'));
         $time1->modify('next Tuesday');
 
         $this->assertSame($time->getTimestamp(), $time1->getTimestamp());
@@ -134,7 +134,7 @@ public function testToDateTimeStringWithTimeZone()
     {
         $time = Time::parse('2017-01-12 00:00', 'Europe/London');
 
-        $expects = new \DateTime('2017-01-12', new \DateTimeZone('Europe/London'));
+        $expects = new DateTime('2017-01-12', new DateTimeZone('Europe/London'));
 
         $this->assertSame($expects->format('Y-m-d H:i:s'), $time->toDateTimeString());
     }
@@ -204,7 +204,7 @@ public function testCreateFromTimeLocalized()
 
     public function testCreateFromFormat()
     {
-        $now = new \DateTime('now');
+        $now = new DateTime('now');
 
         Time::setTestNow($now);
         $time = Time::createFromFormat('F j, Y', 'January 15, 2017', 'America/Chicago');
@@ -222,7 +222,7 @@ public function testCreateFromFormatWithTimezoneString()
 
     public function testCreateFromFormatWithTimezoneObject()
     {
-        $tz = new \DateTimeZone('Europe/London');
+        $tz = new DateTimeZone('Europe/London');
 
         $time = Time::createFromFormat('F j, Y', 'January 15, 2017', $tz);
 
@@ -422,7 +422,7 @@ public function testGetTimezone()
     {
         $instance = Time::now()->getTimezone();
 
-        $this->assertInstanceOf(\DateTimeZone::class, $instance);
+        $this->assertInstanceOf(DateTimeZone::class, $instance);
     }
 
     public function testGetTimezonename()
@@ -776,7 +776,7 @@ public function testEqualWithSame()
     public function testEqualWithDateTime()
     {
         $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
-        $time2 = new \DateTime('January 11, 2017 03:50:00', new \DateTimeZone('Europe/London'));
+        $time2 = new DateTime('January 11, 2017 03:50:00', new DateTimeZone('Europe/London'));
 
         $this->assertTrue($time1->equals($time2));
     }
@@ -784,7 +784,7 @@ public function testEqualWithDateTime()
     public function testEqualWithSameDateTime()
     {
         $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
-        $time2 = new \DateTime('January 10, 2017 21:50:00', new \DateTimeZone('America/Chicago'));
+        $time2 = new DateTime('January 10, 2017 21:50:00', new DateTimeZone('America/Chicago'));
 
         $this->assertTrue($time1->equals($time2));
     }

From 9cbe0f25159d7cbf2fe18d99b60c905a2a9f3701 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Oct 2021 10:26:32 +0900
Subject: [PATCH 0533/2325] fix: make $unsharedHeaders protected

To override the values.
---
 system/HTTP/CURLRequest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 0b6b1cfb9005..baf97d2b891d 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -77,7 +77,7 @@ class CURLRequest extends Request
      *
      * @var string[]
      */
-    private $unsharedHeaders = [
+    protected $unsharedHeaders = [
         'Content-Length',
         'Content-Type',
     ];

From c9bac5f99a40ebc878c245efb1745b84b84d8a9d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Oct 2021 11:16:39 +0900
Subject: [PATCH 0534/2325] fix: reset $unsharedHeaders after sending request

If user setHeader() that is defined in $unsharedHeaders, the header will be removed
before sending request, and there is no way to send the header.

The reason I didn't do the reset after sending is because a test failed.
This time I modify the test, too.
---
 system/HTTP/CURLRequest.php           | 9 ++++-----
 tests/system/HTTP/CURLRequestTest.php | 5 ++++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index baf97d2b891d..b195249589e9 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -116,11 +116,6 @@ public function __construct(App $config, URI $uri, ?ResponseInterface $response
      */
     public function request($method, string $url, array $options = []): ResponseInterface
     {
-        // Reset unshared headers
-        foreach ($this->unsharedHeaders as $header) {
-            $this->removeHeader($header);
-        }
-
         $this->parseOptions($options);
 
         $url = $this->prepareURL($url);
@@ -129,6 +124,10 @@ public function request($method, string $url, array $options = []): ResponseInte
 
         $this->send($method, $url);
 
+        // Reset unshared headers
+        foreach ($this->unsharedHeaders as $header) {
+            $this->removeHeader($header);
+        }
         // Reset unshared configs
         unset($this->config['multipart'], $this->config['form_params']);
 
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index 33fb4d2adfdb..435a647ecf90 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -912,7 +912,10 @@ public function testSetJSON()
         $this->request->setJSON($params)->post('/post');
 
         $this->assertSame(json_encode($params), $this->request->getBody());
-        $this->assertSame('application/json', $this->request->getHeaderLine('Content-Type'));
+        $this->assertSame(
+            'Content-Type: application/json',
+            $this->request->curl_options[CURLOPT_HTTPHEADER][0]
+        );
     }
 
     public function testHTTPv1()

From d39543ece518bade48715451e69992aacefa1ca2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Oct 2021 11:33:31 +0900
Subject: [PATCH 0535/2325] docs: improve changelogs/v4.1.5.rst format

---
 user_guide_src/source/changelogs/v4.1.5.rst | 25 +++++++++++++--------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.1.5.rst b/user_guide_src/source/changelogs/v4.1.5.rst
index 3290763f0ed3..d1d9fd58aa2c 100644
--- a/user_guide_src/source/changelogs/v4.1.5.rst
+++ b/user_guide_src/source/changelogs/v4.1.5.rst
@@ -1,28 +1,35 @@
 Version 4.1.5
-=============
+#############
 
 Release Date: Not released
 
 **4.1.5 release of CodeIgniter4**
 
-BREAKING:
+.. contents::
+    :local:
+    :depth: 1
 
-Fixed `a bug <https://github.com/codeigniter4/CodeIgniter4/issues/2913>`_ on CSRF protection.
-Now CSRF protection works on PUT/PATCH/DELETE requests when CSRF filter is applied.
-If you use such requests, you need to send CSRF token.
+BREAKING
+========
 
-Enhancements:
+- Fixed `a bug <https://github.com/codeigniter4/CodeIgniter4/issues/2913>`_ on CSRF protection. Now CSRF protection works on PUT/PATCH/DELETE requests when CSRF filter is applied. If you use such requests, you need to send CSRF token.
+
+Enhancements
+============
 
 - Added Cache config for reserved characters
 - The ``addForeignKey`` function of the ``Forge`` class can now define composite foreign keys in an array
 - The ``dropKey`` function of the ``Forge`` class can remove key
 
-Changes:
+Changes
+=======
 
 - Always escape identifiers in the ``set``, ``setUpdateBatch``, and ``insertBatch`` functions in ``BaseBuilder``.
 
-Deprecations:
+Deprecations
+============
 
 - Deprecated ``CodeIgniter\\Cache\\Handlers\\BaseHandler::RESERVED_CHARACTERS`` in favor of the new config property
 
-Bugs Fixed:
+Bugs Fixed
+==========

From 9a6a0d3e708e1dbca2b8efb48f16ac00cbe492cf Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Oct 2021 11:38:33 +0900
Subject: [PATCH 0536/2325] docs: add upgrading and changelog

---
 user_guide_src/source/changelogs/v4.1.5.rst        | 1 +
 user_guide_src/source/installation/upgrade_415.rst | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/user_guide_src/source/changelogs/v4.1.5.rst b/user_guide_src/source/changelogs/v4.1.5.rst
index d1d9fd58aa2c..6e9c96ded738 100644
--- a/user_guide_src/source/changelogs/v4.1.5.rst
+++ b/user_guide_src/source/changelogs/v4.1.5.rst
@@ -13,6 +13,7 @@ BREAKING
 ========
 
 - Fixed `a bug <https://github.com/codeigniter4/CodeIgniter4/issues/2913>`_ on CSRF protection. Now CSRF protection works on PUT/PATCH/DELETE requests when CSRF filter is applied. If you use such requests, you need to send CSRF token.
+- In the previous version, ``CURLRequest`` sends request headers from the browser, because of a bug. Since this version it does not send them.
 
 Enhancements
 ============
diff --git a/user_guide_src/source/installation/upgrade_415.rst b/user_guide_src/source/installation/upgrade_415.rst
index 6c20797775af..84750e834c12 100644
--- a/user_guide_src/source/installation/upgrade_415.rst
+++ b/user_guide_src/source/installation/upgrade_415.rst
@@ -53,6 +53,14 @@ If you want the same behavior as the previous version, set the CSRF filter like
 
 Protecting **GET** method needs only when you use ``form_open()`` auto-generation of CSRF field.
 
+CURLRequest header change
+-------------------------
+
+Because of a bug, the previous version of ``CURLRequest`` sends the request headers from the browser request.
+The bug was fixed. If your requests depend on the headers, your requests might fail after upgrading.
+In this case, add the necessary headers manually.
+See `CURLRequest Class <../libraries/curlrequest.html#headers>`_ for how to add.
+
 Breaking Enhancements
 =====================
 

From f5c1d2dbece72deb733e55368ccac173188eb205 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Oct 2021 13:17:27 +0900
Subject: [PATCH 0537/2325] docs: fix method name

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

diff --git a/user_guide_src/source/helpers/security_helper.rst b/user_guide_src/source/helpers/security_helper.rst
index b0d93bf81eec..2c3812a49def 100644
--- a/user_guide_src/source/helpers/security_helper.rst
+++ b/user_guide_src/source/helpers/security_helper.rst
@@ -27,7 +27,7 @@ The following functions are available:
 
     Provides protection against directory traversal.
 
-    This function is an alias for ``\CodeIgniter\Security::sanitize_filename()``.
+    This function is an alias for ``\CodeIgniter\Security::sanitizeFilename()``.
     For more info, please see the :doc:`Security Library <../libraries/security>`
     documentation.
 

From 0a38cf342f3736c6710c25eb0910e98db95e6658 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Oct 2021 13:20:36 +0900
Subject: [PATCH 0538/2325] docs: replace csrf with CSRF

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

diff --git a/user_guide_src/source/installation/upgrade_security.rst b/user_guide_src/source/installation/upgrade_security.rst
index 5f2d8ecfdb66..606ac4139fa8 100644
--- a/user_guide_src/source/installation/upgrade_security.rst
+++ b/user_guide_src/source/installation/upgrade_security.rst
@@ -13,15 +13,15 @@ Documentations
 - :doc:`Security Documentation Codeigniter 4.X </libraries/security>`
 
 .. note::
-    If you use the `form helper </user_guide/helpers/form_helper.html>`_, then form_open() will automatically insert a hidden csrf field in your forms. So you do not have to upgrade this by yourself.
+    If you use the `form helper </user_guide/helpers/form_helper.html>`_, then form_open() will automatically insert a hidden CSRF field in your forms. So you do not have to upgrade this by yourself.
 
 What has been changed
 =====================
-- The method to implement csrf tokens to html forms has been changed.
+- The method to implement CSRF tokens to html forms has been changed.
 
 Upgrade Guide
 =============
-1. To enable csrf protection in CI4 you have to enable it in ``app/Config/Filters.php``::
+1. To enable CSRF protection in CI4 you have to enable it in ``app/Config/Filters.php``::
 
     public $globals = [
         'before' => [

From 06cc51c18ddb0a8d5d3f0acc802edb568ab0d3d0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Oct 2021 13:23:21 +0900
Subject: [PATCH 0539/2325] docs: fix 404 link and make the note more accurate

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

diff --git a/user_guide_src/source/installation/upgrade_security.rst b/user_guide_src/source/installation/upgrade_security.rst
index 606ac4139fa8..7f991b0bdb47 100644
--- a/user_guide_src/source/installation/upgrade_security.rst
+++ b/user_guide_src/source/installation/upgrade_security.rst
@@ -13,7 +13,7 @@ Documentations
 - :doc:`Security Documentation Codeigniter 4.X </libraries/security>`
 
 .. note::
-    If you use the `form helper </user_guide/helpers/form_helper.html>`_, then form_open() will automatically insert a hidden CSRF field in your forms. So you do not have to upgrade this by yourself.
+    If you use the :doc:`form helper </helpers/form_helper>` and enable the CSRF filter globally, then ``form_open()`` will automatically insert a hidden CSRF field in your forms. So you do not have to upgrade this by yourself.
 
 What has been changed
 =====================

From 613b9809b5b58ff35a39aa553ccf9a76bce82413 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Oct 2021 16:00:59 +0900
Subject: [PATCH 0540/2325] fix: remove $unsharedHeaders and add
 $defaultOptions

$defaultOptions is options passed in the constructor.
They are applied for all requests.
All request headers are cleared after sending request,
and $defaultOptions are set again.
---
 system/HTTP/CURLRequest.php | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index b195249589e9..4d2afdbfd856 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -73,14 +73,11 @@ class CURLRequest extends Request
     protected $delay = 0.0;
 
     /**
-     * Request headers that are not shared between requests.
+     * Default options. Applied to all requests.
      *
-     * @var string[]
+     * @var array
      */
-    protected $unsharedHeaders = [
-        'Content-Length',
-        'Content-Type',
-    ];
+    private $defaultOptions;
 
     /**
      * Takes an array of options to set the following possible class properties:
@@ -102,8 +99,9 @@ public function __construct(App $config, URI $uri, ?ResponseInterface $response
 
         parent::__construct($config);
 
-        $this->response = $response;
-        $this->baseURI  = $uri->useRawQueryString();
+        $this->response       = $response;
+        $this->baseURI        = $uri->useRawQueryString();
+        $this->defaultOptions = $options;
 
         $this->parseOptions($options);
     }
@@ -124,12 +122,13 @@ public function request($method, string $url, array $options = []): ResponseInte
 
         $this->send($method, $url);
 
-        // Reset unshared headers
-        foreach ($this->unsharedHeaders as $header) {
-            $this->removeHeader($header);
-        }
+        // Reset headers
+        $this->headers   = [];
+        $this->headerMap = [];
         // Reset unshared configs
         unset($this->config['multipart'], $this->config['form_params']);
+        // Set the default options for next request
+        $this->parseOptions($this->defaultOptions);
 
         return $this->response;
     }

From 8b086428d951f031c979423a61a18704082bc972 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Oct 2021 16:22:44 +0900
Subject: [PATCH 0541/2325] docs: fix changelogs/v4.1.5.rst

The explanation was not accurate.

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

diff --git a/user_guide_src/source/changelogs/v4.1.5.rst b/user_guide_src/source/changelogs/v4.1.5.rst
index 6e9c96ded738..f763123fbd85 100644
--- a/user_guide_src/source/changelogs/v4.1.5.rst
+++ b/user_guide_src/source/changelogs/v4.1.5.rst
@@ -13,7 +13,7 @@ BREAKING
 ========
 
 - Fixed `a bug <https://github.com/codeigniter4/CodeIgniter4/issues/2913>`_ on CSRF protection. Now CSRF protection works on PUT/PATCH/DELETE requests when CSRF filter is applied. If you use such requests, you need to send CSRF token.
-- In the previous version, ``CURLRequest`` sends request headers from the browser, because of a bug. Since this version it does not send them.
+- In the previous version, if you didn't provide your own headers, ``CURLRequest`` would send the request-headers from the browser, due to a bug. As of this version, it does not send them.
 
 Enhancements
 ============

From 182c25264332e5a5331a1025bf33afc4cd2e6fdb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Oct 2021 16:23:40 +0900
Subject: [PATCH 0542/2325] docs: fix upgrade_415.rst

The explanation was not accurate.

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

diff --git a/user_guide_src/source/installation/upgrade_415.rst b/user_guide_src/source/installation/upgrade_415.rst
index 84750e834c12..7a8c51f985ae 100644
--- a/user_guide_src/source/installation/upgrade_415.rst
+++ b/user_guide_src/source/installation/upgrade_415.rst
@@ -56,7 +56,7 @@ Protecting **GET** method needs only when you use ``form_open()`` auto-generatio
 CURLRequest header change
 -------------------------
 
-Because of a bug, the previous version of ``CURLRequest`` sends the request headers from the browser request.
+In the previous version, if you didn't provide your own headers, ``CURLRequest`` would send the request-headers from the browser.
 The bug was fixed. If your requests depend on the headers, your requests might fail after upgrading.
 In this case, add the necessary headers manually.
 See `CURLRequest Class <../libraries/curlrequest.html#headers>`_ for how to add.

From aed89d9119f6ec811757bb7c4fadf1b42e2242d9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Oct 2021 17:44:10 +0900
Subject: [PATCH 0543/2325] fix: add config $CURLRequestShareOptions for the
 CURLRequest

If $CURLRequestShareOptions is false, reset all config after sending a request.
If true, keep the all config (the same as before).
---
 app/Config/App.php                    | 11 +++++++++
 system/HTTP/CURLRequest.php           | 35 +++++++++++++++++++++++----
 tests/system/HTTP/CURLRequestTest.php | 12 +++++----
 3 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/app/Config/App.php b/app/Config/App.php
index 88b295e9a010..57c9b8a45c46 100644
--- a/app/Config/App.php
+++ b/app/Config/App.php
@@ -461,4 +461,15 @@ class App extends BaseConfig
      * @var bool
      */
     public $CSPEnabled = false;
+
+    /**
+     * --------------------------------------------------------------------------
+     * CURLRequest Share Options
+     * --------------------------------------------------------------------------
+     *
+     * Whether share options between requests or not.
+     *
+     * @var bool
+     */
+    public $CURLRequestShareOptions = true;
 }
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 4d2afdbfd856..4a58e5992afc 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -42,7 +42,14 @@ class CURLRequest extends Request
      *
      * @var array
      */
-    protected $config = [
+    protected $config;
+
+    /**
+     * The default setting values
+     *
+     * @var array
+     */
+    private $defaultConfig = [
         'timeout'         => 0.0,
         'connect_timeout' => 150,
         'debug'           => false,
@@ -79,6 +86,13 @@ class CURLRequest extends Request
      */
     private $defaultOptions;
 
+    /**
+     * Whether share options between requests or not.
+     *
+     * @var bool
+     */
+    private $shareOptions;
+
     /**
      * Takes an array of options to set the following possible class properties:
      *
@@ -102,6 +116,8 @@ public function __construct(App $config, URI $uri, ?ResponseInterface $response
         $this->response       = $response;
         $this->baseURI        = $uri->useRawQueryString();
         $this->defaultOptions = $options;
+        $this->config         = $this->defaultConfig;
+        $this->shareOptions   = $config->CURLRequestShareOptions ?? true;
 
         $this->parseOptions($options);
     }
@@ -122,15 +138,24 @@ public function request($method, string $url, array $options = []): ResponseInte
 
         $this->send($method, $url);
 
+        if ($this->shareOptions === false) {
+            $this->resetOptions();
+        }
+
+        return $this->response;
+    }
+
+    private function resetOptions()
+    {
         // Reset headers
         $this->headers   = [];
         $this->headerMap = [];
-        // Reset unshared configs
-        unset($this->config['multipart'], $this->config['form_params']);
+
+        // Reset configs
+        $this->config = $this->defaultConfig;
+
         // Set the default options for next request
         $this->parseOptions($this->defaultOptions);
-
-        return $this->response;
     }
 
     /**
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index 435a647ecf90..7237323f0be4 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -36,11 +36,13 @@ protected function setUp(): void
         $this->request = $this->getRequest();
     }
 
-    protected function getRequest(array $options = [])
+    protected function getRequest(array $options = [], $shareOptions = true)
     {
-        $uri = isset($options['base_uri']) ? new URI($options['base_uri']) : new URI();
+        $uri                          = isset($options['base_uri']) ? new URI($options['base_uri']) : new URI();
+        $app                          = new App();
+        $app->CURLRequestShareOptions = $shareOptions;
 
-        return new MockCURLRequest(($app = new App()), $uri, new Response($app), $options);
+        return new MockCURLRequest(($app), $uri, new Response($app), $options);
     }
 
     /**
@@ -197,12 +199,12 @@ public function testOptionsHeadersNotUsingPopulate()
         $this->assertSame('', $request->header('Accept-Encoding')->getValue());
     }
 
-    public function testHeaderContentLengthNotSharedBetweenRequests()
+    public function testHeaderContentLengthNotSharedBetweenRequestsWhenSharedOptionsFalse()
     {
         $options = [
             'base_uri' => 'http://www.foo.com/api/v1/',
         ];
-        $request = $this->getRequest($options);
+        $request = $this->getRequest($options, false);
 
         $request->post('example', [
             'form_params' => [

From 436013e118aa681bdaf4bdfd5c93125fe5fbe224 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Oct 2021 18:42:50 +0900
Subject: [PATCH 0544/2325] test: add tests for $CURLRequestShareOptions =
 false

---
 .../HTTP/CURLRequestDoNotShareOptionsTest.php | 975 ++++++++++++++++++
 tests/system/HTTP/CURLRequestTest.php         |  21 +-
 2 files changed, 977 insertions(+), 19 deletions(-)
 create mode 100644 tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php

diff --git a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
new file mode 100644
index 000000000000..d40356118f79
--- /dev/null
+++ b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
@@ -0,0 +1,975 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\HTTP;
+
+use CodeIgniter\Config\Services;
+use CodeIgniter\HTTP\Exceptions\HTTPException;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\Mock\MockCURLRequest;
+use Config\App;
+use CURLFile;
+
+/**
+ * @internal
+ */
+final class CURLRequestDoNotShareOptionsTest extends CIUnitTestCase
+{
+    /**
+     * @var MockCURLRequest
+     */
+    protected $request;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Services::reset();
+        $this->request = $this->getRequest();
+    }
+
+    protected function getRequest(array $options = [])
+    {
+        $uri                          = isset($options['base_uri']) ? new URI($options['base_uri']) : new URI();
+        $app                          = new App();
+        $app->CURLRequestShareOptions = false;
+
+        return new MockCURLRequest(($app), $uri, new Response($app), $options);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4707
+     */
+    public function testPrepareURLIgnoresAppConfig()
+    {
+        config('App')->baseURL = 'http://example.com/fruit/';
+
+        $request = $this->getRequest(['base_uri' => 'http://example.com/v1/']);
+
+        $method = $this->getPrivateMethodInvoker($request, 'prepareURL');
+
+        $this->assertSame('http://example.com/v1/bananas', $method('bananas'));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1029
+     */
+    public function testGetRemembersBaseURI()
+    {
+        $request = $this->getRequest(['base_uri' => 'http://www.foo.com/api/v1/']);
+
+        $request->get('products');
+
+        $options = $request->curl_options;
+
+        $this->assertSame('http://www.foo.com/api/v1/products', $options[CURLOPT_URL]);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1029
+     */
+    public function testGetRemembersBaseURIWithHelperMethod()
+    {
+        $request = Services::curlrequest(['base_uri' => 'http://www.foo.com/api/v1/']);
+
+        $uri = $this->getPrivateProperty($request, 'baseURI');
+        $this->assertSame('www.foo.com', $uri->getHost());
+        $this->assertSame('/api/v1/', $uri->getPath());
+    }
+
+    public function testSendReturnsResponse()
+    {
+        $output = 'Howdy Stranger.';
+
+        $response = $this->request->setOutput($output)->send('get', 'http://example.com');
+
+        $this->assertInstanceOf('CodeIgniter\\HTTP\\Response', $response);
+        $this->assertSame($output, $response->getBody());
+    }
+
+    public function testGetSetsCorrectMethod()
+    {
+        $this->request->get('http://example.com');
+
+        $this->assertSame('get', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
+        $this->assertSame('GET', $options[CURLOPT_CUSTOMREQUEST]);
+    }
+
+    public function testDeleteSetsCorrectMethod()
+    {
+        $this->request->delete('http://example.com');
+
+        $this->assertSame('delete', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
+        $this->assertSame('DELETE', $options[CURLOPT_CUSTOMREQUEST]);
+    }
+
+    public function testHeadSetsCorrectMethod()
+    {
+        $this->request->head('http://example.com');
+
+        $this->assertSame('head', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
+        $this->assertSame('HEAD', $options[CURLOPT_CUSTOMREQUEST]);
+    }
+
+    public function testOptionsSetsCorrectMethod()
+    {
+        $this->request->options('http://example.com');
+
+        $this->assertSame('options', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
+        $this->assertSame('OPTIONS', $options[CURLOPT_CUSTOMREQUEST]);
+    }
+
+    public function testOptionsBaseURIOption()
+    {
+        $options = ['base_uri' => 'http://www.foo.com/api/v1/'];
+        $request = $this->getRequest($options);
+
+        $this->assertSame('http://www.foo.com/api/v1/', $request->getBaseURI()->__toString());
+    }
+
+    public function testOptionsBaseURIOverride()
+    {
+        $options = [
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'baseURI'  => 'http://bogus/com',
+        ];
+        $request = $this->getRequest($options);
+
+        $this->assertSame('http://bogus/com', $request->getBaseURI()->__toString());
+    }
+
+    public function testOptionsHeaders()
+    {
+        $options = [
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'headers'  => ['fruit' => 'apple'],
+        ];
+        $request = $this->getRequest();
+        $this->assertNull($request->header('fruit'));
+
+        $request = $this->getRequest($options);
+        $this->assertSame('apple', $request->header('fruit')->getValue());
+    }
+
+    /**
+     * @backupGlobals enabled
+     */
+    public function testOptionsHeadersNotUsingPopulate()
+    {
+        $_SERVER['HTTP_HOST']            = 'site1.com';
+        $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en-US';
+        $_SERVER['HTTP_ACCEPT_ENCODING'] = 'gzip, deflate, br';
+
+        $options = [
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'headers'  => [
+                'Host'            => 'www.foo.com',
+                'Accept-Encoding' => '',
+            ],
+        ];
+        $request = $this->getRequest($options);
+        $request->get('example');
+        // if headers for the request are defined we use them
+        $this->assertNull($request->header('Accept-Language'));
+        $this->assertSame('www.foo.com', $request->header('Host')->getValue());
+        $this->assertSame('', $request->header('Accept-Encoding')->getValue());
+    }
+
+    public function testHeaderContentLengthNotSharedBetweenRequests()
+    {
+        $options = [
+            'base_uri' => 'http://www.foo.com/api/v1/',
+        ];
+        $request = $this->getRequest($options, false);
+
+        $request->post('example', [
+            'form_params' => [
+                'q' => 'keyword',
+            ],
+        ]);
+        $request->get('example');
+
+        $this->assertNull($request->header('Content-Length'));
+    }
+
+    /**
+     * @backupGlobals enabled
+     */
+    public function testHeaderContentLengthNotSharedBetweenClients()
+    {
+        $_SERVER['HTTP_CONTENT_LENGTH'] = '10';
+
+        $options = [
+            'base_uri' => 'http://www.foo.com/api/v1/',
+        ];
+        $request = $this->getRequest($options);
+        $request->post('example', [
+            'form_params' => [
+                'q' => 'keyword',
+            ],
+        ]);
+
+        $request = $this->getRequest($options);
+        $request->get('example');
+
+        $this->assertNull($request->header('Content-Length'));
+    }
+
+    public function testOptionsDelay()
+    {
+        $options = [
+            'delay'   => 2000,
+            'headers' => ['fruit' => 'apple'],
+        ];
+        $request = $this->getRequest();
+        $this->assertSame(0.0, $request->getDelay());
+
+        $request = $this->getRequest($options);
+        $this->assertSame(2.0, $request->getDelay());
+    }
+
+    public function testPatchSetsCorrectMethod()
+    {
+        $this->request->patch('http://example.com');
+
+        $this->assertSame('patch', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
+        $this->assertSame('PATCH', $options[CURLOPT_CUSTOMREQUEST]);
+    }
+
+    public function testPostSetsCorrectMethod()
+    {
+        $this->request->post('http://example.com');
+
+        $this->assertSame('post', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
+        $this->assertSame('POST', $options[CURLOPT_CUSTOMREQUEST]);
+    }
+
+    public function testPutSetsCorrectMethod()
+    {
+        $this->request->put('http://example.com');
+
+        $this->assertSame('put', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
+        $this->assertSame('PUT', $options[CURLOPT_CUSTOMREQUEST]);
+    }
+
+    public function testCustomMethodSetsCorrectMethod()
+    {
+        $this->request->request('custom', 'http://example.com');
+
+        $this->assertSame('custom', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
+        $this->assertSame('CUSTOM', $options[CURLOPT_CUSTOMREQUEST]);
+    }
+
+    public function testRequestMethodGetsSanitized()
+    {
+        $this->request->request('<script>Custom</script>', 'http://example.com');
+
+        $this->assertSame('custom', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_CUSTOMREQUEST, $options);
+        $this->assertSame('CUSTOM', $options[CURLOPT_CUSTOMREQUEST]);
+    }
+
+    public function testRequestSetsBasicCurlOptions()
+    {
+        $this->request->request('get', 'http://example.com');
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_URL, $options);
+        $this->assertSame('http://example.com', $options[CURLOPT_URL]);
+
+        $this->assertArrayHasKey(CURLOPT_RETURNTRANSFER, $options);
+        $this->assertTrue($options[CURLOPT_RETURNTRANSFER]);
+
+        $this->assertArrayHasKey(CURLOPT_HEADER, $options);
+        $this->assertTrue($options[CURLOPT_HEADER]);
+
+        $this->assertArrayHasKey(CURLOPT_FRESH_CONNECT, $options);
+        $this->assertTrue($options[CURLOPT_FRESH_CONNECT]);
+
+        $this->assertArrayHasKey(CURLOPT_TIMEOUT_MS, $options);
+        $this->assertSame(0.0, $options[CURLOPT_TIMEOUT_MS]);
+
+        $this->assertArrayHasKey(CURLOPT_CONNECTTIMEOUT_MS, $options);
+        $this->assertSame(150000.0, $options[CURLOPT_CONNECTTIMEOUT_MS]);
+    }
+
+    public function testAuthBasicOption()
+    {
+        $this->request->request('get', 'http://example.com', [
+            'auth' => [
+                'username',
+                'password',
+            ],
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_USERPWD, $options);
+        $this->assertSame('username:password', $options[CURLOPT_USERPWD]);
+
+        $this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options);
+        $this->assertSame(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]);
+    }
+
+    public function testAuthBasicOptionExplicit()
+    {
+        $this->request->request('get', 'http://example.com', [
+            'auth' => [
+                'username',
+                'password',
+                'basic',
+            ],
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_USERPWD, $options);
+        $this->assertSame('username:password', $options[CURLOPT_USERPWD]);
+
+        $this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options);
+        $this->assertSame(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]);
+    }
+
+    public function testAuthDigestOption()
+    {
+        $output = "HTTP/1.1 401 Unauthorized
+		Server: ddos-guard
+		Set-Cookie: __ddg1=z177j4mLtqzC07v0zviU; Domain=.site.ru; HttpOnly; Path=/; Expires=Wed, 07-Jul-2021 15:13:14 GMT
+		WWW-Authenticate: Digest\x0d\x0a\x0d\x0aHTTP/1.1 200 OK
+		Server: ddos-guard
+		Connection: keep-alive
+		Keep-Alive: timeout=60
+		Set-Cookie: __ddg1=z177j4mLtqzC07v0zviU; Domain=.site.ru; HttpOnly; Path=/; Expires=Wed, 07-Jul-2021 15:13:14 GMT
+		Date: Tue, 07 Jul 2020 15:13:14 GMT
+		Expires: Thu, 19 Nov 1981 08:52:00 GMT
+		Cache-Control: no-store, no-cache, must-revalidate
+		Pragma: no-cache
+		Set-Cookie: PHPSESSID=80pd3hlg38mvjnelpvokp9lad0; path=/
+		Content-Type: application/xml; charset=utf-8
+		Transfer-Encoding: chunked\x0d\x0a\x0d\x0a<title>Update success! config</title>";
+
+        $this->request->setOutput($output);
+
+        $response = $this->request->request('get', 'http://example.com', [
+            'auth' => [
+                'username',
+                'password',
+                'digest',
+            ],
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertSame('<title>Update success! config</title>', $response->getBody());
+        $this->assertSame(200, $response->getStatusCode());
+
+        $this->assertArrayHasKey(CURLOPT_USERPWD, $options);
+        $this->assertSame('username:password', $options[CURLOPT_USERPWD]);
+
+        $this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options);
+        $this->assertSame(CURLAUTH_DIGEST, $options[CURLOPT_HTTPAUTH]);
+    }
+
+    public function testSetAuthBasic()
+    {
+        $this->request->setAuth('username', 'password')->get('http://example.com');
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_USERPWD, $options);
+        $this->assertSame('username:password', $options[CURLOPT_USERPWD]);
+
+        $this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options);
+        $this->assertSame(CURLAUTH_BASIC, $options[CURLOPT_HTTPAUTH]);
+    }
+
+    public function testSetAuthDigest()
+    {
+        $output = "HTTP/1.1 401 Unauthorized
+		Server: ddos-guard
+		Set-Cookie: __ddg1=z177j4mLtqzC07v0zviU; Domain=.site.ru; HttpOnly; Path=/; Expires=Wed, 07-Jul-2021 15:13:14 GMT
+		WWW-Authenticate: Digest\x0d\x0a\x0d\x0aHTTP/1.1 200 OK
+		Server: ddos-guard
+		Connection: keep-alive
+		Keep-Alive: timeout=60
+		Set-Cookie: __ddg1=z177j4mLtqzC07v0zviU; Domain=.site.ru; HttpOnly; Path=/; Expires=Wed, 07-Jul-2021 15:13:14 GMT
+		Date: Tue, 07 Jul 2020 15:13:14 GMT
+		Expires: Thu, 19 Nov 1981 08:52:00 GMT
+		Cache-Control: no-store, no-cache, must-revalidate
+		Pragma: no-cache
+		Set-Cookie: PHPSESSID=80pd3hlg38mvjnelpvokp9lad0; path=/
+		Content-Type: application/xml; charset=utf-8
+		Transfer-Encoding: chunked\x0d\x0a\x0d\x0a<title>Update success! config</title>";
+
+        $this->request->setOutput($output);
+
+        $response = $this->request->setAuth('username', 'password', 'digest')->get('http://example.com');
+
+        $options = $this->request->curl_options;
+
+        $this->assertSame('<title>Update success! config</title>', $response->getBody());
+        $this->assertSame(200, $response->getStatusCode());
+
+        $this->assertArrayHasKey(CURLOPT_USERPWD, $options);
+        $this->assertSame('username:password', $options[CURLOPT_USERPWD]);
+
+        $this->assertArrayHasKey(CURLOPT_HTTPAUTH, $options);
+        $this->assertSame(CURLAUTH_DIGEST, $options[CURLOPT_HTTPAUTH]);
+    }
+
+    public function testCertOption()
+    {
+        $file = __FILE__;
+
+        $this->request->request('get', 'http://example.com', [
+            'cert' => $file,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_SSLCERT, $options);
+        $this->assertSame($file, $options[CURLOPT_SSLCERT]);
+    }
+
+    public function testCertOptionWithPassword()
+    {
+        $file = __FILE__;
+
+        $this->request->request('get', 'http://example.com', [
+            'cert' => [
+                $file,
+                'password',
+            ],
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_SSLCERT, $options);
+        $this->assertSame($file, $options[CURLOPT_SSLCERT]);
+
+        $this->assertArrayHasKey(CURLOPT_SSLCERTPASSWD, $options);
+        $this->assertSame('password', $options[CURLOPT_SSLCERTPASSWD]);
+    }
+
+    public function testMissingCertOption()
+    {
+        $file = 'something_obviously_bogus';
+        $this->expectException(HTTPException::class);
+
+        $this->request->request('get', 'http://example.com', [
+            'cert' => $file,
+        ]);
+    }
+
+    public function testSSLVerification()
+    {
+        $file = __FILE__;
+
+        $this->request->request('get', 'http://example.com', [
+            'verify'  => 'yes',
+            'ssl_key' => $file,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_CAINFO, $options);
+        $this->assertSame($file, $options[CURLOPT_CAINFO]);
+
+        $this->assertArrayHasKey(CURLOPT_SSL_VERIFYPEER, $options);
+        $this->assertSame(1, $options[CURLOPT_SSL_VERIFYPEER]);
+    }
+
+    public function testSSLWithBadKey()
+    {
+        $file = 'something_obviously_bogus';
+        $this->expectException(HTTPException::class);
+
+        $this->request->request('get', 'http://example.com', [
+            'verify'  => 'yes',
+            'ssl_key' => $file,
+        ]);
+    }
+
+    public function testDebugOptionTrue()
+    {
+        $this->request->request('get', 'http://example.com', [
+            'debug' => true,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_VERBOSE, $options);
+        $this->assertSame(1, $options[CURLOPT_VERBOSE]);
+
+        $this->assertArrayHasKey(CURLOPT_STDERR, $options);
+        $this->assertIsResource($options[CURLOPT_STDERR]);
+    }
+
+    public function testDebugOptionFalse()
+    {
+        $this->request->request('get', 'http://example.com', [
+            'debug' => false,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayNotHasKey(CURLOPT_VERBOSE, $options);
+        $this->assertArrayNotHasKey(CURLOPT_STDERR, $options);
+    }
+
+    public function testDebugOptionFile()
+    {
+        $file = SUPPORTPATH . 'Files/baker/banana.php';
+
+        $this->request->request('get', 'http://example.com', [
+            'debug' => $file,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_VERBOSE, $options);
+        $this->assertSame(1, $options[CURLOPT_VERBOSE]);
+
+        $this->assertArrayHasKey(CURLOPT_STDERR, $options);
+        $this->assertIsResource($options[CURLOPT_STDERR]);
+    }
+
+    public function testDecodeContent()
+    {
+        $this->request->setHeader('Accept-Encoding', 'cobol');
+        $this->request->request('get', 'http://example.com', [
+            'decode_content' => true,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_ENCODING, $options);
+        $this->assertSame('cobol', $options[CURLOPT_ENCODING]);
+    }
+
+    public function testDecodeContentWithoutAccept()
+    {
+        //      $this->request->setHeader('Accept-Encoding', 'cobol');
+        $this->request->request('get', 'http://example.com', [
+            'decode_content' => true,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_ENCODING, $options);
+        $this->assertSame('', $options[CURLOPT_ENCODING]);
+        $this->assertArrayHasKey(CURLOPT_HTTPHEADER, $options);
+        $this->assertSame('Accept-Encoding', $options[CURLOPT_HTTPHEADER]);
+    }
+
+    public function testAllowRedirectsOptionFalse()
+    {
+        $this->request->request('get', 'http://example.com', [
+            'allow_redirects' => false,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options);
+        $this->assertSame(0, $options[CURLOPT_FOLLOWLOCATION]);
+
+        $this->assertArrayNotHasKey(CURLOPT_MAXREDIRS, $options);
+        $this->assertArrayNotHasKey(CURLOPT_REDIR_PROTOCOLS, $options);
+    }
+
+    public function testAllowRedirectsOptionTrue()
+    {
+        $this->request->request('get', 'http://example.com', [
+            'allow_redirects' => true,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options);
+        $this->assertSame(1, $options[CURLOPT_FOLLOWLOCATION]);
+
+        $this->assertArrayHasKey(CURLOPT_MAXREDIRS, $options);
+        $this->assertSame(5, $options[CURLOPT_MAXREDIRS]);
+        $this->assertArrayHasKey(CURLOPT_REDIR_PROTOCOLS, $options);
+        $this->assertSame(CURLPROTO_HTTP | CURLPROTO_HTTPS, $options[CURLOPT_REDIR_PROTOCOLS]);
+    }
+
+    public function testAllowRedirectsOptionDefaults()
+    {
+        $this->request->request('get', 'http://example.com', [
+            'allow_redirects' => true,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options);
+        $this->assertSame(1, $options[CURLOPT_FOLLOWLOCATION]);
+
+        $this->assertArrayHasKey(CURLOPT_MAXREDIRS, $options);
+        $this->assertArrayHasKey(CURLOPT_REDIR_PROTOCOLS, $options);
+    }
+
+    public function testAllowRedirectsArray()
+    {
+        $this->request->request('get', 'http://example.com', [
+            'allow_redirects' => ['max' => 2],
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_FOLLOWLOCATION, $options);
+        $this->assertSame(1, $options[CURLOPT_FOLLOWLOCATION]);
+
+        $this->assertArrayHasKey(CURLOPT_MAXREDIRS, $options);
+        $this->assertSame(2, $options[CURLOPT_MAXREDIRS]);
+    }
+
+    public function testSendWithQuery()
+    {
+        $request = $this->getRequest([
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'query'    => [
+                'name' => 'Henry',
+                'd.t'  => 'value',
+            ],
+        ]);
+
+        $request->get('products');
+
+        $options = $request->curl_options;
+
+        $this->assertSame('http://www.foo.com/api/v1/products?name=Henry&d.t=value', $options[CURLOPT_URL]);
+    }
+
+    public function testSendWithDelay()
+    {
+        $request = $this->getRequest([
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'delay'    => 1000,
+        ]);
+
+        $request->get('products');
+
+        // we still need to check the code coverage to make sure this was done
+        $this->assertSame(1.0, $request->getDelay());
+    }
+
+    public function testSendContinued()
+    {
+        $request = $this->getRequest([
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'delay'    => 1000,
+        ]);
+
+        $request->setOutput("HTTP/1.1 100 Continue\x0d\x0a\x0d\x0aHi there");
+        $response = $request->get('answer');
+        $this->assertSame('Hi there', $response->getBody());
+    }
+
+    /**
+     * See: https://github.com/codeigniter4/CodeIgniter4/issues/3261
+     */
+    public function testSendContinuedWithManyHeaders()
+    {
+        $request = $this->getRequest([
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'delay'    => 1000,
+        ]);
+
+        $output = "HTTP/1.1 100 Continue
+Server: ddos-guard
+Set-Cookie: __ddg1=z177j4mLtqzC07v0zviU; Domain=.site.ru; HttpOnly; Path=/; Expires=Wed, 07-Jul-2021 15:13:14 GMT\x0d\x0a\x0d\x0aHTTP/1.1 200 OK
+Server: ddos-guard
+Connection: keep-alive
+Keep-Alive: timeout=60
+Set-Cookie: __ddg1=z177j4mLtqzC07v0zviU; Domain=.site.ru; HttpOnly; Path=/; Expires=Wed, 07-Jul-2021 15:13:14 GMT
+Date: Tue, 07 Jul 2020 15:13:14 GMT
+Expires: Thu, 19 Nov 1981 08:52:00 GMT
+Cache-Control: no-store, no-cache, must-revalidate
+Pragma: no-cache
+Set-Cookie: PHPSESSID=80pd3hlg38mvjnelpvokp9lad0; path=/
+Content-Type: application/xml; charset=utf-8
+Transfer-Encoding: chunked\x0d\x0a\x0d\x0a<title>Update success! config</title>";
+
+        $request->setOutput($output);
+        $response = $request->get('answer');
+
+        $this->assertSame('<title>Update success! config</title>', $response->getBody());
+
+        $responseHeaderKeys = [
+            'Cache-control',
+            'Content-Type',
+            'Server',
+            'Connection',
+            'Keep-Alive',
+            'Set-Cookie',
+            'Date',
+            'Expires',
+            'Pragma',
+            'Transfer-Encoding',
+        ];
+        $this->assertSame($responseHeaderKeys, array_keys($response->headers()));
+
+        $this->assertSame(200, $response->getStatusCode());
+    }
+
+    public function testSplitResponse()
+    {
+        $request = $this->getRequest([
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'delay'    => 1000,
+        ]);
+
+        $request->setOutput("Accept: text/html\x0d\x0a\x0d\x0aHi there");
+        $response = $request->get('answer');
+        $this->assertSame('Hi there', $response->getBody());
+    }
+
+    public function testApplyBody()
+    {
+        $request = $this->getRequest([
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'delay'    => 1000,
+        ]);
+
+        $request->setBody('name=George');
+        $request->setOutput('Hi there');
+        $response = $request->post('answer');
+
+        $this->assertSame('Hi there', $response->getBody());
+        $this->assertSame('name=George', $request->curl_options[CURLOPT_POSTFIELDS]);
+    }
+
+    public function testResponseHeaders()
+    {
+        $request = $this->getRequest([
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'delay'    => 1000,
+        ]);
+
+        $request->setOutput("HTTP/2.0 234 Ohoh\x0d\x0aAccept: text/html\x0d\x0a\x0d\x0aHi there");
+        $response = $request->get('bogus');
+
+        $this->assertSame('2.0', $response->getProtocolVersion());
+        $this->assertSame(234, $response->getStatusCode());
+    }
+
+    public function testResponseHeadersShortProtocol()
+    {
+        $request = $this->getRequest([
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'delay'    => 1000,
+        ]);
+
+        $request->setOutput("HTTP/2 235 Ohoh\x0d\x0aAccept: text/html\x0d\x0a\x0d\x0aHi there shortie");
+        $response = $request->get('bogus');
+
+        $this->assertSame('2.0', $response->getProtocolVersion());
+        $this->assertSame(235, $response->getStatusCode());
+    }
+
+    public function testPostFormEncoded()
+    {
+        $params = [
+            'foo' => 'bar',
+            'baz' => [
+                'hi',
+                'there',
+            ],
+        ];
+        $this->request->request('POST', '/post', [
+            'form_params' => $params,
+        ]);
+
+        $this->assertSame('post', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $expected = http_build_query($params);
+        $this->assertArrayHasKey(CURLOPT_POSTFIELDS, $options);
+        $this->assertSame($expected, $options[CURLOPT_POSTFIELDS]);
+    }
+
+    public function testPostFormMultipart()
+    {
+        $params = [
+            'foo' => 'bar',
+            'baz' => [
+                'hi',
+                'there',
+            ],
+            'afile' => new CURLFile(__FILE__),
+        ];
+        $this->request->request('POST', '/post', [
+            'multipart' => $params,
+        ]);
+
+        $this->assertSame('post', $this->request->getMethod());
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_POSTFIELDS, $options);
+        $this->assertSame($params, $options[CURLOPT_POSTFIELDS]);
+    }
+
+    public function testSetForm()
+    {
+        $params = [
+            'foo' => 'bar',
+            'baz' => [
+                'hi',
+                'there',
+            ],
+        ];
+
+        $this->request->setForm($params)->post('/post');
+
+        $this->assertSame(
+            http_build_query($params),
+            $this->request->curl_options[CURLOPT_POSTFIELDS]
+        );
+
+        $params['afile'] = new CURLFile(__FILE__);
+
+        $this->request->setForm($params, true)->post('/post');
+
+        $this->assertSame(
+            $params,
+            $this->request->curl_options[CURLOPT_POSTFIELDS]
+        );
+    }
+
+    public function testJSONData()
+    {
+        $params = [
+            'foo' => 'bar',
+            'baz' => [
+                'hi',
+                'there',
+            ],
+        ];
+        $this->request->request('POST', '/post', [
+            'json' => $params,
+        ]);
+
+        $this->assertSame('post', $this->request->getMethod());
+
+        $expected = json_encode($params);
+        $this->assertSame($expected, $this->request->getBody());
+    }
+
+    public function testSetJSON()
+    {
+        $params = [
+            'foo' => 'bar',
+            'baz' => [
+                'hi',
+                'there',
+            ],
+        ];
+        $this->request->setJSON($params)->post('/post');
+
+        $this->assertSame(json_encode($params), $this->request->getBody());
+        $this->assertSame(
+            'Content-Type: application/json',
+            $this->request->curl_options[CURLOPT_HTTPHEADER][0]
+        );
+    }
+
+    public function testHTTPv1()
+    {
+        $this->request->request('POST', '/post', [
+            'version' => 1.0,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options);
+        $this->assertSame(CURL_HTTP_VERSION_1_0, $options[CURLOPT_HTTP_VERSION]);
+    }
+
+    public function testHTTPv11()
+    {
+        $this->request->request('POST', '/post', [
+            'version' => 1.1,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_HTTP_VERSION, $options);
+        $this->assertSame(CURL_HTTP_VERSION_1_1, $options[CURLOPT_HTTP_VERSION]);
+    }
+
+    public function testCookieOption()
+    {
+        $holder = SUPPORTPATH . 'HTTP/Files/CookiesHolder.txt';
+        $this->request->request('POST', '/post', [
+            'cookie' => $holder,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_COOKIEJAR, $options);
+        $this->assertSame($holder, $options[CURLOPT_COOKIEJAR]);
+        $this->assertArrayHasKey(CURLOPT_COOKIEFILE, $options);
+        $this->assertSame($holder, $options[CURLOPT_COOKIEFILE]);
+    }
+
+    public function testUserAgentOption()
+    {
+        $agent = 'CodeIgniter Framework';
+
+        $this->request->request('POST', '/post', [
+            'user_agent' => $agent,
+        ]);
+
+        $options = $this->request->curl_options;
+
+        $this->assertArrayHasKey(CURLOPT_USERAGENT, $options);
+        $this->assertSame($agent, $options[CURLOPT_USERAGENT]);
+    }
+}
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index 7237323f0be4..2d71572f3c94 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -36,11 +36,11 @@ protected function setUp(): void
         $this->request = $this->getRequest();
     }
 
-    protected function getRequest(array $options = [], $shareOptions = true)
+    protected function getRequest(array $options = [])
     {
         $uri                          = isset($options['base_uri']) ? new URI($options['base_uri']) : new URI();
         $app                          = new App();
-        $app->CURLRequestShareOptions = $shareOptions;
+        $app->CURLRequestShareOptions = true;
 
         return new MockCURLRequest(($app), $uri, new Response($app), $options);
     }
@@ -199,23 +199,6 @@ public function testOptionsHeadersNotUsingPopulate()
         $this->assertSame('', $request->header('Accept-Encoding')->getValue());
     }
 
-    public function testHeaderContentLengthNotSharedBetweenRequestsWhenSharedOptionsFalse()
-    {
-        $options = [
-            'base_uri' => 'http://www.foo.com/api/v1/',
-        ];
-        $request = $this->getRequest($options, false);
-
-        $request->post('example', [
-            'form_params' => [
-                'q' => 'keyword',
-            ],
-        ]);
-        $request->get('example');
-
-        $this->assertNull($request->header('Content-Length'));
-    }
-
     /**
      * @backupGlobals enabled
      */

From 9e88ec4a41e1930c83970e6c0d7ca02763b8d4da Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Oct 2021 18:56:06 +0900
Subject: [PATCH 0545/2325] test: add tests for sharing options

---
 .../HTTP/CURLRequestDoNotShareOptionsTest.php | 21 +++++++++++++++++++
 tests/system/HTTP/CURLRequestTest.php         | 21 +++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
index d40356118f79..ae6aef2ad74d 100644
--- a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
+++ b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
@@ -199,6 +199,27 @@ public function testOptionsHeadersNotUsingPopulate()
         $this->assertSame('', $request->header('Accept-Encoding')->getValue());
     }
 
+    public function testDefaultOptionsAreSharedBetweenRequests()
+    {
+        $options = [
+            'form_params' => ['studio' => 1],
+            'user_agent'  => 'CodeIgniter Framework v4',
+        ];
+        $request = $this->getRequest($options);
+
+        $request->request('POST', 'https://realestate1.example.com');
+
+        $this->assertSame('https://realestate1.example.com', $request->curl_options[CURLOPT_URL]);
+        $this->assertSame('studio=1', $request->curl_options[CURLOPT_POSTFIELDS]);
+        $this->assertSame('CodeIgniter Framework v4', $request->curl_options[CURLOPT_USERAGENT]);
+
+        $request->request('POST', 'https://realestate2.example.com');
+
+        $this->assertSame('https://realestate2.example.com', $request->curl_options[CURLOPT_URL]);
+        $this->assertSame('studio=1', $request->curl_options[CURLOPT_POSTFIELDS]);
+        $this->assertSame('CodeIgniter Framework v4', $request->curl_options[CURLOPT_USERAGENT]);
+    }
+
     public function testHeaderContentLengthNotSharedBetweenRequests()
     {
         $options = [
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index 2d71572f3c94..de7ef08b59fc 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -199,6 +199,27 @@ public function testOptionsHeadersNotUsingPopulate()
         $this->assertSame('', $request->header('Accept-Encoding')->getValue());
     }
 
+    public function testOptionsAreSharedBetweenRequests()
+    {
+        $options = [
+            'form_params' => ['studio' => 1],
+            'user_agent'  => 'CodeIgniter Framework v4',
+        ];
+        $request = $this->getRequest($options);
+
+        $request->request('POST', 'https://realestate1.example.com');
+
+        $this->assertSame('https://realestate1.example.com', $request->curl_options[CURLOPT_URL]);
+        $this->assertSame('studio=1', $request->curl_options[CURLOPT_POSTFIELDS]);
+        $this->assertSame('CodeIgniter Framework v4', $request->curl_options[CURLOPT_USERAGENT]);
+
+        $request->request('POST', 'https://realestate2.example.com');
+
+        $this->assertSame('https://realestate2.example.com', $request->curl_options[CURLOPT_URL]);
+        $this->assertSame('studio=1', $request->curl_options[CURLOPT_POSTFIELDS]);
+        $this->assertSame('CodeIgniter Framework v4', $request->curl_options[CURLOPT_USERAGENT]);
+    }
+
     /**
      * @backupGlobals enabled
      */

From b648d2d724a0f313b664fd515f0023911381403b Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 29 Oct 2021 18:18:25 +0800
Subject: [PATCH 0546/2325] Cleanup php-cs-fixer config files

---
 .no-header.php-cs-fixer.dist.php | 21 +--------------------
 .php-cs-fixer.dist.php           | 21 +--------------------
 2 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/.no-header.php-cs-fixer.dist.php b/.no-header.php-cs-fixer.dist.php
index a3030aa98f58..12acddb81087 100644
--- a/.no-header.php-cs-fixer.dist.php
+++ b/.no-header.php-cs-fixer.dist.php
@@ -27,26 +27,7 @@
     ])
     ->notName('#Logger\.php$#');
 
-$overrides = [
-    // @TODO Remove once these are live in coding-standard
-    'assign_null_coalescing_to_coalesce_equal' => false, // requires 7.4+
-    'class_attributes_separation'              => [
-        'elements' => [
-            'const'        => 'none',
-            'property'     => 'none',
-            'method'       => 'one',
-            'trait_import' => 'none',
-        ],
-    ],
-    'control_structure_continuation_position' => ['position' => 'same_line'],
-    'empty_loop_condition'                    => ['style' => 'while'],
-    'integer_literal_case'                    => true,
-    'modernize_strpos'                        => false, // requires 8.0+
-    'no_alternative_syntax'                   => ['fix_non_monolithic_code' => false],
-    'no_space_around_double_colon'            => true,
-    'octal_notation'                          => false, // requires 8.1+
-    'string_length_to_empty'                  => true,
-];
+$overrides = [];
 
 $options = [
     'cacheFile'    => 'build/.no-header.php-cs-fixer.cache',
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 743062d44a88..3c9e05fe3b74 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -34,26 +34,7 @@
         __DIR__ . '/spark',
     ]);
 
-$overrides = [
-    // @TODO Remove once these are live in coding-standard
-    'assign_null_coalescing_to_coalesce_equal' => false, // requires 7.4+
-    'class_attributes_separation'              => [
-        'elements' => [
-            'const'        => 'none',
-            'property'     => 'none',
-            'method'       => 'one',
-            'trait_import' => 'none',
-        ],
-    ],
-    'control_structure_continuation_position' => ['position' => 'same_line'],
-    'empty_loop_condition'                    => ['style' => 'while'],
-    'integer_literal_case'                    => true,
-    'modernize_strpos'                        => false, // requires 8.0+
-    'no_alternative_syntax'                   => ['fix_non_monolithic_code' => false],
-    'no_space_around_double_colon'            => true,
-    'octal_notation'                          => false, // requires 8.1+
-    'string_length_to_empty'                  => true,
-];
+$overrides = [];
 
 $options = [
     'cacheFile'    => 'build/.php-cs-fixer.cache',

From 3ac80c37d8482716c7189bcca69bc43d1dc4823d Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 29 Oct 2021 18:23:05 +0800
Subject: [PATCH 0547/2325] Run `builds` thru CS lint

---
 .no-header.php-cs-fixer.dist.php |   5 +-
 admin/starter/builds             | 236 ++++++++++++++-----------------
 2 files changed, 111 insertions(+), 130 deletions(-)

diff --git a/.no-header.php-cs-fixer.dist.php b/.no-header.php-cs-fixer.dist.php
index a3030aa98f58..f3b427daec4a 100644
--- a/.no-header.php-cs-fixer.dist.php
+++ b/.no-header.php-cs-fixer.dist.php
@@ -25,7 +25,10 @@
         __DIR__ . '/app',
         __DIR__ . '/public',
     ])
-    ->notName('#Logger\.php$#');
+    ->notName('#Logger\.php$#')
+    ->append([
+        __DIR__ . '/admin/starter/builds',
+    ]);
 
 $overrides = [
     // @TODO Remove once these are live in coding-standard
diff --git a/admin/starter/builds b/admin/starter/builds
index 268e7a819c22..1ac374f57a75 100755
--- a/admin/starter/builds
+++ b/admin/starter/builds
@@ -15,149 +15,127 @@ define('GITHUB_URL', 'https://github.com/codeigniter4/codeigniter4');
  */
 
 // Determine the requested stability
-if (empty($argv[1]) || ! in_array($argv[1], ['release', 'development']))
-{
-	echo 'Usage: php builds [release|development]' . PHP_EOL;
-	exit;
+if (empty($argv[1]) || ! in_array($argv[1], ['release', 'development'], true)) {
+    echo 'Usage: php builds [release|development]' . PHP_EOL;
+
+    exit;
 }
 
-$dev = $argv[1] == 'development';
+$dev = $argv[1] === 'development';
+
 $modified = [];
 
-/* Locate each file and update it for the requested stability */
+// Locate each file and update it for the requested stability
 
 // Composer.json
 $file = __DIR__ . DIRECTORY_SEPARATOR . 'composer.json';
 
-if (is_file($file))
-{
-	// Make sure we can read it
-	if ($contents = file_get_contents($file))
-	{
-		if ($array = json_decode($contents, true))
-		{
-			// Development
-			if ($dev)
-			{
-				// Set 'minimum-stability'
-				$array['minimum-stability'] = 'dev';
-				$array['prefer-stable']     = true;
-
-				// Make sure the repo is configured
-				if (! isset($array['repositories']))
-				{
-					$array['repositories'] = [];
-				}
-
-				// Check for the CodeIgniter repo
-				$found = false;
-				foreach ($array['repositories'] as $repository)
-				{
-					if ($repository['url'] == GITHUB_URL)
-					{
-						$found = true;
-						break;
-					}
-				}
-
-				// Add the repo if it was not found
-				if (! $found)
-				{
-					$array['repositories'][] = [
-						'type' => 'vcs',
-						'url'  => GITHUB_URL,
-					];
-				}
-
-				// Define the "require"
-				$array['require']['codeigniter4/codeigniter4'] = 'dev-develop';
-				unset($array['require']['codeigniter4/framework']);
-			}
-
-			// Release
-			else
-			{
-				// Clear 'minimum-stability'
-				unset($array['minimum-stability']);
-
-				// If the repo is configured then clear it
-				if (isset($array['repositories']))
-				{
-					// Check for the CodeIgniter repo
-					foreach ($array['repositories'] as $i => $repository)
-					{
-						if ($repository['url'] == GITHUB_URL)
-						{
-							unset($array['repositories'][$i]);
-							break;
-						}
-					}
-					if (empty($array['repositories']))
-					{
-						unset($array['repositories']);
-					}
-				}
-
-				// Define the "require"
-				$array['require']['codeigniter4/framework'] = LATEST_RELEASE;
-				unset($array['require']['codeigniter4/codeigniter4']);
-			}
-
-			// Write out a new composer.json
-			file_put_contents($file, json_encode($array, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES) . PHP_EOL);
-			$modified[] = $file;
-		}
-		else
-		{
-			echo 'Warning: Unable to decode composer.json! Skipping...' . PHP_EOL;
-		}
-	}
-	else
-	{
-		echo 'Warning: Unable to read composer.json! Skipping...' . PHP_EOL;
-	}
+if (is_file($file)) {
+    // Make sure we can read it
+    if ($contents = file_get_contents($file)) {
+        if ($array = json_decode($contents, true)) {
+            // Development
+            if ($dev) {
+                // Set 'minimum-stability'
+                $array['minimum-stability'] = 'dev';
+                $array['prefer-stable']     = true;
+
+                // Make sure the repo is configured
+                if (! isset($array['repositories'])) {
+                    $array['repositories'] = [];
+                }
+
+                // Check for the CodeIgniter repo
+                $found = false;
+
+                foreach ($array['repositories'] as $repository) {
+                    if ($repository['url'] === GITHUB_URL) {
+                        $found = true;
+                        break;
+                    }
+                }
+
+                // Add the repo if it was not found
+                if (! $found) {
+                    $array['repositories'][] = [
+                        'type' => 'vcs',
+                        'url'  => GITHUB_URL,
+                    ];
+                }
+
+                // Define the "require"
+                $array['require']['codeigniter4/codeigniter4'] = 'dev-develop';
+                unset($array['require']['codeigniter4/framework']);
+            }
+
+            // Release
+            else {
+                // Clear 'minimum-stability'
+                unset($array['minimum-stability']);
+
+                // If the repo is configured then clear it
+                if (isset($array['repositories'])) {
+                    // Check for the CodeIgniter repo
+                    foreach ($array['repositories'] as $i => $repository) {
+                        if ($repository['url'] === GITHUB_URL) {
+                            unset($array['repositories'][$i]);
+                            break;
+                        }
+                    }
+                    if (empty($array['repositories'])) {
+                        unset($array['repositories']);
+                    }
+                }
+
+                // Define the "require"
+                $array['require']['codeigniter4/framework'] = LATEST_RELEASE;
+                unset($array['require']['codeigniter4/codeigniter4']);
+            }
+
+            // Write out a new composer.json
+            file_put_contents($file, json_encode($array, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . PHP_EOL);
+            $modified[] = $file;
+        } else {
+            echo 'Warning: Unable to decode composer.json! Skipping...' . PHP_EOL;
+        }
+    } else {
+        echo 'Warning: Unable to read composer.json! Skipping...' . PHP_EOL;
+    }
 }
 
 // Paths config and PHPUnit XMLs
 $files = [
-	__DIR__ . DIRECTORY_SEPARATOR . 'app/Config/Paths.php',
-	__DIR__ . DIRECTORY_SEPARATOR . 'phpunit.xml.dist',
-	__DIR__ . DIRECTORY_SEPARATOR . 'phpunit.xml',
+    __DIR__ . DIRECTORY_SEPARATOR . 'app/Config/Paths.php',
+    __DIR__ . DIRECTORY_SEPARATOR . 'phpunit.xml.dist',
+    __DIR__ . DIRECTORY_SEPARATOR . 'phpunit.xml',
 ];
 
-foreach ($files as $file)
-{
-	if (is_file($file))
-	{
-		$contents = file_get_contents($file);
-
-		// Development
-		if ($dev)
-		{
-			$contents = str_replace('vendor/codeigniter4/framework', 'vendor/codeigniter4/codeigniter4', $contents);
-		}
-
-		// Release
-		else
-		{
-			$contents = str_replace('vendor/codeigniter4/codeigniter4', 'vendor/codeigniter4/framework', $contents);
-		}
-
-		file_put_contents($file, $contents);
-		$modified[] = $file;
-	}
-}
+foreach ($files as $file) {
+    if (is_file($file)) {
+        $contents = file_get_contents($file);
+
+        // Development
+        if ($dev) {
+            $contents = str_replace('vendor/codeigniter4/framework', 'vendor/codeigniter4/codeigniter4', $contents);
+        }
 
-if (empty($modified))
-{
-	echo 'No files modified' . PHP_EOL;
+        // Release
+        else {
+            $contents = str_replace('vendor/codeigniter4/codeigniter4', 'vendor/codeigniter4/framework', $contents);
+        }
+
+        file_put_contents($file, $contents);
+        $modified[] = $file;
+    }
 }
-else
-{
-	echo 'The following files were modified:' . PHP_EOL;
-	foreach ($modified as $file)
-	{
-		echo " * {$file}" . PHP_EOL;
-	}
-	echo 'Run `composer update` to sync changes with your vendor folder' . PHP_EOL;
+
+if (empty($modified)) {
+    echo 'No files modified' . PHP_EOL;
+} else {
+    echo 'The following files were modified:' . PHP_EOL;
+
+    foreach ($modified as $file) {
+        echo " * {$file}" . PHP_EOL;
+    }
+    echo 'Run `composer update` to sync changes with your vendor folder' . PHP_EOL;
 }

From ef47af446062befef5181eada32be3d0e7c13b26 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 29 Oct 2021 18:26:03 +0800
Subject: [PATCH 0548/2325] Remove unnecessary comments

---
 admin/starter/builds | 31 +++++++------------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/admin/starter/builds b/admin/starter/builds
index 1ac374f57a75..3ef9fd3d6ec7 100755
--- a/admin/starter/builds
+++ b/admin/starter/builds
@@ -27,25 +27,19 @@ $modified = [];
 
 // Locate each file and update it for the requested stability
 
-// Composer.json
 $file = __DIR__ . DIRECTORY_SEPARATOR . 'composer.json';
 
 if (is_file($file)) {
-    // Make sure we can read it
     if ($contents = file_get_contents($file)) {
         if ($array = json_decode($contents, true)) {
-            // Development
             if ($dev) {
-                // Set 'minimum-stability'
                 $array['minimum-stability'] = 'dev';
                 $array['prefer-stable']     = true;
 
-                // Make sure the repo is configured
                 if (! isset($array['repositories'])) {
                     $array['repositories'] = [];
                 }
 
-                // Check for the CodeIgniter repo
                 $found = false;
 
                 foreach ($array['repositories'] as $repository) {
@@ -55,7 +49,6 @@ if (is_file($file)) {
                     }
                 }
 
-                // Add the repo if it was not found
                 if (! $found) {
                     $array['repositories'][] = [
                         'type' => 'vcs',
@@ -63,37 +56,30 @@ if (is_file($file)) {
                     ];
                 }
 
-                // Define the "require"
                 $array['require']['codeigniter4/codeigniter4'] = 'dev-develop';
                 unset($array['require']['codeigniter4/framework']);
-            }
-
-            // Release
-            else {
-                // Clear 'minimum-stability'
+            } else {
                 unset($array['minimum-stability']);
 
-                // If the repo is configured then clear it
                 if (isset($array['repositories'])) {
-                    // Check for the CodeIgniter repo
                     foreach ($array['repositories'] as $i => $repository) {
                         if ($repository['url'] === GITHUB_URL) {
                             unset($array['repositories'][$i]);
                             break;
                         }
                     }
+
                     if (empty($array['repositories'])) {
                         unset($array['repositories']);
                     }
                 }
 
-                // Define the "require"
                 $array['require']['codeigniter4/framework'] = LATEST_RELEASE;
                 unset($array['require']['codeigniter4/codeigniter4']);
             }
 
-            // Write out a new composer.json
             file_put_contents($file, json_encode($array, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . PHP_EOL);
+
             $modified[] = $file;
         } else {
             echo 'Warning: Unable to decode composer.json! Skipping...' . PHP_EOL;
@@ -103,7 +89,6 @@ if (is_file($file)) {
     }
 }
 
-// Paths config and PHPUnit XMLs
 $files = [
     __DIR__ . DIRECTORY_SEPARATOR . 'app/Config/Paths.php',
     __DIR__ . DIRECTORY_SEPARATOR . 'phpunit.xml.dist',
@@ -114,17 +99,14 @@ foreach ($files as $file) {
     if (is_file($file)) {
         $contents = file_get_contents($file);
 
-        // Development
         if ($dev) {
             $contents = str_replace('vendor/codeigniter4/framework', 'vendor/codeigniter4/codeigniter4', $contents);
-        }
-
-        // Release
-        else {
+        } else {
             $contents = str_replace('vendor/codeigniter4/codeigniter4', 'vendor/codeigniter4/framework', $contents);
         }
 
         file_put_contents($file, $contents);
+
         $modified[] = $file;
     }
 }
@@ -137,5 +119,6 @@ if (empty($modified)) {
     foreach ($modified as $file) {
         echo " * {$file}" . PHP_EOL;
     }
-    echo 'Run `composer update` to sync changes with your vendor folder' . PHP_EOL;
+
+    echo 'Run `composer update` to sync changes with your vendor folder.' . PHP_EOL;
 }

From 1a048f9ba3dd723efd0809b677175e03e83bb558 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 29 Oct 2021 18:33:02 +0800
Subject: [PATCH 0549/2325] Other optimizations

---
 admin/starter/builds | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/admin/starter/builds b/admin/starter/builds
index 3ef9fd3d6ec7..4a3fe3d53139 100755
--- a/admin/starter/builds
+++ b/admin/starter/builds
@@ -30,15 +30,16 @@ $modified = [];
 $file = __DIR__ . DIRECTORY_SEPARATOR . 'composer.json';
 
 if (is_file($file)) {
-    if ($contents = file_get_contents($file)) {
-        if ($array = json_decode($contents, true)) {
+    $contents = file_get_contents($file);
+
+    if ((string) $contents !== '') {
+        $array = json_decode($contents, true);
+
+        if (is_array($array)) {
             if ($dev) {
                 $array['minimum-stability'] = 'dev';
                 $array['prefer-stable']     = true;
-
-                if (! isset($array['repositories'])) {
-                    $array['repositories'] = [];
-                }
+                $array['repositories']      = $array['repositories'] ?? [];
 
                 $found = false;
 
@@ -111,8 +112,8 @@ foreach ($files as $file) {
     }
 }
 
-if (empty($modified)) {
-    echo 'No files modified' . PHP_EOL;
+if ($modified !== []) {
+    echo 'No files modified.' . PHP_EOL;
 } else {
     echo 'The following files were modified:' . PHP_EOL;
 

From c28ae89840bfafd605ac2314fc9c1a0fd7ead164 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 29 Oct 2021 18:45:33 +0800
Subject: [PATCH 0550/2325] Disable blank issues

---
 .github/ISSUE_TEMPLATE/config.yml          |  9 +++++++++
 .github/ISSUE_TEMPLATE/support-question.md | 11 -----------
 2 files changed, 9 insertions(+), 11 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/support-question.md

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000000..69bb11b44fe8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,9 @@
+blank_issues_enabled: false
+contact_links:
+  - name: CodeIgniter Forum
+    url: https://forum.codeigniter.com
+    about: Please ask your support questions in the forums. Thanks!
+
+  - name: CodeIgniter Slack channel
+    url: https://codeigniterchat.slack.com
+    about: Engage with other members of the community in our Slack channel.
diff --git a/.github/ISSUE_TEMPLATE/support-question.md b/.github/ISSUE_TEMPLATE/support-question.md
deleted file mode 100644
index 390991ac99d0..000000000000
--- a/.github/ISSUE_TEMPLATE/support-question.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-name: Support question
-about: How to ask a support question
-title: ''
-labels: ''
-assignees: ''
-
----
-
-Please ask support questions on our [forum](https://forum.codeigniter.com/forum-30.html).
-We use github issues to track bugs and planned work.

From d7364cdd1d9fa54379adc4682f433cb3d36fabcb Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 29 Oct 2021 19:22:00 +0800
Subject: [PATCH 0551/2325] Speed up `CommonSingleServiceTest`

---
 tests/system/CommonSingleServiceTest.php | 58 +++++++++++++++++-------
 1 file changed, 41 insertions(+), 17 deletions(-)

diff --git a/tests/system/CommonSingleServiceTest.php b/tests/system/CommonSingleServiceTest.php
index ede9d9b0445e..bc2f4a1f60c8 100644
--- a/tests/system/CommonSingleServiceTest.php
+++ b/tests/system/CommonSingleServiceTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter;
 
+use CodeIgniter\Autoloader\FileLocator;
 use CodeIgniter\Config\Services;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockSecurity;
@@ -42,6 +43,17 @@ public function testSingleServiceWithNoParamsSupplied(string $service): void
      */
     public function testSingleServiceWithAtLeastOneParamSupplied(string $service): void
     {
+        if ($service === 'commands') {
+            $locator = $this->getMockBuilder(FileLocator::class)
+                ->setConstructorArgs([Services::autoloader()])
+                ->onlyMethods(['listFiles'])
+                ->getMock();
+
+            // `Commands::discoverCommand()` is an expensive operation
+            $locator->method('listFiles')->with('Commands/')->willReturn([]);
+            Services::injectMock('locator', $locator);
+        }
+
         $params = [];
         $method = new ReflectionMethod(Services::class, $service);
 
@@ -52,6 +64,10 @@ public function testSingleServiceWithAtLeastOneParamSupplied(string $service): v
 
         $this->assertSame(get_class($service1), get_class($service2));
         $this->assertNotSame($service1, $service2);
+
+        if ($service === 'commands') {
+            $this->resetServices();
+        }
     }
 
     public function testSingleServiceWithAllParamsSupplied(): void
@@ -76,25 +92,33 @@ public function testSingleServiceWithGibberishGiven(): void
 
     public static function serviceNamesProvider(): iterable
     {
-        $methods = (new ReflectionClass(Services::class))->getMethods(ReflectionMethod::IS_PUBLIC);
-
-        foreach ($methods as $method) {
-            $name = $method->getName();
-            $excl = [
-                '__callStatic',
-                'serviceExists',
-                'reset',
-                'resetSingle',
-                'injectMock',
-                'encrypter', // Encrypter needs a starter key
-                'session', // Headers already sent
-            ];
-
-            if (in_array($name, $excl, true)) {
-                continue;
+        static $services = [];
+        static $excl     = [
+            '__callStatic',
+            'serviceExists',
+            'reset',
+            'resetSingle',
+            'injectMock',
+            'encrypter', // Encrypter needs a starter key
+            'session', // Headers already sent
+        ];
+
+        if ($services === []) {
+            $methods = (new ReflectionClass(Services::class))->getMethods(ReflectionMethod::IS_PUBLIC);
+
+            foreach ($methods as $method) {
+                $name = $method->getName();
+
+                if (in_array($name, $excl, true)) {
+                    continue;
+                }
+
+                $services[$name] = [$name];
             }
 
-            yield $name => [$name];
+            ksort($services);
         }
+
+        yield from $services;
     }
 }

From ec303bf1ca4ccecea4912ec782879fa123022438 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 29 Oct 2021 19:35:37 +0800
Subject: [PATCH 0552/2325] Replace explicit calls to `Services::reset()` in
 tests

---
 tests/system/CodeIgniterTest.php                | 2 +-
 tests/system/CommonHelperTest.php               | 4 ++--
 tests/system/Config/ServicesTest.php            | 2 +-
 tests/system/Filters/FiltersTest.php            | 2 +-
 tests/system/HTTP/CURLRequestTest.php           | 2 +-
 tests/system/HTTP/URITest.php                   | 6 +++---
 tests/system/RESTful/ResourceControllerTest.php | 2 +-
 tests/system/RESTful/ResourcePresenterTest.php  | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index 0e6de8eadda0..f7838105af4d 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -36,7 +36,7 @@ final class CodeIgniterTest extends CIUnitTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        Services::reset();
+        $this->resetServices();
 
         $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
 
diff --git a/tests/system/CommonHelperTest.php b/tests/system/CommonHelperTest.php
index 18e0a1022f8d..ce472e56b8be 100644
--- a/tests/system/CommonHelperTest.php
+++ b/tests/system/CommonHelperTest.php
@@ -32,7 +32,7 @@ final class CommonHelperTest extends CIUnitTestCase
 
     protected function setUp(): void
     {
-        Services::reset();
+        $this->resetServices();
         parent::setUp();
         $this->cleanUpDummyHelpers();
     }
@@ -41,7 +41,7 @@ protected function tearDown(): void
     {
         parent::tearDown();
         $this->cleanUpDummyHelpers();
-        Services::reset();
+        $this->resetServices();
     }
 
     private function createDummyHelpers(): void
diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php
index 2712bdce8dd5..77a0c77097fc 100644
--- a/tests/system/Config/ServicesTest.php
+++ b/tests/system/Config/ServicesTest.php
@@ -64,7 +64,7 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         $_SERVER = $this->original;
-        Services::reset();
+        $this->resetServices();
     }
 
     public function testCanReplaceFrameworkServices()
diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index dae4074cd134..5451f4b239f4 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -40,7 +40,7 @@ final class FiltersTest extends CIUnitTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        Services::reset();
+        $this->resetServices();
 
         $defaults = [
             'Config'        => APPPATH . 'Config',
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index c1ac77765a44..694d8929dc09 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -32,7 +32,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        Services::reset();
+        $this->resetServices();
         $this->request = $this->getRequest();
     }
 
diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php
index 89cb106ed607..acd491bccb9d 100644
--- a/tests/system/HTTP/URITest.php
+++ b/tests/system/HTTP/URITest.php
@@ -861,7 +861,7 @@ public function testSetBadSegmentSilent()
 
     public function testBasedNoIndex()
     {
-        Services::reset();
+        $this->resetServices();
 
         $_SERVER['HTTP_HOST']   = 'example.com';
         $_SERVER['REQUEST_URI'] = '/ci/v4/controller/method';
@@ -888,7 +888,7 @@ public function testBasedNoIndex()
 
     public function testBasedWithIndex()
     {
-        Services::reset();
+        $this->resetServices();
 
         $_SERVER['HTTP_HOST']   = 'example.com';
         $_SERVER['REQUEST_URI'] = '/ci/v4/index.php/controller/method';
@@ -915,7 +915,7 @@ public function testBasedWithIndex()
 
     public function testForceGlobalSecureRequests()
     {
-        Services::reset();
+        $this->resetServices();
 
         $_SERVER['HTTP_HOST']   = 'example.com';
         $_SERVER['REQUEST_URI'] = '/ci/v4/controller/method';
diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index 185088da1505..ec8d13af7a2d 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -54,7 +54,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        Services::reset();
+        $this->resetServices();
 
         $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
 
diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php
index e32ce9aba5d3..26ea1084b196 100644
--- a/tests/system/RESTful/ResourcePresenterTest.php
+++ b/tests/system/RESTful/ResourcePresenterTest.php
@@ -48,7 +48,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        Services::reset();
+        $this->resetServices();
 
         $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
 

From 88c45d6947053ff76c44b8f028e5e27a1dc26845 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Sat, 30 Oct 2021 00:16:12 +0800
Subject: [PATCH 0553/2325] Fix wrong logic

---
 admin/starter/builds | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/starter/builds b/admin/starter/builds
index 4a3fe3d53139..0b10a150ac59 100755
--- a/admin/starter/builds
+++ b/admin/starter/builds
@@ -112,7 +112,7 @@ foreach ($files as $file) {
     }
 }
 
-if ($modified !== []) {
+if ($modified === []) {
     echo 'No files modified.' . PHP_EOL;
 } else {
     echo 'The following files were modified:' . PHP_EOL;

From a6c06cc990e73e3c1ee39004b5e51aabfbfa27f2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 30 Oct 2021 08:58:11 +0900
Subject: [PATCH 0554/2325] refactor: remove unnecessary second param

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

diff --git a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
index ae6aef2ad74d..fd440bbcffdd 100644
--- a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
+++ b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
@@ -225,7 +225,7 @@ public function testHeaderContentLengthNotSharedBetweenRequests()
         $options = [
             'base_uri' => 'http://www.foo.com/api/v1/',
         ];
-        $request = $this->getRequest($options, false);
+        $request = $this->getRequest($options);
 
         $request->post('example', [
             'form_params' => [

From f53a1da13bec07c5a30a2f658a6658e14d1dbaa9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 30 Oct 2021 09:22:54 +0900
Subject: [PATCH 0555/2325] refactor: move Config\App::$CURLRequestShareOptions
 to Config\CURLRequest::$shareOptions

---
 app/Config/App.php                            | 11 -----------
 app/Config/CURLRequest.php                    | 19 +++++++++++++++++++
 system/HTTP/CURLRequest.php                   |  8 ++++++--
 .../HTTP/CURLRequestDoNotShareOptionsTest.php | 11 ++++++++---
 tests/system/HTTP/CURLRequestTest.php         | 11 ++++++++---
 5 files changed, 41 insertions(+), 19 deletions(-)
 create mode 100644 app/Config/CURLRequest.php

diff --git a/app/Config/App.php b/app/Config/App.php
index 57c9b8a45c46..88b295e9a010 100644
--- a/app/Config/App.php
+++ b/app/Config/App.php
@@ -461,15 +461,4 @@ class App extends BaseConfig
      * @var bool
      */
     public $CSPEnabled = false;
-
-    /**
-     * --------------------------------------------------------------------------
-     * CURLRequest Share Options
-     * --------------------------------------------------------------------------
-     *
-     * Whether share options between requests or not.
-     *
-     * @var bool
-     */
-    public $CURLRequestShareOptions = true;
 }
diff --git a/app/Config/CURLRequest.php b/app/Config/CURLRequest.php
new file mode 100644
index 000000000000..c16cffac4e0a
--- /dev/null
+++ b/app/Config/CURLRequest.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class CURLRequest extends BaseConfig
+{
+    /**
+     * --------------------------------------------------------------------------
+     * CURLRequest Share Options
+     * --------------------------------------------------------------------------
+     *
+     * Whether share options between requests or not.
+     *
+     * @var bool
+     */
+    public $shareOptions = true;
+}
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 4a58e5992afc..1b8b474e5022 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use Config\App;
+use Config\CURLRequest as ConfigCURLRequest;
 use InvalidArgumentException;
 
 /**
@@ -116,9 +117,12 @@ public function __construct(App $config, URI $uri, ?ResponseInterface $response
         $this->response       = $response;
         $this->baseURI        = $uri->useRawQueryString();
         $this->defaultOptions = $options;
-        $this->config         = $this->defaultConfig;
-        $this->shareOptions   = $config->CURLRequestShareOptions ?? true;
 
+        /** @var ConfigCURLRequest|null $configCURLRequest */
+        $configCURLRequest  = config('CURLRequest');
+        $this->shareOptions = $configCURLRequest->shareOptions ?? true;
+
+        $this->config = $this->defaultConfig;
         $this->parseOptions($options);
     }
 
diff --git a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
index fd440bbcffdd..4d35d4510271 100644
--- a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
+++ b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
@@ -11,11 +11,13 @@
 
 namespace CodeIgniter\HTTP;
 
+use CodeIgniter\Config\Factories;
 use CodeIgniter\Config\Services;
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockCURLRequest;
 use Config\App;
+use Config\CURLRequest as ConfigCURLRequest;
 use CURLFile;
 
 /**
@@ -38,9 +40,12 @@ protected function setUp(): void
 
     protected function getRequest(array $options = [])
     {
-        $uri                          = isset($options['base_uri']) ? new URI($options['base_uri']) : new URI();
-        $app                          = new App();
-        $app->CURLRequestShareOptions = false;
+        $uri = isset($options['base_uri']) ? new URI($options['base_uri']) : new URI();
+        $app = new App();
+
+        $config               = new ConfigCURLRequest();
+        $config->shareOptions = false;
+        Factories::injectMock('config', 'CURLRequest', $config);
 
         return new MockCURLRequest(($app), $uri, new Response($app), $options);
     }
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index de7ef08b59fc..64562f37fd65 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -11,11 +11,13 @@
 
 namespace CodeIgniter\HTTP;
 
+use CodeIgniter\Config\Factories;
 use CodeIgniter\Config\Services;
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockCURLRequest;
 use Config\App;
+use Config\CURLRequest as ConfigCURLRequest;
 use CURLFile;
 
 /**
@@ -38,9 +40,12 @@ protected function setUp(): void
 
     protected function getRequest(array $options = [])
     {
-        $uri                          = isset($options['base_uri']) ? new URI($options['base_uri']) : new URI();
-        $app                          = new App();
-        $app->CURLRequestShareOptions = true;
+        $uri = isset($options['base_uri']) ? new URI($options['base_uri']) : new URI();
+        $app = new App();
+
+        $config               = new ConfigCURLRequest();
+        $config->shareOptions = true;
+        Factories::injectMock('config', 'CURLRequest', $config);
 
         return new MockCURLRequest(($app), $uri, new Response($app), $options);
     }

From 772a40819e99c8f5d97ff97412d8ae0f96ae562e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 30 Oct 2021 09:35:49 +0900
Subject: [PATCH 0556/2325] fix: change from private to protected

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

diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 1b8b474e5022..5f857d9319b5 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -50,7 +50,7 @@ class CURLRequest extends Request
      *
      * @var array
      */
-    private $defaultConfig = [
+    protected $defaultConfig = [
         'timeout'         => 0.0,
         'connect_timeout' => 150,
         'debug'           => false,
@@ -149,7 +149,7 @@ public function request($method, string $url, array $options = []): ResponseInte
         return $this->response;
     }
 
-    private function resetOptions()
+    protected function resetOptions()
     {
         // Reset headers
         $this->headers   = [];

From 3901496bc283871a0e02da72923d0dc0eb274181 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 30 Oct 2021 09:39:58 +0900
Subject: [PATCH 0557/2325] docs: add PHPDoc comments

---
 app/Config/CURLRequest.php  | 3 +++
 system/HTTP/CURLRequest.php | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/Config/CURLRequest.php b/app/Config/CURLRequest.php
index c16cffac4e0a..b4c8e5c4f13c 100644
--- a/app/Config/CURLRequest.php
+++ b/app/Config/CURLRequest.php
@@ -13,6 +13,9 @@ class CURLRequest extends BaseConfig
      *
      * Whether share options between requests or not.
      *
+     * If true, all the options won't be reset between requests.
+     * It may cause an error request with unnecessary headers.
+     *
      * @var bool
      */
     public $shareOptions = true;
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 5f857d9319b5..a3c92511adda 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -81,7 +81,7 @@ class CURLRequest extends Request
     protected $delay = 0.0;
 
     /**
-     * Default options. Applied to all requests.
+     * The default options from the constructor. Applied to all requests.
      *
      * @var array
      */
@@ -90,6 +90,9 @@ class CURLRequest extends Request
     /**
      * Whether share options between requests or not.
      *
+     * If true, all the options won't be reset between requests.
+     * It may cause an error request with unnecessary headers.
+     *
      * @var bool
      */
     private $shareOptions;
@@ -149,6 +152,9 @@ public function request($method, string $url, array $options = []): ResponseInte
         return $this->response;
     }
 
+    /**
+     * Reset all options to default.
+     */
     protected function resetOptions()
     {
         // Reset headers

From 8a5973b0de4f4cdf6d2c89006d6a4bf91847e8de Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 30 Oct 2021 09:55:09 +0900
Subject: [PATCH 0558/2325] config: add curlrequest.shareOptions

---
 env | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/env b/env
index 0b6aa1720782..6e30e34b7ddb 100644
--- a/env
+++ b/env
@@ -124,3 +124,9 @@
 #--------------------------------------------------------------------
 
 # logger.threshold = 4
+
+#--------------------------------------------------------------------
+# CURLRequest
+#--------------------------------------------------------------------
+
+# curlrequest.shareOptions = true

From 88963ba2e85f9e0c731ed56c8fdb32108289e757 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 30 Oct 2021 10:31:47 +0900
Subject: [PATCH 0559/2325] docs: add about CURLRequest $shareOptions

---
 .../source/libraries/curlrequest.rst          | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/curlrequest.rst b/user_guide_src/source/libraries/curlrequest.rst
index c9c69ea7ae08..0074523d79fd 100644
--- a/user_guide_src/source/libraries/curlrequest.rst
+++ b/user_guide_src/source/libraries/curlrequest.rst
@@ -19,6 +19,21 @@ to change very little to move over to use Guzzle.
     in your version of PHP. This is a very common library that is typically available but not all hosts
     will provide it, so please check with your host to verify if you run into problems.
 
+**********************
+Config for CURLRequest
+**********************
+
+Sharing Options
+===============
+
+Due to historical reasons, by default, the CURLRequest shares all the options between requests.
+If you send more than one request with an instance of the class,
+this behavior may cause an error request with unnecessary headers.
+
+You can change the behavior by editing the following config parameter value in **app/Config/CURLRequest.php** to ``false``::
+
+    public $shareOptions = false;
+
 *******************
 Loading the Library
 *******************
@@ -38,9 +53,11 @@ The options are described later in this document::
     ];
     $client = \Config\Services::curlrequest($options);
 
+.. note:: When ``$shareOptions`` is false, the default options passed to the class constructor will be used for all requests. Other options will be reset after sending a request.
+
 When creating the class manually, you need to pass a few dependencies in. The first parameter is an
 instance of the ``Config\App`` class. The second parameter is a URI instance. The third
-parameter is a Response object. The fourth parameter is the optional ``$options`` array::
+parameter is a Response object. The fourth parameter is the optional default ``$options`` array::
 
     $client = new \CodeIgniter\HTTP\CURLRequest(
         new \Config\App(),
@@ -70,6 +87,8 @@ a Response instance to you. This takes the HTTP method, the url and an array of
         'auth' => ['user', 'pass'],
     ]);
 
+.. note:: When ``$shareOptions`` is false, the options passed to the method will be used for the request. After sending the request, they will be cleared. If you want to use the options to all requests, pass the options in the constructor.
+
 Since the response is an instance of ``CodeIgniter\HTTP\Response`` you have all of the normal information
 available to you::
 

From 916a7b01325edd3ad7e1e30068654337a1103205 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 31 Oct 2021 11:37:54 +0900
Subject: [PATCH 0560/2325] refactor: remove static variable and add a proptery
 for it

It makes escape chars wrong on PHP 8.1.
See
Usage of static Variables in Inherited Methods
https://www.php.net/manual/en/migration81.incompatible.php
---
 system/Database/BaseConnection.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 9cb44e246296..8525755f6950 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -238,6 +238,13 @@ abstract class BaseConnection implements ConnectionInterface
      */
     public $likeEscapeChar = '!';
 
+    /**
+     * RegExp used to escape identifiers
+     *
+     * @var array
+     */
+    protected $pregEscapeChar = [];
+
     /**
      * Holds previously looked up data
      * for performance reasons.
@@ -1119,29 +1126,27 @@ public function escapeIdentifiers($item)
             return $item;
         }
 
-        static $pregEc = [];
-
-        if (empty($pregEc)) {
+        if (empty($this->pregEscapeChar)) {
             if (is_array($this->escapeChar)) {
-                $pregEc = [
+                $this->pregEscapeChar = [
                     preg_quote($this->escapeChar[0], '/'),
                     preg_quote($this->escapeChar[1], '/'),
                     $this->escapeChar[0],
                     $this->escapeChar[1],
                 ];
             } else {
-                $pregEc[0] = $pregEc[1] = preg_quote($this->escapeChar, '/');
-                $pregEc[2] = $pregEc[3] = $this->escapeChar;
+                $this->pregEscapeChar[0] = $this->pregEscapeChar[1] = preg_quote($this->escapeChar, '/');
+                $this->pregEscapeChar[2] = $this->pregEscapeChar[3] = $this->escapeChar;
             }
         }
 
         foreach ($this->reservedIdentifiers as $id) {
             if (strpos($item, '.' . $id) !== false) {
-                return preg_replace('/' . $pregEc[0] . '?([^' . $pregEc[1] . '\.]+)' . $pregEc[1] . '?\./i', $pregEc[2] . '$1' . $pregEc[3] . '.', $item);
+                return preg_replace('/' . $this->pregEscapeChar[0] . '?([^' . $this->pregEscapeChar[1] . '\.]+)' . $this->pregEscapeChar[1] . '?\./i', $this->pregEscapeChar[2] . '$1' . $this->pregEscapeChar[3] . '.', $item);
             }
         }
 
-        return preg_replace('/' . $pregEc[0] . '?([^' . $pregEc[1] . '\.]+)' . $pregEc[1] . '?(\.)?/i', $pregEc[2] . '$1' . $pregEc[3] . '$2', $item);
+        return preg_replace('/' . $this->pregEscapeChar[0] . '?([^' . $this->pregEscapeChar[1] . '\.]+)' . $this->pregEscapeChar[1] . '?(\.)?/i', $this->pregEscapeChar[2] . '$1' . $this->pregEscapeChar[3] . '$2', $item);
     }
 
     /**

From 601d29523f7a921655b471931c02e9c505b191e7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 31 Oct 2021 11:44:41 +0900
Subject: [PATCH 0561/2325] refactor: break long lines

---
 system/Database/BaseConnection.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 8525755f6950..3a50e43ffd21 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -1142,11 +1142,19 @@ public function escapeIdentifiers($item)
 
         foreach ($this->reservedIdentifiers as $id) {
             if (strpos($item, '.' . $id) !== false) {
-                return preg_replace('/' . $this->pregEscapeChar[0] . '?([^' . $this->pregEscapeChar[1] . '\.]+)' . $this->pregEscapeChar[1] . '?\./i', $this->pregEscapeChar[2] . '$1' . $this->pregEscapeChar[3] . '.', $item);
+                return preg_replace(
+                    '/' . $this->pregEscapeChar[0] . '?([^' . $this->pregEscapeChar[1] . '\.]+)' . $this->pregEscapeChar[1] . '?\./i',
+                    $this->pregEscapeChar[2] . '$1' . $this->pregEscapeChar[3] . '.',
+                    $item
+                );
             }
         }
 
-        return preg_replace('/' . $this->pregEscapeChar[0] . '?([^' . $this->pregEscapeChar[1] . '\.]+)' . $this->pregEscapeChar[1] . '?(\.)?/i', $this->pregEscapeChar[2] . '$1' . $this->pregEscapeChar[3] . '$2', $item);
+        return preg_replace(
+            '/' . $this->pregEscapeChar[0] . '?([^' . $this->pregEscapeChar[1] . '\.]+)' . $this->pregEscapeChar[1] . '?(\.)?/i',
+            $this->pregEscapeChar[2] . '$1' . $this->pregEscapeChar[3] . '$2',
+            $item
+        );
     }
 
     /**

From c36ce02b4b5c9686d632312b75237434e237fe6e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 31 Oct 2021 11:57:51 +0900
Subject: [PATCH 0562/2325] refactor: remove static variables and add
 properties

To prevent inappropriate behavior when inheriting by using the values of the parent class on PHP 8.1.

Usage of static Variables in Inherited Methods
https://www.php.net/manual/en/migration81.incompatible.php
---
 system/Database/BaseBuilder.php | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index f87f21bf7308..73865aed79ee 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -244,6 +244,20 @@ class BaseBuilder
         'RIGHT OUTER',
     ];
 
+    /**
+     * Strings that determine if a string represents a literal value or a field name
+     *
+     * @var string[]
+     */
+    protected $isLiteralStr = [];
+
+    /**
+     * RegExp used to get operators
+     *
+     * @var string[]
+     */
+    protected $pregOperators = [];
+
     /**
      * Constructor
      *
@@ -2515,13 +2529,11 @@ protected function isLiteral(string $str): bool
             return true;
         }
 
-        static $_str;
-
-        if (empty($_str)) {
-            $_str = ($this->db->escapeChar !== '"') ? ['"', "'"] : ["'"];
+        if (empty($this->isLiteralStr)) {
+            $this->isLiteralStr = ($this->db->escapeChar !== '"') ? ['"', "'"] : ["'"];
         }
 
-        return in_array($str[0], $_str, true);
+        return in_array($str[0], $this->isLiteralStr, true);
     }
 
     /**
@@ -2610,11 +2622,9 @@ protected function hasOperator(string $str): bool
      */
     protected function getOperator(string $str, bool $list = false)
     {
-        static $_operators;
-
-        if (empty($_operators)) {
+        if (empty($this->pregOperators)) {
             $_les       = ($this->db->likeEscapeStr !== '') ? '\s+' . preg_quote(trim(sprintf($this->db->likeEscapeStr, $this->db->likeEscapeChar)), '/') : '';
-            $_operators = [
+            $this->pregOperators = [
                 '\s*(?:<|>|!)?=\s*', // =, <=, >=, !=
                 '\s*<>?\s*', // <, <>
                 '\s*>\s*', // >
@@ -2630,7 +2640,7 @@ protected function getOperator(string $str, bool $list = false)
             ];
         }
 
-        return preg_match_all('/' . implode('|', $_operators) . '/i', $str, $match) ? ($list ? $match[0] : $match[0][0]) : false;
+        return preg_match_all('/' . implode('|', $this->pregOperators) . '/i', $str, $match) ? ($list ? $match[0] : $match[0][0]) : false;
     }
 
     /**

From dbfacc0fefca07f68dbbc953dccee066124092a4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 31 Oct 2021 12:03:04 +0900
Subject: [PATCH 0563/2325] refactor: break long lines

---
 system/Database/BaseBuilder.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 73865aed79ee..150ed3b5cf5a 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -2612,7 +2612,10 @@ protected function resetWrite()
      */
     protected function hasOperator(string $str): bool
     {
-        return (bool) preg_match('/(<|>|!|=|\sIS NULL|\sIS NOT NULL|\sEXISTS|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i', trim($str));
+        return (bool) preg_match(
+            '/(<|>|!|=|\sIS NULL|\sIS NOT NULL|\sEXISTS|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i',
+            trim($str)
+        );
     }
 
     /**
@@ -2623,7 +2626,9 @@ protected function hasOperator(string $str): bool
     protected function getOperator(string $str, bool $list = false)
     {
         if (empty($this->pregOperators)) {
-            $_les       = ($this->db->likeEscapeStr !== '') ? '\s+' . preg_quote(trim(sprintf($this->db->likeEscapeStr, $this->db->likeEscapeChar)), '/') : '';
+            $_les = ($this->db->likeEscapeStr !== '')
+                ? '\s+' . preg_quote(trim(sprintf($this->db->likeEscapeStr, $this->db->likeEscapeChar)), '/')
+                : '';
             $this->pregOperators = [
                 '\s*(?:<|>|!)?=\s*', // =, <=, >=, !=
                 '\s*<>?\s*', // <, <>
@@ -2640,7 +2645,11 @@ protected function getOperator(string $str, bool $list = false)
             ];
         }
 
-        return preg_match_all('/' . implode('|', $this->pregOperators) . '/i', $str, $match) ? ($list ? $match[0] : $match[0][0]) : false;
+        return preg_match_all(
+            '/' . implode('|', $this->pregOperators) . '/i',
+            $str,
+            $match
+        ) ? ($list ? $match[0] : $match[0][0]) : false;
     }
 
     /**

From 833ca561ac26798d626a7d732f02b90012c6457c Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Sun, 31 Oct 2021 18:39:55 +0800
Subject: [PATCH 0564/2325] Apply suggestions from code review

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

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 150ed3b5cf5a..886ce928e132 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -2529,8 +2529,8 @@ protected function isLiteral(string $str): bool
             return true;
         }
 
-        if (empty($this->isLiteralStr)) {
-            $this->isLiteralStr = ($this->db->escapeChar !== '"') ? ['"', "'"] : ["'"];
+        if ($this->isLiteralStr === []) {
+            $this->isLiteralStr = $this->db->escapeChar !== '"' ? ['"', "'"] : ["'"];
         }
 
         return in_array($str[0], $this->isLiteralStr, true);
@@ -2612,10 +2612,10 @@ protected function resetWrite()
      */
     protected function hasOperator(string $str): bool
     {
-        return (bool) preg_match(
+        return preg_match(
             '/(<|>|!|=|\sIS NULL|\sIS NOT NULL|\sEXISTS|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i',
             trim($str)
-        );
+        ) === 1;
     }
 
     /**
@@ -2625,8 +2625,8 @@ protected function hasOperator(string $str): bool
      */
     protected function getOperator(string $str, bool $list = false)
     {
-        if (empty($this->pregOperators)) {
-            $_les = ($this->db->likeEscapeStr !== '')
+        if ($this->pregOperators === []) {
+            $_les = $this->db->likeEscapeStr !== ''
                 ? '\s+' . preg_quote(trim(sprintf($this->db->likeEscapeStr, $this->db->likeEscapeChar)), '/')
                 : '';
             $this->pregOperators = [

From 8d5dc08576f433b432d383e9192c51b077366cd3 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Sun, 31 Oct 2021 18:41:59 +0800
Subject: [PATCH 0565/2325] Change empty to is identical check

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

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 3a50e43ffd21..ebb63b7f5827 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -1126,7 +1126,7 @@ public function escapeIdentifiers($item)
             return $item;
         }
 
-        if (empty($this->pregEscapeChar)) {
+        if ($this->pregEscapeChar === []) {
             if (is_array($this->escapeChar)) {
                 $this->pregEscapeChar = [
                     preg_quote($this->escapeChar[0], '/'),

From ef7d23dbd340649302abd90d50c246f9c54cedfa Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sun, 31 Oct 2021 19:37:52 +0800
Subject: [PATCH 0566/2325] Replace usage of `FILTER_SANITIZE_STRING`

---
 system/HTTP/CLIRequest.php        |  8 +++-----
 system/HTTP/CURLRequest.php       | 12 +++---------
 system/Router/RouteCollection.php |  8 ++++----
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
index b8db857fce54..fcc2a51389d2 100644
--- a/system/HTTP/CLIRequest.php
+++ b/system/HTTP/CLIRequest.php
@@ -15,8 +15,6 @@
 use RuntimeException;
 
 /**
- * Class CLIRequest
- *
  * Represents a request from the command-line. Provides additional
  * tools to interact with that request since CLI requests are not
  * static like HTTP requests might be.
@@ -172,17 +170,17 @@ protected function parseCommand()
                 if ($optionValue) {
                     $optionValue = false;
                 } else {
-                    $this->segments[] = filter_var($arg, FILTER_SANITIZE_STRING);
+                    $this->segments[] = esc(strip_tags($arg));
                 }
 
                 continue;
             }
 
-            $arg   = filter_var(ltrim($arg, '-'), FILTER_SANITIZE_STRING);
+            $arg   = esc(strip_tags(ltrim($arg, '-')));
             $value = null;
 
             if (isset($args[$i + 1]) && mb_strpos($args[$i + 1], '-') !== 0) {
-                $value       = filter_var($args[$i + 1], FILTER_SANITIZE_STRING);
+                $value       = esc(strip_tags($args[$i + 1]));
                 $optionValue = true;
             }
 
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 3be8214d42b4..cb723c31adff 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -16,10 +16,7 @@
 use InvalidArgumentException;
 
 /**
- * Class OutgoingRequest
- *
- * A lightweight HTTP client for sending synchronous HTTP requests
- * via cURL.
+ * A lightweight HTTP client for sending synchronous HTTP requests via cURL.
  */
 class CURLRequest extends Request
 {
@@ -84,10 +81,7 @@ class CURLRequest extends Request
     public function __construct(App $config, URI $uri, ?ResponseInterface $response = null, array $options = [])
     {
         if (! function_exists('curl_version')) {
-            // we won't see this during travis-CI
-            // @codeCoverageIgnoreStart
-            throw HTTPException::forMissingCurl();
-            // @codeCoverageIgnoreEnd
+            throw HTTPException::forMissingCurl(); // @codeCoverageIgnore
         }
 
         parent::__construct($config);
@@ -110,7 +104,7 @@ public function request($method, string $url, array $options = []): ResponseInte
 
         $url = $this->prepareURL($url);
 
-        $method = filter_var($method, FILTER_SANITIZE_STRING);
+        $method = esc(strip_tags($method));
 
         $this->send($method, $url);
 
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 1dcbfe9f590d..15a2d3d79e3e 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -19,8 +19,6 @@
 use InvalidArgumentException;
 
 /**
- * Class RouteCollection
- *
  * @todo Implement nested resource routing (See CakePHP)
  */
 class RouteCollection implements RouteCollectionInterface
@@ -663,10 +661,11 @@ public function resource(string $name, ?array $options = null): RouteCollectionI
         // resources are sent to, we need to have a new name
         // to store the values in.
         $newName = implode('\\', array_map('ucfirst', explode('/', $name)));
+
         // If a new controller is specified, then we replace the
         // $name value with the name of the new controller.
         if (isset($options['controller'])) {
-            $newName = ucfirst(filter_var($options['controller'], FILTER_SANITIZE_STRING));
+            $newName = ucfirst(esc(strip_tags($options['controller'])));
         }
 
         // In order to allow customization of allowed id values
@@ -756,10 +755,11 @@ public function presenter(string $name, ?array $options = null): RouteCollection
         // resources are sent to, we need to have a new name
         // to store the values in.
         $newName = implode('\\', array_map('ucfirst', explode('/', $name)));
+
         // If a new controller is specified, then we replace the
         // $name value with the name of the new controller.
         if (isset($options['controller'])) {
-            $newName = ucfirst(filter_var($options['controller'], FILTER_SANITIZE_STRING));
+            $newName = ucfirst(esc(strip_tags($options['controller'])));
         }
 
         // In order to allow customization of allowed id values

From 6a689bf9768bcb660bfba3886b640ab5d5b3c4b3 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sun, 31 Oct 2021 20:36:38 +0800
Subject: [PATCH 0567/2325] Enable `ordered_class_elements` rule

---
 .no-header.php-cs-fixer.dist.php                 | 12 +++++++++++-
 .php-cs-fixer.dist.php                           | 12 +++++++++++-
 tests/_support/Publishers/TestPublisher.php      | 16 ++++++++--------
 tests/system/Cache/Handlers/FileHandlerTest.php  |  3 +--
 .../Cache/Handlers/MemcachedHandlerTest.php      |  4 ++--
 .../system/Cache/Handlers/PredisHandlerTest.php  |  4 ++--
 tests/system/Cache/Handlers/RedisHandlerTest.php |  4 ++--
 7 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/.no-header.php-cs-fixer.dist.php b/.no-header.php-cs-fixer.dist.php
index 153ac5bd1328..9417a859e07e 100644
--- a/.no-header.php-cs-fixer.dist.php
+++ b/.no-header.php-cs-fixer.dist.php
@@ -30,7 +30,17 @@
         __DIR__ . '/admin/starter/builds',
     ]);
 
-$overrides = [];
+$overrides = [
+    'ordered_class_elements' => [
+        'order' => [
+            'use_trait',
+            'constant',
+            'property',
+            'method',
+        ],
+        'sort_algorithm' => 'none',
+    ],
+];
 
 $options = [
     'cacheFile'    => 'build/.no-header.php-cs-fixer.cache',
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 3c9e05fe3b74..5df3c5e90a52 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -34,7 +34,17 @@
         __DIR__ . '/spark',
     ]);
 
-$overrides = [];
+$overrides = [
+    'ordered_class_elements' => [
+        'order' => [
+            'use_trait',
+            'constant',
+            'property',
+            'method',
+        ],
+        'sort_algorithm' => 'none',
+    ],
+];
 
 $options = [
     'cacheFile'    => 'build/.php-cs-fixer.cache',
diff --git a/tests/_support/Publishers/TestPublisher.php b/tests/_support/Publishers/TestPublisher.php
index 357e50f17e1a..95d9fa72c250 100644
--- a/tests/_support/Publishers/TestPublisher.php
+++ b/tests/_support/Publishers/TestPublisher.php
@@ -15,14 +15,6 @@
 
 final class TestPublisher extends Publisher
 {
-    /**
-     * Fakes an error on the given file.
-     */
-    public static function setResult(bool $result)
-    {
-        self::$result = $result;
-    }
-
     /**
      * Return value for publish()
      *
@@ -44,6 +36,14 @@ public static function setResult(bool $result)
      */
     protected $destination = WRITEPATH;
 
+    /**
+     * Fakes an error on the given file.
+     */
+    public static function setResult(bool $result)
+    {
+        self::$result = $result;
+    }
+
     /**
      * Fakes a publish event so no files are actually copied.
      */
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index 3f82375354fe..f0aa76ea610d 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -20,6 +20,7 @@
 final class FileHandlerTest extends AbstractHandlerTest
 {
     private static $directory = 'FileHandler';
+    private $config;
 
     private static function getKeyArray()
     {
@@ -30,8 +31,6 @@ private static function getKeyArray()
         ];
     }
 
-    private $config;
-
     protected function setUp(): void
     {
         parent::setUp();
diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
index 240225fd8bc0..38005d87ed5b 100644
--- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php
+++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
@@ -22,6 +22,8 @@
  */
 final class MemcachedHandlerTest extends AbstractHandlerTest
 {
+    private $config;
+
     private static function getKeyArray()
     {
         return [
@@ -31,8 +33,6 @@ private static function getKeyArray()
         ];
     }
 
-    private $config;
-
     protected function setUp(): void
     {
         parent::setUp();
diff --git a/tests/system/Cache/Handlers/PredisHandlerTest.php b/tests/system/Cache/Handlers/PredisHandlerTest.php
index 9b762f9c27f1..cdc79adf68b4 100644
--- a/tests/system/Cache/Handlers/PredisHandlerTest.php
+++ b/tests/system/Cache/Handlers/PredisHandlerTest.php
@@ -21,6 +21,8 @@
  */
 final class PredisHandlerTest extends AbstractHandlerTest
 {
+    private $config;
+
     private static function getKeyArray()
     {
         return [
@@ -30,8 +32,6 @@ private static function getKeyArray()
         ];
     }
 
-    private $config;
-
     protected function setUp(): void
     {
         parent::setUp();
diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php
index 32d0cdf8223e..4eb8f8b08560 100644
--- a/tests/system/Cache/Handlers/RedisHandlerTest.php
+++ b/tests/system/Cache/Handlers/RedisHandlerTest.php
@@ -21,6 +21,8 @@
  */
 final class RedisHandlerTest extends AbstractHandlerTest
 {
+    private $config;
+
     private static function getKeyArray()
     {
         return [
@@ -30,8 +32,6 @@ private static function getKeyArray()
         ];
     }
 
-    private $config;
-
     protected function setUp(): void
     {
         parent::setUp();

From d8b750b3b815fc935e5f0e48bd1903d6f12a3c46 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 26 Oct 2021 15:41:11 +0900
Subject: [PATCH 0568/2325] test: refactor: $request -> $this->request

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

diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index 5451f4b239f4..302aa985e474 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -61,8 +61,8 @@ public function testProcessMethodDetectsCLI()
                 'cli' => ['foo'],
             ],
         ];
-        $request = new CLIRequest(new MockAppConfig());
-        $filters = new Filters((object) $config, $request, $this->response);
+        $this->request = new CLIRequest(new MockAppConfig());
+        $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $expected = [
             'before' => ['foo'],

From 1f4ba303f9ef953fcd932a78f4bc224819fc241d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 26 Oct 2021 15:49:57 +0900
Subject: [PATCH 0569/2325] test: refactor: reset $_SERVER

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

diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index 302aa985e474..ce01c7757004 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -50,11 +50,19 @@ protected function setUp(): void
 
         Services::autoloader()->addNamespace($defaults);
 
+        $_SERVER = [];
+
         $this->response = Services::response();
     }
 
     public function testProcessMethodDetectsCLI()
     {
+        $_SERVER['argv'] = [
+            'spark',
+            'list',
+        ];
+        $_SERVER['argc'] = 2;
+
         $config = [
             'aliases' => ['foo' => ''],
             'methods' => [

From 3ea1ede69a0c78f33251ef6ba0fde57d19274188 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 26 Oct 2021 15:50:44 +0900
Subject: [PATCH 0570/2325] test: refactor: change the position of line breaks

Separate arrange, act, assert.
---
 tests/system/Filters/FiltersTest.php | 92 +++++++++++-----------------
 1 file changed, 36 insertions(+), 56 deletions(-)

diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index ce01c7757004..57c3f06753f3 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -40,6 +40,7 @@ final class FiltersTest extends CIUnitTestCase
     protected function setUp(): void
     {
         parent::setUp();
+
         $this->resetServices();
 
         $defaults = [
@@ -47,7 +48,6 @@ protected function setUp(): void
             'App'           => APPPATH,
             'Tests\Support' => TESTPATH . '_support',
         ];
-
         Services::autoloader()->addNamespace($defaults);
 
         $_SERVER = [];
@@ -76,7 +76,6 @@ public function testProcessMethodDetectsCLI()
             'before' => ['foo'],
             'after'  => [],
         ];
-
         $this->assertSame($expected, $filters->initialize()->getFilters());
     }
 
@@ -97,7 +96,6 @@ public function testProcessMethodDetectsGetRequests()
             'before' => ['foo'],
             'after'  => [],
         ];
-
         $this->assertSame($expected, $filters->initialize()->getFilters());
     }
 
@@ -122,7 +120,6 @@ public function testProcessMethodRespectsMethod()
             'before' => ['bar'],
             'after'  => [],
         ];
-
         $this->assertSame($expected, $filters->initialize()->getFilters());
     }
 
@@ -147,7 +144,6 @@ public function testProcessMethodIgnoresMethod()
             'before' => [],
             'after'  => [],
         ];
-
         $this->assertSame($expected, $filters->initialize()->getFilters());
     }
 
@@ -181,7 +177,6 @@ public function testProcessMethodProcessGlobals()
             ],
             'after' => ['baz'],
         ];
-
         $this->assertSame($expected, $filters->initialize()->getFilters());
     }
 
@@ -222,15 +217,14 @@ public function testProcessMethodProcessGlobalsWithExcept(array $except)
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'admin/foo/bar';
 
+        $uri      = 'admin/foo/bar';
         $expected = [
             'before' => [
                 'bar',
             ],
             'after' => ['baz'],
         ];
-
         $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
@@ -253,13 +247,12 @@ public function testProcessMethodProcessesFiltersBefore()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'admin/foo/bar';
 
+        $uri      = 'admin/foo/bar';
         $expected = [
             'before' => ['foo'],
             'after'  => [],
         ];
-
         $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
@@ -282,15 +275,14 @@ public function testProcessMethodProcessesFiltersAfter()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'users/foo/bar';
 
+        $uri      = 'users/foo/bar';
         $expected = [
             'before' => [],
             'after'  => [
                 'foo',
             ],
         ];
-
         $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
@@ -329,8 +321,8 @@ public function testProcessMethodProcessesCombined()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'admin/foo/bar';
 
+        $uri      = 'admin/foo/bar';
         $expected = [
             'before' => [
                 'barg',
@@ -339,7 +331,6 @@ public function testProcessMethodProcessesCombined()
             ],
             'after' => ['bazg'],
         ];
-
         $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
@@ -371,8 +362,8 @@ public function testProcessMethodProcessesCombinedAfterForToolbar()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'admin/foo/bar';
 
+        $uri      = 'admin/foo/bar';
         $expected = [
             'before' => ['bar'],
             'after'  => [
@@ -381,7 +372,6 @@ public function testProcessMethodProcessesCombinedAfterForToolbar()
                 'toolbar',
             ],
         ];
-
         $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
@@ -400,8 +390,8 @@ public function testRunThrowsWithInvalidAlias()
         $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $this->expectException(FilterException::class);
-        $uri = 'admin/foo/bar';
 
+        $uri = 'admin/foo/bar';
         $filters->run($uri);
     }
 
@@ -418,8 +408,8 @@ public function testCustomFiltersLoad()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'admin/foo/bar';
 
+        $uri     = 'admin/foo/bar';
         $request = $filters->run($uri, 'before');
 
         $this->assertSame('http://hellowworld.com', $request->url);
@@ -440,8 +430,8 @@ public function testRunThrowsWithInvalidClassType()
         $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $this->expectException(FilterException::class);
-        $uri = 'admin/foo/bar';
 
+        $uri = 'admin/foo/bar';
         $filters->run($uri);
     }
 
@@ -458,8 +448,8 @@ public function testRunDoesBefore()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'admin/foo/bar';
 
+        $uri     = 'admin/foo/bar';
         $request = $filters->run($uri, 'before');
 
         $this->assertSame('http://google.com', $request->url);
@@ -478,8 +468,8 @@ public function testRunDoesAfter()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'admin/foo/bar';
 
+        $uri      = 'admin/foo/bar';
         $response = $filters->run($uri, 'after');
 
         $this->assertSame('http://google.com', $response->csp);
@@ -498,9 +488,10 @@ public function testShortCircuit()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'admin/foo/bar';
 
+        $uri      = 'admin/foo/bar';
         $response = $filters->run($uri, 'before');
+
         $this->assertTrue($response instanceof ResponseInterface);
         $this->assertSame('http://google.com', $response->csp);
     }
@@ -524,8 +515,8 @@ public function testOtherResult()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'admin/foo/bar';
 
+        $uri      = 'admin/foo/bar';
         $response = $filters->run($uri, 'before');
 
         $this->assertSame('This is curious', $response);
@@ -553,15 +544,14 @@ public function testBeforeExceptString()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'admin/foo/bar';
 
+        $uri      = 'admin/foo/bar';
         $expected = [
             'before' => [
                 'bar',
             ],
             'after' => ['baz'],
         ];
-
         $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
@@ -587,8 +577,8 @@ public function testBeforeExceptInapplicable()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'admin/foo/bar';
 
+        $uri      = 'admin/foo/bar';
         $expected = [
             'before' => [
                 'foo',
@@ -596,7 +586,6 @@ public function testBeforeExceptInapplicable()
             ],
             'after' => ['baz'],
         ];
-
         $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
@@ -622,15 +611,14 @@ public function testAfterExceptString()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'admin/foo/bar';
 
+        $uri      = 'admin/foo/bar';
         $expected = [
             'before' => [
                 'bar',
             ],
             'after' => ['baz'],
         ];
-
         $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
@@ -656,8 +644,8 @@ public function testAfterExceptInapplicable()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'admin/foo/bar';
 
+        $uri      = 'admin/foo/bar';
         $expected = [
             'before' => [
                 'bar',
@@ -667,7 +655,6 @@ public function testAfterExceptInapplicable()
                 'baz',
             ],
         ];
-
         $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
@@ -686,9 +673,7 @@ public function testAddFilter()
         $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $filters = $filters->addFilter('Some\Class', 'some_alias');
-
         $filters = $filters->initialize('admin/foo/bar');
-
         $filters = $filters->getFilters();
 
         $this->assertTrue(in_array('some_alias', $filters['before'], true));
@@ -705,7 +690,6 @@ public function testAddFilterSection()
         $filters = $filters
             ->addFilter('Some\OtherClass', 'another', 'before', 'globals')
             ->initialize('admin/foo/bar');
-
         $list = $filters->getFilters();
 
         $this->assertTrue(in_array('another', $list['before'], true));
@@ -723,7 +707,6 @@ public function testInitializeTwice()
             ->addFilter('Some\OtherClass', 'another', 'before', 'globals')
             ->initialize('admin/foo/bar')
             ->initialize();
-
         $list = $filters->getFilters();
 
         $this->assertTrue(in_array('another', $list['before'], true));
@@ -744,9 +727,7 @@ public function testEnableFilter()
         $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $filters = $filters->initialize('admin/foo/bar');
-
         $filters->enableFilter('google', 'before');
-
         $filters = $filters->getFilters();
 
         $this->assertTrue(in_array('google', $filters['before'], true));
@@ -765,11 +746,10 @@ public function testEnableFilterWithArguments()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $filters       = $filters->initialize('admin/foo/bar');
 
+        $filters = $filters->initialize('admin/foo/bar');
         $filters->enableFilter('role:admin , super', 'before');
         $filters->enableFilter('role:admin , super', 'after');
-
         $found = $filters->getFilters();
 
         $this->assertTrue(in_array('role', $found['before'], true));
@@ -777,9 +757,11 @@ public function testEnableFilterWithArguments()
         $this->assertSame(['role' => ['admin', 'super']], $filters->getArguments());
 
         $response = $filters->run('admin/foo/bar', 'before');
+
         $this->assertSame('admin;super', $response);
 
         $response = $filters->run('admin/foo/bar', 'after');
+
         $this->assertSame('admin;super', $response->getBody());
     }
 
@@ -798,18 +780,18 @@ public function testEnableFilterWithNoArguments()
         $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $filters = $filters->initialize('admin/foo/bar');
-
         $filters->enableFilter('role', 'before');
         $filters->enableFilter('role', 'after');
-
         $found = $filters->getFilters();
 
         $this->assertTrue(in_array('role', $found['before'], true));
 
         $response = $filters->run('admin/foo/bar', 'before');
+
         $this->assertSame('Is null', $response);
 
         $response = $filters->run('admin/foo/bar', 'after');
+
         $this->assertSame('Is null', $response->getBody());
     }
 
@@ -830,7 +812,6 @@ public function testEnableNonFilter()
         $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $filters = $filters->initialize('admin/foo/bar');
-
         $filters->enableFilter('goggle', 'before');
     }
 
@@ -867,8 +848,8 @@ public function testMatchesURICaseInsensitively()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'admin/foo/bar';
 
+        $uri      = 'admin/foo/bar';
         $expected = [
             'before' => [
                 'bar',
@@ -879,7 +860,6 @@ public function testMatchesURICaseInsensitively()
                 'frak',
             ],
         ];
-
         $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
@@ -905,7 +885,9 @@ public function testFilterMatching()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'admin';
+
+        $uri    = 'admin';
+        $actual = $filters->initialize($uri)->getFilters();
 
         $expected = [
             'before' => [
@@ -913,8 +895,6 @@ public function testFilterMatching()
             ],
             'after' => [],
         ];
-
-        $actual = $filters->initialize($uri)->getFilters();
         $this->assertSame($expected, $actual);
     }
 
@@ -944,7 +924,9 @@ public function testGlobalFilterMatching()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'admin';
+
+        $uri    = 'admin';
+        $actual = $filters->initialize($uri)->getFilters();
 
         $expected = [
             'before' => [
@@ -955,8 +937,6 @@ public function testGlobalFilterMatching()
                 'two',
             ],
         ];
-
-        $actual = $filters->initialize($uri)->getFilters();
         $this->assertSame($expected, $actual);
     }
 
@@ -993,8 +973,8 @@ public function testCombinedFilterMatching()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'admin123';
 
+        $uri      = 'admin123';
         $expected = [
             'before' => [
                 'one',
@@ -1005,7 +985,6 @@ public function testCombinedFilterMatching()
                 'two',
             ],
         ];
-
         $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
@@ -1039,8 +1018,8 @@ public function testSegmentedFilterMatching()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'admin/123';
 
+        $uri      = 'admin/123';
         $expected = [
             'before' => [
                 'frak',
@@ -1049,7 +1028,6 @@ public function testSegmentedFilterMatching()
                 'frak',
             ],
         ];
-
         $this->assertSame($expected, $filters->initialize($uri)->getFilters());
     }
 
@@ -1073,9 +1051,10 @@ public function testFilterAlitasMultiple()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'admin/foo/bar';
 
+        $uri     = 'admin/foo/bar';
         $request = $filters->run($uri, 'before');
+
         $this->assertSame('http://exampleMultipleURL.com', $request->url);
         $this->assertSame('http://exampleMultipleCSP.com', $request->csp);
     }
@@ -1099,6 +1078,7 @@ public function testFilterClass()
         $filters       = new Filters((object) $config, $this->request, $this->response);
 
         $filters->run('admin/foo/bar', 'before');
+
         $expected = [
             'before' => [],
             'after'  => [
@@ -1125,8 +1105,8 @@ public function testReset()
         ];
         $this->request = Services::request();
         $filters       = new Filters((object) $config, $this->request, $this->response);
-        $uri           = 'admin';
 
+        $uri = 'admin';
         $this->assertSame(['foo'], $filters->initialize($uri)->getFilters()['before']);
         $this->assertSame([], $filters->reset()->getFilters()['before']);
     }

From 64b37786528de76c3950d3a03b120d24b554d882 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 26 Oct 2021 16:12:42 +0900
Subject: [PATCH 0571/2325] test: refactor: extract createFilters() method

---
 tests/system/Filters/FiltersTest.php | 117 +++++++++++----------------
 1 file changed, 46 insertions(+), 71 deletions(-)

diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index 57c3f06753f3..a1e2f0814588 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -55,6 +55,13 @@ protected function setUp(): void
         $this->response = Services::response();
     }
 
+    private function createFilters($config, $request = null): Filters
+    {
+        $request = $request ?? Services::request();
+
+        return new Filters($config, $request, $this->response);
+    }
+
     public function testProcessMethodDetectsCLI()
     {
         $_SERVER['argv'] = [
@@ -69,8 +76,10 @@ public function testProcessMethodDetectsCLI()
                 'cli' => ['foo'],
             ],
         ];
-        $this->request = new CLIRequest(new MockAppConfig());
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters(
+            (object) $config,
+            new CLIRequest(new MockAppConfig())
+        );
 
         $expected = [
             'before' => ['foo'],
@@ -89,8 +98,7 @@ public function testProcessMethodDetectsGetRequests()
                 'get' => ['foo'],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $expected = [
             'before' => ['foo'],
@@ -113,8 +121,7 @@ public function testProcessMethodRespectsMethod()
                 'get'  => ['bar'],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $expected = [
             'before' => ['bar'],
@@ -137,8 +144,7 @@ public function testProcessMethodIgnoresMethod()
                 'get'  => ['bar'],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $expected = [
             'before' => [],
@@ -167,8 +173,7 @@ public function testProcessMethodProcessGlobals()
                 ],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $expected = [
             'before' => [
@@ -215,8 +220,7 @@ public function testProcessMethodProcessGlobalsWithExcept(array $except)
                 ],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri      = 'admin/foo/bar';
         $expected = [
@@ -245,8 +249,7 @@ public function testProcessMethodProcessesFiltersBefore()
                 ],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri      = 'admin/foo/bar';
         $expected = [
@@ -273,8 +276,7 @@ public function testProcessMethodProcessesFiltersAfter()
                 ],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri      = 'users/foo/bar';
         $expected = [
@@ -319,8 +321,7 @@ public function testProcessMethodProcessesCombined()
                 ],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri      = 'admin/foo/bar';
         $expected = [
@@ -360,8 +361,7 @@ public function testProcessMethodProcessesCombinedAfterForToolbar()
                 ],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri      = 'admin/foo/bar';
         $expected = [
@@ -386,8 +386,7 @@ public function testRunThrowsWithInvalidAlias()
                 'after'  => [],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $this->expectException(FilterException::class);
 
@@ -406,8 +405,7 @@ public function testCustomFiltersLoad()
                 'after'  => [],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri     = 'admin/foo/bar';
         $request = $filters->run($uri, 'before');
@@ -426,8 +424,7 @@ public function testRunThrowsWithInvalidClassType()
                 'after'  => [],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $this->expectException(FilterException::class);
 
@@ -446,8 +443,7 @@ public function testRunDoesBefore()
                 'after'  => [],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri     = 'admin/foo/bar';
         $request = $filters->run($uri, 'before');
@@ -466,8 +462,7 @@ public function testRunDoesAfter()
                 'after'  => ['google'],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri      = 'admin/foo/bar';
         $response = $filters->run($uri, 'after');
@@ -486,8 +481,7 @@ public function testShortCircuit()
                 'after'  => [],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri      = 'admin/foo/bar';
         $response = $filters->run($uri, 'before');
@@ -513,8 +507,7 @@ public function testOtherResult()
                 'after' => [],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri      = 'admin/foo/bar';
         $response = $filters->run($uri, 'before');
@@ -542,8 +535,7 @@ public function testBeforeExceptString()
                 ],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri      = 'admin/foo/bar';
         $expected = [
@@ -575,8 +567,7 @@ public function testBeforeExceptInapplicable()
                 ],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri      = 'admin/foo/bar';
         $expected = [
@@ -609,8 +600,7 @@ public function testAfterExceptString()
                 ],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri      = 'admin/foo/bar';
         $expected = [
@@ -642,8 +632,7 @@ public function testAfterExceptInapplicable()
                 ],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri      = 'admin/foo/bar';
         $expected = [
@@ -669,8 +658,7 @@ public function testAddFilter()
                 'after'  => [],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $filters = $filters->addFilter('Some\Class', 'some_alias');
         $filters = $filters->initialize('admin/foo/bar');
@@ -699,9 +687,8 @@ public function testInitializeTwice()
     {
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
-        $config        = [];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $config  = [];
+        $filters = $this->createFilters((object) $config);
 
         $filters = $filters
             ->addFilter('Some\OtherClass', 'another', 'before', 'globals')
@@ -723,8 +710,7 @@ public function testEnableFilter()
                 'after'  => [],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $filters = $filters->initialize('admin/foo/bar');
         $filters->enableFilter('google', 'before');
@@ -744,8 +730,7 @@ public function testEnableFilterWithArguments()
                 'after'  => [],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $filters = $filters->initialize('admin/foo/bar');
         $filters->enableFilter('role:admin , super', 'before');
@@ -776,8 +761,7 @@ public function testEnableFilterWithNoArguments()
                 'after'  => [],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $filters = $filters->initialize('admin/foo/bar');
         $filters->enableFilter('role', 'before');
@@ -808,8 +792,7 @@ public function testEnableNonFilter()
                 'after'  => [],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $filters = $filters->initialize('admin/foo/bar');
         $filters->enableFilter('goggle', 'before');
@@ -846,8 +829,7 @@ public function testMatchesURICaseInsensitively()
                 ],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri      = 'admin/foo/bar';
         $expected = [
@@ -883,8 +865,7 @@ public function testFilterMatching()
                 ],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri    = 'admin';
         $actual = $filters->initialize($uri)->getFilters();
@@ -922,8 +903,7 @@ public function testGlobalFilterMatching()
                 ],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri    = 'admin';
         $actual = $filters->initialize($uri)->getFilters();
@@ -971,8 +951,7 @@ public function testCombinedFilterMatching()
                 ],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri      = 'admin123';
         $expected = [
@@ -1016,8 +995,7 @@ public function testSegmentedFilterMatching()
                 ],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri      = 'admin/123';
         $expected = [
@@ -1049,8 +1027,7 @@ public function testFilterAlitasMultiple()
                 ],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri     = 'admin/foo/bar';
         $request = $filters->run($uri, 'before');
@@ -1074,8 +1051,7 @@ public function testFilterClass()
                 ],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $filters->run('admin/foo/bar', 'before');
 
@@ -1103,8 +1079,7 @@ public function testReset()
                 ],
             ],
         ];
-        $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filters = $this->createFilters((object) $config);
 
         $uri = 'admin';
         $this->assertSame(['foo'], $filters->initialize($uri)->getFilters()['before']);

From df72c88730dde34778aa73db4c08e7ec51a29ada Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 26 Oct 2021 16:17:19 +0900
Subject: [PATCH 0572/2325] test: refactor: use ::class keyword

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

diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index a1e2f0814588..1a7036c29163 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -781,7 +781,7 @@ public function testEnableFilterWithNoArguments()
 
     public function testEnableNonFilter()
     {
-        $this->expectException('CodeIgniter\Filters\Exceptions\FilterException');
+        $this->expectException(FilterException::class);
 
         $_SERVER['REQUEST_METHOD'] = 'GET';
 

From 908c5627c4410175cf0e38e08acb74a7e7bd021a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 26 Oct 2021 16:21:12 +0900
Subject: [PATCH 0573/2325] test: refactor: remove unused property

---
 tests/system/Filters/FiltersTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index 1a7036c29163..9ae75c58daee 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -34,7 +34,6 @@
  */
 final class FiltersTest extends CIUnitTestCase
 {
-    protected $request;
     protected $response;
 
     protected function setUp(): void

From 01fc23707987243f3751dfef9c595e96173c865e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 28 Oct 2021 10:20:11 +0900
Subject: [PATCH 0574/2325] test: refactor: fix wrong config class type

---
 tests/system/Filters/FiltersTest.php | 148 ++++++++++++++++++++-------
 1 file changed, 109 insertions(+), 39 deletions(-)

diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index 9ae75c58daee..8876a3c46956 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -17,6 +17,8 @@
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockAppConfig;
+use Config\Filters as FiltersConfig;
+use LogicException;
 
 require_once __DIR__ . '/fixtures/GoogleMe.php';
 require_once __DIR__ . '/fixtures/GoogleYou.php';
@@ -54,13 +56,37 @@ protected function setUp(): void
         $this->response = Services::response();
     }
 
-    private function createFilters($config, $request = null): Filters
+    private function createFilters(FiltersConfig $config, $request = null): Filters
     {
         $request = $request ?? Services::request();
 
         return new Filters($config, $request, $this->response);
     }
 
+    /**
+     * @template T
+     *
+     * @param class-string<T> $classname
+     *
+     * @return T
+     */
+    private function createConfigFromArray(string $classname, array $config)
+    {
+        $configObj = new $classname();
+
+        foreach ($config as $key => $value) {
+            if (property_exists($configObj, $key)) {
+                $configObj->{$key} = $value;
+            } else {
+                throw new LogicException(
+                    'No such property: ' . $classname . '::$' . $key
+                );
+            }
+        }
+
+        return $configObj;
+    }
+
     public function testProcessMethodDetectsCLI()
     {
         $_SERVER['argv'] = [
@@ -71,12 +97,14 @@ public function testProcessMethodDetectsCLI()
 
         $config = [
             'aliases' => ['foo' => ''],
+            'globals' => [],
             'methods' => [
                 'cli' => ['foo'],
             ],
         ];
-        $filters = $this->createFilters(
-            (object) $config,
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters(
+            $filtersConfig,
             new CLIRequest(new MockAppConfig())
         );
 
@@ -93,11 +121,13 @@ public function testProcessMethodDetectsGetRequests()
 
         $config = [
             'aliases' => ['foo' => ''],
+            'globals' => [],
             'methods' => [
                 'get' => ['foo'],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $expected = [
             'before' => ['foo'],
@@ -115,12 +145,14 @@ public function testProcessMethodRespectsMethod()
                 'foo' => '',
                 'bar' => '',
             ],
+            'globals' => [],
             'methods' => [
                 'post' => ['foo'],
                 'get'  => ['bar'],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $expected = [
             'before' => ['bar'],
@@ -138,12 +170,14 @@ public function testProcessMethodIgnoresMethod()
                 'foo' => '',
                 'bar' => '',
             ],
+            'globals' => [],
             'methods' => [
                 'post' => ['foo'],
                 'get'  => ['bar'],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $expected = [
             'before' => [],
@@ -172,7 +206,8 @@ public function testProcessMethodProcessGlobals()
                 ],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $expected = [
             'before' => [
@@ -219,7 +254,8 @@ public function testProcessMethodProcessGlobalsWithExcept(array $except)
                 ],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri      = 'admin/foo/bar';
         $expected = [
@@ -241,6 +277,7 @@ public function testProcessMethodProcessesFiltersBefore()
                 'bar' => '',
                 'baz' => '',
             ],
+            'globals' => [],
             'filters' => [
                 'foo' => [
                     'before' => ['admin/*'],
@@ -248,7 +285,8 @@ public function testProcessMethodProcessesFiltersBefore()
                 ],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri      = 'admin/foo/bar';
         $expected = [
@@ -268,6 +306,7 @@ public function testProcessMethodProcessesFiltersAfter()
                 'bar' => '',
                 'baz' => '',
             ],
+            'globals' => [],
             'filters' => [
                 'foo' => [
                     'before' => ['admin/*'],
@@ -275,7 +314,8 @@ public function testProcessMethodProcessesFiltersAfter()
                 ],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri      = 'users/foo/bar';
         $expected = [
@@ -320,7 +360,8 @@ public function testProcessMethodProcessesCombined()
                 ],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri      = 'admin/foo/bar';
         $expected = [
@@ -360,7 +401,8 @@ public function testProcessMethodProcessesCombinedAfterForToolbar()
                 ],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri      = 'admin/foo/bar';
         $expected = [
@@ -385,7 +427,8 @@ public function testRunThrowsWithInvalidAlias()
                 'after'  => [],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $this->expectException(FilterException::class);
 
@@ -404,7 +447,8 @@ public function testCustomFiltersLoad()
                 'after'  => [],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri     = 'admin/foo/bar';
         $request = $filters->run($uri, 'before');
@@ -423,7 +467,8 @@ public function testRunThrowsWithInvalidClassType()
                 'after'  => [],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $this->expectException(FilterException::class);
 
@@ -442,7 +487,8 @@ public function testRunDoesBefore()
                 'after'  => [],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri     = 'admin/foo/bar';
         $request = $filters->run($uri, 'before');
@@ -461,7 +507,8 @@ public function testRunDoesAfter()
                 'after'  => ['google'],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri      = 'admin/foo/bar';
         $response = $filters->run($uri, 'after');
@@ -480,7 +527,8 @@ public function testShortCircuit()
                 'after'  => [],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri      = 'admin/foo/bar';
         $response = $filters->run($uri, 'before');
@@ -506,7 +554,8 @@ public function testOtherResult()
                 'after' => [],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri      = 'admin/foo/bar';
         $response = $filters->run($uri, 'before');
@@ -534,7 +583,8 @@ public function testBeforeExceptString()
                 ],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri      = 'admin/foo/bar';
         $expected = [
@@ -566,7 +616,8 @@ public function testBeforeExceptInapplicable()
                 ],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri      = 'admin/foo/bar';
         $expected = [
@@ -599,7 +650,8 @@ public function testAfterExceptString()
                 ],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri      = 'admin/foo/bar';
         $expected = [
@@ -631,7 +683,8 @@ public function testAfterExceptInapplicable()
                 ],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri      = 'admin/foo/bar';
         $expected = [
@@ -657,7 +710,8 @@ public function testAddFilter()
                 'after'  => [],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $filters = $filters->addFilter('Some\Class', 'some_alias');
         $filters = $filters->initialize('admin/foo/bar');
@@ -672,7 +726,8 @@ public function testAddFilterSection()
 
         $config        = [];
         $this->request = Services::request();
-        $filters       = new Filters((object) $config, $this->request, $this->response);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = new Filters($filtersConfig, $this->request, $this->response);
 
         $filters = $filters
             ->addFilter('Some\OtherClass', 'another', 'before', 'globals')
@@ -686,8 +741,9 @@ public function testInitializeTwice()
     {
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
-        $config  = [];
-        $filters = $this->createFilters((object) $config);
+        $config        = [];
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $filters = $filters
             ->addFilter('Some\OtherClass', 'another', 'before', 'globals')
@@ -709,7 +765,8 @@ public function testEnableFilter()
                 'after'  => [],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $filters = $filters->initialize('admin/foo/bar');
         $filters->enableFilter('google', 'before');
@@ -729,7 +786,8 @@ public function testEnableFilterWithArguments()
                 'after'  => [],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $filters = $filters->initialize('admin/foo/bar');
         $filters->enableFilter('role:admin , super', 'before');
@@ -760,7 +818,8 @@ public function testEnableFilterWithNoArguments()
                 'after'  => [],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $filters = $filters->initialize('admin/foo/bar');
         $filters->enableFilter('role', 'before');
@@ -791,7 +850,8 @@ public function testEnableNonFilter()
                 'after'  => [],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $filters = $filters->initialize('admin/foo/bar');
         $filters->enableFilter('goggle', 'before');
@@ -828,7 +888,8 @@ public function testMatchesURICaseInsensitively()
                 ],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri      = 'admin/foo/bar';
         $expected = [
@@ -857,6 +918,7 @@ public function testFilterMatching()
                 'bar'  => '',
                 'frak' => '',
             ],
+            'globals' => [],
             'filters' => [
                 'frak' => [
                     'before' => ['admin*'],
@@ -864,7 +926,8 @@ public function testFilterMatching()
                 ],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri    = 'admin';
         $actual = $filters->initialize($uri)->getFilters();
@@ -902,7 +965,8 @@ public function testGlobalFilterMatching()
                 ],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri    = 'admin';
         $actual = $filters->initialize($uri)->getFilters();
@@ -950,7 +1014,8 @@ public function testCombinedFilterMatching()
                 ],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri      = 'admin123';
         $expected = [
@@ -994,7 +1059,8 @@ public function testSegmentedFilterMatching()
                 ],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri      = 'admin/123';
         $expected = [
@@ -1026,7 +1092,8 @@ public function testFilterAlitasMultiple()
                 ],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri     = 'admin/foo/bar';
         $request = $filters->run($uri, 'before');
@@ -1050,7 +1117,8 @@ public function testFilterClass()
                 ],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $filters->run('admin/foo/bar', 'before');
 
@@ -1072,13 +1140,15 @@ public function testReset()
             'aliases' => [
                 'foo' => '',
             ],
+            'globals' => [],
             'filters' => [
                 'foo' => [
                     'before' => ['admin*'],
                 ],
             ],
         ];
-        $filters = $this->createFilters((object) $config);
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
 
         $uri = 'admin';
         $this->assertSame(['foo'], $filters->initialize($uri)->getFilters()['before']);

From 1d9c1b6e2b98972a528c9162caa5a6c4e24345a2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 28 Oct 2021 10:28:48 +0900
Subject: [PATCH 0575/2325] test: refactor: remove $this->request that I forgot
 to remove

---
 tests/system/Filters/FiltersTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index 8876a3c46956..1ef5e0293c01 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -725,9 +725,8 @@ public function testAddFilterSection()
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
         $config        = [];
-        $this->request = Services::request();
         $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
-        $filters       = new Filters($filtersConfig, $this->request, $this->response);
+        $filters       = $this->createFilters($filtersConfig);
 
         $filters = $filters
             ->addFilter('Some\OtherClass', 'another', 'before', 'globals')

From 24713d43aec82f675e4a510e01343e2cf2b19104 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 28 Oct 2021 10:33:37 +0900
Subject: [PATCH 0576/2325] test: refactor: use method chaining

---
 tests/system/Filters/FiltersTest.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index 1ef5e0293c01..7cd014968e3d 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -728,10 +728,10 @@ public function testAddFilterSection()
         $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
         $filters       = $this->createFilters($filtersConfig);
 
-        $filters = $filters
+        $list = $filters
             ->addFilter('Some\OtherClass', 'another', 'before', 'globals')
-            ->initialize('admin/foo/bar');
-        $list = $filters->getFilters();
+            ->initialize('admin/foo/bar')
+            ->getFilters();
 
         $this->assertTrue(in_array('another', $list['before'], true));
     }
@@ -744,11 +744,11 @@ public function testInitializeTwice()
         $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
         $filters       = $this->createFilters($filtersConfig);
 
-        $filters = $filters
+        $list = $filters
             ->addFilter('Some\OtherClass', 'another', 'before', 'globals')
             ->initialize('admin/foo/bar')
-            ->initialize();
-        $list = $filters->getFilters();
+            ->initialize()
+            ->getFilters();
 
         $this->assertTrue(in_array('another', $list['before'], true));
     }

From 3b2fd6ea3144a75092d12293bf55798845227205 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 1 Nov 2021 09:28:58 +0900
Subject: [PATCH 0577/2325] refactor: remove else

---
 tests/system/Filters/FiltersTest.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index 7cd014968e3d..20fdf8770863 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -77,11 +77,13 @@ private function createConfigFromArray(string $classname, array $config)
         foreach ($config as $key => $value) {
             if (property_exists($configObj, $key)) {
                 $configObj->{$key} = $value;
-            } else {
-                throw new LogicException(
-                    'No such property: ' . $classname . '::$' . $key
-                );
+
+                continue;
             }
+
+            throw new LogicException(
+                'No such property: ' . $classname . '::$' . $key
+            );
         }
 
         return $configObj;

From d1f1f6b2425104a412128331cc3795ec446e1237 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 1 Nov 2021 14:04:14 +0900
Subject: [PATCH 0578/2325] fix: `$this->request->setLocale()` does not work
 for `lang()` in 404 controller

Fixes #5261
---
 system/Exceptions/PageNotFoundException.php | 25 +++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/system/Exceptions/PageNotFoundException.php b/system/Exceptions/PageNotFoundException.php
index 444776c087a2..2a773f1785dc 100644
--- a/system/Exceptions/PageNotFoundException.php
+++ b/system/Exceptions/PageNotFoundException.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Exceptions;
 
+use Config\Services;
 use OutOfBoundsException;
 
 class PageNotFoundException extends OutOfBoundsException implements ExceptionInterface
@@ -26,21 +27,37 @@ class PageNotFoundException extends OutOfBoundsException implements ExceptionInt
 
     public static function forPageNotFound(?string $message = null)
     {
-        return new static($message ?? lang('HTTP.pageNotFound'));
+        return new static($message ?? self::lang('HTTP.pageNotFound'));
     }
 
     public static function forEmptyController()
     {
-        return new static(lang('HTTP.emptyController'));
+        return new static(self::lang('HTTP.emptyController'));
     }
 
     public static function forControllerNotFound(string $controller, string $method)
     {
-        return new static(lang('HTTP.controllerNotFound', [$controller, $method]));
+        return new static(self::lang('HTTP.controllerNotFound', [$controller, $method]));
     }
 
     public static function forMethodNotFound(string $method)
     {
-        return new static(lang('HTTP.methodNotFound', [$method]));
+        return new static(self::lang('HTTP.methodNotFound', [$method]));
+    }
+
+    /**
+     * Get translated system message
+     *
+     * Use a non-shared Language instance in the Services.
+     * If a shared instance is created, the Language will
+     * have the current locale, so even if users call
+     * `$this->request->setLocale()` in the controller afterwards,
+     * the Language locale will not be changed.
+     */
+    private static function lang(string $line, array $args = []): string
+    {
+        $lang = Services::language(null, false);
+
+        return $lang->getLine($line, $args);
     }
 }

From 51966d0c407866f2bdc0dda39a714c0cec8d35aa Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sun, 31 Oct 2021 20:17:00 +0800
Subject: [PATCH 0579/2325] Convert bug report to new syntax

---
 .github/ISSUE_TEMPLATE/bug_report.md  | 40 -----------
 .github/ISSUE_TEMPLATE/bug_report.yml | 99 +++++++++++++++++++++++++++
 2 files changed, 99 insertions(+), 40 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index dc6c9e37de1f..000000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: 'Bug: '
-labels: bug
-assignees: ''
-
----
-
----
-name: Bug report
-about: Help us improve the framework by reporting bugs!
-
----
-
-**Direction**
-We use github issues to track bugs, not for support.  
-If you have a support question, or a feature request, raise these as threads on our
-[forum](https://forum.codeigniter.com/index.php).
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**CodeIgniter 4 version**
-Which version (and branch, if applicable) the bug is in.
-
-**Affected module(s)**
-Which package or class is the bug in, if known.
-
-**Expected behavior, and steps to reproduce if appropriate**
-A clear and concise description of what you expected to happen,
-and how you got there.  
-Feel free to include a text/log extract, but use a pastebin facility for any
-screenshots you deem necessary.
-
-**Context**
- - OS: [e.g. Windows 99]
- - Web server: [e.g. Apache 1.2.3]
- - PHP version: [e.g. 6.5.4]
- - Database:  [e.g. MySQL]
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000000..c20dd368f41a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,99 @@
+name: Bug report
+description: Create a report to help us improve CodeIgniter
+title: "Bug: "
+labels: ['bug']
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report! Before you begin, please
+        ensure that there are no existing issues, whether still open or closed, related
+        to your report. If there is, your report will be closed promptly.
+
+  - type: dropdowm
+    id: php-version
+    attributes:
+      label: PHP Version
+      description: Which PHP versions did you run your code?
+      multiple: true
+      options:
+        - '7.3'
+        - '7.4'
+        - '8.0'
+        - '8.1'
+    validations:
+      required: true
+
+  - type: input
+    id: codeigniter-version
+    attributes:
+      label: CodeIgniter4 Version
+    validations:
+      required: true
+
+  - type: dropdown
+    id: operating-systems
+    attributes:
+      label: Which operating systems have you tested for this bug?
+      description: You may select more than one.
+      multiple: true
+      options:
+        - macOS
+        - Windows
+        - Linux
+    validations:
+      required: true
+
+  - type: dropdown
+    id: server
+    attributes:
+      label: Which server did you use?
+      options:
+        - apache
+        - cli
+        - cli-server (PHP built-in webserver)
+        - cgi-fcgi
+        - fpm-fcgi
+        - phpdbg
+    validations:
+      required: true
+
+  - type: input
+    id: database
+    attributes:
+      label: Database
+    validations:
+      required: false
+
+  - type: textarea
+    id: description
+    attributes:
+      label: What happened?
+      placeholder: Tell us what you see!
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to Reproduce
+      description: Steps to reproduce the behavior.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Expected Output
+      description: What do you expect to happen instead of this filed bug?
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Anything else?
+      description: |
+        Links? References? Anything that will give us more context about the issue you are encountering!
+
+        Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+    validations:
+      required: false

From c833671022b89ba29a01c86ee27260d6d8504f35 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Mon, 1 Nov 2021 13:36:44 +0800
Subject: [PATCH 0580/2325] Fix typo: dropdowm --> dropdown

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index c20dd368f41a..9536a359300b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -11,7 +11,7 @@ body:
         ensure that there are no existing issues, whether still open or closed, related
         to your report. If there is, your report will be closed promptly.
 
-  - type: dropdowm
+  - type: dropdown
     id: php-version
     attributes:
       label: PHP Version

From f2ca146bc68332dacbda5f03792c8b94cf88f1c3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 1 Nov 2021 16:19:11 +0900
Subject: [PATCH 0581/2325] feat: add valid_url_strict rule

Fixes #3156
---
 system/Validation/FormatRules.php             | 31 +++++++-
 tests/system/Validation/FormatRulesTest.php   | 71 +++++++++++++++++--
 .../source/libraries/validation.rst           | 10 ++-
 3 files changed, 104 insertions(+), 8 deletions(-)

diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index 6ee13c3f31df..482765212f0b 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -268,7 +268,10 @@ public function valid_ip(?string $ip = null, ?string $which = null): bool
     }
 
     /**
-     * Checks a URL to ensure it's formed correctly.
+     * Checks a string to ensure it is (loosely) a URL.
+     *
+     * Warning: this rule will pass basic strings like
+     * "banana"; use valid_url_strict for a stricter rule.
      *
      * @param string $str
      */
@@ -291,6 +294,32 @@ public function valid_url(?string $str = null): bool
         return filter_var($str, FILTER_VALIDATE_URL) !== false;
     }
 
+    /**
+     * Checks a URL to ensure it's formed correctly.
+     *
+     * @param string|null $validSchemes comma separated list of allowed schemes
+     */
+    public function valid_url_strict(?string $str = null, ?string $validSchemes = null): bool
+    {
+        if (empty($str)) {
+            return false;
+        }
+
+        if ($validSchemes === null) {
+            $validSchemes = 'http,https,mailto,tel,sms';
+        }
+
+        $scheme           = strtolower(parse_url($str, PHP_URL_SCHEME));
+        $validSchemes     = strtolower($validSchemes);
+        $validSchemeArray = explode(',', $validSchemes);
+
+        if (! in_array(($scheme), $validSchemeArray, true)) {
+            return false;
+        }
+
+        return filter_var($str, FILTER_VALIDATE_URL) !== false;
+    }
+
     /**
      * Checks for a valid date and matches a given date format
      *
diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php
index eb457a0c3a2f..30f89e15df94 100644
--- a/tests/system/Validation/FormatRulesTest.php
+++ b/tests/system/Validation/FormatRulesTest.php
@@ -88,7 +88,7 @@ public function testRegexMatchFalse()
     /**
      * @dataProvider urlProvider
      */
-    public function testValidURL(?string $url, bool $expected)
+    public function testValidURL(?string $url, bool $isLoose, bool $isStrict)
     {
         $data = [
             'foo' => $url,
@@ -98,7 +98,36 @@ public function testValidURL(?string $url, bool $expected)
             'foo' => 'valid_url',
         ]);
 
-        $this->assertSame($expected, $this->validation->run($data));
+        $this->assertSame($isLoose, $this->validation->run($data));
+    }
+
+    /**
+     * @dataProvider urlProvider
+     */
+    public function testValidURLStrict(?string $url, bool $isLoose, bool $isStrict)
+    {
+        $data = [
+            'foo' => $url,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'valid_url_strict',
+        ]);
+
+        $this->assertSame($isStrict, $this->validation->run($data));
+    }
+
+    public function testValidURLStrictWithSchema()
+    {
+        $data = [
+            'foo' => 'http://www.codeigniter.com',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'valid_url_strict[https]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
     }
 
     public function urlProvider()
@@ -107,61 +136,91 @@ public function urlProvider()
             [
                 'www.codeigniter.com',
                 true,
+                false,
             ],
             [
                 'http://codeigniter.com',
                 true,
+                true,
             ],
-            //https://bugs.php.net/bug.php?id=51192
+            // https://bugs.php.net/bug.php?id=51192
             [
                 'http://accept-dashes.tld',
                 true,
+                true,
             ],
             [
                 'http://reject_underscores',
                 false,
+                false,
             ],
-            // https://github.com/codeigniter4/CodeIgniter/issues/4415
+            // https://github.com/bcit-ci/CodeIgniter/issues/4415
             [
                 'http://[::1]/ipv6',
                 true,
+                true,
             ],
             [
                 'htt://www.codeigniter.com',
                 false,
+                false,
             ],
             [
                 '',
                 false,
+                false,
+            ],
+            // https://github.com/codeigniter4/CodeIgniter4/issues/3156
+            [
+                'codeigniter',
+                true,   // What?
+                false,
             ],
             [
                 'code igniter',
                 false,
+                false,
             ],
             [
                 null,
                 false,
+                false,
             ],
             [
                 'http://',
-                true,
-            ], // this is apparently valid!
+                true,   // Why?
+                false,
+            ],
             [
                 'http:///oops.com',
                 false,
+                false,
             ],
             [
                 '123.com',
                 true,
+                false,
             ],
             [
                 'abc.123',
                 true,
+                false,
             ],
             [
                 'http:8080//abc.com',
+                true,   // Insane?
+                false,
+            ],
+            [
+                'mailto:support@codeigniter.com',
+                true,
                 true,
             ],
+            [
+                '//example.com',
+                false,
+                false,
+            ],
         ];
     }
 
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 1779877c50b1..83d22ace13e6 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -860,7 +860,15 @@ valid_emails            No         Fails if any value provided in a comma
 valid_ip                No         Fails if the supplied IP is not valid.        valid_ip[ipv6]
                                    Accepts an optional parameter of ‘ipv4’ or
                                    ‘ipv6’ to specify an IP format.
-valid_url               No         Fails if field does not contain a valid URL.
+valid_url               No         Fails if field does not contain (loosely) a
+                                   URL. Includes simple strings that could be
+                                   hostnames, like "codeigniter".
+valid_url_strict        Yes        Fails if field does not contain a valid URL.  valid_url_strict[http,https]
+                                   Roughly equivalent to a "fail anything that
+                                   would not be a clickable link." You can
+                                   optionally specify a list of valid schemas.
+                                   If not specified,
+                                   ``http,https,mailto,tel,sms`` are valid.
 valid_date              No         Fails if field does not contain a valid date. valid_date[d/m/Y]
                                    Accepts an optional parameter to matches
                                    a date format.

From 10b3de20a43759dc38c501948fa742936fd0967a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 14 Oct 2021 20:41:45 +0900
Subject: [PATCH 0582/2325] docs: make @return strict

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

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 886ce928e132..b26c98189d20 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1944,7 +1944,7 @@ protected function validateUpdate(): bool
      *
      * @throws DatabaseException
      *
-     * @return mixed Number of rows affected, SQL string, or FALSE on failure
+     * @return false|int|string[] Number of rows affected or FALSE on failure, SQL array when testMode
      */
     public function updateBatch(?array $set = null, ?string $index = null, int $batchSize = 100)
     {

From 0f3088c2786c5bc66f39b1857659ca99c47bcdd0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 14 Oct 2021 20:46:01 +0900
Subject: [PATCH 0583/2325] fix: make the return type of insertBatch() the same
 as updateBatch()

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

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index b26c98189d20..da826824d18d 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1590,7 +1590,7 @@ public function getWhere($where = null, ?int $limit = null, ?int $offset = 0, bo
      *
      * @throws DatabaseException
      *
-     * @return false|int Number of rows inserted or FALSE on failure
+     * @return false|int|string[] Number of rows inserted or FALSE on failure, SQL array when testMode
      */
     public function insertBatch(?array $set = null, ?bool $escape = null, int $batchSize = 100)
     {
@@ -1617,12 +1617,13 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
         $table = $this->QBFrom[0];
 
         $affectedRows = 0;
+        $savedSQL     = [];
 
         for ($i = 0, $total = count($this->QBSet); $i < $total; $i += $batchSize) {
             $sql = $this->_insertBatch($this->db->protectIdentifiers($table, true, null, false), $this->QBKeys, array_slice($this->QBSet, $i, $batchSize));
 
             if ($this->testMode) {
-                $affectedRows++;
+                $savedSQL[] = $sql;
             } else {
                 $this->db->query($sql, $this->binds, false);
                 $affectedRows += $this->db->affectedRows();
@@ -1633,7 +1634,7 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
             $this->resetWrite();
         }
 
-        return $affectedRows;
+        return $this->testMode ? $savedSQL : $affectedRows;
     }
 
     /**

From c18c70ef655ecc0e48149dcf3c510149e27b1d65 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 15 Oct 2021 10:42:13 +0900
Subject: [PATCH 0584/2325] refactor: do not use $this->binds when
 insertBatch()

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

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index da826824d18d..96127360c3fa 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1625,7 +1625,7 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
             if ($this->testMode) {
                 $savedSQL[] = $sql;
             } else {
-                $this->db->query($sql, $this->binds, false);
+                $this->db->query($sql, null, false);
                 $affectedRows += $this->db->affectedRows();
             }
         }
@@ -1679,7 +1679,7 @@ public function setInsertBatch($key, string $value = '', ?bool $escape = null)
             $clean = [];
 
             foreach ($row as $k => $rowValue) {
-                $clean[] = ':' . $this->setBind($k, $rowValue, $escape) . ':';
+                $clean[] = $escape ? $this->db->escape($rowValue) : $rowValue;
             }
 
             $row = $clean;

From acd566de40d61b78f3a96a86ca711b016cec2832 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 15 Oct 2021 10:59:08 +0900
Subject: [PATCH 0585/2325] refactor: reduce memory useage when insertBatch()
 with $set is not null

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

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 96127360c3fa..d28cabb570f4 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1610,17 +1610,27 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
 
                 return false; // @codeCoverageIgnore
             }
-
-            $this->setInsertBatch($set, '', $escape);
         }
 
+        $hasQBSet = ($set === null);
+
         $table = $this->QBFrom[0];
 
         $affectedRows = 0;
         $savedSQL     = [];
 
-        for ($i = 0, $total = count($this->QBSet); $i < $total; $i += $batchSize) {
-            $sql = $this->_insertBatch($this->db->protectIdentifiers($table, true, null, false), $this->QBKeys, array_slice($this->QBSet, $i, $batchSize));
+        if ($hasQBSet) {
+            $set = $this->QBSet;
+        }
+
+        for ($i = 0, $total = count($set); $i < $total; $i += $batchSize) {
+            if ($hasQBSet) {
+                $QBSet = array_slice($this->QBSet, $i, $batchSize);
+            } else {
+                $this->setInsertBatch(array_slice($set, $i, $batchSize), '', $escape);
+                $QBSet = $this->QBSet;
+            }
+            $sql = $this->_insertBatch($this->db->protectIdentifiers($table, true, null, false), $this->QBKeys, $QBSet);
 
             if ($this->testMode) {
                 $savedSQL[] = $sql;
@@ -1628,6 +1638,10 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
                 $this->db->query($sql, null, false);
                 $affectedRows += $this->db->affectedRows();
             }
+
+            if (! $hasQBSet) {
+                $this->resetWrite();
+            }
         }
 
         if (! $this->testMode) {

From bc36f0ca3ffa38693e1df49e775a726f4af02467 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 15 Oct 2021 11:10:10 +0900
Subject: [PATCH 0586/2325] refactor: resetWrite() when testMode

No need to keep write values even if testMode.
---
 system/Database/BaseBuilder.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index d28cabb570f4..73d9a69b7196 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1644,9 +1644,7 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
             }
         }
 
-        if (! $this->testMode) {
-            $this->resetWrite();
-        }
+        $this->resetWrite();
 
         return $this->testMode ? $savedSQL : $affectedRows;
     }

From adbdd7034293528273905bd8711bbf5c755386ed Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 15 Oct 2021 11:29:28 +0900
Subject: [PATCH 0587/2325] refactor: vendor/bin/rector process

---
 system/Database/BaseBuilder.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 73d9a69b7196..9f0d4888b271 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1602,14 +1602,12 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
 
                 return false; // @codeCoverageIgnore
             }
-        } else {
-            if (empty($set)) {
-                if (CI_DEBUG) {
-                    throw new DatabaseException('insertBatch() called with no data');
-                }
-
-                return false; // @codeCoverageIgnore
+        } elseif (empty($set)) {
+            if (CI_DEBUG) {
+                throw new DatabaseException('insertBatch() called with no data');
             }
+
+            return false; // @codeCoverageIgnore
         }
 
         $hasQBSet = ($set === null);
@@ -1690,7 +1688,7 @@ public function setInsertBatch($key, string $value = '', ?bool $escape = null)
 
             $clean = [];
 
-            foreach ($row as $k => $rowValue) {
+            foreach ($row as $rowValue) {
                 $clean[] = $escape ? $this->db->escape($rowValue) : $rowValue;
             }
 

From 8ce784756b39222e1a62faf06304b955a54f5ded Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 15 Oct 2021 11:38:12 +0900
Subject: [PATCH 0588/2325] test: remove tests for getOriginalQuery()

Now do not use binds to reduce memory useage.
---
 tests/system/Database/Builder/InsertTest.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php
index d9c0c79e11e6..2905fe222613 100644
--- a/tests/system/Database/Builder/InsertTest.php
+++ b/tests/system/Database/Builder/InsertTest.php
@@ -91,9 +91,6 @@ public function testInsertBatch()
         $query = $this->db->getLastQuery();
         $this->assertInstanceOf(Query::class, $query);
 
-        $raw = 'INSERT INTO "jobs" ("description", "id", "name") VALUES (:description:,:id:,:name:), (:description.1:,:id.1:,:name.1:)';
-        $this->assertSame($raw, str_replace("\n", ' ', $query->getOriginalQuery()));
-
         $expected = "INSERT INTO \"jobs\" (\"description\", \"id\", \"name\") VALUES ('There''s something in your teeth',2,'Commedian'), ('I am yellow',3,'Cab Driver')";
         $this->assertSame($expected, str_replace("\n", ' ', $query->getQuery()));
     }
@@ -121,9 +118,6 @@ public function testInsertBatchWithoutEscape()
         $query = $this->db->getLastQuery();
         $this->assertInstanceOf(Query::class, $query);
 
-        $raw = 'INSERT INTO "jobs" ("description", "id", "name") VALUES (:description:,:id:,:name:), (:description.1:,:id.1:,:name.1:)';
-        $this->assertSame($raw, str_replace("\n", ' ', $query->getOriginalQuery()));
-
         $expected = 'INSERT INTO "jobs" ("description", "id", "name") VALUES (1 + 2,2,1 + 1), (2 + 2,3,2 + 1)';
         $this->assertSame($expected, str_replace("\n", ' ', $query->getQuery()));
     }
@@ -148,9 +142,6 @@ public function testInsertBatchWithFieldsEndingInNumbers()
         $query = $this->db->getLastQuery();
         $this->assertInstanceOf(Query::class, $query);
 
-        $raw = 'INSERT INTO "ip_table" ("ip", "ip2") VALUES (:ip:,:ip2:), (:ip.1:,:ip2.1:), (:ip.2:,:ip2.2:), (:ip.3:,:ip2.3:)';
-        $this->assertSame($raw, str_replace("\n", ' ', $query->getOriginalQuery()));
-
         $expected = "INSERT INTO \"ip_table\" (\"ip\", \"ip2\") VALUES ('1.1.1.0','1.1.1.2'), ('2.2.2.0','2.2.2.2'), ('3.3.3.0','3.3.3.2'), ('4.4.4.0','4.4.4.2')";
         $this->assertSame($expected, str_replace("\n", ' ', $query->getQuery()));
     }

From 516555059753240a1035a77cb88e7cc9f186e9ce Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 15 Oct 2021 11:41:52 +0900
Subject: [PATCH 0589/2325] refactor: do not use $this->binds when
 updateBatch()

To reduce memory consumption.
---
 system/Database/BaseBuilder.php              |  5 ++--
 tests/system/Database/Builder/UpdateTest.php | 26 --------------------
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 9f0d4888b271..58459c37cd4c 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -2076,9 +2076,8 @@ public function setUpdateBatch($key, string $index = '', ?bool $escape = null)
                     $indexSet = true;
                 }
 
-                $bind = $this->setBind($k2, $v2, $escape);
-
-                $clean[$this->db->protectIdentifiers($k2, false)] = ":{$bind}:";
+                $clean[$this->db->protectIdentifiers($k2, false)]
+                    = $escape ? $this->db->escape($v2) : $v2;
             }
 
             if ($indexSet === false) {
diff --git a/tests/system/Database/Builder/UpdateTest.php b/tests/system/Database/Builder/UpdateTest.php
index 1bf36ffe7b3e..bda9ae49915d 100644
--- a/tests/system/Database/Builder/UpdateTest.php
+++ b/tests/system/Database/Builder/UpdateTest.php
@@ -208,19 +208,6 @@ public function testUpdateBatch()
 
         $space = ' ';
 
-        $expected = <<<EOF
-            UPDATE "jobs" SET "name" = CASE{$space}
-            WHEN "id" = :id: THEN :name:
-            WHEN "id" = :id.1: THEN :name.1:
-            ELSE "name" END, "description" = CASE{$space}
-            WHEN "id" = :id: THEN :description:
-            WHEN "id" = :id.1: THEN :description.1:
-            ELSE "description" END
-            WHERE "id" IN(:id:,:id.1:)
-            EOF;
-
-        $this->assertSame($expected, $query->getOriginalQuery());
-
         $expected = <<<EOF
             UPDATE "jobs" SET "name" = CASE{$space}
             WHEN "id" = 2 THEN 'Comedian'
@@ -261,19 +248,6 @@ public function testSetUpdateBatchWithoutEscape()
 
         $space = ' ';
 
-        $expected = <<<EOF
-            UPDATE "jobs" SET "name" = CASE{$space}
-            WHEN "id" = :id: THEN :name:
-            WHEN "id" = :id.1: THEN :name.1:
-            ELSE "name" END, "description" = CASE{$space}
-            WHEN "id" = :id: THEN :description:
-            WHEN "id" = :id.1: THEN :description.1:
-            ELSE "description" END
-            WHERE "id" IN(:id:,:id.1:)
-            EOF;
-
-        $this->assertSame($expected, $query->getOriginalQuery());
-
         $expected = <<<EOF
             UPDATE "jobs" SET "name" = CASE{$space}
             WHEN "id" = 2 THEN SUBSTRING(name, 1)

From 3ad6c4c92974874b95f9c1930b8729f29f529f76 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 15 Oct 2021 11:51:49 +0900
Subject: [PATCH 0590/2325] refactor: reduce memory useage when updateBatch()
 with $set is not null

---
 system/Database/BaseBuilder.php | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 58459c37cd4c..b20c4779de34 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1975,28 +1975,37 @@ public function updateBatch(?array $set = null, ?string $index = null, int $batc
 
                 return false; // @codeCoverageIgnore
             }
-        } else {
-            if (empty($set)) {
-                if (CI_DEBUG) {
-                    throw new DatabaseException('updateBatch() called with no data');
-                }
-
-                return false; // @codeCoverageIgnore
+        } elseif (empty($set)) {
+            if (CI_DEBUG) {
+                throw new DatabaseException('updateBatch() called with no data');
             }
 
-            $this->setUpdateBatch($set, $index);
+            return false; // @codeCoverageIgnore
         }
 
+        $hasQBSet = ($set === null);
+
         $table = $this->QBFrom[0];
 
         $affectedRows = 0;
         $savedSQL     = [];
         $savedQBWhere = $this->QBWhere;
 
-        for ($i = 0, $total = count($this->QBSet); $i < $total; $i += $batchSize) {
+        if ($hasQBSet) {
+            $set = $this->QBSet;
+        }
+
+        for ($i = 0, $total = count($set); $i < $total; $i += $batchSize) {
+            if ($hasQBSet) {
+                $QBSet = array_slice($this->QBSet, $i, $batchSize);
+            } else {
+                $this->setUpdateBatch(array_slice($set, $i, $batchSize), $index);
+                $QBSet = $this->QBSet;
+            }
+
             $sql = $this->_updateBatch(
                 $table,
-                array_slice($this->QBSet, $i, $batchSize),
+                $QBSet,
                 $this->db->protectIdentifiers($index)
             );
 
@@ -2007,6 +2016,10 @@ public function updateBatch(?array $set = null, ?string $index = null, int $batc
                 $affectedRows += $this->db->affectedRows();
             }
 
+            if (! $hasQBSet) {
+                $this->resetWrite();
+            }
+
             $this->QBWhere = $savedQBWhere;
         }
 

From 1b7bc3d63d000deca412d737172349e1eb2ffa91 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 1 Nov 2021 18:42:59 +0900
Subject: [PATCH 0591/2325] refactor: remove ()

Co-authored-by: Abdul Malik Ikhsan <samsonasik@gmail.com>
---
 system/Database/BaseBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index b20c4779de34..fd71a4afd624 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1983,7 +1983,7 @@ public function updateBatch(?array $set = null, ?string $index = null, int $batc
             return false; // @codeCoverageIgnore
         }
 
-        $hasQBSet = ($set === null);
+        $hasQBSet = $set === null;
 
         $table = $this->QBFrom[0];
 

From 94eaf09a80edaaa04960971c014bf75ad6a87d2b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 1 Nov 2021 19:00:14 +0900
Subject: [PATCH 0592/2325] test: add test for getOriginalQuery()

---
 tests/system/Database/Builder/InsertTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php
index 2905fe222613..5235a3bdbf58 100644
--- a/tests/system/Database/Builder/InsertTest.php
+++ b/tests/system/Database/Builder/InsertTest.php
@@ -91,6 +91,11 @@ public function testInsertBatch()
         $query = $this->db->getLastQuery();
         $this->assertInstanceOf(Query::class, $query);
 
+        $raw = <<<'SQL'
+            INSERT INTO "jobs" ("description", "id", "name") VALUES ('There''s something in your teeth',2,'Commedian'), ('I am yellow',3,'Cab Driver')
+            SQL;
+        $this->assertSame($raw, str_replace("\n", ' ', $query->getOriginalQuery()));
+
         $expected = "INSERT INTO \"jobs\" (\"description\", \"id\", \"name\") VALUES ('There''s something in your teeth',2,'Commedian'), ('I am yellow',3,'Cab Driver')";
         $this->assertSame($expected, str_replace("\n", ' ', $query->getQuery()));
     }

From 5ad421a92ed93aff24470411626a4667c13ca7f2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 1 Nov 2021 19:01:14 +0900
Subject: [PATCH 0593/2325] docs: add breaking changes to changelog

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

diff --git a/user_guide_src/source/changelogs/v4.1.5.rst b/user_guide_src/source/changelogs/v4.1.5.rst
index f763123fbd85..b97885f2a3b0 100644
--- a/user_guide_src/source/changelogs/v4.1.5.rst
+++ b/user_guide_src/source/changelogs/v4.1.5.rst
@@ -14,6 +14,8 @@ BREAKING
 
 - Fixed `a bug <https://github.com/codeigniter4/CodeIgniter4/issues/2913>`_ on CSRF protection. Now CSRF protection works on PUT/PATCH/DELETE requests when CSRF filter is applied. If you use such requests, you need to send CSRF token.
 - In the previous version, if you didn't provide your own headers, ``CURLRequest`` would send the request-headers from the browser, due to a bug. As of this version, it does not send them.
+- Fixed ``BaseBuilder::insertBatch()`` return value. Now it returns SQL string array instead of wrong affected row number when testMode.
+- Because of the optimization, when ``BaseBuilder::insertBatch()`` and ``BaseBuilder::updateBatch()`` are used, the return value of ``$query->getOriginalQuery()`` changed.
 
 Enhancements
 ============

From 6e1194f2ee520b88bd90f2e154b9e195ec117e04 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 1 Nov 2021 19:04:43 +0900
Subject: [PATCH 0594/2325] refactor: remove ()

Co-authored-by: Abdul Malik Ikhsan <samsonasik@gmail.com>
---
 system/Database/BaseBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index fd71a4afd624..74b9dffad0e4 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1610,7 +1610,7 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
             return false; // @codeCoverageIgnore
         }
 
-        $hasQBSet = ($set === null);
+        $hasQBSet = $set === null;
 
         $table = $this->QBFrom[0];
 

From cc5b1d0b6e2319857b1a18e25dd1566d5265ea50 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 1 Nov 2021 19:52:52 +0900
Subject: [PATCH 0595/2325] docs: add breaking changes to upgrade note

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

diff --git a/user_guide_src/source/installation/upgrade_415.rst b/user_guide_src/source/installation/upgrade_415.rst
index 7a8c51f985ae..b6a4007a518b 100644
--- a/user_guide_src/source/installation/upgrade_415.rst
+++ b/user_guide_src/source/installation/upgrade_415.rst
@@ -61,6 +61,14 @@ The bug was fixed. If your requests depend on the headers, your requests might f
 In this case, add the necessary headers manually.
 See `CURLRequest Class <../libraries/curlrequest.html#headers>`_ for how to add.
 
+Query Builder changes
+---------------------
+
+For optimization and a bug fix, the following behaviors, mostly used in testing, have been changed.
+
+- When you use ``insertBatch()`` and ``updateBatch()``, the return value of ``$query->getOriginalQuery()`` changed.
+- If ``testMode`` is ``true``, ``insertBatch()`` will return an SQL string array instead of the number of affected rows that were wrong.
+
 Breaking Enhancements
 =====================
 

From 2165b114ada16045106c327bae48407a5043e90b Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Mon, 1 Nov 2021 23:45:26 +0800
Subject: [PATCH 0596/2325] Enclose the PR template's notes as comments

---
 .github/PULL_REQUEST_TEMPLATE.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 6204913fd437..5b48f145ee3a 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -10,7 +10,7 @@ Explain what you have changed, and why.
 - [ ] User guide updated
 - [ ] Conforms to style guide
 
----------Remove from here down in your description----------
+<!--
 
 **Notes**
 - Pull requests must be in English
@@ -19,3 +19,5 @@ Explain what you have changed, and why.
 - Unsolicited pull requests will be considered, but there is no guarantee of acceptance
 - Pull requests should be from a feature branch in the contributor's fork of the repository
   to the develop branch of the project repository
+
+-->

From b8c1939cf41652caffa8ef17892938ae1bfab44d Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Mon, 1 Nov 2021 23:45:54 +0800
Subject: [PATCH 0597/2325] Simplify logic of `number_to_roman` function

---
 system/Helpers/number_helper.php | 91 +++++++++-----------------------
 1 file changed, 24 insertions(+), 67 deletions(-)

diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
index d7f49c15f852..b3d7c80c6006 100644
--- a/system/Helpers/number_helper.php
+++ b/system/Helpers/number_helper.php
@@ -182,79 +182,36 @@ function format_number(float $num, int $precision = 1, ?string $locale = null, a
      */
     function number_to_roman(string $num): ?string
     {
+        static $map = [
+            'M'  => 1000,
+            'CM' => 900,
+            'D'  => 500,
+            'CD' => 400,
+            'C'  => 100,
+            'XC' => 90,
+            'L'  => 50,
+            'XL' => 40,
+            'X'  => 10,
+            'IX' => 9,
+            'V'  => 5,
+            'IV' => 4,
+            'I'  => 1,
+        ];
+
         $num = (int) $num;
+
         if ($num < 1 || $num > 3999) {
             return null;
         }
 
-        $_number_to_roman = static function ($num, $th) use (&$_number_to_roman) {
-            $return = '';
-            $key1   = null;
-            $key2   = null;
-
-            switch ($th) {
-                case 1:
-                    $key1 = 'I';
-                    $key2 = 'V';
-                    $keyF = 'X';
-                    break;
-
-                case 2:
-                    $key1 = 'X';
-                    $key2 = 'L';
-                    $keyF = 'C';
-                    break;
-
-                case 3:
-                    $key1 = 'C';
-                    $key2 = 'D';
-                    $keyF = 'M';
-                    break;
-
-                case 4:
-                    $key1 = 'M';
-                    break;
-            }
-            $n = $num % 10;
-
-            switch ($n) {
-                case 1:
-                case 2:
-                case 3:
-                    $return = str_repeat($key1, $n);
-                    break;
+        $result = '';
 
-                case 4:
-                    $return = $key1 . $key2;
-                    break;
-
-                case 5:
-                    $return = $key2;
-                    break;
-
-                case 6:
-                case 7:
-                case 8:
-                    $return = $key2 . str_repeat($key1, $n - 5);
-                    break;
-
-                case 9:
-                    $return = $key1 . $keyF; // @phpstan-ignore-line
-                    break;
-            }
-
-            switch ($num) {
-                case 10:
-                    $return = $keyF; // @phpstan-ignore-line
-                    break;
-            }
-            if ($num > 10) {
-                $return = $_number_to_roman($num / 10, ++$th) . $return;
-            }
-
-            return $return;
-        };
+        foreach ($map as $roman => $arabic) {
+            $repeat = (int) floor($num / $arabic);
+            $result .= str_repeat($roman, $repeat);
+            $num %= $arabic;
+        }
 
-        return $_number_to_roman($num, 1);
+        return $result;
     }
 }

From 056846458554549bd665750fcc7389b75ee9a48c Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 1 Nov 2021 23:10:46 +0700
Subject: [PATCH 0598/2325] [Rector] Refactor
 UnderscoreToCamelCaseVariableNameRector so no longer require
 symplify/package-builder

---
 composer.json                                 |  3 +-
 rector.php                                    |  2 -
 ...nderscoreToCamelCaseVariableNameRector.php | 48 +++++++------------
 3 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/composer.json b/composer.json
index d914b452e528..b7b3176e055f 100644
--- a/composer.json
+++ b/composer.json
@@ -24,8 +24,7 @@
         "phpstan/phpstan": "^0.12.91",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.60",
-        "symplify/package-builder": "^9.3"
+        "rector/rector": "0.11.60"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"
diff --git a/rector.php b/rector.php
index 04e761cbf89e..77f8124c7d6f 100644
--- a/rector.php
+++ b/rector.php
@@ -117,8 +117,6 @@
     $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_73);
 
     $services = $containerConfigurator->services();
-    $services->load('Symplify\\PackageBuilder\\', __DIR__ . '/vendor/symplify/package-builder/src');
-
     $services->set(UnderscoreToCamelCaseVariableNameRector::class);
     $services->set(SimplifyUselessVariableRector::class);
     $services->set(RemoveAlwaysElseRector::class);
diff --git a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
index 005355bb7fd6..f87956f758e4 100644
--- a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
+++ b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
@@ -13,7 +13,6 @@
 
 namespace Utils\Rector;
 
-use Nette\Utils\Strings;
 use PhpParser\Comment\Doc;
 use PhpParser\Node;
 use PhpParser\Node\Expr\Variable;
@@ -21,8 +20,7 @@
 use PhpParser\Node\Stmt\Function_;
 use Rector\Core\Php\ReservedKeywordAnalyzer;
 use Rector\Core\Rector\AbstractRector;
-use Rector\NodeTypeResolver\Node\AttributeKey;
-use Symplify\PackageBuilder\Strings\StringFormatConverter;
+use Rector\NodeNestingScope\ParentFinder;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
@@ -43,16 +41,16 @@ final class UnderscoreToCamelCaseVariableNameRector extends AbstractRector
     private $reservedKeywordAnalyzer;
 
     /**
-     * @var StringFormatConverter
+     * @var ParentFinder
      */
-    private $stringFormatConverter;
+    private $parentFinder;
 
     public function __construct(
         ReservedKeywordAnalyzer $reservedKeywordAnalyzer,
-        StringFormatConverter $stringFormatConverter
+        ParentFinder $parentFinder
     ) {
         $this->reservedKeywordAnalyzer = $reservedKeywordAnalyzer;
-        $this->stringFormatConverter   = $stringFormatConverter;
+        $this->parentFinder            = $parentFinder;
     }
 
     public function getRuleDefinition(): RuleDefinition
@@ -100,19 +98,20 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        if (! Strings::contains($nodeName, '_')) {
-            return null;
-        }
-
         if ($this->reservedKeywordAnalyzer->isNativeVariable($nodeName)) {
             return null;
         }
 
-        if ($nodeName[0] === '_') {
+        $underscorePosition = strpos($nodeName, '_');
+        // underscore not found, or in the first char, skip
+        if ($underscorePosition === false || $underscorePosition === 0) {
             return null;
         }
 
-        $camelCaseName = $this->stringFormatConverter->underscoreAndHyphenToCamelCase($nodeName);
+        $replaceUnderscoreToSpace = str_replace('_', ' ', $nodeName);
+        $uppercaseFirstChar       = ucwords($replaceUnderscoreToSpace);
+        $camelCaseName            = lcfirst(str_replace(' ', '', $uppercaseFirstChar));
+
         if ($camelCaseName === 'this') {
             return null;
         }
@@ -125,24 +124,13 @@ public function refactor(Node $node): ?Node
 
     private function updateDocblock(Variable $variable, string $variableName, string $camelCaseName): void
     {
-        $parentNode = $variable->getAttribute(AttributeKey::PARENT_NODE);
-
-        while ($parentNode) {
-            /**
-             * @var ClassMethod|Function_ $parentNode
-             */
-            $parentNode = $parentNode->getAttribute(AttributeKey::PARENT_NODE);
-
-            if ($parentNode instanceof ClassMethod || $parentNode instanceof Function_) {
-                break;
-            }
-        }
+        $parentClassMethodOrFunction = $this->parentFinder->findByTypes($variable, [ClassMethod::class, Function_::class]);
 
-        if ($parentNode === null) {
+        if ($parentClassMethodOrFunction === null) {
             return;
         }
 
-        $docComment = $parentNode->getDocComment();
+        $docComment = $parentClassMethodOrFunction->getDocComment();
         if ($docComment === null) {
             return;
         }
@@ -152,11 +140,11 @@ private function updateDocblock(Variable $variable, string $variableName, string
             return;
         }
 
-        if (! Strings::match($docCommentText, sprintf(self::PARAM_NAME_REGEX, $variableName))) {
+        if (! preg_match(sprintf(self::PARAM_NAME_REGEX, $variableName), $docCommentText)) {
             return;
         }
 
-        $phpDocInfo         = $this->phpDocInfoFactory->createFromNodeOrEmpty($parentNode);
+        $phpDocInfo         = $this->phpDocInfoFactory->createFromNodeOrEmpty($parentClassMethodOrFunction);
         $paramTagValueNodes = $phpDocInfo->getParamTagValueNodes();
 
         foreach ($paramTagValueNodes as $paramTagValueNode) {
@@ -166,6 +154,6 @@ private function updateDocblock(Variable $variable, string $variableName, string
             }
         }
 
-        $parentNode->setDocComment(new Doc($phpDocInfo->getPhpDocNode()->__toString()));
+        $parentClassMethodOrFunction->setDocComment(new Doc($phpDocInfo->getPhpDocNode()->__toString()));
     }
 }

From efb3b4dd288052061019f44d49bedfc37cb43b3e Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 1 Nov 2021 23:48:11 +0700
Subject: [PATCH 0599/2325] cast to int for strpos result

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 utils/Rector/UnderscoreToCamelCaseVariableNameRector.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
index f87956f758e4..f87222bb2d5d 100644
--- a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
+++ b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
@@ -104,7 +104,7 @@ public function refactor(Node $node): ?Node
 
         $underscorePosition = strpos($nodeName, '_');
         // underscore not found, or in the first char, skip
-        if ($underscorePosition === false || $underscorePosition === 0) {
+        if ((int) $underscorePosition === 0) {
             return null;
         }
 

From 9c5f5ccd930fbba7c308837dd6c34ef05e00ca6a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 2 Nov 2021 08:18:01 +0900
Subject: [PATCH 0600/2325] docs: make the description more precise

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

diff --git a/user_guide_src/source/installation/upgrade_415.rst b/user_guide_src/source/installation/upgrade_415.rst
index b6a4007a518b..ac3cdb529d74 100644
--- a/user_guide_src/source/installation/upgrade_415.rst
+++ b/user_guide_src/source/installation/upgrade_415.rst
@@ -66,7 +66,7 @@ Query Builder changes
 
 For optimization and a bug fix, the following behaviors, mostly used in testing, have been changed.
 
-- When you use ``insertBatch()`` and ``updateBatch()``, the return value of ``$query->getOriginalQuery()`` changed.
+- When you use ``insertBatch()`` and ``updateBatch()``, the return value of ``$query->getOriginalQuery()`` has changed. It no longer returns the query with the binded parameters, but the actual query that was run.
 - If ``testMode`` is ``true``, ``insertBatch()`` will return an SQL string array instead of the number of affected rows that were wrong.
 
 Breaking Enhancements

From e08bc930685837000a615b4dd40b67b89d677fae Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 2 Nov 2021 08:20:03 +0900
Subject: [PATCH 0601/2325] docs: make the description more specific

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

diff --git a/user_guide_src/source/changelogs/v4.1.5.rst b/user_guide_src/source/changelogs/v4.1.5.rst
index b97885f2a3b0..34eb8937baf4 100644
--- a/user_guide_src/source/changelogs/v4.1.5.rst
+++ b/user_guide_src/source/changelogs/v4.1.5.rst
@@ -15,7 +15,7 @@ BREAKING
 - Fixed `a bug <https://github.com/codeigniter4/CodeIgniter4/issues/2913>`_ on CSRF protection. Now CSRF protection works on PUT/PATCH/DELETE requests when CSRF filter is applied. If you use such requests, you need to send CSRF token.
 - In the previous version, if you didn't provide your own headers, ``CURLRequest`` would send the request-headers from the browser, due to a bug. As of this version, it does not send them.
 - Fixed ``BaseBuilder::insertBatch()`` return value. Now it returns SQL string array instead of wrong affected row number when testMode.
-- Because of the optimization, when ``BaseBuilder::insertBatch()`` and ``BaseBuilder::updateBatch()`` are used, the return value of ``$query->getOriginalQuery()`` changed.
+- Major optimizations have been made to the way data is processed in ``BaseBuilder::insertBatch()`` and ``BaseBuilder::updateBatch()`` methods. This resulted in reduced memory usage and faster query processing. As a trade-off, the result generated by the ``$query->getOriginalQuery()`` method was changed. It no longer returns the query with the binded parameters, but the actual query that was run.
 
 Enhancements
 ============

From 019ea5acadf7993c0ddaf72c605ac220b709bf88 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 2 Nov 2021 08:36:12 +0900
Subject: [PATCH 0602/2325] refactor: remove if statements

---
 system/Validation/FormatRules.php | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index 482765212f0b..5f6289b41c4c 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -305,19 +305,15 @@ public function valid_url_strict(?string $str = null, ?string $validSchemes = nu
             return false;
         }
 
-        if ($validSchemes === null) {
-            $validSchemes = 'http,https,mailto,tel,sms';
-        }
-
-        $scheme           = strtolower(parse_url($str, PHP_URL_SCHEME));
-        $validSchemes     = strtolower($validSchemes);
-        $validSchemeArray = explode(',', $validSchemes);
-
-        if (! in_array(($scheme), $validSchemeArray, true)) {
-            return false;
-        }
-
-        return filter_var($str, FILTER_VALIDATE_URL) !== false;
+        $scheme       = strtolower(parse_url($str, PHP_URL_SCHEME));
+        $validSchemes = explode(
+            ',',
+            strtolower($validSchemes ?? 'http,https,mailto,tel,sms')
+        );
+
+        return ! in_array($scheme, $validSchemes, true)
+            ? false
+            : filter_var($str, FILTER_VALIDATE_URL) !== false;
     }
 
     /**

From 5b91b08731b90d907a859d3578a1e173a029ffca Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 2 Nov 2021 09:02:55 +0900
Subject: [PATCH 0603/2325] docs: add how to fix code with Rector

---
 contributing/pull_request.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index d08bbd2e035c..e08a5c110558 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -199,6 +199,10 @@ Rector, on the other hand, can be run on the specific files you modified or adde
 
 	vendor/bin/rector process --dry-run path/to/file
 
+If you run it without `--dry-run`, Rector will fix the code:
+
+	vendor/bin/rector process path/to/file
+
 [1]: https://github.com/phpstan/phpstan-src
 [2]: https://github.com/rector/rector
 

From 1b0850e422568f4527b6c70247e697d83817cea2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 2 Nov 2021 09:11:04 +0900
Subject: [PATCH 0604/2325] refactor: simplify return statement

---
 system/Validation/FormatRules.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index 5f6289b41c4c..daf5061c80f6 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -311,9 +311,8 @@ public function valid_url_strict(?string $str = null, ?string $validSchemes = nu
             strtolower($validSchemes ?? 'http,https,mailto,tel,sms')
         );
 
-        return ! in_array($scheme, $validSchemes, true)
-            ? false
-            : filter_var($str, FILTER_VALIDATE_URL) !== false;
+        return in_array($scheme, $validSchemes, true)
+            && filter_var($str, FILTER_VALIDATE_URL) !== false;
     }
 
     /**

From fe2c565a5128672b33c7c143de0de721046683ea Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 2 Nov 2021 11:16:17 +0900
Subject: [PATCH 0605/2325] fix: remove incorrect processing of CLI params

Fixes #5266
---
 system/HTTP/CLIRequest.php           |  6 +++---
 tests/system/HTTP/CLIRequestTest.php | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
index fcc2a51389d2..b10d41884733 100644
--- a/system/HTTP/CLIRequest.php
+++ b/system/HTTP/CLIRequest.php
@@ -170,17 +170,17 @@ protected function parseCommand()
                 if ($optionValue) {
                     $optionValue = false;
                 } else {
-                    $this->segments[] = esc(strip_tags($arg));
+                    $this->segments[] = $arg;
                 }
 
                 continue;
             }
 
-            $arg   = esc(strip_tags(ltrim($arg, '-')));
+            $arg   = ltrim($arg, '-');
             $value = null;
 
             if (isset($args[$i + 1]) && mb_strpos($args[$i + 1], '-') !== 0) {
-                $value       = esc(strip_tags($args[$i + 1]));
+                $value       = $args[$i + 1];
                 $optionValue = true;
             }
 
diff --git a/tests/system/HTTP/CLIRequestTest.php b/tests/system/HTTP/CLIRequestTest.php
index c31bace6b554..1c7c23c1c21e 100644
--- a/tests/system/HTTP/CLIRequestTest.php
+++ b/tests/system/HTTP/CLIRequestTest.php
@@ -61,6 +61,30 @@ public function testParsingSegments()
         $this->assertSame($segments, $this->request->getSegments());
     }
 
+    public function testParsingSegmentsWithHTMLMetaChars()
+    {
+        $_SERVER['argv'] = [
+            'index.php',
+            'users',
+            '21',
+            'abc < def',
+            "McDonald's",
+            '<s>aaa</s>',
+        ];
+
+        // reinstantiate it to force parsing
+        $this->request = new CLIRequest(new App());
+
+        $segments = [
+            'users',
+            '21',
+            'abc < def',
+            "McDonald's",
+            '<s>aaa</s>',
+        ];
+        $this->assertSame($segments, $this->request->getSegments());
+    }
+
     public function testParsingOptions()
     {
         $_SERVER['argv'] = [

From eeaa4db60a2fd7fdb7daa7bcfb1fe73446e6e200 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 2 Nov 2021 15:37:45 +0900
Subject: [PATCH 0606/2325] docs: move CSRF Protection Methods section up

This is a basic config item, so it is better to have it at the beginning.
---
 user_guide_src/source/libraries/security.rst | 31 ++++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index 48b97baf1f61..a7ee6e141f78 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -26,6 +26,21 @@ Cross-site request forgery (CSRF)
 .. warning:: The CSRF Protection is only available for **POST/PUT/PATCH/DELETE** requests.
     Requests for other methods are not protected.
 
+CSRF Protection Methods
+=======================
+
+By default, the Cookie based CSRF Protection is used. It is
+`Double Submit Cookie <https://cheatsheetseries.owasp.org/cheatsheets/Cross-Site_Request_Forgery_Prevention_Cheat_Sheet.html#double-submit-cookie>`_
+on OWASP Cross-Site Request Forgery Prevention Cheat Sheet.
+
+You can also use Session based CSRF Protection. It is
+`Synchronizer Token Pattern <https://cheatsheetseries.owasp.org/cheatsheets/Cross-Site_Request_Forgery_Prevention_Cheat_Sheet.html#synchronizer-token-pattern>`_.
+
+You can set to use the Session based CSRF protection by editing the following config parameter value in
+**app/Config/Security.php**::
+
+    public $csrfProtection = 'session';
+
 Enable CSRF Protection
 ======================
 
@@ -130,22 +145,6 @@ than simply crashing. This can be turned off by editing the following config par
 
 Even when the redirect value is ``true``, AJAX calls will not redirect, but will throw an error.
 
-=======================
-CSRF Protection Methods
-=======================
-
-By default, the Cookie based CSRF Protection is used. It is
-`Double Submit Cookie <https://cheatsheetseries.owasp.org/cheatsheets/Cross-Site_Request_Forgery_Prevention_Cheat_Sheet.html#double-submit-cookie>`_
-on OWASP Cross-Site Request Forgery Prevention Cheat Sheet.
-
-You can also use Session based CSRF Protection. It is
-`Synchronizer Token Pattern <https://cheatsheetseries.owasp.org/cheatsheets/Cross-Site_Request_Forgery_Prevention_Cheat_Sheet.html#synchronizer-token-pattern>`_.
-
-You can set to use the Session based CSRF protection by editing the following config parameter value in
-**app/Config/Security.php**::
-
-    public $csrfProtection = 'session';
-
 *********************
 Other Helpful Methods
 *********************

From 8ffd0ad3895b4d16f77817f25ba79f4e943549fc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 2 Nov 2021 15:44:35 +0900
Subject: [PATCH 0607/2325] docs: fix sample code format

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

diff --git a/user_guide_src/source/helpers/html_helper.rst b/user_guide_src/source/helpers/html_helper.rst
index a477b9cbd311..a7ad04914831 100755
--- a/user_guide_src/source/helpers/html_helper.rst
+++ b/user_guide_src/source/helpers/html_helper.rst
@@ -79,7 +79,7 @@ The following functions are available:
         echo img($src);
 
     There is an optional second parameter to specify the MIME type, otherwise the
-    function will use your Mimes config to guess.
+    function will use your Mimes config to guess::
 
         $src = img_data('path/img_without_extension', 'image/png'); // data:image/png;base64,HT5A822...
 

From 0705c535247a13a0ede50b53cea53d545464123e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 2 Nov 2021 15:47:50 +0900
Subject: [PATCH 0608/2325] docs: decorate HTML tags with '``'

---
 user_guide_src/source/helpers/html_helper.rst | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/user_guide_src/source/helpers/html_helper.rst b/user_guide_src/source/helpers/html_helper.rst
index a7ad04914831..8eb55fb649d0 100755
--- a/user_guide_src/source/helpers/html_helper.rst
+++ b/user_guide_src/source/helpers/html_helper.rst
@@ -32,7 +32,7 @@ The following functions are available:
     :returns:   HTML image tag
     :rtype: string
 
-    Lets you create HTML <img /> tags. The first parameter contains the
+    Lets you create HTML ``<img />`` tags. The first parameter contains the
     image source. Example::
 
         echo img('images/picture.jpg');
@@ -99,7 +99,7 @@ The following functions are available:
     :returns:   HTML link tag
     :rtype: string
 
-    Lets you create HTML <link /> tags. This is useful for stylesheet links,
+    Lets you create HTML ``<link />`` tags. This is useful for stylesheet links,
     as well as other links. The parameters are *href*, with optional *rel*,
     *type*, *title*, *media* and *indexPage*.
 
@@ -139,7 +139,7 @@ The following functions are available:
     :returns:   HTML script tag
     :rtype: string
 
-    Lets you create HTML <script></script> tags. The parameters is *src*, with optional *indexPage*.
+    Lets you create HTML ``<script></script>`` tags. The parameters is *src*, with optional *indexPage*.
 
     *indexPage* is a boolean value that specifies if the *src* should have
     the page specified by ``$config['indexPage']`` added to the address it creates.
@@ -284,8 +284,8 @@ The following functions are available:
     :returns:   HTML-formatted ordered list
     :rtype: string
 
-    Identical to :php:func:`ul()`, only it produces the <ol> tag for
-    ordered lists instead of <ul>.
+    Identical to :php:func:`ul()`, only it produces the ``<ol>`` tag for
+    ordered lists instead of ``<ul>``.
 
 .. php:function:: video($src[, $unsupportedMessage = ''[, $attributes = ''[, $tracks = [][, $indexPage = false]]]])
 
@@ -359,7 +359,7 @@ The following functions are available:
     :returns:                            HTML-formatted audio element
     :rtype: string
 
-    Identical to :php:func:`video()`, only it produces the <audio> tag instead of <video>.
+    Identical to :php:func:`video()`, only it produces the ``<audio>`` tag instead of ``<video>``.
 
 .. php:function:: source($src = ''[, $type = false[, $attributes = '']])
 
@@ -369,7 +369,7 @@ The following functions are available:
     :returns:   HTML source tag
     :rtype: string
 
-    Lets you create HTML <source /> tags. The first parameter contains the
+    Lets you create HTML ``<source />`` tags. The first parameter contains the
     source source. Example::
 
         echo source('movie.mp4', 'video/mp4', 'class="test"');
@@ -384,7 +384,7 @@ The following functions are available:
     :returns:   HTML embed tag
     :rtype: string
 
-    Lets you create HTML <embed /> tags. The first parameter contains the
+    Lets you create HTML ``<embed />`` tags. The first parameter contains the
     embed source. Example::
 
         echo embed('movie.mov', 'video/quicktime', 'class="test"');
@@ -399,7 +399,7 @@ The following functions are available:
     :returns:   HTML object tag
     :rtype: string
 
-    Lets you create HTML <object /> tags. The first parameter contains the
+    Lets you create HTML ``<object />`` tags. The first parameter contains the
     object data. Example::
 
         echo object('movie.swf', 'application/x-shockwave-flash', 'class="test"');
@@ -433,7 +433,7 @@ The following functions are available:
     :returns:   HTML param tag
     :rtype: string
 
-    Lets you create HTML <param /> tags. The first parameter contains the
+    Lets you create HTML ``<param />`` tags. The first parameter contains the
     param source. Example::
 
         echo param('movie.mov', 'video/quicktime', 'class="test"');

From 0519177d809e0cbbbaac2028210517cc755c1724 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 2 Nov 2021 15:51:45 +0900
Subject: [PATCH 0609/2325] docs: decorate variables with '``'

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

diff --git a/user_guide_src/source/helpers/html_helper.rst b/user_guide_src/source/helpers/html_helper.rst
index 8eb55fb649d0..9c1a486625b0 100755
--- a/user_guide_src/source/helpers/html_helper.rst
+++ b/user_guide_src/source/helpers/html_helper.rst
@@ -27,7 +27,7 @@ The following functions are available:
 .. php:function:: img([$src = ''[, $indexPage = false[, $attributes = '']]])
 
     :param  string|array  $src:  Image source URI, or array of attributes and values
-    :param  bool    $indexPage:  Whether to treat $src as a routed URI string
+    :param  bool    $indexPage:  Whether to treat ``$src`` as a routed URI string
     :param  mixed   $attributes: Additional HTML attributes
     :returns:   HTML image tag
     :rtype: string
@@ -83,7 +83,7 @@ The following functions are available:
 
         $src = img_data('path/img_without_extension', 'image/png'); // data:image/png;base64,HT5A822...
 
-    Note that $path must exist and be a readable image format supported by the ``data:`` protocol.
+    Note that ``$path`` must exist and be a readable image format supported by the ``data:`` protocol.
     This function is not recommended for very large files, but it provides a convenient way
     of serving images from your app that are not web-accessible (e.g., in **public/**).
 
@@ -94,7 +94,7 @@ The following functions are available:
     :param  string  $type:      Type of the related document
     :param  string  $title:     Link title
     :param  string  $media:     Media type
-    :param  bool    $indexPage: Whether to treat $src as a routed URI string
+    :param  bool    $indexPage: Whether to treat ``$src`` as a routed URI string
     :param  string  $hreflang:  Hreflang type
     :returns:   HTML link tag
     :rtype: string
@@ -135,7 +135,7 @@ The following functions are available:
 .. php:function:: script_tag([$src = ''[, $indexPage = false]])
 
     :param  mixed  $src: The source name of a JavaScript file
-    :param  bool    $indexPage: Whether to treat $src as a routed URI string
+    :param  bool    $indexPage: Whether to treat ``$src`` as a routed URI string
     :returns:   HTML script tag
     :rtype: string
 

From ab71b75a1535fa2814e805b34cdb5b6e3ea6f983 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 2 Nov 2021 15:52:13 +0900
Subject: [PATCH 0610/2325] docs: fix file path decoration

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

diff --git a/user_guide_src/source/helpers/html_helper.rst b/user_guide_src/source/helpers/html_helper.rst
index 9c1a486625b0..3e88f19360fc 100755
--- a/user_guide_src/source/helpers/html_helper.rst
+++ b/user_guide_src/source/helpers/html_helper.rst
@@ -471,7 +471,7 @@ The following functions are available:
         // <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
     The following is a list of the pre-defined doctype choices. These are configurable,
-    pulled from `application/Config/DocTypes.php`, or they could be over-ridden in your `.env` configuration.
+    pulled from **app/Config/DocTypes.php**, or they could be over-ridden in your **.env** configuration.
 
     =============================== =================== ==================================================================================================================================================
     Document type                   Option              Result

From e94394adaa9d429fae63a87b3cde66e87f44a105 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 2 Nov 2021 18:58:28 +0800
Subject: [PATCH 0611/2325] Fix compatibility of Postgres result for PHP 8.1

---
 system/Database/BaseResult.php     | 2 +-
 system/Database/Postgre/Result.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php
index 3adbb592b24c..49a970f5bf11 100644
--- a/system/Database/BaseResult.php
+++ b/system/Database/BaseResult.php
@@ -28,7 +28,7 @@ abstract class BaseResult implements ResultInterface
     /**
      * Result ID
      *
-     * @var bool|object|resource
+     * @var false|object|resource
      */
     public $resultID;
 
diff --git a/system/Database/Postgre/Result.php b/system/Database/Postgre/Result.php
index 6f0fd9ac4ea1..76a0dd956515 100644
--- a/system/Database/Postgre/Result.php
+++ b/system/Database/Postgre/Result.php
@@ -68,7 +68,7 @@ public function getFieldData(): array
      */
     public function freeResult()
     {
-        if (is_resource($this->resultID)) {
+        if ($this->resultID !== false) {
             pg_free_result($this->resultID);
             $this->resultID = false;
         }

From cb565557317c02a7fe6a49c7e7c9498c7618644e Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 2 Nov 2021 19:27:59 +0800
Subject: [PATCH 0612/2325] Skip if result object has no `close` method

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

diff --git a/system/Database/BasePreparedQuery.php b/system/Database/BasePreparedQuery.php
index faf83d854d7b..ba36915c79fe 100644
--- a/system/Database/BasePreparedQuery.php
+++ b/system/Database/BasePreparedQuery.php
@@ -144,7 +144,7 @@ abstract public function _getResult();
      */
     public function close()
     {
-        if (! is_object($this->statement)) {
+        if (! is_object($this->statement) || ! method_exists($this->statement, 'close')) {
             return;
         }
 

From af7dcf37cca21124706a34d45a84316b4f155701 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 2 Nov 2021 19:28:37 +0800
Subject: [PATCH 0613/2325] Call `close` in `tearDown`

---
 .../Database/Live/PreparedQueryTest.php       | 51 ++++++++++++-------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php
index 06999ea93f4c..1cac50672772 100644
--- a/tests/system/Database/Live/PreparedQueryTest.php
+++ b/tests/system/Database/Live/PreparedQueryTest.php
@@ -28,16 +28,36 @@ final class PreparedQueryTest extends CIUnitTestCase
     protected $refresh = true;
     protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
+    /**
+     * @var BasePreparedQuery|null
+     */
+    private $query;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->query = null;
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        if ($this->query !== null) {
+            $this->query->close();
+        }
+    }
+
     public function testPrepareReturnsPreparedQuery()
     {
-        $query = $this->db->prepare(static function ($db) {
+        $this->query = $this->db->prepare(static function ($db) {
             return $db->table('user')->insert([
                 'name'  => 'a',
                 'email' => 'b@example.com',
             ]);
         });
 
-        $this->assertInstanceOf(BasePreparedQuery::class, $query);
+        $this->assertInstanceOf(BasePreparedQuery::class, $this->query);
 
         $ec  = $this->db->escapeChar;
         $pre = $this->db->DBPrefix;
@@ -54,20 +74,19 @@ public function testPrepareReturnsPreparedQuery()
         } else {
             $expected = "INSERT INTO {$ec}{$pre}user{$ec} ({$ec}name{$ec}, {$ec}email{$ec}) VALUES ({$placeholders})";
         }
-        $this->assertSame($expected, $query->getQueryString());
 
-        $query->close();
+        $this->assertSame($expected, $this->query->getQueryString());
     }
 
     public function testPrepareReturnsManualPreparedQuery()
     {
-        $query = $this->db->prepare(static function ($db) {
+        $this->query = $this->db->prepare(static function ($db) {
             $sql = "INSERT INTO {$db->DBPrefix}user (name, email, country) VALUES (?, ?, ?)";
 
             return (new Query($db))->setQuery($sql);
         });
 
-        $this->assertInstanceOf(BasePreparedQuery::class, $query);
+        $this->assertInstanceOf(BasePreparedQuery::class, $this->query);
 
         $pre = $this->db->DBPrefix;
 
@@ -78,14 +97,12 @@ public function testPrepareReturnsManualPreparedQuery()
         }
 
         $expected = "INSERT INTO {$pre}user (name, email, country) VALUES ({$placeholders})";
-        $this->assertSame($expected, $query->getQueryString());
-
-        $query->close();
+        $this->assertSame($expected, $this->query->getQueryString());
     }
 
     public function testExecuteRunsQueryAndReturnsResultObject()
     {
-        $query = $this->db->prepare(static function ($db) {
+        $this->query = $this->db->prepare(static function ($db) {
             return $db->table('user')->insert([
                 'name'    => 'a',
                 'email'   => 'b@example.com',
@@ -93,18 +110,16 @@ public function testExecuteRunsQueryAndReturnsResultObject()
             ]);
         });
 
-        $query->execute('foo', 'foo@example.com', 'US');
-        $query->execute('bar', 'bar@example.com', 'GB');
+        $this->query->execute('foo', 'foo@example.com', 'US');
+        $this->query->execute('bar', 'bar@example.com', 'GB');
 
         $this->seeInDatabase($this->db->DBPrefix . 'user', ['name' => 'foo', 'email' => 'foo@example.com']);
         $this->seeInDatabase($this->db->DBPrefix . 'user', ['name' => 'bar', 'email' => 'bar@example.com']);
-
-        $query->close();
     }
 
     public function testExecuteRunsQueryAndReturnsManualResultObject()
     {
-        $query = $this->db->prepare(static function ($db) {
+        $this->query = $this->db->prepare(static function ($db) {
             $sql = "INSERT INTO {$db->DBPrefix}user (name, email, country) VALUES (?, ?, ?)";
 
             if ($db->DBDriver === 'SQLSRV') {
@@ -114,12 +129,10 @@ public function testExecuteRunsQueryAndReturnsManualResultObject()
             return (new Query($db))->setQuery($sql);
         });
 
-        $query->execute('foo', 'foo@example.com', '');
-        $query->execute('bar', 'bar@example.com', '');
+        $this->query->execute('foo', 'foo@example.com', '');
+        $this->query->execute('bar', 'bar@example.com', '');
 
         $this->seeInDatabase($this->db->DBPrefix . 'user', ['name' => 'foo', 'email' => 'foo@example.com']);
         $this->seeInDatabase($this->db->DBPrefix . 'user', ['name' => 'bar', 'email' => 'bar@example.com']);
-
-        $query->close();
     }
 }

From 32f88ce209f5b8ee7b11b8a5b5cda667d0c4aef7 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 2 Nov 2021 19:30:09 +0800
Subject: [PATCH 0614/2325] Use class const for seeder name

---
 tests/system/Database/Live/PreparedQueryTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php
index 1cac50672772..6de7d223bb43 100644
--- a/tests/system/Database/Live/PreparedQueryTest.php
+++ b/tests/system/Database/Live/PreparedQueryTest.php
@@ -15,6 +15,7 @@
 use CodeIgniter\Database\Query;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -26,7 +27,7 @@ final class PreparedQueryTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    private $seed      = CITestSeeder::class;
 
     /**
      * @var BasePreparedQuery|null

From eb1b6212e0ee7c1e39ff9322c6ee2950bf3eb4cc Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 2 Nov 2021 19:36:22 +0800
Subject: [PATCH 0615/2325] Remove duplicated `$refresh` property

---
 tests/system/Database/Live/PreparedQueryTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php
index 6de7d223bb43..854cab85e7df 100644
--- a/tests/system/Database/Live/PreparedQueryTest.php
+++ b/tests/system/Database/Live/PreparedQueryTest.php
@@ -26,8 +26,7 @@ final class PreparedQueryTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
-    protected $refresh = true;
-    private $seed      = CITestSeeder::class;
+    protected $seed = CITestSeeder::class;
 
     /**
      * @var BasePreparedQuery|null

From 45ebd9c3ca81921934c38e71d23e3758942546b4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 3 Nov 2021 08:51:53 +0900
Subject: [PATCH 0616/2325] docs: add the reason for the change

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

diff --git a/user_guide_src/source/installation/upgrade_415.rst b/user_guide_src/source/installation/upgrade_415.rst
index ac3cdb529d74..e0c7574bcc50 100644
--- a/user_guide_src/source/installation/upgrade_415.rst
+++ b/user_guide_src/source/installation/upgrade_415.rst
@@ -67,7 +67,7 @@ Query Builder changes
 For optimization and a bug fix, the following behaviors, mostly used in testing, have been changed.
 
 - When you use ``insertBatch()`` and ``updateBatch()``, the return value of ``$query->getOriginalQuery()`` has changed. It no longer returns the query with the binded parameters, but the actual query that was run.
-- If ``testMode`` is ``true``, ``insertBatch()`` will return an SQL string array instead of the number of affected rows that were wrong.
+- If ``testMode`` is ``true``, ``insertBatch()`` will return an SQL string array instead of the number of affected rows. This change was made so that the returned data type is the same as the ``updateBatch()`` method.
 
 Breaking Enhancements
 =====================

From 9d329a73b24963ddc9aa6c41f86c7fdafe49b36b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 3 Nov 2021 08:52:52 +0900
Subject: [PATCH 0617/2325] docs: add the reason for the change

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

diff --git a/user_guide_src/source/changelogs/v4.1.5.rst b/user_guide_src/source/changelogs/v4.1.5.rst
index 34eb8937baf4..77b31cdd6e72 100644
--- a/user_guide_src/source/changelogs/v4.1.5.rst
+++ b/user_guide_src/source/changelogs/v4.1.5.rst
@@ -14,7 +14,7 @@ BREAKING
 
 - Fixed `a bug <https://github.com/codeigniter4/CodeIgniter4/issues/2913>`_ on CSRF protection. Now CSRF protection works on PUT/PATCH/DELETE requests when CSRF filter is applied. If you use such requests, you need to send CSRF token.
 - In the previous version, if you didn't provide your own headers, ``CURLRequest`` would send the request-headers from the browser, due to a bug. As of this version, it does not send them.
-- Fixed ``BaseBuilder::insertBatch()`` return value. Now it returns SQL string array instead of wrong affected row number when testMode.
+- Fixed ``BaseBuilder::insertBatch()`` return value for ``testMode``. Now it returns SQL string array instead of a number of affected rows. This change was made because of maintaining compatibility between returning types for batch methods. Now the returned data type for ``BaseBuilder::insertBatch()`` is the same as the `updateBatch()` method.
 - Major optimizations have been made to the way data is processed in ``BaseBuilder::insertBatch()`` and ``BaseBuilder::updateBatch()`` methods. This resulted in reduced memory usage and faster query processing. As a trade-off, the result generated by the ``$query->getOriginalQuery()`` method was changed. It no longer returns the query with the binded parameters, but the actual query that was run.
 
 Enhancements

From 0f036a6c9835259403d09e8356f4102b2d0dd5c9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 3 Nov 2021 10:43:57 +0900
Subject: [PATCH 0618/2325] fix: module filters are not discovered when you use
 module route with filters

Fixes #4720
---
 system/CodeIgniter.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 7a99f926121a..f20f2180e8b0 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -358,9 +358,14 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
     {
         $routeFilter = $this->tryToRouteIt($routes);
 
+        $uri = $this->determinePath();
+
         // Start up the filters
         $filters = Services::filters();
 
+        // Discover filters
+        $filters->initialize(strtolower($uri));
+
         // If any filters were specified within the routes file,
         // we need to ensure it's active for the current request
         if ($routeFilter !== null) {
@@ -375,8 +380,6 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
             }
         }
 
-        $uri = $this->determinePath();
-
         // Never run filters when running through Spark cli
         if (! defined('SPARKED')) {
             // Run "before" filters

From 621323bc90dc3f1c26d2f7a17c3fcd676f0047e3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 3 Nov 2021 11:09:22 +0900
Subject: [PATCH 0619/2325] docs: add sample code for Acme\Blog namespace
 definition

---
 user_guide_src/source/general/modules.rst | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst
index 6fc24ecad55d..d05d0eab159a 100644
--- a/user_guide_src/source/general/modules.rst
+++ b/user_guide_src/source/general/modules.rst
@@ -101,7 +101,17 @@ This is configured in the file **app/Config/Modules.php**.
 The auto-discovery system works by scanning for particular directories and files within psr4 namespaces that have been defined in **Config/Autoload.php**.
 
 To make auto-discovery work for our **Blog** namespace, we need to make one small adjustment.
-**Acme** needs to be changed to **Acme\\Blog** because each "module" within the namespace needs to be fully defined. Once your module folder path is defined, the discovery process would look for discoverable items on that path and should, for example, find the routes file at **/acme/Blog/Config/Routes.php**.
+**Acme** needs to be changed to **Acme\\Blog** because each "module" within the namespace needs to be fully defined.
+
+::
+
+    public $psr4 = [
+        APP_NAMESPACE => APPPATH, // For custom namespace
+        'Config'      => APPPATH . 'Config',
+        'Acme\Blog'   => ROOTPATH . 'acme/Blog', // Change
+    ];
+
+Once your module folder path is defined, the discovery process would look for discoverable items on that path and should, for example, find the routes file at **/acme/Blog/Config/Routes.php**.
 
 Enable/Disable Discover
 =======================

From a5e9aaef0a8ba7e37363cd8a796cf9d9962fe3a5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 3 Nov 2021 11:11:41 +0900
Subject: [PATCH 0620/2325] docs: add about Filter file

---
 user_guide_src/source/general/modules.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst
index d05d0eab159a..91ec5554c955 100644
--- a/user_guide_src/source/general/modules.rst
+++ b/user_guide_src/source/general/modules.rst
@@ -153,6 +153,19 @@ the **Modules** config file, described above.
 .. note:: Since the files are being included into the current scope, the ``$routes`` instance is already defined for you.
     It will cause errors if you attempt to redefine that class.
 
+Filters
+=======
+
+By default, :doc:`filters </incoming/filters>` are automatically scanned for within modules.
+It can be turned off in the **Modules** config file, described above.
+
+.. note:: Since the files are being included into the current scope, the ``$filters`` instance is already defined for you.
+    It will cause errors if you attempt to redefine that class.
+
+In the module's **Config/Filters.php** file, you need to define the aliases of the filters you use.::
+
+    $filters->aliases['menus'] = MenusFilter::class;
+
 Controllers
 ===========
 

From b1d3dd991a484f3614499242e26e9d72c1811d21 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 3 Nov 2021 16:25:36 +0900
Subject: [PATCH 0621/2325] refactor: move discoverFilters() to the instructor

---
 system/CodeIgniter.php     | 3 ---
 system/Filters/Filters.php | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index f20f2180e8b0..8b211cf89023 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -363,9 +363,6 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
         // Start up the filters
         $filters = Services::filters();
 
-        // Discover filters
-        $filters->initialize(strtolower($uri));
-
         // If any filters were specified within the routes file,
         // we need to ensure it's active for the current request
         if ($routeFilter !== null) {
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index 70cf58986727..d5bff401ff3a 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -107,6 +107,10 @@ public function __construct($config, RequestInterface $request, ResponseInterfac
         $this->setResponse($response);
 
         $this->modules = $modules ?? config('Modules');
+
+        if ($this->modules->shouldDiscover('filters')) {
+            $this->discoverFilters();
+        }
     }
 
     /**
@@ -225,10 +229,6 @@ public function initialize(?string $uri = null)
             return $this;
         }
 
-        if ($this->modules->shouldDiscover('filters')) {
-            $this->discoverFilters();
-        }
-
         $this->processGlobals($uri);
         $this->processMethods();
         $this->processFilters($uri);

From 09650022d730ad7e5e28129ee229f8c978d70274 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 3 Nov 2021 20:58:34 +0900
Subject: [PATCH 0622/2325] docs: fix doc comments

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

diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index d5bff401ff3a..faa1df358cb4 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -116,7 +116,7 @@ public function __construct($config, RequestInterface $request, ResponseInterfac
     /**
      * If discoverFilters is enabled in Config then system will try to
      * auto-discover custom filters files in Namespaces and allow access to
-     * the config object via the variable $customfilters as with the routes file
+     * the config object via the variable $filters as with the routes file
      *
      * Sample :
      * $filters->aliases['custom-auth'] = \Acme\Blob\Filters\BlobAuth::class;
@@ -215,12 +215,10 @@ public function run(string $uri, string $position = 'before')
      * The resulting $this->filters is an array of only filters
      * that should be applied to this request.
      *
-     * We go ahead an process the entire tree because we'll need to
+     * We go ahead and process the entire tree because we'll need to
      * run through both a before and after and don't want to double
      * process the rows.
      *
-     * @param string $uri
-     *
      * @return Filters
      */
     public function initialize(?string $uri = null)

From 03551752975c39f57694ed615488f0740397c288 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 4 Nov 2021 19:10:16 +0900
Subject: [PATCH 0623/2325] feat: add CSRF token randomization

---
 app/Config/Security.php                       |  11 +
 env                                           |   1 +
 system/Security/Security.php                  |  43 ++-
 system/Test/Mock/MockSecurity.php             |   8 +
 .../SecurityCSRFSessionRandomizeTokenTest.php | 263 ++++++++++++++++++
 5 files changed, 323 insertions(+), 3 deletions(-)
 create mode 100644 tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php

diff --git a/app/Config/Security.php b/app/Config/Security.php
index 563cf2f3a86e..05083f8b1db1 100644
--- a/app/Config/Security.php
+++ b/app/Config/Security.php
@@ -17,6 +17,17 @@ class Security extends BaseConfig
      */
     public $csrfProtection = 'cookie';
 
+    /**
+     * --------------------------------------------------------------------------
+     * CSRF Token Randomization
+     * --------------------------------------------------------------------------
+     *
+     * Randomize the CSRF Token for added security.
+     *
+     * @var bool
+     */
+    public $tokenRandomize = false;
+
     /**
      * --------------------------------------------------------------------------
      * CSRF Token Name
diff --git a/env b/env
index 6e30e34b7ddb..c60b367265e7 100644
--- a/env
+++ b/env
@@ -111,6 +111,7 @@
 #--------------------------------------------------------------------
 
 # security.csrfProtection = 'cookie'
+# security.tokenRandomize = false
 # security.tokenName = 'csrf_token_name'
 # security.headerName = 'X-CSRF-TOKEN'
 # security.cookieName = 'csrf_cookie_name'
diff --git a/system/Security/Security.php b/system/Security/Security.php
index d9a44c4c9e6a..ef06661966f8 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -19,6 +19,7 @@
 use Config\Cookie as CookieConfig;
 use Config\Security as SecurityConfig;
 use Config\Services;
+use LogicException;
 
 /**
  * Class Security
@@ -30,6 +31,7 @@ class Security implements SecurityInterface
 {
     public const CSRF_PROTECTION_COOKIE  = 'cookie';
     public const CSRF_PROTECTION_SESSION = 'session';
+    public const CSRF_HASH_BYTES         = 16;
 
     /**
      * CSRF Protection Method
@@ -40,6 +42,13 @@ class Security implements SecurityInterface
      */
     protected $csrfProtection = self::CSRF_PROTECTION_COOKIE;
 
+    /**
+     * CSRF Token Randomization
+     *
+     * @var bool
+     */
+    protected $tokenRandomize = false;
+
     /**
      * CSRF Hash
      *
@@ -167,6 +176,7 @@ public function __construct(App $config)
             $this->regenerate     = $security->regenerate ?? $this->regenerate;
             $this->rawCookieName  = $security->cookieName ?? $this->rawCookieName;
             $this->expires        = $security->expires ?? $this->expires;
+            $this->tokenRandomize = $security->tokenRandomize ?? $this->tokenRandomize;
         } else {
             // `Config/Security.php` is absence
             $this->tokenName     = $config->CSRFTokenName ?? $this->tokenName;
@@ -270,7 +280,8 @@ public function verify(RequestInterface $request)
             return $this;
         }
 
-        $token = $this->getPostedToken($request);
+        $token = $this->tokenRandomize ? $this->derandomize($this->getPostedToken($request))
+            : $this->getPostedToken($request);
 
         // Do the tokens match?
         if (! isset($token, $this->hash) || ! hash_equals($this->hash, $token)) {
@@ -329,7 +340,33 @@ private function getPostedToken(RequestInterface $request): ?string
      */
     public function getHash(): ?string
     {
-        return $this->hash;
+        return $this->tokenRandomize ? $this->randomize($this->hash) : $this->hash;
+    }
+
+    /**
+     * Randomize hash to avoid BREACH attacks.
+     */
+    protected function randomize(string $hash): string
+    {
+        $key   = random_bytes(self::CSRF_HASH_BYTES);
+        $value = hex2bin($hash);
+
+        if ($value === false) {
+            throw new LogicException('$hash is invalid: ' . $hash);
+        }
+
+        return bin2hex(($value ^ $key) . $key);
+    }
+
+    /**
+     * Derandomize the token.
+     */
+    protected function derandomize(string $token): string
+    {
+        $key   = substr($token, -self::CSRF_HASH_BYTES * 2);
+        $value = substr($token, 0, self::CSRF_HASH_BYTES * 2);
+
+        return bin2hex(hex2bin($value) ^ hex2bin($key));
     }
 
     /**
@@ -461,7 +498,7 @@ protected function generateHash(): string
                 return $this->hash = $this->session->get($this->tokenName);
             }
 
-            $this->hash = bin2hex(random_bytes(16));
+            $this->hash = bin2hex(random_bytes(self::CSRF_HASH_BYTES));
 
             if ($this->isCSRFCookie()) {
                 $this->saveHashInCookie();
diff --git a/system/Test/Mock/MockSecurity.php b/system/Test/Mock/MockSecurity.php
index e24221c17b47..0e782304a2e7 100644
--- a/system/Test/Mock/MockSecurity.php
+++ b/system/Test/Mock/MockSecurity.php
@@ -19,4 +19,12 @@ protected function doSendCookie(): void
     {
         $_COOKIE['csrf_cookie_name'] = $this->hash;
     }
+
+    protected function randomize(string $hash): string
+    {
+        $key   = hex2bin('005513c290126d34d41bf41c5265e0f1');
+        $value = hex2bin($hash);
+
+        return bin2hex(($value ^ $key) . $key);
+    }
 }
diff --git a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
new file mode 100644
index 000000000000..00623d3db9f1
--- /dev/null
+++ b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
@@ -0,0 +1,263 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Security;
+
+use CodeIgniter\Config\Factories;
+use CodeIgniter\Config\Services;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\UserAgent;
+use CodeIgniter\Security\Exceptions\SecurityException;
+use CodeIgniter\Session\Handlers\ArrayHandler;
+use CodeIgniter\Session\Session;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\Mock\MockAppConfig;
+use CodeIgniter\Test\Mock\MockSecurity;
+use CodeIgniter\Test\Mock\MockSession;
+use CodeIgniter\Test\TestLogger;
+use Config\App as AppConfig;
+use Config\Logger as LoggerConfig;
+use Config\Security as SecurityConfig;
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ *
+ * @internal
+ */
+final class SecurityCSRFSessionRandomizeTokenTest extends CIUnitTestCase
+{
+    /**
+     * @var string CSRF protection hash
+     */
+    private $hash = '8b9218a55906f9dcc1dc263dce7f005a';
+
+    /**
+     * @var string CSRF randomized token
+     */
+    private $randomizedToken = '8bc70b67c91494e815c7d2219c1ae0ab005513c290126d34d41bf41c5265e0f1';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $_SESSION = [];
+        Factories::reset();
+
+        $config                 = new SecurityConfig();
+        $config->csrfProtection = Security::CSRF_PROTECTION_SESSION;
+        $config->tokenRandomize = true;
+        Factories::injectMock('config', 'Security', $config);
+
+        $this->injectSession($this->hash);
+    }
+
+    private function createSession($options = []): Session
+    {
+        $defaults = [
+            'sessionDriver'            => 'CodeIgniter\Session\Handlers\FileHandler',
+            'sessionCookieName'        => 'ci_session',
+            'sessionExpiration'        => 7200,
+            'sessionSavePath'          => null,
+            'sessionMatchIP'           => false,
+            'sessionTimeToUpdate'      => 300,
+            'sessionRegenerateDestroy' => false,
+            'cookieDomain'             => '',
+            'cookiePrefix'             => '',
+            'cookiePath'               => '/',
+            'cookieSecure'             => false,
+            'cookieSameSite'           => 'Lax',
+        ];
+
+        $config    = array_merge($defaults, $options);
+        $appConfig = new AppConfig();
+
+        foreach ($config as $key => $c) {
+            $appConfig->{$key} = $c;
+        }
+
+        $session = new MockSession(new ArrayHandler($appConfig, '127.0.0.1'), $appConfig);
+        $session->setLogger(new TestLogger(new LoggerConfig()));
+
+        return $session;
+    }
+
+    private function injectSession(string $hash): void
+    {
+        $session = $this->createSession();
+        $session->set('csrf_test_name', $hash);
+        Services::injectMock('session', $session);
+    }
+
+    public function testHashIsReadFromSession()
+    {
+        $security = new MockSecurity(new MockAppConfig());
+
+        $this->assertSame(
+            $this->randomizedToken,
+            $security->getHash()
+        );
+    }
+
+    public function testCSRFVerifyPostThrowsExceptionOnNoMatch()
+    {
+        $this->expectException(SecurityException::class);
+
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+        $_POST['csrf_test_name']   = '8b9218a55906f9dcc1dc263dce7f005b';
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+
+        $security = new Security(new MockAppConfig());
+
+        $security->verify($request);
+    }
+
+    public function testCSRFVerifyPostReturnsSelfOnMatch()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+        $_POST['foo']              = 'bar';
+        $_POST['csrf_test_name']   = $this->randomizedToken;
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+
+        $security = new Security(new MockAppConfig());
+
+        $this->assertInstanceOf(Security::class, $security->verify($request));
+        $this->assertLogged('info', 'CSRF token verified.');
+        $this->assertTrue(count($_POST) === 1);
+    }
+
+    public function testCSRFVerifyPOSTHeaderThrowsExceptionOnNoMatch()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005b');
+
+        $security = new Security(new MockAppConfig());
+
+        $this->expectException(SecurityException::class);
+        $security->verify($request);
+    }
+
+    public function testCSRFVerifyPOSTHeaderReturnsSelfOnMatch()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+        $_POST['foo']              = 'bar';
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request->setHeader('X-CSRF-TOKEN', $this->randomizedToken);
+
+        $security = new Security(new MockAppConfig());
+
+        $this->assertInstanceOf(Security::class, $security->verify($request));
+        $this->assertLogged('info', 'CSRF token verified.');
+        $this->assertCount(1, $_POST);
+    }
+
+    public function testCSRFVerifyPUTHeaderThrowsExceptionOnNoMatch()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'PUT';
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005b');
+
+        $security = new Security(new MockAppConfig());
+
+        $this->expectException(SecurityException::class);
+        $security->verify($request);
+    }
+
+    public function testCSRFVerifyPUTHeaderReturnsSelfOnMatch()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'PUT';
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request->setHeader('X-CSRF-TOKEN', $this->randomizedToken);
+
+        $security = new Security(new MockAppConfig());
+
+        $this->assertInstanceOf(Security::class, $security->verify($request));
+        $this->assertLogged('info', 'CSRF token verified.');
+    }
+
+    public function testCSRFVerifyJsonThrowsExceptionOnNoMatch()
+    {
+        $this->expectException(SecurityException::class);
+
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request->setBody('{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005b"}');
+
+        $security = new Security(new MockAppConfig());
+
+        $security->verify($request);
+    }
+
+    public function testCSRFVerifyJsonReturnsSelfOnMatch()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request->setBody('{"csrf_test_name":"' . $this->randomizedToken . '","foo":"bar"}');
+
+        $security = new Security(new MockAppConfig());
+
+        $this->assertInstanceOf(Security::class, $security->verify($request));
+        $this->assertLogged('info', 'CSRF token verified.');
+        $this->assertTrue($request->getBody() === '{"foo":"bar"}');
+    }
+
+    public function testRegenerateWithFalseSecurityRegenerateProperty()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+        $_POST['csrf_test_name']   = $this->randomizedToken;
+
+        $config                 = Factories::config('Security');
+        $config->tokenRandomize = true;
+        $config->regenerate     = false;
+        Factories::injectMock('config', 'Security', $config);
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+
+        $security = new MockSecurity(new MockAppConfig());
+
+        $oldHash = $security->getHash();
+        $security->verify($request);
+        $newHash = $security->getHash();
+
+        $this->assertSame($oldHash, $newHash);
+    }
+
+    public function testRegenerateWithTrueSecurityRegenerateProperty()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+        $_POST['csrf_test_name']   = $this->randomizedToken;
+
+        $config                 = Factories::config('Security');
+        $config->tokenRandomize = true;
+        $config->regenerate     = true;
+        Factories::injectMock('config', 'Security', $config);
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+
+        $security = new Security(new MockAppConfig());
+
+        $oldHash = $security->getHash();
+        $security->verify($request);
+        $newHash = $security->getHash();
+
+        $this->assertNotSame($oldHash, $newHash);
+    }
+}

From 3075273b04fa1d4c61e37d5b9099d797b8a44ddd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Nov 2021 08:40:49 +0900
Subject: [PATCH 0624/2325] docs: add why HTTP-verb-based routes are safer

The security related note should be `warning`.
---
 user_guide_src/source/incoming/routing.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 4392ecdba5b1..70638d3bc747 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -119,8 +119,12 @@ routes. With the examples URLs from above::
 
 will only match product/123 and generate 404 errors for other example.
 
-.. important:: While the ``add()`` method is convenient, it is recommended to always use the HTTP-verb-based
-    routes, described below, as it is more secure. It will also provide a slight performance increase, since
+.. warning:: While the ``add()`` method is convenient, it is recommended to always use the HTTP-verb-based
+    routes, described below, as it is more secure. If you use the :doc:`CSRF protection </libraries/security>`, it does not protect **GET**
+    requests. If the URI specified in the ``add()`` method is accessible by the GET method, the CSRF protection
+    will not work.
+
+.. note:: Using the HTTP-verb-based routes will also provide a slight performance increase, since
     only routes that match the current request method are stored, resulting in fewer routes to scan through
     when trying to find a match.
 

From ae9f434649b76aa9c004bb1fca02810c7cc699ba Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Nov 2021 08:46:33 +0900
Subject: [PATCH 0625/2325] docs: add warning about auto route and CSRF
 protection

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

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 70638d3bc747..899ad0797a30 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -562,6 +562,9 @@ to only those defined by you, by setting the ``setAutoRoute()`` option to false:
 
     $routes->setAutoRoute(false);
 
+.. warning:: If you use the :doc:`CSRF protection </libraries/security>`, it does not protect **GET**
+    requests. If the URI is accessible by the GET method, the CSRF protection will not work.
+
 404 Override
 ------------
 

From 54130d7b916dd7e86e1b1eeca350b74a965a994d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Nov 2021 10:12:40 +0900
Subject: [PATCH 0626/2325] fix: remove mailto,tel,sms from the default valid
 schemas

It seems there are few use cases.
---
 system/Validation/FormatRules.php              | 2 +-
 tests/system/Validation/FormatRulesTest.php    | 2 +-
 user_guide_src/source/libraries/validation.rst | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index daf5061c80f6..2167e28cba79 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -308,7 +308,7 @@ public function valid_url_strict(?string $str = null, ?string $validSchemes = nu
         $scheme       = strtolower(parse_url($str, PHP_URL_SCHEME));
         $validSchemes = explode(
             ',',
-            strtolower($validSchemes ?? 'http,https,mailto,tel,sms')
+            strtolower($validSchemes ?? 'http,https')
         );
 
         return in_array($scheme, $validSchemes, true)
diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php
index 30f89e15df94..76e613604398 100644
--- a/tests/system/Validation/FormatRulesTest.php
+++ b/tests/system/Validation/FormatRulesTest.php
@@ -214,7 +214,7 @@ public function urlProvider()
             [
                 'mailto:support@codeigniter.com',
                 true,
-                true,
+                false,
             ],
             [
                 '//example.com',
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 83d22ace13e6..94789f917e8e 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -863,12 +863,11 @@ valid_ip                No         Fails if the supplied IP is not valid.
 valid_url               No         Fails if field does not contain (loosely) a
                                    URL. Includes simple strings that could be
                                    hostnames, like "codeigniter".
-valid_url_strict        Yes        Fails if field does not contain a valid URL.  valid_url_strict[http,https]
+valid_url_strict        Yes        Fails if field does not contain a valid URL.  valid_url_strict[https]
                                    Roughly equivalent to a "fail anything that
                                    would not be a clickable link." You can
                                    optionally specify a list of valid schemas.
-                                   If not specified,
-                                   ``http,https,mailto,tel,sms`` are valid.
+                                   If not specified, ``http,https`` are valid.
 valid_date              No         Fails if field does not contain a valid date. valid_date[d/m/Y]
                                    Accepts an optional parameter to matches
                                    a date format.

From 2ad981a938a4cf4e6f98d7ffc19a76c33dc2f498 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Nov 2021 10:22:49 +0900
Subject: [PATCH 0627/2325] docs: update explanation of valid_url_strict

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

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 94789f917e8e..27691f084a55 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -864,10 +864,10 @@ valid_url               No         Fails if field does not contain (loosely) a
                                    URL. Includes simple strings that could be
                                    hostnames, like "codeigniter".
 valid_url_strict        Yes        Fails if field does not contain a valid URL.  valid_url_strict[https]
-                                   Roughly equivalent to a "fail anything that
-                                   would not be a clickable link." You can
-                                   optionally specify a list of valid schemas.
-                                   If not specified, ``http,https`` are valid.
+                                   You can optionally specify a list of valid
+                                   schemas. If not specified, ``http,https``
+                                   are valid. This rule uses
+                                   PHP's ``FILTER_VALIDATE_URL``.
 valid_date              No         Fails if field does not contain a valid date. valid_date[d/m/Y]
                                    Accepts an optional parameter to matches
                                    a date format.

From a8890e11d93ecdc0712e463ddf88c00f8697d8ba Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Nov 2021 11:05:39 +0900
Subject: [PATCH 0628/2325] test: add test for discovering module filters

---
 tests/system/Filters/FiltersTest.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index 20fdf8770863..6f5a94941f81 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -458,6 +458,24 @@ public function testCustomFiltersLoad()
         $this->assertSame('http://hellowworld.com', $request->url);
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4720
+     */
+    public function testAllCustomFiltersAreDiscoveredInConstructor()
+    {
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $config = [
+            'aliases' => [],
+            'globals' => [],
+        ];
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+        $filters       = $this->createFilters($filtersConfig);
+
+        $configFilters = $this->getPrivateProperty($filters, 'config');
+        $this->assertContains('test-customfilter', array_keys($configFilters->aliases));
+    }
+
     public function testRunThrowsWithInvalidClassType()
     {
         $_SERVER['REQUEST_METHOD'] = 'GET';

From 96ffbf9115052f4b55b5b04c19dcc0a7a2ecdb57 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Nov 2021 16:07:05 +0900
Subject: [PATCH 0629/2325] docs: add section to enable CSRF filter

---
 .../source/tutorial/create_news_items.rst          | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index 6b8dd53bd458..283babc11cd5 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -6,6 +6,20 @@ you haven't written any information to the database yet. In this section,
 you'll expand your news controller and model created earlier to include
 this functionality.
 
+Enable CSRF Filter
+------------------
+
+Before creating a form, let's enable the CSRF protection.
+
+Open the **app/Config/Filters.php** file and update the ``$methods`` property like the following::
+
+    public $methods = [
+        'post' => ['csrf'],
+    ];
+
+It configures the CSRF filter to be enabled for all **POST** requests.
+You can read more about the CSRF protection in :doc:`Security </libraries/security>` library.
+
 Create a form
 -------------
 

From 620a560e20de952e05a1232ebfebe0672b58e713 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Nov 2021 16:25:26 +0900
Subject: [PATCH 0630/2325] docs: update coding style and its explanation

---
 .../source/tutorial/create_news_items.rst     |  7 ++-
 .../source/tutorial/news_section.rst          | 45 ++++++++++---------
 .../source/tutorial/static_pages.rst          |  4 +-
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index 283babc11cd5..0f1d9a79139d 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -33,7 +33,7 @@ the slug from our title in the model. Create a new view at
 
     <h2><?= esc($title) ?></h2>
 
-    <?= \Config\Services::validation()->listErrors() ?>
+    <?= service('validation')->listErrors() ?>
 
     <form action="/news/create" method="post">
         <?= csrf_field() ?>
@@ -48,7 +48,7 @@ the slug from our title in the model. Create a new view at
     </form>
 
 There are probably only two things here that look unfamiliar. The
-``\Config\Services::validation()->listErrors()`` function is used to report
+``service('validation')->listErrors()`` function is used to report
 errors related to form validation. The ``csrf_field()`` function creates
 a hidden input with a CSRF token that helps protect against some common attacks.
 
@@ -61,7 +61,7 @@ validation <../libraries/validation>` library to do this.
 
     public function create()
     {
-        $model = new NewsModel();
+        $model = model(NewsModel::class);
 
         if ($this->request->getMethod() === 'post' && $this->validate([
             'title' => 'required|min_length[3]|max_length[255]',
@@ -74,7 +74,6 @@ validation <../libraries/validation>` library to do this.
             ]);
 
             echo view('news/success');
-
         } else {
             echo view('templates/header', ['title' => 'Create a news item']);
             echo view('news/create');
diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
index 054b030e61e9..97c763a600a0 100644
--- a/user_guide_src/source/tutorial/news_section.rst
+++ b/user_guide_src/source/tutorial/news_section.rst
@@ -27,10 +27,10 @@ and :doc:`Seeds <../dbmgmt/seeds>` to create more useful database setups later.
 ::
 
     CREATE TABLE news (
-        id int(11) NOT NULL AUTO_INCREMENT,
-        title varchar(128) NOT NULL,
-        slug varchar(128) NOT NULL,
-        body text NOT NULL,
+        id INT UNSIGNED NOT NULL AUTO_INCREMENT,
+        title VARCHAR(128) NOT NULL,
+        slug VARCHAR(128) NOT NULL,
+        body TEXT NOT NULL,
         PRIMARY KEY (id),
         KEY slug (slug)
     );
@@ -111,22 +111,20 @@ following code to your model.
             return $this->findAll();
         }
 
-        return $this->asArray()
-                    ->where(['slug' => $slug])
-                    ->first();
+        return return $this->where(['slug' => $slug])->first();
     }
 
 With this code, you can perform two different queries. You can get all
-news records, or get a news item by its `slug <#>`_. You might have
-noticed that the ``$slug`` variable wasn't sanitized before running the
+news records, or get a news item by its slug. You might have
+noticed that the ``$slug`` variable wasn't escaped before running the
 query; :doc:`Query Builder <../database/query_builder>` does this for you.
 
 The two methods used here, ``findAll()`` and ``first()``, are provided
-by the Model class. They already know the table to use based on the ``$table``
+by the ``CodeIgniter\Model`` class. They already know the table to use based on the ``$table``
 property we set in **NewsModel** class, earlier. They are helper methods
 that use the Query Builder to run their commands on the current table, and
 returning an array of results in the format of your choice. In this example,
-``findAll()`` returns an array of objects.
+``findAll()`` returns an array of array.
 
 Display the news
 -------------------------------------------------------
@@ -150,14 +148,14 @@ a new ``News`` controller is defined. Create the new controller at
     {
         public function index()
         {
-            $model = new NewsModel();
+            $model = model(NewsModel::class);
 
             $data['news'] = $model->getNews();
         }
 
         public function view($slug = null)
         {
-            $model = new NewsModel();
+            $model = model(NewsModel::class);
 
             $data['news'] = $model->getNews($slug);
         }
@@ -170,7 +168,13 @@ access to the current ``Request`` and ``Response`` objects, as well as the
 ``Logger`` class, for saving information to disk.
 
 Next, there are two methods, one to view all news items, and one for a specific
-news item. You can see that the ``$slug`` variable is passed to the model's
+news item.
+
+Next, the ``model()`` function is used to create the **NewsModel** instance.
+This is a helper function. You can read more about it :doc:`here </general/common_functions>`.
+You could also write ``$model = new NewsModel();``, if you don't use it.
+
+You can see that the ``$slug`` variable is passed to the model's
 method in the second method. The model is using this slug to identify the
 news item to be returned.
 
@@ -180,7 +184,7 @@ the views. Modify the ``index()`` method to look like this::
 
     public function index()
     {
-        $model = new NewsModel();
+        $model = model(NewsModel::class);
 
         $data = [
             'news'  => $model->getNews(),
@@ -202,7 +206,7 @@ and add the next piece of code.
 
     <h2><?= esc($title) ?></h2>
 
-    <?php if (! empty($news) && is_array($news)) : ?>
+    <?php if (! empty($news) && is_array($news)): ?>
 
         <?php foreach ($news as $news_item): ?>
 
@@ -215,7 +219,7 @@ and add the next piece of code.
 
         <?php endforeach; ?>
 
-    <?php else : ?>
+    <?php else: ?>
 
         <h3>No News</h3>
 
@@ -244,13 +248,12 @@ add some code to the controller and create a new view. Go back to the
 
     public function view($slug = null)
     {
-        $model = new NewsModel();
+        $model = model(NewsModel::class);
 
         $data['news'] = $model->getNews($slug);
 
-        if (empty($data['news']))
-        {
-            throw new \CodeIgniter\Exceptions\PageNotFoundException('Cannot find the news item: '. $slug);
+        if (empty($data['news'])) {
+            throw new \CodeIgniter\Exceptions\PageNotFoundException('Cannot find the news item: ' . $slug);
         }
 
         $data['title'] = $data['news']['title'];
diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
index 54dfdce6a369..685359965ef7 100644
--- a/user_guide_src/source/tutorial/static_pages.rst
+++ b/user_guide_src/source/tutorial/static_pages.rst
@@ -129,7 +129,7 @@ in the ``Pages`` controller created above:
 
     public function view($page = 'home')
     {
-        if ( ! is_file(APPPATH.'/Views/pages/'.$page.'.php')) {
+        if (! is_file(APPPATH . 'Views/pages/' . $page . '.php')) {
             // Whoops, we don't have a page for that!
             throw new \CodeIgniter\Exceptions\PageNotFoundException($page);
         }
@@ -137,7 +137,7 @@ in the ``Pages`` controller created above:
         $data['title'] = ucfirst($page); // Capitalize the first letter
 
         echo view('templates/header', $data);
-        echo view('pages/'.$page, $data);
+        echo view('pages/' . $page, $data);
         echo view('templates/footer', $data);
     }
 

From cdb7b0eae542ddbcf98a971731c5d6316f867705 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Nov 2021 16:26:18 +0900
Subject: [PATCH 0631/2325] docs: replace php with PHP

---
 user_guide_src/source/installation/upgrade_configuration.rst | 2 +-
 user_guide_src/source/tutorial/static_pages.rst              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_configuration.rst b/user_guide_src/source/installation/upgrade_configuration.rst
index de8eee5c53c5..93fbf7f9cd72 100644
--- a/user_guide_src/source/installation/upgrade_configuration.rst
+++ b/user_guide_src/source/installation/upgrade_configuration.rst
@@ -25,7 +25,7 @@ Upgrade Guide
 1. You have to change the values in the default CI4 config files according to the
    changes in the CI3 files. The config names are pretty much the same as in CI3.
 2. If you are using custom config files in your CI3 project you have to create those
-   files as new php classes in your CI4 project in ``app/Config/``. These classes
+   files as new PHP classes in your CI4 project in ``app/Config/``. These classes
    should be in the ``Config`` namespace and should extend ``CodeIgniter\Config\BaseConfig``.
 3. Once you have created all custom config classes, you have to copy the variables
    from the CI3 config into the new CI4 config class as public class properties.
diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
index 685359965ef7..3b8c1272f1d5 100644
--- a/user_guide_src/source/tutorial/static_pages.rst
+++ b/user_guide_src/source/tutorial/static_pages.rst
@@ -66,7 +66,7 @@ methods and variables defined in the ``CodeIgniter\Controller`` class
 (*system/Controller.php*).
 
 The **controller is what will become the center of every request** to
-your web application. Like any php class, you refer to
+your web application. Like any PHP class, you refer to
 it within your controllers as ``$this``.
 
 Now that you've created your first method, it's time to make some basic page

From 5fdcd7e0b16e6df6ec81ca05fcb600a39745d0a2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Nov 2021 16:28:29 +0900
Subject: [PATCH 0632/2325] docs: add or fix text decoration

---
 user_guide_src/source/tutorial/create_news_items.rst | 4 ++--
 user_guide_src/source/tutorial/index.rst             | 4 ++--
 user_guide_src/source/tutorial/news_section.rst      | 2 +-
 user_guide_src/source/tutorial/static_pages.rst      | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index 0f1d9a79139d..30c4627149bb 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -82,7 +82,7 @@ validation <../libraries/validation>` library to do this.
     }
 
 The code above adds a lot of functionality. First we load the NewsModel.
-After that, we check if we deal with the ``POST`` request and then
+After that, we check if we deal with the **POST** request and then
 the Controller-provided helper function is used to validate
 the $_POST fields. In this case, the title and text fields are required.
 
@@ -96,7 +96,7 @@ was submitted **and** passed all the rules, the model is called. This
 takes care of passing the news item into the model.
 This contains a new function ``url_title()``. This function -
 provided by the :doc:`URL helper <../helpers/url_helper>` - strips down
-the string you pass it, replacing all spaces by dashes (-) and makes
+the string you pass it, replacing all spaces by dashes (``-``) and makes
 sure everything is in lowercase characters. This leaves you with a nice
 slug, perfect for creating URIs.
 
diff --git a/user_guide_src/source/tutorial/index.rst b/user_guide_src/source/tutorial/index.rst
index b03163a3fb60..6be36535579b 100644
--- a/user_guide_src/source/tutorial/index.rst
+++ b/user_guide_src/source/tutorial/index.rst
@@ -61,7 +61,7 @@ From your command line type the following:
 
     composer create-project codeigniter4/appstarter ci-news
 
-This creates a new folder, ci-news, which contains your application code, with
+This creates a new folder, **ci-news**, which contains your application code, with
 CodeIgniter installed in the vendor folder.
 
 By default, CodeIgniter starts up in production mode. This is a safety feature
@@ -71,7 +71,7 @@ So first let's fix that. Copy or rename the ``env`` file to ``.env``. Open it up
 This file contains server-specific settings. This means you never will need to
 commit any sensitive information to your version control system. It includes
 some of the most common ones you want to enter already, though they are all commented
-out. So uncomment the line with CI_ENVIRONMENT on it, and change ``production`` to
+out. So uncomment the line with ``CI_ENVIRONMENT`` on it, and change ``production`` to
 ``development``::
 
     CI_ENVIRONMENT = development
diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
index 97c763a600a0..0589ea21913e 100644
--- a/user_guide_src/source/tutorial/news_section.rst
+++ b/user_guide_src/source/tutorial/news_section.rst
@@ -228,7 +228,7 @@ and add the next piece of code.
     <?php endif ?>
 
 
-.. note:: We are again using using **esc()** to help prevent XSS attacks.
+.. note:: We are again using using ``esc()`` to help prevent XSS attacks.
     But this time we also passed "url" as a second parameter. That's because
     attack patterns are different depending on the context in which the output
     is used. You can read more about it :doc:`here </general/common_functions>`.
diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
index 3b8c1272f1d5..ecee4c69eb42 100644
--- a/user_guide_src/source/tutorial/static_pages.rst
+++ b/user_guide_src/source/tutorial/static_pages.rst
@@ -63,7 +63,7 @@ displays the CodeIgniter welcome page.
 The ``Pages`` class is extending the
 ``CodeIgniter\Controller`` class. This means that the new Pages class can access the
 methods and variables defined in the ``CodeIgniter\Controller`` class
-(*system/Controller.php*).
+(**system/Controller.php**).
 
 The **controller is what will become the center of every request** to
 your web application. Like any PHP class, you refer to
@@ -99,7 +99,7 @@ includes the following code:
     </body>
     </html>
 
-.. note:: If you look closely in **header.php** template we are using an **esc()**
+.. note:: If you look closely in **header.php** template we are using an ``esc()``
     function. It's a global function provided by CodeIgniter to help prevent
     XSS attacks. You can read more about it :doc:`here </general/common_functions>`.
 
@@ -163,7 +163,7 @@ is assigned to a variable with the name of its key. So the value of
 ``$data['title']`` in the controller is equivalent to ``$title`` in the
 view.
 
-.. note:: Any files and directory names passed into the **view()** function MUST
+.. note:: Any files and directory names passed into the ``view()`` function MUST
     match the case of the actual directory and file itself or the system will
     throw errors on case-sensitive platforms. You can read more about it
     :doc:`here </outgoing/views>`.
@@ -269,5 +269,5 @@ You should see something like the following:
     :align: center
 
 .. note:: When manually specifying routes, it is recommended to disable
-    auto-routing by setting ``$routes->setAutoRoute(false);`` in the Routes.php file.
+    auto-routing by setting ``$routes->setAutoRoute(false);`` in the **Routes.php** file.
     This ensures that only routes you define can be accessed.

From 03c536fe46861ba6953ee35a795d65b510afed39 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Nov 2021 16:29:51 +0900
Subject: [PATCH 0633/2325] docs: fix incorrect explanation

---
 user_guide_src/source/tutorial/create_news_items.rst | 2 +-
 user_guide_src/source/tutorial/static_pages.rst      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index 30c4627149bb..c48a53953701 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -84,7 +84,7 @@ validation <../libraries/validation>` library to do this.
 The code above adds a lot of functionality. First we load the NewsModel.
 After that, we check if we deal with the **POST** request and then
 the Controller-provided helper function is used to validate
-the $_POST fields. In this case, the title and text fields are required.
+the user input data. In this case, the POST data, and the title and text fields are required.
 
 CodeIgniter has a powerful validation library as demonstrated
 above. You can read :doc:`more about this library
diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
index ecee4c69eb42..a0958ee89b57 100644
--- a/user_guide_src/source/tutorial/static_pages.rst
+++ b/user_guide_src/source/tutorial/static_pages.rst
@@ -256,7 +256,7 @@ arguments.
 More information about routing can be found in the URI Routing
 :doc:`documentation </incoming/routing>`.
 
-Here, the second rule in the ``$routes`` array matches **any** request
+Here, the second rule in the ``$routes`` object matches **any** request
 using the wildcard string ``(:any)``. and passes the parameter to the
 ``view()`` method of the ``Pages`` class.
 

From 4f810ac5bcd6b4f1e85b5113a650a50053f71a27 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Nov 2021 16:30:37 +0900
Subject: [PATCH 0634/2325] docs: move note to appropriate place

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

diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
index a0958ee89b57..d6874bc9fbe9 100644
--- a/user_guide_src/source/tutorial/static_pages.rst
+++ b/user_guide_src/source/tutorial/static_pages.rst
@@ -60,6 +60,12 @@ one argument named ``$page``. It also has an ``index()`` method, the same
 as the default controller found in **app/Controllers/Home.php**; that method
 displays the CodeIgniter welcome page.
 
+.. note:: There are two ``view()`` functions referred to in this tutorial.
+    One is the class method created with ``public function view($page = 'home')``
+    and ``echo view('welcome_message')`` for displaying a view.
+    Both are *technically* a function. But when you create a function in a class,
+    it's called a method.
+
 The ``Pages`` class is extending the
 ``CodeIgniter\Controller`` class. This means that the new Pages class can access the
 methods and variables defined in the ``CodeIgniter\Controller`` class
@@ -103,12 +109,6 @@ includes the following code:
     function. It's a global function provided by CodeIgniter to help prevent
     XSS attacks. You can read more about it :doc:`here </general/common_functions>`.
 
-.. warning:: There are two **view()** functions referred to in this tutorial.
-    One is the class method created with ``public function view($page = 'home')``
-    and ``echo view('welcome_message');`` for displaying a view.
-    Both are *technically* a function. But when you create a function in a class,
-    it's called a method.
-
 Adding logic to the controller
 -------------------------------------------------------
 

From 8299a6eae41e252c9869023baab73092133b3dd2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Nov 2021 16:31:39 +0900
Subject: [PATCH 0635/2325] docs: small improvement

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

diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index c48a53953701..81002b2a5f85 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -119,9 +119,9 @@ or if the row already exists and should be updated, based on the presence
 of a primary key. In this case, there is no ``id`` field passed to it,
 so it will insert a new row into it's table, **news**.
 
-However, by default the insert and update methods in the model will
+However, by default the insert and update methods in the Model will
 not actually save any data because it doesn't know what fields are
-safe to be updated. Edit the model to provide it a list of updatable
+safe to be updated. Edit the **NewsModel** to provide it a list of updatable
 fields in the ``$allowedFields`` property.
 
 ::

From 494b9041aa4bf2590877bcd12e269d4ff0b5a5f3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Nov 2021 16:32:24 +0900
Subject: [PATCH 0636/2325] docs: update screenshots

---
 user_guide_src/source/images/error.png     | Bin 95175 -> 87299 bytes
 user_guide_src/source/images/tutorial1.png | Bin 11420 -> 21649 bytes
 user_guide_src/source/images/tutorial2.png | Bin 39572 -> 72818 bytes
 user_guide_src/source/images/tutorial3.png | Bin 31744 -> 46038 bytes
 user_guide_src/source/images/tutorial4.png | Bin 11914 -> 20325 bytes
 user_guide_src/source/images/welcome.png   | Bin 62203 -> 129286 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/user_guide_src/source/images/error.png b/user_guide_src/source/images/error.png
index 702bdde286ba7358e1b18b194701911de1fb4004..4c72bc4e43ffd45c9c1be60763c398fc62d34446 100644
GIT binary patch
literal 87299
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
J6w=X){|DY{%{Tx6

literal 95175
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

diff --git a/user_guide_src/source/images/tutorial1.png b/user_guide_src/source/images/tutorial1.png
index f491ee604e7576179bcb95183f88b5ca7bd3345c..dbd6c046341fa7fedfe877ada1342636244883ff 100644
GIT binary patch
literal 21649
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

literal 11420
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

diff --git a/user_guide_src/source/images/tutorial2.png b/user_guide_src/source/images/tutorial2.png
index 459783eb3fc2ed6db05ff981e70a35c56c1dffb1..b8c3deb6a821b0fb50145a6899fe06a79ab0cfef 100644
GIT binary patch
literal 72818
zcmeFZWmr{f8!b#q3JZ`>YS9e>BHi7K?(XjH1`!GAlJ4#<rBhNGB&0#QIn%v$zx#d9
zb$x%oKgVman9ez$x}Uo5F~&m#L{9uU@+)L0D5&R>5+aIFP_V*KP%s&Y&wxAYK{aqt
zP|y+<!om<qVPP=D(azMu+5`%UI@U;EA5)T^dceRyUw>efjt1G$O))(Dy`sL~P}gYJ
zP*-nPPgiELw)PqxXbo1m2P#*gyU_~uJ@~eUaiDDCZLEp*q}i3Jn-2Q?wUjM?f#-{^
zggDJ~)VwDs2Teyo1teHlBjlKJZCynuLpP{-Qc(eM=y@lB17}1p*zgQE17he>BqYaY
zHFi+*FoQ261X%I(pys(GCBE-USQoW}yEa~B?{63yTN@l;%5*j71;tIj!vr0s>p?W)
zQ!*8D)(}zimEp(RjCl#+$zaKZpFM*l3oHBKz=l!eexnIi#~_9cx^RB>te_OJ+THJ2
zsLk<9JP~e?VF@-WYTFDdYU>y-ISxe+Vb^t3KF8=c#GY*$Lw)^+pHEL_8qc0x>Y$?f
zMLs?~@m@VWbxPymCEKyQCZL9cntrY4JrLBH0GL+QL|xKURu+mDxJHD64zqv)EDZ$>
z{Ja8wfL@3Tg+c&+V*)=SSulT|!U|`>{<((9`1PWolCY#C@LS2q(Zs~o$=uGF%b<!8
z$ZFO?S>0J(R))*S&W6#z*v`;|(cQ-WR}v^5cP`-4#>CkG>~3Ri>%`^GOZwLvT)_3O
z+f1b3zg}^+;w4p=g@A?a98JJ%jBglUlky>h!C)RoV^c0g5wYLNf&cN6nmaq&b1^Zw
zxw$dAu`=2@nlUkRa&j`gW?^DsVF2D>aPqKqHgIRKbt3yalRx>0m^c|ZTG%^V*x7=A
z<!fMQ=i<yuO8TpyfByYlPZM{G|CD6w^t)L=1DSq3VPa-{&Gb*+KvJGxcex-I?k3ji
zA{I7)d4MwbI9S<u{(Aradh(wV|4ymmWa21nX9Fa3=KGI*e<%L;!~aeASCJb3De~=G
z&VLvAuP47#@-Y2s`M)gjx0(OC3)q<tnTP40KI21HH$UNmf)ap|6cJQ*hd#(aNPp2g
z+k0FijTR?}lw%Bs0fI*b3vLxtBZgDc(moT|qS?MrnPN49A`2u<hJqIqj3JjKmyAgd
z`a*HcqL-mrQhc<Vk|BFAHd0JnyR1`O`oueYx$CvB8d&rK5e^fLh{sz;C{X();(!P3
zzVRmOmMqMkuVi40#y6H&C?sQk=(D>J1}vl)sJ}h}BcN}2k9G1Y(G&bHXqENDZ@Gyj
zI4FZNWn_6v_=+9R&Hd5mJ<ffJc|Db*QLhm1#8C4ia(TGS(IVk;f}vIz@O}o_ba>xP
zQ^}$l@E=~i|4uDsOBE&wLoV>^BM3M7*g+*>Xqa=m>7|L3Q;3B|z~Ss8CAGIkCaxIx
z>NVLh==FE;2vtd0Sqzu)X)00PtnM0wSP^N3m1Zph$vO-PEWxU#Z6)H^ygc%YZohcR
z>v6?Ma^xKI)=~nd->nFyjN$Km)LJEz)OcBu2SR>MTN%Gr{^ra0`e$+D;}xG8JG~m}
zIk610GLP+YSKXJa{em!Gg}T&z^pOHVigxev%)c5cwz(_NK){`2pHYwyNhvYG(0_db
zcBr5pavv-7QmVY%PQ^@Y)(EnBeC0_3(FnQ7xm}OqbBm#iHEL5|(5WhS_Ks}`|2UBV
zmmqd6q^7sYCo<_V++bqmITtG`R_P1c(6BHOjJz#jd>=&dcka-b_85>A;<QtmQkak!
z6zLTne=7o_32^W$HZI}L>g}bYHjhe<k{wF_RXX+H6R*%!_WPCfD|8(7|5WfB2^3*G
z`VonY$0w+5L<%Y@t4NS2WTjJ&z~CIK>-Z&o)ph&l<4;KXLZy)NRV`iU-$wI?at0Bu
z<!-k6-v}j>!Od|1Sq5MULv`Aj+7dl}-W<-w`kY}#^4knpqW*?EBC%uNJ@mVRz&R?^
zk>L4sI2HlmbxKRJ)b*>FKx$YhjRZIe|6iX|4(NA)oq|SAKz#V<hBClVph^@-h2rX{
zz#WqlbT&MO9vAyPMmT}2sS5{8ojSeAGDZdF36Vr3z@xlqC^ZE>q}F|we~%>KTR{ML
z5!n_qOyYOS-%ny5;HX1uKGArQ|FP=dofi%R^Fmm`{v(ITpWgi4m;)*S=J*Ghd9pvV
z;P+g30m{OA7nt^iB<}AUf4+_R1M<q8J)9R+IZqeKIeDBy2{al++!8uf32E%*SO-^2
z@;B+!_=J}cE^Xq3t@;Mnqm;;9?nsy4Rv)}nT#G-;Un|Cy7W(>;b$WFhHqB%yRL^*!
zfu_cN&TzRwchGY(XX(b#A-_Sf+P)X{0{1XsuHz~BMfsx0P~8FEVN%b}j{?eA>g}H8
z%B8AoC6xg|RKFXd4vw*4j&Cu~Ccxtok)qFJ+IsgQHn=ALO>|dZeH@Q-#6b$X8nRob
z9OiftF-GCE&DmyGPk<t+M~gDGD&$m!E^CpHw+eDukxb^*FcRN$;U#I<TuZulT$$lF
zC_c=WxEp3B8ITh~@l@RF+zOA7G@LGbW^&nCyP2rTF8x{YIoTc)4(;KcS*-O-)^tN^
z99zmtk`ko*RaPd6r@Ny>&x<{=3m5y7-yH=ygk#yFM2G|hLqf2n^WB>rhYXcO$n|m_
z^@%;Gg$bu+nYu~gNR&xj8q$@k^ET-eB^Y+HLksx6i4zS$5L~9Ds}KbdN2QXPC}`tj
zg)C(vEWNLPCyffLvl-E!XEsVDcyv=sWO6%PsCT?RS(mx^nBJz>_kl32xZ$P68^bS%
z-OV{{`Ru;hi^<GJITxpn&PzVG=Lz$*W(XOu9?^Wa<`6#Czeh3f{XI#b;0s85Lmxwm
zRzWBhWyjBg|HE-Estbg@9hfuf!N}>#%9}gYe2OY`-qR$fkWj9oG~GZe0(v1)DOxMg
zLg6!V`-32#&Fo)EX0d`NYJS}A50|-n6w2rwnSJtMWV4)(cN*hV8%kngdbnF<DyC_Y
zj4h19pOaqga0{`ia{3`hqfwJb!0AYC-3|%4yE;y~JKAR&{?KfThWA=PwNjU`#8c#E
zG?i`2sHf>*{QBpHaD!fpbFugN*M5>=VQlyQV>P?|Sq8^`LbqG&ULW1@Om@kuqh*~y
zL?J{ELheb?H%FadxWCqGprddCWFkmLFlY<3H|k3Kzai!!p)&A{bZ`m$>K=m+5QnW-
zKQM(rqSxwyh`+25%qe6a<rF-jFe4PLWK-oQ1Ik9*>vLS--NzM2T<3x<w)k%H*^J3_
zr^akFmEvm2sj=;LkFLgH<5>!)Q^9*8Ud?A{uadKUNs9@(+^A8C!*5s0HEK0qvD=n;
z-Q1szn>^fJXzVB$Pv%MPwXhFm2?pf}20im6?zdT}Lz+M4e=3W?APWtnM^{-R^egfl
zxuUYaoHrYu$QC9PG!6!xLi$Ahvs{G!>din3@)wHVMfq!qyzFO42Y9}el;4JNQC0<V
zX0PIOW1eEmrIC?qHYNKi+nh)8BtZJ%R3(OgK1Jvw-9$%?dsH;^6`m<K78$|NU0=O;
zXhwPR%IFBke7+|gz(O&To=t4LcY|$w(KWYq{21Fw@$@~CX)_exHm0<qMe1~Gn5y1#
zCeCfeW3hULoQi7LWlo0*n=Z3VL;{NfMvUWx?`Bh}SgEjr@op^$J;VEe=jRtJ$Gzei
z=bO9Z&SP3ugrH|Wn|0z3I1FP`qQrjp5$Ag@X?%Si$L&{qQz9CbW3ev#vy#z7yvBoZ
z6qC(PxE?oKYR;T}q0Bk5pZI(T_EkTJnhj>SUC!Qs{9I|(tFi?0UQk0MFyrqiFMp=6
zS$%NcvCmh+p1Yk8MlbbdqdH8~GQK_ET}XY_*wY({OZRhHRV%Toml?AGS7%zY`mks`
ziig$rfd67zY3zdkq$_Aot>^YZ0KNbW(*O<>rDj6P_PLu}VxKD;O%*_IF*p6~c>umh
zvVdZ!R+Zp1sH&V_RIZ#t#m-lK7R_7rlKxRk4|W?wIA5)Dn#B0&i0$F#2hZ;E;$h-U
zgN;@<!fxkNyIN$P$#CLOo5xw6)tptH!RJuN^Bo11S$W^<bp+0{5!QUO@w5!5=R`c}
zeNp&@ODU#E+8Yb?t?H5fmNO-sF5nkLUI)xK+i4h%eJ{-h${SZ`wHgaXg{9?IN*AMv
z`Q_r`;_9-R9&h*SM9mKuT;fW~^f?f;mvntDR5+jR&rCvUX1hX;T8}$aNb^H6B{Q~c
zDE4kI_NlZQtYdRTBWWFKB;;rv;#foNxy3&a#2qd+a;sb(uNGG3TTB%Ui5`(L;EgV2
z%4Jlj8t$X@8s^dBQ*-FnY})ZY?Tz#Q7z!iyrPlLiR=+ao>-4^HoUby-mC59h{N;DZ
zre)@en7PsD5-^s?cw}@LUbJ5BS=rs7IbEOF!4q@4>`qE9=q-$medqhL!wH~a4#eXL
zU0aJpO$A`VAX&Qa$-2NaP!{`KFxj8PWZ8Nmt=D3($sx%3mm~Y6Hm>emB|q%#1bmKD
zZ}9b8M(Qymv((N(PW0byp|kS#RNEp}*s#jl>$6;V?H%J}ktXg(XR@fx@SN{nRx21B
z9P`%aAyK(~L!(f)DC2V&I!);S^L~bWegqcP(3~FnM@-9#Zy~t4MeqZ47E|?Li<v!A
zi}{*-+nLTMAIB+K-it>&OFoU=NfYC>t~!TA8YQs;xeVHw5*4R0f4(vPCmzn@wl`Lw
zGX5$^it|@dTnjqv4+?f;>6{<D(u<Ak3X2{ivFQo|Iqu79{8VQ%a#&1;lo>)Hm3FIq
zmNNN=l=C&6mNS;~^;StsK3B_o+$mX&Ol>DQU}7ZIk_w&HJ)b*qU_sql4<nvUd>hXA
zp76+{-bx8|KE3U(!HQtWahNOE+#&px8I^i4IB<-&uvpt((5Y2ILsH&_@a!)S=+_Pc
zHbXKVl11A`q$ri#)BH)Tkc}O-qIoCv99SU>lBzyTtZWKPofpYXL?g=-UOBw?*(~;%
z7F<5ZoW<a3JMOCPz;xE<T1IH;$EGqAcP5;UnsGLs)Ag|^TuH~N(!WYyJ$G1E>-<Ps
zXmXHUs*u~q;&!BsOUo0F@5TbhEg|z|R7$#P8qCDTCaPs4<7@cc;o<pQHH(Rq^wv<q
zd7)mXSKUS5bT1C02aRe>Xs-A&H2%963QnIt<O_u$7w!v%GGnWd&ZpNZ6@D06aE{z1
zEn9P<^>9^G{J_DPopV6Q>8L&z01{%+`e;`>h5g|nna88X5!RYyvBBo!lpMG0T1Eeh
zOn-*pHAb`6k?aEzDn!ydBYJ+2kSpKi&t+rMKi(RL0~`xQXjRr;rl*<IP$sWso<)z4
zUAa&E-(~{t8;)+B9QoJ^8Y7YXxoLR@BWv<hu~}z8^Yf$qfl)B%mxo})regl-ZBqW}
zX!M|mQbQBHfXSHjhP$KMmDWClzQuXBOuJ*{YXBU?tp5YyWcgyfT=K!$m{s<2&l*k`
zwWU&lOzie(8ckzGfhVyCh!jykUojGAR3$5@ellMgcSenU##SRHxp^({%%t!A%Y}Mt
zz>=p+PU9)t7<Q3343t(g9x<tG+-hrquHEpsmMB=-<7+ud^UgIjJM>x&GCKXQ4*N{C
zzfb6`_k^4`+b>t02n?X&zm@rftVKY^uN`QDihd@~caxXyb<{j$V(ZhiN3R6;+HROz
zd;pO&o*4+>ey^VXB=+}g?Sm2eX_eX@?OA&`^&ddL=4d)vQPx5a8yXG?A_;xVyO!Pj
z;2f%bc$G%_7c|u#Eg$I3U}(Gk{rFu7-5$IOd}M_!XTuIH3~kXbuO<o{T(v_B%<ht(
zJ7HY<fvXq!<j0A$b64-oJ3tGKw#%BjUWb0P)LrG8(+4Z<(h<oOmV6M+i9q&MZ>7jw
zCAs1};?qywr%1g02sX^bg(kzQ-&DGvaqTepE)@h4k7V+SYw*a;c>q3I0<dHbclb!X
zAeIK9z&>j$&HZ*bU#r#{$DsEZO@r1PGVyvA7tVEOxv;TJ1sa>kb4Rd#c7$xQM1_t)
zSC0R|`C^TS+?anCJ6-p|neZCwELT6J=bl`>HfC)h%t5(WQAND*?sS+*r7KLAmR677
z1cQ!D&zE!hW$qP^>HTtxPVNuh?x>@9B{>IenDz?~@ANKUNq4&MT3}TrrHgF+?YauU
zILLtw`akdnjIeYCmZ$@+O|9%S#|Xw>u3ju6$=#AV1bZKm#JeHlRoIP)eN>PrH71Gi
zRT#WV^{=i;D{@Gd|I1^{kwmmv?GWaLRH{LvOm2^Tn|o>NH?G$?9Dp5}CsfFtZi&EN
z7Q^c&mw1|V<$TIg151ZE`;u1sx+yZ%BDz-~vLt3pEIip;U0hL7(R-1A#~m^k26aL?
z^08Z!*KK)5P23Kj!#)cWL2t(&W~F8QgTtfukT?r7&1eET4t?2=AWn|?So>vol<lPZ
zn==F#ggH*H4(vS~x<qETqUBb%VM!`coM{qssF4B806pK7lI>GvRYAIUdv{hHi>7HQ
zV|E=|a=b~16%N0`y1zfo;$Ue*>Z?#fKeMqiymzjOh-A;%TRhGl6$742Sv1ym2l1=L
z{#X#b%Xhd}5CT(unP6YN2Pc&jIi!=lpwNRs`}kMj2sZt-U^1Foob;R$K)3nyw+N`e
zafwb1d)COwzb~DM&w(HUV}Pjb<Fer0@mfXwAJ5Jn1`&dq0X4uQI*X)Sq0PCUQHAhd
zL0=VO-spJ)OOy0}e8InK{_|H*Np!?g8T&hQ{q6dL!=ZX1Ak6=GD}PVCFR(yhOWiz7
z`#}KGv`77t3xGNlWT6CkPVNd}@b~1E^-vMy|CF&tD!{zi6YGYKIsJ;$9c%=wcpTMm
zle!{nSI5^(S?zv?;-72(nbXEpK-LF&DM3E#ob)s_5q1SmG0d%$&`i+kK_^~j&XCmC
zT#WD9E<9xZ<PXvT0^giX-}QhpNH$DddK;6J*oZ-#z^}L;-}iVD4r6JHIymR4;uQIJ
ztJZ$S<s0;;=emlDIRIuM13(nA`;g2IB?9d-kiQCIr`<2KK(E8w;z{Qjr0X98gRuT8
z>MbQDWpP+dP8<`n;N!hh?7?ztbPl!D5n<R%9k?u)le>^r*87h2E3{6(o71nfFLd1E
za(`nT0q02M2j8m0DmkZq#P72yDk)J=P>7-t^W_jvUmi*)1|gvDx8;h%O5wrp^nBcR
zi+~MRh1tGB2<&gl!(q^rd56nH3y-|%wzT=)g<7-n;|ArQ{lgwh!jbrtx)QTXJEYD7
z<)&^Jjc5}5;RJ^p#8DEOkp-`yOUU0Z3geL?u%HcYgGfX!gs-wS^>vfRCnw`bq6rOz
z7qodZ5a9n=Tm?3P#*&&Pl(PK<y8=$-gMaA5moK?{Q7+KD1$78@+Jr>%axe<=P)s;7
z{&3bmy-c+?06RZkp2GaLb5{~nZwymnTM|;Y5z)XjYpSnNR9hWFQyaVPhj6%@SpOTJ
zKs**zuowTU$_S%>T7oDG798bXPtTt4Ru}ry%YV-?P%a#vETfnmJyYcW3{)PVOHaJj
zrT(w?sY4CV`%Y_qSLu&e(u1WB6#~4!Ck(a!ijXsoRQ)bI;&+yYu>t^8w>drzpJeoN
z<up~Ii&9`XMmFef7t<fa<$eMRfwbhQ2mC!(Q<2s}h#yzhkBI;@QQ!a*z)qIE(#X`F
zMS}joi(gQnAD1JOxJUQjs{vTdPtPB$9?Q;A!{i)q$^PoSa4DGkR@{Wfs36LKa3lz-
z==*orl7DLYcf}1OfQd-IEUSz1r+a>*HD7*pl34G%e-@#?FRDd=37vRESsC&_b}|HN
zfRSt1JA(PG)$Nn_#mwvGi$tw+gu6e>m^~@t{p~(ncNmQu;`zb6mTHA|1~=6Y4M{Kz
zjJ7iyj6_+S2h26>`EujxU;yl0-kr-FuyfsQh8=f)r0JB8{gA;WmG-urb+viMu{#j{
zwEK>D=mQ~l+0sTUgXWtge7ijwAb{e{9OV5QT1=+&PqN$Se<-VT09+=(8)0MiY4`Z~
z9gTno421c^3E6_-ypPwgj<>rrj$8L%Jr#MRAAay30<H&t&IKmRn<D}&VIbN_GVDc`
z{+i>lzmByJpO=>>0XP>daI~$o!l>_GUDS@Gu&T|LuV%HDD>lcyv6xh^X!?#hied)|
zMSs#I@~+Zz&A1G{V)eNtX4#BnszbDN`$^$AZ<53<w3!pBIULRZAu(IHBgTRMiGJ>?
zN%z$o^O$^QA;g(tB`wVc%a_yRDC3>fQw6d~K;SuO6wSZ>o~(%UH-cjL4obI8$3sQj
zM|Q)P2v^C_e7#5Xbj6E!xRXQ|#?#I?Wio$jjN2~p_G0`5r}x0Y7MU5}QtUXvB2DYc
zdZmp&Uol_G6py)c6oWZ9>;}L~G`L*bgm~8)$CW_r*5C3*>gl!)YSSblFni^8zWF}5
z#G$@qkwM0$B?sayzzZ!c83#Ol&6ljEZSV1~B26!s-Exhe0${0}t>-;z+*W+WBhl4;
zT6CuvB)q%0f*PI5HS6OrK8K-vL8fQ-Io?a#HCSVK77XD~sJC7A^teoU8jc4qv{}@a
z>2>Ok*?PJb^y684PGL10DlW{V#imt`p^#3L>In8$EOi}~Nc*AQzPahM2QPk|gpYtu
zG`)HZ2@>#7RP?=&L{$+jzb5L4p072POej%d`xKK=^($sLLR!lwcznACPcW&b=SwkQ
zwQ|3dtk0_7CB6r5i9un1EAGsTMJ4z3`|h%vUSyFky;==}*rl(W4(pN1a!dV;+fVN~
znv;8W<DI$FZ@G_GCnC$WrlVsCZmWb@x+CmgH`3l%#9@wJ%tYRCPBz*RUwE;8W;;sf
z>T37*k0QsW(N^bsbQd63nJWKyXgGkFEf)1^o0A0Y6%c&IwtHO-9n3q)6@ddmuQ+y;
znk&5Kz>MzFuwOZLa>p;2L|fb#(ACtd4fAn?(D_dx>IQ+*Me5aoI07JMkVr<W^H&c}
z4-b&YC!br%(2%*NpBtMGS1U;tQ-xcbC(f(wo)>ZA#2(5>gB7QjT6S~}3J~2py|MeB
zsc&6Ur_0sUq!MVcPg{Hm9&+jRI%GZ&@zNq8At}}vOEw?f?&k{xz{sT?cRZ-hmg&%m
zD=FpccLz?k^?FP;Igk~4uju&=Zm#-HscIO14-qIVtyH~g%~7Ii=YwDbTAywXIu24K
zK~On2n}lJ=^|8LSc|=+-HmLX#ajSNkvmSkQ-wkau?0qNE?6~E0e;mbIkp6A8+NtpT
z$VWPqo>!?bBROm#y=kTF(jt;*(NMX;+Tvy-dY*GnD$EO><i!vzE-mp~`qWjK*?8uw
zattAk<cdrez?n5*_y7~&4@3~Wr`u_Ed!C#(u#8c$Ey_4Fn2%f5Vtpy)h66Z4Zp$uS
zVto!m`)|!5@;LPB-aT*_zc9&DETQcl1+(2alkL}gjn~3h7A2~O&N|qrj-)E8w&DBH
z&Ez?LO(Q0~$O%|RBT;-xO3}!VSOh04P;73cQO6+t5RDe+h<G5pe#K^)2S0vlGQ7EO
zpl5X@_9m6ZrKC)=UTP?jp_D;0xsz?TF+#D{RMrHWzJP%j%lAe!G7slRMxizp`cV3O
zt?~7o-ms3_YWaAYF0rXSFyf{I4^S`q-u<<;phByA^SwIH_Ke{&uZidO7Hn>DqWXcy
zw6fy<;PP-fYK%jpC}G=t(NNTg6ZMKsOtZ1$wYeqCV})GuYt9{tvgXHw6~lL5Mp9~f
zGVS`_YiP!VVnNOGGM<~EfLovXqQ)n6@mzJ~4%2Wqb~@+E*^84rO`P_WF)r@DiW3jo
z?H$*%cMY6wJq>7><+o1|aGgu@cHWJ!j>l^$gUixon%NrZ7QaC15J{Y{<nzF<I33^n
zViAp*oNPpQ+HZpl-iM%IzZH%uvANi@=y_(hrGFDaUas4&sK#nTX7MqWi>dRpMu`x8
zuS&>7T(j1*yx|2Qm$O7FyA@;o{<Nb@tLZ2gMO(p8z{A~Ey3<(f?eh=(UB?Uc()AgP
zr3v9hT7?yLEky~w18y$*gaG2n&*Cv@eE4~>z(y-6ZC>u8PjWm$F)^jj@<?N&PgZ-&
z?~zm9ltuwo&}lscw}d^%!~{TdPp9OK&R<S2mF27HxFqm}N=V6!0GNWVdXR0~E~SsR
z>F3bXbp+ypv5bCLm5~fyEtCv=+ct%{VwKhgZ%*f;_k?F3op%>ha7I2=o@q5&lrF*T
z?L6p|JOGd-{DHotR3-Yd#DjXiwss^gQw6$T8i#@$t%j6V+2f5_bGoAx#RX1N2&=1d
z&-LgH^X1-5>3&0UscMHeJZI@wjazphTHYhE?DR~Qa4OWOHVmQHY=UrUd*u5gJgQqS
zwx|rz&Gi<@j(;VUXWv8zh$tRGC>&y*Ho=qNn%l0Z+uUgW*$uYYT**$^$=Mupw~RC%
zkCK{H`Gmqu&u<taAR&3)i@+B&iX3GegGcz+hmE<$7kg}ub2@HtE;e5TI=ws*61G&u
zf}Xi-g~jskLCJISj<?IEB}%Cid|GU?U(Z=;u|9+W!0GV;y2_4%GDC}TTRc?ljkN+j
z%~57yp_hA0t519v+^&fmQiUi+o8k@O+2+9HTgjjneB*Y+!z(_JK4*s_t*P5ka1+I;
ztP5--#$R)KcUuNiE{h`HevJn(NG7+7L%Kp`E>V;@+)O`RBF}3B6N_d^y*>c4&$s(j
zclyOU;&f7)N%HCLI7zqNHo-(Xsgz$PX}`f_I6i@W)m=&Uq+Lqa_l80b4h5GX{%Fp1
zPBrO9N_{Q8^ZvBdcP9+IKbc=^tJW-q?V;0t0jyscZ5NkXE%zVg`4VvT+yxn%PGII+
zT+(=Q`Zz9sRLAKxH$9wB$+s*oH9Kvt`nj1izd0zaH2xg=T<VK9nM#RrqEtfZ08sS=
z3YUP6PauWlan;kjkLlH<U`YVRPTv4B)<7Yc7A;X~%)EcRJ3hVoE~<&zz1d+gMakA7
zqJ!=-xex0Sb9peID`KKq6%`^?mPgyj({!9&`P@=&PS0}EY_;`h(#20@wx~1Si)biD
zzunSvtl6;}{>Q#Y5M6u~i{TDBMd-vFJgzqN%^4Na5`x>owOZrdNzhdS+rGc&u(o=%
zSI6Gj*h+gw^}f`-APjj-DclLE`6l`*UE``J#=~LvaEoXp4ie=%w<eZDQAmZZ0FFEw
z2Hg6`OAqy{P@g;mA`XY{Wc^+L(ka&QHhR0xhYo4bOA@$931Gdu_;%WZZj>F^50Q&T
z86Rdf8=Fb;8RLv{x;VW%-!0D+t%x5RGFg^8+a6W&E8U;hXc;>m66G!Yfi8NHPU5|5
z;2W%Gl-Ch8&-ruErGFaQcU@6YscqgMnmMe<Wq-qx*Ln*Thtx71DKVzIKtZG3dY+|5
ztR4H^n{37f5os>(>na?f<rbHZg-^#8yaxfW2o_%*1}Si@+?WxwOS#<=e|++jOX@5S
zlxjO0Tbyk7a?_}G3`srlEc7)O2L~`cLs#(Qc$Cldy`_2RI^3%AI5Wl8H+o;=ou2dL
z?zZ<$vb{N_yj&Kby~351zZ+ejR9<|(N$2#VU7wZ}`*1G^zp+y^>vpT?dA^e!D8^IJ
z+6yNMXJWqksCWYmoP6EomdWGJCzqwoci2qXU%FJy2&(GJ^cqz|3J9sNd>>R$LII3n
zIR9`8CKtG^d!<#Qyns*6>Z<Mq2FI+?BIp^n*?4Y5v6E+gK~Wq|EI)r6#|LrPoviba
z{y{Bhgc&^HGIs@0&2)r;My8ucWwV;mDnHdkOi-HrL`17eGMN<sYtrCY8-ynmPXNGH
zBMsK`Ih80bVAOHmD{TPZEzA@TVbK;BzIcmT5nR>d^R(<%Bh!o=iZUC}kqiVFas&Zr
zgcTE1cjgn~mK~5=k~$1WuT6Ba{IuJr$vR$#+|f+d?jUkbkIo}hoab7g6xMHvq|>|@
zx>WWqHSidHfdWwOe8Hd^1~Sw1=62rF^^_X>udAGlq4pU80t>5MOC8&gAD>uE-lh9>
za8CpkM|P%grsQ~zO<c_B<p#l~&*f-9^4>!xYMj1*ydscId#hlV8tq=|6OEx`o9ij9
z!;LPo&jR}<vEkrdoWU)xf>v9~o#ReSxO}7aJZ5wK+#$x?_~AS0gk*u1-DGUUJNGr;
ziv%^e02r`ljBWb`PJ3^3t8yNXcMMnr*i<D>h{rAu7fl{Q-v~m_ajFxy?JhZ`ar$IB
z^u1hIwy8iKUCA4quhCzJ@le<B0`tYBzOf)rmS>f3?h{1Kn5l|IC1%!6`s}lLxoGFs
zJmE3!GH>$aV6y%kql^P2K#?H*it=sG1x#WlBkfwq4e#)A1RBB|*V(7-%fqLV#>%t0
zRvj8_Z)jDpdX(wdy>R4viQBF$9Qx$SptteV3QI4^h@b%OAeG%NyLW<xt$%mbZ>o$7
z2>R8s55#v*0R;#zW%w}QkXo_xB7RO7qClGq^9K#bua)R^1^@)9$hZfsUPs&JaFYC0
zWRWr`n%AyF<Eoz+2n;<Up+uf*Z$5i|FK|ggRoX1j|AgKkj@%80YdWIw-t>xtr*R~e
zZO+5L5gwyr4o8SXY#HmK%m{@votp`T<o)q`*1dsm)t%wjekKqKEzG7hBSqVm!SyZk
zA7g5C<FP0@v)P?bx@GhNM>`$KTER(WE6t+YTs2l!wSyIWWV=*a0BkWNURMV&;+rjd
z(Qk||L!aZ<gG&6wbS?@w4x!&-n!hX$atQ|UeN8r;vWhOEG#P4Itt*_PWJ=f=<(&of
zFv)sGmZa*@2iw0-tn(N)<(+03>K!E)5vR+Wtysv(!P`;;cIdv<*=gp*PyLVd=sef{
zFX$nVQPz?Tbt#!<H?1~xW;NAVQqgl^-t8s=<!(f&Bv-8&&;S(9^E|3dZy^ne(p{H~
zXU|{d=^U(ho-tV1o5H>*Oe>Jh$Pw+yXuqR&tMzVqtTOm)oRRtoPEaX-ub68*9DRzU
z#|S^*St*Y8gspP-t143%%-MONn2^DbRK*@L7C7_vK3StU6oz2A12_z$IHbGh7!7C1
zk@(v;0?8@C%!dkRxt7IiX!f79avrBvOZNOVB(W9j<|p$PX3#Fu(tR3i7mKH6h8P^$
zYGTT#=6DrGRa!1v_S3DHeVhO|FXj#oYzxZjRWEoD3ub8pMVOKV@3-8aMsCgj&`qe&
zsdT0ME(~fv9jX;fit2g>BF`4$KwujPMdkVS3I#(qHO;KodWUPVl|z^pf%FR-$Cfb!
zc7rw?#Xo_bYCM66+}%34S)h<c&5d9qpE#4a$_}%Q>wX(2<y8HfX(S#D;u%F4xF-5S
zkmw$o1n#4`914jx7iq#;lyDOi^4pwMzfT3)9-7}Y6zcT=g;BRqX%$*`9Q3MnXE0J(
zQBaFH76VcuQ(mtnnhfAGpFeuCjX&#wgNCUR15F0Pqtr{|TsD^6Z~@!S^!F2N6G6*j
zxUMw2_G01&Kb0dhAc;^tDn-*LgSd^=NZjFG+{P&z=6S!tRlnhxes6zfhszJ##}mZr
z?za0g(xTB`^5tyIU7Tv~G{ZTR1F;dZ>!LtH?Z{Fw`o3sKdWQ>Cl6(}juPX=g+Pyx)
zR|JD_B@oaL=6XIOl584$!21G%!@iZPL_d$vM~Qv6JvALHKZ4uyz}ae%YR4slDUw><
zvEK3?pP<YxfmUsn{z>&7(jSagsaXGR$(ue9jouNl;AAlvY2i8MTn_*&#xx>!eP66r
z>W>NPd0JofxziaqHK!@kdqOSNDGdcg0{DWe;Ja7)qvC|qqG{<;t~-`aXoxxTe4LM0
zeVa!6YO9R=v3Gb>+K2|l#SoH1cpbTP;_;zvkCzWW3QQ1x^m~)A;_mbl`%OCSSk9IO
zkY<2Cyp|uZvyCnOn6X%t$!aW+jGsOS|25);kp5J*uvdN79^6(1E2WNLFc%{4`?p`y
ztBUsGI+F(WpYA>#lNNei9Zi`e(5XeWV0Y7%-cVjl6HoOM`N(AYt$S>_ChF;W{)A_c
zdG&@vi77A)6fe*7vniGJJg^}q%X_L|bV#(KJu|Y#bMzIV1c}B&tf%12p!MyzNz$M{
zH0<X29$UPY+VhvEy`TsG=x`_T_<`>4J-Bq$Hv?qo`{ov533o|IzEBu2%on-HdH!I8
z!c0w3UsZ)!5EuSFqQPM{CWX|F2MgBpXMVWPsWYW@1OD~-u7`D5xPZPyd9Fr8tn?!M
zBn;;)63oMBIU}W~szQN=k@7sdZn43tFn2!+&|xI8DW}H({+g4I{g|hews@SJnjvE1
zCqRur%gzpGNu4!E6^OT&JMskL(tj)6yqCQiYQ{FLrJf3&kmEjl<MXNsUoQEiR9UG%
z{EgemH$(f7X=2%5s<Jk5C?<;&s4!dy3H3YMlOI7BzR~!eMd5LU`z%dE*|tSVE-ivD
z?gi}O;H2Ew0;r~?tI!0UJ{d$@UoOUS<!H+xC?aCFaJ}ezKZ`yi@4Cfqy98<9)c%f1
zH$TIEI~X1o!^yO;dCtRBMjR}vhGC2tS>Cg?M83Ixd=sH=g!tqA9;fiLR}Br|o}mFw
z!j#W^Zsd0WZpLkZL&8dwTt3=HyQ$+4(m4?T3QWN%P^yc#bk=)%JbjP+`lJjQ&3^H)
zai3qPiSph-$ldflFk8-*yo`!jGDJd_DO-;Es{VXoVJnF5QQ~%aO5U?*@J=GR@NC!Y
zlO;*;20DT-_0{8*Zu4MpT7`<z*7IrAm@pz=5qSNbT&lyK`XfLXGR-qFMn0m%jD)`L
zDy4kpB%|xsYxhYr{JgrK=xbszEp5({mR<W++k@A}1^Xrt&?cBl4S-3&J$}dSbGt{E
z+($8Ps~+Ml)Sc@oQuYTBCma14K+RN%Bdk-oTcAVq<Kd<-HSE0579rMQ9^2w$Laf8h
zR?;AqR-?HfoI-Fl$@>c$sW+qs0m>s`nuSXve4IG5I4)JT81x(xyBF1%B=rfeBgtRB
z)v0V2>v+j5q~$n)wqfg{VAcP9s&02)6LsBfw2nrrBHdb1l@U%xK&Y;nLi%x*WP)Fn
zZ%P6bVY662bN82D-iQbw3Yt&E=&?qD<ZqOph)H-KzirSuY9l<rp!p#{*cW<1k54^I
zS+QjO18d!%0XQ;La;7BV;sW60b;X~o7cWVh8y06cAGHI*E+eq~)ch8g{c6wkdH6w|
z_{G|se&ZPO7g&zr7DVb;EL51YDPPVA`Fx8P>v<n)T!<F7ol}`N(0!2MeD<aaqn)^#
zhErImSP|UxvxlSN?N8R$1?18>8gXW%jx}8mz7?+~s};q(-Q{Y(o!9ul{^mLwxk5Tg
zcR{s8McS#b#}C;)cd_%yA4gUUV)~=Gwv@?BuvOwV7~UKp5K9L4q+PCeeC{rXnKt@q
z=)`Px%YE11;f@o14VxGzZhOl1CBw7TzJ_(bBWyI$B7favo1d4*MLOVhWWU8d<A#BL
z9ZsDz19#Q5x!LX*hkd$mGzDk&`po@+<>2$X;F!r3pNwqZu6`n`W91@<LZy=N=^?`&
zI8G~rtNzg1j5r<CT@J|(+-ubv9c*+Hx`0L@gHtW)H8|vJyBn0EC*4aYbnn)pYBxf>
zs%sYAs>_nC<QoQncgHX&-3Gz)wWnKHgv;GEp3xZ|QgZr{cWcNYD7Z6zbeSHPFMm+z
zc;@zgFZ1B-CbaE)Kfl0$ZzO7;0$_||4j9HwU0YUN{?W!^?^;rH1MT;wci+V@g-uxz
zTQncO!?j#J54jPN=YMEx34KZ_vtG`5vRP~}E|L%L#p0~o`5w7gl7y&dHY~k?s$<Tm
zHpa{xKRlOUCLjG&cJd6t3Y}#0EhY@TzAk`%owkTl=Nb+yg~yVK52CLY-k9qFII|5l
zv&mAN00+#;)6;JM*U9~c#pZ7o91wbdZ<v4sdsdxXi4I{N_^gNGIs+)`gu;*a67S%&
z-h^jMR0O#I0YM<ZLcp^c$l<}HU<(_x7-Jv>Q$R&xlKwF1t--p4qyMEb4R8k7#(dcD
zUUE<`+y{A?@b8gp6M*#$lc1ImX@U)}9#4mUvo2tEAiph2pUkxXVI$^%EVf>GW+wm7
z{r~UxZ+Cc@XDtnWOD6){NxC|{emWL<Wc-u@SP$J}Z_3KWGSQEN+tz>7wF;vCepfkr
zt`1e?F$Mqw@=^?E_4(<R^hBiTsjP;#AG-U+FWv;S4|n2*7Admvhs{~z60Y{L^Dy}z
zcEtd3g5||Cw8-Dh`$N?LE$@XKtZ3=J{2!7A4=B=Ltt$L~TIq^JKAOTx=UVwe?N3Gj
zDToA-98MWoq0joi2wXtY8?FK4{4sJ~YZ&Ek^60lj8yXW)9B4cNVd6hj>Tj-=9$?0j
z+w0q2|94IS_5gF#^VQ&g>pJp_!uo&N|3Bj(efj@w<iz!0FPI32p(b45&n{{JnpZ49
zEEq+{wA3ArL1ql7jVfq)y)NS&w}zTe-34IY1~_c=4FVd-1Nvq_%9w9GUsKWcp5S1<
zR(!?p$w%$uM>#G@+s+49H6rwXPg%nx0U?2W3C2nw9u*YY2GlRHDy6ED0Wk2SyF!5U
zmfr92rm&Q8L9JAEG@&0BvkFPz+WT~n$~6&S6UF^LX{Ws8Napowcw@6LJ@b89Nj_nw
zRIT+_jsBU&<e*kKQrC~A+RcujkSKiiArz)IP&_d$?DxU6`_ncTcY;+oK=Vutmj%!&
zf*vFP%;sMg0q;TK>ZsUEx=W3#0K_YmNU!l-YkTy3pG>hdu91nTA3Xq&SU%ISt~Trq
zJWU2bzkikdk_1$Z2Pj+h2Yl_Cw{SQ;&&>xMmDUbno!%r%fO%n7j-T)S82`lIZfY=$
zg^3wB^gs_0O!%)%K&)`2IKmMT5hP5W3w0K!xBHc0^z87Gk{JC~uVtGkpa+wfuB}pM
zjxhuM^jp#&04X!2#m9ftSx`t{Fap*JM`U!ppB^7f=4(t0wC;GPLv6Z*{(C8c#vCAl
znYSzvOg^AdDhU6CqG;M5eIwENaGCZ&C``iHYPKx4Cj><r5F_RTYS+nnE45;vqaauI
zi+2EDv<ax3<um}caq^+%Xso(DXvgq!sZh0CGeU178~~FBD?1-8*%JT`b<iY9XM5=L
z4Iq1?L&2es0RT}TNPJ@8c0Gsz#E}yDQVDqgf9nW%hQk(x8QYdgga~Ip#*>&ju7$+K
z7OM<`)`EgLwGesyi+tUd9K;8lj+dI1eD8mX&p{a5PK1gz>q`juyw$~`i5Nao$>YFH
zaM-W;cRT{T(!g`}r8WGQAcL~7=lGN;xQy`t3%-xeC4TZA7=4mSV>+90(oBQ#`}p+S
zcqlz~8!Kzt6jJdqfGA$PqGgZPr@aD&)79T$<IaGp%3`sh-1X+%*9}rB9ER3n*Ba$U
zeC2(2d025!JH{owH&=N)^ci|D>LsffpxkA8cz8yv-gffP<%YkCZk_V)Dc~6H@0t9b
z8qmtZlQd<>=ZZza>;<fFzBPHeTYVC`oGVphQuARmqc&cSC!+~4%k=0|Sxx`ks)BwQ
z0EnboZxzv7q0f)YTWuEKs_{By5e4eF=z0GXRoYwttkPfMxznlDXj{Q$HCOSR`X@+v
zoEwK=70{Xn032$|g4v}&c`p_uhd$@*`w}|eb=Gln=j~o;7GF%Eh`zvRDH1K~Tz-!Z
z!t)0}^^H#b6{{x7qV$W60Mc&O<$(KEf?D7LodQlWo0V#o?Q)BtNrAjIU<3Rvx52dd
zljoLhfC7HsQcB=Xm#TuIeY4-}{`#lj=tPp9j@QAr&g<`yuy}NTG#bD5N`XtPuJnlT
zI5pJubrlWXKqBg&P*>xpe%^QQl~K#J8W|_bG+0+V+R-Do)yrREeFJo}`)weaf+gz*
zq9$}A9z61N@Q3?JVRYUX(}guT94bH8_NjVCZXOzjkhku-j+|e0kL5{zWbxL050AdM
z65P?Yp&S|eY-`@-M8C4kprQhRmoXZmmRAnwBHx#y6I@4RuYV2`UuvuY!CxRjTaH;Y
zfZ`~NV}1&5fmGKqzhvzWTjRgA-m!$iD5NhEypZwfWcWtAA6rUH^jjbK*Hkpl5GeS8
z+O30J!GE>v_Q})NsW8oRC6B70)rpM1<*;GV7@(yDpM!klc(sumR`SZ=7EH#*)C>ps
zrthW-<<W=II2>}QhvVp;lJtCIH#d#dh|t<Ldeql6L*OVIS3IpCdeq#26uf@%qi0ob
zHeL7glk&z@$1Rghs3TST^;2EgTd1IZA}^Ut_wPuDZ?_L|k4!%KJvP%VGFe|B5PPqc
zZ16(CF7jeV<^jj{zG=x48#yR>-%rk{>6POuU(nT_#d9>Ge?Fq4doPpxx?83H_*LW!
zn(xyA_}T0LO-g%kwXp9Rb_pCNC@jT?d-anMY(=|vHE6e74)mE+tLvfnaizsD!@pcI
z0ZK%XlESt`l8e`+X-BJ_{PwrIg$V7tz5oOt*rH0(q;sJ!__IKPOuTuoNP6-CXxw;3
ziT(U3cV+7M_vy3R>uU`pzyzE>Z-6B+qoWG;iblz_Va+fOlTC1|3g%$3aa{T9EEc~s
z!csd+8W9l9XPwb1U|e6V`USNp8@?{8m>We`MRfA<)oN-lzM+Sv(5yE>y82l=&gV1+
zuO`BeTa{+l!I?#Lkl~rVgp^?Kyr<tEoy5!d`tjjv6?O-GmALabWYwqfuImvvI`M;x
zsbXBKf4s*0mB%;=V*^TF>eLJ4cHs=5cZN+~0(*~1*M38ULlKx_TY2f<$GVJR17unU
zUor<X7a<)8qDQ&AYXP*RRk-fgb!=gKl2bm&_v}~bvA#&?cPls4D+m^qr37OUXUV}g
z<i6-fc%2N+5Mr2-JNx^sB)!xMm?2M0<s<f0*dNNOP&&ACk<DuQMv;_-Q;4o$?*pqY
zzF@5)I0Jn>1Z~X2JQ%*Fp~IG61Vs!tK?M~X+stl{*Qc+KgH)fKhYktrF4DXT0!=t(
zdLl@$tGbHKT$N)&vwq%1$a>=*ShfD_!<WVN-2ZVo+v;YgM(C8)<JfvD)Cp2@J$1rA
zPm?!Z&<3Oof<C5~+=jQCiT`rE*EoJPxj2lMO2@t%{uepQ*>8&Qb!)nK#Gpk>L`TW4
zSLXr{_SVN>bW0^MGSE&0l=9`wle|imB;<B|)9Q($#<Hkl``r!;-d4gFiP3ndW%C7z
zVlq1*N_ujr0ojbEtpF=r7Q6-4M@)FD1!`y#sn>fu&Oy(fV=l@LFUmJ<V33IoBr<3j
z18i9iy?GA3rec;rK#XiWlv4st<h%WEu5Ps`YqVDbWYJAa>yQuo)t?K<gi<rsZbMvs
zk!<ulcPVu8MAExt(JG9?4-$0)@iQ?|1!v+<9JFy|NpfyX-jM8NBA2XLKAQ!OTsUm4
zLw&t#8{8*lcifav!=`u@)MufF2WVq`imnpek%x?){d;O`BN}U&+k|5V8#VNz3K5|L
zhpT{dFIZo9?upb<uxax?qlfKv9d{Et*}q4$T<!3IDDjk$DZhzJ4L_#s58@UQBNOBh
z)YkUcO1S-Y7gHIC-Xz3u7b56;ci8BH_`|BQU6rwAhZH!taFz$0&Eeu{I(mce2So3J
zuPHyie%u;P8s3&oGZ~&`$kA>PX=Zyi>cw*L*+%7Dpj*4*95c9R-E40K(1{rIzJx;%
zD!7Y~oC<S`+;0Q6x%T<7YPFMWFdKym3VWd<9CtEzu!laSAcqlO%0s&lo(r}OFe|mN
zCxk(Yi{ywZ$LWm0##g?DGCs8`vvg|QBR(vv;!0s!|ME=&WH32w$&ov8EyrS(hwR2s
zwPOLdBEQsQxe#Jn2!N_Q0}K*6s-b7E5kAZ5x{+b6508tY+1g!lj`Cn$_#Y36XI!m#
zjq^pVsNvLPdAj<23yVz042KrUuGP5=<Qf)vwhc!z-88p6!TszGuObu}ysW}_M-p+L
zhBpCt;DzK=jLZGfCP<7&+w*!oEa(XKs4-*G>7%etQ@+Q3%5m^6N`>uP`2)Z6ui^#j
zb`RS0?KY&Gq0;34y{&-;aM(F7K!sTJWV&>qmC(<Gh&0U13U<N|C$*>{CHRc1Rw)oC
zW9^yh0g9y|O4-a!$Jn6yY^6fE3Ue2A{TH?hzIG=MD-(1il)wtsx$nIKOJ9L>#YsP{
zS+2>ZV1?^ZYJ80sdjOiR^f=o-1sL#Fdgqr%BZbg8*P?N2dpok6)m8L3R=gNU6_HZ+
zO>!Z}a5y$>7CRH!rfPNx?wIN@hsI1hRzJ*~SLw6TzPgtEBOd-0l*@p%dO<B=t?6^3
zNEN(@RH#Xf_B4QOR@>o=32kahX~ie=?t5Z8>P-M2vvgw&fAJB#{aXGrw;rM`gzA%b
zP4V_Z$NlN>LV}dWl=h7;0>~B=33{C(n>+`1#a+K<Gr+j^h#;6d`v!AlbkJN%ejxSH
zI#&NQ-j=;pp;^U>zPT^zI5_1g7e-~Ean*O9wsSocKX3_5qFPH9lDe8m=u-=5HU7wO
z!`Wfx-<l2hf4*f%zFsbn#s8S!Xj!ee>SB8!rHcZyQsqVb=I}QAvi(7zPM}Snf%GGI
z;`P;MIk7h`M@t$9jSu|yCqYFa5{D%Vfty1o1Z%fH10aGB1aDB&dNlu|{U|i^=<E3o
zz;kunPBBX@3vaXxfTZwxxk7y4>IM9vN1|zU+nSUrgx;XQC~b<IA{(T`o(+Je!J1e{
z5$~FQq*{geBh6_$MP*X`$UxbAp6<VY=}Q$0s0d%vXf@EglF40X=>Kyl1!&d)5zIVe
z=xcgxT8-B~ml|BxqAr0$S$M9~D+ppd#)j3C_OV}kT+OkCcD@-7v`$dtJZD2MNG6C5
zlRJyqXSc1~&v2ogV=Ob+!6zn{X$X6*=p-65boA$M0oZG!&rvI#NdZS+tjBf`5{a7}
z1)**!?9Mqlxl%^YR)o)C8$}iuw&&P8h=I5d<(={mHFow>5KoV;J+3zfeGkqk9&Sga
zZ_i&b+~>Zl=bdzal&pURL(RhA#pTTrlOoCEoLN$qFbo^O7bR4dhkt`ORLi>N3!IIh
zun7^|<f^BP)j2pw+i{c&HA9#Me+26v6j@WQS_8ocjmzFNbC_qV**MWlUduYLCjmXv
z&T)!aro&7(v=HR8Vi2{<O5W`3Pt$y__xl$ua>extLdYad)v_5}Y|Fl^THWI;=Rly+
zA{6g+7h0+T$YS8W&b&TGy+1hlv2xq&fLfqiiV9ahH*-41eRNKkNsL<wzOo8GX2_Z3
z1x^$OHk<xeo94yAhRkr0Vq%y}TUD-dVv1?AHi6st20pL2wHud-w{yB4(9UevE<@Lz
zC*udXxV9l-9X$|9$nwI;RefamaNvD#hg52#)i{VvSP=u9^U!L|S|@o~VGe{rCvWHa
zea{M6SS#U3N795siu!mD<|_3dJ63jHot%8W9xJXKeLnrSimrj`pFevSodfy@D>?#t
z2gH6f+j(pmvT07%RJ|s91BJ+fmehd!4E@;srLCr-hG9^6_u?bq;G8`lF<1aLNVikK
zm9ZLrg~w(-A#i(nX!Wl7pT7t2YuJ$ng!h70Ru%{Ca@ur0_%wxz*1V0f2!rRqz!;SS
zajD;9;*gfb8ez_k2V6Wuab7?|&$|>Va!vUZF31^(+$B0JmwhWh*y&p`S5yJ};+xOf
zI?<8Aa3Vu(?XR=6-*L6O%X~IV(#HZmT|CEOIp$<8+yR777cMI2&nix|lwVk#i=^J?
z>>3!Tz!i1Xr@_SrufZjs8B;9@s~gJne6L&CB&=;*YLqSE76@|)dSf%SKV`=lV-d*!
zLlx|_tGwQExaUc{T1%DbF4SPRdK51xu<CW(-f=c*+p<epNaXhKD6B?8p#5hwwa46^
z0;4cSy%KslbeU0Z=<eN5*Bp^V-7qR;pRF96x}!)PH3r|^!%5CdEm#Db_I=EhXMj)c
zF_AnI<SC$`E`vR%3h#wjV%Jx&9Sb+@9S7AwIldBD=;+~efx8=knbG0%UE5Ml3d*Qq
zd~5k?MVhUVwy48xIsLq^fF4iKC;7~fN9s!m{S(lsI?HsW5)d6Wy?&K`uPhwT=a#u;
z<`tHvJf@NLb(7Mx1EP@5f_BWTT{d+0xdj%RYWR=#+Eu<U{(I-a2>-^i=@a?Ehz<1u
z6_+o8T0v;V<3~nJLR*D_Juwhi7{(;@IzvUqxX~A&l9Xet(<uvGTc{JZ4T{8`ZKq`+
zxbo5S0_s-R#9H)7g(7Mj`#YhvV91f4Jx!T<b<UKUn5+G=?_7vex6cH3;lLuh`+{wZ
zuQ#9s+_%BG#M@`^Sl*I>eGi<uX4{^qCj@xKX25gQ@$jwi2Lc1fnV&@0_0^Tb$Da2K
z?sx4Mvs&#Mw|J_&BNWn1BzR$SI%9RvA0gUn4M+w5_XOO$60m8#493S43H($gfZr)f
zj$wilIN+LqJjb6?Kw_Bk$t!Vr434Sl>;wwm@`Ef;;6aJ!D${rc+*JW^X8EgH`nQV_
zzAxA!(oLLF1-3;tK=f_=cz?67%%n`XX~Z|P)*a;H4`auB_qcFZkg1nRbG9h-T4;?I
zQ0QS)cYRwMngak2!Q~qt@ivrwPyCyxIoGdeR!@Kw$+H!S3(e(IPlSCdmNy{!lLk)t
zR%iL6y7JbdGba1J^}e<r{KVfmxczU>7>tid-Zk(-lHaKBJyNQBG=hLkax^&!A`ILI
zc9-K7Uh@E{Rx~0_1C3i?=9&O<tlLpeA`k`$8f%Co_%#}ju~;0a+U97fS#Ab6TMS<w
zvH7Be5ZLy$Wc5W^NSY2kSA6QaQ-##iod7V2D+Xp;hlZV+Z~!_xvAO~z#B8S4)0U~{
z`yeV#sMY3Pof!s`9cKT3*n8`stiHVuR1pQFTcoACyStH+kd~J2E=lR`kdTn>Zt0Sc
z?(Xiqi*w#{Uj6-l=g!=DXP$8$HxKM*uf6wL-|wgPq>i6`cq@#2FFh-lE&^(ylQ>eH
zs(P=iQHr&{mTC7;upPc_Q|Sd-q0$xJ5^uYtj~51@dLw{8xTk7Ti|V^n{KY=XJD5+C
zvZ{Rf055ciGsV{}#iaST)+f|s=jIqePxo54Y~NWh5Cc<kZwfc`4a2)0&ab9NLtGWJ
zSNmjSWU%l02<0HC1xsB%!RctWc(~tt#}3S4w(us1{eibdI71)@XAGo&q4|e#L!96c
zIdC8)>auGP`5(x91b-Z$KMY{-vH!%(K<h3{1t5FlCR-e~KPvMlfa3o?|1U)2|HkKE
z!|;FC!~fhK|L<Q9-r3@>Jl1-UuR;Hl`a=Zd%K)Vbd$$MIQxFNDBG^UN`{JU1W(#j7
za5)FG0>9JR(Q=0izu#;0s3;OCLu0Gi8q4^Y7_@m(3JM9}CP>b>DEzO3@!y520KvQd
zUqHx8`_!|XnvCZ~X6I!4;~siG-fHLa&REPeQkc18Y~XnVZTw=L3UKxeAMw8h_+Mo=
z@1LtKm_J^42mXw>lzHrnrCL8{(?WE0UtlFu;pX`F?*ky5gY0sFEtg;*tn770P!oO*
z%->Wd!6b|@v40Q-&0FSQ0D9F1O)q+kCF7E$5m|lDH1o+svwO)BY4?A9k^ee?V}626
z4x#JQ%}WF8(?Pa=Ul>$kLPEm4ISboS39^^5Od#b-T$-CV9@f@_G3f~+4?w^j9efRx
zk0Tp@b$t8~b%F$|@0%y+J#Y8fo<cpc9S;|jEoO?-`CtFgHz1gTm^<u?p?K0}mr2Ur
z(L#tm8Ig1tDAaSzs$Y7ryPV|#+msqqT%J;X6dIitw<0DcG~}A`&WK%imE)n7T7_Y#
zQi+!4YfRddd|Q#xJU}l+D)rmoYFzfAQ?0kQy->&!h0j2z>KC8>Pf`?^mw&Q&2hOcE
z`tD2=?dtQK^bnQ1oPXYAC*leee6@>$H=)ZTsN?_RLxCg!cGk1Pd83}dQb)EqE1wjA
zPTl}_7`6%)0?2UKiMiaJq|3V-WLvcB8yN=7RSG8(!V`iyUZC>+H5xfVZn{UkQlYAR
zUknYAiiWkHbUN>ResUzPu*vOF2cmsTX)8aZH-6?Z;pbTZz0rC;-aE?01Guk%X#zm1
zas<D$0197sHY)Yf)-CFUOafepYqORu_EqzBwz+cvjZpxdyL%XrIU375PN*4e@4h${
z9|Z-+IzTkzKURG<>Bk?k->;ekPNxc=B#<NY8;fd(;HgBC#Z!F(L<RPxML|iEQeRtA
ztIP$~O~LrpdeiYj!dlX~WM2219-yY*|1tMJAx-~okG*?f@@n?CNe!OA&cjO`2DeD6
z`x-FPbLNGEI(9lg%U4#e&V?NzhE97SU+>cL0vH;`y<TtcSAIaeF1`V3CF{P@EZ;=M
zFxwm)3F}yG``;gmZAg^tu7OGrLh_E?VB>CK{|Qsxp=<I1nu?c7c2#z_ozAV}vXt$~
zV+ZB^w6J#Dqn#Yp-BnJ<pK_;btyf14f_61PQqb5du6PZbuVZXOdbZ`m1{a=y)=_aK
z`ILGA40qMEx1i`r<*rnm5K_UmeRh$fZT3W~DWXl)SZaS03&$(AX(*oVb`1TGi}c_1
zJ)<Q5JCh}JA*ncOaOfw+0ZQw%n>&;#Z$Js8`0P_B_rRxFaK(6)-$4Rd_eNj0PrVJ@
znEN9*3&rK2kXx{qEjfCMlqk4+GUv~%YLEhgYOuFk)k+qcickLA+?;fUT@9slRe`p~
zY(Yu$TPM(3y<pEBeAa#hPN!`8LNzN@1!9?T)JH0Eap>PA+I+tN`N9u!8Z=g0onxgk
zO?FU(ax5#(QNQ*u38JL(!zJI;hLciUa**Ng4Z1V0Pw|2lR2KIvgPKRy8W4G!23xC1
zro}LJJL42v9|`{@AphTHhJffP#saAL`0HX{9?@IieL40j+Q?<!L?H8Tw7eygNm{Gy
zKoAbw#+-e;KlH5U2Egw*QsD%n&CGqp9li>7Wy5BgYl;mtd&B#6t(<-WelvL+KpAnE
zm%dp3R1-YT$!s))qtXB@r}a0TZ2(Z*_@Srn9CMpe0H;?ANS&&eCKH8f-XIC*r9T4h
z&RPB(yyiKB1($P?GnlCDg3S9P>XcQpCW_Q^cfIyO{L0o2z8-zAML0uJ_C&5t)$xMS
zxFW5OEN&oK^bszTUK>Wc63v=v&<i9__W1l48NP>qp=)5al_VJZ1Wk4Y?!%M-dG45M
z^VtawOLB%v(@9#DWUVF_4)Z-+miJxxP_O|KR#}XQtxiBs1$Jz8B2#D1;e3BSsky$<
zHp7Ki`*j+o*uiSMqodBeu59;ezvDFo@-dhsAkzTt{7hq`5r)>wuy6`2FBAEr8A4Dh
z)8;kv8>VUkFEoPZheO#Gw$Ahp->?ZmW3xQ=P?UGV-L$z^((vWwZAjM*9Rot;x>`(|
z)Y*@;xJ|YcVtQ5i^k>Q^Xw3%cK`Gn50feh*L5#w`=s|G;1qihu(tzHBo#!f0&~k{y
znLi^J#I*9(;4!>(UeYz4Daf4zTAS1PiO~d%;4T3yK*`73(B%S~CyF%-d}!Uk@yXtU
zi@OhasO*VZ4BC){xfBIEC{zSHz82@;<%kU0T0^`bhYdn_>(%;-M!k9*^)mKly9xF-
zLgw~|5_wI}81;A@b}Rm_aD2MHn=GO}LUzb^ThrS;x{gcF8l=@C-Gmad5N;~R<{cN!
z@i}k%+H+oDdpXxKTP^XI31wx`LP$;ZV$ZeHGTlN~gg(QP4BVkM7<@{f>fTmYtCs%Y
zZYgv0QlIu?We<g7rgF@cP1rszS4@pfFj}eMpHLWqcObNIW>TZAzYYn51kW!h9dCKE
zG5l59%RZ`-+7sz}0MJeKvYEe|{t=)z?>9N~tcGR4lfj*waLvZtb;%p5QlvXZFPLEp
zhE{v|3x^JER8UwPVSmIn{siJcR@pHAXV38-`5d*@YPhy2R9bhyN)<mKI}s4|R>Nt!
zpZ{)_(Iu?t<}v<7kefEYPz{#>(M;vQWgA+WGHqMiXyJR|*k^%n!8bmY>TMJ72j$@f
zNez+sx~K?GJk__#28nZqSk<cZK#qLZ#|D$>15;(^4YznH<dkkzcL)|y=|;kMovo2P
zV&{e&Qk>f02kWphAGv9VF9zZ=t(d+C{@;6&pGalzs+Z@D6F8Qdw^zXb6bbB6!6?xV
z)w}_(1-}V>ZFnt+LjdPko1M8+7gSN66EXR2ZHFBd3Lt67BpWGlLjDLNx1}pn6MVib
zHK-F}ea0s?J;tsRe=Zk+bP#Gb(M)+uqB$EU><6ZlXXO;HXFlCybLq|}iDMX7O|sUX
z^iidr+mp(skOQ9CzFx`J<LriulDSGckx_(h?Z+1w_H`$EI`!&8TQi5!v>`B)ld57G
z1H!X@A7n0_VL%|l9Jo-nCraHVUM$dHnEM4MNFb?wK8VO8w+5Ef?2Q}okxUVpSZT{;
zQNvt#Y*ulALhcu8%(twDaY3#?!5mmvbyR4sS(P+eIMpt8eMhl~SLLE;^0iNXGS>X>
z3*1Q4@BFP82gJN%yBhZqNdk3{%M=w9qR82pxugz-$jMcxy^oH0_h#d8q0s{|h-YUY
zc9DJ}jrK$mon!DRDKQ!??zPTTeEv=8{af-S;;%S3y+OI>7?7}WZ>9Vu`}A&(EPf~P
z6;q>QXaK*;N*@#AZSjCKj#J_aZ(b{!0MB4LpEkWE6b7x^52bt*B{DKbE4mo$Ornn;
zzP;c<u%+e8crjvj#lP3yz7cO#BwlMdZT|a&3;*<g4*^K~0{C<0)?$)1k)GGu<QwY<
zTra>u<Flyz>{YgPsbuNuWv@O3Alld0p)^k9T|V@}UnPK~0)+*!8;4W9wkJ{lFqzw|
z33czc3*U@6{FhwK1_wr$apQ*i)|qDlhEe8zjLshFs}n|jpC^mW9nLSnv1fvnVcp>3
znO@CHqN)A4y0PD>Nm)dI9I506RY(#D!Gnj?V@HOejizi*wWXX>(KGiE|H3kyjI`EH
zjQ&}ZR60QiA(h7WQig4w`0;w!GaJyMC&0PGWia<Yv7Y}^o18&|nil{EYdcWI`X1ZB
zf{0$_AtM**d?fOGVWH#q0I{mv5Z591HORx#@8qL86Qc8l!<&)$0e~nBl8ra&>faLF
zZZqCmd<uMLL<Y^E&ioC|!qj2MRYiOM6;uJ_+`3Yr6|VQ-xIAob(tN49aAw6As43_u
zxhr+F`W+YDbBlDfc1I#(R#$|J^4FMaE>opVp`>rmcQ@BsgMR196YWO<V;7_Mhdu`y
zVUgNmEUBRRme+F2V9w9Z&Y22`in6(zvamdyg*TImy?1Zrrr~;*V&Zd%>>DMKK=z6O
zszy?HxPzNTBMUiqi)qwV?{8w1U<gLF4NdUC1yi6ii76whT>MJZuws|!T?($Z^gKjD
zk{e$jdrrI2?BIE`jj8Q#F&@jCmd9H@l~h3P52%xPk()${x^}$j&}^9JxPiya7&>$T
zj!dcCV6fJ5>2-U!!0bXyBX8Z^usPRixq2(G7<F@C_T5D}@{ktJ>POAv-DX7L8&UgX
zQ|h{tF>RbxKgCeyStR^P2Ju5QL%u7AORPEE@m9*+pRG=w|3)*{rz3Mr$`yn|{XC(2
z)kvg#w$0Ccq0zb7R(**#;M`aG<fBtWxHGZCm-W766u`=2yoL0Fj@R*Pb;}ShLfpCp
z^Y$-W+q)aT-+G{EDt-qNv1rJ5Vy16pbBv&r@q~Y$CVT3s>;t)U^8(OmaZEd)vCe*8
zRg&XcaJ8r@yX*+90u`V`d{XG7`>$fJR-Dq$&YQy1_N~a1_j?t?Gt>VlgY965`QLq4
zfj!W?Xiu{;J%tr8zY&O6T^m1mdukn`9+w|LlUYm%c@E;Xs$j85&xy+442?88+ctdu
z^^n40Yln^Y4IVNoRY6f<ebbtcOASdZL(n4&1#)(4B&&)FL-={-&<D`oAWg$re2f%s
zvXyl(gQE58OUlMXp06~C#&CGT$Y5z}`B6|&HG|te9fT*o_p@61+(a-ByV2pK`Ovso
z7Cu>|PA23Jhg{o3SdLRm;M7sKnYN2v2=S$(R!~rbp!N$Jg;W#*pT&v!g2OHNrU7Un
z&`P>rK7LDoYJmX8E)!2!lW@rVd7Qk-xClny`*hXE>&<d=Fd>)0A5B#R{~T(dI9w+W
z3B-R%w12+|<bXh~>+PKTaQfxXNeH}ONdrRLInS5Sf6lOAb2QlOw&1A6@)vIQlLx?Q
zwU4in{*9Xa=ii@CNkdnShmD{Am%Rf!4s-=#UF%15f@gnkeh)SuJ1;u_{!?T}jC2Wv
zqAL$n{LlX0oc^@=wE6VMUvMCZwUC4ByjSsh_SXRs@IGzcbl?2&7Z3;r21s#lOP)Rd
zQ_d5?@Ajn79ljkZ_-|s)(|CE;f;?ZeOYP@>52N=LG1#1bnW`f52V4n)yxs$~@Iea%
z<iC3N|9<&n39y;>5C~oVSiAmj!2drOaDL%Wd3xPp3K@bg^8rcO^ByFbeg{&)w_Bi&
zPIY0Mw^Pg^@H}dRlEp7+Jdw<~=?N1BZgiV2>$RRpX~${MU(OG!8KuT<^V-zwf@SjT
zO){Hh+F0(V$N!$~r#BJ1kWufj1VG}E*?c|A{0}5y@y;OhXi(Je+ylU>X>cnX^oyMC
zAhn7pYp|k-w-`9U=G6`?f%xOb<q0FQ*4DWKT9vIEBt?)R{I%BHkP;6hKZKWoPCL<L
zi1n}CA$@>+ha&V67Q>GA2lx{T+2Y8XZ@9qh84IGXBn1V(4Atz;-WH2)<BS)ntI#&=
zF=`gbrgCnN57n&z(=MzpmO`^{Ae>3F4~5(}uc2XRMCiO>-dpJ!AGux=2K_GOJUPNe
zQytR3X8;rch#^r6k@8%xMJrUBso8Eduw+8}T{K&+BPAjUio*HjWs0aS8S|q=hlSHA
z&0AetdG-T>#4?ty<!+RXFDvo-<U0&SvVn_xiruJ$Z0r;Kcbnk=l1%Bg76X&y&IQ+#
z%M32k{C486|2p0XOc?!z@yND<I-nZJ25QtBCeMevZxcY1TCe!9U$fYU$alAdGyCNU
zFr2Z6v$Z@rN{iu>82;b_&=>vTG#-I_|308`jC&F^xrD(LvLZdxthb8<kX2oh2IvZ0
zaN@OG@~QA4c0hv{+fUb`0p?%Q1S4CJblfvjW%`8ZOqyFX?6U&k!pqcYCqFkE6kaa0
z7#d4fO{B{%Bltt+qX5{X!_>5k{6^blfiibxp>SGGuMJD<RJ!w|<$0>o6g#U#+(S_B
ztOku8pYT19ZlQVpm)4mdg5f;@lEBVLmKeYHuXKRFe4iB@Jht9hwCSg*e;9kux4*`7
zyH_FLK3<}|NU>O|E2PtdDU`Abil52+MWC)ETMX$nd(W{R!%w`5&0?d}!~1IzsC_n5
zN(={+>MgEM)>FAtvgETwo87;qVIg*Xj>`80$Mfn*e487VAG{CLaJdCkx|`}2I}f19
zt6u={)r*U3>ALA=0ETUxxp3KT3`CsAqEmVy&QP|ke+IJdKbM_A5eTemxGLijK_vSD
zH*ko#MX-Ua@hK^VY2WV^4?(;F#O&)Y11*ma>KL>ddHp3onk%0v`WlmBZ=B6mRR=kd
zLC=3E0R4$^oIx2YQfEsI@Ol9d%(OAuaZo)rucC$Gaw)4nC1Gr?H33-)L_8BQ6W<T3
z<<(VZa5t|H^F5BQgQ1HB&f(o~6pvzlRKvOYl`{M{OgmJOB*WaNA>@(dUAPuK5rj95
zr8C?QSF1OAGhZ4|Oin;paWBv<=V(IeE;D%39Mo;%C34#TAYUd2oy+(j{Sc5>Z@CZb
zg5!!;#81)nz6C&@$X6y@;&)sSA_>Pfe+L6Pr}7Ki`tJqvPwmOUAkJl=Y+zCJ2P^^H
z(Gb+X*)E|w^*5N>Zp+LaFL)ImvR7@L1~f2;66A`hB^0VYf7t5-h+~mv4*|*$`zl;2
z=0P`r!tKh+fAnx{rVs)7^CYb)-@{cFhTRj|$rR8taL#Z~Q4rw<l*2bj0(f0vSi1vi
z^-Eu1D+^|T`R{vwlerAOF&oHt-5>SmKD!>`GJ!A$qTZRoA^?h&1H6SMK`s|~0c7<#
zaGpr)OlqMibm&301t+0HA?7xcGKc*cPR5jSgx>4TbUGw=&-?TE;unNx065roziV}`
z+ek9i{~3rZ`!_u=PA~zZuL^g*H?3$!1p_Jf`SXuE0E<V(pfz(r;|3CD6AA_NpuXqM
zxCHWLswO|^I)Fo+H!mVWLq;R@JU=zoNvu2i0=qtATJk%yD<)v}(*X)3d?6*09J>)v
zB%DLNqtf^YC{M+ZI@X0H_$M6r4a1t!*&hGhv~rddZSzlLp+1pcinEVaAW=>Bd7(_k
z2H8E3S=Fb}5Fa)i^5)Vw5X@+~EsF#ZVxs>g{{6}6eYDfLxufeHNL-%yUeP?m>jR{P
zH4;CPkd>=?oz3^+FsK`=$boS;Y#J|%#$(a_iI*xYZUdQx(6^!AUTupgx`KNhi0)}1
zq>wZ^{1Nes`QAYOL@H!P67%Q{K{o&pJj@RW%oZycTC>uVsqO5j?yRoq>*b4hTFo7_
zRZc+?4g7YS64kQy{4aj`O)$!wwYwu9hNS$v|C}bvBndh`krxm=nKZU1OVTlfkr=xa
zd_8ncB<KhgW^!bbD<kB+A<t6YtUkO%_93?f(5T0hMJf3nsCdu0zcc7{ZE<je6mRI(
zFJEk1L*e5nE!*eFqX*n@Z9|F@$MiSXfASW$5ew(QqQ9LR_m=u5VbxL*9*Ni{OsEfS
z{pV$mga|2H`{v6Bs87%^f?K;KEfcrUfpQ>Cvk89(s*s~}fFF)<&u()l)&7I8pXjgW
z+yi>F((E9Y&ExF(WI145`ax4y!e@2a0Hl8}m5I)Lyj~kVMDgIwh9a~<>4Y*)P^0U1
zs1g6Rh(^7wmJ<rJLa!ULe>;HOUc2-WIz#^p<u?>+39a2<AYwpc-}&$ItW1`mV`NRq
z$uN=Ey?)oH%9&IqDLX5=jS-bLmRe2W{gD`MA-sMe6<CL@S)_Q9c5sqg;Q&*F2?_0m
zbOY{)R2x-}5L29=vbB(rUeHck1wiEYg~c<1-m(i)zx5a-tCYe><^dl#RBHIMSJ0x*
z@K8yme+fW?#`x`c*HG&nrRA4E#@+?Ccd!Np%0;6eS~2lM=Cd0P>ZKa)6ZJx1Gf_>6
zu;RHPgXm$9_pDl^ZvZU12J*pK1O5^oNAPPP1@<uNL%s;q$@pa@QN)mqKOuw5XAP;s
zq545uFu~*y2e%=0IspCEazW&h0-H|jvwYBK^MAvVH=tAcd{a|{B*2cJxw7oz%vbt@
zfV$@EkpB&Cu{bLC#++d=qiP!cA<RCIzvlDxh%vhBEh3QX&K%A+V2Tv$_eGdguoBip
zBAO!j!WZg+gx;?RH(pjVrTV&afp}0E(8y4i0?~NxXYx(3$N|?%_qUgmaV3BQGhyQo
zWK!+j(+_VO+Wc>*_`mvzpP<5^7UFU|82H5^g!C_<gS%3QIRTQ&pKW@dzWXH%M33*c
zE(YOe8xL;?eZ?KY`p+38m;>?hwQ<=u42<9Qzc9XZK@&on@TZgR)nGyWjFNcb0TB?x
zN`E6MSgHANy`4BOqoH;1dN~$ehcSj(&8jWDUJ-51(1Al0(jgqxQS~+$LF1PGal1xO
z5PE`9HGkl(^cJdxSM_eXHKs6D=4q<?#q`u~!lrWs&%YZAI8^ag$?|PYe7ttukyaPJ
z>fJb#09uf%Yv;62Ra`6hzAK&2vzfMwn?U_4fi=+I5btie`qd=|m#$WXH9W}N_BU<k
z!*J|O!BaKTarb`HmO|KaI_2(iiA??cz#NGPi5>W&FbmNk+w@T&-nGggI*U>-xj-S{
z<Q3^d51Nxf6H|u-F#}k$JIdfjK-_$_-f%`Ym9WA?5frp%nH4#3>a}G8&)Pou7~5NU
zR&1&i0k*ICdIMXn#v+xV6k>yg(9J1d;rpIN$~~B>w)qit;2dO<m`Bv-m`Z6rR_2+8
zMUF*q{W;+fBMCj#p$v9SYRxf#7ue#ELLx71Zp|D8I1BFh^V3LzsEDPNS8YaO>HR0Y
zf3kp2W5-{O9B4cwSDi}pit|ZtSq&`!*VZ}YpvM#s1<tNBnxH>)&0qUFdfZEWnSvuS
z6R=2(O~fx)x`d&D0BzB`jIk8aF;7y9kArU$fa}nc5rE2Et6tig5rAt|ivzk*hv@5_
ze3|nLI~PM22P4Mhy~q1|hgr$=AH~HrYpD}r{7gcF)Tq=wWn`P6z&g*Vm-m{o{29fB
zmMthXo`jX!_|*$K@Q;^Lf>%t&>lYua-Vs3j`C@|dmY!HM3@ap${d4ov`-oKVD|>}&
z3XsD5f4p=s-VqoWV^B&Pi2Sh?e1d@MIfc-)TJQJ2b{yDBEzIBdi&`n6FX-<d@H;>#
z_?K5iNdYa<A1`mUK(Jr6Jo;GlKemETc<(`G!x<Qn#Q)=qRv>}>R><j6QvKrx(=g&#
zeM6G8B7c5;en>+?uwTQBb|vM%j*B0%95sS5CN)+g=#Oy&V>loP_B$x(mtXkjfP(k>
zWCRA}TvT;ve}4Vv$O(SX;#f(3uNBph|NcRbEPtPzgR%|9UuWPQJuGqrBQq>|PWijP
zfAD`N;NJrdP5|d!dbGmzQ!}*(D6~>g+I47wGH&Y-$h|6nNwN>b+kXnCE)V3n*wSOY
z`rbB?`#xPk;AWHW{w!J(d=juyT!(zoxoWK=pr$kctw#+_{Z=OHW{R!h&<H5&ET8JH
zqSE%)Y0ie>=r&iNIGhI5nlW&0mI4`ElVAobUji^@&9Y2ttYQs;u=hd4yue`qNsm8C
zJ8vgj9?*ZgF8Dk?T((SPi6K6!{B%_d|1pTEOuq{lGPUi`1&1bT5g(U8K;L4u=iMs)
z1;EUwfiui(`+K~Ffbq3fes0a2P4FPsVIwQh`fc(JSc#-wgHKZ?<si{4M_DcqjjF)s
zmz31B01lPaen)9>0V9YgZCKwOq+wj{6*nA|$0~p9<ph;7d7$B9iG9Puo^K6AcyBpn
zOm^YH>+6#B`zQMApmr4@3;zN%0khyR^rWcEd<R))&Cq2q?(1$38is)|0C$nBAH_*(
zHeSJ+xu!&kQiBK6dmDO<u?JAViMDvQQnYpY3yYtEY2s{Cf6al#{y=CNbZoW<LTQ9Q
zMad4<PnSXL+IHgoz-xqIfS#uxKC$VAd+Z`VZ-IGDRl>8lZGh)uO0N#o?Xh;rzuN$7
z?S5z3d~K*qCo<0i9$~^UIYPce$}QbL3`7FkW2<kEmI_z81MpmWy30Uwa8oaHpR;hv
zdvqD!a!0~u&=(W*Q{AK)C`bc{!r0$AH>}x9Eht_R4%f+g^s;~6|E9cchku*rQ70>I
zQ8VvQKpq4Z+R=c=tJQF^<(wv|k&d4*_8SpG2oiHe0|rh{Bf8KBnSk>8ko540woN#x
z+*amJ@4dmBnb-Ebuj&<gIV^akHgo=3luHUSmYRw&R=H(tuFByV{5gDcQ_e$uTen7w
z$GuGkooLIhHxyo;F~-B)Cf}{&_Z0rInRuJKc$?%2l^-9}H7Sc+cx_ShZ0SBqB<h86
zn1Rx}=BYQzQx~P|!zxnM3uOtBuK|=YI=rK@>lSBrH8@={Jc5f=QYzt@fB_?ktQ`u+
zbzY0~c$K9<G?-!5;9xE-)+-!iRXVBVI^BhBY4!pNfqHqAnud=M7pSpaB_0RuTk}{>
zfT{%hoCTUm)boB<d;h)XO|*IKvi}1ex9LIIs9W^*w*^SUUZc)p^^>$TV2fte??D0%
z(FYakpd`M651jdv1LgGyDfR#*TEP)iAE_`JCf}=cq;N@KZ{uTn{2d{ODb%1G%05$L
zsR4txLWw5!uMr$oVL>pc-1Qq>R6Zo@e~n;r&NZlMYUHr~LFFbE@x?2+QgD3{f5vZq
zxG|jto$cKs@E&X#QBy@?E_mChsAgBu#fnQo6BU&x6;yL(OLVJ6^NU=<mCY65Y>($h
z7uE0lU{Uc0^q{J2x%!?%aoxtrHEj**VzE2XB6Ui~NyD#1OY2O{XM_vC+Imn78LHR#
zOm9X{P)AY2)J7GHlK~x+?V@H;x4xGdOnWjsx25_c*~Ze}EvBQU&N^nbgyfI{_kN-@
zyIjd5Ia!tsLz&VTWO9~k=frMUjpxaGTz_OiBV2*C2aC1I9M!(2q?CFsW;^s`ET_K}
z7>|6bvG(2*S-&&lT~~4KIQr2QT6;QQ{1v)&4^h7KQTk3*i>bFHYRcIRMIO0z$s^Yk
z69~j(?d7}<^tFkfS_YUFcuR$cif)dyXq(PPvnR1!aCgia-ShP!MsFks%?s3%iYM;y
zDw!=$ES2RA$Pw()-7m^$YUUU{`qP<yEa$k~^M*W$Owuc4S)QK#^O>rovHUR**qv7#
zfX^M<<Mmhd&l?>&H0BXydfhj!7S|%R>s&;;#SO)E`8uBAUH;7AF*J7`l_~KzQ+nZ5
zAcREJ<LSvmx2yP%Tk}ULccl(BF)=5X;3-ZwXPu|#z}$BgiFeXCt{|1DZnJd?UjPWa
zb&=j?L_>G007e1cC&|YAoc*R|+9JR%*Gm$ey~#{hka<7T>ntKWe*|#XePMv-n_EX<
z9Gn8c)?tU3F3++rsu_R*7%=_bOO=smtlaMul-v~}ZDupbNUlTi!NbFQtcB1ojR2(%
z-|8DgI@9J=56M)ftX}cAyE#6khdx&lP;R|c6_OIY?UxC9VPy~Zw`5H><=I-kC+yqV
z(Plt@a=!hIRxaQwD-3v0bvYlGUmf;V&svx^V&a27p_XT!;X18+G4yKsRG{gb#}S@6
zFt2;~`#clpx_tUTmW5*1IEUdE<h!T|Ka7t(w(Vfp?=2sx?{0wz#?k_&__z&G8j<Hr
z?g^1`zq8m5*0k<KA7L`wnj7t3n#Y%lb<MZic*(l|C46PtD1HA_2rAJn)nUe@>z-im
zz72l8l@~SUbKl96!9w=U{`cl`sEEsFX}%rJQrSxNO<9bO2F~%4FTb92<Kgs0-^lPR
z0vZ0k4<c{RY0_`aG%`m4O*PY^Dz~O=k5@4EVeI)#<H2kEu;)g*MKu@p43!xJwXsya
zH)$K`(`J1kH~87#4U`Kt5v`9N%&Mmi)42Ao4e!D8MV761tm8Euju*?WI{IlF1_Dr9
zx);PxeqO>7hL4ZbhuLGqd|lg#z&dWqaVODi#Li8z33`vZKL|7~X2<1}$}Ou0J?eSy
zJ7?(U2;o$5?8oKh8!Hp{GI*D~UJTG2TiPitdFDHO^I|L6L!vVmPpUOY?ea(h&lIC{
zNjXo=O3O4J;SD$h&TuU(KU6-Ll%OU@>&q0Q<=86t@XJ`qs^2u%ImD+(Ewtx&M=7kq
zyl)oCW~^&RwL>nYgm?_Y$=CZFF&(eq?<<@dIn&!9=U|l-Gy*tl+FoI=HDBEYH}YM$
z)`qLBrB|)D+|D1~oj;jxC)1n3S~+4XtJ<(%o^T6LN893)tJ7JFhQS7F#pZ{kCb2!T
z>)FMJjZ33av5wFmYksJ-q9JdV?`wy|Yhz(=x#yH@?C5-DG<>T79(a2%YmumU0I=La
zzq786Ha=5ZwXyx2g?kr|(Ss0P;pLpvn3GM;cHY5a?~8?bu{rIM>Y2|Rm)5;yQ2zAo
z3o!t6n{Tj9c533fD5@Q7<d{U-5a%<2o16BrI_|{WMBqN+Kb(*$+0+PNz`VGw4GV5L
z%t^8h=RGkVvd_G?cU#0b=*_(iys3=PULnFe05Z64lj)1g@>2U$^>l~!EQ>ms@sZ{V
z{npNt)fn1zyouX}kxZQ3V3_2}sG+O3chuLiU4!RfCRyothbsXdycU07!8F9)!I!xg
z7+>x~<4M1!)i|WT9<04%qCi`_1c6U#+K1ftHf|iV=8kcbbzl>LYmferw0Y6T#dhT@
znah(O;rNi*gebL>_&QAi{}|{Tcbz9<(r;^Tn313aaSiE~MX}9evfPTBE<Qf;HiRWF
zc8h+zUY*a>vMlSw;FX@74vK2W6Img&1PKO)VfE4<=cBkh7irv&*JU-ELFB+amzV2I
z9KrX#CRI+MH@!r+E`i<f>}yk(jsQcwF`bkMN~sTvYJu{cVO+_e*7f&wnug+kSX$-G
zt9t}X`Ga%5ovRquL+7q#nPa}3Tukn+uW-0f^Bh6!Fs3=yKE|PTW6|&mZDY%xxo{7c
zy`M{)M<zj~?U6r;g=WAM6D+m0*n*YN$Gpd4pQu^g09-exIkJ#XD8okO%>fQ<do9^}
z&|@^X!?V%TbBwUd(f)$_oF+ykkjDx};xEo$UY3T}*!Q~Cx1k&k!>0*{FA1x<Vfy^C
zI36N&BXgE@g^=3e0Cwt1T=A<M<y+UmTj|ET<J2s~WzJ}h8YPYrMEODwvVLYMY*9Sj
zSEvi}GfXr1JG=weS^G4k%RJ=c2xup+z+rmJ4$Jet0e^+^+yWGiVQD0Xk=VxP+`ZaY
zu)0Rhhb#NA59KF)GydJTk{N@AU2G(49L@tLc)u3p*qlAL$r=P+F20JCJqS27&Fjtx
zUA-sq1b}l_$u5>yYq_vU01LBdFA=^kLE}+|;(=(kyWX-We}|rDcKcDJ;Fou+qWE_#
zxRmYTmP#V>%gxv<rxv3RBRUO{Sz9B(+_Jn%TKLOqEW&!<(8J9rNR-;7RR<Jq7x;=0
znOR?5+1{b~^~2zPJ31b6rQd%S%*V=$!ip=TKPJO=j{7X3(=QzEz)3gaXk_iho0Cp=
zv}bcK*MnT?*YQGpd}Xq|9czdCr8{^*gbF_GW{k7O9CZBQ0J0&2L7-?c+AI=nYKQ(k
z^l(&n<(=;knn@7VI{Ee-tfWJn8`&!CWJcL$2ftV<-&;1e-4#B((wpOM{ChF4a2VXo
z>~G^oAwy{Eaj}O0%}vkhNJnF1JUqob&_naSt51wesYpV%xE+$(nzM>_L^KF={CeqU
zr&E~`L%gWS+K7sO{wowhbOEbz$wLFnn#e#t83`w|5{1o&%36RSHw)AEY-MOL#aI17
z{Fa~lu5<U(7PUfpq)i_WO)781Pd+1=vF`pQ35`5_yA`32+Yv`)!Laxeqc}$XnF744
z3bOU952Hgu_n}m$CWi`1+6R%<-{2U&3Es$auL?GZEXW&279O<UO1buN^>YcPX2Qdu
zEMWGL(OUQq=B|H_*E*>&DaoTcM&Lsf6wAUfAXi%yYUsbk=HzW0tNbePQNfV#PGO&O
z5hf<V32%NcfsUv-(vO%t$jm{^>5yE^iJ`|!#~9*aT-~=mN&i5Z(aAHzmMyD!G9&F5
zM%Sq<XS6|QQ{_#nU3?WhEcVr^B#|{_7A71gdUWAFKO<Zp=R&Ro?|UsH_f0`pFGeg(
zHq+()I8HBp_d`La4ENqXDpTyVJ*vp+%If;>i)igK(bR_mPM+Ja-JulLvZ?Sdk}~i*
z*g2f6!R+Vya9mAC!&9%q17Tk*KR}$IZioMcyGFVO1BEpi&+Vvf0Vg{-|42$?E_gM*
zwpRX^l4Y`4`PaHv6AwoLd<nbIZ~OIC4S#AgwA~9p;p!i}WD4Oa^&SmPn*~augWO~_
z$6emq1!&*fXIDIM#SBbwy7cq=oJt#%xpgDrp5e8e<Mu}f^J3#u#DULY*ig2|RH$jz
zZ)`<&Wp<(t*IsGn_^F9Tqvb}ZxwRnAA&rJl?+UJ<Nj(Nu^;_su+jJ@MD$Yt@7MJ%?
zKBO2(S?eZ3Zd-?X-d)&jT8wujFVc27aK5K$Y(sf<aRjM*lWy|>9@TkQM1AcL<aU(i
zLL62b@qXupC>n;U&U3w;*-%~=QESJP26<k~@)#0Y>i94Aw%4Q`VcLqDYC}lAE&@&A
zuu`9$O6WJGTy%bGWZ?OqU;8feF7cAbd46JTj`)S36Xe;mD|DxAC8jFNacb_n>w7!<
z=B;k1Tap|pwFGqgC{16gfsr^#ACE6?ST-)lk=Kh38c%(Rcb)=sTUFXgQcYe=b0$Ve
zakO1^FZq^LL+t`e)orrPB7_h*#_>D&W@y-+t;8>WYUeCySi)C4rygrNt4TIzxqyMx
zoyIwY?ay2>#~5~oVi+7e5udSUTj5FdMw-N`@_aZ=C#=Q5RqJbyQes<Lj#ulvMEa09
z5LC5G4X+PVtk}K>ZqniY07c>Z_ex8AG8zE`Rzm8nqp9AGh|Fx_pWc*a4DtaO;cocV
zFOOpykrb5eN7b2A@C=XHOFp;5es3eaZWdbY6!}Hd1x#Po`WQmE!_pAX?=$oZj%@r)
zsgV#@KjXzQg39ampY12?zQKI$P=Bko$dOy=+R{j6ozXN8%8mU_OzpFpibh9^4I(^W
zKDv07d{(!5=+|?3<7^~YZgH0cS8WLjjWSCqyrqf@C)L_IXzwh3y?U(G<zP40EjJUq
z;#7|3*PK|ocA{(8D_2W(bwsPjrm2QH@NB)9vPCR;!$C8xjwA)!Bg1gR5~uV!m*Tc7
zUNl)Wp!78iu2c-+Ti3V9ylH!N%P+PKKQykh@)BE<gdnP`9`+x;J0^5sB660mHBrlA
z(3__e`#Jde`h3St<Fy3GgX(5b_WjVS)IDZhO*aiWrE>A9EHu`K?)zGKiIz+M#d?7`
zanrjpKBGq=jNW!uDR#B_?0uQwM?CR3xA>s`P`7opXsLQc>+IjbR&)>6rZ9{8a~cg;
zY9%q9=_IkHX(Jigs9#GTT1fhkUO-xZWeQ(>pQhM7XZBIw>)k_&OV2Gf@qQEZ@Rt+x
zVvepcq`qub_wd_6n;|^38RAzwK`^O$oXHk(1BZ_M93h(p35%bz8&uuY($V`}^H$*~
z4eT*j?6c~dE5cBM+j|@d#B~I6d9<pzbA<#p*()>bK1M5uN6Oas+l0RR*#ItzhcxGn
zM6wf%(dnrAr$X5|n@LKHg`$xRuCNnIXvJcxr0ap_)#VjwIcA)IAR6I?>yw{^*AnR2
zt1taeWOL!9BHSvrsZY&A`$O)uP)o4o!^N~CPZiAHnEwu<DrVQzuo^mP&>S>}(m5~`
zx#RsQXbvy=Ne-c+*|ye)Xx~g>W${ujJ-EqH;!z{Mzd#8)4MS|ENzz?03ar(LU()Hl
zFpD|-S--eDExT<mguZaMc7(eiIOY|+s~akKPf)=)o|1h;IP<xnXwM(pvedkKzRU5a
zaY!&ss_?^9$lU|fp{sc!vWf>e<Fu8ZRh~ZczyNecXjUn`kg(q2gut!5^PCO7z%8k?
zDEu`NloXBGknl0g7l<tnv93pk-Jgc+hGNk1`00ceW%B>Y0-zyYzk-FQB;u0r3zx5x
zd`*V~pOJh*_lBCNLi}TQXqYBNZ(p?%d#qa;$s$cCom-yCS;Bdsl=0FQ5))N`{(3U&
z?d#Qz*OI6{kY-EVz_f6WNSx~)k%aAm;TZ$P#Mz5{K<&|Qtr%*PTa+<21Sjr>MxRF8
zmmo7?cH?ksoGH&=h`>m$DETAuK*8G3SvH_SZb9Ax`AXkjOzeeqKhYo!*O@u{K1)U1
z@+O9kw~ntb!lxw24s?@4wA2>Kuj-6?1O7({3_%YAW5dFd)>Zw5n;M}xBUtXT9%SWf
z;aK?1O>pD7)GvkjkBI3k)Dn5XLyfEF9cD%P&<wzWs#f~(S(}cCje~`#TS>)Q$wv!v
zmFBM!BB&U;uj=LIXiT8yY{c>RifZO}jJ8HsTJzuvloJMfZ-$Pw7+xeycyzWLsx35B
zGFSPkd~{MfM7CsUrchgaF$&YN_RL}H{RkN}Q_7<IBKs1~uzJEYRdqSpf!1a$*{|jk
zfsKG3X7ZPzqW}YmEr_815LoU_|F#`mnhyjLQi>0Td-$O|L=?;yZh1&?Q%GbL($pre
z>73;B=ejP%kux(H74Uo|rS(=>&u`S3S;+<LY=Z1X`_IJ!exzfM{CurE$BBaPw6|TO
zR9cAv`HI<BbtxDYm$mQ}Lr^EO^{&pUY@>aFAcoNjLPcq4L#{ln*vfV94xLnUh5v^h
zTztBnx2g5n?5i*jSXtKVN8fd`nN}tm!~{koCE{ex=sRHI^4@@_|4{ZDB?uTO6(y}q
z$ZozIj#7{LLO+9x$C%X<mAiI-)HtVCx1J_#^wCXs;@va_5C~ul7-JhVZ6%CdbjAz)
zg!(wzj&Rv0<9MWUP&VgCK^-iyf$Nw0-MCUOB*DlYbF_by&d|N|p*KnsEt4La-w0Qt
zYx{!P$sn4uqXwcg8Y^7ib>+g`&-kNT_Px=okVeLDRx{hVBD%^A13g5C@clX43Eh5J
z;&G>F(aqTB=jKTEjN}5f0X%RfDl7fAdEFXNBG5HHcs(_rIYE{4a~_AH#v`{=Aax@d
ztJ$<oMwJ4kcq|ND1aE4;%Qo<6I!{OnaW^6k$d#{QfoniM0O>~3I)f-&0f)HX6?3jD
zoMssvF?Za#yr_7BjilcdX*9^MKbsyqIpsqW0MFlblGh?)7^!_H&WHDwW)fniv^b5|
zj>maV8p<dM`Ie)CHHD0df=P&)O1BQDg5kJ{RzMLUYn}SC-HZyKIj;Fw08VPQy&o@}
z&qKBYcjAb#-S5a-#CiDzilJZadom;eEJ2Qr0V1MxYCeJ@XvHpa)}c2(+6B@b!mC0=
zE3B_w*-ReGuaem_jvYe<o8?{TD|(<}-DRO~!LyCxk=}0+)XHQ#^I2fObw7a8HH6cZ
z;gKYe!l58yKY6|;HWwJpU8V#f65`HQIB9fE;HrxhBRvqhig%hVE*{V#e%Ig5>ZGd_
zEc-H5*s$Qs^yv||hjjmY@&dW=l>-jMJ_Asg-}~>%iCR}LtKIdO5p2XJnrGlCmTbNG
z<br`(${dq%V6@&J(5XgQaepy89RBLG?GtM>0@fz^fL#>%W96BjYa8yNp^nJgZEnUT
z{!LU7_BuF<HM%PpYC-o^-fIMuxz1gv;ca6ESYI_0PII8dN;#BMz%;>Z_kcE<YnvP?
zO(95IK!WOax;ws28B0VM?x(n{v?CR}hQ>FDvdNH6nAXuxxs0g}xREA%H}Hl5WtiYK
zuH!3|ggQ|Ou_4_!Gp351Wad)kwC@HcQtx2+eD_%&ZMRAGH9swp$%vam`!tST_%$+R
z1+Mh%ahQ`!eU2zR5afY5_m73NLsM-R!S%+^F*3=;k`{8h=(yyYLicQGKOD=_6m)v8
zN-K3;Di(et<D&ZD=UaOx(%0g|E94@`@v^1y{T)5y;#)(bH*&4iw61~WacYv|@-u>0
zZ8CY?%RD)$q<AZvngTsUi{KIU3BP2IG_z4dQBd`PCGFA;t0zMXDnqgBJtsYC7n}DX
zUjJldtAVI{iI7`{hTvNcf7dqn%h8=n#(wIKEb@JCnup*j-Ek75z-~_{HPYUJ*DvBF
z*5{zot}qQ5D=J^Wlr+QZB84($ghe96(U)V!3#d0!z+FU<67O<#-%9cMTtfSW(VN6?
zKgvNF^F<aOY8qn;-bTf$q_l+7U(hZ1lif<POPLm^-^hFwNq0<I=YhsE4!({%Xjy!C
zn6RJJ-ZVmt4kDBKy6swq@)eyVgIgE#VrDcq=Yja%zt*l0;(6|`7&NxGJ2Zo}Uy={D
zw7&JsAWal%7&+A+%}H(E*Nu!d8mZC~N>3hNUZ$eN*oI2$Bm6d)R9~@z_eg6I#4NUr
zwXG0z4xg8f41cjJBoG+D9O<xPl`3VK@zY+Ps2{)9o@gVI!+dTT57yEmn;bIMg?c^w
zF6ywBg=R|U>p+pj<%GA+HfJ8MyM=RFI8;CBl`Zaaqtkp|Yzuzj-4Rm1*b(%$Ln_Q6
z6cvLi#j3}ZZBXX0DYx7eyFo_-p)4Ea&Y-mI0a{+|SmSA-*|FUwuA`{IlGa_O#@LCE
z$%j#&^KZ2guh_c=vyBEFxp9UV@?~*~+a!4<o4N*=&nZg%2uW+Aqhd>DeUO?E>Dxo>
z@}N{7h2}^Hx2dbG@msRz2NkTgcdL_~&o`H~^MVu9Xo!0+$3sJIt>)`bxam~K-!<!0
z1qE0bQvDE%kyzS#h1ZDQ+4|KHR?4w>71M89bUdeGqep1LU?rm{P>TFgXD7u-t-nc*
zb9Fhuw%rc5FE2!*;TC#B4f+dc-JHVIK2iUQwAe96YPV+cUuNVql&HZTKUzMvKtq{<
zTyX<B!FOb!lRcxi7R0Izx3inH$FnV7MQ*BzNym;2mA-@uP@B`0Os>?OrlM6PS@&q<
z$y%_b8^<jCA-}k?auITKh-jg6z!|u3$K)*j@gn$kmHUZu>$Z7g-C&>>$#&9R6UK<J
zZym=N3=x>>d&%L8iub*0mp-Ez5}}giYWUsV8sxRON5DLPx~0&H?vc4o>IOO9kk2C$
z{^4xMl~#bum*2(N#Qi~=fCkwvPGQ{xZt#nJBm;QMLel!M61rO_^=N7ANwryT=9alE
z*<aOi=|YJO&*M`RJx-|uR#^MF0=RZ47DJFo?bFk@S{wPUgQfB>X^Y%@+d;dF*Zlst
zSs|mko@6n`DQ$IAZNW!J2BGHcyC9bcN9Sy*j!f8P&)_f7MW`M0l+;gHA~GDc-r-vx
z$$pdl3L~GBn%Mc-RO(U5w6~eB43Wq~&iv!;ioX6Y7G`H6@ny9#Jy7B+ufEM~TuMOK
z%L%ON9h`?w!7+zJroU<D&3oxWgH+^-IJ_bzn%N#Adgl>$N^O={m1mhpr}m1lS@0TW
zSPHjdqd|%Ndzxa}xTa`Su!M3m&7fl$^FW}H-{`RG0VmxEUgYQRB&Kzkl13lv^BRB}
z?X-f=kG0sy8R}{AF3;hrrQ1}M)rwv|nbz@*W-U;~PW`RPcvora^vHOI$)||S8kSp^
zRdg_3ra0n2GpPOj;6ufL;9HZ1-JP8i>O()HSnd;eQ@{>M#4+u-YRWErRA^Z}&UQ~$
z6KUUSQiPMDl_xHYtA61t0Ajlpj9=liiBC8VQB?41es7jnTWsi>!oKVvy=7bnv0La|
z7?g{j-4uhGpazD@zXV>UO)EfN_BxDEeD!!AiJcInjQPEeD$a<f0MGm4H*CEDA=B^F
zLTMUUhIvN{5oqmfBHq|EywNkqiW|MJFUGExCpVq**~O4Q-89q%AyH6{{~GyLPUg3c
z+L;ahuWP6)b*DDx$BfbU-brgGfo1V~JH>fQxIkQ`;d(Mjp@PYe^;5y^O&-ML^@7Ca
z!gVe3R1=e|gL?T^<1y!?WSbp_q{qT-*;Dl$Ee>ZHf4`G%n=S=&J7ve-qp{-UP?nlc
zK}ZiyT0b<UU|SR}f2bJ}hElhLBoiQBQn_clRg{9RcGu=)GU^6*MHh=rs;d-5yc=D_
z=f0nMH8<4gt3HN_2^T+342OL|jK2G(>QJ(u{KRFL-G?BReD0G*xtW4v8Hx)$IXa}6
zegc#IPs)yjaJWX)-pU1VgQ{><p`kKGg{%85nx2bCqgFOUNq6dV3xr?)BO_@IA!$v+
zy(lkl@samLlM7idRq^NX8pI+_E#pWiE2|RG8o+s1ctTF9HjfS~H2g#C+i%+F0<Ac8
z%O2Gt-SMv@WURw}gLXx1osx<F^EU@(Ah)(oT&1Z$=%GXLokz0X@R=(1q%~CkgzZpx
zlhKOuxh#<@K_?X<xV)|0+9A_M%^ZkHe#odU2mdV^sg#8HNIFRwEb<lQZxKiyD^RQa
zCM`VrhbrYG3D{m#t{OxB57o<Oph{6PZ-1@*x7z002b2iL@&DTa7+vrGKMWChKHNNm
zRn+}{(D4NQcPj-g5BqXWw`-@{yI_iojoI^uyMRaZV>$Lb<?FTX^qd=Rc;_r$+Zzw;
ziLK3!@VAV&kwX8taInO_Wiy_Qkik2Qe%IR%^+Z>O9OCwDOm$ml-(~T1b-k%`;kqs_
zyXZAy%4Iy;cU0UPAtRlwJ+8|`Ykn{c8XhA$@KDBLq1?Q8I~p12B{bz-m;LJ+G*pHl
ziOnEFI9NGl-HQC0?|gS&lYem{7QOF9(=df&TUkMbxc~W(cXVt*vqA62?Su!ah;c)Q
z*i1N|Y-m)yVR{(vd+?YSmU@+)Y|}}H1&PT$Ey<VpoBxn;p%cp~V12ZUM3}IQm35fz
zh*pU2o98W+m*Cv<>eBKYuA7<u+)_|6-M~Wm0$m!|;>!w4nve9A+e+()rvtOa!gJ0X
zcl3GRH@SRY?PHO7C$e0fzR~1fAK#NI`ws=!XCVSbmHWW^)J!IiA3V2nXZ=4d8eKDK
zDs)ndrgMijbs`j#lozaO-OugEPD&jg=XKm`uuS&jZhk+)v+IW3pGd6^^p`FxHr>L~
zVx^1e)ZB~Be$5T<Z*V;FVyNy6%Q`tAp*v`FjiRZVpx>=sliMA4&7)~JuyWl=%&}Xv
zf3J6=dQr2en^n{;*`n64?pXm#hkJOB>$$9ozs9K^el)3~$<@~Us2lWtl?PEeD3fU3
z6_0)9*1Y9P?(uGdi&S`cOm<4FvYVN29|QZd`XP7Uf~&S`(5UKm+J9!vf6Y@$$^4`S
z#sLqhgPb)L$p<~!l$Xb3ihI%cZ}*Ox-o}qcPW8$jUTrnJ(qnz;yxH_>x8mN4tstht
zl@2%>II5F*j{Ed?s}|^mG7=h$^iU2w8!7gdiEJE(VNv&^Zo6m4bAEqzSRF$xnrxI|
zVhv?rzHiwdf~lUQ$SS;Sw|CeSncq)LcAY|jbto-Dz%u~|sqCV38u#y9%Xz-A(sa+k
z=|^1N<kU(<mE9TvF)q8y;_AWr(EeM5#fk#>shWbKD$!JsUOsf2$Xv$2fJ(Y%R<{^l
z+Mt!FKbbZ)h}TjaP*f!;HhcJ9ud(cF4jM~p8C1UG;_}7M7Sh>sGRF!o+C7VC(oM7T
zegE09VO9!L8D2ZmztwkgG7zC-93-E%w$6O?9JW5G%rUizhNpFGq*TZg)?HtSzBEkd
zNn-6<!q^@!8yP${3aMI8wK<vd;i2Bk;y8(zHv4MtKaD;qU1~eDW$1c1)hS!&Rv3yE
zeR>;qfXyt!kQ7sashwt)e738P@3v(qH+Np_X{^xrR`2r--!x4ySE;8;!|@M}%;cu{
zJsqiwRDC))2UqXvZ8KahR!Z%Fy<fkJ8!~%w@g}qivfvvXqvmhcgt>Ys1a<T0dLl!E
zl#X1lf1~czL@MsB=5AJ_$L%hy&bai;vVK}qa$P!>aA+T?5IGKrmU`rE6XhV;IW=<m
zc=-M8{a&5A(d_QG5r-j?RkPs19Fy=ipRj-2k{?JSB(UDS48WmJR`EZmcg)0fkW=B)
zv+eakHQQ{~3~?7UY1euiLUpI>GlW6GK88cPZ)i4T&%{A4#AUuXO(pcc4l7F2Vb9DF
zK1tuza-@^jQF-p5-ZDzXAJ1igM!vw*DA__o)r8%+rP$$@hvDNr4(cNOMHAB@&#0Qc
zP#0^l$LZ!B7lnxKSG+iOEbi<DR@Dr}Z0MJpJ_mbvvbkIcc#P9=DGg2V&U)pyrY>{y
zSgCJLB%0Wyn(YonN%FVzhyHQr{}2J-=TA8C^zS=+T@9p823vKQbEC91;ajCIUJs9#
zioJ3^ns;%1Jl($Rq8`g?%Alv|+#9^Z-6Lcx7`4m_)ADxNnZmocj#o7EV%l||kKx$!
zCL^1c-L(&kTm1f97k`wsA-vMD*{oD#b6<ywR?CQ|K9}nA>0q*npUy|-i+uH0Q;z2+
zh3oFet7x|tKb5#<?+q0ddR*mZqK55g{&8vILL|l#X7ZV(7dsrO>FxEG<V^7$rWl`|
zZRucN(r_y>O=^U`?vCxYtH?qy{U{k97pqxw@M&|AWnrRjm;%efbClHLRo?K9qIv7J
zp4m4hm!q~Cc!wD;3lps@S63YFndUc~zZX0UbBoGt^d?B_(H&pJo6m%!aagqVez8a&
zyF3U`?T_@^G_fq8)igpxq~>;2l6A77`ul7CVuUb|3E!&@PJU@4^}D#)qmj*uUZ;k3
zg4TVdGxrBjFnu)d<!o4Afbn=mo~BgTxo_LEwKXxs#ZClo@&4Dy0hBu8RAKP4BVJ9R
zSyn9PG_MhB{j9@odl2UHrX%a7{e};l;>art_lT@&UaOo1I!751W|a<P*mrIEx9x)(
zo$FC8;g`zmU&{QiD$Xaj^urrDrrXWbocycmtJts^=I@U*#Qw2p?jVs%VXf5oTr6f*
zXtI`$_?~&+%C-nwv@`GiKkU7AP*!i-{;MLTq;!|0bazNfD=1yk-Cfd3Bi$gafOL0v
zOLt0_aMSGT{yy`2-!JZ&{qLT==b7;jN1VmF*S*%Y&hxyE&vA@J?-Im*d49)UuTwSY
zJ@xkd`<!|El3sWCao+^1)r?l;FO{P51N)kF?f{brt(1@Ka_6%%sa)$8r-G?6cTS^l
z{SFRYs8o1DDOa<*XHI*)`WA;u1ah`hQ(Qyq{uJ0NV+QioLGZOZb%;*;VHg%AY|G4E
zNps5(|HoEw{e#*?rMC$6`pYlfcT?f4ldd~tx@LnL3B2_SdKL8PsfqV*xM6<|V^i!M
zQ&Z1fldw;B#z#Qdbjo?m9cjE?{Pi(GZLmjt;p5Il_k@P}IS&QG8&eY-=^!Oc)wDp1
zCR1wni=>0|UM}RSl>>^KrG;U+GJ>JB_91S{rJY%kIma`ZLr(Q(Q#g}khE&$|w(GTX
zIS9UJ+TH!&P_X9V<?NhOP(%f?6M^2(CM|1J?Txq`p8K=$DtfuL;L7^0LdT>(yK|$H
zYE@aOo(tT3H#eo{eUWekL26c8)Creq!=1-7YXX**c^;V-MU`tdd}p(^PGgHh2Ipb+
zSGs=bwBu9}N2lqM?z5{_-Xm2(VHNMMQLCeW5&~xd`$dKMA364>hMDdU)-14^@7u|L
z#}nb-)A3F=BjT-iW#Y+rP(`_QHq_z7m$z9uQC!=0_{1@}s0Y8r^s$27kE5>8RQ1UL
z6snH5ac*aH8aS3#PU{K}Dj+dZkqpyR^;MA?i|XkSoA3Iui0e(MKl@l{T>iS?!n%P&
zNC8rge`&?heAF>Uc#G8IKds{Y)h8f=et@I3Sn97n!AuT_$ctozkN;{oCj5bFK1o+4
z`@zR1eNst9YM4JsnQ`&=abAPt$d$Z$_t%N4L)(qr7m7E39fyMq9EWNetKdN$@maVC
zi0r>RBGP#Mb(|zLa2$-iVC9DwEMpRg>3`Kd#cclTIC4NV{~gguobKToqG%5KD>JPp
z!GE_uRM6u*ttZF&>#}ix%T~$wxRdFx<6uCK<Es_*m$-i-30$`SUVdRYgb5DnNg!<g
z)pUEVu{&Lw1=YgeO{dtbOFsMtg`b*<lb#NYOqc5Kr`Qjb5(~IZdz=m$n-|ySLY23i
zz~o;Y7>4Zwf1rZ*#3!pjN$+Wy8GwD_{Syea7R&9J1TU8TXbORju|V^1(C!{c=YMr0
z&P_4`NLZm`3kVUc_Iux7J$OTtMhNF7W?o&n%|Z7jp)$GCfzJH5S$iNTvRp;mwUgNE
zLT`7j`q073Xgv(rfXx7RkKb8@TvnQxXTUnq8hE(ZH!p&XRtup12}{G`C0imZw4q<G
z`U?5-18AsSMNn{=TYyE7zWo48kQShyU5CwF(QDT2YSpPkZ67>s!ZS}<X+`fZx`oKa
zO<G}bD*RA*dpKtdFbG&a`fE9iibHkMKQUQeoq`ipyFO2(PU(}kp+zOIC=prrSNlP#
z<8_&{;I><IX9ukHo>zwuA2$O@w+k1*xINxh$GUL?-uEJ7GtK>=ffODYe;teMq8i&U
zA0YT|@e^5M9&jiv17f7ntR004k$_@Yn$&V$urbxJZmcY-Sq(l1!0WZA7?e6MYQDP~
zJ-z4!{)~md3;kFFOGpT8mMXP}I?n_3!jLjoZ*mA@U4HtR^rC_`n_tIWfwUCh&^?*o
z7=HefH;5aHLA_o0<3~AwX$?;}O~+pD0;@lf>f@OoGxdYoBdNp>&Pv$)Wu)mdV_-_~
zb~ZXyKjx8<CfFOty9O}gt@gL&gdwOij{$J5t6MT>pR*{x48H(70BgoER0?T(soHMa
zIbOM6W^w_U2zNMo4BW~?(nxGt9*^EuL<6xapIyITE`~gJE9bn8DBvYd$+w_7j$6B?
zch`2S$7yzbv{ByjJ#5k>Y~-oDjwjt~5kiXq9ZT+6n9}hk%Gm%?Va_%_u=g&I1(X%@
zRr7W-^+3)^0ZH+np^y2-)O;~ke+x9aBn(rc+w1rNG0ZZ(0MWLff9}t-Z7><`0Cn}2
zxO}+*$bh5mk4x_X_v+EK9P}bZ^BImxVBOFMElRFLd98=HO$cHQiq#vQ{fhBvwAFhk
z+CLBY;VAoH*|*++$Q-n+->-@ix~ZQDYcMyCX$d->)UXzZENG`~w>9p3|M6{0J}U9R
z^`@&8o`kUWcG&xlO$-0EU>nN;m+OJi$8RN0z-9aQF;H6*E}*V-L;#<*ug(OJX5f9j
zHUFYo*&9dOMGv!T&M(#-=$q_;8MW;JcsS)8NmhAx3(Lv9O{s@gb%yZjX>hxMZ++TU
zk#Z9X&w3=`2L8IW_q7IQl~Q24CDDTyiEb`wq^Z&8!Rx*EBGVWhW86k~2`n~5cJ_Ut
z-q`ou12BPDkqlMSZA_W^f!jd*{PXs}x%m`A;<Ehs8t9-b!Z;>NN~X4e$;>Gm&0=eX
zH$Y%y99%olCB?Q(sgDg^1}yeU+EKbJMi<==iFlR(WU>#q8IHVlambi_LhrK|ZHAn?
zb-Tr<)iaWRfNSa;fR(Lm&CNQ3I&Rt4+E}^rFlU5-15`sI9eq!L8h+eSD^B#r9?3_E
z9VYL~km_a01l1EhU@Emgz&8BnrdCBN!4aR=A>VrslQDe=xHOD>P&cLYj+klC#e_N7
zyMO%|W)s|S;prlF&q|sBSu`~VWXyZRmt5C-ax!bHu3?0~#U8Af>TEuRbjiD7TPZyI
zCR8mOw1@L}ls(|)x)1TSmsS{ZOtY7d>hrw6g^YU2r?8@5I$lTJlmpO(rmh=FJQ7$m
z2-O|NB-qq1k21UunP+2r(Lt*{>N!;YxqK1((zc7N0jC;?v98-f!6UbW0dYX!swa!b
zC_A#o+ohJ$>(1*!((6h0%dBN8!qg|*3%ue~^K`Bbxj(axQpYfAy@6cPPJX5r>Pf(3
z^exhHQjOZ~8feYMt#~puMR`-7;0oBwz-C?h(>|ctd=kG1Q^7ndrr0yaSoAoRyLW$W
zm6%c+UeO5dw$T9??2Uxc<sSN0;HR~J&z$t>aUfWFCpCkX5{OpeHT+86kjwyYiU#-d
z4(8Jn?|X>%;&dCxN<&MTW$7lwNS)d-01{p{Bk2S({VL-xlyS_}^8>?UHkvLg0ZP$<
z&45oOKU7PwU7<26f5ni1+6)4%JW2){Y!`sj<(x@Ym_>xZ`R7o<nr8&J@-Z5-zacoC
z<86h@;CF69xJpsY0XWbU%E5-2mu>&A!o?>sOgPuj?pU^z9VzSSO)gsUsoFCf`pQ~0
zLU*8|rq}{pRs=&y%M-6eLYc<j2|{2639Qf7UD@lvQ20}QxliteVY1rsWz-txnBwP6
zC7dhReri~iP*>bjoW6KGCXTJvp-8pbr!B?Qr>*I_EEu=&ot7S%e=U^l8;$C-ZjL@Q
z>3;yT^ipN?%^u)ex*O5!4UAaAtpaX3k!eg4HT@;2|6Q4}A^LpnLwhz15G*UJ?IbOy
z8AI2Z*FG!GE~}e`GseCn$3~n!@|=Ay%6a$D+x~D~tBm<C(SB@x)@Hq}+e+^+Hd8&J
z?ytsF9W!u2HU&`9g;zLamO~dl_de=I8tQ%}T*0gc&8Y4<37M~_W&92KFh6+pa7fMD
z>DF}H{`oyRYFOf;Vrj@2toY!x$Q5CqQ07tnCL{rYd4gtfGNV3SF0aWD%SrTHu@6!l
zD|<|yOdaP~Yr?l$K;B9c874G=w{^q~&#+>o6A-*D7v@UFJn?G5!kER4Y$1KZ>a?dS
z1k=ST68ANe9!s5-i-L9eoYhqnlYUDyC05|Rn@4DQhyK!b2TOVSTgf*U)^e^Ky<o@u
z-R1OC)Xs2LF`AI0_L6my(-nl=8p?lPKyqd_bQ&JEig~;K8Bkhmp89iC6jjak-KU`u
z8N{jR;qCiAXZ(CZ=v5y?X(a-jB8qKxj02C9q!g=s{nf~f$7=JRV9(o!4)=5nuL-f^
zV?I4+!-}rCw;9r=^5QZD8h}6juzub#Ek}L@^Az{3s8h%G#ZecH7p`mLfA06{U#p1(
z=a5jw-OAoLVR+LRi`0<3+?!dg{){%A;&f#i$Qlq?4AKCp)n`9DHjx6)o5FMsgH7fE
zgg|572equQIW?G*lEXk2+;u9L5V9Wc5v+Fe%~03_2TBQ<nFLBiHp-g}6SVXEJx~kX
zb-zyiRckXx;`e6T1|z_CCbK4nHIK-d0F~(`|JCqJJ?46LwET&XdS7GB7<O8azPjo_
z$y2>^^MahXlXCi-d{bu1A=bM0AJiyW<HN2mSj(4%7;cW}UH5>=NOOR1%|KcIH1NmV
zi;c;yw?Xc%;jxXG&A>g*DiWDLq`p*&6A7dYPC%qa1(-d={j=gD^fdiRK7?{9+<@g_
zwdm*74?88FL|^E@vS3lhRpz5!^BeV{ghsvlH)!X1Pdj~(Awx*z$i)0Eb(Gcsz|lB*
zK~z2M5%SvuFe$xC2H)Ue<yTh%5-C&8x5ufi3y9;6Tn+|waS(dx8R#)Z3fEveeG)O_
zQuSa_MULC0p7wp5_fBHPTuNuNm@e_%UVbcXjJ9fkN9NtR4oJER;PW74=S$vCa%rSS
z$mS-Zrw$4}&rAO$QgW1-`befw6-BS(nV&SesSgUG7Fnr`R1LUT*E}IMyqg{xnc``#
z_AYlLi3{{!pakLPxZX>@1i;h{5>jq9p!O_<WZEKrlGETE8#>JEOOOwg9c5(zUkbr$
zHpFA#yWCc9$U`91fbUPKr`oFDjN13CoaBboVqVUsKgv@$n@BGmsa!}zxAiUqiuOs=
z&|ussn$52gmCGMCT^B=G!AhoJT(IBI)KsApc(<C)7L9qX5y1UbGKNGpDN77p8?cMH
z&)K$vcGJDCdVv$|o94nO636{UWor%N1;=lVLT`j{n@JaN)pXAzav}%{n?)7{$!{{&
z>y}7Q7E3vCFgpxf>ahRao%u{kWzZYuC*ifs;<<mFjwA_XDlF~7KL=ILdp7lezlK~R
z5{MP}hM#9hjMRNgLZ7qE4-me2&=LTuJ7esrbkbz8gMUDqegR?s?~7ykQ2L`}(RcpO
zM#nt=wXj2XiQ-<EaIlFo41T_OP?dpsxG>LCR<-C?)WWrYb(3g5i9Vn|Ow5dlk@)Lq
z!O%Y0Hv5_4gLl1{t`RAq<Be!2bKXAuLB=X*Sl<&CJo#$^kbnoJ#qp%ynEv&Hd~VRm
zVo82~^q}4X_&OXEUk`lu4*#zo&_VI?&L}$Jzs~f(AK`y*oBw}&3s4%KK2zQ_;Ukb(
zrT^1N9)d!?l2NN}8W5{Vo$hJLpp~3&y1#SR06^jCfy(K}kqnV@5LP?`N`3wP*~%YA
z%4}NG5dv2U$X=!;XWQd><fiw)v1Jds#(}P8x(+zzM=?kHK%J&IU2HbSQjm0}$VZY8
zkw^sR0aA;f3|>o?ps6w+eDi)b>CH0eN-CgT*g0U~=79gD)pPn1VKXTZwU~N)wfnOQ
zIC13(PRadqclxY8WgSEUNwr;*n&xtIz|VRQaFyjCAan*`x7c&Ke#m>kT&_ZsQH4LQ
zV;s2d4k>>AP6>Ve-2wo4==mMV{Y4NFpwu`W`z9K$I~lveiOe19w&#cY>>vWpfV(@d
z4mLan3uYB)u|~ZBj~48o_#q8&&=pYJm3##Qq3;$926Re~Fe4F^qg#OM>@DB<c3%1i
zHv9lBiYMUZk+=_lCy6;{@DiT}N781d1f6m?RKN?HzU%YP087~RiDM@Tmtan*C#a<N
z0Owso<TTw1fM@Hovoj|sKQ-D53fqxa(rRsOgW&p*{P@w2={QMxIuD%Qw5ve5OhB|r
z3XJ`tS(0Wmi$!bRpY-hgf>NfT4McW5WRwfTg(ybJmYi!p-@Rzt0oHEfzOt_rR`ZoF
zUY-DKw3<vba2o155S*>%^I4b!(Z6mu)W=|w;s{*8X>1LP6&1FaJ}uz4PdDooAFMD8
zT{d(-P=L1WHyBS;f<AmALOBzGjEK*v0@T%QOnz=#sm||eF_T!-!FBt=o1*}q39R~D
zO+WH1eg9FM<ot6&Ty-@T=|@a6{qXbB-qq?_t7n~R+lGE*4T>sB$&1TOMf_i~M1%H%
z8T91R_-AtE<<jx83q@UnTpTS@p8_y@niqo;MhR=N)MfzRv1q1rKFNpujqMW<g>=#%
z8d7iOrfwx*a#FzdpPNOtZ-oDJKp)&4mkuPQz!wm&pMw$5%Aa47)Prfj+y_-XSRucT
z<BD;4wgdPXFj(0Kw)u$hg7eVMZxJ;Nuzo+SKrd(WCk2`c-g~~_taA+-Fmo_*ieLao
zx{EM$1C~ceR$x5fc?bb>iIeiz{^h`D`q~&8I%ElO*Si#NXiDGhafEjTn5!%ulFb5x
zyIZ@bX{7@p4$<=df3l>2TZ7kKU4qVGMo;rU;}}hQxnUzP{3-*_=K?eilb<Bp8(dz_
zw06IWl2C>r=I0S;CUM+;8sP(f-UhzmIck9sxW2e`Kd9|q4sS!qf=)Sr1v-iI>Tsf(
zztF)2A8<{OVa$5<A&tyeLGZGpYRSu8Cp=~Y>eCvVcH{wa(*>C(;)hcC++n|a-`{~a
z<aAf+ZbJJ|1qeu|F!L8r_2JrPc&XNxP8sLlIKbL}!J18<_$Dm=44k7Sz=7kSJ={5X
z%ogp{%nEY;f#BcXpZ)YcGxftUY+LlHLBl?Lolk8e#fTbKkGj?2*pAF~;p{(ZToW|}
zrhYtb@isD7`9HD`GyG6a4hd{q5qsY$*alsLiC^zEwKw=|dEVU!$&DUT1vNd_RLK^r
zcr348C#g~4Eh5gsw&~v!temC@0lRh)_c1_kAEtBqG)9ORiSe|g<g^0YL(`aW5Vt%*
z?L(;;W9`CavW5Gpj~wvcPQ8@z7fvYm>nv){A*K3=?2boZ-jvSBd;YnNeWGA<lIw|4
z9Pxo8(QfD=oMk8Ib_BFidI{8~W6U%zoT4H?*)@o|9N_lo6ab@COwv2B+t~|R^OblF
z7#^sr@93Ip=GHI41Og{k$abWwv)M5Q*5b3DQ}X#|XSPMFm+eSX^xG(wEM7Ftq=j9d
z9$T%pUANzsSTs@|qOTZPLOz!(*1u3lANuD33`Dajho$UvRGr3*(Xg!iWoK2OIb=CW
z|GRtt)rr+GSfx`m4pZz?mAv=klEuB|2NVxJ!JvFD*6LoWx0Q*t`wzJbcT;&SENP{g
zN43TIYzsW>rSrhaBii0Q4r(iu;Jg)A;_6(S6;%($M-6<{vW#2jh#Q&|hv_TOYZcmN
zpUQSPWcg>f7FCQf`x>m$!^lLu?9O1Oxehf~BoVaL0q{M*jF0a^F2l&Bcx?OkJzT)-
z%lQC|nf`23$gTG>tegsJc8}IyE*yHr*8`UTeo^k0CC8I*iseTwwsG7mk{%+<NI$b{
z!tIClF+!~B6GhUCL8IDP?z15Ms%X9T>mt-azuu88Xb~iB-GcKZUaYrgW2psWT=5l3
zh2U6f(=H+J3HXz3-grUcJby8fx5HAvM!CDYTj3VWI?oyi`eJy?MkNR~ur+O3=fS#~
zY#(eqwC^0;CY2UL=goDMMuEb82WBqAwT)6uAW!oaxK&=07PM!F3GMjLMQok6acs8=
z6fVmOtjy9TEgph|5Rb;p1I3_%S23twTGVWb>kZ~@<Uea}$J6iD6OWqg_K`x@bAjQ!
z)|HF*o9=?Vv?TL<>mI|Rykd&|_MCkiA~_PA8!4`1=u=O*W*7X!S%!!bxmYRLK2_N}
zf>j(kXZMy%h+(jZ;N79|jxax13%Z^VEnWi4*Y;}h2XM1<)3&n>^RsPX;x0|{7%s#I
z>=Is8VG+kXw$g&1%wyVL0`4>G3yR?lFknT|4u=FlP@7j8``W^*BADj~OtqCKsH<s(
zwv3eQ849c?%*Q(1cVftwa^I%cY{ir|aIfL0O&geM%#W#%OyQdsuAKHd2cD-~iQ(t-
z^*{|bewrE=s8qmADBV3tra$gHMH9-q1N3S7A)$9g>U`F|*z07;+Of$KWP3k~G;jXG
z3m!wvMdKZQOR_>lNM;c6iG2I@4&2XG?OUD$6Zpuu2FXEF$k+W~1^+v!J5>u3)u&@W
z*%M$PAx?sduON6}g-yC85kzrsg*nXC!ro;oBC_K5V*UjE+gk8QDH%T(F9BqgkHI5D
zwEOroMflOdyj0CSH+(mHZZ;*O12;SpE?V=(&)SHQL<)I9LfcGHDM7yxvM!=$x{-xm
ze%ChHY$9I2T{=1~=OIMdXx$$)EH~5w<gIP`C8H`@aC_S*%v0VNBBTvHdi|M~_XK?j
z>}uR{0NsG!7#<EUvkg^|2%en`eIq&1Fb0Xd;ObC<-n{#ctGeq~qt$8e``gnS3t%kc
zdgg<|{7hVP{*L8vib4E~l@iI?Grd2gwqJ8@{9edy(J^M02Yd_5Xo-aHV?_w9>DKvO
zc#0Gd<ZczS#FumW{GLhhp4{b367I$CJsgZ0j7d<feBBBi!h?YNLfc!2!LwC#(oK5i
z^q_ubZuu9<w#^Hb-ziujAr2>t-0ci+aUDhwr|`s&A-;B>#;_uu=X`aciT-E9p?S-w
z;<l)w=9Lx-b6&%10^G3^FrB-s@b|$!V8dNA8uHxYuaO}Z_39-cS|GKOXblQ_;%lG>
z0i$3yp-kkq^f{*O!+_T8xCySs>XAhZ&Q&7~kBf=g*IxtV;;I5#`M8g9W?!x%1tULW
zeXZf2e4(43oOudq*L@#%;i3D*dx9EM5AN=(@9Pe>*<I2K@d{hDmkq;YBo~>f<O9sV
ze}_K0Z0KyZCbO8&Bqh((=GYQ2dsB}y_ALuqXifME8@+<F%I>{r|C(~$l60-;dfHnY
zZ3Ik9zSVY(FFBK7@Bw6$N387~=iS&#dU!pdAOftgl#+%oj^p${ZAb!sH|<JYQ6jCt
z$rx+GkT9|lv3y(RJ==_7*FUA*vidVU-(8Y@zj<Yt_~i19-6xIt9sJ}AH8X5Zsi3E&
z^IO0uhbvA^mzZCQg;;G3NiWv^2F$BGyi}90aN=4@_y-2*FXxKiU9;DtHtC$BJMZ$A
zZ%T*_(q<md8K&NEFnRadN30-mlEB-Nm^3SV&UsBQ;8VGacG*q;vxD812izQBPsq@^
zr9EtH3wDrWI}2&8UySyUG=|S{6!}R4K`%<RC76qyZB3B*JKIEwW0#WsL_PMt%e|KL
zg5!%`qer$&&9-r`%Th{c;OM#Vv%I!8xALC}l5>USxvN=gH+2|zrvM!*q^m5x8aV0>
z;I#v5Mwj*FX+=$mdT+YYi<__HCvYU^X(ja3j14-+HL9FquKtw8HI98vT#`hpaQD9$
z;b(^_<5bDTwjzo_?y2utC-7_PnnIm@y0}Zf3g=)^yAc<XQr6K&t91@W8W-+r)1?Mq
z>LfJ6VcDKW5Baab5!^V+>?H3-5_r?Mx?LAl?_ZNNK`h}PM-TyzC&4n)d+AczYD*t1
z8C}1Ur(yhM^B5}{ueEO5N$!?U2gf9KP`#yUk6jhU??yKjy$c|3^e*XTW=+yxYrf&i
zDF!Q<u+(~}Q?S#^3BTVWUD2Bjk{ea-riX4_>%IR7e3fH_jSOizW`C$KWo31c5b+9r
z^Wau%9_~&7kyy4LY$^N~O{b~RA(Ak|Nf)FZgwf5FXonY1oz=oUJbu%hYM>CJ({GeI
zCCR(7n1(M!4u8}uXG}p+Pa;72(86i8Ux*n&Z;Rb;Tx#4p&z*XmT{0;srMf%h=E>zt
zWF^@RtXHO-SyhE}iWMPW&wM;ZY(-|e@KZJJR;If2r6^_)!|R9bw7=hMYj$Eyx_}ph
z`Nmq?AxkH0z}R45r?sme<uSq0J+KkTx)nb*Zs5u}QI&f8jUR!F@pOpG`ey7<r{|r5
z=nRI@yRRGAY1C`0g3_okk5&D})Up<bfoqworRY(5*I1Z`0z`w~bdrAj=0h3b821QX
zUiimBH2c0i*mYv}Ruc@FO6xsGS?L?1p1z?$dA9)A=Semha>hdXxb!A(JoO(vp?nUD
zpEe<IqAD$2s@IJ1?z<)8agAE44L;FYp&}v6&%?Oym+5*L;p3a%Uba(DY`r_qsWj}I
zT^(8Mo;#=U!BZI9dAt<5DLq@SxFbMUy&&U0m7J`7iSf^n1`P;dkI@Z8Pe41#zp&{l
zk&EZ~ta;cs6Bb{L-pR1?Wfzq(zFM_^KIJ9N921GF5!S^T{B93SmXj5a{OFPc>9@@b
z$_NA!{+gU#O@Ymm>Y0pmObJRo0>PBtEz>ErRoT;S0i&JO*LlG+v4-(llS>k`5@Wmz
zG{hoqL%+t;>o~TXM9~k1KU28c^wTuH=r}|G4!{Z6)jIvds_b0IIeqE8TKW1)g*PEN
zK_?N<ZJGN9sdhJ|8bW=&Wru-7^tG3tb4|R{fVu)mw6Z!(O{C+Ew$+Ox{V~ELj{X|4
zvqTDwGkMsgz=0>yD+VS8bsai_gNGAXhEGbUlz3zI#lSFVwf(TUHE{-UCrHDLP<-L*
zRaYqNSz29XAKi}&=29~p9Yi$o7;f6G%?A77)8bb%Rm?T*B!RGt_sgC?aam->>Yc6U
z4A$h5h;&RsOy{Eay-i*vox*G)YEm*q@ADp#v3-b*G^=orm5OhJdN2CCdn&CSt^YJW
zN=ERj!{@bCK=Kycj(lb-3w$YL=kTqRJeCl>o1qUgj75kM2Z#5k>KS7H@73Y56dcyf
zP@UY<Qko7{R)2Jj7*gILQ`69(_r*FSKG)qQoNZ+#H6;MaV`!!t4o#X{)3w@%I26Jt
zxfsUM+vWyz=9Bh+Tz!4n%{LN*yn3$Dk$UOS?Tr-6&mz<IHQzw;D;`1IutAgyo`G#d
za*1r@28#&#s$jW~=_(R@_QFtoJb0(Z(#6?#281(C{^+A^uerbAkyW$8k@(Thwu635
zeHgU0BE_q^gBxEmUolen!6vyfjg_>`j(_#rDS>~u5l^az5vD3Hwu-;*_PKHZskxJd
zDUYHy{qVChcj&PBxzT`BiN*JvudzgIiu97X`<Y?i=2vC<)W0gsDjNm*l8dFm35=MC
zm#E%Jmli0`y%<|Q=Me9oMo2bv(5ofKK2v`|au%P+Se?!(hC{S6$Y$j5gHi-f#!I1e
zRh>2weP26g?7IzgK1C`I)Y?GyNAi@{$6*z>6$&nej&jG*j*1BG^kjJ?B*<@4^j&$x
zxnw-mtBUiayrGi)osuO6+ZlYzOY?}nKC4|09{V&`lkFYRWP7<LiuW5ti0>DzG`4S7
zZO@r5<e7wULq_oQNnW(EGM<!!@D>+Je|ant?P{Ot`;k=V^}9i^^L7`*Un936c&K&@
zOoh<PtM|fc!LE5&1S1KhZ2wp9xQNzAt?cZnCKAA4CJ14CBeb|Il&Pj4S~}4f*or?A
zk8)vo^<2{UwvS0^)eqmLTo%#3!A5^QCY+}nGdm)OQ;J5v?~^<p5qVs~QIM~%Z^vhI
z+BdHh+QOYnL~+UF(*h{v_mC;PT)rKB{DA)@;w$T%pPevq0)qp=7tu)9Zu*U3;zx1z
z$Ba<3FfXx`M&P+o_a%Mixx3PGct^Z%;I50S4U;B(b?9n&2mIpA6@S)2f@&`Pg^0S5
zDWKSycvpsalbQ4}RmbG=EWv2%OdBRWa>&I+ZI@OWwLGYT$Y#qrtBGI+qzR&-GSY=q
z)Li}9UfZSEhw*!vT|12L*>JD8*s8OP@nnm)0kT3Yc>rJCc>{OQYF&fkRUQX(_nM!K
zKD<GxL4W8d$Xee7N7ZY9-e&g2#4=anp^Xq>dwo=Z)=~RAv03}Y$2)H|%Qo2#s8gch
zWb^eW6CsgT&0E^;SKXQ6u+_)<*qmy!af%;IZwd%jc>0x6&m@H?B;31@?3U4H7yc>8
zhfH-YzQ8qE(xg`Slq_qsaQUROe!l-?bwhyHM&m%QT&-9lnkK4Y3kFyh8wp5)C*v>l
zj+piupC7<Pqft-gEM^t%Ytx*fseJbHg7M4EJP5r0XH!Y|7h=ummF%hnlD+(;UXlEt
zEnaz^0jqA<SNg?15%V?j@m!SnvW=^gVV^eC`dU#xw65yahkFk(jE49+_5XQS<f-R0
z;mK}a+>TY-cpA>vxIxusPxR3`6|tYcgTTL}R1s_SWvXh8UAb~=(pG8M|M3F&B2*_Y
zybjmzDD|Ov(RP(&Q{4|wd9^E>aWiPmm)3~u1wp6GT}kk!phQ%;ol8tG#&gdYOEgGS
zAJ4|Ck5cL-SN=TKg|wZp&tF?%&gI2Av`q}sU9x`B5N#K_fw8WhXWHVeKF)ZSmIpe@
zFL^vJT?Q=M2$Si|dc<RrcuIk)d>w<pcoDy018l?BW_biB<_*2Ov${|D2_b7<5ol3Y
zLgOOe8~6FuR#OwMGDQ3GSYxq_(6kH51Fi7$TjFExk|)1;-?hHk8D$VSp(<m!9^?!4
zZrdbsXePkEMBKI~TK}zm^HN5jvylMv_(R3A^!x<Z)HdY!1>8G&##wk-?I4d6`O`&x
z!34KYH6oblK{ev+2l~%a>f$gDV8?IC4$R_UE}dW=^%`85(~FIv_}{$6K5!l-$JjDW
z%dfAIQD1Q&(p_q*39p941!(c#=!T6ts;*Vvy4vp&V56q85^hA;%L+!{y|Wa?=FFMJ
z9tgpRPu3dlSJH(w_cx#Km^0qN-)vd?&!B_ngGhmUW}#^^b8RXnmrVjBOja;LC%P;9
zOgT;eb{x4!Ox`rQhRSM|LN-r{^P+p6Z|o}s;eMmSz1OJ|`O}qMu*NS6*?(XyKpXIp
z+l1*G={^0@?7Ed$ouB#C$Se?<WHUY^$C5@aBr=Nn{E&Xc+~=EK-lg0k#obll)mMT@
zJUv7I;Hdi7ZBp2-QdUxftJR7L^!nuT5){u7w|x=W_+umKZM)V$>SGL?5Da>Ax|4kB
z=Ln13+7;rB{!K@txW1^u4K*5B2?7~QiEbu}vVlT_C_vK^7)eYEMV|@uyl|cm+dWF!
z6;_?@#`2DH8bW1dmBER76xC(0Ab+azTf4wb`c7->)o}f_0JYFu50cban|fONG^`xf
z;YW{g_dVM|g?@%01K)zI&`ska?>G0I#jkpcYcI3YDy^rQ)GXbxIR`B@#%iJ@XG1<7
zip#97rIPNM#W<>atwJtxCmi$5Kk#(4(>e)K%r<^J-u<UajS<bTFw9SB+4ul9xX#dZ
zX`fwN`(kyP<wjBl(F@dVcO@f@FF16hd2Xuh0yM4}38|g(U;5sBET6BF>t?acoj{JQ
zNc2R{shT%)E2wXg`5fij4KrWIXKvrbHC+*grJ&;f-5AmBLLV6z3Dqx35X*RvwhSM=
zKpfoD(h(|!iA_=3(`m<0EeS#h`tZ=JSO3?o*$3*3j76Sx{a{0#^hr6p&)3{a<L&uZ
z_J94vG7fB~accbOt9c;*tbkH<vrd<<AP@fkh!GH%nw5+H41KU;Cp-t$v|7eD+dUL{
z{`cVjAGj<r%7F*C+`V^Boi64H?-EA)f67;dFp*fNd$V*ddekqb-yb!T6F-ChMVEea
zF|M4RM`k@?EWc#kj(_WM@mADG$d2ZrvX^-c0UT5CD!Wy_&Y`gJ_-9*iOX60<KYH-S
zO>1ifAr)(C9nML?ON&kAz@}TPV1cU+0|G8VoY=OhCD~(Fw~mEjx-5x}hICZHBpx1v
z!Myng=IJd1(x5bR=xEjQScDT`W#NcuzT^C*eP>ceRAPvetRL>=w4SN8zaZ&0TW9Vp
z>$o&){SCp=`9kXYxVzx(yQ#hL(XH)iiaH61bgIMt>=55}(t=C@>6zwV8^pd(rRhXN
z7{^+#ipF{w-Cf@8ysMpq=cIcRL^LwJd&r~0r?Kzs$mw1!VVL1-%J7ON?(7#%+5jEy
z2M7;A6wu<t+{vd7Y!#^dbkMBLeUnWye?Hz&tpIsZJN`e&?0+CtVM_#qo$n;2%}Nek
z3YEs`$zF-mVa^H_hS-JW9M=<<gh+PM<9!4u)jyl8)QQgznh6RIIVp-3-Zft}Kc)^X
z)$uY-amC~G`0ni8O1XB5uvc|&!gu_~))j(6%-mHqZL7T4xZauStWcISiEl&{PiU6v
zhFWPjMP#KQFdlPIe_$$0(tmf(XHjvcy3J)?ePivklC##>yv9Vh>!)eFi+*?Y-JE(F
zA|!ik+OXyG=B-1v`!I~8d-FaH$xix`Tetsj*IC5t&*ur7c?%y!Eq7BTXWS3X72e{%
zT7Y(u|MLfsp*`71`y<WeYFkcD<3yJ-8-jNR!Ja3gend?wYwvhp@Xc%!k$6t&4&;&^
zHcaVyR*@VS#o9R?cG}NUb~}|*YbRPXP7)Z=VA?}0WZP~dxB>(`#D)%B^}cD@-Mb{u
zR;UkJdANN$OR6^Q%4G@6y{}&2X+7sPj5*V;89HdluNSblN7eY)ic<BfmBMnbrfWO7
zH#+a?PtkQZ`uXWkp6ljz<ML>y9kW}`-zGr^i@&PWs%>4DR@|K`A749FR!-)ZGiuGc
z3Pn?KQW>@Rr!YXS(VeDVMeogG)X%I<ot0F6*fzPoH4WwB9F6&w%XUtBcEC5Eb}?m8
zf46Ss)E%&3Ikuis)U;sZel<g7SkxQze<PpXWZ3fNi6IfCdf5!1Xzc~NQ%(OKwVzJ0
z=cIedwX~SuvR5uS-i134l(d|6Ja?g`RSin=Y3?OK0iNuV#H`5-r9;g1t4WAXLwE}o
zheY+$wDA#@Ec$j{OQW8CxwI0|cIT`8(U#F(se68?3rNBBi)W~E!7BQ)a`)8rhPLqM
zhh|*b9Fh*@kgr4*y-m@30j*X{Bb=#4`rQ&6yOBh7vyLk4we9V*=8hFU5a8&Xo?-&e
zBThpfOTbh1HtLxdQ?r}zEvH?u=gpt_sx~_!4^0j0nO=#|6f;zQ!CrZ8w<?-D8@uf#
z>S>xhG0!_$h22KwtaJhAT?=<2_SvCYgA~is8TNe^myy3U8{eTi@9gDB7^Bm^5iN*3
z$gtkoF}7fIwej7buMR0yppl!F@v{vOvKW~mhc!-W&shi^thJ(oH#EuH=W{pwP0J-(
z)*qg_Un~-BamY|Ny)_g(rv;Ha=^GJ^sHHS>+_xAHd;SU;et+s0%Ixr7bGrU&eQT5R
zW}_tU538Q(u3y$**O5AhhJLjD1+`z$#2nl!hhWUiWsi~6h4yWS?p9H%xv%!s)nwMP
zPTq16^?X?vqJjkwqu%&~h5VNs0>Azb*bYXh&_BYJ2nHVl6CQ7uE2l2FOg;UHBmnW%
znB6!>Cvp;ANyI<zAw_M{us-w_yj@H%bgSUP%*{z?Ol<ZOST}lqWjQhWN>PDmu3hln
zE*ROysPShqYmmUv`pY@f#-Y)ZdUn!1(ODx%)cH_6a@Fq!B8$$>-9kx-gScgrD_aqo
zY)F@&WB;S;V(qlb1}3kRk4s?*X2$hP7ShjLQKdCb5{v&*w0su@P@dSIp#AY*D1zpp
zo|nHcueVY$EYpaIEY_L=jLkNae!N|&IZ3c`n$VMz*&Zt^+nv<fyQ%M*<Av~0w(l#<
zb__l`Q}g_e%<UbD>>z<Ecv00VPcXtTXzpMg;U_tVBbqmR9dTCi{)5%PtXTD`)pD8K
zbrg9w1Gn19zWvqWEt)w`*%AM~<*%IGy%nDT<A^>)1*^YKQ(YpXa64+j$+leBs$lll
zR0ISL1#WM$b2dkz;X?UW?R%Xc3~I*J^L(wtk2<4+D{DMa@Q4;>UEz(hTlW!pXK!_P
zA16Dq+zhS7#adRpqn_IukZ_)}(o#Jp&%hBZuJ)|nA*6jhUw_|9_1s3&7z;@d^K01T
zfq|b;f`v{^;*T256Ug!6cTMI=H1DcA{M5ZDE^3VghUdd2AF9udD01sb(suuPX@a`Y
zkXH1@Y2;4Bp{gH_GbvKgW@$UVM=rrg%gxR+i`BL@-3Zb@d3DI!r|sx&dBL|g&7z&C
z-o;S=yzJ_`<D@4_JYgQ%erbqOXl}1IU;SxdisfRSeeV+EtZriX&_(OZwIC%O_r}F=
z0oTxdPqQrAgR85q#1xwja?PZH?eim26)mpT;znCvWG6VnE(Lpnn>6N@LA%<S9~@OA
zdd^5G2G)(^%X0SVF1@N6rOs>C^c<I_p&K1psU&&JXEPuD1@6`j-0%J1>Mu@?y*AA`
zjf+q^75+-lfYt^JFhVwm65@|G49JY1lF=d~%WvBRKj|Nj9OT+JK-C#v5WLI<9D%3*
zef@Rq8>jXe`)Rzqbqy^(llo$>?FETluE9r^<vB`$nl9e+P21Y~J>&PyGip)00y^$<
z2S-s=tyUC!zp8ilTYt=#v2Qhd&Bo=tQ7v_vN~n~N_VVPL<?VN>DE~=d9F#6Jsf{<L
zyT;tVfAf@W>9m$x(7hoKXcd@ZiYlE5t@5<_hU91G5(k=W<w-1#*bHaa(Y@|YO%ycd
z_fcohOQNdG?pK^nV%PS#jfbwkxK}zb7STIAB+|aW$<P{l!$I*m=yumysYo=)3ASjs
zbD?UzVKH&qYHNZ&Zk9vkLMy|n97_#`n_>Bl71m-xsZxK^OshY4-@BjMhP&Se2g7e3
zR6w5)ULvp;Dar67!~?7xU*55h)n~r?^gRz8?86G291US$Bry}M;BR1<9B^FfdGG(r
zmF52z>w~s<|L<XaK1Q!ZfimkH$QPyom}Z=!A|nw_XbSQS?9GlugHS5bDI~H5$NwW!
z`=3JcF*=O|(5{;7OcXc)pZQs!Y_<SkQ5n_;)mEUoVDWAmm*<-SB$5(+aakHPaE22g
zC3BkggN8r__v!5SXggF-L4gdlzHi=i1z=TUeK(1BL*bEa0}$lSzJAWIey{DmUs-mm
z(%%kHD2$vRNx??;<M%*KC%Nsn1oV6<_!D5m-ynpk$z|PXxy7g8fX?<52-3f-W-?0u
zZz~Vg#bWx@y+diUH`0TugWT7`xY~*u)-pu=LYtwi9OtyIUxV?6b_0;)IsMKI+H@u0
zFpFU*J0jP{tN;Bi<RmSM6Z5m3;dF`KIUuLptk=52UQM}&%#XWzgK!d0T(EVR#?Wxo
z_SR)R=%(s}8b~Oy_)%0<mTXnmOMP5eK2!z*B5mu|wLy64InYF1T|?=>eSqnV*A`5K
z0iEJRA^odZ_yCH3^>WPmh@dtJ=h;k<Lf=_ztS17I5+KHhL^Knq@c5w2-x=+a)12i#
z5MM!tlagbp(_F|;+-3~pX8<U-9b4#ido=?TjKl&!V6<fc{{74rAW&nYw}sTUIhKHp
z8r&%&KTyO6*V~F@5-9!BaHxX25?J(a8qfFpk{bF!LOV`OKTt4jV@0<5!MlsQfWc|#
zw;Qknj$}yF10pm&?$4<(F%1yH>2bb&_^zQuTxb2P#B0Y$dSAW%Rc5mZ05$wNAPc7U
zAHjGz6v7gS(2-5yW`Ty)Toi2&L4fjsrVt2Gwghxcb7H?atP9ZC_;`<TQ3PB73{I0>
zn(Gv6V|4!u-A>hrsOsc9Vz=L!G^kd!23BqUh;QwHMzH>OqSE=d>thUDo*X8xAHQ8$
zauo#5lrfjU?wKY#p#W4<>~n8@D7&0RQzmrx`UNRz5DkJ$hVK+za4;dAFSRekr!E)=
zA*8P63GuGm?vl95u~@*bU+*7_!@^Erp&AGr>B7FnjBWROAAe2d|8k(&3rjmMcU)jR
z`VH%wi^gH<?SmcO=J!fkKY#4}Z~iudnA`h*uui4#CDz?EVv8K|W%gwoz(^Tq0G9~l
zJJ<oht7D-XX$Wj*T0_otd6b--supB?b8JB7WVsjEMsu&nDF9gJlY2U76b_;LUg_cz
z01o$y#6z%qM<q!ZRJ|O*S6blg-m#bim3Zb()!6FK=yekr0HrId`}rQXH<bCrVG0!y
zE}2jmZ@0jS+dJEzn__Hlf7c-BdDT;>R=&F0+6h*Ht$mTc-oeuA{F1x^=fg!-;~~Of
zp_BPWcjrV_!{DtzJgk^{oo25|WOwaI_?T8KB^_3fZ@!DeMyC6PeVOFiMU&Q=XP*0O
zs{Ty&5S$**JXA^Nr)y+=vfg`6Xt@Dyp!08S#Q7Rlwc@-Ezjg6I61x<y<Ic-ziYnVR
ziQ)9LffODkxAQ$y2#j93`iBp3MSgf}M)^4I071xfPK}S>N<H;|kj?!XQEU`ZqryaQ
zsSZdxd5w^8#Sm97YeD*CBiA_<hT#xP)~6YtpG{Za2O3H5MXW%0@bMViwd#v5eI!a3
zFBZRyV^8obPkQbpl%^%W^=Pm^%abf;9|-BDk<GlDXnvbf=$*wJc*W8GsEDL|efa9J
zGuA-ea#I(MgU4o~@q~LJ|HjdiJR1=I(cCf5>ItNcECa-5cg#QXKc0(pq6l8-9;RK5
zuDzj7#hhx&l}&rGgQIs)x62sDYlNvgd<ZnL%e8-frZ$9^sd(y59<{onLQf~xj*JAq
zx9pt*HJ5p#e&8}#iLj&5`3MZ+eyKSR&@=#X=2)4b3^cv91IeZnDWUOYC@bYb`dhR;
zfvf~XB-(kf<8HSSfTPZZD~bz{K7pWSXn+?x3tQ$2bGaX@$UNTDfil%<xSaB5P*&2B
zt^a%-2p3`i2iv2)MzR{%Qb%NzsvP=)+$b?6b;AXyd4H)v-xkBr>}{V`|8`WN`TC$6
zy*O!zD2K^N%cA{h5c700OsfTM;g;UyQ+H=&T_Wqdo6B=nrcOH(!UE#As0RajAVw6n
z+zD;sxlxTWG@;qr35CroK_rP;&li`n$4w+ra}Ae*gh4Mb*$6KsfimI*5E7;ilRt;3
zYS~2lhEIDi9;6o|kfY^N7SzxDK5Vq*>ifhi$&0`CtP})mb%xUJCGd%UYB5qv#5p8#
zo=3+?S3BQa2&va&1g{k#cT_ecFP7kVoFN(}+v<fxKWO^bB3p3u))I~3<e(72F_3Y0
zb^0aJw~r2aEyJCcl7_zR`zUew<upW%eIU2B*_-4S2<~dEP$|~L!;v>uh{S%%X8c)n
zoPma><lt(U26OQiDk<j8Q%4E=!7mwuQEs0kNyzfUFizNQRPTe-q5e|5ci<@QVhMz$
zKij<_hGW$Z4=;z7)9dCU;VoQaqngC=`6`zTXQPAb>jz2pdQZQqM?*t125_sy20ke(
zP!Js>lMXnwWV4>nEEnDT!agsA<@Jz#--&c^#$L1r4G{}S2eHTvz}t1P(%tu#syz_d
zKK03PDUPIZ>VzL&hKBv<?$pm}`P$lAyAxXKIiZ2RP+|e~fv-YpWd>hbG^>*iIHjW{
zqE1HX1y0*=4Z9C2j|m45&-Zl$;Y<r^tsq`8b~SfO0^JrXU_sJ@c$lhAoQ3lp<i~%E
zBXirDX4~XSEhd=^cysK!G=!1GJfoHajjkJ#Jpd59T^l0x^zDaf`+)0WsE%wghfijm
z=j7o-@A332ohT6RpZd0F+I>F(_bN10d5vL7n!|(c&hZOw+ixx#-?ksVFC2y)+fTTg
z*Vkjj0}Y+yHSNA=)ons_(5H&YONSS)pGtf&{7i!rM|DMM#&fgst~Su_qfrq5>8@(o
z)-xo7{FV%VbLH0yXC~)lYKB`t%U32%88<BQrmaj|tM2okl0Rs{=pFAr&2I$YQ%5{V
zyj-SMbTT+R^+`naXonAmqpxixPp;4FJ_{ERM?+FRe*5<G%%4L~VayLpx@1Kl@cQF`
z`JDTt66~#?AuGZ;{7Su)p6~4&ELy1Q8j?!sQIEjJqU(RSfQvD{7$n)BoXfXc>L#}x
znnaN96)y#msD*sr;U9JOpJ!dJe>?lZ_asn_6rru*eAc{bVI^4t1THn*E@EO*REVpV
zw}(<-w(jxHh`b#Q`)e_M`92WsMe>4P$D@z*j%wv2ieEK-cq}*+!dmI#rUY*PjHi+N
zhux{@cvj-9Lt*8iS36JrOa{1hXBHyKL|2hsk|NXB^8U{78@nPc6#5AjisvEtV92Wf
zh(a6~YY`T!TOAsbOXeI*x^h~(0VPpGB6fLRU*mhrq0C1=gwapDO|UKDH(N9L+r;>G
z&;oH=tO0;f8py313Iq2__a#iZgo!b8{v#M{=0lX`8dUo=%m-_Llmux32anjYx_-Mh
z;od?^wa3vQE<JiX*T*9wvRHu8s|U0!Q2X7A(uLqKg_q;!9&8hrav}PPuohO4dDAKS
zUqKF;00Drh-_XLF9H#6xr(WAGejN947#YUA`C?)IRz3moop?_|8@4`o8_9hA2X7n2
zU2_DCm+-_c8P$?-&!`Fy3v>^^vY;2o`>N4NecuqqrK!u8yxE4NEEB)Kv6#1^@uM@F
zR(LAoLN~1wVCYyf8FWakS4&dZEn*6dCSSnFu|zCa01SLG9F}3=A^(bo3K-aA$R@G(
z)(`)+<WZoR8X@!#LtP&Z*K(PUk#fkTN@QhYA9>I#Z2(B2EH{S5r87u2vn0Pp`uY64
zIa0~OhRS!38ZY)VL1Rc1sPd=r;AoH&#9Qq+1{Qx4V-4_<GTk{il<ar?kQrw8A`A%*
z-pkq42O(fs9N#~&vqT2H^QY80SbTZ*)3$Zl=h=XQ=v!f)LFdSZlX}<IZmVBUIe?(m
z`*d@#=-v0+;jm8LVg70YPHCP<9D1H{)J3zDq;48X4!Xz9$()vDBmuu{6z_D231tx8
zLM}$=1V=)u0wU(j+&_^cb1M2exKhQLfVX9_lfsLHI+6r|vlu1I7pKkX*2W<=KB$*h
zLLEOYm!lrs#4*CziDWKah0p0@FN<7E#kfIUQW5KI<MtvcZvW&T4L;mGeES|&*AoN2
zBgdjIco_3m>}6)Z=niKqdEq6AY~a<Z+TYQtM*6*b)LK>mZuMVE{v~2ihk!~yi}|TT
z<P}Z$HLHf5z-ziBl6j>77@0fe+SY*?kdUd1MOJwdSaQeeOO45fuzIx~t*{P7Z>Eyq
zRT6g=>Z>`3Gu(YM&~!<{=ok{-w{p2Fv!iHAG6V%O9I~h-E$ay)?Zy&3%fgowP6FAU
zSrCETI>+5-F;*T*h`x5;_VdY~!eU;3nXP)I<z*~zLW213BxA9ck+8{g=(p<DijPW~
zVX%iv*b%!BpajnS#3vsiL8KjHPeGYDdaaL3NBSRNyc`QAhWHLGj8)hP<4jgyk`v@w
zB>5K-$-vFP&=$nO=kPm2q>r#P6t$dCiojhyQgWcB#ywRL<$VJ%LqPk{p*Mnjx`ei8
ze|#v^x`${a5J|17pd{kOqNr12lgY9CsM8!!S=DgV%mi@e#y0k_rh3At<zqDw{0_U5
zgLD!!6qrx$kqE~E-#xOQV_pC;lkOTqBDUZSd6WQ(&D0sc%j06L`nnl8w_=NBbm`Fk
zS!ARD>|lbvPj(-92>Xyl5k!2?KdA{$ya!R-7L6@J7x}_(-v4k<U}-OW5%A!ac!4gZ
zh9`}QclgWV3A10gp_$^l(usjvdBs6SJbQ%)?^8oWF>NXpP8uyUg2(h5?G{+{t8dZ2
zTUPd;{QFv8Alex9C>RhlpA!^LciEO){Cn-MOn4NVsjgW|kN@ENi4^93%ozRLxcy-i
zv+$GuhyPC}x?<rH^x(5dWng1uuqubViWjGN{9x@vpcXcyNkKmR_lbhPPkel$9B5{{
zQD*Y*lLUWXd76(DP`*O+;2@+v>aw5u6d8&&u^+x0q)1c1$FkvU5PfjHUMhwlD&l?b
zjP3sx^-mV~|NM4;aGIDyfzDE&9-O}!%VRpx${IU0_P>6w4LHrVnIn|HE*b-suwg#7
z3S)@G!{3W04^EStV3F+MMab_2pX%3YpW*0VzqbvX=Cl7^e4o9!(3f;epxa*uk6bhu
zLBt$GU2HCajS2;Lhv_D|gW*br$Hhv}SgrjQE2MAj2=wQ@Cma2Sz_&;m_XfaIUjcm7
zyXoBfm68>tg3W;H(*R5eWN{fs2lGv-gY`9<Az(7pqog2UI41*!COIIN`~)mE(^rWs
z`hn}4n|+|%kF%Av-yDbn(VBgSUJ$+l&{%ezwj;fyX13pybp`#3#kI)XH-8M9>+ZtB
zLYoLIkGzZwVJLy!db$pvvUpC*St&m_<aGdcReIZR4OM!!fofi-l{Sxf0j#==<9Q14
zfRAE7Yl+2d8%Fgs1Xvv%ZRPhblRCMwRfwSs#K8GQ<bL#<c*yt1Ez012`Ht$N`T~#N
z#b#ig^BgpEF~^|Bai4Wh=CTg2S5a0qSWw{I&gO<VFsfHu5fO0P=#J4qIn88F{-Gp}
z{xk(J)iA9QBmS0~N)s--1WmKlm$>Ya;yh@+_tHRxCvs36pebj`%IE?poArVXGK9do
zfrY~Ll-dl=f>Y<!hr*+!RYwlWBd8Nd)zG5XwIx$fqQ#*$)fj(4C~M8Fe$tE#?FE2r
z%yxh0XN3nRwi*r4h?RmEQ8lj9Zwy9oZ7kJy?}8hA1$1m$VM}39xHEk9<(PPdnt?=}
zsuAH8sYBiVIP~Lx33!e(Tg7cPU-OK#od$e%Gkl*E1G5>BJ4zYBfAZPmYCF%a3(weP
z5zvOlY856?ja|vN2MhJ?kWDXvskC&EzL};`M~zIt8Tu!e`0mdjijhC*_P{eTkBN$v
z>bkz8m3G)OgP2*m;nnrt=p5tWv=b;nVG04GqtF*Gbv%v(wmuNapX_YSSY!;*a`?4i
zsc4dIc7{}#PYw0kP|elHe_>ak%R;icPcS+shvz~S7a_3$uay3?DV@Urzhu`LDu6PU
zKo7#K9~-YShN>KN<A2=musCL#u4mY%oIG;1Y4%CBnl4x2Ng`RK!|(`j+F_JSVvho&
z4lc$ZRdRR;G~hz;_k1#dr{Ws<FV~~Bwkn2|v?fOj)!34a>iW>g5oO%RbLC9qf6$Q&
zYppQ7Zxwx|rB-efwg+5EY)1>V8)q3qzStMS;ix%E$DsuLa^~nEFJGqkl=Gg5*C7)4
zu?*EKEuJ5UD<aE(m%$s`hnf7TV{LlSa5`kG%w;jHn5*;oG&1w~&3SowIa`d|j6wTF
z?3r36<J(!|=~I?M*+esp*`=w1Xa_0f%E(0UN)e7lle+5f)(!{LKzZfXQOy-(c`*7|
z2Ty4%s8-&m?xTBwdQsQ(*Z0`1@LRG30khePg7@^{+^YyauQ&RjLnCNCnPB)nZAs{6
z1+^IGu%V<xv19?!kF?`U4U6B#GdM}rpu#@1NgBY7ddGp%XJK<CQWPZ$5N|3K`cCas
zy!W7XUk8x&S18QbBqAp1cJ@o<Iot(ZZ{Nvm%oIIehYu?l`*NIsVOKv`AgB@?l@bNq
zs|W$BTop<~J=UsCqXM<UGF@tFWWeZyx}Efb?^Cz&W?R9#>{ua@ReW<WnVN>}yq$EB
znU;|*4jS!w)!zR2&bnp=&ZquW?@k49i{iA*J_Ey-xw1@;i*~QF0;Rm!n?10!`3k_G
zP5e;n(;t7TvOcvWzs&Ru=i;>A`~F%7^osTt3uJfDaoK_X(X~dcU5+MjIvcC9)aWNZ
zYjoHi<F+>8S`N9PU_?4EuG^ujua*-K1e5G1C<q}{NOAd+*}LAY8G1L}1}Q5f`}<$0
z)6lYm)VM2Ntv|OU6A}_)lrD^rbdA(mCt#~NKw7xDJhdd!^X>(!(fTd+u{#6;V~fs*
z^Y$dP38wr>0t^2}jFLs#XgJgkikd3Qz%lUF#6-#Dw0G9MtgM@IPg4_2#O;9d&fG1d
zZgu@->I$l5$1s=loa`1CK@QT}E6F?;L;3%!xVMa|>J8rpr9(nWI5bj+jw2u?4blgs
zOX?8PEg+pr2uPQ-AR*n|96BVV8ziNqna%&5nfC|tVZO{-!`dIt2iEiK{p20jbzh^m
zDh8E!CkRVnH^L>Nvf?+(e4kwdUA+M2Yd_%jTQ+6BKD-iZ@S6kdVP48Tq{A4~&QLsF
zp-a&?@Or?zT>=Tc%h`?!TI<7Nht+c+A~`EW({e7sKT36hazpP;cFwkZ0370k6?8&F
zWEwIV1DCq(2UmdnYuFCUs4IKRwPV9Od@tPV72Jwdk=t_<y^s4+&qVCo4|M6}sB%(Y
zU#t<-0lUV!LFy9xE|JbSc9$>MtMl9@fXz&=6=&E?NW>qWvxm@A%8M62{CU^>Wdtx;
zi`DwVK#h(+YZPT@pbO`3qYH}Z_ePB#;)Y+m+CaBkL;4vI87=poD$%$4dC&ju84&GG
z-yt=FaF$N_T=c(d{4f}>Sf51iR>t)8`*aHs@%-SBFEbwy$g>W}zB>&Ffs5bG^(^3z
zV-!wJCz+>PcBH_Fxppz?funy{$2qX;T~s(Z|5z{=ZdD>Ew0l5w)Zm_hEw&)c$7i$q
zg}cIt7kk%<3s<E9t-I1UQH7+D^Ap@(7;<PwnN@~Cz|eUM?4jRYkY2ty7oX>ormOV;
ziJZ%X@P!%bCs(!xcUt0cVK#tX8h0AtvTv3_3c)pQxTUl@jMfZ<1O$>y{xLZi2P*s(
zQDsBj-A})z0@C%oN{|m_JLhdrFE}Ay=~G~r&rRZnk&Wbl^f|B{zK9g{^?aMDe1BYF
zJ;P1Lmq^W4f!s0K1j?Vbsu7l2UV%-x`SYR=O_Q1O%JozhS@b_E0?AzFJFVef$OzM7
zo$(eViX}|p4ET;zf0v>1nz)p>YPCc5um5%4x^!P}z(vBVm7*m?5<dvi4wL})#$!AR
z^N_h&CiUe092RE7y)jr=j5~orlF?{p54!=aPh5&!Nz_JC2zHN5LW#j-a9p=Nw4zO4
zpMo_|I3D8}gFn$3Xyvzl!?&U#=ewDet}ue?e_$9cIMU_MVoOW0uDt|hwC4Qr%04W7
zjCcHEP?}A`{ZfYQsyl+r##20{=U^p*Z=v*xM}=eStNP{Xj`<Ge4fv9BBETKPY!>Ux
zDw+5RSH;VrU@@(1$?j7Gdx`lhn`J)aPdcyn`rB@Sz-rhszwdQ&99D8uYqmR$nGd6x
zsMVDLWT~nJcTMV>Q7FM4rBA-q$<&5aFk9gj7B@W5rQ-l`kH|B9M45*Dq=y+Whzf|Q
zND_&kR}Wao_f~+k3a4tbk02bo)~V=EHO}Y7Rrdm-I8K%~P-F%g3B!%-?4syQVz-ix
zfWy^YAu7^6b4A#ERJu~ZLZ(+amKQHprdHil#Kge<_jMw1!&%*@`ZlL24vWPtVkW?J
zuL|>(WEuiiyU47{QsxtP;Aq(6L7gD6U(NIjp+u&j6yUEA=`vVt`;0>spw}Ww(=IIZ
zgoecT1^aRJ-~o>k=n^QgV@(R&t3y=0hA(V7L3CSloac@x0i<5f8us_=3bBkbLj9tB
zDh_}e7#3)Vr0hkkJCnr~Fv%JHwg5#Uun;G;ne<RMMlkbXNbO)zqDwm-Oaq1(2_0Fo
zUD$umdBy35cD#VS_{p8tVs*TJa`wkWhOKJB+d!H6eP29V64Rw&BB56*&yN|#U8<3k
zE1#-!X4!uVGu#OxJv#^V(@EUO<d9I+o~Z|qC_y!u-y<U;*`mkVtq~#VYC2~WwxC5E
z1QIA665^kSIQoY$6MpBE4TAheJ_=Y2W`R~OMJ}=;ccZpCwq2u?)R4p~d7Wpo(O}&+
z-(Fe`f5SQXn}YFG?I^sQ78@MOoKL%ki}dDAtU$+8l+IP=bCSl(S<l#VtJl{u6&!te
zer>byY`TrJBzh}uh4{HPdB-Ucs=-HRUvy9_^$*q7MdwG&#XiYgh+OSLcF+QxG!MD4
zkYvHr%o{c>r#sBGwILq2Kpl>}g<USWi%MK6iiRvChhwuvmq@`L;aF@W52BMAXx>Rp
zcr&JVCH4;y>vOlAdd;5()kU^<SS=sg0uHz2X-KIInCr5T>??~U@w+*Gy#{LwB!_^*
zm-x2$f~!M_6-XfY8BH0ASQG+kX~sq{%=ZKa)SEe3SD@mjV2NjqA0#QV6blk(oOa^#
z@7}fu#Q-NLE21nmI1#5!$tlGzg#<-Zp~p6Xt!<)OMZjKnKy-MYtbIc(8%x`br@#jF
zt?Q>}d6PH(^ims{rU^oTl4vJZ6bz^>cjy_>(0xP^>V5^<v_%bc1Tu~~Z<ieSstpY5
zlH9Fq6VTJVFSm_ReOy0DMlEvk9iPo7hjtwWT8`&oz|GApJGHWzD(2YpS+#J2bDx-r
zQYJ_?d7SQYGjj$enwcspryzvt8*g~<;y&lHv)(HwV3pwvV6mEO7i!#dWGYolx2*+l
zZWx(0ogPey3<<^~E#vybo|!!{N}%g<=Oz|&`SXv!wOC%gl(0)b%XdA(FqqyD2^A}}
zlO7zgn`%9)5n*f|VVp5<tW17>(FK0v;0bL7`FnKVGO}6<Z6um>f)yRa9I)M37f0#?
z(JBSqgaw9Fo<lN9`&r6zIynk%T}RRfci-y0Wc=n>o-vqZFdA<^2k4Z-x_cnI-#mh4
zwG#=t@%ee|!g)W#M3}X3V5ltV%Y-g&UkWxrjRRN##3+Bz<!@U-F>-0{(SfOwOoEqD
zlE#E64XpAv8TuqrzYR3H?0Drs@L7@fNl~c3OI0*}^-)HM@9Ae3i{5f_dV?Um87T=;
zt_6i4<en;bGU~n-@Op=%=?R*a_xc$@D5(tvLrlcj^TZgHsJ&y1{+KdJ?DftV+lj(=
z_i?pXjOSfP_CzE(AYN-NkjYc9NPJf&uDyt?AAMoT(lMg6!?R+Je+IF~YF8PV62a1+
zCP}N?Dugj<eFC?94nsDP;`y>gxH!sok2cj3vaeQMf3nnn15z&h@dPV%zOalB2BHJu
zsX*z&?u`3en;kJamWB}INnW~7Y&H7#uxEjcNGk~<Ke%gv0alnc$w3k+!V5NhazO0j
z#Folqw=j25JitR~yj66Ar1GIt;FhzknRu6qdwj<@-dxL0>n_YoqJ*ch^zcvQ0Z!8T
zvorj~EZ<)O&gb43%wZ)wIQ5(RW$pFu=#;TyRt<QR0USafO8+5W6%C~D3BKX9<JglR
z)u>h_DwX<xCEh{zO8`5p=b+?oa!uE*ZgmL|`E0y-)mLjsB^D)m!E2|6a;0D&D9Y9C
zjb!u1erLXc4<~)1Sa(XW2jdL07K!2?!%ExbM@@g!nfe55Ph<aBn)T%k`BgQ(e>DWL
zsMp!W*Fa$jUhr?Kp$-z0r~>#i?;dZzvGg~pgB8q4wyD$Kx8x=SoH~%xWSBgmuUtAr
zf8Rv3&sV)xCu*4i!@zcT`RfW3)xVUpyv1i34DeA-ok(Ry?$4Bn<@L}O;dYBi9n`0v
zso+8e^{x1%XL&{<xN`&H-)<BwyjIq~wUo?PLZ{A)Ewtw=N4!TvE`3sNUn3i}qH+9!
z(|-DcadGrdY*3fZr}_nz3J7H#w2B1wH>;jv&O0B>5D{C{kIu584sEHgyUsp=*xr^d
zk_;;g?PL;W>x=&Fe#&Y?TjG=c6_{ab#OOGh0mnpotTQ$YO2m>GYl>ImeXTMq^L#4;
zo`DEd3vU{-($s%Y&32OUG`eGY99x`0YGpgqOnk$W*shZ-T^pjG%Td7nht$#h9Q-~K
ze`qxfMz*_Xl|ZuvLr|ytkljNJzvkTy7HV&7qS#e?K|CWtL8fxp3tB6<WNMoq`Foh9
zdubK0P0nbE+MZD0&QMpAD#Iq2R=QIRI&I<$EmUEV?>lKQ6S(~%kjz96?K{3{<Cqc2
z4(P04v+-if5Ur`t{uIHQyRo6z8xyH*Ptgxu{MntryqQt`CF1a0@kjZWk0#Y<sBG<$
zXs1U12<pBkZ%R6BH+?RuFojLM>~|{qyl5SJ*&!p*KMw3!E>T>o*^+Oi-r_`d>SsI(
zu_m!cNw8nM%mYH_S0iA{rCfy9Pq4LX4FT1|S8cB=3|-0PR0(IAE&F<m{^}h+HBj}7
zz=1nZLFmN1m@l9Bv@Ct$*cAXS0M>Nse@EQy^88@&4}J(8_{^Ly-bSl}Zo)-;KCov9
z8xnO76}wf#IS7R@0iSV?7RvZO8o;C>`NwfN$L>p@+r=C{2Ti(CCrYWd;UmxSc|s@p
z1hc-jHD!P(hu^k-YL4dfL|NH4=0xx37xPD;JVFV=_P3K=vcZdY5v$WJH57xEa@z_R
zHgD&p2uYz&<`{z5K7(<67NSKCp=|?LaDJdxr65wy{;PJ(Xm+-CZWew2P);p)j{IxA
zr$*@JX9Y`9Q0JsLp9_rm?lx}1STQyUsYxd8AbKm3P9xV*q6*NgPJaj4e7@e?p+}@2
zS}bA(al3%g2pT;)!_tkN3Xj6H3R|I3)G8*brWW((@>>5S#+KH0DsTC7Y-HIVsnI1m
z>*MFn7zwv#_MJx*E$sn(8Q`yr`m3Kj6nKXFRusPvUGFuO_fuB=uPYt3*vg0MYrc>3
z4uZV(X#7aLewzZO*;v_}Y(nP66~+LT=xA%qVCjrDpVFOs?2%D5!iw_jE`9lhgf0%j
zoJ0$57xGxOzV4OrQwaYjR_n`E3H<=S84+Vm`PzRx?`~f|nWWTjV<j<A+lq1gKTlM!
zL%T9__;m{xD}^N060^9448(jWJozJ?57GQEGCd}YU|73?LrMD1tFme(#8n)Kb>;^l
z59k*4B0l9u6&on}%1(e9Z(=_z^aMUPj$LQ=dB%31Pd>F#F}Kt?&sZRtn{4ki-M#<0
z6JIkeMNWufj@eCp)j5)tj+vq5-OE(Zm$)icddom=wiK1JG;<1UJlWzyP((JQIEyu8
zT`&FVvylWp?-g0sNIlIR^Cx&#k)dp#(5vDq`W(NbrC~5KFDZn&Y|0Fju#Vb+Zr0sX
zpOl2XgQoBdRffdHcb)O3yvBAZNT!0k^AcjWyUXBld^Q=3dufi!J;^bh9Fkb&ja+TE
zWE;UqtuP@F^e*t&PMQ~@%|$|V_>|Wo8^?&Nujpw_H$f}@c42fVSnvAp%5N-Go4OI4
z(!XRWtqzhN^~<_!gqAv_Ur42&yhGooRX!&ZG_%G^u^LT>emQ@;`t-dh!mZ)5d@+;p
zs_-A|lsf`hwIRcBN5D>>^q?-HZ|6jx8)$8VEIgq_It<`_YUR<($NKCAhYnSJ5{bso
zYyWe-e(&3>S|$47X}x{o(ot_ZximkKqo3Vu&)z{jzo@$U7@Uw^Ae*%0tFu-O5dAOf
zP$&54<ckikBGMj-^(b2F2m(oi#@GZV%_YW3P^on2BFA-70wZbKyaF!Yb+w)!87onJ
zmL=o+Z-;gU(lgG6ZR23BGdGk~qEJXQ0?LWcA<`;askiwV*nM&cii3X1EJS?mzev#D
z{svhR8#|Hs&EyYe)-5K+lNn|U!Sneg+&z37$!}!#5V>d%Y@r_rv?49}UQsI3*3J6a
zsD2nWF5&Iy1_9nCobQpPw^~LS4nN9(mN#A_wZoBpZUNtW3h=!L6w(K2;rp23q14Lf
z$GW$HnOH(8oVWjTiCZHkx`eWBfjOfvFaLJ@!Q5XqdPcYP>d^jIBuZLni&Kwbhx&)P
z5B9j2p_r&C(2~mRF0Tq_c(SdOfEZ$-%LW;*0c8|1*7ZD^8}t>Q&9U?-vtcs(7`L5A
zae=B(t2%xhigznM5*la661lr3i)87@cYhobT(kAy6TKbXUR*+Etm<F5N6S>b$$U}i
zRRZVg5O{K=C$es=?5c!zW^Dn#-6>hF(lYV-F|G&KVRyz9#~U(SMMW|hEY@qJU{hcn
z{oz^htD=pdf^|GmCW4kqr5Qfk$0U@mZNQbRuxod8SVd$66EOe4YV#n2`@LGCQkbiq
z@EPI4G_T}K?C<i$hU1Qj>KIz`ruIlZ{n{#EA1K1fnUX6krRmdep;?kqoVjO6ove_x
z2HF$oZ6}JA2KO`f{lN+lj{Q{?MLfCiHBNv0glcpuW9Zud7RNGW26muPUY)f6KbGFO
zhzANMqXiO_q|zok+}mjYiW!UrS~+byv@&zul}F`cH^J)QZf7J_8zH70%J8#`J))ru
zlp;@-sq}2LkY_k&>!_>_mLRtnFFi!}s~Vv`?t^|@o~j!Alz;=SAR|_Y=n$&HynKD`
z_s(lHaFN_Q0BpsLvGUz0>qN|~%WtrzMS1*{e`FsCjlzf>)*ep0dK_B1)Okb(n_r<E
zGzq^71A9|MLro+gK|fy?-0Ll-+vcP>8?q3R6~YO%z4uOeQbeDZ+X<8~6R^s5ye4CP
zTZqnu^z<sTNo_?U+UW3!Cmy^aR^r%ZKrg`xLVwn@W(WULp%MJ*uh?sdF3oi6F7fem
zsH3AJ{=OAA?u!(v`JS~eNK?}+L~%q%b;hthhAqid=6a=QWvwWQB;6|OxRFE&LiW&M
z4y~bp^#}{3ZOj!!B$Ba1r*;NA5@IoTXC$6$#vj?G*K{l4xJB*tS?;>;17u{8_E4@k
zoT+rR>bGkd;Z8sP#(y7b|Lv(BEBt>2*4DSF<~_t3qy#>l-DQXbl_5h~IW!ww$DM|=
zV{yGEVshoJTM~Qi{mFi&XWyZI%fHDCekzc~flx>-0oHo{33rqfr2|zeeaCc)X<QSz
zi|iMh3KbzwB(;wU3Cd0P2!kQf1djk7p^sD@;Onn$VDwj)>EU=P{IZDg{I+@T<_CzH
zB4HA#>j`nPs2WzW{|W)277;~%Ins&aFPr-0dg#khpHj0rSy_JZtYF^xef%NH$|vKv
z0+noOKO_AfH7z6kM)%`&R9vB-=<&Cqf1d?m?3m&Q$wSGZ((vr4z%C+Qtxjqbf3XBP
z_i@Ee5RkF`N2)R=>iKER?B(J*Kg0c~#QpD432zrk<Bt6fT#+a(9i~V+C*O_s79&`G
z9fMs0U&9A9@<^*r-!0q<g1NxPMsSkLCvJAwM|z|Fi_)+OF+ypvJp!8-+6@J7P>E)S
zsozZtetK0VLyE}a2w*t;e#>XT<1&ATaeMR~?ja_g*#dE4b>71>3`7$gGYZ#}(5;H!
z1g&K9=)7q%Ag$OM(a@F`EvqUEA34bZ`$h<%NPNi-k}m7g;vfBj=QDB#jf#P_+COeC
zA7C7pk$-$l()*xMT`c$^4A*IalQzQ6WEVhJp4Hl@<lp4-q+E9Gwv@*IW<FMAQm8U{
zK3p{V^9HIdj-M}vTq=nJkK%f-65!ZmV@@Pb>hrSymr<210En2cHYz=#E5&}6!Ci^1
z#vS(NVTKYKFS>Ss6^AWH{4moAT;g^2Ny@o;lOfrM$<Z-tAcc$l0Y1-3@Z<@JgRG>O
z8kXFnR-Nwit#vLvserlte<xdkA30(`LX`B7B=$kN^-abGK9DYU+KJ?6e3&VH69D9M
zUoLThAG8uBI!F&BTsI~uoRl7R9EA!bZY^6)pbx*sFIgVwcd%G+BlTg&)Yw2mcg(jZ
z1DJsSK0FCPzsb681N@IVCItp17vYQ8qcM5U4)n`Yv!CensN<LDP>>uFWdIP&`0qFX
zp<y83Z9C6(zk~k!SOW7Diz<Xl|8N}s-zMY#hY5&M1Cbto^qc!PBF)5%!?AWnWgG8F
zH3vQ>ChRxAW2)S|yP+5JJ<R{Hp7zdX*0}%W>eu$(3*F`{x&ck6uooejGLMGp2QAQK
zvf$4*B~3m}ACD|+U)UcXMmWyXlI5%`xtRVD404=D+JP;&@w^3HZf_bV9d(<{lyYtS
zYR46MKFh7hyRQNpOisi;UY|?uqj}H2{pG=2zi0N#fsYU&{h2LSOl@Q;4eyV)i~hH1
z8}H3HnIIiez6KXr>nrLT%(2>>6TSO2kN0_`AmL~HJD>R#*lDSRlTA`d^NV38dDobP
z1X$CW6mATw+`^;fnlFkd8<#onIv7uhHW`P;K!nU5=ed7@Pj3lriBa*X*sEAu3UD-S
z2&RXNqHOTw=9d=z<ow9Z^0I^>LO$xHjZX4iy-Qbo0j%FpuWU?~j$=VUH(&|_XXRoQ
z<H7og5;a4YB>nNup+Lo%*EYIlk*Pspw~v^&Z=u*}4R~2=3<lEN0<W65@~x1ub)$-A
zaLhhqaePsA|L)?F(T-_fOiWS&5lfBMo!ggb5}Bn&`6)P$&&;z;Uc*CyZTF4jSA2I}
z)5MrLHs6V28a7o6W^D_0$6az8FElKhdm=dcsN!$*xh;xc3LDm$?$zk+*ZE{)^PQxh
z^1|7hG-r0AvyWhZeZp)gdz8V4F%r!jTP>5p#T8eoo_9%H7YjET1iQ2XK30iEyz;sK
zW~@xl$oH8rjivY=EQx%;Pmj$US1w>w<&eMSV(>1Qn>zjsTkr{6J8Gtv-;SCYls-tj
za*8(OMLD|IeZhZH8E2-!#K5sIt0k>B4_!Dntf&<F7$llGovAJR+`zl(<$heDF}L?`
z2GHLl=^52}9mVw2dRZM_j<hl++02u>3X|j9gHx-Vd3Jv8Gdsn#;_oSN%HoRLDc@h^
z-V%K$gBydo*0=TP6>_&VtPC~!3!){$EXp3_Ni06+Ug@b5Ri^HX>%?n)OJT=3Z+plK
z-ih=FGfk_-Bwb%8?s}dugZ_#6h1ch0HomSea2DXyWUq5b<Kb0F&K`s8ioKum%5D6+
zZFX_xf(;uGR?IPUQo!MN$yM-bP}63?Zi74+9BMx}9h5umD_xLYHr4g^$>q_=`A6-B
z>gboYdRb9IH+r8CoklNm$xN1rRrzW<heuK-`@N<4-8bX%vaT#j$frfmw#vmRJy_rE
z*A`^zeK7N?yKOryx78om7xb`P(E!RlF&s3tXh-g;Xf|KN2Qm_OoQA>bjdH5YH!U-)
zVLLu@=|cSF(VNq@!`3quo_-1`wr7ZGYRZmI^07btzHjzzg~;8|h;Ay?9bJc^91XPa
z_Q9m_#&R7CH50(9q-Sk1$FPe(#upxcaE=<hDr|I`l#5sjHSD4>eiHYV7LtD0-s!u+
z-RvjLmK^jcOscff#ozEh{v*5CKMALx<$W`}TJ!!3sqf=cM2`NMEJz#&^~}mJF4KX-
zHbyLAeFl_*_j9d(W`5`C83qc**;s3BJ4j}dK)G$^j{^t9#OZrdpC7mLq~&Q5_eow7
z&9;-7Fo>^AlzmtG-3A$p?WzHDDSV{xXA%Iw)pnfYT9)g8C9L(q5<)+UP%$)znU--K
zH2v0c2`J*wzA+pAd+_^7P*+3Jn(1Y@IRBBGi?Gz2CS~$jN#%a>@59rqp8HT4vybI7
z*KrHB#^Fi>iJBIJF$cd&BxRYK`u`uZ{NkB5s2!^})5dA7&*4G?<YAty{Tp_Mhy926
z_1gep?kG(&B6#Wr>|gipd}XAl(fhEOl(h17bx7gZYQA2fXp=jT)NU!&LM5wM$POdx
z3-lrC)ef0Dj$cGUXnURW)w@OK^*b%P2A<*g8@J);JVk$^s^^2W#m}(hq?-XoK?7Ax
za#bTr%k%!>!s_0=jTA+1u^DyC<Hgng%^~@pvq^OQS!fX!&4n28dY`ZERA0MP*U`kZ
zV!6q<HGiJxxx(PtYyz14%XLBKwF7ipwLT*&b+(}yi>gMYzR@%mP(aw$f*?6>(de2U
z9=aSga(NuCD@!?cECq{+3D+E>6~&>**Yu`NCHML5$$zfyE2{PM{x){=CVlgzl1_@3
zQrKXK*4t=(*CJYqGkCP@aL6!aE<V-Gql-63hB|jU`uH+Yo4P`6Z?wg(65#)S(|lL%
z&uCy>;yCc*XTZOKXrJapJ9FQ;qIR7*DWoY6CG&5#;V%<~#Wa&}tIq_Ro2hpr&9rA!
z&?e%-Y}x<1IUd+|J;hVJs)w@gs}H{oTsk{q$$h?LPoZvjNTU$>M^7`)r%wBMViJp{
zv{2)yPTX4)?ENNMfyubOZ#K`<*v36eHKs1k)nRj|uOA|`MG@m9sOe$oi#YX_=ECkv
z7x)BYHyrE@lI%W(F581a^zhDkK3nsI;xxy7(u<MZs<y?9!YOUod%KEVrS&Kr{;{0s
zzDSkOp#u}b?BcP1)=mb5UkPxE6HaEOWcJgn!l?++U#DJ<_5?Yey6mjAizFnju(Prz
z^^MZ9wxh_JRD_^$J32RqdvL$YBSXR=tGWDD+JTy)%?|PW^|w-;d*cEz>B2plXV7af
z^t9ZkA;yk1E|^JnJ-JYUBzuYCw^Ll>?ax8(&Hfj4|Jov4HwyjAG|;-fJfsKEL0ynl
zDgFMnluF|HI+j;(`7b48y~uVZkwWMnr)DJA)MOBzl-#({qMP?_f!{VAD)|XHc+%Ew
zUw$aGN=QpKPgtOEk=(`_k!2)>^>(@qS?1c(b0yr|RhGS&Dv_e#KRx>8xaMBC)^SG&
zXQ3S|e@W16zZ0K}s8z;0#c4%BCtSZNm*C~Nel|+BcC@^+9srUmM=+~XB;h%pZ_oKV
zzcZLqq0*dT?IPfmd+k1fT6ZRH!hO}(&8vg`w$bGX-KaTfOu?1!DnN;{Qb!=QT(!j0
zGyschqjB*=wEU+3AAj5bns{{3B;;~qX=Vrl-#)Cr=8dbXM*b=Pl%2q4P<N+myvlLu
zL`kFn0V0oelp*%gWa!fY=0=yDnw*yvNCYd;c%5nmZDKY%2a?DK=FOW{nGEN&<bz-X
zvnuT$--R@|{ic=KnE6qpA7V%8GLU~bo4p}ee+Wnhz*XFezB`rN`bY}j9yUx(3)s9c
zWI=*QHfirmz~)UVK>(0T4?Zsn53p^y{nI`@+IptRfK9D1^<?~!(bS6$v;%4zl6+)S
z1MdTe=2`h}Kk^|=1A%tJ4b8J2^eT#&1b{HX<2<b=kJ}Lk+L11Ws64tq6#(pK>^7<4
z<)d~$G(bDF(@Bqgjy%ApfjeV!dOd0<{N7~8+f{hv(@>A!4_iHI;_FA2n>64Oz|mb9
z9{EgBmiNQ<|H<(4gJk0#kG}O=WaBceDi)5o%=en~1J5436p-`!fxeu-nZ#}c@Y(J^
zlkL%G0+3ZTgmwpj@pp#XH5jXkOpmVmU5SEOA|Cnf5vEq{6@vN)dscS#Y9DB*J<jMA
zQM&z`z#r%^bMv<#Oe0D2N8^Y2;z^JUQAT59Bj)ES<E%`cy3fnKT91&ii0Jv;$U*t_
zvT+BXO8_FbmYZM@11Jb-@Y*e~0(`b_SR|aHI+Yf9J*cI5iYW|KUMJB&0!{f|J)jPt
z&gKGq4u@NNJf0x{SEmWUq@3C+wNzB1PyYOp#}PVg<^DVB_i))~7-MXW)qalPX__t%
z&(nbM?%!TcwZH)ohXqmc+1_kF0L-Bcd(Kuqb&n8bP)wd4E7GZw^9JBR{SyUma{&NN
zx#c(m0M}D4YCi$+pIuCnDyx#6_gWQ=0Fb=gxC`?hqxao3HzX?a(VF!~-ztI{8D*xS
zTh7%wMAd}X#aShhV?sR7tnbmOMekZ(t8M__s8Wc2FDX)P-zI*~eq`0Fg-U;+WD~hL
z`TFtj7L7Ok`ugMcTwR5F45ugZ`Z_?%tNuJXmMgywu$Yd=!brcPemLr5v`L<?clp|M
z_Pc+GcUze9(Yr8z5hWUGlVq2a>tD-276wEQG%}}w%KG$te43mP2q2%y56B!y5OlF(
znFRtB7-<1Ulx}LvWU<cdP9rLPN&$c)R7w)@X=Y7q5&d0lwR0i797wPRRLGA)dHP(d
zMs4Nf1s9{1_dkFK+Y8X7b_I?fdFh5^w15%hkI(ht&~O`&Ljl;#Pr1FXKZN}OKy6U~
zHCyi<H+T=urEZpvAf1^>GaF3qn(sNPA-i=9&_A2Z_QY*Fss#vz@_^XsDj^Ma<-F^x
zEI|L*gH62RDWWVR$NfA3l+?^tx<?)S*HO0)Kz_mTwFAEb;EXHYD~|p<F4Afi=L|zy
zMUkO!i8aK~O<W3)=8P=`{=wa#^xYOveLA5ljJQ8X_A8wr<1DF$ZwLT=b-$hadasxQ
zseHzx#3wZLUHO}BT9i4E_WEyst=00><=n_fs8CTr&4U=ocPFYFaK3d0aEIDRXtl&r
zlf}B`9rr<@$se-=Nsx6ww4q##Yu5R&4Nbl$lA>R-%5h!p0sx<`5;C90f|X9QWxx_|
z?0^lT$@q9)-=q8e`kMZuG*x=sP{FZSr>Z;{r&JUDGwvC#FrbxJ{_(;wNzkq29z!Y%
zxrZ;xH@NPt0pPQ;V1m~-CvUBKMUmPw5W~rkG0bwP0c^G2+@7gJeR`SY&f?u|jq}06
zyvxSp_z5;m>3)Du-;qj<`Wsu?1CYN;K#6`m94KKAzL!-oJQxJ%MX;H27$7FG7?^Yq
zsm$yMh6ChHRzMCW7GR6ZB=g$nFkltI_W(H&*xa&jlWZc_*p<qvGwt||xUk2GeVY5D
zs1Oth-CDar?x^Lm{gy}YPFeN4gGXW03l<4s&$C$V3iFv6YF3+_k<5U3#=s`g(v#;5
zi4pw&8lBeD+!mtm$u;|em`8;S^<)74V1t*CbKrFw79ZXF)Z0+QJTh@uuX6CzgF6Iz
zgK>RuYh~IW{4r%zad9vnHH6};MjkE4*MK0t0eB-o-Sq$2v$3|;3-CORBADpl2-gaU
zoMM333ds+28X?wxvBR4enx&fgz>;=ci<W`=A|UM+=R4H@T}r(Qx|aN)_~6O~aLF;A
zA-%ud@-!^WDh62Pi^NTwUj&@i0O<4S1EdSKPNU&bK#XRuNEOgNwa&j+SRJA^0#U?w
z0-CnEli_XvquXWC<cl!fuU9;RC@3hC=ZNtq5#;=;Y3_87B2jdRP@cn2l;JmAly-oA
zNu8?yXyDzvr@Y>D)8hG$Kk<ECx#WLW?(yz<rADq~75v_Qf@UAp(mnn#HQa3h=z<z0
zHl4~S$j~bZpa8(@Hojo$f^JKsB%jh?08k{nJyGyg;P2xo<sb$!lQ=-&dZUXcUdG~L
zmfxtyXFCVxOxW{I$ZvGu0>Z2R-A6!lBu5ZJn1h~4$Is>(>q^j48ua^>lTO_~9H|9}
zTHHD5OAAq{d}cog+k?v}-wYYkN1INbii|R`Fe|qowmyxPW4N$+v~!qQe*W7DIetSm
z?ma&w_C3wkBP%K667P+<+17V4M!DuPaIt@`!{AW8R(xdryR?-^_q|#9l%6}H&G_9c
zogpmx{+9=jjG74pM6JsWW^u4(K!AW;MYBZiUk72Nr|EaUG?{$D<KR$gIe|w<lj-Ny
zKT|#Nvh{|`Zj;5QHg{3a1A^t!P*3~MwJ+pm>|sLuIBLP<BtnnvHX*+Vr`xv-1Slfc
zV3wX(*60o_m6VWf`KI~V&WjE-ZLUH>^?WQTda3)c^nV|9@eGTZ&$Z5^uG{Z_CW!p2
z-88Ukk;ol1`H69cAE%j*6_-HX@z@#=Kmd!gUEbBvQ5@rGYW{h-V4!oijxfcPdz>2k
zaUAk+;+|lrar-qQ;T&RtE6E+dtnD{`-~HQ}(~4Wn`)Zd&P%v<YZUBE-;D@~#n3?JF
z5w|EGA5qaG&1Brq5lIT&ALig;OOfhRCs<Xkspy%$T+1Mm%N?7F=k;Kv03Fi!<$XV`
z=*GMD3~4WimRk53@>=$Y)daa?IDh9R3=N9>?+^gLljxqTqL)6e@fdrHQBk(GKvO=y
zJfAz5&qr|iv_1*ej7iq=l&P0^{*eXqhFS{PIn~xPFM@)CRH0C60OT*rg<7^zNk-x2
zv4mge@BU5x?<Eh@9)Tl76xN&D_BfV|Nejh;LxW%p)Gq*zmajPDgS87}CzJt0ckic3
zeAGirhT8W@Y~~{3+_vO{*#thNDyh{D8vOdlAie3#qu1qDre<MbIZg^4Zj*rqGjuil
z{rs?1Uu5P;Q69BGXss+XxI4LJ)<NnK%?SumQAeev>4Qe&`INRqO!oBRxZFclQ8o@<
z9=iozSix?=kA{{GYKzEO9MQ6}V$8(M90Qnyjy>uK2u3Ujx`6<YqbRBP^NmQ6@0H-0
T68ZTP;7?XcNwP%T(EtAcy@f5A

literal 39572
zcmcfpbySt@_ce-RV_}PefEc8Llr$(3ij;JtbVzp_2m&G^B`qK=AR!0{sDMa!mmr<e
z0s?1lpLe|D9pig`zcJ1q=iKA-@p&HD?tS0awXU`1nscu0Eh8m%_yE}fA|j&0cWw*I
z5)thpBO=<#K)e$_xx$=w4*%G1aa+Zjh=`<|@c$jbj3ngv;Xa!?k|O(l?V#Mhht;G-
zz8gQHFp^icxn*u@s%K_{|0E*1Wu^DPMo;&=y^)RKd9gc^GP+E9`-q6n6WtNMDeurd
z-Dj_UvT|GScfrnm`<{!P;QC3o)93t?;}w)yoG1N??|ZLv7;C@x7G=pRH}gqMIiqu{
z_4ye_yPG;?FWFO`ENLE@U9EHx*yw5Kv+SivVp(?*aQV|25!Dxk|GTpB7FAZ&)ln1f
z<E^(`lGNJz`ho)=rGKS}E#YVEd#DuNo?s0-6pa6vBPa1%q|{pXo-S=YkYsFPa`50m
zYisMYv@{bFle>3oh^c94zB@TN?R@;Dxmoto@rj9v;xX!z7Z`|$90s)MS3b^B9ZJv6
z$w^O7-}b(7qu3%fH+QMRmz0~k;QICJd3o9wFUCekN8i>JC8ob}B{@C)Ds!g8+QLYg
zm;d|sSE3>#B_t&J)0BNS1&N5hICrMsh^He{Emn$BVC~wTdux0xGBq_-TwJ`mrpBbF
zy-1GM-PP5#;1GNA1rIK6?zYxeU48xjBKwAK-@a8;RDAjJGs^r1YuNj|yz3ks3Gd(M
zW@M1;J4HnFImUr6+S}V(c&L1Av1-F+gPEKAp0xj6%OHWS(7?dOr3pDDB~B$JrHUJ=
z)Epcf`w7>4e}Dglfbl5*glK+eZ4;BJ;nwEH#-m;*2=B+h$QT%SA}1$@kB`rhkJ78m
zaq(E2pjFOX_s1zJm)|>Fv!(CM$z$QHtgQSg`QL2Oa!gE3<r}qpZ*L!+Y)h-JuU}bN
znbW-@vfc3GcIfSM8XA3;=XVf&*{E%7{2)orOz9sJ5HS1myyKC%^<zSxe6r;2R?>Ft
z+G|X9mqqwO4*pHwpj2F1+MPD-g{XW&!sV5f<L5-MqaH`S%d_6Sd-FN-m-jYpWOY?l
z?56DGz)v}GEv-^(gYDtrVXT%tM_g)py6c$N^BqJ)$yNBw#Kh5J*XvW;UUCWw3eqtG
zGyTQRCv@nmfBg95ygGY?k}o+m)oE3m{@itZ$R}}z{YkH1zgE}i%Ppx)x_yb&+Sc~2
zxVY15I58nMh}7vu%2Jw}n?HZ%!?N~e^tH8dFf(W7=AOLCiJdO3uaDxjpY8QF(Tm?&
z)YY<D@Xa&rx$YE^`To62MMv6xYPIVw@%7!y%ga4^rV){Uzx5QQCtg;g%nmObyrS`^
zARs_SX&~?O=OOjh3g=awmgbiI)ahykYk7+kLj&GsPs}Wrt4Da=5BT`__>wYz|Ng!C
z@fsF<2HVq?7Aiwmeh&w~+uPrNpvc}_Q&TgZ`|6b|G}6)2qoauxirTnzbS6AXO9fMl
z11wSzPn?|jP2q7_^5Vv+<zH`Z9)4b7XFu29l3`&qF){G4J1*_{<ZSUq>9Z}(d-uM+
z<MZ`(KTYb+H#EHT^UjQ`Ycm_GjamT<3(JEC4-i&?w9<*0ez&Ei{e67a7iyTr{3+A*
zTWoA?qXb;nUthj!qjr78SgVDGi0CKB{=<js8XA;n4Ky|Tu_YZD8fg`ZQqg>OXfIs6
zs3per(e2l$kB|6@f+mZ|ScunqMb`rR5BVK&I?tpDM=m!j>s}v6#mfZ6O!e5Uy-Ul>
zrVk$?DBr(-&(6?A>U;YAz$X=@V{L6yO+`Yh$Aw(FKhCrlSUYRQEG+nZ8f$0}(RkrZ
zx!w0NCge(F=A!cC@4>Qzr?1>Eb+75~7vSRJ;^%i=9If+sWzXEn%*0e*Rdvs@;}32W
z4=W-fQWwFwifegUPhZc#K&!-s`|8y?#9u>0LrqPZ_uXSclarIzA9h~T{c%)US~}8w
z$Iqx({VNs1^4%I03yX_&b#)VDnsWPshZHpP`RP>~XQeL39DN-Tf%KH-c17>u!*@;B
zADWtKmbj!Cap~z^YE=+c(A2cNHcd>etNMF*R)d#q%6x9BrN3jWqt7`*Y~Zh3Wdl#|
z*;A)ZVK1hYjqAcWJYJ2|gtojj{`zE31gAN|#I166{h5~+v-+nGv81|uuIo#~Re{A$
z%L~7M-xe45dGUgsgTvO+GPZJZu5`OUOQ*8Lbt5q$K}1;CqM-M>X}4kV$>5+Mc_pPJ
z4Q5W{HS)BPu`w}G(c?m%ht3KSV@v(;9^1?sriT5~+kr*ZjEUoad(!u>P1?$n#T=DY
zP|(xWT?*Hx7kVBL5MY;iw^2dZc11{DMC6%tQJ%z=ik10RddIarmJPpbmDBItySKHq
z#n69Hdfz=Pc~i)G^mAWdYfH<C_H=UU^4{LRgJoWK?%ZL&R_L}_7#JvrghWiOudjdk
z^5sxwt;ELxc6V8JsMmyCwOyD!Li8yA=q4j!PlJPlCE{XZ2cPUY_@;EY?Ibz5^ZZc7
z(vpq7{ELDD?wJ4{#|2$YP0HfT3nvfE%*;41Pqt-f6w#d4oWN$SCib6Uq84Tdo}8HA
zXsnU#Dp&S78kdwr8!R3n+p%J2m#be>!<egFRlJeq@oMna$ga>4>NHyE7;eXPiN5c$
z9<TNtq5NU%!=zObdEH6$#*Hse_Z?x^Sj;Tl>Mn70K5^m%^2zd4M~=IzW93VVl9Cb{
z8X5{7n?EZ(=0-!vCVc$-etv#xxrQv3L*+w5+6igJmcPC~+Og{juB%rCxBpt(DH+^S
z`)oI(ns3(k!q4yO)vFsTGZ6s+EG~b3PqZYFo;uY;^)PPkN9RWqQtMR>x|1Qn!EGHK
zE&gq7ZHR1IkJgS3LB|CTSHb$SvWv{j%(S#(QwfHiV+}FR4i1g}J^AMTFJB5c{Qj9J
z8G$Ibm~5pVHEHkY&?>Z<@S<{4E_HJ?G&I!Lr=cFkxk4JyQ*;~r_6*M$zE*br;zgad
zR0R|^BO@c{m1z~+<##{w)tMe8S=lFxyhI-=Dl3`Q@*Z|&>&?&4PbMY%_s`#V;}7{R
ztNOQIO;>k#ajb!nf#J~M!+pKIJ9qAU^7QG%`=395K6*sN$;o-^RvEG*ZndQ(Em7`s
z_0(|Tw*K(wsJ@<FQ;PtiP*t_PaVjw+{m>oByB9s)B_>FQU)NZ6qPToKLHe(^uzo^<
z-eJ*pzrzP~8pGSPADz)C<+(UMGc#=?TLGA0B^l<L<IhdRzDW^%nEd*Cm7GyL@pxCx
zSh`xieqA_%CC#)a@0d_KVn(kfWUgc*1BHg3p1#)q^4gz2f7honrKF_7!onUuer(c_
z(f8rO)1mOig@r`vn34x&o<;U^Qc*k~?}jp66n!C+RS_N@{&?5EmuJ~Vi{?sBcnd3K
zsApwocbB?v<NZt4C(~M6<%OPmd++D}uxICvK5-lZB#i>RGm=$OVxoA0EZL#pkP!S6
z7$}i%baeC_Nm6q1kLqgiq6A{<s;Vj=gK1t@+@XMgK(X_x8y*2?e|mcQb8+#0YJ>Vn
z9I~@KHikGmbA3hm<^v_%)}sy%4v{>zsTmnBD}Oafu?pQ5652@-eTtOS0N2BZpLHrp
zq@^2B&(EAW^DZ$lb$oo!qtz2^4<pYW&yey7$L=nyjm5C(+$N@G4?)2n$ky`}9XUiy
zOnmt8We+-mD<h+$q74a1x9rk4Zam7E^y<5~yjdT0my}6HqDjv^de$?}SNMXQTuXK~
zYpl$Vjt9pEzBtp^6nS^p?D`l>l;&;nN<1M=DN_>(?%kb0Vrmi+5<NXVHiLTg0;`08
zfTs23DNgf#KDWOPWXUXdo5&w{90eM>`E+kzv9r=d^{!pJlBA-<iRTv<y0i6aP}fCY
zoQc);l}*Wg|Ni06FORWW9!JH*#Dt#Xkjl^vTW}>NCf0^m`jJ;k9NY~A?A6)X`TO_p
z>gsA7(56_Ok&zJ_roh0m!SSi777~M*kP9Bj!L1b)&o<R=ASMt%G#<*Ts{MtwQ^?#X
zsMr~xi7+n9xTjBdQNJ^2h<4xJw3n5YO;b#lisVAt@(sDF*4&YVz$&k-WE+&nK_`G*
zV`Fs<jS1$k7Be;?qU)pY%GJNM-Z9D*^U+jfU|{Gxc8bjed9jwKZ8{~6THer*?(mzF
z`=Z&h<Si^d)O#hgXcDdDD@i!AwfeLFalymA2VPB2A2}f;A@KrX6l5opu5n6;H~HM<
z*O^K#34L`X-@ffUaY83uCmi+F{JQC#yVCjjIUCvm*QryBqcogEMU7R%MKc`?4|Ins
z<o^_9`*BBH9B6Z@Ba<qyIa8~&ySw|-C$50o@|v3U!cq?{EiJKkFTK41`L8lF&ow99
zjVEUX`pwUkf7moI;NJdT<=1z=g9i?*|M}&QERs^M#O1#A7pO?TA-ZmCaeHfH?!$*`
z?(W-11pmJB6e9$AySkj*t(K2!sU;->OiURF<in@FfBEvL|0xq4-K#3y((Nr?XEPO*
zup8$sEG@l#eNDQuM{*1rdV713b<4heo1B`O;F3IY<VdVcXY4JncrpJxv%c<*j!;iD
z9S`wJ{kWsca`Najbhg9|#N?NTzP(H^)aUT6ewmDP)fFEP{G}y#rJ|&|A!5^AT&{mK
z`Xo~*V_?-M_Rm;gh44Fc?CQl<&&t12U*@m{VyvmI{@5vNYI-%M!QAPpdzRs2yIajJ
zuHDCkw)oDjeJ7zbH=ld+=1iMoTwL6E6b(ny*ITt3e1!-1Q=>DgkE7}W*x3C0x3;cs
zb#B0YduwxhL$Ho4!RP96A-mb$vlJ9pPab&s<cZVLc++@;MvZPZVip+o;4>jt*G*&?
z67uWQ$Y@B`C_{M5O*-bomckcMT8{}K4pY<8`uh6FH^Xx`jJtD<?yB(EP6`vx|Nf0i
z9ayD{T|`ia+`i=TDmOP5`<taK!8^G3Fd4gPH#<LnahcZ<FHg@BXF=KhM3TtSSWU!!
zJIez<9{SX(K9l%k3QkUi+E+x_KeLR@%}LjsU;W9wIX*hNvaU_<6x>l|yIuFIxn_T{
zd0Y?x;faf>Lqo?`4u^7{!|kmvlU!qG|7^eg6(G>Zx*^)Xd+QfTpQ6c)8#ioh*f;jZ
z6c_UsF*ES<^IyNNSVtoz=3eya6Y;Ze$;osyn>bo~_wL2r+u7NjCf<##7ozriVWbAo
zT`k{id3DviD?6b#>nr8=j3A$@&Hgs`6=h|ce^vU2^+$Os)(l#pHQgZf8vn^45YzB$
z9*eU$Ty;Xfy(LK+^%&PjH6JNn9v)U5Higyi`*%M<-?-!8;j>syMn=XM0oU-rz?N*i
zyG)@|qob#(sHjLuE8W~0yStr!yrPbATQ`!DdU@KPl!(Z%y0=%IB~CR5#fQV>qz=8L
zmgx<u<L}0#yU#Yb=n4uxSN8FfCeF&uby;Jrsj5=36<%&j%`_5Dn9wMVj6CP`Y(wln
zL}t-Deh*-I_CTNW_RZ-J)KBq(*4$h{Y0>_o?MFvnhlW;Cw)P4O#abX*fGG7TGw&Y}
zN^<9aLCLQg6-uaSeFfIEyu3ZQ%ZcWMno#Ea+}!E*^q#&Vd*G5qG|(--hjJPO)UtKG
z3knJ{GtE_1RfUAUb!O?zOiv>-5n}Sp8HdgF<;{)Nmeqql((_^^r>3UTI)@OIsEtg=
zz0t&=ZwA~arbYvlkdS~1m6erci9O}u;CK1+p`gHVt{;_arYFDDX*o3|B?aK{=FP7u
za!I{?eG{ECi0j$@;tdo4^zf+ZXg<gVT)3`!p1#|(^$z($CMv38(4x?8M*O0Pm{=u}
z-@A90w6wI)rK2nu7>wbl7k>KGn140bxNQ=!2APbU!}z4eU)<$!@A5BS0CM6J6Tf$M
zo}qOja@Zy6M|O&eD%0tH24c=STb4>ANrtW$JsNJB`knPyJwPB$;hBB4d1!l<UL5+b
z?a}<D)+BPF38aFtv9bK;XfdWZ*+tF`VnQ#kqM~Bj?Z93f67i(Oa`MaI2j^9)#y{Q<
z3=RLx2UYRBNTBPcD0E!Zr=p5M1!T$3W!C)cu)XEF?5?YiLxwP%>n*UhvRXh)OG-+1
zyjKZ~jGP`C$_DI0d2f6O1Yz3#zU%MWqMV#uh4wrU=J%HrJwOIm)$-nJ6kWe`=^ZlY
z*RNl(d~)jPsrnsXPW$@$#>d6Ar>lW}(9zM!v6*Q07g&FOl-1(r7fODo7iU;NXpB@+
zxg#pnjEv}8L|StUq+?|qfH_XkN}T}~cW}7&s~A9*Rx%uaJAs_j3?&gqk=6CS>XqQ|
zaMgSFno<=QIqVhjxj2oe9hAq8;ki5GM0^#~Rh!Db0<^NQ1gHf2`rcJgIAxubSy;%!
z&ArzB(F7$JF{4prr?;xQgXps&LiEVNgE|AZUQLBIUkK6e&)*se)nfH-YHDK7h&yZZ
zheo<0?XO@zb3)%O^T^)bb3#9`QxxZ>6>Mbg>FJGVrLTt{&9?oOZ*2Cn!gn|~*Jj3T
zXV}rW9v%=vT+Y;!{hP{UVck7lYwNjF9lST{B!6tBq5523>3_82DY?eGxVQ@p43l4<
z?yHqP@9gZnZ};w>w6C<%#>dBjzuvw*FTaQA^CEIMR`pFZ175M-PB-%;`p+MS^>2H+
znQshmxGoIe(ZBH<-3%GoPuq1H-6FdZb*9ioE%W!s<p&-*N+Q~~zV4&?P2kE_WBxH&
zfQGyF9%`N0hzC-TirMllQCpxe%vSY~1IMv_!RFBE;=4ace&BOa^qN~*&`$Ns_<z|r
zC$%~Dm=`_D!GpdY9=rScQ*YnC{o%t02TpBzBBDq3(K2-E`DRhtg*e=a{$8a@Tifx=
zOiWB*ot{10Q>beD;K5BHAwIU1v-q5!6i1Q{9XbT2DMPck+KoA`9mg8~Iyp0w-p6>n
zU)4N&>NsB4QSGk6B|;3;Yh`CwVl^U;G{3NrJwAR0NON7N!amd0g6kZzcwdRzF1+nP
zT6VUqv~-MXtc!aYTFv6(;*YkzElJzW>ls=P9(;Xvko0}Jn&G^4`*z&h>hgCgs;Uex
zsqjHUx5cY{kwpVmm#@EkJ>Zs=pHE7>8-Ux=))qXF!nR5&(6|TTazNR&f3GFZ5_jBp
z20Yq@;CAGL5*<!<@J_8t_wEG*1-%Ij>`PUcTD7}f>#iB}_IU|84>NN^Pft&~;(MNC
zq$S5S)<x|6>C>mNL~|AnHwR`Fw6vH5tKKztx3&fWNEPzXlhA^a6r6Y9)6qGxZ{I!v
zE&sB?MlE~SGRro>g*Xr7xPqc0%L43p&wVZt0DT(T(jRqoAOBs)4m<-_cOl>`^}7!r
z-sa`yefo5XlXDf|G9)CVzFumsjQ5!Cf#=`u%Cl%w5E1ncn(Zl=q7eH^&eSG&Tq=so
z@>^x4SIx-0gL=v2djNp`ep3(>0Dx?4Y-vb}vgqK>QkR#PziAjFKXV2L)yW~(&0Y0)
zQ82b7Velk4F<$p$x?XbAZznfX4y@a9pCi$V+OxE@1fm94<BMTce+e3$EwPVy>4uBs
zrS0CjFwOxE5#m9MPv=OAJ1R%wDGd9Z-q87M`I8Xn*(1ABJOxVjX~k^)O77v^<9Gd{
zjSLq3Lh9;V&-T9Ul^Hd|!`MtBG62k<i`&-u{(|?v+;1huj~<CKFr)$v{bP-P#qkhc
z7QT~kmqbM05Wrv=2?v0PIEnD*Q7OFb|0lmVA4wqR|8GA0fB)ibxIDuMUD?>;M`blf
z$2Hm*7i~Sg%cp&n-YefzQt~3(OY~@!Cld8PWJn=TB}X5;rc72wXQy&Pr~xXL{F2)9
zvcXUPE_U<&&l4sQpebKc@LE}0gS;wmTAoBN`_^*@(a&O%B)~i6E2n)cgkoRaK_aGL
zH<SUZa%-x&qa*1qPD}I2^``oIl2e<fhvpqXKjUgilr$Mi1w1}NB~UBXRq8Hid<O9}
zWnqj`e)iv`Q~6Ra$v|J9gp55oH&=c_mXeavCgu5aVyBOZR7ffJn&$XG+6x}`_1*YE
zMD*LuOOAoh;rD%DjWcI=S$%CO_dd}@58hvd5Gu|>5jQK7q+_;*1Et;8CurrVt^quv
zOgc?>vIxWog4>c7+&pQEg(XgsUqh=I6%|Fwtoed$cQyF*2=kJ)(Fk)Hkm$cl?oH{(
zL_|ak$-GIp8%oJ-B|LRFG&pz$<+1$vF)-S|RVRpdgZI}cv{5N>akR2x<sA!SGvGRW
z_s*RMR%q9J?+j$=><i3T@*@Hgu`vVdjXDWl!qvqE(0k9$$1-$5w=dzaQh_c(#l3jp
z!otD=`??)#*fh8{%_2L~`}glhTsOtqqno^O9!d50!U7qmSuf$&ii(M!?rUmBPll34
za#?DBd9(wll#fz+)>j6sc5G}cS|KzYpa)z8O0oUOC$1YSxLqS%U0twiJX$vyg144h
zr1_m!a`W=Q)Z}Mpld&5%0ur6HR#j6=qx&7nZB5o~kLozR3{WG^RAyefnWzzgGvE-f
z%g|&{qF*0bVEIclf#Nu-qtD%n^75lX4t$!o($FvG-@c^X{%d@^Ged)yM*G*|8Yr5~
z^z?)<X04Jd0k=EX=*h{+y@g*#N7uh!S!@tA7+o1}dU_{RJmI)E9=XwkPvdu0AT4Xy
z6>93QEiHk?s#(gtvA6btWMA2!0BX|<|ARdY)032taB*=dw4a-up04eG6&$Rfto)|;
z$(}uXa+9%7ItHWj4zejW>q`?p&VyT<8?{5ALlqSjrwfo~vHrLWJblQ?$Y#4g`W83s
zIe7YqDI*v+M5j1;Eja4oYQpCx>`Ao7*`f}(J**k>b<pC{ac?iLea`&g5?<fF<mu_@
zaWvrerGVQc6g=<#Tcf^jWn}<LY^<!=+1ag!lXO|Tzzv;b&cNs5fRH_t({h>L<9rwm
zZ_)&MF#~(0-Fx?9C)n<4e6qM{)`A}PL1tb_N&nZcgWL8<=|FhXht}5C{>fBtKYe<W
zC@(LMBYe%bv!`dE#5JNyOGRa^&wc<1*65fN;x#a1v4*+y3Ny1oGmx37xp@QAJ8j`M
zndi3#hKGOtyymzt3`jv{_n|C>!=(KKDae)mM~-BsrNvwS`t_>_aMvJRy+C$35AEOs
zU0rtV^5^?c(9o5P4b_IRO`d$iznYd=@>;D55a^`Rg<$c27~JYXp`Gbo)ZO%hNhk<t
zF@yUL)PmY)i#z~m#cX0=P^mtr$J&Je>$K)H?Jh5AWX;Tp+e>mT`P02TDz`t6qaFat
zdAveL%}NgfLuYK@lV!a2<9ySeL|d-5OfA6*74XGY_SK#9inp5fdzGQC$t6kv*vFnl
zLv55SR+fVPLT+}7(DhqQU7@GX%F8ojkGw#jQ&{g=-Msl&y;K#q#&I|aFqnFk=9%N-
zD1C-UiT16G4)Lk$zzx6kztJDo4EpkG9z1?`o+)D}B^8z6!_E(rlg755zkb-V*?@}S
zXYid6c)&yb=CJ@DrTL%VgVP0|8krdwv<0d)Z1z)I-6|TdBtYIf1=eFEyk#IUPS)@}
z__n)%>jnjq5;sWG)dBZRF2?icA8iIhX*<Q+AJiZCF+YDB$kUKmgm`{sg@l;+zNdQ?
z|LOC`y+MuA<{v+CB9LA#F<EZw^4*YYn|2oh42ORNOc!9?T9zcwzI^#o!YD;>>(8yM
zy2h`v(;Yt76Y5Y=KA#OQwy!QPA8t*NL-n^JbUG2NdOi{~a>ai@G6%kX-ARuVnDOiJ
zCX1k8jGdB9yr`dc17uHr%c0#TOg+537(*C%c_XAqPoEYQ5ka3y*rl`Rce>UHOrXV}
zkkbjDJM5gCSc5{>jXcp)BSS;1`n6|pbQ5;fgOl#0H_mXWkL0#0O<Zk}7VIl=?dj{=
z#AAWnomPqBu|*Z}VVoE!bq{6I=(HCJp6tksQNLEcrHqUh5s_vj7fAj`K}N;`ncYs@
z&Td7^eKR35Q_!gSlEy~>$w&E2k#S0yKYrZ4c=2Mv5`q)ly83c9Kx@d|05$(1V`h!Q
za*5UHF1cAZs+MgV@R(rx0Ui?<J&($2X}K?r-{Wx|D)$Bl1;ry<Orof$sHVaIEv{Kd
zMig?4j7%enrL3IXerhBcHWrqqI4hj=5`^2GKpNYL=8Bq{nzpu&;Cs;=A@~gp<k;9J
zx^j}#eS|MeG{!!SjioLMp)2UIelgouq*dxx++_bS+bigp&>KtD7q4F*mo(8qFoB$%
zKIya(oMk_!nIcbi=FATg&WKKZ>}3CU3!kGyzkXSdH&Rz9(Y{y9mzv#4Ps`7*!F2i3
zC6CSfpZ)#))jh!wvb2cLt%8RQ-0q)<;B&MB0or-?4eulN->-{|ILvyv5-eq*xy}Eo
z6kHoVK}(zT=+PrYsj;dEx=IiWXqH<(J1(xw^pH|eZ2p=51$g(4a9t|k)kC$Jd@sjT
zeorGya!o;pDKzbjU{y+HW{1tkb-Qo009pTe0oK<~&`8`*Qvd8QkEXx25(Gftc5zF`
z(!Y}y;wk6x3dpyGrP~U4+ji^knrBFJ+}(?ejJ}%z{0rWqS81gp@6Rszo#U2ex(|8B
z2`SvtavsnfN*@4Cmo-AvpGq*}&w;(35;R2)^V$v3{2l3PN%yiqz^)=I-bs+vzvV?j
zK~RdHcBtkW#`YZb`W|GJ<=bv5<eQ~!{JLnMl8@>JG0=~(i_2&1Q%jP+S<fM$3pFyS
zV?v|o<-rdZ2&c&NSPlQE^rvFf5YA$xyL3r-`NJC8AG<9ARbck>9=LGm{i33xDBx&k
zJdaS-Q{ESzTLplQ11AjC8Gl;s0k{3!-(M?B`<YJ(RhR@p;6R9_s<0vMwar*%_mP}C
z!|#;a8zoNR$>lSU2I>0hLsL)`R+%{m4j)c%wPnu;$LUqiG-&yEn?2;XO~4)=sEh^W
zh@t|6j<ecX%1j~?5nmN#J`aFA=3eJIGxLd+lXI>qejo2GRLdbY*M}%dppfJ2hgPP$
z*z~GTu1{X%##+hdyt2v^y2i$~@w@DZ)|94hX^juVl`Ag1<dN$86!i5+fqGzDK&dNG
z&lq~@C20<NnaJFht760okQ2N%V`zWl-4h`3XhMZ5ofxtB|4aw_@3~A$&aRa}6>V&k
zvCF+=Upj{jFjgPcf@)vXB1T+*gbZ~HiEcs+1PkOG#EgNi?zOo=T{@B>quZjQdpF{>
zlY+vZCbTA<$>3OuXFPW77&SFDh>Fc5vfei=I>T;iqxl1FycR!iKrjS{c9M#__0B&C
z<4ouT0|M^p>b}#SdoIiGwDiikO3210w>fffa1d*u`q4PJ*FW&6-s*-fYnT_|+P8V;
z<jHb3u^X<g{KYLvTs#{ng8(+$%N<&$%F2PW);2bBPMk7N<`6!A^n)Nka&~2O(z|zb
zB(}zJOd5rs3JR)3d}@DO%?oB!%253{2}rpu|CH_e^^k+lk*p@T_!0zT;{*R43PmqD
zkE7(|5kR;piwrv+-#EXja}ku9kNJKEdivOo4m9n~j*eAz3ZDnWwpK->p<`-?ir%tc
zC#HtLR99OoFA?hOkPhX@Sn)O@v6Bkq@i?1_$1AKl0NIoaGppduGCBqZ9*duk)bnsl
zz}JtCvI2Ryf2gZ^CMlb;gx8@p^y%{|H2$}>&gi_MfZzZ;@4ZVCj1Hq6n(;pzu4f;@
z=d@%9B?MaxM@dqQn{46niq6|iBC~EW&AhHJAiki;_-lAV0zrS#O90B~r73vr-iLo=
zL5*0M$|R<SA~QWux($s6dL_j_M%uRIA`bb8TMl{^$LV|ONNW_FW|0y!Qv;=?>f4Rv
zqjPf&HkVmxq$25*j0#N&x0)HyY!Dy9q``pBMVqDgH~HDKP5xG;%QRxM;_Z#n=Q}z&
z+!yOOt*D<Nb;QI_vF-f~@e(=2%<vYP<!MsFNm6CHrKos%V@DQ*D>{va>R`q$y=xpC
z%Mj0(mV(H8e~pcWzJ49oH23E(WC!t>3ZQN*Us$j2aStKtbj`x|NW;okLKt^Z3;)$h
zbr*cT#Xwc0&1*CM<;4J*fQy5Q%Gp4z<-B*Y6HxWawX=qbE+I8hpY}!W>KGSCl}S{t
zhXz}t=eE9-;xpIwU&c&y-|0A78z!!kiLOR|IhFLPYO5ia2<R+RtkCbDUm<P*y7N&s
zw6?akv{*O4y94n!P&^@(v%KWNQk#+%z5e}yxt@<Eq0PZ3NlCRnJ6NI&B1!-G`SeI+
zR1^|X{jYgw6j&UzhJ4^u!EqWZfgsZ&IdmvDJ9}tx4Os(+l7O+GF)4hu7q82gP3bqY
zwOt0%M#k<ev^4=UAP{2?k#=@g0C*EzdO>Y!z5-edt`9Fvt6pFB%g_aQ^?8QANU!v4
z8o19%d7~5m@|nqjBrd<LMoR1^(GPB?rDSZAf8{UG5AtxC5#5mcuOGg_wFm$8$O2Xu
zBBKAZd;kC97ymH?|MSBitrAly5N_yg%9C$#)4d?uYDO0R;}8sMC0cvCo1YLKg|BxS
zV3Wx3`2VCD{`b>uzdA_DWU-|L7Q0R58cH;P7T6aE!gS2cVv^`-KVKb`$NqJN+L4lm
z{{8Dx@en<R)lH%pe@<q@vc5josrGa#*QJ2OgKldhp#+4=$jECq-3h&3CJ-NQ9=$Mb
z04Rfc4pQB1W%?}jC2np<V9NhevW`K{hYy{fEH6?IPi2+@I!3eT><#suWimzY;l9#k
z076#m<+&!qufxN-2`zZX-$%UUtVe69J=9BF!aU_{oPhX%$=P_-aG#`1>bHrza*YBZ
zV@7#$8lk60&5LUR*c5t(zl_HTk}dta;G2{*h8%g%#M~d1#;0NkQp=v*yO*ZBPMpG1
z|0d+fR}F&OpCJ+%zkKb<se{l5;1lJ?oBWj{J3EPf_vE>AwJt&833zky+qY$`XMk%;
zH&@h3-8Km*ATyKsxHpg8^d}$>*eAjVN9!Wa?Lq$6ZYQ{PNW98MtPsRT)o9bZ!az*y
zrv`*lMYY~X<#JzNKQSrEz}T1|34>R^s{G+6@}XZyPD#nukAREFWlQt($9yYxKE6SB
zQvA|u>RX;3o}Lij?M4Y5%7mOl>DGE0l0-njF|V?$oE#k`0_KE&239=Aqr|nfwLlP1
z$Z~-tX{Do+=@d*&Vec~G=i~DbicLu|!r{@;)_zlf%%!OM0#*ZhMMBdxAqxS2+Gcd?
zVZ1ZpV31uh>3n<h>5CUHpwVq^Zg%;8Dk_5WBg;C^u<642^Eb@qL5DavIyQ+A76bh+
zi_Z5(f9)(Th+#B=P|8jF3frJfQwYxV6@_NRe)^<*{%GS8dgzvN(9^)VDEIa=-PnqB
zR9oq2zASKzT@X#s2CRT+c(0uG<U2dyNc$UjEDIq%Y`U*cB;hwGqh4K0SWX#b<sZ5)
zpFclJynEW<%&wg~PhV9P2J^>NOZqMh$N)wY=@V-%TQAPC0jT7FeSr2F{%5G-pne^)
zlx}+$Bv=Au@3=#JjCeQX{C8onQVdh>eOL4o^%5qM2M45y!{A*4-VI}b@L>W`-+`|m
z-~+pwIvP!2-twT*BX44@KuLZtqYsk^iHah$&o7gq5y9D`;2{TNl|=b{U0rz@nHw!(
zKWe{zee7MOn4w;!$(HjPo!8SlbFd`^O7R*29fesn^Pyx+%OXK@b8#h8Num6`h(hmo
zQ-2BtK3L6zVjW8Bn}`V5r^FMQVUg+T>}>P{%w>IWfO;4xM(1>9YN~Nx;YS|}A3J);
zT*0BCK$1~+=CCTaD(=rcX^I!iDWhMxAe$n8<uu@zvM)a&G5QP!sm^g2HpNwVpP)rm
z3bex7f#^t99`4X`M-NILwX(PfuBi5MjMTe?gqhB)r&9jsxL>RMhUkf{wBh07i@Z~c
z)wZ*{9wmT0EJJth+I^zUAH6%%GBPq!Q?*aCaB{}5=y<B1PY$|q{tqew=fln~Qs<ze
zE%tliL@L5~n(Lsb*p3C<cbKgF*E|&TB*_T<`}c4BO2Xqd@c}NOiGN^ji3*lF`^~BV
zt$z+E_XE#j+_$&`-A1ZU6-4-pXXT$deOeLjLl-{#S#@}d0&m9udrt9;ZsXC#`FYsR
z^adOVrwEKyyUZ3;e|^;}r`cMNwrZEqu8w;oB_$OV@kV8&r~5sBe%>P}I5>*mIb^>f
z2upto-tQiAP#X=t@dA?Z1Ox{DnwUV+)B;fu@Ld5NosK`J@$=~Deh?UNRqUrm(nRdQ
zK?<H7xg~+n4J&+ZgWJ@i_mgF9Wm}q3%P|eFBUJiIZ+q_+cpfItvmTQIQb?G3*p_<A
zdS9T%V>qoG9UcAL;^B<EW~mD)Y{OO&sW>k;_Z+M4^V9#%aPE;LVrr!ECM7M`3aK!h
zoR20QLHcfg|FE!ajyJ_8Y@a%Nwo1ytNfOqSukWb%oq~=YKYJF$QI#9>u9^3s$@*c4
z=v>=ankbV1FnzC8DscY%7uXr-=*GW2J80}y6ciNHm16)Q`oJ?GaQjf0oSiqmeG{U&
z1=r858u3fVY2NAR6ebc=x3{-j5!x=)4Lxn`IGZQ{#oAnmS<a`6_GNtCtR8`VGmJv0
z$@|HZC(oY~sH1D<x@|Vnpb#JN*?yN|!E(cE(CMqDtc=D`$a4B*5!Kyi<>kWR+vtiV
z;vPS~dFM{m^J5n;9l!J70k!qu*t`QbH@BACT0%*Qo24a7PCB%1LBUeb>nvz(M9tm%
zOWk88o`aYMpqU5diaP-9#-`5?YU}V})k$>V&28C?52}Oc{Z7ZnK9&J!o;Gi7v|udI
zcoh^>&U8aa=!pbPPl+q<VgKBIIUJw2b)EEky~@@$R|lXRg#~^7{24LS-rD+OMAyD>
z_r86c@+U{b1fT}f($Xfbjv(uUho)rF7Dk~9yUAy3Yl~J<5Xcw}Nay31&z@BP&q+se
zv4F4u3tI5nWqWfK6l!W|2NcUUoI42~vL5qN3b@@-%|_hhlVIMEHsUFI<)g4v$j!^U
z3a)hRlR*RJdTC5d41&4+Uw8}~{ypK0u9MI!5BPwyJGPN{MubW&{=k6)!=vqOZI@|i
zVBgF-(X~1kaz#b<-o2Z0of8mLUAF#m^FBNJ8eUF$d3KxeM!3F8T-FwlPzWUDhR9w&
zPdQM}_Y=d8%}RFUnX2jYFf!gXGn0}+Pizl=+1mQbEI6gG3H(juSx$5`QOSLTWcrBa
z8TuG+VJomT1v~hy2+goW<@fK^b;S<zalnneIgh8$(?bbsZx0bjqXNfavwew%W?}6w
zmN}ag4zNGdISp_8(f6XV==h%__+mEwz+sr;(6G$KH<N6LEg@b&FjYnuK@UVgh~6qr
zJi~2uspVEkSQxkMq&!@J2#4#Igy6d&hvx4#s4oRUzHRsIRrllG9#TmO324usgel0$
z<={O?yx82gTvjfiH_<JX!0~uaG6l;7WNPxjen`|6NrNvb`PY9B-m(*SbmV5MD;Z0W
zN0ar&C^3oQ!i6|*`*DG-KRSs|Q-OHd*@MD@0|G3O?s<863mRqe0j$GFt&R&(3b+t@
z$`{95oCtSDM9vI0fyEY}3(Ni7#|H{1*d_GBiD_w!8^u^jEv*4qdw_$Q{2@gI(nxBL
z9@zZ^$u64P+OvNjpXHFSo7)x$ocd^fUH~w-OCNUUdiOcrBGge(q_qbK;0Hc69t}lB
zyY(d_o?_Gn5Z50_d$F^if}k)En#r&*$JN<B#420EN&~j}`-`)wCSS|TJsb~~K{134
zehc13Sav`KvQj7kkiy;r`mVa6fk0gnMBL9Acci5=Gcsm@sqh=^%n-YG8l`SgTSE09
zSC9c=IKUC**7^Pdo(h;{uskP($W)V*uegE!LXB>S5o~x*P_Te!!D@<=22|-zE14pt
zWepf)!Ar0IBK*JThw4gm+Ls`F)+lW0#;EVxyEb6(wR5gRUsLw&pNnjmmw-<XH3bZF
zEY#<i22>U^Gc!n4Mb=|4n`bl&te$1mH8;QBbX$D!;!w97NDT0?BOyFEO0YdRFO7r$
zN5}hp#0tJ<h!C_AZ!F+f<)|E^;&b=_lmiqj6#D^of&rIBNk_*5ZO%6kGfTH_SZ2h5
zOx(4P1RQ^NSJ(dCJ7K2+H&`Fe!AMW<UDeXagD1^g5>@j(eU(gA7gkrRJ@?o9&rwjo
z?Gk)iwuMmQ9?@>Rq21uZOv?^<<{@7q1SiMF{<RU5q-}%%YCQRWik1JngCM;6zy9dI
z4&?vcU;NjD{oj1X|NO;o=0i#Fjd2;@mXP@S%U`gQ9u20VbsCHuXhyHGun?-;)Rw2J
z`4numjk7%*QR)?%pDcD<g;e)*;G|SnPY)6x%vaCu6u{xkb5}y*kmQjA2VfyZwFoy`
zCRo=?-Q87Gx{#}W4Gn2dake_C0cqUZ?m<FiZIXs|cA`dtQStoIw~q<E)aD<bJLsID
zhhI9*LXR?s7u1TS$cqC##mdmNYNw&QhUSAag42<om*<u~ATwq9pRBog(OG25hp<`s
z7b1;;EZPvo5JqzQk+)23Y?i=T0?xOBQtenjJTRPxt@+9Su1jVKy#l<k@S8m-^Q50C
z;I<im)q6Az`p^j>j6j41Neirblnws*^XH0c?vJvvr)L9^t#iS2{_`Iu!#t&<^J{KS
z5S1`Dm;IE8Z1G77k9VK03jF{m2Iv63(uXSsnkE1v)cI@A&avsg==H=jRO$L8qqnfO
zq2c(*h%Et>wgU`kXlR7_L*;}$7!XxL{K11kG&wM?-71QL9#VvU37+AV^^t1y>=e0D
zcx3l|D!TwK%ZAbE-$BcOOIX<B#`#w@RWF#}1(y{OsX!+A)VnQg1U>@bF{DZt%Loh(
zSBdlAKbG*>J4?Xa89MG{__qm_5d0dt6j=D{BDn*PT5bJxR4J2Z#_U6ejT+LE&bP0C
zE9Tv~DL8c!c_O~2HA-AmW_ui+oM2Uah@1tvjC};ClU*7{A>gGqlYl{*_^Ff>Nfb=*
zgX813i6P!0dBIG}Idf?Wg-k&qSlbcyrXp~%-~w496g3E4`tMPUOTa{}kG4`zFXfa}
zRtiayp*RY=VKsV^HxIEAhYuVuHcSB>yx!E)6Hz4x2S>ndq--*Vcj0&GL*UDrW!FPv
z%|3#*r`BHAi@7$NFepRMreFJ(9`-4p%hVot_pF25m=_5zdDz7o&I(g<cs6M7f`vn5
z?9UU=@jJ;IIT9kr^k7nJVV6DL@6Epp2F27scWhE^ajB2b0ioOfkuhO5A`-0&Koc-s
zJ?zPw!KB1F657j`6F|uoYNWn>`xB;4oA83m9Uo1U+O&*8;@QNZ<FvVe3Ad(HIwmHN
zH<zOHJr_Zy@mT)+vZG+ZW~$v!YWMElZ>M0G_^EX>-69oxfHXge1%!ux9g=~e8_(Y7
zM{&SGm>(1RfurzD=m8pUGS%{?rU36tC=xuVv*zaJ;CKP^RVqAl)g}oN0sA6RJbGel
zQfYelOL)HOLX|boWxy~N*vs)HI3B)@Eus}f<7QM1_Zre<*T{oBZDZr=vBjnv$c6m@
z7CucVjDVh^IS{IVKN}}-hfUj0pFUOiT;^Ri2n0_9wPa!=*0KSyW;fTL-je{jw|PR;
z*e9)ye7I{$tH27=H@K!z>42y~Rm8(bQNV{|;jOltaL#!mwa@X|U14LB6WKdj(vKJ;
zpdxtHpr)t((2|pblkT(CNHu&ym`bB^{~O>a){3RDEeguXVLS10cx<f28$)E>-KtR?
znS>vm+W$;QIs`!j;Ej65Bz@=3{-|WsuauOVyO3KP49ZgQ=KUqEY9gLs$?e7)A4>sb
zmVg+AahzeH)Mc$1V<#LO!AFONhuJ|%;z%{CFw8m{<p+g@owfG8#={dXMR2~;FaL0R
z%6+&7t+ovgV8HG2UP?@m><vtci_;!&j0GzY#Mpq^JW-AnXyU=jZlw>(BRc?U0+k28
zhLd8xbbK=fV-~2JG-_sMOwRO)PZ_Xb(A}qR$HgWP{EjD1$f>KJBPA81GW})2m0I*s
zp1G|t4|gxBC1C-z4SIhjSa(o@R;w3Ig<gg26>1?9lm53vye%1@cZD_pL%17IAQ~gH
zfs&~2$`Uau!oub74r&!ULF3{ChYZg?q}FDUHw$2q-9ecFNuj-9Y0(Rgj^0`rxy!Cd
z*tDRbr|#1MO$_G*-CRJSSb5_K4cg`8<#i1WZxgeyvFT`jxD;3w#H66EPGCRbnnMLY
zuzM%iOcN7c-5;-T)>9lrvzij*gMNc_g0=+iwcy72@y@JYs0(3~iD2#MH0*G{INu?6
zKf7-WXbb}PApJ6*JOIT+`N|fi;=-)-4Gd8I2kPo1&mYAp&Nb^J*kx;dQ--VKGc)H#
zMwW3lvYkJR`cwLe$r3`lp7gRsE0yo2Sz1cUgKwb-NF1To{m2OH!w66}H#hK&mA{IU
z8eVR~CjtM*w9Eo3Vd4ptF3bTMUdBt`Ca$jD`-_l72Bp1p34Uu7)<G0u8V?vRK`R_F
zr^CyLmWz{^eF#|tR2&HSF65XePj<p!2PU#XVB;a=I=rjlX~J6yyoe$&D2->n|8q-?
zANv30qxugW{QvVf5kC5Vf|>s(f8%e@?S$q;Pq_iNjdbNJqZVA)$D7Y&Ve2mvz5p}~
zARJ-Vfgz{|g`-e9C$u(2`aQ{Rw6sZKau8Vx6a~T@?bM&|d1+;v326!`W`3#pacQid
zpY5ant5*N`?JXApEd{P%&_mFVb#==}tY)@CA@1@YyrPnQiGe}9ZbqZnsjaql8V7#+
zd$nxoZ(w$(g<<c>gR(G7!nK{K2bFILbuPk+TE1AL;E<o&F%J6caFeuxo`ojS*4|!H
zMRva>dBV8c>0^IIp^t;+Ks$jvF*aU@Ad6;T6Wu9~(Q#NdjB`7~XPGHxon}<yhZH*{
zZ!76Fw%uGOi3~i|)1YQs;rRE@Jfsy+{1w_+7;PfRq?uYV;o<A+89T-OvpZA=&j(h4
ztc|}EnVpwc|KrD>@pyj^p$Ff$2|D~~HCFU?|12-t-;J9e3<d@UDy6F~kE%V0?{Ssf
zBlqw&yf*-`pjHXxyT5AhZ|Rw#j^gF@^>xsM=+jOJfz*Ue!?yVno^Qopsk?OQ+)kh6
zluoz)=mUZ_<1&B-a8?uO3+P=KQ`4&sLQ;hsv%YL9KXGqGmGK-2CA6xaH%mlou3&l*
zl`7n<s-t5Sy2Ey}@wyV}mTB3b1q@eE`A?9M6+S52i`>Ef$o(0TRCqWU)TH%e0XxDQ
zd(>mh?>rN9`->4zhYFulF|I3TB|#nH#Ac+WMesXcC;QDCpPW1nRu{E-@?{jkM2)OM
zSZY(#bca-EMI--4eUJbydjJ@8c6EW)&r&`|MkZc);M(dRxGHw;+6Ap;?ANar<Y7>z
zjAmxjomp5Cz(}A=a0DK&@Q6;BrYk^04*LWr3(MMU(Ht=~`cwd!H=u}d#l&bSE1z*z
zn0%NK`_ShZtp`DNg2DX9k7O{mfX)c=3jxpFEJvl+P(?w2_SV;%!E?uMi9hg?%N}Tz
zd(b%!48$aYYeePviZ;5b$r5rBraG+1vA;0GJFBZl`V_~<?Ir8Z;5i%Q79i@|M+fUW
zZW*6)TnOD|4=NB^7?9fF6){bhWqn<K7xY)qK<7xjRs;#MXzre^`ARB}S6sVp{qOGu
zAUJ%mIb4wh9w&BzZR^jkBX{rKMP4;9Acca<sg$uJSu;np=uL4dHnu4f!03$aflQlc
zezS%?DHd>N;r=iua=qI_=+-R^NbIKutCa`te6JKo!r|lr0R{Ji33Z~&>TN}uw3YEb
zG_B>VbTeEJt8cD*Hsns4XT<Ij&JZ}&<1bqIK0L|Bwm#PfC4@Gx3TtpNR6xJ>4f1(f
zm%2hek6*a>EiF0QQyi*;s*xk?#U3hZYSvtlXi9eP*%Jo)Z&(;|Jq+cAO$Fwn(84t|
zqChPMaNJ)Qu0nyVtwch{Afg??ig8RxDn>w35YFI3R05G<5g{R?BO@Y7c=-L)kO3Gs
zF;-aYvS!6YK}l)$@ZtMhBIF7yTU$K=x8Gm)dAtHMwr)969gK1w+d@cKK<U6edaNqg
zE$~VZYs2=m^{U_M8b06-j3)F0)fHr9jG(&|c?&>ER~VE>LZb>O!=(B7&C%l&6p~}n
zg6`2r7si_|>c_ipt<idwbrsoXO3*MeG0kES0|SKPqyasR5Dz-ZU&j~jJ(<ra#`1KM
zIWDf#@A{=M35-!2Q2Hw=D?0%6Gle?igTo{g6%;s7BM~1VK|yrs#sy@r7_9*es0m^p
zTJd-9JV+RglK)O8s$on9tPu>3o(x`nL}VH{>qT!=f>HMXNs$8x-~~h!XW{-+!2{zj
z6Hk@6Z@b|Gw6wM>NVTpNiQ1lc&3k~|bXRJGaC}7wZ(Fk2_0+M{{^dd*%8>(Cl$=#V
zZyMD+T>rQC#%6@Q&k`W#aZPcoO%+Hmu}KWRc-$KvLV2o#lHB`J`zx%(!hABj3<+Bv
z9zDXIuI%*VdBqUaPjrIOy!Q2-oqqzQ1@0NlPMxNt+(Ko>kjfewjMQ)R1xF=pxjq`V
zVTPy}%;dTy#u#vTWqQw|$?<pv@X0a-aoi|5$m12_p-ML!Q$A?lDE;&GYEJXyBZYw9
zv;n!678mzK#iI5NOD&0<wKYR_)khe$^TE<w>q0Yls*GNL3W*2VgD{qnd<q78eEkJ0
z6$AlE;@G;|%brkLA18Xq9d<o-szT9q1_OKRVCDBygOtP|*6i#ofse6jejEa-!jDHG
z{X(RysvFW`;$MjtOe5iI5jM~yD4e@$b@;||I7fGdjRFQ#Z4}|R0$d>P^YA%!y)Yh!
z4>IBpmv@`hlkC(L7UJ>O-}YFD+veQkS6a^KXq!*g=Sna-8<ba@NcGNqK_abbRG#X*
zv8UYRIhjJ9mh7h4FevNE0;j{RNaTxsM_#f@W~xs!80UWb$W>z`pSAQ#<&y<<AS-$V
zEGg=S=vc{P3kH1U28te1u&iy4bcVgSt$PRZbAl}W;m7-_H&*AA*4aPeZewBw09goP
zqj_ZpjEoZpHXz>|B{tmm2VfJd?A+X(JAzi|Hm1t(dVIY^9n4FmXt^-t40k;e9tr^s
zEv-o|H%HDXFm;ucIdfvU<^!565fG!JelD(|(qUR9xS9D4+7&9Q0h|UJ3@m#cJ$~v`
z!l>sN2IIH%L2iUyU|IMMnip49)x?*_yP$8@Anm|6h67mt@X6633?;*`Jos(Ta+>Pq
zf|{CI&CGMSM^V&#D~9gHi%!_pO-^gmpoB2lfGR$XgRD@z|0+X_#+iZxob2papVqkj
z90_M6-xYQxN2fV;O#OC{_e#`raNP&*SBr5jciX<_QZKtYToX~VR5|tA^jZu_O)N)b
zEmd0vRixs5W*TF6v0-X!3}6>1JC%F&BS|D2fuOGV;Q1)jN$SowcSkdK>g=WCRiI>U
zdugi|+0|84h*$=lvYqWE_;zLnN(W#mR!CEXu%i%OhZ9qFMDU##u)6U5`#)b%-vXLe
zl$Sqw>=+9qRvH8N=}<!;l(j$^l$8~Ic}_)6E`DOPwMul(7*oA833ykZE(uA=Fe6HT
zF)v~|5To%=Y0qt^p{Bu11<YY=cDs(OF}#_Omky_k(Va{rnAF~V#*`Zm&pJ@;s8xXt
z|Mc8Ha34Pr-u`HP#Gp2cx1+O@>&g`g-^#6s65lXBD~`8|)uD_p!opNqB4p%znuJp$
z{3Z)h?TbnL#cT~#Jv;1Ql?<|_uSdwaJ{li><LYYA4JO1}IBt6SVLExvWVTVRudVY)
z^S|ZPBlVB294At@9W4>ar9s3|ojm!@j4L52sl(6@+5tM0Z5%VCxcwv~idk#0#{flQ
zkQ!=|VQcce!^P)y(St#~z+?p`whUVm>l$NkCCE;okAP|X4H)aNFpQ*x@z^p@TuocX
zlIiQ{+`8y$r<=NLhNODl14-oKvjjjGq^fqqTYl}2%u?v`PEQ5!{=vAcp;J5uJg&sl
ztYI(K)U;Zd7m!u4PXrHJ80!d!pIWPe#)R%On=aU36FI4)+?h2v$lI(H=A1Mr{3VUt
z3i&^^YBeCbQVR+=e|?NL+IQ&8Z;UoN<@=^XdV~KN9%cHm8-8~4Q-)u7_{fu0vZf!e
zz{u=z6d}$rR$`{kWRD@n@ZwXOFc%QWx?9#_FU~yB)?UE2L3YcEjgL!CelEaK{c9dJ
zVF16c1nAT+#tE$gr5AN?b)v=VXfx)(l$1IUtJw8ygde;A&_U`hmXz=aIkpHaR73>%
zMoE&WzdydLf#uj2toELrH(~YynEX<|2v>~8XNP<7hf^|kRLnF#5GB*Q4+7XExs&YU
zWiZqB_N!>!*yxeLfs|0Q6q8cZ-@kt&_=1=kiMMTu$imvXrK95rzW2i4|H%IRO;tA&
zwwT(@Hd7h3mfhZ+asy9BlYq%r@M(xxzw6YJJrJCBo|rIJHS)VIc<O&)mWoj0p~snS
zi!Fm+6Pld*JHr$=>x^6*Q_KV<xf4vB-ds`3lbE<$3yTn^LH#+xWMSkkWavWEFFb-Z
zDJoe6UMw*_K7M&=sWbnILT%f)P3t9N5>h?S0k)?d!=7rgxPi+aKMtoF9MOd-4BT6h
z+a^!cGM2xY_vYbKWf);TYBfJ3vOW)UKCQ<U<qwalWVE!<ijE8q2Ze-)?)!=vBlMj5
zk0N*?<N_oo0$m4OS2Zv>h-rwK@DTFGO3JLMp`mZBdyCKhh0Y9-6r&>FD=JWTd>Y1J
zr)xO`D?Y$4BEg4z62gkn{YUR6$z%#O3OMNWWj00RPpZ{<zWei51@IWt5Kvw*P8h8C
zQT;H!as;6x9mWbBumq7E?=NuSz^x{7hEnww@PFL?l|`@~uit92&GtQ|lu%D2|NcW0
z1z|Fd(%&AA*)R#3VDT{kH{(`1+wfP~0rDrGZdH7Q!p+fe)$g<#p62lX3i7CP{$%`J
zN%zj$v`KA!{dexSiHw$(5(?wwW12a5S{Nvjzzz|(Yl!vDUV<f1S0EgZ`f`q(OLih<
zbj_A7VpNJhl~F;+uL)if_@*BiknsrMH6ff{uoo~lG>cD)Pdp+bEh$+C8M(Upf_P<T
zOTHY2rmD7CSy*Cu2@@)@{6_c)LWhzwjb?$EdYZ8XNSNZ>Ibv!!g~9Sdia&tay7_q{
z_>@CKl@JIRxOgA;9<cmEKyqGQh#MgvQV+w(HqD1PhR%(Sz92t;6=Wo;KOzQNE1J^q
z2ot&p^+BUi&{a)nd^$Tnq2jV%*qTU+(Pc#<-yOJy!QJ?_A7hJ{!2m6GGZcp>OZWnY
zz3)fUB{EZ3VwiM({_ORKXEs!YIMEoj;`>a<CU6d6evruei^3Q?Q~kg|X3RI4&hFM>
zBaoOrjzGwpm`+5_fU^jc))u6u>4H>~^BC1aFN|tC-j+tXSyuDyn>Ji+sWsaeakwUF
zkKPT93A}zDN8!<_sI(X+dqiT-;;aC1kNffUtOfGECW&V-Ou8;q(Sn!8;j_DZ`_l2z
zakJzzfCz@|@6WofsM!YIr`#=f?_oj`SzBFVY{BI8dLos-)t(R&A;~MdZYk}XAQxy!
zEiLdQIhru0Yq!xf^u}~ND5D}w5g64UjPca?I9<SPb#?Xc{#4tL2Q{L01<ww7zGR)r
zQ1?^(blQMhk}+hj1ORySwFiXcefv^4n}HPOQh6hd4KsXN0_w}?>&Yi~JB#V*>q9G|
z00gF^BmTI9=#d;xNun82&qs8^OA{^Fybhb$DLdHJ1qB5Oe9!zRE;n{4{#Bn3Jvq97
zPZuH>KV{g6h`17dnUv%ol`^8?<#mRCXzA-?sPeB~y$ZM}RuU#Q39co{#zoRYZf>W$
zyE`B${=^p*VOkiNbGpBnylv-ypI@J@RZ5^4Jzk+=*F(sTFEIaKWRKw?oqvOJHhce1
z6W;&ywf#3+_lVQmAM<<QiXgay;w`cm-1#3_WIElGKL@uJ1d;MO0m4iC6y)V2dF}D7
z49SSX|41SBkcbGzU~#pN#v<2FVpx&r#zBZi9!J4T{r8dG@GW2T(AD1(T$$y+;*-6(
z>kmI~(HAQLhx5uRuLI+f&(j$jQ_3>mVP|c4(q$4tZ_FH?K%-w`sBbixnJsaxmG5oJ
zn<v`QntVZF$@`BxsFn*q2xTk!u(+Y~u-m>%!)}M)<VL~g&-yW8j-zhTj{2X%!YB^B
z`p0{*dt$^Ks0N}WzQW*{4Z(r+mIV`26N7_U@LPSRBZzfxSt27NA&pjMU&;9IukCM6
z5qz(%GBc5)`{s3-7sohZbkR_kCpa`IxGLz7oVK3Ag+O{=AFc=O5$1}81@tr1;ukJd
zdxM@(RZ<!WX0*MUerIj1`_G@$jn(bvy|pp}PBk<a%Z}*~Sh*{4+tWe*{<mW-W;-&c
zE2&H}HEpe|v^`X)Ty<-*UxbDlwqG&1kezQZY!x71o%_Ycc%pf-DL%bB_rcoh)8vHR
z`g{0HNf+q}9R&puUb|%5gHw}+9Zbs}`xXCIzB;-xBqBx?Q~G7*Td7PkUi_Q$PSW=m
zS$Q85%FDO!BsDj)_Z8)snH@TInI?6u@<qwtY*FR&9117MR42!h7FHA`V>DA_Err?L
zT%H9hc+0EeQKu%KKM!HfBsnBMpY~o=VP-VZ#)58bI52$uK_rg?ud%$Ng@qCRr>s0t
zALU-2<K}v}Ea;j<)ptLRgQSWd&C;=smcJN|A5X3HXQqw&`m{!uRWDOBVec);yDc7G
zq3i3ZPo9WlM5M(eh3TmuVU-NeM_F0CCDr`EW1V=NR*dl^4NZG_x$<I*T%z*GFxON@
zws{N<Yc}8Yb{ftOdd8ah=7jEmi#6OY^UU+f1^ZJqcmsq6YqN!gH!vQh(K0$><Zal`
z7on2#z9T)y*Y9Hnm8iH+cZ2`t1Z|}+DMeu5%z#5Y+HX}iMTr;7ZD}usm)6EOWa$?-
zS4r6Pl}|MFnD;y!Fq0M*^XH*ES#MC!)qaG7LxIi3!SUhyy3A4@Jw5J~aq4L9oNxC9
z&zKOVS8wc^IC)GmOuH^g=5OWe<3QzwgJqY$hr|e$vU0ugdzp9Pf|wYMfTq)su&Jo%
z)ng)}sw1PuIXNGNZRRMIH0!gj%nWRgKWY5>H2gVnSsRn`dDl69`m&?P_UwMX_ecn_
z(wlSVe$@D0j<fr}s(bTrD%Zbnxc1(SG?<5!wzibaL&mJqiZahr#zf|MC}V9yhG;}c
zLNbStD1=Ipc?c1bIg*(cp3hbHexKj{-1qa>``*9fcsuq!b~~}wx~}s&&+qp$eJ9D`
zj9qS1?~!WcHm+ss+RetK%fk3(#*>#Nn2|qvT!zEaG6nBw1MBIu%{%FfZMjxfCRlT#
zL#%#y%!l(UypsF0lA&gmYw}@XYPIHTzo{UN#d)g`t5LPkqWKic*vpOcuR=S@yh3-e
zHSKOrkTTe_=aIW@b=S2h23|uw7J9Amp;WA#z2XlV8b7Ri7$?eHKid72SNQztYDZ4(
zLxmC&-FbPW=sOA-4_<b)$PrJS$PJZHvWWF9?Gqb4zk~#b+`476G@-ru*u|GL>Ml>Z
zKc0QPKG9Xs_Ac}=-*Cv=Pxm)d-<V!*U0aR2d4ThP+-a4BOl|Ix)gPh<<e1AoGcahE
zJ0@B#I{f%poZ#@ujrCZ!g3&h?E+(eB^4yxM<Kwk=OCIL`eBEg!qlQ?a*OGrGdCgiD
z#V}<xtHtnT=X0JdIu|n9uA8I#_ztV#ejyDZTb-fFkKKF33KJyrdFo!w>$E4Gj9dND
zZu_B|#W3~3Whv+6h1JE>jT`HiBcx^8ZqYWp=TsIUwwTLG6%4(7CiMFnraq<_7d$e!
zxV3kGtWsN2z-UYA`lWQM@1HZxYi#^g)3V3Mt)_ZvNAAODdvzxViPZeme*C#-$<Dph
zH4mCcFGzcSv#GbfMV2MMA_@4dxaCa6pI%n`{WmhCjWx>EPlUGb;?MD~&#3(Q(bNKv
zB2h~}F>a%vlpQPHTswCwOZTJY`L;(7rM(_whj2f4PPy3OI-k`gFQGsG{CfXb+}pSE
z^QiHo;xbtz+eQ;)N(|9mJ9KM7iV+>MlfC2aGWD~Vn2-?q?e@w$PMwPS(0E&h(zHNX
zHdxCsaCa}XQcpE(V12QAp;Vn%UOUn>&1($0I-8~kXxAEIOzRlk(^R-Q4Due>^gP?n
z!75|uGX0?XD!WdRWA65ChkKtY`_84OI7HI2SPy-!nwvbbwwgj->f0Zjbj<tf@4t2O
z87Vw>KY~)OK7{6$iC@O-f(`?N^Ol`ffg4_wX{V<8e^F8;@y3z*hUY&VIVr2vnszo(
zN;ivXe6~?hLvxa}lHUD6mx0aDKv&+x*Fv6rL|11QtCj*;P>{iOL?^EGC$SP-ZF`4!
z^E`Lp)nR0O^Mt4F$>x2hF5IP^yJ^if@;4~;4IAz=mk_(san1hR-v|zR|4)MDxFl%6
z4VQl&EE~ptI@bRkUugO1ivRWEO)f1NKnc)9q0Ib<+_2i(@r<<l;|O|zH5>X*C%BNg
zcE{>uCE#fb2&e`_zSg6lB<{VyQ!M~Ftp7^nJu%09)dJMjbKm;dtC36F->8}<!b-Hb
zgsSkug<>ccfpF~=ciInq5i%Ho(1IpjrVIHBMGk5KWI?UN$BZ^@xe7kOsAZUs7g=@R
znOj%~*1!JnLD!MEc=xIED_i)>mp%i}<f#KNATB9669k_$T19FqDsQ2i5MQ22ZOP2!
z291M0kCcC_;*W=f{EzoYf`X#r0glMQxmxhXCYOd706^noUA-y~0~D%0wBcY=)?X>C
z8I0WlC=@IT$Jp)jOO__??xHl-Mcojd0XI|;%Uz+&Ho7OCBp7e_!;oTzeum6p-CH^j
zI0!7kl6E9JsezIU4LwIUOw?*mAQo8J_!k$KFf|<;n>0%GmoHy}sH9T|;Op>sx=mA6
zkeUu)akl;DBY$$FYDggR>gCJhXpYwM^Nh>9AnBg~4PRyO_W}7x9^)5!d@+itEe{?%
z00$92io82J0cK-u?RIFdn^NR=K@|q*(POeZ0);oAv(ouOklEecaZc{oUi#k+QpZZT
zKAI8&0|+6(9Bf^1t<OapKDCS0<55vi(BO_jH-`(&QBjL;mxzSIqugVX2rHl>t&FBX
zkq|iuKpMtq7<-`1#_uP#sHv+vqce`SSY`k<=N&nCM_~xuLSQ-&?ldAk6{1ezDpO9j
zn(xaIDJg>}S??%VK&XZqICK<xOSYO{#uxp+yzW@x-HQUb4%j8L+rjI;jITjwpj^sf
zZf>vX{*CL+EnD|c2M<02wGKF(?q*q;uYp0FY!b7W0~-x69CRk5It;saA19+lAfl0_
zErEiSyH7;RCLQA85xJ*A$k!^`)cf$V;bCEcoG>uYAvs_>J0xJ!qnR<M=OEqu9+dlH
zX1fXVzI}W=%Mi&`EOgsG`aLIc8$#^1-=t?`jB7P0QwU^*IG&p)rQK%8<r27p)grKB
z%eO%0mY;_}_2AJ9>Vd<5RCB44=W_j5!}&|xCm2nto_vL#IEVqO4kDcJ?<f$b16vPQ
zi~XQbC`bwvh1o6GY|aul*bx*{RSm8rR2BwHNXdFbN`BaGQ}E=;QWX?+-|0}suY#Tl
zO$XBtmKsVp?-|{}KxvTAifArO3M`f3eySD#jl?GIWV$*;z^6URgIoxLNz@a-C90}#
z!gBMgg54GJ%@9a4;EUjB8-{&+a4>-CF|MHM-R4D=pr9Z`ed2@9T)Ga+y}$$>M8XY1
zGSb&CIrlmYs%O{{q{PM1^r5Kt(?Ljq(^x8eE)-&wg^Z&8{XRdxW81b%Gdr+#F#at8
zi4m3<FkmRXz0Do{k<d241qYS!^ZUmIkT(N(oKgsOGB4R_<U0%#vPoLp3{zRy4qhhS
zQ-N4uws;a(P|B<-Fk+9`CwN;995}h;VhC9f2}Z*2$k#+V#llqY5A0@muLU>!og{bV
zQ8A^%H=_>a6+-+-LoM_)g4C|iDk6cWSN^GE&$I8{wz<CZ?Yf&KPyb~jQMom+yuHka
znTDp4<VkGV{(h44pS-^z^6YdjLXfV2;rX1#NxO{(yB(ED%*SWW=BH1G<mTp9QU-&V
zjFCb|)<TQ`l$`MADcuzqP_@o8$Z2S7G<kCV4CIRtdqUe4xTp?SMseyU7}B^588kDr
zs={!4C}dEnK~>OzrfYE*8AO;7t7RljlMG#25%j}lRd~F1-z+Mc7jBe3Ne0eR#RH&=
zqs2<3O4ZBgT>etg2jjss!Zr#HZonhzlpFhv4^|>%goa3mw>-eJv3b*`@2ak()wx#C
zbb5KFS9YIom1;}IWA>)9(hO=DpHL?gSRu}W0U^J7Vu!%M8x3%dqnDo)T$Laiw><F#
z2xjTH)_(M@%RsA(CmTju0lX>zZb51y$P9*!-8U;LDy9`08II^cvhWINp+yGeUjUvW
zVuaqt8&^C?E2UD(7q0{9`jQ^RaT*%3WXOhbm3#&OY4d?8hD6ZZL{>y+8%+cvGy!^W
zN5Rf6#mN~I!W;|`HM6n^&@!~Gf#D}vBjl3QrZY5r8BcYZ3XmbokX$>p4bK%CWBx;j
z`Zf8YEpW`?u-f964>B_-@tMoe_Mh87oyGKXf22C7s;Cf#tLN?$!vh0mh-isY0J9Bf
zZn@ZNyWiUK2-puW&-g{nBJ>v&M5hmi9OB@R^@J+Tieo!9wcT{xRh(<?t38p4?m&XU
zpCe5TCUS&ndVac8ldPb{-HwlucxjjgT{{%}`FdXm1_Tk+08hKQtuN(!P1ULWl^}y7
z>_1S5-4AI*`FP~uyM?qLS>a=25^#Z+?Y#+fl$p5`lp*AUK9>l6<(cwBR|dvcIb&-^
zkkN&c@(1YVk@v9yWJ2t*Rtl^hsIXqNg}%<*Gcg^+PrTzwoNm>~XzT8V#^GHjVbhx~
z{?o5#&mmr3cr2a*l!D3--W^E(GQGui<LmvoQ~4$dPl}3&Eeq!&mMn5yWtRGXcOw#c
zC<)RFS(?!P!u>>+M+Nk<FKVk1zVM%`pI?>9&m;Ta@`clB{oBq$K82*;Y5}alr*6H_
zioYFl2{x1Y@wMP!a6TBl@=X2;3a!*8fiQz?Y|jw1gDdQ6Y;?r68TG$hAt&h$xg?Sb
z5Fdq&tjMvCkUc}Zt&^d(ql4g60cYd67g_BAwS>4vUq#!;73b>aI?g&`KNWExVr7OQ
z@KUUilb44Es))stj`F*xGyN3_V^k^-=-|77oJ^rwB3|&gBtg+Y6c_wci-rw!1VGD)
z6DOd4#GbjM!^+W-Kc+5K!@9LK13c6C+P$L%!z)Ls1}E6(j=rRO&~5`S9F75bGK@dO
z4!-iogHtqnc$5_s5RV^z{rU(Am=#h(T%eH{ZeymU1&sW<hGt?gi)F(D&aCWgEi?YK
z)BofGWVJ(JN~w9YUcP-pz2f<=Vo6BXC_C#7-Uw==f@wiek<!vVA3lg3I%EadA1ZM2
zox6A6l6F1xrXs;?BO=m<jO~vfy#a{%6hSO|fjQXhE;jTA2&%fe^bg)f9Kv+gUw{2|
zjh%EK&Fem%+wTx>q+Kx#BL^x8$g_CG#h(GcN1ZA9EIFTZhfwFCGJTg4AKWCITRtUY
z!6JG&`(<QM26RwYPkRbi{Fsu$!xn6I>-Oy+3ncjLkEug2G%ia_LPCyiK&4-Yd7gh@
zf`h;sfc6MhQSM*QI1i5<l>NhP2L+m!cX*63nfM5z6ohT0#1KDQCr9VUH~;mIU0u*L
zdjsu`utM&HRJ8!SxRGIDkR(A0fT-u3jEv@w*P$)@viSO$^Ptkz%;zQuhx1za3T=;b
zuo<vNP{hh@*2%iOHh!-2QK4$}Bp+76Fce$M&Qo8$(6g|dA!Cm`csrkG0$DL@4WhlN
zj63S&?&Y$oCymWs|0F=DsJCw2pA2RNfJxbwG}f>Fts~KL)PK6F1kdl{xLhI8a0A|7
zI(6J;qG-#}IqQD~)pQ6s8O5OsTUxsfR9E)cTK%vsu+aE^f6YXxfgvl}>@K1sA_uj&
zwIMwMSDV{z0|CTx{3^<E+=BYr+BlNG3=P1~nIi~a3JgJd2alar?l3q*K7+#3TRT5}
z`qUZrCR(IIostc|qcfYXk<qbpueQP(0s1g<kku|E)F#*Hxf~f0213l2)YWNdd{^f`
zP-=)E=4L4PVK%_k<lx{48ASq#Xm8_uymhvD#A_0WIHZ!6XX1K7_PbZY<rUf9>zaGH
zgb^zv;{xFof%AYcUFdrta5m9r<_s)tpq@EtLm~Vxob<Ws?d1iJjkQP|wqH1>#6Dd-
z>6rrf9ryD&EH&tX0213uwypdKYCOEWdM;UouFOV#Ha;s?DbQwkp!JUWm%+i=Dk}c1
z?5KYB($k+GYY;8lCVbT*rBOFp$LcG^-0tpJ!Ya?CKivqU;?)}x@(!!&e@qt_qE|pe
zbeKL2qEVrzP0(s*=j4RGMYamu7|?Mw9fNh2@Xl&3y<HEpp3XyHJxD5=Xlb|6-8A3R
zB>c_{n6_Gp;E9CGTZ}6KSBWDT=kzur4QR(>t8-_L9b`puyc=ch`_JsZ6Uh}0rf*o!
zB^!jd9QOBL$B~kBANkY0Znb1me5}gY8~!MTpe2C2&~gR^A&4W*+fO7xC3e)uwG?90
z@01#Nl{skrKEv{NI|Ox=nf1rzo!7&|=@gK*apdM{IF|w=BH=|$bjLyibGG@UXqm~i
zcI(prSlgAv+Kv+nBaHqxPea@lc)OAC<^FTg1{-uEvhvoJ(<%=nSGv{et;fq0>xl%u
z4=q@`yk+TQnx<SuS26rAsAL>E^N0nAMm7KfeF4+s5Z(HV%HZ(?J*=n49mPmb-<C^G
zQZqzc3;I&oGfqwdG-G}#%IWevjCfSnQ8Er2Y8B+?Z=<4$7q!)a+;#nUJ3^%5o;(bd
zYfl`4-r&m@H{kWXtkg$eQObpKo;_PynV%^2Y=tP@L7gOaT5Jsm@OG)H+FF}|svzvl
zP-|krBMYRz@u_l`vZY5x6XAO8y$-@QByiu;!bv<hRc^REqOA2W7X;oyF+EL(rM?%&
z!7(-EZ%pRyaa~!%A{AXf6!^7fcNIRmmJC%A<i=}~>@=|TMpYzQG&hL)KZs+Fj*v1D
zO_entVGocer(8ehdRO9~i*;2->NR2y6W|L*)rFgiz04cBUBnk9h7b&DqkW!--#av~
z-}>gicD25HmjREk-kW#t&fK-sfBN`w!}}(9co72%aX2e2Z3~V=xD6liSSPDfc$k=&
z${Gghl*Ne465%g-LTocy@$i+B6K_1oT3X<aen6g$f^d@94iPY$qZ4nEQ`t~lsHh*E
zv#wrzmDlFEgW|H0>*ADA5}BX7H7V{B|C@1<0^NFRzk)^WRjiaI)?;B`T$T}Cx^!W?
zYJ%ht7WUMX!&pO+)jyxTR5n~iC_*NT*Pyua&o<M0^YSz=Ng@f7uEW=+n4F2iWM%XK
z9A<=yEd+AqQ)EgMck2?T32Od$Np!AY*+0!SK@&|!OH04~HI!tCvV{-9{A-lf@UPEW
zCTt4xqKSjbuDh+eRo3By;%nw`3kggBK4}R*k)b7X#SdJEI0F44rC;VUi?<aMO;wDS
zdE=J22^B)p^u)8!m53l4uL|jMWBYq=BIt;_TIh+c5pwPKwYA-_m)tq5$+M%gg-=wF
zXOAbFXnvKYGzZVIVv%!OkClsWTyq#}!+Wb(`b<?;MJ$E8a8_;HxDohXiU5vj9%<<p
zYq^GyYC)6)bAAgi5#EDxgY}vc$IY!Z>kuGd(=H_yqKd9gJP2POaf@<v>PVY1ia#R*
z*T(KlnOcNsSmNunTQ8u7ic$~-bHDklnV$)bI%uiDzV(pN7!$wd)z!wnzI7C_vY}H_
z2YALWwC>H4PiY>F8Z~}vJ?CJf5OdV`8X64MDmU2e$sB?guc~<NVx?-I^Rsr#l{pwO
zdW3FE-12+tZ{hsqqy7DPFwj62^4;Wn!6DP|(zaK5c0J3PV+=<JY0Pefx`wBoOs8=M
zVY)q*?Ir05dJhz7E?CS4fTeLpB1;3-hMW(^-VupE2ClM0o#Tg^lnlleI|WCHp~G}^
z2efGr?gZ}n0}ZHxk`fVL8$f_aG&g0F(latb!@^qXNO0P(e_LOJ?s}Df{X32cIFOMp
zGq3x?^V|J=&iT7mZBWn<+L-A^kM#C&h+LrJDu=CZ*e!qA7sE70rluN5?3oB+`INRB
z6(F_*6d^cWAQBxd3$LX39qrBc`r>j4Toc5!sO?UYQH*wYe@$tAo^jZy`<0*vDoQ{`
zwng2zCidNhV~{zBI-}81n_s9yMoYKp%N+~jgXY#Iv7G_K!f9oAll*0KEihI9X}g4-
zTk-d&>59rCna(3wmKk|0*S9J*@-pU&G+>KC;0>(LtR#m4$A<puaezNK=O$XycCE`>
zBE4m`$F&g^@&q4Zs*->hEiElUHd*%l%^m<YY&CH8d?%UUnF{=Ncbfn3CBQv^*yJNv
zp{K5Q?t$(ph!fq0rk>uRm^#Rn0|HL2udOaK5cw4`b)c(ps~+lNPjZKT&&kON`wB=+
z?5Cb6g#J9*%b?7kQDd4iX9>340Xr2o?V-AQ>ySztWcgLD(>p><0}IF!CvGKSTfxqY
z8fNB$G@fgQy?g5$iD3*eF(~Sc0C6sxI6)1LcW05DxT9q<ar0nfef?fYa|;SwA<~8E
zSH|VbX~Y-C)P3u#FsV3Nwj*}RNBH?1U@DiAdyZd$1NjZVXIV=L4<`^(UK^?P`f@Z4
zN^v6Zpuv6p+5(Rfe&e+#s&0ros<!`S6P31S1t1a3!icGuoA0`i82h-DoNLfV86H1k
zo)mX!NyL}lnavaPHaJ$WROh(GTu0&xwz;ylhs<gp;1=;+Yu;m7dVy48Xj~EgUV@56
zig^BGUB7Hk8HG;(T@@vqVZ)kba!Lwx1znzfzQuWYH!4N-mPXz-G(i42h)o*!!ouC7
z>S}5bhNI&HcGffiAj6z!y)gy?(hN1V8_c~Mo9JOLMKA%3d;KH`f@##z<TZhO_IHGU
z2~mmX^cS$@aJX$bu1REFV?Gu|><?g|*o9H>uLf2;LBFVaUym{x*M<`QhDs&r6w<(<
zGf*T$hZh+UVgDGN{x}2LRKnq!AO(#cgus4i{zvU$Kie5?@%<|ShF^aDPiqPrNp(Ac
zT3>$S>fs^x6E<)9>-0~e`WILG-{9u|Z@<tkoAW<L;=U)2df3ZW-D+#(AF7EjP99+l
z9~;+B>&Rg->yT&fQc18WI~O!r8L&V;@7VZuh$G{U^_8)<melseZ?-}I@VKey(OMwv
zn659s%bb<T-JO3j=d7Nt{Bw^CE~UKBq~O3jCVt74CCVlTrnMkhKv$P5!eCOu1BQFJ
zr$ONVf5a|!2n2hGL+kG>r*uzGMeAOI5!am;a~fUczBU8q`YiHVl-Eq{M4O^5tmLer
zv7^SBJL>5LRqge)R0G}`XG1r)lEg#}y?psy4C>!=D`YY+y}MOgA8$+jM!?(Sl%XM~
z$r%q1qbwax`ADlJ{nXT+_N*fE>p%a5jy;pl<Z*&v%DJzdE|G&s%Gu3;P(oXtw%@n3
zaj1Xq$Ps0$u`cTQ=&0M>#V}id=~oB1W!z5pniAw`f1(}sAM9>$BBwWJX_7@O!bCx$
z%akT-YE&gi>5BP0d(}BJJEFUJOF?t94*ARI+gCM;s`t|C-==dWzdfDRV`%U3G&*Fe
zcd)ijB06>T2fNX3$%|@qG-l7bH&H$OR>oz)%#nO~Lvw#6?ZEci0l#0mluvGZoPhH#
zz99koLKIe&y$T=8e`0qfB?P0761<}+&P$XDqH!ua*bX^-P??+mAZox%)4VV_&SY{Y
z<aIEU&Y{8&xwhVmYvvwKd3QsEgn%KsrN8Q4QD1ZGzYHFF!no`e=(Uj1hP^ovJ5qkU
ze9m{|h{3Zwp+o6yb&5liIg(Dt6B2XRCtt|;?z1mM1i{<g&H?rKx&IBti)7Aa!0>oK
z|1iD&-;k>KZ{c}gk_=%q1)Ryqqh~tq(s1W+$F^<l@nTtJFZ3dUOWn*Oc)KzgPLgxW
zZOU9y+xmaIdGnTj0k>mc$ERmWlWn0E`olTJnLGEkeC^9Me%{g0&%J3=Pbgi{w+j9p
zTdf)#zkE-MzT;%chpHJ@ep(fXk_2?h=)E*!!zwBcN#E-&RxPtsc2~NVQFH6O5a``x
z#hA5`q~zD(S@7Jh9!q$VnUzxFdL+?XMTxvuGK4}Qe|(yOvr*DbfGt2SCGmStS(a#;
zJwR!i8XB4e8KbNp2Q_5cusp7l)|^}OvaeNDD^8fW+T{Iu3&SHLo+!+bm$R9Vq7-}1
z$VfRfRFsa(AlBGr-sa=AYu$J5$Tu=fcBiT+Wsh}CHgDopRXzAuU~hpu9m{h1eVPN=
z8k(Xfud<f4a>axr5kxuOW~!%|wt1kMRXB0u;tVZOR^?<QrKiuVTxz+>-hH2BQdgm!
z^*EA|H}g)Nen9cMk{GcN*WO|N(<h(VdN>Ay2bFpkG`LIB?rZGabFl0A2jgO&I>!0W
zueFOEZF_s*@!;(9F_$NgjTI?IYppHp8TtDD?NBnq5j*#9t-MACWghmJI?+Ix{mP}%
z2Af+~DBaH06_&DrrHR~b+_A>{IZ<_|1_nNRFBbOsrhT8@y*eE**i}#@d_iYsW9LU<
zeSMs-{$EZymT4E6U+r#)Oil(0*twFlPbORc$;0u1lMNlwV;@vsxTNMJ?8S+(`i`sJ
z^P7u(w*cKiJzq+`{ZB#4W&cNLlOUx9%o=U~>$KX?I(FyEk(1P#f6E9(3>r2O&cBy*
z2XyhD4OZKwH^Z0uZ$Ux-69N6N5bUo5_JQE5QG$QnpvVw&=o`Z^Q+?P=Ierq@d3s00
zbX6Chg7W71__Dqn{t6Yy`ve4<elp3m$SgywwPG|+iPON}sb|}*L=b$Vjy(|Y7I2M3
zuknlviM~&tJb}!u`eZOQWQTc}2;lBcI2VXEC0jYGT?LgDSO|1qs^weOdvd7Y0;p=c
z4FItbqDA`cOgwr`bM?@HUeC?(Utbds!&_Z@$)c{Ka}*K1ezB+qk<cNIh<w=W2uiOS
zG=OR4Zw<6?9FN$d2=76*5u(HQ5M<mQ6WHgYkQ|<nFgZ0<j%t3hEh0FsH3b4zaK3)R
z!QpXUDDZNw7w)cBB5^=v=f>N^uakKg*B2|+bJElMM<9xa(NdX*5ted;R1HyIS3>St
zkpvRY1@CR$4gi(<A$q`)AQ!}Z3XrYg0FDLXaI%Q$%gex=qAfz-LVJ%-<5EIF>?!J>
zf<ulN)3Jplh&gsJk>KLgo);S6ngekGG9nayRdY}zJ33%S0zZKqf6&=5b|gCOTp4jN
z+Rqq{ux5Z}kmrNY&B-ysO#r97T!LI}_*;m{A^5kzF0$`LDIMPA@i*mNm;icECWa%K
zzy=yq|M>P|Rs}}{Z||)eeqG(&GjvFu%E-)YIRb{#9IYU0c0Fcv2n)Mn4jd$ru&1d$
z`>@uNGcnejQiD=?d5p+sM;%RZLtO{T3j}4n?MYciv`AMEplIyhwK>-WlIriSMuvuk
z2KK9)h&*@Po0(QLcHxnc3yX`M7~B*78o_P^wu8W;yw6}3-(N?k>BOdMXh><0`i684
zM6)4jm!7^5&VR%klvkmXHSml=4_EGI=H;~l-vxkUD1Ie9r(Pg`q<3l0wdKC`HP6*f
zAh6bU6E6^MiFnW8pdciDL0}rIbkw2e8J0II^+&frM%+DF8Ib#)KunE|ryvKktY`Jx
z*t+`8*$`nz=-Uy$b|^{#h~o3-7=E&ZzSyz1l#>UeTQAt#E0fXSzY;aZ<6bW_V3~Nu
zjTjbEsw=~q?SRk_#I+qhd?rH+J2E=^a7rmm%0o;@39Nvw#wpYm7sJy}%xB4|d^$?k
zctCOK%S(h5grI?huLof7@{!|cP|<@>G*6T=%xqHz_ymFCsbu*NA3;{LGBGVeoJ*)D
zIMMGMC0V9wTtf4a#Qwjj`o7K%iAap&8}BI*rXkWfQd5CRf-I#$$U-+7s#F>SZW$Tl
zkOhQ?!zGIIY41``VddHvaX#dXg|O}2i}0~zEpEsImM-)H{7Zfw1qa=l?14xQtS(6l
z?gU(7T0enZEJ6<}$3YDe1bj#18!|^T0Oo^tJ~WcVBk5-D!ly(Pgw(&!z{(BZ#%vWU
zprxf%(mh0vWXu^(1oQj6BQTP%u2(6en~NL%JD#04tVsh&Z-Clz;kP}CrSZ(C)6{=E
zFUXoKwIrP^bZW@`C_Nh*5@Pl7Deuld@c{I?DV(2PNEE2|4{a>`SNh$A(qvOqiUkhN
z4qMBT^`E5axw$V~fsVf&O-Becg$y)dDHKdm4ZW~`r6r0!ikqqFe$v3u(CfYcge85%
zRJ>C(2DQi}f#8`k2bLcF&})-r;WSbZH8B<Kzw-7ErgYFA6CH9m6b;8?uDI1!SD(DA
z!yUClNBzIj?^L!B+v>5Z0e3Vq+Dlq}v&S(6y|>;A*xJg!5O|GE(Qq4rRH{^Ai(9D_
zaePm{6CV%BNu8>cgv7R?s)!fZ@AT=-4uGycaq(}3iv~US*5(!#ral()V+8J(cVL|e
zwhLe$5QdUZ2bbh?ojP&hMun!61A)7v6(0k@LUvnSagQ7vH%ZYrL=W*tj5ZK^C}dQ~
z{4b`f@E~HTAe2WPH1E21Qk_z1)-TU>=FLmVZ`<}L#EV(F#%WgUQkL)BN|8Fcr#X?j
z8i{llvB}_!Aq<x$7a>ss(4)+8Qz=1GySNW1Y-BYNUhnVsXb(>U;vq=*@h&K_%1W^9
zLG6OT<?RGlKYM8#jeXBE!N2}`h3)oms4NPgpmuwEd#MRE?kFG|%8jyd$1FJ@m7wDj
z%FyCYGQ4<<pySu??6p(z&ukyZZAN%IT=#fb9Xs<*T#W62n%~{ld%FJ$cA>0xabnAd
zZgOot*B^R;kVNA`tD8>6r=Pv8bnd}M5pvoSxrBRZtVLKA`=&GM03g6dLz(km|6!8!
z0%H(`gj()ZkXrW(n-808e+g*+CvRUiCyO*?0R)oy89dAN#J-Guj^mvEQH;QD5y!^Q
z63l{71Wi_36@R=TFmECLPK53snV-Sa^45WDH&u^e{t#i_9$B*ngHI5d7(RmKDg~JU
z2fRznNA2_wv4Y(L>;ItAU1X~jIt>uXHZ%l{9}~k=(GkXQ1SHJo&z}Qp;&I9XrmBYi
zDoFNEEn_XMhiZqAOT(}|XqvTgX2vB*R^8ZGg<REs6YJX_oHmhRg)IyG7jl@O6?>ib
zn->GDrfvKfcff!6FwJ8IT$Ui&q-Lx4p|K&-$BqRp79`@xg=H42vk0S(pSg1o0mJJ*
zhvpzdh>4zl`pmYvCopURtqNGCnPFeH3EI-GJm{_ctO%?*vVWGY=CgiP{e*03!XdAb
z0nSrXLn9=_jJa3J7luA668yOgY!bL}{sOC<FL5wd%+wwMt_so0x%^I4HE?xdKtpLA
z1!6D^T|!feU(7=1PXpVWG6}^-vU}}o=wnbYANUP{Lz#>~(FQhT;@dY&UZ3pmZ^8kN
z_{Qm6-_PS^yKaXd^jNQA8vc{V{>mZ#n=AqZXZJ|LMUUHo<#>wYCPGxDzP&KFo2dG@
zT_;<QhLzO@Ebq<JxG11x2yutGS$v4v(t%blM?axQPzBBZaP2L1AD&B7NR7krFNi}1
zAz#4MLB{Z7($d7-%i<LH>4CrzW2>X1gTK|F%rm~T|HYvz)}Od?lS(iGP7?7lIDRNn
zR87RL$XkoWgvYg#P&snA$x~sfName8^x&vLBp!&t53m}zp;AOfF*nxxe33YfNaIBH
z$Q#RS)byMCWViO>*^Bu9rdtE!KNXMvwcz{(+-&$ad|`irS2E&0aVy^myayjL(FiX7
zsv+M6=3(Gf-fZ*hMkr2*BMR35c^n9w`ZIZ*GC~62_Z6r<09!OuOLw1QC@iC&zb{lG
z;>izKcAdYr@JlH$Q-4qT(hO<#-fW|EVs+o22@qC>7Zr)tJrRnv0}Sdj038@hFb@6j
zJUwU$0aBup0wc}aJAT%&40&^Ac7%T$5o>OW9l0ib;AMw1*Bg)hfQgmx9Xe~R)gH+e
zmy$xn%@7nBKvma~IPl4Lu@{9C#DhgZG$H-+QHltQj4bz>=Z;K$Bz|e;VOG`z3Y_~d
z#V?%;c)E7wTJxt6OUzR<!jB;Y1&xW0)>13)z6LRR%WQ#|9)~rtX;urspA&iQ+7~L2
zK%tO>DC_ZXO@FgGuwesB_ZjjDEv_`smxPs3#F}=cnL^ir(~Q05`WX;Cv9Vp4`oV$e
zL~w~z!Mh8~JNDa9E38tS1;4FSyna$#98)(0pxpWTZAMWm!R~rTWadpE9JnXhL!?1s
z!;Xi*O<+mK?6+Q%t+2dd@DqxQDrYtm6dUa}?znnQp}Z$7EK&_}p62Hdkgy5EQtX34
zJv?>EF$URi%OGc9WohZb5rJ-H5jyXU{ru4?#LjG?zZOPM)85twYS0&o4uqznO#4Cw
z@4Tc{(|$k6e`E~0d@%^dEdj>LkMsT*A$_$&Mkru?+#O41OZ<Mb7?D;1mch}n53}sx
zDmAAW85+XqgD1E?K<rRE>p%C%k(iXmIhn4Wf|LvV!eBNa0f*lU?fr`#@VODlb-1S*
z1g-&Jb!z7OKco^sm&rHa{{k^Um?E}d&?jy<3$^y>dx%5v2V5{cB&L37gx~_37g+>4
zg|2T{TtrbehH3Y7&2jfF{6@ek;5h}$j~@U`G9aQQTpAO5dV3Sh?xL-dKXnRz_L9<4
zR9r~RWd0bXoKb5k?7ro4{!;z5q{>Wc4^uec)~&X#i$~@=pKFj2O5?2;vQqxTd>HG>
z!K-jWRP&-!<`~!6S<gaDm5TLFD%r`_%Z54B0cOmgX4j;%)efB(VySxqq1RIAPXB`q
zA=qc?hFtts0B{2}UPBDUa!Mrsy`%O9a&nt%AmV029wj!eLGj0>rCyln1QQ`(YqlCp
zOPgtAK}-`2mR|`25>7J&JJmP?-an8Gfa`k^IFE=BQ2#_i*zMbNG&Cp3iGC}GNsH)G
zsytA>l>##J^TOVX4S)0Chb(_A2Z(FHEe$^Vr7HNY+pV-EgNeaEj3#*nlrc*%CX;;@
zS4q_XYg&NDjdJkXCPZ)3aFoKun(r_o<%%<!fCsw~1B~nr70>8OzhUvm+1b}ZplPN`
z$^;jONr7A0mC3f}qW76kelFgJ&=b^Hh>XJhp;O1%B5`xpySBAe7!O`b^TV_>44$h1
z5p!@Q%~_kp_L0DbYp)&ssCVdCl>Q#ntLuLciPEgp5A-+ZgeoYpzh$0ej96Hyx9fS=
z@!q4oulb-#{P5QxOKB&!#t}R&DCIDoUA7*F$r$SXEz_?iy9(r!)S&o;pSRCS64NeK
z$xybi)zl}F*1?3}{o|VuAH-8}91Mc8GQd`>G;|+TVU+5$BRbhl$G*S_{>~p{nK8zK
zuDaFq^^rtGw9@|)6>aa=f0mgU7J}mc;hr>!F)dh0@!$%0;sGk<Vl_Vz7g>wHjWEr-
z-tc>J5c3K`_wP|k13ZK_?Xb@me+D{B(ay$$D)w)ZMUU0JZx|`&bIXuRxv4<RDHY>#
z@l%D<ZW|RG;<_9+>FMd2zb4A*S|rEL4;JU=(|j&Iw3$v@wDZcrmczn}>H+rF(I;%Z
zcw$}mn-|6lcTb2FICGs9{;2IQAMe^NLQ1fiyP~=7Q-1y(Ed<u!O=j5FXA{@A&TpXT
zkKJiz;-uaydB@NHHzLKi@z^5Ux)P>qSYjK271NLp!?{oa<4MA&tO{FOTSLYd2$S}l
z9PH2pcxQi=nkBh72elLwP!pdh<H)C}Oh=Onv;pc#h+S*?JPa{pRf1^%OM;Ql5UHbI
zz`;#U`a**W5k{HC+}|R5qhynwA!QB(L(r}Mep8~7vvRvJFQxfY{J?zAA}>+7&5p-_
zu7GFK=TBtZATjhKbUyWzw<k}Y3>w3eXDbqic1xs_G^}f(BJ4is>FGH#=x9j2Im@Q@
zrGP7Y?9N|n>OJX(VD}!j$%uX4k5r#B?vQm=L7q|V6-^Ti;gCxqrm-zuN147PM_<@<
zA#KTQ^7Chm3qxu6%GnT~c-c)MM~9u{hax7Su^94$<7A{<l}^A8J~Q-N*`~Q^&nEX6
zXCziXbwVYI{5DXuCuL<(8Qr*b>zs-dDp;Tx#Zb*acG&mgk}Gf&n<4{8ma_fI@~_1N
zBqX|icp~S;&BcYAkI%vFhED<{Z*Pc2^T_rnbIw?>UfVKmM3qS06EKj&@{gbM_5BWt
z(cX}YIlK0rCF`|{F~L!t_B&V1hGlG=OhlZU;?iFw|IU)qJ7?wSR(w~c%Rppny@Y*S
zM(CEv`*<@jv2!5}Gz8%~7y&)qPhZ&M7G}|PB4G1gBotxZ`yjtEO*4X6UY&Es6XE40
zx$dnB`}$IyqL*&`l8f-M`8G|jD4+-CRM?Y|>2-)c3}-nMc~HB`T|9eT5Eu#atnMN$
zVEya)0`hCIY0$xC87DKe2sLU1l}38O!-uarv*i{GLamg=9*!kAT7D_L{yWKM=|%{W
z=;QLa!{fT<hD8QP?Va-US$*iXV1wY1#LZN`zF_%{QSoE@v)19koyM@?x*{12dmd64
zpk}4;T#b%b`Tijp`dU;1e1?J^Zf-=`0n!m1>xX=Ed5&AZBnXu0fIJ<bWeTaR$W>iF
z@vO9T<;Rai30Jv8H07jpL~%ACF}`u(|Ir+L>_0m%!Wv;5Dp5fd7pZXYHl(rxC?C)f
z8oyXV5p?ixoZ{qH6?UHiBH^(r&6-Wf_`yAZbPZ5Kcy10Z5TEzGO>~2p@C<hJGj|)_
zzsL8?f1?vk<(`f2;;Fa(Jlej83n4J|3_h*+)TaL|;d-fs_tr6=BFnK+9Z-qCE_%@j
zfwtI4fDckoQ3Wy?61xA~nT;1)l%&l;;PY}o?wa%XG2?b9D-_5O35qVw-$R-Z1c^vC
z$kgICzkY<(r|`zQY!i|WlXbFYXJ=9HC<fm*<>leQ`vUqhO!9-M4s1PYG?CRqr8-%N
zp7a8T4&4|;QQWklI00-v$0`J<M=%S@ie+LYV1xpS?OAs0(}!=rL)T@+aeD1tz&F_U
z@ZjK`QEsn!nfRIMFF<fVApRI_($S+HNRWt_xKLIj8*$3kD>^p8#D4<A?yDA~l;j(}
zWni!kkzh^v*ucidrsQ9c>#QAX^=NE~H>{GZJ?v?^>U<9CKkr}9^#&`kg?br9)u)zE
z6&>YGkRQ_0`beVhtL-c7k|ROWR?>A(s&=KICZfe`->hjLk-}`ph3|NF1(1o^dkbh9
zEsg)?wp9-$lvsc^pzjxhS_UevnIUKj7iVTTIFO-*G+;If93}ny4nQPfzm@PA0GkZ}
z56cq0e#82c(eZIfqyY5p&_;Z8O$`WTbi}+c8lyf#UPmsw$Lb1NovS<c41fLF10ey<
zTHsR}95>$%&ETc>P-%!^4(|_$UuG&a{V)on%5Y7T8)I4AKsTa1Tbg_8b_3~ds7?_v
zQ{@>ozcqn{o_-Fv%AJ@PvCc;1s+TG+fxV}!u0ll$ti_No@u+=VsMVf(?WQ9W9{tcL
zV07M)ONkzjhm+GNX5Ngw4Wb*uaF~P2abIA%z=So|VWnQ`PkQSj$=m_;B3ypL<^o1h
z`8(TseXGRc$FI}5F5Hy(c}Q_EyY57jv02`G)$-`nd0Wfp)KgY;Y0AQjvIT77oBfTQ
z*cO2s)7;#>4s#Q1I?GIg8>E-r!YWhMXAyz(_WTpj5lFS3lXHFduNr|4m(1U+22%FY
zZ$E{MCoEW&;1iB76VKr^fmg^>AM^!HX>}m<fosE?Fn=UG1e%M$`x`ebxdIG2A}PsQ
zLSMN1bed8LHc?bx%ekL0nFjX+x42Zld<3mvL>`3es4Efm?T>~D&&{c;8(K0dE~9we
zw0ZLaKqGWpsF5LwgCL8cG?fMNUuo#E$s+KJV8Q~U2E%bG_R010z=7kAd3zi`{t`RF
zkc))m9|l{cr3i<Hso<~wHrf4OWdQ$Q8t&Tqnroxl@84GlJ}lv*7w`%1;IiB!%}bXI
zVwK(raO&uA3dKH2523RxTeeJ%k8f#s{1->^y%3fA*%(1=T%z%zCGJjQZp8K6Qvdbq
zZ|kY&bBgVRgxCa$gy@$X=gJyoWH^GVN=z!Au={5titydLP#Q~&g5j+bGB!?zD>)P%
z*PC^xG!D1^MrgjX<gY)qX$>AyG_d>S;WmYnP3al}3MM;~I(W0QQjDIrfuH)$ep0p*
z{$*dEwcm=V)@74$e_r<emB1?ern@7WmTsL3#<^CvZw;j-g3xTI53>ue%+#@(U1`%&
zwzA4dOsxHQR@B!kRpB*F^U`+)d`=DPP^CxNSqC@_%3nwdsJ+g8VxwJzPh6RVp{_RL
zSDnYTCezi2Dl1d*kC|Djl;;{v<I21!wPuw7=N_>R9z(tM(xO{t3U4B^PM=QSM=HMu
z!8ad5Jj=YISgA#MmFe~wk56Q6-_E^P`k7L0YAN+k_WA)3(aI~v7c0l#$9CUi%Tc>~
zSC5X)yk1o`_FUBM!R+U?<-YK%&UEU<_ZX&S^VBHD*uYIUBHmrz>p-~(zZ}%m!gaJX
zlYP169?J1CX`IQIX6-ENpBNW6@Ez?a^<zGK*oH(}NK0hnH+EA}dFnqHQJW%fyR0uL
z*rA&%N!vV<_~CTw`^7$~_jk>d$&MBF1-{RZ(d<1o{y<GUQDRV!gr}x{dSEC&|7gY9
z_?@Vs&XlVchu?1xST)W5<$oo*Tc`pOWxum4Dm-%?84unS!+h3njZ)ihdQ`GI47hsi
z(#0_l$t)~IWO^3ssQ9e<h7Q_hMEzZosCiQ8zn(%RyJeRR2M4w8bJHtxWs47~Pm<|(
z?`M_P<1jRHaoW$%A05(NM8|7zzO_X7$JFzd49%Q+Yga=<3q9t#zM}KY1~2q7e}vqP
z{l`YnDz4V^IAL@m*S64rBYE;;JAe5hn(!U`+5Z!U?~rGen~%`r{@Lqw;u554srB1g
z6Y2>9LM3y63Cx6b+J$_QeCCWOWu7}=pLBo7Aqjm<7yrCI|5bnd%PV>&S4d`5f8Tt1
ziDJF(SO50rEzF)sQ)%apf*381=D;=M?_puweZ{H;-o>kvA63L0B_sCPr#@c1b~`-W
zqVL1tNrd&iH*C@S`MMV$@r{5DPq?90cB!DdF1+0;U6HAy^A_@?$#dgb9Y=H(cJS?H
zIUFmRHM3wp8L_8ZB>`TVPhMH$O@G#}t&SJjPEtSCP<xpmuKr`~N6Y2Q!xXuF>^5h%
zT^PP~kd@f0jz8)PoBGDTeb<G>NzGh+O<w6hhZ{-<$D2;LjkT;xBOctjJ>R^jB281r
z-Ce}fVaOF7efr5QHxm=BJ|3O#eQtPlXRvvb)tvDC=blBwB4;@M<oL|aO!6(&SyX=L
zlfH3dG6G-*ADQX11YM2ks2FbhDM;CnUP%%Xwg`j4mGfYS(mg8+uXpWP_QFConi~6#
z=@#0?NDAgZI$JEyR49Ec_Qr0H#(m1?zodA{UCUEYZl~UBGpCYh$hUp_IWhap5?6Ue
zXcleX`)uy1QzYY2dip3hIk|RX<P5u?mG_zt@48M-siZ++x(45c9iP^OdkOFK<>1zg
zeDfSTJF6w9ZT=&Qc^2WNnp_Mtyn1S)4u+d(cChnFTx=Ss-j&r|tQ!<~$Km568Lu{V
zG5OGIg)Yu!D+>(kYw8>n$KBP)=vdge(JqEB6+&nP#ah1F`i{S%?UHv^SlF}Qw}{AY
z`1C2WrG@13C@qn(KGAV@Wg-fSp0U=P#)PbPs`=#+&Wwx&c3-VY>?}L^a<Wo#%by%b
zjyjUHWd}DWgw|n@TGU(r1T3ouL=}h?$%t$<M;vQ}bE@NI%IN=v$ERqU5`X)bsp-E;
z*8b<dz~T(V0iY(D2y-rECcHF}N+9CkFp352B<krJngepE-D~c7A<BpzQ%o?tn~m-3
z$cPv)DO5!hd=Ip^0VMaPDl)+s0H%HcvdpS%6qy9-iAZ8tE$r0P)K+U7?@7!83ipJm
z^5AWl$%*8b&YSqyO|-2UsBL15y{u6}0IUKEL)bmR8({LPiPu;vyh3zGT-ZJoJDNnu
zx#E2Ro<lVI!$*(Gr>m%{enSJ_C_RhRI6@Z>t^rg5<eRUZ*+>{#w+a#+R2*`t=36u1
zTp_9iI6DZ`1Z^Q=Wf*8^K=9@B<MTgwovQhZ=WaxzB`BzUNUlTX5k!jR^BrgL-9VS(
zLK#pf62b(yh&#KxX>X#dL9-?#EDT%T@+QQJCbiqZFu4EbY3ASo*A%oFp^1A~Se8Ml
z0$_l?cp_C3ZpM28W>tmOtq|bKV-~g*MBM~N?><hyz=_LJnC-?bEL?zD7AR+-g8YQW
zNkO3&*9L?MS^*0D#=6?tv2RU*BSY`NLA$CB3yeB0-K%qgG>FH#1QrTq64WG#6JNfN
z$xt!$lV*nCY#~34QNj496aajZk_Lw|va${&BkK99B3{=@e~b{wS~lK?G#B>>I)02b
zU=F^7A&SeCgJ=`bmA~n*V3vbCoE>+}`xnzU!wzRVKF3s91yT+;KHuiuxK7pr5$#Te
zTYr*_d&;1I9)e6p7FcHtapRw~WPqbVH!=x{C#W<u8$L<buQvi?3&ptAFR1n{9S8;n
zP>G?P9nboAxUmtr?$DkYm3JH|qcl)rk3EJH6c9)1V!ceh9uIA3p#krD{-Z|+B_v`)
ze0+U>-B^oMP4X)Nr302@2%1dN$Uue9<WHrVqXRP?%w<}hu|PBQ&Yp$D_Du0KKK6X#
zN&kT$rb2^BEa)NwdsOdAO7Fo+p;DgbJBP)xfwDZNg-eW>f(x-q=o)yW+ld*&_@Fe+
z=nL9#!&<dJw6_yFXpo8u%F08DXSg`Pap~%&c?ym}D2}k+f~QXz6@Z;Pe0rfzN<gwY
zWjrev5HAZeGnjq;NEnIg>L&0cG3~1+SQ4wlV{L)k=sF%79ia^c!b1Q#5pvbeJum_-
zIgSvqS3rBk)EzMi18oVO1(>4|Ul-^SA$O9%PGsL<#vTke#(v8dz3sVB$~fPvj8Q2=
zOeKjjeG+UNo_mz+gy;i*^PD_h^?0~q8o*9_TU%lr1VX!rrxgz(LN38t?E`87g*kGP
zdja2@Pav=UN6E;2$T1M=CrAUC0iKj=iJZ6J!MBak?~Ewp-O&+4uak22_jR^XV@Yj&
zeI!69ot=SaS{cYW<`w+h9HuWUuP;p9ICWECXMdjO{p_i841<4DU$g6e!d^N0$B8;d
zvC!8CEi10v?Qx)S3$Umx+(S)A{rBCk&+VEmS^3yP*uFYDIkEN3J{(w`jgFlOVEMGX
z5Z(nLGDhRs6ped4pY)KzK=Y&V2&!B4L%0^{BSVcd{iz7K!MTK`A3uJKbvA;JKNNQG
z_L;QSca{a!1Jj6~!g@<9cAuD+y!|fF>|*&dL%ux`Z#<s!(r>RB%<ubFQC3zz;;Krs
zVM*SVJEl%Kt+mUpV`ARpxe;v0Q3~~z1v**2PdU%rQb=_XXWJZ5x$KqJDq(b8E=4Cx
zn=fW|nSzXXwi=8sO@sT{DE9+9JNubif1KF;M<u-4f(RDgT0On6@Klcn>^*)k3<R@u
z7>T`B&Yx!T9BRRMpybGYZ5eZuOjsNDz*^lVv1!A8sG+~mZ@7H#w+%OtdGQu<>Hqzw
z8(g+;IF59x|M=5?{?dQ^>HqPq_|t#+)|dWYq$u;cyLO2%ldwWJoH?aJek^PH_x}Pn
C1BKcE

diff --git a/user_guide_src/source/images/tutorial3.png b/user_guide_src/source/images/tutorial3.png
index 5934ea24b8c2d78354dd4d98eb05aec2b2bc2eea..e5b73c46e1e81b3fa37193f17084ebbd071990c4 100644
GIT binary patch
literal 46038
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
bIlN1s<#ByJry|(z5d4ytRguY&GW7dD)zse&

literal 31744
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
AssI20

diff --git a/user_guide_src/source/images/tutorial4.png b/user_guide_src/source/images/tutorial4.png
index 0fa7a6640548b0d78adfd22954de0695ffa9b358..4e0dce45c52b934116d86d18d92a0908c33438e0 100644
GIT binary patch
literal 20325
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
AeE<Le

literal 11914
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
b7Ahd?&-`)lhIIV(Ov_3tN)(E{{`Y?YvsH4C

diff --git a/user_guide_src/source/images/welcome.png b/user_guide_src/source/images/welcome.png
index 1e445220163feb6dcf8299681c15f819fc75f171..9b1d2f86b6fe3aece44bb3e1ada7dc3f8b8a415f 100644
GIT binary patch
literal 129286
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
Hd;Wg`WG6uL

literal 62203
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
F{|7);$Oixb


From 6c676c4b1b66ed766c1541f4efb4ef63b1aa26ea Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Nov 2021 16:32:42 +0900
Subject: [PATCH 0637/2325] docs: update screenshot and its explanation

---
 user_guide_src/source/images/tutorial9.png    | Bin 33906 -> 45046 bytes
 .../source/tutorial/create_news_items.rst     |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/images/tutorial9.png b/user_guide_src/source/images/tutorial9.png
index 21edbe96813415aaa3890863199ca63032c81c9c..39986162c65b3f93ca203347ea30cf7b5685020c 100644
GIT binary patch
literal 45046
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%0Dm}@S
z9}PSE@eWAcLTH`+3*~x^;-HhAr`PDL8UO=7k2>xqFk9_==UimaE&?H|EHwa<QkSFA
z(PAybZ+Nq9@Mm09-rm2gQq+QYDZZe}trTf6H+i0AW#S>DW*;nqJ*IL+O~oW6l52C!
z!rQkY=zeI({LX5U1_ER{d2Il$63^vB7Ru4iDr(@&0cN9I(AclO!2v|3F_8zBNDAS_
zKh|Z4CeCE>EZV=?VIxme+Ryq(zuwm>fM8qy-Fc@+<hR=TIuZ#RhW{~{RhbTmqmxMX
zJnY+OE@6<p{lR4sg~a4}F~YY8JZm0{Jpgl5ZM?P)T4{TLM3n(Cu`N;vdkg(O0Xe~J
z@Ksl@kERJHbNsenZQ%#XQ3!B2!FT15>zQeJ3aQj29CY#vk)4U%$1=Vyh&1d~WgqOn
z15&Hbb7tX*Vx1&#1u$^;jbTOPp9R%aiFVe&As{dn70c*-yceq5c1<u1YPS82Lo1hn
z8Cm&;WoOBueS`va@XJy}Jrq&&&Ol74xP%0<eG7q$@O_FGDIT6=FbaMaI_Vn~&^SQa
z0v&|D6v=DW2ynSC+7BLDwM$?_TCkv;U#I5ato6Du-yhEmQl+6=|ED83=yTF4li(Qi
zE9hvmpVHrS%T>Wb<c)I5nh^Lvbiz;ZCQ9rNv!D%*;-}oo4CIH_kAEd}D{X*c<!8ir
z=8Y<6mG%@>G~$>VO~&74e+_coNZiK>0Uor_(9lBaZNR?ae)shFIPcbf3Pk~LJ}Cte
z^5}XqhHoo%M@B+ur<V=3%lfl0Ep~qPaYpl#n>YL?x&nU}KKrK>0~@#F<pneCZ2`_=
z5kNXfy9;sa6|@1Uiq5-0cvLlTQU%7n;eChhO|E<Miv7I98Q+1C3ZT#&4UDcy0tX5c
zkn}DqDmcz>JkraMylSet;roaA2u2NglfMaLVFki|zrn@h&l`-;4K(hPOmw5LUGwgq
z>F<V%v7x>O5(is-Yeubw&6@GX3`yVU0NH}jk(a#4jI~pvUs3axIW9NMx-<RuYMjr7
zEF|$aU>~2XR02v|`q{L&hjUrbU-PS4+RDRa25V+mt;JTGFHS&0sn&ZqEaZGG>Rri3
z_;^U;eKy4yF*@B9`Byb66}(pa=hkX@vPI;q08W!W6`&KR=KYKb6xE|LBt`Xmx_A4;
zyJbtxmsL?wg>3UfI4;3CJU}eRs5`_JXrb?m8!;$F6u=#5g7c0e7U;*bQ*^Q-|F!)4
z#M!mLqbE86qp;`dHr67|E5sxio6q()qk5jB3jBH$_SRPwNmea(^mXV{KO=+huPr`)
z=>O&*y@@|-{T&Ggpx>l3ubPax`7<=lmt)(GJ%gOwBFugo;@n-$8ALK=<Y>KF0D7kg
zpWFV2{h4CIlkRRPc<kH8jvM$@_7vDP=+S@zOql0#G-58S`M0l5p*lQax&qg_Lvg#v
zvEhTq`#?)7b?T3Q;1_AYzyr^~;ag<Q=&$B%V#8dqa=P+AaK30?H14EL-I6SMta^n4
zeRGiJ^S^0uHws=IF2pp}V6zqWZy1twwz2_(%thb`uATvr8eo-$*4eKNK4cs|L5Mu(
zW-?e%5S|gwY{_&|GV?2|Z@{6daH|WbV@Wc&^h%}&heWU7nb8*YN3Os>$M(VsP=rK(
zE?$9tjj<FwKP8-55EeECG<87-4Gf(U)^Sj;q$Cyx#6u_DU8@#k!u%>uI|ym$;bQC^
z_ti1b+R)g=4f+X=xmZ}{B{EuWVYMmy796KQiq;FjvM6-#K^IIVo=x8~1+8xkLN*8v
z;R37euj~xb^-$yvgU@%pdXa~yFxRh<CDX+UOV0(6N~nprO<K_6Nzh(L!I()V8~x;s
zp~oYZi<&p9h&PrdLrYG09~2x4{{kG7o+;>EqB)4gNP5l<w}!OP-({ET>>6$R1-9n-
zuq#r7>vZ^xU{Fo3s0I=3elT~so!UUOJ^)MU-8+~mwxH=RX47&U!3vZW@f}0)%DB9}
z#GpW{_(zm4(b@T@aL*$$(6m1vq8^LinADM$$7J}L2T-qLa=GrR<aM)tEF*I<Gtne1
zZ>af~2}P)@T+m5kLeTEC(U$^e8en))0$St{T9wGtrMga)DKc{{$gl@~!6NIqa1d=?
zNUI7k3`9T7H{8L)h8sru@~`6!bMG*E{YBdbny11Eyh2viFsIar$K>~+BSAk_k9}B3
z`&*QLi1i+l7;2lEbIup}0(woDu2sufCsd$c{{Qo`meA{pnBe4LiGMV@Db)XB2uLER
zzM1q*$~lDPFPp9w84LoS{TF2&OE_N9La`tJj<ALkoMQ&YRIpCzU_`7k-4uAg@Tik`
z;m#-g4(44&nupRY(B^3;g5eWY_*T0-ADZ&cKkapSMYMxJkPVswo4J@N!JxFln=%`0
zd#*^y^~L)f@od!6oN2&mGnb?85r*hfz`0=g1BqJb0+_S&YOJOvf4q{|1<KE`B7z#+
zI1z+i@#CFL6j|&$|IbmyWoo(MnY$UX;=6Rm^#D`%cz|zT)sx$^-F&7UjDU3eGiY@O
z=uS0`YvSB&XLXoE;SH7?=^aUd2t>m)R2<_l%;<|*z&v~giF7-my<u^OEVICZpiuS2
zm0mf`^gCo9v4047f&z;Wt_%s{1wxmixoFI;yRQz=tI{}45V%8lEXS$D1PD>k<{DMA
zrCmWxKdKl(Y67eak=GHx^qwg07K>l<_77Htu=^nqfaHC@zd0GJkpz&y%%87iCPAw{
z@-ah@NxO>XUB}nt;V-nR$G0Wo5{bA;ym;*lid(48a3g#OU7`^_wK;Neawq2m$MwGf
zvJfkFp3DF}$xzF+B1yDEKToP*fCnec<shbdSyR>gF^2;qWD7nfKM%L7CtkB}_p|#S
zOlI^nPP@*vUpvEzQ-<=K@voLm&3SPCwt?@N<8zL3`szV>iO`)_N0TuZ>Q{di1+2rM
zAC&fWf`N}ztNlHM6evXO9tX3LtDhh2@)y9>!^jf0odbTE!37xDSSG>@sRF*EtBEqu
zl^jCs-wrKj2=!yb@_D2sUW1Mik5pTs%~4KVdJYViU<XnjBU3ePZqKFVCZqs4@4;)q
zE=KcAww`8V7H>{wTZN?1M-|Hp&qa;TYjiHb5q@K+`3b%EO3|6ZcA5(3sC<d}47!5p
z%2Ao6E3}gWVjV7!xKh88GoWEWVt&s0)aW>HLXf??%OOoZl_5X)f7UtLNvi+Pmv+#9
z4EMsA%TDQHyhcJ@sKx*t;?`-xF2-$IDu7aW_0NTXWG(y_hUO1C8N8|%lCDBLTj~aF
zeRQz;uw4O-5g8SDg*V7TD0%g`zNangueV&~I1M9z_c`URbJ$Mwj|uSSr}De>Ar-?-
zg>4f^==7VE%t)8i5UgQMy{9=Y9b@FlN}~FYr}wtJ+~i#wT#Hds01dEzcd#NT!vwN+
zF@mk(NC_?2pKiMt@`>%{L?x&3+7OtHB+XDsi^6FDe{dt(8kPx>@A|uRbxRp%(F#+Y
zfJV58^or?!$P%7AJz=<ah)89e3``|AV2_uGl?gij|C!ZNrxntGv7BB;JAebL3S?2X
z<-5D(-u4jTq~DJ1;E}Xi{|^>VaB=Bzne*uija(qM|M(xW&sN+=BovH#a77PXcA>IY
z458~}0!alo1Rkjpu5&E}opgTXQ;R1j*t|tl1cUu%=m0FX9P(l&a3gU-ivzTh)y4J*
zr(If3Ju-|);rK3T=`^ieYz3T)tf67XSxl!$Eb-Y$LQari*<GLLEn*Z$!y*Ky<P1}h
zGF_zceM$i^Bw6_r6d(x4K{SGiqosOv;K{hnJOc(~BDVo0VB^?<NVSOnBh|*{UK?po
zNNbrgyoL)$qYVv4czGlA9hkG!K>j2#ne;=)?J#B(_C>@cpw{F7YZT`R(Qbg4$8?>Y
zZa(+ZZx~S$ToX9oS@C|NLbySwG7gSFAglfNBw054cNSt;lFDu%5;#-#sZ}5yR@NWX
zLxrH;@MR%0MhhByq(`v}C=01|%ORiaC(?yzVPLP{Klr_pciEb?q9y@)47di<VcPjV
zeeCp>7$!3Y7O))PHuwO(i^QJ0bdbf(F{n*G!Z1jv*2Tf#v?!n{a{>2G_H)mE-TXJl
zZ@mb@51aV$OCo->toU$Q5EWJD8%+R}Atks4j;20Ns)<qQfFHAi-{SxZwiviY{$E~d
ze8biwa${Be`}m!AU^wBhauknDLl}rJE$)BHsXPO=&)wTz!NtXlVZ<m9*A$SYLIUY!
zyhUOrWY^L7xV!mq;>(+gdK{#?9`#a&8maq9wn5+L^edkFrHfB8N5>;Jt`A*S<?#nL
z@StB#EgZ$k{cOyPc^m@Z514A_9|{@m%Ba*-DfKo}zgsY9Y#-uzUs11MqG$5(UlflI
zhB6(!Qi@?yekJ#dCsFk&s6wUb^Eno+{GRgOIl(s1O}98mf8x46JX+=Yc5bG#;nH4Q
zL|2hzi`Hf@VP&>-#=h|olRKs~R1#mqq#U0yd1yEUDcne#<4s<ihf~m$lM?v50H>vp
z><(ZEI+NAN01h#zT`i&-MiTK!oDp_vBImxbK=g_L(i3L_Nmva}KPuK;)tETMu*~sD
z|4$Ooi7w-X=<=4mGIo2%rAVKuS(HEI^t~&~!YzKzX%{*EW2S8XBN_CBr5DnDN6q+C
zR9^Det0qF6%YDTKKR^BI!XJ3GsNt{)Gx%v+TM6HN0|k&YewUGjWvGe^roWi71a@SP
z6c?Xel{PGgZ4#cIuIlS77Q@5OSSzx#h{zv33yI%|+fPKD1w{(B_&gxgCRV1WdHKVY
zk}d{4#s(k#Kf32Gi?G%Hd0eSJ>T~T91y9Qxwm+52QkCIt>T{b6#>}?-twt0-i%M!l
zsa9I;Y&OA9???MLton}e=HdG-RXV>$rg*>A^jU$uv`witL@6KErH?WCU&Bwqq84dt
z%D>pCc0VaaZ4G4fm)j$cR~lvGd?HQxi0fx|AMoW09Y{UC+3Z~qW`|-PPXP$TB=<>V
zMsg=MN(@j%7I}>r@=Jwn5p?f>BBGW+vV>qhB=KrcLpkeq0A!+z?3`DnKmK=Ei8pOo
zXkxUt3R|mxC%+~o&e!&b*$%29&e(U)1zOi-eNkArGx|j*^I2qv$>AQR_pa$th6W|I
zqdkyZ{={oJu*yx1$ZL%Pv4E4SuSG|VG5CEj>{gX{M#PT?xq-Fw;}2yHKoGejdzOcA
z9x9S${NBGPJSRn~1NgzKk8DI%!-5lWCKNFTz5)EGyZYzy$pOC}a;ZHrup$OV0<S}g
z{dKYii>GeyHSrc<+P}QYHrUXF%R$N6NwXF=lh>q8c{m-RylYwYXVFj9kv>qj7?G+U
zO*bAwkqR*EVg}*jL7l9upBREf&Eh|;F%sqY2c?I#LYdXN5UnSf5AX38|2LZpn)Y-%
zx~JYfnuLKhKMDq&@`nGoY@NP~rIQgkJnvZqfRnGGA%Zvn9TS^QH2DYIeXU4aN8?$1
zrK=o*g9MFo@tLB?yf%8@G%szGcif*8E$Yg0;2oy(rVd_P`jMjs+cX#X6DlFjdEbTF
zS+=R^HB2QC_bXh~;v!l;Gz8$43{JundtDqNqpa4X95W8>7m?+(`&!bE9P9nGsCRpA
z4{gs~e)4j4f3ViM8$gXMbhP5#c>ZI3;5u4YIdD+Y(&MSbQX}Q<wz7Tay0yqJmwx=S
zc9LLWS<+(9k$hvx`}OwZIi}9ka+$_7b3x9B3ME~p3*+=}hcB&dlV(OjPaoScN_yTR
zGJkS8#d8lz_qIW@BU|`R@qAKNHCgL<F5mt<_@M#K=-Rh4*{xtUUfpx}xP&a07~mS-
z5giAMkn|HeoH32XnzTfp`L2|2Q(1j|Tcf%H$5_Yf7ne0`lXHGVzJ@3N@426dBwROF
z%|tG<uUZ+eP%@x!s@b)1WG~HzLJV!!6Ey)zzG#(kgWSnA@Mc717T`RnX?q`R6})p*
zPO4Lp`~G=;vvktHSauQ8<A{1GG*;W^crlPm<>gcU*J<V<4=7`$C^$0I!1%86PP1_O
zPw8w!%xD~rKygRhq(o<oswpks4j(i3Xfso2+(L@#(MHPB;9+kIh7|3fMCCa0a_MT)
zmeRi^$71h@qqW6ki`kXI0-RpD@@BVrVR8r*XvIf$ksawV6betrym4!X3W<gqJQ#3Q
zEe1=GKv{84iUo&*4XNr2xVJRnptZG(JO6@?sdk0B?Ica*IKcr!Ge^7@+8e7;e^8I;
z?&cd>nDucfV-cmiSV*+IzTf$-O#CY0>{DYe6JBuL`_OsqL};TbJVpkS&R?7Hbbc+b
zy%kkyjS7pt^+@P$^Zj#E;>5>~BT!YaPJQ$F(8J*qZI6si=i)(geR=VCudOf2<-7XP
zw49DZuY>_Oddk)Id?btyBE9C$8`Ibr%MIn{ua0#>WsFO&Q{^oZn+g^!Huy^$qipCg
znP|r{21kbSu`}_@X3Y<B(~%}ciKC+&3bl?NVka*RI~HA2By#55W}-~3N1CgVN<sRc
zVe{Ne4k%=mBqJ*=O(X7q2XhjnyvIpXj4eD$GILM(xZn125i;kmC&hCf^bbdw6;4f}
zZl;R_N<vLb?%;1JOY~a*AB|NjpmMZnlGLDxp%il$kQIhm5sI?p!?7VkRAOGi{Z6~;
z>JIg6+G{lDv*yU%Ui|pI8|k}(kxRc=&9j(HR(bC?8koOqA{<5H+D2cVbNs45=eP*Y
za>Ze@l~9bwg`tu@5n*RFKKnZqhbp)iU2exqj~ym+hOiy4bgiW%IiNjS)`lp494khm
zcR9J_bTzzI#>Pav;;_6P@`i~C102wBoX#llAj!aWLapc;@~+PizY^fe*8-~Ke39Ml
zzVKjyaTInD(&8&t83LuOtnjaxInc?{exfrX>7wkVjbbXZBY&@e$+Yu4u~^(K>K6>F
z%34V3-k)ELO+*4swn->cwuFptVIR$h9%}NkA`P<Gn9J3^hw1J;9xK+ojHNT)Ou2nP
zyJj+%7UP-Qi<IB%S{*^qnA}qwVi@Cgi#Wd;t=yW@xZSjw_PV3BK3!3Zb3i8l#Gz`C
zM>=?9f3u^y-*O1k{0#IV&N8X^x%UZ3?mgnVIk+Z6jP83K?ozC-p=qCQ{K-&|>l-F@
zC9GyF^lve~^ZLg{u{@`Szwrvw=3S%PDPN4eRv^#C%fN##`q4Lp=uu^p!sdY8RN?d5
zjN!vC{lEFE6n$laC`^k5s3Uv#CBW9gMch?srjBkigkShF{(Jl&o&iX2=m^RT=Z)kC
zZ}a%I2V-5Yc0a+eI_6QE&98{m`=OhCxC;K%Dyc0moc*1vZb9y29{plVXFuS|DE8{Q
z)Bivqu)3s9XMWkYP*98rG9GE35R>9409*zEedGCXae7B~Z{|gm6l0>-$s0*xSGdkw
zLb~1JZc7t+KU?v8$IS%VjOpMR&tV-sOb*c~PTKK&z5xbAaIhmoUYIA9`UJi9UJzfo
zp^{zf&r$_57fm{Xp10cX6fS#hbJL9ofq*MLNNX@;H*n*N``I!@r~O<1Wri@<-=NWC
zz%6MV(slGU5UCk@YeC_Xukt~uz(C&B%dM%W0zbG;l-=6=mzGmFqnfv`7fg&2qgwt}
zb5mA9Fh^!EGK<3J0Kd(i{YF>M37VpNtFQ2=!@uLX2-%et`^tEKbbQtRwK=dbNkXqE
z*qhWUE)%zuO6^9%v|5tP88suTR$OPeUQ|n>d@ygTP+`SZ)iU-bBU?Uya>V7O>U+9c
zT(#dJq3xB}(SZWn(Gtntr5SIVjPU=m-s1k}F}D`ZJY4BjHktczx*=mJI9KZMv|Y}L
z&-aM}-)gd#Axo>etmZ0IS<6ZE2j+l!BZdBawX9<J)s}4jhW|*`Uu(1NFy`0U-57m)
z^qM1@a{R$4yx(jWe&WTbg5BOEO0PP&)G)5>y@f|C4MN->xxUE{YFCC(Ul<HmZ)995
zmM)@CilZSr3xleqg#41p?#16{4w_PGqBk8&PW;Qb?r!T16B3eIuKWoM0c4Vel&A<E
zmI|J#Dz=I!7F>?3!=xZg=2sk@UD@4N$jf{$gysu+$87P-w2jTcSYYpwKbGuwu{wPG
za5A=WOZM*7PSjKxW6-W<$7g}F9W;Sf=O~1`V%jR__4l8crJ8IjCdb*hcz#!O<!sOL
zO{fX<<YWE&e2WsypQja9|8A;kr+7s#p|iEncCIsmBoOKFeY?PCkte}5asg`hw#*gg
zwmal40#YL^3ZZK*`jWALO!B+a&zC#yrhz+F>Ylk-bW@s>2muatHM+E)zkVnX6D%6H
zfy-Aoh>zpjtBNmVb5RTMw(Bupf_WCgfI0a#(qsX%{a!8L-p(`IUOU?Q>-iAyJndrc
z(oWlCre1HxSqW_wKw<pyqQOO1S3qjWtu2^24(Fv$LzZ`0v2OB|mK5=(nq6F7bg}WN
z-e}f6|2aMJmtK87SiMC7ir_8W;-_g`ne)XZ&5yGA9KCvGG?IdcohTA6N3!&DrDywT
z<Bp>Q=F{w*Pa87?KebS*y+mxgXk*C+lE(#N1kxwRWk;N<?^9}r>@-Vc^w;I%Z;_yW
zBc9R9ocGn2Z7P*>^#1aJ`|uPFtF-y03(tj`TSGM*wyXpCYJL!3TC7&gsY8}b1?GrG
zy2uz0Q7-^iE<@i4?*l0wVoDG6m2p@M(cZ8zUS0xsqg6>&Y>0d1nY+g(4xvf@T2eOL
zVsMBaa<yL&H04oy(}x=N%1$-L0QaBJAG>T{M1>-KyV%mNcQ};fYD3(AR=N}95j|#6
z>NUULyTHRM*U#HoT_d;iP1k<0reDoCANVcr(~F}bHty@#GHw!`38m|VS!S?)i*^@Y
z)gPOd3Z*Lg>6Y!_Z!1F6;L1=yS1osPh*jQLsLQS0hKAxTFYMSby$u_5dhCo4@k+CE
z)KlvjL87nz<wU9BIl+_Y$}au>jobk)b2&W%12{%iH-tPQJ*w#8R0jJ)%ad#!i9FT4
zs1xM+USt?{mcR*xas9V%haI++h57zsclamn%?FlSozzou<`J#Sqx3`zP>z{m(%Cqj
z+O0Ayzh<}94rdYa;(6Y8xSkArceRL_G&S>-yikmaD_^~51CJw%E=|0^@rZ7ZIS5sv
z8Wi@O$7r*wXDm;-2}_T8tR!iO$m*8DEfO<NZDBO%Ei#<n!^{0-;m#i#Q8K%yC6RNv
z)Zc4gnXjH=F~*+7J2-^RB=J16w(uy7)074`uYX`8u)SHPOdgvTeY%!b4H|pNh=KXR
z&IXe=e_S4_b`)){QeJ8_E&k;S{+Zk0mbu)dh113f+W+a#=eZ74SbL(3$TyLPJuxtj
zUE-q@`DHd`D(NfAaC+lQt~y9`mM8Vyg@I61ht2eX0?%$q;_Prp3P+;fM}%69-|(h1
zBsle0qa`W$v{7^=k%vJC#L}6VV|#pGeDMmTSZ$K)z=(nK%;I~#Rjyg%g61)r>QB{b
zFl))Dhyz!}Pd7YumS9n$facAG+KW3Rp>lEbrTzuM<y$CdI1ECDk6Yf;_MJu{tHQO9
zgvCxT$nkx?waKa<ZeRDI2RWRd1^=CVvJsmYm&WXZ`<5<>h`%<2pfLVe4vp#R_ChzP
zS%e}%C`MGOx-d$K6dQ*?re8N?82AP8<S+H2R{T)$`RGdnxI<pmaJ<mYkO{@{3YFQQ
zKm6W)^QX)35z64yR1GF|IQxLbf%%^fUs6j1#v@ON=B1C6C{%7H(@B&G71RY=o9Ggb
zjYdGT-ElA6578f`4X4eoT;;z&!{{pDRMbOzL%k|l^cR9hvec*gc8^q2eGen~Dq55Y
z8t;_C2;25{7u}m_T+GNB)(~1`bQ`Z&-|Kt0n-c@Q#LMOLYKsAtf~Ra-2aUgy6_@Gy
zmEYGd7U!;NFh?-2S$@irb>hKNLBTPe3@H+SM8gtp&ihQ2;rbVEH-&Le_I(XiM)SPm
zugzrc_BxC>qdE9b9s&U{*4#=^SOj<s)N%KbzZc*{yI}jUx|{Gx@C&HtV;9-Kde3d%
zEbxSk^F4dhCU4JS*k@nCc;B9n`ZM^i{MO+=huh7RN|zwZ^!FGg%Y3}j8L&*2VWEZk
zg(OaDDC=o4YR?@_FImJ}^F1Pqw}j(jTU*}a;8r9_V@bx)kCkvYal#-Uisk3Wq#86_
zSECDq7B+;oxmnJM@p=YQI;RA!{^MtBB-CMIBf4_$dT8MWrvY;^s^E$}JciTO6BLC*
ziRwO7mMU94J{56-T1F<S2#kt<(*DHV(O>3-^V8Bhcu85?9Gy}X)-mBK#B8UZR`TC$
zxVmKA@>hBy7?olyAL|=nn4(p+@RAN$CikZr!!$Pd(XL5A>B5cb5CkaN@7a*PL3QeW
zpPQ*~I?iGgEIU%_kd^EDtsldgKNFuX>hMqC#%nB2Qs2rSbJfA{Ur+Y%+b7?h@EJ`J
zY&%voOo;8d5N3qnKIa_4#9|6AdbX%vt-Pp~g_k?F%)CAOgxF?WdF1ccATrxx98a3(
zzjyr<Ol6mECS2@9tPS{4c6ULP`ZJU_f*bMBTe#5^gRZ{m&fnbxhkarRDZIa5{L6QJ
zfWG|e5VN;BbI}5Qy}yHc%lWbAsac2Qs0Zz1iRn_k<wZdmTJhItG@i8k`rp$r%6P`I
zT+wCKoV};KC>cI~EXMDT*94WdJj7jesfD`xstx4NX4efr!FDg<9AZ-#1gN1fiz#!Y
zSI#P-HyDvOQ1bAL^up>~d@^C8YnxQfDa4X9a`Frt;UUgvXP#~JOu15@!F$ZbWFb98
zqlk&Xes2`sIL@#Xgdeiq7l+Z6uzrV1yS-9P<9g3iXYXs{q?NAAJg4`=Oy3i_N6l*%
zPV+@Pf~7m{^<edfXko7v-pI-E0U_tn#Vw_6`?sz4D!w$LzGNMfOGZu_2zuv-xkY`R
zf~;jiX;|RC6*9uppu|H=a}hNPFVqE(vhKGT6uMsXUy6>2lEITKQuw*(hN2HZ?<wA7
z6bbfif7wF()weBMb@Rz6ob~~$!44MkNXu0JL(BGt%6^uNcASmJFpPG%6S0mXLrl#>
z!^oeOx4+jSIHpZbBbye3<~K(+TMKJk<9mMj89M8Pu4lOq*E%eErJ1Z%w0p4Ry?EUZ
zqlYuGtI9S)tL+G81ZmQ4GA~8J8$CD#L}ai3-NmYP+<ximw*NjS;8*KW84$j{b%YBm
zs9@yJS**7$gIx0+EjT;D*h2F~30nR$mPmhpEydHtXZ36DQQczX(&N8BGJXFk7@?!u
zUhE#no@|+a$eR*PBO|C~R@!Pp&kb*Vx6Spkua>qSm8keUV=%R^GH*b_thX+ixXi|h
z7R8r!YD3PzvP<*YG>eDIVD)WVXgJRvPPU`2mf_u}D1>W?kRR1A6H}-Cu1-rRqnMG;
zZ#U_-SUxgKdo_S}s?_>r3oR!>PkLaYdB~8br2`$7T(7AP^Fz!Fy30chihQ$3OC}>~
z6SpAom5!MhOzsp3L4yB?bj?esYDsE2(vOZR&?MC2NnLYXJN;3trte-pjpFk;tD=3F
z|CjHaTt-avjb1f(YpGn#ezzqR)^0USWA!xYN#A}dD@#QQEmI{kjZiAvb91;gdMce`
z`Iy>iXQ`{=VeC%vg?Gt0Rz^iTOBJm)Oq?h^>XL~j(|=2(M3`6ay~oh}C$wcmp)!~&
zo&J*ddUuN*FcQWY!Jp<^Vn=RRdYQuye#2bYpzAL*2RL;Z<1@hEUB}aw(I_YANYG>c
zHJPzSXC4;HEOixq4PCH0TPaN3#TOS{?&Tg(WkrsP7RJd)_H-m)$v>NdE&f={i#OhZ
z3Wp;17J5*|$iLUPP#&HE{fN5T2$@;I+TIVBHFpX$b0)s8xj_3;#$@drXN@%J_QFVb
z|MP+F`II!Lm280*n4*}l@ddT3+AR19Kc>3OH5W_%mlsb;B%`^5hpkaSuSQ7MbNF|O
z0bIxyFZ6`KCK8od!MutuRl(uN5*2k=hl04QqMe3b@1%gol`A@o+oLfin;GSSnZLol
zQ7M?wJdvI0gHs19e+EbIvh)0hY<$EL7g6E5s!>w>?6?2iA-h6%i9C{$w}z?UUMjti
z?q$GeAV-W9ZC?3Nh`@}Ywe!VWeOSQ3wlCp<{UJwDq8D{5ALhByc3b^tIBeJebZ%y9
z&x*{N@~&eCv4G#&uNb)x;4OO6VMC_IJx;=v^Sr%OfqBH(=>Yf;@bK}ah`H$=FS4Nn
z2$5c9|ERWG*lZO!_Ch;$IFfjSDI+|<g&ugik35GY<Ey5wr3G{ck4P}{ND?w|?a!Y-
zM2ez%K+A%Mho4Y~er2izVB6Us%;Q2FP5EwHRyMB_F4*_gD|S%~Q$0`5w{tg}1GvOF
zQTC(I-N>%Rnx&q9F2z}ciLtpv82fnvIN=fuZK^O+0q}&uL~i=jw@!h{P+}}VQQrbS
zAb_!W4=f+qU__cD*;nA~*^U+Tu*WC|UO2a-MUCWG;7sc?du0H!XKyiLU?DWN&5aES
z$XGZ70|T83L+H?A%A4&kYj7la?qg}fUei?55N6d#1k_huuHG2qZ@^L|4p2RYieLnl
zg*7nc*enC#M+J<Sn9urh?RU2ozXvQ)8+0Q;x;ky5{0heIJg`&%t!U$|<vC<VUxrwa
z)&(L0!Xy}5W_h;Wt2YZGo_in(UoryzGV)+9hJ3hvkpNC2Y>3<F51l*U`2&`fI#1N<
zJ7B%pFttK|`gO`J;=G9z$8M1JJ>Z|Qaii-V&fUX9^|*ekcbs9;STbMqxH%GcjSDc|
zLB`|hTtT!c;I~o(pH~PJFbMwxP)YFnU%;F@-xL8ircNeLKtw479=H^O2bA#TWZ00;
z@w(Rg!0FYin}BOFZ=@!Fetm7uO%yW<j%Y!TO*IP+^#tf(rd$M$ej<{1jA~yuD(}D`
z4Q^njf~~ch3VE3;HyDeN000<mT}r?!1ET?l@}A4v`+AOMnN;cRd!f4%m+vP6R3y4-
z;}c6AhCmjyR^HM$0W!xh4_MBofK6oHRs>+P{LTmHbp(*^wnvg{ZEW+vn5@Y1N(^N{
zFH7Fws6UGqXnT3~d9wvBm%$kLk^u1g5M!Z<9iBCOF>d|ZmrVG@IB5t-uf}CZ=@Tya
zA+_jZ`KWxrbfNmx|4uKgG3rJj;djoNJ^cK1KLLX5mH^`hu>@EzH*lhg;B1a0$5(XD
zX3Jm-_&*E5!@;S5B(Npm!LiJbPXgw^&gDEqkakoPULzmkbk~4Xp98?&w9thV>H%Di
zPPI9D{UPv^<$y70=h8$x=M_fXT2$EDApGA&HxEfq(p`d!fDw%5Nnr<}csN|r=Ii-^
zkh;DcPQwl;f=`xDz_@@-p)GbgSE`#2JlRlJ8^6go4)YS2BMIL00%zt3-5WTxMRn!z
zjNe^nS}1w0z|z9cuW$_PVA!+WfSfiL{_Wd0LnA3+?=BKjFRH`v<#gD2Jav-A;67{^
z3$|g)v|7iU-q&T|XyP(j&(zQqEQA&(V|dj`bU;0srhe>S##4hD@ha`L1O#D1d@}pb
zi6BiwqMMLaCswE4-p)zwn@1;8(2^4ri4Jnj5_+<A#rhXB45EAf8nfR8D!tI)*7CO9
zTHVOkDSwL<1ePz83JHC%eDOh+ubbP#S!Rr$f8ZtfLF8plPUm`9aV&a3Y5St(eC!yh
zS*+Org9vs8!K&l6&|SX!%ToH^1T@Gh(!m=Y?Pz4>E3g=~QIbjeyA>wv9z{FA@9?o^
zrW&+S{<URlMaN(WsOwD0iI8J4lBPUW+-W8>@O0s?Hh39H7Ju-+<q?yTUdGH0<twLQ
zC?7OUgtbPuOJtX&2<PQ~CeNk65#RlMDs?`Zk~(STzh=TZ<mY^YA>85@`FKv4kN0V!
z1Ca}(3!iPBdy`SJ(09`1wE7QHxTj<M>6(Y^no+$}3%jr%juK{>{`xKWh+oRHdZy2X
z3o`YA1A;b6;RLJ2v7PN4Ub$C4rOqZU4;h2gFf(e1tA8lhE$gHRd)4;rf921BTa>bg
zlP5Jivs=te@1N*2=))G-#$cLh1ECO0g!JxClet(iSKkR&9E^!r5f5nVy9;-@_}A?D
zf8S=o>d#ljPUXFiOS*`&T!|0Fw96JYz|7?%c<y()y|Yl^E?V}edEXwPRQ?S?`fc?+
z-~M$pmUXIVR+^XMg-UK)`sCVzfunGtAGcbJgQoiE`NT=G2~3wW)#f25Tf1bj$mL*u
zyCdnwU@`CeR7)}yy81qp8<8;I#~-71T9T3Z&x(FGk}4O(qzr~<H(fccgXBIW*h=G`
z`kDx;{q0Jq=xIUEsi$oHsaShu<j?W&E&Y8<A56wgv2QR|ntf;K)UBg$(*|#dq-mEf
zvsaf+szd5x*CwN8F8e57ROfi(8U0fUYW6mi7IR#l{$LbMTi{)-y2q0!=_uqsr_r)R
z5OVyfJJ%^1+BK4sX#PX~Z+D~M!zzs5))+2JN4+uy-l>E#quG8996C}YY9N%{RAb-2
z!kY8aCNhc|H{!SxkywD2?w&IfK+l<C-Wk8j7BsQei}E{*;c_E6m)np~ew|i<{7g-^
zt*xl~F;6`AZN+SbgOz;{i|frKaogxC9=FUnfm5$c1cx8Wzf&$x`|#z`i=jfbhYmhg
z05e&70(h*G$56_CcJuTz4Lm5B-|ZzKI#}R^O&+feT4E?QAUI2p<m)zF!?I=^Mv_nG
zPS2xFUq;QnG+rsmk1#HMcwbU$k}!S`clP#XL|;Wdl}>_=6WLR}r`v}t#H~85;tgNe
zJK4JPL7x5FK-j^}&z;{*1(R=AmcG6?SfJ;2_t!fKI<m^9>B`Yh>8-Z@79S(ex3>vG
zHoqYCCyT7y3m#z=YWsyp{U&pB8*g^X1ID1_XXSM-Z_SoGquON5Lnap~<*Qw9F60b2
zUA!!2Qu!|hr!p;87R=ERE;QvV-S1@}rCW_m3tx<V=%;)yc{;UTu8F*g+`PT1R$25~
zn(>bD$xK3}$qhk1Ph1r7lAln@^Fl?;8b|NarjC-hexUH}|CxX{u#<WDeD>zV-hxf-
zH%u?WT(<5<Mu#JFyt{uC$sP31DPsJCGwX^RjchXJ?CGv}EmoYJ!((bCFu^H;(o6j}
z8?{32tzv@oGVg4Zj*<f~M#<zseTSRu%wF?`zUq7f(&_Yet-!G)Bwi(d&{Tat?{+>!
z6p0*SE;~~4U&VP-{!DT=XDeR(z-Rh3##uk~hXY7P2)=r}`=(eCSY8L_N+hXI$MnZG
z%lQ?Zb$(!LvaGhpqoWHX$Njr?#X;fG`o@gd%VKc!#jM#Ei#1l<#UwQu)y7Vht-!Dq
zWaifDYieXP_UojDu2Gu1qcf<xDV>Er%hmaPr;qs~b2CsbicH|ndhW%~UZ(EovsF9N
z!u3<YnoI=>k%alz4xEi8lKqi2E1a*2HIse`$z9&X28X2y*1D5@TA5NZ;aG^-K_zIE
z=f=-tRY%|=ls<iUG%2-K@}wZU+l9_miWkGxN<<(v;OJG)3k&n0+ejCVT=#ZD$4yC>
z`F{CMLs3j$Qy*`v=Sgbe206O)kQ#JIH3D{M)e?-^c=BqCTkSvEtjmS2*z3Yg=^c9~
z=XZNABz0&fQ<)McNYW&>>jgS~)n?Y+u6B2&DX--c=GC*>HKowDIC7?U;VaRMmN8h6
z*QgZ;(;8u*CL6FR)>DpDPcTjss46lDf%HkaH!F&je7F#&T`ZL;^k?|GokWpq)<X2$
z=3^ksV~otls}V;s&$E(FM}3bK3}yw+IdamE4vC<3{YE@2OmE#-Ut>fT4m=8!;PU8d
z-pd4gd5!HS=^BeK{fNC=E^U<^Nd7vT3n!47;^HhK6HGjUj4RUj7@ili^joX9QP&6e
zJLV|M$I{Hy0Y$_?XV5xLI(>Ud=cC7IpWr#8u1w(6okhJMg)>TYQ<h><FK=)wpPYsq
zN%@|!hdGn@oM3{my92oc_hKY5elp>XXXtAO`vp#U7R)o!F8yhn+(EpCw2h4XQ7vD&
z<~IQ&aG35tNjr%XjCWD~eN|$82qULa%fHE<Z9k^Y@PV=zCb6GCnhLeLpx1|MOLzxM
z(-Bj&{iA&Ev9H%vqNNF$X|;-PhMYW-^7?N}Va-YN&r1abIM1=B#V_myzGKmEQ=ctj
z7;xXyT4;{o<BBr0(ul;PVwP8>B3ccU)Xt@~=)BsO-1x%P$gAnuHy~`}?xFKJ%G<U<
zHW4*G^R)||bN_l5dXV|3!H!$sb<z3g+eP6kSoeX$THc6#zc(Lm#m2Usq25+_+{=*7
z`aB31y(~D?IP~=&a#@81{h4!IH%8Eh(p*R@4;=@MV;wb{BdNfKbL-%O7(z0v?H|;b
zYaNH)pYv=&>ug&2Tdm8iq}o5;dT%XVDT+7LzD;4-Q=349<AsKTVnLUc6#GC^(XGH2
zb;A3qJjbU~EH5!`fJTp#pMmL-(_mx$^bk3ZHkH{?xB&I#`(hkNs*Z@f`CL>nA`ch&
zty6@1WK1vlP!h~@(tuIjBI(CfqTnLb?T(3T8AY&Ea@NxhC04hV8k)<?ZLyv<_T1x}
zqVl29HLf0==k8>{PTmmbRndIGfT{7n$X_wVqRfUXDxl>u@Ua-y{b1<Y{)MM%_ERkW
z$4~NC#KH=o;&()ZYJhr)G7RsXLDy|Ca@v~df7t#bqb;v#J`Mv#_>Z!pLzJLWvR;{d
zGO%*MeP<XOx`h&5F-J;^--)I?j#^km3(}F`#FA~QA(viqXRltM_L)i~gjudIxoBT^
z+bjJ7i`K;M)IB`4*aT@%tO&Jzv<>%DFcQn(?b^=0)a@>D)&J)W`WmtA57T+fKC?Db
zDOy57Fwgft?bGIEn%l_!ywCEoc{96im-_bCoMvMhS-yfjA+f%^meKg)wkcz(LU&#j
zzx3S2dvF3^R}%rvk5^2lpU4qpK>jX0;5K?VQM3?FPqmltolyi=!p1F(wC67C0u9s3
zXQ-!}CDSI4s}|3exWrFSzR*FBuf<BdYxE}Q>&}yCH9(>|1Ju-anvQSswDeXggGmX%
z7jkB7hY`VnRFlRd#EIRo-P-q|#0!&YvW8g-h0LD4GOr#^IcJQ0jC_E3h+|O|((L-y
zAB<0zZ0#VBxcX>`$~P=jI%1PqI}%L1SBhMcTk~dUPD<d{$Bz-Ol;T2^wvF7c**v&B
z=%ueRca$r<?Dmc-h>%(Jz{!g{g&=|TEriH?MmF0Kw6uuLax~tdcSEEa4vA6$Yshl)
zri-Cigd_xPMA5mYi?XHveZjGO9Z|KPZS*!{6}UfClK=0u_;qW3N{6+^n_lQ-G8K|V
zI-kR6U%cn97>FsEQ-o{_>5RncfK-}nJyR4H!K$J`kAR4lp9#ow@}E9^0@&=savl-i
z+aFn3Sqvu9g73VnjU-`U*s-2VRg<ONOr%CY5(i)zEl>Y-R<7ePQ&Cd~o-T8-c{BY`
zg4D-=ElW*FncncL_|_Cux;&S_e{2OjiEwK(xMkQ;w>dcgKcudrf~DW!7!a&;&%WUa
z#x$c~V9fd^O_Twg;aLtYG4X&Gl_Qn*Xbk<j;OLlaUN4Q?*}9bX>A!%8Do-?I<V?V^
zQup+%ao}Ebyx3N3^1b5%$SFls8S~i4nzu=~=h-5Dy2Dci2R&<`*lq&8$zj=66?r4+
zuMx^*?)_|Tp!VXiUw)e;;wJ!sdmD=VYX=qU=E;dN#0~AdHRwd-3@PJ6(1^v`+S)!8
zsJtqIjC$0n47?DJ*&dAhUZ&UBh5zb^(7;y=jF!xUfk$yn0%;0i&DUvRm^B_C;RT63
zK}vr>;M8gVEF2sX;{3^!K`jRf!pKbV0IU!_f=P2g<$!>-ONRk^y_!yjY_Y+x6NXhO
zl|}>+jeeY?7F28lDZwfduxm)-4YcYhuW|QwfR{7}8JBJxl=j-$VhIQ!Tm`C3dP@Z)
z4e+ko-^_3!=?k3;P)gfcLCmor7bbIaypj#-?Fqo*FjIpN6D>hzr6d)A>!ezJZt}o@
zYMZmS`~U+MDuya?A;ADn#&0l%pF2K`htGaF15lBww~qkfQ<-|a2Q)x(AbAjaY=wy3
z{s36S`Eb!z&|8pjmy+!PofV$jBEo$L!(2O+tScg19mSKfM6tECmC<c~8qSX2|Jiqc
zwv;q^dAttHh>WVlBNF!JLG=Y(l|sNr;Q<Bd>?Wwz^D)Q;P9-~1aoz!XOD6b!oYH+R
zcf|l^E{|N${g0&x2p=ZZ*)DYL<SVC}i-j~|iZ_c|zFtHb(XX}EC}Zc~_;J2HA`jlu
z?3J`HgcJ*gnSv?7$dK?NaOOr|6sPBa3*=2Njc%?=IT(crhFbsLOwz9Fe*8AVRN@63
z{;~jdIFa?L#M!U3o|;OM!;Tivy5-W&vGc0ZGCC`v^XV<OL7S@bcjy;!hSCXeI-cC6
zV8R>cFHzmslyo83uca%@`%J&&_5kV>@$1s2_d*y%ni-vHNYbEvf*aj@#z34z43{a|
zT)~exf*438@rTxv5^?d)<@BFeT7@Y;K$GW!C_wL@CorBDr-rA7DGjOvE|g$4CPe{+
zEoEwL=FGW2^<~>J!in%rQc?bfo5%XU$~y08xWaCY&*<GmZ_!IcPlO?eUZRH}dI=$V
zjczbn^k}1oh?eNR6E#Q>JqU&%dQTAIzVqFC*Sc$6e_Gl&XWp})XYc)cOxlgQ{}6r5
z2RwSg`&PqZ0o&h_xSKwba*OigoP#lceky>&vYNaA8x8FS1KugzniNyJfI*e>@9IQb
z5@U#5Zk2d#O>l`toJD-1=ys9(@)!K9niiooE2t%Jwb#~@C6wcMKGe~wyv{0J!M7%p
zoAo*2h9viU@NYfY7sp|u!9M1D%z&wc7-Sa8i-1+;gh$I~5Eo$wLU;8$1O3eZZj8Ns
z%i_2t-g=tFuzBft@>&Mu!7@Db;m0hZ1p}^l4+Zu{n~XN_xYT4^F<d8C54p9lB(j}D
zz{r~b<Kw*G0+|k^^6L50g2lH+WW4llV+P1Wc(u#;;AP*ATlpC<GX~|Imju0Y;Y>Qw
zTrs_~IB7(6CPWlONp@oO&*ce<AK=tDOcpy~Dd=tEes9+(4=<<?C`#sTk|DEe2+kE6
zQFv5s;=-#{tgEt#X*fu{Eg?%QrM06%o|V^qW=7XG&==D_|IY1b`;KL1^|`sX1{2vG
z(p-3;cg&NcNLq7)ZwFy*ioN<A6cO0KLnksZE76e(d-9y0tW;CPCcbIABFYmKnNj4`
z+j%u`P-GgdRrv3qF*Yn3yS()UKN<X>CA#K3y|hExPcZs1jiBs?uuAC^g{=HLF=gs~
z1I!8EA4v@Sikx$X_w4<lIBv3pURbDfqi0Oi8`1c$9D1vLM7uH{0gaMp^wsNS%SeDh
zNn6G!yg`G5wit+h<z-zfWpS*VOzkGE+wVb(`~7JP5qzr7JKSV^{l^Z|-QK(}R`RH~
z%IyfvTAswmHn|w{B3E3EAsm<&l#jLdBPM?2>!sEOIu8Ra<X04f$Bn37?C{NM4-Dj0
z*bh5wjMnY%%{IJqwSRj!sRUMZtTyJJcwkzBFJ3hfzQXFy<e~6a_U|MQn#yNOv`9^8
zNoFKdn{N}-#2?K{d34H5{SP&<DVX1{BonM!T%!BV$)Yvjg1<;3&A2bt2lZ`jJp1%~
zl=OJSBIil8C~Lq;7Paj!^|S4gSdy+HQekz?x<=kcKYd!sw%_Ce>Ls?Jr-wem6)f{v
zth@Q3zo2_^Ag+@|k{OXCT@=qDIUXUPE<q-*|F@7{|DCsm*moA9P&~PF$tt+^ESYPG
zw}P>5-?hCP^2*!1L|HHW<WGLchpaH78P^fpH2di&^NUm5fjKbjF<C+RmsdkWjO|6D
zd#38b;Yh!=i<+G0_KSBt@si)lY#-f{p?NFW!P4;0oA!d5U(J1ey=N+M0D5+&7Eiq&
z^5oU2)7@nox-_TBM1R*V?XB9sv1eW;cPHNSd7A{pgGPJKgZ2HgZ#tiNXhMXLrxqAL
zX1nG{Y?@9q6PO)jKPZjs*Cy_#R(L)A@M!<l=pX)jVPa&i+WjV{#pWjRWqSwszXobL
zygV+(7}nUCmkP<$wVr$}uyC|G{t0S){o1_+Q|&tXovq<KZ>r`?TqE@VFVct0sSM2p
z3NT_KWdYbnj#;xy8$}wq%Bb%$?aUE=0c%}9sLsxBO`ls5v5l&r`lgrODw+)bUS$t&
z6f8Xc5%pyBwfA|eMoFlb|2k7^uon+?KnG8eYUb;&&#UTXyiVqrt<sl^ud3?D>&rvp
zmA$SH$?kIDQ0wpXx_$;?RYv?~NVk$EZC@A>e*Liv*f$*t89wD3{xGA9ikhrUb9oKb
zlAF9D>RbQ&XNGERFrp7HKjSpzTNk3vtuDi=*Y<L`c!=vrwBPbQs*2GZ%d4f&GcV6R
zOa0a*EZrKU$<nu}jm#tsv6rC#i~}5i)Dr%y`H1go16Tdl$mg)LMF~%R;_yrX-n1s6
zS+1(JVZO;S8&Qns*qtkU)MhWR$>FjgIc)+w32#Cxj-~9Oij>Woi3cz38_u?B*SVd1
zm5B7<Pg_ZH1b<!;9*?G)l?Uk6Dz{UfvrxZ0XVTLo;IBNHcBxE@c_2VwYjywQ^(y4?
z`t9rf<QKZh?Hkh+3-FfPZmi0?xsy>XU+6*&1cA6MQcWb&LVxS<EF6{dZTsIs{$;@A
z1@&E}PKo1*4ehoX`XJEoo4=m6ygO4%n_+P{?c?S2&(O=i->H=g#|7AZr@v;N4x6;m
z5B55BRr~Qq#N769(z$s4RWrMfdwx$ZDng<wHr-25J1XRQ(c0wZ`bt3Z6oht@jrHmN
zt3X_Pt&Y(<&C~i<gwwe0^d+}94xdfIF;>m<SGy)kY*w>FLN-1XN>4Z(p{spQB!k+e
zw38=dvjXd~#Db^t3{K0yxM2jN_xro9Ap>f!#degffQOS1b8y`H(CoL=>3phf`KM$^
zwvliRTl?I)%ROf<XPB+Po<R%?AN9-eguAB<x6E?C7Yf^7z8HJ-EgT1TyQyIO1X^FN
z^58K#?Q!{!D2H?iM*(U*QBd@9*1$YS(wq4!sJ!oH9^jN0ur)V)Y=Bw%mz8<dy!@Fx
zI`(0xLff!JQ>@K6akB;H=9G|0IWw7@$gJ}cwN8UWoY-VOVU@*JVQB0sw(xc2%`Eri
z{b0@rM=5`zHn-Q?33*&%TZ#{nvLl;c?sYU2a`;uGZ4IG`YWgCSn|vB(_g=<#Y@J37
zc~{A3<k?8)&Wjhe$9Yc?-)FaaJ*ec{=@iqRSJfrZ-%q`vy3{=U`@L^bL5iO!rDMj!
z%(kMZiM0B8GJYBu8=z-b8YsCAZ{H`9_V!%kd7|$=2t@*KT<^<xZ<XXh3{!Rc+)-cN
z2N_;6Is`^k2!H+%JAekFVlA#=y9^4?H|KZ%Bxe9@7x*2Q2~Kduobq!*G5*GruWIs`
zr@Fk|;M26io*eyiQ+3JoBK%pQ{^{FMtA7He^&w*XZlxp~b_Q5`?1lTK!i9`#5o5Sf
zqzGnCZfU9nb_xeBk)5OZ+Gz&x?3vQl5D60JM|%$W+8cBe*nT$D@4c<SWXg45PDYi$
zfKDxw9ilrh>3vF(z~t6DwH7gSkCM`n<RGNb3?cufs`PHT$k4@{3fFjz-y43m-_}6%
z!exn{^=#f7gkiH<u2uajUVOS;chP?N1CL}i>KJ|h$7)H%u9%+%1h+D<jaj<cC;6k`
zbY~ZYHTrjoGD4ud1~}42{S3rL#~qsGBB?<q=jQV_*E~4Ykr{pBB|9O%8L1uS({_hq
zuar4$Jp$%RO?o$p&UaLP$Ko;5xqW)wv<oo$KJ4}uD?YXY&ocd8Iu$w^BV$e;d+jDV
ze96pB!PAjM6aP4>nw;{pg>htAdO*0uX6B}Y7;#I{%Av_ViNjtDiUGwzpU+lRtl}NY
zqut+$dXe~WE@Nf{YS(8DTf%T!U&uhsVbuSk-9I5TJb<m|bz=-m+Y!@;>mchK{wm5|
zVp$%#{}Q12J%Tk}H7)c|RUSJ1?^giPJOycw+ux}I#eN39vw^nM3VrH*<4moC$r@Y>
z&uq|3A3zDz1gFXlTB}Xq!50>W8DtF4f54zUA<>ol3-7&QbMwjM2lwv{&4@_j+>xVN
zOOmEETKbM_PB&9EKHyK{f*|d=!UZpgZY7dSEyvyJz%wbw@_D<2Rwjw~ye=VV@H8uO
zyK@(#{F(xBWi91GnVys_+Y1m`;vS|g0ZTTG+PL-D#D)&F@_CogORpQ(Dwk9TsZ+zY
z!Qs{~i@11dWWzvgwy#(LP7&4Jexf?@T)!p=y_fHATB>F{<`DJm@$w^JK{(+^Ip;?&
zcKL_yn@Or~&IrBh9doaNy67BEH)0i+J~CTsNDm`-DiA0Pu>Z_W<oG3LWGJLU)ay7A
z+SE;9fSOvo<TifHv*wKUq;{UkogH2HHyb5hXQ^zH!I&6^DC=-n3}D;sI$0}t;=KH>
z&2ZGcMu<FHYX{fz<`H&wZDZy9&B?DHZcsyH3~NpG03Decc?{>+TNdgW6w?_>1=kIR
z@#E8|P}Y}PR+>y)c@MICDIDgk4OXJ*)HMQyMws5HrdL!CaPqu4C<VR##6LAJ8)^Bz
zEP2)3^<{>HiqhIC_D2ZN(54%i9+^h<Fa*dD#k|sCkUa8rG#naTT5tULgjV$@fjNr9
z&n$l@W(FsMH{HJcDJ~xwr!+oQvC+hd>2xVPsgy}4v4SG41N7WO->)Mme!X9B`k?8~
zstX)XN!{-si42)kjmb)B)pI_(M&NEJ+I@IO(FdCRlzokJnK_|wiZ*@fcW~Gva400O
zbnzE!xmbbfTnwyIj#w|~=R3MtUY#G+0|le#8b@J||14**CvHOpZ13mE-SsddGwlq_
z1b7X~j?l;Xx1WntcSE#TZ`Mo}Q+TxRNJ*KF*aeeX1znxj(A@m`#)0XKqU~do@V5Xo
znU*iJp&5`S&@N8z{{A_b1hTL`u=$pdS*zk0&ORy+<6nSvRe5>&(@!*G-^foX*9-Z-
z^Q5{1Cn0uEu_ao8!Lv2sk6_c$mggxIeWGL%e&7`4HYpj|#_z06xmL&7%3DaXt#PrS
z+~22q%a5i!cV+~F&gT7|Kj#GA1=|2>A={9zZzkp!f*l`T?e)VTMfzsu0}4pUGVr~|
zUZ6#+S=IHg)dxfBpUkib9-6ItF(y`|mCL~VuNbJ7ER4t@>+(PQzzev;#(BU;c)6A2
zbAE_6&gmrS!=yFzbX?F6t}&dUqi>p)gBMOOHs3nVg2wQ@7{)h~M6uneT<SCel>p>#
zEMaWhN_qO9;42AjU|VPajKySSL<!0P3{m7@?`=(g%rNi)6jaS9a+VGF)G`3WBw&-@
zdok*SVSf*XYTv;}0|TfSP<%YkfsWMx#>ltfk=%z(Y6MjV=77Xd-z@39jRHE_#<(+3
zVsK$W`;^=Uu%91P@Sn;Z|E_3Sy4Ue%DPYn3kjB{*bfjlN(WUi#a13K~qLQg3x}gC`
zdWZ64RE1`<mB^vI=OF?J_a#nIk{7)CrAb>rj&c_eUT{<I2&at82i{*P?v5{`wSV8M
z*#UU5DdVC!wCj7{>jsgnus;C!lMON>>?Pe+AhR7F>yImm#Ti_N@yVG{z%}S|09YG)
z3Wn?*6^YLrqUnV4BEaoQsix8h4GqQMbTR=f=y^pp_hP+_j7)JjKDkF8@JKvEFiQLS
z;#Xm!28gv-zapmLx0F+9xfAjQC1T2Qesa)tbKFwRfU*G03Q<fN(?Z<u!oYEWI@JUo
z)4HdIHSEqQy_CapX9wX~s4%bf8wo%P`g4LIy@VoV2TR`mV%b(%_|yex(%Hfe7&~c4
z?i!4g+y}eZk$;Jo*1;6O+UoE~%<j1^mNR||#X~|I37~TMg@LbjPtHWv2KaOfIA5{Y
zy5r9P4mtDXOt}M~6`+1wfH43}2A4H~sEew-urwj1PTRABpi`Vs#0CT%NmblP6VC_>
z6DR}R68<~m(I^cV&%z`~tfBl@kvt`Tk9q!l+R!2`L+U6MV125-1sf67?gA9O`vUUW
z7p!b<O$N%#m?8C-vIH-|9U!p`{GbQw@&=Hv38yF~42fG0475lPT}5{95C%s4_e(u5
z<S`OQvC6@I0hF#*Y^UD|_aDL(eN(>%4fh<`{Ao{ncUm4~&N>&DC^w;is=Qt@%#vb0
z963-7w!foh(^faQ*`%1F;)U3fM6y0wgm7T(`~aMuK2?r-9t)02-=kHLRV1#g_3?NQ
zQpbL?$B9d%z<yRf>6~fDkWF<8uxtg$c;sbmOtUQr;)`$#v@ac}xYQPR>um<fDAL18
z-mxpaP8zS~{1SZm@9zO{deks^c}e3Qocv@MyU+Q1Z3MEh82AIpO-<q;s3vzQ@I-UI
z)tfIg(dZ+)v@iF<>!5HczhnEe6&&x-)dg*<8BduDJrKA;k!5WD#)#Q|^G$}lvIKu+
zyYT>A%iK*Q0eM$a44?B|bfJ+YpuDoyEER%1`efnnM$t&M&*FJhmIVT3;4Tzl4zjG{
zj)3g81z)$$Gy~H8APh&5!1E1~TK3KwI844xtSXjkUT`Pgq8n5Kt{<T|=P<RSzZNMp
zL;MBP_qDi4*61@a!Vx)jVk<?nQiXEOXF6<gg(`{M1-NSbxT>f*{&tL0<STLp0s?r{
z3-;7d&7y8AvQXqP#n&7Oz3e{W3+JWwOmo0dt|ZPj0OKBo057f^_!pd0S`{7eTQqS$
z+PyieI-fL*RBS3^jqdfI*QQm1Ig(R=CO#7UXf$@DAt=_Oib~_0Nn88?Y|3i9EGfTx
zF%Rx9H(TqyMrKkMPB)9Vb6g*U+^qeW0&gK*kOb#PYluQR5$4B%)AEhc$pn}eQ35fG
ziMq<BwBsJQL{yfcpS1jCWg$<?o<uybHuc+!IhZP=#O(C<72j%NWRL*UBT}EN<SB|J
zV$L2MDB7@xZafUS6#djX2XJ7Ipoo={$7!#5pc**8gt$Aw_l<*-r@`)YXEw3n8YDK@
z1LpQrv%Ae6p}gsJ-+R6<_7(j0Yhb|XjS<fzOUTuybgWBja)~#F7M&C0{w|y=ixdMH
zpk7$zFG@MWxW$#G68->1@EqoNr^ZSFShJhL_C|{<<EGZLS*~t1A4iJ0nOjtcvmWp*
z*IQ4<G-S+ueg`(|bpT;Zg3#Or=IAAe%`N1jT62HIecb#!181+QEB%N7gjPyt*NhjB
z&tME&C^p{ba-Z90wjAN@7%o;!yzt9~MuA7cVTA2ZQD0$3_GUHcB7xh&^zw|oPLVV&
zQ>C{yKOs4MzC9}y5fKBaOn-^u<A$&(Ap{rwGC0~!!ru$}xyIJEdCIYj)ZX;9=J3n`
z;8z?EMNQ<4`FV1Cii54i`Zojf%)z`udH$Lxb(#sz2Q;WoLSf!@1`QUM;DiSDdP)}!
zPkE-{B=J<g_KsQMhyp@gvM)~;zW~CoB%srrtiY=ZY;}u8ch2bFvu@2UMMn)NGkgBa
z=Ref!QbC+ruf;b=bCbi4X@FN4e0^q!A)Q5`RhG5sqwjIuBr&TefhZpj`W1=agu84i
z$J--=%(37iB!G)x9w!tq`F#@SBzxMJ`6S!$?WjSHjG5`Czg6#7QY&E|BUVDT)Dj^J
zi^vw%5jepcF7R8`gOusY>7Cxl1;qY%m6vZGd|~^HlSQCGfygrsxr#+;DnFFmUaIHt
z3&&&WS=%CExw)+;JAO3}TOKXtQj8G5G=rFc`FDp4A1D~Tsv*^)uZ1x81+8d3g}t=O
zRLd%Y(G!AoJHUN?;Pw+uLndKKU<)u_lj&UlxdSSu-=%2%T#^6#xza%cYdAFxO6A97
z<bE9bLH&ciTT(XsChfv8Re32}LuLxgoF7j1d!Y)%^-ry6)(l%T-0%Jjit3^5P`(xN
zn)XkjHM=E>T*Uk^st^I(z@I-6R=D%&!iM~2IUZ63@9`ZwX{spvzunhkxF;Q7EurNr
z0T~ycQ9WOr0B>4n0pkchGI#`bq?rOXG0Dw_{s$wrVP^jb7mb^w2}2<zaxII(DX#70
zS6QbUY69kK*XEXXpGv-ujU`S(3h#n)D=3ZaJUU!0@lWzmI)yo3s?12O&Wbs7mN>X$
z;#qedJT(Th>GOA)U1({!(|s*+gXYeNLiVkMSBdCFtGzVkO!M1jC~RwCQnmE_a1cyq
z>mT?#Y)fN7xp+rUMikdu$hq}6m|AZtm-Y_x42o-!h2B{)k(Y~!0)7D)J#@M9i+F)J
zfujIA{vePSi5;v0hq(E(x;!6A*Bs%<!J&JNpWL|Gmo0DL-dT=zhDs>--WOR+f;~@x
z5LtRrx<p^P^N~Sn`l`8`E|{`M9}1-X9@7kU4N-J>tzR<uqH0q8+1(V^I;+%so*Ih8
zC+)`!`~Gg3;h>IipbS`oT;Fm@0Es%58A|O3#9v7>WGo-_w&6SAEYUukQMlh*La)j=
zzA>I7J9-Y1A9yR9|7T)z?k(-V9yffXBU_TpiU;qH>lJxIee!YgM_1jIY4)^9ibsO?
znXaf?c<@OaJ$9mqx$U@W2x&xv@suKel>8mU{jyzl|EF0!WIcC6>+RHr1kNp1ELPux
zZaHQw-g<$;B-K~SeZ96?S*wWo2n!J$#?d2~B|+QioiI!GstP!P@HRzsL0n*%B*F&^
z?F5ESA2NOcL!Q#fkStcW)+FSLkbqkw9iftCy2vl6N-0azPsGHy_1y7K*v>#o#vR`w
z<;NB!+|ncjRE$<a$v341r*Cp)D(Hev8U$yCd+h3bZDef}P>54#A1pr(!MZ3bklYg|
zTpp#{SOJ&*M~y>&17YjVVh{{NQR(0#$i@XV?yy34Rb;0jvQTd3W>TyGjpP6i;F8ld
z^;}$S_4O?eH9f{9T5?0M-yyYiIww*}iy>^>`~~a1VCJ+m-vW&iI|0HvhJ+(f`mVuO
zjG#04^ClE9wfx+**WoO}!(ojBk8~s;%i(HDtIh?cmM@`E#KrI{*BT9kHzNMwd)($c
z_CG%nXx#aS&J6zkXqq2{&GM<d#L~fZO2uEk^WHS0y-uf|Wf#6o;I-uw$+<#Hkvs9h
z(Y;@2g=^YJNDIOr2@=Q#gHDlk>1_fY*(-=9j<X}*D9yh#fp!5_@9s}5Sfo}1?>Sy=
zI-jZZw{YW=2#sgnv&%;W8S<)38hbfRhNL$7ihK|bxtB}%Hk`2S)$&HERSIGDvo~K@
z{;U{BLV1Yi>7tntbx?Dow=zL<?RaixLZQ!jCv7H)-r7Rz`9%3<))D1O?G11Z3YfpW
zNBJQ1l}U%c_rL`fMO5EHPa%IhgyX0&Kc4N-?Td<J_tk45yU&7Uh1u@i)e!uV8I^;d
zG@}RFQNeI|i6>I*M~l&~8%pJQ)n61ATHlVJ7V3Ov8=wE}eYdf?4Ko=j0UFzCmf<FS
z#TiEaNyYfup8=iUyvjLh=(YXJ!qL~HR%(i4p?Iuh^hY>0(TZ%Go}wb>x<GbRWt6gR
zg5mHJ-(U+c_s%eIPIP~Gl9<H&XEpa1)mXTCkCS#zQDcFNI_5_NEx?LDU&AepNCl#{
zhtn2Phs19eot&i0ZI{AV(wPvEVppE_AvfhN622e4y~a+5Tb^r*sB3_3J@)=E*aq2`
z^!V`OH8u^V%Yvn+pR|f-!`xJD2{|vDRuQ;lbisNgQo1N>ntc-LpJ4X2J+d*<bTz%O
zjKSHLjLul$p#lm$)()gb&!3>931y5R8msfa{DDiW8(6x;<lH~`cW?OmetD!%q;RiF
z3kccWRfS5`RID-%oG%H>;>F4OCPS<8?|R$@9Y6(>UaHu!aSWHMBLzW>$6^CRV6W(r
zkaH7=6C602^x$L56PO?LJw!)GiBp^7N5pb;6Xjq0{Frs5Hj?)G?aGR!iv?(_HyCQM
zA$&_15B$}4?|bfwWLgv}F|PE)NF8R1mHh2V=Hlc;-q!pno@^VCOmj5^a6Vk8b+sF3
zWsW;c!sU^Xo{<+_-eUa;p-EWE_COtG33H@%Qx)P8)7aA=%DEHRVYs7(n2MC-EF1?S
z2J^KEETp}wAB~eo+orpUy#>DVXCUnKycl;*4is;^+IdoOSy;1=o1McD##k2ip&ZJk
zlwo+j9O}q=AfIHkHSQ3z5<}#>aX1O3WCLt(PWP@?V}%G(2v?IffU3**J|&V2E^??(
z>f2ZQi&h8-LA6AK>vCQMM4sG;y;-Kmn}XpM0Xv6s+<0xbM$|{nt7Isg6@g1HPw<QL
zFxDIt-|dr~K!?UH5t5RA{a$JI5Ga;1?r8ONek*j(8!PZ%Gv%4Ljls0tFIU3J=~AJ8
zae#y_0`;eZ8hR2#d<;v+yCgcC<O~9k(%pSR*(d-_I(m+%e@&5$ZQb}Z6+%XUMrKVU
zNeWQkg25~w1NxR4K`c$ji!tUD1l_75RM3)wHP|=@#+1^%KT{bYivo$G^i}oN6e5J=
z0+XPIsrNt<j+N&1#EBDrx(7;dg;>gL|3z{UIR~p_9ES*@#`d3uvf?6yq+^@%ZP`fN
zcm1(n<&<TVAeWK9K|)CB<-hH<sg^Y+$aV>OW;|+Eh1=J^eC|$KIxXCSwcI-tY8R7l
zYqdY@%{9^O74htDWMUmb=xi-}Zg6hQgO7Q;YO&rz^#TxLPN*J;p>4#22AI6@8cW?v
zMjsO-;YvfLpjpNgZr?Zy_Ke=Dhdry}F=DFLr{ZG9Cvou5zS?*0xoN74oItOAlf`dN
z=NuC#N^z(r#QSU#c&j%D@`<?4z#0K%H>7|mRae&ktm2=9dms<xKO@w+2_0W*2+oLg
zJ(pA;1UAC}0p2((H*df%5DjU3PlFCCHplNB?gz>e&+a5FQo#gYS8i{IhjER2=5{G%
zjT6w$7eI^0b;Y0EMV<l2Vf97b+}1!mc|2Yz+e-Kz$X5qp?<&~%WcANV3X@C8vkiON
zd7OqZuu3rRLQR}D)y^!X=epSJPC`oJEakInw7-BU>3x@E2^*pyGUuCbLp+uM;wtqI
z4D4{;If7flQ%q_-20NcpQTXIu-LuP(D{p9s-Q-E17!qy1sByr(vj`s4N#Wr38cMAE
zIYI+=Yu^iM7^0?N_D+Fn6OJ!)cB*U{{H6xKKYr-Gs<<>12~)T)ADu2_As8FuooXwW
z&(;mXoMt90@4+1JU+&h8o!??aQmuy}+}^pSq;Fje@w^S}Nr8%uRx5PcePw85{xVtS
zxar>Q7R_a((3@ImRuSP_nU(dJ_M>v=))ky&o(}1olU?$0lKc04qxXZYw|4Z(-H!zB
zsv{c&a2RgXl;&&)y97`iCyka^N%BOyE=DwZC0gr3fwG7_=SMy>N4_L&J4PP)q_w6e
zlG6>Ia7+8XH}lixO|h}R-}lB>F5B1Yy9FYLpZr52xt?RyaC>bqdL20=21;<t`039h
z-Mf<*B(2KXCk{M#>PcP=N8NU?H@r@0>DU{r^KRF8x7^SqUiCObm`qlIQ7fNv;BK0_
zd-s_HBvfoyuxW=p@nylP>=nj-{3oR+0oK#gL5sr7$6mje3V(GB9OOrvnZpI}m0GZ#
z5X*IW3mn=0E~TEYz_ihW`uj=hix+r0&VTs9k)410mfg7^HWE_xU?2mr0)6E0;+FYz
zYL$)TM~!ErVB6#3r0&@Gwi#GQp|)2+(kl=(DFlW;JCLzI&{?x3ZGW=G-{V;1i{}u(
za*O+_yh3S#WN?J5TV3xbGx*&M^PqRpJ{tWh7yTmcRZBq)+ag8S;GznHJjqw5y$U`{
zH|SSv!3<z91^!_rp^OT2raFUMD_mNewDtqRHgw=x$kaYS7+9O1&q_o}YHRVlIjDya
z+qQt*w~!ca<%@qic*>q*>9F=`RFVHvl%rdBHN!lUwni{SMy3~woSgu6*a{)Iqa!Iw
zQUz*vGi;H$jsS6DQd8bgG_DbgG-gLAg5U_oN&m=sUi7X>BR?_2L~rZ|K$^TPpO?tF
zyK)pki2ZK{u=h3tA@`U-6!NEO$}pm3d&`JV{S^5~-~?`}JqKZ??MTSK3^1$_pzILw
zpM@77DZX=Xu0)oCz<3gf@71|`*aBz5xIb_-EUTqaRjT+*u4=+B&`(+bybo)Db`>Fq
zr}-%G+-+v&&?hWC!V(Mqi9#;BR}N>+e7se)%V*Dc;5<v%3M&Jb586W%_HZ3cAAQ{e
z_JahPrE|m{dwbd@{MiTX2u!Ku=+Wfx(^Mq@RV(`$nQ7AM<$w{}bjq~M+QI>7ZIToE
zEl3_1{1ETt$fw8b?2Ib{*RLF1kVeh~m#r{qveS_{H^TlxZcM{4O;L~s46&L34kmVp
zJVZwx*^7+Ie>{2nqRnfoCjbIhF@Y56*V$>B-op{$rc>G<1k+8YP58=OzNvTy^sWzt
zR)S6|qdc5RDQSx<`u63a&FMI&I!^Xb964>6EX-%Zq~T@%JY{v)48gbp%v`ND*v~n5
zswz2IJEX$(qn`}e8w1bbp$?B#1Lx<bo5uMmT9$a&%fuU%oY!RHNJgU{<D<tci9J9(
zcZ2CsuxggDJyq8Gi={U1oVkXu`16SbcvfnCDCk$FO_G5!5y%aAn#t0r^>EK(Ho(9J
zT6-@^j*C+c^f!KDVSWohi>t-b2&}4TQ}~i|iyU_Cv7uHz8dhz5edv_Odu)n%*A!&l
z{x<4QX%dpK0P16OwD-N4zHaL9?^1vg{#9zQQnb1ekgt2(y61QYBdI#yg=z|G;Em68
z-%()b3(r5Z`mn<m4qv@UEN97>JM4)xt+DR+%`kbZm6zRQ5mNCeV{7``0|`qw0=p$L
zlC_CWH&I0?#KjTiR8io(p5ksqYg6GEZ<)S>_U9-3D5DYLQlSw9|KdW>%0BiJfdyAx
zb#LJMV*lD4<?gI@f4lc|Q<a65*D4`aVV}iyZp--P3zC9=i`P;5XWgHfgmZ?Re||Cu
z`s0KdP^cR;JR3zY!GzLHA6Pa$&7j7YO2J6ofDN|~=Jc3-$M|6U(tiO|K%@suxqTR=
q%f&VaVd;avq;#$gnGWg5u2|NKzj4Sj7qvjZhnkX>Vx_!g*na^bK<T*v

literal 33906
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
Nq{ZdM@<nt%{vVmg?xp|$

diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index 81002b2a5f85..151069a4cfd0 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -181,8 +181,8 @@ Congratulations
 You just completed your first CodeIgniter4 application!
 
 The image underneath shows your project's **app** folder,
-with all of the files that you created in green.
-The two modified configuration files (Database & Routes) are not shown.
+with all of the files that you created in red.
+The two modified configuration files (**Config/Routes.php** & **Config/Filters.php**) are not shown.
 
 .. image:: ../images/tutorial9.png
     :align: left

From 85e0d8b80ca9ef4f1095b4763e96d0b40cb9e48d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Nov 2021 16:33:48 +0900
Subject: [PATCH 0638/2325] docs: expand the text area

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

diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index 151069a4cfd0..b4506b4dc322 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -42,7 +42,7 @@ the slug from our title in the model. Create a new view at
         <input type="input" name="title" /><br />
 
         <label for="body">Text</label>
-        <textarea name="body"></textarea><br />
+        <textarea name="body" cols="45" rows="4"></textarea><br />
 
         <input type="submit" name="submit" value="Create news item" />
     </form>

From 7f01e12bd6b26d5f6272857b7415cdd3c4e82f4a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Nov 2021 19:54:04 +0900
Subject: [PATCH 0639/2325] docs: remove duplicated return

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

diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
index 0589ea21913e..af96bdf3522e 100644
--- a/user_guide_src/source/tutorial/news_section.rst
+++ b/user_guide_src/source/tutorial/news_section.rst
@@ -111,7 +111,7 @@ following code to your model.
             return $this->findAll();
         }
 
-        return return $this->where(['slug' => $slug])->first();
+        return $this->where(['slug' => $slug])->first();
     }
 
 With this code, you can perform two different queries. You can get all

From 88aeb16a15c02de76525dcb51b4b54f4812d6485 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Nov 2021 21:50:18 +0900
Subject: [PATCH 0640/2325] chore: add note to update to the latest version

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 9536a359300b..135bd52b3fe9 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -7,9 +7,15 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to fill out this bug report! Before you begin, please
-        ensure that there are no existing issues, whether still open or closed, related
-        to your report. If there is, your report will be closed promptly.
+        Thanks for taking the time to fill out this bug report!
+
+        Before you begin, **please ensure that there are no existing issues,
+        whether still open or closed, related to your report**.
+        If there is, your report will be closed promptly.
+
+        And if you are not using the [latest version](https://github.com/codeigniter4/CodeIgniter4/releases) of CodeIgniter, please update.
+
+        ---
 
   - type: dropdown
     id: php-version

From 699129bd84238a35fb93ab54efc62d085fb5c4af Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Wed, 27 Oct 2021 07:05:41 +0200
Subject: [PATCH 0641/2325] Add variable $op, in order to not alter variable $k

Conceptually cleaner, and will be helpful for the next commit.
---
 system/Database/BaseBuilder.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index f87f21bf7308..a2c407194ed2 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -666,9 +666,9 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
                 $bind = $this->setBind($k, $v, $escape);
 
                 if (empty($op)) {
-                    $k .= ' =';
+                    $op = ' =';
                 } else {
-                    $k .= " {$op}";
+                    $op = " {$op}";
                 }
 
                 if ($v instanceof Closure) {
@@ -679,13 +679,16 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
                 }
             } elseif (! $this->hasOperator($k) && $qbKey !== 'QBHaving') {
                 // value appears not to have been set, assign the test to IS NULL
-                $k .= ' IS NULL';
+                $op = ' IS NULL';
             } elseif (preg_match('/\s*(!?=|<>|IS(?:\s+NOT)?)\s*$/i', $k, $match, PREG_OFFSET_CAPTURE)) {
-                $k = substr($k, 0, $match[0][1]) . ($match[1][0] === '=' ? ' IS NULL' : ' IS NOT NULL');
+                $k  = substr($k, 0, $match[0][1]);
+                $op = $match[1][0] === '=' ? ' IS NULL' : ' IS NOT NULL';
+            } else {
+                $op = '';
             }
 
             $this->{$qbKey}[] = [
-                'condition' => $prefix . $k . $v,
+                'condition' => $prefix . $k . $op . $v,
                 'escape'    => $escape,
             ];
         }

From 223ca28400a95594490052b032e1a921237138fb Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Wed, 27 Oct 2021 07:34:15 +0200
Subject: [PATCH 0642/2325] Do not inappropriately register bind when the value
 is a closure

Such closure just has nothing to do in the $binds array.

The code currently works because the binds compiler determines the binds to apply not by looking at the $binds array, but by looking at the query string, so it doesn't reach the closure.

If we modify the binds compiler to instead look at the $binds array (which makes more sense), it would attempt to replace this registered named bind in the query string, and trying to replace with a closure would trigger a "cannot cast to string" error.
---
 system/Database/BaseBuilder.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index a2c407194ed2..51066398be33 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -663,8 +663,6 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
                     }
                 }
 
-                $bind = $this->setBind($k, $v, $escape);
-
                 if (empty($op)) {
                     $op = ' =';
                 } else {
@@ -675,7 +673,8 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
                     $builder = $this->cleanClone();
                     $v       = '(' . str_replace("\n", ' ', $v($builder)->getCompiledSelect()) . ')';
                 } else {
-                    $v = " :{$bind}:";
+                    $bind = $this->setBind($k, $v, $escape);
+                    $v    = " :{$bind}:";
                 }
             } elseif (! $this->hasOperator($k) && $qbKey !== 'QBHaving') {
                 // value appears not to have been set, assign the test to IS NULL

From 0ae8a670b2b90a89745c201f3846496b25128869 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Wed, 27 Oct 2021 07:41:15 +0200
Subject: [PATCH 0643/2325] Code simplification

We can simply merge these two blocks.
---
 system/Database/BaseBuilder.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 51066398be33..f393c6f3874d 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -661,12 +661,9 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
                     if (substr($k, -1 * strlen($op)) === $op) {
                         $k = rtrim(strrev(preg_replace(strrev('/' . $op . '/'), strrev(''), strrev($k), 1)));
                     }
-                }
-
-                if (empty($op)) {
-                    $op = ' =';
-                } else {
                     $op = " {$op}";
+                } else {
+                    $op = ' =';
                 }
 
                 if ($v instanceof Closure) {

From abd0f7a93f314d4f3ce35fe5aac34eb4541db9f9 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Wed, 27 Oct 2021 07:48:56 +0200
Subject: [PATCH 0644/2325] Another code simplification

Exact same effect: this complicated code was for replacing the last occurrence (there is no built-in function for this), and there is an englobing condition to ensure we replace the substring $op only if it is at the very end of $k.

As a bonus, previous code was missing a preg_quote(), but we no longer need it.
---
 system/Database/BaseBuilder.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index f393c6f3874d..0d0c21e75b3f 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -658,8 +658,8 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
 
                     $op = trim(current($op));
 
-                    if (substr($k, -1 * strlen($op)) === $op) {
-                        $k = rtrim(strrev(preg_replace(strrev('/' . $op . '/'), strrev(''), strrev($k), 1)));
+                    if (substr($k, -strlen($op)) === $op) {
+                        $k = rtrim(substr($k, 0, -strlen($op)));
                     }
                     $op = " {$op}";
                 } else {

From 3e8903aa306e0cb6c3638b054299eda22b53881f Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Wed, 27 Oct 2021 07:58:01 +0200
Subject: [PATCH 0645/2325] Do not append $op if it has not been removed from
 $k

If getOperator() found an $op, but it is not at the very end of $k, it does not get removed from $k.

Previous code was nevertheless appending $op, so it got repeated a second time in the result, which is obviously wrong.
---
 system/Database/BaseBuilder.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 0d0c21e75b3f..e98084fcbec4 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -659,9 +659,11 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
                     $op = trim(current($op));
 
                     if (substr($k, -strlen($op)) === $op) {
-                        $k = rtrim(substr($k, 0, -strlen($op)));
+                        $k  = rtrim(substr($k, 0, -strlen($op)));
+                        $op = " {$op}";
+                    } else {
+                        $op = '';
                     }
-                    $op = " {$op}";
                 } else {
                     $op = ' =';
                 }

From 01dfc65437c8972faa4ec3d2f17fec228e91f70f Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Wed, 27 Oct 2021 07:59:09 +0200
Subject: [PATCH 0646/2325] Adding a space in query

This space isn't mandatory, and the query string gets normalized later, adding this space, but let's make it cleanly in the first place.
---
 system/Database/BaseBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index e98084fcbec4..b5088b23acea 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -670,7 +670,7 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
 
                 if ($v instanceof Closure) {
                     $builder = $this->cleanClone();
-                    $v       = '(' . str_replace("\n", ' ', $v($builder)->getCompiledSelect()) . ')';
+                    $v       = ' (' . str_replace("\n", ' ', $v($builder)->getCompiledSelect()) . ')';
                 } else {
                     $bind = $this->setBind($k, $v, $escape);
                     $v    = " :{$bind}:";

From 65b8569f0b1dd9de816b7ed197b9683dd9f3f9fd Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Thu, 28 Oct 2021 00:34:30 +0200
Subject: [PATCH 0647/2325] Micro-optimization

strtr() is faster for single-character replacements.
---
 system/Database/BaseBuilder.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index b5088b23acea..0a720cf33036 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -670,7 +670,7 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
 
                 if ($v instanceof Closure) {
                     $builder = $this->cleanClone();
-                    $v       = ' (' . str_replace("\n", ' ', $v($builder)->getCompiledSelect()) . ')';
+                    $v       = ' (' . strtr($v($builder)->getCompiledSelect(), "\n", ' ') . ')';
                 } else {
                     $bind = $this->setBind($k, $v, $escape);
                     $v    = " :{$bind}:";
@@ -842,7 +842,7 @@ protected function _whereIn(?string $key = null, $values = null, bool $not = fal
 
         if ($values instanceof Closure) {
             $builder = $this->cleanClone();
-            $ok      = str_replace("\n", ' ', $values($builder)->getCompiledSelect());
+            $ok      = strtr($values($builder)->getCompiledSelect(), "\n", ' ');
         } else {
             $whereIn = array_values($values);
             $ok      = $this->setBind($ok, $whereIn, $escape);

From 68ad98764be764384378ceaed0bce49adb5d4317 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Sat, 30 Oct 2021 08:18:34 +0200
Subject: [PATCH 0648/2325] Add unit test for the case "$v === null and $k has
 operator"

For this code path: "elseif (preg_match('/\s*(!?=|<>|IS(?:\s+NOT)?)\s*$/i', $k ..."

The above code path "elseif (! $this->hasOperator($k) ..." is covered in testOrWhereInClosure() and testOrWhereNotInClosure().
---
 tests/system/Database/Builder/WhereTest.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php
index 653c837058aa..e58af53cadab 100644
--- a/tests/system/Database/Builder/WhereTest.php
+++ b/tests/system/Database/Builder/WhereTest.php
@@ -111,6 +111,22 @@ public function testWhereAssociateArray()
         $this->assertSame($expectedBinds, $builder->getBinds());
     }
 
+    public function testWhereAssociateArrayKeyHasEqualValueIsNull()
+    {
+        $builder = $this->db->table('users');
+
+        $where = [
+            'deleted_at =' => null,
+        ];
+
+        $expectedSQL   = 'SELECT * FROM "users" WHERE "deleted_at" IS NULL';
+        $expectedBinds = [];
+
+        $builder->where($where);
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
     public function testWhereCustomString()
     {
         $builder = $this->db->table('jobs');

From df653689ec0c162f500bac2234cdf5c23cb05d7c Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sat, 6 Nov 2021 06:25:42 +0700
Subject: [PATCH 0649/2325] [Rector] Remove FixClassCaseSensitivityNameRector

Removed in latest rector dev-main
---
 rector.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/rector.php b/rector.php
index 77f8124c7d6f..4a5fde83a45c 100644
--- a/rector.php
+++ b/rector.php
@@ -21,7 +21,6 @@
 use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector;
-use Rector\CodeQuality\Rector\Name\FixClassCaseSensitivityNameRector;
 use Rector\CodeQuality\Rector\Return_\SimplifyUselessVariableRector;
 use Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector;
 use Rector\CodingStyle\Rector\ClassMethod\FuncGetArgsToVariadicParamRector;
@@ -141,6 +140,5 @@
     $services->set(SimplifyRegexPatternRector::class);
     $services->set(FuncGetArgsToVariadicParamRector::class);
     $services->set(MakeInheritedMethodVisibilitySameAsParentRector::class);
-    $services->set(FixClassCaseSensitivityNameRector::class);
     $services->set(SimplifyEmptyArrayCheckRector::class);
 };

From 9c712aae35ffb9ee26618105ea56cb72a9ef9db0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 7 Nov 2021 12:05:58 +0900
Subject: [PATCH 0650/2325] docs: fix RST format

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

diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst
index 6f373e9aafa4..6a70af411ce0 100644
--- a/user_guide_src/source/libraries/caching.rst
+++ b/user_guide_src/source/libraries/caching.rst
@@ -159,7 +159,7 @@ Class Reference
         $cache->deleteMatching('*_suffix'); // deletes all items of which keys end with "_suffix"
 
     For more information on glob-style syntax, please see
-        `https://en.wikipedia.org/wiki/Glob_(programming) <https://en.wikipedia.org/wiki/Glob_(programming)#Syntax>`_.
+    `https://en.wikipedia.org/wiki/Glob_(programming) <https://en.wikipedia.org/wiki/Glob_(programming)#Syntax>`_.
 
 .. php:method:: increment($key[, $offset = 1]): mixed
 

From 8b1a78669c81ee7b5865057111fb2dc36790ddf4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 7 Nov 2021 18:41:29 +0900
Subject: [PATCH 0651/2325] docs: fix by review

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/libraries/caching.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst
index 6a70af411ce0..d9c79289c747 100644
--- a/user_guide_src/source/libraries/caching.rst
+++ b/user_guide_src/source/libraries/caching.rst
@@ -159,7 +159,7 @@ Class Reference
         $cache->deleteMatching('*_suffix'); // deletes all items of which keys end with "_suffix"
 
     For more information on glob-style syntax, please see
-    `https://en.wikipedia.org/wiki/Glob_(programming) <https://en.wikipedia.org/wiki/Glob_(programming)#Syntax>`_.
+    `Glob (programming) <https://en.wikipedia.org/wiki/Glob_(programming)#Syntax>`_.
 
 .. php:method:: increment($key[, $offset = 1]): mixed
 

From 8839f74ba5d2147f214a7b61010cf6a598500876 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 3 Nov 2021 09:44:34 +0800
Subject: [PATCH 0652/2325] Optimize CreditCardRulesTest

---
 .../system/Validation/CreditCardRulesTest.php | 504 +++++++++---------
 1 file changed, 243 insertions(+), 261 deletions(-)

diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php
index 7610ea4ee966..11725f3d4665 100644
--- a/tests/system/Validation/CreditCardRulesTest.php
+++ b/tests/system/Validation/CreditCardRulesTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Services;
+use Generator;
 use Tests\Support\Validation\TestRules;
 
 /**
@@ -23,9 +24,9 @@ final class CreditCardRulesTest extends CIUnitTestCase
     /**
      * @var Validation
      */
-    protected $validation;
+    private $validation;
 
-    protected $config = [
+    private $config = [
         'ruleSets' => [
             Rules::class,
             FormatRules::class,
@@ -48,29 +49,15 @@ protected function setUp(): void
         parent::setUp();
         $this->validation = new Validation((object) $this->config, Services::renderer());
         $this->validation->reset();
-
-        $_FILES = [];
     }
 
-    // Credit Card Rules
-
     /**
      * @dataProvider creditCardProvider
-     *
-     * @param string      $type
-     * @param string|null $number
-     * @param bool        $expected
      */
-    public function testValidCCNumber($type, $number, $expected = false)
+    public function testValidCCNumber(string $type, ?string $number, bool $expected): void
     {
-        $data = [
-            'cc' => $number,
-        ];
-
-        $this->validation->setRules([
-            'cc' => "valid_cc_number[{$type}]",
-        ]);
-
+        $data = ['cc' => $number];
+        $this->validation->setRules(['cc' => "valid_cc_number[{$type}]"]);
         $this->assertSame($expected, $this->validation->run($data));
     }
 
@@ -78,12 +65,10 @@ public function testValidCCNumber($type, $number, $expected = false)
      * Cards shown are test cards found around the web.
      *
      * @see https://www.paypalobjects.com/en_US/vhelp/paypalmanager_help/credit_card_numbers.htm
-     *
-     * @return array
      */
-    public function creditCardProvider()
+    public function creditCardProvider(): Generator
     {
-        return [
+        yield from [
             'null_test' => [
                 'amex',
                 null,
@@ -91,7 +76,7 @@ public function creditCardProvider()
             ],
             'random_test' => [
                 'amex',
-                $this->generateCardNum('37', 16),
+                $this->generateCardNumber('37', 16),
                 false,
             ],
             'invalid_type' => [
@@ -191,1075 +176,1072 @@ public function creditCardProvider()
             ],
             'unionpay1' => [
                 'unionpay',
-                $this->generateCardNum(62, 16),
+                $this->generateCardNumber(62, 16),
                 true,
             ],
             'unionpay2' => [
                 'unionpay',
-                $this->generateCardNum(62, 17),
+                $this->generateCardNumber(62, 17),
                 true,
             ],
             'unionpay3' => [
                 'unionpay',
-                $this->generateCardNum(62, 18),
+                $this->generateCardNumber(62, 18),
                 true,
             ],
             'unionpay4' => [
                 'unionpay',
-                $this->generateCardNum(62, 19),
+                $this->generateCardNumber(62, 19),
                 true,
             ],
             'unionpay5' => [
                 'unionpay',
-                $this->generateCardNum(63, 19),
+                $this->generateCardNumber(63, 19),
                 false,
             ],
             'carteblanche1' => [
                 'carteblanche',
-                $this->generateCardNum(300, 14),
+                $this->generateCardNumber(300, 14),
                 true,
             ],
             'carteblanche2' => [
                 'carteblanche',
-                $this->generateCardNum(301, 14),
+                $this->generateCardNumber(301, 14),
                 true,
             ],
             'carteblanche3' => [
                 'carteblanche',
-                $this->generateCardNum(302, 14),
+                $this->generateCardNumber(302, 14),
                 true,
             ],
             'carteblanche4' => [
                 'carteblanche',
-                $this->generateCardNum(303, 14),
+                $this->generateCardNumber(303, 14),
                 true,
             ],
             'carteblanche5' => [
                 'carteblanche',
-                $this->generateCardNum(304, 14),
+                $this->generateCardNumber(304, 14),
                 true,
             ],
             'carteblanche6' => [
                 'carteblanche',
-                $this->generateCardNum(305, 14),
+                $this->generateCardNumber(305, 14),
                 true,
             ],
             'carteblanche7' => [
                 'carteblanche',
-                $this->generateCardNum(306, 14),
+                $this->generateCardNumber(306, 14),
                 false,
             ],
             'dinersclub3' => [
                 'dinersclub',
-                $this->generateCardNum(300, 14),
+                $this->generateCardNumber(300, 14),
                 true,
             ],
             'dinersclub4' => [
                 'dinersclub',
-                $this->generateCardNum(301, 14),
+                $this->generateCardNumber(301, 14),
                 true,
             ],
             'dinersclub5' => [
                 'dinersclub',
-                $this->generateCardNum(302, 14),
+                $this->generateCardNumber(302, 14),
                 true,
             ],
             'dinersclub6' => [
                 'dinersclub',
-                $this->generateCardNum(303, 14),
+                $this->generateCardNumber(303, 14),
                 true,
             ],
             'dinersclub7' => [
                 'dinersclub',
-                $this->generateCardNum(304, 14),
+                $this->generateCardNumber(304, 14),
                 true,
             ],
             'dinersclub8' => [
                 'dinersclub',
-                $this->generateCardNum(305, 14),
+                $this->generateCardNumber(305, 14),
                 true,
             ],
             'dinersclub9' => [
                 'dinersclub',
-                $this->generateCardNum(309, 14),
+                $this->generateCardNumber(309, 14),
                 true,
             ],
             'dinersclub10' => [
                 'dinersclub',
-                $this->generateCardNum(36, 14),
+                $this->generateCardNumber(36, 14),
                 true,
             ],
             'dinersclub11' => [
                 'dinersclub',
-                $this->generateCardNum(38, 14),
+                $this->generateCardNumber(38, 14),
                 true,
             ],
             'dinersclub12' => [
                 'dinersclub',
-                $this->generateCardNum(39, 14),
+                $this->generateCardNumber(39, 14),
                 true,
             ],
             'dinersclub13' => [
                 'dinersclub',
-                $this->generateCardNum(54, 14),
+                $this->generateCardNumber(54, 14),
                 true,
             ],
             'dinersclub14' => [
                 'dinersclub',
-                $this->generateCardNum(55, 14),
+                $this->generateCardNumber(55, 14),
                 true,
             ],
             'dinersclub15' => [
                 'dinersclub',
-                $this->generateCardNum(300, 16),
+                $this->generateCardNumber(300, 16),
                 true,
             ],
             'dinersclub16' => [
                 'dinersclub',
-                $this->generateCardNum(301, 16),
+                $this->generateCardNumber(301, 16),
                 true,
             ],
             'dinersclub17' => [
                 'dinersclub',
-                $this->generateCardNum(302, 16),
+                $this->generateCardNumber(302, 16),
                 true,
             ],
             'dinersclub18' => [
                 'dinersclub',
-                $this->generateCardNum(303, 16),
+                $this->generateCardNumber(303, 16),
                 true,
             ],
             'dinersclub19' => [
                 'dinersclub',
-                $this->generateCardNum(304, 16),
+                $this->generateCardNumber(304, 16),
                 true,
             ],
             'dinersclub20' => [
                 'dinersclub',
-                $this->generateCardNum(305, 16),
+                $this->generateCardNumber(305, 16),
                 true,
             ],
             'dinersclub21' => [
                 'dinersclub',
-                $this->generateCardNum(309, 16),
+                $this->generateCardNumber(309, 16),
                 true,
             ],
             'dinersclub22' => [
                 'dinersclub',
-                $this->generateCardNum(36, 16),
+                $this->generateCardNumber(36, 16),
                 true,
             ],
             'dinersclub23' => [
                 'dinersclub',
-                $this->generateCardNum(38, 16),
+                $this->generateCardNumber(38, 16),
                 true,
             ],
             'dinersclub24' => [
                 'dinersclub',
-                $this->generateCardNum(39, 16),
+                $this->generateCardNumber(39, 16),
                 true,
             ],
             'dinersclub25' => [
                 'dinersclub',
-                $this->generateCardNum(54, 16),
+                $this->generateCardNumber(54, 16),
                 true,
             ],
             'dinersclub26' => [
                 'dinersclub',
-                $this->generateCardNum(55, 16),
+                $this->generateCardNumber(55, 16),
                 true,
             ],
             'discover3' => [
                 'discover',
-                $this->generateCardNum(6011, 16),
+                $this->generateCardNumber(6011, 16),
                 true,
             ],
             'discover4' => [
                 'discover',
-                $this->generateCardNum(622, 16),
+                $this->generateCardNumber(622, 16),
                 true,
             ],
             'discover5' => [
                 'discover',
-                $this->generateCardNum(644, 16),
+                $this->generateCardNumber(644, 16),
                 true,
             ],
             'discover6' => [
                 'discover',
-                $this->generateCardNum(645, 16),
+                $this->generateCardNumber(645, 16),
                 true,
             ],
             'discover7' => [
                 'discover',
-                $this->generateCardNum(656, 16),
+                $this->generateCardNumber(656, 16),
                 true,
             ],
             'discover8' => [
                 'discover',
-                $this->generateCardNum(647, 16),
+                $this->generateCardNumber(647, 16),
                 true,
             ],
             'discover9' => [
                 'discover',
-                $this->generateCardNum(648, 16),
+                $this->generateCardNumber(648, 16),
                 true,
             ],
             'discover10' => [
                 'discover',
-                $this->generateCardNum(649, 16),
+                $this->generateCardNumber(649, 16),
                 true,
             ],
             'discover11' => [
                 'discover',
-                $this->generateCardNum(65, 16),
+                $this->generateCardNumber(65, 16),
                 true,
             ],
             'discover12' => [
                 'discover',
-                $this->generateCardNum(6011, 19),
+                $this->generateCardNumber(6011, 19),
                 true,
             ],
             'discover13' => [
                 'discover',
-                $this->generateCardNum(622, 19),
+                $this->generateCardNumber(622, 19),
                 true,
             ],
             'discover14' => [
                 'discover',
-                $this->generateCardNum(644, 19),
+                $this->generateCardNumber(644, 19),
                 true,
             ],
             'discover15' => [
                 'discover',
-                $this->generateCardNum(645, 19),
+                $this->generateCardNumber(645, 19),
                 true,
             ],
             'discover16' => [
                 'discover',
-                $this->generateCardNum(656, 19),
+                $this->generateCardNumber(656, 19),
                 true,
             ],
             'discover17' => [
                 'discover',
-                $this->generateCardNum(647, 19),
+                $this->generateCardNumber(647, 19),
                 true,
             ],
             'discover18' => [
                 'discover',
-                $this->generateCardNum(648, 19),
+                $this->generateCardNumber(648, 19),
                 true,
             ],
             'discover19' => [
                 'discover',
-                $this->generateCardNum(649, 19),
+                $this->generateCardNumber(649, 19),
                 true,
             ],
             'discover20' => [
                 'discover',
-                $this->generateCardNum(65, 19),
+                $this->generateCardNumber(65, 19),
                 true,
             ],
             'interpayment1' => [
                 'interpayment',
-                $this->generateCardNum(4, 16),
+                $this->generateCardNumber(4, 16),
                 true,
             ],
             'interpayment2' => [
                 'interpayment',
-                $this->generateCardNum(4, 17),
+                $this->generateCardNumber(4, 17),
                 true,
             ],
             'interpayment3' => [
                 'interpayment',
-                $this->generateCardNum(4, 18),
+                $this->generateCardNumber(4, 18),
                 true,
             ],
             'interpayment4' => [
                 'interpayment',
-                $this->generateCardNum(4, 19),
+                $this->generateCardNumber(4, 19),
                 true,
             ],
             'jcb1' => [
                 'jcb',
-                $this->generateCardNum(352, 16),
+                $this->generateCardNumber(352, 16),
                 true,
             ],
             'jcb2' => [
                 'jcb',
-                $this->generateCardNum(353, 16),
+                $this->generateCardNumber(353, 16),
                 true,
             ],
             'jcb3' => [
                 'jcb',
-                $this->generateCardNum(354, 16),
+                $this->generateCardNumber(354, 16),
                 true,
             ],
             'jcb4' => [
                 'jcb',
-                $this->generateCardNum(355, 16),
+                $this->generateCardNumber(355, 16),
                 true,
             ],
             'jcb5' => [
                 'jcb',
-                $this->generateCardNum(356, 16),
+                $this->generateCardNumber(356, 16),
                 true,
             ],
             'jcb6' => [
                 'jcb',
-                $this->generateCardNum(357, 16),
+                $this->generateCardNumber(357, 16),
                 true,
             ],
             'jcb7' => [
                 'jcb',
-                $this->generateCardNum(358, 16),
+                $this->generateCardNumber(358, 16),
                 true,
             ],
             'maestro1' => [
                 'maestro',
-                $this->generateCardNum(50, 12),
+                $this->generateCardNumber(50, 12),
                 true,
             ],
             'maestro2' => [
                 'maestro',
-                $this->generateCardNum(56, 12),
+                $this->generateCardNumber(56, 12),
                 true,
             ],
             'maestro3' => [
                 'maestro',
-                $this->generateCardNum(57, 12),
+                $this->generateCardNumber(57, 12),
                 true,
             ],
             'maestro4' => [
                 'maestro',
-                $this->generateCardNum(58, 12),
+                $this->generateCardNumber(58, 12),
                 true,
             ],
             'maestro5' => [
                 'maestro',
-                $this->generateCardNum(59, 12),
+                $this->generateCardNumber(59, 12),
                 true,
             ],
             'maestro6' => [
                 'maestro',
-                $this->generateCardNum(60, 12),
+                $this->generateCardNumber(60, 12),
                 true,
             ],
             'maestro7' => [
                 'maestro',
-                $this->generateCardNum(61, 12),
+                $this->generateCardNumber(61, 12),
                 true,
             ],
             'maestro8' => [
                 'maestro',
-                $this->generateCardNum(62, 12),
+                $this->generateCardNumber(62, 12),
                 true,
             ],
             'maestro9' => [
                 'maestro',
-                $this->generateCardNum(63, 12),
+                $this->generateCardNumber(63, 12),
                 true,
             ],
             'maestro10' => [
                 'maestro',
-                $this->generateCardNum(64, 12),
+                $this->generateCardNumber(64, 12),
                 true,
             ],
             'maestro11' => [
                 'maestro',
-                $this->generateCardNum(65, 12),
+                $this->generateCardNumber(65, 12),
                 true,
             ],
             'maestro12' => [
                 'maestro',
-                $this->generateCardNum(66, 12),
+                $this->generateCardNumber(66, 12),
                 true,
             ],
             'maestro13' => [
                 'maestro',
-                $this->generateCardNum(67, 12),
+                $this->generateCardNumber(67, 12),
                 true,
             ],
             'maestro14' => [
                 'maestro',
-                $this->generateCardNum(68, 12),
+                $this->generateCardNumber(68, 12),
                 true,
             ],
             'maestro15' => [
                 'maestro',
-                $this->generateCardNum(69, 12),
+                $this->generateCardNumber(69, 12),
                 true,
             ],
             'maestro16' => [
                 'maestro',
-                $this->generateCardNum(50, 13),
+                $this->generateCardNumber(50, 13),
                 true,
             ],
             'maestro17' => [
                 'maestro',
-                $this->generateCardNum(56, 13),
+                $this->generateCardNumber(56, 13),
                 true,
             ],
             'maestro18' => [
                 'maestro',
-                $this->generateCardNum(57, 13),
+                $this->generateCardNumber(57, 13),
                 true,
             ],
             'maestro19' => [
                 'maestro',
-                $this->generateCardNum(58, 13),
+                $this->generateCardNumber(58, 13),
                 true,
             ],
             'maestro20' => [
                 'maestro',
-                $this->generateCardNum(59, 13),
+                $this->generateCardNumber(59, 13),
                 true,
             ],
             'maestro21' => [
                 'maestro',
-                $this->generateCardNum(60, 13),
+                $this->generateCardNumber(60, 13),
                 true,
             ],
             'maestro22' => [
                 'maestro',
-                $this->generateCardNum(61, 13),
+                $this->generateCardNumber(61, 13),
                 true,
             ],
             'maestro23' => [
                 'maestro',
-                $this->generateCardNum(62, 13),
+                $this->generateCardNumber(62, 13),
                 true,
             ],
             'maestro24' => [
                 'maestro',
-                $this->generateCardNum(63, 13),
+                $this->generateCardNumber(63, 13),
                 true,
             ],
             'maestro25' => [
                 'maestro',
-                $this->generateCardNum(64, 13),
+                $this->generateCardNumber(64, 13),
                 true,
             ],
             'maestro26' => [
                 'maestro',
-                $this->generateCardNum(65, 13),
+                $this->generateCardNumber(65, 13),
                 true,
             ],
             'maestro27' => [
                 'maestro',
-                $this->generateCardNum(66, 13),
+                $this->generateCardNumber(66, 13),
                 true,
             ],
             'maestro28' => [
                 'maestro',
-                $this->generateCardNum(67, 13),
+                $this->generateCardNumber(67, 13),
                 true,
             ],
             'maestro29' => [
                 'maestro',
-                $this->generateCardNum(68, 13),
+                $this->generateCardNumber(68, 13),
                 true,
             ],
             'maestro30' => [
                 'maestro',
-                $this->generateCardNum(69, 13),
+                $this->generateCardNumber(69, 13),
                 true,
             ],
             'maestro31' => [
                 'maestro',
-                $this->generateCardNum(50, 14),
+                $this->generateCardNumber(50, 14),
                 true,
             ],
             'maestro32' => [
                 'maestro',
-                $this->generateCardNum(56, 14),
+                $this->generateCardNumber(56, 14),
                 true,
             ],
             'maestro33' => [
                 'maestro',
-                $this->generateCardNum(57, 14),
+                $this->generateCardNumber(57, 14),
                 true,
             ],
             'maestro34' => [
                 'maestro',
-                $this->generateCardNum(58, 14),
+                $this->generateCardNumber(58, 14),
                 true,
             ],
             'maestro35' => [
                 'maestro',
-                $this->generateCardNum(59, 14),
+                $this->generateCardNumber(59, 14),
                 true,
             ],
             'maestro36' => [
                 'maestro',
-                $this->generateCardNum(60, 14),
+                $this->generateCardNumber(60, 14),
                 true,
             ],
             'maestro37' => [
                 'maestro',
-                $this->generateCardNum(61, 14),
+                $this->generateCardNumber(61, 14),
                 true,
             ],
             'maestro38' => [
                 'maestro',
-                $this->generateCardNum(62, 14),
+                $this->generateCardNumber(62, 14),
                 true,
             ],
             'maestro39' => [
                 'maestro',
-                $this->generateCardNum(63, 14),
+                $this->generateCardNumber(63, 14),
                 true,
             ],
             'maestro40' => [
                 'maestro',
-                $this->generateCardNum(64, 14),
+                $this->generateCardNumber(64, 14),
                 true,
             ],
             'maestro41' => [
                 'maestro',
-                $this->generateCardNum(65, 14),
+                $this->generateCardNumber(65, 14),
                 true,
             ],
             'maestro42' => [
                 'maestro',
-                $this->generateCardNum(66, 14),
+                $this->generateCardNumber(66, 14),
                 true,
             ],
             'maestro43' => [
                 'maestro',
-                $this->generateCardNum(67, 14),
+                $this->generateCardNumber(67, 14),
                 true,
             ],
             'maestro44' => [
                 'maestro',
-                $this->generateCardNum(68, 14),
+                $this->generateCardNumber(68, 14),
                 true,
             ],
             'maestro45' => [
                 'maestro',
-                $this->generateCardNum(69, 14),
+                $this->generateCardNumber(69, 14),
                 true,
             ],
             'maestro46' => [
                 'maestro',
-                $this->generateCardNum(50, 15),
+                $this->generateCardNumber(50, 15),
                 true,
             ],
             'maestro47' => [
                 'maestro',
-                $this->generateCardNum(56, 15),
+                $this->generateCardNumber(56, 15),
                 true,
             ],
             'maestro48' => [
                 'maestro',
-                $this->generateCardNum(57, 15),
+                $this->generateCardNumber(57, 15),
                 true,
             ],
             'maestro49' => [
                 'maestro',
-                $this->generateCardNum(58, 15),
+                $this->generateCardNumber(58, 15),
                 true,
             ],
             'maestro50' => [
                 'maestro',
-                $this->generateCardNum(59, 15),
+                $this->generateCardNumber(59, 15),
                 true,
             ],
             'maestro51' => [
                 'maestro',
-                $this->generateCardNum(60, 15),
+                $this->generateCardNumber(60, 15),
                 true,
             ],
             'maestro52' => [
                 'maestro',
-                $this->generateCardNum(61, 15),
+                $this->generateCardNumber(61, 15),
                 true,
             ],
             'maestro53' => [
                 'maestro',
-                $this->generateCardNum(62, 15),
+                $this->generateCardNumber(62, 15),
                 true,
             ],
             'maestro54' => [
                 'maestro',
-                $this->generateCardNum(63, 15),
+                $this->generateCardNumber(63, 15),
                 true,
             ],
             'maestro55' => [
                 'maestro',
-                $this->generateCardNum(64, 15),
+                $this->generateCardNumber(64, 15),
                 true,
             ],
             'maestro56' => [
                 'maestro',
-                $this->generateCardNum(65, 15),
+                $this->generateCardNumber(65, 15),
                 true,
             ],
             'maestro57' => [
                 'maestro',
-                $this->generateCardNum(66, 15),
+                $this->generateCardNumber(66, 15),
                 true,
             ],
             'maestro58' => [
                 'maestro',
-                $this->generateCardNum(67, 15),
+                $this->generateCardNumber(67, 15),
                 true,
             ],
             'maestro59' => [
                 'maestro',
-                $this->generateCardNum(68, 15),
+                $this->generateCardNumber(68, 15),
                 true,
             ],
             'maestro60' => [
                 'maestro',
-                $this->generateCardNum(69, 15),
+                $this->generateCardNumber(69, 15),
                 true,
             ],
             'maestro61' => [
                 'maestro',
-                $this->generateCardNum(50, 16),
+                $this->generateCardNumber(50, 16),
                 true,
             ],
             'maestro62' => [
                 'maestro',
-                $this->generateCardNum(56, 16),
+                $this->generateCardNumber(56, 16),
                 true,
             ],
             'maestro63' => [
                 'maestro',
-                $this->generateCardNum(57, 16),
+                $this->generateCardNumber(57, 16),
                 true,
             ],
             'maestro64' => [
                 'maestro',
-                $this->generateCardNum(58, 16),
+                $this->generateCardNumber(58, 16),
                 true,
             ],
             'maestro65' => [
                 'maestro',
-                $this->generateCardNum(59, 16),
+                $this->generateCardNumber(59, 16),
                 true,
             ],
             'maestro66' => [
                 'maestro',
-                $this->generateCardNum(60, 16),
+                $this->generateCardNumber(60, 16),
                 true,
             ],
             'maestro67' => [
                 'maestro',
-                $this->generateCardNum(61, 16),
+                $this->generateCardNumber(61, 16),
                 true,
             ],
             'maestro68' => [
                 'maestro',
-                $this->generateCardNum(62, 16),
+                $this->generateCardNumber(62, 16),
                 true,
             ],
             'maestro69' => [
                 'maestro',
-                $this->generateCardNum(63, 16),
+                $this->generateCardNumber(63, 16),
                 true,
             ],
             'maestro70' => [
                 'maestro',
-                $this->generateCardNum(64, 16),
+                $this->generateCardNumber(64, 16),
                 true,
             ],
             'maestro71' => [
                 'maestro',
-                $this->generateCardNum(65, 16),
+                $this->generateCardNumber(65, 16),
                 true,
             ],
             'maestro72' => [
                 'maestro',
-                $this->generateCardNum(66, 16),
+                $this->generateCardNumber(66, 16),
                 true,
             ],
             'maestro73' => [
                 'maestro',
-                $this->generateCardNum(67, 16),
+                $this->generateCardNumber(67, 16),
                 true,
             ],
             'maestro74' => [
                 'maestro',
-                $this->generateCardNum(68, 16),
+                $this->generateCardNumber(68, 16),
                 true,
             ],
             'maestro75' => [
                 'maestro',
-                $this->generateCardNum(69, 16),
+                $this->generateCardNumber(69, 16),
                 true,
             ],
             'maestro91' => [
                 'maestro',
-                $this->generateCardNum(50, 18),
+                $this->generateCardNumber(50, 18),
                 true,
             ],
             'maestro92' => [
                 'maestro',
-                $this->generateCardNum(56, 18),
+                $this->generateCardNumber(56, 18),
                 true,
             ],
             'maestro93' => [
                 'maestro',
-                $this->generateCardNum(57, 18),
+                $this->generateCardNumber(57, 18),
                 true,
             ],
             'maestro94' => [
                 'maestro',
-                $this->generateCardNum(58, 18),
+                $this->generateCardNumber(58, 18),
                 true,
             ],
             'maestro95' => [
                 'maestro',
-                $this->generateCardNum(59, 18),
+                $this->generateCardNumber(59, 18),
                 true,
             ],
             'maestro96' => [
                 'maestro',
-                $this->generateCardNum(60, 18),
+                $this->generateCardNumber(60, 18),
                 true,
             ],
             'maestro97' => [
                 'maestro',
-                $this->generateCardNum(61, 18),
+                $this->generateCardNumber(61, 18),
                 true,
             ],
             'maestro98' => [
                 'maestro',
-                $this->generateCardNum(62, 18),
+                $this->generateCardNumber(62, 18),
                 true,
             ],
             'maestro99' => [
                 'maestro',
-                $this->generateCardNum(63, 18),
+                $this->generateCardNumber(63, 18),
                 true,
             ],
             'maestro100' => [
                 'maestro',
-                $this->generateCardNum(64, 18),
+                $this->generateCardNumber(64, 18),
                 true,
             ],
             'maestro101' => [
                 'maestro',
-                $this->generateCardNum(65, 18),
+                $this->generateCardNumber(65, 18),
                 true,
             ],
             'maestro102' => [
                 'maestro',
-                $this->generateCardNum(66, 18),
+                $this->generateCardNumber(66, 18),
                 true,
             ],
             'maestro103' => [
                 'maestro',
-                $this->generateCardNum(67, 18),
+                $this->generateCardNumber(67, 18),
                 true,
             ],
             'maestro104' => [
                 'maestro',
-                $this->generateCardNum(68, 18),
+                $this->generateCardNumber(68, 18),
                 true,
             ],
             'maestro105' => [
                 'maestro',
-                $this->generateCardNum(69, 18),
+                $this->generateCardNumber(69, 18),
                 true,
             ],
             'maestro106' => [
                 'maestro',
-                $this->generateCardNum(50, 19),
+                $this->generateCardNumber(50, 19),
                 true,
             ],
             'maestro107' => [
                 'maestro',
-                $this->generateCardNum(56, 19),
+                $this->generateCardNumber(56, 19),
                 true,
             ],
             'maestro108' => [
                 'maestro',
-                $this->generateCardNum(57, 19),
+                $this->generateCardNumber(57, 19),
                 true,
             ],
             'maestro109' => [
                 'maestro',
-                $this->generateCardNum(58, 19),
+                $this->generateCardNumber(58, 19),
                 true,
             ],
             'maestro110' => [
                 'maestro',
-                $this->generateCardNum(59, 19),
+                $this->generateCardNumber(59, 19),
                 true,
             ],
             'maestro111' => [
                 'maestro',
-                $this->generateCardNum(60, 19),
+                $this->generateCardNumber(60, 19),
                 true,
             ],
             'maestro112' => [
                 'maestro',
-                $this->generateCardNum(61, 19),
+                $this->generateCardNumber(61, 19),
                 true,
             ],
             'maestro113' => [
                 'maestro',
-                $this->generateCardNum(62, 19),
+                $this->generateCardNumber(62, 19),
                 true,
             ],
             'maestro114' => [
                 'maestro',
-                $this->generateCardNum(63, 19),
+                $this->generateCardNumber(63, 19),
                 true,
             ],
             'maestro115' => [
                 'maestro',
-                $this->generateCardNum(64, 19),
+                $this->generateCardNumber(64, 19),
                 true,
             ],
             'maestro116' => [
                 'maestro',
-                $this->generateCardNum(65, 19),
+                $this->generateCardNumber(65, 19),
                 true,
             ],
             'maestro117' => [
                 'maestro',
-                $this->generateCardNum(66, 19),
+                $this->generateCardNumber(66, 19),
                 true,
             ],
             'maestro118' => [
                 'maestro',
-                $this->generateCardNum(67, 19),
+                $this->generateCardNumber(67, 19),
                 true,
             ],
             'maestro119' => [
                 'maestro',
-                $this->generateCardNum(68, 19),
+                $this->generateCardNumber(68, 19),
                 true,
             ],
             'maestro120' => [
                 'maestro',
-                $this->generateCardNum(69, 19),
+                $this->generateCardNumber(69, 19),
                 true,
             ],
             'dankort1' => [
                 'dankort',
-                $this->generateCardNum(5019, 16),
+                $this->generateCardNumber(5019, 16),
                 true,
             ],
             'dankort2' => [
                 'dankort',
-                $this->generateCardNum(4175, 16),
+                $this->generateCardNumber(4175, 16),
                 true,
             ],
             'dankort3' => [
                 'dankort',
-                $this->generateCardNum(4571, 16),
+                $this->generateCardNumber(4571, 16),
                 true,
             ],
             'dankort4' => [
                 'dankort',
-                $this->generateCardNum(4, 16),
+                $this->generateCardNumber(4, 16),
                 true,
             ],
             'mir1' => [
                 'mir',
-                $this->generateCardNum(2200, 16),
+                $this->generateCardNumber(2200, 16),
                 true,
             ],
             'mir2' => [
                 'mir',
-                $this->generateCardNum(2201, 16),
+                $this->generateCardNumber(2201, 16),
                 true,
             ],
             'mir3' => [
                 'mir',
-                $this->generateCardNum(2202, 16),
+                $this->generateCardNumber(2202, 16),
                 true,
             ],
             'mir4' => [
                 'mir',
-                $this->generateCardNum(2203, 16),
+                $this->generateCardNumber(2203, 16),
                 true,
             ],
             'mir5' => [
                 'mir',
-                $this->generateCardNum(2204, 16),
+                $this->generateCardNumber(2204, 16),
                 true,
             ],
             'mastercard1' => [
                 'mastercard',
-                $this->generateCardNum(51, 16),
+                $this->generateCardNumber(51, 16),
                 true,
             ],
             'mastercard2' => [
                 'mastercard',
-                $this->generateCardNum(52, 16),
+                $this->generateCardNumber(52, 16),
                 true,
             ],
             'mastercard3' => [
                 'mastercard',
-                $this->generateCardNum(53, 16),
+                $this->generateCardNumber(53, 16),
                 true,
             ],
             'mastercard4' => [
                 'mastercard',
-                $this->generateCardNum(54, 16),
+                $this->generateCardNumber(54, 16),
                 true,
             ],
             'mastercard5' => [
                 'mastercard',
-                $this->generateCardNum(55, 16),
+                $this->generateCardNumber(55, 16),
                 true,
             ],
             'mastercard6' => [
                 'mastercard',
-                $this->generateCardNum(22, 16),
+                $this->generateCardNumber(22, 16),
                 true,
             ],
             'mastercard7' => [
                 'mastercard',
-                $this->generateCardNum(23, 16),
+                $this->generateCardNumber(23, 16),
                 true,
             ],
             'mastercard8' => [
                 'mastercard',
-                $this->generateCardNum(24, 16),
+                $this->generateCardNumber(24, 16),
                 true,
             ],
             'mastercard9' => [
                 'mastercard',
-                $this->generateCardNum(25, 16),
+                $this->generateCardNumber(25, 16),
                 true,
             ],
             'mastercard10' => [
                 'mastercard',
-                $this->generateCardNum(26, 16),
+                $this->generateCardNumber(26, 16),
                 true,
             ],
             'mastercard11' => [
                 'mastercard',
-                $this->generateCardNum(27, 16),
+                $this->generateCardNumber(27, 16),
                 true,
             ],
             'visa1' => [
                 'visa',
-                $this->generateCardNum(4, 13),
+                $this->generateCardNumber(4, 13),
                 true,
             ],
             'visa2' => [
                 'visa',
-                $this->generateCardNum(4, 16),
+                $this->generateCardNumber(4, 16),
                 true,
             ],
             'visa3' => [
                 'visa',
-                $this->generateCardNum(4, 19),
+                $this->generateCardNumber(4, 19),
                 true,
             ],
             'uatp' => [
                 'uatp',
-                $this->generateCardNum(1, 15),
+                $this->generateCardNumber(1, 15),
                 true,
             ],
             'verve1' => [
                 'verve',
-                $this->generateCardNum(506, 16),
+                $this->generateCardNumber(506, 16),
                 true,
             ],
             'verve2' => [
                 'verve',
-                $this->generateCardNum(650, 16),
+                $this->generateCardNumber(650, 16),
                 true,
             ],
             'verve3' => [
                 'verve',
-                $this->generateCardNum(506, 19),
+                $this->generateCardNumber(506, 19),
                 true,
             ],
             'verve4' => [
                 'verve',
-                $this->generateCardNum(650, 19),
+                $this->generateCardNumber(650, 19),
                 true,
             ],
             'cibc1' => [
                 'cibc',
-                $this->generateCardNum(4506, 16),
+                $this->generateCardNumber(4506, 16),
                 true,
             ],
             'rbc1' => [
                 'rbc',
-                $this->generateCardNum(45, 16),
+                $this->generateCardNumber(45, 16),
                 true,
             ],
             'tdtrust' => [
                 'tdtrust',
-                $this->generateCardNum(589297, 16),
+                $this->generateCardNumber(589297, 16),
                 true,
             ],
             'scotia1' => [
                 'scotia',
-                $this->generateCardNum(4536, 16),
+                $this->generateCardNumber(4536, 16),
                 true,
             ],
             'bmoabm1' => [
                 'bmoabm',
-                $this->generateCardNum(500, 16),
+                $this->generateCardNumber(500, 16),
                 true,
             ],
             'hsbc1' => [
                 'hsbc',
-                $this->generateCardNum(56, 16),
+                $this->generateCardNumber(56, 16),
                 true,
             ],
             'hsbc2' => [
                 'hsbc',
-                $this->generateCardNum(57, 16),
+                $this->generateCardNumber(57, 16),
                 false,
             ],
         ];
     }
 
     /**
-     * Used to generate fake credit card numbers that will still pass the Luhn
-     * check used to validate the card so we can be sure the cards are recognized correctly.
-     *
-     * @return string
+     * Generate a fake credit card number that still passes the Luhn algorithm.
      */
-    protected function generateCardNum(int $prefix, int $length)
+    private function generateCardNumber(int $prefix, int $length): string
     {
-        $pos        = mb_strlen($prefix);
-        $finalDigit = 0;
-        $sum        = 0;
+        $prefix = (string) $prefix;
+        $cursor = strlen($prefix);
 
-        // Fill in the first values of the string based on $prefix
-        $string = str_split($prefix);
+        $digits = str_split($prefix);
+        $digits = array_pad($digits, $length, '0');
 
-        // Pad out the array to the appropriate length
-        $string = array_pad($string, $length, 0);
-
-        // Fill all of the remaining values with random numbers, except the last one.
-        while ($pos < $length - 1) {
-            $string[$pos++] = random_int(0, 9);
+        while ($cursor < $length - 1) {
+            $digits[$cursor++] = (string) random_int(0, 9);
         }
 
-        // Calculate the Luhn checksum of the current values.
-        $lenOffset = ($length + 1) % 2;
+        $digits[$length - 1] = (string) $this->calculateLuhnChecksum($digits, $length);
 
-        for ($pos = 0; $pos < $length - 1; $pos++) {
-            if (($pos + $lenOffset) % 2) {
-                $temp = $string[$pos] * 2;
-                if ($temp > 9) {
-                    $temp -= 9;
-                }
+        return implode('', $digits);
+    }
+
+    private function calculateLuhnChecksum(array $digits, int $length): int
+    {
+        $parity = $length % 2;
+
+        $sum = 0;
+
+        for ($i = $length - 1; $i >= 0; $i--) {
+            $current = $digits[$i];
 
-                $sum += $temp;
-            } else {
-                $sum += $string[$pos];
+            if ($i % 2 === $parity) {
+                $current *= 2;
+
+                if ($current > 9) {
+                    $current -= 9;
+                }
             }
-        }
 
-        // Make the last number whatever would cause the entire number to pass the checksum
-        $finalDigit          = (10 - ($sum % 10)) % 10;
-        $string[$length - 1] = $finalDigit;
+            $sum += $current;
+        }
 
-        return implode('', $string);
+        return ($sum * 9) % 10;
     }
 }

From f2fe48f4c5c2e9bc8b6999688e6c3c62bd52e623 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 3 Nov 2021 09:50:21 +0800
Subject: [PATCH 0653/2325] Optimize FileRulesTest

---
 tests/system/Validation/FileRulesTest.php | 145 ++++++++--------------
 1 file changed, 50 insertions(+), 95 deletions(-)

diff --git a/tests/system/Validation/FileRulesTest.php b/tests/system/Validation/FileRulesTest.php
index e8da364367a7..8a2a111c451f 100644
--- a/tests/system/Validation/FileRulesTest.php
+++ b/tests/system/Validation/FileRulesTest.php
@@ -23,9 +23,9 @@ final class FileRulesTest extends CIUnitTestCase
     /**
      * @var Validation
      */
-    protected $validation;
+    private $validation;
 
-    protected $config = [
+    private $config = [
         'ruleSets' => [
             Rules::class,
             FormatRules::class,
@@ -64,7 +64,7 @@ protected function setUp(): void
                 'name'     => 'my-big-file.png',
                 'size'     => 1024000,
                 'type'     => 'image/png',
-                'error'    => 0,
+                'error'    => UPLOAD_ERR_OK,
                 'width'    => 640,
                 'height'   => 400,
             ],
@@ -73,7 +73,7 @@ protected function setUp(): void
                 'name'     => 'my-photo.png',
                 'size'     => 4614,
                 'type'     => 'image/png',
-                'error'    => 1, // upload_max_filesize exceeded
+                'error'    => UPLOAD_ERR_INI_SIZE,
                 'width'    => 640,
                 'height'   => 400,
             ],
@@ -95,8 +95,8 @@ protected function setUp(): void
                     'image/png',
                 ],
                 'error' => [
-                    0,
-                    0,
+                    UPLOAD_ERR_OK,
+                    UPLOAD_ERR_OK,
                 ],
                 'width' => [
                     640,
@@ -125,8 +125,8 @@ protected function setUp(): void
                     'image/png',
                 ],
                 'error' => [
-                    1,
-                    0,
+                    UPLOAD_ERR_INI_SIZE,
+                    UPLOAD_ERR_OK,
                 ],
                 'width' => [
                     640,
@@ -140,149 +140,110 @@ protected function setUp(): void
         ];
     }
 
-    public function testUploadedTrue()
+    public function testUploadedTrue(): void
     {
-        $this->validation->setRules([
-            'avatar' => 'uploaded[avatar]',
-        ]);
-
+        $this->validation->setRules(['avatar' => 'uploaded[avatar]']);
         $this->assertTrue($this->validation->run([]));
     }
 
-    public function testUploadedFalse()
+    public function testUploadedFalse(): void
     {
-        $this->validation->setRules([
-            'avatar' => 'uploaded[userfile]',
-        ]);
-
+        $this->validation->setRules(['avatar' => 'uploaded[userfile]']);
         $this->assertFalse($this->validation->run([]));
     }
 
-    public function testUploadedArrayReturnsTrue()
+    public function testUploadedArrayReturnsTrue(): void
     {
-        $this->validation->setRules([
-            'images' => 'uploaded[images]',
-        ]);
-
+        $this->validation->setRules(['images' => 'uploaded[images]']);
         $this->assertTrue($this->validation->run([]));
     }
 
-    public function testUploadedArrayReturnsFalse()
+    public function testUploadedArrayReturnsFalse(): void
     {
-        $this->validation->setRules([
-            'photos' => 'uploaded[photos]',
-        ]);
-
+        $this->validation->setRules(['photos' => 'uploaded[photos]']);
         $this->assertFalse($this->validation->run([]));
     }
 
-    public function testMaxSize()
+    public function testMaxSize(): void
     {
-        $this->validation->setRules([
-            'avatar' => 'max_size[avatar,100]',
-        ]);
-
+        $this->validation->setRules(['avatar' => 'max_size[avatar,100]']);
         $this->assertTrue($this->validation->run([]));
     }
 
-    public function testMaxSizeBigFile()
+    public function testMaxSizeBigFile(): void
     {
-        $this->validation->setRules([
-            'bigfile' => 'max_size[bigfile,9999]',
-        ]);
-
+        $this->validation->setRules(['bigfile' => 'max_size[bigfile,9999]']);
         $this->assertTrue($this->validation->run([]));
     }
 
-    public function testMaxSizeFail()
+    public function testMaxSizeFail(): void
     {
-        $this->validation->setRules([
-            'avatar' => 'max_size[avatar,4]',
-        ]);
+        $this->validation->setRules(['avatar' => 'max_size[avatar,4]']);
         $this->assertFalse($this->validation->run([]));
     }
 
-    public function testMaxSizeFailDueToUploadMaxFilesizeExceededInPhpIni()
+    public function testMaxSizeFailDueToUploadMaxFilesizeExceededInPhpIni(): void
     {
-        $this->validation->setRules([
-            'photo' => 'max_size[photo,100]',
-        ]);
+        $this->validation->setRules(['photo' => 'max_size[photo,100]']);
         $this->assertFalse($this->validation->run([]));
     }
 
-    public function testMaxSizeBigFileFail()
+    public function testMaxSizeBigFileFail(): void
     {
-        $this->validation->setRules([
-            'bigfile' => 'max_size[bigfile,10]',
-        ]);
-
+        $this->validation->setRules(['bigfile' => 'max_size[bigfile,10]']);
         $this->assertFalse($this->validation->run([]));
     }
 
-    public function testMaxSizeBad()
+    public function testMaxSizeBad(): void
     {
-        $this->validation->setRules([
-            'avatar' => 'max_size[userfile,50]',
-        ]);
+        $this->validation->setRules(['avatar' => 'max_size[userfile,50]']);
         $this->assertFalse($this->validation->run([]));
     }
 
-    public function testMaxDims()
+    public function testMaxDims(): void
     {
-        $this->validation->setRules([
-            'avatar' => 'max_dims[avatar,640,480]',
-        ]);
+        $this->validation->setRules(['avatar' => 'max_dims[avatar,640,480]']);
         $this->assertTrue($this->validation->run([]));
     }
 
-    public function testMaxDimsFail()
+    public function testMaxDimsFail(): void
     {
-        $this->validation->setRules([
-            'avatar' => 'max_dims[avatar,600,480]',
-        ]);
+        $this->validation->setRules(['avatar' => 'max_dims[avatar,600,480]']);
         $this->assertFalse($this->validation->run([]));
     }
 
-    public function testMaxDimsBad()
+    public function testMaxDimsBad(): void
     {
-        $this->validation->setRules([
-            'avatar' => 'max_dims[unknown,640,480]',
-        ]);
+        $this->validation->setRules(['avatar' => 'max_dims[unknown,640,480]']);
         $this->assertFalse($this->validation->run([]));
     }
 
-    public function testIsImage()
+    public function testIsImage(): void
     {
-        $this->validation->setRules([
-            'avatar' => 'is_image[avatar]',
-        ]);
+        $this->validation->setRules(['avatar' => 'is_image[avatar]']);
         $this->assertTrue($this->validation->run([]));
     }
 
-    public function testIsntImage()
+    public function testIsntImage(): void
     {
         $_FILES['stuff'] = [
             'tmp_name' => TESTPATH . '_support/Validation/uploads/abc77tz',
             'name'     => 'address.book',
             'size'     => 12345,
             'type'     => 'application/address',
-            'error'    => 0,
+            'error'    => UPLOAD_ERR_OK,
         ];
-        $this->validation->setRules([
-            'avatar' => 'is_image[stuff]',
-        ]);
+        $this->validation->setRules(['avatar' => 'is_image[stuff]']);
         $this->assertFalse($this->validation->run([]));
     }
 
-    public function testAlsoIsntImage()
+    public function testAlsoIsntImage(): void
     {
-        $this->validation->setRules([
-            'avatar' => 'is_image[unknown]',
-        ]);
+        $this->validation->setRules(['avatar' => 'is_image[unknown]']);
         $this->assertFalse($this->validation->run([]));
     }
 
-    public function testMimeTypeOk()
+    public function testMimeTypeOk(): void
     {
         $this->validation->setRules([
             'avatar' => 'mime_in[avatar,image/jpg,image/jpeg,image/gif,image/png]',
@@ -290,7 +251,7 @@ public function testMimeTypeOk()
         $this->assertTrue($this->validation->run([]));
     }
 
-    public function testMimeTypeNotOk()
+    public function testMimeTypeNotOk(): void
     {
         $this->validation->setRules([
             'avatar' => 'mime_in[avatar,application/xls,application/doc,application/ppt]',
@@ -298,7 +259,7 @@ public function testMimeTypeNotOk()
         $this->assertFalse($this->validation->run([]));
     }
 
-    public function testMimeTypeImpossible()
+    public function testMimeTypeImpossible(): void
     {
         $this->validation->setRules([
             'avatar' => 'mime_in[unknown,application/xls,application/doc,application/ppt]',
@@ -306,27 +267,21 @@ public function testMimeTypeImpossible()
         $this->assertFalse($this->validation->run([]));
     }
 
-    public function testExtensionOk()
+    public function testExtensionOk(): void
     {
-        $this->validation->setRules([
-            'avatar' => 'ext_in[avatar,jpg,jpeg,gif,png]',
-        ]);
+        $this->validation->setRules(['avatar' => 'ext_in[avatar,jpg,jpeg,gif,png]']);
         $this->assertTrue($this->validation->run([]));
     }
 
-    public function testExtensionNotOk()
+    public function testExtensionNotOk(): void
     {
-        $this->validation->setRules([
-            'avatar' => 'ext_in[avatar,xls,doc,ppt]',
-        ]);
+        $this->validation->setRules(['avatar' => 'ext_in[avatar,xls,doc,ppt]']);
         $this->assertFalse($this->validation->run([]));
     }
 
-    public function testExtensionImpossible()
+    public function testExtensionImpossible(): void
     {
-        $this->validation->setRules([
-            'avatar' => 'ext_in[unknown,xls,doc,ppt]',
-        ]);
+        $this->validation->setRules(['avatar' => 'ext_in[unknown,xls,doc,ppt]']);
         $this->assertFalse($this->validation->run([]));
     }
 }

From c592af9af25ebc74230f5ea821aaf67ebd4ee924 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 3 Nov 2021 10:21:12 +0800
Subject: [PATCH 0654/2325] Optimize FormatRulesTest

---
 tests/system/Validation/FormatRulesTest.php | 210 +++++++-------------
 1 file changed, 73 insertions(+), 137 deletions(-)

diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php
index 76e613604398..9a2e9bd46efc 100644
--- a/tests/system/Validation/FormatRulesTest.php
+++ b/tests/system/Validation/FormatRulesTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Services;
+use Generator;
 use Tests\Support\Validation\TestRules;
 
 /**
@@ -26,9 +27,9 @@ final class FormatRulesTest extends CIUnitTestCase
     /**
      * @var Validation
      */
-    protected $validation;
+    private $validation;
 
-    protected $config = [
+    private $config = [
         'ruleSets' => [
             Rules::class,
             FormatRules::class,
@@ -51,11 +52,9 @@ protected function setUp(): void
         parent::setUp();
         $this->validation = new Validation((object) $this->config, Services::renderer());
         $this->validation->reset();
-
-        $_FILES = [];
     }
 
-    public function testRegexMatch()
+    public function testRegexMatch(): void
     {
         $data = [
             'foo'   => 'abcde',
@@ -70,7 +69,7 @@ public function testRegexMatch()
         $this->assertTrue($this->validation->run($data));
     }
 
-    public function testRegexMatchFalse()
+    public function testRegexMatchFalse(): void
     {
         $data = [
             'foo'   => 'abcde',
@@ -130,9 +129,9 @@ public function testValidURLStrictWithSchema()
         $this->assertFalse($this->validation->run($data));
     }
 
-    public function urlProvider()
+    public function urlProvider(): Generator
     {
-        return [
+        yield from [
             [
                 'www.codeigniter.com',
                 true,
@@ -226,11 +225,8 @@ public function urlProvider()
 
     /**
      * @dataProvider emailProviderSingle
-     *
-     * @param $email
-     * @param $expected
      */
-    public function testValidEmail($email, $expected)
+    public function testValidEmail(?string $email, bool $expected): void
     {
         $data = [
             'foo' => $email,
@@ -245,11 +241,8 @@ public function testValidEmail($email, $expected)
 
     /**
      * @dataProvider emailsProvider
-     *
-     * @param $email
-     * @param $expected
      */
-    public function testValidEmails($email, $expected)
+    public function testValidEmails(?string $email, bool $expected): void
     {
         $data = [
             'foo' => $email,
@@ -262,9 +255,9 @@ public function testValidEmails($email, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function emailProviderSingle()
+    public function emailProviderSingle(): Generator
     {
-        return [
+        yield from [
             [
                 'email@sample.com',
                 true,
@@ -280,9 +273,9 @@ public function emailProviderSingle()
         ];
     }
 
-    public function emailsProvider()
+    public function emailsProvider(): Generator
     {
-        return [
+        yield from [
             [
                 '1@sample.com,2@sample.com',
                 true,
@@ -312,12 +305,8 @@ public function emailsProvider()
 
     /**
      * @dataProvider ipProvider
-     *
-     * @param $ip
-     * @param $which
-     * @param $expected
      */
-    public function testValidIP($ip, $which, $expected)
+    public function testValidIP(?string $ip, ?string $which, bool $expected): void
     {
         $data = [
             'foo' => $ip,
@@ -330,9 +319,9 @@ public function testValidIP($ip, $which, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function ipProvider()
+    public function ipProvider(): Generator
     {
-        return [
+        yield from [
             [
                 '127.0.0.1',
                 null,
@@ -384,10 +373,9 @@ public function ipProvider()
     /**
      * @dataProvider stringProvider
      *
-     * @param $str
-     * @param $expected
+     * @param int|string $str
      */
-    public function testString($str, $expected)
+    public function testString($str, bool $expected): void
     {
         $data = [
             'foo' => $str,
@@ -400,9 +388,9 @@ public function testString($str, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function stringProvider()
+    public function stringProvider(): Generator
     {
-        return [
+        yield from [
             [
                 '123',
                 true,
@@ -424,7 +412,7 @@ public function stringProvider()
      * @param $str
      * @param $expected
      */
-    public function testAlpha($str, $expected)
+    public function testAlpha(?string $str, bool $expected): void
     {
         $data = [
             'foo' => $str,
@@ -437,9 +425,9 @@ public function testAlpha($str, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function alphaProvider()
+    public function alphaProvider(): Generator
     {
-        return [
+        yield from [
             [
                 self::ALPHABET,
                 true,
@@ -464,14 +452,9 @@ public function alphaProvider()
     }
 
     /**
-     * Test alpha with spaces.
-     *
-     * @param mixed $value    Value.
-     * @param bool  $expected Expected.
-     *
      * @dataProvider alphaSpaceProvider
      */
-    public function testAlphaSpace($value, $expected)
+    public function testAlphaSpace(?string $value, bool $expected): void
     {
         $data = [
             'foo' => $value,
@@ -484,9 +467,9 @@ public function testAlphaSpace($value, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function alphaSpaceProvider()
+    public function alphaSpaceProvider(): Generator
     {
-        return [
+        yield from [
             [
                 null,
                 true,
@@ -516,11 +499,8 @@ public function alphaSpaceProvider()
 
     /**
      * @dataProvider alphaNumericProvider
-     *
-     * @param $str
-     * @param $expected
      */
-    public function testAlphaNumeric($str, $expected)
+    public function testAlphaNumeric(?string $str, bool $expected): void
     {
         $data = [
             'foo' => $str,
@@ -533,9 +513,9 @@ public function testAlphaNumeric($str, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function alphaNumericProvider()
+    public function alphaNumericProvider(): Generator
     {
-        return [
+        yield from [
             [
                 self::ALPHANUMERIC,
                 true,
@@ -557,11 +537,8 @@ public function alphaNumericProvider()
 
     /**
      * @dataProvider alphaNumericPunctProvider
-     *
-     * @param $str
-     * @param $expected
      */
-    public function testAlphaNumericPunct($str, $expected)
+    public function testAlphaNumericPunct(?string $str, bool $expected): void
     {
         $data = [
             'foo' => $str,
@@ -574,9 +551,9 @@ public function testAlphaNumericPunct($str, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function alphaNumericPunctProvider()
+    public function alphaNumericPunctProvider(): Generator
     {
-        return [
+        yield from [
             [
                 self::ALPHANUMERIC . ' ~!#$%&*-_+=|:.',
                 true,
@@ -654,11 +631,8 @@ public function alphaNumericPunctProvider()
 
     /**
      * @dataProvider alphaNumericProvider
-     *
-     * @param $str
-     * @param $expected
      */
-    public function testAlphaNumericSpace($str, $expected)
+    public function testAlphaNumericSpace(?string $str, bool $expected): void
     {
         $data = [
             'foo' => $str,
@@ -671,9 +645,9 @@ public function testAlphaNumericSpace($str, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function alphaNumericSpaceProvider()
+    public function alphaNumericSpaceProvider(): Generator
     {
-        return [
+        yield from [
             [
                 ' ' . self::ALPHANUMERIC,
                 true,
@@ -695,11 +669,8 @@ public function alphaNumericSpaceProvider()
 
     /**
      * @dataProvider alphaDashProvider
-     *
-     * @param $str
-     * @param $expected
      */
-    public function testAlphaDash($str, $expected)
+    public function testAlphaDash(?string $str, bool $expected): void
     {
         $data = [
             'foo' => $str,
@@ -712,9 +683,9 @@ public function testAlphaDash($str, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function alphaDashProvider()
+    public function alphaDashProvider(): Generator
     {
-        return [
+        yield from [
             [
                 self::ALPHANUMERIC . '-',
                 true,
@@ -736,11 +707,8 @@ public function alphaDashProvider()
 
     /**
      * @dataProvider hexProvider
-     *
-     * @param $str
-     * @param $expected
      */
-    public function testHex($str, $expected)
+    public function testHex(?string $str, bool $expected): void
     {
         $data = [
             'foo' => $str,
@@ -753,9 +721,9 @@ public function testHex($str, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function hexProvider()
+    public function hexProvider(): Generator
     {
-        return [
+        yield from [
             [
                 'abcdefABCDEF0123456789',
                 true,
@@ -777,11 +745,8 @@ public function hexProvider()
 
     /**
      * @dataProvider numericProvider
-     *
-     * @param $str
-     * @param $expected
      */
-    public function testNumeric($str, $expected)
+    public function testNumeric(?string $str, bool $expected): void
     {
         $data = [
             'foo' => $str,
@@ -794,9 +759,9 @@ public function testNumeric($str, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function numericProvider()
+    public function numericProvider(): Generator
     {
-        return [
+        yield from [
             [
                 '0',
                 true,
@@ -834,11 +799,8 @@ public function numericProvider()
 
     /**
      * @dataProvider integerProvider
-     *
-     * @param $str
-     * @param $expected
      */
-    public function testInteger($str, $expected)
+    public function testInteger(?string $str, bool $expected): void
     {
         $data = [
             'foo' => $str,
@@ -851,9 +813,9 @@ public function testInteger($str, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function integerProvider()
+    public function integerProvider(): Generator
     {
-        return [
+        yield from [
             [
                 '0',
                 true,
@@ -891,11 +853,8 @@ public function integerProvider()
 
     /**
      * @dataProvider decimalProvider
-     *
-     * @param $str
-     * @param $expected
      */
-    public function testDecimal($str, $expected)
+    public function testDecimal(?string $str, bool $expected): void
     {
         $data = [
             'foo' => $str,
@@ -908,9 +867,9 @@ public function testDecimal($str, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function decimalProvider()
+    public function decimalProvider(): Generator
     {
-        return [
+        yield from [
             [
                 '1.0',
                 true,
@@ -952,15 +911,11 @@ public function decimalProvider()
 
     /**
      * @dataProvider naturalProvider
-     *
-     * @param $str
-     * @param $expected
-     * @param mixed $first
      */
-    public function testNatural($first, $expected)
+    public function testNatural(?string $str, bool $expected): void
     {
         $data = [
-            'foo' => $first,
+            'foo' => $str,
         ];
 
         $this->validation->setRules([
@@ -970,9 +925,9 @@ public function testNatural($first, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function naturalProvider()
+    public function naturalProvider(): Generator
     {
-        return [
+        yield from [
             [
                 '0',
                 true,
@@ -998,15 +953,11 @@ public function naturalProvider()
 
     /**
      * @dataProvider naturalZeroProvider
-     *
-     * @param $str
-     * @param $expected
-     * @param mixed $first
      */
-    public function testNaturalNoZero($first, $expected)
+    public function testNaturalNoZero(?string $str, bool $expected): void
     {
         $data = [
-            'foo' => $first,
+            'foo' => $str,
         ];
 
         $this->validation->setRules([
@@ -1016,9 +967,9 @@ public function testNaturalNoZero($first, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function naturalZeroProvider()
+    public function naturalZeroProvider(): Generator
     {
-        return [
+        yield from [
             [
                 '0',
                 false,
@@ -1044,15 +995,11 @@ public function naturalZeroProvider()
 
     /**
      * @dataProvider base64Provider
-     *
-     * @param $str
-     * @param $expected
-     * @param mixed $first
      */
-    public function testBase64($first, $expected)
+    public function testBase64(?string $str, bool $expected): void
     {
         $data = [
-            'foo' => $first,
+            'foo' => $str,
         ];
 
         $this->validation->setRules([
@@ -1062,9 +1009,9 @@ public function testBase64($first, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function base64Provider()
+    public function base64Provider(): Generator
     {
-        return [
+        yield from [
             [
                 base64_encode('string'),
                 true,
@@ -1082,15 +1029,11 @@ public function base64Provider()
 
     /**
      * @dataProvider jsonProvider
-     *
-     * @param $str
-     * @param $expected
-     * @param mixed $first
      */
-    public function testJson($first, $expected)
+    public function testJson(?string $str, bool $expected): void
     {
         $data = [
-            'foo' => $first,
+            'foo' => $str,
         ];
 
         $this->validation->setRules([
@@ -1100,9 +1043,9 @@ public function testJson($first, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function jsonProvider()
+    public function jsonProvider(): Generator
     {
-        return [
+        yield from [
             [
                 'null',
                 true,
@@ -1144,14 +1087,11 @@ public function jsonProvider()
 
     /**
      * @dataProvider timezoneProvider
-     *
-     * @param $value
-     * @param $expected
      */
-    public function testTimeZone($value, $expected)
+    public function testTimeZone(?string $str, bool $expected): void
     {
         $data = [
-            'foo' => $value,
+            'foo' => $str,
         ];
 
         $this->validation->setRules([
@@ -1161,9 +1101,9 @@ public function testTimeZone($value, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function timezoneProvider()
+    public function timezoneProvider(): Generator
     {
-        return [
+        yield from [
             [
                 'America/Chicago',
                 true,
@@ -1185,12 +1125,8 @@ public function timezoneProvider()
 
     /**
      * @dataProvider validDateProvider
-     *
-     * @param $str
-     * @param $format
-     * @param $expected
      */
-    public function testValidDate($str, $format, $expected)
+    public function testValidDate(?string $str, ?string $format, bool $expected): void
     {
         $data = [
             'foo' => $str,
@@ -1203,9 +1139,9 @@ public function testValidDate($str, $format, $expected)
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function validDateProvider()
+    public function validDateProvider(): Generator
     {
-        return [
+        yield from [
             [
                 'Sun',
                 'D',

From 306a2389b2f1a2ea2b947aa8ca94d88fcdf03453 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 3 Nov 2021 20:20:24 +0800
Subject: [PATCH 0655/2325] Move live database related rules into own file

---
 .../Validation/DatabaseRelatedRulesTest.php   | 221 ++++++++++++++++
 tests/system/Validation/RulesTest.php         | 240 ------------------
 2 files changed, 221 insertions(+), 240 deletions(-)
 create mode 100644 tests/system/Validation/DatabaseRelatedRulesTest.php

diff --git a/tests/system/Validation/DatabaseRelatedRulesTest.php b/tests/system/Validation/DatabaseRelatedRulesTest.php
new file mode 100644
index 000000000000..2968c9c1e207
--- /dev/null
+++ b/tests/system/Validation/DatabaseRelatedRulesTest.php
@@ -0,0 +1,221 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use Config\Database;
+use Config\Services;
+use Tests\Support\Validation\TestRules;
+
+/**
+ * @internal
+ *
+ * @group DatabaseLive
+ */
+final class DatabaseRelatedRulesTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+
+    /**
+     * @var Validation
+     */
+    private $validation;
+
+    private $config = [
+        'ruleSets' => [
+            Rules::class,
+            FormatRules::class,
+            FileRules::class,
+            CreditCardRules::class,
+            TestRules::class,
+        ],
+        'groupA' => [
+            'foo' => 'required|min_length[5]',
+        ],
+        'groupA_errors' => [
+            'foo' => [
+                'min_length' => 'Shame, shame. Too short.',
+            ],
+        ],
+    ];
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->validation = new Validation((object) $this->config, Services::renderer());
+        $this->validation->reset();
+    }
+
+    public function testIsUniqueFalse(): void
+    {
+        Database::connect()
+            ->table('user')
+            ->insert([
+                'name'    => 'Derek Travis',
+                'email'   => 'derek@world.com',
+                'country' => 'Elbonia',
+            ]);
+
+        $data = ['email' => 'derek@world.com'];
+        $this->validation->setRules(['email' => 'is_unique[user.email]']);
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testIsUniqueTrue(): void
+    {
+        $data = ['email' => 'derek@world.co.uk'];
+        $this->validation->setRules(['email' => 'is_unique[user.email]']);
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testIsUniqueIgnoresParams(): void
+    {
+        $db = Database::connect();
+        $db
+            ->table('user')
+            ->insert([
+                'name'    => 'Developer A',
+                'email'   => 'deva@example.com',
+                'country' => 'Elbonia',
+            ]);
+        $row = $db->table('user')
+            ->limit(1)
+            ->get()
+            ->getRow();
+
+        $data = ['email' => 'derek@world.co.uk'];
+        $this->validation->setRules(['email' => "is_unique[user.email,id,{$row->id}]"]);
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testIsUniqueIgnoresParamsPlaceholders(): void
+    {
+        $this->hasInDatabase('user', [
+            'name'    => 'Derek',
+            'email'   => 'derek@world.co.uk',
+            'country' => 'GB',
+        ]);
+
+        $row = Database::connect()
+            ->table('user')
+            ->limit(1)
+            ->get()
+            ->getRow();
+
+        $data = [
+            'id'    => $row->id,
+            'email' => 'derek@world.co.uk',
+        ];
+
+        $this->validation->setRules(['email' => 'is_unique[user.email,id,{id}]']);
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testIsUniqueByManualRun(): void
+    {
+        Database::connect()
+            ->table('user')
+            ->insert([
+                'name'    => 'Developer A',
+                'email'   => 'deva@example.com',
+                'country' => 'Elbonia',
+            ]);
+
+        $this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
+    }
+
+    public function testIsNotUniqueFalse(): void
+    {
+        Database::connect()
+            ->table('user')
+            ->insert([
+                'name'    => 'Derek Travis',
+                'email'   => 'derek@world.com',
+                'country' => 'Elbonia',
+            ]);
+
+        $data = ['email' => 'derek1@world.com'];
+        $this->validation->setRules(['email' => 'is_not_unique[user.email]']);
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testIsNotUniqueTrue(): void
+    {
+        Database::connect()
+            ->table('user')
+            ->insert([
+                'name'    => 'Derek Travis',
+                'email'   => 'derek@world.com',
+                'country' => 'Elbonia',
+            ]);
+
+        $data = ['email' => 'derek@world.com'];
+        $this->validation->setRules(['email' => 'is_not_unique[user.email]']);
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testIsNotUniqueIgnoresParams(): void
+    {
+        $db = Database::connect();
+        $db->table('user')
+            ->insert([
+                'name'    => 'Developer A',
+                'email'   => 'deva@example.com',
+                'country' => 'Elbonia',
+            ]);
+
+        $row = $db->table('user')
+            ->limit(1)
+            ->get()
+            ->getRow();
+
+        $data = ['email' => 'derek@world.co.uk'];
+        $this->validation->setRules(['email' => "is_not_unique[user.email,id,{$row->id}]"]);
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testIsNotUniqueIgnoresParamsPlaceholders(): void
+    {
+        $this->hasInDatabase('user', [
+            'name'    => 'Derek',
+            'email'   => 'derek@world.co.uk',
+            'country' => 'GB',
+        ]);
+
+        $row = Database::connect()
+            ->table('user')
+            ->limit(1)
+            ->get()
+            ->getRow();
+
+        $data = [
+            'id'    => $row->id,
+            'email' => 'derek@world.co.uk',
+        ];
+        $this->validation->setRules(['email' => 'is_not_unique[user.email,id,{id}]']);
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testIsNotUniqueByManualRun(): void
+    {
+        Database::connect()
+            ->table('user')
+            ->insert([
+                'name'    => 'Developer A',
+                'email'   => 'deva@example.com',
+                'country' => 'Elbonia',
+            ]);
+
+        $this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
+    }
+}
diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
index 7fe8469fcbeb..51d57bc3b109 100644
--- a/tests/system/Validation/RulesTest.php
+++ b/tests/system/Validation/RulesTest.php
@@ -12,8 +12,6 @@
 namespace CodeIgniter\Validation;
 
 use CodeIgniter\Test\CIUnitTestCase;
-use CodeIgniter\Test\DatabaseTestTrait;
-use Config\Database;
 use Config\Services;
 use stdClass;
 use Tests\Support\Validation\TestRules;
@@ -23,10 +21,6 @@
  */
 final class RulesTest extends CIUnitTestCase
 {
-    use DatabaseTestTrait;
-
-    protected $refresh = true;
-
     /**
      * @var Validation
      */
@@ -633,240 +627,6 @@ public function testNotEqualsReturnsTrueOnCaseMismatch()
         $this->assertTrue($this->validation->run($data));
     }
 
-    /**
-     * @group DatabaseLive
-     */
-    public function testIsUniqueFalse()
-    {
-        $db = Database::connect();
-        $db->table('user')
-            ->insert([
-                'name'    => 'Derek Travis',
-                'email'   => 'derek@world.com',
-                'country' => 'Elbonia',
-            ]);
-
-        $data = [
-            'email' => 'derek@world.com',
-        ];
-
-        $this->validation->setRules([
-            'email' => 'is_unique[user.email]',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
-    }
-
-    /**
-     * @group DatabaseLive
-     */
-    public function testIsUniqueTrue()
-    {
-        $data = [
-            'email' => 'derek@world.co.uk',
-        ];
-
-        $this->validation->setRules([
-            'email' => 'is_unique[user.email]',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
-    }
-
-    /**
-     * @group DatabaseLive
-     */
-    public function testIsUniqueIgnoresParams()
-    {
-        $db = Database::connect();
-        $db->table('user')
-            ->insert([
-                'name'    => 'Developer A',
-                'email'   => 'deva@example.com',
-                'country' => 'Elbonia',
-            ]);
-        $row = $db->table('user')
-            ->limit(1)
-            ->get()
-            ->getRow();
-
-        $data = [
-            'email' => 'derek@world.co.uk',
-        ];
-
-        $this->validation->setRules([
-            'email' => "is_unique[user.email,id,{$row->id}]",
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
-    }
-
-    /**
-     * @group DatabaseLive
-     */
-    public function testIsUniqueIgnoresParamsPlaceholders()
-    {
-        $this->hasInDatabase('user', [
-            'name'    => 'Derek',
-            'email'   => 'derek@world.co.uk',
-            'country' => 'GB',
-        ]);
-
-        $db  = Database::connect();
-        $row = $db->table('user')
-            ->limit(1)
-            ->get()
-            ->getRow();
-
-        $data = [
-            'id'    => $row->id,
-            'email' => 'derek@world.co.uk',
-        ];
-
-        $this->validation->setRules([
-            'email' => 'is_unique[user.email,id,{id}]',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
-    }
-
-    /**
-     * @group DatabaseLive
-     */
-    public function testIsUniqueByManualRun()
-    {
-        $db = Database::connect();
-        $db->table('user')
-            ->insert([
-                'name'    => 'Developer A',
-                'email'   => 'deva@example.com',
-                'country' => 'Elbonia',
-            ]);
-
-        $this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
-    }
-
-    /**
-     * @group DatabaseLive
-     */
-    public function testIsNotUniqueFalse()
-    {
-        $db = Database::connect();
-        $db->table('user')
-            ->insert([
-                'name'    => 'Derek Travis',
-                'email'   => 'derek@world.com',
-                'country' => 'Elbonia',
-            ]);
-
-        $data = [
-            'email' => 'derek1@world.com',
-        ];
-
-        $this->validation->setRules([
-            'email' => 'is_not_unique[user.email]',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
-    }
-
-    /**
-     * @group DatabaseLive
-     */
-    public function testIsNotUniqueTrue()
-    {
-        $db = Database::connect();
-        $db->table('user')
-            ->insert([
-                'name'    => 'Derek Travis',
-                'email'   => 'derek@world.com',
-                'country' => 'Elbonia',
-            ]);
-
-        $data = [
-            'email' => 'derek@world.com',
-        ];
-
-        $this->validation->setRules([
-            'email' => 'is_not_unique[user.email]',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
-    }
-
-    /**
-     * @group DatabaseLive
-     */
-    public function testIsNotUniqueIgnoresParams()
-    {
-        $db = Database::connect();
-        $db->table('user')
-            ->insert([
-                'name'    => 'Developer A',
-                'email'   => 'deva@example.com',
-                'country' => 'Elbonia',
-            ]);
-        $row = $db->table('user')
-            ->limit(1)
-            ->get()
-            ->getRow();
-
-        $data = [
-            'email' => 'derek@world.co.uk',
-        ];
-
-        $this->validation->setRules([
-            'email' => "is_not_unique[user.email,id,{$row->id}]",
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
-    }
-
-    /**
-     * @group DatabaseLive
-     */
-    public function testIsNotUniqueIgnoresParamsPlaceholders()
-    {
-        $this->hasInDatabase('user', [
-            'name'    => 'Derek',
-            'email'   => 'derek@world.co.uk',
-            'country' => 'GB',
-        ]);
-
-        $db  = Database::connect();
-        $row = $db->table('user')
-            ->limit(1)
-            ->get()
-            ->getRow();
-
-        $data = [
-            'id'    => $row->id,
-            'email' => 'derek@world.co.uk',
-        ];
-
-        $this->validation->setRules([
-            'email' => 'is_not_unique[user.email,id,{id}]',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
-    }
-
-    /**
-     * @group DatabaseLive
-     */
-    public function testIsNotUniqueByManualRun()
-    {
-        $db = Database::connect();
-        $db->table('user')
-            ->insert([
-                'name'    => 'Developer A',
-                'email'   => 'deva@example.com',
-                'country' => 'Elbonia',
-            ]);
-
-        $this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
-    }
-
     public function testMinLengthNull()
     {
         $data = [

From ec958f9ce8432d69d7e61aec41cf8ba41b102a48 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 3 Nov 2021 20:40:10 +0800
Subject: [PATCH 0656/2325] Optimize RulesTest

---
 tests/system/Validation/RulesTest.php | 1088 +++++--------------------
 1 file changed, 198 insertions(+), 890 deletions(-)

diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
index 51d57bc3b109..3b3ddc11987a 100644
--- a/tests/system/Validation/RulesTest.php
+++ b/tests/system/Validation/RulesTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Services;
+use Generator;
 use stdClass;
 use Tests\Support\Validation\TestRules;
 
@@ -24,9 +25,9 @@ final class RulesTest extends CIUnitTestCase
     /**
      * @var Validation
      */
-    protected $validation;
+    private $validation;
 
-    protected $config = [
+    private $config = [
         'ruleSets' => [
             Rules::class,
             FormatRules::class,
@@ -47,111 +48,43 @@ final class RulesTest extends CIUnitTestCase
     protected function setUp(): void
     {
         parent::setUp();
-
         $this->validation = new Validation((object) $this->config, Services::renderer());
         $this->validation->reset();
-
-        $_FILES = [];
     }
 
-    // Rules Tests
-
-    public function testRequiredNull()
-    {
-        $data = [
-            'foo' => null,
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'required|alpha',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
-    }
-
-    public function testRequiredTrueString()
-    {
-        $data = [
-            'foo' => 123,
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'required',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
-    }
-
-    public function testRequiredFalseString()
-    {
-        $data = [
-            'foo' => null,
-            'bar' => 123,
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'required',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
-    }
-
-    public function testRequiredTrueArray()
-    {
-        $data = [
-            'foo' => [123],
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'required',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
-    }
-
-    public function testRequiredFalseArray()
+    /**
+     * @dataProvider provideRequiredCases
+     */
+    public function testRequired(array $data, bool $expected): void
     {
-        $data = [
-            'foo' => [],
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'required',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
+        $this->validation->setRules(['foo' => 'required']);
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function testRequiredObject()
+    public function provideRequiredCases(): Generator
     {
-        $data = [
-            'foo' => new stdClass(),
+        yield from [
+            [['foo' => null], false],
+            [['foo' => 123], true],
+            [['foo' => null, 'bar' => 123], false],
+            [['foo' => [123]], true],
+            [['foo' => []], false],
+            [['foo' => new stdClass()], true],
         ];
-
-        $this->validation->setRules([
-            'foo' => 'required',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
     }
 
     /**
      * @dataProvider ifExistProvider
-     *
-     * @param $rules
-     * @param $data
-     * @param $expected
      */
-    public function testIfExist($rules, $data, $expected)
+    public function testIfExist(array $rules, array $data, bool $expected): void
     {
         $this->validation->setRules($rules);
-
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function ifExistProvider()
+    public function ifExistProvider(): Generator
     {
-        return [
+        yield from [
             [
                 ['foo' => 'required'],
                 ['foo' => ''],
@@ -188,22 +121,17 @@ public function ifExistProvider()
     }
 
     /**
-     * @dataProvider emptysProvider
-     *
-     * @param $rules
-     * @param $data
-     * @param $expected
+     * @dataProvider providePermitEmptyCases
      */
-    public function testEmptys($rules, $data, $expected)
+    public function testPermitEmpty(array $rules, array $data, bool $expected): void
     {
         $this->validation->setRules($rules);
-
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function emptysProvider()
+    public function providePermitEmptyCases(): Generator
     {
-        return [
+        yield from [
             [
                 ['foo' => 'permit_empty'],
                 ['foo' => ''],
@@ -297,23 +225,13 @@ public function emptysProvider()
                 true,
             ],
             [
-                [
-                    'foo' => 'permit_empty|required_with[bar]',
-                ],
-                [
-                    'foo' => 0.0,
-                    'bar' => 1,
-                ],
+                ['foo' => 'permit_empty|required_with[bar]'],
+                ['foo' => 0.0, 'bar' => 1],
                 true,
             ],
             [
-                [
-                    'foo' => 'permit_empty|required_with[bar]',
-                ],
-                [
-                    'foo' => '',
-                    'bar' => 1,
-                ],
+                ['foo' => 'permit_empty|required_with[bar]'],
+                ['foo' => '', 'bar' => 1],
                 false,
             ],
             [
@@ -327,837 +245,281 @@ public function emptysProvider()
                 true,
             ],
             [
-                [
-                    'foo' => 'permit_empty|required_without[bar]',
-                ],
-                [
-                    'foo' => 0.0,
-                    'bar' => 1,
-                ],
+                ['foo' => 'permit_empty|required_without[bar]'],
+                ['foo' => 0.0, 'bar' => 1],
                 true,
             ],
             [
-                [
-                    'foo' => 'permit_empty|required_without[bar]',
-                ],
-                [
-                    'foo' => '',
-                    'bar' => 1,
-                ],
+                ['foo' => 'permit_empty|required_without[bar]'],
+                ['foo' => '', 'bar' => 1],
                 true,
             ],
         ];
     }
 
-    public function testMatchesNull()
-    {
-        $data = [
-            'foo' => null,
-            'bar' => null,
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'matches[bar]',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
-    }
-
-    public function testMatchesTrue()
-    {
-        $data = [
-            'foo' => 'match',
-            'bar' => 'match',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'matches[bar]',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
-    }
-
-    public function testMatchesFalse()
-    {
-        $data = [
-            'foo' => 'match',
-            'bar' => 'nope',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'matches[bar]',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
-    }
-
-    public function testMatcheNestedsTrue()
-    {
-        $data = [
-            'nested' => [
-                'foo' => 'match',
-                'bar' => 'match',
-            ],
-        ];
-
-        $this->validation->setRules([
-            'nested.foo' => 'matches[nested.bar]',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
-    }
-
-    public function testMatchesNestedFalse()
-    {
-        $data = [
-            'nested' => [
-                'foo' => 'match',
-                'bar' => 'nope',
-            ],
-        ];
-
-        $this->validation->setRules([
-            'nested.foo' => 'matches[nested.bar]',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
-    }
-
-    public function testDiffersNull()
-    {
-        $data = [
-            'foo' => null,
-            'bar' => null,
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'differs[bar]',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
-    }
-
-    public function testDiffersTrue()
-    {
-        $data = [
-            'foo' => 'match',
-            'bar' => 'nope',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'differs[bar]',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
-    }
-
-    public function testDiffersFalse()
-    {
-        $data = [
-            'foo' => 'match',
-            'bar' => 'match',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'differs[bar]',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
-    }
-
-    public function testDiffersNestedTrue()
-    {
-        $data = [
-            'nested' => [
-                'foo' => 'match',
-                'bar' => 'nope',
-            ],
-        ];
-
-        $this->validation->setRules([
-            'nested.foo' => 'differs[nested.bar]',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
-    }
-
-    public function testDiffersNestedFalse()
-    {
-        $data = [
-            'nested' => [
-                'foo' => 'match',
-                'bar' => 'match',
-            ],
-        ];
-
-        $this->validation->setRules([
-            'nested.foo' => 'differs[nested.bar]',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
-    }
-
-    public function testEqualsNull()
-    {
-        $data = [
-            'foo' => null,
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'equals[]',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
-    }
-
-    public function testEqualsEmptyIsEmpty()
-    {
-        $data = [
-            'foo' => '',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'equals[]',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
-    }
-
-    public function testEqualsReturnsFalseOnFailure()
-    {
-        $data = [
-            'foo' => 'bar',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'equals[notbar]',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
-    }
-
-    public function testEqualsReturnsTrueOnSuccess()
-    {
-        $data = [
-            'foo' => 'bar',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'equals[bar]',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
-    }
-
-    public function testEqualsReturnsFalseOnCaseMismatch()
-    {
-        $data = [
-            'foo' => 'bar',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'equals[Bar]',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
-    }
-
-    public function testNotEqualsNull()
-    {
-        $data = [
-            'foo' => null,
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'not_equals[]',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
-    }
-
-    public function testNotEqualsEmptyIsEmpty()
-    {
-        $data = [
-            'foo' => '',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'not_equals[]',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
-    }
-
-    public function testNotEqualsReturnsFalseOnFailure()
-    {
-        $data = [
-            'foo' => 'bar',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'not_equals[bar]',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
-    }
-
-    public function testNotEqualsReturnsTrueOnSuccess()
-    {
-        $data = [
-            'foo' => 'bar',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'not_equals[notbar]',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
-    }
-
-    public function testNotEqualsReturnsTrueOnCaseMismatch()
+    /**
+     * @dataProvider provideMatchesCases
+     */
+    public function testMatches(array $data, bool $expected): void
     {
-        $data = [
-            'foo' => 'bar',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'not_equals[Bar]',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
+        $this->validation->setRules(['foo' => 'matches[bar]']);
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function testMinLengthNull()
+    public function provideMatchesCases(): Generator
     {
-        $data = [
-            'foo' => null,
+        yield from [
+            [['foo' => null, 'bar' => null], true],
+            [['foo' => 'match', 'bar' => 'match'], true],
+            [['foo' => 'match', 'bar' => 'nope'], false],
         ];
-
-        $this->validation->setRules([
-            'foo' => 'min_length[3]',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
     }
 
-    public function testMinLengthReturnsTrueWithSuccess()
+    /**
+     * @dataProvider provideMatchesNestedCases
+     */
+    public function testMatchesNested(array $data, bool $expected): void
     {
-        $data = [
-            'foo' => 'bar',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'min_length[2]',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
+        $this->validation->setRules(['nested.foo' => 'matches[nested.bar]']);
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function testMinLengthReturnsTrueWithExactLength()
+    public function provideMatchesNestedCases(): Generator
     {
-        $data = [
-            'foo' => 'bar',
+        yield from [
+            [['nested' => ['foo' => 'match', 'bar' => 'match']], true],
+            [['nested' => ['foo' => 'match', 'bar' => 'nope']], false],
         ];
-
-        $this->validation->setRules([
-            'foo' => 'min_length[3]',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
     }
 
-    public function testMinLengthReturnsFalseWhenWrong()
+    /**
+     * @dataProvider provideMatchesCases
+     */
+    public function testDiffers(array $data, bool $expected): void
     {
-        $data = [
-            'foo' => 'bar',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'min_length[4]',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
+        $this->validation->setRules(['foo' => 'differs[bar]']);
+        $this->assertSame(! $expected, $this->validation->run($data));
     }
 
-    public function testMaxLengthNull()
+    /**
+     * @dataProvider provideMatchesNestedCases
+     */
+    public function testDiffersNested(array $data, bool $expected): void
     {
-        $data = [
-            'foo' => null,
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'max_length[1]',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
+        $this->validation->setRules(['nested.foo' => 'differs[nested.bar]']);
+        $this->assertSame(! $expected, $this->validation->run($data));
     }
 
-    public function testMaxLengthReturnsFalseWithNonNumericVal()
+    /**
+     * @dataProvider provideEqualsCases
+     */
+    public function testEquals(array $data, string $param, bool $expected): void
     {
-        $data = [
-            'foo' => 'bar',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'max_length[bar]',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
+        $this->validation->setRules(['foo' => "equals[{$param}]"]);
+        $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function testMaxLengthReturnsTrueWithSuccess()
+    public function provideEqualsCases(): Generator
     {
-        $data = [
-            'foo' => 'bar',
+        yield from [
+            'null'   => [['foo' => null], '', false],
+            'empty'  => [['foo' => ''], '', true],
+            'fail'   => [['foo' => 'bar'], 'notbar', false],
+            'pass'   => [['foo' => 'bar'], 'bar', true],
+            'casing' => [['foo' => 'bar'], 'Bar', false],
         ];
-
-        $this->validation->setRules([
-            'foo' => 'max_length[4]',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
     }
 
-    public function testMaxLengthReturnsTrueWithExactLength()
+    /**
+     * @dataProvider provideMinLengthCases
+     */
+    public function testMinLength(?string $data, string $length, bool $expected): void
     {
-        $data = [
-            'foo' => 'bar',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'max_length[3]',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
+        $this->validation->setRules(['foo' => "min_length[{$length}]"]);
+        $this->assertSame($expected, $this->validation->run(['foo' => $data]));
     }
 
-    public function testMaxLengthReturnsFalseWhenWrong()
+    public function provideMinLengthCases(): Generator
     {
-        $data = [
-            'foo' => 'bar',
+        yield from [
+            'null'    => [null, '2', false],
+            'less'    => ['bar', '2', true],
+            'equal'   => ['bar', '3', true],
+            'greater' => ['bar', '4', false],
         ];
-
-        $this->validation->setRules([
-            'foo' => 'max_length[2]',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
     }
 
-    public function testExactLengthNull()
+    /**
+     * @dataProvider provideMinLengthCases
+     */
+    public function testMaxLength(?string $data, string $length, bool $expected): void
     {
-        $data = [
-            'foo' => null,
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'exact_length[3]',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
+        $this->validation->setRules(['foo' => "max_length[{$length}]"]);
+        $this->assertSame(! $expected || $length === '3', $this->validation->run(['foo' => $data]));
     }
 
-    public function testExactLengthReturnsTrueOnSuccess()
+    public function testMaxLengthReturnsFalseWithNonNumericVal(): void
     {
-        $data = [
-            'foo' => 'bar',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'exact_length[3]',
-        ]);
-
-        $this->assertTrue($this->validation->run($data));
+        $this->validation->setRules(['foo' => 'max_length[bar]']);
+        $this->assertFalse($this->validation->run(['foo' => 'bar']));
     }
 
-    public function testExactLengthDetectsBadLength()
+    /**
+     * @dataProvider provideExactLengthCases
+     */
+    public function testExactLength(?string $data, bool $expected): void
     {
-        $data = [
-            'foo' => 'bar',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'exact_length[abc]',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
+        $this->validation->setRules(['foo' => 'exact_length[3]']);
+        $this->assertSame($expected, $this->validation->run(['foo' => $data]));
     }
 
-    public function testExactLengthReturnsFalseWhenShort()
+    public function provideExactLengthCases(): Generator
     {
-        $data = [
-            'foo' => 'bar',
+        yield from [
+            'null'    => [null, false],
+            'exact'   => ['bar', true],
+            'less'    => ['ba', false],
+            'greater' => ['bars', false],
         ];
-
-        $this->validation->setRules([
-            'foo' => 'exact_length[2]',
-        ]);
-
-        $this->assertFalse($this->validation->run($data));
     }
 
-    public function testExactLengthReturnsFalseWhenLong()
+    public function testExactLengthDetectsBadLength(): void
     {
-        $data = [
-            'foo' => 'bar',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'exact_length[4]',
-        ]);
-
+        $data = ['foo' => 'bar'];
+        $this->validation->setRules(['foo' => 'exact_length[abc]']);
         $this->assertFalse($this->validation->run($data));
     }
 
     /**
      * @dataProvider greaterThanProvider
-     *
-     * @param $str
-     * @param $expected
-     * @param mixed $first
-     * @param mixed $second
      */
-    public function testGreaterThan($first, $second, $expected)
+    public function testGreaterThan(?string $first, ?string $second, bool $expected): void
     {
-        $data = [
-            'foo' => $first,
-        ];
-
-        $this->validation->setRules([
-            'foo' => "greater_than[{$second}]",
-        ]);
-
+        $data = ['foo' => $first];
+        $this->validation->setRules(['foo' => "greater_than[{$second}]"]);
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function greaterThanProvider()
+    public function greaterThanProvider(): Generator
     {
-        return [
-            [
-                '-10',
-                '-11',
-                true,
-            ],
-            [
-                '10',
-                '9',
-                true,
-            ],
-            [
-                '10',
-                '10',
-                false,
-            ],
-            [
-                '10',
-                'a',
-                false,
-            ],
-            [
-                '10a',
-                '10',
-                false,
-            ],
-            [
-                null,
-                null,
-                false,
-            ],
+        yield from [
+            ['-10', '-11', true],
+            ['10', '9', true],
+            ['10', '10', false],
+            ['10', 'a', false],
+            ['10a', '10', false],
+            [null, null, false],
         ];
     }
 
     /**
      * @dataProvider greaterThanEqualProvider
-     *
-     * @param $str
-     * @param $expected
-     * @param mixed $first
-     * @param mixed $second
      */
-    public function testGreaterThanEqual($first, $second, $expected)
+    public function testGreaterThanEqual(?string $first, ?string $second, bool $expected): void
     {
-        $data = [
-            'foo' => $first,
-        ];
-
-        $this->validation->setRules([
-            'foo' => "greater_than_equal_to[{$second}]",
-        ]);
-
+        $data = ['foo' => $first];
+        $this->validation->setRules(['foo' => "greater_than_equal_to[{$second}]"]);
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function greaterThanEqualProvider()
+    public function greaterThanEqualProvider(): Generator
     {
-        return [
-            [
-                '0',
-                '0',
-                true,
-            ],
-            [
-                '1',
-                '0',
-                true,
-            ],
-            [
-                '-1',
-                '0',
-                false,
-            ],
-            [
-                '10a',
-                '0',
-                false,
-            ],
-            [
-                null,
-                null,
-                false,
-            ],
-            [
-                1,
-                null,
-                true,
-            ],
-            [
-                null,
-                1,
-                false,
-            ],
+        yield from [
+            ['0', '0', true],
+            ['1', '0', true],
+            ['-1', '0', false],
+            ['10a', '0', false],
+            [null, null, false],
+            ['1', null, true],
+            [null, '1', false],
         ];
     }
 
     /**
      * @dataProvider lessThanProvider
-     *
-     * @param $str
-     * @param $expected
-     * @param mixed $first
-     * @param mixed $second
      */
-    public function testLessThan($first, $second, $expected)
+    public function testLessThan(?string $first, ?string $second, bool $expected): void
     {
-        $data = [
-            'foo' => $first,
-        ];
-
-        $this->validation->setRules([
-            'foo' => "less_than[{$second}]",
-        ]);
-
+        $data = ['foo' => $first];
+        $this->validation->setRules(['foo' => "less_than[{$second}]"]);
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function lessThanProvider()
+    public function lessThanProvider(): Generator
     {
-        return [
-            [
-                '4',
-                '5',
-                true,
-            ],
-            [
-                '-1',
-                '0',
-                true,
-            ],
-            [
-                '4',
-                '4',
-                false,
-            ],
-            [
-                '10a',
-                '5',
-                false,
-            ],
-            [
-                null,
-                null,
-                false,
-            ],
-            [
-                1,
-                null,
-                false,
-            ],
-            [
-                null,
-                1,
-                false,
-            ],
+        yield from [
+            ['-10', '-11', false],
+            ['9', '10', true],
+            ['10', '9', false],
+            ['10', '10', false],
+            ['10', 'a', true],
+            ['10a', '10', false],
+            [null, null, false],
         ];
     }
 
     /**
      * @dataProvider lessThanEqualProvider
-     *
-     * @param $str
-     * @param $expected
-     * @param mixed $first
-     * @param mixed $second
      */
-    public function testLessEqualThan($first, $second, $expected)
+    public function testLessEqualThan(?string $first, ?string $second, bool $expected): void
     {
-        $data = [
-            'foo' => $first,
-        ];
-
-        $this->validation->setRules([
-            'foo' => "less_than_equal_to[{$second}]",
-        ]);
-
+        $data = ['foo' => $first];
+        $this->validation->setRules(['foo' => "less_than_equal_to[{$second}]"]);
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function lessThanEqualProvider()
+    public function lessThanEqualProvider(): Generator
     {
-        return [
-            [
-                '-1',
-                '0',
-                true,
-            ],
-            [
-                '-1',
-                '-1',
-                true,
-            ],
-            [
-                '4',
-                '4',
-                true,
-            ],
-            [
-                '0',
-                '-1',
-                false,
-            ],
-            [
-                '10a',
-                '0',
-                false,
-            ],
-            [
-                null,
-                null,
-                false,
-            ],
-            [
-                null,
-                1,
-                false,
-            ],
-            [
-                1,
-                null,
-                false,
-            ],
+        yield from [
+            ['0', '0', true],
+            ['1', '0', false],
+            ['-1', '0', true],
+            ['10a', '0', false],
+            [null, null, false],
+            ['1', null, false],
+            [null, '1', false],
         ];
     }
 
     /**
      * @dataProvider inListProvider
-     *
-     * @param string $first
-     * @param string $second
-     * @param bool   $expected
      */
-    public function testInList($first, $second, $expected)
+    public function testInList(?string $first, ?string $second, bool $expected): void
     {
-        $data = [
-            'foo' => $first,
-        ];
-
-        $this->validation->setRules([
-            'foo' => "in_list[{$second}]",
-        ]);
-
+        $data = ['foo' => $first];
+        $this->validation->setRules(['foo' => "in_list[{$second}]"]);
         $this->assertSame($expected, $this->validation->run($data));
     }
 
     /**
      * @dataProvider inListProvider
-     *
-     * @param string $first
-     * @param string $second
-     * @param bool   $expected
      */
-    public function testNotInList($first, $second, $expected)
+    public function testNotInList(?string $first, ?string $second, bool $expected): void
     {
-        $expected = ! $expected;
-
-        $data = [
-            'foo' => $first,
-        ];
-
-        $this->validation->setRules([
-            'foo' => "not_in_list[{$second}]",
-        ]);
-
-        $this->assertSame($expected, $this->validation->run($data));
+        $data = ['foo' => $first];
+        $this->validation->setRules(['foo' => "not_in_list[{$second}]"]);
+        $this->assertSame(! $expected, $this->validation->run($data));
     }
 
-    public function inListProvider()
+    public function inListProvider(): Generator
     {
-        return [
-            [
-                'red',
-                'red,Blue,123',
-                true,
-            ],
-            [
-                'Blue',
-                'red, Blue,123',
-                true,
-            ],
-            [
-                'Blue',
-                'red,Blue,123',
-                true,
-            ],
-            [
-                '123',
-                'red,Blue,123',
-                true,
-            ],
-            [
-                'Red',
-                'red,Blue,123',
-                false,
-            ],
-            [
-                ' red',
-                'red,Blue,123',
-                false,
-            ],
-            [
-                '1234',
-                'red,Blue,123',
-                false,
-            ],
-            [
-                null,
-                'red,Blue,123',
-                false,
-            ],
-            [
-                'red',
-                null,
-                false,
-            ],
+        yield from [
+            ['red', 'red,Blue,123', true],
+            ['Blue', 'red, Blue,123', true],
+            ['Blue', 'red,Blue,123', true],
+            ['123', 'red,Blue,123', true],
+            ['Red', 'red,Blue,123', false],
+            [' red', 'red,Blue,123', false],
+            ['1234', 'red,Blue,123', false],
+            [null, 'red,Blue,123', false],
+            ['red', null, false],
         ];
     }
 
     /**
      * @dataProvider requiredWithProvider
-     *
-     * @param $check
-     * @param $expected
-     * @param mixed $field
      */
-    public function testRequiredWith($field, $check, $expected = false)
+    public function testRequiredWith(?string $field, ?string $check, bool $expected): void
     {
         $data = [
             'foo'   => 'bar',
@@ -1171,46 +533,19 @@ public function testRequiredWith($field, $check, $expected = false)
             ],
         ];
 
-        $this->validation->setRules([
-            $field => "required_with[{$check}]",
-        ]);
-
+        $this->validation->setRules([$field => "required_with[{$check}]"]);
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function requiredWithProvider()
+    public function requiredWithProvider(): Generator
     {
-        return [
-            [
-                'nope',
-                'bar',
-                false,
-            ],
-            [
-                'foo',
-                'bar',
-                true,
-            ],
-            [
-                'nope',
-                'baz',
-                true,
-            ],
-            [
-                null,
-                null,
-                true,
-            ],
-            [
-                null,
-                'foo',
-                false,
-            ],
-            [
-                'foo',
-                null,
-                true,
-            ],
+        yield from [
+            ['nope', 'bar', false],
+            ['foo', 'bar', true],
+            ['nope', 'baz', true],
+            [null, null, true],
+            [null, 'foo', false],
+            ['foo', null, true],
             [
                 'array.emptyField1',
                 'array.emptyField2',
@@ -1236,12 +571,8 @@ public function requiredWithProvider()
 
     /**
      * @dataProvider requiredWithoutProvider
-     *
-     * @param $check
-     * @param $expected
-     * @param mixed $field
      */
-    public function testRequiredWithout($field, $check, $expected = false)
+    public function testRequiredWithout(?string $field, ?string $check, bool $expected): void
     {
         $data = [
             'foo'   => 'bar',
@@ -1255,41 +586,18 @@ public function testRequiredWithout($field, $check, $expected = false)
             ],
         ];
 
-        $this->validation->setRules([
-            $field => "required_without[{$check}]",
-        ]);
-
+        $this->validation->setRules([$field => "required_without[{$check}]"]);
         $this->assertSame($expected, $this->validation->run($data));
     }
 
-    public function requiredWithoutProvider()
+    public function requiredWithoutProvider(): Generator
     {
-        return [
-            [
-                'nope',
-                'bars',
-                false,
-            ],
-            [
-                'foo',
-                'nope',
-                true,
-            ],
-            [
-                null,
-                null,
-                false,
-            ],
-            [
-                null,
-                'foo',
-                true,
-            ],
-            [
-                'foo',
-                null,
-                true,
-            ],
+        yield from [
+            ['nope', 'bars', false],
+            ['foo', 'nope', true],
+            [null, null, false],
+            [null, 'foo', true],
+            ['foo', null, true],
             [
                 'array.emptyField1',
                 'array.emptyField2',

From a4c627ea550ef2796b457cb628a14ec8f0a029cd Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 3 Nov 2021 21:01:03 +0800
Subject: [PATCH 0657/2325] Optimize ValidationTest

---
 tests/system/Validation/ValidationTest.php | 351 ++++++---------------
 1 file changed, 98 insertions(+), 253 deletions(-)

diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index 8b77686fc3b5..cffde6abf3bd 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -18,6 +18,7 @@
 use CodeIgniter\Validation\Exceptions\ValidationException;
 use Config\App;
 use Config\Services;
+use Generator;
 use Tests\Support\Validation\TestRules;
 
 /**
@@ -28,9 +29,9 @@ final class ValidationTest extends CIUnitTestCase
     /**
      * @var Validation
      */
-    protected $validation;
+    private $validation;
 
-    protected $config = [
+    private $config = [
         'ruleSets' => [
             Rules::class,
             FormatRules::class,
@@ -72,66 +73,44 @@ final class ValidationTest extends CIUnitTestCase
     protected function setUp(): void
     {
         parent::setUp();
-
-        Services::reset(true);
-
         $this->validation = new Validation((object) $this->config, Services::renderer());
         $this->validation->reset();
-
-        $_FILES = [];
     }
 
-    public function testSetRulesStoresRules()
+    public function testSetRulesStoresRules(): void
     {
         $rules = [
             'foo' => 'bar|baz',
             'bar' => 'baz|belch',
         ];
-
         $this->validation->setRules($rules);
-
         $this->assertSame($rules, $this->validation->getRules());
     }
 
-    public function testRunReturnsFalseWithNothingToDo()
+    public function testRunReturnsFalseWithNothingToDo(): void
     {
         $this->validation->setRules([]);
-
         $this->assertFalse($this->validation->run([]));
     }
 
-    public function testRunDoesTheBasics()
+    public function testRunDoesTheBasics(): void
     {
-        $data = [
-            'foo' => 'notanumber',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'is_numeric',
-        ]);
-
+        $data = ['foo' => 'notanumber'];
+        $this->validation->setRules(['foo' => 'is_numeric']);
         $this->assertFalse($this->validation->run($data));
     }
 
-    public function testRunReturnsLocalizedErrors()
+    public function testRunReturnsLocalizedErrors(): void
     {
-        $data = [
-            'foo' => 'notanumber',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'is_numeric',
-        ]);
-
+        $data = ['foo' => 'notanumber'];
+        $this->validation->setRules(['foo' => 'is_numeric']);
         $this->assertFalse($this->validation->run($data));
         $this->assertSame('Validation.is_numeric', $this->validation->getError('foo'));
     }
 
-    public function testRunWithCustomErrors()
+    public function testRunWithCustomErrors(): void
     {
-        $data = [
-            'foo' => 'notanumber',
-        ];
+        $data = ['foo' => 'notanumber'];
 
         $messages = [
             'foo' => [
@@ -139,26 +118,23 @@ public function testRunWithCustomErrors()
             ],
         ];
 
-        $this->validation->setRules([
-            'foo' => 'is_numeric',
-        ], $messages);
-
+        $this->validation->setRules(['foo' => 'is_numeric'], $messages);
         $this->validation->run($data);
         $this->assertSame('Nope. Not a number.', $this->validation->getError('foo'));
     }
 
-    public function testCheck()
+    public function testCheck(): void
     {
         $this->assertFalse($this->validation->check('notanumber', 'is_numeric'));
     }
 
-    public function testCheckLocalizedError()
+    public function testCheckLocalizedError(): void
     {
         $this->assertFalse($this->validation->check('notanumber', 'is_numeric'));
         $this->assertSame('Validation.is_numeric', $this->validation->getError());
     }
 
-    public function testCheckCustomError()
+    public function testCheckCustomError(): void
     {
         $this->validation->check('notanumber', 'is_numeric', [
             'is_numeric' => 'Nope. Not a number.',
@@ -166,122 +142,87 @@ public function testCheckCustomError()
         $this->assertSame('Nope. Not a number.', $this->validation->getError());
     }
 
-    public function testGetErrors()
+    public function testGetErrors(): void
     {
-        $data = [
-            'foo' => 'notanumber',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'is_numeric',
-        ]);
-
+        $data = ['foo' => 'notanumber'];
+        $this->validation->setRules(['foo' => 'is_numeric']);
         $this->validation->run($data);
-
         $this->assertSame(['foo' => 'Validation.is_numeric'], $this->validation->getErrors());
     }
 
-    public function testGetErrorsWhenNone()
+    public function testGetErrorsWhenNone(): void
     {
-        $_SESSION = [];
-
-        $data = [
-            'foo' => 123,
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'is_numeric',
-        ]);
-
+        $data = ['foo' => 123];
+        $this->validation->setRules(['foo' => 'is_numeric']);
         $this->validation->run($data);
-
         $this->assertSame([], $this->validation->getErrors());
     }
 
-    public function testSetErrors()
+    public function testSetErrors(): void
     {
-        $this->validation->setRules([
-            'foo' => 'is_numeric',
-        ]);
-
+        $this->validation->setRules(['foo' => 'is_numeric']);
         $this->validation->setError('foo', 'Nadda');
-
         $this->assertSame(['foo' => 'Nadda'], $this->validation->getErrors());
     }
 
-    public function testRulesReturnErrors()
+    public function testRulesReturnErrors(): void
     {
-        $this->validation->setRules([
-            'foo' => 'customError',
-        ]);
-
+        $this->validation->setRules(['foo' => 'customError']);
         $this->validation->run(['foo' => 'bar']);
-
         $this->assertSame(['foo' => 'My lovely error'], $this->validation->getErrors());
     }
 
-    public function testGroupsReadFromConfig()
+    public function testGroupsReadFromConfig(): void
     {
-        $data = [
-            'foo' => 'bar',
-        ];
-
+        $data = ['foo' => 'bar'];
         $this->assertFalse($this->validation->run($data, 'groupA'));
         $this->assertSame('Shame, shame. Too short.', $this->validation->getError('foo'));
     }
 
-    public function testGroupsReadFromConfigValid()
+    public function testGroupsReadFromConfigValid(): void
     {
-        $data = [
-            'foo' => 'barsteps',
-        ];
-
+        $data = ['foo' => 'barsteps'];
         $this->assertTrue($this->validation->run($data, 'groupA'));
     }
 
-    public function testGetRuleGroup()
+    public function testGetRuleGroup(): void
     {
         $this->assertSame([
             'foo' => 'required|min_length[5]',
         ], $this->validation->getRuleGroup('groupA'));
     }
 
-    public function testGetRuleGroupException()
+    public function testGetRuleGroupException(): void
     {
         $this->expectException(ValidationException::class);
         $this->validation->getRuleGroup('groupZ');
     }
 
-    public function testSetRuleGroup()
+    public function testSetRuleGroup(): void
     {
         $this->validation->setRuleGroup('groupA');
-
         $this->assertSame([
             'foo' => 'required|min_length[5]',
         ], $this->validation->getRules());
     }
 
-    public function testSetRuleGroupException()
+    public function testSetRuleGroupException(): void
     {
         $this->expectException(ValidationException::class);
-
         $this->validation->setRuleGroup('groupZ');
     }
 
-    public function testSetRuleGroupWithCustomErrorMessage()
+    public function testSetRuleGroupWithCustomErrorMessage(): void
     {
         $this->validation->reset();
         $this->validation->setRuleGroup('login');
-        $this->validation->run([
-            'username' => 'codeigniter',
-        ]);
-
+        $this->validation->run(['username' => 'codeigniter']);
         $this->assertSame([
             'password' => 'custom password required error msg.',
         ], $this->validation->getErrors());
     }
 
-    public function testRunGroupWithCustomErrorMessage()
+    public function testRunGroupWithCustomErrorMessage(): void
     {
         $this->validation->reset();
         $this->validation->run([
@@ -296,28 +237,20 @@ public function testRunGroupWithCustomErrorMessage()
     /**
      * @dataProvider rulesSetupProvider
      *
-     * @param mixed $rules
-     * @param mixed $expected
-     * @param mixed $errors
+     * @param string|string[] $rules
+     * @param string          $expected
      */
-    public function testRulesSetup($rules, $expected, $errors = [])
+    public function testRulesSetup($rules, $expected, array $errors = [])
     {
-        $data = [
-            'foo' => '',
-        ];
-
-        $this->validation->setRules([
-            'foo' => $rules,
-        ], $errors);
-
+        $data = ['foo' => ''];
+        $this->validation->setRules(['foo' => $rules], $errors);
         $this->validation->run($data);
-
         $this->assertSame($expected, $this->validation->getError('foo'));
     }
 
-    public function rulesSetupProvider()
+    public function rulesSetupProvider(): Generator
     {
-        return [
+        yield from [
             [
                 'min_length[10]',
                 'The foo field must be at least 10 characters in length.',
@@ -366,7 +299,7 @@ public function rulesSetupProvider()
         ];
     }
 
-    public function testSetRulesRemovesErrorsArray()
+    public function testSetRulesRemovesErrorsArray(): void
     {
         $rules = [
             'foo' => [
@@ -379,13 +312,11 @@ public function testSetRulesRemovesErrorsArray()
         ];
 
         $this->validation->setRules($rules, []);
-
         $this->validation->run(['foo' => 'abc']);
-
         $this->assertSame('The Foo Bar field is very short.', $this->validation->getError('foo'));
     }
 
-    public function testInvalidRule()
+    public function testInvalidRule(): void
     {
         $this->expectException(ValidationException::class);
 
@@ -395,13 +326,11 @@ public function testInvalidRule()
         ];
         $this->validation->setRules($rules);
 
-        $data = [
-            'foo' => '',
-        ];
+        $data = ['foo' => ''];
         $this->validation->run($data);
     }
 
-    public function testRawInput()
+    public function testRawInput(): void
     {
         $rawstring = 'username=admin001&role=administrator&usepass=0';
 
@@ -419,7 +348,7 @@ public function testRawInput()
         $this->assertSame([], $this->validation->getErrors());
     }
 
-    public function testJsonInput()
+    public function testJsonInput(): void
     {
         $data = [
             'username' => 'admin001',
@@ -449,187 +378,126 @@ public function testJsonInput()
         unset($_SERVER['CONTENT_TYPE']);
     }
 
-    public function testHasRule()
+    public function testHasRule(): void
     {
         $this->validation->setRuleGroup('groupA');
-
         $this->assertTrue($this->validation->hasRule('foo'));
     }
 
-    public function testNotARealGroup()
+    public function testNotARealGroup(): void
     {
         $this->expectException(ValidationException::class);
         $this->validation->setRuleGroup('groupX');
         $this->validation->getRuleGroup('groupX');
     }
 
-    public function testBadTemplate()
+    public function testBadTemplate(): void
     {
         $this->expectException(ValidationException::class);
         $this->validation->listErrors('obviouslyBadTemplate');
     }
 
-    public function testShowNonError()
+    public function testShowNonError(): void
     {
-        $this->validation->setRules([
-            'foo' => 'is_numeric',
-        ]);
-
+        $this->validation->setRules(['foo' => 'is_numeric']);
         $this->validation->setError('foo', 'Nadda');
-
         $this->assertSame('', $this->validation->showError('bogus'));
     }
 
-    public function testShowBadTemplate()
+    public function testShowBadTemplate(): void
     {
         $this->expectException(ValidationException::class);
-
-        $this->validation->setRules([
-            'foo' => 'is_numeric',
-        ]);
+        $this->validation->setRules(['foo' => 'is_numeric']);
         $this->validation->setError('foo', 'Nadda');
-
         $this->assertSame('We should never get here', $this->validation->showError('foo', 'bogus_template'));
     }
 
-    public function testNoRuleSetsSetup()
+    public function testNoRuleSetsSetup(): void
     {
         $this->expectException(ValidationException::class);
 
         $this->config['ruleSets'] = null;
         $this->validation         = new Validation((object) $this->config, Services::renderer());
         $this->validation->reset();
-
-        $data = [
-            'foo' => '',
-        ];
-
-        $this->validation->run($data);
+        $this->validation->run(['foo' => '']);
     }
 
-    public function testNotCustomRuleGroup()
+    public function testNotCustomRuleGroup(): void
     {
         $this->expectException(ValidationException::class);
-
-        $data = [
-            'foo' => '',
-        ];
-
+        $data = ['foo' => ''];
         $this->validation->run($data, 'GeorgeRules');
     }
 
-    public function testNotRealCustomRule()
+    public function testNotRealCustomRule(): void
     {
         $this->expectException(ValidationException::class);
-
-        $data = [
-            'foo' => '',
-        ];
-
+        $data = ['foo' => ''];
         $this->validation->run($data, 'groupX');
     }
 
-    public function testHasError()
+    public function testHasError(): void
     {
-        $data = [
-            'foo' => 'notanumber',
-        ];
-
-        $this->validation->setRules([
-            'foo' => 'is_numeric',
-        ]);
-
+        $data = ['foo' => 'notanumber'];
+        $this->validation->setRules(['foo' => 'is_numeric']);
         $this->validation->run($data);
-
         $this->assertTrue($this->validation->hasError('foo'));
     }
 
-    public function testSplitRulesTrue()
+    public function testSplitRulesTrue(): void
     {
-        $data = [
-            'phone' => '0987654321',
-        ];
-
         $this->validation->setRules([
             'phone' => 'required|regex_match[/^(01[2689]|09)[0-9]{8}$/]|numeric',
         ]);
-
-        $result = $this->validation->run($data);
-
-        $this->assertTrue($result);
+        $this->assertTrue($this->validation->run(['phone' => '0987654321']));
     }
 
-    public function testSplitRulesFalse()
+    public function testSplitRulesFalse(): void
     {
-        $data = [
-            'phone' => '09876543214',
-        ];
-
         $this->validation->setRules([
             'phone' => 'required|regex_match[/^(01[2689]|09)[0-9]{8}$/]|numeric',
         ]);
-
-        $result = $this->validation->run($data);
-
-        $this->assertFalse($result);
+        $this->assertFalse($this->validation->run(['phone' => '09876543214']));
     }
 
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/1201
      */
-    public function testSplitNotRegex()
+    public function testSplitNotRegex(): void
     {
         $method = $this->getPrivateMethodInvoker($this->validation, 'splitRules');
-
         $result = $method('uploaded[avatar]|max_size[avatar,1024]');
-
         $this->assertSame('uploaded[avatar]', $result[0]);
     }
 
-    public function testSplitRegex()
+    public function testSplitRegex(): void
     {
         $method = $this->getPrivateMethodInvoker($this->validation, 'splitRules');
-
         $result = $method('required|regex_match[/^[0-9]{4}[\-\.\[\/][0-9]{2}[\-\.\[\/][0-9]{2}/]|max_length[10]');
-
         $this->assertSame('regex_match[/^[0-9]{4}[\-\.\[\/][0-9]{2}[\-\.\[\/][0-9]{2}/]', $result[1]);
     }
 
-    public function testTagReplacement()
+    public function testTagReplacement(): void
     {
-        // data
-        $data = [
-            'Username' => 'Pizza',
-        ];
-
-        // rules
-        $this->validation->setRules([
-            'Username' => 'min_length[6]',
-        ], [
-            'Username' => [
+        $data = ['Username' => 'Pizza'];
+        $this->validation->setRules(
+            ['Username' => 'min_length[6]'],
+            ['Username' => [
                 'min_length' => 'Supplied value ({value}) for {field} must have at least {param} characters.',
-            ],
-        ]);
-
-        // run validation
+            ]]
+        );
         $this->validation->run($data);
-
-        // $errors should contain an associative array
         $errors = $this->validation->getErrors();
 
-        // if "Username" doesn't exist in errors
         if (! isset($errors['Username'])) {
             $this->fail('Unable to find "Username"');
         }
 
-        // expected error message
         $expected = 'Supplied value (Pizza) for Username must have at least 6 characters.';
-
-        // check if they are the same!
         $this->assertSame($expected, $errors['Username']);
     }
 
-    public function testRulesForObjectField()
+    public function testRulesForObjectField(): void
     {
         $this->validation->setRules([
             'configuration' => 'required|check_object_rule',
@@ -640,7 +508,6 @@ public function testRulesForObjectField()
         $this->assertSame([], $this->validation->getErrors());
 
         $this->validation->reset();
-
         $this->validation->setRules([
             'configuration' => 'required|check_object_rule',
         ]);
@@ -655,12 +522,8 @@ public function testRulesForObjectField()
 
     /**
      * @dataProvider arrayFieldDataProvider
-     *
-     * @param mixed $body
-     * @param mixed $rules
-     * @param mixed $results
      */
-    public function testRulesForArrayField($body, $rules, $results)
+    public function testRulesForArrayField(array $body, array $rules, array $results)
     {
         $config          = new App();
         $config->baseURL = 'http://example.com/';
@@ -672,9 +535,9 @@ public function testRulesForArrayField($body, $rules, $results)
         $this->assertSame($results, $this->validation->getErrors());
     }
 
-    public function arrayFieldDataProvider()
+    public function arrayFieldDataProvider(): Generator
     {
-        return [
+        yield from [
             'all_rules_should_pass' => [
                 'body' => [
                     'foo' => [
@@ -728,7 +591,7 @@ public function arrayFieldDataProvider()
         ];
     }
 
-    public function testRulesForSingleRuleWithAsteriskWillReturnNoError()
+    public function testRulesForSingleRuleWithAsteriskWillReturnNoError(): void
     {
         $config          = new App();
         $config->baseURL = 'http://example.com/';
@@ -755,7 +618,7 @@ public function testRulesForSingleRuleWithAsteriskWillReturnNoError()
         $this->assertSame([], $this->validation->getErrors());
     }
 
-    public function testRulesForSingleRuleWithAsteriskWillReturnError()
+    public function testRulesForSingleRuleWithAsteriskWillReturnError(): void
     {
         $config          = new App();
         $config->baseURL = 'http://example.com/';
@@ -785,7 +648,7 @@ public function testRulesForSingleRuleWithAsteriskWillReturnError()
         ], $this->validation->getErrors());
     }
 
-    public function testRulesForSingleRuleWithSingleValue()
+    public function testRulesForSingleRuleWithSingleValue(): void
     {
         $config          = new App();
         $config->baseURL = 'http://example.com/';
@@ -806,7 +669,7 @@ public function testRulesForSingleRuleWithSingleValue()
         ], $this->validation->getErrors());
     }
 
-    public function testTranslatedLabel()
+    public function testTranslatedLabel(): void
     {
         $rules = [
             'foo' => [
@@ -816,13 +679,11 @@ public function testTranslatedLabel()
         ];
 
         $this->validation->setRules($rules, []);
-
         $this->validation->run(['foo' => 'abc']);
-
         $this->assertSame('The Foo Bar Translated field must be at least 10 characters in length.', $this->validation->getError('foo'));
     }
 
-    public function testTranslatedLabelIsMissing()
+    public function testTranslatedLabelIsMissing(): void
     {
         $rules = [
             'foo' => [
@@ -832,13 +693,11 @@ public function testTranslatedLabelIsMissing()
         ];
 
         $this->validation->setRules($rules, []);
-
         $this->validation->run(['foo' => 'abc']);
-
         $this->assertSame('The Foo.bar.is.missing field must be at least 10 characters in length.', $this->validation->getError('foo'));
     }
 
-    public function testTranslatedLabelWithCustomErrorMessage()
+    public function testTranslatedLabelWithCustomErrorMessage(): void
     {
         $rules = [
             'foo' => [
@@ -851,46 +710,32 @@ public function testTranslatedLabelWithCustomErrorMessage()
         ];
 
         $this->validation->setRules($rules, []);
-
         $this->validation->run(['foo' => 'abc']);
-
         $this->assertSame('The Foo Bar Translated field is very short.', $this->validation->getError('foo'));
     }
 
-    public function testTranslatedLabelTagReplacement()
+    public function testTranslatedLabelTagReplacement(): void
     {
-        // data
-        $data = [
-            'Username' => 'Pizza',
-        ];
+        $data = ['Username' => 'Pizza'];
 
-        // rules
-        $this->validation->setRules([
-            'Username' => [
+        $this->validation->setRules(
+            ['Username' => [
                 'label' => 'Foo.bar',
                 'rules' => 'min_length[6]',
-            ],
-        ], [
-            'Username' => [
+            ]],
+            ['Username' => [
                 'min_length' => 'Foo.bar.min_length2',
-            ],
-        ]);
+            ]]
+        );
 
-        // run validation
         $this->validation->run($data);
-
-        // $errors should contain an associative array
         $errors = $this->validation->getErrors();
 
-        // if "Username" doesn't exist in errors
         if (! isset($errors['Username'])) {
             $this->fail('Unable to find "Username"');
         }
 
-        // expected error message
         $expected = 'Supplied value (Pizza) for Foo Bar Translated must have at least 6 characters.';
-
-        // check if they are the same!
         $this->assertSame($expected, $errors['Username']);
     }
 
@@ -905,7 +750,7 @@ public function testDotNotationOnIfExistRule(bool $expected, array $rules, array
         $this->assertSame($expected, $actual);
     }
 
-    public function dotNotationForIfExistProvider()
+    public function dotNotationForIfExistProvider(): Generator
     {
         yield 'dot-on-end-fail' => [
             false,

From 5bf6d51ef49cce76cea3baeaf8fa7905f0c4d6bd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 8 Nov 2021 11:13:14 +0900
Subject: [PATCH 0658/2325] fix: cannot find files in sub-namespaces of the
 same vendor

For example, when you have `CodeIgniter` and `CodeIgniter\Devkit`.
---
 system/Autoloader/FileLocator.php           | 18 ++++++++----------
 tests/system/Autoloader/FileLocatorTest.php | 16 ++++++++++++++--
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index 6fa8109bf992..b8bfdf6df217 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -55,6 +55,7 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
 
         // Standardize slashes to handle nested directories.
         $file = strtr($file, '/', '\\');
+        $file = ltrim($file, '\\');
 
         $segments = explode('\\', $file);
 
@@ -64,23 +65,20 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
         }
 
         $paths    = [];
-        $prefix   = '';
         $filename = '';
 
         // Namespaces always comes with arrays of paths
         $namespaces = $this->autoloader->getNamespace();
 
-        while (! empty($segments)) {
-            $prefix .= empty($prefix) ? array_shift($segments) : '\\' . array_shift($segments);
+        foreach (array_keys($namespaces) as $namespace) {
+            if (substr($file, 0, strlen($namespace)) === $namespace) {
+                // There may be sub-namespaces of the same vendor,
+                // so overwrite them with namespaces found later.
+                $paths = $namespaces[$namespace];
 
-            if (empty($namespaces[$prefix])) {
-                continue;
+                $fileWithoutNamespace = substr($file, strlen($namespace));
+                $filename             = ltrim(str_replace('\\', '/', $fileWithoutNamespace), '/');
             }
-
-            $paths = $namespaces[$prefix];
-
-            $filename = implode('/', $segments);
-            break;
         }
 
         // if no namespaces matched then quit
diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php
index c85e4c215ba2..3a40ed24345b 100644
--- a/tests/system/Autoloader/FileLocatorTest.php
+++ b/tests/system/Autoloader/FileLocatorTest.php
@@ -39,8 +39,11 @@ protected function setUp(): void
                 TESTPATH,
                 SYSTEMPATH,
             ],
-            'Errors' => APPPATH . 'Views/errors',
-            'System' => SUPPORTPATH . 'Autoloader/system',
+            'Errors'              => APPPATH . 'Views/errors',
+            'System'              => SUPPORTPATH . 'Autoloader/system',
+            'CodeIgniter\\Devkit' => [
+                TESTPATH . '_support/',
+            ],
         ]);
 
         $this->locator = new FileLocator($autoloader);
@@ -125,6 +128,15 @@ public function testLocateFileCanFindNestedNamespacedView()
         $this->assertSame($expected, $this->locator->locateFile($file, 'html'));
     }
 
+    public function testLocateFileCanFindNamespacedViewWhenVendorHasTwoNamespaces()
+    {
+        $file = '\CodeIgniter\Devkit\View\Views/simple';
+
+        $expected = ROOTPATH . 'tests/_support/View/Views/simple.php';
+
+        $this->assertSame($expected, $this->locator->locateFile($file, 'Views'));
+    }
+
     public function testLocateFileNotFoundExistingNamespace()
     {
         $file = '\App\Views/unexistence-file.php';

From 033496767fc191db8bc25e57bf10069ba89661e9 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Mon, 8 Nov 2021 13:53:06 +0000
Subject: [PATCH 0659/2325] Prep for 4.1.5 release

---
 system/CodeIgniter.php                        |  2 +-
 user_guide_src/source/changelogs/v4.1.5.rst   |  5 +--
 user_guide_src/source/changelogs/v4.1.6.rst   | 25 +++++++++++++++
 user_guide_src/source/conf.py                 |  2 +-
 .../source/installation/upgrade_405.rst       |  2 +-
 .../source/installation/upgrade_412.rst       |  2 +-
 .../source/installation/upgrade_415.rst       | 32 +++++++++++++++++++
 .../source/installation/upgrading.rst         |  1 +
 8 files changed, 63 insertions(+), 8 deletions(-)
 create mode 100644 user_guide_src/source/changelogs/v4.1.6.rst

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 8b211cf89023..a8ebeef1b5cf 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -45,7 +45,7 @@ class CodeIgniter
     /**
      * The current version of CodeIgniter Framework
      */
-    public const CI_VERSION = '4.1.4';
+    public const CI_VERSION = '4.1.5';
 
     private const MIN_PHP_VERSION = '7.3';
 
diff --git a/user_guide_src/source/changelogs/v4.1.5.rst b/user_guide_src/source/changelogs/v4.1.5.rst
index 77b31cdd6e72..3e8fb8f629f0 100644
--- a/user_guide_src/source/changelogs/v4.1.5.rst
+++ b/user_guide_src/source/changelogs/v4.1.5.rst
@@ -1,7 +1,7 @@
 Version 4.1.5
 #############
 
-Release Date: Not released
+Release Date: November 8, 2021
 
 **4.1.5 release of CodeIgniter4**
 
@@ -33,6 +33,3 @@ Deprecations
 ============
 
 - Deprecated ``CodeIgniter\\Cache\\Handlers\\BaseHandler::RESERVED_CHARACTERS`` in favor of the new config property
-
-Bugs Fixed
-==========
diff --git a/user_guide_src/source/changelogs/v4.1.6.rst b/user_guide_src/source/changelogs/v4.1.6.rst
new file mode 100644
index 000000000000..80800ecbc94b
--- /dev/null
+++ b/user_guide_src/source/changelogs/v4.1.6.rst
@@ -0,0 +1,25 @@
+Version 4.1.6
+#############
+
+Release Date: Not released
+
+**4.1.6 release of CodeIgniter4**
+
+.. contents::
+    :local:
+    :depth: 1
+
+BREAKING
+========
+
+Enhancements
+============
+
+Changes
+=======
+
+Deprecations
+============
+
+Bugs Fixed
+==========
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index f341ddfc25c4..16195c089833 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -24,7 +24,7 @@
 version = '4.1'
 
 # The full version, including alpha/beta/rc tags.
-release = '4.1.4'
+release = '4.1.5'
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/user_guide_src/source/installation/upgrade_405.rst b/user_guide_src/source/installation/upgrade_405.rst
index 5ace64b078d6..2df633e85d31 100644
--- a/user_guide_src/source/installation/upgrade_405.rst
+++ b/user_guide_src/source/installation/upgrade_405.rst
@@ -92,7 +92,7 @@ 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 affect on the runtime:
+many will be simple comments or formatting that have no effect on the runtime:
 
 * ``LICENSE``
 * ``README.md``
diff --git a/user_guide_src/source/installation/upgrade_412.rst b/user_guide_src/source/installation/upgrade_412.rst
index 37624bc7c6dc..b1b8576d23b3 100644
--- a/user_guide_src/source/installation/upgrade_412.rst
+++ b/user_guide_src/source/installation/upgrade_412.rst
@@ -114,7 +114,7 @@ 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 affect on the runtime:
+many will be simple comments or formatting that have no effect on the runtime:
 
 * ``app/Config/App.php``
 * ``app/Config/Autoload.php``
diff --git a/user_guide_src/source/installation/upgrade_415.rst b/user_guide_src/source/installation/upgrade_415.rst
index e0c7574bcc50..3f7c7226ea0b 100644
--- a/user_guide_src/source/installation/upgrade_415.rst
+++ b/user_guide_src/source/installation/upgrade_415.rst
@@ -104,8 +104,40 @@ See *Applying Filters* in :doc:`Routing </incoming/routing>` for the functionali
 Project Files
 =============
 
+Numerous 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>`_.
+
+.. note:: Except in very rare cases for bug fixes, no changes made to files for the project space
+    will break your application. All changes noted here are optional until the next major version,
+    and any mandatory changes will be covered in the sections above.
+
 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:
+
+* ``app/Config/CURLRequest.php``
+* ``app/Config/Cache.php``
+* ``app/Config/Feature.php``
+* ``app/Config/Generators.php``
+* ``app/Config/Publisher.php``
+* ``app/Config/Security.php``
+* ``app/Views/welcome_message.php``
+
 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:
+
+* ``app/Config/CURLRequest.php``
+* ``app/Config/Cache.php``
+* ``app/Config/Feature.php``
+* ``app/Config/Generators.php``
+* ``app/Config/Kint.php``
+* ``app/Config/Publisher.php``
+* ``app/Config/Security.php``
+* ``app/Views/welcome_message.php``
diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index 0264b6eaa3bb..771392d8f81a 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -8,6 +8,7 @@ upgrading from.
 .. toctree::
     :titlesonly:
 
+    Upgrading from 4.1.5 to 4.1.6 <upgrade_416>
     Upgrading from 4.1.4 to 4.1.5 <upgrade_415>
     Upgrading from 4.1.3 to 4.1.4 <upgrade_414>
     Upgrading from 4.1.2 to 4.1.3 <upgrade_413>

From 73f771e0f734fbbb0c100349949de0b0610f4535 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Mon, 8 Nov 2021 16:14:12 +0000
Subject: [PATCH 0660/2325] Fix TOCs

---
 user_guide_src/source/changelogs/index.rst       | 1 +
 user_guide_src/source/installation/upgrading.rst | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/changelogs/index.rst b/user_guide_src/source/changelogs/index.rst
index 2ec12f649150..8a54083777d3 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.1.6
     v4.1.5
     v4.1.4
     v4.1.3
diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index 771392d8f81a..0264b6eaa3bb 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -8,7 +8,6 @@ upgrading from.
 .. toctree::
     :titlesonly:
 
-    Upgrading from 4.1.5 to 4.1.6 <upgrade_416>
     Upgrading from 4.1.4 to 4.1.5 <upgrade_415>
     Upgrading from 4.1.3 to 4.1.4 <upgrade_414>
     Upgrading from 4.1.2 to 4.1.3 <upgrade_413>

From c0ac3bc4aad9881f129c1591f4d99dcebb947e73 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 11:32:09 +0900
Subject: [PATCH 0661/2325] docs: add GitHub auto-generated release note for
 v4.1.5

---
 CHANGELOG.md | 189 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 189 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74513d243589..f1bfe6ce8c3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,194 @@
 # Changelog
 
+## [v4.1.5](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.5) (2021-11-08)
+
+[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.4...v4.1.5)
+
+* Fixes and enhancements to Exceptions by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5052
+* Add entry to changelog for initial PHP 8.1 changes by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5054
+* Apply NoCodeSeparatorCommentFixer by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5053
+* Fix entity name generation when bundled in model by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5055
+* docs: fix indentation of the changelog v4.1.4 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5057
+* Fix variable variable `$$id` in RedisHandler by @Terrorboy in https://github.com/codeigniter4/CodeIgniter4/pull/5062
+* Update 'updated_at' when enabled in replace() by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4684
+* Merge branch '4.2' by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5060
+* Document new coding style guide by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4825
+* Update to phpdocumentor v3.1.1 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5020
+* Add phive to tools in workflow by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5063
+* Test fixing apidocs action by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5064
+* docs: fix upgrade_414 format by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5067
+* docs: update coding-standard links by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5068
+* Update to latest laminas-escaper 2.9.0 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5065
+* docs: add session table change for upgrade by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5069
+* docs: update PSR Compliance (PSR-12) by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5070
+* Update rector/rector requirement from 0.11.52 to 0.11.53 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5071
+* docs: fix view_parser by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5072
+* docs: small fixes for entities by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5077
+* docs: fix db_forge by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5076
+* docs: extended upgrading from CI3 to CI4 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5078
+* docs: add about upgrading migration table by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5079
+* docs: rename v4.2.0 to v4.1.5 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5081
+* [Rector] Clean up rector skip config by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5086
+* docs: fix query_builder RST format by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5083
+* docs: fix sample code in upgrade_routing by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5084
+* docs: small fixes for configuration by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5085
+* docs: fix indentation for migration by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5089
+* docs: add new line at end of file by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5090
+* docs: fix indentation for testing  by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5091
+* Fix typo in Config/Factories.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5092
+* docs: fix api responses by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5093
+* Remove --using-cache=no from php-cs-fixer in pre-commit by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5095
+* Previous Responses by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5034
+* docs: fix cli library by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5099
+* Add composer scripts for coding style by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5098
+* docs: replace tab with space by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5102
+* [Rector] Apply Rector: SimplifyEmptyArrayCheckRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5101
+* docs: replace tab with space by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5105
+* docs: replace tabs with spaces by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5109
+* docs: describe in detail how to add a service by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5112
+* docs: update debugging by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5111
+* IncomingRequest - Trim trailing slash by @najdanovicivan in https://github.com/codeigniter4/CodeIgniter4/pull/4974
+* docs: fix 404 link by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5119
+* docs: fix indentation of list by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5120
+* Remove unintended dead code in pre-commit by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5116
+* docs: small improvement Upgrading from 3.x to 4.x by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5121
+* Fix query binding with two colons in query by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5117
+* docs: replace tabs with spaces by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5122
+* docs: replace tabs with spaces by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5130
+* Fixed the problem that _createTable does not take into account that it returns true. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5133
+* Fix Forge test by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5135
+* Adjust orange color in debug toolbar by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5136
+* docs: replace tabs with spaces by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5140
+* chore(deps-dev): update rector/rector requirement from 0.11.53 to 0.11.54 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5144
+* docs: fix sample code in user_agent.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5146
+* docs: replace tabs with spaces by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5145
+* chore(deps): bump actions/github-script from 4 to 5 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5143
+* Fix MemcachedHandlerTest::testGetMetaData() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5147
+* add SECURITY.md by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5123
+* chore(deps-dev): update rector/rector requirement from 0.11.54 to 0.11.55 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5151
+* docs: fix link styleguide.md in CONTRIBUTING.md by @Felipebros in https://github.com/codeigniter4/CodeIgniter4/pull/5152
+* docs: fix Google.com to DuckDuckGo.com by @Felipebros in https://github.com/codeigniter4/CodeIgniter4/pull/5153
+* Fix color not updated in several places of the precompiled CSS by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5155
+* chore(deps-dev): update rector/rector requirement from 0.11.55 to 0.11.56 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5154
+* Fix `Model::__call` throwing `BadMethodCallException` on empty results by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5139
+* Error when value is an object - validating api data by @daycry in https://github.com/codeigniter4/CodeIgniter4/pull/5142
+* Fix debugbar styles printing by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5100
+* docs: fix tests/README by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5166
+* Always escape identifiers in the set(), setUpdateBatch(), and insertBatch() by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5132
+* docs: fix classname for testing by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5169
+* Fix highlighting in database debug toolbar by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5129
+* Fixed an issue where the dropForeginKey method would execute an empty query when the dropConstraintStr property was empty. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5173
+* docs: fix coding style in uploaded_files.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5174
+* fix typo by @sba in https://github.com/codeigniter4/CodeIgniter4/pull/5124
+* Multiple filters for a route and classname filter by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5128
+* (Paging) Ensure page validity by @puschie286 in https://github.com/codeigniter4/CodeIgniter4/pull/5125
+* Fix debug toolbar db connection count by @danielTiringer in https://github.com/codeigniter4/CodeIgniter4/pull/5172
+* Extract method to get prefix for DB access function by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5178
+* Add tabs detector for RST files by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5165
+* feat: `_` can be used as separators in environment variable names by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5156
+* chore(deps-dev): update rector/rector requirement from 0.11.56 to 0.11.57 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5177
+* docs: fix 404 links to sytle guide by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5167
+* docs: convert `contributing/*.rst` to `*.md` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5180
+* Fixed a problem with not run escape for identities in like when `insensitiveSearch` is true. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5170
+* Fixed an issue where an unnecessary prefix was given when the random number was a column. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5179
+* Enable `no_alternative_syntax` rule by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5181
+* Add support for new fixers added in php-cs-fixer v3.2.0 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5175
+* Refactor/optimise starter's tests by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5158
+* Add unit test to ensure named binds don't get replaced in binded values by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5184
+* Fix  PHPDoc for Security by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5187
+* Fix Cache testGetMetaData() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5189
+* Feature - Mark duplicate queries by @danielTiringer in https://github.com/codeigniter4/CodeIgniter4/pull/5185
+* Remove coverage.txt by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5188
+* chore: add Database in bug report template by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5182
+* Improve `model()` auto-completion by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5186
+* Change behavior of `class_attributes_separation` rule by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5176
+* Move PR template by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5191
+* docs: rework contributing by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5183
+* Update admin/README.md by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5199
+* Update README by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5197
+* Update CSRF related docs by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5198
+* docs: Github -> GitHub by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5203
+* chore(deps-dev): update rector/rector requirement from 0.11.57 to 0.11.58 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5204
+* [Debug] Add formatted query string to timeline. by @sfadschm in https://github.com/codeigniter4/CodeIgniter4/pull/5196
+* Add `dropKey` method to `Forge` by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5171
+* [Debug] Improve keyword highlighting and escaping of query strings.  by @sfadschm in https://github.com/codeigniter4/CodeIgniter4/pull/5200
+* Fix CSRF filter does not work when set it to only post by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5194
+* Fix GC issue when session lifetime is set to 0 by @lf-uraku-yuki in https://github.com/codeigniter4/CodeIgniter4/pull/4744
+* docs: small improvement in debugging by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5208
+* Add `@group CacheLive` to tests by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5209
+* docs: remove link to Model in routing.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5210
+* docs: unify the decoration of app/Config/*.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5213
+* chore(deps-dev): update rector/rector requirement from 0.11.58 to 0.11.59 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5219
+* docs: improve Form Validation Tutorial by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5223
+* Improve contributing docs by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5222
+* Fix typo in @var classname in Tests by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5216
+* docs: add caution on filtering to routing.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5212
+* chore(deps-dev): update rector/rector requirement from 0.11.59 to 0.11.60 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5225
+* Improve tests/README.md by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5221
+* add escape to identifiers for document. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5195
+* Add Session based CSRF Protection by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5201
+* Add CSRF Protection for PUT/PATCH/DELETE by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5228
+* docs: improve Upgrading 4.1.5 page format by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5232
+* Rename toolbar loader to be a regular JS file by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5224
+* Remove invalid @runTestsInSeparateProcesses by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5217
+* [HTTP] Update Http Status Description based on latest iana.org by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5235
+* Fix user guide on CSRF by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5230
+* Remove CSRF properties by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5231
+* docs: improve validation.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5233
+* [Rector] Using LevelSetList::UP_TO_PHP_73 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5239
+* Switch PHPCPD to tool by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5240
+* docs: fix installation/upgrade_4xx.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5238
+* docs: fix format of testing/overview.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5237
+* Fix Publisher test failures on macOS by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5211
+* docs: fix typography.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5241
+* Add CSRF test by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5236
+* Fix TimeTest::testToFormattedDateString() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5245
+* Fix wrong helper path resolution by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5246
+* docs: decorate `.env` with `**` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5248
+* style: global_namespace_import true by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5250
+* Fix CreateDatabaseTest::testCreateDatabase() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5244
+* docs: fix security_helper.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5252
+* docs: fix upgrade_security.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5253
+* Cleanup php-cs-fixer config files by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5254
+* Optimize `builds` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5255
+* Replace explicit calls to `Services::reset()` in tests by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5259
+* Remove static variables for PHP 8.1 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5262
+* Fix: remove CURLRequest headers sharing from $_SERVER by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5249
+* Fix CURLRequest extra headers by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5218
+* Speed up `CommonSingleServiceTest` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5258
+* Disable blank issues by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5257
+* Replace usage of `FILTER_SANITIZE_STRING` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5263
+* Enable `ordered_class_elements` rule by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5265
+* Convert bug report to new syntax by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5264
+* Enclose the PR template's notes as comments by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5256
+* Simplify logic of `number_to_roman` function by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5270
+* [Rector] Refactor UnderscoreToCamelCaseVariableNameRector so no longer require symplify/package-builder by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5271
+* Refactor FiltersTest.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5242
+* docs: add how to fix code with Rector by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5273
+* Fix Localization not working/being ignored for 404 page by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5267
+* docs: fix html_helper.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5276
+* docs: move CSRF Protection Methods section up by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5275
+* Fix compatibility of `PgSql\Result` on closing the result instance by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5279
+* Fix compatibility of Postgres result for PHP 8.1 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5278
+* [Rector] Remove FixClassCaseSensitivityNameRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5288
+* Update bug report template by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5287
+* docs: update Tutorial by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5285
+* docs: improve modules.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5281
+* feat: add valid_url_strict rule by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5268
+* fix: module filters are not discovered when using route filters by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5280
+* docs: improve routing.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5284
+* docs: fix RST format in caching.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5291
+* Reduce memory usage of insertBatch(), updateBatch() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5202
+* Prep for 4.1.5 release by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5293
+* 4.1.5 Ready code by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5294
+
+## New Contributors
+* @Terrorboy made their first contribution in https://github.com/codeigniter4/CodeIgniter4/pull/5062
+* @vlakoff made their first contribution in https://github.com/codeigniter4/CodeIgniter4/pull/5136
+* @Felipebros made their first contribution in https://github.com/codeigniter4/CodeIgniter4/pull/5152
+* @daycry made their first contribution in https://github.com/codeigniter4/CodeIgniter4/pull/5142
+* @danielTiringer made their first contribution in https://github.com/codeigniter4/CodeIgniter4/pull/5172
+
 ## [v4.1.4](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.4) (2021-09-06)
 
 This release focuses on code style. All changes (except those noted below) are cosmetic to bring the code in line with the new

From 8cb858bd6e8b203afadf04ac927744c54857e339 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 11:39:49 +0900
Subject: [PATCH 0662/2325] docs: add and fix headings

---
 CHANGELOG.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1bfe6ce8c3d..582fc05daddc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@
 
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.4...v4.1.5)
 
+**Fixed bugs:**
+
+**Implemented enhancements:**
+
+**Merged pull requests:**
+
 * Fixes and enhancements to Exceptions by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5052
 * Add entry to changelog for initial PHP 8.1 changes by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5054
 * Apply NoCodeSeparatorCommentFixer by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5053
@@ -182,7 +188,8 @@
 * Prep for 4.1.5 release by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5293
 * 4.1.5 Ready code by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5294
 
-## New Contributors
+**New Contributors**
+
 * @Terrorboy made their first contribution in https://github.com/codeigniter4/CodeIgniter4/pull/5062
 * @vlakoff made their first contribution in https://github.com/codeigniter4/CodeIgniter4/pull/5136
 * @Felipebros made their first contribution in https://github.com/codeigniter4/CodeIgniter4/pull/5152

From 21a29fd5c3360067cdd4661f1776e8a407558ae3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 11:44:12 +0900
Subject: [PATCH 0663/2325] docs: move Fixed PRs

---
 CHANGELOG.md | 49 +++++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 582fc05daddc..53f356e6a787 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,17 +6,38 @@
 
 **Fixed bugs:**
 
+* Fixes and enhancements to Exceptions by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5052
+* Fix entity name generation when bundled in model by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5055
+* Fix variable variable `$$id` in RedisHandler by @Terrorboy in https://github.com/codeigniter4/CodeIgniter4/pull/5062
+* Previous Responses by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5034
+* Fix query binding with two colons in query by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5117
+* Fixed the problem that _createTable does not take into account that it returns true. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5133
+* Fix color not updated in several places of the precompiled CSS by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5155
+* Fix `Model::__call` throwing `BadMethodCallException` on empty results by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5139
+* Error when value is an object - validating api data by @daycry in https://github.com/codeigniter4/CodeIgniter4/pull/5142
+* Fix debugbar styles printing by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5100
+* Fix highlighting in database debug toolbar by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5129
+* Fixed an issue where the dropForeginKey method would execute an empty query when the dropConstraintStr property was empty. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5173
+* Fix debug toolbar db connection count by @danielTiringer in https://github.com/codeigniter4/CodeIgniter4/pull/5172
+* Fixed a problem with not run escape for identities in like when `insensitiveSearch` is true. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5170
+* Fixed an issue where an unnecessary prefix was given when the random number was a column. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5179
+* Fix CSRF filter does not work when set it to only post by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5194
+* Fix GC issue when session lifetime is set to 0 by @lf-uraku-yuki in https://github.com/codeigniter4/CodeIgniter4/pull/4744
+* Fix wrong helper path resolution by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5246
+* Fix: remove CURLRequest headers sharing from $_SERVER by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5249
+* Fix CURLRequest extra headers by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5218
+* Fix Localization not working/being ignored for 404 page by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5267
+* fix: module filters are not discovered when using route filters by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5280
+* Update 'updated_at' when enabled in replace() by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4684
+* IncomingRequest - Trim trailing slash by @najdanovicivan in https://github.com/codeigniter4/CodeIgniter4/pull/4974
+
 **Implemented enhancements:**
 
 **Merged pull requests:**
 
-* Fixes and enhancements to Exceptions by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5052
 * Add entry to changelog for initial PHP 8.1 changes by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5054
 * Apply NoCodeSeparatorCommentFixer by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5053
-* Fix entity name generation when bundled in model by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5055
 * docs: fix indentation of the changelog v4.1.4 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5057
-* Fix variable variable `$$id` in RedisHandler by @Terrorboy in https://github.com/codeigniter4/CodeIgniter4/pull/5062
-* Update 'updated_at' when enabled in replace() by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4684
 * Merge branch '4.2' by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5060
 * Document new coding style guide by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4825
 * Update to phpdocumentor v3.1.1 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5020
@@ -44,7 +65,6 @@
 * Fix typo in Config/Factories.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5092
 * docs: fix api responses by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5093
 * Remove --using-cache=no from php-cs-fixer in pre-commit by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5095
-* Previous Responses by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5034
 * docs: fix cli library by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5099
 * Add composer scripts for coding style by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5098
 * docs: replace tab with space by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5102
@@ -53,15 +73,12 @@
 * docs: replace tabs with spaces by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5109
 * docs: describe in detail how to add a service by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5112
 * docs: update debugging by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5111
-* IncomingRequest - Trim trailing slash by @najdanovicivan in https://github.com/codeigniter4/CodeIgniter4/pull/4974
 * docs: fix 404 link by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5119
 * docs: fix indentation of list by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5120
 * Remove unintended dead code in pre-commit by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5116
 * docs: small improvement Upgrading from 3.x to 4.x by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5121
-* Fix query binding with two colons in query by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5117
 * docs: replace tabs with spaces by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5122
 * docs: replace tabs with spaces by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5130
-* Fixed the problem that _createTable does not take into account that it returns true. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5133
 * Fix Forge test by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5135
 * Adjust orange color in debug toolbar by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5136
 * docs: replace tabs with spaces by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5140
@@ -74,29 +91,20 @@
 * chore(deps-dev): update rector/rector requirement from 0.11.54 to 0.11.55 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5151
 * docs: fix link styleguide.md in CONTRIBUTING.md by @Felipebros in https://github.com/codeigniter4/CodeIgniter4/pull/5152
 * docs: fix Google.com to DuckDuckGo.com by @Felipebros in https://github.com/codeigniter4/CodeIgniter4/pull/5153
-* Fix color not updated in several places of the precompiled CSS by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5155
 * chore(deps-dev): update rector/rector requirement from 0.11.55 to 0.11.56 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5154
-* Fix `Model::__call` throwing `BadMethodCallException` on empty results by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5139
-* Error when value is an object - validating api data by @daycry in https://github.com/codeigniter4/CodeIgniter4/pull/5142
-* Fix debugbar styles printing by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5100
 * docs: fix tests/README by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5166
 * Always escape identifiers in the set(), setUpdateBatch(), and insertBatch() by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5132
 * docs: fix classname for testing by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5169
-* Fix highlighting in database debug toolbar by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5129
-* Fixed an issue where the dropForeginKey method would execute an empty query when the dropConstraintStr property was empty. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5173
 * docs: fix coding style in uploaded_files.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5174
 * fix typo by @sba in https://github.com/codeigniter4/CodeIgniter4/pull/5124
 * Multiple filters for a route and classname filter by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5128
 * (Paging) Ensure page validity by @puschie286 in https://github.com/codeigniter4/CodeIgniter4/pull/5125
-* Fix debug toolbar db connection count by @danielTiringer in https://github.com/codeigniter4/CodeIgniter4/pull/5172
 * Extract method to get prefix for DB access function by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5178
 * Add tabs detector for RST files by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5165
 * feat: `_` can be used as separators in environment variable names by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5156
 * chore(deps-dev): update rector/rector requirement from 0.11.56 to 0.11.57 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5177
 * docs: fix 404 links to sytle guide by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5167
 * docs: convert `contributing/*.rst` to `*.md` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5180
-* Fixed a problem with not run escape for identities in like when `insensitiveSearch` is true. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5170
-* Fixed an issue where an unnecessary prefix was given when the random number was a column. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5179
 * Enable `no_alternative_syntax` rule by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5181
 * Add support for new fixers added in php-cs-fixer v3.2.0 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5175
 * Refactor/optimise starter's tests by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5158
@@ -118,8 +126,6 @@
 * [Debug] Add formatted query string to timeline. by @sfadschm in https://github.com/codeigniter4/CodeIgniter4/pull/5196
 * Add `dropKey` method to `Forge` by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5171
 * [Debug] Improve keyword highlighting and escaping of query strings.  by @sfadschm in https://github.com/codeigniter4/CodeIgniter4/pull/5200
-* Fix CSRF filter does not work when set it to only post by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5194
-* Fix GC issue when session lifetime is set to 0 by @lf-uraku-yuki in https://github.com/codeigniter4/CodeIgniter4/pull/4744
 * docs: small improvement in debugging by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5208
 * Add `@group CacheLive` to tests by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5209
 * docs: remove link to Model in routing.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5210
@@ -149,7 +155,6 @@
 * docs: fix typography.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5241
 * Add CSRF test by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5236
 * Fix TimeTest::testToFormattedDateString() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5245
-* Fix wrong helper path resolution by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5246
 * docs: decorate `.env` with `**` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5248
 * style: global_namespace_import true by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5250
 * Fix CreateDatabaseTest::testCreateDatabase() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5244
@@ -159,8 +164,6 @@
 * Optimize `builds` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5255
 * Replace explicit calls to `Services::reset()` in tests by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5259
 * Remove static variables for PHP 8.1 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5262
-* Fix: remove CURLRequest headers sharing from $_SERVER by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5249
-* Fix CURLRequest extra headers by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5218
 * Speed up `CommonSingleServiceTest` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5258
 * Disable blank issues by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5257
 * Replace usage of `FILTER_SANITIZE_STRING` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5263
@@ -171,7 +174,6 @@
 * [Rector] Refactor UnderscoreToCamelCaseVariableNameRector so no longer require symplify/package-builder by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5271
 * Refactor FiltersTest.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5242
 * docs: add how to fix code with Rector by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5273
-* Fix Localization not working/being ignored for 404 page by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5267
 * docs: fix html_helper.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5276
 * docs: move CSRF Protection Methods section up by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5275
 * Fix compatibility of `PgSql\Result` on closing the result instance by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5279
@@ -181,7 +183,6 @@
 * docs: update Tutorial by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5285
 * docs: improve modules.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5281
 * feat: add valid_url_strict rule by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5268
-* fix: module filters are not discovered when using route filters by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5280
 * docs: improve routing.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5284
 * docs: fix RST format in caching.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5291
 * Reduce memory usage of insertBatch(), updateBatch() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5202

From b5167aaf7d1a4ba5ff251c193c224781c283cb62 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 11:51:23 +0900
Subject: [PATCH 0664/2325] docs: move enhancements PRs

---
 CHANGELOG.md | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53f356e6a787..974a7dab4a7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,18 @@
 
 **Implemented enhancements:**
 
+* Always escape identifiers in the set(), setUpdateBatch(), and insertBatch() by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5132
+* Multiple filters for a route and classname filter by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5128
+* feat: `_` can be used as separators in environment variable names by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5156
+* Feature - Mark duplicate queries by @danielTiringer in https://github.com/codeigniter4/CodeIgniter4/pull/5185
+* [Debug] Add formatted query string to timeline. by @sfadschm in https://github.com/codeigniter4/CodeIgniter4/pull/5196
+* Add `dropKey` method to `Forge` by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5171
+* [Debug] Improve keyword highlighting and escaping of query strings.  by @sfadschm in https://github.com/codeigniter4/CodeIgniter4/pull/5200
+* Add Session based CSRF Protection by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5201
+* Add CSRF Protection for PUT/PATCH/DELETE by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5228
+* feat: add valid_url_strict rule by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5268
+* Reduce memory usage of insertBatch(), updateBatch() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5202
+
 **Merged pull requests:**
 
 * Add entry to changelog for initial PHP 8.1 changes by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5054
@@ -93,15 +105,12 @@
 * docs: fix Google.com to DuckDuckGo.com by @Felipebros in https://github.com/codeigniter4/CodeIgniter4/pull/5153
 * chore(deps-dev): update rector/rector requirement from 0.11.55 to 0.11.56 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5154
 * docs: fix tests/README by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5166
-* Always escape identifiers in the set(), setUpdateBatch(), and insertBatch() by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5132
 * docs: fix classname for testing by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5169
 * docs: fix coding style in uploaded_files.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5174
 * fix typo by @sba in https://github.com/codeigniter4/CodeIgniter4/pull/5124
-* Multiple filters for a route and classname filter by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5128
 * (Paging) Ensure page validity by @puschie286 in https://github.com/codeigniter4/CodeIgniter4/pull/5125
 * Extract method to get prefix for DB access function by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5178
 * Add tabs detector for RST files by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5165
-* feat: `_` can be used as separators in environment variable names by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5156
 * chore(deps-dev): update rector/rector requirement from 0.11.56 to 0.11.57 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5177
 * docs: fix 404 links to sytle guide by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5167
 * docs: convert `contributing/*.rst` to `*.md` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5180
@@ -111,7 +120,6 @@
 * Add unit test to ensure named binds don't get replaced in binded values by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5184
 * Fix  PHPDoc for Security by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5187
 * Fix Cache testGetMetaData() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5189
-* Feature - Mark duplicate queries by @danielTiringer in https://github.com/codeigniter4/CodeIgniter4/pull/5185
 * Remove coverage.txt by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5188
 * chore: add Database in bug report template by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5182
 * Improve `model()` auto-completion by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5186
@@ -123,9 +131,6 @@
 * Update CSRF related docs by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5198
 * docs: Github -> GitHub by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5203
 * chore(deps-dev): update rector/rector requirement from 0.11.57 to 0.11.58 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5204
-* [Debug] Add formatted query string to timeline. by @sfadschm in https://github.com/codeigniter4/CodeIgniter4/pull/5196
-* Add `dropKey` method to `Forge` by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5171
-* [Debug] Improve keyword highlighting and escaping of query strings.  by @sfadschm in https://github.com/codeigniter4/CodeIgniter4/pull/5200
 * docs: small improvement in debugging by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5208
 * Add `@group CacheLive` to tests by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5209
 * docs: remove link to Model in routing.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5210
@@ -138,8 +143,6 @@
 * chore(deps-dev): update rector/rector requirement from 0.11.59 to 0.11.60 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5225
 * Improve tests/README.md by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5221
 * add escape to identifiers for document. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5195
-* Add Session based CSRF Protection by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5201
-* Add CSRF Protection for PUT/PATCH/DELETE by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5228
 * docs: improve Upgrading 4.1.5 page format by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5232
 * Rename toolbar loader to be a regular JS file by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5224
 * Remove invalid @runTestsInSeparateProcesses by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5217
@@ -182,10 +185,8 @@
 * Update bug report template by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5287
 * docs: update Tutorial by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5285
 * docs: improve modules.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5281
-* feat: add valid_url_strict rule by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5268
 * docs: improve routing.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5284
 * docs: fix RST format in caching.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5291
-* Reduce memory usage of insertBatch(), updateBatch() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5202
 * Prep for 4.1.5 release by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5293
 * 4.1.5 Ready code by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5294
 

From a32754ca55947df91038f55a7a9af57101debb24 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 11:54:45 +0900
Subject: [PATCH 0665/2325] docs: remove docs PRs

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 974a7dab4a7a..01b46aa6edd5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,71 +49,32 @@
 
 * Add entry to changelog for initial PHP 8.1 changes by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5054
 * Apply NoCodeSeparatorCommentFixer by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5053
-* docs: fix indentation of the changelog v4.1.4 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5057
 * Merge branch '4.2' by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5060
 * Document new coding style guide by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4825
 * Update to phpdocumentor v3.1.1 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5020
 * Add phive to tools in workflow by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5063
 * Test fixing apidocs action by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5064
-* docs: fix upgrade_414 format by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5067
-* docs: update coding-standard links by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5068
 * Update to latest laminas-escaper 2.9.0 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5065
-* docs: add session table change for upgrade by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5069
-* docs: update PSR Compliance (PSR-12) by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5070
 * Update rector/rector requirement from 0.11.52 to 0.11.53 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5071
-* docs: fix view_parser by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5072
-* docs: small fixes for entities by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5077
-* docs: fix db_forge by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5076
-* docs: extended upgrading from CI3 to CI4 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5078
-* docs: add about upgrading migration table by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5079
-* docs: rename v4.2.0 to v4.1.5 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5081
 * [Rector] Clean up rector skip config by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5086
-* docs: fix query_builder RST format by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5083
-* docs: fix sample code in upgrade_routing by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5084
-* docs: small fixes for configuration by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5085
-* docs: fix indentation for migration by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5089
-* docs: add new line at end of file by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5090
-* docs: fix indentation for testing  by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5091
 * Fix typo in Config/Factories.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5092
-* docs: fix api responses by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5093
 * Remove --using-cache=no from php-cs-fixer in pre-commit by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5095
-* docs: fix cli library by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5099
 * Add composer scripts for coding style by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5098
-* docs: replace tab with space by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5102
 * [Rector] Apply Rector: SimplifyEmptyArrayCheckRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5101
-* docs: replace tab with space by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5105
-* docs: replace tabs with spaces by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5109
-* docs: describe in detail how to add a service by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5112
-* docs: update debugging by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5111
-* docs: fix 404 link by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5119
-* docs: fix indentation of list by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5120
 * Remove unintended dead code in pre-commit by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5116
-* docs: small improvement Upgrading from 3.x to 4.x by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5121
-* docs: replace tabs with spaces by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5122
-* docs: replace tabs with spaces by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5130
 * Fix Forge test by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5135
 * Adjust orange color in debug toolbar by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5136
-* docs: replace tabs with spaces by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5140
 * chore(deps-dev): update rector/rector requirement from 0.11.53 to 0.11.54 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5144
-* docs: fix sample code in user_agent.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5146
-* docs: replace tabs with spaces by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5145
 * chore(deps): bump actions/github-script from 4 to 5 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5143
 * Fix MemcachedHandlerTest::testGetMetaData() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5147
 * add SECURITY.md by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5123
 * chore(deps-dev): update rector/rector requirement from 0.11.54 to 0.11.55 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5151
-* docs: fix link styleguide.md in CONTRIBUTING.md by @Felipebros in https://github.com/codeigniter4/CodeIgniter4/pull/5152
-* docs: fix Google.com to DuckDuckGo.com by @Felipebros in https://github.com/codeigniter4/CodeIgniter4/pull/5153
 * chore(deps-dev): update rector/rector requirement from 0.11.55 to 0.11.56 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5154
-* docs: fix tests/README by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5166
-* docs: fix classname for testing by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5169
-* docs: fix coding style in uploaded_files.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5174
 * fix typo by @sba in https://github.com/codeigniter4/CodeIgniter4/pull/5124
 * (Paging) Ensure page validity by @puschie286 in https://github.com/codeigniter4/CodeIgniter4/pull/5125
 * Extract method to get prefix for DB access function by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5178
 * Add tabs detector for RST files by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5165
 * chore(deps-dev): update rector/rector requirement from 0.11.56 to 0.11.57 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5177
-* docs: fix 404 links to sytle guide by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5167
-* docs: convert `contributing/*.rst` to `*.md` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5180
 * Enable `no_alternative_syntax` rule by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5181
 * Add support for new fixers added in php-cs-fixer v3.2.0 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5175
 * Refactor/optimise starter's tests by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5158
@@ -125,44 +86,27 @@
 * Improve `model()` auto-completion by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5186
 * Change behavior of `class_attributes_separation` rule by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5176
 * Move PR template by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5191
-* docs: rework contributing by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5183
 * Update admin/README.md by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5199
 * Update README by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5197
-* Update CSRF related docs by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5198
-* docs: Github -> GitHub by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5203
 * chore(deps-dev): update rector/rector requirement from 0.11.57 to 0.11.58 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5204
-* docs: small improvement in debugging by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5208
 * Add `@group CacheLive` to tests by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5209
-* docs: remove link to Model in routing.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5210
-* docs: unify the decoration of app/Config/*.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5213
 * chore(deps-dev): update rector/rector requirement from 0.11.58 to 0.11.59 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5219
-* docs: improve Form Validation Tutorial by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5223
-* Improve contributing docs by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5222
 * Fix typo in @var classname in Tests by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5216
-* docs: add caution on filtering to routing.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5212
 * chore(deps-dev): update rector/rector requirement from 0.11.59 to 0.11.60 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5225
 * Improve tests/README.md by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5221
 * add escape to identifiers for document. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5195
-* docs: improve Upgrading 4.1.5 page format by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5232
 * Rename toolbar loader to be a regular JS file by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5224
 * Remove invalid @runTestsInSeparateProcesses by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5217
 * [HTTP] Update Http Status Description based on latest iana.org by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5235
 * Fix user guide on CSRF by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5230
 * Remove CSRF properties by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5231
-* docs: improve validation.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5233
 * [Rector] Using LevelSetList::UP_TO_PHP_73 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5239
 * Switch PHPCPD to tool by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5240
-* docs: fix installation/upgrade_4xx.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5238
-* docs: fix format of testing/overview.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5237
 * Fix Publisher test failures on macOS by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5211
-* docs: fix typography.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5241
 * Add CSRF test by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5236
 * Fix TimeTest::testToFormattedDateString() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5245
-* docs: decorate `.env` with `**` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5248
 * style: global_namespace_import true by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5250
 * Fix CreateDatabaseTest::testCreateDatabase() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5244
-* docs: fix security_helper.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5252
-* docs: fix upgrade_security.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5253
 * Cleanup php-cs-fixer config files by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5254
 * Optimize `builds` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5255
 * Replace explicit calls to `Services::reset()` in tests by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5259
@@ -176,17 +120,10 @@
 * Simplify logic of `number_to_roman` function by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5270
 * [Rector] Refactor UnderscoreToCamelCaseVariableNameRector so no longer require symplify/package-builder by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5271
 * Refactor FiltersTest.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5242
-* docs: add how to fix code with Rector by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5273
-* docs: fix html_helper.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5276
-* docs: move CSRF Protection Methods section up by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5275
 * Fix compatibility of `PgSql\Result` on closing the result instance by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5279
 * Fix compatibility of Postgres result for PHP 8.1 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5278
 * [Rector] Remove FixClassCaseSensitivityNameRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5288
 * Update bug report template by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5287
-* docs: update Tutorial by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5285
-* docs: improve modules.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5281
-* docs: improve routing.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5284
-* docs: fix RST format in caching.rst by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5291
 * Prep for 4.1.5 release by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5293
 * 4.1.5 Ready code by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5294
 

From 4299a59017cfdfab0b90efd7ace44de6c6ce0f92 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 11:59:58 +0900
Subject: [PATCH 0666/2325] docs: remove chore PRs

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01b46aa6edd5..0c9d19058984 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,81 +51,40 @@
 * Apply NoCodeSeparatorCommentFixer by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5053
 * Merge branch '4.2' by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5060
 * Document new coding style guide by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4825
-* Update to phpdocumentor v3.1.1 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5020
-* Add phive to tools in workflow by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5063
-* Test fixing apidocs action by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5064
 * Update to latest laminas-escaper 2.9.0 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5065
-* Update rector/rector requirement from 0.11.52 to 0.11.53 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5071
-* [Rector] Clean up rector skip config by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5086
 * Fix typo in Config/Factories.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5092
-* Remove --using-cache=no from php-cs-fixer in pre-commit by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5095
-* Add composer scripts for coding style by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5098
-* [Rector] Apply Rector: SimplifyEmptyArrayCheckRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5101
 * Remove unintended dead code in pre-commit by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5116
 * Fix Forge test by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5135
 * Adjust orange color in debug toolbar by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5136
-* chore(deps-dev): update rector/rector requirement from 0.11.53 to 0.11.54 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5144
-* chore(deps): bump actions/github-script from 4 to 5 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5143
 * Fix MemcachedHandlerTest::testGetMetaData() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5147
-* add SECURITY.md by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5123
-* chore(deps-dev): update rector/rector requirement from 0.11.54 to 0.11.55 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5151
-* chore(deps-dev): update rector/rector requirement from 0.11.55 to 0.11.56 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5154
 * fix typo by @sba in https://github.com/codeigniter4/CodeIgniter4/pull/5124
 * (Paging) Ensure page validity by @puschie286 in https://github.com/codeigniter4/CodeIgniter4/pull/5125
 * Extract method to get prefix for DB access function by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5178
-* Add tabs detector for RST files by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5165
-* chore(deps-dev): update rector/rector requirement from 0.11.56 to 0.11.57 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5177
-* Enable `no_alternative_syntax` rule by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5181
-* Add support for new fixers added in php-cs-fixer v3.2.0 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5175
 * Refactor/optimise starter's tests by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5158
 * Add unit test to ensure named binds don't get replaced in binded values by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5184
 * Fix  PHPDoc for Security by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5187
 * Fix Cache testGetMetaData() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5189
-* Remove coverage.txt by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5188
-* chore: add Database in bug report template by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5182
 * Improve `model()` auto-completion by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5186
-* Change behavior of `class_attributes_separation` rule by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5176
-* Move PR template by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5191
-* Update admin/README.md by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5199
-* Update README by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5197
-* chore(deps-dev): update rector/rector requirement from 0.11.57 to 0.11.58 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5204
 * Add `@group CacheLive` to tests by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5209
-* chore(deps-dev): update rector/rector requirement from 0.11.58 to 0.11.59 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5219
 * Fix typo in @var classname in Tests by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5216
-* chore(deps-dev): update rector/rector requirement from 0.11.59 to 0.11.60 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5225
-* Improve tests/README.md by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5221
 * add escape to identifiers for document. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5195
 * Rename toolbar loader to be a regular JS file by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5224
 * Remove invalid @runTestsInSeparateProcesses by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5217
 * [HTTP] Update Http Status Description based on latest iana.org by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5235
 * Fix user guide on CSRF by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5230
 * Remove CSRF properties by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5231
-* [Rector] Using LevelSetList::UP_TO_PHP_73 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5239
-* Switch PHPCPD to tool by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5240
 * Fix Publisher test failures on macOS by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5211
 * Add CSRF test by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5236
 * Fix TimeTest::testToFormattedDateString() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5245
-* style: global_namespace_import true by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5250
 * Fix CreateDatabaseTest::testCreateDatabase() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5244
-* Cleanup php-cs-fixer config files by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5254
-* Optimize `builds` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5255
 * Replace explicit calls to `Services::reset()` in tests by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5259
 * Remove static variables for PHP 8.1 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5262
 * Speed up `CommonSingleServiceTest` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5258
-* Disable blank issues by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5257
 * Replace usage of `FILTER_SANITIZE_STRING` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5263
-* Enable `ordered_class_elements` rule by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5265
-* Convert bug report to new syntax by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5264
-* Enclose the PR template's notes as comments by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5256
 * Simplify logic of `number_to_roman` function by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5270
-* [Rector] Refactor UnderscoreToCamelCaseVariableNameRector so no longer require symplify/package-builder by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5271
 * Refactor FiltersTest.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5242
 * Fix compatibility of `PgSql\Result` on closing the result instance by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5279
 * Fix compatibility of Postgres result for PHP 8.1 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5278
-* [Rector] Remove FixClassCaseSensitivityNameRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5288
-* Update bug report template by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5287
-* Prep for 4.1.5 release by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5293
-* 4.1.5 Ready code by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5294
 
 **New Contributors**
 

From 4b1a4a140d404725f70a38a8d74e95cb8c3023cd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 12:04:06 +0900
Subject: [PATCH 0667/2325] docs: remove docs PRs

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c9d19058984..fc2a3e32aadf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,10 +47,8 @@
 
 **Merged pull requests:**
 
-* Add entry to changelog for initial PHP 8.1 changes by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5054
 * Apply NoCodeSeparatorCommentFixer by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5053
 * Merge branch '4.2' by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5060
-* Document new coding style guide by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4825
 * Update to latest laminas-escaper 2.9.0 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5065
 * Fix typo in Config/Factories.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5092
 * Remove unintended dead code in pre-commit by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5116
@@ -62,16 +60,11 @@
 * Extract method to get prefix for DB access function by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5178
 * Refactor/optimise starter's tests by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5158
 * Add unit test to ensure named binds don't get replaced in binded values by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5184
-* Fix  PHPDoc for Security by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5187
 * Fix Cache testGetMetaData() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5189
 * Improve `model()` auto-completion by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5186
-* Add `@group CacheLive` to tests by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5209
-* Fix typo in @var classname in Tests by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5216
-* add escape to identifiers for document. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5195
 * Rename toolbar loader to be a regular JS file by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5224
 * Remove invalid @runTestsInSeparateProcesses by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5217
 * [HTTP] Update Http Status Description based on latest iana.org by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5235
-* Fix user guide on CSRF by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5230
 * Remove CSRF properties by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5231
 * Fix Publisher test failures on macOS by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5211
 * Add CSRF test by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5236

From 3e7972e6bb7595842faefb406d1f23ce524a7c2b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 12:04:47 +0900
Subject: [PATCH 0668/2325] docs: remove chore PRs

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc2a3e32aadf..d523e37787c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,7 +47,6 @@
 
 **Merged pull requests:**
 
-* Apply NoCodeSeparatorCommentFixer by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5053
 * Merge branch '4.2' by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5060
 * Update to latest laminas-escaper 2.9.0 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5065
 * Fix typo in Config/Factories.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5092

From 8e11120a721b72e1e9b5aff3d5108c0de891a4e4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 12:05:27 +0900
Subject: [PATCH 0669/2325] docs: remove docs PRs

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d523e37787c7..e4c06281a8ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,7 +49,6 @@
 
 * Merge branch '4.2' by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5060
 * Update to latest laminas-escaper 2.9.0 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5065
-* Fix typo in Config/Factories.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5092
 * Remove unintended dead code in pre-commit by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5116
 * Fix Forge test by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5135
 * Adjust orange color in debug toolbar by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5136

From be2b7d3ca00951c9867ba4027043c959169b4293 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 12:06:43 +0900
Subject: [PATCH 0670/2325] docs: remove test PRs

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4c06281a8ad..f09a50b8e5cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,30 +50,17 @@
 * Merge branch '4.2' by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5060
 * Update to latest laminas-escaper 2.9.0 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5065
 * Remove unintended dead code in pre-commit by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5116
-* Fix Forge test by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5135
 * Adjust orange color in debug toolbar by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5136
-* Fix MemcachedHandlerTest::testGetMetaData() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5147
 * fix typo by @sba in https://github.com/codeigniter4/CodeIgniter4/pull/5124
 * (Paging) Ensure page validity by @puschie286 in https://github.com/codeigniter4/CodeIgniter4/pull/5125
 * Extract method to get prefix for DB access function by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5178
-* Refactor/optimise starter's tests by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5158
-* Add unit test to ensure named binds don't get replaced in binded values by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5184
-* Fix Cache testGetMetaData() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5189
 * Improve `model()` auto-completion by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5186
 * Rename toolbar loader to be a regular JS file by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5224
-* Remove invalid @runTestsInSeparateProcesses by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5217
 * [HTTP] Update Http Status Description based on latest iana.org by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5235
 * Remove CSRF properties by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5231
-* Fix Publisher test failures on macOS by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5211
-* Add CSRF test by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5236
-* Fix TimeTest::testToFormattedDateString() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5245
-* Fix CreateDatabaseTest::testCreateDatabase() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5244
-* Replace explicit calls to `Services::reset()` in tests by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5259
 * Remove static variables for PHP 8.1 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5262
-* Speed up `CommonSingleServiceTest` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5258
 * Replace usage of `FILTER_SANITIZE_STRING` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5263
 * Simplify logic of `number_to_roman` function by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5270
-* Refactor FiltersTest.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5242
 * Fix compatibility of `PgSql\Result` on closing the result instance by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5279
 * Fix compatibility of Postgres result for PHP 8.1 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5278
 

From 410d83694b25f170a11e2ccde08c322d3750c172 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 12:07:19 +0900
Subject: [PATCH 0671/2325] docs: remove docs PRs

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f09a50b8e5cb..51d592be71e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,7 +51,6 @@
 * Update to latest laminas-escaper 2.9.0 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5065
 * Remove unintended dead code in pre-commit by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5116
 * Adjust orange color in debug toolbar by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5136
-* fix typo by @sba in https://github.com/codeigniter4/CodeIgniter4/pull/5124
 * (Paging) Ensure page validity by @puschie286 in https://github.com/codeigniter4/CodeIgniter4/pull/5125
 * Extract method to get prefix for DB access function by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5178
 * Improve `model()` auto-completion by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5186

From 36475a2bfd8eb7a0691eff982b0f10e5265b02b8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 12:09:06 +0900
Subject: [PATCH 0672/2325] docs: move Fixed PRs

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51d592be71e8..ef65b3c7f942 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 * fix: module filters are not discovered when using route filters by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5280
 * Update 'updated_at' when enabled in replace() by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4684
 * IncomingRequest - Trim trailing slash by @najdanovicivan in https://github.com/codeigniter4/CodeIgniter4/pull/4974
+* (Paging) Ensure page validity by @puschie286 in https://github.com/codeigniter4/CodeIgniter4/pull/5125
 
 **Implemented enhancements:**
 
@@ -51,7 +52,6 @@
 * Update to latest laminas-escaper 2.9.0 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5065
 * Remove unintended dead code in pre-commit by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5116
 * Adjust orange color in debug toolbar by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5136
-* (Paging) Ensure page validity by @puschie286 in https://github.com/codeigniter4/CodeIgniter4/pull/5125
 * Extract method to get prefix for DB access function by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5178
 * Improve `model()` auto-completion by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5186
 * Rename toolbar loader to be a regular JS file by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5224

From 3e757ed0e83cd6bc14a201b82b0227ea26c97f38 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 12:47:40 +0900
Subject: [PATCH 0673/2325] docs: remove unmerged PR which is included in other
 PR

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef65b3c7f942..956b79b6530f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,6 @@
 * Fix GC issue when session lifetime is set to 0 by @lf-uraku-yuki in https://github.com/codeigniter4/CodeIgniter4/pull/4744
 * Fix wrong helper path resolution by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5246
 * Fix: remove CURLRequest headers sharing from $_SERVER by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5249
-* Fix CURLRequest extra headers by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5218
 * Fix Localization not working/being ignored for 404 page by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5267
 * fix: module filters are not discovered when using route filters by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5280
 * Update 'updated_at' when enabled in replace() by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4684

From bead2b897ad9991317fb95e65ee1e7146e2f4a71 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 12:51:23 +0900
Subject: [PATCH 0674/2325] docs: sort enhancements PRs

Grouped by function
---
 CHANGELOG.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 956b79b6530f..77e91ede321b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,17 +33,16 @@
 
 **Implemented enhancements:**
 
-* Always escape identifiers in the set(), setUpdateBatch(), and insertBatch() by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5132
-* Multiple filters for a route and classname filter by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5128
 * feat: `_` can be used as separators in environment variable names by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5156
+* Multiple filters for a route and classname filter by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5128
 * Feature - Mark duplicate queries by @danielTiringer in https://github.com/codeigniter4/CodeIgniter4/pull/5185
 * [Debug] Add formatted query string to timeline. by @sfadschm in https://github.com/codeigniter4/CodeIgniter4/pull/5196
-* Add `dropKey` method to `Forge` by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5171
 * [Debug] Improve keyword highlighting and escaping of query strings.  by @sfadschm in https://github.com/codeigniter4/CodeIgniter4/pull/5200
+* Add `dropKey` method to `Forge` by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5171* Always escape identifiers in the set(), setUpdateBatch(), and insertBatch() by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5132
+* Reduce memory usage of insertBatch(), updateBatch() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5202
 * Add Session based CSRF Protection by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5201
 * Add CSRF Protection for PUT/PATCH/DELETE by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5228
 * feat: add valid_url_strict rule by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5268
-* Reduce memory usage of insertBatch(), updateBatch() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5202
 
 **Merged pull requests:**
 

From e1ed6865ec428594ec18f95a9887d63b2804ba37 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 12:59:57 +0900
Subject: [PATCH 0675/2325] docs: sort Fixed PRs

---
 CHANGELOG.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77e91ede321b..bfcf64840267 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,30 +6,30 @@
 
 **Fixed bugs:**
 
-* Fixes and enhancements to Exceptions by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5052
 * Fix entity name generation when bundled in model by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5055
-* Fix variable variable `$$id` in RedisHandler by @Terrorboy in https://github.com/codeigniter4/CodeIgniter4/pull/5062
-* Previous Responses by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5034
+* Fix `Model::__call` throwing `BadMethodCallException` on empty results by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5139
+* Fixed an issue where the dropForeginKey method would execute an empty query when the dropConstraintStr property was empty. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5173
+* Update 'updated_at' when enabled in replace() by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4684
 * Fix query binding with two colons in query by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5117
 * Fixed the problem that _createTable does not take into account that it returns true. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5133
-* Fix color not updated in several places of the precompiled CSS by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5155
-* Fix `Model::__call` throwing `BadMethodCallException` on empty results by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5139
+* Fixed a problem with not run escape for identities in like when `insensitiveSearch` is true. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5170
+* Fixed an issue where an unnecessary prefix was given when the random number was a column. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5179
 * Error when value is an object - validating api data by @daycry in https://github.com/codeigniter4/CodeIgniter4/pull/5142
+* Fix color not updated in several places of the precompiled CSS by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5155
 * Fix debugbar styles printing by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5100
 * Fix highlighting in database debug toolbar by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5129
-* Fixed an issue where the dropForeginKey method would execute an empty query when the dropConstraintStr property was empty. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5173
 * Fix debug toolbar db connection count by @danielTiringer in https://github.com/codeigniter4/CodeIgniter4/pull/5172
-* Fixed a problem with not run escape for identities in like when `insensitiveSearch` is true. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5170
-* Fixed an issue where an unnecessary prefix was given when the random number was a column. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5179
 * Fix CSRF filter does not work when set it to only post by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5194
 * Fix GC issue when session lifetime is set to 0 by @lf-uraku-yuki in https://github.com/codeigniter4/CodeIgniter4/pull/4744
 * Fix wrong helper path resolution by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5246
 * Fix: remove CURLRequest headers sharing from $_SERVER by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5249
 * Fix Localization not working/being ignored for 404 page by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5267
 * fix: module filters are not discovered when using route filters by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5280
-* Update 'updated_at' when enabled in replace() by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4684
 * IncomingRequest - Trim trailing slash by @najdanovicivan in https://github.com/codeigniter4/CodeIgniter4/pull/4974
+* Previous Responses by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5034
 * (Paging) Ensure page validity by @puschie286 in https://github.com/codeigniter4/CodeIgniter4/pull/5125
+* Fix variable variable `$$id` in RedisHandler by @Terrorboy in https://github.com/codeigniter4/CodeIgniter4/pull/5062
+* Fixes and enhancements to Exceptions by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5052
 
 **Implemented enhancements:**
 

From c674b93d6c9ba4db6f00bf5a2a83b204d37af3e1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 14:15:33 +0900
Subject: [PATCH 0676/2325] docs: fix missing line break

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfcf64840267..48a24eb6d37c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,7 +38,8 @@
 * Feature - Mark duplicate queries by @danielTiringer in https://github.com/codeigniter4/CodeIgniter4/pull/5185
 * [Debug] Add formatted query string to timeline. by @sfadschm in https://github.com/codeigniter4/CodeIgniter4/pull/5196
 * [Debug] Improve keyword highlighting and escaping of query strings.  by @sfadschm in https://github.com/codeigniter4/CodeIgniter4/pull/5200
-* Add `dropKey` method to `Forge` by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5171* Always escape identifiers in the set(), setUpdateBatch(), and insertBatch() by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5132
+* Add `dropKey` method to `Forge` by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5171
+* Always escape identifiers in the set(), setUpdateBatch(), and insertBatch() by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5132
 * Reduce memory usage of insertBatch(), updateBatch() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5202
 * Add Session based CSRF Protection by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5201
 * Add CSRF Protection for PUT/PATCH/DELETE by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5228

From 303d0f0ba3c7e7f1c169fe51e47f497b39da1f7d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 14:27:33 +0900
Subject: [PATCH 0677/2325] docs: move PR from enhancements to Fixed

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48a24eb6d37c..70656a3f6e50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 * Fix highlighting in database debug toolbar by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5129
 * Fix debug toolbar db connection count by @danielTiringer in https://github.com/codeigniter4/CodeIgniter4/pull/5172
 * Fix CSRF filter does not work when set it to only post by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5194
+* Add CSRF Protection for PUT/PATCH/DELETE by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5228
 * Fix GC issue when session lifetime is set to 0 by @lf-uraku-yuki in https://github.com/codeigniter4/CodeIgniter4/pull/4744
 * Fix wrong helper path resolution by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5246
 * Fix: remove CURLRequest headers sharing from $_SERVER by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5249
@@ -42,7 +43,6 @@
 * Always escape identifiers in the set(), setUpdateBatch(), and insertBatch() by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5132
 * Reduce memory usage of insertBatch(), updateBatch() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5202
 * Add Session based CSRF Protection by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5201
-* Add CSRF Protection for PUT/PATCH/DELETE by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5228
 * feat: add valid_url_strict rule by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5268
 
 **Merged pull requests:**

From 10f0279186f2107cd8f6ba3251dbd777e5a0436c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 14:51:14 +0900
Subject: [PATCH 0678/2325] docs: move PR from enhancements to Fixed

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70656a3f6e50..1a77c0a4d13a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 * Fixed the problem that _createTable does not take into account that it returns true. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5133
 * Fixed a problem with not run escape for identities in like when `insensitiveSearch` is true. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5170
 * Fixed an issue where an unnecessary prefix was given when the random number was a column. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5179
+* Always escape identifiers in the set(), setUpdateBatch(), and insertBatch() by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5132
 * Error when value is an object - validating api data by @daycry in https://github.com/codeigniter4/CodeIgniter4/pull/5142
 * Fix color not updated in several places of the precompiled CSS by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5155
 * Fix debugbar styles printing by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5100
@@ -40,7 +41,6 @@
 * [Debug] Add formatted query string to timeline. by @sfadschm in https://github.com/codeigniter4/CodeIgniter4/pull/5196
 * [Debug] Improve keyword highlighting and escaping of query strings.  by @sfadschm in https://github.com/codeigniter4/CodeIgniter4/pull/5200
 * Add `dropKey` method to `Forge` by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5171
-* Always escape identifiers in the set(), setUpdateBatch(), and insertBatch() by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5132
 * Reduce memory usage of insertBatch(), updateBatch() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5202
 * Add Session based CSRF Protection by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5201
 * feat: add valid_url_strict rule by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5268

From 40154ac4827b7e84f6f9e448fa186a9930b9269e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 16:06:12 +0900
Subject: [PATCH 0679/2325] chore: add .github/release.yml

See https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#example-configuration
---
 .github/release.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 .github/release.yml

diff --git a/.github/release.yml b/.github/release.yml
new file mode 100644
index 000000000000..de6e982d91a6
--- /dev/null
+++ b/.github/release.yml
@@ -0,0 +1,23 @@
+changelog:
+  exclude:
+    authors:
+      - dependabot
+  categories:
+    - title: Breaking Changes
+      labels:
+        - 'breaking change'
+    - title: Fixed Bugs
+      labels:
+        - bug
+    - title: New Features
+      labels:
+        - 'new feature'
+    - title: Enhancements
+      labels:
+        - enhancement
+    - title: Refactoring
+      labels:
+        - refactor
+    - title: Others (Only for checking. Remove this category)
+      labels:
+        - "*"

From 42b29469c0dadcd47664c5d64331e3b1edd8c634 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 16:06:37 +0900
Subject: [PATCH 0680/2325] docs: add "Labeling PRs"

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

diff --git a/admin/RELEASE.md b/admin/RELEASE.md
index 822bd1f5f154..7eb3fe2c0cc3 100644
--- a/admin/RELEASE.md
+++ b/admin/RELEASE.md
@@ -4,6 +4,17 @@
 > Updated for `4.1.2` on May 17, 2021.
 > -MGatner
 
+## Labeling PRs
+
+To auto-generate changelog, each PR to be listed in changelog must have one of the following [labels](https://github.com/codeigniter4/CodeIgniter4/labels):
+- **bug** ... PRs that fix bugs
+- **enhancement** ... PRs to improve existing functionalities
+- **new feature** ... PRs for new features
+- **refactor** ... PRs to refactor
+
+And a PRs that has the breaking changes must have the following label:
+- **breaking change** ... PRs that may break existing functionalities
+
 ## Preparation
 
 * Work off direct clones of the repos so the release branches persist for a time

From 4c2b1c478882e87185c662182ee0dab221bc7af3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 9 Nov 2021 16:45:37 +0900
Subject: [PATCH 0681/2325] docs: update changelogs/v4.1.5.rst

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

diff --git a/user_guide_src/source/changelogs/v4.1.5.rst b/user_guide_src/source/changelogs/v4.1.5.rst
index 3e8fb8f629f0..9cd543f181e2 100644
--- a/user_guide_src/source/changelogs/v4.1.5.rst
+++ b/user_guide_src/source/changelogs/v4.1.5.rst
@@ -23,6 +23,14 @@ Enhancements
 - Added Cache config for reserved characters
 - The ``addForeignKey`` function of the ``Forge`` class can now define composite foreign keys in an array
 - The ``dropKey`` function of the ``Forge`` class can remove key
+- Now ``_`` can be used as separators in environment variable
+- Added Multiple filters for a route and Classname filter
+- Reduced memory usage of ``insertBatch()`` and ``updateBatch()``
+- Added Session based CSRF Protection
+- Added ``valid_url_strict`` rule for ``Validation``
+- Debug Toolbar
+    - Added formatted query string to timeline
+    - Improved keyword highlighting and escaping of query strings
 
 Changes
 =======
@@ -33,3 +41,8 @@ Deprecations
 ============
 
 - Deprecated ``CodeIgniter\\Cache\\Handlers\\BaseHandler::RESERVED_CHARACTERS`` in favor of the new config property
+
+Bugs Fixed
+==========
+
+See the repo's `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_ for a complete list of bugs fixed.

From bea512e5ac0af5e576162d4c08e99b408b2fa0b0 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 1 Nov 2021 15:53:56 +0700
Subject: [PATCH 0682/2325] [PHPStan] Upgrade to PHPStan 1.0

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index b7b3176e055f..a79e6926b882 100644
--- a/composer.json
+++ b/composer.json
@@ -21,10 +21,10 @@
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.3",
         "nexusphp/tachycardia": "^1.0",
-        "phpstan/phpstan": "^0.12.91",
+        "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.11.60"
+        "rector/rector": "dev-main"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From 6d164b6b84590b58241ca6bf2342014ac4578c77 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 1 Nov 2021 15:56:01 +0700
Subject: [PATCH 0683/2325] use excludePaths config

---
 phpstan.neon.dist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 73e3a7a3a545..b7bde80c3819 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -18,7 +18,7 @@ parameters:
 	treatPhpDocTypesAsCertain: false
 	bootstrapFiles:
 		- system/Test/bootstrap.php
-	excludes_analyse:
+	excludePaths:
 		- app/Views/errors/cli/*
 		- app/Views/errors/html/*
 		- system/Commands/Generators/Views/*

From 758c6ae0eee9a19fd1194e0c5788579e85cf17b2 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 1 Nov 2021 15:58:33 +0700
Subject: [PATCH 0684/2325] remove ignored phpstan in View\Table

---
 system/View/Table.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/system/View/Table.php b/system/View/Table.php
index d57a7092de00..4d8ac37e230c 100644
--- a/system/View/Table.php
+++ b/system/View/Table.php
@@ -181,7 +181,6 @@ public function makeColumns($array = [], $columnLimit = 0)
             $new[] = $temp;
         } while (count($array) > 0);
 
-        // @phpstan-ignore-next-line
         return $new;
     }
 

From e0de21a99a05bdd8941b65cda3fbb90d7caff4f1 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 1 Nov 2021 16:17:13 +0700
Subject: [PATCH 0685/2325] ignoring errors

---
 phpstan.neon.dist | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index b7bde80c3819..bf23eb5303ed 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -39,6 +39,19 @@ parameters:
 		- '#Method CodeIgniter\\Validation\\ValidationInterface::run\(\) invoked with 3 parameters, 0-2 required#'
 		- '#Negated boolean expression is always (true|false)#'
 		- '#Return type \(bool\) of method CodeIgniter\\HTTP\\Files\\UploadedFile::move\(\) should be compatible with return type \(CodeIgniter\\Files\\File\) of method CodeIgniter\\Files\\File::move\(\)#'
+		- '#.*\son left side of \?\? is not nullable#'
+		- '#While loop condition is always true#'
+		- '#Right side of && is always true#'
+		- '#.*in isset\(\) is not nullable#'
+		- '#.*in empty\(\) is not falsy#'
+		- '#.*on left side of \?\? always exists and is not nullable#'
+		- '#Variable \$error on left side of \?\? always exists and is always null#'
+		- '#Variable \$config in empty\(\) always exists and is not falsy#'
+		- '#If condition is always true#'
+		- '#Dead catch - CodeIgniter\\Exceptions\\PageNotFoundException is never thrown in the try block#'
+		- '#.* in isset\(\) does not exist#'
+		- '#Variable \$mockService in empty\(\) always exists and is always falsy#'
+		- '#PHPDoc type string\|null of property CodeIgniter\\Images\\Handlers\\ImageMagickHandler::\$resource is not covariant with PHPDoc type resource\|null of overridden property CodeIgniter\\Images\\Handlers\\BaseHandler::\$resource#'
 	parallel:
 		processTimeout: 300.0
 	scanDirectories:

From 1b39245ed35df948cfb11e9b014f900d91d74a8f Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 1 Nov 2021 17:14:49 +0700
Subject: [PATCH 0686/2325] remove symplify/package-builder dep

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index a79e6926b882..7cf5fa8c152c 100644
--- a/composer.json
+++ b/composer.json
@@ -19,6 +19,7 @@
         "fakerphp/faker": "^1.9",
         "friendsofphp/php-cs-fixer": "^3.1",
         "mikey179/vfsstream": "^1.6",
+        "nette/utils": "^3.2",
         "nexusphp/cs-config": "^3.3",
         "nexusphp/tachycardia": "^1.0",
         "phpstan/phpstan": "^1.0",

From b437088f1480bcd04d0077318f34964583c79d28 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 1 Nov 2021 19:59:09 +0700
Subject: [PATCH 0687/2325] remove nette/utils

---
 composer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7cf5fa8c152c..a79e6926b882 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,6 @@
         "fakerphp/faker": "^1.9",
         "friendsofphp/php-cs-fixer": "^3.1",
         "mikey179/vfsstream": "^1.6",
-        "nette/utils": "^3.2",
         "nexusphp/cs-config": "^3.3",
         "nexusphp/tachycardia": "^1.0",
         "phpstan/phpstan": "^1.0",

From c19875c1baf74017ee954c901c30797e9bc85fd9 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 9 Nov 2021 19:27:29 +0700
Subject: [PATCH 0688/2325] update to composer 0.12

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index a79e6926b882..31d3eddae2e0 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "dev-main"
+        "rector/rector": "0.12.0"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From 707e847ad507e3073c96606f67cf8e096aadc6a6 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 9 Nov 2021 19:37:57 +0700
Subject: [PATCH 0689/2325] re-run rector

---
 rector.php                                             |  4 ++++
 system/View/Table.php                                  |  2 +-
 .../Rector/UnderscoreToCamelCaseVariableNameRector.php | 10 +---------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/rector.php b/rector.php
index 4a5fde83a45c..b95e240edf57 100644
--- a/rector.php
+++ b/rector.php
@@ -39,6 +39,7 @@
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
 use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector;
 use Rector\Php70\Rector\FuncCall\RandomFunctionRector;
+use Rector\Php70\Rector\MethodCall\ThisCallOnStaticMethodToStaticCallRector;
 use Rector\Php71\Rector\FuncCall\CountOnNullRector;
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
@@ -109,6 +110,9 @@
 
         // use mt_rand instead of random_int on purpose on non-cryptographically random
         RandomFunctionRector::class,
+
+        // buggy on rector 0.12.0
+        ThisCallOnStaticMethodToStaticCallRector::class,
     ]);
 
     // auto import fully qualified class names
diff --git a/system/View/Table.php b/system/View/Table.php
index 4d8ac37e230c..539fd193c2a3 100644
--- a/system/View/Table.php
+++ b/system/View/Table.php
@@ -179,7 +179,7 @@ public function makeColumns($array = [], $columnLimit = 0)
             }
 
             $new[] = $temp;
-        } while (count($array) > 0);
+        } while ($array !== []);
 
         return $new;
     }
diff --git a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
index f87222bb2d5d..206af5955ca3 100644
--- a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
+++ b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
@@ -20,7 +20,6 @@
 use PhpParser\Node\Stmt\Function_;
 use Rector\Core\Php\ReservedKeywordAnalyzer;
 use Rector\Core\Rector\AbstractRector;
-use Rector\NodeNestingScope\ParentFinder;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
@@ -40,17 +39,10 @@ final class UnderscoreToCamelCaseVariableNameRector extends AbstractRector
      */
     private $reservedKeywordAnalyzer;
 
-    /**
-     * @var ParentFinder
-     */
-    private $parentFinder;
-
     public function __construct(
         ReservedKeywordAnalyzer $reservedKeywordAnalyzer,
-        ParentFinder $parentFinder
     ) {
         $this->reservedKeywordAnalyzer = $reservedKeywordAnalyzer;
-        $this->parentFinder            = $parentFinder;
     }
 
     public function getRuleDefinition(): RuleDefinition
@@ -124,7 +116,7 @@ public function refactor(Node $node): ?Node
 
     private function updateDocblock(Variable $variable, string $variableName, string $camelCaseName): void
     {
-        $parentClassMethodOrFunction = $this->parentFinder->findByTypes($variable, [ClassMethod::class, Function_::class]);
+        $parentClassMethodOrFunction = $this->betterNodeFinder->findParentByTypes($variable, [ClassMethod::class, Function_::class]);
 
         if ($parentClassMethodOrFunction === null) {
             return;

From 395b164866fb9fdb2295c458ed2a0cbe6f5e5bf0 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 9 Nov 2021 19:46:59 +0700
Subject: [PATCH 0690/2325] cs fix

---
 utils/Rector/UnderscoreToCamelCaseVariableNameRector.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
index 206af5955ca3..690a63c6febe 100644
--- a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
+++ b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
@@ -40,7 +40,7 @@ final class UnderscoreToCamelCaseVariableNameRector extends AbstractRector
     private $reservedKeywordAnalyzer;
 
     public function __construct(
-        ReservedKeywordAnalyzer $reservedKeywordAnalyzer,
+        ReservedKeywordAnalyzer $reservedKeywordAnalyzer
     ) {
         $this->reservedKeywordAnalyzer = $reservedKeywordAnalyzer;
     }

From e44008b8c74e514d96cd82f3d23438f126bf014d Mon Sep 17 00:00:00 2001
From: Najdanovic Ivan <najdanovicivan@gmail.com>
Date: Mon, 8 Nov 2021 18:08:57 +0100
Subject: [PATCH 0691/2325] Toolbar - Make it possible to turn off var data
 collection

---
 app/Config/Toolbar.php   | 12 ++++++++++++
 system/Debug/Toolbar.php |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/app/Config/Toolbar.php b/app/Config/Toolbar.php
index 16a37e83c2b8..7183e1336a28 100644
--- a/app/Config/Toolbar.php
+++ b/app/Config/Toolbar.php
@@ -44,6 +44,18 @@ class Toolbar extends BaseConfig
         Events::class,
     ];
 
+    /**
+     * --------------------------------------------------------------------------
+     * Collect Var Data
+     * --------------------------------------------------------------------------
+     *
+     * If set to false var data from the views will not be colleted. Usefull to
+     * avoid high memory usage when there are lots of data passed to the view.
+     *
+     * @var bool
+     */
+    public $collectVarData = true;
+
     /**
      * --------------------------------------------------------------------------
      * Max History
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index b951e2ed9658..e3cc5b68fce4 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -310,6 +310,10 @@ protected function structureTimelineData(array $elements): array
      */
     protected function collectVarData(): array
     {
+        if (! $this->config->collectVarData) {
+            return [];
+        }
+
         $data = [];
 
         foreach ($this->collectors as $collector) {

From c30e0b5940fec60f08b118d9ba3f6b26613b1578 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Wed, 10 Nov 2021 05:00:47 +0700
Subject: [PATCH 0692/2325] update to rector 0.12.1

---
 composer.json | 2 +-
 rector.php    | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 31d3eddae2e0..dcdfd339390a 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.0"
+        "rector/rector": "0.12.1"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"
diff --git a/rector.php b/rector.php
index b95e240edf57..4a5fde83a45c 100644
--- a/rector.php
+++ b/rector.php
@@ -39,7 +39,6 @@
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
 use Rector\Php56\Rector\FunctionLike\AddDefaultValueForUndefinedVariableRector;
 use Rector\Php70\Rector\FuncCall\RandomFunctionRector;
-use Rector\Php70\Rector\MethodCall\ThisCallOnStaticMethodToStaticCallRector;
 use Rector\Php71\Rector\FuncCall\CountOnNullRector;
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
@@ -110,9 +109,6 @@
 
         // use mt_rand instead of random_int on purpose on non-cryptographically random
         RandomFunctionRector::class,
-
-        // buggy on rector 0.12.0
-        ThisCallOnStaticMethodToStaticCallRector::class,
     ]);
 
     // auto import fully qualified class names

From dc81868b6141b3ddcaf0f72f7c60a82723304d78 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 10 Nov 2021 08:46:59 +0900
Subject: [PATCH 0693/2325] docs: add comma

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

diff --git a/user_guide_src/source/database/connecting.rst b/user_guide_src/source/database/connecting.rst
index 65a3ed086d27..0280dbe5a71e 100644
--- a/user_guide_src/source/database/connecting.rst
+++ b/user_guide_src/source/database/connecting.rst
@@ -15,7 +15,7 @@ database available globally in that class.
     $db = \Config\Database::connect();
 
 If the above function does **not** contain any information in the first
-parameter it will connect to the default group specified in your database config
+parameter, it will connect to the default group specified in your database config
 file. For most people, this is the preferred method of use.
 
 A convenience method exists that is purely a wrapper around the above line

From 603e1792269fcf20ac788b69020b5a55486f3659 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 10 Nov 2021 08:47:55 +0900
Subject: [PATCH 0694/2325] docs: improve parameters explanation

---
 user_guide_src/source/database/connecting.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/database/connecting.rst b/user_guide_src/source/database/connecting.rst
index 0280dbe5a71e..67d9ac2e1aab 100644
--- a/user_guide_src/source/database/connecting.rst
+++ b/user_guide_src/source/database/connecting.rst
@@ -26,8 +26,10 @@ and is provided for your convenience::
 Available Parameters
 --------------------
 
-#. The database group name, a string that must match the config class' property name. Default value is ``$config->defaultGroup``.
-#. true/false (boolean). Whether to return the shared connection (see
+**\\Config\\Database::connect($group = null, bool $getShared = true): BaseConnection**
+
+#. ``$group``: The database group name, a string that must match the config class' property name. Default value is ``$config->defaultGroup``.
+#. ``$getShared``: true/false (boolean). Whether to return the shared connection (see
    Connecting to Multiple Databases below).
 
 Manually Connecting to a Database

From deba152f05b9de590bf037460a0691c1917872fa Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 10 Nov 2021 08:48:42 +0900
Subject: [PATCH 0695/2325] docs: fix variable name

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

diff --git a/user_guide_src/source/database/connecting.rst b/user_guide_src/source/database/connecting.rst
index 67d9ac2e1aab..dca35a6e50d5 100644
--- a/user_guide_src/source/database/connecting.rst
+++ b/user_guide_src/source/database/connecting.rst
@@ -61,7 +61,7 @@ If you need to connect to more than one database simultaneously you can
 do so as follows::
 
     $db1 = \Config\Database::connect('group_one');
-    $db  = \Config\Database::connect('group_two');
+    $db2 = \Config\Database::connect('group_two');
 
 Note: Change the words "group_one" and "group_two" to the specific
 group names you are connecting to.

From 5a3fa54e37615eadc21bde204435c5e0afb96fb5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 10 Nov 2021 08:49:04 +0900
Subject: [PATCH 0696/2325] docs: fix decoration for string in the code

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

diff --git a/user_guide_src/source/database/connecting.rst b/user_guide_src/source/database/connecting.rst
index dca35a6e50d5..41a42e5f0f2f 100644
--- a/user_guide_src/source/database/connecting.rst
+++ b/user_guide_src/source/database/connecting.rst
@@ -63,7 +63,7 @@ do so as follows::
     $db1 = \Config\Database::connect('group_one');
     $db2 = \Config\Database::connect('group_two');
 
-Note: Change the words "group_one" and "group_two" to the specific
+Note: Change the words ``group_one`` and ``group_two`` to the specific
 group names you are connecting to.
 
 .. note:: You don't need to create separate database configurations if you

From 395f71fad77eb1bc192417b1b87fe1ffe34a509d Mon Sep 17 00:00:00 2001
From: Najdanovic Ivan <najdanovicivan@gmail.com>
Date: Wed, 10 Nov 2021 01:05:07 +0100
Subject: [PATCH 0697/2325] Update system/Debug/Toolbar.php

Co-authored-by: Lonnie Ezell <lonnieje@gmail.com>
---
 system/Debug/Toolbar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index e3cc5b68fce4..3502ae877caf 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -310,7 +310,7 @@ protected function structureTimelineData(array $elements): array
      */
     protected function collectVarData(): array
     {
-        if (! $this->config->collectVarData) {
+        if (! ($this->config->collectVarData ?? true)) {
             return [];
         }
 

From b45fb1e76d01995a0df78614fcca3ab6b533e204 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 10 Nov 2021 10:22:54 +0900
Subject: [PATCH 0698/2325] dpcs: fix typo

---
 admin/RELEASE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/RELEASE.md b/admin/RELEASE.md
index 7eb3fe2c0cc3..932ce34ec018 100644
--- a/admin/RELEASE.md
+++ b/admin/RELEASE.md
@@ -12,7 +12,7 @@ To auto-generate changelog, each PR to be listed in changelog must have one of t
 - **new feature** ... PRs for new features
 - **refactor** ... PRs to refactor
 
-And a PRs that has the breaking changes must have the following label:
+And PRs that have the breaking changes must have the following label:
 - **breaking change** ... PRs that may break existing functionalities
 
 ## Preparation

From 5fe35fa6286fd11bc8f7fe658df17bf20e26b7b3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 10 Nov 2021 10:23:16 +0900
Subject: [PATCH 0699/2325] docs: add about labeling PRs in the congtribution
 docs

---
 contributing/pull_request.md |  1 +
 contributing/workflow.md     | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index e08a5c110558..488e299d7000 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -225,6 +225,7 @@ The best way to contribute is to fork the CodeIgniter4 repository, and "clone" t
 12. Make sure the tests pass to have a higher chance of merging.
 13. [Push](https://docs.github.com/en/github/using-git/pushing-commits-to-a-remote-repository) your contribution branch to your fork.
 14. Send a [pull request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork).
+15. Label your pull request with the appropriate label if you can.
 
 See [Contribution workflow](./workflow.md) for Git workflow details.
 
diff --git a/contributing/workflow.md b/contributing/workflow.md
index 670727a89653..b2309df9477a 100644
--- a/contributing/workflow.md
+++ b/contributing/workflow.md
@@ -185,7 +185,6 @@ Make sure that the PR title is helpful for the maintainers and other
 developers. Add any comments appropriate, for instance asking for
 review.
 
-
 **Note:**
 > If you do not provide a title or description for your PR, the odds of it being summarily rejected
 rise astronomically.
@@ -203,6 +202,19 @@ If your PR does not follow our contribution guidelines, or is
 incomplete, the codebase maintainers will comment on it, pointing out
 what needs fixing.
 
+### Labeling PRs
+
+If you have the privilege of labeling PRs, you can help the maintainers.
+
+Label your PRs with the one of the following [labels](https://github.com/codeigniter4/CodeIgniter4/labels):
+- **bug** ... PRs that fix bugs
+- **enhancement** ... PRs to improve existing functionalities
+- **new feature** ... PRs for new features
+- **refactor** ... PRs to refactor
+
+And if your PRs have the breaking changes, label the following label:
+- **breaking change** ... PRs that may break existing functionalities
+
 ## Cleanup
 
 If your PR is accepted and merged into the shared repository, you can

From ec862343faef2f34c857148b9767e877cb32d17f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 10 Nov 2021 10:35:24 +0900
Subject: [PATCH 0700/2325] chore: replace `github.repos.` with
 `github.rest.repos.`

---
 .github/workflows/deploy-framework.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy-framework.yml b/.github/workflows/deploy-framework.yml
index 5a65f3bd1cfc..cdd23f3c7242 100644
--- a/.github/workflows/deploy-framework.yml
+++ b/.github/workflows/deploy-framework.yml
@@ -40,11 +40,11 @@ jobs:
         with:
           github-token: ${{secrets.ACCESS_TOKEN}}
           script: |
-            const release = await github.repos.getLatestRelease({
+            const release = await github.rest.repos.getLatestRelease({
               owner: context.repo.owner,
               repo: context.repo.repo
             })
-            github.repos.createRelease({
+            github.rest.repos.createRelease({
               owner: context.repo.owner,
               repo: 'framework',
               tag_name: release.data.tag_name,
@@ -85,11 +85,11 @@ jobs:
         with:
           github-token: ${{secrets.ACCESS_TOKEN}}
           script: |
-            const release = await github.repos.getLatestRelease({
+            const release = await github.rest.repos.getLatestRelease({
               owner: context.repo.owner,
               repo: context.repo.repo
             })
-            github.repos.createRelease({
+            github.rest.repos.createRelease({
               owner: context.repo.owner,
               repo: 'appstarter',
               tag_name: release.data.tag_name,

From fcb18f9ff0f61b97f4e56d0ac13ddd2635366c9a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 10 Nov 2021 17:41:11 +0900
Subject: [PATCH 0701/2325] docs: make `warning` security related explanation

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

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index cb0771356098..a05fb25f8159 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -295,14 +295,14 @@ methods:
         $where = "name='Joe' AND status='boss' OR status='active'";
         $builder->where($where);
 
-    If you are using user-supplied data within the string, you MUST escape the
+.. warning:: If you are using user-supplied data within the string, you MUST escape the
     data manually. Failure to do so could result in SQL injections.
 
     ::
 
-        $name = $builder->db->escape('Joe');
-        $where = "name={$name} AND status='boss' OR status='active'";
-        $builder->where($where);
+    $name = $builder->db->escape('Joe');
+    $where = "name={$name} AND status='boss' OR status='active'";
+    $builder->where($where);
 
 #. **Subqueries:**
 

From d7523eb06a2d37b0f356d02b0562680130c83fe4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Nov 2021 21:21:12 +0000
Subject: [PATCH 0702/2325] chore(deps-dev): update rector/rector requirement
 from 0.12.1 to 0.12.3 (#5305)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index dcdfd339390a..93286a4f93f8 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.1"
+        "rector/rector": "0.12.3"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From a41ef8624cf8c3f884c52f091dbf1a8199aad4c0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 11 Nov 2021 08:06:30 +0900
Subject: [PATCH 0703/2325] chore: improve ISSUE_TEMPLATE/bug_report.yml

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 135bd52b3fe9..ca357c2962bf 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -13,8 +13,6 @@ body:
         whether still open or closed, related to your report**.
         If there is, your report will be closed promptly.
 
-        And if you are not using the [latest version](https://github.com/codeigniter4/CodeIgniter4/releases) of CodeIgniter, please update.
-
         ---
 
   - type: dropdown
@@ -35,6 +33,9 @@ body:
     id: codeigniter-version
     attributes:
       label: CodeIgniter4 Version
+      description: |
+        e.g. 4.1.5
+        If you are not using the [latest version](https://github.com/codeigniter4/CodeIgniter4/releases), please      check to see if the problem occurs with the latest version.
     validations:
       required: true
 
@@ -69,6 +70,7 @@ body:
     id: database
     attributes:
       label: Database
+      description: e.g. MySQL 5.6, MariaDB 10.2, PostgreSQL 9.6
     validations:
       required: false
 

From cf0a5e65831ccd0f5db8cd184e8acd7d497a8151 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 11 Nov 2021 11:09:01 +0900
Subject: [PATCH 0704/2325] docs: fix MigrationRunner::regress() Class
 Reference

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

diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst
index 027c12d3dc70..9f748da69521 100644
--- a/user_guide_src/source/dbmgmt/migration.rst
+++ b/user_guide_src/source/dbmgmt/migration.rst
@@ -300,10 +300,10 @@ Class Reference
         This locates migrations for a namespace (or all namespaces), determines which migrations
         have not yet been run, and runs them in order of their version (namespaces intermingled).
 
-    .. php:method:: regress($batch, $group)
+    .. php:method:: regress($targetBatch, $group)
 
-        :param    mixed    $batch: previous batch to migrate down to; 1+ specifies the batch, 0 reverts all, negative refers to the relative batch (e.g., -3 means "three batches back")
-        :param    mixed    $group: database group name, if null default database group will be used.
+        :param    int    $targetBatch: previous batch to migrate down to; 1+ specifies the batch, 0 reverts all, negative refers to the relative batch (e.g., -3 means "three batches back")
+        :param    ?string    $group: database group name, if null default database group will be used.
         :returns:    ``true`` on success, ``false`` on failure or no migrations are found
         :rtype:    bool
 

From c31730b55e61cd35cb1935ace2c473557a119ac6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 11 Nov 2021 12:50:13 +0900
Subject: [PATCH 0705/2325] docs: add missing line break

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index ca357c2962bf..2c28200c36aa 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -35,7 +35,8 @@ body:
       label: CodeIgniter4 Version
       description: |
         e.g. 4.1.5
-        If you are not using the [latest version](https://github.com/codeigniter4/CodeIgniter4/releases), please      check to see if the problem occurs with the latest version.
+        If you are not using the [latest version](https://github.com/codeigniter4/CodeIgniter4/releases), please
+        check to see if the problem occurs with the latest version.
     validations:
       required: true
 

From 5f5fdf03beddded89e70a622a739c5d576c42d13 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 11 Nov 2021 13:59:09 +0900
Subject: [PATCH 0706/2325] docs: fix sample code variable names

There is no $collection in app/Config/Routes.php.
---
 user_guide_src/source/incoming/routing.rst | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 899ad0797a30..5dade8d13f3d 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -188,11 +188,12 @@ While the add() method is simple to use, it is often handier to work with multip
 the ``map()`` method. Instead of calling the ``add()`` method for each route that you need to add, you can
 define an array of routes and then pass it as the first parameter to the ``map()`` method::
 
-    $routes = [];
-    $routes['product/(:num)'] = 'Catalog::productLookupById';
-    $routes['product/(:alphanum)'] = 'Catalog::productLookupByName';
+    $multipleRoutes = [
+        'product/(:num)'      => 'Catalog::productLookupById',
+        'product/(:alphanum)' => 'Catalog::productLookupByName',
+    ];
 
-    $collection->map($routes);
+    $routes->map($multipleRoutes);
 
 Redirecting Routes
 ==================
@@ -415,7 +416,7 @@ Limit to Hostname
 You can restrict groups of routes to function only in certain domain or sub-domains of your application
 by passing the "hostname" option along with the desired domain to allow it on as part of the options array::
 
-    $collection->get('from', 'to', ['hostname' => 'accounts.example.com']);
+    $routes->get('from', 'to', ['hostname' => 'accounts.example.com']);
 
 This example would only allow the specified hosts to work if the domain exactly matched "accounts.example.com".
 It would not work under the main site at "example.com".

From bcedd1e7caee9cb3dbd23d9465ed613502f487c7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 12 Nov 2021 09:22:51 +0900
Subject: [PATCH 0707/2325] fix: add workaround for upgraded users who not
 update Config\Exceptions

Uncaught ErrorException: Undefined property: Config\Exceptions::$sensitiveDataInTrace
---
 system/Debug/Exceptions.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index 04556c5c4f20..c594bc4eac9f 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -70,6 +70,11 @@ public function __construct(ExceptionsConfig $config, IncomingRequest $request,
         $this->config   = $config;
         $this->request  = $request;
         $this->response = $response;
+
+        // workaround for upgraded users
+        if (! isset($this->config->sensitiveDataInTrace)) {
+            $this->config->sensitiveDataInTrace = [];
+        }
     }
 
     /**

From 0e084ee926e3ace038b2f0bafd2fd34f964ce9a0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 12 Nov 2021 12:51:17 +0900
Subject: [PATCH 0708/2325] docs: improve How-to Guide

---
 contributing/pull_request.md | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index 488e299d7000..5bcc3511e86c 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -214,18 +214,28 @@ The best way to contribute is to fork the CodeIgniter4 repository, and "clone" t
 2. Go to the [CodeIgniter4 repository](https://github.com/codeigniter4/CodeIgniter4).
 3. [Fork](https://help.github.com/en/articles/fork-a-repo) it (to your GitHub account).
 4. [Clone](https://help.github.com/en/articles/cloning-a-repository) your CodeIgniter repository: `git@github.com:<your-name>/CodeIgniter4.git`
-5. Create a new [branch](https://help.github.com/en/articles/about-branches) in your project for each set of changes you want to make.
-6. Fix existing bugs on the [Issue tracker](https://github.com/codeigniter4/CodeIgniter4/issues) after confirming that no one else is working on them.
-7. [Commit](https://help.github.com/en/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project) the changed files in your contribution branch.
-8. Commit messages are expected to be descriptive of what you changed specifically. Commit messages like
-   "Fixes #1234" would be asked by the reviewer to be revised.
+   - `> git clone git@github.com:<your-name>/CodeIgniter4.git`
+5. Install Composer dependencies.
+   - `> cd CodeIgniter4/`
+   - `> composer install`
+6. Create a new [branch](https://help.github.com/en/articles/about-branches) in your project for each set of changes you want to make.
+   - `> git checkout -b <new-branch-name>`
+7. Fix existing bugs on the [Issue tracker](https://github.com/codeigniter4/CodeIgniter4/issues) after confirming that no one else is working on them.
+8. [Commit](https://help.github.com/en/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project) the changed files in your contribution branch.
+   - `> git commit`
+   - Commit messages are expected to be descriptive of what you changed specifically. Commit messages like
+     "Fixes #1234" would be asked by the reviewer to be revised.
 9. If there are intermediate commits that are not meaningful to the overall PR, such as "Fixed error on style guide", "Fixed phpstan error", "Fixing mistake in code", and other related commits, it is advised to squash your commits so that we can have a clean commit history.
 10. If you have touched PHP code, run static analysis.
+   - `> composer analyze`
+   - `> vendor/bin/rector process`
 11. Run unit tests on the specific file you modified. If there are no existing tests yet, please create one.
-12. Make sure the tests pass to have a higher chance of merging.
-13. [Push](https://docs.github.com/en/github/using-git/pushing-commits-to-a-remote-repository) your contribution branch to your fork.
-14. Send a [pull request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork).
-15. Label your pull request with the appropriate label if you can.
+   - `> vendor/bin/phpunit tests/system/path/to/file/you/modified`
+   - Make sure the tests pass to have a higher chance of merging.
+12. [Push](https://docs.github.com/en/github/using-git/pushing-commits-to-a-remote-repository) your contribution branch to your fork.
+   - `> git push origin <new-branch-name>`
+13. Send a [pull request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork).
+14. Label your pull request with the appropriate label if you can.
 
 See [Contribution workflow](./workflow.md) for Git workflow details.
 

From a6a51697d622d5dc4b761aba30f245ff5a14f593 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 12 Nov 2021 13:12:32 +0900
Subject: [PATCH 0709/2325] docs: replace `composer install` with `composer
 update`

composer warns if use `install`:
No composer.lock file present. Updating dependencies to latest instead of installing from lock file. See https://getcomposer.org/install for more information.
---
 contributing/pull_request.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index 5bcc3511e86c..02e0628a3205 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -217,7 +217,7 @@ The best way to contribute is to fork the CodeIgniter4 repository, and "clone" t
    - `> git clone git@github.com:<your-name>/CodeIgniter4.git`
 5. Install Composer dependencies.
    - `> cd CodeIgniter4/`
-   - `> composer install`
+   - `> composer update`
 6. Create a new [branch](https://help.github.com/en/articles/about-branches) in your project for each set of changes you want to make.
    - `> git checkout -b <new-branch-name>`
 7. Fix existing bugs on the [Issue tracker](https://github.com/codeigniter4/CodeIgniter4/issues) after confirming that no one else is working on them.

From baee0f355368dba64935239adb1b83b9076ca997 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 12 Nov 2021 13:15:10 +0900
Subject: [PATCH 0710/2325] docs: remove line break and indent

It is a single line.
---
 contributing/pull_request.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index 02e0628a3205..e788b76fede3 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -223,8 +223,7 @@ The best way to contribute is to fork the CodeIgniter4 repository, and "clone" t
 7. Fix existing bugs on the [Issue tracker](https://github.com/codeigniter4/CodeIgniter4/issues) after confirming that no one else is working on them.
 8. [Commit](https://help.github.com/en/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project) the changed files in your contribution branch.
    - `> git commit`
-   - Commit messages are expected to be descriptive of what you changed specifically. Commit messages like
-     "Fixes #1234" would be asked by the reviewer to be revised.
+   - Commit messages are expected to be descriptive of what you changed specifically. Commit messages like "Fixes #1234" would be asked by the reviewer to be revised.
 9. If there are intermediate commits that are not meaningful to the overall PR, such as "Fixed error on style guide", "Fixed phpstan error", "Fixing mistake in code", and other related commits, it is advised to squash your commits so that we can have a clean commit history.
 10. If you have touched PHP code, run static analysis.
    - `> composer analyze`

From 9d5ef6bce50d4a79ba28b5a3432e92035fe2534e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 12 Nov 2021 16:32:51 +0900
Subject: [PATCH 0711/2325] test: add $this->markTestSkipped() when extension
 not loaded

---
 tests/system/Cache/Handlers/MemcachedHandlerTest.php | 4 ++++
 tests/system/Cache/Handlers/RedisHandlerTest.php     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
index 38005d87ed5b..08a28f376fe7 100644
--- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php
+++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
@@ -37,6 +37,10 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        if (! extension_loaded('memcached')) {
+            $this->markTestSkipped('Memcached extension not loaded.');
+        }
+
         $this->config = new Cache();
 
         $this->handler = new MemcachedHandler($this->config);
diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php
index 4eb8f8b08560..205e708fc99a 100644
--- a/tests/system/Cache/Handlers/RedisHandlerTest.php
+++ b/tests/system/Cache/Handlers/RedisHandlerTest.php
@@ -36,6 +36,10 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        if (! extension_loaded('redis')) {
+            $this->markTestSkipped('redis extension not loaded.');
+        }
+
         $this->config = new Cache();
 
         $this->handler = new RedisHandler($this->config);

From 96b264607deda02c0f17c397a056b26fb669f6fd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 12 Nov 2021 16:33:42 +0900
Subject: [PATCH 0712/2325] test: remove unneeded return after
 $this->markTestSkipped()

---
 tests/system/Images/BaseHandlerTest.php        | 2 --
 tests/system/Images/GDHandlerTest.php          | 2 --
 tests/system/Images/ImageMagickHandlerTest.php | 2 --
 3 files changed, 6 deletions(-)

diff --git a/tests/system/Images/BaseHandlerTest.php b/tests/system/Images/BaseHandlerTest.php
index dddcf2bdf097..708e4ef50d3a 100644
--- a/tests/system/Images/BaseHandlerTest.php
+++ b/tests/system/Images/BaseHandlerTest.php
@@ -34,8 +34,6 @@ protected function setUp(): void
     {
         if (! extension_loaded('gd')) {
             $this->markTestSkipped('The GD extension is not available.');
-
-            return;
         }
 
         // create virtual file system
diff --git a/tests/system/Images/GDHandlerTest.php b/tests/system/Images/GDHandlerTest.php
index e93995d2072e..30216725a988 100644
--- a/tests/system/Images/GDHandlerTest.php
+++ b/tests/system/Images/GDHandlerTest.php
@@ -33,8 +33,6 @@ protected function setUp(): void
     {
         if (! extension_loaded('gd')) {
             $this->markTestSkipped('The GD extension is not available.');
-
-            return;
         }
 
         // create virtual file system
diff --git a/tests/system/Images/ImageMagickHandlerTest.php b/tests/system/Images/ImageMagickHandlerTest.php
index 1c97baeac0e5..02d02e305634 100644
--- a/tests/system/Images/ImageMagickHandlerTest.php
+++ b/tests/system/Images/ImageMagickHandlerTest.php
@@ -34,8 +34,6 @@ protected function setUp(): void
     {
         if (! extension_loaded('imagick')) {
             $this->markTestSkipped('The ImageMagick extension is not available.');
-
-            return;
         }
 
         $this->root = WRITEPATH . 'cache/';

From 07e701bbaaccb7e948675e6838a9125b8d856923 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 13 Nov 2021 10:00:00 +0900
Subject: [PATCH 0713/2325] docs: add about redirect() change

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

diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst
index f28de5092e3d..2f276a738533 100644
--- a/user_guide_src/source/installation/upgrade_4xx.rst
+++ b/user_guide_src/source/installation/upgrade_4xx.rst
@@ -94,6 +94,9 @@ General Adjustments
 **Helpers**
 
 - Helpers are pretty much the same as before, though some have been simplified.
+- In CI4, ``redirect()`` returns ``RedirectResponse`` instead of redirecting and terminating script execution. You must return it.
+    - `redirect() Documentation Codeigniter 3.X <https://codeigniter.com/userguide3/helpers/url_helper.html#redirect>`_
+    - `redirect() Documentation Codeigniter 4.X <../general/common_functions.html#redirect>`_
 
 **Events**
 

From 6292090f5f33bcb9f280427049d82b6466cfe855 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 13 Nov 2021 11:07:14 +0900
Subject: [PATCH 0714/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/installation/upgrade_4xx.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst
index 2f276a738533..570b9464ab64 100644
--- a/user_guide_src/source/installation/upgrade_4xx.rst
+++ b/user_guide_src/source/installation/upgrade_4xx.rst
@@ -95,8 +95,8 @@ General Adjustments
 
 - Helpers are pretty much the same as before, though some have been simplified.
 - In CI4, ``redirect()`` returns ``RedirectResponse`` instead of redirecting and terminating script execution. You must return it.
-    - `redirect() Documentation Codeigniter 3.X <https://codeigniter.com/userguide3/helpers/url_helper.html#redirect>`_
-    - `redirect() Documentation Codeigniter 4.X <../general/common_functions.html#redirect>`_
+    - `redirect() Documentation CodeIgniter 3.X <https://codeigniter.com/userguide3/helpers/url_helper.html#redirect>`_
+    - `redirect() Documentation CodeIgniter 4.X <../general/common_functions.html#redirect>`_
 
 **Events**
 

From 7c00a8b2ad5d730de1deee361de40d9c5fe39004 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 13 Nov 2021 11:07:24 +0900
Subject: [PATCH 0715/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/installation/upgrade_4xx.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst
index 570b9464ab64..76fdba16c8e0 100644
--- a/user_guide_src/source/installation/upgrade_4xx.rst
+++ b/user_guide_src/source/installation/upgrade_4xx.rst
@@ -94,7 +94,7 @@ General Adjustments
 **Helpers**
 
 - Helpers are pretty much the same as before, though some have been simplified.
-- In CI4, ``redirect()`` returns ``RedirectResponse`` instead of redirecting and terminating script execution. You must return it.
+- In CI4, ``redirect()`` returns a ``RedirectResponse`` instance instead of redirecting and terminating script execution. You must return it.
     - `redirect() Documentation CodeIgniter 3.X <https://codeigniter.com/userguide3/helpers/url_helper.html#redirect>`_
     - `redirect() Documentation CodeIgniter 4.X <../general/common_functions.html#redirect>`_
 

From fef36dae408f3b7990bd2dc896165c0366c3652a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 13 Nov 2021 12:12:14 +0900
Subject: [PATCH 0716/2325] docs: replace Codeigniter with CodeIgniter

---
 user_guide_src/source/changelogs/v4.1.2.rst               | 2 +-
 .../source/installation/upgrade_configuration.rst         | 8 ++++----
 .../source/installation/upgrade_controllers.rst           | 8 ++++----
 user_guide_src/source/installation/upgrade_database.rst   | 8 ++++----
 user_guide_src/source/installation/upgrade_emails.rst     | 8 ++++----
 user_guide_src/source/installation/upgrade_encryption.rst | 8 ++++----
 .../source/installation/upgrade_file_upload.rst           | 8 ++++----
 .../source/installation/upgrade_html_tables.rst           | 8 ++++----
 .../source/installation/upgrade_localization.rst          | 8 ++++----
 user_guide_src/source/installation/upgrade_migrations.rst | 8 ++++----
 user_guide_src/source/installation/upgrade_models.rst     | 8 ++++----
 user_guide_src/source/installation/upgrade_pagination.rst | 8 ++++----
 user_guide_src/source/installation/upgrade_responses.rst  | 8 ++++----
 user_guide_src/source/installation/upgrade_routing.rst    | 8 ++++----
 user_guide_src/source/installation/upgrade_security.rst   | 8 ++++----
 user_guide_src/source/installation/upgrade_sessions.rst   | 8 ++++----
 .../source/installation/upgrade_validations.rst           | 8 ++++----
 .../source/installation/upgrade_view_parser.rst           | 8 ++++----
 user_guide_src/source/installation/upgrade_views.rst      | 8 ++++----
 19 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.1.2.rst b/user_guide_src/source/changelogs/v4.1.2.rst
index 953083aeeff5..73fb0e4ccef6 100644
--- a/user_guide_src/source/changelogs/v4.1.2.rst
+++ b/user_guide_src/source/changelogs/v4.1.2.rst
@@ -38,7 +38,7 @@ Changes:
 
 Deprecations:
 
-- Deprecated ``Codeigniter\View\View::$currentSection`` property.
+- Deprecated ``CodeIgniter\View\View::$currentSection`` property.
 - Language strings and exceptions on invalid cookie samesite are deprecated for the ``CookieException``'s own exception message.
 - Deprecated `CodeIgniter\Entity` in favor of `CodeIgniter\Entity\Entity`
 - Deprecated cookie-related properties of ``Response`` in order to use the ``Cookie`` class.
diff --git a/user_guide_src/source/installation/upgrade_configuration.rst b/user_guide_src/source/installation/upgrade_configuration.rst
index 93fbf7f9cd72..21c309cb34f2 100644
--- a/user_guide_src/source/installation/upgrade_configuration.rst
+++ b/user_guide_src/source/installation/upgrade_configuration.rst
@@ -8,8 +8,8 @@ Upgrade Configuration
 Documentations
 ==============
 
-- `Config Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/config.html>`_
-- :doc:`Configuration Documentation Codeigniter 4.X </general/configuration>`
+- `Config Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/config.html>`_
+- :doc:`Configuration Documentation CodeIgniter 4.X </general/configuration>`
 
 
 What has been changed
@@ -37,7 +37,7 @@ Upgrade Guide
 Code Example
 ============
 
-Codeigniter Version 3.11
+CodeIgniter Version 3.11
 ------------------------
 
 Path: ``application/models``::
@@ -49,7 +49,7 @@ Path: ``application/models``::
     $siteName  = 'My Great Site';
     $siteEmail = 'webmaster@example.com';
 
-Codeigniter Version 4.x
+CodeIgniter Version 4.x
 -----------------------
 
 Path: ``app/Config``::
diff --git a/user_guide_src/source/installation/upgrade_controllers.rst b/user_guide_src/source/installation/upgrade_controllers.rst
index 4af4449f0832..2625bd29cbb0 100644
--- a/user_guide_src/source/installation/upgrade_controllers.rst
+++ b/user_guide_src/source/installation/upgrade_controllers.rst
@@ -8,8 +8,8 @@ Upgrade Controllers
 Documentations
 ==============
 
-- `Controller Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/general/controllers.html>`_
-- :doc:`Controller Documentation Codeigniter 4.X </incoming/controllers>`
+- `Controller Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/general/controllers.html>`_
+- :doc:`Controller Documentation CodeIgniter 4.X </incoming/controllers>`
 
 What has been changed
 =====================
@@ -38,7 +38,7 @@ Upgrade Guide
 Code Example
 ============
 
-Codeigniter Version 3.11
+CodeIgniter Version 3.11
 ------------------------
 
 Path: ``application/controllers``::
@@ -53,7 +53,7 @@ Path: ``application/controllers``::
         }
     }
 
-Codeigniter Version 4.x
+CodeIgniter Version 4.x
 -----------------------
 
 Path: ``app/Controllers``::
diff --git a/user_guide_src/source/installation/upgrade_database.rst b/user_guide_src/source/installation/upgrade_database.rst
index 798b24a1c6c0..221a52b7a8dc 100644
--- a/user_guide_src/source/installation/upgrade_database.rst
+++ b/user_guide_src/source/installation/upgrade_database.rst
@@ -9,8 +9,8 @@ Upgrade Database
 Documentations
 ==============
 
-- `Database Reference Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/database/index.html>`_
-- :doc:`Working with Databases Documentation Codeigniter 4.X </database/index>`
+- `Database Reference Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/database/index.html>`_
+- :doc:`Working with Databases Documentation CodeIgniter 4.X </database/index>`
 
 
 What has been changed
@@ -46,7 +46,7 @@ Upgrade Guide
 Code Example
 ============
 
-Codeigniter Version 3.11
+CodeIgniter Version 3.11
 ------------------------
 ::
 
@@ -55,7 +55,7 @@ Codeigniter Version 3.11
                 ->limit(10, 20)
                 ->get('mytable');
 
-Codeigniter Version 4.x
+CodeIgniter Version 4.x
 -----------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_emails.rst b/user_guide_src/source/installation/upgrade_emails.rst
index 1a65f279cfa7..41778027dc30 100644
--- a/user_guide_src/source/installation/upgrade_emails.rst
+++ b/user_guide_src/source/installation/upgrade_emails.rst
@@ -9,8 +9,8 @@ Upgrade Emails
 Documentations
 ==============
 
-- `Email Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/email.html>`_
-- :doc:`Email Documentation Codeigniter 4.X </libraries/email>`
+- `Email Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/email.html>`_
+- :doc:`Email Documentation CodeIgniter 4.X </libraries/email>`
 
 
 What has been changed
@@ -27,7 +27,7 @@ Upgrade Guide
 Code Example
 ============
 
-Codeigniter Version 3.11
+CodeIgniter Version 3.11
 ------------------------
 ::
 
@@ -43,7 +43,7 @@ Codeigniter Version 3.11
 
     $this->email->send();
 
-Codeigniter Version 4.x
+CodeIgniter Version 4.x
 -----------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_encryption.rst b/user_guide_src/source/installation/upgrade_encryption.rst
index 7dadbba63e85..dca7fbcbc27b 100644
--- a/user_guide_src/source/installation/upgrade_encryption.rst
+++ b/user_guide_src/source/installation/upgrade_encryption.rst
@@ -9,8 +9,8 @@ Upgrade Encryption
 Documentations
 ==============
 
-- `Encryption Library Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/encryption.html>`_
-- :doc:`Encryption Service Documentation Codeigniter 4.X </libraries/encryption>`
+- `Encryption Library Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/encryption.html>`_
+- :doc:`Encryption Service Documentation CodeIgniter 4.X </libraries/encryption>`
 
 
 What has been changed
@@ -25,7 +25,7 @@ Upgrade Guide
 Code Example
 ============
 
-Codeigniter Version 3.11
+CodeIgniter Version 3.11
 ------------------------
 ::
 
@@ -38,7 +38,7 @@ Codeigniter Version 3.11
     echo $this->encryption->decrypt($ciphertext);
 
 
-Codeigniter Version 4.x
+CodeIgniter Version 4.x
 -----------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_file_upload.rst b/user_guide_src/source/installation/upgrade_file_upload.rst
index e93884f7fa81..3369442e6392 100644
--- a/user_guide_src/source/installation/upgrade_file_upload.rst
+++ b/user_guide_src/source/installation/upgrade_file_upload.rst
@@ -8,8 +8,8 @@ Upgrade Working with Uploaded Files
 
 Documentations
 ==============
-- `Output Class Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/file_uploading.html>`_
-- :doc:`Working with Uploaded Files Documentation Codeigniter 4.X </libraries/uploaded_files>`
+- `Output Class Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/file_uploading.html>`_
+- :doc:`Working with Uploaded Files Documentation CodeIgniter 4.X </libraries/uploaded_files>`
 
 What has been changed
 =====================
@@ -25,7 +25,7 @@ You have to change your file uploading code to match the new methods.
 Code Example
 ============
 
-Codeigniter Version 3.11
+CodeIgniter Version 3.11
 ------------------------
 ::
 
@@ -69,7 +69,7 @@ Codeigniter Version 3.11
         }
     }
 
-Codeigniter Version 4.x
+CodeIgniter Version 4.x
 -----------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_html_tables.rst b/user_guide_src/source/installation/upgrade_html_tables.rst
index f8563c0ca9a5..9fc98e1fd838 100644
--- a/user_guide_src/source/installation/upgrade_html_tables.rst
+++ b/user_guide_src/source/installation/upgrade_html_tables.rst
@@ -9,8 +9,8 @@ Upgrade HTML Tables
 Documentations
 ==============
 
-- `HTML Table Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/table.html>`_
-- :doc:`HTML Table Documentation Codeigniter 4.X </outgoing/table>`
+- `HTML Table Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/table.html>`_
+- :doc:`HTML Table Documentation CodeIgniter 4.X </outgoing/table>`
 
 
 What has been changed
@@ -26,7 +26,7 @@ Upgrade Guide
 Code Example
 ============
 
-Codeigniter Version 3.11
+CodeIgniter Version 3.11
 ------------------------
 ::
 
@@ -40,7 +40,7 @@ Codeigniter Version 3.11
 
     echo $this->table->generate();
 
-Codeigniter Version 4.x
+CodeIgniter Version 4.x
 -----------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_localization.rst b/user_guide_src/source/installation/upgrade_localization.rst
index bb01d0057228..b974570f5939 100644
--- a/user_guide_src/source/installation/upgrade_localization.rst
+++ b/user_guide_src/source/installation/upgrade_localization.rst
@@ -9,8 +9,8 @@ Upgrade Localization
 Documentations
 ==============
 
-- `Language Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/language.html>`_
-- :doc:`Localization Documentation Codeigniter 4.X </outgoing/localization>`
+- `Language Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/language.html>`_
+- :doc:`Localization Documentation CodeIgniter 4.X </outgoing/localization>`
 
 
 What has been changed
@@ -31,7 +31,7 @@ Upgrade Guide
 Code Example
 ============
 
-Codeigniter Version 3.11
+CodeIgniter Version 3.11
 ------------------------
 ::
 
@@ -45,7 +45,7 @@ Codeigniter Version 3.11
     $this->lang->load('error', $lang);
     echo $this->lang->line('error_email_missing');
 
-Codeigniter Version 4.x
+CodeIgniter Version 4.x
 -----------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_migrations.rst b/user_guide_src/source/installation/upgrade_migrations.rst
index 66bfcbaabc1d..10a75bf23f2d 100644
--- a/user_guide_src/source/installation/upgrade_migrations.rst
+++ b/user_guide_src/source/installation/upgrade_migrations.rst
@@ -8,8 +8,8 @@ Upgrade Migrations
 Documentations
 ==============
 
-- `Database Migrations Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/migration.html>`_
-- :doc:`Database Migrations Documentation Codeigniter 4.X </dbmgmt/migration>`
+- `Database Migrations Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/migration.html>`_
+- :doc:`Database Migrations Documentation CodeIgniter 4.X </dbmgmt/migration>`
 
 What has been changed
 =====================
@@ -48,7 +48,7 @@ Upgrade Guide
 Code Example
 ============
 
-Codeigniter Version 3.11
+CodeIgniter Version 3.11
 ------------------------
 
 Path: ``application/migrations``::
@@ -87,7 +87,7 @@ Path: ``application/migrations``::
         }
     }
 
-Codeigniter Version 4.x
+CodeIgniter Version 4.x
 -----------------------
 
 Path: ``app/Database/Migrations``::
diff --git a/user_guide_src/source/installation/upgrade_models.rst b/user_guide_src/source/installation/upgrade_models.rst
index 6b4f78a2b856..7100f6ca9202 100644
--- a/user_guide_src/source/installation/upgrade_models.rst
+++ b/user_guide_src/source/installation/upgrade_models.rst
@@ -8,8 +8,8 @@ Upgrade Models
 Documentations
 ==============
 
-- `Model Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/general/models.html>`_
-- :doc:`Model Documentation Codeigniter 4.X </models/model>`
+- `Model Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/general/models.html>`_
+- :doc:`Model Documentation CodeIgniter 4.X </models/model>`
 
 
 What has been changed
@@ -38,7 +38,7 @@ You can find more information to those methods :doc:`here </models/model>`.
 Code Example
 ============
 
-Codeigniter Version 3.11
+CodeIgniter Version 3.11
 ------------------------
 
 Path: ``application/models``::
@@ -57,7 +57,7 @@ Path: ``application/models``::
         }
     }
 
-Codeigniter Version 4.x
+CodeIgniter Version 4.x
 -----------------------
 
 Path: ``app/Models``::
diff --git a/user_guide_src/source/installation/upgrade_pagination.rst b/user_guide_src/source/installation/upgrade_pagination.rst
index 8151e82465e5..4743bb985cf2 100644
--- a/user_guide_src/source/installation/upgrade_pagination.rst
+++ b/user_guide_src/source/installation/upgrade_pagination.rst
@@ -9,8 +9,8 @@ Upgrade Pagination
 Documentations
 ==============
 
-- `Pagination Class Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/pagination.html>`_
-- :doc:`Pagination Documentation Codeigniter 4.X </libraries/pagination>`
+- `Pagination Class Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/pagination.html>`_
+- :doc:`Pagination Documentation CodeIgniter 4.X </libraries/pagination>`
 
 
 What has been changed
@@ -34,7 +34,7 @@ Upgrade Guide
 Code Example
 ============
 
-Codeigniter Version 3.11
+CodeIgniter Version 3.11
 ------------------------
 ::
 
@@ -50,7 +50,7 @@ Codeigniter Version 3.11
 
     $this->load->view('posts/index', $data);
 
-Codeigniter Version 4.x
+CodeIgniter Version 4.x
 -----------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_responses.rst b/user_guide_src/source/installation/upgrade_responses.rst
index 6b5cc1b4ef7b..aafcf9731faa 100644
--- a/user_guide_src/source/installation/upgrade_responses.rst
+++ b/user_guide_src/source/installation/upgrade_responses.rst
@@ -8,8 +8,8 @@ Upgrade HTTP Responses
 
 Documentations
 ==============
-- `Output Class Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/output.html>`_
-- :doc:`HTTP Responses Documentation Codeigniter 4.X </outgoing/response>`
+- `Output Class Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/output.html>`_
+- :doc:`HTTP Responses Documentation CodeIgniter 4.X </outgoing/response>`
 
 What has been changed
 =====================
@@ -23,7 +23,7 @@ Upgrade Guide
 Code Example
 ============
 
-Codeigniter Version 3.11
+CodeIgniter Version 3.11
 ------------------------
 ::
 
@@ -35,7 +35,7 @@ Codeigniter Version 3.11
         ->set_content_type('application/json')
         ->set_output(json_encode(array('foo' => 'bar')));
 
-Codeigniter Version 4.x
+CodeIgniter Version 4.x
 -----------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_routing.rst b/user_guide_src/source/installation/upgrade_routing.rst
index 7243d41345db..bd840b06a82c 100644
--- a/user_guide_src/source/installation/upgrade_routing.rst
+++ b/user_guide_src/source/installation/upgrade_routing.rst
@@ -9,8 +9,8 @@ Upgrade Routing
 Documentations
 ==============
 
-- `URI Routing Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/general/routing.html>`_
-- :doc:`URI Routing Documentation Codeigniter 4.X </incoming/routing>`
+- `URI Routing Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/general/routing.html>`_
+- :doc:`URI Routing Documentation CodeIgniter 4.X </incoming/routing>`
 
 
 What has been changed
@@ -28,7 +28,7 @@ Upgrade Guide
 Code Example
 ============
 
-Codeigniter Version 3.11
+CodeIgniter Version 3.11
 ------------------------
 Path: ``application/config/routes.php``::
 
@@ -45,7 +45,7 @@ Path: ``application/config/routes.php``::
     $route['drivers/update'] = 'drivers/update';
     $route['posts/(:any)'] = 'posts/view/$1';
 
-Codeigniter Version 4.x
+CodeIgniter Version 4.x
 -----------------------
 Path: ``app/Config/Routes.php``::
 
diff --git a/user_guide_src/source/installation/upgrade_security.rst b/user_guide_src/source/installation/upgrade_security.rst
index 7f991b0bdb47..4aeb34e513c9 100644
--- a/user_guide_src/source/installation/upgrade_security.rst
+++ b/user_guide_src/source/installation/upgrade_security.rst
@@ -9,8 +9,8 @@ Upgrade Security
 Documentations
 ==============
 
-- `Security Class Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/security.html>`_
-- :doc:`Security Documentation Codeigniter 4.X </libraries/security>`
+- `Security Class Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/security.html>`_
+- :doc:`Security Documentation CodeIgniter 4.X </libraries/security>`
 
 .. note::
     If you use the :doc:`form helper </helpers/form_helper>` and enable the CSRF filter globally, then ``form_open()`` will automatically insert a hidden CSRF field in your forms. So you do not have to upgrade this by yourself.
@@ -36,7 +36,7 @@ Upgrade Guide
 Code Example
 ============
 
-Codeigniter Version 3.11
+CodeIgniter Version 3.11
 ------------------------
 ::
 
@@ -56,7 +56,7 @@ Codeigniter Version 3.11
         <input type="submit" value="Save">
     </form>
 
-Codeigniter Version 4.x
+CodeIgniter Version 4.x
 -----------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_sessions.rst b/user_guide_src/source/installation/upgrade_sessions.rst
index 3aa085a016ff..23688000ff96 100644
--- a/user_guide_src/source/installation/upgrade_sessions.rst
+++ b/user_guide_src/source/installation/upgrade_sessions.rst
@@ -9,8 +9,8 @@ Upgrade Sessions
 Documentations
 ==============
 
-- `Session Library Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/sessions.html>`_
-- :doc:`Session Library Documentation Codeigniter 4.X </libraries/sessions>`
+- `Session Library Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/sessions.html>`_
+- :doc:`Session Library Documentation CodeIgniter 4.X </libraries/sessions>`
 
 
 What has been changed
@@ -30,7 +30,7 @@ Upgrade Guide
 Code Example
 ============
 
-Codeigniter Version 3.11
+CodeIgniter Version 3.11
 ------------------------
 ::
 
@@ -40,7 +40,7 @@ Codeigniter Version 3.11
     $this->session->item;
     $this->session->userdata('item');
 
-Codeigniter Version 4.x
+CodeIgniter Version 4.x
 -----------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
index 0bc0928ee32e..5e2b1a2bf942 100644
--- a/user_guide_src/source/installation/upgrade_validations.rst
+++ b/user_guide_src/source/installation/upgrade_validations.rst
@@ -9,8 +9,8 @@ Upgrade Validations
 Documentations of Library
 =========================
 
-- `Form Validation Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/form_validation.html>`_
-- :doc:`Validation Documentation Codeigniter 4.X </libraries/validation>`
+- `Form Validation Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/form_validation.html>`_
+- :doc:`Validation Documentation CodeIgniter 4.X </libraries/validation>`
 
 
 What has been changed
@@ -44,7 +44,7 @@ Upgrade Guide
 Code Example
 ============
 
-Codeigniter Version 3.11
+CodeIgniter Version 3.11
 ------------------------
 Path: ``application/views``::
 
@@ -102,7 +102,7 @@ Path: ``application/controllers/``::
         }
     }
 
-Codeigniter Version 4.x
+CodeIgniter Version 4.x
 -----------------------
 Path: ``app/Views``::
 
diff --git a/user_guide_src/source/installation/upgrade_view_parser.rst b/user_guide_src/source/installation/upgrade_view_parser.rst
index f3147bbcd6fd..94bd5ac67f19 100644
--- a/user_guide_src/source/installation/upgrade_view_parser.rst
+++ b/user_guide_src/source/installation/upgrade_view_parser.rst
@@ -9,8 +9,8 @@ Upgrade View Parser
 Documentations
 ==============
 
-- `Template Parser Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/libraries/parser.html>`_
-- :doc:`View Parser Documentation Codeigniter 4.X </outgoing/view_parser>`
+- `Template Parser Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/parser.html>`_
+- :doc:`View Parser Documentation CodeIgniter 4.X </outgoing/view_parser>`
 
 
 What has been changed
@@ -26,7 +26,7 @@ Upgrade Guide
 Code Example
 ============
 
-Codeigniter Version 3.11
+CodeIgniter Version 3.11
 ------------------------
 ::
 
@@ -40,7 +40,7 @@ Codeigniter Version 3.11
     $this->parser
         ->parse('blog_template', $data);
 
-Codeigniter Version 4.x
+CodeIgniter Version 4.x
 -----------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_views.rst b/user_guide_src/source/installation/upgrade_views.rst
index 4da9ce84301d..554a0a83ffc3 100644
--- a/user_guide_src/source/installation/upgrade_views.rst
+++ b/user_guide_src/source/installation/upgrade_views.rst
@@ -8,8 +8,8 @@ Upgrade Views
 Documentations
 ==============
 
-- `View Documentation Codeigniter 3.X <http://codeigniter.com/userguide3/general/views.html>`_
-- :doc:`View Documentation Codeigniter 4.X </outgoing/views>`
+- `View Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/general/views.html>`_
+- :doc:`View Documentation CodeIgniter 4.X </outgoing/views>`
 
 What has been changed
 =====================
@@ -30,7 +30,7 @@ Upgrade Guide
 Code Example
 ============
 
-Codeigniter Version 3.11
+CodeIgniter Version 3.11
 ------------------------
 
 Path: ``application/views``::
@@ -53,7 +53,7 @@ Path: ``application/views``::
     </body>
     </html>
 
-Codeigniter Version 4.x
+CodeIgniter Version 4.x
 -----------------------
 
 Path: ``app/Views``::

From b835b01a0e1eff4b408a582c8246de969ca30fca Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 13 Nov 2021 15:27:00 +0900
Subject: [PATCH 0717/2325] docs: add example file names

---
 user_guide_src/source/outgoing/view_layouts.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/outgoing/view_layouts.rst b/user_guide_src/source/outgoing/view_layouts.rst
index a0e47ab94499..da14a4400bbe 100644
--- a/user_guide_src/source/outgoing/view_layouts.rst
+++ b/user_guide_src/source/outgoing/view_layouts.rst
@@ -19,7 +19,7 @@ Creating A Layout
 Layouts are views like any other. The only difference is their intended usage. Layouts are the only view
 files that would make use of the ``renderSection()`` method. This method acts as a placeholder for content.
 
-::
+E.g. **app/Views/default.php**::
 
     <!doctype html>
     <html>
@@ -50,7 +50,9 @@ other PSR-4 defined namespaces. You can include a namespace to locate the view i
 
 All content within a view that extends a layout must be included within ``section($name)`` and ``endSection()`` method calls.
 Any content between these calls will be inserted into the layout wherever the ``renderSection($name)`` call that
-matches the section name exists.::
+matches the section name exists.
+
+E.g. **app/Views/some_view.php**::
 
     <?= $this->extend('default') ?>
 

From 73b7c412c527c0f6a9ce885fc419fef64a1e1867 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 13 Nov 2021 15:27:24 +0900
Subject: [PATCH 0718/2325] docs: add file names in explanation

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

diff --git a/user_guide_src/source/outgoing/view_layouts.rst b/user_guide_src/source/outgoing/view_layouts.rst
index da14a4400bbe..18a0f963c9e3 100644
--- a/user_guide_src/source/outgoing/view_layouts.rst
+++ b/user_guide_src/source/outgoing/view_layouts.rst
@@ -85,6 +85,8 @@ Rendering the view and it's layout is done exactly as any other view would be di
         echo view('some_view');
     }
 
+It renders the View **app/Views/some_view.php** and if it extends ``default``,
+the Layout **app/Views/default.php** is also used automatically.
 The renderer is smart enough to detect whether the view should be rendered on its own, or if it needs a layout.
 
 ***********************

From de3f788f90600a2399e036a2e268a0abcd6ebd3a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 13 Nov 2021 15:28:25 +0900
Subject: [PATCH 0719/2325] docs: decorate method name with '``'

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

diff --git a/user_guide_src/source/outgoing/view_layouts.rst b/user_guide_src/source/outgoing/view_layouts.rst
index 18a0f963c9e3..8bc8f6df829c 100644
--- a/user_guide_src/source/outgoing/view_layouts.rst
+++ b/user_guide_src/source/outgoing/view_layouts.rst
@@ -31,7 +31,7 @@ E.g. **app/Views/default.php**::
     </body>
     </html>
 
-The renderSection() method only has one argument - the name of the section. That way any child views know
+The ``renderSection()`` method only has one argument - the name of the section. That way any child views know
 what to name the content section.
 
 **********************
@@ -42,7 +42,7 @@ Whenever a view wants to be inserted into a layout, it must use the ``extend()``
 
     <?= $this->extend('default') ?>
 
-The extend method takes the name of any view file that you wish to use. Since they are standard views, they will
+The ``extend()`` method takes the name of any view file that you wish to use. Since they are standard views, they will
 be located just like a view. By default, it will look in the application's View directory, but will also scan
 other PSR-4 defined namespaces. You can include a namespace to locate the view in particular namespace View directory::
 
@@ -106,5 +106,5 @@ view to view. When using view layouts you must use ``$this->include()`` to inclu
         <?= $this->include('sidebar') ?>
     <?= $this->endSection() ?>
 
-When calling the include() method, you can pass it all of the same options that can when rendering a normal view, including
+When calling the ``include()`` method, you can pass it all of the same options that can when rendering a normal view, including
 cache directives, etc.

From f95e75fcfbb63715af4bb3e7229704ec1e969cfc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 14 Nov 2021 09:15:08 +0900
Subject: [PATCH 0720/2325] refactor: rename variable names

To make it easier to identify binary or hex
---
 system/Security/Security.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/Security/Security.php b/system/Security/Security.php
index ef06661966f8..1224bc16f0ac 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -348,14 +348,14 @@ public function getHash(): ?string
      */
     protected function randomize(string $hash): string
     {
-        $key   = random_bytes(self::CSRF_HASH_BYTES);
-        $value = hex2bin($hash);
+        $keyBinary  = random_bytes(self::CSRF_HASH_BYTES);
+        $hashBinary = hex2bin($hash);
 
-        if ($value === false) {
+        if ($hashBinary === false) {
             throw new LogicException('$hash is invalid: ' . $hash);
         }
 
-        return bin2hex(($value ^ $key) . $key);
+        return bin2hex(($hashBinary ^ $keyBinary) . $keyBinary);
     }
 
     /**

From 1037f7f431ebc4cff7600314e9101bc7f907bab2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 14 Nov 2021 09:22:31 +0900
Subject: [PATCH 0721/2325] refactor: CSRF_HASH_BYTES can be overridden

Because the use case where users want to increase the value is assumed.
---
 system/Security/Security.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/Security/Security.php b/system/Security/Security.php
index 1224bc16f0ac..fc8c1ac334c8 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -31,7 +31,7 @@ class Security implements SecurityInterface
 {
     public const CSRF_PROTECTION_COOKIE  = 'cookie';
     public const CSRF_PROTECTION_SESSION = 'session';
-    public const CSRF_HASH_BYTES         = 16;
+    protected const CSRF_HASH_BYTES      = 16;
 
     /**
      * CSRF Protection Method
@@ -348,7 +348,7 @@ public function getHash(): ?string
      */
     protected function randomize(string $hash): string
     {
-        $keyBinary  = random_bytes(self::CSRF_HASH_BYTES);
+        $keyBinary  = random_bytes(static::CSRF_HASH_BYTES);
         $hashBinary = hex2bin($hash);
 
         if ($hashBinary === false) {
@@ -363,8 +363,8 @@ protected function randomize(string $hash): string
      */
     protected function derandomize(string $token): string
     {
-        $key   = substr($token, -self::CSRF_HASH_BYTES * 2);
-        $value = substr($token, 0, self::CSRF_HASH_BYTES * 2);
+        $key   = substr($token, -static::CSRF_HASH_BYTES * 2);
+        $value = substr($token, 0, static::CSRF_HASH_BYTES * 2);
 
         return bin2hex(hex2bin($value) ^ hex2bin($key));
     }
@@ -498,7 +498,7 @@ protected function generateHash(): string
                 return $this->hash = $this->session->get($this->tokenName);
             }
 
-            $this->hash = bin2hex(random_bytes(self::CSRF_HASH_BYTES));
+            $this->hash = bin2hex(random_bytes(static::CSRF_HASH_BYTES));
 
             if ($this->isCSRFCookie()) {
                 $this->saveHashInCookie();

From 1811d00c636266dfa95f5b43b61a964eb757a1d1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 14 Nov 2021 09:42:16 +0900
Subject: [PATCH 0722/2325] test: add $this->expectExceptionMessage();

---
 .../Security/SecurityCSRFSessionRandomizeTokenTest.php      | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
index 00623d3db9f1..c90007bec74c 100644
--- a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
+++ b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
@@ -111,6 +111,7 @@ public function testHashIsReadFromSession()
     public function testCSRFVerifyPostThrowsExceptionOnNoMatch()
     {
         $this->expectException(SecurityException::class);
+        $this->expectExceptionMessage('The action you requested is not allowed.');
 
         $_SERVER['REQUEST_METHOD'] = 'POST';
         $_POST['csrf_test_name']   = '8b9218a55906f9dcc1dc263dce7f005b';
@@ -147,6 +148,8 @@ public function testCSRFVerifyPOSTHeaderThrowsExceptionOnNoMatch()
         $security = new Security(new MockAppConfig());
 
         $this->expectException(SecurityException::class);
+        $this->expectExceptionMessage('The action you requested is not allowed.');
+
         $security->verify($request);
     }
 
@@ -175,6 +178,8 @@ public function testCSRFVerifyPUTHeaderThrowsExceptionOnNoMatch()
         $security = new Security(new MockAppConfig());
 
         $this->expectException(SecurityException::class);
+        $this->expectExceptionMessage('The action you requested is not allowed.');
+
         $security->verify($request);
     }
 
@@ -194,6 +199,7 @@ public function testCSRFVerifyPUTHeaderReturnsSelfOnMatch()
     public function testCSRFVerifyJsonThrowsExceptionOnNoMatch()
     {
         $this->expectException(SecurityException::class);
+        $this->expectExceptionMessage('The action you requested is not allowed.');
 
         $_SERVER['REQUEST_METHOD'] = 'POST';
 

From b1bc7ba1f41f3b7b626b6cd94fa5bca9f1e262ad Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 14 Nov 2021 10:53:14 +0900
Subject: [PATCH 0723/2325] docs: add Token Randomization to user guide

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

diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index a7ee6e141f78..b14535003648 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -79,6 +79,20 @@ It is also possible to enable the CSRF filter only for specific methods::
         'post' => ['csrf'],
     ];
 
+Token Randomization
+===================
+
+To mitigate compression side-channel attacks like `BREACH`_, and prevent an attacker from guessing the CSRF tokens, you can configure token randomization (default off).
+
+If you enable it, a random mask is added to the token and used to scramble it.
+
+.. _`BREACH`: https://en.wikipedia.org/wiki/BREACH
+
+You can enable it by editing the following config parameter value in
+**app/Config/Security.php**::
+
+    public $tokenRandomize = true;
+
 HTML Forms
 ==========
 

From 29bfacf68166922ff7b5ff0051c2ff978baecc68 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 14 Nov 2021 11:04:35 +0900
Subject: [PATCH 0724/2325] test: fix assertions

---
 .../system/Security/SecurityCSRFSessionRandomizeTokenTest.php | 4 ++--
 tests/system/Security/SecurityCSRFSessionTest.php             | 4 ++--
 tests/system/Security/SecurityTest.php                        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
index c90007bec74c..2717e26a40e8 100644
--- a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
+++ b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
@@ -135,7 +135,7 @@ public function testCSRFVerifyPostReturnsSelfOnMatch()
 
         $this->assertInstanceOf(Security::class, $security->verify($request));
         $this->assertLogged('info', 'CSRF token verified.');
-        $this->assertTrue(count($_POST) === 1);
+        $this->assertCount(1, $_POST);
     }
 
     public function testCSRFVerifyPOSTHeaderThrowsExceptionOnNoMatch()
@@ -222,7 +222,7 @@ public function testCSRFVerifyJsonReturnsSelfOnMatch()
 
         $this->assertInstanceOf(Security::class, $security->verify($request));
         $this->assertLogged('info', 'CSRF token verified.');
-        $this->assertTrue($request->getBody() === '{"foo":"bar"}');
+        $this->assertSame('{"foo":"bar"}', $request->getBody());
     }
 
     public function testRegenerateWithFalseSecurityRegenerateProperty()
diff --git a/tests/system/Security/SecurityCSRFSessionTest.php b/tests/system/Security/SecurityCSRFSessionTest.php
index c0ec2c066c40..ca07bf1f30b7 100644
--- a/tests/system/Security/SecurityCSRFSessionTest.php
+++ b/tests/system/Security/SecurityCSRFSessionTest.php
@@ -124,7 +124,7 @@ public function testCSRFVerifyPostReturnsSelfOnMatch()
 
         $this->assertInstanceOf(Security::class, $security->verify($request));
         $this->assertLogged('info', 'CSRF token verified.');
-        $this->assertTrue(count($_POST) === 1);
+        $this->assertCount(1, $_POST);
     }
 
     public function testCSRFVerifyPOSTHeaderThrowsExceptionOnNoMatch()
@@ -206,7 +206,7 @@ public function testCSRFVerifyJsonReturnsSelfOnMatch()
 
         $this->assertInstanceOf(Security::class, $security->verify($request));
         $this->assertLogged('info', 'CSRF token verified.');
-        $this->assertTrue($request->getBody() === '{"foo":"bar"}');
+        $this->assertSame('{"foo":"bar"}', $request->getBody());
     }
 
     public function testRegenerateWithFalseSecurityRegenerateProperty()
diff --git a/tests/system/Security/SecurityTest.php b/tests/system/Security/SecurityTest.php
index ba6a4ada5024..cc9fcf753853 100644
--- a/tests/system/Security/SecurityTest.php
+++ b/tests/system/Security/SecurityTest.php
@@ -115,7 +115,7 @@ public function testCSRFVerifyPostReturnsSelfOnMatch()
         $this->assertInstanceOf(Security::class, $security->verify($request));
         $this->assertLogged('info', 'CSRF token verified.');
 
-        $this->assertTrue(count($_POST) === 1);
+        $this->assertCount(1, $_POST);
     }
 
     public function testCSRFVerifyHeaderThrowsExceptionOnNoMatch()
@@ -176,7 +176,7 @@ public function testCSRFVerifyJsonReturnsSelfOnMatch()
         $this->assertInstanceOf(Security::class, $security->verify($request));
         $this->assertLogged('info', 'CSRF token verified.');
 
-        $this->assertTrue($request->getBody() === '{"foo":"bar"}');
+        $this->assertSame('{"foo":"bar"}', $request->getBody());
     }
 
     public function testSanitizeFilename()

From 899d7d4c06dfa6d43fcc8610112ee36730148577 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 14 Nov 2021 11:04:58 +0900
Subject: [PATCH 0725/2325] test: refactor MockSecurity

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

diff --git a/system/Test/Mock/MockSecurity.php b/system/Test/Mock/MockSecurity.php
index 0e782304a2e7..a078154b7ff9 100644
--- a/system/Test/Mock/MockSecurity.php
+++ b/system/Test/Mock/MockSecurity.php
@@ -22,9 +22,9 @@ protected function doSendCookie(): void
 
     protected function randomize(string $hash): string
     {
-        $key   = hex2bin('005513c290126d34d41bf41c5265e0f1');
-        $value = hex2bin($hash);
+        $keyBinary  = hex2bin('005513c290126d34d41bf41c5265e0f1');
+        $hashBinary = hex2bin($hash);
 
-        return bin2hex(($value ^ $key) . $key);
+        return bin2hex(($hashBinary ^ $keyBinary) . $keyBinary);
     }
 }

From d923f6c9e74643b957ece7ae06abb56fc811f1c0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 14 Nov 2021 12:34:04 +0900
Subject: [PATCH 0726/2325] docs: fix out-of-dated explanation

There is no $useKint.
---
 user_guide_src/source/testing/debugging.rst | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/testing/debugging.rst b/user_guide_src/source/testing/debugging.rst
index fbd0f8eed440..bdacb68e89d3 100644
--- a/user_guide_src/source/testing/debugging.rst
+++ b/user_guide_src/source/testing/debugging.rst
@@ -19,10 +19,9 @@ and much, much more.
 Enabling Kint
 =============
 
-By default, Kint is enabled in **development** and **testing** :doc:`environments </general/environments>` only. This can be altered by modifying
-the ``$useKint`` value in the environment configuration section of the main **index.php** file::
-
-    $useKint = true;
+By default, Kint is enabled in **development** and **testing** :doc:`environments </general/environments>` only.
+It will be enabled whenever the constant ``CI_DEBUG`` is defined and its value is truthy.
+This is defined in the boot files (e.g. **app/Config/Boot/development.php**).
 
 Using Kint
 ==========

From b255726410c8a8e0bd558b923498dbee6a3ff935 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 14 Nov 2021 12:35:36 +0900
Subject: [PATCH 0727/2325] docs: decorate constant with '``'

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

diff --git a/user_guide_src/source/testing/debugging.rst b/user_guide_src/source/testing/debugging.rst
index bdacb68e89d3..3e456d118793 100644
--- a/user_guide_src/source/testing/debugging.rst
+++ b/user_guide_src/source/testing/debugging.rst
@@ -59,7 +59,7 @@ Enabling the Toolbar
 ====================
 
 The toolbar is enabled by default in any :doc:`environment </general/environments>` *except* **production**. It will be shown whenever the
-constant CI_DEBUG is defined and its value is truthy. This is defined in the boot files (e.g.
+constant ``CI_DEBUG`` is defined and its value is truthy. This is defined in the boot files (e.g.
 **app/Config/Boot/development.php**) and can be modified there to determine what environment to show.
 
 .. note:: The Debug Toolbar is not displayed when your ``baseURL`` setting (in **app/Config/App.php** or ``app.baseURL`` in **.env**) does not match your actual URL.

From f7fe38ad16b0d53d4c370ef0e7a5bef014cfa262 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 14 Nov 2021 12:39:59 +0900
Subject: [PATCH 0728/2325] docs: fix coding style in sample code

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

diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
index fd75c09e99e4..39978648de77 100644
--- a/user_guide_src/source/libraries/publisher.rst
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -152,12 +152,9 @@ You can set up :doc:`Custom Command </cli/cli_commands>` to run daily that will
         {
             $publisher = new Publisher('/path/to/photos/', FCPATH . 'assets/images');
 
-            try
-            {
+            try {
                 $publisher->addPath('daily_photo.jpg')->copy(true); // `true` to enable overwrites
-            }
-            catch (Throwable $e)
-            {
+            } catch (Throwable $e) {
                 $this->showError($e);
             }
         }
@@ -281,24 +278,20 @@ into an application for use::
 
             $publisher = new Publisher($source, APPATH);
 
-            try
-            {
+            try {
                 // Add only the desired components
                 $publisher->addPaths([
                     'Controllers',
                     'Database/Migrations',
                     'Models',
                 ])->merge(false); // Be careful not to overwrite anything
-            }
-            catch (Throwable $e)
-            {
+            } catch (Throwable $e) {
                 $this->showError($e);
                 return;
             }
 
             // If publication succeeded then update namespaces
-            foreach ($publisher->getPublished() as $file)
-            {
+            foreach ($publisher->getPublished() as $file) {
                 // Replace the namespace
                 $contents = file_get_contents($file);
                 $contents = str_replace('namespace Math\\Auth', 'namespace ' . APP_NAMESPACE, );

From 1f7254cc74734b70637dd8862d1c72e8a7b576b5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 14 Nov 2021 12:40:52 +0900
Subject: [PATCH 0729/2325] docs: fix sample code

The third argument is missing.
---
 user_guide_src/source/libraries/publisher.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
index 39978648de77..c5928edc1e0a 100644
--- a/user_guide_src/source/libraries/publisher.rst
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -294,7 +294,7 @@ into an application for use::
             foreach ($publisher->getPublished() as $file) {
                 // Replace the namespace
                 $contents = file_get_contents($file);
-                $contents = str_replace('namespace Math\\Auth', 'namespace ' . APP_NAMESPACE, );
+                $contents = str_replace('namespace Math\\Auth', 'namespace ' . APP_NAMESPACE, $contents);
                 file_put_contents($file, $contents);
             }
         }

From f24f1aadf693dc343b76fc69cf8a44609c747c45 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 14 Nov 2021 12:41:46 +0900
Subject: [PATCH 0730/2325] docs: fix RST style

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

diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
index c5928edc1e0a..429e2c59a440 100644
--- a/user_guide_src/source/libraries/publisher.rst
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -13,7 +13,7 @@ Loading the Library
 *******************
 
 Because Publisher instances are specific to their source and destination this library is not available
-through ``Services`` but should be instantiated or extended directly. E.g.
+through ``Services`` but should be instantiated or extended directly. E.g.::
 
     $publisher = new \CodeIgniter\Publisher\Publisher();
 

From 48f53ae12c90c11d92fe2574511219d52826c8d4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 14 Nov 2021 12:43:14 +0900
Subject: [PATCH 0731/2325] docs: adjust the notation of method signatures

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

diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
index 429e2c59a440..b32f0d64838a 100644
--- a/user_guide_src/source/libraries/publisher.rst
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -336,18 +336,18 @@ Returns success or failure.
 Returns the temporary workspace, creating it if necessary. Some operations use intermediate storage to stage
 files and changes, and this provides the path to a transient, writable directory that you may use as well.
 
-**getErrors(): array<string,Throwable>**
+**getErrors(): array<string, Throwable>**
 
 Returns any errors from the last write operation. The array keys are the files that caused the error, and the
 values are the Throwable that was caught. Use ``getMessage()`` on the Throwable to get the error message.
 
-**addPath(string $path, bool $recursive = true)**
+**addPath(string $path, bool $recursive = true)** /
 **addPaths(array $path, bool $recursive = true)**
 
 Adds all files indicated by the relative paths. Paths are references to actual files or directories relative
 to ``$source``. If the relative path resolves to a directory then ``$recursive`` will include sub-directories.
 
-**addUri(string $uri)**
+**addUri(string $uri)** /
 **addUris(array $uris)**
 
 Downloads the contents of a URI using ``CURLRequest`` into the scratch workspace then adds the resulting

From 6365b40c1850b2031d486567e8508d305b963c22 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 14 Nov 2021 12:48:50 +0900
Subject: [PATCH 0732/2325] docs: fix namespaced classnames

Adding `\` in front of the namespaces.
---
 user_guide_src/source/testing/controllers.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/testing/controllers.rst b/user_guide_src/source/testing/controllers.rst
index 4333ad26ec0e..e99a24d935f9 100644
--- a/user_guide_src/source/testing/controllers.rst
+++ b/user_guide_src/source/testing/controllers.rst
@@ -96,7 +96,7 @@ If you do not provide one, the application's App config file will be used.
 
 Allows you to provide an **IncomingRequest** instance tailored to your testing needs::
 
-    $request = new CodeIgniter\HTTP\IncomingRequest(new Config\App(), new URI('http://example.com'));
+    $request = new \CodeIgniter\HTTP\IncomingRequest(new \Config\App(), new URI('http://example.com'));
     $request->setLocale($locale);
 
     $results = $this->withRequest($request)
@@ -110,7 +110,7 @@ into your controller.
 
 Allows you to provide a **Response** instance::
 
-    $response = new CodeIgniter\HTTP\Response(new Config\App());
+    $response = new \CodeIgniter\HTTP\Response(new \Config\App());
 
     $results = $this->withResponse($response)
                     ->controller(\App\Controllers\ForumController::class)
@@ -123,7 +123,7 @@ into your controller.
 
 Allows you to provide a **Logger** instance::
 
-    $logger = new CodeIgniter\Log\Handlers\FileHandler();
+    $logger = new \CodeIgniter\Log\Handlers\FileHandler();
 
     $results = $this->withResponse($response)
                     ->withLogger($logger)

From 1f570bd463e12a68f3d709b909330711b9e50b4e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 14 Nov 2021 12:53:02 +0900
Subject: [PATCH 0733/2325] docs: fix coding style in sample code

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

diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst
index 779f533800b1..8ede85bfbd62 100644
--- a/user_guide_src/source/concepts/services.rst
+++ b/user_guide_src/source/concepts/services.rst
@@ -98,7 +98,7 @@ to find the views at ``APPPATH.views/``. We want the developer to have the optio
 changing that path, though, if their needs require it. So the class accepts the ``$viewPath``
 as a constructor parameter. The service method looks like this::
 
-    public static function renderer($viewPath=APPPATH.'views/')
+    public static function renderer($viewPath = APPPATH . 'views/')
     {
         return new \CodeIgniter\View\View($viewPath);
     }
@@ -121,8 +121,7 @@ within the class, and, if not, creates a new one. All of the factory methods pro
     {
         public static function routes($getShared = false)
         {
-            if (! $getShared)
-            {
+            if (! $getShared) {
                 return new \CodeIgniter\Router\RouteCollection();
             }
 

From 3d8e01da567aed313969a4e9e7afcadcba09f1e1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 14 Nov 2021 12:57:02 +0900
Subject: [PATCH 0734/2325] docs: decorate variables and methods with '``'

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

diff --git a/user_guide_src/source/testing/feature.rst b/user_guide_src/source/testing/feature.rst
index 5d68543d241a..79d0b9d51c76 100644
--- a/user_guide_src/source/testing/feature.rst
+++ b/user_guide_src/source/testing/feature.rst
@@ -74,7 +74,7 @@ Shorthand methods for each of the HTTP verbs exist to ease typing and make thing
     $this->delete($path, $params);
     $this->options($path, $params);
 
-.. note:: The $params array does not make sense for every HTTP verb, but is included for consistency.
+.. note:: The ``$params`` array does not make sense for every HTTP verb, but is included for consistency.
 
 Setting Different Routes
 ------------------------
@@ -96,7 +96,7 @@ Setting Session Values
 ----------------------
 
 You can set custom session values to use during a single test with the ``withSession()`` method. This takes an array
-of key/value pairs that should exist within the $_SESSION variable when this request is made, or ``null` to indicate
+of key/value pairs that should exist within the ``$_SESSION`` variable when this request is made, or ``null`` to indicate
 that the current values of ``$_SESSION`` should be used. This is handy for testing authentication and more.
 ::
 
@@ -136,7 +136,7 @@ Formatting The Request
 -----------------------
 
 You can set the format of your request's body using the ``withBodyFormat()`` method. Currently this supports either
-`json` or `xml`. This will take the parameters passed into ``call(), post(), get()...`` and assign them to the
+`json` or `xml`. This will take the parameters passed into ``call()``, ``post()``, ``get()``... and assign them to the
 body of the request in the given format. This will also set the `Content-Type` header for your request accordingly.
 This is useful when testing JSON or XML API's so that you can set the request in the form that the controller will expect.
 ::

From 4bb36351b7efa7b9fa5519891b8c93b4af7e5169 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 14 Nov 2021 10:20:51 +0900
Subject: [PATCH 0735/2325] chore: add PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD
 to rector

https://github.com/rectorphp/rector-phpunit
---
 rector.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rector.php b/rector.php
index 4a5fde83a45c..4996a4817af8 100644
--- a/rector.php
+++ b/rector.php
@@ -42,6 +42,7 @@
 use Rector\Php71\Rector\FuncCall\CountOnNullRector;
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
+use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
@@ -53,6 +54,7 @@
 return static function (ContainerConfigurator $containerConfigurator): void {
     $containerConfigurator->import(SetList::DEAD_CODE);
     $containerConfigurator->import(LevelSetList::UP_TO_PHP_73);
+    $containerConfigurator->import(PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD);
 
     $parameters = $containerConfigurator->parameters();
 

From 4a17e69ca773e8e7ff71342ff4e4abfc00335d96 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 15 Nov 2021 10:47:46 +0900
Subject: [PATCH 0736/2325] chore: skip AssertIssetToSpecificMethodRector in
 two test classes

---
 rector.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/rector.php b/rector.php
index 4996a4817af8..d5b7e1eec4f6 100644
--- a/rector.php
+++ b/rector.php
@@ -42,6 +42,7 @@
 use Rector\Php71\Rector\FuncCall\CountOnNullRector;
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
+use Rector\PHPUnit\Rector\MethodCall\AssertIssetToSpecificMethodRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
@@ -111,6 +112,15 @@
 
         // use mt_rand instead of random_int on purpose on non-cryptographically random
         RandomFunctionRector::class,
+
+        // $this->assertTrue(isset($bar['foo']))
+        // and $this->assertArrayHasKey('foo', $bar)
+        // or $this->assertObjectHasAttribute('foo', $bar);
+        // are not the same
+        AssertIssetToSpecificMethodRector::class => [
+            __DIR__ . '/tests/system/Entity/EntityTest.php',
+            __DIR__ . '/tests/system/Session/SessionTest.php',
+        ],
     ]);
 
     // auto import fully qualified class names

From dd4024ff1ee50884772523b7e205e4ea9d2a523e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 15 Nov 2021 11:13:11 +0900
Subject: [PATCH 0737/2325] chore: skip AssertFalseStrposToContainsRector

---
 rector.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rector.php b/rector.php
index d5b7e1eec4f6..829ec303e0f4 100644
--- a/rector.php
+++ b/rector.php
@@ -42,6 +42,7 @@
 use Rector\Php71\Rector\FuncCall\CountOnNullRector;
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
+use Rector\PHPUnit\Rector\MethodCall\AssertFalseStrposToContainsRector;
 use Rector\PHPUnit\Rector\MethodCall\AssertIssetToSpecificMethodRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Set\ValueObject\LevelSetList;
@@ -121,6 +122,9 @@
             __DIR__ . '/tests/system/Entity/EntityTest.php',
             __DIR__ . '/tests/system/Session/SessionTest.php',
         ],
+
+        // assertContains() to string can't be used in PHPUnit 9.1
+        AssertFalseStrposToContainsRector::class,
     ]);
 
     // auto import fully qualified class names

From c4f0fbb22c940faf5c8a5c977189f8024a8840a2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 15 Nov 2021 11:13:52 +0900
Subject: [PATCH 0738/2325] test: refactor: vendor/bin/rector process
 tests/system/

---
 tests/system/API/ResponseTraitTest.php             |  2 +-
 tests/system/CLI/ConsoleTest.php                   |  2 +-
 tests/system/CommonSingleServiceTest.php           |  6 +++---
 tests/system/Config/ConfigTest.php                 |  2 +-
 tests/system/Config/ServicesTest.php               |  2 +-
 tests/system/Cookie/CookieTest.php                 |  8 ++++----
 tests/system/Database/Live/ConnectTest.php         |  2 +-
 tests/system/Database/Live/DbUtilsTest.php         |  2 +-
 tests/system/Database/Live/GetTest.php             |  4 ++--
 tests/system/Database/Live/PretendTest.php         |  2 +-
 .../system/Database/Live/SQLite/AlterTableTest.php |  6 +++---
 tests/system/Filters/FiltersTest.php               | 14 +++++++-------
 tests/system/HTTP/IncomingRequestTest.php          |  4 ++--
 tests/system/HTTP/ResponseTest.php                 |  6 +++---
 tests/system/I18n/TimeTest.php                     |  2 +-
 tests/system/Images/BaseHandlerTest.php            | 10 +++++-----
 tests/system/Images/ImageMagickHandlerTest.php     |  4 ++--
 tests/system/Language/LanguageTest.php             |  6 +++---
 tests/system/Log/LoggerTest.php                    |  4 ++--
 tests/system/Models/InsertModelTest.php            |  2 +-
 tests/system/Models/MiscellaneousModelTest.php     |  2 +-
 tests/system/Models/UpdateModelTest.php            |  2 +-
 tests/system/Models/ValidationModelTest.php        |  2 +-
 tests/system/Test/FeatureTestTraitTest.php         |  4 ++--
 tests/system/Test/TestResponseTest.php             |  8 ++++----
 tests/system/View/ViewTest.php                     |  4 ++--
 26 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
index 958be5434689..1db28686eafe 100644
--- a/tests/system/API/ResponseTraitTest.php
+++ b/tests/system/API/ResponseTraitTest.php
@@ -488,7 +488,7 @@ public function testXMLFormatter()
         $this->formatter = new XMLFormatter();
         $controller      = $this->makeController();
 
-        $this->assertSame('CodeIgniter\Format\XMLFormatter', get_class($this->formatter));
+        $this->assertInstanceOf('CodeIgniter\Format\XMLFormatter', $this->formatter);
 
         $controller->respondCreated(['id' => 3], 'A Custom Reason');
         $expected = <<<'EOH'
diff --git a/tests/system/CLI/ConsoleTest.php b/tests/system/CLI/ConsoleTest.php
index a5b3dd1e9783..087c28c12072 100644
--- a/tests/system/CLI/ConsoleTest.php
+++ b/tests/system/CLI/ConsoleTest.php
@@ -67,7 +67,7 @@ public function testHeader()
         $console = new Console($this->app);
         $console->showHeader();
         $result = CITestStreamFilter::$buffer;
-        $this->assertTrue(strpos($result, sprintf('CodeIgniter v%s Command Line Tool', CodeIgniter::CI_VERSION)) > 0);
+        $this->assertGreaterThan(0, strpos($result, sprintf('CodeIgniter v%s Command Line Tool', CodeIgniter::CI_VERSION)));
     }
 
     public function testNoHeader()
diff --git a/tests/system/CommonSingleServiceTest.php b/tests/system/CommonSingleServiceTest.php
index bc2f4a1f60c8..7d078a6f9a2e 100644
--- a/tests/system/CommonSingleServiceTest.php
+++ b/tests/system/CommonSingleServiceTest.php
@@ -34,7 +34,7 @@ public function testSingleServiceWithNoParamsSupplied(string $service): void
         $service1 = single_service($service);
         $service2 = single_service($service);
 
-        $this->assertSame(get_class($service1), get_class($service2));
+        $this->assertInstanceOf(get_class($service1), $service2);
         $this->assertNotSame($service1, $service2);
     }
 
@@ -62,7 +62,7 @@ public function testSingleServiceWithAtLeastOneParamSupplied(string $service): v
         $service1 = single_service($service, ...$params);
         $service2 = single_service($service, ...$params);
 
-        $this->assertSame(get_class($service1), get_class($service2));
+        $this->assertInstanceOf(get_class($service1), $service2);
         $this->assertNotSame($service1, $service2);
 
         if ($service === 'commands') {
@@ -77,7 +77,7 @@ public function testSingleServiceWithAllParamsSupplied(): void
 
         // Assert that even passing true as last param this will
         // not create a shared instance.
-        $this->assertSame(get_class($cache1), get_class($cache2));
+        $this->assertInstanceOf(get_class($cache1), $cache2);
         $this->assertNotSame($cache1, $cache2);
     }
 
diff --git a/tests/system/Config/ConfigTest.php b/tests/system/Config/ConfigTest.php
index 7f64a4851205..a784280bdc12 100644
--- a/tests/system/Config/ConfigTest.php
+++ b/tests/system/Config/ConfigTest.php
@@ -41,7 +41,7 @@ public function testCreateSharedInstance()
         $Config  = Config::get('DocTypes');
         $Config2 = Config::get('Config\\DocTypes');
 
-        $this->assertTrue($Config === $Config2);
+        $this->assertSame($Config2, $Config);
     }
 
     public function testCreateNonConfig()
diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php
index 77a0c77097fc..7fed04f53aa3 100644
--- a/tests/system/Config/ServicesTest.php
+++ b/tests/system/Config/ServicesTest.php
@@ -316,7 +316,7 @@ public function testReset()
         $response2 = service('response');
         $this->assertInstanceOf(MockResponse::class, $response2);
 
-        $this->assertTrue($response !== $response2);
+        $this->assertNotSame($response2, $response);
     }
 
     /**
diff --git a/tests/system/Cookie/CookieTest.php b/tests/system/Cookie/CookieTest.php
index 781373755529..02a820218868 100644
--- a/tests/system/Cookie/CookieTest.php
+++ b/tests/system/Cookie/CookieTest.php
@@ -268,13 +268,13 @@ public function testArrayAccessOfCookie(): void
     {
         $cookie = new Cookie('cookie', 'monster');
 
-        $this->assertTrue(isset($cookie['expire']));
+        $this->assertArrayHasKey('expire', $cookie);
         $this->assertSame($cookie['expire'], $cookie->getExpiresTimestamp());
-        $this->assertTrue(isset($cookie['httponly']));
+        $this->assertArrayHasKey('httponly', $cookie);
         $this->assertSame($cookie['httponly'], $cookie->isHTTPOnly());
-        $this->assertTrue(isset($cookie['samesite']));
+        $this->assertArrayHasKey('samesite', $cookie);
         $this->assertSame($cookie['samesite'], $cookie->getSameSite());
-        $this->assertTrue(isset($cookie['path']));
+        $this->assertArrayHasKey('path', $cookie);
         $this->assertSame($cookie['path'], $cookie->getPath());
 
         $this->expectException(InvalidArgumentException::class);
diff --git a/tests/system/Database/Live/ConnectTest.php b/tests/system/Database/Live/ConnectTest.php
index 5ee18a6f25eb..743b5450cca3 100644
--- a/tests/system/Database/Live/ConnectTest.php
+++ b/tests/system/Database/Live/ConnectTest.php
@@ -103,6 +103,6 @@ public function testConnectWithFailover()
         $db1 = Database::connect($this->tests);
 
         $this->assertSame($this->tests['failover'][0]['DBDriver'], $this->getPrivateProperty($db1, 'DBDriver'));
-        $this->assertTrue(count($db1->listTables()) >= 0);
+        $this->assertGreaterThanOrEqual(0, count($db1->listTables()));
     }
 }
diff --git a/tests/system/Database/Live/DbUtilsTest.php b/tests/system/Database/Live/DbUtilsTest.php
index c9b93242f4d1..2e8beda5f82f 100644
--- a/tests/system/Database/Live/DbUtilsTest.php
+++ b/tests/system/Database/Live/DbUtilsTest.php
@@ -79,7 +79,7 @@ public function testUtilsListDatabases()
         if (in_array($this->db->DBDriver, ['MySQLi', 'Postgre', 'SQLSRV'], true)) {
             $databases = $util->listDatabases();
 
-            $this->assertTrue(in_array($this->db->getDatabase(), $databases, true));
+            $this->assertContains($this->db->getDatabase(), $databases);
         } elseif ($this->db->DBDriver === 'SQLite3') {
             $this->expectException(DatabaseException::class);
             $this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php
index 2682f12e57ca..63f5ee9afd0c 100644
--- a/tests/system/Database/Live/GetTest.php
+++ b/tests/system/Database/Live/GetTest.php
@@ -78,8 +78,8 @@ public function testGetFieldNames()
     {
         $jobs = $this->db->table('job')->get()->getFieldNames();
 
-        $this->assertTrue(in_array('name', $jobs, true));
-        $this->assertTrue(in_array('description', $jobs, true));
+        $this->assertContains('name', $jobs);
+        $this->assertContains('description', $jobs);
     }
 
     public function testGetFieldData()
diff --git a/tests/system/Database/Live/PretendTest.php b/tests/system/Database/Live/PretendTest.php
index b313f41fb7cb..3eae20e97cd2 100644
--- a/tests/system/Database/Live/PretendTest.php
+++ b/tests/system/Database/Live/PretendTest.php
@@ -36,7 +36,7 @@ public function testPretendReturnsQueryObject()
             ->table('user')
             ->get();
 
-        $this->assertFalse($result instanceof Query);
+        $this->assertNotInstanceOf(Query::class, $result);
 
         $result = $this->db->pretend(true)
             ->table('user')
diff --git a/tests/system/Database/Live/SQLite/AlterTableTest.php b/tests/system/Database/Live/SQLite/AlterTableTest.php
index 029c764269a8..2816008a2a54 100644
--- a/tests/system/Database/Live/SQLite/AlterTableTest.php
+++ b/tests/system/Database/Live/SQLite/AlterTableTest.php
@@ -133,9 +133,9 @@ public function testDropColumnSuccess()
 
         $columns = $this->db->getFieldNames('foo');
 
-        $this->assertFalse(in_array('name', $columns, true));
-        $this->assertTrue(in_array('id', $columns, true));
-        $this->assertTrue(in_array('email', $columns, true));
+        $this->assertNotContains('name', $columns);
+        $this->assertContains('id', $columns);
+        $this->assertContains('email', $columns);
     }
 
     public function testDropColumnMaintainsKeys()
diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index 6f5a94941f81..be5e04c5098e 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -553,7 +553,7 @@ public function testShortCircuit()
         $uri      = 'admin/foo/bar';
         $response = $filters->run($uri, 'before');
 
-        $this->assertTrue($response instanceof ResponseInterface);
+        $this->assertInstanceOf(ResponseInterface::class, $response);
         $this->assertSame('http://google.com', $response->csp);
     }
 
@@ -737,7 +737,7 @@ public function testAddFilter()
         $filters = $filters->initialize('admin/foo/bar');
         $filters = $filters->getFilters();
 
-        $this->assertTrue(in_array('some_alias', $filters['before'], true));
+        $this->assertContains('some_alias', $filters['before']);
     }
 
     public function testAddFilterSection()
@@ -753,7 +753,7 @@ public function testAddFilterSection()
             ->initialize('admin/foo/bar')
             ->getFilters();
 
-        $this->assertTrue(in_array('another', $list['before'], true));
+        $this->assertContains('another', $list['before']);
     }
 
     public function testInitializeTwice()
@@ -770,7 +770,7 @@ public function testInitializeTwice()
             ->initialize()
             ->getFilters();
 
-        $this->assertTrue(in_array('another', $list['before'], true));
+        $this->assertContains('another', $list['before']);
     }
 
     public function testEnableFilter()
@@ -791,7 +791,7 @@ public function testEnableFilter()
         $filters->enableFilter('google', 'before');
         $filters = $filters->getFilters();
 
-        $this->assertTrue(in_array('google', $filters['before'], true));
+        $this->assertContains('google', $filters['before']);
     }
 
     public function testEnableFilterWithArguments()
@@ -813,7 +813,7 @@ public function testEnableFilterWithArguments()
         $filters->enableFilter('role:admin , super', 'after');
         $found = $filters->getFilters();
 
-        $this->assertTrue(in_array('role', $found['before'], true));
+        $this->assertContains('role', $found['before']);
         $this->assertSame(['admin', 'super'], $filters->getArguments('role'));
         $this->assertSame(['role' => ['admin', 'super']], $filters->getArguments());
 
@@ -845,7 +845,7 @@ public function testEnableFilterWithNoArguments()
         $filters->enableFilter('role', 'after');
         $found = $filters->getFilters();
 
-        $this->assertTrue(in_array('role', $found['before'], true));
+        $this->assertContains('role', $found['before']);
 
         $response = $filters->run('admin/foo/bar', 'before');
 
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 1e975359a120..b467c9ca3e1a 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -544,8 +544,8 @@ public function testWithFalseBody()
         // Use `false` here to simulate file_get_contents returning a false value
         $request = new IncomingRequest(new App(), new URI(), false, new UserAgent());
 
-        $this->assertTrue($request->getBody() !== false);
-        $this->assertTrue($request->getBody() === null);
+        $this->assertNotFalse($request->getBody());
+        $this->assertNull($request->getBody());
     }
 
     /**
diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php
index dc50aa432140..64eab48dc0fa 100644
--- a/tests/system/HTTP/ResponseTest.php
+++ b/tests/system/HTTP/ResponseTest.php
@@ -63,7 +63,7 @@ public function testConstructWithCSPEnabled()
         $config->CSPEnabled = true;
         $response           = new Response($config);
 
-        $this->assertTrue($response instanceof Response);
+        $this->assertInstanceOf(Response::class, $response);
     }
 
     public function testSetStatusCodeSetsReason()
@@ -327,7 +327,7 @@ public function testJSONWithArray()
         $response->setJSON($body);
 
         $this->assertSame($expected, $response->getJSON());
-        $this->assertTrue(strpos($response->getHeaderLine('content-type'), 'application/json') !== false);
+        $this->assertNotFalse(strpos($response->getHeaderLine('content-type'), 'application/json'));
     }
 
     public function testJSONGetFromNormalBody()
@@ -364,7 +364,7 @@ public function testXMLWithArray()
         $response->setXML($body);
 
         $this->assertSame($expected, $response->getXML());
-        $this->assertTrue(strpos($response->getHeaderLine('content-type'), 'application/xml') !== false);
+        $this->assertNotFalse(strpos($response->getHeaderLine('content-type'), 'application/xml'));
     }
 
     public function testXMLGetFromNormalBody()
diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php
index e1e683c98d07..205a98098724 100644
--- a/tests/system/I18n/TimeTest.php
+++ b/tests/system/I18n/TimeTest.php
@@ -1023,7 +1023,7 @@ public function testCreateFromInstance()
     {
         $datetime = new DateTime();
         $time     = Time::createFromInstance($datetime);
-        $this->assertTrue($time instanceof Time);
+        $this->assertInstanceOf(Time::class, $time);
         $this->assertTrue($time->sameAs($datetime));
     }
 
diff --git a/tests/system/Images/BaseHandlerTest.php b/tests/system/Images/BaseHandlerTest.php
index 708e4ef50d3a..8504779c44eb 100644
--- a/tests/system/Images/BaseHandlerTest.php
+++ b/tests/system/Images/BaseHandlerTest.php
@@ -58,7 +58,7 @@ protected function setUp(): void
     public function testNew()
     {
         $handler = Services::image('gd', null, false);
-        $this->assertTrue($handler instanceof BaseHandler);
+        $this->assertInstanceOf(BaseHandler::class, $handler);
     }
 
     public function testWithFile()
@@ -68,7 +68,7 @@ public function testWithFile()
         $handler->withFile($path);
 
         $image = $handler->getFile();
-        $this->assertTrue($image instanceof Image);
+        $this->assertInstanceOf(Image::class, $image);
         $this->assertSame(155, $image->origWidth);
         $this->assertSame($path, $image->getPathname());
     }
@@ -104,15 +104,15 @@ public function testFileTypes()
         $handler = Services::image('gd', null, false);
         $handler->withFile($this->start . 'ci-logo.png');
         $image = $handler->getFile();
-        $this->assertTrue($image instanceof Image);
+        $this->assertInstanceOf(Image::class, $image);
 
         $handler->withFile($this->start . 'ci-logo.jpeg');
         $image = $handler->getFile();
-        $this->assertTrue($image instanceof Image);
+        $this->assertInstanceOf(Image::class, $image);
 
         $handler->withFile($this->start . 'ci-logo.gif');
         $image = $handler->getFile();
-        $this->assertTrue($image instanceof Image);
+        $this->assertInstanceOf(Image::class, $image);
     }
 
     // Something handled by our Image
diff --git a/tests/system/Images/ImageMagickHandlerTest.php b/tests/system/Images/ImageMagickHandlerTest.php
index 02d02e305634..c79283b3f8fe 100644
--- a/tests/system/Images/ImageMagickHandlerTest.php
+++ b/tests/system/Images/ImageMagickHandlerTest.php
@@ -58,8 +58,8 @@ public function testGetVersion()
         // make sure that the call worked
         $this->assertNotFalse($version);
         // we should have a numeric version, greater than 6
-        $this->assertTrue(version_compare($version, '6.0.0') >= 0);
-        $this->assertTrue(version_compare($version, '99.0.0') < 0);
+        $this->assertGreaterThanOrEqual(0, version_compare($version, '6.0.0'));
+        $this->assertLessThan(0, version_compare($version, '99.0.0'));
     }
 
     public function testImageProperties()
diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php
index fcf4beea6257..0a501ea7947e 100644
--- a/tests/system/Language/LanguageTest.php
+++ b/tests/system/Language/LanguageTest.php
@@ -165,7 +165,7 @@ public function testLanguageFileLoading()
         $this->lang = new SecondMockLanguage('en');
 
         $this->lang->loadem('More', 'en');
-        $this->assertTrue(in_array('More', $this->lang->loaded(), true));
+        $this->assertContains('More', $this->lang->loaded());
 
         $this->lang->loadem('More', 'en');
         $this->assertCount(1, $this->lang->loaded()); // should only be there once
@@ -176,11 +176,11 @@ public function testLanguageFileLoadingReturns()
         $this->lang = new SecondMockLanguage('en');
 
         $result = $this->lang->loadem('More', 'en', true);
-        $this->assertFalse(in_array('More', $this->lang->loaded(), true));
+        $this->assertNotContains('More', $this->lang->loaded());
         $this->assertCount(3, $result);
 
         $result = $this->lang->loadem('More', 'en');
-        $this->assertTrue(in_array('More', $this->lang->loaded(), true));
+        $this->assertContains('More', $this->lang->loaded());
         $this->assertCount(1, $this->lang->loaded());
     }
 
diff --git a/tests/system/Log/LoggerTest.php b/tests/system/Log/LoggerTest.php
index b092cb31041b..a97e16a51f1a 100644
--- a/tests/system/Log/LoggerTest.php
+++ b/tests/system/Log/LoggerTest.php
@@ -203,7 +203,7 @@ public function testLogInterpolatesFileAndLine()
 
         $logs = TestHandler::getLogs();
 
-        $this->assertTrue(strpos($logs[0], $expected) > 1);
+        $this->assertGreaterThan(1, strpos($logs[0], $expected));
     }
 
     public function testLogInterpolatesExceptions()
@@ -222,7 +222,7 @@ public function testLogInterpolatesExceptions()
         $logs = TestHandler::getLogs();
 
         $this->assertCount(1, $logs);
-        $this->assertTrue(strpos($logs[0], $expected) === 0);
+        $this->assertSame(0, strpos($logs[0], $expected));
     }
 
     public function testEmergencyLogsCorrectly()
diff --git a/tests/system/Models/InsertModelTest.php b/tests/system/Models/InsertModelTest.php
index 521dec8fbadd..d08db6f87ac8 100644
--- a/tests/system/Models/InsertModelTest.php
+++ b/tests/system/Models/InsertModelTest.php
@@ -74,7 +74,7 @@ public function testInsertBatchValidationFail(): void
         $this->assertFalse($this->model->insertBatch($jobData));
 
         $error = $this->model->errors();
-        $this->assertTrue(isset($error['description']));
+        $this->assertArrayHasKey('description', $error);
     }
 
     public function testInsertBatchSetsIntTimestamps(): void
diff --git a/tests/system/Models/MiscellaneousModelTest.php b/tests/system/Models/MiscellaneousModelTest.php
index e70ff51c4789..c513c023ab2c 100644
--- a/tests/system/Models/MiscellaneousModelTest.php
+++ b/tests/system/Models/MiscellaneousModelTest.php
@@ -93,7 +93,7 @@ public function testGetValidationMessagesForReplace(): void
         $this->assertFalse($this->model->replace($jobData));
 
         $error = $this->model->errors();
-        $this->assertTrue(isset($error['description']));
+        $this->assertArrayHasKey('description', $error);
     }
 
     public function testUndefinedTypeInTransformDataToArray(): void
diff --git a/tests/system/Models/UpdateModelTest.php b/tests/system/Models/UpdateModelTest.php
index 888c019eca1e..5b6c9ca75972 100644
--- a/tests/system/Models/UpdateModelTest.php
+++ b/tests/system/Models/UpdateModelTest.php
@@ -153,7 +153,7 @@ public function testUpdateBatchValidationFail(): void
         $this->assertFalse($this->model->updateBatch($data, 'name'));
 
         $error = $this->model->errors();
-        $this->assertTrue(isset($error['country']));
+        $this->assertArrayHasKey('country', $error);
     }
 
     public function testUpdateBatchWithEntity(): void
diff --git a/tests/system/Models/ValidationModelTest.php b/tests/system/Models/ValidationModelTest.php
index b97532a09d68..0d60d36524ac 100644
--- a/tests/system/Models/ValidationModelTest.php
+++ b/tests/system/Models/ValidationModelTest.php
@@ -284,7 +284,7 @@ public function testRequiredWithValidationTrue(): void
             'description' => 'just because we have to',
         ];
 
-        $this->assertTrue($this->model->insert($data) !== false);
+        $this->assertNotFalse($this->model->insert($data));
     }
 
     /**
diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php
index 70952b89b96d..572ebe3d4244 100644
--- a/tests/system/Test/FeatureTestTraitTest.php
+++ b/tests/system/Test/FeatureTestTraitTest.php
@@ -366,7 +366,7 @@ public function testSetupRequestBodyWithParams()
         $request = $this->withBodyFormat('json')->setRequestBody($request, ['foo1' => 'bar1']);
 
         $this->assertJsonStringEqualsJsonString(json_encode(['foo1' => 'bar1']), $request->getBody());
-        $this->assertTrue($request->header('Content-Type')->getValue() === 'application/json');
+        $this->assertSame('application/json', $request->header('Content-Type')->getValue());
     }
 
     public function testSetupRequestBodyWithXml()
@@ -380,7 +380,7 @@ public function testSetupRequestBodyWithXml()
 ';
 
         $this->assertSame($expectedXml, $request->getBody());
-        $this->assertTrue($request->header('Content-Type')->getValue() === 'application/xml');
+        $this->assertSame('application/xml', $request->header('Content-Type')->getValue());
     }
 
     public function testSetupRequestBodyWithBody()
diff --git a/tests/system/Test/TestResponseTest.php b/tests/system/Test/TestResponseTest.php
index 5bb3da21f1e7..cef63bd63af4 100644
--- a/tests/system/Test/TestResponseTest.php
+++ b/tests/system/Test/TestResponseTest.php
@@ -152,7 +152,7 @@ public function testAssertRedirectFail()
     {
         $this->getTestResponse('<h1>Hello World</h1>');
 
-        $this->assertFalse($this->testResponse->response() instanceof RedirectResponse);
+        $this->assertNotInstanceOf(RedirectResponse::class, $this->testResponse->response());
         $this->assertFalse($this->testResponse->isRedirect());
         $this->testResponse->assertNotRedirect();
     }
@@ -162,7 +162,7 @@ public function testAssertRedirectSuccess()
         $this->getTestResponse('<h1>Hello World</h1>');
         $this->testResponse->setResponse(new RedirectResponse(new App()));
 
-        $this->assertTrue($this->testResponse->response() instanceof RedirectResponse);
+        $this->assertInstanceOf(RedirectResponse::class, $this->testResponse->response());
         $this->assertTrue($this->testResponse->isRedirect());
         $this->testResponse->assertRedirect();
     }
@@ -172,7 +172,7 @@ public function testAssertRedirectSuccessWithoutRedirectResponse()
         $this->getTestResponse('<h1>Hello World</h1>');
         $this->response->redirect('foo/bar');
 
-        $this->assertFalse($this->testResponse->response() instanceof RedirectResponse);
+        $this->assertNotInstanceOf(RedirectResponse::class, $this->testResponse->response());
         $this->assertTrue($this->testResponse->isRedirect());
         $this->testResponse->assertRedirect();
         $this->assertSame('foo/bar', $this->testResponse->getRedirectUrl());
@@ -345,7 +345,7 @@ public function testInvalidJSON()
         $this->response->setBody($tmp);
 
         // this should be FALSE - invalid JSON - will see if this is working that way ;-)
-        $this->assertFalse($this->response->getBody() === $this->testResponse->getJSON());
+        $this->assertNotSame($this->testResponse->getJSON(), $this->response->getBody());
     }
 
     public function testGetXML()
diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php
index 7abeff5793e6..435c4d8f9578 100644
--- a/tests/system/View/ViewTest.php
+++ b/tests/system/View/ViewTest.php
@@ -316,8 +316,8 @@ public function testRenderLayoutWithInclude()
 
         $content = $view->render('extend_include');
 
-        $this->assertTrue(strpos($content, '<p>Open</p>') !== false);
-        $this->assertTrue(strpos($content, '<h1>Hello World</h1>') !== false);
+        $this->assertNotFalse(strpos($content, '<p>Open</p>'));
+        $this->assertNotFalse(strpos($content, '<h1>Hello World</h1>'));
         $this->assertSame(2, substr_count($content, 'Hello World'));
     }
 

From fa57efc742edff4b203597c7fc8a1bd10ab144f0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 15 Nov 2021 12:04:16 +0900
Subject: [PATCH 0739/2325] docs: add space to method signatures

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

diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index 96b5440887b5..d35ba11f241a 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -55,7 +55,7 @@ can instantiate it directly::
 Then you can use any of the three standard rendering methods that it provides:
 **render(viewpath, options, save)**, **setVar(name, value, context)** and
 **setData(data, context)**. You will also be able to specify delimiters directly,
-through the **setDelimiters(left,right)** method.
+through the **setDelimiters(left, right)** method.
 
 Using the ``Parser``, your view templates are processed only by the Parser
 itself, and not like a conventional view PHP script. PHP code in such a script
@@ -696,7 +696,7 @@ Class Reference
 
 .. php:class:: CodeIgniter\\View\\Parser
 
-    .. php:method:: render($view[, $options[, $saveData=false]])
+    .. php:method:: render($view[, $options[, $saveData = false]])
 
         :param  string  $view: File name of the view source
         :param  array   $options: Array of options, as key/value pairs
@@ -720,7 +720,7 @@ Class Reference
         Any conditional substitutions are performed first, then remaining
         substitutions are performed for each data pair.
 
-    .. php:method:: renderString($template[, $options[, $saveData=false]])
+    .. php:method:: renderString($template[, $options[, $saveData = false]])
 
         :param  string  $template: View source provided as a string
         :param  array   $options: Array of options, as key/value pairs
@@ -734,7 +734,7 @@ Class Reference
 
         Options supported, and behavior, as above.
 
-    .. php:method:: setData([$data[, $context=null]])
+    .. php:method:: setData([$data[, $context = null]])
 
         :param  array   $data: Array of view data strings, as key/value pairs
         :param  string  $context: The context to use for data escaping.
@@ -743,12 +743,12 @@ Class Reference
 
         Sets several pieces of view data at once::
 
-            $renderer->setData(['name'=>'George', 'position'=>'Boss']);
+            $renderer->setData(['name' => 'George', 'position' => 'Boss']);
 
         Supported escape contexts: html, css, js, url, or attr or raw.
         If 'raw', no escaping will happen.
 
-    .. php:method:: setVar($name[, $value=null[, $context=null]])
+    .. php:method:: setVar($name[, $value = null[, $context = null]])
 
         :param  string  $name: Name of the view data variable
         :param  mixed   $value: The value of this view data

From 58e6ff71842e5c4f75add798b8b1d30143249a10 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 15 Nov 2021 12:04:48 +0900
Subject: [PATCH 0740/2325] docs: decorate variables with '``'

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

diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index d35ba11f241a..c8f0c1fd5285 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -97,7 +97,7 @@ like this::
 
 View parameters are passed to ``setData()`` as an associative
 array of data to be replaced in the template. In the above example, the
-template would contain two variables: {blog_title} and {blog_heading}
+template would contain two variables: ``{blog_title}`` and ``{blog_heading}``
 The first parameter to ``render()`` contains the name of the :doc:`view
 file </outgoing/views>`, Where *blog_template* is the name of your view file.
 
@@ -177,8 +177,8 @@ at the top of the page::
     </body>
     </html>
 
-In the above code you'll notice a pair of variables: {blog_entries}
-data... {/blog_entries}. In a case like this, the entire chunk of data
+In the above code you'll notice a pair of variables: ``{blog_entries}``
+data... ``{/blog_entries}``. In a case like this, the entire chunk of data
 between these pairs would be repeated multiple times, corresponding to
 the number of rows in the "blog_entries" element of the parameters array.
 

From 6f1879e1c2d0af8cea85ccf7f99ecda08aebbec2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 15 Nov 2021 12:05:25 +0900
Subject: [PATCH 0741/2325] docs: decorate filename with **

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

diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index c8f0c1fd5285..8bf3db46bb83 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -252,7 +252,7 @@ The value for the pseudo-variable ``blog_entry`` is an associative
 array. The key/value pairs defined inside it will be exposed inside
 the variable pair loop for that variable.
 
-A ``blog_template`` that might work for the above::
+A **blog_template.php** that might work for the above::
 
     <h1>{blog_title} - {blog_heading}</h1>
     {blog_entry}

From 8539b7ce0de7639a73c809186273c8c38efaf42e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 15 Nov 2021 12:42:27 +0900
Subject: [PATCH 0742/2325] docs: add sample code to show error flash message

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

diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index b14535003648..81210975f687 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -151,7 +151,11 @@ Redirection on Failure
 ======================
 
 When a request fails the CSRF validation check, it will redirect to the previous page by default,
-setting an ``error`` flash message that you can display to the end user. This provides a nicer experience
+setting an ``error`` flash message that you can display to the end user with the following code in your view::
+
+    <?= session()->getFlashdata('error') ?>
+
+This provides a nicer experience
 than simply crashing. This can be turned off by editing the following config parameter value in
 **app/Config/Security.php**::
 

From 413dfda51b617972199964734bdf46438447fd04 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 15 Nov 2021 12:47:31 +0900
Subject: [PATCH 0743/2325] docs; add the section Config for CSRF, and move
 contents to it

---
 user_guide_src/source/libraries/security.rst | 93 ++++++++++----------
 1 file changed, 48 insertions(+), 45 deletions(-)

diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index 81210975f687..94845224a9e1 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -6,7 +6,7 @@ The Security Class contains methods that help protect your site against Cross-Si
 
 .. contents::
     :local:
-    :depth: 2
+    :depth: 3
 
 *******************
 Loading the Library
@@ -26,8 +26,11 @@ Cross-site request forgery (CSRF)
 .. warning:: The CSRF Protection is only available for **POST/PUT/PATCH/DELETE** requests.
     Requests for other methods are not protected.
 
+Config for CSRF
+===============
+
 CSRF Protection Methods
-=======================
+-----------------------
 
 By default, the Cookie based CSRF Protection is used. It is
 `Double Submit Cookie <https://cheatsheetseries.owasp.org/cheatsheets/Cross-Site_Request_Forgery_Prevention_Cheat_Sheet.html#double-submit-cookie>`_
@@ -41,6 +44,49 @@ You can set to use the Session based CSRF protection by editing the following co
 
     public $csrfProtection = 'session';
 
+Token Randomization
+-------------------
+
+To mitigate compression side-channel attacks like `BREACH`_, and prevent an attacker from guessing the CSRF tokens, you can configure token randomization (default off).
+
+If you enable it, a random mask is added to the token and used to scramble it.
+
+.. _`BREACH`: https://en.wikipedia.org/wiki/BREACH
+
+You can enable it by editing the following config parameter value in
+**app/Config/Security.php**::
+
+    public $tokenRandomize = true;
+
+Token Regeneration
+------------------
+
+Tokens may be either regenerated on every submission (default) or
+kept the same throughout the life of the CSRF cookie. The default
+regeneration of tokens provides stricter security, but may result
+in usability concerns as other tokens become invalid (back/forward
+navigation, multiple tabs/windows, asynchronous actions, etc). You
+may alter this behavior by editing the following config parameter value in
+**app/Config/Security.php**::
+
+    public $regenerate  = true;
+
+Redirection on Failure
+----------------------
+
+When a request fails the CSRF validation check, it will redirect to the previous page by default,
+setting an ``error`` flash message that you can display to the end user with the following code in your view::
+
+    <?= session()->getFlashdata('error') ?>
+
+This provides a nicer experience
+than simply crashing. This can be turned off by editing the following config parameter value in
+**app/Config/Security.php**::
+
+    public $redirect = false;
+
+Even when the redirect value is ``true``, AJAX calls will not redirect, but will throw an error.
+
 Enable CSRF Protection
 ======================
 
@@ -79,20 +125,6 @@ It is also possible to enable the CSRF filter only for specific methods::
         'post' => ['csrf'],
     ];
 
-Token Randomization
-===================
-
-To mitigate compression side-channel attacks like `BREACH`_, and prevent an attacker from guessing the CSRF tokens, you can configure token randomization (default off).
-
-If you enable it, a random mask is added to the token and used to scramble it.
-
-.. _`BREACH`: https://en.wikipedia.org/wiki/BREACH
-
-You can enable it by editing the following config parameter value in
-**app/Config/Security.php**::
-
-    public $tokenRandomize = true;
-
 HTML Forms
 ==========
 
@@ -134,35 +166,6 @@ The order of checking the availability of the CSRF token is as follows:
 2. HTTP header
 3. ``php://input`` (JSON request) - bear in mind that this approach is the slowest one since we have to decode JSON and then re-encode it
 
-Token Regeneration
-===================
-
-Tokens may be either regenerated on every submission (default) or
-kept the same throughout the life of the CSRF cookie. The default
-regeneration of tokens provides stricter security, but may result
-in usability concerns as other tokens become invalid (back/forward
-navigation, multiple tabs/windows, asynchronous actions, etc). You
-may alter this behavior by editing the following config parameter value in
-**app/Config/Security.php**::
-
-    public $regenerate  = true;
-
-Redirection on Failure
-======================
-
-When a request fails the CSRF validation check, it will redirect to the previous page by default,
-setting an ``error`` flash message that you can display to the end user with the following code in your view::
-
-    <?= session()->getFlashdata('error') ?>
-
-This provides a nicer experience
-than simply crashing. This can be turned off by editing the following config parameter value in
-**app/Config/Security.php**::
-
-    public $redirect = false;
-
-Even when the redirect value is ``true``, AJAX calls will not redirect, but will throw an error.
-
 *********************
 Other Helpful Methods
 *********************

From 12728c0d578d414f6ab8b65bd85f3298dac66a09 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 15 Nov 2021 16:09:29 +0900
Subject: [PATCH 0744/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/libraries/security.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index 94845224a9e1..9b317a75ea91 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -47,7 +47,7 @@ You can set to use the Session based CSRF protection by editing the following co
 Token Randomization
 -------------------
 
-To mitigate compression side-channel attacks like `BREACH`_, and prevent an attacker from guessing the CSRF tokens, you can configure token randomization (default off).
+To mitigate compression side-channel attacks like `BREACH`_, and prevent an attacker from guessing the CSRF tokens, you can configure token randomization (off by default).
 
 If you enable it, a random mask is added to the token and used to scramble it.
 

From 80b3340f31150236d1a1c3260a320f99ccdbf6e2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 15 Nov 2021 16:42:56 +0900
Subject: [PATCH 0745/2325] test: refactor: isset() tests

Separete Arrange, Act, and Assert.
---
 tests/system/Entity/EntityTest.php | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php
index 94d71849c679..026b58121f78 100644
--- a/tests/system/Entity/EntityTest.php
+++ b/tests/system/Entity/EntityTest.php
@@ -69,11 +69,19 @@ public function testIssetWorksLikeTraditionalIsset()
     {
         $entity = $this->getEntity();
 
-        $this->assertFalse(isset($entity->foo));
+        $issetReturn = isset($entity->foo);
+
+        $this->assertFalse($issetReturn);
 
         $attributes = $this->getPrivateProperty($entity, 'attributes');
-        $this->assertFalse(isset($attributes['foo']));
-        $this->assertTrue(isset($attributes['default']));
+
+        $issetReturn = isset($attributes['foo']);
+
+        $this->assertFalse($issetReturn);
+
+        $issetReturn = isset($attributes['default']);
+
+        $this->assertTrue($issetReturn);
     }
 
     public function testFill()
@@ -905,13 +913,17 @@ public function testHasChangedKeyNotExists()
 
     public function testIssetKeyMap()
     {
-        $entity = $this->getEntity();
-
+        $entity             = $this->getEntity();
         $entity->created_at = '12345678';
-        $this->assertTrue(isset($entity->createdAt));
+        $entity->bar        = 'foo';
 
-        $entity->bar = 'foo';
-        $this->assertTrue(isset($entity->FakeBar));
+        $issetReturn = isset($entity->createdAt);
+
+        $this->assertTrue($issetReturn);
+
+        $issetReturn = isset($entity->FakeBar);
+
+        $this->assertTrue($issetReturn);
     }
 
     public function testJsonSerializableEntity()

From bd8ddfab17db44d51fb1aef89defeaf03a2918e9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 15 Nov 2021 17:14:17 +0900
Subject: [PATCH 0746/2325] test: refactor: separete Arrange, Act, and Assert

---
 tests/system/Entity/EntityTest.php | 135 ++++++++++++++---------------
 1 file changed, 66 insertions(+), 69 deletions(-)

diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php
index 026b58121f78..b423f244499d 100644
--- a/tests/system/Entity/EntityTest.php
+++ b/tests/system/Entity/EntityTest.php
@@ -75,13 +75,11 @@ public function testIssetWorksLikeTraditionalIsset()
 
         $attributes = $this->getPrivateProperty($entity, 'attributes');
 
-        $issetReturn = isset($attributes['foo']);
+        $issetFooReturn     = isset($attributes['foo']);
+        $issetDefaultReturn = isset($attributes['default']);
 
-        $this->assertFalse($issetReturn);
-
-        $issetReturn = isset($attributes['default']);
-
-        $this->assertTrue($issetReturn);
+        $this->assertFalse($issetFooReturn);
+        $this->assertTrue($issetDefaultReturn);
     }
 
     public function testFill()
@@ -124,11 +122,9 @@ public function testDataMappingConvertsOriginalName()
 
         // Check mapped field
         $this->assertSame('made it', $entity->foo);
-
         // Should also get from original name
         // since Model's would be looking for the original name
         $this->assertSame('made it', $entity->bar);
-
         // But it shouldn't actually set a class property for the original name...
         $this->expectException(ReflectionException::class);
         $this->getPrivateProperty($entity, 'bar');
@@ -156,7 +152,6 @@ public function testIssetWorksWithMapping()
         $entity->bar = 'here';
 
         $attributes = $this->getPrivateProperty($entity, 'attributes');
-
         $this->assertArrayHasKey('foo', $attributes);
         $this->assertArrayNotHasKey('bar', $attributes);
     }
@@ -164,17 +159,18 @@ public function testIssetWorksWithMapping()
     public function testUnsetWorksWithMapping()
     {
         $entity = $this->getMappedEntity();
-
         // maps to 'foo'
         $entity->bar = 'here';
 
         // doesn't work on original name
         unset($entity->bar);
+
         $this->assertSame('here', $entity->bar);
         $this->assertSame('here', $entity->foo);
 
         // does work on mapped field
         unset($entity->foo);
+
         $this->assertNull($entity->foo);
         $this->assertNull($entity->bar);
     }
@@ -193,8 +189,7 @@ public function testDateMutationFromString()
 
     public function testDateMutationFromTimestamp()
     {
-        $stamp = time();
-
+        $stamp      = time();
         $entity     = $this->getEntity();
         $attributes = ['created_at' => $stamp];
         $this->setPrivateProperty($entity, 'attributes', $attributes);
@@ -238,7 +233,6 @@ public function testDateMutationStringToTime()
         $entity->created_at = '2017-07-15 13:23:34';
 
         $time = $this->getPrivateProperty($entity, 'attributes')['created_at'];
-
         $this->assertInstanceOf(Time::class, $time);
         $this->assertSame('2017-07-15 13:23:34', $time->format('Y-m-d H:i:s'));
     }
@@ -251,7 +245,6 @@ public function testDateMutationTimestampToTime()
         $entity->created_at = $stamp;
 
         $time = $this->getPrivateProperty($entity, 'attributes')['created_at'];
-
         $this->assertInstanceOf(Time::class, $time);
         $this->assertCloseEnoughString(date('Y-m-d H:i:s'), $time->format('Y-m-d H:i:s'));
     }
@@ -264,7 +257,6 @@ public function testDateMutationDatetimeToTime()
         $entity->created_at = $dt;
 
         $time = $this->getPrivateProperty($entity, 'attributes')['created_at'];
-
         $this->assertInstanceOf(Time::class, $time);
         $this->assertCloseEnoughString($dt->format('Y-m-d H:i:s'), $time->format('Y-m-d H:i:s'));
     }
@@ -277,7 +269,6 @@ public function testDateMutationTimeToTime()
         $entity->created_at = $dt;
 
         $time = $this->getPrivateProperty($entity, 'attributes')['created_at'];
-
         $this->assertInstanceOf(Time::class, $time);
         $this->assertCloseEnoughString($dt->format('Y-m-d H:i:s'), $time->format('Y-m-d H:i:s'));
     }
@@ -287,10 +278,12 @@ public function testCastInteger()
         $entity = $this->getCastEntity();
 
         $entity->first = 3.1;
+
         $this->assertIsInt($entity->first);
         $this->assertSame(3, $entity->first);
 
         $entity->first = 3.6;
+
         $this->assertSame(3, $entity->first);
     }
 
@@ -299,10 +292,12 @@ public function testCastFloat()
         $entity = $this->getCastEntity();
 
         $entity->second = 3;
+
         $this->assertIsFloat($entity->second);
         $this->assertSame(3.0, $entity->second);
 
         $entity->second = '3.6';
+
         $this->assertIsFloat($entity->second);
         $this->assertSame(3.6, $entity->second);
     }
@@ -312,10 +307,12 @@ public function testCastDouble()
         $entity = $this->getCastEntity();
 
         $entity->third = 3;
+
         $this->assertIsFloat($entity->third);
         $this->assertSame(3.0, $entity->third);
 
         $entity->third = '3.6';
+
         $this->assertIsFloat($entity->third);
         $this->assertSame(3.6, $entity->third);
     }
@@ -325,6 +322,7 @@ public function testCastString()
         $entity = $this->getCastEntity();
 
         $entity->fourth = 3.1415;
+
         $this->assertIsString($entity->fourth);
         $this->assertSame('3.1415', $entity->fourth);
     }
@@ -334,23 +332,24 @@ public function testCastBoolean()
         $entity = $this->getCastEntity();
 
         $entity->fifth = 1;
+
         $this->assertIsBool($entity->fifth);
         $this->assertTrue($entity->fifth);
 
         $entity->fifth = 0;
+
         $this->assertIsBool($entity->fifth);
         $this->assertFalse($entity->fifth);
     }
 
     public function testCastCSV()
     {
-        $entity = $this->getCastEntity();
-
-        $data = ['foo', 'bar', 'bam'];
-
+        $entity          = $this->getCastEntity();
+        $data            = ['foo', 'bar', 'bam'];
         $entity->twelfth = $data;
 
         $result = $entity->toRawArray();
+
         $this->assertIsString($result['twelfth']);
         $this->assertSame('foo,bar,bam', $result['twelfth']);
 
@@ -362,9 +361,9 @@ public function testCastObject()
     {
         $entity = $this->getCastEntity();
 
-        $data = ['foo' => 'bar'];
-
+        $data          = ['foo' => 'bar'];
         $entity->sixth = $data;
+
         $this->assertIsObject($entity->sixth);
         $this->assertInstanceOf(stdClass::class, $entity->sixth);
         $this->assertSame($data, (array) $entity->sixth);
@@ -375,6 +374,7 @@ public function testCastDateTime()
         $entity = $this->getCastEntity();
 
         $entity->eighth = 'March 12, 2017';
+
         $this->assertInstanceOf('DateTime', $entity->eighth);
         $this->assertSame('2017-03-12', $entity->eighth->format('Y-m-d'));
     }
@@ -383,22 +383,21 @@ public function testCastTimestamp()
     {
         $entity = $this->getCastEntity();
 
-        $date = 'March 12, 2017';
-
+        $date          = 'March 12, 2017';
         $entity->ninth = $date;
+
         $this->assertIsInt($entity->ninth);
         $this->assertSame(strtotime($date), $entity->ninth);
     }
 
     public function testCastTimestampException()
     {
-        $entity = $this->getCastEntity();
-
-        $entity->ninth = 'some string';
-
         $this->expectException(CastException::class);
         $this->expectErrorMessage('Type casting "timestamp" expects a correct timestamp.');
 
+        $entity        = $this->getCastEntity();
+        $entity->ninth = 'some string';
+
         $entity->ninth;
     }
 
@@ -410,7 +409,6 @@ public function testCastArray()
 
         $check = $this->getPrivateProperty($entity, 'attributes')['seventh'];
         $this->assertSame(serialize(['foo' => 'bar']), $check);
-
         $this->assertSame(['foo' => 'bar'], $entity->seventh);
     }
 
@@ -445,27 +443,23 @@ public function testCastArrayByFill()
         $entity = $this->getCastEntity();
 
         $data = ['seventh' => [1, 2, 3]];
-
         $entity->fill($data);
 
         // Check if serialiazed
         $check = $this->getPrivateProperty($entity, 'attributes')['seventh'];
         $this->assertSame(serialize([1, 2, 3]), $check);
-
         // Check if unserialized
         $this->assertSame([1, 2, 3], $entity->seventh);
     }
 
     public function testCastArrayByConstructor()
     {
-        $data = ['seventh' => [1, 2, 3]];
-
+        $data   = ['seventh' => [1, 2, 3]];
         $entity = $this->getCastEntity($data);
 
         // Check if serialiazed
         $check = $this->getPrivateProperty($entity, 'attributes')['seventh'];
         $this->assertSame(serialize([1, 2, 3]), $check);
-
         // Check if unserialized
         $this->assertSame([1, 2, 3], $entity->seventh);
     }
@@ -485,9 +479,9 @@ public function testCastURI()
     {
         $entity = $this->getCastEntity();
 
-        $data = 'https://codeigniter.com/banana';
-
+        $data               = 'https://codeigniter.com/banana';
         $entity->thirteenth = $data;
+
         $this->assertInstanceOf(URI::class, $entity->thirteenth);
         $this->assertSame($data, (string) $entity->thirteenth);
         $this->assertSame('/banana', $entity->thirteenth->getPath());
@@ -497,9 +491,9 @@ public function testURICastURI()
     {
         $entity = $this->getCastEntity();
 
-        $data = 'https://codeigniter.com/banana';
-
+        $data               = 'https://codeigniter.com/banana';
         $entity->thirteenth = new URI($data);
+
         $this->assertInstanceOf(URI::class, $entity->thirteenth);
         $this->assertSame($data, (string) $entity->thirteenth);
         $this->assertSame('/banana', $entity->thirteenth->getPath());
@@ -523,8 +517,7 @@ public function testCastAsJSONArray()
     {
         $entity = $this->getCastEntity();
 
-        $data = ['Sun', 'Mon', 'Tue'];
-
+        $data             = ['Sun', 'Mon', 'Tue'];
         $entity->eleventh = $data;
 
         // Should be a JSON-encoded string now...
@@ -537,14 +530,13 @@ public function testCastAsJSONArray()
     public function testCastAsJsonByFill()
     {
         $entity = $this->getCastEntity();
-        $data   = ['eleventh' => [1, 2, 3]];
 
+        $data = ['eleventh' => [1, 2, 3]];
         $entity->fill($data);
 
         // Check if serialiazed
         $check = $this->getPrivateProperty($entity, 'attributes')['eleventh'];
         $this->assertSame(json_encode([1, 2, 3]), $check);
-
         // Check if unserialized
         $this->assertSame([1, 2, 3], $entity->eleventh);
     }
@@ -557,13 +549,15 @@ public function testCastAsJsonByConstructor()
         // Check if serialiazed
         $check = $this->getPrivateProperty($entity, 'attributes')['eleventh'];
         $this->assertSame(json_encode([1, 2, 3]), $check);
-
         // Check if unserialized
         $this->assertSame([1, 2, 3], $entity->eleventh);
     }
 
     public function testCastAsJSONErrorDepth()
     {
+        $this->expectException(CastException::class);
+        $this->expectExceptionMessage('Maximum stack depth exceeded');
+
         $entity = $this->getCastEntity();
 
         // Create array with depth 513 to get depth error
@@ -576,24 +570,18 @@ public function testCastAsJSONErrorDepth()
         foreach ($keys as $key) {
             $current = &$current[$key];
         }
-
-        $current = $value;
-        $this->expectException(CastException::class);
-        $this->expectExceptionMessage('Maximum stack depth exceeded');
-
+        $current       = $value;
         $entity->tenth = $array;
-        $this->getPrivateProperty($entity, 'tenth');
     }
 
     public function testCastAsJSONErrorUTF8()
     {
-        $entity = $this->getCastEntity();
-
         $this->expectException(CastException::class);
         $this->expectExceptionMessage('Malformed UTF-8 characters, possibly incorrectly encoded');
 
+        $entity = $this->getCastEntity();
+
         $entity->tenth = "\xB1\x31";
-        $this->getPrivateProperty($entity, 'tenth');
     }
 
     public function testCastAsJSONSyntaxError()
@@ -615,7 +603,6 @@ public function testCastAsJSONAnotherErrorDepth()
         $this->expectExceptionMessage('Maximum stack depth exceeded');
 
         $string = '{' . str_repeat('"test":{', 513) . '"test":"value"' . str_repeat('}', 513) . '}';
-
         (Closure::bind(static function (string $value) {
             $entity = new Entity();
             $entity->casts['dummy'] = 'json[array]';
@@ -630,7 +617,6 @@ public function testCastAsJSONControlCharCheck()
         $this->expectExceptionMessage('Unexpected control character found');
 
         $string = "{\n\t\"property1\": \"The quick brown fox\njumps over the lazy dog\",\n\t\"property2\":\"value2\"\n}";
-
         (Closure::bind(static function (string $value) {
             $entity = new Entity();
             $entity->casts['dummy'] = 'json[array]';
@@ -645,7 +631,6 @@ public function testCastAsJSONStateMismatch()
         $this->expectExceptionMessage('Underflow or the modes mismatch');
 
         $string = '[{"name":"jack","product_id":"1234"]';
-
         (Closure::bind(static function (string $value) {
             $entity = new Entity();
             $entity->casts['dummy'] = 'json[array]';
@@ -656,16 +641,17 @@ public function testCastAsJSONStateMismatch()
 
     public function testCastSetter()
     {
-        $string = '321 String with numbers 123';
-        $entity = $this->getCastEntity();
-
+        $string        = '321 String with numbers 123';
+        $entity        = $this->getCastEntity();
         $entity->first = $string;
 
         $entity->cast(false);
+
         $this->assertIsString($entity->first);
         $this->assertSame($string, $entity->first);
 
         $entity->cast(true);
+
         $this->assertIsInt($entity->first);
         $this->assertSame((int) $string, $entity->first);
     }
@@ -684,18 +670,17 @@ public function testCustomCast()
         $entity->first = 'base 64';
 
         $fieldValue = $this->getPrivateProperty($entity, 'attributes')['first'];
-
         $this->assertSame(base64_encode('base 64'), $fieldValue);
-
         $this->assertSame('base 64', $entity->first);
     }
 
     public function testCustomCastException()
     {
-        $entity = $this->getCustomCastEntity();
-
         $this->expectException(CastException::class);
         $this->expectErrorMessage('The "Tests\Support\Entity\Cast\NotExtendsBaseCast" class must inherit the "CodeIgniter\Entity\Cast\BaseCast" class');
+
+        $entity = $this->getCustomCastEntity();
+
         $entity->second = 'throw Exception';
     }
 
@@ -708,14 +693,17 @@ public function testCustomCastParams()
         $this->assertSame('value:["param1","param2","param3"]', $entity->third);
 
         $entity->fourth = 'test_nullable_type';
+
         $this->assertSame('test_nullable_type:["nullable"]', $entity->fourth);
     }
 
     public function testAsArray()
     {
         $entity = $this->getEntity();
+
         $result = $entity->toArray();
 
+        // @TODO arguments are reversed
         $this->assertSame($result, [
             'foo'       => null,
             'bar'       => ':bar',
@@ -748,8 +736,10 @@ public function testAsArrayRecursive()
     public function testAsArrayMapped()
     {
         $entity = $this->getMappedEntity();
+
         $result = $entity->toArray();
 
+        // @TODO arguments are reversed
         $this->assertSame($result, [
             'bar'  => null,
             'orig' => ':oo',
@@ -759,8 +749,10 @@ public function testAsArrayMapped()
     public function testAsArraySwapped()
     {
         $entity = $this->getSwappedEntity();
+
         $result = $entity->toArray();
 
+        // @TODO arguments are reversed
         $this->assertSame($result, [
             'bar'          => 'foo',
             'foo'          => 'bar',
@@ -779,6 +771,7 @@ public function testToArraySkipAttributesWithUnderscoreInFirstCharacter()
 
         $result = $entity->toArray();
 
+        // @TODO arguments are reversed
         $this->assertSame($result, [
             'bar' => null,
         ]);
@@ -786,12 +779,12 @@ public function testToArraySkipAttributesWithUnderscoreInFirstCharacter()
 
     public function testAsArrayOnlyChanged()
     {
-        $entity = $this->getEntity();
-
+        $entity      = $this->getEntity();
         $entity->bar = 'foo';
 
         $result = $entity->toArray(true);
 
+        // @TODO arguments are reversed
         $this->assertSame($result, [
             'bar' => 'bar:foo:bar',
         ]);
@@ -803,6 +796,7 @@ public function testToRawArray()
 
         $result = $entity->toRawArray();
 
+        // @TODO arguments are reversed
         $this->assertSame($result, [
             'foo'        => null,
             'bar'        => null,
@@ -818,6 +812,7 @@ public function testToRawArrayRecursive()
 
         $result = $entity->toRawArray(false, true);
 
+        // @TODO arguments are reversed
         $this->assertSame($result, [
             'foo'        => null,
             'bar'        => null,
@@ -834,12 +829,12 @@ public function testToRawArrayRecursive()
 
     public function testToRawArrayOnlyChanged()
     {
-        $entity = $this->getEntity();
-
+        $entity      = $this->getEntity();
         $entity->bar = 'foo';
 
         $result = $entity->toRawArray(true);
 
+        // @TODO arguments are reversed
         $this->assertSame($result, [
             'bar' => 'bar:foo',
         ]);
@@ -851,17 +846,17 @@ public function testFilledConstruction()
             'foo' => 'bar',
             'bar' => 'baz',
         ];
-
         $something = new SomeEntity($data);
+
         $this->assertSame('bar', $something->foo);
         $this->assertSame('baz', $something->bar);
     }
 
     public function testChangedArray()
     {
-        $data = ['bar' => 'baz'];
-
+        $data      = ['bar' => 'baz'];
         $something = new SomeEntity($data);
+
         $this->assertSame($data, $something->toArray(true));
 
         $something->magic = 'rockin';
@@ -908,6 +903,7 @@ public function testHasChangedWholeEntity()
     public function testHasChangedKeyNotExists()
     {
         $entity = $this->getEntity();
+
         $this->assertFalse($entity->hasChanged('xxx'));
     }
 
@@ -930,6 +926,7 @@ public function testJsonSerializableEntity()
     {
         $entity = $this->getEntity();
         $entity->setBar('foo');
+
         $this->assertSame(json_encode($entity->toArray()), json_encode($entity));
     }
 

From 76bd940514d8543e80aa67ba8f926574b5a7678c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 15 Nov 2021 17:26:09 +0900
Subject: [PATCH 0747/2325] test: refactor: isset() tests

---
 tests/system/Session/SessionTest.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tests/system/Session/SessionTest.php b/tests/system/Session/SessionTest.php
index bb5afaacf515..c295e26ba7d3 100644
--- a/tests/system/Session/SessionTest.php
+++ b/tests/system/Session/SessionTest.php
@@ -245,20 +245,22 @@ public function testIssetReturnsTrueOnSuccess()
     {
         $session = $this->getInstance();
         $session->start();
-
         $_SESSION['foo'] = 'bar';
 
-        $this->assertTrue(isset($session->foo));
+        $issetReturn = isset($session->foo);
+
+        $this->assertTrue($issetReturn);
     }
 
     public function testIssetReturnsFalseOnNotFound()
     {
         $session = $this->getInstance();
         $session->start();
-
         $_SESSION['foo'] = 'bar';
 
-        $this->assertFalse(isset($session->bar));
+        $issetReturn = isset($session->bar);
+
+        $this->assertFalse($issetReturn);
     }
 
     public function testPushNewValueIntoArraySessionValue()
@@ -400,7 +402,8 @@ public function testUnmarkFlashDataRemovesData()
         // Should still be here
         $this->assertTrue($session->has('foo'));
         // but no longer marked as flash
-        $this->assertFalse(isset($_SESSION['__ci_vars']['foo']));
+        $issetReturn = isset($_SESSION['__ci_vars']['foo']);
+        $this->assertFalse($issetReturn);
     }
 
     public function testGetFlashKeysOnlyReturnsFlashKeys()

From 0f97dcde9ef5397fe96011fd2cb2c86564176397 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 15 Nov 2021 17:41:41 +0900
Subject: [PATCH 0748/2325] test: fix assert argument order

---
 tests/system/Entity/EntityTest.php | 40 ++++++++++++------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php
index b423f244499d..15ae33371bb2 100644
--- a/tests/system/Entity/EntityTest.php
+++ b/tests/system/Entity/EntityTest.php
@@ -703,13 +703,12 @@ public function testAsArray()
 
         $result = $entity->toArray();
 
-        // @TODO arguments are reversed
-        $this->assertSame($result, [
+        $this->assertSame([
             'foo'       => null,
             'bar'       => ':bar',
             'default'   => 'sumfin',
             'createdAt' => null,
-        ]);
+        ], $result, );
     }
 
     public function testAsArrayRecursive()
@@ -739,11 +738,10 @@ public function testAsArrayMapped()
 
         $result = $entity->toArray();
 
-        // @TODO arguments are reversed
-        $this->assertSame($result, [
+        $this->assertSame([
             'bar'  => null,
             'orig' => ':oo',
-        ]);
+        ], $result);
     }
 
     public function testAsArraySwapped()
@@ -752,12 +750,11 @@ public function testAsArraySwapped()
 
         $result = $entity->toArray();
 
-        // @TODO arguments are reversed
-        $this->assertSame($result, [
+        $this->assertSame([
             'bar'          => 'foo',
             'foo'          => 'bar',
             'original_bar' => 'bar',
-        ]);
+        ], $result);
     }
 
     public function testToArraySkipAttributesWithUnderscoreInFirstCharacter()
@@ -771,10 +768,9 @@ public function testToArraySkipAttributesWithUnderscoreInFirstCharacter()
 
         $result = $entity->toArray();
 
-        // @TODO arguments are reversed
-        $this->assertSame($result, [
+        $this->assertSame([
             'bar' => null,
-        ]);
+        ], $result);
     }
 
     public function testAsArrayOnlyChanged()
@@ -784,10 +780,9 @@ public function testAsArrayOnlyChanged()
 
         $result = $entity->toArray(true);
 
-        // @TODO arguments are reversed
-        $this->assertSame($result, [
+        $this->assertSame([
             'bar' => 'bar:foo:bar',
-        ]);
+        ], $result);
     }
 
     public function testToRawArray()
@@ -796,13 +791,12 @@ public function testToRawArray()
 
         $result = $entity->toRawArray();
 
-        // @TODO arguments are reversed
-        $this->assertSame($result, [
+        $this->assertSame([
             'foo'        => null,
             'bar'        => null,
             'default'    => 'sumfin',
             'created_at' => null,
-        ]);
+        ], $result);
     }
 
     public function testToRawArrayRecursive()
@@ -812,8 +806,7 @@ public function testToRawArrayRecursive()
 
         $result = $entity->toRawArray(false, true);
 
-        // @TODO arguments are reversed
-        $this->assertSame($result, [
+        $this->assertSame([
             'foo'        => null,
             'bar'        => null,
             'default'    => 'sumfin',
@@ -824,7 +817,7 @@ public function testToRawArrayRecursive()
                 'default'    => 'sumfin',
                 'created_at' => null,
             ],
-        ]);
+        ], $result);
     }
 
     public function testToRawArrayOnlyChanged()
@@ -834,10 +827,9 @@ public function testToRawArrayOnlyChanged()
 
         $result = $entity->toRawArray(true);
 
-        // @TODO arguments are reversed
-        $this->assertSame($result, [
+        $this->assertSame([
             'bar' => 'bar:foo',
-        ]);
+        ], $result);
     }
 
     public function testFilledConstruction()

From 18d32d86754790f8c0d24ea029aec598bae0dcb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Nov 2021 15:03:02 +0000
Subject: [PATCH 0749/2325] chore(deps-dev): update rector/rector requirement
 from 0.12.3 to 0.12.4

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.12.3...0.12.4)

---
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 93286a4f93f8..4e3ebda66819 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.3"
+        "rector/rector": "0.12.4"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From e33f1467b0f0c45de8b0ca9c412adaa95700e153 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Mon, 15 Nov 2021 23:15:19 -0600
Subject: [PATCH 0750/2325] Display file:line and trace information to database
 queries in debug toolbar

---
 system/Debug/Toolbar/Collectors/Database.php | 24 +++++++++++++++---
 system/Debug/Toolbar/Views/_database.tpl     | 11 ++++++++-
 system/Debug/Toolbar/Views/toolbar.css       |  4 ++-
 system/Debug/Toolbar/Views/toolbar.js        | 26 ++++++++++++++++++--
 4 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index d8445b80364f..639ba73be3e0 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -89,6 +89,7 @@ public static function collect(Query $query)
                 'query'     => $query,
                 'string'    => $queryString,
                 'duplicate' => in_array($queryString, array_column(static::$queries, 'string', null), true),
+                'trace'     => debug_backtrace(),
             ];
         }
     }
@@ -133,11 +134,26 @@ public function display(): array
         $data['queries'] = array_map(static function (array $query) {
             $isDuplicate = $query['duplicate'] === true;
 
+            // Find the first line that doesn't include `system` in the backtrace
+            $line = [];
+
+            foreach ($query['trace'] as $traceLine) {
+                if (strpos($traceLine['file'], 'system/') !== false) {
+                    continue;
+                }
+                $line = $traceLine;
+                break;
+            }
+
             return [
-                'hover'    => $isDuplicate ? 'This query was called more than once.' : '',
-                'class'    => $isDuplicate ? 'duplicate' : '',
-                'duration' => ((float) $query['query']->getDuration(5) * 1000) . ' ms',
-                'sql'      => $query['query']->debugToolbarDisplay(),
+                'hover'      => $isDuplicate ? 'This query was called more than once.' : '',
+                'class'      => $isDuplicate ? 'duplicate' : '',
+                'duration'   => ((float) $query['query']->getDuration(5) * 1000) . ' ms',
+                'sql'        => $query['query']->debugToolbarDisplay(),
+                'trace'      => $query['trace'],
+                'trace-file' => str_replace(ROOTPATH, '/', $line['file'] ?? ''),
+                'trace-line' => $line['line'] ?? '',
+                'qid'        => md5((string) $query['query'] . microtime()),
             ];
         }, static::$queries);
 
diff --git a/system/Debug/Toolbar/Views/_database.tpl b/system/Debug/Toolbar/Views/_database.tpl
index a373b56b5256..a2f5bd9808f1 100644
--- a/system/Debug/Toolbar/Views/_database.tpl
+++ b/system/Debug/Toolbar/Views/_database.tpl
@@ -7,9 +7,18 @@
     </thead>
     <tbody>
     {queries}
-        <tr class="{class}" title="{hover}">
+        <tr class="{class}" title="{hover}" data-toggle="{qid}-trace">
             <td class="narrow">{duration}</td>
             <td>{! sql !}</td>
+            <td style="text-align: right">{trace-file}:<strong>{trace-line}</strong></td>
+        </tr>
+        <tr class="muted" id="{qid}-trace" style="display:none">
+            <td></td>
+            <td colspan="2">
+            {trace}
+                {file}:<strong>{line}</strong><br/>
+            {/trace}
+            </td>
         </tr>
     {/queries}
     </tbody>
diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
index b5a223b55d70..50ec4bff9e28 100644
--- a/system/Debug/Toolbar/Views/toolbar.css
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -344,6 +344,8 @@
 
 .debug-view.show-view {
   border-color: #DD8615; }
+#debug-bar tr[data-toggle] {
+  cursor: pointer; }
 
 .debug-view-path {
   background-color: #FDC894;
@@ -407,7 +409,7 @@
     #debug-bar .muted {
       color: #DFDFDF; }
       #debug-bar .muted td {
-        color: #434343; }
+        color: #797979; }
       #debug-bar .muted:hover td {
         color: #DFDFDF; }
     #debug-bar #toolbar-position,
diff --git a/system/Debug/Toolbar/Views/toolbar.js b/system/Debug/Toolbar/Views/toolbar.js
index 690535f2de0d..b6883d4b9f3b 100644
--- a/system/Debug/Toolbar/Views/toolbar.js
+++ b/system/Debug/Toolbar/Views/toolbar.js
@@ -58,6 +58,13 @@ var ciDebugBar = {
 		{
 			buttons[i].addEventListener('click', ciDebugBar.showTab, true);
 		}
+
+		// Hook up generic toggle via data attributes `data-toggle="foo"`
+		var links = document.querySelectorAll('[data-toggle]');
+		for (var i = 0; i < links.length; i++)
+		{
+			links[i].addEventListener('click', ciDebugBar.toggleRows, true);
+		}
 	},
 
 	showTab: function () {
@@ -124,6 +131,21 @@ var ciDebugBar = {
 		}
 	},
 
+	/**
+	 * Toggle display of another object based on
+	 * the data-toggle value of this object
+	 *
+	 * @param event
+	 */
+	toggleRows : function(event) {
+		if(event.target)
+		{
+			let row = event.target.closest('tr');
+			let target = document.getElementById(row.getAttribute('data-toggle'));
+			target.style.display = target.style.display === 'none' ? 'table-row' : 'none';
+		}
+	},
+
 	/**
 	 * Toggle display of a data table
 	 *
@@ -137,7 +159,7 @@ var ciDebugBar = {
 
 		if (obj)
 		{
-			obj.style.display = obj.style.display == 'none' ? 'block' : 'none';
+			obj.style.display = obj.style.display === 'none' ? 'block' : 'none';
 		}
 	},
 
@@ -155,7 +177,7 @@ var ciDebugBar = {
 
 		if (par && obj)
 		{
-			obj.style.display = obj.style.display == 'none' ? '' : 'none';
+			obj.style.display = obj.style.display === 'none' ? '' : 'none';
 			par.classList.toggle('timeline-parent-open');
 		}
 	},

From 0ff83f2863c7d35638db4d003e4624ed60dc5de0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 16 Nov 2021 15:18:24 +0900
Subject: [PATCH 0751/2325] docs: decorate variable names with '``'

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

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index 18545f92f1bf..32fe2cf207c9 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -100,7 +100,7 @@ Connecting to the Database
 
 When the class is first instantiated, if no database connection instance is passed to the constructor,
 it will automatically connect to the default database group, as set in the configuration. You can
-modify which group is used on a per-model basis by adding the DBGroup property to your class.
+modify which group is used on a per-model basis by adding the ``$DBGroup`` property to your class.
 This ensures that within the model any references to ``$this->db`` are made through the appropriate
 connection.
 ::
@@ -221,11 +221,11 @@ Leave it empty to avoid updating it (even if ``$useTimestamps`` is enabled)
 **$updatedField**
 
 Specifies which database field should use for keep data record update timestamp.
-Leave it empty to avoid update it (even useTimestamps is enabled)
+Leave it empty to avoid update it (even ``$useTimestamps`` is enabled).
 
 **$dateFormat**
 
-This value works with $useTimestamps and $useSoftDeletes to ensure that the correct type of
+This value works with ``$useTimestamps`` and ``$useSoftDeletes`` to ensure that the correct type of
 date value gets inserted into the database. By default, this creates DATETIME values, but
 valid options are: datetime, date, or int (a PHP timestamp). Using 'useSoftDeletes' or
 'useTimestamps' with an invalid or missing dateFormat will cause an exception.
@@ -277,7 +277,7 @@ Returns a single row where the primary key matches the value passed in as the fi
 
     $user = $userModel->find($user_id);
 
-The value is returned in the format specified in $returnType.
+The value is returned in the format specified in ``$returnType``.
 
 You can specify more than one row to return by passing an array of primaryKey values instead
 of just one::
@@ -293,7 +293,7 @@ Returns null or an indexed array of column values::
 
     $user = $userModel->findColumn($column_name);
 
-$column_name should be a name of single column else you will get the DataException.
+``$column_name`` should be a name of single column else you will get the DataException.
 
 **findAll()**
 
@@ -344,7 +344,7 @@ Saving Data
 **insert()**
 
 An associative array of data is passed into this method as the only parameter to create a new
-row of data in the database. The array's keys must match the name of the columns in a $table, while
+row of data in the database. The array's keys must match the name of the columns in a ``$table``, while
 the array's values are the values to save for that key::
 
     $data = [
@@ -476,7 +476,7 @@ Takes a primary key value as the first parameter and deletes the matching record
 
     $userModel->delete(12);
 
-If the model's $useSoftDeletes value is true, this will update the row to set ``deleted_at`` to the current
+If the model's ``$useSoftDeletes`` value is true, this will update the row to set ``deleted_at`` to the current
 date and time. You can force a permanent delete by setting the second parameter as true.
 
 An array of primary keys can be passed in as the first parameter to delete multiple records at once::
@@ -642,7 +642,7 @@ Validation Placeholders
 
 The model provides a simple method to replace parts of your rules based on data that's being passed into it. This
 sounds fairly obscure but can be especially handy with the ``is_unique`` validation rule. Placeholders are simply
-the name of the field (or array key) that was passed in as $data surrounded by curly brackets. It will be
+the name of the field (or array key) that was passed in as ``$data`` surrounded by curly brackets. It will be
 replaced by the **value** of the matched incoming field. An example should clarify this::
 
     protected $validationRules = [
@@ -694,7 +694,7 @@ need it::
 
     $builder = $userModel->builder();
 
-This builder is already set up with the model's $table. If you need access to another table
+This builder is already set up with the model's ``$table``. If you need access to another table
 you can pass it in as a parameter, but be aware that this will not return a shared instance::
 
     $groupBuilder = $userModel->builder('groups');
@@ -757,14 +757,14 @@ Model Events
 
 There are several points within the model's execution that you can specify multiple callback methods to run.
 These methods can be used to normalize data, hash passwords, save related entities, and much more. The following
-points in the model's execution can be affected, each through a class property: **$beforeInsert**, **$afterInsert**,
-**$beforeUpdate**, **$afterUpdate**, **$afterFind**, and **$afterDelete**.
+points in the model's execution can be affected, each through a class property: ``$beforeInsert``, ``$afterInsert``,
+``$beforeUpdate``, ``$afterUpdate``, ``$afterFind``, and ``$afterDelete``.
 
 Defining Callbacks
 ------------------
 
 You specify the callbacks by first creating a new class method in your model to use. This class will always
-receive a $data array as its only parameter. The exact contents of the $data array will vary between events, but
+receive a ``$data`` array as its only parameter. The exact contents of the ``$data`` array will vary between events, but
 will always contain a key named **data** that contains the primary data passed to the original method. In the case
 of the insert* or update* methods, that will be the key/value pairs that are being inserted into the database. The
 main array will also contain the other values passed to the method, and be detailed later. The callback method
@@ -785,14 +785,14 @@ must return the original $data array so other callbacks have the full informatio
 Specifying Callbacks To Run
 ---------------------------
 
-You specify when to run the callbacks by adding the method name to the appropriate class property (beforeInsert, afterUpdate,
+You specify when to run the callbacks by adding the method name to the appropriate class property (``$beforeInsert``, ``$afterUpdate``,
 etc). Multiple callbacks can be added to a single event and they will be processed one after the other. You can
 use the same callback in multiple events::
 
     protected $beforeInsert = ['hashPassword'];
     protected $beforeUpdate = ['hashPassword'];
 
-Additionally, each model may allow (default) or deny callbacks class-wide by setting its $allowCallbacks property::
+Additionally, each model may allow (default) or deny callbacks class-wide by setting its ``$allowCallbacks`` property::
 
     protected $allowCallbacks = false;
 
@@ -804,7 +804,7 @@ You may also change this setting temporarily for a single model call sing the ``
 Event Parameters
 ----------------
 
-Since the exact data passed to each callback varies a bit, here are the details on what is in the $data parameter
+Since the exact data passed to each callback varies a bit, here are the details on what is in the ``$data`` parameter
 passed to each event:
 
 ================ =========================================================================================================

From e21445f737df749cbef80a8642dec275b105d03a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 16 Nov 2021 15:19:16 +0900
Subject: [PATCH 0752/2325] docs: fix coding style

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

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index 32fe2cf207c9..ca020ca686a4 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -591,17 +591,16 @@ The other way to set the validation message to fields by functions,
 Now, whenever you call the ``insert()``, ``update()``, or ``save()`` methods, the data will be validated. If it fails,
 the model will return boolean **false**. You can use the ``errors()`` method to retrieve the validation errors::
 
-    if ($model->save($data) === false)
-    {
+    if ($model->save($data) === false) {
         return view('updateUser', ['errors' => $model->errors()]);
     }
 
 This returns an array with the field names and their associated errors that can be used to either show all of the
 errors at the top of the form, or to display them individually::
 
-    <?php if (! empty($errors)) : ?>
+    <?php if (! empty($errors)): ?>
         <div class="alert alert-danger">
-        <?php foreach ($errors as $field => $error) : ?>
+        <?php foreach ($errors as $field => $error): ?>
             <p><?= $error ?></p>
         <?php endforeach ?>
         </div>
@@ -774,7 +773,9 @@ must return the original $data array so other callbacks have the full informatio
 
     protected function hashPassword(array $data)
     {
-        if (! isset($data['data']['password'])) return $data;
+        if (! isset($data['data']['password'])) {
+            return $data;
+        }
 
         $data['data']['password_hash'] = password_hash($data['data']['password'], PASSWORD_DEFAULT);
         unset($data['data']['password']);

From 00480eb7c1ac94f8ac9a93963fd287c384e5caf8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 16 Nov 2021 15:23:17 +0900
Subject: [PATCH 0753/2325] docs: decorate method names with '``'

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

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index ca020ca686a4..97045ceb3787 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -201,8 +201,8 @@ configured to any name of your choice by using $deletedField property.
 
 **$allowedFields**
 
-This array should be updated with the field names that can be set during save, insert, or
-update methods. Any field names other than these will be discarded. This helps to protect
+This array should be updated with the field names that can be set during ``save()``, ``insert()``, or
+``update()`` methods. Any field names other than these will be discarded. This helps to protect
 against just taking input from a form and throwing it all at the model, resulting in
 potential mass assignment vulnerabilities.
 
@@ -268,8 +268,8 @@ Working With Data
 Finding Data
 ------------
 
-Several functions are provided for doing basic CRUD work on your tables, including find(),
-insert(), update(), delete() and more.
+Several functions are provided for doing basic CRUD work on your tables, including ``find()``,
+``insert()``, ``update()``, ``delete()`` and more.
 
 **find()**
 
@@ -285,7 +285,7 @@ of just one::
     $users = $userModel->find([1,2,3]);
 
 If no parameters are passed in, will return all rows in that model's table, effectively acting
-like findAll(), though less explicit.
+like ``findAll()``, though less explicit.
 
 **findColumn()**
 

From 38047b5f23a102e16d48b8b264a02ca755bfe8e9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 16 Nov 2021 15:30:13 +0900
Subject: [PATCH 0754/2325] docs: replace find*() with **find*()**

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

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index 97045ceb3787..bbb0d029f833 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -716,18 +716,18 @@ You can specify the format that data should be returned as when using the find*(
 $returnType. There may be times that you would like the data back in a different format, though. The Model
 provides methods that allow you to do just that.
 
-.. note:: These methods only change the return type for the next find*() method call. After that,
+.. note:: These methods only change the return type for the next **find*()** method call. After that,
     it is reset to its default value.
 
 **asArray()**
 
-Returns data from the next find*() method as associative arrays::
+Returns data from the next **find*()** method as associative arrays::
 
     $users = $userModel->asArray()->where('status', 'active')->findAll();
 
 **asObject()**
 
-Returns data from the next find*() method as standard objects or custom class intances::
+Returns data from the next **find*()** method as standard objects or custom class intances::
 
     // Return as standard objects
     $users = $userModel->asObject()->where('status', 'active')->findAll();

From c80adce3bc0b5d7a35cec9ccf6eb4996bb5b5f82 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 16 Nov 2021 15:31:48 +0900
Subject: [PATCH 0755/2325] docs: add comma

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

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index bbb0d029f833..2018f735f3c9 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -175,7 +175,7 @@ Specifies if the table uses an auto-increment feature for ``$primaryKey``. If se
 then you are responsible for providing primary key value for every record in the table. This
 feature may be handy when we want to implement 1:1 relation or use UUIDs for our model.
 
-.. note:: If you set ``$useAutoIncrement`` to ``false`` then make sure to set your primary
+.. note:: If you set ``$useAutoIncrement`` to ``false``, then make sure to set your primary
     key in the database to ``unique``. This way you will make sure that all of Model's features
     will still work the same as before.
 

From 96664fead007f921c5bf6d9f5086e3b6e8cb381a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 16 Nov 2021 15:32:20 +0900
Subject: [PATCH 0756/2325] docs: add period

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

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index 2018f735f3c9..f94a76d416de 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -216,7 +216,7 @@ data type.
 **$createdField**
 
 Specifies which database field to use for data record create timestamp.
-Leave it empty to avoid updating it (even if ``$useTimestamps`` is enabled)
+Leave it empty to avoid updating it (even if ``$useTimestamps`` is enabled).
 
 **$updatedField**
 

From 57dc194602d5e0d1d335b8b6580cad7513442831 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 16 Nov 2021 15:34:45 +0900
Subject: [PATCH 0757/2325] docs: emphasize table

A Model is for a specific table.
---
 user_guide_src/source/models/model.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index f94a76d416de..2e592106ad92 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -9,7 +9,7 @@ Using CodeIgniter's Model
 Models
 ======
 
-Models provide a way to interact with a specific table in your database. They come out of the box with helper
+Models provide a way to interact with a specific **table** in your database. They come out of the box with helper
 methods for much of the standard ways you would need to interact with a database table, including finding records,
 updating records, deleting records, and more.
 

From e5519e48956fbf58ef1550091798060b84a6cf06 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 16 Nov 2021 15:35:54 +0900
Subject: [PATCH 0758/2325] docs: fix delete* with delete()

There is only one delete() method in the Model.
---
 user_guide_src/source/models/model.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index 2e592106ad92..5198818d0ec9 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -189,7 +189,7 @@ method.
 
 **$useSoftDeletes**
 
-If true, then any delete* method calls will set ``deleted_at`` in the database, instead of
+If true, then any ``delete()`` method calls will set ``deleted_at`` in the database, instead of
 actually deleting the row. This can preserve data when it might be referenced elsewhere, or
 can maintain a "recycle bin" of objects that can be restored, or even simply preserve it as
 part of a security trail. If true, the find* methods will only return non-deleted rows, unless

From ab03da999e48312721643284b03e070a33572c0d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 16 Nov 2021 15:38:04 +0900
Subject: [PATCH 0759/2325] docs: decorate variable names, method names, etc

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

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index 5198818d0ec9..f3a75ef41056 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -183,8 +183,8 @@ feature may be handy when we want to implement 1:1 relation or use UUIDs for our
 
 The Model's CRUD methods will take a step of work away from you and automatically return
 the resulting data, instead of the Result object. This setting allows you to define
-the type of data that is returned. Valid values are 'array', 'object', or the fully
-qualified name of a class that can be used with the Result object's getCustomResultObject()
+the type of data that is returned. Valid values are '**array**' (the default), '**object**', or the **fully
+qualified name of a class** that can be used with the Result object's ``getCustomResultObject()``
 method.
 
 **$useSoftDeletes**
@@ -192,12 +192,12 @@ method.
 If true, then any ``delete()`` method calls will set ``deleted_at`` in the database, instead of
 actually deleting the row. This can preserve data when it might be referenced elsewhere, or
 can maintain a "recycle bin" of objects that can be restored, or even simply preserve it as
-part of a security trail. If true, the find* methods will only return non-deleted rows, unless
-the withDeleted() method is called prior to calling the find* method.
+part of a security trail. If true, the **find*()** methods will only return non-deleted rows, unless
+the ``withDeleted()`` method is called prior to calling the **find*()** method.
 
 This requires either a DATETIME or INTEGER field in the database as per the model's
-$dateFormat setting. The default field name is ``deleted_at`` however this name can be
-configured to any name of your choice by using $deletedField property.
+``$dateFormat`` setting. The default field name is ``deleted_at`` however this name can be
+configured to any name of your choice by using ``$deletedField`` property.
 
 **$allowedFields**
 
@@ -209,8 +209,8 @@ potential mass assignment vulnerabilities.
 **$useTimestamps**
 
 This boolean value determines whether the current date is automatically added to all inserts
-and updates. If true, will set the current time in the format specified by $dateFormat. This
-requires that the table have columns named 'created_at' and 'updated_at' in the appropriate
+and updates. If true, will set the current time in the format specified by ``$dateFormat``. This
+requires that the table have columns named **created_at** and **updated_at** in the appropriate
 data type.
 
 **$createdField**
@@ -227,8 +227,8 @@ Leave it empty to avoid update it (even ``$useTimestamps`` is enabled).
 
 This value works with ``$useTimestamps`` and ``$useSoftDeletes`` to ensure that the correct type of
 date value gets inserted into the database. By default, this creates DATETIME values, but
-valid options are: datetime, date, or int (a PHP timestamp). Using 'useSoftDeletes' or
-'useTimestamps' with an invalid or missing dateFormat will cause an exception.
+valid options are: ``'datetime'``, ``'date'``, or ``'int'`` (a PHP timestamp). Using **useSoftDeletes** or
+**useTimestamps** with an invalid or missing dateFormat will cause an exception.
 
 **$validationRules**
 
@@ -243,7 +243,7 @@ described in :ref:`validation-custom-errors`. Described in more detail below.
 
 **$skipValidation**
 
-Whether validation should be skipped during all ``inserts`` and ``updates``. The default
+Whether validation should be skipped during all **inserts** and **updates**. The default
 value is false, meaning that data will always attempt to be validated. This is
 primarily used by the ``skipValidation()`` method, but may be changed to ``true`` so
 this model will never validate.
@@ -321,8 +321,8 @@ Returns the first row in the result set. This is best used in combination with t
 
 **withDeleted()**
 
-If $useSoftDeletes is true, then the find* methods will not return any rows where 'deleted_at IS NOT null'.
-To temporarily override this, you can use the withDeleted() method prior to calling the find* method.
+If ``$useSoftDeletes`` is true, then the **find*()** methods will not return any rows where 'deleted_at IS NOT NULL'.
+To temporarily override this, you can use the ``withDeleted()`` method prior to calling the **find*()** method.
 ::
 
     // Only gets non-deleted rows (deleted = 0)
@@ -333,8 +333,8 @@ To temporarily override this, you can use the withDeleted() method prior to call
 
 **onlyDeleted()**
 
-Whereas withDeleted() will return both deleted and not-deleted rows, this method modifies
-the next find* methods to return only soft deleted rows::
+Whereas ``withDeleted()`` will return both deleted and not-deleted rows, this method modifies
+the next **find*()** methods to return only soft deleted rows::
 
     $deletedUsers = $userModel->onlyDeleted()->findAll();
 
@@ -356,9 +356,9 @@ the array's values are the values to save for that key::
 
 **update()**
 
-Updates an existing record in the database. The first parameter is the $primaryKey of the record to update.
+Updates an existing record in the database. The first parameter is the ``$primaryKey`` of the record to update.
 An associative array of data is passed into this method as the second parameter. The array's keys must match the name
-of the columns in a $table, while the array's values are the values to save for that key::
+of the columns in a ``$table``, while the array's values are the values to save for that key::
 
     $data = [
         'username' => 'darth',
@@ -385,8 +385,8 @@ update command, with the added benefit of validation, events, etc::
 
 **save()**
 
-This is a wrapper around the insert() and update() methods that handle inserting or updating the record
-automatically, based on whether it finds an array key matching the $primaryKey value::
+This is a wrapper around the ``insert()`` and ``update()`` methods that handle inserting or updating the record
+automatically, based on whether it finds an array key matching the **primary key** value::
 
     // Defined as a model property
     $primaryKey = 'id';
@@ -628,7 +628,7 @@ method directly, with options::
     $rules = $model->getValidationRules($options);
 
 The ``$options`` parameter is an associative array with one element,
-whose key is either "except" or "only", and which has as its
+whose key is either ``'except'`` or ``'only'``, and which has as its
 value an array of fieldnames of interest.::
 
     // get the rules for all but the "username" field
@@ -712,8 +712,8 @@ very elegant use::
 Runtime Return Type Changes
 ----------------------------
 
-You can specify the format that data should be returned as when using the find*() methods as the class property,
-$returnType. There may be times that you would like the data back in a different format, though. The Model
+You can specify the format that data should be returned as when using the **find*()** methods as the class property,
+``$returnType``. There may be times that you would like the data back in a different format, though. The Model
 provides methods that allow you to do just that.
 
 .. note:: These methods only change the return type for the next **find*()** method call. After that,

From e78e6c7c6a1241a2a7728ebb024b706d6d5b86d0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 17 Nov 2021 11:44:55 +0900
Subject: [PATCH 0760/2325] docs: fix execute() explanation

---
 user_guide_src/source/testing/controllers.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/testing/controllers.rst b/user_guide_src/source/testing/controllers.rst
index e99a24d935f9..94ef7dad1135 100644
--- a/user_guide_src/source/testing/controllers.rst
+++ b/user_guide_src/source/testing/controllers.rst
@@ -69,13 +69,15 @@ Specifies the class name of the controller to test. The first parameter must be
 
     $this->controller(\App\Controllers\ForumController::class);
 
-**execute($method)**
+**execute(string $method, ...$params)**
 
-Executes the specified method within the controller. The only parameter is the name of the method to run::
+Executes the specified method within the controller. The first parameter is the name of the method to run::
 
     $results = $this->controller(\App\Controllers\ForumController::class)
                     ->execute('showCategories');
 
+By specifying the second and subsequent parameters, you can pass them to the controller method.
+
 This returns a new helper class that provides a number of routines for checking the response itself. See below
 for details.
 

From 58644197b6cc4cbcbf94c12f11ead23ddd655042 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 17 Nov 2021 11:45:31 +0900
Subject: [PATCH 0761/2325] docs: fix withURI() signature

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

diff --git a/user_guide_src/source/testing/controllers.rst b/user_guide_src/source/testing/controllers.rst
index 94ef7dad1135..1f16cd615fc2 100644
--- a/user_guide_src/source/testing/controllers.rst
+++ b/user_guide_src/source/testing/controllers.rst
@@ -135,7 +135,7 @@ Allows you to provide a **Logger** instance::
 If you do not provide one, a new Logger instance with the default configuration values will be passed
 into your controller.
 
-**withURI($uri)**
+**withURI(string $uri)**
 
 Allows you to provide a new URI that simulates the URL the client was visiting when this controller was run.
 This is helpful if you need to check URI segments within your controller. The only parameter is a string

From 2d867408f32f0e033c09904f1adbb232ffe41234 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 17 Nov 2021 11:45:53 +0900
Subject: [PATCH 0762/2325] docs: elaborate on isOK()

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

diff --git a/user_guide_src/source/testing/response.rst b/user_guide_src/source/testing/response.rst
index e5e0f34852ff..c5f7d9c34fbe 100644
--- a/user_guide_src/source/testing/response.rst
+++ b/user_guide_src/source/testing/response.rst
@@ -37,7 +37,7 @@ Checking Response Status
 **isOK()**
 
 Returns a boolean true/false based on whether the response is perceived to be "ok". This is primarily determined by
-a response status code in the 200 or 300's.
+a response status code in the 200 or 300's. An empty body is not considered valid, unless in redirects.
 ::
 
     if ($result->isOK()) {

From 978089a058b4aa18017b0ba5fd7042b156624ee2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 17 Nov 2021 14:53:48 +0900
Subject: [PATCH 0763/2325] test: fix: move loading helper to setUp()

If you run one test method, it fails.
---
 tests/system/Helpers/FilesystemHelperTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php
index 25a1cb1680bd..6492cab98708 100644
--- a/tests/system/Helpers/FilesystemHelperTest.php
+++ b/tests/system/Helpers/FilesystemHelperTest.php
@@ -37,11 +37,12 @@ protected function setUp(): void
             'simpleFile'    => 'A tap-tap-tapping upon my door',
             '.hidden'       => 'There is no spoon',
         ];
+
+        helper('filesystem');
     }
 
     public function testDirectoryMapDefaults()
     {
-        helper('filesystem');
         $this->assertTrue(function_exists('directory_map'));
 
         $expected = [
@@ -65,7 +66,6 @@ public function testDirectoryMapDefaults()
 
     public function testDirectoryMapShowsHiddenFiles()
     {
-        helper('filesystem');
         $this->assertTrue(function_exists('directory_map'));
 
         $expected = [

From a4a92edfff280d48a64ded19df56941e59ee906a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 17 Nov 2021 14:54:53 +0900
Subject: [PATCH 0764/2325] test: fix: incorrect function name in assertions

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

diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php
index 6492cab98708..c48ccd1ff328 100644
--- a/tests/system/Helpers/FilesystemHelperTest.php
+++ b/tests/system/Helpers/FilesystemHelperTest.php
@@ -257,7 +257,7 @@ public function testDeleteFilesFailure()
 
     public function testGetFilenames()
     {
-        $this->assertTrue(function_exists('delete_files'));
+        $this->assertTrue(function_exists('get_filenames'));
 
         // Not sure the directory names should actually show up
         // here but this matches v3.x results.
@@ -279,7 +279,7 @@ public function testGetFilenames()
 
     public function testGetFilenamesWithHidden()
     {
-        $this->assertTrue(function_exists('delete_files'));
+        $this->assertTrue(function_exists('get_filenames'));
 
         // Not sure the directory names should actually show up
         // here but this matches v3.x results.

From e97b95b2ffc8b11a4a97202cab12d6a839ddca93 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Wed, 17 Nov 2021 00:00:12 -0600
Subject: [PATCH 0765/2325] Fix rector error and cleanup up filename displays
 for Debug toolbar database tab.

---
 system/Debug/Toolbar/Collectors/Database.php | 15 ++++++++++-----
 system/Debug/Toolbar/Views/toolbar.css       |  6 +++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 639ba73be3e0..a3fc7e435d56 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -137,12 +137,17 @@ public function display(): array
             // Find the first line that doesn't include `system` in the backtrace
             $line = [];
 
-            foreach ($query['trace'] as $traceLine) {
-                if (strpos($traceLine['file'], 'system/') !== false) {
+            foreach ($query['trace'] as &$traceLine) {
+                // Clean up the file paths
+                $traceLine['file'] = str_ireplace(APPPATH, 'APPPATH/', $traceLine['file']);
+                $traceLine['file'] = str_ireplace(SYSTEMPATH, 'SYSTEMPATH/', $traceLine['file']);
+                $traceLine['file'] = str_ireplace(VENDORPATH, 'VENDORPATH/', $traceLine['file']);
+                $traceLine['file'] = str_ireplace(ROOTPATH, 'ROOTPATH/', $traceLine['file']);
+
+                if (strpos($traceLine['file'], 'APPPATH') === false) {
                     continue;
                 }
-                $line = $traceLine;
-                break;
+                $line = empty($line) ? $traceLine : $line;
             }
 
             return [
@@ -153,7 +158,7 @@ public function display(): array
                 'trace'      => $query['trace'],
                 'trace-file' => str_replace(ROOTPATH, '/', $line['file'] ?? ''),
                 'trace-line' => $line['line'] ?? '',
-                'qid'        => md5((string) $query['query'] . microtime()),
+                'qid'        => md5($query['query'] . microtime()),
             ];
         }, static::$queries);
 
diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
index 50ec4bff9e28..ed4230be0988 100644
--- a/system/Debug/Toolbar/Views/toolbar.css
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -498,7 +498,7 @@
   #toolbarContainer.dark #debug-bar .muted {
     color: #DFDFDF; }
     #toolbarContainer.dark #debug-bar .muted td {
-      color: #434343; }
+      color: #797979; }
     #toolbarContainer.dark #debug-bar .muted:hover td {
       color: #DFDFDF; }
   #toolbarContainer.dark #debug-bar #toolbar-position,
@@ -589,9 +589,9 @@
     -moz-box-shadow: 0 1px 4px #DFDFDF;
     -webkit-box-shadow: 0 1px 4px #DFDFDF; }
   #toolbarContainer.light #debug-bar .muted {
-    color: #434343; }
+    color: #797979; }
     #toolbarContainer.light #debug-bar .muted td {
-      color: #DFDFDF; }
+      color: #797979; }
     #toolbarContainer.light #debug-bar .muted:hover td {
       color: #434343; }
   #toolbarContainer.light #debug-bar #toolbar-position,

From ccc4a5e8f45072de35b07da9e639f6f120880532 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Wed, 17 Nov 2021 00:02:22 -0600
Subject: [PATCH 0766/2325] Added note to changelog

---
 system/Debug/Toolbar/Collectors/Database.php | 2 +-
 user_guide_src/source/changelogs/v4.1.6.rst  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index a3fc7e435d56..db13e14e920e 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -144,7 +144,7 @@ public function display(): array
                 $traceLine['file'] = str_ireplace(VENDORPATH, 'VENDORPATH/', $traceLine['file']);
                 $traceLine['file'] = str_ireplace(ROOTPATH, 'ROOTPATH/', $traceLine['file']);
 
-                if (strpos($traceLine['file'], 'APPPATH') === false) {
+                if (strpos($traceLine['file'], 'SYSTEMPATH') !== false) {
                     continue;
                 }
                 $line = empty($line) ? $traceLine : $line;
diff --git a/user_guide_src/source/changelogs/v4.1.6.rst b/user_guide_src/source/changelogs/v4.1.6.rst
index 80800ecbc94b..093ea6ca8aec 100644
--- a/user_guide_src/source/changelogs/v4.1.6.rst
+++ b/user_guide_src/source/changelogs/v4.1.6.rst
@@ -14,6 +14,7 @@ BREAKING
 
 Enhancements
 ============
+- Database pane on debug toolbar now displays location where Query was called from. Also displays full backtrace.
 
 Changes
 =======

From 328aa7670c7636db5775f88a6f39d374d098bf6f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 18 Nov 2021 08:48:44 +0900
Subject: [PATCH 0767/2325] chore: add seach example in Issue Form

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 2c28200c36aa..cadb186f71ac 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -13,6 +13,9 @@ body:
         whether still open or closed, related to your report**.
         If there is, your report will be closed promptly.
 
+        For example, if you get the error "*Undefined property: Config\\Exceptions::$sensitiveDataInTrace*",
+        you can search the GitHub repository with the keyword "[$sensitiveDataInTrace](https://github.com/codeigniter4/CodeIgniter4/search?q=%24sensitiveDataInTrace&type=issues)".
+
         ---
 
   - type: dropdown

From e8db9099c65e0ac8cf81f81730a54d10a00ee8ad Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 18 Nov 2021 08:49:31 +0900
Subject: [PATCH 0768/2325] chore: add codeigniter-installation in Issue Form

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index cadb186f71ac..9dc91d2cc42a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -43,6 +43,19 @@ body:
     validations:
       required: true
 
+  - type: dropdown
+    id: codeigniter-installation
+    attributes:
+      label: CodeIgniter4 Installation
+      multiple: false
+      options:
+        - Composer; appstarter
+        - Composer; Adding CI4 to an Existing Project
+        - Manual (zip or tar.gz)
+        - Git
+    validations:
+      required: true
+
   - type: dropdown
     id: operating-systems
     attributes:

From 431546710ee21b8c409c78a48d9fe54b4f3da3b6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 18 Nov 2021 09:35:32 +0900
Subject: [PATCH 0769/2325] docs: add @TODO

See #5344
---
 system/HTTP/IncomingRequest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 128d6ee1c432..3ac25b6df5fd 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -64,6 +64,8 @@ class IncomingRequest extends Request
      * AFTER the script name. So, if hosted in a sub-folder this will
      * appear different than actual URL. If you need that use getPath().
      *
+     * @TODO should be protected. Use getUri() instead.
+     *
      * @var URI
      */
     public $uri;

From 05ce6cb92a6822177a50f479620c6dd276c15ce7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 18 Nov 2021 09:36:14 +0900
Subject: [PATCH 0770/2325] docs: don't use $request->uri

See #5344
---
 user_guide_src/source/concepts/http.rst            | 2 +-
 user_guide_src/source/incoming/incomingrequest.rst | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/concepts/http.rst b/user_guide_src/source/concepts/http.rst
index 2696c91223d3..8ae030fc1811 100644
--- a/user_guide_src/source/concepts/http.rst
+++ b/user_guide_src/source/concepts/http.rst
@@ -75,7 +75,7 @@ is an object-oriented representation of the HTTP request. It provides everything
     $request = service('request');
 
     // the URI being requested (i.e., /about)
-    $request->uri->getPath();
+    $request->getUri()->getPath();
 
     // Retrieve $_GET and $_POST variables
     $request->getGet('foo');
diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index e9f494961233..d08bf8470f70 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -249,13 +249,13 @@ The Request URL
 ---------------
 
 You can retrieve a :doc:`URI </libraries/uri>` object that represents the current URI for this request through the
-``$request->uri`` property. You can cast this object as a string to get a full URL for the current request::
+``$request->getUri()`` method. You can cast this object as a string to get a full URL for the current request::
 
-    $uri = (string)$request->uri;
+    $uri = (string) $request->getUri();
 
 The object gives you full abilities to grab any part of the request on it's own::
 
-    $uri = $request->uri;
+    $uri = $request->getUri();
 
     echo $uri->getScheme();         // http
     echo $uri->getAuthority();      // snoopy:password@example.com:88

From 19454015570810287529b88ef2dcf73ab2409e77 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 18 Nov 2021 10:00:25 +0900
Subject: [PATCH 0771/2325] refactor: replace $request->uri with
 $request->getUri()

See #5344
---
 app/Views/errors/html/error_exception.php |  2 +-
 system/Common.php                         |  6 +++---
 tests/system/HTTP/IncomingRequestTest.php |  2 +-
 tests/system/HTTP/URITest.php             | 14 +++++++-------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
index 4477ee08ff8b..693afed491f5 100644
--- a/app/Views/errors/html/error_exception.php
+++ b/app/Views/errors/html/error_exception.php
@@ -195,7 +195,7 @@
 					<tbody>
 						<tr>
 							<td style="width: 10em">Path</td>
-							<td><?= esc($request->uri) ?></td>
+							<td><?= esc($request->getUri()) ?></td>
 						</tr>
 						<tr>
 							<td>HTTP Method</td>
diff --git a/system/Common.php b/system/Common.php
index 7c150a01c1d4..32943189b56b 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -480,9 +480,9 @@ function force_https(int $duration = 31536000, ?RequestInterface $request = null
         $uri = URI::createURIString(
             'https',
             $baseURL,
-            $request->uri->getPath(), // Absolute URIs should use a "/" for an empty path
-            $request->uri->getQuery(),
-            $request->uri->getFragment()
+            $request->getUri()->getPath(), // Absolute URIs should use a "/" for an empty path
+            $request->getUri()->getQuery(),
+            $request->getUri()->getFragment()
         );
 
         // Set an HSTS header
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index b467c9ca3e1a..3b14c6a03357 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -650,6 +650,6 @@ public function testSetPathUpdatesURI()
 
         $request->setPath('apples');
 
-        $this->assertSame('apples', $request->uri->getPath());
+        $this->assertSame('apples', $request->getUri()->getPath());
     }
 }
diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php
index acd491bccb9d..0438505aea2e 100644
--- a/tests/system/HTTP/URITest.php
+++ b/tests/system/HTTP/URITest.php
@@ -876,14 +876,14 @@ public function testBasedNoIndex()
 
         // going through request
         $this->assertSame('http://example.com/ci/v4/controller/method', (string) $request->uri);
-        $this->assertSame('/ci/v4/controller/method', $request->uri->getPath());
+        $this->assertSame('/ci/v4/controller/method', $request->getUri()->getPath());
 
         // standalone
         $uri = new URI('http://example.com/ci/v4/controller/method');
         $this->assertSame('http://example.com/ci/v4/controller/method', (string) $uri);
         $this->assertSame('/ci/v4/controller/method', $uri->getPath());
 
-        $this->assertSame($uri->getPath(), $request->uri->getPath());
+        $this->assertSame($uri->getPath(), $request->getUri()->getPath());
     }
 
     public function testBasedWithIndex()
@@ -902,15 +902,15 @@ public function testBasedWithIndex()
         Services::injectMock('request', $request);
 
         // going through request
-        $this->assertSame('http://example.com/ci/v4/index.php/controller/method', (string) $request->uri);
-        $this->assertSame('/ci/v4/index.php/controller/method', $request->uri->getPath());
+        $this->assertSame('http://example.com/ci/v4/index.php/controller/method', (string) $request->getUri());
+        $this->assertSame('/ci/v4/index.php/controller/method', $request->getUri()->getPath());
 
         // standalone
         $uri = new URI('http://example.com/ci/v4/index.php/controller/method');
         $this->assertSame('http://example.com/ci/v4/index.php/controller/method', (string) $uri);
         $this->assertSame('/ci/v4/index.php/controller/method', $uri->getPath());
 
-        $this->assertSame($uri->getPath(), $request->uri->getPath());
+        $this->assertSame($uri->getPath(), $request->getUri()->getPath());
     }
 
     public function testForceGlobalSecureRequests()
@@ -933,13 +933,13 @@ public function testForceGlobalSecureRequests()
         Services::injectMock('request', $request);
 
         // Detected by request
-        $this->assertSame('https://example.com/ci/v4/controller/method', (string) $request->uri);
+        $this->assertSame('https://example.com/ci/v4/controller/method', (string) $request->getUri());
 
         // Standalone
         $uri = new URI('http://example.com/ci/v4/controller/method');
         $this->assertSame('https://example.com/ci/v4/controller/method', (string) $uri);
 
-        $this->assertSame(trim($uri->getPath(), '/'), trim($request->uri->getPath(), '/'));
+        $this->assertSame(trim($uri->getPath(), '/'), trim($request->getUri()->getPath(), '/'));
     }
 
     public function testZeroAsURIPath()

From f4eed93bb01bf64b733c0d9afbae75be0592cf76 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 18 Nov 2021 11:46:42 +0900
Subject: [PATCH 0772/2325] docs: remove /docs, because no such directory

---
 user_guide_src/source/concepts/structure.rst | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/user_guide_src/source/concepts/structure.rst b/user_guide_src/source/concepts/structure.rst
index 14bb3a59304b..b55a3eac9ff1 100644
--- a/user_guide_src/source/concepts/structure.rst
+++ b/user_guide_src/source/concepts/structure.rst
@@ -8,8 +8,8 @@ can change to meet the needs of your application.
 Default Directories
 ===================
 
-A fresh install has six directories: ``/app``, ``/system``, ``/public``,
-``/writable``, ``/tests`` and possibly ``/docs``.
+A fresh install has five directories: ``/app``, ``/public``,
+``/writable``, ``/tests`` and ``/system`` or ``/vendor``.
 Each of these directories has a very specific part to play.
 
 app
@@ -75,11 +75,6 @@ This directory is set up to hold your test files. The ``_support`` directory hol
 utilities that you can use while writing your tests. This directory does not need to be transferred to your
 production servers.
 
-docs
-----
-If this directory is part of your project, it holds a local copy of the CodeIgniter4
-User Guide.
-
 Modifying Directory Locations
 -----------------------------
 

From ee08712be5b78f8ce0961b1615088821e2a9e7f8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 18 Nov 2021 11:47:26 +0900
Subject: [PATCH 0773/2325] docs: add note when composer installation

---
 user_guide_src/source/concepts/structure.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/user_guide_src/source/concepts/structure.rst b/user_guide_src/source/concepts/structure.rst
index b55a3eac9ff1..5c94b8542758 100644
--- a/user_guide_src/source/concepts/structure.rst
+++ b/user_guide_src/source/concepts/structure.rst
@@ -44,6 +44,9 @@ All files in this directory live under the ``App`` namespace, though you are fre
 
 system
 ------
+
+.. note:: If you install CodeIgniter with Composer, the ``system`` is located in ``vendor/codeigniter4/framework/system``.
+
 This directory stores the files that make up the framework, itself. While you have a lot of flexibility in how you
 use the application directory, the files in the system directory should never be modified. Instead, you should
 extend the classes, or create new classes, to provide the desired functionality.

From 73371c46ac43828703c8d990d4a79656ed2c6f6c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 18 Nov 2021 11:55:47 +0900
Subject: [PATCH 0774/2325] docs: update sample code

It is recommended to use BaseController instead of Controller.
---
 user_guide_src/source/tutorial/static_pages.rst | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
index d6874bc9fbe9..1763d1fae624 100644
--- a/user_guide_src/source/tutorial/static_pages.rst
+++ b/user_guide_src/source/tutorial/static_pages.rst
@@ -39,9 +39,7 @@ code.
 
     namespace App\Controllers;
 
-    use CodeIgniter\Controller;
-
-    class Pages extends Controller
+    class Pages extends BaseController
     {
         public function index()
         {
@@ -66,7 +64,7 @@ displays the CodeIgniter welcome page.
     Both are *technically* a function. But when you create a function in a class,
     it's called a method.
 
-The ``Pages`` class is extending the
+The ``Pages`` class is extending the ``BaseController`` class that extends the
 ``CodeIgniter\Controller`` class. This means that the new Pages class can access the
 methods and variables defined in the ``CodeIgniter\Controller`` class
 (**system/Controller.php**).

From c0fedce2429ff332316f330c4c89bf8710cbe35b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 18 Nov 2021 11:56:45 +0900
Subject: [PATCH 0775/2325] docs: add CSRF error display in sample code

---
 .../source/tutorial/create_news_items.rst          | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index b4506b4dc322..604c2373314e 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -33,6 +33,7 @@ the slug from our title in the model. Create a new view at
 
     <h2><?= esc($title) ?></h2>
 
+    <?= session()->getFlashdata('error') ?>
     <?= service('validation')->listErrors() ?>
 
     <form action="/news/create" method="post">
@@ -47,10 +48,15 @@ the slug from our title in the model. Create a new view at
         <input type="submit" name="submit" value="Create news item" />
     </form>
 
-There are probably only two things here that look unfamiliar. The
-``service('validation')->listErrors()`` function is used to report
-errors related to form validation. The ``csrf_field()`` function creates
-a hidden input with a CSRF token that helps protect against some common attacks.
+There are probably only three things here that look unfamiliar.
+
+The ``<?= session()->getFlashdata('error') ?>`` function is used to report
+errors related to CSRF protection.
+
+The ``service('validation')->listErrors()`` function is used to report
+errors related to form validation.
+
+The ``csrf_field()`` function creates a hidden input with a CSRF token that helps protect against some common attacks.
 
 Go back to your ``News`` controller. You're going to do two things here,
 check whether the form was submitted and whether the submitted data

From 88c4968fb3147cd33613d7cafaa31084e2d9a907 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 18 Nov 2021 13:20:08 +0900
Subject: [PATCH 0776/2325] chore: fix script to copy tests directory

---
 .github/scripts/deploy-framework | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/scripts/deploy-framework b/.github/scripts/deploy-framework
index c3f7e39fa1b7..9396ed88aa04 100644
--- a/.github/scripts/deploy-framework
+++ b/.github/scripts/deploy-framework
@@ -28,6 +28,8 @@ done
 
 # Copy repo-specific files
 cp -Rf ${SOURCE}/admin/framework/. ./
+# Copy tests files
+cp -Rf ${SOURCE}/admin/starter/tests/. ./tests/
 
 # Commit the changes
 git add .

From d5c90f1668eafc4baa857f304668458526ec6c78 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 18 Nov 2021 17:20:57 +0900
Subject: [PATCH 0777/2325] docs: make view filename lowercase

Capital letters can also be used, but they are often lowercased.
---
 user_guide_src/source/outgoing/views.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst
index 19121c98b86a..4f865f6aaecb 100644
--- a/user_guide_src/source/outgoing/views.rst
+++ b/user_guide_src/source/outgoing/views.rst
@@ -19,7 +19,7 @@ Using the example controller you created in the controller page, let’s add a v
 Creating a View
 ===============
 
-Using your text editor, create a file called ``BlogView.php`` and put this in it::
+Using your text editor, create a file called ``blogview.php`` and put this in it::
 
     <html>
         <head>
@@ -53,7 +53,7 @@ Now, open the controller file you made earlier called ``Blog.php``, and replace
     {
         public function index()
         {
-            echo view('BlogView');
+            echo view('blogview');
         }
     }
 
@@ -111,7 +111,7 @@ If you have ``Blog`` directory that has a PSR-4 mapping set up in the :doc:`Auto
 under the namespace ``Example\Blog``, you could retrieve view files as if they were namespaced also. Following this
 example, you could load the **BlogView** file from **/blog/views** by prepending the namespace to the view name::
 
-    echo view('Example\Blog\Views\BlogView');
+    echo view('Example\Blog\Views\blogview');
 
 Caching Views
 =============

From 05ce8a5142dc3f4ecb72427eeedc5c5959f75e22 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 18 Nov 2021 17:23:39 +0900
Subject: [PATCH 0778/2325] docs: fix directory name

Saying that "If you have ``Blog`` directory", the directory name
must be Blog, not blog.
---
 user_guide_src/source/outgoing/views.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst
index 4f865f6aaecb..b01466ce40da 100644
--- a/user_guide_src/source/outgoing/views.rst
+++ b/user_guide_src/source/outgoing/views.rst
@@ -109,7 +109,7 @@ to package your views together in a module-like fashion for easy re-use or distr
 
 If you have ``Blog`` directory that has a PSR-4 mapping set up in the :doc:`Autoloader </concepts/autoloader>` living
 under the namespace ``Example\Blog``, you could retrieve view files as if they were namespaced also. Following this
-example, you could load the **BlogView** file from **/blog/views** by prepending the namespace to the view name::
+example, you could load the **blogview.php** file from **Blog/Views** by prepending the namespace to the view name::
 
     echo view('Example\Blog\Views\blogview');
 

From 5a3ba8012e09c060ca595b0c705e2229d722d426 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 18 Nov 2021 17:29:12 +0900
Subject: [PATCH 0779/2325] docs: fix incorrect method name

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

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 5dade8d13f3d..9778307bc4fa 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -330,7 +330,7 @@ Command-Line only Routes
 
 You can create routes that work only from the command-line, and are inaccessible from the web browser, with the
 ``cli()`` method. This is great for building cronjobs or CLI-only tools. Any route created by any of the HTTP-verb-based
-route methods will also be inaccessible from the CLI, but routes created by the ``any()`` method will still be
+route methods will also be inaccessible from the CLI, but routes created by the ``add()`` method will still be
 available from the command line::
 
     $routes->cli('migrate', 'App\Database::migrate');

From b4da1c1629350bf04bd8e5eefe78a97908b3c35f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Nov 2021 13:53:30 +0900
Subject: [PATCH 0780/2325] chore: fix by review

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 9dc91d2cc42a..cbc27bc81a22 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -46,7 +46,7 @@ body:
   - type: dropdown
     id: codeigniter-installation
     attributes:
-      label: CodeIgniter4 Installation
+      label: CodeIgniter4 Installation Method
       multiple: false
       options:
         - Composer; appstarter

From b31256fc03bccd8d0bfb8c43f40d9745c56e7bbd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Nov 2021 13:53:38 +0900
Subject: [PATCH 0781/2325] chore: fix by review

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug_report.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index cbc27bc81a22..975c611a61c3 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -49,8 +49,8 @@ body:
       label: CodeIgniter4 Installation Method
       multiple: false
       options:
-        - Composer; appstarter
-        - Composer; Adding CI4 to an Existing Project
+        - Composer (using `codeigniter4/appstarter`)
+        - Composer (as dependency to an existing project)
         - Manual (zip or tar.gz)
         - Git
     validations:

From 27d216b62db26246fa08eb686347b11670dd9c77 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 10 Nov 2021 11:22:36 +0900
Subject: [PATCH 0782/2325] fix: UploadedFile::hasMoved() may return incorrect
 value

---
 system/HTTP/Files/UploadedFile.php         | 13 ++++--
 tests/system/HTTP/Files/FileMovingTest.php | 52 +++++++++++++++++++++-
 2 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
index 6455a5106d8d..42bb9891f90b 100644
--- a/system/HTTP/Files/UploadedFile.php
+++ b/system/HTTP/Files/UploadedFile.php
@@ -141,7 +141,7 @@ public function move(string $targetPath, ?string $name = null, bool $overwrite =
         $destination = $overwrite ? $targetPath . $name : $this->getDestination($targetPath . $name);
 
         try {
-            move_uploaded_file($this->path, $destination);
+            $this->hasMoved = move_uploaded_file($this->path, $destination);
         } catch (Exception $e) {
             $error   = error_get_last();
             $message = isset($error['message']) ? strip_tags($error['message']) : '';
@@ -149,12 +149,17 @@ public function move(string $targetPath, ?string $name = null, bool $overwrite =
             throw HTTPException::forMoveFailed(basename($this->path), $targetPath, $message);
         }
 
+        if ($this->hasMoved === false) {
+            $message = 'move_uploaded_file() returned false';
+
+            throw HTTPException::forMoveFailed(basename($this->path), $targetPath, $message);
+        }
+
         @chmod($targetPath, 0777 & ~umask());
 
         // Success, so store our new information
-        $this->path     = $targetPath;
-        $this->name     = basename($destination);
-        $this->hasMoved = true;
+        $this->path = $targetPath;
+        $this->name = basename($destination);
 
         return true;
     }
diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php
index 9797ca46c301..c9234a82dc6b 100644
--- a/tests/system/HTTP/Files/FileMovingTest.php
+++ b/tests/system/HTTP/Files/FileMovingTest.php
@@ -35,6 +35,9 @@ protected function setUp(): void
         }
 
         $_FILES = [];
+
+        // Set the mock's return value to true
+        move_uploaded_file('', '', true);
     }
 
     protected function tearDown(): void
@@ -262,7 +265,7 @@ public function testInvalidFile()
         $file->move($destination, $file->getName(), false);
     }
 
-    public function testFailedMove()
+    public function testFailedMoveBecauseOfWarning()
     {
         $_FILES = [
             'userfile' => [
@@ -287,6 +290,41 @@ public function testFailedMove()
         $this->expectException(HTTPException::class);
         $file->move($destination, $file->getName(), false);
     }
+
+    public function testFailedMoveBecauseOfFalseReturned()
+    {
+        $finalFilename = 'fileA';
+
+        $_FILES = [
+            'userfile1' => [
+                'name'     => $finalFilename . '.txt',
+                'type'     => 'text/plain',
+                'size'     => 124,
+                'tmp_name' => '/tmp/fileA.txt',
+                'error'    => 0,
+            ],
+        ];
+
+        $collection = new FileCollection();
+
+        $this->assertTrue($collection->hasFile('userfile1'));
+
+        $destination = $this->destination;
+
+        // Create the destination if not exists
+        if (! is_dir($destination)) {
+            mkdir($destination, 0777, true);
+        }
+
+        $file = $collection->getFile('userfile1');
+
+        // Set the mock's return value to false
+        move_uploaded_file('', '', false);
+
+        $this->expectException(HTTPException::class);
+
+        $file->move($destination, $file->getName(), false);
+    }
 }
 
 /*
@@ -311,10 +349,20 @@ function is_uploaded_file($filename)
  * This overwrite is for testing the move operation.
  */
 
-function move_uploaded_file($filename, $destination)
+function move_uploaded_file($filename, $destination, ?bool $setReturnValue = null)
 {
+    static $return = true;
+
+    if ($setReturnValue !== null) {
+        $return = $setReturnValue;
+
+        return true;
+    }
+
     copy($filename, $destination);
     unlink($filename);
+
+    return $return;
 }
 
 function rrmdir($src)

From 2425b291c333c1265ce4a44c5206bb8419c028d2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 20 Nov 2021 11:47:15 +0900
Subject: [PATCH 0783/2325] docs: fix incorrect namespace in sample code

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

diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst
index 65d63d942631..51deea953590 100644
--- a/user_guide_src/source/general/helpers.rst
+++ b/user_guide_src/source/general/helpers.rst
@@ -78,7 +78,7 @@ code into its own namespace, ``Example\Blog``. The files exist on our server at
 **/Modules/Blog/Helpers/blog_helper.php**. Within our controller we could
 use the following command to load the helper for us::
 
-    helper('Modules\Blog\blog');
+    helper('Example\Blog\blog');
 
 .. note:: The functions within files loaded this way are not truly namespaced.
     The namespace is simply used as a convenient way to locate the files.

From 843ddb96846029c8814c121e5ae5de6394584368 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 20 Nov 2021 13:13:38 +0900
Subject: [PATCH 0784/2325] test: add test for table alias and table prefix

---
 tests/system/Database/Builder/AliasTest.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/system/Database/Builder/AliasTest.php b/tests/system/Database/Builder/AliasTest.php
index b6789d987708..d6d2c8618741 100644
--- a/tests/system/Database/Builder/AliasTest.php
+++ b/tests/system/Database/Builder/AliasTest.php
@@ -84,4 +84,20 @@ public function testAliasLeftJoinWithLongTableName()
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5360
+     */
+    public function testAliasSimpleLikeWithDBPrefix()
+    {
+        $this->setPrivateProperty($this->db, 'DBPrefix', 'db_');
+        $builder = $this->db->table('jobs j');
+
+        $builder->like('j.name', 'veloper');
+
+        $expectedSQL = <<<'SQL'
+            SELECT * FROM "db_jobs" "j" WHERE "j"."name" LIKE '%veloper%' ESCAPE '!'
+            SQL;
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 }

From 20411e61851493f210db2877ede2603f8000f467 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 20 Nov 2021 15:20:02 +0900
Subject: [PATCH 0785/2325] fix: if condition where the first segment is one of
 the aliases previously identified

Fixes #5360
---
 system/Database/BaseConnection.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index ebb63b7f5827..c7f4e124d507 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -1012,7 +1012,8 @@ public function protectIdentifiers($item, bool $prefixSingle = false, ?bool $pro
             //
             // NOTE: The ! empty() condition prevents this method
             // from breaking when QB isn't enabled.
-            if (! empty($this->aliasedTables) && in_array($parts[0], $this->aliasedTables, true)) {
+            $firstSegment = trim($parts[0], $this->escapeChar);
+            if (! empty($this->aliasedTables) && in_array($firstSegment, $this->aliasedTables, true)) {
                 if ($protectIdentifiers === true) {
                     foreach ($parts as $key => $val) {
                         if (! in_array($val, $this->reservedIdentifiers, true)) {

From 7f0e921dfe32a42b38c1b2490a624b50d1a3d0ef Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 2 Nov 2021 16:28:18 +0900
Subject: [PATCH 0786/2325] fix: Query builder escapes negative integers

Fixes #4973
---
 system/Database/BaseConnection.php        |  2 +-
 tests/system/Database/BaseQueryTest.php   | 18 ++++++++++++++++++
 tests/system/Database/Live/EscapeTest.php |  2 +-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index ebb63b7f5827..6279e822a10c 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -1201,7 +1201,7 @@ public function escape($str)
         }
 
         if (is_numeric($str) && $str < 0) {
-            return "'{$str}'";
+            return "{$str}";
         }
 
         return $str ?? 'NULL';
diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php
index fe942ffeb187..a279e01dd444 100644
--- a/tests/system/Database/BaseQueryTest.php
+++ b/tests/system/Database/BaseQueryTest.php
@@ -345,6 +345,24 @@ public function testSetQueryBindsWithSetEscapeFalse()
         $this->assertSame($expected, $query->getQuery());
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4973
+     */
+    public function testSetQueryBindsWithSetEscapeNegativeIntegers()
+    {
+        $query = new Query($this->db);
+
+        $query->setQuery(
+            'SELECT * FROM product WHERE date_pickup < DateAdd(month, ?, Convert(date, GetDate())',
+            [-6],
+            true
+        );
+
+        $expected = 'SELECT * FROM product WHERE date_pickup < DateAdd(month, -6, Convert(date, GetDate())';
+
+        $this->assertSame($expected, $query->getQuery());
+    }
+
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/2762
      */
diff --git a/tests/system/Database/Live/EscapeTest.php b/tests/system/Database/Live/EscapeTest.php
index 08265788d00e..9099115e45d0 100644
--- a/tests/system/Database/Live/EscapeTest.php
+++ b/tests/system/Database/Live/EscapeTest.php
@@ -40,7 +40,7 @@ protected function setUp(): void
      */
     public function testEscapeProtectsNegativeNumbers()
     {
-        $this->assertSame("'-100'", $this->db->escape(-100));
+        $this->assertSame('-100', $this->db->escape(-100));
     }
 
     public function testEscape()

From 034b1332a09ab876f8922b62e57c122ccf89ba53 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 2 Nov 2021 16:29:07 +0900
Subject: [PATCH 0787/2325] docs: add PHPDoc

---
 system/Database/BaseConnection.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 6279e822a10c..6902490dea1c 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -565,7 +565,7 @@ abstract protected function execute(string $sql);
      *
      * @param mixed ...$binds
      *
-     * @return BaseResult|bool|Query
+     * @return BaseResult|bool|Query BaseResult when “read” type query, bool when “write” type query, Query when prepared query
      *
      * @todo BC set $queryClass default as null in 4.1
      */
@@ -955,6 +955,8 @@ public function getConnectDuration(int $decimals = 6): string
      * the correct identifiers.
      *
      * @param array|string $item
+     * @param bool         $prefixSingle Prefix an item with no segments?
+     * @param bool         $fieldExists  Supplied $item contains a field name?
      *
      * @return array|string
      */

From 69e79fbe8be7eb1d4a371d051a2d5cfa2575d81b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 2 Nov 2021 19:50:34 +0900
Subject: [PATCH 0788/2325] fix: remove escaping code for negative integer

It is inconsistent, with negative numbers we get a string. For positive, we get numbers.
---
 system/Database/BaseConnection.php        |  4 ----
 tests/system/Database/BaseQueryTest.php   | 14 ++++++++++++++
 tests/system/Database/Live/EscapeTest.php |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 6902490dea1c..44654e4423a0 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -1202,10 +1202,6 @@ public function escape($str)
             return ($str === false) ? 0 : 1;
         }
 
-        if (is_numeric($str) && $str < 0) {
-            return "{$str}";
-        }
-
         return $str ?? 'NULL';
     }
 
diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php
index a279e01dd444..d7fe4bca2819 100644
--- a/tests/system/Database/BaseQueryTest.php
+++ b/tests/system/Database/BaseQueryTest.php
@@ -363,6 +363,20 @@ public function testSetQueryBindsWithSetEscapeNegativeIntegers()
         $this->assertSame($expected, $query->getQuery());
     }
 
+    public function testSetQueryNamedBindsWithNegativeIntegers()
+    {
+        $query = new Query($this->db);
+
+        $query->setQuery(
+            'SELECT * FROM product WHERE date_pickup < DateAdd(month, :num:, Convert(date, GetDate())',
+            ['num' => -6]
+        );
+
+        $expected = 'SELECT * FROM product WHERE date_pickup < DateAdd(month, -6, Convert(date, GetDate())';
+
+        $this->assertSame($expected, $query->getQuery());
+    }
+
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/2762
      */
diff --git a/tests/system/Database/Live/EscapeTest.php b/tests/system/Database/Live/EscapeTest.php
index 9099115e45d0..f0586fd820cb 100644
--- a/tests/system/Database/Live/EscapeTest.php
+++ b/tests/system/Database/Live/EscapeTest.php
@@ -40,7 +40,7 @@ protected function setUp(): void
      */
     public function testEscapeProtectsNegativeNumbers()
     {
-        $this->assertSame('-100', $this->db->escape(-100));
+        $this->assertSame(-100, $this->db->escape(-100));
     }
 
     public function testEscape()

From 127b9cf9a373be3eaf10af27cabbde96d00bebf0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 20 Nov 2021 15:41:11 +0900
Subject: [PATCH 0789/2325] test: fix test method name

---
 tests/system/Database/Live/EscapeTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/Database/Live/EscapeTest.php b/tests/system/Database/Live/EscapeTest.php
index f0586fd820cb..1260badcee77 100644
--- a/tests/system/Database/Live/EscapeTest.php
+++ b/tests/system/Database/Live/EscapeTest.php
@@ -38,7 +38,7 @@ protected function setUp(): void
      *
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/606
      */
-    public function testEscapeProtectsNegativeNumbers()
+    public function testDoesNotEscapeNegativeNumbers()
     {
         $this->assertSame(-100, $this->db->escape(-100));
     }

From 955100eb01c99823d24e1a3e78641f6e338e2616 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 21 Nov 2021 09:52:19 +0900
Subject: [PATCH 0790/2325] refactor: use ??

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 system/HTTP/Files/UploadedFile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
index 42bb9891f90b..b9a672921b94 100644
--- a/system/HTTP/Files/UploadedFile.php
+++ b/system/HTTP/Files/UploadedFile.php
@@ -144,7 +144,7 @@ public function move(string $targetPath, ?string $name = null, bool $overwrite =
             $this->hasMoved = move_uploaded_file($this->path, $destination);
         } catch (Exception $e) {
             $error   = error_get_last();
-            $message = isset($error['message']) ? strip_tags($error['message']) : '';
+            $message = strip_tags($error['message'] ?? '');
 
             throw HTTPException::forMoveFailed(basename($this->path), $targetPath, $message);
         }

From 5bf3492d74fa1ca85b7b5b3b350990915593ba56 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 21 Nov 2021 09:55:24 +0900
Subject: [PATCH 0791/2325] test: add expectExceptionMessage()

---
 tests/system/HTTP/Files/FileMovingTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php
index c9234a82dc6b..67be3a5a310e 100644
--- a/tests/system/HTTP/Files/FileMovingTest.php
+++ b/tests/system/HTTP/Files/FileMovingTest.php
@@ -322,6 +322,7 @@ public function testFailedMoveBecauseOfFalseReturned()
         move_uploaded_file('', '', false);
 
         $this->expectException(HTTPException::class);
+        $this->expectExceptionMessage('move_uploaded_file() returned false');
 
         $file->move($destination, $file->getName(), false);
     }

From 3a7722c1fd7d1432dcc94d9a4b5a0e0e99ae4646 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 21 Nov 2021 10:08:04 +0900
Subject: [PATCH 0792/2325] test: refactor: remove unneeded variable

---
 tests/system/HTTP/Files/FileMovingTest.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php
index 67be3a5a310e..90ba938de396 100644
--- a/tests/system/HTTP/Files/FileMovingTest.php
+++ b/tests/system/HTTP/Files/FileMovingTest.php
@@ -293,11 +293,9 @@ public function testFailedMoveBecauseOfWarning()
 
     public function testFailedMoveBecauseOfFalseReturned()
     {
-        $finalFilename = 'fileA';
-
         $_FILES = [
             'userfile1' => [
-                'name'     => $finalFilename . '.txt',
+                'name'     => 'fileA.txt',
                 'type'     => 'text/plain',
                 'size'     => 124,
                 'tmp_name' => '/tmp/fileA.txt',

From c0a8005a62df48841c9ffdccabbfedea39662a01 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 21 Nov 2021 10:11:51 +0900
Subject: [PATCH 0793/2325] test: refactor: separate arrange, act, assert code

---
 tests/system/HTTP/Files/FileMovingTest.php | 39 +++++++++-------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php
index 90ba938de396..9eac8e51f1e7 100644
--- a/tests/system/HTTP/Files/FileMovingTest.php
+++ b/tests/system/HTTP/Files/FileMovingTest.php
@@ -55,8 +55,7 @@ protected function tearDown(): void
     public function testMove()
     {
         $finalFilename = 'fileA';
-
-        $_FILES = [
+        $_FILES        = [
             'userfile1' => [
                 'name'     => $finalFilename . '.txt',
                 'type'     => 'text/plain',
@@ -79,7 +78,6 @@ public function testMove()
         $this->assertTrue($collection->hasFile('userfile2'));
 
         $destination = $this->destination;
-
         // Create the destination if not exists
         if (! is_dir($destination)) {
             mkdir($destination, 0777, true);
@@ -97,8 +95,7 @@ public function testMove()
     public function testMoveOverwriting()
     {
         $finalFilename = 'file_with_delimiters_underscore';
-
-        $_FILES = [
+        $_FILES        = [
             'userfile1' => [
                 'name'     => $finalFilename . '.txt',
                 'type'     => 'text/plain',
@@ -129,7 +126,6 @@ public function testMoveOverwriting()
         $this->assertTrue($collection->hasFile('userfile3'));
 
         $destination = $this->destination;
-
         // Create the destination if not exists
         if (! is_dir($destination)) {
             mkdir($destination, 0777, true);
@@ -149,8 +145,7 @@ public function testMoveOverwriting()
     public function testMoved()
     {
         $finalFilename = 'fileA';
-
-        $_FILES = [
+        $_FILES        = [
             'userfile1' => [
                 'name'     => $finalFilename . '.txt',
                 'type'     => 'text/plain',
@@ -165,7 +160,6 @@ public function testMoved()
         $this->assertTrue($collection->hasFile('userfile1'));
 
         $destination = $this->destination;
-
         // Create the destination if not exists
         if (! is_dir($destination)) {
             mkdir($destination, 0777, true);
@@ -175,15 +169,16 @@ public function testMoved()
 
         $this->assertInstanceOf(UploadedFile::class, $file);
         $this->assertFalse($file->hasMoved());
+
         $file->move($destination, $file->getName(), false);
+
         $this->assertTrue($file->hasMoved());
     }
 
     public function testStore()
     {
         $finalFilename = 'fileA';
-
-        $_FILES = [
+        $_FILES        = [
             'userfile1' => [
                 'name'     => $finalFilename . '.txt',
                 'type'     => 'text/plain',
@@ -198,7 +193,6 @@ public function testStore()
         $this->assertTrue($collection->hasFile('userfile1'));
 
         $destination = $this->destination;
-
         // Create the destination if not exists
         if (! is_dir($destination)) {
             mkdir($destination, 0777, true);
@@ -207,15 +201,16 @@ public function testStore()
         $file = $collection->getFile('userfile1');
 
         $this->assertInstanceOf(UploadedFile::class, $file);
+
         $path = $file->store($destination, $file->getName());
+
         $this->assertSame($destination . '/fileA.txt', $path);
     }
 
     public function testAlreadyMoved()
     {
         $finalFilename = 'fileA';
-
-        $_FILES = [
+        $_FILES        = [
             'userfile1' => [
                 'name'     => $finalFilename . '.txt',
                 'type'     => 'text/plain',
@@ -230,7 +225,6 @@ public function testAlreadyMoved()
         $this->assertTrue($collection->hasFile('userfile1'));
 
         $destination = $this->destination;
-
         // Create the destination if not exists
         if (! is_dir($destination)) {
             mkdir($destination, 0777, true);
@@ -257,11 +251,11 @@ public function testInvalidFile()
         ];
 
         $destination = $this->destination;
-
-        $collection = new FileCollection();
-        $file       = $collection->getFile('userfile');
+        $collection  = new FileCollection();
 
         $this->expectException(HTTPException::class);
+
+        $file = $collection->getFile('userfile');
         $file->move($destination, $file->getName(), false);
     }
 
@@ -278,16 +272,16 @@ public function testFailedMoveBecauseOfWarning()
         ];
 
         $destination = $this->destination;
-
         // Create the destination and make it read only
         if (! is_dir($destination)) {
             mkdir($destination, 0400, true);
         }
 
         $collection = new FileCollection();
-        $file       = $collection->getFile('userfile');
 
         $this->expectException(HTTPException::class);
+
+        $file = $collection->getFile('userfile');
         $file->move($destination, $file->getName(), false);
     }
 
@@ -308,20 +302,17 @@ public function testFailedMoveBecauseOfFalseReturned()
         $this->assertTrue($collection->hasFile('userfile1'));
 
         $destination = $this->destination;
-
         // Create the destination if not exists
         if (! is_dir($destination)) {
             mkdir($destination, 0777, true);
         }
-
-        $file = $collection->getFile('userfile1');
-
         // Set the mock's return value to false
         move_uploaded_file('', '', false);
 
         $this->expectException(HTTPException::class);
         $this->expectExceptionMessage('move_uploaded_file() returned false');
 
+        $file = $collection->getFile('userfile1');
         $file->move($destination, $file->getName(), false);
     }
 }

From ae6db974ba58d54b895847e6be4574d2686a3d86 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 21 Nov 2021 10:37:18 +0900
Subject: [PATCH 0794/2325] docs: add about config() preferApp and Registrars

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

diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst
index 91ec5554c955..150ddcfe3f60 100644
--- a/user_guide_src/source/general/modules.rst
+++ b/user_guide_src/source/general/modules.rst
@@ -191,6 +191,11 @@ with the ``new`` command::
 
 Config files are automatically discovered whenever using the **config()** function that is always available.
 
+.. note:: **config()** finds the file in **app/Config/** when there is a class with the same shortname,
+    even if you specify a full qualified class name like ``config(\Acme\Blog\Config\Blog::class)``.
+
+.. note:: Modules that need to override or add to known configurations in **app/Config/** should use :ref:`registrars`.
+
 Migrations
 ==========
 

From 525e2d95fa3e2991ab1cafade96822944b05caaa Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 21 Nov 2021 11:17:01 +0900
Subject: [PATCH 0795/2325] docs: fix page links

Do not use link like "`Feature Testing tools <feature.html>`_".
---
 user_guide_src/source/concepts/security.rst        |  8 ++++----
 user_guide_src/source/concepts/structure.rst       |  2 +-
 user_guide_src/source/incoming/routing.rst         | 10 ++++++----
 user_guide_src/source/installation/upgrade_415.rst |  2 +-
 user_guide_src/source/libraries/curlrequest.rst    |  2 ++
 user_guide_src/source/testing/controllers.rst      |  4 ++--
 user_guide_src/source/testing/feature.rst          |  2 +-
 user_guide_src/source/testing/overview.rst         |  2 +-
 user_guide_src/source/testing/response.rst         |  2 +-
 9 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/user_guide_src/source/concepts/security.rst b/user_guide_src/source/concepts/security.rst
index 63581c9510dd..9bca73026eba 100644
--- a/user_guide_src/source/concepts/security.rst
+++ b/user_guide_src/source/concepts/security.rst
@@ -34,7 +34,7 @@ OWASP recommendations
 CodeIgniter provisions
 ----------------------
 
-- `HTTP library <../incoming/incomingrequest.html>`_ provides for input field filtering & content metadata
+- :doc:`HTTP library <../incoming/incomingrequest>` provides for input field filtering & content metadata
 - Form validation library
 
 *********************************************
@@ -56,7 +56,7 @@ OWASP recommendations
 CodeIgniter provisions
 ----------------------
 
-- `Session <../libraries/sessions.html>`_ library
+- :doc:`Session <../libraries/sessions>` library
 - :doc:`Security </libraries/security>` library provides for CSRF validation
 - Easy to add third party authentication
 
@@ -217,5 +217,5 @@ OWASP recommendations
 CodeIgniter provisions
 ----------------------
 
-- `HTTP library <../incoming/incomingrequest.html>`_ provides for ...
-- `Session <../libraries/sessions.html>`_ library provides flashdata
+- :doc:`HTTP library <../incoming/incomingrequest>` provides for ...
+- :doc:`Session <../libraries/sessions>` library provides flashdata
diff --git a/user_guide_src/source/concepts/structure.rst b/user_guide_src/source/concepts/structure.rst
index 5c94b8542758..561cbb28f97d 100644
--- a/user_guide_src/source/concepts/structure.rst
+++ b/user_guide_src/source/concepts/structure.rst
@@ -84,4 +84,4 @@ Modifying Directory Locations
 If you've relocated any of the main directories, you can change the configuration
 settings inside **app/Config/Paths.php**.
 
-Please read `Managing your Applications <../general/managing_apps.html>`_
+Please read :doc:`Managing your Applications <../general/managing_apps>`.
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 9778307bc4fa..5f18fb4960d8 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -228,7 +228,7 @@ extensive set of routes that all share the opening string, like when building an
 
 This would prefix the 'users' and 'blog" URIs with "admin", handling URLs like ``/admin/users`` and ``/admin/blog``.
 
-If you need to assign options to a group, like a `namespace <#assigning-namespace>`_, do it before the callback::
+If you need to assign options to a group, like a :ref:`assigning-namespace`, do it before the callback::
 
     $routes->group('api', ['namespace' => 'App\API\v1'], function ($routes) {
         $routes->resource('users');
@@ -236,7 +236,7 @@ If you need to assign options to a group, like a `namespace <#assigning-namespac
 
 This would handle a resource route to the ``App\API\v1\Users`` controller with the ``/api/users`` URI.
 
-You can also use a specific `filter <filters.html>`_ for a group of routes. This will always
+You can also use a specific :doc:`filter <filters>` for a group of routes. This will always
 run the filter before or after the controller. This is especially handy during authentication or api logging::
 
     $routes->group('api', ['filter' => 'api-auth'], function ($routes) {
@@ -338,7 +338,7 @@ available from the command line::
 Global Options
 ==============
 
-All of the methods for creating a route (add, get, post, `resource <restful.html>`_ etc) can take an array of options that
+All of the methods for creating a route (add, get, post, :doc:`resource <restful>` etc) can take an array of options that
 can modify the generated routes, or further restrict them. The ``$options`` array is always the last parameter::
 
     $routes->add('from', 'to', $options);
@@ -363,7 +363,7 @@ The value for the filter can be a string or an array of strings:
 * matching the aliases defined in **app/Config/Filters.php**.
 * filter classnames
 
-See `Controller filters <filters.html>`_ for more information on setting up filters.
+See :doc:`Controller filters <filters>` for more information on setting up filters.
 
 .. Warning:: If you set filters to routes in **app/Config/Routes.php**
     (not in **app/Config/Filters.php**), it is recommended to disable auto-routing.
@@ -396,6 +396,8 @@ You specify an array for the filter value::
 
     $routes->add('admin',' AdminController::index', ['filter' => ['admin-auth', \App\Filters\SomeFilter::class]]);
 
+.. _assigning-namespace:
+
 Assigning Namespace
 -------------------
 
diff --git a/user_guide_src/source/installation/upgrade_415.rst b/user_guide_src/source/installation/upgrade_415.rst
index 3f7c7226ea0b..c7b885efa40a 100644
--- a/user_guide_src/source/installation/upgrade_415.rst
+++ b/user_guide_src/source/installation/upgrade_415.rst
@@ -59,7 +59,7 @@ CURLRequest header change
 In the previous version, if you didn't provide your own headers, ``CURLRequest`` would send the request-headers from the browser.
 The bug was fixed. If your requests depend on the headers, your requests might fail after upgrading.
 In this case, add the necessary headers manually.
-See `CURLRequest Class <../libraries/curlrequest.html#headers>`_ for how to add.
+See :ref:`CURLRequest Class <curlrequest-request-options-headers>` for how to add.
 
 Query Builder changes
 ---------------------
diff --git a/user_guide_src/source/libraries/curlrequest.rst b/user_guide_src/source/libraries/curlrequest.rst
index 0074523d79fd..e7163133d5bc 100644
--- a/user_guide_src/source/libraries/curlrequest.rst
+++ b/user_guide_src/source/libraries/curlrequest.rst
@@ -299,6 +299,8 @@ if it's not already set::
         Use ``form_params`` for ``application/x-www-form-urlencoded`` request, and ``multipart`` for ``multipart/form-data``
         requests.
 
+.. _curlrequest-request-options-headers:
+
 headers
 =======
 
diff --git a/user_guide_src/source/testing/controllers.rst b/user_guide_src/source/testing/controllers.rst
index 1f16cd615fc2..d5dd2d379b8b 100644
--- a/user_guide_src/source/testing/controllers.rst
+++ b/user_guide_src/source/testing/controllers.rst
@@ -4,7 +4,7 @@ Testing Controllers
 
 Testing your controllers is made convenient with a couple of new helper classes and traits. When testing controllers,
 you can execute the code within a controller, without first running through the entire application bootstrap process.
-Often times, using the `Feature Testing tools <feature.html>`_ will be simpler, but this functionality is here in
+Often times, using the :doc:`Feature Testing tools <feature>` will be simpler, but this functionality is here in
 case you need it.
 
 .. note:: Because the entire framework has not been bootstrapped, there will be times when you cannot test a controller
@@ -161,7 +161,7 @@ you need to set a JSON value as the body. The only parameter is a string that re
 Checking the Response
 =====================
 
-``ControllerTestTrait::execute()`` returns an instance of a ``TestResponse``. See `Testing Responses <response.html>`_ on
+``ControllerTestTrait::execute()`` returns an instance of a ``TestResponse``. See :doc:`Testing Responses <response>` on
 how to use this class to perform additional assertions and verification in your test cases.
 
 Filter Testing
diff --git a/user_guide_src/source/testing/feature.rst b/user_guide_src/source/testing/feature.rst
index 79d0b9d51c76..2a9eb96a348a 100644
--- a/user_guide_src/source/testing/feature.rst
+++ b/user_guide_src/source/testing/feature.rst
@@ -157,5 +157,5 @@ the Content-Type header for you so if you need that, you can set it with the ``w
 Checking the Response
 =====================
 
-``FeatureTestTrait::call()`` returns an instance of a ``TestResponse``. See `Testing Responses <response.html>`_ on
+``FeatureTestTrait::call()`` returns an instance of a ``TestResponse``. See :doc:`Testing Responses <response>` on
 how to use this class to perform additional assertions and verification in your test cases.
diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst
index 0a16a07b34ac..7cfcdcb69d54 100644
--- a/user_guide_src/source/testing/overview.rst
+++ b/user_guide_src/source/testing/overview.rst
@@ -103,7 +103,7 @@ have the correct namespace relative to ``App``.
 
 .. note:: Namespaces are not strictly required for test classes, but they are helpful to ensure no class names collide.
 
-When testing database results, you must use the `DatabaseTestTrait <database.html>`_ in your class.
+When testing database results, you must use the :doc:`DatabaseTestTrait <database>` in your class.
 
 Staging
 -------
diff --git a/user_guide_src/source/testing/response.rst b/user_guide_src/source/testing/response.rst
index c5f7d9c34fbe..db709e415fff 100644
--- a/user_guide_src/source/testing/response.rst
+++ b/user_guide_src/source/testing/response.rst
@@ -4,7 +4,7 @@ Testing Responses
 
 The ``TestResponse`` class provides a number of helpful functions for parsing and testing responses
 from your test cases. Usually a ``TestResponse`` will be provided for you as a result of your
-`Controller Tests <controllers.html>`_ or `HTTP Feature Tests <feature.html>`_, but you can always
+:doc:`Controller Tests <controllers>` or :doc:`HTTP Feature Tests <feature>`, but you can always
 create your own directly using any ``ResponseInterface``::
 
     $result = new \CodeIgniter\Test\TestResponse($response);

From c057adea785539ede98f7ecb2220078e132a25e2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 21 Nov 2021 11:20:00 +0900
Subject: [PATCH 0796/2325] docs: update external URLs

---
 user_guide_src/source/installation/installing_manual.rst | 2 +-
 user_guide_src/source/testing/overview.rst               | 4 ++--
 user_guide_src/source/testing/response.rst               | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/installation/installing_manual.rst b/user_guide_src/source/installation/installing_manual.rst
index 1224e84d2830..c64f7dc5b212 100644
--- a/user_guide_src/source/installation/installing_manual.rst
+++ b/user_guide_src/source/installation/installing_manual.rst
@@ -10,7 +10,7 @@ will be your public-facing document root. Do not change anything inside the ``sy
 folder!
 
 .. note:: This is the installation technique closest to that described
-   for `CodeIgniter 3 <https://codeigniter.com/user_guide/installation/index.html>`_.
+   for `CodeIgniter 3 <https://codeigniter.com/userguide3/installation/index.html>`_.
 
 Installation
 ============
diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst
index 7cfcdcb69d54..4b4cdce7beed 100644
--- a/user_guide_src/source/testing/overview.rst
+++ b/user_guide_src/source/testing/overview.rst
@@ -216,7 +216,7 @@ Ensure that a header or cookie was actually emitted::
     $this->assertHeaderEmitted("Set-Cookie: foo=bar");
 
 Note: the test case with this should be `run as a separate process
-in PHPunit <https://phpunit.readthedocs.io/en/7.4/annotations.html#runinseparateprocess>`_.
+in PHPunit <https://phpunit.readthedocs.io/en/9.5/annotations.html#runinseparateprocess>`_.
 
 **assertHeaderNotEmitted($header, $ignoreCase = false)**
 
@@ -231,7 +231,7 @@ Ensure that a header or cookie was not emitted::
     $this->assertHeaderNotEmitted("Set-Cookie: banana");
 
 Note: the test case with this should be `run as a separate process
-in PHPunit <https://phpunit.readthedocs.io/en/7.4/annotations.html#runinseparateprocess>`_.
+in PHPunit <https://phpunit.readthedocs.io/en/9.5/annotations.html#runinseparateprocess>`_.
 
 **assertCloseEnough($expected, $actual, $message = '', $tolerance = 1)**
 
diff --git a/user_guide_src/source/testing/response.rst b/user_guide_src/source/testing/response.rst
index db709e415fff..6c22e7e9cbdb 100644
--- a/user_guide_src/source/testing/response.rst
+++ b/user_guide_src/source/testing/response.rst
@@ -10,6 +10,10 @@ create your own directly using any ``ResponseInterface``::
     $result = new \CodeIgniter\Test\TestResponse($response);
     $result->assertOK();
 
+.. contents::
+    :local:
+    :depth: 2
+
 Testing the Response
 ====================
 

From c802bd88c5a979a04e08288cd4869614fe4b156c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 21 Nov 2021 17:20:39 +0900
Subject: [PATCH 0797/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/general/modules.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst
index 150ddcfe3f60..c9a5607df1f2 100644
--- a/user_guide_src/source/general/modules.rst
+++ b/user_guide_src/source/general/modules.rst
@@ -192,7 +192,7 @@ with the ``new`` command::
 Config files are automatically discovered whenever using the **config()** function that is always available.
 
 .. note:: **config()** finds the file in **app/Config/** when there is a class with the same shortname,
-    even if you specify a full qualified class name like ``config(\Acme\Blog\Config\Blog::class)``.
+    even if you specify a fully qualified class name like ``config(\Acme\Blog\Config\Blog::class)``.
 
 .. note:: Modules that need to override or add to known configurations in **app/Config/** should use :ref:`registrars`.
 

From b367e05a3f37db4377efd5ae576e2f9e6a772256 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 21 Nov 2021 19:37:47 +0900
Subject: [PATCH 0798/2325] fix: unexpected array structure causes Type Error

Fixes #5369
---
 system/Helpers/array_helper.php          |  4 ++++
 tests/system/Helpers/ArrayHelperTest.php | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php
index a06d4bb96c6e..423f9c266dd5 100644
--- a/system/Helpers/array_helper.php
+++ b/system/Helpers/array_helper.php
@@ -53,6 +53,10 @@ function _array_search_dot(array $indexes, array $array)
             $answer = [];
 
             foreach ($array as $value) {
+                if (! is_array($value)) {
+                    return null;
+                }
+
                 $answer[] = _array_search_dot($indexes, $value);
             }
 
diff --git a/tests/system/Helpers/ArrayHelperTest.php b/tests/system/Helpers/ArrayHelperTest.php
index f6ae751e1bda..68941d670ce9 100644
--- a/tests/system/Helpers/ArrayHelperTest.php
+++ b/tests/system/Helpers/ArrayHelperTest.php
@@ -46,6 +46,18 @@ public function testArrayDotTooManyLevels()
         $this->assertSame(23, dot_array_search('foo.bar.baz', $data));
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5369
+     */
+    public function testArrayDotValueIsListArray()
+    {
+        $data = [
+            'arr' => [1, 2, 3],
+        ];
+
+        $this->assertNull(dot_array_search('arr.*.index', $data));
+    }
+
     public function testArrayDotEscape()
     {
         $data = [

From a2fc131e2c60605c801fb0886620361056b77e6e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 22 Nov 2021 09:09:02 +0900
Subject: [PATCH 0799/2325] docs: add more explanation and link

---
 user_guide_src/source/concepts/factories.rst | 2 ++
 user_guide_src/source/general/modules.rst    | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst
index 2c5c9ea84c3d..96bf0e39a4a5 100644
--- a/user_guide_src/source/concepts/factories.rst
+++ b/user_guide_src/source/concepts/factories.rst
@@ -58,6 +58,8 @@ to access user records always go through that connection::
 Now any time the ``UserModel`` is loaded from ``Factories`` it will in fact be returning a
 class instance that uses the alternate database connection.
 
+.. _factories-options:
+
 Factories Options
 ==================
 
diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst
index c9a5607df1f2..85a1d4ae82f8 100644
--- a/user_guide_src/source/general/modules.rst
+++ b/user_guide_src/source/general/modules.rst
@@ -191,10 +191,12 @@ with the ``new`` command::
 
 Config files are automatically discovered whenever using the **config()** function that is always available.
 
+.. note:: We don't recommend you use the same short classname in modules.
+    Modules that need to override or add to known configurations in **app/Config/** should use :ref:`registrars`.
+
 .. note:: **config()** finds the file in **app/Config/** when there is a class with the same shortname,
     even if you specify a fully qualified class name like ``config(\Acme\Blog\Config\Blog::class)``.
-
-.. note:: Modules that need to override or add to known configurations in **app/Config/** should use :ref:`registrars`.
+    This is because ``Factories``'s the default configuration. See :ref:`factories-options` for more information.
 
 Migrations
 ==========

From 2c668d4e7552e95f43b9ab03668be8a04e06a77a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 22 Nov 2021 09:09:52 +0900
Subject: [PATCH 0800/2325] docs: shorten the width of the table

It is too long and difficult to see.
---
 user_guide_src/source/concepts/factories.rst | 22 ++++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst
index 96bf0e39a4a5..978c6bc26fe9 100644
--- a/user_guide_src/source/concepts/factories.rst
+++ b/user_guide_src/source/concepts/factories.rst
@@ -67,15 +67,19 @@ The default behavior might not work for every component. For example, say your c
 name and its path do not align, or you need to limit instances to a certain type of class.
 Each component takes a set of options to direct discovery and instantiation.
 
-========== ============== ==================================================================================================================== ===================================================
-Key        Type           Description                                                                                                          Default
-========== ============== ==================================================================================================================== ===================================================
-component  string or null The name of the component (if different than the static method). This can be used to alias one component to another. ``null`` (defaults to the component name)
-path       string or null The relative path within the namespace/folder to look for classes.                                                   ``null`` (defaults to the component name)
-instanceOf string or null A required class name to match on the returned instance.                                                             ``null`` (no filtering)
-getShared  boolean        Whether to return a shared instance of the class or load a fresh one.                                                ``true``
-preferApp  boolean        Whether a class with the same basename in the App namespace overrides other explicit class requests.                 ``true``
-========== ============== ==================================================================================================================== ===================================================
+========== ============== ============================================================ ===================================================
+Key        Type           Description                                                  Default
+========== ============== ============================================================ ===================================================
+component  string or null The name of the component (if different than the static      ``null`` (defaults to the component name)
+                          method). This can be used to alias one component to another.
+path       string or null The relative path within the namespace/folder to look for    ``null`` (defaults to the component name)
+                          classes.
+instanceOf string or null A required class name to match on the returned instance.     ``null`` (no filtering)
+getShared  boolean        Whether to return a shared instance of the class or load a   ``true``
+                          fresh one.
+preferApp  boolean        Whether a class with the same basename in the App namespace  ``true``
+                          overrides other explicit class requests.
+========== ============== ============================================================ ===================================================
 
 Factories Behavior
 ==================

From cb64680cd30a6b9764e435c62682aae52eb8186a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 22 Nov 2021 10:41:26 +0900
Subject: [PATCH 0801/2325] docs: replace blogview with blog_view

We use snake_case view filename, e.g. welcome_message, error_404.
---
 user_guide_src/source/outgoing/views.rst | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst
index b01466ce40da..604f38731e85 100644
--- a/user_guide_src/source/outgoing/views.rst
+++ b/user_guide_src/source/outgoing/views.rst
@@ -19,7 +19,7 @@ Using the example controller you created in the controller page, let’s add a v
 Creating a View
 ===============
 
-Using your text editor, create a file called ``blogview.php`` and put this in it::
+Using your text editor, create a file called ``blog_view.php`` and put this in it::
 
     <html>
         <head>
@@ -53,7 +53,7 @@ Now, open the controller file you made earlier called ``Blog.php``, and replace
     {
         public function index()
         {
-            echo view('blogview');
+            echo view('blog_view');
         }
     }
 
@@ -109,9 +109,9 @@ to package your views together in a module-like fashion for easy re-use or distr
 
 If you have ``Blog`` directory that has a PSR-4 mapping set up in the :doc:`Autoloader </concepts/autoloader>` living
 under the namespace ``Example\Blog``, you could retrieve view files as if they were namespaced also. Following this
-example, you could load the **blogview.php** file from **Blog/Views** by prepending the namespace to the view name::
+example, you could load the **blog_view.php** file from **Blog/Views** by prepending the namespace to the view name::
 
-    echo view('Example\Blog\Views\blogview');
+    echo view('Example\Blog\Views\blog_view');
 
 Caching Views
 =============
@@ -140,7 +140,7 @@ Here's an example::
         'message' => 'My Message',
     ];
 
-    echo view('blogview', $data);
+    echo view('blog_view', $data);
 
 Let's try it with your controller file. Open it and add this code::
 
@@ -155,7 +155,7 @@ Let's try it with your controller file. Open it and add this code::
             $data['title']   = "My Real Title";
             $data['heading'] = "My Real Heading";
 
-            echo view('blogview', $data);
+            echo view('blog_view', $data);
         }
     }
 
@@ -184,7 +184,7 @@ into the `$option` array in the third parameter.
         'message' => 'My Message',
     ];
 
-    echo view('blogview', $data, ['saveData' => true]);
+    echo view('blog_view', $data, ['saveData' => true]);
 
 Additionally, if you would like the default functionality of the view function to be that it does save the data
 between calls, you can set ``$saveData`` to **true** in **app/Config/Views.php**.
@@ -212,7 +212,7 @@ Here’s a simple example. Add this to your controller::
                 'heading'   => 'My Real Heading',
             ];
 
-            echo view('blogview', $data);
+            echo view('blog_view', $data);
         }
     }
 

From 7d15138f7d79eb21898ddd7b3ec06591d82b1c5c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 22 Nov 2021 10:50:48 +0900
Subject: [PATCH 0802/2325] docs: fix namespace directory explanation

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

diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst
index 604f38731e85..533e3c9bead5 100644
--- a/user_guide_src/source/outgoing/views.rst
+++ b/user_guide_src/source/outgoing/views.rst
@@ -107,9 +107,9 @@ You can store views under a **View** directory that is namespaced, and load that
 PHP does not support loading non-class files from a namespace, CodeIgniter provides this feature to make it possible
 to package your views together in a module-like fashion for easy re-use or distribution.
 
-If you have ``Blog`` directory that has a PSR-4 mapping set up in the :doc:`Autoloader </concepts/autoloader>` living
+If you have ``example/blog`` directory that has a PSR-4 mapping set up in the :doc:`Autoloader </concepts/autoloader>` living
 under the namespace ``Example\Blog``, you could retrieve view files as if they were namespaced also. Following this
-example, you could load the **blog_view.php** file from **Blog/Views** by prepending the namespace to the view name::
+example, you could load the **blog_view.php** file from **example/blog/Views** by prepending the namespace to the view name::
 
     echo view('Example\Blog\Views\blog_view');
 

From 29047e92d7dcb02300ac258e039470ffe98e48d2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 18 Nov 2021 16:58:51 +0900
Subject: [PATCH 0803/2325] chore: add script to add "Edit this page" button in
 User Guide

---
 user_guide_src/add-edit-this-page | 62 +++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100755 user_guide_src/add-edit-this-page

diff --git a/user_guide_src/add-edit-this-page b/user_guide_src/add-edit-this-page
new file mode 100755
index 000000000000..cb036524369d
--- /dev/null
+++ b/user_guide_src/add-edit-this-page
@@ -0,0 +1,62 @@
+#!/usr/bin/env php
+<?php declare(strict_types=1);
+
+if ($argc === 1) {
+    echo 'Usage: ' . $argv[0] . ' <html-dir>' . PHP_EOL;
+    echo '  e.g: ' . $argv[0] . ' user_guide_src/build/html/' . PHP_EOL;
+
+    exit(1);
+}
+
+$dir = realpath($argv[1]);
+
+if ($dir === false || ! is_dir($dir)) {
+    throw new RuntimeException('Cannot find directory: ' . $dir);
+}
+
+$iterator = new RecursiveIteratorIterator(
+    new RecursiveDirectoryIterator(
+        $dir,
+        FilesystemIterator::CURRENT_AS_FILEINFO |
+        FilesystemIterator::KEY_AS_PATHNAME |
+        FilesystemIterator::SKIP_DOTS
+    )
+);
+
+$files = new RegexIterator(
+    $iterator,
+    '/\A.+\.html\z/',
+    RecursiveRegexIterator::MATCH
+);
+
+foreach ($files as $filePath => $fileInfo) {
+    echo 'processing... ' . PHP_EOL;
+
+    $uriPath    = str_replace('.html', '.rst', str_replace($dir, '', $filePath));
+    $gitHubLink = '<a class="btn btn-neutral float-right" href="https://github.com/codeigniter4/CodeIgniter4/edit/develop/user_guide_src/source'
+        . $uriPath . '">Edit this page</a>';
+
+    $content = file_get_contents($filePath);
+
+    $pattern = '!">Edit this page</a>!u';
+    if (preg_match($pattern, $content) === 1) {
+        // Move the cursor up 1 line
+        echo "\033[1A";
+        echo 'skip: ' . $filePath . PHP_EOL;
+
+        continue;
+    }
+
+    $pattern = '/<div role="navigation" aria-label="breadcrumbs navigation">/u';
+    $content = preg_replace(
+        $pattern,
+        $gitHubLink . PHP_EOL . '<div role="navigation" aria-label="breadcrumbs navigation">',
+        $content
+    );
+
+    file_put_contents($filePath, $content, LOCK_EX);
+
+    // Move the cursor up 1 line
+    echo "\033[1A";
+    echo 'done: ' . $filePath . PHP_EOL;
+}

From 414ca7718ac0525de86095a4fed8d0f143b40806 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Oct 2021 14:23:49 +0900
Subject: [PATCH 0804/2325] feat: add controller filter to check invalid chars
 in user input

---
 system/Filters/InvalidChars.php           | 120 ++++++++++++++++
 tests/system/Filters/InvalidCharsTest.php | 158 ++++++++++++++++++++++
 2 files changed, 278 insertions(+)
 create mode 100644 system/Filters/InvalidChars.php
 create mode 100644 tests/system/Filters/InvalidCharsTest.php

diff --git a/system/Filters/InvalidChars.php b/system/Filters/InvalidChars.php
new file mode 100644
index 000000000000..34368b0c5380
--- /dev/null
+++ b/system/Filters/InvalidChars.php
@@ -0,0 +1,120 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Filters;
+
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use RuntimeException;
+
+/**
+ * InvalidChars filter.
+ *
+ * Check if user input data ($_GET, $_POST, $_COOKIE, php://input) do not contain
+ * invalid characters:
+ *   - invalid UTF-8 characters
+ *   - control characters except line break and tab code
+ */
+class InvalidChars implements FilterInterface
+{
+    /**
+     * Data source
+     *
+     * @var string
+     */
+    protected $source;
+
+    /**
+     * Check invalid characters.
+     *
+     * @param array|null $arguments
+     *
+     * @return void
+     */
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        if ($request->isCLI()) {
+            return;
+        }
+
+        $data = [
+            'get'      => $request->getGet(),
+            'post'     => $request->getPost(),
+            'cookie'   => $request->getCookie(),
+            'rawInput' => $request->getRawInput(),
+        ];
+
+        foreach ($data as $source => $values) {
+            $this->source = $source;
+            $this->checkEncoding($values);
+            $this->checkControl($values);
+        }
+    }
+
+    /**
+     * We don't have anything to do here.
+     *
+     * @param array|null $arguments
+     *
+     * @return void
+     */
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+    }
+
+    /**
+     * Check the character encoding is valid UTF-8.
+     *
+     * @param array|string $value
+     *
+     * @return array|string
+     */
+    protected function checkEncoding($value)
+    {
+        if (is_array($value)) {
+            array_map([$this, 'checkEncoding'], $value);
+
+            return $value;
+        }
+
+        if (mb_check_encoding($value, 'UTF-8')) {
+            return $value;
+        }
+
+        throw new RuntimeException(
+            'Invalid UTF-8 characters in ' . $this->source . ': ' . $value
+        );
+    }
+
+    /**
+     * Check for the presence of control characters except line breaks and tabs.
+     *
+     * @param array|string $value
+     *
+     * @return array|string
+     */
+    protected function checkControl($value)
+    {
+        if (is_array($value)) {
+            array_map([$this, 'checkControl'], $value);
+
+            return $value;
+        }
+
+        if (preg_match('/\A[\r\n\t[:^cntrl:]]*\z/u', $value) === 1) {
+            return $value;
+        }
+
+        throw new RuntimeException(
+            'Invalid Control characters in ' . $this->source . ': ' . $value
+        );
+    }
+}
diff --git a/tests/system/Filters/InvalidCharsTest.php b/tests/system/Filters/InvalidCharsTest.php
new file mode 100644
index 000000000000..85048f1a0df8
--- /dev/null
+++ b/tests/system/Filters/InvalidCharsTest.php
@@ -0,0 +1,158 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Filters;
+
+use CodeIgniter\HTTP\CLIRequest;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\UserAgent;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\Mock\MockAppConfig;
+use RuntimeException;
+
+/**
+ * @internal
+ */
+final class InvalidCharsTest extends CIUnitTestCase
+{
+    /**
+     * @var InvalidChars
+     */
+    private $invalidChars;
+
+    /**
+     * @var IncomingRequest
+     */
+    private $request;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $_GET    = [];
+        $_POST   = [];
+        $_COOKIE = [];
+
+        $this->request      = $this->createRequest();
+        $this->invalidChars = new InvalidChars();
+    }
+
+    private function createRequest(): IncomingRequest
+    {
+        $config    = new MockAppConfig();
+        $uri       = new URI();
+        $userAgent = new UserAgent();
+        $request   = $this->getMockBuilder(IncomingRequest::class)
+            ->setConstructorArgs([$config, $uri, null, $userAgent])
+            ->onlyMethods(['isCLI'])
+            ->getMock();
+        $request->method('isCLI')->willReturn(false);
+
+        return $request;
+    }
+
+    public function testBeforeDoNothingWhenCLIRequest()
+    {
+        $cliRequest = new CLIRequest(new MockAppConfig());
+
+        $ret = $this->invalidChars->before($cliRequest);
+
+        $this->assertNull($ret);
+    }
+
+    public function testBeforeValidString()
+    {
+        $_POST['val'] = [
+            'valid string',
+        ];
+        $_COOKIE['val'] = 'valid string';
+
+        $ret = $this->invalidChars->before($this->request);
+
+        $this->assertNull($ret);
+    }
+
+    public function testBeforeInvalidUTF8StringCausesException()
+    {
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('Invalid UTF-8 characters in post:');
+
+        $sjisString   = mb_convert_encoding('SJISの文字列です。', 'SJIS');
+        $_POST['val'] = [
+            'valid string',
+            $sjisString,
+        ];
+
+        $this->invalidChars->before($this->request);
+    }
+
+    public function testBeforeInvalidControllCharCausesException()
+    {
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('Invalid Control characters in cookie:');
+
+        $stringWithNullChar = "String contains null char and line break.\0\n";
+        $_COOKIE['val']     = $stringWithNullChar;
+
+        $this->invalidChars->before($this->request);
+    }
+
+    /**
+     * @dataProvider stringWithLineBreakAndTabProvider
+     *
+     * @param string $input
+     */
+    public function testCheckControlStringWithLineBreakAndTabReturnsTheString($input)
+    {
+        $_GET['val'] = $input;
+
+        $ret = $this->invalidChars->before($this->request);
+
+        $this->assertNull($ret);
+    }
+
+    public function stringWithLineBreakAndTabProvider()
+    {
+        return [
+            ["String contains \n line break."],
+            ["String contains \r line break."],
+            ["String contains \r\n line break."],
+            ["String contains \t tab."],
+            ["String contains \t and \r line \n break."],
+        ];
+    }
+
+    /**
+     * @dataProvider stringWithControlCharsProvider
+     *
+     * @param string $input
+     */
+    public function testCheckControlStringWithControlCharsCausesException($input)
+    {
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('Invalid Control characters in get:');
+
+        $_GET['val'] = $input;
+
+        $ret = $this->invalidChars->before($this->request);
+
+        $this->assertNull($ret);
+    }
+
+    public function stringWithControlCharsProvider()
+    {
+        return [
+            ["String contains null char.\0"],
+            ["String contains null char and line break.\0\n"],
+        ];
+    }
+}

From 9a67840c43dcc97c8d3123f619fbbe6450d3d752 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Oct 2021 17:06:51 +0900
Subject: [PATCH 0805/2325] test: clear super globals after testing

The following test failed. It depends global state.
1) CodeIgniter\HTTP\ResponseTest::testSetLink
Failed asserting that two strings are identical.
---
 tests/system/Filters/InvalidCharsTest.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/system/Filters/InvalidCharsTest.php b/tests/system/Filters/InvalidCharsTest.php
index 85048f1a0df8..3346b1adad18 100644
--- a/tests/system/Filters/InvalidCharsTest.php
+++ b/tests/system/Filters/InvalidCharsTest.php
@@ -46,6 +46,15 @@ protected function setUp(): void
         $this->invalidChars = new InvalidChars();
     }
 
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        $_GET    = [];
+        $_POST   = [];
+        $_COOKIE = [];
+    }
+
     private function createRequest(): IncomingRequest
     {
         $config    = new MockAppConfig();

From 1e3a30cb6709634e4147a16f9326574b53df3a79 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Nov 2021 11:37:39 +0900
Subject: [PATCH 0806/2325] feat: add SecurityException static consructors

---
 system/Filters/InvalidChars.php                  | 10 +++-------
 system/Security/Exceptions/SecurityException.php | 16 ++++++++++++++++
 tests/system/Filters/InvalidCharsTest.php        |  8 ++++----
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/system/Filters/InvalidChars.php b/system/Filters/InvalidChars.php
index 34368b0c5380..ab5a2fef9ca4 100644
--- a/system/Filters/InvalidChars.php
+++ b/system/Filters/InvalidChars.php
@@ -13,7 +13,7 @@
 
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
-use RuntimeException;
+use CodeIgniter\Security\Exceptions\SecurityException;
 
 /**
  * InvalidChars filter.
@@ -89,9 +89,7 @@ protected function checkEncoding($value)
             return $value;
         }
 
-        throw new RuntimeException(
-            'Invalid UTF-8 characters in ' . $this->source . ': ' . $value
-        );
+        throw SecurityException::forInvalidUTF8Chars($this->source, $value);
     }
 
     /**
@@ -113,8 +111,6 @@ protected function checkControl($value)
             return $value;
         }
 
-        throw new RuntimeException(
-            'Invalid Control characters in ' . $this->source . ': ' . $value
-        );
+        throw SecurityException::forInvalidControlChars($this->source, $value);
     }
 }
diff --git a/system/Security/Exceptions/SecurityException.php b/system/Security/Exceptions/SecurityException.php
index 254f3ec345f5..ed118d95d5dd 100644
--- a/system/Security/Exceptions/SecurityException.php
+++ b/system/Security/Exceptions/SecurityException.php
@@ -20,6 +20,22 @@ public static function forDisallowedAction()
         return new static(lang('Security.disallowedAction'), 403);
     }
 
+    public static function forInvalidUTF8Chars(string $source, string $string)
+    {
+        return new static(
+            'Invalid UTF-8 characters in ' . $source . ': ' . $string,
+            400
+        );
+    }
+
+    public static function forInvalidControlChars(string $source, string $string)
+    {
+        return new static(
+            'Invalid Control characters in ' . $source . ': ' . $string,
+            400
+        );
+    }
+
     /**
      * @deprecated Use `CookieException::forInvalidSameSite()` instead.
      *
diff --git a/tests/system/Filters/InvalidCharsTest.php b/tests/system/Filters/InvalidCharsTest.php
index 3346b1adad18..85fa6b91425a 100644
--- a/tests/system/Filters/InvalidCharsTest.php
+++ b/tests/system/Filters/InvalidCharsTest.php
@@ -15,9 +15,9 @@
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\HTTP\UserAgent;
+use CodeIgniter\Security\Exceptions\SecurityException;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockAppConfig;
-use RuntimeException;
 
 /**
  * @internal
@@ -92,7 +92,7 @@ public function testBeforeValidString()
 
     public function testBeforeInvalidUTF8StringCausesException()
     {
-        $this->expectException(RuntimeException::class);
+        $this->expectException(SecurityException::class);
         $this->expectExceptionMessage('Invalid UTF-8 characters in post:');
 
         $sjisString   = mb_convert_encoding('SJISの文字列です。', 'SJIS');
@@ -106,7 +106,7 @@ public function testBeforeInvalidUTF8StringCausesException()
 
     public function testBeforeInvalidControllCharCausesException()
     {
-        $this->expectException(RuntimeException::class);
+        $this->expectException(SecurityException::class);
         $this->expectExceptionMessage('Invalid Control characters in cookie:');
 
         $stringWithNullChar = "String contains null char and line break.\0\n";
@@ -147,7 +147,7 @@ public function stringWithLineBreakAndTabProvider()
      */
     public function testCheckControlStringWithControlCharsCausesException($input)
     {
-        $this->expectException(RuntimeException::class);
+        $this->expectException(SecurityException::class);
         $this->expectExceptionMessage('Invalid Control characters in get:');
 
         $_GET['val'] = $input;

From 991f9537bf41d58a232e1eb749b9d4dd904007a4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 5 Nov 2021 11:39:01 +0900
Subject: [PATCH 0807/2325] test: fix test code

---
 tests/system/Filters/InvalidCharsTest.php | 26 +++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/system/Filters/InvalidCharsTest.php b/tests/system/Filters/InvalidCharsTest.php
index 85fa6b91425a..95725de07323 100644
--- a/tests/system/Filters/InvalidCharsTest.php
+++ b/tests/system/Filters/InvalidCharsTest.php
@@ -69,15 +69,19 @@ private function createRequest(): IncomingRequest
         return $request;
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testBeforeDoNothingWhenCLIRequest()
     {
         $cliRequest = new CLIRequest(new MockAppConfig());
 
-        $ret = $this->invalidChars->before($cliRequest);
-
-        $this->assertNull($ret);
+        $this->invalidChars->before($cliRequest);
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testBeforeValidString()
     {
         $_POST['val'] = [
@@ -85,9 +89,7 @@ public function testBeforeValidString()
         ];
         $_COOKIE['val'] = 'valid string';
 
-        $ret = $this->invalidChars->before($this->request);
-
-        $this->assertNull($ret);
+        $this->invalidChars->before($this->request);
     }
 
     public function testBeforeInvalidUTF8StringCausesException()
@@ -104,7 +106,7 @@ public function testBeforeInvalidUTF8StringCausesException()
         $this->invalidChars->before($this->request);
     }
 
-    public function testBeforeInvalidControllCharCausesException()
+    public function testBeforeInvalidControlCharCausesException()
     {
         $this->expectException(SecurityException::class);
         $this->expectExceptionMessage('Invalid Control characters in cookie:');
@@ -116,6 +118,8 @@ public function testBeforeInvalidControllCharCausesException()
     }
 
     /**
+     * @doesNotPerformAssertions
+     *
      * @dataProvider stringWithLineBreakAndTabProvider
      *
      * @param string $input
@@ -124,9 +128,7 @@ public function testCheckControlStringWithLineBreakAndTabReturnsTheString($input
     {
         $_GET['val'] = $input;
 
-        $ret = $this->invalidChars->before($this->request);
-
-        $this->assertNull($ret);
+        $this->invalidChars->before($this->request);
     }
 
     public function stringWithLineBreakAndTabProvider()
@@ -152,9 +154,7 @@ public function testCheckControlStringWithControlCharsCausesException($input)
 
         $_GET['val'] = $input;
 
-        $ret = $this->invalidChars->before($this->request);
-
-        $this->assertNull($ret);
+        $this->invalidChars->before($this->request);
     }
 
     public function stringWithControlCharsProvider()

From 871e4996da7c57900df021f5e4a20fe56b818308 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 22 Nov 2021 11:32:22 +0900
Subject: [PATCH 0808/2325] config: add invalidchars to Filter.php as comment

---
 app/Config/Filters.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Config/Filters.php b/app/Config/Filters.php
index df90270a6480..02aaec533c17 100644
--- a/app/Config/Filters.php
+++ b/app/Config/Filters.php
@@ -6,6 +6,7 @@
 use CodeIgniter\Filters\CSRF;
 use CodeIgniter\Filters\DebugToolbar;
 use CodeIgniter\Filters\Honeypot;
+use CodeIgniter\Filters\InvalidChars;
 
 class Filters extends BaseConfig
 {
@@ -16,9 +17,10 @@ class Filters extends BaseConfig
      * @var array
      */
     public $aliases = [
-        'csrf'     => CSRF::class,
-        'toolbar'  => DebugToolbar::class,
-        'honeypot' => Honeypot::class,
+        'csrf'         => CSRF::class,
+        'toolbar'      => DebugToolbar::class,
+        'honeypot'     => Honeypot::class,
+        'invalidchars' => InvalidChars::class,
     ];
 
     /**
@@ -31,6 +33,7 @@ class Filters extends BaseConfig
         'before' => [
             // 'honeypot',
             // 'csrf',
+            // 'invalidchars',
         ],
         'after' => [
             'toolbar',

From 97be0378e2579a7e206d531f0fba1f583fabc459 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 22 Nov 2021 11:37:05 +0900
Subject: [PATCH 0809/2325] docs: add InvalidChars in Provided Filters

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

diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index 259bb496e0b7..334edf188fee 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -193,6 +193,6 @@ In this example, the array ``['dual', 'noreturn']`` will be passed in ``$argumen
 Provided Filters
 ****************
 
-Three filters are bundled with CodeIgniter4: ``Honeypot``, ``CSRF``, and ``DebugToolbar``.
+These filters are bundled with CodeIgniter4: ``Honeypot``, ``CSRF``, ``DebugToolbar`` and ``InvalidChars``.
 
 .. note:: The filters are executed in the declared order  that is defined in the config file, but there is one exception to this and it concerns the ``DebugToolbar``, which is always executed last. This is because ``DebugToolbar`` should be able to register everything that happens in other filters.

From fb9f6ec24f99ff8f30e6aa27ac9433f7b1fbe90f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 22 Nov 2021 11:38:38 +0900
Subject: [PATCH 0810/2325] refactor: add property for control code regex

Users could override the property.
---
 system/Filters/InvalidChars.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/system/Filters/InvalidChars.php b/system/Filters/InvalidChars.php
index ab5a2fef9ca4..4b1d8f7f9b6b 100644
--- a/system/Filters/InvalidChars.php
+++ b/system/Filters/InvalidChars.php
@@ -32,6 +32,13 @@ class InvalidChars implements FilterInterface
      */
     protected $source;
 
+    /**
+     * Regular expressions for valid control codes
+     *
+     * @var string
+     */
+    protected $controlCodeRegex = '/\A[\r\n\t[:^cntrl:]]*\z/u';
+
     /**
      * Check invalid characters.
      *
@@ -107,7 +114,7 @@ protected function checkControl($value)
             return $value;
         }
 
-        if (preg_match('/\A[\r\n\t[:^cntrl:]]*\z/u', $value) === 1) {
+        if (preg_match($this->controlCodeRegex, $value) === 1) {
             return $value;
         }
 

From 867322868e08e671d74c349eae7a8d30a2b638d4 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sun, 21 Nov 2021 18:32:55 +0800
Subject: [PATCH 0811/2325] Fix deprecated usage of `null` on `string` params
 of internal functions

---
 app/Config/Mimes.php                   |  2 +-
 system/CLI/CLI.php                     |  8 ++--
 system/Database/BaseUtils.php          |  4 +-
 system/Database/Forge.php              |  2 +-
 system/Database/Postgre/Connection.php |  7 +++-
 system/Filters/Filters.php             |  7 +---
 system/HTTP/CLIRequest.php             |  8 ++--
 system/HTTP/CURLRequest.php            |  2 +-
 system/HTTP/ResponseTrait.php          |  2 +-
 system/I18n/Time.php                   | 18 ++++----
 system/Security/Security.php           |  7 ++--
 system/Validation/FormatRules.php      | 56 ++++++++++++-------------
 system/Validation/Rules.php            | 58 ++++++--------------------
 system/Validation/Validation.php       | 20 +++------
 tests/system/I18n/TimeTest.php         |  3 +-
 15 files changed, 82 insertions(+), 122 deletions(-)

diff --git a/app/Config/Mimes.php b/app/Config/Mimes.php
index 973fb3984901..786bc6a1e5c7 100644
--- a/app/Config/Mimes.php
+++ b/app/Config/Mimes.php
@@ -509,7 +509,7 @@ public static function guessExtensionFromType(string $type, ?string $proposedExt
     {
         $type = trim(strtolower($type), '. ');
 
-        $proposedExtension = trim(strtolower($proposedExtension));
+        $proposedExtension = trim(strtolower($proposedExtension ?? ''));
 
         if ($proposedExtension !== '') {
             if (array_key_exists($proposedExtension, static::$mimes) && in_array($type, is_string(static::$mimes[$proposedExtension]) ? [static::$mimes[$proposedExtension]] : static::$mimes[$proposedExtension], true)) {
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index ea1e1ad85611..347a894f7578 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -865,10 +865,12 @@ public static function getOptionString(bool $useLongOpts = false, bool $trim = f
                 $out .= "-{$name} ";
             }
 
-            // If there's a space, we need to group
-            // so it will pass correctly.
+            if ($value === null) {
+                continue;
+            }
+
             if (mb_strpos($value, ' ') !== false) {
-                $out .= '"' . $value . '" ';
+                $out .= "\"{$value}\" ";
             } elseif ($value !== null) {
                 $out .= "{$value} ";
             }
diff --git a/system/Database/BaseUtils.php b/system/Database/BaseUtils.php
index 5af2b54dbad7..7848ae75ecf0 100644
--- a/system/Database/BaseUtils.php
+++ b/system/Database/BaseUtils.php
@@ -200,7 +200,7 @@ public function repairTable(string $tableName)
     public function getCSVFromResult(ResultInterface $query, string $delim = ',', string $newline = "\n", string $enclosure = '"')
     {
         $out = '';
-        // First generate the headings from the table column names
+
         foreach ($query->getFieldNames() as $name) {
             $out .= $enclosure . str_replace($enclosure, $enclosure . $enclosure, $name) . $enclosure . $delim;
         }
@@ -212,7 +212,7 @@ public function getCSVFromResult(ResultInterface $query, string $delim = ',', st
             $line = [];
 
             foreach ($row as $item) {
-                $line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item) . $enclosure;
+                $line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item ?? '') . $enclosure;
             }
 
             $out .= implode($delim, $line) . $newline;
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 8e0b7e43c7f3..d07675401df8 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -462,7 +462,7 @@ public function dropKey(string $table, string $keyName)
     public function dropForeignKey(string $table, string $foreignName)
     {
         $sql = sprintf(
-            $this->dropConstraintStr,
+            (string) $this->dropConstraintStr,
             $this->db->escapeIdentifiers($this->db->DBPrefix . $table),
             $this->db->escapeIdentifiers($this->db->DBPrefix . $foreignName)
         );
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
index a768e0ecf432..d39587821036 100644
--- a/system/Database/Postgre/Connection.php
+++ b/system/Database/Postgre/Connection.php
@@ -433,8 +433,11 @@ protected function buildDSN()
             $this->DSN = "host={$this->hostname} ";
         }
 
-        if (! empty($this->port) && ctype_digit($this->port)) {
-            $this->DSN .= "port={$this->port} ";
+        // ctype_digit only accepts strings
+        $port = (string) $this->port;
+
+        if ($port !== '' && ctype_digit($port)) {
+            $this->DSN .= "port={$port} ";
         }
 
         if ($this->username !== '') {
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index faa1df358cb4..edeb8b0571c5 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -397,13 +397,10 @@ protected function processGlobals(?string $uri = null)
             return;
         }
 
-        $uri = strtolower(trim($uri, '/ '));
+        $uri = strtolower(trim($uri ?? '', '/ '));
 
         // Add any global filters, unless they are excluded for this URI
-        $sets = [
-            'before',
-            'after',
-        ];
+        $sets = ['before', 'after'];
 
         foreach ($sets as $set) {
             if (isset($this->config->globals[$set])) {
diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
index b10d41884733..11bf598fd36c 100644
--- a/system/HTTP/CLIRequest.php
+++ b/system/HTTP/CLIRequest.php
@@ -139,11 +139,13 @@ public function getOptionString(bool $useLongOpts = false): string
                 $out .= "-{$name} ";
             }
 
-            // If there's a space, we need to group
-            // so it will pass correctly.
+            if ($value === null) {
+                continue;
+            }
+
             if (mb_strpos($value, ' ') !== false) {
                 $out .= '"' . $value . '" ';
-            } elseif ($value !== null) {
+            } else {
                 $out .= "{$value} ";
             }
         }
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index fffe57258a54..9a66e632783b 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -424,7 +424,7 @@ protected function applyMethod(string $method, array $curlOptions): array
         $this->method                       = $method;
         $curlOptions[CURLOPT_CUSTOMREQUEST] = $method;
 
-        $size = strlen($this->body);
+        $size = strlen($this->body ?? '');
 
         // Have content?
         if ($size > 0) {
diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
index 2b1205a5d47a..7ec5f1e69e6b 100644
--- a/system/HTTP/ResponseTrait.php
+++ b/system/HTTP/ResponseTrait.php
@@ -435,7 +435,7 @@ public function send()
         if ($this->CSPEnabled === true) {
             $this->CSP->finalize($this);
         } else {
-            $this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body);
+            $this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body ?? '');
         }
 
         $this->sendHeaders();
diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index 919a5a391534..ca8ffc3dc72e 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -75,25 +75,23 @@ class Time extends DateTime
      */
     public function __construct(?string $time = null, $timezone = null, ?string $locale = null)
     {
-        // If no locale was provided, grab it from Locale (set by IncomingRequest for web requests)
-        $this->locale = ! empty($locale) ? $locale : Locale::getDefault();
+        $this->locale = $locale ?: Locale::getDefault();
 
-        // If a test instance has been provided, use it instead.
-        if ($time === null && static::$testNow instanceof self) {
-            if (empty($timezone)) {
-                $timezone = static::$testNow->getTimezone();
-            }
+        $time = $time ?? '';
 
-            $time = static::$testNow->toDateTimeString();
+        // If a test instance has been provided, use it instead.
+        if ($time === '' && static::$testNow instanceof self) {
+            $timezone = $timezone ?: static::$testNow->getTimezone();
+            $time     = (string) static::$testNow->toDateTimeString();
         }
 
-        $timezone       = ! empty($timezone) ? $timezone : date_default_timezone_get();
+        $timezone       = $timezone ?: date_default_timezone_get();
         $this->timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
 
         // If the time string was a relative string (i.e. 'next Tuesday')
         // then we need to adjust the time going in so that we have a current
         // timezone to work with.
-        if (! empty($time) && (is_string($time) && static::hasRelativeKeywords($time))) {
+        if ($time !== '' && static::hasRelativeKeywords($time)) {
             $instance = new DateTime('now', $this->timezone);
             $instance->modify($time);
             $time = $instance->format('Y-m-d H:i:s');
diff --git a/system/Security/Security.php b/system/Security/Security.php
index fc8c1ac334c8..35e889a85d69 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -288,7 +288,7 @@ public function verify(RequestInterface $request)
             throw SecurityException::forDisallowedAction();
         }
 
-        $json = json_decode($request->getBody());
+        $json = json_decode($request->getBody() ?? '');
 
         if (isset($_POST[$this->tokenName])) {
             // We kill this since we're done and we don't want to pollute the POST array.
@@ -323,9 +323,10 @@ private function getPostedToken(RequestInterface $request): ?string
         if ($request->hasHeader($this->headerName) && ! empty($request->header($this->headerName)->getValue())) {
             $tokenName = $request->header($this->headerName)->getValue();
         } else {
-            $json = json_decode($request->getBody());
+            $body = (string) $request->getBody();
+            $json = json_decode($body);
 
-            if (! empty($request->getBody()) && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
+            if ($body !== '' && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
                 $tokenName = $json->{$this->tokenName} ?? null;
             } else {
                 $tokenName = null;
diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index 2167e28cba79..e28f6d6af13d 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -23,7 +23,7 @@ class FormatRules
      */
     public function alpha(?string $str = null): bool
     {
-        return ctype_alpha($str);
+        return ctype_alpha($str ?? '');
     }
 
     /**
@@ -74,7 +74,7 @@ public function alpha_numeric_punct($str)
      */
     public function alpha_numeric(?string $str = null): bool
     {
-        return ctype_alnum($str);
+        return ctype_alnum($str ?? '');
     }
 
     /**
@@ -83,7 +83,7 @@ public function alpha_numeric(?string $str = null): bool
     public function alpha_numeric_space(?string $str = null): bool
     {
         // @see https://regex101.com/r/0AZDME/1
-        return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str);
+        return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str ?? '');
     }
 
     /**
@@ -105,7 +105,7 @@ public function string($str = null): bool
     public function decimal(?string $str = null): bool
     {
         // @see https://regex101.com/r/HULifl/2/
-        return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str);
+        return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str ?? '');
     }
 
     /**
@@ -113,7 +113,7 @@ public function decimal(?string $str = null): bool
      */
     public function hex(?string $str = null): bool
     {
-        return ctype_xdigit($str);
+        return ctype_xdigit($str ?? '');
     }
 
     /**
@@ -121,7 +121,7 @@ public function hex(?string $str = null): bool
      */
     public function integer(?string $str = null): bool
     {
-        return (bool) preg_match('/\A[\-+]?\d+\z/', $str);
+        return (bool) preg_match('/\A[\-+]?\d+\z/', $str ?? '');
     }
 
     /**
@@ -129,7 +129,7 @@ public function integer(?string $str = null): bool
      */
     public function is_natural(?string $str = null): bool
     {
-        return ctype_digit($str);
+        return ctype_digit($str ?? '');
     }
 
     /**
@@ -137,7 +137,7 @@ public function is_natural(?string $str = null): bool
      */
     public function is_natural_no_zero(?string $str = null): bool
     {
-        return $str !== '0' && ctype_digit($str);
+        return $str !== '0' && ctype_digit($str ?? '');
     }
 
     /**
@@ -146,7 +146,7 @@ public function is_natural_no_zero(?string $str = null): bool
     public function numeric(?string $str = null): bool
     {
         // @see https://regex101.com/r/bb9wtr/2
-        return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str);
+        return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str ?? '');
     }
 
     /**
@@ -158,7 +158,7 @@ public function regex_match(?string $str, string $pattern): bool
             $pattern = "/{$pattern}/";
         }
 
-        return (bool) preg_match($pattern, $str);
+        return (bool) preg_match($pattern, $str ?? '');
     }
 
     /**
@@ -171,7 +171,7 @@ public function regex_match(?string $str, string $pattern): bool
      */
     public function timezone(?string $str = null): bool
     {
-        return in_array($str, timezone_identifiers_list(), true);
+        return in_array($str ?? '', timezone_identifiers_list(), true);
     }
 
     /**
@@ -184,6 +184,10 @@ public function timezone(?string $str = null): bool
      */
     public function valid_base64(?string $str = null): bool
     {
+        if ($str === null) {
+            return false;
+        }
+
         return base64_encode(base64_decode($str, true)) === $str;
     }
 
@@ -194,7 +198,7 @@ public function valid_base64(?string $str = null): bool
      */
     public function valid_json(?string $str = null): bool
     {
-        json_decode($str);
+        json_decode($str ?? '');
 
         return json_last_error() === JSON_ERROR_NONE;
     }
@@ -207,7 +211,7 @@ public function valid_json(?string $str = null): bool
     public function valid_email(?string $str = null): bool
     {
         // @see https://regex101.com/r/wlJG1t/1/
-        if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches)) {
+        if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str ?? '', $matches)) {
             $str = $matches[1] . '@' . idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46);
         }
 
@@ -224,8 +228,9 @@ public function valid_email(?string $str = null): bool
      */
     public function valid_emails(?string $str = null): bool
     {
-        foreach (explode(',', $str) as $email) {
+        foreach (explode(',', $str ?? '') as $email) {
             $email = trim($email);
+
             if ($email === '') {
                 return false;
             }
@@ -241,8 +246,7 @@ public function valid_emails(?string $str = null): bool
     /**
      * Validate an IP address (human readable format or binary string - inet_pton)
      *
-     * @param string $ip    IP Address
-     * @param string $which IP protocol: 'ipv4' or 'ipv6'
+     * @param string|null $which IP protocol: 'ipv4' or 'ipv6'
      */
     public function valid_ip(?string $ip = null, ?string $which = null): bool
     {
@@ -250,7 +254,7 @@ public function valid_ip(?string $ip = null, ?string $which = null): bool
             return false;
         }
 
-        switch (strtolower($which)) {
+        switch (strtolower($which ?? '')) {
             case 'ipv4':
                 $which = FILTER_FLAG_IPV4;
                 break;
@@ -260,11 +264,11 @@ public function valid_ip(?string $ip = null, ?string $which = null): bool
                 break;
 
             default:
-                $which = null;
-                break;
+                $which = 0;
         }
 
-        return (bool) filter_var($ip, FILTER_VALIDATE_IP, $which) || (! ctype_print($ip) && (bool) filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which));
+        return filter_var($ip, FILTER_VALIDATE_IP, $which) !== false
+            || (! ctype_print($ip) && filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which) !== false);
     }
 
     /**
@@ -272,8 +276,6 @@ public function valid_ip(?string $ip = null, ?string $which = null): bool
      *
      * Warning: this rule will pass basic strings like
      * "banana"; use valid_url_strict for a stricter rule.
-     *
-     * @param string $str
      */
     public function valid_url(?string $str = null): bool
     {
@@ -317,18 +319,16 @@ public function valid_url_strict(?string $str = null, ?string $validSchemes = nu
 
     /**
      * Checks for a valid date and matches a given date format
-     *
-     * @param string $str
-     * @param string $format
      */
     public function valid_date(?string $str = null, ?string $format = null): bool
     {
         if (empty($format)) {
-            return (bool) strtotime($str);
+            return strtotime($str) !== false;
         }
 
-        $date = DateTime::createFromFormat($format, $str);
+        $date   = DateTime::createFromFormat($format, $str);
+        $errors = DateTime::getLastErrors();
 
-        return (bool) $date && DateTime::getLastErrors()['warning_count'] === 0 && DateTime::getLastErrors()['error_count'] === 0;
+        return $date !== false && $errors !== false && $errors['warning_count'] === 0 && $errors['error_count'] === 0;
     }
 }
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
index 20f558e52be2..367915ebae35 100644
--- a/system/Validation/Rules.php
+++ b/system/Validation/Rules.php
@@ -22,8 +22,7 @@ class Rules
     /**
      * The value does not match another field in $data.
      *
-     * @param string $str
-     * @param array  $data Other field/value pairs
+     * @param array $data Other field/value pairs
      */
     public function differs(?string $str, string $field, array $data): bool
     {
@@ -36,8 +35,6 @@ public function differs(?string $str, string $field, array $data): bool
 
     /**
      * Equals the static value provided.
-     *
-     * @param string $str
      */
     public function equals(?string $str, string $val): bool
     {
@@ -47,15 +44,13 @@ public function equals(?string $str, string $val): bool
     /**
      * Returns true if $str is $val characters long.
      * $val = "5" (one) | "5,8,12" (multiple values)
-     *
-     * @param string $str
      */
     public function exact_length(?string $str, string $val): bool
     {
         $val = explode(',', $val);
 
         foreach ($val as $tmp) {
-            if (is_numeric($tmp) && (int) $tmp === mb_strlen($str)) {
+            if (is_numeric($tmp) && (int) $tmp === mb_strlen($str ?? '')) {
                 return true;
             }
         }
@@ -65,8 +60,6 @@ public function exact_length(?string $str, string $val): bool
 
     /**
      * Greater than
-     *
-     * @param string $str
      */
     public function greater_than(?string $str, string $min): bool
     {
@@ -75,8 +68,6 @@ public function greater_than(?string $str, string $min): bool
 
     /**
      * Equal to or Greater than
-     *
-     * @param string $str
      */
     public function greater_than_equal_to(?string $str, string $min): bool
     {
@@ -91,8 +82,6 @@ public function greater_than_equal_to(?string $str, string $min): bool
      * Example:
      *    is_not_unique[table.field,where_field,where_value]
      *    is_not_unique[menu.id,active,1]
-     *
-     * @param string $str
      */
     public function is_not_unique(?string $str, string $field, array $data): bool
     {
@@ -102,9 +91,8 @@ public function is_not_unique(?string $str, string $field, array $data): bool
         // Break the table and field apart
         sscanf($field, '%[^.].%[^.]', $table, $field);
 
-        $db = Database::connect($data['DBGroup'] ?? null);
-
-        $row = $db->table($table)
+        $row = Database::connect($data['DBGroup'] ?? null)
+            ->table($table)
             ->select('1')
             ->where($field, $str)
             ->limit(1);
@@ -118,8 +106,6 @@ public function is_not_unique(?string $str, string $field, array $data): bool
 
     /**
      * Value should be within an array of values
-     *
-     * @param string $value
      */
     public function in_list(?string $value, string $list): bool
     {
@@ -136,20 +122,15 @@ public function in_list(?string $value, string $list): bool
      * Example:
      *    is_unique[table.field,ignore_field,ignore_value]
      *    is_unique[users.email,id,5]
-     *
-     * @param string $str
      */
     public function is_unique(?string $str, string $field, array $data): bool
     {
-        // Grab any data for exclusion of a single row.
         [$field, $ignoreField, $ignoreValue] = array_pad(explode(',', $field), 3, null);
 
-        // Break the table and field apart
         sscanf($field, '%[^.].%[^.]', $table, $field);
 
-        $db = Database::connect($data['DBGroup'] ?? null);
-
-        $row = $db->table($table)
+        $row = Database::connect($data['DBGroup'] ?? null)
+            ->table($table)
             ->select('1')
             ->where($field, $str)
             ->limit(1);
@@ -163,8 +144,6 @@ public function is_unique(?string $str, string $field, array $data): bool
 
     /**
      * Less than
-     *
-     * @param string $str
      */
     public function less_than(?string $str, string $max): bool
     {
@@ -173,8 +152,6 @@ public function less_than(?string $str, string $max): bool
 
     /**
      * Equal to or Less than
-     *
-     * @param string $str
      */
     public function less_than_equal_to(?string $str, string $max): bool
     {
@@ -184,8 +161,7 @@ public function less_than_equal_to(?string $str, string $max): bool
     /**
      * Matches the value of another field in $data.
      *
-     * @param string $str
-     * @param array  $data Other field/value pairs
+     * @param array $data Other field/value pairs
      */
     public function matches(?string $str, string $field, array $data): bool
     {
@@ -198,22 +174,18 @@ public function matches(?string $str, string $field, array $data): bool
 
     /**
      * Returns true if $str is $val or fewer characters in length.
-     *
-     * @param string $str
      */
     public function max_length(?string $str, string $val): bool
     {
-        return is_numeric($val) && $val >= mb_strlen($str);
+        return is_numeric($val) && $val >= mb_strlen($str ?? '');
     }
 
     /**
      * Returns true if $str is at least $val length.
-     *
-     * @param string $str
      */
     public function min_length(?string $str, string $val): bool
     {
-        return is_numeric($val) && $val <= mb_strlen($str);
+        return is_numeric($val) && $val <= mb_strlen($str ?? '');
     }
 
     /**
@@ -237,11 +209,7 @@ public function not_in_list(?string $value, string $list): bool
     }
 
     /**
-     * Required
-     *
-     * @param mixed $str Value
-     *
-     * @return bool True if valid, false if not
+     * @param mixed $str
      */
     public function required($str = null): bool
     {
@@ -270,11 +238,10 @@ public function required_with($str = null, ?string $fields = null, array $data =
             throw new InvalidArgumentException('You must supply the parameters: fields, data.');
         }
 
-        $fields = explode(',', $fields);
-
         // If the field is present we can safely assume that
         // the field is here, no matter whether the corresponding
         // search field is present or not.
+        $fields  = explode(',', $fields);
         $present = $this->required($str ?? '');
 
         if ($present) {
@@ -311,11 +278,10 @@ public function required_without($str = null, ?string $fields = null, array $dat
             throw new InvalidArgumentException('You must supply the parameters: fields, data.');
         }
 
-        $fields = explode(',', $fields);
-
         // If the field is present we can safely assume that
         // the field is here, no matter whether the corresponding
         // search field is present or not.
+        $fields  = explode(',', $fields);
         $present = $this->required($str ?? '');
 
         if ($present) {
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 8bd14817e79d..876ab3caffa0 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -215,7 +215,7 @@ protected function processRules(string $field, ?string $label, $value, $rules =
         }
 
         if (in_array('permit_empty', $rules, true)) {
-            if (! in_array('required', $rules, true) && (is_array($value) ? empty($value) : (trim($value) === ''))) {
+            if (! in_array('required', $rules, true) && (is_array($value) ? $value === [] : trim($value ?? '') === '')) {
                 $passed = true;
 
                 foreach ($rules as $rule) {
@@ -570,13 +570,13 @@ protected function fillPlaceholders(array $rules, array $data): array
                             continue;
                         }
 
-                        $row = strtr($row, $replacements);
+                        $row = strtr($row ?? '', $replacements);
                     }
 
                     continue;
                 }
 
-                $rule = strtr($rule, $replacements);
+                $rule = strtr($rule ?? '', $replacements);
             }
         }
 
@@ -594,10 +594,6 @@ public function hasError(string $field): bool
     /**
      * Returns the error(s) for a specified $field (or empty string if not
      * set).
-     *
-     * @param string $field Field.
-     *
-     * @return string Error(s).
      */
     public function getError(?string $field = null): string
     {
@@ -617,9 +613,7 @@ public function getError(?string $field = null): string
      *        'field2' => 'error message',
      *    ]
      *
-     * @return array<string,string>
-     *
-     * Excluded from code coverage because that it always run as cli
+     * @return array<string, string>
      *
      * @codeCoverageIgnore
      */
@@ -648,12 +642,10 @@ public function setError(string $field, string $error): ValidationInterface
     /**
      * Attempts to find the appropriate error message
      *
-     * @param string $param
-     * @param string $value The value that caused the validation to fail.
+     * @param string|null $value The value that caused the validation to fail.
      */
     protected function getErrorMessage(string $rule, string $field, ?string $label = null, ?string $param = null, ?string $value = null): string
     {
-        // Check if custom message has been defined by user
         if (isset($this->customErrors[$field][$rule])) {
             $message = lang($this->customErrors[$field][$rule]);
         } else {
@@ -666,7 +658,7 @@ protected function getErrorMessage(string $rule, string $field, ?string $label =
         $message = str_replace('{field}', empty($label) ? $field : lang($label), $message);
         $message = str_replace('{param}', empty($this->rules[$param]['label']) ? $param : lang($this->rules[$param]['label']), $message);
 
-        return str_replace('{value}', $value, $message);
+        return str_replace('{value}', $value ?? '', $message);
     }
 
     /**
diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php
index 205a98098724..75f4416676fc 100644
--- a/tests/system/I18n/TimeTest.php
+++ b/tests/system/I18n/TimeTest.php
@@ -42,8 +42,7 @@ public function testNewTimeNow()
             'yyyy-MM-dd HH:mm:ss'
         );
 
-        $time = new Time(null, 'America/Chicago');
-
+        $time = new Time('', 'America/Chicago');
         $this->assertSame($formatter->format($time), (string) $time);
     }
 

From d4d3316909476cab57474d77c4cebc753f328cc2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 23 Nov 2021 10:16:37 +0900
Subject: [PATCH 0812/2325] docs: fix by proofreading

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/general/modules.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst
index 85a1d4ae82f8..581b2617aabb 100644
--- a/user_guide_src/source/general/modules.rst
+++ b/user_guide_src/source/general/modules.rst
@@ -196,7 +196,7 @@ Config files are automatically discovered whenever using the **config()** functi
 
 .. note:: **config()** finds the file in **app/Config/** when there is a class with the same shortname,
     even if you specify a fully qualified class name like ``config(\Acme\Blog\Config\Blog::class)``.
-    This is because ``Factories``'s the default configuration. See :ref:`factories-options` for more information.
+    This is because ``config()`` is a wrapper for the ``Factories`` class which uses ``preferApp`` by default. See :ref:`factories-options` for more information.
 
 Migrations
 ==========

From 09147bb716ea7599cbf0e8bc67a52aa07b89ea7b Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Sun, 26 Sep 2021 09:49:18 +0200
Subject: [PATCH 0813/2325] Determine if binds are simple or named by looking
 at the $binds array

---
 system/Database/Query.php               | 34 +++++++++++++------------
 tests/system/Database/BaseQueryTest.php | 26 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/system/Database/Query.php b/system/Database/Query.php
index a4bb1b2b9de5..aaf6b6cb9671 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -275,14 +275,7 @@ protected function compileBinds()
     {
         $sql = $this->finalQueryString;
 
-        $hasBinds      = strpos($sql, $this->bindMarker) !== false;
-        $hasNamedBinds = ! $hasBinds
-            && preg_match('/:(?!=).+:/', $sql) === 1;
-
-        if (empty($this->binds)
-            || empty($this->bindMarker)
-            || (! $hasNamedBinds && ! $hasBinds)
-        ) {
+        if (empty($this->binds)) {
             return;
         }
 
@@ -294,16 +287,25 @@ protected function compileBinds()
             $bindCount = count($binds);
         }
 
-        // Reverse the binds so that duplicate named binds
-        // will be processed prior to the original binds.
-        if (! is_numeric(key(array_slice($binds, 0, 1)))) {
-            $binds = array_reverse($binds);
-        }
+        if (is_numeric(key(array_slice($binds, 0, 1)))) {
+            if (empty($this->bindMarker) || strpos($sql, $this->bindMarker) === false) {
+                return;
+            }
 
-        $ml  = strlen($this->bindMarker);
-        $sql = $hasNamedBinds ? $this->matchNamedBinds($sql, $binds) : $this->matchSimpleBinds($sql, $binds, $bindCount, $ml);
+            $ml = strlen($this->bindMarker);
 
-        $this->finalQueryString = $sql;
+            $this->finalQueryString = $this->matchSimpleBinds($sql, $binds, $bindCount, $ml);
+        } else {
+            if (! preg_match('/:(?!=).+:/', $sql)) {
+                return;
+            }
+
+            // Reverse the binds so that duplicate named binds
+            // will be processed prior to the original binds.
+            $binds = array_reverse($binds);
+
+            $this->finalQueryString = $this->matchNamedBinds($sql, $binds);
+        }
     }
 
     /**
diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php
index fe942ffeb187..cebbe47163ec 100644
--- a/tests/system/Database/BaseQueryTest.php
+++ b/tests/system/Database/BaseQueryTest.php
@@ -269,7 +269,7 @@ public function testNamedBinds()
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/3566
      */
-    public function testNamedBindsWithColonElseWhere()
+    public function testNamedBindsWithColonElsewhere()
     {
         $query = new Query($this->db);
         $query->setQuery('SELECT `email`, @total:=(total+1) FROM `users` WHERE `id` = :id:', ['id' => 10]);
@@ -278,6 +278,30 @@ public function testNamedBindsWithColonElseWhere()
         $this->assertSame($sql, $query->getQuery());
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/pull/5138
+     */
+    public function testNamedBindsWithBindMarkerElsewhere()
+    {
+        $query = new Query($this->db);
+        $query->setQuery('SELECT * FROM posts WHERE id = :id: AND title = \'The default bind marker is "?"\'', ['id' => 10]);
+
+        $sql = 'SELECT * FROM posts WHERE id = 10 AND title = \'The default bind marker is "?"\'';
+        $this->assertSame($sql, $query->getQuery());
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/pull/5138
+     */
+    public function testSimpleBindsWithNamedBindPlaceholderElsewhere()
+    {
+        $query = new Query($this->db);
+        $query->setQuery('SELECT * FROM posts WHERE id = ? AND title = \'A named bind placeholder looks like ":foobar:"\'', 10);
+
+        $sql = 'SELECT * FROM posts WHERE id = 10 AND title = \'A named bind placeholder looks like ":foobar:"\'';
+        $this->assertSame($sql, $query->getQuery());
+    }
+
     /**
      * @group single
      *

From a8e549b355fb6e17dac11de6b5e5cc1911fb7974 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Sun, 26 Sep 2021 10:16:41 +0200
Subject: [PATCH 0814/2325] Remove tests that are now superfluous
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Simple binds: matchSimpleBinds() also handles the bind marker, and more elaborately: handles enclosing quotes, checks the number of markers…
* Named binds: there just won't be replacements for matchNamedBinds() to make.
---
 system/Database/Query.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/system/Database/Query.php b/system/Database/Query.php
index aaf6b6cb9671..1892781e44c0 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -288,7 +288,7 @@ protected function compileBinds()
         }
 
         if (is_numeric(key(array_slice($binds, 0, 1)))) {
-            if (empty($this->bindMarker) || strpos($sql, $this->bindMarker) === false) {
+            if (empty($this->bindMarker)) {
                 return;
             }
 
@@ -296,10 +296,6 @@ protected function compileBinds()
 
             $this->finalQueryString = $this->matchSimpleBinds($sql, $binds, $bindCount, $ml);
         } else {
-            if (! preg_match('/:(?!=).+:/', $sql)) {
-                return;
-            }
-
             // Reverse the binds so that duplicate named binds
             // will be processed prior to the original binds.
             $binds = array_reverse($binds);

From d1a973869bcc9cfd1b386201c1940ed03a5cfcc0 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Fri, 1 Oct 2021 22:23:49 +0200
Subject: [PATCH 0815/2325] Remove another superfluous test

It's very unlikely that the bindMarker property would be empty.
---
 system/Database/Query.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/system/Database/Query.php b/system/Database/Query.php
index 1892781e44c0..64264bf70635 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -288,10 +288,6 @@ protected function compileBinds()
         }
 
         if (is_numeric(key(array_slice($binds, 0, 1)))) {
-            if (empty($this->bindMarker)) {
-                return;
-            }
-
             $ml = strlen($this->bindMarker);
 
             $this->finalQueryString = $this->matchSimpleBinds($sql, $binds, $bindCount, $ml);

From 211f713f7ac9bc91ebbf734ffe21e923ad272073 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Fri, 1 Oct 2021 22:24:59 +0200
Subject: [PATCH 0816/2325] Some refinement / optimization

Considering that $binds is usually an array, and that only matchSimpleBinds() needs the count.
---
 system/Database/Query.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/system/Database/Query.php b/system/Database/Query.php
index 64264bf70635..021a360d85c9 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -279,16 +279,11 @@ protected function compileBinds()
             return;
         }
 
-        if (! is_array($this->binds)) {
-            $binds     = [$this->binds];
-            $bindCount = 1;
-        } else {
-            $binds     = $this->binds;
-            $bindCount = count($binds);
-        }
+        $binds = (array) $this->binds;
 
         if (is_numeric(key(array_slice($binds, 0, 1)))) {
-            $ml = strlen($this->bindMarker);
+            $bindCount = count($binds);
+            $ml        = strlen($this->bindMarker);
 
             $this->finalQueryString = $this->matchSimpleBinds($sql, $binds, $bindCount, $ml);
         } else {

From 2a08bc7a0dc5a7b688fa40a86b43fa745ed7d995 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Tue, 16 Nov 2021 15:25:49 +0100
Subject: [PATCH 0817/2325] Make the test "array is a list" a bit more robust

We are looking for an integer, excluding other numeric values (decimals, etc).

As a reminder: for array keys, PHP automatically casts strings representing integers to regular integers.
---
 system/Database/Query.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Database/Query.php b/system/Database/Query.php
index 021a360d85c9..a2f65f629f8a 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -281,7 +281,7 @@ protected function compileBinds()
 
         $binds = (array) $this->binds;
 
-        if (is_numeric(key(array_slice($binds, 0, 1)))) {
+        if (is_int(key(array_slice($binds, 0, 1)))) {
             $bindCount = count($binds);
             $ml        = strlen($this->bindMarker);
 

From 9d92d56d6401f12bfe2780a6f56886155076bd71 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Tue, 23 Nov 2021 03:04:12 +0100
Subject: [PATCH 0818/2325] Use array_key_first()

Same results, but simpler and faster code.

Note array_key_first() is available on PHP 7.3+, which is thankfully the minimum PHP version required by CodeIgniter.
---
 system/Database/Query.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Database/Query.php b/system/Database/Query.php
index a2f65f629f8a..f1ec562034c7 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -281,7 +281,7 @@ protected function compileBinds()
 
         $binds = (array) $this->binds;
 
-        if (is_int(key(array_slice($binds, 0, 1)))) {
+        if (is_int(array_key_first($binds))) {
             $bindCount = count($binds);
             $ml        = strlen($this->bindMarker);
 

From 147fc9d8f6cc449c2fd56eb3c9022c43c3dd19e3 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sun, 21 Nov 2021 18:36:02 +0800
Subject: [PATCH 0819/2325] Fix precision loss deprecation on float to int
 conversion

---
 system/Images/Handlers/GDHandler.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/Images/Handlers/GDHandler.php b/system/Images/Handlers/GDHandler.php
index 02d61c40a007..ab8e0b7e3dd3 100644
--- a/system/Images/Handlers/GDHandler.php
+++ b/system/Images/Handlers/GDHandler.php
@@ -188,7 +188,7 @@ protected function process(string $action)
             imagesavealpha($dest, true);
         }
 
-        $copy($dest, $src, 0, 0, $this->xAxis, $this->yAxis, $this->width, $this->height, $origWidth, $origHeight);
+        $copy($dest, $src, 0, 0, (int) $this->xAxis, (int) $this->yAxis, $this->width, $this->height, $origWidth, $origHeight);
 
         imagedestroy($src);
         $this->resource = $dest;
@@ -472,9 +472,9 @@ protected function textOverlay(string $text, array $options = [], bool $isShadow
         // Add the shadow to the source image
         if (! empty($options['fontPath'])) {
             // We have to add fontheight because imagettftext locates the bottom left corner, not top-left corner.
-            imagettftext($src, $options['fontSize'], 0, $xAxis, $yAxis + $options['fontheight'], $color, $options['fontPath'], $text);
+            imagettftext($src, $options['fontSize'], 0, (int) $xAxis, (int) ($yAxis + $options['fontheight']), $color, $options['fontPath'], $text);
         } else {
-            imagestring($src, $options['fontSize'], $xAxis, $yAxis, $text, $color);
+            imagestring($src, (int) $options['fontSize'], (int) $xAxis, (int) $yAxis, $text, $color);
         }
 
         $this->resource = $src;

From abab12128ecf8fe1f8920550048d6f064dc862fe Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 23 Nov 2021 14:31:34 +0900
Subject: [PATCH 0820/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/incoming/filters.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index 334edf188fee..ef2b1991004c 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -193,6 +193,6 @@ In this example, the array ``['dual', 'noreturn']`` will be passed in ``$argumen
 Provided Filters
 ****************
 
-These filters are bundled with CodeIgniter4: ``Honeypot``, ``CSRF``, ``DebugToolbar`` and ``InvalidChars``.
+The filters bundled with CodeIgniter4 are: ``Honeypot``, ``CSRF``, ``DebugToolbar``, and ``InvalidChars``.
 
 .. note:: The filters are executed in the declared order  that is defined in the config file, but there is one exception to this and it concerns the ``DebugToolbar``, which is always executed last. This is because ``DebugToolbar`` should be able to register everything that happens in other filters.

From fe3ab5eb9551fa4445e3bc8c54e8e1dab6fe4bee Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 23 Nov 2021 14:32:54 +0900
Subject: [PATCH 0821/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/incoming/filters.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index ef2b1991004c..60e2ea90cc76 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -195,4 +195,4 @@ Provided Filters
 
 The filters bundled with CodeIgniter4 are: ``Honeypot``, ``CSRF``, ``DebugToolbar``, and ``InvalidChars``.
 
-.. note:: The filters are executed in the declared order  that is defined in the config file, but there is one exception to this and it concerns the ``DebugToolbar``, which is always executed last. This is because ``DebugToolbar`` should be able to register everything that happens in other filters.
+.. note:: The filters are executed in the order defined in the config file. However, if enabled, ``DebugToolbar`` is always executed last because it should be able to capture everything that happens in the other filters.

From e7e492fe6d7cf2a9253d0a918360b415b9447533 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 23 Nov 2021 14:33:36 +0900
Subject: [PATCH 0822/2325] test: add param type

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 tests/system/Filters/InvalidCharsTest.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/system/Filters/InvalidCharsTest.php b/tests/system/Filters/InvalidCharsTest.php
index 95725de07323..5bfe9268795c 100644
--- a/tests/system/Filters/InvalidCharsTest.php
+++ b/tests/system/Filters/InvalidCharsTest.php
@@ -144,10 +144,8 @@ public function stringWithLineBreakAndTabProvider()
 
     /**
      * @dataProvider stringWithControlCharsProvider
-     *
-     * @param string $input
      */
-    public function testCheckControlStringWithControlCharsCausesException($input)
+    public function testCheckControlStringWithControlCharsCausesException(string $input)
     {
         $this->expectException(SecurityException::class);
         $this->expectExceptionMessage('Invalid Control characters in get:');

From 70424d61d5b4d00e0b475b49d36a04a29aa2034c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 23 Nov 2021 14:33:58 +0900
Subject: [PATCH 0823/2325] test: add param type

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 tests/system/Filters/InvalidCharsTest.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/system/Filters/InvalidCharsTest.php b/tests/system/Filters/InvalidCharsTest.php
index 5bfe9268795c..fb487c7939dc 100644
--- a/tests/system/Filters/InvalidCharsTest.php
+++ b/tests/system/Filters/InvalidCharsTest.php
@@ -121,10 +121,8 @@ public function testBeforeInvalidControlCharCausesException()
      * @doesNotPerformAssertions
      *
      * @dataProvider stringWithLineBreakAndTabProvider
-     *
-     * @param string $input
      */
-    public function testCheckControlStringWithLineBreakAndTabReturnsTheString($input)
+    public function testCheckControlStringWithLineBreakAndTabReturnsTheString(string $input)
     {
         $_GET['val'] = $input;
 

From 72aa844b5c9ba2adb9d2c326e7a2380d85d9285d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 23 Nov 2021 14:40:36 +0900
Subject: [PATCH 0824/2325] test: replace return with yield from

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 tests/system/Filters/InvalidCharsTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/Filters/InvalidCharsTest.php b/tests/system/Filters/InvalidCharsTest.php
index fb487c7939dc..90e106eec97d 100644
--- a/tests/system/Filters/InvalidCharsTest.php
+++ b/tests/system/Filters/InvalidCharsTest.php
@@ -131,7 +131,7 @@ public function testCheckControlStringWithLineBreakAndTabReturnsTheString(string
 
     public function stringWithLineBreakAndTabProvider()
     {
-        return [
+        yield from [
             ["String contains \n line break."],
             ["String contains \r line break."],
             ["String contains \r\n line break."],

From 9d7e0389a981f0c8e4650fc4c61d8414bd88aa1a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 23 Nov 2021 14:40:43 +0900
Subject: [PATCH 0825/2325] test: replace return with yield from

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 tests/system/Filters/InvalidCharsTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/Filters/InvalidCharsTest.php b/tests/system/Filters/InvalidCharsTest.php
index 90e106eec97d..8724413120b5 100644
--- a/tests/system/Filters/InvalidCharsTest.php
+++ b/tests/system/Filters/InvalidCharsTest.php
@@ -155,7 +155,7 @@ public function testCheckControlStringWithControlCharsCausesException(string $in
 
     public function stringWithControlCharsProvider()
     {
-        return [
+        yield from [
             ["String contains null char.\0"],
             ["String contains null char and line break.\0\n"],
         ];

From b8fe16d2ff708971693a5e3325b74447ffb93fdd Mon Sep 17 00:00:00 2001
From: Katherine <katherine_wsd@hotmail.com>
Date: Tue, 23 Nov 2021 11:49:00 +0000
Subject: [PATCH 0826/2325] fix: BaseModel::insert() may not pass all the
 values from Entity (#4980)

* Update of BaseModel.php to fix INSERT issue

Applied the fix that enables the INSERT to work correctly when inserting a row that already contains data.

* Update BaseModel.php

* Added tests for fix.

User.php is an Entity
UserObjModel.php returns an entity not StdObj

* Updated to simplify usings.

* Updated to cleanup test code.

* Update tests/system/Models/InsertModelTest.php

Co-authored-by: kenjis <kenji.uui@gmail.com>

* Update tests/_support/Entity/User.php

Co-authored-by: kenjis <kenji.uui@gmail.com>

Co-authored-by: Katherine <katherine@dvana.com>
Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 system/BaseModel.php                    |  2 +-
 tests/_support/Entity/User.php          | 21 +++++++++++++++++++
 tests/_support/Models/UserObjModel.php  | 28 +++++++++++++++++++++++++
 tests/system/Models/InsertModelTest.php | 22 +++++++++++++++++++
 4 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 tests/_support/Entity/User.php
 create mode 100644 tests/_support/Models/UserObjModel.php

diff --git a/system/BaseModel.php b/system/BaseModel.php
index 6b9ef3687817..971303664a8e 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -1578,7 +1578,7 @@ protected function transformDataToArray($data, string $type): array
         // properties representing the collection elements, we need to grab
         // them as an array.
         if (is_object($data) && ! $data instanceof stdClass) {
-            $data = $this->objectToArray($data, true, true);
+            $data = $this->objectToArray($data, ($type === 'update'), true);
         }
 
         // If it's still a stdClass, go ahead and convert to
diff --git a/tests/_support/Entity/User.php b/tests/_support/Entity/User.php
new file mode 100644
index 000000000000..dc8a3954341d
--- /dev/null
+++ b/tests/_support/Entity/User.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Entity;
+
+use CodeIgniter\Entity\Entity;
+
+class User extends Entity
+{
+    protected $attributes = [
+        'country' => 'India',
+    ];
+}
diff --git a/tests/_support/Models/UserObjModel.php b/tests/_support/Models/UserObjModel.php
new file mode 100644
index 000000000000..ea461ec64fb3
--- /dev/null
+++ b/tests/_support/Models/UserObjModel.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Tests\Support\Models;
+
+use CodeIgniter\Model;
+
+class UserObjModel extends Model
+{
+    protected $table         = 'user';
+    protected $allowedFields = [
+        'name',
+        'email',
+        'country',
+        'deleted_at',
+    ];
+    protected $returnType     = \Tests\Support\Entity\User::class;
+    protected $useSoftDeletes = true;
+    protected $dateFormat     = 'datetime';
+}
diff --git a/tests/system/Models/InsertModelTest.php b/tests/system/Models/InsertModelTest.php
index d08db6f87ac8..2bcc912e3d80 100644
--- a/tests/system/Models/InsertModelTest.php
+++ b/tests/system/Models/InsertModelTest.php
@@ -15,8 +15,10 @@
 use CodeIgniter\Entity\Entity;
 use CodeIgniter\I18n\Time;
 use stdClass;
+use Tests\Support\Entity\User;
 use Tests\Support\Models\JobModel;
 use Tests\Support\Models\UserModel;
+use Tests\Support\Models\UserObjModel;
 use Tests\Support\Models\WithoutAutoIncrementModel;
 
 /**
@@ -286,4 +288,24 @@ public function testInsertWithSetAndEscape(): void
 
         $this->assertCloseEnough(time(), strtotime($result->created_at));
     }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4247
+     */
+    public function testInsertWithDefaultValue(): void
+    {
+        $this->createModel(UserObjModel::class);
+
+        $entity             = new User();
+        $entity->name       = 'Mark';
+        $entity->email      = 'mark@example.com';
+        $entity->country    = 'India';  // same as the default
+        $entity->deleted    = 0;
+        $entity->created_at = new Time('now');
+
+        $this->model->insert($entity);
+
+        $id = $this->model->getInsertID();
+        $this->assertSame($entity->country, $this->model->find($id)->country);
+    }
 }

From 3497170a595f99238ce50bd8381cb94258591535 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Nov 2021 09:53:25 +0900
Subject: [PATCH 0827/2325] fix: make sure $this->tableName is string

---
 system/Database/BaseBuilder.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index b0ea12416683..0d7ca807a036 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -158,6 +158,9 @@ class BaseBuilder
      * Tracked separately because $QBFrom gets escaped
      * and prefixed.
      *
+     * When $tableName to the constructor has multiple tables,
+     * the value is empty string.
+     *
      * @var string
      */
     protected $tableName;
@@ -276,7 +279,13 @@ public function __construct($tableName, ConnectionInterface &$db, ?array $option
          */
         $this->db = $db;
 
-        $this->tableName = $tableName;
+        // If it contains `,`, it has multiple tables
+        if (is_string($tableName) && strpos($tableName, ',') === false) {
+            $this->tableName = $tableName;  // @TODO remove alias if exists
+        } else {
+            $this->tableName = '';
+        }
+
         $this->from($tableName);
 
         if (! empty($options)) {

From 82e27ba2eb20892b0133645a44f9d349f5cc5430 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Nov 2021 09:55:47 +0900
Subject: [PATCH 0828/2325] docs: make comment more detailed

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

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 0d7ca807a036..fecf3e10718f 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -264,7 +264,9 @@ class BaseBuilder
     /**
      * Constructor
      *
-     * @param array|string $tableName
+     * @param array|string $tableName tablename or tablenames with or without aliases
+     *
+     * Examples of $tableName: `mytable`, `jobs j`, `jobs j, users u`, `['jobs j','users u']`
      *
      * @throws DatabaseException
      */
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index b7168259e631..f2ceb5a0f907 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -835,7 +835,7 @@ abstract protected function _transCommit(): bool;
     abstract protected function _transRollback(): bool;
 
     /**
-     * Returns an instance of the query builder for this connection.
+     * Returns a non-shared new instance of the query builder for this connection.
      *
      * @param array|string $tableName
      *

From d22c6f14ece4f603184942c73ff5e26780d6458c Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Wed, 24 Nov 2021 04:48:32 +0100
Subject: [PATCH 0829/2325] Remove unneeded cast to array

As discussed on GitHub PR #5138, $this->binds is not expected to be something else than an array.
---
 system/Database/Query.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/system/Database/Query.php b/system/Database/Query.php
index f1ec562034c7..91b98c77d2ef 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -273,14 +273,13 @@ public function getOriginalQuery(): string
      */
     protected function compileBinds()
     {
-        $sql = $this->finalQueryString;
+        $sql   = $this->finalQueryString;
+        $binds = $this->binds;
 
-        if (empty($this->binds)) {
+        if (empty($binds)) {
             return;
         }
 
-        $binds = (array) $this->binds;
-
         if (is_int(array_key_first($binds))) {
             $bindCount = count($binds);
             $ml        = strlen($this->bindMarker);

From 0f3ce86e425847ba3518425000cbe3258cf919c1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Nov 2021 13:22:15 +0900
Subject: [PATCH 0830/2325] docs: fix incorrect explanation on
 getCompiledInsert()

It has only one parameter in CI4.
---
 user_guide_src/source/database/query_builder.rst | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index a05fb25f8159..7aa8cf69dcdb 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -886,15 +886,15 @@ Example::
         'date'  => 'My date',
     ];
 
-    $sql = $builder->set($data)->getCompiledInsert('mytable');
+    $sql = $builder->set($data)->getCompiledInsert();
     echo $sql;
 
     // Produces string: INSERT INTO mytable (`title`, `name`, `date`) VALUES ('My title', 'My name', 'My date')
 
-The second parameter enables you to set whether or not the query builder query
+The first parameter enables you to set whether or not the query builder query
 will be reset (by default it will be--just like ``$builder->insert()``)::
 
-    echo $builder->set('title', 'My Title')->getCompiledInsert('mytable', false);
+    echo $builder->set('title', 'My Title')->getCompiledInsert(false);
 
     // Produces string: INSERT INTO mytable (`title`) VALUES ('My Title')
 
@@ -902,9 +902,7 @@ will be reset (by default it will be--just like ``$builder->insert()``)::
 
     // Produces string: INSERT INTO mytable (`title`, `content`) VALUES ('My Title', 'My Content')
 
-The key thing to notice in the above example is that the second query did not
-utilize ``$builder->from()`` nor did it pass a table name into the first
-parameter. The reason this worked is that the query has not been executed
+The reason the second query worked is that the query has not been executed
 using ``$builder->insert()`` which resets values or reset directly using
 ``$builder->resetQuery()``.
 

From 81859f2920148fa7e95a0cceadfaf06fa09ee98f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Nov 2021 14:30:14 +0900
Subject: [PATCH 0831/2325] docs: change from important to warning

It is security thing.
---
 user_guide_src/source/general/configuration.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst
index ac31e6f3241a..7543802f39ad 100644
--- a/user_guide_src/source/general/configuration.rst
+++ b/user_guide_src/source/general/configuration.rst
@@ -115,7 +115,7 @@ overwritten. The loaded Environment variables are accessed using any of the foll
     $s3_bucket = $_ENV['S3_BUCKET'];
     $s3_bucket = $_SERVER['S3_BUCKET'];
 
-.. important:: Note that your settings from the **.env** file are added to Environment Variables. As a side effect, this means that if your CodeIgniter application is (for example) generating a ``var_dump($_ENV)`` or ``phpinfo()`` (for debugging or other valid reasons) **your secure credentials are publicly exposed**.
+.. warning:: Note that your settings from the **.env** file are added to Environment Variables. As a side effect, this means that if your CodeIgniter application is (for example) generating a ``var_dump($_ENV)`` or ``phpinfo()`` (for debugging or other valid reasons) **your secure credentials are publicly exposed**.
 
 Nesting Variables
 =================

From 954cc0d8c85e8545b0402156f50bbd632f6db787 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Nov 2021 14:37:04 +0900
Subject: [PATCH 0832/2325] docs: add ::class sample

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

diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst
index 7543802f39ad..b1016b939c9b 100644
--- a/user_guide_src/source/general/configuration.rst
+++ b/user_guide_src/source/general/configuration.rst
@@ -31,7 +31,8 @@ You can access configuration files for your classes in several different ways.
     $config = config('Pager');
 
     // Access config class with namespace
-    $config = config( 'Config\\Pager' );
+    $config = config('Config\\Pager');
+    $config = config(\Config\Pager::class);
 
     // Creating a new object with config function
     $config = config('Pager', false);

From e452d510ad374cbb4040018c21af53f80db36f18 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Nov 2021 14:37:37 +0900
Subject: [PATCH 0833/2325] docs: fix RST format

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

diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst
index b1016b939c9b..813f523c7fa2 100644
--- a/user_guide_src/source/general/configuration.rst
+++ b/user_guide_src/source/general/configuration.rst
@@ -122,8 +122,7 @@ Nesting Variables
 =================
 
 To save on typing, you can reuse variables that you've already specified in the file by wrapping the
-variable name within ``${...}``
-::
+variable name within ``${...}``::
 
     BASE_DIR="/var/webroot/project-root"
     CACHE_DIR="${BASE_DIR}/cache"

From f990c7f9be275f054a73426e1cc7993756a1e965 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Nov 2021 14:52:22 +0900
Subject: [PATCH 0834/2325] docs: add reference from Module Routes to Route
 processing queue

---
 user_guide_src/source/general/modules.rst  | 3 +++
 user_guide_src/source/incoming/routing.rst | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst
index 91ec5554c955..19797b099416 100644
--- a/user_guide_src/source/general/modules.rst
+++ b/user_guide_src/source/general/modules.rst
@@ -153,6 +153,9 @@ the **Modules** config file, described above.
 .. note:: Since the files are being included into the current scope, the ``$routes`` instance is already defined for you.
     It will cause errors if you attempt to redefine that class.
 
+When working with modules, it can be a problem if the routes in the application contain wildcards.
+In that case, see :ref:`routing-priority`.
+
 Filters
 =======
 
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 5f18fb4960d8..be571d34b736 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -456,7 +456,7 @@ be used when the first parameter is a language string::
     // Creates:
     $routes['users/(:num)'] = 'users/show/$2';
 
-.. _priority:
+.. _routing-priority:
 
 Route processing queue
 ----------------------
@@ -590,7 +590,7 @@ Route processing by priority
 
 Enables or disables processing of the routes queue by priority. Lowering the priority is defined in the route option.
 Disabled by default. This functionality affects all routes.
-For an example of use lowering the priority see :ref:`priority`::
+For an example of use lowering the priority see :ref:`routing-priority`::
 
     // to enable
     $routes->setPrioritize();

From dfa5229145de49c9e31556129959e87901c2d262 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Nov 2021 15:25:52 +0900
Subject: [PATCH 0835/2325] docs: replace PSR* with PSR-*

---
 user_guide_src/source/concepts/autoloader.rst      | 4 ++--
 user_guide_src/source/general/logging.rst          | 4 ++--
 user_guide_src/source/general/modules.rst          | 6 +++---
 user_guide_src/source/installation/upgrade_4xx.rst | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst
index 543d70323bc6..beb8da256f0b 100644
--- a/user_guide_src/source/concepts/autoloader.rst
+++ b/user_guide_src/source/concepts/autoloader.rst
@@ -11,7 +11,7 @@ headache and very error-prone. That's where autoloaders come in.
 
 CodeIgniter provides a very flexible autoloader that can be used with very little configuration.
 It can locate individual non-namespaced classes, namespaced classes that adhere to
-`PSR4 <https://www.php-fig.org/psr/psr-4/>`_ autoloading
+`PSR-4 <https://www.php-fig.org/psr/psr-4/>`_ autoloading
 directory structures, and will even attempt to locate classes in common directories (like Controllers,
 Models, etc).
 
@@ -30,7 +30,7 @@ Configuration
 =============
 
 Initial configuration is done in **/app/Config/Autoload.php**. This file contains two primary
-arrays: one for the classmap, and one for PSR4-compatible namespaces.
+arrays: one for the classmap, and one for PSR-4 compatible namespaces.
 
 Namespaces
 ==========
diff --git a/user_guide_src/source/general/logging.rst b/user_guide_src/source/general/logging.rst
index 7fa706ce6a86..761500ac722a 100644
--- a/user_guide_src/source/general/logging.rst
+++ b/user_guide_src/source/general/logging.rst
@@ -136,8 +136,8 @@ Using Third-Party Loggers
 =========================
 
 You can use any other logger that you might like as long as it extends from either
-``Psr\Log\LoggerInterface`` and is `PSR3 <https://www.php-fig.org/psr/psr-3/>`_ compatible. This means
-that you can easily drop in use for any PSR3-compatible logger, or create your own.
+``Psr\Log\LoggerInterface`` and is `PSR-3 <https://www.php-fig.org/psr/psr-3/>`_ compatible. This means
+that you can easily drop in use for any PSR-3 compatible logger, or create your own.
 
 You must ensure that the third-party logger can be found by the system, by adding it to either
 the **app/Config/Autoload.php** configuration file, or through another autoloader,
diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst
index 91ec5554c955..7aea12358fdb 100644
--- a/user_guide_src/source/general/modules.rst
+++ b/user_guide_src/source/general/modules.rst
@@ -15,8 +15,8 @@ language files, etc. Modules may contain as few, or as many, of these as you lik
 Namespaces
 ==========
 
-The core element of the modules functionality comes from the :doc:`PSR4-compatible autoloading </concepts/autoloader>`
-that CodeIgniter uses. While any code can use the PSR4 autoloader and namespaces, the primary way to take full advantage of
+The core element of the modules functionality comes from the :doc:`PSR-4 compatible autoloading </concepts/autoloader>`
+that CodeIgniter uses. While any code can use the PSR-4 autoloader and namespaces, the primary way to take full advantage of
 modules is to namespace your code and add it to **app/Config/Autoload.php**, in the ``psr4`` section.
 
 For example, let's say we want to keep a simple blog module that we can re-use between applications. We might create
@@ -129,7 +129,7 @@ Discovery and Composer
 ======================
 
 Packages that were installed via Composer will also be discovered by default. This only requires that the namespace
-that Composer knows about is a PSR4 namespace. PSR0 namespaces will not be detected.
+that Composer knows about is a PSR-4 namespace. PSR-0 namespaces will not be detected.
 
 If you do not want all of Composer's known directories to be scanned when locating files, you can turn this off
 by editing the ``$discoverInComposer`` variable in ``Config\Modules.php``::
diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst
index 76fdba16c8e0..ae6bd0188608 100644
--- a/user_guide_src/source/installation/upgrade_4xx.rst
+++ b/user_guide_src/source/installation/upgrade_4xx.rst
@@ -77,7 +77,7 @@ General Adjustments
   references magically injected as properties of your controller.
 - Classes are instantiated where needed, and components are managed
   by ``Services``.
-- The class loader automatically handles PSR4 style class locating,
+- The class loader automatically handles PSR-4 style class locating,
   within the ``App`` (application) and ``CodeIgniter`` (i.e., system) top level
   namespaces; with composer autoloading support, and even using educated
   guessing to find your models and libraries if they are in the right

From 0ba441a1518d9d80d00cac076f28eb27d670bd38 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Nov 2021 15:38:59 +0900
Subject: [PATCH 0836/2325] docs: change lang file sample filename to uppercase
 first

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

diff --git a/user_guide_src/source/outgoing/localization.rst b/user_guide_src/source/outgoing/localization.rst
index 97d3fbdf6d5e..996224fc2c72 100644
--- a/user_guide_src/source/outgoing/localization.rst
+++ b/user_guide_src/source/outgoing/localization.rst
@@ -20,9 +20,9 @@ supported language::
     /app
         /Language
             /en
-                app.php
+                App.php
             /fr
-                app.php
+                App.php
 
 .. important:: Locale detection only works for web-based requests that use the IncomingRequest class.
     Command-line requests will not have these features.

From 025d27a76daeab7e7c0bef2688db8eb7ec103aed Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Nov 2021 15:40:42 +0900
Subject: [PATCH 0837/2325] docs: change lang key to camelCase

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

diff --git a/user_guide_src/source/outgoing/localization.rst b/user_guide_src/source/outgoing/localization.rst
index 996224fc2c72..f9e0693abfcb 100644
--- a/user_guide_src/source/outgoing/localization.rst
+++ b/user_guide_src/source/outgoing/localization.rst
@@ -119,11 +119,11 @@ You might name it simply: **Errors.php**.
 
 Within the file, you would return an array, where each element in the array has a language key and can have string to return::
 
-    'language_key' => 'The actual message to be shown.'
+    'languageKey' => 'The actual message to be shown.'
 
 It also support nested definition::
 
-    'language_key' => [
+    'languageKey' => [
         'nested' => [
             'key' => 'The actual message to be shown.',
         ],

From a7fc1bed9e4d740cc440e591296c9ef169968e90 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Nov 2021 15:41:09 +0900
Subject: [PATCH 0838/2325] docs: remove out-of-dated note

It seems about CI3.
---
 user_guide_src/source/outgoing/localization.rst | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/user_guide_src/source/outgoing/localization.rst b/user_guide_src/source/outgoing/localization.rst
index f9e0693abfcb..4c78ed39ee44 100644
--- a/user_guide_src/source/outgoing/localization.rst
+++ b/user_guide_src/source/outgoing/localization.rst
@@ -129,10 +129,6 @@ It also support nested definition::
         ],
     ],
 
-.. note:: It's good practice to use a common prefix for all messages in a given file to avoid collisions with
-    similarly named items in other files. For example, if you are creating error messages you might prefix them
-    with error\_
-
 ::
 
     return [

From 96381ea4a8cbeff2be980785074ea1b8b0ace478 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Nov 2021 15:41:56 +0900
Subject: [PATCH 0839/2325] docs: replace " with ' in sample code

No reason to use `"`.
---
 user_guide_src/source/outgoing/localization.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/outgoing/localization.rst b/user_guide_src/source/outgoing/localization.rst
index 4c78ed39ee44..58b24c48524f 100644
--- a/user_guide_src/source/outgoing/localization.rst
+++ b/user_guide_src/source/outgoing/localization.rst
@@ -170,9 +170,9 @@ You can pass an array of values to replace placeholders in the language string a
 
     // The language file, Tests.php:
     return [
-        "apples"      => "I have {0, number} apples.",
-        "men"         => "The top {1, number} men out-performed the remaining {0, number}",
-        "namedApples" => "I have {number_apples, number, integer} apples.",
+        'apples'      => 'I have {0, number} apples.',
+        'men'         => 'The top {1, number} men out-performed the remaining {0, number}',
+        'namedApples' => 'I have {number_apples, number, integer} apples.',
     ];
 
     // Displays "I have 3 apples."
@@ -186,7 +186,7 @@ The first item in the placeholder corresponds to the index of the item in the ar
 You can also use named keys to make it easier to keep things straight, if you'd like::
 
     // Displays "I have 3 apples."
-    echo lang("Tests.namedApples", ['number_apples' => 3]);
+    echo lang('Tests.namedApples', ['number_apples' => 3]);
 
 Obviously, you can do more than just number replacement. According to the
 `official ICU docs <https://unicode-org.github.io/icu-docs/apidoc/released/icu4c/classMessageFormat.html#details>`_ for the underlying

From 95a0ed59f17e3d5495bc4ac187b43d9829ae5df1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 24 Nov 2021 18:38:48 +0900
Subject: [PATCH 0840/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/incoming/routing.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index be571d34b736..0e9f3bb4e6be 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -590,7 +590,7 @@ Route processing by priority
 
 Enables or disables processing of the routes queue by priority. Lowering the priority is defined in the route option.
 Disabled by default. This functionality affects all routes.
-For an example of use lowering the priority see :ref:`routing-priority`::
+For an example use of lowering the priority see :ref:`routing-priority`::
 
     // to enable
     $routes->setPrioritize();

From 9edc247dbafae08f5e55c2b0e41ad18175e14afe Mon Sep 17 00:00:00 2001
From: Toto Prayogo <totoprayogo1916@gmail.com>
Date: Wed, 24 Nov 2021 20:57:38 +0700
Subject: [PATCH 0841/2325] update line numbers about Paths.php

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

diff --git a/user_guide_src/source/general/managing_apps.rst b/user_guide_src/source/general/managing_apps.rst
index c1781e032fa0..21fcebdf9407 100644
--- a/user_guide_src/source/general/managing_apps.rst
+++ b/user_guide_src/source/general/managing_apps.rst
@@ -14,14 +14,14 @@ Renaming or Relocating the Application Directory
 If you would like to rename your application directory or even move
 it to a different location on your server, other than your project root, open
 your main **app/Config/Paths.php** and set a *full server path* in the
-``$appDirectory`` variable (at about line 45)::
+``$appDirectory`` variable (at about line 44)::
 
     public $appDirectory = '/path/to/your/application';
 
 You will need to modify two additional files in your project root, so that
 they can find the ``Paths`` configuration file:
 
-- ``/spark`` runs command line apps; the path is specified on or about line 36::
+- ``/spark`` runs command line apps; the path is specified on or about line 35::
 
     $pathsConfig = 'app/Config/Paths.php';
     // ^^^ Change this line if you move your application folder

From bead7d01437aaef5f22f6e7bc9b8ff078859ae00 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Nov 2021 15:03:44 +0000
Subject: [PATCH 0842/2325] chore(deps-dev): update rector/rector requirement
 from 0.12.4 to 0.12.5

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.12.4...0.12.5)

---
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 4e3ebda66819..064f7b392e05 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.4"
+        "rector/rector": "0.12.5"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From 9def2430108d867615145e612419f64f7dc8f194 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 15 Nov 2021 13:23:58 +0900
Subject: [PATCH 0843/2325] chore: add PHPUnitSetList::PHPUNIT_80 and remove
 skip of AssertFalseStrposToContainsRector

---
 rector.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/rector.php b/rector.php
index 829ec303e0f4..92636b0bfdd5 100644
--- a/rector.php
+++ b/rector.php
@@ -42,7 +42,6 @@
 use Rector\Php71\Rector\FuncCall\CountOnNullRector;
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
-use Rector\PHPUnit\Rector\MethodCall\AssertFalseStrposToContainsRector;
 use Rector\PHPUnit\Rector\MethodCall\AssertIssetToSpecificMethodRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Set\ValueObject\LevelSetList;
@@ -57,6 +56,7 @@
     $containerConfigurator->import(SetList::DEAD_CODE);
     $containerConfigurator->import(LevelSetList::UP_TO_PHP_73);
     $containerConfigurator->import(PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD);
+    $containerConfigurator->import(PHPUnitSetList::PHPUNIT_80);
 
     $parameters = $containerConfigurator->parameters();
 
@@ -122,9 +122,6 @@
             __DIR__ . '/tests/system/Entity/EntityTest.php',
             __DIR__ . '/tests/system/Session/SessionTest.php',
         ],
-
-        // assertContains() to string can't be used in PHPUnit 9.1
-        AssertFalseStrposToContainsRector::class,
     ]);
 
     // auto import fully qualified class names

From 3cf95b599a59a1569378aa20fe944e096bc6ca4a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 15 Nov 2021 13:25:13 +0900
Subject: [PATCH 0844/2325] test: refactor: vendor/bin/rector process
 tests/system/

---
 tests/system/HTTP/ResponseTest.php | 4 ++--
 tests/system/View/ViewTest.php     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php
index 64eab48dc0fa..b4eba4c547c9 100644
--- a/tests/system/HTTP/ResponseTest.php
+++ b/tests/system/HTTP/ResponseTest.php
@@ -327,7 +327,7 @@ public function testJSONWithArray()
         $response->setJSON($body);
 
         $this->assertSame($expected, $response->getJSON());
-        $this->assertNotFalse(strpos($response->getHeaderLine('content-type'), 'application/json'));
+        $this->assertStringContainsString('application/json', $response->getHeaderLine('content-type'));
     }
 
     public function testJSONGetFromNormalBody()
@@ -364,7 +364,7 @@ public function testXMLWithArray()
         $response->setXML($body);
 
         $this->assertSame($expected, $response->getXML());
-        $this->assertNotFalse(strpos($response->getHeaderLine('content-type'), 'application/xml'));
+        $this->assertStringContainsString('application/xml', $response->getHeaderLine('content-type'));
     }
 
     public function testXMLGetFromNormalBody()
diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php
index 435c4d8f9578..d740e17a4c34 100644
--- a/tests/system/View/ViewTest.php
+++ b/tests/system/View/ViewTest.php
@@ -316,8 +316,8 @@ public function testRenderLayoutWithInclude()
 
         $content = $view->render('extend_include');
 
-        $this->assertNotFalse(strpos($content, '<p>Open</p>'));
-        $this->assertNotFalse(strpos($content, '<h1>Hello World</h1>'));
+        $this->assertStringContainsString('<p>Open</p>', $content);
+        $this->assertStringContainsString('<h1>Hello World</h1>', $content);
         $this->assertSame(2, substr_count($content, 'Hello World'));
     }
 

From 6cd24700ac3be69e776e0d9db1c5df5447299505 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Thu, 25 Nov 2021 12:08:40 +0800
Subject: [PATCH 0845/2325] Additional fix for deprecated `null` usage

---
 system/HTTP/IncomingRequest.php   |  2 +-
 system/Validation/FormatRules.php | 22 ++++++++++++++++------
 system/Validation/Rules.php       | 10 +++++++++-
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 3ac25b6df5fd..76b0c1d1c40a 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -565,7 +565,7 @@ public function getJsonVar(string $index, bool $assoc = false, ?int $filter = nu
      */
     public function getRawInput()
     {
-        parse_str($this->body, $output);
+        parse_str($this->body ?? '', $output);
 
         return $output;
     }
diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index e28f6d6af13d..4d02f221365d 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -45,11 +45,16 @@ public function alpha_space(?string $value = null): bool
 
     /**
      * Alphanumeric with underscores and dashes
+     *
+     * @see https://regex101.com/r/XfVY3d/1
      */
     public function alpha_dash(?string $str = null): bool
     {
-        // @see https://regex101.com/r/XfVY3d/1
-        return (bool) preg_match('/\A[a-z0-9_-]+\z/i', $str);
+        if ($str === null) {
+            return false;
+        }
+
+        return preg_match('/\A[a-z0-9_-]+\z/i', $str) === 1;
     }
 
     /**
@@ -59,14 +64,19 @@ public function alpha_dash(?string $str = null): bool
      * _ underscore, + plus, = equals, | vertical bar, : colon, . period
      * ~ ! # $ % & * - _ + = | : .
      *
-     * @param string $str
+     * @param string|null $str
      *
      * @return bool
+     *
+     * @see https://regex101.com/r/6N8dDY/1
      */
     public function alpha_numeric_punct($str)
     {
-        // @see https://regex101.com/r/6N8dDY/1
-        return (bool) preg_match('/\A[A-Z0-9 ~!#$%\&\*\-_+=|:.]+\z/i', $str);
+        if ($str === null) {
+            return false;
+        }
+
+        return preg_match('/\A[A-Z0-9 ~!#$%\&\*\-_+=|:.]+\z/i', $str) === 1;
     }
 
     /**
@@ -307,7 +317,7 @@ public function valid_url_strict(?string $str = null, ?string $validSchemes = nu
             return false;
         }
 
-        $scheme       = strtolower(parse_url($str, PHP_URL_SCHEME));
+        $scheme       = strtolower(parse_url($str, PHP_URL_SCHEME) ?? ''); // absent scheme gives null
         $validSchemes = explode(
             ',',
             strtolower($validSchemes ?? 'http,https')
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
index 367915ebae35..aba9ff117df6 100644
--- a/system/Validation/Rules.php
+++ b/system/Validation/Rules.php
@@ -213,11 +213,19 @@ public function not_in_list(?string $value, string $list): bool
      */
     public function required($str = null): bool
     {
+        if ($str === null) {
+            return false;
+        }
+
         if (is_object($str)) {
             return true;
         }
 
-        return is_array($str) ? ! empty($str) : (trim($str) !== '');
+        if (is_array($str)) {
+            return $str !== [];
+        }
+
+        return trim((string) $str) !== '';
     }
 
     /**

From b2f49be433d3c195be5fc3cfd76eb417e1034ca7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 25 Nov 2021 13:28:11 +0900
Subject: [PATCH 0846/2325] docs: improve explanation

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

diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst
index 0c38a36bb14b..15a4040f020a 100644
--- a/user_guide_src/source/general/modules.rst
+++ b/user_guide_src/source/general/modules.rst
@@ -128,8 +128,8 @@ present, then no auto-discovery will happen for that item, but the others in the
 Discovery and Composer
 ======================
 
-Packages that were installed via Composer will also be discovered by default. This only requires that the namespace
-that Composer knows about is a PSR-4 namespace. PSR-0 namespaces will not be detected.
+Packages installed via Composer using PSR-4 namespaces will also be discovered by default.
+PSR-0 namespaced packages will not be detected.
 
 If you do not want all of Composer's known directories to be scanned when locating files, you can turn this off
 by editing the ``$discoverInComposer`` variable in ``Config\Modules.php``::

From 0a5508202b1c08928c7bcb863837a8a119951b32 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 25 Nov 2021 22:24:19 +0800
Subject: [PATCH 0847/2325] Add support for PHP 8.1 (#4883)

---
 .github/workflows/test-phpunit.yml | 36 ++++++++++++++----------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index aa7d584991a6..4583244ed358 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -4,12 +4,7 @@ on:
   push:
     branches:
       - develop
-      - '4.*'
     paths:
-      - 'app/**'
-      - 'public/**'
-      - 'system/**'
-      - 'tests/**'
       - composer.json
       - spark
       - phpunit.xml.dist
@@ -18,12 +13,7 @@ on:
   pull_request:
     branches:
       - develop
-      - '4.*'
     paths:
-      - 'app/**'
-      - 'public/**'
-      - 'system/**'
-      - 'tests/**'
       - composer.json
       - spark
       - phpunit.xml.dist
@@ -31,22 +21,24 @@ on:
       - .github/workflows/test-phpunit.yml
 
 jobs:
-
   tests:
+    name: PHP ${{ matrix.php-versions }} - ${{ matrix.db-platforms }}
     runs-on: ubuntu-20.04
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
-    name: PHP ${{ matrix.php-versions }} - ${{ matrix.db-platforms }}
 
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.3', '7.4', '8.0']
+        php-versions: ['7.3', '7.4', '8.0', '8.1']
         db-platforms: ['MySQLi', 'Postgre', 'SQLite3', 'SQLSRV']
         mysql-versions: ['5.7']
         include:
           - php-versions: '7.4'
             db-platforms: MySQLi
             mysql-versions: '8.0'
+          # @todo remove once 8.1 is stable enough
+          - php-versions: '8.1'
+            composer-flag: '--ignore-platform-req=php'
 
     services:
       mysql:
@@ -57,6 +49,7 @@ jobs:
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
       postgres:
         image: postgres
         env:
@@ -66,6 +59,7 @@ jobs:
         ports:
           - 5432:5432
         options: --health-cmd=pg_isready --health-interval=10s --health-timeout=5s --health-retries=3
+
       mssql:
         image: mcr.microsoft.com/mssql/server:2019-CU10-ubuntu-20.04
         env:
@@ -75,11 +69,13 @@ jobs:
         ports:
           - 1433:1433
         options: --health-cmd="/opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U sa -P 1Secure*Password1 -Q 'SELECT @@VERSION'" --health-interval=10s --health-timeout=5s --health-retries=3
+
       redis:
         image: redis
         ports:
           - 6379:6379
         options: --health-cmd "redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
       memcached:
         image: memcached:1.6-alpine
         ports:
@@ -105,6 +101,7 @@ jobs:
 
       - name: Install latest ImageMagick
         run: |
+          sudo apt-get update
           sudo apt-get install --reinstall libgs9-common fonts-noto-mono libgs9:amd64 libijs-0.35:amd64 fonts-urw-base35 ghostscript poppler-data libjbig2dec0:amd64 gsfonts libopenjp2-7:amd64 fonts-droid-fallback ttf-dejavu-core
           sudo apt-get install -y imagemagick
           sudo apt-get install --fix-broken
@@ -122,13 +119,13 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer update --ansi --no-interaction
-          composer remove --ansi --dev --unused -W rector/rector phpstan/phpstan friendsofphp/php-cs-fixer nexusphp/cs-config codeigniter/coding-standard
+          composer update --ansi --no-interaction ${{ matrix.composer-flag }}
+          composer remove --ansi --dev --unused -W ${{ matrix.composer-flag }} -- rector/rector phpstan/phpstan friendsofphp/php-cs-fixer nexusphp/cs-config codeigniter/coding-standard
         env:
           COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
 
-      - name: Profile slow tests in PHP 7.4 MySQLi for now
-        if: matrix.php-versions == '7.4' && matrix.db-platforms == 'MySQLi'
+      - name: Profile slow tests in PHP 8.0
+        if: matrix.php-versions == '8.0'
         run: echo "TACHYCARDIA_MONITOR_GA=enabled" >> $GITHUB_ENV
 
       - name: Test with PHPUnit
@@ -137,8 +134,8 @@ jobs:
           DB: ${{ matrix.db-platforms }}
           TERM: xterm-256color
 
-      - if: github.repository_owner == 'codeigniter4' && matrix.php-versions == '7.4'
-        name: Run Coveralls
+      - name: Run Coveralls
+        if: github.repository_owner == 'codeigniter4' && matrix.php-versions == '8.0'
         run: |
           composer global require --ansi php-coveralls/php-coveralls:^2.4
           php-coveralls --coverage_clover=build/logs/clover.xml -v
@@ -151,6 +148,7 @@ jobs:
     if: github.repository_owner == 'codeigniter4'
     needs: [tests]
     runs-on: ubuntu-20.04
+
     steps:
       - name: Coveralls Finished
         uses: coverallsapp/github-action@master

From 567f0c6507941ffbac0cfeb55e2cc19f84ab6944 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 26 Nov 2021 08:53:44 +0900
Subject: [PATCH 0848/2325] fix: IncomingRequest::getJsonVar() may cause
 TypeError

See #5391

[TypeError]
dot_array_search(): Argument #2 ($array) must be of type array, null given, called in .../system/HTTP/IncomingRequest.php on line 540
at SYSTEMPATH/Helpers/array_helper.php:21
---
 system/HTTP/IncomingRequest.php           |  6 +++++-
 tests/system/HTTP/IncomingRequestTest.php | 23 +++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 76b0c1d1c40a..ea5b968a6f79 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -537,7 +537,11 @@ public function getJsonVar(string $index, bool $assoc = false, ?int $filter = nu
     {
         helper('array');
 
-        $data = dot_array_search($index, $this->getJSON(true));
+        $json = $this->getJSON(true);
+        if (! is_array($json)) {
+            return null;
+        }
+        $data = dot_array_search($index, $json);
 
         if ($data === null) {
             return null;
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 3b14c6a03357..4229d5d264ec 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -394,6 +394,29 @@ public function testGetVarWorksWithJsonAndGetParams()
         $this->assertSame('buzz', $all['fizz']);
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5391
+     */
+    public function testGetJsonVarReturnsNullFromNullBody()
+    {
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+        $json            = null;
+        $request         = new IncomingRequest($config, new URI(), $json, new UserAgent());
+
+        $this->assertNull($request->getJsonVar('myKey'));
+    }
+
+    public function testgetJSONReturnsNullFromNullBody()
+    {
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+        $json            = null;
+        $request         = new IncomingRequest($config, new URI(), $json, new UserAgent());
+
+        $this->assertNull($request->getJSON());
+    }
+
     public function testCanGrabGetRawInput()
     {
         $rawstring = 'username=admin001&role=administrator&usepass=0';

From 9c9c4d2e15805ecfa0163469021ac49c13ff14f8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 26 Nov 2021 09:24:11 +0900
Subject: [PATCH 0849/2325] fix: passing null to parameter of type string

ErrorException: json_decode(): Passing null to parameter #1 ($json) of type string is deprecated
---
 system/HTTP/IncomingRequest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index ea5b968a6f79..071b18e97d00 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -520,7 +520,7 @@ public function getVar($index = null, $filter = null, $flags = null)
      */
     public function getJSON(bool $assoc = false, int $depth = 512, int $options = 0)
     {
-        return json_decode($this->body, $assoc, $depth, $options);
+        return json_decode($this->body ?? '', $assoc, $depth, $options);
     }
 
     /**

From ed0207d29a86c00c2e1b95ad22b142c0f440c9d1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 26 Nov 2021 14:43:00 +0900
Subject: [PATCH 0850/2325] docs: add space after `//` in sample code

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

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index d08bf8470f70..63a4aa5266df 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -149,7 +149,7 @@ data that you want or you can use "dot" notation to dig into the JSON to get dat
 
 ::
 
-    //With a request body of:
+    // With a request body of:
     {
         "foo": "bar",
         "fizz": {
@@ -157,10 +157,10 @@ data that you want or you can use "dot" notation to dig into the JSON to get dat
         }
     }
     $data = $request->getVar('foo');
-    //$data = "bar"
+    // $data = "bar"
 
     $data = $request->getVar('fizz.buzz');
-    //$data = "baz"
+    // $data = "baz"
 
 
 If you want the result to be an associative array instead of an object, you can use ``getJsonVar()`` instead and pass
@@ -169,12 +169,12 @@ correct ``CONTENT_TYPE`` header.
 
 ::
 
-    //With the same request as above
+    // With the same request as above
     $data = $request->getJsonVar('fizz');
-    //$data->buzz = "baz"
+    // $data->buzz = "baz"
 
     $data = $request->getJsonVar('fizz', true);
-    //$data = ["buzz" => "baz"]
+    // $data = ["buzz" => "baz"]
 
 .. note:: See the documentation for ``dot_array_search()`` in the ``Array`` helper for more information on "dot" notation.
 

From 59d1b74effaa4db8a3faaa8526186d373adce8fb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 26 Nov 2021 17:13:29 +0900
Subject: [PATCH 0851/2325] docs: fix about class loading

Update application folder name.
Remove about Legacy Support which was removed in 4.1.0.
---
 user_guide_src/source/installation/upgrade_4xx.rst | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst
index ae6bd0188608..6b693b3101cb 100644
--- a/user_guide_src/source/installation/upgrade_4xx.rst
+++ b/user_guide_src/source/installation/upgrade_4xx.rst
@@ -78,10 +78,8 @@ General Adjustments
 - Classes are instantiated where needed, and components are managed
   by ``Services``.
 - The class loader automatically handles PSR-4 style class locating,
-  within the ``App`` (application) and ``CodeIgniter`` (i.e., system) top level
-  namespaces; with composer autoloading support, and even using educated
-  guessing to find your models and libraries if they are in the right
-  folder even though not namespaced.
+  within the ``App`` (**app**) and ``CodeIgniter`` (i.e., **system**) top level
+  namespaces; with Composer autoloading support.
 - You can configure the class loading to support whatever application structure
   you are most comfortable with, including the "HMVC" style.
 

From c28b5d10fc3c2049daaf34f8b703a418e7b89772 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 26 Nov 2021 17:19:31 +0900
Subject: [PATCH 0852/2325] docs: decorate file paths with **

---
 .../source/installation/upgrade_4xx.rst       | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst
index 6b693b3101cb..d4f219d4d7a3 100644
--- a/user_guide_src/source/installation/upgrade_4xx.rst
+++ b/user_guide_src/source/installation/upgrade_4xx.rst
@@ -39,26 +39,26 @@ General Adjustments
 
 **Application Structure**
 
-- The ``application`` folder is renamed as ``app`` and the framework still has ``system`` folders,
+- The **application** folder is renamed as **app** and the framework still has **system** folders,
   with the same interpretation as before.
-- The framework now provides for a ``public`` folder, intended as the document root for your app.
-- There is also a ``writable`` folder, to hold cache data, logs, and session data.
-- The ``app`` folder looks very similar to ``application`` for CI3, with some
-  name changes, and some subfolders moved to the ``writable`` folder.
-- There is no longer a nested ``application/core`` folder, as we have
+- The framework now provides for a **public** folder, intended as the document root for your app.
+- There is also a **writable** folder, to hold cache data, logs, and session data.
+- The **app** folder looks very similar to **application** for CI3, with some
+  name changes, and some subfolders moved to the **writable** folder.
+- There is no longer a nested **application/core** folder, as we have
   a different mechanism for extending framework components (see below).
 
 **Model, View and Controller**
 
 - CodeIgniter is based on the MVC concept. Thus, the changes on the Model, View and Controller
   are one of the most important things you have to handle.
-- In CodeIgniter 4, models are now located in ``app/Models`` and you have to add the lines
+- In CodeIgniter 4, models are now located in **app/Models** and you have to add the lines
   ``namespace App\Models;`` along with ``use CodeIgniter\Model;`` right after the opening php tag.
   The last step is to replace ``extends CI_Model`` with ``extends Model``.
-- The views of CodeIgniter 4 have been moved ``to app/Views``. Furthermore, you have to change
+- The views of CodeIgniter 4 have been moved to **app/Views**. Furthermore, you have to change
   the syntax of loading views from ``$this->load->view('directory_name/file_name')`` to
   ``echo view('directory_name/file_name');``.
-- Controllers of CodeIgniter 4 have to be moved to ``app/Controllers;``. After that,
+- Controllers of CodeIgniter 4 have to be moved to **app/Controllers**. After that,
   add ``namespace App\Controllers;`` after the opening php tag.
   Lastly, replace ``extends CI_Controller`` with ``extends BaseController``.
 - For more information we recommend you the following upgrade guides, which will give
@@ -85,7 +85,7 @@ General Adjustments
 
 **Libraries**
 
-- Your app classes can still go inside ``app/Libraries``, but they don't have to.
+- Your app classes can still go inside **app/Libraries**, but they don't have to.
 - Instead of CI3's ``$this->load->library(x);`` you can now use
   ``$this->x = new X();``, following namespaced conventions for your component.
 
@@ -105,18 +105,18 @@ General Adjustments
 
 **Extending the framework**
 
-- You don't need a ``core`` folder to hold ``MY_...`` framework
+- You don't need a **core** folder to hold ``MY_...`` framework
   component extensions or replacements.
 - You don't need ``MY_x`` classes inside your libraries folder
   to extend or replace CI4 pieces.
 - Make any such classes where you like, and add appropriate
-  service methods in ``app/Config/Services.php`` to load
+  service methods in **app/Config/Services.php** to load
   your components instead of the default ones.
 
 Upgrading Libraries
 ===================
 
-- Your app classes can still go inside ``app/Libraries``, but they don’t have to.
+- Your app classes can still go inside **app/Libraries**, but they don’t have to.
 - Instead of CI3’s ``$this->load->library(x);`` you can now use ``$this->x = new X();``,
   following namespaced conventions for your component.
 - Some libraries from CodeIgniter 3 no longer exists in Version 4. For all these

From a467f3a5ea73def182494dbb0a3cc46cfa9f739e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 26 Nov 2021 18:33:50 +0900
Subject: [PATCH 0853/2325] docs: add settings and devkit repositories

---
 .../source/installation/repositories.rst      | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/user_guide_src/source/installation/repositories.rst b/user_guide_src/source/installation/repositories.rst
index 9e4e0abc9db9..e35de088e99e 100644
--- a/user_guide_src/source/installation/repositories.rst
+++ b/user_guide_src/source/installation/repositories.rst
@@ -6,15 +6,21 @@ The CodeIgniter 4 open source project has its own
 
 There are several development repositories, of interest to potential contributors:
 
-+---------------------------------------------------------------------+--------------+-----------------------------------------------------------------+
-| Repository                                                          | Audience     | Description                                                     |
-+=====================================================================+==============+=================================================================+
-| CodeIgniter4                                                        | contributors | Project codebase, including tests & user guide sources          |
-+---------------------------------------------------------------------+--------------+-----------------------------------------------------------------+
-| translations                                                        | developers   | System message translations                                     |
-+---------------------------------------------------------------------+--------------+-----------------------------------------------------------------+
-| `coding-standard <https://github.com/CodeIgniter/coding-standard>`_ | contributors | Coding style conventions & rules                                |
-+---------------------------------------------------------------------+--------------+-----------------------------------------------------------------+
++------------------+--------------+-----------------------------------------------------------------+
+| Repository       | Audience     | Description                                                     |
++==================+==============+=================================================================+
+| CodeIgniter4     | contributors | Project codebase, including tests & user guide sources          |
++------------------+--------------+-----------------------------------------------------------------+
+| translations     | developers   | System message translations                                     |
++------------------+--------------+-----------------------------------------------------------------+
+| coding-standard_ | contributors | Coding style conventions & rules                                |
++------------------+--------------+-----------------------------------------------------------------+
+| settings         | developers   | Settings Library for CodeIgniter 4                              |
++------------------+--------------+-----------------------------------------------------------------+
+| devkit           | developers   | Development toolkit for CodeIgniter libraries and projects      |
++------------------+--------------+-----------------------------------------------------------------+
+
+.. _coding-standard: https://github.com/CodeIgniter/coding-standard
 
 There are also several deployment repositories, referenced in the installation directions.
 The deployment repositories are built automatically when a new version is released, and they

From b83d2646c4a4f1847d59b183cd2aa0cd0da4269f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 26 Nov 2021 18:34:35 +0900
Subject: [PATCH 0854/2325] docs: update codeigniter.com repository

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

diff --git a/user_guide_src/source/installation/repositories.rst b/user_guide_src/source/installation/repositories.rst
index e35de088e99e..be7e0863136f 100644
--- a/user_guide_src/source/installation/repositories.rst
+++ b/user_guide_src/source/installation/repositories.rst
@@ -66,7 +66,7 @@ but which showcase it or make it easier to work with!
 +------------------+--------------+-----------------------------------------------------------------+
 | Repository       | Audience     | Description                                                     |
 +==================+==============+=================================================================+
-| website2         | developers   | The codeigniter.com website, written in CodeIgniter 4           |
+| website          | developers   | The codeigniter.com website, written in CodeIgniter 4           |
 +------------------+--------------+-----------------------------------------------------------------+
 | playground       | developers   | Basic code examples in project form. Still growing.             |
 +------------------+--------------+-----------------------------------------------------------------+

From 8c638e05c8a7515d1e987ae0fbbac1169f50b751 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 27 Nov 2021 10:55:35 +0900
Subject: [PATCH 0855/2325] docs: add about BaseBuilder::$tableName in
 changelog

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

diff --git a/user_guide_src/source/changelogs/v4.1.6.rst b/user_guide_src/source/changelogs/v4.1.6.rst
index 093ea6ca8aec..2bb0f77f9536 100644
--- a/user_guide_src/source/changelogs/v4.1.6.rst
+++ b/user_guide_src/source/changelogs/v4.1.6.rst
@@ -11,6 +11,7 @@ Release Date: Not released
 
 BREAKING
 ========
+- Multiple table names will no longer be stored in ``BaseBuilder::$tableName`` - an empty string will be used instead.
 
 Enhancements
 ============

From fa1ae6802d8d5fe0981d825563395bf72a6726d6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 27 Nov 2021 11:06:36 +0900
Subject: [PATCH 0856/2325] docs: remove deprecated
 CodeIgniter\Config\Config::get() usage

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

diff --git a/user_guide_src/source/installation/upgrade_configuration.rst b/user_guide_src/source/installation/upgrade_configuration.rst
index 21c309cb34f2..78793439e333 100644
--- a/user_guide_src/source/installation/upgrade_configuration.rst
+++ b/user_guide_src/source/installation/upgrade_configuration.rst
@@ -31,8 +31,7 @@ Upgrade Guide
    from the CI3 config into the new CI4 config class as public class properties.
 4. Now, you have to change the config fetching syntax everywhere you fetch config
    values. The CI3 syntax is something like ``$this->config->item('item_name');``.
-   You have to change this into ``config('MyConfigFile')->item_name;``. Alternatively,
-   you can use the object-oriented approach: ``CodeIgniter\Config\Config::get('MyConfigFile')->item_name;``
+   You have to change this into ``config('MyConfigFile')->item_name;``.
 
 Code Example
 ============

From 748b11a6ae8b35fdcb608ccb6c8c6c45ef65b70c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 27 Nov 2021 11:09:13 +0900
Subject: [PATCH 0857/2325] docs: decorate file paths with **

---
 .../source/installation/upgrade_configuration.rst           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_configuration.rst b/user_guide_src/source/installation/upgrade_configuration.rst
index 78793439e333..cad74dc1e713 100644
--- a/user_guide_src/source/installation/upgrade_configuration.rst
+++ b/user_guide_src/source/installation/upgrade_configuration.rst
@@ -25,7 +25,7 @@ Upgrade Guide
 1. You have to change the values in the default CI4 config files according to the
    changes in the CI3 files. The config names are pretty much the same as in CI3.
 2. If you are using custom config files in your CI3 project you have to create those
-   files as new PHP classes in your CI4 project in ``app/Config/``. These classes
+   files as new PHP classes in your CI4 project in **app/Config**. These classes
    should be in the ``Config`` namespace and should extend ``CodeIgniter\Config\BaseConfig``.
 3. Once you have created all custom config classes, you have to copy the variables
    from the CI3 config into the new CI4 config class as public class properties.
@@ -39,7 +39,7 @@ Code Example
 CodeIgniter Version 3.11
 ------------------------
 
-Path: ``application/models``::
+Path: **application/config**::
 
     <?php
 
@@ -51,7 +51,7 @@ Path: ``application/models``::
 CodeIgniter Version 4.x
 -----------------------
 
-Path: ``app/Config``::
+Path: **app/Config**::
 
    <?php
 

From 6133888ca406ac8461005577fc663f2abcbfaf40 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 28 Nov 2021 14:00:57 +0900
Subject: [PATCH 0858/2325] fix: remove dependency on VENDORPATH

Fixes #5401
---
 system/Debug/Toolbar/Collectors/Database.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index db13e14e920e..520ddc7c5dc6 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -141,7 +141,10 @@ public function display(): array
                 // Clean up the file paths
                 $traceLine['file'] = str_ireplace(APPPATH, 'APPPATH/', $traceLine['file']);
                 $traceLine['file'] = str_ireplace(SYSTEMPATH, 'SYSTEMPATH/', $traceLine['file']);
-                $traceLine['file'] = str_ireplace(VENDORPATH, 'VENDORPATH/', $traceLine['file']);
+                if (defined('VENDORPATH')) {
+                    // VENDORPATH is not defined unless `vendor/autoload.php` exists
+                    $traceLine['file'] = str_ireplace(VENDORPATH, 'VENDORPATH/', $traceLine['file']);
+                }
                 $traceLine['file'] = str_ireplace(ROOTPATH, 'ROOTPATH/', $traceLine['file']);
 
                 if (strpos($traceLine['file'], 'SYSTEMPATH') !== false) {

From 77e3e6ad8c2770dddcc7d73fa7e6bcf79695897e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 29 Nov 2021 13:43:37 +0900
Subject: [PATCH 0859/2325] docs: add GitHub auto-generated release note for
 v4.1.4

---
 CHANGELOG.md | 145 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 144 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a77c0a4d13a..820ca4069478 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,10 +72,153 @@
 
 ## [v4.1.4](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.4) (2021-09-06)
 
+[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.3...v4.1.4)
+
 This release focuses on code style. All changes (except those noted below) are cosmetic to bring the code in line with the new
 [CodeIgniter Coding Standard](https://github.com/CodeIgniter/coding-standard) (based on PSR-12).
 
-*Note: Full changelog forthcoming.*
+**What's Changed**
+
+* Use php-cs-fixer as coding style tool by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4770
+* Convert tabs to spaces by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4771
+* Initial rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4774
+* Fixes incorrect release versions by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4777
+* [CS Migration]Enable `binary_operator_spaces` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4779
+* Update rector/rector requirement from 0.11.8 to 0.11.14 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4785
+* Remove unused local variables by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4783
+* Use static lambda if a binding to `$this` is not required. by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4784
+* [CS Migration]PSR12 rules starting with "b" by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4780
+* Use/Fix `preg_quote()` delimiters by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4789
+* [CS Migration]Update indentation to spaces by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4778
+* Define yoda_style rule and initially apply no_yoda style by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4786
+* Don't override `$path` parameter by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4787
+* Don't override `$value` parameter by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4788
+* Add brackets to clarify intent and avoid unwanted side-effects by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4791
+* Use constants instead of functions by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4793
+* Replace alias functions with origins by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4794
+* Use null coalescing operator by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4796
+* Remove removed `safe_mode` ini Option by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4795
+* Enable `blank_line_before_statement` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4790
+* Enable `braces` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4792
+* Ensure single space between cast and variable by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4797
+* Update rector/rector requirement from 0.11.14 to 0.11.15 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4803
+* It will fix undefined index cid error when sending emails with embedded images by @mmfarhan in https://github.com/codeigniter4/CodeIgniter4/pull/4798
+* Update rector/rector requirement from 0.11.15 to 0.11.16 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4805
+* Phpdoc param return types by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4802
+* [Rector] Apply Rector: SimplifyRegexPatternRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4806
+* Shift binary alignment to `align_single_space_minimal` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4801
+* Enable rules fixing array notations by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4808
+* PSR12: Add visibility identifiers by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4809
+* Class, trait and interface elements must be separated with one line by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4810
+* Enable `ordered_imports` by @totoprayogo1916 in https://github.com/codeigniter4/CodeIgniter4/pull/4815
+* Enable `class_definition` fixer by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4811
+* Revert Model coalesce by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/4819
+* Define remaining "c" rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4817
+* Heredocs-related rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4818
+* Update rector/rector requirement from 0.11.16 to 0.11.20 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4832
+* Initial Phpdoc-related rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4820
+* Phpdoc types by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4823
+* Modernize and standardize typecasting by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4824
+* Enforce ordering and trimming of phpdoc elements by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4822
+* Define switch-related rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4835
+* Define rules starting with "L" by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4838
+* Define rules on unary operators by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4837
+* Define initial "m" rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4839
+* Define rules for ternary operators by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4836
+* Define last "m" rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4842
+* PSR12: Enable `method_argument_space` fixer by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4840
+* Enable `method_chaining_indentation` fixer by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4841
+* Native functions and type hints should be written in correct case by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4845
+* PSR12: All instances created with `new` keyword must be followed by braces. by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4846
+* Master language constructs shall be used instead of aliases. by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4847
+* [Commands] Remove unused $minPHPVersion property at Serve command by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4852
+* Update to latest PHPStan and Rector and Rector config compat by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4861
+* [Rector] Apply Rector: RemoveExtraParametersRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4862
+* [Rector] Apply Rector: RemoveUnusedVariableAssignRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4864
+* Update rector/rector requirement from 0.11.21 to 0.11.23 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4869
+* Test classes should be marked as final and internal by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4870
+* Normalize tests to use dedicated PHPUnit assertions by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4868
+* Other PHPUnit-related fixers by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4871
+* Configure rules in "d" by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4872
+* Defining the trailing "p" rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4873
+* Update to latest laminas-escaper ^2.8 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4878
+* Enable `echo_tag_syntax` until `error_suppression` fixers by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4879
+* Strive for stricter assertions by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4874
+* Convert to explicit those implicit string variables by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4882
+* Enable `explicit_indirect_variable` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4881
+* Update rector/rector requirement from 0.11.23 to 0.11.28 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4889
+* Update to rector 0.11.29 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4893
+* Update rector/rector requirement from 0.11.29 to 0.11.32 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4895
+* Enable remaining rules in "f" by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4888
+* Enable `escape_implicit_backslashes` fixer by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4880
+* Enable prohibitory rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4900
+* Enable `no_null_property_initialization` fixer by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4901
+* Update rector/rector requirement from 0.11.32 to 0.11.35 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4916
+* General phpdocs by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4917
+* Define "i" rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4919
+* Define "o" rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4921
+* Define "r" rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4926
+* [Rector] Re-run InlineIfToExplicitIfRector on Latest Rector 0.11.36 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4930
+* Add `?` to nullable typehints by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4928
+* Define `single_**` rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4924
+* Define last "s" rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4925
+* Define initial "s" rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4923
+* Define remaining rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4934
+* Remove 'memory_usage' from 'displayPerformanceMetrics()' comment by @Mauricevb in https://github.com/codeigniter4/CodeIgniter4/pull/4939
+* Normalize var and return annotations by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4942
+* Fix tag casing and tag types by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4943
+* Change some phpdocs to simple comments by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4945
+* Remove useless code separator comments by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4946
+* Normalize and add file-level headers to `system/`, `tests/`, `utils/` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4949
+* [Rector] Update rector to 0.11.37, clean up config by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4954
+* Update to phpdocumentor v3.0 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4773
+* [PHPStan] Using PHPStan ^0.12.91 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4962
+* Add workflow for linting framework by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4958
+* Update pre-commit to lint code by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4960
+* Remove superfluous phpdoc tags by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4941
+* Update to phpdoc v3.1 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4961
+* [Rector] Apply FuncGetArgsToVariadicParamRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4963
+* Optimize Filters by @mostafakhudair in https://github.com/codeigniter4/CodeIgniter4/pull/4965
+* Update rector/rector requirement from 0.11.37 to 0.11.40 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4967
+* Fix properly the phpstan error in 0.12.93 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4970
+* [Rector] Apply MakeInheritedMethodVisibilitySameAsParentRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4966
+* Fix API repo preparation step by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4969
+* Manual cleanup of docblocks and comments by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4964
+* Delete `docs` directly, not `api/docs` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4976
+* [Rector] Apply Rector: RemoveDuplicatedArrayKeyRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4978
+* Update rector/rector requirement from 0.11.40 to 0.11.42 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4984
+* Update rector/rector requirement from 0.11.42 to 0.11.43 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4985
+* Remove override by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4991
+* Update rector/rector requirement from 0.11.43 to 0.11.46 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4995
+* Update rector/rector requirement from 0.11.46 to 0.11.47 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4997
+* Add SpaceAfterCommentStartFixer by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4999
+* [Rector] Apply Rector: RemoveDoubleAssignRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5000
+* [Rector] Apply Rector dead code set list by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5007
+* Make Cookie compatible with ArrayAccess by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5004
+* Replace deprecated FILTER_SANITIZE_STRING by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5005
+* Make CookieStore compatible with IteratorAggregate::getIterator by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5010
+* Make the session handlers all compatible with SessionHandlerInterface by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5012
+* Make CITestStreamFilter compatible with php_user_filter by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5014
+* Update rector/rector requirement from 0.11.48 to 0.11.49 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5018
+* Make Time compatible with DateTime by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5022
+* Update dependabot config by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5027
+* Add `ReturnTypeWillChange` attribute to Entity by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5028
+* Replace unused Entity private method by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5029
+* Update rector/rector requirement from 0.11.49 to 0.11.52 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5033
+* Fix broken apt installation by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5037
+* Make File compatible with SplFileInfo by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5040
+* Update documentation code samples by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5039
+* PHP Copy-Paste Detector by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5031
+* Fix key casting in form_dropdown helper. by @sfadschm in https://github.com/codeigniter4/CodeIgniter4/pull/5035
+* [Rector] Apply Rector: FixClassCaseSensitivityNameRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5044
+* Bump to php-cs-fixer v3.1 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5045
+* Switch to official coding standard by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5038
+* 4.1.4 Ready code by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5058
+
+**New Contributors**
+
+* @mmfarhan made their first contribution in https://github.com/codeigniter4/CodeIgniter4/pull/4798
+* @Mauricevb made their first contribution in https://github.com/codeigniter4/CodeIgniter4/pull/4939
 
 ## [v4.1.3](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.3) (2021-06-06)
 

From 74d7159ef07cf9378b55b1953c6839da5a2de420 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 29 Nov 2021 14:05:34 +0900
Subject: [PATCH 0860/2325] docs: remove PRs on coding style, rector, phpstan

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 820ca4069478..7a62c588d97c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,17 +80,9 @@ This release focuses on code style. All changes (except those noted below) are c
 **What's Changed**
 
 * Use php-cs-fixer as coding style tool by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4770
-* Convert tabs to spaces by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4771
-* Initial rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4774
-* Fixes incorrect release versions by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4777
-* [CS Migration]Enable `binary_operator_spaces` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4779
-* Update rector/rector requirement from 0.11.8 to 0.11.14 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4785
 * Remove unused local variables by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4783
 * Use static lambda if a binding to `$this` is not required. by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4784
-* [CS Migration]PSR12 rules starting with "b" by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4780
 * Use/Fix `preg_quote()` delimiters by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4789
-* [CS Migration]Update indentation to spaces by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4778
-* Define yoda_style rule and initially apply no_yoda style by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4786
 * Don't override `$path` parameter by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4787
 * Don't override `$value` parameter by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4788
 * Add brackets to clarify intent and avoid unwanted side-effects by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4791
@@ -98,122 +90,51 @@ This release focuses on code style. All changes (except those noted below) are c
 * Replace alias functions with origins by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4794
 * Use null coalescing operator by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4796
 * Remove removed `safe_mode` ini Option by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4795
-* Enable `blank_line_before_statement` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4790
-* Enable `braces` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4792
 * Ensure single space between cast and variable by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4797
-* Update rector/rector requirement from 0.11.14 to 0.11.15 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4803
 * It will fix undefined index cid error when sending emails with embedded images by @mmfarhan in https://github.com/codeigniter4/CodeIgniter4/pull/4798
-* Update rector/rector requirement from 0.11.15 to 0.11.16 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4805
-* Phpdoc param return types by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4802
-* [Rector] Apply Rector: SimplifyRegexPatternRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4806
-* Shift binary alignment to `align_single_space_minimal` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4801
-* Enable rules fixing array notations by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4808
-* PSR12: Add visibility identifiers by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4809
 * Class, trait and interface elements must be separated with one line by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4810
-* Enable `ordered_imports` by @totoprayogo1916 in https://github.com/codeigniter4/CodeIgniter4/pull/4815
-* Enable `class_definition` fixer by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4811
 * Revert Model coalesce by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/4819
-* Define remaining "c" rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4817
-* Heredocs-related rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4818
-* Update rector/rector requirement from 0.11.16 to 0.11.20 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4832
-* Initial Phpdoc-related rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4820
-* Phpdoc types by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4823
 * Modernize and standardize typecasting by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4824
 * Enforce ordering and trimming of phpdoc elements by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4822
-* Define switch-related rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4835
-* Define rules starting with "L" by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4838
-* Define rules on unary operators by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4837
-* Define initial "m" rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4839
-* Define rules for ternary operators by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4836
-* Define last "m" rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4842
-* PSR12: Enable `method_argument_space` fixer by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4840
-* Enable `method_chaining_indentation` fixer by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4841
 * Native functions and type hints should be written in correct case by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4845
-* PSR12: All instances created with `new` keyword must be followed by braces. by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4846
 * Master language constructs shall be used instead of aliases. by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4847
 * [Commands] Remove unused $minPHPVersion property at Serve command by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4852
-* Update to latest PHPStan and Rector and Rector config compat by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4861
-* [Rector] Apply Rector: RemoveExtraParametersRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4862
-* [Rector] Apply Rector: RemoveUnusedVariableAssignRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4864
-* Update rector/rector requirement from 0.11.21 to 0.11.23 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4869
 * Test classes should be marked as final and internal by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4870
 * Normalize tests to use dedicated PHPUnit assertions by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4868
-* Other PHPUnit-related fixers by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4871
-* Configure rules in "d" by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4872
-* Defining the trailing "p" rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4873
 * Update to latest laminas-escaper ^2.8 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4878
-* Enable `echo_tag_syntax` until `error_suppression` fixers by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4879
 * Strive for stricter assertions by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4874
 * Convert to explicit those implicit string variables by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4882
-* Enable `explicit_indirect_variable` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4881
-* Update rector/rector requirement from 0.11.23 to 0.11.28 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4889
-* Update to rector 0.11.29 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4893
-* Update rector/rector requirement from 0.11.29 to 0.11.32 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4895
-* Enable remaining rules in "f" by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4888
-* Enable `escape_implicit_backslashes` fixer by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4880
-* Enable prohibitory rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4900
-* Enable `no_null_property_initialization` fixer by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4901
-* Update rector/rector requirement from 0.11.32 to 0.11.35 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4916
 * General phpdocs by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4917
-* Define "i" rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4919
-* Define "o" rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4921
-* Define "r" rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4926
-* [Rector] Re-run InlineIfToExplicitIfRector on Latest Rector 0.11.36 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4930
 * Add `?` to nullable typehints by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4928
-* Define `single_**` rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4924
-* Define last "s" rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4925
-* Define initial "s" rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4923
-* Define remaining rules by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4934
 * Remove 'memory_usage' from 'displayPerformanceMetrics()' comment by @Mauricevb in https://github.com/codeigniter4/CodeIgniter4/pull/4939
 * Normalize var and return annotations by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4942
 * Fix tag casing and tag types by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4943
 * Change some phpdocs to simple comments by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4945
 * Remove useless code separator comments by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4946
 * Normalize and add file-level headers to `system/`, `tests/`, `utils/` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4949
-* [Rector] Update rector to 0.11.37, clean up config by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4954
 * Update to phpdocumentor v3.0 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4773
-* [PHPStan] Using PHPStan ^0.12.91 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4962
 * Add workflow for linting framework by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4958
 * Update pre-commit to lint code by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4960
 * Remove superfluous phpdoc tags by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4941
-* Update to phpdoc v3.1 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4961
-* [Rector] Apply FuncGetArgsToVariadicParamRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4963
 * Optimize Filters by @mostafakhudair in https://github.com/codeigniter4/CodeIgniter4/pull/4965
-* Update rector/rector requirement from 0.11.37 to 0.11.40 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4967
 * Fix properly the phpstan error in 0.12.93 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4970
-* [Rector] Apply MakeInheritedMethodVisibilitySameAsParentRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4966
 * Fix API repo preparation step by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4969
 * Manual cleanup of docblocks and comments by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4964
 * Delete `docs` directly, not `api/docs` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4976
-* [Rector] Apply Rector: RemoveDuplicatedArrayKeyRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4978
-* Update rector/rector requirement from 0.11.40 to 0.11.42 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4984
-* Update rector/rector requirement from 0.11.42 to 0.11.43 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4985
-* Remove override by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4991
-* Update rector/rector requirement from 0.11.43 to 0.11.46 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4995
-* Update rector/rector requirement from 0.11.46 to 0.11.47 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/4997
-* Add SpaceAfterCommentStartFixer by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4999
-* [Rector] Apply Rector: RemoveDoubleAssignRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5000
-* [Rector] Apply Rector dead code set list by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5007
 * Make Cookie compatible with ArrayAccess by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5004
 * Replace deprecated FILTER_SANITIZE_STRING by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5005
 * Make CookieStore compatible with IteratorAggregate::getIterator by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5010
 * Make the session handlers all compatible with SessionHandlerInterface by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5012
 * Make CITestStreamFilter compatible with php_user_filter by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5014
-* Update rector/rector requirement from 0.11.48 to 0.11.49 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5018
 * Make Time compatible with DateTime by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5022
-* Update dependabot config by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5027
 * Add `ReturnTypeWillChange` attribute to Entity by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5028
 * Replace unused Entity private method by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5029
-* Update rector/rector requirement from 0.11.49 to 0.11.52 by @dependabot in https://github.com/codeigniter4/CodeIgniter4/pull/5033
 * Fix broken apt installation by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5037
 * Make File compatible with SplFileInfo by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5040
 * Update documentation code samples by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5039
 * PHP Copy-Paste Detector by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5031
 * Fix key casting in form_dropdown helper. by @sfadschm in https://github.com/codeigniter4/CodeIgniter4/pull/5035
-* [Rector] Apply Rector: FixClassCaseSensitivityNameRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5044
-* Bump to php-cs-fixer v3.1 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5045
 * Switch to official coding standard by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5038
-* 4.1.4 Ready code by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5058
 
 **New Contributors**
 

From b89cf02a558c54de202f215ffda1f8fa848f990a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 29 Nov 2021 14:19:12 +0900
Subject: [PATCH 0861/2325] docs: remove PRs on coding style, github/workflow

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a62c588d97c..9d2a65357cab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -86,41 +86,17 @@ This release focuses on code style. All changes (except those noted below) are c
 * Don't override `$path` parameter by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4787
 * Don't override `$value` parameter by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4788
 * Add brackets to clarify intent and avoid unwanted side-effects by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4791
-* Use constants instead of functions by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4793
-* Replace alias functions with origins by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4794
-* Use null coalescing operator by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4796
 * Remove removed `safe_mode` ini Option by @jeromegamez in https://github.com/codeigniter4/CodeIgniter4/pull/4795
-* Ensure single space between cast and variable by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4797
 * It will fix undefined index cid error when sending emails with embedded images by @mmfarhan in https://github.com/codeigniter4/CodeIgniter4/pull/4798
-* Class, trait and interface elements must be separated with one line by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4810
 * Revert Model coalesce by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/4819
-* Modernize and standardize typecasting by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4824
-* Enforce ordering and trimming of phpdoc elements by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4822
-* Native functions and type hints should be written in correct case by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4845
 * Master language constructs shall be used instead of aliases. by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4847
 * [Commands] Remove unused $minPHPVersion property at Serve command by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4852
-* Test classes should be marked as final and internal by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4870
-* Normalize tests to use dedicated PHPUnit assertions by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4868
 * Update to latest laminas-escaper ^2.8 by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/4878
-* Strive for stricter assertions by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4874
-* Convert to explicit those implicit string variables by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4882
-* General phpdocs by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4917
-* Add `?` to nullable typehints by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4928
 * Remove 'memory_usage' from 'displayPerformanceMetrics()' comment by @Mauricevb in https://github.com/codeigniter4/CodeIgniter4/pull/4939
-* Normalize var and return annotations by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4942
-* Fix tag casing and tag types by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4943
-* Change some phpdocs to simple comments by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4945
 * Remove useless code separator comments by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4946
-* Normalize and add file-level headers to `system/`, `tests/`, `utils/` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4949
-* Update to phpdocumentor v3.0 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4773
-* Add workflow for linting framework by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4958
-* Update pre-commit to lint code by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4960
-* Remove superfluous phpdoc tags by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4941
 * Optimize Filters by @mostafakhudair in https://github.com/codeigniter4/CodeIgniter4/pull/4965
 * Fix properly the phpstan error in 0.12.93 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4970
-* Fix API repo preparation step by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4969
 * Manual cleanup of docblocks and comments by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4964
-* Delete `docs` directly, not `api/docs` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4976
 * Make Cookie compatible with ArrayAccess by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5004
 * Replace deprecated FILTER_SANITIZE_STRING by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5005
 * Make CookieStore compatible with IteratorAggregate::getIterator by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5010
@@ -129,7 +105,6 @@ This release focuses on code style. All changes (except those noted below) are c
 * Make Time compatible with DateTime by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5022
 * Add `ReturnTypeWillChange` attribute to Entity by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5028
 * Replace unused Entity private method by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5029
-* Fix broken apt installation by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5037
 * Make File compatible with SplFileInfo by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5040
 * Update documentation code samples by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5039
 * PHP Copy-Paste Detector by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5031

From 854fefbacfe930734d6c6ebe02fff927121f9546 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 09:21:06 +0900
Subject: [PATCH 0862/2325] docs: fix 404 link

---
 user_guide_src/source/installation/upgrade_emails.rst | 2 +-
 user_guide_src/source/libraries/email.rst             | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/installation/upgrade_emails.rst b/user_guide_src/source/installation/upgrade_emails.rst
index 41778027dc30..d64a6bb2afea 100644
--- a/user_guide_src/source/installation/upgrade_emails.rst
+++ b/user_guide_src/source/installation/upgrade_emails.rst
@@ -22,7 +22,7 @@ Upgrade Guide
 1. Within your class change the ``$this->load->library('email');`` to ``$email = service('email');``.
 2. From that on you have to replace every line starting with ``$this->email`` to ``$email``.
 3. The methods in the Email class are named slightly different. All methods, except for ``send()``, ``attach()``, ``printDebugger()`` and ``clear()`` have a ``set`` as prefix followed by the previous method name. ``bcc()`` is now ``setBcc()`` and so on.
-4. The config attributes in ``app/Config/Email.php`` have changed. You should have a look at the `Email Class Documentation </libraries/email.html#setting-email-preferences>`__ to have a list of the new attributes.
+4. The config attributes in **app/Config/Email.php** have changed. You should have a look at the :ref:`setting-email-preferences` to have a list of the new attributes.
 
 Code Example
 ============
diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index f57f3cf93d8d..a10b3d9bf6ca 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -44,6 +44,8 @@ Here is a basic example demonstrating how you might send email::
 
     $email->send();
 
+.. _setting-email-preferences:
+
 Setting Email Preferences
 =========================
 

From 66c588335a594346fb822e167b5e7b1f3ef1a20c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 09:44:44 +0900
Subject: [PATCH 0863/2325] docs: decorate keywords in source code with '``'

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

diff --git a/user_guide_src/source/incoming/restful.rst b/user_guide_src/source/incoming/restful.rst
index bb2f9d8ad1bb..2ed7ed4607fe 100644
--- a/user_guide_src/source/incoming/restful.rst
+++ b/user_guide_src/source/incoming/restful.rst
@@ -47,7 +47,7 @@ name::
 .. important:: The routes are matched in the order they are specified, so if you have a resource photos above a get 'photos/poll' the show action's route for the resource line will be matched before the get line. To fix this, move the get line above the resource line so that it is matched first.
 
 The second parameter accepts an array of options that can be used to modify the routes that are generated. While these
-routes are geared toward API-usage, where more methods are allowed, you can pass in the 'websafe' option to have it
+routes are geared toward API-usage, where more methods are allowed, you can pass in the ``websafe`` option to have it
 generate update and delete methods that work with HTML forms::
 
     $routes->resource('photos', ['websafe' => 1]);
@@ -90,15 +90,15 @@ Otherwise you can remove unused routes with the ``except`` option. This option r
 
     $routes->resource('photos', ['except' => 'new,edit']);
 
-Valid methods are: index, show, create, update, new, edit and delete.
+Valid methods are: ``index``, ``show``, ``create``, ``update``, ``new``, ``edit`` and ``delete``.
 
 ResourceController
 ============================================================
 
-The `ResourceController` provides a convenient starting point for your RESTful API,
+The ``ResourceController`` provides a convenient starting point for your RESTful API,
 with methods that correspond to the resource routes above.
 
-Extend it, over-riding the `modelName` and `format` properties, and then
+Extend it, over-riding the ``modelName`` and ``format`` properties, and then
 implement those methods that you want handled.::
 
     <?php
@@ -195,16 +195,16 @@ Otherwise you can remove unused routes with the ``except`` option. This option r
 
     $routes->presenter('photos', ['except' => 'new,edit']);
 
-Valid methods are: index, show, new, create, edit, update, remove and delete.
+Valid methods are: ``index``, ``show``, ``new``, ``create``, ``edit``, ``update``, ``remove`` and ``delete``.
 
 ResourcePresenter
 ============================================================
 
-The `ResourcePresenter` provides a convenient starting point for presenting views
+The ``ResourcePresenter`` provides a convenient starting point for presenting views
 of your resource, and processing data from forms in those views,
 with methods that align to the resource routes above.
 
-Extend it, over-riding the `modelName` property, and then
+Extend it, over-riding the ``modelName`` property, and then
 implement those methods that you want handled.::
 
     <?php

From b91ac9f53d194f984fffbc8dab587aa2799a9695 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 09:45:42 +0900
Subject: [PATCH 0864/2325] docs: replace segment with (:segment)

Make it more precise.
---
 user_guide_src/source/incoming/restful.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/incoming/restful.rst b/user_guide_src/source/incoming/restful.rst
index 2ed7ed4607fe..9ac3ed1292c4 100644
--- a/user_guide_src/source/incoming/restful.rst
+++ b/user_guide_src/source/incoming/restful.rst
@@ -70,7 +70,7 @@ the controller that should be used::
 Change the Placeholder Used
 ---------------------------
 
-By default, the ``segment`` placeholder is used when a resource ID is needed. You can change this by passing
+By default, the ``(:segment)`` placeholder is used when a resource ID is needed. You can change this by passing
 in the ``placeholder`` option with the new string to use::
 
     $routes->resource('photos', ['placeholder' => '(:num)']);
@@ -175,7 +175,7 @@ the controller that should be used::
 Change the Placeholder Used
 ---------------------------
 
-By default, the ``segment`` placeholder is used when a resource ID is needed. You can change this by passing
+By default, the ``(:segment)`` placeholder is used when a resource ID is needed. You can change this by passing
 in the ``placeholder`` option with the new string to use::
 
     $routes->presenter('photos', ['placeholder' => '(:num)']);

From 36ae946804044bf4b46f4a55a9fac9c3890af452 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 09:47:50 +0900
Subject: [PATCH 0865/2325] docs: improve explanation for except option

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

diff --git a/user_guide_src/source/incoming/restful.rst b/user_guide_src/source/incoming/restful.rst
index 9ac3ed1292c4..8992221590a0 100644
--- a/user_guide_src/source/incoming/restful.rst
+++ b/user_guide_src/source/incoming/restful.rst
@@ -81,12 +81,12 @@ in the ``placeholder`` option with the new string to use::
 Limit the Routes Made
 ---------------------
 
-You can restrict the routes generated with the ``only`` option. This should be an array or comma separated list of method names that should
+You can restrict the routes generated with the ``only`` option. This should be **an array** or **comma separated list** of method names that should
 be created. Only routes that match one of these methods will be created. The rest will be ignored::
 
     $routes->resource('photos', ['only' => ['index', 'show']]);
 
-Otherwise you can remove unused routes with the ``except`` option. This option run after ``only``::
+Otherwise you can remove unused routes with the ``except`` option. This should also be **an array** or **comma separated list** of method names. This option run after ``only``::
 
     $routes->resource('photos', ['except' => 'new,edit']);
 
@@ -186,12 +186,12 @@ in the ``placeholder`` option with the new string to use::
 Limit the Routes Made
 ---------------------
 
-You can restrict the routes generated with the ``only`` option. This should be an array or comma separated list of method names that should
+You can restrict the routes generated with the ``only`` option. This should be **an array** or **comma separated list** of method names that should
 be created. Only routes that match one of these methods will be created. The rest will be ignored::
 
     $routes->presenter('photos', ['only' => ['index', 'show']]);
 
-Otherwise you can remove unused routes with the ``except`` option. This option run after ``only``::
+Otherwise you can remove unused routes with the ``except`` option. This should also be **an array** or **comma separated list** of method names. This option run after ``only``::
 
     $routes->presenter('photos', ['except' => 'new,edit']);
 

From c15b930b9d167a6ea1166b1cfe9081b047f680c7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 10:23:49 +0900
Subject: [PATCH 0866/2325] docs: fix sample code

It seems 3.x and 4.x sample code are not the same.
---
 user_guide_src/source/installation/upgrade_routing.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_routing.rst b/user_guide_src/source/installation/upgrade_routing.rst
index bd840b06a82c..8743cc7816f1 100644
--- a/user_guide_src/source/installation/upgrade_routing.rst
+++ b/user_guide_src/source/installation/upgrade_routing.rst
@@ -64,12 +64,12 @@ Path: ``app/Config/Routes.php``::
 
     ...
 
-    $routes->add('posts', 'Posts::index');
+    $routes->add('posts/index', 'Posts::index');
     $routes->add('teams/create', 'Teams::create');
-    $routes->add('teams/edit/(:any)', 'Teams::edit/$1');
+    $routes->add('teams/update', 'Teams::update');
 
     $routes->add('posts/create', 'Posts::create');
-    $routes->add('posts/edit/(:any)', 'Posts::edit/$1');
+    $routes->add('posts/update', 'Posts::update');
     $routes->add('drivers/create', 'Drivers::create');
-    $routes->add('drivers/edit/(:any)', 'Drivers::edit/$1');
+    $routes->add('drivers/update', 'Drivers::update');
     $routes->add('posts/(:any)', 'Posts::view/$1');

From 59660589ee1ede69770c4ab6eec31f00cd4f3b49 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 10:24:54 +0900
Subject: [PATCH 0867/2325] docs: decorate file paths with **

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

diff --git a/user_guide_src/source/installation/upgrade_routing.rst b/user_guide_src/source/installation/upgrade_routing.rst
index 8743cc7816f1..b99dd676bf5a 100644
--- a/user_guide_src/source/installation/upgrade_routing.rst
+++ b/user_guide_src/source/installation/upgrade_routing.rst
@@ -19,7 +19,7 @@ What has been changed
 
 Upgrade Guide
 =============
-1. You have to change the syntax of each routing line and append it in ``app/Config/Routes.php``. For example:
+1. You have to change the syntax of each routing line and append it in **app/Config/Routes.php**. For example:
 
 - ``$route['journals'] = 'blogs';`` to ``$routes->add('journals', 'App\Blogs');`` this would map to the ``index()`` method in the "Blogs" class.
 - ``$route['product/(:any)'] = 'catalog/product_lookup';`` to ``$routes->add('product/(:any)', 'Catalog::productLookup');``
@@ -30,7 +30,7 @@ Code Example
 
 CodeIgniter Version 3.11
 ------------------------
-Path: ``application/config/routes.php``::
+Path: **application/config/routes.php**::
 
     <?php
     defined('BASEPATH') OR exit('No direct script access allowed');
@@ -47,7 +47,7 @@ Path: ``application/config/routes.php``::
 
 CodeIgniter Version 4.x
 -----------------------
-Path: ``app/Config/Routes.php``::
+Path: **app/Config/Routes.php**::
 
     <?php
 

From bed9e5c678069084ad133e5f498c7251dc0eceb6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 10:25:34 +0900
Subject: [PATCH 0868/2325] docs: fix indentation of the list and the
 explanation

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

diff --git a/user_guide_src/source/installation/upgrade_routing.rst b/user_guide_src/source/installation/upgrade_routing.rst
index b99dd676bf5a..5ea14f16e74d 100644
--- a/user_guide_src/source/installation/upgrade_routing.rst
+++ b/user_guide_src/source/installation/upgrade_routing.rst
@@ -21,9 +21,9 @@ Upgrade Guide
 =============
 1. You have to change the syntax of each routing line and append it in **app/Config/Routes.php**. For example:
 
-- ``$route['journals'] = 'blogs';`` to ``$routes->add('journals', 'App\Blogs');`` this would map to the ``index()`` method in the "Blogs" class.
-- ``$route['product/(:any)'] = 'catalog/product_lookup';`` to ``$routes->add('product/(:any)', 'Catalog::productLookup');``
-- ``$route['login/(.+)'] = 'auth/login/$1';`` to ``$routes->add('login/(.+)', 'Auth::login/$1');``
+    - ``$route['journals'] = 'blogs';`` to ``$routes->add('journals', 'Blogs::index');``. This would map to the ``index()`` method in the ``Blogs`` controller.
+    - ``$route['product/(:any)'] = 'catalog/product_lookup';`` to ``$routes->add('product/(:any)', 'Catalog::productLookup');``
+    - ``$route['login/(.+)'] = 'auth/login/$1';`` to ``$routes->add('login/(.+)', 'Auth::login/$1');``
 
 Code Example
 ============

From c9c8748770a062f59d6b54ff68b960400b0d4ced Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 10:46:19 +0900
Subject: [PATCH 0869/2325] docs: fix coding style of sample code

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

diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index 094eacc1eafa..c0284f221d79 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -110,7 +110,7 @@ In controller::
         foreach($imagefile['images'] as $img) {
             if ($img->isValid() && ! $img->hasMoved()) {
                 $newName = $img->getRandomName();
-                $img->move(WRITEPATH.'uploads', $newName);
+                $img->move(WRITEPATH . 'uploads', $newName);
             }
         }
     }
@@ -153,7 +153,7 @@ Verify A File
 You can check that a file was actually uploaded via HTTP with no errors by calling the ``isValid()`` method::
 
     if (! $file->isValid()) {
-        throw new \RuntimeException($file->getErrorString().'('.$file->getError().')');
+        throw new \RuntimeException($file->getErrorString() . '(' . $file->getError() . ')');
     }
 
 As seen in this example, if a file had an upload error, you can retrieve the error code (an integer) and the error
@@ -216,12 +216,12 @@ Moving Files
 Each file can be moved to its new location with the aptly named ``move()`` method. This takes the directory to move
 the file to as the first parameter::
 
-    $file->move(WRITEPATH.'uploads');
+    $file->move(WRITEPATH . 'uploads');
 
 By default, the original filename was used. You can specify a new filename by passing it as the second parameter::
 
     $newName = $file->getRandomName();
-    $file->move(WRITEPATH.'uploads', $newName);
+    $file->move(WRITEPATH . 'uploads', $newName);
 
 Once the file has been removed the temporary file is deleted. You can check if a file has been moved already with
 the ``hasMoved()`` method, which returns a boolean::

From 7422d99f97507a01af43a010baa0cbf2863d2de5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 10:46:49 +0900
Subject: [PATCH 0870/2325] docs: fix typo

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

diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index c0284f221d79..b15185506e81 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -117,7 +117,7 @@ In controller::
 
 where the **images** is a loop from the form field name
 
-If there are multiple files with the same name you can use ``getFile()`` ro retrieve every file individually::
+If there are multiple files with the same name you can use ``getFile()`` to retrieve every file individually::
 In controller::
 
     $file1 = $this->request->getFile('images.0');

From 34340569a9866f3d52cb1338eff0b6afd01f4f1b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 10:47:24 +0900
Subject: [PATCH 0871/2325] docs: decorate words in code with '``'

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

diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index b15185506e81..c0e4b27baf9a 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -160,7 +160,7 @@ As seen in this example, if a file had an upload error, you can retrieve the err
 message with the ``getError()`` and ``getErrorString()`` methods. The following errors can be discovered through
 this method:
 
-* The file exceeds your upload_max_filesize ini directive.
+* The file exceeds your ``upload_max_filesize`` ini directive.
 * The file exceeds the upload limit defined in your form.
 * The file was only partially uploaded.
 * No file was uploaded.
@@ -255,7 +255,7 @@ passing it as the second parameter::
 
     $path = $this->request->getFile('userfile')->store('head_img/', 'user_name.jpg');
 
-Moving an uploaded file can fail, with an HTTPException, under several circumstances:
+Moving an uploaded file can fail, with an ``HTTPException``, under several circumstances:
 
 - the file has already been moved
 - the file did not upload successfully

From a177ea33d1d8c70869053168d85afdc88ad2ac6e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 10:48:41 +0900
Subject: [PATCH 0872/2325] docs: make it a single sentence

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

diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index c0e4b27baf9a..d48bc02a9dcb 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -138,7 +138,7 @@ In controller::
     $file1 = $this->request->getFile('my-form.details.avatars.0');
     $file2 = $this->request->getFile('my-form.details.avatars.1');
 
-.. note:: using ``getFiles()`` is more appropriate
+.. note:: Using ``getFiles()`` is more appropriate.
 
 =====================
 Working With the File

From 80689ddc4cb3b72179f9cee57ef12ec619b3e13d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 10:49:22 +0900
Subject: [PATCH 0873/2325] docs: decroate file paths with **

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

diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index d48bc02a9dcb..e1734165c6e5 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -245,7 +245,7 @@ With the simplest usage, a single file might be submitted like::
 
     <input type="file" name="userfile" />
 
-By default, upload files are saved in writable/uploads directory. The YYYYMMDD folder
+By default, upload files are saved in **writable/uploads** directory. The **YYYYMMDD** folder
 and random file name will be created. Returns a file path::
 
     $path = $this->request->getFile('userfile')->store();

From 49a07f0ccb46e313e08b8cb6c53de00e0df537e3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 10:49:48 +0900
Subject: [PATCH 0874/2325] docs: make warning for security matter

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

diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index e1734165c6e5..d4ecc9d34867 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -196,11 +196,12 @@ Other File Info
 
 **getClientExtension()**
 
-Returns the original file extension, based on the file name that was uploaded. This is NOT a trusted source. For a
-trusted version, use ``guessExtension()`` instead::
+Returns the original file extension, based on the file name that was uploaded::
 
     $ext = $file->getClientExtension();
 
+.. warning:: This is NOT a trusted source. For a trusted version, use ``guessExtension()`` instead.
+
 **getClientMimeType()**
 
 Returns the mime type (mime type) of the file as provided by the client. This is NOT a trusted value. For a trusted

From 352a67166ad6e592c70c17c64626e41e075ccad0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 12:13:47 +0900
Subject: [PATCH 0875/2325] docs: add file upload sample code like CI3

---
 .../source/libraries/uploaded_files.rst       | 176 ++++++++++++++++--
 1 file changed, 163 insertions(+), 13 deletions(-)

diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index d4ecc9d34867..1f60167f9189 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -1,6 +1,6 @@
-***************************
+###########################
 Working with Uploaded Files
-***************************
+###########################
 
 CodeIgniter makes working with files uploaded through a form much simpler and more secure than using PHP's ``$_FILES``
 array directly. This extends the :doc:`File class </libraries/files>` and thus gains all of the features of that class.
@@ -12,12 +12,162 @@ array directly. This extends the :doc:`File class </libraries/files>` and thus g
     :local:
     :depth: 2
 
-===============
+***********
+The Process
+***********
+
+Uploading a file involves the following general process:
+
+-  An upload form is displayed, allowing a user to select a file and
+   upload it.
+-  When the form is submitted, the file is uploaded to the destination
+   you specify.
+-  Along the way, the file is validated to make sure it is allowed to be
+   uploaded based on the preferences you set.
+-  Once uploaded, the user will be shown a success message.
+
+To demonstrate this process here is brief tutorial. Afterward you'll
+find reference information.
+
+Creating the Upload Form
+========================
+
+Using a text editor, create a form called upload_form.php. In it, place
+this code and save it to your **app/Views/** directory::
+
+    <!DOCTYPE html>
+    <html lang="en">
+    <head>
+        <title>Upload Form</title>
+    </head>
+    <body>
+
+    <?php foreach ($errors as $error): ?>
+        <li><?= $error ?></li>
+    <?php endforeach ?>
+
+    <?= form_open_multipart('upload/upload') ?>
+
+    <input type="file" name="userfile" size="20" />
+
+    <br /><br />
+
+    <input type="submit" value="upload" />
+
+    </form>
+
+    </body>
+    </html>
+
+You'll notice we are using a form helper to create the opening form tag.
+File uploads require a multipart form, so the helper creates the proper
+syntax for you. You'll also notice we have an ``$errors`` variable. This is
+so we can show error messages in the event the user does something
+wrong.
+
+The Success Page
+================
+
+Using a text editor, create a form called upload_success.php. In it,
+place this code and save it to your **app/Views/** directory::
+
+    <!DOCTYPE html>
+    <html lang="en">
+    <head>
+        <title>Upload Form</title>
+    </head>
+    <body>
+
+    <h3>Your file was successfully uploaded!</h3>
+
+    <ul>
+        <li>name: <?= $uploaded_flleinfo->getBasename() ?></li>
+        <li>size: <?= $uploaded_flleinfo->getSizeByUnit('kb') ?> KB</li>
+        <li>extension: <?= $uploaded_flleinfo->guessExtension() ?></li>
+    </ul>
+
+    <p><?= anchor('upload', 'Upload Another File!') ?></p>
+
+    </body>
+    </html>
+
+The Controller
+==============
+
+Using a text editor, create a controller called Upload.php. In it, place
+this code and save it to your **app/Controllers/** directory::
+
+    <?php
+
+    namespace App\Controllers;
+
+    use CodeIgniter\Files\File;
+
+    class Upload extends BaseController
+    {
+        protected $helpers = ['form'];
+
+        public function index()
+        {
+            return view('upload_form', ['errors' => []]);
+        }
+
+        public function upload()
+        {
+            $validationRule = [
+                'userfile' => [
+                    'label' => 'Image File',
+                    'rules' => 'uploaded[userfile]'
+                        . '|is_image[userfile]'
+                        . '|mime_in[userfile,image/jpg,image/jpeg,image/gif,image/png,image/webp]'
+                        . '|max_size[userfile,100]'
+                        . '|max_dims[userfile,1024,768]',
+                ],
+            ];
+            if (! $this->validate($validationRule)) {
+                $data = ['errors' => $this->validator->getErrors()];
+
+                return view('upload_form', $data);
+            }
+
+            $img = $this->request->getFile('userfile');
+
+            if (! $img->hasMoved()) {
+                $filepath = WRITEPATH . 'uploads/' . $img->store();
+
+                $data = ['uploaded_flleinfo' => new File($filepath)];
+
+                return view('upload_success', $data);
+            } else {
+                $data = ['errors' => 'The file has already been moved.'];
+
+                return view('upload_form', $data);
+            }
+        }
+    }
+
+The Upload Directory
+====================
+
+The uploaded files are stored in the **writable/uploads/** directory.
+
+Try it!
+=======
+
+To try your form, visit your site using a URL similar to this one::
+
+    example.com/index.php/upload/
+
+You should see an upload form. Try uploading an image file (either a
+**jpg**, **gif**, **png**, or **webp**). If the path in your controller is correct it should
+work.
+
+***************
 Accessing Files
-===============
+***************
 
 All Files
-----------
+=========
 
 When you upload files they can be accessed natively in PHP through the ``$_FILES`` superglobal. This array has some
 major shortcomings when working with multiple files uploaded at once, and has potential security flaws many developers
@@ -72,7 +222,7 @@ In this case, the returned array of files would be more like::
     ]
 
 Single File
------------
+===========
 
 If you just need to access a single file, you can use ``getFile()`` to retrieve the file instance directly. This will return an instance of ``CodeIgniter\HTTP\Files\UploadedFile``:
 
@@ -140,15 +290,15 @@ In controller::
 
 .. note:: Using ``getFiles()`` is more appropriate.
 
-=====================
+*********************
 Working With the File
-=====================
+*********************
 
 Once you've retrieved the UploadedFile instance, you can retrieve information about the file in safe ways, as well as
 move the file to a new location.
 
 Verify A File
--------------
+=============
 
 You can check that a file was actually uploaded via HTTP with no errors by calling the ``isValid()`` method::
 
@@ -169,7 +319,7 @@ this method:
 * File upload was stopped by a PHP extension.
 
 File Names
-----------
+==========
 
 **getName()**
 
@@ -192,7 +342,7 @@ To get the full path of the temp file that was created during the upload, you ca
     $tempfile = $file->getTempName();
 
 Other File Info
----------------
+===============
 
 **getClientExtension()**
 
@@ -212,7 +362,7 @@ version, use ``getMimeType()`` instead::
     echo $type; // image/png
 
 Moving Files
-------------
+============
 
 Each file can be moved to its new location with the aptly named ``move()`` method. This takes the directory to move
 the file to as the first parameter::
@@ -238,7 +388,7 @@ Moving an uploaded file can fail, with an HTTPException, under several circumsta
 - the file move operation fails (e.g., improper permissions)
 
 Store Files
-------------
+===========
 
 Each file can be moved to its new location with the aptly named ``store()`` method.
 

From f646b9c3ee2c3ce6d34ed99a7b9a703c1c9ebbd5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 13:03:40 +0900
Subject: [PATCH 0876/2325] docs: update sample code coding style

---
 user_guide_src/source/libraries/files.rst | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/user_guide_src/source/libraries/files.rst b/user_guide_src/source/libraries/files.rst
index 76b2e8a6acd8..cf46d8ceb9b5 100644
--- a/user_guide_src/source/libraries/files.rst
+++ b/user_guide_src/source/libraries/files.rst
@@ -96,17 +96,17 @@ Moving Files
 Each file can be moved to its new location with the aptly named ``move()`` method. This takes the directory to move
 the file to as the first parameter::
 
-    $file->move(WRITEPATH.'uploads');
+    $file->move(WRITEPATH . 'uploads');
 
 By default, the original filename was used. You can specify a new filename by passing it as the second parameter::
 
     $newName = $file->getRandomName();
-    $file->move(WRITEPATH.'uploads', $newName);
+    $file->move(WRITEPATH . 'uploads', $newName);
 
 The move() method returns a new File instance that for the relocated file, so you must capture the result if the
 resulting location is needed::
 
-    $file = $file->move(WRITEPATH.'uploads');
+    $file = $file->move(WRITEPATH . 'uploads');
 
 ****************
 File Collections
@@ -136,8 +136,7 @@ When your collection is complete, you can use ``get()`` to retrieve the final li
     echo 'My files: ' . implode(PHP_EOL, $files->get());
     echo 'I have ' . count($files) . ' files!';
 
-    foreach ($files as $file)
-    {
+    foreach ($files as $file) {
         echo 'Moving ' . $file->getBasename() . ', ' . $file->getSizeByUnit('mb');
         $file->move(WRITABLE . $file->getRandomName());
     }

From afdc97646f6d3e6073d288aca73cdee2ea3ab730 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 13:06:09 +0900
Subject: [PATCH 0877/2325] docs: decorate method/variable with '``'

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

diff --git a/user_guide_src/source/libraries/files.rst b/user_guide_src/source/libraries/files.rst
index cf46d8ceb9b5..04bd317356e2 100644
--- a/user_guide_src/source/libraries/files.rst
+++ b/user_guide_src/source/libraries/files.rst
@@ -149,7 +149,7 @@ Starting a Collection
 **__construct(string[] $files = [])**
 
 The constructor accepts an optional array of file paths to use as the initial collection. These are passed to
-**add()** so any files supplied by child classes in the **$files** will remain.
+``add()`` so any files supplied by child classes in the ``$files`` will remain.
 
 **define()**
 

From 78cf411974a2b074faf5d91cec2a29fa16868ca1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 13:06:54 +0900
Subject: [PATCH 0878/2325] docs: add / to separate methods

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

diff --git a/user_guide_src/source/libraries/files.rst b/user_guide_src/source/libraries/files.rst
index 04bd317356e2..6734e98d5fda 100644
--- a/user_guide_src/source/libraries/files.rst
+++ b/user_guide_src/source/libraries/files.rst
@@ -180,17 +180,17 @@ Inputting Files
 Adds all files indicated by the path or array of paths. If the path resolves to a directory then ``$recursive``
 will include sub-directories.
 
-**addFile(string $file)**
+**addFile(string $file)** /
 **addFiles(array $files)**
 
 Adds the file or files to the current list of input files. Files are absolute paths to actual files.
 
-**removeFile(string $file)**
+**removeFile(string $file)** /
 **removeFiles(array $files)**
 
 Removes the file or files from the current list of input files.
 
-**addDirectory(string $directory, bool $recursive = false)**
+**addDirectory(string $directory, bool $recursive = false)** /
 **addDirectories(array $directories, bool $recursive = false)**
 
 Adds all files from the directory or directories, optionally recursing into sub-directories. Directories are
@@ -199,7 +199,7 @@ absolute paths to actual directories.
 Filtering Files
 ===============
 
-**removePattern(string $pattern, string $scope = null)**
+**removePattern(string $pattern, string $scope = null)** /
 **retainPattern(string $pattern, string $scope = null)**
 
 Filters the current file list through the pattern (and optional scope), removing or retaining matched

From fbabefa946ae4899e90e9c0b0a92eca49861fb9f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 13:51:27 +0900
Subject: [PATCH 0879/2325] docs: add esc() to views

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

diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index 1f60167f9189..961823036e60 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -43,7 +43,7 @@ this code and save it to your **app/Views/** directory::
     <body>
 
     <?php foreach ($errors as $error): ?>
-        <li><?= $error ?></li>
+        <li><?= esc($error) ?></li>
     <?php endforeach ?>
 
     <?= form_open_multipart('upload/upload') ?>
@@ -81,9 +81,9 @@ place this code and save it to your **app/Views/** directory::
     <h3>Your file was successfully uploaded!</h3>
 
     <ul>
-        <li>name: <?= $uploaded_flleinfo->getBasename() ?></li>
-        <li>size: <?= $uploaded_flleinfo->getSizeByUnit('kb') ?> KB</li>
-        <li>extension: <?= $uploaded_flleinfo->guessExtension() ?></li>
+        <li>name: <?= esc($uploaded_flleinfo->getBasename()) ?></li>
+        <li>size: <?= esc($uploaded_flleinfo->getSizeByUnit('kb')) ?> KB</li>
+        <li>extension: <?= esc($uploaded_flleinfo->guessExtension()) ?></li>
     </ul>
 
     <p><?= anchor('upload', 'Upload Another File!') ?></p>

From 4d8266dfb9d7ccb3611b09d305dc8054aeab07b7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 14:57:25 +0900
Subject: [PATCH 0880/2325] docs: add esc() to views

It is not good practice to show variables without escaping
---
 user_guide_src/source/outgoing/views.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst
index 533e3c9bead5..8b8f21efccaf 100644
--- a/user_guide_src/source/outgoing/views.rst
+++ b/user_guide_src/source/outgoing/views.rst
@@ -163,10 +163,10 @@ Now open your view file and change the text to variables that correspond to the
 
     <html>
         <head>
-            <title><?= $title ?></title>
+            <title><?= esc($title) ?></title>
         </head>
         <body>
-            <h1><?= $heading ?></h1>
+            <h1><?= esc($heading) ?></h1>
         </body>
     </html>
 
@@ -220,17 +220,17 @@ Now open your view file and create a loop::
 
     <html>
     <head>
-        <title><?= $title ?></title>
+        <title><?= esc($title) ?></title>
     </head>
     <body>
-        <h1><?= $heading ?></h1>
+        <h1><?= esc($heading) ?></h1>
 
         <h3>My Todo List</h3>
 
         <ul>
         <?php foreach ($todo_list as $item):?>
 
-            <li><?= $item ?></li>
+            <li><?= esc($item) ?></li>
 
         <?php endforeach;?>
         </ul>

From 2fb74d0ab70215811a8bbac3deb4eacaf8545066 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 14:58:27 +0900
Subject: [PATCH 0881/2325] docs: fix coding style

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

diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst
index 8b8f21efccaf..5cc77d05a3a4 100644
--- a/user_guide_src/source/outgoing/views.rst
+++ b/user_guide_src/source/outgoing/views.rst
@@ -228,11 +228,11 @@ Now open your view file and create a loop::
         <h3>My Todo List</h3>
 
         <ul>
-        <?php foreach ($todo_list as $item):?>
+        <?php foreach ($todo_list as $item): ?>
 
             <li><?= esc($item) ?></li>
 
-        <?php endforeach;?>
+        <?php endforeach ?>
         </ul>
 
     </body>

From 69a6563d52229ddfa8fd2e2a0f833bd2d945d734 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 15:03:24 +0900
Subject: [PATCH 0882/2325] docs: fix coding style

remove unneeded ;
remove space before :
---
 user_guide_src/source/installation/upgrade_views.rst | 2 +-
 user_guide_src/source/libraries/pagination.rst       | 4 ++--
 user_guide_src/source/libraries/validation.rst       | 2 +-
 user_guide_src/source/outgoing/alternative_php.rst   | 8 ++++----
 user_guide_src/source/tutorial/news_section.rst      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_views.rst b/user_guide_src/source/installation/upgrade_views.rst
index 554a0a83ffc3..829b84a47e5f 100644
--- a/user_guide_src/source/installation/upgrade_views.rst
+++ b/user_guide_src/source/installation/upgrade_views.rst
@@ -70,7 +70,7 @@ Path: ``app/Views``::
         <ul>
         <?php foreach ($todo_list as $item): ?>
             <li><?= esc($item) ?></li>
-        <?php endforeach; ?>
+        <?php endforeach ?>
         </ul>
 
     </body>
diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index 8b47ac046d1f..b665300749e2 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -250,7 +250,7 @@ usefulness. It is easiest to demonstrate creating a new view by showing you the
             </li>
         <?php endif ?>
 
-        <?php foreach ($pager->links() as $link) : ?>
+        <?php foreach ($pager->links() as $link): ?>
             <li <?= $link['active'] ? 'class="active"' : '' ?>>
                 <a href="<?= $link['uri'] ?>">
                     <?= $link['title'] ?>
@@ -328,7 +328,7 @@ See following an example with these changes::
                 </li>
             <?php endif ?>
 
-            <?php foreach ($pager->links() as $link) : ?>
+            <?php foreach ($pager->links() as $link): ?>
                 <li <?= $link['active'] ? 'class="active"' : '' ?>>
                     <a href="<?= $link['uri'] ?>">
                         <?= $link['title'] ?>
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 27691f084a55..468f05e5a41f 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -607,7 +607,7 @@ a new view at **/app/Views/_errors_list.php**::
 
     <div class="alert alert-danger" role="alert">
         <ul>
-        <?php foreach ($errors as $error) : ?>
+        <?php foreach ($errors as $error): ?>
             <li><?= esc($error) ?></li>
         <?php endforeach ?>
         </ul>
diff --git a/user_guide_src/source/outgoing/alternative_php.rst b/user_guide_src/source/outgoing/alternative_php.rst
index 70a86e2ebb75..369808874413 100644
--- a/user_guide_src/source/outgoing/alternative_php.rst
+++ b/user_guide_src/source/outgoing/alternative_php.rst
@@ -29,7 +29,7 @@ a simplified format as well. Here is an example using ``foreach``::
 
     <ul>
 
-    <?php foreach ($todo as $item) : ?>
+    <?php foreach ($todo as $item): ?>
 
         <li><?= $item ?></li>
 
@@ -46,15 +46,15 @@ Also notice that instead of using a semicolon after each structure
 
 Here is another example, using ``if``/``elseif``/``else``. Notice the colons::
 
-    <?php if ($username === 'sally') : ?>
+    <?php if ($username === 'sally'): ?>
 
         <h3>Hi Sally</h3>
 
-    <?php elseif ($username === 'joe') : ?>
+    <?php elseif ($username === 'joe'): ?>
 
         <h3>Hi Joe</h3>
 
-    <?php else : ?>
+    <?php else: ?>
 
         <h3>Hi unknown user</h3>
 
diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
index af96bdf3522e..42bda88c5d06 100644
--- a/user_guide_src/source/tutorial/news_section.rst
+++ b/user_guide_src/source/tutorial/news_section.rst
@@ -217,7 +217,7 @@ and add the next piece of code.
             </div>
             <p><a href="/news/<?= esc($news_item['slug'], 'url') ?>">View article</a></p>
 
-        <?php endforeach; ?>
+        <?php endforeach ?>
 
     <?php else: ?>
 

From 6ca2cfe78cfdf6beb83119ec68d41fa96a9745e6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 15:05:21 +0900
Subject: [PATCH 0883/2325] docs: fix coding style

Align = position
---
 user_guide_src/source/installation/upgrade_migrations.rst | 8 ++++----
 user_guide_src/source/installation/upgrade_models.rst     | 6 +++---
 user_guide_src/source/installation/upgrade_pagination.rst | 8 ++++----
 .../source/installation/upgrade_view_parser.rst           | 2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_migrations.rst b/user_guide_src/source/installation/upgrade_migrations.rst
index 10a75bf23f2d..fc65ea2aa8d3 100644
--- a/user_guide_src/source/installation/upgrade_migrations.rst
+++ b/user_guide_src/source/installation/upgrade_migrations.rst
@@ -63,13 +63,13 @@ Path: ``application/migrations``::
         {
             $this->dbforge->add_field(array(
                 'blog_id' => array(
-                    'type' => 'INT',
-                    'constraint' => 5,
-                    'unsigned' => true,
+                    'type'           => 'INT',
+                    'constraint'     => 5,
+                    'unsigned'       => true,
                     'auto_increment' => true,
                 ),
                 'blog_title' => array(
-                    'type' => 'VARCHAR',
+                    'type'       => 'VARCHAR',
                     'constraint' => '100',
                 ),
                 'blog_description' => array(
diff --git a/user_guide_src/source/installation/upgrade_models.rst b/user_guide_src/source/installation/upgrade_models.rst
index 7100f6ca9202..ba508424cdf2 100644
--- a/user_guide_src/source/installation/upgrade_models.rst
+++ b/user_guide_src/source/installation/upgrade_models.rst
@@ -50,9 +50,9 @@ Path: ``application/models``::
         public function insert($name, $address, $email)
         {
             $this->db->insert('user_contacts', array(
-                "name" => $name,
-                "address" => $address,
-                "email" => $email,
+                'name'    => $name,
+                'address' => $address,
+                'email'   => $email,
             ));
         }
     }
diff --git a/user_guide_src/source/installation/upgrade_pagination.rst b/user_guide_src/source/installation/upgrade_pagination.rst
index 4743bb985cf2..23c8564d1390 100644
--- a/user_guide_src/source/installation/upgrade_pagination.rst
+++ b/user_guide_src/source/installation/upgrade_pagination.rst
@@ -39,11 +39,11 @@ CodeIgniter Version 3.11
 ::
 
     $this->load->library('pagination');
-    $config['base_url'] = base_url().'users/index/';
-    $config['total_rows'] = $this->db->count_all('users');
-    $config['per_page'] = 10;
+    $config['base_url']    = base_url().'users/index/';
+    $config['total_rows']  = $this->db->count_all('users');
+    $config['per_page']    = 10;
     $config['uri_segment'] = 3;
-    $config['attributes'] = array('class' => 'pagination-link');
+    $config['attributes']  = array('class' => 'pagination-link');
     $this->pagination->initialize($config);
 
     $data['users'] = $this->user_model->get_users(FALSE, $config['per_page'], $offset);
diff --git a/user_guide_src/source/installation/upgrade_view_parser.rst b/user_guide_src/source/installation/upgrade_view_parser.rst
index 94bd5ac67f19..96f821b81922 100644
--- a/user_guide_src/source/installation/upgrade_view_parser.rst
+++ b/user_guide_src/source/installation/upgrade_view_parser.rst
@@ -33,7 +33,7 @@ CodeIgniter Version 3.11
     $this->load->library('parser');
 
     $data = array(
-        'blog_title' => 'My Blog Title',
+        'blog_title'   => 'My Blog Title',
         'blog_heading' => 'My Blog Heading'
     );
 

From 3839795e6cd65c5440a5bc197fc20f69198f3099 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 19:03:12 +0900
Subject: [PATCH 0884/2325] docs: decorate variable with '``'

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

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 27691f084a55..3550bec9ff9d 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -896,7 +896,7 @@ Rules for File Uploads
 ======================
 
 These validation rules enable you to do the basic checks you might need to verify that uploaded files meet your business needs.
-Since the value of a file upload HTML field doesn't exist, and is stored in the $_FILES global, the name of the input field will
+Since the value of a file upload HTML field doesn't exist, and is stored in the ``$_FILES`` global, the name of the input field will
 need to be used twice. Once to specify the field name as you would for any other rule, but again as the first parameter of all
 file upload related rules::
 

From 0daf8c90166f35230216bb878343f8931444ad7a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 19:03:50 +0900
Subject: [PATCH 0885/2325] docs: add note about Validation rules

---
 user_guide_src/source/libraries/uploaded_files.rst | 4 ++++
 user_guide_src/source/libraries/validation.rst     | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index 961823036e60..615716ea0273 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -146,6 +146,10 @@ this code and save it to your **app/Controllers/** directory::
         }
     }
 
+.. note:: Since the value of a file upload HTML field doesn't exist, and is stored in the ``$_FILES`` global,
+    only :ref:`rules-for-file-uploads` can be used to validate upload file with :doc:`validation`.
+    The rule ``required`` also can't be used, so use ``uploaded`` instead.
+
 The Upload Directory
 ====================
 
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 3550bec9ff9d..aed337d1b062 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -892,6 +892,8 @@ valid_cc_number         Yes        Verifies that the credit card number matches
                                    HSBC Canada Card (hsbc)
 ======================= ========== ============================================= ===================================================
 
+.. _rules-for-file-uploads:
+
 Rules for File Uploads
 ======================
 

From 47a4af22e8cef349171c510de319178037cc4368 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 1 Dec 2021 16:29:58 +0900
Subject: [PATCH 0886/2325] docs: add TOC to general pages

---
 user_guide_src/source/general/ajax.rst          | 4 ++++
 user_guide_src/source/general/caching.rst       | 4 ++++
 user_guide_src/source/general/environments.rst  | 4 ++++
 user_guide_src/source/general/managing_apps.rst | 4 ++++
 user_guide_src/source/general/urls.rst          | 4 ++++
 5 files changed, 20 insertions(+)

diff --git a/user_guide_src/source/general/ajax.rst b/user_guide_src/source/general/ajax.rst
index 710406b41272..d3fd5945f1ff 100644
--- a/user_guide_src/source/general/ajax.rst
+++ b/user_guide_src/source/general/ajax.rst
@@ -8,6 +8,10 @@ To get around this problem, the most efficient solution (so far) is to manually
 
 Here's how to force the ``X-Requested-With`` header to be sent in the Fetch API and other JavaScript libraries.
 
+.. contents::
+    :local:
+    :depth: 2
+
 Fetch API
 =========
 
diff --git a/user_guide_src/source/general/caching.rst b/user_guide_src/source/general/caching.rst
index f241cb02c15d..b3d5e152b879 100644
--- a/user_guide_src/source/general/caching.rst
+++ b/user_guide_src/source/general/caching.rst
@@ -12,6 +12,10 @@ page load speeds. By caching your pages, since they are saved in their
 fully rendered state, you can achieve performance much closer to that of
 static web pages.
 
+.. contents::
+    :local:
+    :depth: 2
+
 How Does Caching Work?
 ======================
 
diff --git a/user_guide_src/source/general/environments.rst b/user_guide_src/source/general/environments.rst
index ac860d4634cf..057dd8e57dea 100644
--- a/user_guide_src/source/general/environments.rst
+++ b/user_guide_src/source/general/environments.rst
@@ -9,6 +9,10 @@ while developing an application, but it may also pose a security issue
 when "live". In development environments, you might want additional
 tools loaded that you don't in production environments, etc.
 
+.. contents::
+    :local:
+    :depth: 2
+
 The ENVIRONMENT Constant
 ========================
 
diff --git a/user_guide_src/source/general/managing_apps.rst b/user_guide_src/source/general/managing_apps.rst
index 21fcebdf9407..5e4711958c24 100644
--- a/user_guide_src/source/general/managing_apps.rst
+++ b/user_guide_src/source/general/managing_apps.rst
@@ -8,6 +8,10 @@ directory. It is possible, however, to have multiple sets of
 applications that share a single CodeIgniter installation, or even to
 rename or relocate your application directory.
 
+.. contents::
+    :local:
+    :depth: 2
+
 Renaming or Relocating the Application Directory
 ================================================
 
diff --git a/user_guide_src/source/general/urls.rst b/user_guide_src/source/general/urls.rst
index 5eab9ee7a1e1..da056cc96cbc 100644
--- a/user_guide_src/source/general/urls.rst
+++ b/user_guide_src/source/general/urls.rst
@@ -2,6 +2,10 @@
 CodeIgniter URLs
 ################
 
+.. contents::
+    :local:
+    :depth: 2
+
 By default, URLs in CodeIgniter are designed to be search-engine and human-friendly. Rather than using the standard
 "query-string" approach to URLs that is synonymous with dynamic systems, CodeIgniter uses a **segment-based** approach::
 

From d3d514b4892c7c140cb210bf22d2d33f2c9b1e16 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 2 Dec 2021 10:32:39 +0900
Subject: [PATCH 0887/2325] docs: fix application folder name

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

diff --git a/user_guide_src/source/general/managing_apps.rst b/user_guide_src/source/general/managing_apps.rst
index 21fcebdf9407..92c152c5dd63 100644
--- a/user_guide_src/source/general/managing_apps.rst
+++ b/user_guide_src/source/general/managing_apps.rst
@@ -3,7 +3,7 @@ Managing your Applications
 ##########################
 
 By default, it is assumed that you only intend to use CodeIgniter to
-manage one application, which you will build in your **application**
+manage one application, which you will build in your **app**
 directory. It is possible, however, to have multiple sets of
 applications that share a single CodeIgniter installation, or even to
 rename or relocate your application directory.
@@ -16,7 +16,7 @@ it to a different location on your server, other than your project root, open
 your main **app/Config/Paths.php** and set a *full server path* in the
 ``$appDirectory`` variable (at about line 44)::
 
-    public $appDirectory = '/path/to/your/application';
+    public $appDirectory = '/path/to/your/app';
 
 You will need to modify two additional files in your project root, so that
 they can find the ``Paths`` configuration file:

From c96224688927a3c64303fa1a817e490cfdf0a5f1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 2 Dec 2021 10:33:42 +0900
Subject: [PATCH 0888/2325] docs: decorate file paths with **

---
 .../source/general/managing_apps.rst          | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/user_guide_src/source/general/managing_apps.rst b/user_guide_src/source/general/managing_apps.rst
index 92c152c5dd63..6e156cd783d5 100644
--- a/user_guide_src/source/general/managing_apps.rst
+++ b/user_guide_src/source/general/managing_apps.rst
@@ -19,15 +19,15 @@ your main **app/Config/Paths.php** and set a *full server path* in the
     public $appDirectory = '/path/to/your/app';
 
 You will need to modify two additional files in your project root, so that
-they can find the ``Paths`` configuration file:
+they can find the **Paths** configuration file:
 
-- ``/spark`` runs command line apps; the path is specified on or about line 35::
+- **/spark** runs command line apps; the path is specified on or about line 35::
 
     $pathsConfig = 'app/Config/Paths.php';
     // ^^^ Change this line if you move your application folder
 
 
-- ``/public/index.php`` is the front controller for your webapp; the config
+- **/public/index.php** is the front controller for your webapp; the config
   path is specified on or about line 20::
 
     $pathsConfig = FCPATH . '../app/Config/Paths.php';
@@ -41,8 +41,8 @@ If you would like to share a common CodeIgniter framework installation, to manag
 several different applications, simply put all of the directories located
 inside your application directory into their own (sub)-directory.
 
-For example, let's say you want to create two applications, named "foo"
-and "bar". You could structure your application project directories like this:
+For example, let's say you want to create two applications, named **foo**
+and **bar**. You could structure your application project directories like this:
 
 .. code-block:: text
 
@@ -60,12 +60,12 @@ and "bar". You could structure your application project directories like this:
         /system
         /docs
 
-This would have two apps, "foo" and "bar", both having standard application directories
-and a ``public`` folder, and sharing a common codeigniter framework.
+This would have two apps, **foo** and **bar**, both having standard application directories
+and a **public** folder, and sharing a common **codeigniter** framework.
 
-The ``index.php`` inside each application would refer to its own configuration,
+The **index.php** inside each application would refer to its own configuration,
 ``../app/Config/Paths.php``, and the ``$systemDirectory`` variable inside each
-of those would be set to refer to the shared common "system" folder.
+of those would be set to refer to the shared common **system** folder.
 
 If either of the applications had a command-line component, then you would also
-modify ``spark`` inside each application's project folder, as directed above.
+modify **spark** inside each application's project folder, as directed above.

From 95581fd3bb9f91a2e2fbd5e785f0738050bf3d31 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 2 Dec 2021 10:53:25 +0900
Subject: [PATCH 0889/2325] docs: there is no `docs` folder now

---
 user_guide_src/source/general/managing_apps.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/user_guide_src/source/general/managing_apps.rst b/user_guide_src/source/general/managing_apps.rst
index 6e156cd783d5..d9a3e8e05d77 100644
--- a/user_guide_src/source/general/managing_apps.rst
+++ b/user_guide_src/source/general/managing_apps.rst
@@ -58,7 +58,6 @@ and **bar**. You could structure your application project directories like this:
         /writable
     /codeigniter
         /system
-        /docs
 
 This would have two apps, **foo** and **bar**, both having standard application directories
 and a **public** folder, and sharing a common **codeigniter** framework.

From a2aed177b40949eeac58f4dde61a108916823be5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 2 Dec 2021 10:56:49 +0900
Subject: [PATCH 0890/2325] docs: add `spark` file

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

diff --git a/user_guide_src/source/general/managing_apps.rst b/user_guide_src/source/general/managing_apps.rst
index d9a3e8e05d77..6e2279ede97c 100644
--- a/user_guide_src/source/general/managing_apps.rst
+++ b/user_guide_src/source/general/managing_apps.rst
@@ -51,11 +51,13 @@ and **bar**. You could structure your application project directories like this:
         /public
         /tests
         /writable
+        spark
     /bar
         /app
         /public
         /tests
         /writable
+        spark
     /codeigniter
         /system
 

From a838edcb61ccb49998979411f12ecd6e2c877760 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 2 Dec 2021 11:04:00 +0900
Subject: [PATCH 0891/2325] chore: temporary fix for PhpCoveralls error

https://github.com/php-coveralls/php-coveralls/issues/327
---
 .github/workflows/test-phpunit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 4583244ed358..61133437d3e8 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -137,7 +137,7 @@ jobs:
       - name: Run Coveralls
         if: github.repository_owner == 'codeigniter4' && matrix.php-versions == '8.0'
         run: |
-          composer global require --ansi php-coveralls/php-coveralls:^2.4
+          composer global require --ansi php-coveralls/php-coveralls:^2.4 symfony/console:^5
           php-coveralls --coverage_clover=build/logs/clover.xml -v
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 8cd4cd33bf357247b0b6fc40b099d6d54ceda113 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 15:49:25 +0900
Subject: [PATCH 0892/2325] refactor: Time::getDst()

---
 system/I18n/Time.php | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index ca8ffc3dc72e..c182bee32e7e 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -479,21 +479,7 @@ public function getQuarter(): string
      */
     public function getDst(): bool
     {
-        // grab the transactions that would affect today
-        $start       = strtotime('-1 year', $this->getTimestamp());
-        $end         = strtotime('+2 year', $start);
-        $transitions = $this->timezone->getTransitions($start, $end);
-
-        $daylightSaving = false;
-
-        foreach ($transitions as $transition) {
-            if ($transition['time'] > $this->format('U')) {
-                $daylightSaving = (bool) ($transition['isdst'] ?? $daylightSaving);
-                break;
-            }
-        }
-
-        return $daylightSaving;
+        return (bool) $this->format('I');
     }
 
     /**

From 027381d6fbbf18a284d4e75061f8e36919774c93 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 1 Dec 2021 20:34:00 +0900
Subject: [PATCH 0893/2325] chore: fix example test code for starter and module

---
 .../tests/database/ExampleDatabaseTest.php      | 12 ++++++------
 .../module/tests/session/ExampleSessionTest.php | 17 +++++++----------
 .../tests/database/ExampleDatabaseTest.php      |  3 +++
 .../tests/session/ExampleSessionTest.php        |  7 +++++--
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/admin/module/tests/database/ExampleDatabaseTest.php b/admin/module/tests/database/ExampleDatabaseTest.php
index 203b1261c7e0..f9edc4d235d8 100644
--- a/admin/module/tests/database/ExampleDatabaseTest.php
+++ b/admin/module/tests/database/ExampleDatabaseTest.php
@@ -1,18 +1,18 @@
 <?php
 
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\ExampleSeeder;
 use Tests\Support\Models\ExampleModel;
 
 /**
  * @internal
  */
-final class ExampleDatabaseTest extends \Tests\Support\DatabaseTestCase
+final class ExampleDatabaseTest extends CIUnitTestCase
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
+    use DatabaseTestTrait;
 
-        // Extra code to run before each test
-    }
+    protected $seed = ExampleSeeder::class;
 
     public function testModelFindAll()
     {
diff --git a/admin/module/tests/session/ExampleSessionTest.php b/admin/module/tests/session/ExampleSessionTest.php
index 65dd37c6b498..98fe7afa0d77 100644
--- a/admin/module/tests/session/ExampleSessionTest.php
+++ b/admin/module/tests/session/ExampleSessionTest.php
@@ -1,21 +1,18 @@
 <?php
 
+use CodeIgniter\Test\CIUnitTestCase;
+use Config\Services;
+
 /**
  * @internal
  */
-final class ExampleSessionTest extends \Tests\Support\SessionTestCase
+final class ExampleSessionTest extends CIUnitTestCase
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
-    }
-
     public function testSessionSimple()
     {
-        $this->session->set('logged_in', 123);
-
-        $value = $this->session->get('logged_in');
+        $session = Services::session();
 
-        $this->assertSame(123, $value);
+        $session->set('logged_in', 123);
+        $this->assertSame(123, $session->get('logged_in'));
     }
 }
diff --git a/admin/starter/tests/database/ExampleDatabaseTest.php b/admin/starter/tests/database/ExampleDatabaseTest.php
index 5d13836f9dc6..f9edc4d235d8 100644
--- a/admin/starter/tests/database/ExampleDatabaseTest.php
+++ b/admin/starter/tests/database/ExampleDatabaseTest.php
@@ -2,6 +2,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\ExampleSeeder;
 use Tests\Support\Models\ExampleModel;
 
 /**
@@ -11,6 +12,8 @@ final class ExampleDatabaseTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
+    protected $seed = ExampleSeeder::class;
+
     public function testModelFindAll()
     {
         $model = new ExampleModel();
diff --git a/admin/starter/tests/session/ExampleSessionTest.php b/admin/starter/tests/session/ExampleSessionTest.php
index 151036412146..98fe7afa0d77 100644
--- a/admin/starter/tests/session/ExampleSessionTest.php
+++ b/admin/starter/tests/session/ExampleSessionTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use CodeIgniter\Test\CIUnitTestCase;
+use Config\Services;
 
 /**
  * @internal
@@ -9,7 +10,9 @@ final class ExampleSessionTest extends CIUnitTestCase
 {
     public function testSessionSimple()
     {
-        $this->session->set('logged_in', 123);
-        $this->assertSame(123, $this->session->get('logged_in'));
+        $session = Services::session();
+
+        $session->set('logged_in', 123);
+        $this->assertSame(123, $session->get('logged_in'));
     }
 }

From dfeb02f744f95ac879a2fc3550eea8b72c459916 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 3 Dec 2021 08:31:56 +0900
Subject: [PATCH 0894/2325] docs: fix sample code that uses non-existent
 methods

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

diff --git a/user_guide_src/source/libraries/time.rst b/user_guide_src/source/libraries/time.rst
index 12f3a9f38e7e..cd8dc0a9ddcf 100644
--- a/user_guide_src/source/libraries/time.rst
+++ b/user_guide_src/source/libraries/time.rst
@@ -334,9 +334,9 @@ thrown.
 ::
 
     $time = $time->setYear(2017);
-    $time = $time->setMonthNumber(4); // April
-    $time = $time->setMonthLongName('April');
-    $time = $time->setMonthShortName('Feb'); // February
+    $time = $time->setMonth(4);     // April
+    $time = $time->setMonth('April');
+    $time = $time->setMonth('Feb'); // February
     $time = $time->setDay(25);
     $time = $time->setHour(14); // 2:00 pm
     $time = $time->setMinute(30);

From 4ea0156e387b0684477e6d313332213eec76045d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 3 Dec 2021 08:35:28 +0900
Subject: [PATCH 0895/2325] docs: decorate class,method,variable with '``'

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

diff --git a/user_guide_src/source/libraries/time.rst b/user_guide_src/source/libraries/time.rst
index cd8dc0a9ddcf..11093a3b5a60 100644
--- a/user_guide_src/source/libraries/time.rst
+++ b/user_guide_src/source/libraries/time.rst
@@ -4,7 +4,7 @@ Times and Dates
 
 CodeIgniter provides a fully-localized, immutable, date/time class that is built on PHP's DateTime object, but uses the Intl
 extension's features to convert times across timezones and display the output correctly for different locales. This class
-is the **Time** class and lives in the **CodeIgniter\\I18n** namespace.
+is the ``Time`` class and lives in the ``CodeIgniter\I18n`` namespace.
 
 .. note:: Since the Time class extends DateTime, if there are features that you need that this class doesn't provide,
     you can likely find them within the DateTime class itself.
@@ -38,7 +38,7 @@ provided, the application defaults will be used.
 now()
 -----
 
-The Time class has several helper methods to instantiate the class. The first of these is the **now()** method
+The Time class has several helper methods to instantiate the class. The first of these is the ``now()`` method
 that returns a new instance set to the current time. You can pass in strings representing the timezone and the locale
 in the second and parameters, respectively. If no locale or timezone is provided, the application defaults will be used.
 
@@ -92,7 +92,7 @@ fourth and fifth parameters::
 createFromTime()
 ----------------
 
-Like **createFromDate** except it is only concerned with the **hours**, **minutes**, and **seconds**. Uses the
+Like ``createFromDate()`` except it is only concerned with the **hours**, **minutes**, and **seconds**. Uses the
 current day for the date portion of the Time instance. Accepts strings for the timezone and locale in the
 fourth and fifth parameters::
 
@@ -113,7 +113,7 @@ createFromFormat()
 ------------------
 
 This is a replacement for DateTime's method of the same name. This allows the timezone to be set at the same time,
-and returns a **Time** instance, instead of DateTime::
+and returns a ``Time`` instance, instead of DateTime::
 
     $time = Time::createFromFormat('j-M-Y', '15-Feb-2009', 'America/Chicago');
 
@@ -154,7 +154,7 @@ to display localized versions of the value, though.
 toLocalizedString()
 -------------------
 
-This is the localized version of DateTime's format() method. Instead of using the values you might be familiar with, though,
+This is the localized version of DateTime's ``format()`` method. Instead of using the values you might be familiar with, though,
 you must use values acceptable to the `IntlDateFormatter <https://www.php.net/manual/en/class.intldateformatter.php>`__ class.
 A full listing of values can be found `here <https://unicode-org.github.io/icu-docs/apidoc/released/icu4c/classSimpleDateFormat.html#details>`__.
 ::
@@ -224,8 +224,8 @@ The Time object provides a number of methods to allow to get and set individual
 of an existing instance. All of the values retrieved through the following methods will be fully localized and respect
 the locale that the Time instance was created with.
 
-All of the following `getX` and `setX` methods can also be used as if they were a class property. So, any calls to methods
-like `getYear` can also be accessed through `$time->year`, and so on.
+All of the following ``getX()`` and ``setX()`` methods can also be used as if they were a class property. So, any calls to methods
+like ``getYear()`` can also be accessed through ``$time->year``, and so on.
 
 Getters
 -------
@@ -416,7 +416,7 @@ a timezone string in as the second parameter. If no timezone is given, the syste
 sameAs()
 --------
 
-This is identical to the **equals** method, except that it only returns true when the date, time, AND timezone are
+This is identical to the ``equals()`` method, except that it only returns true when the date, time, AND timezone are
 all identical::
 
     $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
@@ -446,7 +446,7 @@ a timezone string in as the second parameter. If no timezone is given, the syste
 isAfter()
 ---------
 
-Works exactly the same as **isBefore()** except checks if the time is after the time passed in::
+Works exactly the same as ``isBefore()`` except checks if the time is after the time passed in::
 
     $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
     $time2 = Time::parse('January 11, 2017 03:50:00', 'America/Chicago');
@@ -457,7 +457,7 @@ Works exactly the same as **isBefore()** except checks if the time is after the
 Viewing Differences
 ===================
 
-To compare two Times directly, you would use the **difference()** method, which returns a **CodeIgniter\\I18n\\TimeDifference**
+To compare two Times directly, you would use the ``difference()`` method, which returns a ``CodeIgniter\\I18n\\TimeDifference``
 instance. The first parameter is either a Time instance, a DateTime instance, or a string with the date/time. If
 a string is passed in the first parameter, the second parameter can be a timezone string::
 
@@ -484,7 +484,7 @@ the original time::
     echo $diff->getMinutes(); // -3682080
     echo $diff->getSeconds(); // -220924800
 
-You can use either **getX()** methods, or access the calculate values as if they were properties::
+You can use either ``getX()`` methods, or access the calculate values as if they were properties::
 
     echo $diff->years;   // -7
     echo $diff->months; // -84
@@ -497,7 +497,7 @@ You can use either **getX()** methods, or access the calculate values as if they
 humanize()
 ----------
 
-Much like Time's humanize() method, this returns a string that displays the difference between the times in a
+Much like Time's ``humanize()`` method, this returns a string that displays the difference between the times in a
 human readable format that is geared towards being easily understood. It can create strings like '3 hours ago',
 'in 1 month', etc. The biggest differences are in how very recent dates are handled::
 

From c30e02622109571d1a49710978034584c8599408 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 3 Dec 2021 08:37:47 +0900
Subject: [PATCH 0896/2325] docs: decrate filename with **

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

diff --git a/user_guide_src/source/libraries/time.rst b/user_guide_src/source/libraries/time.rst
index 11093a3b5a60..6b2c2c32efd0 100644
--- a/user_guide_src/source/libraries/time.rst
+++ b/user_guide_src/source/libraries/time.rst
@@ -214,7 +214,7 @@ $time > now && < 1 hour          in 35 minutes / 35 minutes ago
 $time == now                     Now
 =============================== =================================
 
-The exact language used is controlled through the language file, Time.php.
+The exact language used is controlled through the language file, **Time.php**.
 
 ==============================
 Working with Individual Values
@@ -522,4 +522,4 @@ $time > 1 minute && < 1 hour     in 35 minutes / 35 minutes ago
 $time < 1 minute                 Now
 =============================== =================================
 
-The exact language used is controlled through the language file, Time.php.
+The exact language used is controlled through the language file, **Time.php**.

From 4cbbd7ecd6b520ef46b3fb537e14e823bcfa7b7d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 3 Dec 2021 08:38:29 +0900
Subject: [PATCH 0897/2325] docs: align comments

---
 user_guide_src/source/libraries/time.rst | 82 ++++++++++++------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/user_guide_src/source/libraries/time.rst b/user_guide_src/source/libraries/time.rst
index 6b2c2c32efd0..494a934b4fea 100644
--- a/user_guide_src/source/libraries/time.rst
+++ b/user_guide_src/source/libraries/time.rst
@@ -85,7 +85,7 @@ Given separate inputs for **year**, **month**, and **day**, will return a new in
 are not provided, it will use the current value to fill it in. Accepts strings for the timezone and locale in the
 fourth and fifth parameters::
 
-    $today       = Time::createFromDate(); // Uses current year, month, and day
+    $today       = Time::createFromDate();     // Uses current year, month, and day
     $anniversary = Time::createFromDate(2018); // Uses current month and day
     $date        = Time::createFromDate(2018, 3, 15, 'America/Chicago', 'en_US');
 
@@ -96,7 +96,7 @@ Like ``createFromDate()`` except it is only concerned with the **hours**, **minu
 current day for the date portion of the Time instance. Accepts strings for the timezone and locale in the
 fourth and fifth parameters::
 
-    $lunch  = Time::createFromTime(11, 30); // 11:30 am today
+    $lunch  = Time::createFromTime(11, 30);     // 11:30 am today
     $dinner = Time::createFromTime(18, 00, 00); // 6:00 pm today
     $time   = Time::createFromTime($hour, $minutes, $seconds, $timezone, $locale);
 
@@ -234,17 +234,17 @@ The following basic getters exist::
 
     $time = Time::parse('August 12, 2016 4:15:23pm');
 
-    echo $time->getYear(); // 2016
-    echo $time->getMonth(); // 8
-    echo $time->getDay(); // 12
-    echo $time->getHour(); // 16
+    echo $time->getYear();   // 2016
+    echo $time->getMonth();  // 8
+    echo $time->getDay();    // 12
+    echo $time->getHour();   // 16
     echo $time->getMinute(); // 15
     echo $time->getSecond(); // 23
 
-    echo $time->year; // 2016
-    echo $time->month; // 8
-    echo $time->day; // 12
-    echo $time->hour; // 16
+    echo $time->year;   // 2016
+    echo $time->month;  // 8
+    echo $time->day;    // 12
+    echo $time->hour;   // 16
     echo $time->minute; // 15
     echo $time->second; // 23
 
@@ -252,19 +252,19 @@ In addition to these, a number of methods exist to provide additional informatio
 
     $time = Time::parse('August 12, 2016 4:15:23pm');
 
-    echo $time->getDayOfWeek(); // 6 - but may vary based on locale's starting day of the week
-    echo $time->getDayOfYear(); // 225
+    echo $time->getDayOfWeek();   // 6 - but may vary based on locale's starting day of the week
+    echo $time->getDayOfYear();   // 225
     echo $time->getWeekOfMonth(); // 2
-    echo $time->getWeekOfYear(); // 33
-    echo $time->getTimestamp(); // 1471018523 - UNIX timestamp
-    echo $time->getQuarter(); // 3
+    echo $time->getWeekOfYear();  // 33
+    echo $time->getTimestamp();   // 1471018523 - UNIX timestamp
+    echo $time->getQuarter();     // 3
 
-    echo $time->dayOfWeek; // 6
-    echo $time->dayOfYear; // 225
+    echo $time->dayOfWeek;   // 6
+    echo $time->dayOfYear;   // 225
     echo $time->weekOfMonth; // 2
-    echo $time->weekOfYear; // 33
-    echo $time->timestamp; // 1471018523
-    echo $time->quarter; // 3
+    echo $time->weekOfYear;  // 33
+    echo $time->timestamp;   // 1471018523
+    echo $time->quarter;     // 3
 
 getAge()
 --------
@@ -275,7 +275,7 @@ the age of someone based on their birthday::
     $time = Time::parse('5 years ago');
 
     echo $time->getAge(); // 5
-    echo $time->age; // 5
+    echo $time->age;      // 5
 
 getDST()
 --------
@@ -283,14 +283,14 @@ getDST()
 Returns boolean true/false based on whether the Time instance is currently observing Daylight Savings Time::
 
     echo Time::createFromDate(2012, 1, 1)->getDst(); // false
-    echo Time::createFromDate(2012, 9, 1)->dst; // true
+    echo Time::createFromDate(2012, 9, 1)->dst;      // true
 
 getLocal()
 ----------
 
 Returns boolean true if the Time instance is in the same timezone as the application is currently running in::
 
-    echo Time::now()->getLocal(); // true
+    echo Time::now()->getLocal();    // true
     echo Time::now('Europe/London'); // false
 
 getUtc()
@@ -299,7 +299,7 @@ getUtc()
 Returns boolean true if the Time instance is in UTC time::
 
     echo Time::now('America/Chicago')->getUtc(); // false
-    echo Time::now('UTC')->utc; // true
+    echo Time::now('UTC')->utc;                  // true
 
 getTimezone()
 -------------
@@ -319,7 +319,7 @@ getTimezoneName()
 Returns the full `timezone string <https://www.php.net/manual/en/timezones.php>`__ of the Time instance::
 
     echo Time::now('America/Chicago')->getTimezoneName(); // America/Chicago
-    echo Time::now('Europe/London')->timezoneName; // Europe/London
+    echo Time::now('Europe/London')->timezoneName;        // Europe/London
 
 Setters
 =======
@@ -334,11 +334,11 @@ thrown.
 ::
 
     $time = $time->setYear(2017);
-    $time = $time->setMonth(4);     // April
+    $time = $time->setMonth(4);       // April
     $time = $time->setMonth('April');
-    $time = $time->setMonth('Feb'); // February
+    $time = $time->setMonth('Feb');   // February
     $time = $time->setDay(25);
-    $time = $time->setHour(14); // 2:00 pm
+    $time = $time->setHour(14);       // 2:00 pm
     $time = $time->setMinute(30);
     $time = $time->setSecond(54);
 
@@ -350,10 +350,10 @@ Converts the time from it's current timezone into the new one::
     $time  = Time::parse('13 May 2020 10:00', 'America/Chicago');
     $time2 = $time->setTimezone('Europe/London'); // Returns new instance converted to new timezone
 
-    echo $time->getTimezoneName(); // American/Chicago
+    echo $time->getTimezoneName();  // American/Chicago
     echo $time2->getTimezoneName(); // Europe/London
 
-    echo $time->toDateTimeString(); // 2020-05-13 10:00:00
+    echo $time->toDateTimeString();  // 2020-05-13 10:00:00
     echo $time2->toDateTimeString(); // 2020-05-13 18:00:00
 
 setTimestamp()
@@ -364,7 +364,7 @@ Returns a new instance with the date set to the new timestamp::
     $time = Time::parse('May 10, 2017', 'America/Chicago');
     $time2 = $time->setTimestamp(strtotime('April 1, 2017'));
 
-    echo $time->toDateTimeString(); // 2017-05-10 00:00:00
+    echo $time->toDateTimeString();  // 2017-05-10 00:00:00
     echo $time2->toDateTimeString(); // 2017-04-01 00:00:00
 
 Modifying the Value
@@ -422,7 +422,7 @@ all identical::
     $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
     $time2 = Time::parse('January 11, 2017 03:50:00', 'Europe/London');
 
-    $time1->sameAs($time2);    // false
+    $time1->sameAs($time2); // false
     $time2->sameAs('January 10, 2017 21:50:00', 'America/Chicago'); // true
 
 isBefore()
@@ -476,21 +476,21 @@ the original time::
 
     $diff = $current->difference($test);
 
-    echo $diff->getYears(); // -7
-    echo $diff->getMonths(); // -84
-    echo $diff->getWeeks(); // -365
-    echo $diff->getDays(); // -2557
-    echo $diff->getHours(); // -61368
+    echo $diff->getYears();   // -7
+    echo $diff->getMonths();  // -84
+    echo $diff->getWeeks();   // -365
+    echo $diff->getDays();    // -2557
+    echo $diff->getHours();   // -61368
     echo $diff->getMinutes(); // -3682080
     echo $diff->getSeconds(); // -220924800
 
 You can use either ``getX()`` methods, or access the calculate values as if they were properties::
 
     echo $diff->years;   // -7
-    echo $diff->months; // -84
-    echo $diff->weeks; // -365
-    echo $diff->days; // -2557
-    echo $diff->hours; // -61368
+    echo $diff->months;  // -84
+    echo $diff->weeks;   // -365
+    echo $diff->days;    // -2557
+    echo $diff->hours;   // -61368
     echo $diff->minutes; // -3682080
     echo $diff->seconds; // -220924800
 

From f55ddd28016fc258400fb905d2a19b5a3f495ecb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 3 Dec 2021 08:42:37 +0900
Subject: [PATCH 0898/2325] docs: remove duplicated '\'

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

diff --git a/user_guide_src/source/libraries/time.rst b/user_guide_src/source/libraries/time.rst
index 494a934b4fea..57ee4d4572d6 100644
--- a/user_guide_src/source/libraries/time.rst
+++ b/user_guide_src/source/libraries/time.rst
@@ -457,7 +457,7 @@ Works exactly the same as ``isBefore()`` except checks if the time is after the
 Viewing Differences
 ===================
 
-To compare two Times directly, you would use the ``difference()`` method, which returns a ``CodeIgniter\\I18n\\TimeDifference``
+To compare two Times directly, you would use the ``difference()`` method, which returns a ``CodeIgniter\I18n\TimeDifference``
 instance. The first parameter is either a Time instance, a DateTime instance, or a string with the date/time. If
 a string is passed in the first parameter, the second parameter can be a timezone string::
 

From 11007b454370097d5e763472c62a01b737c33256 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 3 Dec 2021 08:51:07 +0900
Subject: [PATCH 0899/2325] docs: add command prompt '>' before `php spark`

---
 user_guide_src/source/cli/cli_generators.rst           | 2 +-
 user_guide_src/source/dbmgmt/forge.rst                 | 4 ++--
 user_guide_src/source/installation/running.rst         | 8 ++++----
 user_guide_src/source/installation/troubleshooting.rst | 2 +-
 user_guide_src/source/tutorial/index.rst               | 2 +-
 user_guide_src/source/tutorial/static_pages.rst        | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/user_guide_src/source/cli/cli_generators.rst b/user_guide_src/source/cli/cli_generators.rst
index 210226b51edc..5cf4ed4279da 100644
--- a/user_guide_src/source/cli/cli_generators.rst
+++ b/user_guide_src/source/cli/cli_generators.rst
@@ -260,7 +260,7 @@ generator command are recognized by the scaffold command.
 
 Running this in your terminal::
 
-    php spark make:scaffold user
+    > php spark make:scaffold user
 
 will create the following classes:
 
diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index e1ed99e02c5c..720f77655d54 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -67,7 +67,7 @@ will complain that the database creation has failed.
 
 To start, just type the command and the name of the database (e.g., ``foo``)::
 
-    php spark db:create foo
+    > php spark db:create foo
 
 If everything went fine, you should expect the ``Database "foo" successfully created.`` message displayed.
 
@@ -76,7 +76,7 @@ for the file where the database will be created using the ``--ext`` option. Vali
 ``sqlite`` and defaults to ``db``. Remember that these should not be preceded by a period.
 ::
 
-    php spark db:create foo --ext sqlite
+    > php spark db:create foo --ext sqlite
     // will create the db file in WRITEPATH/foo.sqlite
 
 .. note:: When using the special SQLite3 database name ``:memory:``, expect that the command will still
diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst
index bb4b99aa468f..f16bb7636672 100644
--- a/user_guide_src/source/installation/running.rst
+++ b/user_guide_src/source/installation/running.rst
@@ -43,7 +43,7 @@ CodeIgniter 4 comes with a local development server, leveraging PHP's built-in w
 with CodeIgniter routing. You can use the ``serve`` script to launch it,
 with the following command line in the main directory::
 
-    php spark serve
+    > php spark serve
 
 This will launch the server and you can now view your application in your browser at http://localhost:8080.
 
@@ -58,17 +58,17 @@ The local development server can be customized with three command line options:
 
 - You can use the ``--host`` CLI option to specify a different host to run the application at::
 
-    php spark serve --host example.dev
+    > php spark serve --host example.dev
 
 - By default, the server runs on port 8080 but you might have more than one site running, or already have
   another application using that port. You can use the ``--port`` CLI option to specify a different one::
 
-    php spark serve --port 8081
+    > php spark serve --port 8081
 
 - You can also specify a specific version of PHP to use, with the ``--php`` CLI option, with its value
   set to the path of the PHP executable you want to use::
 
-    php spark serve --php /usr/bin/php7.6.5.4
+    > php spark serve --php /usr/bin/php7.6.5.4
 
 Hosting with Apache
 ===================
diff --git a/user_guide_src/source/installation/troubleshooting.rst b/user_guide_src/source/installation/troubleshooting.rst
index ff30759efcad..0da650bdf07c 100644
--- a/user_guide_src/source/installation/troubleshooting.rst
+++ b/user_guide_src/source/installation/troubleshooting.rst
@@ -9,7 +9,7 @@ How do I know if my install is working?
 
 From the command line, at your project root::
 
-    php spark serve
+    > php spark serve
 
 ``http://localhost:8080`` in your browser should then show the default
 welcome page:
diff --git a/user_guide_src/source/tutorial/index.rst b/user_guide_src/source/tutorial/index.rst
index 6be36535579b..71182a6f5bf4 100644
--- a/user_guide_src/source/tutorial/index.rst
+++ b/user_guide_src/source/tutorial/index.rst
@@ -82,7 +82,7 @@ comes with a simple command that takes advantage of PHP's built-in server to get
 you up and running fast on your development machines. Type the following on the
 command line from the root of your project::
 
-    php spark serve
+    > php spark serve
 
 
 The Welcome Page
diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
index 1763d1fae624..ecf6e87e03c5 100644
--- a/user_guide_src/source/tutorial/static_pages.rst
+++ b/user_guide_src/source/tutorial/static_pages.rst
@@ -178,7 +178,7 @@ From the command line, at the root of your project:
 
 ::
 
-    php spark serve
+    > php spark serve
 
 will start a web server, accessible on port 8080. If you set the location field
 in your browser to ``localhost:8080``, you should see the CodeIgniter welcome page.

From 458aa5b24fbbd7f3848eb226777289972be9485b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 3 Dec 2021 09:45:09 +0900
Subject: [PATCH 0900/2325] docs: add command prompt `>` before `composer`

---
 .../source/installation/installing_composer.rst    | 14 +++++++-------
 user_guide_src/source/libraries/caching.rst        |  2 +-
 user_guide_src/source/tutorial/index.rst           |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst
index b63e34602425..41b288c02037 100644
--- a/user_guide_src/source/installation/installing_composer.rst
+++ b/user_guide_src/source/installation/installing_composer.rst
@@ -32,7 +32,7 @@ Installation & Set Up
 
 In the folder above your project root::
 
-    composer create-project codeigniter4/appstarter project-root
+    > composer create-project codeigniter4/appstarter project-root
 
 The command above will create a "project-root" folder.
 
@@ -46,7 +46,7 @@ trusted dependencies that we bundle, being composer-installed.
 
 A sample such installation command, using the default project-root "appstarter"::
 
-    composer create-project codeigniter4/appstarter --no-dev
+    > composer create-project codeigniter4/appstarter --no-dev
 
 After installation you should follow the steps in the "Upgrading" section.
 
@@ -55,11 +55,11 @@ Upgrading
 
 Whenever there is a new release, then from the command line in your project root::
 
-    composer update
+    > composer update
 
 If you want to compare the latest framework source structure for non-system directory (app, public, etc), you can update with ``--prefer-source``::
 
-    composer update codeigniter4/framework --prefer-source
+    > composer update codeigniter4/framework --prefer-source
 
 If ``--prefer-source`` doesn't automatically update to pull latest framework source structure, you can remove first::
 
@@ -125,7 +125,7 @@ will be your document root.
 
 In your project root::
 
-    composer require codeigniter4/framework --prefer-source
+    > composer require codeigniter4/framework --prefer-source
 
 As with the earlier two composer install methods, you can omit installing
 phpunit and its dependencies by adding the ``--no-dev`` argument to the ``composer require`` command.
@@ -147,7 +147,7 @@ Upgrading
 
 Whenever there is a new release, then from the command line in your project root::
 
-    composer update --prefer-source
+    > composer update --prefer-source
 
 Read the upgrade instructions, and check designated
 ``app/Config`` folders for affected changes.
@@ -179,6 +179,6 @@ they can be added to your project in a similar fashion.
 
 From the command line inside your project root::
 
-    composer require codeigniter4/translations
+    > composer require codeigniter4/translations
 
 These will be updated along with the framework whenever you do a ``composer update``.
diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst
index d9c79289c747..cc9049ee9a5d 100644
--- a/user_guide_src/source/libraries/caching.rst
+++ b/user_guide_src/source/libraries/caching.rst
@@ -315,7 +315,7 @@ Predis Caching
 Predis is a flexible and feature-complete PHP client library for the Redis key-value store.
 To use it, from the command line inside your project root::
 
-    composer require predis/predis
+    > composer require predis/predis
 
 For more information on Redis, please see
 `https://github.com/nrk/predis <https://github.com/nrk/predis>`_.
diff --git a/user_guide_src/source/tutorial/index.rst b/user_guide_src/source/tutorial/index.rst
index 6be36535579b..f396e44283c8 100644
--- a/user_guide_src/source/tutorial/index.rst
+++ b/user_guide_src/source/tutorial/index.rst
@@ -59,7 +59,7 @@ From your command line type the following:
 
 ::
 
-    composer create-project codeigniter4/appstarter ci-news
+    > composer create-project codeigniter4/appstarter ci-news
 
 This creates a new folder, **ci-news**, which contains your application code, with
 CodeIgniter installed in the vendor folder.

From 5ecf75138a2d5debe505d285f35031daffcf620c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 3 Dec 2021 09:55:41 +0900
Subject: [PATCH 0901/2325] docs: fix decoration for file path and code

---
 .../source/installation/upgrade_controllers.rst      | 12 ++++++------
 .../source/installation/upgrade_database.rst         |  2 +-
 .../source/installation/upgrade_encryption.rst       |  2 +-
 .../source/installation/upgrade_file_upload.rst      |  2 +-
 .../source/installation/upgrade_localization.rst     |  4 ++--
 .../source/installation/upgrade_migrations.rst       |  6 +++---
 .../source/installation/upgrade_models.rst           | 12 ++++++------
 .../source/installation/upgrade_security.rst         |  2 +-
 .../source/installation/upgrade_validations.rst      |  8 ++++----
 user_guide_src/source/installation/upgrade_views.rst |  6 +++---
 10 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_controllers.rst b/user_guide_src/source/installation/upgrade_controllers.rst
index 2625bd29cbb0..003cad92a295 100644
--- a/user_guide_src/source/installation/upgrade_controllers.rst
+++ b/user_guide_src/source/installation/upgrade_controllers.rst
@@ -23,16 +23,16 @@ What has been changed
 Upgrade Guide
 =============
 
-1. First, move all controller files to the folder ``app/Controllers``.
+1. First, move all controller files to the folder **app/Controllers**.
 2. Add this line just after the opening php tag: ``namespace App\Controllers;``
 3. Replace ``extends CI_Controller`` with ``extends BaseController``.
 
 | If you use sub-directories in your controller structure, you have to change the namespace according to that.
-| For example, you have a version 3 controller located in ``application/controllers/users/auth/Register.php``, 
+| For example, you have a version 3 controller located in **application/controllers/users/auth/Register.php**,
     the namespace has to be ``namespace App\Controllers\Users\Auth;`` and the controller path in the version 4 
-    should look like this: ``app/Controllers/Users/Auth/Register.php``. Make sure to have the first letters of 
+    should look like this: **app/Controllers/Users/Auth/Register.php**. Make sure to have the first letters of
     the sub-directories as capitalized.
-| After that you have to insert a "use" statement below the namespace definition in order to extend the "BaseController": 
+| After that you have to insert a ``use`` statement below the namespace definition in order to extend the ``BaseController``:
     ``use App\Controllers\BaseController;``
 
 Code Example
@@ -41,7 +41,7 @@ Code Example
 CodeIgniter Version 3.11
 ------------------------
 
-Path: ``application/controllers``::
+Path: **application/controllers**::
 
     <?php
 
@@ -56,7 +56,7 @@ Path: ``application/controllers``::
 CodeIgniter Version 4.x
 -----------------------
 
-Path: ``app/Controllers``::
+Path: **app/Controllers**::
 
     <?php
 
diff --git a/user_guide_src/source/installation/upgrade_database.rst b/user_guide_src/source/installation/upgrade_database.rst
index 221a52b7a8dc..f2f4ee65440f 100644
--- a/user_guide_src/source/installation/upgrade_database.rst
+++ b/user_guide_src/source/installation/upgrade_database.rst
@@ -20,7 +20,7 @@ What has been changed
 
 Upgrade Guide
 =============
-1. Add your database credentials to ``app/Config/Database.php``. The options are pretty much the same as in CI3 only some names have changed slightly.
+1. Add your database credentials to **app/Config/Database.php**. The options are pretty much the same as in CI3 only some names have changed slightly.
 2. Everywhere you have used the database you have to replace ``$this->load->database();`` with ``$db = db_connect();``.
 3. If you use multiple databases use the following code to load additional databases ``$db = db_connect('group_name');``.
 4. Now you have to change all database queries. The most important change here is to replace ``$this->db`` with just ``$db`` and adjust the method name and ``$db``. Here are some examples:
diff --git a/user_guide_src/source/installation/upgrade_encryption.rst b/user_guide_src/source/installation/upgrade_encryption.rst
index dca7fbcbc27b..003abc7ae218 100644
--- a/user_guide_src/source/installation/upgrade_encryption.rst
+++ b/user_guide_src/source/installation/upgrade_encryption.rst
@@ -19,7 +19,7 @@ What has been changed
 
 Upgrade Guide
 =============
-1. Within your configs the ``$config['encryption_key'] = 'abc123';`` moved from ``application/config/config.php`` to ``public $key = 'abc123';`` in ``app/Config/Encryption.php``.
+1. Within your configs the ``$config['encryption_key'] = 'abc123';`` moved from **application/config/config.php** to ``public $key = 'abc123';`` in **app/Config/Encryption.php**.
 2. Wherever you have used the encryption library you have to replace ``$this->load->library('encryption');`` with ``$encrypter = service('encrypter');`` and change the methods for encryption and decrypting like in the following code example.
 
 Code Example
diff --git a/user_guide_src/source/installation/upgrade_file_upload.rst b/user_guide_src/source/installation/upgrade_file_upload.rst
index 3369442e6392..6161e999f45e 100644
--- a/user_guide_src/source/installation/upgrade_file_upload.rst
+++ b/user_guide_src/source/installation/upgrade_file_upload.rst
@@ -18,7 +18,7 @@ What has been changed
 Upgrade Guide
 =============
 In CI4 you access uploaded files with ``$file = $this->request->getFile('userfile')``. From there you can validate if the file got uploaded successfully with ``$file->isValid()``.
-To store the file you could use ``$path = $this->request->getFile('userfile')->store('head_img/', 'user_name.jpg');`` This will store the file in ``writable/uploads/head_img/user_name.jpg``.
+To store the file you could use ``$path = $this->request->getFile('userfile')->store('head_img/', 'user_name.jpg');``. This will store the file in **writable/uploads/head_img/user_name.jpg**.
 
 You have to change your file uploading code to match the new methods.
 
diff --git a/user_guide_src/source/installation/upgrade_localization.rst b/user_guide_src/source/installation/upgrade_localization.rst
index b974570f5939..ca919c7cdb1b 100644
--- a/user_guide_src/source/installation/upgrade_localization.rst
+++ b/user_guide_src/source/installation/upgrade_localization.rst
@@ -19,11 +19,11 @@ What has been changed
 
 Upgrade Guide
 =============
-1. Specify the default language in *Config/App.php*:::
+1. Specify the default language in **Config/App.php**::
 
     public $defaultLocale = 'en';
 
-2. Now move your language files to ``app/Language/<locale>/``.
+2. Now move your language files to **app/Language/<locale>**.
 3. After that you have to change the syntax within the language files. Below in the Code Example you will see how the language array within the file should look like.
 4. Remove from every file the language loader ``$this->lang->load($file, $lang);``.
 5. Replace the method to load the language line ``$this->lang->line('error_email_missing')`` with ``echo lang('Errors.errorEmailMissing');``.
diff --git a/user_guide_src/source/installation/upgrade_migrations.rst b/user_guide_src/source/installation/upgrade_migrations.rst
index 10a75bf23f2d..9141cc82ae21 100644
--- a/user_guide_src/source/installation/upgrade_migrations.rst
+++ b/user_guide_src/source/installation/upgrade_migrations.rst
@@ -25,7 +25,7 @@ Upgrade Guide
 =============
 
 1. If your v3 project uses sequential migration names you have to change those to timestamp names.
-2. You have to move all migration files to the new folder ``app/Database/Migrations``.
+2. You have to move all migration files to the new folder **app/Database/Migrations**.
 3. Remove the following line ``defined('BASEPATH') OR exit('No direct script access allowed');``.
 4. Add this line just after the opening php tag: ``namespace App\Database\Migrations;``.
 5. Below the ``namespace App\Database\Migrations;`` line add this line: ``use CodeIgniter\Database\Migration;``
@@ -51,7 +51,7 @@ Code Example
 CodeIgniter Version 3.11
 ------------------------
 
-Path: ``application/migrations``::
+Path: **application/migrations**::
 
     <?php
 
@@ -90,7 +90,7 @@ Path: ``application/migrations``::
 CodeIgniter Version 4.x
 -----------------------
 
-Path: ``app/Database/Migrations``::
+Path: **app/Database/Migrations**::
 
     <?php
 
diff --git a/user_guide_src/source/installation/upgrade_models.rst b/user_guide_src/source/installation/upgrade_models.rst
index 7100f6ca9202..51426f42acf7 100644
--- a/user_guide_src/source/installation/upgrade_models.rst
+++ b/user_guide_src/source/installation/upgrade_models.rst
@@ -21,14 +21,14 @@ What has been changed
 Upgrade Guide
 =============
 
-1. First, move all model files to the folder ``app/Models``.
+1. First, move all model files to the folder **app/Models**.
 2. Add this line just after the opening php tag: ``namespace App\Models;``.
 3. Below the ``namespace App\Models;`` line add this line: ``use CodeIgniter\Model;``.
 4. Replace ``extends CI_Model`` with ``extends Model``.
-5. Instead of CI3’s ``$this->load->model(x);``, you would now use ``$this->x = new X();``, following namespaced conventions for your component. Alternatively, you can use the ``model`` function: ``$this->x = model('X');``.
+5. Instead of CI3’s ``$this->load->model(x);``, you would now use ``$this->x = new X();``, following namespaced conventions for your component. Alternatively, you can use the ``model()`` function: ``$this->x = model('X');``.
 
 If you use sub-directories in your model structure you have to change the namespace according to that.
-Example: You have a version 3 model located in ``application/models/users/user_contact.php`` the namespace has to be ``namespace App\Models\Users;`` and the model path in the version 4 should look like this: ``app/Models/Users/UserContact.php``
+Example: You have a version 3 model located in **application/models/users/user_contact.php** the namespace has to be ``namespace App\Models\Users;`` and the model path in the version 4 should look like this: **app/Models/Users/UserContact.php**
 
 The new Model in CI4 has a lot of built-in methods. For example, the ``find($id)`` method. With this you can find data where the primary key is equal to ``$id``.
 Inserting data is also easier than before. In CI4 there is an ``insert($data)`` method. You can optionally make use of all those built-in methods and migrate your code to the new methods.
@@ -41,7 +41,7 @@ Code Example
 CodeIgniter Version 3.11
 ------------------------
 
-Path: ``application/models``::
+Path: **application/models**::
 
     <?php
 
@@ -60,7 +60,7 @@ Path: ``application/models``::
 CodeIgniter Version 4.x
 -----------------------
 
-Path: ``app/Models``::
+Path: **app/Models**::
 
     <?php
 
@@ -73,4 +73,4 @@ Path: ``app/Models``::
         // insert() method already implemented in parent
     }
 
-To insert data you can just directly call the ``$model->insert()`` method because this method is built-in since CI 4.
+To insert data you can just directly call the ``$model->insert()`` method because this method is built-in since CI4.
diff --git a/user_guide_src/source/installation/upgrade_security.rst b/user_guide_src/source/installation/upgrade_security.rst
index 4aeb34e513c9..12990ba63347 100644
--- a/user_guide_src/source/installation/upgrade_security.rst
+++ b/user_guide_src/source/installation/upgrade_security.rst
@@ -21,7 +21,7 @@ What has been changed
 
 Upgrade Guide
 =============
-1. To enable CSRF protection in CI4 you have to enable it in ``app/Config/Filters.php``::
+1. To enable CSRF protection in CI4 you have to enable it in **app/Config/Filters.php**::
 
     public $globals = [
         'before' => [
diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
index 5e2b1a2bf942..083479d210db 100644
--- a/user_guide_src/source/installation/upgrade_validations.rst
+++ b/user_guide_src/source/installation/upgrade_validations.rst
@@ -46,7 +46,7 @@ Code Example
 
 CodeIgniter Version 3.11
 ------------------------
-Path: ``application/views``::
+Path: **application/views**::
 
     <html>
     <head>
@@ -77,7 +77,7 @@ Path: ``application/views``::
     </body>
     </html>
 
-Path: ``application/controllers/``::
+Path: **application/controllers**::
 
     <?php
 
@@ -104,7 +104,7 @@ Path: ``application/controllers/``::
 
 CodeIgniter Version 4.x
 -----------------------
-Path: ``app/Views``::
+Path: **app/Views**::
 
     <html>
     <head>
@@ -135,7 +135,7 @@ Path: ``app/Views``::
     </body>
     </html>
 
-Path: ``app/Controllers/``::
+Path: **app/Controllers**::
 
     <?php
 
diff --git a/user_guide_src/source/installation/upgrade_views.rst b/user_guide_src/source/installation/upgrade_views.rst
index 554a0a83ffc3..51995646652c 100644
--- a/user_guide_src/source/installation/upgrade_views.rst
+++ b/user_guide_src/source/installation/upgrade_views.rst
@@ -22,7 +22,7 @@ What has been changed
 Upgrade Guide
 =============
 
-1. First, move all views  to the folder ``app/Views``
+1. First, move all views  to the folder **app/Views**
 2. Change the loading syntax of views in every script where you load views from
    ``$this->load->view('directory_name/file_name')`` to ``echo view('directory_name/file_name');``
 3. (optional) You can change the echo syntax in views from ``<?php echo $title; ?>`` to ``<?= $title ?>``
@@ -33,7 +33,7 @@ Code Example
 CodeIgniter Version 3.11
 ------------------------
 
-Path: ``application/views``::
+Path: **application/views**::
 
     <html>
     <head>
@@ -56,7 +56,7 @@ Path: ``application/views``::
 CodeIgniter Version 4.x
 -----------------------
 
-Path: ``app/Views``::
+Path: **app/Views**::
 
     <html>
     <head>

From f3eea52e21dee98ae74fbe6e372ebe892bd7e0dc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 5 Dec 2021 11:53:00 +0900
Subject: [PATCH 0902/2325] docs: add "License Agreement" and "Change Logs" in
 the TOC

---
 user_guide_src/source/installation/index.rst | 1 +
 user_guide_src/source/intro/index.rst        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/user_guide_src/source/installation/index.rst b/user_guide_src/source/installation/index.rst
index 37a4e61751a0..c29bcd33857e 100644
--- a/user_guide_src/source/installation/index.rst
+++ b/user_guide_src/source/installation/index.rst
@@ -19,6 +19,7 @@ Which is right for you?
     installing_manual
     running
     upgrading
+    ../changelogs/index
     troubleshooting
     repositories
 
diff --git a/user_guide_src/source/intro/index.rst b/user_guide_src/source/intro/index.rst
index 2a815c7d6d2b..4daafc228876 100644
--- a/user_guide_src/source/intro/index.rst
+++ b/user_guide_src/source/intro/index.rst
@@ -44,3 +44,4 @@ CodeIgniter is right for you if:
     requirements
     credits
     psr
+    License Agreement <../license>

From 92820fa54301e4875107460619ce67932b4702e9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 29 Nov 2021 10:44:58 +0900
Subject: [PATCH 0903/2325] test: add tests for current validation behaviors

---
 tests/system/Validation/FormatRulesTest.php | 67 +++++++++++++++
 tests/system/Validation/ValidationTest.php  | 95 +++++++++++++++++++++
 2 files changed, 162 insertions(+)

diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php
index 9a2e9bd46efc..1d7a0b33dc85 100644
--- a/tests/system/Validation/FormatRulesTest.php
+++ b/tests/system/Validation/FormatRulesTest.php
@@ -797,6 +797,73 @@ public function numericProvider(): Generator
         ];
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5374
+     *
+     * @dataProvider integerInvalidTypeDataProvider
+     *
+     * @param mixed $value
+     */
+    public function testIntegerWithInvalidTypeData($value, bool $expected): void
+    {
+        $this->validation->setRules([
+            'foo' => 'integer',
+        ]);
+
+        $data = [
+            'foo' => $value,
+        ];
+        $this->assertsame($expected, $this->validation->run($data));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5374
+     *
+     * @dataProvider integerInvalidTypeDataProvider
+     *
+     * @param mixed $value
+     */
+    public function testNumericWithInvalidTypeData($value, bool $expected): void
+    {
+        $this->validation->setRules([
+            'foo' => 'numeric',
+        ]);
+
+        $data = [
+            'foo' => $value,
+        ];
+        $this->assertsame($expected, $this->validation->run($data));
+    }
+
+    public function integerInvalidTypeDataProvider(): Generator
+    {
+        yield 'array with int' => [
+            [555],
+            true,  // incorrect
+        ];
+
+        // TypeError : CodeIgniter\Validation\FormatRules::integer(): Argument #1 ($str) must be of type ?string, array given
+        // yield 'empty array' => [
+        // [],
+        // false,
+        // ];
+
+        yield 'bool true' => [
+            true,
+            true,  // incorrect
+        ];
+
+        yield 'bool false' => [
+            false,
+            false,
+        ];
+
+        yield 'null' => [
+            null,
+            false,
+        ];
+    }
+
     /**
      * @dataProvider integerProvider
      */
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index cffde6abf3bd..f218117a70f8 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -100,6 +100,101 @@ public function testRunDoesTheBasics(): void
         $this->assertFalse($this->validation->run($data));
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5368
+     *
+     * @dataProvider arrayDataProvider
+     *
+     * @param mixed $value
+     */
+    public function testCanValidatetArrayData($value, bool $expected): void
+    {
+        $this->validation->setRules(['arr' => 'is_array']);
+
+        $data['arr'] = $value;
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function arrayDataProvider(): Generator
+    {
+        yield 'list array' => [
+            [1, 2, 3, 4, 5],
+            false,   // incorrect
+        ];
+
+        yield 'associative array' => [
+            [
+                'username' => 'admin001',
+                'role'     => 'administrator',
+                'usepass'  => 0,
+            ],
+            false,   // incorrect
+        ];
+
+        yield 'int' => [
+            0,
+            false,
+        ];
+
+        yield 'string int' => [
+            '0',
+            false,
+        ];
+
+        yield 'bool' => [
+            false,
+            false,
+        ];
+
+        yield 'null' => [
+            null,
+            false,
+        ];
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5374
+     *
+     * @dataProvider isIntInvalidTypeDataProvider
+     *
+     * @param mixed $value
+     */
+    public function testIsIntWithInvalidTypeData($value, bool $expected): void
+    {
+        $this->validation->setRules(['foo' => 'is_int']);
+
+        $data = ['foo' => $value];
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function isIntInvalidTypeDataProvider(): Generator
+    {
+        yield 'array with int' => [
+            [555],
+            true,  // incorrect
+        ];
+
+        yield 'empty array' => [
+            [],
+            false,
+        ];
+
+        yield 'bool true' => [
+            true,
+            false,
+        ];
+
+        yield 'bool false' => [
+            false,
+            false,
+        ];
+
+        yield 'null' => [
+            null,
+            false,
+        ];
+    }
+
     public function testRunReturnsLocalizedErrors(): void
     {
         $data = ['foo' => 'notanumber'];

From 61e476a36249048106c603a1412abeefc02fd7b4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 29 Nov 2021 10:53:47 +0900
Subject: [PATCH 0904/2325] refactor: pass valid type value to method/function

---
 system/Validation/Validation.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 876ab3caffa0..e28a704a31b9 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -295,7 +295,8 @@ protected function processRules(string $field, ?string $label, $value, $rules =
                     $value = json_encode($value);
                 }
 
-                $this->errors[$field] = $error ?? $this->getErrorMessage($rule, $field, $label, $param, $value);
+                $param                = ($param === false) ? '' : $param;
+                $this->errors[$field] = $error ?? $this->getErrorMessage($rule, $field, $label, $param, (string) $value);
 
                 return false;
             }
@@ -646,6 +647,9 @@ public function setError(string $field, string $error): ValidationInterface
      */
     protected function getErrorMessage(string $rule, string $field, ?string $label = null, ?string $param = null, ?string $value = null): string
     {
+        $param = $param ?? '';
+
+        // Check if custom message has been defined by user
         if (isset($this->customErrors[$field][$rule])) {
             $message = lang($this->customErrors[$field][$rule]);
         } else {

From cfd27fbdb0ecaa6a9501c88a94c4215f39274e18 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 29 Nov 2021 10:59:36 +0900
Subject: [PATCH 0905/2325] docs: fix typo in comment

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

diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index e28a704a31b9..20f388fb59ff 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -261,7 +261,7 @@ protected function processRules(string $field, ?string $label, $value, $rules =
             // Placeholder for custom errors from the rules.
             $error = null;
 
-            // If it's a callable, call and and get out of here.
+            // If it's a callable, call and get out of here.
             if ($isCallable) {
                 $passed = $param === false ? $rule($value) : $rule($value, $param, $data);
             } else {

From 6b3121d0ffe199c4b71ffe6ba37bb87c3180e083 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 29 Nov 2021 11:00:36 +0900
Subject: [PATCH 0906/2325] fix: cast $value to string, because it may be
 int/bool/null...

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

diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 20f388fb59ff..f2c467c95e13 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -215,7 +215,7 @@ protected function processRules(string $field, ?string $label, $value, $rules =
         }
 
         if (in_array('permit_empty', $rules, true)) {
-            if (! in_array('required', $rules, true) && (is_array($value) ? $value === [] : trim($value ?? '') === '')) {
+            if (! in_array('required', $rules, true) && (is_array($value) ? $value === [] : trim((string) $value) === '')) {
                 $passed = true;
 
                 foreach ($rules as $rule) {

From 16b027f8514edf71a39cd47291af8f3c53b6a9c7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 29 Nov 2021 11:09:43 +0900
Subject: [PATCH 0907/2325] fix: separate process of multiple field and single
 field

---
 system/Validation/Validation.php            | 12 ++++++++----
 tests/system/Validation/FormatRulesTest.php |  9 +++++----
 tests/system/Validation/ValidationTest.php  |  6 +++---
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index f2c467c95e13..c2a31790e2cc 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -139,16 +139,20 @@ public function run(?array $data = null, ?string $group = null, ?string $dbGroup
             }
 
             $values = dot_array_search($field, $data);
-            $values = is_array($values) ? $values : [$values];
 
             if ($values === []) {
                 // We'll process the values right away if an empty array
                 $this->processRules($field, $setup['label'] ?? $field, $values, $rules, $data);
             }
 
-            foreach ($values as $value) {
-                // Otherwise, we'll let the loop do the job
-                $this->processRules($field, $setup['label'] ?? $field, $value, $rules, $data);
+            if (strpos($field, '*') !== false && is_array($values)) {
+                // Process multiple fields
+                foreach ($values as $value) {
+                    $this->processRules($field, $setup['label'] ?? $field, $value, $rules, $data);
+                }
+            } else {
+                // Process single field
+                $this->processRules($field, $setup['label'] ?? $field, $values, $rules, $data);
             }
         }
 
diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php
index 1d7a0b33dc85..411c173fcf8d 100644
--- a/tests/system/Validation/FormatRulesTest.php
+++ b/tests/system/Validation/FormatRulesTest.php
@@ -837,10 +837,11 @@ public function testNumericWithInvalidTypeData($value, bool $expected): void
 
     public function integerInvalidTypeDataProvider(): Generator
     {
-        yield 'array with int' => [
-            [555],
-            true,  // incorrect
-        ];
+        // TypeError : CodeIgniter\Validation\FormatRules::integer(): Argument #1 ($str) must be of type ?string, array given
+        // yield 'array with int' => [
+        // [555],
+        // false,
+        // ];
 
         // TypeError : CodeIgniter\Validation\FormatRules::integer(): Argument #1 ($str) must be of type ?string, array given
         // yield 'empty array' => [
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index f218117a70f8..d075b7b59151 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -119,7 +119,7 @@ public function arrayDataProvider(): Generator
     {
         yield 'list array' => [
             [1, 2, 3, 4, 5],
-            false,   // incorrect
+            true,
         ];
 
         yield 'associative array' => [
@@ -128,7 +128,7 @@ public function arrayDataProvider(): Generator
                 'role'     => 'administrator',
                 'usepass'  => 0,
             ],
-            false,   // incorrect
+            true,
         ];
 
         yield 'int' => [
@@ -171,7 +171,7 @@ public function isIntInvalidTypeDataProvider(): Generator
     {
         yield 'array with int' => [
             [555],
-            true,  // incorrect
+            false,
         ];
 
         yield 'empty array' => [

From aac0a51bce155190ba9239921fa5f49705feabcf Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 29 Nov 2021 11:14:47 +0900
Subject: [PATCH 0908/2325] style: break long lines

---
 system/Validation/Validation.php | 36 ++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index c2a31790e2cc..e915e8c46528 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -198,11 +198,15 @@ protected function processRules(string $field, ?string $label, $value, $rules =
                 // that can be used later
                 $ifExistField = str_replace('\.\*', '\.(?:[^\.]+)', preg_quote($field, '/'));
 
-                $dataIsExisting = array_reduce(array_keys($flattenedData), static function ($carry, $item) use ($ifExistField) {
-                    $pattern = sprintf('/%s/u', $ifExistField);
-
-                    return $carry || preg_match($pattern, $item) === 1;
-                }, false);
+                $dataIsExisting = array_reduce(
+                    array_keys($flattenedData),
+                    static function ($carry, $item) use ($ifExistField) {
+                        $pattern = sprintf('/%s/u', $ifExistField);
+
+                        return $carry || preg_match($pattern, $item) === 1;
+                    },
+                    false
+                );
             } else {
                 $dataIsExisting = array_key_exists($ifExistField, $flattenedData);
             }
@@ -219,7 +223,10 @@ protected function processRules(string $field, ?string $label, $value, $rules =
         }
 
         if (in_array('permit_empty', $rules, true)) {
-            if (! in_array('required', $rules, true) && (is_array($value) ? $value === [] : trim((string) $value) === '')) {
+            if (
+                ! in_array('required', $rules, true)
+                && (is_array($value) ? $value === [] : trim((string) $value) === '')
+            ) {
                 $passed = true;
 
                 foreach ($rules as $rule) {
@@ -278,7 +285,8 @@ protected function processRules(string $field, ?string $label, $value, $rules =
                     }
 
                     $found  = true;
-                    $passed = $param === false ? $set->{$rule}($value, $error) : $set->{$rule}($value, $param, $data, $error);
+                    $passed = $param === false ? $set->{$rule}($value, $error)
+                        : $set->{$rule}($value, $param, $data, $error);
 
                     break;
                 }
@@ -300,7 +308,13 @@ protected function processRules(string $field, ?string $label, $value, $rules =
                 }
 
                 $param                = ($param === false) ? '' : $param;
-                $this->errors[$field] = $error ?? $this->getErrorMessage($rule, $field, $label, $param, (string) $value);
+                $this->errors[$field] = $error ?? $this->getErrorMessage(
+                    $rule,
+                    $field,
+                    $label,
+                    $param,
+                    (string) $value
+                );
 
                 return false;
             }
@@ -664,7 +678,11 @@ protected function getErrorMessage(string $rule, string $field, ?string $label =
         }
 
         $message = str_replace('{field}', empty($label) ? $field : lang($label), $message);
-        $message = str_replace('{param}', empty($this->rules[$param]['label']) ? $param : lang($this->rules[$param]['label']), $message);
+        $message = str_replace(
+            '{param}',
+            empty($this->rules[$param]['label']) ? $param : lang($this->rules[$param]['label']),
+            $message
+        );
 
         return str_replace('{value}', $value ?? '', $message);
     }

From a42a641bd946537bf280e9c8c53b4b46ab1665d2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 29 Nov 2021 11:42:25 +0900
Subject: [PATCH 0909/2325] docs: add about Validation result changes in
 Upgrading

---
 .../source/installation/upgrade_416.rst       | 55 +++++++++++++++++++
 .../source/installation/upgrading.rst         |  1 +
 2 files changed, 56 insertions(+)
 create mode 100644 user_guide_src/source/installation/upgrade_416.rst

diff --git a/user_guide_src/source/installation/upgrade_416.rst b/user_guide_src/source/installation/upgrade_416.rst
new file mode 100644
index 000000000000..2735e4b07aa4
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_416.rst
@@ -0,0 +1,55 @@
+#############################
+Upgrading from 4.1.5 to 4.1.6
+#############################
+
+.. contents::
+    :local:
+    :depth: 2
+
+Breaking Changes
+****************
+
+Validation result changes
+=========================
+
+The previous version of the Validation can't handle an array item.
+Because of the bug fix, the validation results may be different,
+or raise an TypeError.
+But the previous version's results are probably incorrect.
+
+And the Validation separated the validation process of multiple field
+like ``contacts.*.name`` and single field.
+When a single field has an array data, the previous version validates each element of the array.
+The validation rule gets an element of the array as the parameter.
+On the other hand, the current version passes the array to the validation rule as a whole.
+
+Breaking Enhancements
+*********************
+
+Project Files
+*************
+
+Numerous 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>`_.
+
+.. note:: Except in very rare cases for bug fixes, no changes made to files for the project space
+    will break your application. All changes noted here are optional until the next major version,
+    and any mandatory changes will be covered in the sections above.
+
+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:
+
+*
+
+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:
+
+*
diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index 0264b6eaa3bb..771392d8f81a 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -8,6 +8,7 @@ upgrading from.
 .. toctree::
     :titlesonly:
 
+    Upgrading from 4.1.5 to 4.1.6 <upgrade_416>
     Upgrading from 4.1.4 to 4.1.5 <upgrade_415>
     Upgrading from 4.1.3 to 4.1.4 <upgrade_414>
     Upgrading from 4.1.2 to 4.1.3 <upgrade_413>

From 0485bb79bace65e1f831e198efa75faeaa4994d1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 5 Dec 2021 11:23:55 +0900
Subject: [PATCH 0910/2325] docs: the longer explanation in the changelog, the
 upgrading section has actual tasks that need to be done when upgrading

---
 user_guide_src/source/changelogs/v4.1.6.rst      | 16 +++++++++++++++-
 .../source/installation/upgrade_416.rst          | 11 +----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.1.6.rst b/user_guide_src/source/changelogs/v4.1.6.rst
index 2bb0f77f9536..2e2c50b11869 100644
--- a/user_guide_src/source/changelogs/v4.1.6.rst
+++ b/user_guide_src/source/changelogs/v4.1.6.rst
@@ -7,12 +7,26 @@ Release Date: Not released
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 BREAKING
 ========
 - Multiple table names will no longer be stored in ``BaseBuilder::$tableName`` - an empty string will be used instead.
 
+.. _changelog-v416-validation-changes:
+
+Validation changes
+------------------
+- The previous version of the Validation can't handle an array item.
+  Because of the bug fix, the validation results may be different,
+  or raise an TypeError.
+  But the previous version's results are probably incorrect.
+- The Validation separated the validation process of multiple field
+  like ``contacts.*.name`` and single field.
+  When a single field has an array data, the previous version validates each element of the array.
+  The validation rule gets an element of the array as the parameter.
+  On the other hand, the current version passes the array to the validation rule as a whole.
+
 Enhancements
 ============
 - Database pane on debug toolbar now displays location where Query was called from. Also displays full backtrace.
diff --git a/user_guide_src/source/installation/upgrade_416.rst b/user_guide_src/source/installation/upgrade_416.rst
index 2735e4b07aa4..a0c1cbd02a1b 100644
--- a/user_guide_src/source/installation/upgrade_416.rst
+++ b/user_guide_src/source/installation/upgrade_416.rst
@@ -12,16 +12,7 @@ Breaking Changes
 Validation result changes
 =========================
 
-The previous version of the Validation can't handle an array item.
-Because of the bug fix, the validation results may be different,
-or raise an TypeError.
-But the previous version's results are probably incorrect.
-
-And the Validation separated the validation process of multiple field
-like ``contacts.*.name`` and single field.
-When a single field has an array data, the previous version validates each element of the array.
-The validation rule gets an element of the array as the parameter.
-On the other hand, the current version passes the array to the validation rule as a whole.
+Due to a bug fix, the Validation now might change the validation results when you validate an array item (see :ref:`Changelog <changelog-v416-validation-changes>`). So check the validation results for all the code that validates the array. Validating multiple fields like ``contacts.*.name`` is not affected.
 
 Breaking Enhancements
 *********************

From 622fc0486cf675f82533532cffbc9b6267a686ed Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 4 Dec 2021 11:39:30 +0900
Subject: [PATCH 0911/2325] docs: add space after `,` in sample code

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

diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index 720f77655d54..29f35e7a83f0 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -230,18 +230,18 @@ Adding Foreign Keys
 Foreign Keys help to enforce relationships and actions across your tables. For tables that support Foreign Keys,
 you may add them directly in forge::
 
-    $forge->addForeignKey('users_id','users','id');
+    $forge->addForeignKey('users_id', 'users', 'id');
     // gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`) REFERENCES `users`(`id`)
 
-    $forge->addForeignKey(['users_id', 'users_name'],'users',['id', 'name']);
+    $forge->addForeignKey(['users_id', 'users_name'], 'users', ['id', 'name']);
     // gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`, `users_name`) REFERENCES `users`(`id`, `name`)
 
 You can specify the desired action for the "on delete" and "on update" properties of the constraint::
 
-    $forge->addForeignKey('users_id','users','id','CASCADE','CASCADE');
+    $forge->addForeignKey('users_id', 'users', 'id', 'CASCADE', 'CASCADE');
     // gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`) REFERENCES `users`(`id`) ON DELETE CASCADE ON UPDATE CASCADE
 
-    $forge->addForeignKey(['users_id', 'users_name'],'users',['id', 'name'],'CASCADE','CASCADE');
+    $forge->addForeignKey(['users_id', 'users_name'], 'users', ['id', 'name'], 'CASCADE', 'CASCADE');
     // gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`, `users_name`) REFERENCES `users`(`id`, `name`) ON DELETE CASCADE ON UPDATE CASCADE
 
 Creating a table
@@ -302,7 +302,7 @@ Execute a DROP FOREIGN KEY.
 ::
 
     // Produces: ALTER TABLE `tablename` DROP FOREIGN KEY `users_foreign`
-    $forge->dropForeignKey('tablename','users_foreign');
+    $forge->dropForeignKey('tablename', 'users_foreign');
 
 
 Dropping a Key
@@ -313,7 +313,7 @@ Execute a DROP KEY.
 ::
 
     // Produces: DROP INDEX `users_index` ON `tablename`
-    $forge->dropKey('tablename','users_index');
+    $forge->dropKey('tablename', 'users_index');
 
 Renaming a table
 ================

From a0a55ed84447904cb64e176294daa1d46f04c340 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 6 Dec 2021 17:09:05 +0900
Subject: [PATCH 0912/2325] fix: when useAutoIncrement is disabled,
 countAllResults() is called

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

diff --git a/system/Model.php b/system/Model.php
index c73e5c716778..bcc1d46a48c6 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -584,12 +584,12 @@ public function set($key, $value = '', ?bool $escape = null)
      */
     protected function shouldUpdate($data): bool
     {
-        // When useAutoIncrement feature is disabled check
+        // When useAutoIncrement feature is disabled, check
         // in the database if given record already exists
         return parent::shouldUpdate($data)
-            && $this->useAutoIncrement
+            && ($this->useAutoIncrement
                 ? true
-                : $this->where($this->primaryKey, $this->getIdValue($data))->countAllResults() === 1;
+                : $this->where($this->primaryKey, $this->getIdValue($data))->countAllResults() === 1);
     }
 
     /**

From 35b612b075c6e7cc7930f05ff817f6f5f05fad03 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 6 Dec 2021 21:01:49 +0900
Subject: [PATCH 0913/2325] refactor: early return

Complex conditions cause bugs.
---
 system/Model.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/system/Model.php b/system/Model.php
index bcc1d46a48c6..767f7de08048 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -584,12 +584,15 @@ public function set($key, $value = '', ?bool $escape = null)
      */
     protected function shouldUpdate($data): bool
     {
+        if (parent::shouldUpdate($data) === false) {
+            return false;
+        }
+
         // When useAutoIncrement feature is disabled, check
         // in the database if given record already exists
-        return parent::shouldUpdate($data)
-            && ($this->useAutoIncrement
+        return $this->useAutoIncrement
                 ? true
-                : $this->where($this->primaryKey, $this->getIdValue($data))->countAllResults() === 1);
+                : $this->where($this->primaryKey, $this->getIdValue($data))->countAllResults() === 1;
     }
 
     /**

From 41f56cfb68fa18f6eed793e2eeef93b642884ced Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 6 Dec 2021 21:29:15 +0900
Subject: [PATCH 0914/2325] style: add line break

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 system/Validation/Validation.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index e915e8c46528..288fe8e02653 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -285,7 +285,8 @@ static function ($carry, $item) use ($ifExistField) {
                     }
 
                     $found  = true;
-                    $passed = $param === false ? $set->{$rule}($value, $error)
+                    $passed = $param === false
+                        ? $set->{$rule}($value, $error)
                         : $set->{$rule}($value, $param, $data, $error);
 
                     break;

From dfdba23f490d5f07d2d1d28c1f810d18802b044e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 6 Dec 2021 21:30:01 +0900
Subject: [PATCH 0915/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/changelogs/v4.1.6.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/changelogs/v4.1.6.rst b/user_guide_src/source/changelogs/v4.1.6.rst
index 2e2c50b11869..4cddcc21f953 100644
--- a/user_guide_src/source/changelogs/v4.1.6.rst
+++ b/user_guide_src/source/changelogs/v4.1.6.rst
@@ -19,7 +19,7 @@ Validation changes
 ------------------
 - The previous version of the Validation can't handle an array item.
   Because of the bug fix, the validation results may be different,
-  or raise an TypeError.
+  or raise a ``TypeError``.
   But the previous version's results are probably incorrect.
 - The Validation separated the validation process of multiple field
   like ``contacts.*.name`` and single field.

From 82573aad8ae410aa433544b805052677201d34b2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 6 Dec 2021 21:30:53 +0900
Subject: [PATCH 0916/2325] style: add new line

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

diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 288fe8e02653..67cf1a16853d 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -308,7 +308,8 @@ static function ($carry, $item) use ($ifExistField) {
                     $value = json_encode($value);
                 }
 
-                $param                = ($param === false) ? '' : $param;
+                $param = ($param === false) ? '' : $param;
+
                 $this->errors[$field] = $error ?? $this->getErrorMessage(
                     $rule,
                     $field,

From d16b5ea53f3ddd2218325e9b220c4343fb40e0a3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 6 Dec 2021 22:03:11 +0900
Subject: [PATCH 0917/2325] fix: $this->processRules() may run twice

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

diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 67cf1a16853d..39af6703f8df 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -143,6 +143,8 @@ public function run(?array $data = null, ?string $group = null, ?string $dbGroup
             if ($values === []) {
                 // We'll process the values right away if an empty array
                 $this->processRules($field, $setup['label'] ?? $field, $values, $rules, $data);
+
+                continue;
             }
 
             if (strpos($field, '*') !== false && is_array($values)) {

From 1533fa038a71216f8fbd0b8cc0977cdcffc3d766 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Dec 2021 10:15:55 +0900
Subject: [PATCH 0918/2325] docs: add or improve links to other sections

---
 user_guide_src/source/changelogs/v4.1.5.rst        | 4 ++--
 user_guide_src/source/dbmgmt/forge.rst             | 1 +
 user_guide_src/source/incoming/routing.rst         | 4 +++-
 user_guide_src/source/installation/upgrade_415.rst | 4 +++-
 user_guide_src/source/libraries/security.rst       | 2 ++
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.1.5.rst b/user_guide_src/source/changelogs/v4.1.5.rst
index 9cd543f181e2..67589933074f 100644
--- a/user_guide_src/source/changelogs/v4.1.5.rst
+++ b/user_guide_src/source/changelogs/v4.1.5.rst
@@ -21,12 +21,12 @@ Enhancements
 ============
 
 - Added Cache config for reserved characters
-- The ``addForeignKey`` function of the ``Forge`` class can now define composite foreign keys in an array
+- The :ref:`addForeignKey()<adding-foreign-keys>` function of the ``Forge`` class can now define composite foreign keys in an array
 - The ``dropKey`` function of the ``Forge`` class can remove key
 - Now ``_`` can be used as separators in environment variable
 - Added Multiple filters for a route and Classname filter
 - Reduced memory usage of ``insertBatch()`` and ``updateBatch()``
-- Added Session based CSRF Protection
+- Added :ref:`Session based CSRF Protection <csrf-protection-methods>`
 - Added ``valid_url_strict`` rule for ``Validation``
 - Debug Toolbar
     - Added formatted query string to timeline
diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index 29f35e7a83f0..bbaa01490b0e 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -223,6 +223,7 @@ and unique keys with specific methods::
     $forge->addUniqueKey(['blog_id', 'uri']);
     // gives UNIQUE KEY `blog_id_uri` (`blog_id`, `uri`)
 
+.. _adding-foreign-keys:
 
 Adding Foreign Keys
 ===================
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 0e9f3bb4e6be..97c2b1aa1fdd 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -354,6 +354,8 @@ can modify the generated routes, or further restrict them. The ``$options`` arra
     $routes->map($array, $options);
     $routes->group('name', $options, function ());
 
+.. _applying-filters:
+
 Applying Filters
 ----------------
 
@@ -390,7 +392,7 @@ You specify a filter classname for the filter value::
 
 **Multiple filters**
 
-.. important:: *Multiple filters* is disabled by default. Because it breaks backward compatibility. If you want to use it, you need to configure. See *Multiple filters for a route* in :doc:`/installation/upgrade_415` for the details.
+.. important:: *Multiple filters* is disabled by default. Because it breaks backward compatibility. If you want to use it, you need to configure. See :ref:`upgrade-415-multiple-filters-for-a-route` for the details.
 
 You specify an array for the filter value::
 
diff --git a/user_guide_src/source/installation/upgrade_415.rst b/user_guide_src/source/installation/upgrade_415.rst
index c7b885efa40a..a029724b3bfb 100644
--- a/user_guide_src/source/installation/upgrade_415.rst
+++ b/user_guide_src/source/installation/upgrade_415.rst
@@ -72,6 +72,8 @@ For optimization and a bug fix, the following behaviors, mostly used in testing,
 Breaking Enhancements
 =====================
 
+.. _upgrade-415-multiple-filters-for-a-route:
+
 Multiple filters for a route
 ----------------------------
 
@@ -99,7 +101,7 @@ The following methods and a property have been deprecated:
 - ``CodeIgniter\Router\RouteCollection::getFilterForRoute()``
 - ``CodeIgniter\Router\RouteCollection``'s property ``$filterInfo``
 
-See *Applying Filters* in :doc:`Routing </incoming/routing>` for the functionality.
+See :ref:`applying-filters` for the functionality.
 
 Project Files
 =============
diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index 9b317a75ea91..b0a11af06b6d 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -29,6 +29,8 @@ Cross-site request forgery (CSRF)
 Config for CSRF
 ===============
 
+.. _csrf-protection-methods:
+
 CSRF Protection Methods
 -----------------------
 

From 4ed62286f861347fd045c748ddcd7b5be8cd0609 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Dec 2021 11:17:36 +0900
Subject: [PATCH 0919/2325] docs: remove out-of-dated <div class="custom-index
 container"></div>

It seems not used now.
---
 contributing/documentation.rst | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/contributing/documentation.rst b/contributing/documentation.rst
index 03164f183e6e..d8756cc1623c 100644
--- a/contributing/documentation.rst
+++ b/contributing/documentation.rst
@@ -16,21 +16,9 @@ It is created automatically by inserting the following:
     .. contents::
         :local:
 
-    .. raw:: html
-
-    <div class="custom-index container"></div>
-
 .. contents::
   :local:
 
-.. raw:: html
-
-  <div class="custom-index container"></div>
-
-The <div> that is inserted as raw HTML is a event for the documentation's
-JavaScript to dynamically add links to any function and method definitions
-contained in the current page.
-
 **************
 Tools Required
 **************

From a5d5d7eba3c15e5c1570e671dde24129cf388f17 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Dec 2021 11:18:18 +0900
Subject: [PATCH 0920/2325] docs: add depth to sample code

---
 contributing/documentation.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contributing/documentation.rst b/contributing/documentation.rst
index d8756cc1623c..3e6c3f43204f 100644
--- a/contributing/documentation.rst
+++ b/contributing/documentation.rst
@@ -15,6 +15,7 @@ It is created automatically by inserting the following:
 
     .. contents::
         :local:
+        :depth: 2
 
 .. contents::
   :local:

From 6c1a326e8cb68c8211b7ff1fb55ef69f9a4cd150 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Dec 2021 11:18:46 +0900
Subject: [PATCH 0921/2325] docs: add how to make references

---
 contributing/documentation.rst | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/contributing/documentation.rst b/contributing/documentation.rst
index 3e6c3f43204f..eba3eb99437e 100644
--- a/contributing/documentation.rst
+++ b/contributing/documentation.rst
@@ -81,3 +81,32 @@ create these with the following tab triggers::
 
         SubSubSubSubSection (!)
         """""""""""""""""""""""
+
+**********
+References
+**********
+
+References to a Section
+=======================
+
+If you need to link to a specific section, the first you add the label before a header::
+
+    .. _curlrequest-request-options-headers:
+
+    headers
+    =======
+
+And then you can reference it like this::
+
+    See :ref:`CURLRequest Class <curlrequest-request-options-headers>` for how to add.
+
+    See :ref:`curlrequest-request-options-headers` for how to add.
+
+References to a Page
+====================
+
+You can reference a page like the following::
+
+    :doc:`Session <../libraries/sessions>` library
+
+    :doc:`../libraries/sessions` library

From 1911a805a8c906e10dca1320d26e3100e9d88f39 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Dec 2021 11:26:48 +0900
Subject: [PATCH 0922/2325] docs: update the user guide URL

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

diff --git a/user_guide_src/ghpages.rst b/user_guide_src/ghpages.rst
index 15619a060e0d..682c1eee49ce 100644
--- a/user_guide_src/ghpages.rst
+++ b/user_guide_src/ghpages.rst
@@ -8,7 +8,7 @@ in the meantime.
 
 The user guide takes advantage of GitHub pages, where the "gh-pages" branch of
 a repo, containing HTML only, is accessible through `github.io
-<https://bcit-ci.github.io/CodeIgniter4>`_.
+<https://codeigniter4.github.io/CodeIgniter4/>`_.
 
 Setup for Repo Maintainers
 ==========================

From c873c354ca0e4d6ab5d491e807d14678a3f39f23 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Dec 2021 12:51:56 +0900
Subject: [PATCH 0923/2325] refactor: add \ for regex string

Both the string before and after the change are the same string in PHP,
but I got a pattern error when I entered the string before the change
in https://regex101.com/.
---
 system/Helpers/array_helper.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php
index 423f9c266dd5..258a1874a766 100644
--- a/system/Helpers/array_helper.php
+++ b/system/Helpers/array_helper.php
@@ -20,7 +20,8 @@
      */
     function dot_array_search(string $index, array $array)
     {
-        $segments = preg_split('/(?<!\\\)\./', rtrim($index, '* '), 0, PREG_SPLIT_NO_EMPTY);
+        // See https://regex101.com/r/44Ipql/1
+        $segments = preg_split('/(?<!\\\\)\./', rtrim($index, '* '), 0, PREG_SPLIT_NO_EMPTY);
 
         $segments = array_map(static function ($key) {
             return str_replace('\.', '.', $key);

From 8cad0946e3d87d659c6e70345d79fa2eb38b701f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Dec 2021 12:54:27 +0900
Subject: [PATCH 0924/2325] style: break long line

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

diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php
index 258a1874a766..2f8a5f9c8366 100644
--- a/system/Helpers/array_helper.php
+++ b/system/Helpers/array_helper.php
@@ -21,7 +21,12 @@
     function dot_array_search(string $index, array $array)
     {
         // See https://regex101.com/r/44Ipql/1
-        $segments = preg_split('/(?<!\\\\)\./', rtrim($index, '* '), 0, PREG_SPLIT_NO_EMPTY);
+        $segments = preg_split(
+            '/(?<!\\\\)\./',
+            rtrim($index, '* '),
+            0,
+            PREG_SPLIT_NO_EMPTY
+        );
 
         $segments = array_map(static function ($key) {
             return str_replace('\.', '.', $key);

From faa474a488dfd6f18a0c45da1a786c69c88e2fa1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Dec 2021 17:16:54 +0900
Subject: [PATCH 0925/2325] refactor: early return

---
 system/Model.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/system/Model.php b/system/Model.php
index 767f7de08048..418b3057eeb9 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -588,11 +588,13 @@ protected function shouldUpdate($data): bool
             return false;
         }
 
+        if ($this->useAutoIncrement === true) {
+            return true;
+        }
+
         // When useAutoIncrement feature is disabled, check
         // in the database if given record already exists
-        return $this->useAutoIncrement
-                ? true
-                : $this->where($this->primaryKey, $this->getIdValue($data))->countAllResults() === 1;
+        return $this->where($this->primaryKey, $this->getIdValue($data))->countAllResults() === 1;
     }
 
     /**

From bb82f4e76035075d36fcf455d6ce4fd0c295fea2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 7 Dec 2021 18:32:51 +0900
Subject: [PATCH 0926/2325] refactor: compare it to the return value to make it
 easier to understand what it is doing

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 system/I18n/Time.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index c182bee32e7e..01698444587d 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -479,7 +479,7 @@ public function getQuarter(): string
      */
     public function getDst(): bool
     {
-        return (bool) $this->format('I');
+        return $this->format('I') === '1'; // 1 if Daylight Saving Time, 0 otherwise.
     }
 
     /**

From 9ddc23980d8ad21e69ff5e04fb766690ccf33e53 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 2 Dec 2021 10:02:37 +0900
Subject: [PATCH 0927/2325] fix: string literals to be enclosed in single
 quotes

Fixes #5423
---
 system/Database/MySQLi/Connection.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
index 62881620c46b..9736bf0b03c6 100644
--- a/system/Database/MySQLi/Connection.php
+++ b/system/Database/MySQLi/Connection.php
@@ -100,19 +100,19 @@ public function connect(bool $persistent = false)
             if ($this->strictOn) {
                 $this->mysqli->options(
                     MYSQLI_INIT_COMMAND,
-                    'SET SESSION sql_mode = CONCAT(@@sql_mode, ",", "STRICT_ALL_TABLES")'
+                    "SET SESSION sql_mode = CONCAT(@@sql_mode, ',', 'STRICT_ALL_TABLES')"
                 );
             } else {
                 $this->mysqli->options(
                     MYSQLI_INIT_COMMAND,
-                    'SET SESSION sql_mode = REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(
+                    "SET SESSION sql_mode = REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(
                                         @@sql_mode,
-                                        "STRICT_ALL_TABLES,", ""),
-                                    ",STRICT_ALL_TABLES", ""),
-                                "STRICT_ALL_TABLES", ""),
-                            "STRICT_TRANS_TABLES,", ""),
-                        ",STRICT_TRANS_TABLES", ""),
-                    "STRICT_TRANS_TABLES", "")'
+                                        'STRICT_ALL_TABLES,', ''),
+                                    ',STRICT_ALL_TABLES', ''),
+                                'STRICT_ALL_TABLES', ''),
+                            'STRICT_TRANS_TABLES,', ''),
+                        ',STRICT_TRANS_TABLES', ''),
+                    'STRICT_TRANS_TABLES', '')"
                 );
             }
         }

From e943b691e1f5b71cbf390c899f566bb41de88a25 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 1 Dec 2021 15:26:38 +0900
Subject: [PATCH 0928/2325] feat: add SecureHeaders filter

---
 app/Config/Filters.php                     | 11 ++--
 system/Filters/SecureHeaders.php           | 71 ++++++++++++++++++++++
 tests/system/Filters/SecureHeadersTest.php | 40 ++++++++++++
 user_guide_src/source/incoming/filters.rst |  2 +-
 4 files changed, 119 insertions(+), 5 deletions(-)
 create mode 100644 system/Filters/SecureHeaders.php
 create mode 100644 tests/system/Filters/SecureHeadersTest.php

diff --git a/app/Config/Filters.php b/app/Config/Filters.php
index 02aaec533c17..14685207f71b 100644
--- a/app/Config/Filters.php
+++ b/app/Config/Filters.php
@@ -7,6 +7,7 @@
 use CodeIgniter\Filters\DebugToolbar;
 use CodeIgniter\Filters\Honeypot;
 use CodeIgniter\Filters\InvalidChars;
+use CodeIgniter\Filters\SecureHeaders;
 
 class Filters extends BaseConfig
 {
@@ -17,10 +18,11 @@ class Filters extends BaseConfig
      * @var array
      */
     public $aliases = [
-        'csrf'         => CSRF::class,
-        'toolbar'      => DebugToolbar::class,
-        'honeypot'     => Honeypot::class,
-        'invalidchars' => InvalidChars::class,
+        'csrf'          => CSRF::class,
+        'toolbar'       => DebugToolbar::class,
+        'honeypot'      => Honeypot::class,
+        'invalidchars'  => InvalidChars::class,
+        'secureheaders' => SecureHeaders::class,
     ];
 
     /**
@@ -38,6 +40,7 @@ class Filters extends BaseConfig
         'after' => [
             'toolbar',
             // 'honeypot',
+            // 'secureheaders',
         ],
     ];
 
diff --git a/system/Filters/SecureHeaders.php b/system/Filters/SecureHeaders.php
new file mode 100644
index 000000000000..fd656af6a80f
--- /dev/null
+++ b/system/Filters/SecureHeaders.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Filters;
+
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+
+/**
+ * Add Common Security Headers
+ */
+class SecureHeaders implements FilterInterface
+{
+    /**
+     * @var array<string, string>
+     */
+    protected $headers = [
+        // https://owasp.org/www-project-secure-headers/#x-frame-options
+        'X-Frame-Options' => 'SAMEORIGIN',
+
+        // https://owasp.org/www-project-secure-headers/#x-content-type-options
+        'X-Content-Type-Options' => 'nosniff',
+
+        // https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/compatibility/jj542450(v=vs.85)#the-noopen-directive
+        'X-Download-Options' => 'noopen',
+
+        // https://owasp.org/www-project-secure-headers/#x-permitted-cross-domain-policies
+        'X-Permitted-Cross-Domain-Policies' => 'none',
+
+        // https://owasp.org/www-project-secure-headers/#referrer-policy
+        'Referrer-Policy' => 'same-origin',
+
+        // https://owasp.org/www-project-secure-headers/#x-xss-protection
+        // If you do not need to support legacy browsers, it is recommended that you use
+        // Content-Security-Policy without allowing unsafe-inline scripts instead.
+        // 'X-XSS-Protection' => '1; mode=block',
+    ];
+
+    /**
+     * We don't have anything to do here.
+     *
+     * @param array|null $arguments
+     *
+     * @return void
+     */
+    public function before(RequestInterface $request, $arguments = null)
+    {
+    }
+
+    /**
+     * Add security headers.
+     *
+     * @param array|null $arguments
+     *
+     * @return void
+     */
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+        foreach ($this->headers as $header => $value) {
+            $response->setHeader($header, $value);
+        }
+    }
+}
diff --git a/tests/system/Filters/SecureHeadersTest.php b/tests/system/Filters/SecureHeadersTest.php
new file mode 100644
index 000000000000..038ef81003ab
--- /dev/null
+++ b/tests/system/Filters/SecureHeadersTest.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Filters;
+
+use CodeIgniter\Config\Services;
+use CodeIgniter\Test\CIUnitTestCase;
+
+/**
+ * @internal
+ */
+final class SecureHeadersTest extends CIUnitTestCase
+{
+    protected $request;
+    protected $response;
+
+    public function testAfter()
+    {
+        $filter   = new SecureHeaders();
+        $request  = Services::request(null, false);
+        $response = Services::response(null, false);
+
+        $filter->after($request, $response);
+
+        $responseHeaders = $response->headers();
+        $headers         = $this->getPrivateProperty($filter, 'headers');
+
+        foreach ($headers as $header => $value) {
+            $this->assertSame($value, $responseHeaders[$header]->getValue());
+        }
+    }
+}
diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index 60e2ea90cc76..f0d6d7fbf6cb 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -193,6 +193,6 @@ In this example, the array ``['dual', 'noreturn']`` will be passed in ``$argumen
 Provided Filters
 ****************
 
-The filters bundled with CodeIgniter4 are: ``Honeypot``, ``CSRF``, ``DebugToolbar``, and ``InvalidChars``.
+The filters bundled with CodeIgniter4 are: ``Honeypot``, ``CSRF``, ``InvalidChars``, ``SecureHeaders``, and ``DebugToolbar``.
 
 .. note:: The filters are executed in the order defined in the config file. However, if enabled, ``DebugToolbar`` is always executed last because it should be able to capture everything that happens in the other filters.

From 32ca70c732274d28f5d945f84eda1888ad29f891 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Dec 2021 10:01:18 +0900
Subject: [PATCH 0929/2325] docs: add how to customize SecureHeaders

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

diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index f0d6d7fbf6cb..bbed197e7702 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -196,3 +196,17 @@ Provided Filters
 The filters bundled with CodeIgniter4 are: ``Honeypot``, ``CSRF``, ``InvalidChars``, ``SecureHeaders``, and ``DebugToolbar``.
 
 .. note:: The filters are executed in the order defined in the config file. However, if enabled, ``DebugToolbar`` is always executed last because it should be able to capture everything that happens in the other filters.
+
+SecureHeaders
+=============
+
+This filter adds HTTP response headers that your application can use to increase the security of your application.
+
+If you want to customize the headers, extend ``CodeIgniter\Filters\SecureHeaders`` and override the ``$headers`` property. And change the ``$aliases`` property in **app/Config/Filters.php**::
+
+    public $aliases = [
+        ...
+        'secureheaders' => \App\Filters\SecureHeaders::class,
+    ];
+
+If you want to know about secure headers, see `OWASP Secure Headers Project <https://owasp.org/www-project-secure-headers/>`_.

From 27d9984476d17a1e997ac98961f88e555b4768af Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 2 Dec 2021 16:03:58 +0900
Subject: [PATCH 0930/2325] fix: move secure cookie check from Security to
 CookieStore

---
 system/Cookie/CookieStore.php          |  8 ++++++
 system/Security/Security.php           |  3 ---
 tests/system/HTTP/ResponseSendTest.php | 36 ++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/system/Cookie/CookieStore.php b/system/Cookie/CookieStore.php
index 87dc472d1fe5..3edcd506d644 100644
--- a/system/Cookie/CookieStore.php
+++ b/system/Cookie/CookieStore.php
@@ -13,6 +13,8 @@
 
 use ArrayIterator;
 use CodeIgniter\Cookie\Exceptions\CookieException;
+use CodeIgniter\Security\Exceptions\SecurityException;
+use Config\Services;
 use Countable;
 use IteratorAggregate;
 use Traversable;
@@ -161,7 +163,13 @@ public function remove(string $name, string $prefix = '')
      */
     public function dispatch(): void
     {
+        $request = Services::request();
+
         foreach ($this->cookies as $cookie) {
+            if ($cookie->isSecure() && ! $request->isSecure()) {
+                throw SecurityException::forDisallowedAction();
+            }
+
             $name    = $cookie->getPrefixedName();
             $value   = $cookie->getValue();
             $options = $cookie->getOptions();
diff --git a/system/Security/Security.php b/system/Security/Security.php
index 35e889a85d69..dd03d4ac68d9 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -538,9 +538,6 @@ private function saveHashInCookie(): void
      */
     protected function sendCookie(RequestInterface $request)
     {
-        if ($this->cookie->isSecure() && ! $request->isSecure()) {
-            return false;
-        }
 
         $this->doSendCookie();
         log_message('info', 'CSRF cookie sent.');
diff --git a/tests/system/HTTP/ResponseSendTest.php b/tests/system/HTTP/ResponseSendTest.php
index 5fedc69da7b1..6610321040a2 100644
--- a/tests/system/HTTP/ResponseSendTest.php
+++ b/tests/system/HTTP/ResponseSendTest.php
@@ -11,8 +11,10 @@
 
 namespace CodeIgniter\HTTP;
 
+use CodeIgniter\Security\Exceptions\SecurityException;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\App;
+use Config\Services;
 
 /**
  * This test suite has been created separately from
@@ -135,4 +137,38 @@ public function testRedirectResponseCookies()
         $this->assertHeaderEmitted('Set-Cookie: foo=bar;');
         $this->assertHeaderEmitted('Set-Cookie: login_time');
     }
+
+    /**
+     * Make sure secure cookies are not sent with HTTP request
+     *
+     * @ runInSeparateProcess
+     * @ preserveGlobalState  disabled
+     */
+    public function testDoNotSendUnSecureCookie(): void
+    {
+        $this->expectException(SecurityException::class);
+        $this->expectExceptionMessage('The action you requested is not allowed');
+
+        $request = $this->createMock(IncomingRequest::class);
+        $request->method('isSecure')->willReturn(false);
+        Services::injectMock('request', $request);
+
+        $response = new Response(new App());
+        $response->pretend(false);
+        $body = 'Hello';
+        $response->setBody($body);
+
+        $response->setCookie(
+            'foo',
+            'bar',
+            '',
+            '',
+            '/',
+            '',
+            true
+        );
+
+        // send it
+        $response->send();
+    }
 }

From a3c65d75fef7c95fb322214544aaa89383bb80c6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 2 Dec 2021 16:06:36 +0900
Subject: [PATCH 0931/2325] docs: fix doc comments

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

diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
index 7ec5f1e69e6b..39657af8464f 100644
--- a/system/HTTP/ResponseTrait.php
+++ b/system/HTTP/ResponseTrait.php
@@ -22,7 +22,7 @@
 use InvalidArgumentException;
 
 /**
- * Request Trait
+ * Response Trait
  *
  * Additional methods to make a PSR-7 Response class
  * compliant with the framework's own ResponseInterface.
@@ -446,7 +446,7 @@ public function send()
     }
 
     /**
-     * Sends the headers of this HTTP request to the browser.
+     * Sends the headers of this HTTP response to the browser.
      *
      * @return Response
      */

From fd72e192cb9050abf6233bdd4f2daa10a73d4739 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 2 Dec 2021 16:06:58 +0900
Subject: [PATCH 0932/2325] test: fix setUp()

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

diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index ba4c1e7a4e07..c6f1d6b9b2e1 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -41,10 +41,10 @@ final class CommonFunctionsTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
-        parent::setUp();
-        $renderer = Services::renderer();
-        $renderer->resetData();
         unset($_ENV['foo'], $_SERVER['foo']);
+        Services::reset();
+
+        parent::setUp();
     }
 
     public function testStringifyAttributes()

From 3aadd002fa4753cfe5ae97aed93fb9a278ff423a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 2 Dec 2021 16:09:28 +0900
Subject: [PATCH 0933/2325] fix: Security class does not send cookies

Add Response::setCookieStore()
---
 system/HTTP/ResponseTrait.php          |  8 ++++
 system/Security/Security.php           | 28 ++-----------
 tests/system/Security/SecurityTest.php | 58 +++-----------------------
 3 files changed, 17 insertions(+), 77 deletions(-)

diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
index 39657af8464f..46835cc515c6 100644
--- a/system/HTTP/ResponseTrait.php
+++ b/system/HTTP/ResponseTrait.php
@@ -596,6 +596,14 @@ public function getCookieStore()
         return $this->cookieStore;
     }
 
+    /**
+     * Sets the CookieStore.
+     */
+    public function setCookieStore(CookieStore $cookieStore)
+    {
+        $this->cookieStore = $cookieStore;
+    }
+
     /**
      * Checks to see if the Response has a specified cookie or not.
      */
diff --git a/system/Security/Security.php b/system/Security/Security.php
index dd03d4ac68d9..a484310d40c5 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -528,32 +528,12 @@ private function saveHashInCookie(): void
                 'expires' => $this->expires === 0 ? 0 : time() + $this->expires,
             ]
         );
-        $this->sendCookie($this->request);
-    }
-
-    /**
-     * CSRF Send Cookie
-     *
-     * @return false|Security
-     */
-    protected function sendCookie(RequestInterface $request)
-    {
-
-        $this->doSendCookie();
-        log_message('info', 'CSRF cookie sent.');
 
-        return $this;
-    }
+        $response    = Services::response();
+        $cookieStore = $response->getCookieStore();
+        $cookieStore = $cookieStore->put($this->cookie);
 
-    /**
-     * Actual dispatching of cookies.
-     * Extracted for this to be unit tested.
-     *
-     * @codeCoverageIgnore
-     */
-    protected function doSendCookie(): void
-    {
-        cookies([$this->cookie], false)->dispatch();
+        $response->setCookieStore($cookieStore);
     }
 
     private function saveHashInSession(): void
diff --git a/tests/system/Security/SecurityTest.php b/tests/system/Security/SecurityTest.php
index cc9fcf753853..6bb8d3a809b5 100644
--- a/tests/system/Security/SecurityTest.php
+++ b/tests/system/Security/SecurityTest.php
@@ -20,8 +20,8 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockAppConfig;
 use CodeIgniter\Test\Mock\MockSecurity;
-use Config\Cookie as CookieConfig;
 use Config\Security as SecurityConfig;
+use Config\Services;
 
 /**
  * @backupGlobals enabled
@@ -41,11 +41,7 @@ protected function setUp(): void
 
     public function testBasicConfigIsSaved()
     {
-        $config   = new MockAppConfig();
-        $security = $this->getMockBuilder(Security::class)
-            ->setConstructorArgs([$config])
-            ->onlyMethods(['doSendCookie'])
-            ->getMock();
+        $security = new MockSecurity(new MockAppConfig());
 
         $hash = $security->getHash();
 
@@ -57,11 +53,7 @@ public function testHashIsReadFromCookie()
     {
         $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
 
-        $config   = new MockAppConfig();
-        $security = $this->getMockBuilder(Security::class)
-            ->setConstructorArgs([$config])
-            ->onlyMethods(['doSendCookie'])
-            ->getMock();
+        $security = new MockSecurity(new MockAppConfig());
 
         $this->assertSame('8b9218a55906f9dcc1dc263dce7f005a', $security->getHash());
     }
@@ -74,7 +66,8 @@ public function testGetHashSetsCookieWhenGETWithoutCSRFCookie()
 
         $security->verify(new Request(new MockAppConfig()));
 
-        $this->assertSame($_COOKIE['csrf_cookie_name'], $security->getHash());
+        $cookie = Services::response()->getCookie('csrf_cookie_name');
+        $this->assertSame($security->getHash(), $cookie->getValue());
     }
 
     public function testGetHashReturnsCSRFCookieWhenGETWithCSRFCookie()
@@ -238,45 +231,4 @@ public function testGetters(): void
         $this->assertIsString($security->getCookieName());
         $this->assertIsBool($security->shouldRedirect());
     }
-
-    public function testSendingCookiesFalse(): void
-    {
-        $request = $this->createMock(IncomingRequest::class);
-        $request->method('isSecure')->willReturn(false);
-
-        $config = new CookieConfig();
-
-        $config->secure = true;
-        Factories::injectMock('config', CookieConfig::class, $config);
-
-        $security = $this->getMockBuilder(Security::class)
-            ->setConstructorArgs([new MockAppConfig()])
-            ->onlyMethods(['doSendCookie'])
-            ->getMock();
-
-        $sendCookie = $this->getPrivateMethodInvoker($security, 'sendCookie');
-
-        $security->expects($this->never())->method('doSendCookie');
-        $this->assertFalse($sendCookie($request));
-    }
-
-    public function testSendingGoodCookies(): void
-    {
-        $request = $this->createMock(IncomingRequest::class);
-        $request->method('isSecure')->willReturn(true);
-
-        $config = new MockAppConfig();
-
-        $config->cookieSecure = true;
-
-        $security = $this->getMockBuilder(Security::class)
-            ->setConstructorArgs([$config])
-            ->onlyMethods(['doSendCookie'])
-            ->getMock();
-
-        $sendCookie = $this->getPrivateMethodInvoker($security, 'sendCookie');
-
-        $security->expects($this->once())->method('doSendCookie');
-        $this->assertInstanceOf(Security::class, $sendCookie($request));
-    }
 }

From 7ea464cd4d44b713d4d86a558bcf23865cc69b53 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 2 Dec 2021 16:10:36 +0900
Subject: [PATCH 0934/2325] test: break long lines

---
 tests/system/Security/SecurityTest.php | 69 ++++++++++++++++++++++----
 1 file changed, 58 insertions(+), 11 deletions(-)

diff --git a/tests/system/Security/SecurityTest.php b/tests/system/Security/SecurityTest.php
index 6bb8d3a809b5..160e35b17cb6 100644
--- a/tests/system/Security/SecurityTest.php
+++ b/tests/system/Security/SecurityTest.php
@@ -55,7 +55,10 @@ public function testHashIsReadFromCookie()
 
         $security = new MockSecurity(new MockAppConfig());
 
-        $this->assertSame('8b9218a55906f9dcc1dc263dce7f005a', $security->getHash());
+        $this->assertSame(
+            '8b9218a55906f9dcc1dc263dce7f005a',
+            $security->getHash()
+        );
     }
 
     public function testGetHashSetsCookieWhenGETWithoutCSRFCookie()
@@ -89,7 +92,12 @@ public function testCSRFVerifyPostThrowsExceptionOnNoMatch()
         $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b';
 
         $security = new MockSecurity(new MockAppConfig());
-        $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request  = new IncomingRequest(
+            new MockAppConfig(),
+            new URI('http://badurl.com'),
+            null,
+            new UserAgent()
+        );
 
         $this->expectException(SecurityException::class);
         $security->verify($request);
@@ -103,7 +111,12 @@ public function testCSRFVerifyPostReturnsSelfOnMatch()
         $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
 
         $security = new MockSecurity(new MockAppConfig());
-        $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request  = new IncomingRequest(
+            new MockAppConfig(),
+            new URI('http://badurl.com'),
+            null,
+            new UserAgent()
+        );
 
         $this->assertInstanceOf(Security::class, $security->verify($request));
         $this->assertLogged('info', 'CSRF token verified.');
@@ -117,7 +130,12 @@ public function testCSRFVerifyHeaderThrowsExceptionOnNoMatch()
         $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b';
 
         $security = new MockSecurity(new MockAppConfig());
-        $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request  = new IncomingRequest(
+            new MockAppConfig(),
+            new URI('http://badurl.com'),
+            null,
+            new UserAgent()
+        );
 
         $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005a');
 
@@ -132,7 +150,12 @@ public function testCSRFVerifyHeaderReturnsSelfOnMatch()
         $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
 
         $security = new MockSecurity(new MockAppConfig());
-        $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request  = new IncomingRequest(
+            new MockAppConfig(),
+            new URI('http://badurl.com'),
+            null,
+            new UserAgent()
+        );
 
         $request->setHeader('X-CSRF-TOKEN', '8b9218a55906f9dcc1dc263dce7f005a');
 
@@ -148,9 +171,16 @@ public function testCSRFVerifyJsonThrowsExceptionOnNoMatch()
         $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005b';
 
         $security = new MockSecurity(new MockAppConfig());
-        $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request  = new IncomingRequest(
+            new MockAppConfig(),
+            new URI('http://badurl.com'),
+            null,
+            new UserAgent()
+        );
 
-        $request->setBody('{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005a"}');
+        $request->setBody(
+            '{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005a"}'
+        );
 
         $this->expectException(SecurityException::class);
         $security->verify($request);
@@ -162,9 +192,16 @@ public function testCSRFVerifyJsonReturnsSelfOnMatch()
         $_COOKIE['csrf_cookie_name'] = '8b9218a55906f9dcc1dc263dce7f005a';
 
         $security = new MockSecurity(new MockAppConfig());
-        $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request  = new IncomingRequest(
+            new MockAppConfig(),
+            new URI('http://badurl.com'),
+            null,
+            new UserAgent()
+        );
 
-        $request->setBody('{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005a","foo":"bar"}');
+        $request->setBody(
+            '{"csrf_test_name":"8b9218a55906f9dcc1dc263dce7f005a","foo":"bar"}'
+        );
 
         $this->assertInstanceOf(Security::class, $security->verify($request));
         $this->assertLogged('info', 'CSRF token verified.');
@@ -192,7 +229,12 @@ public function testRegenerateWithFalseSecurityRegenerateProperty()
         Factories::injectMock('config', 'Security', $config);
 
         $security = new MockSecurity(new MockAppConfig());
-        $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request  = new IncomingRequest(
+            new MockAppConfig(),
+            new URI('http://badurl.com'),
+            null,
+            new UserAgent()
+        );
 
         $oldHash = $security->getHash();
         $security->verify($request);
@@ -212,7 +254,12 @@ public function testRegenerateWithTrueSecurityRegenerateProperty()
         Factories::injectMock('config', 'Security', $config);
 
         $security = new MockSecurity(new MockAppConfig());
-        $request  = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+        $request  = new IncomingRequest(
+            new MockAppConfig(),
+            new URI('http://badurl.com'),
+            null,
+            new UserAgent()
+        );
 
         $oldHash = $security->getHash();
         $security->verify($request);

From 628db685b1fa1667535f08aa50828739cebcd707 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 2 Dec 2021 17:29:18 +0900
Subject: [PATCH 0935/2325] test: fix setUp()

---
 tests/system/HTTP/ResponseTest.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php
index b4eba4c547c9..a94cd8e8b2b5 100644
--- a/tests/system/HTTP/ResponseTest.php
+++ b/tests/system/HTTP/ResponseTest.php
@@ -30,14 +30,18 @@ final class ResponseTest extends CIUnitTestCase
 
     protected function setUp(): void
     {
-        parent::setUp();
         $this->server = $_SERVER;
+
+        Services::reset();
+
+        parent::setUp();
     }
 
     protected function tearDown(): void
     {
-        $_SERVER = $this->server;
         Factories::reset('config');
+
+        $_SERVER = $this->server;
     }
 
     public function testCanSetStatusCode()

From d94cca96462ff14108160ed447b4814d964f4a4f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 3 Dec 2021 09:24:55 +0900
Subject: [PATCH 0936/2325] chore: add rule Cookie depends on Security

---
 depfile.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/depfile.yaml b/depfile.yaml
index 2c87969f4fc4..61b85383b329 100644
--- a/depfile.yaml
+++ b/depfile.yaml
@@ -157,6 +157,8 @@ ruleset:
   Controller:
     - HTTP
     - Validation
+  Cookie:
+    - Security
   Database:
     - Entity
     - Events

From d472ec1faafaee79e386aa68176b88f98c3eae7b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 3 Dec 2021 19:52:07 +0900
Subject: [PATCH 0937/2325] refactor: move cookie dispatching to Response class

---
 system/Cookie/CookieStore.php | 14 +++++------
 system/HTTP/ResponseTrait.php | 47 ++++++++++++++++++++++++++++++++++-
 2 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/system/Cookie/CookieStore.php b/system/Cookie/CookieStore.php
index 3edcd506d644..af7dd2f0e437 100644
--- a/system/Cookie/CookieStore.php
+++ b/system/Cookie/CookieStore.php
@@ -13,8 +13,6 @@
 
 use ArrayIterator;
 use CodeIgniter\Cookie\Exceptions\CookieException;
-use CodeIgniter\Security\Exceptions\SecurityException;
-use Config\Services;
 use Countable;
 use IteratorAggregate;
 use Traversable;
@@ -160,16 +158,12 @@ public function remove(string $name, string $prefix = '')
 
     /**
      * Dispatches all cookies in store.
+     *
+     * @deprecated Response should dispatch cookies.
      */
     public function dispatch(): void
     {
-        $request = Services::request();
-
         foreach ($this->cookies as $cookie) {
-            if ($cookie->isSecure() && ! $request->isSecure()) {
-                throw SecurityException::forDisallowedAction();
-            }
-
             $name    = $cookie->getPrefixedName();
             $value   = $cookie->getValue();
             $options = $cookie->getOptions();
@@ -240,6 +234,8 @@ protected function validateCookies(array $cookies): void
      * Extracted call to `setrawcookie()` in order to run unit tests on it.
      *
      * @codeCoverageIgnore
+     *
+     * @deprecated
      */
     protected function setRawCookie(string $name, string $value, array $options): void
     {
@@ -250,6 +246,8 @@ protected function setRawCookie(string $name, string $value, array $options): vo
      * Extracted call to `setcookie()` in order to run unit tests on it.
      *
      * @codeCoverageIgnore
+     *
+     * @deprecated
      */
     protected function setCookie(string $name, string $value, array $options): void
     {
diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
index 46835cc515c6..3b2a42c9b82d 100644
--- a/system/HTTP/ResponseTrait.php
+++ b/system/HTTP/ResponseTrait.php
@@ -16,6 +16,7 @@
 use CodeIgniter\Cookie\Exceptions\CookieException;
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\Pager\PagerInterface;
+use CodeIgniter\Security\Exceptions\SecurityException;
 use Config\Services;
 use DateTime;
 use DateTimeZone;
@@ -697,7 +698,51 @@ protected function sendCookies()
             return;
         }
 
-        $this->cookieStore->dispatch();
+        $this->dispatchCookies();
+    }
+
+    private function dispatchCookies(): void
+    {
+        /** @var IncomingRequest $request */
+        $request = Services::request();
+
+        foreach ($this->cookieStore->display() as $cookie) {
+            if ($cookie->isSecure() && ! $request->isSecure()) {
+                throw SecurityException::forDisallowedAction();
+            }
+
+            $name    = $cookie->getPrefixedName();
+            $value   = $cookie->getValue();
+            $options = $cookie->getOptions();
+
+            if ($cookie->isRaw()) {
+                $this->doSetRawCookie($name, $value, $options);
+            } else {
+                $this->doSetCookie($name, $value, $options);
+            }
+        }
+
+        $this->cookieStore->clear();
+    }
+
+    /**
+     * Extracted call to `setrawcookie()` in order to run unit tests on it.
+     *
+     * @codeCoverageIgnore
+     */
+    private function doSetRawCookie(string $name, string $value, array $options): void
+    {
+        setrawcookie($name, $value, $options);
+    }
+
+    /**
+     * Extracted call to `setcookie()` in order to run unit tests on it.
+     *
+     * @codeCoverageIgnore
+     */
+    private function doSetCookie(string $name, string $value, array $options): void
+    {
+        setcookie($name, $value, $options);
     }
 
     /**

From 246f3358ba33118f842cfc32a76f500feb506f5e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 3 Dec 2021 19:53:56 +0900
Subject: [PATCH 0938/2325] refactor: add @var

To explicitly indicate dependency
---
 system/Security/Security.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/Security/Security.php b/system/Security/Security.php
index a484310d40c5..bacbc9ee74d9 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Cookie\Cookie;
 use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\Response;
 use CodeIgniter\Security\Exceptions\SecurityException;
 use CodeIgniter\Session\Session;
 use Config\App;
@@ -529,6 +530,7 @@ private function saveHashInCookie(): void
             ]
         );
 
+        /** @var Response $response */
         $response    = Services::response();
         $cookieStore = $response->getCookieStore();
         $cookieStore = $cookieStore->put($this->cookie);

From 11e22972ca7190026b42bad84195ed11a9d934da Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 3 Dec 2021 19:55:38 +0900
Subject: [PATCH 0939/2325] chore: update deptrac rule

---
 depfile.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/depfile.yaml b/depfile.yaml
index 61b85383b329..301f17076f82 100644
--- a/depfile.yaml
+++ b/depfile.yaml
@@ -157,8 +157,6 @@ ruleset:
   Controller:
     - HTTP
     - Validation
-  Cookie:
-    - Security
   Database:
     - Entity
     - Events
@@ -174,6 +172,7 @@ ruleset:
   HTTP:
     - Cookie
     - Files
+    - Security
     - URI
   Images:
     - Files

From 3376a7cbe4e188bb32906a8040b9cc26791e7d0e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 3 Dec 2021 20:10:10 +0900
Subject: [PATCH 0940/2325] fix: restore removed methods as deprecated

---
 system/Security/Security.php | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/system/Security/Security.php b/system/Security/Security.php
index bacbc9ee74d9..344ef5cfe00c 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -538,6 +538,38 @@ private function saveHashInCookie(): void
         $response->setCookieStore($cookieStore);
     }
 
+    /**
+     * CSRF Send Cookie
+     *
+     * @return false|Security
+     *
+     * @deprecated Set cookies to Response object instead.
+     */
+    protected function sendCookie(RequestInterface $request)
+    {
+        if ($this->cookie->isSecure() && ! $request->isSecure()) {
+            return false;
+        }
+
+        $this->doSendCookie();
+        log_message('info', 'CSRF cookie sent.');
+
+        return $this;
+    }
+
+    /**
+     * Actual dispatching of cookies.
+     * Extracted for this to be unit tested.
+     *
+     * @codeCoverageIgnore
+     *
+     * @deprecated Set cookies to Response object instead.
+     */
+    protected function doSendCookie(): void
+    {
+        cookies([$this->cookie], false)->dispatch();
+    }
+
     private function saveHashInSession(): void
     {
         $this->session->set($this->tokenName, $this->hash);

From 23ba12cfe1b3ee5354559258cde5947120a16c54 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 4 Dec 2021 10:35:43 +0900
Subject: [PATCH 0941/2325] feat: Response::setCookie() can get Cookie object
 as the first parameter

---
 system/HTTP/ResponseTrait.php            | 24 +++++++++++++++---------
 tests/system/HTTP/ResponseCookieTest.php | 11 +++++++++++
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
index 3b2a42c9b82d..7caa5ebbbcca 100644
--- a/system/HTTP/ResponseTrait.php
+++ b/system/HTTP/ResponseTrait.php
@@ -536,15 +536,15 @@ public function redirect(string $uri, string $method = 'auto', ?int $code = null
      * Accepts an arbitrary number of binds (up to 7) or an associative
      * array in the first parameter containing all the values.
      *
-     * @param array|string $name     Cookie name or array containing binds
-     * @param string       $value    Cookie value
-     * @param string       $expire   Cookie expiration time in seconds
-     * @param string       $domain   Cookie domain (e.g.: '.yourdomain.com')
-     * @param string       $path     Cookie path (default: '/')
-     * @param string       $prefix   Cookie name prefix
-     * @param bool         $secure   Whether to only transfer cookies via SSL
-     * @param bool         $httponly Whether only make the cookie accessible via HTTP (no javascript)
-     * @param string|null  $samesite
+     * @param array|Cookie|string $name     Cookie name / array containing binds / Cookie object
+     * @param string              $value    Cookie value
+     * @param string              $expire   Cookie expiration time in seconds
+     * @param string              $domain   Cookie domain (e.g.: '.yourdomain.com')
+     * @param string              $path     Cookie path (default: '/')
+     * @param string              $prefix   Cookie name prefix
+     * @param bool                $secure   Whether to only transfer cookies via SSL
+     * @param bool                $httponly Whether only make the cookie accessible via HTTP (no javascript)
+     * @param string|null         $samesite
      *
      * @return $this
      */
@@ -559,6 +559,12 @@ public function setCookie(
         $httponly = false,
         $samesite = null
     ) {
+        if ($name instanceof Cookie) {
+            $this->cookieStore = $this->cookieStore->put($name);
+
+            return $this;
+        }
+
         if (is_array($name)) {
             // always leave 'name' in last place, as the loop will break otherwise, due to $$item
             foreach (['samesite', 'value', 'expire', 'domain', 'path', 'prefix', 'secure', 'httponly', 'name'] as $item) {
diff --git a/tests/system/HTTP/ResponseCookieTest.php b/tests/system/HTTP/ResponseCookieTest.php
index 721a2fbd47b7..678928463cc4 100644
--- a/tests/system/HTTP/ResponseCookieTest.php
+++ b/tests/system/HTTP/ResponseCookieTest.php
@@ -65,6 +65,17 @@ public function testCookiesAll()
         $this->assertTrue($response->hasCookie('bee'));
     }
 
+    public function testSetCookieObject()
+    {
+        $cookie   = new Cookie('foo', 'bar');
+        $response = new Response(new App());
+
+        $response->setCookie($cookie);
+
+        $this->assertCount(1, $response->getCookies());
+        $this->assertTrue($response->hasCookie('foo'));
+    }
+
     public function testCookieGet()
     {
         $response = new Response(new App());

From 943b4e04051774fa5be8ca89ea8667dc7dca832b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 4 Dec 2021 10:37:53 +0900
Subject: [PATCH 0942/2325] refactor: use Response::setCookie()

---
 system/HTTP/ResponseTrait.php | 8 --------
 system/Security/Security.php  | 7 ++-----
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
index 7caa5ebbbcca..278143fd3c3a 100644
--- a/system/HTTP/ResponseTrait.php
+++ b/system/HTTP/ResponseTrait.php
@@ -603,14 +603,6 @@ public function getCookieStore()
         return $this->cookieStore;
     }
 
-    /**
-     * Sets the CookieStore.
-     */
-    public function setCookieStore(CookieStore $cookieStore)
-    {
-        $this->cookieStore = $cookieStore;
-    }
-
     /**
      * Checks to see if the Response has a specified cookie or not.
      */
diff --git a/system/Security/Security.php b/system/Security/Security.php
index 344ef5cfe00c..008e94aeb612 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -531,11 +531,8 @@ private function saveHashInCookie(): void
         );
 
         /** @var Response $response */
-        $response    = Services::response();
-        $cookieStore = $response->getCookieStore();
-        $cookieStore = $cookieStore->put($this->cookie);
-
-        $response->setCookieStore($cookieStore);
+        $response = Services::response();
+        $response->setCookie($this->cookie);
     }
 
     /**

From 6817dc6f5f99cf9636e36479daf0259c512f136d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Dec 2021 10:21:19 +0900
Subject: [PATCH 0943/2325] docs: fix header level

---
 user_guide_src/source/changelogs/v4.1.6.rst | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.1.6.rst b/user_guide_src/source/changelogs/v4.1.6.rst
index 4cddcc21f953..e747e9181fa8 100644
--- a/user_guide_src/source/changelogs/v4.1.6.rst
+++ b/user_guide_src/source/changelogs/v4.1.6.rst
@@ -10,13 +10,15 @@ Release Date: Not released
     :depth: 2
 
 BREAKING
-========
+********
+
 - Multiple table names will no longer be stored in ``BaseBuilder::$tableName`` - an empty string will be used instead.
 
 .. _changelog-v416-validation-changes:
 
 Validation changes
-------------------
+==================
+
 - The previous version of the Validation can't handle an array item.
   Because of the bug fix, the validation results may be different,
   or raise a ``TypeError``.
@@ -28,14 +30,15 @@ Validation changes
   On the other hand, the current version passes the array to the validation rule as a whole.
 
 Enhancements
-============
+************
+
 - Database pane on debug toolbar now displays location where Query was called from. Also displays full backtrace.
 
 Changes
-=======
+*******
 
 Deprecations
-============
+************
 
 Bugs Fixed
-==========
+**********

From 49cd87991b218e67641557285ef5f3b4ba3c51fb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Dec 2021 10:46:06 +0900
Subject: [PATCH 0944/2325] docs: add changelog and update
 Response::setCookie()

---
 user_guide_src/source/changelogs/v4.1.6.rst | 14 ++++++++++++++
 user_guide_src/source/outgoing/response.rst |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/changelogs/v4.1.6.rst b/user_guide_src/source/changelogs/v4.1.6.rst
index e747e9181fa8..82b03127cda2 100644
--- a/user_guide_src/source/changelogs/v4.1.6.rst
+++ b/user_guide_src/source/changelogs/v4.1.6.rst
@@ -37,8 +37,22 @@ Enhancements
 Changes
 *******
 
+- The process of sending cookies has been moved to the ``Response`` class. Now the ``Security`` and ``CookieStore`` class don't send cookies, set them to the Response.
+
 Deprecations
 ************
 
+Sending Cookies
+===============
+
+The process of sending cookies has been moved to the ``Response`` class.
+And the following methods are deprecated:
+
+- ``CookieStore::dispatch()``
+- ``CookieStore::setRawCookie()``
+- ``CookieStore::setCookie()``
+- ``Security::sendCookie()``
+- ``Security::doSendCookie()``
+
 Bugs Fixed
 **********
diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
index 060e2cd28291..2cd619dbd390 100644
--- a/user_guide_src/source/outgoing/response.rst
+++ b/user_guide_src/source/outgoing/response.rst
@@ -396,7 +396,7 @@ The methods provided by the parent class that are available are:
 
     .. php:method:: setCookie($name = ''[, $value = ''[, $expire = ''[, $domain = ''[, $path = '/'[, $prefix = ''[, $secure = false[, $httponly = false[, $samesite = null]]]]]]]])
 
-        :param mixed $name: Cookie name or an array of parameters
+        :param array|Cookie|string $name: Cookie name or an array of parameters or an instance of ``CodeIgniter\Cookie\Cookie``
         :param string $value: Cookie value
         :param int $expire: Cookie expiration time in seconds
         :param string $domain: Cookie domain

From 004f42ab6c8169ed518aec8dad3662312a74babe Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 30 Nov 2021 16:46:20 +0900
Subject: [PATCH 0945/2325] fix: SQL in MySQLi\Connection::_foreignKeyData()

Fixes #4996
---
 system/Database/MySQLi/Connection.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/Database/MySQLi/Connection.php b/system/Database/MySQLi/Connection.php
index 9736bf0b03c6..5badaf1c4881 100644
--- a/system/Database/MySQLi/Connection.php
+++ b/system/Database/MySQLi/Connection.php
@@ -485,8 +485,10 @@ protected function _foreignKeyData(string $table): array
                     FROM information_schema.TABLE_CONSTRAINTS AS tc
                     INNER JOIN information_schema.REFERENTIAL_CONSTRAINTS AS rc
                         ON tc.CONSTRAINT_NAME = rc.CONSTRAINT_NAME
+                        AND tc.CONSTRAINT_SCHEMA = rc.CONSTRAINT_SCHEMA
                     INNER JOIN information_schema.KEY_COLUMN_USAGE AS kcu
                         ON tc.CONSTRAINT_NAME = kcu.CONSTRAINT_NAME
+                        AND tc.CONSTRAINT_SCHEMA = kcu.CONSTRAINT_SCHEMA
                     WHERE
                         tc.CONSTRAINT_TYPE = ' . $this->escape('FOREIGN KEY') . ' AND
                         tc.TABLE_SCHEMA = ' . $this->escape($this->database) . ' AND

From 29f8bf85c7dbd19d88c1728f917ab60e8dd3c715 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 26 Nov 2021 09:15:05 +0900
Subject: [PATCH 0946/2325] fix: is_cli() returns true when
 $_SERVER['HTTP_USER_AGENT'] is missing

Fixes #5336
---
 system/Common.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/system/Common.php b/system/Common.php
index 32943189b56b..bf91834ac0b1 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -643,16 +643,7 @@ function helper($filenames)
      */
     function is_cli(): bool
     {
-        if (defined('STDIN')) {
-            return true;
-        }
-
-        if (! isset($_SERVER['REMOTE_ADDR'], $_SERVER['HTTP_USER_AGENT']) && isset($_SERVER['argv']) && count($_SERVER['argv']) > 0) {
-            return true;
-        }
-
-        // if source of request is from CLI, the `$_SERVER` array will not populate this key
-        return ! isset($_SERVER['REQUEST_METHOD']);
+        return in_array(PHP_SAPI, ['cli', 'phpdbg'], true);
     }
 }
 

From 00fc5852a8fc199e70e967b84faa7cbaa71b0315 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 3 Dec 2021 14:52:45 +0900
Subject: [PATCH 0947/2325] fix: handle edge case of 'cgi-fcgi' and 'fpm-fcgi'

---
 system/Common.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/system/Common.php b/system/Common.php
index bf91834ac0b1..85a2506dfb9f 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -643,7 +643,13 @@ function helper($filenames)
      */
     function is_cli(): bool
     {
-        return in_array(PHP_SAPI, ['cli', 'phpdbg'], true);
+        if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {
+            return true;
+        }
+
+        // PHP_SAPI could be 'cgi-fcgi', 'fpm-fcgi'.
+        // See https://github.com/codeigniter4/CodeIgniter4/pull/5393
+        return ! isset($_SERVER['REMOTE_ADDR']) && ! isset($_SERVER['REQUEST_METHOD']);
     }
 }
 

From 19057bff9ed577966b47605f9193d3a9b3c32df0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 9 Dec 2021 10:01:47 +0900
Subject: [PATCH 0948/2325] docs: improve text decoration

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

diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst
index 51deea953590..c454bee36180 100644
--- a/user_guide_src/source/general/helpers.rst
+++ b/user_guide_src/source/general/helpers.rst
@@ -24,10 +24,10 @@ in your :doc:`controller </incoming/controllers>` and
 :doc:`views </outgoing/views>`.
 
 Helpers are typically stored in your **system/Helpers**, or
-**app/Helpers directory**. CodeIgniter will look first in your
-**app/Helpers directory**. If the directory does not exist or the
+**app/Helpers** directory. CodeIgniter will look first in your
+**app/Helpers** directory. If the directory does not exist or the
 specified helper is not located there CI will instead look in your
-global *system/Helpers/* directory.
+global **system/Helpers** directory.
 
 Loading a Helper
 ================
@@ -36,8 +36,8 @@ Loading a helper file is quite simple using the following method::
 
     helper('name');
 
-Where **name** is the file name of the helper, without the .php file
-extension or the "_helper" part.
+Where ``name`` is the file name of the helper, without the "**.php**" file
+extension or the "**_helper**" part.
 
 For example, to load the **Cookie Helper** file, which is named
 **cookie_helper.php**, you would do this::
@@ -69,7 +69,7 @@ Helpers can be loaded from directories outside of **app/Helpers** and
 has been set up within the PSR-4 section of the :doc:`Autoloader config file <../concepts/autoloader>`.
 You would prefix the name of the Helper with the namespace that it can be located
 in. Within that namespaced directory, the loader expects it to live within a
-sub-directory named ``Helpers``. An example will help understand this.
+sub-directory named **Helpers**. An example will help understand this.
 
 For this example, assume that we have grouped together all of our Blog-related
 code into its own namespace, ``Example\Blog``. The files exist on our server at
@@ -94,7 +94,7 @@ your view files you would do this::
 
     <?= anchor('blog/comments', 'Click Here') ?>
 
-Where "Click Here" is the name of the link, and "blog/comments" is the
+Where ``Click Here`` is the name of the link, and ``blog/comments`` is the
 URI to the controller/method you wish to link to.
 
 "Extending" Helpers
@@ -139,7 +139,7 @@ functions::
         return array_pop($array);
     }
 
-The **helper()** method will scan through all PSR-4 namespaces defined in **app/Config/Autoload.php**
+The ``helper()`` method will scan through all PSR-4 namespaces defined in **app/Config/Autoload.php**
 and load in ALL matching helpers of the same name. This allows any module's helpers
 to be loaded, as well as any helpers you've created specifically for this application. The load order
 is as follows:

From 18138fa4c781b05ff4f091135644963a1024cad9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 11 Nov 2021 17:10:10 +0900
Subject: [PATCH 0949/2325] fix: remove unserialize() in old()

I can't think of any use cases.
---
 system/Common.php                    | 5 -----
 tests/system/CommonFunctionsTest.php | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/system/Common.php b/system/Common.php
index 32943189b56b..61e2716fb56b 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -813,11 +813,6 @@ function old(string $key, $default = null, $escape = 'html')
             return $default;
         }
 
-        // If the result was serialized array or string, then unserialize it for use...
-        if (is_string($value) && (strpos($value, 'a:') === 0 || strpos($value, 's:') === 0)) {
-            $value = unserialize($value);
-        }
-
         return $escape === false ? $value : esc($value, $escape);
     }
 }
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index c6f1d6b9b2e1..0febdb038c1f 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -300,7 +300,7 @@ public function testOldInput()
         $_GET     = ['foo' => 'bar'];
         $_POST    = [
             'bar'    => 'baz',
-            'zibble' => serialize('fritz'),
+            'zibble' => 'fritz',
         ];
 
         $response = new RedirectResponse(new App());

From c2ab3d24504b70893be116e09fb7c8b7fa0475c6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 12 Nov 2021 12:42:22 +0900
Subject: [PATCH 0950/2325] docs: add security advisories URL in SECURITY.md

---
 SECURITY.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SECURITY.md b/SECURITY.md
index 7879188492b5..87b894ee713c 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -20,6 +20,7 @@ This person will coordinate the fix and release process, involving the following
 - Confirm the problem and determine the affected versions.
 - Audit code to find any potential similar problems.
 - Prepare fixes for all releases still under maintenance. These fixes will be released as fast as possible.
+- Publish security advisories at https://github.com/codeigniter4/CodeIgniter4/security/advisories
 
 ## Comments on this Policy
 

From 7c69140b65a1d4705a63c0bbd55e61171bfd132e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 12 Nov 2021 14:08:04 +0900
Subject: [PATCH 0951/2325] docs: remove out-of-dated comment

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

diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 0febdb038c1f..1b9bcbbbf3ad 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -308,7 +308,7 @@ public function testOldInput()
 
         $this->assertSame('bar', old('foo')); // regular parameter
         $this->assertSame('doo', old('yabba dabba', 'doo')); // non-existing parameter
-        $this->assertSame('fritz', old('zibble')); // serialized parameter
+        $this->assertSame('fritz', old('zibble'));
     }
 
     /**

From 78e4b27a16300c430248c0797a2d980093ef68e2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 12 Nov 2021 14:09:37 +0900
Subject: [PATCH 0952/2325] test: add test for serialize data

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

diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 1b9bcbbbf3ad..35175209da64 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -311,6 +311,39 @@ public function testOldInput()
         $this->assertSame('fritz', old('zibble'));
     }
 
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testOldInputSerializeData()
+    {
+        $this->injectSessionMock();
+        // setup from RedirectResponseTest...
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+
+        $this->config          = new App();
+        $this->config->baseURL = 'http://example.com/';
+
+        $this->routes = new RouteCollection(Services::locator(), new Modules());
+        Services::injectMock('routes', $this->routes);
+
+        $this->request = new MockIncomingRequest($this->config, new URI('http://example.com'), null, new UserAgent());
+        Services::injectMock('request', $this->request);
+
+        // setup & ask for a redirect...
+        $_SESSION = [];
+        $_GET     = [];
+        $_POST    = [
+            'zibble' => serialize('fritz'),
+        ];
+
+        $response = new RedirectResponse(new App());
+        $response->withInput();
+
+        // serialized parameters are only HTML-escaped.
+        $this->assertSame('s:5:&quot;fritz&quot;;', old('zibble'));
+    }
+
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/1492
      * @runInSeparateProcess

From b2d27c354c89b740a4c63443066a06b1bdf2469e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 12 Nov 2021 14:24:49 +0900
Subject: [PATCH 0953/2325] docs: add about Deserialization of Untrusted Data
 in old() to changelogs/v4.1.6.rst

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

diff --git a/user_guide_src/source/changelogs/v4.1.6.rst b/user_guide_src/source/changelogs/v4.1.6.rst
index 82b03127cda2..f3c513b48b99 100644
--- a/user_guide_src/source/changelogs/v4.1.6.rst
+++ b/user_guide_src/source/changelogs/v4.1.6.rst
@@ -9,6 +9,11 @@ Release Date: Not released
     :local:
     :depth: 2
 
+SECURITY
+========
+
+- *Deserialization of Untrusted Data* found in the ``old()`` function was fixed. See the `Security advisory <https://github.com/codeigniter4/CodeIgniter4/security/advisories/GHSA-w6jr-wj64-mc9x>`_ for more information.
+
 BREAKING
 ********
 

From 19d27497ca0c5bbcfb978d23581285cef03d058f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 13 Nov 2021 08:06:30 +0900
Subject: [PATCH 0954/2325] docs: move // comments into PHPDoc

---
 tests/system/HTTP/IncomingRequestTest.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 4229d5d264ec..2ea9dd38914f 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -107,7 +107,9 @@ public function testMissingOldInput()
         $this->assertNull($this->request->getOldInput('pineapple.name'));
     }
 
-    // Reference: https://github.com/codeigniter4/CodeIgniter4/issues/1492
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1492
+     */
     public function testCanGetOldInputArray()
     {
         $_SESSION['_ci_old_input'] = [
@@ -119,9 +121,9 @@ public function testCanGetOldInputArray()
         $this->assertSame(['name' => 'foo'], $this->request->getOldInput('banana'));
     }
 
-    // Reference: https://github.com/codeigniter4/CodeIgniter4/issues/1492
-
     /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1492
+     *
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
      */

From 24ae7250a91208a9dfd1ba0d14ccad6aad028d01 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 13 Nov 2021 08:12:18 +0900
Subject: [PATCH 0955/2325] test: refactor: fix test method names

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

diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 2ea9dd38914f..e8c91268a8e2 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -110,7 +110,7 @@ public function testMissingOldInput()
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/1492
      */
-    public function testCanGetOldInputArray()
+    public function testCanGetOldInputArrayWithSESSION()
     {
         $_SESSION['_ci_old_input'] = [
             'get'  => ['apple' => ['name' => 'two']],
@@ -127,7 +127,7 @@ public function testCanGetOldInputArray()
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
      */
-    public function testCanSerializeOldArray()
+    public function testCanGetOldInputArrayWithSessionService()
     {
         $locations = [
             'AB' => 'Alberta',

From 025a63bb2a0a0c9a1a34334b35e87f8ac19d6c96 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 9 Dec 2021 10:14:03 +0900
Subject: [PATCH 0956/2325] docs: update header level

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

diff --git a/user_guide_src/source/changelogs/v4.1.6.rst b/user_guide_src/source/changelogs/v4.1.6.rst
index f3c513b48b99..60b2dca40e30 100644
--- a/user_guide_src/source/changelogs/v4.1.6.rst
+++ b/user_guide_src/source/changelogs/v4.1.6.rst
@@ -10,7 +10,7 @@ Release Date: Not released
     :depth: 2
 
 SECURITY
-========
+********
 
 - *Deserialization of Untrusted Data* found in the ``old()`` function was fixed. See the `Security advisory <https://github.com/codeigniter4/CodeIgniter4/security/advisories/GHSA-w6jr-wj64-mc9x>`_ for more information.
 

From 6c7742cfadf4c3c3df8be9e4c2a61ea3e15cd460 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 9 Dec 2021 10:39:29 +0900
Subject: [PATCH 0957/2325] docs: fix wrong sample code

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

diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
index d38ec66e8994..cb6e78c25330 100644
--- a/user_guide_src/source/libraries/sessions.rst
+++ b/user_guide_src/source/libraries/sessions.rst
@@ -91,7 +91,7 @@ longer need it. So, what you need is to close the session for the
 current request after you no longer need it.
 ::
 
-    $session->destroy();
+    session_write_close();
 
 What is Session Data?
 =====================

From 2778b37527edd1411b3bf14285570fb481170822 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 9 Dec 2021 21:20:08 +0900
Subject: [PATCH 0958/2325] docs: update command option

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

diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst
index 9f748da69521..4d76e04d903b 100644
--- a/user_guide_src/source/dbmgmt/migration.rst
+++ b/user_guide_src/source/dbmgmt/migration.rst
@@ -199,13 +199,13 @@ You can use (migrate) with the following options:
 
 - ``-g`` - to chose database group, otherwise default database group will be used.
 - ``-n`` - to choose namespace, otherwise (App) namespace will be used.
-- ``-all`` - to migrate all namespaces to the latest migration
+- ``--all`` - to migrate all namespaces to the latest migration
 
 This example will migrate Blog namespace with any new migrations on the test database group::
 
     > php spark migrate -g test -n Blog
 
-When using the ``-all`` option, it will scan through all namespaces attempting to find any migrations that have
+When using the ``--all`` option, it will scan through all namespaces attempting to find any migrations that have
 not been run. These will all be collected and then sorted as a group by date created. This should help
 to minimize any potential conflicts between the main application and any modules.
 
@@ -231,7 +231,7 @@ You can use (refresh) with the following options:
 
 - ``-g`` - to choose database group, otherwise default database group will be used.
 - ``-n`` - to choose namespace, otherwise (App) namespace will be used.
-- ``-all`` - to refresh all namespaces
+- ``--all`` - to refresh all namespaces
 - ``-f`` - to force a bypass confirmation question, it is only asked in a production environment
 
 **status**

From 641873bed9c8bdc0f297aad607f8b4949b033270 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 9 Dec 2021 21:24:35 +0900
Subject: [PATCH 0959/2325] docs: improve command sample

'\' is a meta character in the shell.
---
 user_guide_src/source/dbmgmt/migration.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst
index 4d76e04d903b..e7bd41f34bc0 100644
--- a/user_guide_src/source/dbmgmt/migration.rst
+++ b/user_guide_src/source/dbmgmt/migration.rst
@@ -201,9 +201,9 @@ You can use (migrate) with the following options:
 - ``-n`` - to choose namespace, otherwise (App) namespace will be used.
 - ``--all`` - to migrate all namespaces to the latest migration
 
-This example will migrate Blog namespace with any new migrations on the test database group::
+This example will migrate ``Acme\Blog`` namespace with any new migrations on the test database group::
 
-    > php spark migrate -g test -n Blog
+    > php spark migrate -g test -n 'Acme\Blog'
 
 When using the ``--all`` option, it will scan through all namespaces attempting to find any migrations that have
 not been run. These will all be collected and then sorted as a group by date created. This should help

From 05ac0503b4f2dab6607ff796c93e548e19bc1720 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 10 Dec 2021 14:24:47 +0900
Subject: [PATCH 0960/2325] docs: add note and warning

Waring about the possibility of bypassing the filter.
---
 user_guide_src/source/incoming/filters.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index bbed197e7702..267ef4c921f4 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -91,6 +91,13 @@ Configuring Filters
 Once you've created your filters, you need to configure when they get run. This is done in **app/Config/Filters.php**.
 This file contains four properties that allow you to configure exactly when the filters run.
 
+.. Note:: The safest way to apply filters is to :ref:`disable auto-routing <use-defined-routes-only>`, and :ref:`set filters to routes <applying-filters>`.
+
+.. Warning:: It is recommended that you should always add ``*`` at the end of a URI in the filter settings.
+    Because a controller method might be accessible by different URLs than you think.
+    For example, when auto-routing is enabled, if you have ``Blog::index``,
+    it can be accessible with ``blog``, ``blog/index``, and ``blog/index/1``, etc.
+
 $aliases
 ========
 

From bfd0812346b4b028f3d2970cea7806573a9a0be8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 10 Dec 2021 14:27:40 +0900
Subject: [PATCH 0961/2325] docs: replace uri with URI

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

diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index 267ef4c921f4..096d1020f77f 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -140,7 +140,7 @@ run on every request. Filters can be specified by adding their alias to either t
 There are times where you want to apply a filter to almost every request, but have a few that should be left alone.
 One common example is if you need to exclude a few URI's from the CSRF protection filter to allow requests from
 third-party websites to hit one or two specific URI's, while keeping the rest of them protected. To do this, add
-an array with the 'except' key and a uri to match as the value alongside the alias::
+an array with the 'except' key and a URI to match as the value alongside the alias::
 
     public $globals = [
         'before' => [

From 7d3f02ca53327e492ab15f3409b5f4e7ce95e68d Mon Sep 17 00:00:00 2001
From: Toto <totoprayogo1916@gmail.com>
Date: Fri, 10 Dec 2021 21:49:51 +0700
Subject: [PATCH 0962/2325] update docs about `esc()`

`null` is not `$context`
---
 user_guide_src/source/general/common_functions.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index dd4c69a9915e..c1cdb038984a 100755
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -81,7 +81,7 @@ Service Accessors
     If $data is a string, then it simply escapes and returns it.
     If $data is an array, then it loops over it, escaping each 'value' of the key/value pairs.
 
-    Valid context values: html, js, css, url, attr, raw, null
+    Valid context values: html, js, css, url, attr, raw
 
 .. php:function:: helper($filename)
 

From 85de0fa9c2e753089ec3b95e9d6bc11eb4c5213b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Dec 2021 01:46:37 +0000
Subject: [PATCH 0963/2325] chore(deps-dev): update rector/rector requirement
 from 0.12.5 to 0.12.7 (#5451)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 064f7b392e05..ab1c999190bf 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.5"
+        "rector/rector": "0.12.7"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From 19d9f111dcc87746efe4ca255062370d7a8bf31b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 11 Dec 2021 10:59:30 +0900
Subject: [PATCH 0964/2325] fix: VENDORPATH definition

When using multiple apps, vendor/ is not ROOTPATH/vendor/.
---
 system/bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/bootstrap.php b/system/bootstrap.php
index 17226d099974..4549fbc2c939 100644
--- a/system/bootstrap.php
+++ b/system/bootstrap.php
@@ -117,7 +117,7 @@ class_alias('Config\Services', 'CodeIgniter\Services');
      * We do not want to enforce this, so set the constant if Composer was used.
      */
     if (! defined('VENDORPATH')) {
-        define('VENDORPATH', realpath(ROOTPATH . 'vendor') . DIRECTORY_SEPARATOR);
+        define('VENDORPATH', dirname(COMPOSER_PATH) . DIRECTORY_SEPARATOR);
     }
 
     require_once COMPOSER_PATH;

From 290b4d0dbf6db5dd8f57f9ba6d35c2aa8a8477b6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 11 Dec 2021 11:02:18 +0900
Subject: [PATCH 0965/2325] refactor: COMPOSER_PATH and VENDORPATH are defined
 above

---
 system/Test/bootstrap.php | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php
index f6ddb2ad68d1..48a266d14600 100644
--- a/system/Test/bootstrap.php
+++ b/system/Test/bootstrap.php
@@ -84,20 +84,6 @@ class_alias('Config\Services', 'CodeIgniter\Services');
 // Initialize and register the loader with the SPL autoloader stack.
 Services::autoloader()->initialize(new Autoload(), new Modules())->register();
 
-// Now load Composer's if it's available
-if (is_file(COMPOSER_PATH)) {
-    /*
-     * The path to the vendor directory.
-     *
-     * We do not want to enforce this, so set the constant if Composer was used.
-     */
-    if (! defined('VENDORPATH')) {
-        define('VENDORPATH', realpath(ROOTPATH . 'vendor') . DIRECTORY_SEPARATOR);
-    }
-
-    require_once COMPOSER_PATH;
-}
-
 // Load environment settings from .env files into $_SERVER and $_ENV
 require_once SYSTEMPATH . 'Config/DotEnv.php';
 

From e2ec0fea517bde7319f3208c628484233b3aebb9 Mon Sep 17 00:00:00 2001
From: Toto Prayogo <mail@totoprayogo.com>
Date: Sat, 11 Dec 2021 10:07:18 +0700
Subject: [PATCH 0966/2325] remove null as `$context`

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 system/Common.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Common.php b/system/Common.php
index 85a2506dfb9f..f531a82f7284 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -380,7 +380,7 @@ function env(string $key, $default = null)
      * If $data is an array, then it loops over it, escaping each
      * 'value' of the key/value pairs.
      *
-     * Valid context values: html, js, css, url, attr, raw, null
+     * Valid context values: html, js, css, url, attr, raw
      *
      * @param array|string $data
      * @param string       $encoding

From 9792a6b25f53640bca4d59715c58389df6bcc578 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 11 Dec 2021 13:03:35 +0900
Subject: [PATCH 0967/2325] fix: $fraction type

NumberFormatter::setAttribute(): Passing null to parameter #2 ($value) of type int|float is deprecated
---
 system/Helpers/number_helper.php          | 2 +-
 tests/system/Helpers/NumberHelperTest.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
index b3d7c80c6006..7e5428455aaf 100644
--- a/system/Helpers/number_helper.php
+++ b/system/Helpers/number_helper.php
@@ -116,7 +116,7 @@ function number_to_amount($num, int $precision = 0, ?string $locale = null)
      * @param string $locale
      * @param int    $fraction
      */
-    function number_to_currency(float $num, string $currency, ?string $locale = null, ?int $fraction = null): string
+    function number_to_currency(float $num, string $currency, ?string $locale = null, int $fraction = 0): string
     {
         return format_number($num, 1, $locale, [
             'type'     => NumberFormatter::CURRENCY,
diff --git a/tests/system/Helpers/NumberHelperTest.php b/tests/system/Helpers/NumberHelperTest.php
index 286440d7423b..006d0a650118 100755
--- a/tests/system/Helpers/NumberHelperTest.php
+++ b/tests/system/Helpers/NumberHelperTest.php
@@ -126,6 +126,7 @@ public function testQuadrillions()
      */
     public function testCurrencyCurrentLocale()
     {
+        $this->assertSame('$1,235', number_to_currency(1234.56, 'USD', 'en_US'));
         $this->assertSame('$1,234.56', number_to_currency(1234.56, 'USD', 'en_US', 2));
         $this->assertSame('£1,234.56', number_to_currency(1234.56, 'GBP', 'en_GB', 2));
         $this->assertSame("1.234,56\u{a0}RSD", number_to_currency(1234.56, 'RSD', 'sr_RS', 2));

From a6eb95dcc44e194d6799dc95da203023e5fcb8b3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 11 Dec 2021 13:11:39 +0900
Subject: [PATCH 0968/2325] docs: remove unneeded doc comments

---
 system/Helpers/number_helper.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
index 7e5428455aaf..04c8b9e4c0c2 100644
--- a/system/Helpers/number_helper.php
+++ b/system/Helpers/number_helper.php
@@ -112,10 +112,7 @@ function number_to_amount($num, int $precision = 0, ?string $locale = null)
 }
 
 if (! function_exists('number_to_currency')) {
-    /**
-     * @param string $locale
-     * @param int    $fraction
-     */
+
     function number_to_currency(float $num, string $currency, ?string $locale = null, int $fraction = 0): string
     {
         return format_number($num, 1, $locale, [

From ad3a204f6c6f1829d7ca9d1e944397dec0dc4af8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 11 Dec 2021 13:29:49 +0900
Subject: [PATCH 0969/2325] docs: fix number_helper.rst

---
 .../source/helpers/number_helper.rst           | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/user_guide_src/source/helpers/number_helper.rst b/user_guide_src/source/helpers/number_helper.rst
index eeca3a00614f..be5be2a8018c 100644
--- a/user_guide_src/source/helpers/number_helper.rst
+++ b/user_guide_src/source/helpers/number_helper.rst
@@ -27,7 +27,7 @@ Available Functions
 
 The following functions are available:
 
-.. php:function:: number_to_size($num[, $precision = 1[, $locale = null])
+.. php:function:: number_to_size($num[, $precision = 1[, $locale = null]])
 
     :param      mixed     $num: Number of bytes
     :param      int       $precision: Floating point precision
@@ -86,21 +86,23 @@ The following functions are available:
 
         echo number_to_amount('123,456,789,012', 2, 'de_DE'); // Returns 123,46 billion
 
-.. php:function:: number_to_currency($num, $currency[, $locale = null])
+.. php:function:: number_to_currency($num, $currency[, $locale = null[, $fraction = 0]])
 
-    :param mixed $num: Number to format
+    :param float $num: Number to format
     :param string $currency: The currency type, i.e., USD, EUR, etc
-    :param string $locale: The locale to use for formatting
+    :param string|null $locale: The locale to use for formatting
     :param integer $fraction: Number of fraction digits after decimal point
     :returns: The number as the appropriate currency for the locale
     :rtype: string
 
     Converts a number in common currency formats, like USD, EUR, GBP, etc::
 
-        echo number_to_currency(1234.56, 'USD');  // Returns $1,234.56
-        echo number_to_currency(1234.56, 'EUR');  // Returns €1,234.56
-        echo number_to_currency(1234.56, 'GBP');  // Returns £1,234.56
-        echo number_to_currency(1234.56, 'YEN');  // Returns YEN1,234.56
+        echo number_to_currency(1234.56, 'USD', 'en_US', 2);  // Returns $1,234.56
+        echo number_to_currency(1234.56, 'EUR', 'de_DE', 2);  // Returns 1.234,56 €
+        echo number_to_currency(1234.56, 'GBP', 'en_GB', 2);  // Returns £1,234.56
+        echo number_to_currency(1234.56, 'YEN', 'ja_JP', 2);  // Returns YEN 1,234.56
+
+    If you don't specify a locale, the Request locale is used.
 
 .. php:function:: number_to_roman($num)
 

From ce3d3cc9d5a4633e6c5f464c2295420d54b807ba Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 11 Dec 2021 13:56:09 +0900
Subject: [PATCH 0970/2325] style: remove empty line

---
 system/Helpers/number_helper.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
index 04c8b9e4c0c2..35e748978fbb 100644
--- a/system/Helpers/number_helper.php
+++ b/system/Helpers/number_helper.php
@@ -112,7 +112,6 @@ function number_to_amount($num, int $precision = 0, ?string $locale = null)
 }
 
 if (! function_exists('number_to_currency')) {
-
     function number_to_currency(float $num, string $currency, ?string $locale = null, int $fraction = 0): string
     {
         return format_number($num, 1, $locale, [

From 9e9b9cd7324d43c72a493c1fb9518aa446f1a349 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 11 Dec 2021 14:17:22 +0900
Subject: [PATCH 0971/2325] docs: add about COMPOSER_PATH change

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

diff --git a/user_guide_src/source/general/managing_apps.rst b/user_guide_src/source/general/managing_apps.rst
index c967c4a296bc..8b82a697698c 100644
--- a/user_guide_src/source/general/managing_apps.rst
+++ b/user_guide_src/source/general/managing_apps.rst
@@ -69,8 +69,13 @@ This would have two apps, **foo** and **bar**, both having standard application
 and a **public** folder, and sharing a common **codeigniter** framework.
 
 The **index.php** inside each application would refer to its own configuration,
-``../app/Config/Paths.php``, and the ``$systemDirectory`` variable inside each
+``../app/Config/Paths.php``, and the ``$systemDirectory`` variable in **app/Config/Paths.php** inside each
 of those would be set to refer to the shared common **system** folder.
 
 If either of the applications had a command-line component, then you would also
 modify **spark** inside each application's project folder, as directed above.
+
+When you use Composer autoloader, fix the ``COMPOSER_PATH`` constant in **app/Config/Constants.php** inside each
+of those::
+
+    defined('COMPOSER_PATH') || define('COMPOSER_PATH', ROOTPATH . '../vendor/autoload.php');

From 544e0c15c87bf1bb3ac5744aa7ed08c9894ad6bf Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Sat, 11 Dec 2021 16:36:48 +0800
Subject: [PATCH 0972/2325] The View class. Optimizing duplicate code.

---
 system/View/View.php | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/system/View/View.php b/system/View/View.php
index 6005b5f40582..e65416e5cf48 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -199,11 +199,7 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
         }
 
         // Make our view data available to the view.
-        $this->tempData = $this->tempData ?? $this->data;
-
-        if ($saveData) {
-            $this->data = $this->tempData;
-        }
+        $this->prepareTemplateData($saveData);
 
         // Save current vars
         $renderVars = $this->renderVars;
@@ -275,13 +271,9 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
      */
     public function renderString(string $view, ?array $options = null, ?bool $saveData = null): string
     {
-        $start          = microtime(true);
-        $saveData       = $saveData ?? $this->saveData;
-        $this->tempData = $this->tempData ?? $this->data;
-
-        if ($saveData) {
-            $this->data = $this->tempData;
-        }
+        $start    = microtime(true);
+        $saveData = $saveData ?? $this->saveData;
+        $this->prepareTemplateData($saveData);
 
         $output = (function (string $view): string {
             extract($this->tempData);
@@ -454,4 +446,13 @@ protected function logPerformance(float $start, float $end, string $view)
             ];
         }
     }
+
+    protected function prepareTemplateData(bool $saveData): void
+    {
+        $this->tempData = $this->tempData ?? $this->data;
+
+        if ($saveData) {
+            $this->data = $this->tempData;
+        }
+    }
 }

From 623b1024963bbfc119c8ddfb1e7b5ecf367ba8d0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Dec 2021 09:53:51 +0900
Subject: [PATCH 0973/2325] test: fix: restore `require_once` that was
 accidentally deleted

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

diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php
index 48a266d14600..00a4341c6e2a 100644
--- a/system/Test/bootstrap.php
+++ b/system/Test/bootstrap.php
@@ -84,6 +84,11 @@ class_alias('Config\Services', 'CodeIgniter\Services');
 // Initialize and register the loader with the SPL autoloader stack.
 Services::autoloader()->initialize(new Autoload(), new Modules())->register();
 
+// Now load Composer's if it's available
+if (is_file(COMPOSER_PATH)) {
+    require_once COMPOSER_PATH;
+}
+
 // Load environment settings from .env files into $_SERVER and $_ENV
 require_once SYSTEMPATH . 'Config/DotEnv.php';
 

From b22183c7a280debd5f084d0ffb43d723a041932e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Dec 2021 19:57:41 +0900
Subject: [PATCH 0974/2325] docs: add space after //

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

diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst
index 10828c0dc56b..9df5239cb820 100644
--- a/user_guide_src/source/models/entities.rst
+++ b/user_guide_src/source/models/entities.rst
@@ -433,7 +433,7 @@ Let's say the class will be located in the 'app/Entity/Cast' directory::
 
     use CodeIgniter\Entity\Cast\BaseCast;
 
-    //The class must inherit the CodeIgniter\Entity\Cast\BaseCast class
+    // The class must inherit the CodeIgniter\Entity\Cast\BaseCast class
     class CastBase64 extends BaseCast
     {
         public static function get($value, array $params = [])
@@ -462,13 +462,13 @@ Now you need to register it::
             'key' => 'base64',
         ];
 
-        //Bind the type to the handler
+        // Bind the type to the handler
         protected $castHandlers = [
             'base64' => \App\Entity\Cast\CastBase64::class,
         ];
     }
 
-    //...
+    // ...
 
     $entity->key = 'test'; // dGVzdA==
     echo $entity->key;     // test

From 46d592a0f6be3eabc14ed0c42e94a7086b7cb6b9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Dec 2021 19:58:16 +0900
Subject: [PATCH 0975/2325] docs: align `=>` positions

---
 user_guide_src/source/models/entities.rst | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst
index 9df5239cb820..7a170aa2790c 100644
--- a/user_guide_src/source/models/entities.rst
+++ b/user_guide_src/source/models/entities.rst
@@ -239,10 +239,10 @@ As an example, imagine you have the simplified User Entity that is used througho
     class User extends Entity
     {
         protected $attributes = [
-            'id' => null,
-            'name' => null, // Represents a username
-            'email' => null,
-            'password' => null,
+            'id'         => null,
+            'name'       => null, // Represents a username
+            'email'      => null,
+            'password'   => null,
             'created_at' => null,
             'updated_at' => null,
         ];
@@ -266,10 +266,10 @@ simply map the ``full_name`` column in the database to the ``$name`` property, a
     class User extends Entity
     {
         protected $attributes = [
-            'id' => null,
-            'name' => null, // Represents a username
-            'email' => null,
-            'password' => null,
+            'id'         => null,
+            'name'       => null, // Represents a username
+            'email'      => null,
+            'password'   => null,
             'created_at' => null,
             'updated_at' => null,
         ];

From b7e0f8b20921a69f8c04a95d1a37a2cd5b78da89 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Dec 2021 20:00:30 +0900
Subject: [PATCH 0976/2325] docs: fix the variable name

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

diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst
index 7a170aa2790c..1ac2f2c3ebf6 100644
--- a/user_guide_src/source/models/entities.rst
+++ b/user_guide_src/source/models/entities.rst
@@ -299,7 +299,7 @@ By default, the Entity class will convert fields named `created_at`, `updated_at
 :doc:`Time </libraries/time>` instances whenever they are set or retrieved. The Time class provides a large number
 of helpful methods in an immutable, localized way.
 
-You can define which properties are automatically converted by adding the name to the **options['dates']** array::
+You can define which properties are automatically converted by adding the name to the ``$dates`` property::
 
     <?php
 

From f396effb96146d83eb50fff1e90cdd7a25f08847 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Dec 2021 20:01:21 +0900
Subject: [PATCH 0977/2325] docs: fix the classname

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

diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst
index 1ac2f2c3ebf6..54c0c0ed8b00 100644
--- a/user_guide_src/source/models/entities.rst
+++ b/user_guide_src/source/models/entities.rst
@@ -107,8 +107,8 @@ Now that all of the pieces are in place, you would work with the Entity class as
     $userModel->save($user);
 
 You may have noticed that the User class has not set any properties for the columns, but you can still
-access them as if they were public properties. The base class, **CodeIgniter\\Entity**, takes care of this for you, as
 well as providing the ability to check the properties with **isset()**, or **unset()** the property, and keep track
+access them as if they were public properties. The base class, ``CodeIgniter\Entity\Entity``, takes care of this for you, as
 of what columns have changed since the object was created or pulled from the database.
 
 When the User is passed to the model's **save()** method, it automatically takes care of reading the  properties

From 155d16b222e4bcd7117182d06e489a216a9cece7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 12 Dec 2021 20:02:09 +0900
Subject: [PATCH 0978/2325] docs: improve text decoration

Code is decrated with ``.
File paths are decrated with **.
---
 user_guide_src/source/models/entities.rst | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst
index 54c0c0ed8b00..489685a8c5ff 100644
--- a/user_guide_src/source/models/entities.rst
+++ b/user_guide_src/source/models/entities.rst
@@ -106,13 +106,13 @@ Now that all of the pieces are in place, you would work with the Entity class as
     $user->email    = 'foo@example.com';
     $userModel->save($user);
 
-You may have noticed that the User class has not set any properties for the columns, but you can still
-well as providing the ability to check the properties with **isset()**, or **unset()** the property, and keep track
+You may have noticed that the ``User`` class has not set any properties for the columns, but you can still
 access them as if they were public properties. The base class, ``CodeIgniter\Entity\Entity``, takes care of this for you, as
+well as providing the ability to check the properties with ``isset()``, or ``unset()`` the property, and keep track
 of what columns have changed since the object was created or pulled from the database.
 
-When the User is passed to the model's **save()** method, it automatically takes care of reading the  properties
-and saving any changes to columns listed in the model's **$allowedFields** property. It also knows whether to create
+When the User is passed to the model's ``save()`` method, it automatically takes care of reading the  properties
+and saving any changes to columns listed in the model's ``$allowedFields`` property. It also knows whether to create
 a new row, or update an existing one.
 
 .. note:: When we are making a call to the ``insert()`` all the values from Entity are passed to the method, but when we
@@ -123,7 +123,7 @@ Filling Properties Quickly
 
 The Entity class also provides a method, ``fill()`` that allows you to shove an array of key/value pairs into the class
 and populate the class properties. Any property in the array will be set on the Entity. However, when saving through
-the model, only the fields in $allowedFields will actually be saved to the database, so you can store additional data
+the model, only the fields in ``$allowedFields`` will actually be saved to the database, so you can store additional data
 on your entities without worrying much about stray fields getting saved incorrectly.
 
 ::
@@ -198,7 +198,7 @@ Here's an updated User entity to provide some examples of how this could be used
 
 The first thing to notice is the name of the methods we've added. For each one, the class expects the snake_case
 column name to be converted into PascalCase, and prefixed with either ``set`` or ``get``. These methods will then
-be automatically called whenever you set or retrieve the class property using the direct syntax (i.e., $user->email).
+be automatically called whenever you set or retrieve the class property using the direct syntax (i.e., ``$user->email``).
 The methods do not need to be public unless you want them accessed from other classes. For example, the ``created_at``
 class property will be accessed through the ``setCreatedAt()`` and ``getCreatedAt()`` methods.
 
@@ -327,14 +327,14 @@ current timezone, as set in **app/Config/App.php**::
 Property Casting
 ----------------
 
-You can specify that properties in your Entity should be converted to common data types with the **casts** property.
+You can specify that properties in your Entity should be converted to common data types with the ``$casts`` property.
 This option should be an array where the key is the name of the class property, and the value is the data type it
 should be cast to. Casting only affects when values are read. No conversions happen that affect the permanent value in
 either the entity or the database. Properties can be cast to any of the following data types:
 **integer**, **float**, **double**, **string**, **boolean**, **object**, **array**, **datetime**, **timestamp**, and **uri**.
 Add a question mark at the beginning of type to mark property as nullable, i.e., **?string**, **?integer**.
 
-For example, if you had a User entity with an **is_banned** property, you can cast it as a boolean::
+For example, if you had a User entity with an ``is_banned`` property, you can cast it as a boolean::
 
     <?php
 
@@ -356,8 +356,8 @@ Array/Json Casting
 Array/Json casting is especially useful with fields that store serialized arrays or json in them. When cast as:
 
 * an **array**, they will automatically be unserialized,
-* a **json**, they will automatically be set as an value of json_decode($value, false),
-* a **json-array**, they will automatically be set as an value of json_decode($value, true),
+* a **json**, they will automatically be set as an value of ``json_decode($value, false)``,
+* a **json-array**, they will automatically be set as an value of ``json_decode($value, true)``,
 
 when you set the property's value.
 Unlike the rest of the data types that you can cast properties into, the:
@@ -425,7 +425,7 @@ Custom casting
 You can define your own conversion types for getting and setting data.
 
 At first you need to create a handler class for your type.
-Let's say the class will be located in the 'app/Entity/Cast' directory::
+Let's say the class will be located in the **app/Entity/Cast** directory::
 
     <?php
 

From 30d2b3fe9fd96fa55cda01da2c50b94981fb3666 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 13 Dec 2021 09:14:59 +0900
Subject: [PATCH 0979/2325] docs: remove out of dated raw html

---
 user_guide_src/source/helpers/html_helper.rst | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/user_guide_src/source/helpers/html_helper.rst b/user_guide_src/source/helpers/html_helper.rst
index 3e88f19360fc..978f0ea67f04 100755
--- a/user_guide_src/source/helpers/html_helper.rst
+++ b/user_guide_src/source/helpers/html_helper.rst
@@ -8,10 +8,6 @@ HTML.
 .. contents::
     :local:
 
-.. raw:: html
-
-    <div class="custom-index container"></div>
-
 Loading this Helper
 ===================
 

From f941858bcf244e7925d6f0513a11efbeaf1c3312 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Mon, 13 Dec 2021 15:05:13 +0800
Subject: [PATCH 0980/2325] Use PHPStan's baseline instead of global ignore of
 errors

---
 phpstan-baseline.neon.dist                    | 1022 +++++++++++++++++
 phpstan.neon.dist                             |   27 +-
 system/Autoloader/Autoloader.php              |    4 +-
 system/Cache/Handlers/FileHandler.php         |    1 -
 system/Cache/Handlers/MemcachedHandler.php    |    6 +-
 system/CodeIgniter.php                        |    7 +-
 system/Common.php                             |    1 -
 system/Database/BaseConnection.php            |    1 -
 system/Database/BaseResult.php                |    2 -
 system/Database/Postgre/Connection.php        |    1 -
 system/Database/SQLite3/Result.php            |   16 +-
 system/Debug/Exceptions.php                   |    2 +-
 system/Debug/Toolbar/Collectors/Events.php    |    2 +-
 system/Debug/Toolbar/Collectors/Views.php     |    6 +-
 system/HTTP/CURLRequest.php                   |    2 +-
 system/HTTP/RequestTrait.php                  |    1 -
 system/HTTP/URI.php                           |    2 +-
 system/Helpers/number_helper.php              |    2 +-
 system/Helpers/text_helper.php                |    1 -
 system/Helpers/url_helper.php                 |    2 +-
 system/Images/Handlers/ImageMagickHandler.php |    6 +-
 system/Model.php                              |    2 +-
 system/Router/Router.php                      |    1 -
 system/Session/Handlers/DatabaseHandler.php   |    1 -
 system/Session/Handlers/RedisHandler.php      |    1 -
 system/Test/CIUnitTestCase.php                |    2 +-
 system/Test/Fabricator.php                    |    6 +-
 system/Test/FeatureTestCase.php               |    2 +-
 system/Test/FeatureTestTrait.php              |    2 +-
 system/Test/Mock/MockConnection.php           |    2 +-
 30 files changed, 1060 insertions(+), 73 deletions(-)
 create mode 100644 phpstan-baseline.neon.dist

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
new file mode 100644
index 000000000000..0a91bd7fc64f
--- /dev/null
+++ b/phpstan-baseline.neon.dist
@@ -0,0 +1,1022 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Parameter \\#1 \\$callback of function spl_autoload_register expects \\(callable\\(string\\)\\: void\\)\\|null, array\\{\\$this\\(CodeIgniter\\\\Autoloader\\\\Autoloader\\), 'loadClass'\\} given\\.$#"
+			count: 1
+			path: system/Autoloader/Autoloader.php
+
+		-
+			message: "#^Parameter \\#1 \\$callback of function spl_autoload_register expects \\(callable\\(string\\)\\: void\\)\\|null, array\\{\\$this\\(CodeIgniter\\\\Autoloader\\\\Autoloader\\), 'loadClassmap'\\} given\\.$#"
+			count: 1
+			path: system/Autoloader/Autoloader.php
+
+		-
+			message: "#^Property Config\\\\Autoload\\:\\:\\$classmap \\(array\\<string, string\\>\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Autoloader/Autoloader.php
+
+		-
+			message: "#^Property Config\\\\Autoload\\:\\:\\$files \\(array\\<int, string\\>\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Autoloader/Autoloader.php
+
+		-
+			message: "#^Property Config\\\\Autoload\\:\\:\\$psr4 \\(array\\<string, string\\>\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Autoloader/Autoloader.php
+
+		-
+			message: "#^Method CodeIgniter\\\\Validation\\\\ValidationInterface\\:\\:run\\(\\) invoked with 3 parameters, 0\\-2 required\\.$#"
+			count: 1
+			path: system/BaseModel.php
+
+		-
+			message: "#^Property Config\\\\Cache\\:\\:\\$backupHandler \\(string\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Cache/CacheFactory.php
+
+		-
+			message: "#^Property Config\\\\Cache\\:\\:\\$handler \\(string\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Cache/CacheFactory.php
+
+		-
+			message: "#^Property Config\\\\Cache\\:\\:\\$validHandlers \\(array\\<string, string\\>\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Cache/CacheFactory.php
+
+		-
+			message: "#^Comparison operation \"\\>\" between int\\<1, max\\> and \\(array\\|float\\|int\\) results in an error\\.$#"
+			count: 1
+			path: system/Cache/Handlers/FileHandler.php
+
+		-
+			message: "#^If condition is always true\\.$#"
+			count: 1
+			path: system/Cache/Handlers/FileHandler.php
+
+		-
+			message: "#^Property Config\\\\Cache\\:\\:\\$storePath \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Cache/Handlers/FileHandler.php
+
+		-
+			message: "#^Method MemcachePool\\:\\:decrement\\(\\) invoked with 4 parameters, 1\\-2 required\\.$#"
+			count: 1
+			path: system/Cache/Handlers/MemcachedHandler.php
+
+		-
+			message: "#^Method MemcachePool\\:\\:increment\\(\\) invoked with 4 parameters, 1\\-2 required\\.$#"
+			count: 1
+			path: system/Cache/Handlers/MemcachedHandler.php
+
+		-
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			count: 1
+			path: system/Cache/Handlers/MemcachedHandler.php
+
+		-
+			message: "#^Variable \\$config in empty\\(\\) always exists and is not falsy\\.$#"
+			count: 1
+			path: system/Cache/Handlers/MemcachedHandler.php
+
+		-
+			message: "#^Variable \\$data might not be defined\\.$#"
+			count: 1
+			path: system/Cache/Handlers/MemcachedHandler.php
+
+		-
+			message: "#^Property Config\\\\Cache\\:\\:\\$redis \\(array\\<string, int\\|string\\|null\\>\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Cache/Handlers/PredisHandler.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Cache\\\\Handlers\\\\RedisHandler\\:\\:\\$redis \\(Redis\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Cache/Handlers/RedisHandler.php
+
+		-
+			message: "#^Variable \\$config in empty\\(\\) always exists and is not falsy\\.$#"
+			count: 1
+			path: system/Cache/Handlers/RedisHandler.php
+
+		-
+			message: "#^Call to an undefined method CodeIgniter\\\\HTTP\\\\Request\\:\\:getPost\\(\\)\\.$#"
+			count: 1
+			path: system/CodeIgniter.php
+
+		-
+			message: "#^Call to an undefined method CodeIgniter\\\\HTTP\\\\Request\\:\\:getSegments\\(\\)\\.$#"
+			count: 1
+			path: system/CodeIgniter.php
+
+		-
+			message: "#^Call to an undefined method CodeIgniter\\\\HTTP\\\\Request\\:\\:setLocale\\(\\)\\.$#"
+			count: 1
+			path: system/CodeIgniter.php
+
+		-
+			message: "#^Dead catch \\- CodeIgniter\\\\Exceptions\\\\PageNotFoundException is never thrown in the try block\\.$#"
+			count: 1
+			path: system/CodeIgniter.php
+
+		-
+			message: "#^Property Config\\\\App\\:\\:\\$appTimezone \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/CodeIgniter.php
+
+		-
+			message: "#^Property Config\\\\App\\:\\:\\$defaultLocale \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/CodeIgniter.php
+
+		-
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			count: 1
+			path: system/CodeIgniter.php
+
+		-
+			message: "#^Binary operation \"\\+\" between array\\<string, class\\-string\\>\\|false and non\\-empty\\-array\\<string, string\\> results in an error\\.$#"
+			count: 1
+			path: system/Common.php
+
+		-
+			message: "#^Variable \\$params on left side of \\?\\? always exists and is not nullable\\.$#"
+			count: 1
+			path: system/Common.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$db \\(CodeIgniter\\\\Database\\\\BaseConnection\\) in empty\\(\\) is not falsy\\.$#"
+			count: 1
+			path: system/Database/BaseBuilder.php
+
+		-
+			message: "#^Call to an undefined method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:_disableForeignKeyChecks\\(\\)\\.$#"
+			count: 1
+			path: system/Database/BaseConnection.php
+
+		-
+			message: "#^Call to an undefined method CodeIgniter\\\\Database\\\\BaseConnection\\:\\:_enableForeignKeyChecks\\(\\)\\.$#"
+			count: 1
+			path: system/Database/BaseConnection.php
+
+		-
+			message: "#^Call to an undefined method CodeIgniter\\\\Database\\\\QueryInterface\\:\\:getOriginalQuery\\(\\)\\.$#"
+			count: 1
+			path: system/Database/BaseConnection.php
+
+		-
+			message: "#^Negated boolean expression is always true\\.$#"
+			count: 1
+			path: system/Database/BaseConnection.php
+
+		-
+			message: "#^Negated boolean expression is always false\\.$#"
+			count: 3
+			path: system/Database/BaseResult.php
+
+		-
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			count: 2
+			path: system/Database/BaseResult.php
+
+		-
+			message: "#^While loop condition is always true\\.$#"
+			count: 2
+			path: system/Database/BaseResult.php
+
+		-
+			message: "#^Access to an undefined property CodeIgniter\\\\Database\\\\ConnectionInterface\\:\\:\\$DBDriver\\.$#"
+			count: 2
+			path: system/Database/Database.php
+
+		-
+			message: "#^Access to an undefined property CodeIgniter\\\\Database\\\\ConnectionInterface\\:\\:\\$connID\\.$#"
+			count: 2
+			path: system/Database/Database.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Database\\\\Migration\\:\\:\\$DBGroup \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Database/Migration.php
+
+		-
+			message: "#^Property Config\\\\Migrations\\:\\:\\$enabled \\(bool\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Database/MigrationRunner.php
+
+		-
+			message: "#^Property Config\\\\Migrations\\:\\:\\$table \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Database/MigrationRunner.php
+
+		-
+			message: "#^Cannot access property \\$affected_rows on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Connection.php
+
+		-
+			message: "#^Cannot access property \\$errno on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Connection.php
+
+		-
+			message: "#^Cannot access property \\$error on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Connection.php
+
+		-
+			message: "#^Cannot access property \\$insert_id on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Connection.php
+
+		-
+			message: "#^Cannot call method autocommit\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 3
+			path: system/Database/MySQLi/Connection.php
+
+		-
+			message: "#^Cannot call method begin_transaction\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Connection.php
+
+		-
+			message: "#^Cannot call method close\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Connection.php
+
+		-
+			message: "#^Cannot call method commit\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Connection.php
+
+		-
+			message: "#^Cannot call method more_results\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Connection.php
+
+		-
+			message: "#^Cannot call method next_result\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Connection.php
+
+		-
+			message: "#^Cannot call method query\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Connection.php
+
+		-
+			message: "#^Cannot call method real_escape_string\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Connection.php
+
+		-
+			message: "#^Cannot call method rollback\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Connection.php
+
+		-
+			message: "#^Cannot call method select_db\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Connection.php
+
+		-
+			message: "#^Cannot call method store_result\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Connection.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$strictOn \\(bool\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Connection.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Database\\\\MySQLi\\\\Connection\\:\\:\\$mysqli \\(mysqli\\) in empty\\(\\) is not falsy\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Connection.php
+
+		-
+			message: "#^Access to an undefined property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$mysqli\\.$#"
+			count: 3
+			path: system/Database/MySQLi/PreparedQuery.php
+
+		-
+			message: "#^Cannot call method bind_param\\(\\) on object\\|resource\\.$#"
+			count: 1
+			path: system/Database/MySQLi/PreparedQuery.php
+
+		-
+			message: "#^Cannot call method execute\\(\\) on object\\|resource\\.$#"
+			count: 1
+			path: system/Database/MySQLi/PreparedQuery.php
+
+		-
+			message: "#^Cannot call method get_result\\(\\) on object\\|resource\\.$#"
+			count: 1
+			path: system/Database/MySQLi/PreparedQuery.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Database\\\\BasePreparedQuery\\:\\:\\$statement \\(object\\|resource\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Database/MySQLi/PreparedQuery.php
+
+		-
+			message: "#^Cannot access property \\$field_count on object\\|resource\\|false\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Result.php
+
+		-
+			message: "#^Cannot access property \\$num_rows on object\\|resource\\|false\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Result.php
+
+		-
+			message: "#^Cannot call method data_seek\\(\\) on object\\|resource\\|false\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Result.php
+
+		-
+			message: "#^Cannot call method fetch_assoc\\(\\) on object\\|resource\\|false\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Result.php
+
+		-
+			message: "#^Cannot call method fetch_field\\(\\) on object\\|resource\\|false\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Result.php
+
+		-
+			message: "#^Cannot call method fetch_fields\\(\\) on object\\|resource\\|false\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Result.php
+
+		-
+			message: "#^Cannot call method fetch_object\\(\\) on object\\|resource\\|false\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Result.php
+
+		-
+			message: "#^Cannot call method field_seek\\(\\) on object\\|resource\\|false\\.$#"
+			count: 1
+			path: system/Database/MySQLi/Result.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between array and false will always evaluate to false\\.$#"
+			count: 1
+			path: system/Database/Postgre/Connection.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Database\\\\BasePreparedQuery\\:\\:\\$statement \\(object\\|resource\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Database/Postgre/PreparedQuery.php
+
+		-
+			message: "#^Access to an undefined property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$schema\\.$#"
+			count: 2
+			path: system/Database/SQLSRV/Builder.php
+
+		-
+			message: "#^Access to an undefined property CodeIgniter\\\\Database\\\\BaseConnection\\:\\:\\$schema\\.$#"
+			count: 14
+			path: system/Database/SQLSRV/Forge.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Database\\\\BasePreparedQuery\\:\\:\\$statement \\(object\\|resource\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Database/SQLSRV/PreparedQuery.php
+
+		-
+			message: "#^Cannot call method changes\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/SQLite3/Connection.php
+
+		-
+			message: "#^Cannot call method close\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/SQLite3/Connection.php
+
+		-
+			message: "#^Cannot call method escapeString\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/SQLite3/Connection.php
+
+		-
+			message: "#^Cannot call method exec\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 4
+			path: system/Database/SQLite3/Connection.php
+
+		-
+			message: "#^Cannot call method lastErrorCode\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/SQLite3/Connection.php
+
+		-
+			message: "#^Cannot call method lastErrorMsg\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/SQLite3/Connection.php
+
+		-
+			message: "#^Cannot call method lastInsertRowID\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/SQLite3/Connection.php
+
+		-
+			message: "#^Cannot call method query\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/SQLite3/Connection.php
+
+		-
+			message: "#^Cannot call method bindValue\\(\\) on object\\|resource\\.$#"
+			count: 1
+			path: system/Database/SQLite3/PreparedQuery.php
+
+		-
+			message: "#^Cannot call method execute\\(\\) on object\\|resource\\.$#"
+			count: 1
+			path: system/Database/SQLite3/PreparedQuery.php
+
+		-
+			message: "#^Cannot call method lastErrorCode\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/SQLite3/PreparedQuery.php
+
+		-
+			message: "#^Cannot call method lastErrorMsg\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/SQLite3/PreparedQuery.php
+
+		-
+			message: "#^Cannot call method prepare\\(\\) on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Database/SQLite3/PreparedQuery.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Database\\\\BasePreparedQuery\\:\\:\\$statement \\(object\\|resource\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Database/SQLite3/PreparedQuery.php
+
+		-
+			message: "#^Cannot call method columnName\\(\\) on object\\|resource\\|false\\.$#"
+			count: 2
+			path: system/Database/SQLite3/Result.php
+
+		-
+			message: "#^Cannot call method columnType\\(\\) on object\\|resource\\|false\\.$#"
+			count: 1
+			path: system/Database/SQLite3/Result.php
+
+		-
+			message: "#^Cannot call method fetchArray\\(\\) on object\\|resource\\|false\\.$#"
+			count: 2
+			path: system/Database/SQLite3/Result.php
+
+		-
+			message: "#^Cannot call method numColumns\\(\\) on object\\|resource\\|false\\.$#"
+			count: 1
+			path: system/Database/SQLite3/Result.php
+
+		-
+			message: "#^Cannot call method reset\\(\\) on object\\|resource\\|false\\.$#"
+			count: 2
+			path: system/Database/SQLite3/Result.php
+
+		-
+			message: "#^Property Config\\\\Database\\:\\:\\$filesPath \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Database/Seeder.php
+
+		-
+			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Debug/Exceptions.php
+
+		-
+			message: "#^Parameter \\#4 \\$replacement of function array_splice expects array\\|string, true given\\.$#"
+			count: 1
+			path: system/Debug/Exceptions.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Debug\\\\Exceptions\\:\\:\\$formatter \\(CodeIgniter\\\\Format\\\\FormatterInterface\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Debug/Exceptions.php
+
+		-
+			message: "#^Property Config\\\\Exceptions\\:\\:\\$sensitiveDataInTrace \\(array\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Debug/Exceptions.php
+
+		-
+			message: "#^Property Config\\\\Toolbar\\:\\:\\$collectVarData \\(bool\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Debug/Toolbar.php
+
+		-
+			message: "#^Variable \\$request on left side of \\?\\? always exists and is not nullable\\.$#"
+			count: 1
+			path: system/Debug/Toolbar.php
+
+		-
+			message: "#^Variable \\$response on left side of \\?\\? always exists and is not nullable\\.$#"
+			count: 1
+			path: system/Debug/Toolbar.php
+
+		-
+			message: "#^Call to an undefined method CodeIgniter\\\\View\\\\RendererInterface\\:\\:getPerformanceData\\(\\)\\.$#"
+			count: 1
+			path: system/Debug/Toolbar/Collectors/Events.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Log\\\\Logger\\:\\:\\$logCache \\(array\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Debug/Toolbar/Collectors/Logs.php
+
+		-
+			message: "#^Call to an undefined method CodeIgniter\\\\View\\\\RendererInterface\\:\\:getData\\(\\)\\.$#"
+			count: 1
+			path: system/Debug/Toolbar/Collectors/Views.php
+
+		-
+			message: "#^Call to an undefined method CodeIgniter\\\\View\\\\RendererInterface\\:\\:getPerformanceData\\(\\)\\.$#"
+			count: 2
+			path: system/Debug/Toolbar/Collectors/Views.php
+
+		-
+			message: "#^Static property CodeIgniter\\\\Email\\\\Email\\:\\:\\$func_overload \\(bool\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Email/Email.php
+
+		-
+			message: "#^Property Config\\\\Encryption\\:\\:\\$digest \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 2
+			path: system/Encryption/Encryption.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Files\\\\File\\:\\:\\$size \\(int\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Files/File.php
+
+		-
+			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Filters/Filters.php
+
+		-
+			message: "#^Property Config\\\\Filters\\:\\:\\$filters \\(array\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Filters/Filters.php
+
+		-
+			message: "#^Property Config\\\\Filters\\:\\:\\$globals \\(array\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Filters/Filters.php
+
+		-
+			message: "#^Property Config\\\\Filters\\:\\:\\$methods \\(array\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Filters/Filters.php
+
+		-
+			message: "#^Parameter \\#1 \\$seconds of function sleep expects int, float given\\.$#"
+			count: 1
+			path: system/HTTP/CURLRequest.php
+
+		-
+			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/HTTP/Files/UploadedFile.php
+
+		-
+			message: "#^Property CodeIgniter\\\\HTTP\\\\Files\\\\UploadedFile\\:\\:\\$error \\(int\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 2
+			path: system/HTTP/Files/UploadedFile.php
+
+		-
+			message: "#^Return type \\(bool\\) of method CodeIgniter\\\\HTTP\\\\Files\\\\UploadedFile\\:\\:move\\(\\) should be compatible with return type \\(CodeIgniter\\\\Files\\\\File\\) of method CodeIgniter\\\\Files\\\\File\\:\\:move\\(\\)$#"
+			count: 1
+			path: system/HTTP/Files/UploadedFile.php
+
+		-
+			message: "#^Property CodeIgniter\\\\HTTP\\\\IncomingRequest\\:\\:\\$locale \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/HTTP/IncomingRequest.php
+
+		-
+			message: "#^Property CodeIgniter\\\\HTTP\\\\Message\\:\\:\\$protocolVersion \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/HTTP/Message.php
+
+		-
+			message: "#^Variable \\$_GET on left side of \\?\\? always exists and is not nullable\\.$#"
+			count: 1
+			path: system/HTTP/RedirectResponse.php
+
+		-
+			message: "#^Variable \\$_POST on left side of \\?\\? always exists and is not nullable\\.$#"
+			count: 1
+			path: system/HTTP/RedirectResponse.php
+
+		-
+			message: "#^Property CodeIgniter\\\\HTTP\\\\Request\\:\\:\\$proxyIPs \\(array\\|string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/HTTP/Request.php
+
+		-
+			message: "#^Property CodeIgniter\\\\HTTP\\\\Request\\:\\:\\$uri \\(CodeIgniter\\\\HTTP\\\\URI\\) in empty\\(\\) is not falsy\\.$#"
+			count: 1
+			path: system/HTTP/Request.php
+
+		-
+			message: "#^Property Config\\\\App\\:\\:\\$cookieSameSite \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 3
+			path: system/HTTP/Response.php
+
+		-
+			message: "#^Cannot unset offset 'path' on array\\{host\\: mixed\\}\\.$#"
+			count: 1
+			path: system/HTTP/URI.php
+
+		-
+			message: "#^Property CodeIgniter\\\\HTTP\\\\URI\\:\\:\\$fragment \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/HTTP/URI.php
+
+		-
+			message: "#^Property CodeIgniter\\\\HTTP\\\\URI\\:\\:\\$host \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/HTTP/URI.php
+
+		-
+			message: "#^Property CodeIgniter\\\\HTTP\\\\URI\\:\\:\\$path \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/HTTP/URI.php
+
+		-
+			message: "#^Right side of && is always true\\.$#"
+			count: 1
+			path: system/Helpers/filesystem_helper.php
+
+		-
+			message: "#^Offset 'checked' on array\\{type\\: 'checkbox', name\\: mixed, value\\: string\\} in isset\\(\\) does not exist\\.$#"
+			count: 1
+			path: system/Helpers/form_helper.php
+
+		-
+			message: "#^Binary operation \"\\+\" between 0 and string results in an error\\.$#"
+			count: 1
+			path: system/Helpers/number_helper.php
+
+		-
+			message: "#^Variable \\$mockService in empty\\(\\) always exists and is always falsy\\.$#"
+			count: 1
+			path: system/Helpers/test_helper.php
+
+		-
+			message: "#^Parameter \\#2 \\$times of function str_repeat expects int, float given\\.$#"
+			count: 1
+			path: system/Helpers/text_helper.php
+
+		-
+			message: "#^Variable \\$pool might not be defined\\.$#"
+			count: 2
+			path: system/Helpers/text_helper.php
+
+		-
+			message: "#^Variable \\$count might not be defined\\.$#"
+			count: 1
+			path: system/Helpers/url_helper.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$image \\(CodeIgniter\\\\Images\\\\Image\\) in empty\\(\\) is not falsy\\.$#"
+			count: 1
+			path: system/Images/Handlers/BaseHandler.php
+
+		-
+			message: "#^Comparison operation \"\\>\\=\" between \\(array\\|float\\|int\\) and 0 results in an error\\.$#"
+			count: 2
+			path: system/Images/Handlers/ImageMagickHandler.php
+
+		-
+			message: "#^PHPDoc type string\\|null of property CodeIgniter\\\\Images\\\\Handlers\\\\ImageMagickHandler\\:\\:\\$resource is not covariant with PHPDoc type resource\\|null of overridden property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$resource\\.$#"
+			count: 1
+			path: system/Images/Handlers/ImageMagickHandler.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$height \\(int\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 4
+			path: system/Images/Handlers/ImageMagickHandler.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Images\\\\Handlers\\\\BaseHandler\\:\\:\\$width \\(int\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 4
+			path: system/Images/Handlers/ImageMagickHandler.php
+
+		-
+			message: "#^Variable \\$gravity might not be defined\\.$#"
+			count: 1
+			path: system/Images/Handlers/ImageMagickHandler.php
+
+		-
+			message: "#^Variable \\$xAxis might not be defined\\.$#"
+			count: 1
+			path: system/Images/Handlers/ImageMagickHandler.php
+
+		-
+			message: "#^Variable \\$yAxis might not be defined\\.$#"
+			count: 1
+			path: system/Images/Handlers/ImageMagickHandler.php
+
+		-
+			message: "#^Property Config\\\\Logger\\:\\:\\$dateFormat \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Log/Logger.php
+
+		-
+			message: "#^Call to an undefined method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:asArray\\(\\)\\.$#"
+			count: 1
+			path: system/Model.php
+
+		-
+			message: "#^Property CodeIgniter\\\\RESTful\\\\ResourceController\\:\\:\\$formatter \\(CodeIgniter\\\\Format\\\\FormatterInterface\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/RESTful/ResourceController.php
+
+		-
+			message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getDefaultNamespace\\(\\)\\.$#"
+			count: 2
+			path: system/Router/Router.php
+
+		-
+			message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getFilterForRoute\\(\\)\\.$#"
+			count: 1
+			path: system/Router/Router.php
+
+		-
+			message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getFiltersForRoute\\(\\)\\.$#"
+			count: 1
+			path: system/Router/Router.php
+
+		-
+			message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRoutesOptions\\(\\)\\.$#"
+			count: 2
+			path: system/Router/Router.php
+
+		-
+			message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:isFiltered\\(\\)\\.$#"
+			count: 1
+			path: system/Router/Router.php
+
+		-
+			message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:setHTTPVerb\\(\\)\\.$#"
+			count: 1
+			path: system/Router/Router.php
+
+		-
+			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Router/Router.php
+
+		-
+			message: "#^Method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRoutes\\(\\) invoked with 1 parameter, 0 required\\.$#"
+			count: 2
+			path: system/Router/Router.php
+
+		-
+			message: "#^Property Config\\\\App\\:\\:\\$CSRFCookieName \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Security/Security.php
+
+		-
+			message: "#^Property Config\\\\App\\:\\:\\$CSRFExpire \\(int\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Security/Security.php
+
+		-
+			message: "#^Property Config\\\\App\\:\\:\\$CSRFHeaderName \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Security/Security.php
+
+		-
+			message: "#^Property Config\\\\App\\:\\:\\$CSRFRegenerate \\(bool\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Security/Security.php
+
+		-
+			message: "#^Property Config\\\\App\\:\\:\\$CSRFTokenName \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Security/Security.php
+
+		-
+			message: "#^Property Config\\\\Security\\:\\:\\$cookieName \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Security/Security.php
+
+		-
+			message: "#^Property Config\\\\Security\\:\\:\\$csrfProtection \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Security/Security.php
+
+		-
+			message: "#^Property Config\\\\Security\\:\\:\\$expires \\(int\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Security/Security.php
+
+		-
+			message: "#^Property Config\\\\Security\\:\\:\\$headerName \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Security/Security.php
+
+		-
+			message: "#^Property Config\\\\Security\\:\\:\\$regenerate \\(bool\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Security/Security.php
+
+		-
+			message: "#^Property Config\\\\Security\\:\\:\\$tokenName \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Security/Security.php
+
+		-
+			message: "#^Property Config\\\\Security\\:\\:\\$tokenRandomize \\(bool\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Security/Security.php
+
+		-
+			message: "#^Access to an undefined property Config\\\\App\\:\\:\\$sessionDBGroup\\.$#"
+			count: 1
+			path: system/Session/Handlers/DatabaseHandler.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Session\\\\Handlers\\\\BaseHandler\\:\\:\\$sessionID \\(string\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Session/Handlers/DatabaseHandler.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Session\\\\Handlers\\\\BaseHandler\\:\\:\\$sessionID \\(string\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Session/Handlers/FileHandler.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Session\\\\Handlers\\\\BaseHandler\\:\\:\\$sessionID \\(string\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Session/Handlers/MemcachedHandler.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Session\\\\Handlers\\\\BaseHandler\\:\\:\\$sessionID \\(string\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Session/Handlers/RedisHandler.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between string and true will always evaluate to false\\.$#"
+			count: 1
+			path: system/Session/Handlers/RedisHandler.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Session\\\\Session\\:\\:\\$sessionExpiration \\(int\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Session/Session.php
+
+		-
+			message: "#^Property Config\\\\App\\:\\:\\$cookieDomain \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Session/Session.php
+
+		-
+			message: "#^Property Config\\\\App\\:\\:\\$cookiePath \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Session/Session.php
+
+		-
+			message: "#^Property Config\\\\App\\:\\:\\$cookieSameSite \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 2
+			path: system/Session/Session.php
+
+		-
+			message: "#^Property Config\\\\App\\:\\:\\$cookieSecure \\(bool\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Session/Session.php
+
+		-
+			message: "#^Property Config\\\\App\\:\\:\\$sessionCookieName \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Session/Session.php
+
+		-
+			message: "#^Property Config\\\\App\\:\\:\\$sessionExpiration \\(int\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Session/Session.php
+
+		-
+			message: "#^Property Config\\\\App\\:\\:\\$sessionMatchIP \\(bool\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Session/Session.php
+
+		-
+			message: "#^Property Config\\\\App\\:\\:\\$sessionRegenerateDestroy \\(bool\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Session/Session.php
+
+		-
+			message: "#^Property Config\\\\App\\:\\:\\$sessionTimeToUpdate \\(int\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Session/Session.php
+
+		-
+			message: "#^Property Config\\\\Cookie\\:\\:\\$domain \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Session/Session.php
+
+		-
+			message: "#^Property Config\\\\Cookie\\:\\:\\$path \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Session/Session.php
+
+		-
+			message: "#^Property Config\\\\Cookie\\:\\:\\$raw \\(bool\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Session/Session.php
+
+		-
+			message: "#^Property Config\\\\Cookie\\:\\:\\$samesite \\(string\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Session/Session.php
+
+		-
+			message: "#^Property Config\\\\Cookie\\:\\:\\$secure \\(bool\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Session/Session.php
+
+		-
+			message: "#^Negated boolean expression is always false\\.$#"
+			count: 1
+			path: system/Test/CIUnitTestCase.php
+
+		-
+			message: "#^Access to an undefined property object\\:\\:\\$createdField\\.$#"
+			count: 1
+			path: system/Test/Fabricator.php
+
+		-
+			message: "#^Access to an undefined property object\\:\\:\\$deletedField\\.$#"
+			count: 1
+			path: system/Test/Fabricator.php
+
+		-
+			message: "#^Access to an undefined property object\\:\\:\\$updatedField\\.$#"
+			count: 1
+			path: system/Test/Fabricator.php
+
+		-
+			message: "#^Access to protected property CodeIgniter\\\\HTTP\\\\Request\\:\\:\\$uri\\.$#"
+			count: 1
+			path: system/Test/FeatureTestCase.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$bodyFormat \\(string\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Test/FeatureTestCase.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$clean \\(bool\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Test/FeatureTestCase.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$session \\(array\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Test/FeatureTestCase.php
+
+		-
+			message: "#^Cannot access property \\$insert_id on bool\\|object\\|resource\\.$#"
+			count: 1
+			path: system/Test/Mock/MockConnection.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockResourcePresenter\\:\\:\\$formatter \\(CodeIgniter\\\\Format\\\\FormatterInterface\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Test/Mock/MockResourcePresenter.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Throttle\\\\Throttler\\:\\:\\$testTime \\(int\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Throttle/Throttler.php
+
+		-
+			message: "#^Property CodeIgniter\\\\Validation\\\\Validation\\:\\:\\$errors \\(array\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/Validation/Validation.php
+
+		-
+			message: "#^Variable \\$error on left side of \\?\\? always exists and is always null\\.$#"
+			count: 1
+			path: system/Validation/Validation.php
+
+		-
+			message: "#^Property CodeIgniter\\\\View\\\\Cell\\:\\:\\$cache \\(CodeIgniter\\\\Cache\\\\CacheInterface\\) in empty\\(\\) is not falsy\\.$#"
+			count: 2
+			path: system/View/Cell.php
+
+		-
+			message: "#^Property Config\\\\View\\:\\:\\$plugins \\(array\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: system/View/Parser.php
+
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index bf23eb5303ed..741b147136b3 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -8,6 +8,9 @@ services:
 		tags:
 			- phpstan.rules.rule
 
+includes:
+	- phpstan-baseline.neon.dist
+
 parameters:
 	tmpDir: build/phpstan
 	level: 5
@@ -28,30 +31,6 @@ parameters:
 		- system/Test/Filters/CITestStreamFilter.php
 		- system/ThirdParty/*
 		- system/Validation/Views/single.php
-	ignoreErrors:
-		- '#Access to an undefined property CodeIgniter\\Database\\BaseConnection::\$mysqli|\$schema#'
-		- '#Access to an undefined property CodeIgniter\\Database\\ConnectionInterface::(\$DBDriver|\$connID|\$likeEscapeStr|\$likeEscapeChar|\$escapeChar|\$protectIdentifiers|\$schema)#'
-		- '#Call to an undefined method CodeIgniter\\Database\\BaseConnection::_(disable|enable)ForeignKeyChecks\(\)#'
-		- '#Call to an undefined method CodeIgniter\\Router\\RouteCollectionInterface::(getDefaultNamespace|isFiltered|getFilterForRoute|getFiltersForRoute|getRoutesOptions)\(\)#'
-		- '#Cannot access property [\$a-z_]+ on ((bool\|)?object\|resource)#'
-		- '#Cannot call method [a-zA-Z_]+\(\) on ((bool\|)?object\|resource)#'
-		- '#Method CodeIgniter\\Router\\RouteCollectionInterface::getRoutes\(\) invoked with 1 parameter, 0 required#'
-		- '#Method CodeIgniter\\Validation\\ValidationInterface::run\(\) invoked with 3 parameters, 0-2 required#'
-		- '#Negated boolean expression is always (true|false)#'
-		- '#Return type \(bool\) of method CodeIgniter\\HTTP\\Files\\UploadedFile::move\(\) should be compatible with return type \(CodeIgniter\\Files\\File\) of method CodeIgniter\\Files\\File::move\(\)#'
-		- '#.*\son left side of \?\? is not nullable#'
-		- '#While loop condition is always true#'
-		- '#Right side of && is always true#'
-		- '#.*in isset\(\) is not nullable#'
-		- '#.*in empty\(\) is not falsy#'
-		- '#.*on left side of \?\? always exists and is not nullable#'
-		- '#Variable \$error on left side of \?\? always exists and is always null#'
-		- '#Variable \$config in empty\(\) always exists and is not falsy#'
-		- '#If condition is always true#'
-		- '#Dead catch - CodeIgniter\\Exceptions\\PageNotFoundException is never thrown in the try block#'
-		- '#.* in isset\(\) does not exist#'
-		- '#Variable \$mockService in empty\(\) always exists and is always falsy#'
-		- '#PHPDoc type string\|null of property CodeIgniter\\Images\\Handlers\\ImageMagickHandler::\$resource is not covariant with PHPDoc type resource\|null of overridden property CodeIgniter\\Images\\Handlers\\BaseHandler::\$resource#'
 	parallel:
 		processTimeout: 300.0
 	scanDirectories:
diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
index 3472756ad4dd..492fb09930f0 100644
--- a/system/Autoloader/Autoloader.php
+++ b/system/Autoloader/Autoloader.php
@@ -114,10 +114,10 @@ public function initialize(Autoload $config, Modules $modules)
     public function register()
     {
         // Prepend the PSR4  autoloader for maximum performance.
-        spl_autoload_register([$this, 'loadClass'], true, true); // @phpstan-ignore-line
+        spl_autoload_register([$this, 'loadClass'], true, true);
 
         // Now prepend another loader for the files in our class map.
-        spl_autoload_register([$this, 'loadClassmap'], true, true); // @phpstan-ignore-line
+        spl_autoload_register([$this, 'loadClassmap'], true, true);
 
         // Load our non-class files
         foreach ($this->files as $file) {
diff --git a/system/Cache/Handlers/FileHandler.php b/system/Cache/Handlers/FileHandler.php
index a7df6971b4bc..2517c6a5df11 100644
--- a/system/Cache/Handlers/FileHandler.php
+++ b/system/Cache/Handlers/FileHandler.php
@@ -241,7 +241,6 @@ protected function getItem(string $filename)
             return false;
         }
 
-        // @phpstan-ignore-next-line
         if ($data['ttl'] > 0 && time() > $data['time'] + $data['ttl']) {
             // If the file is still there then try to remove it
             if (is_file($this->path . $filename)) {
diff --git a/system/Cache/Handlers/MemcachedHandler.php b/system/Cache/Handlers/MemcachedHandler.php
index 93c8cc59e0b5..f240a5d08de2 100644
--- a/system/Cache/Handlers/MemcachedHandler.php
+++ b/system/Cache/Handlers/MemcachedHandler.php
@@ -146,7 +146,7 @@ public function get(string $key)
             }
         }
 
-        return is_array($data) ? $data[0] : $data; // @phpstan-ignore-line
+        return is_array($data) ? $data[0] : $data;
     }
 
     /**
@@ -172,7 +172,6 @@ public function save(string $key, $value, int $ttl = 60)
             return $this->memcached->set($key, $value, 0, $ttl);
         }
 
-        // @phpstan-ignore-next-line
         return false;
     }
 
@@ -205,7 +204,6 @@ public function increment(string $key, int $offset = 1)
 
         $key = static::validateKey($key, $this->prefix);
 
-        // @phpstan-ignore-next-line
         return $this->memcached->increment($key, $offset, $offset, 60);
     }
 
@@ -221,7 +219,7 @@ public function decrement(string $key, int $offset = 1)
         $key = static::validateKey($key, $this->prefix);
 
         // FIXME: third parameter isn't other handler actions.
-        // @phpstan-ignore-next-line
+
         return $this->memcached->decrement($key, $offset, $offset, 60);
     }
 
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index a8ebeef1b5cf..41e775dbf58d 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -537,7 +537,6 @@ protected function getRequestObject()
             return;
         }
 
-        // @phpstan-ignore-next-line
         if (is_cli() && ENVIRONMENT !== 'testing') {
             // @codeCoverageIgnoreStart
             $this->request = Services::clirequest($this->config);
@@ -721,7 +720,7 @@ protected function tryToRouteIt(?RouteCollectionInterface $routes = null)
         // If a {locale} segment was matched in the final route,
         // then we need to set the correct locale on our Request.
         if ($this->router->hasLocale()) {
-            $this->request->setLocale($this->router->getLocale()); // @phpstan-ignore-line
+            $this->request->setLocale($this->router->getLocale());
         }
 
         $this->benchmark->stop('routing');
@@ -816,7 +815,7 @@ protected function createController()
     protected function runController($class)
     {
         // If this is a console request then use the input segments as parameters
-        $params = defined('SPARKED') ? $this->request->getSegments() : $this->router->params(); // @phpstan-ignore-line
+        $params = defined('SPARKED') ? $this->request->getSegments() : $this->router->params();
 
         if (method_exists($class, '_remap')) {
             $output = $class->_remap($this->method, ...$params);
@@ -969,7 +968,7 @@ public function spoofRequestMethod()
             return;
         }
 
-        $method = $this->request->getPost('_method'); // @phpstan-ignore-line
+        $method = $this->request->getPost('_method');
 
         if (empty($method)) {
             return;
diff --git a/system/Common.php b/system/Common.php
index f531a82f7284..567135babe1f 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -1153,7 +1153,6 @@ function class_uses_recursive($class)
 
         $results = [];
 
-        // @phpstan-ignore-next-line
         foreach (array_reverse(class_parents($class)) + [$class => $class] as $class) {
             $results += trait_uses_recursive($class);
         }
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index f2ceb5a0f907..5f678e5114d7 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -883,7 +883,6 @@ public function prepare(Closure $func, array $options = [])
         $this->pretend(false);
 
         if ($sql instanceof QueryInterface) {
-            // @phpstan-ignore-next-line
             $sql = $sql->getOriginalQuery();
         }
 
diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php
index 49a970f5bf11..5d223c7fc08b 100644
--- a/system/Database/BaseResult.php
+++ b/system/Database/BaseResult.php
@@ -154,7 +154,6 @@ public function getCustomResultObject(string $className)
             $this->customResultObject[$className][] = $row;
         }
 
-        // @phpstan-ignore-next-line
         return $this->customResultObject[$className];
     }
 
@@ -233,7 +232,6 @@ public function getResultObject(): array
             $this->resultObject[] = $row;
         }
 
-        // @phpstan-ignore-next-line
         return $this->resultObject;
     }
 
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
index d39587821036..57b4c78fd749 100644
--- a/system/Database/Postgre/Connection.php
+++ b/system/Database/Postgre/Connection.php
@@ -117,7 +117,6 @@ public function getVersion(): string
             return $this->dataCache['version'];
         }
 
-        // @phpstan-ignore-next-line
         if (! $this->connID || ($pgVersion = pg_version($this->connID)) === false) {
             $this->initialize();
         }
diff --git a/system/Database/SQLite3/Result.php b/system/Database/SQLite3/Result.php
index 6ad8e5dc939f..6afc04c51578 100644
--- a/system/Database/SQLite3/Result.php
+++ b/system/Database/SQLite3/Result.php
@@ -27,7 +27,7 @@ class Result extends BaseResult
      */
     public function getFieldCount(): int
     {
-        return $this->resultID->numColumns(); // @phpstan-ignore-line
+        return $this->resultID->numColumns();
     }
 
     /**
@@ -38,7 +38,7 @@ public function getFieldNames(): array
         $fieldNames = [];
 
         for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i++) {
-            $fieldNames[] = $this->resultID->columnName($i); // @phpstan-ignore-line
+            $fieldNames[] = $this->resultID->columnName($i);
         }
 
         return $fieldNames;
@@ -58,18 +58,18 @@ public function getFieldData(): array
         ];
 
         $retVal = [];
-        $this->resultID->fetchArray(SQLITE3_NUM); // @phpstan-ignore-line
+        $this->resultID->fetchArray(SQLITE3_NUM);
 
         for ($i = 0, $c = $this->getFieldCount(); $i < $c; $i++) {
             $retVal[$i]             = new stdClass();
-            $retVal[$i]->name       = $this->resultID->columnName($i); // @phpstan-ignore-line
-            $type                   = $this->resultID->columnType($i); // @phpstan-ignore-line
+            $retVal[$i]->name       = $this->resultID->columnName($i);
+            $type                   = $this->resultID->columnType($i);
             $retVal[$i]->type       = $type;
             $retVal[$i]->type_name  = $dataTypes[$type] ?? null;
             $retVal[$i]->max_length = null;
             $retVal[$i]->length     = null;
         }
-        $this->resultID->reset(); // @phpstan-ignore-line
+        $this->resultID->reset();
 
         return $retVal;
     }
@@ -100,7 +100,7 @@ public function dataSeek(int $n = 0)
             throw new DatabaseException('SQLite3 doesn\'t support seeking to other offset.');
         }
 
-        return $this->resultID->reset(); // @phpstan-ignore-line
+        return $this->resultID->reset();
     }
 
     /**
@@ -112,7 +112,7 @@ public function dataSeek(int $n = 0)
      */
     protected function fetchAssoc()
     {
-        return $this->resultID->fetchArray(SQLITE3_ASSOC); // @phpstan-ignore-line
+        return $this->resultID->fetchArray(SQLITE3_ASSOC);
     }
 
     /**
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index c594bc4eac9f..d319c2f9746e 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -394,7 +394,7 @@ public static function highlightFile(string $file, int $lineNumber, int $lines =
         $start = max($lineNumber - (int) round($lines / 2), 0);
 
         // Get just the lines we need to display, while keeping line numbers...
-        $source = array_splice($source, $start, $lines, true); // @phpstan-ignore-line
+        $source = array_splice($source, $start, $lines, true);
 
         // Used to format the line number in the source
         $format = '% ' . strlen((string) ($start + $lines)) . 'd';
diff --git a/system/Debug/Toolbar/Collectors/Events.php b/system/Debug/Toolbar/Collectors/Events.php
index b8c59f4566bb..a8a7e7aa4c35 100644
--- a/system/Debug/Toolbar/Collectors/Events.php
+++ b/system/Debug/Toolbar/Collectors/Events.php
@@ -74,7 +74,7 @@ protected function formatTimelineData(): array
     {
         $data = [];
 
-        $rows = $this->viewer->getPerformanceData(); // @phpstan-ignore-line
+        $rows = $this->viewer->getPerformanceData();
 
         foreach ($rows as $info) {
             $data[] = [
diff --git a/system/Debug/Toolbar/Collectors/Views.php b/system/Debug/Toolbar/Collectors/Views.php
index 75fea1d6cc6d..fae3385fffbc 100644
--- a/system/Debug/Toolbar/Collectors/Views.php
+++ b/system/Debug/Toolbar/Collectors/Views.php
@@ -89,7 +89,7 @@ protected function formatTimelineData(): array
     {
         $data = [];
 
-        $rows = $this->viewer->getPerformanceData(); // @phpstan-ignore-line
+        $rows = $this->viewer->getPerformanceData();
 
         foreach ($rows as $info) {
             $data[] = [
@@ -122,7 +122,7 @@ protected function formatTimelineData(): array
     public function getVarData(): array
     {
         return [
-            // @phpstan-ignore-next-line
+
             'View Data' => $this->viewer->getData(),
         ];
     }
@@ -132,7 +132,7 @@ public function getVarData(): array
      */
     public function getBadgeValue(): int
     {
-        return count($this->viewer->getPerformanceData()); // @phpstan-ignore-line
+        return count($this->viewer->getPerformanceData());
     }
 
     /**
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index 9a66e632783b..e00ac44f97e0 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -358,7 +358,7 @@ public function send(string $method, string $url)
 
         // Do we need to delay this request?
         if ($this->delay > 0) {
-            sleep($this->delay); // @phpstan-ignore-line
+            sleep($this->delay);
         }
 
         $output = $this->sendRequest($curlOptions);
diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php
index c0bb005099ab..327cddcb0e7f 100644
--- a/system/HTTP/RequestTrait.php
+++ b/system/HTTP/RequestTrait.php
@@ -273,7 +273,6 @@ public function fetchGlobal(string $method, $index = null, ?int $filter = null,
             $value = $this->globals[$method][$index] ?? null;
         }
 
-        // @phpstan-ignore-next-line
         if (is_array($value)
             && (
                 $filter !== FILTER_DEFAULT
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index c7bdbb135354..f9e9d34c277d 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -625,7 +625,7 @@ public function setAuthority(string $str)
 
         if (empty($parts['host']) && $parts['path'] !== '') {
             $parts['host'] = $parts['path'];
-            unset($parts['path']); // @phpstan-ignore-line
+            unset($parts['path']);
         }
 
         $this->applyParts($parts);
diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
index 35e748978fbb..a9a2a938c36f 100644
--- a/system/Helpers/number_helper.php
+++ b/system/Helpers/number_helper.php
@@ -77,7 +77,7 @@ function number_to_amount($num, int $precision = 0, ?string $locale = null)
     {
         // Strip any formatting & ensure numeric input
         try {
-            $num = 0 + str_replace(',', '', $num); // @phpstan-ignore-line
+            $num = 0 + str_replace(',', '', $num);
         } catch (ErrorException $ee) {
             return false;
         }
diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index 5f0738421908..4e7e5d855302 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -564,7 +564,6 @@ function random_string(string $type = 'alnum', int $len = 8): string
                         break;
                 }
 
-                // @phpstan-ignore-next-line
                 return substr(str_shuffle(str_repeat($pool, ceil($len / strlen($pool)))), 0, $len);
 
             case 'md5':
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
index 8d089083eddd..42bcdc473619 100644
--- a/system/Helpers/url_helper.php
+++ b/system/Helpers/url_helper.php
@@ -352,7 +352,7 @@ function safe_mailto(string $email, string $title = '', $attributes = ''): strin
 
                 $temp[] = $ordinal;
 
-                if (count($temp) === $count) { // @phpstan-ignore-line
+                if (count($temp) === $count) {
                     $number = ($count === 3) ? (($temp[0] % 16) * 4096) + (($temp[1] % 64) * 64) + ($temp[2] % 64) : (($temp[0] % 32) * 64) + ($temp[1] % 64);
                     $x[]    = '|' . $number;
                     $count  = 1;
diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php
index 5ec6a23cc4f7..37bd168ead02 100644
--- a/system/Images/Handlers/ImageMagickHandler.php
+++ b/system/Images/Handlers/ImageMagickHandler.php
@@ -384,10 +384,10 @@ protected function _text(string $text, array $options = [])
                     break;
             }
 
-            $xAxis = $xAxis >= 0 ? '+' . $xAxis : $xAxis; // @phpstan-ignore-line
-            $yAxis = $yAxis >= 0 ? '+' . $yAxis : $yAxis; // @phpstan-ignore-line
+            $xAxis = $xAxis >= 0 ? '+' . $xAxis : $xAxis;
+            $yAxis = $yAxis >= 0 ? '+' . $yAxis : $yAxis;
 
-            $cmd .= " -gravity {$gravity} -geometry {$xAxis}{$yAxis}"; // @phpstan-ignore-line
+            $cmd .= " -gravity {$gravity} -geometry {$xAxis}{$yAxis}";
         }
 
         // Color
diff --git a/system/Model.php b/system/Model.php
index 418b3057eeb9..32fa82fcff64 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -158,7 +158,7 @@ protected function doFind(bool $singleton, $id = null)
      */
     protected function doFindColumn(string $columnName)
     {
-        return $this->select($columnName)->asArray()->find(); // @phpstan-ignore-line
+        return $this->select($columnName)->asArray()->find();
     }
 
     /**
diff --git a/system/Router/Router.php b/system/Router/Router.php
index 621c54a5e9dd..5c4b3f0255d7 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -124,7 +124,6 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request
         $this->controller = $this->collection->getDefaultController();
         $this->method     = $this->collection->getDefaultMethod();
 
-        // @phpstan-ignore-next-line
         $this->collection->setHTTPVerb($request->getMethod() ?? strtolower($_SERVER['REQUEST_METHOD']));
     }
 
diff --git a/system/Session/Handlers/DatabaseHandler.php b/system/Session/Handlers/DatabaseHandler.php
index f0164d2dfc3c..dfaa472029fd 100644
--- a/system/Session/Handlers/DatabaseHandler.php
+++ b/system/Session/Handlers/DatabaseHandler.php
@@ -69,7 +69,6 @@ public function __construct(AppConfig $config, string $ipAddress)
             throw SessionException::forMissingDatabaseTable();
         }
 
-        // @phpstan-ignore-next-line
         $this->DBGroup = $config->sessionDBGroup ?? config(Database::class)->defaultGroup;
 
         $this->db = Database::connect($this->DBGroup);
diff --git a/system/Session/Handlers/RedisHandler.php b/system/Session/Handlers/RedisHandler.php
index ce6e7bde5180..93a601eade70 100644
--- a/system/Session/Handlers/RedisHandler.php
+++ b/system/Session/Handlers/RedisHandler.php
@@ -206,7 +206,6 @@ public function close(): bool
             try {
                 $pingReply = $this->redis->ping();
 
-                // @phpstan-ignore-next-line
                 if (($pingReply === true) || ($pingReply === '+PONG')) {
                     if (isset($this->lockKey)) {
                         $this->redis->del($this->lockKey);
diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
index 50a28e13d2da..e2c6eab609bb 100644
--- a/system/Test/CIUnitTestCase.php
+++ b/system/Test/CIUnitTestCase.php
@@ -231,7 +231,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        if (! $this->app) { // @phpstan-ignore-line
+        if (! $this->app) {
             $this->app = $this->createApplication();
         }
 
diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
index 0fb013cb1820..d4369765f0ee 100644
--- a/system/Test/Fabricator.php
+++ b/system/Test/Fabricator.php
@@ -510,12 +510,12 @@ protected function createMock(?int $count = null)
         $fields = [];
 
         if (! empty($this->model->useTimestamps)) {
-            $fields[$this->model->createdField] = $datetime; // @phpstan-ignore-line
-            $fields[$this->model->updatedField] = $datetime; // @phpstan-ignore-line
+            $fields[$this->model->createdField] = $datetime;
+            $fields[$this->model->updatedField] = $datetime;
         }
 
         if (! empty($this->model->useSoftDeletes)) {
-            $fields[$this->model->deletedField] = null; // @phpstan-ignore-line
+            $fields[$this->model->deletedField] = null;
         }
 
         // Iterate over new entities and add the necessary fields
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index 87423271cd63..d1a75edb8f62 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -349,7 +349,7 @@ protected function populateGlobals(string $method, Request $request, ?array $par
         // otherwise set it from the URL.
         $get = ! empty($params) && $method === 'get'
             ? $params
-            : $this->getPrivateProperty($request->uri, 'query'); // @phpstan-ignore-line
+            : $this->getPrivateProperty($request->uri, 'query');
 
         $request->setGlobal('get', $get);
         if ($method !== 'get') {
diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php
index b44ff8c65491..afb93376b9a0 100644
--- a/system/Test/FeatureTestTrait.php
+++ b/system/Test/FeatureTestTrait.php
@@ -344,7 +344,7 @@ protected function populateGlobals(string $method, Request $request, ?array $par
         // otherwise set it from the URL.
         $get = ! empty($params) && $method === 'get'
             ? $params
-            : $this->getPrivateProperty($request->uri, 'query'); // @phpstan-ignore-line
+            : $this->getPrivateProperty($request->uri, 'query');
 
         $request->setGlobal('get', $get);
         if ($method !== 'get') {
diff --git a/system/Test/Mock/MockConnection.php b/system/Test/Mock/MockConnection.php
index 78bd405babad..c9d03e7638d6 100644
--- a/system/Test/Mock/MockConnection.php
+++ b/system/Test/Mock/MockConnection.php
@@ -166,7 +166,7 @@ public function error(): array
      */
     public function insertID(): int
     {
-        return $this->connID->insert_id; // @phpstan-ignore-line
+        return $this->connID->insert_id;
     }
 
     /**

From a0b8140b4f5b5ebe1cb7cb1b7d4b751e97fb174e Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Mon, 13 Dec 2021 20:23:40 +0800
Subject: [PATCH 0981/2325] Test phpstan on PHP 8.0+

---
 .github/workflows/test-phpstan.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-phpstan.yml b/.github/workflows/test-phpstan.yml
index 0e59e3bf4e3a..eceb97524605 100644
--- a/.github/workflows/test-phpstan.yml
+++ b/.github/workflows/test-phpstan.yml
@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.0']
+        php-versions: ['8.0', '8.1']
     steps:
       - name: Checkout
         uses: actions/checkout@v2

From 01ca5857fb3b64982670b1f808dad6129476cf0c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 14 Dec 2021 10:29:38 +0900
Subject: [PATCH 0982/2325] docs: use BaseController instead of Controller

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

diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
index 42bda88c5d06..396c74255962 100644
--- a/user_guide_src/source/tutorial/news_section.rst
+++ b/user_guide_src/source/tutorial/news_section.rst
@@ -142,9 +142,8 @@ a new ``News`` controller is defined. Create the new controller at
     namespace App\Controllers;
 
     use App\Models\NewsModel;
-    use CodeIgniter\Controller;
 
-    class News extends Controller
+    class News extends BaseController
     {
         public function index()
         {

From 2f8d694d77717e5166a100b6cbda8a47660bb779 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 14 Dec 2021 13:13:41 +0900
Subject: [PATCH 0983/2325] docs: improve text decoration

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

diff --git a/user_guide_src/source/incoming/content_negotiation.rst b/user_guide_src/source/incoming/content_negotiation.rst
index 11940b82092a..8122a4a910b5 100644
--- a/user_guide_src/source/incoming/content_negotiation.rst
+++ b/user_guide_src/source/incoming/content_negotiation.rst
@@ -60,7 +60,7 @@ be able to return data as raw HTML, JSON, or XML. This list should be provided i
     $format = $negotiate->media($supported);
 
 In this case, both the client and the server can agree on formatting the data as JSON so 'json' is returned from
-the negotiate method. By default, if no match is found, the first element in the $supported array would be returned.
+the negotiate method. By default, if no match is found, the first element in the ``$supported`` array would be returned.
 In some cases, though, you might need to enforce the format to be a strict match. If you pass ``true`` as the
 final value, it will return an empty string if no match is found::
 
@@ -92,7 +92,7 @@ and German you would do something like::
     $lang = $negotiate->language($supported);
 
 In this example, 'en' would be returned as the current language. If no match is found, it will return the first element
-in the $supported array, so that should always be the preferred language.
+in the ``$supported`` array, so that should always be the preferred language.
 
 Encoding
 ========

From 5956d9821fd44b4c5ee882141b1399e273f8c710 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Dec 2021 15:02:53 +0000
Subject: [PATCH 0984/2325] chore(deps-dev): update rector/rector requirement
 from 0.12.7 to 0.12.8

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

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

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

diff --git a/composer.json b/composer.json
index ab1c999190bf..38ddfd6ef3c7 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.7"
+        "rector/rector": "0.12.8"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From eaab880886eff83b87734087b258754fe3d73ce5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 15 Dec 2021 10:50:31 +0900
Subject: [PATCH 0985/2325] docs: fix view() $options explanation

---
 user_guide_src/source/general/common_functions.rst | 9 +++++----
 user_guide_src/source/testing/debugging.rst        | 2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index c1cdb038984a..f4b61548f4da 100755
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -179,11 +179,12 @@ Service Accessors
     a convenience method that can be used in Controllers,
     libraries, and routed closures.
 
-    Currently, only one option is available for use within the `$options` array, `saveData` which specifies
-    that data will persistent between multiple calls to `view()` within the same request. By default, the
-    data for that view is forgotten after displaying that single view file.
+    Currently, only two options are available for use within the ``$options`` array:
 
-    The $option array is provided primarily to facilitate third-party integrations with
+    - ``saveData`` specifies that data will persistent between multiple calls to ``view()`` within the same request. If you do not want the data to be persisted, specify false.
+    - ``debug`` can be set to false to disable the addition of debug code for :ref:`Debug Toolbar <the-debug-toolbar>`.
+
+    The ``$option`` array is provided primarily to facilitate third-party integrations with
     libraries like Twig.
 
     Example::
diff --git a/user_guide_src/source/testing/debugging.rst b/user_guide_src/source/testing/debugging.rst
index 3e456d118793..22c77141e116 100644
--- a/user_guide_src/source/testing/debugging.rst
+++ b/user_guide_src/source/testing/debugging.rst
@@ -45,6 +45,8 @@ This provides a backtrace to the current execution point, with Kint's own unique
 
 For more information, see `Kint's page <https://kint-php.github.io/kint//>`_.
 
+.. _the-debug-toolbar:
+
 =================
 The Debug Toolbar
 =================

From 36d9c137e95300636da4232012746d40d1a06f05 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 15 Dec 2021 11:03:56 +0900
Subject: [PATCH 0986/2325] docs: add sample code

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

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 97c2b1aa1fdd..954fc8ca24b1 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -259,7 +259,13 @@ This would handle the URL at ``admin/users/list``. Note that options passed to t
 At some point, you may want to group routes for the purpose of applying filters or other route
 config options like namespace, subdomain, etc. Without necessarily needing to add a prefix to the group, you can pass
 an empty string in place of the prefix and the routes in the group will be routed as though the group never existed but with the
-given route config options.
+given route config options::
+
+    $routes->group('', ['namespace' => 'Myth\Auth\Controllers'], function ($routes) {
+        $routes->get('login', 'AuthController::login', ['as' => 'login']);
+        $routes->post('login', 'AuthController::attemptLogin');
+        $routes->get('logout', 'AuthController::logout');
+    });
 
 Environment Restrictions
 ========================

From c890ef7bc56b79e416a52b52a7d44455c44d2257 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 15 Dec 2021 11:23:52 +0900
Subject: [PATCH 0987/2325] docs: fix sample code

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/incoming/routing.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 954fc8ca24b1..9d4ab0d88998 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -261,7 +261,7 @@ config options like namespace, subdomain, etc. Without necessarily needing to ad
 an empty string in place of the prefix and the routes in the group will be routed as though the group never existed but with the
 given route config options::
 
-    $routes->group('', ['namespace' => 'Myth\Auth\Controllers'], function ($routes) {
+    $routes->group('', ['namespace' => 'Myth\Auth\Controllers'], static function ($routes) {
         $routes->get('login', 'AuthController::login', ['as' => 'login']);
         $routes->post('login', 'AuthController::attemptLogin');
         $routes->get('logout', 'AuthController::logout');

From f7c42268f6a99ab4cb3c503b2b30389ed371fe4a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 14 Dec 2021 09:29:43 +0900
Subject: [PATCH 0988/2325] fix: use $this->time() instead of time()

For testing, we need to use testTime in all places.
---
 system/Throttle/Throttler.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/system/Throttle/Throttler.php b/system/Throttle/Throttler.php
index 0bdf8a95522d..5154f386439b 100644
--- a/system/Throttle/Throttler.php
+++ b/system/Throttle/Throttler.php
@@ -100,7 +100,7 @@ public function check(string $key, int $capacity, int $seconds, int $cost = 1):
             // If it hasn't been created, then we'll set it to the maximum
             // capacity - 1, and save it to the cache.
             $this->cache->save($tokenName, $capacity - $cost, $seconds);
-            $this->cache->save($tokenName . 'Time', time(), $seconds);
+            $this->cache->save($tokenName . 'Time', $this->time(), $seconds);
 
             return true;
         }
@@ -129,7 +129,7 @@ public function check(string $key, int $capacity, int $seconds, int $cost = 1):
         // we need to decrement the number of available tokens.
         if ($tokens >= 1) {
             $this->cache->save($tokenName, $tokens - $cost, $seconds);
-            $this->cache->save($tokenName . 'Time', time(), $seconds);
+            $this->cache->save($tokenName . 'Time', $this->time(), $seconds);
 
             return true;
         }
@@ -164,6 +164,8 @@ public function setTestTime(int $time)
 
     /**
      * Return the test time, defaulting to current.
+     *
+     * @TODO should be private
      */
     public function time(): int
     {

From f8c22452d3ebce55460d0add9b82481b827671c3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 14 Dec 2021 09:31:40 +0900
Subject: [PATCH 0989/2325] test: fix time dependent test

Fixes #5444
---
 tests/system/Throttle/ThrottleTest.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php
index a7905a2f59bf..498cbf0673d5 100644
--- a/tests/system/Throttle/ThrottleTest.php
+++ b/tests/system/Throttle/ThrottleTest.php
@@ -127,7 +127,10 @@ public function testOverload()
 
     public function testFlooding()
     {
+        $time = 1639441295;
+
         $throttler = new Throttler($this->cache);
+        $throttler->setTestTime($time);
 
         $rate = 60; // allow 1 per second after the bucket is emptied
         $cost = 1;
@@ -141,7 +144,7 @@ public function testFlooding()
         $this->assertFalse($throttler->check('127.0.0.1', $rate, MINUTE, $cost));
         $this->assertSame(0, $this->cache->get('throttler_127.0.0.1'));
 
-        $throttler = $throttler->setTestTime(strtotime('+10 seconds'));
+        $throttler = $throttler->setTestTime($time + 10);
 
         $this->assertTrue($throttler->check('127.0.0.1', $rate, MINUTE, 0));
         $this->assertSame(10.0, round($this->cache->get('throttler_127.0.0.1')));

From 0ca3ef9aa722799b8120abf3edc2b2b5ddc8bdc0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 16 Dec 2021 10:39:11 +0900
Subject: [PATCH 0990/2325] docs: add InvalidChars filter explanation

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

diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index 096d1020f77f..cb62defe02a3 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -204,6 +204,14 @@ The filters bundled with CodeIgniter4 are: ``Honeypot``, ``CSRF``, ``InvalidChar
 
 .. note:: The filters are executed in the order defined in the config file. However, if enabled, ``DebugToolbar`` is always executed last because it should be able to capture everything that happens in the other filters.
 
+InvalidChars
+=============
+
+This filter checks if user input data (``$_GET``, ``$_POST``, ``$_COOKIE``, ``php://input``) do not contain the following characters:
+
+- invalid UTF-8 characters
+- control characters except line break and tab code
+
 SecureHeaders
 =============
 

From 1ebc173f9519875518ac47b750e8f33ca6337c0d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 16 Dec 2021 10:39:45 +0900
Subject: [PATCH 0991/2325] docs: add links to other pages

---
 user_guide_src/source/incoming/filters.rst   | 2 +-
 user_guide_src/source/libraries/security.rst | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index cb62defe02a3..b8b16bb1c9ce 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -200,7 +200,7 @@ In this example, the array ``['dual', 'noreturn']`` will be passed in ``$argumen
 Provided Filters
 ****************
 
-The filters bundled with CodeIgniter4 are: ``Honeypot``, ``CSRF``, ``InvalidChars``, ``SecureHeaders``, and ``DebugToolbar``.
+The filters bundled with CodeIgniter4 are: :doc:`Honeypot <../libraries/honeypot>`, :ref:`CSRF <cross-site-request-forgery>`, ``InvalidChars``, ``SecureHeaders``, and :ref:`DebugToolbar <the-debug-toolbar>`.
 
 .. note:: The filters are executed in the order defined in the config file. However, if enabled, ``DebugToolbar`` is always executed last because it should be able to capture everything that happens in the other filters.
 
diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index b0a11af06b6d..00c6173ee4f3 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -19,6 +19,8 @@ If you find a case where you do need direct access though, you may load it throu
 
     $security = \Config\Services::security();
 
+.. _cross-site-request-forgery:
+
 *********************************
 Cross-site request forgery (CSRF)
 *********************************

From 0924a0c965dc760c89cc367ad7da0a9d1498bc1f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 16 Dec 2021 11:26:09 +0900
Subject: [PATCH 0992/2325] docs: change TOC depth 2 or more

---
 user_guide_src/source/changelogs/v4.1.5.rst                  | 2 +-
 user_guide_src/source/dbmgmt/migration.rst                   | 3 ++-
 user_guide_src/source/helpers/array_helper.rst               | 1 +
 user_guide_src/source/helpers/cookie_helper.rst              | 3 ++-
 user_guide_src/source/helpers/date_helper.rst                | 3 ++-
 user_guide_src/source/helpers/filesystem_helper.rst          | 3 ++-
 user_guide_src/source/helpers/form_helper.rst                | 3 ++-
 user_guide_src/source/helpers/html_helper.rst                | 1 +
 user_guide_src/source/helpers/inflector_helper.rst           | 3 ++-
 user_guide_src/source/helpers/number_helper.rst              | 3 ++-
 user_guide_src/source/helpers/security_helper.rst            | 3 ++-
 user_guide_src/source/helpers/test_helper.rst                | 3 ++-
 user_guide_src/source/helpers/text_helper.rst                | 3 ++-
 user_guide_src/source/helpers/url_helper.rst                 | 3 ++-
 user_guide_src/source/helpers/xml_helper.rst                 | 3 ++-
 user_guide_src/source/installation/installing_composer.rst   | 2 +-
 user_guide_src/source/installation/installing_manual.rst     | 4 ++++
 user_guide_src/source/installation/running.rst               | 2 +-
 user_guide_src/source/installation/upgrade_415.rst           | 2 +-
 user_guide_src/source/installation/upgrade_configuration.rst | 2 +-
 user_guide_src/source/installation/upgrade_controllers.rst   | 2 +-
 user_guide_src/source/installation/upgrade_database.rst      | 2 +-
 user_guide_src/source/installation/upgrade_emails.rst        | 2 +-
 user_guide_src/source/installation/upgrade_encryption.rst    | 2 +-
 user_guide_src/source/installation/upgrade_file_upload.rst   | 2 +-
 user_guide_src/source/installation/upgrade_html_tables.rst   | 2 +-
 user_guide_src/source/installation/upgrade_localization.rst  | 2 +-
 user_guide_src/source/installation/upgrade_migrations.rst    | 2 +-
 user_guide_src/source/installation/upgrade_models.rst        | 2 +-
 user_guide_src/source/installation/upgrade_pagination.rst    | 2 +-
 user_guide_src/source/installation/upgrade_responses.rst     | 2 +-
 user_guide_src/source/installation/upgrade_routing.rst       | 2 +-
 user_guide_src/source/installation/upgrade_security.rst      | 2 +-
 user_guide_src/source/installation/upgrade_sessions.rst      | 2 +-
 user_guide_src/source/installation/upgrade_validations.rst   | 2 +-
 user_guide_src/source/installation/upgrade_view_parser.rst   | 2 +-
 user_guide_src/source/installation/upgrade_views.rst         | 2 +-
 user_guide_src/source/libraries/encryption.rst               | 3 ++-
 user_guide_src/source/libraries/time.rst                     | 2 +-
 user_guide_src/source/outgoing/table.rst                     | 3 ++-
 user_guide_src/source/testing/mocking.rst                    | 2 +-
 41 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.1.5.rst b/user_guide_src/source/changelogs/v4.1.5.rst
index 67589933074f..1ef2ec8775a0 100644
--- a/user_guide_src/source/changelogs/v4.1.5.rst
+++ b/user_guide_src/source/changelogs/v4.1.5.rst
@@ -7,7 +7,7 @@ Release Date: November 8, 2021
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 BREAKING
 ========
diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst
index e7bd41f34bc0..d88d3e226118 100644
--- a/user_guide_src/source/dbmgmt/migration.rst
+++ b/user_guide_src/source/dbmgmt/migration.rst
@@ -15,7 +15,8 @@ state. You can also use ``$migration->setNamespace(null)->latest()`` to
 include migrations from all namespaces.
 
 .. contents::
-  :local:
+    :local:
+    :depth: 2
 
 ********************
 Migration file names
diff --git a/user_guide_src/source/helpers/array_helper.rst b/user_guide_src/source/helpers/array_helper.rst
index 2457790e4ad6..21e798a1ee2e 100644
--- a/user_guide_src/source/helpers/array_helper.rst
+++ b/user_guide_src/source/helpers/array_helper.rst
@@ -7,6 +7,7 @@ any of the existing functionality that PHP provides - unless it is to vastly sim
 
 .. contents::
     :local:
+    :depth: 2
 
 Loading this Helper
 ===================
diff --git a/user_guide_src/source/helpers/cookie_helper.rst b/user_guide_src/source/helpers/cookie_helper.rst
index c7df02f6461f..597adaa66c9a 100755
--- a/user_guide_src/source/helpers/cookie_helper.rst
+++ b/user_guide_src/source/helpers/cookie_helper.rst
@@ -6,7 +6,8 @@ The Cookie Helper file contains functions that assist in working with
 cookies.
 
 .. contents::
-  :local:
+    :local:
+    :depth: 2
 
 Loading this Helper
 ===================
diff --git a/user_guide_src/source/helpers/date_helper.rst b/user_guide_src/source/helpers/date_helper.rst
index 876a09bfbae6..cc97b46a9dbf 100644
--- a/user_guide_src/source/helpers/date_helper.rst
+++ b/user_guide_src/source/helpers/date_helper.rst
@@ -6,7 +6,8 @@ The Date Helper file contains functions that assist in working with
 dates.
 
 .. contents::
-  :local:
+    :local:
+    :depth: 2
 
 Loading this Helper
 ===================
diff --git a/user_guide_src/source/helpers/filesystem_helper.rst b/user_guide_src/source/helpers/filesystem_helper.rst
index 2d884aeee08d..c7a7e8ad22a2 100644
--- a/user_guide_src/source/helpers/filesystem_helper.rst
+++ b/user_guide_src/source/helpers/filesystem_helper.rst
@@ -6,7 +6,8 @@ The Directory Helper file contains functions that assist in working with
 directories.
 
 .. contents::
-  :local:
+    :local:
+    :depth: 2
 
 Loading this Helper
 ===================
diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst
index e8788de0a499..490a4cd3ccc1 100644
--- a/user_guide_src/source/helpers/form_helper.rst
+++ b/user_guide_src/source/helpers/form_helper.rst
@@ -6,7 +6,8 @@ The Form Helper file contains functions that assist in working with
 forms.
 
 .. contents::
-  :local:
+    :local:
+    :depth: 2
 
 Loading this Helper
 ===================
diff --git a/user_guide_src/source/helpers/html_helper.rst b/user_guide_src/source/helpers/html_helper.rst
index 978f0ea67f04..b73b3222f711 100755
--- a/user_guide_src/source/helpers/html_helper.rst
+++ b/user_guide_src/source/helpers/html_helper.rst
@@ -7,6 +7,7 @@ HTML.
 
 .. contents::
     :local:
+    :depth: 2
 
 Loading this Helper
 ===================
diff --git a/user_guide_src/source/helpers/inflector_helper.rst b/user_guide_src/source/helpers/inflector_helper.rst
index 31e603b2941d..924ee5b75559 100755
--- a/user_guide_src/source/helpers/inflector_helper.rst
+++ b/user_guide_src/source/helpers/inflector_helper.rst
@@ -6,7 +6,8 @@ The Inflector Helper file contains functions that permit you to change
 **English** words to plural, singular, camel case, etc.
 
 .. contents::
-  :local:
+    :local:
+    :depth: 2
 
 Loading this Helper
 ===================
diff --git a/user_guide_src/source/helpers/number_helper.rst b/user_guide_src/source/helpers/number_helper.rst
index be5be2a8018c..c085a59f8d12 100644
--- a/user_guide_src/source/helpers/number_helper.rst
+++ b/user_guide_src/source/helpers/number_helper.rst
@@ -6,7 +6,8 @@ The Number Helper file contains functions that help you work with
 numeric data in a locale-aware manner.
 
 .. contents::
-  :local:
+    :local:
+    :depth: 2
 
 Loading this Helper
 ===================
diff --git a/user_guide_src/source/helpers/security_helper.rst b/user_guide_src/source/helpers/security_helper.rst
index 2c3812a49def..b5ada61fe254 100644
--- a/user_guide_src/source/helpers/security_helper.rst
+++ b/user_guide_src/source/helpers/security_helper.rst
@@ -5,7 +5,8 @@ Security Helper
 The Security Helper file contains security related functions.
 
 .. contents::
-  :local:
+    :local:
+    :depth: 2
 
 Loading this Helper
 ===================
diff --git a/user_guide_src/source/helpers/test_helper.rst b/user_guide_src/source/helpers/test_helper.rst
index 4d98f005fb0a..f6a59d6e6c11 100644
--- a/user_guide_src/source/helpers/test_helper.rst
+++ b/user_guide_src/source/helpers/test_helper.rst
@@ -5,7 +5,8 @@ Test Helper
 The Test Helper file contains functions that assist in testing your project.
 
 .. contents::
-  :local:
+    :local:
+    :depth: 2
 
 Loading this Helper
 ===================
diff --git a/user_guide_src/source/helpers/text_helper.rst b/user_guide_src/source/helpers/text_helper.rst
index d83fb54835ae..0c842677a001 100755
--- a/user_guide_src/source/helpers/text_helper.rst
+++ b/user_guide_src/source/helpers/text_helper.rst
@@ -5,7 +5,8 @@ Text Helper
 The Text Helper file contains functions that assist in working with Text.
 
 .. contents::
-  :local:
+    :local:
+    :depth: 2
 
 Loading this Helper
 ===================
diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst
index 780becac13d8..b3f5daf5e439 100644
--- a/user_guide_src/source/helpers/url_helper.rst
+++ b/user_guide_src/source/helpers/url_helper.rst
@@ -5,7 +5,8 @@ URL Helper
 The URL Helper file contains functions that assist in working with URLs.
 
 .. contents::
-  :local:
+    :local:
+    :depth: 2
 
 Loading this Helper
 ===================
diff --git a/user_guide_src/source/helpers/xml_helper.rst b/user_guide_src/source/helpers/xml_helper.rst
index ebccaca79f91..ac72f26891f9 100644
--- a/user_guide_src/source/helpers/xml_helper.rst
+++ b/user_guide_src/source/helpers/xml_helper.rst
@@ -6,7 +6,8 @@ The XML Helper file contains functions that assist in working with XML
 data.
 
 .. contents::
-  :local:
+    :local:
+    :depth: 2
 
 Loading this Helper
 ===================
diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst
index 41b288c02037..ac1be8c5e12c 100644
--- a/user_guide_src/source/installation/installing_composer.rst
+++ b/user_guide_src/source/installation/installing_composer.rst
@@ -3,7 +3,7 @@ Composer Installation
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 Composer can be used in several ways to install CodeIgniter4 on your system.
 
diff --git a/user_guide_src/source/installation/installing_manual.rst b/user_guide_src/source/installation/installing_manual.rst
index c64f7dc5b212..daf7ea26c55f 100644
--- a/user_guide_src/source/installation/installing_manual.rst
+++ b/user_guide_src/source/installation/installing_manual.rst
@@ -1,6 +1,10 @@
 Manual Installation
 ###################
 
+.. contents::
+    :local:
+    :depth: 2
+
 The `CodeIgniter 4 framework <https://github.com/codeigniter4/framework>`_
 repository holds the released versions of the framework.
 It is intended for developers who do not wish to use Composer.
diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst
index f16bb7636672..8b2d0668a867 100644
--- a/user_guide_src/source/installation/running.rst
+++ b/user_guide_src/source/installation/running.rst
@@ -3,7 +3,7 @@ Running Your App
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 A CodeIgniter 4 app can be run in a number of different ways: hosted on a web server,
 using virtualization, or using CodeIgniter’s command line tool for testing.
diff --git a/user_guide_src/source/installation/upgrade_415.rst b/user_guide_src/source/installation/upgrade_415.rst
index a029724b3bfb..d995a58d8ffd 100644
--- a/user_guide_src/source/installation/upgrade_415.rst
+++ b/user_guide_src/source/installation/upgrade_415.rst
@@ -4,7 +4,7 @@ Upgrading from 4.1.4 to 4.1.5
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 Breaking Changes
 ================
diff --git a/user_guide_src/source/installation/upgrade_configuration.rst b/user_guide_src/source/installation/upgrade_configuration.rst
index cad74dc1e713..4592f2d1e001 100644
--- a/user_guide_src/source/installation/upgrade_configuration.rst
+++ b/user_guide_src/source/installation/upgrade_configuration.rst
@@ -3,7 +3,7 @@ Upgrade Configuration
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 Documentations
 ==============
diff --git a/user_guide_src/source/installation/upgrade_controllers.rst b/user_guide_src/source/installation/upgrade_controllers.rst
index 003cad92a295..44999b0dc6ec 100644
--- a/user_guide_src/source/installation/upgrade_controllers.rst
+++ b/user_guide_src/source/installation/upgrade_controllers.rst
@@ -3,7 +3,7 @@ Upgrade Controllers
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 Documentations
 ==============
diff --git a/user_guide_src/source/installation/upgrade_database.rst b/user_guide_src/source/installation/upgrade_database.rst
index f2f4ee65440f..666a51e97716 100644
--- a/user_guide_src/source/installation/upgrade_database.rst
+++ b/user_guide_src/source/installation/upgrade_database.rst
@@ -3,7 +3,7 @@ Upgrade Database
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 
 Documentations
diff --git a/user_guide_src/source/installation/upgrade_emails.rst b/user_guide_src/source/installation/upgrade_emails.rst
index d64a6bb2afea..0ce8b0792bc1 100644
--- a/user_guide_src/source/installation/upgrade_emails.rst
+++ b/user_guide_src/source/installation/upgrade_emails.rst
@@ -3,7 +3,7 @@ Upgrade Emails
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 
 Documentations
diff --git a/user_guide_src/source/installation/upgrade_encryption.rst b/user_guide_src/source/installation/upgrade_encryption.rst
index 003abc7ae218..04c857ba8f4e 100644
--- a/user_guide_src/source/installation/upgrade_encryption.rst
+++ b/user_guide_src/source/installation/upgrade_encryption.rst
@@ -3,7 +3,7 @@ Upgrade Encryption
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 
 Documentations
diff --git a/user_guide_src/source/installation/upgrade_file_upload.rst b/user_guide_src/source/installation/upgrade_file_upload.rst
index 6161e999f45e..6ad3c533a03a 100644
--- a/user_guide_src/source/installation/upgrade_file_upload.rst
+++ b/user_guide_src/source/installation/upgrade_file_upload.rst
@@ -3,7 +3,7 @@ Upgrade Working with Uploaded Files
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 
 Documentations
diff --git a/user_guide_src/source/installation/upgrade_html_tables.rst b/user_guide_src/source/installation/upgrade_html_tables.rst
index 9fc98e1fd838..715d80660876 100644
--- a/user_guide_src/source/installation/upgrade_html_tables.rst
+++ b/user_guide_src/source/installation/upgrade_html_tables.rst
@@ -3,7 +3,7 @@ Upgrade HTML Tables
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 
 Documentations
diff --git a/user_guide_src/source/installation/upgrade_localization.rst b/user_guide_src/source/installation/upgrade_localization.rst
index ca919c7cdb1b..cde7f81c0e31 100644
--- a/user_guide_src/source/installation/upgrade_localization.rst
+++ b/user_guide_src/source/installation/upgrade_localization.rst
@@ -3,7 +3,7 @@ Upgrade Localization
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 
 Documentations
diff --git a/user_guide_src/source/installation/upgrade_migrations.rst b/user_guide_src/source/installation/upgrade_migrations.rst
index ce1e92664d6d..90e1999e29f6 100644
--- a/user_guide_src/source/installation/upgrade_migrations.rst
+++ b/user_guide_src/source/installation/upgrade_migrations.rst
@@ -3,7 +3,7 @@ Upgrade Migrations
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 Documentations
 ==============
diff --git a/user_guide_src/source/installation/upgrade_models.rst b/user_guide_src/source/installation/upgrade_models.rst
index 12e0680e7320..b76bc10d67d5 100644
--- a/user_guide_src/source/installation/upgrade_models.rst
+++ b/user_guide_src/source/installation/upgrade_models.rst
@@ -3,7 +3,7 @@ Upgrade Models
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 Documentations
 ==============
diff --git a/user_guide_src/source/installation/upgrade_pagination.rst b/user_guide_src/source/installation/upgrade_pagination.rst
index 23c8564d1390..f952da0c5074 100644
--- a/user_guide_src/source/installation/upgrade_pagination.rst
+++ b/user_guide_src/source/installation/upgrade_pagination.rst
@@ -3,7 +3,7 @@ Upgrade Pagination
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 
 Documentations
diff --git a/user_guide_src/source/installation/upgrade_responses.rst b/user_guide_src/source/installation/upgrade_responses.rst
index aafcf9731faa..2f87f9ec50ef 100644
--- a/user_guide_src/source/installation/upgrade_responses.rst
+++ b/user_guide_src/source/installation/upgrade_responses.rst
@@ -3,7 +3,7 @@ Upgrade HTTP Responses
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 
 Documentations
diff --git a/user_guide_src/source/installation/upgrade_routing.rst b/user_guide_src/source/installation/upgrade_routing.rst
index 5ea14f16e74d..1d2540b2ded1 100644
--- a/user_guide_src/source/installation/upgrade_routing.rst
+++ b/user_guide_src/source/installation/upgrade_routing.rst
@@ -3,7 +3,7 @@ Upgrade Routing
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 
 Documentations
diff --git a/user_guide_src/source/installation/upgrade_security.rst b/user_guide_src/source/installation/upgrade_security.rst
index 12990ba63347..18b61209ec1b 100644
--- a/user_guide_src/source/installation/upgrade_security.rst
+++ b/user_guide_src/source/installation/upgrade_security.rst
@@ -3,7 +3,7 @@ Upgrade Security
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 
 Documentations
diff --git a/user_guide_src/source/installation/upgrade_sessions.rst b/user_guide_src/source/installation/upgrade_sessions.rst
index 23688000ff96..e935b08cfd16 100644
--- a/user_guide_src/source/installation/upgrade_sessions.rst
+++ b/user_guide_src/source/installation/upgrade_sessions.rst
@@ -3,7 +3,7 @@ Upgrade Sessions
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 
 Documentations
diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
index 083479d210db..825b8be9ccdf 100644
--- a/user_guide_src/source/installation/upgrade_validations.rst
+++ b/user_guide_src/source/installation/upgrade_validations.rst
@@ -3,7 +3,7 @@ Upgrade Validations
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 
 Documentations of Library
diff --git a/user_guide_src/source/installation/upgrade_view_parser.rst b/user_guide_src/source/installation/upgrade_view_parser.rst
index 96f821b81922..a970a5ab5e88 100644
--- a/user_guide_src/source/installation/upgrade_view_parser.rst
+++ b/user_guide_src/source/installation/upgrade_view_parser.rst
@@ -3,7 +3,7 @@ Upgrade View Parser
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 
 Documentations
diff --git a/user_guide_src/source/installation/upgrade_views.rst b/user_guide_src/source/installation/upgrade_views.rst
index 38da7443ea53..903ac6838be1 100644
--- a/user_guide_src/source/installation/upgrade_views.rst
+++ b/user_guide_src/source/installation/upgrade_views.rst
@@ -3,7 +3,7 @@ Upgrade Views
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 Documentations
 ==============
diff --git a/user_guide_src/source/libraries/encryption.rst b/user_guide_src/source/libraries/encryption.rst
index 2c45e7ad79d9..1a8bf834d94c 100644
--- a/user_guide_src/source/libraries/encryption.rst
+++ b/user_guide_src/source/libraries/encryption.rst
@@ -31,7 +31,8 @@ A more comprehensive package like `Halite <https://github.com/paragonie/halite>`
     been deprecated as of PHP 7.2.
 
 .. contents::
-  :local:
+    :local:
+    :depth: 2
 
 .. _usage:
 
diff --git a/user_guide_src/source/libraries/time.rst b/user_guide_src/source/libraries/time.rst
index 57ee4d4572d6..6e55cf87aed3 100644
--- a/user_guide_src/source/libraries/time.rst
+++ b/user_guide_src/source/libraries/time.rst
@@ -11,7 +11,7 @@ is the ``Time`` class and lives in the ``CodeIgniter\I18n`` namespace.
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 =============
 Instantiating
diff --git a/user_guide_src/source/outgoing/table.rst b/user_guide_src/source/outgoing/table.rst
index 0c8810fdb277..01b7dabe5cef 100644
--- a/user_guide_src/source/outgoing/table.rst
+++ b/user_guide_src/source/outgoing/table.rst
@@ -6,7 +6,8 @@ The Table Class provides methods that enable you to auto-generate HTML
 tables from arrays or database result sets.
 
 .. contents::
-  :local:
+    :local:
+    :depth: 2
 
 *********************
 Using the Table Class
diff --git a/user_guide_src/source/testing/mocking.rst b/user_guide_src/source/testing/mocking.rst
index 03b464cf6570..758f6c2f3a50 100644
--- a/user_guide_src/source/testing/mocking.rst
+++ b/user_guide_src/source/testing/mocking.rst
@@ -9,7 +9,7 @@ emails were sent correctly, etc.
 
 .. contents::
     :local:
-    :depth: 1
+    :depth: 2
 
 Cache
 =====

From e1085c81c44ce5c094d3d279b6472d6a49088070 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 16 Dec 2021 13:34:53 +0900
Subject: [PATCH 0993/2325] docs: fix $request->getMethod() return values

Now the method name is lower case by default.
---
 user_guide_src/source/concepts/http.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/concepts/http.rst b/user_guide_src/source/concepts/http.rst
index 8ae030fc1811..bc9bb25fe2b9 100644
--- a/user_guide_src/source/concepts/http.rst
+++ b/user_guide_src/source/concepts/http.rst
@@ -95,7 +95,7 @@ is an object-oriented representation of the HTTP request. It provides everything
     $request->getHeader('host');
     $request->getHeader('Content-Type');
 
-    $request->getMethod();  // GET, POST, PUT, etc
+    $request->getMethod();  // get, post, put, etc
 
 The request class does a lot of work in the background for you, that you never need to worry about.
 The `isAJAX()` and `isSecure()` methods check several different methods to determine the correct answer.

From 9a9ebccfe141e7cc289738d0bbe3932bbbdd1cfa Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 16 Dec 2021 13:38:32 +0900
Subject: [PATCH 0994/2325] docs: decorate method names with '``'

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

diff --git a/user_guide_src/source/concepts/http.rst b/user_guide_src/source/concepts/http.rst
index bc9bb25fe2b9..d5c82f2a1492 100644
--- a/user_guide_src/source/concepts/http.rst
+++ b/user_guide_src/source/concepts/http.rst
@@ -98,7 +98,7 @@ is an object-oriented representation of the HTTP request. It provides everything
     $request->getMethod();  // get, post, put, etc
 
 The request class does a lot of work in the background for you, that you never need to worry about.
-The `isAJAX()` and `isSecure()` methods check several different methods to determine the correct answer.
+The ``isAJAX()`` and ``isSecure()`` methods check several different methods to determine the correct answer.
 
 .. note:: The ``isAJAX()`` method depends on the ``X-Requested-With`` header, which in some cases is not sent by default in XHR requests via JavaScript (i.e., fetch). See the :doc:`AJAX Requests </general/ajax>` section on how to avoid this problem.
 

From 757a9d630ef7da7fc55d23454f762fe2bc4f1601 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 16 Dec 2021 16:33:54 +0900
Subject: [PATCH 0995/2325] refactor: update deprecated method

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

diff --git a/system/Entity/Cast/DatetimeCast.php b/system/Entity/Cast/DatetimeCast.php
index 4655b4e374e3..99f425a410be 100644
--- a/system/Entity/Cast/DatetimeCast.php
+++ b/system/Entity/Cast/DatetimeCast.php
@@ -32,7 +32,7 @@ public static function get($value, array $params = [])
         }
 
         if ($value instanceof DateTime) {
-            return Time::instance($value);
+            return Time::createFromInstance($value);
         }
 
         if (is_numeric($value)) {

From 986d46f12d332d39861cf1a4c2fe67a37420ac50 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Thu, 16 Dec 2021 22:51:51 -0600
Subject: [PATCH 0996/2325] Add final deploy workflow

---
 .github/workflows/deploy-userguide.yml | 53 ++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 .github/workflows/deploy-userguide.yml

diff --git a/.github/workflows/deploy-userguide.yml b/.github/workflows/deploy-userguide.yml
new file mode 100644
index 000000000000..0fc7900197a8
--- /dev/null
+++ b/.github/workflows/deploy-userguide.yml
@@ -0,0 +1,53 @@
+# When changes are pushed to the master branch,
+# build the current version of the User Guide
+# with Sphinx and deploy it to the production server.
+#
+# @todo Consolidate checkouts
+name: Deploy User Guide
+
+on:
+  push:
+    branches:
+      - 'master'
+    paths:
+      - 'user_guide_src/**'
+
+jobs:
+  build:
+    name: Deploy to production
+    if: (github.repository == 'codeigniter4/CodeIgniter4')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      # Build the latest User Guide
+      - name: Build with Sphinx
+        uses: ammaraskar/sphinx-action@0.4
+        with:
+          docs-folder: user_guide_src/
+
+      # Create an artifact of the html output
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: HTML Documentation
+          path: user_guide_src/build/html/
+
+      - name: Install SSH key
+        uses: shimataro/ssh-key-action@v2
+        with:
+          key: ${{ secrets.DEPLOY_KEY }}
+          name: id_rsa
+          known_hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
+
+      - name: Deploy to Webserver
+        uses: yeshan333/rsync-deploy-action@main
+        id: rsync-deploy-action
+        with:
+          ssh_login_username: ${{ secrets.DEPLOY_USER }}
+          remote_server_ip: ${{ secrets.DEPLOY_SSH_BOX }}
+          ssh_port: ${{ secrets.DEPLOY_PORT }}
+          ssh_private_key: ${{ secrets.DEPLOY_KEY }}
+          source_path: "./user_guide_src/build/html/*"
+          destination_path: "/home/public_html/userguides/v4/"

From 091b324102bc28b179514a7795128ad122f968a3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 17 Dec 2021 15:13:28 +0900
Subject: [PATCH 0997/2325] docs: remove environment-specific configuration
 files

There is no such a thing.
---
 user_guide_src/source/general/environments.rst | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/user_guide_src/source/general/environments.rst b/user_guide_src/source/general/environments.rst
index 057dd8e57dea..ca9c6efc1042 100644
--- a/user_guide_src/source/general/environments.rst
+++ b/user_guide_src/source/general/environments.rst
@@ -103,11 +103,3 @@ Conversely, setting the constant to 'production' will disable all error
 output. Disabling error reporting in production is a
 :doc:`good security practice </concepts/security>`.
 
-Configuration Files
--------------------
-
-Optionally, you can have CodeIgniter load environment-specific
-configuration files. This may be useful for managing things like
-differing API keys across multiple environments. This is described in
-more detail in the Handling Different Environments section of the
-:doc:`Working with Configuration Files </general/configuration>` documentation.

From b3ea655665e101d068c0df6edcf7309176397387 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 17 Dec 2021 15:22:14 +0900
Subject: [PATCH 0998/2325] docs: change text decoration

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

diff --git a/user_guide_src/source/general/environments.rst b/user_guide_src/source/general/environments.rst
index ca9c6efc1042..6abd709a00a9 100644
--- a/user_guide_src/source/general/environments.rst
+++ b/user_guide_src/source/general/environments.rst
@@ -97,7 +97,7 @@ is affected.
 Error Reporting
 ---------------
 
-Setting the ENVIRONMENT constant to a value of 'development' will cause
+Setting the ENVIRONMENT constant to a value of ``development`` will cause
 all PHP errors to be rendered to the browser when they occur.
 Conversely, setting the constant to 'production' will disable all error
 output. Disabling error reporting in production is a

From a81c37d95aea6c4e15785e86d4067f36146ef1f1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 17 Dec 2021 15:26:49 +0900
Subject: [PATCH 0999/2325] docs: fix JSONFormatter namespace

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

diff --git a/user_guide_src/source/outgoing/api_responses.rst b/user_guide_src/source/outgoing/api_responses.rst
index 99e89783f7d5..dd9f9593278f 100644
--- a/user_guide_src/source/outgoing/api_responses.rst
+++ b/user_guide_src/source/outgoing/api_responses.rst
@@ -113,7 +113,7 @@ support both JSON and XML::
     ];
 
 So, if your request asks for JSON formatted data in an **Accept** header, the data array you pass any of the
-``respond*`` or ``fail*`` methods will be formatted by the **CodeIgniter\\API\\JSONFormatter** class. The resulting
+``respond*`` or ``fail*`` methods will be formatted by the ``CodeIgniter\Format\JSONFormatter`` class. The resulting
 JSON data will be sent back to the client.
 
 Class Reference

From d8b2cdc0307a67740851bdf78e5766bec5344b22 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 17 Dec 2021 15:27:21 +0900
Subject: [PATCH 1000/2325] docs: change text decoration

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

diff --git a/user_guide_src/source/outgoing/api_responses.rst b/user_guide_src/source/outgoing/api_responses.rst
index dd9f9593278f..92eaa066f36f 100644
--- a/user_guide_src/source/outgoing/api_responses.rst
+++ b/user_guide_src/source/outgoing/api_responses.rst
@@ -104,7 +104,7 @@ type of response to return. If no matches are found between what the client requ
 format in this array is what will be returned.
 
 Next, you need to define the class that is used to format the array of data. This must be a fully qualified class
-name, and the class must implement **CodeIgniter\\Format\\FormatterInterface**. Formatters come out of the box that
+name, and the class must implement ``CodeIgniter\Format\FormatterInterface``. Formatters come out of the box that
 support both JSON and XML::
 
     public $formatters = [
@@ -240,7 +240,7 @@ Class Reference
     :param string $message: A custom "reason" message to return.
     :returns: The value of the Response object's send() method.
 
-    Unlike ``failUnauthorized``, this method should be used when the requested API endpoint is never allowed.
+    Unlike ``failUnauthorized()``, this method should be used when the requested API endpoint is never allowed.
     Unauthorized implies the client is encouraged to try again with different credentials. Forbidden means
     the client should not try again because it won't help. Status code is 403.
 

From 714235bf39517376c47126d37c77d140a7750391 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 18 Dec 2021 08:56:10 +0900
Subject: [PATCH 1001/2325] docs: change from note to warning, because it is a
 security matter

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

diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index 8bf3db46bb83..80c2f37d5c73 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -356,7 +356,7 @@ of the comparison operators you would normally, like ``==``, ``===``, ``!==``, `
         <h1>Welcome, User</h1>
     {endif}
 
-.. note:: In the background, conditionals are parsed using an **eval()**, so you must ensure that you take
+.. warning:: In the background, conditionals are parsed using an ``eval()``, so you must ensure that you take
     care with the user data that is used within conditionals, or you could open your application up to security risks.
 
 Escaping Data

From fec61fb2db116ea766219fde563523c0b2a12c6a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 18 Dec 2021 09:04:37 +0900
Subject: [PATCH 1002/2325] docs: change text decration

Code is decorated with '``'.
---
 .../source/outgoing/view_parser.rst           | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index 80c2f37d5c73..7070b1f8deac 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -53,9 +53,9 @@ can instantiate it directly::
     $parser = new \CodeIgniter\View\Parser();
 
 Then you can use any of the three standard rendering methods that it provides:
-**render(viewpath, options, save)**, **setVar(name, value, context)** and
-**setData(data, context)**. You will also be able to specify delimiters directly,
-through the **setDelimiters(left, right)** method.
+``render(viewpath, options, save)``, ``setVar(name, value, context)`` and
+``setData(data, context)``. You will also be able to specify delimiters directly,
+through the ``setDelimiters(left, right)`` method.
 
 Using the ``Parser``, your view templates are processed only by the Parser
 itself, and not like a conventional view PHP script. PHP code in such a script
@@ -221,12 +221,12 @@ method::
                 ->render('blog_template');
 
 If the array you are trying to loop over contains objects instead of arrays,
-the parser will first look for an ``asArray`` method on the object. If it exists,
+the parser will first look for an ``asArray()`` method on the object. If it exists,
 that method will be called and the resulting array is then looped over just as
-described above. If no ``asArray`` method exists, the object will be cast as
+described above. If no ``asArray()`` method exists, the object will be cast as
 an array and its public properties will be made available to the Parser.
 
-This is especially useful with the Entity classes, which has an asArray method
+This is especially useful with the Entity classes, which has an ``asArray()`` method
 that returns all public and protected properties (minus the _options property) and
 makes them available to the Parser.
 
@@ -262,8 +262,8 @@ A **blog_template.php** that might work for the above::
         </div>
     {/blog_entry}
 
-If you would like the other pseudo-variables accessible inside the "blog_entry"
-scope, then make sure that the "cascadeData" option is set to true.
+If you would like the other pseudo-variables accessible inside the ``blog_entry``
+scope, then make sure that the ``cascadeData`` option is set to true.
 
 Comments
 ========
@@ -362,9 +362,9 @@ of the comparison operators you would normally, like ``==``, ``===``, ``!==``, `
 Escaping Data
 =============
 
-By default, all variable substitution is escaped to help prevent XSS attacks on your pages. CodeIgniter's ``esc`` method
-supports several different contexts, like general **html**, when it's in an HTML **attr**, in **css**, etc. If nothing
-else is specified, the data will be assumed to be in an HTML context. You can specify the context used by using the **esc**
+By default, all variable substitution is escaped to help prevent XSS attacks on your pages. CodeIgniter's ``esc()`` method
+supports several different contexts, like general ``html``, when it's in an HTML ``attr``, in ``css``, etc. If nothing
+else is specified, the data will be assumed to be in an HTML context. You can specify the context used by using the ``esc()``
 filter::
 
     { user_styles | esc(css) }

From c9af04cf985b62d4caafaddf151b9a375e860fbc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 18 Dec 2021 09:41:31 +0900
Subject: [PATCH 1003/2325] docs: shorten the width of tables

---
 .../source/outgoing/view_parser.rst           | 144 +++++++++---------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index 7070b1f8deac..e182ce789b35 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -402,66 +402,65 @@ Provided Filters
 
 The following filters are available when using the parser:
 
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ **Filter**    + **Arguments**       + **Description**                                              + **Example**                         +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ abs           +                     + Displays the absolute value of a number.                     + { v|abs }                           +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ capitalize    +                     + Displays the string in sentence case: all lowercase          + { v|capitalize}                     +
-+               +                     + with firstletter capitalized.                                +                                     +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ date          + format (Y-m-d)      + A PHP **date**-compatible formatting string.                 + { v|date(Y-m-d) }                   +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ date_modify   + value to add        + A **strtotime** compatible string to modify the date,        + { v|date_modify(+1 day) }           +
-+               + / subtract          + like ``+5 day`` or ``-1 week``.                              +                                     +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ default       + default value       + Displays the default value if the variable is empty or       + { v|default(just in case) }         +
-+               +                     + undefined.                                                   +                                     +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ esc           + html, attr, css, js + Specifies the context to escape the data.                    + { v|esc(attr) }                     +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ excerpt       + phrase, radius      + Returns the text within a radius of words from a given       + { v|excerpt(green giant, 20) }      +
-+               +                     + phrase. Same as **excerpt** helper function.                 +                                     +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ highlight     + phrase              + Highlights a given phrase within the text using              + { v|highlight(view parser) }        +
-+               +                     + '<mark></mark>' tags.                                        +                                     +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ highlight_code+                     + Highlights code samples with HTML/CSS.                       + { v|highlight_code }                +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ limit_chars   + limit               + Limits the number of characters to $limit.                   + { v|limit_chars(100) }              +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ limit_words   + limit               + Limits the number of words to $limit.                        + { v|limit_words(20) }               +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ local_currency+ currency, locale    + Displays a localized version of a currency. "currency"       + { v|local_currency(EUR,en_US) }     +
-+               +                     + valueis any 3-letter ISO 4217 currency code.                 +                                     +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ local_number  + type, precision,    + Displays a localized version of a number. "type" can be      + { v|local_number(decimal,2,en_US) } +
-+               + locale              + one of: decimal, currency, percent, scientific, spellout,    +                                     +
-+               +                     + ordinal, duration.                                           +                                     +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ lower         +                     + Converts a string to lowercase.                              + { v|lower }                         +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ nl2br         +                     + Replaces all newline characters (\n) to an HTML <br/> tag.   + { v|nl2br }                         +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ number_format + places              + Wraps PHP **number_format** function for use within the      + { v|number_format(3) }              +
-+               +                     + parser.                                                      +                                     +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ prose         +                     + Takes a body of text and uses the **auto_typography()**      + { v|prose }                         +
-+               +                     + method to turn it into prettier, easier-to-read, prose.      +                                     +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ round         + places, type        + Rounds a number to the specified places. Types of **ceil**   + { v|round(3) } { v|round(ceil) }    +
-+               +                     + and **floor** can be passed to use those functions instead.  +                                     +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ strip_tags    + allowed chars       + Wraps PHP **strip_tags**. Can accept a string of allowed     + { v|strip_tags(<br>) }              +
-+               +                     + tags.                                                        +                                     +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ title         +                     + Displays a "title case" version of the string, with all      + { v|title }                         +
-+               +                     + lowercase, and each word capitalized.                        +                                     +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+ upper         +                     + Displays the string in all uppercase.                        + { v|upper }                         +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
-+               +                     +                                                              +                                     +
-+---------------+---------------------+--------------------------------------------------------------+-------------------------------------+
+================ ================= =========================================================== ======================================
+Filter           Arguments         Description                                                  Example
+================ ================= =========================================================== ======================================
+abs                                Displays the absolute value of a number.                    { v|abs }
+
+capitalize                         Displays the string in sentence case: all lowercase         { v|capitalize}
+                                   with firstletter capitalized.
+
+date              format (Y-m-d)   A PHP **date**-compatible formatting string.                { v|date(Y-m-d) }
+
+date_modify       value to add     A **strtotime** compatible string to modify the date,       { v|date_modify(+1 day) }
+                  / subtract       like ``+5 day`` or ``-1 week``.
+
+default           default value    Displays the default value if the variable is empty or      { v|default(just in case) }
+                                   undefined.
+
+esc               html, attr,      Specifies the context to escape the data.                   { v|esc(attr) }
+                  css, js
+
+excerpt           phrase, radius   Returns the text within a radius of words from a given      { v|excerpt(green giant, 20) }
+                                   phrase. Same as **excerpt** helper function.
+
+highlight         phrase           Highlights a given phrase within the text using             { v|highlight(view parser) }
+                                   '<mark></mark>' tags.
+
+highlight_code                     Highlights code samples with HTML/CSS.                      { v|highlight_code }
+
+limit_chars       limit            Limits the number of characters to $limit.                  { v|limit_chars(100) }
+
+limit_words       limit            Limits the number of words to $limit.                       { v|limit_words(20) }
+
+local_currency    currency, locale Displays a localized version of a currency. "currency"      { v|local_currency(EUR,en_US) }
+                                   valueis any 3-letter ISO 4217 currency code.
+
+local_number      type, precision, Displays a localized version of a number. "type" can be     { v|local_number(decimal,2,en_US) }
+                  locale           one of: decimal, currency, percent, scientific, spellout,
+                                   ordinal, duration.
+
+lower                              Converts a string to lowercase.                             { v|lower }
+
+nl2br                              Replaces all newline characters (\n) to an HTML <br/> tag.  { v|nl2br }
+
+number_format     places           Wraps PHP **number_format** function for use within the     { v|number_format(3) }
+                                   parser.
+
+prose                              Takes a body of text and uses the **auto_typography()**     { v|prose }
+                                   method to turn it into prettier, easier-to-read, prose.
+
+round             places, type     Rounds a number to the specified places. Types of **ceil**  { v|round(3) } { v|round(ceil) }
+                                   and **floor** can be passed to use those functions instead.
+
+strip_tags        allowed chars    Wraps PHP **strip_tags**. Can accept a string of allowed    { v|strip_tags(<br>) }
+                                   tags.
+
+title                              Displays a "title case" version of the string, with all     { v|title }
+                                   lowercase, and each word capitalized.
+
+upper                              Displays the string in all uppercase.                       { v|upper }
+================ ================= =========================================================== ======================================
 
 See `PHP's NumberFormatter <https://www.php.net/manual/en/numberformatter.create.php>`_ for details relevant to the
 "local_number" filter.
@@ -519,18 +518,19 @@ Provided Plugins
 
 The following plugins are available when using the parser:
 
-==================== ========================== ================================================================================== ================================================================
-Plugin               Arguments                  Description                                                                          Example
-==================== ========================== ================================================================================== ================================================================
-current_url                                     Alias for the current_url helper function.                                         {+ current_url +}
-previous_url                                    Alias for the previous_url helper function.                                          {+ previous_url +}
-siteURL                                         Alias for the site_url helper function.                                            {+ siteURL "login" +}
-mailto               email, title, attributes   Alias for the mailto helper function.                                                {+ mailto email=foo@example.com title="Stranger Things" +}
-safe_mailto          email, title, attributes   Alias for the safe_mailto helper function.                                           {+ safe_mailto email=foo@example.com title="Stranger Things" +}
-lang                 language string            Alias for the lang helper function.                                                   {+ lang number.terabyteAbbr +}
-validation_errors    fieldname(optional)        Returns either error string for the field (if specified) or all validation errors. {+ validation_errors +} , {+ validation_errors field="email" +}
-route                route name                 Alias for the route_to helper function.                                            {+ route "login" +}
-==================== ========================== ================================================================================== ================================================================
+================== ========================= ============================================ ================================================================
+Plugin             Arguments                 Description                                    Example
+================== ========================= ============================================ ================================================================
+current_url                                  Alias for the current_url helper function.   {+ current_url +}
+previous_url                                 Alias for the previous_url helper function.  {+ previous_url +}
+siteURL                                      Alias for the site_url helper function.      {+ siteURL "login" +}
+mailto             email, title, attributes  Alias for the mailto helper function.        {+ mailto email=foo@example.com title="Stranger Things" +}
+safe_mailto        email, title, attributes  Alias for the safe_mailto helper function.   {+ safe_mailto email=foo@example.com title="Stranger Things" +}
+lang               language string           Alias for the lang helper function.          {+ lang number.terabyteAbbr +}
+validation_errors  fieldname(optional)       Returns either error string for the field    {+ validation_errors +} , {+ validation_errors field="email" +}
+                                             (if specified) or all validation errors.
+route              route name                Alias for the route_to helper function.      {+ route "login" +}
+================== ========================= ============================================ ================================================================
 
 Registering a Plugin
 --------------------

From 3b1078f93aeb4d34f075817b81525078400ddb01 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 18 Dec 2021 10:35:36 +0900
Subject: [PATCH 1004/2325] docs: change text decoration

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

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index b29f6651d4eb..be46d861e747 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -527,7 +527,7 @@ or the value that was validated you can add the ``{field}``, ``{param}`` and ``{
 
     'min_length' => 'Supplied value ({value}) for {field} must have at least {param} characters.'
 
-On a field with the human name Username and a rule of min_length[6] with a value of “Pizza”, an error would display: “Supplied value (Pizza) for Username must have
+On a field with the human name Username and a rule of ``min_length[6]`` with a value of “Pizza”, an error would display: “Supplied value (Pizza) for Username must have
 at least 6 characters.”
 
 .. note:: If you pass the last parameter the labeled style error messages will be ignored.
@@ -643,11 +643,11 @@ short alias they can be referenced by. If we were to add our example file from a
 Specifying the Template
 =======================
 
-You can specify the template to use by passing it's alias as the first parameter in ``listErrors``::
+You can specify the template to use by passing it's alias as the first parameter in ``listErrors()``::
 
     <?= $validation->listErrors('my_list') ?>
 
-When showing field-specific errors, you can pass the alias as the second parameter to the ``showError`` method,
+When showing field-specific errors, you can pass the alias as the second parameter to the ``showError()`` method,
 right after the name of the field the error should belong to::
 
     <?= $validation->showError('username', 'my_single') ?>

From d16fec7fdf4def1b18d1f9c1c995ed03d149fb48 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 18 Dec 2021 10:39:52 +0900
Subject: [PATCH 1005/2325] docs: fix note explanation

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

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index be46d861e747..137da33afdee 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -530,7 +530,7 @@ or the value that was validated you can add the ``{field}``, ``{param}`` and ``{
 On a field with the human name Username and a rule of ``min_length[6]`` with a value of “Pizza”, an error would display: “Supplied value (Pizza) for Username must have
 at least 6 characters.”
 
-.. note:: If you pass the last parameter the labeled style error messages will be ignored.
+.. note:: When using label-style error messages, if you pass the second parameter to ``setRules()``, it will be overwritten with the value of the first parameter.
 
 Translation Of Messages And Validation Labels
 =============================================

From 6750eee38449c987b285c60ed85346bab3ee8a58 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 18 Dec 2021 10:41:44 +0900
Subject: [PATCH 1006/2325] docs: add warning about XSS risk

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

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

From d2f12fb8da231ba027e52b00555ea19d19e762f3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 18 Dec 2021 10:42:02 +0900
Subject: [PATCH 1007/2325] docs: remove uneeded '*'

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

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index ae2e48962f3b..960a1bce3dda 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -594,7 +594,7 @@ You can check to see if an error exists with the ``hasError()`` method. The only
     }
 
 Customizing Error Display
-************************************************
+*************************
 
 When you call ``$validation->listErrors()`` or ``$validation->showError()``, it loads a view file in the background
 that determines how the errors are displayed. By default, they display with a class of ``errors`` on the wrapping div.

From dc969c1f4272710b3dfa2386e91267dc1039e4cd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 18 Dec 2021 10:54:29 +0900
Subject: [PATCH 1008/2325] docs: fix directory inconsistency

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

diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst
index 489685a8c5ff..34928d628dbe 100644
--- a/user_guide_src/source/models/entities.rst
+++ b/user_guide_src/source/models/entities.rst
@@ -425,11 +425,11 @@ Custom casting
 You can define your own conversion types for getting and setting data.
 
 At first you need to create a handler class for your type.
-Let's say the class will be located in the **app/Entity/Cast** directory::
+Let's say the class will be located in the **app/Entities/Cast** directory::
 
     <?php
 
-    namespace App\Entity\Cast;
+    namespace App\Entities\Cast;
 
     use CodeIgniter\Entity\Cast\BaseCast;
 
@@ -464,7 +464,7 @@ Now you need to register it::
 
         // Bind the type to the handler
         protected $castHandlers = [
-            'base64' => \App\Entity\Cast\CastBase64::class,
+            'base64' => \App\Entities\Cast\CastBase64::class,
         ];
     }
 

From 31fb03b98571c5453d18c773bfe99b96c569cfc7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 15 Dec 2021 16:38:05 +0900
Subject: [PATCH 1009/2325] fix: does not show correct token time until 1 token
 is available

Fixes #5458
---
 system/Throttle/Throttler.php          | 30 +++++++++++++--------
 tests/system/Throttle/ThrottleTest.php | 36 ++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/system/Throttle/Throttler.php b/system/Throttle/Throttler.php
index 5154f386439b..28d08739e123 100644
--- a/system/Throttle/Throttler.php
+++ b/system/Throttle/Throttler.php
@@ -95,13 +95,21 @@ public function check(string $key, int $capacity, int $seconds, int $cost = 1):
     {
         $tokenName = $this->prefix . $key;
 
+        // Number of tokens to add back per second
+        $rate = $capacity / $seconds;
+        // Number of seconds to get one token
+        $refresh = 1 / $rate;
+
         // Check to see if the bucket has even been created yet.
         if (($tokens = $this->cache->get($tokenName)) === null) {
             // If it hasn't been created, then we'll set it to the maximum
             // capacity - 1, and save it to the cache.
-            $this->cache->save($tokenName, $capacity - $cost, $seconds);
+            $tokens = $capacity - $cost;
+            $this->cache->save($tokenName, $tokens, $seconds);
             $this->cache->save($tokenName . 'Time', $this->time(), $seconds);
 
+            $this->tokenTime = max(1, (int) $refresh);
+
             return true;
         }
 
@@ -110,15 +118,6 @@ public function check(string $key, int $capacity, int $seconds, int $cost = 1):
         $throttleTime = $this->cache->get($tokenName . 'Time');
         $elapsed      = $this->time() - $throttleTime;
 
-        // Number of tokens to add back per second
-        $rate = $capacity / $seconds;
-
-        // How many seconds till a new token is available.
-        // We must have a minimum wait of 1 second for a new token.
-        // Primarily stored to allow devs to report back to users.
-        $newTokenAvailable = (1 / $rate) - $elapsed;
-        $this->tokenTime   = max(1, $newTokenAvailable);
-
         // Add tokens based up on number per second that
         // should be refilled, then checked against capacity
         // to be sure the bucket didn't overflow.
@@ -128,12 +127,21 @@ public function check(string $key, int $capacity, int $seconds, int $cost = 1):
         // If $tokens >= 1, then we are safe to perform the action, but
         // we need to decrement the number of available tokens.
         if ($tokens >= 1) {
-            $this->cache->save($tokenName, $tokens - $cost, $seconds);
+            $tokens = $tokens - $cost;
+            $this->cache->save($tokenName, $tokens, $seconds);
             $this->cache->save($tokenName . 'Time', $this->time(), $seconds);
 
+            $this->tokenTime = max(1, (int) ($refresh - $elapsed));
+
             return true;
         }
 
+        // How many seconds till a new token is available.
+        // We must have a minimum wait of 1 second for a new token.
+        // Primarily stored to allow devs to report back to users.
+        $newTokenAvailable = (int) ($refresh - $elapsed - $refresh * $tokens);
+        $this->tokenTime   = max(1, $newTokenAvailable);
+
         return false;
     }
 
diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php
index 498cbf0673d5..930e34c5e184 100644
--- a/tests/system/Throttle/ThrottleTest.php
+++ b/tests/system/Throttle/ThrottleTest.php
@@ -45,6 +45,42 @@ public function testTokenTime()
         $this->assertGreaterThanOrEqual(1, $throttler->getTokenTime());
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5458
+     */
+    public function testTokenTimeCalculation()
+    {
+        $time = 1639441295;
+
+        $throttler = new Throttler($this->cache);
+        $throttler->setTestTime($time);
+
+        $capacity = 2;
+        $seconds = 200;
+
+        // refresh = 200 / 2 = 100 seconds
+        // refresh rate = 2 / 200 = 0.01 token per second
+
+        // token should be 2
+        $this->assertTrue($throttler->check('test', $capacity, $seconds));
+        // token should be 2 - 1 = 1
+        $this->assertSame(100, $throttler->getTokenTime(), 'Wrong token time');
+
+        // do nothing for 3 seconds
+        $throttler = $throttler->setTestTime($time + 3);
+
+        // token should be 1 + 3 * 0.01 = 1.03
+        $this->assertTrue($throttler->check('test', $capacity, $seconds));
+        // token should be 1.03 - 1 = 0.03
+        $this->assertSame(97, $throttler->getTokenTime(), 'Wrong token time');
+
+        $this->assertFalse($throttler->check('test', $capacity, $seconds));
+        // token should still be 0.03 because check failed
+
+        // expect remaining time: (1 - 0.03) * 100 = 97
+        $this->assertSame(97, $throttler->getTokenTime(), 'Wrong token time');
+    }
+
     public function testIPSavesBucket()
     {
         $throttler = new Throttler($this->cache);

From 10f772a4b93f2d18cbee03cb6ccd6cccda9a8636 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 15 Dec 2021 16:39:44 +0900
Subject: [PATCH 1010/2325] docs: update sample code in comment

---
 system/Throttle/Throttler.php          | 5 ++---
 tests/system/Throttle/ThrottleTest.php | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/system/Throttle/Throttler.php b/system/Throttle/Throttler.php
index 28d08739e123..239abd0d6d20 100644
--- a/system/Throttle/Throttler.php
+++ b/system/Throttle/Throttler.php
@@ -79,10 +79,9 @@ public function getTokenTime(): int
      *
      * Example:
      *
-     *  if (! $throttler->check($request->ipAddress(), 60, MINUTE))
-     * {
+     *  if (! $throttler->check($request->ipAddress(), 60, MINUTE)) {
      *      die('You submitted over 60 requests within a minute.');
-     * }
+     *  }
      *
      * @param string $key      The name to use as the "bucket" name.
      * @param int    $capacity The number of requests the "bucket" can hold
diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php
index 930e34c5e184..8da9e6fe4396 100644
--- a/tests/system/Throttle/ThrottleTest.php
+++ b/tests/system/Throttle/ThrottleTest.php
@@ -56,7 +56,7 @@ public function testTokenTimeCalculation()
         $throttler->setTestTime($time);
 
         $capacity = 2;
-        $seconds = 200;
+        $seconds  = 200;
 
         // refresh = 200 / 2 = 100 seconds
         // refresh rate = 2 / 200 = 0.01 token per second

From 47c4c9cdc7041725a6a911aabc77b1a1ed9f011a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 15 Dec 2021 21:49:28 +0900
Subject: [PATCH 1011/2325] fix: tokenTime calcuration

When check() returns false, tokenTime is 0.
---
 system/Throttle/Throttler.php          | 4 ++--
 tests/system/Throttle/ThrottleTest.php | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/system/Throttle/Throttler.php b/system/Throttle/Throttler.php
index 239abd0d6d20..89c32981a841 100644
--- a/system/Throttle/Throttler.php
+++ b/system/Throttle/Throttler.php
@@ -107,7 +107,7 @@ public function check(string $key, int $capacity, int $seconds, int $cost = 1):
             $this->cache->save($tokenName, $tokens, $seconds);
             $this->cache->save($tokenName . 'Time', $this->time(), $seconds);
 
-            $this->tokenTime = max(1, (int) $refresh);
+            $this->tokenTime = 0;
 
             return true;
         }
@@ -130,7 +130,7 @@ public function check(string $key, int $capacity, int $seconds, int $cost = 1):
             $this->cache->save($tokenName, $tokens, $seconds);
             $this->cache->save($tokenName . 'Time', $this->time(), $seconds);
 
-            $this->tokenTime = max(1, (int) ($refresh - $elapsed));
+            $this->tokenTime = 0;
 
             return true;
         }
diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php
index 8da9e6fe4396..cc8ccb82856d 100644
--- a/tests/system/Throttle/ThrottleTest.php
+++ b/tests/system/Throttle/ThrottleTest.php
@@ -36,11 +36,11 @@ public function testTokenTime()
         // set $rate
         $rate = 1;    // allow 1 request per minute
 
-        // first check just creates a bucket, so tokenTime should be 0
+        // When the first check you have a token, so tokenTime should be 0
         $throttler->check('127.0.0.1', $rate, MINUTE);
         $this->assertSame(0, $throttler->getTokenTime());
 
-        // additional check affects tokenTime, so tokenTime should be 1 or greater
+        // When additional check you don't have one token, so tokenTime should be 1 or greater
         $throttler->check('127.0.0.1', $rate, MINUTE);
         $this->assertGreaterThanOrEqual(1, $throttler->getTokenTime());
     }
@@ -64,7 +64,7 @@ public function testTokenTimeCalculation()
         // token should be 2
         $this->assertTrue($throttler->check('test', $capacity, $seconds));
         // token should be 2 - 1 = 1
-        $this->assertSame(100, $throttler->getTokenTime(), 'Wrong token time');
+        $this->assertSame(0, $throttler->getTokenTime(), 'Wrong token time');
 
         // do nothing for 3 seconds
         $throttler = $throttler->setTestTime($time + 3);
@@ -72,7 +72,7 @@ public function testTokenTimeCalculation()
         // token should be 1 + 3 * 0.01 = 1.03
         $this->assertTrue($throttler->check('test', $capacity, $seconds));
         // token should be 1.03 - 1 = 0.03
-        $this->assertSame(97, $throttler->getTokenTime(), 'Wrong token time');
+        $this->assertSame(0, $throttler->getTokenTime(), 'Wrong token time');
 
         $this->assertFalse($throttler->check('test', $capacity, $seconds));
         // token should still be 0.03 because check failed

From cc901dbd138f3e866760d2ca77b602f8a5535845 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 19 Dec 2021 16:14:04 +0900
Subject: [PATCH 1012/2325] docs: add views()'s option `cache`

---
 user_guide_src/source/general/common_functions.rst | 3 ++-
 user_guide_src/source/outgoing/views.rst           | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index f4b61548f4da..b9b21e29ba38 100755
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -179,9 +179,10 @@ Service Accessors
     a convenience method that can be used in Controllers,
     libraries, and routed closures.
 
-    Currently, only two options are available for use within the ``$options`` array:
+    Currently, these options are available for use within the ``$options`` array:
 
     - ``saveData`` specifies that data will persistent between multiple calls to ``view()`` within the same request. If you do not want the data to be persisted, specify false.
+    - ``cache`` specifies the number of seconds to cache the view for. See :ref:`caching-views` for the details.
     - ``debug`` can be set to false to disable the addition of debug code for :ref:`Debug Toolbar <the-debug-toolbar>`.
 
     The ``$option`` array is provided primarily to facilitate third-party integrations with
diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst
index 5cc77d05a3a4..96e350216ce7 100644
--- a/user_guide_src/source/outgoing/views.rst
+++ b/user_guide_src/source/outgoing/views.rst
@@ -113,6 +113,8 @@ example, you could load the **blog_view.php** file from **example/blog/Views** b
 
     echo view('Example\Blog\Views\blog_view');
 
+.. _caching-views:
+
 Caching Views
 =============
 

From 95bad7cb0464c22179e522063903ea59ffb25c1c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 19 Dec 2021 16:24:07 +0900
Subject: [PATCH 1013/2325] chore: update Kint to ^4.0

---
 composer.json                                 |   2 +-
 system/ThirdParty/Kint/CallFinder.php         | 124 ++++++---
 system/ThirdParty/Kint/Kint.php               | 256 ++++++++----------
 .../Kint/Parser/ArrayLimitPlugin.php          | 142 ++++++++++
 .../Kint/Parser/ArrayObjectPlugin.php         |   6 +-
 .../ThirdParty/Kint/Parser/Base64Plugin.php   |  11 +-
 .../ThirdParty/Kint/Parser/BinaryPlugin.php   |  10 +-
 .../Kint/Parser/BlacklistPlugin.php           |  74 +----
 .../Kint/Parser/ClassMethodsPlugin.php        |  26 +-
 .../Kint/Parser/ClassStaticsPlugin.php        |  46 ++--
 .../ThirdParty/Kint/Parser/ClosurePlugin.php  |  26 +-
 system/ThirdParty/Kint/Parser/ColorPlugin.php |   8 +-
 .../Kint/Parser/DOMDocumentPlugin.php         | 107 ++++----
 .../ThirdParty/Kint/Parser/DateTimePlugin.php |  10 +-
 .../ThirdParty/Kint/Parser/FsPathPlugin.php   |  10 +-
 .../ThirdParty/Kint/Parser/IteratorPlugin.php |  25 +-
 system/ThirdParty/Kint/Parser/JsonPlugin.php  |  10 +-
 .../Kint/Parser/MicrotimePlugin.php           |  10 +-
 .../ThirdParty/Kint/Parser/MysqliPlugin.php   |  98 +++++--
 system/ThirdParty/Kint/Parser/Parser.php      | 223 ++++++++-------
 system/ThirdParty/Kint/Parser/Plugin.php      |   6 +-
 system/ThirdParty/Kint/Parser/ProxyPlugin.php |   6 +-
 .../Kint/Parser/SerializePlugin.php           |  18 +-
 .../Kint/Parser/SimpleXMLElementPlugin.php    | 189 ++++++++-----
 .../Kint/Parser/SplFileInfoPlugin.php         |   8 +-
 .../Kint/Parser/SplObjectStoragePlugin.php    |   6 +-
 .../ThirdParty/Kint/Parser/StreamPlugin.php   |  23 +-
 system/ThirdParty/Kint/Parser/TablePlugin.php |   8 +-
 .../Kint/Parser/ThrowablePlugin.php           |  12 +-
 .../Kint/Parser/TimestampPlugin.php           |  12 +-
 .../ThirdParty/Kint/Parser/ToStringPlugin.php |  12 +-
 system/ThirdParty/Kint/Parser/TracePlugin.php |  46 +++-
 system/ThirdParty/Kint/Parser/XmlPlugin.php   |  31 ++-
 .../ThirdParty/Kint/Renderer/CliRenderer.php  |  18 +-
 .../Kint/Renderer/PlainRenderer.php           |  34 +--
 system/ThirdParty/Kint/Renderer/Renderer.php  |  52 ++--
 .../Kint/Renderer/Rich/ArrayLimitPlugin.php   |  36 +++
 .../Kint/Renderer/Rich/BinaryPlugin.php       |  15 +-
 .../Kint/Renderer/Rich/BlacklistPlugin.php    |   6 +-
 .../Kint/Renderer/Rich/CallablePlugin.php     |  40 +--
 .../Kint/Renderer/Rich/ClosurePlugin.php      |  10 +-
 .../Kint/Renderer/Rich/ColorPlugin.php        |  12 +-
 .../Kint/Renderer/Rich/DepthLimitPlugin.php   |   6 +-
 .../Kint/Renderer/Rich/DocstringPlugin.php    |  10 +-
 .../Kint/Renderer/Rich/MicrotimePlugin.php    |   6 +-
 .../ThirdParty/Kint/Renderer/Rich/Plugin.php  |   7 +-
 .../Kint/Renderer/Rich/RecursionPlugin.php    |   6 +-
 .../Renderer/Rich/SimpleXMLElementPlugin.php  |  20 +-
 .../Kint/Renderer/Rich/SourcePlugin.php       |   6 +-
 .../Kint/Renderer/Rich/TabPluginInterface.php |   7 +-
 .../Kint/Renderer/Rich/TablePlugin.php        |   8 +-
 .../Kint/Renderer/Rich/TimestampPlugin.php    |   2 +-
 .../Kint/Renderer/Rich/TraceFramePlugin.php   |  10 +-
 ...Interface.php => ValuePluginInterface.php} |   9 +-
 .../ThirdParty/Kint/Renderer/RichRenderer.php |  98 ++++---
 .../Kint/Renderer/Text/ArrayLimitPlugin.php   |  44 +++
 .../Kint/Renderer/Text/BlacklistPlugin.php    |   4 +-
 .../Kint/Renderer/Text/DepthLimitPlugin.php   |   4 +-
 .../Kint/Renderer/Text/MicrotimePlugin.php    |   8 +-
 .../ThirdParty/Kint/Renderer/Text/Plugin.php  |   7 +-
 .../Kint/Renderer/Text/RecursionPlugin.php    |   4 +-
 .../Kint/Renderer/Text/TracePlugin.php        |   8 +-
 .../ThirdParty/Kint/Renderer/TextRenderer.php |  36 +--
 system/ThirdParty/Kint/Utils.php              |  69 +++--
 .../BlobObject.php => Zval/BlobValue.php}     |  14 +-
 .../ClosureValue.php}                         |  10 +-
 .../DateTimeValue.php}                        |   6 +-
 .../InstanceValue.php}                        |  14 +-
 .../MethodObject.php => Zval/MethodValue.php} |  32 +--
 .../ParameterValue.php}                       |   7 +-
 .../Representation/ColorRepresentation.php    |  31 +--
 .../DocstringRepresentation.php               |   4 +-
 .../MicrotimeRepresentation.php               |   4 +-
 .../Representation/Representation.php         |   6 +-
 .../Representation/SourceRepresentation.php   |   6 +-
 .../SplFileInfoRepresentation.php             |  16 +-
 .../ResourceValue.php}                        |   6 +-
 .../Kint/Zval/SimpleXMLElementValue.php       |  48 ++++
 .../StreamObject.php => Zval/StreamValue.php} |   4 +-
 .../ThrowableValue.php}                       |   8 +-
 .../TraceFrameValue.php}                      |  31 ++-
 .../TraceObject.php => Zval/TraceValue.php}   |   6 +-
 .../BasicObject.php => Zval/Value.php}        |  28 +-
 system/ThirdParty/Kint/init.php               |  14 +-
 system/ThirdParty/Kint/init_helpers.php       |  16 +-
 .../Kint/resources/compiled/aante-light.css   |   2 +-
 .../Kint/resources/compiled/microtime.js      |   2 +-
 .../Kint/resources/compiled/original.css      |   2 +-
 .../Kint/resources/compiled/rich.js           |   2 +-
 .../Kint/resources/compiled/shared.js         |   2 +-
 .../resources/compiled/solarized-dark.css     |   2 +-
 .../Kint/resources/compiled/solarized.css     |   2 +-
 92 files changed, 1511 insertions(+), 1017 deletions(-)
 create mode 100644 system/ThirdParty/Kint/Parser/ArrayLimitPlugin.php
 create mode 100644 system/ThirdParty/Kint/Renderer/Rich/ArrayLimitPlugin.php
 rename system/ThirdParty/Kint/Renderer/Rich/{ObjectPluginInterface.php => ValuePluginInterface.php} (88%)
 create mode 100644 system/ThirdParty/Kint/Renderer/Text/ArrayLimitPlugin.php
 rename system/ThirdParty/Kint/{Object/BlobObject.php => Zval/BlobValue.php} (95%)
 rename system/ThirdParty/Kint/{Object/ClosureObject.php => Zval/ClosureValue.php} (91%)
 rename system/ThirdParty/Kint/{Object/DateTimeObject.php => Zval/DateTimeValue.php} (93%)
 rename system/ThirdParty/Kint/{Object/InstanceObject.php => Zval/InstanceValue.php} (88%)
 rename system/ThirdParty/Kint/{Object/MethodObject.php => Zval/MethodValue.php} (90%)
 rename system/ThirdParty/Kint/{Object/ParameterObject.php => Zval/ParameterValue.php} (95%)
 rename system/ThirdParty/Kint/{Object => Zval}/Representation/ColorRepresentation.php (96%)
 rename system/ThirdParty/Kint/{Object => Zval}/Representation/DocstringRepresentation.php (97%)
 rename system/ThirdParty/Kint/{Object => Zval}/Representation/MicrotimeRepresentation.php (96%)
 rename system/ThirdParty/Kint/{Object => Zval}/Representation/Representation.php (95%)
 rename system/ThirdParty/Kint/{Object => Zval}/Representation/SourceRepresentation.php (96%)
 rename system/ThirdParty/Kint/{Object => Zval}/Representation/SplFileInfoRepresentation.php (95%)
 rename system/ThirdParty/Kint/{Object/ResourceObject.php => Zval/ResourceValue.php} (93%)
 create mode 100644 system/ThirdParty/Kint/Zval/SimpleXMLElementValue.php
 rename system/ThirdParty/Kint/{Object/StreamObject.php => Zval/StreamValue.php} (96%)
 rename system/ThirdParty/Kint/{Object/ThrowableObject.php => Zval/ThrowableValue.php} (88%)
 rename system/ThirdParty/Kint/{Object/TraceFrameObject.php => Zval/TraceFrameValue.php} (81%)
 rename system/ThirdParty/Kint/{Object/TraceObject.php => Zval/TraceValue.php} (93%)
 rename system/ThirdParty/Kint/{Object/BasicObject.php => Zval/Value.php} (91%)

diff --git a/composer.json b/composer.json
index 38ddfd6ef3c7..330209cb21a6 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
         "ext-intl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "kint-php/kint": "^3.3",
+        "kint-php/kint": "^4.0",
         "laminas/laminas-escaper": "^2.9",
         "psr/log": "^1.1"
     },
diff --git a/system/ThirdParty/Kint/CallFinder.php b/system/ThirdParty/Kint/CallFinder.php
index e7192a815284..e77a6407f018 100644
--- a/system/ThirdParty/Kint/CallFinder.php
+++ b/system/ThirdParty/Kint/CallFinder.php
@@ -27,7 +27,7 @@
 
 class CallFinder
 {
-    private static $ignore = array(
+    private static $ignore = [
         T_CLOSE_TAG => true,
         T_COMMENT => true,
         T_DOC_COMMENT => true,
@@ -35,7 +35,7 @@ class CallFinder
         T_OPEN_TAG => true,
         T_OPEN_TAG_WITH_ECHO => true,
         T_WHITESPACE => true,
-    );
+    ];
 
     /**
      * Things we need to do specially for operator tokens:
@@ -43,17 +43,19 @@ class CallFinder
      * - Wrap the access path in parentheses if there
      *   are any of these in the final short parameter.
      */
-    private static $operator = array(
+    private static $operator = [
         T_AND_EQUAL => true,
         T_BOOLEAN_AND => true,
         T_BOOLEAN_OR => true,
         T_ARRAY_CAST => true,
         T_BOOL_CAST => true,
+        T_CLASS => true,
         T_CLONE => true,
         T_CONCAT_EQUAL => true,
         T_DEC => true,
         T_DIV_EQUAL => true,
         T_DOUBLE_CAST => true,
+        T_FUNCTION => true,
         T_INC => true,
         T_INCLUDE => true,
         T_INCLUDE_ONCE => true,
@@ -84,6 +86,9 @@ class CallFinder
         T_STRING_CAST => true,
         T_UNSET_CAST => true,
         T_XOR_EQUAL => true,
+        T_POW => true,
+        T_POW_EQUAL => true,
+        T_DOUBLE_ARROW => true,
         '!' => true,
         '%' => true,
         '&' => true,
@@ -100,9 +105,9 @@ class CallFinder
         '^' => true,
         '|' => true,
         '~' => true,
-    );
+    ];
 
-    private static $strip = array(
+    private static $strip = [
         '(' => true,
         ')' => true,
         '[' => true,
@@ -112,39 +117,43 @@ class CallFinder
         T_OBJECT_OPERATOR => true,
         T_DOUBLE_COLON => true,
         T_NS_SEPARATOR => true,
-    );
+    ];
+
+    private static $classcalls = [
+        T_DOUBLE_COLON => true,
+        T_OBJECT_OPERATOR => true,
+    ];
+
+    private static $namespace = [
+        T_STRING => true,
+    ];
 
     public static function getFunctionCalls($source, $line, $function)
     {
-        static $up = array(
+        static $up = [
             '(' => true,
             '[' => true,
             '{' => true,
             T_CURLY_OPEN => true,
             T_DOLLAR_OPEN_CURLY_BRACES => true,
-        );
-        static $down = array(
+        ];
+        static $down = [
             ')' => true,
             ']' => true,
             '}' => true,
-        );
-        static $modifiers = array(
+        ];
+        static $modifiers = [
             '!' => true,
             '@' => true,
             '~' => true,
             '+' => true,
             '-' => true,
-        );
-        static $identifier = array(
+        ];
+        static $identifier = [
             T_DOUBLE_COLON => true,
             T_STRING => true,
             T_NS_SEPARATOR => true,
-        );
-
-        if (KINT_PHP56) {
-            self::$operator[T_POW] = true;
-            self::$operator[T_POW_EQUAL] = true;
-        }
+        ];
 
         if (KINT_PHP70) {
             self::$operator[T_SPACESHIP] = true;
@@ -154,11 +163,24 @@ public static function getFunctionCalls($source, $line, $function)
             self::$operator[T_COALESCE_EQUAL] = true;
         }
 
+        if (KINT_PHP80) {
+            $up[T_ATTRIBUTE] = true;
+            self::$operator[T_MATCH] = true;
+            self::$strip[T_NULLSAFE_OBJECT_OPERATOR] = true;
+            self::$classcalls[T_NULLSAFE_OBJECT_OPERATOR] = true;
+            self::$namespace[T_NAME_FULLY_QUALIFIED] = true;
+            self::$namespace[T_NAME_QUALIFIED] = true;
+            self::$namespace[T_NAME_RELATIVE] = true;
+            $identifier[T_NAME_FULLY_QUALIFIED] = true;
+            $identifier[T_NAME_QUALIFIED] = true;
+            $identifier[T_NAME_RELATIVE] = true;
+        }
+
         $tokens = \token_get_all($source);
         $cursor = 1;
-        $function_calls = array();
-        /** @var array<int, null|array|string> Performance optimization preventing backwards loops */
-        $prev_tokens = array(null, null, null);
+        $function_calls = [];
+        // Performance optimization preventing backwards loops
+        $prev_tokens = [null, null, null];
 
         if (\is_array($function)) {
             $class = \explode('\\', $function[0]);
@@ -188,10 +210,16 @@ public static function getFunctionCalls($source, $line, $function)
                 continue;
             }
 
-            $prev_tokens = array($prev_tokens[1], $prev_tokens[2], $token);
+            $prev_tokens = [$prev_tokens[1], $prev_tokens[2], $token];
 
             // Check if it's the right type to be the function we're looking for
-            if (T_STRING !== $token[0] || \strtolower($token[1]) !== $function) {
+            if (!isset(self::$namespace[$token[0]])) {
+                continue;
+            }
+
+            $ns = \explode('\\', \strtolower($token[1]));
+
+            if (\end($ns) !== $function) {
                 continue;
             }
 
@@ -203,7 +231,7 @@ public static function getFunctionCalls($source, $line, $function)
 
             // Check if it matches the signature
             if (null === $class) {
-                if ($prev_tokens[1] && \in_array($prev_tokens[1][0], array(T_DOUBLE_COLON, T_OBJECT_OPERATOR), true)) {
+                if ($prev_tokens[1] && isset(self::$classcalls[$prev_tokens[1][0]])) {
                     continue;
                 }
             } else {
@@ -211,7 +239,15 @@ public static function getFunctionCalls($source, $line, $function)
                     continue;
                 }
 
-                if (!$prev_tokens[0] || T_STRING !== $prev_tokens[0][0] || \strtolower($prev_tokens[0][1]) !== $class) {
+                if (!$prev_tokens[0] || !isset(self::$namespace[$prev_tokens[0][0]])) {
+                    continue;
+                }
+
+                /** @var array{int, string, int} $prev_tokens[0] */
+                // All self::$namespace tokens are T_ constants
+                $ns = \explode('\\', \strtolower($prev_tokens[0][1]));
+
+                if (\end($ns) !== $class) {
                     continue;
                 }
             }
@@ -222,8 +258,8 @@ public static function getFunctionCalls($source, $line, $function)
             $instring = false; // Whether we're in a string or not
             $realtokens = false; // Whether the current scope contains anything meaningful or not
             $paramrealtokens = false; // Whether the current parameter contains anything meaningful
-            $params = array(); // All our collected parameters
-            $shortparam = array(); // The short version of the parameter
+            $params = []; // All our collected parameters
+            $shortparam = []; // The short version of the parameter
             $param_start = $offset; // The distance to the start of the parameter
 
             // Loop through the following tokens until the function call ends
@@ -276,11 +312,11 @@ public static function getFunctionCalls($source, $line, $function)
                     $shortparam[] = '"';
                 } elseif (1 === $depth) {
                     if (',' === $token[0]) {
-                        $params[] = array(
+                        $params[] = [
                             'full' => \array_slice($tokens, $param_start, $offset - $param_start),
                             'short' => $shortparam,
-                        );
-                        $shortparam = array();
+                        ];
+                        $shortparam = [];
                         $paramrealtokens = false;
                         $param_start = $offset + 1;
                     } elseif (T_CONSTANT_ENCAPSED_STRING === $token[0] && \strlen($token[1]) > 2) {
@@ -293,10 +329,10 @@ public static function getFunctionCalls($source, $line, $function)
                 // Depth has dropped to 0 (So we've hit the closing paren)
                 if ($depth <= 0) {
                     if ($paramrealtokens) {
-                        $params[] = array(
+                        $params[] = [
                             'full' => \array_slice($tokens, $param_start, $offset - $param_start),
                             'short' => $shortparam,
-                        );
+                        ];
                     }
 
                     break;
@@ -322,11 +358,11 @@ public static function getFunctionCalls($source, $line, $function)
                     }
                 }
 
-                $param = array(
+                $param = [
                     'name' => self::tokensToString($name),
                     'path' => self::tokensToString(self::tokensTrim($param['full'])),
                     'expression' => $expression,
-                );
+                ];
             }
 
             // Get the modifiers
@@ -340,7 +376,7 @@ public static function getFunctionCalls($source, $line, $function)
                 --$index;
             }
 
-            $mods = array();
+            $mods = [];
 
             while (isset($tokens[$index])) {
                 if (isset(self::$ignore[$tokens[$index][0]])) {
@@ -357,10 +393,10 @@ public static function getFunctionCalls($source, $line, $function)
                 break;
             }
 
-            $function_calls[] = array(
+            $function_calls[] = [
                 'parameters' => $params,
                 'modifiers' => $mods,
-            );
+            ];
         }
 
         return $function_calls;
@@ -436,10 +472,11 @@ private static function tokensTrim(array $tokens)
     private static function tokensFormatted(array $tokens)
     {
         $space = false;
+        $attribute = false;
 
         $tokens = self::tokensTrim($tokens);
 
-        $output = array();
+        $output = [];
         $last = null;
 
         foreach ($tokens as $index => $token) {
@@ -450,7 +487,10 @@ private static function tokensFormatted(array $tokens)
 
                 $next = $tokens[self::realTokenIndex($tokens, $index)];
 
-                if (isset(self::$strip[$last[0]]) && !self::tokenIsOperator($next)) {
+                /** @var array|string $last */
+                if ($attribute && ']' === $last[0]) {
+                    $attribute = false;
+                } elseif (isset(self::$strip[$last[0]]) && !self::tokenIsOperator($next)) {
                     continue;
                 }
 
@@ -461,6 +501,10 @@ private static function tokensFormatted(array $tokens)
                 $token = ' ';
                 $space = true;
             } else {
+                if (KINT_PHP80 && $last && T_ATTRIBUTE == $last[0]) {
+                    $attribute = true;
+                }
+
                 $space = false;
                 $last = $token;
             }
diff --git a/system/ThirdParty/Kint/Kint.php b/system/ThirdParty/Kint/Kint.php
index e0ce96337753..f11ed498c45f 100644
--- a/system/ThirdParty/Kint/Kint.php
+++ b/system/ThirdParty/Kint/Kint.php
@@ -26,11 +26,11 @@
 namespace Kint;
 
 use InvalidArgumentException;
-use Kint\Object\BasicObject;
 use Kint\Parser\Parser;
 use Kint\Parser\Plugin;
 use Kint\Renderer\Renderer;
 use Kint\Renderer\TextRenderer;
+use Kint\Zval\Value;
 
 class Kint
 {
@@ -102,12 +102,12 @@ class Kint
      *
      * Defaults to [$_SERVER['DOCUMENT_ROOT'] => '<ROOT>']
      */
-    public static $app_root_dirs = array();
+    public static $app_root_dirs = [];
 
     /**
-     * @var int max array/object levels to go deep, if zero no limits are applied
+     * @var int depth limit for array/object traversal. 0 for no limit
      */
-    public static $max_depth = 6;
+    public static $depth_limit = 7;
 
     /**
      * @var bool expand all trees by default for rich view
@@ -124,23 +124,24 @@ class Kint
     /**
      * @var array Kint aliases. Add debug functions in Kint wrappers here to fix modifiers and backtraces
      */
-    public static $aliases = array(
-        array('Kint\\Kint', 'dump'),
-        array('Kint\\Kint', 'trace'),
-        array('Kint\\Kint', 'dumpArray'),
-    );
+    public static $aliases = [
+        ['Kint\\Kint', 'dump'],
+        ['Kint\\Kint', 'trace'],
+        ['Kint\\Kint', 'dumpArray'],
+    ];
 
     /**
      * @var array<mixed, string> Array of modes to renderer class names
      */
-    public static $renderers = array(
+    public static $renderers = [
         self::MODE_RICH => 'Kint\\Renderer\\RichRenderer',
         self::MODE_PLAIN => 'Kint\\Renderer\\PlainRenderer',
         self::MODE_TEXT => 'Kint\\Renderer\\TextRenderer',
         self::MODE_CLI => 'Kint\\Renderer\\CliRenderer',
-    );
+    ];
 
-    public static $plugins = array(
+    public static $plugins = [
+        'Kint\\Parser\\ArrayLimitPlugin',
         'Kint\\Parser\\ArrayObjectPlugin',
         'Kint\\Parser\\Base64Plugin',
         'Kint\\Parser\\BlacklistPlugin',
@@ -162,9 +163,9 @@ class Kint
         'Kint\\Parser\\TimestampPlugin',
         'Kint\\Parser\\TracePlugin',
         'Kint\\Parser\\XmlPlugin',
-    );
+    ];
 
-    protected static $plugin_pool = array();
+    protected static $plugin_pool = [];
 
     protected $parser;
     protected $renderer;
@@ -199,24 +200,25 @@ public function setStatesFromStatics(array $statics)
     {
         $this->renderer->setStatics($statics);
 
-        $this->parser->setDepthLimit(isset($statics['max_depth']) ? $statics['max_depth'] : false);
+        $this->parser->setDepthLimit(isset($statics['depth_limit']) ? $statics['depth_limit'] : 0);
         $this->parser->clearPlugins();
 
         if (!isset($statics['plugins'])) {
             return;
         }
 
-        $plugins = array();
+        $plugins = [];
 
         foreach ($statics['plugins'] as $plugin) {
             if ($plugin instanceof Plugin) {
                 $plugins[] = $plugin;
-            } elseif (\is_string($plugin) && \is_subclass_of($plugin, 'Kint\\Parser\\Plugin')) {
-                if (!isset(self::$plugin_pool[$plugin])) {
+            } elseif (\is_string($plugin) && \is_subclass_of($plugin, Plugin::class)) {
+                if (!isset(static::$plugin_pool[$plugin])) {
+                    /** @psalm-suppress UnsafeInstantiation */
                     $p = new $plugin();
-                    self::$plugin_pool[$plugin] = $p;
+                    static::$plugin_pool[$plugin] = $p;
                 }
-                $plugins[] = self::$plugin_pool[$plugin];
+                $plugins[] = static::$plugin_pool[$plugin];
             }
         }
 
@@ -232,7 +234,7 @@ public function setStatesFromCallInfo(array $info)
         $this->renderer->setCallInfo($info);
 
         if (isset($info['modifiers']) && \is_array($info['modifiers']) && \in_array('+', $info['modifiers'], true)) {
-            $this->parser->setDepthLimit(false);
+            $this->parser->setDepthLimit(0);
         }
 
         $this->parser->setCallerClass(isset($info['caller']['class']) ? $info['caller']['class'] : null);
@@ -241,8 +243,8 @@ public function setStatesFromCallInfo(array $info)
     /**
      * Renders a list of vars including the pre and post renders.
      *
-     * @param array         $vars Data to dump
-     * @param BasicObject[] $base Base objects
+     * @param array $vars Data to dump
+     * @param array $base Base Zval\Value objects
      *
      * @return string
      */
@@ -254,13 +256,13 @@ public function dumpAll(array $vars, array $base)
 
         $output = $this->renderer->preRender();
 
-        if ($vars === array()) {
+        if ([] === $vars) {
             $output .= $this->renderer->renderNothing();
         }
 
         foreach ($vars as $key => $arg) {
-            if (!$base[$key] instanceof BasicObject) {
-                throw new InvalidArgumentException('Kint::dumpAll requires all elements of the second argument to be BasicObject instances');
+            if (!$base[$key] instanceof Value) {
+                throw new InvalidArgumentException('Kint::dumpAll requires all elements of the second argument to be Value instances');
             }
             $output .= $this->dumpVar($arg, $base[$key]);
         }
@@ -273,12 +275,12 @@ public function dumpAll(array $vars, array $base)
     /**
      * Dumps and renders a var.
      *
-     * @param mixed       $var  Data to dump
-     * @param BasicObject $base Base object
+     * @param mixed $var  Data to dump
+     * @param Value $base Base object
      *
      * @return string
      */
-    public function dumpVar(&$var, BasicObject $base)
+    public function dumpVar(&$var, Value $base)
     {
         return $this->renderer->render(
             $this->parser->parse($var, $base)
@@ -292,21 +294,21 @@ public function dumpVar(&$var, BasicObject $base)
      */
     public static function getStatics()
     {
-        return array(
-            'aliases' => self::$aliases,
-            'app_root_dirs' => self::$app_root_dirs,
-            'cli_detection' => self::$cli_detection,
-            'display_called_from' => self::$display_called_from,
-            'enabled_mode' => self::$enabled_mode,
-            'expanded' => self::$expanded,
-            'file_link_format' => self::$file_link_format,
-            'max_depth' => self::$max_depth,
-            'mode_default' => self::$mode_default,
-            'mode_default_cli' => self::$mode_default_cli,
-            'plugins' => self::$plugins,
-            'renderers' => self::$renderers,
-            'return' => self::$return,
-        );
+        return [
+            'aliases' => static::$aliases,
+            'app_root_dirs' => static::$app_root_dirs,
+            'cli_detection' => static::$cli_detection,
+            'depth_limit' => static::$depth_limit,
+            'display_called_from' => static::$display_called_from,
+            'enabled_mode' => static::$enabled_mode,
+            'expanded' => static::$expanded,
+            'file_link_format' => static::$file_link_format,
+            'mode_default' => static::$mode_default,
+            'mode_default_cli' => static::$mode_default_cli,
+            'plugins' => static::$plugins,
+            'renderers' => static::$renderers,
+            'return' => static::$return,
+        ];
     }
 
     /**
@@ -325,7 +327,7 @@ public static function createFromStatics(array $statics)
         if (isset($statics['enabled_mode'])) {
             $mode = $statics['enabled_mode'];
 
-            if (true === $statics['enabled_mode'] && isset($statics['mode_default'])) {
+            if (true === $mode && isset($statics['mode_default'])) {
                 $mode = $statics['mode_default'];
 
                 if (PHP_SAPI === 'cli' && !empty($statics['cli_detection']) && isset($statics['mode_default_cli'])) {
@@ -334,7 +336,7 @@ public static function createFromStatics(array $statics)
             }
         }
 
-        if (!$mode) {
+        if (false === $mode) {
             return null;
         }
 
@@ -345,7 +347,8 @@ public static function createFromStatics(array $statics)
             $renderer = new $statics['renderers'][$mode]();
         }
 
-        return new self(new Parser(), $renderer);
+        /** @psalm-suppress UnsafeInstantiation */
+        return new static(new Parser(), $renderer);
     }
 
     /**
@@ -354,11 +357,11 @@ public static function createFromStatics(array $statics)
      * @param array $params Parameters as returned from getCallInfo
      * @param int   $argc   Number of arguments the helper was called with
      *
-     * @return BasicObject[] Base objects for the arguments
+     * @return Value[] Base objects for the arguments
      */
     public static function getBasesFromParamInfo(array $params, $argc)
     {
-        static $blacklist = array(
+        static $blacklist = [
             'null',
             'true',
             'false',
@@ -372,10 +375,10 @@ public static function getBasesFromParamInfo(array $params, $argc)
             'b"..."',
             "'...'",
             "b'...'",
-        );
+        ];
 
         $params = \array_values($params);
-        $bases = array();
+        $bases = [];
 
         for ($i = 0; $i < $argc; ++$i) {
             if (isset($params[$i])) {
@@ -402,7 +405,7 @@ public static function getBasesFromParamInfo(array $params, $argc)
                 $access_path = '$'.$i;
             }
 
-            $bases[] = BasicObject::blank($name, $access_path);
+            $bases[] = Value::blank($name, $access_path);
         }
 
         return $bases;
@@ -424,23 +427,21 @@ public static function getCallInfo(array $aliases, array $trace, $argc)
         $found = false;
         $callee = null;
         $caller = null;
-        $miniTrace = array();
+        $miniTrace = [];
 
         foreach ($trace as $index => $frame) {
             if (Utils::traceFrameIsListed($frame, $aliases)) {
                 $found = true;
-                $miniTrace = array();
+                $miniTrace = [];
             }
 
-            if (!Utils::traceFrameIsListed($frame, array('spl_autoload_call'))) {
+            if (!Utils::traceFrameIsListed($frame, ['spl_autoload_call'])) {
                 $miniTrace[] = $frame;
             }
         }
 
         if ($found) {
             $callee = \reset($miniTrace) ?: null;
-
-            /** @var null|array Psalm bug workaround */
             $caller = \next($miniTrace) ?: null;
         }
 
@@ -455,15 +456,15 @@ public static function getCallInfo(array $aliases, array $trace, $argc)
 
         $miniTrace = \array_values($miniTrace);
 
-        $call = self::getSingleCall($callee ?: array(), $argc);
+        $call = static::getSingleCall($callee ?: [], $argc);
 
-        $ret = array(
+        $ret = [
             'params' => null,
-            'modifiers' => array(),
+            'modifiers' => [],
             'callee' => $callee,
             'caller' => $caller,
             'trace' => $miniTrace,
-        );
+        ];
 
         if ($call) {
             $ret['params'] = $call['parameters'];
@@ -482,23 +483,21 @@ public static function getCallInfo(array $aliases, array $trace, $argc)
      */
     public static function trace()
     {
-        if (!self::$enabled_mode) {
+        if (false === static::$enabled_mode) {
             return 0;
         }
 
-        Utils::normalizeAliases(self::$aliases);
-
-        $args = \func_get_args();
+        Utils::normalizeAliases(static::$aliases);
 
-        $call_info = self::getCallInfo(self::$aliases, \debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS), \count($args));
+        $call_info = static::getCallInfo(static::$aliases, \debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS), \func_num_args());
 
-        $statics = self::getStatics();
+        $statics = static::getStatics();
 
         if (\in_array('~', $call_info['modifiers'], true)) {
-            $statics['enabled_mode'] = self::MODE_TEXT;
+            $statics['enabled_mode'] = static::MODE_TEXT;
         }
 
-        $kintstance = self::createFromStatics($statics);
+        $kintstance = static::createFromStatics($statics);
         if (!$kintstance) {
             // Should never happen
             return 0; // @codeCoverageIgnore
@@ -513,23 +512,25 @@ public static function trace()
         $kintstance->setStatesFromStatics($statics);
         $kintstance->setStatesFromCallInfo($call_info);
 
-        $trimmed_trace = array();
-        $trace = \debug_backtrace(true);
+        $trimmed_trace = [];
+        $trace = \debug_backtrace();
 
         foreach ($trace as $frame) {
-            if (Utils::traceFrameIsListed($frame, self::$aliases)) {
-                $trimmed_trace = array();
+            if (Utils::traceFrameIsListed($frame, static::$aliases)) {
+                $trimmed_trace = [];
             }
 
             $trimmed_trace[] = $frame;
         }
 
+        \array_shift($trimmed_trace);
+
         $output = $kintstance->dumpAll(
-            array($trimmed_trace),
-            array(BasicObject::blank('Kint\\Kint::trace()', 'debug_backtrace(true)'))
+            [$trimmed_trace],
+            [Value::blank('Kint\\Kint::trace()', 'debug_backtrace()')]
         );
 
-        if (self::$return || \in_array('@', $call_info['modifiers'], true)) {
+        if (static::$return || \in_array('@', $call_info['modifiers'], true)) {
             return $output;
         }
 
@@ -545,29 +546,29 @@ public static function trace()
     /**
      * Dumps some data.
      *
-     * Functionally equivalent to Kint::dump(1) or Kint::dump(debug_backtrace(true))
+     * Functionally equivalent to Kint::dump(1) or Kint::dump(debug_backtrace())
      *
      * @return int|string
      */
     public static function dump()
     {
-        if (!self::$enabled_mode) {
+        if (false === static::$enabled_mode) {
             return 0;
         }
 
-        Utils::normalizeAliases(self::$aliases);
+        Utils::normalizeAliases(static::$aliases);
 
         $args = \func_get_args();
 
-        $call_info = self::getCallInfo(self::$aliases, \debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS), \count($args));
+        $call_info = static::getCallInfo(static::$aliases, \debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS), \count($args));
 
-        $statics = self::getStatics();
+        $statics = static::getStatics();
 
         if (\in_array('~', $call_info['modifiers'], true)) {
-            $statics['enabled_mode'] = self::MODE_TEXT;
+            $statics['enabled_mode'] = static::MODE_TEXT;
         }
 
-        $kintstance = self::createFromStatics($statics);
+        $kintstance = static::createFromStatics($statics);
         if (!$kintstance) {
             // Should never happen
             return 0; // @codeCoverageIgnore
@@ -582,40 +583,13 @@ public static function dump()
         $kintstance->setStatesFromStatics($statics);
         $kintstance->setStatesFromCallInfo($call_info);
 
-        // If the call is Kint::dump(1) then dump a backtrace instead
-        if ($args === array(1) && (!isset($call_info['params'][0]['name']) || '1' === $call_info['params'][0]['name'])) {
-            $args = \debug_backtrace(true);
-            $trace = array();
-
-            foreach ($args as $index => $frame) {
-                if (Utils::traceFrameIsListed($frame, self::$aliases)) {
-                    $trace = array();
-                }
-
-                $trace[] = $frame;
-            }
-
-            if (isset($call_info['callee']['function'])) {
-                $tracename = $call_info['callee']['function'].'(1)';
-                if (isset($call_info['callee']['class'], $call_info['callee']['type'])) {
-                    $tracename = $call_info['callee']['class'].$call_info['callee']['type'].$tracename;
-                }
-            } else {
-                $tracename = 'Kint\\Kint::dump(1)';
-            }
-
-            $tracebase = BasicObject::blank($tracename, 'debug_backtrace(true)');
-
-            $output = $kintstance->dumpAll(array($trace), array($tracebase));
-        } else {
-            $bases = self::getBasesFromParamInfo(
-                isset($call_info['params']) ? $call_info['params'] : array(),
-                \count($args)
-            );
-            $output = $kintstance->dumpAll($args, $bases);
-        }
+        $bases = static::getBasesFromParamInfo(
+            isset($call_info['params']) ? $call_info['params'] : [],
+            \count($args)
+        );
+        $output = $kintstance->dumpAll($args, $bases);
 
-        if (self::$return || \in_array('@', $call_info['modifiers'], true)) {
+        if (static::$return || \in_array('@', $call_info['modifiers'], true)) {
             return $output;
         }
 
@@ -643,7 +617,7 @@ public static function shortenPath($file)
         $longest_match = 0;
         $match = '/';
 
-        foreach (self::$app_root_dirs as $path => $alias) {
+        foreach (static::$app_root_dirs as $path => $alias) {
             if (empty($path)) {
                 continue;
             }
@@ -657,7 +631,7 @@ public static function shortenPath($file)
         }
 
         if ($longest_match) {
-            $file = \array_merge(array($match), \array_slice($file, $longest_match));
+            $file = \array_merge([$match], \array_slice($file, $longest_match));
 
             return \implode('/', $file);
         }
@@ -676,7 +650,7 @@ public static function shortenPath($file)
 
     public static function getIdeLink($file, $line)
     {
-        return \str_replace(array('%f', '%l'), array($file, $line), self::$file_link_format);
+        return \str_replace(['%f', '%l'], [$file, $line], static::$file_link_format);
     }
 
     /**
@@ -696,7 +670,7 @@ protected static function getSingleCall(array $frame, $argc)
         if (empty($frame['class'])) {
             $callfunc = $frame['function'];
         } else {
-            $callfunc = array($frame['class'], $frame['function']);
+            $callfunc = [$frame['class'], $frame['function']];
         }
 
         $calls = CallFinder::getFunctionCalls(
@@ -711,32 +685,30 @@ protected static function getSingleCall(array $frame, $argc)
             $is_unpack = false;
 
             // Handle argument unpacking as a last resort
-            if (KINT_PHP56) {
-                foreach ($call['parameters'] as $i => &$param) {
-                    if (0 === \strpos($param['name'], '...')) {
-                        if ($i < $argc && $i === \count($call['parameters']) - 1) {
-                            for ($j = 1; $j + $i < $argc; ++$j) {
-                                $call['parameters'][] = array(
-                                    'name' => 'array_values('.\substr($param['name'], 3).')['.$j.']',
-                                    'path' => 'array_values('.\substr($param['path'], 3).')['.$j.']',
-                                    'expression' => false,
-                                );
-                            }
-
-                            $param['name'] = 'reset('.\substr($param['name'], 3).')';
-                            $param['path'] = 'reset('.\substr($param['path'], 3).')';
-                            $param['expression'] = false;
-                        } else {
-                            $call['parameters'] = \array_slice($call['parameters'], 0, $i);
+            foreach ($call['parameters'] as $i => &$param) {
+                if (0 === \strpos($param['name'], '...')) {
+                    if ($i < $argc && $i === \count($call['parameters']) - 1) {
+                        for ($j = 1; $j + $i < $argc; ++$j) {
+                            $call['parameters'][] = [
+                                'name' => 'array_values('.\substr($param['name'], 3).')['.$j.']',
+                                'path' => 'array_values('.\substr($param['path'], 3).')['.$j.']',
+                                'expression' => false,
+                            ];
                         }
 
-                        $is_unpack = true;
-                        break;
+                        $param['name'] = 'reset('.\substr($param['name'], 3).')';
+                        $param['path'] = 'reset('.\substr($param['path'], 3).')';
+                        $param['expression'] = false;
+                    } else {
+                        $call['parameters'] = \array_slice($call['parameters'], 0, $i);
                     }
 
-                    if ($i >= $argc) {
-                        continue 2;
-                    }
+                    $is_unpack = true;
+                    break;
+                }
+
+                if ($i >= $argc) {
+                    continue 2;
                 }
             }
 
diff --git a/system/ThirdParty/Kint/Parser/ArrayLimitPlugin.php b/system/ThirdParty/Kint/Parser/ArrayLimitPlugin.php
new file mode 100644
index 000000000000..4fa94c63c3b9
--- /dev/null
+++ b/system/ThirdParty/Kint/Parser/ArrayLimitPlugin.php
@@ -0,0 +1,142 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Šleinius (raveren@gmail.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace Kint\Parser;
+
+use InvalidArgumentException;
+use Kint\Utils;
+use Kint\Zval\Value;
+
+class ArrayLimitPlugin extends Plugin
+{
+    /**
+     * Maximum size of arrays before limiting.
+     *
+     * @var int
+     */
+    public static $trigger = 1000;
+
+    /**
+     * Maximum amount of items to show in a limited array.
+     *
+     * @var int
+     */
+    public static $limit = 50;
+
+    /**
+     * Don't limit arrays with string keys.
+     *
+     * @var bool
+     */
+    public static $numeric_only = true;
+
+    public function getTypes()
+    {
+        return ['array'];
+    }
+
+    public function getTriggers()
+    {
+        return Parser::TRIGGER_BEGIN;
+    }
+
+    public function parse(&$var, Value &$o, $trigger)
+    {
+        if (self::$limit >= self::$trigger) {
+            throw new InvalidArgumentException('ArrayLimitPlugin::$limit can not be lower than ArrayLimitPlugin::$trigger');
+        }
+
+        $depth = $this->parser->getDepthLimit();
+
+        if (!$depth) {
+            return;
+        }
+
+        if ($o->depth >= $depth - 1) {
+            return;
+        }
+
+        if (\count($var) < self::$trigger) {
+            return;
+        }
+
+        if (self::$numeric_only && Utils::isAssoc($var)) {
+            return;
+        }
+
+        $base = clone $o;
+        $base->depth = $depth - 1;
+        $obj = $this->parser->parse($var, $base);
+
+        if (!$obj instanceof Value || 'array' != $obj->type) {
+            return; // @codeCoverageIgnore
+        }
+
+        $obj->depth = $o->depth;
+        $i = 0;
+
+        foreach ($obj->value->contents as $child) {
+            // We only bother setting the correct depth for the first child,
+            // any deeper children should be cancelled by the depth limit
+            $child->depth = $o->depth + 1;
+            $this->recalcDepthLimit($child);
+        }
+
+        $var2 = \array_slice($var, 0, self::$limit, true);
+        $base = clone $o;
+        $slice = $this->parser->parse($var2, $base);
+
+        \array_splice($obj->value->contents, 0, self::$limit, $slice->value->contents);
+
+        $o = $obj;
+
+        $this->parser->haltParse();
+    }
+
+    protected function recalcDepthLimit(Value $o)
+    {
+        $hintkey = \array_search('depth_limit', $o->hints, true);
+        if (false !== $hintkey) {
+            $o->hints[$hintkey] = 'array_limit';
+        }
+
+        $reps = $o->getRepresentations();
+        if ($o->value) {
+            $reps[] = $o->value;
+        }
+
+        foreach ($reps as $rep) {
+            if ($rep->contents instanceof Value) {
+                $this->recalcDepthLimit($rep->contents);
+            } elseif (\is_array($rep->contents)) {
+                foreach ($rep->contents as $child) {
+                    if ($child instanceof Value) {
+                        $this->recalcDepthLimit($child);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/system/ThirdParty/Kint/Parser/ArrayObjectPlugin.php b/system/ThirdParty/Kint/Parser/ArrayObjectPlugin.php
index 286d255b16b9..f32b4fada23a 100644
--- a/system/ThirdParty/Kint/Parser/ArrayObjectPlugin.php
+++ b/system/ThirdParty/Kint/Parser/ArrayObjectPlugin.php
@@ -26,13 +26,13 @@
 namespace Kint\Parser;
 
 use ArrayObject;
-use Kint\Object\BasicObject;
+use Kint\Zval\Value;
 
 class ArrayObjectPlugin extends Plugin
 {
     public function getTypes()
     {
-        return array('object');
+        return ['object'];
     }
 
     public function getTriggers()
@@ -40,7 +40,7 @@ public function getTriggers()
         return Parser::TRIGGER_BEGIN;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         if (!$var instanceof ArrayObject) {
             return;
diff --git a/system/ThirdParty/Kint/Parser/Base64Plugin.php b/system/ThirdParty/Kint/Parser/Base64Plugin.php
index 3d7d6bc29011..5208d7ddef4a 100644
--- a/system/ThirdParty/Kint/Parser/Base64Plugin.php
+++ b/system/ThirdParty/Kint/Parser/Base64Plugin.php
@@ -25,8 +25,8 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
-use Kint\Object\Representation\Representation;
+use Kint\Zval\Representation\Representation;
+use Kint\Zval\Value;
 
 class Base64Plugin extends Plugin
 {
@@ -46,7 +46,7 @@ class Base64Plugin extends Plugin
 
     public function getTypes()
     {
-        return array('string');
+        return ['string'];
     }
 
     public function getTriggers()
@@ -54,7 +54,7 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         if (\strlen($var) < self::$min_length_hard || \strlen($var) % 4) {
             return;
@@ -68,14 +68,13 @@ public function parse(&$var, BasicObject &$o, $trigger)
             return;
         }
 
-        /** @var false|string */
         $data = \base64_decode($var, true);
 
         if (false === $data) {
             return;
         }
 
-        $base_obj = new BasicObject();
+        $base_obj = new Value();
         $base_obj->depth = $o->depth + 1;
         $base_obj->name = 'base64_decode('.$o->name.')';
 
diff --git a/system/ThirdParty/Kint/Parser/BinaryPlugin.php b/system/ThirdParty/Kint/Parser/BinaryPlugin.php
index 327c297cd560..9a6b117ba50e 100644
--- a/system/ThirdParty/Kint/Parser/BinaryPlugin.php
+++ b/system/ThirdParty/Kint/Parser/BinaryPlugin.php
@@ -25,14 +25,14 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
-use Kint\Object\BlobObject;
+use Kint\Zval\BlobValue;
+use Kint\Zval\Value;
 
 class BinaryPlugin extends Plugin
 {
     public function getTypes()
     {
-        return array('string');
+        return ['string'];
     }
 
     public function getTriggers()
@@ -40,9 +40,9 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
-        if (!$o instanceof BlobObject || !\in_array($o->encoding, array('ASCII', 'UTF-8'), true)) {
+        if (!$o instanceof BlobValue || !\in_array($o->encoding, ['ASCII', 'UTF-8'], true)) {
             $o->value->hints[] = 'binary';
         }
     }
diff --git a/system/ThirdParty/Kint/Parser/BlacklistPlugin.php b/system/ThirdParty/Kint/Parser/BlacklistPlugin.php
index b37e45ff6fbf..9c472d43e798 100644
--- a/system/ThirdParty/Kint/Parser/BlacklistPlugin.php
+++ b/system/ThirdParty/Kint/Parser/BlacklistPlugin.php
@@ -25,8 +25,8 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
-use Kint\Object\InstanceObject;
+use Kint\Zval\InstanceValue;
+use Kint\Zval\Value;
 
 class BlacklistPlugin extends Plugin
 {
@@ -35,32 +35,18 @@ class BlacklistPlugin extends Plugin
      *
      * @var array
      */
-    public static $blacklist = array();
+    public static $blacklist = [];
 
     /**
      * List of classes and interfaces to blacklist except when dumped directly.
      *
      * @var array
      */
-    public static $shallow_blacklist = array();
-
-    /**
-     * Maximum size of arrays before blacklisting.
-     *
-     * @var int
-     */
-    public static $array_limit = 10000;
-
-    /**
-     * Maximum size of arrays before blacklisting except when dumped directly.
-     *
-     * @var int
-     */
-    public static $shallow_array_limit = 1000;
+    public static $shallow_blacklist = ['Psr\\Container\\ContainerInterface'];
 
     public function getTypes()
     {
-        return array('object', 'array');
+        return ['object'];
     }
 
     public function getTriggers()
@@ -68,21 +54,11 @@ public function getTriggers()
         return Parser::TRIGGER_BEGIN;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
-    {
-        if (\is_object($var)) {
-            return $this->parseObject($var, $o);
-        }
-        if (\is_array($var)) {
-            return $this->parseArray($var, $o);
-        }
-    }
-
-    protected function parseObject(&$var, BasicObject &$o)
+    public function parse(&$var, Value &$o, $trigger)
     {
         foreach (self::$blacklist as $class) {
             if ($var instanceof $class) {
-                return $this->blacklistObject($var, $o);
+                return $this->blacklistValue($var, $o);
             }
         }
 
@@ -92,17 +68,17 @@ protected function parseObject(&$var, BasicObject &$o)
 
         foreach (self::$shallow_blacklist as $class) {
             if ($var instanceof $class) {
-                return $this->blacklistObject($var, $o);
+                return $this->blacklistValue($var, $o);
             }
         }
     }
 
-    protected function blacklistObject(&$var, BasicObject &$o)
+    protected function blacklistValue(&$var, Value &$o)
     {
-        $object = new InstanceObject();
+        $object = new InstanceValue();
         $object->transplant($o);
         $object->classname = \get_class($var);
-        $object->hash = \spl_object_hash($var);
+        $object->spl_object_hash = \spl_object_hash($var);
         $object->clearRepresentations();
         $object->value = null;
         $object->size = null;
@@ -112,32 +88,4 @@ protected function blacklistObject(&$var, BasicObject &$o)
 
         $this->parser->haltParse();
     }
-
-    protected function parseArray(array &$var, BasicObject &$o)
-    {
-        if (\count($var) > self::$array_limit) {
-            return $this->blacklistArray($var, $o);
-        }
-
-        if ($o->depth <= 0) {
-            return;
-        }
-
-        if (\count($var) > self::$shallow_array_limit) {
-            return $this->blacklistArray($var, $o);
-        }
-    }
-
-    protected function blacklistArray(array &$var, BasicObject &$o)
-    {
-        $object = new BasicObject();
-        $object->transplant($o);
-        $object->value = null;
-        $object->size = \count($var);
-        $object->hints[] = 'blacklist';
-
-        $o = $object;
-
-        $this->parser->haltParse();
-    }
 }
diff --git a/system/ThirdParty/Kint/Parser/ClassMethodsPlugin.php b/system/ThirdParty/Kint/Parser/ClassMethodsPlugin.php
index e4c23716186a..152e59d9c762 100644
--- a/system/ThirdParty/Kint/Parser/ClassMethodsPlugin.php
+++ b/system/ThirdParty/Kint/Parser/ClassMethodsPlugin.php
@@ -25,19 +25,19 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
-use Kint\Object\InstanceObject;
-use Kint\Object\MethodObject;
-use Kint\Object\Representation\Representation;
+use Kint\Zval\InstanceValue;
+use Kint\Zval\MethodValue;
+use Kint\Zval\Representation\Representation;
+use Kint\Zval\Value;
 use ReflectionClass;
 
 class ClassMethodsPlugin extends Plugin
 {
-    private static $cache = array();
+    private static $cache = [];
 
     public function getTypes()
     {
-        return array('object');
+        return ['object'];
     }
 
     public function getTriggers()
@@ -45,21 +45,21 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         $class = \get_class($var);
 
         // assuming class definition will not change inside one request
         if (!isset(self::$cache[$class])) {
-            $methods = array();
+            $methods = [];
 
             $reflection = new ReflectionClass($class);
 
             foreach ($reflection->getMethods() as $method) {
-                $methods[] = new MethodObject($method);
+                $methods[] = new MethodValue($method);
             }
 
-            \usort($methods, array('Kint\\Parser\\ClassMethodsPlugin', 'sort'));
+            \usort($methods, ['Kint\\Parser\\ClassMethodsPlugin', 'sort']);
 
             self::$cache[$class] = $methods;
         }
@@ -91,19 +91,19 @@ public function parse(&$var, BasicObject &$o, $trigger)
         }
     }
 
-    private static function sort(MethodObject $a, MethodObject $b)
+    private static function sort(MethodValue $a, MethodValue $b)
     {
         $sort = ((int) $a->static) - ((int) $b->static);
         if ($sort) {
             return $sort;
         }
 
-        $sort = BasicObject::sortByAccess($a, $b);
+        $sort = Value::sortByAccess($a, $b);
         if ($sort) {
             return $sort;
         }
 
-        $sort = InstanceObject::sortByHierarchy($a->owner_class, $b->owner_class);
+        $sort = InstanceValue::sortByHierarchy($a->owner_class, $b->owner_class);
         if ($sort) {
             return $sort;
         }
diff --git a/system/ThirdParty/Kint/Parser/ClassStaticsPlugin.php b/system/ThirdParty/Kint/Parser/ClassStaticsPlugin.php
index 0ba58ca24874..89601af2f9f7 100644
--- a/system/ThirdParty/Kint/Parser/ClassStaticsPlugin.php
+++ b/system/ThirdParty/Kint/Parser/ClassStaticsPlugin.php
@@ -25,19 +25,19 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
-use Kint\Object\InstanceObject;
-use Kint\Object\Representation\Representation;
+use Kint\Zval\InstanceValue;
+use Kint\Zval\Representation\Representation;
+use Kint\Zval\Value;
 use ReflectionClass;
 use ReflectionProperty;
 
 class ClassStaticsPlugin extends Plugin
 {
-    private static $cache = array();
+    private static $cache = [];
 
     public function getTypes()
     {
-        return array('object');
+        return ['object'];
     }
 
     public function getTriggers()
@@ -45,7 +45,7 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         $class = \get_class($var);
         $reflection = new ReflectionClass($class);
@@ -53,14 +53,14 @@ public function parse(&$var, BasicObject &$o, $trigger)
         // Constants
         // TODO: PHP 7.1 allows private consts but reflection doesn't have a way to check them yet
         if (!isset(self::$cache[$class])) {
-            $consts = array();
+            $consts = [];
 
             foreach ($reflection->getConstants() as $name => $val) {
-                $const = BasicObject::blank($name, '\\'.$class.'::'.$name);
+                $const = Value::blank($name, '\\'.$class.'::'.$name);
                 $const->const = true;
                 $const->depth = $o->depth + 1;
                 $const->owner_class = $class;
-                $const->operator = BasicObject::OPERATOR_STATIC;
+                $const->operator = Value::OPERATOR_STATIC;
                 $const = $this->parser->parse($val, $const);
 
                 $consts[] = $const;
@@ -73,18 +73,18 @@ public function parse(&$var, BasicObject &$o, $trigger)
         $statics->contents = self::$cache[$class];
 
         foreach ($reflection->getProperties(ReflectionProperty::IS_STATIC) as $static) {
-            $prop = new BasicObject();
+            $prop = new Value();
             $prop->name = '$'.$static->getName();
             $prop->depth = $o->depth + 1;
             $prop->static = true;
-            $prop->operator = BasicObject::OPERATOR_STATIC;
+            $prop->operator = Value::OPERATOR_STATIC;
             $prop->owner_class = $static->getDeclaringClass()->name;
 
-            $prop->access = BasicObject::ACCESS_PUBLIC;
+            $prop->access = Value::ACCESS_PUBLIC;
             if ($static->isProtected()) {
-                $prop->access = BasicObject::ACCESS_PROTECTED;
+                $prop->access = Value::ACCESS_PROTECTED;
             } elseif ($static->isPrivate()) {
-                $prop->access = BasicObject::ACCESS_PRIVATE;
+                $prop->access = Value::ACCESS_PRIVATE;
             }
 
             if ($this->parser->childHasPath($o, $prop)) {
@@ -92,31 +92,37 @@ public function parse(&$var, BasicObject &$o, $trigger)
             }
 
             $static->setAccessible(true);
-            $static = $static->getValue();
-            $statics->contents[] = $this->parser->parse($static, $prop);
+
+            if (KINT_PHP74 && !$static->isInitialized()) {
+                $prop->type = 'uninitialized';
+                $statics->contents[] = $prop;
+            } else {
+                $static = $static->getValue();
+                $statics->contents[] = $this->parser->parse($static, $prop);
+            }
         }
 
         if (empty($statics->contents)) {
             return;
         }
 
-        \usort($statics->contents, array('Kint\\Parser\\ClassStaticsPlugin', 'sort'));
+        \usort($statics->contents, ['Kint\\Parser\\ClassStaticsPlugin', 'sort']);
 
         $o->addRepresentation($statics);
     }
 
-    private static function sort(BasicObject $a, BasicObject $b)
+    private static function sort(Value $a, Value $b)
     {
         $sort = ((int) $a->const) - ((int) $b->const);
         if ($sort) {
             return $sort;
         }
 
-        $sort = BasicObject::sortByAccess($a, $b);
+        $sort = Value::sortByAccess($a, $b);
         if ($sort) {
             return $sort;
         }
 
-        return InstanceObject::sortByHierarchy($a->owner_class, $b->owner_class);
+        return InstanceValue::sortByHierarchy($a->owner_class, $b->owner_class);
     }
 }
diff --git a/system/ThirdParty/Kint/Parser/ClosurePlugin.php b/system/ThirdParty/Kint/Parser/ClosurePlugin.php
index 73e367b22b03..f4a68f5db737 100644
--- a/system/ThirdParty/Kint/Parser/ClosurePlugin.php
+++ b/system/ThirdParty/Kint/Parser/ClosurePlugin.php
@@ -26,17 +26,17 @@
 namespace Kint\Parser;
 
 use Closure;
-use Kint\Object\BasicObject;
-use Kint\Object\ClosureObject;
-use Kint\Object\ParameterObject;
-use Kint\Object\Representation\Representation;
+use Kint\Zval\ClosureValue;
+use Kint\Zval\ParameterValue;
+use Kint\Zval\Representation\Representation;
+use Kint\Zval\Value;
 use ReflectionFunction;
 
 class ClosurePlugin extends Plugin
 {
     public function getTypes()
     {
-        return array('object');
+        return ['object'];
     }
 
     public function getTriggers()
@@ -44,13 +44,13 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         if (!$var instanceof Closure) {
             return;
         }
 
-        $object = new ClosureObject();
+        $object = new ClosureValue();
         $object->transplant($o);
         $o = $object;
         $object->removeRepresentation('properties');
@@ -61,24 +61,24 @@ public function parse(&$var, BasicObject &$o, $trigger)
         $o->startline = $closure->getStartLine();
 
         foreach ($closure->getParameters() as $param) {
-            $o->parameters[] = new ParameterObject($param);
+            $o->parameters[] = new ParameterValue($param);
         }
 
         $p = new Representation('Parameters');
         $p->contents = &$o->parameters;
         $o->addRepresentation($p, 0);
 
-        $statics = array();
+        $statics = [];
 
-        if (\method_exists($closure, 'getClosureThis') && $v = $closure->getClosureThis()) {
-            $statics = array('this' => $v);
+        if ($v = $closure->getClosureThis()) {
+            $statics = ['this' => $v];
         }
 
         if (\count($statics = $statics + $closure->getStaticVariables())) {
-            $statics_parsed = array();
+            $statics_parsed = [];
 
             foreach ($statics as $name => &$static) {
-                $obj = BasicObject::blank('$'.$name);
+                $obj = Value::blank('$'.$name);
                 $obj->depth = $o->depth + 1;
                 $statics_parsed[$name] = $this->parser->parse($static, $obj);
                 if (null === $statics_parsed[$name]->value) {
diff --git a/system/ThirdParty/Kint/Parser/ColorPlugin.php b/system/ThirdParty/Kint/Parser/ColorPlugin.php
index 0d748f2c35f2..a00b338c4708 100644
--- a/system/ThirdParty/Kint/Parser/ColorPlugin.php
+++ b/system/ThirdParty/Kint/Parser/ColorPlugin.php
@@ -25,14 +25,14 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
-use Kint\Object\Representation\ColorRepresentation;
+use Kint\Zval\Representation\ColorRepresentation;
+use Kint\Zval\Value;
 
 class ColorPlugin extends Plugin
 {
     public function getTypes()
     {
-        return array('string');
+        return ['string'];
     }
 
     public function getTriggers()
@@ -40,7 +40,7 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         if (\strlen($var) > 32) {
             return;
diff --git a/system/ThirdParty/Kint/Parser/DOMDocumentPlugin.php b/system/ThirdParty/Kint/Parser/DOMDocumentPlugin.php
index ec08d311ffef..53329820f787 100644
--- a/system/ThirdParty/Kint/Parser/DOMDocumentPlugin.php
+++ b/system/ThirdParty/Kint/Parser/DOMDocumentPlugin.php
@@ -28,9 +28,10 @@
 use DOMNamedNodeMap;
 use DOMNode;
 use DOMNodeList;
-use Kint\Object\BasicObject;
-use Kint\Object\InstanceObject;
-use Kint\Object\Representation\Representation;
+use Kint\Zval\BlobValue;
+use Kint\Zval\InstanceValue;
+use Kint\Zval\Representation\Representation;
+use Kint\Zval\Value;
 
 /**
  * The DOMDocument parser plugin is particularly useful as it is both the only
@@ -63,14 +64,14 @@ class DOMDocumentPlugin extends Plugin
      *
      * @var array
      */
-    public static $blacklist = array(
+    public static $blacklist = [
         'parentNode' => 'DOMNode',
         'firstChild' => 'DOMNode',
         'lastChild' => 'DOMNode',
         'previousSibling' => 'DOMNode',
         'nextSibling' => 'DOMNode',
         'ownerDocument' => 'DOMDocument',
-    );
+    ];
 
     /**
      * Show all properties and methods.
@@ -81,7 +82,7 @@ class DOMDocumentPlugin extends Plugin
 
     public function getTypes()
     {
-        return array('object');
+        return ['object'];
     }
 
     public function getTriggers()
@@ -89,9 +90,9 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
-        if (!$o instanceof InstanceObject) {
+        if (!$o instanceof InstanceValue) {
             return;
         }
 
@@ -104,10 +105,10 @@ public function parse(&$var, BasicObject &$o, $trigger)
         }
     }
 
-    protected function parseList(&$var, InstanceObject &$o, $trigger)
+    protected function parseList(&$var, InstanceValue &$o, $trigger)
     {
         // Recursion should never happen, should always be stopped at the parent
-        // DOMNode.  Depth limit on the other hand we're going to skip since
+        // DOMNode. Depth limit on the other hand we're going to skip since
         // that would show an empty iterator and rather useless. Let the depth
         // limit hit the children (DOMNodeList only has DOMNode as children)
         if ($trigger & Parser::TRIGGER_RECURSION) {
@@ -125,36 +126,42 @@ protected function parseList(&$var, InstanceObject &$o, $trigger)
         // Depth limit
         // Make empty iterator representation since we need it in DOMNode to point out depth limits
         if ($this->parser->getDepthLimit() && $o->depth + 1 >= $this->parser->getDepthLimit()) {
-            $b = new BasicObject();
+            $b = new Value();
             $b->name = $o->classname.' Iterator Contents';
             $b->access_path = 'iterator_to_array('.$o->access_path.')';
             $b->depth = $o->depth + 1;
             $b->hints[] = 'depth_limit';
 
             $r = new Representation('Iterator');
-            $r->contents = array($b);
+            $r->contents = [$b];
             $o->replaceRepresentation($r, 0);
 
             return;
         }
 
-        $data = \iterator_to_array($var);
-
         $r = new Representation('Iterator');
         $o->replaceRepresentation($r, 0);
 
-        foreach ($data as $key => $item) {
-            $base_obj = new BasicObject();
+        foreach ($var as $key => $item) {
+            $base_obj = new Value();
             $base_obj->depth = $o->depth + 1;
             $base_obj->name = $item->nodeName;
 
             if ($o->access_path) {
                 if ($var instanceof DOMNamedNodeMap) {
-                    $base_obj->access_path = $o->access_path.'->getNamedItem('.\var_export($key, true).')';
+                    // We can't use getNamedItem() for attributes without a
+                    // namespace because it will pick the first matching
+                    // attribute of *any* namespace.
+                    //
+                    // Contrary to the PHP docs, getNamedItemNS takes null
+                    // as a namespace argument for an unnamespaced item.
+                    $base_obj->access_path = $o->access_path.'->getNamedItemNS(';
+                    $base_obj->access_path .= \var_export($item->namespaceURI, true);
+                    $base_obj->access_path .= ', ';
+                    $base_obj->access_path .= \var_export($item->name, true);
+                    $base_obj->access_path .= ')';
                 } elseif ($var instanceof DOMNodeList) {
                     $base_obj->access_path = $o->access_path.'->item('.\var_export($key, true).')';
-                } else {
-                    $base_obj->access_path = 'iterator_to_array('.$o->access_path.')';
                 }
             }
 
@@ -162,19 +169,19 @@ protected function parseList(&$var, InstanceObject &$o, $trigger)
         }
     }
 
-    protected function parseNode(&$var, InstanceObject &$o)
+    protected function parseNode(&$var, InstanceValue &$o)
     {
         // Fill the properties
         // They can't be enumerated through reflection or casting,
         // so we have to trust the docs and try them one at a time
-        $known_properties = array(
+        $known_properties = [
             'nodeValue',
             'childNodes',
             'attributes',
-        );
+        ];
 
         if (self::$verbose) {
-            $known_properties = array(
+            $known_properties = [
                 'nodeName',
                 'nodeValue',
                 'nodeType',
@@ -191,11 +198,11 @@ protected function parseNode(&$var, InstanceObject &$o)
                 'localName',
                 'baseURI',
                 'textContent',
-            );
+            ];
         }
 
-        $childNodes = array();
-        $attributes = array();
+        $childNodes = null;
+        $attributes = null;
 
         $rep = $o->value;
 
@@ -217,7 +224,9 @@ protected function parseNode(&$var, InstanceObject &$o)
 
         // Attributes and comments and text nodes don't
         // need children or attributes of their own
-        if (\in_array($o->classname, array('DOMAttr', 'DOMText', 'DOMComment'), true)) {
+        if (\in_array($o->classname, ['DOMAttr', 'DOMText', 'DOMComment'], true)) {
+            $o = self::textualNodeToString($o);
+
             return;
         }
 
@@ -225,7 +234,7 @@ protected function parseNode(&$var, InstanceObject &$o)
         if ($attributes) {
             $a = new Representation('Attributes');
             foreach ($attributes->contents as $attribute) {
-                $a->contents[] = self::textualNodeToString($attribute);
+                $a->contents[] = $attribute;
             }
             $o->addRepresentation($a, 0);
         }
@@ -235,21 +244,16 @@ protected function parseNode(&$var, InstanceObject &$o)
             $c = new Representation('Children');
 
             if (1 === \count($childNodes->contents) && ($node = \reset($childNodes->contents)) && \in_array('depth_limit', $node->hints, true)) {
-                $n = new InstanceObject();
+                $n = new InstanceValue();
                 $n->transplant($node);
                 $n->name = 'childNodes';
                 $n->classname = 'DOMNodeList';
-                $c->contents = array($n);
+                $c->contents = [$n];
             } else {
-                foreach ($childNodes->contents as $index => $node) {
-                    // Shortcircuit text nodes to plain strings
-                    if ('DOMText' === $node->classname || 'DOMComment' === $node->classname) {
-                        $node = self::textualNodeToString($node);
-
-                        // And remove them if they're empty
-                        if (\ctype_space($node->value->contents) || '' === $node->value->contents) {
-                            continue;
-                        }
+                foreach ($childNodes->contents as $node) {
+                    // Remove text nodes if theyre empty
+                    if ($node instanceof BlobValue && '#text' === $node->name && (\ctype_space($node->value->contents) || '' === $node->value->contents)) {
+                        continue;
                     }
 
                     $c->contents[] = $node;
@@ -259,8 +263,8 @@ protected function parseNode(&$var, InstanceObject &$o)
             $o->addRepresentation($c, 0);
         }
 
-        if (isset($c) && \count($c->contents)) {
-            $o->size = \count($c->contents);
+        if ($childNodes) {
+            $o->size = \count($childNodes->contents);
         }
 
         if (!$o->size) {
@@ -268,15 +272,15 @@ protected function parseNode(&$var, InstanceObject &$o)
         }
     }
 
-    protected function parseProperty(InstanceObject $o, $prop, &$var)
+    protected function parseProperty(InstanceValue $o, $prop, &$var)
     {
         // Duplicating (And slightly optimizing) the Parser::parseObject() code here
-        $base_obj = new BasicObject();
+        $base_obj = new Value();
         $base_obj->depth = $o->depth + 1;
         $base_obj->owner_class = $o->classname;
         $base_obj->name = $prop;
-        $base_obj->operator = BasicObject::OPERATOR_OBJECT;
-        $base_obj->access = BasicObject::ACCESS_PUBLIC;
+        $base_obj->operator = Value::OPERATOR_OBJECT;
+        $base_obj->access = Value::ACCESS_PUBLIC;
 
         if (null !== $o->access_path) {
             $base_obj->access_path = $o->access_path;
@@ -291,14 +295,19 @@ protected function parseProperty(InstanceObject $o, $prop, &$var)
         if (!isset($var->{$prop})) {
             $base_obj->type = 'null';
         } elseif (isset(self::$blacklist[$prop])) {
-            $b = new InstanceObject();
+            $b = new InstanceValue();
             $b->transplant($base_obj);
             $base_obj = $b;
 
             $base_obj->hints[] = 'blacklist';
             $base_obj->classname = self::$blacklist[$prop];
         } elseif ('attributes' === $prop) {
-            $base_obj = $this->parser->parseDeep($var->{$prop}, $base_obj);
+            // Attributes are strings. If we're too deep set the
+            // depth limit to enable parsing them, but no deeper.
+            if ($this->parser->getDepthLimit() && $this->parser->getDepthLimit() - 2 < $base_obj->depth) {
+                $base_obj->depth = $this->parser->getDepthLimit() - 2;
+            }
+            $base_obj = $this->parser->parse($var->{$prop}, $base_obj);
         } else {
             $base_obj = $this->parser->parse($var->{$prop}, $base_obj);
         }
@@ -306,13 +315,13 @@ protected function parseProperty(InstanceObject $o, $prop, &$var)
         return $base_obj;
     }
 
-    protected static function textualNodeToString(InstanceObject $o)
+    protected static function textualNodeToString(InstanceValue $o)
     {
         if (empty($o->value) || empty($o->value->contents) || empty($o->classname)) {
             return;
         }
 
-        if (!\in_array($o->classname, array('DOMText', 'DOMAttr', 'DOMComment'), true)) {
+        if (!\in_array($o->classname, ['DOMText', 'DOMAttr', 'DOMComment'], true)) {
             return;
         }
 
diff --git a/system/ThirdParty/Kint/Parser/DateTimePlugin.php b/system/ThirdParty/Kint/Parser/DateTimePlugin.php
index f2cebb643cb9..1c546fd7d2a1 100644
--- a/system/ThirdParty/Kint/Parser/DateTimePlugin.php
+++ b/system/ThirdParty/Kint/Parser/DateTimePlugin.php
@@ -26,14 +26,14 @@
 namespace Kint\Parser;
 
 use DateTime;
-use Kint\Object\BasicObject;
-use Kint\Object\DateTimeObject;
+use Kint\Zval\DateTimeValue;
+use Kint\Zval\Value;
 
 class DateTimePlugin extends Plugin
 {
     public function getTypes()
     {
-        return array('object');
+        return ['object'];
     }
 
     public function getTriggers()
@@ -41,13 +41,13 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         if (!$var instanceof DateTime) {
             return;
         }
 
-        $object = new DateTimeObject($var);
+        $object = new DateTimeValue($var);
         $object->transplant($o);
 
         $o = $object;
diff --git a/system/ThirdParty/Kint/Parser/FsPathPlugin.php b/system/ThirdParty/Kint/Parser/FsPathPlugin.php
index 3a8d1e0538c2..79ed3288ca9a 100644
--- a/system/ThirdParty/Kint/Parser/FsPathPlugin.php
+++ b/system/ThirdParty/Kint/Parser/FsPathPlugin.php
@@ -25,17 +25,17 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
-use Kint\Object\Representation\SplFileInfoRepresentation;
+use Kint\Zval\Representation\SplFileInfoRepresentation;
+use Kint\Zval\Value;
 use SplFileInfo;
 
 class FsPathPlugin extends Plugin
 {
-    public static $blacklist = array('/', '.');
+    public static $blacklist = ['/', '.'];
 
     public function getTypes()
     {
-        return array('string');
+        return ['string'];
     }
 
     public function getTriggers()
@@ -43,7 +43,7 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         if (\strlen($var) > 2048) {
             return;
diff --git a/system/ThirdParty/Kint/Parser/IteratorPlugin.php b/system/ThirdParty/Kint/Parser/IteratorPlugin.php
index 0487a381f5b9..8aa1c342f5ce 100644
--- a/system/ThirdParty/Kint/Parser/IteratorPlugin.php
+++ b/system/ThirdParty/Kint/Parser/IteratorPlugin.php
@@ -25,8 +25,8 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
-use Kint\Object\Representation\Representation;
+use Kint\Zval\Representation\Representation;
+use Kint\Zval\Value;
 use Traversable;
 
 class IteratorPlugin extends Plugin
@@ -40,17 +40,17 @@ class IteratorPlugin extends Plugin
      *
      * @var array
      */
-    public static $blacklist = array(
+    public static $blacklist = [
         'DOMNamedNodeMap',
         'DOMNodeList',
         'mysqli_result',
         'PDOStatement',
         'SplFileObject',
-    );
+    ];
 
     public function getTypes()
     {
-        return array('object');
+        return ['object'];
     }
 
     public function getTriggers()
@@ -58,7 +58,7 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         if (!$var instanceof Traversable) {
             return;
@@ -66,14 +66,14 @@ public function parse(&$var, BasicObject &$o, $trigger)
 
         foreach (self::$blacklist as $class) {
             if ($var instanceof $class) {
-                $b = new BasicObject();
+                $b = new Value();
                 $b->name = $class.' Iterator Contents';
                 $b->access_path = 'iterator_to_array('.$o->access_path.', true)';
                 $b->depth = $o->depth + 1;
                 $b->hints[] = 'blacklist';
 
                 $r = new Representation('Iterator');
-                $r->contents = array($b);
+                $r->contents = [$b];
 
                 $o->addRepresentation($r);
 
@@ -81,14 +81,9 @@ public function parse(&$var, BasicObject &$o, $trigger)
             }
         }
 
-        /** @var array|false */
         $data = \iterator_to_array($var);
 
-        if (false === $data) {
-            return;
-        }
-
-        $base_obj = new BasicObject();
+        $base_obj = new Value();
         $base_obj->depth = $o->depth;
 
         if ($o->access_path) {
@@ -101,7 +96,7 @@ public function parse(&$var, BasicObject &$o, $trigger)
 
         $primary = $o->getRepresentations();
         $primary = \reset($primary);
-        if ($primary && $primary === $o->value && $primary->contents === array()) {
+        if ($primary && $primary === $o->value && [] === $primary->contents) {
             $o->addRepresentation($r, 0);
         } else {
             $o->addRepresentation($r);
diff --git a/system/ThirdParty/Kint/Parser/JsonPlugin.php b/system/ThirdParty/Kint/Parser/JsonPlugin.php
index 84b251955383..a105b8fd6ff1 100644
--- a/system/ThirdParty/Kint/Parser/JsonPlugin.php
+++ b/system/ThirdParty/Kint/Parser/JsonPlugin.php
@@ -25,14 +25,14 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
-use Kint\Object\Representation\Representation;
+use Kint\Zval\Representation\Representation;
+use Kint\Zval\Value;
 
 class JsonPlugin extends Plugin
 {
     public function getTypes()
     {
-        return array('string');
+        return ['string'];
     }
 
     public function getTriggers()
@@ -40,7 +40,7 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         if (!isset($var[0]) || ('{' !== $var[0] && '[' !== $var[0])) {
             return;
@@ -54,7 +54,7 @@ public function parse(&$var, BasicObject &$o, $trigger)
 
         $json = (array) $json;
 
-        $base_obj = new BasicObject();
+        $base_obj = new Value();
         $base_obj->depth = $o->depth;
 
         if ($o->access_path) {
diff --git a/system/ThirdParty/Kint/Parser/MicrotimePlugin.php b/system/ThirdParty/Kint/Parser/MicrotimePlugin.php
index 5062b59ad224..782c11f84f85 100644
--- a/system/ThirdParty/Kint/Parser/MicrotimePlugin.php
+++ b/system/ThirdParty/Kint/Parser/MicrotimePlugin.php
@@ -25,8 +25,8 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
-use Kint\Object\Representation\MicrotimeRepresentation;
+use Kint\Zval\Representation\MicrotimeRepresentation;
+use Kint\Zval\Value;
 
 class MicrotimePlugin extends Plugin
 {
@@ -37,7 +37,7 @@ class MicrotimePlugin extends Plugin
 
     public function getTypes()
     {
-        return array('string', 'double');
+        return ['string', 'double'];
     }
 
     public function getTriggers()
@@ -45,7 +45,7 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         if (0 !== $o->depth) {
             return;
@@ -79,7 +79,7 @@ public function parse(&$var, BasicObject &$o, $trigger)
             self::$start = $time;
         }
 
-        self::$last = array($sec, $usec);
+        self::$last = [$sec, $usec];
 
         if (null !== $lap) {
             $total = $time - self::$start;
diff --git a/system/ThirdParty/Kint/Parser/MysqliPlugin.php b/system/ThirdParty/Kint/Parser/MysqliPlugin.php
index 265299bec6ee..4c95d790a772 100644
--- a/system/ThirdParty/Kint/Parser/MysqliPlugin.php
+++ b/system/ThirdParty/Kint/Parser/MysqliPlugin.php
@@ -25,8 +25,10 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
+use Kint\Zval\Value;
 use Mysqli;
+use ReflectionClass;
+use Throwable;
 
 /**
  * Adds support for Mysqli object parsing.
@@ -37,21 +39,21 @@
 class MysqliPlugin extends Plugin
 {
     // These 'properties' are actually globals
-    protected $always_readable = array(
+    protected $always_readable = [
         'client_version' => true,
         'connect_errno' => true,
         'connect_error' => true,
-    );
+    ];
 
     // These are readable on empty mysqli objects, but not on failed connections
-    protected $empty_readable = array(
+    protected $empty_readable = [
         'client_info' => true,
         'errno' => true,
         'error' => true,
-    );
+    ];
 
     // These are only readable on connected mysqli objects
-    protected $connected_readable = array(
+    protected $connected_readable = [
         'affected_rows' => true,
         'error_list' => true,
         'field_count' => true,
@@ -60,16 +62,15 @@ class MysqliPlugin extends Plugin
         'insert_id' => true,
         'server_info' => true,
         'server_version' => true,
-        'stat' => true,
         'sqlstate' => true,
         'protocol_version' => true,
         'thread_id' => true,
         'warning_count' => true,
-    );
+    ];
 
     public function getTypes()
     {
-        return array('object');
+        return ['object'];
     }
 
     public function getTriggers()
@@ -77,19 +78,24 @@ public function getTriggers()
         return Parser::TRIGGER_COMPLETE;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         if (!$var instanceof Mysqli) {
             return;
         }
 
-        $connected = false;
-        $empty = false;
+        try {
+            $connected = \is_string(@$var->sqlstate);
+        } catch (Throwable $t) {
+            $connected = false;
+        }
 
-        if (\is_string(@$var->sqlstate)) {
-            $connected = true;
-        } elseif (\is_string(@$var->client_info)) {
-            $empty = true;
+        try {
+            $empty = !$connected && \is_string(@$var->client_info);
+        } catch (Throwable $t) { // @codeCoverageIgnore
+            // Only possible in PHP 8.0. Before 8.0 there's no exception,
+            // after 8.1 there are no failed connection objects
+            $empty = false; // @codeCoverageIgnore
         }
 
         foreach ($o->value->contents as $key => $obj) {
@@ -98,8 +104,9 @@ public function parse(&$var, BasicObject &$o, $trigger)
                     continue;
                 }
             } elseif (isset($this->empty_readable[$obj->name])) {
-                if (!$connected && !$empty) {
-                    continue;
+                // No failed connections after PHP 8.1
+                if (!$connected && !$empty) { // @codeCoverageIgnore
+                    continue; // @codeCoverageIgnore
                 }
             } elseif (!isset($this->always_readable[$obj->name])) {
                 continue;
@@ -109,13 +116,17 @@ public function parse(&$var, BasicObject &$o, $trigger)
                 continue;
             }
 
+            // @codeCoverageIgnoreStart
+            // All of this is irellevant after 8.1,
+            // we have separate logic for that below
+
             $param = $var->{$obj->name};
 
             if (null === $param) {
                 continue;
             }
 
-            $base = BasicObject::blank($obj->name, $obj->access_path);
+            $base = Value::blank($obj->name, $obj->access_path);
 
             $base->depth = $obj->depth;
             $base->owner_class = $obj->owner_class;
@@ -124,6 +135,55 @@ public function parse(&$var, BasicObject &$o, $trigger)
             $base->reference = $obj->reference;
 
             $o->value->contents[$key] = $this->parser->parse($param, $base);
+
+            // @codeCoverageIgnoreEnd
+        }
+
+        // PHP81 returns an empty array when casting a Mysqli instance
+        if (KINT_PHP81) {
+            $r = new ReflectionClass(Mysqli::class);
+
+            $basepropvalues = [];
+
+            foreach ($r->getProperties() as $prop) {
+                if ($prop->isStatic()) {
+                    continue; // @codeCoverageIgnore
+                }
+
+                $pname = $prop->getName();
+                $param = null;
+
+                if (isset($this->connected_readable[$pname])) {
+                    if ($connected) {
+                        $param = $var->{$pname};
+                    }
+                } else {
+                    $param = $var->{$pname};
+                }
+
+                $child = new Value();
+                $child->depth = $o->depth + 1;
+                $child->owner_class = Mysqli::class;
+                $child->operator = Value::OPERATOR_OBJECT;
+                $child->name = $pname;
+
+                if ($prop->isPublic()) {
+                    $child->access = Value::ACCESS_PUBLIC;
+                } elseif ($prop->isProtected()) { // @codeCoverageIgnore
+                    $child->access = Value::ACCESS_PROTECTED; // @codeCoverageIgnore
+                } elseif ($prop->isPrivate()) { // @codeCoverageIgnore
+                    $child->access = Value::ACCESS_PRIVATE; // @codeCoverageIgnore
+                }
+
+                // We only do base Mysqli properties so we don't need to worry about complex names
+                if ($this->parser->childHasPath($o, $child)) {
+                    $child->access_path .= $o->access_path.'->'.$child->name;
+                }
+
+                $basepropvalues[] = $this->parser->parse($param, $child);
+            }
+
+            $o->value->contents = \array_merge($basepropvalues, $o->value->contents);
         }
     }
 }
diff --git a/system/ThirdParty/Kint/Parser/Parser.php b/system/ThirdParty/Kint/Parser/Parser.php
index b7f81c62186f..d658b092479d 100644
--- a/system/ThirdParty/Kint/Parser/Parser.php
+++ b/system/ThirdParty/Kint/Parser/Parser.php
@@ -27,11 +27,11 @@
 
 use DomainException;
 use Exception;
-use Kint\Object\BasicObject;
-use Kint\Object\BlobObject;
-use Kint\Object\InstanceObject;
-use Kint\Object\Representation\Representation;
-use Kint\Object\ResourceObject;
+use Kint\Zval\BlobValue;
+use Kint\Zval\InstanceValue;
+use Kint\Zval\Representation\Representation;
+use Kint\Zval\ResourceValue;
+use Kint\Zval\Value;
 use ReflectionObject;
 use stdClass;
 
@@ -58,25 +58,22 @@ class Parser
     const TRIGGER_COMPLETE = 14;
 
     protected $caller_class;
-    protected $depth_limit = false;
+    protected $depth_limit = 0;
     protected $marker;
-    protected $object_hashes = array();
+    protected $object_hashes = [];
     protected $parse_break = false;
-    protected $plugins = array();
+    protected $plugins = [];
 
     /**
-     * @param false|int   $depth_limit Maximum depth to parse data
+     * @param int         $depth_limit Maximum depth to parse data
      * @param null|string $caller      Caller class name
      */
-    public function __construct($depth_limit = false, $caller = null)
+    public function __construct($depth_limit = 0, $caller = null)
     {
         $this->marker = \uniqid("kint\0", true);
 
+        $this->depth_limit = $depth_limit;
         $this->caller_class = $caller;
-
-        if ($depth_limit) {
-            $this->depth_limit = $depth_limit;
-        }
     }
 
     /**
@@ -99,9 +96,9 @@ public function getCallerClass()
     /**
      * Set the depth limit.
      *
-     * @param false|int $depth_limit Maximum depth to parse data
+     * @param int $depth_limit Maximum depth to parse data
      */
-    public function setDepthLimit($depth_limit = false)
+    public function setDepthLimit($depth_limit = 0)
     {
         $this->noRecurseCall();
 
@@ -113,37 +110,15 @@ public function getDepthLimit()
         return $this->depth_limit;
     }
 
-    /**
-     * Disables the depth limit and parses a variable.
-     *
-     * This should not be used unless you know what you're doing!
-     *
-     * @param mixed       $var The input variable
-     * @param BasicObject $o   The base object
-     *
-     * @return BasicObject
-     */
-    public function parseDeep(&$var, BasicObject $o)
-    {
-        $depth_limit = $this->depth_limit;
-        $this->depth_limit = false;
-
-        $out = $this->parse($var, $o);
-
-        $this->depth_limit = $depth_limit;
-
-        return $out;
-    }
-
     /**
      * Parses a variable into a Kint object structure.
      *
-     * @param mixed       $var The input variable
-     * @param BasicObject $o   The base object
+     * @param mixed $var The input variable
+     * @param Value $o   The base object
      *
-     * @return BasicObject
+     * @return Value
      */
-    public function parse(&$var, BasicObject $o)
+    public function parse(&$var, Value $o)
     {
         $o->type = \strtolower(\gettype($var));
 
@@ -165,8 +140,10 @@ public function parse(&$var, BasicObject $o)
                 return $this->parseResource($var, $o);
             case 'string':
                 return $this->parseString($var, $o);
+            case 'unknown type':
+            case 'resource (closed)':
             default:
-                return $this->parseUnknown($var, $o);
+                return $this->parseResourceClosed($var, $o);
         }
     }
 
@@ -184,12 +161,12 @@ public function addPlugin(Plugin $p)
 
         foreach ($types as $type) {
             if (!isset($this->plugins[$type])) {
-                $this->plugins[$type] = array(
-                    self::TRIGGER_BEGIN => array(),
-                    self::TRIGGER_SUCCESS => array(),
-                    self::TRIGGER_RECURSION => array(),
-                    self::TRIGGER_DEPTH_LIMIT => array(),
-                );
+                $this->plugins[$type] = [
+                    self::TRIGGER_BEGIN => [],
+                    self::TRIGGER_SUCCESS => [],
+                    self::TRIGGER_RECURSION => [],
+                    self::TRIGGER_DEPTH_LIMIT => [],
+                ];
             }
 
             foreach ($this->plugins[$type] as $trigger => &$pool) {
@@ -204,7 +181,7 @@ public function addPlugin(Plugin $p)
 
     public function clearPlugins()
     {
-        $this->plugins = array();
+        $this->plugins = [];
     }
 
     public function haltParse()
@@ -212,18 +189,18 @@ public function haltParse()
         $this->parse_break = true;
     }
 
-    public function childHasPath(InstanceObject $parent, BasicObject $child)
+    public function childHasPath(InstanceValue $parent, Value $child)
     {
         if ('object' === $parent->type && (null !== $parent->access_path || $child->static || $child->const)) {
-            if (BasicObject::ACCESS_PUBLIC === $child->access) {
+            if (Value::ACCESS_PUBLIC === $child->access) {
                 return true;
             }
 
-            if (BasicObject::ACCESS_PRIVATE === $child->access && $this->caller_class) {
+            if (Value::ACCESS_PRIVATE === $child->access && $this->caller_class) {
                 if ($this->caller_class === $child->owner_class) {
                     return true;
                 }
-            } elseif (BasicObject::ACCESS_PROTECTED === $child->access && $this->caller_class) {
+            } elseif (Value::ACCESS_PROTECTED === $child->access && $this->caller_class) {
                 if ($this->caller_class === $child->owner_class) {
                     return true;
                 }
@@ -262,9 +239,9 @@ protected function noRecurseCall()
     {
         $bt = \debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT | DEBUG_BACKTRACE_IGNORE_ARGS);
 
-        $caller_frame = array(
+        $caller_frame = [
             'function' => __FUNCTION__,
-        );
+        ];
 
         while (isset($bt[0]['object']) && $bt[0]['object'] === $this) {
             $caller_frame = \array_shift($bt);
@@ -277,7 +254,7 @@ protected function noRecurseCall()
         }
     }
 
-    private function parseGeneric(&$var, BasicObject $o)
+    private function parseGeneric(&$var, Value $o)
     {
         $rep = new Representation('Contents');
         $rep->contents = $var;
@@ -291,19 +268,19 @@ private function parseGeneric(&$var, BasicObject $o)
     }
 
     /**
-     * Parses a string into a Kint BlobObject structure.
+     * Parses a string into a Kint BlobValue structure.
      *
-     * @param string      $var The input variable
-     * @param BasicObject $o   The base object
+     * @param string $var The input variable
+     * @param Value  $o   The base object
      *
-     * @return BasicObject
+     * @return Value
      */
-    private function parseString(&$var, BasicObject $o)
+    private function parseString(&$var, Value $o)
     {
-        $string = new BlobObject();
+        $string = new BlobValue();
         $string->transplant($o);
-        $string->encoding = BlobObject::detectEncoding($var);
-        $string->size = BlobObject::strlen($var, $string->encoding);
+        $string->encoding = BlobValue::detectEncoding($var);
+        $string->size = \strlen($var);
 
         $rep = new Representation('Contents');
         $rep->contents = $var;
@@ -320,14 +297,14 @@ private function parseString(&$var, BasicObject $o)
     /**
      * Parses an array into a Kint object structure.
      *
-     * @param array       $var The input variable
-     * @param BasicObject $o   The base object
+     * @param array $var The input variable
+     * @param Value $o   The base object
      *
-     * @return BasicObject
+     * @return Value
      */
-    private function parseArray(array &$var, BasicObject $o)
+    private function parseArray(array &$var, Value $o)
     {
-        $array = new BasicObject();
+        $array = new Value();
         $array->transplant($o);
         $array->size = \count($var);
 
@@ -379,11 +356,11 @@ private function parseArray(array &$var, BasicObject $o)
                 continue;
             }
 
-            $child = new BasicObject();
+            $child = new Value();
             $child->name = $key;
             $child->depth = $array->depth + 1;
-            $child->access = BasicObject::ACCESS_NONE;
-            $child->operator = BasicObject::OPERATOR_ARRAY;
+            $child->access = Value::ACCESS_NONE;
+            $child->operator = Value::OPERATOR_ARRAY;
 
             if (null !== $array->access_path) {
                 if (\is_string($key) && (string) (int) $key === $key) {
@@ -411,22 +388,22 @@ private function parseArray(array &$var, BasicObject $o)
     }
 
     /**
-     * Parses an object into a Kint InstanceObject structure.
+     * Parses an object into a Kint InstanceValue structure.
      *
-     * @param object      $var The input variable
-     * @param BasicObject $o   The base object
+     * @param object $var The input variable
+     * @param Value  $o   The base object
      *
-     * @return BasicObject
+     * @return Value
      */
-    private function parseObject(&$var, BasicObject $o)
+    private function parseObject(&$var, Value $o)
     {
         $hash = \spl_object_hash($var);
         $values = (array) $var;
 
-        $object = new InstanceObject();
+        $object = new InstanceValue();
         $object->transplant($o);
         $object->classname = \get_class($var);
-        $object->hash = $hash;
+        $object->spl_object_hash = $hash;
         $object->size = \count($values);
 
         if (isset($this->object_hashes[$hash])) {
@@ -457,6 +434,48 @@ private function parseObject(&$var, BasicObject $o)
 
         $rep = new Representation('Properties');
 
+        if (KINT_PHP74) {
+            $rprops = $reflector->getProperties();
+
+            foreach ($rprops as $rprop) {
+                if ($rprop->isStatic()) {
+                    continue;
+                }
+
+                $rprop->setAccessible(true);
+                if ($rprop->isInitialized($var)) {
+                    continue;
+                }
+
+                $undefined = null;
+
+                $child = new Value();
+                $child->type = 'undefined';
+                $child->depth = $object->depth + 1;
+                $child->owner_class = $rprop->getDeclaringClass()->getName();
+                $child->operator = Value::OPERATOR_OBJECT;
+                $child->name = $rprop->getName();
+
+                if ($rprop->isPublic()) {
+                    $child->access = Value::ACCESS_PUBLIC;
+                } elseif ($rprop->isProtected()) {
+                    $child->access = Value::ACCESS_PROTECTED;
+                } elseif ($rprop->isPrivate()) {
+                    $child->access = Value::ACCESS_PRIVATE;
+                }
+
+                // Can't dynamically add undefined properties, so no need to use var_export
+                if ($this->childHasPath($object, $child)) {
+                    $child->access_path .= $object->access_path.'->'.$child->name;
+                }
+
+                if ($this->applyPlugins($undefined, $child, self::TRIGGER_BEGIN)) {
+                    $this->applyPlugins($undefined, $child, self::TRIGGER_SUCCESS);
+                }
+                $rep->contents[] = $child;
+            }
+        }
+
         $copy = \array_values($values);
         $refmarker = new stdClass();
         $i = 0;
@@ -470,20 +489,20 @@ private function parseObject(&$var, BasicObject $o)
             // public properties show in the form "$property_name";
             // http://www.php.net/manual/en/language.types.array.php#language.types.array.casting
 
-            $child = new BasicObject();
+            $child = new Value();
             $child->depth = $object->depth + 1;
             $child->owner_class = $object->classname;
-            $child->operator = BasicObject::OPERATOR_OBJECT;
-            $child->access = BasicObject::ACCESS_PUBLIC;
+            $child->operator = Value::OPERATOR_OBJECT;
+            $child->access = Value::ACCESS_PUBLIC;
 
             $split_key = \explode("\0", $key, 3);
 
             if (3 === \count($split_key) && '' === $split_key[0]) {
                 $child->name = $split_key[2];
                 if ('*' === $split_key[1]) {
-                    $child->access = BasicObject::ACCESS_PROTECTED;
+                    $child->access = Value::ACCESS_PROTECTED;
                 } else {
-                    $child->access = BasicObject::ACCESS_PRIVATE;
+                    $child->access = Value::ACCESS_PRIVATE;
                     $child->owner_class = $split_key[1];
                 }
             } elseif (KINT_PHP72) {
@@ -524,16 +543,16 @@ private function parseObject(&$var, BasicObject $o)
     }
 
     /**
-     * Parses a resource into a Kint ResourceObject structure.
+     * Parses a resource into a Kint ResourceValue structure.
      *
-     * @param resource    $var The input variable
-     * @param BasicObject $o   The base object
+     * @param resource $var The input variable
+     * @param Value    $o   The base object
      *
-     * @return BasicObject
+     * @return Value
      */
-    private function parseResource(&$var, BasicObject $o)
+    private function parseResource(&$var, Value $o)
     {
-        $resource = new ResourceObject();
+        $resource = new ResourceValue();
         $resource->transplant($o);
         $resource->resource_type = \get_resource_type($var);
 
@@ -543,16 +562,16 @@ private function parseResource(&$var, BasicObject $o)
     }
 
     /**
-     * Parses an unknown into a Kint object structure.
+     * Parses a closed resource into a Kint object structure.
      *
-     * @param mixed       $var The input variable
-     * @param BasicObject $o   The base object
+     * @param mixed $var The input variable
+     * @param Value $o   The base object
      *
-     * @return BasicObject
+     * @return Value
      */
-    private function parseUnknown(&$var, BasicObject $o)
+    private function parseResourceClosed(&$var, Value $o)
     {
-        $o->type = 'unknown';
+        $o->type = 'resource (closed)';
         $this->applyPlugins($var, $o, self::TRIGGER_SUCCESS);
 
         return $o;
@@ -561,20 +580,20 @@ private function parseUnknown(&$var, BasicObject $o)
     /**
      * Applies plugins for an object type.
      *
-     * @param mixed       $var     variable
-     * @param BasicObject $o       Kint object parsed so far
-     * @param int         $trigger The trigger to check for the plugins
+     * @param mixed $var     variable
+     * @param Value $o       Kint object parsed so far
+     * @param int   $trigger The trigger to check for the plugins
      *
      * @return bool Continue parsing
      */
-    private function applyPlugins(&$var, BasicObject &$o, $trigger)
+    private function applyPlugins(&$var, Value &$o, $trigger)
     {
         $break_stash = $this->parse_break;
 
         /** @var bool Psalm bug workaround */
         $this->parse_break = false;
 
-        $plugins = array();
+        $plugins = [];
 
         if (isset($this->plugins[$o->type][$trigger])) {
             $plugins = $this->plugins[$o->type][$trigger];
diff --git a/system/ThirdParty/Kint/Parser/Plugin.php b/system/ThirdParty/Kint/Parser/Plugin.php
index 51d5f0b1440b..981d2aa56e1b 100644
--- a/system/ThirdParty/Kint/Parser/Plugin.php
+++ b/system/ThirdParty/Kint/Parser/Plugin.php
@@ -25,7 +25,7 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
+use Kint\Zval\Value;
 
 abstract class Plugin
 {
@@ -43,7 +43,7 @@ public function setParser(Parser $p)
      */
     public function getTypes()
     {
-        return array();
+        return [];
     }
 
     public function getTriggers()
@@ -51,5 +51,5 @@ public function getTriggers()
         return Parser::TRIGGER_NONE;
     }
 
-    abstract public function parse(&$variable, BasicObject &$o, $trigger);
+    abstract public function parse(&$var, Value &$o, $trigger);
 }
diff --git a/system/ThirdParty/Kint/Parser/ProxyPlugin.php b/system/ThirdParty/Kint/Parser/ProxyPlugin.php
index 3376d3aa9016..116f3883dbdb 100644
--- a/system/ThirdParty/Kint/Parser/ProxyPlugin.php
+++ b/system/ThirdParty/Kint/Parser/ProxyPlugin.php
@@ -26,7 +26,7 @@
 namespace Kint\Parser;
 
 use InvalidArgumentException;
-use Kint\Object\BasicObject;
+use Kint\Zval\Value;
 
 class ProxyPlugin extends Plugin
 {
@@ -59,8 +59,8 @@ public function getTriggers()
         return $this->triggers;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
-        return \call_user_func_array($this->callback, array(&$var, &$o, $trigger, $this->parser));
+        return \call_user_func_array($this->callback, [&$var, &$o, $trigger, $this->parser]);
     }
 }
diff --git a/system/ThirdParty/Kint/Parser/SerializePlugin.php b/system/ThirdParty/Kint/Parser/SerializePlugin.php
index c5dadb88d9de..5924483fc50e 100644
--- a/system/ThirdParty/Kint/Parser/SerializePlugin.php
+++ b/system/ThirdParty/Kint/Parser/SerializePlugin.php
@@ -25,8 +25,8 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
-use Kint\Object\Representation\Representation;
+use Kint\Zval\Representation\Representation;
+use Kint\Zval\Value;
 
 class SerializePlugin extends Plugin
 {
@@ -45,11 +45,11 @@ class SerializePlugin extends Plugin
      * @var bool
      */
     public static $safe_mode = true;
-    public static $options = array(true);
+    public static $options = [true];
 
     public function getTypes()
     {
-        return array('string');
+        return ['string'];
     }
 
     public function getTriggers()
@@ -57,7 +57,7 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         $trimmed = \rtrim($var);
 
@@ -65,7 +65,7 @@ public function parse(&$var, BasicObject &$o, $trigger)
             return;
         }
 
-        if (!self::$safe_mode || !\in_array($trimmed[0], array('C', 'O', 'a'), true)) {
+        if (!self::$safe_mode || !\in_array($trimmed[0], ['C', 'O', 'a'], true)) {
             // Second parameter only supported on PHP 7
             if (KINT_PHP70) {
                 // Suppress warnings on unserializeable variable
@@ -79,15 +79,15 @@ public function parse(&$var, BasicObject &$o, $trigger)
             }
         }
 
-        $base_obj = new BasicObject();
+        $base_obj = new Value();
         $base_obj->depth = $o->depth + 1;
         $base_obj->name = 'unserialize('.$o->name.')';
 
         if ($o->access_path) {
             $base_obj->access_path = 'unserialize('.$o->access_path;
-            if (!KINT_PHP70 || self::$options === array(true)) {
+            if (!KINT_PHP70 || self::$options === [true]) {
                 $base_obj->access_path .= ')';
-            } elseif (self::$options === array(false)) {
+            } elseif (self::$options === [false]) {
                 $base_obj->access_path .= ', false)';
             } else {
                 $base_obj->access_path .= ', Serialize::$options)';
diff --git a/system/ThirdParty/Kint/Parser/SimpleXMLElementPlugin.php b/system/ThirdParty/Kint/Parser/SimpleXMLElementPlugin.php
index b90c863f8873..9e44e5388ec8 100644
--- a/system/ThirdParty/Kint/Parser/SimpleXMLElementPlugin.php
+++ b/system/ThirdParty/Kint/Parser/SimpleXMLElementPlugin.php
@@ -25,9 +25,10 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
-use Kint\Object\BlobObject;
-use Kint\Object\Representation\Representation;
+use Kint\Zval\BlobValue;
+use Kint\Zval\Representation\Representation;
+use Kint\Zval\SimpleXMLElementValue;
+use Kint\Zval\Value;
 use SimpleXMLElement;
 
 class SimpleXMLElementPlugin extends Plugin
@@ -41,7 +42,7 @@ class SimpleXMLElementPlugin extends Plugin
 
     public function getTypes()
     {
-        return array('object');
+        return ['object'];
     }
 
     public function getTriggers()
@@ -49,106 +50,168 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         if (!$var instanceof SimpleXMLElement) {
             return;
         }
 
-        $o->hints[] = 'simplexml_element';
-
         if (!self::$verbose) {
             $o->removeRepresentation('properties');
             $o->removeRepresentation('iterator');
             $o->removeRepresentation('methods');
         }
 
+        // An invalid SimpleXMLElement can gum up the works with
+        // warnings if we call stuff children/attributes on it.
+        if (!$var) {
+            $o->size = null;
+
+            return;
+        }
+
+        $x = new SimpleXMLElementValue();
+        $x->transplant($o);
+
+        $namespaces = \array_merge([null], $var->getDocNamespaces());
+
         // Attributes
         $a = new Representation('Attributes');
 
-        $base_obj = new BasicObject();
-        $base_obj->depth = $o->depth;
+        $base_obj = new Value();
+        $base_obj->depth = $x->depth;
 
-        if ($o->access_path) {
-            $base_obj->access_path = '(string) '.$o->access_path;
+        if ($x->access_path) {
+            $base_obj->access_path = '(string) '.$x->access_path;
         }
 
-        if ($attribs = $var->attributes()) {
-            $attribs = \iterator_to_array($attribs);
-            $attribs = \array_map('strval', $attribs);
-        } else {
-            $attribs = array();
+        // Attributes are strings. If we're too deep set the
+        // depth limit to enable parsing them, but no deeper.
+        if ($this->parser->getDepthLimit() && $this->parser->getDepthLimit() - 2 < $base_obj->depth) {
+            $base_obj->depth = $this->parser->getDepthLimit() - 2;
         }
 
-        // XML attributes are by definition strings and don't have children,
-        // so up the depth limit in case we're just below the limit since
-        // there won't be any recursive stuff anyway.
-        $a->contents = $this->parser->parseDeep($attribs, $base_obj)->value->contents;
+        $attribs = [];
 
-        $o->addRepresentation($a, 0);
+        foreach ($namespaces as $nsAlias => $nsUrl) {
+            if ($nsAttribs = $var->attributes($nsUrl)) {
+                $cleanAttribs = [];
+                foreach ($nsAttribs as $name => $attrib) {
+                    $cleanAttribs[(string) $name] = $attrib;
+                }
 
-        // Children
-        // We need to check children() separately from the values we already parsed because
-        // text contents won't show up in children() but they will show up in properties.
-        //
-        // Why do we still need to check for attributes if we already have an attributes()
-        // method? Hell if I know!
-        $children = $var->children();
-
-        if ($o->value) {
-            $c = new Representation('Children');
-
-            foreach ($o->value->contents as $value) {
-                if ('@attributes' === $value->name) {
-                    continue;
+                if (null === $nsUrl) {
+                    $obj = clone $base_obj;
+                    if ($obj->access_path) {
+                        $obj->access_path .= '->attributes()';
+                    }
+
+                    $a->contents = $this->parser->parse($cleanAttribs, $obj)->value->contents;
+                } else {
+                    $obj = clone $base_obj;
+                    if ($obj->access_path) {
+                        $obj->access_path .= '->attributes('.\var_export($nsAlias, true).', true)';
+                    }
+
+                    $cleanAttribs = $this->parser->parse($cleanAttribs, $obj)->value->contents;
+
+                    foreach ($cleanAttribs as $attribute) {
+                        $attribute->name = $nsAlias.':'.$attribute->name;
+                        $a->contents[] = $attribute;
+                    }
                 }
+            }
+        }
+
+        $x->addRepresentation($a, 0);
 
-                if (isset($children->{$value->name})) {
-                    $i = 0;
+        // Children
+        $c = new Representation('Children');
+
+        foreach ($namespaces as $nsAlias => $nsUrl) {
+            // This is doubling items because of the root namespace
+            // and the implicit namespace on its children.
+            $thisNs = $var->getNamespaces();
+            if (isset($thisNs['']) && $thisNs[''] === $nsUrl) {
+                continue;
+            }
 
-                    while (isset($children->{$value->name}[$i])) {
-                        $base_obj = new BasicObject();
-                        $base_obj->depth = $o->depth + 1;
-                        $base_obj->name = $value->name;
-                        if ($value->access_path) {
-                            $base_obj->access_path = $value->access_path.'['.$i.']';
+            if ($nsChildren = $var->children($nsUrl)) {
+                $nsap = [];
+                foreach ($nsChildren as $name => $child) {
+                    $obj = new Value();
+                    $obj->depth = $x->depth + 1;
+                    $obj->name = (string) $name;
+                    if ($x->access_path) {
+                        if (null === $nsUrl) {
+                            $obj->access_path = $x->access_path.'->children()->';
+                        } else {
+                            $obj->access_path = $x->access_path.'->children('.\var_export($nsAlias, true).', true)->';
                         }
 
-                        $value = $this->parser->parse($children->{$value->name}[$i], $base_obj);
+                        if (\preg_match('/^[a-zA-Z_\\x7f-\\xff][a-zA-Z0-9_\\x7f-\\xff]+$/', (string) $name)) {
+                            $obj->access_path .= (string) $name;
+                        } else {
+                            $obj->access_path .= '{'.\var_export((string) $name, true).'}';
+                        }
 
-                        if ($value->access_path && 'string' === $value->type) {
-                            $value->access_path = '(string) '.$value->access_path;
+                        if (isset($nsap[$obj->access_path])) {
+                            ++$nsap[$obj->access_path];
+                            $obj->access_path .= '['.$nsap[$obj->access_path].']';
+                        } else {
+                            $nsap[$obj->access_path] = 0;
                         }
+                    }
 
-                        $c->contents[] = $value;
+                    $value = $this->parser->parse($child, $obj);
 
-                        ++$i;
+                    if ($value->access_path && 'string' === $value->type) {
+                        $value->access_path = '(string) '.$value->access_path;
                     }
+
+                    $c->contents[] = $value;
                 }
             }
+        }
 
-            $o->size = \count($c->contents);
+        $x->size = \count($c->contents);
 
-            if (!$o->size) {
-                $o->size = null;
+        if ($x->size) {
+            $x->addRepresentation($c, 0);
+        } else {
+            $x->size = null;
+
+            if (\strlen((string) $var)) {
+                $base_obj = new BlobValue();
+                $base_obj->depth = $x->depth + 1;
+                $base_obj->name = $x->name;
+                if ($x->access_path) {
+                    $base_obj->access_path = '(string) '.$x->access_path;
+                }
+
+                $value = (string) $var;
+
+                $s = $this->parser->parse($value, $base_obj);
+                $srep = $s->getRepresentation('contents');
+                $svalrep = $s->value && 'contents' == $s->value->getName() ? $s : null;
 
-                if (\strlen((string) $var)) {
-                    $base_obj = new BlobObject();
-                    $base_obj->depth = $o->depth + 1;
-                    $base_obj->name = $o->name;
-                    if ($o->access_path) {
-                        $base_obj->access_path = '(string) '.$o->access_path;
+                if ($srep || $svalrep) {
+                    $x->setIsStringValue(true);
+                    $x->value = $srep ?: $svalrep;
+
+                    if ($srep) {
+                        $x->replaceRepresentation($x->value, 0);
                     }
+                }
 
-                    $value = (string) $var;
+                $reps = \array_reverse($s->getRepresentations());
 
-                    $c = new Representation('Contents');
-                    $c->implicit_label = true;
-                    $c->contents = array($this->parser->parseDeep($value, $base_obj));
+                foreach ($reps as $rep) {
+                    $x->addRepresentation($rep, 0);
                 }
             }
-
-            $o->addRepresentation($c, 0);
         }
+
+        $o = $x;
     }
 }
diff --git a/system/ThirdParty/Kint/Parser/SplFileInfoPlugin.php b/system/ThirdParty/Kint/Parser/SplFileInfoPlugin.php
index 8b72193bc369..ada3e1fb8e85 100644
--- a/system/ThirdParty/Kint/Parser/SplFileInfoPlugin.php
+++ b/system/ThirdParty/Kint/Parser/SplFileInfoPlugin.php
@@ -25,8 +25,8 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
-use Kint\Object\Representation\SplFileInfoRepresentation;
+use Kint\Zval\Representation\SplFileInfoRepresentation;
+use Kint\Zval\Value;
 use SplFileInfo;
 use SplFileObject;
 
@@ -34,7 +34,7 @@ class SplFileInfoPlugin extends Plugin
 {
     public function getTypes()
     {
-        return array('object');
+        return ['object'];
     }
 
     public function getTriggers()
@@ -42,7 +42,7 @@ public function getTriggers()
         return Parser::TRIGGER_COMPLETE;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         if (!$var instanceof SplFileInfo || $var instanceof SplFileObject) {
             return;
diff --git a/system/ThirdParty/Kint/Parser/SplObjectStoragePlugin.php b/system/ThirdParty/Kint/Parser/SplObjectStoragePlugin.php
index 03ff301d3477..359774d3bfff 100644
--- a/system/ThirdParty/Kint/Parser/SplObjectStoragePlugin.php
+++ b/system/ThirdParty/Kint/Parser/SplObjectStoragePlugin.php
@@ -25,14 +25,14 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
+use Kint\Zval\Value;
 use SplObjectStorage;
 
 class SplObjectStoragePlugin extends Plugin
 {
     public function getTypes()
     {
-        return array('object');
+        return ['object'];
     }
 
     public function getTriggers()
@@ -40,7 +40,7 @@ public function getTriggers()
         return Parser::TRIGGER_COMPLETE;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         if (!$var instanceof SplObjectStorage || !($r = $o->getRepresentation('iterator'))) {
             return;
diff --git a/system/ThirdParty/Kint/Parser/StreamPlugin.php b/system/ThirdParty/Kint/Parser/StreamPlugin.php
index 464a3fff12c5..76608d94a6a6 100644
--- a/system/ThirdParty/Kint/Parser/StreamPlugin.php
+++ b/system/ThirdParty/Kint/Parser/StreamPlugin.php
@@ -25,16 +25,16 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
-use Kint\Object\Representation\Representation;
-use Kint\Object\ResourceObject;
-use Kint\Object\StreamObject;
+use Kint\Zval\Representation\Representation;
+use Kint\Zval\ResourceValue;
+use Kint\Zval\StreamValue;
+use Kint\Zval\Value;
 
 class StreamPlugin extends Plugin
 {
     public function getTypes()
     {
-        return array('resource');
+        return ['resource'];
     }
 
     public function getTriggers()
@@ -42,20 +42,23 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
-        if (!$o instanceof ResourceObject || 'stream' !== $o->resource_type) {
+        if (!$o instanceof ResourceValue || 'stream' !== $o->resource_type) {
             return;
         }
 
-        if (!$meta = \stream_get_meta_data($var)) {
+        // Doublecheck that the resource is open before we get the metadata
+        if (!\is_resource($var)) {
             return;
         }
 
+        $meta = \stream_get_meta_data($var);
+
         $rep = new Representation('Stream');
         $rep->implicit_label = true;
 
-        $base_obj = new BasicObject();
+        $base_obj = new Value();
         $base_obj->depth = $o->depth;
 
         if ($o->access_path) {
@@ -71,7 +74,7 @@ public function parse(&$var, BasicObject &$o, $trigger)
         $o->addRepresentation($rep, 0);
         $o->value = $rep;
 
-        $stream = new StreamObject($meta);
+        $stream = new StreamValue($meta);
         $stream->transplant($o);
         $o = $stream;
     }
diff --git a/system/ThirdParty/Kint/Parser/TablePlugin.php b/system/ThirdParty/Kint/Parser/TablePlugin.php
index 510c4ff0ef86..c6ca6e248d68 100644
--- a/system/ThirdParty/Kint/Parser/TablePlugin.php
+++ b/system/ThirdParty/Kint/Parser/TablePlugin.php
@@ -25,14 +25,14 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
-use Kint\Object\Representation\Representation;
+use Kint\Zval\Representation\Representation;
+use Kint\Zval\Value;
 
 class TablePlugin extends Plugin
 {
     public function getTypes()
     {
-        return array('array');
+        return ['array'];
     }
 
     public function getTriggers()
@@ -40,7 +40,7 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         if (empty($o->value->contents)) {
             return;
diff --git a/system/ThirdParty/Kint/Parser/ThrowablePlugin.php b/system/ThirdParty/Kint/Parser/ThrowablePlugin.php
index 8490d1d41a1a..ea343e96ee78 100644
--- a/system/ThirdParty/Kint/Parser/ThrowablePlugin.php
+++ b/system/ThirdParty/Kint/Parser/ThrowablePlugin.php
@@ -26,16 +26,16 @@
 namespace Kint\Parser;
 
 use Exception;
-use Kint\Object\BasicObject;
-use Kint\Object\Representation\SourceRepresentation;
-use Kint\Object\ThrowableObject;
+use Kint\Zval\Representation\SourceRepresentation;
+use Kint\Zval\ThrowableValue;
+use Kint\Zval\Value;
 use Throwable;
 
 class ThrowablePlugin extends Plugin
 {
     public function getTypes()
     {
-        return array('object');
+        return ['object'];
     }
 
     public function getTriggers()
@@ -43,13 +43,13 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         if (!$var instanceof Exception && (!KINT_PHP70 || !$var instanceof Throwable)) {
             return;
         }
 
-        $throw = new ThrowableObject($var);
+        $throw = new ThrowableValue($var);
         $throw->transplant($o);
         $r = new SourceRepresentation($var->getFile(), $var->getLine());
         $r->showfilename = true;
diff --git a/system/ThirdParty/Kint/Parser/TimestampPlugin.php b/system/ThirdParty/Kint/Parser/TimestampPlugin.php
index 72958d6465c0..fa8d743dea89 100644
--- a/system/ThirdParty/Kint/Parser/TimestampPlugin.php
+++ b/system/ThirdParty/Kint/Parser/TimestampPlugin.php
@@ -25,20 +25,20 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
+use Kint\Zval\Value;
 
 class TimestampPlugin extends Plugin
 {
-    public static $blacklist = array(
+    public static $blacklist = [
         2147483648,
         2147483647,
         1073741824,
         1073741823,
-    );
+    ];
 
     public function getTypes()
     {
-        return array('string', 'integer');
+        return ['string', 'integer'];
     }
 
     public function getTriggers()
@@ -46,7 +46,7 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         if (\is_string($var) && !\ctype_digit($var)) {
             return;
@@ -56,7 +56,7 @@ public function parse(&$var, BasicObject &$o, $trigger)
             return;
         }
 
-        $len = \strlen($var);
+        $len = \strlen((string) $var);
 
         // Guess for anything between March 1973 and November 2286
         if (9 === $len || 10 === $len) {
diff --git a/system/ThirdParty/Kint/Parser/ToStringPlugin.php b/system/ThirdParty/Kint/Parser/ToStringPlugin.php
index 8b7a65fe60f5..d13cb29cc93b 100644
--- a/system/ThirdParty/Kint/Parser/ToStringPlugin.php
+++ b/system/ThirdParty/Kint/Parser/ToStringPlugin.php
@@ -25,20 +25,20 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
-use Kint\Object\Representation\Representation;
+use Kint\Zval\Representation\Representation;
+use Kint\Zval\Value;
 use ReflectionClass;
 
 class ToStringPlugin extends Plugin
 {
-    public static $blacklist = array(
+    public static $blacklist = [
         'SimpleXMLElement',
         'SplFileObject',
-    );
+    ];
 
     public function getTypes()
     {
-        return array('object');
+        return ['object'];
     }
 
     public function getTriggers()
@@ -46,7 +46,7 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         $reflection = new ReflectionClass($var);
         if (!$reflection->hasMethod('__toString')) {
diff --git a/system/ThirdParty/Kint/Parser/TracePlugin.php b/system/ThirdParty/Kint/Parser/TracePlugin.php
index 3554993dd2e1..ccdcadec59a8 100644
--- a/system/ThirdParty/Kint/Parser/TracePlugin.php
+++ b/system/ThirdParty/Kint/Parser/TracePlugin.php
@@ -25,18 +25,19 @@
 
 namespace Kint\Parser;
 
-use Kint\Object\BasicObject;
-use Kint\Object\TraceFrameObject;
-use Kint\Object\TraceObject;
 use Kint\Utils;
+use Kint\Zval\TraceFrameValue;
+use Kint\Zval\TraceValue;
+use Kint\Zval\Value;
 
 class TracePlugin extends Plugin
 {
-    public static $blacklist = array('spl_autoload_call');
+    public static $blacklist = ['spl_autoload_call'];
+    public static $path_blacklist = [];
 
     public function getTypes()
     {
-        return array('array');
+        return ['array'];
     }
 
     public function getTriggers()
@@ -44,27 +45,29 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         if (!$o->value) {
             return;
         }
 
+        /** @var array[] $trace Psalm workaround */
         $trace = $this->parser->getCleanArray($var);
 
         if (\count($trace) !== \count($o->value->contents) || !Utils::isTrace($trace)) {
             return;
         }
 
-        $traceobj = new TraceObject();
+        $traceobj = new TraceValue();
         $traceobj->transplant($o);
         $rep = $traceobj->value;
 
         $old_trace = $rep->contents;
 
         Utils::normalizeAliases(self::$blacklist);
+        $path_blacklist = self::normalizePaths(self::$path_blacklist);
 
-        $rep->contents = array();
+        $rep->contents = [];
 
         foreach ($old_trace as $frame) {
             $index = $frame->name;
@@ -78,7 +81,16 @@ public function parse(&$var, BasicObject &$o, $trigger)
                 continue;
             }
 
-            $rep->contents[$index] = new TraceFrameObject($frame, $trace[$index]);
+            if (isset($trace[$index]['file'])) {
+                $realfile = \realpath($trace[$index]['file']);
+                foreach ($path_blacklist as $path) {
+                    if (0 === \strpos($realfile, $path)) {
+                        continue 2;
+                    }
+                }
+            }
+
+            $rep->contents[$index] = new TraceFrameValue($frame, $trace[$index]);
         }
 
         \ksort($rep->contents);
@@ -89,4 +101,20 @@ public function parse(&$var, BasicObject &$o, $trigger)
         $traceobj->size = \count($rep->contents);
         $o = $traceobj;
     }
+
+    protected static function normalizePaths(array $paths)
+    {
+        $normalized = [];
+
+        foreach ($paths as $path) {
+            $realpath = \realpath($path);
+            if (\is_dir($realpath)) {
+                $realpath .= DIRECTORY_SEPARATOR;
+            }
+
+            $normalized[] = $realpath;
+        }
+
+        return $normalized;
+    }
 }
diff --git a/system/ThirdParty/Kint/Parser/XmlPlugin.php b/system/ThirdParty/Kint/Parser/XmlPlugin.php
index 0947e9a6cb14..a4fa2b0c21c8 100644
--- a/system/ThirdParty/Kint/Parser/XmlPlugin.php
+++ b/system/ThirdParty/Kint/Parser/XmlPlugin.php
@@ -27,8 +27,8 @@
 
 use DOMDocument;
 use Exception;
-use Kint\Object\BasicObject;
-use Kint\Object\Representation\Representation;
+use Kint\Zval\Representation\Representation;
+use Kint\Zval\Value;
 
 class XmlPlugin extends Plugin
 {
@@ -45,7 +45,7 @@ class XmlPlugin extends Plugin
 
     public function getTypes()
     {
-        return array('string');
+        return ['string'];
     }
 
     public function getTriggers()
@@ -53,7 +53,7 @@ public function getTriggers()
         return Parser::TRIGGER_SUCCESS;
     }
 
-    public function parse(&$var, BasicObject &$o, $trigger)
+    public function parse(&$var, Value &$o, $trigger)
     {
         if ('<?xml' !== \substr($var, 0, 5)) {
             return;
@@ -63,7 +63,7 @@ public function parse(&$var, BasicObject &$o, $trigger)
             return;
         }
 
-        $xml = \call_user_func(array(\get_class($this), 'xmlTo'.self::$parse_method), $var, $o->access_path);
+        $xml = \call_user_func([\get_class($this), 'xmlTo'.self::$parse_method], $var, $o->access_path);
 
         if (empty($xml)) {
             return;
@@ -71,7 +71,7 @@ public function parse(&$var, BasicObject &$o, $trigger)
 
         list($xml, $access_path, $name) = $xml;
 
-        $base_obj = new BasicObject();
+        $base_obj = new Value();
         $base_obj->depth = $o->depth + 1;
         $base_obj->name = $name;
         $base_obj->access_path = $access_path;
@@ -96,7 +96,7 @@ protected static function xmlToSimpleXML($var, $parent_path)
             return;
         }
 
-        if (!$xml) {
+        if (false === $xml) {
             return;
         }
 
@@ -108,7 +108,7 @@ protected static function xmlToSimpleXML($var, $parent_path)
 
         $name = $xml->getName();
 
-        return array($xml, $access_path, $name);
+        return [$xml, $access_path, $name];
     }
 
     /**
@@ -135,16 +135,23 @@ protected static function xmlToDOMDocument($var, $parent_path)
 
         $xml = new DOMDocument();
         $xml->loadXML($var);
-        $xml = $xml->firstChild;
+
+        if ($xml->childNodes->count() > 1) {
+            $xml = $xml->childNodes;
+            $access_path = 'childNodes';
+        } else {
+            $xml = $xml->firstChild;
+            $access_path = 'firstChild';
+        }
 
         if (null === $parent_path) {
             $access_path = null;
         } else {
-            $access_path = '@\\DOMDocument::loadXML('.$parent_path.')->firstChild';
+            $access_path = '(function($s){$x = new \\DomDocument(); $x->loadXML($s); return $x;})('.$parent_path.')->'.$access_path;
         }
 
-        $name = $xml->nodeName;
+        $name = isset($xml->nodeName) ? $xml->nodeName : null;
 
-        return array($xml, $access_path, $name);
+        return [$xml, $access_path, $name];
     }
 }
diff --git a/system/ThirdParty/Kint/Renderer/CliRenderer.php b/system/ThirdParty/Kint/Renderer/CliRenderer.php
index 0d0846a411c3..f86671ff1cf3 100644
--- a/system/ThirdParty/Kint/Renderer/CliRenderer.php
+++ b/system/ThirdParty/Kint/Renderer/CliRenderer.php
@@ -25,7 +25,9 @@
 
 namespace Kint\Renderer;
 
-use Kint\Object\BasicObject;
+use Exception;
+use Kint\Zval\Value;
+use Throwable;
 
 class CliRenderer extends TextRenderer
 {
@@ -73,7 +75,13 @@ public function __construct()
 
         if (!self::$terminal_width) {
             if (!KINT_WIN && self::$detect_width) {
-                self::$terminal_width = \exec('tput cols');
+                try {
+                    self::$terminal_width = \exec('tput cols');
+                } catch (Exception $e) {
+                    self::$terminal_width = self::$default_width;
+                } catch (Throwable $t) {
+                    self::$terminal_width = self::$default_width;
+                }
             }
 
             if (self::$terminal_width < self::$min_terminal_width) {
@@ -113,7 +121,7 @@ public function colorTitle($string)
         return "\x1b[36m".\str_replace("\n", "\x1b[0m\n\x1b[36m", $string)."\x1b[0m";
     }
 
-    public function renderTitle(BasicObject $o)
+    public function renderTitle(Value $o)
     {
         if ($this->windows_output) {
             return $this->utf8ToWindows(parent::renderTitle($o));
@@ -144,8 +152,8 @@ public function escape($string, $encoding = false)
     protected function utf8ToWindows($string)
     {
         return \str_replace(
-            array('┌', '═', '┐', '│', '└', '─', '┘'),
-            array("\xda", "\xdc", "\xbf", "\xb3", "\xc0", "\xc4", "\xd9"),
+            ['┌', '═', '┐', '│', '└', '─', '┘'],
+            ["\xda", "\xdc", "\xbf", "\xb3", "\xc0", "\xc4", "\xd9"],
             $string
         );
     }
diff --git a/system/ThirdParty/Kint/Renderer/PlainRenderer.php b/system/ThirdParty/Kint/Renderer/PlainRenderer.php
index 493a7743bed4..4b8102a4750f 100644
--- a/system/ThirdParty/Kint/Renderer/PlainRenderer.php
+++ b/system/ThirdParty/Kint/Renderer/PlainRenderer.php
@@ -26,21 +26,21 @@
 namespace Kint\Renderer;
 
 use Kint\Kint;
-use Kint\Object\BasicObject;
-use Kint\Object\BlobObject;
+use Kint\Zval\BlobValue;
+use Kint\Zval\Value;
 
 class PlainRenderer extends TextRenderer
 {
-    public static $pre_render_sources = array(
-        'script' => array(
-            array('Kint\\Renderer\\PlainRenderer', 'renderJs'),
-            array('Kint\\Renderer\\Text\\MicrotimePlugin', 'renderJs'),
-        ),
-        'style' => array(
-            array('Kint\\Renderer\\PlainRenderer', 'renderCss'),
-        ),
-        'raw' => array(),
-    );
+    public static $pre_render_sources = [
+        'script' => [
+            ['Kint\\Renderer\\PlainRenderer', 'renderJs'],
+            ['Kint\\Renderer\\Text\\MicrotimePlugin', 'renderJs'],
+        ],
+        'style' => [
+            ['Kint\\Renderer\\PlainRenderer', 'renderCss'],
+        ],
+        'raw' => [],
+    ];
 
     /**
      * Path to the CSS file to load by default.
@@ -118,7 +118,7 @@ public function colorTitle($string)
         return '<u>'.$string.'</u>';
     }
 
-    public function renderTitle(BasicObject $o)
+    public function renderTitle(Value $o)
     {
         if (self::$disable_utf8) {
             return $this->utf8ToHtmlentity(parent::renderTitle($o));
@@ -193,7 +193,7 @@ public function ideLink($file, $line)
     public function escape($string, $encoding = false)
     {
         if (false === $encoding) {
-            $encoding = BlobObject::detectEncoding($string);
+            $encoding = BlobValue::detectEncoding($string);
         }
 
         $original_encoding = $encoding;
@@ -206,7 +206,7 @@ public function escape($string, $encoding = false)
 
         // this call converts all non-ASCII characters into numeirc htmlentities
         if (\function_exists('mb_encode_numericentity') && 'ASCII' !== $original_encoding) {
-            $string = \mb_encode_numericentity($string, array(0x80, 0xffff, 0, 0xffff), $encoding);
+            $string = \mb_encode_numericentity($string, [0x80, 0xFFFF, 0, 0xFFFF], $encoding);
         }
 
         return $string;
@@ -215,8 +215,8 @@ public function escape($string, $encoding = false)
     protected function utf8ToHtmlentity($string)
     {
         return \str_replace(
-            array('┌', '═', '┐', '│', '└', '─', '┘'),
-            array('&#9484;', '&#9552;', '&#9488;', '&#9474;', '&#9492;', '&#9472;', '&#9496;'),
+            ['┌', '═', '┐', '│', '└', '─', '┘'],
+            ['&#9484;', '&#9552;', '&#9488;', '&#9474;', '&#9492;', '&#9472;', '&#9496;'],
             $string
         );
     }
diff --git a/system/ThirdParty/Kint/Renderer/Renderer.php b/system/ThirdParty/Kint/Renderer/Renderer.php
index cf8b0a781179..0ed7ce0895b5 100644
--- a/system/ThirdParty/Kint/Renderer/Renderer.php
+++ b/system/ThirdParty/Kint/Renderer/Renderer.php
@@ -25,8 +25,8 @@
 
 namespace Kint\Renderer;
 
-use Kint\Object\BasicObject;
-use Kint\Object\InstanceObject;
+use Kint\Zval\InstanceValue;
+use Kint\Zval\Value;
 
 abstract class Renderer
 {
@@ -34,11 +34,11 @@ abstract class Renderer
     const SORT_VISIBILITY = 1;
     const SORT_FULL = 2;
 
-    protected $call_info = array();
-    protected $statics = array();
+    protected $call_info = [];
+    protected $statics = [];
     protected $show_trace = true;
 
-    abstract public function render(BasicObject $o);
+    abstract public function render(Value $o);
 
     abstract public function renderNothing();
 
@@ -49,7 +49,7 @@ public function setCallInfo(array $info)
         }
 
         if (!isset($info['modifiers']) || !\is_array($info['modifiers'])) {
-            $info['modifiers'] = array();
+            $info['modifiers'] = [];
         }
 
         if (!isset($info['callee'])) {
@@ -61,16 +61,16 @@ public function setCallInfo(array $info)
         }
 
         if (!isset($info['trace']) || !\is_array($info['trace'])) {
-            $info['trace'] = array();
+            $info['trace'] = [];
         }
 
-        $this->call_info = array(
+        $this->call_info = [
             'params' => $info['params'],
             'modifiers' => $info['modifiers'],
             'callee' => $info['callee'],
             'caller' => $info['caller'],
             'trace' => $info['trace'],
-        );
+        ];
     }
 
     public function getCallInfo()
@@ -109,7 +109,7 @@ public function getShowTrace()
      */
     public function matchPlugins(array $plugins, array $hints)
     {
-        $out = array();
+        $out = [];
 
         foreach ($hints as $key) {
             if (isset($plugins[$key])) {
@@ -135,40 +135,40 @@ public function postRender()
         return '';
     }
 
-    public static function sortPropertiesFull(BasicObject $a, BasicObject $b)
+    public static function sortPropertiesFull(Value $a, Value $b)
     {
-        $sort = BasicObject::sortByAccess($a, $b);
+        $sort = Value::sortByAccess($a, $b);
         if ($sort) {
             return $sort;
         }
 
-        $sort = BasicObject::sortByName($a, $b);
+        $sort = Value::sortByName($a, $b);
         if ($sort) {
             return $sort;
         }
 
-        return InstanceObject::sortByHierarchy($a->owner_class, $b->owner_class);
+        return InstanceValue::sortByHierarchy($a->owner_class, $b->owner_class);
     }
 
     /**
-     * Sorts an array of BasicObject.
+     * Sorts an array of Value.
      *
-     * @param BasicObject[] $contents Object properties to sort
-     * @param int           $sort
+     * @param Value[] $contents Object properties to sort
+     * @param int     $sort
      *
-     * @return BasicObject[]
+     * @return Value[]
      */
     public static function sortProperties(array $contents, $sort)
     {
         switch ($sort) {
             case self::SORT_VISIBILITY:
-                /** @var array<array-key, BasicObject[]> Containers to quickly stable sort by type */
-                $containers = array(
-                    BasicObject::ACCESS_PUBLIC => array(),
-                    BasicObject::ACCESS_PROTECTED => array(),
-                    BasicObject::ACCESS_PRIVATE => array(),
-                    BasicObject::ACCESS_NONE => array(),
-                );
+                // Containers to quickly stable sort by type
+                $containers = [
+                    Value::ACCESS_PUBLIC => [],
+                    Value::ACCESS_PROTECTED => [],
+                    Value::ACCESS_PRIVATE => [],
+                    Value::ACCESS_NONE => [],
+                ];
 
                 foreach ($contents as $item) {
                     $containers[$item->access][] = $item;
@@ -176,7 +176,7 @@ public static function sortProperties(array $contents, $sort)
 
                 return \call_user_func_array('array_merge', $containers);
             case self::SORT_FULL:
-                \usort($contents, array('Kint\\Renderer\\Renderer', 'sortPropertiesFull'));
+                \usort($contents, ['Kint\\Renderer\\Renderer', 'sortPropertiesFull']);
                 // no break
             default:
                 return $contents;
diff --git a/system/ThirdParty/Kint/Renderer/Rich/ArrayLimitPlugin.php b/system/ThirdParty/Kint/Renderer/Rich/ArrayLimitPlugin.php
new file mode 100644
index 000000000000..e6ebe569b85e
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Rich/ArrayLimitPlugin.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Šleinius (raveren@gmail.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace Kint\Renderer\Rich;
+
+use Kint\Zval\Value;
+
+class ArrayLimitPlugin extends Plugin implements ValuePluginInterface
+{
+    public function renderValue(Value $o)
+    {
+        return '<dl>'.$this->renderLockedHeader($o, '<var>Array Limit</var>').'</dl>';
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Rich/BinaryPlugin.php b/system/ThirdParty/Kint/Renderer/Rich/BinaryPlugin.php
index 5b4d613fdce6..b12690a49969 100644
--- a/system/ThirdParty/Kint/Renderer/Rich/BinaryPlugin.php
+++ b/system/ThirdParty/Kint/Renderer/Rich/BinaryPlugin.php
@@ -25,7 +25,7 @@
 
 namespace Kint\Renderer\Rich;
 
-use Kint\Object\Representation\Representation;
+use Kint\Zval\Representation\Representation;
 
 class BinaryPlugin extends Plugin implements TabPluginInterface
 {
@@ -36,12 +36,17 @@ public function renderTab(Representation $r)
     {
         $out = '<pre>';
 
-        $chunks = \str_split($r->contents, self::$line_length);
+        /** @var string[] Psalm bug workaround */
+        $lines = \str_split($r->contents, self::$line_length);
 
-        foreach ($chunks as $index => $chunk) {
+        foreach ($lines as $index => $line) {
             $out .= \sprintf('%08X', $index * self::$line_length).":\t";
-            $out .= \implode(' ', \str_split(\str_pad(\bin2hex($chunk), 2 * self::$line_length, ' '), self::$chunk_length));
-            $out .= "\t".\preg_replace('/[^\\x20-\\x7E]/', '.', $chunk)."\n";
+
+            /** @var string[] Psalm bug workaround */
+            $chunks = \str_split(\str_pad(\bin2hex($line), 2 * self::$line_length, ' '), self::$chunk_length);
+
+            $out .= \implode(' ', $chunks);
+            $out .= "\t".\preg_replace('/[^\\x20-\\x7E]/', '.', $line)."\n";
         }
 
         $out .= '</pre>';
diff --git a/system/ThirdParty/Kint/Renderer/Rich/BlacklistPlugin.php b/system/ThirdParty/Kint/Renderer/Rich/BlacklistPlugin.php
index fcfedc1a00be..ed7f4ec96495 100644
--- a/system/ThirdParty/Kint/Renderer/Rich/BlacklistPlugin.php
+++ b/system/ThirdParty/Kint/Renderer/Rich/BlacklistPlugin.php
@@ -25,11 +25,11 @@
 
 namespace Kint\Renderer\Rich;
 
-use Kint\Object\BasicObject;
+use Kint\Zval\Value;
 
-class BlacklistPlugin extends Plugin implements ObjectPluginInterface
+class BlacklistPlugin extends Plugin implements ValuePluginInterface
 {
-    public function renderObject(BasicObject $o)
+    public function renderValue(Value $o)
     {
         return '<dl>'.$this->renderLockedHeader($o, '<var>Blacklisted</var>').'</dl>';
     }
diff --git a/system/ThirdParty/Kint/Renderer/Rich/CallablePlugin.php b/system/ThirdParty/Kint/Renderer/Rich/CallablePlugin.php
index 5834017ba550..b28b56a07ad1 100644
--- a/system/ThirdParty/Kint/Renderer/Rich/CallablePlugin.php
+++ b/system/ThirdParty/Kint/Renderer/Rich/CallablePlugin.php
@@ -25,30 +25,30 @@
 
 namespace Kint\Renderer\Rich;
 
-use Kint\Object\BasicObject;
-use Kint\Object\BlobObject;
-use Kint\Object\ClosureObject;
-use Kint\Object\MethodObject;
 use Kint\Renderer\RichRenderer;
+use Kint\Utils;
+use Kint\Zval\ClosureValue;
+use Kint\Zval\MethodValue;
+use Kint\Zval\Value;
 
-class CallablePlugin extends Plugin implements ObjectPluginInterface
+class CallablePlugin extends Plugin implements ValuePluginInterface
 {
-    protected static $method_cache = array();
+    protected static $method_cache = [];
 
-    public function renderObject(BasicObject $o)
+    public function renderValue(Value $o)
     {
-        if ($o instanceof MethodObject) {
+        if ($o instanceof MethodValue) {
             return $this->renderMethod($o);
         }
 
-        if ($o instanceof ClosureObject) {
+        if ($o instanceof ClosureValue) {
             return $this->renderClosure($o);
         }
 
         return $this->renderCallable($o);
     }
 
-    protected function renderClosure(ClosureObject $o)
+    protected function renderClosure(ClosureValue $o)
     {
         $children = $this->renderer->renderChildren($o);
 
@@ -63,8 +63,8 @@ protected function renderClosure(ClosureObject $o)
         }
 
         if (null !== ($s = $o->getValueShort())) {
-            if (RichRenderer::$strlen_max && BlobObject::strlen($s) > RichRenderer::$strlen_max) {
-                $s = \substr($s, 0, RichRenderer::$strlen_max).'...';
+            if (RichRenderer::$strlen_max) {
+                $s = Utils::truncateString($s, RichRenderer::$strlen_max);
             }
             $header .= ' '.$this->renderer->escape($s);
         }
@@ -72,7 +72,7 @@ protected function renderClosure(ClosureObject $o)
         return '<dl>'.$this->renderer->renderHeaderWrapper($o, (bool) \strlen($children), $header).$children.'</dl>';
     }
 
-    protected function renderCallable(BasicObject $o)
+    protected function renderCallable(Value $o)
     {
         $children = $this->renderer->renderChildren($o);
 
@@ -87,8 +87,8 @@ protected function renderCallable(BasicObject $o)
         }
 
         if (null !== ($s = $o->getValueShort())) {
-            if (RichRenderer::$strlen_max && BlobObject::strlen($s) > RichRenderer::$strlen_max) {
-                $s = \substr($s, 0, RichRenderer::$strlen_max).'...';
+            if (RichRenderer::$strlen_max) {
+                $s = Utils::truncateString($s, RichRenderer::$strlen_max);
             }
             $header .= ' '.$this->renderer->escape($s);
         }
@@ -96,7 +96,7 @@ protected function renderCallable(BasicObject $o)
         return '<dl>'.$this->renderer->renderHeaderWrapper($o, (bool) \strlen($children), $header).$children.'</dl>';
     }
 
-    protected function renderMethod(MethodObject $o)
+    protected function renderMethod(MethodValue $o)
     {
         if (!empty(self::$method_cache[$o->owner_class][$o->name])) {
             $children = self::$method_cache[$o->owner_class][$o->name]['children'];
@@ -154,17 +154,17 @@ protected function renderMethod(MethodObject $o)
         }
 
         if (null !== ($s = $o->getValueShort())) {
-            if (RichRenderer::$strlen_max && BlobObject::strlen($s) > RichRenderer::$strlen_max) {
-                $s = \substr($s, 0, RichRenderer::$strlen_max).'...';
+            if (RichRenderer::$strlen_max) {
+                $s = Utils::truncateString($s, RichRenderer::$strlen_max);
             }
             $header .= ' '.$this->renderer->escape($s);
         }
 
         if (\strlen($o->owner_class) && \strlen($o->name)) {
-            self::$method_cache[$o->owner_class][$o->name] = array(
+            self::$method_cache[$o->owner_class][$o->name] = [
                 'header' => $header,
                 'children' => $children,
-            );
+            ];
         }
 
         $header = $this->renderer->renderHeaderWrapper($o, (bool) \strlen($children), $header);
diff --git a/system/ThirdParty/Kint/Renderer/Rich/ClosurePlugin.php b/system/ThirdParty/Kint/Renderer/Rich/ClosurePlugin.php
index 79a9926cab7f..44813e3ef89f 100644
--- a/system/ThirdParty/Kint/Renderer/Rich/ClosurePlugin.php
+++ b/system/ThirdParty/Kint/Renderer/Rich/ClosurePlugin.php
@@ -26,16 +26,16 @@
 namespace Kint\Renderer\Rich;
 
 use Kint\Kint;
-use Kint\Object\BasicObject;
-use Kint\Object\ClosureObject;
+use Kint\Zval\ClosureValue;
+use Kint\Zval\Value;
 
-class ClosurePlugin extends Plugin implements ObjectPluginInterface
+class ClosurePlugin extends Plugin implements ValuePluginInterface
 {
-    public function renderObject(BasicObject $o)
+    public function renderValue(Value $o)
     {
         $children = $this->renderer->renderChildren($o);
 
-        if (!($o instanceof ClosureObject)) {
+        if (!($o instanceof ClosureValue)) {
             $header = $this->renderer->renderHeader($o);
         } else {
             $header = '';
diff --git a/system/ThirdParty/Kint/Renderer/Rich/ColorPlugin.php b/system/ThirdParty/Kint/Renderer/Rich/ColorPlugin.php
index 241a8154f430..ebd02cb59e24 100644
--- a/system/ThirdParty/Kint/Renderer/Rich/ColorPlugin.php
+++ b/system/ThirdParty/Kint/Renderer/Rich/ColorPlugin.php
@@ -25,13 +25,13 @@
 
 namespace Kint\Renderer\Rich;
 
-use Kint\Object\BasicObject;
-use Kint\Object\Representation\ColorRepresentation;
-use Kint\Object\Representation\Representation;
+use Kint\Zval\Representation\ColorRepresentation;
+use Kint\Zval\Representation\Representation;
+use Kint\Zval\Value;
 
-class ColorPlugin extends Plugin implements TabPluginInterface, ObjectPluginInterface
+class ColorPlugin extends Plugin implements TabPluginInterface, ValuePluginInterface
 {
-    public function renderObject(BasicObject $o)
+    public function renderValue(Value $o)
     {
         $r = $o->getRepresentation('color');
 
@@ -92,7 +92,7 @@ public function renderTab(Representation $r)
         }
 
         if (!\strlen($out)) {
-            return false;
+            return;
         }
 
         return '<pre>'.$out.'</pre>';
diff --git a/system/ThirdParty/Kint/Renderer/Rich/DepthLimitPlugin.php b/system/ThirdParty/Kint/Renderer/Rich/DepthLimitPlugin.php
index cd92b417985c..69808c7c3e1d 100644
--- a/system/ThirdParty/Kint/Renderer/Rich/DepthLimitPlugin.php
+++ b/system/ThirdParty/Kint/Renderer/Rich/DepthLimitPlugin.php
@@ -25,11 +25,11 @@
 
 namespace Kint\Renderer\Rich;
 
-use Kint\Object\BasicObject;
+use Kint\Zval\Value;
 
-class DepthLimitPlugin extends Plugin implements ObjectPluginInterface
+class DepthLimitPlugin extends Plugin implements ValuePluginInterface
 {
-    public function renderObject(BasicObject $o)
+    public function renderValue(Value $o)
     {
         return '<dl>'.$this->renderLockedHeader($o, '<var>Depth Limit</var>').'</dl>';
     }
diff --git a/system/ThirdParty/Kint/Renderer/Rich/DocstringPlugin.php b/system/ThirdParty/Kint/Renderer/Rich/DocstringPlugin.php
index 19c530951c4d..cb53a74fb182 100644
--- a/system/ThirdParty/Kint/Renderer/Rich/DocstringPlugin.php
+++ b/system/ThirdParty/Kint/Renderer/Rich/DocstringPlugin.php
@@ -26,25 +26,25 @@
 namespace Kint\Renderer\Rich;
 
 use Kint\Kint;
-use Kint\Object\Representation\DocstringRepresentation;
-use Kint\Object\Representation\Representation;
+use Kint\Zval\Representation\DocstringRepresentation;
+use Kint\Zval\Representation\Representation;
 
 class DocstringPlugin extends Plugin implements TabPluginInterface
 {
     public function renderTab(Representation $r)
     {
         if (!($r instanceof DocstringRepresentation)) {
-            return false;
+            return;
         }
 
-        $docstring = array();
+        $docstring = [];
         foreach (\explode("\n", $r->contents) as $line) {
             $docstring[] = \trim($line);
         }
 
         $docstring = \implode("\n", $docstring);
 
-        $location = array();
+        $location = [];
 
         if ($r->class) {
             $location[] = 'Inherited from '.$this->renderer->escape($r->class);
diff --git a/system/ThirdParty/Kint/Renderer/Rich/MicrotimePlugin.php b/system/ThirdParty/Kint/Renderer/Rich/MicrotimePlugin.php
index a56bb23ef53a..3d06b529252b 100644
--- a/system/ThirdParty/Kint/Renderer/Rich/MicrotimePlugin.php
+++ b/system/ThirdParty/Kint/Renderer/Rich/MicrotimePlugin.php
@@ -25,16 +25,16 @@
 
 namespace Kint\Renderer\Rich;
 
-use Kint\Object\Representation\MicrotimeRepresentation;
-use Kint\Object\Representation\Representation;
 use Kint\Utils;
+use Kint\Zval\Representation\MicrotimeRepresentation;
+use Kint\Zval\Representation\Representation;
 
 class MicrotimePlugin extends Plugin implements TabPluginInterface
 {
     public function renderTab(Representation $r)
     {
         if (!($r instanceof MicrotimeRepresentation)) {
-            return false;
+            return;
         }
 
         $out = $r->getDateTime()->format('Y-m-d H:i:s.u');
diff --git a/system/ThirdParty/Kint/Renderer/Rich/Plugin.php b/system/ThirdParty/Kint/Renderer/Rich/Plugin.php
index 06710bcc45c2..58e22cb276f4 100644
--- a/system/ThirdParty/Kint/Renderer/Rich/Plugin.php
+++ b/system/ThirdParty/Kint/Renderer/Rich/Plugin.php
@@ -25,8 +25,8 @@
 
 namespace Kint\Renderer\Rich;
 
-use Kint\Object\BasicObject;
 use Kint\Renderer\RichRenderer;
+use Kint\Zval\Value;
 
 abstract class Plugin implements PluginInterface
 {
@@ -40,10 +40,9 @@ public function __construct(RichRenderer $r)
     /**
      * Renders a locked header.
      *
-     * @param BasicObject $o
-     * @param string      $content
+     * @param string $content
      */
-    public function renderLockedHeader(BasicObject $o, $content)
+    public function renderLockedHeader(Value $o, $content)
     {
         $header = '<dt class="kint-parent kint-locked">';
 
diff --git a/system/ThirdParty/Kint/Renderer/Rich/RecursionPlugin.php b/system/ThirdParty/Kint/Renderer/Rich/RecursionPlugin.php
index 618d2176d917..baad2ecb57b8 100644
--- a/system/ThirdParty/Kint/Renderer/Rich/RecursionPlugin.php
+++ b/system/ThirdParty/Kint/Renderer/Rich/RecursionPlugin.php
@@ -25,11 +25,11 @@
 
 namespace Kint\Renderer\Rich;
 
-use Kint\Object\BasicObject;
+use Kint\Zval\Value;
 
-class RecursionPlugin extends Plugin implements ObjectPluginInterface
+class RecursionPlugin extends Plugin implements ValuePluginInterface
 {
-    public function renderObject(BasicObject $o)
+    public function renderValue(Value $o)
     {
         return '<dl>'.$this->renderLockedHeader($o, '<var>Recursion</var>').'</dl>';
     }
diff --git a/system/ThirdParty/Kint/Renderer/Rich/SimpleXMLElementPlugin.php b/system/ThirdParty/Kint/Renderer/Rich/SimpleXMLElementPlugin.php
index 6c18931ee7af..718cd67aace3 100644
--- a/system/ThirdParty/Kint/Renderer/Rich/SimpleXMLElementPlugin.php
+++ b/system/ThirdParty/Kint/Renderer/Rich/SimpleXMLElementPlugin.php
@@ -25,13 +25,13 @@
 
 namespace Kint\Renderer\Rich;
 
-use Kint\Object\BasicObject;
-use Kint\Object\BlobObject;
 use Kint\Renderer\RichRenderer;
+use Kint\Utils;
+use Kint\Zval\Value;
 
-class SimpleXMLElementPlugin extends Plugin implements ObjectPluginInterface
+class SimpleXMLElementPlugin extends Plugin implements ValuePluginInterface
 {
-    public function renderObject(BasicObject $o)
+    public function renderValue(Value $o)
     {
         $children = $this->renderer->renderChildren($o);
 
@@ -63,15 +63,11 @@ public function renderObject(BasicObject $o)
             $header .= '('.$this->renderer->escape($s).') ';
         }
 
-        if (null === $s && $c = $o->getRepresentation('contents')) {
-            $c = \reset($c->contents);
-
-            if ($c && null !== ($s = $c->getValueShort())) {
-                if (RichRenderer::$strlen_max && BlobObject::strlen($s) > RichRenderer::$strlen_max) {
-                    $s = \substr($s, 0, RichRenderer::$strlen_max).'...';
-                }
-                $header .= $this->renderer->escape($s);
+        if (null !== ($s = $o->getValueShort())) {
+            if (RichRenderer::$strlen_max) {
+                $s = Utils::truncateString($s, RichRenderer::$strlen_max);
             }
+            $header .= $this->renderer->escape($s);
         }
 
         $header = $this->renderer->renderHeaderWrapper($o, (bool) \strlen($children), $header);
diff --git a/system/ThirdParty/Kint/Renderer/Rich/SourcePlugin.php b/system/ThirdParty/Kint/Renderer/Rich/SourcePlugin.php
index 5443dbfd9a8e..4be024b627b2 100644
--- a/system/ThirdParty/Kint/Renderer/Rich/SourcePlugin.php
+++ b/system/ThirdParty/Kint/Renderer/Rich/SourcePlugin.php
@@ -25,15 +25,15 @@
 
 namespace Kint\Renderer\Rich;
 
-use Kint\Object\Representation\Representation;
-use Kint\Object\Representation\SourceRepresentation;
+use Kint\Zval\Representation\Representation;
+use Kint\Zval\Representation\SourceRepresentation;
 
 class SourcePlugin extends Plugin implements TabPluginInterface
 {
     public function renderTab(Representation $r)
     {
         if (!($r instanceof SourceRepresentation) || empty($r->source)) {
-            return false;
+            return;
         }
 
         $source = $r->source;
diff --git a/system/ThirdParty/Kint/Renderer/Rich/TabPluginInterface.php b/system/ThirdParty/Kint/Renderer/Rich/TabPluginInterface.php
index 7cdbde72d2ad..779e13acd3a9 100644
--- a/system/ThirdParty/Kint/Renderer/Rich/TabPluginInterface.php
+++ b/system/ThirdParty/Kint/Renderer/Rich/TabPluginInterface.php
@@ -25,9 +25,12 @@
 
 namespace Kint\Renderer\Rich;
 
-use Kint\Object\Representation\Representation;
+use Kint\Zval\Representation\Representation;
 
 interface TabPluginInterface extends PluginInterface
 {
-    public function renderTab(Representation $o);
+    /**
+     * @return null|string
+     */
+    public function renderTab(Representation $r);
 }
diff --git a/system/ThirdParty/Kint/Renderer/Rich/TablePlugin.php b/system/ThirdParty/Kint/Renderer/Rich/TablePlugin.php
index cc3ee0f05da7..ac345a167f9d 100644
--- a/system/ThirdParty/Kint/Renderer/Rich/TablePlugin.php
+++ b/system/ThirdParty/Kint/Renderer/Rich/TablePlugin.php
@@ -25,9 +25,9 @@
 
 namespace Kint\Renderer\Rich;
 
-use Kint\Object\BlobObject;
-use Kint\Object\Representation\Representation;
 use Kint\Renderer\RichRenderer;
+use Kint\Utils;
+use Kint\Zval\Representation\Representation;
 
 class TablePlugin extends Plugin implements TabPluginInterface
 {
@@ -89,8 +89,8 @@ public function renderTab(Representation $r)
                     case 'string':
                         if ($field->encoding) {
                             $val = $field->value->contents;
-                            if (RichRenderer::$strlen_max && self::$respect_str_length && BlobObject::strlen($val) > RichRenderer::$strlen_max) {
-                                $val = \substr($val, 0, RichRenderer::$strlen_max).'...';
+                            if (RichRenderer::$strlen_max && self::$respect_str_length) {
+                                $val = Utils::truncateString($val, RichRenderer::$strlen_max);
                             }
 
                             $out .= $this->renderer->escape($val);
diff --git a/system/ThirdParty/Kint/Renderer/Rich/TimestampPlugin.php b/system/ThirdParty/Kint/Renderer/Rich/TimestampPlugin.php
index 6e3a2f8c5c83..f0c58e67a3cc 100644
--- a/system/ThirdParty/Kint/Renderer/Rich/TimestampPlugin.php
+++ b/system/ThirdParty/Kint/Renderer/Rich/TimestampPlugin.php
@@ -27,7 +27,7 @@
 
 use DateTime;
 use DateTimeZone;
-use Kint\Object\Representation\Representation;
+use Kint\Zval\Representation\Representation;
 
 class TimestampPlugin extends Plugin implements TabPluginInterface
 {
diff --git a/system/ThirdParty/Kint/Renderer/Rich/TraceFramePlugin.php b/system/ThirdParty/Kint/Renderer/Rich/TraceFramePlugin.php
index 6ca19bb67157..ea7048bcdd09 100644
--- a/system/ThirdParty/Kint/Renderer/Rich/TraceFramePlugin.php
+++ b/system/ThirdParty/Kint/Renderer/Rich/TraceFramePlugin.php
@@ -25,14 +25,14 @@
 
 namespace Kint\Renderer\Rich;
 
-use Kint\Object\BasicObject;
-use Kint\Object\TraceFrameObject;
+use Kint\Zval\TraceFrameValue;
+use Kint\Zval\Value;
 
-class TraceFramePlugin extends Plugin implements ObjectPluginInterface
+class TraceFramePlugin extends Plugin implements ValuePluginInterface
 {
-    public function renderObject(BasicObject $o)
+    public function renderValue(Value $o)
     {
-        if (!$o instanceof TraceFrameObject) {
+        if (!$o instanceof TraceFrameValue) {
             return;
         }
 
diff --git a/system/ThirdParty/Kint/Renderer/Rich/ObjectPluginInterface.php b/system/ThirdParty/Kint/Renderer/Rich/ValuePluginInterface.php
similarity index 88%
rename from system/ThirdParty/Kint/Renderer/Rich/ObjectPluginInterface.php
rename to system/ThirdParty/Kint/Renderer/Rich/ValuePluginInterface.php
index f46aa2946ea3..8f750eda6bad 100644
--- a/system/ThirdParty/Kint/Renderer/Rich/ObjectPluginInterface.php
+++ b/system/ThirdParty/Kint/Renderer/Rich/ValuePluginInterface.php
@@ -25,9 +25,12 @@
 
 namespace Kint\Renderer\Rich;
 
-use Kint\Object\BasicObject;
+use Kint\Zval\Value;
 
-interface ObjectPluginInterface extends PluginInterface
+interface ValuePluginInterface extends PluginInterface
 {
-    public function renderObject(BasicObject $o);
+    /**
+     * @return null|string
+     */
+    public function renderValue(Value $o);
 }
diff --git a/system/ThirdParty/Kint/Renderer/RichRenderer.php b/system/ThirdParty/Kint/Renderer/RichRenderer.php
index dcd39eec8c53..94b7f98ab71f 100644
--- a/system/ThirdParty/Kint/Renderer/RichRenderer.php
+++ b/system/ThirdParty/Kint/Renderer/RichRenderer.php
@@ -26,18 +26,19 @@
 namespace Kint\Renderer;
 
 use Kint\Kint;
-use Kint\Object\BasicObject;
-use Kint\Object\BlobObject;
-use Kint\Object\InstanceObject;
-use Kint\Object\Representation\Representation;
 use Kint\Utils;
+use Kint\Zval\BlobValue;
+use Kint\Zval\InstanceValue;
+use Kint\Zval\Representation\Representation;
+use Kint\Zval\Value;
 
 class RichRenderer extends Renderer
 {
     /**
-     * RichRenderer object plugins should implement Kint\Renderer\Rich\ObjectPluginInterface.
+     * RichRenderer value plugins should implement Kint\Renderer\Rich\ValuePluginInterface.
      */
-    public static $object_plugins = array(
+    public static $value_plugins = [
+        'array_limit' => 'Kint\\Renderer\\Rich\\ArrayLimitPlugin',
         'blacklist' => 'Kint\\Renderer\\Rich\\BlacklistPlugin',
         'callable' => 'Kint\\Renderer\\Rich\\CallablePlugin',
         'closure' => 'Kint\\Renderer\\Rich\\ClosurePlugin',
@@ -46,12 +47,12 @@ class RichRenderer extends Renderer
         'recursion' => 'Kint\\Renderer\\Rich\\RecursionPlugin',
         'simplexml_element' => 'Kint\\Renderer\\Rich\\SimpleXMLElementPlugin',
         'trace_frame' => 'Kint\\Renderer\\Rich\\TraceFramePlugin',
-    );
+    ];
 
     /**
      * RichRenderer tab plugins should implement Kint\Renderer\Rich\TabPluginInterface.
      */
-    public static $tab_plugins = array(
+    public static $tab_plugins = [
         'binary' => 'Kint\\Renderer\\Rich\\BinaryPlugin',
         'color' => 'Kint\\Renderer\\Rich\\ColorPlugin',
         'docstring' => 'Kint\\Renderer\\Rich\\DocstringPlugin',
@@ -59,18 +60,18 @@ class RichRenderer extends Renderer
         'source' => 'Kint\\Renderer\\Rich\\SourcePlugin',
         'table' => 'Kint\\Renderer\\Rich\\TablePlugin',
         'timestamp' => 'Kint\\Renderer\\Rich\\TimestampPlugin',
-    );
-
-    public static $pre_render_sources = array(
-        'script' => array(
-            array('Kint\\Renderer\\RichRenderer', 'renderJs'),
-            array('Kint\\Renderer\\Rich\\MicrotimePlugin', 'renderJs'),
-        ),
-        'style' => array(
-            array('Kint\\Renderer\\RichRenderer', 'renderCss'),
-        ),
-        'raw' => array(),
-    );
+    ];
+
+    public static $pre_render_sources = [
+        'script' => [
+            ['Kint\\Renderer\\RichRenderer', 'renderJs'],
+            ['Kint\\Renderer\\Rich\\MicrotimePlugin', 'renderJs'],
+        ],
+        'style' => [
+            ['Kint\\Renderer\\RichRenderer', 'renderCss'],
+        ],
+        'raw' => [],
+    ];
 
     /**
      * Whether or not to render access paths.
@@ -118,7 +119,7 @@ class RichRenderer extends Renderer
      *
      * @var bool
      */
-    public static $folder = true;
+    public static $folder = false;
 
     /**
      * Sort mode for object properties.
@@ -132,7 +133,7 @@ class RichRenderer extends Renderer
 
     public static $always_pre_render = false;
 
-    protected $plugin_objs = array();
+    protected $plugin_objs = [];
     protected $expand = false;
     protected $force_pre_render = false;
     protected $pre_render;
@@ -193,7 +194,6 @@ public function setForcePreRender()
 
     public function setPreRender($pre_render)
     {
-        $this->setForcePreRender(); // TODO: Remove line in next major version
         $this->pre_render = $pre_render;
     }
 
@@ -212,10 +212,11 @@ public function getUseFolder()
         return $this->use_folder;
     }
 
-    public function render(BasicObject $o)
+    public function render(Value $o)
     {
-        if ($plugin = $this->getPlugin(self::$object_plugins, $o->hints)) {
-            if (\strlen($output = $plugin->renderObject($o))) {
+        if ($plugin = $this->getPlugin(self::$value_plugins, $o->hints)) {
+            $output = $plugin->renderValue($o);
+            if (null !== $output && \strlen($output)) {
                 return $output;
             }
         }
@@ -231,7 +232,7 @@ public function renderNothing()
         return '<dl><dt><var>No argument</var></dt></dl>';
     }
 
-    public function renderHeaderWrapper(BasicObject $o, $has_children, $contents)
+    public function renderHeaderWrapper(Value $o, $has_children, $contents)
     {
         $out = '<dt';
 
@@ -271,7 +272,7 @@ public function renderHeaderWrapper(BasicObject $o, $has_children, $contents)
         return $out.'</dt>';
     }
 
-    public function renderHeader(BasicObject $o)
+    public function renderHeader(Value $o)
     {
         $output = '';
 
@@ -319,10 +320,10 @@ public function renderHeader(BasicObject $o)
         return \trim($output);
     }
 
-    public function renderChildren(BasicObject $o)
+    public function renderChildren(Value $o)
     {
-        $contents = array();
-        $tabs = array();
+        $contents = [];
+        $tabs = [];
 
         foreach ($o->getRepresentations() as $rep) {
             $result = $this->renderTab($o, $rep);
@@ -353,10 +354,16 @@ public function renderChildren(BasicObject $o)
                 $output .= $this->escape($tab->getLabel()).'</li>';
             }
 
-            $output .= '</ul><ul>';
+            $output .= '</ul><ul class="kint-tab-contents">';
 
-            foreach ($contents as $tab) {
-                $output .= '<li>'.$tab.'</li>';
+            foreach ($contents as $i => $tab) {
+                if (0 === $i) {
+                    $output .= '<li class="kint-show">';
+                } else {
+                    $output .= '<li>';
+                }
+
+                $output .= $tab.'</li>';
             }
 
             $output .= '</ul>';
@@ -441,7 +448,7 @@ public function postRender()
                 !empty($this->call_info['callee']['class']) ||
                 !\in_array(
                     $this->call_info['callee']['function'],
-                    array('include', 'include_once', 'require', 'require_once'),
+                    ['include', 'include_once', 'require', 'require_once'],
                     true
                 )
             )
@@ -465,7 +472,7 @@ public function postRender()
 
                 $output .= '<li>'.$this->ideLink($step['file'], $step['line']); // closing tag not required
                 if (isset($step['function'])
-                    && !\in_array($step['function'], array('include', 'include_once', 'require', 'require_once'), true)
+                    && !\in_array($step['function'], ['include', 'include_once', 'require', 'require_once'], true)
                 ) {
                     $output .= ' [';
                     if (isset($step['class'])) {
@@ -488,7 +495,7 @@ public function postRender()
     public function escape($string, $encoding = false)
     {
         if (false === $encoding) {
-            $encoding = BlobObject::detectEncoding($string);
+            $encoding = BlobValue::detectEncoding($string);
         }
 
         $original_encoding = $encoding;
@@ -501,7 +508,7 @@ public function escape($string, $encoding = false)
 
         // this call converts all non-ASCII characters into numeirc htmlentities
         if (\function_exists('mb_encode_numericentity') && 'ASCII' !== $original_encoding) {
-            $string = \mb_encode_numericentity($string, array(0x80, 0xffff, 0, 0xffff), $encoding);
+            $string = \mb_encode_numericentity($string, [0x80, 0xFFFF, 0, 0xFFFF], $encoding);
         }
 
         return $string;
@@ -525,10 +532,11 @@ public function ideLink($file, $line)
         return '<a '.$class.'href="'.$this->escape($ideLink).'">'.$path.'</a>';
     }
 
-    protected function renderTab(BasicObject $o, Representation $rep)
+    protected function renderTab(Value $o, Representation $rep)
     {
         if ($plugin = $this->getPlugin(self::$tab_plugins, $rep->hints)) {
-            if (\strlen($output = $plugin->renderTab($rep))) {
+            $output = $plugin->renderTab($rep);
+            if (null !== $output && \strlen($output)) {
                 return $output;
             }
         }
@@ -536,7 +544,7 @@ protected function renderTab(BasicObject $o, Representation $rep)
         if (\is_array($rep->contents)) {
             $output = '';
 
-            if ($o instanceof InstanceObject && 'properties' === $rep->getName()) {
+            if ($o instanceof InstanceValue && 'properties' === $rep->getName()) {
                 foreach (self::sortProperties($rep->contents, self::$sort) as $obj) {
                     $output .= $this->render($obj);
                 }
@@ -559,7 +567,7 @@ protected function renderTab(BasicObject $o, Representation $rep)
             } else {
                 if (\preg_match('/(:?[\\r\\n\\t\\f\\v]| {2})/', $rep->contents)) {
                     $show_contents = true;
-                } elseif (self::$strlen_max && BlobObject::strlen($o->getValueShort()) > self::$strlen_max) {
+                } elseif (self::$strlen_max && null !== $o->getValueShort() && BlobValue::strlen($o->getValueShort()) > self::$strlen_max) {
                     $show_contents = true;
                 }
 
@@ -573,9 +581,11 @@ protected function renderTab(BasicObject $o, Representation $rep)
             }
         }
 
-        if ($rep->contents instanceof BasicObject) {
+        if ($rep->contents instanceof Value) {
             return $this->render($rep->contents);
         }
+
+        return '';
     }
 
     protected function getPlugin(array $plugins, array $hints)
@@ -607,6 +617,6 @@ protected static function renderCss()
 
     protected static function renderFolder()
     {
-        return '<div class="kint-rich kint-folder"><dl><dt class="kint-parent"><nav></nav>Kint</dt><dd class="kint-folder"></dd></dl></div>';
+        return '<div class="kint-rich kint-folder"><dl><dt class="kint-parent"><nav></nav>Kint</dt><dd class="kint-foldout"></dd></dl></div>';
     }
 }
diff --git a/system/ThirdParty/Kint/Renderer/Text/ArrayLimitPlugin.php b/system/ThirdParty/Kint/Renderer/Text/ArrayLimitPlugin.php
new file mode 100644
index 000000000000..12c16f397b1b
--- /dev/null
+++ b/system/ThirdParty/Kint/Renderer/Text/ArrayLimitPlugin.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Šleinius (raveren@gmail.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace Kint\Renderer\Text;
+
+use Kint\Zval\Value;
+
+class ArrayLimitPlugin extends Plugin
+{
+    public function render(Value $o)
+    {
+        $out = '';
+
+        if (0 == $o->depth) {
+            $out .= $this->renderer->colorTitle($this->renderer->renderTitle($o)).PHP_EOL;
+        }
+
+        $out .= $this->renderer->renderHeader($o).' '.$this->renderer->colorValue('ARRAY LIMIT').PHP_EOL;
+
+        return $out;
+    }
+}
diff --git a/system/ThirdParty/Kint/Renderer/Text/BlacklistPlugin.php b/system/ThirdParty/Kint/Renderer/Text/BlacklistPlugin.php
index 127d32a197f9..441368b10720 100644
--- a/system/ThirdParty/Kint/Renderer/Text/BlacklistPlugin.php
+++ b/system/ThirdParty/Kint/Renderer/Text/BlacklistPlugin.php
@@ -25,11 +25,11 @@
 
 namespace Kint\Renderer\Text;
 
-use Kint\Object\BasicObject;
+use Kint\Zval\Value;
 
 class BlacklistPlugin extends Plugin
 {
-    public function render(BasicObject $o)
+    public function render(Value $o)
     {
         $out = '';
 
diff --git a/system/ThirdParty/Kint/Renderer/Text/DepthLimitPlugin.php b/system/ThirdParty/Kint/Renderer/Text/DepthLimitPlugin.php
index 310b87e417b0..cea6cdf89a50 100644
--- a/system/ThirdParty/Kint/Renderer/Text/DepthLimitPlugin.php
+++ b/system/ThirdParty/Kint/Renderer/Text/DepthLimitPlugin.php
@@ -25,11 +25,11 @@
 
 namespace Kint\Renderer\Text;
 
-use Kint\Object\BasicObject;
+use Kint\Zval\Value;
 
 class DepthLimitPlugin extends Plugin
 {
-    public function render(BasicObject $o)
+    public function render(Value $o)
     {
         $out = '';
 
diff --git a/system/ThirdParty/Kint/Renderer/Text/MicrotimePlugin.php b/system/ThirdParty/Kint/Renderer/Text/MicrotimePlugin.php
index 9128032c4ae0..ce63a5447d87 100644
--- a/system/ThirdParty/Kint/Renderer/Text/MicrotimePlugin.php
+++ b/system/ThirdParty/Kint/Renderer/Text/MicrotimePlugin.php
@@ -25,12 +25,12 @@
 
 namespace Kint\Renderer\Text;
 
-use Kint\Object\BasicObject;
-use Kint\Object\Representation\MicrotimeRepresentation;
 use Kint\Renderer\PlainRenderer;
 use Kint\Renderer\Rich\MicrotimePlugin as RichPlugin;
 use Kint\Renderer\TextRenderer;
 use Kint\Utils;
+use Kint\Zval\Representation\MicrotimeRepresentation;
+use Kint\Zval\Value;
 
 class MicrotimePlugin extends Plugin
 {
@@ -45,12 +45,12 @@ public function __construct(TextRenderer $r)
         }
     }
 
-    public function render(BasicObject $o)
+    public function render(Value $o)
     {
         $r = $o->getRepresentation('microtime');
 
         if (!$r instanceof MicrotimeRepresentation) {
-            return false;
+            return;
         }
 
         $out = '';
diff --git a/system/ThirdParty/Kint/Renderer/Text/Plugin.php b/system/ThirdParty/Kint/Renderer/Text/Plugin.php
index 9de25c1a1147..61a1820f48c8 100644
--- a/system/ThirdParty/Kint/Renderer/Text/Plugin.php
+++ b/system/ThirdParty/Kint/Renderer/Text/Plugin.php
@@ -25,8 +25,8 @@
 
 namespace Kint\Renderer\Text;
 
-use Kint\Object\BasicObject;
 use Kint\Renderer\TextRenderer;
+use Kint\Zval\Value;
 
 abstract class Plugin
 {
@@ -37,5 +37,8 @@ public function __construct(TextRenderer $r)
         $this->renderer = $r;
     }
 
-    abstract public function render(BasicObject $o);
+    /**
+     * @return null|string
+     */
+    abstract public function render(Value $o);
 }
diff --git a/system/ThirdParty/Kint/Renderer/Text/RecursionPlugin.php b/system/ThirdParty/Kint/Renderer/Text/RecursionPlugin.php
index 72c2257ca8fc..21956b6ec221 100644
--- a/system/ThirdParty/Kint/Renderer/Text/RecursionPlugin.php
+++ b/system/ThirdParty/Kint/Renderer/Text/RecursionPlugin.php
@@ -25,11 +25,11 @@
 
 namespace Kint\Renderer\Text;
 
-use Kint\Object\BasicObject;
+use Kint\Zval\Value;
 
 class RecursionPlugin extends Plugin
 {
-    public function render(BasicObject $o)
+    public function render(Value $o)
     {
         $out = '';
 
diff --git a/system/ThirdParty/Kint/Renderer/Text/TracePlugin.php b/system/ThirdParty/Kint/Renderer/Text/TracePlugin.php
index 5833840cdf8f..b25f113e040b 100644
--- a/system/ThirdParty/Kint/Renderer/Text/TracePlugin.php
+++ b/system/ThirdParty/Kint/Renderer/Text/TracePlugin.php
@@ -25,12 +25,12 @@
 
 namespace Kint\Renderer\Text;
 
-use Kint\Object\BasicObject;
-use Kint\Object\MethodObject;
+use Kint\Zval\MethodValue;
+use Kint\Zval\Value;
 
 class TracePlugin extends Plugin
 {
-    public function render(BasicObject $o)
+    public function render(Value $o)
     {
         $out = '';
 
@@ -66,7 +66,7 @@ public function render(BasicObject $o)
 
             if (\is_string($frame->trace['function'])) {
                 $framedesc .= $this->renderer->escape($frame->trace['function']).'(...)';
-            } elseif ($frame->trace['function'] instanceof MethodObject) {
+            } elseif ($frame->trace['function'] instanceof MethodValue) {
                 $framedesc .= $this->renderer->escape($frame->trace['function']->getName());
                 $framedesc .= '('.$this->renderer->escape($frame->trace['function']->getParams()).')';
             }
diff --git a/system/ThirdParty/Kint/Renderer/TextRenderer.php b/system/ThirdParty/Kint/Renderer/TextRenderer.php
index 43b6c40d63b8..0cfba527c78b 100644
--- a/system/ThirdParty/Kint/Renderer/TextRenderer.php
+++ b/system/ThirdParty/Kint/Renderer/TextRenderer.php
@@ -26,33 +26,36 @@
 namespace Kint\Renderer;
 
 use Kint\Kint;
-use Kint\Object\BasicObject;
-use Kint\Object\InstanceObject;
 use Kint\Utils;
+use Kint\Zval\InstanceValue;
+use Kint\Zval\Value;
 
 class TextRenderer extends Renderer
 {
     /**
      * TextRenderer plugins should be instances of Kint\Renderer\Text\Plugin.
      */
-    public static $plugins = array(
+    public static $plugins = [
+        'array_limit' => 'Kint\\Renderer\\Text\\ArrayLimitPlugin',
         'blacklist' => 'Kint\\Renderer\\Text\\BlacklistPlugin',
         'depth_limit' => 'Kint\\Renderer\\Text\\DepthLimitPlugin',
         'microtime' => 'Kint\\Renderer\\Text\\MicrotimePlugin',
         'recursion' => 'Kint\\Renderer\\Text\\RecursionPlugin',
         'trace' => 'Kint\\Renderer\\Text\\TracePlugin',
-    );
+    ];
 
     /**
      * Parser plugins must be instanceof one of these or
      * it will be removed for performance reasons.
      */
-    public static $parser_plugin_whitelist = array(
+    public static $parser_plugin_whitelist = [
+        'Kint\\Parser\\ArrayLimitPlugin',
+        'Kint\\Parser\\ArrayObjectPlugin',
         'Kint\\Parser\\BlacklistPlugin',
         'Kint\\Parser\\MicrotimePlugin',
         'Kint\\Parser\\StreamPlugin',
         'Kint\\Parser\\TracePlugin',
-    );
+    ];
 
     /**
      * The maximum length of a string before it is truncated.
@@ -94,7 +97,7 @@ class TextRenderer extends Renderer
     public $header_width = 80;
     public $indent_width = 4;
 
-    protected $plugin_objs = array();
+    protected $plugin_objs = [];
 
     public function __construct()
     {
@@ -102,10 +105,11 @@ public function __construct()
         $this->indent_width = self::$default_indent;
     }
 
-    public function render(BasicObject $o)
+    public function render(Value $o)
     {
         if ($plugin = $this->getPlugin(self::$plugins, $o->hints)) {
-            if (\strlen($output = $plugin->render($o))) {
+            $output = $plugin->render($o);
+            if (null !== $output && \strlen($output)) {
                 return $output;
             }
         }
@@ -149,7 +153,7 @@ public function boxText($text, $width)
         return $out;
     }
 
-    public function renderTitle(BasicObject $o)
+    public function renderTitle(Value $o)
     {
         $name = (string) $o->getName();
 
@@ -160,9 +164,9 @@ public function renderTitle(BasicObject $o)
         return Utils::truncateString($name, $this->header_width);
     }
 
-    public function renderHeader(BasicObject $o)
+    public function renderHeader(Value $o)
     {
-        $output = array();
+        $output = [];
 
         if ($o->depth) {
             if (null !== ($s = $o->getModifiers())) {
@@ -200,7 +204,7 @@ public function renderHeader(BasicObject $o)
         return \str_repeat(' ', $o->depth * $this->indent_width).\implode(' ', $output);
     }
 
-    public function renderChildren(BasicObject $o)
+    public function renderChildren(Value $o)
     {
         if ('array' === $o->type) {
             $output = ' [';
@@ -213,7 +217,7 @@ public function renderChildren(BasicObject $o)
         $children = '';
 
         if ($o->value && \is_array($o->value->contents)) {
-            if ($o instanceof InstanceObject && 'properties' === $o->value->getName()) {
+            if ($o instanceof InstanceValue && 'properties' === $o->value->getName()) {
                 foreach (self::sortProperties($o->value->contents, self::$sort) as $obj) {
                     $children .= $this->render($obj);
                 }
@@ -274,7 +278,7 @@ public function postRender()
 
     public function filterParserPlugins(array $plugins)
     {
-        $return = array();
+        $return = [];
 
         foreach ($plugins as $index => $plugin) {
             foreach (self::$parser_plugin_whitelist as $whitelist) {
@@ -313,7 +317,7 @@ protected function calledFrom()
                 !empty($this->call_info['callee']['class']) ||
                 !\in_array(
                     $this->call_info['callee']['function'],
-                    array('include', 'include_once', 'require', 'require_once'),
+                    ['include', 'include_once', 'require', 'require_once'],
                     true
                 )
             )
diff --git a/system/ThirdParty/Kint/Utils.php b/system/ThirdParty/Kint/Utils.php
index 27a24913fdb1..5143731c75c4 100644
--- a/system/ThirdParty/Kint/Utils.php
+++ b/system/ThirdParty/Kint/Utils.php
@@ -25,8 +25,7 @@
 
 namespace Kint;
 
-use InvalidArgumentException;
-use Kint\Object\BlobObject;
+use Kint\Zval\BlobValue;
 use ReflectionNamedType;
 use ReflectionType;
 
@@ -51,15 +50,36 @@ private function __construct()
      */
     public static function getHumanReadableBytes($value)
     {
-        static $unit = array('B', 'KB', 'MB', 'GB', 'TB');
+        static $unit = ['B', 'KB', 'MB', 'GB', 'TB'];
+
+        $negative = $value < 0;
+        $value = \abs($value);
+
+        if ($value < 1024) {
+            $i = 0;
+            $value = \floor($value);
+        } elseif ($value < 0xFFFCCCCCCCCCCCC >> 40) {
+            $i = 1;
+        } elseif ($value < 0xFFFCCCCCCCCCCCC >> 30) {
+            $i = 2;
+        } elseif ($value < 0xFFFCCCCCCCCCCCC >> 20) {
+            $i = 3;
+        } else {
+            $i = 4;
+        }
 
-        $i = \floor(\log($value, 1024));
-        $i = \min($i, 4); // Only go up to TB
+        if ($i) {
+            $value = $value / \pow(1024, $i);
+        }
+
+        if ($negative) {
+            $value *= -1;
+        }
 
-        return array(
-            'value' => (float) ($value / \pow(1024, $i)),
+        return [
+            'value' => \round($value, 1),
             'unit' => $unit[$i],
-        );
+        ];
     }
 
     public static function isSequential(array $array)
@@ -67,9 +87,14 @@ public static function isSequential(array $array)
         return \array_keys($array) === \range(0, \count($array) - 1);
     }
 
+    public static function isAssoc(array $array)
+    {
+        return (bool) \count(\array_filter(\array_keys($array), 'is_string'));
+    }
+
     public static function composerGetExtras($key = 'kint')
     {
-        $extras = array();
+        $extras = [];
 
         if (0 === \strpos(KINT_DIR, 'phar://')) {
             // Only run inside phar file, so skip for code coverage
@@ -131,7 +156,7 @@ public static function isTrace(array $trace)
             return false;
         }
 
-        static $bt_structure = array(
+        static $bt_structure = [
             'function' => 'string',
             'line' => 'integer',
             'file' => 'string',
@@ -139,7 +164,7 @@ public static function isTrace(array $trace)
             'object' => 'object',
             'type' => 'string',
             'args' => 'array',
-        );
+        ];
 
         $file_found = false;
 
@@ -169,7 +194,7 @@ public static function isTrace(array $trace)
     public static function traceFrameIsListed(array $frame, array $matches)
     {
         if (isset($frame['class'])) {
-            $called = array(\strtolower($frame['class']), \strtolower($frame['function']));
+            $called = [\strtolower($frame['class']), \strtolower($frame['function'])];
         } else {
             $called = \strtolower($frame['function']);
         }
@@ -189,10 +214,10 @@ public static function normalizeAliases(array &$aliases)
                     \preg_match('/^'.$name_regex.'$/', $alias[1]) &&
                     \preg_match('/^\\\\?('.$name_regex.'\\\\)*'.$name_regex.'$/', $alias[0])
                 ) {
-                    $alias = array(
+                    $alias = [
                         \strtolower(\ltrim($alias[0], '\\')),
                         \strtolower($alias[1]),
-                    );
+                    ];
                 } else {
                     unset($aliases[$index]);
                     continue;
@@ -216,14 +241,15 @@ public static function normalizeAliases(array &$aliases)
     public static function truncateString($input, $length = PHP_INT_MAX, $end = '...', $encoding = false)
     {
         $length = (int) $length;
-        $endlength = BlobObject::strlen($end);
+        $endlength = BlobValue::strlen($end);
 
         if ($endlength >= $length) {
-            throw new InvalidArgumentException('Can\'t truncate a string to '.$length.' characters if ending with string '.$endlength.' characters long');
+            $endlength = 0;
+            $end = '';
         }
 
-        if (BlobObject::strlen($input, $encoding) > $length) {
-            return BlobObject::substr($input, 0, $length - $endlength, $encoding).$end;
+        if (BlobValue::strlen($input, $encoding) > $length) {
+            return BlobValue::substr($input, 0, $length - $endlength, $encoding).$end;
         }
 
         return $input;
@@ -232,7 +258,12 @@ public static function truncateString($input, $length = PHP_INT_MAX, $end = '...
     public static function getTypeString(ReflectionType $type)
     {
         if ($type instanceof ReflectionNamedType) {
-            return $type->getName();
+            $name = $type->getName();
+            if ($type->allowsNull() && false === \strpos($name, '|')) {
+                $name = '?'.$name;
+            }
+
+            return $name;
         }
 
         return (string) $type; // @codeCoverageIgnore
diff --git a/system/ThirdParty/Kint/Object/BlobObject.php b/system/ThirdParty/Kint/Zval/BlobValue.php
similarity index 95%
rename from system/ThirdParty/Kint/Object/BlobObject.php
rename to system/ThirdParty/Kint/Zval/BlobValue.php
index 66d508ff70db..c5ac53acb096 100644
--- a/system/ThirdParty/Kint/Object/BlobObject.php
+++ b/system/ThirdParty/Kint/Zval/BlobValue.php
@@ -23,9 +23,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-namespace Kint\Object;
+namespace Kint\Zval;
 
-class BlobObject extends BasicObject
+class BlobValue extends Value
 {
     /**
      * @var array Character encodings to detect
@@ -51,10 +51,10 @@ class BlobObject extends BasicObject
      *
      * This depends on the mbstring extension
      */
-    public static $char_encodings = array(
+    public static $char_encodings = [
         'ASCII',
         'UTF-8',
-    );
+    ];
 
     /**
      * @var array Legacy character encodings to detect
@@ -74,11 +74,11 @@ class BlobObject extends BasicObject
      *
      * This depends on the iconv extension
      */
-    public static $legacy_encodings = array();
+    public static $legacy_encodings = [];
 
     public $type = 'string';
     public $encoding = false;
-    public $hints = array('string');
+    public $hints = ['string'];
 
     public function getType()
     {
@@ -100,7 +100,7 @@ public function getValueShort()
         }
     }
 
-    public function transplant(BasicObject $old)
+    public function transplant(Value $old)
     {
         parent::transplant($old);
 
diff --git a/system/ThirdParty/Kint/Object/ClosureObject.php b/system/ThirdParty/Kint/Zval/ClosureValue.php
similarity index 91%
rename from system/ThirdParty/Kint/Object/ClosureObject.php
rename to system/ThirdParty/Kint/Zval/ClosureValue.php
index 344eceb21e77..95dd3fea9e39 100644
--- a/system/ThirdParty/Kint/Object/ClosureObject.php
+++ b/system/ThirdParty/Kint/Zval/ClosureValue.php
@@ -23,12 +23,12 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-namespace Kint\Object;
+namespace Kint\Zval;
 
-class ClosureObject extends InstanceObject
+class ClosureValue extends InstanceValue
 {
-    public $parameters = array();
-    public $hints = array('object', 'callable', 'closure');
+    public $parameters = [];
+    public $hints = ['object', 'callable', 'closure'];
 
     private $paramcache;
 
@@ -49,7 +49,7 @@ public function getParams()
             return $this->paramcache;
         }
 
-        $out = array();
+        $out = [];
 
         foreach ($this->parameters as $p) {
             $type = $p->getType();
diff --git a/system/ThirdParty/Kint/Object/DateTimeObject.php b/system/ThirdParty/Kint/Zval/DateTimeValue.php
similarity index 93%
rename from system/ThirdParty/Kint/Object/DateTimeObject.php
rename to system/ThirdParty/Kint/Zval/DateTimeValue.php
index f8b1b3fd164f..1a8084ec3b9f 100644
--- a/system/ThirdParty/Kint/Object/DateTimeObject.php
+++ b/system/ThirdParty/Kint/Zval/DateTimeValue.php
@@ -23,15 +23,15 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-namespace Kint\Object;
+namespace Kint\Zval;
 
 use DateTime;
 
-class DateTimeObject extends InstanceObject
+class DateTimeValue extends InstanceValue
 {
     public $dt;
 
-    public $hints = array('object', 'datetime');
+    public $hints = ['object', 'datetime'];
 
     public function __construct(DateTime $dt)
     {
diff --git a/system/ThirdParty/Kint/Object/InstanceObject.php b/system/ThirdParty/Kint/Zval/InstanceValue.php
similarity index 88%
rename from system/ThirdParty/Kint/Object/InstanceObject.php
rename to system/ThirdParty/Kint/Zval/InstanceValue.php
index 943b33d8eabb..1c26600ca47e 100644
--- a/system/ThirdParty/Kint/Object/InstanceObject.php
+++ b/system/ThirdParty/Kint/Zval/InstanceValue.php
@@ -23,29 +23,29 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-namespace Kint\Object;
+namespace Kint\Zval;
 
-class InstanceObject extends BasicObject
+class InstanceValue extends Value
 {
     public $type = 'object';
     public $classname;
-    public $hash;
+    public $spl_object_hash;
     public $filename;
     public $startline;
-    public $hints = array('object');
+    public $hints = ['object'];
 
     public function getType()
     {
         return $this->classname;
     }
 
-    public function transplant(BasicObject $old)
+    public function transplant(Value $old)
     {
         parent::transplant($old);
 
         if ($old instanceof self) {
             $this->classname = $old->classname;
-            $this->hash = $old->hash;
+            $this->spl_object_hash = $old->spl_object_hash;
             $this->filename = $old->filename;
             $this->startline = $old->startline;
         }
@@ -56,7 +56,7 @@ public static function sortByHierarchy($a, $b)
         if (\is_string($a) && \is_string($b)) {
             $aclass = $a;
             $bclass = $b;
-        } elseif (!($a instanceof BasicObject) || !($b instanceof BasicObject)) {
+        } elseif (!($a instanceof Value) || !($b instanceof Value)) {
             return 0;
         } elseif ($a instanceof self && $b instanceof self) {
             $aclass = $a->classname;
diff --git a/system/ThirdParty/Kint/Object/MethodObject.php b/system/ThirdParty/Kint/Zval/MethodValue.php
similarity index 90%
rename from system/ThirdParty/Kint/Object/MethodObject.php
rename to system/ThirdParty/Kint/Zval/MethodValue.php
index 78d49de22264..5d59a50765f2 100644
--- a/system/ThirdParty/Kint/Object/MethodObject.php
+++ b/system/ThirdParty/Kint/Zval/MethodValue.php
@@ -23,27 +23,27 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-namespace Kint\Object;
+namespace Kint\Zval;
 
-use Kint\Object\Representation\DocstringRepresentation;
 use Kint\Utils;
+use Kint\Zval\Representation\DocstringRepresentation;
 use ReflectionFunctionAbstract;
 use ReflectionMethod;
 
-class MethodObject extends BasicObject
+class MethodValue extends Value
 {
     public $type = 'method';
     public $filename;
     public $startline;
     public $endline;
-    public $parameters = array();
+    public $parameters = [];
     public $abstract;
     public $final;
     public $internal;
     public $docstring;
     public $returntype;
     public $return_reference = false;
-    public $hints = array('callable', 'method');
+    public $hints = ['callable', 'method'];
     public $showparams = true;
 
     private $paramcache;
@@ -61,7 +61,7 @@ public function __construct(ReflectionFunctionAbstract $method)
         $this->return_reference = $method->returnsReference();
 
         foreach ($method->getParameters() as $param) {
-            $this->parameters[] = new ParameterObject($param);
+            $this->parameters[] = new ParameterValue($param);
         }
 
         if (KINT_PHP70) {
@@ -73,15 +73,15 @@ public function __construct(ReflectionFunctionAbstract $method)
 
         if ($method instanceof ReflectionMethod) {
             $this->static = $method->isStatic();
-            $this->operator = $this->static ? BasicObject::OPERATOR_STATIC : BasicObject::OPERATOR_OBJECT;
+            $this->operator = $this->static ? Value::OPERATOR_STATIC : Value::OPERATOR_OBJECT;
             $this->abstract = $method->isAbstract();
             $this->final = $method->isFinal();
             $this->owner_class = $method->getDeclaringClass()->name;
-            $this->access = BasicObject::ACCESS_PUBLIC;
+            $this->access = Value::ACCESS_PUBLIC;
             if ($method->isProtected()) {
-                $this->access = BasicObject::ACCESS_PROTECTED;
+                $this->access = Value::ACCESS_PROTECTED;
             } elseif ($method->isPrivate()) {
-                $this->access = BasicObject::ACCESS_PRIVATE;
+                $this->access = Value::ACCESS_PRIVATE;
             }
         }
 
@@ -100,9 +100,9 @@ public function __construct(ReflectionFunctionAbstract $method)
         $this->value = $docstring;
     }
 
-    public function setAccessPathFrom(InstanceObject $parent)
+    public function setAccessPathFrom(InstanceValue $parent)
     {
-        static $magic = array(
+        static $magic = [
             '__call' => true,
             '__callstatic' => true,
             '__clone' => true,
@@ -118,7 +118,7 @@ public function setAccessPathFrom(InstanceObject $parent)
             '__tostring' => true,
             '__unset' => true,
             '__wakeup' => true,
-        );
+        ];
 
         $name = \strtolower($this->name);
 
@@ -172,12 +172,12 @@ public function getValueShort()
 
     public function getModifiers()
     {
-        $mods = array(
+        $mods = [
             $this->abstract ? 'abstract' : null,
             $this->final ? 'final' : null,
             $this->getAccess(),
             $this->static ? 'static' : null,
-        );
+        ];
 
         $out = '';
 
@@ -209,7 +209,7 @@ public function getParams()
             return $this->paramcache;
         }
 
-        $out = array();
+        $out = [];
 
         foreach ($this->parameters as $p) {
             $type = $p->getType();
diff --git a/system/ThirdParty/Kint/Object/ParameterObject.php b/system/ThirdParty/Kint/Zval/ParameterValue.php
similarity index 95%
rename from system/ThirdParty/Kint/Object/ParameterObject.php
rename to system/ThirdParty/Kint/Zval/ParameterValue.php
index 4bed551f548b..29bcbe72bb2b 100644
--- a/system/ThirdParty/Kint/Object/ParameterObject.php
+++ b/system/ThirdParty/Kint/Zval/ParameterValue.php
@@ -23,18 +23,18 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-namespace Kint\Object;
+namespace Kint\Zval;
 
 use Kint\Utils;
 use ReflectionException;
 use ReflectionParameter;
 
-class ParameterObject extends BasicObject
+class ParameterValue extends Value
 {
     public $type_hint;
     public $default;
     public $position;
-    public $hints = array('parameter');
+    public $hints = ['parameter'];
 
     public function __construct(ReflectionParameter $param)
     {
@@ -64,7 +64,6 @@ public function __construct(ReflectionParameter $param)
         $this->position = $param->getPosition();
 
         if ($param->isDefaultValueAvailable()) {
-            /** @var mixed Psalm bug workaround */
             $default = $param->getDefaultValue();
             switch (\gettype($default)) {
                 case 'NULL':
diff --git a/system/ThirdParty/Kint/Object/Representation/ColorRepresentation.php b/system/ThirdParty/Kint/Zval/Representation/ColorRepresentation.php
similarity index 96%
rename from system/ThirdParty/Kint/Object/Representation/ColorRepresentation.php
rename to system/ThirdParty/Kint/Zval/Representation/ColorRepresentation.php
index d6a072f50891..533ccb35d940 100644
--- a/system/ThirdParty/Kint/Object/Representation/ColorRepresentation.php
+++ b/system/ThirdParty/Kint/Zval/Representation/ColorRepresentation.php
@@ -23,7 +23,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-namespace Kint\Object\Representation;
+namespace Kint\Zval\Representation;
 
 use InvalidArgumentException;
 
@@ -39,7 +39,7 @@ class ColorRepresentation extends Representation
     const COLOR_HEX_4 = 8;
     const COLOR_HEX_8 = 9;
 
-    public static $color_map = array(
+    public static $color_map = [
         'aliceblue' => 'f0f8ff',
         'antiquewhite' => 'faebd7',
         'aqua' => '00ffff',
@@ -191,7 +191,7 @@ class ColorRepresentation extends Representation
         'whitesmoke' => 'f5f5f5',
         'yellow' => 'ffff00',
         'yellowgreen' => '9acd32',
-    );
+    ];
 
     public $r = 0;
     public $g = 0;
@@ -199,7 +199,7 @@ class ColorRepresentation extends Representation
     public $a = 1.0;
     public $variant;
     public $implicit_label = true;
-    public $hints = array('color');
+    public $hints = ['color'];
 
     public function __construct($value)
     {
@@ -254,7 +254,7 @@ public function getColor($variant = null)
 
                 return \sprintf('hsla(%d, %d%%, %d%%, %s)', $val[0], $val[1], $val[2], \round($this->a, 4));
             case self::COLOR_HEX_4:
-                if (0 === $this->r % 0x11 && 0 === $this->g % 0x11 && 0 === $this->b % 0x11 && 0 === ($this->a * 255) % 0x11) {
+                if (0 === $this->r % 0x11 && 0 === $this->g % 0x11 && 0 === $this->b % 0x11 && 0 === ((int) ($this->a * 255)) % 0x11) {
                     return \sprintf(
                         '#%1X%1X%1X%1X',
                         \round($this->r / 0x11),
@@ -413,21 +413,19 @@ protected function setValuesFromFunction($value)
 
                 if (3 === $i) {
                     $color = $color / 100;
-                } elseif (\in_array($variant, array(self::COLOR_RGB, self::COLOR_RGBA), true)) {
+                } elseif (\in_array($variant, [self::COLOR_RGB, self::COLOR_RGBA], true)) {
                     $color = \round($color / 100 * 0xFF);
                 }
             }
 
             $color = (float) $color;
 
-            if (0 === $i && \in_array($variant, array(self::COLOR_HSL, self::COLOR_HSLA), true)) {
-                $color = ($color % 360 + 360) % 360;
+            if (0 === $i && \in_array($variant, [self::COLOR_HSL, self::COLOR_HSLA], true)) {
+                $color = \fmod(\fmod($color, 360) + 360, 360);
             }
         }
 
-        /** @var float[] Psalm bug workaround */
-        $params = \array_map('floatval', $params);
-
+        /** @var non-empty-array<array-key, float> $params Psalm bug workaround */
         switch ($variant) {
             case self::COLOR_RGBA:
             case self::COLOR_RGB:
@@ -486,11 +484,11 @@ public static function hslToRgb($h, $s, $l)
         $m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l * $s;
         $m1 = $l * 2 - $m2;
 
-        return array(
+        return [
             (int) \round(self::hueToRgb($m1, $m2, $h + 1 / 3) * 0xFF),
             (int) \round(self::hueToRgb($m1, $m2, $h) * 0xFF),
             (int) \round(self::hueToRgb($m1, $m2, $h - 1 / 3) * 0xFF),
-        );
+        ];
     }
 
     /**
@@ -541,17 +539,16 @@ public static function rgbToHsl($red, $green, $blue)
             }
         }
 
-        return array(
-            (float) ($H * 360 % 360),
+        return [
+            \fmod($H * 360, 360),
             (float) ($S * 100),
             (float) ($L * 100),
-        );
+        ];
     }
 
     /**
      * Helper function for hslToRgb. Even blacker magic.
      *
-     *
      * @param float $m1
      * @param float $m2
      * @param float $hue
diff --git a/system/ThirdParty/Kint/Object/Representation/DocstringRepresentation.php b/system/ThirdParty/Kint/Zval/Representation/DocstringRepresentation.php
similarity index 97%
rename from system/ThirdParty/Kint/Object/Representation/DocstringRepresentation.php
rename to system/ThirdParty/Kint/Zval/Representation/DocstringRepresentation.php
index 488d8d6e0748..8acdcc1e8583 100644
--- a/system/ThirdParty/Kint/Object/Representation/DocstringRepresentation.php
+++ b/system/ThirdParty/Kint/Zval/Representation/DocstringRepresentation.php
@@ -23,14 +23,14 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-namespace Kint\Object\Representation;
+namespace Kint\Zval\Representation;
 
 class DocstringRepresentation extends Representation
 {
     public $file;
     public $line;
     public $class;
-    public $hints = array('docstring');
+    public $hints = ['docstring'];
 
     public function __construct($docstring, $file, $line, $class = null)
     {
diff --git a/system/ThirdParty/Kint/Object/Representation/MicrotimeRepresentation.php b/system/ThirdParty/Kint/Zval/Representation/MicrotimeRepresentation.php
similarity index 96%
rename from system/ThirdParty/Kint/Object/Representation/MicrotimeRepresentation.php
rename to system/ThirdParty/Kint/Zval/Representation/MicrotimeRepresentation.php
index b9f4dacb314b..aedc2edffb6e 100644
--- a/system/ThirdParty/Kint/Object/Representation/MicrotimeRepresentation.php
+++ b/system/ThirdParty/Kint/Zval/Representation/MicrotimeRepresentation.php
@@ -23,7 +23,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-namespace Kint\Object\Representation;
+namespace Kint\Zval\Representation;
 
 use DateTime;
 
@@ -40,7 +40,7 @@ class MicrotimeRepresentation extends Representation
     public $mem_real = 0;
     public $mem_peak = 0;
     public $mem_peak_real = 0;
-    public $hints = array('microtime');
+    public $hints = ['microtime'];
 
     public function __construct($seconds, $microseconds, $group, $lap = null, $total = null, $i = 0)
     {
diff --git a/system/ThirdParty/Kint/Object/Representation/Representation.php b/system/ThirdParty/Kint/Zval/Representation/Representation.php
similarity index 95%
rename from system/ThirdParty/Kint/Object/Representation/Representation.php
rename to system/ThirdParty/Kint/Zval/Representation/Representation.php
index 0c911a4eaa98..2d649d077c13 100644
--- a/system/ThirdParty/Kint/Object/Representation/Representation.php
+++ b/system/ThirdParty/Kint/Zval/Representation/Representation.php
@@ -23,14 +23,14 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-namespace Kint\Object\Representation;
+namespace Kint\Zval\Representation;
 
 class Representation
 {
     public $label;
     public $implicit_label = false;
-    public $hints = array();
-    public $contents = array();
+    public $hints = [];
+    public $contents = [];
 
     protected $name;
 
diff --git a/system/ThirdParty/Kint/Object/Representation/SourceRepresentation.php b/system/ThirdParty/Kint/Zval/Representation/SourceRepresentation.php
similarity index 96%
rename from system/ThirdParty/Kint/Object/Representation/SourceRepresentation.php
rename to system/ThirdParty/Kint/Zval/Representation/SourceRepresentation.php
index c2cf1204f1a9..65077d6218c6 100644
--- a/system/ThirdParty/Kint/Object/Representation/SourceRepresentation.php
+++ b/system/ThirdParty/Kint/Zval/Representation/SourceRepresentation.php
@@ -23,12 +23,12 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-namespace Kint\Object\Representation;
+namespace Kint\Zval\Representation;
 
 class SourceRepresentation extends Representation
 {
-    public $hints = array('source');
-    public $source = array();
+    public $hints = ['source'];
+    public $source = [];
     public $filename;
     public $line = 0;
     public $showfilename = false;
diff --git a/system/ThirdParty/Kint/Object/Representation/SplFileInfoRepresentation.php b/system/ThirdParty/Kint/Zval/Representation/SplFileInfoRepresentation.php
similarity index 95%
rename from system/ThirdParty/Kint/Object/Representation/SplFileInfoRepresentation.php
rename to system/ThirdParty/Kint/Zval/Representation/SplFileInfoRepresentation.php
index 3df50e6a1284..6208451b41ed 100644
--- a/system/ThirdParty/Kint/Object/Representation/SplFileInfoRepresentation.php
+++ b/system/ThirdParty/Kint/Zval/Representation/SplFileInfoRepresentation.php
@@ -23,29 +23,29 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-namespace Kint\Object\Representation;
+namespace Kint\Zval\Representation;
 
 use Kint\Utils;
 use SplFileInfo;
 
 class SplFileInfoRepresentation extends Representation
 {
-    public $perms;
+    public $perms = null;
     public $flags;
     public $path;
-    public $realpath;
-    public $linktarget;
+    public $realpath = null;
+    public $linktarget = null;
     public $size;
     public $is_dir = false;
     public $is_file = false;
     public $is_link = false;
-    public $owner;
-    public $group;
+    public $owner = null;
+    public $group = null;
     public $ctime;
     public $mtime;
     public $typename = 'Unknown file';
     public $typeflag = '-';
-    public $hints = array('fspath');
+    public $hints = ['fspath'];
 
     public function __construct(SplFileInfo $fileInfo)
     {
@@ -109,7 +109,7 @@ public function __construct(SplFileInfo $fileInfo)
                 break;
         }
 
-        $this->flags = array($this->typeflag);
+        $this->flags = [$this->typeflag];
 
         // User
         $this->flags[] = (($this->perms & 0400) ? 'r' : '-');
diff --git a/system/ThirdParty/Kint/Object/ResourceObject.php b/system/ThirdParty/Kint/Zval/ResourceValue.php
similarity index 93%
rename from system/ThirdParty/Kint/Object/ResourceObject.php
rename to system/ThirdParty/Kint/Zval/ResourceValue.php
index a43f85d900ee..ef1c5541e476 100644
--- a/system/ThirdParty/Kint/Object/ResourceObject.php
+++ b/system/ThirdParty/Kint/Zval/ResourceValue.php
@@ -23,9 +23,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-namespace Kint\Object;
+namespace Kint\Zval;
 
-class ResourceObject extends BasicObject
+class ResourceValue extends Value
 {
     public $resource_type;
 
@@ -38,7 +38,7 @@ public function getType()
         return 'resource';
     }
 
-    public function transplant(BasicObject $old)
+    public function transplant(Value $old)
     {
         parent::transplant($old);
 
diff --git a/system/ThirdParty/Kint/Zval/SimpleXMLElementValue.php b/system/ThirdParty/Kint/Zval/SimpleXMLElementValue.php
new file mode 100644
index 000000000000..b385bc6daa2e
--- /dev/null
+++ b/system/ThirdParty/Kint/Zval/SimpleXMLElementValue.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Šleinius (raveren@gmail.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace Kint\Zval;
+
+class SimpleXMLElementValue extends InstanceValue
+{
+    public $hints = ['object', 'simplexml_element'];
+
+    protected $is_string_value = false;
+
+    /**
+     * @param bool $is_string_value
+     */
+    public function setIsStringValue($is_string_value)
+    {
+        $this->is_string_value = $is_string_value;
+    }
+
+    public function getValueShort()
+    {
+        if ($this->is_string_value && ($rep = $this->value) && 'contents' === $rep->getName() && 'string' === \gettype($rep->contents)) {
+            return '"'.$rep->contents.'"';
+        }
+    }
+}
diff --git a/system/ThirdParty/Kint/Object/StreamObject.php b/system/ThirdParty/Kint/Zval/StreamValue.php
similarity index 96%
rename from system/ThirdParty/Kint/Object/StreamObject.php
rename to system/ThirdParty/Kint/Zval/StreamValue.php
index 358f2743e94f..af909c84f39a 100644
--- a/system/ThirdParty/Kint/Object/StreamObject.php
+++ b/system/ThirdParty/Kint/Zval/StreamValue.php
@@ -23,11 +23,11 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-namespace Kint\Object;
+namespace Kint\Zval;
 
 use Kint\Kint;
 
-class StreamObject extends ResourceObject
+class StreamValue extends ResourceValue
 {
     public $stream_meta;
 
diff --git a/system/ThirdParty/Kint/Object/ThrowableObject.php b/system/ThirdParty/Kint/Zval/ThrowableValue.php
similarity index 88%
rename from system/ThirdParty/Kint/Object/ThrowableObject.php
rename to system/ThirdParty/Kint/Zval/ThrowableValue.php
index 2a86d57538df..26676481c26d 100644
--- a/system/ThirdParty/Kint/Object/ThrowableObject.php
+++ b/system/ThirdParty/Kint/Zval/ThrowableValue.php
@@ -23,21 +23,21 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-namespace Kint\Object;
+namespace Kint\Zval;
 
 use Exception;
 use InvalidArgumentException;
 use Throwable;
 
-class ThrowableObject extends InstanceObject
+class ThrowableValue extends InstanceValue
 {
     public $message;
-    public $hints = array('object', 'throwable');
+    public $hints = ['object', 'throwable'];
 
     public function __construct($throw)
     {
         if (!$throw instanceof Exception && (!KINT_PHP70 || !$throw instanceof Throwable)) {
-            throw new InvalidArgumentException('ThrowableObject must be constructed with a Throwable');
+            throw new InvalidArgumentException('ThrowableValue must be constructed with a Throwable');
         }
 
         parent::__construct();
diff --git a/system/ThirdParty/Kint/Object/TraceFrameObject.php b/system/ThirdParty/Kint/Zval/TraceFrameValue.php
similarity index 81%
rename from system/ThirdParty/Kint/Object/TraceFrameObject.php
rename to system/ThirdParty/Kint/Zval/TraceFrameValue.php
index 4259aeeec1aa..62f7829192d2 100644
--- a/system/ThirdParty/Kint/Object/TraceFrameObject.php
+++ b/system/ThirdParty/Kint/Zval/TraceFrameValue.php
@@ -23,52 +23,57 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-namespace Kint\Object;
+namespace Kint\Zval;
 
-use Kint\Object\Representation\Representation;
-use Kint\Object\Representation\SourceRepresentation;
+use InvalidArgumentException;
+use Kint\Zval\Representation\Representation;
+use Kint\Zval\Representation\SourceRepresentation;
 use ReflectionFunction;
 use ReflectionMethod;
 
-class TraceFrameObject extends BasicObject
+class TraceFrameValue extends Value
 {
     public $trace;
-    public $hints = array('trace_frame');
+    public $hints = ['trace_frame'];
 
-    public function __construct(BasicObject $base, array $raw_frame)
+    public function __construct(Value $base, array $raw_frame)
     {
         parent::__construct();
 
         $this->transplant($base);
 
-        $this->trace = array(
-            'function' => isset($raw_frame['function']) ? $raw_frame['function'] : null,
+        if (!isset($this->value)) {
+            throw new InvalidArgumentException('Tried to create TraceFrameValue from Value with no value representation');
+        }
+
+        $this->trace = [
+            'function' => $raw_frame['function'],
             'line' => isset($raw_frame['line']) ? $raw_frame['line'] : null,
             'file' => isset($raw_frame['file']) ? $raw_frame['file'] : null,
             'class' => isset($raw_frame['class']) ? $raw_frame['class'] : null,
             'type' => isset($raw_frame['type']) ? $raw_frame['type'] : null,
             'object' => null,
             'args' => null,
-        );
+        ];
 
         if ($this->trace['class'] && \method_exists($this->trace['class'], $this->trace['function'])) {
             $func = new ReflectionMethod($this->trace['class'], $this->trace['function']);
-            $this->trace['function'] = new MethodObject($func);
+            $this->trace['function'] = new MethodValue($func);
         } elseif (!$this->trace['class'] && \function_exists($this->trace['function'])) {
             $func = new ReflectionFunction($this->trace['function']);
-            $this->trace['function'] = new MethodObject($func);
+            $this->trace['function'] = new MethodValue($func);
         }
 
         foreach ($this->value->contents as $frame_prop) {
             if ('object' === $frame_prop->name) {
                 $this->trace['object'] = $frame_prop;
                 $this->trace['object']->name = null;
-                $this->trace['object']->operator = BasicObject::OPERATOR_NONE;
+                $this->trace['object']->operator = Value::OPERATOR_NONE;
             }
             if ('args' === $frame_prop->name) {
                 $this->trace['args'] = $frame_prop->value->contents;
 
-                if ($this->trace['function'] instanceof MethodObject) {
+                if ($this->trace['function'] instanceof MethodValue) {
                     foreach (\array_values($this->trace['function']->parameters) as $param) {
                         if (isset($this->trace['args'][$param->position])) {
                             $this->trace['args'][$param->position]->name = $param->getName();
diff --git a/system/ThirdParty/Kint/Object/TraceObject.php b/system/ThirdParty/Kint/Zval/TraceValue.php
similarity index 93%
rename from system/ThirdParty/Kint/Object/TraceObject.php
rename to system/ThirdParty/Kint/Zval/TraceValue.php
index a780b082bf9c..4d0edc42219a 100644
--- a/system/ThirdParty/Kint/Object/TraceObject.php
+++ b/system/ThirdParty/Kint/Zval/TraceValue.php
@@ -23,11 +23,11 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-namespace Kint\Object;
+namespace Kint\Zval;
 
-class TraceObject extends BasicObject
+class TraceValue extends Value
 {
-    public $hints = array('trace');
+    public $hints = ['trace'];
 
     public function getType()
     {
diff --git a/system/ThirdParty/Kint/Object/BasicObject.php b/system/ThirdParty/Kint/Zval/Value.php
similarity index 91%
rename from system/ThirdParty/Kint/Object/BasicObject.php
rename to system/ThirdParty/Kint/Zval/Value.php
index d69347eb8dfc..747efb5f718f 100644
--- a/system/ThirdParty/Kint/Object/BasicObject.php
+++ b/system/ThirdParty/Kint/Zval/Value.php
@@ -23,11 +23,11 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-namespace Kint\Object;
+namespace Kint\Zval;
 
-use Kint\Object\Representation\Representation;
+use Kint\Zval\Representation\Representation;
 
-class BasicObject
+class Value
 {
     const ACCESS_NONE = null;
     const ACCESS_PUBLIC = 1;
@@ -51,9 +51,9 @@ class BasicObject
     public $depth = 0;
     public $size;
     public $value;
-    public $hints = array();
+    public $hints = [];
 
-    protected $representations = array();
+    protected $representations = [];
 
     public function __construct()
     {
@@ -70,7 +70,7 @@ public function addRepresentation(Representation $rep, $pos = null)
         } else {
             $this->representations = \array_merge(
                 \array_slice($this->representations, 0, $pos),
-                array($rep->getName() => $rep),
+                [$rep->getName() => $rep],
                 \array_slice($this->representations, $pos)
             );
         }
@@ -111,7 +111,7 @@ public function getRepresentations()
 
     public function clearRepresentations()
     {
-        $this->representations = array();
+        $this->representations = [];
     }
 
     public function getType()
@@ -131,7 +131,7 @@ public function getModifiers()
             $out .= ' static';
         }
 
-        if (\strlen($out)) {
+        if (null !== $out && \strlen($out)) {
             return \ltrim($out);
         }
     }
@@ -188,7 +188,7 @@ public function getAccessPath()
         return $this->access_path;
     }
 
-    public function transplant(BasicObject $old)
+    public function transplant(Value $old)
     {
         $this->name = $old->name;
         $this->size = $old->size;
@@ -212,7 +212,7 @@ public function transplant(BasicObject $old)
      * @param null|string $name
      * @param null|string $access_path
      *
-     * @return \Kint\Object\BasicObject
+     * @return \Kint\Zval\Value
      */
     public static function blank($name = null, $access_path = null)
     {
@@ -223,19 +223,19 @@ public static function blank($name = null, $access_path = null)
         return $o;
     }
 
-    public static function sortByAccess(BasicObject $a, BasicObject $b)
+    public static function sortByAccess(Value $a, Value $b)
     {
-        static $sorts = array(
+        static $sorts = [
             self::ACCESS_PUBLIC => 1,
             self::ACCESS_PROTECTED => 2,
             self::ACCESS_PRIVATE => 3,
             self::ACCESS_NONE => 4,
-        );
+        ];
 
         return $sorts[$a->access] - $sorts[$b->access];
     }
 
-    public static function sortByName(BasicObject $a, BasicObject $b)
+    public static function sortByName(Value $a, Value $b)
     {
         $ret = \strnatcasecmp($a->name, $b->name);
 
diff --git a/system/ThirdParty/Kint/init.php b/system/ThirdParty/Kint/init.php
index 952e041400ff..2e7c62b4b1c9 100644
--- a/system/ThirdParty/Kint/init.php
+++ b/system/ThirdParty/Kint/init.php
@@ -30,31 +30,33 @@
     return;
 }
 
-if (\version_compare(PHP_VERSION, '5.3') < 0) {
-    throw new Exception('Kint 3.0 requires PHP 5.3 or higher');
+if (\version_compare(PHP_VERSION, '5.6') < 0) {
+    throw new Exception('Kint 4.0 requires PHP 5.6 or higher');
 }
 
 \define('KINT_DIR', __DIR__);
 \define('KINT_WIN', DIRECTORY_SEPARATOR !== '/');
-\define('KINT_PHP56', (\version_compare(PHP_VERSION, '5.6') >= 0));
 \define('KINT_PHP70', (\version_compare(PHP_VERSION, '7.0') >= 0));
+\define('KINT_PHP71', (\version_compare(PHP_VERSION, '7.1') >= 0));
 \define('KINT_PHP72', (\version_compare(PHP_VERSION, '7.2') >= 0));
 \define('KINT_PHP73', (\version_compare(PHP_VERSION, '7.3') >= 0));
 \define('KINT_PHP74', (\version_compare(PHP_VERSION, '7.4') >= 0));
+\define('KINT_PHP80', (\version_compare(PHP_VERSION, '8.0') >= 0));
+\define('KINT_PHP81', (\version_compare(PHP_VERSION, '8.1') >= 0));
 
 // Dynamic default settings
 Kint::$file_link_format = \ini_get('xdebug.file_link_format');
 if (isset($_SERVER['DOCUMENT_ROOT'])) {
-    Kint::$app_root_dirs = array(
+    Kint::$app_root_dirs = [
         $_SERVER['DOCUMENT_ROOT'] => '<ROOT>',
         \realpath($_SERVER['DOCUMENT_ROOT']) => '<ROOT>',
-    );
+    ];
 }
 
 Utils::composerSkipFlags();
 
 if ((!\defined('KINT_SKIP_FACADE') || !KINT_SKIP_FACADE) && !\class_exists('Kint')) {
-    \class_alias('Kint\\Kint', 'Kint');
+    \class_alias(Kint::class, 'Kint');
 }
 
 if (!\defined('KINT_SKIP_HELPERS') || !KINT_SKIP_HELPERS) {
diff --git a/system/ThirdParty/Kint/init_helpers.php b/system/ThirdParty/Kint/init_helpers.php
index b961d67f1af5..3dca84c35f08 100644
--- a/system/ThirdParty/Kint/init_helpers.php
+++ b/system/ThirdParty/Kint/init_helpers.php
@@ -24,6 +24,7 @@
  */
 
 use Kint\Kint;
+use Kint\Renderer\CliRenderer;
 
 if (!\function_exists('d')) {
     /**
@@ -35,7 +36,7 @@ function d()
     {
         $args = \func_get_args();
 
-        return \call_user_func_array(array('Kint', 'dump'), $args);
+        return \call_user_func_array(['Kint', 'dump'], $args);
     }
 
     Kint::$aliases[] = 'd';
@@ -59,23 +60,28 @@ function d()
      */
     function s()
     {
-        if (!Kint::$enabled_mode) {
+        if (false === Kint::$enabled_mode) {
             return 0;
         }
 
-        $stash = Kint::$enabled_mode;
+        $kstash = Kint::$enabled_mode;
+        $cstash = CliRenderer::$cli_colors;
 
         if (Kint::MODE_TEXT !== Kint::$enabled_mode) {
             Kint::$enabled_mode = Kint::MODE_PLAIN;
+
             if (PHP_SAPI === 'cli' && true === Kint::$cli_detection) {
                 Kint::$enabled_mode = Kint::$mode_default_cli;
             }
         }
 
+        CliRenderer::$cli_colors = false;
+
         $args = \func_get_args();
-        $out = \call_user_func_array(array('Kint', 'dump'), $args);
+        $out = \call_user_func_array(['Kint', 'dump'], $args);
 
-        Kint::$enabled_mode = $stash;
+        Kint::$enabled_mode = $kstash;
+        CliRenderer::$cli_colors = $cstash;
 
         return $out;
     }
diff --git a/system/ThirdParty/Kint/resources/compiled/aante-light.css b/system/ThirdParty/Kint/resources/compiled/aante-light.css
index 2de17accf9a9..dc7a40a73489 100644
--- a/system/ThirdParty/Kint/resources/compiled/aante-light.css
+++ b/system/ThirdParty/Kint/resources/compiled/aante-light.css
@@ -1 +1 @@
-.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,0.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:none}.kint-rich.kint-folder.kint-show{display:block}.kint-rich.kint-folder dd.kint-folder{max-height:calc(100vh - 100px);padding-right:8px;overflow-y:scroll}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#aaa;color:#1d1e1e}.kint-rich .kint-focused{box-shadow:0 0 3px 2px red}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#1d1e1e;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:8px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#f8f8f8;border:1px solid #d7d7d7;color:#1d1e1e;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:4px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#aaa}.kint-rich>dl dl{padding:0 0 0 12px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxwYXRoIGQ9Ik02IDdoMThsLTkgMTV6bTAgMzBoMThsLTkgMTV6bTAgNDVoMThsLTktMTV6bTAgMzBoMThsLTktMTV6bTAgMTJsMTggMThtLTE4IDBsMTgtMTgiIGZpbGw9IiM1NTUiLz48cGF0aCBkPSJNNiAxMjZsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSIjNTU1Ii8+PC9zdmc+") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #d7d7d7}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#06f;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:red}.kint-rich dfn{font-style:normal;font-family:monospace;color:#1d1e1e}.kint-rich pre{color:#1d1e1e;margin:0 0 0 12px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #d7d7d7;background:#f8f8f8;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(29,30,30,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#f8f8f8;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#1d1e1e;background:#f8f8f8}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #d7d7d7;border-top-width:0;border-bottom-width:0;padding:4px;float:right !important;margin:-4px 0;color:#1d1e1e;background:#f8f8f8;height:24px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#f8f8f8;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#f8f8f8}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#f8f8f8;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#1d1e1e}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#1d1e1e;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#1d1e1e;border-bottom:1px dotted #1d1e1e}.kint-rich ul{list-style:none;padding-left:12px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #d7d7d7}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 12px;padding-left:0;background:#f8f8f8;border:1px solid #d7d7d7;border-top:0}.kint-rich ul.kint-tabs>li{background:#f8f8f8;border:1px solid #d7d7d7;cursor:pointer;display:inline-block;height:24px;margin:2px;padding:0 12px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#aaa;color:red}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#f8f8f8;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:20px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul:not(.kint-tabs)>li:not(:first-child){display:none}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#aaa;color:red}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #d7d7d7;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#aaa}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #d7d7d7;padding:2px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#f8f8f8;color:#1d1e1e}.kint-rich table td{background:#f8f8f8;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #aaa inset}.kint-rich table tr:hover var{color:red}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:4px;padding-bottom:4px;border-bottom:1px solid #f8f8f8}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #aaa;padding-right:8px;margin-right:8px}.kint-rich pre.kint-source>div.kint-highlight{background:#f8f8f8}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #aaa,0 1px #aaa,1px 0 #aaa,0 -1px #aaa;color:#f8f8f8;font-weight:bold}.kint-rich .kint-focused{box-shadow:0 0 3px 2px red}.kint-rich dt{font-weight:normal}.kint-rich dt.kint-parent{margin-top:4px}.kint-rich dl dl{margin-top:4px;padding-left:25px;border-left:none}.kint-rich>dl>dt{background:#f8f8f8}.kint-rich ul{margin:0;padding-left:0}.kint-rich ul:not(.kint-tabs)>li{border-left:0}.kint-rich ul.kint-tabs{background:#f8f8f8;border:1px solid #d7d7d7;border-width:0 1px 1px 1px;padding:4px 0 0 12px;margin-left:-1px;margin-top:-1px}.kint-rich ul.kint-tabs li,.kint-rich ul.kint-tabs li+li{margin:0 0 0 4px}.kint-rich ul.kint-tabs li{border-bottom-width:0;height:25px}.kint-rich ul.kint-tabs li:first-child{margin-left:0}.kint-rich ul.kint-tabs li.kint-active-tab{border-top:1px solid #d7d7d7;background:#fff;font-weight:bold;padding-top:0;border-bottom:1px solid #fff !important;margin-bottom:-1px}.kint-rich ul.kint-tabs li.kint-active-tab:hover{border-bottom:1px solid #fff}.kint-rich ul>li>pre{border:1px solid #d7d7d7}.kint-rich dt:hover+dd>ul{border-color:#aaa}.kint-rich pre{background:#fff;margin-top:4px;margin-left:25px}.kint-rich .kint-source{margin-left:-1px}.kint-rich .kint-source .kint-highlight{background:#cfc}.kint-rich .kint-parent.kint-show>.kint-search{border-bottom-width:1px}.kint-rich table td{background:#fff}.kint-rich table td>dl{padding:0;margin:0}.kint-rich table td>dl>dt.kint-parent{margin:0}.kint-rich table td:first-child,.kint-rich table td,.kint-rich table th{padding:2px 4px}.kint-rich table dd,.kint-rich table dt{background:#fff}.kint-rich table tr:hover>td{box-shadow:none;background:#cfc}
+.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,0.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:8px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#aaa;color:#1d1e1e}.kint-rich .kint-focused{box-shadow:0 0 3px 2px red}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#1d1e1e;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:8px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#f8f8f8;border:1px solid #d7d7d7;color:#1d1e1e;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:4px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#aaa}.kint-rich>dl dl{padding:0 0 0 12px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxwYXRoIGQ9Ik02IDdoMThsLTkgMTV6bTAgMzBoMThsLTkgMTV6bTAgNDVoMThsLTktMTV6bTAgMzBoMThsLTktMTV6bTAgMTJsMTggMThtLTE4IDBsMTgtMTgiIGZpbGw9IiM1NTUiLz48cGF0aCBkPSJNNiAxMjZsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSIjNTU1Ii8+PC9zdmc+") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #d7d7d7}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#06f;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:red}.kint-rich dfn{font-style:normal;font-family:monospace;color:#1d1e1e}.kint-rich pre{color:#1d1e1e;margin:0 0 0 12px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #d7d7d7;background:#f8f8f8;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(29,30,30,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#f8f8f8;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#1d1e1e;background:#f8f8f8}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #d7d7d7;border-top-width:0;border-bottom-width:0;padding:4px;float:right !important;margin:-4px 0;color:#1d1e1e;background:#f8f8f8;height:24px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#f8f8f8;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#f8f8f8}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#f8f8f8;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#1d1e1e}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#1d1e1e;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#1d1e1e;border-bottom:1px dotted #1d1e1e}.kint-rich ul{list-style:none;padding-left:12px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #d7d7d7}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 12px;padding-left:0;background:#f8f8f8;border:1px solid #d7d7d7;border-top:0}.kint-rich ul.kint-tabs>li{background:#f8f8f8;border:1px solid #d7d7d7;cursor:pointer;display:inline-block;height:24px;margin:2px;padding:0 12px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#aaa;color:red}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#f8f8f8;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:20px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#aaa;color:red}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #d7d7d7;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#aaa}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #d7d7d7;padding:2px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#f8f8f8;color:#1d1e1e}.kint-rich table td{background:#f8f8f8;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #aaa inset}.kint-rich table tr:hover var{color:red}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:4px;padding-bottom:4px;border-bottom:1px solid #f8f8f8}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #aaa;padding-right:8px;margin-right:8px}.kint-rich pre.kint-source>div.kint-highlight{background:#f8f8f8}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #aaa,0 1px #aaa,1px 0 #aaa,0 -1px #aaa;color:#f8f8f8;font-weight:bold}.kint-rich .kint-focused{box-shadow:0 0 3px 2px red}.kint-rich dt{font-weight:normal}.kint-rich dt.kint-parent{margin-top:4px}.kint-rich dl dl{margin-top:4px;padding-left:25px;border-left:none}.kint-rich>dl>dt{background:#f8f8f8}.kint-rich ul{margin:0;padding-left:0}.kint-rich ul:not(.kint-tabs)>li{border-left:0}.kint-rich ul.kint-tabs{background:#f8f8f8;border:1px solid #d7d7d7;border-width:0 1px 1px 1px;padding:4px 0 0 12px;margin-left:-1px;margin-top:-1px}.kint-rich ul.kint-tabs li,.kint-rich ul.kint-tabs li+li{margin:0 0 0 4px}.kint-rich ul.kint-tabs li{border-bottom-width:0;height:25px}.kint-rich ul.kint-tabs li:first-child{margin-left:0}.kint-rich ul.kint-tabs li.kint-active-tab{border-top:1px solid #d7d7d7;background:#fff;font-weight:bold;padding-top:0;border-bottom:1px solid #fff !important;margin-bottom:-1px}.kint-rich ul.kint-tabs li.kint-active-tab:hover{border-bottom:1px solid #fff}.kint-rich ul>li>pre{border:1px solid #d7d7d7}.kint-rich dt:hover+dd>ul{border-color:#aaa}.kint-rich pre{background:#fff;margin-top:4px;margin-left:25px}.kint-rich .kint-source{margin-left:-1px}.kint-rich .kint-source .kint-highlight{background:#cfc}.kint-rich .kint-parent.kint-show>.kint-search{border-bottom-width:1px}.kint-rich table td{background:#fff}.kint-rich table td>dl{padding:0;margin:0}.kint-rich table td>dl>dt.kint-parent{margin:0}.kint-rich table td:first-child,.kint-rich table td,.kint-rich table th{padding:2px 4px}.kint-rich table dd,.kint-rich table dt{background:#fff}.kint-rich table tr:hover>td{box-shadow:none;background:#cfc}
diff --git a/system/ThirdParty/Kint/resources/compiled/microtime.js b/system/ThirdParty/Kint/resources/compiled/microtime.js
index 20e3445b2b05..c9b8f00a58d7 100644
--- a/system/ThirdParty/Kint/resources/compiled/microtime.js
+++ b/system/ThirdParty/Kint/resources/compiled/microtime.js
@@ -1 +1 @@
-void 0===window.kintMicrotimeInitialized&&(window.kintMicrotimeInitialized=1,window.addEventListener("load",function(){"use strict";var c={},i=Array.prototype.slice.call(document.querySelectorAll("[data-kint-microtime-group]"),0);i.forEach(function(i){if(i.querySelector(".kint-microtime-lap")){var t=i.getAttribute("data-kint-microtime-group"),e=parseFloat(i.querySelector(".kint-microtime-lap").innerHTML),r=parseFloat(i.querySelector(".kint-microtime-avg").innerHTML);void 0===c[t]&&(c[t]={}),(void 0===c[t].min||c[t].min>e)&&(c[t].min=e),(void 0===c[t].max||c[t].max<e)&&(c[t].max=e),c[t].avg=r}}),i.forEach(function(i){var t=i.querySelector(".kint-microtime-lap");if(null!==t){var e=parseFloat(t.textContent),r=i.dataset.kintMicrotimeGroup,o=c[r].avg,n=c[r].max,a=c[r].min;e===(i.querySelector(".kint-microtime-avg").textContent=o)&&e===a&&e===n||(t.style.background=o<e?"hsl("+(40-40*((e-o)/(n-o)))+", 100%, 65%)":"hsl("+(40+80*(o===a?0:(o-e)/(o-a)))+", 100%, 65%)")}})}));
+void 0===window.kintMicrotimeInitialized&&(window.kintMicrotimeInitialized=1,window.addEventListener("load",function(){"use strict";var a={},t=Array.prototype.slice.call(document.querySelectorAll("[data-kint-microtime-group]"),0);t.forEach(function(t){var i,e;t.querySelector(".kint-microtime-lap")&&(i=t.getAttribute("data-kint-microtime-group"),e=parseFloat(t.querySelector(".kint-microtime-lap").innerHTML),t=parseFloat(t.querySelector(".kint-microtime-avg").innerHTML),void 0===a[i]&&(a[i]={}),(void 0===a[i].min||a[i].min>e)&&(a[i].min=e),(void 0===a[i].max||a[i].max<e)&&(a[i].max=e),a[i].avg=t)}),t.forEach(function(t){var i,e,r,o,n=t.querySelector(".kint-microtime-lap");null!==n&&(i=parseFloat(n.textContent),o=t.dataset.kintMicrotimeGroup,e=a[o].avg,r=a[o].max,o=a[o].min,i===(t.querySelector(".kint-microtime-avg").textContent=e)&&i===o&&i===r||(n.style.background=e<i?"hsl("+(40-40*((i-e)/(r-e)))+", 100%, 65%)":"hsl("+(40+80*(e===o?0:(e-i)/(e-o)))+", 100%, 65%)"))})}));
diff --git a/system/ThirdParty/Kint/resources/compiled/original.css b/system/ThirdParty/Kint/resources/compiled/original.css
index 7366299b169a..4a320a6835c8 100644
--- a/system/ThirdParty/Kint/resources/compiled/original.css
+++ b/system/ThirdParty/Kint/resources/compiled/original.css
@@ -1 +1 @@
-.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,0.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:none}.kint-rich.kint-folder.kint-show{display:block}.kint-rich.kint-folder dd.kint-folder{max-height:calc(100vh - 100px);padding-right:8px;overflow-y:scroll}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#0092db;color:#1d1e1e}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #5cb730}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#1d1e1e;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:8px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#e0eaef;border:1px solid #b6cedb;color:#1d1e1e;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:4px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#0092db}.kint-rich>dl dl{padding:0 0 0 12px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxnIHN0cm9rZS13aWR0aD0iMiIgZmlsbD0iI0ZGRiI+PHBhdGggZD0iTTEgMWgyOHYyOEgxem01IDE0aDE4bS05IDlWNk0xIDYxaDI4djI4SDF6bTUgMTRoMTgiIHN0cm9rZT0iIzM3OSIvPjxwYXRoIGQ9Ik0xIDMxaDI4djI4SDF6bTUgMTRoMThtLTkgOVYzNk0xIDkxaDI4djI4SDF6bTUgMTRoMTgiIHN0cm9rZT0iIzVBMyIvPjxwYXRoIGQ9Ik0xIDEyMWgyOHYyOEgxem01IDVsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZT0iI0NDQyIvPjwvZz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #b6cedb}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#0092db;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#5cb730}.kint-rich dfn{font-style:normal;font-family:monospace;color:#1d1e1e}.kint-rich pre{color:#1d1e1e;margin:0 0 0 12px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #b6cedb;background:#e0eaef;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(29,30,30,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#e0eaef;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#1d1e1e;background:#e0eaef}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #b6cedb;border-top-width:0;border-bottom-width:0;padding:4px;float:right !important;margin:-4px 0;color:#1d1e1e;background:#c1d4df;height:24px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#d0d0d0;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#e8e8e8}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#c1d4df;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#1d1e1e}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#1d1e1e;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#1d1e1e;border-bottom:1px dotted #1d1e1e}.kint-rich ul{list-style:none;padding-left:12px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #b6cedb}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 12px;padding-left:0;background:#e0eaef;border:1px solid #b6cedb;border-top:0}.kint-rich ul.kint-tabs>li{background:#c1d4df;border:1px solid #b6cedb;cursor:pointer;display:inline-block;height:24px;margin:2px;padding:0 12px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#0092db;color:#5cb730}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#e0eaef;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:20px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul:not(.kint-tabs)>li:not(:first-child){display:none}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#0092db;color:#5cb730}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #b6cedb;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#0092db}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #b6cedb;padding:2px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#c1d4df;color:#1d1e1e}.kint-rich table td{background:#e0eaef;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #0092db inset}.kint-rich table tr:hover var{color:#5cb730}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:4px;padding-bottom:4px;border-bottom:1px solid #c1d4df}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #0092db;padding-right:8px;margin-right:8px}.kint-rich pre.kint-source>div.kint-highlight{background:#c1d4df}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #0092db,0 1px #0092db,1px 0 #0092db,0 -1px #0092db;color:#e0eaef;font-weight:bold}.kint-rich>dl>dt{background:linear-gradient(to bottom, #e3ecf0 0, #c0d4df 100%)}.kint-rich ul.kint-tabs{background:linear-gradient(to bottom, #9dbed0 0px, #b2ccda 100%)}.kint-rich>dl:not(.kint-trace)>dd>ul.kint-tabs li{background:#e0eaef}.kint-rich>dl:not(.kint-trace)>dd>ul.kint-tabs li.kint-active-tab{background:#c1d4df}.kint-rich>dl.kint-trace>dt{background:linear-gradient(to bottom, #c0d4df 0px, #e3ecf0 100%)}.kint-rich .kint-source .kint-highlight{background:#f0eb96}
+.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,0.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:8px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#0092db;color:#1d1e1e}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #5cb730}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#1d1e1e;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:8px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#e0eaef;border:1px solid #b6cedb;color:#1d1e1e;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:4px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#0092db}.kint-rich>dl dl{padding:0 0 0 12px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxnIHN0cm9rZS13aWR0aD0iMiIgZmlsbD0iI0ZGRiI+PHBhdGggZD0iTTEgMWgyOHYyOEgxem01IDE0aDE4bS05IDlWNk0xIDYxaDI4djI4SDF6bTUgMTRoMTgiIHN0cm9rZT0iIzM3OSIvPjxwYXRoIGQ9Ik0xIDMxaDI4djI4SDF6bTUgMTRoMThtLTkgOVYzNk0xIDkxaDI4djI4SDF6bTUgMTRoMTgiIHN0cm9rZT0iIzVBMyIvPjxwYXRoIGQ9Ik0xIDEyMWgyOHYyOEgxem01IDVsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZT0iI0NDQyIvPjwvZz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #b6cedb}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#0092db;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#5cb730}.kint-rich dfn{font-style:normal;font-family:monospace;color:#1d1e1e}.kint-rich pre{color:#1d1e1e;margin:0 0 0 12px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #b6cedb;background:#e0eaef;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(29,30,30,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#e0eaef;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#1d1e1e;background:#e0eaef}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #b6cedb;border-top-width:0;border-bottom-width:0;padding:4px;float:right !important;margin:-4px 0;color:#1d1e1e;background:#c1d4df;height:24px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#d0d0d0;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#e8e8e8}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#c1d4df;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#1d1e1e}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#1d1e1e;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#1d1e1e;border-bottom:1px dotted #1d1e1e}.kint-rich ul{list-style:none;padding-left:12px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #b6cedb}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 12px;padding-left:0;background:#e0eaef;border:1px solid #b6cedb;border-top:0}.kint-rich ul.kint-tabs>li{background:#c1d4df;border:1px solid #b6cedb;cursor:pointer;display:inline-block;height:24px;margin:2px;padding:0 12px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#0092db;color:#5cb730}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#e0eaef;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:20px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#0092db;color:#5cb730}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #b6cedb;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#0092db}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #b6cedb;padding:2px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#c1d4df;color:#1d1e1e}.kint-rich table td{background:#e0eaef;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #0092db inset}.kint-rich table tr:hover var{color:#5cb730}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:4px;padding-bottom:4px;border-bottom:1px solid #c1d4df}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #0092db;padding-right:8px;margin-right:8px}.kint-rich pre.kint-source>div.kint-highlight{background:#c1d4df}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #0092db,0 1px #0092db,1px 0 #0092db,0 -1px #0092db;color:#e0eaef;font-weight:bold}.kint-rich>dl>dt{background:linear-gradient(to bottom, #e3ecf0 0, #c0d4df 100%)}.kint-rich ul.kint-tabs{background:linear-gradient(to bottom, #9dbed0 0px, #b2ccda 100%)}.kint-rich>dl:not(.kint-trace)>dd>ul.kint-tabs li{background:#e0eaef}.kint-rich>dl:not(.kint-trace)>dd>ul.kint-tabs li.kint-active-tab{background:#c1d4df}.kint-rich>dl.kint-trace>dt{background:linear-gradient(to bottom, #c0d4df 0px, #e3ecf0 100%)}.kint-rich .kint-source .kint-highlight{background:#f0eb96}
diff --git a/system/ThirdParty/Kint/resources/compiled/rich.js b/system/ThirdParty/Kint/resources/compiled/rich.js
index 18fb072ead95..5648cda6de9e 100644
--- a/system/ThirdParty/Kint/resources/compiled/rich.js
+++ b/system/ThirdParty/Kint/resources/compiled/rich.js
@@ -1 +1 @@
-void 0===window.kintRich&&(window.kintRich=function(){"use strict";var n={selectText:function(e){var t=window.getSelection(),a=document.createRange();a.selectNodeContents(e),t.removeAllRanges(),t.addRange(a)},each:function(e,t){Array.prototype.slice.call(document.querySelectorAll(e),0).forEach(t)},hasClass:function(e,t){return!!e.classList&&(void 0===t&&(t="kint-show"),e.classList.contains(t))},addClass:function(e,t){void 0===t&&(t="kint-show"),e.classList.add(t)},removeClass:function(e,t){return void 0===t&&(t="kint-show"),e.classList.remove(t),e},toggle:function(e,t){var a=n.getChildren(e);a&&(void 0===t&&(t=n.hasClass(e)),t?n.removeClass(e):n.addClass(e),1===a.childNodes.length&&(a=a.childNodes[0].childNodes[0])&&n.hasClass(a,"kint-parent")&&n.toggle(a,t))},toggleChildren:function(e,t){var a=n.getChildren(e);if(a){var r=a.getElementsByClassName("kint-parent"),o=r.length;for(void 0===t&&(t=!n.hasClass(e));o--;)n.toggle(r[o],t)}},toggleAll:function(e){for(var t=document.getElementsByClassName("kint-parent"),a=t.length,r=!n.hasClass(e.parentNode);a--;)n.toggle(t[a],r)},switchTab:function(e){var t,a=e.previousSibling,r=0;for(n.removeClass(e.parentNode.getElementsByClassName("kint-active-tab")[0],"kint-active-tab"),n.addClass(e,"kint-active-tab");a;)1===a.nodeType&&r++,a=a.previousSibling;t=e.parentNode.nextSibling.childNodes;for(var o=0;o<t.length;o++)o===r?(t[o].style.display="block",1===t[o].childNodes.length&&(a=t[o].childNodes[0].childNodes[0])&&n.hasClass(a,"kint-parent")&&n.toggle(a,!1)):t[o].style.display="none"},mktag:function(e){return"<"+e+">"},openInNewWindow:function(e){var t=window.open();t&&(t.document.open(),t.document.write(n.mktag("html")+n.mktag("head")+n.mktag("title")+"Kint ("+(new Date).toISOString()+")"+n.mktag("/title")+n.mktag('meta charset="utf-8"')+document.getElementsByClassName("kint-rich-script")[0].outerHTML+document.getElementsByClassName("kint-rich-style")[0].outerHTML+n.mktag("/head")+n.mktag("body")+'<input style="width: 100%" placeholder="Take some notes!"><div class="kint-rich">'+e.parentNode.outerHTML+"</div>"+n.mktag("/body")),t.document.close())},sortTable:function(e,a){var t=e.tBodies[0];[].slice.call(e.tBodies[0].rows).sort(function(e,t){if(e=e.cells[a].textContent.trim().toLocaleLowerCase(),t=t.cells[a].textContent.trim().toLocaleLowerCase(),isNaN(e)||isNaN(t)){if(isNaN(e)&&!isNaN(t))return 1;if(isNaN(t)&&!isNaN(e))return-1}else e=parseFloat(e),t=parseFloat(t);return e<t?-1:t<e?1:0}).forEach(function(e){t.appendChild(e)})},showAccessPath:function(e){for(var t=e.childNodes,a=0;a<t.length;a++)if(n.hasClass(t[a],"access-path"))return void(n.hasClass(t[a],"kint-show")?n.removeClass(t[a]):(n.addClass(t[a]),n.selectText(t[a])))},showSearchBox:function(e){var t=e.querySelector(".kint-search");t&&(n.hasClass(t)?(n.removeClass(t),n.removeClass(e.parentNode,"kint-search-root")):(n.addClass(e),n.addClass(t),t.focus(),t.select(),n.search(t)))},search:function(e){var t=e.parentNode.parentNode;if(e.value.length){var a=n.findMatches(t,e.value);n.highlightMatches(t,a)}else n.removeClass(t,"kint-search-root")},findMatches:function(e,t){for(var a=null,r=0;r<e.children.length;r++)if("DD"===e.children[r].tagName){a=e.children[r];break}if(!a)return[];var o=a.querySelectorAll("dfn"),s=[];return t=t.toLowerCase(),[].forEach.call(o,function(e){-1!=e.innerText.toLowerCase().indexOf(t)&&s.push(e)}),s},highlightMatches:function(e,t){var a=e.querySelectorAll(".kint-search-match");[].forEach.call(a,function(e){n.removeClass(e,"kint-search-match")}),n.addClass(e,"kint-search-root");for(var r=0;r<t.length;r++){for(var o=t[r];o!=e;){if("DL"===o.tagName)n.addClass(o,"kint-search-match");else if("LI"===o.tagName){if(o.parentNode.previousElementSibling.classList.contains("kint-tabs")){var s=[].slice.call(o.parentNode.children).indexOf(o);n.addClass([].slice.call(o.parentNode.previousElementSibling.children)[s],"kint-search-match")}o=o.parentNode}o=o.parentNode}n.addClass(t[r],"kint-search-match")}},getParentByClass:function(e,t){for(void 0===t&&(t="kint-rich");(e=e.parentNode)&&!n.hasClass(e,t););return e},getParentHeader:function(e,t){for(var a=e.nodeName.toLowerCase();"dd"!==a&&"dt"!==a&&n.getParentByClass(e);)a=(e=e.parentNode).nodeName.toLowerCase();return n.getParentByClass(e)?("dd"===a&&t&&(e=e.previousElementSibling),e&&"dt"===e.nodeName.toLowerCase()&&n.hasClass(e,"kint-parent")?e:void 0):null},getChildren:function(e){for(;(e=e.nextElementSibling)&&"dd"!==e.nodeName.toLowerCase(););return e},initLoad:function(){n.style=window.kintShared.dedupe("style.kint-rich-style",n.style),n.script=window.kintShared.dedupe("script.kint-rich-script",n.script),n.folder=window.kintShared.dedupe(".kint-rich.kint-folder",n.folder);var e=document.querySelectorAll("input.kint-search");if([].forEach.call(e,function(a){function e(e){if(window.clearTimeout(r),a.value!==t){var t=a.value;r=window.setTimeout(function(){n.search(a)},500)}}var r=null;a.removeEventListener("keyup",e),a.addEventListener("keyup",e)}),n.folder){var t=n.folder.querySelector("dd");[].forEach.call(document.querySelectorAll(".kint-rich.kint-file"),function(e){e.parentNode!==n.folder&&t.appendChild(e)}),document.body.appendChild(n.folder),n.addClass(n.folder)}},keyboardNav:{targets:[],target:0,active:!1,fetchTargets:function(){n.keyboardNav.targets=[],n.each(".kint-rich nav, .kint-tabs>li:not(.kint-active-tab)",function(e){0===e.offsetWidth&&0===e.offsetHeight||n.keyboardNav.targets.push(e)})},sync:function(e){var t=document.querySelector(".kint-focused");if(t&&n.removeClass(t,"kint-focused"),n.keyboardNav.active){var a=n.keyboardNav.targets[n.keyboardNav.target];n.addClass(a,"kint-focused"),e||n.keyboardNav.scroll(a)}},scroll:function(e){var t=function(e){return e.offsetTop+(e.offsetParent?t(e.offsetParent):0)},a=t(e);if(n.folder){var r=n.folder.querySelector("dd.kint-folder");r.scrollTo(0,a-r.clientHeight/2)}else window.scrollTo(0,a-window.innerHeight/2)},moveCursor:function(e){for(n.keyboardNav.target+=e;n.keyboardNav.target<0;)n.keyboardNav.target+=n.keyboardNav.targets.length;for(;n.keyboardNav.target>=n.keyboardNav.targets.length;)n.keyboardNav.target-=n.keyboardNav.targets.length;n.keyboardNav.sync()},setCursor:function(e){n.keyboardNav.fetchTargets();for(var t=0;t<n.keyboardNav.targets.length;t++)if(e===n.keyboardNav.targets[t])return n.keyboardNav.target=t,!0;return!1}},mouseNav:{lastClickTarget:null,lastClickTimer:null,lastClickCount:0,renewLastClick:function(){window.clearTimeout(n.mouseNav.lastClickTimer),n.mouseNav.lastClickTimer=window.setTimeout(function(){n.mouseNav.lastClickTarget=null,n.mouseNav.lastClickTimer=null,n.mouseNav.lastClickCount=0},250)}},style:null,script:null,folder:null};return window.addEventListener("click",function(e){var t=e.target,a=t.nodeName.toLowerCase();if(n.mouseNav.lastClickTarget&&n.mouseNav.lastClickTimer&&n.mouseNav.lastClickCount)return t=n.mouseNav.lastClickTarget,void(1===n.mouseNav.lastClickCount?(n.toggleChildren(t.parentNode),n.keyboardNav.setCursor(t),n.keyboardNav.sync(!0),n.mouseNav.lastClickCount++,n.mouseNav.renewLastClick()):(n.toggleAll(t),n.keyboardNav.setCursor(t),n.keyboardNav.sync(!0),n.keyboardNav.scroll(t),window.clearTimeout(n.mouseNav.lastClickTimer),n.mouseNav.lastClickTarget=null,n.mouseNav.lastClickTarget=null,n.mouseNav.lastClickCount=0));if(n.getParentByClass(t)){if("dfn"===a)n.selectText(t);else if("th"===a)return void(e.ctrlKey||n.sortTable(t.parentNode.parentNode.parentNode,t.cellIndex));if((t=n.getParentHeader(t))&&(n.keyboardNav.setCursor(t.querySelector("nav")),n.keyboardNav.sync(!0)),t=e.target,"li"===a&&"kint-tabs"===t.parentNode.className)"kint-active-tab"!==t.className&&n.switchTab(t),(t=n.getParentHeader(t,!0))&&(n.keyboardNav.setCursor(t.querySelector("nav")),n.keyboardNav.sync(!0));else if("nav"===a)"footer"===t.parentNode.nodeName.toLowerCase()?(n.keyboardNav.setCursor(t),n.keyboardNav.sync(!0),t=t.parentNode,n.hasClass(t)?n.removeClass(t):n.addClass(t)):(n.toggle(t.parentNode),n.keyboardNav.fetchTargets(),n.mouseNav.lastClickCount=1,n.mouseNav.lastClickTarget=t,n.mouseNav.renewLastClick());else if(n.hasClass(t,"kint-popup-trigger")){var r=t.parentNode;if("footer"===r.nodeName.toLowerCase())r=r.previousSibling;else for(;r&&!n.hasClass(r,"kint-parent");)r=r.parentNode;n.openInNewWindow(r)}else n.hasClass(t,"kint-access-path-trigger")?n.showAccessPath(t.parentNode):n.hasClass(t,"kint-search-trigger")?n.showSearchBox(t.parentNode):n.hasClass(t,"kint-search")||("pre"===a&&3===e.detail?n.selectText(t):n.getParentByClass(t,"kint-source")&&3===e.detail?n.selectText(n.getParentByClass(t,"kint-source")):n.hasClass(t,"access-path")?n.selectText(t):"a"!==a&&(t=n.getParentHeader(t))&&(n.toggle(t),n.keyboardNav.fetchTargets()))}},!0),window.addEventListener("keydown",function(e){if(e.target===document.body&&!e.altKey&&!e.ctrlKey){if(68===e.keyCode){if(n.keyboardNav.active)n.keyboardNav.active=!1;else if(n.keyboardNav.active=!0,n.keyboardNav.fetchTargets(),0===n.keyboardNav.targets.length)return void(n.keyboardNav.active=!1);return n.keyboardNav.sync(),void e.preventDefault()}if(n.keyboardNav.active){if(9===e.keyCode)return n.keyboardNav.moveCursor(e.shiftKey?-1:1),void e.preventDefault();if(38===e.keyCode||75===e.keyCode)return n.keyboardNav.moveCursor(-1),void e.preventDefault();if(40===e.keyCode||74===e.keyCode)return n.keyboardNav.moveCursor(1),void e.preventDefault();var t=n.keyboardNav.targets[n.keyboardNav.target];if("li"===t.nodeName.toLowerCase()){if(32===e.keyCode||13===e.keyCode)return n.switchTab(t),n.keyboardNav.fetchTargets(),n.keyboardNav.sync(),void e.preventDefault();if(39===e.keyCode||76===e.keyCode)return n.keyboardNav.moveCursor(1),void e.preventDefault();if(37===e.keyCode||72===e.keyCode)return n.keyboardNav.moveCursor(-1),void e.preventDefault()}if(t=t.parentNode,65===e.keyCode)return n.showAccessPath(t),void e.preventDefault();if("footer"===t.nodeName.toLowerCase()&&n.hasClass(t.parentNode,"kint-rich"))32===e.keyCode||13===e.keyCode?(n.hasClass(t)?n.removeClass(t):n.addClass(t),e.preventDefault()):37===e.keyCode||72===e.keyCode?(n.removeClass(t),e.preventDefault()):39!==e.keyCode&&76!==e.keyCode||(n.addClass(t),e.preventDefault());else{if(32===e.keyCode||13===e.keyCode)return n.toggle(t),n.keyboardNav.fetchTargets(),void e.preventDefault();if(39===e.keyCode||76===e.keyCode||37===e.keyCode||72===e.keyCode){var a=37===e.keyCode||72===e.keyCode;if(n.hasClass(t))n.toggleChildren(t,a),n.toggle(t,a);else{if(a){var r=n.getParentHeader(t.parentNode.parentNode,!0);r&&(t=r,n.keyboardNav.setCursor(t.querySelector("nav")),n.keyboardNav.sync())}n.toggle(t,a)}return n.keyboardNav.fetchTargets(),void e.preventDefault()}}}}},!0),n}()),window.kintShared.runOnce(window.kintRich.initLoad);
+void 0===window.kintRich&&(window.kintRich=function(){"use strict";var i={selectText:function(e){var t=window.getSelection(),a=document.createRange();a.selectNodeContents(e),t.removeAllRanges(),t.addRange(a)},each:function(e,t){Array.prototype.slice.call(document.querySelectorAll(e),0).forEach(t)},hasClass:function(e,t){return!!e.classList&&e.classList.contains(t=void 0===t?"kint-show":t)},addClass:function(e,t){e.classList.add(t=void 0===t?"kint-show":t)},removeClass:function(e,t){return e.classList.remove(t=void 0===t?"kint-show":t),e},toggle:function(e,t){var a=i.getChildren(e);a&&((t=void 0===t?i.hasClass(e):t)?i.removeClass(e):i.addClass(e),1===a.childNodes.length&&(a=a.childNodes[0].childNodes[0])&&i.hasClass(a,"kint-parent")&&i.toggle(a,t))},toggleChildren:function(e,t){var a=i.getChildren(e);if(a){var o=a.getElementsByClassName("kint-parent"),r=o.length;for(void 0===t&&(t=!i.hasClass(e));r--;)i.toggle(o[r],t)}},toggleAll:function(e){for(var t=document.getElementsByClassName("kint-parent"),a=t.length,o=!i.hasClass(e.parentNode);a--;)i.toggle(t[a],o)},switchTab:function(e){var t=e.previousSibling,a=0;for(i.removeClass(e.parentNode.getElementsByClassName("kint-active-tab")[0],"kint-active-tab"),i.addClass(e,"kint-active-tab");t;)1===t.nodeType&&a++,t=t.previousSibling;for(var o=e.parentNode.nextSibling.childNodes,r=0;r<o.length;r++)r===a?(i.addClass(o[r]),1===o[r].childNodes.length&&(t=o[r].childNodes[0].childNodes[0])&&i.hasClass(t,"kint-parent")&&i.toggle(t,!1)):i.removeClass(o[r])},mktag:function(e){return"<"+e+">"},openInNewWindow:function(e){var t=window.open();t&&(t.document.open(),t.document.write(i.mktag("html")+i.mktag("head")+i.mktag("title")+"Kint ("+(new Date).toISOString()+")"+i.mktag("/title")+i.mktag('meta charset="utf-8"')+document.getElementsByClassName("kint-rich-script")[0].outerHTML+document.getElementsByClassName("kint-rich-style")[0].outerHTML+i.mktag("/head")+i.mktag("body")+'<input style="width: 100%" placeholder="Take some notes!"><div class="kint-rich">'+e.parentNode.outerHTML+"</div>"+i.mktag("/body")),t.document.close())},sortTable:function(e,a){var t=e.tBodies[0];[].slice.call(e.tBodies[0].rows).sort(function(e,t){if(e=e.cells[a].textContent.trim().toLocaleLowerCase(),t=t.cells[a].textContent.trim().toLocaleLowerCase(),isNaN(e)||isNaN(t)){if(isNaN(e)&&!isNaN(t))return 1;if(isNaN(t)&&!isNaN(e))return-1}else e=parseFloat(e),t=parseFloat(t);return e<t?-1:t<e?1:0}).forEach(function(e){t.appendChild(e)})},showAccessPath:function(e){for(var t=e.childNodes,a=0;a<t.length;a++)if(i.hasClass(t[a],"access-path"))return void(i.hasClass(t[a],"kint-show")?i.removeClass(t[a]):(i.addClass(t[a]),i.selectText(t[a])))},showSearchBox:function(e){var t=e.querySelector(".kint-search");t&&(i.hasClass(t)?(i.removeClass(t),i.removeClass(e.parentNode,"kint-search-root")):(i.addClass(e),i.addClass(t),t.focus(),t.select(),i.search(e.parentNode,t.value)))},search:function(e,t){var a=e.querySelectorAll(".kint-search-match");[].forEach.call(a,function(e){i.removeClass(e,"kint-search-match")}),i.removeClass(e,"kint-search-match"),t.length?(i.addClass(e,"kint-search-root"),i.findMatches(e,t)):i.removeClass(e,"kint-search-root")},findMatches:function(e,t){var a,o,r,s=e.cloneNode(!0);if(s.querySelectorAll(".access-path").forEach(function(e){e.remove()}),-1!=s.textContent.toUpperCase().indexOf(t.toUpperCase())){for(n in i.addClass(e,"kint-search-match"),e.childNodes)if("DD"==e.childNodes[n].tagName){a=e.childNodes[n];break}if(a)if([].forEach.call(a.childNodes,function(e){"DL"==e.tagName?i.findMatches(e,t):"UL"==e.tagName&&(i.hasClass(e,"kint-tabs")?o=e.childNodes:i.hasClass(e,"kint-tab-contents")&&(r=e.childNodes))}),o&&r&&o.length==r.length)for(var n=0;n<o.length;n++){var l=!1;-1!=o[n].textContent.toUpperCase().indexOf(t.toUpperCase())?l=!0:((s=r[n].cloneNode(!0)).querySelectorAll(".access-path").forEach(function(e){e.remove()}),-1!=s.textContent.toUpperCase().indexOf(t.toUpperCase())&&(l=!0)),l&&(i.addClass(o[n],"kint-search-match"),[].forEach.call(r[n].childNodes,function(e){"DL"==e.tagName&&i.findMatches(e,t)}))}}},getParentByClass:function(e,t){for(void 0===t&&(t="kint-rich");(e=e.parentNode)&&!i.hasClass(e,t););return e},getParentHeader:function(e,t){for(var a=e.nodeName.toLowerCase();"dd"!==a&&"dt"!==a&&i.getParentByClass(e);)a=(e=e.parentNode).nodeName.toLowerCase();return i.getParentByClass(e)?(e="dd"===a&&t?e.previousElementSibling:e)&&"dt"===e.nodeName.toLowerCase()&&i.hasClass(e,"kint-parent")?e:void 0:null},getChildren:function(e){for(;(e=e.nextElementSibling)&&"dd"!==e.nodeName.toLowerCase(););return e},isFolderOpen:function(){if(i.folder&&i.folder.querySelector("dd.kint-foldout"))return i.hasClass(i.folder.querySelector("dd.kint-foldout").previousSibling)},initLoad:function(){i.style=window.kintShared.dedupe("style.kint-rich-style",i.style),i.script=window.kintShared.dedupe("script.kint-rich-script",i.script),i.folder=window.kintShared.dedupe(".kint-rich.kint-folder",i.folder);var t,e=document.querySelectorAll("input.kint-search");[].forEach.call(e,function(t){function e(e){window.clearTimeout(a),t.value!==o&&(a=window.setTimeout(function(){o=t.value,i.search(t.parentNode.parentNode,o)},500))}var a=null,o=null;t.removeEventListener("keyup",e),t.addEventListener("keyup",e)}),i.folder&&(t=i.folder.querySelector("dd"),[].forEach.call(document.querySelectorAll(".kint-rich.kint-file"),function(e){e.parentNode!==i.folder&&t.appendChild(e)}),document.body.appendChild(i.folder),i.addClass(i.folder))},keyboardNav:{targets:[],target:0,active:!1,fetchTargets:function(){var e=i.keyboardNav.targets[i.keyboardNav.target];i.keyboardNav.targets=[],i.each(".kint-rich nav, .kint-tabs>li:not(.kint-active-tab)",function(e){i.isFolderOpen()&&!i.folder.contains(e)||0===e.offsetWidth&&0===e.offsetHeight||i.keyboardNav.targets.push(e)}),e&&-1!==i.keyboardNav.targets.indexOf(e)&&(i.keyboardNav.target=i.keyboardNav.targets.indexOf(e))},sync:function(e){var t=document.querySelector(".kint-focused");t&&i.removeClass(t,"kint-focused"),i.keyboardNav.active&&(t=i.keyboardNav.targets[i.keyboardNav.target],i.addClass(t,"kint-focused"),e||i.keyboardNav.scroll(t))},scroll:function(e){var t,a;e!==i.folder.querySelector("dt > nav")&&(a=(t=function(e){return e.offsetTop+(e.offsetParent?t(e.offsetParent):0)})(e),i.isFolderOpen()?(e=i.folder.querySelector("dd.kint-foldout")).scrollTo(0,a-e.clientHeight/2):window.scrollTo(0,a-window.innerHeight/2))},moveCursor:function(e){for(i.keyboardNav.target+=e;i.keyboardNav.target<0;)i.keyboardNav.target+=i.keyboardNav.targets.length;for(;i.keyboardNav.target>=i.keyboardNav.targets.length;)i.keyboardNav.target-=i.keyboardNav.targets.length;i.keyboardNav.sync()},setCursor:function(e){if(i.isFolderOpen()&&!i.folder.contains(e))return!1;i.keyboardNav.fetchTargets();for(var t=0;t<i.keyboardNav.targets.length;t++)if(e===i.keyboardNav.targets[t])return i.keyboardNav.target=t,!0;return!1}},mouseNav:{lastClickTarget:null,lastClickTimer:null,lastClickCount:0,renewLastClick:function(){window.clearTimeout(i.mouseNav.lastClickTimer),i.mouseNav.lastClickTimer=window.setTimeout(function(){i.mouseNav.lastClickTarget=null,i.mouseNav.lastClickTimer=null,i.mouseNav.lastClickCount=0},250)}},style:null,script:null,folder:null};return window.addEventListener("click",function(e){var t=e.target,a=t.nodeName.toLowerCase();if(i.mouseNav.lastClickTarget&&i.mouseNav.lastClickTimer&&i.mouseNav.lastClickCount)return t=i.mouseNav.lastClickTarget,void(1===i.mouseNav.lastClickCount?(i.toggleChildren(t.parentNode),i.keyboardNav.setCursor(t),i.keyboardNav.sync(!0),i.mouseNav.lastClickCount++,i.mouseNav.renewLastClick()):(i.toggleAll(t),i.keyboardNav.setCursor(t),i.keyboardNav.sync(!0),i.keyboardNav.scroll(t),window.clearTimeout(i.mouseNav.lastClickTimer),i.mouseNav.lastClickTarget=null,i.mouseNav.lastClickTarget=null,i.mouseNav.lastClickCount=0));if(i.getParentByClass(t)){if("dfn"===a)i.selectText(t);else if("th"===a)return void(e.ctrlKey||i.sortTable(t.parentNode.parentNode.parentNode,t.cellIndex));if((t=i.getParentHeader(t))&&(i.keyboardNav.setCursor(t.querySelector("nav")),i.keyboardNav.sync(!0)),t=e.target,"li"===a&&"kint-tabs"===t.parentNode.className)"kint-active-tab"!==t.className&&i.switchTab(t),(t=i.getParentHeader(t,!0))&&(i.keyboardNav.setCursor(t.querySelector("nav")),i.keyboardNav.sync(!0));else if("nav"===a)"footer"===t.parentNode.nodeName.toLowerCase()?(i.keyboardNav.setCursor(t),i.keyboardNav.sync(!0),t=t.parentNode,i.hasClass(t)?i.removeClass(t):i.addClass(t)):(i.toggle(t.parentNode),i.keyboardNav.fetchTargets(),i.mouseNav.lastClickCount=1,i.mouseNav.lastClickTarget=t,i.mouseNav.renewLastClick());else if(i.hasClass(t,"kint-popup-trigger")){var o=t.parentNode;if("footer"===o.nodeName.toLowerCase())o=o.previousSibling;else for(;o&&!i.hasClass(o,"kint-parent");)o=o.parentNode;i.openInNewWindow(o)}else i.hasClass(t,"kint-access-path-trigger")?i.showAccessPath(t.parentNode):i.hasClass(t,"kint-search-trigger")?i.showSearchBox(t.parentNode):i.hasClass(t,"kint-search")||("pre"===a&&3===e.detail?i.selectText(t):i.getParentByClass(t,"kint-source")&&3===e.detail?i.selectText(i.getParentByClass(t,"kint-source")):i.hasClass(t,"access-path")?i.selectText(t):"a"!==a&&(t=i.getParentHeader(t))&&(i.toggle(t),i.keyboardNav.fetchTargets()))}},!0),window.addEventListener("keydown",function(e){if(e.target===document.body&&!e.altKey&&!e.ctrlKey){if(68===e.keyCode){if(i.keyboardNav.active)i.keyboardNav.active=!1;else if(i.keyboardNav.active=!0,i.keyboardNav.fetchTargets(),0===i.keyboardNav.targets.length)return void(i.keyboardNav.active=!1);return i.keyboardNav.sync(),void e.preventDefault()}if(i.keyboardNav.active){if(9===e.keyCode)return i.keyboardNav.moveCursor(e.shiftKey?-1:1),void e.preventDefault();if(38===e.keyCode||75===e.keyCode)return i.keyboardNav.moveCursor(-1),void e.preventDefault();if(40===e.keyCode||74===e.keyCode)return i.keyboardNav.moveCursor(1),void e.preventDefault();var t,a,o=i.keyboardNav.targets[i.keyboardNav.target];if("li"===o.nodeName.toLowerCase()){if(32===e.keyCode||13===e.keyCode)return i.switchTab(o),i.keyboardNav.fetchTargets(),i.keyboardNav.sync(),void e.preventDefault();if(39===e.keyCode||76===e.keyCode)return i.keyboardNav.moveCursor(1),void e.preventDefault();if(37===e.keyCode||72===e.keyCode)return i.keyboardNav.moveCursor(-1),void e.preventDefault()}o=o.parentNode,65===e.keyCode?(i.showAccessPath(o),e.preventDefault()):"footer"===o.nodeName.toLowerCase()&&i.hasClass(o.parentNode,"kint-rich")?32===e.keyCode||13===e.keyCode?(i.hasClass(o)?i.removeClass(o):i.addClass(o),e.preventDefault()):37===e.keyCode||72===e.keyCode?(i.removeClass(o),e.preventDefault()):39!==e.keyCode&&76!==e.keyCode||(i.addClass(o),e.preventDefault()):32===e.keyCode||13===e.keyCode?(i.toggle(o),i.keyboardNav.fetchTargets(),e.preventDefault()):39!==e.keyCode&&76!==e.keyCode&&37!==e.keyCode&&72!==e.keyCode||(t=37===e.keyCode||72===e.keyCode,i.hasClass(o)?i.toggleChildren(o,t):!t||(a=i.getParentHeader(o.parentNode.parentNode,!0))&&(i.keyboardNav.setCursor((o=a).querySelector("nav")),i.keyboardNav.sync()),i.toggle(o,t),i.keyboardNav.fetchTargets(),e.preventDefault())}}},!0),i}()),window.kintShared.runOnce(window.kintRich.initLoad);
diff --git a/system/ThirdParty/Kint/resources/compiled/shared.js b/system/ThirdParty/Kint/resources/compiled/shared.js
index 5869c5b212dc..497b393a66ec 100644
--- a/system/ThirdParty/Kint/resources/compiled/shared.js
+++ b/system/ThirdParty/Kint/resources/compiled/shared.js
@@ -1 +1 @@
-void 0===window.kintShared&&(window.kintShared=function(){"use strict";var e={dedupe:function(e,n){return[].forEach.call(document.querySelectorAll(e),function(e){n&&n.ownerDocument.contains(n)||(n=e),e!==n&&e.parentNode.removeChild(e)}),n},runOnce:function(e){"complete"===document.readyState?e():window.addEventListener("load",e)}};return window.addEventListener("click",function(e){if(e.target.classList.contains("kint-ide-link")){var n=new XMLHttpRequest;n.open("GET",e.target.href),n.send(null),e.preventDefault()}}),e}());
+void 0===window.kintShared&&(window.kintShared=function(){"use strict";var e={dedupe:function(e,n){return[].forEach.call(document.querySelectorAll(e),function(e){e!==(n=!n||!n.ownerDocument.contains(n)?e:n)&&e.parentNode.removeChild(e)}),n},runOnce:function(e){"complete"===document.readyState?e():window.addEventListener("load",e)}};return window.addEventListener("click",function(e){var n;e.target.classList.contains("kint-ide-link")&&((n=new XMLHttpRequest).open("GET",e.target.href),n.send(null),e.preventDefault())}),e}());
diff --git a/system/ThirdParty/Kint/resources/compiled/solarized-dark.css b/system/ThirdParty/Kint/resources/compiled/solarized-dark.css
index 32ff776b6e36..685e6208c12b 100644
--- a/system/ThirdParty/Kint/resources/compiled/solarized-dark.css
+++ b/system/ThirdParty/Kint/resources/compiled/solarized-dark.css
@@ -1 +1 @@
-.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:#073642}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:none}.kint-rich.kint-folder.kint-show{display:block}.kint-rich.kint-folder dd.kint-folder{max-height:calc(100vh - 100px);padding-right:10px;overflow-y:scroll}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#268bd2;color:#839496}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #2aa198}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#839496;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:10px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#002b36;border:1px solid #586e75;color:#839496;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:5px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#268bd2}.kint-rich>dl dl{padding:0 0 0 15px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMzAgMTUwIj48ZGVmcz48cGF0aCBzdHJva2UtbGluZWpvaW49InJvdW5kIiBkPSJNNCAzYTI0IDMyIDAgMCAxIDAgMjQgNDAgMjAtMTAgMCAxIDIzLTEyQTQwIDIwIDEwIDAgMSA0IDN6IiBpZD0iYSIvPjwvZGVmcz48ZyBmaWxsPSIjOTNhMWExIiBzdHJva2U9IiM5M2ExYTEiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxnIGZpbGw9IiM1ODZlNzUiIHN0cm9rZT0iIzU4NmU3NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAzMCkiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxwYXRoIGQ9Ik02IDEyNmwxOCAxOG0tMTggMGwxOC0xOCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2U9IiM1ODZlNzUiLz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #586e75}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#268bd2;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#2aa198}.kint-rich dfn{font-style:normal;font-family:monospace;color:#93a1a1}.kint-rich pre{color:#839496;margin:0 0 0 15px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #586e75;background:#002b36;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(131,148,150,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#002b36;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#839496;background:#002b36}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #586e75;border-top-width:0;border-bottom-width:0;padding:5px;float:right !important;margin:-5px 0;color:#93a1a1;background:#073642;height:26px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#252525;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#1b1b1b}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#073642;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#839496}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#839496;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#93a1a1;border-bottom:1px dotted #93a1a1}.kint-rich ul{list-style:none;padding-left:15px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #586e75}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 15px;padding-left:0;background:#002b36;border:1px solid #586e75;border-top:0}.kint-rich ul.kint-tabs>li{background:#073642;border:1px solid #586e75;cursor:pointer;display:inline-block;height:30px;margin:3px;padding:0 15px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#268bd2;color:#2aa198}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#002b36;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:25px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul:not(.kint-tabs)>li:not(:first-child){display:none}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#268bd2;color:#2aa198}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #586e75;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#268bd2}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2.5px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #586e75;padding:2.5px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#073642;color:#93a1a1}.kint-rich table td{background:#002b36;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #268bd2 inset}.kint-rich table tr:hover var{color:#2aa198}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:5px;padding-bottom:5px;border-bottom:1px solid #073642}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #268bd2;padding-right:10px;margin-right:10px}.kint-rich pre.kint-source>div.kint-highlight{background:#073642}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #268bd2,0 1px #268bd2,1px 0 #268bd2,0 -1px #268bd2;color:#002b36;font-weight:bold}body{background:#073642;color:#fff}.kint-rich{box-shadow:0 0 5px 3px #073642}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #859900 inset;border-radius:7px}.kint-rich>dl>dt,.kint-rich ul.kint-tabs{box-shadow:4px 0 2px -3px #268bd2 inset}.kint-rich ul.kint-tabs li.kint-active-tab{padding-top:7px;height:34px}.kint-rich footer li{color:#ddd}
+.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:#073642}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:10px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#268bd2;color:#839496}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #2aa198}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#839496;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:10px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#002b36;border:1px solid #586e75;color:#839496;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:5px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#268bd2}.kint-rich>dl dl{padding:0 0 0 15px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMzAgMTUwIj48ZGVmcz48cGF0aCBzdHJva2UtbGluZWpvaW49InJvdW5kIiBkPSJNNCAzYTI0IDMyIDAgMCAxIDAgMjQgNDAgMjAtMTAgMCAxIDIzLTEyQTQwIDIwIDEwIDAgMSA0IDN6IiBpZD0iYSIvPjwvZGVmcz48ZyBmaWxsPSIjOTNhMWExIiBzdHJva2U9IiM5M2ExYTEiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxnIGZpbGw9IiM1ODZlNzUiIHN0cm9rZT0iIzU4NmU3NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAzMCkiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxwYXRoIGQ9Ik02IDEyNmwxOCAxOG0tMTggMGwxOC0xOCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2U9IiM1ODZlNzUiLz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #586e75}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#268bd2;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#2aa198}.kint-rich dfn{font-style:normal;font-family:monospace;color:#93a1a1}.kint-rich pre{color:#839496;margin:0 0 0 15px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #586e75;background:#002b36;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(131,148,150,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#002b36;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#839496;background:#002b36}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #586e75;border-top-width:0;border-bottom-width:0;padding:5px;float:right !important;margin:-5px 0;color:#93a1a1;background:#073642;height:26px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#252525;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#1b1b1b}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#073642;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#839496}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#839496;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#93a1a1;border-bottom:1px dotted #93a1a1}.kint-rich ul{list-style:none;padding-left:15px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #586e75}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 15px;padding-left:0;background:#002b36;border:1px solid #586e75;border-top:0}.kint-rich ul.kint-tabs>li{background:#073642;border:1px solid #586e75;cursor:pointer;display:inline-block;height:30px;margin:3px;padding:0 15px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#268bd2;color:#2aa198}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#002b36;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:25px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#268bd2;color:#2aa198}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #586e75;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#268bd2}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2.5px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #586e75;padding:2.5px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#073642;color:#93a1a1}.kint-rich table td{background:#002b36;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #268bd2 inset}.kint-rich table tr:hover var{color:#2aa198}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:5px;padding-bottom:5px;border-bottom:1px solid #073642}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #268bd2;padding-right:10px;margin-right:10px}.kint-rich pre.kint-source>div.kint-highlight{background:#073642}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #268bd2,0 1px #268bd2,1px 0 #268bd2,0 -1px #268bd2;color:#002b36;font-weight:bold}body{background:#073642;color:#fff}.kint-rich{box-shadow:0 0 5px 3px #073642}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #859900 inset;border-radius:7px}.kint-rich>dl>dt,.kint-rich ul.kint-tabs{box-shadow:4px 0 2px -3px #268bd2 inset}.kint-rich ul.kint-tabs li.kint-active-tab{padding-top:7px;height:34px}.kint-rich footer li{color:#ddd}
diff --git a/system/ThirdParty/Kint/resources/compiled/solarized.css b/system/ThirdParty/Kint/resources/compiled/solarized.css
index db5da0d2d3b7..fa04f2de8f4d 100644
--- a/system/ThirdParty/Kint/resources/compiled/solarized.css
+++ b/system/ThirdParty/Kint/resources/compiled/solarized.css
@@ -1 +1 @@
-.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,0.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:none}.kint-rich.kint-folder.kint-show{display:block}.kint-rich.kint-folder dd.kint-folder{max-height:calc(100vh - 100px);padding-right:10px;overflow-y:scroll}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#268bd2;color:#657b83}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #2aa198}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#657b83;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:10px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#fdf6e3;border:1px solid #93a1a1;color:#657b83;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:5px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#268bd2}.kint-rich>dl dl{padding:0 0 0 15px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMzAgMTUwIj48ZGVmcz48cGF0aCBzdHJva2UtbGluZWpvaW49InJvdW5kIiBkPSJNNCAzYTI0IDMyIDAgMCAxIDAgMjQgNDAgMjAtMTAgMCAxIDIzLTEyQTQwIDIwIDEwIDAgMSA0IDN6IiBpZD0iYSIvPjwvZGVmcz48ZyBmaWxsPSIjOTNhMWExIiBzdHJva2U9IiM5M2ExYTEiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxnIGZpbGw9IiM1ODZlNzUiIHN0cm9rZT0iIzU4NmU3NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAzMCkiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxwYXRoIGQ9Ik02IDEyNmwxOCAxOG0tMTggMGwxOC0xOCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2U9IiM1ODZlNzUiLz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #93a1a1}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#268bd2;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#2aa198}.kint-rich dfn{font-style:normal;font-family:monospace;color:#586e75}.kint-rich pre{color:#657b83;margin:0 0 0 15px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #93a1a1;background:#fdf6e3;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(101,123,131,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#fdf6e3;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#657b83;background:#fdf6e3}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #93a1a1;border-top-width:0;border-bottom-width:0;padding:5px;float:right !important;margin:-5px 0;color:#586e75;background:#eee8d5;height:26px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#e2e2e2;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#f0f0f0}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#eee8d5;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#657b83}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#657b83;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#586e75;border-bottom:1px dotted #586e75}.kint-rich ul{list-style:none;padding-left:15px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #93a1a1}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 15px;padding-left:0;background:#fdf6e3;border:1px solid #93a1a1;border-top:0}.kint-rich ul.kint-tabs>li{background:#eee8d5;border:1px solid #93a1a1;cursor:pointer;display:inline-block;height:30px;margin:3px;padding:0 15px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#268bd2;color:#2aa198}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#fdf6e3;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:25px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul:not(.kint-tabs)>li:not(:first-child){display:none}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#268bd2;color:#2aa198}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #93a1a1;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#268bd2}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2.5px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #93a1a1;padding:2.5px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#eee8d5;color:#586e75}.kint-rich table td{background:#fdf6e3;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #268bd2 inset}.kint-rich table tr:hover var{color:#2aa198}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:5px;padding-bottom:5px;border-bottom:1px solid #eee8d5}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #268bd2;padding-right:10px;margin-right:10px}.kint-rich pre.kint-source>div.kint-highlight{background:#eee8d5}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #268bd2,0 1px #268bd2,1px 0 #268bd2,0 -1px #268bd2;color:#fdf6e3;font-weight:bold}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #859900 inset;border-radius:7px}.kint-rich>dl>dt,.kint-rich ul.kint-tabs{box-shadow:4px 0 2px -3px #268bd2 inset}.kint-rich ul.kint-tabs li.kint-active-tab{padding-top:7px;height:34px}
+.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,0.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:10px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#268bd2;color:#657b83}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #2aa198}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#657b83;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:10px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#fdf6e3;border:1px solid #93a1a1;color:#657b83;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:5px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#268bd2}.kint-rich>dl dl{padding:0 0 0 15px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMzAgMTUwIj48ZGVmcz48cGF0aCBzdHJva2UtbGluZWpvaW49InJvdW5kIiBkPSJNNCAzYTI0IDMyIDAgMCAxIDAgMjQgNDAgMjAtMTAgMCAxIDIzLTEyQTQwIDIwIDEwIDAgMSA0IDN6IiBpZD0iYSIvPjwvZGVmcz48ZyBmaWxsPSIjOTNhMWExIiBzdHJva2U9IiM5M2ExYTEiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxnIGZpbGw9IiM1ODZlNzUiIHN0cm9rZT0iIzU4NmU3NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAzMCkiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxwYXRoIGQ9Ik02IDEyNmwxOCAxOG0tMTggMGwxOC0xOCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2U9IiM1ODZlNzUiLz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #93a1a1}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#268bd2;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#2aa198}.kint-rich dfn{font-style:normal;font-family:monospace;color:#586e75}.kint-rich pre{color:#657b83;margin:0 0 0 15px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #93a1a1;background:#fdf6e3;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(101,123,131,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#fdf6e3;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#657b83;background:#fdf6e3}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #93a1a1;border-top-width:0;border-bottom-width:0;padding:5px;float:right !important;margin:-5px 0;color:#586e75;background:#eee8d5;height:26px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#e2e2e2;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#f0f0f0}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#eee8d5;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#657b83}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#657b83;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#586e75;border-bottom:1px dotted #586e75}.kint-rich ul{list-style:none;padding-left:15px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #93a1a1}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 15px;padding-left:0;background:#fdf6e3;border:1px solid #93a1a1;border-top:0}.kint-rich ul.kint-tabs>li{background:#eee8d5;border:1px solid #93a1a1;cursor:pointer;display:inline-block;height:30px;margin:3px;padding:0 15px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#268bd2;color:#2aa198}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#fdf6e3;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:25px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#268bd2;color:#2aa198}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #93a1a1;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#268bd2}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2.5px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #93a1a1;padding:2.5px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#eee8d5;color:#586e75}.kint-rich table td{background:#fdf6e3;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #268bd2 inset}.kint-rich table tr:hover var{color:#2aa198}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:5px;padding-bottom:5px;border-bottom:1px solid #eee8d5}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #268bd2;padding-right:10px;margin-right:10px}.kint-rich pre.kint-source>div.kint-highlight{background:#eee8d5}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #268bd2,0 1px #268bd2,1px 0 #268bd2,0 -1px #268bd2;color:#fdf6e3;font-weight:bold}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #859900 inset;border-radius:7px}.kint-rich>dl>dt,.kint-rich ul.kint-tabs{box-shadow:4px 0 2px -3px #268bd2 inset}.kint-rich ul.kint-tabs li.kint-active-tab{padding-top:7px;height:34px}

From d542514edb6c05b6fbc6a9039de5dce9d4f84ca8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 19 Dec 2021 16:28:11 +0900
Subject: [PATCH 1014/2325] chore: rename changed property names in Kint

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

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 41e775dbf58d..d309ca81c27a 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -249,7 +249,7 @@ protected function initializeKint()
          */
         $config = config('Config\Kint');
 
-        Kint::$max_depth           = $config->maxDepth;
+        Kint::$depth_limit         = $config->maxDepth;
         Kint::$display_called_from = $config->displayCalledFrom;
         Kint::$expanded            = $config->expanded;
 
@@ -261,7 +261,7 @@ protected function initializeKint()
         RichRenderer::$folder = $config->richFolder;
         RichRenderer::$sort   = $config->richSort;
         if (! empty($config->richObjectPlugins) && is_array($config->richObjectPlugins)) {
-            RichRenderer::$object_plugins = $config->richObjectPlugins;
+            RichRenderer::$value_plugins = $config->richObjectPlugins;
         }
         if (! empty($config->richTabPlugins) && is_array($config->richTabPlugins)) {
             RichRenderer::$tab_plugins = $config->richTabPlugins;

From 67ce1b025511a16271caea5dbb37058f9aab190f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 19 Dec 2021 21:40:46 +0900
Subject: [PATCH 1015/2325] docs: fix by proof reading

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/incoming/filters.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index b8b16bb1c9ce..8677f1925dee 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -207,7 +207,7 @@ The filters bundled with CodeIgniter4 are: :doc:`Honeypot <../libraries/honeypot
 InvalidChars
 =============
 
-This filter checks if user input data (``$_GET``, ``$_POST``, ``$_COOKIE``, ``php://input``) do not contain the following characters:
+This filter prohibits user input data (``$_GET``, ``$_POST``, ``$_COOKIE``, ``php://input``) from containing the following characters:
 
 - invalid UTF-8 characters
 - control characters except line break and tab code

From 068f1d8a2ee3a7c84fe29e2d1a999ccf54934ac1 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Sun, 19 Dec 2021 22:42:49 -0600
Subject: [PATCH 1016/2325] Update index.rst

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

diff --git a/user_guide_src/source/index.rst b/user_guide_src/source/index.rst
index 3f337e5b1f2a..e6240dd4e56b 100644
--- a/user_guide_src/source/index.rst
+++ b/user_guide_src/source/index.rst
@@ -114,3 +114,5 @@ Advanced Topics
 
     license
     changelogs/index
+    
+UNNECCESSARY CHANGES

From 2118d682bd065697d7f6d858f21bb54f933f0cc0 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Sun, 19 Dec 2021 22:47:11 -0600
Subject: [PATCH 1017/2325] Update index.rst

---
 user_guide_src/source/index.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/user_guide_src/source/index.rst b/user_guide_src/source/index.rst
index e6240dd4e56b..3f337e5b1f2a 100644
--- a/user_guide_src/source/index.rst
+++ b/user_guide_src/source/index.rst
@@ -114,5 +114,3 @@ Advanced Topics
 
     license
     changelogs/index
-    
-UNNECCESSARY CHANGES

From 37fe5bb223faa6303c14303023fe9bbf53d21de3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 20 Dec 2021 13:48:34 +0900
Subject: [PATCH 1018/2325] docs: fix incorrect sample code

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

diff --git a/user_guide_src/source/general/logging.rst b/user_guide_src/source/general/logging.rst
index 761500ac722a..08e60d60988c 100644
--- a/user_guide_src/source/general/logging.rst
+++ b/user_guide_src/source/general/logging.rst
@@ -97,7 +97,7 @@ into the message string::
     // Generates a message like: User 123 logged into the system from 127.0.0.1
     $info = [
         'id' => $user->id,
-        'ip_address' => $this->request->ip_address()
+        'ip_address' => $this->request->getIPAddress()
     ];
 
     log_message('info', 'User {id} logged into the system from {ip_address}', $info);

From a2df301abae87d308c4c501f4c65b1b06f50f612 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 20 Dec 2021 17:30:24 +0900
Subject: [PATCH 1019/2325] docs: change text decoration

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

diff --git a/user_guide_src/source/general/environments.rst b/user_guide_src/source/general/environments.rst
index 6abd709a00a9..ae9c877c81fd 100644
--- a/user_guide_src/source/general/environments.rst
+++ b/user_guide_src/source/general/environments.rst
@@ -99,7 +99,7 @@ Error Reporting
 
 Setting the ENVIRONMENT constant to a value of ``development`` will cause
 all PHP errors to be rendered to the browser when they occur.
-Conversely, setting the constant to 'production' will disable all error
+Conversely, setting the constant to ``production`` will disable all error
 output. Disabling error reporting in production is a
 :doc:`good security practice </concepts/security>`.
 

From 499f4a031f7ba8a076afa58a0f8b3b3c86d80283 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 21 Dec 2021 16:36:32 +0900
Subject: [PATCH 1020/2325] test: fix doc comment

---
 tests/system/API/ResponseTraitTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
index 1db28686eafe..abff4ce0c1a9 100644
--- a/tests/system/API/ResponseTraitTest.php
+++ b/tests/system/API/ResponseTraitTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\API;
 
+use CodeIgniter\Format\FormatterInterface;
 use CodeIgniter\Format\JSONFormatter;
 use CodeIgniter\Format\XMLFormatter;
 use CodeIgniter\HTTP\URI;
@@ -30,7 +31,7 @@ final class ResponseTraitTest extends CIUnitTestCase
     protected $response;
 
     /**
-     * @var Response formatter
+     * @var FormatterInterface|null
      */
     protected $formatter;
 

From b75b9aff45d381e134348cc29eadc49051f98bf7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 21 Dec 2021 17:38:19 +0900
Subject: [PATCH 1021/2325] docs: depreacted Seeder::faker()

See #5456
---
 system/Database/Seeder.php                   |  4 +++
 tests/system/Database/DatabaseSeederTest.php |  3 ++
 user_guide_src/source/changelogs/v4.1.6.rst  |  2 ++
 user_guide_src/source/dbmgmt/seeds.rst       | 35 --------------------
 4 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/system/Database/Seeder.php b/system/Database/Seeder.php
index b6127af2cd91..92d281965c7e 100644
--- a/system/Database/Seeder.php
+++ b/system/Database/Seeder.php
@@ -68,6 +68,8 @@ class Seeder
      * Faker Generator instance.
      *
      * @var Generator|null
+     *
+     * @deprecated
      */
     private static $faker;
 
@@ -98,6 +100,8 @@ public function __construct(Database $config, ?BaseConnection $db = null)
 
     /**
      * Gets the Faker Generator instance.
+     *
+     * @deprecated
      */
     public static function faker(): ?Generator
     {
diff --git a/tests/system/Database/DatabaseSeederTest.php b/tests/system/Database/DatabaseSeederTest.php
index d17ff71fe61a..7e08d6648508 100644
--- a/tests/system/Database/DatabaseSeederTest.php
+++ b/tests/system/Database/DatabaseSeederTest.php
@@ -38,6 +38,9 @@ public function testInstantiateNotDirSeedPath()
         new Seeder($config);
     }
 
+    /**
+     * @TODO remove this when Seeder::faker() is removed
+     */
     public function testFakerGet()
     {
         $this->assertInstanceOf(Generator::class, Seeder::faker());
diff --git a/user_guide_src/source/changelogs/v4.1.6.rst b/user_guide_src/source/changelogs/v4.1.6.rst
index 82b03127cda2..d53378a6b624 100644
--- a/user_guide_src/source/changelogs/v4.1.6.rst
+++ b/user_guide_src/source/changelogs/v4.1.6.rst
@@ -42,6 +42,8 @@ Changes
 Deprecations
 ************
 
+- ``Seeder::faker()`` and ``Seeder::$faker`` are deprecated.
+
 Sending Cookies
 ===============
 
diff --git a/user_guide_src/source/dbmgmt/seeds.rst b/user_guide_src/source/dbmgmt/seeds.rst
index 95afc23104b7..e79496efbffb 100644
--- a/user_guide_src/source/dbmgmt/seeds.rst
+++ b/user_guide_src/source/dbmgmt/seeds.rst
@@ -67,41 +67,6 @@ anywhere the autoloader can find them. This is great for more modular code bases
         $this->call('My\Database\Seeds\CountrySeeder');
     }
 
-Using Faker
-===========
-
-If you want to automate the generation of seed data, you can use
-the `Faker library <https://github.com/fakerphp/faker>`_.
-
-To install Faker into your project::
-
-    > composer require --dev fakerphp/faker
-
-After installation, an instance of ``Faker\Generator`` is available in the main ``Seeder``
-class and is accessible by all child seeders. You must use the static method ``faker()``
-to access the instance.
-
-::
-
-    <?php
-
-    namespace App\Database\Seeds;
-
-    use CodeIgniter\Database\Seeder;
-
-    class UserSeeder extends Seeder
-    {
-        public function run()
-        {
-            $model = model('UserModel');
-
-            $model->insert([
-                'email'      => static::faker()->email,
-                'ip_address' => static::faker()->ipv4,
-            ]);
-        }
-    }
-
 Using Seeders
 =============
 

From 2591d65c091f8f5b95353bc2ed82cd5f2e0e9d7a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 21 Dec 2021 19:48:22 +0900
Subject: [PATCH 1022/2325] docs: fix sample code

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

diff --git a/user_guide_src/source/extending/core_classes.rst b/user_guide_src/source/extending/core_classes.rst
index a51c9e825b34..9ef3330e23bc 100644
--- a/user_guide_src/source/extending/core_classes.rst
+++ b/user_guide_src/source/extending/core_classes.rst
@@ -68,7 +68,7 @@ Then you would add the ``routes`` service in **app/Config/Services.php** to load
             return static::getSharedInstance('routes');
         }
 
-        return new RouteCollection(static::locator(), config('Modules'));
+        return new \App\Libraries\RouteCollection(static::locator(), config('Modules'));
     }
 
 Extending Core Classes

From 39ce053fbb018b6afcb2d6aaffdb0df61a616832 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 22 Dec 2021 09:08:13 +0900
Subject: [PATCH 1023/2325] fix: directory_mirror() throws an error if
 destination directory exists

Fixes #5478
---
 system/Helpers/filesystem_helper.php          |  4 ++-
 tests/system/Helpers/FilesystemHelperTest.php | 29 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php
index 52341b848e06..89d4d507f961 100644
--- a/system/Helpers/filesystem_helper.php
+++ b/system/Helpers/filesystem_helper.php
@@ -91,7 +91,9 @@ function directory_mirror(string $originDir, string $targetDir, bool $overwrite
             $target = $targetDir . substr($origin, $dirLen);
 
             if ($file->isDir()) {
-                mkdir($target, 0755);
+                if (! is_dir($target)) {
+                    mkdir($target, 0755);
+                }
             } elseif (! is_file($target) || ($overwrite && is_file($target))) {
                 copy($origin, $target);
             }
diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php
index c48ccd1ff328..7b837064a410 100644
--- a/tests/system/Helpers/FilesystemHelperTest.php
+++ b/tests/system/Helpers/FilesystemHelperTest.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use InvalidArgumentException;
 use org\bovigo\vfs\vfsStream;
+use org\bovigo\vfs\visitor\vfsStreamStructureVisitor;
 
 /**
  * @internal
@@ -161,6 +162,34 @@ public function testDirectoryMirrorNotOverwrites()
         $this->assertSame($this->structure['boo']['faz'], $result);
     }
 
+    public function testDirectoryMirrorSkipExistingFolder()
+    {
+        $this->assertTrue(function_exists('directory_mirror'));
+
+        $this->structure = [
+            'src' => [
+                'AnEmptyFolder' => [],
+            ],
+            'dest' => [
+                'AnEmptyFolder' => [],
+            ],
+        ];
+        vfsStream::setup('root', null, $this->structure);
+        $root = rtrim(vfsStream::url('root') . DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+
+        // skips the existing folder
+        directory_mirror($root . 'src', $root . 'dest');
+
+        $structure = vfsStream::inspect(new vfsStreamStructureVisitor())->getStructure();
+        $this->assertSame([], $structure['root']['dest']['AnEmptyFolder']);
+
+        // skips the existing folder (the same as overwrite = true)
+        directory_mirror($root . 'src', $root . 'dest', false);
+
+        $structure = vfsStream::inspect(new vfsStreamStructureVisitor())->getStructure();
+        $this->assertSame([], $structure['root']['dest']['AnEmptyFolder']);
+    }
+
     public function testWriteFileSuccess()
     {
         $vfs = vfsStream::setup('root');

From 66bc13d94c5f6a3d18af620bc650db4f37b63576 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Wed, 22 Dec 2021 08:47:05 +0700
Subject: [PATCH 1024/2325] Update rector to 0.12.9 and clean up skip config

---
 composer.json |  2 +-
 rector.php    | 10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index 330209cb21a6..984520972a46 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.8"
+        "rector/rector": "0.12.9"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"
diff --git a/rector.php b/rector.php
index 92636b0bfdd5..8be24cd7024d 100644
--- a/rector.php
+++ b/rector.php
@@ -42,7 +42,6 @@
 use Rector\Php71\Rector\FuncCall\CountOnNullRector;
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
-use Rector\PHPUnit\Rector\MethodCall\AssertIssetToSpecificMethodRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
@@ -113,15 +112,6 @@
 
         // use mt_rand instead of random_int on purpose on non-cryptographically random
         RandomFunctionRector::class,
-
-        // $this->assertTrue(isset($bar['foo']))
-        // and $this->assertArrayHasKey('foo', $bar)
-        // or $this->assertObjectHasAttribute('foo', $bar);
-        // are not the same
-        AssertIssetToSpecificMethodRector::class => [
-            __DIR__ . '/tests/system/Entity/EntityTest.php',
-            __DIR__ . '/tests/system/Session/SessionTest.php',
-        ],
     ]);
 
     // auto import fully qualified class names

From b1ab3533e62851323b3759da4584fced0c9ee30f Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Tue, 21 Dec 2021 22:34:15 -0600
Subject: [PATCH 1025/2325] Update destination folder.

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

diff --git a/.github/workflows/deploy-userguide.yml b/.github/workflows/deploy-userguide.yml
index 0fc7900197a8..ad0b48ae6559 100644
--- a/.github/workflows/deploy-userguide.yml
+++ b/.github/workflows/deploy-userguide.yml
@@ -49,5 +49,5 @@ jobs:
           remote_server_ip: ${{ secrets.DEPLOY_SSH_BOX }}
           ssh_port: ${{ secrets.DEPLOY_PORT }}
           ssh_private_key: ${{ secrets.DEPLOY_KEY }}
-          source_path: "./user_guide_src/build/html/*"
-          destination_path: "/home/public_html/userguides/v4/"
+          source_path: "user_guide_src/build/html/*"
+          destination_path: "/home/public_html/userguides/user_guide_4/"

From f7151ab591ef36055aee25cae7082b191ae24c14 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Mon, 20 Dec 2021 17:51:36 +0800
Subject: [PATCH 1026/2325] BaseBuilder instance as subquery.

---
 system/Database/BaseBuilder.php               | 58 ++++++++----
 tests/system/Database/Builder/WhereTest.php   | 81 ++++++++++++++--
 .../source/database/query_builder.rst         | 94 ++++++++++++++-----
 3 files changed, 182 insertions(+), 51 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index fecf3e10718f..6d97db101cbb 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -693,9 +693,8 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
                     $op = ' =';
                 }
 
-                if ($v instanceof Closure) {
-                    $builder = $this->cleanClone();
-                    $v       = ' (' . strtr($v($builder)->getCompiledSelect(), "\n", ' ') . ')';
+                if ($this->isSubQuery($v)) {
+                    $v = $this->buildSubQuery($v, true);
                 } else {
                     $bind = $this->setBind($k, $v, $escape);
                     $v    = " :{$bind}:";
@@ -723,7 +722,7 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
      * Generates a WHERE field IN('item', 'item') SQL query,
      * joined with 'AND' if appropriate.
      *
-     * @param array|Closure|string $values The values searched on, or anonymous function with subquery
+     * @param array|BaseBuilder|Closure|string $values The values searched on, or anonymous function with subquery
      *
      * @return $this
      */
@@ -736,7 +735,7 @@ public function whereIn(?string $key = null, $values = null, ?bool $escape = nul
      * Generates a WHERE field IN('item', 'item') SQL query,
      * joined with 'OR' if appropriate.
      *
-     * @param array|Closure|string $values The values searched on, or anonymous function with subquery
+     * @param array|BaseBuilder|Closure|string $values The values searched on, or anonymous function with subquery
      *
      * @return $this
      */
@@ -749,7 +748,7 @@ public function orWhereIn(?string $key = null, $values = null, ?bool $escape = n
      * Generates a WHERE field NOT IN('item', 'item') SQL query,
      * joined with 'AND' if appropriate.
      *
-     * @param array|Closure|string $values The values searched on, or anonymous function with subquery
+     * @param array|BaseBuilder|Closure|string $values The values searched on, or anonymous function with subquery
      *
      * @return $this
      */
@@ -762,7 +761,7 @@ public function whereNotIn(?string $key = null, $values = null, ?bool $escape =
      * Generates a WHERE field NOT IN('item', 'item') SQL query,
      * joined with 'OR' if appropriate.
      *
-     * @param array|Closure|string $values The values searched on, or anonymous function with subquery
+     * @param array|BaseBuilder|Closure|string $values The values searched on, or anonymous function with subquery
      *
      * @return $this
      */
@@ -775,7 +774,7 @@ public function orWhereNotIn(?string $key = null, $values = null, ?bool $escape
      * Generates a HAVING field IN('item', 'item') SQL query,
      * joined with 'AND' if appropriate.
      *
-     * @param array|Closure|string $values The values searched on, or anonymous function with subquery
+     * @param array|BaseBuilder|Closure|string $values The values searched on, or anonymous function with subquery
      *
      * @return $this
      */
@@ -788,7 +787,7 @@ public function havingIn(?string $key = null, $values = null, ?bool $escape = nu
      * Generates a HAVING field IN('item', 'item') SQL query,
      * joined with 'OR' if appropriate.
      *
-     * @param array|Closure|string $values The values searched on, or anonymous function with subquery
+     * @param array|BaseBuilder|Closure|string $values The values searched on, or anonymous function with subquery
      *
      * @return $this
      */
@@ -801,7 +800,7 @@ public function orHavingIn(?string $key = null, $values = null, ?bool $escape =
      * Generates a HAVING field NOT IN('item', 'item') SQL query,
      * joined with 'AND' if appropriate.
      *
-     * @param array|Closure|string $values The values searched on, or anonymous function with subquery
+     * @param array|BaseBuilder|Closure|string $values The values searched on, or anonymous function with subquery
      *
      * @return $this
      */
@@ -814,7 +813,7 @@ public function havingNotIn(?string $key = null, $values = null, ?bool $escape =
      * Generates a HAVING field NOT IN('item', 'item') SQL query,
      * joined with 'OR' if appropriate.
      *
-     * @param array|Closure|string $values The values searched on, or anonymous function with subquery
+     * @param array|BaseBuilder|Closure|string $values The values searched on, or anonymous function with subquery
      *
      * @return $this
      */
@@ -829,7 +828,7 @@ public function orHavingNotIn(?string $key = null, $values = null, ?bool $escape
      * @used-by whereNotIn()
      * @used-by orWhereNotIn()
      *
-     * @param array|Closure|null $values The values searched on, or anonymous function with subquery
+     * @param array|BaseBuilder|Closure|null $values The values searched on, or anonymous function with subquery
      *
      * @throws InvalidArgumentException
      *
@@ -845,7 +844,7 @@ protected function _whereIn(?string $key = null, $values = null, bool $not = fal
             return $this; // @codeCoverageIgnore
         }
 
-        if ($values === null || (! is_array($values) && ! ($values instanceof Closure))) {
+        if ($values === null || (! is_array($values) && ! $this->isSubQuery($values))) {
             if (CI_DEBUG) {
                 throw new InvalidArgumentException(sprintf('%s() expects $values to be of type array or closure', debug_backtrace(0, 2)[1]['function']));
             }
@@ -865,9 +864,8 @@ protected function _whereIn(?string $key = null, $values = null, bool $not = fal
 
         $not = ($not) ? ' NOT' : '';
 
-        if ($values instanceof Closure) {
-            $builder = $this->cleanClone();
-            $ok      = strtr($values($builder)->getCompiledSelect(), "\n", ' ');
+        if ($this->isSubQuery($values)) {
+            $ok = $this->buildSubQuery($values);
         } else {
             $whereIn = array_values($values);
             $ok      = $this->setBind($ok, $whereIn, $escape);
@@ -876,7 +874,7 @@ protected function _whereIn(?string $key = null, $values = null, bool $not = fal
         $prefix = empty($this->{$clause}) ? $this->groupGetType('') : $this->groupGetType($type);
 
         $whereIn = [
-            'condition' => $prefix . $key . $not . ($values instanceof Closure ? " IN ({$ok})" : " IN :{$ok}:"),
+            'condition' => $prefix . $key . $not . ($this->isSubQuery($values) ? " IN ({$ok})" : " IN :{$ok}:"),
             'escape'    => false,
         ];
 
@@ -2724,9 +2722,35 @@ protected function setBind(string $key, $value = null, bool $escape = true): str
      * Returns a clone of a Base Builder with reset query builder values.
      *
      * @return $this
+     *
+     * @deprecated
      */
     protected function cleanClone()
     {
         return (clone $this)->from([], true)->resetQuery();
     }
+
+    /**
+     * @param mixed $value
+     */
+    protected function isSubQuery($value): bool
+    {
+        return $value instanceof BaseBuilder || $value instanceof Closure;
+    }
+
+    /**
+     * @param BaseBuilder|Closure $builder
+     * @param bool                $wrapped Wrap the subquery in brackets
+     */
+    protected function buildSubQuery($builder, bool $wrapped = false): string
+    {
+        if ($builder instanceof Closure) {
+            $instance = (clone $this)->from([], true)->resetQuery();
+            $builder  = $builder($instance);
+        }
+
+        $subQuery = strtr($builder->getCompiledSelect(), "\n", ' ');
+
+        return $wrapped ? '(' . $subQuery . ')' : $subQuery;
+    }
 }
diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php
index e58af53cadab..70463776a3ac 100644
--- a/tests/system/Database/Builder/WhereTest.php
+++ b/tests/system/Database/Builder/WhereTest.php
@@ -141,14 +141,27 @@ public function testWhereCustomString()
         $this->assertSame($expectedBinds, $builder->getBinds());
     }
 
-    public function testWhereValueClosure()
+    public function testWhereValueSubQuery()
     {
+        $expectedSQL = 'SELECT * FROM "neworder" WHERE "advance_amount" < (SELECT MAX(advance_amount) FROM "orders" WHERE "id" > 2)';
+
+        // Closure
         $builder = $this->db->table('neworder');
 
         $builder->where('advance_amount <', static function (BaseBuilder $builder) {
             return $builder->select('MAX(advance_amount)', false)->from('orders')->where('id >', 2);
         });
-        $expectedSQL = 'SELECT * FROM "neworder" WHERE "advance_amount" < (SELECT MAX(advance_amount) FROM "orders" WHERE "id" > 2)';
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+
+        // Builder
+        $builder = $this->db->table('neworder');
+
+        $subQuery = $this->db->table('orders')
+            ->select('MAX(advance_amount)', false)
+            ->where('id >', 2);
+
+        $builder->where('advance_amount <', $subQuery);
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
@@ -218,15 +231,27 @@ public function testWhereIn()
         $this->assertSame($expectedBinds, $builder->getBinds());
     }
 
-    public function testWhereInClosure()
+    public function testWhereInSubQuery()
     {
+        $expectedSQL = 'SELECT * FROM "jobs" WHERE "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)';
+
+        // Closure
         $builder = $this->db->table('jobs');
 
         $builder->whereIn('id', static function (BaseBuilder $builder) {
             return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
         });
 
-        $expectedSQL = 'SELECT * FROM "jobs" WHERE "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)';
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+
+        // Builder
+        $builder = $this->db->table('jobs');
+
+        $subQuery = $this->db->table('users_jobs')
+            ->select('job_id')
+            ->where('user_id', 3);
+
+        $builder->whereIn('id', $subQuery);
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
@@ -295,15 +320,27 @@ public function testWhereNotIn()
         $this->assertSame($expectedBinds, $builder->getBinds());
     }
 
-    public function testWhereNotInClosure()
+    public function testWhereNotInSubQuery()
     {
+        $expectedSQL = 'SELECT * FROM "jobs" WHERE "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)';
+
+        // Closure
         $builder = $this->db->table('jobs');
 
         $builder->whereNotIn('id', static function (BaseBuilder $builder) {
             return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
         });
 
-        $expectedSQL = 'SELECT * FROM "jobs" WHERE "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)';
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+
+        // Builder
+        $builder = $this->db->table('jobs');
+
+        $subQuery = $this->db->table('users_jobs')
+            ->select('job_id')
+            ->where('user_id', 3);
+
+        $builder->whereNotIn('id', $subQuery);
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
@@ -333,15 +370,27 @@ public function testOrWhereIn()
         $this->assertSame($expectedBinds, $builder->getBinds());
     }
 
-    public function testOrWhereInClosure()
+    public function testOrWhereInSubQuery()
     {
+        $expectedSQL = 'SELECT * FROM "jobs" WHERE "deleted_at" IS NULL OR "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)';
+
+        // Closure
         $builder = $this->db->table('jobs');
 
         $builder->where('deleted_at', null)->orWhereIn('id', static function (BaseBuilder $builder) {
             return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
         });
 
-        $expectedSQL = 'SELECT * FROM "jobs" WHERE "deleted_at" IS NULL OR "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)';
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+
+        // Builder
+        $builder = $this->db->table('jobs');
+
+        $subQuery = $this->db->table('users_jobs')
+            ->select('job_id')
+            ->where('user_id', 3);
+
+        $builder->where('deleted_at', null)->orWhereIn('id', $subQuery);
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
@@ -371,15 +420,27 @@ public function testOrWhereNotIn()
         $this->assertSame($expectedBinds, $builder->getBinds());
     }
 
-    public function testOrWhereNotInClosure()
+    public function testOrWhereNotInSubQuery()
     {
+        $expectedSQL = 'SELECT * FROM "jobs" WHERE "deleted_at" IS NULL OR "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)';
+
+        // Closure
         $builder = $this->db->table('jobs');
 
         $builder->where('deleted_at', null)->orWhereNotIn('id', static function (BaseBuilder $builder) {
             return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
         });
 
-        $expectedSQL = 'SELECT * FROM "jobs" WHERE "deleted_at" IS NULL OR "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)';
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+
+        // Builder
+        $builder = $this->db->table('jobs');
+
+        $subQuery = $this->db->table('users_jobs')
+            ->select('job_id')
+            ->where('user_id', 3);
+
+        $builder->where('deleted_at', null)->orWhereNotIn('id', $subQuery);
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 7aa8cf69dcdb..63d9c25f501b 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -306,13 +306,22 @@ methods:
 
 #. **Subqueries:**
 
-    You can use an anonymous function to create a subquery::
+    ::
+
+        // With closure
 
         $builder->where('advance_amount <', function (BaseBuilder $builder) {
             return $builder->select('MAX(advance_amount)', false)->from('orders')->where('id >', 2);
         });
+
         // Produces: WHERE "advance_amount" < (SELECT MAX(advance_amount) FROM "orders" WHERE "id" > 2)
 
+        // With builder directly
+        $subQuery = $db->table('orders')->select('MAX(advance_amount)', false)->where('id >', 2)
+
+        $builder->where('advance_amount <', $subQuery);
+
+
 **$builder->orWhere()**
 
 This function is identical to the one above, except that multiple
@@ -333,11 +342,17 @@ appropriate::
 
 You can use subqueries instead of an array of values::
 
+    // With closure
     $builder->whereIn('id', function (BaseBuilder $builder) {
         return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
     });
     // Produces: WHERE "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
 
+    // With builder directly
+    $subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
+
+    $builder->whereIn('id', $subQuery);
+
 **$builder->orWhereIn()**
 
 Generates a ``WHERE field IN ('item', 'item')`` SQL query joined with OR if
@@ -349,12 +364,18 @@ appropriate::
 
 You can use subqueries instead of an array of values::
 
+        // With closure
         $builder->orWhereIn('id', function (BaseBuilder $builder) {
             return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
         });
 
         // Produces: OR "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
 
+        // With builder directly
+        $subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
+
+        $builder->orWhereIn('id', $subQuery);
+
 **$builder->whereNotIn()**
 
 Generates a WHERE field NOT IN ('item', 'item') SQL query joined with
@@ -366,12 +387,18 @@ AND if appropriate::
 
 You can use subqueries instead of an array of values::
 
+    // With closure
     $builder->whereNotIn('id', function (BaseBuilder $builder) {
         return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
     });
 
     // Produces: WHERE "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
 
+    // With builder directly
+    $subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
+
+    $builder->whereNotIn('id', $subQuery);
+
 **$builder->orWhereNotIn()**
 
 Generates a ``WHERE field NOT IN ('item', 'item')`` SQL query joined with OR
@@ -383,12 +410,18 @@ if appropriate::
 
 You can use subqueries instead of an array of values::
 
+    // With closure
     $builder->orWhereNotIn('id', function (BaseBuilder $builder) {
         return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
     });
 
     // Produces: OR "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
 
+    // With builder directly
+    $subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
+
+    $builder->orWhereNotIn('id', $subQuery);
+
 ************************
 Looking for Similar Data
 ************************
@@ -512,23 +545,25 @@ Identical to ``having()``, only separates multiple clauses with "OR".
 **$builder->havingIn()**
 
 Generates a ``HAVING field IN ('item', 'item')`` SQL query joined with AND if
-appropriate
-
-::
+appropriate::
 
     $groups = [1, 2, 3];
     $builder->havingIn('group_id', $groups);
     // Produces: HAVING group_id IN (1, 2, 3)
 
-You can use subqueries instead of an array of values.
-
-::
+You can use subqueries instead of an array of values.::
 
+    // With closure
     $builder->havingIn('id', function (BaseBuilder $builder) {
         return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
     });
     // Produces: HAVING "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
 
+    // With builder directly
+    $subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
+
+    $builder->havingIn('id', $subQuery);
+
 **$builder->orHavingIn()**
 
 Generates a ``HAVING field IN ('item', 'item')`` SQL query joined with OR if
@@ -540,16 +575,20 @@ appropriate
     $builder->orHavingIn('group_id', $groups);
     // Produces: OR group_id IN (1, 2, 3)
 
-You can use subqueries instead of an array of values.
-
-::
+You can use subqueries instead of an array of values.::
 
+    //With closure
     $builder->orHavingIn('id', function (BaseBuilder $builder) {
         return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
     });
 
     // Produces: OR "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
 
+    // With builder directly
+    $subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
+
+    $builder->orHavingIn('id', $subQuery);
+
 **$builder->havingNotIn()**
 
 Generates a ``HAVING field NOT IN ('item', 'item')`` SQL query joined with
@@ -561,16 +600,19 @@ AND if appropriate
     $builder->havingNotIn('group_id', $groups);
     // Produces: HAVING group_id NOT IN (1, 2, 3)
 
-You can use subqueries instead of an array of values.
-
-::
+You can use subqueries instead of an array of values.::
 
+    //With closure
     $builder->havingNotIn('id', function (BaseBuilder $builder) {
         return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
     });
 
     // Produces: HAVING "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
 
+    // With builder directly
+    $subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
+
+    $builder->havingNotIn('id', $subQuery);
 
 **$builder->orHavingNotIn()**
 
@@ -583,16 +625,20 @@ if appropriate
     $builder->havingNotIn('group_id', $groups);
     // Produces: OR group_id NOT IN (1, 2, 3)
 
-You can use subqueries instead of an array of values.
-
-::
+You can use subqueries instead of an array of values.::
 
+    //With closure
     $builder->orHavingNotIn('id', function (BaseBuilder $builder) {
         return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
     });
 
     // Produces: OR "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
 
+    // With builder directly
+    $subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
+
+    $builder->orHavingNotIn('id', $subQuery);
+
 **$builder->havingLike()**
 
 This method enables you to generate **LIKE** clauses for HAVING part or the query, useful for doing
@@ -1397,7 +1443,7 @@ Class Reference
     .. php:method:: orWhereIn([$key = null[, $values = null[, $escape = null]]])
 
         :param string $key: The field to search
-        :param array|Closure $values: Array of target values, or anonymous function for subquery
+        :param array|BaseBulder|Closure $values: Array of target values, or anonymous function for subquery
         :param bool $escape: Whether to escape values and identifiers
         :returns:   ``BaseBuilder`` instance (method chaining)
         :rtype:     ``BaseBuilder``
@@ -1407,7 +1453,7 @@ Class Reference
     .. php:method:: orWhereNotIn([$key = null[, $values = null[, $escape = null]]])
 
         :param string $key: The field to search
-        :param array|Closure $values: Array of target values, or anonymous function for subquery
+        :param array|BaseBulder|Closure $values: Array of target values, or anonymous function for subquery
         :param bool $escape: Whether to escape values and identifiers
         :returns:   ``BaseBuilder`` instance (method chaining)
         :rtype:     ``BaseBuilder``
@@ -1417,7 +1463,7 @@ Class Reference
     .. php:method:: whereIn([$key = null[, $values = null[, $escape = null]]])
 
         :param string $key: Name of field to examine
-        :param array|Closure $values: Array of target values, or anonymous function for subquery
+        :param array|BaseBulder|Closure $values: Array of target values, or anonymous function for subquery
         :param bool $escape: Whether to escape values and identifiers
         :returns:   ``BaseBuilder`` instance (method chaining)
         :rtype:     ``BaseBuilder``
@@ -1427,7 +1473,7 @@ Class Reference
     .. php:method:: whereNotIn([$key = null[, $values = null[, $escape = null]]])
 
         :param string $key: Name of field to examine
-        :param array|Closure $values: Array of target values, or anonymous function for subquery
+        :param array|BaseBulder|Closure $values: Array of target values, or anonymous function for subquery
         :param bool    $escape: Whether to escape values and identifiers
         :returns:   ``BaseBuilder`` instance (method chaining)
         :rtype:     ``BaseBuilder``
@@ -1540,7 +1586,7 @@ Class Reference
     .. php:method:: orHavingIn([$key = null[, $values = null[, $escape = null]]])
 
         :param string $key: The field to search
-        :param array|Closure $values: Array of target values, or anonymous function for subquery
+        :param array|BaseBulder|Closure $values: Array of target values, or anonymous function for subquery
         :param bool    $escape: Whether to escape values and identifiers
         :returns:   ``BaseBuilder`` instance (method chaining)
         :rtype:     ``BaseBuilder``
@@ -1550,7 +1596,7 @@ Class Reference
     .. php:method:: orHavingNotIn([$key = null[, $values = null[, $escape = null]]])
 
         :param string $key: The field to search
-        :param array|Closure $values: Array of target values, or anonymous function for subquery
+        :param array|BaseBulder|Closure $values: Array of target values, or anonymous function for subquery
         :param bool    $escape: Whether to escape values and identifiers
         :returns:   ``BaseBuilder`` instance (method chaining)
         :rtype:     ``BaseBuilder``
@@ -1560,7 +1606,7 @@ Class Reference
     .. php:method:: havingIn([$key = null[, $values = null[, $escape = null]]])
 
         :param string $key: Name of field to examine
-        :param array|Closure $values: Array of target values, or anonymous function for subquery
+        :param array|BaseBulder|Closure $values: Array of target values, or anonymous function for subquery
         :param bool $escape: Whether to escape values and identifiers
         :returns:   ``BaseBuilder`` instance (method chaining)
         :rtype:     ``BaseBuilder``
@@ -1570,7 +1616,7 @@ Class Reference
     .. php:method:: havingNotIn([$key = null[, $values = null[, $escape = null]]])
 
         :param string $key: Name of field to examine
-        :param array|Closure $values: Array of target values, or anonymous function for subquery
+        :param array|BaseBulder|Closure $values: Array of target values, or anonymous function for subquery
         :param bool $escape: Whether to escape values and identifiers
         :param bool $insensitiveSearch: Whether to force a case-insensitive search
         :returns:   ``BaseBuilder`` instance (method chaining)

From d4fe9895d592c0a6a3da88132dea59a9c6d62686 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Mon, 20 Dec 2021 18:10:03 +0800
Subject: [PATCH 1027/2325] Rename method

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

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 6d97db101cbb..a2a021ea9630 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -693,8 +693,8 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
                     $op = ' =';
                 }
 
-                if ($this->isSubQuery($v)) {
-                    $v = $this->buildSubQuery($v, true);
+                if ($this->isSubquery($v)) {
+                    $v = $this->buildSubquery($v, true);
                 } else {
                     $bind = $this->setBind($k, $v, $escape);
                     $v    = " :{$bind}:";
@@ -844,7 +844,7 @@ protected function _whereIn(?string $key = null, $values = null, bool $not = fal
             return $this; // @codeCoverageIgnore
         }
 
-        if ($values === null || (! is_array($values) && ! $this->isSubQuery($values))) {
+        if ($values === null || (! is_array($values) && ! $this->isSubquery($values))) {
             if (CI_DEBUG) {
                 throw new InvalidArgumentException(sprintf('%s() expects $values to be of type array or closure', debug_backtrace(0, 2)[1]['function']));
             }
@@ -864,8 +864,8 @@ protected function _whereIn(?string $key = null, $values = null, bool $not = fal
 
         $not = ($not) ? ' NOT' : '';
 
-        if ($this->isSubQuery($values)) {
-            $ok = $this->buildSubQuery($values);
+        if ($this->isSubquery($values)) {
+            $ok = $this->buildSubquery($values);
         } else {
             $whereIn = array_values($values);
             $ok      = $this->setBind($ok, $whereIn, $escape);
@@ -874,7 +874,7 @@ protected function _whereIn(?string $key = null, $values = null, bool $not = fal
         $prefix = empty($this->{$clause}) ? $this->groupGetType('') : $this->groupGetType($type);
 
         $whereIn = [
-            'condition' => $prefix . $key . $not . ($this->isSubQuery($values) ? " IN ({$ok})" : " IN :{$ok}:"),
+            'condition' => $prefix . $key . $not . ($this->isSubquery($values) ? " IN ({$ok})" : " IN :{$ok}:"),
             'escape'    => false,
         ];
 
@@ -2733,7 +2733,7 @@ protected function cleanClone()
     /**
      * @param mixed $value
      */
-    protected function isSubQuery($value): bool
+    protected function isSubquery($value): bool
     {
         return $value instanceof BaseBuilder || $value instanceof Closure;
     }
@@ -2742,15 +2742,15 @@ protected function isSubQuery($value): bool
      * @param BaseBuilder|Closure $builder
      * @param bool                $wrapped Wrap the subquery in brackets
      */
-    protected function buildSubQuery($builder, bool $wrapped = false): string
+    protected function buildSubquery($builder, bool $wrapped = false): string
     {
         if ($builder instanceof Closure) {
             $instance = (clone $this)->from([], true)->resetQuery();
             $builder  = $builder($instance);
         }
 
-        $subQuery = strtr($builder->getCompiledSelect(), "\n", ' ');
+        $subquery = strtr($builder->getCompiledSelect(), "\n", ' ');
 
-        return $wrapped ? '(' . $subQuery . ')' : $subQuery;
+        return $wrapped ? '(' . $subquery . ')' : $subquery;
     }
 }

From 2aa2de794ea6039d0fd237e24da61bab85cb1fe5 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Thu, 23 Dec 2021 12:58:19 +0800
Subject: [PATCH 1028/2325] Changelog and fix doc

---
 user_guide_src/source/changelogs/v4.1.6.rst      |  2 ++
 user_guide_src/source/database/query_builder.rst | 11 +----------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.1.6.rst b/user_guide_src/source/changelogs/v4.1.6.rst
index d53378a6b624..09cd48ceae80 100644
--- a/user_guide_src/source/changelogs/v4.1.6.rst
+++ b/user_guide_src/source/changelogs/v4.1.6.rst
@@ -33,6 +33,7 @@ Enhancements
 ************
 
 - Database pane on debug toolbar now displays location where Query was called from. Also displays full backtrace.
+- :ref:`Subqueries<query-builder-where-subquery>` in QueryBuilder can now be an instance of the BaseBuilder class.
 
 Changes
 *******
@@ -43,6 +44,7 @@ Deprecations
 ************
 
 - ``Seeder::faker()`` and ``Seeder::$faker`` are deprecated.
+- ``BaseBuilder::cleanClone()`` is deprecated.
 
 Sending Cookies
 ===============
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 63d9c25f501b..4d0fd69ce2f9 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -304,6 +304,7 @@ methods:
     $where = "name={$name} AND status='boss' OR status='active'";
     $builder->where($where);
 
+.. _query-builder-where-subquery:
 #. **Subqueries:**
 
     ::
@@ -318,10 +319,8 @@ methods:
 
         // With builder directly
         $subQuery = $db->table('orders')->select('MAX(advance_amount)', false)->where('id >', 2)
-
         $builder->where('advance_amount <', $subQuery);
 
-
 **$builder->orWhere()**
 
 This function is identical to the one above, except that multiple
@@ -350,7 +349,6 @@ You can use subqueries instead of an array of values::
 
     // With builder directly
     $subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
-
     $builder->whereIn('id', $subQuery);
 
 **$builder->orWhereIn()**
@@ -373,7 +371,6 @@ You can use subqueries instead of an array of values::
 
         // With builder directly
         $subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
-
         $builder->orWhereIn('id', $subQuery);
 
 **$builder->whereNotIn()**
@@ -396,7 +393,6 @@ You can use subqueries instead of an array of values::
 
     // With builder directly
     $subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
-
     $builder->whereNotIn('id', $subQuery);
 
 **$builder->orWhereNotIn()**
@@ -419,7 +415,6 @@ You can use subqueries instead of an array of values::
 
     // With builder directly
     $subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
-
     $builder->orWhereNotIn('id', $subQuery);
 
 ************************
@@ -561,7 +556,6 @@ You can use subqueries instead of an array of values.::
 
     // With builder directly
     $subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
-
     $builder->havingIn('id', $subQuery);
 
 **$builder->orHavingIn()**
@@ -586,7 +580,6 @@ You can use subqueries instead of an array of values.::
 
     // With builder directly
     $subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
-
     $builder->orHavingIn('id', $subQuery);
 
 **$builder->havingNotIn()**
@@ -611,7 +604,6 @@ You can use subqueries instead of an array of values.::
 
     // With builder directly
     $subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
-
     $builder->havingNotIn('id', $subQuery);
 
 **$builder->orHavingNotIn()**
@@ -636,7 +628,6 @@ You can use subqueries instead of an array of values.::
 
     // With builder directly
     $subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
-
     $builder->orHavingNotIn('id', $subQuery);
 
 **$builder->havingLike()**

From fbaab7705a64448bc973c3cfefc7f408d9c07914 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Thu, 23 Dec 2021 15:14:41 +0800
Subject: [PATCH 1029/2325] Update user_guide_src/source/changelogs/v4.1.6.rst

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

diff --git a/user_guide_src/source/changelogs/v4.1.6.rst b/user_guide_src/source/changelogs/v4.1.6.rst
index 09cd48ceae80..61214596ea97 100644
--- a/user_guide_src/source/changelogs/v4.1.6.rst
+++ b/user_guide_src/source/changelogs/v4.1.6.rst
@@ -33,7 +33,7 @@ Enhancements
 ************
 
 - Database pane on debug toolbar now displays location where Query was called from. Also displays full backtrace.
-- :ref:`Subqueries<query-builder-where-subquery>` in QueryBuilder can now be an instance of the BaseBuilder class.
+- :ref:`Subqueries <query-builder-where-subquery>` in QueryBuilder can now be an instance of the BaseBuilder class.
 
 Changes
 *******

From 5eb8c822c64c0f1500d40bfaeb9542c85567d53c Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Thu, 23 Dec 2021 15:14:51 +0800
Subject: [PATCH 1030/2325] Update
 user_guide_src/source/database/query_builder.rst

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 user_guide_src/source/database/query_builder.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 4d0fd69ce2f9..2c85a58e63e6 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -305,6 +305,7 @@ methods:
     $builder->where($where);
 
 .. _query-builder-where-subquery:
+
 #. **Subqueries:**
 
     ::

From 864d366c87ab432a2a97ad92dd32603ea14a71ae Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Fri, 24 Dec 2021 09:45:58 +0800
Subject: [PATCH 1031/2325] Excluding a condition from a query string.

---
 system/Database/BaseBuilder.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index a2a021ea9630..2a431accd2f5 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -865,16 +865,18 @@ protected function _whereIn(?string $key = null, $values = null, bool $not = fal
         $not = ($not) ? ' NOT' : '';
 
         if ($this->isSubquery($values)) {
-            $ok = $this->buildSubquery($values);
+            $whereIn = $this->buildSubquery($values, true);
+            $escape  = false;
         } else {
             $whereIn = array_values($values);
-            $ok      = $this->setBind($ok, $whereIn, $escape);
         }
 
+        $ok = $this->setBind($ok, $whereIn, $escape);
+
         $prefix = empty($this->{$clause}) ? $this->groupGetType('') : $this->groupGetType($type);
 
         $whereIn = [
-            'condition' => $prefix . $key . $not . ($this->isSubquery($values) ? " IN ({$ok})" : " IN :{$ok}:"),
+            'condition' => "{$prefix}{$key}{$not} IN :{$ok}:",
             'escape'    => false,
         ];
 

From 70625366ae5fa901bc901c435903b008c417353f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 25 Dec 2021 11:57:59 +0900
Subject: [PATCH 1032/2325] fix: KINT visual error when activating CSP

---
 rector.php                         |  1 +
 system/CodeIgniter.php             |  4 +-
 system/Debug/Kint/RichRenderer.php | 75 ++++++++++++++++++++++++++++++
 3 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 system/Debug/Kint/RichRenderer.php

diff --git a/rector.php b/rector.php
index 8be24cd7024d..68d16bbb66e4 100644
--- a/rector.php
+++ b/rector.php
@@ -71,6 +71,7 @@
     $parameters->set(Option::SKIP, [
         __DIR__ . '/app/Views',
         __DIR__ . '/system/Debug/Toolbar/Views/toolbar.tpl.php',
+        __DIR__ . '/system/Debug/Kint/RichRenderer.php',
         __DIR__ . '/system/ThirdParty',
         __DIR__ . '/tests/system/Config/fixtures',
         __DIR__ . '/tests/_support',
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index d309ca81c27a..56cb0df4b7bd 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter;
 
 use Closure;
+use CodeIgniter\Debug\Kint\RichRenderer;
 use CodeIgniter\Debug\Timer;
 use CodeIgniter\Events\Events;
 use CodeIgniter\Exceptions\FrameworkException;
@@ -33,7 +34,6 @@
 use Exception;
 use Kint;
 use Kint\Renderer\CliRenderer;
-use Kint\Renderer\RichRenderer;
 
 /**
  * This class is the core of the framework, and will analyse the
@@ -257,6 +257,8 @@ protected function initializeKint()
             Kint::$plugins = $config->plugins;
         }
 
+        Kint::$renderers[Kint::MODE_RICH] = RichRenderer::class;
+
         RichRenderer::$theme  = $config->richTheme;
         RichRenderer::$folder = $config->richFolder;
         RichRenderer::$sort   = $config->richSort;
diff --git a/system/Debug/Kint/RichRenderer.php b/system/Debug/Kint/RichRenderer.php
new file mode 100644
index 000000000000..756cac75e144
--- /dev/null
+++ b/system/Debug/Kint/RichRenderer.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug\Kint;
+
+use Kint\Renderer\RichRenderer as KintRichRenderer;
+
+/**
+ * Overrides RichRenderer::preRender() for CSP
+ */
+class RichRenderer extends KintRichRenderer
+{
+    public function preRender()
+    {
+        $output = '';
+
+        if ($this->pre_render) {
+            foreach (self::$pre_render_sources as $type => $values) {
+                $contents = '';
+
+                foreach ($values as $v) {
+                    $contents .= $v($this);
+                }
+
+                if (! \strlen($contents)) {
+                    continue;
+                }
+
+                switch ($type) {
+                    case 'script':
+                        $output .= '<script {csp-script-nonce} class="kint-rich-script">' . $contents . '</script>';
+                        break;
+
+                    case 'style':
+                        $output .= '<style {csp-style-nonce} class="kint-rich-style">' . $contents . '</style>';
+                        break;
+
+                    default:
+                        $output .= $contents;
+                }
+            }
+
+            // Don't pre-render on every dump
+            if (! $this->force_pre_render) {
+                self::$needs_pre_render = false;
+            }
+        }
+
+        $output .= '<div class="kint-rich';
+
+        if ($this->use_folder) {
+            $output .= ' kint-file';
+
+            if (self::$needs_folder_render || $this->force_pre_render) {
+                $output = $this->renderFolder() . $output;
+
+                if (! $this->force_pre_render) {
+                    self::$needs_folder_render = false;
+                }
+            }
+        }
+
+        $output .= '">';
+
+        return $output;
+    }
+}

From 9cd87553c1902c69cdbc0bed3fc9d691b9f07cde Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 25 Dec 2021 18:43:41 +0900
Subject: [PATCH 1033/2325] docs: fix typo

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

diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index b9b21e29ba38..24d90ed654e1 100755
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -309,7 +309,7 @@ Miscellaneous Functions
         // Go back to the previous page
         return redirect()->back();
 
-        // Go to specific UI
+        // Go to specific URI
         return redirect()->to('/admin');
 
         // Go to a named/reverse-routed URI

From 34209c8b6dfc03141040b231767e03514a8061db Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 25 Dec 2021 18:43:59 +0900
Subject: [PATCH 1034/2325] docs: fix comment

This code uses named route.
---
 user_guide_src/source/general/common_functions.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index 24d90ed654e1..cf99aaddda49 100755
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -312,7 +312,7 @@ Miscellaneous Functions
         // Go to specific URI
         return redirect()->to('/admin');
 
-        // Go to a named/reverse-routed URI
+        // Go to a named route
         return redirect()->route('named_route');
 
         // Keep the old input values upon redirect so they can be used by the `old()` function

From a01b3313d220bf82181b7f8002b8d07880eff8cf Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 25 Dec 2021 18:45:33 +0900
Subject: [PATCH 1035/2325] docs: decorate method

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

diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index cf99aaddda49..96a16fde77b6 100755
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -328,7 +328,7 @@ Miscellaneous Functions
         return redirect()->back()->withHeaders();
 
     When passing an argument into the function, it is treated as a named/reverse-routed route, not a relative/full URI,
-    treating it the same as using redirect()->route()::
+    treating it the same as using ``redirect()->route()``::
 
         // Go to a named/reverse-routed URI
         return redirect('named_route');

From aaf9cb2b4ede06b82b287016f04a5b7abdf7d8d3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 26 Dec 2021 06:58:17 +0900
Subject: [PATCH 1036/2325] docs: change text decoration

---
 user_guide_src/source/dbmgmt/forge.rst | 42 ++++++++++++--------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index bbaa01490b0e..aadaf08d707b 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -40,7 +40,7 @@ Returns true/false based on success or failure::
         echo 'Database created!';
     }
 
-An optional second parameter set to true will add IF EXISTS statement
+An optional second parameter set to true will add ``IF EXISTS`` statement
 or will check if a database exists before create it (depending on DBMS).
 
 ::
@@ -95,9 +95,9 @@ Adding fields
 =============
 
 Fields are normally created via an associative array. Within the array, you must
-include a 'type' key that relates to the datatype of the field. For
+include a ``type`` key that relates to the datatype of the field. For
 example, INT, VARCHAR, TEXT, etc. Many datatypes (for example VARCHAR)
-also require a 'constraint' key.
+also require a ``constraint`` key.
 
 ::
 
@@ -111,14 +111,14 @@ also require a 'constraint' key.
 
 Additionally, the following key/values can be used:
 
--  unsigned/true : to generate "UNSIGNED" in the field definition.
--  default/value : to generate a default value in the field definition.
--  null/true : to generate "null" in the field definition. Without this,
+-  ``unsigned``/true : to generate "UNSIGNED" in the field definition.
+-  ``default``/value : to generate a default value in the field definition.
+-  ``null``/true : to generate "null" in the field definition. Without this,
    the field will default to "NOT null".
--  auto_increment/true : generates an auto_increment flag on the
+-  ``auto_increment``/true : generates an auto_increment flag on the
    field. Note that the field type must be a type that supports this,
    such as integer.
--  unique/true : to generate a unique key for the field definition.
+-  ``unique``/true : to generate a unique key for the field definition.
 
 ::
 
@@ -162,15 +162,13 @@ Passing strings as fields
 -------------------------
 
 If you know exactly how you want a field to be created, you can pass the
-string into the field definitions with addField()
-
-::
+string into the field definitions with ``addField()``::
 
     $forge->addField("label varchar(100) NOT NULL DEFAULT 'default label'");
 
 .. note:: Passing raw strings as fields cannot be followed by ``addKey()`` calls on those fields.
 
-.. note:: Multiple calls to addField() are cumulative.
+.. note:: Multiple calls to ``addField()`` are cumulative.
 
 Creating an id field
 --------------------
@@ -188,10 +186,10 @@ Adding Keys
 ===========
 
 Generally speaking, you'll want your table to have Keys. This is
-accomplished with $forge->addKey('field'). The optional second
+accomplished with ``$forge->addKey('field')``. The optional second
 parameter set to true will make it a primary key and the third
-parameter set to true will make it a unique key. Note that addKey()
-must be followed by a call to createTable().
+parameter set to true will make it a unique key. Note that ``addKey()``
+must be followed by a call to ``createTable()``.
 
 Multiple column non-primary keys must be sent as an array. Sample output
 below is for MySQL.
@@ -256,7 +254,7 @@ with
     $forge->createTable('table_name');
     // gives CREATE TABLE table_name
 
-An optional second parameter set to true adds an "IF NOT EXISTS" clause
+An optional second parameter set to true adds an ``IF NOT EXISTS`` clause
 into the definition
 
 ::
@@ -277,7 +275,7 @@ You could also pass optional table attributes, such as MySQL's ``ENGINE``::
 Dropping a table
 ================
 
-Execute a DROP TABLE statement and optionally add an IF EXISTS clause.
+Execute a ``DROP TABLE`` statement and optionally add an ``IF EXISTS`` clause.
 
 ::
 
@@ -287,7 +285,7 @@ Execute a DROP TABLE statement and optionally add an IF EXISTS clause.
     // Produces: DROP TABLE IF EXISTS `table_name`
     $forge->dropTable('table_name', true);
 
-A third parameter can be passed to add a "CASCADE" option, which might be required for some
+A third parameter can be passed to add a ``CASCADE`` option, which might be required for some
 drivers to handle removal of tables with foreign keys.
 
 ::
@@ -348,7 +346,7 @@ number of additional fields.
     // Executes: ALTER TABLE `table_name` ADD `preferences` TEXT
 
 If you are using MySQL or CUBIRD, then you can take advantage of their
-AFTER and FIRST clauses to position the new column.
+``AFTER`` and ``FIRST`` clauses to position the new column.
 
 Examples::
 
@@ -464,7 +462,7 @@ Class Reference
     .. php:method:: createDatabase($dbName[, $ifNotExists = false])
 
         :param    string    $db_name: Name of the database to create
-        :param    string    $ifNotExists: Set to true to add an 'IF NOT EXISTS' clause or check if database exists
+        :param    string    $ifNotExists: Set to true to add an ``IF NOT EXISTS`` clause or check if database exists
         :returns:    true on success, false on failure
         :rtype:    bool
 
@@ -473,7 +471,7 @@ Class Reference
     .. php:method:: createTable($table[, $if_not_exists = false[, array $attributes = []]])
 
         :param    string    $table: Name of the table to create
-        :param    string    $if_not_exists: Set to true to add an 'IF NOT EXISTS' clause
+        :param    string    $if_not_exists: Set to true to add an ``IF NOT EXISTS`` clause
         :param    string    $attributes: An associative array of table attributes
         :returns:  Query object on success, false on failure
         :rtype:    mixed
@@ -500,7 +498,7 @@ Class Reference
     .. php:method:: dropTable($table_name[, $if_exists = false])
 
         :param    string    $table: Name of the table to drop
-        :param    string    $if_exists: Set to true to add an 'IF EXISTS' clause
+        :param    string    $if_exists: Set to true to add an ``IF EXISTS`` clause
         :returns:    true on success, false on failure
         :rtype:    bool
 

From 63d3bf605e72be076de33fd6dd0fd33011d37346 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 26 Dec 2021 07:00:35 +0900
Subject: [PATCH 1037/2325] docs: remove `;`

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

diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index aadaf08d707b..c74fada3551d 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -151,7 +151,7 @@ Additionally, the following key/values can be used:
     ];
 
 After the fields have been defined, they can be added using
-``$forge->addField($fields);`` followed by a call to the
+``$forge->addField($fields)`` followed by a call to the
 ``createTable()`` method.
 
 **$forge->addField()**

From 5876539b3b6dea4c69c07328da5b3fc2d0410cd0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 26 Dec 2021 07:00:56 +0900
Subject: [PATCH 1038/2325] docs: change lowercase to uppercase

---
 user_guide_src/source/dbmgmt/forge.rst | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index c74fada3551d..2dedbc9af2dc 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -13,7 +13,7 @@ Initializing the Forge Class
 ****************************
 
 .. important:: In order to initialize the Forge class, your database
-    driver must already be running, since the forge class relies on it.
+    driver must already be running, since the Forge class relies on it.
 
 Load the Forge Class as follows::
 
@@ -91,7 +91,7 @@ There are several things you may wish to do when creating tables. Add
 fields, add keys to the table, alter columns. CodeIgniter provides a
 mechanism for this.
 
-Adding fields
+Adding Fields
 =============
 
 Fields are normally created via an associative array. Within the array, you must
@@ -243,7 +243,7 @@ You can specify the desired action for the "on delete" and "on update" propertie
     $forge->addForeignKey(['users_id', 'users_name'], 'users', ['id', 'name'], 'CASCADE', 'CASCADE');
     // gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`, `users_name`) REFERENCES `users`(`id`, `name`) ON DELETE CASCADE ON UPDATE CASCADE
 
-Creating a table
+Creating a Table
 ================
 
 After fields and keys have been declared, you can create a new table
@@ -272,7 +272,7 @@ You could also pass optional table attributes, such as MySQL's ``ENGINE``::
     ``createTable()`` will always add them with your configured *charset*
     and *DBCollat* values, as long as they are not empty (MySQL only).
 
-Dropping a table
+Dropping a Table
 ================
 
 Execute a ``DROP TABLE`` statement and optionally add an ``IF EXISTS`` clause.
@@ -314,7 +314,7 @@ Execute a DROP KEY.
     // Produces: DROP INDEX `users_index` ON `tablename`
     $forge->dropKey('tablename', 'users_index');
 
-Renaming a table
+Renaming a Table
 ================
 
 Executes a TABLE rename
@@ -419,7 +419,7 @@ Class Reference
         :returns:    \CodeIgniter\Database\Forge instance (method chaining)
         :rtype:    \CodeIgniter\Database\Forge
 
-                Adds a field to the set that will be used to create a table. Usage:  See `Adding fields`_.
+                Adds a field to the set that will be used to create a table. Usage:  See `Adding Fields`_.
 
     .. php:method:: addForeignKey($fieldName, $tableName, $tableField[, $onUpdate = '', $onDelete = ''])
 
@@ -476,7 +476,7 @@ Class Reference
         :returns:  Query object on success, false on failure
         :rtype:    mixed
 
-        Creates a new table. Usage:  See `Creating a table`_.
+        Creates a new table. Usage:  See `Creating a Table`_.
 
     .. php:method:: dropColumn($table, $column_name)
 
@@ -502,7 +502,7 @@ Class Reference
         :returns:    true on success, false on failure
         :rtype:    bool
 
-        Drops a table. Usage:  See `Dropping a table`_.
+        Drops a table. Usage:  See `Dropping a Table`_.
 
     .. php:method:: modifyColumn($table, $field)
 
@@ -520,4 +520,4 @@ Class Reference
         :returns:  Query object on success, false on failure
         :rtype:    mixed
 
-        Renames a table. Usage:  See `Renaming a table`_.
+        Renames a table. Usage:  See `Renaming a Table`_.

From 3a03e452a944429df0ee85f7ad95e3274e357bc1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 27 Dec 2021 09:50:10 +0900
Subject: [PATCH 1039/2325] chore: add third party license files

---
 system/ComposerScripts.php           | 19 +++++++++++++------
 system/ThirdParty/Escaper/LICENSE.md | 26 ++++++++++++++++++++++++++
 system/ThirdParty/Kint/LICENSE       | 20 ++++++++++++++++++++
 system/ThirdParty/PSR/Log/LICENSE    | 19 +++++++++++++++++++
 4 files changed, 78 insertions(+), 6 deletions(-)
 create mode 100644 system/ThirdParty/Escaper/LICENSE.md
 create mode 100644 system/ThirdParty/Kint/LICENSE
 create mode 100644 system/ThirdParty/PSR/Log/LICENSE

diff --git a/system/ComposerScripts.php b/system/ComposerScripts.php
index 6972395b5444..ef4dfe1a801b 100644
--- a/system/ComposerScripts.php
+++ b/system/ComposerScripts.php
@@ -43,20 +43,23 @@ final class ComposerScripts
      */
     private static $dependencies = [
         'kint-src' => [
-            'from' => __DIR__ . '/../vendor/kint-php/kint/src/',
-            'to'   => __DIR__ . '/ThirdParty/Kint/',
+            'license' => __DIR__ . '/../vendor/kint-php/kint/LICENSE',
+            'from'    => __DIR__ . '/../vendor/kint-php/kint/src/',
+            'to'      => __DIR__ . '/ThirdParty/Kint/',
         ],
         'kint-resources' => [
             'from' => __DIR__ . '/../vendor/kint-php/kint/resources/',
             'to'   => __DIR__ . '/ThirdParty/Kint/resources/',
         ],
         'escaper' => [
-            'from' => __DIR__ . '/../vendor/laminas/laminas-escaper/src/',
-            'to'   => __DIR__ . '/ThirdParty/Escaper/',
+            'license' => __DIR__ . '/../vendor/laminas/laminas-escaper/LICENSE.md',
+            'from'    => __DIR__ . '/../vendor/laminas/laminas-escaper/src/',
+            'to'      => __DIR__ . '/ThirdParty/Escaper/',
         ],
         'psr-log' => [
-            'from' => __DIR__ . '/../vendor/psr/log/Psr/Log/',
-            'to'   => __DIR__ . '/ThirdParty/PSR/Log/',
+            'license' => __DIR__ . '/../vendor/psr/log/LICENSE',
+            'from'    => __DIR__ . '/../vendor/psr/log/Psr/Log/',
+            'to'      => __DIR__ . '/ThirdParty/PSR/Log/',
         ],
     ];
 
@@ -70,6 +73,10 @@ public static function postUpdate()
 
         foreach (self::$dependencies as $dependency) {
             self::recursiveMirror($dependency['from'], $dependency['to']);
+            if (isset($dependency['license'])) {
+                $license = basename($dependency['license']);
+                copy($dependency['license'], $dependency['to'] . '/' . $license);
+            }
         }
 
         self::copyKintInitFiles();
diff --git a/system/ThirdParty/Escaper/LICENSE.md b/system/ThirdParty/Escaper/LICENSE.md
new file mode 100644
index 000000000000..10b40f1423b5
--- /dev/null
+++ b/system/ThirdParty/Escaper/LICENSE.md
@@ -0,0 +1,26 @@
+Copyright (c) 2020 Laminas Project a Series of LF Projects, LLC.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+- Neither the name of Laminas Foundation nor the names of its contributors may
+  be used to endorse or promote products derived from this software without
+  specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/system/ThirdParty/Kint/LICENSE b/system/ThirdParty/Kint/LICENSE
new file mode 100644
index 000000000000..01718d4953c4
--- /dev/null
+++ b/system/ThirdParty/Kint/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Jonathan Vollebregt (jnvsor@gmail.com), Rokas Šleinius (raveren@gmail.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/system/ThirdParty/PSR/Log/LICENSE b/system/ThirdParty/PSR/Log/LICENSE
new file mode 100644
index 000000000000..474c952b4b50
--- /dev/null
+++ b/system/ThirdParty/PSR/Log/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2012 PHP Framework Interoperability Group
+
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

From 9c379088e8afa6cbfa470cbda79359f800ab5b24 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 27 Dec 2021 11:37:44 +0900
Subject: [PATCH 1040/2325] test: add tests for Kint with CSP

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

diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index c6f1d6b9b2e1..b7f4f381c233 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -29,6 +29,7 @@
 use Config\Logger;
 use Config\Modules;
 use InvalidArgumentException;
+use Kint;
 use stdClass;
 use Tests\Support\Models\JobModel;
 
@@ -482,4 +483,37 @@ public function testIsCli()
         $this->assertIsBool(is_cli());
         $this->assertTrue(is_cli());
     }
+
+    public function testDWithCSP()
+    {
+        /** @var App $config */
+        $config       = config(App::class);
+        $CSPEnabled   = $config->CSPEnabled;
+        $cliDetection = Kint::$cli_detection;
+
+        $config->CSPEnabled  = true;
+        Kint::$cli_detection = false;
+
+        $this->expectOutputRegex('/<script {csp-script-nonce} class="kint-rich-script">/u');
+        d('string');
+
+        // Restore settings
+        $config->CSPEnabled  = $CSPEnabled;
+        Kint::$cli_detection = $cliDetection;
+    }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testTraceWithCSP()
+    {
+        /** @var App $config */
+        $config              = config(App::class);
+        $config->CSPEnabled  = true;
+        Kint::$cli_detection = false;
+
+        $this->expectOutputRegex('/<style {csp-style-nonce} class="kint-rich-style">/u');
+        trace();
+    }
 }

From 23e5d66feb4010c3575395a5b4faafc5ccf91324 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 28 Dec 2021 10:26:00 +0900
Subject: [PATCH 1041/2325] docs: file field name

Make the same as Upload Library sample
---
 user_guide_src/source/incoming/incomingrequest.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index 63a4aa5266df..b256b0b35c1d 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -293,8 +293,8 @@ and uses best practices to minimize any security risks.
     $files = $request->getFiles();
 
     // Grab the file by name given in HTML form
-    if ($files->hasFile('uploadedFile')) {
-        $file = $files->getFile('uploadedfile');
+    if ($files->hasFile('userfile')) {
+        $file = $files->getFile('userfile');
 
         // Generate a new secure name
         $name = $file->getRandomName();
@@ -309,12 +309,12 @@ and uses best practices to minimize any security risks.
 
 You can retrieve a single file uploaded on its own, based on the filename given in the HTML file input::
 
-    $file = $request->getFile('uploadedfile');
+    $file = $request->getFile('userfile');
 
 You can retrieve an array of same-named files uploaded as part of a
 multi-file upload, based on the filename given in the HTML file input::
 
-    $files = $request->getFileMultiple('uploadedfile');
+    $files = $request->getFileMultiple('userfile');
 
 Content Negotiation
 -------------------

From 19da2d3b3ba4509d18f95668c277b4159f942cb4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 28 Dec 2021 10:28:12 +0900
Subject: [PATCH 1042/2325] docs: fix headings level

---
 user_guide_src/source/libraries/uploaded_files.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index 615716ea0273..8ad4cb586491 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -231,7 +231,7 @@ Single File
 If you just need to access a single file, you can use ``getFile()`` to retrieve the file instance directly. This will return an instance of ``CodeIgniter\HTTP\Files\UploadedFile``:
 
 Simplest usage
-^^^^^^^^^^^^^^
+--------------
 
 With the simplest usage, a single file might be submitted like::
 
@@ -242,7 +242,7 @@ Which would return a simple file instance like::
     $file = $this->request->getFile('userfile');
 
 Array notation
-^^^^^^^^^^^^^^
+--------------
 
 If you used an array notation for the name, the input would look something like::
 
@@ -253,7 +253,8 @@ For get the file instance::
     $file = $this->request->getFile('my-form.details.avatar');
 
 Multiple files
-^^^^^^^^^^^^^^
+==============
+
 ::
 
     <input type="file" name="images[]" multiple />

From 34afa293dc5ddc724372ceedf7fbb1da8af06511 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 28 Dec 2021 10:29:16 +0900
Subject: [PATCH 1043/2325] docs: add note about UploadedFile instance when no
 file was uploaded

---
 user_guide_src/source/incoming/incomingrequest.rst | 2 ++
 user_guide_src/source/libraries/uploaded_files.rst | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index b256b0b35c1d..fe6c26909aed 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -316,6 +316,8 @@ multi-file upload, based on the filename given in the HTML file input::
 
     $files = $request->getFileMultiple('userfile');
 
+.. note:: The files here correspond to ``$_FILES``. Even if a user just clicks submit button of a form and does not upload any file, the file will still exist. You can check that the file was actually uploaded by the ``isValid()`` method in UploadedFile. See :ref:`verify-a-file` for more details.
+
 Content Negotiation
 -------------------
 
diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index 8ad4cb586491..7d55a14f0941 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -194,6 +194,8 @@ Which would return a simple array like::
         'avatar' => // UploadedFile instance
     ]
 
+.. note:: The UploadedFile instance corresponds to ``$_FILES``. Even if a user just clicks the submit button and does not upload any file, the instance will still exist. You can check that the file was actually uploaded by the ``isValid()`` method in UploadedFile. See :ref:`verify-a-file`.
+
 If you used an array notation for the name, the input would look something like::
 
     <input type="file" name="my-form[details][avatar]" />
@@ -302,7 +304,9 @@ Working With the File
 Once you've retrieved the UploadedFile instance, you can retrieve information about the file in safe ways, as well as
 move the file to a new location.
 
-Verify A File
+.. _verify-a-file:
+
+Verify a File
 =============
 
 You can check that a file was actually uploaded via HTTP with no errors by calling the ``isValid()`` method::

From 9b0549c3045a8ebcedc7a52b7047a4e217f28cf1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 28 Dec 2021 10:30:38 +0900
Subject: [PATCH 1044/2325] docs: change text decoration

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

diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index 7d55a14f0941..1ec38f0c6528 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -272,7 +272,7 @@ In controller::
         }
     }
 
-where the **images** is a loop from the form field name
+where the ``images`` is a loop from the form field name.
 
 If there are multiple files with the same name you can use ``getFile()`` to retrieve every file individually::
 In controller::

From d65411409ee46cc3e9cfb6170bd2c5219fcf8534 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 28 Dec 2021 10:31:13 +0900
Subject: [PATCH 1045/2325] docs: add line break

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

diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index 1ec38f0c6528..c38620935060 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -274,7 +274,8 @@ In controller::
 
 where the ``images`` is a loop from the form field name.
 
-If there are multiple files with the same name you can use ``getFile()`` to retrieve every file individually::
+If there are multiple files with the same name you can use ``getFile()`` to retrieve every file individually.
+
 In controller::
 
     $file1 = $this->request->getFile('images.0');

From ce2ae5462c06b49bec229477eb76405353d205e9 Mon Sep 17 00:00:00 2001
From: ytetsuro <phper.0o0@gmail.com>
Date: Wed, 29 Dec 2021 14:45:58 +0900
Subject: [PATCH 1046/2325] style: remove semicolon for OCI8.

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

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index d07675401df8..406f75b47030 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -135,7 +135,7 @@ class Forge
      *
      * @var false|string
      */
-    protected $renameTableStr = 'ALTER TABLE %s RENAME TO %s;';
+    protected $renameTableStr = 'ALTER TABLE %s RENAME TO %s';
 
     /**
      * UNSIGNED support
@@ -1042,14 +1042,14 @@ protected function _processIndexes(string $table)
             if (in_array($i, $this->uniqueKeys, true)) {
                 $sqls[] = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table)
                     . ' ADD CONSTRAINT ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
-                    . ' UNIQUE (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
+                    . ' UNIQUE (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ')';
 
                 continue;
             }
 
             $sqls[] = 'CREATE INDEX ' . $this->db->escapeIdentifiers($table . '_' . implode('_', $this->keys[$i]))
                 . ' ON ' . $this->db->escapeIdentifiers($table)
-                . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ');';
+                . ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ')';
         }
 
         return $sqls;

From 05a6ce9e324c521acde537849ec32824756faa62 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Jan 2022 00:39:00 +0800
Subject: [PATCH 1047/2325] chore(deps-dev): update rector/rector requirement
 from 0.12.9 to 0.12.10 (#5518)

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.12.9...0.12.10)

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

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 984520972a46..6799259fdf62 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.9"
+        "rector/rector": "0.12.10"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From 74da6d5dfe74a8d2cf941993b676cc628103d223 Mon Sep 17 00:00:00 2001
From: Toto Prayogo <mail@totoprayogo.com>
Date: Sat, 1 Jan 2022 12:02:12 +0700
Subject: [PATCH 1048/2325] :tada: New Year 2022 :tada:

---
 LICENSE                           | 2 +-
 user_guide_src/source/conf.py     | 4 ++--
 user_guide_src/source/license.rst | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/LICENSE b/LICENSE
index daac9e5bb4f5..31425034e8e9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2014-2019 British Columbia Institute of Technology
-Copyright (c) 2019-2021 CodeIgniter Foundation
+Copyright (c) 2019-2022 CodeIgniter Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 16195c089833..dd58db63f9ce 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -18,7 +18,7 @@
 
 project = 'CodeIgniter'
 author = 'CodeIgniter Foundation'
-copyright = '2019-2021 CodeIgniter Foundation'
+copyright = '2019-2022 CodeIgniter Foundation'
 
 # The short X.Y version.
 version = '4.1'
@@ -137,4 +137,4 @@
 epub_title = 'CodeIgniter4'
 epub_author = 'CodeIgniter Foundation'
 epub_publisher = 'CodeIgniter Foundation'
-epub_copyright = '2019-2021 CodeIgniter Foundation'
+epub_copyright = '2019-2022 CodeIgniter Foundation'
diff --git a/user_guide_src/source/license.rst b/user_guide_src/source/license.rst
index 13deeceb4094..40505f1b73ba 100644
--- a/user_guide_src/source/license.rst
+++ b/user_guide_src/source/license.rst
@@ -2,8 +2,8 @@
 The MIT License (MIT)
 #####################
 
-| Copyright (c) 2014-2019 British Columbia Institute of Technology 
-| Copyright (c) 2019-2021 CodeIgniter Foundation
+| Copyright (c) 2014-2019 British Columbia Institute of Technology
+| Copyright (c) 2019-2022 CodeIgniter Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From 889c0eccfc082722a5b0fb06a17712b458eeee1f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 1 Jan 2022 17:30:58 +0900
Subject: [PATCH 1049/2325] chore: make the URL of the support forum more
 specific

---
 .github/ISSUE_TEMPLATE/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 69bb11b44fe8..9bec3b2d3431 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: CodeIgniter Forum
-    url: https://forum.codeigniter.com
+    url: https://forum.codeigniter.com/forum-30.html
     about: Please ask your support questions in the forums. Thanks!
 
   - name: CodeIgniter Slack channel

From 2da2085b811ec9ab9ae44a2f879f46e2c3cfffbc Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sun, 2 Jan 2022 04:13:58 +0700
Subject: [PATCH 1050/2325] [Rector] Apply Option::PARALLEL to speed up analyze

---
 rector.php                                           | 3 +++
 tests/system/Commands/BaseCommandTest.php            | 4 ++--
 tests/system/Files/FileCollectionTest.php            | 4 ++--
 tests/system/Publisher/PublisherInputTest.php        | 3 ++-
 tests/system/Publisher/PublisherOutputTest.php       | 3 ++-
 tests/system/Publisher/PublisherRestrictionsTest.php | 3 ++-
 tests/system/Publisher/PublisherSupportTest.php      | 3 ++-
 7 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/rector.php b/rector.php
index 68d16bbb66e4..21f63c0eca1b 100644
--- a/rector.php
+++ b/rector.php
@@ -43,6 +43,7 @@
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
+use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
@@ -59,6 +60,7 @@
 
     $parameters = $containerConfigurator->parameters();
 
+    $parameters->set(Option::PARALLEL, true);
     // paths to refactor; solid alternative to CLI arguments
     $parameters->set(Option::PATHS, [__DIR__ . '/app', __DIR__ . '/system', __DIR__ . '/tests', __DIR__ . '/utils/Rector']);
 
@@ -145,4 +147,5 @@
     $services->set(FuncGetArgsToVariadicParamRector::class);
     $services->set(MakeInheritedMethodVisibilitySameAsParentRector::class);
     $services->set(SimplifyEmptyArrayCheckRector::class);
+    $services->set(NormalizeNamespaceByPSR4ComposerAutoloadRector::class);
 };
diff --git a/tests/system/Commands/BaseCommandTest.php b/tests/system/Commands/BaseCommandTest.php
index 7295c05e4d0c..5f9764208042 100644
--- a/tests/system/Commands/BaseCommandTest.php
+++ b/tests/system/Commands/BaseCommandTest.php
@@ -35,14 +35,14 @@ public function testMagicIssetTrue()
     {
         $command = new AppInfo($this->logger, service('commands'));
 
-        $this->assertTrue(isset($command->group));
+        $this->assertObjectHasAttribute('group', $command);
     }
 
     public function testMagicIssetFalse()
     {
         $command = new AppInfo($this->logger, service('commands'));
 
-        $this->assertFalse(isset($command->foobar));
+        $this->assertObjectNotHasAttribute('foobar', $command);
     }
 
     public function testMagicGet()
diff --git a/tests/system/Files/FileCollectionTest.php b/tests/system/Files/FileCollectionTest.php
index 5621151842e2..ec30f289100e 100644
--- a/tests/system/Files/FileCollectionTest.php
+++ b/tests/system/Files/FileCollectionTest.php
@@ -9,9 +9,9 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+namespace CodeIgniter\Files;
+
 use CodeIgniter\Files\Exceptions\FileException;
-use CodeIgniter\Files\File;
-use CodeIgniter\Files\FileCollection;
 use CodeIgniter\Test\CIUnitTestCase;
 
 /**
diff --git a/tests/system/Publisher/PublisherInputTest.php b/tests/system/Publisher/PublisherInputTest.php
index a6f6b8eec582..8e6d0a4368f1 100644
--- a/tests/system/Publisher/PublisherInputTest.php
+++ b/tests/system/Publisher/PublisherInputTest.php
@@ -9,7 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use CodeIgniter\Publisher\Publisher;
+namespace CodeIgniter\Publisher;
+
 use CodeIgniter\Test\CIUnitTestCase;
 
 /**
diff --git a/tests/system/Publisher/PublisherOutputTest.php b/tests/system/Publisher/PublisherOutputTest.php
index 512e051f7663..f43fdf64971b 100644
--- a/tests/system/Publisher/PublisherOutputTest.php
+++ b/tests/system/Publisher/PublisherOutputTest.php
@@ -9,7 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use CodeIgniter\Publisher\Publisher;
+namespace CodeIgniter\Publisher;
+
 use CodeIgniter\Test\CIUnitTestCase;
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamDirectory;
diff --git a/tests/system/Publisher/PublisherRestrictionsTest.php b/tests/system/Publisher/PublisherRestrictionsTest.php
index 692e49d7680b..a3750f1427ad 100644
--- a/tests/system/Publisher/PublisherRestrictionsTest.php
+++ b/tests/system/Publisher/PublisherRestrictionsTest.php
@@ -9,8 +9,9 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+namespace CodeIgniter\Publisher;
+
 use CodeIgniter\Publisher\Exceptions\PublisherException;
-use CodeIgniter\Publisher\Publisher;
 use CodeIgniter\Test\CIUnitTestCase;
 
 /**
diff --git a/tests/system/Publisher/PublisherSupportTest.php b/tests/system/Publisher/PublisherSupportTest.php
index de1fb29fbd93..2f14a49c4dd2 100644
--- a/tests/system/Publisher/PublisherSupportTest.php
+++ b/tests/system/Publisher/PublisherSupportTest.php
@@ -9,8 +9,9 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+namespace CodeIgniter\Publisher;
+
 use CodeIgniter\Publisher\Exceptions\PublisherException;
-use CodeIgniter\Publisher\Publisher;
 use CodeIgniter\Test\CIUnitTestCase;
 use Tests\Support\Publishers\TestPublisher;
 

From 979b2f16d148784091657a39e710ac311afddb6f Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 4 Jan 2022 02:18:37 +0800
Subject: [PATCH 1051/2325] Update modified Kint files in `ThirdParty`

---
 .../ThirdParty/Kint/Renderer/CliRenderer.php  | 29 +++++++++++++++++--
 .../ThirdParty/Kint/Renderer/RichRenderer.php | 15 ++++++++--
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/system/ThirdParty/Kint/Renderer/CliRenderer.php b/system/ThirdParty/Kint/Renderer/CliRenderer.php
index f86671ff1cf3..12b18d036b62 100644
--- a/system/ThirdParty/Kint/Renderer/CliRenderer.php
+++ b/system/ThirdParty/Kint/Renderer/CliRenderer.php
@@ -59,6 +59,15 @@ class CliRenderer extends TextRenderer
      */
     public static $min_terminal_width = 40;
 
+    /**
+     * Which stream to check for VT100 support on windows.
+     *
+     * null uses STDOUT if it's defined
+     *
+     * @var null|resource
+     */
+    public static $windows_stream = null;
+
     protected static $terminal_width = null;
 
     protected $windows_output = false;
@@ -69,8 +78,22 @@ public function __construct()
     {
         parent::__construct();
 
-        if (!self::$force_utf8) {
-            $this->windows_output = KINT_WIN;
+        if (!self::$force_utf8 && KINT_WIN) {
+            if (!KINT_PHP72) {
+                $this->windows_output = true;
+            } else {
+                $stream = self::$windows_stream;
+
+                if (!$stream && \defined('STDOUT')) {
+                    $stream = STDOUT;
+                }
+
+                if (!$stream) {
+                    $this->windows_output = true;
+                } else {
+                    $this->windows_output = !\sapi_windows_vt100_support($stream);
+                }
+            }
         }
 
         if (!self::$terminal_width) {
@@ -153,7 +176,7 @@ protected function utf8ToWindows($string)
     {
         return \str_replace(
             ['┌', '═', '┐', '│', '└', '─', '┘'],
-            ["\xda", "\xdc", "\xbf", "\xb3", "\xc0", "\xc4", "\xd9"],
+            [' ', '=', ' ', '|', ' ', '-', ' '],
             $string
         );
     }
diff --git a/system/ThirdParty/Kint/Renderer/RichRenderer.php b/system/ThirdParty/Kint/Renderer/RichRenderer.php
index 94b7f98ab71f..46a8827ded56 100644
--- a/system/ThirdParty/Kint/Renderer/RichRenderer.php
+++ b/system/ThirdParty/Kint/Renderer/RichRenderer.php
@@ -133,6 +133,9 @@ class RichRenderer extends Renderer
 
     public static $always_pre_render = false;
 
+    public static $js_nonce = null;
+    public static $css_nonce = null;
+
     protected $plugin_objs = [];
     protected $expand = false;
     protected $force_pre_render = false;
@@ -389,10 +392,18 @@ public function preRender()
 
                 switch ($type) {
                     case 'script':
-                        $output .= '<script class="kint-rich-script">'.$contents.'</script>';
+                        $output .= '<script class="kint-rich-script"';
+                        if (null !== self::$js_nonce) {
+                            $output .= ' nonce="'.\htmlspecialchars(self::$js_nonce).'"';
+                        }
+                        $output .= '>'.$contents.'</script>';
                         break;
                     case 'style':
-                        $output .= '<style class="kint-rich-style">'.$contents.'</style>';
+                        $output .= '<style class="kint-rich-style"';
+                        if (null !== self::$css_nonce) {
+                            $output .= ' nonce="'.\htmlspecialchars(self::$css_nonce).'"';
+                        }
+                        $output .= '>'.$contents.'</style>';
                         break;
                     default:
                         $output .= $contents;

From c487715222312a79f83b1f0868e34b0871ae1c85 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 4 Jan 2022 02:21:57 +0800
Subject: [PATCH 1052/2325] Revert workaround for php-coveralls

---
 .github/workflows/test-phpunit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 61133437d3e8..4583244ed358 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -137,7 +137,7 @@ jobs:
       - name: Run Coveralls
         if: github.repository_owner == 'codeigniter4' && matrix.php-versions == '8.0'
         run: |
-          composer global require --ansi php-coveralls/php-coveralls:^2.4 symfony/console:^5
+          composer global require --ansi php-coveralls/php-coveralls:^2.4
           php-coveralls --coverage_clover=build/logs/clover.xml -v
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From fb31518f40fff254b96279fe74e587bf35ae57e4 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 4 Jan 2022 02:23:35 +0800
Subject: [PATCH 1053/2325] Remove experimental flag for PHP 8.1

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

diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 61133437d3e8..6ca73f48a29c 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -36,9 +36,6 @@ jobs:
           - php-versions: '7.4'
             db-platforms: MySQLi
             mysql-versions: '8.0'
-          # @todo remove once 8.1 is stable enough
-          - php-versions: '8.1'
-            composer-flag: '--ignore-platform-req=php'
 
     services:
       mysql:
@@ -119,8 +116,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer update --ansi --no-interaction ${{ matrix.composer-flag }}
-          composer remove --ansi --dev --unused -W ${{ matrix.composer-flag }} -- rector/rector phpstan/phpstan friendsofphp/php-cs-fixer nexusphp/cs-config codeigniter/coding-standard
+          composer update --ansi --no-interaction
+          composer remove --ansi --dev --unused -W -- rector/rector phpstan/phpstan friendsofphp/php-cs-fixer nexusphp/cs-config codeigniter/coding-standard
         env:
           COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
 

From 591e6d435d4443e709ea6a92c9e2ee5863913af8 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Fri, 24 Dec 2021 20:19:14 +0000
Subject: [PATCH 1054/2325] Prep for 4.1.6 release

---
 CHANGELOG.md                                  | 60 +++++++++++++++++++
 admin/RELEASE.md                              | 19 +++---
 system/CodeIgniter.php                        |  2 +-
 user_guide_src/source/changelogs/v4.1.6.rst   |  2 +-
 user_guide_src/source/conf.py                 |  2 +-
 .../source/installation/upgrade_416.rst       | 11 +++-
 6 files changed, 81 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d2a65357cab..51523268e404 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,65 @@
 # Changelog
 
+## [v4.1.6](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.6) (2021-12-24)
+
+[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.5...v4.1.6)
+
+**Breaking Changes**
+
+* fix: Incorrect type `BaseBuilder::$tableName` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5378
+* fix: Validation cannot handle array item by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5405
+
+**Fixed Bugs**
+
+* fix: FileLocator cannot find files in sub-namespaces of the same vendor by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5292
+* fix: add a workaround for upgraded users who do not update Config\Exceptions by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5314
+* Fix db escape negative integers by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5277
+* Fix: remove incorrect processing of CLI params by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5274
+* fix: table alias is prefixed when LIKE clause by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5361
+* fix: `dot_array_search()` unexpected array structure causes Type Error by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5372
+* fix: UploadedFile::move() may return incorrect value by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5302
+* fix: BaseModel::insert() may not pass all the values from Entity by @katie1348 in https://github.com/codeigniter4/CodeIgniter4/pull/4980
+* fix: `IncomingRequest::getJsonVar()` may cause TypeError by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5392
+* chore: fix example test code for appstarter and module by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5421
+* fix: Model::save() may call unneeded countAllResults() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5439
+* fix: errors when MariaDB/MySQL has `ANSI_QUOTES` enabled by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5425
+* fix: Security class sends cookies immediately by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5429
+* fix: `is_cli()` returns `true` when `$_SERVER['HTTP_USER_AGENT']` is missing by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5393
+* fix: `MySQLi\Connection::_foreignKeyData()` may return duplicated rows by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5416
+* fix: `number_to_currency()` error on PHP 8.1 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5454
+* fix: VENDORPATH definition by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5453
+* fix: Throttler does not show correct token time by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5470
+* fix: directory_mirror() throws an error if destination directory exists by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5493
+
+**New Features**
+
+* feat: add filter to check invalid chars in user input by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5227
+
+**Enhancements**
+
+* Toolbar - Make it possible to turn off var data collection by @najdanovicivan in https://github.com/codeigniter4/CodeIgniter4/pull/5295
+* feat: add CSRF token randomization by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5283
+* Display file:line and trace information to database queries in debug toolbar by @lonnieezell in https://github.com/codeigniter4/CodeIgniter4/pull/5334
+* feat: add SecureHeaders filter by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5419
+* Feature: BaseBuilder instance as subquery. by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/5488
+
+**Refactoring**
+
+* Do not inappropriately register bind when the value is a closure by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5247
+* refactor: replace $request->uri with $request->getUri() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5346
+* Determine if binds are simple or named by looking at the $binds array by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5138
+* Remove unneeded cast to array by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5379
+* Additional fix for deprecated `null` usage by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5388
+* refactor: dot_array_search() regex by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5443
+* refactor: Time::getDst() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5415
+* The View class. Optimizing duplicate code. by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/5455
+* refactor: fix `ThrottleTest::testFlooding` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5463
+* refactor: update deprecated method in DatetimeCast by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5474
+
+**New Contributors**
+
+* @katie1348 made their first contribution in https://github.com/codeigniter4/CodeIgniter4/pull/4980
+
 ## [v4.1.5](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.5) (2021-11-08)
 
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.4...v4.1.5)
diff --git a/admin/RELEASE.md b/admin/RELEASE.md
index 932ce34ec018..eb4e621e1e40 100644
--- a/admin/RELEASE.md
+++ b/admin/RELEASE.md
@@ -1,31 +1,30 @@
 # Release Process
 
 > Documentation guide based on the releases of `4.0.5` and `4.1.0` on January 31, 2021.
-> Updated for `4.1.2` on May 17, 2021.
+>
+> Updated for `4.1.6` on December 24, 2021.
+>
 > -MGatner
 
-## Labeling PRs
+## Changelog
 
-To auto-generate changelog, each PR to be listed in changelog must have one of the following [labels](https://github.com/codeigniter4/CodeIgniter4/labels):
+When generating the changelog each Pull Request to be included must have one of the following [labels](https://github.com/codeigniter4/CodeIgniter4/labels):
 - **bug** ... PRs that fix bugs
 - **enhancement** ... PRs to improve existing functionalities
 - **new feature** ... PRs for new features
 - **refactor** ... PRs to refactor
 
-And PRs that have the breaking changes must have the following label:
+PRs with breaking changes must have the following additional label:
 - **breaking change** ... PRs that may break existing functionalities
 
+To auto-generate, start drafting a new Release and use the "Auto-generate release notes" button.
+Copy the resulting content into **CHANGELOG.md** and adjust the format to match the existing content.
+
 ## Preparation
 
 * Work off direct clones of the repos so the release branches persist for a time
 * Clone both **codeigniter4/CodeIgniter4** and **codeigniter4/userguide** and resolve any necessary PRs
 * Vet the **admin/** folders for any removed hidden files (Action deploy scripts *do not remove these*)
-* Generate a new **CHANGELOG.md** ahead of time using [GitHub Changelog Generator](https://github.com/github-changelog-generator/github-changelog-generator):
-```
-github_changelog_generator --user codeigniter4 --project codeigniter4 --since-tag v4.0.4 --future-release v4.0.5 --token {your_github_token}
-...or
-github_changelog_generator --user codeigniter4 --project codeigniter4 --since-commit "2021-02-01 13:26:28" --future-release v4.0.5 --token {your_github_token}
-```
 
 ## CodeIgniter4
 
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 56cb0df4b7bd..bcce77f1f853 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -45,7 +45,7 @@ class CodeIgniter
     /**
      * The current version of CodeIgniter Framework
      */
-    public const CI_VERSION = '4.1.5';
+    public const CI_VERSION = '4.1.6';
 
     private const MIN_PHP_VERSION = '7.3';
 
diff --git a/user_guide_src/source/changelogs/v4.1.6.rst b/user_guide_src/source/changelogs/v4.1.6.rst
index cdbb08cb8e97..74eb2ae5f9bd 100644
--- a/user_guide_src/source/changelogs/v4.1.6.rst
+++ b/user_guide_src/source/changelogs/v4.1.6.rst
@@ -1,7 +1,7 @@
 Version 4.1.6
 #############
 
-Release Date: Not released
+Release Date: December 24, 2021
 
 **4.1.6 release of CodeIgniter4**
 
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index dd58db63f9ce..0d5246a4aaaa 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -24,7 +24,7 @@
 version = '4.1'
 
 # The full version, including alpha/beta/rc tags.
-release = '4.1.5'
+release = '4.1.6'
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/user_guide_src/source/installation/upgrade_416.rst b/user_guide_src/source/installation/upgrade_416.rst
index a0c1cbd02a1b..9fd585821740 100644
--- a/user_guide_src/source/installation/upgrade_416.rst
+++ b/user_guide_src/source/installation/upgrade_416.rst
@@ -35,7 +35,10 @@ 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:
 
-*
+* ``app/Config/Filters.php``
+* ``app/Config/Mimes.php``
+* ``app/Config/Security.php``
+* ``app/Config/Toolbar.php``
 
 All Changes
 ===========
@@ -43,4 +46,8 @@ 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:
 
-*
+* ``app/Config/Filters.php``
+* ``app/Config/Mimes.php``
+* ``app/Config/Security.php``
+* ``app/Config/Toolbar.php``
+* ``app/Views/errors/html/error_exception.php``

From 54e84b7b05d528da391cc005623f2cd19eee0c48 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Sat, 25 Dec 2021 19:49:11 -0500
Subject: [PATCH 1055/2325] Update CHANGELOG.md

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51523268e404..23f570ed8b04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,6 +37,7 @@
 
 **Enhancements**
 
+* Add support for PHP 8.1 by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/4883
 * Toolbar - Make it possible to turn off var data collection by @najdanovicivan in https://github.com/codeigniter4/CodeIgniter4/pull/5295
 * feat: add CSRF token randomization by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5283
 * Display file:line and trace information to database queries in debug toolbar by @lonnieezell in https://github.com/codeigniter4/CodeIgniter4/pull/5334

From 08ddd86c083f3bf3be7f4ea0c793d02ba47cc01c Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Mon, 3 Jan 2022 23:57:06 +0000
Subject: [PATCH 1056/2325] Refresh release

---
 CHANGELOG.md                                | 4 +++-
 user_guide_src/source/changelogs/v4.1.6.rst | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23f570ed8b04..c2ea5e536da0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [v4.1.6](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.6) (2021-12-24)
+## [v4.1.6](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.6) (2022-01-03)
 
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.5...v4.1.6)
 
@@ -30,6 +30,7 @@
 * fix: VENDORPATH definition by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5453
 * fix: Throttler does not show correct token time by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5470
 * fix: directory_mirror() throws an error if destination directory exists by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5493
+* fix: KINT visual error when activating CSP by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5501
 
 **New Features**
 
@@ -56,6 +57,7 @@
 * The View class. Optimizing duplicate code. by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/5455
 * refactor: fix `ThrottleTest::testFlooding` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5463
 * refactor: update deprecated method in DatetimeCast by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5474
+* Remove semicolons from SQL statements. by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5513
 
 **New Contributors**
 
diff --git a/user_guide_src/source/changelogs/v4.1.6.rst b/user_guide_src/source/changelogs/v4.1.6.rst
index 74eb2ae5f9bd..5068d92a99f3 100644
--- a/user_guide_src/source/changelogs/v4.1.6.rst
+++ b/user_guide_src/source/changelogs/v4.1.6.rst
@@ -1,7 +1,7 @@
 Version 4.1.6
 #############
 
-Release Date: December 24, 2021
+Release Date: January 3, 2022
 
 **4.1.6 release of CodeIgniter4**
 

From 1bdd7f108d9d4bb7d2b27828f4edd34323f45118 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 4 Jan 2022 10:33:59 +0900
Subject: [PATCH 1057/2325] chore: update admin/framework/composer.json Kint

---
 admin/framework/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/framework/composer.json b/admin/framework/composer.json
index 6c02a4b71eb9..25ac1f07ecc3 100644
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@@ -10,7 +10,7 @@
         "ext-intl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "kint-php/kint": "^3.3",
+        "kint-php/kint": "^4.0",
         "laminas/laminas-escaper": "^2.9",
         "psr/log": "^1.1"
     },

From 01442bae17e7d16e9318dda5ebc3eaf4b46a09f1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 4 Jan 2022 10:58:08 +0900
Subject: [PATCH 1058/2325] docs: add Security advisory in CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2ea5e536da0..4d333c153241 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.5...v4.1.6)
 
+**SECURITY**
+
+* *Deserialization of Untrusted Data* found in the ``old()`` function was fixed. See the [Security advisory](https://github.com/codeigniter4/CodeIgniter4/security/advisories/GHSA-w6jr-wj64-mc9x) for more information.
+
 **Breaking Changes**
 
 * fix: Incorrect type `BaseBuilder::$tableName` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5378

From e51a1d9af079893d5deff14a6166c301627b4dc1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 4 Jan 2022 13:56:04 +0900
Subject: [PATCH 1059/2325] fix: number_format(): Passing null to parameter #1
 ($num) of type float is deprecated

Fixes #5535
---
 system/Database/BaseConnection.php           |  4 ++--
 tests/system/Database/BaseConnectionTest.php | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 5f678e5114d7..53e5dad1b351 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -258,14 +258,14 @@ abstract class BaseConnection implements ConnectionInterface
      *
      * @var float
      */
-    protected $connectTime;
+    protected $connectTime = 0.0;
 
     /**
      * How long it took to establish connection.
      *
      * @var float
      */
-    protected $connectDuration;
+    protected $connectDuration = 0.0;
 
     /**
      * If true, no queries will actually be
diff --git a/tests/system/Database/BaseConnectionTest.php b/tests/system/Database/BaseConnectionTest.php
index 7d2352a0e9b2..9bb8ddee1499 100644
--- a/tests/system/Database/BaseConnectionTest.php
+++ b/tests/system/Database/BaseConnectionTest.php
@@ -123,6 +123,16 @@ public function testStoresConnectionTimings()
         $this->assertGreaterThan(0.0, $db->getConnectDuration());
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5535
+     */
+    public function testStoresConnectionTimingsNotConnected()
+    {
+        $db = new MockConnection($this->options);
+
+        $this->assertSame('0.000000', $db->getConnectDuration());
+    }
+
     public function testMagicIssetTrue()
     {
         $db = new MockConnection($this->options);

From 4957fd57537aa50789f6b9b4ab1ce0eb6d4db523 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 4 Jan 2022 14:28:00 +0900
Subject: [PATCH 1060/2325] docs: minor addition to changelogs/v4.1.6.rst and
 upgrade_416.rst

---
 user_guide_src/source/changelogs/v4.1.6.rst        | 2 ++
 user_guide_src/source/installation/upgrade_416.rst | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/user_guide_src/source/changelogs/v4.1.6.rst b/user_guide_src/source/changelogs/v4.1.6.rst
index 5068d92a99f3..6993add513f9 100644
--- a/user_guide_src/source/changelogs/v4.1.6.rst
+++ b/user_guide_src/source/changelogs/v4.1.6.rst
@@ -65,3 +65,5 @@ And the following methods are deprecated:
 
 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_416.rst b/user_guide_src/source/installation/upgrade_416.rst
index 9fd585821740..cd72c3b2c043 100644
--- a/user_guide_src/source/installation/upgrade_416.rst
+++ b/user_guide_src/source/installation/upgrade_416.rst
@@ -17,6 +17,8 @@ Due to a bug fix, the Validation now might change the validation results when yo
 Breaking Enhancements
 *********************
 
+n/a
+
 Project Files
 *************
 

From c71c535190ce4bc10cb7db27de48a85b817d93b7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 4 Jan 2022 16:45:10 +0900
Subject: [PATCH 1061/2325] docs: n/a -> none.

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

diff --git a/user_guide_src/source/installation/upgrade_416.rst b/user_guide_src/source/installation/upgrade_416.rst
index cd72c3b2c043..f81dacf8ec79 100644
--- a/user_guide_src/source/installation/upgrade_416.rst
+++ b/user_guide_src/source/installation/upgrade_416.rst
@@ -17,7 +17,7 @@ Due to a bug fix, the Validation now might change the validation results when yo
 Breaking Enhancements
 *********************
 
-n/a
+none.
 
 Project Files
 *************

From 3147214df680af5b4c8bd3d402350d9f3a965289 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 5 Jan 2022 09:19:18 +0900
Subject: [PATCH 1062/2325] docs: improve upgrade instructions

---
 .../source/installation/installing_composer.rst      |  8 ++++++--
 .../source/installation/installing_manual.rst        |  6 ++++--
 user_guide_src/source/installation/upgrade_416.rst   | 12 +++++++++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst
index ac1be8c5e12c..2240c4195093 100644
--- a/user_guide_src/source/installation/installing_composer.rst
+++ b/user_guide_src/source/installation/installing_composer.rst
@@ -50,6 +50,8 @@ A sample such installation command, using the default project-root "appstarter":
 
 After installation you should follow the steps in the "Upgrading" section.
 
+.. _app-starter-upgrading:
+
 Upgrading
 ---------
 
@@ -68,7 +70,7 @@ If ``--prefer-source`` doesn't automatically update to pull latest framework sou
 If you used the ``--no-dev`` option when you created the project, it
 would be appropriate to do so here too, i.e., ``composer update --no-dev``.
 
-Read the upgrade instructions, and check designated  ``app/Config`` folders for affected changes.
+Read the :doc:`upgrade instructions <upgrading>`, and check designated  ``app/Config`` folders for affected changes.
 
 Pros
 ----
@@ -142,6 +144,8 @@ Copy the ``env``, ``phpunit.xml.dist`` and ``spark`` files, from
 You will have to adjust the system path to refer to the vendor one, e.g., ``ROOTPATH . '/vendor/codeigniter4/framework/system'``,
 - the ``$systemDirectory`` variable in **app/Config/Paths.php**
 
+.. _adding-codeigniter4-upgrading:
+
 Upgrading
 ---------
 
@@ -149,7 +153,7 @@ Whenever there is a new release, then from the command line in your project root
 
     > composer update --prefer-source
 
-Read the upgrade instructions, and check designated
+Read the :doc:`upgrade instructions <upgrading>`, and check designated
 ``app/Config`` folders for affected changes.
 
 Pros
diff --git a/user_guide_src/source/installation/installing_manual.rst b/user_guide_src/source/installation/installing_manual.rst
index daf7ea26c55f..8e0898acc7e2 100644
--- a/user_guide_src/source/installation/installing_manual.rst
+++ b/user_guide_src/source/installation/installing_manual.rst
@@ -27,11 +27,13 @@ Setting Up
 
 None
 
+.. _installing-manual-upgrading:
+
 Upgrading
 ---------
 
-Download a new copy of the framework, and then follow the upgrade
-instructions in the release notice or changelog to merge that with your project.
+Download a new copy of the framework, and then follow the :doc:`upgrade instructions <upgrading>`
+in the release notice or changelog to merge that with your project.
 
 Typically, you replace the ``system`` folder, and check designated
 ``app/Config`` folders for affected changes.
diff --git a/user_guide_src/source/installation/upgrade_416.rst b/user_guide_src/source/installation/upgrade_416.rst
index f81dacf8ec79..36f0d1039b46 100644
--- a/user_guide_src/source/installation/upgrade_416.rst
+++ b/user_guide_src/source/installation/upgrade_416.rst
@@ -2,6 +2,12 @@
 Upgrading from 4.1.5 to 4.1.6
 #############################
 
+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
@@ -22,8 +28,8 @@ none.
 Project Files
 *************
 
-Numerous 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.
+Numerous 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>`_.
 
@@ -45,7 +51,7 @@ and it is recommended that you merge the updated versions with your application:
 All Changes
 ===========
 
-This is a list of all files in the project space that received 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:
 
 * ``app/Config/Filters.php``

From d0b0df4f393cfc1bdb28e9fd4ffdb8f4ed2c4b6d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 5 Jan 2022 09:28:18 +0900
Subject: [PATCH 1063/2325] docs: fix manual installation upgrading instruction

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

diff --git a/user_guide_src/source/installation/installing_manual.rst b/user_guide_src/source/installation/installing_manual.rst
index 8e0898acc7e2..53df51383dc7 100644
--- a/user_guide_src/source/installation/installing_manual.rst
+++ b/user_guide_src/source/installation/installing_manual.rst
@@ -32,10 +32,9 @@ None
 Upgrading
 ---------
 
-Download a new copy of the framework, and then follow the :doc:`upgrade instructions <upgrading>`
-in the release notice or changelog to merge that with your project.
+Download a new copy of the framework, and then replace the ``system`` folder.
 
-Typically, you replace the ``system`` folder, and check designated
+Read the :doc:`upgrade instructions <upgrading>`, and check designated
 ``app/Config`` folders for affected changes.
 
 Pros

From 3f18412373631081e5a1ffe4393e30173bad735a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 5 Jan 2022 09:32:32 +0900
Subject: [PATCH 1064/2325] docs: fix upgrade instructions

---
 user_guide_src/source/installation/installing_composer.rst | 5 ++---
 user_guide_src/source/installation/installing_manual.rst   | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst
index 2240c4195093..7133e2cb80bf 100644
--- a/user_guide_src/source/installation/installing_composer.rst
+++ b/user_guide_src/source/installation/installing_composer.rst
@@ -70,7 +70,7 @@ If ``--prefer-source`` doesn't automatically update to pull latest framework sou
 If you used the ``--no-dev`` option when you created the project, it
 would be appropriate to do so here too, i.e., ``composer update --no-dev``.
 
-Read the :doc:`upgrade instructions <upgrading>`, and check designated  ``app/Config`` folders for affected changes.
+Read the :doc:`upgrade instructions <upgrading>`, and check Breaking Changes and Enhancements.
 
 Pros
 ----
@@ -153,8 +153,7 @@ Whenever there is a new release, then from the command line in your project root
 
     > composer update --prefer-source
 
-Read the :doc:`upgrade instructions <upgrading>`, and check designated
-``app/Config`` folders for affected changes.
+Read the :doc:`upgrade instructions <upgrading>`, and check Breaking Changes and Enhancements.
 
 Pros
 ----
diff --git a/user_guide_src/source/installation/installing_manual.rst b/user_guide_src/source/installation/installing_manual.rst
index 53df51383dc7..ebd231cdb2cf 100644
--- a/user_guide_src/source/installation/installing_manual.rst
+++ b/user_guide_src/source/installation/installing_manual.rst
@@ -34,8 +34,7 @@ Upgrading
 
 Download a new copy of the framework, and then replace the ``system`` folder.
 
-Read the :doc:`upgrade instructions <upgrading>`, and check designated
-``app/Config`` folders for affected changes.
+Read the :doc:`upgrade instructions <upgrading>`, and check Breaking Changes and Enhancements.
 
 Pros
 ----

From 08f3d30aa486c55a39a51b3d0d7762ef768c09ea Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 4 Jan 2022 14:51:10 +0800
Subject: [PATCH 1065/2325] Auto-review required dependency matching

---
 .github/workflows/test-autoreview.yml | 49 +++++++++++++++++++++++++
 .github/workflows/test-phpunit.yml    |  2 +-
 composer.json                         |  1 +
 phpunit.xml.dist                      |  3 ++
 tests/AutoReview/ComposerJsonTest.php | 51 +++++++++++++++++++++++++++
 5 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/test-autoreview.yml
 create mode 100644 tests/AutoReview/ComposerJsonTest.php

diff --git a/.github/workflows/test-autoreview.yml b/.github/workflows/test-autoreview.yml
new file mode 100644
index 000000000000..28f1230b0073
--- /dev/null
+++ b/.github/workflows/test-autoreview.yml
@@ -0,0 +1,49 @@
+name: Automatic Code Review
+
+on:
+  pull_request:
+    paths:
+      - composer.json
+      - spark
+      - '**.php'
+      - .github/workflows/test-autoreview.yml
+  push:
+    paths:
+      - composer.json
+      - spark
+      - '**.php'
+      - .github/workflows/test-autoreview.yml
+
+jobs:
+  auto-review-tests:
+    name: Automatic Code Review
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.0'
+          coverage: none
+
+      - name: Get composer cache directory
+        id: composercache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composercache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Install dependencies
+        run: composer update --ansi
+        env:
+          COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }}
+
+      - name: Run AutoReview Tests
+        run: vendor/bin/phpunit --color=always --group=auto-review --no-coverage
diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 2fb7f6d66dd1..50809c95abda 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -126,7 +126,7 @@ jobs:
         run: echo "TACHYCARDIA_MONITOR_GA=enabled" >> $GITHUB_ENV
 
       - name: Test with PHPUnit
-        run: script -e -c "vendor/bin/phpunit --color=always"
+        run: script -e -c "vendor/bin/phpunit --color=always --exclude-group=auto-review"
         env:
           DB: ${{ matrix.db-platforms }}
           TERM: xterm-256color
diff --git a/composer.json b/composer.json
index 6799259fdf62..ecf61daa3d80 100644
--- a/composer.json
+++ b/composer.json
@@ -50,6 +50,7 @@
     "autoload-dev": {
         "psr-4": {
             "CodeIgniter\\": "tests/system/",
+            "CodeIgniter\\AutoReview\\": "tests/AutoReview/",
             "Utils\\": "utils/"
         }
     },
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index de2f81aae07e..6965a686f8e2 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -36,6 +36,9 @@
     </coverage>
 
     <testsuites>
+        <testsuite name="AutoReview">
+            <directory>./tests/AutoReview</directory>
+        </testsuite>
         <testsuite name="System">
             <directory>./tests/system</directory>
             <exclude>./tests/system/Database</exclude>
diff --git a/tests/AutoReview/ComposerJsonTest.php b/tests/AutoReview/ComposerJsonTest.php
new file mode 100644
index 000000000000..752f9723e0ed
--- /dev/null
+++ b/tests/AutoReview/ComposerJsonTest.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\AutoReview;
+
+use JsonException;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ * @group auto-review
+ */
+final class ComposerJsonTest extends TestCase
+{
+    public function testFrameworkRequireIsTheSameWithDevRequire(): void
+    {
+        $devComposer       = $this->getComposerJson(dirname(__DIR__, 2) . '/composer.json');
+        $frameworkComposer = $this->getComposerJson(dirname(__DIR__, 2) . '/admin/framework/composer.json');
+
+        $this->assertSame(
+            $devComposer['require'],
+            $frameworkComposer['require'],
+            'The framework\'s "require" section is not updated with the main composer.json.'
+        );
+    }
+
+    private function getComposerJson(string $path): array
+    {
+        try {
+            return json_decode((string) file_get_contents($path), true, 512, JSON_THROW_ON_ERROR);
+        } catch (JsonException $e) {
+            $this->fail(sprintf(
+                'The composer.json at "%s" is not readable or does not exist. Error was "%s".',
+                clean_path($path),
+                $e->getMessage()
+            ));
+        }
+    }
+}

From 6ce314b3f73fd133fb852148cb622c6d6851e1c9 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Wed, 5 Jan 2022 11:04:21 +0800
Subject: [PATCH 1066/2325] Modifying a node for selecting items

---
 system/Debug/Toolbar/Views/toolbar.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/system/Debug/Toolbar/Views/toolbar.js b/system/Debug/Toolbar/Views/toolbar.js
index b6883d4b9f3b..1e0869e1050e 100644
--- a/system/Debug/Toolbar/Views/toolbar.js
+++ b/system/Debug/Toolbar/Views/toolbar.js
@@ -24,10 +24,10 @@ var ciDebugBar = {
 		document.getElementById('debug-icon-link').addEventListener('click', ciDebugBar.toggleToolbar, true);
 
 		// Allows to highlight the row of the current history request
-		var btn = document.querySelector('button[data-time="' + localStorage.getItem('debugbar-time') + '"]');
+		var btn = this.toolbar.querySelector('button[data-time="' + localStorage.getItem('debugbar-time') + '"]');
 		ciDebugBar.addClass(btn.parentNode.parentNode, 'current');
 
-		historyLoad = document.getElementsByClassName('ci-history-load');
+		historyLoad = this.toolbar.getElementsByClassName('ci-history-load');
 
 		for (var i = 0; i < historyLoad.length; i++)
 		{
@@ -52,7 +52,7 @@ var ciDebugBar = {
 	},
 
 	createListeners : function () {
-		var buttons = [].slice.call(document.querySelectorAll('#debug-bar .ci-label a'));
+		var buttons = [].slice.call(this.toolbar.querySelectorAll('.ci-label a'));
 
 		for (var i = 0; i < buttons.length; i++)
 		{
@@ -60,7 +60,7 @@ var ciDebugBar = {
 		}
 
 		// Hook up generic toggle via data attributes `data-toggle="foo"`
-		var links = document.querySelectorAll('[data-toggle]');
+		var links = this.toolbar.querySelectorAll('[data-toggle]');
 		for (var i = 0; i < links.length; i++)
 		{
 			links[i].addEventListener('click', ciDebugBar.toggleRows, true);
@@ -84,7 +84,7 @@ var ciDebugBar = {
 		var state = tab.style.display;
 
 		// Hide all tabs
-		var tabs = document.querySelectorAll('#debug-bar .tab');
+		var tabs = this.toolbar.querySelectorAll('.tab');
 
 		for (var i = 0; i < tabs.length; i++)
 		{
@@ -92,7 +92,7 @@ var ciDebugBar = {
 		}
 
 		// Mark all labels as inactive
-		var labels = document.querySelectorAll('#debug-bar .ci-label');
+		var labels = this.toolbar.querySelectorAll('.ci-label');
 
 		for (var i = 0; i < labels.length; i++)
 		{
@@ -502,7 +502,7 @@ var ciDebugBar = {
 	},
 
 	setToolbarPosition: function () {
-		var btnPosition = document.getElementById('toolbar-position');
+		var btnPosition = this.toolbar.querySelector('#toolbar-position');
 
 		if (ciDebugBar.readCookie('debug-bar-position') === 'top')
 		{
@@ -531,7 +531,7 @@ var ciDebugBar = {
 	},
 
 	setToolbarTheme: function () {
-		var btnTheme    = document.getElementById('toolbar-theme');
+		var btnTheme    = this.toolbar.querySelector('#toolbar-theme');
 		var isDarkMode  = window.matchMedia("(prefers-color-scheme: dark)").matches;
 		var isLightMode = window.matchMedia("(prefers-color-scheme: light)").matches;
 
@@ -627,7 +627,7 @@ var ciDebugBar = {
 
 	routerLink: function () {
 		var row, _location;
-		var rowGet = document.querySelectorAll('#debug-bar td[data-debugbar-route="GET"]');
+		var rowGet = this.toolbar.querySelectorAll('td[data-debugbar-route="GET"]');
 		var patt   = /\((?:[^)(]+|\((?:[^)(]+|\([^)(]*\))*\))*\)/;
 
 		for (var i = 0; i < rowGet.length; i++)
@@ -653,7 +653,7 @@ var ciDebugBar = {
 			}
 		}
 
-		rowGet = document.querySelectorAll('#debug-bar td[data-debugbar-route="GET"] form');
+		rowGet = this.toolbar.querySelectorAll('td[data-debugbar-route="GET"] form');
 		for (var i = 0; i < rowGet.length; i++)
 		{
 			row = rowGet[i];

From 84e17b0e0967b6e7eb6ef5b2175d1fbd68335b0b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 6 Jan 2022 09:40:54 +0900
Subject: [PATCH 1067/2325] docs: add upgrade instruction when validating an
 array without `*`

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

diff --git a/user_guide_src/source/installation/upgrade_416.rst b/user_guide_src/source/installation/upgrade_416.rst
index 36f0d1039b46..ce88d59582b7 100644
--- a/user_guide_src/source/installation/upgrade_416.rst
+++ b/user_guide_src/source/installation/upgrade_416.rst
@@ -20,6 +20,17 @@ Validation result changes
 
 Due to a bug fix, the Validation now might change the validation results when you validate an array item (see :ref:`Changelog <changelog-v416-validation-changes>`). So check the validation results for all the code that validates the array. Validating multiple fields like ``contacts.*.name`` is not affected.
 
+If you have the following form::
+
+    <input type='text' name='invoice_rule[1]'>
+    <input type='text' name='invoice_rule[2]'>
+
+And you have the validation rule like this::
+
+    'invoice_rule' =>  ['rules' => 'numeric', 'errors' => ['numeric' => 'Not numeric']]
+
+Change the rule key to ``invoice_rule.*`` and the validation will work.
+
 Breaking Enhancements
 *********************
 

From 58e288edef88566cb774fd1905400a96b64ae43a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 6 Jan 2022 14:44:26 +0900
Subject: [PATCH 1068/2325] docs: fix variable name

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

diff --git a/user_guide_src/source/helpers/cookie_helper.rst b/user_guide_src/source/helpers/cookie_helper.rst
index 597adaa66c9a..33b4e5e7b66c 100755
--- a/user_guide_src/source/helpers/cookie_helper.rst
+++ b/user_guide_src/source/helpers/cookie_helper.rst
@@ -42,7 +42,7 @@ The following functions are available:
 .. php:function:: get_cookie($index[, $xssClean = false])
 
     :param    string    $index: Cookie name
-    :param    bool    $xss_clean: Whether to apply XSS filtering to the returned value
+    :param    bool    $xssClean: Whether to apply XSS filtering to the returned value
     :returns:    The cookie value or null if not found
     :rtype:    mixed
 

From 3f0c8450247411c20ab3997963897b80dc249e64 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Thu, 6 Jan 2022 14:39:11 +0000
Subject: [PATCH 1069/2325] Add simple post-release test

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

diff --git a/admin/RELEASE.md b/admin/RELEASE.md
index eb4e621e1e40..b145edaf0e3e 100644
--- a/admin/RELEASE.md
+++ b/admin/RELEASE.md
@@ -57,6 +57,12 @@ CodeIgniter 4.x.x release.
 See the changelog: https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md
 ```
 * Watch for the "Deploy Framework" Action to make sure **framework** and **appstarter** get updated
+* Run the following commands to install and test AppStarter and verify the new version:
+```bash
+composer create-project codeigniter4/appstarter release-test
+cd release-test
+composer test && composer info codeigniter4/framework
+```
 
 ## User Guide
 

From 9096197d4b9971023d34b715108a56b2f8b0d153 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 19 Nov 2021 21:47:04 +0900
Subject: [PATCH 1070/2325] refactor: add Factories::models() to suppress
 PHPStan error

---
 system/Common.php           |  1 -
 system/Config/Factories.php | 20 ++++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/system/Common.php b/system/Common.php
index e132d982b7d4..158211032b8b 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -773,7 +773,6 @@ function log_message(string $level, string $message, array $context = [])
      * @param class-string<T> $name
      *
      * @return T
-     * @phpstan-return Model
      */
     function model(string $name, bool $getShared = true, ?ConnectionInterface &$conn = null)
     {
diff --git a/system/Config/Factories.php b/system/Config/Factories.php
index 8bcef3e09610..0a6f34d10e27 100644
--- a/system/Config/Factories.php
+++ b/system/Config/Factories.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Config;
 
+use CodeIgniter\Database\ConnectionInterface;
 use CodeIgniter\Model;
 use Config\Services;
 
@@ -23,7 +24,6 @@
  * instantiation checks.
  *
  * @method static BaseConfig config(...$arguments)
- * @method static Model models(...$arguments)
  */
 class Factories
 {
@@ -67,6 +67,22 @@ class Factories
      */
     protected static $instances = [];
 
+    /**
+     * This method is only to prevent PHPStan error.
+     * If we have a solution, we can remove this method.
+     * See https://github.com/codeigniter4/CodeIgniter4/pull/5358
+     *
+     * @template T of Model
+     *
+     * @param class-string<T> $name
+     *
+     * @return T
+     */
+    public static function models(string $name, array $options = [], ?ConnectionInterface &$conn = null)
+    {
+        return self::__callStatic('models', [$name, $options, $conn]);
+    }
+
     /**
      * Loads instances based on the method component name. Either
      * creates a new instance or returns an existing shared instance.
@@ -263,7 +279,7 @@ public static function setOptions(string $component, array $values): array
     /**
      * Resets the static arrays, optionally just for one component
      *
-     * @param string $component Lowercase, plural component name
+     * @param string|null $component Lowercase, plural component name
      */
     public static function reset(?string $component = null)
     {

From cb0b3714d65a94a0c2a6d4ef076beac0b8a84e8c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Jan 2022 01:49:57 +0000
Subject: [PATCH 1071/2325] chore(deps-dev): update rector/rector requirement
 (#5551)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ecf61daa3d80..f93b7034a992 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.10"
+        "rector/rector": "0.12.11"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From e960545894b7b2105af3fa1520c0f5de035eacd9 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Fri, 7 Jan 2022 13:55:23 +0800
Subject: [PATCH 1072/2325] Toolbar. ciDebugBar.showTab() context.

---
 system/Debug/Toolbar/Views/toolbar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Debug/Toolbar/Views/toolbar.js b/system/Debug/Toolbar/Views/toolbar.js
index 1e0869e1050e..3bd05d5e9592 100644
--- a/system/Debug/Toolbar/Views/toolbar.js
+++ b/system/Debug/Toolbar/Views/toolbar.js
@@ -84,7 +84,7 @@ var ciDebugBar = {
 		var state = tab.style.display;
 
 		// Hide all tabs
-		var tabs = this.toolbar.querySelectorAll('.tab');
+		var tabs = document.querySelectorAll('#debug-bar .tab');
 
 		for (var i = 0; i < tabs.length; i++)
 		{
@@ -92,7 +92,7 @@ var ciDebugBar = {
 		}
 
 		// Mark all labels as inactive
-		var labels = this.toolbar.querySelectorAll('.ci-label');
+		var labels = document.querySelectorAll('#debug-bar .ci-label');
 
 		for (var i = 0; i < labels.length; i++)
 		{

From 973ab182ad5f35c191f6d418a041aa08a56a259a Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 7 Jan 2022 10:48:08 +0800
Subject: [PATCH 1073/2325] Refactor Database Collector display

---
 system/Debug/Toolbar/Collectors/Database.php  | 56 +++++++++++------
 system/Debug/Toolbar/Views/_database.tpl      |  5 +-
 .../Debug/Toolbar/Collectors/DatabaseTest.php | 61 +++++++++++++++++++
 3 files changed, 103 insertions(+), 19 deletions(-)
 create mode 100644 tests/system/Debug/Toolbar/Collectors/DatabaseTest.php

diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 520ddc7c5dc6..d7e14d291b68 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -89,7 +89,7 @@ public static function collect(Query $query)
                 'query'     => $query,
                 'string'    => $queryString,
                 'duplicate' => in_array($queryString, array_column(static::$queries, 'string', null), true),
-                'trace'     => debug_backtrace(),
+                'trace'     => debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS),
             ];
         }
     }
@@ -134,23 +134,46 @@ public function display(): array
         $data['queries'] = array_map(static function (array $query) {
             $isDuplicate = $query['duplicate'] === true;
 
-            // Find the first line that doesn't include `system` in the backtrace
-            $line = [];
-
-            foreach ($query['trace'] as &$traceLine) {
-                // Clean up the file paths
-                $traceLine['file'] = str_ireplace(APPPATH, 'APPPATH/', $traceLine['file']);
-                $traceLine['file'] = str_ireplace(SYSTEMPATH, 'SYSTEMPATH/', $traceLine['file']);
-                if (defined('VENDORPATH')) {
-                    // VENDORPATH is not defined unless `vendor/autoload.php` exists
-                    $traceLine['file'] = str_ireplace(VENDORPATH, 'VENDORPATH/', $traceLine['file']);
+            foreach ($query['trace'] as $index => &$line) {
+                // simplify file and line
+                if (isset($line['file'])) {
+                    $line['file'] = clean_path($line['file']) . ':' . $line['line'];
+                    unset($line['line']);
+                } else {
+                    $line['file'] = '[internal function]';
+                }
+
+                // simplify function call
+                if (isset($line['class'])) {
+                    $line['function'] = $line['class'] . $line['type'] . $line['function'];
+                    unset($line['class'], $line['type']);
                 }
-                $traceLine['file'] = str_ireplace(ROOTPATH, 'ROOTPATH/', $traceLine['file']);
 
-                if (strpos($traceLine['file'], 'SYSTEMPATH') !== false) {
-                    continue;
+                if (strrpos($line['function'], '{closure}') === false) {
+                    $line['function'] .= '()';
+                }
+
+                $line['function'] = str_repeat(chr(0xC2) . chr(0xA0), 8) . $line['function'];
+
+                // add index numbering padded with nonbreaking space
+                $indexPadded = str_pad(sprintf('%d', $index + 1), 3, ' ', STR_PAD_LEFT);
+                $indexPadded = preg_replace('/\s/', chr(0xC2) . chr(0xA0), $indexPadded);
+
+                $line['index'] = $indexPadded . str_repeat(chr(0xC2) . chr(0xA0), 4);
+            }
+
+            // remove the caller trace which is duplicated as the last item
+            array_pop($query['trace']);
+
+            // Find the first line that doesn't include `system` in the backtrace
+            $firstNonSystemLine = '';
+
+            foreach ($query['trace'] as $line) {
+                if (strpos($line['file'], 'SYSTEMPATH') === false) {
+                    $firstNonSystemLine = $line['file'];
+
+                    break;
                 }
-                $line = empty($line) ? $traceLine : $line;
             }
 
             return [
@@ -159,8 +182,7 @@ public function display(): array
                 'duration'   => ((float) $query['query']->getDuration(5) * 1000) . ' ms',
                 'sql'        => $query['query']->debugToolbarDisplay(),
                 'trace'      => $query['trace'],
-                'trace-file' => str_replace(ROOTPATH, '/', $line['file'] ?? ''),
-                'trace-line' => $line['line'] ?? '',
+                'trace-file' => $firstNonSystemLine,
                 'qid'        => md5($query['query'] . microtime()),
             ];
         }, static::$queries);
diff --git a/system/Debug/Toolbar/Views/_database.tpl b/system/Debug/Toolbar/Views/_database.tpl
index a2f5bd9808f1..1bd9b8a88405 100644
--- a/system/Debug/Toolbar/Views/_database.tpl
+++ b/system/Debug/Toolbar/Views/_database.tpl
@@ -10,13 +10,14 @@
         <tr class="{class}" title="{hover}" data-toggle="{qid}-trace">
             <td class="narrow">{duration}</td>
             <td>{! sql !}</td>
-            <td style="text-align: right">{trace-file}:<strong>{trace-line}</strong></td>
+            <td style="text-align: right"><strong>{trace-file}</strong></td>
         </tr>
         <tr class="muted" id="{qid}-trace" style="display:none">
             <td></td>
             <td colspan="2">
             {trace}
-                {file}:<strong>{line}</strong><br/>
+                {index}<strong>{file}</strong><br/>
+                {function}<br/><br/>
             {/trace}
             </td>
         </tr>
diff --git a/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php b/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php
new file mode 100644
index 000000000000..17ae1cb3d143
--- /dev/null
+++ b/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug\Toolbar\Collectors;
+
+use CodeIgniter\Database\Query;
+use CodeIgniter\Test\CIUnitTestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+
+/**
+ * @internal
+ */
+final class DatabaseTest extends CIUnitTestCase
+{
+    public function testDisplay(): void
+    {
+        /** @var MockObject&Query $query */
+        $query = $this->getMockBuilder(Query::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        // set mock returns
+        $query->method('getQuery')->willReturn('SHOW TABLES;');
+        $query->method('debugToolbarDisplay')->willReturn('<strong>SHOW</strong> TABLES;');
+        $query->method('getDuration')->with(5)->willReturn('1.23456');
+
+        Database::collect($query); // <== $query will be called here
+        $collector = new Database();
+
+        $queries = $collector->display()['queries'];
+
+        $this->assertSame('1234.56 ms', $queries[0]['duration']);
+        $this->assertSame('<strong>SHOW</strong> TABLES;', $queries[0]['sql']);
+        $this->assertSame(clean_path(__FILE__) . ':35', $queries[0]['trace-file']);
+
+        foreach ($queries[0]['trace'] as $i => $trace) {
+            // since we added the index numbering
+            $this->assertArrayHasKey('index', $trace);
+            $this->assertSame(
+                sprintf('%s', $i + 1),
+                preg_replace(sprintf('/%s/', chr(0xC2) . chr(0xA0)), '', $trace['index'])
+            );
+
+            // since we merged file & line together
+            $this->assertArrayNotHasKey('line', $trace);
+            $this->assertArrayHasKey('file', $trace);
+
+            // since we dropped object & args in the backtrace for performance
+            $this->assertArrayNotHasKey('object', $trace);
+            $this->assertArrayNotHasKey('args', $trace);
+        }
+    }
+}

From 1a52fbf7cb113358820de8cd86f85d263c42a357 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 7 Jan 2022 16:56:59 +0800
Subject: [PATCH 1074/2325] Do not reuse `$line` outside of foreach

---
 system/Debug/Toolbar/Collectors/Database.php  | 21 +++++++------------
 .../Debug/Toolbar/Collectors/DatabaseTest.php |  2 +-
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index d7e14d291b68..a589c8fdabb9 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -134,6 +134,8 @@ public function display(): array
         $data['queries'] = array_map(static function (array $query) {
             $isDuplicate = $query['duplicate'] === true;
 
+            $firstNonSystemLine = '';
+
             foreach ($query['trace'] as $index => &$line) {
                 // simplify file and line
                 if (isset($line['file'])) {
@@ -143,6 +145,11 @@ public function display(): array
                     $line['file'] = '[internal function]';
                 }
 
+                // find the first trace line that does not originate from `system/`
+                if ($firstNonSystemLine === '' && strpos($line['file'], 'SYSTEMPATH') === false) {
+                    $firstNonSystemLine = $line['file'];
+                }
+
                 // simplify function call
                 if (isset($line['class'])) {
                     $line['function'] = $line['class'] . $line['type'] . $line['function'];
@@ -162,20 +169,6 @@ public function display(): array
                 $line['index'] = $indexPadded . str_repeat(chr(0xC2) . chr(0xA0), 4);
             }
 
-            // remove the caller trace which is duplicated as the last item
-            array_pop($query['trace']);
-
-            // Find the first line that doesn't include `system` in the backtrace
-            $firstNonSystemLine = '';
-
-            foreach ($query['trace'] as $line) {
-                if (strpos($line['file'], 'SYSTEMPATH') === false) {
-                    $firstNonSystemLine = $line['file'];
-
-                    break;
-                }
-            }
-
             return [
                 'hover'      => $isDuplicate ? 'This query was called more than once.' : '',
                 'class'      => $isDuplicate ? 'duplicate' : '',
diff --git a/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php b/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php
index 17ae1cb3d143..3b139d9f2d7e 100644
--- a/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php
+++ b/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php
@@ -54,8 +54,8 @@ public function testDisplay(): void
             $this->assertArrayHasKey('file', $trace);
 
             // since we dropped object & args in the backtrace for performance
+            // but args MAY STILL BE present in internal calls
             $this->assertArrayNotHasKey('object', $trace);
-            $this->assertArrayNotHasKey('args', $trace);
         }
     }
 }

From 1f3d5255bbeb08eef454fb61c1ac11f69ef1b59a Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Fri, 7 Jan 2022 20:36:14 +0800
Subject: [PATCH 1075/2325] Remove first two arrays in trace when called in
 browser

---
 system/Debug/Toolbar/Collectors/Database.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index a589c8fdabb9..26cb02ddfeb0 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -85,11 +85,19 @@ public static function collect(Query $query)
         if (count(static::$queries) < $max) {
             $queryString = $query->getQuery();
 
+            $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+
+            if (! is_cli()) {
+                // when called in the browser, the first two trace arrays
+                // are from the DB event trigger, which are unneeded
+                $backtrace = array_slice($backtrace, 2);
+            }
+
             static::$queries[] = [
                 'query'     => $query,
                 'string'    => $queryString,
                 'duplicate' => in_array($queryString, array_column(static::$queries, 'string', null), true),
-                'trace'     => debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS),
+                'trace'     => $backtrace,
             ];
         }
     }

From 972f579a9841aaac917eb0d498fab22114167b1c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 4 Jan 2022 16:11:09 +0900
Subject: [PATCH 1076/2325] Merge pull request #5532 from
 kenjis/update-CHANGELOG-416

docs: add Security advisory in CHANGELOG.md
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2ea5e536da0..4d333c153241 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.5...v4.1.6)
 
+**SECURITY**
+
+* *Deserialization of Untrusted Data* found in the ``old()`` function was fixed. See the [Security advisory](https://github.com/codeigniter4/CodeIgniter4/security/advisories/GHSA-w6jr-wj64-mc9x) for more information.
+
 **Breaking Changes**
 
 * fix: Incorrect type `BaseBuilder::$tableName` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5378

From e1f40c5e8de2481243fb3d623eb2882dacc72eab Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Tue, 4 Jan 2022 10:17:50 -0500
Subject: [PATCH 1077/2325] Merge pull request #5537 from
 kenjis/fix-ug-changelog-416

docs: minor addition to changelogs/v4.1.6.rst and upgrade_416.rst
---
 user_guide_src/source/changelogs/v4.1.6.rst        | 2 ++
 user_guide_src/source/installation/upgrade_416.rst | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/user_guide_src/source/changelogs/v4.1.6.rst b/user_guide_src/source/changelogs/v4.1.6.rst
index 5068d92a99f3..6993add513f9 100644
--- a/user_guide_src/source/changelogs/v4.1.6.rst
+++ b/user_guide_src/source/changelogs/v4.1.6.rst
@@ -65,3 +65,5 @@ And the following methods are deprecated:
 
 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_416.rst b/user_guide_src/source/installation/upgrade_416.rst
index 9fd585821740..f81dacf8ec79 100644
--- a/user_guide_src/source/installation/upgrade_416.rst
+++ b/user_guide_src/source/installation/upgrade_416.rst
@@ -17,6 +17,8 @@ Due to a bug fix, the Validation now might change the validation results when yo
 Breaking Enhancements
 *********************
 
+none.
+
 Project Files
 *************
 

From 803442218be44f7daf61b22ec438e1e95cf0d4e9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 5 Jan 2022 10:25:02 +0900
Subject: [PATCH 1078/2325] Merge pull request #5527 from
 paulbalandan/kint-4.1.1

Update modified Kint files in `ThirdParty`
---
 .../ThirdParty/Kint/Renderer/CliRenderer.php  | 29 +++++++++++++++++--
 .../ThirdParty/Kint/Renderer/RichRenderer.php | 15 ++++++++--
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/system/ThirdParty/Kint/Renderer/CliRenderer.php b/system/ThirdParty/Kint/Renderer/CliRenderer.php
index f86671ff1cf3..12b18d036b62 100644
--- a/system/ThirdParty/Kint/Renderer/CliRenderer.php
+++ b/system/ThirdParty/Kint/Renderer/CliRenderer.php
@@ -59,6 +59,15 @@ class CliRenderer extends TextRenderer
      */
     public static $min_terminal_width = 40;
 
+    /**
+     * Which stream to check for VT100 support on windows.
+     *
+     * null uses STDOUT if it's defined
+     *
+     * @var null|resource
+     */
+    public static $windows_stream = null;
+
     protected static $terminal_width = null;
 
     protected $windows_output = false;
@@ -69,8 +78,22 @@ public function __construct()
     {
         parent::__construct();
 
-        if (!self::$force_utf8) {
-            $this->windows_output = KINT_WIN;
+        if (!self::$force_utf8 && KINT_WIN) {
+            if (!KINT_PHP72) {
+                $this->windows_output = true;
+            } else {
+                $stream = self::$windows_stream;
+
+                if (!$stream && \defined('STDOUT')) {
+                    $stream = STDOUT;
+                }
+
+                if (!$stream) {
+                    $this->windows_output = true;
+                } else {
+                    $this->windows_output = !\sapi_windows_vt100_support($stream);
+                }
+            }
         }
 
         if (!self::$terminal_width) {
@@ -153,7 +176,7 @@ protected function utf8ToWindows($string)
     {
         return \str_replace(
             ['┌', '═', '┐', '│', '└', '─', '┘'],
-            ["\xda", "\xdc", "\xbf", "\xb3", "\xc0", "\xc4", "\xd9"],
+            [' ', '=', ' ', '|', ' ', '-', ' '],
             $string
         );
     }
diff --git a/system/ThirdParty/Kint/Renderer/RichRenderer.php b/system/ThirdParty/Kint/Renderer/RichRenderer.php
index 94b7f98ab71f..46a8827ded56 100644
--- a/system/ThirdParty/Kint/Renderer/RichRenderer.php
+++ b/system/ThirdParty/Kint/Renderer/RichRenderer.php
@@ -133,6 +133,9 @@ class RichRenderer extends Renderer
 
     public static $always_pre_render = false;
 
+    public static $js_nonce = null;
+    public static $css_nonce = null;
+
     protected $plugin_objs = [];
     protected $expand = false;
     protected $force_pre_render = false;
@@ -389,10 +392,18 @@ public function preRender()
 
                 switch ($type) {
                     case 'script':
-                        $output .= '<script class="kint-rich-script">'.$contents.'</script>';
+                        $output .= '<script class="kint-rich-script"';
+                        if (null !== self::$js_nonce) {
+                            $output .= ' nonce="'.\htmlspecialchars(self::$js_nonce).'"';
+                        }
+                        $output .= '>'.$contents.'</script>';
                         break;
                     case 'style':
-                        $output .= '<style class="kint-rich-style">'.$contents.'</style>';
+                        $output .= '<style class="kint-rich-style"';
+                        if (null !== self::$css_nonce) {
+                            $output .= ' nonce="'.\htmlspecialchars(self::$css_nonce).'"';
+                        }
+                        $output .= '>'.$contents.'</style>';
                         break;
                     default:
                         $output .= $contents;

From 12d998ab87e0230f91892c9da7957c13895ded0d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 5 Jan 2022 10:25:59 +0900
Subject: [PATCH 1079/2325] Merge pull request #5536 from
 kenjis/fix-BaseConnection-connectDuration

fix: BaseConnection::getConnectDuration() number_format(): Passing null to parameter
---
 system/Database/BaseConnection.php           |  4 ++--
 tests/system/Database/BaseConnectionTest.php | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 5f678e5114d7..53e5dad1b351 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -258,14 +258,14 @@ abstract class BaseConnection implements ConnectionInterface
      *
      * @var float
      */
-    protected $connectTime;
+    protected $connectTime = 0.0;
 
     /**
      * How long it took to establish connection.
      *
      * @var float
      */
-    protected $connectDuration;
+    protected $connectDuration = 0.0;
 
     /**
      * If true, no queries will actually be
diff --git a/tests/system/Database/BaseConnectionTest.php b/tests/system/Database/BaseConnectionTest.php
index 7d2352a0e9b2..9bb8ddee1499 100644
--- a/tests/system/Database/BaseConnectionTest.php
+++ b/tests/system/Database/BaseConnectionTest.php
@@ -123,6 +123,16 @@ public function testStoresConnectionTimings()
         $this->assertGreaterThan(0.0, $db->getConnectDuration());
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5535
+     */
+    public function testStoresConnectionTimingsNotConnected()
+    {
+        $db = new MockConnection($this->options);
+
+        $this->assertSame('0.000000', $db->getConnectDuration());
+    }
+
     public function testMagicIssetTrue()
     {
         $db = new MockConnection($this->options);

From 3561b9cc749ee8eea97ae1470b4bb6695c4c3f47 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Tue, 4 Jan 2022 21:51:21 -0600
Subject: [PATCH 1080/2325] Merge pull request #5544 from
 iRedds/fix/debug-toolbar-selectors

Fix: Debug toolbar selectors
---
 system/Debug/Toolbar/Views/toolbar.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/system/Debug/Toolbar/Views/toolbar.js b/system/Debug/Toolbar/Views/toolbar.js
index b6883d4b9f3b..1e0869e1050e 100644
--- a/system/Debug/Toolbar/Views/toolbar.js
+++ b/system/Debug/Toolbar/Views/toolbar.js
@@ -24,10 +24,10 @@ var ciDebugBar = {
 		document.getElementById('debug-icon-link').addEventListener('click', ciDebugBar.toggleToolbar, true);
 
 		// Allows to highlight the row of the current history request
-		var btn = document.querySelector('button[data-time="' + localStorage.getItem('debugbar-time') + '"]');
+		var btn = this.toolbar.querySelector('button[data-time="' + localStorage.getItem('debugbar-time') + '"]');
 		ciDebugBar.addClass(btn.parentNode.parentNode, 'current');
 
-		historyLoad = document.getElementsByClassName('ci-history-load');
+		historyLoad = this.toolbar.getElementsByClassName('ci-history-load');
 
 		for (var i = 0; i < historyLoad.length; i++)
 		{
@@ -52,7 +52,7 @@ var ciDebugBar = {
 	},
 
 	createListeners : function () {
-		var buttons = [].slice.call(document.querySelectorAll('#debug-bar .ci-label a'));
+		var buttons = [].slice.call(this.toolbar.querySelectorAll('.ci-label a'));
 
 		for (var i = 0; i < buttons.length; i++)
 		{
@@ -60,7 +60,7 @@ var ciDebugBar = {
 		}
 
 		// Hook up generic toggle via data attributes `data-toggle="foo"`
-		var links = document.querySelectorAll('[data-toggle]');
+		var links = this.toolbar.querySelectorAll('[data-toggle]');
 		for (var i = 0; i < links.length; i++)
 		{
 			links[i].addEventListener('click', ciDebugBar.toggleRows, true);
@@ -84,7 +84,7 @@ var ciDebugBar = {
 		var state = tab.style.display;
 
 		// Hide all tabs
-		var tabs = document.querySelectorAll('#debug-bar .tab');
+		var tabs = this.toolbar.querySelectorAll('.tab');
 
 		for (var i = 0; i < tabs.length; i++)
 		{
@@ -92,7 +92,7 @@ var ciDebugBar = {
 		}
 
 		// Mark all labels as inactive
-		var labels = document.querySelectorAll('#debug-bar .ci-label');
+		var labels = this.toolbar.querySelectorAll('.ci-label');
 
 		for (var i = 0; i < labels.length; i++)
 		{
@@ -502,7 +502,7 @@ var ciDebugBar = {
 	},
 
 	setToolbarPosition: function () {
-		var btnPosition = document.getElementById('toolbar-position');
+		var btnPosition = this.toolbar.querySelector('#toolbar-position');
 
 		if (ciDebugBar.readCookie('debug-bar-position') === 'top')
 		{
@@ -531,7 +531,7 @@ var ciDebugBar = {
 	},
 
 	setToolbarTheme: function () {
-		var btnTheme    = document.getElementById('toolbar-theme');
+		var btnTheme    = this.toolbar.querySelector('#toolbar-theme');
 		var isDarkMode  = window.matchMedia("(prefers-color-scheme: dark)").matches;
 		var isLightMode = window.matchMedia("(prefers-color-scheme: light)").matches;
 
@@ -627,7 +627,7 @@ var ciDebugBar = {
 
 	routerLink: function () {
 		var row, _location;
-		var rowGet = document.querySelectorAll('#debug-bar td[data-debugbar-route="GET"]');
+		var rowGet = this.toolbar.querySelectorAll('td[data-debugbar-route="GET"]');
 		var patt   = /\((?:[^)(]+|\((?:[^)(]+|\([^)(]*\))*\))*\)/;
 
 		for (var i = 0; i < rowGet.length; i++)
@@ -653,7 +653,7 @@ var ciDebugBar = {
 			}
 		}
 
-		rowGet = document.querySelectorAll('#debug-bar td[data-debugbar-route="GET"] form');
+		rowGet = this.toolbar.querySelectorAll('td[data-debugbar-route="GET"] form');
 		for (var i = 0; i < rowGet.length; i++)
 		{
 			row = rowGet[i];

From 187c864a9d37e2bef75e47fe7507dd1da8514603 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Tue, 4 Jan 2022 21:55:19 -0600
Subject: [PATCH 1081/2325] Merge pull request #5542 from
 kenjis/fix-docs-upgrade-instruction

docs: improve upgrade instructions
---
 .../source/installation/installing_composer.rst      |  9 ++++++---
 .../source/installation/installing_manual.rst        |  8 ++++----
 user_guide_src/source/installation/upgrade_416.rst   | 12 +++++++++---
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst
index ac1be8c5e12c..7133e2cb80bf 100644
--- a/user_guide_src/source/installation/installing_composer.rst
+++ b/user_guide_src/source/installation/installing_composer.rst
@@ -50,6 +50,8 @@ A sample such installation command, using the default project-root "appstarter":
 
 After installation you should follow the steps in the "Upgrading" section.
 
+.. _app-starter-upgrading:
+
 Upgrading
 ---------
 
@@ -68,7 +70,7 @@ If ``--prefer-source`` doesn't automatically update to pull latest framework sou
 If you used the ``--no-dev`` option when you created the project, it
 would be appropriate to do so here too, i.e., ``composer update --no-dev``.
 
-Read the upgrade instructions, and check designated  ``app/Config`` folders for affected changes.
+Read the :doc:`upgrade instructions <upgrading>`, and check Breaking Changes and Enhancements.
 
 Pros
 ----
@@ -142,6 +144,8 @@ Copy the ``env``, ``phpunit.xml.dist`` and ``spark`` files, from
 You will have to adjust the system path to refer to the vendor one, e.g., ``ROOTPATH . '/vendor/codeigniter4/framework/system'``,
 - the ``$systemDirectory`` variable in **app/Config/Paths.php**
 
+.. _adding-codeigniter4-upgrading:
+
 Upgrading
 ---------
 
@@ -149,8 +153,7 @@ Whenever there is a new release, then from the command line in your project root
 
     > composer update --prefer-source
 
-Read the upgrade instructions, and check designated
-``app/Config`` folders for affected changes.
+Read the :doc:`upgrade instructions <upgrading>`, and check Breaking Changes and Enhancements.
 
 Pros
 ----
diff --git a/user_guide_src/source/installation/installing_manual.rst b/user_guide_src/source/installation/installing_manual.rst
index daf7ea26c55f..ebd231cdb2cf 100644
--- a/user_guide_src/source/installation/installing_manual.rst
+++ b/user_guide_src/source/installation/installing_manual.rst
@@ -27,14 +27,14 @@ Setting Up
 
 None
 
+.. _installing-manual-upgrading:
+
 Upgrading
 ---------
 
-Download a new copy of the framework, and then follow the upgrade
-instructions in the release notice or changelog to merge that with your project.
+Download a new copy of the framework, and then replace the ``system`` folder.
 
-Typically, you replace the ``system`` folder, and check designated
-``app/Config`` folders for affected changes.
+Read the :doc:`upgrade instructions <upgrading>`, and check Breaking Changes and Enhancements.
 
 Pros
 ----
diff --git a/user_guide_src/source/installation/upgrade_416.rst b/user_guide_src/source/installation/upgrade_416.rst
index f81dacf8ec79..36f0d1039b46 100644
--- a/user_guide_src/source/installation/upgrade_416.rst
+++ b/user_guide_src/source/installation/upgrade_416.rst
@@ -2,6 +2,12 @@
 Upgrading from 4.1.5 to 4.1.6
 #############################
 
+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
@@ -22,8 +28,8 @@ none.
 Project Files
 *************
 
-Numerous 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.
+Numerous 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>`_.
 
@@ -45,7 +51,7 @@ and it is recommended that you merge the updated versions with your application:
 All Changes
 ===========
 
-This is a list of all files in the project space that received 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:
 
 * ``app/Config/Filters.php``

From 841e8408811d37fec127ccc8cf3943e3fef20c4c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 6 Jan 2022 16:34:23 +0900
Subject: [PATCH 1082/2325] Merge pull request #5546 from
 kenjis/fix-docs-upgrade_416.rst

docs: add upgrade instruction in upgrade_416.rst
---
 user_guide_src/source/installation/upgrade_416.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/user_guide_src/source/installation/upgrade_416.rst b/user_guide_src/source/installation/upgrade_416.rst
index 36f0d1039b46..ce88d59582b7 100644
--- a/user_guide_src/source/installation/upgrade_416.rst
+++ b/user_guide_src/source/installation/upgrade_416.rst
@@ -20,6 +20,17 @@ Validation result changes
 
 Due to a bug fix, the Validation now might change the validation results when you validate an array item (see :ref:`Changelog <changelog-v416-validation-changes>`). So check the validation results for all the code that validates the array. Validating multiple fields like ``contacts.*.name`` is not affected.
 
+If you have the following form::
+
+    <input type='text' name='invoice_rule[1]'>
+    <input type='text' name='invoice_rule[2]'>
+
+And you have the validation rule like this::
+
+    'invoice_rule' =>  ['rules' => 'numeric', 'errors' => ['numeric' => 'Not numeric']]
+
+Change the rule key to ``invoice_rule.*`` and the validation will work.
+
 Breaking Enhancements
 *********************
 

From c058b18070c08ccb25fe9a64e220474c3d1df084 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Fri, 7 Jan 2022 15:35:24 +0800
Subject: [PATCH 1083/2325] Merge pull request #5554 from iRedds/fix/toolbar

Fix: Toolbar. ciDebugBar.showTab() context.
---
 system/Debug/Toolbar/Views/toolbar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Debug/Toolbar/Views/toolbar.js b/system/Debug/Toolbar/Views/toolbar.js
index 1e0869e1050e..3bd05d5e9592 100644
--- a/system/Debug/Toolbar/Views/toolbar.js
+++ b/system/Debug/Toolbar/Views/toolbar.js
@@ -84,7 +84,7 @@ var ciDebugBar = {
 		var state = tab.style.display;
 
 		// Hide all tabs
-		var tabs = this.toolbar.querySelectorAll('.tab');
+		var tabs = document.querySelectorAll('#debug-bar .tab');
 
 		for (var i = 0; i < tabs.length; i++)
 		{
@@ -92,7 +92,7 @@ var ciDebugBar = {
 		}
 
 		// Mark all labels as inactive
-		var labels = this.toolbar.querySelectorAll('.ci-label');
+		var labels = document.querySelectorAll('#debug-bar .ci-label');
 
 		for (var i = 0; i < labels.length; i++)
 		{

From 27235a1267608517086ec61ac33ad56c908563d8 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Fri, 7 Jan 2022 16:12:05 -0600
Subject: [PATCH 1084/2325] Merge pull request #5553 from
 paulbalandan/backtrace-collector

Refactor Database Collector display
---
 system/Debug/Toolbar/Collectors/Database.php  | 55 ++++++++++++-----
 system/Debug/Toolbar/Views/_database.tpl      |  5 +-
 .../Debug/Toolbar/Collectors/DatabaseTest.php | 61 +++++++++++++++++++
 3 files changed, 103 insertions(+), 18 deletions(-)
 create mode 100644 tests/system/Debug/Toolbar/Collectors/DatabaseTest.php

diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 520ddc7c5dc6..26cb02ddfeb0 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -85,11 +85,19 @@ public static function collect(Query $query)
         if (count(static::$queries) < $max) {
             $queryString = $query->getQuery();
 
+            $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+
+            if (! is_cli()) {
+                // when called in the browser, the first two trace arrays
+                // are from the DB event trigger, which are unneeded
+                $backtrace = array_slice($backtrace, 2);
+            }
+
             static::$queries[] = [
                 'query'     => $query,
                 'string'    => $queryString,
                 'duplicate' => in_array($queryString, array_column(static::$queries, 'string', null), true),
-                'trace'     => debug_backtrace(),
+                'trace'     => $backtrace,
             ];
         }
     }
@@ -134,23 +142,39 @@ public function display(): array
         $data['queries'] = array_map(static function (array $query) {
             $isDuplicate = $query['duplicate'] === true;
 
-            // Find the first line that doesn't include `system` in the backtrace
-            $line = [];
+            $firstNonSystemLine = '';
+
+            foreach ($query['trace'] as $index => &$line) {
+                // simplify file and line
+                if (isset($line['file'])) {
+                    $line['file'] = clean_path($line['file']) . ':' . $line['line'];
+                    unset($line['line']);
+                } else {
+                    $line['file'] = '[internal function]';
+                }
+
+                // find the first trace line that does not originate from `system/`
+                if ($firstNonSystemLine === '' && strpos($line['file'], 'SYSTEMPATH') === false) {
+                    $firstNonSystemLine = $line['file'];
+                }
 
-            foreach ($query['trace'] as &$traceLine) {
-                // Clean up the file paths
-                $traceLine['file'] = str_ireplace(APPPATH, 'APPPATH/', $traceLine['file']);
-                $traceLine['file'] = str_ireplace(SYSTEMPATH, 'SYSTEMPATH/', $traceLine['file']);
-                if (defined('VENDORPATH')) {
-                    // VENDORPATH is not defined unless `vendor/autoload.php` exists
-                    $traceLine['file'] = str_ireplace(VENDORPATH, 'VENDORPATH/', $traceLine['file']);
+                // simplify function call
+                if (isset($line['class'])) {
+                    $line['function'] = $line['class'] . $line['type'] . $line['function'];
+                    unset($line['class'], $line['type']);
                 }
-                $traceLine['file'] = str_ireplace(ROOTPATH, 'ROOTPATH/', $traceLine['file']);
 
-                if (strpos($traceLine['file'], 'SYSTEMPATH') !== false) {
-                    continue;
+                if (strrpos($line['function'], '{closure}') === false) {
+                    $line['function'] .= '()';
                 }
-                $line = empty($line) ? $traceLine : $line;
+
+                $line['function'] = str_repeat(chr(0xC2) . chr(0xA0), 8) . $line['function'];
+
+                // add index numbering padded with nonbreaking space
+                $indexPadded = str_pad(sprintf('%d', $index + 1), 3, ' ', STR_PAD_LEFT);
+                $indexPadded = preg_replace('/\s/', chr(0xC2) . chr(0xA0), $indexPadded);
+
+                $line['index'] = $indexPadded . str_repeat(chr(0xC2) . chr(0xA0), 4);
             }
 
             return [
@@ -159,8 +183,7 @@ public function display(): array
                 'duration'   => ((float) $query['query']->getDuration(5) * 1000) . ' ms',
                 'sql'        => $query['query']->debugToolbarDisplay(),
                 'trace'      => $query['trace'],
-                'trace-file' => str_replace(ROOTPATH, '/', $line['file'] ?? ''),
-                'trace-line' => $line['line'] ?? '',
+                'trace-file' => $firstNonSystemLine,
                 'qid'        => md5($query['query'] . microtime()),
             ];
         }, static::$queries);
diff --git a/system/Debug/Toolbar/Views/_database.tpl b/system/Debug/Toolbar/Views/_database.tpl
index a2f5bd9808f1..1bd9b8a88405 100644
--- a/system/Debug/Toolbar/Views/_database.tpl
+++ b/system/Debug/Toolbar/Views/_database.tpl
@@ -10,13 +10,14 @@
         <tr class="{class}" title="{hover}" data-toggle="{qid}-trace">
             <td class="narrow">{duration}</td>
             <td>{! sql !}</td>
-            <td style="text-align: right">{trace-file}:<strong>{trace-line}</strong></td>
+            <td style="text-align: right"><strong>{trace-file}</strong></td>
         </tr>
         <tr class="muted" id="{qid}-trace" style="display:none">
             <td></td>
             <td colspan="2">
             {trace}
-                {file}:<strong>{line}</strong><br/>
+                {index}<strong>{file}</strong><br/>
+                {function}<br/><br/>
             {/trace}
             </td>
         </tr>
diff --git a/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php b/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php
new file mode 100644
index 000000000000..3b139d9f2d7e
--- /dev/null
+++ b/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug\Toolbar\Collectors;
+
+use CodeIgniter\Database\Query;
+use CodeIgniter\Test\CIUnitTestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+
+/**
+ * @internal
+ */
+final class DatabaseTest extends CIUnitTestCase
+{
+    public function testDisplay(): void
+    {
+        /** @var MockObject&Query $query */
+        $query = $this->getMockBuilder(Query::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        // set mock returns
+        $query->method('getQuery')->willReturn('SHOW TABLES;');
+        $query->method('debugToolbarDisplay')->willReturn('<strong>SHOW</strong> TABLES;');
+        $query->method('getDuration')->with(5)->willReturn('1.23456');
+
+        Database::collect($query); // <== $query will be called here
+        $collector = new Database();
+
+        $queries = $collector->display()['queries'];
+
+        $this->assertSame('1234.56 ms', $queries[0]['duration']);
+        $this->assertSame('<strong>SHOW</strong> TABLES;', $queries[0]['sql']);
+        $this->assertSame(clean_path(__FILE__) . ':35', $queries[0]['trace-file']);
+
+        foreach ($queries[0]['trace'] as $i => $trace) {
+            // since we added the index numbering
+            $this->assertArrayHasKey('index', $trace);
+            $this->assertSame(
+                sprintf('%s', $i + 1),
+                preg_replace(sprintf('/%s/', chr(0xC2) . chr(0xA0)), '', $trace['index'])
+            );
+
+            // since we merged file & line together
+            $this->assertArrayNotHasKey('line', $trace);
+            $this->assertArrayHasKey('file', $trace);
+
+            // since we dropped object & args in the backtrace for performance
+            // but args MAY STILL BE present in internal calls
+            $this->assertArrayNotHasKey('object', $trace);
+        }
+    }
+}

From 505b3961d7192793e1b0d2536ad8c2beff926059 Mon Sep 17 00:00:00 2001
From: Tim Zandbergen <TimZ99@users.noreply.github.com>
Date: Tue, 4 Jan 2022 22:30:58 +0100
Subject: [PATCH 1085/2325] Replaced deprecated `FILTER_SANITIZE_STRING`

Replaced with FILTER_SANITIZE_FULL_SPECIAL_CHARS. Equivalent to calling htmlspecialchars() with ENT_QUOTES set.
---
 user_guide_src/source/incoming/incomingrequest.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index fe6c26909aed..46ebd35b4bf9 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -399,7 +399,7 @@ The methods provided by the parent classes that are available are:
         The second optional parameter lets you run the data through the PHP's
         filters. Pass in the desired filter type as the second parameter::
 
-            $request->getVar('some_data', FILTER_SANITIZE_STRING);
+            $request->getVar('some_data', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
         To return an array of all POST items call without any parameters.
 
@@ -407,7 +407,7 @@ The methods provided by the parent classes that are available are:
         first parameter to null while setting the second parameter to the filter
         you want to use::
 
-            $request->getVar(null, FILTER_SANITIZE_STRING);
+            $request->getVar(null, FILTER_SANITIZE_FULL_SPECIAL_CHARS);
             // returns all POST items with string sanitation
 
         To return an array of multiple POST parameters, pass all the required keys as an array::
@@ -417,7 +417,7 @@ The methods provided by the parent classes that are available are:
         Same rule applied here, to retrieve the parameters with filtering, set the second parameter to
         the filter type to apply::
 
-            $request->getVar(['field1', 'field2'], FILTER_SANITIZE_STRING);
+            $request->getVar(['field1', 'field2'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
 
     .. php:method:: getGet([$index = null[, $filter = null[, $flags = null]]])
 
@@ -489,7 +489,7 @@ The methods provided by the parent classes that are available are:
         This method is identical to ``getPost()`` and ``getGet()``, only it fetches cookie data::
 
             $request->getCookie('some_cookie');
-            $request->getCookie('some_cookie', FILTER_SANITIZE_STRING); // with filter
+            $request->getCookie('some_cookie', FILTER_SANITIZE_FULL_SPECIAL_CHARS); // with filter
 
         To return an array of multiple cookie values, pass all the required keys as an array::
 

From 490fece27b78cf46361239a328cbb324a3e45935 Mon Sep 17 00:00:00 2001
From: Tim Zandbergen <TimZ99@users.noreply.github.com>
Date: Tue, 4 Jan 2022 23:07:50 +0100
Subject: [PATCH 1086/2325] Replaced deprecated `FILTER_SANITIZE_STRING`

Replaced with FILTER_SANITIZE_FULL_SPECIAL_CHARS. Equivalent to calling htmlspecialchars() with ENT_QUOTES set.
---
 system/Helpers/cookie_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Helpers/cookie_helper.php b/system/Helpers/cookie_helper.php
index e47a86356dbf..51a746c5395b 100755
--- a/system/Helpers/cookie_helper.php
+++ b/system/Helpers/cookie_helper.php
@@ -65,7 +65,7 @@ function get_cookie($index, bool $xssClean = false)
     {
         $prefix  = isset($_COOKIE[$index]) ? '' : config(App::class)->cookiePrefix;
         $request = Services::request();
-        $filter  = $xssClean ? FILTER_SANITIZE_STRING : FILTER_DEFAULT;
+        $filter  = $xssClean ? FILTER_SANITIZE_FULL_SPECIAL_CHARS : FILTER_DEFAULT;
 
         return $request->getCookie($prefix . $index, $filter);
     }

From b4b24e0957ac05bc15d920ca44637a6bb01d17d2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 8 Jan 2022 10:23:42 +0900
Subject: [PATCH 1087/2325] docs: add changelogs, upgrade_417, and warning in
 cookie_helper.rst

---
 user_guide_src/source/changelogs/index.rst    |  1 +
 user_guide_src/source/changelogs/v4.1.7.rst   | 35 +++++++++++++
 .../source/helpers/cookie_helper.rst          |  2 +
 .../source/installation/upgrade_417.rst       | 51 +++++++++++++++++++
 .../source/installation/upgrading.rst         |  1 +
 5 files changed, 90 insertions(+)
 create mode 100644 user_guide_src/source/changelogs/v4.1.7.rst
 create mode 100644 user_guide_src/source/installation/upgrade_417.rst

diff --git a/user_guide_src/source/changelogs/index.rst b/user_guide_src/source/changelogs/index.rst
index 8a54083777d3..74e782cb3508 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.1.7
     v4.1.6
     v4.1.5
     v4.1.4
diff --git a/user_guide_src/source/changelogs/v4.1.7.rst b/user_guide_src/source/changelogs/v4.1.7.rst
new file mode 100644
index 000000000000..33d2efffe850
--- /dev/null
+++ b/user_guide_src/source/changelogs/v4.1.7.rst
@@ -0,0 +1,35 @@
+Version 4.1.7
+#############
+
+Release Date: Not Released
+
+**4.1.7 release of CodeIgniter4**
+
+.. contents::
+    :local:
+    :depth: 2
+
+BREAKING
+********
+
+- Because ``FILTER_SANITIZE_STRING`` is deprecated since PHP 8.1, ``get_cookie()`` that uses it when ``$xssClean`` is true changed the output. Now it uses ``FILTER_SANITIZE_FULL_SPECIAL_CHARS``. Note that using XSS filtering is a bad practice. It does not prevent XSS attacks perfectly. Using ``esc()`` with the correct ``$context`` in the views is recommended.
+
+Enhancements
+************
+
+none.
+
+Changes
+*******
+
+none.
+
+Deprecations
+************
+
+none.
+
+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/helpers/cookie_helper.rst b/user_guide_src/source/helpers/cookie_helper.rst
index 597adaa66c9a..a5e2946e5869 100755
--- a/user_guide_src/source/helpers/cookie_helper.rst
+++ b/user_guide_src/source/helpers/cookie_helper.rst
@@ -53,6 +53,8 @@ The following functions are available:
     the ``$cookiePrefix`` that you might've set in your
     **app/Config/App.php** file.
 
+.. warning:: Using XSS filtering is a bad practice. It does not prevent XSS attacks perfectly. Using ``esc()`` with the correct ``$context`` in the views is recommended.
+
 .. php:function:: delete_cookie($name[, $domain = ''[, $path = '/'[, $prefix = '']]])
 
     :param string $name: Cookie name
diff --git a/user_guide_src/source/installation/upgrade_417.rst b/user_guide_src/source/installation/upgrade_417.rst
new file mode 100644
index 000000000000..4b94375f65ce
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_417.rst
@@ -0,0 +1,51 @@
+#############################
+Upgrading from 4.1.6 to 4.1.7
+#############################
+
+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
+
+Breaking Changes
+****************
+
+- ``get_cookie()`` when ``$xssClean`` is true changed the output. Now it uses ``FILTER_SANITIZE_FULL_SPECIAL_CHARS``, not ``FILTER_SANITIZE_STRING``. Make sure the change is acceptable or not. Note that using XSS filtering is a bad practice. It does not prevent XSS attacks perfectly. Using ``esc()`` with the correct ``$context`` in the views is recommended.
+
+Breaking Enhancements
+*********************
+
+none.
+
+Project Files
+*************
+
+Numerous 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>`_.
+
+.. note:: Except in very rare cases for bug fixes, no changes made to files for the project space
+    will break your application. All changes noted here are optional until the next major version,
+    and any mandatory changes will be covered in the sections above.
+
+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:
+
+*
+
+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:
+
+*
diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index 771392d8f81a..d142117ba7b9 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -8,6 +8,7 @@ upgrading from.
 .. toctree::
     :titlesonly:
 
+    Upgrading from 4.1.6 to 4.1.7 <upgrade_417>
     Upgrading from 4.1.5 to 4.1.6 <upgrade_416>
     Upgrading from 4.1.4 to 4.1.5 <upgrade_415>
     Upgrading from 4.1.3 to 4.1.4 <upgrade_414>

From 72255dab23cc1f99c0fc8160a327fc11aff839df Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 8 Jan 2022 11:47:28 +0900
Subject: [PATCH 1088/2325] docs: generate CHANGELOG.md

---
 CHANGELOG.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d333c153241..9da2f2e61492 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## [v4.1.7](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.7) (2022-01-XX)
+
+[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.6...v4.1.7)
+
+**Breaking Changes**
+
+* fix: replace deprecated FILTER_SANITIZE_STRING by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5555
+
+**Fixed Bugs**
+
+* fix: BaseConnection::getConnectDuration() number_format(): Passing null to parameter by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5536
+* Fix: Debug toolbar selectors by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/5544
+* Fix: Toolbar. ciDebugBar.showTab() context. by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/5554
+* Refactor Database Collector display by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5553
+
 ## [v4.1.6](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.6) (2022-01-03)
 
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.5...v4.1.6)

From b6c21c35e3e37eaf1cca2e4ecef0d617053572d8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 8 Jan 2022 11:54:29 +0900
Subject: [PATCH 1089/2325] chore: update verion to 4.1.7

---
 system/CodeIgniter.php        | 2 +-
 user_guide_src/source/conf.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index bcce77f1f853..ed4e500466f6 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -45,7 +45,7 @@ class CodeIgniter
     /**
      * The current version of CodeIgniter Framework
      */
-    public const CI_VERSION = '4.1.6';
+    public const CI_VERSION = '4.1.7';
 
     private const MIN_PHP_VERSION = '7.3';
 
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 0d5246a4aaaa..60a34e9c178b 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -24,7 +24,7 @@
 version = '4.1'
 
 # The full version, including alpha/beta/rc tags.
-release = '4.1.6'
+release = '4.1.7'
 
 # -- General configuration ---------------------------------------------------
 

From ff7150e23230bef464f59aafebaf506246e52297 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 8 Jan 2022 11:58:38 +0900
Subject: [PATCH 1090/2325] docs: remove not changed sections in upgrade_417

---
 .../source/installation/upgrade_417.rst       | 33 -------------------
 1 file changed, 33 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_417.rst b/user_guide_src/source/installation/upgrade_417.rst
index 4b94375f65ce..fd5c3cf80543 100644
--- a/user_guide_src/source/installation/upgrade_417.rst
+++ b/user_guide_src/source/installation/upgrade_417.rst
@@ -16,36 +16,3 @@ Breaking Changes
 ****************
 
 - ``get_cookie()`` when ``$xssClean`` is true changed the output. Now it uses ``FILTER_SANITIZE_FULL_SPECIAL_CHARS``, not ``FILTER_SANITIZE_STRING``. Make sure the change is acceptable or not. Note that using XSS filtering is a bad practice. It does not prevent XSS attacks perfectly. Using ``esc()`` with the correct ``$context`` in the views is recommended.
-
-Breaking Enhancements
-*********************
-
-none.
-
-Project Files
-*************
-
-Numerous 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>`_.
-
-.. note:: Except in very rare cases for bug fixes, no changes made to files for the project space
-    will break your application. All changes noted here are optional until the next major version,
-    and any mandatory changes will be covered in the sections above.
-
-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:
-
-*
-
-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:
-
-*

From 867e8d69635d96c2e2b33e070cbc14d4e5387659 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 9 Jan 2022 11:21:37 +0900
Subject: [PATCH 1091/2325] fix: add missing Migration lang item

---
 system/Commands/Database/Migrate.php | 2 +-
 system/Language/en/Migrations.php    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/Commands/Database/Migrate.php b/system/Commands/Database/Migrate.php
index 91a699b346d6..fb8de810cded 100644
--- a/system/Commands/Database/Migrate.php
+++ b/system/Commands/Database/Migrate.php
@@ -91,7 +91,7 @@ public function run(array $params)
                 CLI::write($message);
             }
 
-            CLI::write('Done migrations.', 'green');
+            CLI::write(lang('Migrations.done'), 'green');
 
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {
diff --git a/system/Language/en/Migrations.php b/system/Language/en/Migrations.php
index 1e9ef6316d37..df0aeed93dcf 100644
--- a/system/Language/en/Migrations.php
+++ b/system/Language/en/Migrations.php
@@ -36,6 +36,7 @@
 
     'latest'            => 'Running all new migrations...',
     'generalFault'      => 'Migration failed!',
+    'done'              => 'Done migrations.',
     'migInvalidVersion' => 'Invalid version number provided.',
     'toVersionPH'       => 'Migrating to version %s...',
     'toVersion'         => 'Migrating to current version...',

From ceff4d71844873e2b4ba5969e88f811254e7f014 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 10 Jan 2022 08:37:30 +0900
Subject: [PATCH 1092/2325] refactor: fix lang key

Co-authored-by: MGatner <mgatner@icloud.com>
---
 system/Commands/Database/Migrate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Commands/Database/Migrate.php b/system/Commands/Database/Migrate.php
index fb8de810cded..bcf71cade337 100644
--- a/system/Commands/Database/Migrate.php
+++ b/system/Commands/Database/Migrate.php
@@ -91,7 +91,7 @@ public function run(array $params)
                 CLI::write($message);
             }
 
-            CLI::write(lang('Migrations.done'), 'green');
+            CLI::write(lang('Migrations.migrated'), 'green');
 
             // @codeCoverageIgnoreStart
         } catch (Throwable $e) {

From 41c8b17854e8d05fcb7fe6008117a7ec611a6c79 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 10 Jan 2022 08:37:44 +0900
Subject: [PATCH 1093/2325] refactor: fix lang key

Co-authored-by: MGatner <mgatner@icloud.com>
---
 system/Language/en/Migrations.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Language/en/Migrations.php b/system/Language/en/Migrations.php
index df0aeed93dcf..9bfb5c60ae25 100644
--- a/system/Language/en/Migrations.php
+++ b/system/Language/en/Migrations.php
@@ -36,7 +36,7 @@
 
     'latest'            => 'Running all new migrations...',
     'generalFault'      => 'Migration failed!',
-    'done'              => 'Done migrations.',
+    'migrated'          => 'Migrations complete.',
     'migInvalidVersion' => 'Invalid version number provided.',
     'toVersionPH'       => 'Migrating to version %s...',
     'toVersion'         => 'Migrating to current version...',

From 1abcac39979d21524ab90f516b2efc8f1cb89b49 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 10 Jan 2022 10:23:13 +0900
Subject: [PATCH 1094/2325] test: update migration message

---
 tests/system/Commands/DatabaseCommandsTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/system/Commands/DatabaseCommandsTest.php b/tests/system/Commands/DatabaseCommandsTest.php
index 0d33342654f0..51221142f9b1 100644
--- a/tests/system/Commands/DatabaseCommandsTest.php
+++ b/tests/system/Commands/DatabaseCommandsTest.php
@@ -52,12 +52,12 @@ protected function clearBuffer(): void
     public function testMigrate()
     {
         command('migrate --all');
-        $this->assertStringContainsString('Done migrations.', $this->getBuffer());
+        $this->assertStringContainsString('Migrations complete.', $this->getBuffer());
         command('migrate:rollback');
 
         $this->clearBuffer();
         command('migrate -n Tests\\\\Support');
-        $this->assertStringContainsString('Done migrations.', $this->getBuffer());
+        $this->assertStringContainsString('Migrations complete.', $this->getBuffer());
     }
 
     public function testMigrateRollback()
@@ -75,7 +75,7 @@ public function testMigrateRefresh()
         $this->clearBuffer();
 
         command('migrate:refresh');
-        $this->assertStringContainsString('Done migrations.', $this->getBuffer());
+        $this->assertStringContainsString('Migrations complete.', $this->getBuffer());
     }
 
     public function testMigrateStatus()

From 3e088a9e00fc271d1bb46d1ee454e92a7b91a2d1 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Mon, 10 Jan 2022 01:30:43 +0000
Subject: [PATCH 1095/2325] Apply release dates

---
 CHANGELOG.md                                | 2 +-
 user_guide_src/source/changelogs/v4.1.7.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9da2f2e61492..23c77082242e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [v4.1.7](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.7) (2022-01-XX)
+## [v4.1.7](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.7) (2022-01-09)
 
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.6...v4.1.7)
 
diff --git a/user_guide_src/source/changelogs/v4.1.7.rst b/user_guide_src/source/changelogs/v4.1.7.rst
index 33d2efffe850..5c9d07357858 100644
--- a/user_guide_src/source/changelogs/v4.1.7.rst
+++ b/user_guide_src/source/changelogs/v4.1.7.rst
@@ -1,7 +1,7 @@
 Version 4.1.7
 #############
 
-Release Date: Not Released
+Release Date: January 9, 2022
 
 **4.1.7 release of CodeIgniter4**
 

From af7fb3f9a5a3c63b5b9e0f1ad15e202bc7b93943 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 13 Dec 2021 22:07:52 +0700
Subject: [PATCH 1096/2325] [Rector] Apply PHP 7.4 Requirement and syntax

---
 app/Config/Constants.php                      |  6 +-
 app/Config/Events.php                         |  4 +-
 composer.json                                 |  2 +-
 rector.php                                    |  4 +-
 system/Autoloader/FileLocator.php             |  2 +-
 system/BaseModel.php                          |  2 +-
 system/CodeIgniter.php                        |  2 +-
 system/Commands/Generators/MigrateCreate.php  |  4 +-
 system/Commands/Help.php                      |  2 +-
 system/Commands/Utilities/Environment.php     |  2 +-
 system/Common.php                             |  6 +-
 system/ComposerScripts.php                    |  6 +-
 system/Config/AutoloadConfig.php              |  2 +-
 system/Config/BaseService.php                 |  2 +-
 system/Config/Factories.php                   |  2 +-
 system/Config/Services.php                    | 56 +++++++++----------
 system/Controller.php                         |  2 +-
 system/Cookie/Cookie.php                      |  7 +--
 system/Database/Config.php                    |  2 +-
 system/Database/Forge.php                     |  4 +-
 system/Database/Postgre/Builder.php           |  2 +-
 system/Database/Postgre/Connection.php        |  4 +-
 system/Database/Postgre/PreparedQuery.php     |  2 +-
 system/Database/Query.php                     |  4 +-
 system/Database/SQLSRV/Builder.php            |  4 +-
 system/Database/SQLSRV/Connection.php         |  4 +-
 system/Database/SQLSRV/Forge.php              |  4 +-
 system/Debug/Exceptions.php                   |  4 +-
 system/Debug/Toolbar.php                      |  4 +-
 system/Debug/Toolbar/Collectors/Database.php  |  4 +-
 system/Encryption/Encryption.php              |  2 +-
 system/Encryption/Handlers/BaseHandler.php    |  2 +-
 system/Entity/Entity.php                      | 12 ++--
 system/Files/File.php                         |  2 +-
 system/Files/FileCollection.php               |  8 +--
 system/Filters/Filters.php                    |  2 +-
 system/HTTP/CURLRequest.php                   |  8 +--
 system/HTTP/DownloadResponse.php              | 22 ++------
 system/HTTP/Files/UploadedFile.php            |  4 +-
 system/HTTP/IncomingRequest.php               |  4 +-
 system/HTTP/RequestTrait.php                  |  2 +-
 system/HTTP/Response.php                      |  2 +-
 system/HTTP/URI.php                           | 10 +---
 system/Helpers/array_helper.php               |  8 +--
 system/Helpers/html_helper.php                |  2 +-
 system/Helpers/number_helper.php              | 30 +++++-----
 system/Helpers/url_helper.php                 |  6 +-
 system/I18n/Time.php                          | 10 ++--
 system/Images/Image.php                       |  2 +-
 system/Language/Language.php                  |  2 +-
 system/Log/Handlers/FileHandler.php           |  2 +-
 system/Model.php                              |  2 +-
 system/Pager/Pager.php                        |  2 +-
 system/Publisher/Publisher.php                |  6 +-
 system/Router/RouteCollection.php             |  4 +-
 system/Router/Router.php                      |  4 +-
 system/Security/Security.php                  | 14 ++---
 system/Test/CIUnitTestCase.php                |  4 +-
 system/Test/FilterTestTrait.php               | 16 ++----
 system/Test/ReflectionHelper.php              |  4 +-
 system/Validation/Validation.php              |  6 +-
 system/View/Parser.php                        |  2 +-
 system/View/View.php                          | 10 ++--
 tests/system/CLI/CommandRunnerTest.php        |  5 +-
 tests/system/Cache/CacheFactoryTest.php       |  6 +-
 .../Cache/Handlers/DummyHandlerTest.php       |  6 +-
 .../system/Cache/Handlers/FileHandlerTest.php | 12 ++--
 .../Cache/Handlers/MemcachedHandlerTest.php   |  6 +-
 .../Cache/Handlers/PredisHandlerTest.php      |  6 +-
 .../Cache/Handlers/RedisHandlerTest.php       |  6 +-
 tests/system/CodeIgniterTest.php              |  8 +--
 .../Commands/EnvironmentCommandTest.php       |  4 +-
 tests/system/Commands/GenerateKeyTest.php     |  4 +-
 .../Commands/MigrationIntegrationTest.php     |  4 +-
 tests/system/CommonHelperTest.php             |  2 +-
 tests/system/Cookie/CookieStoreTest.php       |  5 +-
 tests/system/Cookie/CookieTest.php            |  5 +-
 tests/system/Database/Builder/GroupTest.php   | 24 ++------
 tests/system/Database/Builder/WhereTest.php   | 16 ++----
 .../Database/Live/PreparedQueryTest.php       | 27 ++++-----
 tests/system/Debug/ExceptionsTest.php         |  5 +-
 tests/system/Files/FileCollectionTest.php     |  8 +--
 tests/system/Filters/FiltersTest.php          |  2 +-
 tests/system/Filters/InvalidCharsTest.php     | 10 +---
 tests/system/HTTP/ResponseCookieTest.php      |  5 +-
 tests/system/Helpers/CookieHelperTest.php     |  7 ++-
 tests/system/Helpers/HTMLHelperTest.php       |  4 +-
 tests/system/Helpers/NumberHelperTest.php     |  6 +-
 tests/system/Helpers/TextHelperTest.php       |  2 +-
 .../Helpers/URLHelper/CurrentUrlTest.php      |  5 +-
 .../system/Helpers/URLHelper/MiscUrlTest.php  |  5 +-
 .../system/Helpers/URLHelper/SiteUrlTest.php  |  5 +-
 tests/system/I18n/TimeDifferenceTest.php      |  8 +--
 tests/system/Language/LanguageTest.php        |  5 +-
 tests/system/Models/GeneralModelTest.php      | 14 ++---
 tests/system/Publisher/PublisherInputTest.php |  8 +--
 .../system/Publisher/PublisherOutputTest.php  | 16 ++----
 .../system/Publisher/PublisherSupportTest.php |  8 +--
 tests/system/Router/RouterTest.php            |  4 +-
 .../SecurityCSRFSessionRandomizeTokenTest.php |  4 +-
 .../Security/SecurityCSRFSessionTest.php      |  2 +-
 tests/system/Test/BootstrapFCPATHTest.php     |  6 +-
 tests/system/Test/FeatureTestTraitTest.php    | 40 ++++---------
 tests/system/Test/ReflectionHelperTest.php    |  4 +-
 .../system/Validation/CreditCardRulesTest.php |  7 +--
 .../Validation/DatabaseRelatedRulesTest.php   |  7 +--
 tests/system/Validation/FileRulesTest.php     | 13 ++---
 tests/system/Validation/FormatRulesTest.php   |  7 +--
 tests/system/Validation/RulesTest.php         |  7 +--
 tests/system/Validation/ValidationTest.php    |  7 +--
 tests/system/View/ParserFilterTest.php        | 10 ++--
 tests/system/View/ParserTest.php              | 44 ++++-----------
 ...moveErrorSuppressInTryCatchStmtsRector.php |  4 +-
 ...nderscoreToCamelCaseVariableNameRector.php |  5 +-
 114 files changed, 286 insertions(+), 525 deletions(-)

diff --git a/app/Config/Constants.php b/app/Config/Constants.php
index 8f8498a58a0a..2290758cebee 100644
--- a/app/Config/Constants.php
+++ b/app/Config/Constants.php
@@ -38,9 +38,9 @@
 defined('HOUR')   || define('HOUR', 3600);
 defined('DAY')    || define('DAY', 86400);
 defined('WEEK')   || define('WEEK', 604800);
-defined('MONTH')  || define('MONTH', 2592000);
-defined('YEAR')   || define('YEAR', 31536000);
-defined('DECADE') || define('DECADE', 315360000);
+defined('MONTH')  || define('MONTH', 2_592_000);
+defined('YEAR')   || define('YEAR', 31_536_000);
+defined('DECADE') || define('DECADE', 315_360_000);
 
 /*
  | --------------------------------------------------------------------------
diff --git a/app/Config/Events.php b/app/Config/Events.php
index 183280ebda31..36ce2c74ab36 100644
--- a/app/Config/Events.php
+++ b/app/Config/Events.php
@@ -32,9 +32,7 @@
             ob_end_flush();
         }
 
-        ob_start(static function ($buffer) {
-            return $buffer;
-        });
+        ob_start(static fn($buffer) => $buffer);
     }
 
     /*
diff --git a/composer.json b/composer.json
index f93b7034a992..fc02c21539d4 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "homepage": "https://codeigniter.com",
     "license": "MIT",
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "ext-curl": "*",
         "ext-intl": "*",
         "ext-json": "*",
diff --git a/rector.php b/rector.php
index 21f63c0eca1b..11daa7a10bec 100644
--- a/rector.php
+++ b/rector.php
@@ -27,7 +27,6 @@
 use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector;
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
 use Rector\Core\Configuration\Option;
-use Rector\Core\ValueObject\PhpVersion;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector;
 use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector;
@@ -54,7 +53,7 @@
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $containerConfigurator->import(SetList::DEAD_CODE);
-    $containerConfigurator->import(LevelSetList::UP_TO_PHP_73);
+    $containerConfigurator->import(LevelSetList::UP_TO_PHP_74);
     $containerConfigurator->import(PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD);
     $containerConfigurator->import(PHPUnitSetList::PHPUNIT_80);
 
@@ -119,7 +118,6 @@
 
     // auto import fully qualified class names
     $parameters->set(Option::AUTO_IMPORT_NAMES, true);
-    $parameters->set(Option::PHP_VERSION_FEATURES, PhpVersion::PHP_73);
 
     $services = $containerConfigurator->services();
     $services->set(UnderscoreToCamelCaseVariableNameRector::class);
diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index b8bfdf6df217..3facd6b7aa83 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -186,7 +186,7 @@ public function search(string $path, string $ext = 'php', bool $prioritizeApp =
         }
 
         if (! $prioritizeApp && ! empty($appPaths)) {
-            $foundPaths = array_merge($foundPaths, $appPaths);
+            $foundPaths = [...$foundPaths, ...$appPaths];
         }
 
         // Remove any duplicates
diff --git a/system/BaseModel.php b/system/BaseModel.php
index 971303664a8e..4d2bc203c44d 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -295,7 +295,7 @@ public function __construct(?ValidationInterface $validation = null)
         /**
          * @var Validation $validation
          */
-        $validation       = $validation ?? Services::validation(null, false);
+        $validation ??= Services::validation(null, false);
         $this->validation = $validation;
 
         $this->initialize();
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index ed4e500466f6..2d1cd50dcc62 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -576,7 +576,7 @@ protected function getResponseObject()
      * @param int $duration How long the Strict Transport Security
      *                      should be enforced for this URL.
      */
-    protected function forceSecureAccess($duration = 31536000)
+    protected function forceSecureAccess($duration = 31_536_000)
     {
         if ($this->config->forceGlobalSecureRequests !== true) {
             return;
diff --git a/system/Commands/Generators/MigrateCreate.php b/system/Commands/Generators/MigrateCreate.php
index 4803dc96db25..0b4935342831 100644
--- a/system/Commands/Generators/MigrateCreate.php
+++ b/system/Commands/Generators/MigrateCreate.php
@@ -77,9 +77,9 @@ class MigrateCreate extends BaseCommand
     public function run(array $params)
     {
         // Resolve arguments before passing to make:migration
-        $params[0] = $params[0] ?? CLI::getSegment(2);
+        $params[0] ??= CLI::getSegment(2);
 
-        $params['namespace'] = $params['namespace'] ?? CLI::getOption('namespace') ?? APP_NAMESPACE;
+        $params['namespace'] ??= CLI::getOption('namespace') ?? APP_NAMESPACE;
 
         if (array_key_exists('force', $params) || CLI::getOption('force')) {
             $params['force'] = null;
diff --git a/system/Commands/Help.php b/system/Commands/Help.php
index 7562333a4f09..bda3179f0365 100644
--- a/system/Commands/Help.php
+++ b/system/Commands/Help.php
@@ -72,7 +72,7 @@ class Help extends BaseCommand
     public function run(array $params)
     {
         $command  = array_shift($params);
-        $command  = $command ?? 'help';
+        $command ??= 'help';
         $commands = $this->commands->getCommands();
 
         if (! $this->commands->verifyCommand($command, $commands)) {
diff --git a/system/Commands/Utilities/Environment.php b/system/Commands/Utilities/Environment.php
index 5586de575dbd..b844e7a260f2 100644
--- a/system/Commands/Utilities/Environment.php
+++ b/system/Commands/Utilities/Environment.php
@@ -72,7 +72,7 @@ final class Environment extends BaseCommand
      *
      * @var array<int, string>
      */
-    private static $knownTypes = [
+    private static array $knownTypes = [
         'production',
         'development',
     ];
diff --git a/system/Common.php b/system/Common.php
index 158211032b8b..5a67f045fede 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -445,7 +445,7 @@ function esc($data, string $context = 'html', ?string $encoding = null)
      *
      * @throws HTTPException
      */
-    function force_https(int $duration = 31536000, ?RequestInterface $request = null, ?ResponseInterface $response = null)
+    function force_https(int $duration = 31_536_000, ?RequestInterface $request = null, ?ResponseInterface $response = null)
     {
         if ($request === null) {
             $request = Services::request(null, true);
@@ -618,7 +618,7 @@ function helper($filenames)
                 }
 
                 // All namespaced files get added in next
-                $includes = array_merge($includes, $localIncludes);
+                $includes = [...$includes, ...$localIncludes];
 
                 // And the system default one should be added in last.
                 if (! empty($systemHelper)) {
@@ -949,7 +949,7 @@ function single_service(string $name, ...$params)
         $method = new ReflectionMethod($service, $name);
         $count  = $method->getNumberOfParameters();
         $mParam = $method->getParameters();
-        $params = $params ?? [];
+        $params ??= [];
 
         if ($count === 1) {
             // This service needs only one argument, which is the shared
diff --git a/system/ComposerScripts.php b/system/ComposerScripts.php
index ef4dfe1a801b..62e5d828e1ce 100644
--- a/system/ComposerScripts.php
+++ b/system/ComposerScripts.php
@@ -30,10 +30,8 @@ final class ComposerScripts
 {
     /**
      * Path to the ThirdParty directory.
-     *
-     * @var string
      */
-    private static $path = __DIR__ . '/ThirdParty/';
+    private static string $path = __DIR__ . '/ThirdParty/';
 
     /**
      * Direct dependencies of CodeIgniter to copy
@@ -41,7 +39,7 @@ final class ComposerScripts
      *
      * @var array<string, array<string, string>>
      */
-    private static $dependencies = [
+    private static array $dependencies = [
         'kint-src' => [
             'license' => __DIR__ . '/../vendor/kint-php/kint/LICENSE',
             'from'    => __DIR__ . '/../vendor/kint-php/kint/src/',
diff --git a/system/Config/AutoloadConfig.php b/system/Config/AutoloadConfig.php
index 0818271e002f..d3dbefcd7c3c 100644
--- a/system/Config/AutoloadConfig.php
+++ b/system/Config/AutoloadConfig.php
@@ -130,6 +130,6 @@ public function __construct()
 
         $this->psr4     = array_merge($this->corePsr4, $this->psr4);
         $this->classmap = array_merge($this->coreClassmap, $this->classmap);
-        $this->files    = array_merge($this->coreFiles, $this->files);
+        $this->files    = [...$this->coreFiles, ...$this->files];
     }
 }
diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
index d390807fc51f..b50617d7ed83 100644
--- a/system/Config/BaseService.php
+++ b/system/Config/BaseService.php
@@ -162,7 +162,7 @@ class BaseService
      *
      * @var array<string>
      */
-    private static $serviceNames = [];
+    private static array $serviceNames = [];
 
     /**
      * Returns a shared instance of any of the class' services.
diff --git a/system/Config/Factories.php b/system/Config/Factories.php
index 0a6f34d10e27..31188c1b03a1 100644
--- a/system/Config/Factories.php
+++ b/system/Config/Factories.php
@@ -41,7 +41,7 @@ class Factories
      *
      * @var array<string, mixed>
      */
-    private static $configOptions = [
+    private static array $configOptions = [
         'component'  => 'config',
         'path'       => 'Config',
         'instanceOf' => null,
diff --git a/system/Config/Services.php b/system/Config/Services.php
index 0b681f17ce17..b72fad36eec7 100644
--- a/system/Config/Services.php
+++ b/system/Config/Services.php
@@ -101,7 +101,7 @@ public static function cache(?Cache $config = null, bool $getShared = true)
             return static::getSharedInstance('cache', $config);
         }
 
-        $config = $config ?? new Cache();
+        $config ??= new Cache();
 
         return CacheFactory::getHandler($config);
     }
@@ -118,7 +118,7 @@ public static function clirequest(?App $config = null, bool $getShared = true)
             return static::getSharedInstance('clirequest', $config);
         }
 
-        $config = $config ?? config('App');
+        $config ??= config('App');
 
         return new CLIRequest($config);
     }
@@ -134,7 +134,7 @@ public static function codeigniter(?App $config = null, bool $getShared = true)
             return static::getSharedInstance('codeigniter', $config);
         }
 
-        $config = $config ?? config('App');
+        $config ??= config('App');
 
         return new CodeIgniter($config);
     }
@@ -165,8 +165,8 @@ public static function curlrequest(array $options = [], ?ResponseInterface $resp
             return static::getSharedInstance('curlrequest', $options, $response, $config);
         }
 
-        $config   = $config ?? config('App');
-        $response = $response ?? new Response($config);
+        $config ??= config('App');
+        $response ??= new Response($config);
 
         return new CURLRequest(
             $config,
@@ -209,7 +209,7 @@ public static function encrypter(?EncryptionConfig $config = null, $getShared =
             return static::getSharedInstance('encrypter', $config);
         }
 
-        $config     = $config ?? config('Encryption');
+        $config ??= config('Encryption');
         $encryption = new Encryption($config);
 
         return $encryption->initialize($config);
@@ -234,9 +234,9 @@ public static function exceptions(
             return static::getSharedInstance('exceptions', $config, $request, $response);
         }
 
-        $config   = $config ?? config('Exceptions');
-        $request  = $request ?? AppServices::request();
-        $response = $response ?? AppServices::response();
+        $config ??= config('Exceptions');
+        $request ??= AppServices::request();
+        $response ??= AppServices::response();
 
         return new Exceptions($config, $request, $response);
     }
@@ -255,7 +255,7 @@ public static function filters(?FiltersConfig $config = null, bool $getShared =
             return static::getSharedInstance('filters', $config);
         }
 
-        $config = $config ?? config('Filters');
+        $config ??= config('Filters');
 
         return new Filters($config, AppServices::request(), AppServices::response());
     }
@@ -271,7 +271,7 @@ public static function format(?FormatConfig $config = null, bool $getShared = tr
             return static::getSharedInstance('format', $config);
         }
 
-        $config = $config ?? config('Format');
+        $config ??= config('Format');
 
         return new Format($config);
     }
@@ -288,7 +288,7 @@ public static function honeypot(?HoneypotConfig $config = null, bool $getShared
             return static::getSharedInstance('honeypot', $config);
         }
 
-        $config = $config ?? config('Honeypot');
+        $config ??= config('Honeypot');
 
         return new Honeypot($config);
     }
@@ -305,7 +305,7 @@ public static function image(?string $handler = null, ?Images $config = null, bo
             return static::getSharedInstance('image', $handler, $config);
         }
 
-        $config  = $config ?? config('Images');
+        $config ??= config('Images');
         $handler = $handler ?: $config->defaultHandler;
         $class   = $config->handlers[$handler];
 
@@ -371,7 +371,7 @@ public static function migrations(?Migrations $config = null, ?ConnectionInterfa
             return static::getSharedInstance('migrations', $config, $db);
         }
 
-        $config = $config ?? config('Migrations');
+        $config ??= config('Migrations');
 
         return new MigrationRunner($config, $db);
     }
@@ -389,7 +389,7 @@ public static function negotiator(?RequestInterface $request = null, bool $getSh
             return static::getSharedInstance('negotiator', $request);
         }
 
-        $request = $request ?? AppServices::request();
+        $request ??= AppServices::request();
 
         return new Negotiate($request);
     }
@@ -405,8 +405,8 @@ public static function pager(?PagerConfig $config = null, ?RendererInterface $vi
             return static::getSharedInstance('pager', $config, $view);
         }
 
-        $config = $config ?? config('Pager');
-        $view   = $view ?? AppServices::renderer();
+        $config ??= config('Pager');
+        $view ??= AppServices::renderer();
 
         return new Pager($config, $view);
     }
@@ -423,7 +423,7 @@ public static function parser(?string $viewPath = null, ?ViewConfig $config = nu
         }
 
         $viewPath = $viewPath ?: config('Paths')->viewDirectory;
-        $config   = $config ?? config('View');
+        $config ??= config('View');
 
         return new Parser($config, $viewPath, AppServices::locator(), CI_DEBUG, AppServices::logger());
     }
@@ -442,7 +442,7 @@ public static function renderer(?string $viewPath = null, ?ViewConfig $config =
         }
 
         $viewPath = $viewPath ?: config('Paths')->viewDirectory;
-        $config   = $config ?? config('View');
+        $config ??= config('View');
 
         return new View($config, $viewPath, AppServices::locator(), CI_DEBUG, AppServices::logger());
     }
@@ -458,7 +458,7 @@ public static function request(?App $config = null, bool $getShared = true)
             return static::getSharedInstance('request', $config);
         }
 
-        $config = $config ?? config('App');
+        $config ??= config('App');
 
         return new IncomingRequest(
             $config,
@@ -479,7 +479,7 @@ public static function response(?App $config = null, bool $getShared = true)
             return static::getSharedInstance('response', $config);
         }
 
-        $config = $config ?? config('App');
+        $config ??= config('App');
 
         return new Response($config);
     }
@@ -495,7 +495,7 @@ public static function redirectresponse(?App $config = null, bool $getShared = t
             return static::getSharedInstance('redirectresponse', $config);
         }
 
-        $config   = $config ?? config('App');
+        $config ??= config('App');
         $response = new RedirectResponse($config);
         $response->setProtocolVersion(AppServices::request()->getProtocolVersion());
 
@@ -529,8 +529,8 @@ public static function router(?RouteCollectionInterface $routes = null, ?Request
             return static::getSharedInstance('router', $routes, $request);
         }
 
-        $routes  = $routes ?? AppServices::routes();
-        $request = $request ?? AppServices::request();
+        $routes ??= AppServices::routes();
+        $request ??= AppServices::request();
 
         return new Router($routes, $request);
     }
@@ -547,7 +547,7 @@ public static function security(?App $config = null, bool $getShared = true)
             return static::getSharedInstance('security', $config);
         }
 
-        $config = $config ?? config('App');
+        $config ??= config('App');
 
         return new Security($config);
     }
@@ -563,7 +563,7 @@ public static function session(?App $config = null, bool $getShared = true)
             return static::getSharedInstance('session', $config);
         }
 
-        $config = $config ?? config('App');
+        $config ??= config('App');
         $logger = AppServices::logger();
 
         $driverName = $config->sessionDriver;
@@ -621,7 +621,7 @@ public static function toolbar(?ToolbarConfig $config = null, bool $getShared =
             return static::getSharedInstance('toolbar', $config);
         }
 
-        $config = $config ?? config('Toolbar');
+        $config ??= config('Toolbar');
 
         return new Toolbar($config);
     }
@@ -653,7 +653,7 @@ public static function validation(?ValidationConfig $config = null, bool $getSha
             return static::getSharedInstance('validation', $config);
         }
 
-        $config = $config ?? config('Validation');
+        $config ??= config('Validation');
 
         return new Validation($config, AppServices::renderer());
     }
diff --git a/system/Controller.php b/system/Controller.php
index b50c8bcf3470..625bb1639b4c 100644
--- a/system/Controller.php
+++ b/system/Controller.php
@@ -97,7 +97,7 @@ public function initController(RequestInterface $request, ResponseInterface $res
      *
      * @throws HTTPException
      */
-    protected function forceHTTPS(int $duration = 31536000)
+    protected function forceHTTPS(int $duration = 31_536_000)
     {
         force_https($duration, $this->request, $this->response);
     }
diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php
index 150d42069949..e6fc999fd398 100644
--- a/system/Cookie/Cookie.php
+++ b/system/Cookie/Cookie.php
@@ -95,7 +95,7 @@ class Cookie implements ArrayAccess, CloneableCookieInterface
      *
      * @var array<string, mixed>
      */
-    private static $defaults = [
+    private static array $defaults = [
         'prefix'   => '',
         'expires'  => 0,
         'path'     => '/',
@@ -110,12 +110,11 @@ class Cookie implements ArrayAccess, CloneableCookieInterface
      * A cookie name can be any US-ASCII characters, except control characters,
      * spaces, tabs, or separator characters.
      *
-     * @var string
      *
      * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#attributes
      * @see https://tools.ietf.org/html/rfc2616#section-2.2
      */
-    private static $reservedCharsList = "=,; \t\r\n\v\f()<>@:\\\"/[]?{}";
+    private static string $reservedCharsList = "=,; \t\r\n\v\f()<>@:\\\"/[]?{}";
 
     /**
      * Set the default attributes to a Cookie instance by injecting
@@ -491,7 +490,7 @@ public function withPath(?string $path)
      */
     public function withDomain(?string $domain)
     {
-        $domain = $domain ?? self::$defaults['domain'];
+        $domain ??= self::$defaults['domain'];
         $this->validatePrefix($this->prefix, $this->secure, $this->path, $domain);
 
         $cookie = clone $this;
diff --git a/system/Database/Config.php b/system/Database/Config.php
index 6d2e82bf1109..f73c93a1169a 100644
--- a/system/Database/Config.php
+++ b/system/Database/Config.php
@@ -55,7 +55,7 @@ public static function connect($group = null, bool $getShared = true)
             $group  = 'custom-' . md5(json_encode($config));
         }
 
-        $config = $config ?? config('Database');
+        $config ??= config('Database');
 
         if (empty($group)) {
             $group = ENVIRONMENT === 'testing' ? 'tests' : $config->defaultGroup;
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 406f75b47030..a8dc13691bda 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -804,9 +804,7 @@ protected function _alterTable(string $alterType, string $table, $fields)
                 $fields = explode(',', $fields);
             }
 
-            $fields = array_map(function ($field) {
-                return 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field));
-            }, $fields);
+            $fields = array_map(fn($field) => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $fields);
 
             return $sql . implode(', ', $fields);
         }
diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index 1006ab20012e..80e9f278cf50 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -241,7 +241,7 @@ protected function _updateBatch(string $table, array $values, string $index): st
 
             foreach (array_keys($val) as $field) {
                 if ($field !== $index) {
-                    $final[$field] = $final[$field] ?? [];
+                    $final[$field] ??= [];
 
                     $final[$field][] = "WHEN {$val[$index]} THEN {$val[$field]}";
                 }
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
index 57b4c78fd749..f1de457ada4b 100644
--- a/system/Database/Postgre/Connection.php
+++ b/system/Database/Postgre/Connection.php
@@ -284,9 +284,7 @@ protected function _indexData(string $table): array
             $obj         = new stdClass();
             $obj->name   = $row->indexname;
             $_fields     = explode(',', preg_replace('/^.*\((.+?)\)$/', '$1', trim($row->indexdef)));
-            $obj->fields = array_map(static function ($v) {
-                return trim($v);
-            }, $_fields);
+            $obj->fields = array_map(static fn($v) => trim($v), $_fields);
 
             if (strpos($row->indexdef, 'CREATE UNIQUE INDEX pk') === 0) {
                 $obj->type = 'PRIMARY';
diff --git a/system/Database/Postgre/PreparedQuery.php b/system/Database/Postgre/PreparedQuery.php
index 53e42b867f0f..890534663256 100644
--- a/system/Database/Postgre/PreparedQuery.php
+++ b/system/Database/Postgre/PreparedQuery.php
@@ -52,7 +52,7 @@ class PreparedQuery extends BasePreparedQuery
      */
     public function _prepare(string $sql, array $options = [])
     {
-        $this->name = (string) random_int(1, 10000000000000000);
+        $this->name = (string) random_int(1, 10_000_000_000_000_000);
 
         $sql = $this->parameterize($sql);
 
diff --git a/system/Database/Query.php b/system/Database/Query.php
index 91b98c77d2ef..939db58792b8 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -403,9 +403,7 @@ public function debugToolbarDisplay(): string
          */
         $search = '/\b(?:' . implode('|', $highlight) . ')\b(?![^(&#039;)]*&#039;(?:(?:[^(&#039;)]*&#039;){2})*[^(&#039;)]*$)/';
 
-        return preg_replace_callback($search, static function ($matches) {
-            return '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>';
-        }, $sql);
+        return preg_replace_callback($search, static fn($matches) => '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>', $sql);
     }
 
     /**
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index 17d8bd576c9f..f58a5b302932 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -382,9 +382,7 @@ protected function _replace(string $table, array $keys, array $values): string
         }
 
         // Get the unique field names
-        $escKeyFields = array_map(function (string $field): string {
-            return $this->db->protectIdentifiers($field);
-        }, array_values(array_unique($keyFields)));
+        $escKeyFields = array_map(fn(string $field): string => $this->db->protectIdentifiers($field), array_values(array_unique($keyFields)));
 
         // Get the binds
         $binds = $this->binds;
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index 3c86839d2e88..23d309c6b234 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -229,9 +229,7 @@ protected function _indexData(string $table): array
             $obj->name = $row->index_name;
 
             $_fields     = explode(',', trim($row->index_keys));
-            $obj->fields = array_map(static function ($v) {
-                return trim($v);
-            }, $_fields);
+            $obj->fields = array_map(static fn($v) => trim($v), $_fields);
 
             if (strpos($row->index_description, 'primary key located on') !== false) {
                 $obj->type = 'PRIMARY';
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
index 14d297604cbe..db9fb32cf33e 100755
--- a/system/Database/SQLSRV/Forge.php
+++ b/system/Database/SQLSRV/Forge.php
@@ -152,9 +152,7 @@ protected function _alterTable(string $alterType, string $table, $field)
 
             $sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($this->db->schema) . '.' . $this->db->escapeIdentifiers($table) . ' DROP ';
 
-            $fields = array_map(static function ($item) {
-                return 'COLUMN [' . trim($item) . ']';
-            }, (array) $field);
+            $fields = array_map(static fn($item) => 'COLUMN [' . trim($item) . ']', (array) $field);
 
             return $sql . implode(',', $fields);
         }
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index d319c2f9746e..a65be7a2ad2f 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -352,11 +352,11 @@ public static function describeMemory(int $bytes): string
             return $bytes . 'B';
         }
 
-        if ($bytes < 1048576) {
+        if ($bytes < 1_048_576) {
             return round($bytes / 1024, 2) . 'KB';
         }
 
-        return round($bytes / 1048576, 2) . 'MB';
+        return round($bytes / 1_048_576, 2) . 'MB';
     }
 
     /**
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 3502ae877caf..9e0752ebc237 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -354,8 +354,8 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
         if (CI_DEBUG && ! is_cli()) {
             global $app;
 
-            $request  = $request ?? Services::request();
-            $response = $response ?? Services::response();
+            $request ??= Services::request();
+            $response ??= Services::response();
 
             // Disable the toolbar for downloads
             if ($response instanceof DownloadResponse) {
diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 26cb02ddfeb0..995f8085535e 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -209,9 +209,7 @@ public function getTitleDetails(): string
         $this->getConnections();
 
         $queryCount  = count(static::$queries);
-        $uniqueCount = count(array_filter(static::$queries, static function ($query) {
-            return $query['duplicate'] === false;
-        }));
+        $uniqueCount = count(array_filter(static::$queries, static fn($query) => $query['duplicate'] === false));
         $connectionCount = count($this->connections);
 
         return sprintf(
diff --git a/system/Encryption/Encryption.php b/system/Encryption/Encryption.php
index 35c3568120ca..3ffa80d317a0 100644
--- a/system/Encryption/Encryption.php
+++ b/system/Encryption/Encryption.php
@@ -80,7 +80,7 @@ class Encryption
      */
     public function __construct(?EncryptionConfig $config = null)
     {
-        $config = $config ?? new EncryptionConfig();
+        $config ??= new EncryptionConfig();
 
         $this->key    = $config->key;
         $this->driver = $config->driver;
diff --git a/system/Encryption/Handlers/BaseHandler.php b/system/Encryption/Handlers/BaseHandler.php
index 9fb28dff1c25..13f60e970362 100644
--- a/system/Encryption/Handlers/BaseHandler.php
+++ b/system/Encryption/Handlers/BaseHandler.php
@@ -32,7 +32,7 @@ abstract class BaseHandler implements EncrypterInterface
      */
     public function __construct(?Encryption $config = null)
     {
-        $config = $config ?? config('Encryption');
+        $config ??= config('Encryption');
 
         // make the parameters conveniently accessible
         foreach (get_object_vars($config) as $key => $value) {
diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index a98395172e23..ec4108ef02f4 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -70,7 +70,7 @@ class Entity implements JsonSerializable
      *
      * @var array<string, string>
      */
-    private $defaultCastHandlers = [
+    private array $defaultCastHandlers = [
         'array'     => ArrayCast::class,
         'bool'      => BooleanCast::class,
         'boolean'   => BooleanCast::class,
@@ -105,10 +105,8 @@ class Entity implements JsonSerializable
 
     /**
      * Holds info whenever properties have to be casted
-     *
-     * @var bool
      */
-    private $_cast = true;
+    private bool $_cast = true;
 
     /**
      * Allows filling in Entity parameters during construction.
@@ -155,13 +153,11 @@ public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recu
     {
         $this->_cast = $cast;
 
-        $keys = array_filter(array_keys($this->attributes), static function ($key) {
-            return strpos($key, '_') !== 0;
-        });
+        $keys = array_filter(array_keys($this->attributes), static fn($key) => strpos($key, '_') !== 0);
 
         if (is_array($this->datamap)) {
             $keys = array_unique(
-                array_merge(array_diff($keys, $this->datamap), array_keys($this->datamap))
+                [...array_diff($keys, $this->datamap), ...array_keys($this->datamap)]
             );
         }
 
diff --git a/system/Files/File.php b/system/Files/File.php
index 40d1247e7541..c72d6c3a34aa 100644
--- a/system/Files/File.php
+++ b/system/Files/File.php
@@ -132,7 +132,7 @@ public function getRandomName(): string
     public function move(string $targetPath, ?string $name = null, bool $overwrite = false)
     {
         $targetPath  = rtrim($targetPath, '/') . '/';
-        $name        = $name ?? $this->getBaseName();
+        $name ??= $this->getBaseName();
         $destination = $overwrite ? $targetPath . $name : $this->getDestination($targetPath . $name);
 
         $oldName = $this->getRealPath() ?: $this->__toString();
diff --git a/system/Files/FileCollection.php b/system/Files/FileCollection.php
index 0b1714425ba9..e66aa94735d1 100644
--- a/system/Files/FileCollection.php
+++ b/system/Files/FileCollection.php
@@ -80,9 +80,7 @@ final protected static function filterFiles(array $files, string $directory): ar
     {
         $directory = self::resolveDirectory($directory);
 
-        return array_filter($files, static function (string $value) use ($directory): bool {
-            return strpos($value, $directory) === 0;
-        });
+        return array_filter($files, static fn(string $value): bool => strpos($value, $directory) === 0);
     }
 
     /**
@@ -105,9 +103,7 @@ final protected static function matchFiles(array $files, string $pattern): array
             $pattern = "#{$pattern}#";
         }
 
-        return array_filter($files, static function ($value) use ($pattern) {
-            return (bool) preg_match($pattern, basename($value));
-        });
+        return array_filter($files, static fn($value) => (bool) preg_match($pattern, basename($value)));
     }
 
     //--------------------------------------------------------------------
diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index edeb8b0571c5..622d9153f016 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -292,7 +292,7 @@ public function getFiltersClass(): array
      */
     public function addFilter(string $class, ?string $alias = null, string $when = 'before', string $section = 'globals')
     {
-        $alias = $alias ?? md5($class);
+        $alias ??= md5($class);
 
         if (! isset($this->config->{$section})) {
             $this->config->{$section} = [];
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index e00ac44f97e0..dd031753b1fa 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -79,20 +79,16 @@ class CURLRequest extends Request
 
     /**
      * The default options from the constructor. Applied to all requests.
-     *
-     * @var array
      */
-    private $defaultOptions;
+    private array $defaultOptions;
 
     /**
      * Whether share options between requests or not.
      *
      * If true, all the options won't be reset between requests.
      * It may cause an error request with unnecessary headers.
-     *
-     * @var bool
      */
-    private $shareOptions;
+    private bool $shareOptions;
 
     /**
      * Takes an array of options to set the following possible class properties:
diff --git a/system/HTTP/DownloadResponse.php b/system/HTTP/DownloadResponse.php
index ed343dbe4b08..8efb8b47a55a 100644
--- a/system/HTTP/DownloadResponse.php
+++ b/system/HTTP/DownloadResponse.php
@@ -22,38 +22,28 @@ class DownloadResponse extends Response
 {
     /**
      * Download file name
-     *
-     * @var string
      */
-    private $filename;
+    private string $filename;
 
     /**
      * Download for file
-     *
-     * @var File|null
      */
-    private $file;
+    private ?File $file = null;
 
     /**
      * mime set flag
-     *
-     * @var bool
      */
-    private $setMime;
+    private bool $setMime;
 
     /**
      * Download for binary
-     *
-     * @var string|null
      */
-    private $binary;
+    private ?string $binary = null;
 
     /**
      * Download charset
-     *
-     * @var string
      */
-    private $charset = 'UTF-8';
+    private string $charset = 'UTF-8';
 
     /**
      * Download reason
@@ -314,7 +304,7 @@ private function sendBodyByFilePath()
         $splFileObject = $this->file->openFile('rb');
 
         // Flush 1MB chunks of data
-        while (! $splFileObject->eof() && ($data = $splFileObject->fread(1048576)) !== false) {
+        while (! $splFileObject->eof() && ($data = $splFileObject->fread(1_048_576)) !== false) {
             echo $data;
         }
 
diff --git a/system/HTTP/Files/UploadedFile.php b/system/HTTP/Files/UploadedFile.php
index b9a672921b94..f66c2a926b87 100644
--- a/system/HTTP/Files/UploadedFile.php
+++ b/system/HTTP/Files/UploadedFile.php
@@ -137,7 +137,7 @@ public function move(string $targetPath, ?string $name = null, bool $overwrite =
             throw HTTPException::forInvalidFile();
         }
 
-        $name        = $name ?? $this->getName();
+        $name ??= $this->getName();
         $destination = $overwrite ? $targetPath . $name : $this->getDestination($targetPath . $name);
 
         try {
@@ -335,7 +335,7 @@ public function isValid(): bool
     public function store(?string $folderName = null, ?string $fileName = null): string
     {
         $folderName = rtrim($folderName ?? date('Ymd'), '/') . '/';
-        $fileName   = $fileName ?? $this->getRandomName();
+        $fileName ??= $this->getRandomName();
 
         // Move the uploaded file to a new location.
         $this->move(WRITEPATH . 'uploads/' . $folderName, $fileName);
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index 071b18e97d00..bbe0095087df 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -391,7 +391,7 @@ public function setPath(string $path, ?App $config = null)
         $this->path = $path;
         $this->uri->setPath($path);
 
-        $config = $config ?? $this->config;
+        $config ??= $this->config;
 
         // It's possible the user forgot a trailing slash on their
         // baseURL, so let's help them out.
@@ -548,7 +548,7 @@ public function getJsonVar(string $index, bool $assoc = false, ?int $filter = nu
         }
 
         if (! is_array($data)) {
-            $filter = $filter ?? FILTER_DEFAULT;
+            $filter ??= FILTER_DEFAULT;
             $flags  = is_array($flags) ? $flags : (is_numeric($flags) ? (int) $flags : 0);
 
             return filter_var($data, $filter, $flags);
diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php
index 327cddcb0e7f..cf66f4d60fe5 100644
--- a/system/HTTP/RequestTrait.php
+++ b/system/HTTP/RequestTrait.php
@@ -223,7 +223,7 @@ public function fetchGlobal(string $method, $index = null, ?int $filter = null,
         }
 
         // Null filters cause null values to return.
-        $filter = $filter ?? FILTER_DEFAULT;
+        $filter ??= FILTER_DEFAULT;
         $flags  = is_array($flags) ? $flags : (is_numeric($flags) ? (int) $flags : 0);
 
         // Return all values when $index is null
diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php
index 4efc6e804d3f..8e2cc472cc00 100644
--- a/system/HTTP/Response.php
+++ b/system/HTTP/Response.php
@@ -165,7 +165,7 @@ public function __construct($config)
         $this->cookieHTTPOnly = $config->cookieHTTPOnly;
         $this->cookieSameSite = $config->cookieSameSite ?? Cookie::SAMESITE_LAX;
 
-        $config->cookieSameSite = $config->cookieSameSite ?? Cookie::SAMESITE_LAX;
+        $config->cookieSameSite ??= Cookie::SAMESITE_LAX;
 
         if (! in_array(strtolower($config->cookieSameSite ?: Cookie::SAMESITE_LAX), Cookie::ALLOWED_SAMESITE_VALUES, true)) {
             throw CookieException::forInvalidSameSite($config->cookieSameSite);
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index f9e9d34c277d..753461eefd79 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -878,9 +878,7 @@ protected function filterPath(?string $path = null): string
         // Encode characters
         $path = preg_replace_callback(
             '/(?:[^' . static::CHAR_UNRESERVED . ':@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/',
-            static function (array $matches) {
-                return rawurlencode($matches[0]);
-            },
+            static fn(array $matches) => rawurlencode($matches[0]),
             $path
         );
 
@@ -1025,11 +1023,7 @@ protected function parseStr(string $query): array
         $return = [];
         $query  = explode('&', $query);
 
-        $params = array_map(static function (string $chunk) {
-            return preg_replace_callback('/^(?<key>[^&=]+?)(?:\[[^&=]*\])?=(?<value>[^&=]+)/', static function (array $match) {
-                return str_replace($match['key'], bin2hex($match['key']), $match[0]);
-            }, urldecode($chunk));
-        }, $query);
+        $params = array_map(static fn(string $chunk) => preg_replace_callback('/^(?<key>[^&=]+?)(?:\[[^&=]*\])?=(?<value>[^&=]+)/', static fn(array $match) => str_replace($match['key'], bin2hex($match['key']), $match[0]), urldecode($chunk)), $query);
 
         $params = implode('&', $params);
         parse_str($params, $params);
diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php
index 2f8a5f9c8366..bb494633c031 100644
--- a/system/Helpers/array_helper.php
+++ b/system/Helpers/array_helper.php
@@ -28,9 +28,7 @@ function dot_array_search(string $index, array $array)
             PREG_SPLIT_NO_EMPTY
         );
 
-        $segments = array_map(static function ($key) {
-            return str_replace('\.', '.', $key);
-        }, $segments);
+        $segments = array_map(static fn($key) => str_replace('\.', '.', $key), $segments);
 
         return _array_search_dot($segments, $array);
     }
@@ -66,9 +64,7 @@ function _array_search_dot(array $indexes, array $array)
                 $answer[] = _array_search_dot($indexes, $value);
             }
 
-            $answer = array_filter($answer, static function ($value) {
-                return $value !== null;
-            });
+            $answer = array_filter($answer, static fn($value) => $value !== null);
 
             if ($answer !== []) {
                 if (count($answer) === 1) {
diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
index a1a51af11955..868d1a27883e 100755
--- a/system/Helpers/html_helper.php
+++ b/system/Helpers/html_helper.php
@@ -156,7 +156,7 @@ function img_data(string $path, ?string $mime = null): string
         $data = base64_encode($data);
 
         // Figure out the type (Hail Mary to JPEG)
-        $mime = $mime ?? Mimes::guessTypeFromExtension(pathinfo($path, PATHINFO_EXTENSION)) ?? 'image/jpg';
+        $mime ??= Mimes::guessTypeFromExtension(pathinfo($path, PATHINFO_EXTENSION)) ?? 'image/jpg';
 
         return 'data:' . $mime . ';base64,' . $data;
     }
diff --git a/system/Helpers/number_helper.php b/system/Helpers/number_helper.php
index a9a2a938c36f..0a1e16cedc29 100644
--- a/system/Helpers/number_helper.php
+++ b/system/Helpers/number_helper.php
@@ -37,14 +37,14 @@ function number_to_size($num, int $precision = 1, ?string $locale = null)
             $generalLocale = substr($locale, 0, $underscorePos);
         }
 
-        if ($num >= 1000000000000) {
-            $num  = round($num / 1099511627776, $precision);
+        if ($num >= 1_000_000_000_000) {
+            $num  = round($num / 1_099_511_627_776, $precision);
             $unit = lang('Number.terabyteAbbr', [], $generalLocale);
-        } elseif ($num >= 1000000000) {
-            $num  = round($num / 1073741824, $precision);
+        } elseif ($num >= 1_000_000_000) {
+            $num  = round($num / 1_073_741_824, $precision);
             $unit = lang('Number.gigabyteAbbr', [], $generalLocale);
-        } elseif ($num >= 1000000) {
-            $num  = round($num / 1048576, $precision);
+        } elseif ($num >= 1_000_000) {
+            $num  = round($num / 1_048_576, $precision);
             $unit = lang('Number.megabyteAbbr', [], $generalLocale);
         } elseif ($num >= 1000) {
             $num  = round($num / 1024, $precision);
@@ -90,18 +90,18 @@ function number_to_amount($num, int $precision = 0, ?string $locale = null)
             $generalLocale = substr($locale, 0, $underscorePos);
         }
 
-        if ($num > 1000000000000000) {
+        if ($num > 1_000_000_000_000_000) {
             $suffix = lang('Number.quadrillion', [], $generalLocale);
-            $num    = round(($num / 1000000000000000), $precision);
-        } elseif ($num > 1000000000000) {
+            $num    = round(($num / 1_000_000_000_000_000), $precision);
+        } elseif ($num > 1_000_000_000_000) {
             $suffix = lang('Number.trillion', [], $generalLocale);
-            $num    = round(($num / 1000000000000), $precision);
-        } elseif ($num > 1000000000) {
+            $num    = round(($num / 1_000_000_000_000), $precision);
+        } elseif ($num > 1_000_000_000) {
             $suffix = lang('Number.billion', [], $generalLocale);
-            $num    = round(($num / 1000000000), $precision);
-        } elseif ($num > 1000000) {
+            $num    = round(($num / 1_000_000_000), $precision);
+        } elseif ($num > 1_000_000) {
             $suffix = lang('Number.million', [], $generalLocale);
-            $num    = round(($num / 1000000), $precision);
+            $num    = round(($num / 1_000_000), $precision);
         } elseif ($num > 1000) {
             $suffix = lang('Number.thousand', [], $generalLocale);
             $num    = round(($num / 1000), $precision);
@@ -130,7 +130,7 @@ function number_to_currency(float $num, string $currency, ?string $locale = null
     function format_number(float $num, int $precision = 1, ?string $locale = null, array $options = []): string
     {
         // Locale is either passed in here, negotiated with client, or grabbed from our config file.
-        $locale = $locale ?? Services::request()->getLocale();
+        $locale ??= Services::request()->getLocale();
 
         // Type can be any of the NumberFormatter options, but provide a default.
         $type = (int) ($options['type'] ?? NumberFormatter::DECIMAL);
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
index 42bcdc473619..0fbf46787d04 100644
--- a/system/Helpers/url_helper.php
+++ b/system/Helpers/url_helper.php
@@ -30,7 +30,7 @@
      */
     function _get_uri(string $relativePath = '', ?App $config = null): URI
     {
-        $config = $config ?? config('App');
+        $config ??= config('App');
 
         if ($config->baseURL === '') {
             throw new InvalidArgumentException('_get_uri() requires a valid baseURL.');
@@ -119,7 +119,7 @@ function base_url($relativePath = '', ?string $scheme = null): string
      */
     function current_url(bool $returnObject = false, ?IncomingRequest $request = null)
     {
-        $request = $request ?? Services::request();
+        $request ??= Services::request();
         $path    = $request->getPath();
 
         // Append queries and fragments
@@ -152,7 +152,7 @@ function previous_url(bool $returnObject = false)
         // Otherwise, grab a sanitized version from $_SERVER.
         $referer = $_SESSION['_ci_previous_url'] ?? Services::request()->getServer('HTTP_REFERER', FILTER_SANITIZE_URL);
 
-        $referer = $referer ?? site_url('/');
+        $referer ??= site_url('/');
 
         return $returnObject ? new URI($referer) : $referer;
     }
diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index 01698444587d..9d2bc96c9b40 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -77,7 +77,7 @@ public function __construct(?string $time = null, $timezone = null, ?string $loc
     {
         $this->locale = $locale ?: Locale::getDefault();
 
-        $time = $time ?? '';
+        $time ??= '';
 
         // If a test instance has been provided, use it instead.
         if ($time === '' && static::$testNow instanceof self) {
@@ -213,9 +213,9 @@ public static function createFromTime(?int $hour = null, ?int $minutes = null, ?
      */
     public static function create(?int $year = null, ?int $month = null, ?int $day = null, ?int $hour = null, ?int $minutes = null, ?int $seconds = null, $timezone = null, ?string $locale = null)
     {
-        $year    = $year ?? date('Y');
-        $month   = $month ?? date('m');
-        $day     = $day ?? date('d');
+        $year ??= date('Y');
+        $month ??= date('m');
+        $day ??= date('d');
         $hour    = empty($hour) ? 0 : $hour;
         $minutes = empty($minutes) ? 0 : $minutes;
         $seconds = empty($seconds) ? 0 : $seconds;
@@ -899,7 +899,7 @@ public function toTimeString()
      */
     public function toLocalizedString(?string $format = null)
     {
-        $format = $format ?? $this->toStringFormat;
+        $format ??= $this->toStringFormat;
 
         return IntlDateFormatter::formatObject($this->toDateTime(), $format, $this->locale);
     }
diff --git a/system/Images/Image.php b/system/Images/Image.php
index 2eca30f92cab..bb348a7ca1b8 100644
--- a/system/Images/Image.php
+++ b/system/Images/Image.php
@@ -69,7 +69,7 @@ public function copy(string $targetPath, ?string $targetName = null, int $perms
     {
         $targetPath = rtrim($targetPath, '/ ') . '/';
 
-        $targetName = $targetName ?? $this->getFilename();
+        $targetName ??= $this->getFilename();
 
         if (empty($targetName)) {
             throw ImageException::forInvalidFile($targetName);
diff --git a/system/Language/Language.php b/system/Language/Language.php
index a6797f74ed9e..299618657aa2 100644
--- a/system/Language/Language.php
+++ b/system/Language/Language.php
@@ -115,7 +115,7 @@ public function getLine(string $line, array $args = [])
             $output = $this->getTranslationOutput('en', $file, $parsedLine);
         }
 
-        $output = $output ?? $line;
+        $output ??= $line;
 
         return $this->formatMessage($output, $args);
     }
diff --git a/system/Log/Handlers/FileHandler.php b/system/Log/Handlers/FileHandler.php
index 1fc929077d45..e80a6121c676 100644
--- a/system/Log/Handlers/FileHandler.php
+++ b/system/Log/Handlers/FileHandler.php
@@ -88,7 +88,7 @@ public function handle($level, $message): bool
         // Instantiating DateTime with microseconds appended to initial date is needed for proper support of this format
         if (strpos($this->dateFormat, 'u') !== false) {
             $microtimeFull  = microtime(true);
-            $microtimeShort = sprintf('%06d', ($microtimeFull - floor($microtimeFull)) * 1000000);
+            $microtimeShort = sprintf('%06d', ($microtimeFull - floor($microtimeFull)) * 1_000_000);
             $date           = new DateTime(date('Y-m-d H:i:s.' . $microtimeShort, (int) $microtimeFull));
             $date           = $date->format($this->dateFormat);
         } else {
diff --git a/system/Model.php b/system/Model.php
index 32fa82fcff64..01fa74300737 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -94,7 +94,7 @@ public function __construct(?ConnectionInterface &$db = null, ?ValidationInterfa
         /**
          * @var BaseConnection $db
          */
-        $db = $db ?? Database::connect($this->DBGroup);
+        $db ??= Database::connect($this->DBGroup);
 
         $this->db = &$db;
 
diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
index a653485633aa..f3d6d4bec39d 100644
--- a/system/Pager/Pager.php
+++ b/system/Pager/Pager.php
@@ -143,7 +143,7 @@ public function store(string $group, int $page, ?int $perPage, int $total, int $
             $page = $this->groups[$group]['currentPage'];
         }
 
-        $perPage   = $perPage ?? $this->config->perPage;
+        $perPage ??= $this->config->perPage;
         $pageCount = (int) ceil($total / $perPage);
 
         $this->groups[$group]['currentPage'] = $page > $pageCount ? $pageCount : $page;
diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php
index dac7aa898f1a..b9cc9a1314c9 100644
--- a/system/Publisher/Publisher.php
+++ b/system/Publisher/Publisher.php
@@ -41,15 +41,13 @@ class Publisher extends FileCollection
      *
      * @var array<string, self[]|null>
      */
-    private static $discovered = [];
+    private static array $discovered = [];
 
     /**
      * Directory to use for methods that need temporary storage.
      * Created on-the-fly as needed.
-     *
-     * @var string|null
      */
-    private $scratch;
+    private ?string $scratch = null;
 
     /**
      * Exceptions for specific files from the last write operation.
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 15a2d3d79e3e..4a5a754866b0 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1163,9 +1163,7 @@ protected function create(string $verb, string $from, $to, ?array $options = nul
             for ($i = (int) $options['offset'] + 1; $i < (int) $options['offset'] + 7; $i++) {
                 $to = preg_replace_callback(
                     '/\$X/',
-                    static function ($m) use ($i) {
-                        return '$' . $i;
-                    },
+                    static fn($m) => '$' . $i,
                     $to,
                     1
                 );
diff --git a/system/Router/Router.php b/system/Router/Router.php
index 5c4b3f0255d7..8ae806a59958 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -550,9 +550,7 @@ protected function validateRequest(array $segments): array
      */
     protected function scanControllers(array $segments): array
     {
-        $segments = array_filter($segments, static function ($segment) {
-            return $segment !== '';
-        });
+        $segments = array_filter($segments, static fn($segment) => $segment !== '');
         // numerically reindex the array, removing gaps
         $segments = array_values($segments);
 
diff --git a/system/Security/Security.php b/system/Security/Security.php
index 008e94aeb612..36134c572fb0 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Security;
 
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\Cookie\Cookie;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\Response;
@@ -139,24 +140,17 @@ class Security implements SecurityInterface
      */
     protected $samesite = Cookie::SAMESITE_LAX;
 
-    /**
-     * @var RequestInterface
-     */
-    private $request;
+    private IncomingRequest $request;
 
     /**
      * CSRF Cookie Name without Prefix
-     *
-     * @var string
      */
-    private $rawCookieName;
+    private ?string $rawCookieName = null;
 
     /**
      * Session instance.
-     *
-     * @var Session
      */
-    private $session;
+    private ?Session $session = null;
 
     /**
      * Constructor.
diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
index e2c6eab609bb..00d936cd4251 100644
--- a/system/Test/CIUnitTestCase.php
+++ b/system/Test/CIUnitTestCase.php
@@ -63,10 +63,8 @@ abstract class CIUnitTestCase extends TestCase
 
     /**
      * Store of identified traits.
-     *
-     * @var string[]|null
      */
-    private $traits;
+    private ?array $traits = null;
 
     //--------------------------------------------------------------------
     // Database Properties
diff --git a/system/Test/FilterTestTrait.php b/system/Test/FilterTestTrait.php
index 680515ed107b..a4a79ab7590c 100644
--- a/system/Test/FilterTestTrait.php
+++ b/system/Test/FilterTestTrait.php
@@ -94,12 +94,12 @@ protected function setUpFilterTestTrait(): void
         // Create our own Request and Response so we can
         // use the same ones for Filters and FilterInterface
         // yet isolate them from outside influence
-        $this->request  = $this->request ?? clone Services::request();
-        $this->response = $this->response ?? clone Services::response();
+        $this->request ??= clone Services::request();
+        $this->response ??= clone Services::response();
 
         // Create our config and Filters instance to reuse for performance
-        $this->filtersConfig = $this->filtersConfig ?? config('Filters');
-        $this->filters       = $this->filters ?? new Filters($this->filtersConfig, $this->request, $this->response);
+        $this->filtersConfig ??= config('Filters');
+        $this->filters ??= new Filters($this->filtersConfig, $this->request, $this->response);
 
         if ($this->collection === null) {
             // Load the RouteCollection from Config to gather App route info
@@ -151,16 +151,12 @@ protected function getFilterCaller($filter, string $position): Closure
         $request = clone $this->request;
 
         if ($position === 'before') {
-            return static function (?array $params = null) use ($filter, $request) {
-                return $filter->before($request, $params);
-            };
+            return static fn(?array $params = null) => $filter->before($request, $params);
         }
 
         $response = clone $this->response;
 
-        return static function (?array $params = null) use ($filter, $request, $response) {
-            return $filter->after($request, $response, $params);
-        };
+        return static fn(?array $params = null) => $filter->after($request, $response, $params);
     }
 
     /**
diff --git a/system/Test/ReflectionHelper.php b/system/Test/ReflectionHelper.php
index 4eb474ad0ecb..d3e87e018484 100644
--- a/system/Test/ReflectionHelper.php
+++ b/system/Test/ReflectionHelper.php
@@ -39,9 +39,7 @@ public static function getPrivateMethodInvoker($obj, $method)
         $refMethod->setAccessible(true);
         $obj = (gettype($obj) === 'object') ? $obj : null;
 
-        return static function (...$args) use ($obj, $refMethod) {
-            return $refMethod->invokeArgs($obj, $args);
-        };
+        return static fn(...$args) => $refMethod->invokeArgs($obj, $args);
     }
 
     /**
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 39af6703f8df..031d8f51a398 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -107,7 +107,7 @@ public function __construct($config, RendererInterface $view)
      */
     public function run(?array $data = null, ?string $group = null, ?string $dbGroup = null): bool
     {
-        $data = $data ?? $this->data;
+        $data ??= $this->data;
 
         // i.e. is_unique
         $data['DBGroup'] = $dbGroup;
@@ -330,8 +330,6 @@ static function ($carry, $item) use ($ifExistField) {
     /**
      * Takes a Request object and grabs the input data to use from its
      * array values.
-     *
-     * @param IncomingRequest|RequestInterface $request
      */
     public function withRequest(RequestInterface $request): ValidationInterface
     {
@@ -669,7 +667,7 @@ public function setError(string $field, string $error): ValidationInterface
      */
     protected function getErrorMessage(string $rule, string $field, ?string $label = null, ?string $param = null, ?string $value = null): string
     {
-        $param = $param ?? '';
+        $param ??= '';
 
         // Check if custom message has been defined by user
         if (isset($this->customErrors[$field][$rule])) {
diff --git a/system/View/Parser.php b/system/View/Parser.php
index c58f2b427dc5..ac4f29750f8a 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -191,7 +191,7 @@ public function setData(array $data = [], ?string $context = null): RendererInte
             }
         }
 
-        $this->tempData = $this->tempData ?? $this->data;
+        $this->tempData ??= $this->data;
         $this->tempData = array_merge($this->tempData, $data);
 
         return $this;
diff --git a/system/View/View.php b/system/View/View.php
index e65416e5cf48..6f6dddf178d0 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -167,7 +167,7 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
         // Store the results here so even if
         // multiple views are called in a view, it won't
         // clean it unless we mean it to.
-        $saveData                    = $saveData ?? $this->saveData;
+        $saveData ??= $this->saveData;
         $fileExt                     = pathinfo($view, PATHINFO_EXTENSION);
         $realPath                    = empty($fileExt) ? $view . '.php' : $view; // allow Views as .html, .tpl, etc (from CI3)
         $this->renderVars['view']    = $realPath;
@@ -272,7 +272,7 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
     public function renderString(string $view, ?array $options = null, ?bool $saveData = null): string
     {
         $start    = microtime(true);
-        $saveData = $saveData ?? $this->saveData;
+        $saveData ??= $this->saveData;
         $this->prepareTemplateData($saveData);
 
         $output = (function (string $view): string {
@@ -309,7 +309,7 @@ public function setData(array $data = [], ?string $context = null): RendererInte
             $data = \esc($data, $context);
         }
 
-        $this->tempData = $this->tempData ?? $this->data;
+        $this->tempData ??= $this->data;
         $this->tempData = array_merge($this->tempData, $data);
 
         return $this;
@@ -328,7 +328,7 @@ public function setVar(string $name, $value = null, ?string $context = null): Re
             $value = esc($value, $context);
         }
 
-        $this->tempData        = $this->tempData ?? $this->data;
+        $this->tempData ??= $this->data;
         $this->tempData[$name] = $value;
 
         return $this;
@@ -449,7 +449,7 @@ protected function logPerformance(float $start, float $end, string $view)
 
     protected function prepareTemplateData(bool $saveData): void
     {
-        $this->tempData = $this->tempData ?? $this->data;
+        $this->tempData ??= $this->data;
 
         if ($saveData) {
             $this->data = $this->tempData;
diff --git a/tests/system/CLI/CommandRunnerTest.php b/tests/system/CLI/CommandRunnerTest.php
index 36c89ddafc76..1e20618dae25 100644
--- a/tests/system/CLI/CommandRunnerTest.php
+++ b/tests/system/CLI/CommandRunnerTest.php
@@ -31,10 +31,7 @@ final class CommandRunnerTest extends CIUnitTestCase
      */
     private static $logger;
 
-    /**
-     * @var CommandRunner
-     */
-    private static $runner;
+    private static CommandRunner $runner;
 
     public static function setUpBeforeClass(): void
     {
diff --git a/tests/system/Cache/CacheFactoryTest.php b/tests/system/Cache/CacheFactoryTest.php
index ec978504fcfb..c67d1c805ad0 100644
--- a/tests/system/Cache/CacheFactoryTest.php
+++ b/tests/system/Cache/CacheFactoryTest.php
@@ -20,9 +20,9 @@
  */
 final class CacheFactoryTest extends CIUnitTestCase
 {
-    private static $directory = 'CacheFactory';
-    private $cacheFactory;
-    private $config;
+    private static string $directory = 'CacheFactory';
+    private CacheFactory $cacheFactory;
+    private Cache $config;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Cache/Handlers/DummyHandlerTest.php b/tests/system/Cache/Handlers/DummyHandlerTest.php
index 482205d68d20..2472937eed0c 100644
--- a/tests/system/Cache/Handlers/DummyHandlerTest.php
+++ b/tests/system/Cache/Handlers/DummyHandlerTest.php
@@ -18,7 +18,7 @@
  */
 final class DummyHandlerTest extends CIUnitTestCase
 {
-    private $handler;
+    private DummyHandler $handler;
 
     protected function setUp(): void
     {
@@ -38,9 +38,7 @@ public function testGet()
 
     public function testRemember()
     {
-        $dummyHandler = $this->handler->remember('key', 2, static function () {
-            return 'value';
-        });
+        $dummyHandler = $this->handler->remember('key', 2, static fn() => 'value');
 
         $this->assertNull($dummyHandler);
     }
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index f0aa76ea610d..acb9e9d298cc 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -19,8 +19,8 @@
  */
 final class FileHandlerTest extends AbstractHandlerTest
 {
-    private static $directory = 'FileHandler';
-    private $config;
+    private static string $directory = 'FileHandler';
+    private Cache $config;
 
     private static function getKeyArray()
     {
@@ -119,9 +119,7 @@ public function testGet()
      */
     public function testRemember()
     {
-        $this->handler->remember(self::$key1, 2, static function () {
-            return 'value';
-        });
+        $this->handler->remember(self::$key1, 2, static fn() => 'value');
 
         $this->assertSame('value', $this->handler->get(self::$key1));
         $this->assertNull($this->handler->get(self::$dummy));
@@ -328,8 +326,8 @@ public function testGetMetaDataMiss()
 
 final class BaseTestFileHandler extends FileHandler
 {
-    private static $directory = 'FileHandler';
-    private $config;
+    private static string $directory = 'FileHandler';
+    private Cache $config;
 
     public function __construct()
     {
diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
index 08a28f376fe7..d79c8ab2feed 100644
--- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php
+++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
@@ -22,7 +22,7 @@
  */
 final class MemcachedHandlerTest extends AbstractHandlerTest
 {
-    private $config;
+    private Cache $config;
 
     private static function getKeyArray()
     {
@@ -85,9 +85,7 @@ public function testGet()
      */
     public function testRemember()
     {
-        $this->handler->remember(self::$key1, 2, static function () {
-            return 'value';
-        });
+        $this->handler->remember(self::$key1, 2, static fn() => 'value');
 
         $this->assertSame('value', $this->handler->get(self::$key1));
         $this->assertNull($this->handler->get(self::$dummy));
diff --git a/tests/system/Cache/Handlers/PredisHandlerTest.php b/tests/system/Cache/Handlers/PredisHandlerTest.php
index cdc79adf68b4..4404ca83f712 100644
--- a/tests/system/Cache/Handlers/PredisHandlerTest.php
+++ b/tests/system/Cache/Handlers/PredisHandlerTest.php
@@ -21,7 +21,7 @@
  */
 final class PredisHandlerTest extends AbstractHandlerTest
 {
-    private $config;
+    private Cache $config;
 
     private static function getKeyArray()
     {
@@ -88,9 +88,7 @@ public function testGet()
      */
     public function testRemember()
     {
-        $this->handler->remember(self::$key1, 2, static function () {
-            return 'value';
-        });
+        $this->handler->remember(self::$key1, 2, static fn() => 'value');
 
         $this->assertSame('value', $this->handler->get(self::$key1));
         $this->assertNull($this->handler->get(self::$dummy));
diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php
index 205e708fc99a..64e224240451 100644
--- a/tests/system/Cache/Handlers/RedisHandlerTest.php
+++ b/tests/system/Cache/Handlers/RedisHandlerTest.php
@@ -21,7 +21,7 @@
  */
 final class RedisHandlerTest extends AbstractHandlerTest
 {
-    private $config;
+    private Cache $config;
 
     private static function getKeyArray()
     {
@@ -92,9 +92,7 @@ public function testGet()
      */
     public function testRemember()
     {
-        $this->handler->remember(self::$key1, 2, static function () {
-            return 'value';
-        });
+        $this->handler->remember(self::$key1, 2, static fn() => 'value');
 
         $this->assertSame('value', $this->handler->get(self::$key1));
         $this->assertNull($this->handler->get(self::$dummy));
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index f7838105af4d..334550f4efd5 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -135,9 +135,7 @@ public function testControllersCanReturnString()
 
         // Inject mock router.
         $routes = Services::routes();
-        $routes->add('pages/(:segment)', static function ($segment) {
-            return 'You want to see "' . esc($segment) . '" page.';
-        });
+        $routes->add('pages/(:segment)', static fn($segment) => 'You want to see "' . esc($segment) . '" page.');
         $router = Services::router($routes, Services::request());
         Services::injectMock('router', $router);
 
@@ -182,9 +180,7 @@ public function testControllersRunFilterByClassName()
 
         // Inject mock router.
         $routes = Services::routes();
-        $routes->add('pages/about', static function () {
-            return Services::request()->url;
-        }, ['filter' => Customfilter::class]);
+        $routes->add('pages/about', static fn() => Services::request()->url, ['filter' => Customfilter::class]);
 
         $router = Services::router($routes, Services::request());
         Services::injectMock('router', $router);
diff --git a/tests/system/Commands/EnvironmentCommandTest.php b/tests/system/Commands/EnvironmentCommandTest.php
index e81fe65ec622..e877c1144ae6 100644
--- a/tests/system/Commands/EnvironmentCommandTest.php
+++ b/tests/system/Commands/EnvironmentCommandTest.php
@@ -20,8 +20,8 @@
 final class EnvironmentCommandTest extends CIUnitTestCase
 {
     private $streamFilter;
-    private $envPath       = ROOTPATH . '.env';
-    private $backupEnvPath = ROOTPATH . '.env.backup';
+    private string $envPath       = ROOTPATH . '.env';
+    private string $backupEnvPath = ROOTPATH . '.env.backup';
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/GenerateKeyTest.php b/tests/system/Commands/GenerateKeyTest.php
index 2691bca89180..8def37509d67 100644
--- a/tests/system/Commands/GenerateKeyTest.php
+++ b/tests/system/Commands/GenerateKeyTest.php
@@ -20,8 +20,8 @@
 final class GenerateKeyTest extends CIUnitTestCase
 {
     private $streamFilter;
-    private $envPath;
-    private $backupEnvPath;
+    private string $envPath;
+    private string $backupEnvPath;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/MigrationIntegrationTest.php b/tests/system/Commands/MigrationIntegrationTest.php
index 7dab2f1f8ef1..c0970b5c317d 100644
--- a/tests/system/Commands/MigrationIntegrationTest.php
+++ b/tests/system/Commands/MigrationIntegrationTest.php
@@ -20,8 +20,8 @@
 final class MigrationIntegrationTest extends CIUnitTestCase
 {
     private $streamFilter;
-    private $migrationFileFrom = SUPPORTPATH . 'Database/Migrations/20160428212500_Create_test_tables.php';
-    private $migrationFileTo   = APPPATH . 'Database/Migrations/20160428212500_Create_test_tables.php';
+    private string $migrationFileFrom = SUPPORTPATH . 'Database/Migrations/20160428212500_Create_test_tables.php';
+    private string $migrationFileTo   = APPPATH . 'Database/Migrations/20160428212500_Create_test_tables.php';
 
     protected function setUp(): void
     {
diff --git a/tests/system/CommonHelperTest.php b/tests/system/CommonHelperTest.php
index ce472e56b8be..f8af2b5868cf 100644
--- a/tests/system/CommonHelperTest.php
+++ b/tests/system/CommonHelperTest.php
@@ -25,7 +25,7 @@
  */
 final class CommonHelperTest extends CIUnitTestCase
 {
-    private $dummyHelpers = [
+    private array $dummyHelpers = [
         APPPATH . 'Helpers' . DIRECTORY_SEPARATOR . 'foobarbaz_helper.php',
         SYSTEMPATH . 'Helpers' . DIRECTORY_SEPARATOR . 'foobarbaz_helper.php',
     ];
diff --git a/tests/system/Cookie/CookieStoreTest.php b/tests/system/Cookie/CookieStoreTest.php
index 2c588fb3391e..eeebb6a2cf3f 100644
--- a/tests/system/Cookie/CookieStoreTest.php
+++ b/tests/system/Cookie/CookieStoreTest.php
@@ -21,10 +21,7 @@
  */
 final class CookieStoreTest extends CIUnitTestCase
 {
-    /**
-     * @var array
-     */
-    private $defaults;
+    private array $defaults;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Cookie/CookieTest.php b/tests/system/Cookie/CookieTest.php
index 02a820218868..34d9d59955e6 100644
--- a/tests/system/Cookie/CookieTest.php
+++ b/tests/system/Cookie/CookieTest.php
@@ -24,10 +24,7 @@
  */
 final class CookieTest extends CIUnitTestCase
 {
-    /**
-     * @var array
-     */
-    private $defaults;
+    private array $defaults;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Database/Builder/GroupTest.php b/tests/system/Database/Builder/GroupTest.php
index 8d5520ecd73e..f0b885dd3178 100644
--- a/tests/system/Database/Builder/GroupTest.php
+++ b/tests/system/Database/Builder/GroupTest.php
@@ -86,9 +86,7 @@ public function testHavingInClosure()
 
         $builder->select('name')->groupBy('name');
 
-        $builder->havingIn('id', static function (BaseBuilder $builder) {
-            return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
-        });
+        $builder->havingIn('id', static fn(BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)';
 
@@ -115,12 +113,8 @@ public function testOrHavingInClosure()
 
         $builder->select('name')->groupBy('name');
 
-        $builder->havingIn('id', static function (BaseBuilder $builder) {
-            return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
-        });
-        $builder->orHavingIn('group_id', static function (BaseBuilder $builder) {
-            return $builder->select('group_id')->from('groups')->where('group_id', 6);
-        });
+        $builder->havingIn('id', static fn(BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
+        $builder->orHavingIn('group_id', static fn(BaseBuilder $builder) => $builder->select('group_id')->from('groups')->where('group_id', 6));
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3) OR "group_id" IN (SELECT "group_id" FROM "groups" WHERE "group_id" = 6)';
 
@@ -146,9 +140,7 @@ public function testHavingNotInClosure()
 
         $builder->select('name')->groupBy('name');
 
-        $builder->havingNotIn('id', static function (BaseBuilder $builder) {
-            return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
-        });
+        $builder->havingNotIn('id', static fn(BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)';
 
@@ -175,12 +167,8 @@ public function testOrHavingNotInClosure()
 
         $builder->select('name')->groupBy('name');
 
-        $builder->havingNotIn('id', static function (BaseBuilder $builder) {
-            return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
-        });
-        $builder->orHavingNotIn('group_id', static function (BaseBuilder $builder) {
-            return $builder->select('group_id')->from('groups')->where('group_id', 6);
-        });
+        $builder->havingNotIn('id', static fn(BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
+        $builder->orHavingNotIn('group_id', static fn(BaseBuilder $builder) => $builder->select('group_id')->from('groups')->where('group_id', 6));
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3) OR "group_id" NOT IN (SELECT "group_id" FROM "groups" WHERE "group_id" = 6)';
 
diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php
index 70463776a3ac..9ea14296eb89 100644
--- a/tests/system/Database/Builder/WhereTest.php
+++ b/tests/system/Database/Builder/WhereTest.php
@@ -238,9 +238,7 @@ public function testWhereInSubQuery()
         // Closure
         $builder = $this->db->table('jobs');
 
-        $builder->whereIn('id', static function (BaseBuilder $builder) {
-            return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
-        });
+        $builder->whereIn('id', static fn(BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
@@ -327,9 +325,7 @@ public function testWhereNotInSubQuery()
         // Closure
         $builder = $this->db->table('jobs');
 
-        $builder->whereNotIn('id', static function (BaseBuilder $builder) {
-            return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
-        });
+        $builder->whereNotIn('id', static fn(BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
@@ -377,9 +373,7 @@ public function testOrWhereInSubQuery()
         // Closure
         $builder = $this->db->table('jobs');
 
-        $builder->where('deleted_at', null)->orWhereIn('id', static function (BaseBuilder $builder) {
-            return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
-        });
+        $builder->where('deleted_at', null)->orWhereIn('id', static fn(BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
@@ -427,9 +421,7 @@ public function testOrWhereNotInSubQuery()
         // Closure
         $builder = $this->db->table('jobs');
 
-        $builder->where('deleted_at', null)->orWhereNotIn('id', static function (BaseBuilder $builder) {
-            return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
-        });
+        $builder->where('deleted_at', null)->orWhereNotIn('id', static fn(BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php
index 854cab85e7df..f465a7d7eb5b 100644
--- a/tests/system/Database/Live/PreparedQueryTest.php
+++ b/tests/system/Database/Live/PreparedQueryTest.php
@@ -28,10 +28,7 @@ final class PreparedQueryTest extends CIUnitTestCase
 
     protected $seed = CITestSeeder::class;
 
-    /**
-     * @var BasePreparedQuery|null
-     */
-    private $query;
+    private ?BasePreparedQuery $query = null;
 
     protected function setUp(): void
     {
@@ -50,12 +47,10 @@ protected function tearDown(): void
 
     public function testPrepareReturnsPreparedQuery()
     {
-        $this->query = $this->db->prepare(static function ($db) {
-            return $db->table('user')->insert([
-                'name'  => 'a',
-                'email' => 'b@example.com',
-            ]);
-        });
+        $this->query = $this->db->prepare(static fn($db) => $db->table('user')->insert([
+            'name'  => 'a',
+            'email' => 'b@example.com',
+        ]));
 
         $this->assertInstanceOf(BasePreparedQuery::class, $this->query);
 
@@ -102,13 +97,11 @@ public function testPrepareReturnsManualPreparedQuery()
 
     public function testExecuteRunsQueryAndReturnsResultObject()
     {
-        $this->query = $this->db->prepare(static function ($db) {
-            return $db->table('user')->insert([
-                'name'    => 'a',
-                'email'   => 'b@example.com',
-                'country' => 'x',
-            ]);
-        });
+        $this->query = $this->db->prepare(static fn($db) => $db->table('user')->insert([
+            'name'    => 'a',
+            'email'   => 'b@example.com',
+            'country' => 'x',
+        ]));
 
         $this->query->execute('foo', 'foo@example.com', 'US');
         $this->query->execute('bar', 'bar@example.com', 'GB');
diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php
index 9bfcbb93c08b..08d521ede2f4 100644
--- a/tests/system/Debug/ExceptionsTest.php
+++ b/tests/system/Debug/ExceptionsTest.php
@@ -25,10 +25,7 @@ final class ExceptionsTest extends CIUnitTestCase
 {
     use ReflectionHelper;
 
-    /**
-     * @var Exceptions
-     */
-    private $exception;
+    private \CodeIgniter\Debug\Exceptions $exception;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Files/FileCollectionTest.php b/tests/system/Files/FileCollectionTest.php
index ec30f289100e..ced5b38873d2 100644
--- a/tests/system/Files/FileCollectionTest.php
+++ b/tests/system/Files/FileCollectionTest.php
@@ -21,17 +21,13 @@ final class FileCollectionTest extends CIUnitTestCase
 {
     /**
      * A known, valid file
-     *
-     * @var string
      */
-    private $file = SUPPORTPATH . 'Files/baker/banana.php';
+    private string $file = SUPPORTPATH . 'Files/baker/banana.php';
 
     /**
      * A known, valid directory
-     *
-     * @var string
      */
-    private $directory = SUPPORTPATH . 'Files/able/';
+    private string $directory = SUPPORTPATH . 'Files/able/';
 
     /**
      * Initialize the helper, since some
diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index be5e04c5098e..ca50f9af1586 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -58,7 +58,7 @@ protected function setUp(): void
 
     private function createFilters(FiltersConfig $config, $request = null): Filters
     {
-        $request = $request ?? Services::request();
+        $request ??= Services::request();
 
         return new Filters($config, $request, $this->response);
     }
diff --git a/tests/system/Filters/InvalidCharsTest.php b/tests/system/Filters/InvalidCharsTest.php
index 8724413120b5..86331b4c4d10 100644
--- a/tests/system/Filters/InvalidCharsTest.php
+++ b/tests/system/Filters/InvalidCharsTest.php
@@ -24,15 +24,9 @@
  */
 final class InvalidCharsTest extends CIUnitTestCase
 {
-    /**
-     * @var InvalidChars
-     */
-    private $invalidChars;
+    private InvalidChars $invalidChars;
 
-    /**
-     * @var IncomingRequest
-     */
-    private $request;
+    private IncomingRequest $request;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/ResponseCookieTest.php b/tests/system/HTTP/ResponseCookieTest.php
index 678928463cc4..fc82a2421756 100644
--- a/tests/system/HTTP/ResponseCookieTest.php
+++ b/tests/system/HTTP/ResponseCookieTest.php
@@ -23,10 +23,7 @@
  */
 final class ResponseCookieTest extends CIUnitTestCase
 {
-    /**
-     * @var array
-     */
-    private $defaults;
+    private array $defaults;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Helpers/CookieHelperTest.php b/tests/system/Helpers/CookieHelperTest.php
index 13eae956faea..67d8f2e70e3f 100755
--- a/tests/system/Helpers/CookieHelperTest.php
+++ b/tests/system/Helpers/CookieHelperTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Helpers;
 
+use CodeIgniter\HTTP\Response;
 use CodeIgniter\Cookie\Exceptions\CookieException;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\URI;
@@ -26,9 +27,9 @@
 final class CookieHelperTest extends CIUnitTestCase
 {
     private $name;
-    private $value;
-    private $expire;
-    private $response;
+    private string $value;
+    private int $expire;
+    private Response $response;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index c5665ea94e05..f17254d8694d 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -19,7 +19,7 @@
  */
 final class HTMLHelperTest extends CIUnitTestCase
 {
-    private $tracks;
+    private array $tracks;
 
     /**
      * @var string Path to the test file for img_data
@@ -29,7 +29,7 @@ final class HTMLHelperTest extends CIUnitTestCase
     /**
      * @var string Expected base64 encoding of img path
      */
-    private $imgData = 'R0lGODlhmwDIAOcAAAAAAAEBAQICAgMDAwQEBAUFBQYGBgcHBwgICAkJCQoKCgsLCwwMDA0NDQ4ODg8PDxAQEBERERISEhMTExQUFBUVFRYWFhcXFxgYGBkZGRoaGhsbGxwcHB0dHR4eHh8fHyAgICEhISIiIiMjIyQkJCUlJSYmJicnJygoKCkpKSoqKisrKywsLC0tLS4uLi8vLzAwMDExMTIyMjMzMzQ0NDU1NTY2Njc3Nzg4ODk5OTo6Ojs7Ozw8PD09PT4+Pj8/P0BAQEFBQUJCQkNDQ0REREVFRUZGRkdHR0hISElJSUpKSktLS0xMTE1NTU5OTk9PT1BQUFFRUVJSUlNTU1RUVFVVVVZWVldXV1hYWFlZWVpaWltbW1xcXF1dXV5eXl9fX2BgYGFhYWJiYmNjY2RkZGVlZWZmZmdnZ2hoaGlpaWpqamtra2xsbG1tbW5ubm9vb3BwcHFxcXJycnNzc3R0dHV1dXZ2dnd3d3h4eHl5eXp6ent7e3x8fH19fX5+fn9/f4CAgIGBgYKCgoODg4SEhIWFhYaGhoeHh4iIiImJiYqKiouLi4yMjI2NjY6Ojo+Pj5CQkJGRkZKSkpOTk5SUlJWVlZaWlpeXl5iYmJmZmZqampubm5ycnJ2dnZ6enp+fn6CgoKGhoaKioqOjo6SkpKWlpaampqenp6ioqKmpqaqqqqurq6ysrK2tra6urq+vr7CwsLGxsbKysrOzs7S0tLW1tba2tre3t7i4uLm5ubq6uru7u7y8vL29vb6+vr+/v8DAwMHBwcLCwsPDw8TExMXFxcbGxsfHx8jIyMnJycrKysvLy8zMzM3Nzc7Ozs/Pz9DQ0NHR0dLS0tPT09TU1NXV1dbW1tfX19jY2NnZ2dra2tvb29zc3N3d3d7e3t/f3+Dg4OHh4eLi4uPj4+Tk5OXl5ebm5ufn5+jo6Onp6erq6uvr6+zs7O3t7e7u7u/v7/Dw8PHx8fLy8vPz8/T09PX19fb29vf39/j4+Pn5+fr6+vv7+/z8/P39/f7+/v///yH5BAEKAP8ALAAAAACbAMgAAAj+AP8JHEiwoMGDCBMqXMiwocOHECNKnEhRIoCKGDNq3MixIYCLHUOKHEkS4UeQJVOqXAnxJEqWMGPCdCmzpk2SLl/e3MnTIs2eQIMuzKlTqNGgRIseXWozqVKmUFc6jUo1ptOnVbNqvPpRq9eOXLF+HeswrFiyaE2aTcvW49q2cA+aPRm37sC5Xe3GxUtXb1u+ef2mBRxY8FfChQ1rRXxWsVHGiR1DhdxYMk/KlS3fxJxZs1XOno9yjhx65+jOpUueJp165mrUrcG+jt30NWzaGG2zxi1S927eHH3/Bp5R+HDiFY3fRs5Q+XLmCZ0/h25Q+nTqd61jz239OvXux7f+ywXvHTn58sTPo+etfj3t9u5bwxdfdj79ofDjh84f/jt//Zb91x9zAg6YXoEAGoZggoItyKBfDt5HkIMP1kWhhAJRWCFcGm7IVoceogViiGONSKJXJp6YVYoqUsVii5O96B+L0L1ooEIwFmfjen0dtiOPPa74441q/VTVkESOl9ORSKJ3VYxNehfWUlEaOdFbQlUZZER8IaXllg8B1tOXS3JJmGlkllkfYpvx949wblFW038ZGhfdaZ/ll12UrulZZ5VSubknoCkJOiihI9E5YZqJGroomb05eqiWsvlZXZpJKmmfpl9uJCCOmG4l6aWhJqcoqKVeeSqqkKq6Kqv+nfr0KqyIhvlpS4ziOmtzua45apyU+rorr7ESe6urfBp7LLJNKjusrcnS+qusQ+IXoahISvsstTZqOy1F2XK6YKTdiotgozKaey66KZLaoWo0FtQuvCO6+26h9co7L773TtovvRf6C2KgAf8ZL8HrGnywStcqvDC/BQpsYp6nNtunoNGydGutCLfn8I8yYcxxx+R9DHLIHr/pJ2hzqmeydipj1mbJMZ8nsZgt05zyyzjn3B3PcD4q88ww26wvy0Q7B7Rt6p6JZtE/N91z0nbWrLTUXV4GtXR3Iv20ckuPZi1kWV7N9diMlV211b4567SXQYdNNrBvw932zV6jnfX+Y3GzvZqZU6utm9CzcTslU337LTazU7k4OOF4cpfUYo9DnndslVs+NHtM23v5e4UfHfmBo3sup3l/F/k56KWLvjnpq+ONV42tm84mgYt7Gzhwues+F3axu3477afTXTfsaUObPO5z6zo86s0rfzzv0Tu/O+fPAz499ttLPzvx11v/PfTha7839eUbjiX64weXfmndm3o+bvFL3j7rvwO8Pubzs3s4/ffTH1cAmL+LDRB/B0TZ/jwTQAM2Dn4L9NmTIJjAMUVQQf+z2wMlc0GtVRCDE4RSCBv0QRFOjoQbFFIK9zJCH53QQiskSwxl+EIWEoVDNwShlUqkJsfUUIUVYOJgDx0XxP0UUXAzQlymGCiaqgQEADs=';
+    private string $imgData = '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';
 
     protected function setUp(): void
     {
diff --git a/tests/system/Helpers/NumberHelperTest.php b/tests/system/Helpers/NumberHelperTest.php
index 006d0a650118..772fd3292246 100755
--- a/tests/system/Helpers/NumberHelperTest.php
+++ b/tests/system/Helpers/NumberHelperTest.php
@@ -83,17 +83,17 @@ public function testKbFormatLarge()
 
     public function testMbFormat()
     {
-        $this->assertSame('3.3 MB', number_to_size(3456789, 1, 'en_US'));
+        $this->assertSame('3.3 MB', number_to_size(3_456_789, 1, 'en_US'));
     }
 
     public function testGbFormat()
     {
-        $this->assertSame('1.8 GB', number_to_size(1932735283.2, 1, 'en_US'));
+        $this->assertSame('1.8 GB', number_to_size(1_932_735_283.2, 1, 'en_US'));
     }
 
     public function testTbFormat()
     {
-        $this->assertSame('112,283.3 TB', number_to_size(123456789123456789, 1, 'en_US'));
+        $this->assertSame('112,283.3 TB', number_to_size(123_456_789_123_456_789, 1, 'en_US'));
     }
 
     public function testThousands()
diff --git a/tests/system/Helpers/TextHelperTest.php b/tests/system/Helpers/TextHelperTest.php
index 0853ed46c6f4..7871b8a90ef9 100755
--- a/tests/system/Helpers/TextHelperTest.php
+++ b/tests/system/Helpers/TextHelperTest.php
@@ -18,7 +18,7 @@
  */
 final class TextHelperTest extends CIUnitTestCase
 {
-    private $_long_string = 'Once upon a time, a framework had no tests. It sad. So some nice people began to write tests. The more time that went on, the happier it became. Everyone was happy.';
+    private string $_long_string = 'Once upon a time, a framework had no tests. It sad. So some nice people began to write tests. The more time that went on, the happier it became. Everyone was happy.';
 
     protected function setUp(): void
     {
diff --git a/tests/system/Helpers/URLHelper/CurrentUrlTest.php b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
index 6dc5de5a4829..b4f522f16071 100644
--- a/tests/system/Helpers/URLHelper/CurrentUrlTest.php
+++ b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
@@ -28,10 +28,7 @@
  */
 final class CurrentUrlTest extends CIUnitTestCase
 {
-    /**
-     * @var App
-     */
-    private $config;
+    private App $config;
 
     public static function setUpBeforeClass(): void
     {
diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php
index bb74696181a4..a5a78c5cc687 100644
--- a/tests/system/Helpers/URLHelper/MiscUrlTest.php
+++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php
@@ -25,10 +25,7 @@
  */
 final class MiscUrlTest extends CIUnitTestCase
 {
-    /**
-     * @var App
-     */
-    private $config;
+    private App $config;
 
     public static function setUpBeforeClass(): void
     {
diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php
index cd9c0f816646..e9b5ec9c25dd 100644
--- a/tests/system/Helpers/URLHelper/SiteUrlTest.php
+++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php
@@ -28,10 +28,7 @@
  */
 final class SiteUrlTest extends CIUnitTestCase
 {
-    /**
-     * @var App
-     */
-    private $config;
+    private App $config;
 
     public static function setUpBeforeClass(): void
     {
diff --git a/tests/system/I18n/TimeDifferenceTest.php b/tests/system/I18n/TimeDifferenceTest.php
index 0e73b13341d8..7141f71769d3 100644
--- a/tests/system/I18n/TimeDifferenceTest.php
+++ b/tests/system/I18n/TimeDifferenceTest.php
@@ -41,16 +41,16 @@ public function testDifferenceBasics()
         $this->assertSame(-365, $obj->getWeeks());
         $this->assertSame(-2557, $obj->getDays());
         $this->assertSame(-61368, $obj->getHours());
-        $this->assertSame(-3682080, $obj->getMinutes());
-        $this->assertSame(-220924800, $obj->getSeconds());
+        $this->assertSame(-3_682_080, $obj->getMinutes());
+        $this->assertSame(-220_924_800, $obj->getSeconds());
 
         $this->assertSame(-7, $obj->years);
         $this->assertSame(-84, $obj->months);
         $this->assertSame(-365, $obj->weeks);
         $this->assertSame(-2557, $obj->days);
         $this->assertSame(-61368, $obj->hours);
-        $this->assertSame(-3682080, $obj->minutes);
-        $this->assertSame(-220924800, $obj->seconds);
+        $this->assertSame(-3_682_080, $obj->minutes);
+        $this->assertSame(-220_924_800, $obj->seconds);
 
         $this->assertSame($diff / YEAR, $obj->getYears(true));
         $this->assertSame($diff / MONTH, $obj->getMonths(true));
diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php
index 0a501ea7947e..f89e6dd18125 100644
--- a/tests/system/Language/LanguageTest.php
+++ b/tests/system/Language/LanguageTest.php
@@ -21,10 +21,7 @@
  */
 final class LanguageTest extends CIUnitTestCase
 {
-    /**
-     * @var MockLanguage
-     */
-    private $lang;
+    private Language $lang;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Models/GeneralModelTest.php b/tests/system/Models/GeneralModelTest.php
index cc41c453603b..c036febeedb9 100644
--- a/tests/system/Models/GeneralModelTest.php
+++ b/tests/system/Models/GeneralModelTest.php
@@ -28,10 +28,8 @@ final class GeneralModelTest extends CIUnitTestCase
 {
     /**
      * Current instance of the Model.
-     *
-     * @var Model
      */
-    private $model;
+    private ?object $model = null;
 
     protected function setUp(): void
     {
@@ -68,21 +66,21 @@ public function testMagicGetters(): void
     {
         $this->createModel(UserModel::class);
 
-        $this->assertTrue(isset($this->model->table));
+        $this->assertObjectHasAttribute('table', $this->model);
         $this->assertSame('user', $this->model->table);
-        $this->assertFalse(isset($this->model->foobar));
+        $this->assertObjectNotHasAttribute('foobar', $this->model);
         $this->assertNull($this->model->foobar);
 
         $this->model->flavor = 'chocolate';
-        $this->assertTrue(isset($this->model->flavor));
+        $this->assertObjectHasAttribute('flavor', $this->model);
         $this->assertSame('chocolate', $this->model->flavor);
 
         // from DB
-        $this->assertTrue(isset($this->model->DBPrefix));
+        $this->assertObjectHasAttribute('DBPrefix', $this->model);
         $this->assertSame('utf8', $this->model->charset);
 
         // from Builder
-        $this->assertTrue(isset($this->model->QBNoEscape));
+        $this->assertObjectHasAttribute('QBNoEscape', $this->model);
         $this->assertIsArray($this->model->QBNoEscape);
     }
 
diff --git a/tests/system/Publisher/PublisherInputTest.php b/tests/system/Publisher/PublisherInputTest.php
index 8e6d0a4368f1..071d387031c6 100644
--- a/tests/system/Publisher/PublisherInputTest.php
+++ b/tests/system/Publisher/PublisherInputTest.php
@@ -20,17 +20,13 @@ final class PublisherInputTest extends CIUnitTestCase
 {
     /**
      * A known, valid file
-     *
-     * @var string
      */
-    private $file = SUPPORTPATH . 'Files/baker/banana.php';
+    private string $file = SUPPORTPATH . 'Files/baker/banana.php';
 
     /**
      * A known, valid directory
-     *
-     * @var string
      */
-    private $directory = SUPPORTPATH . 'Files/able/';
+    private string $directory = SUPPORTPATH . 'Files/able/';
 
     /**
      * Initialize the helper, since some
diff --git a/tests/system/Publisher/PublisherOutputTest.php b/tests/system/Publisher/PublisherOutputTest.php
index f43fdf64971b..fe66467f35f7 100644
--- a/tests/system/Publisher/PublisherOutputTest.php
+++ b/tests/system/Publisher/PublisherOutputTest.php
@@ -22,31 +22,23 @@ final class PublisherOutputTest extends CIUnitTestCase
 {
     /**
      * Files to seed to VFS
-     *
-     * @var array
      */
-    private $structure;
+    private array $structure;
 
     /**
      * Virtual destination
-     *
-     * @var vfsStreamDirectory
      */
-    private $root;
+    private vfsStreamDirectory $root;
 
     /**
      * A known, valid file
-     *
-     * @var string
      */
-    private $file = SUPPORTPATH . 'Files/baker/banana.php';
+    private string $file = SUPPORTPATH . 'Files/baker/banana.php';
 
     /**
      * A known, valid directory
-     *
-     * @var string
      */
-    private $directory = SUPPORTPATH . 'Files/able/';
+    private string $directory = SUPPORTPATH . 'Files/able/';
 
     /**
      * Initialize the helper, since some
diff --git a/tests/system/Publisher/PublisherSupportTest.php b/tests/system/Publisher/PublisherSupportTest.php
index 2f14a49c4dd2..5fb5f4b2a15b 100644
--- a/tests/system/Publisher/PublisherSupportTest.php
+++ b/tests/system/Publisher/PublisherSupportTest.php
@@ -22,17 +22,13 @@ final class PublisherSupportTest extends CIUnitTestCase
 {
     /**
      * A known, valid file
-     *
-     * @var string
      */
-    private $file = SUPPORTPATH . 'Files/baker/banana.php';
+    private string $file = SUPPORTPATH . 'Files/baker/banana.php';
 
     /**
      * A known, valid directory
-     *
-     * @var string
      */
-    private $directory = SUPPORTPATH . 'Files/able/';
+    private string $directory = SUPPORTPATH . 'Files/able/';
 
     /**
      * Initialize the helper, since some
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index 0c264fbdc43b..fdb66c8c2856 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -57,9 +57,7 @@ protected function setUp(): void
             'posts/(:num)'                 => 'Blog::show/$1',
             'posts/(:num)/edit'            => 'Blog::edit/$1',
             'books/(:num)/(:alpha)/(:num)' => 'Blog::show/$3/$1',
-            'closure/(:num)/(:alpha)'      => static function ($num, $str) {
-                return $num . '-' . $str;
-            },
+            'closure/(:num)/(:alpha)'      => static fn($num, $str) => $num . '-' . $str,
             '{locale}/pages'                                  => 'App\Pages::list_all',
             'Admin/Admins'                                    => 'App\Admin\Admins::list_all',
             '/some/slash'                                     => 'App\Slash::index',
diff --git a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
index 2717e26a40e8..ea416f896a96 100644
--- a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
+++ b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
@@ -39,12 +39,12 @@ final class SecurityCSRFSessionRandomizeTokenTest extends CIUnitTestCase
     /**
      * @var string CSRF protection hash
      */
-    private $hash = '8b9218a55906f9dcc1dc263dce7f005a';
+    private string $hash = '8b9218a55906f9dcc1dc263dce7f005a';
 
     /**
      * @var string CSRF randomized token
      */
-    private $randomizedToken = '8bc70b67c91494e815c7d2219c1ae0ab005513c290126d34d41bf41c5265e0f1';
+    private string $randomizedToken = '8bc70b67c91494e815c7d2219c1ae0ab005513c290126d34d41bf41c5265e0f1';
 
     protected function setUp(): void
     {
diff --git a/tests/system/Security/SecurityCSRFSessionTest.php b/tests/system/Security/SecurityCSRFSessionTest.php
index ca07bf1f30b7..db6326b5257a 100644
--- a/tests/system/Security/SecurityCSRFSessionTest.php
+++ b/tests/system/Security/SecurityCSRFSessionTest.php
@@ -38,7 +38,7 @@ final class SecurityCSRFSessionTest extends CIUnitTestCase
     /**
      * @var string CSRF protection hash
      */
-    private $hash = '8b9218a55906f9dcc1dc263dce7f005a';
+    private string $hash = '8b9218a55906f9dcc1dc263dce7f005a';
 
     protected function setUp(): void
     {
diff --git a/tests/system/Test/BootstrapFCPATHTest.php b/tests/system/Test/BootstrapFCPATHTest.php
index c3fe92aa2d9d..5deb0850d524 100644
--- a/tests/system/Test/BootstrapFCPATHTest.php
+++ b/tests/system/Test/BootstrapFCPATHTest.php
@@ -25,9 +25,9 @@
  */
 final class BootstrapFCPATHTest extends CIUnitTestCase
 {
-    private $currentDir = __DIR__;
-    private $dir1       = '/tmp/dir1';
-    private $file1      = '/tmp/dir1/testFile.php';
+    private string $currentDir = __DIR__;
+    private string $dir1       = '/tmp/dir1';
+    private string $file1      = '/tmp/dir1/testFile.php';
 
     protected function setUp(): void
     {
diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php
index 572ebe3d4244..7ef278840a7e 100644
--- a/tests/system/Test/FeatureTestTraitTest.php
+++ b/tests/system/Test/FeatureTestTraitTest.php
@@ -38,9 +38,7 @@ public function testCallGet()
             [
                 'get',
                 'home',
-                static function () {
-                    return 'Hello World';
-                },
+                static fn() => 'Hello World',
             ],
         ]);
         $response = $this->get('home');
@@ -55,9 +53,7 @@ public function testCallSimpleGet()
             [
                 'add',
                 'home',
-                static function () {
-                    return 'Hello Earth';
-                },
+                static fn() => 'Hello Earth',
             ],
         ]);
         $response = $this->call('get', 'home');
@@ -75,9 +71,7 @@ public function testCallPost()
             [
                 'post',
                 'home',
-                static function () {
-                    return 'Hello Mars';
-                },
+                static fn() => 'Hello Mars',
             ],
         ]);
         $response = $this->post('home');
@@ -91,9 +85,7 @@ public function testCallPostWithBody()
             [
                 'post',
                 'home',
-                static function () {
-                    return 'Hello ' . service('request')->getPost('foo') . '!';
-                },
+                static fn() => 'Hello ' . service('request')->getPost('foo') . '!',
             ],
         ]);
         $response = $this->post('home', ['foo' => 'Mars']);
@@ -107,9 +99,7 @@ public function testCallPut()
             [
                 'put',
                 'home',
-                static function () {
-                    return 'Hello Pluto';
-                },
+                static fn() => 'Hello Pluto',
             ],
         ]);
         $response = $this->put('home');
@@ -123,9 +113,7 @@ public function testCallPatch()
             [
                 'patch',
                 'home',
-                static function () {
-                    return 'Hello Jupiter';
-                },
+                static fn() => 'Hello Jupiter',
             ],
         ]);
         $response = $this->patch('home');
@@ -139,9 +127,7 @@ public function testCallOptions()
             [
                 'options',
                 'home',
-                static function () {
-                    return 'Hello George';
-                },
+                static fn() => 'Hello George',
             ],
         ]);
         $response = $this->options('home');
@@ -155,9 +141,7 @@ public function testCallDelete()
             [
                 'delete',
                 'home',
-                static function () {
-                    return 'Hello Wonka';
-                },
+                static fn() => 'Hello Wonka',
             ],
         ]);
         $response = $this->delete('home');
@@ -171,9 +155,7 @@ public function testSession()
             [
                 'get',
                 'home',
-                static function () {
-                    return 'Home';
-                },
+                static fn() => 'Home',
             ],
         ])->withSession([
             'fruit'    => 'apple',
@@ -195,9 +177,7 @@ public function testWithSessionNull()
             [
                 'get',
                 'home',
-                static function () {
-                    return 'Home';
-                },
+                static fn() => 'Home',
             ],
         ])->withSession()->get('home');
 
diff --git a/tests/system/Test/ReflectionHelperTest.php b/tests/system/Test/ReflectionHelperTest.php
index c2f514695973..8a9f297fb561 100644
--- a/tests/system/Test/ReflectionHelperTest.php
+++ b/tests/system/Test/ReflectionHelperTest.php
@@ -91,8 +91,8 @@ public function testGetPrivateMethodInvokerWithStatic()
 
 class __TestForReflectionHelper
 {
-    private $private               = 'secret';
-    private static $static_private = 'xyz';
+    private string $private               = 'secret';
+    private static string $static_private = 'xyz';
 
     public function getPrivate()
     {
diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php
index 11725f3d4665..fae3a7a95c5e 100644
--- a/tests/system/Validation/CreditCardRulesTest.php
+++ b/tests/system/Validation/CreditCardRulesTest.php
@@ -21,12 +21,9 @@
  */
 final class CreditCardRulesTest extends CIUnitTestCase
 {
-    /**
-     * @var Validation
-     */
-    private $validation;
+    private Validation $validation;
 
-    private $config = [
+    private array $config = [
         'ruleSets' => [
             Rules::class,
             FormatRules::class,
diff --git a/tests/system/Validation/DatabaseRelatedRulesTest.php b/tests/system/Validation/DatabaseRelatedRulesTest.php
index 2968c9c1e207..652140e3ff34 100644
--- a/tests/system/Validation/DatabaseRelatedRulesTest.php
+++ b/tests/system/Validation/DatabaseRelatedRulesTest.php
@@ -26,12 +26,9 @@ final class DatabaseRelatedRulesTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
-    /**
-     * @var Validation
-     */
-    private $validation;
+    private Validation $validation;
 
-    private $config = [
+    private array $config = [
         'ruleSets' => [
             Rules::class,
             FormatRules::class,
diff --git a/tests/system/Validation/FileRulesTest.php b/tests/system/Validation/FileRulesTest.php
index 8a2a111c451f..a60369ad8ca7 100644
--- a/tests/system/Validation/FileRulesTest.php
+++ b/tests/system/Validation/FileRulesTest.php
@@ -20,12 +20,9 @@
  */
 final class FileRulesTest extends CIUnitTestCase
 {
-    /**
-     * @var Validation
-     */
-    private $validation;
+    private Validation $validation;
 
-    private $config = [
+    private array $config = [
         'ruleSets' => [
             Rules::class,
             FormatRules::class,
@@ -62,7 +59,7 @@ protected function setUp(): void
             'bigfile' => [
                 'tmp_name' => TESTPATH . '_support/Validation/uploads/phpUxc0ty',
                 'name'     => 'my-big-file.png',
-                'size'     => 1024000,
+                'size'     => 1_024_000,
                 'type'     => 'image/png',
                 'error'    => UPLOAD_ERR_OK,
                 'width'    => 640,
@@ -88,7 +85,7 @@ protected function setUp(): void
                 ],
                 'size' => [
                     4614,
-                    1024000,
+                    1_024_000,
                 ],
                 'type' => [
                     'image/png',
@@ -118,7 +115,7 @@ protected function setUp(): void
                 ],
                 'size' => [
                     4614,
-                    1024000,
+                    1_024_000,
                 ],
                 'type' => [
                     'image/png',
diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php
index 411c173fcf8d..6ba1d8215263 100644
--- a/tests/system/Validation/FormatRulesTest.php
+++ b/tests/system/Validation/FormatRulesTest.php
@@ -24,12 +24,9 @@ final class FormatRulesTest extends CIUnitTestCase
     public const ALPHABET     = 'abcdefghijklmnopqrstuvwxyzABCDEFGHLIJKLMNOPQRSTUVWXYZ';
     public const ALPHANUMERIC = 'abcdefghijklmnopqrstuvwxyzABCDEFGHLIJKLMNOPQRSTUVWXYZ0123456789';
 
-    /**
-     * @var Validation
-     */
-    private $validation;
+    private Validation $validation;
 
-    private $config = [
+    private array $config = [
         'ruleSets' => [
             Rules::class,
             FormatRules::class,
diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
index 3b3ddc11987a..63f842771707 100644
--- a/tests/system/Validation/RulesTest.php
+++ b/tests/system/Validation/RulesTest.php
@@ -22,12 +22,9 @@
  */
 final class RulesTest extends CIUnitTestCase
 {
-    /**
-     * @var Validation
-     */
-    private $validation;
+    private Validation $validation;
 
-    private $config = [
+    private array $config = [
         'ruleSets' => [
             Rules::class,
             FormatRules::class,
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index d075b7b59151..4fee16030222 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -26,12 +26,9 @@
  */
 final class ValidationTest extends CIUnitTestCase
 {
-    /**
-     * @var Validation
-     */
-    private $validation;
+    private Validation $validation;
 
-    private $config = [
+    private array $config = [
         'ruleSets' => [
             Rules::class,
             FormatRules::class,
diff --git a/tests/system/View/ParserFilterTest.php b/tests/system/View/ParserFilterTest.php
index d1670f60a119..4ed4feab56ab 100644
--- a/tests/system/View/ParserFilterTest.php
+++ b/tests/system/View/ParserFilterTest.php
@@ -326,7 +326,7 @@ public function testLocalNumberBase()
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
         $data = [
-            'mynum' => 1234567.891234567890000,
+            'mynum' => 1_234_567.8912346,
         ];
 
         $template = '{ mynum|local_number }';
@@ -340,7 +340,7 @@ public function testLocalNumberPrecision()
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
         $data = [
-            'mynum' => 1234567.891234567890000,
+            'mynum' => 1_234_567.8912346,
         ];
 
         $template = '{ mynum|local_number(decimal,2) }';
@@ -354,7 +354,7 @@ public function testLocalNumberType()
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
         $data = [
-            'mynum' => 1234567.891234567890000,
+            'mynum' => 1_234_567.8912346,
         ];
 
         $template = '{ mynum|local_number(spellout) }';
@@ -368,7 +368,7 @@ public function testLocalNumberLocale()
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
         $data = [
-            'mynum' => 1234567.891234567890000,
+            'mynum' => 1_234_567.8912346,
         ];
 
         $template = '{ mynum|local_number(decimal,4,de_DE) }';
@@ -382,7 +382,7 @@ public function testLocalCurrency()
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
 
         $data = [
-            'mynum' => 1234567.891234567890000,
+            'mynum' => 1_234_567.8912346,
         ];
 
         $template = '{ mynum|local_currency(EUR,de_DE,2) }';
diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php
index a7a97f00c51a..a92ecaa69851 100644
--- a/tests/system/View/ParserTest.php
+++ b/tests/system/View/ParserTest.php
@@ -24,25 +24,13 @@
  */
 final class ParserTest extends CIUnitTestCase
 {
-    /**
-     * @var FileLocator
-     */
-    private $loader;
+    private FileLocator $loader;
 
-    /**
-     * @var string
-     */
-    private $viewsDir;
+    private string $viewsDir;
 
-    /**
-     * @var ViewConfig
-     */
-    private $config;
+    private ViewConfig $config;
 
-    /**
-     * @var Parser
-     */
-    private $parser;
+    private Parser $parser;
 
     protected function setUp(): void
     {
@@ -677,9 +665,7 @@ public function testParseRuns()
      */
     public function testCanAddAndRemovePlugins()
     {
-        $this->parser->addPlugin('first', static function ($str) {
-            return $str;
-        });
+        $this->parser->addPlugin('first', static fn($str) => $str);
 
         $setParsers = $this->getPrivateProperty($this->parser, 'plugins');
 
@@ -707,9 +693,7 @@ public function testParserPluginNoMatches()
      */
     public function testParserPluginNoParams()
     {
-        $this->parser->addPlugin('hit:it', static function ($str) {
-            return str_replace('here', 'Hip to the Hop', $str);
-        }, true);
+        $this->parser->addPlugin('hit:it', static fn($str) => str_replace('here', 'Hip to the Hop', $str), true);
 
         $template = '{+ hit:it +} stuff here {+ /hit:it +}';
 
@@ -722,9 +706,7 @@ public function testParserPluginNoParams()
     public function testParserPluginClosure()
     {
         $config                   = $this->config;
-        $config->plugins['hello'] = static function (array $params = []) {
-            return 'Hello, ' . trim($params[0]);
-        };
+        $config->plugins['hello'] = static fn(array $params = []) => 'Hello, ' . trim($params[0]);
 
         $this->parser = new Parser($config, $this->viewsDir, $this->loader);
 
@@ -761,9 +743,7 @@ public function testParserPluginParams()
      */
     public function testParserSingleTag()
     {
-        $this->parser->addPlugin('hit:it', static function () {
-            return 'Hip to the Hop';
-        }, false);
+        $this->parser->addPlugin('hit:it', static fn() => 'Hip to the Hop', false);
 
         $template = '{+ hit:it +}';
 
@@ -775,9 +755,7 @@ public function testParserSingleTag()
      */
     public function testParserSingleTagWithParams()
     {
-        $this->parser->addPlugin('hit:it', static function (array $params = []) {
-            return "{$params['first']} to the {$params['last']}";
-        }, false);
+        $this->parser->addPlugin('hit:it', static fn(array $params = []) => "{$params['first']} to the {$params['last']}", false);
 
         $template = '{+ hit:it first=foo last=bar +}';
 
@@ -789,9 +767,7 @@ public function testParserSingleTagWithParams()
      */
     public function testParserSingleTagWithSingleParams()
     {
-        $this->parser->addPlugin('hit:it', static function (array $params = []) {
-            return "{$params[0]} to the {$params[1]}";
-        }, false);
+        $this->parser->addPlugin('hit:it', static fn(array $params = []) => "{$params[0]} to the {$params[1]}", false);
 
         $template = '{+ hit:it foo bar +}';
 
diff --git a/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php b/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php
index b083b5daff87..6b65e2c35b20 100644
--- a/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php
+++ b/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php
@@ -60,9 +60,7 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        $inStmts = (bool) $this->betterNodeFinder->findFirst((array) $tryCatch->stmts, static function (Node $n) use ($node): bool {
-            return $n === $node;
-        });
+        $inStmts = (bool) $this->betterNodeFinder->findFirst((array) $tryCatch->stmts, static fn(Node $n): bool => $n === $node);
 
         // not in stmts, means it in catch or finally
         if (! $inStmts) {
diff --git a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
index 690a63c6febe..530fe18b029e 100644
--- a/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
+++ b/utils/Rector/UnderscoreToCamelCaseVariableNameRector.php
@@ -34,10 +34,7 @@ final class UnderscoreToCamelCaseVariableNameRector extends AbstractRector
      */
     private const PARAM_NAME_REGEX = '#(?<paramPrefix>@param\s.*\s+\$)(?<paramName>%s)#ms';
 
-    /**
-     * @var ReservedKeywordAnalyzer
-     */
-    private $reservedKeywordAnalyzer;
+    private ReservedKeywordAnalyzer $reservedKeywordAnalyzer;
 
     public function __construct(
         ReservedKeywordAnalyzer $reservedKeywordAnalyzer

From a074aee6aaca078f521ee42a56019f472674ba69 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 14 Dec 2021 10:59:41 +0700
Subject: [PATCH 1097/2325] remove php 7.3 from workflow

---
 .github/workflows/test-coding-standards.yml | 1 -
 .github/workflows/test-phpunit.yml          | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/test-coding-standards.yml b/.github/workflows/test-coding-standards.yml
index cb7d9671e2cd..583f4d5df72c 100644
--- a/.github/workflows/test-coding-standards.yml
+++ b/.github/workflows/test-coding-standards.yml
@@ -21,7 +21,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - '7.3'
           - '7.4'
           - '8.0'
 
diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 50809c95abda..cdd530ccc5c4 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.3', '7.4', '8.0', '8.1']
+        php-versions: ['7.4', '8.0', '8.1']
         db-platforms: ['MySQLi', 'Postgre', 'SQLite3', 'SQLSRV']
         mysql-versions: ['5.7']
         include:

From 4e3792d1382518c2f6f89d03aab857356c45a040 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 14 Dec 2021 11:19:51 +0700
Subject: [PATCH 1098/2325] cs fix

---
 app/Config/Events.php                         |  2 +-
 system/Commands/Help.php                      |  2 +-
 system/Cookie/Cookie.php                      |  1 -
 system/Database/Forge.php                     |  2 +-
 system/Database/Postgre/Connection.php        |  2 +-
 system/Database/Query.php                     |  2 +-
 system/Database/SQLSRV/Builder.php            |  2 +-
 system/Database/SQLSRV/Connection.php         |  2 +-
 system/Database/SQLSRV/Forge.php              |  2 +-
 system/Debug/Toolbar/Collectors/Database.php  |  4 ++--
 system/Entity/Entity.php                      |  2 +-
 system/Files/File.php                         |  2 +-
 system/Files/FileCollection.php               |  4 ++--
 system/HTTP/IncomingRequest.php               |  2 +-
 system/HTTP/RequestTrait.php                  |  2 +-
 system/HTTP/URI.php                           |  4 ++--
 system/Helpers/array_helper.php               |  4 ++--
 system/Helpers/url_helper.php                 |  2 +-
 system/Router/RouteCollection.php             |  2 +-
 system/Router/Router.php                      |  2 +-
 system/Security/Security.php                  |  2 +-
 system/Test/FilterTestTrait.php               |  4 ++--
 system/Test/ReflectionHelper.php              |  2 +-
 system/View/View.php                          |  2 +-
 .../Cache/Handlers/DummyHandlerTest.php       |  2 +-
 .../system/Cache/Handlers/FileHandlerTest.php |  2 +-
 .../Cache/Handlers/MemcachedHandlerTest.php   |  2 +-
 .../Cache/Handlers/PredisHandlerTest.php      |  2 +-
 .../Cache/Handlers/RedisHandlerTest.php       |  2 +-
 tests/system/CodeIgniterTest.php              |  4 ++--
 tests/system/Database/Builder/GroupTest.php   | 12 +++++------
 tests/system/Database/Builder/WhereTest.php   |  8 ++++----
 .../Database/Live/PreparedQueryTest.php       |  7 +++----
 tests/system/Filters/InvalidCharsTest.php     |  1 -
 tests/system/Helpers/CookieHelperTest.php     |  2 +-
 tests/system/Router/RouterTest.php            | 18 ++++++++---------
 tests/system/Test/FeatureTestTraitTest.php    | 20 +++++++++----------
 .../system/Validation/CreditCardRulesTest.php |  1 -
 .../Validation/DatabaseRelatedRulesTest.php   |  1 -
 tests/system/Validation/FileRulesTest.php     |  1 -
 tests/system/Validation/FormatRulesTest.php   |  1 -
 tests/system/Validation/RulesTest.php         |  1 -
 tests/system/Validation/ValidationTest.php    |  1 -
 tests/system/View/ParserTest.php              | 15 ++++++--------
 ...moveErrorSuppressInTryCatchStmtsRector.php |  2 +-
 45 files changed, 75 insertions(+), 87 deletions(-)

diff --git a/app/Config/Events.php b/app/Config/Events.php
index 36ce2c74ab36..5219f4ac3f68 100644
--- a/app/Config/Events.php
+++ b/app/Config/Events.php
@@ -32,7 +32,7 @@
             ob_end_flush();
         }
 
-        ob_start(static fn($buffer) => $buffer);
+        ob_start(static fn ($buffer) => $buffer);
     }
 
     /*
diff --git a/system/Commands/Help.php b/system/Commands/Help.php
index bda3179f0365..4dbc2df6d34d 100644
--- a/system/Commands/Help.php
+++ b/system/Commands/Help.php
@@ -71,7 +71,7 @@ class Help extends BaseCommand
      */
     public function run(array $params)
     {
-        $command  = array_shift($params);
+        $command = array_shift($params);
         $command ??= 'help';
         $commands = $this->commands->getCommands();
 
diff --git a/system/Cookie/Cookie.php b/system/Cookie/Cookie.php
index e6fc999fd398..e40d0a1201d5 100644
--- a/system/Cookie/Cookie.php
+++ b/system/Cookie/Cookie.php
@@ -110,7 +110,6 @@ class Cookie implements ArrayAccess, CloneableCookieInterface
      * A cookie name can be any US-ASCII characters, except control characters,
      * spaces, tabs, or separator characters.
      *
-     *
      * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#attributes
      * @see https://tools.ietf.org/html/rfc2616#section-2.2
      */
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index a8dc13691bda..60095ae2496f 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -804,7 +804,7 @@ protected function _alterTable(string $alterType, string $table, $fields)
                 $fields = explode(',', $fields);
             }
 
-            $fields = array_map(fn($field) => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $fields);
+            $fields = array_map(fn ($field) => 'DROP COLUMN ' . $this->db->escapeIdentifiers(trim($field)), $fields);
 
             return $sql . implode(', ', $fields);
         }
diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
index f1de457ada4b..bf78f379d1ef 100644
--- a/system/Database/Postgre/Connection.php
+++ b/system/Database/Postgre/Connection.php
@@ -284,7 +284,7 @@ protected function _indexData(string $table): array
             $obj         = new stdClass();
             $obj->name   = $row->indexname;
             $_fields     = explode(',', preg_replace('/^.*\((.+?)\)$/', '$1', trim($row->indexdef)));
-            $obj->fields = array_map(static fn($v) => trim($v), $_fields);
+            $obj->fields = array_map(static fn ($v) => trim($v), $_fields);
 
             if (strpos($row->indexdef, 'CREATE UNIQUE INDEX pk') === 0) {
                 $obj->type = 'PRIMARY';
diff --git a/system/Database/Query.php b/system/Database/Query.php
index 939db58792b8..8abee5ae30e2 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -403,7 +403,7 @@ public function debugToolbarDisplay(): string
          */
         $search = '/\b(?:' . implode('|', $highlight) . ')\b(?![^(&#039;)]*&#039;(?:(?:[^(&#039;)]*&#039;){2})*[^(&#039;)]*$)/';
 
-        return preg_replace_callback($search, static fn($matches) => '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>', $sql);
+        return preg_replace_callback($search, static fn ($matches) => '<strong>' . str_replace(' ', '&nbsp;', $matches[0]) . '</strong>', $sql);
     }
 
     /**
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index f58a5b302932..9b5e9ea88a01 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -382,7 +382,7 @@ protected function _replace(string $table, array $keys, array $values): string
         }
 
         // Get the unique field names
-        $escKeyFields = array_map(fn(string $field): string => $this->db->protectIdentifiers($field), array_values(array_unique($keyFields)));
+        $escKeyFields = array_map(fn (string $field): string => $this->db->protectIdentifiers($field), array_values(array_unique($keyFields)));
 
         // Get the binds
         $binds = $this->binds;
diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index 23d309c6b234..ee27f038f817 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -229,7 +229,7 @@ protected function _indexData(string $table): array
             $obj->name = $row->index_name;
 
             $_fields     = explode(',', trim($row->index_keys));
-            $obj->fields = array_map(static fn($v) => trim($v), $_fields);
+            $obj->fields = array_map(static fn ($v) => trim($v), $_fields);
 
             if (strpos($row->index_description, 'primary key located on') !== false) {
                 $obj->type = 'PRIMARY';
diff --git a/system/Database/SQLSRV/Forge.php b/system/Database/SQLSRV/Forge.php
index db9fb32cf33e..67ef057e12de 100755
--- a/system/Database/SQLSRV/Forge.php
+++ b/system/Database/SQLSRV/Forge.php
@@ -152,7 +152,7 @@ protected function _alterTable(string $alterType, string $table, $field)
 
             $sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($this->db->schema) . '.' . $this->db->escapeIdentifiers($table) . ' DROP ';
 
-            $fields = array_map(static fn($item) => 'COLUMN [' . trim($item) . ']', (array) $field);
+            $fields = array_map(static fn ($item) => 'COLUMN [' . trim($item) . ']', (array) $field);
 
             return $sql . implode(',', $fields);
         }
diff --git a/system/Debug/Toolbar/Collectors/Database.php b/system/Debug/Toolbar/Collectors/Database.php
index 995f8085535e..6a845ae51bf3 100644
--- a/system/Debug/Toolbar/Collectors/Database.php
+++ b/system/Debug/Toolbar/Collectors/Database.php
@@ -208,8 +208,8 @@ public function getTitleDetails(): string
     {
         $this->getConnections();
 
-        $queryCount  = count(static::$queries);
-        $uniqueCount = count(array_filter(static::$queries, static fn($query) => $query['duplicate'] === false));
+        $queryCount      = count(static::$queries);
+        $uniqueCount     = count(array_filter(static::$queries, static fn ($query) => $query['duplicate'] === false));
         $connectionCount = count($this->connections);
 
         return sprintf(
diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index ec4108ef02f4..85233c14c47b 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -153,7 +153,7 @@ public function toArray(bool $onlyChanged = false, bool $cast = true, bool $recu
     {
         $this->_cast = $cast;
 
-        $keys = array_filter(array_keys($this->attributes), static fn($key) => strpos($key, '_') !== 0);
+        $keys = array_filter(array_keys($this->attributes), static fn ($key) => strpos($key, '_') !== 0);
 
         if (is_array($this->datamap)) {
             $keys = array_unique(
diff --git a/system/Files/File.php b/system/Files/File.php
index c72d6c3a34aa..b3bdb47b90de 100644
--- a/system/Files/File.php
+++ b/system/Files/File.php
@@ -131,7 +131,7 @@ public function getRandomName(): string
      */
     public function move(string $targetPath, ?string $name = null, bool $overwrite = false)
     {
-        $targetPath  = rtrim($targetPath, '/') . '/';
+        $targetPath = rtrim($targetPath, '/') . '/';
         $name ??= $this->getBaseName();
         $destination = $overwrite ? $targetPath . $name : $this->getDestination($targetPath . $name);
 
diff --git a/system/Files/FileCollection.php b/system/Files/FileCollection.php
index e66aa94735d1..853c15c07ae1 100644
--- a/system/Files/FileCollection.php
+++ b/system/Files/FileCollection.php
@@ -80,7 +80,7 @@ final protected static function filterFiles(array $files, string $directory): ar
     {
         $directory = self::resolveDirectory($directory);
 
-        return array_filter($files, static fn(string $value): bool => strpos($value, $directory) === 0);
+        return array_filter($files, static fn (string $value): bool => strpos($value, $directory) === 0);
     }
 
     /**
@@ -103,7 +103,7 @@ final protected static function matchFiles(array $files, string $pattern): array
             $pattern = "#{$pattern}#";
         }
 
-        return array_filter($files, static fn($value) => (bool) preg_match($pattern, basename($value)));
+        return array_filter($files, static fn ($value) => (bool) preg_match($pattern, basename($value)));
     }
 
     //--------------------------------------------------------------------
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index bbe0095087df..d37f498e2d44 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -549,7 +549,7 @@ public function getJsonVar(string $index, bool $assoc = false, ?int $filter = nu
 
         if (! is_array($data)) {
             $filter ??= FILTER_DEFAULT;
-            $flags  = is_array($flags) ? $flags : (is_numeric($flags) ? (int) $flags : 0);
+            $flags = is_array($flags) ? $flags : (is_numeric($flags) ? (int) $flags : 0);
 
             return filter_var($data, $filter, $flags);
         }
diff --git a/system/HTTP/RequestTrait.php b/system/HTTP/RequestTrait.php
index cf66f4d60fe5..c24827721c00 100644
--- a/system/HTTP/RequestTrait.php
+++ b/system/HTTP/RequestTrait.php
@@ -224,7 +224,7 @@ public function fetchGlobal(string $method, $index = null, ?int $filter = null,
 
         // Null filters cause null values to return.
         $filter ??= FILTER_DEFAULT;
-        $flags  = is_array($flags) ? $flags : (is_numeric($flags) ? (int) $flags : 0);
+        $flags = is_array($flags) ? $flags : (is_numeric($flags) ? (int) $flags : 0);
 
         // Return all values when $index is null
         if ($index === null) {
diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index 753461eefd79..9900443672e1 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -878,7 +878,7 @@ protected function filterPath(?string $path = null): string
         // Encode characters
         $path = preg_replace_callback(
             '/(?:[^' . static::CHAR_UNRESERVED . ':@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/',
-            static fn(array $matches) => rawurlencode($matches[0]),
+            static fn (array $matches) => rawurlencode($matches[0]),
             $path
         );
 
@@ -1023,7 +1023,7 @@ protected function parseStr(string $query): array
         $return = [];
         $query  = explode('&', $query);
 
-        $params = array_map(static fn(string $chunk) => preg_replace_callback('/^(?<key>[^&=]+?)(?:\[[^&=]*\])?=(?<value>[^&=]+)/', static fn(array $match) => str_replace($match['key'], bin2hex($match['key']), $match[0]), urldecode($chunk)), $query);
+        $params = array_map(static fn (string $chunk) => preg_replace_callback('/^(?<key>[^&=]+?)(?:\[[^&=]*\])?=(?<value>[^&=]+)/', static fn (array $match) => str_replace($match['key'], bin2hex($match['key']), $match[0]), urldecode($chunk)), $query);
 
         $params = implode('&', $params);
         parse_str($params, $params);
diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php
index bb494633c031..c93acd5365a7 100644
--- a/system/Helpers/array_helper.php
+++ b/system/Helpers/array_helper.php
@@ -28,7 +28,7 @@ function dot_array_search(string $index, array $array)
             PREG_SPLIT_NO_EMPTY
         );
 
-        $segments = array_map(static fn($key) => str_replace('\.', '.', $key), $segments);
+        $segments = array_map(static fn ($key) => str_replace('\.', '.', $key), $segments);
 
         return _array_search_dot($segments, $array);
     }
@@ -64,7 +64,7 @@ function _array_search_dot(array $indexes, array $array)
                 $answer[] = _array_search_dot($indexes, $value);
             }
 
-            $answer = array_filter($answer, static fn($value) => $value !== null);
+            $answer = array_filter($answer, static fn ($value) => $value !== null);
 
             if ($answer !== []) {
                 if (count($answer) === 1) {
diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
index 0fbf46787d04..98dd596c1a4d 100644
--- a/system/Helpers/url_helper.php
+++ b/system/Helpers/url_helper.php
@@ -120,7 +120,7 @@ function base_url($relativePath = '', ?string $scheme = null): string
     function current_url(bool $returnObject = false, ?IncomingRequest $request = null)
     {
         $request ??= Services::request();
-        $path    = $request->getPath();
+        $path = $request->getPath();
 
         // Append queries and fragments
         if ($query = $request->getUri()->getQuery()) {
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 4a5a754866b0..c2b9a35b035f 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1163,7 +1163,7 @@ protected function create(string $verb, string $from, $to, ?array $options = nul
             for ($i = (int) $options['offset'] + 1; $i < (int) $options['offset'] + 7; $i++) {
                 $to = preg_replace_callback(
                     '/\$X/',
-                    static fn($m) => '$' . $i,
+                    static fn ($m) => '$' . $i,
                     $to,
                     1
                 );
diff --git a/system/Router/Router.php b/system/Router/Router.php
index 8ae806a59958..198d6ece5350 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -550,7 +550,7 @@ protected function validateRequest(array $segments): array
      */
     protected function scanControllers(array $segments): array
     {
-        $segments = array_filter($segments, static fn($segment) => $segment !== '');
+        $segments = array_filter($segments, static fn ($segment) => $segment !== '');
         // numerically reindex the array, removing gaps
         $segments = array_values($segments);
 
diff --git a/system/Security/Security.php b/system/Security/Security.php
index 36134c572fb0..5d0daf46dfae 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -11,8 +11,8 @@
 
 namespace CodeIgniter\Security;
 
-use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\Cookie\Cookie;
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\Response;
 use CodeIgniter\Security\Exceptions\SecurityException;
diff --git a/system/Test/FilterTestTrait.php b/system/Test/FilterTestTrait.php
index a4a79ab7590c..f2a52f301daa 100644
--- a/system/Test/FilterTestTrait.php
+++ b/system/Test/FilterTestTrait.php
@@ -151,12 +151,12 @@ protected function getFilterCaller($filter, string $position): Closure
         $request = clone $this->request;
 
         if ($position === 'before') {
-            return static fn(?array $params = null) => $filter->before($request, $params);
+            return static fn (?array $params = null) => $filter->before($request, $params);
         }
 
         $response = clone $this->response;
 
-        return static fn(?array $params = null) => $filter->after($request, $response, $params);
+        return static fn (?array $params = null) => $filter->after($request, $response, $params);
     }
 
     /**
diff --git a/system/Test/ReflectionHelper.php b/system/Test/ReflectionHelper.php
index d3e87e018484..274ece65a843 100644
--- a/system/Test/ReflectionHelper.php
+++ b/system/Test/ReflectionHelper.php
@@ -39,7 +39,7 @@ public static function getPrivateMethodInvoker($obj, $method)
         $refMethod->setAccessible(true);
         $obj = (gettype($obj) === 'object') ? $obj : null;
 
-        return static fn(...$args) => $refMethod->invokeArgs($obj, $args);
+        return static fn (...$args) => $refMethod->invokeArgs($obj, $args);
     }
 
     /**
diff --git a/system/View/View.php b/system/View/View.php
index 6f6dddf178d0..6e81272e0e02 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -271,7 +271,7 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
      */
     public function renderString(string $view, ?array $options = null, ?bool $saveData = null): string
     {
-        $start    = microtime(true);
+        $start = microtime(true);
         $saveData ??= $this->saveData;
         $this->prepareTemplateData($saveData);
 
diff --git a/tests/system/Cache/Handlers/DummyHandlerTest.php b/tests/system/Cache/Handlers/DummyHandlerTest.php
index 2472937eed0c..236200d55352 100644
--- a/tests/system/Cache/Handlers/DummyHandlerTest.php
+++ b/tests/system/Cache/Handlers/DummyHandlerTest.php
@@ -38,7 +38,7 @@ public function testGet()
 
     public function testRemember()
     {
-        $dummyHandler = $this->handler->remember('key', 2, static fn() => 'value');
+        $dummyHandler = $this->handler->remember('key', 2, static fn () => 'value');
 
         $this->assertNull($dummyHandler);
     }
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index acb9e9d298cc..032243d890f1 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -119,7 +119,7 @@ public function testGet()
      */
     public function testRemember()
     {
-        $this->handler->remember(self::$key1, 2, static fn() => 'value');
+        $this->handler->remember(self::$key1, 2, static fn () => 'value');
 
         $this->assertSame('value', $this->handler->get(self::$key1));
         $this->assertNull($this->handler->get(self::$dummy));
diff --git a/tests/system/Cache/Handlers/MemcachedHandlerTest.php b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
index d79c8ab2feed..f6e2e45309c9 100644
--- a/tests/system/Cache/Handlers/MemcachedHandlerTest.php
+++ b/tests/system/Cache/Handlers/MemcachedHandlerTest.php
@@ -85,7 +85,7 @@ public function testGet()
      */
     public function testRemember()
     {
-        $this->handler->remember(self::$key1, 2, static fn() => 'value');
+        $this->handler->remember(self::$key1, 2, static fn () => 'value');
 
         $this->assertSame('value', $this->handler->get(self::$key1));
         $this->assertNull($this->handler->get(self::$dummy));
diff --git a/tests/system/Cache/Handlers/PredisHandlerTest.php b/tests/system/Cache/Handlers/PredisHandlerTest.php
index 4404ca83f712..60ed0a0e0c07 100644
--- a/tests/system/Cache/Handlers/PredisHandlerTest.php
+++ b/tests/system/Cache/Handlers/PredisHandlerTest.php
@@ -88,7 +88,7 @@ public function testGet()
      */
     public function testRemember()
     {
-        $this->handler->remember(self::$key1, 2, static fn() => 'value');
+        $this->handler->remember(self::$key1, 2, static fn () => 'value');
 
         $this->assertSame('value', $this->handler->get(self::$key1));
         $this->assertNull($this->handler->get(self::$dummy));
diff --git a/tests/system/Cache/Handlers/RedisHandlerTest.php b/tests/system/Cache/Handlers/RedisHandlerTest.php
index 64e224240451..a10d92171ec8 100644
--- a/tests/system/Cache/Handlers/RedisHandlerTest.php
+++ b/tests/system/Cache/Handlers/RedisHandlerTest.php
@@ -92,7 +92,7 @@ public function testGet()
      */
     public function testRemember()
     {
-        $this->handler->remember(self::$key1, 2, static fn() => 'value');
+        $this->handler->remember(self::$key1, 2, static fn () => 'value');
 
         $this->assertSame('value', $this->handler->get(self::$key1));
         $this->assertNull($this->handler->get(self::$dummy));
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index 334550f4efd5..a34664d9c9e1 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -135,7 +135,7 @@ public function testControllersCanReturnString()
 
         // Inject mock router.
         $routes = Services::routes();
-        $routes->add('pages/(:segment)', static fn($segment) => 'You want to see "' . esc($segment) . '" page.');
+        $routes->add('pages/(:segment)', static fn ($segment) => 'You want to see "' . esc($segment) . '" page.');
         $router = Services::router($routes, Services::request());
         Services::injectMock('router', $router);
 
@@ -180,7 +180,7 @@ public function testControllersRunFilterByClassName()
 
         // Inject mock router.
         $routes = Services::routes();
-        $routes->add('pages/about', static fn() => Services::request()->url, ['filter' => Customfilter::class]);
+        $routes->add('pages/about', static fn () => Services::request()->url, ['filter' => Customfilter::class]);
 
         $router = Services::router($routes, Services::request());
         Services::injectMock('router', $router);
diff --git a/tests/system/Database/Builder/GroupTest.php b/tests/system/Database/Builder/GroupTest.php
index f0b885dd3178..f5e6da0cbcfe 100644
--- a/tests/system/Database/Builder/GroupTest.php
+++ b/tests/system/Database/Builder/GroupTest.php
@@ -86,7 +86,7 @@ public function testHavingInClosure()
 
         $builder->select('name')->groupBy('name');
 
-        $builder->havingIn('id', static fn(BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
+        $builder->havingIn('id', static fn (BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)';
 
@@ -113,8 +113,8 @@ public function testOrHavingInClosure()
 
         $builder->select('name')->groupBy('name');
 
-        $builder->havingIn('id', static fn(BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
-        $builder->orHavingIn('group_id', static fn(BaseBuilder $builder) => $builder->select('group_id')->from('groups')->where('group_id', 6));
+        $builder->havingIn('id', static fn (BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
+        $builder->orHavingIn('group_id', static fn (BaseBuilder $builder) => $builder->select('group_id')->from('groups')->where('group_id', 6));
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3) OR "group_id" IN (SELECT "group_id" FROM "groups" WHERE "group_id" = 6)';
 
@@ -140,7 +140,7 @@ public function testHavingNotInClosure()
 
         $builder->select('name')->groupBy('name');
 
-        $builder->havingNotIn('id', static fn(BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
+        $builder->havingNotIn('id', static fn (BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)';
 
@@ -167,8 +167,8 @@ public function testOrHavingNotInClosure()
 
         $builder->select('name')->groupBy('name');
 
-        $builder->havingNotIn('id', static fn(BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
-        $builder->orHavingNotIn('group_id', static fn(BaseBuilder $builder) => $builder->select('group_id')->from('groups')->where('group_id', 6));
+        $builder->havingNotIn('id', static fn (BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
+        $builder->orHavingNotIn('group_id', static fn (BaseBuilder $builder) => $builder->select('group_id')->from('groups')->where('group_id', 6));
 
         $expectedSQL = 'SELECT "name" FROM "user" GROUP BY "name" HAVING "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3) OR "group_id" NOT IN (SELECT "group_id" FROM "groups" WHERE "group_id" = 6)';
 
diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php
index 9ea14296eb89..cf5f8f344e28 100644
--- a/tests/system/Database/Builder/WhereTest.php
+++ b/tests/system/Database/Builder/WhereTest.php
@@ -238,7 +238,7 @@ public function testWhereInSubQuery()
         // Closure
         $builder = $this->db->table('jobs');
 
-        $builder->whereIn('id', static fn(BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
+        $builder->whereIn('id', static fn (BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
@@ -325,7 +325,7 @@ public function testWhereNotInSubQuery()
         // Closure
         $builder = $this->db->table('jobs');
 
-        $builder->whereNotIn('id', static fn(BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
+        $builder->whereNotIn('id', static fn (BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
@@ -373,7 +373,7 @@ public function testOrWhereInSubQuery()
         // Closure
         $builder = $this->db->table('jobs');
 
-        $builder->where('deleted_at', null)->orWhereIn('id', static fn(BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
+        $builder->where('deleted_at', null)->orWhereIn('id', static fn (BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
@@ -421,7 +421,7 @@ public function testOrWhereNotInSubQuery()
         // Closure
         $builder = $this->db->table('jobs');
 
-        $builder->where('deleted_at', null)->orWhereNotIn('id', static fn(BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
+        $builder->where('deleted_at', null)->orWhereNotIn('id', static fn (BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php
index f465a7d7eb5b..acfc17277982 100644
--- a/tests/system/Database/Live/PreparedQueryTest.php
+++ b/tests/system/Database/Live/PreparedQueryTest.php
@@ -26,8 +26,7 @@ final class PreparedQueryTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
-    protected $seed = CITestSeeder::class;
-
+    protected $seed                   = CITestSeeder::class;
     private ?BasePreparedQuery $query = null;
 
     protected function setUp(): void
@@ -47,7 +46,7 @@ protected function tearDown(): void
 
     public function testPrepareReturnsPreparedQuery()
     {
-        $this->query = $this->db->prepare(static fn($db) => $db->table('user')->insert([
+        $this->query = $this->db->prepare(static fn ($db) => $db->table('user')->insert([
             'name'  => 'a',
             'email' => 'b@example.com',
         ]));
@@ -97,7 +96,7 @@ public function testPrepareReturnsManualPreparedQuery()
 
     public function testExecuteRunsQueryAndReturnsResultObject()
     {
-        $this->query = $this->db->prepare(static fn($db) => $db->table('user')->insert([
+        $this->query = $this->db->prepare(static fn ($db) => $db->table('user')->insert([
             'name'    => 'a',
             'email'   => 'b@example.com',
             'country' => 'x',
diff --git a/tests/system/Filters/InvalidCharsTest.php b/tests/system/Filters/InvalidCharsTest.php
index 86331b4c4d10..893108294d74 100644
--- a/tests/system/Filters/InvalidCharsTest.php
+++ b/tests/system/Filters/InvalidCharsTest.php
@@ -25,7 +25,6 @@
 final class InvalidCharsTest extends CIUnitTestCase
 {
     private InvalidChars $invalidChars;
-
     private IncomingRequest $request;
 
     protected function setUp(): void
diff --git a/tests/system/Helpers/CookieHelperTest.php b/tests/system/Helpers/CookieHelperTest.php
index 67d8f2e70e3f..2b09aa2afb3a 100755
--- a/tests/system/Helpers/CookieHelperTest.php
+++ b/tests/system/Helpers/CookieHelperTest.php
@@ -11,9 +11,9 @@
 
 namespace CodeIgniter\Helpers;
 
-use CodeIgniter\HTTP\Response;
 use CodeIgniter\Cookie\Exceptions\CookieException;
 use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Test\CIUnitTestCase;
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index fdb66c8c2856..af8588851ea7 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -49,15 +49,15 @@ protected function setUp(): void
         $this->collection      = new RouteCollection(Services::locator(), $moduleConfig);
 
         $routes = [
-            'users'                        => 'Users::index',
-            'user-setting/show-list'       => 'User_setting::show_list',
-            'user-setting/(:segment)'      => 'User_setting::detail/$1',
-            'posts'                        => 'Blog::posts',
-            'pages'                        => 'App\Pages::list_all',
-            'posts/(:num)'                 => 'Blog::show/$1',
-            'posts/(:num)/edit'            => 'Blog::edit/$1',
-            'books/(:num)/(:alpha)/(:num)' => 'Blog::show/$3/$1',
-            'closure/(:num)/(:alpha)'      => static fn($num, $str) => $num . '-' . $str,
+            'users'                                           => 'Users::index',
+            'user-setting/show-list'                          => 'User_setting::show_list',
+            'user-setting/(:segment)'                         => 'User_setting::detail/$1',
+            'posts'                                           => 'Blog::posts',
+            'pages'                                           => 'App\Pages::list_all',
+            'posts/(:num)'                                    => 'Blog::show/$1',
+            'posts/(:num)/edit'                               => 'Blog::edit/$1',
+            'books/(:num)/(:alpha)/(:num)'                    => 'Blog::show/$3/$1',
+            'closure/(:num)/(:alpha)'                         => static fn ($num, $str) => $num . '-' . $str,
             '{locale}/pages'                                  => 'App\Pages::list_all',
             'Admin/Admins'                                    => 'App\Admin\Admins::list_all',
             '/some/slash'                                     => 'App\Slash::index',
diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php
index 7ef278840a7e..0a424aff4ad2 100644
--- a/tests/system/Test/FeatureTestTraitTest.php
+++ b/tests/system/Test/FeatureTestTraitTest.php
@@ -38,7 +38,7 @@ public function testCallGet()
             [
                 'get',
                 'home',
-                static fn() => 'Hello World',
+                static fn () => 'Hello World',
             ],
         ]);
         $response = $this->get('home');
@@ -53,7 +53,7 @@ public function testCallSimpleGet()
             [
                 'add',
                 'home',
-                static fn() => 'Hello Earth',
+                static fn () => 'Hello Earth',
             ],
         ]);
         $response = $this->call('get', 'home');
@@ -71,7 +71,7 @@ public function testCallPost()
             [
                 'post',
                 'home',
-                static fn() => 'Hello Mars',
+                static fn () => 'Hello Mars',
             ],
         ]);
         $response = $this->post('home');
@@ -85,7 +85,7 @@ public function testCallPostWithBody()
             [
                 'post',
                 'home',
-                static fn() => 'Hello ' . service('request')->getPost('foo') . '!',
+                static fn () => 'Hello ' . service('request')->getPost('foo') . '!',
             ],
         ]);
         $response = $this->post('home', ['foo' => 'Mars']);
@@ -99,7 +99,7 @@ public function testCallPut()
             [
                 'put',
                 'home',
-                static fn() => 'Hello Pluto',
+                static fn () => 'Hello Pluto',
             ],
         ]);
         $response = $this->put('home');
@@ -113,7 +113,7 @@ public function testCallPatch()
             [
                 'patch',
                 'home',
-                static fn() => 'Hello Jupiter',
+                static fn () => 'Hello Jupiter',
             ],
         ]);
         $response = $this->patch('home');
@@ -127,7 +127,7 @@ public function testCallOptions()
             [
                 'options',
                 'home',
-                static fn() => 'Hello George',
+                static fn () => 'Hello George',
             ],
         ]);
         $response = $this->options('home');
@@ -141,7 +141,7 @@ public function testCallDelete()
             [
                 'delete',
                 'home',
-                static fn() => 'Hello Wonka',
+                static fn () => 'Hello Wonka',
             ],
         ]);
         $response = $this->delete('home');
@@ -155,7 +155,7 @@ public function testSession()
             [
                 'get',
                 'home',
-                static fn() => 'Home',
+                static fn () => 'Home',
             ],
         ])->withSession([
             'fruit'    => 'apple',
@@ -177,7 +177,7 @@ public function testWithSessionNull()
             [
                 'get',
                 'home',
-                static fn() => 'Home',
+                static fn () => 'Home',
             ],
         ])->withSession()->get('home');
 
diff --git a/tests/system/Validation/CreditCardRulesTest.php b/tests/system/Validation/CreditCardRulesTest.php
index fae3a7a95c5e..031eddb1490c 100644
--- a/tests/system/Validation/CreditCardRulesTest.php
+++ b/tests/system/Validation/CreditCardRulesTest.php
@@ -22,7 +22,6 @@
 final class CreditCardRulesTest extends CIUnitTestCase
 {
     private Validation $validation;
-
     private array $config = [
         'ruleSets' => [
             Rules::class,
diff --git a/tests/system/Validation/DatabaseRelatedRulesTest.php b/tests/system/Validation/DatabaseRelatedRulesTest.php
index 652140e3ff34..42881bab444e 100644
--- a/tests/system/Validation/DatabaseRelatedRulesTest.php
+++ b/tests/system/Validation/DatabaseRelatedRulesTest.php
@@ -27,7 +27,6 @@ final class DatabaseRelatedRulesTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     private Validation $validation;
-
     private array $config = [
         'ruleSets' => [
             Rules::class,
diff --git a/tests/system/Validation/FileRulesTest.php b/tests/system/Validation/FileRulesTest.php
index a60369ad8ca7..0a2f5356efd8 100644
--- a/tests/system/Validation/FileRulesTest.php
+++ b/tests/system/Validation/FileRulesTest.php
@@ -21,7 +21,6 @@
 final class FileRulesTest extends CIUnitTestCase
 {
     private Validation $validation;
-
     private array $config = [
         'ruleSets' => [
             Rules::class,
diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php
index 6ba1d8215263..f4a22b2af973 100644
--- a/tests/system/Validation/FormatRulesTest.php
+++ b/tests/system/Validation/FormatRulesTest.php
@@ -25,7 +25,6 @@ final class FormatRulesTest extends CIUnitTestCase
     public const ALPHANUMERIC = 'abcdefghijklmnopqrstuvwxyzABCDEFGHLIJKLMNOPQRSTUVWXYZ0123456789';
 
     private Validation $validation;
-
     private array $config = [
         'ruleSets' => [
             Rules::class,
diff --git a/tests/system/Validation/RulesTest.php b/tests/system/Validation/RulesTest.php
index 63f842771707..d4c15816294f 100644
--- a/tests/system/Validation/RulesTest.php
+++ b/tests/system/Validation/RulesTest.php
@@ -23,7 +23,6 @@
 final class RulesTest extends CIUnitTestCase
 {
     private Validation $validation;
-
     private array $config = [
         'ruleSets' => [
             Rules::class,
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index 4fee16030222..40328f194516 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -27,7 +27,6 @@
 final class ValidationTest extends CIUnitTestCase
 {
     private Validation $validation;
-
     private array $config = [
         'ruleSets' => [
             Rules::class,
diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php
index a92ecaa69851..3462b0cc2a84 100644
--- a/tests/system/View/ParserTest.php
+++ b/tests/system/View/ParserTest.php
@@ -25,11 +25,8 @@
 final class ParserTest extends CIUnitTestCase
 {
     private FileLocator $loader;
-
     private string $viewsDir;
-
     private ViewConfig $config;
-
     private Parser $parser;
 
     protected function setUp(): void
@@ -665,7 +662,7 @@ public function testParseRuns()
      */
     public function testCanAddAndRemovePlugins()
     {
-        $this->parser->addPlugin('first', static fn($str) => $str);
+        $this->parser->addPlugin('first', static fn ($str) => $str);
 
         $setParsers = $this->getPrivateProperty($this->parser, 'plugins');
 
@@ -693,7 +690,7 @@ public function testParserPluginNoMatches()
      */
     public function testParserPluginNoParams()
     {
-        $this->parser->addPlugin('hit:it', static fn($str) => str_replace('here', 'Hip to the Hop', $str), true);
+        $this->parser->addPlugin('hit:it', static fn ($str) => str_replace('here', 'Hip to the Hop', $str), true);
 
         $template = '{+ hit:it +} stuff here {+ /hit:it +}';
 
@@ -706,7 +703,7 @@ public function testParserPluginNoParams()
     public function testParserPluginClosure()
     {
         $config                   = $this->config;
-        $config->plugins['hello'] = static fn(array $params = []) => 'Hello, ' . trim($params[0]);
+        $config->plugins['hello'] = static fn (array $params = []) => 'Hello, ' . trim($params[0]);
 
         $this->parser = new Parser($config, $this->viewsDir, $this->loader);
 
@@ -743,7 +740,7 @@ public function testParserPluginParams()
      */
     public function testParserSingleTag()
     {
-        $this->parser->addPlugin('hit:it', static fn() => 'Hip to the Hop', false);
+        $this->parser->addPlugin('hit:it', static fn () => 'Hip to the Hop', false);
 
         $template = '{+ hit:it +}';
 
@@ -755,7 +752,7 @@ public function testParserSingleTag()
      */
     public function testParserSingleTagWithParams()
     {
-        $this->parser->addPlugin('hit:it', static fn(array $params = []) => "{$params['first']} to the {$params['last']}", false);
+        $this->parser->addPlugin('hit:it', static fn (array $params = []) => "{$params['first']} to the {$params['last']}", false);
 
         $template = '{+ hit:it first=foo last=bar +}';
 
@@ -767,7 +764,7 @@ public function testParserSingleTagWithParams()
      */
     public function testParserSingleTagWithSingleParams()
     {
-        $this->parser->addPlugin('hit:it', static fn(array $params = []) => "{$params[0]} to the {$params[1]}", false);
+        $this->parser->addPlugin('hit:it', static fn (array $params = []) => "{$params[0]} to the {$params[1]}", false);
 
         $template = '{+ hit:it foo bar +}';
 
diff --git a/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php b/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php
index 6b65e2c35b20..d1b660b037aa 100644
--- a/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php
+++ b/utils/Rector/RemoveErrorSuppressInTryCatchStmtsRector.php
@@ -60,7 +60,7 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        $inStmts = (bool) $this->betterNodeFinder->findFirst((array) $tryCatch->stmts, static fn(Node $n): bool => $n === $node);
+        $inStmts = (bool) $this->betterNodeFinder->findFirst((array) $tryCatch->stmts, static fn (Node $n): bool => $n === $node);
 
         // not in stmts, means it in catch or finally
         if (! $inStmts) {

From ecf41ff640c46b111965ba43a0db96d811dba7e4 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 14 Dec 2021 11:23:42 +0700
Subject: [PATCH 1099/2325] add 4.* for pull_request phpunit workflow

---
 .github/workflows/test-phpunit.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index cdd530ccc5c4..69930c7281ec 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -13,6 +13,7 @@ on:
   pull_request:
     branches:
       - develop
+      - '4.*'
     paths:
       - composer.json
       - spark

From 58d73e2a41fc63f218951a7f1e19fade340ab894 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 14 Dec 2021 11:26:45 +0700
Subject: [PATCH 1100/2325] try without quote

---
 .github/workflows/test-phpunit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 69930c7281ec..1f4cfc316e65 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -13,7 +13,7 @@ on:
   pull_request:
     branches:
       - develop
-      - '4.*'
+      - 4.*
     paths:
       - composer.json
       - spark

From d2c3b440c005d64ae1b1b0ca54d98ce321956300 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 14 Dec 2021 11:28:13 +0700
Subject: [PATCH 1101/2325] use v4.*

---
 .github/workflows/test-deptrac.yml | 4 ++--
 .github/workflows/test-phpcpd.yml  | 4 ++--
 .github/workflows/test-phpstan.yml | 4 ++--
 .github/workflows/test-phpunit.yml | 2 +-
 .github/workflows/test-rector.yml  | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test-deptrac.yml b/.github/workflows/test-deptrac.yml
index 0698809319fe..52b58d51d5d8 100644
--- a/.github/workflows/test-deptrac.yml
+++ b/.github/workflows/test-deptrac.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
     branches:
       - 'develop'
-      - '4.*'
+      - 'v4.*'
     paths:
       - 'app/**'
       - 'system/**'
@@ -16,7 +16,7 @@ on:
   push:
     branches:
       - 'develop'
-      - '4.*'
+      - 'v4.*'
     paths:
       - 'app/**'
       - 'system/**'
diff --git a/.github/workflows/test-phpcpd.yml b/.github/workflows/test-phpcpd.yml
index f4215df01c0e..018acd11cbd2 100644
--- a/.github/workflows/test-phpcpd.yml
+++ b/.github/workflows/test-phpcpd.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
     branches:
       - 'develop'
-      - '4.*'
+      - 'v4.*'
     paths:
       - 'app/**'
       - 'public/**'
@@ -15,7 +15,7 @@ on:
   push:
     branches:
       - 'develop'
-      - '4.*'
+      - 'v4.*'
     paths:
       - 'app/**'
       - 'public/**'
diff --git a/.github/workflows/test-phpstan.yml b/.github/workflows/test-phpstan.yml
index eceb97524605..dcbcaf085fe8 100644
--- a/.github/workflows/test-phpstan.yml
+++ b/.github/workflows/test-phpstan.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
     branches:
       - 'develop'
-      - '4.*'
+      - 'v4.*'
     paths:
       - 'app/**'
       - 'system/**'
@@ -15,7 +15,7 @@ on:
   push:
     branches:
       - 'develop'
-      - '4.*'
+      - 'v4.*'
     paths:
       - 'app/**'
       - 'system/**'
diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 1f4cfc316e65..f6e4bc91a0d4 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -13,7 +13,7 @@ on:
   pull_request:
     branches:
       - develop
-      - 4.*
+      - 'v4.*'
     paths:
       - composer.json
       - spark
diff --git a/.github/workflows/test-rector.yml b/.github/workflows/test-rector.yml
index 0d7262ceb4ea..03aa90f9bb8c 100644
--- a/.github/workflows/test-rector.yml
+++ b/.github/workflows/test-rector.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
     branches:
       - 'develop'
-      - '4.*'
+      - 'v4.*'
     paths:
       - 'app/**'
       - 'system/**'
@@ -17,7 +17,7 @@ on:
   push:
     branches:
       - 'develop'
-      - '4.*'
+      - 'v4.*'
     paths:
       - 'app/**'
       - 'system/**'

From 408218ae2d25918a5681cfc2221719f27257a6fe Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 14 Dec 2021 11:43:24 +0700
Subject: [PATCH 1102/2325] skip AssertIssetToSpecificMethodRector on
 GeneralModelTest

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

diff --git a/tests/system/Models/GeneralModelTest.php b/tests/system/Models/GeneralModelTest.php
index c036febeedb9..cf5b890c2718 100644
--- a/tests/system/Models/GeneralModelTest.php
+++ b/tests/system/Models/GeneralModelTest.php
@@ -66,21 +66,21 @@ public function testMagicGetters(): void
     {
         $this->createModel(UserModel::class);
 
-        $this->assertObjectHasAttribute('table', $this->model);
+        $this->assertTrue(isset($this->model->table));
         $this->assertSame('user', $this->model->table);
-        $this->assertObjectNotHasAttribute('foobar', $this->model);
+        $this->assertFalse(isset($this->model->foobar));
         $this->assertNull($this->model->foobar);
 
         $this->model->flavor = 'chocolate';
-        $this->assertObjectHasAttribute('flavor', $this->model);
+        $this->assertTrue(isset($this->model->flavor));
         $this->assertSame('chocolate', $this->model->flavor);
 
         // from DB
-        $this->assertObjectHasAttribute('DBPrefix', $this->model);
+        $this->assertTrue(isset($this->model->DBPrefix));
         $this->assertSame('utf8', $this->model->charset);
 
         // from Builder
-        $this->assertObjectHasAttribute('QBNoEscape', $this->model);
+        $this->assertTrue(isset($this->model->QBNoEscape));
         $this->assertIsArray($this->model->QBNoEscape);
     }
 

From a659246bfd9932dcf197606a74f527f7e53d19ba Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 14 Dec 2021 11:49:33 +0700
Subject: [PATCH 1103/2325] update MIN_PHP_VERSION constant to 7.4

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

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 2d1cd50dcc62..d46f60cda937 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -47,7 +47,7 @@ class CodeIgniter
      */
     public const CI_VERSION = '4.1.7';
 
-    private const MIN_PHP_VERSION = '7.3';
+    private const MIN_PHP_VERSION = '7.4';
 
     /**
      * App startup time.

From 684169a2304a802a80af215129261f82e8c766db Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 14 Dec 2021 12:15:23 +0700
Subject: [PATCH 1104/2325] temporary run rector only in php 8.0

---
 .github/workflows/test-rector.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-rector.yml b/.github/workflows/test-rector.yml
index 03aa90f9bb8c..ac407eb72959 100644
--- a/.github/workflows/test-rector.yml
+++ b/.github/workflows/test-rector.yml
@@ -33,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.4', '8.0']
+        php-versions: ['8.0']
     steps:
       - name: Checkout
         uses: actions/checkout@v2

From f5802918ae46584d3c95e0c6759cbe90db600230 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 14 Dec 2021 13:28:51 +0700
Subject: [PATCH 1105/2325] apply multiline in array map

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

diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index 9900443672e1..70305ae5864c 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -1023,7 +1023,11 @@ protected function parseStr(string $query): array
         $return = [];
         $query  = explode('&', $query);
 
-        $params = array_map(static fn (string $chunk) => preg_replace_callback('/^(?<key>[^&=]+?)(?:\[[^&=]*\])?=(?<value>[^&=]+)/', static fn (array $match) => str_replace($match['key'], bin2hex($match['key']), $match[0]), urldecode($chunk)), $query);
+        $params = array_map(static fn (string $chunk) => preg_replace_callback(
+            '/^(?<key>[^&=]+?)(?:\[[^&=]*\])?=(?<value>[^&=]+)/',
+            static fn (array $match) => str_replace($match['key'], bin2hex($match['key']), $match[0]),
+            urldecode($chunk)
+        ), $query);
 
         $params = implode('&', $params);
         parse_str($params, $params);

From 252170c50ca533aada2071bf5b899624e144d6f2 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Thu, 23 Dec 2021 08:24:21 +0700
Subject: [PATCH 1106/2325] re-run rector for php 7.4 syntax

---
 system/Database/Seeder.php             | 5 ++---
 system/Publisher/Publisher.php         | 6 +++---
 tests/system/CLI/CommandRunnerTest.php | 5 +----
 tests/system/Throttle/ThrottleTest.php | 4 ++--
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/system/Database/Seeder.php b/system/Database/Seeder.php
index 92d281965c7e..e3f954c726f2 100644
--- a/system/Database/Seeder.php
+++ b/system/Database/Seeder.php
@@ -67,11 +67,10 @@ class Seeder
     /**
      * Faker Generator instance.
      *
-     * @var Generator|null
      *
      * @deprecated
      */
-    private static $faker;
+    private static ?Generator $faker = null;
 
     /**
      * Seeder constructor.
@@ -92,7 +91,7 @@ public function __construct(Database $config, ?BaseConnection $db = null)
 
         $this->config = &$config;
 
-        $db = $db ?? Database::connect($this->DBGroup);
+        $db ??= Database::connect($this->DBGroup);
 
         $this->db    = &$db;
         $this->forge = Database::forge($this->DBGroup);
diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php
index b9cc9a1314c9..5cd392d921a8 100644
--- a/system/Publisher/Publisher.php
+++ b/system/Publisher/Publisher.php
@@ -54,14 +54,14 @@ class Publisher extends FileCollection
      *
      * @var array<string, Throwable>
      */
-    private $errors = [];
+    private array $errors = [];
 
     /**
      * List of file published curing the last write operation.
      *
      * @var string[]
      */
-    private $published = [];
+    private array $published = [];
 
     /**
      * List of allowed directories and their allowed files regex.
@@ -69,7 +69,7 @@ class Publisher extends FileCollection
      *
      * @var array<string,string>
      */
-    private $restrictions;
+    private array $restrictions;
 
     /**
      * Base path to use for the source.
diff --git a/tests/system/CLI/CommandRunnerTest.php b/tests/system/CLI/CommandRunnerTest.php
index 1e20618dae25..ce9ad2ff8f17 100644
--- a/tests/system/CLI/CommandRunnerTest.php
+++ b/tests/system/CLI/CommandRunnerTest.php
@@ -26,10 +26,7 @@ final class CommandRunnerTest extends CIUnitTestCase
      */
     private $streamFilter;
 
-    /**
-     * @var Logger
-     */
-    private static $logger;
+    private static Logger $logger;
 
     private static CommandRunner $runner;
 
diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php
index cc8ccb82856d..de0a6bf9bddd 100644
--- a/tests/system/Throttle/ThrottleTest.php
+++ b/tests/system/Throttle/ThrottleTest.php
@@ -50,7 +50,7 @@ public function testTokenTime()
      */
     public function testTokenTimeCalculation()
     {
-        $time = 1639441295;
+        $time = 1_639_441_295;
 
         $throttler = new Throttler($this->cache);
         $throttler->setTestTime($time);
@@ -163,7 +163,7 @@ public function testOverload()
 
     public function testFlooding()
     {
-        $time = 1639441295;
+        $time = 1_639_441_295;
 
         $throttler = new Throttler($this->cache);
         $throttler->setTestTime($time);

From d5a8acac32362ff8608e00ba586dc5d91da61c36 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Mon, 10 Jan 2022 02:08:10 +0000
Subject: [PATCH 1107/2325] Fix repo PHP versions

---
 admin/framework/composer.json | 2 +-
 admin/starter/composer.json   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/framework/composer.json b/admin/framework/composer.json
index 25ac1f07ecc3..68b46c10092c 100644
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@@ -5,7 +5,7 @@
     "homepage": "https://codeigniter.com",
     "license": "MIT",
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "ext-curl": "*",
         "ext-intl": "*",
         "ext-json": "*",
diff --git a/admin/starter/composer.json b/admin/starter/composer.json
index 9f7dc492cbc8..f2959dd49b51 100644
--- a/admin/starter/composer.json
+++ b/admin/starter/composer.json
@@ -5,8 +5,8 @@
     "homepage": "https://codeigniter.com",
     "license": "MIT",
     "require": {
-        "php": "^7.3 || ^8.0",
-        "codeigniter4/framework": "^4"
+        "php": "^7.4 || ^8.0",
+        "codeigniter4/framework": "^4.0"
     },
     "require-dev": {
         "fakerphp/faker": "^1.9",

From 7af8635f945cca61c67180b39426c63ebe0b8980 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 10 Jan 2022 11:49:24 +0900
Subject: [PATCH 1108/2325] refactor: fix PHPStan errors

---
 app/Config/App.php         |  2 +-
 phpstan-baseline.neon.dist | 25 -------------------------
 system/BaseModel.php       |  2 +-
 system/Common.php          |  1 -
 system/Debug/Toolbar.php   |  4 ++--
 system/Model.php           |  2 +-
 6 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/app/Config/App.php b/app/Config/App.php
index 88b295e9a010..4d52cd430499 100644
--- a/app/Config/App.php
+++ b/app/Config/App.php
@@ -318,7 +318,7 @@ class App extends BaseConfig
      * (empty string) means default SameSite attribute set by browsers (`Lax`)
      * will be set on cookies. If set to `None`, `$cookieSecure` must also be set.
      *
-     * @var string
+     * @var string|null
      *
      * @deprecated use Config\Cookie::$samesite property instead.
      */
diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index 0a91bd7fc64f..7387648970ea 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -140,11 +140,6 @@ parameters:
 			count: 1
 			path: system/Common.php
 
-		-
-			message: "#^Variable \\$params on left side of \\?\\? always exists and is not nullable\\.$#"
-			count: 1
-			path: system/Common.php
-
 		-
 			message: "#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$db \\(CodeIgniter\\\\Database\\\\BaseConnection\\) in empty\\(\\) is not falsy\\.$#"
 			count: 1
@@ -510,16 +505,6 @@ parameters:
 			count: 1
 			path: system/Debug/Toolbar.php
 
-		-
-			message: "#^Variable \\$request on left side of \\?\\? always exists and is not nullable\\.$#"
-			count: 1
-			path: system/Debug/Toolbar.php
-
-		-
-			message: "#^Variable \\$response on left side of \\?\\? always exists and is not nullable\\.$#"
-			count: 1
-			path: system/Debug/Toolbar.php
-
 		-
 			message: "#^Call to an undefined method CodeIgniter\\\\View\\\\RendererInterface\\:\\:getPerformanceData\\(\\)\\.$#"
 			count: 1
@@ -625,11 +610,6 @@ parameters:
 			count: 1
 			path: system/HTTP/Request.php
 
-		-
-			message: "#^Property Config\\\\App\\:\\:\\$cookieSameSite \\(string\\) on left side of \\?\\? is not nullable\\.$#"
-			count: 3
-			path: system/HTTP/Response.php
-
 		-
 			message: "#^Cannot unset offset 'path' on array\\{host\\: mixed\\}\\.$#"
 			count: 1
@@ -885,11 +865,6 @@ parameters:
 			count: 1
 			path: system/Session/Session.php
 
-		-
-			message: "#^Property Config\\\\App\\:\\:\\$cookieSameSite \\(string\\) on left side of \\?\\? is not nullable\\.$#"
-			count: 2
-			path: system/Session/Session.php
-
 		-
 			message: "#^Property Config\\\\App\\:\\:\\$cookieSecure \\(bool\\) on left side of \\?\\? is not nullable\\.$#"
 			count: 1
diff --git a/system/BaseModel.php b/system/BaseModel.php
index 4d2bc203c44d..5e481f731db6 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -293,7 +293,7 @@ public function __construct(?ValidationInterface $validation = null)
         $this->tempAllowCallbacks = $this->allowCallbacks;
 
         /**
-         * @var Validation $validation
+         * @var Validation|null $validation
          */
         $validation ??= Services::validation(null, false);
         $this->validation = $validation;
diff --git a/system/Common.php b/system/Common.php
index 5a67f045fede..e2fa9bce5a33 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -949,7 +949,6 @@ function single_service(string $name, ...$params)
         $method = new ReflectionMethod($service, $name);
         $count  = $method->getNumberOfParameters();
         $mParam = $method->getParameters();
-        $params ??= [];
 
         if ($count === 1) {
             // This service needs only one argument, which is the shared
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 9e0752ebc237..8e100fe25a6b 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -348,8 +348,8 @@ protected function roundTo(float $number, int $increments = 5): float
     public function prepare(?RequestInterface $request = null, ?ResponseInterface $response = null)
     {
         /**
-         * @var IncomingRequest $request
-         * @var Response        $response
+         * @var IncomingRequest|null $request
+         * @var Response|null        $response
          */
         if (CI_DEBUG && ! is_cli()) {
             global $app;
diff --git a/system/Model.php b/system/Model.php
index 01fa74300737..d092b2e48d3e 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -92,7 +92,7 @@ class Model extends BaseModel
     public function __construct(?ConnectionInterface &$db = null, ?ValidationInterface $validation = null)
     {
         /**
-         * @var BaseConnection $db
+         * @var BaseConnection|null $db
          */
         $db ??= Database::connect($this->DBGroup);
 

From 51f9b659b3946dc9076de8e40d28a5607832367c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 10 Jan 2022 11:49:41 +0900
Subject: [PATCH 1109/2325] style: composer cs-fix

---
 system/Database/Seeder.php             | 1 -
 tests/system/CLI/CommandRunnerTest.php | 1 -
 2 files changed, 2 deletions(-)

diff --git a/system/Database/Seeder.php b/system/Database/Seeder.php
index e3f954c726f2..94bd0612e393 100644
--- a/system/Database/Seeder.php
+++ b/system/Database/Seeder.php
@@ -67,7 +67,6 @@ class Seeder
     /**
      * Faker Generator instance.
      *
-     *
      * @deprecated
      */
     private static ?Generator $faker = null;
diff --git a/tests/system/CLI/CommandRunnerTest.php b/tests/system/CLI/CommandRunnerTest.php
index ce9ad2ff8f17..9e219954f7a2 100644
--- a/tests/system/CLI/CommandRunnerTest.php
+++ b/tests/system/CLI/CommandRunnerTest.php
@@ -27,7 +27,6 @@ final class CommandRunnerTest extends CIUnitTestCase
     private $streamFilter;
 
     private static Logger $logger;
-
     private static CommandRunner $runner;
 
     public static function setUpBeforeClass(): void

From 5b3a3fb9e4ccf4003f69272c1d935317578362fc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 10 Jan 2022 14:25:03 +0900
Subject: [PATCH 1110/2325] refactor: fix rector errors

---
 tests/system/Database/Builder/WhereTest.php | 4 +---
 tests/system/Helpers/HTMLHelperTest.php     | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php
index cf5f8f344e28..60d328483972 100644
--- a/tests/system/Database/Builder/WhereTest.php
+++ b/tests/system/Database/Builder/WhereTest.php
@@ -148,9 +148,7 @@ public function testWhereValueSubQuery()
         // Closure
         $builder = $this->db->table('neworder');
 
-        $builder->where('advance_amount <', static function (BaseBuilder $builder) {
-            return $builder->select('MAX(advance_amount)', false)->from('orders')->where('id >', 2);
-        });
+        $builder->where('advance_amount <', static fn (BaseBuilder $builder) => $builder->select('MAX(advance_amount)', false)->from('orders')->where('id >', 2));
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index f17254d8694d..79cb5da92334 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -24,7 +24,7 @@ final class HTMLHelperTest extends CIUnitTestCase
     /**
      * @var string Path to the test file for img_data
      */
-    private $imgPath = SUPPORTPATH . 'Images' . DIRECTORY_SEPARATOR . 'ci-logo.gif';
+    private string $imgPath = SUPPORTPATH . 'Images' . DIRECTORY_SEPARATOR . 'ci-logo.gif';
 
     /**
      * @var string Expected base64 encoding of img path

From 15b86a5cde6bf1ed7d47e98e37997784d1a3c10f Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 10 Jan 2022 12:40:47 +0700
Subject: [PATCH 1111/2325] add back php 7.4 to rector workflow

---
 .github/workflows/test-rector.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-rector.yml b/.github/workflows/test-rector.yml
index ac407eb72959..03aa90f9bb8c 100644
--- a/.github/workflows/test-rector.yml
+++ b/.github/workflows/test-rector.yml
@@ -33,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['8.0']
+        php-versions: ['7.4', '8.0']
     steps:
       - name: Checkout
         uses: actions/checkout@v2

From 8c0f547940cfcf827104046e065f4bcb0ca1e6d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Jan 2022 15:02:48 +0000
Subject: [PATCH 1112/2325] chore(deps-dev): update rector/rector requirement

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

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

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

diff --git a/composer.json b/composer.json
index f93b7034a992..3de58d518d28 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.11"
+        "rector/rector": "0.12.12"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From f43a6b41a8ed6b2a8c814b2360a52a0fa384b3fb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 31 Dec 2021 11:45:01 +0900
Subject: [PATCH 1113/2325] refactor: move $CSPEnabled from Response to
 ContentSecurityPolicy

ContentSecurityPolicy will be needed out of Response.
---
 system/HTTP/ContentSecurityPolicy.php | 23 +++++++++++++++++++++++
 system/HTTP/Response.php              |  3 +++
 system/HTTP/ResponseTrait.php         |  4 +++-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index 3b18fc8bf1df..cee4c92b9d37 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -192,6 +192,13 @@ class ContentSecurityPolicy
      */
     protected $reportOnlyHeaders = [];
 
+    /**
+     * Whether Content Security Policy is being enforced.
+     *
+     * @var bool
+     */
+    protected $CSPEnabled = false;
+
     /**
      * Constructor.
      *
@@ -206,6 +213,22 @@ public function __construct(ContentSecurityPolicyConfig $config)
         }
     }
 
+    /**
+     * Enable CSP
+     */
+    public function enable(): void
+    {
+        $this->CSPEnabled = true;
+    }
+
+    /**
+     * Whether Content Security Policy is being enforced.
+     */
+    public function enabled(): bool
+    {
+        return $this->CSPEnabled;
+    }
+
     /**
      * Compiles and sets the appropriate headers in the request.
      *
diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php
index 8e2cc472cc00..f25962d6af37 100644
--- a/system/HTTP/Response.php
+++ b/system/HTTP/Response.php
@@ -155,6 +155,9 @@ public function __construct($config)
         $this->CSP = new ContentSecurityPolicy(new CSPConfig());
 
         $this->CSPEnabled = $config->CSPEnabled;
+        if ($config->CSPEnabled) {
+            $this->CSP->enable();
+        }
 
         // DEPRECATED COOKIE MANAGEMENT
 
diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
index 278143fd3c3a..412e7b970e7c 100644
--- a/system/HTTP/ResponseTrait.php
+++ b/system/HTTP/ResponseTrait.php
@@ -38,6 +38,8 @@ trait ResponseTrait
      * Whether Content Security Policy is being enforced.
      *
      * @var bool
+     *
+     * @deprecated Use $this->CSP->enabled() instead.
      */
     protected $CSPEnabled = false;
 
@@ -433,7 +435,7 @@ public function send()
     {
         // If we're enforcing a Content Security Policy,
         // we need to give it a chance to build out it's headers.
-        if ($this->CSPEnabled === true) {
+        if ($this->CSP->enabled()) {
             $this->CSP->finalize($this);
         } else {
             $this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body ?? '');

From 434f90ac4f9b33e1d9bf772254221d79019389a7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 31 Dec 2021 11:53:01 +0900
Subject: [PATCH 1114/2325] feat: add methods to get nonces

---
 system/HTTP/ContentSecurityPolicy.php         | 38 +++++++++++++++++++
 .../system/HTTP/ContentSecurityPolicyTest.php | 18 +++++++++
 2 files changed, 56 insertions(+)

diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index cee4c92b9d37..baf42ff6193d 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -176,6 +176,20 @@ class ContentSecurityPolicy
      */
     protected $nonces = [];
 
+    /**
+     * Nonce for style
+     *
+     * @var string
+     */
+    protected $styleNonce;
+
+    /**
+     * Nonce for script
+     *
+     * @var string
+     */
+    protected $scriptNonce;
+
     /**
      * An array of header info since we have
      * to build ourself before passing to Response.
@@ -229,6 +243,30 @@ public function enabled(): bool
         return $this->CSPEnabled;
     }
 
+    /**
+     * Get the nonce for the style tag.
+     */
+    public function getStyleNonce(): string
+    {
+        if ($this->styleNonce === null) {
+            $this->styleNonce = bin2hex(random_bytes(12));
+        }
+
+        return $this->styleNonce;
+    }
+
+    /**
+     * Get the nonce for the script tag.
+     */
+    public function getScriptNonce(): string
+    {
+        if ($this->scriptNonce === null) {
+            $this->scriptNonce = bin2hex(random_bytes(12));
+        }
+
+        return $this->scriptNonce;
+    }
+
     /**
      * Compiles and sets the appropriate headers in the request.
      *
diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php
index 0bbb6f60f988..8d70c4929cd0 100644
--- a/tests/system/HTTP/ContentSecurityPolicyTest.php
+++ b/tests/system/HTTP/ContentSecurityPolicyTest.php
@@ -519,4 +519,22 @@ public function testCSPDisabled()
 
         $this->assertHeaderNotEmitted('content-security-policy', true);
     }
+
+    public function testGetScriptNonce()
+    {
+        $this->prepare();
+
+        $nonce = $this->csp->getScriptNonce();
+
+        $this->assertMatchesRegularExpression('/[0-9a-z]{24}/', $nonce);
+    }
+
+    public function testGetStyleNonce()
+    {
+        $this->prepare();
+
+        $nonce = $this->csp->getStyleNonce();
+
+        $this->assertMatchesRegularExpression('/[0-9a-z]{24}/', $nonce);
+    }
 }

From c45cfcb622365bf9b288f52fa2e56874e3354a41 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 31 Dec 2021 12:53:08 +0900
Subject: [PATCH 1115/2325] refactor: output only one nonce

Outputting multiple nonces do not improve security.
One is enough.
---
 system/HTTP/ContentSecurityPolicy.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index baf42ff6193d..540b5ab86789 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -651,21 +651,25 @@ protected function generateNonces(ResponseInterface &$response)
 
         // Replace style placeholders with nonces
         $body = preg_replace_callback('/{csp-style-nonce}/', function () {
-            $nonce = bin2hex(random_bytes(12));
-
-            $this->styleSrc[] = 'nonce-' . $nonce;
+            $nonce = $this->getStyleNonce();
 
             return "nonce=\"{$nonce}\"";
-        }, $body);
+        }, $body, -1, $count);
+
+        if ($count > 0) {
+            $this->styleSrc[] = 'nonce-' . $this->styleNonce;
+        }
 
         // Replace script placeholders with nonces
         $body = preg_replace_callback('/{csp-script-nonce}/', function () {
-            $nonce = bin2hex(random_bytes(12));
-
-            $this->scriptSrc[] = 'nonce-' . $nonce;
+            $nonce = $this->getScriptNonce();
 
             return "nonce=\"{$nonce}\"";
-        }, $body);
+        }, $body, -1, $count);
+
+        if ($count > 0) {
+            $this->scriptSrc[] = 'nonce-' . $this->scriptNonce;
+        }
 
         $response->setBody($body);
     }

From 6be16a8c5c776e02d9a72064e06425d8e7a4034a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 31 Dec 2021 13:26:08 +0900
Subject: [PATCH 1116/2325] feat: custom nonce tags

---
 app/Config/ContentSecurityPolicy.php          | 14 ++++++++
 env                                           |  2 ++
 system/HTTP/ContentSecurityPolicy.php         | 20 +++++++++--
 .../system/HTTP/ContentSecurityPolicyTest.php | 33 +++++++++++++++++++
 4 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/app/Config/ContentSecurityPolicy.php b/app/Config/ContentSecurityPolicy.php
index 6fa5bd7b4cc7..b4450d5ed422 100644
--- a/app/Config/ContentSecurityPolicy.php
+++ b/app/Config/ContentSecurityPolicy.php
@@ -164,4 +164,18 @@ class ContentSecurityPolicy extends BaseConfig
      * @var string|string[]|null
      */
     public $sandbox;
+
+    /**
+     * Nonce tag for style
+     *
+     * @var string
+     */
+    public $styleNonceTag = '{csp-style-nonce}';
+
+    /**
+     * Nonce tag for script
+     *
+     * @var string
+     */
+    public $scriptNonceTag = '{csp-script-nonce}';
 }
diff --git a/env b/env
index c60b367265e7..7b52d6690441 100644
--- a/env
+++ b/env
@@ -73,6 +73,8 @@
 # contentsecuritypolicy.reportURI = null
 # contentsecuritypolicy.sandbox = false
 # contentsecuritypolicy.upgradeInsecureRequests = false
+# contentsecuritypolicy.styleNonceTag = '{csp-style-nonce}'
+# contentsecuritypolicy.scriptNonceTag = '{csp-script-nonce}'
 
 #--------------------------------------------------------------------
 # COOKIE
diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index 540b5ab86789..fb70c613549a 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -190,6 +190,20 @@ class ContentSecurityPolicy
      */
     protected $scriptNonce;
 
+    /**
+     * Nonce tag for style
+     *
+     * @var string
+     */
+    protected $styleNonceTag = '{csp-style-nonce}';
+
+    /**
+     * Nonce tag for script
+     *
+     * @var string
+     */
+    protected $scriptNonceTag = '{csp-script-nonce}';
+
     /**
      * An array of header info since we have
      * to build ourself before passing to Response.
@@ -650,7 +664,8 @@ protected function generateNonces(ResponseInterface &$response)
         }
 
         // Replace style placeholders with nonces
-        $body = preg_replace_callback('/{csp-style-nonce}/', function () {
+        $pattern = '/' . preg_quote($this->styleNonceTag, '/') . '/';
+        $body    = preg_replace_callback($pattern, function () {
             $nonce = $this->getStyleNonce();
 
             return "nonce=\"{$nonce}\"";
@@ -661,7 +676,8 @@ protected function generateNonces(ResponseInterface &$response)
         }
 
         // Replace script placeholders with nonces
-        $body = preg_replace_callback('/{csp-script-nonce}/', function () {
+        $pattern = '/' . preg_quote($this->scriptNonceTag, '/') . '/';
+        $body    = preg_replace_callback($pattern, function () {
             $nonce = $this->getScriptNonce();
 
             return "nonce=\"{$nonce}\"";
diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php
index 8d70c4929cd0..5525309d7a2f 100644
--- a/tests/system/HTTP/ContentSecurityPolicyTest.php
+++ b/tests/system/HTTP/ContentSecurityPolicyTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\App;
+use Config\ContentSecurityPolicy as CSPConfig;
 
 /**
  * Test the CSP policy directive creation.
@@ -463,6 +464,22 @@ public function testBodyScriptNonce()
         $this->assertStringContainsString('nonce-', $result);
     }
 
+    public function testBodyScriptNonceCustomScriptTag()
+    {
+        $config                 = new CSPConfig();
+        $config->scriptNonceTag = '{custom-script-nonce-tag}';
+        $csp                    = new ContentSecurityPolicy($config);
+
+        $response = new Response(new App());
+        $response->pretend(true);
+        $body = 'Blah blah {custom-script-nonce-tag} blah blah';
+        $response->setBody($body);
+
+        $csp->finalize($response);
+
+        $this->assertStringContainsString('nonce=', $response->getBody());
+    }
+
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
@@ -481,6 +498,22 @@ public function testBodyStyleNonce()
         $this->assertStringContainsString('nonce-', $result);
     }
 
+    public function testBodyStyleNonceCustomStyleTag()
+    {
+        $config                = new CSPConfig();
+        $config->styleNonceTag = '{custom-style-nonce-tag}';
+        $csp                   = new ContentSecurityPolicy($config);
+
+        $response = new Response(new App());
+        $response->pretend(true);
+        $body = 'Blah blah {custom-style-nonce-tag} blah blah';
+        $response->setBody($body);
+
+        $csp->finalize($response);
+
+        $this->assertStringContainsString('nonce=', $response->getBody());
+    }
+
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled

From 7a75b89b8b7aed4a9ad4f5f76805428b4c3216a6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 31 Dec 2021 13:49:53 +0900
Subject: [PATCH 1117/2325] feat: add csp_style_nonce() and csp_script_nonce()

---
 system/Common.php                    | 35 ++++++++++++++++++++++++++++
 tests/system/CommonFunctionsTest.php | 10 ++++++++
 2 files changed, 45 insertions(+)

diff --git a/system/Common.php b/system/Common.php
index e2fa9bce5a33..80a7dc013944 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -21,6 +21,7 @@
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\Model;
@@ -288,6 +289,40 @@ function csrf_meta(?string $id = null): string
     }
 }
 
+if (! function_exists('csp_style_nonce')) {
+    /**
+     * Generates a nonce attribute for style tag.
+     */
+    function csp_style_nonce(): string
+    {
+        /** @var Response $response */
+        $response = Services::response();
+
+        if (! $response->CSP->enabled()) {
+            return '';
+        }
+
+        return 'nonce="' . $response->CSP->getStyleNonce() . '"';
+    }
+}
+
+if (! function_exists('csp_script_nonce')) {
+    /**
+     * Generates a nonce attribute for script tag.
+     */
+    function csp_script_nonce(): string
+    {
+        /** @var Response $response */
+        $response = Services::response();
+
+        if (! $response->CSP->enabled()) {
+            return '';
+        }
+
+        return 'nonce="' . $response->CSP->getScriptNonce() . '"';
+    }
+}
+
 if (! function_exists('db_connect')) {
     /**
      * Grabs a database connection and returns it to the user.
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 3916a1ab785f..f55f55fb45b4 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -549,4 +549,14 @@ public function testTraceWithCSP()
         $this->expectOutputRegex('/<style {csp-style-nonce} class="kint-rich-style">/u');
         trace();
     }
+
+    public function testCspStyleNonce()
+    {
+        $this->assertStringContainsString('nonce="', csp_style_nonce());
+    }
+
+    public function testCspScriptNonce()
+    {
+        $this->assertStringContainsString('nonce="', csp_script_nonce());
+    }
 }

From a08d7e587550db82307585a18c25cc559c3a5da0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 31 Dec 2021 13:53:05 +0900
Subject: [PATCH 1118/2325] refactor: use csp_script_nonce() and
 csp_script_nonce() in Debug Toolbar

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

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 8e100fe25a6b..bf502f1f1563 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -402,11 +402,11 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
             $kintScript         = substr($kintScript, 0, strpos($kintScript, '</style>') + 8);
 
             $script = PHP_EOL
-                . '<script type="text/javascript" {csp-script-nonce} id="debugbar_loader" '
+                . '<script type="text/javascript" ' . csp_script_nonce() . ' id="debugbar_loader" '
                 . 'data-time="' . $time . '" '
                 . 'src="' . site_url() . '?debugbar"></script>'
-                . '<script type="text/javascript" {csp-script-nonce} id="debugbar_dynamic_script"></script>'
-                . '<style type="text/css" {csp-style-nonce} id="debugbar_dynamic_style"></style>'
+                . '<script type="text/javascript" ' . csp_script_nonce() . ' id="debugbar_dynamic_script"></script>'
+                . '<style type="text/css" ' . csp_style_nonce() . ' id="debugbar_dynamic_style"></style>'
                 . $kintScript
                 . PHP_EOL;
 

From e7b0727e8d42833bbee5a38476a76ade10bd4f5b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 31 Dec 2021 13:55:42 +0900
Subject: [PATCH 1119/2325] config: fix incorrect property name

---
 env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/env b/env
index 7b52d6690441..e11bb08e0493 100644
--- a/env
+++ b/env
@@ -60,7 +60,7 @@
 # contentsecuritypolicy.scriptSrc = 'self'
 # contentsecuritypolicy.styleSrc = 'self'
 # contentsecuritypolicy.imageSrc = 'self'
-# contentsecuritypolicy.base_uri = null
+# contentsecuritypolicy.baseURI = null
 # contentsecuritypolicy.childSrc = null
 # contentsecuritypolicy.connectSrc = 'self'
 # contentsecuritypolicy.fontSrc = null

From d548118c264dedc1dde45b6ca0afcd550462b49f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 31 Dec 2021 14:01:36 +0900
Subject: [PATCH 1120/2325] feat: add config for disabling to replace nonce tag
 automatically

---
 app/Config/ContentSecurityPolicy.php          |  7 ++++
 env                                           |  1 +
 system/HTTP/ContentSecurityPolicy.php         | 11 +++++++
 .../system/HTTP/ContentSecurityPolicyTest.php | 32 +++++++++++++++++++
 4 files changed, 51 insertions(+)

diff --git a/app/Config/ContentSecurityPolicy.php b/app/Config/ContentSecurityPolicy.php
index b4450d5ed422..aa18ba9f1060 100644
--- a/app/Config/ContentSecurityPolicy.php
+++ b/app/Config/ContentSecurityPolicy.php
@@ -178,4 +178,11 @@ class ContentSecurityPolicy extends BaseConfig
      * @var string
      */
     public $scriptNonceTag = '{csp-script-nonce}';
+
+    /**
+     * Replace nonce tag automatically
+     *
+     * @var bool
+     */
+    public $autoNonce = true;
 }
diff --git a/env b/env
index e11bb08e0493..83def018081f 100644
--- a/env
+++ b/env
@@ -75,6 +75,7 @@
 # contentsecuritypolicy.upgradeInsecureRequests = false
 # contentsecuritypolicy.styleNonceTag = '{csp-style-nonce}'
 # contentsecuritypolicy.scriptNonceTag = '{csp-script-nonce}'
+# contentsecuritypolicy.autoNonce = true
 
 #--------------------------------------------------------------------
 # COOKIE
diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index fb70c613549a..341411013d0e 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -204,6 +204,13 @@ class ContentSecurityPolicy
      */
     protected $scriptNonceTag = '{csp-script-nonce}';
 
+    /**
+     * Replace nonce tag automatically
+     *
+     * @var bool
+     */
+    protected $autoNonce = true;
+
     /**
      * An array of header info since we have
      * to build ourself before passing to Response.
@@ -288,6 +295,10 @@ public function getScriptNonce(): string
      */
     public function finalize(ResponseInterface &$response)
     {
+        if ($this->autoNonce === false) {
+            return;
+        }
+
         $this->generateNonces($response);
         $this->buildHeaders($response);
     }
diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php
index 5525309d7a2f..fa95d9ba9fb6 100644
--- a/tests/system/HTTP/ContentSecurityPolicyTest.php
+++ b/tests/system/HTTP/ContentSecurityPolicyTest.php
@@ -480,6 +480,38 @@ public function testBodyScriptNonceCustomScriptTag()
         $this->assertStringContainsString('nonce=', $response->getBody());
     }
 
+    public function testBodyScriptNonceDisableAutoNonce()
+    {
+        $config            = new CSPConfig();
+        $config->autoNonce = false;
+        $csp               = new ContentSecurityPolicy($config);
+
+        $response = new Response(new App());
+        $response->pretend(true);
+        $body = 'Blah blah {csp-script-nonce} blah blah';
+        $response->setBody($body);
+
+        $csp->finalize($response);
+
+        $this->assertStringContainsString('{csp-script-nonce}', $response->getBody());
+    }
+
+    public function testBodyStyleNonceDisableAutoNonce()
+    {
+        $config            = new CSPConfig();
+        $config->autoNonce = false;
+        $csp               = new ContentSecurityPolicy($config);
+
+        $response = new Response(new App());
+        $response->pretend(true);
+        $body = 'Blah blah {csp-style-nonce} blah blah';
+        $response->setBody($body);
+
+        $csp->finalize($response);
+
+        $this->assertStringContainsString('{csp-style-nonce}', $response->getBody());
+    }
+
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled

From bc52fad6678b3600e2d62139a032dbd5a2482192 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 31 Dec 2021 14:13:57 +0900
Subject: [PATCH 1121/2325] refactor: use csp_script_nonce() and
 csp_script_nonce() in Kint

---
 system/Debug/Kint/RichRenderer.php   | 4 ++--
 tests/system/CommonFunctionsTest.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/Debug/Kint/RichRenderer.php b/system/Debug/Kint/RichRenderer.php
index 756cac75e144..8210fb21e1c2 100644
--- a/system/Debug/Kint/RichRenderer.php
+++ b/system/Debug/Kint/RichRenderer.php
@@ -36,11 +36,11 @@ public function preRender()
 
                 switch ($type) {
                     case 'script':
-                        $output .= '<script {csp-script-nonce} class="kint-rich-script">' . $contents . '</script>';
+                        $output .= '<script ' . csp_script_nonce() . ' class="kint-rich-script">' . $contents . '</script>';
                         break;
 
                     case 'style':
-                        $output .= '<style {csp-style-nonce} class="kint-rich-style">' . $contents . '</style>';
+                        $output .= '<style ' . csp_style_nonce() . ' class="kint-rich-style">' . $contents . '</style>';
                         break;
 
                     default:
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index f55f55fb45b4..51eb7f94938f 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -527,7 +527,7 @@ public function testDWithCSP()
         $config->CSPEnabled  = true;
         Kint::$cli_detection = false;
 
-        $this->expectOutputRegex('/<script {csp-script-nonce} class="kint-rich-script">/u');
+        $this->expectOutputRegex('/<script nonce="[0-9a-z]{24}" class="kint-rich-script">/u');
         d('string');
 
         // Restore settings
@@ -546,7 +546,7 @@ public function testTraceWithCSP()
         $config->CSPEnabled  = true;
         Kint::$cli_detection = false;
 
-        $this->expectOutputRegex('/<style {csp-style-nonce} class="kint-rich-style">/u');
+        $this->expectOutputRegex('/<style nonce="[0-9a-z]{24}" class="kint-rich-style">/u');
         trace();
     }
 

From 9b1f5131c65469b57bd57b16284072e36c2fad0f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 31 Dec 2021 14:52:44 +0900
Subject: [PATCH 1122/2325] feat: add Services::contentsecuritypolicy()

---
 system/Config/BaseService.php         |  3 +++
 system/Config/Services.php            | 18 ++++++++++++++++++
 system/HTTP/ContentSecurityPolicy.php |  3 +++
 3 files changed, 24 insertions(+)

diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
index b50617d7ed83..64c2948df3c6 100644
--- a/system/Config/BaseService.php
+++ b/system/Config/BaseService.php
@@ -28,6 +28,7 @@
 use CodeIgniter\Format\Format;
 use CodeIgniter\Honeypot\Honeypot;
 use CodeIgniter\HTTP\CLIRequest;
+use CodeIgniter\HTTP\ContentSecurityPolicy;
 use CodeIgniter\HTTP\CURLRequest;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\Negotiate;
@@ -56,6 +57,7 @@
 use Config\App;
 use Config\Autoload;
 use Config\Cache;
+use Config\ContentSecurityPolicy as CSPConfig;
 use Config\Encryption;
 use Config\Exceptions as ConfigExceptions;
 use Config\Filters as ConfigFilters;
@@ -94,6 +96,7 @@
  * @method static CLIRequest clirequest(App $config = null, $getShared = true)
  * @method static CodeIgniter codeigniter(App $config = null, $getShared = true)
  * @method static Commands commands($getShared = true)
+ * @method static ContentSecurityPolicy contentsecuritypolicy(CSPConfig $config = null, $getShared = true)
  * @method static CURLRequest curlrequest($options = [], ResponseInterface $response = null, App $config = null, $getShared = true)
  * @method static Email email($config = null, $getShared = true)
  * @method static EncrypterInterface encrypter(Encryption $config = null, $getShared = false)
diff --git a/system/Config/Services.php b/system/Config/Services.php
index b72fad36eec7..dcad21799681 100644
--- a/system/Config/Services.php
+++ b/system/Config/Services.php
@@ -28,6 +28,7 @@
 use CodeIgniter\Format\Format;
 use CodeIgniter\Honeypot\Honeypot;
 use CodeIgniter\HTTP\CLIRequest;
+use CodeIgniter\HTTP\ContentSecurityPolicy;
 use CodeIgniter\HTTP\CURLRequest;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\Negotiate;
@@ -56,6 +57,7 @@
 use CodeIgniter\View\View;
 use Config\App;
 use Config\Cache;
+use Config\ContentSecurityPolicy as CSPConfig;
 use Config\Email as EmailConfig;
 use Config\Encryption as EncryptionConfig;
 use Config\Exceptions as ExceptionsConfig;
@@ -153,6 +155,22 @@ public static function commands(bool $getShared = true)
         return new Commands();
     }
 
+    /**
+     * Content Security Policy
+     *
+     * @return ContentSecurityPolicy
+     */
+    public static function contentsecuritypolicy(?CSPConfig $config = null, bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('contentsecuritypolicy', $config);
+        }
+
+        $config = $config ?? config('ContentSecurityPolicy');
+
+        return new ContentSecurityPolicy($config);
+    }
+
     /**
      * The CURL Request class acts as a simple HTTP client for interacting
      * with other servers, typically through APIs.
diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index 341411013d0e..dbfeb2ababc4 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -241,6 +241,9 @@ class ContentSecurityPolicy
      */
     public function __construct(ContentSecurityPolicyConfig $config)
     {
+        $appConfig        = config('App');
+        $this->CSPEnabled = $appConfig->CSPEnabled;
+
         foreach (get_object_vars($config) as $setting => $value) {
             if (property_exists($this, $setting)) {
                 $this->{$setting} = $value;

From 9ece590bd3dfa0fa96f02447c13a63b5f46ee7a7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 31 Dec 2021 14:54:38 +0900
Subject: [PATCH 1123/2325] refactor: use Services::contentsecuritypolicy()

---
 system/Common.php                             | 14 +++++------
 system/HTTP/ContentSecurityPolicy.php         |  8 -------
 system/HTTP/Response.php                      |  7 ++----
 tests/system/CommonFunctionsTest.php          | 24 +++++++++++++++----
 .../system/HTTP/ContentSecurityPolicyTest.php |  5 +++-
 tests/system/HTTP/ResponseSendTest.php        |  5 +++-
 6 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/system/Common.php b/system/Common.php
index 80a7dc013944..7db4474f9c0d 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -295,14 +295,13 @@ function csrf_meta(?string $id = null): string
      */
     function csp_style_nonce(): string
     {
-        /** @var Response $response */
-        $response = Services::response();
+        $csp = Services::contentsecuritypolicy();
 
-        if (! $response->CSP->enabled()) {
+        if (! $csp->enabled()) {
             return '';
         }
 
-        return 'nonce="' . $response->CSP->getStyleNonce() . '"';
+        return 'nonce="' . $csp->getStyleNonce() . '"';
     }
 }
 
@@ -312,14 +311,13 @@ function csp_style_nonce(): string
      */
     function csp_script_nonce(): string
     {
-        /** @var Response $response */
-        $response = Services::response();
+        $csp = Services::contentsecuritypolicy();
 
-        if (! $response->CSP->enabled()) {
+        if (! $csp->enabled()) {
             return '';
         }
 
-        return 'nonce="' . $response->CSP->getScriptNonce() . '"';
+        return 'nonce="' . $csp->getScriptNonce() . '"';
     }
 }
 
diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index dbfeb2ababc4..00fdb5f8ba0d 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -251,14 +251,6 @@ public function __construct(ContentSecurityPolicyConfig $config)
         }
     }
 
-    /**
-     * Enable CSP
-     */
-    public function enable(): void
-    {
-        $this->CSPEnabled = true;
-    }
-
     /**
      * Whether Content Security Policy is being enforced.
      */
diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php
index f25962d6af37..015bb658a275 100644
--- a/system/HTTP/Response.php
+++ b/system/HTTP/Response.php
@@ -16,7 +16,7 @@
 use CodeIgniter\Cookie\Exceptions\CookieException;
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use Config\App;
-use Config\ContentSecurityPolicy as CSPConfig;
+use Config\Services;
 
 /**
  * Representation of an outgoing, getServer-side response.
@@ -152,12 +152,9 @@ public function __construct($config)
         $this->noCache();
 
         // We need CSP object even if not enabled to avoid calls to non existing methods
-        $this->CSP = new ContentSecurityPolicy(new CSPConfig());
+        $this->CSP = Services::contentsecuritypolicy();
 
         $this->CSPEnabled = $config->CSPEnabled;
-        if ($config->CSPEnabled) {
-            $this->CSP->enable();
-        }
 
         // DEPRECATED COOKIE MANAGEMENT
 
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 51eb7f94938f..cf8dd9c89aa4 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -519,9 +519,11 @@ public function testIsCli()
 
     public function testDWithCSP()
     {
+        $this->resetServices();
+        $this->resetFactories();
+
         /** @var App $config */
-        $config       = config(App::class);
-        $CSPEnabled   = $config->CSPEnabled;
+        $config       = config('App');
         $cliDetection = Kint::$cli_detection;
 
         $config->CSPEnabled  = true;
@@ -531,7 +533,6 @@ public function testDWithCSP()
         d('string');
 
         // Restore settings
-        $config->CSPEnabled  = $CSPEnabled;
         Kint::$cli_detection = $cliDetection;
     }
 
@@ -541,8 +542,11 @@ public function testDWithCSP()
      */
     public function testTraceWithCSP()
     {
+        $this->resetServices();
+        $this->resetFactories();
+
         /** @var App $config */
-        $config              = config(App::class);
+        $config              = config('App');
         $config->CSPEnabled  = true;
         Kint::$cli_detection = false;
 
@@ -552,11 +556,23 @@ public function testTraceWithCSP()
 
     public function testCspStyleNonce()
     {
+        $this->resetServices();
+        $this->resetFactories();
+
+        $config             = config('App');
+        $config->CSPEnabled = true;
+
         $this->assertStringContainsString('nonce="', csp_style_nonce());
     }
 
     public function testCspScriptNonce()
     {
+        $this->resetServices();
+        $this->resetFactories();
+
+        $config             = config('App');
+        $config->CSPEnabled = true;
+
         $this->assertStringContainsString('nonce="', csp_script_nonce());
     }
 }
diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php
index fa95d9ba9fb6..c1c91d7b4da4 100644
--- a/tests/system/HTTP/ContentSecurityPolicyTest.php
+++ b/tests/system/HTTP/ContentSecurityPolicyTest.php
@@ -28,7 +28,10 @@ final class ContentSecurityPolicyTest extends CIUnitTestCase
     // Having this method as setUp() doesn't work - can't find Config\App !?
     protected function prepare(bool $CSPEnabled = true)
     {
-        $config             = new App();
+        $this->resetServices();
+        $this->resetFactories();
+
+        $config             = config('App');
         $config->CSPEnabled = $CSPEnabled;
         $this->response     = new Response($config);
         $this->response->pretend(false);
diff --git a/tests/system/HTTP/ResponseSendTest.php b/tests/system/HTTP/ResponseSendTest.php
index 6610321040a2..eef845297182 100644
--- a/tests/system/HTTP/ResponseSendTest.php
+++ b/tests/system/HTTP/ResponseSendTest.php
@@ -79,7 +79,10 @@ public function testHeadersMissingDate()
      */
     public function testHeadersWithCSP()
     {
-        $config             = new App();
+        $this->resetFactories();
+        $this->resetServices();
+
+        $config             = config('App');
         $config->CSPEnabled = true;
         $response           = new Response($config);
         $response->pretend(false);

From 031e411449cc768d8d6ddb82cab8b6477711f7e4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 31 Dec 2021 16:45:03 +0900
Subject: [PATCH 1124/2325] fix: CSP nonce header is nottt sent when CSP tag
 replacement does not happen

---
 system/HTTP/ContentSecurityPolicy.php         | 30 ++++++++-----------
 .../system/HTTP/ContentSecurityPolicyTest.php | 15 ++++++++++
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index 00fdb5f8ba0d..b7f9b066d7d8 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -249,6 +249,14 @@ public function __construct(ContentSecurityPolicyConfig $config)
                 $this->{$setting} = $value;
             }
         }
+
+        if (! is_array($this->styleSrc)) {
+            $this->styleSrc = [$this->styleSrc];
+        }
+
+        if (! is_array($this->scriptSrc)) {
+            $this->scriptSrc = [$this->scriptSrc];
+        }
     }
 
     /**
@@ -266,6 +274,7 @@ public function getStyleNonce(): string
     {
         if ($this->styleNonce === null) {
             $this->styleNonce = bin2hex(random_bytes(12));
+            $this->styleSrc[] = 'nonce-' . $this->styleNonce;
         }
 
         return $this->styleNonce;
@@ -278,6 +287,7 @@ public function getScriptNonce(): string
     {
         if ($this->scriptNonce === null) {
             $this->scriptNonce = bin2hex(random_bytes(12));
+            $this->scriptSrc[] = 'nonce-' . $this->scriptNonce;
         }
 
         return $this->scriptNonce;
@@ -661,25 +671,13 @@ protected function generateNonces(ResponseInterface &$response)
             return;
         }
 
-        if (! is_array($this->styleSrc)) {
-            $this->styleSrc = [$this->styleSrc];
-        }
-
-        if (! is_array($this->scriptSrc)) {
-            $this->scriptSrc = [$this->scriptSrc];
-        }
-
         // Replace style placeholders with nonces
         $pattern = '/' . preg_quote($this->styleNonceTag, '/') . '/';
         $body    = preg_replace_callback($pattern, function () {
             $nonce = $this->getStyleNonce();
 
             return "nonce=\"{$nonce}\"";
-        }, $body, -1, $count);
-
-        if ($count > 0) {
-            $this->styleSrc[] = 'nonce-' . $this->styleNonce;
-        }
+        }, $body);
 
         // Replace script placeholders with nonces
         $pattern = '/' . preg_quote($this->scriptNonceTag, '/') . '/';
@@ -687,11 +685,7 @@ protected function generateNonces(ResponseInterface &$response)
             $nonce = $this->getScriptNonce();
 
             return "nonce=\"{$nonce}\"";
-        }, $body, -1, $count);
-
-        if ($count > 0) {
-            $this->scriptSrc[] = 'nonce-' . $this->scriptNonce;
-        }
+        }, $body);
 
         $response->setBody($body);
     }
diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php
index c1c91d7b4da4..4a90d7313e38 100644
--- a/tests/system/HTTP/ContentSecurityPolicyTest.php
+++ b/tests/system/HTTP/ContentSecurityPolicyTest.php
@@ -605,4 +605,19 @@ public function testGetStyleNonce()
 
         $this->assertMatchesRegularExpression('/[0-9a-z]{24}/', $nonce);
     }
+
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState  disabled
+     */
+    public function testHeaderScriptNonceEmittedOnceGetScriptNonceCalled()
+    {
+        $this->prepare();
+
+        $this->csp->getScriptNonce();
+        $this->work();
+
+        $result = $this->getHeaderEmitted('Content-Security-Policy');
+        $this->assertStringContainsString("script-src 'self' 'nonce-", $result);
+    }
 }

From 571a34c97f18c9880ac389c5982a7a3a16e5fc54 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 31 Dec 2021 19:32:47 +0900
Subject: [PATCH 1125/2325] test: make regex strict

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

diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php
index 4a90d7313e38..e13b5954bb47 100644
--- a/tests/system/HTTP/ContentSecurityPolicyTest.php
+++ b/tests/system/HTTP/ContentSecurityPolicyTest.php
@@ -594,7 +594,7 @@ public function testGetScriptNonce()
 
         $nonce = $this->csp->getScriptNonce();
 
-        $this->assertMatchesRegularExpression('/[0-9a-z]{24}/', $nonce);
+        $this->assertMatchesRegularExpression('/\A[0-9a-z]{24}\z/', $nonce);
     }
 
     public function testGetStyleNonce()
@@ -603,7 +603,7 @@ public function testGetStyleNonce()
 
         $nonce = $this->csp->getStyleNonce();
 
-        $this->assertMatchesRegularExpression('/[0-9a-z]{24}/', $nonce);
+        $this->assertMatchesRegularExpression('/\A[0-9a-z]{24}\z/', $nonce);
     }
 
     /**

From 3fde024d32ace899657c4db51067c1b379079bf7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 4 Jan 2022 17:07:16 +0900
Subject: [PATCH 1126/2325] refactor: remove uneeded use statement

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

diff --git a/system/Common.php b/system/Common.php
index 7db4474f9c0d..979a5c07f4e1 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -21,7 +21,6 @@
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\RequestInterface;
-use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\Model;

From c4aaa4f4b0cb6ed751ed2b8a2a8a43dd7b958cd3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 4 Jan 2022 17:10:12 +0900
Subject: [PATCH 1127/2325] refactor: rename from contentsecuritypolicy() to
 csp()

---
 system/Common.php             | 4 ++--
 system/Config/BaseService.php | 2 +-
 system/Config/Services.php    | 4 ++--
 system/HTTP/Response.php      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/system/Common.php b/system/Common.php
index 979a5c07f4e1..690275c4fedf 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -294,7 +294,7 @@ function csrf_meta(?string $id = null): string
      */
     function csp_style_nonce(): string
     {
-        $csp = Services::contentsecuritypolicy();
+        $csp = Services::csp();
 
         if (! $csp->enabled()) {
             return '';
@@ -310,7 +310,7 @@ function csp_style_nonce(): string
      */
     function csp_script_nonce(): string
     {
-        $csp = Services::contentsecuritypolicy();
+        $csp = Services::csp();
 
         if (! $csp->enabled()) {
             return '';
diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
index 64c2948df3c6..38bac37fdaa9 100644
--- a/system/Config/BaseService.php
+++ b/system/Config/BaseService.php
@@ -96,7 +96,7 @@
  * @method static CLIRequest clirequest(App $config = null, $getShared = true)
  * @method static CodeIgniter codeigniter(App $config = null, $getShared = true)
  * @method static Commands commands($getShared = true)
- * @method static ContentSecurityPolicy contentsecuritypolicy(CSPConfig $config = null, $getShared = true)
+ * @method static ContentSecurityPolicy csp(CSPConfig $config = null, $getShared = true)
  * @method static CURLRequest curlrequest($options = [], ResponseInterface $response = null, App $config = null, $getShared = true)
  * @method static Email email($config = null, $getShared = true)
  * @method static EncrypterInterface encrypter(Encryption $config = null, $getShared = false)
diff --git a/system/Config/Services.php b/system/Config/Services.php
index dcad21799681..3c36515be691 100644
--- a/system/Config/Services.php
+++ b/system/Config/Services.php
@@ -160,10 +160,10 @@ public static function commands(bool $getShared = true)
      *
      * @return ContentSecurityPolicy
      */
-    public static function contentsecuritypolicy(?CSPConfig $config = null, bool $getShared = true)
+    public static function csp(?CSPConfig $config = null, bool $getShared = true)
     {
         if ($getShared) {
-            return static::getSharedInstance('contentsecuritypolicy', $config);
+            return static::getSharedInstance('csp', $config);
         }
 
         $config = $config ?? config('ContentSecurityPolicy');
diff --git a/system/HTTP/Response.php b/system/HTTP/Response.php
index 015bb658a275..493c990e1eae 100644
--- a/system/HTTP/Response.php
+++ b/system/HTTP/Response.php
@@ -152,7 +152,7 @@ public function __construct($config)
         $this->noCache();
 
         // We need CSP object even if not enabled to avoid calls to non existing methods
-        $this->CSP = Services::contentsecuritypolicy();
+        $this->CSP = Services::csp();
 
         $this->CSPEnabled = $config->CSPEnabled;
 

From 4b8b118daa19bdf12b646719ece7a6a24581de48 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 4 Jan 2022 17:27:33 +0900
Subject: [PATCH 1128/2325] test: remove unneeded $this->resetFactories()

It is called in CIUnitTestCase::setUp() via $setUpMethods.
---
 tests/system/CommonFunctionsTest.php            | 4 ----
 tests/system/HTTP/ContentSecurityPolicyTest.php | 1 -
 2 files changed, 5 deletions(-)

diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index cf8dd9c89aa4..8328de05271d 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -520,7 +520,6 @@ public function testIsCli()
     public function testDWithCSP()
     {
         $this->resetServices();
-        $this->resetFactories();
 
         /** @var App $config */
         $config       = config('App');
@@ -543,7 +542,6 @@ public function testDWithCSP()
     public function testTraceWithCSP()
     {
         $this->resetServices();
-        $this->resetFactories();
 
         /** @var App $config */
         $config              = config('App');
@@ -557,7 +555,6 @@ public function testTraceWithCSP()
     public function testCspStyleNonce()
     {
         $this->resetServices();
-        $this->resetFactories();
 
         $config             = config('App');
         $config->CSPEnabled = true;
@@ -568,7 +565,6 @@ public function testCspStyleNonce()
     public function testCspScriptNonce()
     {
         $this->resetServices();
-        $this->resetFactories();
 
         $config             = config('App');
         $config->CSPEnabled = true;
diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php
index e13b5954bb47..2ab6ee747d91 100644
--- a/tests/system/HTTP/ContentSecurityPolicyTest.php
+++ b/tests/system/HTTP/ContentSecurityPolicyTest.php
@@ -29,7 +29,6 @@ final class ContentSecurityPolicyTest extends CIUnitTestCase
     protected function prepare(bool $CSPEnabled = true)
     {
         $this->resetServices();
-        $this->resetFactories();
 
         $config             = config('App');
         $config->CSPEnabled = $CSPEnabled;

From b1e91ddb72a2f91f7b0fe8cfd0e5c055e137a9e5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 4 Jan 2022 18:53:37 +0900
Subject: [PATCH 1129/2325] feat: add csp_script_nonce and csp_style_nonce
 plugin for View Parser

---
 system/Config/View.php                 |  2 ++
 system/View/Plugins.php                | 16 ++++++++++++++++
 tests/system/View/ParserPluginTest.php | 13 +++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/system/Config/View.php b/system/Config/View.php
index 5a8baeac2d6a..da4f81b1c716 100644
--- a/system/Config/View.php
+++ b/system/Config/View.php
@@ -76,6 +76,8 @@ class View extends BaseConfig
      * @var array
      */
     protected $corePlugins = [
+        'csp_script_nonce'  => '\CodeIgniter\View\Plugins::cspScriptNonce',
+        'csp_style_nonce'   => '\CodeIgniter\View\Plugins::cspStyleNonce',
         'current_url'       => '\CodeIgniter\View\Plugins::currentURL',
         'previous_url'      => '\CodeIgniter\View\Plugins::previousURL',
         'mailto'            => '\CodeIgniter\View\Plugins::mailto',
diff --git a/system/View/Plugins.php b/system/View/Plugins.php
index d0e170071a6a..b74ad96bd385 100644
--- a/system/View/Plugins.php
+++ b/system/View/Plugins.php
@@ -103,4 +103,20 @@ public static function siteURL(array $params = []): string
     {
         return site_url(...$params);
     }
+
+    /**
+     * Wrap csp_script_nonce() function to use as view plugin.
+     */
+    public static function cspScriptNonce(): string
+    {
+        return csp_script_nonce();
+    }
+
+    /**
+     * Wrap csp_style_nonce() function to use as view plugin.
+     */
+    public static function cspStyleNonce(): string
+    {
+        return csp_style_nonce();
+    }
 }
diff --git a/tests/system/View/ParserPluginTest.php b/tests/system/View/ParserPluginTest.php
index 85de3e7898fa..55e5e4ce9c75 100644
--- a/tests/system/View/ParserPluginTest.php
+++ b/tests/system/View/ParserPluginTest.php
@@ -133,4 +133,17 @@ public function setHints($output)
     {
         return preg_replace('/(<!-- DEBUG-VIEW+) (\w+) (\d+)/', '${1}', $output);
     }
+
+    public function testCspScriptNonceWithCspEnabled()
+    {
+        $config             = config('App');
+        $config->CSPEnabled = true;
+
+        $template = 'aaa {+ csp_script_nonce +} bbb';
+
+        $this->assertMatchesRegularExpression(
+            '/aaa nonce="[0-9a-z]{24}" bbb/',
+            $this->parser->renderString($template)
+        );
+    }
 }

From c472bb645d17040a31e7ea34ddd145cf3ecfe8ba Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 5 Jan 2022 15:47:01 +0900
Subject: [PATCH 1130/2325] docs: update user guide

---
 .../source/general/common_functions.rst       | 16 +++++++++++++
 user_guide_src/source/outgoing/response.rst   | 23 +++++++++++++++++++
 .../source/outgoing/view_parser.rst           |  4 ++++
 3 files changed, 43 insertions(+)

diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index 96a16fde77b6..19fb3e454704 100755
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -217,6 +217,22 @@ Miscellaneous Functions
 
     Returns the timezone the application has been set to display dates in.
 
+.. php:function:: csp_script_nonce ()
+
+    :returns: The CSP nonce attribute for script tag.
+    :rtype: string
+
+    Returns the nonce attribute for script tag. That is string like ``nonce="Eskdikejidojdk978Ad8jf"``.
+    See :ref:`content-security-policy`.
+
+.. php:function:: csp_style_nonce ()
+
+    :returns: The CSP nonce attribute for style tag.
+    :rtype: string
+
+    Returns the nonce attribute for style tag. That is string like ``nonce="Eskdikejidojdk978Ad8jf"``.
+    See :ref:`content-security-policy`.
+
 .. php:function:: csrf_token ()
 
     :returns: The name of the current CSRF token.
diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
index 2cd619dbd390..af847fd0760b 100644
--- a/user_guide_src/source/outgoing/response.rst
+++ b/user_guide_src/source/outgoing/response.rst
@@ -133,6 +133,8 @@ to the ``Cache-Control`` header. You are free to set all of the options exactly
 situation. While most of the options are applied to the ``Cache-Control`` header, it intelligently handles
 the ``etag`` and ``last-modified`` options to their appropriate header.
 
+.. _content-security-policy:
+
 Content Security Policy
 =======================
 
@@ -249,6 +251,27 @@ life, and is most secure when generated on the fly. To make this simple, you can
         . . .
     </style>
 
+.. warning:: If an attacker injects string like ``<script {csp-script-nonce}>``, it might become the real nonce attribute with this functionality. You can customize the placeholder string with the ``$scriptNonceTag`` and ``$styleNonceTag`` properties in **app/Config/ContentSecurityPolicy.php**.
+
+If you don't like this auto replacement functionality, you can turn it off with setting ``$autoNonce = false`` in **app/Config/ContentSecurityPolicy.php**.
+
+In this case, you can use the functions, ``csp_script_nonce()`` and ``csp_style_nonce()``::
+
+    // Original
+    <script <?= csp_script_nonce() ?>>
+        console.log("Script won't run as it doesn't contain a nonce attribute");
+    </script>
+
+    // Becomes
+    <script nonce="Eskdikejidojdk978Ad8jf">
+        console.log("Script won't run as it doesn't contain a nonce attribute");
+    </script>
+
+    // OR
+    <style <?= csp_style_nonce() ?>>
+        . . .
+    </style>
+
 Class Reference
 ===============
 
diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index e182ce789b35..9aae57f1af00 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -530,6 +530,10 @@ lang               language string           Alias for the lang helper function.
 validation_errors  fieldname(optional)       Returns either error string for the field    {+ validation_errors +} , {+ validation_errors field="email" +}
                                              (if specified) or all validation errors.
 route              route name                Alias for the route_to helper function.      {+ route "login" +}
+csp_script_nonce                             Alias for the csp_script_nonce helper        {+ csp_script_nonce +}
+                                             function.
+csp_style_nonce                              Alias for the csp_style_nonce helper         {+ csp_style_nonce +}
+                                             function.
 ================== ========================= ============================================ ================================================================
 
 Registering a Plugin

From dee40c1220d0cbec29f36fd9a931d9858e4e7314 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 6 Jan 2022 12:56:23 +0900
Subject: [PATCH 1131/2325] docs: fix by proofreading

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/general/common_functions.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index 19fb3e454704..b7b7143e8f53 100755
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -222,7 +222,7 @@ Miscellaneous Functions
     :returns: The CSP nonce attribute for script tag.
     :rtype: string
 
-    Returns the nonce attribute for script tag. That is string like ``nonce="Eskdikejidojdk978Ad8jf"``.
+    Returns the nonce attribute for a script tag. For example: ``nonce="Eskdikejidojdk978Ad8jf"``.
     See :ref:`content-security-policy`.
 
 .. php:function:: csp_style_nonce ()

From ae90f8e662f0aee8b32d5e754a4531f2f3270e8e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 6 Jan 2022 12:56:33 +0900
Subject: [PATCH 1132/2325] docs: fix by proofreading

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/general/common_functions.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index b7b7143e8f53..c041e470e920 100755
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -230,7 +230,7 @@ Miscellaneous Functions
     :returns: The CSP nonce attribute for style tag.
     :rtype: string
 
-    Returns the nonce attribute for style tag. That is string like ``nonce="Eskdikejidojdk978Ad8jf"``.
+    Returns the nonce attribute for a style tag. For example: ``nonce="Eskdikejidojdk978Ad8jf"``.
     See :ref:`content-security-policy`.
 
 .. php:function:: csrf_token ()

From 161be1065518cf63a3273a0a37158218a2bceaa9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 6 Jan 2022 12:56:43 +0900
Subject: [PATCH 1133/2325] docs: fix by proofreading

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/outgoing/response.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
index af847fd0760b..b4622bd93b88 100644
--- a/user_guide_src/source/outgoing/response.rst
+++ b/user_guide_src/source/outgoing/response.rst
@@ -251,7 +251,7 @@ life, and is most secure when generated on the fly. To make this simple, you can
         . . .
     </style>
 
-.. warning:: If an attacker injects string like ``<script {csp-script-nonce}>``, it might become the real nonce attribute with this functionality. You can customize the placeholder string with the ``$scriptNonceTag`` and ``$styleNonceTag`` properties in **app/Config/ContentSecurityPolicy.php**.
+.. warning:: If an attacker injects a string like ``<script {csp-script-nonce}>``, it might become the real nonce attribute with this functionality. You can customize the placeholder string with the ``$scriptNonceTag`` and ``$styleNonceTag`` properties in **app/Config/ContentSecurityPolicy.php**.
 
 If you don't like this auto replacement functionality, you can turn it off with setting ``$autoNonce = false`` in **app/Config/ContentSecurityPolicy.php**.
 

From 1184046f671fec49c2d846988f624fc331a462f6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 6 Jan 2022 12:58:22 +0900
Subject: [PATCH 1134/2325] test: use more specific assert method

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

diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 8328de05271d..15a511926d3c 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -559,7 +559,7 @@ public function testCspStyleNonce()
         $config             = config('App');
         $config->CSPEnabled = true;
 
-        $this->assertStringContainsString('nonce="', csp_style_nonce());
+        $this->assertStringStartsWith('nonce="', csp_style_nonce());
     }
 
     public function testCspScriptNonce()
@@ -569,6 +569,6 @@ public function testCspScriptNonce()
         $config             = config('App');
         $config->CSPEnabled = true;
 
-        $this->assertStringContainsString('nonce="', csp_script_nonce());
+        $this->assertStringStartsWith('nonce="', csp_script_nonce());
     }
 }

From f686c252c1753386c50298dde0287c76dd628c8e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 6 Jan 2022 13:33:16 +0900
Subject: [PATCH 1135/2325] docs: add changelogs/v4.2.0

---
 user_guide_src/source/changelogs/index.rst  |  1 +
 user_guide_src/source/changelogs/v4.2.0.rst | 39 +++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 user_guide_src/source/changelogs/v4.2.0.rst

diff --git a/user_guide_src/source/changelogs/index.rst b/user_guide_src/source/changelogs/index.rst
index 74e782cb3508..da5ac2994d92 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.2.0
     v4.1.7
     v4.1.6
     v4.1.5
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
new file mode 100644
index 000000000000..c4722995961a
--- /dev/null
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -0,0 +1,39 @@
+Version 4.2.0
+#############
+
+Release Date: Not Released
+
+**4.2.0 release of CodeIgniter4**
+
+.. contents::
+    :local:
+    :depth: 2
+
+BREAKING
+********
+
+
+
+Enhancements
+************
+
+- Content Security Policy (CSP) enhancements
+    - Added the configs ``$scriptNonceTag`` and ``$styleNonceTag`` in  ``Config\ContentSecurityPolicy`` to customize the CSP placeholders (``{csp-script-nonce}`` and ``{csp-style-nonce}``)
+    - Added the config ``$autoNonce`` in ``Config\ContentSecurityPolicy`` to disable the CSP placeholder replacement
+    - Added the functions ``csp_script_nonce()`` and ``csp_style_nonce()`` to get nonce attributes
+    - See :ref:`content-security-policy` for details.
+
+Changes
+*******
+
+- The current version of Content Security Policy (CSP) outputs one nonce for script and one for style tags. The previous version outputted one nonce for each tag.
+
+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.

From 444da2bd39d918621ff461c17c2de7ce168287ba Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 12 Jan 2022 09:23:36 +0900
Subject: [PATCH 1136/2325] refactor: fix by rector

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

diff --git a/system/Config/Services.php b/system/Config/Services.php
index 3c36515be691..2d44e3ccfd78 100644
--- a/system/Config/Services.php
+++ b/system/Config/Services.php
@@ -166,7 +166,7 @@ public static function csp(?CSPConfig $config = null, bool $getShared = true)
             return static::getSharedInstance('csp', $config);
         }
 
-        $config = $config ?? config('ContentSecurityPolicy');
+        $config ??= config('ContentSecurityPolicy');
 
         return new ContentSecurityPolicy($config);
     }

From 8624a789000b3a31608e7636ec18a854993dcca6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 12 Jan 2022 10:53:40 +0900
Subject: [PATCH 1137/2325] docs: update version references to PHP 7.4

---
 README.md                                          | 2 +-
 admin/framework/README.md                          | 2 +-
 admin/starter/README.md                            | 2 +-
 contributing/pull_request.md                       | 2 +-
 user_guide_src/source/installation/upgrade_4xx.rst | 2 +-
 user_guide_src/source/intro/requirements.rst       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index fa5194457cbc..a8a3566e395d 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@ Please read the [*Contributing to CodeIgniter*](https://github.com/codeigniter4/
 
 ## Server Requirements
 
-PHP version 7.3 or higher is required, with the following extensions installed:
+PHP version 7.4 or higher is required, with the following extensions installed:
 
 
 - [intl](http://php.net/manual/en/intl.requirements.php)
diff --git a/admin/framework/README.md b/admin/framework/README.md
index 6b7c6673e33a..ebc758ed530e 100644
--- a/admin/framework/README.md
+++ b/admin/framework/README.md
@@ -43,7 +43,7 @@ Please read the [*Contributing to CodeIgniter*](https://github.com/codeigniter4/
 
 ## Server Requirements
 
-PHP version 7.3 or higher is required, with the following extensions installed:
+PHP version 7.4 or higher is required, with the following extensions installed:
 
 - [intl](http://php.net/manual/en/intl.requirements.php)
 - [libcurl](http://php.net/manual/en/curl.requirements.php) if you plan to use the HTTP\CURLRequest library
diff --git a/admin/starter/README.md b/admin/starter/README.md
index 363e7c89f304..2e17d9c98888 100644
--- a/admin/starter/README.md
+++ b/admin/starter/README.md
@@ -50,7 +50,7 @@ Problems with it can be raised on our forum, or as issues in the main repository
 
 ## Server Requirements
 
-PHP version 7.3 or higher is required, with the following extensions installed:
+PHP version 7.4 or higher is required, with the following extensions installed:
 
 - [intl](http://php.net/manual/en/intl.requirements.php)
 - [libcurl](http://php.net/manual/en/curl.requirements.php) if you plan to use the HTTP\CURLRequest library
diff --git a/contributing/pull_request.md b/contributing/pull_request.md
index e788b76fede3..51f976232987 100644
--- a/contributing/pull_request.md
+++ b/contributing/pull_request.md
@@ -119,7 +119,7 @@ See [Contribution CSS](./css.md).
 
 ### Compatibility
 
-CodeIgniter4 requires [PHP 7.3](https://php.net/releases/7_3_0.php).
+CodeIgniter4 requires [PHP 7.4](https://php.net/releases/7_4_0.php).
 
 ### Backwards Compatibility
 
diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst
index d4f219d4d7a3..face3339341b 100644
--- a/user_guide_src/source/installation/upgrade_4xx.rst
+++ b/user_guide_src/source/installation/upgrade_4xx.rst
@@ -35,7 +35,7 @@ General Adjustments
 
 **Namespaces**
 
-- CI4 is built for PHP7.3+, and everything in the framework is namespaced, except for the helpers.
+- CI4 is built for PHP 7.4+, and everything in the framework is namespaced, except for the helpers.
 
 **Application Structure**
 
diff --git a/user_guide_src/source/intro/requirements.rst b/user_guide_src/source/intro/requirements.rst
index 88516f7de355..2a3d41ded92c 100644
--- a/user_guide_src/source/intro/requirements.rst
+++ b/user_guide_src/source/intro/requirements.rst
@@ -2,7 +2,7 @@
 Server Requirements
 ###################
 
-`PHP <https://www.php.net/>`_ version 7.3 or newer is required, with the
+`PHP <https://www.php.net/>`_ version 7.4 or newer is required, with the
 `*intl* extension <https://www.php.net/manual/en/intl.requirements.php>`_ and `*mbstring* extension <https://www.php.net/manual/en/mbstring.requirements.php>`_
 installed.
 

From a2234d31e640d64c1cf2eee95d1519756424195a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 12 Jan 2022 10:55:12 +0900
Subject: [PATCH 1138/2325] chore: update version references to PHP 7.4

---
 Vagrantfile.dist                            | 6 +++---
 admin/module/composer.json                  | 2 +-
 admin/starter/.github/workflows/phpunit.yml | 2 +-
 admin/userguide/composer.json               | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Vagrantfile.dist b/Vagrantfile.dist
index 857f92314a40..e85393ff8588 100644
--- a/Vagrantfile.dist
+++ b/Vagrantfile.dist
@@ -50,7 +50,7 @@ Vagrant.configure("2") do |config|
     PGSQL_ROOT_PASS="password"
     VIRTUALHOST="localhost"
     CODEIGNITER_PATH="/var/www/codeigniter"
-    PHP_VERSION=7.3
+    PHP_VERSION=7.4
     PGSQL_VERSION=10
     #APT_PROXY="192.168.10.1:3142"
 
@@ -166,8 +166,8 @@ Vagrant.configure("2") do |config|
     sed -i "s/APACHE_RUN_USER=www-data/APACHE_RUN_USER=vagrant/" /etc/apache2/envvars
     sed -i "s/APACHE_RUN_GROUP=www-data/APACHE_RUN_GROUP=vagrant/" /etc/apache2/envvars
     grep -q "Listen 81" /etc/apache2/ports.conf || sed -i "s/^Listen 80/Listen 80\\nListen 81\\nListen 82/" /etc/apache2/ports.conf
-    sed -i "s/^display_errors = Off/display_errors = On/" /etc/php/7.3/apache2/php.ini
-    sed -i "s/^display_startup_errors = Off/display_startup_errors = On/" /etc/php/7.3/apache2/php.ini
+    sed -i "s/^display_errors = Off/display_errors = On/" /etc/php/7.4/apache2/php.ini
+    sed -i "s/^display_startup_errors = Off/display_startup_errors = On/" /etc/php/7.4/apache2/php.ini
 
     echo "ServerName ${VIRTUALHOST}
 <Directory ${CODEIGNITER_PATH}>
diff --git a/admin/module/composer.json b/admin/module/composer.json
index 70197a43010c..172533e9e5f2 100644
--- a/admin/module/composer.json
+++ b/admin/module/composer.json
@@ -4,7 +4,7 @@
     "homepage": "https://codeigniter.com",
     "license": "MIT",
     "require": {
-        "php": "^7.3 || ^8.0"
+        "php": "^7.4 || ^8.0"
     },
     "require-dev": {
         "codeigniter4/codeigniter4": "dev-develop",
diff --git a/admin/starter/.github/workflows/phpunit.yml b/admin/starter/.github/workflows/phpunit.yml
index 5e37bd91e504..73d413cad92f 100644
--- a/admin/starter/.github/workflows/phpunit.yml
+++ b/admin/starter/.github/workflows/phpunit.yml
@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        php-versions: ['7.3', '7.4']
+        php-versions: ['7.4', '8.0']
 
     runs-on: ubuntu-latest
 
diff --git a/admin/userguide/composer.json b/admin/userguide/composer.json
index a8fc259202fd..61428fa50ff1 100644
--- a/admin/userguide/composer.json
+++ b/admin/userguide/composer.json
@@ -5,7 +5,7 @@
     "homepage": "https://codeigniter.com",
     "license": "MIT",
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "codeigniter4/framework": "^4"
     },
     "support": {

From 9f561030f75afe58a84979799764a09b0ed144c0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 11 Jan 2022 16:36:06 +0900
Subject: [PATCH 1139/2325] fix: throws Exception when getCompiled*() in the
 Model called

---
 system/Exceptions/ModelException.php          |  5 ++
 system/Language/en/Database.php               |  1 +
 system/Model.php                              | 20 ++++++
 .../_support/Models/GetCompiledModelTest.php  | 72 +++++++++++++++++++
 4 files changed, 98 insertions(+)
 create mode 100644 tests/_support/Models/GetCompiledModelTest.php

diff --git a/system/Exceptions/ModelException.php b/system/Exceptions/ModelException.php
index 7ef6f7a808b9..3bdc283649ed 100644
--- a/system/Exceptions/ModelException.php
+++ b/system/Exceptions/ModelException.php
@@ -25,4 +25,9 @@ public static function forNoDateFormat(string $modelName)
     {
         return new static(lang('Database.noDateFormat', [$modelName]));
     }
+
+    public static function forMethodNotAvailable(string $modelName, string $methodName)
+    {
+        return new static(lang('Database.methodNotAvailable', [$modelName, $methodName]));
+    }
 }
diff --git a/system/Language/en/Database.php b/system/Language/en/Database.php
index f57f7dc598cc..eaa3be67b3cf 100644
--- a/system/Language/en/Database.php
+++ b/system/Language/en/Database.php
@@ -27,4 +27,5 @@
     'fieldNotExists'                   => 'Field `{0}` not found.',
     'forEmptyInputGiven'               => 'Empty statement is given for the field `{0}`',
     'forFindColumnHaveMultipleColumns' => 'Only single column allowed in Column name.',
+    'methodNotAvailable'               => 'You cannot use `{1}` in `{0}`. The CodeIgniter\Model is not the Query Builder.',
 ];
diff --git a/system/Model.php b/system/Model.php
index d092b2e48d3e..591a2d53c339 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -89,6 +89,17 @@ class Model extends BaseModel
      */
     protected $escape = [];
 
+    /**
+     * Builder method names that are not used in the Model.
+     *
+     * @var string[] method name
+     */
+    private array $builderMethodsNotAvailable = [
+        'getCompiledInsert',
+        'getCompiledSelect',
+        'getCompiledUpdate',
+    ];
+
     public function __construct(?ConnectionInterface &$db = null, ?ValidationInterface $validation = null)
     {
         /**
@@ -725,6 +736,8 @@ public function __call(string $name, array $params)
         if (method_exists($this->db, $name)) {
             $result = $this->db->{$name}(...$params);
         } elseif (method_exists($builder, $name)) {
+            $this->checkBuilderMethod($name);
+
             $result = $builder->{$name}(...$params);
         } else {
             throw new BadMethodCallException('Call to undefined method ' . static::class . '::' . $name);
@@ -737,6 +750,13 @@ public function __call(string $name, array $params)
         return $result;
     }
 
+    private function checkBuilderMethod(string $name): void
+    {
+        if (in_array($name, $this->builderMethodsNotAvailable, true)) {
+            throw ModelException::forMethodNotAvailable(static::class, $name . '()');
+        }
+    }
+
     /**
      * Takes a class an returns an array of it's public and protected
      * properties as an array suitable for use in creates and updates.
diff --git a/tests/_support/Models/GetCompiledModelTest.php b/tests/_support/Models/GetCompiledModelTest.php
new file mode 100644
index 000000000000..ce034d56363c
--- /dev/null
+++ b/tests/_support/Models/GetCompiledModelTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Models;
+
+use CodeIgniter\Exceptions\ModelException;
+use CodeIgniter\Model;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\Mock\MockConnection;
+use Tests\Support\Models\UserObjModel;
+
+/**
+ * @internal
+ */
+final class GetCompiledModelTest extends CIUnitTestCase
+{
+    /**
+     * @var Model
+     */
+    private $model;
+
+    /**
+     * Create an instance of Model for use in testing.
+     */
+    private function createModel(string $modelName): Model
+    {
+        $db          = new MockConnection([]);
+        $this->model = new $modelName($db);
+
+        return $this->model;
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5549
+     */
+    public function testGetCompiledInsert(): void
+    {
+        $this->expectException(ModelException::class);
+        $this->expectExceptionMessage('You cannot use `getCompiledInsert()` in `Tests\Support\Models\UserObjModel`.');
+
+        $this->createModel(UserObjModel::class);
+
+        $sql = $this->model
+            ->set('name', 'Mark')
+            ->set('email', 'mark@example.com')
+            ->getCompiledInsert();
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5549
+     */
+    public function testGetCompiledUpdate(): void
+    {
+        $this->expectException(ModelException::class);
+        $this->expectExceptionMessage('You cannot use `getCompiledUpdate()` in `Tests\Support\Models\UserObjModel`.');
+
+        $this->createModel(UserObjModel::class);
+
+        $sql = $this->model
+            ->set('name', 'Mark')
+            ->set('email', 'mark@example.com')
+            ->getCompiledUpdate();
+    }
+}

From 3a1772affb2f006235acc6e57450119886c46d9f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 12 Jan 2022 13:47:26 +0900
Subject: [PATCH 1140/2325] docs: add/fix doc comments

---
 system/Model.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/system/Model.php b/system/Model.php
index 591a2d53c339..c95c6671c02d 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -90,7 +90,7 @@ class Model extends BaseModel
     protected $escape = [];
 
     /**
-     * Builder method names that are not used in the Model.
+     * Builder method names that should not be used in the Model.
      *
      * @var string[] method name
      */
@@ -750,6 +750,9 @@ public function __call(string $name, array $params)
         return $result;
     }
 
+    /**
+     * Checks the Builder method name that should not be used in the Model.
+     */
     private function checkBuilderMethod(string $name): void
     {
         if (in_array($name, $this->builderMethodsNotAvailable, true)) {

From b68089d4a979f0b420f5b35ed98acf0b4e058bc4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 12 Jan 2022 13:55:07 +0900
Subject: [PATCH 1141/2325] test: refactor
 MiscellaneousModelTest::testCanCreateAndSaveEntityClasses()

The following code is not good usage of the Model:
$this->model->where('name', 'Senior Developer')->get()->getFirstRow();
---
 tests/system/Models/MiscellaneousModelTest.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/system/Models/MiscellaneousModelTest.php b/tests/system/Models/MiscellaneousModelTest.php
index c513c023ab2c..1c4af20a87f0 100644
--- a/tests/system/Models/MiscellaneousModelTest.php
+++ b/tests/system/Models/MiscellaneousModelTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Models;
 
 use CodeIgniter\Database\Exceptions\DataException;
+use CodeIgniter\I18n\Time;
 use InvalidArgumentException;
 use Tests\Support\Models\EntityModel;
 use Tests\Support\Models\JobModel;
@@ -50,8 +51,11 @@ public function testCanCreateAndSaveEntityClasses(): void
 
         $this->assertTrue($this->model->save($entity));
 
-        $result = $this->model->where('name', 'Senior Developer')->get()->getFirstRow();
-        $this->assertSame(date('Y-m-d', $time), date('Y-m-d', $result->created_at));
+        $result = $this->model->where('name', 'Senior Developer')->first();
+        $this->assertSame(
+            Time::createFromTimestamp($time)->toDateTimeString(),
+            $result->created_at->toDateTimeString()
+        );
     }
 
     /**

From db9898c7912aefc5f1d17c9b35742114b276bbd1 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Tue, 28 Dec 2021 14:40:59 +0800
Subject: [PATCH 1142/2325] Feature: Subqueries in the FROM section

---
 system/Database/BaseBuilder.php               | 56 ++++++++++++++-----
 system/Database/BaseConnection.php            |  2 +-
 system/Database/SQLSRV/Builder.php            |  2 +-
 tests/system/Database/Builder/FromTest.php    | 48 ++++++++++++++++
 .../source/database/query_builder.rst         | 22 +++++++-
 5 files changed, 112 insertions(+), 18 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 2a431accd2f5..66fb9d0012db 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -264,7 +264,7 @@ class BaseBuilder
     /**
      * Constructor
      *
-     * @param array|string $tableName tablename or tablenames with or without aliases
+     * @param array|BaseBuilder|Closure|string $tableName tablename or tablenames with or without aliases
      *
      * Examples of $tableName: `mytable`, `jobs j`, `jobs j, users u`, `['jobs j','users u']`
      *
@@ -515,7 +515,7 @@ public function distinct(bool $val = true)
     /**
      * Generates the FROM portion of the query
      *
-     * @param array|string $from
+     * @param array|BaseBuilder|Closure|string $from
      *
      * @return $this
      */
@@ -526,22 +526,40 @@ public function from($from, bool $overwrite = false)
             $this->db->setAliasedTables([]);
         }
 
+        $tableProcessing = function (string $table, bool $protectIdentifiers = true): void {
+            $table = trim($table);
+            $this->trackAliases($table);
+
+            $this->QBFrom[] = $protectIdentifiers
+                ? $this->db->protectIdentifiers($table, true, null, false)
+                : $table;
+        };
+
+        if (is_array($from) && count($from) === 2 || $this->isSubquery($from)) {
+            [$table, $alias] = is_array($from) ? $from : [$from, ''];
+            if ($this->isSubquery($table)) {
+                if ($this->QBFrom !== [] && $alias === '') {
+                    throw new DatabaseException('Subquery must have an alias');
+                }
+
+                $table = $this->buildSubquery($table, true, $alias);
+                $tableProcessing($table, false);
+
+                return $this;
+            }
+        }
+
         foreach ((array) $from as $val) {
+            if (! is_string($val)) {
+                throw new DatabaseException('Table name must be string or instance of the BaseBuilder');
+            }
+
             if (strpos($val, ',') !== false) {
                 foreach (explode(',', $val) as $v) {
-                    $v = trim($v);
-                    $this->trackAliases($v);
-
-                    $this->QBFrom[] = $this->db->protectIdentifiers($v, true, null, false);
+                    $tableProcessing($v);
                 }
             } else {
-                $val = trim($val);
-
-                // Extract any aliases that might exist. We use this information
-                // in the protectIdentifiers to know whether to add a table prefix
-                $this->trackAliases($val);
-
-                $this->QBFrom[] = $this->db->protectIdentifiers($val, true, null, false);
+                $tableProcessing($val);
             }
         }
 
@@ -2744,7 +2762,7 @@ protected function isSubquery($value): bool
      * @param BaseBuilder|Closure $builder
      * @param bool                $wrapped Wrap the subquery in brackets
      */
-    protected function buildSubquery($builder, bool $wrapped = false): string
+    protected function buildSubquery($builder, bool $wrapped = false, string $alias = ''): string
     {
         if ($builder instanceof Closure) {
             $instance = (clone $this)->from([], true)->resetQuery();
@@ -2753,6 +2771,14 @@ protected function buildSubquery($builder, bool $wrapped = false): string
 
         $subquery = strtr($builder->getCompiledSelect(), "\n", ' ');
 
-        return $wrapped ? '(' . $subquery . ')' : $subquery;
+        if ($wrapped) {
+            $subquery = '(' . $subquery . ')';
+
+            if ($alias !== '') {
+                $subquery .= " AS {$alias}";
+            }
+        }
+
+        return $subquery;
     }
 }
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 53e5dad1b351..115e099dd302 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -837,7 +837,7 @@ abstract protected function _transRollback(): bool;
     /**
      * Returns a non-shared new instance of the query builder for this connection.
      *
-     * @param array|string $tableName
+     * @param array|BaseBuilder|Closure|string $tableName
      *
      * @throws DatabaseException
      *
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index 9b5e9ea88a01..55da29b7bf85 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -68,7 +68,7 @@ protected function _fromTables(): string
         $from = [];
 
         foreach ($this->QBFrom as $value) {
-            $from[] = $this->getFullName($value);
+            $from[] = strpos($value, '(SELECT') === 0 ? $value : $this->getFullName($value);
         }
 
         return implode(', ', $from);
diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php
index b7c62a2c748c..3c24ba5d7881 100644
--- a/tests/system/Database/Builder/FromTest.php
+++ b/tests/system/Database/Builder/FromTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
+use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\SQLSRV\Builder as SQLSRVBuilder;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
@@ -101,6 +102,38 @@ public function testFromReset()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
+    public function testFromSubquery()
+    {
+        // Subquery as table
+        $expectedSQL = 'SELECT * FROM (SELECT * FROM "users")';
+        $subquery    = new BaseBuilder('users', $this->db);
+        $builder     = new BaseBuilder($subquery, $this->db);
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+
+        // Subquery with alias
+        $expectedSQL = 'SELECT * FROM (SELECT "id", "name" FROM "users") AS users_1';
+
+        $subquery = (new BaseBuilder('users', $this->db))->select('id, name');
+        $builder  = new BaseBuilder([$subquery, 'users_1'], $this->db);
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
+
+    public function testFromSubqueryExceptions()
+    {
+        $this->expectException(DatabaseException::class);
+        $this->expectExceptionMessage('Table name must be string or instance of the BaseBuilder');
+        $subquery = new BaseBuilder('users', $this->db);
+        $builder  = new BaseBuilder([$subquery], $this->db);
+
+        $this->expectException(DatabaseException::class);
+        $this->expectExceptionMessage('Subquery must have an alias');
+        $subquery = new BaseBuilder('users', $this->db);
+        $builder  = new BaseBuilder('jobs', $this->db);
+        $builder->from($subquery);
+    }
+
     public function testFromWithMultipleTablesAsStringWithSQLSRV()
     {
         $this->db = new MockConnection(['DBDriver' => 'SQLSRV', 'database' => 'test', 'schema' => 'dbo']);
@@ -113,4 +146,19 @@ public function testFromWithMultipleTablesAsStringWithSQLSRV()
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
+
+    public function testFromSubqueryWithSQLSRV()
+    {
+        $this->db = new MockConnection(['DBDriver' => 'SQLSRV', 'database' => 'test', 'schema' => 'dbo']);
+
+        $subquery = new SQLSRVBuilder('users', $this->db);
+
+        $builder = new SQLSRVBuilder('jobs', $this->db);
+
+        $builder->from([$subquery, 'users_1']);
+
+        $expectedSQL = 'SELECT * FROM "test"."dbo"."jobs", (SELECT * FROM "test"."dbo"."users") AS users_1';
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 }
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 2c85a58e63e6..04821f25b035 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -210,6 +210,26 @@ Permits you to write the FROM portion of your query::
     in the ``$db->table()`` function. Additional calls to ``from()`` will add more tables
     to the FROM portion of your query.
 
+#. **Subqueries:**
+
+In special cases, you can compose a database query using subqueries::
+
+    $subquery = $db->table('users);
+    $builder  = $db->table($subquery);
+    $query = $builder->get();
+
+    // Produces: SELECT * FROM (SELECT * FROM users)
+
+You can specify an alias for a subquery by passing an array the first value of which will be the subquery, and the second an alias.::
+
+    $subquery = $db->table('users)->select('id, name');
+    $builder  = $db->table([$subquery, 't']);
+    $query = $builder->get();
+
+    // Produces: SELECT * FROM (SELECT `id`, `name` FROM users) AS t
+
+.. note:: Only one subquery can be passed to a method.
+
 **$builder->join()**
 
 Permits you to write the JOIN portion of your query::
@@ -1394,7 +1414,7 @@ Class Reference
 
     .. php:method:: from($from[, $overwrite = false])
 
-        :param mixed $from: Table name(s); string or array
+        :param mixed $from: Table name(s); string, array or BaseBuilder
         :param bool    $overwrite: Should we remove the first table existing?
         :returns:   ``BaseBuilder`` instance (method chaining)
         :rtype:     ``BaseBuilder``

From 5b224583f6742f2e5163d0b197b729c3889e8c40 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Wed, 29 Dec 2021 14:07:28 +0800
Subject: [PATCH 1143/2325] fix documentation fix method docblock

---
 system/Database/BaseBuilder.php                  | 1 +
 user_guide_src/source/database/query_builder.rst | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 66fb9d0012db..f8691c5cbcdf 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -2761,6 +2761,7 @@ protected function isSubquery($value): bool
     /**
      * @param BaseBuilder|Closure $builder
      * @param bool                $wrapped Wrap the subquery in brackets
+     * @param string              $alias   Subquery alias
      */
     protected function buildSubquery($builder, bool $wrapped = false, string $alias = ''): string
     {
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 04821f25b035..a2c2da74d06b 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -214,7 +214,7 @@ Permits you to write the FROM portion of your query::
 
 In special cases, you can compose a database query using subqueries::
 
-    $subquery = $db->table('users);
+    $subquery = $db->table('users');
     $builder  = $db->table($subquery);
     $query = $builder->get();
 
@@ -222,7 +222,7 @@ In special cases, you can compose a database query using subqueries::
 
 You can specify an alias for a subquery by passing an array the first value of which will be the subquery, and the second an alias.::
 
-    $subquery = $db->table('users)->select('id, name');
+    $subquery = $db->table('users')->select('id, name');
     $builder  = $db->table([$subquery, 't']);
     $query = $builder->get();
 

From db619f39d182153ca41d07b8df43d5c44974018e Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Sat, 1 Jan 2022 07:43:51 +0800
Subject: [PATCH 1144/2325] Reworked implementation

---
 system/Database/BaseBuilder.php               | 62 ++++++++-----------
 system/Database/BaseConnection.php            | 10 ++-
 tests/system/Database/Builder/FromTest.php    | 21 +------
 .../source/database/query_builder.rst         | 25 +++++---
 4 files changed, 55 insertions(+), 63 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index f8691c5cbcdf..6305178f330b 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -264,7 +264,7 @@ class BaseBuilder
     /**
      * Constructor
      *
-     * @param array|BaseBuilder|Closure|string $tableName tablename or tablenames with or without aliases
+     * @param array|string $tableName tablename or tablenames with or without aliases
      *
      * Examples of $tableName: `mytable`, `jobs j`, `jobs j, users u`, `['jobs j','users u']`
      *
@@ -515,53 +515,42 @@ public function distinct(bool $val = true)
     /**
      * Generates the FROM portion of the query
      *
-     * @param array|BaseBuilder|Closure|string $from
+     * @param array|string $from
      *
      * @return $this
      */
-    public function from($from, bool $overwrite = false)
+    public function from($from, bool $overwrite = false): self
     {
         if ($overwrite === true) {
             $this->QBFrom = [];
             $this->db->setAliasedTables([]);
         }
 
-        $tableProcessing = function (string $table, bool $protectIdentifiers = true): void {
-            $table = trim($table);
-            $this->trackAliases($table);
-
-            $this->QBFrom[] = $protectIdentifiers
-                ? $this->db->protectIdentifiers($table, true, null, false)
-                : $table;
-        };
-
-        if (is_array($from) && count($from) === 2 || $this->isSubquery($from)) {
-            [$table, $alias] = is_array($from) ? $from : [$from, ''];
-            if ($this->isSubquery($table)) {
-                if ($this->QBFrom !== [] && $alias === '') {
-                    throw new DatabaseException('Subquery must have an alias');
-                }
-
-                $table = $this->buildSubquery($table, true, $alias);
-                $tableProcessing($table, false);
-
-                return $this;
+        foreach ((array) $from as $table) {
+            if (strpos($table, ',') !== false) {
+                $this->from(explode(',', $table));
+            } else {
+                $table = trim($table);
+                $this->trackAliases($table);
+                $this->QBFrom[] = $this->db->protectIdentifiers($table, true, null, false);
             }
         }
 
-        foreach ((array) $from as $val) {
-            if (! is_string($val)) {
-                throw new DatabaseException('Table name must be string or instance of the BaseBuilder');
-            }
+        return $this;
+    }
 
-            if (strpos($val, ',') !== false) {
-                foreach (explode(',', $val) as $v) {
-                    $tableProcessing($v);
-                }
-            } else {
-                $tableProcessing($val);
-            }
-        }
+    /**
+     * @param BaseBuilder $from  Expected subquery
+     * @param string      $alias Subquery alias
+     *
+     * @return $this
+     */
+    public function fromSubquery(BaseBuilder $from, string $alias): self
+    {
+        $table = $this->buildSubquery($from, true, $alias);
+
+        $this->trackAliases($table);
+        $this->QBFrom[] = $table;
 
         return $this;
     }
@@ -2766,8 +2755,7 @@ protected function isSubquery($value): bool
     protected function buildSubquery($builder, bool $wrapped = false, string $alias = ''): string
     {
         if ($builder instanceof Closure) {
-            $instance = (clone $this)->from([], true)->resetQuery();
-            $builder  = $builder($instance);
+            $builder($builder = $this->db->newQuery());
         }
 
         $subquery = strtr($builder->getCompiledSelect(), "\n", ' ');
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 115e099dd302..196d525b8805 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -837,7 +837,7 @@ abstract protected function _transRollback(): bool;
     /**
      * Returns a non-shared new instance of the query builder for this connection.
      *
-     * @param array|BaseBuilder|Closure|string $tableName
+     * @param array|string $tableName
      *
      * @throws DatabaseException
      *
@@ -854,6 +854,14 @@ public function table($tableName)
         return new $className($tableName, $this);
     }
 
+    /**
+     * Returns a new instance of the BaseBuilder class without a table.
+     */
+    public function newQuery(): BaseBuilder
+    {
+        return $this->table('crunch')->from([], true);
+    }
+
     /**
      * Creates a prepared statement with the database that can then
      * be used to execute multiple statements against. Within the
diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php
index 3c24ba5d7881..8c243f04b151 100644
--- a/tests/system/Database/Builder/FromTest.php
+++ b/tests/system/Database/Builder/FromTest.php
@@ -12,7 +12,6 @@
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
-use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\SQLSRV\Builder as SQLSRVBuilder;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
@@ -107,7 +106,7 @@ public function testFromSubquery()
         // Subquery as table
         $expectedSQL = 'SELECT * FROM (SELECT * FROM "users")';
         $subquery    = new BaseBuilder('users', $this->db);
-        $builder     = new BaseBuilder($subquery, $this->db);
+        $builder     = $this->db->newQuery()->fromSubquery($subquery);
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
@@ -115,25 +114,11 @@ public function testFromSubquery()
         $expectedSQL = 'SELECT * FROM (SELECT "id", "name" FROM "users") AS users_1';
 
         $subquery = (new BaseBuilder('users', $this->db))->select('id, name');
-        $builder  = new BaseBuilder([$subquery, 'users_1'], $this->db);
+        $builder  = $this->db->newQuery()->fromSubquery($subquery, 'users_1');
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
-    public function testFromSubqueryExceptions()
-    {
-        $this->expectException(DatabaseException::class);
-        $this->expectExceptionMessage('Table name must be string or instance of the BaseBuilder');
-        $subquery = new BaseBuilder('users', $this->db);
-        $builder  = new BaseBuilder([$subquery], $this->db);
-
-        $this->expectException(DatabaseException::class);
-        $this->expectExceptionMessage('Subquery must have an alias');
-        $subquery = new BaseBuilder('users', $this->db);
-        $builder  = new BaseBuilder('jobs', $this->db);
-        $builder->from($subquery);
-    }
-
     public function testFromWithMultipleTablesAsStringWithSQLSRV()
     {
         $this->db = new MockConnection(['DBDriver' => 'SQLSRV', 'database' => 'test', 'schema' => 'dbo']);
@@ -155,7 +140,7 @@ public function testFromSubqueryWithSQLSRV()
 
         $builder = new SQLSRVBuilder('jobs', $this->db);
 
-        $builder->from([$subquery, 'users_1']);
+        $builder->fromSubquery($subquery, 'users_1');
 
         $expectedSQL = 'SELECT * FROM "test"."dbo"."jobs", (SELECT * FROM "test"."dbo"."users") AS users_1';
 
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index a2c2da74d06b..aaefbe9d4630 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -210,20 +210,22 @@ Permits you to write the FROM portion of your query::
     in the ``$db->table()`` function. Additional calls to ``from()`` will add more tables
     to the FROM portion of your query.
 
-#. **Subqueries:**
+**$builder->fromSubquery()**
+
+Permits you to write part of a FROM query as a subquery.
 
-In special cases, you can compose a database query using subqueries::
+This is where we add a subquery to an existing table.::
 
     $subquery = $db->table('users');
-    $builder  = $db->table($subquery);
+    $builder  = $db->table('jobs')->fromSubquery($subquery, 'alias');
     $query = $builder->get();
 
-    // Produces: SELECT * FROM (SELECT * FROM users)
+    // Produces: SELECT * FROM `jobs`, (SELECT * FROM `users`) AS alias
 
-You can specify an alias for a subquery by passing an array the first value of which will be the subquery, and the second an alias.::
+Use the ``$db->newQuery()`` method to make a subquery the main table.::
 
     $subquery = $db->table('users')->select('id, name');
-    $builder  = $db->table([$subquery, 't']);
+    $builder  = $db->newQuery()->fromSubquery($subquery, 't');
     $query = $builder->get();
 
     // Produces: SELECT * FROM (SELECT `id`, `name` FROM users) AS t
@@ -1414,13 +1416,22 @@ Class Reference
 
     .. php:method:: from($from[, $overwrite = false])
 
-        :param mixed $from: Table name(s); string, array or BaseBuilder
+        :param mixed $from: Table name(s); string or array
         :param bool    $overwrite: Should we remove the first table existing?
         :returns:   ``BaseBuilder`` instance (method chaining)
         :rtype:     ``BaseBuilder``
 
         Specifies the ``FROM`` clause of a query.
 
+    .. php:method:: fromSubquery($from, $alias)
+
+        :param BaseBuilder $from: Instance of the BaseBuilder class
+        :param string      $alias: Subquery alias
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
+
+        Specifies the ``FROM`` clause of a query using a subquery.
+
     .. php:method:: join($table, $cond[, $type = ''[, $escape = null]])
 
         :param string $table: Table name to join

From bc3b0b477e2a6f37e9d3124b77ed78a940c1ce57 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Sat, 1 Jan 2022 08:05:02 +0800
Subject: [PATCH 1145/2325] fix tests

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

diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php
index 8c243f04b151..9307eb158807 100644
--- a/tests/system/Database/Builder/FromTest.php
+++ b/tests/system/Database/Builder/FromTest.php
@@ -104,9 +104,9 @@ public function testFromReset()
     public function testFromSubquery()
     {
         // Subquery as table
-        $expectedSQL = 'SELECT * FROM (SELECT * FROM "users")';
+        $expectedSQL = 'SELECT * FROM (SELECT * FROM "users") AS alias';
         $subquery    = new BaseBuilder('users', $this->db);
-        $builder     = $this->db->newQuery()->fromSubquery($subquery);
+        $builder     = $this->db->newQuery()->fromSubquery($subquery, 'alias');
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 

From acb32ea6879737ecaa552314378d8e72719653c4 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Sat, 1 Jan 2022 14:43:07 +0800
Subject: [PATCH 1146/2325] Unique fake table name. Added test

---
 system/Database/BaseConnection.php         | 4 ++--
 tests/system/Database/Builder/FromTest.php | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 196d525b8805..03643f04f6e6 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -855,11 +855,11 @@ public function table($tableName)
     }
 
     /**
-     * Returns a new instance of the BaseBuilder class without a table.
+     * Returns a new instance of the BaseBuilder class with a cleared FROM clause.
      */
     public function newQuery(): BaseBuilder
     {
-        return $this->table('crunch')->from([], true);
+        return $this->table(uniqid())->from([], true);
     }
 
     /**
diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php
index 9307eb158807..613d1aae6e52 100644
--- a/tests/system/Database/Builder/FromTest.php
+++ b/tests/system/Database/Builder/FromTest.php
@@ -103,20 +103,24 @@ public function testFromReset()
 
     public function testFromSubquery()
     {
-        // Subquery as table
         $expectedSQL = 'SELECT * FROM (SELECT * FROM "users") AS alias';
         $subquery    = new BaseBuilder('users', $this->db);
         $builder     = $this->db->newQuery()->fromSubquery($subquery, 'alias');
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
-        // Subquery with alias
         $expectedSQL = 'SELECT * FROM (SELECT "id", "name" FROM "users") AS users_1';
 
         $subquery = (new BaseBuilder('users', $this->db))->select('id, name');
         $builder  = $this->db->newQuery()->fromSubquery($subquery, 'users_1');
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+
+        $expectedSQL = 'SELECT * FROM (SELECT * FROM "users") AS alias, "some_table"';
+        $subquery    = new BaseBuilder('users', $this->db);
+        $builder     = $this->db->newQuery()->fromSubquery($subquery, 'alias')->from('some_table');
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
     public function testFromWithMultipleTablesAsStringWithSQLSRV()

From 6dd649dffb7b545bfd7de9e8eb4d2afe634d13f0 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Sun, 2 Jan 2022 10:19:05 +0800
Subject: [PATCH 1147/2325] Update tests/system/Database/Builder/FromTest.php

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 tests/system/Database/Builder/FromTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php
index 613d1aae6e52..380e579b84c9 100644
--- a/tests/system/Database/Builder/FromTest.php
+++ b/tests/system/Database/Builder/FromTest.php
@@ -110,7 +110,6 @@ public function testFromSubquery()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
         $expectedSQL = 'SELECT * FROM (SELECT "id", "name" FROM "users") AS users_1';
-
         $subquery = (new BaseBuilder('users', $this->db))->select('id, name');
         $builder  = $this->db->newQuery()->fromSubquery($subquery, 'users_1');
 

From 1ff5d331b523983e1e0eb307259461e0dce67fbd Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Sun, 2 Jan 2022 10:59:56 +0800
Subject: [PATCH 1148/2325] fix cs

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

diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php
index 380e579b84c9..fee171e9ca42 100644
--- a/tests/system/Database/Builder/FromTest.php
+++ b/tests/system/Database/Builder/FromTest.php
@@ -110,8 +110,8 @@ public function testFromSubquery()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
         $expectedSQL = 'SELECT * FROM (SELECT "id", "name" FROM "users") AS users_1';
-        $subquery = (new BaseBuilder('users', $this->db))->select('id, name');
-        $builder  = $this->db->newQuery()->fromSubquery($subquery, 'users_1');
+        $subquery    = (new BaseBuilder('users', $this->db))->select('id, name');
+        $builder     = $this->db->newQuery()->fromSubquery($subquery, 'users_1');
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 

From 013e3743c6151b52cfd04acf91f5de6c449e19a5 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Wed, 12 Jan 2022 17:26:19 +0800
Subject: [PATCH 1149/2325] BaseConnection::newQuery: replaced the name of the
 temporary table BaseBuilder::from: skip empty table name

---
 system/Database/BaseBuilder.php    | 5 +++++
 system/Database/BaseConnection.php | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 6305178f330b..8bbaf764dcf1 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -531,6 +531,11 @@ public function from($from, bool $overwrite = false): self
                 $this->from(explode(',', $table));
             } else {
                 $table = trim($table);
+
+                if ($table === '') {
+                    continue;
+                }
+
                 $this->trackAliases($table);
                 $this->QBFrom[] = $this->db->protectIdentifiers($table, true, null, false);
             }
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 03643f04f6e6..c3761322aa84 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -859,7 +859,7 @@ public function table($tableName)
      */
     public function newQuery(): BaseBuilder
     {
-        return $this->table(uniqid())->from([], true);
+        return $this->table(',')->from([], true);
     }
 
     /**

From 5a845e63f953910f71998ea874a2dd95c9c9578c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 12 Jan 2022 21:27:11 +0900
Subject: [PATCH 1150/2325] test: improve slow test

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

diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 15a511926d3c..c7f4059cbdcc 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -440,6 +440,10 @@ public function testRedirectResponseCookies1()
         $this->assertTrue($answer1->hasCookie('login_time'));
     }
 
+    /**
+     * @runInSeparateProcess
+     * @preserveGlobalState disabled
+     */
     public function testTrace()
     {
         ob_start();

From 13d0e6a9d4278e93530981167ba75400f89a3edd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Dec 2021 11:38:22 +0900
Subject: [PATCH 1151/2325] test: style: change array style

---
 tests/system/Validation/ValidationTest.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index 40328f194516..dbc1c03e4b50 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -858,17 +858,21 @@ public function dotNotationForIfExistProvider(): Generator
         yield 'dot-on-middle-fail' => [
             false,
             ['fizz.*.baz' => 'if_exist|numeric'],
-            ['fizz' => [
-                'bar' => ['baz' => 'yes'],
-            ]],
+            [
+                'fizz' => [
+                    'bar' => ['baz' => 'yes'],
+                ],
+            ],
         ];
 
         yield 'dot-on-middle-pass' => [
             true,
             ['fizz.*.baz' => 'if_exist|numeric'],
-            ['fizz' => [
-                'bar' => ['baz' => 30],
-            ]],
+            [
+                'fizz' => [
+                    'bar' => ['baz' => 30],
+                ],
+            ],
         ];
 
         yield 'dot-multiple-fail' => [

From ad9462e565b2dc31774b88a715d931075e66809a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Dec 2021 11:46:36 +0900
Subject: [PATCH 1152/2325] feat: add StrictRules to Validation

---
 .../StrictRules/CreditCardRules.php           |  290 ++++
 system/Validation/StrictRules/FileRules.php   |  250 +++
 system/Validation/StrictRules/FormatRules.php |  494 ++++++
 system/Validation/StrictRules/Rules.php       |  379 +++++
 .../StrictRules/CreditCardRulesTest.php       | 1248 +++++++++++++++
 .../StrictRules/DatabaseRelatedRulesTest.php  |  222 +++
 .../Validation/StrictRules/FileRulesTest.php  |  288 ++++
 .../StrictRules/FormatRulesTest.php           | 1374 +++++++++++++++++
 .../Validation/StrictRules/RulesTest.php      |  624 ++++++++
 .../Validation/StrictRules/ValidationTest.php | 1016 ++++++++++++
 10 files changed, 6185 insertions(+)
 create mode 100644 system/Validation/StrictRules/CreditCardRules.php
 create mode 100644 system/Validation/StrictRules/FileRules.php
 create mode 100644 system/Validation/StrictRules/FormatRules.php
 create mode 100644 system/Validation/StrictRules/Rules.php
 create mode 100644 tests/system/Validation/StrictRules/CreditCardRulesTest.php
 create mode 100644 tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php
 create mode 100644 tests/system/Validation/StrictRules/FileRulesTest.php
 create mode 100644 tests/system/Validation/StrictRules/FormatRulesTest.php
 create mode 100644 tests/system/Validation/StrictRules/RulesTest.php
 create mode 100644 tests/system/Validation/StrictRules/ValidationTest.php

diff --git a/system/Validation/StrictRules/CreditCardRules.php b/system/Validation/StrictRules/CreditCardRules.php
new file mode 100644
index 000000000000..95c8dd83e846
--- /dev/null
+++ b/system/Validation/StrictRules/CreditCardRules.php
@@ -0,0 +1,290 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation\StrictRules;
+
+/**
+ * Class CreditCardRules
+ *
+ * Provides validation methods for common credit-card inputs.
+ *
+ * @see http://en.wikipedia.org/wiki/Credit_card_number
+ */
+class CreditCardRules
+{
+    /**
+     * The cards that we support, with the defining details:
+     *
+     *  name        - The type of card as found in the form. Must match the user's value
+     *  length      - List of possible lengths for the card number
+     *  prefixes    - List of possible prefixes for the card
+     *  checkdigit  - Boolean on whether we should do a modulus10 check on the numbers.
+     *
+     * @var array
+     */
+    protected $cards = [
+        'American Express' => [
+            'name'       => 'amex',
+            'length'     => '15',
+            'prefixes'   => '34,37',
+            'checkdigit' => true,
+        ],
+        'China UnionPay' => [
+            'name'       => 'unionpay',
+            'length'     => '16,17,18,19',
+            'prefixes'   => '62',
+            'checkdigit' => true,
+        ],
+        'Dankort' => [
+            'name'       => 'dankort',
+            'length'     => '16',
+            'prefixes'   => '5019,4175,4571,4',
+            'checkdigit' => true,
+        ],
+        'DinersClub' => [
+            'name'       => 'dinersclub',
+            'length'     => '14,16',
+            'prefixes'   => '300,301,302,303,304,305,309,36,38,39,54,55',
+            'checkdigit' => true,
+        ],
+        'DinersClub CarteBlanche' => [
+            'name'       => 'carteblanche',
+            'length'     => '14',
+            'prefixes'   => '300,301,302,303,304,305',
+            'checkdigit' => true,
+        ],
+        'Discover Card' => [
+            'name'       => 'discover',
+            'length'     => '16,19',
+            'prefixes'   => '6011,622,644,645,656,647,648,649,65',
+            'checkdigit' => true,
+        ],
+        'InterPayment' => [
+            'name'       => 'interpayment',
+            'length'     => '16,17,18,19',
+            'prefixes'   => '4',
+            'checkdigit' => true,
+        ],
+        'JCB' => [
+            'name'       => 'jcb',
+            'length'     => '16,17,18,19',
+            'prefixes'   => '352,353,354,355,356,357,358',
+            'checkdigit' => true,
+        ],
+        'Maestro' => [
+            'name'       => 'maestro',
+            'length'     => '12,13,14,15,16,18,19',
+            'prefixes'   => '50,56,57,58,59,60,61,62,63,64,65,66,67,68,69',
+            'checkdigit' => true,
+        ],
+        'MasterCard' => [
+            'name'       => 'mastercard',
+            'length'     => '16',
+            'prefixes'   => '51,52,53,54,55,22,23,24,25,26,27',
+            'checkdigit' => true,
+        ],
+        'NSPK MIR' => [
+            'name'       => 'mir',
+            'length'     => '16',
+            'prefixes'   => '2200,2201,2202,2203,2204',
+            'checkdigit' => true,
+        ],
+        'Troy' => [
+            'name'       => 'troy',
+            'length'     => '16',
+            'prefixes'   => '979200,979289',
+            'checkdigit' => true,
+        ],
+        'UATP' => [
+            'name'       => 'uatp',
+            'length'     => '15',
+            'prefixes'   => '1',
+            'checkdigit' => true,
+        ],
+        'Verve' => [
+            'name'       => 'verve',
+            'length'     => '16,19',
+            'prefixes'   => '506,650',
+            'checkdigit' => true,
+        ],
+        'Visa' => [
+            'name'       => 'visa',
+            'length'     => '13,16,19',
+            'prefixes'   => '4',
+            'checkdigit' => true,
+        ],
+        // Canadian Cards
+        'BMO ABM Card' => [
+            'name'       => 'bmoabm',
+            'length'     => '16',
+            'prefixes'   => '500',
+            'checkdigit' => false,
+        ],
+        'CIBC Convenience Card' => [
+            'name'       => 'cibc',
+            'length'     => '16',
+            'prefixes'   => '4506',
+            'checkdigit' => false,
+        ],
+        'HSBC Canada Card' => [
+            'name'       => 'hsbc',
+            'length'     => '16',
+            'prefixes'   => '56',
+            'checkdigit' => false,
+        ],
+        'Royal Bank of Canada Client Card' => [
+            'name'       => 'rbc',
+            'length'     => '16',
+            'prefixes'   => '45',
+            'checkdigit' => false,
+        ],
+        'Scotiabank Scotia Card' => [
+            'name'       => 'scotia',
+            'length'     => '16',
+            'prefixes'   => '4536',
+            'checkdigit' => false,
+        ],
+        'TD Canada Trust Access Card' => [
+            'name'       => 'tdtrust',
+            'length'     => '16',
+            'prefixes'   => '589297',
+            'checkdigit' => false,
+        ],
+    ];
+
+    /**
+     * Verifies that a credit card number is valid and matches the known
+     * formats for a wide number of credit card types. This does not verify
+     * that the card is a valid card, only that the number is formatted correctly.
+     *
+     * Example:
+     *  $rules = [
+     *      'cc_num' => 'valid_cc_number[visa]'
+     *  ];
+     *
+     * @param mixed $ccNumber
+     */
+    public function valid_cc_number($ccNumber, string $type): bool
+    {
+        if (! is_string($ccNumber)) {
+            return false;
+        }
+
+        $type = strtolower($type);
+        $info = null;
+
+        // Get our card info based on provided name.
+        foreach ($this->cards as $card) {
+            if ($card['name'] === $type) {
+                $info = $card;
+                break;
+            }
+        }
+
+        // If empty, it's not a card type we recognize, or invalid type.
+        if (empty($info)) {
+            return false;
+        }
+
+        // Make sure we have a valid length
+        if ((string) $ccNumber === '') {
+            return false;
+        }
+
+        // Remove any spaces and dashes
+        $ccNumber = str_replace([' ', '-'], '', $ccNumber);
+
+        // Non-numeric values cannot be a number...duh
+        if (! is_numeric($ccNumber)) {
+            return false;
+        }
+
+        // Make sure it's a valid length for this card
+        $lengths = explode(',', $info['length']);
+
+        if (! in_array((string) strlen($ccNumber), $lengths, true)) {
+            return false;
+        }
+
+        // Make sure it has a valid prefix
+        $prefixes = explode(',', $info['prefixes']);
+
+        $validPrefix = false;
+
+        foreach ($prefixes as $prefix) {
+            if (strpos($ccNumber, $prefix) === 0) {
+                $validPrefix = true;
+                break;
+            }
+        }
+
+        if ($validPrefix === false) {
+            return false;
+        }
+
+        // Still here? Then check the number against the Luhn algorithm, if required
+        // @see https://en.wikipedia.org/wiki/Luhn_algorithm
+        // @see https://gist.github.com/troelskn/1287893
+        if ($info['checkdigit'] === true) {
+            return $this->isValidLuhn($ccNumber);
+        }
+
+        return true;
+    }
+
+    /**
+     * Checks the given number to see if the number passing a Luhn check.
+     *
+     * @param string $number
+     */
+    protected function isValidLuhn(?string $number = null): bool
+    {
+        $number = (string) $number;
+
+        $sumTable = [
+            [
+                0,
+                1,
+                2,
+                3,
+                4,
+                5,
+                6,
+                7,
+                8,
+                9,
+            ],
+            [
+                0,
+                2,
+                4,
+                6,
+                8,
+                1,
+                3,
+                5,
+                7,
+                9,
+            ],
+        ];
+
+        $sum  = 0;
+        $flip = 0;
+
+        for ($i = strlen($number) - 1; $i >= 0; $i--) {
+            $sum += $sumTable[$flip++ & 0x1][$number[$i]];
+        }
+
+        return $sum % 10 === 0;
+    }
+}
diff --git a/system/Validation/StrictRules/FileRules.php b/system/Validation/StrictRules/FileRules.php
new file mode 100644
index 000000000000..f14ba321b636
--- /dev/null
+++ b/system/Validation/StrictRules/FileRules.php
@@ -0,0 +1,250 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation\StrictRules;
+
+use CodeIgniter\HTTP\RequestInterface;
+use Config\Mimes;
+use Config\Services;
+
+/**
+ * File validation rules
+ */
+class FileRules
+{
+    /**
+     * Request instance. So we can get access to the files.
+     *
+     * @var RequestInterface
+     */
+    protected $request;
+
+    /**
+     * Constructor.
+     *
+     * @param RequestInterface $request
+     */
+    public function __construct(?RequestInterface $request = null)
+    {
+        if ($request === null) {
+            $request = Services::request();
+        }
+
+        $this->request = $request;
+    }
+
+    /**
+     * Verifies that $name is the name of a valid uploaded file.
+     */
+    public function uploaded(?string $blank, string $name): bool
+    {
+        if (! ($files = $this->request->getFileMultiple($name))) {
+            $files = [$this->request->getFile($name)];
+        }
+
+        foreach ($files as $file) {
+            if ($file === null) {
+                return false;
+            }
+
+            if (ENVIRONMENT === 'testing') {
+                if ($file->getError() !== 0) {
+                    return false;
+                }
+            } else {
+                // Note: cannot unit test this; no way to over-ride ENVIRONMENT?
+                // @codeCoverageIgnoreStart
+                if (! $file->isValid()) {
+                    return false;
+                }
+                // @codeCoverageIgnoreEnd
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Verifies if the file's size in Kilobytes is no larger than the parameter.
+     */
+    public function max_size(?string $blank, string $params): bool
+    {
+        // Grab the file name off the top of the $params
+        // after we split it.
+        $params = explode(',', $params);
+        $name   = array_shift($params);
+
+        if (! ($files = $this->request->getFileMultiple($name))) {
+            $files = [$this->request->getFile($name)];
+        }
+
+        foreach ($files as $file) {
+            if ($file === null) {
+                return false;
+            }
+
+            if ($file->getError() === UPLOAD_ERR_NO_FILE) {
+                return true;
+            }
+
+            if ($file->getError() === UPLOAD_ERR_INI_SIZE) {
+                return false;
+            }
+
+            if ($file->getSize() / 1024 > $params[0]) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Uses the mime config file to determine if a file is considered an "image",
+     * which for our purposes basically means that it's a raster image or svg.
+     */
+    public function is_image(?string $blank, string $params): bool
+    {
+        // Grab the file name off the top of the $params
+        // after we split it.
+        $params = explode(',', $params);
+        $name   = array_shift($params);
+
+        if (! ($files = $this->request->getFileMultiple($name))) {
+            $files = [$this->request->getFile($name)];
+        }
+
+        foreach ($files as $file) {
+            if ($file === null) {
+                return false;
+            }
+
+            if ($file->getError() === UPLOAD_ERR_NO_FILE) {
+                return true;
+            }
+
+            // We know that our mimes list always has the first mime
+            // start with `image` even when then are multiple accepted types.
+            $type = Mimes::guessTypeFromExtension($file->getExtension());
+
+            if (mb_strpos($type, 'image') !== 0) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Checks to see if an uploaded file's mime type matches one in the parameter.
+     */
+    public function mime_in(?string $blank, string $params): bool
+    {
+        // Grab the file name off the top of the $params
+        // after we split it.
+        $params = explode(',', $params);
+        $name   = array_shift($params);
+
+        if (! ($files = $this->request->getFileMultiple($name))) {
+            $files = [$this->request->getFile($name)];
+        }
+
+        foreach ($files as $file) {
+            if ($file === null) {
+                return false;
+            }
+
+            if ($file->getError() === UPLOAD_ERR_NO_FILE) {
+                return true;
+            }
+
+            if (! in_array($file->getMimeType(), $params, true)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Checks to see if an uploaded file's extension matches one in the parameter.
+     */
+    public function ext_in(?string $blank, string $params): bool
+    {
+        // Grab the file name off the top of the $params
+        // after we split it.
+        $params = explode(',', $params);
+        $name   = array_shift($params);
+
+        if (! ($files = $this->request->getFileMultiple($name))) {
+            $files = [$this->request->getFile($name)];
+        }
+
+        foreach ($files as $file) {
+            if ($file === null) {
+                return false;
+            }
+
+            if ($file->getError() === UPLOAD_ERR_NO_FILE) {
+                return true;
+            }
+
+            if (! in_array($file->guessExtension(), $params, true)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Checks an uploaded file to verify that the dimensions are within
+     * a specified allowable dimension.
+     */
+    public function max_dims(?string $blank, string $params): bool
+    {
+        // Grab the file name off the top of the $params
+        // after we split it.
+        $params = explode(',', $params);
+        $name   = array_shift($params);
+
+        if (! ($files = $this->request->getFileMultiple($name))) {
+            $files = [$this->request->getFile($name)];
+        }
+
+        foreach ($files as $file) {
+            if ($file === null) {
+                return false;
+            }
+
+            if ($file->getError() === UPLOAD_ERR_NO_FILE) {
+                return true;
+            }
+
+            // Get Parameter sizes
+            $allowedWidth  = $params[0] ?? 0;
+            $allowedHeight = $params[1] ?? 0;
+
+            // Get uploaded image size
+            $info       = getimagesize($file->getTempName());
+            $fileWidth  = $info[0];
+            $fileHeight = $info[1];
+
+            if ($fileWidth > $allowedWidth || $fileHeight > $allowedHeight) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/system/Validation/StrictRules/FormatRules.php b/system/Validation/StrictRules/FormatRules.php
new file mode 100644
index 000000000000..9eb76b832ed8
--- /dev/null
+++ b/system/Validation/StrictRules/FormatRules.php
@@ -0,0 +1,494 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation\StrictRules;
+
+use DateTime;
+
+/**
+ * Format validation Rules.
+ */
+class FormatRules
+{
+    /**
+     * Alpha
+     *
+     * @param mixed|null $str
+     */
+    public function alpha($str = null): bool
+    {
+        if (! is_string($str)) {
+            return false;
+        }
+
+        return ctype_alpha($str);
+    }
+
+    /**
+     * Alpha with spaces.
+     *
+     * @param string|null $value Value.
+     *
+     * @return bool True if alpha with spaces, else false.
+     */
+    public function alpha_space(?string $value = null): bool
+    {
+        if ($value === null) {
+            return true;
+        }
+
+        if (! is_string($value)) {
+            return false;
+        }
+
+        // @see https://regex101.com/r/LhqHPO/1
+        return (bool) preg_match('/\A[A-Z ]+\z/i', $value);
+    }
+
+    /**
+     * Alphanumeric with underscores and dashes
+     *
+     * @param mixed|null $str
+     */
+    public function alpha_dash($str = null): bool
+    {
+        if ($str === null) {
+            return false;
+        }
+
+        if (is_int($str)) {
+            $str = (string) $str;
+        }
+
+        if (! is_string($str)) {
+            return false;
+        }
+
+        // @see https://regex101.com/r/XfVY3d/1
+        return preg_match('/\A[a-z0-9_-]+\z/i', $str) === 1;
+    }
+
+    /**
+     * Alphanumeric, spaces, and a limited set of punctuation characters.
+     * Accepted punctuation characters are: ~ tilde, ! exclamation,
+     * # number, $ dollar, % percent, & ampersand, * asterisk, - dash,
+     * _ underscore, + plus, = equals, | vertical bar, : colon, . period
+     * ~ ! # $ % & * - _ + = | : .
+     *
+     * @param string|null $str
+     *
+     * @return bool
+     */
+    public function alpha_numeric_punct($str)
+    {
+        if ($str === null) {
+            return false;
+        }
+
+        if (is_int($str) || is_float($str)) {
+            $str = (string) $str;
+        }
+
+        if (! is_string($str)) {
+            return false;
+        }
+
+        // @see https://regex101.com/r/6N8dDY/1
+        return preg_match('/\A[A-Z0-9 ~!#$%\&\*\-_+=|:.]+\z/i', $str) === 1;
+    }
+
+    /**
+     * Alphanumeric
+     *
+     * @param mixed|null $str
+     */
+    public function alpha_numeric($str = null): bool
+    {
+        if (is_int($str)) {
+            $str = (string) $str;
+        }
+
+        if (! is_string($str)) {
+            return false;
+        }
+
+        return ctype_alnum($str);
+    }
+
+    /**
+     * Alphanumeric w/ spaces
+     *
+     * @param mixed|null $str
+     */
+    public function alpha_numeric_space($str = null): bool
+    {
+        if (is_int($str)) {
+            $str = (string) $str;
+        }
+
+        if (! is_string($str)) {
+            return false;
+        }
+
+        // @see https://regex101.com/r/0AZDME/1
+        return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str ?? '');
+    }
+
+    /**
+     * Any type of string
+     *
+     * @param string|null $str
+     */
+    public function string($str = null): bool
+    {
+        return is_string($str);
+    }
+
+    /**
+     * Decimal number
+     *
+     * @param mixed|null $str
+     */
+    public function decimal($str = null): bool
+    {
+        if (is_int($str) || is_float($str)) {
+            $str = (string) $str;
+        }
+
+        if (! is_string($str)) {
+            return false;
+        }
+
+        // @see https://regex101.com/r/HULifl/2/
+        return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str ?? '');
+    }
+
+    /**
+     * String of hexidecimal characters
+     *
+     * @param mixed|null $str
+     */
+    public function hex($str = null): bool
+    {
+        if (is_int($str)) {
+            $str = (string) $str;
+        }
+
+        if (! is_string($str)) {
+            return false;
+        }
+
+        return ctype_xdigit($str);
+    }
+
+    /**
+     * Integer
+     *
+     * @param mixed|null $str
+     */
+    public function integer($str = null): bool
+    {
+        if (is_int($str)) {
+            $str = (string) $str;
+        }
+
+        if (! is_string($str)) {
+            return false;
+        }
+
+        return (bool) preg_match('/\A[\-+]?\d+\z/', $str);
+    }
+
+    /**
+     * Is a Natural number  (0,1,2,3, etc.)
+     *
+     * @param mixed|null $str
+     */
+    public function is_natural($str = null): bool
+    {
+        if (is_int($str)) {
+            $str = (string) $str;
+        }
+
+        if (! is_string($str)) {
+            return false;
+        }
+
+        return ctype_digit($str);
+    }
+
+    /**
+     * Is a Natural number, but not a zero  (1,2,3, etc.)
+     *
+     * @param mixed|null $str
+     */
+    public function is_natural_no_zero($str = null): bool
+    {
+        if (is_int($str)) {
+            $str = (string) $str;
+        }
+
+        if (! is_string($str)) {
+            return false;
+        }
+
+        return $str !== '0' && ctype_digit($str);
+    }
+
+    /**
+     * Numeric
+     *
+     * @param mixed|null $str
+     */
+    public function numeric($str = null): bool
+    {
+        if (is_int($str) || is_float($str)) {
+            $str = (string) $str;
+        }
+
+        if (! is_string($str)) {
+            return false;
+        }
+
+        // @see https://regex101.com/r/bb9wtr/2
+        return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str ?? '');
+    }
+
+    /**
+     * Compares value against a regular expression pattern.
+     *
+     * @param mixed $str
+     */
+    public function regex_match($str, string $pattern): bool
+    {
+        if (! is_string($str)) {
+            return false;
+        }
+
+        if (strpos($pattern, '/') !== 0) {
+            $pattern = "/{$pattern}/";
+        }
+
+        return (bool) preg_match($pattern, $str ?? '');
+    }
+
+    /**
+     * Validates that the string is a valid timezone as per the
+     * timezone_identifiers_list function.
+     *
+     * @see http://php.net/manual/en/datetimezone.listidentifiers.php
+     *
+     * @param string $str
+     */
+    public function timezone($str = null): bool
+    {
+        if (! is_string($str)) {
+            return false;
+        }
+
+        return in_array($str, timezone_identifiers_list(), true);
+    }
+
+    /**
+     * Valid Base64
+     *
+     * 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($str = null): bool
+    {
+        if (! is_string($str)) {
+            return false;
+        }
+
+        return base64_encode(base64_decode($str, true)) === $str;
+    }
+
+    /**
+     * Valid JSON
+     *
+     * @param string $str
+     */
+    public function valid_json($str = null): bool
+    {
+        if (! is_string($str)) {
+            return false;
+        }
+
+        json_decode($str);
+
+        return json_last_error() === JSON_ERROR_NONE;
+    }
+
+    /**
+     * Checks for a correctly formatted email address
+     *
+     * @param string $str
+     */
+    public function valid_email($str = null): bool
+    {
+        if (! is_string($str)) {
+            return false;
+        }
+
+        // @see https://regex101.com/r/wlJG1t/1/
+        if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str ?? '', $matches)) {
+            $str = $matches[1] . '@' . idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46);
+        }
+
+        return (bool) filter_var($str, FILTER_VALIDATE_EMAIL);
+    }
+
+    /**
+     * Validate a comma-separated list of email addresses.
+     *
+     * Example:
+     *     valid_emails[one@example.com,two@example.com]
+     *
+     * @param string $str
+     */
+    public function valid_emails($str = null): bool
+    {
+        if (! is_string($str)) {
+            return false;
+        }
+
+        foreach (explode(',', $str) as $email) {
+            $email = trim($email);
+
+            if ($email === '') {
+                return false;
+            }
+
+            if ($this->valid_email($email) === false) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Validate an IP address (human readable format or binary string - inet_pton)
+     *
+     * @param string|null $which IP protocol: 'ipv4' or 'ipv6'
+     * @param mixed|null  $ip
+     */
+    public function valid_ip($ip = null, ?string $which = null): bool
+    {
+        if (! is_string($ip)) {
+            return false;
+        }
+
+        if (empty($ip)) {
+            return false;
+        }
+
+        switch (strtolower($which ?? '')) {
+            case 'ipv4':
+                $which = FILTER_FLAG_IPV4;
+                break;
+
+            case 'ipv6':
+                $which = FILTER_FLAG_IPV6;
+                break;
+
+            default:
+                $which = 0;
+        }
+
+        return filter_var($ip, FILTER_VALIDATE_IP, $which) !== false
+            || (! ctype_print($ip) && filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which) !== false);
+    }
+
+    /**
+     * Checks a string to ensure it is (loosely) a URL.
+     *
+     * Warning: this rule will pass basic strings like
+     * "banana"; use valid_url_strict for a stricter rule.
+     *
+     * @param mixed|null $str
+     */
+    public function valid_url($str = null): bool
+    {
+        if (! is_string($str)) {
+            return false;
+        }
+
+        if (empty($str)) {
+            return false;
+        }
+
+        if (preg_match('/^(?:([^:]*)\:)?\/\/(.+)$/', $str, $matches)) {
+            if (! in_array($matches[1], ['http', 'https'], true)) {
+                return false;
+            }
+
+            $str = $matches[2];
+        }
+
+        $str = 'http://' . $str;
+
+        return filter_var($str, FILTER_VALIDATE_URL) !== false;
+    }
+
+    /**
+     * Checks a URL to ensure it's formed correctly.
+     *
+     * @param string|null $validSchemes comma separated list of allowed schemes
+     * @param mixed|null  $str
+     */
+    public function valid_url_strict($str = null, ?string $validSchemes = null): bool
+    {
+        if (! is_string($str)) {
+            return false;
+        }
+
+        if (empty($str)) {
+            return false;
+        }
+
+        // parse_url() may return null and false
+        $scheme       = strtolower((string) parse_url($str, PHP_URL_SCHEME));
+        $validSchemes = explode(
+            ',',
+            strtolower($validSchemes ?? 'http,https')
+        );
+
+        return in_array($scheme, $validSchemes, true)
+            && filter_var($str, FILTER_VALIDATE_URL) !== false;
+    }
+
+    /**
+     * Checks for a valid date and matches a given date format
+     *
+     * @param mixed|null $str
+     */
+    public function valid_date($str = null, ?string $format = null): bool
+    {
+        if (! is_string($str)) {
+            return false;
+        }
+
+        if (empty($format)) {
+            return strtotime($str) !== false;
+        }
+
+        $date   = DateTime::createFromFormat($format, $str);
+        $errors = DateTime::getLastErrors();
+
+        return $date !== false && $errors !== false && $errors['warning_count'] === 0 && $errors['error_count'] === 0;
+    }
+}
diff --git a/system/Validation/StrictRules/Rules.php b/system/Validation/StrictRules/Rules.php
new file mode 100644
index 000000000000..61a70a1a49b9
--- /dev/null
+++ b/system/Validation/StrictRules/Rules.php
@@ -0,0 +1,379 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation\StrictRules;
+
+use Config\Database;
+use InvalidArgumentException;
+
+/**
+ * Validation Rules.
+ */
+class Rules
+{
+    /**
+     * The value does not match another field in $data.
+     *
+     * @param array $data Other field/value pairs
+     * @param mixed $str
+     */
+    public function differs($str, string $field, array $data): bool
+    {
+        if (! is_string($str)) {
+            return false;
+        }
+
+        if (strpos($field, '.') !== false) {
+            return $str !== dot_array_search($field, $data);
+        }
+
+        return array_key_exists($field, $data) && $str !== $data[$field];
+    }
+
+    /**
+     * Equals the static value provided.
+     *
+     * @param mixed $str
+     */
+    public function equals($str, string $val): bool
+    {
+        return $str === $val;
+    }
+
+    /**
+     * Returns true if $str is $val characters long.
+     * $val = "5" (one) | "5,8,12" (multiple values)
+     *
+     * @param mixed $str
+     */
+    public function exact_length($str, string $val): bool
+    {
+        if (! is_string($str)) {
+            return false;
+        }
+
+        $val = explode(',', $val);
+
+        foreach ($val as $tmp) {
+            if (is_numeric($tmp) && (int) $tmp === mb_strlen($str ?? '')) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Greater than
+     *
+     * @param mixed $str
+     */
+    public function greater_than($str, string $min): bool
+    {
+        return is_numeric($str) && $str > $min;
+    }
+
+    /**
+     * Equal to or Greater than
+     *
+     * @param mixed $str
+     */
+    public function greater_than_equal_to($str, string $min): bool
+    {
+        return is_numeric($str) && $str >= $min;
+    }
+
+    /**
+     * Checks the database to see if the given value exist.
+     * Can ignore records by field/value to filter (currently
+     * accept only one filter).
+     *
+     * Example:
+     *    is_not_unique[table.field,where_field,where_value]
+     *    is_not_unique[menu.id,active,1]
+     *
+     * @param mixed $str
+     */
+    public function is_not_unique($str, string $field, array $data): bool
+    {
+        // Grab any data for exclusion of a single row.
+        [$field, $whereField, $whereValue] = array_pad(explode(',', $field), 3, null);
+
+        // Break the table and field apart
+        sscanf($field, '%[^.].%[^.]', $table, $field);
+
+        $row = Database::connect($data['DBGroup'] ?? null)
+            ->table($table)
+            ->select('1')
+            ->where($field, $str)
+            ->limit(1);
+
+        if (! empty($whereField) && ! empty($whereValue) && ! preg_match('/^\{(\w+)\}$/', $whereValue)) {
+            $row = $row->where($whereField, $whereValue);
+        }
+
+        return $row->get()->getRow() !== null;
+    }
+
+    /**
+     * Value should be within an array of values
+     *
+     * @param mixed $value
+     */
+    public function in_list($value, string $list): bool
+    {
+        if (is_int($value) || is_float($value)) {
+            $value = (string) $value;
+        }
+
+        if (! is_string($value)) {
+            return false;
+        }
+
+        $list = array_map('trim', explode(',', $list));
+
+        return in_array($value, $list, true);
+    }
+
+    /**
+     * Checks the database to see if the given value is unique. Can
+     * ignore a single record by field/value to make it useful during
+     * record updates.
+     *
+     * Example:
+     *    is_unique[table.field,ignore_field,ignore_value]
+     *    is_unique[users.email,id,5]
+     *
+     * @param mixed $str
+     */
+    public function is_unique($str, string $field, array $data): bool
+    {
+        [$field, $ignoreField, $ignoreValue] = array_pad(explode(',', $field), 3, null);
+
+        sscanf($field, '%[^.].%[^.]', $table, $field);
+
+        $row = Database::connect($data['DBGroup'] ?? null)
+            ->table($table)
+            ->select('1')
+            ->where($field, $str)
+            ->limit(1);
+
+        if (! empty($ignoreField) && ! empty($ignoreValue) && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)) {
+            $row = $row->where("{$ignoreField} !=", $ignoreValue);
+        }
+
+        return $row->get()->getRow() === null;
+    }
+
+    /**
+     * Less than
+     *
+     * @param mixed $str
+     */
+    public function less_than($str, string $max): bool
+    {
+        return is_numeric($str) && $str < $max;
+    }
+
+    /**
+     * Equal to or Less than
+     *
+     * @param mixed $str
+     */
+    public function less_than_equal_to($str, string $max): bool
+    {
+        return is_numeric($str) && $str <= $max;
+    }
+
+    /**
+     * Matches the value of another field in $data.
+     *
+     * @param array $data Other field/value pairs
+     * @param mixed $str
+     */
+    public function matches($str, string $field, array $data): bool
+    {
+        if (strpos($field, '.') !== false) {
+            return $str === dot_array_search($field, $data);
+        }
+
+        return array_key_exists($field, $data) && $str === $data[$field];
+    }
+
+    /**
+     * Returns true if $str is $val or fewer characters in length.
+     *
+     * @param mixed $str
+     */
+    public function max_length($str, string $val): bool
+    {
+        if (is_int($str) || is_float($str) || null === $str) {
+            $str = (string) $str;
+        }
+
+        if (! is_string($str)) {
+            return false;
+        }
+
+        return is_numeric($val) && $val >= mb_strlen($str);
+    }
+
+    /**
+     * Returns true if $str is at least $val length.
+     *
+     * @param mixed $str
+     */
+    public function min_length($str, string $val): bool
+    {
+        if (is_int($str) || is_float($str)) {
+            $str = (string) $str;
+        }
+
+        if (! is_string($str)) {
+            return false;
+        }
+
+        return is_numeric($val) && $val <= mb_strlen($str);
+    }
+
+    /**
+     * Does not equal the static value provided.
+     *
+     * @param string $str
+     */
+    public function not_equals($str, string $val): bool
+    {
+        return $str !== $val;
+    }
+
+    /**
+     * Value should not be within an array of values.
+     *
+     * @param string $value
+     */
+    public function not_in_list($value, string $list): bool
+    {
+        if (null === $value) {
+            return true;
+        }
+
+        if (is_int($value) || is_float($value)) {
+            $value = (string) $value;
+        }
+
+        if (! is_string($value)) {
+            return false;
+        }
+
+        return ! $this->in_list($value, $list);
+    }
+
+    /**
+     * @param mixed $str
+     */
+    public function required($str = null): bool
+    {
+        if ($str === null) {
+            return false;
+        }
+
+        if (is_object($str)) {
+            return true;
+        }
+
+        if (is_array($str)) {
+            return $str !== [];
+        }
+
+        return trim((string) $str) !== '';
+    }
+
+    /**
+     * The field is required when any of the other required fields are present
+     * in the data.
+     *
+     * Example (field is required when the password field is present):
+     *
+     *     required_with[password]
+     *
+     * @param string|null $str
+     * @param string|null $fields List of fields that we should check if present
+     * @param array       $data   Complete list of fields from the form
+     */
+    public function required_with($str = null, ?string $fields = null, array $data = []): bool
+    {
+        if ($fields === null || empty($data)) {
+            throw new InvalidArgumentException('You must supply the parameters: fields, data.');
+        }
+
+        // If the field is present we can safely assume that
+        // the field is here, no matter whether the corresponding
+        // search field is present or not.
+        $fields  = explode(',', $fields);
+        $present = $this->required($str ?? '');
+
+        if ($present) {
+            return true;
+        }
+
+        // Still here? Then we fail this test if
+        // any of the fields are present in $data
+        // as $fields is the lis
+        $requiredFields = [];
+
+        foreach ($fields as $field) {
+            if ((array_key_exists($field, $data) && ! empty($data[$field])) || (strpos($field, '.') !== false && ! empty(dot_array_search($field, $data)))) {
+                $requiredFields[] = $field;
+            }
+        }
+
+        return empty($requiredFields);
+    }
+
+    /**
+     * The field is required when all of the other fields are present
+     * in the data but not required.
+     *
+     * Example (field is required when the id or email field is missing):
+     *
+     *     required_without[id,email]
+     *
+     * @param string|null $str
+     */
+    public function required_without($str = null, ?string $fields = null, array $data = []): bool
+    {
+        if ($fields === null || empty($data)) {
+            throw new InvalidArgumentException('You must supply the parameters: fields, data.');
+        }
+
+        // If the field is present we can safely assume that
+        // the field is here, no matter whether the corresponding
+        // search field is present or not.
+        $fields  = explode(',', $fields);
+        $present = $this->required($str ?? '');
+
+        if ($present) {
+            return true;
+        }
+
+        // Still here? Then we fail this test if
+        // any of the fields are not present in $data
+        foreach ($fields as $field) {
+            if ((strpos($field, '.') === false && (! array_key_exists($field, $data) || empty($data[$field]))) || (strpos($field, '.') !== false && empty(dot_array_search($field, $data)))) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}
diff --git a/tests/system/Validation/StrictRules/CreditCardRulesTest.php b/tests/system/Validation/StrictRules/CreditCardRulesTest.php
new file mode 100644
index 000000000000..8bc1c69d1111
--- /dev/null
+++ b/tests/system/Validation/StrictRules/CreditCardRulesTest.php
@@ -0,0 +1,1248 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation\StrictRules;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Validation\Validation;
+use Config\Services;
+use Generator;
+use Tests\Support\Validation\TestRules;
+
+/**
+ * @internal
+ */
+final class CreditCardRulesTest extends CIUnitTestCase
+{
+    /**
+     * @var Validation
+     */
+    private $validation;
+
+    private $config = [
+        'ruleSets' => [
+            Rules::class,
+            FormatRules::class,
+            FileRules::class,
+            CreditCardRules::class,
+            TestRules::class,
+        ],
+        'groupA' => [
+            'foo' => 'required|min_length[5]',
+        ],
+        'groupA_errors' => [
+            'foo' => [
+                'min_length' => 'Shame, shame. Too short.',
+            ],
+        ],
+    ];
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->validation = new Validation((object) $this->config, Services::renderer());
+        $this->validation->reset();
+    }
+
+    /**
+     * @dataProvider creditCardProvider
+     */
+    public function testValidCCNumber(string $type, ?string $number, bool $expected): void
+    {
+        $data = ['cc' => $number];
+        $this->validation->setRules(['cc' => "valid_cc_number[{$type}]"]);
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    /**
+     * Cards shown are test cards found around the web.
+     *
+     * @see https://www.paypalobjects.com/en_US/vhelp/paypalmanager_help/credit_card_numbers.htm
+     */
+    public function creditCardProvider(): Generator
+    {
+        yield from [
+            'null_test' => [
+                'amex',
+                null,
+                false,
+            ],
+            'random_test' => [
+                'amex',
+                $this->generateCardNumber('37', 16),
+                false,
+            ],
+            'invalid_type' => [
+                'shorty',
+                '1111 1111 1111 1111',
+                false,
+            ],
+            'invalid_length' => [
+                'amex',
+                '',
+                false,
+            ],
+            'not_numeric' => [
+                'amex',
+                'abcd efgh ijkl mnop',
+                false,
+            ],
+            'bad_length' => [
+                'amex',
+                '3782 8224 6310 0051',
+                false,
+            ],
+            'bad_prefix' => [
+                'amex',
+                '3582 8224 6310 0051',
+                false,
+            ],
+            'amex1' => [
+                'amex',
+                '3782 8224 6310 005',
+                true,
+            ],
+            'amex2' => [
+                'amex',
+                '3714 4963 5398 431',
+                true,
+            ],
+            'dinersclub1' => [
+                'dinersclub',
+                '3056 9309 0259 04',
+                true,
+            ],
+            'dinersculb2' => [
+                'dinersclub',
+                '3852 0000 0232 37',
+                true,
+            ],
+            'discover1' => [
+                'discover',
+                '6011 1111 1111 1117',
+                true,
+            ],
+            'discover2' => [
+                'discover',
+                '6011 0009 9013 9424',
+                true,
+            ],
+            'jcb8' => [
+                'jcb',
+                '3530 1113 3330 0000',
+                true,
+            ],
+            'jcb9' => [
+                'jcb',
+                '3566 0020 2036 0505',
+                true,
+            ],
+            'mastercard12' => [
+                'mastercard',
+                '5555 5555 5555 4444',
+                true,
+            ],
+            'mastercard13' => [
+                'mastercard',
+                '5105 1051 0510 5100',
+                true,
+            ],
+            'visa4' => [
+                'visa',
+                '4111 1111 1111 1111',
+                true,
+            ],
+            'visa5' => [
+                'visa',
+                '4012 8888 8888 1881',
+                true,
+            ],
+            'visa6' => [
+                'visa',
+                '4222 2222 2222 2',
+                true,
+            ],
+            'dankort5' => [
+                'dankort',
+                '5019 7170 1010 3742',
+                true,
+            ],
+            'unionpay1' => [
+                'unionpay',
+                $this->generateCardNumber(62, 16),
+                true,
+            ],
+            'unionpay2' => [
+                'unionpay',
+                $this->generateCardNumber(62, 17),
+                true,
+            ],
+            'unionpay3' => [
+                'unionpay',
+                $this->generateCardNumber(62, 18),
+                true,
+            ],
+            'unionpay4' => [
+                'unionpay',
+                $this->generateCardNumber(62, 19),
+                true,
+            ],
+            'unionpay5' => [
+                'unionpay',
+                $this->generateCardNumber(63, 19),
+                false,
+            ],
+            'carteblanche1' => [
+                'carteblanche',
+                $this->generateCardNumber(300, 14),
+                true,
+            ],
+            'carteblanche2' => [
+                'carteblanche',
+                $this->generateCardNumber(301, 14),
+                true,
+            ],
+            'carteblanche3' => [
+                'carteblanche',
+                $this->generateCardNumber(302, 14),
+                true,
+            ],
+            'carteblanche4' => [
+                'carteblanche',
+                $this->generateCardNumber(303, 14),
+                true,
+            ],
+            'carteblanche5' => [
+                'carteblanche',
+                $this->generateCardNumber(304, 14),
+                true,
+            ],
+            'carteblanche6' => [
+                'carteblanche',
+                $this->generateCardNumber(305, 14),
+                true,
+            ],
+            'carteblanche7' => [
+                'carteblanche',
+                $this->generateCardNumber(306, 14),
+                false,
+            ],
+            'dinersclub3' => [
+                'dinersclub',
+                $this->generateCardNumber(300, 14),
+                true,
+            ],
+            'dinersclub4' => [
+                'dinersclub',
+                $this->generateCardNumber(301, 14),
+                true,
+            ],
+            'dinersclub5' => [
+                'dinersclub',
+                $this->generateCardNumber(302, 14),
+                true,
+            ],
+            'dinersclub6' => [
+                'dinersclub',
+                $this->generateCardNumber(303, 14),
+                true,
+            ],
+            'dinersclub7' => [
+                'dinersclub',
+                $this->generateCardNumber(304, 14),
+                true,
+            ],
+            'dinersclub8' => [
+                'dinersclub',
+                $this->generateCardNumber(305, 14),
+                true,
+            ],
+            'dinersclub9' => [
+                'dinersclub',
+                $this->generateCardNumber(309, 14),
+                true,
+            ],
+            'dinersclub10' => [
+                'dinersclub',
+                $this->generateCardNumber(36, 14),
+                true,
+            ],
+            'dinersclub11' => [
+                'dinersclub',
+                $this->generateCardNumber(38, 14),
+                true,
+            ],
+            'dinersclub12' => [
+                'dinersclub',
+                $this->generateCardNumber(39, 14),
+                true,
+            ],
+            'dinersclub13' => [
+                'dinersclub',
+                $this->generateCardNumber(54, 14),
+                true,
+            ],
+            'dinersclub14' => [
+                'dinersclub',
+                $this->generateCardNumber(55, 14),
+                true,
+            ],
+            'dinersclub15' => [
+                'dinersclub',
+                $this->generateCardNumber(300, 16),
+                true,
+            ],
+            'dinersclub16' => [
+                'dinersclub',
+                $this->generateCardNumber(301, 16),
+                true,
+            ],
+            'dinersclub17' => [
+                'dinersclub',
+                $this->generateCardNumber(302, 16),
+                true,
+            ],
+            'dinersclub18' => [
+                'dinersclub',
+                $this->generateCardNumber(303, 16),
+                true,
+            ],
+            'dinersclub19' => [
+                'dinersclub',
+                $this->generateCardNumber(304, 16),
+                true,
+            ],
+            'dinersclub20' => [
+                'dinersclub',
+                $this->generateCardNumber(305, 16),
+                true,
+            ],
+            'dinersclub21' => [
+                'dinersclub',
+                $this->generateCardNumber(309, 16),
+                true,
+            ],
+            'dinersclub22' => [
+                'dinersclub',
+                $this->generateCardNumber(36, 16),
+                true,
+            ],
+            'dinersclub23' => [
+                'dinersclub',
+                $this->generateCardNumber(38, 16),
+                true,
+            ],
+            'dinersclub24' => [
+                'dinersclub',
+                $this->generateCardNumber(39, 16),
+                true,
+            ],
+            'dinersclub25' => [
+                'dinersclub',
+                $this->generateCardNumber(54, 16),
+                true,
+            ],
+            'dinersclub26' => [
+                'dinersclub',
+                $this->generateCardNumber(55, 16),
+                true,
+            ],
+            'discover3' => [
+                'discover',
+                $this->generateCardNumber(6011, 16),
+                true,
+            ],
+            'discover4' => [
+                'discover',
+                $this->generateCardNumber(622, 16),
+                true,
+            ],
+            'discover5' => [
+                'discover',
+                $this->generateCardNumber(644, 16),
+                true,
+            ],
+            'discover6' => [
+                'discover',
+                $this->generateCardNumber(645, 16),
+                true,
+            ],
+            'discover7' => [
+                'discover',
+                $this->generateCardNumber(656, 16),
+                true,
+            ],
+            'discover8' => [
+                'discover',
+                $this->generateCardNumber(647, 16),
+                true,
+            ],
+            'discover9' => [
+                'discover',
+                $this->generateCardNumber(648, 16),
+                true,
+            ],
+            'discover10' => [
+                'discover',
+                $this->generateCardNumber(649, 16),
+                true,
+            ],
+            'discover11' => [
+                'discover',
+                $this->generateCardNumber(65, 16),
+                true,
+            ],
+            'discover12' => [
+                'discover',
+                $this->generateCardNumber(6011, 19),
+                true,
+            ],
+            'discover13' => [
+                'discover',
+                $this->generateCardNumber(622, 19),
+                true,
+            ],
+            'discover14' => [
+                'discover',
+                $this->generateCardNumber(644, 19),
+                true,
+            ],
+            'discover15' => [
+                'discover',
+                $this->generateCardNumber(645, 19),
+                true,
+            ],
+            'discover16' => [
+                'discover',
+                $this->generateCardNumber(656, 19),
+                true,
+            ],
+            'discover17' => [
+                'discover',
+                $this->generateCardNumber(647, 19),
+                true,
+            ],
+            'discover18' => [
+                'discover',
+                $this->generateCardNumber(648, 19),
+                true,
+            ],
+            'discover19' => [
+                'discover',
+                $this->generateCardNumber(649, 19),
+                true,
+            ],
+            'discover20' => [
+                'discover',
+                $this->generateCardNumber(65, 19),
+                true,
+            ],
+            'interpayment1' => [
+                'interpayment',
+                $this->generateCardNumber(4, 16),
+                true,
+            ],
+            'interpayment2' => [
+                'interpayment',
+                $this->generateCardNumber(4, 17),
+                true,
+            ],
+            'interpayment3' => [
+                'interpayment',
+                $this->generateCardNumber(4, 18),
+                true,
+            ],
+            'interpayment4' => [
+                'interpayment',
+                $this->generateCardNumber(4, 19),
+                true,
+            ],
+            'jcb1' => [
+                'jcb',
+                $this->generateCardNumber(352, 16),
+                true,
+            ],
+            'jcb2' => [
+                'jcb',
+                $this->generateCardNumber(353, 16),
+                true,
+            ],
+            'jcb3' => [
+                'jcb',
+                $this->generateCardNumber(354, 16),
+                true,
+            ],
+            'jcb4' => [
+                'jcb',
+                $this->generateCardNumber(355, 16),
+                true,
+            ],
+            'jcb5' => [
+                'jcb',
+                $this->generateCardNumber(356, 16),
+                true,
+            ],
+            'jcb6' => [
+                'jcb',
+                $this->generateCardNumber(357, 16),
+                true,
+            ],
+            'jcb7' => [
+                'jcb',
+                $this->generateCardNumber(358, 16),
+                true,
+            ],
+            'maestro1' => [
+                'maestro',
+                $this->generateCardNumber(50, 12),
+                true,
+            ],
+            'maestro2' => [
+                'maestro',
+                $this->generateCardNumber(56, 12),
+                true,
+            ],
+            'maestro3' => [
+                'maestro',
+                $this->generateCardNumber(57, 12),
+                true,
+            ],
+            'maestro4' => [
+                'maestro',
+                $this->generateCardNumber(58, 12),
+                true,
+            ],
+            'maestro5' => [
+                'maestro',
+                $this->generateCardNumber(59, 12),
+                true,
+            ],
+            'maestro6' => [
+                'maestro',
+                $this->generateCardNumber(60, 12),
+                true,
+            ],
+            'maestro7' => [
+                'maestro',
+                $this->generateCardNumber(61, 12),
+                true,
+            ],
+            'maestro8' => [
+                'maestro',
+                $this->generateCardNumber(62, 12),
+                true,
+            ],
+            'maestro9' => [
+                'maestro',
+                $this->generateCardNumber(63, 12),
+                true,
+            ],
+            'maestro10' => [
+                'maestro',
+                $this->generateCardNumber(64, 12),
+                true,
+            ],
+            'maestro11' => [
+                'maestro',
+                $this->generateCardNumber(65, 12),
+                true,
+            ],
+            'maestro12' => [
+                'maestro',
+                $this->generateCardNumber(66, 12),
+                true,
+            ],
+            'maestro13' => [
+                'maestro',
+                $this->generateCardNumber(67, 12),
+                true,
+            ],
+            'maestro14' => [
+                'maestro',
+                $this->generateCardNumber(68, 12),
+                true,
+            ],
+            'maestro15' => [
+                'maestro',
+                $this->generateCardNumber(69, 12),
+                true,
+            ],
+            'maestro16' => [
+                'maestro',
+                $this->generateCardNumber(50, 13),
+                true,
+            ],
+            'maestro17' => [
+                'maestro',
+                $this->generateCardNumber(56, 13),
+                true,
+            ],
+            'maestro18' => [
+                'maestro',
+                $this->generateCardNumber(57, 13),
+                true,
+            ],
+            'maestro19' => [
+                'maestro',
+                $this->generateCardNumber(58, 13),
+                true,
+            ],
+            'maestro20' => [
+                'maestro',
+                $this->generateCardNumber(59, 13),
+                true,
+            ],
+            'maestro21' => [
+                'maestro',
+                $this->generateCardNumber(60, 13),
+                true,
+            ],
+            'maestro22' => [
+                'maestro',
+                $this->generateCardNumber(61, 13),
+                true,
+            ],
+            'maestro23' => [
+                'maestro',
+                $this->generateCardNumber(62, 13),
+                true,
+            ],
+            'maestro24' => [
+                'maestro',
+                $this->generateCardNumber(63, 13),
+                true,
+            ],
+            'maestro25' => [
+                'maestro',
+                $this->generateCardNumber(64, 13),
+                true,
+            ],
+            'maestro26' => [
+                'maestro',
+                $this->generateCardNumber(65, 13),
+                true,
+            ],
+            'maestro27' => [
+                'maestro',
+                $this->generateCardNumber(66, 13),
+                true,
+            ],
+            'maestro28' => [
+                'maestro',
+                $this->generateCardNumber(67, 13),
+                true,
+            ],
+            'maestro29' => [
+                'maestro',
+                $this->generateCardNumber(68, 13),
+                true,
+            ],
+            'maestro30' => [
+                'maestro',
+                $this->generateCardNumber(69, 13),
+                true,
+            ],
+            'maestro31' => [
+                'maestro',
+                $this->generateCardNumber(50, 14),
+                true,
+            ],
+            'maestro32' => [
+                'maestro',
+                $this->generateCardNumber(56, 14),
+                true,
+            ],
+            'maestro33' => [
+                'maestro',
+                $this->generateCardNumber(57, 14),
+                true,
+            ],
+            'maestro34' => [
+                'maestro',
+                $this->generateCardNumber(58, 14),
+                true,
+            ],
+            'maestro35' => [
+                'maestro',
+                $this->generateCardNumber(59, 14),
+                true,
+            ],
+            'maestro36' => [
+                'maestro',
+                $this->generateCardNumber(60, 14),
+                true,
+            ],
+            'maestro37' => [
+                'maestro',
+                $this->generateCardNumber(61, 14),
+                true,
+            ],
+            'maestro38' => [
+                'maestro',
+                $this->generateCardNumber(62, 14),
+                true,
+            ],
+            'maestro39' => [
+                'maestro',
+                $this->generateCardNumber(63, 14),
+                true,
+            ],
+            'maestro40' => [
+                'maestro',
+                $this->generateCardNumber(64, 14),
+                true,
+            ],
+            'maestro41' => [
+                'maestro',
+                $this->generateCardNumber(65, 14),
+                true,
+            ],
+            'maestro42' => [
+                'maestro',
+                $this->generateCardNumber(66, 14),
+                true,
+            ],
+            'maestro43' => [
+                'maestro',
+                $this->generateCardNumber(67, 14),
+                true,
+            ],
+            'maestro44' => [
+                'maestro',
+                $this->generateCardNumber(68, 14),
+                true,
+            ],
+            'maestro45' => [
+                'maestro',
+                $this->generateCardNumber(69, 14),
+                true,
+            ],
+            'maestro46' => [
+                'maestro',
+                $this->generateCardNumber(50, 15),
+                true,
+            ],
+            'maestro47' => [
+                'maestro',
+                $this->generateCardNumber(56, 15),
+                true,
+            ],
+            'maestro48' => [
+                'maestro',
+                $this->generateCardNumber(57, 15),
+                true,
+            ],
+            'maestro49' => [
+                'maestro',
+                $this->generateCardNumber(58, 15),
+                true,
+            ],
+            'maestro50' => [
+                'maestro',
+                $this->generateCardNumber(59, 15),
+                true,
+            ],
+            'maestro51' => [
+                'maestro',
+                $this->generateCardNumber(60, 15),
+                true,
+            ],
+            'maestro52' => [
+                'maestro',
+                $this->generateCardNumber(61, 15),
+                true,
+            ],
+            'maestro53' => [
+                'maestro',
+                $this->generateCardNumber(62, 15),
+                true,
+            ],
+            'maestro54' => [
+                'maestro',
+                $this->generateCardNumber(63, 15),
+                true,
+            ],
+            'maestro55' => [
+                'maestro',
+                $this->generateCardNumber(64, 15),
+                true,
+            ],
+            'maestro56' => [
+                'maestro',
+                $this->generateCardNumber(65, 15),
+                true,
+            ],
+            'maestro57' => [
+                'maestro',
+                $this->generateCardNumber(66, 15),
+                true,
+            ],
+            'maestro58' => [
+                'maestro',
+                $this->generateCardNumber(67, 15),
+                true,
+            ],
+            'maestro59' => [
+                'maestro',
+                $this->generateCardNumber(68, 15),
+                true,
+            ],
+            'maestro60' => [
+                'maestro',
+                $this->generateCardNumber(69, 15),
+                true,
+            ],
+            'maestro61' => [
+                'maestro',
+                $this->generateCardNumber(50, 16),
+                true,
+            ],
+            'maestro62' => [
+                'maestro',
+                $this->generateCardNumber(56, 16),
+                true,
+            ],
+            'maestro63' => [
+                'maestro',
+                $this->generateCardNumber(57, 16),
+                true,
+            ],
+            'maestro64' => [
+                'maestro',
+                $this->generateCardNumber(58, 16),
+                true,
+            ],
+            'maestro65' => [
+                'maestro',
+                $this->generateCardNumber(59, 16),
+                true,
+            ],
+            'maestro66' => [
+                'maestro',
+                $this->generateCardNumber(60, 16),
+                true,
+            ],
+            'maestro67' => [
+                'maestro',
+                $this->generateCardNumber(61, 16),
+                true,
+            ],
+            'maestro68' => [
+                'maestro',
+                $this->generateCardNumber(62, 16),
+                true,
+            ],
+            'maestro69' => [
+                'maestro',
+                $this->generateCardNumber(63, 16),
+                true,
+            ],
+            'maestro70' => [
+                'maestro',
+                $this->generateCardNumber(64, 16),
+                true,
+            ],
+            'maestro71' => [
+                'maestro',
+                $this->generateCardNumber(65, 16),
+                true,
+            ],
+            'maestro72' => [
+                'maestro',
+                $this->generateCardNumber(66, 16),
+                true,
+            ],
+            'maestro73' => [
+                'maestro',
+                $this->generateCardNumber(67, 16),
+                true,
+            ],
+            'maestro74' => [
+                'maestro',
+                $this->generateCardNumber(68, 16),
+                true,
+            ],
+            'maestro75' => [
+                'maestro',
+                $this->generateCardNumber(69, 16),
+                true,
+            ],
+            'maestro91' => [
+                'maestro',
+                $this->generateCardNumber(50, 18),
+                true,
+            ],
+            'maestro92' => [
+                'maestro',
+                $this->generateCardNumber(56, 18),
+                true,
+            ],
+            'maestro93' => [
+                'maestro',
+                $this->generateCardNumber(57, 18),
+                true,
+            ],
+            'maestro94' => [
+                'maestro',
+                $this->generateCardNumber(58, 18),
+                true,
+            ],
+            'maestro95' => [
+                'maestro',
+                $this->generateCardNumber(59, 18),
+                true,
+            ],
+            'maestro96' => [
+                'maestro',
+                $this->generateCardNumber(60, 18),
+                true,
+            ],
+            'maestro97' => [
+                'maestro',
+                $this->generateCardNumber(61, 18),
+                true,
+            ],
+            'maestro98' => [
+                'maestro',
+                $this->generateCardNumber(62, 18),
+                true,
+            ],
+            'maestro99' => [
+                'maestro',
+                $this->generateCardNumber(63, 18),
+                true,
+            ],
+            'maestro100' => [
+                'maestro',
+                $this->generateCardNumber(64, 18),
+                true,
+            ],
+            'maestro101' => [
+                'maestro',
+                $this->generateCardNumber(65, 18),
+                true,
+            ],
+            'maestro102' => [
+                'maestro',
+                $this->generateCardNumber(66, 18),
+                true,
+            ],
+            'maestro103' => [
+                'maestro',
+                $this->generateCardNumber(67, 18),
+                true,
+            ],
+            'maestro104' => [
+                'maestro',
+                $this->generateCardNumber(68, 18),
+                true,
+            ],
+            'maestro105' => [
+                'maestro',
+                $this->generateCardNumber(69, 18),
+                true,
+            ],
+            'maestro106' => [
+                'maestro',
+                $this->generateCardNumber(50, 19),
+                true,
+            ],
+            'maestro107' => [
+                'maestro',
+                $this->generateCardNumber(56, 19),
+                true,
+            ],
+            'maestro108' => [
+                'maestro',
+                $this->generateCardNumber(57, 19),
+                true,
+            ],
+            'maestro109' => [
+                'maestro',
+                $this->generateCardNumber(58, 19),
+                true,
+            ],
+            'maestro110' => [
+                'maestro',
+                $this->generateCardNumber(59, 19),
+                true,
+            ],
+            'maestro111' => [
+                'maestro',
+                $this->generateCardNumber(60, 19),
+                true,
+            ],
+            'maestro112' => [
+                'maestro',
+                $this->generateCardNumber(61, 19),
+                true,
+            ],
+            'maestro113' => [
+                'maestro',
+                $this->generateCardNumber(62, 19),
+                true,
+            ],
+            'maestro114' => [
+                'maestro',
+                $this->generateCardNumber(63, 19),
+                true,
+            ],
+            'maestro115' => [
+                'maestro',
+                $this->generateCardNumber(64, 19),
+                true,
+            ],
+            'maestro116' => [
+                'maestro',
+                $this->generateCardNumber(65, 19),
+                true,
+            ],
+            'maestro117' => [
+                'maestro',
+                $this->generateCardNumber(66, 19),
+                true,
+            ],
+            'maestro118' => [
+                'maestro',
+                $this->generateCardNumber(67, 19),
+                true,
+            ],
+            'maestro119' => [
+                'maestro',
+                $this->generateCardNumber(68, 19),
+                true,
+            ],
+            'maestro120' => [
+                'maestro',
+                $this->generateCardNumber(69, 19),
+                true,
+            ],
+            'dankort1' => [
+                'dankort',
+                $this->generateCardNumber(5019, 16),
+                true,
+            ],
+            'dankort2' => [
+                'dankort',
+                $this->generateCardNumber(4175, 16),
+                true,
+            ],
+            'dankort3' => [
+                'dankort',
+                $this->generateCardNumber(4571, 16),
+                true,
+            ],
+            'dankort4' => [
+                'dankort',
+                $this->generateCardNumber(4, 16),
+                true,
+            ],
+            'mir1' => [
+                'mir',
+                $this->generateCardNumber(2200, 16),
+                true,
+            ],
+            'mir2' => [
+                'mir',
+                $this->generateCardNumber(2201, 16),
+                true,
+            ],
+            'mir3' => [
+                'mir',
+                $this->generateCardNumber(2202, 16),
+                true,
+            ],
+            'mir4' => [
+                'mir',
+                $this->generateCardNumber(2203, 16),
+                true,
+            ],
+            'mir5' => [
+                'mir',
+                $this->generateCardNumber(2204, 16),
+                true,
+            ],
+            'mastercard1' => [
+                'mastercard',
+                $this->generateCardNumber(51, 16),
+                true,
+            ],
+            'mastercard2' => [
+                'mastercard',
+                $this->generateCardNumber(52, 16),
+                true,
+            ],
+            'mastercard3' => [
+                'mastercard',
+                $this->generateCardNumber(53, 16),
+                true,
+            ],
+            'mastercard4' => [
+                'mastercard',
+                $this->generateCardNumber(54, 16),
+                true,
+            ],
+            'mastercard5' => [
+                'mastercard',
+                $this->generateCardNumber(55, 16),
+                true,
+            ],
+            'mastercard6' => [
+                'mastercard',
+                $this->generateCardNumber(22, 16),
+                true,
+            ],
+            'mastercard7' => [
+                'mastercard',
+                $this->generateCardNumber(23, 16),
+                true,
+            ],
+            'mastercard8' => [
+                'mastercard',
+                $this->generateCardNumber(24, 16),
+                true,
+            ],
+            'mastercard9' => [
+                'mastercard',
+                $this->generateCardNumber(25, 16),
+                true,
+            ],
+            'mastercard10' => [
+                'mastercard',
+                $this->generateCardNumber(26, 16),
+                true,
+            ],
+            'mastercard11' => [
+                'mastercard',
+                $this->generateCardNumber(27, 16),
+                true,
+            ],
+            'visa1' => [
+                'visa',
+                $this->generateCardNumber(4, 13),
+                true,
+            ],
+            'visa2' => [
+                'visa',
+                $this->generateCardNumber(4, 16),
+                true,
+            ],
+            'visa3' => [
+                'visa',
+                $this->generateCardNumber(4, 19),
+                true,
+            ],
+            'uatp' => [
+                'uatp',
+                $this->generateCardNumber(1, 15),
+                true,
+            ],
+            'verve1' => [
+                'verve',
+                $this->generateCardNumber(506, 16),
+                true,
+            ],
+            'verve2' => [
+                'verve',
+                $this->generateCardNumber(650, 16),
+                true,
+            ],
+            'verve3' => [
+                'verve',
+                $this->generateCardNumber(506, 19),
+                true,
+            ],
+            'verve4' => [
+                'verve',
+                $this->generateCardNumber(650, 19),
+                true,
+            ],
+            'cibc1' => [
+                'cibc',
+                $this->generateCardNumber(4506, 16),
+                true,
+            ],
+            'rbc1' => [
+                'rbc',
+                $this->generateCardNumber(45, 16),
+                true,
+            ],
+            'tdtrust' => [
+                'tdtrust',
+                $this->generateCardNumber(589297, 16),
+                true,
+            ],
+            'scotia1' => [
+                'scotia',
+                $this->generateCardNumber(4536, 16),
+                true,
+            ],
+            'bmoabm1' => [
+                'bmoabm',
+                $this->generateCardNumber(500, 16),
+                true,
+            ],
+            'hsbc1' => [
+                'hsbc',
+                $this->generateCardNumber(56, 16),
+                true,
+            ],
+            'hsbc2' => [
+                'hsbc',
+                $this->generateCardNumber(57, 16),
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * Generate a fake credit card number that still passes the Luhn algorithm.
+     */
+    private function generateCardNumber(int $prefix, int $length): string
+    {
+        $prefix = (string) $prefix;
+        $cursor = strlen($prefix);
+
+        $digits = str_split($prefix);
+        $digits = array_pad($digits, $length, '0');
+
+        while ($cursor < $length - 1) {
+            $digits[$cursor++] = (string) random_int(0, 9);
+        }
+
+        $digits[$length - 1] = (string) $this->calculateLuhnChecksum($digits, $length);
+
+        return implode('', $digits);
+    }
+
+    private function calculateLuhnChecksum(array $digits, int $length): int
+    {
+        $parity = $length % 2;
+
+        $sum = 0;
+
+        for ($i = $length - 1; $i >= 0; $i--) {
+            $current = $digits[$i];
+
+            if ($i % 2 === $parity) {
+                $current *= 2;
+
+                if ($current > 9) {
+                    $current -= 9;
+                }
+            }
+
+            $sum += $current;
+        }
+
+        return ($sum * 9) % 10;
+    }
+}
diff --git a/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php b/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php
new file mode 100644
index 000000000000..d292a17846e7
--- /dev/null
+++ b/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php
@@ -0,0 +1,222 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation\StrictRules;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use CodeIgniter\Validation\Validation;
+use Config\Database;
+use Config\Services;
+use Tests\Support\Validation\TestRules;
+
+/**
+ * @internal
+ *
+ * @group DatabaseLive
+ */
+final class DatabaseRelatedRulesTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+
+    /**
+     * @var Validation
+     */
+    private $validation;
+
+    private $config = [
+        'ruleSets' => [
+            Rules::class,
+            FormatRules::class,
+            FileRules::class,
+            CreditCardRules::class,
+            TestRules::class,
+        ],
+        'groupA' => [
+            'foo' => 'required|min_length[5]',
+        ],
+        'groupA_errors' => [
+            'foo' => [
+                'min_length' => 'Shame, shame. Too short.',
+            ],
+        ],
+    ];
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->validation = new Validation((object) $this->config, Services::renderer());
+        $this->validation->reset();
+    }
+
+    public function testIsUniqueFalse(): void
+    {
+        Database::connect()
+            ->table('user')
+            ->insert([
+                'name'    => 'Derek Travis',
+                'email'   => 'derek@world.com',
+                'country' => 'Elbonia',
+            ]);
+
+        $data = ['email' => 'derek@world.com'];
+        $this->validation->setRules(['email' => 'is_unique[user.email]']);
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testIsUniqueTrue(): void
+    {
+        $data = ['email' => 'derek@world.co.uk'];
+        $this->validation->setRules(['email' => 'is_unique[user.email]']);
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testIsUniqueIgnoresParams(): void
+    {
+        $db = Database::connect();
+        $db
+            ->table('user')
+            ->insert([
+                'name'    => 'Developer A',
+                'email'   => 'deva@example.com',
+                'country' => 'Elbonia',
+            ]);
+        $row = $db->table('user')
+            ->limit(1)
+            ->get()
+            ->getRow();
+
+        $data = ['email' => 'derek@world.co.uk'];
+        $this->validation->setRules(['email' => "is_unique[user.email,id,{$row->id}]"]);
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testIsUniqueIgnoresParamsPlaceholders(): void
+    {
+        $this->hasInDatabase('user', [
+            'name'    => 'Derek',
+            'email'   => 'derek@world.co.uk',
+            'country' => 'GB',
+        ]);
+
+        $row = Database::connect()
+            ->table('user')
+            ->limit(1)
+            ->get()
+            ->getRow();
+
+        $data = [
+            'id'    => $row->id,
+            'email' => 'derek@world.co.uk',
+        ];
+
+        $this->validation->setRules(['email' => 'is_unique[user.email,id,{id}]']);
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testIsUniqueByManualRun(): void
+    {
+        Database::connect()
+            ->table('user')
+            ->insert([
+                'name'    => 'Developer A',
+                'email'   => 'deva@example.com',
+                'country' => 'Elbonia',
+            ]);
+
+        $this->assertFalse((new Rules())->is_unique('deva@example.com', 'user.email,id,{id}', []));
+    }
+
+    public function testIsNotUniqueFalse(): void
+    {
+        Database::connect()
+            ->table('user')
+            ->insert([
+                'name'    => 'Derek Travis',
+                'email'   => 'derek@world.com',
+                'country' => 'Elbonia',
+            ]);
+
+        $data = ['email' => 'derek1@world.com'];
+        $this->validation->setRules(['email' => 'is_not_unique[user.email]']);
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testIsNotUniqueTrue(): void
+    {
+        Database::connect()
+            ->table('user')
+            ->insert([
+                'name'    => 'Derek Travis',
+                'email'   => 'derek@world.com',
+                'country' => 'Elbonia',
+            ]);
+
+        $data = ['email' => 'derek@world.com'];
+        $this->validation->setRules(['email' => 'is_not_unique[user.email]']);
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testIsNotUniqueIgnoresParams(): void
+    {
+        $db = Database::connect();
+        $db->table('user')
+            ->insert([
+                'name'    => 'Developer A',
+                'email'   => 'deva@example.com',
+                'country' => 'Elbonia',
+            ]);
+
+        $row = $db->table('user')
+            ->limit(1)
+            ->get()
+            ->getRow();
+
+        $data = ['email' => 'derek@world.co.uk'];
+        $this->validation->setRules(['email' => "is_not_unique[user.email,id,{$row->id}]"]);
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function testIsNotUniqueIgnoresParamsPlaceholders(): void
+    {
+        $this->hasInDatabase('user', [
+            'name'    => 'Derek',
+            'email'   => 'derek@world.co.uk',
+            'country' => 'GB',
+        ]);
+
+        $row = Database::connect()
+            ->table('user')
+            ->limit(1)
+            ->get()
+            ->getRow();
+
+        $data = [
+            'id'    => $row->id,
+            'email' => 'derek@world.co.uk',
+        ];
+        $this->validation->setRules(['email' => 'is_not_unique[user.email,id,{id}]']);
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testIsNotUniqueByManualRun(): void
+    {
+        Database::connect()
+            ->table('user')
+            ->insert([
+                'name'    => 'Developer A',
+                'email'   => 'deva@example.com',
+                'country' => 'Elbonia',
+            ]);
+
+        $this->assertTrue((new Rules())->is_not_unique('deva@example.com', 'user.email,id,{id}', []));
+    }
+}
diff --git a/tests/system/Validation/StrictRules/FileRulesTest.php b/tests/system/Validation/StrictRules/FileRulesTest.php
new file mode 100644
index 000000000000..c287fec7f50a
--- /dev/null
+++ b/tests/system/Validation/StrictRules/FileRulesTest.php
@@ -0,0 +1,288 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation\StrictRules;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Validation\Validation;
+use Config\Services;
+use Tests\Support\Validation\TestRules;
+
+/**
+ * @internal
+ */
+final class FileRulesTest extends CIUnitTestCase
+{
+    /**
+     * @var Validation
+     */
+    private $validation;
+
+    private $config = [
+        'ruleSets' => [
+            Rules::class,
+            FormatRules::class,
+            FileRules::class,
+            CreditCardRules::class,
+            TestRules::class,
+        ],
+        'groupA' => [
+            'foo' => 'required|min_length[5]',
+        ],
+        'groupA_errors' => [
+            'foo' => [
+                'min_length' => 'Shame, shame. Too short.',
+            ],
+        ],
+    ];
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->validation = new Validation((object) $this->config, Services::renderer());
+        $this->validation->reset();
+
+        $_FILES = [
+            'avatar' => [
+                'tmp_name' => TESTPATH . '_support/Validation/uploads/phpUxc0ty',
+                'name'     => 'my-avatar.png',
+                'size'     => 4614,
+                'type'     => 'image/png',
+                'error'    => 0,
+                'width'    => 640,
+                'height'   => 400,
+            ],
+            'bigfile' => [
+                'tmp_name' => TESTPATH . '_support/Validation/uploads/phpUxc0ty',
+                'name'     => 'my-big-file.png',
+                'size'     => 1024000,
+                'type'     => 'image/png',
+                'error'    => UPLOAD_ERR_OK,
+                'width'    => 640,
+                'height'   => 400,
+            ],
+            'photo' => [
+                'tmp_name' => TESTPATH . '_support/Validation/uploads/phpUxc0ty',
+                'name'     => 'my-photo.png',
+                'size'     => 4614,
+                'type'     => 'image/png',
+                'error'    => UPLOAD_ERR_INI_SIZE,
+                'width'    => 640,
+                'height'   => 400,
+            ],
+            'images' => [
+                'tmp_name' => [
+                    TESTPATH . '_support/Validation/uploads/phpUxc0ty',
+                    TESTPATH . '_support/Validation/uploads/phpUxc0ty',
+                ],
+                'name' => [
+                    'my_avatar.png',
+                    'my_bigfile.png',
+                ],
+                'size' => [
+                    4614,
+                    1024000,
+                ],
+                'type' => [
+                    'image/png',
+                    'image/png',
+                ],
+                'error' => [
+                    UPLOAD_ERR_OK,
+                    UPLOAD_ERR_OK,
+                ],
+                'width' => [
+                    640,
+                    640,
+                ],
+                'height' => [
+                    400,
+                    400,
+                ],
+            ],
+            'photos' => [
+                'tmp_name' => [
+                    TESTPATH . '_support/Validation/uploads/phpUxc0ty',
+                    TESTPATH . '_support/Validation/uploads/phpUxc0ty',
+                ],
+                'name' => [
+                    'my_avatar.png',
+                    'my_bigfile.png',
+                ],
+                'size' => [
+                    4614,
+                    1024000,
+                ],
+                'type' => [
+                    'image/png',
+                    'image/png',
+                ],
+                'error' => [
+                    UPLOAD_ERR_INI_SIZE,
+                    UPLOAD_ERR_OK,
+                ],
+                'width' => [
+                    640,
+                    640,
+                ],
+                'height' => [
+                    400,
+                    400,
+                ],
+            ],
+        ];
+    }
+
+    public function testUploadedTrue(): void
+    {
+        $this->validation->setRules(['avatar' => 'uploaded[avatar]']);
+        $this->assertTrue($this->validation->run([]));
+    }
+
+    public function testUploadedFalse(): void
+    {
+        $this->validation->setRules(['avatar' => 'uploaded[userfile]']);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testUploadedArrayReturnsTrue(): void
+    {
+        $this->validation->setRules(['images' => 'uploaded[images]']);
+        $this->assertTrue($this->validation->run([]));
+    }
+
+    public function testUploadedArrayReturnsFalse(): void
+    {
+        $this->validation->setRules(['photos' => 'uploaded[photos]']);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testMaxSize(): void
+    {
+        $this->validation->setRules(['avatar' => 'max_size[avatar,100]']);
+        $this->assertTrue($this->validation->run([]));
+    }
+
+    public function testMaxSizeBigFile(): void
+    {
+        $this->validation->setRules(['bigfile' => 'max_size[bigfile,9999]']);
+        $this->assertTrue($this->validation->run([]));
+    }
+
+    public function testMaxSizeFail(): void
+    {
+        $this->validation->setRules(['avatar' => 'max_size[avatar,4]']);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testMaxSizeFailDueToUploadMaxFilesizeExceededInPhpIni(): void
+    {
+        $this->validation->setRules(['photo' => 'max_size[photo,100]']);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testMaxSizeBigFileFail(): void
+    {
+        $this->validation->setRules(['bigfile' => 'max_size[bigfile,10]']);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testMaxSizeBad(): void
+    {
+        $this->validation->setRules(['avatar' => 'max_size[userfile,50]']);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testMaxDims(): void
+    {
+        $this->validation->setRules(['avatar' => 'max_dims[avatar,640,480]']);
+        $this->assertTrue($this->validation->run([]));
+    }
+
+    public function testMaxDimsFail(): void
+    {
+        $this->validation->setRules(['avatar' => 'max_dims[avatar,600,480]']);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testMaxDimsBad(): void
+    {
+        $this->validation->setRules(['avatar' => 'max_dims[unknown,640,480]']);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testIsImage(): void
+    {
+        $this->validation->setRules(['avatar' => 'is_image[avatar]']);
+        $this->assertTrue($this->validation->run([]));
+    }
+
+    public function testIsntImage(): void
+    {
+        $_FILES['stuff'] = [
+            'tmp_name' => TESTPATH . '_support/Validation/uploads/abc77tz',
+            'name'     => 'address.book',
+            'size'     => 12345,
+            'type'     => 'application/address',
+            'error'    => UPLOAD_ERR_OK,
+        ];
+        $this->validation->setRules(['avatar' => 'is_image[stuff]']);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testAlsoIsntImage(): void
+    {
+        $this->validation->setRules(['avatar' => 'is_image[unknown]']);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testMimeTypeOk(): void
+    {
+        $this->validation->setRules([
+            'avatar' => 'mime_in[avatar,image/jpg,image/jpeg,image/gif,image/png]',
+        ]);
+        $this->assertTrue($this->validation->run([]));
+    }
+
+    public function testMimeTypeNotOk(): void
+    {
+        $this->validation->setRules([
+            'avatar' => 'mime_in[avatar,application/xls,application/doc,application/ppt]',
+        ]);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testMimeTypeImpossible(): void
+    {
+        $this->validation->setRules([
+            'avatar' => 'mime_in[unknown,application/xls,application/doc,application/ppt]',
+        ]);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testExtensionOk(): void
+    {
+        $this->validation->setRules(['avatar' => 'ext_in[avatar,jpg,jpeg,gif,png]']);
+        $this->assertTrue($this->validation->run([]));
+    }
+
+    public function testExtensionNotOk(): void
+    {
+        $this->validation->setRules(['avatar' => 'ext_in[avatar,xls,doc,ppt]']);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testExtensionImpossible(): void
+    {
+        $this->validation->setRules(['avatar' => 'ext_in[unknown,xls,doc,ppt]']);
+        $this->assertFalse($this->validation->run([]));
+    }
+}
diff --git a/tests/system/Validation/StrictRules/FormatRulesTest.php b/tests/system/Validation/StrictRules/FormatRulesTest.php
new file mode 100644
index 000000000000..9e35aaa20ec1
--- /dev/null
+++ b/tests/system/Validation/StrictRules/FormatRulesTest.php
@@ -0,0 +1,1374 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation\StrictRules;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Validation\Validation;
+use Config\Services;
+use Generator;
+use Tests\Support\Validation\TestRules;
+
+/**
+ * @internal
+ */
+final class FormatRulesTest extends CIUnitTestCase
+{
+    public const ALPHABET     = 'abcdefghijklmnopqrstuvwxyzABCDEFGHLIJKLMNOPQRSTUVWXYZ';
+    public const ALPHANUMERIC = 'abcdefghijklmnopqrstuvwxyzABCDEFGHLIJKLMNOPQRSTUVWXYZ0123456789';
+
+    /**
+     * @var Validation
+     */
+    private $validation;
+
+    private $config = [
+        'ruleSets' => [
+            Rules::class,
+            FormatRules::class,
+            FileRules::class,
+            CreditCardRules::class,
+            TestRules::class,
+        ],
+        'groupA' => [
+            'foo' => 'required|min_length[5]',
+        ],
+        'groupA_errors' => [
+            'foo' => [
+                'min_length' => 'Shame, shame. Too short.',
+            ],
+        ],
+    ];
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->validation = new Validation((object) $this->config, Services::renderer());
+        $this->validation->reset();
+    }
+
+    public function testRegexMatch(): void
+    {
+        $data = [
+            'foo'   => 'abcde',
+            'phone' => '0987654321',
+        ];
+
+        $this->validation->setRules([
+            'foo'   => 'regex_match[/[a-z]/]',
+            'phone' => 'regex_match[/^(01[2689]|09)[0-9]{8}$/]',
+        ]);
+
+        $this->assertTrue($this->validation->run($data));
+    }
+
+    public function testRegexMatchFalse(): void
+    {
+        $data = [
+            'foo'   => 'abcde',
+            'phone' => '09876543214',
+        ];
+
+        $this->validation->setRules([
+            'foo'   => 'regex_match[\d]',
+            'phone' => 'regex_match[/^(01[2689]|09)[0-9]{8}$/]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    /**
+     * @dataProvider urlProvider
+     */
+    public function testValidURL(?string $url, bool $isLoose, bool $isStrict)
+    {
+        $data = [
+            'foo' => $url,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'valid_url',
+        ]);
+
+        $this->assertSame($isLoose, $this->validation->run($data));
+    }
+
+    /**
+     * @dataProvider urlProvider
+     */
+    public function testValidURLStrict(?string $url, bool $isLoose, bool $isStrict)
+    {
+        $data = [
+            'foo' => $url,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'valid_url_strict',
+        ]);
+
+        $this->assertSame($isStrict, $this->validation->run($data));
+    }
+
+    public function testValidURLStrictWithSchema()
+    {
+        $data = [
+            'foo' => 'http://www.codeigniter.com',
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'valid_url_strict[https]',
+        ]);
+
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    public function urlProvider(): Generator
+    {
+        yield from [
+            [
+                'www.codeigniter.com',
+                true,
+                false,
+            ],
+            [
+                'http://codeigniter.com',
+                true,
+                true,
+            ],
+            // https://bugs.php.net/bug.php?id=51192
+            [
+                'http://accept-dashes.tld',
+                true,
+                true,
+            ],
+            [
+                'http://reject_underscores',
+                false,
+                false,
+            ],
+            // https://github.com/bcit-ci/CodeIgniter/issues/4415
+            [
+                'http://[::1]/ipv6',
+                true,
+                true,
+            ],
+            [
+                'htt://www.codeigniter.com',
+                false,
+                false,
+            ],
+            [
+                '',
+                false,
+                false,
+            ],
+            // https://github.com/codeigniter4/CodeIgniter4/issues/3156
+            [
+                'codeigniter',
+                true,   // What?
+                false,
+            ],
+            [
+                'code igniter',
+                false,
+                false,
+            ],
+            [
+                null,
+                false,
+                false,
+            ],
+            [
+                'http://',
+                true,   // Why?
+                false,
+            ],
+            [
+                'http:///oops.com',
+                false,
+                false,
+            ],
+            [
+                '123.com',
+                true,
+                false,
+            ],
+            [
+                'abc.123',
+                true,
+                false,
+            ],
+            [
+                'http:8080//abc.com',
+                true,   // Insane?
+                false,
+            ],
+            [
+                'mailto:support@codeigniter.com',
+                true,
+                false,
+            ],
+            [
+                '//example.com',
+                false,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider emailProviderSingle
+     */
+    public function testValidEmail(?string $email, bool $expected): void
+    {
+        $data = [
+            'foo' => $email,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'valid_email',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    /**
+     * @dataProvider emailsProvider
+     */
+    public function testValidEmails(?string $email, bool $expected): void
+    {
+        $data = [
+            'foo' => $email,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'valid_emails',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function emailProviderSingle(): Generator
+    {
+        yield from [
+            [
+                'email@sample.com',
+                true,
+            ],
+            [
+                'valid_email',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    public function emailsProvider(): Generator
+    {
+        yield from [
+            [
+                '1@sample.com,2@sample.com',
+                true,
+            ],
+            [
+                '1@sample.com, 2@sample.com',
+                true,
+            ],
+            [
+                'email@sample.com',
+                true,
+            ],
+            [
+                '@sample.com,2@sample.com,validemail@email.ca',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+            [
+                ',',
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider ipProvider
+     */
+    public function testValidIP(?string $ip, ?string $which, bool $expected): void
+    {
+        $data = [
+            'foo' => $ip,
+        ];
+
+        $this->validation->setRules([
+            'foo' => "valid_ip[{$which}]",
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function ipProvider(): Generator
+    {
+        yield from [
+            [
+                '127.0.0.1',
+                null,
+                true,
+            ],
+            [
+                '127.0.0.1',
+                'ipv4',
+                true,
+            ],
+            [
+                '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
+                null,
+                true,
+            ],
+            [
+                '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
+                'ipv6',
+                true,
+            ],
+            [
+                '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
+                'ipv4',
+                false,
+            ],
+            [
+                '127.0.0.1',
+                'ipv6',
+                false,
+            ],
+            [
+                'H001:0db8:85a3:0000:0000:8a2e:0370:7334',
+                null,
+                false,
+            ],
+            [
+                '127.0.0.259',
+                null,
+                false,
+            ],
+            [
+                null,
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider stringProvider
+     *
+     * @param int|string $str
+     */
+    public function testString($str, bool $expected): void
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'string',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function stringProvider(): Generator
+    {
+        yield from [
+            [
+                '123',
+                true,
+            ],
+            [
+                123,
+                false,
+            ],
+            [
+                'hello',
+                true,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider alphaProvider
+     *
+     * @param $str
+     * @param $expected
+     */
+    public function testAlpha(?string $str, bool $expected): void
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'alpha',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function alphaProvider(): Generator
+    {
+        yield from [
+            [
+                self::ALPHABET,
+                true,
+            ],
+            [
+                self::ALPHABET . ' ',
+                false,
+            ],
+            [
+                self::ALPHABET . '1',
+                false,
+            ],
+            [
+                self::ALPHABET . '*',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider alphaSpaceProvider
+     */
+    public function testAlphaSpace(?string $value, bool $expected): void
+    {
+        $data = [
+            'foo' => $value,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'alpha_space',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function alphaSpaceProvider(): Generator
+    {
+        yield from [
+            [
+                null,
+                true,
+            ],
+            [
+                self::ALPHABET,
+                true,
+            ],
+            [
+                self::ALPHABET . ' ',
+                true,
+            ],
+            [
+                self::ALPHABET . "\n",
+                false,
+            ],
+            [
+                self::ALPHABET . '1',
+                false,
+            ],
+            [
+                self::ALPHABET . '*',
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider alphaNumericProvider
+     */
+    public function testAlphaNumeric(?string $str, bool $expected): void
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'alpha_numeric',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function alphaNumericProvider(): Generator
+    {
+        yield from [
+            [
+                self::ALPHANUMERIC,
+                true,
+            ],
+            [
+                self::ALPHANUMERIC . '\ ',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '_',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider alphaNumericPunctProvider
+     */
+    public function testAlphaNumericPunct(?string $str, bool $expected): void
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'alpha_numeric_punct',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function alphaNumericPunctProvider(): Generator
+    {
+        yield from [
+            [
+                self::ALPHANUMERIC . ' ~!#$%&*-_+=|:.',
+                true,
+            ],
+            [
+                self::ALPHANUMERIC . '`',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . "\n",
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '@',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '^',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '(',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . ')',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '\\',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '{',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '}',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '[',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . ']',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '"',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . "'",
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '<',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '>',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . '/',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider alphaNumericProvider
+     */
+    public function testAlphaNumericSpace(?string $str, bool $expected): void
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'alpha_numeric_space',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function alphaNumericSpaceProvider(): Generator
+    {
+        yield from [
+            [
+                ' ' . self::ALPHANUMERIC,
+                true,
+            ],
+            [
+                ' ' . self::ALPHANUMERIC . '-',
+                false,
+            ],
+            [
+                ' ' . self::ALPHANUMERIC . "\n",
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider alphaDashProvider
+     */
+    public function testAlphaDash(?string $str, bool $expected): void
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'alpha_dash',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function alphaDashProvider(): Generator
+    {
+        yield from [
+            [
+                self::ALPHANUMERIC . '-',
+                true,
+            ],
+            [
+                self::ALPHANUMERIC . '-\ ',
+                false,
+            ],
+            [
+                self::ALPHANUMERIC . "-\n",
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider hexProvider
+     */
+    public function testHex(?string $str, bool $expected): void
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'hex',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function hexProvider(): Generator
+    {
+        yield from [
+            [
+                'abcdefABCDEF0123456789',
+                true,
+            ],
+            [
+                self::ALPHANUMERIC,
+                false,
+            ],
+            [
+                'asdfjkl;',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider numericProvider
+     */
+    public function testNumeric(?string $str, bool $expected): void
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'numeric',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function numericProvider(): Generator
+    {
+        yield from [
+            [
+                '0',
+                true,
+            ],
+            [
+                '12314',
+                true,
+            ],
+            [
+                '-42',
+                true,
+            ],
+            [
+                '+42',
+                true,
+            ],
+            [
+                "+42\n",
+                false,
+            ],
+            [
+                '123a',
+                false,
+            ],
+            [
+                '--1',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5374
+     *
+     * @dataProvider integerInvalidTypeDataProvider
+     *
+     * @param mixed $value
+     */
+    public function testIntegerWithInvalidTypeData($value, bool $expected): void
+    {
+        $this->validation->setRules([
+            'foo' => 'integer',
+        ]);
+
+        $data = [
+            'foo' => $value,
+        ];
+        $this->assertsame($expected, $this->validation->run($data));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5374
+     *
+     * @dataProvider integerInvalidTypeDataProvider
+     *
+     * @param mixed $value
+     */
+    public function testNumericWithInvalidTypeData($value, bool $expected): void
+    {
+        $this->validation->setRules([
+            'foo' => 'numeric',
+        ]);
+
+        $data = [
+            'foo' => $value,
+        ];
+        $this->assertsame($expected, $this->validation->run($data));
+    }
+
+    public function integerInvalidTypeDataProvider(): Generator
+    {
+        yield 'array with int' => [
+            [555],
+            false,  // true in v4.1.5 and earlier
+        ];
+
+        yield 'empty array' => [
+            [],
+            false,  // true in v4.1.5 and earlier
+        ];
+
+        yield 'bool true' => [
+            true,
+            false,  // true in v4.1.5 and earlier
+        ];
+
+        yield 'bool false' => [
+            false,
+            false,
+        ];
+
+        yield 'null' => [
+            null,
+            false,
+        ];
+    }
+
+    /**
+     * @dataProvider integerProvider
+     */
+    public function testInteger(?string $str, bool $expected): void
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'integer',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function integerProvider(): Generator
+    {
+        yield from [
+            [
+                '0',
+                true,
+            ],
+            [
+                '42',
+                true,
+            ],
+            [
+                '-1',
+                true,
+            ],
+            [
+                "+42\n",
+                false,
+            ],
+            [
+                '123a',
+                false,
+            ],
+            [
+                '1.9',
+                false,
+            ],
+            [
+                '--1',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider decimalProvider
+     */
+    public function testDecimal(?string $str, bool $expected): void
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'decimal',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function decimalProvider(): Generator
+    {
+        yield from [
+            [
+                '1.0',
+                true,
+            ],
+            [
+                '-0.98',
+                true,
+            ],
+            [
+                '0',
+                true,
+            ],
+            [
+                "0\n",
+                false,
+            ],
+            [
+                '1.0a',
+                false,
+            ],
+            [
+                '-i',
+                false,
+            ],
+            [
+                '--1',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+            [
+                '.25',
+                true,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider naturalProvider
+     */
+    public function testNatural(?string $str, bool $expected): void
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'is_natural',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function naturalProvider(): Generator
+    {
+        yield from [
+            [
+                '0',
+                true,
+            ],
+            [
+                '12',
+                true,
+            ],
+            [
+                '42a',
+                false,
+            ],
+            [
+                '-1',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider naturalZeroProvider
+     */
+    public function testNaturalNoZero(?string $str, bool $expected): void
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'is_natural_no_zero',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function naturalZeroProvider(): Generator
+    {
+        yield from [
+            [
+                '0',
+                false,
+            ],
+            [
+                '12',
+                true,
+            ],
+            [
+                '42a',
+                false,
+            ],
+            [
+                '-1',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider base64Provider
+     */
+    public function testBase64(?string $str, bool $expected): void
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'valid_base64',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function base64Provider(): Generator
+    {
+        yield from [
+            [
+                base64_encode('string'),
+                true,
+            ],
+            [
+                'FA08GG',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider jsonProvider
+     */
+    public function testJson(?string $str, bool $expected): void
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'valid_json',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function jsonProvider(): Generator
+    {
+        yield from [
+            [
+                'null',
+                true,
+            ],
+            [
+                '"null"',
+                true,
+            ],
+            [
+                '600100825',
+                true,
+            ],
+            [
+                '{"A":"Yay.", "B":[0,5]}',
+                true,
+            ],
+            [
+                '[0,"2",2.2,"3.3"]',
+                true,
+            ],
+            [
+                null,
+                false,
+            ],
+            [
+                '600-Nope. Should not pass.',
+                false,
+            ],
+            [
+                '{"A":SHOULD_NOT_PASS}',
+                false,
+            ],
+            [
+                '[0,"2",2.2 "3.3"]',
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider timezoneProvider
+     */
+    public function testTimeZone(?string $str, bool $expected): void
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => 'timezone',
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function timezoneProvider(): Generator
+    {
+        yield from [
+            [
+                'America/Chicago',
+                true,
+            ],
+            [
+                'america/chicago',
+                false,
+            ],
+            [
+                'foo/bar',
+                false,
+            ],
+            [
+                null,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider validDateProvider
+     */
+    public function testValidDate(?string $str, ?string $format, bool $expected): void
+    {
+        $data = [
+            'foo' => $str,
+        ];
+
+        $this->validation->setRules([
+            'foo' => "valid_date[{$format}]",
+        ]);
+
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function validDateProvider(): Generator
+    {
+        yield from [
+            [
+                'Sun',
+                'D',
+                true,
+            ],
+            [
+                'Sun',
+                'd',
+                false,
+            ],
+            [
+                'Sun',
+                null,
+                true,
+            ],
+            [
+                '1500',
+                'Y',
+                true,
+            ],
+            [
+                '1500',
+                'y',
+                false,
+            ],
+            [
+                '1500',
+                null,
+                true,
+            ],
+            [
+                '09:26:05',
+                'H:i:s',
+                true,
+            ],
+            [
+                '09:26:5',
+                'H:i:s',
+                false,
+            ],
+            [
+                '1992-02-29',
+                'Y-m-d',
+                true,
+            ],
+            [
+                '1991-02-29',
+                'Y-m-d',
+                false,
+            ],
+            [
+                '1718-05-10 15:25:59',
+                'Y-m-d H:i:s',
+                true,
+            ],
+            [
+                '1718-05-10 15:5:59',
+                'Y-m-d H:i:s',
+                false,
+            ],
+            [
+                'Thu, 31 Oct 2013 13:31:00',
+                'D, d M Y H:i:s',
+                true,
+            ],
+            [
+                'Thu, 31 Jun 2013 13:31:00',
+                'D, d M Y H:i:s',
+                false,
+            ],
+            [
+                'Thu, 31 Jun 2013 13:31:00',
+                null,
+                true,
+            ],
+            [
+                '07.05.03',
+                'm.d.y',
+                true,
+            ],
+            [
+                '07.05.1803',
+                'm.d.y',
+                false,
+            ],
+            [
+                '19890109',
+                'Ymd',
+                true,
+            ],
+            [
+                '198919',
+                'Ymd',
+                false,
+            ],
+            [
+                '2, 7, 2001',
+                'j, n, Y',
+                true,
+            ],
+            [
+                '2, 17, 2001',
+                'j, n, Y',
+                false,
+            ],
+            [
+                '09-42-25, 12-11-17',
+                'h-i-s, j-m-y',
+                true,
+            ],
+            [
+                '09-42-25, 12-00-17',
+                'h-i-s, j-m-y',
+                false,
+            ],
+            [
+                '09-42-25, 12-00-17',
+                null,
+                false,
+            ],
+            [
+                'November 12, 2017, 9:42 am',
+                'F j, Y, g:i a',
+                true,
+            ],
+            [
+                'November 12, 2017, 19:42 am',
+                'F j, Y, g:i a',
+                false,
+            ],
+            [
+                'November 12, 2017, 9:42 am',
+                null,
+                true,
+            ],
+            [
+                'Monday 8th of August 2005 03:12:46 PM',
+                'l jS \of F Y h:i:s A',
+                true,
+            ],
+            [
+                'Monday 8th of August 2005 13:12:46 PM',
+                'l jS \of F Y h:i:s A',
+                false,
+            ],
+            [
+                '23:01:59 is now',
+                'H:m:s \i\s \n\o\w',
+                true,
+            ],
+            [
+                '23:01:59 is now',
+                'H:m:s is now',
+                false,
+            ],
+            [
+                '12/11/2017',
+                'd/m/Y',
+                true,
+            ],
+        ];
+    }
+}
diff --git a/tests/system/Validation/StrictRules/RulesTest.php b/tests/system/Validation/StrictRules/RulesTest.php
new file mode 100644
index 000000000000..dd0a38289afa
--- /dev/null
+++ b/tests/system/Validation/StrictRules/RulesTest.php
@@ -0,0 +1,624 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation\StrictRules;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Validation\Validation;
+use Config\Services;
+use Generator;
+use stdClass;
+use Tests\Support\Validation\TestRules;
+
+/**
+ * @internal
+ */
+final class RulesTest extends CIUnitTestCase
+{
+    /**
+     * @var Validation
+     */
+    private $validation;
+
+    private $config = [
+        'ruleSets' => [
+            Rules::class,
+            FormatRules::class,
+            FileRules::class,
+            CreditCardRules::class,
+            TestRules::class,
+        ],
+        'groupA' => [
+            'foo' => 'required|min_length[5]',
+        ],
+        'groupA_errors' => [
+            'foo' => [
+                'min_length' => 'Shame, shame. Too short.',
+            ],
+        ],
+    ];
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->validation = new Validation((object) $this->config, Services::renderer());
+        $this->validation->reset();
+    }
+
+    /**
+     * @dataProvider provideRequiredCases
+     */
+    public function testRequired(array $data, bool $expected): void
+    {
+        $this->validation->setRules(['foo' => 'required']);
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function provideRequiredCases(): Generator
+    {
+        yield from [
+            [['foo' => null], false],
+            [['foo' => 123], true],
+            [['foo' => null, 'bar' => 123], false],
+            [['foo' => [123]], true],
+            [['foo' => []], false],
+            [['foo' => new stdClass()], true],
+        ];
+    }
+
+    /**
+     * @dataProvider ifExistProvider
+     */
+    public function testIfExist(array $rules, array $data, bool $expected): void
+    {
+        $this->validation->setRules($rules);
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function ifExistProvider(): Generator
+    {
+        yield from [
+            [
+                ['foo' => 'required'],
+                ['foo' => ''],
+                false,
+            ],
+            [
+                ['foo' => 'required'],
+                ['foo' => null],
+                false,
+            ],
+            [
+                ['foo' => 'if_exist|required'],
+                ['foo' => ''],
+                false,
+            ],
+            // Input data does not exist then the other rules will be ignored
+            [
+                ['foo' => 'if_exist|required'],
+                [],
+                true,
+            ],
+            // Testing for multi-dimensional data
+            [
+                ['foo.bar' => 'if_exist|required'],
+                ['foo' => ['bar' => '']],
+                false,
+            ],
+            [
+                ['foo.bar' => 'if_exist|required'],
+                ['foo' => []],
+                true,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider providePermitEmptyCases
+     */
+    public function testPermitEmpty(array $rules, array $data, bool $expected): void
+    {
+        $this->validation->setRules($rules);
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function providePermitEmptyCases(): Generator
+    {
+        yield from [
+            [
+                ['foo' => 'permit_empty'],
+                ['foo' => ''],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty'],
+                ['foo' => '0'],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty'],
+                ['foo' => 0],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty'],
+                ['foo' => 0.0],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty'],
+                ['foo' => null],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty'],
+                ['foo' => false],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty|valid_email'],
+                ['foo' => ''],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty|valid_email'],
+                ['foo' => 'user@domain.tld'],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty|valid_email'],
+                ['foo' => 'invalid'],
+                false,
+            ],
+            // Required has more priority
+            [
+                ['foo' => 'permit_empty|required|valid_email'],
+                ['foo' => ''],
+                false,
+            ],
+            [
+                ['foo' => 'permit_empty|required'],
+                ['foo' => ''],
+                false,
+            ],
+            [
+                ['foo' => 'permit_empty|required'],
+                ['foo' => null],
+                false,
+            ],
+            [
+                ['foo' => 'permit_empty|required'],
+                ['foo' => false],
+                false,
+            ],
+            // This tests will return true because the input data is trimmed
+            [
+                ['foo' => 'permit_empty|required'],
+                ['foo' => '0'],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty|required'],
+                ['foo' => 0],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty|required'],
+                ['foo' => 0.0],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty|required_with[bar]'],
+                ['foo' => ''],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty|required_with[bar]'],
+                ['foo' => 0],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty|required_with[bar]'],
+                ['foo' => 0.0, 'bar' => 1],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty|required_with[bar]'],
+                ['foo' => '', 'bar' => 1],
+                false,
+            ],
+            [
+                ['foo' => 'permit_empty|required_without[bar]'],
+                ['foo' => ''],
+                false,
+            ],
+            [
+                ['foo' => 'permit_empty|required_without[bar]'],
+                ['foo' => 0],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty|required_without[bar]'],
+                ['foo' => 0.0, 'bar' => 1],
+                true,
+            ],
+            [
+                ['foo' => 'permit_empty|required_without[bar]'],
+                ['foo' => '', 'bar' => 1],
+                true,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider provideMatchesCases
+     */
+    public function testMatches(array $data, bool $expected): void
+    {
+        $this->validation->setRules(['foo' => 'matches[bar]']);
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function provideMatchesCases(): Generator
+    {
+        yield from [
+            [['foo' => null, 'bar' => null], true],
+            [['foo' => 'match', 'bar' => 'match'], true],
+            [['foo' => 'match', 'bar' => 'nope'], false],
+        ];
+    }
+
+    /**
+     * @dataProvider provideMatchesNestedCases
+     */
+    public function testMatchesNested(array $data, bool $expected): void
+    {
+        $this->validation->setRules(['nested.foo' => 'matches[nested.bar]']);
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function provideMatchesNestedCases(): Generator
+    {
+        yield from [
+            [['nested' => ['foo' => 'match', 'bar' => 'match']], true],
+            [['nested' => ['foo' => 'match', 'bar' => 'nope']], false],
+        ];
+    }
+
+    /**
+     * @dataProvider provideMatchesCases
+     */
+    public function testDiffers(array $data, bool $expected): void
+    {
+        $this->validation->setRules(['foo' => 'differs[bar]']);
+        $this->assertSame(! $expected, $this->validation->run($data));
+    }
+
+    /**
+     * @dataProvider provideMatchesNestedCases
+     */
+    public function testDiffersNested(array $data, bool $expected): void
+    {
+        $this->validation->setRules(['nested.foo' => 'differs[nested.bar]']);
+        $this->assertSame(! $expected, $this->validation->run($data));
+    }
+
+    /**
+     * @dataProvider provideEqualsCases
+     */
+    public function testEquals(array $data, string $param, bool $expected): void
+    {
+        $this->validation->setRules(['foo' => "equals[{$param}]"]);
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function provideEqualsCases(): Generator
+    {
+        yield from [
+            'null'   => [['foo' => null], '', false],
+            'empty'  => [['foo' => ''], '', true],
+            'fail'   => [['foo' => 'bar'], 'notbar', false],
+            'pass'   => [['foo' => 'bar'], 'bar', true],
+            'casing' => [['foo' => 'bar'], 'Bar', false],
+        ];
+    }
+
+    /**
+     * @dataProvider provideMinLengthCases
+     */
+    public function testMinLength(?string $data, string $length, bool $expected): void
+    {
+        $this->validation->setRules(['foo' => "min_length[{$length}]"]);
+        $this->assertSame($expected, $this->validation->run(['foo' => $data]));
+    }
+
+    public function provideMinLengthCases(): Generator
+    {
+        yield from [
+            'null'    => [null, '2', false],
+            'less'    => ['bar', '2', true],
+            'equal'   => ['bar', '3', true],
+            'greater' => ['bar', '4', false],
+        ];
+    }
+
+    /**
+     * @dataProvider provideMinLengthCases
+     */
+    public function testMaxLength(?string $data, string $length, bool $expected): void
+    {
+        $this->validation->setRules(['foo' => "max_length[{$length}]"]);
+        $this->assertSame(! $expected || $length === '3', $this->validation->run(['foo' => $data]));
+    }
+
+    public function testMaxLengthReturnsFalseWithNonNumericVal(): void
+    {
+        $this->validation->setRules(['foo' => 'max_length[bar]']);
+        $this->assertFalse($this->validation->run(['foo' => 'bar']));
+    }
+
+    /**
+     * @dataProvider provideExactLengthCases
+     */
+    public function testExactLength(?string $data, bool $expected): void
+    {
+        $this->validation->setRules(['foo' => 'exact_length[3]']);
+        $this->assertSame($expected, $this->validation->run(['foo' => $data]));
+    }
+
+    public function provideExactLengthCases(): Generator
+    {
+        yield from [
+            'null'    => [null, false],
+            'exact'   => ['bar', true],
+            'less'    => ['ba', false],
+            'greater' => ['bars', false],
+        ];
+    }
+
+    public function testExactLengthDetectsBadLength(): void
+    {
+        $data = ['foo' => 'bar'];
+        $this->validation->setRules(['foo' => 'exact_length[abc]']);
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    /**
+     * @dataProvider greaterThanProvider
+     */
+    public function testGreaterThan(?string $first, ?string $second, bool $expected): void
+    {
+        $data = ['foo' => $first];
+        $this->validation->setRules(['foo' => "greater_than[{$second}]"]);
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function greaterThanProvider(): Generator
+    {
+        yield from [
+            ['-10', '-11', true],
+            ['10', '9', true],
+            ['10', '10', false],
+            ['10', 'a', false],
+            ['10a', '10', false],
+            [null, null, false],
+        ];
+    }
+
+    /**
+     * @dataProvider greaterThanEqualProvider
+     */
+    public function testGreaterThanEqual(?string $first, ?string $second, bool $expected): void
+    {
+        $data = ['foo' => $first];
+        $this->validation->setRules(['foo' => "greater_than_equal_to[{$second}]"]);
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function greaterThanEqualProvider(): Generator
+    {
+        yield from [
+            ['0', '0', true],
+            ['1', '0', true],
+            ['-1', '0', false],
+            ['10a', '0', false],
+            [null, null, false],
+            ['1', null, true],
+            [null, '1', false],
+        ];
+    }
+
+    /**
+     * @dataProvider lessThanProvider
+     */
+    public function testLessThan(?string $first, ?string $second, bool $expected): void
+    {
+        $data = ['foo' => $first];
+        $this->validation->setRules(['foo' => "less_than[{$second}]"]);
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function lessThanProvider(): Generator
+    {
+        yield from [
+            ['-10', '-11', false],
+            ['9', '10', true],
+            ['10', '9', false],
+            ['10', '10', false],
+            ['10', 'a', true],
+            ['10a', '10', false],
+            [null, null, false],
+        ];
+    }
+
+    /**
+     * @dataProvider lessThanEqualProvider
+     */
+    public function testLessEqualThan(?string $first, ?string $second, bool $expected): void
+    {
+        $data = ['foo' => $first];
+        $this->validation->setRules(['foo' => "less_than_equal_to[{$second}]"]);
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function lessThanEqualProvider(): Generator
+    {
+        yield from [
+            ['0', '0', true],
+            ['1', '0', false],
+            ['-1', '0', true],
+            ['10a', '0', false],
+            [null, null, false],
+            ['1', null, false],
+            [null, '1', false],
+        ];
+    }
+
+    /**
+     * @dataProvider inListProvider
+     */
+    public function testInList(?string $first, ?string $second, bool $expected): void
+    {
+        $data = ['foo' => $first];
+        $this->validation->setRules(['foo' => "in_list[{$second}]"]);
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    /**
+     * @dataProvider inListProvider
+     */
+    public function testNotInList(?string $first, ?string $second, bool $expected): void
+    {
+        $data = ['foo' => $first];
+        $this->validation->setRules(['foo' => "not_in_list[{$second}]"]);
+        $this->assertSame(! $expected, $this->validation->run($data));
+    }
+
+    public function inListProvider(): Generator
+    {
+        yield from [
+            ['red', 'red,Blue,123', true],
+            ['Blue', 'red, Blue,123', true],
+            ['Blue', 'red,Blue,123', true],
+            ['123', 'red,Blue,123', true],
+            ['Red', 'red,Blue,123', false],
+            [' red', 'red,Blue,123', false],
+            ['1234', 'red,Blue,123', false],
+            [null, 'red,Blue,123', false],
+            ['red', null, false],
+        ];
+    }
+
+    /**
+     * @dataProvider requiredWithProvider
+     */
+    public function testRequiredWith(?string $field, ?string $check, bool $expected): void
+    {
+        $data = [
+            'foo'   => 'bar',
+            'bar'   => 'something',
+            'baz'   => null,
+            'array' => [
+                'nonEmptyField1' => 'value1',
+                'nonEmptyField2' => 'value2',
+                'emptyField1'    => null,
+                'emptyField2'    => null,
+            ],
+        ];
+
+        $this->validation->setRules([$field => "required_with[{$check}]"]);
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function requiredWithProvider(): Generator
+    {
+        yield from [
+            ['nope', 'bar', false],
+            ['foo', 'bar', true],
+            ['nope', 'baz', true],
+            [null, null, true],
+            [null, 'foo', false],
+            ['foo', null, true],
+            [
+                'array.emptyField1',
+                'array.emptyField2',
+                true,
+            ],
+            [
+                'array.nonEmptyField1',
+                'array.emptyField2',
+                true,
+            ],
+            [
+                'array.emptyField1',
+                'array.nonEmptyField2',
+                false,
+            ],
+            [
+                'array.nonEmptyField1',
+                'array.nonEmptyField2',
+                true,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider requiredWithoutProvider
+     */
+    public function testRequiredWithout(?string $field, ?string $check, bool $expected): void
+    {
+        $data = [
+            'foo'   => 'bar',
+            'bar'   => 'something',
+            'baz'   => null,
+            'array' => [
+                'nonEmptyField1' => 'value1',
+                'nonEmptyField2' => 'value2',
+                'emptyField1'    => null,
+                'emptyField2'    => null,
+            ],
+        ];
+
+        $this->validation->setRules([$field => "required_without[{$check}]"]);
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function requiredWithoutProvider(): Generator
+    {
+        yield from [
+            ['nope', 'bars', false],
+            ['foo', 'nope', true],
+            [null, null, false],
+            [null, 'foo', true],
+            ['foo', null, true],
+            [
+                'array.emptyField1',
+                'array.emptyField2',
+                false,
+            ],
+            [
+                'array.nonEmptyField1',
+                'array.emptyField2',
+                true,
+            ],
+            [
+                'array.emptyField1',
+                'array.nonEmptyField2',
+                true,
+            ],
+            [
+                'array.nonEmptyField1',
+                'array.nonEmptyField2',
+                true,
+            ],
+        ];
+    }
+}
diff --git a/tests/system/Validation/StrictRules/ValidationTest.php b/tests/system/Validation/StrictRules/ValidationTest.php
new file mode 100644
index 000000000000..d7a6d5893e97
--- /dev/null
+++ b/tests/system/Validation/StrictRules/ValidationTest.php
@@ -0,0 +1,1016 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Validation\StrictRules;
+
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\UserAgent;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Validation\Exceptions\ValidationException;
+use CodeIgniter\Validation\Validation;
+use Config\App;
+use Config\Services;
+use Generator;
+use Tests\Support\Validation\TestRules;
+
+/**
+ * @internal
+ */
+final class ValidationTest extends CIUnitTestCase
+{
+    /**
+     * @var Validation
+     */
+    private $validation;
+
+    private $config = [
+        'ruleSets' => [
+            Rules::class,
+            FormatRules::class,
+            FileRules::class,
+            CreditCardRules::class,
+            TestRules::class,
+        ],
+        'groupA' => [
+            'foo' => 'required|min_length[5]',
+        ],
+        'login' => [
+            'username' => [
+                'label'  => 'Username',
+                'rules'  => 'required',
+                'errors' => [
+                    'required' => 'custom username required error msg.',
+                ],
+            ],
+            'password' => [
+                'label'  => 'Password',
+                'rules'  => 'required',
+                'errors' => [
+                    'required' => 'custom password required error msg.',
+                ],
+            ],
+        ],
+        'groupA_errors' => [
+            'foo' => [
+                'min_length' => 'Shame, shame. Too short.',
+            ],
+        ],
+        'groupX'    => 'Not an array, so not a real group',
+        'templates' => [
+            'list'   => 'CodeIgniter\Validation\Views\list',
+            'single' => 'CodeIgniter\Validation\Views\single',
+        ],
+    ];
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->validation = new Validation((object) $this->config, Services::renderer());
+        $this->validation->reset();
+    }
+
+    public function testSetRulesStoresRules(): void
+    {
+        $rules = [
+            'foo' => 'bar|baz',
+            'bar' => 'baz|belch',
+        ];
+        $this->validation->setRules($rules);
+        $this->assertSame($rules, $this->validation->getRules());
+    }
+
+    public function testRunReturnsFalseWithNothingToDo(): void
+    {
+        $this->validation->setRules([]);
+        $this->assertFalse($this->validation->run([]));
+    }
+
+    public function testRunDoesTheBasics(): void
+    {
+        $data = ['foo' => 'notanumber'];
+        $this->validation->setRules(['foo' => 'is_numeric']);
+        $this->assertFalse($this->validation->run($data));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5368
+     *
+     * @dataProvider arrayDataProvider
+     *
+     * @param mixed $value
+     */
+    public function testCanValidatetArrayData($value, bool $expected): void
+    {
+        $this->validation->setRules(['arr' => 'is_array']);
+
+        $data['arr'] = $value;
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function arrayDataProvider(): Generator
+    {
+        yield 'list array' => [
+            [1, 2, 3, 4, 5],
+            true,   // false in v4.1.5 and earlier
+        ];
+
+        yield 'associative array' => [
+            [
+                'username' => 'admin001',
+                'role'     => 'administrator',
+                'usepass'  => 0,
+            ],
+            true,   // false in v4.1.5 and earlier
+        ];
+
+        yield 'int' => [
+            0,
+            false,
+        ];
+
+        yield 'string int' => [
+            '0',
+            false,
+        ];
+
+        yield 'bool' => [
+            false,
+            false,
+        ];
+
+        yield 'null' => [
+            null,
+            false,
+        ];
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5374
+     *
+     * @dataProvider isIntInvalidTypeDataProvider
+     *
+     * @param mixed $value
+     */
+    public function testIsIntWithInvalidTypeData($value, bool $expected): void
+    {
+        $this->validation->setRules(['foo' => 'is_int']);
+
+        $data = ['foo' => $value];
+        $this->assertSame($expected, $this->validation->run($data));
+    }
+
+    public function isIntInvalidTypeDataProvider(): Generator
+    {
+        yield 'array with int' => [
+            [555],
+            false,  // true in v4.1.5 and earlier
+        ];
+
+        yield 'empty array' => [
+            [],
+            false,
+        ];
+
+        yield 'bool true' => [
+            true,
+            false,
+        ];
+
+        yield 'bool false' => [
+            false,
+            false,
+        ];
+
+        yield 'null' => [
+            null,
+            false,
+        ];
+    }
+
+    public function testRunReturnsLocalizedErrors(): void
+    {
+        $data = ['foo' => 'notanumber'];
+        $this->validation->setRules(['foo' => 'is_numeric']);
+        $this->assertFalse($this->validation->run($data));
+        $this->assertSame('Validation.is_numeric', $this->validation->getError('foo'));
+    }
+
+    public function testRunWithCustomErrors(): void
+    {
+        $data = ['foo' => 'notanumber'];
+
+        $messages = [
+            'foo' => [
+                'is_numeric' => 'Nope. Not a number.',
+            ],
+        ];
+
+        $this->validation->setRules(['foo' => 'is_numeric'], $messages);
+        $this->validation->run($data);
+        $this->assertSame('Nope. Not a number.', $this->validation->getError('foo'));
+    }
+
+    public function testCheck(): void
+    {
+        $this->assertFalse($this->validation->check('notanumber', 'is_numeric'));
+    }
+
+    public function testCheckLocalizedError(): void
+    {
+        $this->assertFalse($this->validation->check('notanumber', 'is_numeric'));
+        $this->assertSame('Validation.is_numeric', $this->validation->getError());
+    }
+
+    public function testCheckCustomError(): void
+    {
+        $this->validation->check('notanumber', 'is_numeric', [
+            'is_numeric' => 'Nope. Not a number.',
+        ]);
+        $this->assertSame('Nope. Not a number.', $this->validation->getError());
+    }
+
+    public function testGetErrors(): void
+    {
+        $data = ['foo' => 'notanumber'];
+        $this->validation->setRules(['foo' => 'is_numeric']);
+        $this->validation->run($data);
+        $this->assertSame(['foo' => 'Validation.is_numeric'], $this->validation->getErrors());
+    }
+
+    public function testGetErrorsWhenNone(): void
+    {
+        $data = ['foo' => 123];
+        $this->validation->setRules(['foo' => 'is_numeric']);
+        $this->validation->run($data);
+        $this->assertSame([], $this->validation->getErrors());
+    }
+
+    public function testSetErrors(): void
+    {
+        $this->validation->setRules(['foo' => 'is_numeric']);
+        $this->validation->setError('foo', 'Nadda');
+        $this->assertSame(['foo' => 'Nadda'], $this->validation->getErrors());
+    }
+
+    public function testRulesReturnErrors(): void
+    {
+        $this->validation->setRules(['foo' => 'customError']);
+        $this->validation->run(['foo' => 'bar']);
+        $this->assertSame(['foo' => 'My lovely error'], $this->validation->getErrors());
+    }
+
+    public function testGroupsReadFromConfig(): void
+    {
+        $data = ['foo' => 'bar'];
+        $this->assertFalse($this->validation->run($data, 'groupA'));
+        $this->assertSame('Shame, shame. Too short.', $this->validation->getError('foo'));
+    }
+
+    public function testGroupsReadFromConfigValid(): void
+    {
+        $data = ['foo' => 'barsteps'];
+        $this->assertTrue($this->validation->run($data, 'groupA'));
+    }
+
+    public function testGetRuleGroup(): void
+    {
+        $this->assertSame([
+            'foo' => 'required|min_length[5]',
+        ], $this->validation->getRuleGroup('groupA'));
+    }
+
+    public function testGetRuleGroupException(): void
+    {
+        $this->expectException(ValidationException::class);
+        $this->validation->getRuleGroup('groupZ');
+    }
+
+    public function testSetRuleGroup(): void
+    {
+        $this->validation->setRuleGroup('groupA');
+        $this->assertSame([
+            'foo' => 'required|min_length[5]',
+        ], $this->validation->getRules());
+    }
+
+    public function testSetRuleGroupException(): void
+    {
+        $this->expectException(ValidationException::class);
+        $this->validation->setRuleGroup('groupZ');
+    }
+
+    public function testSetRuleGroupWithCustomErrorMessage(): void
+    {
+        $this->validation->reset();
+        $this->validation->setRuleGroup('login');
+        $this->validation->run(['username' => 'codeigniter']);
+        $this->assertSame([
+            'password' => 'custom password required error msg.',
+        ], $this->validation->getErrors());
+    }
+
+    public function testRunGroupWithCustomErrorMessage(): void
+    {
+        $this->validation->reset();
+        $this->validation->run([
+            'username' => 'codeigniter',
+        ], 'login');
+
+        $this->assertSame([
+            'password' => 'custom password required error msg.',
+        ], $this->validation->getErrors());
+    }
+
+    /**
+     * @dataProvider rulesSetupProvider
+     *
+     * @param string|string[] $rules
+     * @param string          $expected
+     */
+    public function testRulesSetup($rules, $expected, array $errors = [])
+    {
+        $data = ['foo' => ''];
+        $this->validation->setRules(['foo' => $rules], $errors);
+        $this->validation->run($data);
+        $this->assertSame($expected, $this->validation->getError('foo'));
+    }
+
+    public function rulesSetupProvider(): Generator
+    {
+        yield from [
+            [
+                'min_length[10]',
+                'The foo field must be at least 10 characters in length.',
+            ],
+            [
+                'min_length[10]',
+                'The foo field is very short.',
+                ['foo' => ['min_length' => 'The {field} field is very short.']],
+            ],
+            [
+                ['min_length[10]'],
+                'The foo field must be at least 10 characters in length.',
+            ],
+            [
+                ['min_length[10]'],
+                'The foo field is very short.',
+                ['foo' => ['min_length' => 'The {field} field is very short.']],
+            ],
+            [
+                ['rules' => 'min_length[10]'],
+                'The foo field must be at least 10 characters in length.',
+            ],
+            [
+                [
+                    'label' => 'Foo Bar',
+                    'rules' => 'min_length[10]',
+                ],
+                'The Foo Bar field must be at least 10 characters in length.',
+            ],
+            [
+                [
+                    'label' => 'Foo Bar',
+                    'rules' => 'min_length[10]',
+                ],
+                'The Foo Bar field is very short.',
+                ['foo' => ['min_length' => 'The {field} field is very short.']],
+            ],
+            [
+                [
+                    'label'  => 'Foo Bar',
+                    'rules'  => 'min_length[10]',
+                    'errors' => ['min_length' => 'The {field} field is very short.'],
+                ],
+                'The Foo Bar field is very short.',
+            ],
+        ];
+    }
+
+    public function testSetRulesRemovesErrorsArray(): void
+    {
+        $rules = [
+            'foo' => [
+                'label'  => 'Foo Bar',
+                'rules'  => 'min_length[10]',
+                'errors' => [
+                    'min_length' => 'The {field} field is very short.',
+                ],
+            ],
+        ];
+
+        $this->validation->setRules($rules, []);
+        $this->validation->run(['foo' => 'abc']);
+        $this->assertSame('The Foo Bar field is very short.', $this->validation->getError('foo'));
+    }
+
+    public function testInvalidRule(): void
+    {
+        $this->expectException(ValidationException::class);
+
+        $rules = [
+            'foo' => 'bar|baz',
+            'bar' => 'baz|belch',
+        ];
+        $this->validation->setRules($rules);
+
+        $data = ['foo' => ''];
+        $this->validation->run($data);
+    }
+
+    public function testRawInput(): void
+    {
+        $rawstring = 'username=admin001&role=administrator&usepass=0';
+
+        $data = [
+            'username' => 'admin001',
+            'role'     => 'administrator',
+            'usepass'  => 0,
+        ];
+
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+
+        $request = new IncomingRequest($config, new URI(), $rawstring, new UserAgent());
+        $this->validation->withRequest($request->withMethod('patch'))->run($data);
+        $this->assertSame([], $this->validation->getErrors());
+    }
+
+    public function testJsonInput(): void
+    {
+        $data = [
+            'username' => 'admin001',
+            'role'     => 'administrator',
+            'usepass'  => 0,
+        ];
+        $json = json_encode($data);
+
+        $_SERVER['CONTENT_TYPE'] = 'application/json';
+
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+
+        $request = new IncomingRequest($config, new URI(), $json, new UserAgent());
+
+        $rules = [
+            'role' => 'required|min_length[5]',
+        ];
+        $validated = $this->validation
+            ->withRequest($request->withMethod('patch'))
+            ->setRules($rules)
+            ->run();
+
+        $this->assertTrue($validated);
+        $this->assertSame([], $this->validation->getErrors());
+
+        unset($_SERVER['CONTENT_TYPE']);
+    }
+
+    public function testHasRule(): void
+    {
+        $this->validation->setRuleGroup('groupA');
+        $this->assertTrue($this->validation->hasRule('foo'));
+    }
+
+    public function testNotARealGroup(): void
+    {
+        $this->expectException(ValidationException::class);
+        $this->validation->setRuleGroup('groupX');
+        $this->validation->getRuleGroup('groupX');
+    }
+
+    public function testBadTemplate(): void
+    {
+        $this->expectException(ValidationException::class);
+        $this->validation->listErrors('obviouslyBadTemplate');
+    }
+
+    public function testShowNonError(): void
+    {
+        $this->validation->setRules(['foo' => 'is_numeric']);
+        $this->validation->setError('foo', 'Nadda');
+        $this->assertSame('', $this->validation->showError('bogus'));
+    }
+
+    public function testShowBadTemplate(): void
+    {
+        $this->expectException(ValidationException::class);
+        $this->validation->setRules(['foo' => 'is_numeric']);
+        $this->validation->setError('foo', 'Nadda');
+        $this->assertSame('We should never get here', $this->validation->showError('foo', 'bogus_template'));
+    }
+
+    public function testNoRuleSetsSetup(): void
+    {
+        $this->expectException(ValidationException::class);
+
+        $this->config['ruleSets'] = null;
+        $this->validation         = new Validation((object) $this->config, Services::renderer());
+        $this->validation->reset();
+        $this->validation->run(['foo' => '']);
+    }
+
+    public function testNotCustomRuleGroup(): void
+    {
+        $this->expectException(ValidationException::class);
+        $data = ['foo' => ''];
+        $this->validation->run($data, 'GeorgeRules');
+    }
+
+    public function testNotRealCustomRule(): void
+    {
+        $this->expectException(ValidationException::class);
+        $data = ['foo' => ''];
+        $this->validation->run($data, 'groupX');
+    }
+
+    public function testHasError(): void
+    {
+        $data = ['foo' => 'notanumber'];
+        $this->validation->setRules(['foo' => 'is_numeric']);
+        $this->validation->run($data);
+        $this->assertTrue($this->validation->hasError('foo'));
+    }
+
+    public function testSplitRulesTrue(): void
+    {
+        $this->validation->setRules([
+            'phone' => 'required|regex_match[/^(01[2689]|09)[0-9]{8}$/]|numeric',
+        ]);
+        $this->assertTrue($this->validation->run(['phone' => '0987654321']));
+    }
+
+    public function testSplitRulesFalse(): void
+    {
+        $this->validation->setRules([
+            'phone' => 'required|regex_match[/^(01[2689]|09)[0-9]{8}$/]|numeric',
+        ]);
+        $this->assertFalse($this->validation->run(['phone' => '09876543214']));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/1201
+     */
+    public function testSplitNotRegex(): void
+    {
+        $method = $this->getPrivateMethodInvoker($this->validation, 'splitRules');
+        $result = $method('uploaded[avatar]|max_size[avatar,1024]');
+        $this->assertSame('uploaded[avatar]', $result[0]);
+    }
+
+    public function testSplitRegex(): void
+    {
+        $method = $this->getPrivateMethodInvoker($this->validation, 'splitRules');
+        $result = $method('required|regex_match[/^[0-9]{4}[\-\.\[\/][0-9]{2}[\-\.\[\/][0-9]{2}/]|max_length[10]');
+        $this->assertSame('regex_match[/^[0-9]{4}[\-\.\[\/][0-9]{2}[\-\.\[\/][0-9]{2}/]', $result[1]);
+    }
+
+    public function testTagReplacement(): void
+    {
+        $data = ['Username' => 'Pizza'];
+        $this->validation->setRules(
+            ['Username' => 'min_length[6]'],
+            ['Username' => [
+                'min_length' => 'Supplied value ({value}) for {field} must have at least {param} characters.',
+            ]]
+        );
+        $this->validation->run($data);
+        $errors = $this->validation->getErrors();
+
+        if (! isset($errors['Username'])) {
+            $this->fail('Unable to find "Username"');
+        }
+
+        $expected = 'Supplied value (Pizza) for Username must have at least 6 characters.';
+        $this->assertSame($expected, $errors['Username']);
+    }
+
+    public function testRulesForObjectField(): void
+    {
+        $this->validation->setRules([
+            'configuration' => 'required|check_object_rule',
+        ]);
+
+        $data = (object) ['configuration' => (object) ['first' => 1, 'second' => 2]];
+        $this->validation->run((array) $data);
+        $this->assertSame([], $this->validation->getErrors());
+
+        $this->validation->reset();
+        $this->validation->setRules([
+            'configuration' => 'required|check_object_rule',
+        ]);
+
+        $data = (object) ['configuration' => (object) ['first1' => 1, 'second' => 2]];
+        $this->validation->run((array) $data);
+
+        $this->assertSame([
+            'configuration' => 'Validation.check_object_rule',
+        ], $this->validation->getErrors());
+    }
+
+    /**
+     * @dataProvider arrayFieldDataProvider
+     */
+    public function testRulesForArrayField(array $body, array $rules, array $results)
+    {
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+
+        $request = new IncomingRequest($config, new URI(), http_build_query($body), new UserAgent());
+
+        $this->validation->setRules($rules);
+        $this->validation->withRequest($request->withMethod('post'))->run($body);
+        $this->assertSame($results, $this->validation->getErrors());
+    }
+
+    public function arrayFieldDataProvider(): Generator
+    {
+        yield from [
+            'all_rules_should_pass' => [
+                'body' => [
+                    'foo' => [
+                        'a',
+                        'b',
+                        'c',
+                    ],
+                ],
+                'rules' => [
+                    'foo.0' => 'required|alpha|max_length[2]',
+                    'foo.1' => 'required|alpha|max_length[2]',
+                    'foo.2' => 'required|alpha|max_length[2]',
+                ],
+                'results' => [],
+            ],
+            'first_field_will_return_required_error' => [
+                'body' => [
+                    'foo' => [
+                        '',
+                        'b',
+                        'c',
+                    ],
+                ],
+                'rules' => [
+                    'foo.0' => 'required|alpha|max_length[2]',
+                    'foo.1' => 'required|alpha|max_length[2]',
+                    'foo.2' => 'required|alpha|max_length[2]',
+                ],
+                'results' => [
+                    'foo.0' => 'The foo.0 field is required.',
+                ],
+            ],
+            'first_and second_field_will_return_required_and_min_length_error' => [
+                'body' => [
+                    'foo' => [
+                        '',
+                        'b',
+                        'c',
+                    ],
+                ],
+                'rules' => [
+                    'foo.0' => 'required|alpha|max_length[2]',
+                    'foo.1' => 'required|alpha|min_length[2]|max_length[4]',
+                    'foo.2' => 'required|alpha|max_length[2]',
+                ],
+                'results' => [
+                    'foo.0' => 'The foo.0 field is required.',
+                    'foo.1' => 'The foo.1 field must be at least 2 characters in length.',
+                ],
+            ],
+        ];
+    }
+
+    public function testRulesForSingleRuleWithAsteriskWillReturnNoError(): void
+    {
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+
+        $_REQUEST = [
+            'id_user' => [
+                1,
+                3,
+            ],
+            'name_user' => [
+                'abc123',
+                'xyz098',
+            ],
+        ];
+
+        $request = new IncomingRequest($config, new URI(), 'php://input', new UserAgent());
+
+        $this->validation->setRules([
+            'id_user.*'   => 'numeric',
+            'name_user.*' => 'alpha_numeric',
+        ]);
+
+        $this->validation->withRequest($request->withMethod('post'))->run();
+        $this->assertSame([], $this->validation->getErrors());
+    }
+
+    public function testRulesForSingleRuleWithAsteriskWillReturnError(): void
+    {
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+
+        $_REQUEST = [
+            'id_user' => [
+                '1dfd',
+                3,
+            ],
+            'name_user' => [
+                123,
+                'xyz098',
+            ],
+        ];
+
+        $request = new IncomingRequest($config, new URI(), 'php://input', new UserAgent());
+
+        $this->validation->setRules([
+            'id_user.*'   => 'numeric',
+            'name_user.*' => 'alpha',
+        ]);
+
+        $this->validation->withRequest($request->withMethod('post'))->run();
+        $this->assertSame([
+            'id_user.*'   => 'The id_user.* field must contain only numbers.',
+            'name_user.*' => 'The name_user.* field may only contain alphabetical characters.',
+        ], $this->validation->getErrors());
+    }
+
+    public function testRulesForSingleRuleWithSingleValue(): void
+    {
+        $config          = new App();
+        $config->baseURL = 'http://example.com/';
+
+        $_REQUEST = [
+            'id_user' => 'gh',
+        ];
+
+        $request = new IncomingRequest($config, new URI(), 'php://input', new UserAgent());
+
+        $this->validation->setRules([
+            'id_user' => 'numeric',
+        ]);
+
+        $this->validation->withRequest($request->withMethod('post'))->run();
+        $this->assertSame([
+            'id_user' => 'The id_user field must contain only numbers.',
+        ], $this->validation->getErrors());
+    }
+
+    public function testTranslatedLabel(): void
+    {
+        $rules = [
+            'foo' => [
+                'label' => 'Foo.bar',
+                'rules' => 'min_length[10]',
+            ],
+        ];
+
+        $this->validation->setRules($rules, []);
+        $this->validation->run(['foo' => 'abc']);
+        $this->assertSame('The Foo Bar Translated field must be at least 10 characters in length.', $this->validation->getError('foo'));
+    }
+
+    public function testTranslatedLabelIsMissing(): void
+    {
+        $rules = [
+            'foo' => [
+                'label' => 'Foo.bar.is.missing',
+                'rules' => 'min_length[10]',
+            ],
+        ];
+
+        $this->validation->setRules($rules, []);
+        $this->validation->run(['foo' => 'abc']);
+        $this->assertSame('The Foo.bar.is.missing field must be at least 10 characters in length.', $this->validation->getError('foo'));
+    }
+
+    public function testTranslatedLabelWithCustomErrorMessage(): void
+    {
+        $rules = [
+            'foo' => [
+                'label'  => 'Foo.bar',
+                'rules'  => 'min_length[10]',
+                'errors' => [
+                    'min_length' => 'Foo.bar.min_length1',
+                ],
+            ],
+        ];
+
+        $this->validation->setRules($rules, []);
+        $this->validation->run(['foo' => 'abc']);
+        $this->assertSame('The Foo Bar Translated field is very short.', $this->validation->getError('foo'));
+    }
+
+    public function testTranslatedLabelTagReplacement(): void
+    {
+        $data = ['Username' => 'Pizza'];
+
+        $this->validation->setRules(
+            ['Username' => [
+                'label' => 'Foo.bar',
+                'rules' => 'min_length[6]',
+            ]],
+            ['Username' => [
+                'min_length' => 'Foo.bar.min_length2',
+            ]]
+        );
+
+        $this->validation->run($data);
+        $errors = $this->validation->getErrors();
+
+        if (! isset($errors['Username'])) {
+            $this->fail('Unable to find "Username"');
+        }
+
+        $expected = 'Supplied value (Pizza) for Foo Bar Translated must have at least 6 characters.';
+        $this->assertSame($expected, $errors['Username']);
+    }
+
+    /**
+     * @dataProvider dotNotationForIfExistProvider
+     *
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4521
+     */
+    public function testDotNotationOnIfExistRule(bool $expected, array $rules, array $data): void
+    {
+        $actual = $this->validation->setRules($rules)->run($data);
+        $this->assertSame($expected, $actual);
+    }
+
+    public function dotNotationForIfExistProvider(): Generator
+    {
+        yield 'dot-on-end-fail' => [
+            false,
+            ['status.*' => 'if_exist|in_list[status_1,status_2]'],
+            ['status'   => ['bad-status']],
+        ];
+
+        yield 'dot-on-end-pass' => [
+            true,
+            ['status.*' => 'if_exist|in_list[status_1,status_2]'],
+            ['status'   => ['status_1']],
+        ];
+
+        yield 'dot-on-middle-fail' => [
+            false,
+            ['fizz.*.baz' => 'if_exist|numeric'],
+            [
+                'fizz' => [
+                    'bar' => ['baz' => 'yes'],
+                ],
+            ],
+        ];
+
+        yield 'dot-on-middle-pass' => [
+            true,
+            ['fizz.*.baz' => 'if_exist|numeric'],
+            [
+                'fizz' => [
+                    'bar' => ['baz' => 30],
+                ],
+            ],
+        ];
+
+        yield 'dot-multiple-fail' => [
+            false,
+            ['fizz.*.bar.*' => 'if_exist|numeric'],
+            ['fizz' => [
+                'bos' => [
+                    'bar' => [
+                        'bub' => 'noo',
+                    ],
+                ],
+            ]],
+        ];
+
+        yield 'dot-multiple-pass' => [
+            true,
+            ['fizz.*.bar.*' => 'if_exist|numeric'],
+            ['fizz' => [
+                'bos' => [
+                    'bar' => [
+                        'bub' => 5,
+                    ],
+                ],
+            ]],
+        ];
+    }
+
+    /**
+     * @dataProvider validationArrayDataCaseProvider
+     *
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4510
+     */
+    public function testValidationOfArrayData(bool $expected, array $rules, array $data): void
+    {
+        $actual = $this->validation->setRules($rules)->run($data);
+        $this->assertSame($expected, $actual);
+    }
+
+    public function validationArrayDataCaseProvider(): iterable
+    {
+        yield 'fail-empty-string' => [
+            false,
+            ['bar.*.foo' => 'required'],
+            ['bar' => [
+                ['foo' => 'baz'],
+                ['foo' => ''],
+            ]],
+        ];
+
+        yield 'pass-nonempty-string' => [
+            true,
+            ['bar.*.foo' => 'required'],
+            ['bar' => [
+                ['foo' => 'baz'],
+                ['foo' => 'boz'],
+            ]],
+        ];
+
+        yield 'fail-empty-array' => [
+            false,
+            ['bar.*.foo' => 'required'],
+            ['bar' => [
+                ['foo' => 'baz'],
+                ['foo' => []],
+            ]],
+        ];
+
+        yield 'pass-nonempty-array' => [
+            true,
+            ['bar.*.foo' => 'required'],
+            ['bar' => [
+                ['foo' => 'baz'],
+                ['foo' => ['boz']],
+            ]],
+        ];
+    }
+
+    /**
+     * @dataProvider provideStringRulesCases
+     *
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4929
+     */
+    public function testSplittingOfComplexStringRules(string $input, array $expected): void
+    {
+        $splitter = $this->getPrivateMethodInvoker($this->validation, 'splitRules');
+        $this->assertSame($expected, $splitter($input));
+    }
+
+    public function provideStringRulesCases(): iterable
+    {
+        yield [
+            'required',
+            ['required'],
+        ];
+
+        yield [
+            'required|numeric',
+            ['required', 'numeric'],
+        ];
+
+        yield [
+            'required|max_length[500]|hex',
+            ['required', 'max_length[500]', 'hex'],
+        ];
+
+        yield [
+            'required|numeric|regex_match[/[a-zA-Z]+/]',
+            ['required', 'numeric', 'regex_match[/[a-zA-Z]+/]'],
+        ];
+
+        yield [
+            'required|max_length[500]|regex_match[/^;"\'{}\[\]^<>=/]',
+            ['required', 'max_length[500]', 'regex_match[/^;"\'{}\[\]^<>=/]'],
+        ];
+
+        yield [
+            'regex_match[/^;"\'{}\[\]^<>=/]|regex_match[/[^a-z0-9.\|_]+/]',
+            ['regex_match[/^;"\'{}\[\]^<>=/]', 'regex_match[/[^a-z0-9.\|_]+/]'],
+        ];
+
+        yield [
+            'required|regex_match[/^(01[2689]|09)[0-9]{8}$/]|numeric',
+            ['required', 'regex_match[/^(01[2689]|09)[0-9]{8}$/]', 'numeric'],
+        ];
+
+        yield [
+            'required|regex_match[/^[0-9]{4}[\-\.\[\/][0-9]{2}[\-\.\[\/][0-9]{2}/]|max_length[10]',
+            ['required', 'regex_match[/^[0-9]{4}[\-\.\[\/][0-9]{2}[\-\.\[\/][0-9]{2}/]', 'max_length[10]'],
+        ];
+
+        yield [
+            'required|regex_match[/^(01|2689|09)[0-9]{8}$/]|numeric',
+            ['required', 'regex_match[/^(01|2689|09)[0-9]{8}$/]', 'numeric'],
+        ];
+    }
+}

From 4df559ea0d468e15f80b9059221f355996304bcc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 8 Dec 2021 13:25:25 +0900
Subject: [PATCH 1153/2325] docs: add documentation

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

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 960a1bce3dda..79ceebe89dd3 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -201,6 +201,42 @@ Then add validation rules in the controller (**Form.php**)::
 
 If you submit the form you should see the success page or the form with error messages.
 
+Config for Validation
+*********************
+
+.. _validation-traditional-and-strict-rules:
+
+Traditional and Strict Rules
+============================
+
+CI4 has two kind of Validation rule classes.
+The default rule classes (**Traditional Rules**) have the namespace ``CodeIgniter\Validation``,
+and the new classes (**Strict Rules**) have ``CodeIgniter\Validation\StrictRules``, which provide strict validation.
+
+The **Traditional Rules** implicitly assume that string values are validated.
+And the input value may be converted implicitly to a string value.
+It works for most basic cases like validating POST data.
+
+But, for example, if you use JSON input data, it may be type of bool/null/array.
+When you validate the bool ``true``, it is converted to string ``'1'`` with the Traditional rule classes.
+And if you validate it with the ``integer`` rule, ``'1'`` passes the validation.
+
+The **Strict Rules** don't use implicit type conversion.
+
+.. warning:: When validating data that contains non-string values, such as JSON data, it is recommended to use **Strict Rules**.
+
+Using Strict Rules
+------------------
+
+If you want to use this, you need to change the rule classes in **app/Config/Validation.php**::
+
+        public $ruleSets = [
+            \CodeIgniter\Validation\StrictRules\CreditCardRules::class,
+            \CodeIgniter\Validation\StrictRules\FileRules::class,
+            \CodeIgniter\Validation\StrictRules\FormatRules::class,
+            \CodeIgniter\Validation\StrictRules\Rules::class,
+        ];
+
 Loading the Library
 ************************************************
 

From e1669429e2e0d310f66a7154361b26f0f5bed7d0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 6 Jan 2022 15:24:01 +0900
Subject: [PATCH 1154/2325] refactor: composition with NonStrictCreditCardRules

---
 .../StrictRules/CreditCardRules.php           | 253 +-----------------
 1 file changed, 10 insertions(+), 243 deletions(-)

diff --git a/system/Validation/StrictRules/CreditCardRules.php b/system/Validation/StrictRules/CreditCardRules.php
index 95c8dd83e846..eec043a3011f 100644
--- a/system/Validation/StrictRules/CreditCardRules.php
+++ b/system/Validation/StrictRules/CreditCardRules.php
@@ -13,6 +13,8 @@
 
 namespace CodeIgniter\Validation\StrictRules;
 
+use CodeIgniter\Validation\CreditCardRules as NonStrictCreditCardRules;
+
 /**
  * Class CreditCardRules
  *
@@ -23,144 +25,14 @@
 class CreditCardRules
 {
     /**
-     * The cards that we support, with the defining details:
-     *
-     *  name        - The type of card as found in the form. Must match the user's value
-     *  length      - List of possible lengths for the card number
-     *  prefixes    - List of possible prefixes for the card
-     *  checkdigit  - Boolean on whether we should do a modulus10 check on the numbers.
-     *
-     * @var array
+     * @var NonStrictCreditCardRules
      */
-    protected $cards = [
-        'American Express' => [
-            'name'       => 'amex',
-            'length'     => '15',
-            'prefixes'   => '34,37',
-            'checkdigit' => true,
-        ],
-        'China UnionPay' => [
-            'name'       => 'unionpay',
-            'length'     => '16,17,18,19',
-            'prefixes'   => '62',
-            'checkdigit' => true,
-        ],
-        'Dankort' => [
-            'name'       => 'dankort',
-            'length'     => '16',
-            'prefixes'   => '5019,4175,4571,4',
-            'checkdigit' => true,
-        ],
-        'DinersClub' => [
-            'name'       => 'dinersclub',
-            'length'     => '14,16',
-            'prefixes'   => '300,301,302,303,304,305,309,36,38,39,54,55',
-            'checkdigit' => true,
-        ],
-        'DinersClub CarteBlanche' => [
-            'name'       => 'carteblanche',
-            'length'     => '14',
-            'prefixes'   => '300,301,302,303,304,305',
-            'checkdigit' => true,
-        ],
-        'Discover Card' => [
-            'name'       => 'discover',
-            'length'     => '16,19',
-            'prefixes'   => '6011,622,644,645,656,647,648,649,65',
-            'checkdigit' => true,
-        ],
-        'InterPayment' => [
-            'name'       => 'interpayment',
-            'length'     => '16,17,18,19',
-            'prefixes'   => '4',
-            'checkdigit' => true,
-        ],
-        'JCB' => [
-            'name'       => 'jcb',
-            'length'     => '16,17,18,19',
-            'prefixes'   => '352,353,354,355,356,357,358',
-            'checkdigit' => true,
-        ],
-        'Maestro' => [
-            'name'       => 'maestro',
-            'length'     => '12,13,14,15,16,18,19',
-            'prefixes'   => '50,56,57,58,59,60,61,62,63,64,65,66,67,68,69',
-            'checkdigit' => true,
-        ],
-        'MasterCard' => [
-            'name'       => 'mastercard',
-            'length'     => '16',
-            'prefixes'   => '51,52,53,54,55,22,23,24,25,26,27',
-            'checkdigit' => true,
-        ],
-        'NSPK MIR' => [
-            'name'       => 'mir',
-            'length'     => '16',
-            'prefixes'   => '2200,2201,2202,2203,2204',
-            'checkdigit' => true,
-        ],
-        'Troy' => [
-            'name'       => 'troy',
-            'length'     => '16',
-            'prefixes'   => '979200,979289',
-            'checkdigit' => true,
-        ],
-        'UATP' => [
-            'name'       => 'uatp',
-            'length'     => '15',
-            'prefixes'   => '1',
-            'checkdigit' => true,
-        ],
-        'Verve' => [
-            'name'       => 'verve',
-            'length'     => '16,19',
-            'prefixes'   => '506,650',
-            'checkdigit' => true,
-        ],
-        'Visa' => [
-            'name'       => 'visa',
-            'length'     => '13,16,19',
-            'prefixes'   => '4',
-            'checkdigit' => true,
-        ],
-        // Canadian Cards
-        'BMO ABM Card' => [
-            'name'       => 'bmoabm',
-            'length'     => '16',
-            'prefixes'   => '500',
-            'checkdigit' => false,
-        ],
-        'CIBC Convenience Card' => [
-            'name'       => 'cibc',
-            'length'     => '16',
-            'prefixes'   => '4506',
-            'checkdigit' => false,
-        ],
-        'HSBC Canada Card' => [
-            'name'       => 'hsbc',
-            'length'     => '16',
-            'prefixes'   => '56',
-            'checkdigit' => false,
-        ],
-        'Royal Bank of Canada Client Card' => [
-            'name'       => 'rbc',
-            'length'     => '16',
-            'prefixes'   => '45',
-            'checkdigit' => false,
-        ],
-        'Scotiabank Scotia Card' => [
-            'name'       => 'scotia',
-            'length'     => '16',
-            'prefixes'   => '4536',
-            'checkdigit' => false,
-        ],
-        'TD Canada Trust Access Card' => [
-            'name'       => 'tdtrust',
-            'length'     => '16',
-            'prefixes'   => '589297',
-            'checkdigit' => false,
-        ],
-    ];
+    private $nonStrictCreditCardRules;
+
+    public function __construct()
+    {
+        $this->nonStrictCreditCardRules = new NonStrictCreditCardRules();
+    }
 
     /**
      * Verifies that a credit card number is valid and matches the known
@@ -180,111 +52,6 @@ public function valid_cc_number($ccNumber, string $type): bool
             return false;
         }
 
-        $type = strtolower($type);
-        $info = null;
-
-        // Get our card info based on provided name.
-        foreach ($this->cards as $card) {
-            if ($card['name'] === $type) {
-                $info = $card;
-                break;
-            }
-        }
-
-        // If empty, it's not a card type we recognize, or invalid type.
-        if (empty($info)) {
-            return false;
-        }
-
-        // Make sure we have a valid length
-        if ((string) $ccNumber === '') {
-            return false;
-        }
-
-        // Remove any spaces and dashes
-        $ccNumber = str_replace([' ', '-'], '', $ccNumber);
-
-        // Non-numeric values cannot be a number...duh
-        if (! is_numeric($ccNumber)) {
-            return false;
-        }
-
-        // Make sure it's a valid length for this card
-        $lengths = explode(',', $info['length']);
-
-        if (! in_array((string) strlen($ccNumber), $lengths, true)) {
-            return false;
-        }
-
-        // Make sure it has a valid prefix
-        $prefixes = explode(',', $info['prefixes']);
-
-        $validPrefix = false;
-
-        foreach ($prefixes as $prefix) {
-            if (strpos($ccNumber, $prefix) === 0) {
-                $validPrefix = true;
-                break;
-            }
-        }
-
-        if ($validPrefix === false) {
-            return false;
-        }
-
-        // Still here? Then check the number against the Luhn algorithm, if required
-        // @see https://en.wikipedia.org/wiki/Luhn_algorithm
-        // @see https://gist.github.com/troelskn/1287893
-        if ($info['checkdigit'] === true) {
-            return $this->isValidLuhn($ccNumber);
-        }
-
-        return true;
-    }
-
-    /**
-     * Checks the given number to see if the number passing a Luhn check.
-     *
-     * @param string $number
-     */
-    protected function isValidLuhn(?string $number = null): bool
-    {
-        $number = (string) $number;
-
-        $sumTable = [
-            [
-                0,
-                1,
-                2,
-                3,
-                4,
-                5,
-                6,
-                7,
-                8,
-                9,
-            ],
-            [
-                0,
-                2,
-                4,
-                6,
-                8,
-                1,
-                3,
-                5,
-                7,
-                9,
-            ],
-        ];
-
-        $sum  = 0;
-        $flip = 0;
-
-        for ($i = strlen($number) - 1; $i >= 0; $i--) {
-            $sum += $sumTable[$flip++ & 0x1][$number[$i]];
-        }
-
-        return $sum % 10 === 0;
+        return $this->nonStrictCreditCardRules->valid_cc_number($ccNumber, $type);
     }
 }

From 75e99f71ccf26b8fa4b40a71b1ef9b2caaad33de Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 6 Jan 2022 15:24:52 +0900
Subject: [PATCH 1155/2325] refactor: extends NonStrictFileRules

---
 system/Validation/StrictRules/FileRules.php | 231 +-------------------
 1 file changed, 2 insertions(+), 229 deletions(-)

diff --git a/system/Validation/StrictRules/FileRules.php b/system/Validation/StrictRules/FileRules.php
index f14ba321b636..401771cf6cfa 100644
--- a/system/Validation/StrictRules/FileRules.php
+++ b/system/Validation/StrictRules/FileRules.php
@@ -13,238 +13,11 @@
 
 namespace CodeIgniter\Validation\StrictRules;
 
-use CodeIgniter\HTTP\RequestInterface;
-use Config\Mimes;
-use Config\Services;
+use CodeIgniter\Validation\FileRules as NonStrictFileRules;
 
 /**
  * File validation rules
  */
-class FileRules
+class FileRules extends NonStrictFileRules
 {
-    /**
-     * Request instance. So we can get access to the files.
-     *
-     * @var RequestInterface
-     */
-    protected $request;
-
-    /**
-     * Constructor.
-     *
-     * @param RequestInterface $request
-     */
-    public function __construct(?RequestInterface $request = null)
-    {
-        if ($request === null) {
-            $request = Services::request();
-        }
-
-        $this->request = $request;
-    }
-
-    /**
-     * Verifies that $name is the name of a valid uploaded file.
-     */
-    public function uploaded(?string $blank, string $name): bool
-    {
-        if (! ($files = $this->request->getFileMultiple($name))) {
-            $files = [$this->request->getFile($name)];
-        }
-
-        foreach ($files as $file) {
-            if ($file === null) {
-                return false;
-            }
-
-            if (ENVIRONMENT === 'testing') {
-                if ($file->getError() !== 0) {
-                    return false;
-                }
-            } else {
-                // Note: cannot unit test this; no way to over-ride ENVIRONMENT?
-                // @codeCoverageIgnoreStart
-                if (! $file->isValid()) {
-                    return false;
-                }
-                // @codeCoverageIgnoreEnd
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Verifies if the file's size in Kilobytes is no larger than the parameter.
-     */
-    public function max_size(?string $blank, string $params): bool
-    {
-        // Grab the file name off the top of the $params
-        // after we split it.
-        $params = explode(',', $params);
-        $name   = array_shift($params);
-
-        if (! ($files = $this->request->getFileMultiple($name))) {
-            $files = [$this->request->getFile($name)];
-        }
-
-        foreach ($files as $file) {
-            if ($file === null) {
-                return false;
-            }
-
-            if ($file->getError() === UPLOAD_ERR_NO_FILE) {
-                return true;
-            }
-
-            if ($file->getError() === UPLOAD_ERR_INI_SIZE) {
-                return false;
-            }
-
-            if ($file->getSize() / 1024 > $params[0]) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Uses the mime config file to determine if a file is considered an "image",
-     * which for our purposes basically means that it's a raster image or svg.
-     */
-    public function is_image(?string $blank, string $params): bool
-    {
-        // Grab the file name off the top of the $params
-        // after we split it.
-        $params = explode(',', $params);
-        $name   = array_shift($params);
-
-        if (! ($files = $this->request->getFileMultiple($name))) {
-            $files = [$this->request->getFile($name)];
-        }
-
-        foreach ($files as $file) {
-            if ($file === null) {
-                return false;
-            }
-
-            if ($file->getError() === UPLOAD_ERR_NO_FILE) {
-                return true;
-            }
-
-            // We know that our mimes list always has the first mime
-            // start with `image` even when then are multiple accepted types.
-            $type = Mimes::guessTypeFromExtension($file->getExtension());
-
-            if (mb_strpos($type, 'image') !== 0) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Checks to see if an uploaded file's mime type matches one in the parameter.
-     */
-    public function mime_in(?string $blank, string $params): bool
-    {
-        // Grab the file name off the top of the $params
-        // after we split it.
-        $params = explode(',', $params);
-        $name   = array_shift($params);
-
-        if (! ($files = $this->request->getFileMultiple($name))) {
-            $files = [$this->request->getFile($name)];
-        }
-
-        foreach ($files as $file) {
-            if ($file === null) {
-                return false;
-            }
-
-            if ($file->getError() === UPLOAD_ERR_NO_FILE) {
-                return true;
-            }
-
-            if (! in_array($file->getMimeType(), $params, true)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Checks to see if an uploaded file's extension matches one in the parameter.
-     */
-    public function ext_in(?string $blank, string $params): bool
-    {
-        // Grab the file name off the top of the $params
-        // after we split it.
-        $params = explode(',', $params);
-        $name   = array_shift($params);
-
-        if (! ($files = $this->request->getFileMultiple($name))) {
-            $files = [$this->request->getFile($name)];
-        }
-
-        foreach ($files as $file) {
-            if ($file === null) {
-                return false;
-            }
-
-            if ($file->getError() === UPLOAD_ERR_NO_FILE) {
-                return true;
-            }
-
-            if (! in_array($file->guessExtension(), $params, true)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Checks an uploaded file to verify that the dimensions are within
-     * a specified allowable dimension.
-     */
-    public function max_dims(?string $blank, string $params): bool
-    {
-        // Grab the file name off the top of the $params
-        // after we split it.
-        $params = explode(',', $params);
-        $name   = array_shift($params);
-
-        if (! ($files = $this->request->getFileMultiple($name))) {
-            $files = [$this->request->getFile($name)];
-        }
-
-        foreach ($files as $file) {
-            if ($file === null) {
-                return false;
-            }
-
-            if ($file->getError() === UPLOAD_ERR_NO_FILE) {
-                return true;
-            }
-
-            // Get Parameter sizes
-            $allowedWidth  = $params[0] ?? 0;
-            $allowedHeight = $params[1] ?? 0;
-
-            // Get uploaded image size
-            $info       = getimagesize($file->getTempName());
-            $fileWidth  = $info[0];
-            $fileHeight = $info[1];
-
-            if ($fileWidth > $allowedWidth || $fileHeight > $allowedHeight) {
-                return false;
-            }
-        }
-
-        return true;
-    }
 }

From 2c1020a6e668cd2a6620d3a5e4ba865567b10301 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 6 Jan 2022 15:50:59 +0900
Subject: [PATCH 1156/2325] refactor: strtolower() should take only string

---
 system/Validation/FormatRules.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index 4d02f221365d..990ea8128809 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -317,7 +317,8 @@ public function valid_url_strict(?string $str = null, ?string $validSchemes = nu
             return false;
         }
 
-        $scheme       = strtolower(parse_url($str, PHP_URL_SCHEME) ?? ''); // absent scheme gives null
+        // parse_url() may return null and false
+        $scheme       = strtolower((string) parse_url($str, PHP_URL_SCHEME));
         $validSchemes = explode(
             ',',
             strtolower($validSchemes ?? 'http,https')

From dfee04e5ec3bd62f067b4b37147960f03d6cf2eb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 6 Jan 2022 15:52:34 +0900
Subject: [PATCH 1157/2325] refactor: composition with NonStrictFormatRules

---
 system/Validation/StrictRules/FormatRules.php | 138 +++++-------------
 1 file changed, 34 insertions(+), 104 deletions(-)

diff --git a/system/Validation/StrictRules/FormatRules.php b/system/Validation/StrictRules/FormatRules.php
index 9eb76b832ed8..56a885f2bed8 100644
--- a/system/Validation/StrictRules/FormatRules.php
+++ b/system/Validation/StrictRules/FormatRules.php
@@ -13,13 +13,23 @@
 
 namespace CodeIgniter\Validation\StrictRules;
 
-use DateTime;
+use CodeIgniter\Validation\FormatRules as NonStrictFormatRules;
 
 /**
  * Format validation Rules.
  */
 class FormatRules
 {
+    /**
+     * @var NonStrictFormatRules
+     */
+    private $nonStrictFormatRules;
+
+    public function __construct()
+    {
+        $this->nonStrictFormatRules = new NonStrictFormatRules();
+    }
+
     /**
      * Alpha
      *
@@ -31,7 +41,7 @@ public function alpha($str = null): bool
             return false;
         }
 
-        return ctype_alpha($str);
+        return $this->nonStrictFormatRules->alpha($str);
     }
 
     /**
@@ -51,8 +61,7 @@ public function alpha_space(?string $value = null): bool
             return false;
         }
 
-        // @see https://regex101.com/r/LhqHPO/1
-        return (bool) preg_match('/\A[A-Z ]+\z/i', $value);
+        return $this->nonStrictFormatRules->alpha_space($value);
     }
 
     /**
@@ -74,8 +83,7 @@ public function alpha_dash($str = null): bool
             return false;
         }
 
-        // @see https://regex101.com/r/XfVY3d/1
-        return preg_match('/\A[a-z0-9_-]+\z/i', $str) === 1;
+        return $this->nonStrictFormatRules->alpha_dash($str);
     }
 
     /**
@@ -103,8 +111,7 @@ public function alpha_numeric_punct($str)
             return false;
         }
 
-        // @see https://regex101.com/r/6N8dDY/1
-        return preg_match('/\A[A-Z0-9 ~!#$%\&\*\-_+=|:.]+\z/i', $str) === 1;
+        return $this->nonStrictFormatRules->alpha_numeric_punct($str);
     }
 
     /**
@@ -122,7 +129,7 @@ public function alpha_numeric($str = null): bool
             return false;
         }
 
-        return ctype_alnum($str);
+        return $this->nonStrictFormatRules->alpha_numeric($str);
     }
 
     /**
@@ -140,8 +147,7 @@ public function alpha_numeric_space($str = null): bool
             return false;
         }
 
-        // @see https://regex101.com/r/0AZDME/1
-        return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str ?? '');
+        return $this->nonStrictFormatRules->alpha_numeric_space($str);
     }
 
     /**
@@ -151,7 +157,7 @@ public function alpha_numeric_space($str = null): bool
      */
     public function string($str = null): bool
     {
-        return is_string($str);
+        return $this->nonStrictFormatRules->string($str);
     }
 
     /**
@@ -169,8 +175,7 @@ public function decimal($str = null): bool
             return false;
         }
 
-        // @see https://regex101.com/r/HULifl/2/
-        return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str ?? '');
+        return $this->nonStrictFormatRules->decimal($str);
     }
 
     /**
@@ -188,7 +193,7 @@ public function hex($str = null): bool
             return false;
         }
 
-        return ctype_xdigit($str);
+        return $this->nonStrictFormatRules->hex($str);
     }
 
     /**
@@ -206,7 +211,7 @@ public function integer($str = null): bool
             return false;
         }
 
-        return (bool) preg_match('/\A[\-+]?\d+\z/', $str);
+        return $this->nonStrictFormatRules->integer($str);
     }
 
     /**
@@ -224,7 +229,7 @@ public function is_natural($str = null): bool
             return false;
         }
 
-        return ctype_digit($str);
+        return $this->nonStrictFormatRules->is_natural($str);
     }
 
     /**
@@ -242,7 +247,7 @@ public function is_natural_no_zero($str = null): bool
             return false;
         }
 
-        return $str !== '0' && ctype_digit($str);
+        return $this->nonStrictFormatRules->is_natural_no_zero($str);
     }
 
     /**
@@ -260,8 +265,7 @@ public function numeric($str = null): bool
             return false;
         }
 
-        // @see https://regex101.com/r/bb9wtr/2
-        return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str ?? '');
+        return $this->nonStrictFormatRules->numeric($str);
     }
 
     /**
@@ -275,11 +279,7 @@ public function regex_match($str, string $pattern): bool
             return false;
         }
 
-        if (strpos($pattern, '/') !== 0) {
-            $pattern = "/{$pattern}/";
-        }
-
-        return (bool) preg_match($pattern, $str ?? '');
+        return $this->nonStrictFormatRules->regex_match($str, $pattern);
     }
 
     /**
@@ -296,7 +296,7 @@ public function timezone($str = null): bool
             return false;
         }
 
-        return in_array($str, timezone_identifiers_list(), true);
+        return $this->nonStrictFormatRules->timezone($str);
     }
 
     /**
@@ -313,7 +313,7 @@ public function valid_base64($str = null): bool
             return false;
         }
 
-        return base64_encode(base64_decode($str, true)) === $str;
+        return $this->nonStrictFormatRules->valid_base64($str);
     }
 
     /**
@@ -327,9 +327,7 @@ public function valid_json($str = null): bool
             return false;
         }
 
-        json_decode($str);
-
-        return json_last_error() === JSON_ERROR_NONE;
+        return $this->nonStrictFormatRules->valid_json($str);
     }
 
     /**
@@ -343,12 +341,7 @@ public function valid_email($str = null): bool
             return false;
         }
 
-        // @see https://regex101.com/r/wlJG1t/1/
-        if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str ?? '', $matches)) {
-            $str = $matches[1] . '@' . idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46);
-        }
-
-        return (bool) filter_var($str, FILTER_VALIDATE_EMAIL);
+        return $this->nonStrictFormatRules->valid_email($str);
     }
 
     /**
@@ -365,19 +358,7 @@ public function valid_emails($str = null): bool
             return false;
         }
 
-        foreach (explode(',', $str) as $email) {
-            $email = trim($email);
-
-            if ($email === '') {
-                return false;
-            }
-
-            if ($this->valid_email($email) === false) {
-                return false;
-            }
-        }
-
-        return true;
+        return $this->nonStrictFormatRules->valid_emails($str);
     }
 
     /**
@@ -392,25 +373,7 @@ public function valid_ip($ip = null, ?string $which = null): bool
             return false;
         }
 
-        if (empty($ip)) {
-            return false;
-        }
-
-        switch (strtolower($which ?? '')) {
-            case 'ipv4':
-                $which = FILTER_FLAG_IPV4;
-                break;
-
-            case 'ipv6':
-                $which = FILTER_FLAG_IPV6;
-                break;
-
-            default:
-                $which = 0;
-        }
-
-        return filter_var($ip, FILTER_VALIDATE_IP, $which) !== false
-            || (! ctype_print($ip) && filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which) !== false);
+        return $this->nonStrictFormatRules->valid_ip($ip, $which);
     }
 
     /**
@@ -427,21 +390,7 @@ public function valid_url($str = null): bool
             return false;
         }
 
-        if (empty($str)) {
-            return false;
-        }
-
-        if (preg_match('/^(?:([^:]*)\:)?\/\/(.+)$/', $str, $matches)) {
-            if (! in_array($matches[1], ['http', 'https'], true)) {
-                return false;
-            }
-
-            $str = $matches[2];
-        }
-
-        $str = 'http://' . $str;
-
-        return filter_var($str, FILTER_VALIDATE_URL) !== false;
+        return $this->nonStrictFormatRules->valid_url($str);
     }
 
     /**
@@ -456,19 +405,7 @@ public function valid_url_strict($str = null, ?string $validSchemes = null): boo
             return false;
         }
 
-        if (empty($str)) {
-            return false;
-        }
-
-        // parse_url() may return null and false
-        $scheme       = strtolower((string) parse_url($str, PHP_URL_SCHEME));
-        $validSchemes = explode(
-            ',',
-            strtolower($validSchemes ?? 'http,https')
-        );
-
-        return in_array($scheme, $validSchemes, true)
-            && filter_var($str, FILTER_VALIDATE_URL) !== false;
+        return $this->nonStrictFormatRules->valid_url_strict($str, $validSchemes);
     }
 
     /**
@@ -482,13 +419,6 @@ public function valid_date($str = null, ?string $format = null): bool
             return false;
         }
 
-        if (empty($format)) {
-            return strtotime($str) !== false;
-        }
-
-        $date   = DateTime::createFromFormat($format, $str);
-        $errors = DateTime::getLastErrors();
-
-        return $date !== false && $errors !== false && $errors['warning_count'] === 0 && $errors['error_count'] === 0;
+        return $this->nonStrictFormatRules->valid_date($str, $format);
     }
 }

From c8ecd89da0fb9ed80e8a84cb9957e3891536d783 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 6 Jan 2022 16:05:33 +0900
Subject: [PATCH 1158/2325] refactor: composition with NonStrictRules

---
 system/Validation/StrictRules/Rules.php | 155 +++++-------------------
 1 file changed, 29 insertions(+), 126 deletions(-)

diff --git a/system/Validation/StrictRules/Rules.php b/system/Validation/StrictRules/Rules.php
index 61a70a1a49b9..3cd190d4452e 100644
--- a/system/Validation/StrictRules/Rules.php
+++ b/system/Validation/StrictRules/Rules.php
@@ -13,14 +13,24 @@
 
 namespace CodeIgniter\Validation\StrictRules;
 
+use CodeIgniter\Validation\Rules as NonStrictRules;
 use Config\Database;
-use InvalidArgumentException;
 
 /**
  * Validation Rules.
  */
 class Rules
 {
+    /**
+     * @var NonStrictRules
+     */
+    private $nonStrictRules;
+
+    public function __construct()
+    {
+        $this->nonStrictRules = new NonStrictRules();
+    }
+
     /**
      * The value does not match another field in $data.
      *
@@ -33,11 +43,7 @@ public function differs($str, string $field, array $data): bool
             return false;
         }
 
-        if (strpos($field, '.') !== false) {
-            return $str !== dot_array_search($field, $data);
-        }
-
-        return array_key_exists($field, $data) && $str !== $data[$field];
+        return $this->nonStrictRules->differs($str, $field, $data);
     }
 
     /**
@@ -47,7 +53,7 @@ public function differs($str, string $field, array $data): bool
      */
     public function equals($str, string $val): bool
     {
-        return $str === $val;
+        return $this->nonStrictRules->equals($str, $val);
     }
 
     /**
@@ -62,15 +68,7 @@ public function exact_length($str, string $val): bool
             return false;
         }
 
-        $val = explode(',', $val);
-
-        foreach ($val as $tmp) {
-            if (is_numeric($tmp) && (int) $tmp === mb_strlen($str ?? '')) {
-                return true;
-            }
-        }
-
-        return false;
+        return $this->nonStrictRules->exact_length($str, $val);
     }
 
     /**
@@ -80,7 +78,7 @@ public function exact_length($str, string $val): bool
      */
     public function greater_than($str, string $min): bool
     {
-        return is_numeric($str) && $str > $min;
+        return $this->nonStrictRules->greater_than($str, $min);
     }
 
     /**
@@ -90,7 +88,7 @@ public function greater_than($str, string $min): bool
      */
     public function greater_than_equal_to($str, string $min): bool
     {
-        return is_numeric($str) && $str >= $min;
+        return $this->nonStrictRules->greater_than_equal_to($str, $min);
     }
 
     /**
@@ -106,23 +104,7 @@ public function greater_than_equal_to($str, string $min): bool
      */
     public function is_not_unique($str, string $field, array $data): bool
     {
-        // Grab any data for exclusion of a single row.
-        [$field, $whereField, $whereValue] = array_pad(explode(',', $field), 3, null);
-
-        // Break the table and field apart
-        sscanf($field, '%[^.].%[^.]', $table, $field);
-
-        $row = Database::connect($data['DBGroup'] ?? null)
-            ->table($table)
-            ->select('1')
-            ->where($field, $str)
-            ->limit(1);
-
-        if (! empty($whereField) && ! empty($whereValue) && ! preg_match('/^\{(\w+)\}$/', $whereValue)) {
-            $row = $row->where($whereField, $whereValue);
-        }
-
-        return $row->get()->getRow() !== null;
+        return $this->nonStrictRules->is_not_unique($str, $field, $data);
     }
 
     /**
@@ -140,9 +122,7 @@ public function in_list($value, string $list): bool
             return false;
         }
 
-        $list = array_map('trim', explode(',', $list));
-
-        return in_array($value, $list, true);
+        return $this->nonStrictRules->in_list($value, $list);
     }
 
     /**
@@ -158,21 +138,7 @@ public function in_list($value, string $list): bool
      */
     public function is_unique($str, string $field, array $data): bool
     {
-        [$field, $ignoreField, $ignoreValue] = array_pad(explode(',', $field), 3, null);
-
-        sscanf($field, '%[^.].%[^.]', $table, $field);
-
-        $row = Database::connect($data['DBGroup'] ?? null)
-            ->table($table)
-            ->select('1')
-            ->where($field, $str)
-            ->limit(1);
-
-        if (! empty($ignoreField) && ! empty($ignoreValue) && ! preg_match('/^\{(\w+)\}$/', $ignoreValue)) {
-            $row = $row->where("{$ignoreField} !=", $ignoreValue);
-        }
-
-        return $row->get()->getRow() === null;
+        return $this->nonStrictRules->is_unique($str, $field, $data);
     }
 
     /**
@@ -182,7 +148,7 @@ public function is_unique($str, string $field, array $data): bool
      */
     public function less_than($str, string $max): bool
     {
-        return is_numeric($str) && $str < $max;
+        return $this->nonStrictRules->less_than($str, $max);
     }
 
     /**
@@ -192,7 +158,7 @@ public function less_than($str, string $max): bool
      */
     public function less_than_equal_to($str, string $max): bool
     {
-        return is_numeric($str) && $str <= $max;
+        return $this->nonStrictRules->less_than_equal_to($str, $max);
     }
 
     /**
@@ -203,11 +169,7 @@ public function less_than_equal_to($str, string $max): bool
      */
     public function matches($str, string $field, array $data): bool
     {
-        if (strpos($field, '.') !== false) {
-            return $str === dot_array_search($field, $data);
-        }
-
-        return array_key_exists($field, $data) && $str === $data[$field];
+        return $this->nonStrictRules->matches($str, $field, $data);
     }
 
     /**
@@ -225,7 +187,7 @@ public function max_length($str, string $val): bool
             return false;
         }
 
-        return is_numeric($val) && $val >= mb_strlen($str);
+        return $this->nonStrictRules->max_length($str, $val);
     }
 
     /**
@@ -243,7 +205,7 @@ public function min_length($str, string $val): bool
             return false;
         }
 
-        return is_numeric($val) && $val <= mb_strlen($str);
+        return $this->nonStrictRules->min_length($str, $val);
     }
 
     /**
@@ -253,7 +215,7 @@ public function min_length($str, string $val): bool
      */
     public function not_equals($str, string $val): bool
     {
-        return $str !== $val;
+        return $this->nonStrictRules->not_equals($str, $val);
     }
 
     /**
@@ -275,7 +237,7 @@ public function not_in_list($value, string $list): bool
             return false;
         }
 
-        return ! $this->in_list($value, $list);
+        return $this->nonStrictRules->not_in_list($value, $list);
     }
 
     /**
@@ -283,19 +245,7 @@ public function not_in_list($value, string $list): bool
      */
     public function required($str = null): bool
     {
-        if ($str === null) {
-            return false;
-        }
-
-        if (is_object($str)) {
-            return true;
-        }
-
-        if (is_array($str)) {
-            return $str !== [];
-        }
-
-        return trim((string) $str) !== '';
+        return $this->nonStrictRules->required($str);
     }
 
     /**
@@ -312,32 +262,7 @@ public function required($str = null): bool
      */
     public function required_with($str = null, ?string $fields = null, array $data = []): bool
     {
-        if ($fields === null || empty($data)) {
-            throw new InvalidArgumentException('You must supply the parameters: fields, data.');
-        }
-
-        // If the field is present we can safely assume that
-        // the field is here, no matter whether the corresponding
-        // search field is present or not.
-        $fields  = explode(',', $fields);
-        $present = $this->required($str ?? '');
-
-        if ($present) {
-            return true;
-        }
-
-        // Still here? Then we fail this test if
-        // any of the fields are present in $data
-        // as $fields is the lis
-        $requiredFields = [];
-
-        foreach ($fields as $field) {
-            if ((array_key_exists($field, $data) && ! empty($data[$field])) || (strpos($field, '.') !== false && ! empty(dot_array_search($field, $data)))) {
-                $requiredFields[] = $field;
-            }
-        }
-
-        return empty($requiredFields);
+        return $this->nonStrictRules->required_with($str, $fields, $data);
     }
 
     /**
@@ -352,28 +277,6 @@ public function required_with($str = null, ?string $fields = null, array $data =
      */
     public function required_without($str = null, ?string $fields = null, array $data = []): bool
     {
-        if ($fields === null || empty($data)) {
-            throw new InvalidArgumentException('You must supply the parameters: fields, data.');
-        }
-
-        // If the field is present we can safely assume that
-        // the field is here, no matter whether the corresponding
-        // search field is present or not.
-        $fields  = explode(',', $fields);
-        $present = $this->required($str ?? '');
-
-        if ($present) {
-            return true;
-        }
-
-        // Still here? Then we fail this test if
-        // any of the fields are not present in $data
-        foreach ($fields as $field) {
-            if ((strpos($field, '.') === false && (! array_key_exists($field, $data) || empty($data[$field]))) || (strpos($field, '.') !== false && empty(dot_array_search($field, $data)))) {
-                return false;
-            }
-        }
-
-        return true;
+        return $this->nonStrictRules->required_without($str, $fields, $data);
     }
 }

From f5b60686a240bcc65b8b57751ab1c60ca27433ae Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 7 Jan 2022 11:34:36 +0900
Subject: [PATCH 1159/2325] docs: replace mixed|null with mixed

mixed includes null.
---
 system/Validation/StrictRules/FormatRules.php | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/system/Validation/StrictRules/FormatRules.php b/system/Validation/StrictRules/FormatRules.php
index 56a885f2bed8..f42ea9a7bd28 100644
--- a/system/Validation/StrictRules/FormatRules.php
+++ b/system/Validation/StrictRules/FormatRules.php
@@ -33,7 +33,7 @@ public function __construct()
     /**
      * Alpha
      *
-     * @param mixed|null $str
+     * @param mixed $str
      */
     public function alpha($str = null): bool
     {
@@ -67,7 +67,7 @@ public function alpha_space(?string $value = null): bool
     /**
      * Alphanumeric with underscores and dashes
      *
-     * @param mixed|null $str
+     * @param mixed $str
      */
     public function alpha_dash($str = null): bool
     {
@@ -117,7 +117,7 @@ public function alpha_numeric_punct($str)
     /**
      * Alphanumeric
      *
-     * @param mixed|null $str
+     * @param mixed $str
      */
     public function alpha_numeric($str = null): bool
     {
@@ -135,7 +135,7 @@ public function alpha_numeric($str = null): bool
     /**
      * Alphanumeric w/ spaces
      *
-     * @param mixed|null $str
+     * @param mixed $str
      */
     public function alpha_numeric_space($str = null): bool
     {
@@ -163,7 +163,7 @@ public function string($str = null): bool
     /**
      * Decimal number
      *
-     * @param mixed|null $str
+     * @param mixed $str
      */
     public function decimal($str = null): bool
     {
@@ -181,7 +181,7 @@ public function decimal($str = null): bool
     /**
      * String of hexidecimal characters
      *
-     * @param mixed|null $str
+     * @param mixed $str
      */
     public function hex($str = null): bool
     {
@@ -199,7 +199,7 @@ public function hex($str = null): bool
     /**
      * Integer
      *
-     * @param mixed|null $str
+     * @param mixed $str
      */
     public function integer($str = null): bool
     {
@@ -217,7 +217,7 @@ public function integer($str = null): bool
     /**
      * Is a Natural number  (0,1,2,3, etc.)
      *
-     * @param mixed|null $str
+     * @param mixed $str
      */
     public function is_natural($str = null): bool
     {
@@ -235,7 +235,7 @@ public function is_natural($str = null): bool
     /**
      * Is a Natural number, but not a zero  (1,2,3, etc.)
      *
-     * @param mixed|null $str
+     * @param mixed $str
      */
     public function is_natural_no_zero($str = null): bool
     {
@@ -253,7 +253,7 @@ public function is_natural_no_zero($str = null): bool
     /**
      * Numeric
      *
-     * @param mixed|null $str
+     * @param mixed $str
      */
     public function numeric($str = null): bool
     {
@@ -365,7 +365,7 @@ public function valid_emails($str = null): bool
      * Validate an IP address (human readable format or binary string - inet_pton)
      *
      * @param string|null $which IP protocol: 'ipv4' or 'ipv6'
-     * @param mixed|null  $ip
+     * @param mixed       $ip
      */
     public function valid_ip($ip = null, ?string $which = null): bool
     {
@@ -382,7 +382,7 @@ public function valid_ip($ip = null, ?string $which = null): bool
      * Warning: this rule will pass basic strings like
      * "banana"; use valid_url_strict for a stricter rule.
      *
-     * @param mixed|null $str
+     * @param mixed $str
      */
     public function valid_url($str = null): bool
     {
@@ -397,7 +397,7 @@ public function valid_url($str = null): bool
      * Checks a URL to ensure it's formed correctly.
      *
      * @param string|null $validSchemes comma separated list of allowed schemes
-     * @param mixed|null  $str
+     * @param mixed       $str
      */
     public function valid_url_strict($str = null, ?string $validSchemes = null): bool
     {
@@ -411,7 +411,7 @@ public function valid_url_strict($str = null, ?string $validSchemes = null): boo
     /**
      * Checks for a valid date and matches a given date format
      *
-     * @param mixed|null $str
+     * @param mixed $str
      */
     public function valid_date($str = null, ?string $format = null): bool
     {

From 0e6a086f0763068c5e4a4a8ac5cff6af679aa2e3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 7 Jan 2022 11:44:43 +0900
Subject: [PATCH 1160/2325] fix: remove type for param

To return validation error (not TypeError exception), it must accept all type values.
And called from a file without `strict_types`, implicit type conversion occurs.
---
 system/Validation/StrictRules/FormatRules.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Validation/StrictRules/FormatRules.php b/system/Validation/StrictRules/FormatRules.php
index f42ea9a7bd28..e62ae613353b 100644
--- a/system/Validation/StrictRules/FormatRules.php
+++ b/system/Validation/StrictRules/FormatRules.php
@@ -47,11 +47,11 @@ public function alpha($str = null): bool
     /**
      * Alpha with spaces.
      *
-     * @param string|null $value Value.
+     * @param mixed $value Value.
      *
      * @return bool True if alpha with spaces, else false.
      */
-    public function alpha_space(?string $value = null): bool
+    public function alpha_space($value = null): bool
     {
         if ($value === null) {
             return true;

From 04a40d4a6a7bea110f21a6f4cf439463e3ab6105 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 7 Jan 2022 11:52:07 +0900
Subject: [PATCH 1161/2325] docs: fix @param order

---
 system/Validation/StrictRules/FormatRules.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Validation/StrictRules/FormatRules.php b/system/Validation/StrictRules/FormatRules.php
index e62ae613353b..0742e39d1d57 100644
--- a/system/Validation/StrictRules/FormatRules.php
+++ b/system/Validation/StrictRules/FormatRules.php
@@ -364,8 +364,8 @@ public function valid_emails($str = null): bool
     /**
      * Validate an IP address (human readable format or binary string - inet_pton)
      *
-     * @param string|null $which IP protocol: 'ipv4' or 'ipv6'
      * @param mixed       $ip
+     * @param string|null $which IP protocol: 'ipv4' or 'ipv6'
      */
     public function valid_ip($ip = null, ?string $which = null): bool
     {
@@ -396,8 +396,8 @@ public function valid_url($str = null): bool
     /**
      * Checks a URL to ensure it's formed correctly.
      *
-     * @param string|null $validSchemes comma separated list of allowed schemes
      * @param mixed       $str
+     * @param string|null $validSchemes comma separated list of allowed schemes
      */
     public function valid_url_strict($str = null, ?string $validSchemes = null): bool
     {

From 2a0bd480d0ad44da189621fee6f4978eb1c35905 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 7 Jan 2022 11:53:05 +0900
Subject: [PATCH 1162/2325] docs: fix @param type

These methods accept all type value to return validation error.
---
 system/Validation/StrictRules/FormatRules.php | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/system/Validation/StrictRules/FormatRules.php b/system/Validation/StrictRules/FormatRules.php
index 0742e39d1d57..124c43835605 100644
--- a/system/Validation/StrictRules/FormatRules.php
+++ b/system/Validation/StrictRules/FormatRules.php
@@ -93,16 +93,12 @@ public function alpha_dash($str = null): bool
      * _ underscore, + plus, = equals, | vertical bar, : colon, . period
      * ~ ! # $ % & * - _ + = | : .
      *
-     * @param string|null $str
+     * @param mixed $str
      *
      * @return bool
      */
     public function alpha_numeric_punct($str)
     {
-        if ($str === null) {
-            return false;
-        }
-
         if (is_int($str) || is_float($str)) {
             $str = (string) $str;
         }
@@ -153,7 +149,7 @@ public function alpha_numeric_space($str = null): bool
     /**
      * Any type of string
      *
-     * @param string|null $str
+     * @param mixed $str
      */
     public function string($str = null): bool
     {
@@ -288,7 +284,7 @@ public function regex_match($str, string $pattern): bool
      *
      * @see http://php.net/manual/en/datetimezone.listidentifiers.php
      *
-     * @param string $str
+     * @param mixed $str
      */
     public function timezone($str = null): bool
     {
@@ -305,7 +301,7 @@ public function timezone($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
+     * @param mixed $str
      */
     public function valid_base64($str = null): bool
     {
@@ -319,7 +315,7 @@ public function valid_base64($str = null): bool
     /**
      * Valid JSON
      *
-     * @param string $str
+     * @param mixed $str
      */
     public function valid_json($str = null): bool
     {
@@ -333,7 +329,7 @@ public function valid_json($str = null): bool
     /**
      * Checks for a correctly formatted email address
      *
-     * @param string $str
+     * @param mixed $str
      */
     public function valid_email($str = null): bool
     {
@@ -350,7 +346,7 @@ public function valid_email($str = null): bool
      * Example:
      *     valid_emails[one@example.com,two@example.com]
      *
-     * @param string $str
+     * @param mixed $str
      */
     public function valid_emails($str = null): bool
     {

From 9e671ada7ab9558d03922c9a5eaf19cddeceebf5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 7 Jan 2022 11:59:53 +0900
Subject: [PATCH 1163/2325] refactor: remove unneeded if statement

---
 system/Validation/StrictRules/FormatRules.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/system/Validation/StrictRules/FormatRules.php b/system/Validation/StrictRules/FormatRules.php
index 124c43835605..9d3d72f86668 100644
--- a/system/Validation/StrictRules/FormatRules.php
+++ b/system/Validation/StrictRules/FormatRules.php
@@ -71,10 +71,6 @@ public function alpha_space($value = null): bool
      */
     public function alpha_dash($str = null): bool
     {
-        if ($str === null) {
-            return false;
-        }
-
         if (is_int($str)) {
             $str = (string) $str;
         }

From 28ecf128aff654a0dd6ba6a3958faf5205cd189c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 7 Jan 2022 12:03:21 +0900
Subject: [PATCH 1164/2325] fix: now `alpha_space` does not accept null

Other alpha_* does not accept null.
---
 system/Validation/StrictRules/FormatRules.php           | 4 ----
 tests/system/Validation/StrictRules/FormatRulesTest.php | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/system/Validation/StrictRules/FormatRules.php b/system/Validation/StrictRules/FormatRules.php
index 9d3d72f86668..b1f7e463bcc1 100644
--- a/system/Validation/StrictRules/FormatRules.php
+++ b/system/Validation/StrictRules/FormatRules.php
@@ -53,10 +53,6 @@ public function alpha($str = null): bool
      */
     public function alpha_space($value = null): bool
     {
-        if ($value === null) {
-            return true;
-        }
-
         if (! is_string($value)) {
             return false;
         }
diff --git a/tests/system/Validation/StrictRules/FormatRulesTest.php b/tests/system/Validation/StrictRules/FormatRulesTest.php
index 9e35aaa20ec1..5976b54cc371 100644
--- a/tests/system/Validation/StrictRules/FormatRulesTest.php
+++ b/tests/system/Validation/StrictRules/FormatRulesTest.php
@@ -473,7 +473,7 @@ public function alphaSpaceProvider(): Generator
         yield from [
             [
                 null,
-                true,
+                false,  // true in v4.1.6 and earlier
             ],
             [
                 self::ALPHABET,

From 337a71a69f091774bfdb5316932eaff121c68209 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 7 Jan 2022 12:45:57 +0900
Subject: [PATCH 1165/2325] test: update comments

---
 tests/system/Validation/StrictRules/FormatRulesTest.php | 8 ++++----
 tests/system/Validation/StrictRules/ValidationTest.php  | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/system/Validation/StrictRules/FormatRulesTest.php b/tests/system/Validation/StrictRules/FormatRulesTest.php
index 5976b54cc371..33e75ab8ab1f 100644
--- a/tests/system/Validation/StrictRules/FormatRulesTest.php
+++ b/tests/system/Validation/StrictRules/FormatRulesTest.php
@@ -473,7 +473,7 @@ public function alphaSpaceProvider(): Generator
         yield from [
             [
                 null,
-                false,  // true in v4.1.6 and earlier
+                false,  // true in Traditional Rule
             ],
             [
                 self::ALPHABET,
@@ -840,17 +840,17 @@ public function integerInvalidTypeDataProvider(): Generator
     {
         yield 'array with int' => [
             [555],
-            false,  // true in v4.1.5 and earlier
+            false,  // TypeError in Traditional Rule
         ];
 
         yield 'empty array' => [
             [],
-            false,  // true in v4.1.5 and earlier
+            false,  // TypeError in Traditional Rule
         ];
 
         yield 'bool true' => [
             true,
-            false,  // true in v4.1.5 and earlier
+            false,  // true in Traditional Rule
         ];
 
         yield 'bool false' => [
diff --git a/tests/system/Validation/StrictRules/ValidationTest.php b/tests/system/Validation/StrictRules/ValidationTest.php
index d7a6d5893e97..cf016756fc7a 100644
--- a/tests/system/Validation/StrictRules/ValidationTest.php
+++ b/tests/system/Validation/StrictRules/ValidationTest.php
@@ -120,7 +120,7 @@ public function arrayDataProvider(): Generator
     {
         yield 'list array' => [
             [1, 2, 3, 4, 5],
-            true,   // false in v4.1.5 and earlier
+            true,   // false in Traditional Rule
         ];
 
         yield 'associative array' => [
@@ -129,7 +129,7 @@ public function arrayDataProvider(): Generator
                 'role'     => 'administrator',
                 'usepass'  => 0,
             ],
-            true,   // false in v4.1.5 and earlier
+            true,   // false in Traditional Rule
         ];
 
         yield 'int' => [
@@ -172,7 +172,7 @@ public function isIntInvalidTypeDataProvider(): Generator
     {
         yield 'array with int' => [
             [555],
-            false,  // true in v4.1.5 and earlier
+            false,  // true in Traditional Rule
         ];
 
         yield 'empty array' => [

From dc12656137d703c74b4b3dc54867d8c13a51881e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 7 Jan 2022 13:42:16 +0900
Subject: [PATCH 1166/2325] docs: fix @param order

---
 system/Validation/StrictRules/Rules.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Validation/StrictRules/Rules.php b/system/Validation/StrictRules/Rules.php
index 3cd190d4452e..347b87883b56 100644
--- a/system/Validation/StrictRules/Rules.php
+++ b/system/Validation/StrictRules/Rules.php
@@ -34,8 +34,8 @@ public function __construct()
     /**
      * The value does not match another field in $data.
      *
-     * @param array $data Other field/value pairs
      * @param mixed $str
+     * @param array $data Other field/value pairs
      */
     public function differs($str, string $field, array $data): bool
     {
@@ -164,8 +164,8 @@ public function less_than_equal_to($str, string $max): bool
     /**
      * Matches the value of another field in $data.
      *
-     * @param array $data Other field/value pairs
      * @param mixed $str
+     * @param array $data Other field/value pairs
      */
     public function matches($str, string $field, array $data): bool
     {

From d5b0ffa0f142d34c59198a8775b736c383b4ad5c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 7 Jan 2022 13:42:41 +0900
Subject: [PATCH 1167/2325] docs: fix @param type

---
 system/Validation/StrictRules/Rules.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/Validation/StrictRules/Rules.php b/system/Validation/StrictRules/Rules.php
index 347b87883b56..e910227d5f3d 100644
--- a/system/Validation/StrictRules/Rules.php
+++ b/system/Validation/StrictRules/Rules.php
@@ -211,7 +211,7 @@ public function min_length($str, string $val): bool
     /**
      * Does not equal the static value provided.
      *
-     * @param string $str
+     * @param mixed $str
      */
     public function not_equals($str, string $val): bool
     {
@@ -221,7 +221,7 @@ public function not_equals($str, string $val): bool
     /**
      * Value should not be within an array of values.
      *
-     * @param string $value
+     * @param mixed $value
      */
     public function not_in_list($value, string $list): bool
     {
@@ -256,7 +256,7 @@ public function required($str = null): bool
      *
      *     required_with[password]
      *
-     * @param string|null $str
+     * @param mixed       $str
      * @param string|null $fields List of fields that we should check if present
      * @param array       $data   Complete list of fields from the form
      */
@@ -273,7 +273,7 @@ public function required_with($str = null, ?string $fields = null, array $data =
      *
      *     required_without[id,email]
      *
-     * @param string|null $str
+     * @param mixed $str
      */
     public function required_without($str = null, ?string $fields = null, array $data = []): bool
     {

From 7d8cde59fd72dab19272fe00c30c50c7c7370ff4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 13 Jan 2022 09:22:40 +0900
Subject: [PATCH 1168/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/libraries/validation.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 79ceebe89dd3..28f283540900 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -209,7 +209,7 @@ Config for Validation
 Traditional and Strict Rules
 ============================
 
-CI4 has two kind of Validation rule classes.
+CI4 has two kinds of Validation rule classes.
 The default rule classes (**Traditional Rules**) have the namespace ``CodeIgniter\Validation``,
 and the new classes (**Strict Rules**) have ``CodeIgniter\Validation\StrictRules``, which provide strict validation.
 

From 736b598ead7cef664e435389d7f7c99d1cb38199 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 13 Jan 2022 09:33:34 +0900
Subject: [PATCH 1169/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/libraries/validation.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 28f283540900..9fce387fdfa1 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -217,9 +217,9 @@ The **Traditional Rules** implicitly assume that string values are validated.
 And the input value may be converted implicitly to a string value.
 It works for most basic cases like validating POST data.
 
-But, for example, if you use JSON input data, it may be type of bool/null/array.
-When you validate the bool ``true``, it is converted to string ``'1'`` with the Traditional rule classes.
-And if you validate it with the ``integer`` rule, ``'1'`` passes the validation.
+However, for example, if you use JSON input data, it may be a type of bool/null/array.
+When you validate the boolean ``true``, it is converted to string ``'1'`` with the Traditional rule classes.
+If you validate it with the ``integer`` rule, ``'1'`` passes the validation.
 
 The **Strict Rules** don't use implicit type conversion.
 

From c60f075ff59b3df3f252f12ab6679d3ce026366c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 13 Jan 2022 09:34:17 +0900
Subject: [PATCH 1170/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/libraries/validation.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 9fce387fdfa1..c87f55864daf 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -228,7 +228,7 @@ The **Strict Rules** don't use implicit type conversion.
 Using Strict Rules
 ------------------
 
-If you want to use this, you need to change the rule classes in **app/Config/Validation.php**::
+If you want to use these rules, you need to change the rule classes in **app/Config/Validation.php**::
 
         public $ruleSets = [
             \CodeIgniter\Validation\StrictRules\CreditCardRules::class,

From e35b6074dc88ec42745772f760ff428e3f2e192f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 13 Jan 2022 09:36:01 +0900
Subject: [PATCH 1171/2325] docs: fix by proofreading

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

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index c87f55864daf..3c9d2a16a022 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -213,8 +213,8 @@ CI4 has two kinds of Validation rule classes.
 The default rule classes (**Traditional Rules**) have the namespace ``CodeIgniter\Validation``,
 and the new classes (**Strict Rules**) have ``CodeIgniter\Validation\StrictRules``, which provide strict validation.
 
-The **Traditional Rules** implicitly assume that string values are validated.
-And the input value may be converted implicitly to a string value.
+The **Traditional Rules** implicitly assume that string values are validated,
+and the input value may be converted implicitly to a string value.
 It works for most basic cases like validating POST data.
 
 However, for example, if you use JSON input data, it may be a type of bool/null/array.

From b7658006a1dabcc3504870fb26feb2d5838e0e8f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 13 Jan 2022 10:13:23 +0900
Subject: [PATCH 1172/2325] refactor: by rector

---
 system/Validation/StrictRules/CreditCardRules.php  |  5 +----
 system/Validation/StrictRules/FormatRules.php      |  5 +----
 system/Validation/StrictRules/Rules.php            |  5 +----
 .../Validation/StrictRules/CreditCardRulesTest.php |  8 ++------
 .../StrictRules/DatabaseRelatedRulesTest.php       |  8 ++------
 .../Validation/StrictRules/FileRulesTest.php       | 14 +++++---------
 .../Validation/StrictRules/FormatRulesTest.php     |  8 ++------
 tests/system/Validation/StrictRules/RulesTest.php  |  8 ++------
 .../Validation/StrictRules/ValidationTest.php      |  8 ++------
 9 files changed, 18 insertions(+), 51 deletions(-)

diff --git a/system/Validation/StrictRules/CreditCardRules.php b/system/Validation/StrictRules/CreditCardRules.php
index eec043a3011f..9d82daae01ef 100644
--- a/system/Validation/StrictRules/CreditCardRules.php
+++ b/system/Validation/StrictRules/CreditCardRules.php
@@ -24,10 +24,7 @@
  */
 class CreditCardRules
 {
-    /**
-     * @var NonStrictCreditCardRules
-     */
-    private $nonStrictCreditCardRules;
+    private NonStrictCreditCardRules $nonStrictCreditCardRules;
 
     public function __construct()
     {
diff --git a/system/Validation/StrictRules/FormatRules.php b/system/Validation/StrictRules/FormatRules.php
index b1f7e463bcc1..97df6c04aecb 100644
--- a/system/Validation/StrictRules/FormatRules.php
+++ b/system/Validation/StrictRules/FormatRules.php
@@ -20,10 +20,7 @@
  */
 class FormatRules
 {
-    /**
-     * @var NonStrictFormatRules
-     */
-    private $nonStrictFormatRules;
+    private NonStrictFormatRules $nonStrictFormatRules;
 
     public function __construct()
     {
diff --git a/system/Validation/StrictRules/Rules.php b/system/Validation/StrictRules/Rules.php
index e910227d5f3d..8861ab727852 100644
--- a/system/Validation/StrictRules/Rules.php
+++ b/system/Validation/StrictRules/Rules.php
@@ -21,10 +21,7 @@
  */
 class Rules
 {
-    /**
-     * @var NonStrictRules
-     */
-    private $nonStrictRules;
+    private NonStrictRules $nonStrictRules;
 
     public function __construct()
     {
diff --git a/tests/system/Validation/StrictRules/CreditCardRulesTest.php b/tests/system/Validation/StrictRules/CreditCardRulesTest.php
index 8bc1c69d1111..d5846194d6ac 100644
--- a/tests/system/Validation/StrictRules/CreditCardRulesTest.php
+++ b/tests/system/Validation/StrictRules/CreditCardRulesTest.php
@@ -22,12 +22,8 @@
  */
 final class CreditCardRulesTest extends CIUnitTestCase
 {
-    /**
-     * @var Validation
-     */
-    private $validation;
-
-    private $config = [
+    private Validation $validation;
+    private array $config = [
         'ruleSets' => [
             Rules::class,
             FormatRules::class,
diff --git a/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php b/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php
index d292a17846e7..79c9c7d39e9f 100644
--- a/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php
+++ b/tests/system/Validation/StrictRules/DatabaseRelatedRulesTest.php
@@ -27,12 +27,8 @@ final class DatabaseRelatedRulesTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
-    /**
-     * @var Validation
-     */
-    private $validation;
-
-    private $config = [
+    private Validation $validation;
+    private array $config = [
         'ruleSets' => [
             Rules::class,
             FormatRules::class,
diff --git a/tests/system/Validation/StrictRules/FileRulesTest.php b/tests/system/Validation/StrictRules/FileRulesTest.php
index c287fec7f50a..73e536d205e4 100644
--- a/tests/system/Validation/StrictRules/FileRulesTest.php
+++ b/tests/system/Validation/StrictRules/FileRulesTest.php
@@ -21,12 +21,8 @@
  */
 final class FileRulesTest extends CIUnitTestCase
 {
-    /**
-     * @var Validation
-     */
-    private $validation;
-
-    private $config = [
+    private Validation $validation;
+    private array $config = [
         'ruleSets' => [
             Rules::class,
             FormatRules::class,
@@ -63,7 +59,7 @@ protected function setUp(): void
             'bigfile' => [
                 'tmp_name' => TESTPATH . '_support/Validation/uploads/phpUxc0ty',
                 'name'     => 'my-big-file.png',
-                'size'     => 1024000,
+                'size'     => 1_024_000,
                 'type'     => 'image/png',
                 'error'    => UPLOAD_ERR_OK,
                 'width'    => 640,
@@ -89,7 +85,7 @@ protected function setUp(): void
                 ],
                 'size' => [
                     4614,
-                    1024000,
+                    1_024_000,
                 ],
                 'type' => [
                     'image/png',
@@ -119,7 +115,7 @@ protected function setUp(): void
                 ],
                 'size' => [
                     4614,
-                    1024000,
+                    1_024_000,
                 ],
                 'type' => [
                     'image/png',
diff --git a/tests/system/Validation/StrictRules/FormatRulesTest.php b/tests/system/Validation/StrictRules/FormatRulesTest.php
index 33e75ab8ab1f..c1a060f51664 100644
--- a/tests/system/Validation/StrictRules/FormatRulesTest.php
+++ b/tests/system/Validation/StrictRules/FormatRulesTest.php
@@ -25,12 +25,8 @@ final class FormatRulesTest extends CIUnitTestCase
     public const ALPHABET     = 'abcdefghijklmnopqrstuvwxyzABCDEFGHLIJKLMNOPQRSTUVWXYZ';
     public const ALPHANUMERIC = 'abcdefghijklmnopqrstuvwxyzABCDEFGHLIJKLMNOPQRSTUVWXYZ0123456789';
 
-    /**
-     * @var Validation
-     */
-    private $validation;
-
-    private $config = [
+    private Validation $validation;
+    private array $config = [
         'ruleSets' => [
             Rules::class,
             FormatRules::class,
diff --git a/tests/system/Validation/StrictRules/RulesTest.php b/tests/system/Validation/StrictRules/RulesTest.php
index dd0a38289afa..f3f8ce946020 100644
--- a/tests/system/Validation/StrictRules/RulesTest.php
+++ b/tests/system/Validation/StrictRules/RulesTest.php
@@ -23,12 +23,8 @@
  */
 final class RulesTest extends CIUnitTestCase
 {
-    /**
-     * @var Validation
-     */
-    private $validation;
-
-    private $config = [
+    private Validation $validation;
+    private array $config = [
         'ruleSets' => [
             Rules::class,
             FormatRules::class,
diff --git a/tests/system/Validation/StrictRules/ValidationTest.php b/tests/system/Validation/StrictRules/ValidationTest.php
index cf016756fc7a..34211ca80425 100644
--- a/tests/system/Validation/StrictRules/ValidationTest.php
+++ b/tests/system/Validation/StrictRules/ValidationTest.php
@@ -27,12 +27,8 @@
  */
 final class ValidationTest extends CIUnitTestCase
 {
-    /**
-     * @var Validation
-     */
-    private $validation;
-
-    private $config = [
+    private Validation $validation;
+    private array $config = [
         'ruleSets' => [
             Rules::class,
             FormatRules::class,

From 06f6cd686803342c8a452eb8a306038ad9734a39 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Thu, 13 Jan 2022 00:33:57 -0600
Subject: [PATCH 1173/2325] Added new View Decorators.

---
 app/Config/View.php                           |  11 ++
 system/Language/en/View.php                   |   1 +
 system/View/Exceptions/ViewException.php      |   5 +
 system/View/Interfaces/ViewDecorator.php      |  30 +++++
 system/View/Parser.php                        |   6 +
 system/View/Traits/DecoratesViews.php         |  40 +++++++
 system/View/View.php                          |  16 +++
 tests/_support/View/BadDecorator.php          |  26 +++++
 tests/_support/View/WorldDecorator.php        |  30 +++++
 tests/system/View/DecoratorsTest.php          | 109 ++++++++++++++++++
 user_guide_src/source/outgoing/index.rst      |   1 +
 .../source/outgoing/view_decorators.rst       |  40 +++++++
 12 files changed, 315 insertions(+)
 create mode 100644 system/View/Interfaces/ViewDecorator.php
 create mode 100644 system/View/Traits/DecoratesViews.php
 create mode 100644 tests/_support/View/BadDecorator.php
 create mode 100644 tests/_support/View/WorldDecorator.php
 create mode 100644 tests/system/View/DecoratorsTest.php
 create mode 100644 user_guide_src/source/outgoing/view_decorators.rst

diff --git a/app/Config/View.php b/app/Config/View.php
index 024e8302a01b..a1c649a5c214 100644
--- a/app/Config/View.php
+++ b/app/Config/View.php
@@ -41,4 +41,15 @@ class View extends BaseView
      * @var array
      */
     public $plugins = [];
+
+    /**
+     * View Decorators are class methods that will be run in sequence to
+     * have a chance to alter the generated output just prior to caching
+     * the results.
+     *
+     * All classes must implement CodeIgniter\View\ViewDecorator
+     *
+     * @var array
+     */
+    public $decorators = [];
 }
diff --git a/system/Language/en/View.php b/system/Language/en/View.php
index df42d1fa3f0e..3aad53122a78 100644
--- a/system/Language/en/View.php
+++ b/system/Language/en/View.php
@@ -17,4 +17,5 @@
     'noCellClass'           => 'No view cell class provided.',
     'invalidCellClass'      => 'Unable to locate view cell class: {0}.',
     'tagSyntaxError'        => 'You have a syntax error in your Parser tags: {0}',
+    'invalidDecoratorClass' => '{0} is not a valid ViewDecorator.',
 ];
diff --git a/system/View/Exceptions/ViewException.php b/system/View/Exceptions/ViewException.php
index f2643e44ed7e..3e07893ffec2 100644
--- a/system/View/Exceptions/ViewException.php
+++ b/system/View/Exceptions/ViewException.php
@@ -44,4 +44,9 @@ public static function forTagSyntaxError(string $output)
     {
         return new static(lang('View.tagSyntaxError', [$output]));
     }
+
+    public static function forInvalidDecorator(string $className)
+    {
+        return new static(lang('View.invalidDecoratorClass', [$className]));
+    }
 }
diff --git a/system/View/Interfaces/ViewDecorator.php b/system/View/Interfaces/ViewDecorator.php
new file mode 100644
index 000000000000..80cfe5d4645e
--- /dev/null
+++ b/system/View/Interfaces/ViewDecorator.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\View\Interfaces;
+
+/**
+ * View Decorators are simple classes that are given the
+ * chance to modify the output from the view() calls
+ * prior to it being cached.
+ */
+interface ViewDecorator
+{
+    /**
+     * Takes $html and has a chance to alter it.
+     * MUST return the modified HTML.
+     *
+     * @param string $html
+     *
+     * @return string
+     */
+    public function decorate(string $html): string;
+}
diff --git a/system/View/Parser.php b/system/View/Parser.php
index ac4f29750f8a..be2d3918a9d9 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\View;
 
 use CodeIgniter\View\Exceptions\ViewException;
+use CodeIgniter\View\Traits\DecoratesViews;
 use Config\View as ViewConfig;
 use ParseError;
 use Psr\Log\LoggerInterface;
@@ -21,6 +22,8 @@
  */
 class Parser extends View
 {
+    use DecoratesViews;
+
     /**
      * Left delimiter character for pseudo vars
      *
@@ -124,6 +127,9 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
         if ($saveData) {
             $this->data = $this->tempData;
         }
+
+        $output = $this->decorateOutput($output);
+
         // Should we cache?
         if (isset($options['cache'])) {
             cache()->save($cacheName, $output, (int) $options['cache']);
diff --git a/system/View/Traits/DecoratesViews.php b/system/View/Traits/DecoratesViews.php
new file mode 100644
index 000000000000..af2c6f356181
--- /dev/null
+++ b/system/View/Traits/DecoratesViews.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace CodeIgniter\View\Traits;
+
+use CodeIgniter\View\Exceptions\ViewException;
+use CodeIgniter\View\Interfaces\ViewDecorator;
+
+use function config;
+
+trait DecoratesViews
+{
+    /**
+     * Runs the generated output through and declared
+     * view decorators.
+     *
+     * @param string $html
+     *
+     * @return string
+     */
+    private function decorateOutput(string $html): string
+    {
+        $decorators = config('View')->decorators;
+
+        if (empty($decorators)) {
+            return $html;
+        }
+
+        foreach ($decorators as $className) {
+            $decorator = new $className();
+
+            if (! $decorator instanceof ViewDecorator) {
+                throw ViewException::forInvalidDecorator($className);
+            }
+
+            $html = $decorator->decorate($html);
+        }
+
+        return $html;
+    }
+}
diff --git a/system/View/View.php b/system/View/View.php
index 6e81272e0e02..1c168cf3c71a 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Autoloader\FileLocator;
 use CodeIgniter\Debug\Toolbar\Collectors\Views;
 use CodeIgniter\View\Exceptions\ViewException;
+use CodeIgniter\View\Traits\DecoratesViews;
 use Config\Services;
 use Config\Toolbar;
 use Config\View as ViewConfig;
@@ -25,6 +26,8 @@
  */
 class View implements RendererInterface
 {
+    use DecoratesViews;
+
     /**
      * Data that is made available to the Views.
      *
@@ -134,6 +137,17 @@ class View implements RendererInterface
      */
     protected $sectionStack = [];
 
+    /**
+     * View Decorators are class methods that will be run in sequence to
+     * have a chance to alter the generated output just prior to caching
+     * the results.
+     *
+     * All classes must implement CodeIgniter\View\ViewDecorator
+     *
+     * @var array
+     */
+    public $decorators = [];
+
     public function __construct(ViewConfig $config, ?string $viewPath = null, ?FileLocator $loader = null, ?bool $debug = null, ?LoggerInterface $logger = null)
     {
         $this->config   = $config;
@@ -228,6 +242,8 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
             $this->renderVars = $renderVars;
         }
 
+        $output = $this->decorateOutput($output);
+
         $this->logPerformance($this->renderVars['start'], microtime(true), $this->renderVars['view']);
 
         if (($this->debug && (! isset($options['debug']) || $options['debug'] === true))
diff --git a/tests/_support/View/BadDecorator.php b/tests/_support/View/BadDecorator.php
new file mode 100644
index 000000000000..c248d9423099
--- /dev/null
+++ b/tests/_support/View/BadDecorator.php
@@ -0,0 +1,26 @@
+<?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\View;
+
+/**
+ * Class BadDecorator
+ *
+ * This class is only used to provide a reference point
+ * during tests to make sure that things work as expected.
+ */
+class BadDecorator
+{
+    public function decorate(string $html): string
+    {
+        return $html;
+    }
+}
diff --git a/tests/_support/View/WorldDecorator.php b/tests/_support/View/WorldDecorator.php
new file mode 100644
index 000000000000..8f3752f42e71
--- /dev/null
+++ b/tests/_support/View/WorldDecorator.php
@@ -0,0 +1,30 @@
+<?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\View;
+
+use CodeIgniter\View\Interfaces\ViewDecorator;
+
+/**
+ * Class WorldDecorator
+ *
+ * This class is only used to provide a reference point
+ * during tests to make sure that things work as expected.
+ */
+class WorldDecorator implements ViewDecorator
+{
+    public function decorate(string $html): string
+    {
+        $html = str_ireplace('World', 'Galaxy', $html);
+
+        return $html;
+    }
+}
diff --git a/tests/system/View/DecoratorsTest.php b/tests/system/View/DecoratorsTest.php
new file mode 100644
index 000000000000..7ef56bf6649d
--- /dev/null
+++ b/tests/system/View/DecoratorsTest.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\View;
+
+use CodeIgniter\Config\Factories;
+use CodeIgniter\Config\Services;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\View\Exceptions\ViewException;
+use Tests\Support\View\BadDecorator;
+use Tests\Support\View\WorldDecorator;
+
+/**
+ * @internal
+ */
+final class DecoratorsTest extends CIUnitTestCase
+{
+    protected $loader;
+    protected $viewsDir;
+    protected $config;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->loader   = Services::locator();
+        $this->viewsDir = __DIR__ . '/Views';
+        $this->config   = config('View');
+    }
+
+    public function testNoDecoratorsDoesntAlter()
+    {
+        $config = $this->config;
+        $config->decorators = [];
+        Factories::injectMock('config', 'View', $config);
+
+        $view = new View($this->config, $this->viewsDir, $this->loader);
+
+        $view->setVar('testString', 'Hello World');
+        $expected = '<h1>Hello World</h1>';
+
+        $this->assertStringContainsString($expected, $view->render('simple'));
+    }
+
+    public function testThrowsOnInvalidClass()
+    {
+        $this->expectException(ViewException::class);
+        $this->expectExceptionMessage(lang('View.invalidDecoratorClass', ['Tests\Support\View\BadDecorator']));
+
+        $config = $this->config;
+        $config->decorators = [BadDecorator::class];
+        Factories::injectMock('config', 'View', $config);
+
+        $view = new View($this->config, $this->viewsDir, $this->loader);
+
+        $view->setVar('testString', 'Hello World');
+        $expected = '<h1>Hello World</h1>';
+
+        $this->assertStringContainsString($expected, $view->render('simple'));
+    }
+
+    public function testDecoratorAltersOutput()
+    {
+        $config = $this->config;
+        $config->decorators = [WorldDecorator::class];
+        Factories::injectMock('config', 'View', $config);
+
+        $view = new View($this->config, $this->viewsDir, $this->loader);
+
+        $view->setVar('testString', 'Hello World');
+        $expected = '<h1>Hello Galaxy</h1>';
+
+        $this->assertStringContainsString($expected, $view->render('simple'));
+    }
+
+    public function testParserNoDecoratorsDoesntAlter()
+    {
+        $config = $this->config;
+        $config->decorators = [];
+        Factories::injectMock('config', 'View', $config);
+
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
+        $parser->setVar('teststring', 'Hello World');
+
+        $this->assertSame("<h1>Hello World</h1>\n", $parser->render('template1'));
+    }
+
+    public function testParserDecoratorAltersOutput()
+    {
+        $config = $this->config;
+        $config->decorators = [WorldDecorator::class];
+        Factories::injectMock('config', 'View', $config);
+
+        $view = new View($this->config, $this->viewsDir, $this->loader);
+
+        $parser = new Parser($this->config, $this->viewsDir, $this->loader);
+        $parser->setVar('teststring', 'Hello World');
+
+        $this->assertSame("<h1>Hello Galaxy</h1>\n", $parser->render('template1'));
+    }
+}
diff --git a/user_guide_src/source/outgoing/index.rst b/user_guide_src/source/outgoing/index.rst
index 12995a7daf9e..2b95096511c3 100644
--- a/user_guide_src/source/outgoing/index.rst
+++ b/user_guide_src/source/outgoing/index.rst
@@ -12,6 +12,7 @@ View components are used to build what is returned to the user.
     view_renderer
     view_layouts
     view_parser
+    view_decorators
     table
     response
     api_responses
diff --git a/user_guide_src/source/outgoing/view_decorators.rst b/user_guide_src/source/outgoing/view_decorators.rst
new file mode 100644
index 000000000000..ecd7cb038fb3
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_decorators.rst
@@ -0,0 +1,40 @@
+###############
+View Decorators
+###############
+
+View Decorators allow your application to modify the HTML output during the rendering process. This happens just
+prior to being cached, and allows you to apply custom functionality to your views.
+
+*******************
+Creating Decorators
+*******************
+
+Implementing your own view decorators requires creating a new class that implements ``CodeIgniter\Views\Interfaces\ViewDecorator``.
+This requires implementing a single method that takes the generated HTML, performs any modifications on it, and returns
+the resulting HTML.
+
+::
+
+    <?php
+
+    namespace App\Views\Decorators;
+
+    use CodeIgniter\Views\Interfaces\ViewDecorator;
+
+    class MyDecorator implements ViewDecorator
+    {
+        public function decorate(string $html): string
+        {
+            // Modify the output here
+
+            return $html;
+        }
+    }
+
+Once created, the class must be registered in ``app/Config/View.php``::
+
+    public $decorators = [
+        'App\Views\Decorators\MyDecorator',
+    ];
+
+Now that it's registered the decorator will be called for every view that is rendered or parsed.

From d85a4fdecee752cf9f26a9aeea579ef62ef86544 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 13 Jan 2022 18:44:59 +0900
Subject: [PATCH 1174/2325] fix: the error message

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 system/Language/en/Database.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Language/en/Database.php b/system/Language/en/Database.php
index eaa3be67b3cf..63a18498e9f4 100644
--- a/system/Language/en/Database.php
+++ b/system/Language/en/Database.php
@@ -27,5 +27,5 @@
     'fieldNotExists'                   => 'Field `{0}` not found.',
     'forEmptyInputGiven'               => 'Empty statement is given for the field `{0}`',
     'forFindColumnHaveMultipleColumns' => 'Only single column allowed in Column name.',
-    'methodNotAvailable'               => 'You cannot use `{1}` in `{0}`. The CodeIgniter\Model is not the Query Builder.',
+    'methodNotAvailable'               => 'You cannot use `{1}` in `{0}`. This is a method of the `Query Builder` class.',
 ];

From 8777a9df664fbeab44d12d0dba1193828a3a0104 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Thu, 13 Jan 2022 10:47:44 -0600
Subject: [PATCH 1175/2325] Apply review suggestions

---
 system/Config/View.php                        | 11 +++++
 system/View/Parser.php                        |  3 +-
 system/View/Traits/DecoratesViews.php         | 40 -------------------
 system/View/View.php                          | 14 +------
 ...corator.php => ViewDecoratorInterface.php} | 10 ++---
 system/View/ViewDecoratorTrait.php            | 29 ++++++++++++++
 tests/_support/View/BadDecorator.php          |  2 +-
 tests/_support/View/WorldDecorator.php        |  6 +--
 tests/system/View/DecoratorsTest.php          |  2 -
 .../source/outgoing/view_decorators.rst       |  5 ++-
 10 files changed, 52 insertions(+), 70 deletions(-)
 delete mode 100644 system/View/Traits/DecoratesViews.php
 rename system/View/{Interfaces/ViewDecorator.php => ViewDecoratorInterface.php} (74%)
 create mode 100644 system/View/ViewDecoratorTrait.php

diff --git a/system/Config/View.php b/system/Config/View.php
index da4f81b1c716..2522a9727b03 100644
--- a/system/Config/View.php
+++ b/system/Config/View.php
@@ -88,6 +88,17 @@ class View extends BaseConfig
         'siteURL'           => '\CodeIgniter\View\Plugins::siteURL',
     ];
 
+    /**
+     * View Decorators are class methods that will be run in sequence to
+     * have a chance to alter the generated output just prior to caching
+     * the results.
+     *
+     * All classes must implement CodeIgniter\View\ViewDecorator
+     *
+     * @var array
+     */
+    public $decorators = [];
+
     /**
      * Merge the built-in and developer-configured filters and plugins,
      * with preference to the developer ones.
diff --git a/system/View/Parser.php b/system/View/Parser.php
index be2d3918a9d9..6834c003e500 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -12,7 +12,6 @@
 namespace CodeIgniter\View;
 
 use CodeIgniter\View\Exceptions\ViewException;
-use CodeIgniter\View\Traits\DecoratesViews;
 use Config\View as ViewConfig;
 use ParseError;
 use Psr\Log\LoggerInterface;
@@ -22,7 +21,7 @@
  */
 class Parser extends View
 {
-    use DecoratesViews;
+    use ViewDecoratorTrait;
 
     /**
      * Left delimiter character for pseudo vars
diff --git a/system/View/Traits/DecoratesViews.php b/system/View/Traits/DecoratesViews.php
deleted file mode 100644
index af2c6f356181..000000000000
--- a/system/View/Traits/DecoratesViews.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace CodeIgniter\View\Traits;
-
-use CodeIgniter\View\Exceptions\ViewException;
-use CodeIgniter\View\Interfaces\ViewDecorator;
-
-use function config;
-
-trait DecoratesViews
-{
-    /**
-     * Runs the generated output through and declared
-     * view decorators.
-     *
-     * @param string $html
-     *
-     * @return string
-     */
-    private function decorateOutput(string $html): string
-    {
-        $decorators = config('View')->decorators;
-
-        if (empty($decorators)) {
-            return $html;
-        }
-
-        foreach ($decorators as $className) {
-            $decorator = new $className();
-
-            if (! $decorator instanceof ViewDecorator) {
-                throw ViewException::forInvalidDecorator($className);
-            }
-
-            $html = $decorator->decorate($html);
-        }
-
-        return $html;
-    }
-}
diff --git a/system/View/View.php b/system/View/View.php
index 1c168cf3c71a..f557b6629b0a 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -14,7 +14,6 @@
 use CodeIgniter\Autoloader\FileLocator;
 use CodeIgniter\Debug\Toolbar\Collectors\Views;
 use CodeIgniter\View\Exceptions\ViewException;
-use CodeIgniter\View\Traits\DecoratesViews;
 use Config\Services;
 use Config\Toolbar;
 use Config\View as ViewConfig;
@@ -26,7 +25,7 @@
  */
 class View implements RendererInterface
 {
-    use DecoratesViews;
+    use ViewDecoratorTrait;
 
     /**
      * Data that is made available to the Views.
@@ -137,17 +136,6 @@ class View implements RendererInterface
      */
     protected $sectionStack = [];
 
-    /**
-     * View Decorators are class methods that will be run in sequence to
-     * have a chance to alter the generated output just prior to caching
-     * the results.
-     *
-     * All classes must implement CodeIgniter\View\ViewDecorator
-     *
-     * @var array
-     */
-    public $decorators = [];
-
     public function __construct(ViewConfig $config, ?string $viewPath = null, ?FileLocator $loader = null, ?bool $debug = null, ?LoggerInterface $logger = null)
     {
         $this->config   = $config;
diff --git a/system/View/Interfaces/ViewDecorator.php b/system/View/ViewDecoratorInterface.php
similarity index 74%
rename from system/View/Interfaces/ViewDecorator.php
rename to system/View/ViewDecoratorInterface.php
index 80cfe5d4645e..0a4d99266c36 100644
--- a/system/View/Interfaces/ViewDecorator.php
+++ b/system/View/ViewDecoratorInterface.php
@@ -9,22 +9,18 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace CodeIgniter\View\Interfaces;
+namespace CodeIgniter\View;
 
 /**
  * View Decorators are simple classes that are given the
  * chance to modify the output from the view() calls
  * prior to it being cached.
  */
-interface ViewDecorator
+interface ViewDecoratorInterface
 {
     /**
      * Takes $html and has a chance to alter it.
      * MUST return the modified HTML.
-     *
-     * @param string $html
-     *
-     * @return string
      */
-    public function decorate(string $html): string;
+    public static function decorate(string $html): string;
 }
diff --git a/system/View/ViewDecoratorTrait.php b/system/View/ViewDecoratorTrait.php
new file mode 100644
index 000000000000..1bff8b06a750
--- /dev/null
+++ b/system/View/ViewDecoratorTrait.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace CodeIgniter\View;
+
+use CodeIgniter\View\Exceptions\ViewException;
+
+use function config;
+
+trait ViewDecoratorTrait
+{
+    /**
+     * Runs the generated output through and declared
+     * view decorators.
+     */
+    private function decorateOutput(string $html): string
+    {
+        $decorators = config('View')->decorators;
+
+        foreach ($decorators as $decorator) {
+            if (! is_subclass_of($decorator, ViewDecoratorInterface::class)) {
+                throw ViewException::forInvalidDecorator($decorator);
+            }
+
+            $html = $decorator::decorate($html);
+        }
+
+        return $html;
+    }
+}
diff --git a/tests/_support/View/BadDecorator.php b/tests/_support/View/BadDecorator.php
index c248d9423099..5a095f27cd34 100644
--- a/tests/_support/View/BadDecorator.php
+++ b/tests/_support/View/BadDecorator.php
@@ -19,7 +19,7 @@
  */
 class BadDecorator
 {
-    public function decorate(string $html): string
+    public static function decorate(string $html): string
     {
         return $html;
     }
diff --git a/tests/_support/View/WorldDecorator.php b/tests/_support/View/WorldDecorator.php
index 8f3752f42e71..b305dbb38573 100644
--- a/tests/_support/View/WorldDecorator.php
+++ b/tests/_support/View/WorldDecorator.php
@@ -11,7 +11,7 @@
 
 namespace Tests\Support\View;
 
-use CodeIgniter\View\Interfaces\ViewDecorator;
+use CodeIgniter\View\ViewDecoratorInterface;
 
 /**
  * Class WorldDecorator
@@ -19,9 +19,9 @@
  * This class is only used to provide a reference point
  * during tests to make sure that things work as expected.
  */
-class WorldDecorator implements ViewDecorator
+class WorldDecorator implements ViewDecoratorInterface
 {
-    public function decorate(string $html): string
+    public static function decorate(string $html): string
     {
         $html = str_ireplace('World', 'Galaxy', $html);
 
diff --git a/tests/system/View/DecoratorsTest.php b/tests/system/View/DecoratorsTest.php
index 7ef56bf6649d..0a19965a142f 100644
--- a/tests/system/View/DecoratorsTest.php
+++ b/tests/system/View/DecoratorsTest.php
@@ -99,8 +99,6 @@ public function testParserDecoratorAltersOutput()
         $config->decorators = [WorldDecorator::class];
         Factories::injectMock('config', 'View', $config);
 
-        $view = new View($this->config, $this->viewsDir, $this->loader);
-
         $parser = new Parser($this->config, $this->viewsDir, $this->loader);
         $parser->setVar('teststring', 'Hello World');
 
diff --git a/user_guide_src/source/outgoing/view_decorators.rst b/user_guide_src/source/outgoing/view_decorators.rst
index ecd7cb038fb3..0b0590035e8d 100644
--- a/user_guide_src/source/outgoing/view_decorators.rst
+++ b/user_guide_src/source/outgoing/view_decorators.rst
@@ -9,7 +9,7 @@ prior to being cached, and allows you to apply custom functionality to your view
 Creating Decorators
 *******************
 
-Implementing your own view decorators requires creating a new class that implements ``CodeIgniter\Views\Interfaces\ViewDecorator``.
+Implementing your own view decorators requires creating a new class that implements ``CodeIgniter\Views\ViewDecoratorInterface``.
 This requires implementing a single method that takes the generated HTML, performs any modifications on it, and returns
 the resulting HTML.
 
@@ -23,7 +23,7 @@ the resulting HTML.
 
     class MyDecorator implements ViewDecorator
     {
-        public function decorate(string $html): string
+        public static function decorate(string $html): string
         {
             // Modify the output here
 
@@ -38,3 +38,4 @@ Once created, the class must be registered in ``app/Config/View.php``::
     ];
 
 Now that it's registered the decorator will be called for every view that is rendered or parsed.
+Decorators are called in the order specified in this configuration setting.

From dc361856e3f1da19ae2dc6c9f80c6ca0784a131c Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Thu, 13 Jan 2022 22:16:39 -0600
Subject: [PATCH 1176/2325] Additional review comments

---
 app/Config/View.php                                |  4 ++--
 system/Config/View.php                             |  4 ++--
 system/Language/en/View.php                        |  2 +-
 system/View/ViewDecoratorTrait.php                 | 11 ++++++++++-
 tests/_support/View/WorldDecorator.php             |  4 +---
 tests/system/View/DecoratorsTest.php               | 10 +++++-----
 user_guide_src/source/outgoing/view_decorators.rst |  4 ++--
 7 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/app/Config/View.php b/app/Config/View.php
index a1c649a5c214..f674325ee74f 100644
--- a/app/Config/View.php
+++ b/app/Config/View.php
@@ -47,9 +47,9 @@ class View extends BaseView
      * have a chance to alter the generated output just prior to caching
      * the results.
      *
-     * All classes must implement CodeIgniter\View\ViewDecorator
+     * All classes must implement CodeIgniter\View\ViewDecoratorInterface
      *
-     * @var array
+     * @var class-string<\CodeIgniter\View\ViewDecoratorInterface>[]
      */
     public $decorators = [];
 }
diff --git a/system/Config/View.php b/system/Config/View.php
index 2522a9727b03..fb3f2ec00c82 100644
--- a/system/Config/View.php
+++ b/system/Config/View.php
@@ -93,9 +93,9 @@ class View extends BaseConfig
      * have a chance to alter the generated output just prior to caching
      * the results.
      *
-     * All classes must implement CodeIgniter\View\ViewDecorator
+     * All classes must implement CodeIgniter\View\ViewDecoratorInterface
      *
-     * @var array
+     * @var class-string<\CodeIgniter\View\ViewDecoratorInterface>[]
      */
     public $decorators = [];
 
diff --git a/system/Language/en/View.php b/system/Language/en/View.php
index 3aad53122a78..ac94be50fd82 100644
--- a/system/Language/en/View.php
+++ b/system/Language/en/View.php
@@ -17,5 +17,5 @@
     'noCellClass'           => 'No view cell class provided.',
     'invalidCellClass'      => 'Unable to locate view cell class: {0}.',
     'tagSyntaxError'        => 'You have a syntax error in your Parser tags: {0}',
-    'invalidDecoratorClass' => '{0} is not a valid ViewDecorator.',
+    'invalidDecoratorClass' => '{0} is not a valid View Decorator.',
 ];
diff --git a/system/View/ViewDecoratorTrait.php b/system/View/ViewDecoratorTrait.php
index 1bff8b06a750..23ace6e7c4a6 100644
--- a/system/View/ViewDecoratorTrait.php
+++ b/system/View/ViewDecoratorTrait.php
@@ -1,5 +1,14 @@
 <?php
 
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace CodeIgniter\View;
 
 use CodeIgniter\View\Exceptions\ViewException;
@@ -12,7 +21,7 @@ trait ViewDecoratorTrait
      * Runs the generated output through and declared
      * view decorators.
      */
-    private function decorateOutput(string $html): string
+    protected function decorateOutput(string $html): string
     {
         $decorators = config('View')->decorators;
 
diff --git a/tests/_support/View/WorldDecorator.php b/tests/_support/View/WorldDecorator.php
index b305dbb38573..09f17a43ed44 100644
--- a/tests/_support/View/WorldDecorator.php
+++ b/tests/_support/View/WorldDecorator.php
@@ -23,8 +23,6 @@ class WorldDecorator implements ViewDecoratorInterface
 {
     public static function decorate(string $html): string
     {
-        $html = str_ireplace('World', 'Galaxy', $html);
-
-        return $html;
+        return str_ireplace('World', 'Galaxy', $html);
     }
 }
diff --git a/tests/system/View/DecoratorsTest.php b/tests/system/View/DecoratorsTest.php
index 0a19965a142f..571005897099 100644
--- a/tests/system/View/DecoratorsTest.php
+++ b/tests/system/View/DecoratorsTest.php
@@ -38,7 +38,7 @@ protected function setUp(): void
 
     public function testNoDecoratorsDoesntAlter()
     {
-        $config = $this->config;
+        $config             = $this->config;
         $config->decorators = [];
         Factories::injectMock('config', 'View', $config);
 
@@ -55,7 +55,7 @@ public function testThrowsOnInvalidClass()
         $this->expectException(ViewException::class);
         $this->expectExceptionMessage(lang('View.invalidDecoratorClass', ['Tests\Support\View\BadDecorator']));
 
-        $config = $this->config;
+        $config             = $this->config;
         $config->decorators = [BadDecorator::class];
         Factories::injectMock('config', 'View', $config);
 
@@ -69,7 +69,7 @@ public function testThrowsOnInvalidClass()
 
     public function testDecoratorAltersOutput()
     {
-        $config = $this->config;
+        $config             = $this->config;
         $config->decorators = [WorldDecorator::class];
         Factories::injectMock('config', 'View', $config);
 
@@ -83,7 +83,7 @@ public function testDecoratorAltersOutput()
 
     public function testParserNoDecoratorsDoesntAlter()
     {
-        $config = $this->config;
+        $config             = $this->config;
         $config->decorators = [];
         Factories::injectMock('config', 'View', $config);
 
@@ -95,7 +95,7 @@ public function testParserNoDecoratorsDoesntAlter()
 
     public function testParserDecoratorAltersOutput()
     {
-        $config = $this->config;
+        $config             = $this->config;
         $config->decorators = [WorldDecorator::class];
         Factories::injectMock('config', 'View', $config);
 
diff --git a/user_guide_src/source/outgoing/view_decorators.rst b/user_guide_src/source/outgoing/view_decorators.rst
index 0b0590035e8d..acf5c825072a 100644
--- a/user_guide_src/source/outgoing/view_decorators.rst
+++ b/user_guide_src/source/outgoing/view_decorators.rst
@@ -19,9 +19,9 @@ the resulting HTML.
 
     namespace App\Views\Decorators;
 
-    use CodeIgniter\Views\Interfaces\ViewDecorator;
+    use CodeIgniter\Views\ViewDecoratorInterface;
 
-    class MyDecorator implements ViewDecorator
+    class MyDecorator implements ViewDecoratorInterface
     {
         public static function decorate(string $html): string
         {

From 7b1149b5e554fc01fb9e4dccac904b0c932a1f91 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Thu, 13 Jan 2022 22:22:31 -0600
Subject: [PATCH 1177/2325] Rector fixes

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

diff --git a/app/Config/View.php b/app/Config/View.php
index f674325ee74f..f974d2f32c8b 100644
--- a/app/Config/View.php
+++ b/app/Config/View.php
@@ -3,6 +3,7 @@
 namespace Config;
 
 use CodeIgniter\Config\View as BaseView;
+use CodeIgniter\View\ViewDecoratorInterface;
 
 class View extends BaseView
 {
@@ -49,7 +50,7 @@ class View extends BaseView
      *
      * All classes must implement CodeIgniter\View\ViewDecoratorInterface
      *
-     * @var class-string<\CodeIgniter\View\ViewDecoratorInterface>[]
+     * @var class-string<ViewDecoratorInterface>[]
      */
     public $decorators = [];
 }
diff --git a/system/Config/View.php b/system/Config/View.php
index fb3f2ec00c82..5733122736d9 100644
--- a/system/Config/View.php
+++ b/system/Config/View.php
@@ -11,6 +11,8 @@
 
 namespace CodeIgniter\Config;
 
+use CodeIgniter\View\ViewDecoratorInterface;
+
 /**
  * View configuration
  */
@@ -95,7 +97,7 @@ class View extends BaseConfig
      *
      * All classes must implement CodeIgniter\View\ViewDecoratorInterface
      *
-     * @var class-string<\CodeIgniter\View\ViewDecoratorInterface>[]
+     * @var class-string<ViewDecoratorInterface>[]
      */
     public $decorators = [];
 

From bbf3dfac419928aeac71ed58bfd7858cbad6a6aa Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Fri, 14 Jan 2022 15:10:45 +0800
Subject: [PATCH 1178/2325] Fix: QueryBuilder doc

---
 user_guide_src/source/database/query_builder.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index aaefbe9d4630..6136a5c5c281 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -230,8 +230,6 @@ Use the ``$db->newQuery()`` method to make a subquery the main table.::
 
     // Produces: SELECT * FROM (SELECT `id`, `name` FROM users) AS t
 
-.. note:: Only one subquery can be passed to a method.
-
 **$builder->join()**
 
 Permits you to write the JOIN portion of your query::

From 92c4ca2736ce466291138dfebfd1b63551e9bdae Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 14 Jan 2022 18:46:45 +0900
Subject: [PATCH 1179/2325] chore: workaround for `phpdoc_types_order` bug in
 v3.5.0

See https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/6238
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index da32db5a0a19..8616e15d7162 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.1",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "^3.1",
+        "friendsofphp/php-cs-fixer": "3.4.*",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.3",
         "nexusphp/tachycardia": "^1.0",

From 161ba77323760ee17361501c64c8e29ad93115b6 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Fri, 14 Jan 2022 11:52:05 -0600
Subject: [PATCH 1180/2325] Update system/View/ViewDecoratorTrait.php

Co-authored-by: MGatner <mgatner@icloud.com>
---
 system/View/ViewDecoratorTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/View/ViewDecoratorTrait.php b/system/View/ViewDecoratorTrait.php
index 23ace6e7c4a6..4dffa225e3f6 100644
--- a/system/View/ViewDecoratorTrait.php
+++ b/system/View/ViewDecoratorTrait.php
@@ -18,7 +18,7 @@
 trait ViewDecoratorTrait
 {
     /**
-     * Runs the generated output through and declared
+     * Runs the generated output through any declared
      * view decorators.
      */
     protected function decorateOutput(string $html): string

From d06689f80d21902385c7acf2ef5e9f614ccf72da Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Fri, 14 Jan 2022 11:52:17 -0600
Subject: [PATCH 1181/2325] Update
 user_guide_src/source/outgoing/view_decorators.rst

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/outgoing/view_decorators.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/outgoing/view_decorators.rst b/user_guide_src/source/outgoing/view_decorators.rst
index acf5c825072a..a61d0a140123 100644
--- a/user_guide_src/source/outgoing/view_decorators.rst
+++ b/user_guide_src/source/outgoing/view_decorators.rst
@@ -9,7 +9,7 @@ prior to being cached, and allows you to apply custom functionality to your view
 Creating Decorators
 *******************
 
-Implementing your own view decorators requires creating a new class that implements ``CodeIgniter\Views\ViewDecoratorInterface``.
+Creating your own view decorators requires creating a new class that implements ``CodeIgniter\Views\ViewDecoratorInterface``.
 This requires implementing a single method that takes the generated HTML, performs any modifications on it, and returns
 the resulting HTML.
 

From c71169c70b89b63157c0744acb28f19f787977cf Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Fri, 14 Jan 2022 11:52:31 -0600
Subject: [PATCH 1182/2325] Update
 user_guide_src/source/outgoing/view_decorators.rst

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/outgoing/view_decorators.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/outgoing/view_decorators.rst b/user_guide_src/source/outgoing/view_decorators.rst
index a61d0a140123..545641b580d9 100644
--- a/user_guide_src/source/outgoing/view_decorators.rst
+++ b/user_guide_src/source/outgoing/view_decorators.rst
@@ -10,7 +10,7 @@ Creating Decorators
 *******************
 
 Creating your own view decorators requires creating a new class that implements ``CodeIgniter\Views\ViewDecoratorInterface``.
-This requires implementing a single method that takes the generated HTML, performs any modifications on it, and returns
+This requires a single method that takes the generated HTML string, performs any modifications on it, and returns
 the resulting HTML.
 
 ::

From 0f455a387b433a5d3a502807ecc27fa3522e1789 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Fri, 14 Jan 2022 11:54:14 -0600
Subject: [PATCH 1183/2325] Update
 user_guide_src/source/outgoing/view_decorators.rst

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/outgoing/view_decorators.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/outgoing/view_decorators.rst b/user_guide_src/source/outgoing/view_decorators.rst
index 545641b580d9..513e9c1a3f0a 100644
--- a/user_guide_src/source/outgoing/view_decorators.rst
+++ b/user_guide_src/source/outgoing/view_decorators.rst
@@ -33,7 +33,7 @@ the resulting HTML.
 
 Once created, the class must be registered in ``app/Config/View.php``::
 
-    public $decorators = [
+    public array $decorators = [
         'App\Views\Decorators\MyDecorator',
     ];
 

From 5e9e425a7c12738304ebed9e7449fd74171a9622 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Fri, 14 Jan 2022 11:54:23 -0600
Subject: [PATCH 1184/2325] Update app/Config/View.php

Co-authored-by: MGatner <mgatner@icloud.com>
---
 app/Config/View.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Config/View.php b/app/Config/View.php
index f974d2f32c8b..78cd547e3b8f 100644
--- a/app/Config/View.php
+++ b/app/Config/View.php
@@ -52,5 +52,5 @@ class View extends BaseView
      *
      * @var class-string<ViewDecoratorInterface>[]
      */
-    public $decorators = [];
+    public array $decorators = [];
 }

From 593e6ad9310d1929af821eb8c9fa631a5bbf883b Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Fri, 14 Jan 2022 11:54:31 -0600
Subject: [PATCH 1185/2325] Update system/Config/View.php

Co-authored-by: MGatner <mgatner@icloud.com>
---
 system/Config/View.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Config/View.php b/system/Config/View.php
index 5733122736d9..42d40faf879e 100644
--- a/system/Config/View.php
+++ b/system/Config/View.php
@@ -99,7 +99,7 @@ class View extends BaseConfig
      *
      * @var class-string<ViewDecoratorInterface>[]
      */
-    public $decorators = [];
+    public array $decorators = [];
 
     /**
      * Merge the built-in and developer-configured filters and plugins,

From 015b302cc9b1de1571973be55beee1f3325b2c49 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 15 Jan 2022 09:39:43 +0900
Subject: [PATCH 1186/2325] =?UTF-8?q?test:=20refactor:=20$request->uri=20?=
 =?UTF-8?q?=E2=86=92=20$request->getUri()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 phpstan-baseline.neon.dist       | 5 -----
 system/Test/FeatureTestCase.php  | 2 +-
 system/Test/FeatureTestTrait.php | 2 +-
 tests/system/HTTP/URITest.php    | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index 7387648970ea..e8cdb15157f7 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -940,11 +940,6 @@ parameters:
 			count: 1
 			path: system/Test/Fabricator.php
 
-		-
-			message: "#^Access to protected property CodeIgniter\\\\HTTP\\\\Request\\:\\:\\$uri\\.$#"
-			count: 1
-			path: system/Test/FeatureTestCase.php
-
 		-
 			message: "#^Property CodeIgniter\\\\Test\\\\CIUnitTestCase\\:\\:\\$bodyFormat \\(string\\) in isset\\(\\) is not nullable\\.$#"
 			count: 1
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index d1a75edb8f62..b89ad5fb2fcc 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -349,7 +349,7 @@ protected function populateGlobals(string $method, Request $request, ?array $par
         // otherwise set it from the URL.
         $get = ! empty($params) && $method === 'get'
             ? $params
-            : $this->getPrivateProperty($request->uri, 'query');
+            : $this->getPrivateProperty($request->getUri(), 'query');
 
         $request->setGlobal('get', $get);
         if ($method !== 'get') {
diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php
index afb93376b9a0..a31852daf2cc 100644
--- a/system/Test/FeatureTestTrait.php
+++ b/system/Test/FeatureTestTrait.php
@@ -344,7 +344,7 @@ protected function populateGlobals(string $method, Request $request, ?array $par
         // otherwise set it from the URL.
         $get = ! empty($params) && $method === 'get'
             ? $params
-            : $this->getPrivateProperty($request->uri, 'query');
+            : $this->getPrivateProperty($request->getUri(), 'query');
 
         $request->setGlobal('get', $get);
         if ($method !== 'get') {
diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php
index 0438505aea2e..8536fcc7c801 100644
--- a/tests/system/HTTP/URITest.php
+++ b/tests/system/HTTP/URITest.php
@@ -875,7 +875,7 @@ public function testBasedNoIndex()
         Services::injectMock('request', $request);
 
         // going through request
-        $this->assertSame('http://example.com/ci/v4/controller/method', (string) $request->uri);
+        $this->assertSame('http://example.com/ci/v4/controller/method', (string) $request->getUri());
         $this->assertSame('/ci/v4/controller/method', $request->getUri()->getPath());
 
         // standalone

From 13115b9572b6a09cd5b0cdd6b6fbb27ae6206fda Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Fri, 14 Jan 2022 22:49:40 -0600
Subject: [PATCH 1187/2325] Added to changelog

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index c4722995961a..7556b28f8608 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -22,6 +22,7 @@ Enhancements
     - Added the config ``$autoNonce`` in ``Config\ContentSecurityPolicy`` to disable the CSP placeholder replacement
     - Added the functions ``csp_script_nonce()`` and ``csp_style_nonce()`` to get nonce attributes
     - See :ref:`content-security-policy` for details.
+- New View Decorators allow modifying the generated HTML prior to caching. 
 
 Changes
 *******

From 84ac2ea71f38d2428f1b52eca91e3cf4e09930a9 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 5 Jan 2022 22:19:53 +0800
Subject: [PATCH 1188/2325] Validation: support placeholders for anything

---
 system/Validation/Validation.php              |  71 +++---
 tests/system/Validation/ValidationTest.php    | 204 +++++++++++++++++-
 user_guide_src/source/changelogs/v4.2.0.rst   |   1 +
 .../source/libraries/validation.rst           |  20 +-
 4 files changed, 263 insertions(+), 33 deletions(-)

diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 031d8f51a398..1060527cb689 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -17,6 +17,7 @@
 use CodeIgniter\View\RendererInterface;
 use Config\Validation as ValidationConfig;
 use InvalidArgumentException;
+use TypeError;
 
 /**
  * Validator
@@ -362,18 +363,30 @@ public function withRequest(RequestInterface $request): ValidationInterface
      *        'rule' => 'message'
      *    ]
      *
+     * @param array|string $rules
+     *
+     * @throws TypeError
+     *
      * @return $this
      */
-    public function setRule(string $field, ?string $label, string $rules, array $errors = [])
+    public function setRule(string $field, ?string $label, $rules, array $errors = [])
     {
-        $this->rules[$field] = [
-            'label' => $label,
-            'rules' => $rules,
+        if (! is_array($rules) && ! is_string($rules)) {
+            throw new TypeError('$rules must be of type string|array');
+        }
+
+        $ruleSet = [
+            $field => [
+                'label' => $label,
+                'rules' => $rules,
+            ],
         ];
 
-        $this->customErrors = array_merge($this->customErrors, [
-            $field => $errors,
-        ]);
+        if ($errors) {
+            $ruleSet[$field]['errors'] = $errors;
+        }
+
+        $this->setRules($ruleSet + $this->getRules());
 
         return $this;
     }
@@ -401,16 +414,18 @@ public function setRules(array $rules, array $errors = []): ValidationInterface
         $this->customErrors = $errors;
 
         foreach ($rules as $field => &$rule) {
-            if (! is_array($rule)) {
-                continue;
-            }
+            if (is_array($rule)) {
+                if (array_key_exists('errors', $rule)) {
+                    $this->customErrors[$field] = $rule['errors'];
+                    unset($rule['errors']);
+                }
 
-            if (! array_key_exists('errors', $rule)) {
-                continue;
+                // if $rule is already a rule collection, just move it to "rules"
+                // transforming [foo => [required, foobar]] to [foo => [rules => [required, foobar]]]
+                if (! array_key_exists('rules', $rule)) {
+                    $rule = ['rules' => $rule];
+                }
             }
-
-            $this->customErrors[$field] = $rule['errors'];
-            unset($rule['errors']);
         }
 
         $this->rules = $rules;
@@ -581,23 +596,27 @@ protected function fillPlaceholders(array $rules, array $data): array
             $replacements["{{$key}}"] = $value;
         }
 
-        if (! empty($replacements)) {
+        if ($replacements !== []) {
             foreach ($rules as &$rule) {
-                if (is_array($rule)) {
-                    foreach ($rule as &$row) {
-                        // Should only be an `errors` array
-                        // which doesn't take placeholders.
-                        if (is_array($row)) {
-                            continue;
-                        }
+                $ruleSet = $rule['rules'] ?? $rule;
 
-                        $row = strtr($row ?? '', $replacements);
+                if (is_array($ruleSet)) {
+                    foreach ($ruleSet as &$row) {
+                        if (is_string($row)) {
+                            $row = strtr($row, $replacements);
+                        }
                     }
+                }
 
-                    continue;
+                if (is_string($ruleSet)) {
+                    $ruleSet = strtr($ruleSet, $replacements);
                 }
 
-                $rule = strtr($rule ?? '', $replacements);
+                if (isset($rule['rules'])) {
+                    $rule['rules'] = $ruleSet;
+                } else {
+                    $rule = $ruleSet;
+                }
             }
         }
 
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index dbc1c03e4b50..fa5e769411b0 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -19,7 +19,9 @@
 use Config\App;
 use Config\Services;
 use Generator;
+use PHPUnit\Framework\ExpectationFailedException;
 use Tests\Support\Validation\TestRules;
+use TypeError;
 
 /**
  * @internal
@@ -83,7 +85,109 @@ public function testSetRulesStoresRules(): void
         $this->assertSame($rules, $this->validation->getRules());
     }
 
-    public function testRunReturnsFalseWithNothingToDo(): void
+    public function testSetRuleStoresRule()
+    {
+        $this->validation->setRules([]);
+        $this->validation->setRule('foo', null, 'bar|baz');
+
+        $this->assertSame([
+            'foo' => [
+                'label' => null,
+                'rules' => 'bar|baz',
+            ],
+        ], $this->validation->getRules());
+    }
+
+    public function testSetRuleAddsRule()
+    {
+        $this->validation->setRules([
+            'bar' => [
+                'label' => null,
+                'rules' => 'bar|baz',
+            ],
+        ]);
+        $this->validation->setRule('foo', null, 'foo|foz');
+
+        $this->assertSame([
+            'foo' => [
+                'label' => null,
+                'rules' => 'foo|foz',
+            ],
+            'bar' => [
+                'label' => null,
+                'rules' => 'bar|baz',
+            ],
+        ], $this->validation->getRules());
+    }
+
+    public function testSetRuleOverwritesRule()
+    {
+        $this->validation->setRules([
+            'foo' => [
+                'label' => null,
+                'rules' => 'bar|baz',
+            ],
+        ]);
+        $this->validation->setRule('foo', null, 'foo|foz');
+
+        $this->assertSame([
+            'foo' => [
+                'label' => null,
+                'rules' => 'foo|foz',
+            ],
+        ], $this->validation->getRules());
+    }
+
+    /**
+     * @dataProvider setRuleRulesFormatCaseProvider
+     *
+     * @param mixed $rules
+     */
+    public function testSetRuleRulesFormat(bool $expected, $rules): void
+    {
+        if (! $expected) {
+            $this->expectException(TypeError::class);
+            $this->expectExceptionMessage('$rules must be of type string|array');
+        }
+
+        $this->validation->setRule('foo', null, $rules);
+        $this->addToAssertionCount(1);
+    }
+
+    public function setRuleRulesFormatCaseProvider(): iterable
+    {
+        yield 'fail-simple-object' => [
+            false,
+            (object) ['required'],
+        ];
+
+        yield 'pass-single-string' => [
+            true,
+            'required',
+        ];
+
+        yield 'pass-single-array' => [
+            true,
+            ['required'],
+        ];
+
+        yield 'fail-deep-object' => [
+            false,
+            new Validation((object) $this->config, Services::renderer()),
+        ];
+
+        yield 'pass-multiple-string' => [
+            true,
+            'required|alpha',
+        ];
+
+        yield 'pass-multiple-array' => [
+            true,
+            ['required', 'alpha'],
+        ];
+    }
+
+    public function testRunReturnsFalseWithNothingToDo()
     {
         $this->validation->setRules([]);
         $this->assertFalse($this->validation->run([]));
@@ -1008,4 +1112,102 @@ public function provideStringRulesCases(): iterable
             ['required', 'regex_match[/^(01|2689|09)[0-9]{8}$/]', 'numeric'],
         ];
     }
+
+    /**
+     * internal method to simplify placeholder replacement test
+     * REQUIRES THE RULES TO BE SET FOR THE FIELD "foo"
+     *
+     * @param array|null $data optional POST data, needs to contain the key $placeholderField to pass
+     *
+     * @source https://github.com/codeigniter4/CodeIgniter4/pull/3910#issuecomment-784922913
+     */
+    private function placeholderReplacementResultDetermination(string $placeholder = 'id', ?array $data = null)
+    {
+        if ($data === null) {
+            $data = [$placeholder => 'placeholder-value'];
+        }
+
+        $validationRules = $this->getPrivateMethodInvoker($this->validation, 'fillPlaceholders')($this->validation->getRules(), $data);
+        $fieldRules      = $validationRules['foo']['rules'] ?? $validationRules['foo'];
+        if (is_string($fieldRules)) {
+            $fieldRules = $this->getPrivateMethodInvoker($this->validation, 'splitRules')($fieldRules);
+        }
+
+        // loop all rules for this field
+        foreach ($fieldRules as $rule) {
+            // only string type rules are supported
+            if (is_string($rule)) {
+                $this->assertStringNotContainsString('{' . $placeholder . '}', $rule);
+            }
+        }
+    }
+
+    /**
+     * @see ValidationTest::placeholderReplacementResultDetermination()
+     */
+    public function testPlaceholderReplacementTestFails()
+    {
+        // to test if placeholderReplacementResultDetermination() works we provoke and expect an exception
+        $this->expectException(ExpectationFailedException::class);
+        $this->expectExceptionMessage('Failed asserting that \'filter[{id}]\' does not contain "{id}".');
+
+        $this->validation->setRule('foo', 'foo-label', 'required|filter[{id}]');
+
+        // calling with empty $data should produce an exception since {id} can't be replaced
+        $this->placeholderReplacementResultDetermination('id', []);
+    }
+
+    public function testPlaceholderReplacementSetSingleRuleString()
+    {
+        $this->validation->setRule('foo', null, 'required|filter[{id}]');
+
+        $this->placeholderReplacementResultDetermination();
+    }
+
+    public function testPlaceholderReplacementSetSingleRuleArray()
+    {
+        $this->validation->setRule('foo', null, ['required', 'filter[{id}]']);
+
+        $this->placeholderReplacementResultDetermination();
+    }
+
+    public function testPlaceholderReplacementSetMultipleRulesSimpleString()
+    {
+        $this->validation->setRules([
+            'foo' => 'required|filter[{id}]',
+        ]);
+
+        $this->placeholderReplacementResultDetermination();
+    }
+
+    public function testPlaceholderReplacementSetMultipleRulesSimpleArray()
+    {
+        $this->validation->setRules([
+            'foo' => ['required', 'filter[{id}]'],
+        ]);
+
+        $this->placeholderReplacementResultDetermination();
+    }
+
+    public function testPlaceholderReplacementSetMultipleRulesComplexString()
+    {
+        $this->validation->setRules([
+            'foo' => [
+                'rules' => 'required|filter[{id}]',
+            ],
+        ]);
+
+        $this->placeholderReplacementResultDetermination();
+    }
+
+    public function testPlaceholderReplacementSetMultipleRulesComplexArray()
+    {
+        $this->validation->setRules([
+            'foo' => [
+                'rules' => ['required', 'filter[{id}]'],
+            ],
+        ]);
+
+        $this->placeholderReplacementResultDetermination();
+    }
 }
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 7556b28f8608..67934fae25da 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -12,6 +12,7 @@ Release Date: Not Released
 BREAKING
 ********
 
+- The method signature of ``Validation::setRule()`` has been changed. The ``string`` typehint on the ``$rules`` parameter was removed. Extending classes should likewise remove the parameter so as not to break LSP.
 
 
 Enhancements
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 3c9d2a16a022..00cf3177a493 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -261,20 +261,28 @@ methods.
 setRule()
 =========
 
-This method sets a single rule. It takes the name of the field as
-the first parameter, an optional label and a string with a pipe-delimited list of rules
-that should be applied::
+This method sets a single rule. It has the method signature
 
-    $validation->setRule('username', 'Username', 'required');
+    setRule(string $field, ?string $label, array|string $rules[, array $errors = []])
 
-The **field name** must match the key of any data array that is sent in. If
+The ``$rules`` either takes in a pipe-delimited list of rules or an array collection of rules.
+
+    $validation->setRule('username', 'Username', 'required|min_length[3]');
+    $validation->setRule('password', 'Password', ['required', 'min_length[8]', 'alpha_numeric_punct']);
+
+The value you pass to ``$field`` must match the key of any data array that is sent in. If
 the data is taken directly from ``$_POST``, then it must be an exact match for
 the form input name.
 
+.. warning:: Prior to v4.2.0, this method's third parameter, ``$rules``, was typehinted to accept
+    ``string``. In v4.2.0 and after, the typehint was removed to allow arrays, too. To avoid LSP being
+    broken in extending classes overriding this method, the child class's method should also be modified
+    to remove the typehint.
+
 setRules()
 ==========
 
-Like, ``setRule()``, but accepts an array of field names and their rules::
+Like ``setRule()``, but accepts an array of field names and their rules::
 
     $validation->setRules([
         'username' => 'required',

From 0bad84e33ebd83231b08eb3d9682583635009d3a Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Sat, 15 Jan 2022 20:35:18 +0800
Subject: [PATCH 1189/2325] Fix: Model. Changing the timestamps of a
 softdeleted row.

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

diff --git a/system/Model.php b/system/Model.php
index c95c6671c02d..ee660e99d7e9 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -358,6 +358,8 @@ protected function doDelete($id = null, bool $purge = false)
                 return false; // @codeCoverageIgnore
             }
 
+            $builder->where($this->deletedField, null);
+
             $set[$this->deletedField] = $this->setDate();
 
             if ($this->useTimestamps && $this->updatedField) {

From b982b5d13501915a5028b180ab60e11d9bacc49d Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sat, 15 Jan 2022 20:02:23 +0700
Subject: [PATCH 1190/2325] Update changelog 4.2 for update minimal php to 7.4

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 67934fae25da..93a745e6e0d6 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -23,11 +23,12 @@ Enhancements
     - Added the config ``$autoNonce`` in ``Config\ContentSecurityPolicy`` to disable the CSP placeholder replacement
     - Added the functions ``csp_script_nonce()`` and ``csp_style_nonce()`` to get nonce attributes
     - See :ref:`content-security-policy` for details.
-- New View Decorators allow modifying the generated HTML prior to caching. 
+- New View Decorators allow modifying the generated HTML prior to caching.
 
 Changes
 *******
 
+- Update minimal PHP requirement to 7.4.
 - The current version of Content Security Policy (CSP) outputs one nonce for script and one for style tags. The previous version outputted one nonce for each tag.
 
 Deprecations

From 6559c6738f7bc68c67d260825b3ae56a2365f397 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 16 Jan 2022 09:49:38 +0900
Subject: [PATCH 1191/2325] style: vendor/bin/php-cs-fixer fix --verbose --ansi
 --config=.no-header.php-cs-fixer.dist.php

---
 admin/starter/builds | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/starter/builds b/admin/starter/builds
index 0b10a150ac59..cc2ca0851ac7 100755
--- a/admin/starter/builds
+++ b/admin/starter/builds
@@ -39,7 +39,7 @@ if (is_file($file)) {
             if ($dev) {
                 $array['minimum-stability'] = 'dev';
                 $array['prefer-stable']     = true;
-                $array['repositories']      = $array['repositories'] ?? [];
+                $array['repositories'] ??= [];
 
                 $found = false;
 

From 9fb47720239d174fcdb0586a6bc3f24ee8903511 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Sun, 16 Jan 2022 00:12:23 -0600
Subject: [PATCH 1192/2325] Fixing phpstan and style errors

---
 phpstan-baseline.neon.dist                  | 9 ++-------
 system/Helpers/text_helper.php              | 2 +-
 system/View/ViewDecoratorTrait.php          | 4 +---
 tests/_support/Autoloader/FatalLocator.php  | 2 +-
 tests/_support/Commands/LanguageCommand.php | 4 ++--
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index e8cdb15157f7..d5991f51aad8 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -1,12 +1,12 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Parameter \\#1 \\$callback of function spl_autoload_register expects \\(callable\\(string\\)\\: void\\)\\|null, array\\{\\$this\\(CodeIgniter\\\\Autoloader\\\\Autoloader\\), 'loadClass'\\} given\\.$#"
+			message: "#^Parameter \\#1 \\$autoload_function of function spl_autoload_register expects callable\\(string\\)\\: void, array\\{\\$this\\(CodeIgniter\\\\Autoloader\\\\Autoloader\\), 'loadClass'\\} given\\.$#"
 			count: 1
 			path: system/Autoloader/Autoloader.php
 
 		-
-			message: "#^Parameter \\#1 \\$callback of function spl_autoload_register expects \\(callable\\(string\\)\\: void\\)\\|null, array\\{\\$this\\(CodeIgniter\\\\Autoloader\\\\Autoloader\\), 'loadClassmap'\\} given\\.$#"
+			message: "#^Parameter \\#1 \\$autoload_function of function spl_autoload_register expects callable\\(string\\)\\: void, array\\{\\$this\\(CodeIgniter\\\\Autoloader\\\\Autoloader\\), 'loadClassmap'\\} given\\.$#"
 			count: 1
 			path: system/Autoloader/Autoloader.php
 
@@ -650,11 +650,6 @@ parameters:
 			count: 1
 			path: system/Helpers/test_helper.php
 
-		-
-			message: "#^Parameter \\#2 \\$times of function str_repeat expects int, float given\\.$#"
-			count: 1
-			path: system/Helpers/text_helper.php
-
 		-
 			message: "#^Variable \\$pool might not be defined\\.$#"
 			count: 2
diff --git a/system/Helpers/text_helper.php b/system/Helpers/text_helper.php
index 4e7e5d855302..6914f318829c 100755
--- a/system/Helpers/text_helper.php
+++ b/system/Helpers/text_helper.php
@@ -564,7 +564,7 @@ function random_string(string $type = 'alnum', int $len = 8): string
                         break;
                 }
 
-                return substr(str_shuffle(str_repeat($pool, ceil($len / strlen($pool)))), 0, $len);
+                return substr(str_shuffle(str_repeat($pool, (int) ceil($len / strlen($pool)))), 0, $len);
 
             case 'md5':
                 return md5(uniqid((string) mt_rand(), true));
diff --git a/system/View/ViewDecoratorTrait.php b/system/View/ViewDecoratorTrait.php
index 4dffa225e3f6..243c229bfbde 100644
--- a/system/View/ViewDecoratorTrait.php
+++ b/system/View/ViewDecoratorTrait.php
@@ -13,8 +13,6 @@
 
 use CodeIgniter\View\Exceptions\ViewException;
 
-use function config;
-
 trait ViewDecoratorTrait
 {
     /**
@@ -23,7 +21,7 @@ trait ViewDecoratorTrait
      */
     protected function decorateOutput(string $html): string
     {
-        $decorators = config('View')->decorators;
+        $decorators = \config('View')->decorators;
 
         foreach ($decorators as $decorator) {
             if (! is_subclass_of($decorator, ViewDecoratorInterface::class)) {
diff --git a/tests/_support/Autoloader/FatalLocator.php b/tests/_support/Autoloader/FatalLocator.php
index 9c30fb9c89b6..463455759705 100644
--- a/tests/_support/Autoloader/FatalLocator.php
+++ b/tests/_support/Autoloader/FatalLocator.php
@@ -34,7 +34,7 @@ class FatalLocator extends FileLocator
      */
     public function locateFile(string $file, ?string $folder = null, string $ext = 'php')
     {
-        $folder = $folder ?? 'null';
+        $folder ??= 'null';
 
         throw new RuntimeException("locateFile({$file}, {$folder}, {$ext})");
     }
diff --git a/tests/_support/Commands/LanguageCommand.php b/tests/_support/Commands/LanguageCommand.php
index 858755b7549a..e495d250a295 100644
--- a/tests/_support/Commands/LanguageCommand.php
+++ b/tests/_support/Commands/LanguageCommand.php
@@ -30,8 +30,8 @@ class LanguageCommand extends BaseCommand
     public function run(array $params)
     {
         $this->setHasClassName(false);
-        $params[0]      = 'Foobar';
-        $params['lang'] = $params['lang'] ?? 'en';
+        $params[0] = 'Foobar';
+        $params['lang'] ??= 'en';
 
         $this->component = 'Language';
         $this->directory = 'Language\\' . $params['lang'];

From def5ce4bfc70b8bbeba3122a38e090f27ba282d0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 15 Jan 2022 11:21:25 +0900
Subject: [PATCH 1193/2325] docs: add sub sections

To add direct link from changelog.
---
 .../source/database/query_builder.rst           | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 6136a5c5c281..b110aaaa2d70 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -39,6 +39,9 @@ Selecting Data
 
 The following functions allow you to build SQL **SELECT** statements.
 
+Get
+===
+
 **$builder->get()**
 
 Runs the selection query and returns the result. Can be used by itself
@@ -107,6 +110,9 @@ function::
 
 Please read about the `where` function below for more information.
 
+Select
+======
+
 **$builder->select()**
 
 Permits you to write the SELECT portion of your query::
@@ -196,6 +202,9 @@ the resulting field.
     $query = $builder->get();
     // Produces: SELECT COUNT(age) as age FROM mytable
 
+From
+====
+
 **$builder->from()**
 
 Permits you to write the FROM portion of your query::
@@ -210,6 +219,11 @@ Permits you to write the FROM portion of your query::
     in the ``$db->table()`` function. Additional calls to ``from()`` will add more tables
     to the FROM portion of your query.
 
+.. _query-builder-from-subquery:
+
+Subqueries
+==========
+
 **$builder->fromSubquery()**
 
 Permits you to write part of a FROM query as a subquery.
@@ -230,6 +244,9 @@ Use the ``$db->newQuery()`` method to make a subquery the main table.::
 
     // Produces: SELECT * FROM (SELECT `id`, `name` FROM users) AS t
 
+Join
+====
+
 **$builder->join()**
 
 Permits you to write the JOIN portion of your query::

From 6e828a88cdbe7e806d39664659ce562e24bfa748 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 15 Jan 2022 11:26:47 +0900
Subject: [PATCH 1194/2325] docs: improve decoration and wordings

Replace function with method.
Make SQL keywords bold.
Decrate code with '``'
Correct minor errors.
---
 .../source/database/query_builder.rst         | 234 +++++++++---------
 1 file changed, 117 insertions(+), 117 deletions(-)

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index b110aaaa2d70..84d70732488a 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -24,7 +24,7 @@ Loading the Query Builder
 *************************
 
 The Query Builder is loaded through the ``table()`` method on the
-database connection. This sets the ``FROM`` portion of the query for you
+database connection. This sets the **FROM** portion of the query for you
 and returns a new instance of the Query Builder class::
 
     $db      = \Config\Database::connect();
@@ -37,7 +37,7 @@ the class, so no resources are used by default.
 Selecting Data
 **************
 
-The following functions allow you to build SQL **SELECT** statements.
+The following methods allow you to build SQL **SELECT** statements.
 
 Get
 ===
@@ -58,7 +58,7 @@ clause::
     // Executes: SELECT * FROM mytable LIMIT 20, 10
     // (in MySQL. Other databases have slightly different syntax)
 
-You'll notice that the above function is assigned to a variable named
+You'll notice that the above method is assigned to a variable named
 $query, which can be used to show the results::
 
     $query = $builder->get();
@@ -67,7 +67,7 @@ $query, which can be used to show the results::
         echo $row->title;
     }
 
-Please visit the :doc:`result functions <results>` page for a full
+Please visit the :doc:`getResult*() method <results>` page for a full
 discussion regarding result generation.
 
 **$builder->getCompiledSelect()**
@@ -102,29 +102,29 @@ using ``$builder->resetQuery()``.
 
 **$builder->getWhere()**
 
-Identical to the ``get()`` function except that it permits you to add a
-"where" clause in the first parameter, instead of using the db->where()
-function::
+Identical to the ``get()`` method except that it permits you to add a
+"where" clause in the first parameter, instead of using the ``$builder->where()``
+method::
 
     $query = $builder->getWhere(['id' => $id], $limit, $offset);
 
-Please read about the `where` function below for more information.
+Please read about the ``where()`` method below for more information.
 
 Select
 ======
 
 **$builder->select()**
 
-Permits you to write the SELECT portion of your query::
+Permits you to write the **SELECT** portion of your query::
 
     $builder->select('title, content, date');
     $query = $builder->get();
 
     // Executes: SELECT title, content, date FROM mytable
 
-.. note:: If you are selecting all (\*) from a table you do not need to
-    use this function. When omitted, CodeIgniter assumes that you wish
-    to select all fields and automatically adds ``SELECT \*``.
+.. note:: If you are selecting all (``*``) from a table you do not need to
+    use this method. When omitted, CodeIgniter assumes that you wish
+    to select all fields and automatically adds ``SELECT *``.
 
 ``$builder->select()`` accepts an optional second parameter. If you set it
 to ``false``, CodeIgniter will not try to protect your field or table names.
@@ -138,7 +138,7 @@ escaping of fields may break them.
 
 **$builder->selectMax()**
 
-Writes a ``SELECT MAX(field)`` portion for your query. You can optionally
+Writes a **SELECT MAX(field)** portion for your query. You can optionally
 include a second parameter to rename the resulting field.
 
 ::
@@ -153,8 +153,8 @@ include a second parameter to rename the resulting field.
 
 **$builder->selectMin()**
 
-Writes a "SELECT MIN(field)" portion for your query. As with
-selectMax(), You can optionally include a second parameter to rename
+Writes a **SELECT MIN(field)** portion for your query. As with
+``selectMax()``, You can optionally include a second parameter to rename
 the resulting field.
 
 ::
@@ -165,8 +165,8 @@ the resulting field.
 
 **$builder->selectAvg()**
 
-Writes a "SELECT AVG(field)" portion for your query. As with
-selectMax(), You can optionally include a second parameter to rename
+Writes a **SELECT AVG(field)** portion for your query. As with
+``selectMax()``, You can optionally include a second parameter to rename
 the resulting field.
 
 ::
@@ -177,7 +177,7 @@ the resulting field.
 
 **$builder->selectSum()**
 
-Writes a "SELECT SUM(field)" portion for your query. As with
+Writes a **SELECT SUM(field)** portion for your query. As with
 ``selectMax()``, You can optionally include a second parameter to rename
 the resulting field.
 
@@ -189,7 +189,7 @@ the resulting field.
 
 **$builder->selectCount()**
 
-Writes a ``"SELECT COUNT(field)"`` portion for your query. As with
+Writes a **SELECT COUNT(field)** portion for your query. As with
 ``selectMax()``, You can optionally include a second parameter to rename
 the resulting field.
 
@@ -207,7 +207,7 @@ From
 
 **$builder->from()**
 
-Permits you to write the FROM portion of your query::
+Permits you to write the **FROM** portion of your query::
 
     $builder = $db->table('users');
     $builder->select('title, content, date');
@@ -215,8 +215,8 @@ Permits you to write the FROM portion of your query::
     $query = $builder->get();
     // Produces: SELECT title, content, date FROM users, mytable
 
-.. note:: As shown earlier, the FROM portion of your query can is specified
-    in the ``$db->table()`` function. Additional calls to ``from()`` will add more tables
+.. note:: As shown earlier, the **FROM** portion of your query can be specified
+    in the ``$db->table()`` method. Additional calls to ``from()`` will add more tables
     to the FROM portion of your query.
 
 .. _query-builder-from-subquery:
@@ -226,7 +226,7 @@ Subqueries
 
 **$builder->fromSubquery()**
 
-Permits you to write part of a FROM query as a subquery.
+Permits you to write part of a **FROM** query as a subquery.
 
 This is where we add a subquery to an existing table.::
 
@@ -249,7 +249,7 @@ Join
 
 **$builder->join()**
 
-Permits you to write the JOIN portion of your query::
+Permits you to write the **JOIN** portion of your query::
 
     $builder = $db->table('blogs');
     $builder->select('*');
@@ -259,12 +259,12 @@ Permits you to write the JOIN portion of your query::
     // Produces:
     // SELECT * FROM blogs JOIN comments ON comments.id = blogs.id
 
-Multiple function calls can be made if you need several joins in one
+Multiple method calls can be made if you need several joins in one
 query.
 
-If you need a specific type of JOIN you can specify it via the third
-parameter of the function. Options are: left, right, outer, inner, left
-outer, and right outer.
+If you need a specific type of **JOIN** you can specify it via the third
+parameter of the method. Options are: ``left``, ``right``, ``outer``, ``inner``, ``left
+outer``, and ``right outer``.
 
 ::
 
@@ -277,10 +277,10 @@ Looking for Specific Data
 
 **$builder->where()**
 
-This function enables you to set **WHERE** clauses using one of four
+This method enables you to set **WHERE** clauses using one of five
 methods:
 
-.. note:: All values passed to this function are escaped automatically,
+.. note:: All values passed to this method are escaped automatically,
     producing safer queries, except when using a custom string.
 
 .. note:: ``$builder->where()`` accepts an optional third parameter. If you set it to
@@ -295,8 +295,8 @@ methods:
 
     Notice that the equal sign is added for you.
 
-    If you use multiple function calls they will be chained together with
-    AND between them::
+    If you use multiple method calls they will be chained together with
+    **AND** between them::
 
         $builder->where('name', $name);
         $builder->where('title', $title);
@@ -332,18 +332,18 @@ methods:
         $where = "name='Joe' AND status='boss' OR status='active'";
         $builder->where($where);
 
-.. warning:: If you are using user-supplied data within the string, you MUST escape the
-    data manually. Failure to do so could result in SQL injections.
+    .. warning:: If you are using user-supplied data within the string, you MUST escape the
+        data manually. Failure to do so could result in SQL injections.
 
-    ::
+        ::
 
-    $name = $builder->db->escape('Joe');
-    $where = "name={$name} AND status='boss' OR status='active'";
-    $builder->where($where);
+        $name = $builder->db->escape('Joe');
+        $where = "name={$name} AND status='boss' OR status='active'";
+        $builder->where($where);
 
 .. _query-builder-where-subquery:
 
-#. **Subqueries:**
+5. **Subqueries:**
 
     ::
 
@@ -361,8 +361,8 @@ methods:
 
 **$builder->orWhere()**
 
-This function is identical to the one above, except that multiple
-instances are joined by OR::
+This method is identical to the one above, except that multiple
+instances are joined by **OR**::
 
     $builder->where('name !=', $name);
     $builder->orWhere('id >', $id);
@@ -370,7 +370,7 @@ instances are joined by OR::
 
 **$builder->whereIn()**
 
-Generates a WHERE field IN ('item', 'item') SQL query joined with AND if
+Generates a **WHERE** field IN ('item', 'item') SQL query joined with **AND** if
 appropriate::
 
     $names = ['Frank', 'Todd', 'James'];
@@ -391,7 +391,7 @@ You can use subqueries instead of an array of values::
 
 **$builder->orWhereIn()**
 
-Generates a ``WHERE field IN ('item', 'item')`` SQL query joined with OR if
+Generates a **WHERE field IN ('item', 'item')** SQL query joined with **OR** if
 appropriate::
 
         $names = ['Frank', 'Todd', 'James'];
@@ -413,8 +413,8 @@ You can use subqueries instead of an array of values::
 
 **$builder->whereNotIn()**
 
-Generates a WHERE field NOT IN ('item', 'item') SQL query joined with
-AND if appropriate::
+Generates a **WHERE field NOT IN ('item', 'item')** SQL query joined with
+**AND** if appropriate::
 
     $names = ['Frank', 'Todd', 'James'];
     $builder->whereNotIn('username', $names);
@@ -435,7 +435,7 @@ You can use subqueries instead of an array of values::
 
 **$builder->orWhereNotIn()**
 
-Generates a ``WHERE field NOT IN ('item', 'item')`` SQL query joined with OR
+Generates a **WHERE field NOT IN ('item', 'item')** SQL query joined with **OR**
 if appropriate::
 
     $names = ['Frank', 'Todd', 'James'];
@@ -479,15 +479,15 @@ searches.
         // Produces: WHERE `title` LIKE '%match%' ESCAPE '!'
 
     If you use multiple method calls they will be chained together with
-    AND between them::
+    **AND** between them::
 
         $builder->like('title', 'match');
         $builder->like('body', 'match');
         // WHERE `title` LIKE '%match%' ESCAPE '!' AND  `body` LIKE '%match%' ESCAPE '!'
 
-    If you want to control where the wildcard (%) is placed, you can use
-    an optional third argument. Your options are 'before', 'after' and
-    'both' (which is the default).
+    If you want to control where the wildcard (**%**) is placed, you can use
+    an optional third argument. Your options are ``before``, ``after`` and
+    ``both`` (which is the default).
 
     ::
 
@@ -506,7 +506,7 @@ searches.
 **$builder->orLike()**
 
 This method is identical to the one above, except that multiple
-instances are joined by OR::
+instances are joined by **OR**::
 
     $builder->like('title', 'match'); $builder->orLike('body', $match);
     // WHERE `title` LIKE '%match%' ESCAPE '!' OR  `body` LIKE '%match%' ESCAPE '!'
@@ -514,14 +514,14 @@ instances are joined by OR::
 **$builder->notLike()**
 
 This method is identical to ``like()``, except that it generates
-NOT LIKE statements::
+**NOT LIKE** statements::
 
     $builder->notLike('title', 'match'); // WHERE `title` NOT LIKE '%match% ESCAPE '!'
 
 **$builder->orNotLike()**
 
 This method is identical to ``notLike()``, except that multiple
-instances are joined by OR::
+instances are joined by **OR**::
 
     $builder->like('title', 'match');
     $builder->orNotLike('body', 'match');
@@ -529,7 +529,7 @@ instances are joined by OR::
 
 **$builder->groupBy()**
 
-Permits you to write the GROUP BY portion of your query::
+Permits you to write the **GROUP BY** portion of your query::
 
     $builder->groupBy("title");
     // Produces: GROUP BY title
@@ -541,7 +541,7 @@ You can also pass an array of multiple values as well::
 
 **$builder->distinct()**
 
-Adds the "DISTINCT" keyword to a query
+Adds the **DISTINCT** keyword to a query
 
 ::
 
@@ -551,7 +551,7 @@ Adds the "DISTINCT" keyword to a query
 
 **$builder->having()**
 
-Permits you to write the HAVING portion of your query. There are 2
+Permits you to write the **HAVING** portion of your query. There are 2
 possible syntaxes, 1 argument or 2::
 
     $builder->having('user_id = 45'); // Produces: HAVING user_id = 45
@@ -573,11 +573,11 @@ setting it to ``false``.
 
 **$builder->orHaving()**
 
-Identical to ``having()``, only separates multiple clauses with "OR".
+Identical to ``having()``, only separates multiple clauses with **OR**.
 
 **$builder->havingIn()**
 
-Generates a ``HAVING field IN ('item', 'item')`` SQL query joined with AND if
+Generates a **HAVING field IN ('item', 'item')** SQL query joined with **AND** if
 appropriate::
 
     $groups = [1, 2, 3];
@@ -598,7 +598,7 @@ You can use subqueries instead of an array of values.::
 
 **$builder->orHavingIn()**
 
-Generates a ``HAVING field IN ('item', 'item')`` SQL query joined with OR if
+Generates a **HAVING field IN ('item', 'item')** SQL query joined with **OR** if
 appropriate
 
 ::
@@ -622,8 +622,8 @@ You can use subqueries instead of an array of values.::
 
 **$builder->havingNotIn()**
 
-Generates a ``HAVING field NOT IN ('item', 'item')`` SQL query joined with
-AND if appropriate
+Generates a **HAVING field NOT IN ('item', 'item')** SQL query joined with
+**AND** if appropriate
 
 ::
 
@@ -646,7 +646,7 @@ You can use subqueries instead of an array of values.::
 
 **$builder->orHavingNotIn()**
 
-Generates a ``HAVING field NOT IN ('item', 'item')`` SQL query joined with OR
+Generates a **HAVING field NOT IN ('item', 'item')** SQL query joined with **OR**
 if appropriate
 
 ::
@@ -670,12 +670,12 @@ You can use subqueries instead of an array of values.::
 
 **$builder->havingLike()**
 
-This method enables you to generate **LIKE** clauses for HAVING part or the query, useful for doing
+This method enables you to generate **LIKE** clauses for **HAVING** part or the query, useful for doing
 searches.
 
 .. note:: All values passed to this method are escaped automatically.
 
-.. note:: All ``havingLike*`` method variations can be forced to perform case-insensitive searches by passing
+.. note:: All ``havingLike*()`` method variations can be forced to perform case-insensitive searches by passing
     a fifth parameter of ``true`` to the method. This will use platform-specific features where available
     otherwise, will force the values to be lowercase, i.e., ``HAVING LOWER(column) LIKE '%search%'``. This
     may require indexes to be made for ``LOWER(column)`` instead of ``column`` to be effective.
@@ -688,15 +688,15 @@ searches.
         // Produces: HAVING `title` LIKE '%match%' ESCAPE '!'
 
     If you use multiple method calls they will be chained together with
-    AND between them::
+    **AND** between them::
 
         $builder->havingLike('title', 'match');
         $builder->havingLike('body', 'match');
         // HAVING `title` LIKE '%match%' ESCAPE '!' AND  `body` LIKE '%match% ESCAPE '!'
 
-    If you want to control where the wildcard (%) is placed, you can use
-    an optional third argument. Your options are 'before', 'after' and
-    'both' (which is the default).
+    If you want to control where the wildcard (**%**) is placed, you can use
+    an optional third argument. Your options are ``before``, ``after`` and
+    ``both`` (which is the default).
 
     ::
 
@@ -715,7 +715,7 @@ searches.
 **$builder->orHavingLike()**
 
 This method is identical to the one above, except that multiple
-instances are joined by OR::
+instances are joined by **OR**::
 
     $builder->havingLike('title', 'match'); $builder->orHavingLike('body', $match);
     // HAVING `title` LIKE '%match%' ESCAPE '!' OR  `body` LIKE '%match%' ESCAPE '!'
@@ -723,7 +723,7 @@ instances are joined by OR::
 **$builder->notHavingLike()**
 
 This method is identical to ``havingLike()``, except that it generates
-NOT LIKE statements::
+**NOT LIKE** statements::
 
     $builder->notHavingLike('title', 'match');
     // HAVING `title` NOT LIKE '%match% ESCAPE '!'
@@ -731,24 +731,24 @@ NOT LIKE statements::
 **$builder->orNotHavingLike()**
 
 This method is identical to ``notHavingLike()``, except that multiple
-instances are joined by OR::
+instances are joined by **OR**::
 
     $builder->havingLike('title', 'match');
     $builder->orNotHavingLike('body', 'match');
     // HAVING `title` LIKE '%match% OR  `body` NOT LIKE '%match%' ESCAPE '!'
 
 ****************
-Ordering results
+Ordering Results
 ****************
 
 **$builder->orderBy()**
 
-Lets you set an ORDER BY clause.
+Lets you set an **ORDER BY** clause.
 
 The first parameter contains the name of the column you would like to order by.
 
 The second parameter lets you set the direction of the result.
-Options are **ASC**, **DESC** AND **RANDOM**.
+Options are ``ASC``, ``DESC`` AND ``RANDOM``.
 
 ::
 
@@ -760,7 +760,7 @@ You can also pass your own string in the first parameter::
     $builder->orderBy('title DESC, name ASC');
     // Produces: ORDER BY `title` DESC, `name` ASC
 
-Or multiple function calls can be made if you need multiple fields.
+Or multiple method calls can be made if you need multiple fields.
 
 ::
 
@@ -768,7 +768,7 @@ Or multiple function calls can be made if you need multiple fields.
     $builder->orderBy('name', 'ASC');
     // Produces: ORDER BY `title` DESC, `name` ASC
 
-If you choose the **RANDOM** direction option, then the first parameters will
+If you choose the ``RANDOM`` direction option, then the first parameters will
 be ignored, unless you specify a numeric seed value.
 
 ::
@@ -827,7 +827,7 @@ Example::
 
     echo $builder->countAll(); // Produces an integer, like 25
 
-As is in countAllResult method, this method resets any field values that you may have passed
+As is in ``countAllResult()`` method, this method resets any field values that you may have passed
 to ``select()`` as well. If you need to keep them, you can pass ``false`` as the
 first parameter.
 
@@ -835,8 +835,8 @@ first parameter.
 Query grouping
 **************
 
-Query grouping allows you to create groups of WHERE clauses by enclosing them in parentheses. This will allow
-you to create queries with complex WHERE clauses. Nested groups are supported. Example::
+Query grouping allows you to create groups of **WHERE** clauses by enclosing them in parentheses. This will allow
+you to create queries with complex **WHERE** clauses. Nested groups are supported. Example::
 
     $builder->select('*')->from('my_table')
         ->groupStart()
@@ -856,43 +856,43 @@ you to create queries with complex WHERE clauses. Nested groups are supported. E
 
 **$builder->groupStart()**
 
-Starts a new group by adding an opening parenthesis to the WHERE clause of the query.
+Starts a new group by adding an opening parenthesis to the **WHERE** clause of the query.
 
 **$builder->orGroupStart()**
 
-Starts a new group by adding an opening parenthesis to the WHERE clause of the query, prefixing it with 'OR'.
+Starts a new group by adding an opening parenthesis to the **WHERE** clause of the query, prefixing it with **OR**.
 
 **$builder->notGroupStart()**
 
-Starts a new group by adding an opening parenthesis to the WHERE clause of the query, prefixing it with 'NOT'.
+Starts a new group by adding an opening parenthesis to the **WHERE** clause of the query, prefixing it with **NOT**.
 
 **$builder->orNotGroupStart()**
 
-Starts a new group by adding an opening parenthesis to the WHERE clause of the query, prefixing it with 'OR NOT'.
+Starts a new group by adding an opening parenthesis to the **WHERE** clause of the query, prefixing it with **OR NOT**.
 
 **$builder->groupEnd()**
 
-Ends the current group by adding a closing parenthesis to the WHERE clause of the query.
+Ends the current group by adding a closing parenthesis to the **WHERE** clause of the query.
 
 **$builder->havingGroupStart()**
 
-Starts a new group by adding an opening parenthesis to the HAVING clause of the query.
+Starts a new group by adding an opening parenthesis to the **HAVING** clause of the query.
 
 **$builder->orHavingGroupStart()**
 
-Starts a new group by adding an opening parenthesis to the HAVING clause of the query, prefixing it with 'OR'.
+Starts a new group by adding an opening parenthesis to the **HAVING** clause of the query, prefixing it with **OR**.
 
 **$builder->notHavingGroupStart()**
 
-Starts a new group by adding an opening parenthesis to the HAVING clause of the query, prefixing it with 'NOT'.
+Starts a new group by adding an opening parenthesis to the **HAVING** clause of the query, prefixing it with **NOT**.
 
 **$builder->orNotHavingGroupStart()**
 
-Starts a new group by adding an opening parenthesis to the HAVING clause of the query, prefixing it with 'OR NOT'.
+Starts a new group by adding an opening parenthesis to the **HAVING** clause of the query, prefixing it with **OR NOT**.
 
 **$builder->havingGroupEnd()**
 
-Ends the current group by adding a closing parenthesis to the HAVING clause of the query.
+Ends the current group by adding a closing parenthesis to the **HAVING** clause of the query.
 
 **************
 Inserting Data
@@ -902,7 +902,7 @@ Inserting Data
 
 Generates an insert string based on the data you supply, and runs the
 query. You can either pass an **array** or an **object** to the
-function. Here is an example using an array::
+method. Here is an example using an array::
 
     $data = [
         'title' => 'My title',
@@ -936,7 +936,7 @@ The first parameter is an object.
 
 Generates an insert ignore string based on the data you supply, and runs the
 query. So if an entry with the same primary key already exists, the query won't be inserted.
-You can optionally pass an **boolean** to the function. Here is an example using the array of the above example::
+You can optionally pass an **boolean** to the method. Here is an example using the array of the above example::
 
     $data = [
         'title' => 'My title',
@@ -987,7 +987,7 @@ using ``$builder->insert()`` which resets values or reset directly using
 
 Generates an insert string based on the data you supply, and runs the
 query. You can either pass an **array** or an **object** to the
-function. Here is an example using an array::
+method. Here is an example using an array::
 
     $data = [
         [
@@ -1015,8 +1015,8 @@ Updating Data
 
 **$builder->replace()**
 
-This method executes a REPLACE statement, which is basically the SQL
-standard for (optional) DELETE + INSERT, using *PRIMARY* and *UNIQUE*
+This method executes a **REPLACE** statement, which is basically the SQL
+standard for (optional) **DELETE** + **INSERT**, using *PRIMARY* and *UNIQUE*
 keys as the determining factor.
 In our case, it will save you from the need to implement complex
 logics with different combinations of  ``select()``, ``update()``,
@@ -1034,8 +1034,8 @@ Example::
 
     // Executes: REPLACE INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')
 
-In the above example, if we assume that the *title* field is our primary
-key, then if a row containing 'My title' as the *title* value, that row
+In the above example, if we assume that the ``title`` field is our primary
+key, then if a row containing ``My title`` as the ``title`` value, that row
 will be deleted with our new row data replacing it.
 
 Usage of the ``set()`` method is also allowed and all fields are
@@ -1043,10 +1043,10 @@ automatically escaped, just like with ``insert()``.
 
 **$builder->set()**
 
-This function enables you to set values for inserts or updates.
+This method enables you to set values for inserts or updates.
 
-**It can be used instead of passing a data array directly to the insert
-or update functions:**
+**It can be used instead of passing a data array directly to the insert()
+or update() methods:**
 
 ::
 
@@ -1054,7 +1054,7 @@ or update functions:**
     $builder->insert();
     // Produces: INSERT INTO mytable (`name`) VALUES ('{$name}')
 
-If you use multiple function called they will be assembled properly
+If you use multiple method called they will be assembled properly
 based on whether you are doing an insert or an update::
 
     $builder->set('name', $name);
@@ -1062,7 +1062,7 @@ based on whether you are doing an insert or an update::
     $builder->set('status', $status);
     $builder->insert();
 
-**set()** will also accept an optional third parameter (``$escape``), that
+``set()`` will also accept an optional third parameter (``$escape``), that
 will prevent data from being escaped if set to ``false``. To illustrate the
 difference, here is ``set()`` used both with and without the escape
 parameter.
@@ -1079,7 +1079,7 @@ parameter.
     $builder->update();
     // gives UPDATE `mytable` SET `field` = 'field+1' WHERE `id` = 2
 
-You can also pass an associative array to this function::
+You can also pass an associative array to this method::
 
     $array = [
         'name'   => $name,
@@ -1106,7 +1106,7 @@ Or an object::
 **$builder->update()**
 
 Generates an update string and runs the query based on the data you
-supply. You can pass an **array** or an **object** to the function. Here
+supply. You can pass an **array** or an **object** to the method. Here
 is an example using an array::
 
     $data = [
@@ -1143,9 +1143,9 @@ Or you can supply an object::
 
 .. note:: All values are escaped automatically producing safer queries.
 
-You'll notice the use of the ``$builder->where()`` function, enabling you
-to set the WHERE clause. You can optionally pass this information
-directly into the update function as a string::
+You'll notice the use of the ``$builder->where()`` method, enabling you
+to set the **WHERE** clause. You can optionally pass this information
+directly into the ``update()`` method as a string::
 
     $builder->update($data, "id = 4");
 
@@ -1153,13 +1153,13 @@ Or as an array::
 
     $builder->update($data, ['id' => $id]);
 
-You may also use the ``$builder->set()`` function described above when
+You may also use the ``$builder->set()`` method described above when
 performing updates.
 
 **$builder->updateBatch()**
 
 Generates an update string based on the data you supply, and runs the query.
-You can either pass an **array** or an **object** to the function.
+You can either pass an **array** or an **object** to the method.
 Here is an example using an array::
 
     $data = [
@@ -1199,7 +1199,7 @@ The first parameter is an associative array of values, the second parameter is t
 **$builder->getCompiledUpdate()**
 
 This works exactly the same way as ``$builder->getCompiledInsert()`` except
-that it produces an UPDATE SQL string instead of an INSERT SQL string.
+that it produces an **UPDATE** SQL string instead of an **INSERT** SQL string.
 
 For more information view documentation for ``$builder->getCompiledInsert()``.
 
@@ -1211,7 +1211,7 @@ Deleting Data
 
 **$builder->delete()**
 
-Generates a delete SQL string and runs the query.
+Generates a **DELETE** SQL string and runs the query.
 
 ::
 
@@ -1219,8 +1219,8 @@ Generates a delete SQL string and runs the query.
     // Produces: // DELETE FROM mytable  // WHERE id = $id
 
 The first parameter is the where clause.
-You can also use the ``where()`` or ``or_where()`` functions instead of passing
-the data to the first parameter of the function::
+You can also use the ``where()`` or ``or_where()`` methods instead of passing
+the data to the first parameter of the method::
 
     $builder->where('id', $id);
     $builder->delete();
@@ -1230,11 +1230,11 @@ the data to the first parameter of the function::
     // WHERE id = $id
 
 If you want to delete all data from a table, you can use the ``truncate()``
-function, or ``emptyTable()``.
+method, or ``emptyTable()``.
 
 **$builder->emptyTable()**
 
-Generates a delete SQL string and runs the
+Generates a **DELETE** SQL string and runs the
 query::
 
       $builder->emptyTable('mytable');
@@ -1242,7 +1242,7 @@ query::
 
 **$builder->truncate()**
 
-Generates a truncate SQL string and runs the query.
+Generates a **TRUNCATE** SQL string and runs the query.
 
 ::
 
@@ -1257,7 +1257,7 @@ Generates a truncate SQL string and runs the query.
 **$builder->getCompiledDelete()**
 
 This works exactly the same way as ``$builder->getCompiledInsert()`` except
-that it produces a DELETE SQL string instead of an INSERT SQL string.
+that it produces a **DELETE** SQL string instead of an **INSERT** SQL string.
 
 For more information view documentation for ``$builder->getCompiledInsert()``.
 
@@ -1266,7 +1266,7 @@ Method Chaining
 ***************
 
 Method chaining allows you to simplify your syntax by connecting
-multiple functions. Consider this example::
+multiple methods. Consider this example::
 
     $query = $builder->select('title')
                      ->where('id', $id)

From 7357bf743eedc3d65808e109d7e8184e252c4444 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 15 Jan 2022 11:30:38 +0900
Subject: [PATCH 1195/2325] docs: add enhancements in changelog v4.2.0

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 93a745e6e0d6..98d14b6e9197 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -24,6 +24,8 @@ Enhancements
     - Added the functions ``csp_script_nonce()`` and ``csp_style_nonce()`` to get nonce attributes
     - See :ref:`content-security-policy` for details.
 - New View Decorators allow modifying the generated HTML prior to caching.
+- Added Subqueries in the FROM section. See :ref:`query-builder-from-subquery`.
+- Added Validation Strict Rules. See :ref:`validation-traditional-and-strict-rules`.
 
 Changes
 *******

From 3e221f496c56d19f4f1a749d78cc1625e465f634 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jan 2022 15:02:47 +0000
Subject: [PATCH 1196/2325] chore(deps-dev): update rector/rector requirement

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

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

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

diff --git a/composer.json b/composer.json
index 8616e15d7162..519183084def 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.12"
+        "rector/rector": "0.12.13"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From 641ef368f4152cbcbc4449e79227687ba1d12ea9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 18 Jan 2022 09:02:40 +0900
Subject: [PATCH 1197/2325] chore: add "phpVersion: 80000" in phpstan.neon.dist

---
 phpstan.neon.dist | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 741b147136b3..8aa28016ca33 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -12,6 +12,7 @@ includes:
 	- phpstan-baseline.neon.dist
 
 parameters:
+	phpVersion: 80000
 	tmpDir: build/phpstan
 	level: 5
 	paths:

From 0e59ceec1d3b7f7d7386ff5a5d3bfe0e935e68ce Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 18 Jan 2022 09:11:08 +0900
Subject: [PATCH 1198/2325] chore: revert ignoreErrors for PHP 8.0

---
 phpstan-baseline.neon.dist | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index d5991f51aad8..bc424a91445c 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -1,12 +1,12 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Parameter \\#1 \\$autoload_function of function spl_autoload_register expects callable\\(string\\)\\: void, array\\{\\$this\\(CodeIgniter\\\\Autoloader\\\\Autoloader\\), 'loadClass'\\} given\\.$#"
+			message: "#^Parameter \\#1 \\$callback of function spl_autoload_register expects \\(callable\\(string\\)\\: void\\)\\|null, array\\{\\$this\\(CodeIgniter\\\\Autoloader\\\\Autoloader\\), 'loadClass'\\} given\\.$#"
 			count: 1
 			path: system/Autoloader/Autoloader.php
 
 		-
-			message: "#^Parameter \\#1 \\$autoload_function of function spl_autoload_register expects callable\\(string\\)\\: void, array\\{\\$this\\(CodeIgniter\\\\Autoloader\\\\Autoloader\\), 'loadClassmap'\\} given\\.$#"
+			message: "#^Parameter \\#1 \\$callback of function spl_autoload_register expects \\(callable\\(string\\)\\: void\\)\\|null, array\\{\\$this\\(CodeIgniter\\\\Autoloader\\\\Autoloader\\), 'loadClassmap'\\} given\\.$#"
 			count: 1
 			path: system/Autoloader/Autoloader.php
 

From 168b61ad0c7cd05adc3ae0da4f9ebfa289033862 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 18 Jan 2022 09:43:56 +0900
Subject: [PATCH 1199/2325] docs: fix typos in comments

---
 system/Autoloader/FileLocator.php | 4 ++--
 system/BaseModel.php              | 6 +++---
 tests/system/I18n/TimeTest.php    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index 3facd6b7aa83..f9734828b692 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -108,7 +108,7 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
     }
 
     /**
-     * Examines a file and returns the fully qualified domain name.
+     * Examines a file and returns the fully qualified class name.
      */
     public function getClassname(string $file): string
     {
@@ -319,7 +319,7 @@ public function listFiles(string $path): array
 
     /**
      * Scans the provided namespace, returning a list of all files
-     * that are contained within the subpath specified by $path.
+     * that are contained within the sub path specified by $path.
      */
     public function listNamespaceFiles(string $prefix, string $path): array
     {
diff --git a/system/BaseModel.php b/system/BaseModel.php
index 5e481f731db6..cda9c23433e7 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -1489,9 +1489,9 @@ public function asObject(string $class = 'object')
     }
 
     /**
-     * Takes a class an returns an array of it's public and protected
+     * Takes a class and returns an array of it's public and protected
      * properties as an array suitable for use in creates and updates.
-     * This method use objectToRawArray internally and does conversion
+     * This method uses objectToRawArray() internally and does conversion
      * to string on all Time instances
      *
      * @param object|string $data        Data
@@ -1521,7 +1521,7 @@ protected function objectToArray($data, bool $onlyChanged = true, bool $recursiv
     }
 
     /**
-     * Takes a class an returns an array of it's public and protected
+     * Takes a class and returns an array of its public and protected
      * properties as an array with raw values.
      *
      * @param object|string $data        Data
diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php
index 75f4416676fc..b51db77fe8e0 100644
--- a/tests/system/I18n/TimeTest.php
+++ b/tests/system/I18n/TimeTest.php
@@ -240,7 +240,7 @@ public function testCreateFromFormatWithInvalidFormat()
 
     public function testCreateFromTimestamp()
     {
-        // Se the timezone temporarily to UTC to make sure the test timestamp is correct
+        // Set the timezone temporarily to UTC to make sure the test timestamp is correct
         $tz = date_default_timezone_get();
         date_default_timezone_set('UTC');
 

From a28aa933a6613f480658d5cc61369e3e1efc346a Mon Sep 17 00:00:00 2001
From: Toto Prayogo <mail@totoprayogo.com>
Date: Mon, 17 Jan 2022 23:34:57 +0700
Subject: [PATCH 1200/2325] Update Time.php

previously not updating date even though time zone has been set
---
 system/I18n/Time.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index 9d2bc96c9b40..777554291e24 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -256,7 +256,10 @@ public static function createFromFormat($format, $datetime, $timezone = null)
      */
     public static function createFromTimestamp(int $timestamp, $timezone = null, ?string $locale = null)
     {
-        return new self(gmdate('Y-m-d H:i:s', $timestamp), $timezone ?? 'UTC', $locale);
+        $timezone ??= 'UTC';
+        $date = new DateTime('now', new DateTimeZone($timezone));
+
+        return new self($date->setTimestamp($timestamp)->format('Y-m-d H:i:s'), $timezone, $locale);
     }
 
     /**

From 67665c296c645ad3bf0cc049948b8bcaa0cba5af Mon Sep 17 00:00:00 2001
From: Toto Prayogo <mail@totoprayogo.com>
Date: Tue, 18 Jan 2022 08:26:04 +0700
Subject: [PATCH 1201/2325] TimeTest for createFromTimestamp with timezone

---
 tests/system/I18n/TimeTest.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php
index b51db77fe8e0..bdc605d2d253 100644
--- a/tests/system/I18n/TimeTest.php
+++ b/tests/system/I18n/TimeTest.php
@@ -253,6 +253,21 @@ public function testCreateFromTimestamp()
         $this->assertSame(date('2017-03-18 00:00:00'), $time->toDateTimeString());
     }
 
+    public function testCreateFromTimestampWithTimezone()
+    {
+        // Set the timezone temporarily to UTC to make sure the test timestamp is correct
+        $tz = date_default_timezone_get();
+        date_default_timezone_set('UTC');
+
+        $timestamp = strtotime('2017-03-18 midnight'); // in UTC
+
+        date_default_timezone_set($tz);
+
+        $time = Time::createFromTimestamp($timestamp, 'Asia/Jakarta'); // UTC +7
+
+        $this->assertSame(date('2017-03-18 07:00:00'), $time->toDateTimeString());
+    }
+
     public function testTestNow()
     {
         $this->assertFalse(Time::hasTestNow());

From a7dfa5fb3f09a5cfbb7e88ba785f9e39aa58c582 Mon Sep 17 00:00:00 2001
From: Toto <mail@totoprayogo.com>
Date: Tue, 18 Jan 2022 08:52:07 +0700
Subject: [PATCH 1202/2325] Update system/I18n/Time.php

apply suggestion

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 system/I18n/Time.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/I18n/Time.php b/system/I18n/Time.php
index 777554291e24..64b4d350e8fd 100644
--- a/system/I18n/Time.php
+++ b/system/I18n/Time.php
@@ -256,10 +256,10 @@ public static function createFromFormat($format, $datetime, $timezone = null)
      */
     public static function createFromTimestamp(int $timestamp, $timezone = null, ?string $locale = null)
     {
+        $time = new self(gmdate('Y-m-d H:i:s', $timestamp), 'UTC', $locale);
         $timezone ??= 'UTC';
-        $date = new DateTime('now', new DateTimeZone($timezone));
 
-        return new self($date->setTimestamp($timestamp)->format('Y-m-d H:i:s'), $timezone, $locale);
+        return $time->setTimezone($timezone);
     }
 
     /**

From 58005ddc33c486727be45768744435371e1d7b82 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 19 Jan 2022 15:00:28 +0900
Subject: [PATCH 1203/2325] fix: reset Autoloader state when initialize() is
 called

If not, namespaces are added again and again.
---
 system/Autoloader/Autoloader.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
index 492fb09930f0..bfd535f856ca 100644
--- a/system/Autoloader/Autoloader.php
+++ b/system/Autoloader/Autoloader.php
@@ -82,6 +82,10 @@ class Autoloader
      */
     public function initialize(Autoload $config, Modules $modules)
     {
+        $this->prefixes = [];
+        $this->classmap = [];
+        $this->files    = [];
+
         // We have to have one or the other, though we don't enforce the need
         // to have both present in order to work.
         if (empty($config->psr4) && empty($config->classmap)) {

From 8f23692acb296a6c4bddb67927a0ea1d311c5794 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 19 Jan 2022 15:02:02 +0900
Subject: [PATCH 1204/2325] test: fix failed tests

'Tests\Support\MigrationTestMigrations' is a special place for migration files.
When using it, you must clean up the after state.
---
 .../DatabaseTestCaseMigrationOnce1Test.php    | 17 +++++++++++++++-
 .../DatabaseTestCaseMigrationOnce2Test.php    | 17 +++++++++++++++-
 .../system/Database/DatabaseTestCaseTest.php  | 20 +++++++++++++++----
 .../Migrations/MigrationRunnerTest.php        | 17 +++++++++++++++-
 4 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php
index 5cf5ea0d69cc..77c10b4933b1 100644
--- a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php
+++ b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce1Test.php
@@ -56,11 +56,26 @@ final class DatabaseTestCaseMigrationOnce1Test extends CIUnitTestCase
 
     protected function setUp(): void
     {
-        Services::autoloader()->addNamespace('Tests\Support\MigrationTestMigrations', SUPPORTPATH . 'MigrationTestMigrations');
+        $this->setUpMethods[] = 'setUpAddNamespace';
 
         parent::setUp();
     }
 
+    protected function setUpAddNamespace()
+    {
+        Services::autoloader()->addNamespace(
+            'Tests\Support\MigrationTestMigrations',
+            SUPPORTPATH . 'MigrationTestMigrations'
+        );
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        $this->regressDatabase();
+    }
+
     public function testMigrationDone()
     {
         $this->seeInDatabase('foo', ['key' => 'foobar']);
diff --git a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php
index c801d189535b..ec24ffe03eea 100644
--- a/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php
+++ b/tests/system/Database/DatabaseTestCase/DatabaseTestCaseMigrationOnce2Test.php
@@ -55,11 +55,26 @@ final class DatabaseTestCaseMigrationOnce2Test extends CIUnitTestCase
 
     protected function setUp(): void
     {
-        Services::autoloader()->addNamespace('Tests\Support\MigrationTestMigrations', SUPPORTPATH . 'MigrationTestMigrations');
+        $this->setUpMethods[] = 'setUpAddNamespace';
 
         parent::setUp();
     }
 
+    protected function setUpAddNamespace()
+    {
+        Services::autoloader()->addNamespace(
+            'Tests\Support\MigrationTestMigrations',
+            SUPPORTPATH . 'MigrationTestMigrations'
+        );
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        $this->regressDatabase();
+    }
+
     public function testMigrationDone()
     {
         $this->seeInDatabase('foo', ['key' => 'foobar']);
diff --git a/tests/system/Database/DatabaseTestCaseTest.php b/tests/system/Database/DatabaseTestCaseTest.php
index 86f3ec3eec31..71a5264d93f6 100644
--- a/tests/system/Database/DatabaseTestCaseTest.php
+++ b/tests/system/Database/DatabaseTestCaseTest.php
@@ -60,14 +60,26 @@ final class DatabaseTestCaseTest extends CIUnitTestCase
 
     protected function setUp(): void
     {
-        if (! self::$loaded) {
-            Services::autoloader()->addNamespace('Tests\Support\MigrationTestMigrations', SUPPORTPATH . 'MigrationTestMigrations');
-            self::$loaded = true;
-        }
+        $this->setUpMethods[] = 'setUpAddNamespace';
 
         parent::setUp();
     }
 
+    protected function setUpAddNamespace()
+    {
+        Services::autoloader()->addNamespace(
+            'Tests\Support\MigrationTestMigrations',
+            SUPPORTPATH . 'MigrationTestMigrations'
+        );
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        $this->regressDatabase();
+    }
+
     public function testMultipleSeeders()
     {
         $this->seeInDatabase('user', ['name' => 'Jerome Lohan']);
diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php
index 27e14c51c0f7..2c9fa09e1d73 100644
--- a/tests/system/Database/Migrations/MigrationRunnerTest.php
+++ b/tests/system/Database/Migrations/MigrationRunnerTest.php
@@ -39,6 +39,8 @@ final class MigrationRunnerTest extends CIUnitTestCase
 
     protected function setUp(): void
     {
+        $this->setUpMethods[] = 'setUpAddNamespace';
+
         parent::setUp();
 
         $this->root   = vfsStream::setup('root');
@@ -46,8 +48,21 @@ protected function setUp(): void
         $this->config = new Migrations();
 
         $this->config->enabled = true;
+    }
+
+    protected function setUpAddNamespace()
+    {
+        Services::autoloader()->addNamespace(
+            'Tests\Support\MigrationTestMigrations',
+            SUPPORTPATH . 'MigrationTestMigrations'
+        );
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
 
-        Services::autoloader()->addNamespace('Tests\Support\MigrationTestMigrations', TESTPATH . '_support/MigrationTestMigrations');
+        $this->regressDatabase();
     }
 
     public function testLoadsDefaultDatabaseWhenNoneSpecified()

From 35a33ca2c9dd2a0abe10262991d4f8cd177b9754 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 19 Jan 2022 16:33:11 +0900
Subject: [PATCH 1205/2325] test: add test

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

diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php
index fb0b4c8c0cb5..3c7156abdde2 100644
--- a/tests/system/Autoloader/AutoloaderTest.php
+++ b/tests/system/Autoloader/AutoloaderTest.php
@@ -70,6 +70,22 @@ public function testInitializeWithInvalidArguments()
         (new Autoloader())->initialize($config, $modules);
     }
 
+    public function testInitializeTwice()
+    {
+        $loader = new Autoloader();
+        $loader->initialize(new Autoload(), new Modules());
+
+        $ns = $loader->getNamespace();
+        $this->assertCount(1, $ns['App']);
+        $this->assertSame('ROOTPATH/app', clean_path($ns['App'][0]));
+
+        $loader->initialize(new Autoload(), new Modules());
+
+        $ns = $loader->getNamespace();
+        $this->assertCount(1, $ns['App']);
+        $this->assertSame('ROOTPATH/app', clean_path($ns['App'][0]));
+    }
+
     public function testServiceAutoLoaderFromShareInstances()
     {
         $autoloader = Services::autoloader();

From c94219f4e5660fdedf756a372e27115f9431eed3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 24 Dec 2021 15:04:49 +0900
Subject: [PATCH 1206/2325] fix: Entity's isset() and unset()

---
 system/Entity/Entity.php           | 39 +++++++++++++-
 tests/system/Entity/EntityTest.php | 82 +++++++++++++++++++++++-------
 2 files changed, 102 insertions(+), 19 deletions(-)

diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index 85233c14c47b..7d8024e7fe15 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -284,8 +284,8 @@ public function setAttributes(array $data)
     }
 
     /**
-     * Checks the datamap to see if this column name is being mapped,
-     * and returns the mapped name, if any, or the original name.
+     * Checks the datamap to see if this property name is being mapped,
+     * and returns the db column name, if any, or the original property name.
      *
      * @return mixed|string
      */
@@ -510,6 +510,10 @@ public function __get(string $key)
      */
     public function __isset(string $key): bool
     {
+        if ($this->isMappedDbColumn($key)) {
+            return false;
+        }
+
         $key = $this->mapProperty($key);
 
         $method = 'get' . str_replace(' ', '', ucwords(str_replace(['-', '_'], ' ', $key)));
@@ -526,6 +530,37 @@ public function __isset(string $key): bool
      */
     public function __unset(string $key): void
     {
+        if ($this->isMappedDbColumn($key)) {
+            return;
+        }
+
+        $key = $this->mapProperty($key);
+
         unset($this->attributes[$key]);
     }
+
+    /**
+     * Whether this key is mapped db column name?
+     */
+    protected function isMappedDbColumn(string $key): bool
+    {
+        $maybeColumnName = $this->mapProperty($key);
+
+        // Property name which has mapped column name
+        if (($key !== $maybeColumnName)) {
+            return false;
+        }
+
+        return $this->hasMappedProperty($key);
+    }
+
+    /**
+     * Whether this key has mapped property?
+     */
+    protected function hasMappedProperty(string $key): bool
+    {
+        $property = array_search($key, $this->datamap, true);
+
+        return $property !== false;
+    }
 }
diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php
index 15ae33371bb2..a83fdf295dc9 100644
--- a/tests/system/Entity/EntityTest.php
+++ b/tests/system/Entity/EntityTest.php
@@ -120,12 +120,14 @@ public function testDataMappingConvertsOriginalName()
 
         $entity->bar = 'made it';
 
-        // Check mapped field
+        // Check db column name
         $this->assertSame('made it', $entity->foo);
-        // Should also get from original name
-        // since Model's would be looking for the original name
+
+        // Should also get from property name
+        // since Model's would be looking for the property name
         $this->assertSame('made it', $entity->bar);
-        // But it shouldn't actually set a class property for the original name...
+
+        // But it shouldn't actually set a class property for the column name...
         $this->expectException(ReflectionException::class);
         $this->getPrivateProperty($entity, 'bar');
     }
@@ -134,7 +136,7 @@ public function testDataMappingWorksWithCustomSettersAndGetters()
     {
         $entity = $this->getMappedEntity();
 
-        // Will map to "simple"
+        // Will map to "simple" column
         $entity->orig = 'first';
 
         $this->assertSame('oo:first:oo', $entity->simple);
@@ -148,31 +150,36 @@ public function testIssetWorksWithMapping()
     {
         $entity = $this->getMappedEntity();
 
-        // maps to 'foo'
+        // maps to 'foo' column
         $entity->bar = 'here';
 
-        $attributes = $this->getPrivateProperty($entity, 'attributes');
-        $this->assertArrayHasKey('foo', $attributes);
-        $this->assertArrayNotHasKey('bar', $attributes);
+        $isset = isset($entity->bar);
+        $this->assertTrue($isset);
+
+        $isset = isset($entity->foo);
+        $this->assertFalse($isset);
     }
 
     public function testUnsetWorksWithMapping()
     {
         $entity = $this->getMappedEntity();
-        // maps to 'foo'
+
+        // maps to 'foo' column
         $entity->bar = 'here';
 
-        // doesn't work on original name
-        unset($entity->bar);
+        // doesn't work on db column name
+        unset($entity->foo);
 
         $this->assertSame('here', $entity->bar);
         $this->assertSame('here', $entity->foo);
 
-        // does work on mapped field
-        unset($entity->foo);
+        // does work on property name
+        unset($entity->bar);
 
-        $this->assertNull($entity->foo);
-        $this->assertNull($entity->bar);
+        $isset = isset($entity->foo);
+        $this->assertFalse($isset);
+        $isset = isset($entity->bar);
+        $this->assertFalse($isset);
     }
 
     public function testDateMutationFromString()
@@ -757,6 +764,29 @@ public function testAsArraySwapped()
         ], $result);
     }
 
+    public function testSwapped()
+    {
+        $entity = $this->getSimpleSwappedEntity();
+
+        $entity->foo = '111';
+        $entity->bar = '222';
+
+        $isset = isset($entity->foo);
+        $this->assertTrue($isset);
+        $this->assertSame('111', $entity->foo);
+
+        $isset = isset($entity->bar);
+        $this->assertTrue($isset);
+        $this->assertSame('222', $entity->bar);
+
+        $result = $entity->toRawArray();
+
+        $this->assertSame([
+            'foo' => '222',
+            'bar' => '111',
+        ], $result);
+    }
+
     public function testToArraySkipAttributesWithUnderscoreInFirstCharacter()
     {
         $entity                   = new class () extends Entity {
@@ -972,7 +1002,7 @@ protected function getMappedEntity()
                 'simple' => null,
             ];
 
-            // 'bar' is db column, 'foo' is internal representation
+            // 'bar' is class property, 'foo' is db column
             protected $datamap = [
                 'bar'  => 'foo',
                 'orig' => 'simple',
@@ -1009,6 +1039,24 @@ protected function getSwappedEntity()
         };
     }
 
+    protected function getSimpleSwappedEntity()
+    {
+        return new class () extends Entity {
+            protected $attributes = [
+                'foo' => 'foo',
+                'bar' => 'bar',
+            ];
+            protected $_original = [
+                'foo' => 'foo',
+                'bar' => 'bar',
+            ];
+            protected $datamap = [
+                'bar' => 'foo',
+                'foo' => 'bar',
+            ];
+        };
+    }
+
     protected function getCastEntity($data = null): Entity
     {
         return new class ($data) extends Entity {

From 8409466e7a65563672706acf1b2e5bf815956587 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 24 Dec 2021 15:57:16 +0900
Subject: [PATCH 1207/2325] docs: fix the incorrect explanation

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

diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst
index 34928d628dbe..08f6988a4a9b 100644
--- a/user_guide_src/source/models/entities.rst
+++ b/user_guide_src/source/models/entities.rst
@@ -267,7 +267,7 @@ simply map the ``full_name`` column in the database to the ``$name`` property, a
     {
         protected $attributes = [
             'id'         => null,
-            'name'       => null, // Represents a username
+            'full_name'  => null, // In the $attributes, the key is the column name
             'email'      => null,
             'password'   => null,
             'created_at' => null,
@@ -286,8 +286,8 @@ name of the column in the database.
 In this example, when the model sets the ``full_name`` field on the User class, it actually assigns that value to the
 class' ``$name`` property, so it can be set and retrieved through ``$user->name``. The value will still be accessible
 through the original ``$user->full_name``, also, as this is needed for the model to get the data back out and save it
-to the database. However, ``unset`` and ``isset`` only work on the mapped property, ``$name``, not on the original name,
-``full_name``.
+to the database. However, ``unset()`` and ``isset()`` only work on the mapped property, ``$user->name``, not on the database column name,
+``$user->full_name``.
 
 Mutators
 ========

From b71c1ef8eb531d3c28929bc86ed42e4cda832ed1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 24 Dec 2021 19:13:08 +0900
Subject: [PATCH 1208/2325] test: add test and rename test methods

---
 tests/system/Entity/EntityTest.php | 31 +++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php
index a83fdf295dc9..a9a59502575f 100644
--- a/tests/system/Entity/EntityTest.php
+++ b/tests/system/Entity/EntityTest.php
@@ -146,7 +146,7 @@ public function testDataMappingWorksWithCustomSettersAndGetters()
         $this->assertSame('oo:second:oo', $entity->simple);
     }
 
-    public function testIssetWorksWithMapping()
+    public function testDataMappingIsset()
     {
         $entity = $this->getMappedEntity();
 
@@ -764,7 +764,7 @@ public function testAsArraySwapped()
         ], $result);
     }
 
-    public function testSwapped()
+    public function testDataMappingIssetSwapped()
     {
         $entity = $this->getSimpleSwappedEntity();
 
@@ -787,6 +787,23 @@ public function testSwapped()
         ], $result);
     }
 
+    public function testDataMappingIssetUnsetSwapped()
+    {
+        $entity = $this->getSimpleSwappedEntity();
+
+        $entity->foo = '111';
+        $entity->bar = '222';
+        unset($entity->foo);
+
+        $isset = isset($entity->foo);
+        $this->assertFalse($isset);
+        $this->assertNull($entity->foo);
+
+        $isset = isset($entity->bar);
+        $this->assertTrue($isset);
+        $this->assertSame('222', $entity->bar);
+    }
+
     public function testToArraySkipAttributesWithUnderscoreInFirstCharacter()
     {
         $entity                   = new class () extends Entity {
@@ -929,18 +946,18 @@ public function testHasChangedKeyNotExists()
         $this->assertFalse($entity->hasChanged('xxx'));
     }
 
-    public function testIssetKeyMap()
+    public function testDataMappingIssetSetGetMethod()
     {
-        $entity             = $this->getEntity();
+        $entity = $this->getEntity();
+
         $entity->created_at = '12345678';
-        $entity->bar        = 'foo';
 
         $issetReturn = isset($entity->createdAt);
-
         $this->assertTrue($issetReturn);
 
-        $issetReturn = isset($entity->FakeBar);
+        $entity->bar = 'foo';
 
+        $issetReturn = isset($entity->FakeBar);
         $this->assertTrue($issetReturn);
     }
 

From 5f9b0e770366e5d000d6a2b37471caa59195d036 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 2 Jan 2022 08:55:10 +0900
Subject: [PATCH 1209/2325] refactor: remove unneeded parentheses

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

diff --git a/system/Entity/Entity.php b/system/Entity/Entity.php
index 7d8024e7fe15..194f7441717b 100644
--- a/system/Entity/Entity.php
+++ b/system/Entity/Entity.php
@@ -547,7 +547,7 @@ protected function isMappedDbColumn(string $key): bool
         $maybeColumnName = $this->mapProperty($key);
 
         // Property name which has mapped column name
-        if (($key !== $maybeColumnName)) {
+        if ($key !== $maybeColumnName) {
             return false;
         }
 

From 7c32e4b57bb6fa6f9608d48dc6eac11612f7b90a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 19 Jan 2022 21:18:41 +0900
Subject: [PATCH 1210/2325] refactor: use usleep() instead of sleep()

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

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index bc424a91445c..46aa7e5d1ae3 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -560,11 +560,6 @@ parameters:
 			count: 1
 			path: system/Filters/Filters.php
 
-		-
-			message: "#^Parameter \\#1 \\$seconds of function sleep expects int, float given\\.$#"
-			count: 1
-			path: system/HTTP/CURLRequest.php
-
 		-
 			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
 			count: 1
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index dd031753b1fa..c8aceb9cdac0 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -354,7 +354,7 @@ public function send(string $method, string $url)
 
         // Do we need to delay this request?
         if ($this->delay > 0) {
-            sleep($this->delay);
+            usleep((int) $this->delay * 1_000_000);
         }
 
         $output = $this->sendRequest($curlOptions);

From 98927283a9284ed8eee839b43beb681ec738f2cb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 19 Jan 2022 21:19:45 +0900
Subject: [PATCH 1211/2325] test: change `delay` from 1000 to 100

To improve test speed.
---
 .../HTTP/CURLRequestDoNotShareOptionsTest.php | 22 +++++++++----------
 tests/system/HTTP/CURLRequestTest.php         | 22 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
index 4d35d4510271..21070736d741 100644
--- a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
+++ b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
@@ -267,13 +267,13 @@ public function testHeaderContentLengthNotSharedBetweenClients()
 
     public function testOptionsDelay()
     {
+        $request = $this->getRequest();
+        $this->assertSame(0.0, $request->getDelay());
+
         $options = [
             'delay'   => 2000,
             'headers' => ['fruit' => 'apple'],
         ];
-        $request = $this->getRequest();
-        $this->assertSame(0.0, $request->getDelay());
-
         $request = $this->getRequest($options);
         $this->assertSame(2.0, $request->getDelay());
     }
@@ -715,20 +715,20 @@ public function testSendWithDelay()
     {
         $request = $this->getRequest([
             'base_uri' => 'http://www.foo.com/api/v1/',
-            'delay'    => 1000,
+            'delay'    => 100,
         ]);
 
         $request->get('products');
 
         // we still need to check the code coverage to make sure this was done
-        $this->assertSame(1.0, $request->getDelay());
+        $this->assertSame(0.1, $request->getDelay());
     }
 
     public function testSendContinued()
     {
         $request = $this->getRequest([
             'base_uri' => 'http://www.foo.com/api/v1/',
-            'delay'    => 1000,
+            'delay'    => 100,
         ]);
 
         $request->setOutput("HTTP/1.1 100 Continue\x0d\x0a\x0d\x0aHi there");
@@ -743,7 +743,7 @@ public function testSendContinuedWithManyHeaders()
     {
         $request = $this->getRequest([
             'base_uri' => 'http://www.foo.com/api/v1/',
-            'delay'    => 1000,
+            'delay'    => 100,
         ]);
 
         $output = "HTTP/1.1 100 Continue
@@ -787,7 +787,7 @@ public function testSplitResponse()
     {
         $request = $this->getRequest([
             'base_uri' => 'http://www.foo.com/api/v1/',
-            'delay'    => 1000,
+            'delay'    => 100,
         ]);
 
         $request->setOutput("Accept: text/html\x0d\x0a\x0d\x0aHi there");
@@ -799,7 +799,7 @@ public function testApplyBody()
     {
         $request = $this->getRequest([
             'base_uri' => 'http://www.foo.com/api/v1/',
-            'delay'    => 1000,
+            'delay'    => 100,
         ]);
 
         $request->setBody('name=George');
@@ -814,7 +814,7 @@ public function testResponseHeaders()
     {
         $request = $this->getRequest([
             'base_uri' => 'http://www.foo.com/api/v1/',
-            'delay'    => 1000,
+            'delay'    => 100,
         ]);
 
         $request->setOutput("HTTP/2.0 234 Ohoh\x0d\x0aAccept: text/html\x0d\x0a\x0d\x0aHi there");
@@ -828,7 +828,7 @@ public function testResponseHeadersShortProtocol()
     {
         $request = $this->getRequest([
             'base_uri' => 'http://www.foo.com/api/v1/',
-            'delay'    => 1000,
+            'delay'    => 100,
         ]);
 
         $request->setOutput("HTTP/2 235 Ohoh\x0d\x0aAccept: text/html\x0d\x0a\x0d\x0aHi there shortie");
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index e978944ad116..64b824cbad56 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -250,13 +250,13 @@ public function testHeaderContentLengthNotSharedBetweenClients()
 
     public function testOptionsDelay()
     {
+        $request = $this->getRequest();
+        $this->assertSame(0.0, $request->getDelay());
+
         $options = [
             'delay'   => 2000,
             'headers' => ['fruit' => 'apple'],
         ];
-        $request = $this->getRequest();
-        $this->assertSame(0.0, $request->getDelay());
-
         $request = $this->getRequest($options);
         $this->assertSame(2.0, $request->getDelay());
     }
@@ -698,20 +698,20 @@ public function testSendWithDelay()
     {
         $request = $this->getRequest([
             'base_uri' => 'http://www.foo.com/api/v1/',
-            'delay'    => 1000,
+            'delay'    => 100,
         ]);
 
         $request->get('products');
 
         // we still need to check the code coverage to make sure this was done
-        $this->assertSame(1.0, $request->getDelay());
+        $this->assertSame(0.1, $request->getDelay());
     }
 
     public function testSendContinued()
     {
         $request = $this->getRequest([
             'base_uri' => 'http://www.foo.com/api/v1/',
-            'delay'    => 1000,
+            'delay'    => 100,
         ]);
 
         $request->setOutput("HTTP/1.1 100 Continue\x0d\x0a\x0d\x0aHi there");
@@ -726,7 +726,7 @@ public function testSendContinuedWithManyHeaders()
     {
         $request = $this->getRequest([
             'base_uri' => 'http://www.foo.com/api/v1/',
-            'delay'    => 1000,
+            'delay'    => 100,
         ]);
 
         $output = "HTTP/1.1 100 Continue
@@ -770,7 +770,7 @@ public function testSplitResponse()
     {
         $request = $this->getRequest([
             'base_uri' => 'http://www.foo.com/api/v1/',
-            'delay'    => 1000,
+            'delay'    => 100,
         ]);
 
         $request->setOutput("Accept: text/html\x0d\x0a\x0d\x0aHi there");
@@ -782,7 +782,7 @@ public function testApplyBody()
     {
         $request = $this->getRequest([
             'base_uri' => 'http://www.foo.com/api/v1/',
-            'delay'    => 1000,
+            'delay'    => 100,
         ]);
 
         $request->setBody('name=George');
@@ -797,7 +797,7 @@ public function testResponseHeaders()
     {
         $request = $this->getRequest([
             'base_uri' => 'http://www.foo.com/api/v1/',
-            'delay'    => 1000,
+            'delay'    => 100,
         ]);
 
         $request->setOutput("HTTP/2.0 234 Ohoh\x0d\x0aAccept: text/html\x0d\x0a\x0d\x0aHi there");
@@ -811,7 +811,7 @@ public function testResponseHeadersShortProtocol()
     {
         $request = $this->getRequest([
             'base_uri' => 'http://www.foo.com/api/v1/',
-            'delay'    => 1000,
+            'delay'    => 100,
         ]);
 
         $request->setOutput("HTTP/2 235 Ohoh\x0d\x0aAccept: text/html\x0d\x0a\x0d\x0aHi there shortie");

From 1a98885bb0cbbd8ae1889958e0acf36a31918169 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Thu, 20 Jan 2022 10:46:19 +0800
Subject: [PATCH 1212/2325] Model deletion timestamp. Added test

---
 system/Model.php                        | 2 +-
 tests/system/Models/DeleteModelTest.php | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/system/Model.php b/system/Model.php
index ee660e99d7e9..e2f5b0fca891 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -358,7 +358,7 @@ protected function doDelete($id = null, bool $purge = false)
                 return false; // @codeCoverageIgnore
             }
 
-            $builder->where($this->deletedField, null);
+            $builder->where($this->deletedField);
 
             $set[$this->deletedField] = $this->setDate();
 
diff --git a/tests/system/Models/DeleteModelTest.php b/tests/system/Models/DeleteModelTest.php
index ecd09b2ed76c..c6339b9bf9b3 100644
--- a/tests/system/Models/DeleteModelTest.php
+++ b/tests/system/Models/DeleteModelTest.php
@@ -60,6 +60,10 @@ public function testDeleteWithSoftDeletes(): void
         $result = $this->model->delete(1);
         $this->assertTrue($result);
         $this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NOT NULL' => null]);
+        $this->assertSame(1, $this->db->affectedRows());
+
+        $this->model->delete(1);
+        $this->assertSame(0, $this->db->affectedRows());
     }
 
     public function testDeleteWithSoftDeleteFail(): void

From 1ffa12e6b483143415c05f1d93f7727f699018fa Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Thu, 20 Jan 2022 11:15:13 +0800
Subject: [PATCH 1213/2325] Model deletion timestamp. Attempt to fix test

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

diff --git a/tests/system/Models/DeleteModelTest.php b/tests/system/Models/DeleteModelTest.php
index c6339b9bf9b3..1d25181068d6 100644
--- a/tests/system/Models/DeleteModelTest.php
+++ b/tests/system/Models/DeleteModelTest.php
@@ -59,8 +59,8 @@ public function testDeleteWithSoftDeletes(): void
 
         $result = $this->model->delete(1);
         $this->assertTrue($result);
-        $this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NOT NULL' => null]);
         $this->assertSame(1, $this->db->affectedRows());
+        $this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at IS NOT NULL' => null]);
 
         $this->model->delete(1);
         $this->assertSame(0, $this->db->affectedRows());

From d2e973237b0fa17792c1a217892f06779ca3fb91 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 20 Jan 2022 15:00:27 +0900
Subject: [PATCH 1214/2325] docs: fix descriptions

The default namespace is `App\Controllers`.
---
 user_guide_src/source/incoming/routing.rst | 28 ++++++++++++----------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 9d4ab0d88998..5351935bf256 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -47,12 +47,12 @@ Placeholders
 
 A typical route might look something like this::
 
-    $routes->add('product/(:num)', 'App\Catalog::productLookup');
+    $routes->add('product/(:num)', 'Catalog::productLookup');
 
 In a route, the first parameter contains the URI to be matched, while the second parameter
-contains the destination it should be re-routed to. In the above example, if the literal word
-"product" is found in the first segment of the URL, and a number is found in the second segment,
-the "App\Catalog" class and the "productLookup" method are used instead.
+contains the destination it should be routed to. In the above example, if the literal word
+"product" is found in the first segment of the URL path, and a number is found in the second segment,
+the ``Catalog`` class and the ``productLookup`` method are used instead.
 
 Placeholders are simply strings that represent a Regular Expression pattern. During the routing
 process, these placeholders are replaced with the value of the Regular Expression. They are primarily
@@ -79,23 +79,23 @@ Examples
 
 Here are a few basic routing examples.
 
-A URL containing the word "journals" in the first segment will be remapped to the "App\Blogs" class,
+A URL containing the word **journals** in the first segment will be remapped to the ``\App\Controllers\Blogs`` class,
 and the default method, which is usually ``index()``::
 
-    $routes->add('journals', 'App\Blogs');
+    $routes->add('journals', 'Blogs');
 
-A URL containing the segments "blog/joe" will be remapped to the “\Blogs” class and the “users” method.
-The ID will be set to “34”::
+A URL containing the segments **blog/joe** will be remapped to the ``\App\Controllers\Blogs`` class and the ``users`` method.
+The ID will be set to ``34``::
 
     $routes->add('blog/joe', 'Blogs::users/34');
 
-A URL with “product” as the first segment, and anything in the second will be remapped to the “\Catalog” class
-and the “productLookup” method::
+A URL with **product** as the first segment, and anything in the second will be remapped to the ``\App\Controllers\Catalog`` class
+and the ``productLookup`` method::
 
     $routes->add('product/(:any)', 'Catalog::productLookup');
 
-A URL with “product” as the first segment, and a number in the second will be remapped to the “\Catalog” class
-and the “productLookupByID” method passing in the match as a variable to the method::
+A URL with **product** as the first segment, and a number in the second will be remapped to the ``\App\Controllers\Catalog`` class
+and the ``productLookupByID`` method passing in the match as a variable to the method::
 
     $routes->add('product/(:num)', 'Catalog::productLookupByID/$1');
 
@@ -505,7 +505,9 @@ Default Namespace
 -----------------
 
 When matching a controller to a route, the router will add the default namespace value to the front of the controller
-specified by the route. By default, this value is empty, which leaves each route to specify the fully namespaced
+specified by the route. By default, this value is ``App\Controllers``.
+
+If you set the value empty string (``''``), it leaves each route to specify the fully namespaced
 controller::
 
     $routes->setDefaultNamespace('');

From f1c3e4ca4ceb89a285d40eb95c1a75c301e9f5f4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 20 Jan 2022 15:03:33 +0900
Subject: [PATCH 1215/2325] docs: correct words

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

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 5351935bf256..d7335c49cc5d 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -21,7 +21,7 @@ For example, let’s say you want your URLs to have this prototype::
     example.com/product/3/
     example.com/product/4/
 
-Normally the second segment of the URL is reserved for the method name, but in the example
+Normally the second segment of the URL path is reserved for the method name, but in the example
 above it instead has a product ID. To overcome this, CodeIgniter allows you to remap the URI handler.
 
 Setting your own routing rules
@@ -31,7 +31,7 @@ Routing rules are defined in the **app/Config/Routes.php** file. In it you'll se
 it creates an instance of the RouteCollection class that permits you to specify your own routing criteria.
 Routes can be specified using placeholders or Regular Expressions.
 
-A route simply takes the URI on the left, and maps it to the controller and method on the right,
+A route simply takes the URI path on the left, and maps it to the controller and method on the right,
 along with any parameters that should be passed to the controller. The controller and method should
 be listed in the same way that you would use a static method, by separating the fully-namespaced class
 and its method with a double-colon, like ``Users::list``. If that method requires parameters to be
@@ -582,7 +582,7 @@ to only those defined by you, by setting the ``setAutoRoute()`` option to false:
 ------------
 
 When a page is not found that matches the current URI, the system will show a generic 404 view. You can change
-what happens by specifying an action to happen with the ``set404Override()`` option. The value can be either
+what happens by specifying an action to happen with the ``set404Override()`` method. The value can be either
 a valid class/method pair, just like you would show in any route, or a Closure::
 
     // Would execute the show404 method of the App\Errors class

From 53044208e706db9aa325a446b82f57c645e8ccda Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 20 Jan 2022 15:03:59 +0900
Subject: [PATCH 1216/2325] docs: extract `note`

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

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index d7335c49cc5d..32fb2297bdc8 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -253,8 +253,9 @@ It is possible to nest groups within groups for finer organization if you need i
         });
     });
 
-This would handle the URL at ``admin/users/list``. Note that options passed to the outer ``group()`` (for example
-``namespace`` and ``filter``) are not merged with the inner ``group()`` options.
+This would handle the URL at **admin/users/list**.
+
+.. note:: Options passed to the outer ``group()`` (for example ``namespace`` and ``filter``) are not merged with the inner ``group()`` options.
 
 At some point, you may want to group routes for the purpose of applying filters or other route
 config options like namespace, subdomain, etc. Without necessarily needing to add a prefix to the group, you can pass

From 400d6d3777c80e7d65590a98b2caf544155be8d5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 20 Jan 2022 15:04:53 +0900
Subject: [PATCH 1217/2325] docs: change text decoration, etc.

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

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 32fb2297bdc8..3199e4fc6256 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -64,14 +64,14 @@ The following placeholders are available for you to use in your routes:
 Placeholders Description
 ============ ===========================================================================================================
 (:any)       will match all characters from that point to the end of the URI. This may include multiple URI segments.
-(:segment)   will match any character except for a forward slash (/) restricting the result to a single segment.
+(:segment)   will match any character except for a forward slash (``/``) restricting the result to a single segment.
 (:num)       will match any integer.
 (:alpha)     will match any string of alphabetic characters
 (:alphanum)  will match any string of alphabetic characters or integers, or any combination of the two.
-(:hash)      is the same as **(:segment)**, but can be used to easily see which routes use hashed ids.
+(:hash)      is the same as ``(:segment)``, but can be used to easily see which routes use hashed ids.
 ============ ===========================================================================================================
 
-.. note:: **{locale}** cannot be used as a placeholder or other part of the route, as it is reserved for use
+.. note:: ``{locale}`` cannot be used as a placeholder or other part of the route, as it is reserved for use
     in :doc:`localization </outgoing/localization>`.
 
 Examples
@@ -103,7 +103,7 @@ Note that a single ``(:any)`` will match multiple segments in the URL if present
 
     $routes->add('product/(:any)', 'Catalog::productLookup/$1');
 
-will match product/123, product/123/456, product/123/456/789 and so on. The implementation in the
+will match **product/123**, **product/123/456**, **product/123/456/789** and so on. The implementation in the
 Controller should take into account the maximum parameters::
 
     public function productLookup($seg1 = false, $seg2 = false, $seg3 = false) {
@@ -117,7 +117,7 @@ routes. With the examples URLs from above::
 
     $routes->add('product/(:segment)', 'Catalog::productLookup/$1');
 
-will only match product/123 and generate 404 errors for other example.
+will only match **product/123** and generate 404 errors for other example.
 
 .. warning:: While the ``add()`` method is convenient, it is recommended to always use the HTTP-verb-based
     routes, described below, as it is more secure. If you use the :doc:`CSRF protection </libraries/security>`, it does not protect **GET**
@@ -134,7 +134,7 @@ Custom Placeholders
 You can create your own placeholders that can be used in your routes file to fully customize the experience
 and readability.
 
-You add new placeholders with the ``addPlaceholder`` method. The first parameter is the string to be used as
+You add new placeholders with the ``addPlaceholder()`` method. The first parameter is the string to be used as
 the placeholder. The second parameter is the Regular Expression pattern it should be replaced with.
 This must be called before you add the route::
 
@@ -152,10 +152,10 @@ is allowed, as are back-references.
 
     $routes->add('products/([a-z]+)/(\d+)', 'Products::show/$1/id_$2');
 
-In the above example, a URI similar to products/shirts/123 would instead call the ``show`` method
+In the above example, a URI similar to **products/shirts/123** would instead call the ``show`` method
 of the ``Products`` controller class, with the original first and second segment passed as arguments to it.
 
-With regular expressions, you can also catch a segment containing a forward slash (‘/’), which would usually
+With regular expressions, you can also catch a segment containing a forward slash (``/``), which would usually
 represent the delimiter between multiple segments.
 
 For example, if a user accesses a password protected area of your web application and you wish to be able to
@@ -184,7 +184,7 @@ a simple view::
 Mapping multiple routes
 =======================
 
-While the add() method is simple to use, it is often handier to work with multiple routes at once, using
+While the ``add()`` method is simple to use, it is often handier to work with multiple routes at once, using
 the ``map()`` method. Instead of calling the ``add()`` method for each route that you need to add, you can
 define an array of routes and then pass it as the first parameter to the ``map()`` method::
 
@@ -226,7 +226,7 @@ extensive set of routes that all share the opening string, like when building an
         $routes->add('blog', 'Admin\Blog::index');
     });
 
-This would prefix the 'users' and 'blog" URIs with "admin", handling URLs like ``/admin/users`` and ``/admin/blog``.
+This would prefix the **users** and **blog** URIs with **admin**, handling URLs like **admin/users** and **admin/blog**.
 
 If you need to assign options to a group, like a :ref:`assigning-namespace`, do it before the callback::
 
@@ -234,7 +234,7 @@ If you need to assign options to a group, like a :ref:`assigning-namespace`, do
         $routes->resource('users');
     });
 
-This would handle a resource route to the ``App\API\v1\Users`` controller with the ``/api/users`` URI.
+This would handle a resource route to the ``App\API\v1\Users`` controller with the **api/users** URI.
 
 You can also use a specific :doc:`filter <filters>` for a group of routes. This will always
 run the filter before or after the controller. This is especially handy during authentication or api logging::
@@ -289,7 +289,7 @@ to update your application code. This is typically used within views to create l
 
 For example, if you have a route to a photo gallery that you want to link to, you can use the ``route_to()`` helper
 function to get the current route that should be used. The first parameter is the fully qualified Controller and method,
-separated by a double colon (::), much like you would use when writing the initial route itself. Any parameters that
+separated by a double colon (``::``), much like you would use when writing the initial route itself. Any parameters that
 should be passed to the route are passed in next::
 
     // The route is defined as:
@@ -303,7 +303,7 @@ Using Named Routes
 ==================
 
 You can name routes to make your application less fragile. This applies a name to a route that can be called
-later, and even if the route definition changes, all of the links in your application built with ``route_to``
+later, and even if the route definition changes, all of the links in your application built with ``route_to()``
 will still work without you having to make any changes. A route is named by passing in the ``as`` option
 with the name of the route::
 
@@ -328,7 +328,7 @@ Each verb has its own method you can use::
     $routes->put('products/(:num)', 'Product::feature');
     $routes->delete('products/(:num)', 'Product::feature');
 
-You can supply multiple verbs that a route should match by passing them in as an array to the ``match`` method::
+You can supply multiple verbs that a route should match by passing them in as an array to the ``match()`` method::
 
     $routes->match(['get', 'put'], 'products', 'Product::feature');
 
@@ -336,7 +336,7 @@ Command-Line only Routes
 ========================
 
 You can create routes that work only from the command-line, and are inaccessible from the web browser, with the
-``cli()`` method. This is great for building cronjobs or CLI-only tools. Any route created by any of the HTTP-verb-based
+``cli()`` method. This is great for building cron jobs or CLI-only tools. Any route created by any of the HTTP-verb-based
 route methods will also be inaccessible from the CLI, but routes created by the ``add()`` method will still be
 available from the command line::
 
@@ -429,8 +429,8 @@ by passing the "hostname" option along with the desired domain to allow it on as
 
     $routes->get('from', 'to', ['hostname' => 'accounts.example.com']);
 
-This example would only allow the specified hosts to work if the domain exactly matched "accounts.example.com".
-It would not work under the main site at "example.com".
+This example would only allow the specified hosts to work if the domain exactly matched **accounts.example.com**.
+It would not work under the main site at **example.com**.
 
 Limit to Subdomains
 -------------------
@@ -441,7 +441,7 @@ sub-domain. The route will only be matched if the subdomain is the one the appli
     // Limit to media.example.com
     $routes->add('from', 'to', ['subdomain' => 'media']);
 
-You can restrict it to any subdomain by setting the value to an asterisk, (*). If you are viewing from a URL
+You can restrict it to any subdomain by setting the value to an asterisk, (``*``). If you are viewing from a URL
 that does not have any subdomain present, this will not be matched::
 
     // Limit to any sub-domain
@@ -473,7 +473,7 @@ Route processing queue
 When working with modules, it can be a problem if the routes in the application contain wildcards.
 Then the module routes will not be processed correctly.
 You can solve this problem by lowering the priority of route processing using the ``priority`` option. The parameter
-accepts positive integers and zero. The higher the number specified in the "priority", the lower
+accepts positive integers and zero. The higher the number specified in the ``priority``, the lower
 route priority in the processing queue::
 
     // First you need to enable sorting.
@@ -535,14 +535,14 @@ Default Controller
 
 When a user visits the root of your site (i.e., example.com) the controller to use is determined by the value set by
 the ``setDefaultController()`` method, unless a route exists for it explicitly. The default value for this is ``Home``
-which matches the controller at ``/app/Controllers/Home.php``::
+which matches the controller at **app/Controllers/Home.php**::
 
     // example.com routes to app/Controllers/Welcome.php
     $routes->setDefaultController('Welcome');
 
 The default controller is also used when no matching route has been found, and the URI would point to a directory
-in the controllers directory. For example, if the user visits ``example.com/admin``, if a controller was found at
-``/app/Controllers/admin/Home.php`` it would be used.
+in the controllers directory. For example, if the user visits **example.com/admin**, if a controller was found at
+**app/Controllers/Admin/Home.php**, it would be used.
 
 Default Method
 --------------
@@ -551,7 +551,7 @@ This works similar to the default controller setting, but is used to determine t
 when a controller is found that matches the URI, but no segment exists for the method. The default value is
 ``index``.
 
-In this example, if the user were to visit example.com/products, and a Products controller existed, the
+In this example, if the user were to visit **example.com/products**, and a ``Products`` controller existed, the
 ``Products::listAll()`` method would be executed::
 
     $routes->setDefaultMethod('listAll');
@@ -559,7 +559,7 @@ In this example, if the user were to visit example.com/products, and a Products
 Translate URI Dashes
 --------------------
 
-This option enables you to automatically replace dashes (‘-‘) with underscores in the controller and method
+This option enables you to automatically replace dashes (``-``) with underscores in the controller and method
 URI segments, thus saving you additional route entries if you need to do that. This is required because the
 dash isn’t a valid class or method name character and would cause a fatal error if you try to use it::
 

From 41f0013e807ac66b1ebbdc8b90c7eb5aa8518b19 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Thu, 20 Jan 2022 23:46:41 +0800
Subject: [PATCH 1218/2325] Clarification when working with model pagination.

---
 .../source/libraries/pagination.rst           | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index b665300749e2..2fc5e236f00c 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -56,6 +56,33 @@ The first element is the results from the database, **users**, which is retrieve
 the Model will hold on to the instance it used and store it in the public class variable, **$pager**. So, we grab
 that and assign it to the $pager variable in the view.
 
+.. important:: It is important to understand that the Model::paginate() method uses the Model and QueryBuilder methods.
+Therefore, trying to use ``$db->query()`` and Model::paginate() **will not work** because ``$db->query()`` executes
+the query immediately and is not associated with a QueryBuilder.
+
+To define conditions for pagination in a model, you can::
+
+    //You can specify conditions directly.
+    $model = new \App\Models\UserModel();
+
+    $data = [
+        'users' => $model->where('ban', 1)->paginate(10),
+        'pager' => $model->pager,
+    ];
+
+    // You can move the conditions to a separate method.
+    // Model method
+    public function banned()
+    {
+        $this->builder()->where('ban', 1);
+        return $this; // This will allow the call chain to be used.
+    }
+
+    $data = [
+        'users' => $model->banned()->paginate(10),
+        'pager' => $model->pager,
+    ];
+
 Within the view, we then need to tell it where to display the resulting links::
 
     <?= $pager->links() ?>

From e3cb05ebe110b708ab8c164a556c957bc12012ff Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Fri, 21 Jan 2022 02:54:52 +0800
Subject: [PATCH 1219/2325] fix

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

diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index 2fc5e236f00c..04b4b36cdbf9 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -57,8 +57,8 @@ the Model will hold on to the instance it used and store it in the public class
 that and assign it to the $pager variable in the view.
 
 .. important:: It is important to understand that the Model::paginate() method uses the Model and QueryBuilder methods.
-Therefore, trying to use ``$db->query()`` and Model::paginate() **will not work** because ``$db->query()`` executes
-the query immediately and is not associated with a QueryBuilder.
+    Therefore, trying to use ``$db->query()`` and Model::paginate() **will not work** because ``$db->query()`` executes
+    the query immediately and is not associated with a QueryBuilder.
 
 To define conditions for pagination in a model, you can::
 

From 0f67501da3f31046f1dab4f3f39e5eeda39e2ac7 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Fri, 21 Jan 2022 05:21:40 +0800
Subject: [PATCH 1220/2325] Added alias escaping in subquery

---
 system/Database/BaseBuilder.php            | 3 ++-
 tests/system/Database/Builder/FromTest.php | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 8bbaf764dcf1..a3fc6c7563d3 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -2767,9 +2767,10 @@ protected function buildSubquery($builder, bool $wrapped = false, string $alias
 
         if ($wrapped) {
             $subquery = '(' . $subquery . ')';
+            $alias    = trim($alias);
 
             if ($alias !== '') {
-                $subquery .= " AS {$alias}";
+                $subquery .= ' AS ' . ($this->db->protectIdentifiers ? $this->db->escapeIdentifiers($alias) : $alias);
             }
         }
 
diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php
index fee171e9ca42..b0e3ee335035 100644
--- a/tests/system/Database/Builder/FromTest.php
+++ b/tests/system/Database/Builder/FromTest.php
@@ -103,19 +103,19 @@ public function testFromReset()
 
     public function testFromSubquery()
     {
-        $expectedSQL = 'SELECT * FROM (SELECT * FROM "users") AS alias';
+        $expectedSQL = 'SELECT * FROM (SELECT * FROM "users") AS "alias"';
         $subquery    = new BaseBuilder('users', $this->db);
         $builder     = $this->db->newQuery()->fromSubquery($subquery, 'alias');
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
-        $expectedSQL = 'SELECT * FROM (SELECT "id", "name" FROM "users") AS users_1';
+        $expectedSQL = 'SELECT * FROM (SELECT "id", "name" FROM "users") AS "users_1"';
         $subquery    = (new BaseBuilder('users', $this->db))->select('id, name');
         $builder     = $this->db->newQuery()->fromSubquery($subquery, 'users_1');
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
-        $expectedSQL = 'SELECT * FROM (SELECT * FROM "users") AS alias, "some_table"';
+        $expectedSQL = 'SELECT * FROM (SELECT * FROM "users") AS "alias", "some_table"';
         $subquery    = new BaseBuilder('users', $this->db);
         $builder     = $this->db->newQuery()->fromSubquery($subquery, 'alias')->from('some_table');
 
@@ -145,7 +145,7 @@ public function testFromSubqueryWithSQLSRV()
 
         $builder->fromSubquery($subquery, 'users_1');
 
-        $expectedSQL = 'SELECT * FROM "test"."dbo"."jobs", (SELECT * FROM "test"."dbo"."users") AS users_1';
+        $expectedSQL = 'SELECT * FROM "test"."dbo"."jobs", (SELECT * FROM "test"."dbo"."users") AS "users_1"';
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }

From 83e6d5f3218b3b4d45e1129816cfa56e484fc2d8 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Fri, 21 Jan 2022 07:49:03 +0800
Subject: [PATCH 1221/2325] Update
 user_guide_src/source/libraries/pagination.rst

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

diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index 04b4b36cdbf9..978df73a9240 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -62,7 +62,7 @@ that and assign it to the $pager variable in the view.
 
 To define conditions for pagination in a model, you can::
 
-    //You can specify conditions directly.
+    // You can specify conditions directly.
     $model = new \App\Models\UserModel();
 
     $data = [

From c18473141d1f28c1aeea857d7f24fe343991bf2d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 21 Jan 2022 09:09:51 +0900
Subject: [PATCH 1222/2325] docs: replace http: with https:

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

diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index b665300749e2..eb925e12687d 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -118,7 +118,7 @@ Specifying the URI Segment for Page
 
 It is also possible to use a URI segment for the page number, instead of the page query parameter. Simply specify the
 segment number to use as the fourth argument. URIs generated by the pager would then look
-like *https://domain.tld/model/[pageNumber]* instead of *https://domain.tld/model?page=[pageNumber]*.
+like **https://domain.tld/model/[pageNumber]** instead of **https://domain.tld/model?page=[pageNumber]**.
 
 ::
 
@@ -165,15 +165,15 @@ Paginating with Only Expected Queries
 
 By default, all GET queries are shown in the pagination links.
 
-For example, when accessing the URL *http://domain.tld?search=foo&order=asc&hello=i+am+here&page=2*, the page 3 link can be generated, along with the other links, as follows::
+For example, when accessing the URL **https://domain.tld?search=foo&order=asc&hello=i+am+here&page=2**, the page 3 link can be generated, along with the other links, as follows::
 
     echo $pager->links();
-    // Page 3 link: http://domain.tld?search=foo&order=asc&hello=i+am+here&page=3
+    // Page 3 link: https://domain.tld?search=foo&order=asc&hello=i+am+here&page=3
 
 The ``only()`` method allows you to limit this just to queries already expected::
 
     echo $pager->only(['search', 'order'])->links();
-    // Page 3 link: http://domain.tld?search=foo&order=asc&page=3
+    // Page 3 link: https://domain.tld?search=foo&order=asc&page=3
 
 The *page* query is enabled by default. And ``only()`` acts in all pagination links.
 
@@ -303,7 +303,7 @@ title, which is just the number, and a boolean that tells whether the link is th
 
     $link = [
         'active' => false,
-        'uri'    => 'http://example.com/foo?page=2',
+        'uri'    => 'https://example.com/foo?page=2',
         'title'  => 1,
     ];
 

From 6db9f3835061c08fdbdcbebab53bd61924056024 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 21 Jan 2022 09:10:29 +0900
Subject: [PATCH 1223/2325] docs: replace `class variable` with property

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

diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index eb925e12687d..c94c14a7af81 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -53,8 +53,8 @@ To provide a paginated list of users in your application, your controller's meth
 In this example, we first create a new instance of our UserModel. Then we populate the data to send to the view.
 The first element is the results from the database, **users**, which is retrieved for the correct page, returning
 10 users per page. The second item that must be sent to the view is the Pager instance itself. As a convenience,
-the Model will hold on to the instance it used and store it in the public class variable, **$pager**. So, we grab
-that and assign it to the $pager variable in the view.
+the Model will hold on to the instance it used and store it in the public property, ``$pager``. So, we grab
+that and assign it to the ``$pager`` variable in the view.
 
 Within the view, we then need to tell it where to display the resulting links::
 

From 354bc29b97aa424a980e7f319ece7399360ba460 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 21 Jan 2022 09:11:20 +0900
Subject: [PATCH 1224/2325] docs: fix sample code

$segment is used in the sentence, but it does not exist in the code.
---
 user_guide_src/source/libraries/pagination.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index c94c14a7af81..246dda0cc00a 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -122,7 +122,7 @@ like **https://domain.tld/model/[pageNumber]** instead of **https://domain.tld/m
 
 ::
 
-    $users = $userModel->paginate(10, 'group1', null, 3);
+    $users = $userModel->paginate(10, 'group1', null, $segment);
 
 Please note: ``$segment`` value cannot be greater than the number of URI segments plus 1.
 

From ea76b26ea2d30c5d42f873e6bf6cfa91a52540ab Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 21 Jan 2022 09:19:15 +0900
Subject: [PATCH 1225/2325] docs: change text decoration

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

diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index 246dda0cc00a..53aa634d9511 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -50,7 +50,7 @@ To provide a paginated list of users in your application, your controller's meth
         }
     }
 
-In this example, we first create a new instance of our UserModel. Then we populate the data to send to the view.
+In this example, we first create a new instance of our ``UserModel``. Then we populate the data to send to the view.
 The first element is the results from the database, **users**, which is retrieved for the correct page, returning
 10 users per page. The second item that must be sent to the view is the Pager instance itself. As a convenience,
 the Model will hold on to the instance it used and store it in the public property, ``$pager``. So, we grab
@@ -104,7 +104,7 @@ Setting Page Manually
 =====================
 
 If you need to specify which page of results to return you can specify the page as the 3rd argument. This can be
-handy when you have a different manner than the default $_GET varibable to control which page to show.
+handy when you have a different manner than the default ``$_GET`` varibable to control which page to show.
 
 ::
 
@@ -118,7 +118,7 @@ Specifying the URI Segment for Page
 
 It is also possible to use a URI segment for the page number, instead of the page query parameter. Simply specify the
 segment number to use as the fourth argument. URIs generated by the pager would then look
-like **https://domain.tld/model/[pageNumber]** instead of **https://domain.tld/model?page=[pageNumber]**.
+like **https://domain.tld/foo/bar/[pageNumber]** instead of **https://domain.tld/foo/bar?page=[pageNumber]**.
 
 ::
 
@@ -158,7 +158,7 @@ If you in need to show many pagers on one page then additional parameter which w
     $pager->setPath('path/for/my-group', 'my-group'); // Additionally you could define path for every group.
     $pager->makeLinks($page, $perPage, $total, 'template_name', $segment, 'my-group');
 
-Pagination library uses *page* query parameter for HTTP queries by default (if no group or *default* group name given) or *page_[groupName]* for custom group names.
+Pagination library uses **page** query parameter for HTTP queries by default (if no group or ``default`` group name given) or ``page_[groupName]`` for custom group names.
 
 Paginating with Only Expected Queries
 =====================================
@@ -193,7 +193,7 @@ that is used by editing **app/Config/Pager.php**::
     ];
 
 This setting stores the alias and :doc:`namespaced view paths </outgoing/views>` for the view that
-should be used. The *default_full* and *default_simple* views are used for the ``links()`` and ``simpleLinks()``
+should be used. The ``default_full`` and ``default_simple`` views are used for the ``links()`` and ``simpleLinks()``
 methods, respectively. To change the way those are displayed application-wide, you could assign a new view here.
 
 For example, say you create a new view file that works with the Foundation CSS framework, and
@@ -231,7 +231,7 @@ Creating the View
 
 When you create a new view, you only need to create the code that is needed for creating the pagination links themselves.
 You should not create unnecessary wrapping divs since it might be used in multiple places and you only limit their
-usefulness. It is easiest to demonstrate creating a new view by showing you the existing default_full template::
+usefulness. It is easiest to demonstrate creating a new view by showing you the existing ``default_full`` template::
 
     <?php $pager->setSurroundCount(2) ?>
 
@@ -281,7 +281,7 @@ the current page link. The only parameter that it accepts is the number of links
 **hasPrevious()** & **hasNext()**
 
 These methods return a boolean true if there are more links that can be displayed on either side of the current page,
-based on the value passed to ``setSurroundCount``. For example, let's say we have 20 pages of data. The current
+based on the value passed to ``setSurroundCount()``. For example, let's say we have 20 pages of data. The current
 page is page 3. If the surrounding count is 2, then the following links would show up in the list: 1, 2, 3, 4, and 5.
 Since the first link displayed is page one, ``hasPrevious()`` would return **false** since there is no page zero. However,
 ``hasNext()`` would return **true** since there are 15 additional pages of results after page five.
@@ -355,7 +355,7 @@ See following an example with these changes::
 
 This method returns a boolean true if there are links to a page before and after, respectively, the current page being displayed.
 
-Their difference to ``hasPrevious()`` and ``hasNext()`` is that they are based on the current page while ``hasPrevious()`` and ``hasNext()`` are based on the set of links to be displayed before and after the current page based on the value passed in ``setSurroundCount``.
+Their difference to ``hasPrevious()`` and ``hasNext()`` is that they are based on the current page while ``hasPrevious()`` and ``hasNext()`` are based on the set of links to be displayed before and after the current page based on the value passed in ``setSurroundCount()``.
 
 **getPreviousPage()** & **getNextPage()**
 

From 9e9dfbb6099ae68e69cfb993527b0b9b9b09273c Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Tue, 4 Jan 2022 07:43:04 -0500
Subject: [PATCH 1226/2325] Merge pull request #5531 from
 kenjis/fix-framework-composer.json

---
 admin/framework/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/framework/composer.json b/admin/framework/composer.json
index 6c02a4b71eb9..25ac1f07ecc3 100644
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@@ -10,7 +10,7 @@
         "ext-intl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "kint-php/kint": "^3.3",
+        "kint-php/kint": "^4.0",
         "laminas/laminas-escaper": "^2.9",
         "psr/log": "^1.1"
     },

From df19be9795b31b0f5c00e73ad986ddecb80f32e3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 19 Jan 2022 13:41:52 +0900
Subject: [PATCH 1227/2325] fix: all methods in ResponseTrait should be
 protected

Public methods can be accessible via HTTP.
---
 system/API/ResponseTrait.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
index 56848ea608de..16ef3925612b 100644
--- a/system/API/ResponseTrait.php
+++ b/system/API/ResponseTrait.php
@@ -87,7 +87,7 @@ trait ResponseTrait
      *
      * @return mixed
      */
-    public function respond($data = null, ?int $status = null, string $message = '')
+    protected function respond($data = null, ?int $status = null, string $message = '')
     {
         if ($data === null && $status === null) {
             $status = 404;
@@ -121,7 +121,7 @@ public function respond($data = null, ?int $status = null, string $message = '')
      *
      * @return mixed
      */
-    public function fail($messages, int $status = 400, ?string $code = null, string $customMessage = '')
+    protected function fail($messages, int $status = 400, ?string $code = null, string $customMessage = '')
     {
         if (! is_array($messages)) {
             $messages = ['error' => $messages];
@@ -147,7 +147,7 @@ public function fail($messages, int $status = 400, ?string $code = null, string
      *
      * @return mixed
      */
-    public function respondCreated($data = null, string $message = '')
+    protected function respondCreated($data = null, string $message = '')
     {
         return $this->respond($data, $this->codes['created'], $message);
     }
@@ -159,7 +159,7 @@ public function respondCreated($data = null, string $message = '')
      *
      * @return mixed
      */
-    public function respondDeleted($data = null, string $message = '')
+    protected function respondDeleted($data = null, string $message = '')
     {
         return $this->respond($data, $this->codes['deleted'], $message);
     }
@@ -171,7 +171,7 @@ public function respondDeleted($data = null, string $message = '')
      *
      * @return mixed
      */
-    public function respondUpdated($data = null, string $message = '')
+    protected function respondUpdated($data = null, string $message = '')
     {
         return $this->respond($data, $this->codes['updated'], $message);
     }
@@ -182,7 +182,7 @@ public function respondUpdated($data = null, string $message = '')
      *
      * @return mixed
      */
-    public function respondNoContent(string $message = 'No Content')
+    protected function respondNoContent(string $message = 'No Content')
     {
         return $this->respond(null, $this->codes['no_content'], $message);
     }
@@ -194,7 +194,7 @@ public function respondNoContent(string $message = 'No Content')
      *
      * @return mixed
      */
-    public function failUnauthorized(string $description = 'Unauthorized', ?string $code = null, string $message = '')
+    protected function failUnauthorized(string $description = 'Unauthorized', ?string $code = null, string $message = '')
     {
         return $this->fail($description, $this->codes['unauthorized'], $code, $message);
     }
@@ -205,7 +205,7 @@ public function failUnauthorized(string $description = 'Unauthorized', ?string $
      *
      * @return mixed
      */
-    public function failForbidden(string $description = 'Forbidden', ?string $code = null, string $message = '')
+    protected function failForbidden(string $description = 'Forbidden', ?string $code = null, string $message = '')
     {
         return $this->fail($description, $this->codes['forbidden'], $code, $message);
     }
@@ -215,7 +215,7 @@ public function failForbidden(string $description = 'Forbidden', ?string $code =
      *
      * @return mixed
      */
-    public function failNotFound(string $description = 'Not Found', ?string $code = null, string $message = '')
+    protected function failNotFound(string $description = 'Not Found', ?string $code = null, string $message = '')
     {
         return $this->fail($description, $this->codes['resource_not_found'], $code, $message);
     }
@@ -227,7 +227,7 @@ public function failNotFound(string $description = 'Not Found', ?string $code =
      *
      * @deprecated Use failValidationErrors instead
      */
-    public function failValidationError(string $description = 'Bad Request', ?string $code = null, string $message = '')
+    protected function failValidationError(string $description = 'Bad Request', ?string $code = null, string $message = '')
     {
         return $this->fail($description, $this->codes['invalid_data'], $code, $message);
     }
@@ -239,7 +239,7 @@ public function failValidationError(string $description = 'Bad Request', ?string
      *
      * @return mixed
      */
-    public function failValidationErrors($errors, ?string $code = null, string $message = '')
+    protected function failValidationErrors($errors, ?string $code = null, string $message = '')
     {
         return $this->fail($errors, $this->codes['invalid_data'], $code, $message);
     }
@@ -249,7 +249,7 @@ public function failValidationErrors($errors, ?string $code = null, string $mess
      *
      * @return mixed
      */
-    public function failResourceExists(string $description = 'Conflict', ?string $code = null, string $message = '')
+    protected function failResourceExists(string $description = 'Conflict', ?string $code = null, string $message = '')
     {
         return $this->fail($description, $this->codes['resource_exists'], $code, $message);
     }
@@ -261,7 +261,7 @@ public function failResourceExists(string $description = 'Conflict', ?string $co
      *
      * @return mixed
      */
-    public function failResourceGone(string $description = 'Gone', ?string $code = null, string $message = '')
+    protected function failResourceGone(string $description = 'Gone', ?string $code = null, string $message = '')
     {
         return $this->fail($description, $this->codes['resource_gone'], $code, $message);
     }
@@ -271,7 +271,7 @@ public function failResourceGone(string $description = 'Gone', ?string $code = n
      *
      * @return mixed
      */
-    public function failTooManyRequests(string $description = 'Too Many Requests', ?string $code = null, string $message = '')
+    protected function failTooManyRequests(string $description = 'Too Many Requests', ?string $code = null, string $message = '')
     {
         return $this->fail($description, $this->codes['too_many_requests'], $code, $message);
     }
@@ -285,7 +285,7 @@ public function failTooManyRequests(string $description = 'Too Many Requests', ?
      *
      * @return Response The value of the Response's send() method.
      */
-    public function failServerError(string $description = 'Internal Server Error', ?string $code = null, string $message = ''): Response
+    protected function failServerError(string $description = 'Internal Server Error', ?string $code = null, string $message = ''): Response
     {
         return $this->fail($description, $this->codes['server_error'], $code, $message);
     }
@@ -346,7 +346,7 @@ protected function format($data = null)
      *
      * @return $this
      */
-    public function setResponseFormat(?string $format = null)
+    protected function setResponseFormat(?string $format = null)
     {
         $this->format = strtolower($format);
 

From 7c99acf7c8f90aef36afe3c8edd9a63cc6948437 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 19 Jan 2022 13:43:48 +0900
Subject: [PATCH 1228/2325] docs: fix @return type

---
 system/API/ResponseTrait.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
index 16ef3925612b..9ee722b45235 100644
--- a/system/API/ResponseTrait.php
+++ b/system/API/ResponseTrait.php
@@ -85,7 +85,7 @@ trait ResponseTrait
      *
      * @param array|string|null $data
      *
-     * @return mixed
+     * @return Response
      */
     protected function respond($data = null, ?int $status = null, string $message = '')
     {
@@ -119,7 +119,7 @@ protected function respond($data = null, ?int $status = null, string $message =
      * @param int          $status   HTTP status code
      * @param string|null  $code     Custom, API-specific, error code
      *
-     * @return mixed
+     * @return Response
      */
     protected function fail($messages, int $status = 400, ?string $code = null, string $customMessage = '')
     {
@@ -145,7 +145,7 @@ protected function fail($messages, int $status = 400, ?string $code = null, stri
      *
      * @param mixed $data
      *
-     * @return mixed
+     * @return Response
      */
     protected function respondCreated($data = null, string $message = '')
     {
@@ -157,7 +157,7 @@ protected function respondCreated($data = null, string $message = '')
      *
      * @param mixed $data
      *
-     * @return mixed
+     * @return Response
      */
     protected function respondDeleted($data = null, string $message = '')
     {
@@ -169,7 +169,7 @@ protected function respondDeleted($data = null, string $message = '')
      *
      * @param mixed $data
      *
-     * @return mixed
+     * @return Response
      */
     protected function respondUpdated($data = null, string $message = '')
     {
@@ -180,7 +180,7 @@ protected function respondUpdated($data = null, string $message = '')
      * Used after a command has been successfully executed but there is no
      * meaningful reply to send back to the client.
      *
-     * @return mixed
+     * @return Response
      */
     protected function respondNoContent(string $message = 'No Content')
     {
@@ -192,7 +192,7 @@ protected function respondNoContent(string $message = 'No Content')
      * or had bad authorization credentials. User is encouraged to try again
      * with the proper information.
      *
-     * @return mixed
+     * @return Response
      */
     protected function failUnauthorized(string $description = 'Unauthorized', ?string $code = null, string $message = '')
     {
@@ -203,7 +203,7 @@ protected function failUnauthorized(string $description = 'Unauthorized', ?strin
      * Used when access is always denied to this resource and no amount
      * of trying again will help.
      *
-     * @return mixed
+     * @return Response
      */
     protected function failForbidden(string $description = 'Forbidden', ?string $code = null, string $message = '')
     {
@@ -213,7 +213,7 @@ protected function failForbidden(string $description = 'Forbidden', ?string $cod
     /**
      * Used when a specified resource cannot be found.
      *
-     * @return mixed
+     * @return Response
      */
     protected function failNotFound(string $description = 'Not Found', ?string $code = null, string $message = '')
     {
@@ -223,7 +223,7 @@ protected function failNotFound(string $description = 'Not Found', ?string $code
     /**
      * Used when the data provided by the client cannot be validated.
      *
-     * @return mixed
+     * @return Response
      *
      * @deprecated Use failValidationErrors instead
      */
@@ -237,7 +237,7 @@ protected function failValidationError(string $description = 'Bad Request', ?str
      *
      * @param string|string[] $errors
      *
-     * @return mixed
+     * @return Response
      */
     protected function failValidationErrors($errors, ?string $code = null, string $message = '')
     {
@@ -247,7 +247,7 @@ protected function failValidationErrors($errors, ?string $code = null, string $m
     /**
      * Use when trying to create a new resource and it already exists.
      *
-     * @return mixed
+     * @return Response
      */
     protected function failResourceExists(string $description = 'Conflict', ?string $code = null, string $message = '')
     {
@@ -259,7 +259,7 @@ protected function failResourceExists(string $description = 'Conflict', ?string
      * Not Found, because here we know the data previously existed, but is now gone,
      * where Not Found means we simply cannot find any information about it.
      *
-     * @return mixed
+     * @return Response
      */
     protected function failResourceGone(string $description = 'Gone', ?string $code = null, string $message = '')
     {
@@ -269,7 +269,7 @@ protected function failResourceGone(string $description = 'Gone', ?string $code
     /**
      * Used when the user has made too many requests for the resource recently.
      *
-     * @return mixed
+     * @return Response
      */
     protected function failTooManyRequests(string $description = 'Too Many Requests', ?string $code = null, string $message = '')
     {

From 79172edd17a33843cda4a11059078a64fe583fea Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 19 Jan 2022 14:07:11 +0900
Subject: [PATCH 1229/2325] test: update failed tests

---
 tests/system/API/ResponseTraitTest.php        | 114 +++++++++++-------
 .../system/RESTful/ResourceControllerTest.php |  11 +-
 2 files changed, 79 insertions(+), 46 deletions(-)

diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
index abff4ce0c1a9..8cf06372dcdd 100644
--- a/tests/system/API/ResponseTraitTest.php
+++ b/tests/system/API/ResponseTraitTest.php
@@ -110,7 +110,8 @@ public function testNoFormatterJSON()
     {
         $this->formatter = null;
         $controller      = $this->makeController([], 'http://codeigniter.com', ['Accept' => 'application/json']);
-        $controller->respondCreated(['id' => 3], 'A Custom Reason');
+
+        $this->invoke($controller, 'respondCreated', [['id' => 3], 'A Custom Reason']);
 
         $this->assertSame('A Custom Reason', $this->response->getReason());
         $this->assertSame(201, $this->response->getStatusCode());
@@ -127,7 +128,8 @@ public function testNoFormatter()
     {
         $this->formatter = null;
         $controller      = $this->makeController([], 'http://codeigniter.com', ['Accept' => 'application/json']);
-        $controller->respondCreated('A Custom Reason');
+
+        $this->invoke($controller, 'respondCreated', ['A Custom Reason']);
 
         $this->assertSame('A Custom Reason', $this->response->getBody());
     }
@@ -137,12 +139,14 @@ public function testAssociativeArrayPayload()
         $this->formatter = null;
         $controller      = $this->makeController();
         $payload         = ['answer' => 42];
-        $expected        = <<<'EOH'
+
+        $this->invoke($controller, 'respond', [$payload]);
+
+        $expected = <<<'EOH'
             {
                 "answer": 42
             }
             EOH;
-        $controller->respond($payload);
         $this->assertSame($expected, $this->response->getBody());
     }
 
@@ -155,6 +159,9 @@ public function testArrayPayload()
             2,
             3,
         ];
+
+        $this->invoke($controller, 'respond', [$payload]);
+
         $expected = <<<'EOH'
             [
                 1,
@@ -162,7 +169,6 @@ public function testArrayPayload()
                 3
             ]
             EOH;
-        $controller->respond($payload);
         $this->assertSame($expected, $this->response->getBody());
     }
 
@@ -173,20 +179,23 @@ public function testPHPtoArrayPayload()
         $payload         = new stdClass();
         $payload->name   = 'Tom';
         $payload->id     = 1;
-        $expected        = <<<'EOH'
+
+        $this->invoke($controller, 'respond', [(array) $payload]);
+
+        $expected = <<<'EOH'
             {
                 "name": "Tom",
                 "id": 1
             }
             EOH;
-        $controller->respond((array) $payload);
         $this->assertSame($expected, $this->response->getBody());
     }
 
     public function testRespondSets404WithNoData()
     {
         $controller = $this->makeController();
-        $controller->respond(null, null);
+
+        $this->invoke($controller, 'respond', [null, null]);
 
         $this->assertSame(404, $this->response->getStatusCode());
         $this->assertNull($this->response->getBody());
@@ -195,7 +204,8 @@ public function testRespondSets404WithNoData()
     public function testRespondSetsStatusWithEmptyData()
     {
         $controller = $this->makeController();
-        $controller->respond(null, 201);
+
+        $this->invoke($controller, 'respond', [null, 201]);
 
         $this->assertSame(201, $this->response->getStatusCode());
         $this->assertNull($this->response->getBody());
@@ -204,7 +214,8 @@ public function testRespondSetsStatusWithEmptyData()
     public function testRespondSetsCorrectBodyAndStatus()
     {
         $controller = $this->makeController();
-        $controller->respond('something', 201);
+
+        $this->invoke($controller, 'respond', ['something', 201]);
 
         $this->assertSame(201, $this->response->getStatusCode());
         $this->assertSame('something', $this->response->getBody());
@@ -215,7 +226,8 @@ public function testRespondSetsCorrectBodyAndStatus()
     public function testRespondWithCustomReason()
     {
         $controller = $this->makeController();
-        $controller->respond('something', 201, 'A Custom Reason');
+
+        $this->invoke($controller, 'respond', ['something', 201, 'A Custom Reason']);
 
         $this->assertSame(201, $this->response->getStatusCode());
         $this->assertSame('A Custom Reason', $this->response->getReason());
@@ -225,7 +237,7 @@ public function testFailSingleMessage()
     {
         $controller = $this->makeController();
 
-        $controller->fail('Failure to Launch', 500, 'WHAT!', 'A Custom Reason');
+        $this->invoke($controller, 'fail', ['Failure to Launch', 500, 'WHAT!', 'A Custom Reason']);
 
         // Will use the JSON formatter by default
         $expected = [
@@ -235,7 +247,6 @@ public function testFailSingleMessage()
                 'error' => 'Failure to Launch',
             ],
         ];
-
         $this->assertSame($this->formatter->format($expected), $this->response->getBody());
         $this->assertSame(500, $this->response->getStatusCode());
         $this->assertSame('A Custom Reason', $this->response->getReason());
@@ -244,7 +255,8 @@ public function testFailSingleMessage()
     public function testCreated()
     {
         $controller = $this->makeController();
-        $controller->respondCreated(['id' => 3], 'A Custom Reason');
+
+        $this->invoke($controller, 'respondCreated', [['id' => 3], 'A Custom Reason']);
 
         $this->assertSame('A Custom Reason', $this->response->getReason());
         $this->assertSame(201, $this->response->getStatusCode());
@@ -254,7 +266,8 @@ public function testCreated()
     public function testDeleted()
     {
         $controller = $this->makeController();
-        $controller->respondDeleted(['id' => 3], 'A Custom Reason');
+
+        $this->invoke($controller, 'respondDeleted', [['id' => 3], 'A Custom Reason']);
 
         $this->assertSame('A Custom Reason', $this->response->getReason());
         $this->assertSame(200, $this->response->getStatusCode());
@@ -264,7 +277,8 @@ public function testDeleted()
     public function testUpdated()
     {
         $controller = $this->makeController();
-        $controller->respondUpdated(['id' => 3], 'A Custom Reason');
+
+        $this->invoke($controller, 'respondUpdated', [['id' => 3], 'A Custom Reason']);
 
         $this->assertSame('A Custom Reason', $this->response->getReason());
         $this->assertSame(200, $this->response->getStatusCode());
@@ -274,7 +288,8 @@ public function testUpdated()
     public function testUnauthorized()
     {
         $controller = $this->makeController();
-        $controller->failUnauthorized('Nope', 'FAT CHANCE', 'A Custom Reason');
+
+        $this->invoke($controller, 'failUnauthorized', ['Nope', 'FAT CHANCE', 'A Custom Reason']);
 
         $expected = [
             'status'   => 401,
@@ -283,7 +298,6 @@ public function testUnauthorized()
                 'error' => 'Nope',
             ],
         ];
-
         $this->assertSame('A Custom Reason', $this->response->getReason());
         $this->assertSame(401, $this->response->getStatusCode());
         $this->assertSame($this->formatter->format($expected), $this->response->getBody());
@@ -292,7 +306,8 @@ public function testUnauthorized()
     public function testForbidden()
     {
         $controller = $this->makeController();
-        $controller->failForbidden('Nope', 'FAT CHANCE', 'A Custom Reason');
+
+        $this->invoke($controller, 'failForbidden', ['Nope', 'FAT CHANCE', 'A Custom Reason']);
 
         $expected = [
             'status'   => 403,
@@ -301,7 +316,6 @@ public function testForbidden()
                 'error' => 'Nope',
             ],
         ];
-
         $this->assertSame('A Custom Reason', $this->response->getReason());
         $this->assertSame(403, $this->response->getStatusCode());
         $this->assertSame($this->formatter->format($expected), $this->response->getBody());
@@ -310,7 +324,8 @@ public function testForbidden()
     public function testNoContent()
     {
         $controller = $this->makeController();
-        $controller->respondNoContent('');
+
+        $this->invoke($controller, 'respondNoContent', ['']);
 
         $this->assertSame('No Content', $this->response->getReason());
         $this->assertSame(204, $this->response->getStatusCode());
@@ -319,7 +334,8 @@ public function testNoContent()
     public function testNotFound()
     {
         $controller = $this->makeController();
-        $controller->failNotFound('Nope', 'FAT CHANCE', 'A Custom Reason');
+
+        $this->invoke($controller, 'failNotFound', ['Nope', 'FAT CHANCE', 'A Custom Reason']);
 
         $expected = [
             'status'   => 404,
@@ -328,7 +344,6 @@ public function testNotFound()
                 'error' => 'Nope',
             ],
         ];
-
         $this->assertSame('A Custom Reason', $this->response->getReason());
         $this->assertSame(404, $this->response->getStatusCode());
         $this->assertSame($this->formatter->format($expected), $this->response->getBody());
@@ -337,7 +352,8 @@ public function testNotFound()
     public function testValidationError()
     {
         $controller = $this->makeController();
-        $controller->failValidationError('Nope', 'FAT CHANCE', 'A Custom Reason');
+
+        $this->invoke($controller, 'failValidationError', ['Nope', 'FAT CHANCE', 'A Custom Reason']);
 
         $expected = [
             'status'   => 400,
@@ -346,7 +362,6 @@ public function testValidationError()
                 'error' => 'Nope',
             ],
         ];
-
         $this->assertSame('A Custom Reason', $this->response->getReason());
         $this->assertSame(400, $this->response->getStatusCode());
         $this->assertSame($this->formatter->format($expected), $this->response->getBody());
@@ -355,7 +370,8 @@ public function testValidationError()
     public function testValidationErrors()
     {
         $controller = $this->makeController();
-        $controller->failValidationErrors(['foo' => 'Nope', 'bar' => 'No way'], 'FAT CHANCE', 'A Custom Reason');
+
+        $this->invoke($controller, 'failValidationErrors', [['foo' => 'Nope', 'bar' => 'No way'], 'FAT CHANCE', 'A Custom Reason']);
 
         $expected = [
             'status'   => 400,
@@ -365,7 +381,6 @@ public function testValidationErrors()
                 'bar' => 'No way',
             ],
         ];
-
         $this->assertSame('A Custom Reason', $this->response->getReason());
         $this->assertSame(400, $this->response->getStatusCode());
         $this->assertSame($this->formatter->format($expected), $this->response->getBody());
@@ -374,7 +389,8 @@ public function testValidationErrors()
     public function testResourceExists()
     {
         $controller = $this->makeController();
-        $controller->failResourceExists('Nope', 'FAT CHANCE', 'A Custom Reason');
+
+        $this->invoke($controller, 'failResourceExists', ['Nope', 'FAT CHANCE', 'A Custom Reason']);
 
         $expected = [
             'status'   => 409,
@@ -383,7 +399,6 @@ public function testResourceExists()
                 'error' => 'Nope',
             ],
         ];
-
         $this->assertSame('A Custom Reason', $this->response->getReason());
         $this->assertSame(409, $this->response->getStatusCode());
         $this->assertSame($this->formatter->format($expected), $this->response->getBody());
@@ -392,7 +407,8 @@ public function testResourceExists()
     public function testResourceGone()
     {
         $controller = $this->makeController();
-        $controller->failResourceGone('Nope', 'FAT CHANCE', 'A Custom Reason');
+
+        $this->invoke($controller, 'failResourceGone', ['Nope', 'FAT CHANCE', 'A Custom Reason']);
 
         $expected = [
             'status'   => 410,
@@ -401,7 +417,6 @@ public function testResourceGone()
                 'error' => 'Nope',
             ],
         ];
-
         $this->assertSame('A Custom Reason', $this->response->getReason());
         $this->assertSame(410, $this->response->getStatusCode());
         $this->assertSame($this->formatter->format($expected), $this->response->getBody());
@@ -410,7 +425,8 @@ public function testResourceGone()
     public function testTooManyRequests()
     {
         $controller = $this->makeController();
-        $controller->failTooManyRequests('Nope', 'FAT CHANCE', 'A Custom Reason');
+
+        $this->invoke($controller, 'failTooManyRequests', ['Nope', 'FAT CHANCE', 'A Custom Reason']);
 
         $expected = [
             'status'   => 429,
@@ -419,7 +435,6 @@ public function testTooManyRequests()
                 'error' => 'Nope',
             ],
         ];
-
         $this->assertSame('A Custom Reason', $this->response->getReason());
         $this->assertSame(429, $this->response->getStatusCode());
         $this->assertSame($this->formatter->format($expected), $this->response->getBody());
@@ -428,7 +443,8 @@ public function testTooManyRequests()
     public function testServerError()
     {
         $controller = $this->makeController();
-        $controller->failServerError('Nope.', 'FAT-CHANCE', 'A custom reason.');
+
+        $this->invoke($controller, 'failServerError', ['Nope.', 'FAT-CHANCE', 'A custom reason.']);
 
         $this->assertSame('A custom reason.', $this->response->getReason());
         $this->assertSame(500, $this->response->getStatusCode());
@@ -491,7 +507,8 @@ public function testXMLFormatter()
 
         $this->assertInstanceOf('CodeIgniter\Format\XMLFormatter', $this->formatter);
 
-        $controller->respondCreated(['id' => 3], 'A Custom Reason');
+        $this->invoke($controller, 'respondCreated', [['id' => 3], 'A Custom Reason']);
+
         $expected = <<<'EOH'
             <?xml version="1.0"?>
             <response><id>3</id></response>
@@ -540,23 +557,24 @@ public function __construct(&$request, &$response)
             }
         };
 
-        $controller->respondCreated(['id' => 3], 'A Custom Reason');
+        $this->invoke($controller, 'respondCreated', [['id' => 3], 'A Custom Reason']);
+
         $this->assertStringStartsWith(config('Format')->supportedResponseFormats[0], $response->getHeaderLine('Content-Type'));
     }
 
     public function testResponseFormat()
     {
-        $data = ['foo' => 'something'];
-
+        $data       = ['foo' => 'something'];
         $controller = $this->makeController();
-        $controller->setResponseFormat('json');
-        $controller->respond($data, 201);
+
+        $this->invoke($controller, 'setResponseFormat', ['json']);
+        $this->invoke($controller, 'respond', [$data, 201]);
 
         $this->assertStringStartsWith('application/json', $this->response->getHeaderLine('Content-Type'));
         $this->assertSame($this->formatter->format($data), $this->response->getJSON());
 
-        $controller->setResponseFormat('xml');
-        $controller->respond($data, 201);
+        $this->invoke($controller, 'setResponseFormat', ['xml']);
+        $this->invoke($controller, 'respond', [$data, 201]);
 
         $this->assertStringStartsWith('application/xml', $this->response->getHeaderLine('Content-Type'));
     }
@@ -566,10 +584,18 @@ public function testXMLResponseFormat()
         $data       = ['foo' => 'bar'];
         $controller = $this->makeController();
         $controller->resetFormatter();
-        $controller->setResponseFormat('xml');
-        $controller->respond($data, 201);
+
+        $this->invoke($controller, 'setResponseFormat', ['xml']);
+        $this->invoke($controller, 'respond', [$data, 201]);
 
         $xmlFormatter = new XMLFormatter();
         $this->assertSame($xmlFormatter->format($data), $this->response->getXML());
     }
+
+    private function invoke(object $controller, string $method, array $args = [])
+    {
+        $method = $this->getPrivateMethodInvoker($controller, $method);
+
+        return $method(...$args);
+    }
 }
diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index ec8d13af7a2d..e6098527d09c 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -293,7 +293,7 @@ public function testJSONFormatOutput()
             'foo' => 'bar',
         ];
 
-        $theResponse = $resource->respond($data);
+        $theResponse = $this->invoke($resource, 'respond', [$data]);
         $result      = $theResponse->getBody();
 
         $JSONFormatter = new JSONFormatter();
@@ -321,7 +321,7 @@ public function testXMLFormatOutput()
             'foo' => 'bar',
         ];
 
-        $theResponse = $resource->respond($data);
+        $theResponse = $this->invoke($resource, 'respond', [$data]);
         $result      = $theResponse->getBody();
 
         $XMLFormatter = new XMLFormatter();
@@ -329,4 +329,11 @@ public function testXMLFormatOutput()
 
         $this->assertSame($expected, $result);
     }
+
+    private function invoke(object $controller, string $method, array $args = [])
+    {
+        $method = $this->getPrivateMethodInvoker($controller, $method);
+
+        return $method(...$args);
+    }
 }

From 22a66b24e265040241062e40f6e214f8e2a492d9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 21 Jan 2022 12:56:45 +0900
Subject: [PATCH 1230/2325] docs: add changelogs/v4.1.8.rst

---
 user_guide_src/source/changelogs/index.rst  |  1 +
 user_guide_src/source/changelogs/v4.1.8.rst | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 user_guide_src/source/changelogs/v4.1.8.rst

diff --git a/user_guide_src/source/changelogs/index.rst b/user_guide_src/source/changelogs/index.rst
index 74e782cb3508..4a48ea878d98 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.1.8
     v4.1.7
     v4.1.6
     v4.1.5
diff --git a/user_guide_src/source/changelogs/v4.1.8.rst b/user_guide_src/source/changelogs/v4.1.8.rst
new file mode 100644
index 000000000000..4b2005f51c7a
--- /dev/null
+++ b/user_guide_src/source/changelogs/v4.1.8.rst
@@ -0,0 +1,15 @@
+Version 4.1.8
+#############
+
+Release Date: January XX, 2022
+
+**4.1.8 release of CodeIgniter4**
+
+.. contents::
+    :local:
+    :depth: 2
+
+SECURITY
+********
+
+- *XSS Vulnerability* in the ``API\ResponseTrait`` was fixed. See the `Security advisory <https://github.com/codeigniter4/CodeIgniter4/security/advisories/GHSA-7528-7jg5-6g62>`_ for more information.

From 0fac3c61ee58d890f0158784169b21f6b096af01 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 21 Jan 2022 13:06:54 +0900
Subject: [PATCH 1231/2325] Update version to 4.1.8

---
 system/CodeIgniter.php        | 2 +-
 user_guide_src/source/conf.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index ed4e500466f6..24ad148269cf 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -45,7 +45,7 @@ class CodeIgniter
     /**
      * The current version of CodeIgniter Framework
      */
-    public const CI_VERSION = '4.1.7';
+    public const CI_VERSION = '4.1.8';
 
     private const MIN_PHP_VERSION = '7.3';
 
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 60a34e9c178b..0f7585e66df4 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -24,7 +24,7 @@
 version = '4.1'
 
 # The full version, including alpha/beta/rc tags.
-release = '4.1.7'
+release = '4.1.8'
 
 # -- General configuration ---------------------------------------------------
 

From ad5c67f298240b9dd3d3e41ce8a988de01b1d525 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 21 Jan 2022 13:12:26 +0900
Subject: [PATCH 1232/2325] docs: update CHANGELOG.md

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23c77082242e..db4113d55c60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [v4.1.8](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.8) (2022-01-XX)
+
+[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.7...v4.1.8)
+
+**SECURITY**
+
+* *XSS Vulnerability* in the `API\ResponseTrait` was fixed. See the [Security advisory](https://github.com/codeigniter4/CodeIgniter4/security/advisories/GHSA-7528-7jg5-6g62) for more information.
+
 ## [v4.1.7](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.7) (2022-01-09)
 
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.6...v4.1.7)

From 9f3e8c6c904490a96025ad91cd57bde44beaafde Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 21 Jan 2022 14:59:01 +0900
Subject: [PATCH 1233/2325] chore: add --no-coverage option to PHPUnit other
 than on PHP 8.0

---
 .github/workflows/test-phpunit.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index f6e4bc91a0d4..2df45201e7cf 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -126,7 +126,15 @@ jobs:
         if: matrix.php-versions == '8.0'
         run: echo "TACHYCARDIA_MONITOR_GA=enabled" >> $GITHUB_ENV
 
-      - name: Test with PHPUnit
+      - name: Test with PHPUnit w/o Coverage
+        if: matrix.php-versions != '8.0'
+        run: script -e -c "vendor/bin/phpunit --color=always --exclude-group=auto-review --no-coverage"
+        env:
+          DB: ${{ matrix.db-platforms }}
+          TERM: xterm-256color
+
+      - name: Test with PHPUnit with Coverage
+        if: matrix.php-versions == '8.0'
         run: script -e -c "vendor/bin/phpunit --color=always --exclude-group=auto-review"
         env:
           DB: ${{ matrix.db-platforms }}

From ed67dccc58ef2b2de20feb95d746332af90648ab Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 21 Jan 2022 16:13:17 +0900
Subject: [PATCH 1234/2325] chore: compute phpunit option for coverage

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 .github/workflows/test-phpunit.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 2df45201e7cf..6908f2be88e2 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -126,16 +126,15 @@ jobs:
         if: matrix.php-versions == '8.0'
         run: echo "TACHYCARDIA_MONITOR_GA=enabled" >> $GITHUB_ENV
 
-      - name: Test with PHPUnit w/o Coverage
-        if: matrix.php-versions != '8.0'
-        run: script -e -c "vendor/bin/phpunit --color=always --exclude-group=auto-review --no-coverage"
-        env:
-          DB: ${{ matrix.db-platforms }}
-          TERM: xterm-256color
+      - name: Compute coverage option
+        uses: actions/github-script@v3
+        id: phpunit-coverage-option
+        with:
+          script: 'return "${{ matrix.php-versions }}" == "8.0" ? "" : "--no-coverage"'
+          result-encoding: string
 
-      - name: Test with PHPUnit with Coverage
-        if: matrix.php-versions == '8.0'
-        run: script -e -c "vendor/bin/phpunit --color=always --exclude-group=auto-review"
+      - name: Test with PHPUnit
+        run: script -e -c "vendor/bin/phpunit --color=always --exclude-group=auto-review ${{ steps.phpunit-coverage-option.outputs.result }}"
         env:
           DB: ${{ matrix.db-platforms }}
           TERM: xterm-256color

From d8406d98edd1d60229c916519d8e76aaaa16d756 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Sat, 22 Jan 2022 09:17:54 +0800
Subject: [PATCH 1235/2325] Fix: Escaping subquery alias docs

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 user_guide_src/source/database/query_builder.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 84d70732488a..d21896e3c251 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -234,7 +234,7 @@ This is where we add a subquery to an existing table.::
     $builder  = $db->table('jobs')->fromSubquery($subquery, 'alias');
     $query = $builder->get();
 
-    // Produces: SELECT * FROM `jobs`, (SELECT * FROM `users`) AS alias
+    // Produces: SELECT * FROM `jobs`, (SELECT * FROM `users`) AS `alias`
 
 Use the ``$db->newQuery()`` method to make a subquery the main table.::
 
@@ -242,7 +242,7 @@ Use the ``$db->newQuery()`` method to make a subquery the main table.::
     $builder  = $db->newQuery()->fromSubquery($subquery, 't');
     $query = $builder->get();
 
-    // Produces: SELECT * FROM (SELECT `id`, `name` FROM users) AS t
+    // Produces: SELECT * FROM (SELECT `id`, `name` FROM users) AS `t`
 
 Join
 ====

From d4ddb2e640f8f91682d89c18074a923ef717629f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 22 Jan 2022 15:42:08 +0900
Subject: [PATCH 1236/2325] fix: spark migrate:status does not show status with
 different namespaces

---
 system/Commands/Database/MigrateStatus.php    |   7 +-
 .../Commands/Database/MigrateStatusTest.php   | 112 ++++++++++++++++++
 2 files changed, 116 insertions(+), 3 deletions(-)
 create mode 100644 tests/system/Commands/Database/MigrateStatusTest.php

diff --git a/system/Commands/Database/MigrateStatus.php b/system/Commands/Database/MigrateStatus.php
index 91b52950b2b4..8b0885a659b1 100644
--- a/system/Commands/Database/MigrateStatus.php
+++ b/system/Commands/Database/MigrateStatus.php
@@ -79,8 +79,8 @@ class MigrateStatus extends BaseCommand
      */
     public function run(array $params)
     {
-        $runner = Services::migrations();
-        $group  = $params['g'] ?? CLI::getOption('g');
+        $runner     = Services::migrations();
+        $paramGroup = $params['g'] ?? CLI::getOption('g');
 
         // Get all namespaces
         $namespaces = Services::autoloader()->getNamespace();
@@ -108,7 +108,8 @@ public function run(array $params)
                 continue;
             }
 
-            $history = $runner->getHistory((string) $group);
+            $runner->setNamespace($namespace);
+            $history = $runner->getHistory((string) $paramGroup);
             ksort($migrations);
 
             foreach ($migrations as $uid => $migration) {
diff --git a/tests/system/Commands/Database/MigrateStatusTest.php b/tests/system/Commands/Database/MigrateStatusTest.php
new file mode 100644
index 000000000000..8f6997d01127
--- /dev/null
+++ b/tests/system/Commands/Database/MigrateStatusTest.php
@@ -0,0 +1,112 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Database;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\Filters\CITestStreamFilter;
+
+/**
+ * @internal
+ */
+final class MigrateStatusTest extends CIUnitTestCase
+{
+    private $streamFilter;
+    private string $migrationFileFrom = SUPPORTPATH . 'MigrationTestMigrations/Database/Migrations/2018-01-24-102301_Some_migration.php';
+    private string $migrationFileTo   = APPPATH . 'Database/Migrations/2018-01-24-102301_Some_migration.php';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        if (! is_file($this->migrationFileFrom)) {
+            $this->fail(clean_path($this->migrationFileFrom) . ' is not found.');
+        }
+
+        if (is_file($this->migrationFileTo)) {
+            @unlink($this->migrationFileTo);
+        }
+
+        copy($this->migrationFileFrom, $this->migrationFileTo);
+
+        $contents = file_get_contents($this->migrationFileTo);
+        $contents = str_replace(
+            'namespace Tests\Support\MigrationTestMigrations\Database\Migrations;',
+            'namespace App\Database\Migrations;',
+            $contents
+        );
+        file_put_contents($this->migrationFileTo, $contents);
+
+        CITestStreamFilter::$buffer = '';
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        $db = db_connect();
+        $db->table('migrations')->emptyTable();
+
+        if (is_file($this->migrationFileTo)) {
+            @unlink($this->migrationFileTo);
+        }
+
+        stream_filter_remove($this->streamFilter);
+    }
+
+    public function testMigrateAllWithWithTwoNamespaces(): void
+    {
+        command('migrate --all');
+        CITestStreamFilter::$buffer = '';
+
+        command('migrate:status');
+
+        $result   = str_replace(["\033[0;33m", "\033[0m"], '', CITestStreamFilter::$buffer);
+        $result   = preg_replace('/\d{4}-\d\d-\d\d \d\d:\d\d:\d\d/', 'YYYY-MM-DD HH:MM:SS', $result);
+        $expected = <<<'EOL'
+            +---------------+-------------------+--------------------+-------+---------------------+-------+
+            | Namespace     | Version           | Filename           | Group | Migrated On         | Batch |
+            +---------------+-------------------+--------------------+-------+---------------------+-------+
+            | App           | 2018-01-24-102301 | Some_migration     | tests | YYYY-MM-DD HH:MM:SS | 1     |
+            | Tests\Support | 20160428212500    | Create_test_tables | tests | YYYY-MM-DD HH:MM:SS | 1     |
+            +---------------+-------------------+--------------------+-------+---------------------+-------+
+
+
+            EOL;
+        $this->assertSame($expected, $result);
+    }
+
+    public function testMigrateWithWithTwoNamespaces(): void
+    {
+        command('migrate -n App');
+        command('migrate -n Tests\\\\Support');
+        CITestStreamFilter::$buffer = '';
+
+        command('migrate:status');
+
+        $result   = str_replace(["\033[0;33m", "\033[0m"], '', CITestStreamFilter::$buffer);
+        $result   = preg_replace('/\d{4}-\d\d-\d\d \d\d:\d\d:\d\d/', 'YYYY-MM-DD HH:MM:SS', $result);
+        $expected = <<<'EOL'
+            +---------------+-------------------+--------------------+-------+---------------------+-------+
+            | Namespace     | Version           | Filename           | Group | Migrated On         | Batch |
+            +---------------+-------------------+--------------------+-------+---------------------+-------+
+            | App           | 2018-01-24-102301 | Some_migration     | tests | YYYY-MM-DD HH:MM:SS | 1     |
+            | Tests\Support | 20160428212500    | Create_test_tables | tests | YYYY-MM-DD HH:MM:SS | 2     |
+            +---------------+-------------------+--------------------+-------+---------------------+-------+
+
+
+            EOL;
+        $this->assertSame($expected, $result);
+    }
+}

From 8207e2757539bf2f681007897cb15929279833fc Mon Sep 17 00:00:00 2001
From: Najdanovic Ivan <najdanovicivan@gmail.com>
Date: Wed, 19 Jan 2022 19:26:38 +0100
Subject: [PATCH 1237/2325] BaseService - Use lowercase key in resetSingle

---
 system/Config/BaseService.php        |  1 +
 tests/system/Config/ServicesTest.php | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
index 38bac37fdaa9..572b6cf576bd 100644
--- a/system/Config/BaseService.php
+++ b/system/Config/BaseService.php
@@ -288,6 +288,7 @@ public static function reset(bool $initAutoloader = false)
      */
     public static function resetSingle(string $name)
     {
+        $name = strtolower($name);
         unset(static::$mocks[$name], static::$instances[$name]);
     }
 
diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php
index 7fed04f53aa3..5f8cc476ae88 100644
--- a/tests/system/Config/ServicesTest.php
+++ b/tests/system/Config/ServicesTest.php
@@ -343,6 +343,17 @@ public function testResetSingle()
         $this->assertSame($security, $security2);
     }
 
+    public function testResetSingleCaseInsensitive()
+    {
+        Services::injectMock('response', new MockResponse(new App()));
+        $someService = service('response');
+        $this->assertInstanceOf(MockResponse::class, $someService);
+
+        Services::resetSingle('Response');
+        $someService = service('response');
+        $this->assertNotInstanceOf(MockResponse::class, $someService);
+    }
+
     public function testFilters()
     {
         $result = Services::filters();

From 22ca7a9aac23919c3490b56fbb5ae928f933f2c3 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sat, 22 Jan 2022 23:51:43 +0800
Subject: [PATCH 1238/2325] Fix `array_flatten_with_dots` ignores empty array
 values

---
 system/Helpers/array_helper.php          |  2 +-
 tests/system/Helpers/ArrayHelperTest.php | 30 +++++++++++++++---------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php
index c93acd5365a7..b5350cdd8b70 100644
--- a/system/Helpers/array_helper.php
+++ b/system/Helpers/array_helper.php
@@ -203,7 +203,7 @@ function array_flatten_with_dots(iterable $array, string $id = ''): array
         foreach ($array as $key => $value) {
             $newKey = $id . $key;
 
-            if (is_array($value)) {
+            if (is_array($value) && $value !== []) {
                 $flattened = array_merge($flattened, array_flatten_with_dots($value, $newKey . '.'));
             } else {
                 $flattened[$newKey] = $value;
diff --git a/tests/system/Helpers/ArrayHelperTest.php b/tests/system/Helpers/ArrayHelperTest.php
index 68941d670ce9..90413c570a00 100644
--- a/tests/system/Helpers/ArrayHelperTest.php
+++ b/tests/system/Helpers/ArrayHelperTest.php
@@ -391,11 +391,8 @@ public static function sortByMultipleKeysProvider()
 
     /**
      * @dataProvider arrayFlattenProvider
-     *
-     * @param iterable $input
-     * @param iterable $expected
      */
-    public function testArrayFlattening($input, $expected): void
+    public function testArrayFlattening(array $input, array $expected): void
     {
         $this->assertSame($expected, array_flatten_with_dots($input));
     }
@@ -452,24 +449,22 @@ public function arrayFlattenProvider(): iterable
             ],
             [
                 'foo'      => 'bar',
+                'baz'      => [],
                 'bar.fizz' => 'buzz',
                 'bar.nope' => 'yeah',
+                'bar.why'  => [],
             ],
         ];
 
-        yield 'with-mixed-empty' => [
+        yield 'with-empty-string-index' => [
             [
                 'foo' => 1,
                 ''    => [
                     'bar' => 2,
                     'baz' => 3,
                 ],
-                0 => [
-                    'fizz' => 4,
-                ],
-                1 => [
-                    'buzz' => 5,
-                ],
+                ['fizz' => 4],
+                ['buzz' => 5],
             ],
             [
                 'foo'    => 1,
@@ -479,5 +474,18 @@ public function arrayFlattenProvider(): iterable
                 '1.buzz' => 5,
             ],
         ];
+
+        yield 'empty-array-and-lists' => [
+            [
+                'bar' => [
+                    ['foo' => 'baz'],
+                    ['foo' => []],
+                ],
+            ],
+            [
+                'bar.0.foo' => 'baz',
+                'bar.1.foo' => [],
+            ],
+        ];
     }
 }

From d02d8e4af905e44880d209b82d509625b4b8b314 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 13:51:16 +0900
Subject: [PATCH 1239/2325] feat: copy MySQLi to OCI8.

---
 system/Database/OCI8/Builder.php       |  76 +++
 system/Database/OCI8/Connection.php    | 731 +++++++++++++++++++++++++
 system/Database/OCI8/Forge.php         | 271 +++++++++
 system/Database/OCI8/PreparedQuery.php | 136 +++++
 system/Database/OCI8/Result.php        | 172 ++++++
 system/Database/OCI8/Utils.php         |  79 +++
 6 files changed, 1465 insertions(+)
 create mode 100644 system/Database/OCI8/Builder.php
 create mode 100644 system/Database/OCI8/Connection.php
 create mode 100644 system/Database/OCI8/Forge.php
 create mode 100644 system/Database/OCI8/PreparedQuery.php
 create mode 100644 system/Database/OCI8/Result.php
 create mode 100644 system/Database/OCI8/Utils.php

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
new file mode 100644
index 000000000000..23f14ea7e33c
--- /dev/null
+++ b/system/Database/OCI8/Builder.php
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2014-2019 British Columbia Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package    CodeIgniter
+ * @author     CodeIgniter Dev Team
+ * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
+ * @license    https://opensource.org/licenses/MIT	MIT License
+ * @link       https://codeigniter.com
+ * @since      Version 4.0.0
+ * @filesource
+ */
+
+namespace CodeIgniter\Database\MySQLi;
+
+use CodeIgniter\Database\BaseBuilder;
+
+/**
+ * Builder for MySQLi
+ */
+class Builder extends BaseBuilder
+{
+
+	/**
+	 * Identifier escape character
+	 *
+	 * @var string
+	 */
+	protected $escapeChar = '`';
+
+	/**
+	 * FROM tables
+	 *
+	 * Groups tables in FROM clauses if needed, so there is no confusion
+	 * about operator precedence.
+	 *
+	 * Note: This is only used (and overridden) by MySQL.
+	 *
+	 * @return string
+	 */
+	protected function _fromTables(): string
+	{
+		if ( ! empty($this->QBJoin) && count($this->QBFrom) > 1)
+		{
+			return '('.implode(', ', $this->QBFrom).')';
+		}
+
+		return implode(', ', $this->QBFrom);
+	}
+
+}
diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
new file mode 100644
index 000000000000..059c86009324
--- /dev/null
+++ b/system/Database/OCI8/Connection.php
@@ -0,0 +1,731 @@
+<?php
+
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2014-2019 British Columbia Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package    CodeIgniter
+ * @author     CodeIgniter Dev Team
+ * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
+ * @license    https://opensource.org/licenses/MIT	MIT License
+ * @link       https://codeigniter.com
+ * @since      Version 4.0.0
+ * @filesource
+ */
+
+namespace CodeIgniter\Database\MySQLi;
+
+use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Database\ConnectionInterface;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+
+/**
+ * Connection for MySQLi
+ */
+class Connection extends BaseConnection implements ConnectionInterface
+{
+	/**
+	 * Database driver
+	 *
+	 * @var string
+	 */
+	public $DBDriver = 'MySQLi';
+	/**
+	 * DELETE hack flag
+	 *
+	 * Whether to use the MySQL "delete hack" which allows the number
+	 * of affected rows to be shown. Uses a preg_replace when enabled,
+	 * adding a bit more processing to all queries.
+	 *
+	 * @var boolean
+	 */
+	public $deleteHack = true;
+	// --------------------------------------------------------------------
+	/**
+	 * Identifier escape character
+	 *
+	 * @var string
+	 */
+	public $escapeChar = '`';
+	// --------------------------------------------------------------------
+	/**
+	 * MySQLi object
+	 *
+	 * Has to be preserved without being assigned to $conn_id.
+	 *
+	 * @var \MySQLi
+	 */
+	public $mysqli;
+	//--------------------------------------------------------------------
+
+	/**
+	 * Connect to the database.
+	 *
+	 * @param boolean $persistent
+	 *
+	 * @return mixed
+	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 */
+	public function connect(bool $persistent = false)
+	{
+		// Do we have a socket path?
+		if ($this->hostname[0] === '/')
+		{
+			$hostname = null;
+			$port     = null;
+			$socket   = $this->hostname;
+		}
+		else
+		{
+			$hostname = ($persistent === true) ? 'p:' . $this->hostname : $this->hostname;
+			$port     = empty($this->port) ? null : $this->port;
+			$socket   = null;
+		}
+
+		$client_flags = ($this->compress === true) ? MYSQLI_CLIENT_COMPRESS : 0;
+		$this->mysqli = mysqli_init();
+
+		mysqli_report(MYSQLI_REPORT_ALL & ~MYSQLI_REPORT_INDEX);
+
+		$this->mysqli->options(MYSQLI_OPT_CONNECT_TIMEOUT, 10);
+
+		if (isset($this->strictOn))
+		{
+			if ($this->strictOn)
+			{
+				$this->mysqli->options(MYSQLI_INIT_COMMAND,
+					'SET SESSION sql_mode = CONCAT(@@sql_mode, ",", "STRICT_ALL_TABLES")');
+			}
+			else
+			{
+				$this->mysqli->options(MYSQLI_INIT_COMMAND, 'SET SESSION sql_mode =
+						REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(
+												@@sql_mode,
+												"STRICT_ALL_TABLES,", ""),
+											",STRICT_ALL_TABLES", ""),
+										"STRICT_ALL_TABLES", ""),
+									"STRICT_TRANS_TABLES,", ""),
+								",STRICT_TRANS_TABLES", ""),
+							"STRICT_TRANS_TABLES", "")'
+				);
+			}
+		}
+
+		if (is_array($this->encrypt))
+		{
+			$ssl                                                  = [];
+			empty($this->encrypt['ssl_key']) || $ssl['key']       = $this->encrypt['ssl_key'];
+			empty($this->encrypt['ssl_cert']) || $ssl['cert']     = $this->encrypt['ssl_cert'];
+			empty($this->encrypt['ssl_ca']) || $ssl['ca']         = $this->encrypt['ssl_ca'];
+			empty($this->encrypt['ssl_capath']) || $ssl['capath'] = $this->encrypt['ssl_capath'];
+			empty($this->encrypt['ssl_cipher']) || $ssl['cipher'] = $this->encrypt['ssl_cipher'];
+
+			if (! empty($ssl))
+			{
+				if (isset($this->encrypt['ssl_verify']))
+				{
+					if ($this->encrypt['ssl_verify'])
+					{
+						defined('MYSQLI_OPT_SSL_VERIFY_SERVER_CERT') &&
+						$this->mysqli->options(MYSQLI_OPT_SSL_VERIFY_SERVER_CERT, true);
+					}
+					// Apparently (when it exists), setting MYSQLI_OPT_SSL_VERIFY_SERVER_CERT
+					// to FALSE didn't do anything, so PHP 5.6.16 introduced yet another
+					// constant ...
+					//
+					// https://secure.php.net/ChangeLog-5.php#5.6.16
+					// https://bugs.php.net/bug.php?id=68344
+					elseif (defined('MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT') && version_compare($this->mysqli->client_info, '5.6', '>='))
+					{
+						$client_flags += MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT;
+					}
+				}
+
+				$client_flags += MYSQLI_CLIENT_SSL;
+				$this->mysqli->ssl_set(
+					$ssl['key'] ?? null, $ssl['cert'] ?? null, $ssl['ca'] ?? null,
+					$ssl['capath'] ?? null, $ssl['cipher'] ?? null
+				);
+			}
+		}
+
+		try
+		{
+			if ($this->mysqli->real_connect($hostname, $this->username, $this->password,
+				$this->database, $port, $socket, $client_flags)
+			)
+			{
+				// Prior to version 5.7.3, MySQL silently downgrades to an unencrypted connection if SSL setup fails
+				if (($client_flags & MYSQLI_CLIENT_SSL) && version_compare($this->mysqli->client_info, '5.7.3', '<=')
+					&& empty($this->mysqli->query("SHOW STATUS LIKE 'ssl_cipher'")
+										  ->fetch_object()->Value)
+				)
+				{
+					$this->mysqli->close();
+					$message = 'MySQLi was configured for an SSL connection, but got an unencrypted connection instead!';
+					log_message('error', $message);
+
+					if ($this->DBDebug)
+					{
+						throw new DatabaseException($message);
+					}
+
+					return false;
+				}
+
+				if (! $this->mysqli->set_charset($this->charset))
+				{
+					log_message('error',
+						"Database: Unable to set the configured connection charset ('{$this->charset}').");
+					$this->mysqli->close();
+
+					if ($this->db->debug)
+					{
+						throw new DatabaseException('Unable to set client connection character set: ' . $this->charset);
+					}
+
+					return false;
+				}
+
+				return $this->mysqli;
+			}
+		}
+		catch (\Throwable $e)
+		{
+			// Clean sensitive information from errors.
+			$msg = $e->getMessage();
+
+			$msg = str_replace($this->username, '****', $msg);
+			$msg = str_replace($this->password, '****', $msg);
+
+			throw new \mysqli_sql_exception($msg, $e->getCode(), $e);
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Keep or establish the connection if no queries have been sent for
+	 * a length of time exceeding the server's idle timeout.
+	 *
+	 * @return void
+	 */
+	public function reconnect()
+	{
+		$this->close();
+		$this->initialize();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Close the database connection.
+	 *
+	 * @return void
+	 */
+	protected function _close()
+	{
+		$this->connID->close();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Select a specific database table to use.
+	 *
+	 * @param string $databaseName
+	 *
+	 * @return boolean
+	 */
+	public function setDatabase(string $databaseName): bool
+	{
+		if ($databaseName === '')
+		{
+			$databaseName = $this->database;
+		}
+
+		if (empty($this->connID))
+		{
+			$this->initialize();
+		}
+
+		if ($this->connID->select_db($databaseName))
+		{
+			$this->database = $databaseName;
+
+			return true;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns a string containing the version of the database being used.
+	 *
+	 * @return string
+	 */
+	public function getVersion(): string
+	{
+		if (isset($this->dataCache['version']))
+		{
+			return $this->dataCache['version'];
+		}
+
+		if (empty($this->mysqli))
+		{
+			$this->initialize();
+		}
+
+		return $this->dataCache['version'] = $this->mysqli->server_info;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Executes the query against the database.
+	 *
+	 * @param string $sql
+	 *
+	 * @return mixed
+	 */
+	public function execute(string $sql)
+	{
+		while ($this->connID->more_results())
+		{
+			$this->connID->next_result();
+			if ($res = $this->connID->store_result())
+			{
+				$res->free();
+			}
+		}
+
+		return $this->connID->query($this->prepQuery($sql));
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Prep the query
+	 *
+	 * If needed, each database adapter can prep the query string
+	 *
+	 * @param string $sql an SQL query
+	 *
+	 * @return string
+	 */
+	protected function prepQuery(string $sql): string
+	{
+		// mysqli_affected_rows() returns 0 for "DELETE FROM TABLE" queries. This hack
+		// modifies the query so that it a proper number of affected rows is returned.
+		if ($this->deleteHack === true && preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $sql))
+		{
+			return trim($sql) . ' WHERE 1=1';
+		}
+
+		return $sql;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the total number of rows affected by this query.
+	 *
+	 * @return integer
+	 */
+	public function affectedRows(): int
+	{
+		return $this->connID->affected_rows ?? 0;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Platform-dependant string escape
+	 *
+	 * @param  string $str
+	 * @return string
+	 */
+	protected function _escapeString(string $str): string
+	{
+		if (is_bool($str))
+		{
+			return $str;
+		}
+
+		if (! $this->connID)
+		{
+			$this->initialize();
+		}
+
+		return $this->connID->real_escape_string($str);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Escape Like String Direct
+	 * There are a few instances where MySQLi queries cannot take the
+	 * additional "ESCAPE x" parameter for specifying the escape character
+	 * in "LIKE" strings, and this handles those directly with a backslash.
+	 *
+	 * @param  string|string[] $str  Input string
+	 * @return string|string[]
+	 */
+	public function escapeLikeStringDirect($str)
+	{
+		if (is_array($str))
+		{
+			foreach ($str as $key => $val)
+			{
+				$str[$key] = $this->escapeLikeStringDirect($val);
+			}
+
+			return $str;
+		}
+
+		$str = $this->_escapeString($str);
+
+		// Escape LIKE condition wildcards
+		return str_replace([
+			$this->likeEscapeChar,
+			'%',
+			'_',
+		], [
+			'\\' . $this->likeEscapeChar,
+			'\\' . '%',
+			'\\' . '_',
+		], $str
+		);
+
+		return $str;
+	}
+
+	//--------------------------------------------------------------------
+	
+	/**
+	 * Generates the SQL for listing tables in a platform-dependent manner.
+	 * Uses escapeLikeStringDirect().
+	 *
+	 * @param boolean $prefixLimit
+	 *
+	 * @return string
+	 */
+	protected function _listTables(bool $prefixLimit = false): string
+	{
+		$sql = 'SHOW TABLES FROM ' . $this->escapeIdentifiers($this->database);
+
+		if ($prefixLimit !== false && $this->DBPrefix !== '')
+		{
+			return $sql . " LIKE '" . $this->escapeLikeStringDirect($this->DBPrefix) . "%'";
+		}
+
+		return $sql;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates a platform-specific query string so that the column names can be fetched.
+	 *
+	 * @param string $table
+	 *
+	 * @return string
+	 */
+	protected function _listColumns(string $table = ''): string
+	{
+		return 'SHOW COLUMNS FROM ' . $this->protectIdentifiers($table, true, null, false);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of objects with field data
+	 *
+	 * @param  string $table
+	 * @return \stdClass[]
+	 * @throws DatabaseException
+	 */
+	public function _fieldData(string $table): array
+	{
+		$table = $this->protectIdentifiers($table, true, null, false);
+
+		if (($query = $this->query('SHOW COLUMNS FROM ' . $table)) === false)
+		{
+			throw new DatabaseException(lang('Database.failGetFieldData'));
+		}
+		$query = $query->getResultObject();
+
+		$retVal = [];
+		for ($i = 0, $c = count($query); $i < $c; $i++)
+		{
+			$retVal[$i]       = new \stdClass();
+			$retVal[$i]->name = $query[$i]->Field;
+
+			sscanf($query[$i]->Type, '%[a-z](%d)', $retVal[$i]->type, $retVal[$i]->max_length);
+
+			$retVal[$i]->default     = $query[$i]->Default;
+			$retVal[$i]->primary_key = (int)($query[$i]->Key === 'PRI');
+		}
+
+		return $retVal;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of objects with index data
+	 *
+	 * @param  string $table
+	 * @return \stdClass[]
+	 * @throws DatabaseException
+	 * @throws \LogicException
+	 */
+	public function _indexData(string $table): array
+	{
+		$table = $this->protectIdentifiers($table, true, null, false);
+
+		if (($query = $this->query('SHOW INDEX FROM ' . $table)) === false)
+		{
+			throw new DatabaseException(lang('Database.failGetIndexData'));
+		}
+
+		if (! $indexes = $query->getResultArray())
+		{
+			return [];
+		}
+
+		$keys = [];
+
+		foreach ($indexes as $index)
+		{
+			if (empty($keys[$index['Key_name']]))
+			{
+				$keys[$index['Key_name']]       = new \stdClass();
+				$keys[$index['Key_name']]->name = $index['Key_name'];
+
+				if ($index['Key_name'] === 'PRIMARY')
+				{
+					$type = 'PRIMARY';
+				}
+				elseif ($index['Index_type'] === 'FULLTEXT')
+				{
+					$type = 'FULLTEXT';
+				}
+				elseif ($index['Non_unique'])
+				{
+					if ($index['Index_type'] === 'SPATIAL')
+					{
+						$type = 'SPATIAL';
+					}
+					else
+					{
+						$type = 'INDEX';
+					}
+				}
+				else
+				{
+					$type = 'UNIQUE';
+				}
+
+				$keys[$index['Key_name']]->type = $type;
+			}
+
+			$keys[$index['Key_name']]->fields[] = $index['Column_name'];
+		}
+
+		return $keys;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns an array of objects with Foreign key data
+	 *
+	 * @param  string $table
+	 * @return \stdClass[]
+	 * @throws DatabaseException
+	 */
+	public function _foreignKeyData(string $table): array
+	{
+		$sql = '
+                    SELECT
+                        tc.CONSTRAINT_NAME,
+                        tc.TABLE_NAME,
+                        kcu.COLUMN_NAME,
+                        rc.REFERENCED_TABLE_NAME,
+                        kcu.REFERENCED_COLUMN_NAME
+                    FROM information_schema.TABLE_CONSTRAINTS AS tc
+                    INNER JOIN information_schema.REFERENTIAL_CONSTRAINTS AS rc
+                        ON tc.CONSTRAINT_NAME = rc.CONSTRAINT_NAME
+                    INNER JOIN information_schema.KEY_COLUMN_USAGE AS kcu
+                        ON tc.CONSTRAINT_NAME = kcu.CONSTRAINT_NAME
+                    WHERE
+                        tc.CONSTRAINT_TYPE = ' . $this->escape('FOREIGN KEY') . ' AND
+                        tc.TABLE_SCHEMA = ' . $this->escape($this->database) . ' AND
+                        tc.TABLE_NAME = ' . $this->escape($table);
+
+		if (($query = $this->query($sql)) === false)
+		{
+			throw new DatabaseException(lang('Database.failGetForeignKeyData'));
+		}
+		$query = $query->getResultObject();
+
+		$retVal = [];
+		foreach ($query as $row)
+		{
+			$obj                      = new \stdClass();
+			$obj->constraint_name     = $row->CONSTRAINT_NAME;
+			$obj->table_name          = $row->TABLE_NAME;
+			$obj->column_name         = $row->COLUMN_NAME;
+			$obj->foreign_table_name  = $row->REFERENCED_TABLE_NAME;
+			$obj->foreign_column_name = $row->REFERENCED_COLUMN_NAME;
+
+			$retVal[] = $obj;
+		}
+
+		return $retVal;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns platform-specific SQL to disable foreign key checks.
+	 *
+	 * @return string
+	 */
+	protected function _disableForeignKeyChecks()
+	{
+		return 'SET FOREIGN_KEY_CHECKS=0';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns platform-specific SQL to enable foreign key checks.
+	 *
+	 * @return string
+	 */
+	protected function _enableForeignKeyChecks()
+	{
+		return 'SET FOREIGN_KEY_CHECKS=1';
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the last error code and message.
+	 *
+	 * Must return an array with keys 'code' and 'message':
+	 *
+	 *  return ['code' => null, 'message' => null);
+	 *
+	 * @return array
+	 */
+	public function error(): array
+	{
+		if (! empty($this->mysqli->connect_errno))
+		{
+			return [
+				'code'    => $this->mysqli->connect_errno,
+				'message' => $this->mysqli->connect_error,
+			];
+		}
+
+		return [
+			'code'    => $this->connID->errno,
+			'message' => $this->connID->error,
+		];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Insert ID
+	 *
+	 * @return integer
+	 */
+	public function insertID(): int
+	{
+		return $this->connID->insert_id;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Begin Transaction
+	 *
+	 * @return boolean
+	 */
+	protected function _transBegin(): bool
+	{
+		$this->connID->autocommit(false);
+
+		return $this->connID->begin_transaction();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Commit Transaction
+	 *
+	 * @return boolean
+	 */
+	protected function _transCommit(): bool
+	{
+		if ($this->connID->commit())
+		{
+			$this->connID->autocommit(true);
+
+			return true;
+		}
+
+		return false;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Rollback Transaction
+	 *
+	 * @return boolean
+	 */
+	protected function _transRollback(): bool
+	{
+		if ($this->connID->rollback())
+		{
+			$this->connID->autocommit(true);
+
+			return true;
+		}
+
+		return false;
+	}
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
new file mode 100644
index 000000000000..52168afde4c9
--- /dev/null
+++ b/system/Database/OCI8/Forge.php
@@ -0,0 +1,271 @@
+<?php
+
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2014-2019 British Columbia Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package    CodeIgniter
+ * @author     CodeIgniter Dev Team
+ * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
+ * @license    https://opensource.org/licenses/MIT	MIT License
+ * @link       https://codeigniter.com
+ * @since      Version 4.0.0
+ * @filesource
+ */
+
+namespace CodeIgniter\Database\MySQLi;
+
+/**
+ * Forge for MySQLi
+ */
+class Forge extends \CodeIgniter\Database\Forge
+{
+
+	/**
+	 * CREATE DATABASE statement
+	 *
+	 * @var string
+	 */
+	protected $createDatabaseStr = 'CREATE DATABASE %s CHARACTER SET %s COLLATE %s';
+
+	/**
+	 * DROP CONSTRAINT statement
+	 *
+	 * @var string
+	 */
+	protected $dropConstraintStr = 'ALTER TABLE %s DROP FOREIGN KEY %s';
+
+	/**
+	 * CREATE TABLE keys flag
+	 *
+	 * Whether table keys are created from within the
+	 * CREATE TABLE statement.
+	 *
+	 * @var boolean
+	 */
+	protected $createTableKeys = true;
+
+	/**
+	 * UNSIGNED support
+	 *
+	 * @var array
+	 */
+	protected $_unsigned = [
+		'TINYINT',
+		'SMALLINT',
+		'MEDIUMINT',
+		'INT',
+		'INTEGER',
+		'BIGINT',
+		'REAL',
+		'DOUBLE',
+		'DOUBLE PRECISION',
+		'FLOAT',
+		'DECIMAL',
+		'NUMERIC',
+	];
+
+	/**
+	 * Table Options list which required to be quoted
+	 *
+	 * @var array
+	 */
+	protected $_quoted_table_options = [
+		'COMMENT',
+		'COMPRESSION',
+		'CONNECTION',
+		'DATA DIRECTORY',
+		'INDEX DIRECTORY',
+		'ENCRYPTION',
+		'PASSWORD',
+	];
+
+	/**
+	 * NULL value representation in CREATE/ALTER TABLE statements
+	 *
+	 * @var string
+	 */
+	protected $_null = 'NULL';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * CREATE TABLE attributes
+	 *
+	 * @param  array $attributes Associative array of table attributes
+	 * @return string
+	 */
+	protected function _createTableAttributes(array $attributes): string
+	{
+		$sql = '';
+
+		foreach (array_keys($attributes) as $key)
+		{
+			if (is_string($key))
+			{
+				$sql .= ' ' . strtoupper($key) . ' = ';
+
+				if (in_array(strtoupper($key), $this->_quoted_table_options))
+				{
+					$sql .= $this->db->escape($attributes[$key]);
+				}
+				else
+				{
+					$sql .= $this->db->escapeString($attributes[$key]);
+				}
+			}
+		}
+
+		if (! empty($this->db->charset) && ! strpos($sql, 'CHARACTER SET') && ! strpos($sql, 'CHARSET'))
+		{
+			$sql .= ' DEFAULT CHARACTER SET = ' . $this->db->escapeString($this->db->charset);
+		}
+
+		if (! empty($this->db->DBCollat) && ! strpos($sql, 'COLLATE'))
+		{
+			$sql .= ' COLLATE = ' . $this->db->escapeString($this->db->DBCollat);
+		}
+
+		return $sql;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * ALTER TABLE
+	 *
+	 * @param  string $alter_type ALTER type
+	 * @param  string $table      Table name
+	 * @param  mixed  $field      Column definition
+	 * @return string|string[]
+	 */
+	protected function _alterTable(string $alter_type, string $table, $field)
+	{
+		if ($alter_type === 'DROP')
+		{
+			return parent::_alterTable($alter_type, $table, $field);
+		}
+
+		$sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
+		foreach ($field as $i => $data)
+		{
+			if ($data['_literal'] !== false)
+			{
+				$field[$i] = ($alter_type === 'ADD') ? "\n\tADD " . $data['_literal'] : "\n\tMODIFY " . $data['_literal'];
+			}
+			else
+			{
+				if ($alter_type === 'ADD')
+				{
+					$field[$i]['_literal'] = "\n\tADD ";
+				}
+				else
+				{
+					$field[$i]['_literal'] = empty($data['new_name']) ? "\n\tMODIFY " : "\n\tCHANGE ";
+				}
+
+				$field[$i] = $field[$i]['_literal'] . $this->_processColumn($field[$i]);
+			}
+		}
+
+		return [$sql . implode(',', $field)];
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Process column
+	 *
+	 * @param  array $field
+	 * @return string
+	 */
+	protected function _processColumn(array $field): string
+	{
+		$extra_clause = isset($field['after']) ? ' AFTER ' . $this->db->escapeIdentifiers($field['after']) : '';
+
+		if (empty($extra_clause) && isset($field['first']) && $field['first'] === true)
+		{
+			$extra_clause = ' FIRST';
+		}
+
+		return $this->db->escapeIdentifiers($field['name'])
+				. (empty($field['new_name']) ? '' : ' ' . $this->db->escapeIdentifiers($field['new_name']))
+				. ' ' . $field['type'] . $field['length']
+				. $field['unsigned']
+				. $field['null']
+				. $field['default']
+				. $field['auto_increment']
+				. $field['unique']
+				. (empty($field['comment']) ? '' : ' COMMENT ' . $field['comment'])
+				. $extra_clause;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Process indexes
+	 *
+	 * @param  string $table (ignored)
+	 * @return string
+	 */
+	protected function _processIndexes(string $table): string
+	{
+		$sql = '';
+
+		for ($i = 0, $c = count($this->keys); $i < $c; $i ++)
+		{
+			if (is_array($this->keys[$i]))
+			{
+				for ($i2 = 0, $c2 = count($this->keys[$i]); $i2 < $c2; $i2 ++)
+				{
+					if (! isset($this->fields[$this->keys[$i][$i2]]))
+					{
+						unset($this->keys[$i][$i2]);
+						continue;
+					}
+				}
+			}
+			elseif (! isset($this->fields[$this->keys[$i]]))
+			{
+				unset($this->keys[$i]);
+				continue;
+			}
+
+			is_array($this->keys[$i]) || $this->keys[$i] = [$this->keys[$i]];
+
+			$unique = in_array($i, $this->uniqueKeys) ? 'UNIQUE ' : '';
+
+			$sql .= ",\n\t{$unique}KEY " . $this->db->escapeIdentifiers(implode('_', $this->keys[$i]))
+				. ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ')';
+		}
+
+		$this->keys = [];
+
+		return $sql;
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/OCI8/PreparedQuery.php b/system/Database/OCI8/PreparedQuery.php
new file mode 100644
index 000000000000..a510a3702877
--- /dev/null
+++ b/system/Database/OCI8/PreparedQuery.php
@@ -0,0 +1,136 @@
+<?php
+
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2014-2019 British Columbia Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package    CodeIgniter
+ * @author     CodeIgniter Dev Team
+ * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
+ * @license    https://opensource.org/licenses/MIT	MIT License
+ * @link       https://codeigniter.com
+ * @since      Version 4.0.0
+ * @filesource
+ */
+
+namespace CodeIgniter\Database\MySQLi;
+
+use CodeIgniter\Database\PreparedQueryInterface;
+use CodeIgniter\Database\BasePreparedQuery;
+
+/**
+ * Prepared query for MySQLi
+ */
+class PreparedQuery extends BasePreparedQuery implements PreparedQueryInterface
+{
+
+	/**
+	 * Prepares the query against the database, and saves the connection
+	 * info necessary to execute the query later.
+	 *
+	 * NOTE: This version is based on SQL code. Child classes should
+	 * override this method.
+	 *
+	 * @param string $sql
+	 * @param array  $options Passed to the connection's prepare statement.
+	 *                        Unused in the MySQLi driver.
+	 *
+	 * @return mixed
+	 */
+	public function _prepare(string $sql, array $options = [])
+	{
+		// Mysqli driver doesn't like statements
+		// with terminating semicolons.
+		$sql = rtrim($sql, ';');
+
+		if (! $this->statement = $this->db->mysqli->prepare($sql))
+		{
+			$this->errorCode   = $this->db->mysqli->errno;
+			$this->errorString = $this->db->mysqli->error;
+		}
+
+		return $this;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Takes a new set of data and runs it against the currently
+	 * prepared query. Upon success, will return a Results object.
+	 *
+	 * @param array $data
+	 *
+	 * @return boolean
+	 */
+	public function _execute(array $data): bool
+	{
+		if (is_null($this->statement))
+		{
+			throw new \BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
+		}
+
+		// First off -bind the parameters
+		$bindTypes = '';
+
+		// Determine the type string
+		foreach ($data as $item)
+		{
+			if (is_integer($item))
+			{
+				$bindTypes .= 'i';
+			}
+			elseif (is_numeric($item))
+			{
+				$bindTypes .= 'd';
+			}
+			else
+			{
+				$bindTypes .= 's';
+			}
+		}
+
+		// Bind it
+		$this->statement->bind_param($bindTypes, ...$data);
+
+		$success = $this->statement->execute();
+
+		return $success;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the result object for the prepared query.
+	 *
+	 * @return mixed
+	 */
+	public function _getResult()
+	{
+		return $this->statement->get_result();
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php
new file mode 100644
index 000000000000..630a4f7f3788
--- /dev/null
+++ b/system/Database/OCI8/Result.php
@@ -0,0 +1,172 @@
+<?php
+
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2014-2019 British Columbia Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package    CodeIgniter
+ * @author     CodeIgniter Dev Team
+ * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
+ * @license    https://opensource.org/licenses/MIT	MIT License
+ * @link       https://codeigniter.com
+ * @since      Version 4.0.0
+ * @filesource
+ */
+
+namespace CodeIgniter\Database\MySQLi;
+
+use CodeIgniter\Database\BaseResult;
+use CodeIgniter\Database\ResultInterface;
+use CodeIgniter\Entity;
+
+/**
+ * Result for MySQLi
+ */
+class Result extends BaseResult implements ResultInterface
+{
+
+	/**
+	 * Gets the number of fields in the result set.
+	 *
+	 * @return integer
+	 */
+	public function getFieldCount(): int
+	{
+		return $this->resultID->field_count;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates an array of column names in the result set.
+	 *
+	 * @return array
+	 */
+	public function getFieldNames(): array
+	{
+		$fieldNames = [];
+		$this->resultID->field_seek(0);
+		while ($field = $this->resultID->fetch_field())
+		{
+			$fieldNames[] = $field->name;
+		}
+
+		return $fieldNames;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Generates an array of objects representing field meta-data.
+	 *
+	 * @return array
+	 */
+	public function getFieldData(): array
+	{
+		$retVal    = [];
+		$fieldData = $this->resultID->fetch_fields();
+
+		foreach ($fieldData as $i => $data)
+		{
+			$retVal[$i]              = new \stdClass();
+			$retVal[$i]->name        = $data->name;
+			$retVal[$i]->type        = $data->type;
+			$retVal[$i]->max_length  = $data->max_length;
+			$retVal[$i]->primary_key = (int) ($data->flags & 2);
+			$retVal[$i]->default     = $data->def;
+		}
+
+		return $retVal;
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Frees the current result.
+	 *
+	 * @return void
+	 */
+	public function freeResult()
+	{
+		if (is_object($this->resultID))
+		{
+			$this->resultID->free();
+			$this->resultID = false;
+		}
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Moves the internal pointer to the desired offset. This is called
+	 * internally before fetching results to make sure the result set
+	 * starts at zero.
+	 *
+	 * @param integer $n
+	 *
+	 * @return mixed
+	 */
+	public function dataSeek(int $n = 0)
+	{
+		return $this->resultID->data_seek($n);
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the result set as an array.
+	 *
+	 * Overridden by driver classes.
+	 *
+	 * @return mixed
+	 */
+	protected function fetchAssoc()
+	{
+		return $this->resultID->fetch_assoc();
+	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Returns the result set as an object.
+	 *
+	 * Overridden by child classes.
+	 *
+	 * @param string $className
+	 *
+	 * @return object|boolean|Entity
+	 */
+	protected function fetchObject(string $className = 'stdClass')
+	{
+		if (is_subclass_of($className, Entity::class))
+		{
+			return empty($data = $this->fetchAssoc()) ? false : (new $className())->setAttributes($data);
+		}
+		return $this->resultID->fetch_object($className);
+	}
+
+	//--------------------------------------------------------------------
+}
diff --git a/system/Database/OCI8/Utils.php b/system/Database/OCI8/Utils.php
new file mode 100644
index 000000000000..5ebe7fbb9f1b
--- /dev/null
+++ b/system/Database/OCI8/Utils.php
@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP
+ *
+ * This content is released under the MIT License (MIT)
+ *
+ * Copyright (c) 2014-2019 British Columbia Institute of Technology
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package    CodeIgniter
+ * @author     CodeIgniter Dev Team
+ * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
+ * @license    https://opensource.org/licenses/MIT	MIT License
+ * @link       https://codeigniter.com
+ * @since      Version 4.0.0
+ * @filesource
+ */
+
+namespace CodeIgniter\Database\MySQLi;
+
+use CodeIgniter\Database\BaseUtils;
+use CodeIgniter\Database\Exceptions\DatabaseException;
+
+/**
+ * Utils for MySQLi
+ */
+class Utils extends BaseUtils
+{
+
+	/**
+	 * List databases statement
+	 *
+	 * @var string
+	 */
+	protected $listDatabases = 'SHOW DATABASES';
+
+	/**
+	 * OPTIMIZE TABLE statement
+	 *
+	 * @var string
+	 */
+	protected $optimizeTable = 'OPTIMIZE TABLE %s';
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Platform dependent version of the backup function.
+	 *
+	 * @param array|null $prefs
+	 *
+	 * @return mixed
+	 */
+	public function _backup(array $prefs = null)
+	{
+		throw new DatabaseException('Unsupported feature of the database platform you are using.');
+	}
+
+	//--------------------------------------------------------------------
+}

From 325614c4c6d603d26c2294b458f47ec3e2904704 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 13:55:25 +0900
Subject: [PATCH 1240/2325] fix: namespace MySQLi to OCI8.

---
 system/Database/OCI8/Builder.php       | 2 +-
 system/Database/OCI8/Forge.php         | 2 +-
 system/Database/OCI8/PreparedQuery.php | 2 +-
 system/Database/OCI8/Result.php        | 4 ++--
 system/Database/OCI8/Utils.php         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 23f14ea7e33c..d81b91d074e7 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -36,7 +36,7 @@
  * @filesource
  */
 
-namespace CodeIgniter\Database\MySQLi;
+namespace CodeIgniter\Database\OCI8;
 
 use CodeIgniter\Database\BaseBuilder;
 
diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 52168afde4c9..02c132bf4a81 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -36,7 +36,7 @@
  * @filesource
  */
 
-namespace CodeIgniter\Database\MySQLi;
+namespace CodeIgniter\Database\OCI8;
 
 /**
  * Forge for MySQLi
diff --git a/system/Database/OCI8/PreparedQuery.php b/system/Database/OCI8/PreparedQuery.php
index a510a3702877..6ef0d9e7bc80 100644
--- a/system/Database/OCI8/PreparedQuery.php
+++ b/system/Database/OCI8/PreparedQuery.php
@@ -36,7 +36,7 @@
  * @filesource
  */
 
-namespace CodeIgniter\Database\MySQLi;
+namespace CodeIgniter\Database\OCI8;
 
 use CodeIgniter\Database\PreparedQueryInterface;
 use CodeIgniter\Database\BasePreparedQuery;
diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php
index 630a4f7f3788..e1cb7425f716 100644
--- a/system/Database/OCI8/Result.php
+++ b/system/Database/OCI8/Result.php
@@ -36,14 +36,14 @@
  * @filesource
  */
 
-namespace CodeIgniter\Database\MySQLi;
+namespace CodeIgniter\Database\OCI8;
 
 use CodeIgniter\Database\BaseResult;
 use CodeIgniter\Database\ResultInterface;
 use CodeIgniter\Entity;
 
 /**
- * Result for MySQLi
+ * Result for OCI
  */
 class Result extends BaseResult implements ResultInterface
 {
diff --git a/system/Database/OCI8/Utils.php b/system/Database/OCI8/Utils.php
index 5ebe7fbb9f1b..070c0d5d7348 100644
--- a/system/Database/OCI8/Utils.php
+++ b/system/Database/OCI8/Utils.php
@@ -36,7 +36,7 @@
  * @filesource
  */
 
-namespace CodeIgniter\Database\MySQLi;
+namespace CodeIgniter\Database\OCI8;
 
 use CodeIgniter\Database\BaseUtils;
 use CodeIgniter\Database\Exceptions\DatabaseException;

From 1e412ca2aef76292e78e2a10a5f87415612f7622 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 14:30:47 +0900
Subject: [PATCH 1241/2325] feat: add build DNS process.

---
 system/Database/OCI8/Connection.php | 284 +++++++++++++---------------
 1 file changed, 136 insertions(+), 148 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 059c86009324..3925337c8eee 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * CodeIgniter
  *
@@ -36,195 +35,116 @@
  * @filesource
  */
 
-namespace CodeIgniter\Database\MySQLi;
+namespace CodeIgniter\Database\OCI8;
 
 use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Database\ConnectionInterface;
 use CodeIgniter\Database\Exceptions\DatabaseException;
+use stdClass;
 
 /**
- * Connection for MySQLi
+ * Connection for Postgre
  */
 class Connection extends BaseConnection implements ConnectionInterface
 {
+
 	/**
 	 * Database driver
 	 *
 	 * @var string
 	 */
-	public $DBDriver = 'MySQLi';
-	/**
-	 * DELETE hack flag
-	 *
-	 * Whether to use the MySQL "delete hack" which allows the number
-	 * of affected rows to be shown. Uses a preg_replace when enabled,
-	 * adding a bit more processing to all queries.
-	 *
-	 * @var boolean
-	 */
-	public $deleteHack = true;
-	// --------------------------------------------------------------------
+	public $DBDriver = 'OCI8';
+
 	/**
 	 * Identifier escape character
 	 *
 	 * @var string
 	 */
-	public $escapeChar = '`';
-	// --------------------------------------------------------------------
+	public $escapeChar = '"';
+
 	/**
-	 * MySQLi object
+	 * List of reserved identifiers
 	 *
-	 * Has to be preserved without being assigned to $conn_id.
+	 * Identifiers that must NOT be escaped.
 	 *
-	 * @var \MySQLi
+	 * @var array
 	 */
-	public $mysqli;
+	protected $reservedIdentifiers = ['*', 'rownum'];
+
+	protected $validDSNs = [
+			'tns'	=> '/^\(DESCRIPTION=(\(.+\)){2,}\)$/', // TNS
+			// Easy Connect string (Oracle 10g+)
+			'ec'	=> '/^(\/\/)?[a-z0-9.:_-]+(:[1-9][0-9]{0,4})?(\/[a-z0-9$_]+)?(:[^\/])?(\/[a-z0-9$_]+)?$/i',
+			'in'	=> '/^[a-z0-9$_]+$/i' // Instance name (defined in tnsnames.ora)
+	];
+
 	//--------------------------------------------------------------------
 
 	/**
-	 * Connect to the database.
-	 *
-	 * @param boolean $persistent
+	 * Reset $stmtId flag
 	 *
-	 * @return mixed
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 * Used by storedProcedure() to prevent execute() from
+	 * re-setting the statement ID.
 	 */
-	public function connect(bool $persistent = false)
-	{
-		// Do we have a socket path?
-		if ($this->hostname[0] === '/')
-		{
-			$hostname = null;
-			$port     = null;
-			$socket   = $this->hostname;
-		}
-		else
-		{
-			$hostname = ($persistent === true) ? 'p:' . $this->hostname : $this->hostname;
-			$port     = empty($this->port) ? null : $this->port;
-			$socket   = null;
-		}
+	protected $resetStmtId = true;
 
-		$client_flags = ($this->compress === true) ? MYSQLI_CLIENT_COMPRESS : 0;
-		$this->mysqli = mysqli_init();
+	/**
+	 * Statement ID
+	 *
+	 * @var	resource
+	 */
+	public $stmtId;
 
-		mysqli_report(MYSQLI_REPORT_ALL & ~MYSQLI_REPORT_INDEX);
+	/**
+	 * Commit mode flag
+	 *
+	 * @var	int
+	 */
+	public $commitMode = OCI_COMMIT_ON_SUCCESS;
 
-		$this->mysqli->options(MYSQLI_OPT_CONNECT_TIMEOUT, 10);
+	/**
+	 * Cursor ID
+	 *
+	 * @var	resource
+	 */
+	public $cursorId;
 
-		if (isset($this->strictOn))
+	/**
+	 * confirm DNS format.
+	 *
+	 * @return bool
+	 */
+	private function isValidDSN() : bool
+	{
+		foreach ($this->validDSNs as $regexp)
 		{
-			if ($this->strictOn)
+			if (preg_match($regexp, $this->DSN))
 			{
-				$this->mysqli->options(MYSQLI_INIT_COMMAND,
-					'SET SESSION sql_mode = CONCAT(@@sql_mode, ",", "STRICT_ALL_TABLES")');
-			}
-			else
-			{
-				$this->mysqli->options(MYSQLI_INIT_COMMAND, 'SET SESSION sql_mode =
-						REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(
-												@@sql_mode,
-												"STRICT_ALL_TABLES,", ""),
-											",STRICT_ALL_TABLES", ""),
-										"STRICT_ALL_TABLES", ""),
-									"STRICT_TRANS_TABLES,", ""),
-								",STRICT_TRANS_TABLES", ""),
-							"STRICT_TRANS_TABLES", "")'
-				);
+				return true;
 			}
 		}
 
-		if (is_array($this->encrypt))
-		{
-			$ssl                                                  = [];
-			empty($this->encrypt['ssl_key']) || $ssl['key']       = $this->encrypt['ssl_key'];
-			empty($this->encrypt['ssl_cert']) || $ssl['cert']     = $this->encrypt['ssl_cert'];
-			empty($this->encrypt['ssl_ca']) || $ssl['ca']         = $this->encrypt['ssl_ca'];
-			empty($this->encrypt['ssl_capath']) || $ssl['capath'] = $this->encrypt['ssl_capath'];
-			empty($this->encrypt['ssl_cipher']) || $ssl['cipher'] = $this->encrypt['ssl_cipher'];
-
-			if (! empty($ssl))
-			{
-				if (isset($this->encrypt['ssl_verify']))
-				{
-					if ($this->encrypt['ssl_verify'])
-					{
-						defined('MYSQLI_OPT_SSL_VERIFY_SERVER_CERT') &&
-						$this->mysqli->options(MYSQLI_OPT_SSL_VERIFY_SERVER_CERT, true);
-					}
-					// Apparently (when it exists), setting MYSQLI_OPT_SSL_VERIFY_SERVER_CERT
-					// to FALSE didn't do anything, so PHP 5.6.16 introduced yet another
-					// constant ...
-					//
-					// https://secure.php.net/ChangeLog-5.php#5.6.16
-					// https://bugs.php.net/bug.php?id=68344
-					elseif (defined('MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT') && version_compare($this->mysqli->client_info, '5.6', '>='))
-					{
-						$client_flags += MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT;
-					}
-				}
-
-				$client_flags += MYSQLI_CLIENT_SSL;
-				$this->mysqli->ssl_set(
-					$ssl['key'] ?? null, $ssl['cert'] ?? null, $ssl['ca'] ?? null,
-					$ssl['capath'] ?? null, $ssl['cipher'] ?? null
-				);
-			}
-		}
+		return false;
+	}
 
-		try
+	/**
+	 * Connect to the database.
+	 *
+	 * @param  boolean $persistent
+	 * @return mixed
+	 */
+	public function connect(bool $persistent = false)
+	{
+		if (empty($this->DSN) && !$this->isValidDSN())
 		{
-			if ($this->mysqli->real_connect($hostname, $this->username, $this->password,
-				$this->database, $port, $socket, $client_flags)
-			)
-			{
-				// Prior to version 5.7.3, MySQL silently downgrades to an unencrypted connection if SSL setup fails
-				if (($client_flags & MYSQLI_CLIENT_SSL) && version_compare($this->mysqli->client_info, '5.7.3', '<=')
-					&& empty($this->mysqli->query("SHOW STATUS LIKE 'ssl_cipher'")
-										  ->fetch_object()->Value)
-				)
-				{
-					$this->mysqli->close();
-					$message = 'MySQLi was configured for an SSL connection, but got an unencrypted connection instead!';
-					log_message('error', $message);
-
-					if ($this->DBDebug)
-					{
-						throw new DatabaseException($message);
-					}
-
-					return false;
-				}
-
-				if (! $this->mysqli->set_charset($this->charset))
-				{
-					log_message('error',
-						"Database: Unable to set the configured connection charset ('{$this->charset}').");
-					$this->mysqli->close();
-
-					if ($this->db->debug)
-					{
-						throw new DatabaseException('Unable to set client connection character set: ' . $this->charset);
-					}
-
-					return false;
-				}
-
-				return $this->mysqli;
-			}
+			$this->buildDSN();
 		}
-		catch (\Throwable $e)
-		{
-			// Clean sensitive information from errors.
-			$msg = $e->getMessage();
 
-			$msg = str_replace($this->username, '****', $msg);
-			$msg = str_replace($this->password, '****', $msg);
+		$func = ($persistent === true) ? 'oci_pconnect' : 'oci_connect';
 
-			throw new \mysqli_sql_exception($msg, $e->getCode(), $e);
-		}
-
-		return false;
+		return empty($this->charset)
+			? $func($this->username, $this->password, $this->DSN)
+			: $func($this->username, $this->password, $this->DSN, $this->charset);
 	}
 
 	//--------------------------------------------------------------------
@@ -678,6 +598,74 @@ public function insertID(): int
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Build a DSN from the provided parameters
+	 *
+	 * @return void
+	 */
+	protected function buildDSN()
+	{
+		$this->DSN === '' || $this->DSN = '';
+
+		// Legacy support for TNS in the hostname configuration field
+		$this->hostname = str_replace(["\n", "\r", "\t", ' '], '', $this->hostname);
+
+		if (preg_match($this->validDSNs['tns'], $this->hostname))
+		{
+			$this->DSN = $this->hostname;
+			return;
+		}
+
+		$isEasyConnectableHostName = $this->hostname !== '' && strpos($this->hostname, '/') === FALSE && strpos($this->hostname, ':') === FALSE;
+		$easyConnectablePort = (( ! empty($this->port) && ctype_digit($this->port)) ? ':'.$this->port : '');
+		$easyConnectableDatabase = ($this->database !== '' ? '/'.ltrim($this->database, '/') : '');
+
+		if ($isEasyConnectableHostName && ($easyConnectablePort !== '' || $easyConnectableDatabase !== ''))
+		{
+			/* If the hostname field isn't empty, doesn't contain
+			 * ':' and/or '/' and if port and/or database aren't
+			 * empty, then the hostname field is most likely indeed
+			 * just a hostname. Therefore we'll try and build an
+			 * Easy Connect string from these 3 settings, assuming
+			 * that the database field is a service name.
+			 */
+			$this->DSN = $this->hostname
+				.$easyConnectablePort
+				.$easyConnectableDatabase;
+
+			if (preg_match($this->validDSNs['ec'], $this->DSN))
+			{
+				return;
+			}
+		}
+
+		/* At this point, we can only try and validate the hostname and
+		 * database fields separately as DSNs.
+		 */
+		if (preg_match($this->validDSNs['ec'], $this->hostname) OR preg_match($this->validDSNs['in'], $this->hostname))
+		{
+			$this->DSN = $this->hostname;
+			return;
+		}
+
+		$this->database = str_replace(["\n", "\r", "\t", ' '], '', $this->database);
+		foreach ($valid_dsns as $regexp)
+		{
+			if (preg_match($regexp, $this->database))
+			{
+				return;
+			}
+		}
+
+		/* Well - OK, an empty string should work as well.
+		 * PHP will try to use environment variables to
+		 * determine which Oracle instance to connect to.
+		 */
+		$this->DSN = '';
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Begin Transaction
 	 *

From 96350b8af341595cf897615976950dbd0d2f462a Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 15:40:17 +0900
Subject: [PATCH 1242/2325] style: fix style.

---
 system/Database/OCI8/Connection.php | 33 ++++++++++++++++-------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 3925337c8eee..674bc8812230 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -69,13 +69,16 @@ class Connection extends BaseConnection implements ConnectionInterface
 	 *
 	 * @var array
 	 */
-	protected $reservedIdentifiers = ['*', 'rownum'];
+	protected $reservedIdentifiers = [
+		'*',
+		'rownum',
+	];
 
 	protected $validDSNs = [
-			'tns'	=> '/^\(DESCRIPTION=(\(.+\)){2,}\)$/', // TNS
+		'tns' => '/^\(DESCRIPTION=(\(.+\)){2,}\)$/', // TNS
 			// Easy Connect string (Oracle 10g+)
-			'ec'	=> '/^(\/\/)?[a-z0-9.:_-]+(:[1-9][0-9]{0,4})?(\/[a-z0-9$_]+)?(:[^\/])?(\/[a-z0-9$_]+)?$/i',
-			'in'	=> '/^[a-z0-9$_]+$/i' // Instance name (defined in tnsnames.ora)
+		'ec'  => '/^(\/\/)?[a-z0-9.:_-]+(:[1-9][0-9]{0,4})?(\/[a-z0-9$_]+)?(:[^\/])?(\/[a-z0-9$_]+)?$/i',
+		'in'  => '/^[a-z0-9$_]+$/i',// Instance name (defined in tnsnames.ora)
 	];
 
 	//--------------------------------------------------------------------
@@ -91,28 +94,28 @@ class Connection extends BaseConnection implements ConnectionInterface
 	/**
 	 * Statement ID
 	 *
-	 * @var	resource
+	 * @var resource
 	 */
 	public $stmtId;
 
 	/**
 	 * Commit mode flag
 	 *
-	 * @var	int
+	 * @var integer
 	 */
 	public $commitMode = OCI_COMMIT_ON_SUCCESS;
 
 	/**
 	 * Cursor ID
 	 *
-	 * @var	resource
+	 * @var resource
 	 */
 	public $cursorId;
 
 	/**
 	 * confirm DNS format.
 	 *
-	 * @return bool
+	 * @return boolean
 	 */
 	private function isValidDSN() : bool
 	{
@@ -135,7 +138,7 @@ private function isValidDSN() : bool
 	 */
 	public function connect(bool $persistent = false)
 	{
-		if (empty($this->DSN) && !$this->isValidDSN())
+		if (empty($this->DSN) && ! $this->isValidDSN())
 		{
 			$this->buildDSN();
 		}
@@ -616,9 +619,9 @@ protected function buildDSN()
 			return;
 		}
 
-		$isEasyConnectableHostName = $this->hostname !== '' && strpos($this->hostname, '/') === FALSE && strpos($this->hostname, ':') === FALSE;
-		$easyConnectablePort = (( ! empty($this->port) && ctype_digit($this->port)) ? ':'.$this->port : '');
-		$easyConnectableDatabase = ($this->database !== '' ? '/'.ltrim($this->database, '/') : '');
+		$isEasyConnectableHostName = $this->hostname !== '' && strpos($this->hostname, '/') === false && strpos($this->hostname, ':') === false;
+		$easyConnectablePort       = (( ! empty($this->port) && ctype_digit($this->port)) ? ':' . $this->port : '');
+		$easyConnectableDatabase   = ($this->database !== '' ? '/' . ltrim($this->database, '/') : '');
 
 		if ($isEasyConnectableHostName && ($easyConnectablePort !== '' || $easyConnectableDatabase !== ''))
 		{
@@ -630,8 +633,8 @@ protected function buildDSN()
 			 * that the database field is a service name.
 			 */
 			$this->DSN = $this->hostname
-				.$easyConnectablePort
-				.$easyConnectableDatabase;
+				. $easyConnectablePort
+				. $easyConnectableDatabase;
 
 			if (preg_match($this->validDSNs['ec'], $this->DSN))
 			{
@@ -642,7 +645,7 @@ protected function buildDSN()
 		/* At this point, we can only try and validate the hostname and
 		 * database fields separately as DSNs.
 		 */
-		if (preg_match($this->validDSNs['ec'], $this->hostname) OR preg_match($this->validDSNs['in'], $this->hostname))
+		if (preg_match($this->validDSNs['ec'], $this->hostname) || preg_match($this->validDSNs['in'], $this->hostname))
 		{
 			$this->DSN = $this->hostname;
 			return;

From b5e028692c752aac68d103ebcb69f23819bfba2e Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 15:41:21 +0900
Subject: [PATCH 1243/2325] feat: add get forgen key data method.

---
 system/Database/OCI8/Connection.php | 41 +++++++++++++++--------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 674bc8812230..b2742ee31c12 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -497,22 +497,24 @@ public function _indexData(string $table): array
 	 */
 	public function _foreignKeyData(string $table): array
 	{
-		$sql = '
-                    SELECT
-                        tc.CONSTRAINT_NAME,
-                        tc.TABLE_NAME,
-                        kcu.COLUMN_NAME,
-                        rc.REFERENCED_TABLE_NAME,
-                        kcu.REFERENCED_COLUMN_NAME
-                    FROM information_schema.TABLE_CONSTRAINTS AS tc
-                    INNER JOIN information_schema.REFERENTIAL_CONSTRAINTS AS rc
-                        ON tc.CONSTRAINT_NAME = rc.CONSTRAINT_NAME
-                    INNER JOIN information_schema.KEY_COLUMN_USAGE AS kcu
-                        ON tc.CONSTRAINT_NAME = kcu.CONSTRAINT_NAME
-                    WHERE
-                        tc.CONSTRAINT_TYPE = ' . $this->escape('FOREIGN KEY') . ' AND
-                        tc.TABLE_SCHEMA = ' . $this->escape($this->database) . ' AND
-                        tc.TABLE_NAME = ' . $this->escape($table);
+		$sql = 'SELECT
+                 acc.constraint_name,
+                 acc.table_name,
+                 acc.column_name,
+                 ccu.table_name foreign_table_name,
+                 accu.column_name foreign_column_name
+  FROM all_cons_columns acc
+  JOIN all_constraints ac
+      ON acc.owner = ac.owner
+      AND acc.constraint_name = ac.constraint_name
+  JOIN all_constraints ccu
+      ON ac.r_owner = ccu.owner
+      AND ac.r_constraint_name = ccu.constraint_name
+  JOIN all_cons_columns accu
+      ON accu.constraint_name = ccu.constraint_name
+      AND accu.table_name = ccu.table_name
+  WHERE ac.constraint_type = ' . $this->escape('R') . '
+      AND acc.table_name = ' . $this->escape($table);
 
 		if (($query = $this->query($sql)) === false)
 		{
@@ -527,10 +529,9 @@ public function _foreignKeyData(string $table): array
 			$obj->constraint_name     = $row->CONSTRAINT_NAME;
 			$obj->table_name          = $row->TABLE_NAME;
 			$obj->column_name         = $row->COLUMN_NAME;
-			$obj->foreign_table_name  = $row->REFERENCED_TABLE_NAME;
-			$obj->foreign_column_name = $row->REFERENCED_COLUMN_NAME;
-
-			$retVal[] = $obj;
+			$obj->foreign_table_name  = $row->FOREIGN_TABLE_NAME;
+			$obj->foreign_column_name = $row->FOREIGN_COLUMN_NAME;
+			$retVal[]                 = $obj;
 		}
 
 		return $retVal;

From c6dcfda35457459075cd4f4791f4904e60f56bbe Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 15:54:57 +0900
Subject: [PATCH 1244/2325] feat: add close method.

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

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index b2742ee31c12..808fa424fdf4 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -173,7 +173,7 @@ public function reconnect()
 	 */
 	protected function _close()
 	{
-		$this->connID->close();
+		oci_close($this->connID);
 	}
 
 	//--------------------------------------------------------------------

From c4362a94ab562ee8c7d674146a32b976a16d1fa4 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 15:55:22 +0900
Subject: [PATCH 1245/2325] feat: add reconnect method.

---
 system/Database/OCI8/Connection.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 808fa424fdf4..fee3e74ec24d 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -160,8 +160,6 @@ public function connect(bool $persistent = false)
 	 */
 	public function reconnect()
 	{
-		$this->close();
-		$this->initialize();
 	}
 
 	//--------------------------------------------------------------------

From 8444672f502a618e38f5f6c6a2f61ee4caae51e0 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 15:55:40 +0900
Subject: [PATCH 1246/2325] feat: add setDatabase method.

---
 system/Database/OCI8/Connection.php | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index fee3e74ec24d..c0e5d795a4b6 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -185,23 +185,6 @@ protected function _close()
 	 */
 	public function setDatabase(string $databaseName): bool
 	{
-		if ($databaseName === '')
-		{
-			$databaseName = $this->database;
-		}
-
-		if (empty($this->connID))
-		{
-			$this->initialize();
-		}
-
-		if ($this->connID->select_db($databaseName))
-		{
-			$this->database = $databaseName;
-
-			return true;
-		}
-
 		return false;
 	}
 

From 2ec92fed353324975dc3a85b09a6ec60fc49febd Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 15:56:14 +0900
Subject: [PATCH 1247/2325] feat: add get version method.

---
 system/Database/OCI8/Connection.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index c0e5d795a4b6..b52544c839e7 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -202,12 +202,16 @@ public function getVersion(): string
 			return $this->dataCache['version'];
 		}
 
-		if (empty($this->mysqli))
+		if (! $this->connID || ($version_string = oci_server_version($this->connID)) === false)
 		{
-			$this->initialize();
+			return false;
+		}
+		elseif (preg_match('#Release\s(\d+(?:\.\d+)+)#', $version_string, $match))
+		{
+			return $this->dataCache['version'] = $match[1];
 		}
 
-		return $this->dataCache['version'] = $this->mysqli->server_info;
+		return false;
 	}
 
 	//--------------------------------------------------------------------

From 4ea5d58f48fbfc183a563c50f42dc671b5e53613 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 15:56:38 +0900
Subject: [PATCH 1248/2325] feat: add exec method.

---
 system/Database/OCI8/Connection.php | 37 +++++++----------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index b52544c839e7..f5a9f7e0a720 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -221,43 +221,22 @@ public function getVersion(): string
 	 *
 	 * @param string $sql
 	 *
-	 * @return mixed
+	 * @return resource
 	 */
 	public function execute(string $sql)
 	{
-		while ($this->connID->more_results())
+		if ($this->resetStmtId === true)
 		{
-			$this->connID->next_result();
-			if ($res = $this->connID->store_result())
+			$sql = rtrim($sql, ';');
+			if (strpos('BEGIN', ltrim($sql)) === 0)
 			{
-				$res->free();
+				$sql .= ';';
 			}
+			$this->stmtId = oci_parse($this->connID, $sql);
 		}
 
-		return $this->connID->query($this->prepQuery($sql));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Prep the query
-	 *
-	 * If needed, each database adapter can prep the query string
-	 *
-	 * @param string $sql an SQL query
-	 *
-	 * @return string
-	 */
-	protected function prepQuery(string $sql): string
-	{
-		// mysqli_affected_rows() returns 0 for "DELETE FROM TABLE" queries. This hack
-		// modifies the query so that it a proper number of affected rows is returned.
-		if ($this->deleteHack === true && preg_match('/^\s*DELETE\s+FROM\s+(\S+)\s*$/i', $sql))
-		{
-			return trim($sql) . ' WHERE 1=1';
-		}
-
-		return $sql;
+		oci_set_prefetch($this->stmtId, 1000);
+		return (oci_execute($this->stmtId, $this->commitMode)) ? $this->stmtId : false;
 	}
 
 	//--------------------------------------------------------------------

From f1c68a16fd9aa7ca49d04da088538288421f65a4 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 15:57:36 +0900
Subject: [PATCH 1249/2325] feat: add get affected rows method.

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

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index f5a9f7e0a720..443600ee7372 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -248,7 +248,7 @@ public function execute(string $sql)
 	 */
 	public function affectedRows(): int
 	{
-		return $this->connID->affected_rows ?? 0;
+		return oci_num_rows($this->stmtId);
 	}
 
 	//--------------------------------------------------------------------

From 359817fa2c32f2ad45b172e49891526f99585ff2 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 15:58:04 +0900
Subject: [PATCH 1250/2325] feat: remove escape method.

---
 system/Database/OCI8/Connection.php | 62 -----------------------------
 1 file changed, 62 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 443600ee7372..955fb75a2eef 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -253,72 +253,10 @@ public function affectedRows(): int
 
 	//--------------------------------------------------------------------
 
-	/**
-	 * Platform-dependant string escape
-	 *
-	 * @param  string $str
-	 * @return string
-	 */
-	protected function _escapeString(string $str): string
-	{
-		if (is_bool($str))
-		{
-			return $str;
-		}
-
-		if (! $this->connID)
-		{
-			$this->initialize();
-		}
-
-		return $this->connID->real_escape_string($str);
-	}
-
 	//--------------------------------------------------------------------
 
-	/**
-	 * Escape Like String Direct
-	 * There are a few instances where MySQLi queries cannot take the
-	 * additional "ESCAPE x" parameter for specifying the escape character
-	 * in "LIKE" strings, and this handles those directly with a backslash.
-	 *
-	 * @param  string|string[] $str  Input string
-	 * @return string|string[]
-	 */
-	public function escapeLikeStringDirect($str)
-	{
-		if (is_array($str))
-		{
-			foreach ($str as $key => $val)
-			{
-				$str[$key] = $this->escapeLikeStringDirect($val);
-			}
-
-			return $str;
-		}
-
-		$str = $this->_escapeString($str);
-
-		// Escape LIKE condition wildcards
-		return str_replace([
-			$this->likeEscapeChar,
-			'%',
-			'_',
-		], [
-			'\\' . $this->likeEscapeChar,
-			'\\' . '%',
-			'\\' . '_',
-		], $str
-		);
-
-		return $str;
-	}
-
-	//--------------------------------------------------------------------
-	
 	/**
 	 * Generates the SQL for listing tables in a platform-dependent manner.
-	 * Uses escapeLikeStringDirect().
 	 *
 	 * @param boolean $prefixLimit
 	 *

From bdd528c3cb605fe51a23af3c812706fc1f133156 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 15:58:30 +0900
Subject: [PATCH 1251/2325] feat: add get table list method.

---
 system/Database/OCI8/Connection.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 955fb75a2eef..b10b79a65aee 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -264,11 +264,12 @@ public function affectedRows(): int
 	 */
 	protected function _listTables(bool $prefixLimit = false): string
 	{
-		$sql = 'SHOW TABLES FROM ' . $this->escapeIdentifiers($this->database);
+		$sql = 'SELECT "TABLE_NAME" FROM "USER_TABLES"';
 
 		if ($prefixLimit !== false && $this->DBPrefix !== '')
 		{
-			return $sql . " LIKE '" . $this->escapeLikeStringDirect($this->DBPrefix) . "%'";
+			return $sql . ' WHERE "TABLE_NAME" LIKE \'' . $this->escapeLikeString($this->DBPrefix) . "%' "
+					. sprintf($this->likeEscapeStr, $this->likeEscapeChar);
 		}
 
 		return $sql;

From e43a5f2881aca3cddf633a0a3c273cdebc3cd30b Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 15:59:01 +0900
Subject: [PATCH 1252/2325] feat: add column list method.

---
 system/Database/OCI8/Connection.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index b10b79a65aee..580b6fe79f37 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -286,7 +286,18 @@ protected function _listTables(bool $prefixLimit = false): string
 	 */
 	protected function _listColumns(string $table = ''): string
 	{
-		return 'SHOW COLUMNS FROM ' . $this->protectIdentifiers($table, true, null, false);
+		if (strpos($table, '.') !== false)
+		{
+			sscanf($table, '%[^.].%s', $owner, $table);
+		}
+		else
+		{
+			$owner = $this->username;
+		}
+
+		return 'SELECT COLUMN_NAME FROM ALL_TAB_COLUMNS
+			WHERE UPPER(OWNER) = ' . $this->escape(strtoupper($owner)) . '
+				AND UPPER(TABLE_NAME) = ' . $this->escape(strtoupper($this->DBPrefix . $table));
 	}
 
 	//--------------------------------------------------------------------

From 31a9f1236d9434d9dfe0c4888628c2313d67baf1 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 15:59:32 +0900
Subject: [PATCH 1253/2325] feat: add get field list method.

---
 system/Database/OCI8/Connection.php | 41 ++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 580b6fe79f37..81bd889a81ff 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -311,27 +311,50 @@ protected function _listColumns(string $table = ''): string
 	 */
 	public function _fieldData(string $table): array
 	{
-		$table = $this->protectIdentifiers($table, true, null, false);
+		if (strpos($table, '.') !== false)
+		{
+			sscanf($table, '%[^.].%s', $owner, $table);
+		}
+		else
+		{
+			$owner = $this->username;
+		}
 
-		if (($query = $this->query('SHOW COLUMNS FROM ' . $table)) === false)
+		$sql = 'SELECT COLUMN_NAME, DATA_TYPE, CHAR_LENGTH, DATA_PRECISION, DATA_LENGTH, DATA_DEFAULT, NULLABLE
+			FROM ALL_TAB_COLUMNS
+			WHERE UPPER(OWNER) = ' . $this->escape(strtoupper($owner)) . '
+				AND UPPER(TABLE_NAME) = ' . $this->escape(strtoupper($table));
+
+		if (($query = $this->query($sql)) === false)
 		{
 			throw new DatabaseException(lang('Database.failGetFieldData'));
 		}
 		$query = $query->getResultObject();
 
-		$retVal = [];
+		$retval = [];
 		for ($i = 0, $c = count($query); $i < $c; $i++)
 		{
-			$retVal[$i]       = new \stdClass();
-			$retVal[$i]->name = $query[$i]->Field;
+			$retval[$i]       = new stdClass();
+			$retval[$i]->name = $query[$i]->COLUMN_NAME;
+			$retval[$i]->type = $query[$i]->DATA_TYPE;
 
-			sscanf($query[$i]->Type, '%[a-z](%d)', $retVal[$i]->type, $retVal[$i]->max_length);
+			$length = ($query[$i]->CHAR_LENGTH > 0)
+				? $query[$i]->CHAR_LENGTH : $query[$i]->DATA_PRECISION;
+			if ($length === null)
+			{
+				$length = $query[$i]->DATA_LENGTH;
+			}
+			$retval[$i]->max_length = $length;
 
-			$retVal[$i]->default     = $query[$i]->Default;
-			$retVal[$i]->primary_key = (int)($query[$i]->Key === 'PRI');
+			$default = $query[$i]->DATA_DEFAULT;
+			if ($default === null && $query[$i]->NULLABLE === 'N')
+			{
+				$default = '';
+			}
+			$retval[$i]->default = $default;
 		}
 
-		return $retVal;
+		return $retval;
 	}
 
 	//--------------------------------------------------------------------

From 15343145c8bd243b1febe79fb66b15c09ed9596a Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 15:59:49 +0900
Subject: [PATCH 1254/2325] feat: add get index list method.

---
 system/Database/OCI8/Connection.php | 71 ++++++++++++-----------------
 1 file changed, 30 insertions(+), 41 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 81bd889a81ff..ad9b7fb9b6a5 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -365,62 +365,51 @@ public function _fieldData(string $table): array
 	 * @param  string $table
 	 * @return \stdClass[]
 	 * @throws DatabaseException
-	 * @throws \LogicException
 	 */
 	public function _indexData(string $table): array
 	{
-		$table = $this->protectIdentifiers($table, true, null, false);
-
-		if (($query = $this->query('SHOW INDEX FROM ' . $table)) === false)
+		if (strpos($table, '.') !== false)
 		{
-			throw new DatabaseException(lang('Database.failGetIndexData'));
+			sscanf($table, '%[^.].%s', $owner, $table);
 		}
-
-		if (! $indexes = $query->getResultArray())
+		else
 		{
-			return [];
+			$owner = $this->username;
 		}
 
-		$keys = [];
+		$sql = 'SELECT AIC.INDEX_NAME, UC.CONSTRAINT_TYPE, AIC.COLUMN_NAME '
+			. ' FROM ALL_IND_COLUMNS uic '
+			. ' LEFT JOIN USER_CONSTRAINTS UC ON AIC.INDEX_NAME = UC.CONSTRAINT_NAME AND AIC.TABLE_NAME = UC.TABLE_NAME '
+			. 'WHERE TABLE_NAME = ' . $this->escape(strtolower($this->DBPrefix . $table)) . ' '
+			. 'AND TABLE_OWNER = ' . $this->escape(strtoupper($owner)) . ' '
+			. ' ORDER BY UC.CONSTRAINT_TYPE, AIC.COLUMN_POSITION';
+
+		if (($query = $this->query($sql)) === false)
+		{
+			throw new DatabaseException(lang('Database.failGetIndexData'));
+		}
+		$query = $query->getResultObject();
 
-		foreach ($indexes as $index)
+		$retVal          = [];
+		$constraintTypes = [
+			'P' => 'PRIMARY',
+			'U' => 'UNIQUE',
+		];
+		foreach ($query as $row)
 		{
-			if (empty($keys[$index['Key_name']]))
+			if (isset($retVal[$row->INDEX_NAME]))
 			{
-				$keys[$index['Key_name']]       = new \stdClass();
-				$keys[$index['Key_name']]->name = $index['Key_name'];
-
-				if ($index['Key_name'] === 'PRIMARY')
-				{
-					$type = 'PRIMARY';
-				}
-				elseif ($index['Index_type'] === 'FULLTEXT')
-				{
-					$type = 'FULLTEXT';
-				}
-				elseif ($index['Non_unique'])
-				{
-					if ($index['Index_type'] === 'SPATIAL')
-					{
-						$type = 'SPATIAL';
-					}
-					else
-					{
-						$type = 'INDEX';
-					}
-				}
-				else
-				{
-					$type = 'UNIQUE';
-				}
-
-				$keys[$index['Key_name']]->type = $type;
+				$retVal[$row->INDEX_NAME]->fields[] = $row->COLUMN_NAME;
+				continue;
 			}
 
-			$keys[$index['Key_name']]->fields[] = $index['Column_name'];
+			$retVal[$row->INDEX_NAME]         = new \stdClass();
+			$retVal[$row->INDEX_NAME]->name   = $row->INDEX_NAME;
+			$retVal[$row->INDEX_NAME]->fields = [$row->COLUMN_NAME];
+			$retVal[$row->INDEX_NAME]->type   = $constraintTypes[$row->CONSTRAINT_TYPE] ?? 'INDEX';
 		}
 
-		return $keys;
+		return $retVal;
 	}
 
 	//--------------------------------------------------------------------

From 19d1a1866273a6416525326402286ecec17917a5 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:09:13 +0900
Subject: [PATCH 1255/2325] feat: add disable foreign key method.

---
 system/Database/OCI8/Connection.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index ad9b7fb9b6a5..b1b75ec9d2be 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -472,7 +472,21 @@ public function _foreignKeyData(string $table): array
 	 */
 	protected function _disableForeignKeyChecks()
 	{
-		return 'SET FOREIGN_KEY_CHECKS=0';
+		return <<<SQL
+BEGIN
+  FOR c IN
+  (SELECT c.owner, c.table_name, c.constraint_name
+   FROM user_constraints c, user_tables t
+   WHERE c.table_name = t.table_name
+   AND c.status = 'ENABLED'
+   AND c.constraint_type = 'R'
+   AND t.iot_type IS NULL
+   ORDER BY c.constraint_type DESC)
+  LOOP
+    dbms_utility.exec_ddl_statement('alter table "' || c.owner || '"."' || c.table_name || '" disable constraint "' || c.constraint_name || '"');
+  END LOOP;
+END;
+SQL;
 	}
 
 	//--------------------------------------------------------------------

From 31f24bfb4b547d4fa759fa20eadb5b897c14fabe Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:10:12 +0900
Subject: [PATCH 1256/2325] feat: add enable foreign key method.

---
 system/Database/OCI8/Connection.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index b1b75ec9d2be..b363d47e127e 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -498,7 +498,21 @@ protected function _disableForeignKeyChecks()
 	 */
 	protected function _enableForeignKeyChecks()
 	{
-		return 'SET FOREIGN_KEY_CHECKS=1';
+		return <<<SQL
+BEGIN
+  FOR c IN
+  (SELECT c.owner, c.table_name, c.constraint_name
+   FROM user_constraints c, user_tables t
+   WHERE c.table_name = t.table_name
+   AND c.status = 'DISABLED'
+   AND c.constraint_type = 'R'
+   AND t.iot_type IS NULL
+   ORDER BY c.constraint_type DESC)
+  LOOP
+    dbms_utility.exec_ddl_statement('alter table "' || c.owner || '"."' || c.table_name || '" enable constraint "' || c.constraint_name || '"');
+  END LOOP;
+END;
+SQL;
 	}
 
 	//--------------------------------------------------------------------

From 82cf9dd22c2e71d25d4976333b5498eb8fcc1187 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:11:04 +0900
Subject: [PATCH 1257/2325] feat: add get cursor method.

---
 system/Database/OCI8/Connection.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index b363d47e127e..4f0693d626cb 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -517,6 +517,18 @@ protected function _enableForeignKeyChecks()
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Get cursor. Returns a cursor from the database
+	 *
+	 * @return resource
+	 */
+	public function getCursor()
+	{
+		return $this->cursorId = oci_new_cursor($this->connID);
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Returns the last error code and message.
 	 *

From 6c4ef9b49f4a01528a14d08be145b847de0d7a88 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:11:50 +0900
Subject: [PATCH 1258/2325] feat: add call stored procedure method.

---
 system/Database/OCI8/Connection.php | 49 +++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 4f0693d626cb..7b897a376bd4 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -529,6 +529,55 @@ public function getCursor()
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Stored Procedure.  Executes a stored procedure
+	 *
+	 * @param  string	package name in which the stored procedure is in
+	 * @param  string	stored procedure name to execute
+	 * @param  array	parameters
+	 * @return mixed
+	 *
+	 * params array keys
+	 *
+	 * KEY      OPTIONAL  NOTES
+	 * name     no        the name of the parameter should be in :<param_name> format
+	 * value    no        the value of the parameter.  If this is an OUT or IN OUT parameter,
+	 *                    this should be a reference to a variable
+	 * type     yes       the type of the parameter
+	 * length   yes       the max size of the parameter
+	 */
+	public function storedProcedure(string $package, string $procedure, array $params)
+	{
+		if ($package === '' || $procedure === '')
+		{
+			throw new DatabaseException(lang('Database.invalidArgument', [$package . $procedure]));
+		}
+
+		// Build the query string
+		$sql = 'BEGIN ' . $package . '.' . $procedure . '(';
+
+		$have_cursor = false;
+		foreach ($params as $param)
+		{
+			$sql .= $param['name'] . ',';
+
+			if (isset($param['type']) && $param['type'] === OCI_B_CURSOR)
+			{
+				$have_cursor = true;
+			}
+		}
+		$sql = trim($sql, ',') . '); END;';
+
+		$this->resetStmtId = false;
+		$this->stmtId      = oci_parse($this->connID, $sql);
+		$this->bindParams($params);
+		$result            = $this->query($sql, false, $have_cursor);
+		$this->resetStmtId = true;
+		return $result;
+	}
+
+	// --------------------------------------------------------------------
+
 	/**
 	 * Returns the last error code and message.
 	 *

From f7880e54c3120ece06f51c63f5d3cb21f4c915b4 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:12:28 +0900
Subject: [PATCH 1259/2325] feat: add bind parameter method.

---
 system/Database/OCI8/Connection.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 7b897a376bd4..f02dbf192bfc 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -578,6 +578,35 @@ public function storedProcedure(string $package, string $procedure, array $param
 
 	// --------------------------------------------------------------------
 
+	/**
+	 * Bind parameters
+	 *
+	 * @param  array $params
+	 * @return void
+	 */
+	protected function bindParams($params)
+	{
+		if (! is_array($params) || ! is_resource($this->stmtId))
+		{
+			return;
+		}
+
+		foreach ($params as $param)
+		{
+			foreach (['name', 'value', 'type', 'length'] as $val)
+			{
+				if (! isset($param[$val]))
+				{
+					$param[$val] = '';
+				}
+			}
+
+			oci_bind_by_name($this->stmtId, $param['name'], $param['value'], $param['length'], $param['type']);
+		}
+	}
+
+	// --------------------------------------------------------------------
+
 	/**
 	 * Returns the last error code and message.
 	 *

From 1de69671f1d8ab481a231efddf479d1375af4028 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:12:49 +0900
Subject: [PATCH 1260/2325] feat: add error method.

---
 system/Database/OCI8/Connection.php | 32 +++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index f02dbf192bfc..7c59ca1843f4 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -618,18 +618,32 @@ protected function bindParams($params)
 	 */
 	public function error(): array
 	{
-		if (! empty($this->mysqli->connect_errno))
+		// oci_error() returns an array that already contains
+		// 'code' and 'message' keys, but it can return false
+		// if there was no error ....
+		if (is_resource($this->cursorId))
 		{
-			return [
-				'code'    => $this->mysqli->connect_errno,
-				'message' => $this->mysqli->connect_error,
-			];
+			$error = oci_error($this->cursorId);
+		}
+		elseif (is_resource($this->stmtId))
+		{
+			$error = oci_error($this->stmtId);
+		}
+		elseif (is_resource($this->connID))
+		{
+			$error = oci_error($this->connID);
+		}
+		else
+		{
+			$error = oci_error();
 		}
 
-		return [
-			'code'    => $this->connID->errno,
-			'message' => $this->connID->error,
-		];
+		return is_array($error)
+			? $error
+			: [
+				  'code'    => '',
+				  'message' => '',
+			  ];
 	}
 
 	//--------------------------------------------------------------------

From 194e68345c6b7db315f9f6d20d1f0afecc1bac56 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:26:57 +0900
Subject: [PATCH 1261/2325] feat: add insert_id method.

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

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 7c59ca1843f4..e620874869e2 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -655,7 +655,7 @@ public function error(): array
 	 */
 	public function insertID(): int
 	{
-		return $this->connID->insert_id;
+		throw new DatabaseException(lang('Database.featureUnavailable'));
 	}
 
 	//--------------------------------------------------------------------

From eed3529f9b5ad846cefd152b98e0c3a4ce2b141a Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:27:29 +0900
Subject: [PATCH 1262/2325] feat: add transaction start method.

---
 system/Database/OCI8/Connection.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index e620874869e2..ee3a3ea5ec89 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -735,12 +735,12 @@ protected function buildDSN()
 	 */
 	protected function _transBegin(): bool
 	{
-		$this->connID->autocommit(false);
+		$this->commitMode = OCI_NO_AUTO_COMMIT;
 
-		return $this->connID->begin_transaction();
+		return true;
 	}
 
-	//--------------------------------------------------------------------
+	// --------------------------------------------------------------------
 
 	/**
 	 * Commit Transaction

From f940c360b3e68c0bf60d104a987988f6177e50b0 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:28:07 +0900
Subject: [PATCH 1263/2325] feat: add transaction commit method.

---
 system/Database/OCI8/Connection.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index ee3a3ea5ec89..a1a6835b4617 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -749,17 +749,12 @@ protected function _transBegin(): bool
 	 */
 	protected function _transCommit(): bool
 	{
-		if ($this->connID->commit())
-		{
-			$this->connID->autocommit(true);
-
-			return true;
-		}
+		$this->commitMode = OCI_COMMIT_ON_SUCCESS;
 
-		return false;
+		return oci_commit($this->connID);
 	}
 
-	//--------------------------------------------------------------------
+	// --------------------------------------------------------------------
 
 	/**
 	 * Rollback Transaction

From e7600ebfaf98f06216f4869bef72a387f2ab586d Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:28:38 +0900
Subject: [PATCH 1264/2325] feat: add transaction rollback method.

---
 system/Database/OCI8/Connection.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index a1a6835b4617..e201502776a4 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -763,14 +763,10 @@ protected function _transCommit(): bool
 	 */
 	protected function _transRollback(): bool
 	{
-		if ($this->connID->rollback())
-		{
-			$this->connID->autocommit(true);
-
-			return true;
-		}
+		$this->commitMode = OCI_COMMIT_ON_SUCCESS;
 
-		return false;
+		return oci_rollback($this->connID);
 	}
-	//--------------------------------------------------------------------
+
+	// --------------------------------------------------------------------
 }

From 917e7ec2db445feed5a7770e8216538c0328c943 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:33:32 +0900
Subject: [PATCH 1265/2325] feat: add necessary property.

---
 system/Database/OCI8/Builder.php | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index d81b91d074e7..8ffd06092249 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -45,13 +45,41 @@
  */
 class Builder extends BaseBuilder
 {
-
 	/**
 	 * Identifier escape character
 	 *
 	 * @var string
 	 */
-	protected $escapeChar = '`';
+	protected $escapeChar = '"';
+
+	/**
+	 * ORDER BY random keyword
+	 *
+	 * @var array
+	 */
+	protected $randomKeyword = [
+		'DBMS_RANDOM.RANDOM' // @todo: 未検証
+	];
+
+	/**
+	 * COUNT string
+	 *
+	 * @used-by CI_DB_driver::count_all()
+	 * @used-by BaseBuilder::count_all_results()
+	 *
+	 * @var string
+	 */
+	protected $countString = 'SELECT COUNT(1) AS ';
+
+	/**
+	 * Limit used flag
+	 *
+	 * If we use LIMIT, we'll add a field that will
+	 * throw off num_fields later.
+	 *
+	 * @var boolean
+	 */
+	protected $limitUsed = false;
 
 	/**
 	 * FROM tables

From 44bd4cabe131e981f0d51490cc18729d7fa7db05 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:37:13 +0900
Subject: [PATCH 1266/2325] feat: add insert batch method.

---
 system/Database/OCI8/Builder.php | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 8ffd06092249..0cc2097c8fd2 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -82,23 +82,29 @@ class Builder extends BaseBuilder
 	protected $limitUsed = false;
 
 	/**
-	 * FROM tables
+	 * Insert batch statement
 	 *
-	 * Groups tables in FROM clauses if needed, so there is no confusion
-	 * about operator precedence.
+	 * Generates a platform-specific insert string from the supplied data.
 	 *
-	 * Note: This is only used (and overridden) by MySQL.
+	 * @param string $table  Table name
+	 * @param array  $keys   INSERT keys
+	 * @param array  $values INSERT values
 	 *
 	 * @return string
 	 */
-	protected function _fromTables(): string
+	protected function _insertBatch(string $table, array $keys, array $values): string
 	{
-		if ( ! empty($this->QBJoin) && count($this->QBFrom) > 1)
+		$keys = implode(', ', $keys);
+		$sql  = "INSERT ALL\n";
+
+		for ($i = 0, $c = count($values); $i < $c; $i++)
 		{
-			return '('.implode(', ', $this->QBFrom).')';
+			$sql .= '	INTO ' . $table . ' (' . $keys . ') VALUES ' . $values[$i] . "\n";
 		}
 
-		return implode(', ', $this->QBFrom);
+		return $sql . 'SELECT * FROM dual';
+	}
+
 	}
 
 }

From 626e53d9f7d01692b73c2b8a00a8e125b7e2390e Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:38:07 +0900
Subject: [PATCH 1267/2325] feat: add truncate method.

---
 system/Database/OCI8/Builder.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 0cc2097c8fd2..402426639aca 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -105,6 +105,23 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
 		return $sql . 'SELECT * FROM dual';
 	}
 
+	//--------------------------------------------------------------------
+
+	/**
+	 * Truncate statement
+	 *
+	 * Generates a platform-specific truncate string from the supplied data
+	 *
+	 * If the database does not support the truncate() command,
+	 * then this method maps to 'DELETE FROM table'
+	 *
+	 * @param string $table The table name
+	 *
+	 * @return string
+	 */
+	protected function _truncate(string $table): string
+	{
+		return 'TRUNCATE TABLE ' . $table;
 	}
 
 }

From 945d03dd8942f029bde13041c9195c3772e165c6 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:38:36 +0900
Subject: [PATCH 1268/2325] feat: add delete method.

---
 system/Database/OCI8/Builder.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 402426639aca..c556383b7537 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -124,4 +124,27 @@ protected function _truncate(string $table): string
 		return 'TRUNCATE TABLE ' . $table;
 	}
 
+	//--------------------------------------------------------------------
+
+	/**
+	 * Delete
+	 *
+	 * Compiles a delete string and runs the query
+	 *
+	 * @param mixed   $where      The where clause
+	 * @param integer $limit      The limit clause
+	 * @param boolean $reset_data
+	 *
+	 * @return mixed
+	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+	 */
+	public function delete($where = '', int $limit = null, bool $reset_data = true)
+	{
+		if (! empty($limit))
+		{
+			$this->QBLimit = $limit;
+		}
+
+		return parent::delete($where, null, $reset_data);
+	}
 }

From 836928eca25f3cd4607445083e713893b8a59b58 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:39:05 +0900
Subject: [PATCH 1269/2325] feat: add delete method.

---
 system/Database/OCI8/Builder.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index c556383b7537..f350aee36c29 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -147,4 +147,26 @@ public function delete($where = '', int $limit = null, bool $reset_data = true)
 
 		return parent::delete($where, null, $reset_data);
 	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Delete statement
+	 *
+	 * Generates a platform-specific delete string from the supplied data
+	 *
+	 * @param string $table The table name
+	 *
+	 * @return string
+	 */
+	protected function _delete(string $table): string
+	{
+		if ($this->QBLimit)
+		{
+			$this->where('rownum <= ', $this->QBLimit, false);
+			$this->QBLimit = false;
+		}
+
+		return parent::_delete($table);
+	}
 }

From d6b52235b8f48584c395c26f27b7cd361cf80aa0 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:39:23 +0900
Subject: [PATCH 1270/2325] feat: add limit method.

---
 system/Database/OCI8/Builder.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index f350aee36c29..6b7f3d86e1e2 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -169,4 +169,30 @@ protected function _delete(string $table): string
 
 		return parent::_delete($table);
 	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * LIMIT string
+	 *
+	 * Generates a platform-specific LIMIT clause.
+	 *
+	 * @param string $sql SQL Query
+	 *
+	 * @return string
+	 */
+	protected function _limit(string $sql): string
+	{
+		if (version_compare($this->db->getVersion(), '12.1', '>='))
+		{
+			// OFFSET-FETCH can be used only with the ORDER BY clause
+			empty($this->QBOrderBy) && $sql .= ' ORDER BY 1';
+
+			return $sql . ' OFFSET ' . (int) $this->QBOffset . ' ROWS FETCH NEXT ' . $this->QBLimit . ' ROWS ONLY';
+		}
+
+		$this->limitUsed = true;
+		return 'SELECT * FROM (SELECT inner_query.*, rownum rnum FROM (' . $sql . ') inner_query WHERE rownum < ' . ($this->QBOffset + $this->QBLimit + 1) . ')'
+			. ($this->QBOffset ? ' WHERE rnum >= ' . ($this->QBOffset + 1) : '');
+	}
 }

From 10b6d80b7e7b543dc2f6e729a24d18fe1570cbd9 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:39:34 +0900
Subject: [PATCH 1271/2325] feat: add reset select method.

---
 system/Database/OCI8/Builder.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 6b7f3d86e1e2..be206e330b70 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -195,4 +195,13 @@ protected function _limit(string $sql): string
 		return 'SELECT * FROM (SELECT inner_query.*, rownum rnum FROM (' . $sql . ') inner_query WHERE rownum < ' . ($this->QBOffset + $this->QBLimit + 1) . ')'
 			. ($this->QBOffset ? ' WHERE rnum >= ' . ($this->QBOffset + 1) : '');
 	}
+
+	/**
+	 * Resets the query builder values.  Called by the get() function
+	 */
+	protected function resetSelect()
+	{
+		$this->limitUsed = false;
+		parent::resetSelect();
+	}
 }

From 26277b8ba87e15c3f208508951d1270911f5921d Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:50:50 +0900
Subject: [PATCH 1272/2325] remove: unncessary method and property.

---
 system/Database/OCI8/Forge.php | 74 ----------------------------------
 1 file changed, 74 deletions(-)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 02c132bf4a81..aa9eaeb55ad6 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -49,108 +49,34 @@ class Forge extends \CodeIgniter\Database\Forge
 	 *
 	 * @var string
 	 */
-	protected $createDatabaseStr = 'CREATE DATABASE %s CHARACTER SET %s COLLATE %s';
 
 	/**
-	 * DROP CONSTRAINT statement
 	 *
 	 * @var string
 	 */
-	protected $dropConstraintStr = 'ALTER TABLE %s DROP FOREIGN KEY %s';
 
 	/**
-	 * CREATE TABLE keys flag
 	 *
-	 * Whether table keys are created from within the
-	 * CREATE TABLE statement.
-	 *
-	 * @var boolean
 	 */
-	protected $createTableKeys = true;
 
 	/**
-	 * UNSIGNED support
 	 *
-	 * @var array
 	 */
-	protected $_unsigned = [
-		'TINYINT',
-		'SMALLINT',
-		'MEDIUMINT',
-		'INT',
-		'INTEGER',
-		'BIGINT',
-		'REAL',
-		'DOUBLE',
-		'DOUBLE PRECISION',
-		'FLOAT',
-		'DECIMAL',
-		'NUMERIC',
-	];
 
 	/**
-	 * Table Options list which required to be quoted
 	 *
-	 * @var array
 	 */
-	protected $_quoted_table_options = [
-		'COMMENT',
-		'COMPRESSION',
-		'CONNECTION',
-		'DATA DIRECTORY',
-		'INDEX DIRECTORY',
-		'ENCRYPTION',
-		'PASSWORD',
-	];
 
 	/**
 	 * NULL value representation in CREATE/ALTER TABLE statements
 	 *
 	 * @var string
 	 */
-	protected $_null = 'NULL';
-
-	//--------------------------------------------------------------------
 
 	/**
-	 * CREATE TABLE attributes
 	 *
-	 * @param  array $attributes Associative array of table attributes
-	 * @return string
 	 */
-	protected function _createTableAttributes(array $attributes): string
-	{
-		$sql = '';
 
-		foreach (array_keys($attributes) as $key)
-		{
-			if (is_string($key))
-			{
-				$sql .= ' ' . strtoupper($key) . ' = ';
-
-				if (in_array(strtoupper($key), $this->_quoted_table_options))
-				{
-					$sql .= $this->db->escape($attributes[$key]);
-				}
-				else
-				{
-					$sql .= $this->db->escapeString($attributes[$key]);
-				}
-			}
-		}
-
-		if (! empty($this->db->charset) && ! strpos($sql, 'CHARACTER SET') && ! strpos($sql, 'CHARSET'))
-		{
-			$sql .= ' DEFAULT CHARACTER SET = ' . $this->db->escapeString($this->db->charset);
-		}
-
-		if (! empty($this->db->DBCollat) && ! strpos($sql, 'COLLATE'))
-		{
-			$sql .= ' COLLATE = ' . $this->db->escapeString($this->db->DBCollat);
-		}
-
-		return $sql;
-	}
 
 	//--------------------------------------------------------------------
 

From 08fc17056d32af2a85c40060938c759467ebde7c Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:51:40 +0900
Subject: [PATCH 1273/2325] feat: add necessary properties.

---
 system/Database/OCI8/Forge.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index aa9eaeb55ad6..e149edbba4b2 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -49,34 +49,56 @@ class Forge extends \CodeIgniter\Database\Forge
 	 *
 	 * @var string
 	 */
+	protected $createDatabaseStr = false;
 
 	/**
+	 * CREATE TABLE IF statement
 	 *
 	 * @var string
 	 */
+	protected $createTableIfStr = false;
 
 	/**
+	 * DROP TABLE IF EXISTS statement
 	 *
+	 * @var string
 	 */
+	protected $dropTableIfStr = false;
 
 	/**
+	 * DROP DATABASE statement
 	 *
+	 * @var string
 	 */
+	protected $dropDatabaseStr = false;
 
 	/**
+	 * UNSIGNED support
 	 *
+	 * @var boolean|array
 	 */
+	protected $unsigned = false;
 
 	/**
 	 * NULL value representation in CREATE/ALTER TABLE statements
 	 *
 	 * @var string
 	 */
+	protected $null = 'NULL';
 
 	/**
+	 * RENAME TABLE statement
 	 *
+	 * @var string
 	 */
+	protected $renameTableStr = 'ALTER TABLE %s RENAME TO %s';
 
+	/**
+	 * DROP CONSTRAINT statement
+	 *
+	 * @var string
+	 */
+	protected $dropConstraintStr = 'ALTER TABLE %s DROP CONSTRAINT %s';
 
 	//--------------------------------------------------------------------
 

From 02c86e0a3966b80545f3741d3b78b12b740a1ef1 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:51:59 +0900
Subject: [PATCH 1274/2325] style: fix doc comment style.

---
 system/Database/OCI8/Forge.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index e149edbba4b2..c538136edd6f 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -105,9 +105,10 @@ class Forge extends \CodeIgniter\Database\Forge
 	/**
 	 * ALTER TABLE
 	 *
-	 * @param  string $alter_type ALTER type
-	 * @param  string $table      Table name
-	 * @param  mixed  $field      Column definition
+	 * @param string $alter_type ALTER type
+	 * @param string $table      Table name
+	 * @param mixed  $field      Column definition
+	 *
 	 * @return string|string[]
 	 */
 	protected function _alterTable(string $alter_type, string $table, $field)

From e18141884c3e0573b308a5533b604867e461a2fd Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:52:57 +0900
Subject: [PATCH 1275/2325] feat: add alter table method.

---
 system/Database/OCI8/Forge.php | 38 +++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index c538136edd6f..7e58c853d617 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -117,30 +117,48 @@ protected function _alterTable(string $alter_type, string $table, $field)
 		{
 			return parent::_alterTable($alter_type, $table, $field);
 		}
+		elseif ($alter_type === 'CHANGE')
+		{
+			$alter_type = 'MODIFY';
+		}
 
-		$sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
-		foreach ($field as $i => $data)
+		$sql  = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
+		$sqls = [];
+		for ($i = 0, $c = count($field); $i < $c; $i++)
 		{
-			if ($data['_literal'] !== false)
+			if ($field[$i]['_literal'] !== false)
 			{
-				$field[$i] = ($alter_type === 'ADD') ? "\n\tADD " . $data['_literal'] : "\n\tMODIFY " . $data['_literal'];
+				$field[$i] = "\n\t" . $field[$i]['_literal'];
 			}
 			else
 			{
-				if ($alter_type === 'ADD')
+				$field[$i]['_literal'] = "\n\t" . $this->_processColumn($field[$i]);
+
+				if (! empty($field[$i]['comment']))
 				{
-					$field[$i]['_literal'] = "\n\tADD ";
+					$sqls[] = 'COMMENT ON COLUMN '
+						. $this->db->escapeIdentifiers($table) . '.' . $this->db->escapeIdentifiers($field[$i]['name'])
+						. ' IS ' . $field[$i]['comment'];
 				}
-				else
+
+				if ($alter_type === 'MODIFY' && ! empty($field[$i]['new_name']))
 				{
-					$field[$i]['_literal'] = empty($data['new_name']) ? "\n\tMODIFY " : "\n\tCHANGE ";
+					$sqls[] = $sql . ' RENAME COLUMN ' . $this->db->escapeIdentifiers($field[$i]['name'])
+						. ' TO ' . $this->db->escapeIdentifiers($field[$i]['new_name']);
 				}
 
-				$field[$i] = $field[$i]['_literal'] . $this->_processColumn($field[$i]);
+				$field[$i] = "\n\t" . $field[$i]['_literal'];
 			}
 		}
 
-		return [$sql . implode(',', $field)];
+		$sql .= ' ' . $alter_type . ' ';
+		$sql .= (count($field) === 1)
+				? $field[0]
+				: '(' . implode(',', $field) . ')';
+
+		// RENAME COLUMN must be executed after MODIFY
+		array_unshift($sqls, $sql);
+		return $sqls;
 	}
 
 	//--------------------------------------------------------------------

From 0ce7e2ed781a9ba769451dcac31ab5d22c71f19f Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 16:55:28 +0900
Subject: [PATCH 1276/2325] feat: add auto increment method.

---
 system/Database/OCI8/Forge.php | 35 ++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 7e58c853d617..247ed01f55e0 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -163,6 +163,27 @@ protected function _alterTable(string $alter_type, string $table, $field)
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Field attribute AUTO_INCREMENT
+	 *
+	 * @param array &$attributes
+	 * @param array &$field
+	 *
+	 * @return void
+	 */
+	protected function _attributeAutoIncrement(array &$attributes, array &$field)
+	{
+		if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
+			&& stripos($field['type'], 'NUMBER') !== false
+			&& version_compare($this->db->getVersion(), '12.1', '>=')
+		)
+		{
+			$field['auto_increment'] = ' GENERATED ALWAYS AS IDENTITY';
+		}
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Process column
 	 *
@@ -173,21 +194,7 @@ protected function _processColumn(array $field): string
 	{
 		$extra_clause = isset($field['after']) ? ' AFTER ' . $this->db->escapeIdentifiers($field['after']) : '';
 
-		if (empty($extra_clause) && isset($field['first']) && $field['first'] === true)
-		{
-			$extra_clause = ' FIRST';
-		}
 
-		return $this->db->escapeIdentifiers($field['name'])
-				. (empty($field['new_name']) ? '' : ' ' . $this->db->escapeIdentifiers($field['new_name']))
-				. ' ' . $field['type'] . $field['length']
-				. $field['unsigned']
-				. $field['null']
-				. $field['default']
-				. $field['auto_increment']
-				. $field['unique']
-				. (empty($field['comment']) ? '' : ' COMMENT ' . $field['comment'])
-				. $extra_clause;
 	}
 
 	//--------------------------------------------------------------------

From 9b0a9d823733e7285ab93e6e406e1e24f3ac53a2 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 17:04:49 +0900
Subject: [PATCH 1277/2325] feat: add processColumn method.

---
 system/Database/OCI8/Forge.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 247ed01f55e0..94077c9fbfb7 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -187,12 +187,20 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
 	/**
 	 * Process column
 	 *
-	 * @param  array $field
+	 * @param array $field
+	 *
 	 * @return string
 	 */
 	protected function _processColumn(array $field): string
 	{
-		$extra_clause = isset($field['after']) ? ' AFTER ' . $this->db->escapeIdentifiers($field['after']) : '';
+		return $this->db->escapeIdentifiers($field['name'])
+			   . ' ' . $field['type'] . $field['length']
+			   . $field['unsigned']
+			   . $field['default']
+			   . $field['auto_increment']
+			   . $field['null']
+			   . $field['unique'];
+	}
 
 
 	}

From 0538af6ac68d9851cc13937ddc5299b50f887078 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 17:06:47 +0900
Subject: [PATCH 1278/2325] feat: merge column type method.

see: https://docs.oracle.com/cd/E12151_01/doc.150/e12155/oracle_mysql_compared.htm#BABHHAJC
---
 system/Database/OCI8/Forge.php | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 94077c9fbfb7..e47d53fce2c6 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -202,7 +202,41 @@ protected function _processColumn(array $field): string
 			   . $field['unique'];
 	}
 
+	//--------------------------------------------------------------------
 
+	/**
+	 * Field attribute TYPE
+	 *
+	 * Performs a data type mapping between different databases.
+	 *
+	 * @param array &$attributes
+	 *
+	 * @return void
+	 */
+	protected function _attributeType(array &$attributes)
+	{
+		// Reset field lengths for data types that don't support it
+		// Usually overridden by drivers
+		switch (strtoupper($attributes['TYPE']))
+		{
+			case 'TINYINT':
+			case 'SMALLINT':
+			case 'MEDIUMINT':
+			case 'INT':
+			case 'INTEGER':
+			case 'BIGINT':
+			case 'NUMERIC':
+				$attributes['TYPE'] = 'NUMBER';
+				return;
+			case 'DATETIME':
+				$attributes['TYPE'] = 'DATE';
+				return;
+			case 'TEXT':
+			case 'VARCHAR':
+				$attributes['TYPE'] = 'VARCHAR2';
+				return;
+			default: return;
+		}
 	}
 
 	//--------------------------------------------------------------------

From 3f8d25286a7d307d6c8c04a24de0ac9536e31b7e Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 17:10:48 +0900
Subject: [PATCH 1279/2325] feat: add drop table method.

---
 system/Database/OCI8/Forge.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index e47d53fce2c6..e65648b5be11 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -241,6 +241,35 @@ protected function _attributeType(array &$attributes)
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Drop Table
+	 *
+	 * Generates a platform-specific DROP TABLE string
+	 *
+	 * @param string  $table     Table name
+	 * @param boolean $if_exists Whether to add an IF EXISTS condition
+	 * @param boolean $cascade
+	 *
+	 * @return string
+	 */
+	protected function _dropTable(string $table, bool $if_exists, bool $cascade): string
+	{
+		$sql = parent::_dropTable($table, $if_exists, $cascade);
+
+		if ($sql !== '' && $cascade === true)
+		{
+			$sql .= ' CASCADE CONSTRAINTS PURGE';
+		}
+		elseif ($sql !== '')
+		{
+			$sql .= ' PURGE';
+		}
+
+		return $sql;
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Process indexes
 	 *

From 53e44213a3b8731074012f874357825c6582c0b8 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 17:14:09 +0900
Subject: [PATCH 1280/2325] feat: add forgen key method.

---
 system/Database/OCI8/Forge.php | 46 ++++++++++++++--------------------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index e65648b5be11..85a5bdc3d3e2 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -271,46 +271,38 @@ protected function _dropTable(string $table, bool $if_exists, bool $cascade): st
 	//--------------------------------------------------------------------
 
 	/**
-	 * Process indexes
+	 * Process foreign keys
+	 *
+	 * @param string $table Table name
 	 *
-	 * @param  string $table (ignored)
 	 * @return string
 	 */
-	protected function _processIndexes(string $table): string
+	protected function _processForeignKeys(string $table): string
 	{
 		$sql = '';
 
-		for ($i = 0, $c = count($this->keys); $i < $c; $i ++)
+		$allowActions = [
+			'CASCADE',
+			'SET NULL',
+			'NO ACTION',
+		];
+
+		if (count($this->foreignKeys) > 0)
 		{
-			if (is_array($this->keys[$i]))
+			foreach ($this->foreignKeys as $field => $fkey)
 			{
-				for ($i2 = 0, $c2 = count($this->keys[$i]); $i2 < $c2; $i2 ++)
+				$name_index = $table . '_' . $field . '_fk';
+
+				$sql .= ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers($name_index)
+					. ' FOREIGN KEY(' . $this->db->escapeIdentifiers($field) . ') REFERENCES ' . $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['table']) . ' (' . $this->db->escapeIdentifiers($fkey['field']) . ')';
+
+				if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions))
 				{
-					if (! isset($this->fields[$this->keys[$i][$i2]]))
-					{
-						unset($this->keys[$i][$i2]);
-						continue;
-					}
+					$sql .= ' ON DELETE ' . $fkey['onDelete'];
 				}
 			}
-			elseif (! isset($this->fields[$this->keys[$i]]))
-			{
-				unset($this->keys[$i]);
-				continue;
-			}
-
-			is_array($this->keys[$i]) || $this->keys[$i] = [$this->keys[$i]];
-
-			$unique = in_array($i, $this->uniqueKeys) ? 'UNIQUE ' : '';
-
-			$sql .= ",\n\t{$unique}KEY " . $this->db->escapeIdentifiers(implode('_', $this->keys[$i]))
-				. ' (' . implode(', ', $this->db->escapeIdentifiers($this->keys[$i])) . ')';
 		}
 
-		$this->keys = [];
-
 		return $sql;
 	}
-
-	//--------------------------------------------------------------------
 }

From 4236bae0faa758f128bbc01b3928499c19db1971 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 17:15:03 +0900
Subject: [PATCH 1281/2325] feat: add prepear method.

---
 system/Database/OCI8/PreparedQuery.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/system/Database/OCI8/PreparedQuery.php b/system/Database/OCI8/PreparedQuery.php
index 6ef0d9e7bc80..b4999f4bc6a2 100644
--- a/system/Database/OCI8/PreparedQuery.php
+++ b/system/Database/OCI8/PreparedQuery.php
@@ -62,14 +62,17 @@ class PreparedQuery extends BasePreparedQuery implements PreparedQueryInterface
 	 */
 	public function _prepare(string $sql, array $options = [])
 	{
-		// Mysqli driver doesn't like statements
-		// with terminating semicolons.
 		$sql = rtrim($sql, ';');
+		if (strpos('BEGIN', ltrim($sql)) === 0)
+		{
+			$sql .= ';';
+		}
 
-		if (! $this->statement = $this->db->mysqli->prepare($sql))
+		if (! $this->statement = oci_parse($this->db->connID, $this->parameterize($sql)))
 		{
-			$this->errorCode   = $this->db->mysqli->errno;
-			$this->errorString = $this->db->mysqli->error;
+			$error             = oci_error($this->db->connID);
+			$this->errorCode   = $error['code'] ?? 0;
+			$this->errorString = $error['message'] ?? '';
 		}
 
 		return $this;

From d2fc77ee4d77cb6ff0937919a9fbf28263888980 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 17:17:58 +0900
Subject: [PATCH 1282/2325] feat: add bind process.

---
 system/Database/OCI8/PreparedQuery.php | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/system/Database/OCI8/PreparedQuery.php b/system/Database/OCI8/PreparedQuery.php
index b4999f4bc6a2..c2691ac80f9e 100644
--- a/system/Database/OCI8/PreparedQuery.php
+++ b/system/Database/OCI8/PreparedQuery.php
@@ -95,32 +95,12 @@ public function _execute(array $data): bool
 			throw new \BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
 		}
 
-		// First off -bind the parameters
-		$bindTypes = '';
-
-		// Determine the type string
-		foreach ($data as $item)
+		foreach ($data as $key => $val)
 		{
-			if (is_integer($item))
-			{
-				$bindTypes .= 'i';
-			}
-			elseif (is_numeric($item))
-			{
-				$bindTypes .= 'd';
-			}
-			else
-			{
-				$bindTypes .= 's';
-			}
+			oci_bind_by_name($this->statement, ':' . $key, $val);
 		}
 
-		// Bind it
-		$this->statement->bind_param($bindTypes, ...$data);
-
-		$success = $this->statement->execute();
-
-		return $success;
+		return oci_execute($this->statement, $this->db->commitMode);
 	}
 
 	//--------------------------------------------------------------------

From 08153a5c36067979c5c80bfef2d761a4a8f40ce3 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 17:19:52 +0900
Subject: [PATCH 1283/2325] feat: add get result method.

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

diff --git a/system/Database/OCI8/PreparedQuery.php b/system/Database/OCI8/PreparedQuery.php
index c2691ac80f9e..fc35d15e44ef 100644
--- a/system/Database/OCI8/PreparedQuery.php
+++ b/system/Database/OCI8/PreparedQuery.php
@@ -112,7 +112,7 @@ public function _execute(array $data): bool
 	 */
 	public function _getResult()
 	{
-		return $this->statement->get_result();
+		return $this->statement;
 	}
 
 	//--------------------------------------------------------------------

From 0c7fc2f60a4f31920fe7319a1b2ae371be95ac5d Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 17:20:15 +0900
Subject: [PATCH 1284/2325] feat: add parameterize method.

---
 system/Database/OCI8/PreparedQuery.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/system/Database/OCI8/PreparedQuery.php b/system/Database/OCI8/PreparedQuery.php
index fc35d15e44ef..ff5808846d96 100644
--- a/system/Database/OCI8/PreparedQuery.php
+++ b/system/Database/OCI8/PreparedQuery.php
@@ -116,4 +116,25 @@ public function _getResult()
 	}
 
 	//--------------------------------------------------------------------
+
+	/**
+	 * Replaces the ? placeholders with :1, :2, etc parameters for use
+	 * within the prepared query.
+	 *
+	 * @param string $sql
+	 *
+	 * @return string
+	 */
+	public function parameterize(string $sql): string
+	{
+		// Track our current value
+		$count = 0;
+
+		$sql = preg_replace_callback('/\?/', function ($matches) use (&$count) {
+			$count ++;
+			return ":{$count}";
+		}, $sql);
+
+		return $sql;
+	}
 }

From 6dea7b1206b52dd81d7027baf920179129c3959d Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 17:21:17 +0900
Subject: [PATCH 1285/2325] feat: add get field count method.

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

diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php
index e1cb7425f716..1b82b57aea47 100644
--- a/system/Database/OCI8/Result.php
+++ b/system/Database/OCI8/Result.php
@@ -55,7 +55,7 @@ class Result extends BaseResult implements ResultInterface
 	 */
 	public function getFieldCount(): int
 	{
-		return $this->resultID->field_count;
+		return oci_num_fields($this->resultID);
 	}
 
 	//--------------------------------------------------------------------

From e9bd2ca1598537b63782f5b88a8c8d06ab43b33e Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 17:22:16 +0900
Subject: [PATCH 1286/2325] feat: add get fieldNames method.

---
 system/Database/OCI8/Result.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php
index 1b82b57aea47..581754de0b7d 100644
--- a/system/Database/OCI8/Result.php
+++ b/system/Database/OCI8/Result.php
@@ -67,14 +67,9 @@ public function getFieldCount(): int
 	 */
 	public function getFieldNames(): array
 	{
-		$fieldNames = [];
-		$this->resultID->field_seek(0);
-		while ($field = $this->resultID->fetch_field())
-		{
-			$fieldNames[] = $field->name;
-		}
-
-		return $fieldNames;
+		return array_map(function ($field_index) {
+			return oci_field_name($this->resultID, $field_index);
+		}, range(1, $this->getFieldCount()));
 	}
 
 	//--------------------------------------------------------------------

From 739c74eec9b04fa2c60b627276b576c7f4a349ad Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 17:22:53 +0900
Subject: [PATCH 1287/2325] feat: add get field data method.

---
 system/Database/OCI8/Result.php | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php
index 581754de0b7d..b2a8255bb3ae 100644
--- a/system/Database/OCI8/Result.php
+++ b/system/Database/OCI8/Result.php
@@ -81,20 +81,15 @@ public function getFieldNames(): array
 	 */
 	public function getFieldData(): array
 	{
-		$retVal    = [];
-		$fieldData = $this->resultID->fetch_fields();
-
-		foreach ($fieldData as $i => $data)
-		{
-			$retVal[$i]              = new \stdClass();
-			$retVal[$i]->name        = $data->name;
-			$retVal[$i]->type        = $data->type;
-			$retVal[$i]->max_length  = $data->max_length;
-			$retVal[$i]->primary_key = (int) ($data->flags & 2);
-			$retVal[$i]->default     = $data->def;
-		}
-
-		return $retVal;
+		return array_map(function ($field_index) {
+			return (object) [
+								'name'       => oci_field_name($this->resultID, $field_index),
+								'type'       => oci_field_type($this->resultID, $field_index),
+								'max_length' => oci_field_size($this->resultID, $field_index),
+				// 'primary_key' = (int) ($data->flags & 2),
+				// 'default'     = $data->def,
+							];
+		}, range(1, $this->getFieldCount()));
 	}
 
 	//--------------------------------------------------------------------

From dfdb6e0141d56843f175855cf4042a1e85bbffdb Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 17:23:20 +0900
Subject: [PATCH 1288/2325] feat: add free result method.

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

diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php
index b2a8255bb3ae..a475215481bf 100644
--- a/system/Database/OCI8/Result.php
+++ b/system/Database/OCI8/Result.php
@@ -103,8 +103,8 @@ public function freeResult()
 	{
 		if (is_object($this->resultID))
 		{
-			$this->resultID->free();
-			$this->resultID = false;
+			oci_free_statement($this->resultID);
+			$this->resultID = null;
 		}
 	}
 

From da3674ba8f4da0cc0a4537a55bfa81d841a531e8 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 17:23:36 +0900
Subject: [PATCH 1289/2325] feat: add data Seek method.

---
 system/Database/OCI8/Result.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php
index a475215481bf..ae6fab6bec26 100644
--- a/system/Database/OCI8/Result.php
+++ b/system/Database/OCI8/Result.php
@@ -121,7 +121,8 @@ public function freeResult()
 	 */
 	public function dataSeek(int $n = 0)
 	{
-		return $this->resultID->data_seek($n);
+		// We can't support data seek by oci
+		return false;
 	}
 
 	//--------------------------------------------------------------------

From 0e379350a1869db8b9b8ef5914b674786d0581cf Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 17:23:56 +0900
Subject: [PATCH 1290/2325] feat: fetchAssoc method.

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

diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php
index ae6fab6bec26..1fcf0b5c608e 100644
--- a/system/Database/OCI8/Result.php
+++ b/system/Database/OCI8/Result.php
@@ -136,7 +136,7 @@ public function dataSeek(int $n = 0)
 	 */
 	protected function fetchAssoc()
 	{
-		return $this->resultID->fetch_assoc();
+		return oci_fetch_assoc($this->resultID);
 	}
 
 	//--------------------------------------------------------------------

From 3c42fd22c1452d67092c9786568b12e924ebbcc2 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 17:24:08 +0900
Subject: [PATCH 1291/2325] feat: add fetchObject method.

---
 system/Database/OCI8/Result.php | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php
index 1fcf0b5c608e..85faae1db6a2 100644
--- a/system/Database/OCI8/Result.php
+++ b/system/Database/OCI8/Result.php
@@ -150,13 +150,26 @@ protected function fetchAssoc()
 	 *
 	 * @return object|boolean|Entity
 	 */
-	protected function fetchObject(string $className = 'stdClass')
+	protected function fetchObject(string $className = \stdClass::class)
 	{
-		if (is_subclass_of($className, Entity::class))
+		$row = oci_fetch_object($this->resultID);
+
+		if ($className === 'stdClass' || ! $row)
+		{
+			return $row;
+		}
+		elseif (is_subclass_of($className, Entity::class))
 		{
-			return empty($data = $this->fetchAssoc()) ? false : (new $className())->setAttributes($data);
+			return (new $className())->setAttributes((array) $row);
 		}
-		return $this->resultID->fetch_object($className);
+
+		$instance = new $className();
+		foreach ($row as $key => $value)
+		{
+			$instance->$key = $value;
+		}
+
+		return $instance;
 	}
 
 	//--------------------------------------------------------------------

From 9fe2661c8b1c4f0be0cb60b0a578d80ba345dc35 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 17:25:04 +0900
Subject: [PATCH 1292/2325] feat: define property.

---
 system/Database/OCI8/Utils.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/system/Database/OCI8/Utils.php b/system/Database/OCI8/Utils.php
index 070c0d5d7348..9ed063e5022a 100644
--- a/system/Database/OCI8/Utils.php
+++ b/system/Database/OCI8/Utils.php
@@ -52,14 +52,7 @@ class Utils extends BaseUtils
 	 *
 	 * @var string
 	 */
-	protected $listDatabases = 'SHOW DATABASES';
-
-	/**
-	 * OPTIMIZE TABLE statement
-	 *
-	 * @var string
-	 */
-	protected $optimizeTable = 'OPTIMIZE TABLE %s';
+	protected $listDatabases = 'SELECT TABLESPACE_NAME FROM USER_TABLESPACES';
 
 	//--------------------------------------------------------------------
 

From 82a22dc311453aa2f28415dcfad804df66918698 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 18:02:03 +0900
Subject: [PATCH 1293/2325] test: add test for oci listDatabase method.

---
 tests/system/Database/Live/DbUtilsTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/Database/Live/DbUtilsTest.php b/tests/system/Database/Live/DbUtilsTest.php
index 2e8beda5f82f..2eaea6500000 100644
--- a/tests/system/Database/Live/DbUtilsTest.php
+++ b/tests/system/Database/Live/DbUtilsTest.php
@@ -76,7 +76,7 @@ public function testUtilsListDatabases()
     {
         $util = (new Database())->loadUtils($this->db);
 
-        if (in_array($this->db->DBDriver, ['MySQLi', 'Postgre', 'SQLSRV'], true)) {
+        if (in_array($this->db->DBDriver, ['MySQLi', 'Postgre', 'SQLSRV', 'OCI8'], true)) {
             $databases = $util->listDatabases();
 
             $this->assertContains($this->db->getDatabase(), $databases);

From e07cee0b46697c3733de8e4e00392056ebc2ab55 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 18:03:35 +0900
Subject: [PATCH 1294/2325] test: add databaseExists test for oci8.

---
 tests/system/Database/Live/DbUtilsTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/Database/Live/DbUtilsTest.php b/tests/system/Database/Live/DbUtilsTest.php
index 2eaea6500000..cf2753e590fc 100644
--- a/tests/system/Database/Live/DbUtilsTest.php
+++ b/tests/system/Database/Live/DbUtilsTest.php
@@ -92,7 +92,7 @@ public function testUtilsDatabaseExist()
     {
         $util = (new Database())->loadUtils($this->db);
 
-        if (in_array($this->db->DBDriver, ['MySQLi', 'Postgre', 'SQLSRV'], true)) {
+        if (in_array($this->db->DBDriver, ['MySQLi', 'Postgre', 'SQLSRV', 'OCI8'], true)) {
             $exist = $util->databaseExists($this->db->getDatabase());
 
             $this->assertTrue($exist);

From b26946ec554e79d4e9d80fe826430422d46c075d Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 31 Dec 2019 18:04:58 +0900
Subject: [PATCH 1295/2325] fix: skip not support oci8 test.

---
 tests/system/Database/Live/DbUtilsTest.php | 14 ++++++++++++++
 tests/system/Database/Live/ForgeTest.php   | 17 +++++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/tests/system/Database/Live/DbUtilsTest.php b/tests/system/Database/Live/DbUtilsTest.php
index cf2753e590fc..e997981b55ec 100644
--- a/tests/system/Database/Live/DbUtilsTest.php
+++ b/tests/system/Database/Live/DbUtilsTest.php
@@ -108,6 +108,13 @@ public function testUtilsOptimizeDatabase()
     {
         $util = (new Database())->loadUtils($this->db);
 
+		if ($this->db->DBDriver === 'OCI8')
+		{
+			$this->markTestSkipped(
+			  'Unsupported feature of the oracle database platform.'
+			);
+		}
+
         $d = $util->optimizeDatabase();
 
         $this->assertTrue((bool) $d);
@@ -147,6 +154,13 @@ public function testUtilsOptimizeTable()
     {
         $util = (new Database())->loadUtils($this->db);
 
+		if ($this->db->DBDriver === 'OCI8')
+		{
+			$this->markTestSkipped(
+			  'Unsupported feature of the oracle database platform.'
+			);
+		}
+
         $d = $util->optimizeTable('db_job');
 
         $this->assertTrue((bool) $d);
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 08ca65e03b95..07a0aea4b9b2 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -44,6 +44,9 @@ protected function setUp(): void
 
     public function testCreateDatabase()
     {
+        if ($this->db->DBDriver === 'OCI8') {
+            $this->markTestSkipped('OCI8 does not support create database.');
+        }
         $databaseCreated = $this->forge->createDatabase('test_forge_database');
 
         $this->assertTrue($databaseCreated);
@@ -76,7 +79,11 @@ public function testCreateDatabaseIfNotExistsWithDb()
 
     public function testDropDatabase()
     {
-        if ($this->db->DBDriver === 'SQLite3') {
+        if ($this->db->DBDriver === 'OCI8') {
+            $this->markTestSkipped('OCI8 does not support drop database.');
+        }
+        if ($this->db->DBDriver === 'SQLite3')
+        {
             $this->markTestSkipped('SQLite3 requires file path to drop database');
         }
 
@@ -169,6 +176,8 @@ public function testCreateTableApplyBigInt()
             $this->assertSame(strtolower($fieldsData[0]->type), 'bigint');
         } elseif ($this->db->DBDriver === 'SQLite3') {
             $this->assertSame(strtolower($fieldsData[0]->type), 'integer');
+        } elseif ($this->db->DBDriver === 'OCI8') {
+            $this->assertSame(strtolower($fieldsData[0]->type), 'number');
         } elseif ($this->db->DBDriver === 'SQLSRV') {
             $this->assertSame(strtolower($fieldsData[0]->type), 'bigint');
         }
@@ -178,7 +187,11 @@ public function testCreateTableApplyBigInt()
 
     public function testCreateTableWithAttributes()
     {
-        if ($this->db->DBDriver === 'SQLite3') {
+        if ($this->db->DBDriver === 'OCI8')
+        {
+            $this->markTestSkipped('OCI8 does not support comments on tables or columns.');
+        }
+        if ($this->db->DBDriver === 'SQLite3')
             $this->markTestSkipped('SQLite3 does not support comments on tables or columns.');
         }
 

From 0a684f45687ad920faf858bbfaf5a5d8ac578eb5 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Fri, 3 Jan 2020 18:30:08 +0900
Subject: [PATCH 1296/2325] style: fix style.

---
 tests/system/Database/Live/ForgeTest.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 07a0aea4b9b2..1cc9c1153dae 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -44,7 +44,8 @@ protected function setUp(): void
 
     public function testCreateDatabase()
     {
-        if ($this->db->DBDriver === 'OCI8') {
+		if ($this->db->DBDriver === 'OCI8')
+		{
             $this->markTestSkipped('OCI8 does not support create database.');
         }
         $databaseCreated = $this->forge->createDatabase('test_forge_database');
@@ -79,7 +80,8 @@ public function testCreateDatabaseIfNotExistsWithDb()
 
     public function testDropDatabase()
     {
-        if ($this->db->DBDriver === 'OCI8') {
+		if ($this->db->DBDriver === 'OCI8')
+		{
             $this->markTestSkipped('OCI8 does not support drop database.');
         }
         if ($this->db->DBDriver === 'SQLite3')

From 1e33e52fb85add1afebb3c8349259509dfeba7de Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Fri, 3 Jan 2020 18:30:49 +0900
Subject: [PATCH 1297/2325] test: add test for get foreign key method.

---
 tests/system/Database/Live/ForgeTest.php | 32 ++++++++++++++++++------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 1cc9c1153dae..959d5f618e5d 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -424,13 +424,23 @@ public function testForeignKey()
         $this->forge->addKey('id', true);
         $this->forge->addForeignKey('users_id', 'forge_test_users', 'id', 'CASCADE', 'CASCADE');
 
-        $this->forge->createTable('forge_test_invoices', true, $attributes);
+        $tableName = 'forge_test_invoices';
+        if ($this->db->DBDriver === 'OCI8')
+        {
+            $tableName = 'forge_test_inv';
+        }
 
-        $foreignKeyData = $this->db->getForeignKeyData('forge_test_invoices');
+        $this->forge->createTable($tableName, true, $attributes);
+
+        $foreignKeyData = $this->db->getForeignKeyData($tableName);
 
         if ($this->db->DBDriver === 'SQLite3') {
             $this->assertSame($foreignKeyData[0]->constraint_name, 'users_id to db_forge_test_users.id');
             $this->assertSame($foreignKeyData[0]->sequence, 0);
+        } elseif ($this->db->DBDriver === 'OCI8') {
+            $this->assertEquals($foreignKeyData[0]->constraint_name, $this->db->DBPrefix . 'forge_test_inv_users_id_fk');
+            $this->assertEquals($foreignKeyData[0]->column_name, 'users_id');
+            $this->assertEquals($foreignKeyData[0]->foreign_column_name, 'id');
         } else {
             $this->assertSame($foreignKeyData[0]->constraint_name, $this->db->DBPrefix . 'forge_test_invoices_users_id_foreign');
             $this->assertSame($foreignKeyData[0]->column_name, 'users_id');
@@ -439,7 +449,7 @@ public function testForeignKey()
         $this->assertSame($foreignKeyData[0]->table_name, $this->db->DBPrefix . 'forge_test_invoices');
         $this->assertSame($foreignKeyData[0]->foreign_table_name, $this->db->DBPrefix . 'forge_test_users');
 
-        $this->forge->dropTable('forge_test_invoices', true);
+        $this->forge->dropTable($tableName, true);
         $this->forge->dropTable('forge_test_users', true);
     }
 
@@ -693,15 +703,23 @@ public function testDropForeignKey()
         $this->forge->addKey('id', true);
         $this->forge->addForeignKey('users_id', 'forge_test_users', 'id', 'CASCADE', 'CASCADE');
 
-        $this->forge->createTable('forge_test_invoices', true, $attributes);
+        $tableName      = 'forge_test_invoices';
+        $foreignKeyName = 'forge_test_invoices_users_id_foreign';
+        if ($this->db->DBDriver === 'OCI8')
+        {
+            $tableName      = 'forge_test_inv';
+            $foreignKeyName = 'forge_test_inv_users_id_fk';
+        }
 
-        $this->forge->dropForeignKey('forge_test_invoices', 'forge_test_invoices_users_id_foreign');
+        $this->forge->createTable($tableName, true, $attributes);
 
-        $foreignKeyData = $this->db->getForeignKeyData('forge_test_invoices');
+        $this->forge->dropForeignKey($tableName, $foreignKeyName);
+
+        $foreignKeyData = $this->db->getForeignKeyData($tableName);
 
         $this->assertEmpty($foreignKeyData);
 
-        $this->forge->dropTable('forge_test_invoices', true);
+        $this->forge->dropTable($tableName, true);
         $this->forge->dropTable('forge_test_users', true);
     }
 

From 65ff0573c804f8c7b9b611bb43a3d1980a5f855f Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Fri, 3 Jan 2020 18:32:20 +0900
Subject: [PATCH 1298/2325] test: add test for add field method.

---
 tests/system/Database/Live/ForgeTest.php | 25 +++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 959d5f618e5d..8f6962960276 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -760,7 +760,12 @@ public function testAddColumn()
 
     public function testAddFields()
     {
-        $this->forge->dropTable('forge_test_fields', true);
+        $tableName = 'forge_test_fields';
+        if ($this->db->DBDriver === 'OCI8')
+        {
+            $tableName = 'getestfield';
+        }
+        $this->forge->dropTable($tableName, true);
 
         $this->forge->addField([
             'id' => [
@@ -787,18 +792,14 @@ public function testAddFields()
 
         $this->forge->addKey('id', true);
         $this->forge->addUniqueKey(['username', 'active']);
-        $this->forge->createTable('forge_test_fields', true);
+        $create = $this->forge->createTable($tableName, true);
 
-        $fieldsNames = $this->db->getFieldNames('forge_test_fields');
-        $fieldsData  = $this->db->getFieldData('forge_test_fields');
+        $fieldsNames = $this->db->getFieldNames($tableName);
+        $fieldsData  = $this->db->getFieldData($tableName);
 
-        $this->forge->dropTable('forge_test_fields', true);
+        $this->forge->dropTable($tableName, true);
 
         $this->assertIsArray($fieldsNames);
-        $this->assertContains('id', $fieldsNames);
-        $this->assertContains('username', $fieldsNames);
-        $this->assertContains('name', $fieldsNames);
-        $this->assertContains('active', $fieldsNames);
 
         $fields = ['id', 'name', 'username', 'active'];
         $this->assertContains($fieldsData[0]->name, $fields);
@@ -836,6 +837,12 @@ public function testAddFields()
             $this->assertSame('varchar', $fieldsData[1]->type);
             $this->assertNull($fieldsData[1]->default);
             $this->assertSame(255, (int) $fieldsData[1]->max_length);
+        } elseif ($this->db->DBDriver === 'OCI8') {
+            //Check types
+            $this->assertSame('NUMBER', $fieldsData[0]->type);
+            $this->assertSame('VARCHAR2', $fieldsData[1]->type);
+            $this->assertSame(32, $fieldsData[0]->max_length);
+            $this->assertSame(255, $fieldsData[1]->max_length);
         } else {
             $this->fail(sprintf('DB driver "%s" is not supported.', $this->db->DBDriver));
         }

From 14fd82c6d446de9e2bfa947a98b1a2d96c6ab028 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:39:41 +0900
Subject: [PATCH 1299/2325] fix: remove comment.

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

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index be206e330b70..2e2076b3008a 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -58,7 +58,7 @@ class Builder extends BaseBuilder
 	 * @var array
 	 */
 	protected $randomKeyword = [
-		'DBMS_RANDOM.RANDOM' // @todo: 未検証
+		'DBMS_RANDOM.RANDOM'
 	];
 
 	/**

From 01d92b864801835980bca45275ce2d66f59bb28f Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:40:07 +0900
Subject: [PATCH 1300/2325] fix: remove as keyword.

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

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 2e2076b3008a..b89575af9899 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -69,7 +69,7 @@ class Builder extends BaseBuilder
 	 *
 	 * @var string
 	 */
-	protected $countString = 'SELECT COUNT(1) AS ';
+	protected $countString = 'SELECT COUNT(1) ';
 
 	/**
 	 * Limit used flag

From 6f19c1bf1c5a28e50234ea2d218fa6df797ac691 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:40:37 +0900
Subject: [PATCH 1301/2325] feat: insertBatch for auto increment.

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

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index b89575af9899..4c602fe3e693 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -94,8 +94,24 @@ class Builder extends BaseBuilder
 	 */
 	protected function _insertBatch(string $table, array $keys, array $values): string
 	{
-		$keys = implode(', ', $keys);
-		$sql  = "INSERT ALL\n";
+		$keys            = implode(', ', $keys);
+		$has_primary_key = in_array('PRIMARY', array_column($this->db->getIndexData($table), 'type'), true);
+
+		// ORA-00001 measures
+		if ($has_primary_key)
+		{
+			$sql                 = 'INSERT INTO ' . $table . ' (' . $keys . ") \n SELECT * FROM (\n";
+			$select_query_values = [];
+
+			for ($i = 0, $c = count($values); $i < $c; $i++)
+			{
+				$select_query_values[] = 'SELECT ' . substr(substr($values[$i], 1), 0, -1) . ' FROM DUAL';
+			}
+
+			return $sql . implode("\n UNION ALL \n", $select_query_values) . "\n)";
+		}
+
+		$sql = "INSERT ALL\n";
 
 		for ($i = 0, $c = count($values); $i < $c; $i++)
 		{

From 4a26bd583ab6a118b7eaf4789bf0fe1325706e99 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:41:16 +0900
Subject: [PATCH 1302/2325] feat: add replace command.

---
 system/Database/OCI8/Builder.php | 68 ++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 4c602fe3e693..7199f031f104 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -123,6 +123,74 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Replace statement
+	 *
+	 * Generates a platform-specific replace string from the supplied data
+	 *
+	 * @param string $table  The table name
+	 * @param array  $keys   The insert keys
+	 * @param array  $values The insert values
+	 *
+	 * @return string
+	 */
+	protected function _replace(string $table, array $keys, array $values): string
+	{
+		$field_names = array_map(function ($column_name) {
+			return trim($column_name, '"');
+		}, $keys);
+
+		$unique_indexes     = array_filter($this->db->getIndexData($table), function ($index) use ($field_names) {
+			$has_all_fields = count(array_intersect($index->fields, $field_names)) === count($index->fields);
+
+			return (($index->type === 'PRIMARY') && $has_all_fields);
+		});
+		$replaceable_fields = array_filter($keys, function ($column_name) use ($unique_indexes) {
+			foreach ($unique_indexes as $index)
+			{
+				if (in_array(trim($column_name, '"'), $index->fields, true))
+				{
+					return false;
+				}
+			}
+
+			return true;
+		});
+
+		$sql = 'MERGE INTO ' . $table . "\n USING (SELECT ";
+
+		$sql .= implode(', ', array_map(function ($column_name, $value) {
+			return $value . ' ' . $column_name;
+		}, $keys, $values));
+
+		$sql .= ' FROM DUAL) "_replace" ON ( ';
+
+		$on_list   = [];
+		$on_list[] = '1 != 1';
+
+		foreach ($unique_indexes as $index)
+		{
+			$on_list[] = '(' . implode(' AND ', array_map(function ($column_name) use ($table) {
+				return $table . '."' . $column_name . '" = "_replace"."' . $column_name . '"';
+			}, $index->fields)) . ')';
+		}
+
+		$sql .= implode(' OR ', $on_list) . ') WHEN MATCHED THEN UPDATE SET ';
+
+		$sql .= implode(', ', array_map(function ($column_name) {
+			return $column_name . ' = "_replace".' . $column_name;
+		}, $replaceable_fields));
+
+		$sql .= ' WHEN NOT MATCHED THEN INSERT (' . implode(', ', $replaceable_fields) . ') VALUES ';
+		$sql .= ' (' . implode(', ', array_map(function ($column_name) {
+			return '"_replace".' . $column_name;
+		}, $replaceable_fields)) . ')';
+
+		return $sql;
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * Truncate statement
 	 *

From 5b9167f2821b1f17bd73d72842f47dd85b2d607f Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:41:49 +0900
Subject: [PATCH 1303/2325] fix: update method for limit.

---
 system/Database/OCI8/Builder.php | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 7199f031f104..ed96cd55f1be 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -256,6 +256,37 @@ protected function _delete(string $table): string
 
 	//--------------------------------------------------------------------
 
+	/**
+	 * Update statement
+	 *
+	 * Generates a platform-specific update string from the supplied data
+	 *
+	 * @param string $table  the Table name
+	 * @param array  $values the Update data
+	 *
+	 * @return string
+	 */
+	protected function _update(string $table, array $values): string
+	{
+		$valStr = [];
+
+		foreach ($values as $key => $val)
+		{
+			$valStr[] = $key . ' = ' . $val;
+		}
+
+		if ($this->QBLimit)
+		{
+			$this->where('rownum <= ', $this->QBLimit, false);
+		}
+
+		return 'UPDATE ' . $this->compileIgnore('update') . $table . ' SET ' . implode(', ', $valStr)
+				. $this->compileWhereHaving('QBWhere')
+				. $this->compileOrderBy();
+	}
+
+	//--------------------------------------------------------------------
+
 	/**
 	 * LIMIT string
 	 *

From 5798e8e8e96078685527272a58475c3de1131073 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:44:28 +0900
Subject: [PATCH 1304/2325] feat: add insertId method, @todo: has a strange
 design.

---
 system/Database/OCI8/Builder.php       | 22 ++++++++++
 system/Database/OCI8/Connection.php    | 56 +++++++++++++++++++++++++-
 system/Database/OCI8/PreparedQuery.php | 38 +++++++++++++++--
 3 files changed, 110 insertions(+), 6 deletions(-)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index ed96cd55f1be..17fac1198ec1 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -319,4 +319,26 @@ protected function resetSelect()
 		$this->limitUsed = false;
 		parent::resetSelect();
 	}
+
+	//--------------------------------------------------------------------
+
+	/**
+	 * Insert statement
+	 *
+	 * Generates a platform-specific insert string from the supplied data
+	 *
+	 * @param string $table         The table name
+	 * @param array  $keys          The insert keys
+	 * @param array  $unescapedKeys The insert values
+	 *
+	 * @return string
+	 */
+	protected function _insert(string $table, array $keys, array $unescapedKeys): string
+	{
+		// Has a strange design.
+		// Processing to get the table where the last insert was performed for insertId method.
+		$this->db->latestInsertedTableName = $table;
+
+		return 'INSERT ' . $this->compileIgnore('insert') . 'INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES (' . implode(', ', $unescapedKeys) . ') RETURNING ROWID INTO :CI_OCI8_ROWID';
+	}
 }
diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index e201502776a4..bc8ef8e1baee 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -112,6 +112,20 @@ class Connection extends BaseConnection implements ConnectionInterface
 	 */
 	public $cursorId;
 
+	/**
+	 * RowID
+	 *
+	 * @var integer|null
+	 */
+	public $rowId;
+
+	/**
+	 * Latest inserted table name.
+	 *
+	 * @var string|null
+	 */
+	public $latestInsertedTableName;
+
 	/**
 	 * confirm DNS format.
 	 *
@@ -228,13 +242,18 @@ public function execute(string $sql)
 		if ($this->resetStmtId === true)
 		{
 			$sql = rtrim($sql, ';');
-			if (strpos('BEGIN', ltrim($sql)) === 0)
+			if (strpos(ltrim($sql), 'BEGIN') === 0)
 			{
 				$sql .= ';';
 			}
 			$this->stmtId = oci_parse($this->connID, $sql);
 		}
 
+		if (strpos($sql, 'RETURNING ROWID INTO :CI_OCI8_ROWID') !== false)
+		{
+			oci_bind_by_name($this->stmtId, ':CI_OCI8_ROWID', $this->rowId, 255);
+		}
+
 		oci_set_prefetch($this->stmtId, 1000);
 		return (oci_execute($this->stmtId, $this->commitMode)) ? $this->stmtId : false;
 	}
@@ -655,7 +674,40 @@ public function error(): array
 	 */
 	public function insertID(): int
 	{
-		throw new DatabaseException(lang('Database.featureUnavailable'));
+		if (empty($this->rowId) || empty($this->latestInsertedTableName)) {
+			return 0;
+		}
+
+		$indexs = $this->getIndexData($this->latestInsertedTableName);
+		$field_datas = $this->getFieldData($this->latestInsertedTableName);
+
+		if (!$indexs || !$field_datas) {
+			return 0;
+		}
+
+		$column_type_list = array_column($field_datas, 'type', 'name');
+		$primary_column_name = '';
+		foreach ((is_array($indexs) ? $indexs : [] ) as $index ) {
+			if ($index->type !== 'PRIMARY' || count($index->fields) !== 1) {
+				continue;
+			}
+
+			$primary_column_name = $this->protectIdentifiers($index->fields[0], false, false);
+			$primary_column_type = $column_type_list[$primary_column_name];
+
+			if ($primary_column_type !== 'NUMBER') {
+				continue;
+			}
+		}
+
+		if (!$primary_column_name) {
+			return 0;
+		}
+
+		$table = $this->protectIdentifiers($this->latestInsertedTableName, true);
+		$query = $this->query('SELECT '.$this->protectIdentifiers($primary_column_name, false).' SEQ FROM '.$table . ' WHERE ROWID = ?', $this->rowId)->getRow();
+
+		return (int)($query->SEQ ?? 0);
 	}
 
 	//--------------------------------------------------------------------
diff --git a/system/Database/OCI8/PreparedQuery.php b/system/Database/OCI8/PreparedQuery.php
index ff5808846d96..e543d7301ac7 100644
--- a/system/Database/OCI8/PreparedQuery.php
+++ b/system/Database/OCI8/PreparedQuery.php
@@ -46,6 +46,31 @@
  */
 class PreparedQuery extends BasePreparedQuery implements PreparedQueryInterface
 {
+	private $isCollectRowId;
+
+	/**
+	 * Prepares the query against the database, and saves the connection
+	 * info necessary to execute the query later.
+	 *
+	 * NOTE: This version is based on SQL code. Child classes should
+	 * override this method.
+	 *
+	 * @param string $sql
+	 * @param array  $options    Passed to the connection's prepare statement.
+	 * @param string $queryClass
+	 *
+	 * @return mixed
+	 */
+	public function prepare(string $sql, array $options = [], string $queryClass = 'CodeIgniter\\Database\\Query')
+	{
+		$this->isCollectRowId = false;
+
+		if (substr($sql, strpos($sql, 'RETURNING ROWID INTO :CI_OCI8_ROWID')) === 'RETURNING ROWID INTO :CI_OCI8_ROWID') {
+			$this->isCollectRowId = true;
+		}
+
+		return parent::prepare($sql, $options, $queryClass);
+	}
 
 	/**
 	 * Prepares the query against the database, and saves the connection
@@ -95,9 +120,15 @@ public function _execute(array $data): bool
 			throw new \BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
 		}
 
-		foreach ($data as $key => $val)
+		$last_key = 0;
+		foreach (array_keys($data) as $key)
 		{
-			oci_bind_by_name($this->statement, ':' . $key, $val);
+			oci_bind_by_name($this->statement, ':' . $key, $data[$key]);
+			$last_key = $key;
+		}
+
+		if ($this->isCollectRowId) {
+			oci_bind_by_name($this->statement, ':' . (++$last_key), $this->db->rowId, 255);
 		}
 
 		return oci_execute($this->statement, $this->db->commitMode);
@@ -131,8 +162,7 @@ public function parameterize(string $sql): string
 		$count = 0;
 
 		$sql = preg_replace_callback('/\?/', function ($matches) use (&$count) {
-			$count ++;
-			return ":{$count}";
+			return ":".($count++);
 		}, $sql);
 
 		return $sql;

From ea52a9e025060473c53ba2575d6bc3ac6b664016 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:45:12 +0900
Subject: [PATCH 1305/2325] feat: add nullable flag.

---
 system/Database/OCI8/Connection.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index bc8ef8e1baee..15d1c50eade6 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -370,7 +370,8 @@ public function _fieldData(string $table): array
 			{
 				$default = '';
 			}
-			$retval[$i]->default = $default;
+			$retval[$i]->default  = $default;
+			$retval[$i]->nullable = $query[$i]->NULLABLE === 'Y';
 		}
 
 		return $retval;

From 3a83365fab7efb5a4ff61d0dbcad00e78b10131f Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:45:52 +0900
Subject: [PATCH 1306/2325] fix: remove dbPrefix.

---
 system/Database/OCI8/Connection.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 15d1c50eade6..5fae1beb22ff 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -398,10 +398,10 @@ public function _indexData(string $table): array
 		}
 
 		$sql = 'SELECT AIC.INDEX_NAME, UC.CONSTRAINT_TYPE, AIC.COLUMN_NAME '
-			. ' FROM ALL_IND_COLUMNS uic '
+			. ' FROM ALL_IND_COLUMNS AIC '
 			. ' LEFT JOIN USER_CONSTRAINTS UC ON AIC.INDEX_NAME = UC.CONSTRAINT_NAME AND AIC.TABLE_NAME = UC.TABLE_NAME '
-			. 'WHERE TABLE_NAME = ' . $this->escape(strtolower($this->DBPrefix . $table)) . ' '
-			. 'AND TABLE_OWNER = ' . $this->escape(strtoupper($owner)) . ' '
+			. 'WHERE AIC.TABLE_NAME = ' . $this->escape(strtolower($table)) . ' '
+			. 'AND AIC.TABLE_OWNER = ' . $this->escape(strtoupper($owner)) . ' '
 			. ' ORDER BY UC.CONSTRAINT_TYPE, AIC.COLUMN_POSITION';
 
 		if (($query = $this->query($sql)) === false)

From cd5db61f58a4d74f065567610a72d5ca831ba7bb Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:46:40 +0900
Subject: [PATCH 1307/2325] style: fix code style.

---
 system/Database/OCI8/Connection.php | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 5fae1beb22ff..fac040854da9 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -675,38 +675,44 @@ public function error(): array
 	 */
 	public function insertID(): int
 	{
-		if (empty($this->rowId) || empty($this->latestInsertedTableName)) {
+		if (empty($this->rowId) || empty($this->latestInsertedTableName))
+		{
 			return 0;
 		}
 
-		$indexs = $this->getIndexData($this->latestInsertedTableName);
+		$indexs      = $this->getIndexData($this->latestInsertedTableName);
 		$field_datas = $this->getFieldData($this->latestInsertedTableName);
 
-		if (!$indexs || !$field_datas) {
+		if (! $indexs || ! $field_datas)
+		{
 			return 0;
 		}
 
-		$column_type_list = array_column($field_datas, 'type', 'name');
+		$column_type_list    = array_column($field_datas, 'type', 'name');
 		$primary_column_name = '';
-		foreach ((is_array($indexs) ? $indexs : [] ) as $index ) {
-			if ($index->type !== 'PRIMARY' || count($index->fields) !== 1) {
+		foreach ((is_array($indexs) ? $indexs : [] ) as $index)
+		{
+			if ($index->type !== 'PRIMARY' || count($index->fields) !== 1)
+			{
 				continue;
 			}
 
 			$primary_column_name = $this->protectIdentifiers($index->fields[0], false, false);
 			$primary_column_type = $column_type_list[$primary_column_name];
 
-			if ($primary_column_type !== 'NUMBER') {
+			if ($primary_column_type !== 'NUMBER')
+			{
 				continue;
 			}
 		}
 
-		if (!$primary_column_name) {
+		if (! $primary_column_name)
+		{
 			return 0;
 		}
 
 		$table = $this->protectIdentifiers($this->latestInsertedTableName, true);
-		$query = $this->query('SELECT '.$this->protectIdentifiers($primary_column_name, false).' SEQ FROM '.$table . ' WHERE ROWID = ?', $this->rowId)->getRow();
+		$query = $this->query('SELECT ' . $this->protectIdentifiers($primary_column_name, false) . ' SEQ FROM ' . $table . ' WHERE ROWID = ?', $this->rowId)->getRow();
 
 		return (int)($query->SEQ ?? 0);
 	}

From 5315adab1154b54a94e77a27996e40197b548cb9 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:47:30 +0900
Subject: [PATCH 1308/2325] fix: ORA-01451

---
 system/Database/OCI8/Forge.php | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 85a5bdc3d3e2..4fe2826e0e67 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -122,10 +122,25 @@ protected function _alterTable(string $alter_type, string $table, $field)
 			$alter_type = 'MODIFY';
 		}
 
-		$sql  = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
-		$sqls = [];
+		$sql          = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
+		$nullable_map = array_column($this->db->getFieldData($table), 'nullable', 'name');
+		$sqls         = [];
 		for ($i = 0, $c = count($field); $i < $c; $i++)
 		{
+			if ($alter_type === 'MODIFY')
+			{
+				// If a null constraint is added to a column with a null constraint,
+				// ORA-01451 will occur,
+				// so add null constraint is used only when it is different from the current null constraint.
+				$is_want_to_add_null  = (strpos($field[$i]['null'], ' NOT') === false);
+				$current_null_addable = $nullable_map[$field[$i]['name']];
+
+				if ($is_want_to_add_null === $current_null_addable)
+				{
+					$field[$i]['null'] = '';
+				}
+			}
+
 			if ($field[$i]['_literal'] !== false)
 			{
 				$field[$i] = "\n\t" . $field[$i]['_literal'];

From 74db15b57c617d274055b6033b709a68dadf20a8 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:48:05 +0900
Subject: [PATCH 1309/2325] fix: Fix to be able to update identity.

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

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 4fe2826e0e67..253aac5e754a 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -193,7 +193,7 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
 			&& version_compare($this->db->getVersion(), '12.1', '>=')
 		)
 		{
-			$field['auto_increment'] = ' GENERATED ALWAYS AS IDENTITY';
+			$field['auto_increment'] = ' GENERATED BY DEFAULT AS IDENTITY';
 		}
 	}
 

From b6a96fa7c838e57a170ef4791f35ce528c81a933 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:49:09 +0900
Subject: [PATCH 1310/2325] feat: Specified default length.

---
 system/Database/OCI8/Forge.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 253aac5e754a..6b0906a935ed 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -235,11 +235,16 @@ protected function _attributeType(array &$attributes)
 		switch (strtoupper($attributes['TYPE']))
 		{
 			case 'TINYINT':
+				$attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 3;
 			case 'SMALLINT':
+				$attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 5;
 			case 'MEDIUMINT':
+				$attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 7;
 			case 'INT':
 			case 'INTEGER':
+				$attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 11;
 			case 'BIGINT':
+				$attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 19;
 			case 'NUMERIC':
 				$attributes['TYPE'] = 'NUMBER';
 				return;
@@ -248,7 +253,8 @@ protected function _attributeType(array &$attributes)
 				return;
 			case 'TEXT':
 			case 'VARCHAR':
-				$attributes['TYPE'] = 'VARCHAR2';
+				$attributes['TYPE']       = 'VARCHAR2';
+				$attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 255;
 				return;
 			default: return;
 		}

From d9ebce1520f0e9dc2a0ff2dd8dbd4766423f95f6 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:49:53 +0900
Subject: [PATCH 1311/2325] style: fix code style.

---
 system/Database/OCI8/PreparedQuery.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/system/Database/OCI8/PreparedQuery.php b/system/Database/OCI8/PreparedQuery.php
index e543d7301ac7..7fd98611c937 100644
--- a/system/Database/OCI8/PreparedQuery.php
+++ b/system/Database/OCI8/PreparedQuery.php
@@ -65,7 +65,8 @@ public function prepare(string $sql, array $options = [], string $queryClass = '
 	{
 		$this->isCollectRowId = false;
 
-		if (substr($sql, strpos($sql, 'RETURNING ROWID INTO :CI_OCI8_ROWID')) === 'RETURNING ROWID INTO :CI_OCI8_ROWID') {
+		if (substr($sql, strpos($sql, 'RETURNING ROWID INTO :CI_OCI8_ROWID')) === 'RETURNING ROWID INTO :CI_OCI8_ROWID')
+		{
 			$this->isCollectRowId = true;
 		}
 
@@ -127,7 +128,8 @@ public function _execute(array $data): bool
 			$last_key = $key;
 		}
 
-		if ($this->isCollectRowId) {
+		if ($this->isCollectRowId)
+		{
 			oci_bind_by_name($this->statement, ':' . (++$last_key), $this->db->rowId, 255);
 		}
 
@@ -162,7 +164,7 @@ public function parameterize(string $sql): string
 		$count = 0;
 
 		$sql = preg_replace_callback('/\?/', function ($matches) use (&$count) {
-			return ":".($count++);
+			return ':' . ($count++);
 		}, $sql);
 
 		return $sql;

From cad4a7e796ae61bbd6ea6c80a57f4d6e29cde431 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:50:18 +0900
Subject: [PATCH 1312/2325] fix: Fixed typing errors.

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

diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php
index 85faae1db6a2..2df16ab7273a 100644
--- a/system/Database/OCI8/Result.php
+++ b/system/Database/OCI8/Result.php
@@ -101,10 +101,10 @@ public function getFieldData(): array
 	 */
 	public function freeResult()
 	{
-		if (is_object($this->resultID))
+		if (is_resource($this->resultID))
 		{
 			oci_free_statement($this->resultID);
-			$this->resultID = null;
+			$this->resultID = false;
 		}
 	}
 

From 17b2e1f33d62f232b776f7c558554a8882e9ed8a Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:51:02 +0900
Subject: [PATCH 1313/2325] fix: dbname to upper.

---
 tests/system/Database/Live/DbUtilsTest.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/system/Database/Live/DbUtilsTest.php b/tests/system/Database/Live/DbUtilsTest.php
index e997981b55ec..61e44628822f 100644
--- a/tests/system/Database/Live/DbUtilsTest.php
+++ b/tests/system/Database/Live/DbUtilsTest.php
@@ -108,12 +108,12 @@ public function testUtilsOptimizeDatabase()
     {
         $util = (new Database())->loadUtils($this->db);
 
-		if ($this->db->DBDriver === 'OCI8')
-		{
-			$this->markTestSkipped(
-			  'Unsupported feature of the oracle database platform.'
-			);
-		}
+        if ($this->db->DBDriver === 'OCI8')
+        {
+            $this->markTestSkipped(
+              'Unsupported feature of the oracle database platform.'
+            );
+        }
 
         $d = $util->optimizeDatabase();
 

From 2576896be75cfa91eb6c4f807930f142ea5a8abd Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:51:29 +0900
Subject: [PATCH 1314/2325] test: skip to not support oci.

---
 tests/system/Database/Live/ForgeTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 8f6962960276..8b3be710da64 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -55,6 +55,10 @@ public function testCreateDatabase()
 
     public function testCreateDatabaseIfNotExists()
     {
+		if ($this->db->DBDriver === 'OCI8')
+		{
+			$this->markTestSkipped('OCI8 does not support create database.');
+		}
         $dbName = 'test_forge_database_exist';
 
         $databaseCreateIfNotExists = $this->forge->createDatabase($dbName, true);
@@ -67,6 +71,10 @@ public function testCreateDatabaseIfNotExists()
 
     public function testCreateDatabaseIfNotExistsWithDb()
     {
+		if ($this->db->DBDriver === 'OCI8')
+		{
+			$this->markTestSkipped('OCI8 does not support create database.');
+		}
         $dbName = 'test_forge_database_exist';
 
         $this->forge->createDatabase($dbName);

From 60b55e42b21033869ae005401d2ddcd88e2e5f61 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:52:16 +0900
Subject: [PATCH 1315/2325] test: fix column type.

---
 tests/system/Database/Live/ForgeTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 8b3be710da64..d45bb29b31a7 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -850,6 +850,7 @@ public function testAddFields()
             $this->assertSame('NUMBER', $fieldsData[0]->type);
             $this->assertSame('VARCHAR2', $fieldsData[1]->type);
             $this->assertSame(32, $fieldsData[0]->max_length);
+            $this->assertSame('', $fieldsData[1]->default);
             $this->assertSame(255, $fieldsData[1]->max_length);
         } else {
             $this->fail(sprintf('DB driver "%s" is not supported.', $this->db->DBDriver));

From 850b598169290a352cc5b73e63e2e55669021e9b Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:52:53 +0900
Subject: [PATCH 1316/2325] test: add getIndexData.

---
 tests/system/Database/Live/ForgeTest.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index d45bb29b31a7..7337d24e62f7 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -928,6 +928,18 @@ public function testCompositeKey()
             $this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
             $this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
         }
+		elseif ($this->db->DBDriver === 'OCI8')
+		{
+			$this->assertEquals($keys['pk_db_forge_test_1']->name, 'pk_db_forge_test_1');
+			$this->assertEquals($keys['pk_db_forge_test_1']->fields, ['id']);
+			$this->assertEquals($keys['pk_db_forge_test_1']->type, 'PRIMARY');
+			$this->assertEquals($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
+			$this->assertEquals($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
+			$this->assertEquals($keys['db_forge_test_1_code_company']->type, 'INDEX');
+			$this->assertEquals($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
+			$this->assertEquals($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
+			$this->assertEquals($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
+		}
 
         $this->forge->dropTable('forge_test_1', true);
     }

From 96e2fcb2d15557df4b3cc582eeb7b3768e108486 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:53:56 +0900
Subject: [PATCH 1317/2325] test: add escape.

---
 tests/system/Database/Live/GroupTest.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/system/Database/Live/GroupTest.php b/tests/system/Database/Live/GroupTest.php
index 705172ac97f0..32ccbce6765e 100644
--- a/tests/system/Database/Live/GroupTest.php
+++ b/tests/system/Database/Live/GroupTest.php
@@ -42,7 +42,7 @@ public function testHavingBy()
         $result = $this->db->table('job')
             ->select('name')
             ->groupBy('name')
-            ->having('SUM(id) > 2')
+						->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
             ->get()
             ->getResultArray();
 
@@ -55,7 +55,7 @@ public function testOrHavingBy()
             ->select('id')
             ->groupBy('id')
             ->having('id >', 3)
-            ->orHaving('SUM(id) > 2')
+						->orHaving('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
             ->get()
             ->getResult();
 
@@ -114,7 +114,7 @@ public function testOrHavingNotIn()
             ->select('name')
             ->groupBy('name')
             ->orderBy('name', 'asc')
-            ->having('SUM(id) > 2')
+						->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
             ->orHavingNotIn('name', ['Developer', 'Politician'])
             ->get()
             ->getResult();
@@ -174,7 +174,7 @@ public function testOrNotHavingLike()
             ->select('name')
             ->groupBy('name')
             ->orderBy('name', 'asc')
-            ->having('SUM(id) > 2')
+						->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
             ->orNotHavingLike('name', 'ian')
             ->get()
             ->getResult();
@@ -191,9 +191,9 @@ public function testAndHavingGroupStart()
             ->select('name')
             ->groupBy('name')
             ->orderBy('name', 'asc')
-            ->having('SUM(id) > 2')
+						->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
             ->havingGroupStart()
-            ->having('SUM(id) <= 4')
+							->having('SUM(' . $this->db->protectIdentifiers('id') . ') <= 4')
             ->havingLike('name', 'ant', 'before')
             ->havingGroupEnd()
             ->get()
@@ -209,9 +209,9 @@ public function testOrHavingGroupStart()
             ->select('name')
             ->groupBy('name')
             ->orderBy('name', 'asc')
-            ->having('SUM(id) > 2')
+						->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
             ->orHavingGroupStart()
-            ->having('SUM(id) <= 4')
+							->having('SUM(' . $this->db->protectIdentifiers('id') . ') <= 4')
             ->havingLike('name', 'ant', 'before')
             ->havingGroupEnd()
             ->get()
@@ -228,9 +228,9 @@ public function testNotHavingGroupStart()
             ->select('name')
             ->groupBy('name')
             ->orderBy('name', 'asc')
-            ->having('SUM(id) > 2')
+						->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
             ->notHavingGroupStart()
-            ->having('SUM(id) <= 4')
+							->having('SUM(' . $this->db->protectIdentifiers('id') . ') <= 4')
             ->havingLike('name', 'ant', 'before')
             ->havingGroupEnd()
             ->get()
@@ -246,9 +246,9 @@ public function testOrNotHavingGroupStart()
             ->select('name')
             ->groupBy('name')
             ->orderBy('name', 'asc')
-            ->having('SUM(id) > 2')
+						->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
             ->orNotHavingGroupStart()
-            ->having('SUM(id) < 2')
+							->having('SUM(' . $this->db->protectIdentifiers('id') . ') < 2')
             ->havingLike('name', 'o')
             ->havingGroupEnd()
             ->get()

From 8a41297d9cfb69b508ec992527dbbe6747520451 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:54:48 +0900
Subject: [PATCH 1318/2325] test: add last insert id.

---
 tests/system/Database/Live/PreparedQueryTest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php
index acfc17277982..fcb4769a8801 100644
--- a/tests/system/Database/Live/PreparedQueryTest.php
+++ b/tests/system/Database/Live/PreparedQueryTest.php
@@ -69,6 +69,11 @@ public function testPrepareReturnsPreparedQuery()
             $expected = "INSERT INTO {$ec}{$pre}user{$ec} ({$ec}name{$ec}, {$ec}email{$ec}) VALUES ({$placeholders})";
         }
 
+        if ($this->db->DBDriver === 'OCI8')
+        {
+            $expected .= ' RETURNING ROWID INTO ?';
+        }
+
         $this->assertSame($expected, $this->query->getQueryString());
     }
 

From cc75e37156f4699105142276f400fd8364c490ea Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:55:44 +0900
Subject: [PATCH 1319/2325] test: add test case for not escape.

---
 tests/system/Database/Live/UpdateTest.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index f7e2fb5e4b32..1e1e989ff5d5 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -201,6 +201,28 @@ public function testUpdatePeriods()
      */
     public function testSetWithoutEscape()
     {
+		if ($this->db->DBDriver === 'OCI8')
+		{
+			$forge = \Config\Database::forge($this->DBGroup);
+			$forge->modifyColumn('job', [
+				'description' => [
+					'name' => 'DESCRIPTION',
+				],
+				'name'        => [
+					'name' => 'NAME',
+				],
+			]);
+			$this->db->table('job')
+					 ->set('description', 'name', false)
+					 ->update();
+
+			$this->seeInDatabase('job', [
+				'NAME'        => 'Developer',
+				'DESCRIPTION' => 'Developer',
+			]);
+			return;
+		}
+
         $this->db->table('job')
             ->set('description', 'name', false)
             ->update();

From 940222f5706f347daa3b1bd82df94cc1f84bb280 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:56:37 +0900
Subject: [PATCH 1320/2325] test: add test case for sub query.

---
 tests/system/Database/Live/WhereTest.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tests/system/Database/Live/WhereTest.php b/tests/system/Database/Live/WhereTest.php
index 76756e19a219..88364218a6ee 100644
--- a/tests/system/Database/Live/WhereTest.php
+++ b/tests/system/Database/Live/WhereTest.php
@@ -127,10 +127,21 @@ public function testSubQuery()
             ->where('name', 'Developer')
             ->getCompiledSelect();
 
+		if ($this->db->DBDriver === 'OCI8')
+		{
+			$jobs = $this->db->table('job')
+							 ->where('"id" not in (' . $subQuery . ')', null, false)
+							 ->orderBy('id')
+							 ->get()
+							 ->getResult();
+		}
+		else
+		{
         $jobs = $this->db->table('job')
             ->where('id not in (' . $subQuery . ')', null, false)
             ->get()
             ->getResult();
+		}
 
         $this->assertCount(3, $jobs);
         $this->assertSame('Politician', $jobs[0]->name);
@@ -145,10 +156,20 @@ public function testSubQueryAnotherType()
             ->where('name', 'Developer')
             ->getCompiledSelect();
 
+		if ($this->db->DBDriver === 'OCI8')
+		{
+			$jobs = $this->db->table('job')
+							 ->where('"id" = (' . $subQuery . ')', null, false)
+							 ->get()
+							 ->getResult();
+		}
+		else
+		{
         $jobs = $this->db->table('job')
             ->where('id = (' . $subQuery . ')', null, false)
             ->get()
             ->getResult();
+		}
 
         $this->assertCount(1, $jobs);
         $this->assertSame('Developer', $jobs[0]->name);

From fc3f80fb745786e8da7b70898f9b88cc1d616909 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 14 Jan 2020 14:58:44 +0900
Subject: [PATCH 1321/2325] feat: add test case for dataSeek.

---
 tests/system/Database/Live/GetTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php
index 63f5ee9afd0c..a923435942f4 100644
--- a/tests/system/Database/Live/GetTest.php
+++ b/tests/system/Database/Live/GetTest.php
@@ -176,6 +176,10 @@ public function testGetDataSeek()
             $this->expectException(DatabaseException::class);
             $this->expectExceptionMessage('SQLite3 doesn\'t support seeking to other offset.');
         }
+		elseif ($this->db->DBDriver === 'OCI8')
+		{
+			$this->markTestSkipped('OCI8 does not support data seek.');
+		}
 
         $data->dataSeek(3);
 

From 2e7df6357c94d1bb301ae7f2f03b0e6b4cff0bc1 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Fri, 17 Jan 2020 01:22:00 +0900
Subject: [PATCH 1322/2325] docs: add note.

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

diff --git a/user_guide_src/source/database/helpers.rst b/user_guide_src/source/database/helpers.rst
index a9a160a26713..0a6695d0bcdf 100644
--- a/user_guide_src/source/database/helpers.rst
+++ b/user_guide_src/source/database/helpers.rst
@@ -17,6 +17,8 @@ The insert ID number when performing database inserts.
     driver, this function requires a $name parameter, which specifies the
     appropriate sequence to check for the insert id.
 
+.. note:: If using the OCI8 driver, the insert ID can be get when using insert() of :doc:`QueryBuilder<./querybuilder>`.
+
 **$db->affectedRows()**
 
 Displays the number of affected rows, when doing "write" type queries

From 3c27a6f6cf5d6034405adc7ce325392d53aab61a Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Wed, 29 Jan 2020 23:40:51 +0900
Subject: [PATCH 1323/2325] fix: too many connection.

---
 system/Database/OCI8/Connection.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index fac040854da9..28d08bf5ecbd 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -185,6 +185,14 @@ public function reconnect()
 	 */
 	protected function _close()
 	{
+		if (is_resource($this->cursorId))
+		{
+			oci_free_statement($this->cursorId);
+		}
+		if (is_resource($this->stmtId))
+		{
+			oci_free_statement($this->stmtId);
+		}
 		oci_close($this->connID);
 	}
 

From e70071b1e261b56b5dc155064026c28cb7fb2cab Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 9 Sep 2021 02:19:08 +0900
Subject: [PATCH 1324/2325] fix: the random value retrieval is now not affected
 by DB prefix.

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

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 17fac1198ec1..d353e1ca60c5 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -58,7 +58,7 @@ class Builder extends BaseBuilder
 	 * @var array
 	 */
 	protected $randomKeyword = [
-		'DBMS_RANDOM.RANDOM'
+		'"DBMS_RANDOM"."RANDOM"'
 	];
 
 	/**

From 623bf34ed854ec1e2a86b6052205a2bbc90c91b7 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 9 Sep 2021 02:20:37 +0900
Subject: [PATCH 1325/2325] fix: due to supported ignoreOffset.

---
 system/Database/OCI8/Builder.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index d353e1ca60c5..0d5e3d8a4117 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -296,19 +296,20 @@ protected function _update(string $table, array $values): string
 	 *
 	 * @return string
 	 */
-	protected function _limit(string $sql): string
+	protected function _limit(string $sql, bool $offsetIgnore = false): string
 	{
+        $offset = (int)($offsetIgnore === false) ? $this->QBOffset : 0 ;
 		if (version_compare($this->db->getVersion(), '12.1', '>='))
 		{
 			// OFFSET-FETCH can be used only with the ORDER BY clause
 			empty($this->QBOrderBy) && $sql .= ' ORDER BY 1';
 
-			return $sql . ' OFFSET ' . (int) $this->QBOffset . ' ROWS FETCH NEXT ' . $this->QBLimit . ' ROWS ONLY';
+			return $sql . ' OFFSET ' . (int) $offset . ' ROWS FETCH NEXT ' . $this->QBLimit . ' ROWS ONLY';
 		}
 
 		$this->limitUsed = true;
-		return 'SELECT * FROM (SELECT inner_query.*, rownum rnum FROM (' . $sql . ') inner_query WHERE rownum < ' . ($this->QBOffset + $this->QBLimit + 1) . ')'
-			. ($this->QBOffset ? ' WHERE rnum >= ' . ($this->QBOffset + 1) : '');
+		return 'SELECT * FROM (SELECT inner_query.*, rownum rnum FROM (' . $sql . ') inner_query WHERE rownum < ' . ($offset + $this->QBLimit + 1) . ')'
+			. ($offset ? ' WHERE rnum >= ' . ($offset + 1) : '');
 	}
 
 	/**

From 029a8fb13a0ffc155ecb63e82809d23d18682cd0 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 9 Sep 2021 02:23:09 +0900
Subject: [PATCH 1326/2325] fix: Not throw execute error when DBDebug is false.

---
 system/Database/OCI8/Connection.php | 45 ++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 28d08bf5ecbd..311a315574cb 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -41,6 +41,7 @@
 use CodeIgniter\Database\ConnectionInterface;
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use stdClass;
+use ErrorException;
 
 /**
  * Connection for Postgre
@@ -247,23 +248,33 @@ public function getVersion(): string
 	 */
 	public function execute(string $sql)
 	{
-		if ($this->resetStmtId === true)
-		{
-			$sql = rtrim($sql, ';');
-			if (strpos(ltrim($sql), 'BEGIN') === 0)
-			{
-				$sql .= ';';
-			}
-			$this->stmtId = oci_parse($this->connID, $sql);
-		}
-
-		if (strpos($sql, 'RETURNING ROWID INTO :CI_OCI8_ROWID') !== false)
-		{
-			oci_bind_by_name($this->stmtId, ':CI_OCI8_ROWID', $this->rowId, 255);
-		}
-
-		oci_set_prefetch($this->stmtId, 1000);
-		return (oci_execute($this->stmtId, $this->commitMode)) ? $this->stmtId : false;
+        try {
+		    if ($this->resetStmtId === true)
+		    {
+		    	$sql = rtrim($sql, ';');
+		    	if (strpos(ltrim($sql), 'BEGIN') === 0)
+		    	{
+		    		$sql .= ';';
+		    	}
+		    	$this->stmtId = oci_parse($this->connID, $sql);
+		    }
+
+		    if (strpos($sql, 'RETURNING ROWID INTO :CI_OCI8_ROWID') !== false)
+		    {
+		    	oci_bind_by_name($this->stmtId, ':CI_OCI8_ROWID', $this->rowId, 255);
+		    }
+
+		    oci_set_prefetch($this->stmtId, 1000);
+		    return (oci_execute($this->stmtId, $this->commitMode)) ? $this->stmtId : false;
+        } catch (ErrorException $e) {
+            log_message('error', $e->getMessage());
+
+            if ($this->DBDebug) {
+                throw $e;
+            }
+        }
+
+        return false;
 	}
 
 	//--------------------------------------------------------------------

From a547c2923d2716640c1f6de37a59aaf4716e126f Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 9 Sep 2021 02:23:52 +0900
Subject: [PATCH 1327/2325] fix: fixed happen error when multiple column in
 bulk drop.

---
 system/Database/OCI8/Forge.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 6b0906a935ed..2d09ad307809 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -113,16 +113,21 @@ class Forge extends \CodeIgniter\Database\Forge
 	 */
 	protected function _alterTable(string $alter_type, string $table, $field)
 	{
+		$sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
+
 		if ($alter_type === 'DROP')
 		{
-			return parent::_alterTable($alter_type, $table, $field);
+            $fields = array_map(function ($field) {
+                return $this->db->escapeIdentifiers(trim($field));
+            }, (is_string($field)) ? explode(',', $field) : $field);
+
+			return $sql . ' DROP ('.implode(',', $fields).') CASCADE CONSTRAINT INVALIDATE';
 		}
 		elseif ($alter_type === 'CHANGE')
 		{
 			$alter_type = 'MODIFY';
 		}
 
-		$sql          = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
 		$nullable_map = array_column($this->db->getFieldData($table), 'nullable', 'name');
 		$sqls         = [];
 		for ($i = 0, $c = count($field); $i < $c; $i++)

From ef9ffc03f91d99e6f39a8df873025839c6175758 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 9 Sep 2021 02:26:10 +0900
Subject: [PATCH 1328/2325] feat: Fixed to store missing types in oracle.

---
 system/Database/OCI8/Forge.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 2d09ad307809..2218798e016b 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -253,13 +253,22 @@ protected function _attributeType(array &$attributes)
 			case 'NUMERIC':
 				$attributes['TYPE'] = 'NUMBER';
 				return;
+            case 'DOUBLE':
+				$attributes['TYPE'] = 'FLOAT';
+				$attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 126;
+				return;
 			case 'DATETIME':
+			case 'TIME':
 				$attributes['TYPE'] = 'DATE';
 				return;
-			case 'TEXT':
+			case 'SET':
+			case 'ENUM':
 			case 'VARCHAR':
-				$attributes['TYPE']       = 'VARCHAR2';
 				$attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 255;
+			case 'TEXT':
+			case 'MEDIUMTEXT':
+				$attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 4000;
+				$attributes['TYPE']       = 'VARCHAR2';
 				return;
 			default: return;
 		}

From 429cc0be30709258d828a01a075b219b3b145d75 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 9 Sep 2021 02:27:09 +0900
Subject: [PATCH 1329/2325] feat: Use check constraint to reproduce the enum.

---
 system/Database/OCI8/Forge.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 2218798e016b..a1cf71b330ed 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -213,6 +213,17 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
 	 */
 	protected function _processColumn(array $field): string
 	{
+        $constraint = '';
+        // @fixme: can’t cover multi pattern when set type.
+        if ($field['type'] === 'VARCHAR2' && strpos($field['length'], "('") === 0) {
+            $constraint = ' CHECK(' . $this->db->escapeIdentifiers($field['name'])
+                . ' IN ' . $field['length'] . ')';
+
+            $field['length'] = '('.max(array_map('mb_strlen', explode("','",  mb_substr($field['length'], 2, -2)))).')'.$constraint;
+        } else if (count($this->primaryKeys) === 1 && $field['name'] === $this->primaryKeys[0]) {
+            $field['unique'] = '';
+        }
+
 		return $this->db->escapeIdentifiers($field['name'])
 			   . ' ' . $field['type'] . $field['length']
 			   . $field['unsigned']

From 555a9b2c53703b4d96d798b20ce39f4ebd7630ab Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 9 Sep 2021 02:28:58 +0900
Subject: [PATCH 1330/2325] fix: Aligned the API with the changed interface.

---
 system/Database/OCI8/Forge.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index a1cf71b330ed..45f35f5db77a 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -296,17 +296,17 @@ protected function _attributeType(array &$attributes)
 	 * @param boolean $if_exists Whether to add an IF EXISTS condition
 	 * @param boolean $cascade
 	 *
-	 * @return string
+	 * @return string|boolean
 	 */
-	protected function _dropTable(string $table, bool $if_exists, bool $cascade): string
+	protected function _dropTable(string $table, bool $if_exists, bool $cascade)
 	{
 		$sql = parent::_dropTable($table, $if_exists, $cascade);
 
-		if ($sql !== '' && $cascade === true)
+		if ($sql !== true && $cascade === true)
 		{
 			$sql .= ' CASCADE CONSTRAINTS PURGE';
 		}
-		elseif ($sql !== '')
+		elseif ($sql !== true)
 		{
 			$sql .= ' PURGE';
 		}

From 79495055f8774753038b35153db6f89143f68a52 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 9 Sep 2021 02:30:09 +0900
Subject: [PATCH 1331/2325] fix: Date types are now added according to the
 Oracle format.

---
 tests/_support/Database/Seeds/CITestSeeder.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/_support/Database/Seeds/CITestSeeder.php b/tests/_support/Database/Seeds/CITestSeeder.php
index 372697aaa6ba..0126a0a6695d 100644
--- a/tests/_support/Database/Seeds/CITestSeeder.php
+++ b/tests/_support/Database/Seeds/CITestSeeder.php
@@ -166,6 +166,16 @@ public function run()
             ];
         }
 
+        if ($this->db->DBDriver === 'OCI8') {
+            $this->db->query('alter session set NLS_DATE_FORMAT=?', ['YYYY/MM/DD HH24:MI:SS']);
+            $data['type_test'][0]['type_time'] = '2020-07-18 15:22:00';
+            $data['type_test'][0]['type_date'] = '2020-01-11 22:11:00';
+            $data['type_test'][0]['type_time'] = '2020-07-18 15:22:00';
+            $data['type_test'][0]['type_datetime'] = '2020-06-18 05:12:24';
+            $data['type_test'][0]['type_timestamp'] = '2020-06-18 21:53:21';
+            unset($data['type_test'][0]['type_blob']);
+        }
+
         foreach ($data as $table => $dummy_data) {
             $this->db->table($table)->truncate();
 

From 986574326b2ddea043c7f912b445f4d653063535 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 9 Sep 2021 02:31:02 +0900
Subject: [PATCH 1332/2325] fix: syntax error.

---
 tests/system/Database/Live/ForgeTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 7337d24e62f7..f1c3b5acc2cc 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -201,7 +201,7 @@ public function testCreateTableWithAttributes()
         {
             $this->markTestSkipped('OCI8 does not support comments on tables or columns.');
         }
-        if ($this->db->DBDriver === 'SQLite3')
+        if ($this->db->DBDriver === 'SQLite3'){
             $this->markTestSkipped('SQLite3 does not support comments on tables or columns.');
         }
 

From d6f0cd200a89f8578a80922b76ccd2bf61752fbe Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 9 Sep 2021 02:31:36 +0900
Subject: [PATCH 1333/2325] fix: Due to table name to long.

---
 tests/system/Database/Live/ForgeTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index f1c3b5acc2cc..879b1496db3e 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -454,7 +454,7 @@ public function testForeignKey()
             $this->assertSame($foreignKeyData[0]->column_name, 'users_id');
             $this->assertSame($foreignKeyData[0]->foreign_column_name, 'id');
         }
-        $this->assertSame($foreignKeyData[0]->table_name, $this->db->DBPrefix . 'forge_test_invoices');
+        $this->assertSame($foreignKeyData[0]->table_name, $this->db->DBPrefix . $tableName);
         $this->assertSame($foreignKeyData[0]->foreign_table_name, $this->db->DBPrefix . 'forge_test_users');
 
         $this->forge->dropTable($tableName, true);

From a6c53c74a0c19d6b767bfddb04b8d6ffcdab6514 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 9 Sep 2021 02:32:32 +0900
Subject: [PATCH 1334/2325] fix: Fixed to fit the problem that the structure of
 seeder has changed.

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

diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 879b1496db3e..88653af4d36e 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -849,9 +849,9 @@ public function testAddFields()
             //Check types
             $this->assertSame('NUMBER', $fieldsData[0]->type);
             $this->assertSame('VARCHAR2', $fieldsData[1]->type);
-            $this->assertSame(32, $fieldsData[0]->max_length);
+            $this->assertSame('11', $fieldsData[0]->max_length);
             $this->assertSame('', $fieldsData[1]->default);
-            $this->assertSame(255, $fieldsData[1]->max_length);
+            $this->assertSame('255', $fieldsData[1]->max_length);
         } else {
             $this->fail(sprintf('DB driver "%s" is not supported.', $this->db->DBDriver));
         }

From bcde669eb2f11a9fc63e51bb8f7a7531f58e77bc Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 9 Sep 2021 02:33:48 +0900
Subject: [PATCH 1335/2325] test: add OCI8 case for RANDOM.

---
 tests/system/Database/Live/OrderTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/system/Database/Live/OrderTest.php b/tests/system/Database/Live/OrderTest.php
index 76f7e8374f32..eaab910edc5e 100644
--- a/tests/system/Database/Live/OrderTest.php
+++ b/tests/system/Database/Live/OrderTest.php
@@ -83,6 +83,8 @@ public function testOrderRandom()
         } elseif ($this->db->DBDriver === 'SQLSRV') {
             $key   = 'NEWID()';
             $table = '"' . $this->db->getDatabase() . '"."' . $this->db->schema . '".' . $table;
+        } elseif ($this->db->DBDriver === 'OCI8') {
+            $key = '"DBMS_RANDOM"."RANDOM"';
         }
 
         $expected = 'SELECT * FROM ' . $table . ' ORDER BY ' . $key;

From 90988911720c96d1c93c22039002753587f7005d Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 9 Sep 2021 02:34:23 +0900
Subject: [PATCH 1336/2325] fix: Since it is treated as uppercase unless
 explicitly specified.

---
 tests/system/Database/Live/PreparedQueryTest.php | 10 +++++++---
 tests/system/Database/Live/WhereTest.php         |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php
index fcb4769a8801..11cb741e267b 100644
--- a/tests/system/Database/Live/PreparedQueryTest.php
+++ b/tests/system/Database/Live/PreparedQueryTest.php
@@ -117,7 +117,11 @@ public function testExecuteRunsQueryAndReturnsResultObject()
     public function testExecuteRunsQueryAndReturnsManualResultObject()
     {
         $this->query = $this->db->prepare(static function ($db) {
-            $sql = "INSERT INTO {$db->DBPrefix}user (name, email, country) VALUES (?, ?, ?)";
+            $sql = "INSERT INTO {$db->protectIdentifiers($db->DBPrefix . 'user')} ("
+                  . $db->protectIdentifiers('name') . ', '
+                  . $db->protectIdentifiers('email') . ', '
+                  . $db->protectIdentifiers('country')
+                  . ") VALUES (?, ?, ?)";
 
             if ($db->DBDriver === 'SQLSRV') {
                 $sql = "INSERT INTO {$db->schema}.{$db->DBPrefix}user (name, email, country) VALUES (?, ?, ?)";
@@ -126,8 +130,8 @@ public function testExecuteRunsQueryAndReturnsManualResultObject()
             return (new Query($db))->setQuery($sql);
         });
 
-        $this->query->execute('foo', 'foo@example.com', '');
-        $this->query->execute('bar', 'bar@example.com', '');
+        $this->query->execute('foo', 'foo@example.com', 'US');
+        $this->query->execute('bar', 'bar@example.com', 'GB');
 
         $this->seeInDatabase($this->db->DBPrefix . 'user', ['name' => 'foo', 'email' => 'foo@example.com']);
         $this->seeInDatabase($this->db->DBPrefix . 'user', ['name' => 'bar', 'email' => 'bar@example.com']);
diff --git a/tests/system/Database/Live/WhereTest.php b/tests/system/Database/Live/WhereTest.php
index 88364218a6ee..d65b2d7296a7 100644
--- a/tests/system/Database/Live/WhereTest.php
+++ b/tests/system/Database/Live/WhereTest.php
@@ -237,7 +237,7 @@ public function testWhereWithLower()
         ]);
 
         $job = $builder
-            ->where(sprintf('LOWER(%s.name)', $this->db->prefixTable('job')), 'brewmaster')
+            ->where(sprintf("LOWER({$this->db->protectIdentifiers('%s.name')})", 'job'), 'brewmaster')
             ->get()
             ->getResult();
         $this->assertCount(1, $job);

From b9ce6eaf2e78fde13b6b873d1da26523a2b4fe8e Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 9 Sep 2021 02:36:11 +0900
Subject: [PATCH 1337/2325] feat: Due to name of the tablespace is not defined
 in the property when connecting by instance name.

---
 system/Database/OCI8/Connection.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 311a315574cb..9529bb805631 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -847,4 +847,16 @@ protected function _transRollback(): bool
 	}
 
 	// --------------------------------------------------------------------
+
+    /**
+     * Returns the name of the current database being used.
+     */
+    public function getDatabase(): string
+    {
+        if (empty($this->database)) {
+            $this->database = $this->query('SELECT DEFAULT_TABLESPACE FROM USER_USERS')->getRow()->DEFAULT_TABLESPACE ?? '';
+        }
+
+        return empty($this->database) ? '' : $this->database;
+    }
 }

From 6e97504a5bad865e99c0dd4c597568820e65f55e Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 9 Sep 2021 02:51:20 +0900
Subject: [PATCH 1338/2325] style: php -d memory_limit=-1
 ./vendor/bin/php-cs-fixer fix system/Database/

---
 system/Database/OCI8/Builder.php       |  591 +++++-----
 system/Database/OCI8/Connection.php    | 1441 +++++++++++-------------
 system/Database/OCI8/Forge.php         |  601 +++++-----
 system/Database/OCI8/PreparedQuery.php |  261 ++---
 system/Database/OCI8/Result.php        |  259 ++---
 system/Database/OCI8/Utils.php         |   74 +-
 6 files changed, 1412 insertions(+), 1815 deletions(-)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 0d5e3d8a4117..3f2c997a1589 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -1,39 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\OCI8;
@@ -45,301 +18,263 @@
  */
 class Builder extends BaseBuilder
 {
-	/**
-	 * Identifier escape character
-	 *
-	 * @var string
-	 */
-	protected $escapeChar = '"';
-
-	/**
-	 * ORDER BY random keyword
-	 *
-	 * @var array
-	 */
-	protected $randomKeyword = [
-		'"DBMS_RANDOM"."RANDOM"'
-	];
-
-	/**
-	 * COUNT string
-	 *
-	 * @used-by CI_DB_driver::count_all()
-	 * @used-by BaseBuilder::count_all_results()
-	 *
-	 * @var string
-	 */
-	protected $countString = 'SELECT COUNT(1) ';
-
-	/**
-	 * Limit used flag
-	 *
-	 * If we use LIMIT, we'll add a field that will
-	 * throw off num_fields later.
-	 *
-	 * @var boolean
-	 */
-	protected $limitUsed = false;
-
-	/**
-	 * Insert batch statement
-	 *
-	 * Generates a platform-specific insert string from the supplied data.
-	 *
-	 * @param string $table  Table name
-	 * @param array  $keys   INSERT keys
-	 * @param array  $values INSERT values
-	 *
-	 * @return string
-	 */
-	protected function _insertBatch(string $table, array $keys, array $values): string
-	{
-		$keys            = implode(', ', $keys);
-		$has_primary_key = in_array('PRIMARY', array_column($this->db->getIndexData($table), 'type'), true);
-
-		// ORA-00001 measures
-		if ($has_primary_key)
-		{
-			$sql                 = 'INSERT INTO ' . $table . ' (' . $keys . ") \n SELECT * FROM (\n";
-			$select_query_values = [];
-
-			for ($i = 0, $c = count($values); $i < $c; $i++)
-			{
-				$select_query_values[] = 'SELECT ' . substr(substr($values[$i], 1), 0, -1) . ' FROM DUAL';
-			}
-
-			return $sql . implode("\n UNION ALL \n", $select_query_values) . "\n)";
-		}
-
-		$sql = "INSERT ALL\n";
-
-		for ($i = 0, $c = count($values); $i < $c; $i++)
-		{
-			$sql .= '	INTO ' . $table . ' (' . $keys . ') VALUES ' . $values[$i] . "\n";
-		}
-
-		return $sql . 'SELECT * FROM dual';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Replace statement
-	 *
-	 * Generates a platform-specific replace string from the supplied data
-	 *
-	 * @param string $table  The table name
-	 * @param array  $keys   The insert keys
-	 * @param array  $values The insert values
-	 *
-	 * @return string
-	 */
-	protected function _replace(string $table, array $keys, array $values): string
-	{
-		$field_names = array_map(function ($column_name) {
-			return trim($column_name, '"');
-		}, $keys);
-
-		$unique_indexes     = array_filter($this->db->getIndexData($table), function ($index) use ($field_names) {
-			$has_all_fields = count(array_intersect($index->fields, $field_names)) === count($index->fields);
-
-			return (($index->type === 'PRIMARY') && $has_all_fields);
-		});
-		$replaceable_fields = array_filter($keys, function ($column_name) use ($unique_indexes) {
-			foreach ($unique_indexes as $index)
-			{
-				if (in_array(trim($column_name, '"'), $index->fields, true))
-				{
-					return false;
-				}
-			}
-
-			return true;
-		});
-
-		$sql = 'MERGE INTO ' . $table . "\n USING (SELECT ";
-
-		$sql .= implode(', ', array_map(function ($column_name, $value) {
-			return $value . ' ' . $column_name;
-		}, $keys, $values));
-
-		$sql .= ' FROM DUAL) "_replace" ON ( ';
-
-		$on_list   = [];
-		$on_list[] = '1 != 1';
-
-		foreach ($unique_indexes as $index)
-		{
-			$on_list[] = '(' . implode(' AND ', array_map(function ($column_name) use ($table) {
-				return $table . '."' . $column_name . '" = "_replace"."' . $column_name . '"';
-			}, $index->fields)) . ')';
-		}
-
-		$sql .= implode(' OR ', $on_list) . ') WHEN MATCHED THEN UPDATE SET ';
-
-		$sql .= implode(', ', array_map(function ($column_name) {
-			return $column_name . ' = "_replace".' . $column_name;
-		}, $replaceable_fields));
-
-		$sql .= ' WHEN NOT MATCHED THEN INSERT (' . implode(', ', $replaceable_fields) . ') VALUES ';
-		$sql .= ' (' . implode(', ', array_map(function ($column_name) {
-			return '"_replace".' . $column_name;
-		}, $replaceable_fields)) . ')';
-
-		return $sql;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Truncate statement
-	 *
-	 * Generates a platform-specific truncate string from the supplied data
-	 *
-	 * If the database does not support the truncate() command,
-	 * then this method maps to 'DELETE FROM table'
-	 *
-	 * @param string $table The table name
-	 *
-	 * @return string
-	 */
-	protected function _truncate(string $table): string
-	{
-		return 'TRUNCATE TABLE ' . $table;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Delete
-	 *
-	 * Compiles a delete string and runs the query
-	 *
-	 * @param mixed   $where      The where clause
-	 * @param integer $limit      The limit clause
-	 * @param boolean $reset_data
-	 *
-	 * @return mixed
-	 * @throws \CodeIgniter\Database\Exceptions\DatabaseException
-	 */
-	public function delete($where = '', int $limit = null, bool $reset_data = true)
-	{
-		if (! empty($limit))
-		{
-			$this->QBLimit = $limit;
-		}
-
-		return parent::delete($where, null, $reset_data);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Delete statement
-	 *
-	 * Generates a platform-specific delete string from the supplied data
-	 *
-	 * @param string $table The table name
-	 *
-	 * @return string
-	 */
-	protected function _delete(string $table): string
-	{
-		if ($this->QBLimit)
-		{
-			$this->where('rownum <= ', $this->QBLimit, false);
-			$this->QBLimit = false;
-		}
-
-		return parent::_delete($table);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Update statement
-	 *
-	 * Generates a platform-specific update string from the supplied data
-	 *
-	 * @param string $table  the Table name
-	 * @param array  $values the Update data
-	 *
-	 * @return string
-	 */
-	protected function _update(string $table, array $values): string
-	{
-		$valStr = [];
-
-		foreach ($values as $key => $val)
-		{
-			$valStr[] = $key . ' = ' . $val;
-		}
-
-		if ($this->QBLimit)
-		{
-			$this->where('rownum <= ', $this->QBLimit, false);
-		}
-
-		return 'UPDATE ' . $this->compileIgnore('update') . $table . ' SET ' . implode(', ', $valStr)
-				. $this->compileWhereHaving('QBWhere')
-				. $this->compileOrderBy();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * LIMIT string
-	 *
-	 * Generates a platform-specific LIMIT clause.
-	 *
-	 * @param string $sql SQL Query
-	 *
-	 * @return string
-	 */
-	protected function _limit(string $sql, bool $offsetIgnore = false): string
-	{
-        $offset = (int)($offsetIgnore === false) ? $this->QBOffset : 0 ;
-		if (version_compare($this->db->getVersion(), '12.1', '>='))
-		{
-			// OFFSET-FETCH can be used only with the ORDER BY clause
-			empty($this->QBOrderBy) && $sql .= ' ORDER BY 1';
-
-			return $sql . ' OFFSET ' . (int) $offset . ' ROWS FETCH NEXT ' . $this->QBLimit . ' ROWS ONLY';
-		}
-
-		$this->limitUsed = true;
-		return 'SELECT * FROM (SELECT inner_query.*, rownum rnum FROM (' . $sql . ') inner_query WHERE rownum < ' . ($offset + $this->QBLimit + 1) . ')'
-			. ($offset ? ' WHERE rnum >= ' . ($offset + 1) : '');
-	}
-
-	/**
-	 * Resets the query builder values.  Called by the get() function
-	 */
-	protected function resetSelect()
-	{
-		$this->limitUsed = false;
-		parent::resetSelect();
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Insert statement
-	 *
-	 * Generates a platform-specific insert string from the supplied data
-	 *
-	 * @param string $table         The table name
-	 * @param array  $keys          The insert keys
-	 * @param array  $unescapedKeys The insert values
-	 *
-	 * @return string
-	 */
-	protected function _insert(string $table, array $keys, array $unescapedKeys): string
-	{
-		// Has a strange design.
-		// Processing to get the table where the last insert was performed for insertId method.
-		$this->db->latestInsertedTableName = $table;
-
-		return 'INSERT ' . $this->compileIgnore('insert') . 'INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES (' . implode(', ', $unescapedKeys) . ') RETURNING ROWID INTO :CI_OCI8_ROWID';
-	}
+    /**
+     * Identifier escape character
+     *
+     * @var string
+     */
+    protected $escapeChar = '"';
+
+    /**
+     * ORDER BY random keyword
+     *
+     * @var array
+     */
+    protected $randomKeyword = [
+        '"DBMS_RANDOM"."RANDOM"',
+    ];
+
+    /**
+     * COUNT string
+     *
+     * @used-by CI_DB_driver::count_all()
+     * @used-by BaseBuilder::count_all_results()
+     *
+     * @var string
+     */
+    protected $countString = 'SELECT COUNT(1) ';
+
+    /**
+     * Limit used flag
+     *
+     * If we use LIMIT, we'll add a field that will
+     * throw off num_fields later.
+     *
+     * @var bool
+     */
+    protected $limitUsed = false;
+
+    /**
+     * Insert batch statement
+     *
+     * Generates a platform-specific insert string from the supplied data.
+     *
+     * @param string $table  Table name
+     * @param array  $keys   INSERT keys
+     * @param array  $values INSERT values
+     */
+    protected function _insertBatch(string $table, array $keys, array $values): string
+    {
+        $keys            = implode(', ', $keys);
+        $has_primary_key = in_array('PRIMARY', array_column($this->db->getIndexData($table), 'type'), true);
+
+        // ORA-00001 measures
+        if ($has_primary_key) {
+            $sql                 = 'INSERT INTO ' . $table . ' (' . $keys . ") \n SELECT * FROM (\n";
+            $select_query_values = [];
+
+            for ($i = 0, $c = count($values); $i < $c; $i++) {
+                $select_query_values[] = 'SELECT ' . substr(substr($values[$i], 1), 0, -1) . ' FROM DUAL';
+            }
+
+            return $sql . implode("\n UNION ALL \n", $select_query_values) . "\n)";
+        }
+
+        $sql = "INSERT ALL\n";
+
+        for ($i = 0, $c = count($values); $i < $c; $i++) {
+            $sql .= '	INTO ' . $table . ' (' . $keys . ') VALUES ' . $values[$i] . "\n";
+        }
+
+        return $sql . 'SELECT * FROM dual';
+    }
+
+    /**
+     * Replace statement
+     *
+     * Generates a platform-specific replace string from the supplied data
+     *
+     * @param string $table  The table name
+     * @param array  $keys   The insert keys
+     * @param array  $values The insert values
+     */
+    protected function _replace(string $table, array $keys, array $values): string
+    {
+        $field_names = array_map(static function ($column_name) {
+            return trim($column_name, '"');
+        }, $keys);
+
+        $unique_indexes = array_filter($this->db->getIndexData($table), static function ($index) use ($field_names) {
+            $has_all_fields = count(array_intersect($index->fields, $field_names)) === count($index->fields);
+
+            return ($index->type === 'PRIMARY') && $has_all_fields;
+        });
+        $replaceable_fields = array_filter($keys, static function ($column_name) use ($unique_indexes) {
+            foreach ($unique_indexes as $index) {
+                if (in_array(trim($column_name, '"'), $index->fields, true)) {
+                    return false;
+                }
+            }
+
+            return true;
+        });
+
+        $sql = 'MERGE INTO ' . $table . "\n USING (SELECT ";
+
+        $sql .= implode(', ', array_map(static function ($column_name, $value) {
+            return $value . ' ' . $column_name;
+        }, $keys, $values));
+
+        $sql .= ' FROM DUAL) "_replace" ON ( ';
+
+        $on_list   = [];
+        $on_list[] = '1 != 1';
+
+        foreach ($unique_indexes as $index) {
+            $on_list[] = '(' . implode(' AND ', array_map(static function ($column_name) use ($table) {
+                return $table . '."' . $column_name . '" = "_replace"."' . $column_name . '"';
+            }, $index->fields)) . ')';
+        }
+
+        $sql .= implode(' OR ', $on_list) . ') WHEN MATCHED THEN UPDATE SET ';
+
+        $sql .= implode(', ', array_map(static function ($column_name) {
+            return $column_name . ' = "_replace".' . $column_name;
+        }, $replaceable_fields));
+
+        $sql .= ' WHEN NOT MATCHED THEN INSERT (' . implode(', ', $replaceable_fields) . ') VALUES ';
+        $sql .= ' (' . implode(', ', array_map(static function ($column_name) {
+            return '"_replace".' . $column_name;
+        }, $replaceable_fields)) . ')';
+
+        return $sql;
+    }
+
+    /**
+     * Truncate statement
+     *
+     * Generates a platform-specific truncate string from the supplied data
+     *
+     * If the database does not support the truncate() command,
+     * then this method maps to 'DELETE FROM table'
+     *
+     * @param string $table The table name
+     */
+    protected function _truncate(string $table): string
+    {
+        return 'TRUNCATE TABLE ' . $table;
+    }
+
+    /**
+     * Delete
+     *
+     * Compiles a delete string and runs the query
+     *
+     * @param mixed $where The where clause
+     * @param int   $limit The limit clause
+     *
+     * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+     *
+     * @return mixed
+     */
+    public function delete($where = '', ?int $limit = null, bool $reset_data = true)
+    {
+        if (! empty($limit)) {
+            $this->QBLimit = $limit;
+        }
+
+        return parent::delete($where, null, $reset_data);
+    }
+
+    /**
+     * Delete statement
+     *
+     * Generates a platform-specific delete string from the supplied data
+     *
+     * @param string $table The table name
+     */
+    protected function _delete(string $table): string
+    {
+        if ($this->QBLimit) {
+            $this->where('rownum <= ', $this->QBLimit, false);
+            $this->QBLimit = false;
+        }
+
+        return parent::_delete($table);
+    }
+
+    /**
+     * Update statement
+     *
+     * Generates a platform-specific update string from the supplied data
+     *
+     * @param string $table  the Table name
+     * @param array  $values the Update data
+     */
+    protected function _update(string $table, array $values): string
+    {
+        $valStr = [];
+
+        foreach ($values as $key => $val) {
+            $valStr[] = $key . ' = ' . $val;
+        }
+
+        if ($this->QBLimit) {
+            $this->where('rownum <= ', $this->QBLimit, false);
+        }
+
+        return 'UPDATE ' . $this->compileIgnore('update') . $table . ' SET ' . implode(', ', $valStr)
+                . $this->compileWhereHaving('QBWhere')
+                . $this->compileOrderBy();
+    }
+
+    /**
+     * LIMIT string
+     *
+     * Generates a platform-specific LIMIT clause.
+     *
+     * @param string $sql SQL Query
+     */
+    protected function _limit(string $sql, bool $offsetIgnore = false): string
+    {
+        $offset = (int) ($offsetIgnore === false) ? $this->QBOffset : 0;
+        if (version_compare($this->db->getVersion(), '12.1', '>=')) {
+            // OFFSET-FETCH can be used only with the ORDER BY clause
+            empty($this->QBOrderBy) && $sql .= ' ORDER BY 1';
+
+            return $sql . ' OFFSET ' . (int) $offset . ' ROWS FETCH NEXT ' . $this->QBLimit . ' ROWS ONLY';
+        }
+
+        $this->limitUsed = true;
+
+        return 'SELECT * FROM (SELECT inner_query.*, rownum rnum FROM (' . $sql . ') inner_query WHERE rownum < ' . ($offset + $this->QBLimit + 1) . ')'
+            . ($offset ? ' WHERE rnum >= ' . ($offset + 1) : '');
+    }
+
+    /**
+     * Resets the query builder values.  Called by the get() function
+     */
+    protected function resetSelect()
+    {
+        $this->limitUsed = false;
+        parent::resetSelect();
+    }
+
+    /**
+     * Insert statement
+     *
+     * Generates a platform-specific insert string from the supplied data
+     *
+     * @param string $table         The table name
+     * @param array  $keys          The insert keys
+     * @param array  $unescapedKeys The insert values
+     */
+    protected function _insert(string $table, array $keys, array $unescapedKeys): string
+    {
+        // Has a strange design.
+        // Processing to get the table where the last insert was performed for insertId method.
+        $this->db->latestInsertedTableName = $table;
+
+        return 'INSERT ' . $this->compileIgnore('insert') . 'INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES (' . implode(', ', $unescapedKeys) . ') RETURNING ROWID INTO :CI_OCI8_ROWID';
+    }
 }
diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 9529bb805631..598fed9c63c4 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -1,38 +1,12 @@
 <?php
+
 /**
- * CodeIgniter
- *
- * An open source application development framework for PHP
- *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
+ * This file is part of CodeIgniter 4 framework.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\OCI8;
@@ -40,232 +14,198 @@
 use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Database\ConnectionInterface;
 use CodeIgniter\Database\Exceptions\DatabaseException;
-use stdClass;
 use ErrorException;
+use stdClass;
 
 /**
  * Connection for Postgre
  */
 class Connection extends BaseConnection implements ConnectionInterface
 {
+    /**
+     * Database driver
+     *
+     * @var string
+     */
+    public $DBDriver = 'OCI8';
+
+    /**
+     * Identifier escape character
+     *
+     * @var string
+     */
+    public $escapeChar = '"';
+
+    /**
+     * List of reserved identifiers
+     *
+     * Identifiers that must NOT be escaped.
+     *
+     * @var array
+     */
+    protected $reservedIdentifiers = [
+        '*',
+        'rownum',
+    ];
+
+    protected $validDSNs = [
+        'tns' => '/^\(DESCRIPTION=(\(.+\)){2,}\)$/', // TNS
+        // Easy Connect string (Oracle 10g+)
+        'ec' => '/^(\/\/)?[a-z0-9.:_-]+(:[1-9][0-9]{0,4})?(\/[a-z0-9$_]+)?(:[^\/])?(\/[a-z0-9$_]+)?$/i',
+        'in' => '/^[a-z0-9$_]+$/i', // Instance name (defined in tnsnames.ora)
+    ];
+
+    /**
+     * Reset $stmtId flag
+     *
+     * Used by storedProcedure() to prevent execute() from
+     * re-setting the statement ID.
+     */
+    protected $resetStmtId = true;
+
+    /**
+     * Statement ID
+     *
+     * @var resource
+     */
+    public $stmtId;
+
+    /**
+     * Commit mode flag
+     *
+     * @var int
+     */
+    public $commitMode = OCI_COMMIT_ON_SUCCESS;
+
+    /**
+     * Cursor ID
+     *
+     * @var resource
+     */
+    public $cursorId;
+
+    /**
+     * RowID
+     *
+     * @var int|null
+     */
+    public $rowId;
+
+    /**
+     * Latest inserted table name.
+     *
+     * @var string|null
+     */
+    public $latestInsertedTableName;
+
+    /**
+     * confirm DNS format.
+     */
+    private function isValidDSN(): bool
+    {
+        foreach ($this->validDSNs as $regexp) {
+            if (preg_match($regexp, $this->DSN)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Connect to the database.
+     *
+     * @return mixed
+     */
+    public function connect(bool $persistent = false)
+    {
+        if (empty($this->DSN) && ! $this->isValidDSN()) {
+            $this->buildDSN();
+        }
 
-	/**
-	 * Database driver
-	 *
-	 * @var string
-	 */
-	public $DBDriver = 'OCI8';
-
-	/**
-	 * Identifier escape character
-	 *
-	 * @var string
-	 */
-	public $escapeChar = '"';
-
-	/**
-	 * List of reserved identifiers
-	 *
-	 * Identifiers that must NOT be escaped.
-	 *
-	 * @var array
-	 */
-	protected $reservedIdentifiers = [
-		'*',
-		'rownum',
-	];
-
-	protected $validDSNs = [
-		'tns' => '/^\(DESCRIPTION=(\(.+\)){2,}\)$/', // TNS
-			// Easy Connect string (Oracle 10g+)
-		'ec'  => '/^(\/\/)?[a-z0-9.:_-]+(:[1-9][0-9]{0,4})?(\/[a-z0-9$_]+)?(:[^\/])?(\/[a-z0-9$_]+)?$/i',
-		'in'  => '/^[a-z0-9$_]+$/i',// Instance name (defined in tnsnames.ora)
-	];
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Reset $stmtId flag
-	 *
-	 * Used by storedProcedure() to prevent execute() from
-	 * re-setting the statement ID.
-	 */
-	protected $resetStmtId = true;
-
-	/**
-	 * Statement ID
-	 *
-	 * @var resource
-	 */
-	public $stmtId;
-
-	/**
-	 * Commit mode flag
-	 *
-	 * @var integer
-	 */
-	public $commitMode = OCI_COMMIT_ON_SUCCESS;
-
-	/**
-	 * Cursor ID
-	 *
-	 * @var resource
-	 */
-	public $cursorId;
-
-	/**
-	 * RowID
-	 *
-	 * @var integer|null
-	 */
-	public $rowId;
-
-	/**
-	 * Latest inserted table name.
-	 *
-	 * @var string|null
-	 */
-	public $latestInsertedTableName;
-
-	/**
-	 * confirm DNS format.
-	 *
-	 * @return boolean
-	 */
-	private function isValidDSN() : bool
-	{
-		foreach ($this->validDSNs as $regexp)
-		{
-			if (preg_match($regexp, $this->DSN))
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Connect to the database.
-	 *
-	 * @param  boolean $persistent
-	 * @return mixed
-	 */
-	public function connect(bool $persistent = false)
-	{
-		if (empty($this->DSN) && ! $this->isValidDSN())
-		{
-			$this->buildDSN();
-		}
-
-		$func = ($persistent === true) ? 'oci_pconnect' : 'oci_connect';
-
-		return empty($this->charset)
-			? $func($this->username, $this->password, $this->DSN)
-			: $func($this->username, $this->password, $this->DSN, $this->charset);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Keep or establish the connection if no queries have been sent for
-	 * a length of time exceeding the server's idle timeout.
-	 *
-	 * @return void
-	 */
-	public function reconnect()
-	{
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Close the database connection.
-	 *
-	 * @return void
-	 */
-	protected function _close()
-	{
-		if (is_resource($this->cursorId))
-		{
-			oci_free_statement($this->cursorId);
-		}
-		if (is_resource($this->stmtId))
-		{
-			oci_free_statement($this->stmtId);
-		}
-		oci_close($this->connID);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Select a specific database table to use.
-	 *
-	 * @param string $databaseName
-	 *
-	 * @return boolean
-	 */
-	public function setDatabase(string $databaseName): bool
-	{
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns a string containing the version of the database being used.
-	 *
-	 * @return string
-	 */
-	public function getVersion(): string
-	{
-		if (isset($this->dataCache['version']))
-		{
-			return $this->dataCache['version'];
-		}
-
-		if (! $this->connID || ($version_string = oci_server_version($this->connID)) === false)
-		{
-			return false;
-		}
-		elseif (preg_match('#Release\s(\d+(?:\.\d+)+)#', $version_string, $match))
-		{
-			return $this->dataCache['version'] = $match[1];
-		}
-
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Executes the query against the database.
-	 *
-	 * @param string $sql
-	 *
-	 * @return resource
-	 */
-	public function execute(string $sql)
-	{
+        $func = ($persistent === true) ? 'oci_pconnect' : 'oci_connect';
+
+        return empty($this->charset)
+            ? $func($this->username, $this->password, $this->DSN)
+            : $func($this->username, $this->password, $this->DSN, $this->charset);
+    }
+
+    /**
+     * Keep or establish the connection if no queries have been sent for
+     * a length of time exceeding the server's idle timeout.
+     *
+     * @return void
+     */
+    public function reconnect()
+    {
+    }
+
+    /**
+     * Close the database connection.
+     *
+     * @return void
+     */
+    protected function _close()
+    {
+        if (is_resource($this->cursorId)) {
+            oci_free_statement($this->cursorId);
+        }
+        if (is_resource($this->stmtId)) {
+            oci_free_statement($this->stmtId);
+        }
+        oci_close($this->connID);
+    }
+
+    /**
+     * Select a specific database table to use.
+     */
+    public function setDatabase(string $databaseName): bool
+    {
+        return false;
+    }
+
+    /**
+     * Returns a string containing the version of the database being used.
+     */
+    public function getVersion(): string
+    {
+        if (isset($this->dataCache['version'])) {
+            return $this->dataCache['version'];
+        }
+
+        if (! $this->connID || ($version_string = oci_server_version($this->connID)) === false) {
+            return false;
+        }
+        if (preg_match('#Release\s(\d+(?:\.\d+)+)#', $version_string, $match)) {
+            return $this->dataCache['version'] = $match[1];
+        }
+
+        return false;
+    }
+
+    /**
+     * Executes the query against the database.
+     *
+     * @return resource
+     */
+    public function execute(string $sql)
+    {
         try {
-		    if ($this->resetStmtId === true)
-		    {
-		    	$sql = rtrim($sql, ';');
-		    	if (strpos(ltrim($sql), 'BEGIN') === 0)
-		    	{
-		    		$sql .= ';';
-		    	}
-		    	$this->stmtId = oci_parse($this->connID, $sql);
-		    }
-
-		    if (strpos($sql, 'RETURNING ROWID INTO :CI_OCI8_ROWID') !== false)
-		    {
-		    	oci_bind_by_name($this->stmtId, ':CI_OCI8_ROWID', $this->rowId, 255);
-		    }
-
-		    oci_set_prefetch($this->stmtId, 1000);
-		    return (oci_execute($this->stmtId, $this->commitMode)) ? $this->stmtId : false;
+            if ($this->resetStmtId === true) {
+                $sql = rtrim($sql, ';');
+                if (strpos(ltrim($sql), 'BEGIN') === 0) {
+                    $sql .= ';';
+                }
+                $this->stmtId = oci_parse($this->connID, $sql);
+            }
+
+            if (strpos($sql, 'RETURNING ROWID INTO :CI_OCI8_ROWID') !== false) {
+                oci_bind_by_name($this->stmtId, ':CI_OCI8_ROWID', $this->rowId, 255);
+            }
+
+            oci_set_prefetch($this->stmtId, 1000);
+
+            return (oci_execute($this->stmtId, $this->commitMode)) ? $this->stmtId : false;
         } catch (ErrorException $e) {
             log_message('error', $e->getMessage());
 
@@ -275,194 +215,156 @@ public function execute(string $sql)
         }
 
         return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the total number of rows affected by this query.
-	 *
-	 * @return integer
-	 */
-	public function affectedRows(): int
-	{
-		return oci_num_rows($this->stmtId);
-	}
-
-	//--------------------------------------------------------------------
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates the SQL for listing tables in a platform-dependent manner.
-	 *
-	 * @param boolean $prefixLimit
-	 *
-	 * @return string
-	 */
-	protected function _listTables(bool $prefixLimit = false): string
-	{
-		$sql = 'SELECT "TABLE_NAME" FROM "USER_TABLES"';
-
-		if ($prefixLimit !== false && $this->DBPrefix !== '')
-		{
-			return $sql . ' WHERE "TABLE_NAME" LIKE \'' . $this->escapeLikeString($this->DBPrefix) . "%' "
-					. sprintf($this->likeEscapeStr, $this->likeEscapeChar);
-		}
-
-		return $sql;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates a platform-specific query string so that the column names can be fetched.
-	 *
-	 * @param string $table
-	 *
-	 * @return string
-	 */
-	protected function _listColumns(string $table = ''): string
-	{
-		if (strpos($table, '.') !== false)
-		{
-			sscanf($table, '%[^.].%s', $owner, $table);
-		}
-		else
-		{
-			$owner = $this->username;
-		}
-
-		return 'SELECT COLUMN_NAME FROM ALL_TAB_COLUMNS
+    }
+
+    /**
+     * Returns the total number of rows affected by this query.
+     */
+    public function affectedRows(): int
+    {
+        return oci_num_rows($this->stmtId);
+    }
+
+    /**
+     * Generates the SQL for listing tables in a platform-dependent manner.
+     */
+    protected function _listTables(bool $prefixLimit = false): string
+    {
+        $sql = 'SELECT "TABLE_NAME" FROM "USER_TABLES"';
+
+        if ($prefixLimit !== false && $this->DBPrefix !== '') {
+            return $sql . ' WHERE "TABLE_NAME" LIKE \'' . $this->escapeLikeString($this->DBPrefix) . "%' "
+                    . sprintf($this->likeEscapeStr, $this->likeEscapeChar);
+        }
+
+        return $sql;
+    }
+
+    /**
+     * Generates a platform-specific query string so that the column names can be fetched.
+     */
+    protected function _listColumns(string $table = ''): string
+    {
+        if (strpos($table, '.') !== false) {
+            sscanf($table, '%[^.].%s', $owner, $table);
+        } else {
+            $owner = $this->username;
+        }
+
+        return 'SELECT COLUMN_NAME FROM ALL_TAB_COLUMNS
 			WHERE UPPER(OWNER) = ' . $this->escape(strtoupper($owner)) . '
 				AND UPPER(TABLE_NAME) = ' . $this->escape(strtoupper($this->DBPrefix . $table));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array of objects with field data
-	 *
-	 * @param  string $table
-	 * @return \stdClass[]
-	 * @throws DatabaseException
-	 */
-	public function _fieldData(string $table): array
-	{
-		if (strpos($table, '.') !== false)
-		{
-			sscanf($table, '%[^.].%s', $owner, $table);
-		}
-		else
-		{
-			$owner = $this->username;
-		}
-
-		$sql = 'SELECT COLUMN_NAME, DATA_TYPE, CHAR_LENGTH, DATA_PRECISION, DATA_LENGTH, DATA_DEFAULT, NULLABLE
+    }
+
+    /**
+     * Returns an array of objects with field data
+     *
+     * @throws DatabaseException
+     *
+     * @return \stdClass[]
+     */
+    public function _fieldData(string $table): array
+    {
+        if (strpos($table, '.') !== false) {
+            sscanf($table, '%[^.].%s', $owner, $table);
+        } else {
+            $owner = $this->username;
+        }
+
+        $sql = 'SELECT COLUMN_NAME, DATA_TYPE, CHAR_LENGTH, DATA_PRECISION, DATA_LENGTH, DATA_DEFAULT, NULLABLE
 			FROM ALL_TAB_COLUMNS
 			WHERE UPPER(OWNER) = ' . $this->escape(strtoupper($owner)) . '
 				AND UPPER(TABLE_NAME) = ' . $this->escape(strtoupper($table));
 
-		if (($query = $this->query($sql)) === false)
-		{
-			throw new DatabaseException(lang('Database.failGetFieldData'));
-		}
-		$query = $query->getResultObject();
-
-		$retval = [];
-		for ($i = 0, $c = count($query); $i < $c; $i++)
-		{
-			$retval[$i]       = new stdClass();
-			$retval[$i]->name = $query[$i]->COLUMN_NAME;
-			$retval[$i]->type = $query[$i]->DATA_TYPE;
-
-			$length = ($query[$i]->CHAR_LENGTH > 0)
-				? $query[$i]->CHAR_LENGTH : $query[$i]->DATA_PRECISION;
-			if ($length === null)
-			{
-				$length = $query[$i]->DATA_LENGTH;
-			}
-			$retval[$i]->max_length = $length;
-
-			$default = $query[$i]->DATA_DEFAULT;
-			if ($default === null && $query[$i]->NULLABLE === 'N')
-			{
-				$default = '';
-			}
-			$retval[$i]->default  = $default;
-			$retval[$i]->nullable = $query[$i]->NULLABLE === 'Y';
-		}
-
-		return $retval;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array of objects with index data
-	 *
-	 * @param  string $table
-	 * @return \stdClass[]
-	 * @throws DatabaseException
-	 */
-	public function _indexData(string $table): array
-	{
-		if (strpos($table, '.') !== false)
-		{
-			sscanf($table, '%[^.].%s', $owner, $table);
-		}
-		else
-		{
-			$owner = $this->username;
-		}
-
-		$sql = 'SELECT AIC.INDEX_NAME, UC.CONSTRAINT_TYPE, AIC.COLUMN_NAME '
-			. ' FROM ALL_IND_COLUMNS AIC '
-			. ' LEFT JOIN USER_CONSTRAINTS UC ON AIC.INDEX_NAME = UC.CONSTRAINT_NAME AND AIC.TABLE_NAME = UC.TABLE_NAME '
-			. 'WHERE AIC.TABLE_NAME = ' . $this->escape(strtolower($table)) . ' '
-			. 'AND AIC.TABLE_OWNER = ' . $this->escape(strtoupper($owner)) . ' '
-			. ' ORDER BY UC.CONSTRAINT_TYPE, AIC.COLUMN_POSITION';
-
-		if (($query = $this->query($sql)) === false)
-		{
-			throw new DatabaseException(lang('Database.failGetIndexData'));
-		}
-		$query = $query->getResultObject();
-
-		$retVal          = [];
-		$constraintTypes = [
-			'P' => 'PRIMARY',
-			'U' => 'UNIQUE',
-		];
-		foreach ($query as $row)
-		{
-			if (isset($retVal[$row->INDEX_NAME]))
-			{
-				$retVal[$row->INDEX_NAME]->fields[] = $row->COLUMN_NAME;
-				continue;
-			}
-
-			$retVal[$row->INDEX_NAME]         = new \stdClass();
-			$retVal[$row->INDEX_NAME]->name   = $row->INDEX_NAME;
-			$retVal[$row->INDEX_NAME]->fields = [$row->COLUMN_NAME];
-			$retVal[$row->INDEX_NAME]->type   = $constraintTypes[$row->CONSTRAINT_TYPE] ?? 'INDEX';
-		}
-
-		return $retVal;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns an array of objects with Foreign key data
-	 *
-	 * @param  string $table
-	 * @return \stdClass[]
-	 * @throws DatabaseException
-	 */
-	public function _foreignKeyData(string $table): array
-	{
-		$sql = 'SELECT
+        if (($query = $this->query($sql)) === false) {
+            throw new DatabaseException(lang('Database.failGetFieldData'));
+        }
+        $query = $query->getResultObject();
+
+        $retval = [];
+
+        for ($i = 0, $c = count($query); $i < $c; $i++) {
+            $retval[$i]       = new stdClass();
+            $retval[$i]->name = $query[$i]->COLUMN_NAME;
+            $retval[$i]->type = $query[$i]->DATA_TYPE;
+
+            $length = ($query[$i]->CHAR_LENGTH > 0)
+                ? $query[$i]->CHAR_LENGTH : $query[$i]->DATA_PRECISION;
+            if ($length === null) {
+                $length = $query[$i]->DATA_LENGTH;
+            }
+            $retval[$i]->max_length = $length;
+
+            $default = $query[$i]->DATA_DEFAULT;
+            if ($default === null && $query[$i]->NULLABLE === 'N') {
+                $default = '';
+            }
+            $retval[$i]->default  = $default;
+            $retval[$i]->nullable = $query[$i]->NULLABLE === 'Y';
+        }
+
+        return $retval;
+    }
+
+    /**
+     * Returns an array of objects with index data
+     *
+     * @throws DatabaseException
+     *
+     * @return \stdClass[]
+     */
+    public function _indexData(string $table): array
+    {
+        if (strpos($table, '.') !== false) {
+            sscanf($table, '%[^.].%s', $owner, $table);
+        } else {
+            $owner = $this->username;
+        }
+
+        $sql = 'SELECT AIC.INDEX_NAME, UC.CONSTRAINT_TYPE, AIC.COLUMN_NAME '
+            . ' FROM ALL_IND_COLUMNS AIC '
+            . ' LEFT JOIN USER_CONSTRAINTS UC ON AIC.INDEX_NAME = UC.CONSTRAINT_NAME AND AIC.TABLE_NAME = UC.TABLE_NAME '
+            . 'WHERE AIC.TABLE_NAME = ' . $this->escape(strtolower($table)) . ' '
+            . 'AND AIC.TABLE_OWNER = ' . $this->escape(strtoupper($owner)) . ' '
+            . ' ORDER BY UC.CONSTRAINT_TYPE, AIC.COLUMN_POSITION';
+
+        if (($query = $this->query($sql)) === false) {
+            throw new DatabaseException(lang('Database.failGetIndexData'));
+        }
+        $query = $query->getResultObject();
+
+        $retVal          = [];
+        $constraintTypes = [
+            'P' => 'PRIMARY',
+            'U' => 'UNIQUE',
+        ];
+
+        foreach ($query as $row) {
+            if (isset($retVal[$row->INDEX_NAME])) {
+                $retVal[$row->INDEX_NAME]->fields[] = $row->COLUMN_NAME;
+
+                continue;
+            }
+
+            $retVal[$row->INDEX_NAME]         = new \stdClass();
+            $retVal[$row->INDEX_NAME]->name   = $row->INDEX_NAME;
+            $retVal[$row->INDEX_NAME]->fields = [$row->COLUMN_NAME];
+            $retVal[$row->INDEX_NAME]->type   = $constraintTypes[$row->CONSTRAINT_TYPE] ?? 'INDEX';
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Returns an array of objects with Foreign key data
+     *
+     * @throws DatabaseException
+     *
+     * @return \stdClass[]
+     */
+    public function _foreignKeyData(string $table): array
+    {
+        $sql = 'SELECT
                  acc.constraint_name,
                  acc.table_name,
                  acc.column_name,
@@ -481,372 +383,319 @@ public function _foreignKeyData(string $table): array
   WHERE ac.constraint_type = ' . $this->escape('R') . '
       AND acc.table_name = ' . $this->escape($table);
 
-		if (($query = $this->query($sql)) === false)
-		{
-			throw new DatabaseException(lang('Database.failGetForeignKeyData'));
-		}
-		$query = $query->getResultObject();
-
-		$retVal = [];
-		foreach ($query as $row)
-		{
-			$obj                      = new \stdClass();
-			$obj->constraint_name     = $row->CONSTRAINT_NAME;
-			$obj->table_name          = $row->TABLE_NAME;
-			$obj->column_name         = $row->COLUMN_NAME;
-			$obj->foreign_table_name  = $row->FOREIGN_TABLE_NAME;
-			$obj->foreign_column_name = $row->FOREIGN_COLUMN_NAME;
-			$retVal[]                 = $obj;
-		}
-
-		return $retVal;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns platform-specific SQL to disable foreign key checks.
-	 *
-	 * @return string
-	 */
-	protected function _disableForeignKeyChecks()
-	{
-		return <<<SQL
-BEGIN
-  FOR c IN
-  (SELECT c.owner, c.table_name, c.constraint_name
-   FROM user_constraints c, user_tables t
-   WHERE c.table_name = t.table_name
-   AND c.status = 'ENABLED'
-   AND c.constraint_type = 'R'
-   AND t.iot_type IS NULL
-   ORDER BY c.constraint_type DESC)
-  LOOP
-    dbms_utility.exec_ddl_statement('alter table "' || c.owner || '"."' || c.table_name || '" disable constraint "' || c.constraint_name || '"');
-  END LOOP;
-END;
-SQL;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns platform-specific SQL to enable foreign key checks.
-	 *
-	 * @return string
-	 */
-	protected function _enableForeignKeyChecks()
-	{
-		return <<<SQL
-BEGIN
-  FOR c IN
-  (SELECT c.owner, c.table_name, c.constraint_name
-   FROM user_constraints c, user_tables t
-   WHERE c.table_name = t.table_name
-   AND c.status = 'DISABLED'
-   AND c.constraint_type = 'R'
-   AND t.iot_type IS NULL
-   ORDER BY c.constraint_type DESC)
-  LOOP
-    dbms_utility.exec_ddl_statement('alter table "' || c.owner || '"."' || c.table_name || '" enable constraint "' || c.constraint_name || '"');
-  END LOOP;
-END;
-SQL;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Get cursor. Returns a cursor from the database
-	 *
-	 * @return resource
-	 */
-	public function getCursor()
-	{
-		return $this->cursorId = oci_new_cursor($this->connID);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Stored Procedure.  Executes a stored procedure
-	 *
-	 * @param  string	package name in which the stored procedure is in
-	 * @param  string	stored procedure name to execute
-	 * @param  array	parameters
-	 * @return mixed
-	 *
-	 * params array keys
-	 *
-	 * KEY      OPTIONAL  NOTES
-	 * name     no        the name of the parameter should be in :<param_name> format
-	 * value    no        the value of the parameter.  If this is an OUT or IN OUT parameter,
-	 *                    this should be a reference to a variable
-	 * type     yes       the type of the parameter
-	 * length   yes       the max size of the parameter
-	 */
-	public function storedProcedure(string $package, string $procedure, array $params)
-	{
-		if ($package === '' || $procedure === '')
-		{
-			throw new DatabaseException(lang('Database.invalidArgument', [$package . $procedure]));
-		}
-
-		// Build the query string
-		$sql = 'BEGIN ' . $package . '.' . $procedure . '(';
-
-		$have_cursor = false;
-		foreach ($params as $param)
-		{
-			$sql .= $param['name'] . ',';
-
-			if (isset($param['type']) && $param['type'] === OCI_B_CURSOR)
-			{
-				$have_cursor = true;
-			}
-		}
-		$sql = trim($sql, ',') . '); END;';
-
-		$this->resetStmtId = false;
-		$this->stmtId      = oci_parse($this->connID, $sql);
-		$this->bindParams($params);
-		$result            = $this->query($sql, false, $have_cursor);
-		$this->resetStmtId = true;
-		return $result;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Bind parameters
-	 *
-	 * @param  array $params
-	 * @return void
-	 */
-	protected function bindParams($params)
-	{
-		if (! is_array($params) || ! is_resource($this->stmtId))
-		{
-			return;
-		}
-
-		foreach ($params as $param)
-		{
-			foreach (['name', 'value', 'type', 'length'] as $val)
-			{
-				if (! isset($param[$val]))
-				{
-					$param[$val] = '';
-				}
-			}
-
-			oci_bind_by_name($this->stmtId, $param['name'], $param['value'], $param['length'], $param['type']);
-		}
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Returns the last error code and message.
-	 *
-	 * Must return an array with keys 'code' and 'message':
-	 *
-	 *  return ['code' => null, 'message' => null);
-	 *
-	 * @return array
-	 */
-	public function error(): array
-	{
-		// oci_error() returns an array that already contains
-		// 'code' and 'message' keys, but it can return false
-		// if there was no error ....
-		if (is_resource($this->cursorId))
-		{
-			$error = oci_error($this->cursorId);
-		}
-		elseif (is_resource($this->stmtId))
-		{
-			$error = oci_error($this->stmtId);
-		}
-		elseif (is_resource($this->connID))
-		{
-			$error = oci_error($this->connID);
-		}
-		else
-		{
-			$error = oci_error();
-		}
-
-		return is_array($error)
-			? $error
-			: [
-				  'code'    => '',
-				  'message' => '',
-			  ];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Insert ID
-	 *
-	 * @return integer
-	 */
-	public function insertID(): int
-	{
-		if (empty($this->rowId) || empty($this->latestInsertedTableName))
-		{
-			return 0;
-		}
-
-		$indexs      = $this->getIndexData($this->latestInsertedTableName);
-		$field_datas = $this->getFieldData($this->latestInsertedTableName);
-
-		if (! $indexs || ! $field_datas)
-		{
-			return 0;
-		}
-
-		$column_type_list    = array_column($field_datas, 'type', 'name');
-		$primary_column_name = '';
-		foreach ((is_array($indexs) ? $indexs : [] ) as $index)
-		{
-			if ($index->type !== 'PRIMARY' || count($index->fields) !== 1)
-			{
-				continue;
-			}
-
-			$primary_column_name = $this->protectIdentifiers($index->fields[0], false, false);
-			$primary_column_type = $column_type_list[$primary_column_name];
-
-			if ($primary_column_type !== 'NUMBER')
-			{
-				continue;
-			}
-		}
-
-		if (! $primary_column_name)
-		{
-			return 0;
-		}
-
-		$table = $this->protectIdentifiers($this->latestInsertedTableName, true);
-		$query = $this->query('SELECT ' . $this->protectIdentifiers($primary_column_name, false) . ' SEQ FROM ' . $table . ' WHERE ROWID = ?', $this->rowId)->getRow();
-
-		return (int)($query->SEQ ?? 0);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Build a DSN from the provided parameters
-	 *
-	 * @return void
-	 */
-	protected function buildDSN()
-	{
-		$this->DSN === '' || $this->DSN = '';
-
-		// Legacy support for TNS in the hostname configuration field
-		$this->hostname = str_replace(["\n", "\r", "\t", ' '], '', $this->hostname);
-
-		if (preg_match($this->validDSNs['tns'], $this->hostname))
-		{
-			$this->DSN = $this->hostname;
-			return;
-		}
-
-		$isEasyConnectableHostName = $this->hostname !== '' && strpos($this->hostname, '/') === false && strpos($this->hostname, ':') === false;
-		$easyConnectablePort       = (( ! empty($this->port) && ctype_digit($this->port)) ? ':' . $this->port : '');
-		$easyConnectableDatabase   = ($this->database !== '' ? '/' . ltrim($this->database, '/') : '');
-
-		if ($isEasyConnectableHostName && ($easyConnectablePort !== '' || $easyConnectableDatabase !== ''))
-		{
-			/* If the hostname field isn't empty, doesn't contain
-			 * ':' and/or '/' and if port and/or database aren't
-			 * empty, then the hostname field is most likely indeed
-			 * just a hostname. Therefore we'll try and build an
-			 * Easy Connect string from these 3 settings, assuming
-			 * that the database field is a service name.
-			 */
-			$this->DSN = $this->hostname
-				. $easyConnectablePort
-				. $easyConnectableDatabase;
-
-			if (preg_match($this->validDSNs['ec'], $this->DSN))
-			{
-				return;
-			}
-		}
-
-		/* At this point, we can only try and validate the hostname and
-		 * database fields separately as DSNs.
-		 */
-		if (preg_match($this->validDSNs['ec'], $this->hostname) || preg_match($this->validDSNs['in'], $this->hostname))
-		{
-			$this->DSN = $this->hostname;
-			return;
-		}
-
-		$this->database = str_replace(["\n", "\r", "\t", ' '], '', $this->database);
-		foreach ($valid_dsns as $regexp)
-		{
-			if (preg_match($regexp, $this->database))
-			{
-				return;
-			}
-		}
-
-		/* Well - OK, an empty string should work as well.
-		 * PHP will try to use environment variables to
-		 * determine which Oracle instance to connect to.
-		 */
-		$this->DSN = '';
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Begin Transaction
-	 *
-	 * @return boolean
-	 */
-	protected function _transBegin(): bool
-	{
-		$this->commitMode = OCI_NO_AUTO_COMMIT;
-
-		return true;
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Commit Transaction
-	 *
-	 * @return boolean
-	 */
-	protected function _transCommit(): bool
-	{
-		$this->commitMode = OCI_COMMIT_ON_SUCCESS;
-
-		return oci_commit($this->connID);
-	}
-
-	// --------------------------------------------------------------------
-
-	/**
-	 * Rollback Transaction
-	 *
-	 * @return boolean
-	 */
-	protected function _transRollback(): bool
-	{
-		$this->commitMode = OCI_COMMIT_ON_SUCCESS;
-
-		return oci_rollback($this->connID);
-	}
-
-	// --------------------------------------------------------------------
+        if (($query = $this->query($sql)) === false) {
+            throw new DatabaseException(lang('Database.failGetForeignKeyData'));
+        }
+        $query = $query->getResultObject();
+
+        $retVal = [];
+
+        foreach ($query as $row) {
+            $obj                      = new \stdClass();
+            $obj->constraint_name     = $row->CONSTRAINT_NAME;
+            $obj->table_name          = $row->TABLE_NAME;
+            $obj->column_name         = $row->COLUMN_NAME;
+            $obj->foreign_table_name  = $row->FOREIGN_TABLE_NAME;
+            $obj->foreign_column_name = $row->FOREIGN_COLUMN_NAME;
+            $retVal[]                 = $obj;
+        }
+
+        return $retVal;
+    }
+
+    /**
+     * Returns platform-specific SQL to disable foreign key checks.
+     *
+     * @return string
+     */
+    protected function _disableForeignKeyChecks()
+    {
+        return <<<'SQL'
+            BEGIN
+              FOR c IN
+              (SELECT c.owner, c.table_name, c.constraint_name
+               FROM user_constraints c, user_tables t
+               WHERE c.table_name = t.table_name
+               AND c.status = 'ENABLED'
+               AND c.constraint_type = 'R'
+               AND t.iot_type IS NULL
+               ORDER BY c.constraint_type DESC)
+              LOOP
+                dbms_utility.exec_ddl_statement('alter table "' || c.owner || '"."' || c.table_name || '" disable constraint "' || c.constraint_name || '"');
+              END LOOP;
+            END;
+            SQL;
+    }
+
+    /**
+     * Returns platform-specific SQL to enable foreign key checks.
+     *
+     * @return string
+     */
+    protected function _enableForeignKeyChecks()
+    {
+        return <<<'SQL'
+            BEGIN
+              FOR c IN
+              (SELECT c.owner, c.table_name, c.constraint_name
+               FROM user_constraints c, user_tables t
+               WHERE c.table_name = t.table_name
+               AND c.status = 'DISABLED'
+               AND c.constraint_type = 'R'
+               AND t.iot_type IS NULL
+               ORDER BY c.constraint_type DESC)
+              LOOP
+                dbms_utility.exec_ddl_statement('alter table "' || c.owner || '"."' || c.table_name || '" enable constraint "' || c.constraint_name || '"');
+              END LOOP;
+            END;
+            SQL;
+    }
+
+    /**
+     * Get cursor. Returns a cursor from the database
+     *
+     * @return resource
+     */
+    public function getCursor()
+    {
+        return $this->cursorId = oci_new_cursor($this->connID);
+    }
+
+    /**
+     * Stored Procedure.  Executes a stored procedure
+     *
+     * @param  string	package name in which the stored procedure is in
+     * @param  string	stored procedure name to execute
+     * @param  array	parameters
+     *
+     * @return mixed
+     *
+     * params array keys
+     *
+     * KEY      OPTIONAL  NOTES
+     * name     no        the name of the parameter should be in :<param_name> format
+     * value    no        the value of the parameter.  If this is an OUT or IN OUT parameter,
+     *                    this should be a reference to a variable
+     * type     yes       the type of the parameter
+     * length   yes       the max size of the parameter
+     */
+    public function storedProcedure(string $package, string $procedure, array $params)
+    {
+        if ($package === '' || $procedure === '') {
+            throw new DatabaseException(lang('Database.invalidArgument', [$package . $procedure]));
+        }
+
+        // Build the query string
+        $sql = 'BEGIN ' . $package . '.' . $procedure . '(';
+
+        $have_cursor = false;
+
+        foreach ($params as $param) {
+            $sql .= $param['name'] . ',';
+
+            if (isset($param['type']) && $param['type'] === OCI_B_CURSOR) {
+                $have_cursor = true;
+            }
+        }
+        $sql = trim($sql, ',') . '); END;';
+
+        $this->resetStmtId = false;
+        $this->stmtId      = oci_parse($this->connID, $sql);
+        $this->bindParams($params);
+        $result            = $this->query($sql, false, $have_cursor);
+        $this->resetStmtId = true;
+
+        return $result;
+    }
+
+    /**
+     * Bind parameters
+     *
+     * @param array $params
+     *
+     * @return void
+     */
+    protected function bindParams($params)
+    {
+        if (! is_array($params) || ! is_resource($this->stmtId)) {
+            return;
+        }
+
+        foreach ($params as $param) {
+            foreach (['name', 'value', 'type', 'length'] as $val) {
+                if (! isset($param[$val])) {
+                    $param[$val] = '';
+                }
+            }
+
+            oci_bind_by_name($this->stmtId, $param['name'], $param['value'], $param['length'], $param['type']);
+        }
+    }
+
+    /**
+     * Returns the last error code and message.
+     *
+     * Must return an array with keys 'code' and 'message':
+     *
+     *  return ['code' => null, 'message' => null);
+     */
+    public function error(): array
+    {
+        // oci_error() returns an array that already contains
+        // 'code' and 'message' keys, but it can return false
+        // if there was no error ....
+        if (is_resource($this->cursorId)) {
+            $error = oci_error($this->cursorId);
+        } elseif (is_resource($this->stmtId)) {
+            $error = oci_error($this->stmtId);
+        } elseif (is_resource($this->connID)) {
+            $error = oci_error($this->connID);
+        } else {
+            $error = oci_error();
+        }
+
+        return is_array($error)
+            ? $error
+            : [
+                'code'    => '',
+                'message' => '',
+            ];
+    }
+
+    /**
+     * Insert ID
+     */
+    public function insertID(): int
+    {
+        if (empty($this->rowId) || empty($this->latestInsertedTableName)) {
+            return 0;
+        }
+
+        $indexs      = $this->getIndexData($this->latestInsertedTableName);
+        $field_datas = $this->getFieldData($this->latestInsertedTableName);
+
+        if (! $indexs || ! $field_datas) {
+            return 0;
+        }
+
+        $column_type_list    = array_column($field_datas, 'type', 'name');
+        $primary_column_name = '';
+
+        foreach ((is_array($indexs) ? $indexs : []) as $index) {
+            if ($index->type !== 'PRIMARY' || count($index->fields) !== 1) {
+                continue;
+            }
+
+            $primary_column_name = $this->protectIdentifiers($index->fields[0], false, false);
+            $primary_column_type = $column_type_list[$primary_column_name];
+
+            if ($primary_column_type !== 'NUMBER') {
+                continue;
+            }
+        }
+
+        if (! $primary_column_name) {
+            return 0;
+        }
+
+        $table = $this->protectIdentifiers($this->latestInsertedTableName, true);
+        $query = $this->query('SELECT ' . $this->protectIdentifiers($primary_column_name, false) . ' SEQ FROM ' . $table . ' WHERE ROWID = ?', $this->rowId)->getRow();
+
+        return (int) ($query->SEQ ?? 0);
+    }
+
+    /**
+     * Build a DSN from the provided parameters
+     *
+     * @return void
+     */
+    protected function buildDSN()
+    {
+        $this->DSN === '' || $this->DSN = '';
+
+        // Legacy support for TNS in the hostname configuration field
+        $this->hostname = str_replace(["\n", "\r", "\t", ' '], '', $this->hostname);
+
+        if (preg_match($this->validDSNs['tns'], $this->hostname)) {
+            $this->DSN = $this->hostname;
+
+            return;
+        }
+
+        $isEasyConnectableHostName = $this->hostname !== '' && strpos($this->hostname, '/') === false && strpos($this->hostname, ':') === false;
+        $easyConnectablePort       = ((! empty($this->port) && ctype_digit($this->port)) ? ':' . $this->port : '');
+        $easyConnectableDatabase   = ($this->database !== '' ? '/' . ltrim($this->database, '/') : '');
+
+        if ($isEasyConnectableHostName && ($easyConnectablePort !== '' || $easyConnectableDatabase !== '')) {
+            /* If the hostname field isn't empty, doesn't contain
+             * ':' and/or '/' and if port and/or database aren't
+             * empty, then the hostname field is most likely indeed
+             * just a hostname. Therefore we'll try and build an
+             * Easy Connect string from these 3 settings, assuming
+             * that the database field is a service name.
+             */
+            $this->DSN = $this->hostname
+                . $easyConnectablePort
+                . $easyConnectableDatabase;
+
+            if (preg_match($this->validDSNs['ec'], $this->DSN)) {
+                return;
+            }
+        }
+
+        /* At this point, we can only try and validate the hostname and
+         * database fields separately as DSNs.
+         */
+        if (preg_match($this->validDSNs['ec'], $this->hostname) || preg_match($this->validDSNs['in'], $this->hostname)) {
+            $this->DSN = $this->hostname;
+
+            return;
+        }
+
+        $this->database = str_replace(["\n", "\r", "\t", ' '], '', $this->database);
+
+        foreach ($valid_dsns as $regexp) {
+            if (preg_match($regexp, $this->database)) {
+                return;
+            }
+        }
+
+        /* Well - OK, an empty string should work as well.
+         * PHP will try to use environment variables to
+         * determine which Oracle instance to connect to.
+         */
+        $this->DSN = '';
+    }
+
+    /**
+     * Begin Transaction
+     */
+    protected function _transBegin(): bool
+    {
+        $this->commitMode = OCI_NO_AUTO_COMMIT;
+
+        return true;
+    }
+
+    /**
+     * Commit Transaction
+     */
+    protected function _transCommit(): bool
+    {
+        $this->commitMode = OCI_COMMIT_ON_SUCCESS;
+
+        return oci_commit($this->connID);
+    }
+
+    /**
+     * Rollback Transaction
+     */
+    protected function _transRollback(): bool
+    {
+        $this->commitMode = OCI_COMMIT_ON_SUCCESS;
+
+        return oci_rollback($this->connID);
+    }
 
     /**
      * Returns the name of the current database being used.
diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 45f35f5db77a..0658ec8c2fe1 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -1,39 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\OCI8;
@@ -43,312 +16,290 @@
  */
 class Forge extends \CodeIgniter\Database\Forge
 {
-
-	/**
-	 * CREATE DATABASE statement
-	 *
-	 * @var string
-	 */
-	protected $createDatabaseStr = false;
-
-	/**
-	 * CREATE TABLE IF statement
-	 *
-	 * @var string
-	 */
-	protected $createTableIfStr = false;
-
-	/**
-	 * DROP TABLE IF EXISTS statement
-	 *
-	 * @var string
-	 */
-	protected $dropTableIfStr = false;
-
-	/**
-	 * DROP DATABASE statement
-	 *
-	 * @var string
-	 */
-	protected $dropDatabaseStr = false;
-
-	/**
-	 * UNSIGNED support
-	 *
-	 * @var boolean|array
-	 */
-	protected $unsigned = false;
-
-	/**
-	 * NULL value representation in CREATE/ALTER TABLE statements
-	 *
-	 * @var string
-	 */
-	protected $null = 'NULL';
-
-	/**
-	 * RENAME TABLE statement
-	 *
-	 * @var string
-	 */
-	protected $renameTableStr = 'ALTER TABLE %s RENAME TO %s';
-
-	/**
-	 * DROP CONSTRAINT statement
-	 *
-	 * @var string
-	 */
-	protected $dropConstraintStr = 'ALTER TABLE %s DROP CONSTRAINT %s';
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * ALTER TABLE
-	 *
-	 * @param string $alter_type ALTER type
-	 * @param string $table      Table name
-	 * @param mixed  $field      Column definition
-	 *
-	 * @return string|string[]
-	 */
-	protected function _alterTable(string $alter_type, string $table, $field)
-	{
-		$sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
-
-		if ($alter_type === 'DROP')
-		{
+    /**
+     * CREATE DATABASE statement
+     *
+     * @var string
+     */
+    protected $createDatabaseStr = false;
+
+    /**
+     * CREATE TABLE IF statement
+     *
+     * @var string
+     */
+    protected $createTableIfStr = false;
+
+    /**
+     * DROP TABLE IF EXISTS statement
+     *
+     * @var string
+     */
+    protected $dropTableIfStr = false;
+
+    /**
+     * DROP DATABASE statement
+     *
+     * @var string
+     */
+    protected $dropDatabaseStr = false;
+
+    /**
+     * UNSIGNED support
+     *
+     * @var array|bool
+     */
+    protected $unsigned = false;
+
+    /**
+     * NULL value representation in CREATE/ALTER TABLE statements
+     *
+     * @var string
+     */
+    protected $null = 'NULL';
+
+    /**
+     * RENAME TABLE statement
+     *
+     * @var string
+     */
+    protected $renameTableStr = 'ALTER TABLE %s RENAME TO %s';
+
+    /**
+     * DROP CONSTRAINT statement
+     *
+     * @var string
+     */
+    protected $dropConstraintStr = 'ALTER TABLE %s DROP CONSTRAINT %s';
+
+    /**
+     * ALTER TABLE
+     *
+     * @param string $alter_type ALTER type
+     * @param string $table      Table name
+     * @param mixed  $field      Column definition
+     *
+     * @return string|string[]
+     */
+    protected function _alterTable(string $alter_type, string $table, $field)
+    {
+        $sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
+
+        if ($alter_type === 'DROP') {
             $fields = array_map(function ($field) {
                 return $this->db->escapeIdentifiers(trim($field));
             }, (is_string($field)) ? explode(',', $field) : $field);
 
-			return $sql . ' DROP ('.implode(',', $fields).') CASCADE CONSTRAINT INVALIDATE';
-		}
-		elseif ($alter_type === 'CHANGE')
-		{
-			$alter_type = 'MODIFY';
-		}
-
-		$nullable_map = array_column($this->db->getFieldData($table), 'nullable', 'name');
-		$sqls         = [];
-		for ($i = 0, $c = count($field); $i < $c; $i++)
-		{
-			if ($alter_type === 'MODIFY')
-			{
-				// If a null constraint is added to a column with a null constraint,
-				// ORA-01451 will occur,
-				// so add null constraint is used only when it is different from the current null constraint.
-				$is_want_to_add_null  = (strpos($field[$i]['null'], ' NOT') === false);
-				$current_null_addable = $nullable_map[$field[$i]['name']];
-
-				if ($is_want_to_add_null === $current_null_addable)
-				{
-					$field[$i]['null'] = '';
-				}
-			}
-
-			if ($field[$i]['_literal'] !== false)
-			{
-				$field[$i] = "\n\t" . $field[$i]['_literal'];
-			}
-			else
-			{
-				$field[$i]['_literal'] = "\n\t" . $this->_processColumn($field[$i]);
-
-				if (! empty($field[$i]['comment']))
-				{
-					$sqls[] = 'COMMENT ON COLUMN '
-						. $this->db->escapeIdentifiers($table) . '.' . $this->db->escapeIdentifiers($field[$i]['name'])
-						. ' IS ' . $field[$i]['comment'];
-				}
-
-				if ($alter_type === 'MODIFY' && ! empty($field[$i]['new_name']))
-				{
-					$sqls[] = $sql . ' RENAME COLUMN ' . $this->db->escapeIdentifiers($field[$i]['name'])
-						. ' TO ' . $this->db->escapeIdentifiers($field[$i]['new_name']);
-				}
-
-				$field[$i] = "\n\t" . $field[$i]['_literal'];
-			}
-		}
-
-		$sql .= ' ' . $alter_type . ' ';
-		$sql .= (count($field) === 1)
-				? $field[0]
-				: '(' . implode(',', $field) . ')';
-
-		// RENAME COLUMN must be executed after MODIFY
-		array_unshift($sqls, $sql);
-		return $sqls;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Field attribute AUTO_INCREMENT
-	 *
-	 * @param array &$attributes
-	 * @param array &$field
-	 *
-	 * @return void
-	 */
-	protected function _attributeAutoIncrement(array &$attributes, array &$field)
-	{
-		if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
-			&& stripos($field['type'], 'NUMBER') !== false
-			&& version_compare($this->db->getVersion(), '12.1', '>=')
-		)
-		{
-			$field['auto_increment'] = ' GENERATED BY DEFAULT AS IDENTITY';
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Process column
-	 *
-	 * @param array $field
-	 *
-	 * @return string
-	 */
-	protected function _processColumn(array $field): string
-	{
+            return $sql . ' DROP (' . implode(',', $fields) . ') CASCADE CONSTRAINT INVALIDATE';
+        }
+        if ($alter_type === 'CHANGE') {
+            $alter_type = 'MODIFY';
+        }
+
+        $nullable_map = array_column($this->db->getFieldData($table), 'nullable', 'name');
+        $sqls         = [];
+
+        for ($i = 0, $c = count($field); $i < $c; $i++) {
+            if ($alter_type === 'MODIFY') {
+                // If a null constraint is added to a column with a null constraint,
+                // ORA-01451 will occur,
+                // so add null constraint is used only when it is different from the current null constraint.
+                $is_want_to_add_null  = (strpos($field[$i]['null'], ' NOT') === false);
+                $current_null_addable = $nullable_map[$field[$i]['name']];
+
+                if ($is_want_to_add_null === $current_null_addable) {
+                    $field[$i]['null'] = '';
+                }
+            }
+
+            if ($field[$i]['_literal'] !== false) {
+                $field[$i] = "\n\t" . $field[$i]['_literal'];
+            } else {
+                $field[$i]['_literal'] = "\n\t" . $this->_processColumn($field[$i]);
+
+                if (! empty($field[$i]['comment'])) {
+                    $sqls[] = 'COMMENT ON COLUMN '
+                        . $this->db->escapeIdentifiers($table) . '.' . $this->db->escapeIdentifiers($field[$i]['name'])
+                        . ' IS ' . $field[$i]['comment'];
+                }
+
+                if ($alter_type === 'MODIFY' && ! empty($field[$i]['new_name'])) {
+                    $sqls[] = $sql . ' RENAME COLUMN ' . $this->db->escapeIdentifiers($field[$i]['name'])
+                        . ' TO ' . $this->db->escapeIdentifiers($field[$i]['new_name']);
+                }
+
+                $field[$i] = "\n\t" . $field[$i]['_literal'];
+            }
+        }
+
+        $sql .= ' ' . $alter_type . ' ';
+        $sql .= (count($field) === 1)
+                ? $field[0]
+                : '(' . implode(',', $field) . ')';
+
+        // RENAME COLUMN must be executed after MODIFY
+        array_unshift($sqls, $sql);
+
+        return $sqls;
+    }
+
+    /**
+     * Field attribute AUTO_INCREMENT
+     *
+     * @param array &$attributes
+     * @param array &$field
+     *
+     * @return void
+     */
+    protected function _attributeAutoIncrement(array &$attributes, array &$field)
+    {
+        if (! empty($attributes['AUTO_INCREMENT']) && $attributes['AUTO_INCREMENT'] === true
+            && stripos($field['type'], 'NUMBER') !== false
+            && version_compare($this->db->getVersion(), '12.1', '>=')
+        ) {
+            $field['auto_increment'] = ' GENERATED BY DEFAULT AS IDENTITY';
+        }
+    }
+
+    /**
+     * Process column
+     */
+    protected function _processColumn(array $field): string
+    {
         $constraint = '';
         // @fixme: can’t cover multi pattern when set type.
         if ($field['type'] === 'VARCHAR2' && strpos($field['length'], "('") === 0) {
             $constraint = ' CHECK(' . $this->db->escapeIdentifiers($field['name'])
                 . ' IN ' . $field['length'] . ')';
 
-            $field['length'] = '('.max(array_map('mb_strlen', explode("','",  mb_substr($field['length'], 2, -2)))).')'.$constraint;
-        } else if (count($this->primaryKeys) === 1 && $field['name'] === $this->primaryKeys[0]) {
+            $field['length'] = '(' . max(array_map('mb_strlen', explode("','", mb_substr($field['length'], 2, -2)))) . ')' . $constraint;
+        } elseif (count($this->primaryKeys) === 1 && $field['name'] === $this->primaryKeys[0]) {
             $field['unique'] = '';
         }
 
-		return $this->db->escapeIdentifiers($field['name'])
-			   . ' ' . $field['type'] . $field['length']
-			   . $field['unsigned']
-			   . $field['default']
-			   . $field['auto_increment']
-			   . $field['null']
-			   . $field['unique'];
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Field attribute TYPE
-	 *
-	 * Performs a data type mapping between different databases.
-	 *
-	 * @param array &$attributes
-	 *
-	 * @return void
-	 */
-	protected function _attributeType(array &$attributes)
-	{
-		// Reset field lengths for data types that don't support it
-		// Usually overridden by drivers
-		switch (strtoupper($attributes['TYPE']))
-		{
-			case 'TINYINT':
-				$attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 3;
-			case 'SMALLINT':
-				$attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 5;
-			case 'MEDIUMINT':
-				$attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 7;
-			case 'INT':
-			case 'INTEGER':
-				$attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 11;
-			case 'BIGINT':
-				$attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 19;
-			case 'NUMERIC':
-				$attributes['TYPE'] = 'NUMBER';
-				return;
+        return $this->db->escapeIdentifiers($field['name'])
+               . ' ' . $field['type'] . $field['length']
+               . $field['unsigned']
+               . $field['default']
+               . $field['auto_increment']
+               . $field['null']
+               . $field['unique'];
+    }
+
+    /**
+     * Field attribute TYPE
+     *
+     * Performs a data type mapping between different databases.
+     *
+     * @param array &$attributes
+     *
+     * @return void
+     */
+    protected function _attributeType(array &$attributes)
+    {
+        // Reset field lengths for data types that don't support it
+        // Usually overridden by drivers
+        switch (strtoupper($attributes['TYPE'])) {
+            case 'TINYINT':
+                $attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 3;
+                // no break
+            case 'SMALLINT':
+                $attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 5;
+                // no break
+            case 'MEDIUMINT':
+                $attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 7;
+                // no break
+            case 'INT':
+            case 'INTEGER':
+                $attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 11;
+                // no break
+            case 'BIGINT':
+                $attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 19;
+                // no break
+            case 'NUMERIC':
+                $attributes['TYPE'] = 'NUMBER';
+
+                return;
+
             case 'DOUBLE':
-				$attributes['TYPE'] = 'FLOAT';
-				$attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 126;
-				return;
-			case 'DATETIME':
-			case 'TIME':
-				$attributes['TYPE'] = 'DATE';
-				return;
-			case 'SET':
-			case 'ENUM':
-			case 'VARCHAR':
-				$attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 255;
-			case 'TEXT':
-			case 'MEDIUMTEXT':
-				$attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 4000;
-				$attributes['TYPE']       = 'VARCHAR2';
-				return;
-			default: return;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Drop Table
-	 *
-	 * Generates a platform-specific DROP TABLE string
-	 *
-	 * @param string  $table     Table name
-	 * @param boolean $if_exists Whether to add an IF EXISTS condition
-	 * @param boolean $cascade
-	 *
-	 * @return string|boolean
-	 */
-	protected function _dropTable(string $table, bool $if_exists, bool $cascade)
-	{
-		$sql = parent::_dropTable($table, $if_exists, $cascade);
-
-		if ($sql !== true && $cascade === true)
-		{
-			$sql .= ' CASCADE CONSTRAINTS PURGE';
-		}
-		elseif ($sql !== true)
-		{
-			$sql .= ' PURGE';
-		}
-
-		return $sql;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Process foreign keys
-	 *
-	 * @param string $table Table name
-	 *
-	 * @return string
-	 */
-	protected function _processForeignKeys(string $table): string
-	{
-		$sql = '';
-
-		$allowActions = [
-			'CASCADE',
-			'SET NULL',
-			'NO ACTION',
-		];
-
-		if (count($this->foreignKeys) > 0)
-		{
-			foreach ($this->foreignKeys as $field => $fkey)
-			{
-				$name_index = $table . '_' . $field . '_fk';
-
-				$sql .= ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers($name_index)
-					. ' FOREIGN KEY(' . $this->db->escapeIdentifiers($field) . ') REFERENCES ' . $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['table']) . ' (' . $this->db->escapeIdentifiers($fkey['field']) . ')';
-
-				if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions))
-				{
-					$sql .= ' ON DELETE ' . $fkey['onDelete'];
-				}
-			}
-		}
-
-		return $sql;
-	}
+                $attributes['TYPE']       = 'FLOAT';
+                $attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 126;
+
+                return;
+
+            case 'DATETIME':
+            case 'TIME':
+                $attributes['TYPE'] = 'DATE';
+
+                return;
+
+            case 'SET':
+            case 'ENUM':
+            case 'VARCHAR':
+                $attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 255;
+                // no break
+            case 'TEXT':
+            case 'MEDIUMTEXT':
+                $attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 4000;
+                $attributes['TYPE']       = 'VARCHAR2';
+
+                return;
+
+            default: return;
+        }
+    }
+
+    /**
+     * Drop Table
+     *
+     * Generates a platform-specific DROP TABLE string
+     *
+     * @param string $table     Table name
+     * @param bool   $if_exists Whether to add an IF EXISTS condition
+     *
+     * @return bool|string
+     */
+    protected function _dropTable(string $table, bool $if_exists, bool $cascade)
+    {
+        $sql = parent::_dropTable($table, $if_exists, $cascade);
+
+        if ($sql !== true && $cascade === true) {
+            $sql .= ' CASCADE CONSTRAINTS PURGE';
+        } elseif ($sql !== true) {
+            $sql .= ' PURGE';
+        }
+
+        return $sql;
+    }
+
+    /**
+     * Process foreign keys
+     *
+     * @param string $table Table name
+     */
+    protected function _processForeignKeys(string $table): string
+    {
+        $sql = '';
+
+        $allowActions = [
+            'CASCADE',
+            'SET NULL',
+            'NO ACTION',
+        ];
+
+        if (count($this->foreignKeys) > 0) {
+            foreach ($this->foreignKeys as $field => $fkey) {
+                $name_index = $table . '_' . $field . '_fk';
+
+                $sql .= ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers($name_index)
+                    . ' FOREIGN KEY(' . $this->db->escapeIdentifiers($field) . ') REFERENCES ' . $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['table']) . ' (' . $this->db->escapeIdentifiers($fkey['field']) . ')';
+
+                if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true)) {
+                    $sql .= ' ON DELETE ' . $fkey['onDelete'];
+                }
+            }
+        }
+
+        return $sql;
+    }
 }
diff --git a/system/Database/OCI8/PreparedQuery.php b/system/Database/OCI8/PreparedQuery.php
index 7fd98611c937..6951f79c6fbe 100644
--- a/system/Database/OCI8/PreparedQuery.php
+++ b/system/Database/OCI8/PreparedQuery.php
@@ -1,172 +1,123 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\OCI8;
 
-use CodeIgniter\Database\PreparedQueryInterface;
 use CodeIgniter\Database\BasePreparedQuery;
+use CodeIgniter\Database\PreparedQueryInterface;
 
 /**
  * Prepared query for MySQLi
  */
 class PreparedQuery extends BasePreparedQuery implements PreparedQueryInterface
 {
-	private $isCollectRowId;
-
-	/**
-	 * Prepares the query against the database, and saves the connection
-	 * info necessary to execute the query later.
-	 *
-	 * NOTE: This version is based on SQL code. Child classes should
-	 * override this method.
-	 *
-	 * @param string $sql
-	 * @param array  $options    Passed to the connection's prepare statement.
-	 * @param string $queryClass
-	 *
-	 * @return mixed
-	 */
-	public function prepare(string $sql, array $options = [], string $queryClass = 'CodeIgniter\\Database\\Query')
-	{
-		$this->isCollectRowId = false;
-
-		if (substr($sql, strpos($sql, 'RETURNING ROWID INTO :CI_OCI8_ROWID')) === 'RETURNING ROWID INTO :CI_OCI8_ROWID')
-		{
-			$this->isCollectRowId = true;
-		}
-
-		return parent::prepare($sql, $options, $queryClass);
-	}
-
-	/**
-	 * Prepares the query against the database, and saves the connection
-	 * info necessary to execute the query later.
-	 *
-	 * NOTE: This version is based on SQL code. Child classes should
-	 * override this method.
-	 *
-	 * @param string $sql
-	 * @param array  $options Passed to the connection's prepare statement.
-	 *                        Unused in the MySQLi driver.
-	 *
-	 * @return mixed
-	 */
-	public function _prepare(string $sql, array $options = [])
-	{
-		$sql = rtrim($sql, ';');
-		if (strpos('BEGIN', ltrim($sql)) === 0)
-		{
-			$sql .= ';';
-		}
-
-		if (! $this->statement = oci_parse($this->db->connID, $this->parameterize($sql)))
-		{
-			$error             = oci_error($this->db->connID);
-			$this->errorCode   = $error['code'] ?? 0;
-			$this->errorString = $error['message'] ?? '';
-		}
-
-		return $this;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Takes a new set of data and runs it against the currently
-	 * prepared query. Upon success, will return a Results object.
-	 *
-	 * @param array $data
-	 *
-	 * @return boolean
-	 */
-	public function _execute(array $data): bool
-	{
-		if (is_null($this->statement))
-		{
-			throw new \BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
-		}
-
-		$last_key = 0;
-		foreach (array_keys($data) as $key)
-		{
-			oci_bind_by_name($this->statement, ':' . $key, $data[$key]);
-			$last_key = $key;
-		}
-
-		if ($this->isCollectRowId)
-		{
-			oci_bind_by_name($this->statement, ':' . (++$last_key), $this->db->rowId, 255);
-		}
-
-		return oci_execute($this->statement, $this->db->commitMode);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the result object for the prepared query.
-	 *
-	 * @return mixed
-	 */
-	public function _getResult()
-	{
-		return $this->statement;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Replaces the ? placeholders with :1, :2, etc parameters for use
-	 * within the prepared query.
-	 *
-	 * @param string $sql
-	 *
-	 * @return string
-	 */
-	public function parameterize(string $sql): string
-	{
-		// Track our current value
-		$count = 0;
-
-		$sql = preg_replace_callback('/\?/', function ($matches) use (&$count) {
-			return ':' . ($count++);
-		}, $sql);
-
-		return $sql;
-	}
+    private $isCollectRowId;
+
+    /**
+     * Prepares the query against the database, and saves the connection
+     * info necessary to execute the query later.
+     *
+     * NOTE: This version is based on SQL code. Child classes should
+     * override this method.
+     *
+     * @param array $options Passed to the connection's prepare statement.
+     *
+     * @return mixed
+     */
+    public function prepare(string $sql, array $options = [], string $queryClass = 'CodeIgniter\\Database\\Query')
+    {
+        $this->isCollectRowId = false;
+
+        if (substr($sql, strpos($sql, 'RETURNING ROWID INTO :CI_OCI8_ROWID')) === 'RETURNING ROWID INTO :CI_OCI8_ROWID') {
+            $this->isCollectRowId = true;
+        }
+
+        return parent::prepare($sql, $options, $queryClass);
+    }
+
+    /**
+     * Prepares the query against the database, and saves the connection
+     * info necessary to execute the query later.
+     *
+     * NOTE: This version is based on SQL code. Child classes should
+     * override this method.
+     *
+     * @param array $options Passed to the connection's prepare statement.
+     *                       Unused in the MySQLi driver.
+     *
+     * @return mixed
+     */
+    public function _prepare(string $sql, array $options = [])
+    {
+        $sql = rtrim($sql, ';');
+        if (strpos('BEGIN', ltrim($sql)) === 0) {
+            $sql .= ';';
+        }
+
+        if (! $this->statement = oci_parse($this->db->connID, $this->parameterize($sql))) {
+            $error             = oci_error($this->db->connID);
+            $this->errorCode   = $error['code'] ?? 0;
+            $this->errorString = $error['message'] ?? '';
+        }
+
+        return $this;
+    }
+
+    /**
+     * Takes a new set of data and runs it against the currently
+     * prepared query. Upon success, will return a Results object.
+     */
+    public function _execute(array $data): bool
+    {
+        if (null === $this->statement) {
+            throw new \BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
+        }
+
+        $last_key = 0;
+
+        foreach (array_keys($data) as $key) {
+            oci_bind_by_name($this->statement, ':' . $key, $data[$key]);
+            $last_key = $key;
+        }
+
+        if ($this->isCollectRowId) {
+            oci_bind_by_name($this->statement, ':' . (++$last_key), $this->db->rowId, 255);
+        }
+
+        return oci_execute($this->statement, $this->db->commitMode);
+    }
+
+    /**
+     * Returns the result object for the prepared query.
+     *
+     * @return mixed
+     */
+    public function _getResult()
+    {
+        return $this->statement;
+    }
+
+    /**
+     * Replaces the ? placeholders with :1, :2, etc parameters for use
+     * within the prepared query.
+     */
+    public function parameterize(string $sql): string
+    {
+        // Track our current value
+        $count = 0;
+
+        $sql = preg_replace_callback('/\?/', static function ($matches) use (&$count) {
+            return ':' . ($count++);
+        }, $sql);
+
+        return $sql;
+    }
 }
diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php
index 2df16ab7273a..3352f308a5c7 100644
--- a/system/Database/OCI8/Result.php
+++ b/system/Database/OCI8/Result.php
@@ -1,39 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\OCI8;
@@ -47,130 +20,102 @@
  */
 class Result extends BaseResult implements ResultInterface
 {
-
-	/**
-	 * Gets the number of fields in the result set.
-	 *
-	 * @return integer
-	 */
-	public function getFieldCount(): int
-	{
-		return oci_num_fields($this->resultID);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates an array of column names in the result set.
-	 *
-	 * @return array
-	 */
-	public function getFieldNames(): array
-	{
-		return array_map(function ($field_index) {
-			return oci_field_name($this->resultID, $field_index);
-		}, range(1, $this->getFieldCount()));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Generates an array of objects representing field meta-data.
-	 *
-	 * @return array
-	 */
-	public function getFieldData(): array
-	{
-		return array_map(function ($field_index) {
-			return (object) [
-								'name'       => oci_field_name($this->resultID, $field_index),
-								'type'       => oci_field_type($this->resultID, $field_index),
-								'max_length' => oci_field_size($this->resultID, $field_index),
-				// 'primary_key' = (int) ($data->flags & 2),
-				// 'default'     = $data->def,
-							];
-		}, range(1, $this->getFieldCount()));
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Frees the current result.
-	 *
-	 * @return void
-	 */
-	public function freeResult()
-	{
-		if (is_resource($this->resultID))
-		{
-			oci_free_statement($this->resultID);
-			$this->resultID = false;
-		}
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Moves the internal pointer to the desired offset. This is called
-	 * internally before fetching results to make sure the result set
-	 * starts at zero.
-	 *
-	 * @param integer $n
-	 *
-	 * @return mixed
-	 */
-	public function dataSeek(int $n = 0)
-	{
-		// We can't support data seek by oci
-		return false;
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the result set as an array.
-	 *
-	 * Overridden by driver classes.
-	 *
-	 * @return mixed
-	 */
-	protected function fetchAssoc()
-	{
-		return oci_fetch_assoc($this->resultID);
-	}
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Returns the result set as an object.
-	 *
-	 * Overridden by child classes.
-	 *
-	 * @param string $className
-	 *
-	 * @return object|boolean|Entity
-	 */
-	protected function fetchObject(string $className = \stdClass::class)
-	{
-		$row = oci_fetch_object($this->resultID);
-
-		if ($className === 'stdClass' || ! $row)
-		{
-			return $row;
-		}
-		elseif (is_subclass_of($className, Entity::class))
-		{
-			return (new $className())->setAttributes((array) $row);
-		}
-
-		$instance = new $className();
-		foreach ($row as $key => $value)
-		{
-			$instance->$key = $value;
-		}
-
-		return $instance;
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * Gets the number of fields in the result set.
+     */
+    public function getFieldCount(): int
+    {
+        return oci_num_fields($this->resultID);
+    }
+
+    /**
+     * Generates an array of column names in the result set.
+     */
+    public function getFieldNames(): array
+    {
+        return array_map(function ($field_index) {
+            return oci_field_name($this->resultID, $field_index);
+        }, range(1, $this->getFieldCount()));
+    }
+
+    /**
+     * Generates an array of objects representing field meta-data.
+     */
+    public function getFieldData(): array
+    {
+        return array_map(function ($field_index) {
+            return (object) [
+                'name'       => oci_field_name($this->resultID, $field_index),
+                'type'       => oci_field_type($this->resultID, $field_index),
+                'max_length' => oci_field_size($this->resultID, $field_index),
+                // 'primary_key' = (int) ($data->flags & 2),
+                // 'default'     = $data->def,
+            ];
+        }, range(1, $this->getFieldCount()));
+    }
+
+    /**
+     * Frees the current result.
+     *
+     * @return void
+     */
+    public function freeResult()
+    {
+        if (is_resource($this->resultID)) {
+            oci_free_statement($this->resultID);
+            $this->resultID = false;
+        }
+    }
+
+    /**
+     * Moves the internal pointer to the desired offset. This is called
+     * internally before fetching results to make sure the result set
+     * starts at zero.
+     *
+     * @return mixed
+     */
+    public function dataSeek(int $n = 0)
+    {
+        // We can't support data seek by oci
+        return false;
+    }
+
+    /**
+     * Returns the result set as an array.
+     *
+     * Overridden by driver classes.
+     *
+     * @return mixed
+     */
+    protected function fetchAssoc()
+    {
+        return oci_fetch_assoc($this->resultID);
+    }
+
+    /**
+     * Returns the result set as an object.
+     *
+     * Overridden by child classes.
+     *
+     * @return bool|Entity|object
+     */
+    protected function fetchObject(string $className = \stdClass::class)
+    {
+        $row = oci_fetch_object($this->resultID);
+
+        if ($className === 'stdClass' || ! $row) {
+            return $row;
+        }
+        if (is_subclass_of($className, Entity::class)) {
+            return (new $className())->setAttributes((array) $row);
+        }
+
+        $instance = new $className();
+
+        foreach ($row as $key => $value) {
+            $instance->{$key} = $value;
+        }
+
+        return $instance;
+    }
 }
diff --git a/system/Database/OCI8/Utils.php b/system/Database/OCI8/Utils.php
index 9ed063e5022a..d3fafca8e09a 100644
--- a/system/Database/OCI8/Utils.php
+++ b/system/Database/OCI8/Utils.php
@@ -1,39 +1,12 @@
 <?php
 
 /**
- * CodeIgniter
+ * This file is part of CodeIgniter 4 framework.
  *
- * An open source application development framework for PHP
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
  *
- * This content is released under the MIT License (MIT)
- *
- * Copyright (c) 2014-2019 British Columbia Institute of Technology
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * @package    CodeIgniter
- * @author     CodeIgniter Dev Team
- * @copyright  2014-2019 British Columbia Institute of Technology (https://bcit.ca/)
- * @license    https://opensource.org/licenses/MIT	MIT License
- * @link       https://codeigniter.com
- * @since      Version 4.0.0
- * @filesource
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
  */
 
 namespace CodeIgniter\Database\OCI8;
@@ -46,27 +19,20 @@
  */
 class Utils extends BaseUtils
 {
-
-	/**
-	 * List databases statement
-	 *
-	 * @var string
-	 */
-	protected $listDatabases = 'SELECT TABLESPACE_NAME FROM USER_TABLESPACES';
-
-	//--------------------------------------------------------------------
-
-	/**
-	 * Platform dependent version of the backup function.
-	 *
-	 * @param array|null $prefs
-	 *
-	 * @return mixed
-	 */
-	public function _backup(array $prefs = null)
-	{
-		throw new DatabaseException('Unsupported feature of the database platform you are using.');
-	}
-
-	//--------------------------------------------------------------------
+    /**
+     * List databases statement
+     *
+     * @var string
+     */
+    protected $listDatabases = 'SELECT TABLESPACE_NAME FROM USER_TABLESPACES';
+
+    /**
+     * Platform dependent version of the backup function.
+     *
+     * @return mixed
+     */
+    public function _backup(?array $prefs = null)
+    {
+        throw new DatabaseException('Unsupported feature of the database platform you are using.');
+    }
 }

From a77ad8d42e2756cde5c50db0a97a9ee0950d8737 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 9 Sep 2021 10:58:20 +0900
Subject: [PATCH 1339/2325] style: php -d memory_limit=-1 ./vendor/bin/phpstan
 analyse

---
 system/Database/OCI8/Builder.php       | 11 +++++++-
 system/Database/OCI8/Connection.php    | 36 ++++++++++++++------------
 system/Database/OCI8/Forge.php         | 14 +++++-----
 system/Database/OCI8/PreparedQuery.php | 12 +++++++++
 4 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 3f2c997a1589..8b5318a588bf 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -54,6 +54,13 @@ class Builder extends BaseBuilder
      */
     protected $limitUsed = false;
 
+    /**
+     * A reference to the database connection.
+     *
+     * @var Connection
+     */
+    protected $db;
+
     /**
      * Insert batch statement
      *
@@ -240,7 +247,9 @@ protected function _limit(string $sql, bool $offsetIgnore = false): string
         $offset = (int) ($offsetIgnore === false) ? $this->QBOffset : 0;
         if (version_compare($this->db->getVersion(), '12.1', '>=')) {
             // OFFSET-FETCH can be used only with the ORDER BY clause
-            empty($this->QBOrderBy) && $sql .= ' ORDER BY 1';
+            if (empty($this->QBOrderBy)) {
+                $sql .= ' ORDER BY 1';
+            }
 
             return $sql . ' OFFSET ' . (int) $offset . ' ROWS FETCH NEXT ' . $this->QBLimit . ' ROWS ONLY';
         }
diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 598fed9c63c4..c99d9c5420d6 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -174,19 +174,19 @@ public function getVersion(): string
         }
 
         if (! $this->connID || ($version_string = oci_server_version($this->connID)) === false) {
-            return false;
+            return '';
         }
         if (preg_match('#Release\s(\d+(?:\.\d+)+)#', $version_string, $match)) {
             return $this->dataCache['version'] = $match[1];
         }
 
-        return false;
+        return '';
     }
 
     /**
      * Executes the query against the database.
      *
-     * @return resource
+     * @return resource|boolean
      */
     public function execute(string $sql)
     {
@@ -464,9 +464,9 @@ public function getCursor()
     /**
      * Stored Procedure.  Executes a stored procedure
      *
-     * @param  string	package name in which the stored procedure is in
-     * @param  string	stored procedure name to execute
-     * @param  array	parameters
+     * @param  string $package    package name in which the stored procedure is in
+     * @param  string $procedure  stored procedure name to execute
+     * @param  array  $params     parameters
      *
      * @return mixed
      *
@@ -544,14 +544,14 @@ public function error(): array
         // oci_error() returns an array that already contains
         // 'code' and 'message' keys, but it can return false
         // if there was no error ....
-        if (is_resource($this->cursorId)) {
-            $error = oci_error($this->cursorId);
-        } elseif (is_resource($this->stmtId)) {
-            $error = oci_error($this->stmtId);
-        } elseif (is_resource($this->connID)) {
-            $error = oci_error($this->connID);
-        } else {
-            $error = oci_error();
+        $error = oci_error();
+        $resources = [$this->cursorId, $this->stmtId, $this->connID];
+
+        foreach ($resources as $resource) {
+          if (is_resource($resource)) {
+              $error = oci_error($resource);
+              break;
+          }
         }
 
         return is_array($error)
@@ -581,7 +581,7 @@ public function insertID(): int
         $column_type_list    = array_column($field_datas, 'type', 'name');
         $primary_column_name = '';
 
-        foreach ((is_array($indexs) ? $indexs : []) as $index) {
+        foreach ($indexs as $index) {
             if ($index->type !== 'PRIMARY' || count($index->fields) !== 1) {
                 continue;
             }
@@ -611,7 +611,9 @@ public function insertID(): int
      */
     protected function buildDSN()
     {
-        $this->DSN === '' || $this->DSN = '';
+        if ($this->DSN !== '') {
+            $this->DSN = '';
+        }
 
         // Legacy support for TNS in the hostname configuration field
         $this->hostname = str_replace(["\n", "\r", "\t", ' '], '', $this->hostname);
@@ -654,7 +656,7 @@ protected function buildDSN()
 
         $this->database = str_replace(["\n", "\r", "\t", ' '], '', $this->database);
 
-        foreach ($valid_dsns as $regexp) {
+        foreach ($this->validDSNs as $regexp) {
             if (preg_match($regexp, $this->database)) {
                 return;
             }
diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 0658ec8c2fe1..4b9fb009fbcc 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -19,28 +19,28 @@ class Forge extends \CodeIgniter\Database\Forge
     /**
      * CREATE DATABASE statement
      *
-     * @var string
+     * @var false
      */
     protected $createDatabaseStr = false;
 
     /**
      * CREATE TABLE IF statement
      *
-     * @var string
+     * @var false
      */
     protected $createTableIfStr = false;
 
     /**
      * DROP TABLE IF EXISTS statement
      *
-     * @var string
+     * @var false
      */
     protected $dropTableIfStr = false;
 
     /**
      * DROP DATABASE statement
      *
-     * @var string
+     * @var false
      */
     protected $dropDatabaseStr = false;
 
@@ -146,8 +146,8 @@ protected function _alterTable(string $alter_type, string $table, $field)
     /**
      * Field attribute AUTO_INCREMENT
      *
-     * @param array &$attributes
-     * @param array &$field
+     * @param array $attributes
+     * @param array $field
      *
      * @return void
      */
@@ -191,7 +191,7 @@ protected function _processColumn(array $field): string
      *
      * Performs a data type mapping between different databases.
      *
-     * @param array &$attributes
+     * @param array $attributes
      *
      * @return void
      */
diff --git a/system/Database/OCI8/PreparedQuery.php b/system/Database/OCI8/PreparedQuery.php
index 6951f79c6fbe..36b4325df485 100644
--- a/system/Database/OCI8/PreparedQuery.php
+++ b/system/Database/OCI8/PreparedQuery.php
@@ -19,6 +19,18 @@
  */
 class PreparedQuery extends BasePreparedQuery implements PreparedQueryInterface
 {
+    /**
+     * A reference to the db connection to use.
+     *
+     * @var Connection
+     */
+    protected $db;
+
+    /**
+     * Is collect row id
+     *
+     * @var bool
+     */
     private $isCollectRowId;
 
     /**

From 5fc81d8b22b0e13d0b824f4971d7af885f8cd477 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Fri, 10 Sep 2021 00:05:29 +0900
Subject: [PATCH 1340/2325] fix: BOOLEAN is now cast to NUMBER.

---
 system/Database/OCI8/Forge.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 4b9fb009fbcc..ba4f4f14a1c3 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -221,6 +221,13 @@ protected function _attributeType(array &$attributes)
 
                 return;
 
+            case 'BOOLEAN':
+                $attributes['TYPE'] = 'NUMBER';
+                $attributes['CONSTRAINT'] = 1;
+                $attributes['UNSIGNED'] = true;
+                $attributes['NULL'] = false;
+                return;
+
             case 'DOUBLE':
                 $attributes['TYPE']       = 'FLOAT';
                 $attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 126;

From f2924f676137f73ea8b9ff9cb8519995b8ddeed7 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Fri, 10 Sep 2021 00:07:45 +0900
Subject: [PATCH 1341/2325] fix: support CompositeForeignKey.

---
 system/Database/OCI8/Forge.php           | 12 ++++--
 tests/system/Database/Live/ForgeTest.php | 53 +++++++++++++++++-------
 2 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index ba4f4f14a1c3..5e50557579aa 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -296,10 +296,14 @@ protected function _processForeignKeys(string $table): string
 
         if (count($this->foreignKeys) > 0) {
             foreach ($this->foreignKeys as $field => $fkey) {
-                $name_index = $table . '_' . $field . '_fk';
-
-                $sql .= ",\n\tCONSTRAINT " . $this->db->escapeIdentifiers($name_index)
-                    . ' FOREIGN KEY(' . $this->db->escapeIdentifiers($field) . ') REFERENCES ' . $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['table']) . ' (' . $this->db->escapeIdentifiers($fkey['field']) . ')';
+                $nameIndex            = $table . '_' . implode('_', $fkey['field']) . '_fk';
+                $nameIndexFilled      = $this->db->escapeIdentifiers($nameIndex);
+                $foreignKeyFilled     = implode(', ', $this->db->escapeIdentifiers($fkey['field']));
+                $referenceTableFilled = $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['referenceTable']);
+                $referenceFieldFilled = implode(', ', $this->db->escapeIdentifiers($fkey['referenceField']));
+
+                $formatSql = ",\n\tCONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s)";
+                $sql .= sprintf($formatSql, $nameIndexFilled, $foreignKeyFilled, $referenceTableFilled, $referenceFieldFilled);
 
                 if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true)) {
                     $sql .= ' ON DELETE ' . $fkey['onDelete'];
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 88653af4d36e..07585680daff 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -526,38 +526,59 @@ public function testCompositeForeignKey()
         $this->forge->addPrimaryKey(['id', 'second_id']);
         $this->forge->createTable('forge_test_users', true, $attributes);
 
-        $this->forge->addField([
+        $forgeTestInvoicesTableName = 'forge_test_invoices';
+        $userIdColumnName = 'user_id';
+        $userSecondIdColumnName = 'user_second_id';
+        $fields = [
             'id' => [
                 'type'       => 'INTEGER',
                 'constraint' => 11,
             ],
-            'users_id' => [
-                'type'       => 'INTEGER',
-                'constraint' => 11,
-            ],
-            'users_second_id' => [
-                'type'       => 'VARCHAR',
-                'constraint' => 50,
-            ],
             'name' => [
                 'type'       => 'VARCHAR',
                 'constraint' => 255,
             ],
-        ]);
+        ];
+
+        if ($this->db->DBDriver === 'OCI8') {
+            $userIdColumnName = 'uid';
+            $userSecondIdColumnName = 'usid';
+            $forgeTestInvoicesTableName = 'forge_test_inv';
+        }
+
+        $fields[$userIdColumnName] = [
+            'type'       => 'INTEGER',
+            'constraint' => 11,
+        ];
+
+        $fields[$userSecondIdColumnName] = [
+            'type'       => 'VARCHAR',
+            'constraint' => 50,
+        ];
+
+        $this->forge->addField($fields);
         $this->forge->addPrimaryKey('id');
-        $this->forge->addForeignKey(['users_id', 'users_second_id'], 'forge_test_users', ['id', 'second_id'], 'CASCADE', 'CASCADE');
+        $this->forge->addForeignKey([$userIdColumnName, $userSecondIdColumnName], 'forge_test_users', ['id', 'second_id'], 'CASCADE', 'CASCADE');
 
-        $this->forge->createTable('forge_test_invoices', true, $attributes);
+        $this->forge->createTable($forgeTestInvoicesTableName, true, $attributes);
 
-        $foreignKeyData = $this->db->getForeignKeyData('forge_test_invoices');
+        $foreignKeyData = $this->db->getForeignKeyData($forgeTestInvoicesTableName);
 
         if ($this->db->DBDriver === 'SQLite3') {
             $this->assertSame('users_id to db_forge_test_users.id', $foreignKeyData[0]->constraint_name);
             $this->assertSame(0, $foreignKeyData[0]->sequence);
             $this->assertSame('users_second_id to db_forge_test_users.second_id', $foreignKeyData[1]->constraint_name);
             $this->assertSame(1, $foreignKeyData[1]->sequence);
+        } else if ($this->db->DBDriver === 'OCI8') {
+            $haystack = [$userIdColumnName, $userSecondIdColumnName];
+            $this->assertSame($this->db->DBPrefix . 'forge_test_inv_uid_usid_fk', $foreignKeyData[0]->constraint_name);
+            $this->assertContains($foreignKeyData[0]->column_name, $haystack);
+
+            $secondIdKey = 1;
+            $this->assertSame($this->db->DBPrefix . 'forge_test_inv_uid_usid_fk', $foreignKeyData[$secondIdKey]->constraint_name);
+            $this->assertContains($foreignKeyData[$secondIdKey]->column_name, $haystack);
         } else {
-            $haystack = ['users_id', 'users_second_id'];
+            $haystack = [$userIdColumnName, $userSecondIdColumnName];
             $this->assertSame($this->db->DBPrefix . 'forge_test_invoices_users_id_users_second_id_foreign', $foreignKeyData[0]->constraint_name);
             $this->assertContains($foreignKeyData[0]->column_name, $haystack);
 
@@ -565,10 +586,10 @@ public function testCompositeForeignKey()
             $this->assertSame($this->db->DBPrefix . 'forge_test_invoices_users_id_users_second_id_foreign', $foreignKeyData[$secondIdKey]->constraint_name);
             $this->assertContains($foreignKeyData[$secondIdKey]->column_name, $haystack);
         }
-        $this->assertSame($this->db->DBPrefix . 'forge_test_invoices', $foreignKeyData[0]->table_name);
+        $this->assertSame($this->db->DBPrefix . $forgeTestInvoicesTableName, $foreignKeyData[0]->table_name);
         $this->assertSame($this->db->DBPrefix . 'forge_test_users', $foreignKeyData[0]->foreign_table_name);
 
-        $this->forge->dropTable('forge_test_invoices', true);
+        $this->forge->dropTable($forgeTestInvoicesTableName, true);
         $this->forge->dropTable('forge_test_users', true);
     }
 

From 205d8698e0e03226cda33120b9a83c40a47cc646 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Fri, 10 Sep 2021 00:15:16 +0900
Subject: [PATCH 1342/2325] style: php -d memory_limit=-1
 ./vendor/bin/php-cs-fixer fix

---
 system/Database/OCI8/Connection.php           | 18 ++---
 system/Database/OCI8/Forge.php                | 12 +--
 .../_support/Database/Seeds/CITestSeeder.php  |  8 +-
 tests/system/Database/Live/DbUtilsTest.php    | 16 ++--
 tests/system/Database/Live/ForgeTest.php      | 79 ++++++++-----------
 tests/system/Database/Live/GetTest.php        |  6 +-
 tests/system/Database/Live/GroupTest.php      | 24 +++---
 .../Database/Live/PreparedQueryTest.php       |  5 +-
 tests/system/Database/Live/UpdateTest.php     | 42 +++++-----
 tests/system/Database/Live/WhereTest.php      | 52 ++++++------
 10 files changed, 118 insertions(+), 144 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index c99d9c5420d6..674f614d13d5 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -186,7 +186,7 @@ public function getVersion(): string
     /**
      * Executes the query against the database.
      *
-     * @return resource|boolean
+     * @return bool|resource
      */
     public function execute(string $sql)
     {
@@ -464,9 +464,9 @@ public function getCursor()
     /**
      * Stored Procedure.  Executes a stored procedure
      *
-     * @param  string $package    package name in which the stored procedure is in
-     * @param  string $procedure  stored procedure name to execute
-     * @param  array  $params     parameters
+     * @param string $package   package name in which the stored procedure is in
+     * @param string $procedure stored procedure name to execute
+     * @param array  $params    parameters
      *
      * @return mixed
      *
@@ -544,14 +544,14 @@ public function error(): array
         // oci_error() returns an array that already contains
         // 'code' and 'message' keys, but it can return false
         // if there was no error ....
-        $error = oci_error();
+        $error     = oci_error();
         $resources = [$this->cursorId, $this->stmtId, $this->connID];
 
         foreach ($resources as $resource) {
-          if (is_resource($resource)) {
-              $error = oci_error($resource);
-              break;
-          }
+            if (is_resource($resource)) {
+                $error = oci_error($resource);
+                break;
+            }
         }
 
         return is_array($error)
diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 5e50557579aa..382162b65fd0 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -146,9 +146,6 @@ protected function _alterTable(string $alter_type, string $table, $field)
     /**
      * Field attribute AUTO_INCREMENT
      *
-     * @param array $attributes
-     * @param array $field
-     *
      * @return void
      */
     protected function _attributeAutoIncrement(array &$attributes, array &$field)
@@ -191,8 +188,6 @@ protected function _processColumn(array $field): string
      *
      * Performs a data type mapping between different databases.
      *
-     * @param array $attributes
-     *
      * @return void
      */
     protected function _attributeType(array &$attributes)
@@ -222,10 +217,11 @@ protected function _attributeType(array &$attributes)
                 return;
 
             case 'BOOLEAN':
-                $attributes['TYPE'] = 'NUMBER';
+                $attributes['TYPE']       = 'NUMBER';
                 $attributes['CONSTRAINT'] = 1;
-                $attributes['UNSIGNED'] = true;
-                $attributes['NULL'] = false;
+                $attributes['UNSIGNED']   = true;
+                $attributes['NULL']       = false;
+
                 return;
 
             case 'DOUBLE':
diff --git a/tests/_support/Database/Seeds/CITestSeeder.php b/tests/_support/Database/Seeds/CITestSeeder.php
index 0126a0a6695d..d9a0ec8f3bed 100644
--- a/tests/_support/Database/Seeds/CITestSeeder.php
+++ b/tests/_support/Database/Seeds/CITestSeeder.php
@@ -168,10 +168,10 @@ public function run()
 
         if ($this->db->DBDriver === 'OCI8') {
             $this->db->query('alter session set NLS_DATE_FORMAT=?', ['YYYY/MM/DD HH24:MI:SS']);
-            $data['type_test'][0]['type_time'] = '2020-07-18 15:22:00';
-            $data['type_test'][0]['type_date'] = '2020-01-11 22:11:00';
-            $data['type_test'][0]['type_time'] = '2020-07-18 15:22:00';
-            $data['type_test'][0]['type_datetime'] = '2020-06-18 05:12:24';
+            $data['type_test'][0]['type_time']      = '2020-07-18 15:22:00';
+            $data['type_test'][0]['type_date']      = '2020-01-11 22:11:00';
+            $data['type_test'][0]['type_time']      = '2020-07-18 15:22:00';
+            $data['type_test'][0]['type_datetime']  = '2020-06-18 05:12:24';
             $data['type_test'][0]['type_timestamp'] = '2020-06-18 21:53:21';
             unset($data['type_test'][0]['type_blob']);
         }
diff --git a/tests/system/Database/Live/DbUtilsTest.php b/tests/system/Database/Live/DbUtilsTest.php
index 61e44628822f..e767d0b6991d 100644
--- a/tests/system/Database/Live/DbUtilsTest.php
+++ b/tests/system/Database/Live/DbUtilsTest.php
@@ -108,10 +108,9 @@ public function testUtilsOptimizeDatabase()
     {
         $util = (new Database())->loadUtils($this->db);
 
-        if ($this->db->DBDriver === 'OCI8')
-        {
+        if ($this->db->DBDriver === 'OCI8') {
             $this->markTestSkipped(
-              'Unsupported feature of the oracle database platform.'
+                'Unsupported feature of the oracle database platform.'
             );
         }
 
@@ -154,12 +153,11 @@ public function testUtilsOptimizeTable()
     {
         $util = (new Database())->loadUtils($this->db);
 
-		if ($this->db->DBDriver === 'OCI8')
-		{
-			$this->markTestSkipped(
-			  'Unsupported feature of the oracle database platform.'
-			);
-		}
+        if ($this->db->DBDriver === 'OCI8') {
+            $this->markTestSkipped(
+                'Unsupported feature of the oracle database platform.'
+            );
+        }
 
         $d = $util->optimizeTable('db_job');
 
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 07585680daff..24b5a25abffc 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -44,8 +44,7 @@ protected function setUp(): void
 
     public function testCreateDatabase()
     {
-		if ($this->db->DBDriver === 'OCI8')
-		{
+        if ($this->db->DBDriver === 'OCI8') {
             $this->markTestSkipped('OCI8 does not support create database.');
         }
         $databaseCreated = $this->forge->createDatabase('test_forge_database');
@@ -55,10 +54,9 @@ public function testCreateDatabase()
 
     public function testCreateDatabaseIfNotExists()
     {
-		if ($this->db->DBDriver === 'OCI8')
-		{
-			$this->markTestSkipped('OCI8 does not support create database.');
-		}
+        if ($this->db->DBDriver === 'OCI8') {
+            $this->markTestSkipped('OCI8 does not support create database.');
+        }
         $dbName = 'test_forge_database_exist';
 
         $databaseCreateIfNotExists = $this->forge->createDatabase($dbName, true);
@@ -71,10 +69,9 @@ public function testCreateDatabaseIfNotExists()
 
     public function testCreateDatabaseIfNotExistsWithDb()
     {
-		if ($this->db->DBDriver === 'OCI8')
-		{
-			$this->markTestSkipped('OCI8 does not support create database.');
-		}
+        if ($this->db->DBDriver === 'OCI8') {
+            $this->markTestSkipped('OCI8 does not support create database.');
+        }
         $dbName = 'test_forge_database_exist';
 
         $this->forge->createDatabase($dbName);
@@ -88,12 +85,10 @@ public function testCreateDatabaseIfNotExistsWithDb()
 
     public function testDropDatabase()
     {
-		if ($this->db->DBDriver === 'OCI8')
-		{
+        if ($this->db->DBDriver === 'OCI8') {
             $this->markTestSkipped('OCI8 does not support drop database.');
         }
-        if ($this->db->DBDriver === 'SQLite3')
-        {
+        if ($this->db->DBDriver === 'SQLite3') {
             $this->markTestSkipped('SQLite3 requires file path to drop database');
         }
 
@@ -197,11 +192,10 @@ public function testCreateTableApplyBigInt()
 
     public function testCreateTableWithAttributes()
     {
-        if ($this->db->DBDriver === 'OCI8')
-        {
+        if ($this->db->DBDriver === 'OCI8') {
             $this->markTestSkipped('OCI8 does not support comments on tables or columns.');
         }
-        if ($this->db->DBDriver === 'SQLite3'){
+        if ($this->db->DBDriver === 'SQLite3') {
             $this->markTestSkipped('SQLite3 does not support comments on tables or columns.');
         }
 
@@ -433,8 +427,7 @@ public function testForeignKey()
         $this->forge->addForeignKey('users_id', 'forge_test_users', 'id', 'CASCADE', 'CASCADE');
 
         $tableName = 'forge_test_invoices';
-        if ($this->db->DBDriver === 'OCI8')
-        {
+        if ($this->db->DBDriver === 'OCI8') {
             $tableName = 'forge_test_inv';
         }
 
@@ -446,9 +439,9 @@ public function testForeignKey()
             $this->assertSame($foreignKeyData[0]->constraint_name, 'users_id to db_forge_test_users.id');
             $this->assertSame($foreignKeyData[0]->sequence, 0);
         } elseif ($this->db->DBDriver === 'OCI8') {
-            $this->assertEquals($foreignKeyData[0]->constraint_name, $this->db->DBPrefix . 'forge_test_inv_users_id_fk');
-            $this->assertEquals($foreignKeyData[0]->column_name, 'users_id');
-            $this->assertEquals($foreignKeyData[0]->foreign_column_name, 'id');
+            $this->assertSame($foreignKeyData[0]->constraint_name, $this->db->DBPrefix . 'forge_test_inv_users_id_fk');
+            $this->assertSame($foreignKeyData[0]->column_name, 'users_id');
+            $this->assertSame($foreignKeyData[0]->foreign_column_name, 'id');
         } else {
             $this->assertSame($foreignKeyData[0]->constraint_name, $this->db->DBPrefix . 'forge_test_invoices_users_id_foreign');
             $this->assertSame($foreignKeyData[0]->column_name, 'users_id');
@@ -527,9 +520,9 @@ public function testCompositeForeignKey()
         $this->forge->createTable('forge_test_users', true, $attributes);
 
         $forgeTestInvoicesTableName = 'forge_test_invoices';
-        $userIdColumnName = 'user_id';
-        $userSecondIdColumnName = 'user_second_id';
-        $fields = [
+        $userIdColumnName           = 'user_id';
+        $userSecondIdColumnName     = 'user_second_id';
+        $fields                     = [
             'id' => [
                 'type'       => 'INTEGER',
                 'constraint' => 11,
@@ -541,8 +534,8 @@ public function testCompositeForeignKey()
         ];
 
         if ($this->db->DBDriver === 'OCI8') {
-            $userIdColumnName = 'uid';
-            $userSecondIdColumnName = 'usid';
+            $userIdColumnName           = 'uid';
+            $userSecondIdColumnName     = 'usid';
             $forgeTestInvoicesTableName = 'forge_test_inv';
         }
 
@@ -569,7 +562,7 @@ public function testCompositeForeignKey()
             $this->assertSame(0, $foreignKeyData[0]->sequence);
             $this->assertSame('users_second_id to db_forge_test_users.second_id', $foreignKeyData[1]->constraint_name);
             $this->assertSame(1, $foreignKeyData[1]->sequence);
-        } else if ($this->db->DBDriver === 'OCI8') {
+        } elseif ($this->db->DBDriver === 'OCI8') {
             $haystack = [$userIdColumnName, $userSecondIdColumnName];
             $this->assertSame($this->db->DBPrefix . 'forge_test_inv_uid_usid_fk', $foreignKeyData[0]->constraint_name);
             $this->assertContains($foreignKeyData[0]->column_name, $haystack);
@@ -734,8 +727,7 @@ public function testDropForeignKey()
 
         $tableName      = 'forge_test_invoices';
         $foreignKeyName = 'forge_test_invoices_users_id_foreign';
-        if ($this->db->DBDriver === 'OCI8')
-        {
+        if ($this->db->DBDriver === 'OCI8') {
             $tableName      = 'forge_test_inv';
             $foreignKeyName = 'forge_test_inv_users_id_fk';
         }
@@ -790,8 +782,7 @@ public function testAddColumn()
     public function testAddFields()
     {
         $tableName = 'forge_test_fields';
-        if ($this->db->DBDriver === 'OCI8')
-        {
+        if ($this->db->DBDriver === 'OCI8') {
             $tableName = 'getestfield';
         }
         $this->forge->dropTable($tableName, true);
@@ -867,7 +858,7 @@ public function testAddFields()
             $this->assertNull($fieldsData[1]->default);
             $this->assertSame(255, (int) $fieldsData[1]->max_length);
         } elseif ($this->db->DBDriver === 'OCI8') {
-            //Check types
+            // Check types
             $this->assertSame('NUMBER', $fieldsData[0]->type);
             $this->assertSame('VARCHAR2', $fieldsData[1]->type);
             $this->assertSame('11', $fieldsData[0]->max_length);
@@ -945,22 +936,20 @@ public function testCompositeKey()
             $this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
             $this->assertSame($keys['db_forge_test_1_code_company']->type, 'INDEX');
 
+            $this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
+            $this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
+            $this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
+        } elseif ($this->db->DBDriver === 'OCI8') {
+            $this->assertSame($keys['pk_db_forge_test_1']->name, 'pk_db_forge_test_1');
+            $this->assertSame($keys['pk_db_forge_test_1']->fields, ['id']);
+            $this->assertSame($keys['pk_db_forge_test_1']->type, 'PRIMARY');
+            $this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
+            $this->assertSame($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
+            $this->assertSame($keys['db_forge_test_1_code_company']->type, 'INDEX');
             $this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
             $this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
             $this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
         }
-		elseif ($this->db->DBDriver === 'OCI8')
-		{
-			$this->assertEquals($keys['pk_db_forge_test_1']->name, 'pk_db_forge_test_1');
-			$this->assertEquals($keys['pk_db_forge_test_1']->fields, ['id']);
-			$this->assertEquals($keys['pk_db_forge_test_1']->type, 'PRIMARY');
-			$this->assertEquals($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
-			$this->assertEquals($keys['db_forge_test_1_code_company']->fields, ['code', 'company']);
-			$this->assertEquals($keys['db_forge_test_1_code_company']->type, 'INDEX');
-			$this->assertEquals($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
-			$this->assertEquals($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
-			$this->assertEquals($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
-		}
 
         $this->forge->dropTable('forge_test_1', true);
     }
diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php
index a923435942f4..20ae2e099d0d 100644
--- a/tests/system/Database/Live/GetTest.php
+++ b/tests/system/Database/Live/GetTest.php
@@ -175,11 +175,9 @@ public function testGetDataSeek()
         if ($this->db->DBDriver === 'SQLite3') {
             $this->expectException(DatabaseException::class);
             $this->expectExceptionMessage('SQLite3 doesn\'t support seeking to other offset.');
+        } elseif ($this->db->DBDriver === 'OCI8') {
+            $this->markTestSkipped('OCI8 does not support data seek.');
         }
-		elseif ($this->db->DBDriver === 'OCI8')
-		{
-			$this->markTestSkipped('OCI8 does not support data seek.');
-		}
 
         $data->dataSeek(3);
 
diff --git a/tests/system/Database/Live/GroupTest.php b/tests/system/Database/Live/GroupTest.php
index 32ccbce6765e..bfc66bd714f2 100644
--- a/tests/system/Database/Live/GroupTest.php
+++ b/tests/system/Database/Live/GroupTest.php
@@ -42,7 +42,7 @@ public function testHavingBy()
         $result = $this->db->table('job')
             ->select('name')
             ->groupBy('name')
-						->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
+            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
             ->get()
             ->getResultArray();
 
@@ -55,7 +55,7 @@ public function testOrHavingBy()
             ->select('id')
             ->groupBy('id')
             ->having('id >', 3)
-						->orHaving('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
+            ->orHaving('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
             ->get()
             ->getResult();
 
@@ -114,7 +114,7 @@ public function testOrHavingNotIn()
             ->select('name')
             ->groupBy('name')
             ->orderBy('name', 'asc')
-						->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
+            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
             ->orHavingNotIn('name', ['Developer', 'Politician'])
             ->get()
             ->getResult();
@@ -174,7 +174,7 @@ public function testOrNotHavingLike()
             ->select('name')
             ->groupBy('name')
             ->orderBy('name', 'asc')
-						->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
+            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
             ->orNotHavingLike('name', 'ian')
             ->get()
             ->getResult();
@@ -191,9 +191,9 @@ public function testAndHavingGroupStart()
             ->select('name')
             ->groupBy('name')
             ->orderBy('name', 'asc')
-						->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
+            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
             ->havingGroupStart()
-							->having('SUM(' . $this->db->protectIdentifiers('id') . ') <= 4')
+            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') <= 4')
             ->havingLike('name', 'ant', 'before')
             ->havingGroupEnd()
             ->get()
@@ -209,9 +209,9 @@ public function testOrHavingGroupStart()
             ->select('name')
             ->groupBy('name')
             ->orderBy('name', 'asc')
-						->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
+            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
             ->orHavingGroupStart()
-							->having('SUM(' . $this->db->protectIdentifiers('id') . ') <= 4')
+            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') <= 4')
             ->havingLike('name', 'ant', 'before')
             ->havingGroupEnd()
             ->get()
@@ -228,9 +228,9 @@ public function testNotHavingGroupStart()
             ->select('name')
             ->groupBy('name')
             ->orderBy('name', 'asc')
-						->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
+            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
             ->notHavingGroupStart()
-							->having('SUM(' . $this->db->protectIdentifiers('id') . ') <= 4')
+            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') <= 4')
             ->havingLike('name', 'ant', 'before')
             ->havingGroupEnd()
             ->get()
@@ -246,9 +246,9 @@ public function testOrNotHavingGroupStart()
             ->select('name')
             ->groupBy('name')
             ->orderBy('name', 'asc')
-						->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
+            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
             ->orNotHavingGroupStart()
-							->having('SUM(' . $this->db->protectIdentifiers('id') . ') < 2')
+            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') < 2')
             ->havingLike('name', 'o')
             ->havingGroupEnd()
             ->get()
diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php
index 11cb741e267b..9a42f8efd2f6 100644
--- a/tests/system/Database/Live/PreparedQueryTest.php
+++ b/tests/system/Database/Live/PreparedQueryTest.php
@@ -69,8 +69,7 @@ public function testPrepareReturnsPreparedQuery()
             $expected = "INSERT INTO {$ec}{$pre}user{$ec} ({$ec}name{$ec}, {$ec}email{$ec}) VALUES ({$placeholders})";
         }
 
-        if ($this->db->DBDriver === 'OCI8')
-        {
+        if ($this->db->DBDriver === 'OCI8') {
             $expected .= ' RETURNING ROWID INTO ?';
         }
 
@@ -121,7 +120,7 @@ public function testExecuteRunsQueryAndReturnsManualResultObject()
                   . $db->protectIdentifiers('name') . ', '
                   . $db->protectIdentifiers('email') . ', '
                   . $db->protectIdentifiers('country')
-                  . ") VALUES (?, ?, ?)";
+                  . ') VALUES (?, ?, ?)';
 
             if ($db->DBDriver === 'SQLSRV') {
                 $sql = "INSERT INTO {$db->schema}.{$db->DBPrefix}user (name, email, country) VALUES (?, ?, ?)";
diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index 1e1e989ff5d5..fdf643be6deb 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -201,27 +201,27 @@ public function testUpdatePeriods()
      */
     public function testSetWithoutEscape()
     {
-		if ($this->db->DBDriver === 'OCI8')
-		{
-			$forge = \Config\Database::forge($this->DBGroup);
-			$forge->modifyColumn('job', [
-				'description' => [
-					'name' => 'DESCRIPTION',
-				],
-				'name'        => [
-					'name' => 'NAME',
-				],
-			]);
-			$this->db->table('job')
-					 ->set('description', 'name', false)
-					 ->update();
-
-			$this->seeInDatabase('job', [
-				'NAME'        => 'Developer',
-				'DESCRIPTION' => 'Developer',
-			]);
-			return;
-		}
+        if ($this->db->DBDriver === 'OCI8') {
+            $forge = \Config\Database::forge($this->DBGroup);
+            $forge->modifyColumn('job', [
+                'description' => [
+                    'name' => 'DESCRIPTION',
+                ],
+                'name' => [
+                    'name' => 'NAME',
+                ],
+            ]);
+            $this->db->table('job')
+                ->set('description', 'name', false)
+                ->update();
+
+            $this->seeInDatabase('job', [
+                'NAME'        => 'Developer',
+                'DESCRIPTION' => 'Developer',
+            ]);
+
+            return;
+        }
 
         $this->db->table('job')
             ->set('description', 'name', false)
diff --git a/tests/system/Database/Live/WhereTest.php b/tests/system/Database/Live/WhereTest.php
index d65b2d7296a7..d03b2b5000e3 100644
--- a/tests/system/Database/Live/WhereTest.php
+++ b/tests/system/Database/Live/WhereTest.php
@@ -127,21 +127,18 @@ public function testSubQuery()
             ->where('name', 'Developer')
             ->getCompiledSelect();
 
-		if ($this->db->DBDriver === 'OCI8')
-		{
-			$jobs = $this->db->table('job')
-							 ->where('"id" not in (' . $subQuery . ')', null, false)
-							 ->orderBy('id')
-							 ->get()
-							 ->getResult();
-		}
-		else
-		{
-        $jobs = $this->db->table('job')
-            ->where('id not in (' . $subQuery . ')', null, false)
-            ->get()
-            ->getResult();
-		}
+        if ($this->db->DBDriver === 'OCI8') {
+            $jobs = $this->db->table('job')
+                ->where('"id" not in (' . $subQuery . ')', null, false)
+                ->orderBy('id')
+                ->get()
+                ->getResult();
+        } else {
+            $jobs = $this->db->table('job')
+                ->where('id not in (' . $subQuery . ')', null, false)
+                ->get()
+                ->getResult();
+        }
 
         $this->assertCount(3, $jobs);
         $this->assertSame('Politician', $jobs[0]->name);
@@ -156,20 +153,17 @@ public function testSubQueryAnotherType()
             ->where('name', 'Developer')
             ->getCompiledSelect();
 
-		if ($this->db->DBDriver === 'OCI8')
-		{
-			$jobs = $this->db->table('job')
-							 ->where('"id" = (' . $subQuery . ')', null, false)
-							 ->get()
-							 ->getResult();
-		}
-		else
-		{
-        $jobs = $this->db->table('job')
-            ->where('id = (' . $subQuery . ')', null, false)
-            ->get()
-            ->getResult();
-		}
+        if ($this->db->DBDriver === 'OCI8') {
+            $jobs = $this->db->table('job')
+                ->where('"id" = (' . $subQuery . ')', null, false)
+                ->get()
+                ->getResult();
+        } else {
+            $jobs = $this->db->table('job')
+                ->where('id = (' . $subQuery . ')', null, false)
+                ->get()
+                ->getResult();
+        }
 
         $this->assertCount(1, $jobs);
         $this->assertSame('Developer', $jobs[0]->name);

From 5a6cc7c01a99ad7c75db9a040236d8c1667582ba Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Fri, 10 Sep 2021 00:24:02 +0900
Subject: [PATCH 1343/2325] fix: Changed foreach for object to be performed on
 the return value of get_object_vars.

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

diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php
index 3352f308a5c7..0f7f3456d15f 100644
--- a/system/Database/OCI8/Result.php
+++ b/system/Database/OCI8/Result.php
@@ -112,7 +112,7 @@ protected function fetchObject(string $className = \stdClass::class)
 
         $instance = new $className();
 
-        foreach ($row as $key => $value) {
+        foreach (get_object_vars($row) as $key => $value) {
             $instance->{$key} = $value;
         }
 

From 9be4e2fa0e196783ec2e2693d009861f3fa828a0 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 16 Sep 2021 08:23:05 +0900
Subject: [PATCH 1344/2325] refactor: vendor/bin/rector

---
 system/Database/OCI8/Builder.php          | 69 +++++++++++-----------
 system/Database/OCI8/Connection.php       | 45 ++++++++-------
 system/Database/OCI8/Forge.php            | 70 +++++++++++------------
 system/Database/OCI8/PreparedQuery.php    | 13 ++---
 system/Database/OCI8/Result.php           | 15 ++---
 tests/system/Database/Live/UpdateTest.php |  3 +-
 6 files changed, 109 insertions(+), 106 deletions(-)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 8b5318a588bf..d5366c6a170a 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Database\OCI8;
 
+use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\BaseBuilder;
 
 /**
@@ -73,24 +74,24 @@ class Builder extends BaseBuilder
     protected function _insertBatch(string $table, array $keys, array $values): string
     {
         $keys            = implode(', ', $keys);
-        $has_primary_key = in_array('PRIMARY', array_column($this->db->getIndexData($table), 'type'), true);
+        $hasPrimaryKey = in_array('PRIMARY', array_column($this->db->getIndexData($table), 'type'), true);
 
         // ORA-00001 measures
-        if ($has_primary_key) {
+        if ($hasPrimaryKey) {
             $sql                 = 'INSERT INTO ' . $table . ' (' . $keys . ") \n SELECT * FROM (\n";
-            $select_query_values = [];
+            $selectQueryValues = [];
 
-            for ($i = 0, $c = count($values); $i < $c; $i++) {
-                $select_query_values[] = 'SELECT ' . substr(substr($values[$i], 1), 0, -1) . ' FROM DUAL';
+            foreach ($values as $value) {
+                $selectQueryValues[] = 'SELECT ' . substr(substr($value, 1), 0, -1) . ' FROM DUAL';
             }
 
-            return $sql . implode("\n UNION ALL \n", $select_query_values) . "\n)";
+            return $sql . implode("\n UNION ALL \n", $selectQueryValues) . "\n)";
         }
 
         $sql = "INSERT ALL\n";
 
-        for ($i = 0, $c = count($values); $i < $c; $i++) {
-            $sql .= '	INTO ' . $table . ' (' . $keys . ') VALUES ' . $values[$i] . "\n";
+        foreach ($values as $value) {
+            $sql .= '	INTO ' . $table . ' (' . $keys . ') VALUES ' . $value . "\n";
         }
 
         return $sql . 'SELECT * FROM dual';
@@ -107,18 +108,18 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
      */
     protected function _replace(string $table, array $keys, array $values): string
     {
-        $field_names = array_map(static function ($column_name) {
-            return trim($column_name, '"');
+        $fieldNames = array_map(static function ($columnName) {
+            return trim($columnName, '"');
         }, $keys);
 
-        $unique_indexes = array_filter($this->db->getIndexData($table), static function ($index) use ($field_names) {
-            $has_all_fields = count(array_intersect($index->fields, $field_names)) === count($index->fields);
+        $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
+            $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
 
-            return ($index->type === 'PRIMARY') && $has_all_fields;
+            return ($index->type === 'PRIMARY') && $hasAllFields;
         });
-        $replaceable_fields = array_filter($keys, static function ($column_name) use ($unique_indexes) {
-            foreach ($unique_indexes as $index) {
-                if (in_array(trim($column_name, '"'), $index->fields, true)) {
+        $replaceableFields = array_filter($keys, static function ($columnName) use ($uniqueIndexes) {
+            foreach ($uniqueIndexes as $index) {
+                if (in_array(trim($columnName, '"'), $index->fields, true)) {
                     return false;
                 }
             }
@@ -128,31 +129,31 @@ protected function _replace(string $table, array $keys, array $values): string
 
         $sql = 'MERGE INTO ' . $table . "\n USING (SELECT ";
 
-        $sql .= implode(', ', array_map(static function ($column_name, $value) {
-            return $value . ' ' . $column_name;
+        $sql .= implode(', ', array_map(static function ($columnName, $value) {
+            return $value . ' ' . $columnName;
         }, $keys, $values));
 
         $sql .= ' FROM DUAL) "_replace" ON ( ';
 
-        $on_list   = [];
-        $on_list[] = '1 != 1';
+        $onList   = [];
+        $onList[] = '1 != 1';
 
-        foreach ($unique_indexes as $index) {
-            $on_list[] = '(' . implode(' AND ', array_map(static function ($column_name) use ($table) {
-                return $table . '."' . $column_name . '" = "_replace"."' . $column_name . '"';
+        foreach ($uniqueIndexes as $index) {
+            $onList[] = '(' . implode(' AND ', array_map(static function ($columnName) use ($table) {
+                return $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"';
             }, $index->fields)) . ')';
         }
 
-        $sql .= implode(' OR ', $on_list) . ') WHEN MATCHED THEN UPDATE SET ';
+        $sql .= implode(' OR ', $onList) . ') WHEN MATCHED THEN UPDATE SET ';
 
-        $sql .= implode(', ', array_map(static function ($column_name) {
-            return $column_name . ' = "_replace".' . $column_name;
-        }, $replaceable_fields));
+        $sql .= implode(', ', array_map(static function ($columnName) {
+            return $columnName . ' = "_replace".' . $columnName;
+        }, $replaceableFields));
 
-        $sql .= ' WHEN NOT MATCHED THEN INSERT (' . implode(', ', $replaceable_fields) . ') VALUES ';
-        $sql .= ' (' . implode(', ', array_map(static function ($column_name) {
-            return '"_replace".' . $column_name;
-        }, $replaceable_fields)) . ')';
+        $sql .= ' WHEN NOT MATCHED THEN INSERT (' . implode(', ', $replaceableFields) . ') VALUES ';
+        $sql .= ' (' . implode(', ', array_map(static function ($columnName) {
+            return '"_replace".' . $columnName;
+        }, $replaceableFields)) . ')';
 
         return $sql;
     }
@@ -180,17 +181,17 @@ protected function _truncate(string $table): string
      * @param mixed $where The where clause
      * @param int   $limit The limit clause
      *
-     * @throws \CodeIgniter\Database\Exceptions\DatabaseException
+     * @throws DatabaseException
      *
      * @return mixed
      */
-    public function delete($where = '', ?int $limit = null, bool $reset_data = true)
+    public function delete($where = '', ?int $limit = null, bool $resetData = true)
     {
         if (! empty($limit)) {
             $this->QBLimit = $limit;
         }
 
-        return parent::delete($where, null, $reset_data);
+        return parent::delete($where, null, $resetData);
     }
 
     /**
diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 674f614d13d5..c0d1beee4218 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -19,6 +19,9 @@
 
 /**
  * Connection for Postgre
+ *
+ * @property string|null $latestInsertedTableName
+ * @property int|null    $rowId
  */
 class Connection extends BaseConnection implements ConnectionInterface
 {
@@ -173,10 +176,10 @@ public function getVersion(): string
             return $this->dataCache['version'];
         }
 
-        if (! $this->connID || ($version_string = oci_server_version($this->connID)) === false) {
+        if (! $this->connID || ($versionString = oci_server_version($this->connID)) === false) {
             return '';
         }
-        if (preg_match('#Release\s(\d+(?:\.\d+)+)#', $version_string, $match)) {
+        if (preg_match('#Release\s(\d+(?:\.\d+)+)#', $versionString, $match)) {
             return $this->dataCache['version'] = $match[1];
         }
 
@@ -188,7 +191,7 @@ public function getVersion(): string
      *
      * @return bool|resource
      */
-    public function execute(string $sql)
+    protected function execute(string $sql)
     {
         try {
             if ($this->resetStmtId === true) {
@@ -261,9 +264,9 @@ protected function _listColumns(string $table = ''): string
      *
      * @throws DatabaseException
      *
-     * @return \stdClass[]
+     * @return stdClass[]
      */
-    public function _fieldData(string $table): array
+    protected function _fieldData(string $table): array
     {
         if (strpos($table, '.') !== false) {
             sscanf($table, '%[^.].%s', $owner, $table);
@@ -311,9 +314,9 @@ public function _fieldData(string $table): array
      *
      * @throws DatabaseException
      *
-     * @return \stdClass[]
+     * @return stdClass[]
      */
-    public function _indexData(string $table): array
+    protected function _indexData(string $table): array
     {
         if (strpos($table, '.') !== false) {
             sscanf($table, '%[^.].%s', $owner, $table);
@@ -360,9 +363,9 @@ public function _indexData(string $table): array
      *
      * @throws DatabaseException
      *
-     * @return \stdClass[]
+     * @return stdClass[]
      */
-    public function _foreignKeyData(string $table): array
+    protected function _foreignKeyData(string $table): array
     {
         $sql = 'SELECT
                  acc.constraint_name,
@@ -488,13 +491,13 @@ public function storedProcedure(string $package, string $procedure, array $param
         // Build the query string
         $sql = 'BEGIN ' . $package . '.' . $procedure . '(';
 
-        $have_cursor = false;
+        $haveCursor = false;
 
         foreach ($params as $param) {
             $sql .= $param['name'] . ',';
 
             if (isset($param['type']) && $param['type'] === OCI_B_CURSOR) {
-                $have_cursor = true;
+                $haveCursor = true;
             }
         }
         $sql = trim($sql, ',') . '); END;';
@@ -502,7 +505,7 @@ public function storedProcedure(string $package, string $procedure, array $param
         $this->resetStmtId = false;
         $this->stmtId      = oci_parse($this->connID, $sql);
         $this->bindParams($params);
-        $result            = $this->query($sql, false, $have_cursor);
+        $result            = $this->query($sql, false, $haveCursor);
         $this->resetStmtId = true;
 
         return $result;
@@ -572,34 +575,34 @@ public function insertID(): int
         }
 
         $indexs      = $this->getIndexData($this->latestInsertedTableName);
-        $field_datas = $this->getFieldData($this->latestInsertedTableName);
+        $fieldDatas = $this->getFieldData($this->latestInsertedTableName);
 
-        if (! $indexs || ! $field_datas) {
+        if (! $indexs || ! $fieldDatas) {
             return 0;
         }
 
-        $column_type_list    = array_column($field_datas, 'type', 'name');
-        $primary_column_name = '';
+        $columnTypeList    = array_column($fieldDatas, 'type', 'name');
+        $primaryColumnName = '';
 
         foreach ($indexs as $index) {
             if ($index->type !== 'PRIMARY' || count($index->fields) !== 1) {
                 continue;
             }
 
-            $primary_column_name = $this->protectIdentifiers($index->fields[0], false, false);
-            $primary_column_type = $column_type_list[$primary_column_name];
+            $primaryColumnName = $this->protectIdentifiers($index->fields[0], false, false);
+            $primaryColumnType = $columnTypeList[$primaryColumnName];
 
-            if ($primary_column_type !== 'NUMBER') {
+            if ($primaryColumnType !== 'NUMBER') {
                 continue;
             }
         }
 
-        if (! $primary_column_name) {
+        if (! $primaryColumnName) {
             return 0;
         }
 
         $table = $this->protectIdentifiers($this->latestInsertedTableName, true);
-        $query = $this->query('SELECT ' . $this->protectIdentifiers($primary_column_name, false) . ' SEQ FROM ' . $table . ' WHERE ROWID = ?', $this->rowId)->getRow();
+        $query = $this->query('SELECT ' . $this->protectIdentifiers($primaryColumnName, false) . ' SEQ FROM ' . $table . ' WHERE ROWID = ?', $this->rowId)->getRow();
 
         return (int) ($query->SEQ ?? 0);
     }
diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 382162b65fd0..c428b40f9825 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -74,40 +74,40 @@ class Forge extends \CodeIgniter\Database\Forge
 
     /**
      * ALTER TABLE
-     *
-     * @param string $alter_type ALTER type
-     * @param string $table      Table name
-     * @param mixed  $field      Column definition
-     *
+     * 
+     * @param string $alterType ALTER type
+     * @param string $table Table name
+     * @param mixed $field Column definition
+     * 
      * @return string|string[]
      */
-    protected function _alterTable(string $alter_type, string $table, $field)
+    protected function _alterTable(string $alterType, string $table, $field)
     {
         $sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
 
-        if ($alter_type === 'DROP') {
+        if ($alterType === 'DROP') {
             $fields = array_map(function ($field) {
                 return $this->db->escapeIdentifiers(trim($field));
             }, (is_string($field)) ? explode(',', $field) : $field);
 
             return $sql . ' DROP (' . implode(',', $fields) . ') CASCADE CONSTRAINT INVALIDATE';
         }
-        if ($alter_type === 'CHANGE') {
-            $alter_type = 'MODIFY';
+        if ($alterType === 'CHANGE') {
+            $alterType = 'MODIFY';
         }
 
-        $nullable_map = array_column($this->db->getFieldData($table), 'nullable', 'name');
+        $nullableMap = array_column($this->db->getFieldData($table), 'nullable', 'name');
         $sqls         = [];
 
         for ($i = 0, $c = count($field); $i < $c; $i++) {
-            if ($alter_type === 'MODIFY') {
+            if ($alterType === 'MODIFY') {
                 // If a null constraint is added to a column with a null constraint,
                 // ORA-01451 will occur,
                 // so add null constraint is used only when it is different from the current null constraint.
-                $is_want_to_add_null  = (strpos($field[$i]['null'], ' NOT') === false);
-                $current_null_addable = $nullable_map[$field[$i]['name']];
+                $isWantToAddNull  = (strpos($field[$i]['null'], ' NOT') === false);
+                $currentNullAddable = $nullableMap[$field[$i]['name']];
 
-                if ($is_want_to_add_null === $current_null_addable) {
+                if ($isWantToAddNull === $currentNullAddable) {
                     $field[$i]['null'] = '';
                 }
             }
@@ -123,7 +123,7 @@ protected function _alterTable(string $alter_type, string $table, $field)
                         . ' IS ' . $field[$i]['comment'];
                 }
 
-                if ($alter_type === 'MODIFY' && ! empty($field[$i]['new_name'])) {
+                if ($alterType === 'MODIFY' && ! empty($field[$i]['new_name'])) {
                     $sqls[] = $sql . ' RENAME COLUMN ' . $this->db->escapeIdentifiers($field[$i]['name'])
                         . ' TO ' . $this->db->escapeIdentifiers($field[$i]['new_name']);
                 }
@@ -132,7 +132,7 @@ protected function _alterTable(string $alter_type, string $table, $field)
             }
         }
 
-        $sql .= ' ' . $alter_type . ' ';
+        $sql .= ' ' . $alterType . ' ';
         $sql .= (count($field) === 1)
                 ? $field[0]
                 : '(' . implode(',', $field) . ')';
@@ -248,23 +248,23 @@ protected function _attributeType(array &$attributes)
 
                 return;
 
-            default: return;
+            default:
         }
     }
 
     /**
      * Drop Table
-     *
+     * 
      * Generates a platform-specific DROP TABLE string
-     *
-     * @param string $table     Table name
-     * @param bool   $if_exists Whether to add an IF EXISTS condition
-     *
+     * 
+     * @param string $table Table name
+     * @param bool $ifExists Whether to add an IF EXISTS condition
+     * 
      * @return bool|string
      */
-    protected function _dropTable(string $table, bool $if_exists, bool $cascade)
+    protected function _dropTable(string $table, bool $ifExists, bool $cascade)
     {
-        $sql = parent::_dropTable($table, $if_exists, $cascade);
+        $sql = parent::_dropTable($table, $ifExists, $cascade);
 
         if ($sql !== true && $cascade === true) {
             $sql .= ' CASCADE CONSTRAINTS PURGE';
@@ -290,20 +290,18 @@ protected function _processForeignKeys(string $table): string
             'NO ACTION',
         ];
 
-        if (count($this->foreignKeys) > 0) {
-            foreach ($this->foreignKeys as $field => $fkey) {
-                $nameIndex            = $table . '_' . implode('_', $fkey['field']) . '_fk';
-                $nameIndexFilled      = $this->db->escapeIdentifiers($nameIndex);
-                $foreignKeyFilled     = implode(', ', $this->db->escapeIdentifiers($fkey['field']));
-                $referenceTableFilled = $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['referenceTable']);
-                $referenceFieldFilled = implode(', ', $this->db->escapeIdentifiers($fkey['referenceField']));
+        foreach ($this->foreignKeys as $fkey) {
+            $nameIndex            = $table . '_' . implode('_', $fkey['field']) . '_fk';
+            $nameIndexFilled      = $this->db->escapeIdentifiers($nameIndex);
+            $foreignKeyFilled     = implode(', ', $this->db->escapeIdentifiers($fkey['field']));
+            $referenceTableFilled = $this->db->escapeIdentifiers($this->db->DBPrefix . $fkey['referenceTable']);
+            $referenceFieldFilled = implode(', ', $this->db->escapeIdentifiers($fkey['referenceField']));
 
-                $formatSql = ",\n\tCONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s)";
-                $sql .= sprintf($formatSql, $nameIndexFilled, $foreignKeyFilled, $referenceTableFilled, $referenceFieldFilled);
+            $formatSql = ",\n\tCONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s(%s)";
+            $sql .= sprintf($formatSql, $nameIndexFilled, $foreignKeyFilled, $referenceTableFilled, $referenceFieldFilled);
 
-                if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true)) {
-                    $sql .= ' ON DELETE ' . $fkey['onDelete'];
-                }
+            if ($fkey['onDelete'] !== false && in_array($fkey['onDelete'], $allowActions, true)) {
+                $sql .= ' ON DELETE ' . $fkey['onDelete'];
             }
         }
 
diff --git a/system/Database/OCI8/PreparedQuery.php b/system/Database/OCI8/PreparedQuery.php
index 36b4325df485..952593a2f167 100644
--- a/system/Database/OCI8/PreparedQuery.php
+++ b/system/Database/OCI8/PreparedQuery.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Database\OCI8;
 
+use BadMethodCallException;
 use CodeIgniter\Database\BasePreparedQuery;
 use CodeIgniter\Database\PreparedQueryInterface;
 
@@ -90,18 +91,18 @@ public function _prepare(string $sql, array $options = [])
     public function _execute(array $data): bool
     {
         if (null === $this->statement) {
-            throw new \BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
+            throw new BadMethodCallException('You must call prepare before trying to execute a prepared statement.');
         }
 
-        $last_key = 0;
+        $lastKey = 0;
 
         foreach (array_keys($data) as $key) {
             oci_bind_by_name($this->statement, ':' . $key, $data[$key]);
-            $last_key = $key;
+            $lastKey = $key;
         }
 
         if ($this->isCollectRowId) {
-            oci_bind_by_name($this->statement, ':' . (++$last_key), $this->db->rowId, 255);
+            oci_bind_by_name($this->statement, ':' . (++$lastKey), $this->db->rowId, 255);
         }
 
         return oci_execute($this->statement, $this->db->commitMode);
@@ -126,10 +127,8 @@ public function parameterize(string $sql): string
         // Track our current value
         $count = 0;
 
-        $sql = preg_replace_callback('/\?/', static function ($matches) use (&$count) {
+        return preg_replace_callback('/\?/', static function ($matches) use (&$count) {
             return ':' . ($count++);
         }, $sql);
-
-        return $sql;
     }
 }
diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php
index 0f7f3456d15f..a798b9b12edb 100644
--- a/system/Database/OCI8/Result.php
+++ b/system/Database/OCI8/Result.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Database\OCI8;
 
+use stdClass;
 use CodeIgniter\Database\BaseResult;
 use CodeIgniter\Database\ResultInterface;
 use CodeIgniter\Entity;
@@ -33,8 +34,8 @@ public function getFieldCount(): int
      */
     public function getFieldNames(): array
     {
-        return array_map(function ($field_index) {
-            return oci_field_name($this->resultID, $field_index);
+        return array_map(function ($fieldIndex) {
+            return oci_field_name($this->resultID, $fieldIndex);
         }, range(1, $this->getFieldCount()));
     }
 
@@ -43,11 +44,11 @@ public function getFieldNames(): array
      */
     public function getFieldData(): array
     {
-        return array_map(function ($field_index) {
+        return array_map(function ($fieldIndex) {
             return (object) [
-                'name'       => oci_field_name($this->resultID, $field_index),
-                'type'       => oci_field_type($this->resultID, $field_index),
-                'max_length' => oci_field_size($this->resultID, $field_index),
+                'name'       => oci_field_name($this->resultID, $fieldIndex),
+                'type'       => oci_field_type($this->resultID, $fieldIndex),
+                'max_length' => oci_field_size($this->resultID, $fieldIndex),
                 // 'primary_key' = (int) ($data->flags & 2),
                 // 'default'     = $data->def,
             ];
@@ -99,7 +100,7 @@ protected function fetchAssoc()
      *
      * @return bool|Entity|object
      */
-    protected function fetchObject(string $className = \stdClass::class)
+    protected function fetchObject(string $className = stdClass::class)
     {
         $row = oci_fetch_object($this->resultID);
 
diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index fdf643be6deb..7ec2c6ebdcbb 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Database\Live;
 
+use Config\Database;
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
@@ -202,7 +203,7 @@ public function testUpdatePeriods()
     public function testSetWithoutEscape()
     {
         if ($this->db->DBDriver === 'OCI8') {
-            $forge = \Config\Database::forge($this->DBGroup);
+            $forge = Database::forge($this->DBGroup);
             $forge->modifyColumn('job', [
                 'description' => [
                     'name' => 'DESCRIPTION',

From 2e5ffef9066959a0d6715f86731c573408a36ed0 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Fri, 17 Sep 2021 00:17:35 +0900
Subject: [PATCH 1345/2325] fix: user_id -> users_id

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

diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 24b5a25abffc..e20f26556f1d 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -520,8 +520,8 @@ public function testCompositeForeignKey()
         $this->forge->createTable('forge_test_users', true, $attributes);
 
         $forgeTestInvoicesTableName = 'forge_test_invoices';
-        $userIdColumnName           = 'user_id';
-        $userSecondIdColumnName     = 'user_second_id';
+        $userIdColumnName           = 'users_id';
+        $userSecondIdColumnName     = 'users_second_id';
         $fields                     = [
             'id' => [
                 'type'       => 'INTEGER',

From a69f2817bbf60c53b4fe6d20ea44e5d80b5db91c Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Fri, 17 Sep 2021 00:28:27 +0900
Subject: [PATCH 1346/2325] style: vendor/bin/php-cs-fixer fix

---
 system/Database/OCI8/Builder.php          |  6 +++---
 system/Database/OCI8/Connection.php       |  2 +-
 system/Database/OCI8/Forge.php            | 22 +++++++++++-----------
 system/Database/OCI8/Result.php           |  2 +-
 tests/system/Database/Live/UpdateTest.php |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index d5366c6a170a..5bdc1aaff39a 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -11,8 +11,8 @@
 
 namespace CodeIgniter\Database\OCI8;
 
-use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\BaseBuilder;
+use CodeIgniter\Database\Exceptions\DatabaseException;
 
 /**
  * Builder for MySQLi
@@ -73,12 +73,12 @@ class Builder extends BaseBuilder
      */
     protected function _insertBatch(string $table, array $keys, array $values): string
     {
-        $keys            = implode(', ', $keys);
+        $keys          = implode(', ', $keys);
         $hasPrimaryKey = in_array('PRIMARY', array_column($this->db->getIndexData($table), 'type'), true);
 
         // ORA-00001 measures
         if ($hasPrimaryKey) {
-            $sql                 = 'INSERT INTO ' . $table . ' (' . $keys . ") \n SELECT * FROM (\n";
+            $sql               = 'INSERT INTO ' . $table . ' (' . $keys . ") \n SELECT * FROM (\n";
             $selectQueryValues = [];
 
             foreach ($values as $value) {
diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index c0d1beee4218..ee1201216914 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -574,7 +574,7 @@ public function insertID(): int
             return 0;
         }
 
-        $indexs      = $this->getIndexData($this->latestInsertedTableName);
+        $indexs     = $this->getIndexData($this->latestInsertedTableName);
         $fieldDatas = $this->getFieldData($this->latestInsertedTableName);
 
         if (! $indexs || ! $fieldDatas) {
diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index c428b40f9825..d2e4bb1ee9cb 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -74,11 +74,11 @@ class Forge extends \CodeIgniter\Database\Forge
 
     /**
      * ALTER TABLE
-     * 
+     *
      * @param string $alterType ALTER type
-     * @param string $table Table name
-     * @param mixed $field Column definition
-     * 
+     * @param string $table     Table name
+     * @param mixed  $field     Column definition
+     *
      * @return string|string[]
      */
     protected function _alterTable(string $alterType, string $table, $field)
@@ -97,14 +97,14 @@ protected function _alterTable(string $alterType, string $table, $field)
         }
 
         $nullableMap = array_column($this->db->getFieldData($table), 'nullable', 'name');
-        $sqls         = [];
+        $sqls        = [];
 
         for ($i = 0, $c = count($field); $i < $c; $i++) {
             if ($alterType === 'MODIFY') {
                 // If a null constraint is added to a column with a null constraint,
                 // ORA-01451 will occur,
                 // so add null constraint is used only when it is different from the current null constraint.
-                $isWantToAddNull  = (strpos($field[$i]['null'], ' NOT') === false);
+                $isWantToAddNull    = (strpos($field[$i]['null'], ' NOT') === false);
                 $currentNullAddable = $nullableMap[$field[$i]['name']];
 
                 if ($isWantToAddNull === $currentNullAddable) {
@@ -254,12 +254,12 @@ protected function _attributeType(array &$attributes)
 
     /**
      * Drop Table
-     * 
+     *
      * Generates a platform-specific DROP TABLE string
-     * 
-     * @param string $table Table name
-     * @param bool $ifExists Whether to add an IF EXISTS condition
-     * 
+     *
+     * @param string $table    Table name
+     * @param bool   $ifExists Whether to add an IF EXISTS condition
+     *
      * @return bool|string
      */
     protected function _dropTable(string $table, bool $ifExists, bool $cascade)
diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php
index a798b9b12edb..0d5c692560d4 100644
--- a/system/Database/OCI8/Result.php
+++ b/system/Database/OCI8/Result.php
@@ -11,10 +11,10 @@
 
 namespace CodeIgniter\Database\OCI8;
 
-use stdClass;
 use CodeIgniter\Database\BaseResult;
 use CodeIgniter\Database\ResultInterface;
 use CodeIgniter\Entity;
+use stdClass;
 
 /**
  * Result for OCI
diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index 7ec2c6ebdcbb..ac3c4c8d2744 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -11,10 +11,10 @@
 
 namespace CodeIgniter\Database\Live;
 
-use Config\Database;
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Config\Database;
 
 /**
  * @group DatabaseLive

From 4a919fcc6001cf2fff1febc2b2eed5631da4c7c3 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Fri, 17 Sep 2021 00:46:54 +0900
Subject: [PATCH 1347/2325] docs: fix link path.

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

diff --git a/user_guide_src/source/database/helpers.rst b/user_guide_src/source/database/helpers.rst
index 0a6695d0bcdf..d56c78c5799f 100644
--- a/user_guide_src/source/database/helpers.rst
+++ b/user_guide_src/source/database/helpers.rst
@@ -17,7 +17,7 @@ The insert ID number when performing database inserts.
     driver, this function requires a $name parameter, which specifies the
     appropriate sequence to check for the insert id.
 
-.. note:: If using the OCI8 driver, the insert ID can be get when using insert() of :doc:`QueryBuilder<./querybuilder>`.
+.. note:: If using the OCI8 driver, the insert ID can be get when using insert() of :doc:`QueryBuilder<./query_builder>`.
 
 **$db->affectedRows()**
 

From 202f3eccc64472c05cbf0ff79053b2c149abdd7b Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Fri, 24 Sep 2021 07:11:50 +0900
Subject: [PATCH 1348/2325] =?UTF-8?q?fix:=20remove=20unnecessary=20escape.?=
 =?UTF-8?q?=20i=20can=E2=80=99t=20imagine=20set=20key=20is=20not=20column.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/system/Database/Live/UpdateTest.php | 24 +----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index ac3c4c8d2744..c5502ce949a1 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -202,30 +202,8 @@ public function testUpdatePeriods()
      */
     public function testSetWithoutEscape()
     {
-        if ($this->db->DBDriver === 'OCI8') {
-            $forge = Database::forge($this->DBGroup);
-            $forge->modifyColumn('job', [
-                'description' => [
-                    'name' => 'DESCRIPTION',
-                ],
-                'name' => [
-                    'name' => 'NAME',
-                ],
-            ]);
-            $this->db->table('job')
-                ->set('description', 'name', false)
-                ->update();
-
-            $this->seeInDatabase('job', [
-                'NAME'        => 'Developer',
-                'DESCRIPTION' => 'Developer',
-            ]);
-
-            return;
-        }
-
         $this->db->table('job')
-            ->set('description', 'name', false)
+            ->set('description', $this->db->escapeIdentifiers('name'), false)
             ->update();
 
         $this->seeInDatabase('job', [

From 61ad650499f0a62fe31f8b4584d32d49e8b81afb Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Fri, 24 Sep 2021 07:16:20 +0900
Subject: [PATCH 1349/2325] fix: fix fail bulk insert when table has auto
 increment column.

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

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 5bdc1aaff39a..c2f67c904620 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -73,16 +73,19 @@ class Builder extends BaseBuilder
      */
     protected function _insertBatch(string $table, array $keys, array $values): string
     {
-        $keys          = implode(', ', $keys);
+        $insertKeys    = implode(', ', $keys);
         $hasPrimaryKey = in_array('PRIMARY', array_column($this->db->getIndexData($table), 'type'), true);
 
         // ORA-00001 measures
         if ($hasPrimaryKey) {
-            $sql               = 'INSERT INTO ' . $table . ' (' . $keys . ") \n SELECT * FROM (\n";
+            $sql               = 'INSERT INTO ' . $table . ' (' . $insertKeys . ") \n SELECT * FROM (\n";
             $selectQueryValues = [];
 
             foreach ($values as $value) {
-                $selectQueryValues[] = 'SELECT ' . substr(substr($value, 1), 0, -1) . ' FROM DUAL';
+                $selectValues = implode(',', array_map(static function ($value, $key) {
+                    return $value .' as '. $key;
+                }, explode(',', substr(substr($value, 1), 0, -1)), $keys));
+                $selectQueryValues[] = 'SELECT ' . $selectValues . ' FROM DUAL';
             }
 
             return $sql . implode("\n UNION ALL \n", $selectQueryValues) . "\n)";
@@ -91,7 +94,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
         $sql = "INSERT ALL\n";
 
         foreach ($values as $value) {
-            $sql .= '	INTO ' . $table . ' (' . $keys . ') VALUES ' . $value . "\n";
+            $sql .= '	INTO ' . $table . ' (' . $insertKeys . ') VALUES ' . $value . "\n";
         }
 
         return $sql . 'SELECT * FROM dual';

From 6a6472af1c072adf5ae1dd67483a73f9b14696e8 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Fri, 24 Sep 2021 07:18:36 +0900
Subject: [PATCH 1350/2325] test: add escape for lower case column name.

---
 tests/system/Models/FindModelTest.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tests/system/Models/FindModelTest.php b/tests/system/Models/FindModelTest.php
index bf06422d8f5f..61d1e0052fd2 100644
--- a/tests/system/Models/FindModelTest.php
+++ b/tests/system/Models/FindModelTest.php
@@ -168,7 +168,9 @@ public function testFirstAggregate($groupBy, $total): void
             $this->model->groupBy('id');
         }
 
-        $user = $this->model->select('SUM(id) as total')->where('id >', 2)->first();
+        $user = $this->model->select('SUM('.$this->db->escapeIdentifiers('id').') as '.$this->db->escapeIdentifiers('total'))
+            ->where('id >', 2)
+            ->first();
         $this->assertSame($total, (int) $user->total);
     }
 
@@ -195,10 +197,14 @@ public function testFirstRespectsSoftDeletes($aggregate, $groupBy): void
         $this->createModel(UserModel::class);
 
         if ($aggregate) {
-            $this->model->select('SUM(id) as id');
+            $this->model->select('SUM('.$this->db->escapeIdentifiers('id').') as '.$this->db->escapeIdentifiers('id'));
         }
 
         if ($groupBy) {
+            if (!$aggregate) {
+                $this->model->select('id');
+            }
+
             $this->model->groupBy('id');
         }
 
@@ -228,10 +234,11 @@ public function testFirstRecoverTempUseSoftDeletes($aggregate, $groupBy): void
         $this->model->delete(1);
 
         if ($aggregate) {
-            $this->model->select('sum(id) as id');
+            $this->model->select('sum('.$this->db->escapeIdentifiers('id').') as '.$this->db->escapeIdentifiers('id'));
         }
 
         if ($groupBy) {
+
             $this->model->groupBy('id');
         }
 

From 6109a724b2c147e455fd79e1a3165c4d6f7fed55 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Fri, 24 Sep 2021 07:20:53 +0900
Subject: [PATCH 1351/2325] fix: fixed groupBy column not matching select
 column.

---
 tests/system/Models/FindModelTest.php     | 6 ++++--
 tests/system/Models/PaginateModelTest.php | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/system/Models/FindModelTest.php b/tests/system/Models/FindModelTest.php
index 61d1e0052fd2..80194a983177 100644
--- a/tests/system/Models/FindModelTest.php
+++ b/tests/system/Models/FindModelTest.php
@@ -218,7 +218,7 @@ public function testFirstRespectsSoftDeletes($aggregate, $groupBy): void
             $this->assertSame(9, (int) $user->id);
         }
 
-        $user = $this->model->withDeleted()->first();
+        $user = $this->model->withDeleted()->select('id')->first();
         $this->assertSame(1, (int) $user->id);
     }
 
@@ -235,6 +235,8 @@ public function testFirstRecoverTempUseSoftDeletes($aggregate, $groupBy): void
 
         if ($aggregate) {
             $this->model->select('sum('.$this->db->escapeIdentifiers('id').') as '.$this->db->escapeIdentifiers('id'));
+        } else {
+            $this->model->select('id');
         }
 
         if ($groupBy) {
@@ -245,7 +247,7 @@ public function testFirstRecoverTempUseSoftDeletes($aggregate, $groupBy): void
         $user = $this->model->withDeleted()->first();
         $this->assertSame(1, (int) $user->id);
 
-        $user2 = $this->model->first();
+        $user2 = $this->model->select('id')->first();
         $this->assertSame(2, (int) $user2->id);
     }
 
diff --git a/tests/system/Models/PaginateModelTest.php b/tests/system/Models/PaginateModelTest.php
index 35e58221ecee..ae93f2f6c62b 100644
--- a/tests/system/Models/PaginateModelTest.php
+++ b/tests/system/Models/PaginateModelTest.php
@@ -46,7 +46,7 @@ public function testPaginatePassPerPageParameter(): void
     public function testPaginateForQueryWithGroupBy(): void
     {
         $this->createModel(ValidModel::class);
-        $this->model->groupBy('id');
+        $this->model->select('id')->groupBy('id');
         $this->model->paginate();
         $this->assertSame(4, $this->model->pager->getDetails()['total']);
     }

From 015840ae765b42d37bfcab7db3006bb120283831 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Fri, 24 Sep 2021 07:38:18 +0900
Subject: [PATCH 1352/2325] test: Added skip test for create database.

---
 tests/system/Commands/CreateDatabaseTest.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/system/Commands/CreateDatabaseTest.php b/tests/system/Commands/CreateDatabaseTest.php
index a00de5c437a1..835aac4d03a6 100644
--- a/tests/system/Commands/CreateDatabaseTest.php
+++ b/tests/system/Commands/CreateDatabaseTest.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Database\Database as DatabaseFactory;
 use CodeIgniter\Database\SQLite3\Connection as SQLite3Connection;
+use CodeIgniter\Database\OCI8\Connection as OCI8Connection;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 use Config\Database;
@@ -68,6 +69,10 @@ protected function getBuffer()
 
     public function testCreateDatabase()
     {
+        if ($this->connection instanceof OCI8Connection) {
+            $this->markTestSkipped('Needs to run on non-OCI8 drivers.');
+        }
+
         command('db:create foobar');
         $this->assertStringContainsString('successfully created.', $this->getBuffer());
     }
@@ -87,8 +92,8 @@ public function testSqliteDatabaseDuplicated()
 
     public function testOtherDriverDuplicatedDatabase()
     {
-        if ($this->connection instanceof SQLite3Connection) {
-            $this->markTestSkipped('Needs to run on non-SQLite3 drivers.');
+        if ($this->connection instanceof SQLite3Connection || $this->connection instanceof OCI8Connection) {
+            $this->markTestSkipped('Needs to run on non-SQLite3 and non-OCI8 drivers.');
         }
 
         command('db:create foobar');

From 4622e3cbf1045e606162699755531a52994d523b Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sat, 25 Sep 2021 09:35:49 +0900
Subject: [PATCH 1353/2325] fix: Changed the database property to be immutable.

---
 system/Database/OCI8/Connection.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index ee1201216914..693d2a66a813 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -707,10 +707,10 @@ protected function _transRollback(): bool
      */
     public function getDatabase(): string
     {
-        if (empty($this->database)) {
-            $this->database = $this->query('SELECT DEFAULT_TABLESPACE FROM USER_USERS')->getRow()->DEFAULT_TABLESPACE ?? '';
+        if (!empty($this->database)) {
+            return $this->database;
         }
 
-        return empty($this->database) ? '' : $this->database;
+        return $this->query('SELECT DEFAULT_TABLESPACE FROM USER_USERS')->getRow()->DEFAULT_TABLESPACE ?? '';
     }
 }

From 99c20e4914b251a19429df0f243ef54e9c6c2bb1 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sat, 25 Sep 2021 09:44:36 +0900
Subject: [PATCH 1354/2325] style: vendor/bin/php-cs-fixer fix --verbose --ansi
 --using-cache=no --diff

---
 system/Database/OCI8/Builder.php             | 2 +-
 system/Database/OCI8/Connection.php          | 2 +-
 tests/system/Commands/CreateDatabaseTest.php | 3 +--
 tests/system/Models/FindModelTest.php        | 9 ++++-----
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index c2f67c904620..dd6e08cbd60c 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -83,7 +83,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
 
             foreach ($values as $value) {
                 $selectValues = implode(',', array_map(static function ($value, $key) {
-                    return $value .' as '. $key;
+                    return $value . ' as ' . $key;
                 }, explode(',', substr(substr($value, 1), 0, -1)), $keys));
                 $selectQueryValues[] = 'SELECT ' . $selectValues . ' FROM DUAL';
             }
diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 693d2a66a813..28ba609435a6 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -707,7 +707,7 @@ protected function _transRollback(): bool
      */
     public function getDatabase(): string
     {
-        if (!empty($this->database)) {
+        if (! empty($this->database)) {
             return $this->database;
         }
 
diff --git a/tests/system/Commands/CreateDatabaseTest.php b/tests/system/Commands/CreateDatabaseTest.php
index 835aac4d03a6..f0ce8a683857 100644
--- a/tests/system/Commands/CreateDatabaseTest.php
+++ b/tests/system/Commands/CreateDatabaseTest.php
@@ -12,9 +12,8 @@
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Database\BaseConnection;
-use CodeIgniter\Database\Database as DatabaseFactory;
-use CodeIgniter\Database\SQLite3\Connection as SQLite3Connection;
 use CodeIgniter\Database\OCI8\Connection as OCI8Connection;
+use CodeIgniter\Database\SQLite3\Connection as SQLite3Connection;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 use Config\Database;
diff --git a/tests/system/Models/FindModelTest.php b/tests/system/Models/FindModelTest.php
index 80194a983177..4cddee6530fb 100644
--- a/tests/system/Models/FindModelTest.php
+++ b/tests/system/Models/FindModelTest.php
@@ -168,7 +168,7 @@ public function testFirstAggregate($groupBy, $total): void
             $this->model->groupBy('id');
         }
 
-        $user = $this->model->select('SUM('.$this->db->escapeIdentifiers('id').') as '.$this->db->escapeIdentifiers('total'))
+        $user = $this->model->select('SUM(' . $this->db->escapeIdentifiers('id') . ') as ' . $this->db->escapeIdentifiers('total'))
             ->where('id >', 2)
             ->first();
         $this->assertSame($total, (int) $user->total);
@@ -197,11 +197,11 @@ public function testFirstRespectsSoftDeletes($aggregate, $groupBy): void
         $this->createModel(UserModel::class);
 
         if ($aggregate) {
-            $this->model->select('SUM('.$this->db->escapeIdentifiers('id').') as '.$this->db->escapeIdentifiers('id'));
+            $this->model->select('SUM(' . $this->db->escapeIdentifiers('id') . ') as ' . $this->db->escapeIdentifiers('id'));
         }
 
         if ($groupBy) {
-            if (!$aggregate) {
+            if (! $aggregate) {
                 $this->model->select('id');
             }
 
@@ -234,13 +234,12 @@ public function testFirstRecoverTempUseSoftDeletes($aggregate, $groupBy): void
         $this->model->delete(1);
 
         if ($aggregate) {
-            $this->model->select('sum('.$this->db->escapeIdentifiers('id').') as '.$this->db->escapeIdentifiers('id'));
+            $this->model->select('sum(' . $this->db->escapeIdentifiers('id') . ') as ' . $this->db->escapeIdentifiers('id'));
         } else {
             $this->model->select('id');
         }
 
         if ($groupBy) {
-
             $this->model->groupBy('id');
         }
 

From a37b852cfa37465baf745a7eaf85e85a1b0cdd1b Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sat, 25 Sep 2021 10:23:33 +0900
Subject: [PATCH 1355/2325] chore: Add phpunit workflow for oci8.

---
 .github/workflows/test-phpunit.yml  | 34 +++++++++++++++++++++++++++--
 tests/_support/Config/Registrar.php | 18 +++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 6908f2be88e2..5f2189f41e42 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -31,7 +31,7 @@ jobs:
       fail-fast: false
       matrix:
         php-versions: ['7.4', '8.0', '8.1']
-        db-platforms: ['MySQLi', 'Postgre', 'SQLite3', 'SQLSRV']
+        db-platforms: ['MySQLi', 'Postgre', 'SQLite3', 'SQLSRV', 'OCI8']
         mysql-versions: ['5.7']
         include:
           - php-versions: '7.4'
@@ -68,6 +68,14 @@ jobs:
           - 1433:1433
         options: --health-cmd="/opt/mssql-tools/bin/sqlcmd -S 127.0.0.1 -U sa -P 1Secure*Password1 -Q 'SELECT @@VERSION'" --health-interval=10s --health-timeout=5s --health-retries=3
 
+      oracle:
+        image: quillbuilduser/oracle-18-xe
+        env:
+          ORACLE_ALLOW_REMOTE: true
+        ports:
+          - 1521:1521
+        options: --health-cmd="/opt/oracle/product/18c/dbhomeXE/bin/sqlplus -s sys/Oracle18@oracledbxe/XE as sysdba <<< 'SELECT 1 FROM DUAL'" --health-interval=10s --health-timeout=5s --health-retries=3
+
       redis:
         image: redis
         ports:
@@ -84,6 +92,28 @@ jobs:
         if: matrix.db-platforms == 'SQLSRV'
         run: sqlcmd -S 127.0.0.1 -U sa -P 1Secure*Password1 -Q "CREATE DATABASE test"
 
+      - name: Install Oracle InstantClient
+        if: matrix.db-platforms == 'OCI8'
+        run: |
+          sudo apt-get install wget libaio1 alien
+          sudo wget https://download.oracle.com/otn_software/linux/instantclient/185000/oracle-instantclient18.5-basic-18.5.0.0.0-3.x86_64.rpm
+          sudo wget https://download.oracle.com/otn_software/linux/instantclient/185000/oracle-instantclient18.5-devel-18.5.0.0.0-3.x86_64.rpm
+          sudo wget https://download.oracle.com/otn_software/linux/instantclient/185000/oracle-instantclient18.5-sqlplus-18.5.0.0.0-3.x86_64.rpm
+          sudo alien oracle-instantclient18.5-basic-18.5.0.0.0-3.x86_64.rpm
+          sudo alien oracle-instantclient18.5-devel-18.5.0.0.0-3.x86_64.rpm
+          sudo alien oracle-instantclient18.5-sqlplus-18.5.0.0.0-3.x86_64.rpm
+          sudo dpkg -i oracle-instantclient18.5-basic_18.5.0.0.0-4_amd64.deb oracle-instantclient18.5-devel_18.5.0.0.0-4_amd64.deb oracle-instantclient18.5-sqlplus_18.5.0.0.0-4_amd64.deb
+          echo "LD_LIBRARY_PATH=/lib/oracle/18.5/client64/lib/" >> $GITHUB_ENV
+          echo "NLS_LANG=AMERICAN_AMERICA.UTF8" >> $GITHUB_ENV
+          echo "C_INCLUDE_PATH=/usr/include/oracle/18.5/client64" >> $GITHUB_ENV
+          echo 'NLS_DATE_FORMAT=YYYY-MM-DD HH24:MI:SS' >> $GITHUB_ENV
+          echo 'NLS_TIMESTAMP_FORMAT=YYYY-MM-DD HH24:MI:SS' >> $GITHUB_ENV
+          echo 'NLS_TIMESTAMP_TZ_FORMAT=YYYY-MM-DD HH24:MI:SS' >> $GITHUB_ENV
+
+      - name: Create database for Oracle Database
+        if: matrix.db-platforms == 'OCI8'
+        run: echo -e "ALTER SESSION SET CONTAINER = XEPDB1;\nCREATE BIGFILE TABLESPACE \"TEST\" DATAFILE '/opt/oracle/product/18c/dbhomeXE/dbs/TEST' SIZE 10M AUTOEXTEND ON MAXSIZE UNLIMITED SEGMENT SPACE MANAGEMENT AUTO EXTENT MANAGEMENT LOCAL AUTOALLOCATE;\nCREATE USER \"ORACLE\" IDENTIFIED BY \"ORACLE\" DEFAULT TABLESPACE \"TEST\" TEMPORARY TABLESPACE TEMP QUOTA UNLIMITED ON \"TEST\";\nGRANT CONNECT,RESOURCE TO \"ORACLE\";\nexit;" | /lib/oracle/18.5/client64/bin/sqlplus -s sys/Oracle18@localhost:1521/XE as sysdba
+
       - name: Checkout
         uses: actions/checkout@v2
 
@@ -92,7 +122,7 @@ jobs:
         with:
           php-version: ${{ matrix.php-versions }}
           tools: composer, pecl
-          extensions: imagick, sqlsrv, gd, sqlite3, redis, memcached, pgsql
+          extensions: imagick, sqlsrv, gd, sqlite3, redis, memcached, oci8, pgsql
           coverage: xdebug
         env:
           update: true
diff --git a/tests/_support/Config/Registrar.php b/tests/_support/Config/Registrar.php
index 989b406655b1..b568629ea19f 100644
--- a/tests/_support/Config/Registrar.php
+++ b/tests/_support/Config/Registrar.php
@@ -100,6 +100,24 @@ class Registrar
             'failover' => [],
             'port'     => 1433,
         ],
+        'OCI8' => [
+            'DSN'      => 'localhost:1521/XEPDB1',
+            'hostname' => '',
+            'username' => 'ORACLE',
+            'password' => 'ORACLE',
+            'database' => '',
+            'DBDriver' => 'OCI8',
+            'DBPrefix' => 'db_',
+            'pConnect' => false,
+            'DBDebug'  => (ENVIRONMENT !== 'production'),
+            'charset'  => 'utf8',
+            'DBCollat' => 'utf8_general_ci',
+            'swapPre'  => '',
+            'encrypt'  => false,
+            'compress' => false,
+            'strictOn' => false,
+            'failover' => [],
+        ],
     ];
 
     /**

From 523333a59a593de93767792b30b29777d20182bd Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sat, 25 Sep 2021 14:38:44 +0900
Subject: [PATCH 1356/2325] docs: MySQLi -> OCI8

---
 system/Database/OCI8/Builder.php       | 2 +-
 system/Database/OCI8/Forge.php         | 2 +-
 system/Database/OCI8/PreparedQuery.php | 4 ++--
 system/Database/OCI8/Result.php        | 2 +-
 system/Database/OCI8/Utils.php         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index dd6e08cbd60c..f81bfbea6ef1 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -15,7 +15,7 @@
 use CodeIgniter\Database\Exceptions\DatabaseException;
 
 /**
- * Builder for MySQLi
+ * Builder for OCI8
  */
 class Builder extends BaseBuilder
 {
diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index d2e4bb1ee9cb..58b550cc9b89 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -12,7 +12,7 @@
 namespace CodeIgniter\Database\OCI8;
 
 /**
- * Forge for MySQLi
+ * Forge for OCI8
  */
 class Forge extends \CodeIgniter\Database\Forge
 {
diff --git a/system/Database/OCI8/PreparedQuery.php b/system/Database/OCI8/PreparedQuery.php
index 952593a2f167..8c4c493543ac 100644
--- a/system/Database/OCI8/PreparedQuery.php
+++ b/system/Database/OCI8/PreparedQuery.php
@@ -16,7 +16,7 @@
 use CodeIgniter\Database\PreparedQueryInterface;
 
 /**
- * Prepared query for MySQLi
+ * Prepared query for OCI8
  */
 class PreparedQuery extends BasePreparedQuery implements PreparedQueryInterface
 {
@@ -64,7 +64,7 @@ public function prepare(string $sql, array $options = [], string $queryClass = '
      * override this method.
      *
      * @param array $options Passed to the connection's prepare statement.
-     *                       Unused in the MySQLi driver.
+     *                       Unused in the OCI8 driver.
      *
      * @return mixed
      */
diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php
index 0d5c692560d4..d7d52da45516 100644
--- a/system/Database/OCI8/Result.php
+++ b/system/Database/OCI8/Result.php
@@ -17,7 +17,7 @@
 use stdClass;
 
 /**
- * Result for OCI
+ * Result for OCI8
  */
 class Result extends BaseResult implements ResultInterface
 {
diff --git a/system/Database/OCI8/Utils.php b/system/Database/OCI8/Utils.php
index d3fafca8e09a..870306d8b8b1 100644
--- a/system/Database/OCI8/Utils.php
+++ b/system/Database/OCI8/Utils.php
@@ -15,7 +15,7 @@
 use CodeIgniter\Database\Exceptions\DatabaseException;
 
 /**
- * Utils for MySQLi
+ * Utils for OCI8
  */
 class Utils extends BaseUtils
 {

From 751243b29a7dc6fe74e7d62ec23fa58887075d9d Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sat, 25 Sep 2021 15:24:51 +0900
Subject: [PATCH 1357/2325] docs: i writed that oci8 is supported.

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

diff --git a/user_guide_src/source/intro/requirements.rst b/user_guide_src/source/intro/requirements.rst
index 2a3d41ded92c..a55b8c46d0d9 100644
--- a/user_guide_src/source/intro/requirements.rst
+++ b/user_guide_src/source/intro/requirements.rst
@@ -19,12 +19,13 @@ Currently supported databases are:
   - PostgreSQL via the *Postgre* driver
   - SQLite3 via the *SQLite3* driver
   - MSSQL via the *SQLSRV* driver (version 2005 and above only)
+  - Oracle via the *OCI8* driver (version 12.1 and above only)
 
 Not all of the drivers have been converted/rewritten for CodeIgniter4.
 The list below shows the outstanding ones.
 
   - MySQL (5.1+) via the *pdo* driver
-  - Oracle via the *oci8* and *pdo* drivers
+  - Oracle via the *pdo* drivers
   - PostgreSQL via the *pdo* driver
   - MSSQL via the *pdo* driver
   - SQLite via the *sqlite* (version 2) and *pdo* drivers

From e3a2a6959f0fe074766352ffc6d68bfa49bcac17 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Wed, 29 Sep 2021 00:39:34 +0900
Subject: [PATCH 1358/2325] test: Fixed to use escaped column names based on
 whether they are ANSI-SQL or not.

---
 tests/system/Database/Live/GroupTest.php | 48 ++++++++++++++++++------
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/tests/system/Database/Live/GroupTest.php b/tests/system/Database/Live/GroupTest.php
index bfc66bd714f2..da2a49884599 100644
--- a/tests/system/Database/Live/GroupTest.php
+++ b/tests/system/Database/Live/GroupTest.php
@@ -39,10 +39,13 @@ public function testGroupBy()
 
     public function testHavingBy()
     {
+        $isANSISQL   = in_array($this->db->DBDriver, ['OCI8'], true);
+        $sumIdColumn = $isANSISQL ? 'SUM("id")' : 'SUM(id)';
+
         $result = $this->db->table('job')
             ->select('name')
             ->groupBy('name')
-            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
+            ->having($sumIdColumn . ' >', 2)
             ->get()
             ->getResultArray();
 
@@ -51,11 +54,14 @@ public function testHavingBy()
 
     public function testOrHavingBy()
     {
+        $isANSISQL   = in_array($this->db->DBDriver, ['OCI8'], true);
+        $sumIdColumn = $isANSISQL ? 'SUM("id")' : 'SUM(id)';
+
         $result = $this->db->table('user')
             ->select('id')
             ->groupBy('id')
             ->having('id >', 3)
-            ->orHaving('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
+            ->orHaving($sumIdColumn . ' >', 2)
             ->get()
             ->getResult();
 
@@ -110,11 +116,14 @@ public function testHavingNotIn()
 
     public function testOrHavingNotIn()
     {
+        $isANSISQL   = in_array($this->db->DBDriver, ['OCI8'], true);
+        $sumIdColumn = $isANSISQL ? 'SUM("id")' : 'SUM(id)';
+
         $result = $this->db->table('job')
             ->select('name')
             ->groupBy('name')
             ->orderBy('name', 'asc')
-            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
+            ->having($sumIdColumn . ' >', 2)
             ->orHavingNotIn('name', ['Developer', 'Politician'])
             ->get()
             ->getResult();
@@ -170,11 +179,14 @@ public function testOrHavingLike()
 
     public function testOrNotHavingLike()
     {
+        $isANSISQL   = in_array($this->db->DBDriver, ['OCI8'], true);
+        $sumIdColumn = $isANSISQL ? 'SUM("id")' : 'SUM(id)';
+
         $result = $this->db->table('job')
             ->select('name')
             ->groupBy('name')
             ->orderBy('name', 'asc')
-            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
+            ->having($sumIdColumn . ' >', 2)
             ->orNotHavingLike('name', 'ian')
             ->get()
             ->getResult();
@@ -187,13 +199,16 @@ public function testOrNotHavingLike()
 
     public function testAndHavingGroupStart()
     {
+        $isANSISQL   = in_array($this->db->DBDriver, ['OCI8'], true);
+        $sumIdColumn = $isANSISQL ? 'SUM("id")' : 'SUM(id)';
+
         $result = $this->db->table('job')
             ->select('name')
             ->groupBy('name')
             ->orderBy('name', 'asc')
-            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
+            ->having($sumIdColumn . ' >', 2)
             ->havingGroupStart()
-            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') <= 4')
+            ->having($sumIdColumn . ' <=', 4)
             ->havingLike('name', 'ant', 'before')
             ->havingGroupEnd()
             ->get()
@@ -205,13 +220,16 @@ public function testAndHavingGroupStart()
 
     public function testOrHavingGroupStart()
     {
+        $isANSISQL   = in_array($this->db->DBDriver, ['OCI8'], true);
+        $sumIdColumn = $isANSISQL ? 'SUM("id")' : 'SUM(id)';
+
         $result = $this->db->table('job')
             ->select('name')
             ->groupBy('name')
             ->orderBy('name', 'asc')
-            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
+            ->having($sumIdColumn . ' >', 2)
             ->orHavingGroupStart()
-            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') <= 4')
+            ->having($sumIdColumn . ' <=', 4)
             ->havingLike('name', 'ant', 'before')
             ->havingGroupEnd()
             ->get()
@@ -224,13 +242,16 @@ public function testOrHavingGroupStart()
 
     public function testNotHavingGroupStart()
     {
+        $isANSISQL   = in_array($this->db->DBDriver, ['OCI8'], true);
+        $sumIdColumn = $isANSISQL ? 'SUM("id")' : 'SUM(id)';
+
         $result = $this->db->table('job')
             ->select('name')
             ->groupBy('name')
             ->orderBy('name', 'asc')
-            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
+            ->having($sumIdColumn . ' >', 2)
             ->notHavingGroupStart()
-            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') <= 4')
+            ->having($sumIdColumn . ' <=', 4)
             ->havingLike('name', 'ant', 'before')
             ->havingGroupEnd()
             ->get()
@@ -242,13 +263,16 @@ public function testNotHavingGroupStart()
 
     public function testOrNotHavingGroupStart()
     {
+        $isANSISQL   = in_array($this->db->DBDriver, ['OCI8'], true);
+        $sumIdColumn = $isANSISQL ? 'SUM("id")' : 'SUM(id)';
+
         $result = $this->db->table('job')
             ->select('name')
             ->groupBy('name')
             ->orderBy('name', 'asc')
-            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') > 2')
+            ->having($sumIdColumn . ' >', 2)
             ->orNotHavingGroupStart()
-            ->having('SUM(' . $this->db->protectIdentifiers('id') . ') < 2')
+            ->having($sumIdColumn . ' <', 2)
             ->havingLike('name', 'o')
             ->havingGroupEnd()
             ->get()

From 97cb6093b43aad36a00ff2dce46cceae7094d846 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Wed, 29 Sep 2021 23:12:07 +0900
Subject: [PATCH 1359/2325] test: fixed using variables for column names.

---
 tests/system/Database/Live/GroupTest.php | 283 +++++++++++++++--------
 1 file changed, 186 insertions(+), 97 deletions(-)

diff --git a/tests/system/Database/Live/GroupTest.php b/tests/system/Database/Live/GroupTest.php
index da2a49884599..c7514d0954dc 100644
--- a/tests/system/Database/Live/GroupTest.php
+++ b/tests/system/Database/Live/GroupTest.php
@@ -39,31 +39,48 @@ public function testGroupBy()
 
     public function testHavingBy()
     {
-        $isANSISQL   = in_array($this->db->DBDriver, ['OCI8'], true);
-        $sumIdColumn = $isANSISQL ? 'SUM("id")' : 'SUM(id)';
-
-        $result = $this->db->table('job')
-            ->select('name')
-            ->groupBy('name')
-            ->having($sumIdColumn . ' >', 2)
-            ->get()
-            ->getResultArray();
+        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+
+        if ($isANSISQL) {
+            $result = $this->db->table('job')
+                ->select('name')
+                ->groupBy('name')
+                ->having('SUM("id") >', 2)
+                ->get()
+                ->getResultArray();
+        } else {
+            $result = $this->db->table('job')
+                ->select('name')
+                ->groupBy('name')
+                ->having('SUM(id) >', 2)
+                ->get()
+                ->getResultArray();
+        }
 
         $this->assertCount(2, $result);
     }
 
     public function testOrHavingBy()
     {
-        $isANSISQL   = in_array($this->db->DBDriver, ['OCI8'], true);
-        $sumIdColumn = $isANSISQL ? 'SUM("id")' : 'SUM(id)';
-
-        $result = $this->db->table('user')
-            ->select('id')
-            ->groupBy('id')
-            ->having('id >', 3)
-            ->orHaving($sumIdColumn . ' >', 2)
-            ->get()
-            ->getResult();
+        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+
+        if ($isANSISQL) {
+            $result = $this->db->table('user')
+                ->select('id')
+                ->groupBy('id')
+                ->having('id >', 3)
+                ->orHaving('SUM("id") >', 2)
+                ->get()
+                ->getResult();
+        } else {
+            $result = $this->db->table('user')
+                ->select('id')
+                ->groupBy('id')
+                ->having('id >', 3)
+                ->orHaving('SUM(id) >', 2)
+                ->get()
+                ->getResult();
+        }
 
         $this->assertCount(2, $result);
     }
@@ -116,17 +133,27 @@ public function testHavingNotIn()
 
     public function testOrHavingNotIn()
     {
-        $isANSISQL   = in_array($this->db->DBDriver, ['OCI8'], true);
-        $sumIdColumn = $isANSISQL ? 'SUM("id")' : 'SUM(id)';
-
-        $result = $this->db->table('job')
-            ->select('name')
-            ->groupBy('name')
-            ->orderBy('name', 'asc')
-            ->having($sumIdColumn . ' >', 2)
-            ->orHavingNotIn('name', ['Developer', 'Politician'])
-            ->get()
-            ->getResult();
+        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+
+        if ($isANSISQL) {
+            $result = $this->db->table('job')
+                ->select('name')
+                ->groupBy('name')
+                ->orderBy('name', 'asc')
+                ->having('SUM("id") >', 2)
+                ->orHavingNotIn('name', ['Developer', 'Politician'])
+                ->get()
+                ->getResult();
+        } else {
+            $result = $this->db->table('job')
+                ->select('name')
+                ->groupBy('name')
+                ->orderBy('name', 'asc')
+                ->having('SUM(id) >', 2)
+                ->orHavingNotIn('name', ['Developer', 'Politician'])
+                ->get()
+                ->getResult();
+        }
 
         $this->assertCount(2, $result);
         $this->assertSame('Accountant', $result[0]->name);
@@ -179,17 +206,27 @@ public function testOrHavingLike()
 
     public function testOrNotHavingLike()
     {
-        $isANSISQL   = in_array($this->db->DBDriver, ['OCI8'], true);
-        $sumIdColumn = $isANSISQL ? 'SUM("id")' : 'SUM(id)';
-
-        $result = $this->db->table('job')
-            ->select('name')
-            ->groupBy('name')
-            ->orderBy('name', 'asc')
-            ->having($sumIdColumn . ' >', 2)
-            ->orNotHavingLike('name', 'ian')
-            ->get()
-            ->getResult();
+        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+
+        if ($isANSISQL) {
+            $result = $this->db->table('job')
+                ->select('name')
+                ->groupBy('name')
+                ->orderBy('name', 'asc')
+                ->having('SUM("id") >', 2)
+                ->orNotHavingLike('name', 'ian')
+                ->get()
+                ->getResult();
+        } else {
+            $result = $this->db->table('job')
+                ->select('name')
+                ->groupBy('name')
+                ->orderBy('name', 'asc')
+                ->having('SUM(id) >', 2)
+                ->orNotHavingLike('name', 'ian')
+                ->get()
+                ->getResult();
+        }
 
         $this->assertCount(3, $result);
         $this->assertSame('Accountant', $result[0]->name);
@@ -199,20 +236,33 @@ public function testOrNotHavingLike()
 
     public function testAndHavingGroupStart()
     {
-        $isANSISQL   = in_array($this->db->DBDriver, ['OCI8'], true);
-        $sumIdColumn = $isANSISQL ? 'SUM("id")' : 'SUM(id)';
-
-        $result = $this->db->table('job')
-            ->select('name')
-            ->groupBy('name')
-            ->orderBy('name', 'asc')
-            ->having($sumIdColumn . ' >', 2)
-            ->havingGroupStart()
-            ->having($sumIdColumn . ' <=', 4)
-            ->havingLike('name', 'ant', 'before')
-            ->havingGroupEnd()
-            ->get()
-            ->getResult();
+        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+
+        if ($isANSISQL) {
+            $result = $this->db->table('job')
+                ->select('name')
+                ->groupBy('name')
+                ->orderBy('name', 'asc')
+                ->having('SUM("id") >', 2)
+                ->havingGroupStart()
+                ->having('SUM("id") <=', 4)
+                ->havingLike('name', 'ant', 'before')
+                ->havingGroupEnd()
+                ->get()
+                ->getResult();
+        } else {
+            $result = $this->db->table('job')
+                ->select('name')
+                ->groupBy('name')
+                ->orderBy('name', 'asc')
+                ->having('SUM(id) >', 2)
+                ->havingGroupStart()
+                ->having('SUM(id) <=', 4)
+                ->havingLike('name', 'ant', 'before')
+                ->havingGroupEnd()
+                ->get()
+                ->getResult();
+        }
 
         $this->assertCount(1, $result);
         $this->assertSame('Accountant', $result[0]->name);
@@ -220,20 +270,33 @@ public function testAndHavingGroupStart()
 
     public function testOrHavingGroupStart()
     {
-        $isANSISQL   = in_array($this->db->DBDriver, ['OCI8'], true);
-        $sumIdColumn = $isANSISQL ? 'SUM("id")' : 'SUM(id)';
-
-        $result = $this->db->table('job')
-            ->select('name')
-            ->groupBy('name')
-            ->orderBy('name', 'asc')
-            ->having($sumIdColumn . ' >', 2)
-            ->orHavingGroupStart()
-            ->having($sumIdColumn . ' <=', 4)
-            ->havingLike('name', 'ant', 'before')
-            ->havingGroupEnd()
-            ->get()
-            ->getResult();
+        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+
+        if ($isANSISQL) {
+            $result = $this->db->table('job')
+                ->select('name')
+                ->groupBy('name')
+                ->orderBy('name', 'asc')
+                ->having('SUM("id") >', 2)
+                ->orHavingGroupStart()
+                ->having('SUM("id") <=', 4)
+                ->havingLike('name', 'ant', 'before')
+                ->havingGroupEnd()
+                ->get()
+                ->getResult();
+        } else {
+            $result = $this->db->table('job')
+                ->select('name')
+                ->groupBy('name')
+                ->orderBy('name', 'asc')
+                ->having('SUM(id) >', 2)
+                ->orHavingGroupStart()
+                ->having('SUM(id) <=', 4)
+                ->havingLike('name', 'ant', 'before')
+                ->havingGroupEnd()
+                ->get()
+                ->getResult();
+        }
 
         $this->assertCount(2, $result);
         $this->assertSame('Accountant', $result[0]->name);
@@ -242,20 +305,33 @@ public function testOrHavingGroupStart()
 
     public function testNotHavingGroupStart()
     {
-        $isANSISQL   = in_array($this->db->DBDriver, ['OCI8'], true);
-        $sumIdColumn = $isANSISQL ? 'SUM("id")' : 'SUM(id)';
-
-        $result = $this->db->table('job')
-            ->select('name')
-            ->groupBy('name')
-            ->orderBy('name', 'asc')
-            ->having($sumIdColumn . ' >', 2)
-            ->notHavingGroupStart()
-            ->having($sumIdColumn . ' <=', 4)
-            ->havingLike('name', 'ant', 'before')
-            ->havingGroupEnd()
-            ->get()
-            ->getResult();
+        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+
+        if ($isANSISQL) {
+            $result = $this->db->table('job')
+                ->select('name')
+                ->groupBy('name')
+                ->orderBy('name', 'asc')
+                ->having('SUM("id") >', 2)
+                ->notHavingGroupStart()
+                ->having('SUM("id") <=', 4)
+                ->havingLike('name', 'ant', 'before')
+                ->havingGroupEnd()
+                ->get()
+                ->getResult();
+        } else {
+            $result = $this->db->table('job')
+                ->select('name')
+                ->groupBy('name')
+                ->orderBy('name', 'asc')
+                ->having('SUM(id) >', 2)
+                ->notHavingGroupStart()
+                ->having('SUM(id) <=', 4)
+                ->havingLike('name', 'ant', 'before')
+                ->havingGroupEnd()
+                ->get()
+                ->getResult();
+        }
 
         $this->assertCount(1, $result);
         $this->assertSame('Musician', $result[0]->name);
@@ -263,20 +339,33 @@ public function testNotHavingGroupStart()
 
     public function testOrNotHavingGroupStart()
     {
-        $isANSISQL   = in_array($this->db->DBDriver, ['OCI8'], true);
-        $sumIdColumn = $isANSISQL ? 'SUM("id")' : 'SUM(id)';
-
-        $result = $this->db->table('job')
-            ->select('name')
-            ->groupBy('name')
-            ->orderBy('name', 'asc')
-            ->having($sumIdColumn . ' >', 2)
-            ->orNotHavingGroupStart()
-            ->having($sumIdColumn . ' <', 2)
-            ->havingLike('name', 'o')
-            ->havingGroupEnd()
-            ->get()
-            ->getResult();
+        $isANSISQL = in_array($this->db->DBDriver, ['OCI8'], true);
+
+        if ($isANSISQL) {
+            $result = $this->db->table('job')
+                ->select('name')
+                ->groupBy('name')
+                ->orderBy('name', 'asc')
+                ->having('SUM("id") >', 2)
+                ->orNotHavingGroupStart()
+                ->having('SUM("id") <', 2)
+                ->havingLike('name', 'o')
+                ->havingGroupEnd()
+                ->get()
+                ->getResult();
+        } else {
+            $result = $this->db->table('job')
+                ->select('name')
+                ->groupBy('name')
+                ->orderBy('name', 'asc')
+                ->having('SUM(id) >', 2)
+                ->orNotHavingGroupStart()
+                ->having('SUM(id) <', 2)
+                ->havingLike('name', 'o')
+                ->havingGroupEnd()
+                ->get()
+                ->getResult();
+        }
 
         $this->assertCount(3, $result);
         $this->assertSame('Accountant', $result[0]->name);

From 5408d8bd6421bc6b4a5d5249f33eec6920c5675a Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 3 Oct 2021 15:26:13 +0900
Subject: [PATCH 1360/2325] test: The process of generating select by character
 concatenation is now generated by branching.

---
 tests/system/Database/Live/WhereTest.php |  9 +++++++-
 tests/system/Models/FindModelTest.php    | 26 +++++++++++++++++++++---
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/tests/system/Database/Live/WhereTest.php b/tests/system/Database/Live/WhereTest.php
index d03b2b5000e3..f349418eef0d 100644
--- a/tests/system/Database/Live/WhereTest.php
+++ b/tests/system/Database/Live/WhereTest.php
@@ -230,8 +230,15 @@ public function testWhereWithLower()
             'description' => null,
         ]);
 
+        $ANSISQLDriverNames = ['OCI8'];
+        $lowerJobName       = sprintf('LOWER(%s.name)', $this->db->prefixTable('job'));
+
+        if (in_array($this->db->DBDriver, $ANSISQLDriverNames, true)) {
+            $lowerJobName = sprintf('LOWER("%s"."name")', $this->db->prefixTable('job'));
+        }
+
         $job = $builder
-            ->where(sprintf("LOWER({$this->db->protectIdentifiers('%s.name')})", 'job'), 'brewmaster')
+            ->where($lowerJobName, 'brewmaster')
             ->get()
             ->getResult();
         $this->assertCount(1, $job);
diff --git a/tests/system/Models/FindModelTest.php b/tests/system/Models/FindModelTest.php
index 4cddee6530fb..e564f570ec8c 100644
--- a/tests/system/Models/FindModelTest.php
+++ b/tests/system/Models/FindModelTest.php
@@ -168,7 +168,15 @@ public function testFirstAggregate($groupBy, $total): void
             $this->model->groupBy('id');
         }
 
-        $user = $this->model->select('SUM(' . $this->db->escapeIdentifiers('id') . ') as ' . $this->db->escapeIdentifiers('total'))
+        $ANSISQLDriverNames = ['OCI8'];
+
+        if (in_array($this->db->DBDriver, $ANSISQLDriverNames, true)) {
+            $this->model->select('SUM("id") as "total"');
+        } else {
+            $this->model->select('SUM(id) as total');
+        }
+
+        $user = $this->model
             ->where('id >', 2)
             ->first();
         $this->assertSame($total, (int) $user->total);
@@ -197,7 +205,13 @@ public function testFirstRespectsSoftDeletes($aggregate, $groupBy): void
         $this->createModel(UserModel::class);
 
         if ($aggregate) {
-            $this->model->select('SUM(' . $this->db->escapeIdentifiers('id') . ') as ' . $this->db->escapeIdentifiers('id'));
+            $ANSISQLDriverNames = ['OCI8'];
+
+            if (in_array($this->db->DBDriver, $ANSISQLDriverNames, true)) {
+                $this->model->select('SUM("id") as "id"');
+            } else {
+                $this->model->select('SUM(id) as id');
+            }
         }
 
         if ($groupBy) {
@@ -234,7 +248,13 @@ public function testFirstRecoverTempUseSoftDeletes($aggregate, $groupBy): void
         $this->model->delete(1);
 
         if ($aggregate) {
-            $this->model->select('sum(' . $this->db->escapeIdentifiers('id') . ') as ' . $this->db->escapeIdentifiers('id'));
+            $ANSISQLDriverNames = ['OCI8'];
+
+            if (in_array($this->db->DBDriver, $ANSISQLDriverNames, true)) {
+                $this->model->select('SUM("id") as "id"');
+            } else {
+                $this->model->select('SUM(id) as id');
+            }
         } else {
             $this->model->select('id');
         }

From e9260fe2cfc1dcd90b476744822192a7bc88ff12 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 14 Oct 2021 23:31:33 +0900
Subject: [PATCH 1361/2325] feat: Fixed the problem that 1 is always returned
 when the type is not number.

---
 system/Database/OCI8/Connection.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 28ba609435a6..70bdd104b6e0 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -593,6 +593,7 @@ public function insertID(): int
             $primaryColumnType = $columnTypeList[$primaryColumnName];
 
             if ($primaryColumnType !== 'NUMBER') {
+                $primaryColumnName = '';
                 continue;
             }
         }

From 31a6540f30f380c921bc140a8066bb1e73e7dd66 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 14 Oct 2021 23:32:53 +0900
Subject: [PATCH 1362/2325] docs: fix typo Postgres -> OCI8

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

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 70bdd104b6e0..4d4f68697122 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -18,7 +18,7 @@
 use stdClass;
 
 /**
- * Connection for Postgre
+ * Connection for OCI8
  *
  * @property string|null $latestInsertedTableName
  * @property int|null    $rowId

From d7c269330bfadf80dd73c7bf2edb5198ab3e0fe2 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 14 Oct 2021 23:34:06 +0900
Subject: [PATCH 1363/2325] fix: access level for DBDriver property

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

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 4d4f68697122..24e5df59306e 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -30,7 +30,7 @@ class Connection extends BaseConnection implements ConnectionInterface
      *
      * @var string
      */
-    public $DBDriver = 'OCI8';
+    protected $DBDriver = 'OCI8';
 
     /**
      * Identifier escape character

From cb29df05000418f52a98032be45a9da2a29ebaca Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 14 Oct 2021 23:50:21 +0900
Subject: [PATCH 1364/2325] style: composer cs-fix

---
 system/Database/OCI8/Connection.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 24e5df59306e..8e72409352eb 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -594,6 +594,7 @@ public function insertID(): int
 
             if ($primaryColumnType !== 'NUMBER') {
                 $primaryColumnName = '';
+
                 continue;
             }
         }

From 1a84ca04797f3237d46ffa9a9a4a2364667ce15a Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 19 Oct 2021 21:51:46 +0900
Subject: [PATCH 1365/2325] docs: add @used-by for OCI8

---
 system/Database/OCI8/Connection.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 8e72409352eb..265e0a464847 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -90,6 +90,7 @@ class Connection extends BaseConnection implements ConnectionInterface
     /**
      * RowID
      *
+     * @used-by PreparedQuery::_execute()
      * @var int|null
      */
     public $rowId;
@@ -97,6 +98,7 @@ class Connection extends BaseConnection implements ConnectionInterface
     /**
      * Latest inserted table name.
      *
+     * @used-by Builder::_insert()
      * @var string|null
      */
     public $latestInsertedTableName;

From 8a0fca9444f020403411c87fa8f5e4fe26b0a82d Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 19 Oct 2021 21:52:17 +0900
Subject: [PATCH 1366/2325] docs: remove unnecessary @property annotation for
 OCI8

---
 system/Database/OCI8/Connection.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 265e0a464847..527121517462 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -19,9 +19,6 @@
 
 /**
  * Connection for OCI8
- *
- * @property string|null $latestInsertedTableName
- * @property int|null    $rowId
  */
 class Connection extends BaseConnection implements ConnectionInterface
 {

From 275f729901d28c6ce1fed4bec1fea6dbdaa427ce Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 19 Oct 2021 21:53:28 +0900
Subject: [PATCH 1367/2325] docs: The query method explicitly states that
 insertId cannot be obtained.

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

diff --git a/user_guide_src/source/database/helpers.rst b/user_guide_src/source/database/helpers.rst
index d56c78c5799f..ef7bb4229d3e 100644
--- a/user_guide_src/source/database/helpers.rst
+++ b/user_guide_src/source/database/helpers.rst
@@ -17,7 +17,7 @@ The insert ID number when performing database inserts.
     driver, this function requires a $name parameter, which specifies the
     appropriate sequence to check for the insert id.
 
-.. note:: If using the OCI8 driver, the insert ID can be get when using insert() of :doc:`QueryBuilder<./query_builder>`.
+.. note:: If using the OCI8 driver, the ``$db->insertID()`` can be used only after using ``insert()`` of :doc:`QueryBuilder<./query_builder>`. You can't use it after ``$db->query()``.
 
 **$db->affectedRows()**
 

From 0e9d0567e0d856aeb2ffbe8d5a9c14eb9df7c1a8 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 19 Oct 2021 21:56:43 +0900
Subject: [PATCH 1368/2325] fix: The scope of the access modifier has been
 changed to protected.

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

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 527121517462..970992f23fef 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -68,7 +68,7 @@ class Connection extends BaseConnection implements ConnectionInterface
      *
      * @var resource
      */
-    public $stmtId;
+    protected $stmtId;
 
     /**
      * Commit mode flag
@@ -82,7 +82,7 @@ class Connection extends BaseConnection implements ConnectionInterface
      *
      * @var resource
      */
-    public $cursorId;
+    protected $cursorId;
 
     /**
      * RowID

From e7cb7c9492041eca55e79bcea18af35c84762a4d Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 19 Oct 2021 21:58:30 +0900
Subject: [PATCH 1369/2325] docs: add @used-by for commitMode

---
 system/Database/OCI8/Connection.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 970992f23fef..286805cb3a2a 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -73,6 +73,7 @@ class Connection extends BaseConnection implements ConnectionInterface
     /**
      * Commit mode flag
      *
+     * @used-by PreparedQuery::_execute()
      * @var int
      */
     public $commitMode = OCI_COMMIT_ON_SUCCESS;

From 70a1fca5e4cefb866eb7288b8007514b8644af73 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 19 Oct 2021 22:10:00 +0900
Subject: [PATCH 1370/2325] docs: remove unnecessary comment.

---
 system/Database/OCI8/Builder.php    | 40 -----------------------------
 system/Database/OCI8/Connection.php |  8 ++----
 system/Database/OCI8/Forge.php      | 14 ----------
 system/Database/OCI8/Result.php     |  4 +--
 4 files changed, 3 insertions(+), 63 deletions(-)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index f81bfbea6ef1..23b9825b4559 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -63,13 +63,7 @@ class Builder extends BaseBuilder
     protected $db;
 
     /**
-     * Insert batch statement
-     *
      * Generates a platform-specific insert string from the supplied data.
-     *
-     * @param string $table  Table name
-     * @param array  $keys   INSERT keys
-     * @param array  $values INSERT values
      */
     protected function _insertBatch(string $table, array $keys, array $values): string
     {
@@ -101,13 +95,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
     }
 
     /**
-     * Replace statement
-     *
      * Generates a platform-specific replace string from the supplied data
-     *
-     * @param string $table  The table name
-     * @param array  $keys   The insert keys
-     * @param array  $values The insert values
      */
     protected function _replace(string $table, array $keys, array $values): string
     {
@@ -162,14 +150,10 @@ protected function _replace(string $table, array $keys, array $values): string
     }
 
     /**
-     * Truncate statement
-     *
      * Generates a platform-specific truncate string from the supplied data
      *
      * If the database does not support the truncate() command,
      * then this method maps to 'DELETE FROM table'
-     *
-     * @param string $table The table name
      */
     protected function _truncate(string $table): string
     {
@@ -177,13 +161,8 @@ protected function _truncate(string $table): string
     }
 
     /**
-     * Delete
-     *
      * Compiles a delete string and runs the query
      *
-     * @param mixed $where The where clause
-     * @param int   $limit The limit clause
-     *
      * @throws DatabaseException
      *
      * @return mixed
@@ -198,11 +177,7 @@ public function delete($where = '', ?int $limit = null, bool $resetData = true)
     }
 
     /**
-     * Delete statement
-     *
      * Generates a platform-specific delete string from the supplied data
-     *
-     * @param string $table The table name
      */
     protected function _delete(string $table): string
     {
@@ -215,12 +190,7 @@ protected function _delete(string $table): string
     }
 
     /**
-     * Update statement
-     *
      * Generates a platform-specific update string from the supplied data
-     *
-     * @param string $table  the Table name
-     * @param array  $values the Update data
      */
     protected function _update(string $table, array $values): string
     {
@@ -240,11 +210,7 @@ protected function _update(string $table, array $values): string
     }
 
     /**
-     * LIMIT string
-     *
      * Generates a platform-specific LIMIT clause.
-     *
-     * @param string $sql SQL Query
      */
     protected function _limit(string $sql, bool $offsetIgnore = false): string
     {
@@ -274,13 +240,7 @@ protected function resetSelect()
     }
 
     /**
-     * Insert statement
-     *
      * Generates a platform-specific insert string from the supplied data
-     *
-     * @param string $table         The table name
-     * @param array  $keys          The insert keys
-     * @param array  $unescapedKeys The insert values
      */
     protected function _insert(string $table, array $keys, array $unescapedKeys): string
     {
diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 286805cb3a2a..1b8c315dd37f 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -189,7 +189,7 @@ public function getVersion(): string
     /**
      * Executes the query against the database.
      *
-     * @return bool|resource
+     * @return false|resource
      */
     protected function execute(string $sql)
     {
@@ -465,11 +465,10 @@ public function getCursor()
     }
 
     /**
-     * Stored Procedure.  Executes a stored procedure
+     * Executes a stored procedure
      *
      * @param string $package   package name in which the stored procedure is in
      * @param string $procedure stored procedure name to execute
-     * @param array  $params    parameters
      *
      * @return mixed
      *
@@ -565,9 +564,6 @@ public function error(): array
             ];
     }
 
-    /**
-     * Insert ID
-     */
     public function insertID(): int
     {
         if (empty($this->rowId) || empty($this->latestInsertedTableName)) {
diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 58b550cc9b89..2334f2b4b65d 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -184,8 +184,6 @@ protected function _processColumn(array $field): string
     }
 
     /**
-     * Field attribute TYPE
-     *
      * Performs a data type mapping between different databases.
      *
      * @return void
@@ -247,19 +245,12 @@ protected function _attributeType(array &$attributes)
                 $attributes['TYPE']       = 'VARCHAR2';
 
                 return;
-
-            default:
         }
     }
 
     /**
-     * Drop Table
-     *
      * Generates a platform-specific DROP TABLE string
      *
-     * @param string $table    Table name
-     * @param bool   $ifExists Whether to add an IF EXISTS condition
-     *
      * @return bool|string
      */
     protected function _dropTable(string $table, bool $ifExists, bool $cascade)
@@ -275,11 +266,6 @@ protected function _dropTable(string $table, bool $ifExists, bool $cascade)
         return $sql;
     }
 
-    /**
-     * Process foreign keys
-     *
-     * @param string $table Table name
-     */
     protected function _processForeignKeys(string $table): string
     {
         $sql = '';
diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php
index d7d52da45516..4d33dd0c9b64 100644
--- a/system/Database/OCI8/Result.php
+++ b/system/Database/OCI8/Result.php
@@ -49,8 +49,6 @@ public function getFieldData(): array
                 'name'       => oci_field_name($this->resultID, $fieldIndex),
                 'type'       => oci_field_type($this->resultID, $fieldIndex),
                 'max_length' => oci_field_size($this->resultID, $fieldIndex),
-                // 'primary_key' = (int) ($data->flags & 2),
-                // 'default'     = $data->def,
             ];
         }, range(1, $this->getFieldCount()));
     }
@@ -73,7 +71,7 @@ public function freeResult()
      * internally before fetching results to make sure the result set
      * starts at zero.
      *
-     * @return mixed
+     * @return false
      */
     public function dataSeek(int $n = 0)
     {

From 51686fc7991a4e967de4add51f7312951c2bcd49 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 19 Oct 2021 22:31:44 +0900
Subject: [PATCH 1371/2325] style: fix indent.

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

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 23b9825b4559..699acc5f4438 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -205,8 +205,8 @@ protected function _update(string $table, array $values): string
         }
 
         return 'UPDATE ' . $this->compileIgnore('update') . $table . ' SET ' . implode(', ', $valStr)
-                . $this->compileWhereHaving('QBWhere')
-                . $this->compileOrderBy();
+            . $this->compileWhereHaving('QBWhere')
+            . $this->compileOrderBy();
     }
 
     /**

From 45c4ffb5f246f15c7386ded35c6ba7610763ee50 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 19 Oct 2021 22:32:09 +0900
Subject: [PATCH 1372/2325] style: It seems that the reference operator needs
 to cover the result.

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

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 699acc5f4438..27631faf64f1 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -214,7 +214,7 @@ protected function _update(string $table, array $values): string
      */
     protected function _limit(string $sql, bool $offsetIgnore = false): string
     {
-        $offset = (int) ($offsetIgnore === false) ? $this->QBOffset : 0;
+        $offset = (int) ($offsetIgnore === false ? $this->QBOffset : 0);
         if (version_compare($this->db->getVersion(), '12.1', '>=')) {
             // OFFSET-FETCH can be used only with the ORDER BY clause
             if (empty($this->QBOrderBy)) {

From 0295774512af908bd535563b2e69fd63efa6fb90 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 19 Oct 2021 22:34:54 +0900
Subject: [PATCH 1373/2325] style: using sprintf for create query.

---
 system/Database/OCI8/Builder.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 27631faf64f1..4b4360db812c 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -225,9 +225,9 @@ protected function _limit(string $sql, bool $offsetIgnore = false): string
         }
 
         $this->limitUsed = true;
+        $limitTemplateQuery = 'SELECT * FROM (SELECT INNER_QUERY.*, ROWNUM RNUM FROM (%s) INNER_QUERY WHERE ROWNUM < %d)' . ($offset ? ' WHERE RNUM >= %d' : '');
 
-        return 'SELECT * FROM (SELECT inner_query.*, rownum rnum FROM (' . $sql . ') inner_query WHERE rownum < ' . ($offset + $this->QBLimit + 1) . ')'
-            . ($offset ? ' WHERE rnum >= ' . ($offset + 1) : '');
+        return sprintf($limitTemplateQuery, $sql, $offset + $this->QBLimit + 1, $offset);
     }
 
     /**
@@ -244,10 +244,15 @@ protected function resetSelect()
      */
     protected function _insert(string $table, array $keys, array $unescapedKeys): string
     {
-        // Has a strange design.
-        // Processing to get the table where the last insert was performed for insertId method.
         $this->db->latestInsertedTableName = $table;
-
-        return 'INSERT ' . $this->compileIgnore('insert') . 'INTO ' . $table . ' (' . implode(', ', $keys) . ') VALUES (' . implode(', ', $unescapedKeys) . ') RETURNING ROWID INTO :CI_OCI8_ROWID';
+        $sql = 'INSERT %sINTO %s (%s) VALUES (%s) RETURNING ROWID INTO :CI_OCI8_ROWID';
+
+        return sprintf(
+            $sql,
+            $this->compileIgnore('insert'),
+            $table,
+            implode(', ', $keys),
+            implode(', ', $unescapedKeys)
+        );
     }
 }

From c3ce98faa0f9ae4469cd299d6adad93d9238dadb Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 19 Oct 2021 22:35:44 +0900
Subject: [PATCH 1374/2325] style: Fixed ternary operator style as noted.

---
 system/Database/OCI8/Connection.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 1b8c315dd37f..60f595b37761 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -126,7 +126,7 @@ public function connect(bool $persistent = false)
             $this->buildDSN();
         }
 
-        $func = ($persistent === true) ? 'oci_pconnect' : 'oci_connect';
+        $func = $persistent ? 'oci_pconnect' : 'oci_connect';
 
         return empty($this->charset)
             ? $func($this->username, $this->password, $this->DSN)
@@ -208,7 +208,7 @@ protected function execute(string $sql)
 
             oci_set_prefetch($this->stmtId, 1000);
 
-            return (oci_execute($this->stmtId, $this->commitMode)) ? $this->stmtId : false;
+            return oci_execute($this->stmtId, $this->commitMode) ? $this->stmtId : false;
         } catch (ErrorException $e) {
             log_message('error', $e->getMessage());
 
@@ -291,11 +291,9 @@ protected function _fieldData(string $table): array
             $retval[$i]->name = $query[$i]->COLUMN_NAME;
             $retval[$i]->type = $query[$i]->DATA_TYPE;
 
-            $length = ($query[$i]->CHAR_LENGTH > 0)
-                ? $query[$i]->CHAR_LENGTH : $query[$i]->DATA_PRECISION;
-            if ($length === null) {
-                $length = $query[$i]->DATA_LENGTH;
-            }
+            $length = $query[$i]->CHAR_LENGTH > 0 ? $query[$i]->CHAR_LENGTH : $query[$i]->DATA_PRECISION;
+            $length = $length ?? $query[$i]->DATA_LENGTH;
+
             $retval[$i]->max_length = $length;
 
             $default = $query[$i]->DATA_DEFAULT;

From b8f0b5ec37f04e4ccef77a1c3942215a1a6f3707 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 19 Oct 2021 22:36:58 +0900
Subject: [PATCH 1375/2325] style: importd stdClass.

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

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 60f595b37761..4c5a814622ab 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -347,7 +347,7 @@ protected function _indexData(string $table): array
                 continue;
             }
 
-            $retVal[$row->INDEX_NAME]         = new \stdClass();
+            $retVal[$row->INDEX_NAME]         = new stdClass();
             $retVal[$row->INDEX_NAME]->name   = $row->INDEX_NAME;
             $retVal[$row->INDEX_NAME]->fields = [$row->COLUMN_NAME];
             $retVal[$row->INDEX_NAME]->type   = $constraintTypes[$row->CONSTRAINT_TYPE] ?? 'INDEX';
@@ -392,7 +392,7 @@ protected function _foreignKeyData(string $table): array
         $retVal = [];
 
         foreach ($query as $row) {
-            $obj                      = new \stdClass();
+            $obj                      = new stdClass();
             $obj->constraint_name     = $row->CONSTRAINT_NAME;
             $obj->table_name          = $row->TABLE_NAME;
             $obj->column_name         = $row->COLUMN_NAME;

From 7b2a9c039d1aa5f4d2d1f5d01d5e871a98cd1f29 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 19 Oct 2021 22:37:26 +0900
Subject: [PATCH 1376/2325] style: Changed to start conditions from literals.

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

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 4c5a814622ab..76ae990f1c2b 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -384,7 +384,7 @@ protected function _foreignKeyData(string $table): array
   WHERE ac.constraint_type = ' . $this->escape('R') . '
       AND acc.table_name = ' . $this->escape($table);
 
-        if (($query = $this->query($sql)) === false) {
+        if (false === $query = $this->query($sql)) {
             throw new DatabaseException(lang('Database.failGetForeignKeyData'));
         }
         $query = $query->getResultObject();

From c57778c4480be16bfa4bf61f22567f6a5e3f4dc4 Mon Sep 17 00:00:00 2001
From: ytetsuro <phper.0o0@gmail.com>
Date: Tue, 19 Oct 2021 22:46:44 +0900
Subject: [PATCH 1377/2325] style: Removed unnecessary parentheses.

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 system/Database/OCI8/Connection.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 76ae990f1c2b..7b41b9fc7a3d 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -624,8 +624,8 @@ protected function buildDSN()
         }
 
         $isEasyConnectableHostName = $this->hostname !== '' && strpos($this->hostname, '/') === false && strpos($this->hostname, ':') === false;
-        $easyConnectablePort       = ((! empty($this->port) && ctype_digit($this->port)) ? ':' . $this->port : '');
-        $easyConnectableDatabase   = ($this->database !== '' ? '/' . ltrim($this->database, '/') : '');
+        $easyConnectablePort       = ! empty($this->port) && ctype_digit($this->port) ? ':' . $this->port : '';
+        $easyConnectableDatabase   = $this->database !== '' ? '/' . ltrim($this->database, '/') : '';
 
         if ($isEasyConnectableHostName && ($easyConnectablePort !== '' || $easyConnectableDatabase !== '')) {
             /* If the hostname field isn't empty, doesn't contain

From 9fb0685ff1f58e286d6d53bd31a83a22df631f82 Mon Sep 17 00:00:00 2001
From: ytetsuro <phper.0o0@gmail.com>
Date: Tue, 19 Oct 2021 22:47:58 +0900
Subject: [PATCH 1378/2325] style: remove empty line.

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 system/Database/OCI8/Connection.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 7b41b9fc7a3d..54826e9895df 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -635,9 +635,7 @@ protected function buildDSN()
              * Easy Connect string from these 3 settings, assuming
              * that the database field is a service name.
              */
-            $this->DSN = $this->hostname
-                . $easyConnectablePort
-                . $easyConnectableDatabase;
+            $this->DSN = $this->hostname . $easyConnectablePort . $easyConnectableDatabase;
 
             if (preg_match($this->validDSNs['ec'], $this->DSN)) {
                 return;

From 68cff0304ea0acd1d4ca9e5ebc8867df6ae460d5 Mon Sep 17 00:00:00 2001
From: ytetsuro <phper.0o0@gmail.com>
Date: Tue, 19 Oct 2021 22:49:34 +0900
Subject: [PATCH 1379/2325] style: fix indent

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 system/Database/OCI8/Forge.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 2334f2b4b65d..14fbbb02affb 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -175,12 +175,12 @@ protected function _processColumn(array $field): string
         }
 
         return $this->db->escapeIdentifiers($field['name'])
-               . ' ' . $field['type'] . $field['length']
-               . $field['unsigned']
-               . $field['default']
-               . $field['auto_increment']
-               . $field['null']
-               . $field['unique'];
+           . ' ' . $field['type'] . $field['length']
+           . $field['unsigned']
+           . $field['default']
+           . $field['auto_increment']
+           . $field['null']
+           . $field['unique'];
     }
 
     /**

From 21693600268167885fd6ce58d66818afda649be8 Mon Sep 17 00:00:00 2001
From: ytetsuro <phper.0o0@gmail.com>
Date: Tue, 19 Oct 2021 22:50:26 +0900
Subject: [PATCH 1380/2325] style: Removed unnecessary parentheses.

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 system/Database/OCI8/Forge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 14fbbb02affb..c9d8bf0635d7 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -88,7 +88,7 @@ protected function _alterTable(string $alterType, string $table, $field)
         if ($alterType === 'DROP') {
             $fields = array_map(function ($field) {
                 return $this->db->escapeIdentifiers(trim($field));
-            }, (is_string($field)) ? explode(',', $field) : $field);
+            }, is_string($field)) ? explode(',', $field) : $field;
 
             return $sql . ' DROP (' . implode(',', $fields) . ') CASCADE CONSTRAINT INVALIDATE';
         }

From a6a8c40e50b07bcf06935ae78e4ce7467fea4c50 Mon Sep 17 00:00:00 2001
From: ytetsuro <phper.0o0@gmail.com>
Date: Tue, 19 Oct 2021 22:51:30 +0900
Subject: [PATCH 1381/2325] style: Removed unnecessary parentheses.

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 system/Database/OCI8/Forge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index c9d8bf0635d7..9676df2e4e09 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -104,7 +104,7 @@ protected function _alterTable(string $alterType, string $table, $field)
                 // If a null constraint is added to a column with a null constraint,
                 // ORA-01451 will occur,
                 // so add null constraint is used only when it is different from the current null constraint.
-                $isWantToAddNull    = (strpos($field[$i]['null'], ' NOT') === false);
+                $isWantToAddNull    = strpos($field[$i]['null'], ' NOT') === false;
                 $currentNullAddable = $nullableMap[$field[$i]['name']];
 
                 if ($isWantToAddNull === $currentNullAddable) {

From 2b0b3ad943ddd00516fa85a195ca63a0ad236894 Mon Sep 17 00:00:00 2001
From: ytetsuro <phper.0o0@gmail.com>
Date: Tue, 19 Oct 2021 22:52:19 +0900
Subject: [PATCH 1382/2325] style: Removed unnecessary parentheses.

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 system/Database/OCI8/Forge.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 9676df2e4e09..72cfb61c4482 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -133,7 +133,7 @@ protected function _alterTable(string $alterType, string $table, $field)
         }
 
         $sql .= ' ' . $alterType . ' ';
-        $sql .= (count($field) === 1)
+        $sql .= count($field) === 1
                 ? $field[0]
                 : '(' . implode(',', $field) . ')';
 

From 5e610f90872028d9ad184fea52336de787d97b7a Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 19 Oct 2021 22:52:58 +0900
Subject: [PATCH 1383/2325] docs: fixme -> todo

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

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 72cfb61c4482..b13750d7f696 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -164,7 +164,7 @@ protected function _attributeAutoIncrement(array &$attributes, array &$field)
     protected function _processColumn(array $field): string
     {
         $constraint = '';
-        // @fixme: can’t cover multi pattern when set type.
+        // @todo: can’t cover multi pattern when set type.
         if ($field['type'] === 'VARCHAR2' && strpos($field['length'], "('") === 0) {
             $constraint = ' CHECK(' . $this->db->escapeIdentifiers($field['name'])
                 . ' IN ' . $field['length'] . ')';

From 0f2dc4911aee3873733531b1eddd2609c91dddc7 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Tue, 19 Oct 2021 22:53:59 +0900
Subject: [PATCH 1384/2325] style: dual -> DUAL

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

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 4b4360db812c..0fd72773245d 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -91,7 +91,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
             $sql .= '	INTO ' . $table . ' (' . $insertKeys . ') VALUES ' . $value . "\n";
         }
 
-        return $sql . 'SELECT * FROM dual';
+        return $sql . 'SELECT * FROM DUAL';
     }
 
     /**

From 310d72427328abf0cfeac2e4407e8855658f606d Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Wed, 20 Oct 2021 23:58:25 +0900
Subject: [PATCH 1385/2325] refactor: latestInsertedTableName ->
 lastInsertedTableName

---
 system/Database/OCI8/Builder.php    |  2 +-
 system/Database/OCI8/Connection.php | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 0fd72773245d..519f162a27b5 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -244,7 +244,7 @@ protected function resetSelect()
      */
     protected function _insert(string $table, array $keys, array $unescapedKeys): string
     {
-        $this->db->latestInsertedTableName = $table;
+        $this->db->lastInsertedTableName = $table;
         $sql = 'INSERT %sINTO %s (%s) VALUES (%s) RETURNING ROWID INTO :CI_OCI8_ROWID';
 
         return sprintf(
diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 54826e9895df..f6f1970fc9b5 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -99,7 +99,7 @@ class Connection extends BaseConnection implements ConnectionInterface
      * @used-by Builder::_insert()
      * @var string|null
      */
-    public $latestInsertedTableName;
+    public $lastInsertedTableName;
 
     /**
      * confirm DNS format.
@@ -564,12 +564,12 @@ public function error(): array
 
     public function insertID(): int
     {
-        if (empty($this->rowId) || empty($this->latestInsertedTableName)) {
+        if (empty($this->rowId) || empty($this->lastInsertedTableName)) {
             return 0;
         }
 
-        $indexs     = $this->getIndexData($this->latestInsertedTableName);
-        $fieldDatas = $this->getFieldData($this->latestInsertedTableName);
+        $indexs     = $this->getIndexData($this->lastInsertedTableName);
+        $fieldDatas = $this->getFieldData($this->lastInsertedTableName);
 
         if (! $indexs || ! $fieldDatas) {
             return 0;
@@ -597,7 +597,7 @@ public function insertID(): int
             return 0;
         }
 
-        $table = $this->protectIdentifiers($this->latestInsertedTableName, true);
+        $table = $this->protectIdentifiers($this->lastInsertedTableName, true);
         $query = $this->query('SELECT ' . $this->protectIdentifiers($primaryColumnName, false) . ' SEQ FROM ' . $table . ' WHERE ROWID = ?', $this->rowId)->getRow();
 
         return (int) ($query->SEQ ?? 0);

From 61fbf492fe69d354166e987ace1bb9414f124224 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 21 Oct 2021 00:01:17 +0900
Subject: [PATCH 1386/2325] fix: Fixed a code that should have been specified
 as an argument, but was not.

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

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index b13750d7f696..5bffd8ad8b38 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -88,7 +88,7 @@ protected function _alterTable(string $alterType, string $table, $field)
         if ($alterType === 'DROP') {
             $fields = array_map(function ($field) {
                 return $this->db->escapeIdentifiers(trim($field));
-            }, is_string($field)) ? explode(',', $field) : $field;
+            }, is_string($field) ? explode(',', $field) : $field);
 
             return $sql . ' DROP (' . implode(',', $fields) . ') CASCADE CONSTRAINT INVALIDATE';
         }

From b3a5ae7283ed659e0fa52cf564bff61b3ca37732 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 21 Oct 2021 07:43:39 +0900
Subject: [PATCH 1387/2325] style: cs-fixer error.

---
 system/Database/OCI8/Builder.php    | 6 ++++--
 system/Database/OCI8/Connection.php | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 519f162a27b5..836e0ae7f0ac 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -163,6 +163,8 @@ protected function _truncate(string $table): string
     /**
      * Compiles a delete string and runs the query
      *
+     * @param mixed $where
+     *
      * @throws DatabaseException
      *
      * @return mixed
@@ -224,7 +226,7 @@ protected function _limit(string $sql, bool $offsetIgnore = false): string
             return $sql . ' OFFSET ' . (int) $offset . ' ROWS FETCH NEXT ' . $this->QBLimit . ' ROWS ONLY';
         }
 
-        $this->limitUsed = true;
+        $this->limitUsed    = true;
         $limitTemplateQuery = 'SELECT * FROM (SELECT INNER_QUERY.*, ROWNUM RNUM FROM (%s) INNER_QUERY WHERE ROWNUM < %d)' . ($offset ? ' WHERE RNUM >= %d' : '');
 
         return sprintf($limitTemplateQuery, $sql, $offset + $this->QBLimit + 1, $offset);
@@ -245,7 +247,7 @@ protected function resetSelect()
     protected function _insert(string $table, array $keys, array $unescapedKeys): string
     {
         $this->db->lastInsertedTableName = $table;
-        $sql = 'INSERT %sINTO %s (%s) VALUES (%s) RETURNING ROWID INTO :CI_OCI8_ROWID';
+        $sql                             = 'INSERT %sINTO %s (%s) VALUES (%s) RETURNING ROWID INTO :CI_OCI8_ROWID';
 
         return sprintf(
             $sql,
diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index f6f1970fc9b5..3f54e1c254d3 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -74,6 +74,7 @@ class Connection extends BaseConnection implements ConnectionInterface
      * Commit mode flag
      *
      * @used-by PreparedQuery::_execute()
+     *
      * @var int
      */
     public $commitMode = OCI_COMMIT_ON_SUCCESS;
@@ -89,6 +90,7 @@ class Connection extends BaseConnection implements ConnectionInterface
      * RowID
      *
      * @used-by PreparedQuery::_execute()
+     *
      * @var int|null
      */
     public $rowId;
@@ -97,6 +99,7 @@ class Connection extends BaseConnection implements ConnectionInterface
      * Latest inserted table name.
      *
      * @used-by Builder::_insert()
+     *
      * @var string|null
      */
     public $lastInsertedTableName;

From e653cdc2d5aaead2c969f56e9f37e7ce9bffcc2a Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 21 Oct 2021 07:46:52 +0900
Subject: [PATCH 1388/2325] style: fix for rector.

---
 system/Database/OCI8/Builder.php | 2 +-
 system/Database/OCI8/Forge.php   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 836e0ae7f0ac..93063c52a482 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -223,7 +223,7 @@ protected function _limit(string $sql, bool $offsetIgnore = false): string
                 $sql .= ' ORDER BY 1';
             }
 
-            return $sql . ' OFFSET ' . (int) $offset . ' ROWS FETCH NEXT ' . $this->QBLimit . ' ROWS ONLY';
+            return $sql . ' OFFSET ' . $offset . ' ROWS FETCH NEXT ' . $this->QBLimit . ' ROWS ONLY';
         }
 
         $this->limitUsed    = true;
diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 5bffd8ad8b38..bce8a75492f9 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -243,8 +243,7 @@ protected function _attributeType(array &$attributes)
             case 'MEDIUMTEXT':
                 $attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 4000;
                 $attributes['TYPE']       = 'VARCHAR2';
-
-                return;
+                // no break
         }
     }
 

From 1d8f6ccfd9c731e2b07ba7220258a00b6c9ba643 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Thu, 21 Oct 2021 08:13:53 +0900
Subject: [PATCH 1389/2325] docs: I made sure to start with zero bindings.

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

diff --git a/system/Database/OCI8/PreparedQuery.php b/system/Database/OCI8/PreparedQuery.php
index 8c4c493543ac..28ebb72db55a 100644
--- a/system/Database/OCI8/PreparedQuery.php
+++ b/system/Database/OCI8/PreparedQuery.php
@@ -119,7 +119,7 @@ public function _getResult()
     }
 
     /**
-     * Replaces the ? placeholders with :1, :2, etc parameters for use
+     * Replaces the ? placeholders with :0, :1, etc parameters for use
      * within the prepared query.
      */
     public function parameterize(string $sql): string

From c63db8910cd88ebda20eb840a0ceeba5cfeeb13a Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Fri, 22 Oct 2021 04:37:36 +0900
Subject: [PATCH 1390/2325] style: I stopped using yoda notation.

https://github.com/codeigniter4/CodeIgniter4/issues/5226
---
 system/Database/OCI8/Connection.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 3f54e1c254d3..d4f135aadde8 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -386,8 +386,9 @@ protected function _foreignKeyData(string $table): array
       AND accu.table_name = ccu.table_name
   WHERE ac.constraint_type = ' . $this->escape('R') . '
       AND acc.table_name = ' . $this->escape($table);
+        $query = $this->query($sql);
 
-        if (false === $query = $this->query($sql)) {
+        if ($query === false) {
             throw new DatabaseException(lang('Database.failGetForeignKeyData'));
         }
         $query = $query->getResultObject();

From a77647500c9b8d9a5b0e1ed17f9f2cf05059ef1b Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Fri, 22 Oct 2021 04:58:41 +0900
Subject: [PATCH 1391/2325] style: remove comment.

---
 system/Database/OCI8/Forge.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index bce8a75492f9..3e9cf0a582da 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -243,7 +243,6 @@ protected function _attributeType(array &$attributes)
             case 'MEDIUMTEXT':
                 $attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 4000;
                 $attributes['TYPE']       = 'VARCHAR2';
-                // no break
         }
     }
 

From d0722691db9b4df2135cfcf5e2495358b8a4e9b9 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 24 Oct 2021 23:28:41 +0900
Subject: [PATCH 1392/2325] test: Add a test for lastInsertId.

---
 .../Database/Live/OCI8/LastInsertIDTest.php   | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 tests/system/Database/Live/OCI8/LastInsertIDTest.php

diff --git a/tests/system/Database/Live/OCI8/LastInsertIDTest.php b/tests/system/Database/Live/OCI8/LastInsertIDTest.php
new file mode 100644
index 000000000000..e5acb990454c
--- /dev/null
+++ b/tests/system/Database/Live/OCI8/LastInsertIDTest.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live\OCI8;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+
+/**
+ * @group DatabaseLive
+ *
+ * @internal
+ */
+final class LastInsertIDTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+
+    protected $refresh = true;
+    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+
+    public function testGetInsertIDWithInsert()
+    {
+        $jobData = [
+            'name'        => 'Grocery Sales',
+            'description' => 'Discount!',
+        ];
+
+        $this->db->table('job')->insert($jobData);
+        $actual = $this->db->insertID();
+
+        $this->assertSame($actual, 5);
+    }
+
+    public function testGetInsertIDWithQuery()
+    {
+        $this->db->query('INSERT INTO "db_job" ("name", "description") VALUES (?, ?)', ['Grocery Sales', 'Discount!']);
+        $actual = $this->db->insertID();
+
+        $this->assertSame($actual, 5);
+    }
+
+    public function testGetInsertIDWithHasCommentQuery()
+    {
+        $sql = <<<SQL
+-- INSERT INTO "db_misc" ("key", "value") VALUES ('key', 'value')
+/* INSERT INTO "db_misc" ("key", "value") VALUES ('key', 'value') */
+INSERT /* INTO "db_misc" */ INTO "db_job"  ("name", "description") VALUES (' INTO "abc"', ?)
+SQL;
+        $this->db->query($sql, ['Discount!']);
+        $actual = $this->db->insertID();
+
+        $this->assertSame($actual, 5);
+    }
+}

From 6c074e6287bd67e5035696af175f94b7bca93c9d Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 24 Oct 2021 23:50:02 +0900
Subject: [PATCH 1393/2325] feat: To know the last insertID for OCI8.

Added support for keeping the inserted table name as a property when executing SQL.
---
 system/Database/OCI8/Builder.php       | 17 ----------
 system/Database/OCI8/Connection.php    | 47 ++++++++++++++++++--------
 system/Database/OCI8/PreparedQuery.php | 33 ------------------
 3 files changed, 32 insertions(+), 65 deletions(-)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 93063c52a482..2b48e1ce0f01 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -240,21 +240,4 @@ protected function resetSelect()
         $this->limitUsed = false;
         parent::resetSelect();
     }
-
-    /**
-     * Generates a platform-specific insert string from the supplied data
-     */
-    protected function _insert(string $table, array $keys, array $unescapedKeys): string
-    {
-        $this->db->lastInsertedTableName = $table;
-        $sql                             = 'INSERT %sINTO %s (%s) VALUES (%s) RETURNING ROWID INTO :CI_OCI8_ROWID';
-
-        return sprintf(
-            $sql,
-            $this->compileIgnore('insert'),
-            $table,
-            implode(', ', $keys),
-            implode(', ', $unescapedKeys)
-        );
-    }
 }
diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index d4f135aadde8..bb5c3d2c982d 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -86,19 +86,10 @@ class Connection extends BaseConnection implements ConnectionInterface
      */
     protected $cursorId;
 
-    /**
-     * RowID
-     *
-     * @used-by PreparedQuery::_execute()
-     *
-     * @var int|null
-     */
-    public $rowId;
-
     /**
      * Latest inserted table name.
      *
-     * @used-by Builder::_insert()
+     * @used-by PreparedQuery::_execute()
      *
      * @var string|null
      */
@@ -205,13 +196,16 @@ protected function execute(string $sql)
                 $this->stmtId = oci_parse($this->connID, $sql);
             }
 
-            if (strpos($sql, 'RETURNING ROWID INTO :CI_OCI8_ROWID') !== false) {
-                oci_bind_by_name($this->stmtId, ':CI_OCI8_ROWID', $this->rowId, 255);
-            }
-
             oci_set_prefetch($this->stmtId, 1000);
 
-            return oci_execute($this->stmtId, $this->commitMode) ? $this->stmtId : false;
+            $result = oci_execute($this->stmtId, $this->commitMode) ? $this->stmtId : false;
+            $insertTableName = $this->parseInsertTableName($sql);
+
+            if ($result && $insertTableName !== '') {
+                $this->lastInsertedTableName = $insertTableName;
+            }
+
+            return $result;
         } catch (ErrorException $e) {
             log_message('error', $e->getMessage());
 
@@ -223,6 +217,29 @@ protected function execute(string $sql)
         return false;
     }
 
+    /**
+     * Get the table name for the insert statement from sql.
+     *
+     * @param string $sql
+     *
+     * @return string
+     */
+    public function parseInsertTableName(string $sql): string {
+        $commentStrippedSql = preg_replace(['/\/\*(.|\n)*?\*\//m', '/^-- .*/'], '', $sql);
+        $isInsertQuery = strpos(strtoupper(ltrim($commentStrippedSql)), 'INSERT') === 0;
+
+        if (!$isInsertQuery) {
+            return '';
+        }
+
+        preg_match('/(?is)\b(?:into)\s+("?\w+"?)/', $commentStrippedSql, $match);
+        $tableName = $match[1] ?? '';
+        $tableName = strpos($tableName, '"') === 0 ? trim($tableName, '"') : strtoupper($tableName);
+
+        return $tableName;
+    }
+
+
     /**
      * Returns the total number of rows affected by this query.
      */
diff --git a/system/Database/OCI8/PreparedQuery.php b/system/Database/OCI8/PreparedQuery.php
index 28ebb72db55a..9c798b5d48c9 100644
--- a/system/Database/OCI8/PreparedQuery.php
+++ b/system/Database/OCI8/PreparedQuery.php
@@ -27,35 +27,6 @@ class PreparedQuery extends BasePreparedQuery implements PreparedQueryInterface
      */
     protected $db;
 
-    /**
-     * Is collect row id
-     *
-     * @var bool
-     */
-    private $isCollectRowId;
-
-    /**
-     * Prepares the query against the database, and saves the connection
-     * info necessary to execute the query later.
-     *
-     * NOTE: This version is based on SQL code. Child classes should
-     * override this method.
-     *
-     * @param array $options Passed to the connection's prepare statement.
-     *
-     * @return mixed
-     */
-    public function prepare(string $sql, array $options = [], string $queryClass = 'CodeIgniter\\Database\\Query')
-    {
-        $this->isCollectRowId = false;
-
-        if (substr($sql, strpos($sql, 'RETURNING ROWID INTO :CI_OCI8_ROWID')) === 'RETURNING ROWID INTO :CI_OCI8_ROWID') {
-            $this->isCollectRowId = true;
-        }
-
-        return parent::prepare($sql, $options, $queryClass);
-    }
-
     /**
      * Prepares the query against the database, and saves the connection
      * info necessary to execute the query later.
@@ -101,10 +72,6 @@ public function _execute(array $data): bool
             $lastKey = $key;
         }
 
-        if ($this->isCollectRowId) {
-            oci_bind_by_name($this->statement, ':' . (++$lastKey), $this->db->rowId, 255);
-        }
-
         return oci_execute($this->statement, $this->db->commitMode);
     }
 

From 6cfb0bec82bfa72b5128fd7488679b124e42d3ab Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 24 Oct 2021 23:51:12 +0900
Subject: [PATCH 1394/2325] feat: Added getting the last insertID.

---
 system/Database/OCI8/Connection.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index bb5c3d2c982d..f44d7bd2e2eb 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -585,7 +585,7 @@ public function error(): array
 
     public function insertID(): int
     {
-        if (empty($this->rowId) || empty($this->lastInsertedTableName)) {
+        if (empty($this->lastInsertedTableName)) {
             return 0;
         }
 
@@ -609,8 +609,6 @@ public function insertID(): int
 
             if ($primaryColumnType !== 'NUMBER') {
                 $primaryColumnName = '';
-
-                continue;
             }
         }
 
@@ -618,8 +616,9 @@ public function insertID(): int
             return 0;
         }
 
-        $table = $this->protectIdentifiers($this->lastInsertedTableName, true);
-        $query = $this->query('SELECT ' . $this->protectIdentifiers($primaryColumnName, false) . ' SEQ FROM ' . $table . ' WHERE ROWID = ?', $this->rowId)->getRow();
+        $query = $this->query('SELECT DATA_DEFAULT FROM USER_TAB_COLUMNS WHERE TABLE_NAME = ? AND COLUMN_NAME = ?', [$this->lastInsertedTableName, $primaryColumnName])->getRow();
+        $lastInsertValue = str_replace('nextval', 'currval', $query->DATA_DEFAULT ?? '0');
+        $query = $this->query(sprintf('SELECT %s SEQ FROM DUAL', $lastInsertValue))->getRow();
 
         return (int) ($query->SEQ ?? 0);
     }

From fd8057a4057ae6a4a3b8b137dff9d44c4872e350 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 24 Oct 2021 23:52:12 +0900
Subject: [PATCH 1395/2325] feat: Added the ability to get the last insertID
 even when executing SQL with PreparedQuery.

---
 system/Database/OCI8/PreparedQuery.php          | 17 ++++++++++++++++-
 .../Database/Live/OCI8/LastInsertIDTest.php     | 15 +++++++++++++++
 .../system/Database/Live/PreparedQueryTest.php  |  3 ---
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/system/Database/OCI8/PreparedQuery.php b/system/Database/OCI8/PreparedQuery.php
index 9c798b5d48c9..32fe4b46e179 100644
--- a/system/Database/OCI8/PreparedQuery.php
+++ b/system/Database/OCI8/PreparedQuery.php
@@ -27,6 +27,13 @@ class PreparedQuery extends BasePreparedQuery implements PreparedQueryInterface
      */
     protected $db;
 
+    /**
+     * Latest inserted table name.
+     *
+     * @var string|null
+     */
+    private $lastInsertTableName;
+
     /**
      * Prepares the query against the database, and saves the connection
      * info necessary to execute the query later.
@@ -52,6 +59,8 @@ public function _prepare(string $sql, array $options = [])
             $this->errorString = $error['message'] ?? '';
         }
 
+        $this->lastInsertTableName = $this->db->parseInsertTableName($sql);
+
         return $this;
     }
 
@@ -72,7 +81,13 @@ public function _execute(array $data): bool
             $lastKey = $key;
         }
 
-        return oci_execute($this->statement, $this->db->commitMode);
+        $result = oci_execute($this->statement, $this->db->commitMode);
+
+        if ($result && $this->lastInsertTableName !== '') {
+            $this->db->lastInsertedTableName = $this->lastInsertTableName;
+        }
+
+        return $result;
     }
 
     /**
diff --git a/tests/system/Database/Live/OCI8/LastInsertIDTest.php b/tests/system/Database/Live/OCI8/LastInsertIDTest.php
index e5acb990454c..a1e78e3a363d 100644
--- a/tests/system/Database/Live/OCI8/LastInsertIDTest.php
+++ b/tests/system/Database/Live/OCI8/LastInsertIDTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Database\Live\OCI8;
 
+use CodeIgniter\Database\Query;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
@@ -59,4 +60,18 @@ public function testGetInsertIDWithHasCommentQuery()
 
         $this->assertSame($actual, 5);
     }
+
+    public function testGetInsertIDWithPreparedQuery()
+    {
+        $query = $this->db->prepare(static function ($db) {
+            $sql = 'INSERT INTO "db_job" ("name", "description") VALUES (?, ?)';
+
+            return (new Query($db))->setQuery($sql);
+        });
+
+        $query->execute('foo', 'bar');
+        $actual = $this->db->insertID();
+
+        $this->assertSame($actual, 5);
+    }
 }
diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php
index 9a42f8efd2f6..e8bdabea91fa 100644
--- a/tests/system/Database/Live/PreparedQueryTest.php
+++ b/tests/system/Database/Live/PreparedQueryTest.php
@@ -69,9 +69,6 @@ public function testPrepareReturnsPreparedQuery()
             $expected = "INSERT INTO {$ec}{$pre}user{$ec} ({$ec}name{$ec}, {$ec}email{$ec}) VALUES ({$placeholders})";
         }
 
-        if ($this->db->DBDriver === 'OCI8') {
-            $expected .= ' RETURNING ROWID INTO ?';
-        }
 
         $this->assertSame($expected, $this->query->getQueryString());
     }

From 2745e6a9a247b760fa4688ca5eedd4f37d782e4e Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 24 Oct 2021 23:57:32 +0900
Subject: [PATCH 1396/2325] docs: remove unneeded note.

---
 user_guide_src/source/database/helpers.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/user_guide_src/source/database/helpers.rst b/user_guide_src/source/database/helpers.rst
index ef7bb4229d3e..a9a160a26713 100644
--- a/user_guide_src/source/database/helpers.rst
+++ b/user_guide_src/source/database/helpers.rst
@@ -17,8 +17,6 @@ The insert ID number when performing database inserts.
     driver, this function requires a $name parameter, which specifies the
     appropriate sequence to check for the insert id.
 
-.. note:: If using the OCI8 driver, the ``$db->insertID()`` can be used only after using ``insert()`` of :doc:`QueryBuilder<./query_builder>`. You can't use it after ``$db->query()``.
-
 **$db->affectedRows()**
 
 Displays the number of affected rows, when doing "write" type queries

From 1cee89421dc093d5016a7b1ab4f5a1fab4aebb68 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Mon, 25 Oct 2021 08:50:25 +0900
Subject: [PATCH 1397/2325] test: add setUp for skipTest when using OCI8 driver

---
 tests/system/Database/Live/OCI8/LastInsertIDTest.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/system/Database/Live/OCI8/LastInsertIDTest.php b/tests/system/Database/Live/OCI8/LastInsertIDTest.php
index a1e78e3a363d..a2e354bf0d95 100644
--- a/tests/system/Database/Live/OCI8/LastInsertIDTest.php
+++ b/tests/system/Database/Live/OCI8/LastInsertIDTest.php
@@ -27,6 +27,14 @@ final class LastInsertIDTest extends CIUnitTestCase
     protected $refresh = true;
     protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
+    public function setUp(){
+        parent::setUp();
+
+        if ($this->db->DBDriver !== 'OCI8') {
+            $this->markTestSkipped('Only OCI8 has its own implementation.');
+        }
+    }
+
     public function testGetInsertIDWithInsert()
     {
         $jobData = [

From 7644cdd3a3759a7a528c3087b8934b2c0722bcb8 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Wed, 27 Oct 2021 20:42:08 +0900
Subject: [PATCH 1398/2325] test: add return type for setUp method.

---
 tests/system/Database/Live/OCI8/LastInsertIDTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/Database/Live/OCI8/LastInsertIDTest.php b/tests/system/Database/Live/OCI8/LastInsertIDTest.php
index a2e354bf0d95..0ed8ed2fb774 100644
--- a/tests/system/Database/Live/OCI8/LastInsertIDTest.php
+++ b/tests/system/Database/Live/OCI8/LastInsertIDTest.php
@@ -27,7 +27,7 @@ final class LastInsertIDTest extends CIUnitTestCase
     protected $refresh = true;
     protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
-    public function setUp(){
+    public function setUp(): void {
         parent::setUp();
 
         if ($this->db->DBDriver !== 'OCI8') {

From 2d18992db05ecd7fedfbce835bac2ece0f075e1d Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 28 Nov 2021 17:24:35 +0900
Subject: [PATCH 1399/2325] feat: add dropIndexStr for OCI8.

---
 system/Database/OCI8/Forge.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 3e9cf0a582da..890af27080c3 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -16,6 +16,13 @@
  */
 class Forge extends \CodeIgniter\Database\Forge
 {
+    /**
+     * DROP INDEX statement
+     *
+     * @var string
+     */
+    protected $dropIndexStr = 'DROP INDEX %s';
+
     /**
      * CREATE DATABASE statement
      *

From e78d8c37b5a65f4b58ad1bf9875eefb36ac6f410 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 28 Nov 2021 17:54:56 +0900
Subject: [PATCH 1400/2325] feat: add test case.

---
 system/Database/OCI8/Connection.php                  | 2 +-
 tests/system/Database/Live/OCI8/LastInsertIDTest.php | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index f44d7bd2e2eb..dd3791d16bf6 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -225,7 +225,7 @@ protected function execute(string $sql)
      * @return string
      */
     public function parseInsertTableName(string $sql): string {
-        $commentStrippedSql = preg_replace(['/\/\*(.|\n)*?\*\//m', '/^-- .*/'], '', $sql);
+        $commentStrippedSql = preg_replace(['/\/\*(.|\n)*?\*\//m', '/--.+/'], '', $sql);
         $isInsertQuery = strpos(strtoupper(ltrim($commentStrippedSql)), 'INSERT') === 0;
 
         if (!$isInsertQuery) {
diff --git a/tests/system/Database/Live/OCI8/LastInsertIDTest.php b/tests/system/Database/Live/OCI8/LastInsertIDTest.php
index 0ed8ed2fb774..a8310a40b1f9 100644
--- a/tests/system/Database/Live/OCI8/LastInsertIDTest.php
+++ b/tests/system/Database/Live/OCI8/LastInsertIDTest.php
@@ -60,8 +60,11 @@ public function testGetInsertIDWithHasCommentQuery()
     {
         $sql = <<<SQL
 -- INSERT INTO "db_misc" ("key", "value") VALUES ('key', 'value')
+--INSERT INTO "db_misc" ("key", "value") VALUES ('key', 'value')
 /* INSERT INTO "db_misc" ("key", "value") VALUES ('key', 'value') */
-INSERT /* INTO "db_misc" */ INTO "db_job"  ("name", "description") VALUES (' INTO "abc"', ?)
+/*INSERT INTO "db_misc" ("key", "value") VALUES ('key', 'value')*/
+INSERT /* INTO "db_misc" */ INTO -- comment "db_misc"
+"db_job"  ("name", "description") VALUES (' INTO "abc"', ?)
 SQL;
         $this->db->query($sql, ['Discount!']);
         $actual = $this->db->insertID();

From 40fce31cb59179738177c0ddb22bf386255ff3e2 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 28 Nov 2021 20:15:07 +0900
Subject: [PATCH 1401/2325] style: compover cs-fix

---
 system/Database/OCI8/Connection.php           | 21 +++++++------------
 .../Database/Live/OCI8/LastInsertIDTest.php   | 19 +++++++++--------
 .../Database/Live/PreparedQueryTest.php       |  1 -
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index dd3791d16bf6..0c5861fe39a2 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -198,7 +198,7 @@ protected function execute(string $sql)
 
             oci_set_prefetch($this->stmtId, 1000);
 
-            $result = oci_execute($this->stmtId, $this->commitMode) ? $this->stmtId : false;
+            $result          = oci_execute($this->stmtId, $this->commitMode) ? $this->stmtId : false;
             $insertTableName = $this->parseInsertTableName($sql);
 
             if ($result && $insertTableName !== '') {
@@ -219,27 +219,22 @@ protected function execute(string $sql)
 
     /**
      * Get the table name for the insert statement from sql.
-     *
-     * @param string $sql
-     *
-     * @return string
      */
-    public function parseInsertTableName(string $sql): string {
+    public function parseInsertTableName(string $sql): string
+    {
         $commentStrippedSql = preg_replace(['/\/\*(.|\n)*?\*\//m', '/--.+/'], '', $sql);
-        $isInsertQuery = strpos(strtoupper(ltrim($commentStrippedSql)), 'INSERT') === 0;
+        $isInsertQuery      = strpos(strtoupper(ltrim($commentStrippedSql)), 'INSERT') === 0;
 
-        if (!$isInsertQuery) {
+        if (! $isInsertQuery) {
             return '';
         }
 
         preg_match('/(?is)\b(?:into)\s+("?\w+"?)/', $commentStrippedSql, $match);
         $tableName = $match[1] ?? '';
-        $tableName = strpos($tableName, '"') === 0 ? trim($tableName, '"') : strtoupper($tableName);
 
-        return $tableName;
+        return strpos($tableName, '"') === 0 ? trim($tableName, '"') : strtoupper($tableName);
     }
 
-
     /**
      * Returns the total number of rows affected by this query.
      */
@@ -616,9 +611,9 @@ public function insertID(): int
             return 0;
         }
 
-        $query = $this->query('SELECT DATA_DEFAULT FROM USER_TAB_COLUMNS WHERE TABLE_NAME = ? AND COLUMN_NAME = ?', [$this->lastInsertedTableName, $primaryColumnName])->getRow();
+        $query           = $this->query('SELECT DATA_DEFAULT FROM USER_TAB_COLUMNS WHERE TABLE_NAME = ? AND COLUMN_NAME = ?', [$this->lastInsertedTableName, $primaryColumnName])->getRow();
         $lastInsertValue = str_replace('nextval', 'currval', $query->DATA_DEFAULT ?? '0');
-        $query = $this->query(sprintf('SELECT %s SEQ FROM DUAL', $lastInsertValue))->getRow();
+        $query           = $this->query(sprintf('SELECT %s SEQ FROM DUAL', $lastInsertValue))->getRow();
 
         return (int) ($query->SEQ ?? 0);
     }
diff --git a/tests/system/Database/Live/OCI8/LastInsertIDTest.php b/tests/system/Database/Live/OCI8/LastInsertIDTest.php
index a8310a40b1f9..16e4d84e989c 100644
--- a/tests/system/Database/Live/OCI8/LastInsertIDTest.php
+++ b/tests/system/Database/Live/OCI8/LastInsertIDTest.php
@@ -27,7 +27,8 @@ final class LastInsertIDTest extends CIUnitTestCase
     protected $refresh = true;
     protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
 
-    public function setUp(): void {
+    protected function setUp(): void
+    {
         parent::setUp();
 
         if ($this->db->DBDriver !== 'OCI8') {
@@ -58,14 +59,14 @@ public function testGetInsertIDWithQuery()
 
     public function testGetInsertIDWithHasCommentQuery()
     {
-        $sql = <<<SQL
--- INSERT INTO "db_misc" ("key", "value") VALUES ('key', 'value')
---INSERT INTO "db_misc" ("key", "value") VALUES ('key', 'value')
-/* INSERT INTO "db_misc" ("key", "value") VALUES ('key', 'value') */
-/*INSERT INTO "db_misc" ("key", "value") VALUES ('key', 'value')*/
-INSERT /* INTO "db_misc" */ INTO -- comment "db_misc"
-"db_job"  ("name", "description") VALUES (' INTO "abc"', ?)
-SQL;
+        $sql = <<<'SQL'
+            -- INSERT INTO "db_misc" ("key", "value") VALUES ('key', 'value')
+            --INSERT INTO "db_misc" ("key", "value") VALUES ('key', 'value')
+            /* INSERT INTO "db_misc" ("key", "value") VALUES ('key', 'value') */
+            /*INSERT INTO "db_misc" ("key", "value") VALUES ('key', 'value')*/
+            INSERT /* INTO "db_misc" */ INTO -- comment "db_misc"
+            "db_job"  ("name", "description") VALUES (' INTO "abc"', ?)
+            SQL;
         $this->db->query($sql, ['Discount!']);
         $actual = $this->db->insertID();
 
diff --git a/tests/system/Database/Live/PreparedQueryTest.php b/tests/system/Database/Live/PreparedQueryTest.php
index e8bdabea91fa..ef71e1500065 100644
--- a/tests/system/Database/Live/PreparedQueryTest.php
+++ b/tests/system/Database/Live/PreparedQueryTest.php
@@ -69,7 +69,6 @@ public function testPrepareReturnsPreparedQuery()
             $expected = "INSERT INTO {$ec}{$pre}user{$ec} ({$ec}name{$ec}, {$ec}email{$ec}) VALUES ({$placeholders})";
         }
 
-
         $this->assertSame($expected, $this->query->getQueryString());
     }
 

From 7e2424f3d914edae72a4f8bd36ccd48a8ee61181 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 28 Nov 2021 20:57:50 +0900
Subject: [PATCH 1402/2325] test: import need module.

---
 tests/system/Commands/CreateDatabaseTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/system/Commands/CreateDatabaseTest.php b/tests/system/Commands/CreateDatabaseTest.php
index f0ce8a683857..ccbadc51f0c3 100644
--- a/tests/system/Commands/CreateDatabaseTest.php
+++ b/tests/system/Commands/CreateDatabaseTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Commands;
 
 use CodeIgniter\Database\BaseConnection;
+use CodeIgniter\Database\Database as DatabaseFactory;
 use CodeIgniter\Database\OCI8\Connection as OCI8Connection;
 use CodeIgniter\Database\SQLite3\Connection as SQLite3Connection;
 use CodeIgniter\Test\CIUnitTestCase;

From 3f700c6d64f6315eddbf2c63287515bcf0cda989 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sat, 18 Dec 2021 18:45:59 +0900
Subject: [PATCH 1403/2325] chore: add stored procedure in github actions for
 oracle database.

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

diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 5f2189f41e42..b5c5731fad04 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -114,6 +114,10 @@ jobs:
         if: matrix.db-platforms == 'OCI8'
         run: echo -e "ALTER SESSION SET CONTAINER = XEPDB1;\nCREATE BIGFILE TABLESPACE \"TEST\" DATAFILE '/opt/oracle/product/18c/dbhomeXE/dbs/TEST' SIZE 10M AUTOEXTEND ON MAXSIZE UNLIMITED SEGMENT SPACE MANAGEMENT AUTO EXTENT MANAGEMENT LOCAL AUTOALLOCATE;\nCREATE USER \"ORACLE\" IDENTIFIED BY \"ORACLE\" DEFAULT TABLESPACE \"TEST\" TEMPORARY TABLESPACE TEMP QUOTA UNLIMITED ON \"TEST\";\nGRANT CONNECT,RESOURCE TO \"ORACLE\";\nexit;" | /lib/oracle/18.5/client64/bin/sqlplus -s sys/Oracle18@localhost:1521/XE as sysdba
 
+      - name: Create stored procedure for Oracle Database
+        if: matrix.db-platforms == 'OCI8'
+        run: echo -e "CREATE OR REPLACE PACKAGE calculator AS PROCEDURE plus(left IN NUMBER, right IN NUMBER, result OUT NUMBER); END;\n/\nCREATE OR REPLACE PACKAGE BODY calculator AS PROCEDURE plus(left IN NUMBER, right IN NUMBER, result OUT NUMBER) IS BEGIN result := left + right; END plus; END calculator;\n/\nCREATE OR REPLACE PROCEDURE plus(left IN NUMBER, right IN NUMBER, output OUT NUMBER) IS BEGIN output := left  + right; END;\n/\n\n" | /lib/oracle/18.5/client64/bin/sqlplus -s ORACLE/ORACLE@localhost:1521/XEPDB1
+
       - name: Checkout
         uses: actions/checkout@v2
 

From 9c170aac52c13286755727c5a20eff784012df52 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sat, 18 Dec 2021 18:47:19 +0900
Subject: [PATCH 1404/2325] feat: add call storedProcedure test.

---
 system/Database/OCI8/Connection.php           | 27 +++----
 .../Live/OCI8/CallStoredProcedureTest.php     | 81 +++++++++++++++++++
 2 files changed, 94 insertions(+), 14 deletions(-)
 create mode 100644 tests/system/Database/Live/OCI8/CallStoredProcedureTest.php

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 0c5861fe39a2..aafad7fe4433 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -481,8 +481,7 @@ public function getCursor()
     /**
      * Executes a stored procedure
      *
-     * @param string $package   package name in which the stored procedure is in
-     * @param string $procedure stored procedure name to execute
+     * @param string $procedureName procedure name to execute
      *
      * @return mixed
      *
@@ -495,14 +494,14 @@ public function getCursor()
      * type     yes       the type of the parameter
      * length   yes       the max size of the parameter
      */
-    public function storedProcedure(string $package, string $procedure, array $params)
+    public function storedProcedure(string $procedureName, array $params)
     {
-        if ($package === '' || $procedure === '') {
-            throw new DatabaseException(lang('Database.invalidArgument', [$package . $procedure]));
+        if ($procedureName === '') {
+            throw new DatabaseException(lang('Database.invalidArgument', [$procedureName]));
         }
 
         // Build the query string
-        $sql = 'BEGIN ' . $package . '.' . $procedure . '(';
+        $sql = 'BEGIN ' . $procedureName . '(';
 
         $haveCursor = false;
 
@@ -518,7 +517,7 @@ public function storedProcedure(string $package, string $procedure, array $param
         $this->resetStmtId = false;
         $this->stmtId      = oci_parse($this->connID, $sql);
         $this->bindParams($params);
-        $result            = $this->query($sql, false, $haveCursor);
+        $result            = $this->query($sql);
         $this->resetStmtId = true;
 
         return $result;
@@ -538,13 +537,13 @@ protected function bindParams($params)
         }
 
         foreach ($params as $param) {
-            foreach (['name', 'value', 'type', 'length'] as $val) {
-                if (! isset($param[$val])) {
-                    $param[$val] = '';
-                }
-            }
-
-            oci_bind_by_name($this->stmtId, $param['name'], $param['value'], $param['length'], $param['type']);
+            oci_bind_by_name(
+                $this->stmtId,
+                $param['name'],
+                $param['value'],
+                $param['length'] ?? -1,
+                $param['type'] ?? SQLT_CHR
+            );
         }
     }
 
diff --git a/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php b/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php
new file mode 100644
index 000000000000..6dc4b12a9c6e
--- /dev/null
+++ b/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php
@@ -0,0 +1,81 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live\OCI8;
+
+use CodeIgniter\Database\Query;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+
+/**
+ * @group DatabaseLive
+ *
+ * @internal
+ */
+final class CallStoredProcedureTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        if ($this->db->DBDriver !== 'OCI8') {
+            $this->markTestSkipped('Only OCI8 has its own implementation.');
+        }
+    }
+
+    public function testCallPackageProcedure()
+    {
+        $result = 0;
+
+        $this->db->storedProcedure('calculator.plus', [
+            [
+                'name' => ':left',
+                'value' => 2,
+            ],
+            [
+                'name' => ':right',
+                'value' => 5,
+            ],
+            [
+                'name' => ':output',
+                'value' => &$result,
+            ]
+
+        ]);
+
+        $this->assertSame($result, '7');
+    }
+
+    public function testCallStoredProcedure()
+    {
+        $result = 0;
+
+        $this->db->storedProcedure('plus', [
+            [
+                'name' => ':left',
+                'value' => 2,
+            ],
+            [
+                'name' => ':right',
+                'value' => 5,
+            ],
+            [
+                'name' => ':output',
+                'value' => &$result,
+            ]
+
+        ]);
+
+        $this->assertSame($result, '7');
+    }
+}

From c4f2e69947e74f049f3f3fb5bcf33d9237589994 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 19 Dec 2021 17:50:06 +0900
Subject: [PATCH 1405/2325] style: composer cs-fix

---
 .../Live/OCI8/CallStoredProcedureTest.php       | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php b/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php
index 6dc4b12a9c6e..96352d4ae8db 100644
--- a/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php
+++ b/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php
@@ -11,7 +11,6 @@
 
 namespace CodeIgniter\Database\Live\OCI8;
 
-use CodeIgniter\Database\Query;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 
@@ -39,17 +38,17 @@ public function testCallPackageProcedure()
 
         $this->db->storedProcedure('calculator.plus', [
             [
-                'name' => ':left',
+                'name'  => ':left',
                 'value' => 2,
             ],
             [
-                'name' => ':right',
+                'name'  => ':right',
                 'value' => 5,
             ],
             [
-                'name' => ':output',
+                'name'  => ':output',
                 'value' => &$result,
-            ]
+            ],
 
         ]);
 
@@ -62,17 +61,17 @@ public function testCallStoredProcedure()
 
         $this->db->storedProcedure('plus', [
             [
-                'name' => ':left',
+                'name'  => ':left',
                 'value' => 2,
             ],
             [
-                'name' => ':right',
+                'name'  => ':right',
                 'value' => 5,
             ],
             [
-                'name' => ':output',
+                'name'  => ':output',
                 'value' => &$result,
-            ]
+            ],
 
         ]);
 

From 190f76df8b79174c4cf146adce81346e86c989f6 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Wed, 29 Dec 2021 14:07:57 +0900
Subject: [PATCH 1406/2325] feat: Removed semicolon from ALTER TABLE to make it
 distinguish between sql and PLSQL in OCI8.

---
 .github/workflows/test-phpunit.yml  | 4 ----
 system/Database/OCI8/Connection.php | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index b5c5731fad04..5f2189f41e42 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -114,10 +114,6 @@ jobs:
         if: matrix.db-platforms == 'OCI8'
         run: echo -e "ALTER SESSION SET CONTAINER = XEPDB1;\nCREATE BIGFILE TABLESPACE \"TEST\" DATAFILE '/opt/oracle/product/18c/dbhomeXE/dbs/TEST' SIZE 10M AUTOEXTEND ON MAXSIZE UNLIMITED SEGMENT SPACE MANAGEMENT AUTO EXTENT MANAGEMENT LOCAL AUTOALLOCATE;\nCREATE USER \"ORACLE\" IDENTIFIED BY \"ORACLE\" DEFAULT TABLESPACE \"TEST\" TEMPORARY TABLESPACE TEMP QUOTA UNLIMITED ON \"TEST\";\nGRANT CONNECT,RESOURCE TO \"ORACLE\";\nexit;" | /lib/oracle/18.5/client64/bin/sqlplus -s sys/Oracle18@localhost:1521/XE as sysdba
 
-      - name: Create stored procedure for Oracle Database
-        if: matrix.db-platforms == 'OCI8'
-        run: echo -e "CREATE OR REPLACE PACKAGE calculator AS PROCEDURE plus(left IN NUMBER, right IN NUMBER, result OUT NUMBER); END;\n/\nCREATE OR REPLACE PACKAGE BODY calculator AS PROCEDURE plus(left IN NUMBER, right IN NUMBER, result OUT NUMBER) IS BEGIN result := left + right; END plus; END calculator;\n/\nCREATE OR REPLACE PROCEDURE plus(left IN NUMBER, right IN NUMBER, output OUT NUMBER) IS BEGIN output := left  + right; END;\n/\n\n" | /lib/oracle/18.5/client64/bin/sqlplus -s ORACLE/ORACLE@localhost:1521/XEPDB1
-
       - name: Checkout
         uses: actions/checkout@v2
 
diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index aafad7fe4433..7af79d93663f 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -189,10 +189,6 @@ protected function execute(string $sql)
     {
         try {
             if ($this->resetStmtId === true) {
-                $sql = rtrim($sql, ';');
-                if (strpos(ltrim($sql), 'BEGIN') === 0) {
-                    $sql .= ';';
-                }
                 $this->stmtId = oci_parse($this->connID, $sql);
             }
 

From fb62ab203fb84a80769686664826e4ed75392253 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Wed, 29 Dec 2021 14:11:04 +0900
Subject: [PATCH 1407/2325] chore: Defined the stored procedure needed for the
 test.

---
 .../Migrations/20160428212500_Create_test_tables.php  | 11 +++++++++++
 .../Database/Live/OCI8/CallStoredProcedureTest.php    |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
index cf517e988ebc..26419f89adae 100644
--- a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
+++ b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
@@ -151,6 +151,12 @@ public function up()
             $this->forge->addKey('id', true);
             $this->forge->createTable('ci_sessions', true);
         }
+
+        if ($this->db->DBDriver === 'OCI8') {
+            $this->db->query('CREATE OR REPLACE PACKAGE calculator AS PROCEDURE plus(left IN NUMBER, right IN NUMBER, result OUT NUMBER); END;');
+            $this->db->query('CREATE OR REPLACE PACKAGE BODY calculator AS PROCEDURE plus(left IN NUMBER, right IN NUMBER, result OUT NUMBER) IS BEGIN result := left + right; END plus; END calculator;');
+            $this->db->query('CREATE OR REPLACE PROCEDURE plus(left IN NUMBER, right IN NUMBER, output OUT NUMBER) IS BEGIN output := left  + right; END;');
+        }
     }
 
     public function down()
@@ -168,5 +174,10 @@ public function down()
         if (in_array($this->db->DBDriver, ['MySQLi', 'Postgre'], true)) {
             $this->forge->dropTable('ci_sessions', true);
         }
+
+        if ($this->db->DBDriver === 'OCI8') {
+            $this->db->query('DROP PROCEDURE plus');
+            $this->db->query('DROP PACKAGE BODY calculator');
+        }
     }
 }
diff --git a/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php b/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php
index 96352d4ae8db..3f5089ff48a2 100644
--- a/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php
+++ b/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php
@@ -23,6 +23,8 @@ final class CallStoredProcedureTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
+    protected $refresh = true;
+
     protected function setUp(): void
     {
         parent::setUp();

From 8638ac2e57b677f378e242465114e5ff4b44b546 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sat, 15 Jan 2022 19:18:12 +0900
Subject: [PATCH 1408/2325] chore: composer update --ansi --no-interaction &&
 vendor/bin/rector process

---
 system/Database/OCI8/Builder.php       | 24 ++++++------------------
 system/Database/OCI8/Connection.php    |  2 +-
 system/Database/OCI8/Forge.php         | 20 +++++++++-----------
 system/Database/OCI8/PreparedQuery.php |  4 +---
 system/Database/OCI8/Result.php        | 16 ++++++----------
 5 files changed, 23 insertions(+), 43 deletions(-)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index 2b48e1ce0f01..e1d82be89fb5 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -76,9 +76,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
             $selectQueryValues = [];
 
             foreach ($values as $value) {
-                $selectValues = implode(',', array_map(static function ($value, $key) {
-                    return $value . ' as ' . $key;
-                }, explode(',', substr(substr($value, 1), 0, -1)), $keys));
+                $selectValues = implode(',', array_map(static fn($value, $key) => $value . ' as ' . $key, explode(',', substr(substr($value, 1), 0, -1)), $keys));
                 $selectQueryValues[] = 'SELECT ' . $selectValues . ' FROM DUAL';
             }
 
@@ -99,9 +97,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
      */
     protected function _replace(string $table, array $keys, array $values): string
     {
-        $fieldNames = array_map(static function ($columnName) {
-            return trim($columnName, '"');
-        }, $keys);
+        $fieldNames = array_map(static fn($columnName) => trim($columnName, '"'), $keys);
 
         $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
             $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
@@ -120,9 +116,7 @@ protected function _replace(string $table, array $keys, array $values): string
 
         $sql = 'MERGE INTO ' . $table . "\n USING (SELECT ";
 
-        $sql .= implode(', ', array_map(static function ($columnName, $value) {
-            return $value . ' ' . $columnName;
-        }, $keys, $values));
+        $sql .= implode(', ', array_map(static fn($columnName, $value) => $value . ' ' . $columnName, $keys, $values));
 
         $sql .= ' FROM DUAL) "_replace" ON ( ';
 
@@ -130,21 +124,15 @@ protected function _replace(string $table, array $keys, array $values): string
         $onList[] = '1 != 1';
 
         foreach ($uniqueIndexes as $index) {
-            $onList[] = '(' . implode(' AND ', array_map(static function ($columnName) use ($table) {
-                return $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"';
-            }, $index->fields)) . ')';
+            $onList[] = '(' . implode(' AND ', array_map(static fn($columnName) => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
         }
 
         $sql .= implode(' OR ', $onList) . ') WHEN MATCHED THEN UPDATE SET ';
 
-        $sql .= implode(', ', array_map(static function ($columnName) {
-            return $columnName . ' = "_replace".' . $columnName;
-        }, $replaceableFields));
+        $sql .= implode(', ', array_map(static fn($columnName) => $columnName . ' = "_replace".' . $columnName, $replaceableFields));
 
         $sql .= ' WHEN NOT MATCHED THEN INSERT (' . implode(', ', $replaceableFields) . ') VALUES ';
-        $sql .= ' (' . implode(', ', array_map(static function ($columnName) {
-            return '"_replace".' . $columnName;
-        }, $replaceableFields)) . ')';
+        $sql .= ' (' . implode(', ', array_map(static fn($columnName) => '"_replace".' . $columnName, $replaceableFields)) . ')';
 
         return $sql;
     }
diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 7af79d93663f..88071404059f 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -303,7 +303,7 @@ protected function _fieldData(string $table): array
             $retval[$i]->type = $query[$i]->DATA_TYPE;
 
             $length = $query[$i]->CHAR_LENGTH > 0 ? $query[$i]->CHAR_LENGTH : $query[$i]->DATA_PRECISION;
-            $length = $length ?? $query[$i]->DATA_LENGTH;
+            $length ??= $query[$i]->DATA_LENGTH;
 
             $retval[$i]->max_length = $length;
 
diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 890af27080c3..02f9f23e1060 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -93,9 +93,7 @@ protected function _alterTable(string $alterType, string $table, $field)
         $sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
 
         if ($alterType === 'DROP') {
-            $fields = array_map(function ($field) {
-                return $this->db->escapeIdentifiers(trim($field));
-            }, is_string($field) ? explode(',', $field) : $field);
+            $fields = array_map(fn($field) => $this->db->escapeIdentifiers(trim($field)), is_string($field) ? explode(',', $field) : $field);
 
             return $sql . ' DROP (' . implode(',', $fields) . ') CASCADE CONSTRAINT INVALIDATE';
         }
@@ -201,20 +199,20 @@ protected function _attributeType(array &$attributes)
         // Usually overridden by drivers
         switch (strtoupper($attributes['TYPE'])) {
             case 'TINYINT':
-                $attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 3;
+                $attributes['CONSTRAINT'] ??= 3;
                 // no break
             case 'SMALLINT':
-                $attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 5;
+                $attributes['CONSTRAINT'] ??= 5;
                 // no break
             case 'MEDIUMINT':
-                $attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 7;
+                $attributes['CONSTRAINT'] ??= 7;
                 // no break
             case 'INT':
             case 'INTEGER':
-                $attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 11;
+                $attributes['CONSTRAINT'] ??= 11;
                 // no break
             case 'BIGINT':
-                $attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 19;
+                $attributes['CONSTRAINT'] ??= 19;
                 // no break
             case 'NUMERIC':
                 $attributes['TYPE'] = 'NUMBER';
@@ -231,7 +229,7 @@ protected function _attributeType(array &$attributes)
 
             case 'DOUBLE':
                 $attributes['TYPE']       = 'FLOAT';
-                $attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 126;
+                $attributes['CONSTRAINT'] ??= 126;
 
                 return;
 
@@ -244,11 +242,11 @@ protected function _attributeType(array &$attributes)
             case 'SET':
             case 'ENUM':
             case 'VARCHAR':
-                $attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 255;
+                $attributes['CONSTRAINT'] ??= 255;
                 // no break
             case 'TEXT':
             case 'MEDIUMTEXT':
-                $attributes['CONSTRAINT'] = $attributes['CONSTRAINT'] ?? 4000;
+                $attributes['CONSTRAINT'] ??= 4000;
                 $attributes['TYPE']       = 'VARCHAR2';
         }
     }
diff --git a/system/Database/OCI8/PreparedQuery.php b/system/Database/OCI8/PreparedQuery.php
index 32fe4b46e179..e83e6f8f3a1f 100644
--- a/system/Database/OCI8/PreparedQuery.php
+++ b/system/Database/OCI8/PreparedQuery.php
@@ -29,10 +29,8 @@ class PreparedQuery extends BasePreparedQuery implements PreparedQueryInterface
 
     /**
      * Latest inserted table name.
-     *
-     * @var string|null
      */
-    private $lastInsertTableName;
+    private ?string $lastInsertTableName = null;
 
     /**
      * Prepares the query against the database, and saves the connection
diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php
index 4d33dd0c9b64..c2aecc78b0e2 100644
--- a/system/Database/OCI8/Result.php
+++ b/system/Database/OCI8/Result.php
@@ -34,9 +34,7 @@ public function getFieldCount(): int
      */
     public function getFieldNames(): array
     {
-        return array_map(function ($fieldIndex) {
-            return oci_field_name($this->resultID, $fieldIndex);
-        }, range(1, $this->getFieldCount()));
+        return array_map(fn($fieldIndex) => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
     }
 
     /**
@@ -44,13 +42,11 @@ public function getFieldNames(): array
      */
     public function getFieldData(): array
     {
-        return array_map(function ($fieldIndex) {
-            return (object) [
-                'name'       => oci_field_name($this->resultID, $fieldIndex),
-                'type'       => oci_field_type($this->resultID, $fieldIndex),
-                'max_length' => oci_field_size($this->resultID, $fieldIndex),
-            ];
-        }, range(1, $this->getFieldCount()));
+        return array_map(fn($fieldIndex) => (object) [
+            'name'       => oci_field_name($this->resultID, $fieldIndex),
+            'type'       => oci_field_type($this->resultID, $fieldIndex),
+            'max_length' => oci_field_size($this->resultID, $fieldIndex),
+        ], range(1, $this->getFieldCount()));
     }
 
     /**

From 0cb021ab7b86102b11879479ff15ca7906a4fd79 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sat, 15 Jan 2022 19:36:51 +0900
Subject: [PATCH 1409/2325] docs: add oci8 description in changelog.

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 98d14b6e9197..24b85b255402 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -26,6 +26,8 @@ Enhancements
 - New View Decorators allow modifying the generated HTML prior to caching.
 - Added Subqueries in the FROM section. See :ref:`query-builder-from-subquery`.
 - Added Validation Strict Rules. See :ref:`validation-traditional-and-strict-rules`.
+- Added new OCI8 driver for database.
+    - You to access Oracle Database. They support SQL and PL/SQL statements.
 
 Changes
 *******

From 50547e8db79cf6d9e70f245ae7676b8e69239838 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sat, 15 Jan 2022 19:49:52 +0900
Subject: [PATCH 1410/2325] docs: Added a document to the query method about
 the presence of semicolons for OCI8.

---
 user_guide_src/source/database/queries.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/user_guide_src/source/database/queries.rst b/user_guide_src/source/database/queries.rst
index af15bacea038..50bb0325fa11 100644
--- a/user_guide_src/source/database/queries.rst
+++ b/user_guide_src/source/database/queries.rst
@@ -27,6 +27,9 @@ this::
 
     $query = $db->query('YOUR QUERY HERE');
 
+.. note:: If you are using OCI8 Driver, SQL statements should not end with a semi-colon (`;`).
+    PL/SQL statements should end with a semi-colon (`;`).
+
 Simplified Queries
 ==================
 

From a46d0bbd7a6b2a29ceb442e6c3a54934e22f8049 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sat, 15 Jan 2022 19:56:52 +0900
Subject: [PATCH 1411/2325] chore: vendor/bin/php-cs-fixer fix --verbose --ansi

---
 system/Database/OCI8/Builder.php | 12 ++++++------
 system/Database/OCI8/Forge.php   |  6 +++---
 system/Database/OCI8/Result.php  |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index e1d82be89fb5..ac64b7ba5ca7 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -76,7 +76,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
             $selectQueryValues = [];
 
             foreach ($values as $value) {
-                $selectValues = implode(',', array_map(static fn($value, $key) => $value . ' as ' . $key, explode(',', substr(substr($value, 1), 0, -1)), $keys));
+                $selectValues        = implode(',', array_map(static fn ($value, $key) => $value . ' as ' . $key, explode(',', substr(substr($value, 1), 0, -1)), $keys));
                 $selectQueryValues[] = 'SELECT ' . $selectValues . ' FROM DUAL';
             }
 
@@ -97,7 +97,7 @@ protected function _insertBatch(string $table, array $keys, array $values): stri
      */
     protected function _replace(string $table, array $keys, array $values): string
     {
-        $fieldNames = array_map(static fn($columnName) => trim($columnName, '"'), $keys);
+        $fieldNames = array_map(static fn ($columnName) => trim($columnName, '"'), $keys);
 
         $uniqueIndexes = array_filter($this->db->getIndexData($table), static function ($index) use ($fieldNames) {
             $hasAllFields = count(array_intersect($index->fields, $fieldNames)) === count($index->fields);
@@ -116,7 +116,7 @@ protected function _replace(string $table, array $keys, array $values): string
 
         $sql = 'MERGE INTO ' . $table . "\n USING (SELECT ";
 
-        $sql .= implode(', ', array_map(static fn($columnName, $value) => $value . ' ' . $columnName, $keys, $values));
+        $sql .= implode(', ', array_map(static fn ($columnName, $value) => $value . ' ' . $columnName, $keys, $values));
 
         $sql .= ' FROM DUAL) "_replace" ON ( ';
 
@@ -124,15 +124,15 @@ protected function _replace(string $table, array $keys, array $values): string
         $onList[] = '1 != 1';
 
         foreach ($uniqueIndexes as $index) {
-            $onList[] = '(' . implode(' AND ', array_map(static fn($columnName) => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
+            $onList[] = '(' . implode(' AND ', array_map(static fn ($columnName) => $table . '."' . $columnName . '" = "_replace"."' . $columnName . '"', $index->fields)) . ')';
         }
 
         $sql .= implode(' OR ', $onList) . ') WHEN MATCHED THEN UPDATE SET ';
 
-        $sql .= implode(', ', array_map(static fn($columnName) => $columnName . ' = "_replace".' . $columnName, $replaceableFields));
+        $sql .= implode(', ', array_map(static fn ($columnName) => $columnName . ' = "_replace".' . $columnName, $replaceableFields));
 
         $sql .= ' WHEN NOT MATCHED THEN INSERT (' . implode(', ', $replaceableFields) . ') VALUES ';
-        $sql .= ' (' . implode(', ', array_map(static fn($columnName) => '"_replace".' . $columnName, $replaceableFields)) . ')';
+        $sql .= ' (' . implode(', ', array_map(static fn ($columnName) => '"_replace".' . $columnName, $replaceableFields)) . ')';
 
         return $sql;
     }
diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index 02f9f23e1060..d5ca20a9e4d9 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -93,7 +93,7 @@ protected function _alterTable(string $alterType, string $table, $field)
         $sql = 'ALTER TABLE ' . $this->db->escapeIdentifiers($table);
 
         if ($alterType === 'DROP') {
-            $fields = array_map(fn($field) => $this->db->escapeIdentifiers(trim($field)), is_string($field) ? explode(',', $field) : $field);
+            $fields = array_map(fn ($field) => $this->db->escapeIdentifiers(trim($field)), is_string($field) ? explode(',', $field) : $field);
 
             return $sql . ' DROP (' . implode(',', $fields) . ') CASCADE CONSTRAINT INVALIDATE';
         }
@@ -228,7 +228,7 @@ protected function _attributeType(array &$attributes)
                 return;
 
             case 'DOUBLE':
-                $attributes['TYPE']       = 'FLOAT';
+                $attributes['TYPE'] = 'FLOAT';
                 $attributes['CONSTRAINT'] ??= 126;
 
                 return;
@@ -247,7 +247,7 @@ protected function _attributeType(array &$attributes)
             case 'TEXT':
             case 'MEDIUMTEXT':
                 $attributes['CONSTRAINT'] ??= 4000;
-                $attributes['TYPE']       = 'VARCHAR2';
+                $attributes['TYPE'] = 'VARCHAR2';
         }
     }
 
diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php
index c2aecc78b0e2..ce3a73def1c4 100644
--- a/system/Database/OCI8/Result.php
+++ b/system/Database/OCI8/Result.php
@@ -34,7 +34,7 @@ public function getFieldCount(): int
      */
     public function getFieldNames(): array
     {
-        return array_map(fn($fieldIndex) => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
+        return array_map(fn ($fieldIndex) => oci_field_name($this->resultID, $fieldIndex), range(1, $this->getFieldCount()));
     }
 
     /**
@@ -42,7 +42,7 @@ public function getFieldNames(): array
      */
     public function getFieldData(): array
     {
-        return array_map(fn($fieldIndex) => (object) [
+        return array_map(fn ($fieldIndex) => (object) [
             'name'       => oci_field_name($this->resultID, $fieldIndex),
             'type'       => oci_field_type($this->resultID, $fieldIndex),
             'max_length' => oci_field_size($this->resultID, $fieldIndex),

From 7f09031261bbae05d1bb1a9c7cc81ea4839bbdb7 Mon Sep 17 00:00:00 2001
From: ytetsuro <phper.0o0@gmail.com>
Date: Sat, 15 Jan 2022 20:00:54 +0900
Subject: [PATCH 1412/2325] docs: Fixed the incomprehensible changelog.

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 24b85b255402..94024f4192f8 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -27,7 +27,7 @@ Enhancements
 - Added Subqueries in the FROM section. See :ref:`query-builder-from-subquery`.
 - Added Validation Strict Rules. See :ref:`validation-traditional-and-strict-rules`.
 - Added new OCI8 driver for database.
-    - You to access Oracle Database. They support SQL and PL/SQL statements.
+    - It can access Oracle Database and supports SQL and PL/SQL statements.
 
 Changes
 *******

From 870bd271aae8782aa4effb359390fb71152fc65f Mon Sep 17 00:00:00 2001
From: ytetsuro <phper.0o0@gmail.com>
Date: Sun, 16 Jan 2022 08:55:14 +0900
Subject: [PATCH 1413/2325] docs: add backquote.

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 user_guide_src/source/database/queries.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/database/queries.rst b/user_guide_src/source/database/queries.rst
index 50bb0325fa11..b78cc1907b4c 100644
--- a/user_guide_src/source/database/queries.rst
+++ b/user_guide_src/source/database/queries.rst
@@ -27,8 +27,8 @@ this::
 
     $query = $db->query('YOUR QUERY HERE');
 
-.. note:: If you are using OCI8 Driver, SQL statements should not end with a semi-colon (`;`).
-    PL/SQL statements should end with a semi-colon (`;`).
+.. note:: If you are using OCI8 Driver, SQL statements should not end with a semi-colon (``;``).
+    PL/SQL statements should end with a semi-colon (``;``).
 
 Simplified Queries
 ==================

From b01f918d7f2517e80d7f93bb32cb60111dc2d072 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 16 Jan 2022 12:02:44 +0900
Subject: [PATCH 1414/2325] refactor: Removed unnecessary processes.

---
 system/Database/OCI8/Connection.php | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 88071404059f..5d2059bba3ea 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -497,18 +497,11 @@ public function storedProcedure(string $procedureName, array $params)
         }
 
         // Build the query string
-        $sql = 'BEGIN ' . $procedureName . '(';
-
-        $haveCursor = false;
-
-        foreach ($params as $param) {
-            $sql .= $param['name'] . ',';
-
-            if (isset($param['type']) && $param['type'] === OCI_B_CURSOR) {
-                $haveCursor = true;
-            }
-        }
-        $sql = trim($sql, ',') . '); END;';
+        $sql = sprintf(
+            'BEGIN %s (' . substr(str_repeat(',%s', count($params)), 1) . '); END;',
+            $procedureName,
+            ...array_map(static fn ($row) => $row['name'], $params)
+        );
 
         $this->resetStmtId = false;
         $this->stmtId      = oci_parse($this->connID, $sql);

From 5feae180497e568ddaf5b042e5dc66f5df179361 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 23 Jan 2022 15:22:47 +0900
Subject: [PATCH 1415/2325] docs: fix phpdoc for storedProcedure

---
 system/Database/OCI8/Connection.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 5d2059bba3ea..c470b599433d 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -478,17 +478,16 @@ public function getCursor()
      * Executes a stored procedure
      *
      * @param string $procedureName procedure name to execute
-     *
-     * @return mixed
-     *
-     * params array keys
-     *
+     * @param array $params params array keys
      * KEY      OPTIONAL  NOTES
      * name     no        the name of the parameter should be in :<param_name> format
      * value    no        the value of the parameter.  If this is an OUT or IN OUT parameter,
      *                    this should be a reference to a variable
      * type     yes       the type of the parameter
      * length   yes       the max size of the parameter
+     *
+     * @return Result|bool|CodeIgniter\Database\Query
+     *
      */
     public function storedProcedure(string $procedureName, array $params)
     {

From 5c1cda1114326f62c8978175baf5cacc7d266c0b Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 23 Jan 2022 16:01:28 +0900
Subject: [PATCH 1416/2325] test: add call stored procedure test for cursor.

---
 .../20160428212500_Create_test_tables.php     |  2 ++
 .../Live/OCI8/CallStoredProcedureTest.php     | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
index 26419f89adae..e802dcedc9be 100644
--- a/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
+++ b/tests/_support/Database/Migrations/20160428212500_Create_test_tables.php
@@ -156,6 +156,7 @@ public function up()
             $this->db->query('CREATE OR REPLACE PACKAGE calculator AS PROCEDURE plus(left IN NUMBER, right IN NUMBER, result OUT NUMBER); END;');
             $this->db->query('CREATE OR REPLACE PACKAGE BODY calculator AS PROCEDURE plus(left IN NUMBER, right IN NUMBER, result OUT NUMBER) IS BEGIN result := left + right; END plus; END calculator;');
             $this->db->query('CREATE OR REPLACE PROCEDURE plus(left IN NUMBER, right IN NUMBER, output OUT NUMBER) IS BEGIN output := left  + right; END;');
+            $this->db->query('CREATE OR REPLACE PROCEDURE one(cursor OUT SYS_REFCURSOR) IS BEGIN open cursor for select 1 AS ONE from DUAL; END;');
         }
     }
 
@@ -176,6 +177,7 @@ public function down()
         }
 
         if ($this->db->DBDriver === 'OCI8') {
+            $this->db->query('DROP PROCEDURE one');
             $this->db->query('DROP PROCEDURE plus');
             $this->db->query('DROP PACKAGE BODY calculator');
         }
diff --git a/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php b/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php
index 3f5089ff48a2..b142f5f4588d 100644
--- a/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php
+++ b/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php
@@ -79,4 +79,23 @@ public function testCallStoredProcedure()
 
         $this->assertSame($result, '7');
     }
+
+    public function testCallStoredProcedureForCursor()
+    {
+        $result = $this->db->getCursor();
+
+        $this->db->storedProcedure('one', [
+            [
+                'name'  => ':cursor',
+                'type' => OCI_B_CURSOR,
+                'value' => &$result,
+            ],
+
+        ]);
+
+        oci_execute($result);
+        $row = oci_fetch_array($result, OCI_ASSOC+OCI_RETURN_NULLS);
+
+        $this->assertSame($row, ['ONE' => '1']);
+    }
 }

From c1bbee8c77671583cc5ed349c04f90abeccb8d9f Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 23 Jan 2022 16:02:46 +0900
Subject: [PATCH 1417/2325] feat: add getDriverFunctionPrefix for oci8

---
 system/Database/OCI8/Connection.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index c470b599433d..8f312766fb91 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -709,4 +709,12 @@ public function getDatabase(): string
 
         return $this->query('SELECT DEFAULT_TABLESPACE FROM USER_USERS')->getRow()->DEFAULT_TABLESPACE ?? '';
     }
+
+    /**
+     * Get the prefix of the function to access the DB.
+     */
+    protected function getDriverFunctionPrefix(): string
+    {
+        return 'oci_';
+    }
 }

From fb1fb0001954f3f20cc605be6a119f82e784f3c9 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 23 Jan 2022 16:05:23 +0900
Subject: [PATCH 1418/2325] docs: remove unnecessary notes in Oracle for random
 sort.

---
 user_guide_src/source/database/query_builder.rst | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index d21896e3c251..e4283cf52f67 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -779,9 +779,6 @@ be ignored, unless you specify a numeric seed value.
     $builder->orderBy(42, 'RANDOM');
     // Produces: ORDER BY RAND(42)
 
-.. note:: Random ordering is not currently supported in Oracle and
-    will default to ASC instead.
-
 ****************************
 Limiting or Counting Results
 ****************************

From af2654bd6670a1656484ab3d479864ec4a10b8a0 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 23 Jan 2022 17:33:08 +0900
Subject: [PATCH 1419/2325] docs: fix return type for storedProcedure method.

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

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index 8f312766fb91..ca7280c82d75 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -486,7 +486,7 @@ public function getCursor()
      * type     yes       the type of the parameter
      * length   yes       the max size of the parameter
      *
-     * @return Result|bool|CodeIgniter\Database\Query
+     * @return Result|bool|\CodeIgniter\Database\Query
      *
      */
     public function storedProcedure(string $procedureName, array $params)

From 76c1029414ea8d8e5601fa9ec895553fae976d40 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Sun, 23 Jan 2022 18:52:54 +0900
Subject: [PATCH 1420/2325] chore: composer cs-fix && ./vendor/bin/rector
 process system/Database/OCI8/Connection.php

---
 system/Database/OCI8/Connection.php           | 20 +++++++++----------
 .../Live/OCI8/CallStoredProcedureTest.php     |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index ca7280c82d75..e1e4ede00779 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Database\OCI8;
 
+use CodeIgniter\Database\Query;
 use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Database\ConnectionInterface;
 use CodeIgniter\Database\Exceptions\DatabaseException;
@@ -478,16 +479,15 @@ public function getCursor()
      * Executes a stored procedure
      *
      * @param string $procedureName procedure name to execute
-     * @param array $params params array keys
-     * KEY      OPTIONAL  NOTES
-     * name     no        the name of the parameter should be in :<param_name> format
-     * value    no        the value of the parameter.  If this is an OUT or IN OUT parameter,
-     *                    this should be a reference to a variable
-     * type     yes       the type of the parameter
-     * length   yes       the max size of the parameter
-     *
-     * @return Result|bool|\CodeIgniter\Database\Query
-     *
+     * @param array  $params        params array keys
+     *                              KEY      OPTIONAL  NOTES
+     *                              name     no        the name of the parameter should be in :<param_name> format
+     *                              value    no        the value of the parameter.  If this is an OUT or IN OUT parameter,
+     *                              this should be a reference to a variable
+     *                              type     yes       the type of the parameter
+     *                              length   yes       the max size of the parameter
+     *
+     * @return bool|Query|Result
      */
     public function storedProcedure(string $procedureName, array $params)
     {
diff --git a/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php b/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php
index b142f5f4588d..3b85fd068d36 100644
--- a/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php
+++ b/tests/system/Database/Live/OCI8/CallStoredProcedureTest.php
@@ -87,14 +87,14 @@ public function testCallStoredProcedureForCursor()
         $this->db->storedProcedure('one', [
             [
                 'name'  => ':cursor',
-                'type' => OCI_B_CURSOR,
+                'type'  => OCI_B_CURSOR,
                 'value' => &$result,
             ],
 
         ]);
 
         oci_execute($result);
-        $row = oci_fetch_array($result, OCI_ASSOC+OCI_RETURN_NULLS);
+        $row = oci_fetch_array($result, OCI_ASSOC + OCI_RETURN_NULLS);
 
         $this->assertSame($row, ['ONE' => '1']);
     }

From 23878a06813258495199aeb2771419dff9eb2d80 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sun, 23 Jan 2022 20:34:00 +0800
Subject: [PATCH 1421/2325] Refactor `if_exist` validation with dot notation

---
 system/Validation/Validation.php | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 1060527cb689..2ebe361fa5c8 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -197,19 +197,17 @@ protected function processRules(string $field, ?string $label, $value, $rules =
             $ifExistField  = $field;
 
             if (strpos($field, '.*') !== false) {
-                // We'll change the dot notation into a PCRE pattern
-                // that can be used later
-                $ifExistField = str_replace('\.\*', '\.(?:[^\.]+)', preg_quote($field, '/'));
-
-                $dataIsExisting = array_reduce(
-                    array_keys($flattenedData),
-                    static function ($carry, $item) use ($ifExistField) {
-                        $pattern = sprintf('/%s/u', $ifExistField);
-
-                        return $carry || preg_match($pattern, $item) === 1;
-                    },
-                    false
-                );
+                // We'll change the dot notation into a PCRE pattern that can be used later
+                $ifExistField   = str_replace('\.\*', '\.(?:[^\.]+)', preg_quote($field, '/'));
+                $dataIsExisting = false;
+                $pattern        = sprintf('/%s/u', $ifExistField);
+
+                foreach (array_keys($flattenedData) as $item) {
+                    if (preg_match($pattern, $item) === 1) {
+                        $dataIsExisting = true;
+                        break;
+                    }
+                }
             } else {
                 $dataIsExisting = array_key_exists($ifExistField, $flattenedData);
             }

From 27892f2d15dd84b6eaddc633138f454b7d1cbc2c Mon Sep 17 00:00:00 2001
From: fdomgjoni99 <89722818+fdomgjoni99@users.noreply.github.com>
Date: Sun, 23 Jan 2022 17:37:37 +0100
Subject: [PATCH 1422/2325] fix small typo

Replace 'they' with 'the'
---
 user_guide_src/source/libraries/throttler.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/throttler.rst b/user_guide_src/source/libraries/throttler.rst
index bc13c16fc321..463efcbec9a4 100644
--- a/user_guide_src/source/libraries/throttler.rst
+++ b/user_guide_src/source/libraries/throttler.rst
@@ -32,7 +32,7 @@ more readable. This says that the bucket allows 60 actions every minute, or 1 ac
 
 Let's say that a third-party script was trying to hit a URL repeatedly. At first, it would be able to use all 60
 of those tokens in less than a second. However, after that the Throttler would only allow one action per second,
-potentially slowing down the requests enough that they attack is no longer worth it.
+potentially slowing down the requests enough that the attack is no longer worth it.
 
 .. note:: For the Throttler class to work, the Cache library must be set up to use a handler other than dummy.
             For best performance, an in-memory cache, like Redis or Memcached, is recommended.

From 2780bf47862da6186a844d9a9bf28d7b56ab3ecc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 24 Jan 2022 10:12:29 +0900
Subject: [PATCH 1423/2325] docs: @deprecated
 Database\SQLSRV\Connection::getError()

This method is a duplicate of error().
---
 system/Database/SQLSRV/Connection.php       | 2 ++
 user_guide_src/source/changelogs/v4.2.0.rst | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index ee27f038f817..acbada4e6c0a 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -465,6 +465,8 @@ protected function execute(string $sql)
      * Returns the last error encountered by this connection.
      *
      * @return mixed
+     *
+     * @deprecated Use `error()` instead.
      */
     public function getError()
     {
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 98d14b6e9197..84e7abb2457c 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -36,7 +36,7 @@ Changes
 Deprecations
 ************
 
-
+- ``CodeIgniter\Database\SQLSRV\Connection::getError()`` is deprecated. Use ``CodeIgniter\Database\SQLSRV\Connection::error()`` instead.
 
 Bugs Fixed
 **********

From 434a3fbb9898b0a6f1013ff1429eec4817227239 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 24 Jan 2022 10:14:31 +0900
Subject: [PATCH 1424/2325] docs: add @return

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

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index c3761322aa84..a0f753f9fd8b 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -1526,7 +1526,7 @@ public function isWriteType($sql): bool
      *
      * Must return an array with keys 'code' and 'message':
      *
-     *  return ['code' => null, 'message' => null);
+     * @return array{code: int|string|null, message: string|null}
      */
     abstract public function error(): array;
 

From 119b59a1c2aafa80f9b62c674114d9f3f2058757 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Mon, 24 Jan 2022 12:26:37 +0900
Subject: [PATCH 1425/2325] fix: Fixed to problem PLSQL will be treated as SQL
 when the first word is not `BEGIN`.

---
 system/Database/OCI8/PreparedQuery.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/system/Database/OCI8/PreparedQuery.php b/system/Database/OCI8/PreparedQuery.php
index e83e6f8f3a1f..311dacc4045f 100644
--- a/system/Database/OCI8/PreparedQuery.php
+++ b/system/Database/OCI8/PreparedQuery.php
@@ -46,11 +46,6 @@ class PreparedQuery extends BasePreparedQuery implements PreparedQueryInterface
      */
     public function _prepare(string $sql, array $options = [])
     {
-        $sql = rtrim($sql, ';');
-        if (strpos('BEGIN', ltrim($sql)) === 0) {
-            $sql .= ';';
-        }
-
         if (! $this->statement = oci_parse($this->db->connID, $this->parameterize($sql))) {
             $error             = oci_error($this->db->connID);
             $this->errorCode   = $error['code'] ?? 0;

From c7d1620ce8f53bae73e679ff7aec2674bd41c5c5 Mon Sep 17 00:00:00 2001
From: Tetsuro Yoshikawa <phper.0o0@gmail.com>
Date: Mon, 24 Jan 2022 12:54:17 +0900
Subject: [PATCH 1426/2325] style: composer cs-fix

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

diff --git a/system/Database/OCI8/Connection.php b/system/Database/OCI8/Connection.php
index e1e4ede00779..dc0b26f57c0e 100644
--- a/system/Database/OCI8/Connection.php
+++ b/system/Database/OCI8/Connection.php
@@ -11,10 +11,10 @@
 
 namespace CodeIgniter\Database\OCI8;
 
-use CodeIgniter\Database\Query;
 use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Database\ConnectionInterface;
 use CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Database\Query;
 use ErrorException;
 use stdClass;
 

From 2dd39684d6538ab1485e30b7259137649f408ba5 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Mon, 24 Jan 2022 14:42:47 +0000
Subject: [PATCH 1427/2325] Finalize release

---
 CHANGELOG.md                                   |  2 +-
 user_guide_src/source/changelogs/v4.1.8.rst    |  2 +-
 .../source/installation/upgrade_418.rst        | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 user_guide_src/source/installation/upgrade_418.rst

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db4113d55c60..8ecd4ae661e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [v4.1.8](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.8) (2022-01-XX)
+## [v4.1.8](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.8) (2022-01-24)
 
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.7...v4.1.8)
 
diff --git a/user_guide_src/source/changelogs/v4.1.8.rst b/user_guide_src/source/changelogs/v4.1.8.rst
index 4b2005f51c7a..2d6c7c8c0ea5 100644
--- a/user_guide_src/source/changelogs/v4.1.8.rst
+++ b/user_guide_src/source/changelogs/v4.1.8.rst
@@ -1,7 +1,7 @@
 Version 4.1.8
 #############
 
-Release Date: January XX, 2022
+Release Date: January 24, 2022
 
 **4.1.8 release of CodeIgniter4**
 
diff --git a/user_guide_src/source/installation/upgrade_418.rst b/user_guide_src/source/installation/upgrade_418.rst
new file mode 100644
index 000000000000..ee3973ba37bc
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_418.rst
@@ -0,0 +1,18 @@
+#############################
+Upgrading from 4.1.7 to 4.1.8
+#############################
+
+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
+
+Breaking Changes
+****************
+
+-  Due to a security issue in the ``API\ResponseTrait`` all trait methods are now scoped to ``protected``. See the `Security advisory` <https://github.com/codeigniter4/CodeIgniter4/security/advisories/GHSA-7528-7jg5-6g62>` for more information.

From c9cdce071756067ba33f964d5d2088d3954e84be Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 25 Jan 2022 10:02:39 +0900
Subject: [PATCH 1428/2325] docs: add missing upgrade_418

---
 user_guide_src/source/installation/upgrading.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index d142117ba7b9..911f5b836528 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -8,6 +8,7 @@ upgrading from.
 .. toctree::
     :titlesonly:
 
+    Upgrading from 4.1.7 to 4.1.8 <upgrade_418>
     Upgrading from 4.1.6 to 4.1.7 <upgrade_417>
     Upgrading from 4.1.5 to 4.1.6 <upgrade_416>
     Upgrading from 4.1.4 to 4.1.5 <upgrade_415>

From 427606428f9b5ff2fccd4f0ee5d42ec33e6be7de Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 25 Jan 2022 10:03:45 +0900
Subject: [PATCH 1429/2325] docs: move "Change Logs" up

"Change Logs" should be for all versions, but "Upgrading" may be absent
if there are no upgrade instructions.
---
 user_guide_src/source/installation/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/installation/index.rst b/user_guide_src/source/installation/index.rst
index c29bcd33857e..92fe78d38184 100644
--- a/user_guide_src/source/installation/index.rst
+++ b/user_guide_src/source/installation/index.rst
@@ -18,8 +18,8 @@ Which is right for you?
     installing_composer
     installing_manual
     running
-    upgrading
     ../changelogs/index
+    upgrading
     troubleshooting
     repositories
 

From 03dbe6383f2e4dcd5e788235cb1a5e706241a05e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 25 Jan 2022 09:50:35 +0900
Subject: [PATCH 1430/2325] chore: add about PHP Security Advisories Database

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

diff --git a/admin/RELEASE.md b/admin/RELEASE.md
index b145edaf0e3e..d6546f3eb6da 100644
--- a/admin/RELEASE.md
+++ b/admin/RELEASE.md
@@ -100,6 +100,13 @@ the User Guide repo to **public/userguide4** and browse to the website to make s
 * Make a new topic in the "News & Discussion" forums: https://forum.codeigniter.com/forum-2.html
 * The content is somewhat organic, but should include any major features and changes as well as a link to the User Guide's changelog
 
+## After Publishing Security Advisory
+
+* Send a PR to [PHP Security Advisories Database](https://github.com/FriendsOfPHP/security-advisories).
+    * E.g. https://github.com/FriendsOfPHP/security-advisories/pull/606
+    * See https://github.com/FriendsOfPHP/security-advisories#contributing
+    * Don't forget to run `php -d memory_limit=-1 validator.php`, before submitting the PR
+
 ## Appendix
 
 ### Sphinx Installation

From 71ca538a585d11136985bd8f54ed0a15181ee5c5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 25 Jan 2022 11:29:23 +0900
Subject: [PATCH 1431/2325] docs: add explanations

---
 user_guide_src/source/installation/upgrade_views.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_views.rst b/user_guide_src/source/installation/upgrade_views.rst
index 903ac6838be1..cdf8996f1504 100644
--- a/user_guide_src/source/installation/upgrade_views.rst
+++ b/user_guide_src/source/installation/upgrade_views.rst
@@ -16,15 +16,16 @@ What has been changed
 
 - Your views look much like before, but they are invoked differently … instead of CI3’s
   ``$this->load->view(x);``, you can use ``echo view(x);``.
-- CI4 supports view “cells”, to build your response in pieces.
+- CI4 supports *View Cells* to build your response in pieces, and *View Layouts* for page layout.
 - The template parser is still there, and substantially enhanced.
 
 Upgrade Guide
 =============
 
 1. First, move all views  to the folder **app/Views**
-2. Change the loading syntax of views in every script where you load views from
-   ``$this->load->view('directory_name/file_name')`` to ``echo view('directory_name/file_name');``
+2. Change the loading syntax of views in every script where you load views:
+    - from ``$this->load->view('directory_name/file_name')`` to ``echo view('directory_name/file_name');``
+    - from ``$content = $this->load->view('file', $data, TRUE);`` to ``$content = view('file', $data);``
 3. (optional) You can change the echo syntax in views from ``<?php echo $title; ?>`` to ``<?= $title ?>``
 
 Code Example

From 7540051d4335e068fa79e0a05d1468a084b227a5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 25 Jan 2022 11:32:16 +0900
Subject: [PATCH 1432/2325] docs: replace 3.11 with 3.x

The current version is 3.1.11, not 3.11.
---
 user_guide_src/source/installation/upgrade_configuration.rst | 2 +-
 user_guide_src/source/installation/upgrade_controllers.rst   | 2 +-
 user_guide_src/source/installation/upgrade_database.rst      | 2 +-
 user_guide_src/source/installation/upgrade_emails.rst        | 2 +-
 user_guide_src/source/installation/upgrade_encryption.rst    | 2 +-
 user_guide_src/source/installation/upgrade_file_upload.rst   | 2 +-
 user_guide_src/source/installation/upgrade_html_tables.rst   | 2 +-
 user_guide_src/source/installation/upgrade_localization.rst  | 2 +-
 user_guide_src/source/installation/upgrade_migrations.rst    | 2 +-
 user_guide_src/source/installation/upgrade_models.rst        | 2 +-
 user_guide_src/source/installation/upgrade_pagination.rst    | 2 +-
 user_guide_src/source/installation/upgrade_responses.rst     | 2 +-
 user_guide_src/source/installation/upgrade_routing.rst       | 2 +-
 user_guide_src/source/installation/upgrade_security.rst      | 2 +-
 user_guide_src/source/installation/upgrade_sessions.rst      | 2 +-
 user_guide_src/source/installation/upgrade_validations.rst   | 2 +-
 user_guide_src/source/installation/upgrade_view_parser.rst   | 2 +-
 user_guide_src/source/installation/upgrade_views.rst         | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_configuration.rst b/user_guide_src/source/installation/upgrade_configuration.rst
index 4592f2d1e001..fa168b2627ed 100644
--- a/user_guide_src/source/installation/upgrade_configuration.rst
+++ b/user_guide_src/source/installation/upgrade_configuration.rst
@@ -36,7 +36,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 
 Path: **application/config**::
diff --git a/user_guide_src/source/installation/upgrade_controllers.rst b/user_guide_src/source/installation/upgrade_controllers.rst
index 44999b0dc6ec..60d4e4bd3d2e 100644
--- a/user_guide_src/source/installation/upgrade_controllers.rst
+++ b/user_guide_src/source/installation/upgrade_controllers.rst
@@ -38,7 +38,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 
 Path: **application/controllers**::
diff --git a/user_guide_src/source/installation/upgrade_database.rst b/user_guide_src/source/installation/upgrade_database.rst
index 666a51e97716..7d41152ccad8 100644
--- a/user_guide_src/source/installation/upgrade_database.rst
+++ b/user_guide_src/source/installation/upgrade_database.rst
@@ -46,7 +46,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_emails.rst b/user_guide_src/source/installation/upgrade_emails.rst
index 0ce8b0792bc1..af5e532262aa 100644
--- a/user_guide_src/source/installation/upgrade_emails.rst
+++ b/user_guide_src/source/installation/upgrade_emails.rst
@@ -27,7 +27,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_encryption.rst b/user_guide_src/source/installation/upgrade_encryption.rst
index 04c857ba8f4e..d9a29af62650 100644
--- a/user_guide_src/source/installation/upgrade_encryption.rst
+++ b/user_guide_src/source/installation/upgrade_encryption.rst
@@ -25,7 +25,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_file_upload.rst b/user_guide_src/source/installation/upgrade_file_upload.rst
index 6ad3c533a03a..a3e83cbce9e9 100644
--- a/user_guide_src/source/installation/upgrade_file_upload.rst
+++ b/user_guide_src/source/installation/upgrade_file_upload.rst
@@ -25,7 +25,7 @@ You have to change your file uploading code to match the new methods.
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_html_tables.rst b/user_guide_src/source/installation/upgrade_html_tables.rst
index 715d80660876..1fb70790ccbc 100644
--- a/user_guide_src/source/installation/upgrade_html_tables.rst
+++ b/user_guide_src/source/installation/upgrade_html_tables.rst
@@ -26,7 +26,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_localization.rst b/user_guide_src/source/installation/upgrade_localization.rst
index cde7f81c0e31..8362b711aa3f 100644
--- a/user_guide_src/source/installation/upgrade_localization.rst
+++ b/user_guide_src/source/installation/upgrade_localization.rst
@@ -31,7 +31,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_migrations.rst b/user_guide_src/source/installation/upgrade_migrations.rst
index 90e1999e29f6..cf9b7c951511 100644
--- a/user_guide_src/source/installation/upgrade_migrations.rst
+++ b/user_guide_src/source/installation/upgrade_migrations.rst
@@ -48,7 +48,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 
 Path: **application/migrations**::
diff --git a/user_guide_src/source/installation/upgrade_models.rst b/user_guide_src/source/installation/upgrade_models.rst
index b76bc10d67d5..dce4dd31377a 100644
--- a/user_guide_src/source/installation/upgrade_models.rst
+++ b/user_guide_src/source/installation/upgrade_models.rst
@@ -38,7 +38,7 @@ You can find more information to those methods :doc:`here </models/model>`.
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 
 Path: **application/models**::
diff --git a/user_guide_src/source/installation/upgrade_pagination.rst b/user_guide_src/source/installation/upgrade_pagination.rst
index f952da0c5074..99ba213547f0 100644
--- a/user_guide_src/source/installation/upgrade_pagination.rst
+++ b/user_guide_src/source/installation/upgrade_pagination.rst
@@ -34,7 +34,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_responses.rst b/user_guide_src/source/installation/upgrade_responses.rst
index 2f87f9ec50ef..4518836371c9 100644
--- a/user_guide_src/source/installation/upgrade_responses.rst
+++ b/user_guide_src/source/installation/upgrade_responses.rst
@@ -23,7 +23,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_routing.rst b/user_guide_src/source/installation/upgrade_routing.rst
index 1d2540b2ded1..b3fe276d6fcc 100644
--- a/user_guide_src/source/installation/upgrade_routing.rst
+++ b/user_guide_src/source/installation/upgrade_routing.rst
@@ -28,7 +28,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 Path: **application/config/routes.php**::
 
diff --git a/user_guide_src/source/installation/upgrade_security.rst b/user_guide_src/source/installation/upgrade_security.rst
index 18b61209ec1b..ad1fc80e945b 100644
--- a/user_guide_src/source/installation/upgrade_security.rst
+++ b/user_guide_src/source/installation/upgrade_security.rst
@@ -36,7 +36,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_sessions.rst b/user_guide_src/source/installation/upgrade_sessions.rst
index e935b08cfd16..6785907ba061 100644
--- a/user_guide_src/source/installation/upgrade_sessions.rst
+++ b/user_guide_src/source/installation/upgrade_sessions.rst
@@ -30,7 +30,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
index 825b8be9ccdf..6b88ade7ef3c 100644
--- a/user_guide_src/source/installation/upgrade_validations.rst
+++ b/user_guide_src/source/installation/upgrade_validations.rst
@@ -44,7 +44,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 Path: **application/views**::
 
diff --git a/user_guide_src/source/installation/upgrade_view_parser.rst b/user_guide_src/source/installation/upgrade_view_parser.rst
index a970a5ab5e88..b2c57adbf0e6 100644
--- a/user_guide_src/source/installation/upgrade_view_parser.rst
+++ b/user_guide_src/source/installation/upgrade_view_parser.rst
@@ -26,7 +26,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 ::
 
diff --git a/user_guide_src/source/installation/upgrade_views.rst b/user_guide_src/source/installation/upgrade_views.rst
index cdf8996f1504..0aef96b113e8 100644
--- a/user_guide_src/source/installation/upgrade_views.rst
+++ b/user_guide_src/source/installation/upgrade_views.rst
@@ -31,7 +31,7 @@ Upgrade Guide
 Code Example
 ============
 
-CodeIgniter Version 3.11
+CodeIgniter Version 3.x
 ------------------------
 
 Path: **application/views**::

From c4d67393ac8d1d5f4b43b843f4a85ae8f8d4053c Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Tue, 25 Jan 2022 04:29:17 +0100
Subject: [PATCH 1433/2325] Allow calling getQuery() multiple times, and other
 improvements

---
 system/Database/Query.php               |  39 ++++--
 tests/system/Database/BaseQueryTest.php | 158 +++++++++++++++++++++++-
 2 files changed, 183 insertions(+), 14 deletions(-)

diff --git a/system/Database/Query.php b/system/Database/Query.php
index 91b98c77d2ef..c89112088485 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -23,10 +23,17 @@ class Query implements QueryInterface
      */
     protected $originalQueryString;
 
+    /**
+     * The query string if table prefix has been swapped.
+     *
+     * @var string|null
+     */
+    protected $swappedQueryString;
+
     /**
      * The final query string after binding, etc.
      *
-     * @var string
+     * @var string|null
      */
     protected $finalQueryString;
 
@@ -99,6 +106,7 @@ public function __construct(ConnectionInterface &$db)
     public function setQuery(string $sql, $binds = null, bool $setEscape = true)
     {
         $this->originalQueryString = $sql;
+        unset($this->swappedQueryString);
 
         if ($binds !== null) {
             if (! is_array($binds)) {
@@ -116,6 +124,8 @@ public function setQuery(string $sql, $binds = null, bool $setEscape = true)
             $this->binds = $binds;
         }
 
+        unset($this->finalQueryString);
+
         return $this;
     }
 
@@ -134,6 +144,8 @@ public function setBinds(array $binds, bool $setEscape = true)
 
         $this->binds = $binds;
 
+        unset($this->finalQueryString);
+
         return $this;
     }
 
@@ -144,11 +156,9 @@ public function setBinds(array $binds, bool $setEscape = true)
     public function getQuery(): string
     {
         if (empty($this->finalQueryString)) {
-            $this->finalQueryString = $this->originalQueryString;
+            $this->compileBinds();
         }
 
-        $this->compileBinds();
-
         return $this->finalQueryString;
     }
 
@@ -251,9 +261,14 @@ public function isWriteType(): bool
      */
     public function swapPrefix(string $orig, string $swap)
     {
-        $sql = empty($this->finalQueryString) ? $this->originalQueryString : $this->finalQueryString;
+        $sql = $this->swappedQueryString ?? $this->originalQueryString;
+
+        $from = '/(\W)' . $orig . '(\S+?)/';
+        $to   = '\\1' . $swap . '\\2';
 
-        $this->finalQueryString = preg_replace('/(\W)' . $orig . '(\S+?)/', '\\1' . $swap . '\\2', $sql);
+        $this->swappedQueryString = preg_replace($from, $to, $sql);
+
+        unset($this->finalQueryString);
 
         return $this;
     }
@@ -267,16 +282,18 @@ public function getOriginalQuery(): string
     }
 
     /**
-     * Escapes and inserts any binds into the finalQueryString object.
+     * Escapes and inserts any binds into the finalQueryString property.
      *
      * @see https://regex101.com/r/EUEhay/5
      */
     protected function compileBinds()
     {
-        $sql   = $this->finalQueryString;
+        $sql   = $this->swappedQueryString ?? $this->originalQueryString;
         $binds = $this->binds;
 
         if (empty($binds)) {
+            $this->finalQueryString = $sql;
+
             return;
         }
 
@@ -391,11 +408,7 @@ public function debugToolbarDisplay(): string
             'WHERE',
         ];
 
-        if (empty($this->finalQueryString)) {
-            $this->compileBinds(); // @codeCoverageIgnore
-        }
-
-        $sql = esc($this->finalQueryString);
+        $sql = esc($this->getQuery());
 
         /**
          * @see https://stackoverflow.com/a/20767160
diff --git a/tests/system/Database/BaseQueryTest.php b/tests/system/Database/BaseQueryTest.php
index b011732d8e8d..d3de455c8964 100644
--- a/tests/system/Database/BaseQueryTest.php
+++ b/tests/system/Database/BaseQueryTest.php
@@ -420,6 +420,163 @@ public function testSetQueryBinds()
         $this->assertSame($expected, $query->getQuery());
     }
 
+    public function testGetQueryMultipleTimes()
+    {
+        $query = new Query($this->db);
+
+        $query->setQuery('SELECT * FROM users WHERE name = :name:', ['name' => 'placeholder :name: in value']);
+
+        $expected = "SELECT * FROM users WHERE name = 'placeholder :name: in value'";
+
+        // Triggers compileBinds()
+        $query->getQuery();
+
+        $this->assertSame($expected, $query->getQuery());
+    }
+
+    public function testSetBindsMultipleTimes()
+    {
+        $query = new Query($this->db);
+
+        $query->setQuery('SELECT * FROM users WHERE name = :name:', ['name' => 'John']);
+
+        // Triggers compileBinds()
+        $query->getQuery();
+
+        $query->setBinds(['name' => 'Jane']);
+
+        $expected = "SELECT * FROM users WHERE name = 'Jane'";
+
+        $this->assertSame($expected, $query->getQuery());
+    }
+
+    public function testSetQueryMultipleTimesKeepingBinds()
+    {
+        $query = new Query($this->db);
+
+        $query->setQuery('SELECT * FROM users WHERE name = :name:', ['name' => 'John']);
+
+        // Triggers compileBinds()
+        $query->getQuery();
+
+        $query->setQuery('SELECT * FROM users WHERE name = :name: OR id = 1');
+
+        $expected = "SELECT * FROM users WHERE name = 'John' OR id = 1";
+
+        $this->assertSame($expected, $query->getQuery());
+    }
+
+    public function testSetQueryMultipleTimesReplacingBinds()
+    {
+        $query = new Query($this->db);
+
+        $query->setQuery('SELECT * FROM users WHERE name = :name:', ['name' => 'John']);
+
+        // Triggers compileBinds()
+        $query->getQuery();
+
+        $query->setQuery('SELECT * FROM users WHERE name = :name: OR id = 1', ['name' => 'Jane']);
+
+        $expected = "SELECT * FROM users WHERE name = 'Jane' OR id = 1";
+
+        $this->assertSame($expected, $query->getQuery());
+    }
+
+    public function testSetQueryMultipleTimesRemovingBinds()
+    {
+        $query = new Query($this->db);
+
+        $query->setQuery('SELECT * FROM users WHERE name = :name:', ['name' => 'John']);
+
+        // Triggers compileBinds()
+        $query->getQuery();
+
+        $query->setQuery('SELECT * FROM users WHERE name = :name: OR id = 1', []);
+
+        $expected = 'SELECT * FROM users WHERE name = :name: OR id = 1';
+
+        $this->assertSame($expected, $query->getQuery());
+    }
+
+    public function testSwapPrefixMultipleTimes()
+    {
+        $query = new Query($this->db);
+
+        $origPrefix = 'db_';
+        $newPrefix1 = 'ci_';
+        $newPrefix2 = 'zz_';
+
+        $origSQL = 'SELECT * FROM db_users WHERE db_users.id = 1';
+        $newSQL  = 'SELECT * FROM zz_users WHERE zz_users.id = 1';
+
+        $query->setQuery($origSQL);
+        $query->swapPrefix($origPrefix, $newPrefix1);
+        $query->swapPrefix($newPrefix1, $newPrefix2);
+
+        $this->assertSame($newSQL, $query->getQuery());
+    }
+
+    public function testSwapPrefixBeforeSetBinds()
+    {
+        $query = new Query($this->db);
+
+        $origSQL = 'SELECT * FROM db_users WHERE db_users.name = ?';
+        $newSQL  = "SELECT * FROM ci_users WHERE ci_users.name = 'John'";
+
+        $query->setQuery($origSQL);
+
+        $query->swapPrefix('db_', 'ci_');
+        $query->setBinds(['John']);
+
+        $this->assertSame($newSQL, $query->getQuery());
+    }
+
+    public function testSwapPrefixAfterSetBinds()
+    {
+        $query = new Query($this->db);
+
+        $origSQL = 'SELECT * FROM db_users WHERE db_users.name = ?';
+        $newSQL  = "SELECT * FROM ci_users WHERE ci_users.name = 'John'";
+
+        $query->setQuery($origSQL);
+
+        $query->setBinds(['John']);
+        $query->swapPrefix('db_', 'ci_');
+
+        $this->assertSame($newSQL, $query->getQuery());
+    }
+
+    public function testSwapPrefixIsAppliedBeforeBinds()
+    {
+        $query = new Query($this->db);
+
+        $origSQL = 'SELECT * FROM db_users WHERE db_users.name = ?';
+        $newSQL  = "SELECT * FROM ci_users WHERE ci_users.name = 'John db_foobar John'";
+
+        $query->setQuery($origSQL);
+
+        $query->setBinds(['John db_foobar John']);
+        $query->swapPrefix('db_', 'ci_');
+
+        $this->assertSame($newSQL, $query->getQuery());
+    }
+
+    public function testSwapPrefixAfterGetQuery()
+    {
+        $query = new Query($this->db);
+
+        $query->setQuery('SELECT * FROM db_users WHERE db_users.id = 1');
+
+        // Triggers compileBinds()
+        $query->getQuery();
+
+        $query->swapPrefix('db_', 'ci_');
+
+        $expected = 'SELECT * FROM ci_users WHERE ci_users.id = 1';
+
+        $this->assertSame($expected, $query->getQuery());
+    }
+
     public function queryKeywords()
     {
         return [
@@ -448,7 +605,6 @@ public function testHighlightQueryKeywords($expected, $sql)
     {
         $query = new Query($this->db);
         $query->setQuery($sql);
-        $query->getQuery();
 
         $this->assertSame($expected, $query->debugToolbarDisplay());
     }

From ea3a8acb93238b07ff9cc9d9e47f66f9698c0086 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Tue, 25 Jan 2022 04:29:25 +0100
Subject: [PATCH 1434/2325] Micro-optimization: No need to capture the next
 characters

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

diff --git a/system/Database/Query.php b/system/Database/Query.php
index c89112088485..f79d960c0bd2 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -263,7 +263,7 @@ public function swapPrefix(string $orig, string $swap)
     {
         $sql = $this->swappedQueryString ?? $this->originalQueryString;
 
-        $from = '/(\W)' . $orig . '(\S+?)/';
+        $from = '/(\W)' . $orig . '(\S)/';
         $to   = '\\1' . $swap . '\\2';
 
         $this->swappedQueryString = preg_replace($from, $to, $sql);

From 9ffce9537243fc7e1c6b3abdfe68c706c2dab345 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 26 Jan 2022 11:12:43 +0900
Subject: [PATCH 1435/2325] docs: make link to the section

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

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 516028d8c04d..ff083da52c4d 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -199,7 +199,7 @@ see the “Hello World” message.
 
 .. note:: The line ``$routes->get('/', 'Home::index');`` is an optimization that you will want to use in a "real-world" app. But for demonstration purposes we don't want to use that feature. ``$routes->get()`` is explained in :doc:`URI Routing <routing>`
 
-For more information, please refer to the "Routes Configuration Options" section of the
+For more information, please refer to the :ref:`routes-configuration-options` section of the
 :doc:`URI Routing <routing>` documentation.
 
 Remapping Method Calls
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 3199e4fc6256..44c9cbe9135c 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -495,6 +495,7 @@ To disable this functionality, you must call the method with the parameter ``fal
 .. note:: By default, all routes have a priority of 0.
     Negative integers will be cast to the absolute value.
 
+.. _routes-configuration-options:
 
 Routes Configuration Options
 ============================

From e109198d1bf7cd0ec1de1fe0db7ed13cb267773f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 26 Jan 2022 11:14:22 +0900
Subject: [PATCH 1436/2325] docs: change the note to normal text

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

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index ff083da52c4d..406225db280a 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -276,14 +276,15 @@ one and place your controller classes within them.
 
 .. important:: Folder names MUST start with an uppercase letter and ONLY the first character can be uppercase.
 
-.. note:: When using this feature the first segment of your URI must
-    specify the folder. For example, let's say you have a controller located here::
+When using this feature the first segment of your URI must
+specify the folder. For example, let's say you have a controller located here::
 
-        app/Controllers/Products/Shoes.php
+    app/Controllers/Products/Shoes.php
 
-    To call the above controller your URI will look something like this::
+To call the above controller your URI will look something like this::
+
+    example.com/index.php/products/shoes/show/123
 
-        example.com/index.php/products/shoes/show/123
 
 Each of your sub-directories may contain a default controller which will be
 called if the URL contains *only* the sub-directory. Simply put a controller

From 1c10e523657d52265c97c93f2043d46f8cb526e0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 26 Jan 2022 11:15:57 +0900
Subject: [PATCH 1437/2325] docs: add note about directory with the same name

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

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 406225db280a..5ad26ffb17e4 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -285,6 +285,9 @@ To call the above controller your URI will look something like this::
 
     example.com/index.php/products/shoes/show/123
 
+.. note:: You cannot have directories with the same name in **app/Controllers/** and **public/**.
+    This is because if there is a directory, the web server will search for it and
+    it will not be routed to CodeIgniter.
 
 Each of your sub-directories may contain a default controller which will be
 called if the URL contains *only* the sub-directory. Simply put a controller

From d5edaacbb299f7941770137718dfb9044c942a18 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 26 Jan 2022 11:16:44 +0900
Subject: [PATCH 1438/2325] docs: fix sample code

The namespace not starting with '\' will be prefixed with the default namespace.
---
 user_guide_src/source/incoming/controllers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 5ad26ffb17e4..63b51980139d 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -108,7 +108,7 @@ class so that it can inherit all its methods.
 
         \<NamespaceName>(\<SubNamespaceNames>)*\<ClassName>
 
-        $routes->get('helloworld', 'App\Controllers\HelloWorld::index');
+        $routes->get('helloworld', '\App\Controllers\HelloWorld::index');
 
 Methods
 =======

From 9312daa92db2bd42b3bda0331f5245d005b30526 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 26 Jan 2022 11:19:28 +0900
Subject: [PATCH 1439/2325] docs: change text decoration, or fix small typos

---
 .../source/incoming/controllers.rst           | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 63b51980139d..67d9ed572bef 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -18,21 +18,21 @@ Consider this URI::
 
     example.com/index.php/helloworld/
 
-In the above example, CodeIgniter would attempt to find a controller named Helloworld.php and load it.
+In the above example, CodeIgniter would attempt to find a controller named **Helloworld.php** and load it.
 
 **When a controller's name matches the first segment of a URI, it will be loaded.**
 
 Let's try it: Hello World!
 ==========================
 
-Let's create a simple controller so you can see it in action. Using your text editor, create a file called Helloworld.php,
-and put the following code in it. You will notice that the Helloworld Controller is extending the BaseController. you can
-also extend the CodeIgniter\\Controller if you do not need the functionality of the BaseController.
+Let's create a simple controller so you can see it in action. Using your text editor, create a file called **Helloworld.php**,
+and put the following code in it. You will notice that the ``Helloworld`` Controller is extending the ``BaseController``. you can
+also extend the ``CodeIgniter\Controller`` if you do not need the functionality of the BaseController.
 
 The BaseController provides a convenient place for loading components and performing functions that are needed by all your
 controllers. You can extend this class in any new controller.
 
-For security reasons be sure to declare any new utility methods as protected or private.::
+For security reasons be sure to declare any new utility methods as ``protected`` or ``private``.::
 
     <?php
 
@@ -48,7 +48,7 @@ For security reasons be sure to declare any new utility methods as protected or
 
 Then save the file to your **/app/Controllers/** directory.
 
-.. important:: The file must be called 'Helloworld.php', with a capital 'H'.
+.. important:: The file must be called **Helloworld.php**, with a capital ``H``.
 
 Now visit your site using a URL similar to this::
 
@@ -66,7 +66,6 @@ This is valid::
 
     namespace App\Controllers;
 
-
     class Helloworld extends BaseController
     {
 
@@ -99,12 +98,12 @@ class so that it can inherit all its methods.
 
 .. note::
     The system will attempt to match the URI against Controllers by matching each segment against
-    folders/files in APPPATH/Controllers, when a match wasn't found against defined routes.
+    folders/files in **app/Controllers/**, when a match wasn't found against defined routes.
     That's why your folders/files MUST start with a capital letter and the rest MUST be lowercase.
     If you want another naming convention you need to manually define it using the
     :doc:`URI Routing <routing>` feature.
 
-    Here is an example based on PSR-4: Autoloader::
+    Here is an example based on PSR-4 Autoloader::
 
         \<NamespaceName>(\<SubNamespaceNames>)*\<ClassName>
 
@@ -113,7 +112,7 @@ class so that it can inherit all its methods.
 Methods
 =======
 
-In the above example, the method name is ``index()``. The "index" method
+In the above example, the method name is ``index()``. The ``index()`` method
 is always loaded by default if the **second segment** of the URI is
 empty. Another way to show your "Hello World" message would be this::
 
@@ -157,7 +156,7 @@ For example, let's say you have a URI like this::
 
     example.com/index.php/products/shoes/sandals/123
 
-Your method will be passed URI segments 3 and 4 ("sandals" and "123")::
+Your method will be passed URI segments 3 and 4 (``'sandals'`` and ``'123'``)::
 
     <?php
 
@@ -181,18 +180,18 @@ Defining a Default Controller
 
 CodeIgniter can be told to load a default controller when a URI is not
 present, as will be the case when only your site root URL is requested. Let's try it
-with the Helloworld controller.
+with the ``Helloworld`` controller.
 
 To specify a default controller open your **app/Config/Routes.php**
 file and set this variable::
 
     $routes->setDefaultController('Helloworld');
 
-Where 'Helloworld' is the name of the controller class you want to be used.
+Where ``Helloworld`` is the name of the controller class you want to be used.
 
-A few lines further down **Routes.php** in the "Route Definitions" section comment out the line::
+A few lines further down **Routes.php** in the "Route Definitions" section, comment out the line::
 
-$routes->get('/', 'Home::index');
+    $routes->get('/', 'Home::index');
 
 If you now browse to your site without specifying any URI segments you'll
 see the “Hello World” message.
@@ -214,7 +213,7 @@ this behavior through the use of the ``_remap()`` method::
         // Some code here...
     }
 
-.. important:: If your controller contains a method named _remap(),
+.. important:: If your controller contains a method named ``_remap()``,
     it will **always** get called regardless of what your URI contains. It
     overrides the normal behavior in which the URI determines which method
     is called, allowing you to define your own method routing rules.
@@ -251,9 +250,9 @@ Private methods
 ===============
 
 In some cases, you may want certain methods hidden from public access.
-To achieve this, simply declare the method as private or protected.
+To achieve this, simply declare the method as ``private`` or ``protected``.
 That will prevent it from being served by a URL request. For example,
-if you were to define a method like this for the `Helloworld` controller::
+if you were to define a method like this for the ``Helloworld`` controller::
 
     protected function utility()
     {
@@ -271,8 +270,8 @@ If you are building a large application you might want to hierarchically
 organize or structure your controllers into sub-directories. CodeIgniter
 permits you to do this.
 
-Simply create sub-directories under the main *app/Controllers/*
-one and place your controller classes within them.
+Simply create sub-directories under the main **app/Controllers/**,
+and place your controller classes within them.
 
 .. important:: Folder names MUST start with an uppercase letter and ONLY the first character can be uppercase.
 
@@ -291,7 +290,7 @@ To call the above controller your URI will look something like this::
 
 Each of your sub-directories may contain a default controller which will be
 called if the URL contains *only* the sub-directory. Simply put a controller
-in there that matches the name of your 'default_controller' as specified in
+in there that matches the name of your default controller as specified in
 your **app/Config/Routes.php** file.
 
 CodeIgniter also permits you to remap your URIs using its :doc:`URI Routing <routing>` feature.
@@ -335,7 +334,7 @@ modify this by passing the duration (in seconds) as the first parameter::
         $this->forceHTTPS(31536000); // one year
     }
 
-.. note:: A number of :doc:`time-based constants </general/common_functions>` are always available for you to use, including YEAR, MONTH, and more.
+.. note:: A number of :doc:`time-based constants </general/common_functions>` are always available for you to use, including ``YEAR``, ``MONTH``, and more.
 
 Helpers
 -------
@@ -358,7 +357,7 @@ To simplify data checking, the controller also provides the convenience method `
 The method accepts an array of rules in the first parameter,
 and in the optional second parameter, an array of custom error messages to display
 if the items are not valid. Internally, this uses the controller's
-**$this->request** instance to get the data to be validated.
+``$this->request`` instance to get the data to be validated.
 The :doc:`Validation Library docs </libraries/validation>` have details on
 rule and message array formats, as well as available rules.::
 
@@ -377,7 +376,7 @@ rule and message array formats, as well as available rules.::
     }
 
 If you find it simpler to keep the rules in the configuration file, you can replace
-the $rules array with the name of the group as defined in ``Config\Validation.php``::
+the ``$rules`` array with the name of the group as defined in ``Config\Validation.php``::
 
     public function updateUser(int $userID)
     {

From 3c428a409acd0d1c70702ebc0f604cc482d9f203 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 26 Jan 2022 15:16:54 +0900
Subject: [PATCH 1440/2325] fix: debug toolbar Routes Params output

---
 system/Debug/Toolbar/Collectors/Routes.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/system/Debug/Toolbar/Collectors/Routes.php b/system/Debug/Toolbar/Collectors/Routes.php
index 060d8b995872..5ea88c0411c8 100644
--- a/system/Debug/Toolbar/Collectors/Routes.php
+++ b/system/Debug/Toolbar/Collectors/Routes.php
@@ -78,9 +78,13 @@ public function display(): array
 
         foreach ($rawParams as $key => $param) {
             $params[] = [
-                'name'  => $param->getName(),
+                'name'  => '$' . $param->getName() . ' = ',
                 'value' => $router->params()[$key] ??
-                    ('&lt;empty&gt;&nbsp| default: ' . var_export($param->isDefaultValueAvailable() ? $param->getDefaultValue() : null, true)),
+                    ' <empty> | default: '
+                    . var_export(
+                        $param->isDefaultValueAvailable() ? $param->getDefaultValue() : null,
+                        true
+                    ),
             ];
         }
 

From ef3f23d93e27d608aa2fba9fae4c09f72013d6bb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 19 Jan 2022 11:13:44 +0900
Subject: [PATCH 1441/2325] test: fix namespace

---
 tests/_support/Controllers/Hello.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/_support/Controllers/Hello.php b/tests/_support/Controllers/Hello.php
index cc63814d7e09..ac9f421b55d1 100644
--- a/tests/_support/Controllers/Hello.php
+++ b/tests/_support/Controllers/Hello.php
@@ -9,7 +9,7 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace App\Controllers;
+namespace Tests\Support\Controllers;
 
 use CodeIgniter\Controller;
 

From 925faca89a11f5a6d5e9afd122bae4f1a826f6d7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 19 Jan 2022 11:16:58 +0900
Subject: [PATCH 1442/2325] feat: add ControllerFinder for auto routes listing

---
 .../Utilities/Routes/ControllerFinder.php     | 75 +++++++++++++++++++
 .../Utilities/Routes/ControllerFinderTest.php | 31 ++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 system/Commands/Utilities/Routes/ControllerFinder.php
 create mode 100644 tests/system/Commands/Utilities/Routes/ControllerFinderTest.php

diff --git a/system/Commands/Utilities/Routes/ControllerFinder.php b/system/Commands/Utilities/Routes/ControllerFinder.php
new file mode 100644
index 000000000000..a48ed15ddba0
--- /dev/null
+++ b/system/Commands/Utilities/Routes/ControllerFinder.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Utilities\Routes;
+
+use CodeIgniter\Autoloader\FileLocator;
+use CodeIgniter\Config\Services;
+
+/**
+ * Finds all controllers in a namespace for auto route listing.
+ */
+class ControllerFinder
+{
+    /**
+     * @var string namespace to search
+     */
+    private string $namespace;
+
+    private FileLocator $locator;
+
+    /**
+     * @param string $namespace namespace to search
+     */
+    public function __construct(string $namespace)
+    {
+        $this->namespace = $namespace;
+        $this->locator   = Services::locator();
+    }
+
+    /**
+     * @return class-string[]
+     */
+    public function find(): array
+    {
+        $nsArray = explode('\\', trim($this->namespace, '\\'));
+        $count   = count($nsArray);
+        $ns      = '';
+
+        for ($i = 0; $i < $count; $i++) {
+            $ns .= '\\' . array_shift($nsArray);
+            $path = implode('\\', $nsArray);
+
+            $files = $this->locator->listNamespaceFiles($ns, $path);
+
+            if ($files !== []) {
+                break;
+            }
+        }
+
+        $classes = [];
+
+        foreach ($files as $file) {
+            if (\is_file($file)) {
+                $classnameOrEmpty = $this->locator->getClassname($file);
+
+                if ($classnameOrEmpty !== '') {
+                    /** @var class-string $classname */
+                    $classname = $classnameOrEmpty;
+
+                    $classes[] = $classname;
+                }
+            }
+        }
+
+        return $classes;
+    }
+}
diff --git a/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php b/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php
new file mode 100644
index 000000000000..0e965745d95d
--- /dev/null
+++ b/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Utilities\Routes;
+
+use CodeIgniter\Test\CIUnitTestCase;
+
+/**
+ * @internal
+ */
+final class ControllerFinderTest extends CIUnitTestCase
+{
+    public function testFind()
+    {
+        $namespace = 'Tests\Support\Controllers';
+        $finder    = new ControllerFinder($namespace);
+
+        $controllers = $finder->find();
+
+        $this->assertCount(2, $controllers);
+        $this->assertSame('Tests\Support\Controllers\Hello', $controllers[0]);
+    }
+}

From 166d3d9ee1c8d579d7bfd908d22246d98057cbf5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 19 Jan 2022 11:17:31 +0900
Subject: [PATCH 1443/2325] feat: add ControllerMethodReader for auto route
 listing

---
 .../Routes/ControllerMethodReader.php         | 110 ++++++++++++++++++
 .../Routes/ControllerMethodReaderTest.php     |  89 ++++++++++++++
 2 files changed, 199 insertions(+)
 create mode 100644 system/Commands/Utilities/Routes/ControllerMethodReader.php
 create mode 100644 tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php

diff --git a/system/Commands/Utilities/Routes/ControllerMethodReader.php b/system/Commands/Utilities/Routes/ControllerMethodReader.php
new file mode 100644
index 000000000000..8065fff2e99f
--- /dev/null
+++ b/system/Commands/Utilities/Routes/ControllerMethodReader.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Utilities\Routes;
+
+use ReflectionClass;
+use ReflectionMethod;
+
+/**
+ * Reads a controller and returns a list of auto route listing.
+ */
+class ControllerMethodReader
+{
+    /**
+     * @var string the default namespace
+     */
+    private string $namespace;
+
+    /**
+     * @param string $namespace the default namespace
+     */
+    public function __construct(string $namespace)
+    {
+        $this->namespace = $namespace;
+    }
+
+    /**
+     * @param class-string $class
+     *
+     * @return list<array{route: string, handler: string}>
+     */
+    public function read(string $class, string $defaultController = 'Home', string $defaultMethod = 'index'): array
+    {
+        $reflection     = new ReflectionClass($class);
+        $classname      = $reflection->getName();
+        $classShortname = $reflection->getShortName();
+
+        $output = [];
+
+        foreach ($reflection->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
+            $uriByClass = $this->getUriByClass($classname);
+            $methodName = $method->getName();
+
+            $route = $uriByClass . '/' . $methodName;
+
+            // Exclude BaseController and initController
+            // See system/Config/Routes.php
+            if (preg_match('#\AbaseController.*#', $route) === 1) {
+                continue;
+            }
+            if (preg_match('#.*/initController\z#', $route) === 1) {
+                continue;
+            }
+
+            if ($classShortname === $defaultController) {
+                $pattern         = '#' . preg_quote(lcfirst($defaultController), '#') . '\z#';
+                $routeController = preg_replace($pattern, '', $uriByClass);
+                $routeController = $routeController ? '' : '/';
+
+                $output[] = [
+                    'route'   => $routeController,
+                    'handler' => '\\' . $classname . '::' . $methodName,
+                ];
+            }
+
+            if ($methodName === $defaultMethod) {
+                $output[] = [
+                    'route'   => $uriByClass,
+                    'handler' => '\\' . $classname . '::' . $methodName,
+                ];
+            }
+
+            $output[] = [
+                'route'   => $route . '[/...]',
+                'handler' => '\\' . $classname . '::' . $methodName,
+            ];
+        }
+
+        return $output;
+    }
+
+    /**
+     * @param class-string $classname URI path part from the controller
+     */
+    private function getUriByClass(string $classname): string
+    {
+        // remove the namespace
+        $pattern = '/' . preg_quote($this->namespace, '/') . '/';
+        $class   = ltrim(preg_replace($pattern, '', $classname), '\\');
+
+        $classParts = explode('\\', $class);
+        $classPath  = '';
+
+        foreach ($classParts as $part) {
+            // make the first letter lowercase, because auto routing makes
+            // the URI path's first letter uppercase and search the controller
+            $classPath .= lcfirst($part) . '/';
+        }
+
+        return rtrim($classPath, '/');
+    }
+}
diff --git a/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php b/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php
new file mode 100644
index 000000000000..959ddaabb2d1
--- /dev/null
+++ b/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Utilities\Routes;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use Tests\Support\Controllers\Popcorn;
+
+/**
+ * @internal
+ */
+final class ControllerMethodReaderTest extends CIUnitTestCase
+{
+    public function testRead()
+    {
+        $namespace = 'Tests\Support\Controllers';
+        $reader    = new ControllerMethodReader($namespace);
+
+        $routes = $reader->read(Popcorn::class);
+
+        $expected = [
+            0 => [
+                'route'   => 'popcorn',
+                'handler' => '\\Tests\\Support\\Controllers\\Popcorn::index',
+            ],
+            1 => [
+                'route'   => 'popcorn/index[/...]',
+                'handler' => '\\Tests\\Support\\Controllers\\Popcorn::index',
+            ],
+            2 => [
+                'route'   => 'popcorn/pop[/...]',
+                'handler' => '\\Tests\\Support\\Controllers\\Popcorn::pop',
+            ],
+            3 => [
+                'route'   => 'popcorn/popper[/...]',
+                'handler' => '\\Tests\\Support\\Controllers\\Popcorn::popper',
+            ],
+            4 => [
+                'route'   => 'popcorn/weasel[/...]',
+                'handler' => '\\Tests\\Support\\Controllers\\Popcorn::weasel',
+            ],
+            5 => [
+                'route'   => 'popcorn/oops[/...]',
+                'handler' => '\\Tests\\Support\\Controllers\\Popcorn::oops',
+            ],
+            6 => [
+                'route'   => 'popcorn/goaway[/...]',
+                'handler' => '\\Tests\\Support\\Controllers\\Popcorn::goaway',
+            ],
+            7 => [
+                'route'   => 'popcorn/index3[/...]',
+                'handler' => '\\Tests\\Support\\Controllers\\Popcorn::index3',
+            ],
+            8 => [
+                'route'   => 'popcorn/canyon[/...]',
+                'handler' => '\\Tests\\Support\\Controllers\\Popcorn::canyon',
+            ],
+            9 => [
+                'route'   => 'popcorn/cat[/...]',
+                'handler' => '\\Tests\\Support\\Controllers\\Popcorn::cat',
+            ],
+            10 => [
+                'route'   => 'popcorn/json[/...]',
+                'handler' => '\\Tests\\Support\\Controllers\\Popcorn::json',
+            ],
+            11 => [
+                'route'   => 'popcorn/xml[/...]',
+                'handler' => '\\Tests\\Support\\Controllers\\Popcorn::xml',
+            ],
+            12 => [
+                'route'   => 'popcorn/toindex[/...]',
+                'handler' => '\\Tests\\Support\\Controllers\\Popcorn::toindex',
+            ],
+            13 => [
+                'route'   => 'popcorn/echoJson[/...]',
+                'handler' => '\\Tests\\Support\\Controllers\\Popcorn::echoJson',
+            ],
+        ];
+        $this->assertSame($expected, $routes);
+    }
+}

From bfbef8f67b131abbd628eb224bd873e3205e3fdf Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 19 Jan 2022 11:18:15 +0900
Subject: [PATCH 1444/2325] feat: add auto routes listing to `spark routes`
 command

---
 system/Commands/Utilities/Routes.php | 34 ++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
index 210d1e11c5f7..78c7f1c8411f 100644
--- a/system/Commands/Utilities/Routes.php
+++ b/system/Commands/Utilities/Routes.php
@@ -13,6 +13,9 @@
 
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
+use CodeIgniter\Commands\Utilities\Routes\ControllerFinder;
+use CodeIgniter\Commands\Utilities\Routes\ControllerMethodReader;
+use CodeIgniter\Router\RouteCollection;
 use Config\Services;
 
 /**
@@ -101,6 +104,10 @@ public function run(array $params)
             }
         }
 
+        if ($collection->shouldAutoRoute()) {
+            $tbody = array_merge($tbody, $this->getAutoRoutes($collection));
+        }
+
         $thead = [
             'Method',
             'Route',
@@ -109,4 +116,31 @@ public function run(array $params)
 
         CLI::table($tbody, $thead);
     }
+
+    private function getAutoRoutes(RouteCollection $collection): array
+    {
+        $defaultNamespace = $collection->getDefaultNamespace();
+        $finder           = new ControllerFinder($defaultNamespace);
+        $reader           = new ControllerMethodReader($defaultNamespace);
+
+        $tbody = [];
+
+        foreach ($finder->find() as $class) {
+            $output = $reader->read(
+                $class,
+                $collection->getDefaultController(),
+                $collection->getDefaultMethod()
+            );
+
+            foreach ($output as $item) {
+                $tbody[] = [
+                    'auto',
+                    $item['route'],
+                    $item['handler'],
+                ];
+            }
+        }
+
+        return $tbody;
+    }
 }

From cc928985445ac676807d97c0a2401a87855a9005 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 24 Jan 2022 11:30:35 +0900
Subject: [PATCH 1445/2325] refactor: move method calls to outside of the loop

---
 system/Commands/Utilities/Routes.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
index 78c7f1c8411f..533f89d54e47 100644
--- a/system/Commands/Utilities/Routes.php
+++ b/system/Commands/Utilities/Routes.php
@@ -119,17 +119,20 @@ public function run(array $params)
 
     private function getAutoRoutes(RouteCollection $collection): array
     {
-        $defaultNamespace = $collection->getDefaultNamespace();
-        $finder           = new ControllerFinder($defaultNamespace);
-        $reader           = new ControllerMethodReader($defaultNamespace);
+        $defaultNamespace  = $collection->getDefaultNamespace();
+        $defaultController = $collection->getDefaultController();
+        $defaultMethod     = $collection->getDefaultMethod();
+
+        $finder = new ControllerFinder($defaultNamespace);
+        $reader = new ControllerMethodReader($defaultNamespace);
 
         $tbody = [];
 
         foreach ($finder->find() as $class) {
             $output = $reader->read(
                 $class,
-                $collection->getDefaultController(),
-                $collection->getDefaultMethod()
+                $defaultController,
+                $defaultMethod
             );
 
             foreach ($output as $item) {

From f58d6e8fc4333e9c10af333f993499f88786a52d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 25 Jan 2022 13:39:47 +0900
Subject: [PATCH 1446/2325] refactor: add final keyword to classes

---
 system/Commands/Utilities/Routes/ControllerFinder.php       | 2 +-
 system/Commands/Utilities/Routes/ControllerMethodReader.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Commands/Utilities/Routes/ControllerFinder.php b/system/Commands/Utilities/Routes/ControllerFinder.php
index a48ed15ddba0..9e6dd5ca2005 100644
--- a/system/Commands/Utilities/Routes/ControllerFinder.php
+++ b/system/Commands/Utilities/Routes/ControllerFinder.php
@@ -17,7 +17,7 @@
 /**
  * Finds all controllers in a namespace for auto route listing.
  */
-class ControllerFinder
+final class ControllerFinder
 {
     /**
      * @var string namespace to search
diff --git a/system/Commands/Utilities/Routes/ControllerMethodReader.php b/system/Commands/Utilities/Routes/ControllerMethodReader.php
index 8065fff2e99f..dce6aa4bd7e3 100644
--- a/system/Commands/Utilities/Routes/ControllerMethodReader.php
+++ b/system/Commands/Utilities/Routes/ControllerMethodReader.php
@@ -17,7 +17,7 @@
 /**
  * Reads a controller and returns a list of auto route listing.
  */
-class ControllerMethodReader
+final class ControllerMethodReader
 {
     /**
      * @var string the default namespace

From dfddfd1517556c847907d8e13434918e782af2c2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 25 Jan 2022 14:05:35 +0900
Subject: [PATCH 1447/2325] feat: add AutoRouteCollector class

---
 .../Utilities/Routes/AutoRouteCollector.php   |  65 ++++++++++
 .../Routes/AutoRouteCollectorTest.php         | 116 ++++++++++++++++++
 2 files changed, 181 insertions(+)
 create mode 100644 system/Commands/Utilities/Routes/AutoRouteCollector.php
 create mode 100644 tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php

diff --git a/system/Commands/Utilities/Routes/AutoRouteCollector.php b/system/Commands/Utilities/Routes/AutoRouteCollector.php
new file mode 100644
index 000000000000..a3254adb6a57
--- /dev/null
+++ b/system/Commands/Utilities/Routes/AutoRouteCollector.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Utilities\Routes;
+
+/**
+ * Collects data for auto route listing.
+ */
+final class AutoRouteCollector
+{
+    /**
+     * @var string namespace to search
+     */
+    private string $namespace;
+
+    private string $defaultController;
+    private string $defaultMethod;
+
+    /**
+     * @param string $namespace namespace to search
+     */
+    public function __construct(string $namespace, string $defaultController, string $defaultMethod)
+    {
+        $this->namespace         = $namespace;
+        $this->defaultController = $defaultController;
+        $this->defaultMethod     = $defaultMethod;
+    }
+
+    /**
+     * @return list<list<string>>
+     */
+    public function get(): array
+    {
+        $finder = new ControllerFinder($this->namespace);
+        $reader = new ControllerMethodReader($this->namespace);
+
+        $tbody = [];
+
+        foreach ($finder->find() as $class) {
+            $output = $reader->read(
+                $class,
+                $this->defaultController,
+                $this->defaultMethod
+            );
+
+            foreach ($output as $item) {
+                $tbody[] = [
+                    'auto',
+                    $item['route'],
+                    $item['handler'],
+                ];
+            }
+        }
+
+        return $tbody;
+    }
+}
diff --git a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php
new file mode 100644
index 000000000000..76c24f92ecb3
--- /dev/null
+++ b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php
@@ -0,0 +1,116 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Utilities\Routes;
+
+use CodeIgniter\Test\CIUnitTestCase;
+
+/**
+ * @internal
+ */
+final class AutoRouteCollectorTest extends CIUnitTestCase
+{
+    public function testGet()
+    {
+        $namespace = 'Tests\Support\Controllers';
+        $collector = new AutoRouteCollector(
+            $namespace,
+            'Home',
+            'index',
+        );
+
+        $routes = $collector->get();
+
+        $expected = [
+            0 => [
+                0 => 'auto',
+                1 => 'hello',
+                2 => '\\Tests\\Support\\Controllers\\Hello::index',
+            ],
+            1 => [
+                0 => 'auto',
+                1 => 'hello/index[/...]',
+                2 => '\\Tests\\Support\\Controllers\\Hello::index',
+            ],
+            2 => [
+                0 => 'auto',
+                1 => 'popcorn',
+                2 => '\\Tests\\Support\\Controllers\\Popcorn::index',
+            ],
+            3 => [
+                0 => 'auto',
+                1 => 'popcorn/index[/...]',
+                2 => '\\Tests\\Support\\Controllers\\Popcorn::index',
+            ],
+            4 => [
+                0 => 'auto',
+                1 => 'popcorn/pop[/...]',
+                2 => '\\Tests\\Support\\Controllers\\Popcorn::pop',
+            ],
+            5 => [
+                0 => 'auto',
+                1 => 'popcorn/popper[/...]',
+                2 => '\\Tests\\Support\\Controllers\\Popcorn::popper',
+            ],
+            6 => [
+                0 => 'auto',
+                1 => 'popcorn/weasel[/...]',
+                2 => '\\Tests\\Support\\Controllers\\Popcorn::weasel',
+            ],
+            7 => [
+                0 => 'auto',
+                1 => 'popcorn/oops[/...]',
+                2 => '\\Tests\\Support\\Controllers\\Popcorn::oops',
+            ],
+            8 => [
+                0 => 'auto',
+                1 => 'popcorn/goaway[/...]',
+                2 => '\\Tests\\Support\\Controllers\\Popcorn::goaway',
+            ],
+            9 => [
+                0 => 'auto',
+                1 => 'popcorn/index3[/...]',
+                2 => '\\Tests\\Support\\Controllers\\Popcorn::index3',
+            ],
+            10 => [
+                0 => 'auto',
+                1 => 'popcorn/canyon[/...]',
+                2 => '\\Tests\\Support\\Controllers\\Popcorn::canyon',
+            ],
+            11 => [
+                0 => 'auto',
+                1 => 'popcorn/cat[/...]',
+                2 => '\\Tests\\Support\\Controllers\\Popcorn::cat',
+            ],
+            12 => [
+                0 => 'auto',
+                1 => 'popcorn/json[/...]',
+                2 => '\\Tests\\Support\\Controllers\\Popcorn::json',
+            ],
+            13 => [
+                0 => 'auto',
+                1 => 'popcorn/xml[/...]',
+                2 => '\\Tests\\Support\\Controllers\\Popcorn::xml',
+            ],
+            14 => [
+                0 => 'auto',
+                1 => 'popcorn/toindex[/...]',
+                2 => '\\Tests\\Support\\Controllers\\Popcorn::toindex',
+            ],
+            15 => [
+                0 => 'auto',
+                1 => 'popcorn/echoJson[/...]',
+                2 => '\\Tests\\Support\\Controllers\\Popcorn::echoJson',
+            ],
+        ];
+        $this->assertSame($expected, $routes);
+    }
+}

From 03372c03b7c232250852fa1f807874924f42217d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 25 Jan 2022 14:06:23 +0900
Subject: [PATCH 1448/2325] refactor: use AutoRouteCollector

---
 system/Commands/Utilities/Routes.php | 41 +++++-----------------------
 1 file changed, 7 insertions(+), 34 deletions(-)

diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
index 533f89d54e47..621ca6da3831 100644
--- a/system/Commands/Utilities/Routes.php
+++ b/system/Commands/Utilities/Routes.php
@@ -13,9 +13,7 @@
 
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
-use CodeIgniter\Commands\Utilities\Routes\ControllerFinder;
-use CodeIgniter\Commands\Utilities\Routes\ControllerMethodReader;
-use CodeIgniter\Router\RouteCollection;
+use CodeIgniter\Commands\Utilities\Routes\AutoRouteCollector;
 use Config\Services;
 
 /**
@@ -105,7 +103,12 @@ public function run(array $params)
         }
 
         if ($collection->shouldAutoRoute()) {
-            $tbody = array_merge($tbody, $this->getAutoRoutes($collection));
+            $autoRouteCollector = new AutoRouteCollector(
+                $collection->getDefaultNamespace(),
+                $collection->getDefaultController(),
+                $collection->getDefaultMethod()
+            );
+            $tbody = array_merge($tbody, $autoRouteCollector->get());
         }
 
         $thead = [
@@ -116,34 +119,4 @@ public function run(array $params)
 
         CLI::table($tbody, $thead);
     }
-
-    private function getAutoRoutes(RouteCollection $collection): array
-    {
-        $defaultNamespace  = $collection->getDefaultNamespace();
-        $defaultController = $collection->getDefaultController();
-        $defaultMethod     = $collection->getDefaultMethod();
-
-        $finder = new ControllerFinder($defaultNamespace);
-        $reader = new ControllerMethodReader($defaultNamespace);
-
-        $tbody = [];
-
-        foreach ($finder->find() as $class) {
-            $output = $reader->read(
-                $class,
-                $defaultController,
-                $defaultMethod
-            );
-
-            foreach ($output as $item) {
-                $tbody[] = [
-                    'auto',
-                    $item['route'],
-                    $item['handler'],
-                ];
-            }
-        }
-
-        return $tbody;
-    }
 }

From f47d299a3dc79a478a28d7531b532d150b532410 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 25 Jan 2022 14:11:46 +0900
Subject: [PATCH 1449/2325] docs: update doc comment

[ci skip]
---
 system/Commands/Utilities/Routes.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
index 621ca6da3831..c7e9e393d048 100644
--- a/system/Commands/Utilities/Routes.php
+++ b/system/Commands/Utilities/Routes.php
@@ -17,9 +17,9 @@
 use Config\Services;
 
 /**
- * Lists all of the user-defined routes. This will include any Routes files
- * that can be discovered, but will NOT include any routes that are not defined
- * in a routes file, but are instead discovered through auto-routing.
+ * Lists all the routes. This will include any Routes files
+ * that can be discovered, and will include routes that are not defined
+ * in routes files, but are instead discovered through auto-routing.
  */
 class Routes extends BaseCommand
 {

From c555e7fbad8feac8fe562fb5a5bad01aa50992e3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 25 Jan 2022 14:59:37 +0900
Subject: [PATCH 1450/2325] refactor: by rector

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

diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
index c7e9e393d048..26ad9b2a689e 100644
--- a/system/Commands/Utilities/Routes.php
+++ b/system/Commands/Utilities/Routes.php
@@ -108,7 +108,7 @@ public function run(array $params)
                 $collection->getDefaultController(),
                 $collection->getDefaultMethod()
             );
-            $tbody = array_merge($tbody, $autoRouteCollector->get());
+            $tbody = [...$tbody, ...$autoRouteCollector->get()];
         }
 
         $thead = [

From c56386285340471c2f19d0203d33f49fb3af11f3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 26 Jan 2022 14:16:31 +0900
Subject: [PATCH 1451/2325] test: add a controller for testing

---
 tests/_support/Controllers/Remap.php          | 36 +++++++++++++++++++
 .../Routes/AutoRouteCollectorTest.php         |  5 +++
 .../Utilities/Routes/ControllerFinderTest.php |  2 +-
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 tests/_support/Controllers/Remap.php

diff --git a/tests/_support/Controllers/Remap.php b/tests/_support/Controllers/Remap.php
new file mode 100644
index 000000000000..1489a80aa776
--- /dev/null
+++ b/tests/_support/Controllers/Remap.php
@@ -0,0 +1,36 @@
+<?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\Controllers;
+
+use CodeIgniter\Controller;
+
+class Remap extends Controller
+{
+    public function _remap($method, ...$params)
+    {
+        if ($method === 'xyz') {
+            return $this->abc();
+        }
+
+        return $this->index();
+    }
+
+    public function index()
+    {
+        return 'index';
+    }
+
+    public function abc()
+    {
+        return 'abc';
+    }
+}
diff --git a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php
index 76c24f92ecb3..dd1c5db46b5f 100644
--- a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php
+++ b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php
@@ -110,6 +110,11 @@ public function testGet()
                 1 => 'popcorn/echoJson[/...]',
                 2 => '\\Tests\\Support\\Controllers\\Popcorn::echoJson',
             ],
+            16 => [
+                0 => 'auto',
+                1 => 'remap[/...]',
+                2 => '\\Tests\\Support\\Controllers\\Remap::_remap',
+            ],
         ];
         $this->assertSame($expected, $routes);
     }
diff --git a/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php b/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php
index 0e965745d95d..676a1869b1b3 100644
--- a/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php
+++ b/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php
@@ -25,7 +25,7 @@ public function testFind()
 
         $controllers = $finder->find();
 
-        $this->assertCount(2, $controllers);
+        $this->assertCount(3, $controllers);
         $this->assertSame('Tests\Support\Controllers\Hello', $controllers[0]);
     }
 }

From b3b86065f288b83d0b2d5555481457b7c8947332 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 26 Jan 2022 14:19:34 +0900
Subject: [PATCH 1452/2325] feat: add support to _remap() method

---
 .../Routes/ControllerMethodReader.php         | 86 ++++++++++++++++---
 .../Routes/ControllerMethodReaderTest.php     | 17 ++++
 2 files changed, 90 insertions(+), 13 deletions(-)

diff --git a/system/Commands/Utilities/Routes/ControllerMethodReader.php b/system/Commands/Utilities/Routes/ControllerMethodReader.php
index dce6aa4bd7e3..63ad513b12e3 100644
--- a/system/Commands/Utilities/Routes/ControllerMethodReader.php
+++ b/system/Commands/Utilities/Routes/ControllerMethodReader.php
@@ -43,10 +43,30 @@ public function read(string $class, string $defaultController = 'Home', string $
         $classname      = $reflection->getName();
         $classShortname = $reflection->getShortName();
 
-        $output = [];
+        $output     = [];
+        $uriByClass = $this->getUriByClass($classname);
+
+        if ($this->hasRemap($reflection)) {
+            $methodName = '_remap';
+
+            $routeWithoutController = $this->getRouteWithoutController(
+                $classShortname,
+                $defaultController,
+                $uriByClass,
+                $classname,
+                $methodName
+            );
+            $output = [...$output, ...$routeWithoutController];
+
+            $output[] = [
+                'route'   => $uriByClass . '[/...]',
+                'handler' => '\\' . $classname . '::' . $methodName,
+            ];
+
+            return $output;
+        }
 
         foreach ($reflection->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
-            $uriByClass = $this->getUriByClass($classname);
             $methodName = $method->getName();
 
             $route = $uriByClass . '/' . $methodName;
@@ -60,16 +80,14 @@ public function read(string $class, string $defaultController = 'Home', string $
                 continue;
             }
 
-            if ($classShortname === $defaultController) {
-                $pattern         = '#' . preg_quote(lcfirst($defaultController), '#') . '\z#';
-                $routeController = preg_replace($pattern, '', $uriByClass);
-                $routeController = $routeController ? '' : '/';
-
-                $output[] = [
-                    'route'   => $routeController,
-                    'handler' => '\\' . $classname . '::' . $methodName,
-                ];
-            }
+            $routeWithoutController = $this->getRouteWithoutController(
+                $classShortname,
+                $defaultController,
+                $uriByClass,
+                $classname,
+                $methodName
+            );
+            $output = [...$output, ...$routeWithoutController];
 
             if ($methodName === $defaultMethod) {
                 $output[] = [
@@ -88,7 +106,23 @@ public function read(string $class, string $defaultController = 'Home', string $
     }
 
     /**
-     * @param class-string $classname URI path part from the controller
+     * Whether the class has a _remap() method.
+     */
+    private function hasRemap(ReflectionClass $class): bool
+    {
+        if ($class->hasMethod('_remap')) {
+            $remap = $class->getMethod('_remap');
+
+            return $remap->isPublic();
+        }
+
+        return false;
+    }
+
+    /**
+     * @param class-string $classname
+     *
+     * @return string URI path part from the folder(s) and controller
      */
     private function getUriByClass(string $classname): string
     {
@@ -107,4 +141,30 @@ private function getUriByClass(string $classname): string
 
         return rtrim($classPath, '/');
     }
+
+    /**
+     * Gets a route without default controller.
+     */
+    private function getRouteWithoutController(
+        string $classShortname,
+        string $defaultController,
+        string $uriByClass,
+        string $classname,
+        string $methodName
+    ): array {
+        $output = [];
+
+        if ($classShortname === $defaultController) {
+            $pattern                = '#' . preg_quote(lcfirst($defaultController), '#') . '\z#';
+            $routeWithoutController = preg_replace($pattern, '', $uriByClass);
+            $routeWithoutController = $routeWithoutController ?: '/';
+
+            $output[] = [
+                'route'   => $routeWithoutController,
+                'handler' => '\\' . $classname . '::' . $methodName,
+            ];
+        }
+
+        return $output;
+    }
 }
diff --git a/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php b/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php
index 959ddaabb2d1..a899b9c44b73 100644
--- a/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php
+++ b/tests/system/Commands/Utilities/Routes/ControllerMethodReaderTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use Tests\Support\Controllers\Popcorn;
+use Tests\Support\Controllers\Remap;
 
 /**
  * @internal
@@ -86,4 +87,20 @@ public function testRead()
         ];
         $this->assertSame($expected, $routes);
     }
+
+    public function testReadControllerWithRemap()
+    {
+        $namespace = 'Tests\Support\Controllers';
+        $reader    = new ControllerMethodReader($namespace);
+
+        $routes = $reader->read(Remap::class);
+
+        $expected = [
+            0 => [
+                'route'   => 'remap[/...]',
+                'handler' => '\\Tests\\Support\\Controllers\\Remap::_remap',
+            ],
+        ];
+        $this->assertSame($expected, $routes);
+    }
 }

From 6a2d8b1a1b511ce0b826686fe01e79fc8d2dc986 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 26 Jan 2022 14:58:49 +0900
Subject: [PATCH 1453/2325] fix: remove / after sub-directory

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

diff --git a/system/Commands/Utilities/Routes/ControllerMethodReader.php b/system/Commands/Utilities/Routes/ControllerMethodReader.php
index 63ad513b12e3..da4f0bc6086d 100644
--- a/system/Commands/Utilities/Routes/ControllerMethodReader.php
+++ b/system/Commands/Utilities/Routes/ControllerMethodReader.php
@@ -156,7 +156,7 @@ private function getRouteWithoutController(
 
         if ($classShortname === $defaultController) {
             $pattern                = '#' . preg_quote(lcfirst($defaultController), '#') . '\z#';
-            $routeWithoutController = preg_replace($pattern, '', $uriByClass);
+            $routeWithoutController = rtrim(preg_replace($pattern, '', $uriByClass), '/');
             $routeWithoutController = $routeWithoutController ?: '/';
 
             $output[] = [

From b83e0b611405a683192aa123cb79bb157571babd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 26 Jan 2022 16:29:14 +0900
Subject: [PATCH 1454/2325] fix: exclude abstruct controllers

---
 .../Commands/Utilities/Routes/ControllerMethodReader.php   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/system/Commands/Utilities/Routes/ControllerMethodReader.php b/system/Commands/Utilities/Routes/ControllerMethodReader.php
index da4f0bc6086d..79085e71ef0f 100644
--- a/system/Commands/Utilities/Routes/ControllerMethodReader.php
+++ b/system/Commands/Utilities/Routes/ControllerMethodReader.php
@@ -39,7 +39,12 @@ public function __construct(string $namespace)
      */
     public function read(string $class, string $defaultController = 'Home', string $defaultMethod = 'index'): array
     {
-        $reflection     = new ReflectionClass($class);
+        $reflection = new ReflectionClass($class);
+
+        if ($reflection->isAbstract()) {
+            return [];
+        }
+
         $classname      = $reflection->getName();
         $classShortname = $reflection->getShortName();
 

From b089e2d8c8dc68066c8f448cce44d959e0a5d89e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 26 Jan 2022 16:30:07 +0900
Subject: [PATCH 1455/2325] fix: remove duplicated / route

---
 .../Routes/ControllerMethodReader.php          | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/system/Commands/Utilities/Routes/ControllerMethodReader.php b/system/Commands/Utilities/Routes/ControllerMethodReader.php
index 79085e71ef0f..0e9549f2b88a 100644
--- a/system/Commands/Utilities/Routes/ControllerMethodReader.php
+++ b/system/Commands/Utilities/Routes/ControllerMethodReader.php
@@ -85,16 +85,16 @@ public function read(string $class, string $defaultController = 'Home', string $
                 continue;
             }
 
-            $routeWithoutController = $this->getRouteWithoutController(
-                $classShortname,
-                $defaultController,
-                $uriByClass,
-                $classname,
-                $methodName
-            );
-            $output = [...$output, ...$routeWithoutController];
-
             if ($methodName === $defaultMethod) {
+                $routeWithoutController = $this->getRouteWithoutController(
+                    $classShortname,
+                    $defaultController,
+                    $uriByClass,
+                    $classname,
+                    $methodName
+                );
+                $output = [...$output, ...$routeWithoutController];
+
                 $output[] = [
                     'route'   => $uriByClass,
                     'handler' => '\\' . $classname . '::' . $methodName,

From fa1aa8a96d45a7902dff1d731b415bd5ad3d1a7d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Jan 2022 15:03:29 +0000
Subject: [PATCH 1456/2325] chore(deps-dev): update rector/rector requirement

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

---
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 519183084def..5475def9c5c6 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.13"
+        "rector/rector": "0.12.15"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From 845bc4a3cba18d108b20267dff1a87871ed31429 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 27 Jan 2022 09:28:31 +0900
Subject: [PATCH 1457/2325] fix: DownloadResponse memory leak

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

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 3ff821585e6c..ecd051273c75 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -894,6 +894,11 @@ protected function gatherOutput(?Cache $cacheConfig = null, $returned = null)
         }
 
         if ($returned instanceof DownloadResponse) {
+            // Turn off output buffering completely, even if php.ini output_buffering is not off
+            while (ob_get_level() > 0) {
+                ob_end_clean();
+            }
+
             $this->response = $returned;
 
             return;

From 5106920fcde186d8f36fb3f556e9de7245e0e9d4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 27 Jan 2022 09:29:47 +0900
Subject: [PATCH 1458/2325] perf: reduce memory consumption

---
 system/HTTP/DownloadResponse.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/HTTP/DownloadResponse.php b/system/HTTP/DownloadResponse.php
index 8efb8b47a55a..abd666fbca52 100644
--- a/system/HTTP/DownloadResponse.php
+++ b/system/HTTP/DownloadResponse.php
@@ -306,6 +306,7 @@ private function sendBodyByFilePath()
         // Flush 1MB chunks of data
         while (! $splFileObject->eof() && ($data = $splFileObject->fread(1_048_576)) !== false) {
             echo $data;
+            unset($data);
         }
 
         return $this;

From 21d84bf9a3f5db958aa772cf58abaa8435b7d6ef Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 27 Jan 2022 17:08:28 +0900
Subject: [PATCH 1459/2325] fix: add check if array key exists

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

diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index c2b9a35b035f..2fcebe62da50 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1064,6 +1064,10 @@ public function getFiltersForRoute(string $search, ?string $verb = null): array
     {
         $options = $this->loadRoutesOptions($verb);
 
+        if (! array_key_exists($search, $options)) {
+            return [];
+        }
+
         if (is_string($options[$search]['filter'])) {
             return [$options[$search]['filter']];
         }

From 1090f691be2b6fd80bd8fbbdd9fad559137e0dff Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 27 Jan 2022 17:08:57 +0900
Subject: [PATCH 1460/2325] test: refactor: update deprecated
 getFilterForRoute()

---
 system/Test/FilterTestTrait.php             | 4 ++--
 tests/system/Router/RouteCollectionTest.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/Test/FilterTestTrait.php b/system/Test/FilterTestTrait.php
index f2a52f301daa..1407a67b0a64 100644
--- a/system/Test/FilterTestTrait.php
+++ b/system/Test/FilterTestTrait.php
@@ -176,8 +176,8 @@ protected function getFiltersForRoute(string $route, string $position): array
 
         $this->filters->reset();
 
-        if ($routeFilter = $this->collection->getFilterForRoute($route)) {
-            $this->filters->enableFilter($routeFilter, $position);
+        if ($routeFilters = $this->collection->getFiltersForRoute($route)) {
+            $this->filters->enableFilters($routeFilters, $position);
         }
 
         $aliases = $this->filters->initialize($route)->getFilters();
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index 8f586a4fcbb8..222bff2981a9 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -1254,8 +1254,8 @@ static function ($routes) {
 
         $this->assertTrue($routes->isFiltered('admin/users'));
         $this->assertFalse($routes->isFiltered('admin/franky'));
-        $this->assertSame('role', $routes->getFilterForRoute('admin/users'));
-        $this->assertSame('', $routes->getFilterForRoute('admin/bosses'));
+        $this->assertSame(['role'], $routes->getFiltersForRoute('admin/users'));
+        $this->assertSame([], $routes->getFiltersForRoute('admin/bosses'));
     }
 
     public function testRouteGroupWithFilterWithParams()
@@ -1273,7 +1273,7 @@ static function ($routes) {
 
         $this->assertTrue($routes->isFiltered('admin/users'));
         $this->assertFalse($routes->isFiltered('admin/franky'));
-        $this->assertSame('role:admin,manager', $routes->getFilterForRoute('admin/users'));
+        $this->assertSame(['role:admin,manager'], $routes->getFiltersForRoute('admin/users'));
     }
 
     public function test404OverrideNot()

From 5debe7e5beae1ca60eb9621d0e892e790a320c6f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 28 Jan 2022 10:42:39 +0900
Subject: [PATCH 1461/2325] test: fix typos

---
 tests/system/Filters/FiltersTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index ca50f9af1586..3c5724d310d3 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -1096,18 +1096,18 @@ public function testSegmentedFilterMatching()
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/2831
      */
-    public function testFilterAlitasMultiple()
+    public function testFilterAliasMultiple()
     {
         $config = [
             'aliases' => [
-                'multipeTest' => [
+                'multipleTest' => [
                     'CodeIgniter\Filters\fixtures\Multiple1',
                     'CodeIgniter\Filters\fixtures\Multiple2',
                 ],
             ],
             'globals' => [
                 'before' => [
-                    'multipeTest',
+                    'multipleTest',
                 ],
             ],
         ];

From b672d67da103bdfde952edc0add0657a5f39a4f7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 28 Jan 2022 11:48:37 +0900
Subject: [PATCH 1462/2325] test: refactor: extract method to trait

---
 system/Test/ConfigFromArrayTrait.php | 46 ++++++++++++++++++++++++++++
 tests/system/Filters/FiltersTest.php | 30 ++----------------
 2 files changed, 49 insertions(+), 27 deletions(-)
 create mode 100644 system/Test/ConfigFromArrayTrait.php

diff --git a/system/Test/ConfigFromArrayTrait.php b/system/Test/ConfigFromArrayTrait.php
new file mode 100644
index 000000000000..59ba5e6d7f24
--- /dev/null
+++ b/system/Test/ConfigFromArrayTrait.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Test;
+
+use LogicException;
+
+trait ConfigFromArrayTrait
+{
+    /**
+     * Creates a Config instance from an array.
+     *
+     * @template T of \CodeIgniter\Config\BaseConfig
+     *
+     * @param array<string, mixed> $config
+     * @param class-string<T>      $classname Config classname
+     *
+     * @return T
+     */
+    private function createConfigFromArray(string $classname, array $config)
+    {
+        $configObj = new $classname();
+
+        foreach ($config as $key => $value) {
+            if (property_exists($configObj, $key)) {
+                $configObj->{$key} = $value;
+
+                continue;
+            }
+
+            throw new LogicException(
+                'No such property: ' . $classname . '::$' . $key
+            );
+        }
+
+        return $configObj;
+    }
+}
diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index 3c5724d310d3..f2003e3891b6 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -16,9 +16,9 @@
 use CodeIgniter\HTTP\CLIRequest;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\ConfigFromArrayTrait;
 use CodeIgniter\Test\Mock\MockAppConfig;
 use Config\Filters as FiltersConfig;
-use LogicException;
 
 require_once __DIR__ . '/fixtures/GoogleMe.php';
 require_once __DIR__ . '/fixtures/GoogleYou.php';
@@ -36,6 +36,8 @@
  */
 final class FiltersTest extends CIUnitTestCase
 {
+    use ConfigFromArrayTrait;
+
     protected $response;
 
     protected function setUp(): void
@@ -63,32 +65,6 @@ private function createFilters(FiltersConfig $config, $request = null): Filters
         return new Filters($config, $request, $this->response);
     }
 
-    /**
-     * @template T
-     *
-     * @param class-string<T> $classname
-     *
-     * @return T
-     */
-    private function createConfigFromArray(string $classname, array $config)
-    {
-        $configObj = new $classname();
-
-        foreach ($config as $key => $value) {
-            if (property_exists($configObj, $key)) {
-                $configObj->{$key} = $value;
-
-                continue;
-            }
-
-            throw new LogicException(
-                'No such property: ' . $classname . '::$' . $key
-            );
-        }
-
-        return $configObj;
-    }
-
     public function testProcessMethodDetectsCLI()
     {
         $_SERVER['argv'] = [

From acaf6851f77014160ea7757d8a61e3f3c30ca45d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 28 Jan 2022 11:49:15 +0900
Subject: [PATCH 1463/2325] test: refactor: remove empty tearDown()

---
 tests/system/Router/RouteCollectionTest.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index 8f586a4fcbb8..c79b32983d8f 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -23,10 +23,6 @@
  */
 final class RouteCollectionTest extends CIUnitTestCase
 {
-    protected function tearDown(): void
-    {
-    }
-
     protected function getCollector(array $config = [], array $files = [], $moduleConfig = null)
     {
         $defaults = [

From 6a72819471faba19c4af24fa02b6b295ca1196d7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 28 Jan 2022 16:20:04 +0900
Subject: [PATCH 1464/2325] refactor: initialize $this->filtersInfo

---
 system/Router/Router.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/Router/Router.php b/system/Router/Router.php
index 198d6ece5350..fad7d45ee5f6 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -149,7 +149,8 @@ public function handle(?string $uri = null)
         $uri = urldecode($uri);
 
         // Restart filterInfo
-        $this->filterInfo = null;
+        $this->filterInfo  = null;
+        $this->filtersInfo = [];
 
         if ($this->checkRoutes($uri)) {
             if ($this->collection->isFiltered($this->matchedRoute[0])) {

From 0c9966406cd4de506e14e03f6ae9e7ef8619dbf5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 28 Jan 2022 16:20:50 +0900
Subject: [PATCH 1465/2325] refactor: renumber the array keys

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

diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index 622d9153f016..786ff0862b12 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -503,7 +503,7 @@ protected function processAliasesToClass(string $position)
         // when using enableFilter() we already write the class name in ->filtersClass as well as the
         // alias in ->filters. This leads to duplicates when using route filters.
         // Since some filters like rate limiters rely on being executed once a request we filter em here.
-        $this->filtersClass[$position] = array_unique($this->filtersClass[$position]);
+        $this->filtersClass[$position] = array_values(array_unique($this->filtersClass[$position]));
     }
 
     /**

From 3240a77896a441a39b35b6c80c226496cf41a42f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 29 Jan 2022 11:33:46 +0900
Subject: [PATCH 1466/2325] docs: fix @params order

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

diff --git a/system/Test/ConfigFromArrayTrait.php b/system/Test/ConfigFromArrayTrait.php
index 59ba5e6d7f24..17d2dd553cfe 100644
--- a/system/Test/ConfigFromArrayTrait.php
+++ b/system/Test/ConfigFromArrayTrait.php
@@ -20,8 +20,8 @@ trait ConfigFromArrayTrait
      *
      * @template T of \CodeIgniter\Config\BaseConfig
      *
-     * @param array<string, mixed> $config
      * @param class-string<T>      $classname Config classname
+     * @param array<string, mixed> $config
      *
      * @return T
      */

From 5afb7f3da4791a1351fdc8d8d50c06aa002427db Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sat, 29 Jan 2022 18:53:01 +0800
Subject: [PATCH 1467/2325] Rename docblocks in Routes utilities classes

---
 system/Commands/Utilities/Routes/AutoRouteCollector.php     | 2 +-
 system/Commands/Utilities/Routes/ControllerFinder.php       | 5 +++--
 system/Commands/Utilities/Routes/ControllerMethodReader.php | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/system/Commands/Utilities/Routes/AutoRouteCollector.php b/system/Commands/Utilities/Routes/AutoRouteCollector.php
index a3254adb6a57..4585bc297ab8 100644
--- a/system/Commands/Utilities/Routes/AutoRouteCollector.php
+++ b/system/Commands/Utilities/Routes/AutoRouteCollector.php
@@ -35,7 +35,7 @@ public function __construct(string $namespace, string $defaultController, string
     }
 
     /**
-     * @return list<list<string>>
+     * @return array<int, array<int, string>>
      */
     public function get(): array
     {
diff --git a/system/Commands/Utilities/Routes/ControllerFinder.php b/system/Commands/Utilities/Routes/ControllerFinder.php
index 9e6dd5ca2005..7e7865876750 100644
--- a/system/Commands/Utilities/Routes/ControllerFinder.php
+++ b/system/Commands/Utilities/Routes/ControllerFinder.php
@@ -36,7 +36,8 @@ public function __construct(string $namespace)
     }
 
     /**
-     * @return class-string[]
+     * @return string[]
+     * @phpstan-return class-string[]
      */
     public function find(): array
     {
@@ -62,7 +63,7 @@ public function find(): array
                 $classnameOrEmpty = $this->locator->getClassname($file);
 
                 if ($classnameOrEmpty !== '') {
-                    /** @var class-string $classname */
+                    /** @phpstan-var class-string $classname */
                     $classname = $classnameOrEmpty;
 
                     $classes[] = $classname;
diff --git a/system/Commands/Utilities/Routes/ControllerMethodReader.php b/system/Commands/Utilities/Routes/ControllerMethodReader.php
index 0e9549f2b88a..2acf204ca6a4 100644
--- a/system/Commands/Utilities/Routes/ControllerMethodReader.php
+++ b/system/Commands/Utilities/Routes/ControllerMethodReader.php
@@ -33,9 +33,9 @@ public function __construct(string $namespace)
     }
 
     /**
-     * @param class-string $class
+     * @phpstan-param class-string $class
      *
-     * @return list<array{route: string, handler: string}>
+     * @return array<int, array{route: string, handler: string}>
      */
     public function read(string $class, string $defaultController = 'Home', string $defaultMethod = 'index'): array
     {
@@ -125,7 +125,7 @@ private function hasRemap(ReflectionClass $class): bool
     }
 
     /**
-     * @param class-string $classname
+     * @phpstan-param class-string $classname
      *
      * @return string URI path part from the folder(s) and controller
      */

From 0839468402eaa50f5f7548f4bb8c5636669079db Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Mon, 31 Jan 2022 02:35:57 +0100
Subject: [PATCH 1468/2325] Small adjustment in the user guide

Although the prefix swap propagates of course up to the final SQL,
the replacements actually occur in the original SQL (i.e. before the binds are applied).
---
 user_guide_src/source/database/queries.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/database/queries.rst b/user_guide_src/source/database/queries.rst
index af15bacea038..3e3bb5d1a78c 100644
--- a/user_guide_src/source/database/queries.rst
+++ b/user_guide_src/source/database/queries.rst
@@ -356,7 +356,7 @@ INSERT, UPDATE, DELETE, etc)::
 
 **swapPrefix()**
 
-Replaces one table prefix with another value in the final SQL. The first
+Replaces one table prefix with another value in the SQL. The first
 parameter is the original prefix that you want replaced, and the second
 parameter is the value you want it replaced with::
 

From e2ba5b331941acfb2c2e2018b757c56178ad12e5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 31 Jan 2022 10:36:45 +0900
Subject: [PATCH 1469/2325] docs: fix migration tablename

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

diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst
index d88d3e226118..ffc4f644d873 100644
--- a/user_guide_src/source/dbmgmt/migration.rst
+++ b/user_guide_src/source/dbmgmt/migration.rst
@@ -8,7 +8,7 @@ but you would then be responsible for telling other developers that they
 need to go and run them. You would also have to keep track of which changes
 need to be run against the production machines next time you deploy.
 
-The database table **migration** tracks which migrations have already been
+The database table **migrations** tracks which migrations have already been
 run so all you have to do is make sure your migrations are in place and
 call ``$migration->latest()`` to bring the database up to the most recent
 state. You can also use ``$migration->setNamespace(null)->latest()`` to

From e636315d147189fa5050018d96ab222a4a3b0fda Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 31 Jan 2022 10:38:14 +0900
Subject: [PATCH 1470/2325] docs: update migration filename

Use make:migration's output filename and classname
---
 user_guide_src/source/dbmgmt/migration.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst
index ffc4f644d873..a51ae135941f 100644
--- a/user_guide_src/source/dbmgmt/migration.rst
+++ b/user_guide_src/source/dbmgmt/migration.rst
@@ -24,16 +24,16 @@ Migration file names
 
 Each Migration is run in numeric order forward or backwards depending on the
 method taken. Each migration is numbered using the timestamp when the migration
-was created, in **YYYYMMDDHHIISS** format (e.g., **20121031100537**). This
+was created, in **YYYY-MM-DD-HHIISS** format (e.g., **2012-10-31-100537**). This
 helps prevent numbering conflicts when working in a team environment.
 
 Prefix your migration files with the migration number followed by an underscore
 and a descriptive name for the migration. The year, month, and date can be separated
 from each other by dashes, underscores, or not at all. For example:
 
-* 20121031100537_add_blog.php
-* 2012-10-31-100538_alter_blog_track_views.php
-* 2012_10_31_100539_alter_blog_add_translations.php
+* 2012-10-31-100538_AlterBlogTrackViews.php
+* 2012_10_31_100539_AlterBlogAddTranslations.php
+* 20121031100537_AddBlog.php
 
 ******************
 Create a Migration
@@ -41,7 +41,7 @@ Create a Migration
 
 This will be the first migration for a new site which has a blog. All
 migrations go in the **app/Database/Migrations/** directory and have names such
-as *20121031100537_add_blog.php*.
+as **2022-01-31-013057_AddBlog.php**.
 ::
 
     <?php

From 4b5f556034592323a7b6d88fe78128d69144f471 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 31 Jan 2022 10:45:02 +0900
Subject: [PATCH 1471/2325] docs: add note about migration classname

Fixes #5611
---
 user_guide_src/source/dbmgmt/migration.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst
index a51ae135941f..15677e8165ef 100644
--- a/user_guide_src/source/dbmgmt/migration.rst
+++ b/user_guide_src/source/dbmgmt/migration.rst
@@ -86,6 +86,8 @@ The database connection and the database Forge class are both available to you t
 Alternatively, you can use a command-line call to generate a skeleton migration file. See
 below for more details.
 
+.. note:: Since the migration class is a PHP class, the classname must be unique in every migration file.
+
 Foreign Keys
 ============
 

From b5c02e9d4fb230f29d734fe6553bab29a1ab0a73 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 31 Jan 2022 12:00:16 +0900
Subject: [PATCH 1472/2325] docs: add a link

---
 user_guide_src/source/dbmgmt/migration.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst
index 15677e8165ef..f3278d520e3f 100644
--- a/user_guide_src/source/dbmgmt/migration.rst
+++ b/user_guide_src/source/dbmgmt/migration.rst
@@ -83,8 +83,8 @@ as **2022-01-31-013057_AddBlog.php**.
 The database connection and the database Forge class are both available to you through
 ``$this->db`` and ``$this->forge``, respectively.
 
-Alternatively, you can use a command-line call to generate a skeleton migration file. See
-below for more details.
+Alternatively, you can use a command-line call to generate a skeleton migration file.
+See **make:migration** in :ref:`command-line-tools` for more details.
 
 .. note:: Since the migration class is a PHP class, the classname must be unique in every migration file.
 
@@ -185,6 +185,8 @@ to update the schema::
         }
     }
 
+.. _command-line-tools:
+
 *******************
 Command-Line Tools
 *******************

From 0bd5823023b2924816ffc6d9713103a9e67f5797 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 1 Feb 2022 08:54:35 +0900
Subject: [PATCH 1473/2325] docs: replace getServer with server

---
 user_guide_src/source/incoming/message.rst      | 2 +-
 user_guide_src/source/incoming/request.rst      | 2 +-
 user_guide_src/source/libraries/curlrequest.rst | 4 ++--
 user_guide_src/source/outgoing/response.rst     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/user_guide_src/source/incoming/message.rst b/user_guide_src/source/incoming/message.rst
index 317f7823b8d2..e5f5a49ab4af 100644
--- a/user_guide_src/source/incoming/message.rst
+++ b/user_guide_src/source/incoming/message.rst
@@ -19,7 +19,7 @@ resource to serve more than one type of content, allowing the clients to request
 data that works best for them.
 
 A classic example of this is a browser that cannot display PNG files can request only GIF or
-JPEG images. When the getServer receives the request, it looks at the available file types the client
+JPEG images. When the server receives the request, it looks at the available file types the client
 is requesting and selects the best match from the image formats that it supports, in this case
 likely choosing a JPEG image to return.
 
diff --git a/user_guide_src/source/incoming/request.rst b/user_guide_src/source/incoming/request.rst
index 27dce8c8267f..62a9f962cf6e 100644
--- a/user_guide_src/source/incoming/request.rst
+++ b/user_guide_src/source/incoming/request.rst
@@ -86,7 +86,7 @@ Class Reference
         :rtype:   mixed
 
         This method is identical to the ``post()``, ``get()`` and ``cookie()`` methods from the
-        :doc:`IncomingRequest Class </incoming/incomingrequest>`, only it fetches getServer data (``$_SERVER``)::
+        :doc:`IncomingRequest Class </incoming/incomingrequest>`, only it fetches server data (``$_SERVER``)::
 
             $request->getServer('some_data');
 
diff --git a/user_guide_src/source/libraries/curlrequest.rst b/user_guide_src/source/libraries/curlrequest.rst
index e7163133d5bc..62e6ebbaa0c8 100644
--- a/user_guide_src/source/libraries/curlrequest.rst
+++ b/user_guide_src/source/libraries/curlrequest.rst
@@ -166,7 +166,7 @@ The body can be retrieved using the ``getBody()`` method::
 
     $body = $response->getBody();
 
-The body is the raw body provided by the remote getServer. If the content type requires formatting, you will need
+The body is the raw body provided by the remote server. If the content type requires formatting, you will need
 to ensure that your script handles that::
 
     if (strpos($response->getHeader('content-type'), 'application/json') !== false) {
@@ -239,7 +239,7 @@ To specify the location of a PEM formatted client-side certificate, pass a strin
 file as the ``cert`` option. If a password is required, set the value to an array with the first element
 as the path to the certificate, and the second as the password::
 
-    $client->request('get', '/', ['cert' => ['/path/getServer.pem', 'password']);
+    $client->request('get', '/', ['cert' => ['/path/server.pem', 'password']);
 
 connect_timeout
 ===============
diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
index b4622bd93b88..a573710ad8c8 100644
--- a/user_guide_src/source/outgoing/response.rst
+++ b/user_guide_src/source/outgoing/response.rst
@@ -111,7 +111,7 @@ HTTP Caching
 
 Built into the HTTP specification are tools help the client (often the web browser) cache the results. Used correctly,
 this can lead to a huge performance boost to your application because it will tell the client that they don't need
-to contact the getServer at all since nothing has changed. And you can't get faster than that.
+to contact the server at all since nothing has changed. And you can't get faster than that.
 
 This are handled through the ``Cache-Control`` and ``ETag`` headers. This guide is not the proper place for a thorough
 introduction to all of the cache headers power, but you can get a good understanding over at

From 9147a4fb1e26f7bde5db8bb2e1a55f9f13850768 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 1 Feb 2022 09:18:06 +0900
Subject: [PATCH 1474/2325] docs: add version up of Kint

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

diff --git a/user_guide_src/source/changelogs/v4.1.6.rst b/user_guide_src/source/changelogs/v4.1.6.rst
index 6993add513f9..2321f413e173 100644
--- a/user_guide_src/source/changelogs/v4.1.6.rst
+++ b/user_guide_src/source/changelogs/v4.1.6.rst
@@ -39,6 +39,7 @@ Enhancements
 
 - Database pane on debug toolbar now displays location where Query was called from. Also displays full backtrace.
 - :ref:`Subqueries <query-builder-where-subquery>` in QueryBuilder can now be an instance of the BaseBuilder class.
+- Kint was updated from ^3.3 to ^4.0.
 
 Changes
 *******

From 78b9bee595814c4379200e55afa6ba029fe83b94 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 1 Feb 2022 10:27:55 +0900
Subject: [PATCH 1475/2325] docs: update Faker URL

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

diff --git a/user_guide_src/source/testing/fabricator.rst b/user_guide_src/source/testing/fabricator.rst
index 933db982b2ee..abd68d8af86b 100644
--- a/user_guide_src/source/testing/fabricator.rst
+++ b/user_guide_src/source/testing/fabricator.rst
@@ -3,7 +3,7 @@ Generating Test Data
 ####################
 
 Often you will need sample data for your application to run its tests. The ``Fabricator`` class
-uses fzaninotto's `Faker <https://github.com/fzaninotto/Faker//>`_ to turn models into generators
+uses fzaninotto's `Faker <https://github.com/FakerPHP/Faker>`_ to turn models into generators
 of random data. Use fabricators in your seeds or test cases to stage fake data for your unit tests.
 
 .. contents::

From b7b784216c5ab5dd0a11eafe0df25c54aede6828 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 1 Feb 2022 12:13:13 +0700
Subject: [PATCH 1476/2325] Fix PHPStan notice on 1.4.4

---
 phpstan-baseline.neon.dist | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index 46aa7e5d1ae3..f2cad007146e 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -640,11 +640,6 @@ parameters:
 			count: 1
 			path: system/Helpers/number_helper.php
 
-		-
-			message: "#^Variable \\$mockService in empty\\(\\) always exists and is always falsy\\.$#"
-			count: 1
-			path: system/Helpers/test_helper.php
-
 		-
 			message: "#^Variable \\$pool might not be defined\\.$#"
 			count: 2
@@ -980,3 +975,8 @@ parameters:
 			count: 1
 			path: system/View/Parser.php
 
+		-
+			message: "#^Result of \\|\\| is always false\\.$#"
+			paths:
+				- system/Cache/CacheFactory.php
+				- system/Filters/Filters.php

From bf78c65394be73a78418b6ea225622331ef28a4c Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 1 Feb 2022 12:58:17 +0700
Subject: [PATCH 1477/2325] register - phpstan-baseline.neon.dist to
 test-phpstan on paths

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

diff --git a/.github/workflows/test-phpstan.yml b/.github/workflows/test-phpstan.yml
index dcbcaf085fe8..6c0d40efa83a 100644
--- a/.github/workflows/test-phpstan.yml
+++ b/.github/workflows/test-phpstan.yml
@@ -12,6 +12,7 @@ on:
       - 'system/**'
       - composer.json
       - phpstan.neon.dist
+      - phpstan-baseline.neon.dist
   push:
     branches:
       - 'develop'
@@ -21,6 +22,7 @@ on:
       - 'system/**'
       - composer.json
       - phpstan.neon.dist
+      - phpstan-baseline.neon.dist
 
 jobs:
   build:

From 498a5c083a98f70d2077067559446428a21e486b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 1 Feb 2022 17:24:07 +0900
Subject: [PATCH 1478/2325] fix: spark does not show Exception

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

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index ecd051273c75..b2d0ea84dbe7 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -316,6 +316,11 @@ public function run(?RouteCollectionInterface $routes = null, bool $returnRespon
             return;
         }
 
+        // spark command has nothing to do with HTTP redirect and 404
+        if (defined('SPARKED')) {
+            return $this->handleRequest($routes, $cacheConfig, $returnResponse);
+        }
+
         try {
             return $this->handleRequest($routes, $cacheConfig, $returnResponse);
         } catch (RedirectException $e) {

From 4724ee6bf6242a9e9f3b17029c6d25ef46e33e6c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 2 Feb 2022 09:01:51 +0900
Subject: [PATCH 1479/2325] docs: fix RST format

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

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 00cf3177a493..9029b6edb169 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -261,11 +261,11 @@ methods.
 setRule()
 =========
 
-This method sets a single rule. It has the method signature
+This method sets a single rule. It has the method signature::
 
     setRule(string $field, ?string $label, array|string $rules[, array $errors = []])
 
-The ``$rules`` either takes in a pipe-delimited list of rules or an array collection of rules.
+The ``$rules`` either takes in a pipe-delimited list of rules or an array collection of rules::
 
     $validation->setRule('username', 'Username', 'required|min_length[3]');
     $validation->setRule('password', 'Password', ['required', 'min_length[8]', 'alpha_numeric_punct']);

From 1eb0f6eeab33de4e2f2e596dbdceb7f17624fd85 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 2 Feb 2022 16:16:37 +0900
Subject: [PATCH 1480/2325] chore: fix composer dev package versions

---
 composer.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 6799259fdf62..376e2cdff38f 100644
--- a/composer.json
+++ b/composer.json
@@ -15,13 +15,13 @@
         "psr/log": "^1.1"
     },
     "require-dev": {
-        "codeigniter/coding-standard": "^1.1",
+        "codeigniter/coding-standard": "1.2.*",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "^3.1",
+        "friendsofphp/php-cs-fixer": "3.2.*",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.3",
         "nexusphp/tachycardia": "^1.0",
-        "phpstan/phpstan": "^1.0",
+        "phpstan/phpstan": "1.4.3",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
         "rector/rector": "0.12.10"

From 4ccac8683c460c9257c04c0532b69e9978aa0e46 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 2 Feb 2022 16:18:14 +0900
Subject: [PATCH 1481/2325] fix: executing CLI routes via HTTP request

---
 phpstan-baseline.neon.dist       |  5 -----
 system/CodeIgniter.php           |  7 +++++++
 tests/system/CodeIgniterTest.php | 19 +++++++++++++++++++
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index 0a91bd7fc64f..d25e5e23a409 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -115,11 +115,6 @@ parameters:
 			count: 1
 			path: system/CodeIgniter.php
 
-		-
-			message: "#^Dead catch \\- CodeIgniter\\\\Exceptions\\\\PageNotFoundException is never thrown in the try block\\.$#"
-			count: 1
-			path: system/CodeIgniter.php
-
 		-
 			message: "#^Property Config\\\\App\\:\\:\\$appTimezone \\(string\\) on left side of \\?\\? is not nullable\\.$#"
 			count: 1
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 24ad148269cf..80f37d13e8fc 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -299,6 +299,12 @@ public function run(?RouteCollectionInterface $routes = null, bool $returnRespon
 
         $this->spoofRequestMethod();
 
+        if ($this->request instanceof IncomingRequest && $this->request->getMethod() === 'cli') {
+            $this->response->setStatusCode(405)->setBody('Method Not Allowed');
+
+            return $this->sendResponse();
+        }
+
         Events::trigger('pre_system');
 
         // Check for a cached page. Execution will stop
@@ -352,6 +358,7 @@ public function useSafeOutput(bool $safe = true)
     /**
      * Handles the main request logic and fires the controller.
      *
+     * @throws PageNotFoundException
      * @throws RedirectException
      *
      * @return mixed|RequestInterface|ResponseInterface
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index f7838105af4d..cdaf5c6b9164 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -425,4 +425,23 @@ public function testRunDefaultRoute()
 
         $this->assertStringContainsString('Welcome to CodeIgniter', $output);
     }
+
+    public function testRunCLIRoute()
+    {
+        $_SERVER['argv'] = ['index.php', 'cli'];
+        $_SERVER['argc'] = 2;
+
+        $_SERVER['REQUEST_URI']     = '/cli';
+        $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
+        $_SERVER['REQUEST_METHOD']  = 'CLI';
+
+        $routes = Services::routes();
+        $routes->cli('cli', '\Tests\Support\Controllers\Popcorn::index');
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run();
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString('Method Not Allowed', $output);
+    }
 }

From 68beebbb82cae5c56490206cd3ccea1645b5e89c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 2 Feb 2022 16:27:24 +0900
Subject: [PATCH 1482/2325] config: update version number to 4.1.9

---
 system/CodeIgniter.php        | 2 +-
 user_guide_src/source/conf.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 80f37d13e8fc..09844471e478 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -45,7 +45,7 @@ class CodeIgniter
     /**
      * The current version of CodeIgniter Framework
      */
-    public const CI_VERSION = '4.1.8';
+    public const CI_VERSION = '4.1.9';
 
     private const MIN_PHP_VERSION = '7.3';
 
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 0f7585e66df4..188b3146f9ad 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -24,7 +24,7 @@
 version = '4.1'
 
 # The full version, including alpha/beta/rc tags.
-release = '4.1.8'
+release = '4.1.9'
 
 # -- General configuration ---------------------------------------------------
 

From 0c13bbdae6f1c8775463eb7f8d2fe40069dae6b3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 2 Feb 2022 16:34:42 +0900
Subject: [PATCH 1483/2325] docs: add changelog

---
 CHANGELOG.md                                     |  8 ++++++++
 user_guide_src/source/changelogs/index.rst       |  1 +
 user_guide_src/source/changelogs/v4.1.9.rst      | 15 +++++++++++++++
 user_guide_src/source/installation/upgrading.rst |  1 +
 4 files changed, 25 insertions(+)
 create mode 100644 user_guide_src/source/changelogs/v4.1.9.rst

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ecd4ae661e6..7d93525498dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [v4.1.9](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.9) (2022-02-xx)
+
+[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.8...v4.1.9)
+
+**SECURITY**
+
+* *Remote CLI Command Execution Vulnerability* was fixed. See the [Security advisory](https://github.com/codeigniter4/CodeIgniter4/security/advisories/GHSA-xjp4-6w75-qrj7) for more information.
+
 ## [v4.1.8](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.8) (2022-01-24)
 
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.7...v4.1.8)
diff --git a/user_guide_src/source/changelogs/index.rst b/user_guide_src/source/changelogs/index.rst
index 4a48ea878d98..9814dde5c4da 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.1.9
     v4.1.8
     v4.1.7
     v4.1.6
diff --git a/user_guide_src/source/changelogs/v4.1.9.rst b/user_guide_src/source/changelogs/v4.1.9.rst
new file mode 100644
index 000000000000..efc82b49b3f3
--- /dev/null
+++ b/user_guide_src/source/changelogs/v4.1.9.rst
@@ -0,0 +1,15 @@
+Version 4.1.9
+#############
+
+Release Date: February xx, 2022
+
+**4.1.9 release of CodeIgniter4**
+
+.. contents::
+    :local:
+    :depth: 2
+
+SECURITY
+********
+
+- *Remote CLI Command Execution Vulnerability* was fixed. See the `Security advisory <https://github.com/codeigniter4/CodeIgniter4/security/advisories/GHSA-xjp4-6w75-qrj7>`_ for more information.
diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index d142117ba7b9..911f5b836528 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -8,6 +8,7 @@ upgrading from.
 .. toctree::
     :titlesonly:
 
+    Upgrading from 4.1.7 to 4.1.8 <upgrade_418>
     Upgrading from 4.1.6 to 4.1.7 <upgrade_417>
     Upgrading from 4.1.5 to 4.1.6 <upgrade_416>
     Upgrading from 4.1.4 to 4.1.5 <upgrade_415>

From 059b0d5878006bd3ae1d48a1c602ae78d9620234 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 3 Feb 2022 09:27:36 +0900
Subject: [PATCH 1484/2325] docs: fix sample code

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

diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst
index b7863b03010d..2fdc896c23a9 100644
--- a/user_guide_src/source/general/errors.rst
+++ b/user_guide_src/source/general/errors.rst
@@ -65,14 +65,14 @@ Logging Exceptions
 By default, all Exceptions other than 404 - Page Not Found exceptions are logged. This can be turned on and off
 by setting the **$log** value of ``Config\Exceptions``::
 
-    class Exceptions
+    class Exceptions extends BaseConfig
     {
         public $log = true;
     }
 
 To ignore logging on other status codes, you can set the status code to ignore in the same file::
 
-    class Exceptions
+    class Exceptions extends BaseConfig
     {
         public $ignoredCodes = [ 404 ];
     }

From 5d9bf1fbe5a41aab43f15c6ddf32fabfa3cf7d72 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 3 Feb 2022 09:27:54 +0900
Subject: [PATCH 1485/2325] docs: change text decoration, etc.

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

diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst
index 2fdc896c23a9..921b1130ecf5 100644
--- a/user_guide_src/source/general/errors.rst
+++ b/user_guide_src/source/general/errors.rst
@@ -63,7 +63,7 @@ Logging Exceptions
 ------------------
 
 By default, all Exceptions other than 404 - Page Not Found exceptions are logged. This can be turned on and off
-by setting the **$log** value of ``Config\Exceptions``::
+by setting the ``$log`` value of **app/Config/Exceptions.php**::
 
     class Exceptions extends BaseConfig
     {
@@ -89,8 +89,8 @@ PageNotFoundException
 ---------------------
 
 This is used to signal a 404, Page Not Found error. When thrown, the system will show the view found at
-``/app/views/errors/html/error_404.php``. You should customize all of the error views for your site.
-If, in ``Config/Routes.php``, you have specified a 404 Override, that will be called instead of the standard
+**app/Views/errors/html/error_404.php**. You should customize all of the error views for your site.
+If, in **app/Config/Routes.php**, you have specified a 404 Override, that will be called instead of the standard
 404 page::
 
     if (! $page = $pageModel->find($id)) {

From 7295823da32930812e340742bc0c23dfb6373000 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 3 Feb 2022 10:47:49 +0900
Subject: [PATCH 1486/2325] test: move tests of getIPAddress() from
 CLIRequestTest to IncomingRequestTest

CLIRequest has nothing to do with IP address.
---
 tests/system/HTTP/CLIRequestTest.php      | 77 -----------------------
 tests/system/HTTP/IncomingRequestTest.php | 77 +++++++++++++++++++++++
 2 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/tests/system/HTTP/CLIRequestTest.php b/tests/system/HTTP/CLIRequestTest.php
index 1c7c23c1c21e..42679c2c48ae 100644
--- a/tests/system/HTTP/CLIRequestTest.php
+++ b/tests/system/HTTP/CLIRequestTest.php
@@ -553,83 +553,6 @@ public function testGetIPAddressDefault()
         $this->assertSame('0.0.0.0', $this->request->getIPAddress());
     }
 
-    public function testGetIPAddressNormal()
-    {
-        $expected               = '123.123.123.123';
-        $_SERVER['REMOTE_ADDR'] = $expected;
-        $this->request          = new Request(new App());
-        $this->assertSame($expected, $this->request->getIPAddress());
-        // call a second time to exercise the initial conditional block in getIPAddress()
-        $this->assertSame($expected, $this->request->getIPAddress());
-    }
-
-    public function testGetIPAddressThruProxy()
-    {
-        $expected                        = '123.123.123.123';
-        $_SERVER['REMOTE_ADDR']          = '10.0.1.200';
-        $config                          = new App();
-        $config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
-        $this->request                   = new Request($config);
-
-        // we should see the original forwarded address
-        $this->assertSame($expected, $this->request->getIPAddress());
-    }
-
-    public function testGetIPAddressThruProxyInvalid()
-    {
-        $expected                        = '123.456.23.123';
-        $_SERVER['REMOTE_ADDR']          = '10.0.1.200';
-        $config                          = new App();
-        $config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
-        $this->request                   = new Request($config);
-
-        // spoofed address invalid
-        $this->assertSame('10.0.1.200', $this->request->getIPAddress());
-    }
-
-    public function testGetIPAddressThruProxyNotWhitelisted()
-    {
-        $expected                        = '123.456.23.123';
-        $_SERVER['REMOTE_ADDR']          = '10.10.1.200';
-        $config                          = new App();
-        $config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
-        $this->request                   = new Request($config);
-
-        // spoofed address invalid
-        $this->assertSame('10.10.1.200', $this->request->getIPAddress());
-    }
-
-    public function testGetIPAddressThruProxySubnet()
-    {
-        $expected                        = '123.123.123.123';
-        $_SERVER['REMOTE_ADDR']          = '192.168.5.21';
-        $config                          = new App();
-        $config->proxyIPs                = ['192.168.5.0/24'];
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
-        $this->request                   = new Request($config);
-
-        // we should see the original forwarded address
-        $this->assertSame($expected, $this->request->getIPAddress());
-    }
-
-    public function testGetIPAddressThruProxyOutofSubnet()
-    {
-        $expected                        = '123.123.123.123';
-        $_SERVER['REMOTE_ADDR']          = '192.168.5.21';
-        $config                          = new App();
-        $config->proxyIPs                = ['192.168.5.0/28'];
-        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
-        $this->request                   = new Request($config);
-
-        // we should see the original forwarded address
-        $this->assertSame('192.168.5.21', $this->request->getIPAddress());
-    }
-
-    // FIXME getIPAddress should have more testing, to 100% code coverage
-
     public function testMethodReturnsRightStuff()
     {
         // Defaults method to CLI now.
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index e8c91268a8e2..10d2cefdd7ff 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -677,4 +677,81 @@ public function testSetPathUpdatesURI()
 
         $this->assertSame('apples', $request->getUri()->getPath());
     }
+
+    public function testGetIPAddressNormal()
+    {
+        $expected               = '123.123.123.123';
+        $_SERVER['REMOTE_ADDR'] = $expected;
+        $this->request          = new Request(new App());
+        $this->assertSame($expected, $this->request->getIPAddress());
+        // call a second time to exercise the initial conditional block in getIPAddress()
+        $this->assertSame($expected, $this->request->getIPAddress());
+    }
+
+    public function testGetIPAddressThruProxy()
+    {
+        $expected                        = '123.123.123.123';
+        $_SERVER['REMOTE_ADDR']          = '10.0.1.200';
+        $config                          = new App();
+        $config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+        $this->request                   = new Request($config);
+
+        // we should see the original forwarded address
+        $this->assertSame($expected, $this->request->getIPAddress());
+    }
+
+    public function testGetIPAddressThruProxyInvalid()
+    {
+        $expected                        = '123.456.23.123';
+        $_SERVER['REMOTE_ADDR']          = '10.0.1.200';
+        $config                          = new App();
+        $config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+        $this->request                   = new Request($config);
+
+        // spoofed address invalid
+        $this->assertSame('10.0.1.200', $this->request->getIPAddress());
+    }
+
+    public function testGetIPAddressThruProxyNotWhitelisted()
+    {
+        $expected                        = '123.456.23.123';
+        $_SERVER['REMOTE_ADDR']          = '10.10.1.200';
+        $config                          = new App();
+        $config->proxyIPs                = '10.0.1.200,192.168.5.0/24';
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+        $this->request                   = new Request($config);
+
+        // spoofed address invalid
+        $this->assertSame('10.10.1.200', $this->request->getIPAddress());
+    }
+
+    public function testGetIPAddressThruProxySubnet()
+    {
+        $expected                        = '123.123.123.123';
+        $_SERVER['REMOTE_ADDR']          = '192.168.5.21';
+        $config                          = new App();
+        $config->proxyIPs                = ['192.168.5.0/24'];
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+        $this->request                   = new Request($config);
+
+        // we should see the original forwarded address
+        $this->assertSame($expected, $this->request->getIPAddress());
+    }
+
+    public function testGetIPAddressThruProxyOutofSubnet()
+    {
+        $expected                        = '123.123.123.123';
+        $_SERVER['REMOTE_ADDR']          = '192.168.5.21';
+        $config                          = new App();
+        $config->proxyIPs                = ['192.168.5.0/28'];
+        $_SERVER['HTTP_X_FORWARDED_FOR'] = $expected;
+        $this->request                   = new Request($config);
+
+        // we should see the original forwarded address
+        $this->assertSame('192.168.5.21', $this->request->getIPAddress());
+    }
+
+    // FIXME getIPAddress should have more testing, to 100% code coverage
 }

From 1c2a8c4b29c60098e988eb0e5767e780c37ad587 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 3 Feb 2022 11:43:15 +0900
Subject: [PATCH 1487/2325] docs: FIXME -> @TODO

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

diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 10d2cefdd7ff..2f0ef21a1623 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -753,5 +753,5 @@ public function testGetIPAddressThruProxyOutofSubnet()
         $this->assertSame('192.168.5.21', $this->request->getIPAddress());
     }
 
-    // FIXME getIPAddress should have more testing, to 100% code coverage
+    // @TODO getIPAddress should have more testing, to 100% code coverage
 }

From a8259657f6df8e5ce1d6edf67b3b1ec4c75ba23a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 3 Feb 2022 12:38:51 +0900
Subject: [PATCH 1488/2325] refactor: make BaseController abstract

---
 app/Controllers/BaseController.php | 2 +-
 system/Config/Routes.php           | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php
index 0328f140bfdf..122db5f9a9f2 100644
--- a/app/Controllers/BaseController.php
+++ b/app/Controllers/BaseController.php
@@ -19,7 +19,7 @@
  *
  * For security be sure to declare any new methods as protected or private.
  */
-class BaseController extends Controller
+abstract class BaseController extends Controller
 {
     /**
      * Instance of the main Request object.
diff --git a/system/Config/Routes.php b/system/Config/Routes.php
index 4ace952bc3c8..14735e27432f 100644
--- a/system/Config/Routes.php
+++ b/system/Config/Routes.php
@@ -21,11 +21,6 @@
  * already loaded up and ready for us to use.
  */
 
-// Prevent access to BaseController
-$routes->add('BaseController(:any)', static function () {
-    throw PageNotFoundException::forPageNotFound();
-});
-
 // Prevent access to initController method
 $routes->add('(:any)/initController', static function () {
     throw PageNotFoundException::forPageNotFound();

From 51fee600fe3dbae2ae93b78119ebe21b896b126e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 3 Feb 2022 12:55:59 +0900
Subject: [PATCH 1489/2325] chore: remove Ignored error pattern

---
 phpstan-baseline.neon.dist | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index f2cad007146e..8d8834cb57dc 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -485,11 +485,6 @@ parameters:
 			count: 1
 			path: system/Debug/Exceptions.php
 
-		-
-			message: "#^Parameter \\#4 \\$replacement of function array_splice expects array\\|string, true given\\.$#"
-			count: 1
-			path: system/Debug/Exceptions.php
-
 		-
 			message: "#^Property CodeIgniter\\\\Debug\\\\Exceptions\\:\\:\\$formatter \\(CodeIgniter\\\\Format\\\\FormatterInterface\\) in isset\\(\\) is not nullable\\.$#"
 			count: 1

From 43ede2799b759a53db3347bec3188115ae8a2a8d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 3 Feb 2022 13:01:58 +0900
Subject: [PATCH 1490/2325] refactor: move logic to prevent access to
 initController

---
 system/Config/Routes.php           |  7 -------
 system/Router/Router.php           |  5 +++++
 tests/system/Router/RouterTest.php | 10 ++++++++++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/system/Config/Routes.php b/system/Config/Routes.php
index 14735e27432f..15298ce6cf2a 100644
--- a/system/Config/Routes.php
+++ b/system/Config/Routes.php
@@ -9,8 +9,6 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use CodeIgniter\Exceptions\PageNotFoundException;
-
 /*
  * System URI Routing
  *
@@ -21,11 +19,6 @@
  * already loaded up and ready for us to use.
  */
 
-// Prevent access to initController method
-$routes->add('(:any)/initController', static function () {
-    throw PageNotFoundException::forPageNotFound();
-});
-
 // Migrations
 $routes->cli('migrations/(:segment)/(:segment)', '\CodeIgniter\Commands\MigrationsCommand::$1/$2');
 $routes->cli('migrations/(:segment)', '\CodeIgniter\Commands\MigrationsCommand::$1');
diff --git a/system/Router/Router.php b/system/Router/Router.php
index fad7d45ee5f6..e655f147632e 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -485,6 +485,11 @@ public function autoRoute(string $uri)
             $this->method = array_shift($segments) ?: $this->method;
         }
 
+        // Prevent access to initController method
+        if (strtolower($this->method) === 'initcontroller') {
+            throw PageNotFoundException::forPageNotFound();
+        }
+
         if (! empty($segments)) {
             $this->params = $segments;
         }
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index af8588851ea7..3ba45ee03351 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -362,6 +362,16 @@ public function testAutoRouteRejectsMidDot()
         $router->autoRoute('Foo.bar');
     }
 
+    public function testAutoRouteRejectsInitController()
+    {
+        $router = new Router($this->collection, $this->request);
+        $router->setTranslateURIDashes(true);
+
+        $this->expectException(PageNotFoundException::class);
+
+        $router->autoRoute('home/initController');
+    }
+
     public function testDetectsLocales()
     {
         $router = new Router($this->collection, $this->request);

From 873ba16a6ba22e2b6d8da4f7bae33e9a9e2b1b0e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 3 Feb 2022 10:07:03 +0900
Subject: [PATCH 1491/2325] refactor: isCLI() does not use is_cli()

---
 system/HTTP/CLIRequest.php                | 2 +-
 system/HTTP/IncomingRequest.php           | 2 +-
 tests/system/HTTP/IncomingRequestTest.php | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
index 11bf598fd36c..c015571cde40 100644
--- a/system/HTTP/CLIRequest.php
+++ b/system/HTTP/CLIRequest.php
@@ -195,6 +195,6 @@ protected function parseCommand()
      */
     public function isCLI(): bool
     {
-        return is_cli();
+        return true;
     }
 }
diff --git a/system/HTTP/IncomingRequest.php b/system/HTTP/IncomingRequest.php
index d37f498e2d44..8bd5f33efbe2 100755
--- a/system/HTTP/IncomingRequest.php
+++ b/system/HTTP/IncomingRequest.php
@@ -347,7 +347,7 @@ public function negotiate(string $type, array $supported, bool $strictMatch = fa
      */
     public function isCLI(): bool
     {
-        return is_cli();
+        return false;
     }
 
     /**
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index e8c91268a8e2..72d71cefbac1 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -439,8 +439,7 @@ public function testCanGrabGetRawInput()
 
     public function testIsCLI()
     {
-        // this should be the case in unit testing
-        $this->assertTrue($this->request->isCLI());
+        $this->assertFalse($this->request->isCLI());
     }
 
     public function testIsAJAX()

From 59985994e0f2ce40ab1a875bcd91166c9bc3731c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 3 Feb 2022 13:59:38 +0900
Subject: [PATCH 1492/2325] docs: make array type VS Code compatible

Co-authored-by: MGatner <mgatner@icloud.com>
---
 system/Database/BaseConnection.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index a0f753f9fd8b..134a50517ae6 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -1526,7 +1526,8 @@ public function isWriteType($sql): bool
      *
      * Must return an array with keys 'code' and 'message':
      *
-     * @return array{code: int|string|null, message: string|null}
+     * @return array<string, int|string|null>
+     * @phpstan-return array{code: int|string|null, message: string|null}
      */
     abstract public function error(): array;
 

From c255d1c5ddbd8aa1ed4fea8bfacdf9f3250a7b86 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Thu, 3 Feb 2022 17:10:34 +0800
Subject: [PATCH 1493/2325] Feature: "spark routes" command shows routes with
 closure.

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/Commands/Utilities/Routes.php  | 5 +++--
 tests/_support/Config/Routes.php      | 1 +
 tests/system/Commands/CommandTest.php | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
index 26ad9b2a689e..d5c1dfefad28 100644
--- a/system/Commands/Utilities/Routes.php
+++ b/system/Commands/Utilities/Routes.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Commands\Utilities;
 
+use Closure;
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\Commands\Utilities\Routes\AutoRouteCollector;
@@ -92,11 +93,11 @@ public function run(array $params)
 
             foreach ($routes as $route => $handler) {
                 // filter for strings, as callbacks aren't displayable
-                if (is_string($handler)) {
+                if (is_string($handler) || $handler instanceof Closure) {
                     $tbody[] = [
                         strtoupper($method),
                         $route,
-                        $handler,
+                        is_string($handler) ? $handler : 'Closure',
                     ];
                 }
             }
diff --git a/tests/_support/Config/Routes.php b/tests/_support/Config/Routes.php
index 6ca5bbf2488d..ea288729aa9d 100644
--- a/tests/_support/Config/Routes.php
+++ b/tests/_support/Config/Routes.php
@@ -13,3 +13,4 @@
 
 // This is a simple file to include for testing the RouteCollection class.
 $routes->add('testing', 'TestController::index', ['as' => 'testing-index']);
+$routes->get('closure', static fn () => 'closure test');
diff --git a/tests/system/Commands/CommandTest.php b/tests/system/Commands/CommandTest.php
index 3333d215ba78..6e689f8b6a1a 100644
--- a/tests/system/Commands/CommandTest.php
+++ b/tests/system/Commands/CommandTest.php
@@ -110,6 +110,7 @@ public function testRoutesCommand()
     {
         command('routes');
 
+        $this->assertStringContainsString('| Closure', $this->getBuffer());
         $this->assertStringContainsString('| Route', $this->getBuffer());
         $this->assertStringContainsString('| testing', $this->getBuffer());
         $this->assertStringContainsString('\\TestController::index', $this->getBuffer());

From 4e0a9f43c23805ec9344c57dada1dfde5652fcd3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 4 Feb 2022 11:16:59 +0900
Subject: [PATCH 1494/2325] config: remove out-of-dated migrations routes

---
 system/Config/Routes.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/system/Config/Routes.php b/system/Config/Routes.php
index 15298ce6cf2a..0f16b675a8ad 100644
--- a/system/Config/Routes.php
+++ b/system/Config/Routes.php
@@ -19,10 +19,5 @@
  * already loaded up and ready for us to use.
  */
 
-// Migrations
-$routes->cli('migrations/(:segment)/(:segment)', '\CodeIgniter\Commands\MigrationsCommand::$1/$2');
-$routes->cli('migrations/(:segment)', '\CodeIgniter\Commands\MigrationsCommand::$1');
-$routes->cli('migrations', '\CodeIgniter\Commands\MigrationsCommand::index');
-
 // CLI Catchall - uses a _remap to call Commands
 $routes->cli('ci(:any)', '\CodeIgniter\CLI\CommandRunner::index/$1');

From 345e8cfcb96e52144129621ba0701971e6bcf96a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 4 Feb 2022 11:19:33 +0900
Subject: [PATCH 1495/2325] docs: remove out-of-dated explanation of Command

---
 contributing/internals.md | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/contributing/internals.md b/contributing/internals.md
index 6ced5f56dc48..acba8d9fdbd8 100644
--- a/contributing/internals.md
+++ b/contributing/internals.md
@@ -122,17 +122,9 @@ scans and keep performance high.
 
 ## Command-Line Support
 
-CodeIgniter has never been known for it's strong CLI support. However,
+CodeIgniter has never been known for its strong CLI support. However,
 if your package could benefit from it, create a new file under
-**system/Commands**. The class contained within is simply a controller
-that is intended for CLI usage only. The `index()` method should provide
-a list of available commands provided by that package.
-
-Routes must be added to **system/Config/Routes.php** using the `cli()`
-method to ensure it is not accessible through the browser, but is
-restricted to the CLI only.
-
-See the **MigrationsCommand** file for an example.
+**system/Commands**.
 
 ## Documentation
 

From 54438e3ae5bb1f263f9d55c80dead906b7630834 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Fri, 4 Feb 2022 11:52:38 +0800
Subject: [PATCH 1496/2325] Feature: "spark routes" closure. Decoration.

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/Commands/Utilities/Routes.php  | 2 +-
 tests/system/Commands/CommandTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
index d5c1dfefad28..f391c0a950bf 100644
--- a/system/Commands/Utilities/Routes.php
+++ b/system/Commands/Utilities/Routes.php
@@ -97,7 +97,7 @@ public function run(array $params)
                     $tbody[] = [
                         strtoupper($method),
                         $route,
-                        is_string($handler) ? $handler : 'Closure',
+                        is_string($handler) ? $handler : '(Closure)',
                     ];
                 }
             }
diff --git a/tests/system/Commands/CommandTest.php b/tests/system/Commands/CommandTest.php
index 6e689f8b6a1a..30cf3cce38b8 100644
--- a/tests/system/Commands/CommandTest.php
+++ b/tests/system/Commands/CommandTest.php
@@ -110,7 +110,7 @@ public function testRoutesCommand()
     {
         command('routes');
 
-        $this->assertStringContainsString('| Closure', $this->getBuffer());
+        $this->assertStringContainsString('| (Closure)', $this->getBuffer());
         $this->assertStringContainsString('| Route', $this->getBuffer());
         $this->assertStringContainsString('| testing', $this->getBuffer());
         $this->assertStringContainsString('\\TestController::index', $this->getBuffer());

From 0f26d9be184327bded82f6bed786622ce9c3a9ca Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 4 Feb 2022 13:00:15 +0900
Subject: [PATCH 1497/2325] docs: update coding style

---
 contributing/internals.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/contributing/internals.md b/contributing/internals.md
index 6ced5f56dc48..e39328159176 100644
--- a/contributing/internals.md
+++ b/contributing/internals.md
@@ -17,11 +17,9 @@ other core packages, you can create that in the constructor using the
 override that:
 
 ```php
-    public function __construct(Foo $foo=null)
+    public function __construct(?Foo $foo = null)
     {
-        $this->foo = $foo instanceOf Foo
-            ? $foo
-            : \Config\Services::foo();
+        $this->foo = $foo ?? \Config\Services::foo();
     }
 ```
 

From db0f19342085f0cac2604ed5f096c3606ab46b30 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 4 Feb 2022 13:00:33 +0900
Subject: [PATCH 1498/2325] docs: fix link

---
 contributing/internals.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributing/internals.md b/contributing/internals.md
index e39328159176..577715558a97 100644
--- a/contributing/internals.md
+++ b/contributing/internals.md
@@ -73,7 +73,7 @@ package itself will need its own sub-namespace that collects all related
 files into one grouping, like `CodeIgniter\HTTP`.
 
 Files MUST be named the same as the class they hold, and they must match
-the Style Guide &lt;./styleguide.md&gt;, meaning CamelCase class and
+the [Style Guide](styleguide.md), meaning CamelCase class and
 file names. They should be in their own directory that matches the
 sub-namespace under the **system** directory.
 

From 8a5d3517ed7efa6c769b77bca8be56e3ad7ae125 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 5 Feb 2022 09:36:08 +0900
Subject: [PATCH 1499/2325] refactor: remove cookies() and use
 $response->setCookie() instead

---
 system/Session/Session.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/system/Session/Session.php b/system/Session/Session.php
index ebfb6a94d082..0b27b03fa46e 100644
--- a/system/Session/Session.php
+++ b/system/Session/Session.php
@@ -12,8 +12,10 @@
 namespace CodeIgniter\Session;
 
 use CodeIgniter\Cookie\Cookie;
+use CodeIgniter\HTTP\Response;
 use Config\App;
 use Config\Cookie as CookieConfig;
+use Config\Services;
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\LoggerInterface;
 use SessionHandlerInterface;
@@ -904,6 +906,8 @@ protected function setCookie()
         $expiration   = $this->sessionExpiration === 0 ? 0 : time() + $this->sessionExpiration;
         $this->cookie = $this->cookie->withValue(session_id())->withExpires($expiration);
 
-        cookies([$this->cookie], false)->dispatch();
+        /** @var Response $response */
+        $response = Services::response();
+        $response->setCookie($this->cookie);
     }
 }

From e3158a11dd52cb6c9b22c2859590512ce8724d72 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 5 Feb 2022 09:41:34 +0900
Subject: [PATCH 1500/2325] docs: add changelog

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 161fba26ffa7..0fc876025840 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -34,6 +34,7 @@ Changes
 
 - Update minimal PHP requirement to 7.4.
 - The current version of Content Security Policy (CSP) outputs one nonce for script and one for style tags. The previous version outputted one nonce for each tag.
+- The process of sending cookies has been moved to the ``Response`` class. Now the ``Session`` class doesn't send cookies, set them to the Response.
 
 Deprecations
 ************

From 53e3990aa70974192e3aef5e1945b3710d201252 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 5 Feb 2022 10:13:16 +0900
Subject: [PATCH 1501/2325] chore: add rule Session depends on HTTP

---
 depfile.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/depfile.yaml b/depfile.yaml
index 301f17076f82..cca2df95c14d 100644
--- a/depfile.yaml
+++ b/depfile.yaml
@@ -198,6 +198,7 @@ ruleset:
     - HTTP
   Session:
     - Cookie
+    - HTTP
     - Database
   Throttle:
     - Cache

From 19e3893a272bde6d3cc824b75d9dcedab1218ce4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 5 Feb 2022 11:35:24 +0900
Subject: [PATCH 1502/2325] docs: update coding style of `if`

---
 user_guide_src/source/database/queries.rst                 | 2 +-
 user_guide_src/source/general/common_functions.rst         | 3 +--
 user_guide_src/source/helpers/filesystem_helper.rst        | 2 +-
 user_guide_src/source/incoming/request.rst                 | 2 +-
 user_guide_src/source/installation/upgrade_file_upload.rst | 7 ++-----
 user_guide_src/source/installation/upgrade_validations.rst | 7 ++-----
 user_guide_src/source/libraries/email.rst                  | 6 ++----
 user_guide_src/source/libraries/publisher.rst              | 3 +--
 8 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/user_guide_src/source/database/queries.rst b/user_guide_src/source/database/queries.rst
index b78cc1907b4c..5c20647ae986 100644
--- a/user_guide_src/source/database/queries.rst
+++ b/user_guide_src/source/database/queries.rst
@@ -189,7 +189,7 @@ If you need to get the last error that has occurred, the ``error()`` method
 will return an array containing its code and message. Here's a quick
 example::
 
-    if ( ! $db->simpleQuery('SELECT `example_field` FROM `example_table`')) {
+    if (! $db->simpleQuery('SELECT `example_field` FROM `example_table`')) {
         $error = $db->error(); // Has keys 'code' and 'message'
     }
 
diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index c041e470e920..381430023426 100755
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -122,8 +122,7 @@ Service Accessors
     Example::
 
         // in controller, checking form submittal
-        if (! $model->save($user))
-        {
+        if (! $model->save($user)) {
             // 'withInput' is what specifies "old data"
             // should be saved.
             return redirect()->back()->withInput();
diff --git a/user_guide_src/source/helpers/filesystem_helper.rst b/user_guide_src/source/helpers/filesystem_helper.rst
index c7a7e8ad22a2..93111a7e8c55 100644
--- a/user_guide_src/source/helpers/filesystem_helper.rst
+++ b/user_guide_src/source/helpers/filesystem_helper.rst
@@ -115,7 +115,7 @@ The following functions are available:
 
         $data = 'Some file data';
 
-        if ( ! write_file('./path/to/file.php', $data)) {     
+        if (! write_file('./path/to/file.php', $data)) {     
             echo 'Unable to write the file';
         } else {     
             echo 'File written!';
diff --git a/user_guide_src/source/incoming/request.rst b/user_guide_src/source/incoming/request.rst
index 62a9f962cf6e..109c22a7bd7e 100644
--- a/user_guide_src/source/incoming/request.rst
+++ b/user_guide_src/source/incoming/request.rst
@@ -46,7 +46,7 @@ Class Reference
 
             ::
 
-                if ( ! $request->isValidIP($ip)) {
+                if (! $request->isValidIP($ip)) {
                     echo 'Not Valid';
                 } else {
                     echo 'Valid';
diff --git a/user_guide_src/source/installation/upgrade_file_upload.rst b/user_guide_src/source/installation/upgrade_file_upload.rst
index a3e83cbce9e9..27bd74e19a74 100644
--- a/user_guide_src/source/installation/upgrade_file_upload.rst
+++ b/user_guide_src/source/installation/upgrade_file_upload.rst
@@ -54,14 +54,11 @@ CodeIgniter Version 3.x
 
             $this->load->library('upload', $config);
 
-            if ( ! $this->upload->do_upload('userfile'))
-            {
+            if (! $this->upload->do_upload('userfile')) {
                 $error = array('error' => $this->upload->display_errors());
 
                 $this->load->view('upload_form', $error);
-            }
-            else
-            {
+            } else {
                 $data = array('upload_data' => $this->upload->data());
 
                 $this->load->view('upload_success', $data);
diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
index 6b88ade7ef3c..1a71ef0b5065 100644
--- a/user_guide_src/source/installation/upgrade_validations.rst
+++ b/user_guide_src/source/installation/upgrade_validations.rst
@@ -91,12 +91,9 @@ Path: **application/controllers**::
 
             // Set validation rules
 
-            if ($this->form_validation->run() == FALSE)
-            {
+            if ($this->form_validation->run() == FALSE) {
                     $this->load->view('myform');
-            }
-            else
-            {
+            } else {
                     $this->load->view('formsuccess');
             }
         }
diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index a10b3d9bf6ca..e56af313b005 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -336,16 +336,14 @@ Class Reference
         The e-mail sending method. Returns boolean true or false based on
         success or failure, enabling it to be used conditionally::
 
-            if (! $email->send())
-            {
+            if (! $email->send()) {
                 // Generate error
             }
 
         This method will automatically clear all parameters if the request was
         successful. To stop this behaviour pass false::
 
-            if ($email->send(false))
-            {
+            if ($email->send(false)) {
                 // Parameters won't be cleared
             }
 
diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
index b32f0d64838a..895d74bee7b3 100644
--- a/user_guide_src/source/libraries/publisher.rst
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -89,8 +89,7 @@ the powerful ``Autoloader`` to locate any child classes primed for publication::
     {
         $result = $publisher->publish();
 
-        if ($result === false)
-        {
+        if ($result === false) {
             CLI::error(get_class($publisher) . ' failed to publish!', 'red');
         }
     }

From b416ddbb283243c2ce87c151b15eccf4f9016da1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 5 Feb 2022 10:01:59 +0900
Subject: [PATCH 1503/2325] refactor: use Kint 4.1 CSP nonce functionality

---
 rector.php                           |  1 -
 system/CodeIgniter.php               | 10 +++-
 system/Debug/Kint/RichRenderer.php   | 75 ----------------------------
 tests/system/CommonFunctionsTest.php |  4 +-
 4 files changed, 10 insertions(+), 80 deletions(-)
 delete mode 100644 system/Debug/Kint/RichRenderer.php

diff --git a/rector.php b/rector.php
index 11daa7a10bec..f82fe9134873 100644
--- a/rector.php
+++ b/rector.php
@@ -72,7 +72,6 @@
     $parameters->set(Option::SKIP, [
         __DIR__ . '/app/Views',
         __DIR__ . '/system/Debug/Toolbar/Views/toolbar.tpl.php',
-        __DIR__ . '/system/Debug/Kint/RichRenderer.php',
         __DIR__ . '/system/ThirdParty',
         __DIR__ . '/tests/system/Config/fixtures',
         __DIR__ . '/tests/_support',
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index b2d0ea84dbe7..62d7f84f4fbf 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -12,12 +12,12 @@
 namespace CodeIgniter;
 
 use Closure;
-use CodeIgniter\Debug\Kint\RichRenderer;
 use CodeIgniter\Debug\Timer;
 use CodeIgniter\Events\Events;
 use CodeIgniter\Exceptions\FrameworkException;
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\CLIRequest;
+use CodeIgniter\HTTP\ContentSecurityPolicy;
 use CodeIgniter\HTTP\DownloadResponse;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RedirectResponse;
@@ -34,6 +34,7 @@
 use Exception;
 use Kint;
 use Kint\Renderer\CliRenderer;
+use Kint\Renderer\RichRenderer;
 
 /**
  * This class is the core of the framework, and will analyse the
@@ -257,7 +258,12 @@ protected function initializeKint()
             Kint::$plugins = $config->plugins;
         }
 
-        Kint::$renderers[Kint::MODE_RICH] = RichRenderer::class;
+        /** @var ContentSecurityPolicy $csp */
+        $csp = Services::csp();
+        if ($csp->enabled()) {
+            RichRenderer::$js_nonce  = $csp->getScriptNonce();
+            RichRenderer::$css_nonce = $csp->getStyleNonce();
+        }
 
         RichRenderer::$theme  = $config->richTheme;
         RichRenderer::$folder = $config->richFolder;
diff --git a/system/Debug/Kint/RichRenderer.php b/system/Debug/Kint/RichRenderer.php
deleted file mode 100644
index 8210fb21e1c2..000000000000
--- a/system/Debug/Kint/RichRenderer.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * This file is part of CodeIgniter 4 framework.
- *
- * (c) CodeIgniter Foundation <admin@codeigniter.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace CodeIgniter\Debug\Kint;
-
-use Kint\Renderer\RichRenderer as KintRichRenderer;
-
-/**
- * Overrides RichRenderer::preRender() for CSP
- */
-class RichRenderer extends KintRichRenderer
-{
-    public function preRender()
-    {
-        $output = '';
-
-        if ($this->pre_render) {
-            foreach (self::$pre_render_sources as $type => $values) {
-                $contents = '';
-
-                foreach ($values as $v) {
-                    $contents .= $v($this);
-                }
-
-                if (! \strlen($contents)) {
-                    continue;
-                }
-
-                switch ($type) {
-                    case 'script':
-                        $output .= '<script ' . csp_script_nonce() . ' class="kint-rich-script">' . $contents . '</script>';
-                        break;
-
-                    case 'style':
-                        $output .= '<style ' . csp_style_nonce() . ' class="kint-rich-style">' . $contents . '</style>';
-                        break;
-
-                    default:
-                        $output .= $contents;
-                }
-            }
-
-            // Don't pre-render on every dump
-            if (! $this->force_pre_render) {
-                self::$needs_pre_render = false;
-            }
-        }
-
-        $output .= '<div class="kint-rich';
-
-        if ($this->use_folder) {
-            $output .= ' kint-file';
-
-            if (self::$needs_folder_render || $this->force_pre_render) {
-                $output = $this->renderFolder() . $output;
-
-                if (! $this->force_pre_render) {
-                    self::$needs_folder_render = false;
-                }
-            }
-        }
-
-        $output .= '">';
-
-        return $output;
-    }
-}
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index c7f4059cbdcc..3598fd53efea 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -532,7 +532,7 @@ public function testDWithCSP()
         $config->CSPEnabled  = true;
         Kint::$cli_detection = false;
 
-        $this->expectOutputRegex('/<script nonce="[0-9a-z]{24}" class="kint-rich-script">/u');
+        $this->expectOutputRegex('/<script class="kint-rich-script" nonce="[0-9a-z]{24}">/u');
         d('string');
 
         // Restore settings
@@ -552,7 +552,7 @@ public function testTraceWithCSP()
         $config->CSPEnabled  = true;
         Kint::$cli_detection = false;
 
-        $this->expectOutputRegex('/<style nonce="[0-9a-z]{24}" class="kint-rich-style">/u');
+        $this->expectOutputRegex('/<style class="kint-rich-style" nonce="[0-9a-z]{24}">/u');
         trace();
     }
 

From 857464c99cf80aec30e25ebb7298eeef4523bea6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 5 Feb 2022 10:02:37 +0900
Subject: [PATCH 1504/2325] chore: update Kint version

system/ThirdParty/Kint/ is already 4.1.1.
---
 admin/framework/composer.json | 2 +-
 composer.json                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/framework/composer.json b/admin/framework/composer.json
index 68b46c10092c..57bffd74b98a 100644
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@@ -10,7 +10,7 @@
         "ext-intl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "kint-php/kint": "^4.0",
+        "kint-php/kint": "^4.1.1",
         "laminas/laminas-escaper": "^2.9",
         "psr/log": "^1.1"
     },
diff --git a/composer.json b/composer.json
index 5475def9c5c6..5b6e5897a833 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
         "ext-intl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "kint-php/kint": "^4.0",
+        "kint-php/kint": "^4.1.1",
         "laminas/laminas-escaper": "^2.9",
         "psr/log": "^1.1"
     },

From cae9f8941047454a27bef33b9f563ab8f1d81e2e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 5 Feb 2022 13:55:03 +0900
Subject: [PATCH 1505/2325] test: update Kint CSP tests

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

diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 3598fd53efea..1c8088fdf227 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -21,6 +21,7 @@
 use CodeIgniter\Session\Handlers\FileHandler;
 use CodeIgniter\Session\Session;
 use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\Mock\MockCodeIgniter;
 use CodeIgniter\Test\Mock\MockIncomingRequest;
 use CodeIgniter\Test\Mock\MockSecurity;
 use CodeIgniter\Test\Mock\MockSession;
@@ -526,10 +527,14 @@ public function testDWithCSP()
         $this->resetServices();
 
         /** @var App $config */
-        $config       = config('App');
-        $cliDetection = Kint::$cli_detection;
+        $config             = config('App');
+        $config->CSPEnabled = true;
 
-        $config->CSPEnabled  = true;
+        // Initialize Kint
+        $app = new MockCodeIgniter($config);
+        $app->initialize();
+
+        $cliDetection        = Kint::$cli_detection;
         Kint::$cli_detection = false;
 
         $this->expectOutputRegex('/<script class="kint-rich-script" nonce="[0-9a-z]{24}">/u');
@@ -548,8 +553,13 @@ public function testTraceWithCSP()
         $this->resetServices();
 
         /** @var App $config */
-        $config              = config('App');
-        $config->CSPEnabled  = true;
+        $config             = config('App');
+        $config->CSPEnabled = true;
+
+        // Initialize Kint
+        $app = new MockCodeIgniter($config);
+        $app->initialize();
+
         Kint::$cli_detection = false;
 
         $this->expectOutputRegex('/<style class="kint-rich-style" nonce="[0-9a-z]{24}">/u');

From 73fd422b9c3db30ffb6481c176891fb2492d3740 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 27 Jan 2022 16:05:58 +0900
Subject: [PATCH 1506/2325] docs: fix @return

---
 system/Router/Router.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/Router/Router.php b/system/Router/Router.php
index e655f147632e..80144959f6fb 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Router;
 
+use Closure;
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\Request;
 use CodeIgniter\Router\Exceptions\RedirectException;
@@ -39,7 +40,7 @@ class Router implements RouterInterface
     /**
      * The name of the controller class.
      *
-     * @var string
+     * @var Closure|string
      */
     protected $controller;
 
@@ -203,7 +204,7 @@ public function getFilters(): array
     /**
      * Returns the name of the matched controller.
      *
-     * @return mixed
+     * @return Closure|string
      */
     public function controllerName()
     {

From 77e389ea06f3ebb9148fcd2ca43d463b249a572b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 27 Jan 2022 16:07:10 +0900
Subject: [PATCH 1507/2325] docs: fix typo

---
 system/Filters/Filters.php        | 2 +-
 system/Router/RouteCollection.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Filters/Filters.php b/system/Filters/Filters.php
index 786ff0862b12..69788a0582c1 100644
--- a/system/Filters/Filters.php
+++ b/system/Filters/Filters.php
@@ -355,7 +355,7 @@ public function enableFilter(string $name, string $when = 'before')
     }
 
     /**
-     * Ensures that specific filters is on and enabled for the current request.
+     * Ensures that specific filters are on and enabled for the current request.
      *
      * Filters can have "arguments". This is done by placing a colon immediately
      * after the filter name, followed by a comma-separated list of arguments that
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 2fcebe62da50..15c1862a0895 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -429,7 +429,7 @@ public function getRoutes(?string $verb = null): array
         $collection = [];
 
         if (isset($this->routes[$verb])) {
-            // Keep current verb's routes at the beginning so they're matched
+            // Keep current verb's routes at the beginning, so they're matched
             // before any of the generic, "add" routes.
             if (isset($this->routes['*'])) {
                 $extraRules = array_diff_key($this->routes['*'], $this->routes[$verb]);

From acbd6bc16293568d9f4cd7fe833b58a1ced5a4e8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 27 Jan 2022 16:45:53 +0900
Subject: [PATCH 1508/2325] fix: `spark routes` description

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

diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
index f391c0a950bf..9f6bd768b43a 100644
--- a/system/Commands/Utilities/Routes.php
+++ b/system/Commands/Utilities/Routes.php
@@ -44,7 +44,7 @@ class Routes extends BaseCommand
      *
      * @var string
      */
-    protected $description = 'Displays all of user-defined routes. Does NOT display auto-detected routes.';
+    protected $description = 'Displays all routes.';
 
     /**
      * the Command's usage

From 4f3a316014606efd9f445d55bcd09780bcd52475 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 28 Jan 2022 09:17:06 +0900
Subject: [PATCH 1509/2325] feat: add RouteCollection::getPlaceholders()

---
 system/Router/RouteCollection.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 15c1862a0895..1724f8b906c9 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -90,7 +90,7 @@ class RouteCollection implements RouteCollectionInterface
      * Defined placeholders that can be used
      * within the
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $placeholders = [
         'any'      => '.*',
@@ -238,6 +238,18 @@ public function addPlaceholder($placeholder, ?string $pattern = null): RouteColl
         return $this;
     }
 
+    /**
+     * For `spark routes`
+     *
+     * @return array<string, string>
+     *
+     * @internal
+     */
+    public function getPlaceholders(): array
+    {
+        return $this->placeholders;
+    }
+
     /**
      * Sets the default namespace to use for Controllers when no other
      * namespace has been specified.

From 08e77bf75e0884cc2de5562a07c8ed57079963a2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 28 Jan 2022 09:17:50 +0900
Subject: [PATCH 1510/2325] feat: add SampleURIGenerator

---
 .../Utilities/Routes/SampleURIGenerator.php   | 61 +++++++++++++++++++
 .../Routes/SampleURIGeneratorTest.php         | 61 +++++++++++++++++++
 2 files changed, 122 insertions(+)
 create mode 100644 system/Commands/Utilities/Routes/SampleURIGenerator.php
 create mode 100644 tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php

diff --git a/system/Commands/Utilities/Routes/SampleURIGenerator.php b/system/Commands/Utilities/Routes/SampleURIGenerator.php
new file mode 100644
index 000000000000..984e50abd0e2
--- /dev/null
+++ b/system/Commands/Utilities/Routes/SampleURIGenerator.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Utilities\Routes;
+
+use CodeIgniter\Config\Services;
+use CodeIgniter\Router\RouteCollection;
+
+/**
+ * Generate a sample URI path from route key regex.
+ */
+final class SampleURIGenerator
+{
+    private RouteCollection $routes;
+
+    /**
+     * Sample URI path for placeholder.
+     *
+     * @var array<string, string>
+     */
+    private array $samples = [
+        'any'      => '123/abc',
+        'segment'  => 'abc_123',
+        'alphanum' => 'abc123',
+        'num'      => '123',
+        'alpha'    => 'abc',
+        'hash'     => 'abc_123',
+    ];
+
+    public function __construct(?RouteCollection $routes = null)
+    {
+        $this->routes = $routes ?? Services::routes();
+    }
+
+    /**
+     * @param string $routeKey route key regex
+     *
+     * @return string sample URI path
+     */
+    public function get(string $routeKey): string
+    {
+        $sampleUri = $routeKey;
+
+        foreach ($this->routes->getPlaceholders() as $placeholder => $regex) {
+            $sample = $this->samples[$placeholder] ?? '::unknown::';
+
+            $sampleUri = str_replace('(' . $regex . ')', $sample, $sampleUri);
+        }
+
+        // auto route
+        return str_replace('[/...]', '/1/2/3/4/5', $sampleUri);
+    }
+}
diff --git a/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php b/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php
new file mode 100644
index 000000000000..6a3160d20622
--- /dev/null
+++ b/tests/system/Commands/Utilities/Routes/SampleURIGeneratorTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Utilities\Routes;
+
+use CodeIgniter\Config\Services;
+use CodeIgniter\Test\CIUnitTestCase;
+use Generator;
+
+/**
+ * @internal
+ */
+final class SampleURIGeneratorTest extends CIUnitTestCase
+{
+    /**
+     * @dataProvider routeKeyProvider
+     */
+    public function testGet(string $routeKey, string $expected)
+    {
+        $generator = new SampleURIGenerator();
+
+        $uri = $generator->get($routeKey);
+
+        $this->assertSame($expected, $uri);
+    }
+
+    public function routeKeyProvider(): Generator
+    {
+        yield from [
+            'root'                => ['/', '/'],
+            'placeholder num'     => ['shop/product/([0-9]+)', 'shop/product/123'],
+            'placeholder segment' => ['shop/product/([^/]+)', 'shop/product/abc_123'],
+            'placeholder any'     => ['shop/product/(.*)', 'shop/product/123/abc'],
+            'auto route'          => ['home/index[/...]', 'home/index/1/2/3/4/5'],
+        ];
+    }
+
+    public function testGetFromPlaceholderCustomPlaceholder()
+    {
+        $routes = Services::routes();
+        $routes->addPlaceholder(
+            'uuid',
+            '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
+        );
+
+        $generator = new SampleURIGenerator();
+
+        $routeKey = 'shop/product/([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})';
+        $uri      = $generator->get($routeKey);
+
+        $this->assertSame('shop/product/::unknown::', $uri);
+    }
+}

From b26bbeaaa1d492ff46629fbb961280e92de28ba5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 28 Jan 2022 10:25:37 +0900
Subject: [PATCH 1511/2325] docs: fix @return type

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

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index b2d0ea84dbe7..b2468bc59db0 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -286,7 +286,7 @@ protected function initializeKint()
      * @throws Exception
      * @throws RedirectException
      *
-     * @return bool|mixed|RequestInterface|ResponseInterface
+     * @return bool|mixed|RequestInterface|ResponseInterface|void
      */
     public function run(?RouteCollectionInterface $routes = null, bool $returnResponse = false)
     {

From 88d8cfb7c02608261825b7dc15154e1ea49df950 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 28 Jan 2022 10:36:08 +0900
Subject: [PATCH 1512/2325] docs: add @return description

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

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index b2468bc59db0..869fc733aaa7 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -703,7 +703,7 @@ public function displayPerformanceMetrics(string $output): string
      *
      * @throws RedirectException
      *
-     * @return string|string[]|null
+     * @return string|string[]|null Route filters, that is, the filters specified in the routes file
      */
     protected function tryToRouteIt(?RouteCollectionInterface $routes = null)
     {

From 204091c049d2aed74fd99dd4cc59a9dc1c6fe885 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 28 Jan 2022 16:51:01 +0900
Subject: [PATCH 1513/2325] feat: add FilterFinder class

---
 .../Utilities/Routes/FilterFinder.php         |  64 +++++++++
 .../Utilities/Routes/FilterFinderTest.php     | 130 ++++++++++++++++++
 2 files changed, 194 insertions(+)
 create mode 100644 system/Commands/Utilities/Routes/FilterFinder.php
 create mode 100644 tests/system/Commands/Utilities/Routes/FilterFinderTest.php

diff --git a/system/Commands/Utilities/Routes/FilterFinder.php b/system/Commands/Utilities/Routes/FilterFinder.php
new file mode 100644
index 000000000000..995ad420c4c2
--- /dev/null
+++ b/system/Commands/Utilities/Routes/FilterFinder.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Utilities\Routes;
+
+use CodeIgniter\Filters\Filters;
+use CodeIgniter\Router\Router;
+use Config\Services;
+
+/**
+ * Finds filters.
+ */
+final class FilterFinder
+{
+    private Router $router;
+    private Filters $filters;
+
+    public function __construct(?Router $router = null, ?Filters $filters = null)
+    {
+        $this->router  = $router ?? Services::router();
+        $this->filters = $filters ?? Services::filters();
+    }
+
+    private function getRouteFilters(string $uri): array
+    {
+        $this->router->handle($uri);
+
+        $multipleFiltersEnabled = config('Feature')->multipleFilters ?? false;
+        if (! $multipleFiltersEnabled) {
+            $filter = $this->router->getFilter();
+
+            return $filter === null ? [] : [$filter];
+        }
+
+        return $this->router->getFilters();
+    }
+
+    /**
+     * @param string $uri URI path to find filters for
+     *
+     * @return array{before: array<class-string>, after: array<class-string>} Filter classnames
+     */
+    public function find(string $uri): array
+    {
+        $this->filters->reset();
+
+        // Add route filters
+        $routeFilters = $this->getRouteFilters($uri);
+        $this->filters->enableFilters($routeFilters, 'before');
+        $this->filters->enableFilters($routeFilters, 'after');
+
+        $this->filters->initialize($uri);
+
+        return $this->filters->getFiltersClass();
+    }
+}
diff --git a/tests/system/Commands/Utilities/Routes/FilterFinderTest.php b/tests/system/Commands/Utilities/Routes/FilterFinderTest.php
new file mode 100644
index 000000000000..05f3cf8b5550
--- /dev/null
+++ b/tests/system/Commands/Utilities/Routes/FilterFinderTest.php
@@ -0,0 +1,130 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Utilities\Routes;
+
+use CodeIgniter\Config\Services;
+use CodeIgniter\Filters\CSRF;
+use CodeIgniter\Filters\DebugToolbar;
+use CodeIgniter\Filters\Filters;
+use CodeIgniter\Filters\Honeypot;
+use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\HTTP\Response;
+use CodeIgniter\Router\RouteCollection;
+use CodeIgniter\Router\Router;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\ConfigFromArrayTrait;
+use Config\Filters as FiltersConfig;
+use Config\Modules;
+
+/**
+ * @internal
+ */
+final class FilterFinderTest extends CIUnitTestCase
+{
+    use ConfigFromArrayTrait;
+
+    private IncomingRequest $request;
+    private Response $response;
+    private Modules $moduleConfig;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->request  = Services::request();
+        $this->response = Services::response();
+
+        $this->moduleConfig          = new Modules();
+        $this->moduleConfig->enabled = false;
+    }
+
+    private function createRouteCollection(array $routes = []): RouteCollection
+    {
+        $collection = new RouteCollection(Services::locator(), $this->moduleConfig);
+
+        $routes = ($routes !== []) ? $routes : [
+            'users'                   => 'Users::index',
+            'user-setting/show-list'  => 'User_setting::show_list',
+            'user-setting/(:segment)' => 'User_setting::detail/$1',
+        ];
+
+        return $collection->map($routes);
+    }
+
+    private function createRouter(RouteCollection $collection): Router
+    {
+        return new Router($collection, $this->request);
+    }
+
+    private function createFilters(array $config = []): Filters
+    {
+        $config = ($config !== []) ? $config : [
+            'aliases' => [
+                'csrf'     => CSRF::class,
+                'toolbar'  => DebugToolbar::class,
+                'honeypot' => Honeypot::class,
+            ],
+            'globals' => [
+                'before' => [
+                    'csrf',
+                ],
+                'after' => [
+                    'toolbar',
+                ],
+            ],
+            'methods' => [
+                'get' => [],
+            ],
+            'filters' => [
+                'honeypot' => ['before' => ['form/*', 'survey/*']],
+            ],
+        ];
+        $filtersConfig = $this->createConfigFromArray(FiltersConfig::class, $config);
+
+        return new Filters($filtersConfig, $this->request, $this->response, $this->moduleConfig);
+    }
+
+    public function testFindGlobalsFilters()
+    {
+        $collection = $this->createRouteCollection();
+        $router     = $this->createRouter($collection);
+        $filters    = $this->createFilters();
+
+        $finder = new FilterFinder($router, $filters);
+
+        $filters = $finder->find('users');
+
+        $expected = [
+            'before' => [CSRF::class],
+            'after'  => [DebugToolbar::class],
+        ];
+        $this->assertSame($expected, $filters);
+    }
+
+    public function testFindGlobalsAndRouteFilters()
+    {
+        $collection = $this->createRouteCollection();
+        $collection->get('admin', ' AdminController::index', ['filter' => 'honeypot']);
+        $router  = $this->createRouter($collection);
+        $filters = $this->createFilters();
+
+        $finder = new FilterFinder($router, $filters);
+
+        $filters = $finder->find('admin');
+
+        $expected = [
+            'before' => [Honeypot::class, CSRF::class],
+            'after'  => [Honeypot::class, DebugToolbar::class],
+        ];
+        $this->assertSame($expected, $filters);
+    }
+}

From d2a444e2eeef1c77be32868b3bb2fce710fccb12 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 28 Jan 2022 16:51:35 +0900
Subject: [PATCH 1514/2325] docs: fix @return type

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

diff --git a/system/Router/Router.php b/system/Router/Router.php
index 80144959f6fb..1b80377e26cf 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -182,7 +182,7 @@ public function handle(?string $uri = null)
     /**
      * Returns the filter info for the matched route, if any.
      *
-     * @return string
+     * @return string|null
      *
      * @deprecated Use getFilters()
      */

From c01a623c66da40313d09435f9305a287b6acf942 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 28 Jan 2022 18:40:39 +0900
Subject: [PATCH 1515/2325] feat: add FilterCollector class

---
 .../Utilities/Routes/FilterCollector.php      | 61 +++++++++++++++++++
 .../Utilities/Routes/FilterCollectorTest.php  | 37 +++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 system/Commands/Utilities/Routes/FilterCollector.php
 create mode 100644 tests/system/Commands/Utilities/Routes/FilterCollectorTest.php

diff --git a/system/Commands/Utilities/Routes/FilterCollector.php b/system/Commands/Utilities/Routes/FilterCollector.php
new file mode 100644
index 000000000000..25beb7b48246
--- /dev/null
+++ b/system/Commands/Utilities/Routes/FilterCollector.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Utilities\Routes;
+
+use CodeIgniter\Config\Services;
+use CodeIgniter\Filters\Filters;
+use CodeIgniter\HTTP\Request;
+use CodeIgniter\Router\Router;
+
+/**
+ * Collects filters for a route.
+ */
+final class FilterCollector
+{
+    /**
+     * @param string $method HTTP method
+     * @param string $uri    URI path to find filters for
+     *
+     * @return array{before: array<class-string>, after: array<class-string>} Filter classnames
+     */
+    public function get(string $method, string $uri): array
+    {
+        if ($method === 'cli') {
+            return [
+                'before' => [],
+                'after'  => [],
+            ];
+        }
+
+        $request = Services::request(null, false);
+        $request->setMethod($method);
+
+        $router  = $this->createRouter($request);
+        $filters = $this->createFilters($request);
+
+        $finder = new FilterFinder($router, $filters);
+
+        return $finder->find($uri);
+    }
+
+    private function createRouter(Request $request): Router
+    {
+        return new Router(Services::routes(), $request);
+    }
+
+    private function createFilters(Request $request): Filters
+    {
+        $config = config('Filters');
+
+        return new Filters($config, $request, Services::response());
+    }
+}
diff --git a/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php
new file mode 100644
index 000000000000..9a0d8d45455b
--- /dev/null
+++ b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Utilities\Routes;
+
+use CodeIgniter\Filters\DebugToolbar;
+use CodeIgniter\Test\CIUnitTestCase;
+
+/**
+ * @internal
+ */
+final class FilterCollectorTest extends CIUnitTestCase
+{
+    public function testGet()
+    {
+        $collector = new FilterCollector();
+
+        $filters = $collector->get('get', '/');
+
+        $expected = [
+            'before' => [
+            ],
+            'after' => [
+                DebugToolbar::class,
+            ],
+        ];
+        $this->assertSame($expected, $filters);
+    }
+}

From 7287fd55673bb24bf5f6ba9115d0503f0141d6e1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 28 Jan 2022 18:54:55 +0900
Subject: [PATCH 1516/2325] feat: `spark routes` shows Filters

---
 system/Commands/Utilities/Routes.php | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
index 9f6bd768b43a..6231a9a564ad 100644
--- a/system/Commands/Utilities/Routes.php
+++ b/system/Commands/Utilities/Routes.php
@@ -15,6 +15,8 @@
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\Commands\Utilities\Routes\AutoRouteCollector;
+use CodeIgniter\Commands\Utilities\Routes\FilterCollector;
+use CodeIgniter\Commands\Utilities\Routes\SampleURIGenerator;
 use Config\Services;
 
 /**
@@ -86,7 +88,9 @@ public function run(array $params)
             'cli',
         ];
 
-        $tbody = [];
+        $tbody           = [];
+        $uriGenerator    = new SampleURIGenerator();
+        $filterCollector = new FilterCollector();
 
         foreach ($methods as $method) {
             $routes = $collection->getRoutes($method);
@@ -94,10 +98,15 @@ public function run(array $params)
             foreach ($routes as $route => $handler) {
                 // filter for strings, as callbacks aren't displayable
                 if (is_string($handler) || $handler instanceof Closure) {
+                    $sampleUri = $uriGenerator->get($route);
+                    $filters   = $filterCollector->get($method, $sampleUri);
+
                     $tbody[] = [
                         strtoupper($method),
                         $route,
                         is_string($handler) ? $handler : '(Closure)',
+                        implode(' ', array_map('class_basename', $filters['before'])),
+                        implode(' ', array_map('class_basename', $filters['after'])),
                     ];
                 }
             }
@@ -109,13 +118,23 @@ public function run(array $params)
                 $collection->getDefaultController(),
                 $collection->getDefaultMethod()
             );
-            $tbody = [...$tbody, ...$autoRouteCollector->get()];
+            $autoRoutes = $autoRouteCollector->get();
+
+            foreach ($autoRoutes as &$routes) {
+                $filters  = $filterCollector->get('get', $uriGenerator->get($routes[1]));
+                $routes[] = implode(' ', array_map('class_basename', $filters['before']));
+                $routes[] = implode(' ', array_map('class_basename', $filters['after']));
+            }
+
+            $tbody = [...$tbody, ...$autoRoutes];
         }
 
         $thead = [
             'Method',
             'Route',
             'Handler',
+            'Filters:before',
+            'Filters:after',
         ];
 
         CLI::table($tbody, $thead);

From 313dce538b12976491cd672e480b316f76e5a400 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 29 Jan 2022 09:08:13 +0900
Subject: [PATCH 1517/2325] feat: output filter alias instead of classname

---
 .../Utilities/Routes/FilterCollector.php      |  2 +-
 .../Utilities/Routes/FilterFinder.php         |  4 +-
 .../Utilities/Routes/FilterCollectorTest.php  |  3 +-
 .../Utilities/Routes/FilterFinderTest.php     | 49 +++++++++++++++++--
 4 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/system/Commands/Utilities/Routes/FilterCollector.php b/system/Commands/Utilities/Routes/FilterCollector.php
index 25beb7b48246..78d8e3132079 100644
--- a/system/Commands/Utilities/Routes/FilterCollector.php
+++ b/system/Commands/Utilities/Routes/FilterCollector.php
@@ -25,7 +25,7 @@ final class FilterCollector
      * @param string $method HTTP method
      * @param string $uri    URI path to find filters for
      *
-     * @return array{before: array<class-string>, after: array<class-string>} Filter classnames
+     * @return array{before: list<string>, after: list<string>} array of filter alias or classname
      */
     public function get(string $method, string $uri): array
     {
diff --git a/system/Commands/Utilities/Routes/FilterFinder.php b/system/Commands/Utilities/Routes/FilterFinder.php
index 995ad420c4c2..bc761a9a4ee8 100644
--- a/system/Commands/Utilities/Routes/FilterFinder.php
+++ b/system/Commands/Utilities/Routes/FilterFinder.php
@@ -46,7 +46,7 @@ private function getRouteFilters(string $uri): array
     /**
      * @param string $uri URI path to find filters for
      *
-     * @return array{before: array<class-string>, after: array<class-string>} Filter classnames
+     * @return array{before: list<string>, after: list<string>} array of filter alias or classname
      */
     public function find(string $uri): array
     {
@@ -59,6 +59,6 @@ public function find(string $uri): array
 
         $this->filters->initialize($uri);
 
-        return $this->filters->getFiltersClass();
+        return $this->filters->getFilters();
     }
 }
diff --git a/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php
index 9a0d8d45455b..c27157ca7856 100644
--- a/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php
+++ b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php
@@ -11,7 +11,6 @@
 
 namespace CodeIgniter\Commands\Utilities\Routes;
 
-use CodeIgniter\Filters\DebugToolbar;
 use CodeIgniter\Test\CIUnitTestCase;
 
 /**
@@ -29,7 +28,7 @@ public function testGet()
             'before' => [
             ],
             'after' => [
-                DebugToolbar::class,
+                'toolbar',
             ],
         ];
         $this->assertSame($expected, $filters);
diff --git a/tests/system/Commands/Utilities/Routes/FilterFinderTest.php b/tests/system/Commands/Utilities/Routes/FilterFinderTest.php
index 05f3cf8b5550..eeacd68df163 100644
--- a/tests/system/Commands/Utilities/Routes/FilterFinderTest.php
+++ b/tests/system/Commands/Utilities/Routes/FilterFinderTest.php
@@ -16,6 +16,7 @@
 use CodeIgniter\Filters\DebugToolbar;
 use CodeIgniter\Filters\Filters;
 use CodeIgniter\Filters\Honeypot;
+use CodeIgniter\Filters\InvalidChars;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\Response;
 use CodeIgniter\Router\RouteCollection;
@@ -104,8 +105,8 @@ public function testFindGlobalsFilters()
         $filters = $finder->find('users');
 
         $expected = [
-            'before' => [CSRF::class],
-            'after'  => [DebugToolbar::class],
+            'before' => ['csrf'],
+            'after'  => ['toolbar'],
         ];
         $this->assertSame($expected, $filters);
     }
@@ -122,9 +123,49 @@ public function testFindGlobalsAndRouteFilters()
         $filters = $finder->find('admin');
 
         $expected = [
-            'before' => [Honeypot::class, CSRF::class],
-            'after'  => [Honeypot::class, DebugToolbar::class],
+            'before' => ['honeypot', 'csrf'],
+            'after'  => ['honeypot', 'toolbar'],
         ];
         $this->assertSame($expected, $filters);
     }
+
+    public function testFindGlobalsAndRouteClassnameFilters()
+    {
+        $collection = $this->createRouteCollection();
+        $collection->get('admin', ' AdminController::index', ['filter' => InvalidChars::class]);
+        $router  = $this->createRouter($collection);
+        $filters = $this->createFilters();
+
+        $finder = new FilterFinder($router, $filters);
+
+        $filters = $finder->find('admin');
+
+        $expected = [
+            'before' => [InvalidChars::class, 'csrf'],
+            'after'  => [InvalidChars::class, 'toolbar'],
+        ];
+        $this->assertSame($expected, $filters);
+    }
+
+    public function testFindGlobalsAndRouteMultipleFilters()
+    {
+        config('Feature')->multipleFilters = true;
+
+        $collection = $this->createRouteCollection();
+        $collection->get('admin', ' AdminController::index', ['filter' => ['honeypot', InvalidChars::class]]);
+        $router  = $this->createRouter($collection);
+        $filters = $this->createFilters();
+
+        $finder = new FilterFinder($router, $filters);
+
+        $filters = $finder->find('admin');
+
+        $expected = [
+            'before' => ['honeypot', InvalidChars::class, 'csrf'],
+            'after'  => ['honeypot', InvalidChars::class, 'toolbar'],
+        ];
+        $this->assertSame($expected, $filters);
+
+        config('Feature')->multipleFilters = false;
+    }
 }

From 31bb567a2651dfa270ae3f65e6f623ca2aafd6b2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 29 Jan 2022 10:20:49 +0900
Subject: [PATCH 1518/2325] docs: add documentation

---
 user_guide_src/source/incoming/filters.rst |  7 +++
 user_guide_src/source/incoming/routing.rst | 60 ++++++++++++++++++----
 2 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index 8677f1925dee..382d1f42790b 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -196,6 +196,13 @@ When configuring filters, additional arguments may be passed to a filter when se
 
 In this example, the array ``['dual', 'noreturn']`` will be passed in ``$arguments`` to the filter's ``before()`` and ``after()`` implementation methods.
 
+******************
+Confirming Filters
+******************
+
+You can see the routes and filters by the ``spark routes`` command.
+See :ref:`URI Routing <spark-routes>`.
+
 ****************
 Provided Filters
 ****************
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 44c9cbe9135c..5717aa5020bc 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -24,8 +24,9 @@ For example, let’s say you want your URLs to have this prototype::
 Normally the second segment of the URL path is reserved for the method name, but in the example
 above it instead has a product ID. To overcome this, CodeIgniter allows you to remap the URI handler.
 
+******************************
 Setting your own routing rules
-==============================
+******************************
 
 Routing rules are defined in the **app/Config/Routes.php** file. In it you'll see that
 it creates an instance of the RouteCollection class that permits you to specify your own routing criteria.
@@ -497,14 +498,15 @@ To disable this functionality, you must call the method with the parameter ``fal
 
 .. _routes-configuration-options:
 
+****************************
 Routes Configuration Options
-============================
+****************************
 
 The RoutesCollection class provides several options that affect all routes, and can be modified to meet your
 application's needs. These options are available at the top of **app/Config/Routes.php**.
 
 Default Namespace
------------------
+=================
 
 When matching a controller to a route, the router will add the default namespace value to the front of the controller
 specified by the route. By default, this value is ``App\Controllers``.
@@ -532,7 +534,7 @@ then you can change this value to save typing::
     $routes->add('users', 'Admin\Users::index');
 
 Default Controller
-------------------
+==================
 
 When a user visits the root of your site (i.e., example.com) the controller to use is determined by the value set by
 the ``setDefaultController()`` method, unless a route exists for it explicitly. The default value for this is ``Home``
@@ -546,7 +548,7 @@ in the controllers directory. For example, if the user visits **example.com/admi
 **app/Controllers/Admin/Home.php**, it would be used.
 
 Default Method
---------------
+==============
 
 This works similar to the default controller setting, but is used to determine the default method that is used
 when a controller is found that matches the URI, but no segment exists for the method. The default value is
@@ -558,7 +560,7 @@ In this example, if the user were to visit **example.com/products**, and a ``Pro
     $routes->setDefaultMethod('listAll');
 
 Translate URI Dashes
---------------------
+====================
 
 This option enables you to automatically replace dashes (``-``) with underscores in the controller and method
 URI segments, thus saving you additional route entries if you need to do that. This is required because the
@@ -569,7 +571,7 @@ dash isn’t a valid class or method name character and would cause a fatal erro
 .. _use-defined-routes-only:
 
 Use Defined Routes Only
------------------------
+=======================
 
 When no defined route is found that matches the URI, the system will attempt to match that URI against the
 controllers and methods as described above. You can disable this automatic matching, and restrict routes
@@ -581,7 +583,7 @@ to only those defined by you, by setting the ``setAutoRoute()`` option to false:
     requests. If the URI is accessible by the GET method, the CSRF protection will not work.
 
 404 Override
-------------
+============
 
 When a page is not found that matches the current URI, the system will show a generic 404 view. You can change
 what happens by specifying an action to happen with the ``set404Override()`` method. The value can be either
@@ -598,7 +600,7 @@ a valid class/method pair, just like you would show in any route, or a Closure::
 
 
 Route processing by priority
-----------------------------
+============================
 
 Enables or disables processing of the routes queue by priority. Lowering the priority is defined in the route option.
 Disabled by default. This functionality affects all routes.
@@ -609,3 +611,43 @@ For an example use of lowering the priority see :ref:`routing-priority`::
 
     // to disable
     $routes->setPrioritize(false);
+
+*****************
+Confirming Routes
+*****************
+
+CodeIgniter has the following :doc:`command </cli/cli_commands>` to display all routes.
+
+.. _spark-routes:
+
+**routes**
+
+Displays all routes and filters::
+
+    > php spark routes
+
+The output is like the following:
+
+.. code-block:: none
+
+    +--------+----------------------------+------------------------------------------------+----------------+-----------------------+
+    | Method | Route                      | Handler                                        | Filters:before | Filters:after         |
+    +--------+----------------------------+------------------------------------------------+----------------+-----------------------+
+    | GET    | /                          | \App\Controllers\Home::index                   | csrf           | secureheaders toolbar |
+    | CLI    | migrations/([^/]+)/([^/]+) | \CodeIgniter\Commands\MigrationsCommand::$1/$2 |                |                       |
+    | CLI    | migrations/([^/]+)         | \CodeIgniter\Commands\MigrationsCommand::$1    |                |                       |
+    | CLI    | migrations                 | \CodeIgniter\Commands\MigrationsCommand::index |                |                       |
+    | CLI    | ci(.*)                     | \CodeIgniter\CLI\CommandRunner::index/$1       |                |                       |
+    | auto   | /                          | \App\Controllers\Home::index                   | csrf           | secureheaders toolbar |
+    | auto   | home                       | \App\Controllers\Home::index                   | csrf           | secureheaders toolbar |
+    | auto   | home/index[/...]           | \App\Controllers\Home::index                   | csrf           | secureheaders toolbar |
+    +--------+----------------------------+------------------------------------------------+----------------+-----------------------+
+
+The *Method* column shows the HTTP method that the route is listening for. ``auto`` means that the route is discovered by auto routing, so it is not defined in **app/Config/Routes.php**.
+
+The *Route* column shows the URI path to match. The route of a defined route is expressed as a regular expression.
+But ``[/...]`` in the route of an auto route is indicates any number of segments.
+
+.. note:: When auto routing is enabled, if you have the route ``home``, it can be also accessd by ``Home``, or maybe by ``hOme``, ``hoMe``, ``HOME``, etc. But the command shows only ``home``.
+
+.. important:: The system is not perfect. If you use Custom Placeholders, *Filters* might not be correct. But the filters defined in **app/Config/Routes.php** are always displayed correctly.

From f871f4b53387a7458962ad3c5bdfae6c2ce941a8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 29 Jan 2022 14:56:11 +0900
Subject: [PATCH 1519/2325] fix: catch RedirectException

---
 .../Utilities/Routes/FilterFinder.php         | 18 +++++++++++++-----
 .../Utilities/Routes/FilterFinderTest.php     | 19 +++++++++++++++++++
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/system/Commands/Utilities/Routes/FilterFinder.php b/system/Commands/Utilities/Routes/FilterFinder.php
index bc761a9a4ee8..f36ddd9e362d 100644
--- a/system/Commands/Utilities/Routes/FilterFinder.php
+++ b/system/Commands/Utilities/Routes/FilterFinder.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Commands\Utilities\Routes;
 
 use CodeIgniter\Filters\Filters;
+use CodeIgniter\Router\Exceptions\RedirectException;
 use CodeIgniter\Router\Router;
 use Config\Services;
 
@@ -53,12 +54,19 @@ public function find(string $uri): array
         $this->filters->reset();
 
         // Add route filters
-        $routeFilters = $this->getRouteFilters($uri);
-        $this->filters->enableFilters($routeFilters, 'before');
-        $this->filters->enableFilters($routeFilters, 'after');
+        try {
+            $routeFilters = $this->getRouteFilters($uri);
+            $this->filters->enableFilters($routeFilters, 'before');
+            $this->filters->enableFilters($routeFilters, 'after');
 
-        $this->filters->initialize($uri);
+            $this->filters->initialize($uri);
 
-        return $this->filters->getFilters();
+            return $this->filters->getFilters();
+        } catch (RedirectException $e) {
+            return [
+                'before' => [],
+                'after'  => [],
+            ];
+        }
     }
 }
diff --git a/tests/system/Commands/Utilities/Routes/FilterFinderTest.php b/tests/system/Commands/Utilities/Routes/FilterFinderTest.php
index eeacd68df163..1b5e23c772f5 100644
--- a/tests/system/Commands/Utilities/Routes/FilterFinderTest.php
+++ b/tests/system/Commands/Utilities/Routes/FilterFinderTest.php
@@ -111,6 +111,25 @@ public function testFindGlobalsFilters()
         $this->assertSame($expected, $filters);
     }
 
+    public function testFindGlobalsFiltersWithRedirectRoute()
+    {
+        $collection = $this->createRouteCollection();
+        $collection->addRedirect('users/about', 'profile');
+
+        $router  = $this->createRouter($collection);
+        $filters = $this->createFilters();
+
+        $finder = new FilterFinder($router, $filters);
+
+        $filters = $finder->find('users/about');
+
+        $expected = [
+            'before' => [],
+            'after'  => [],
+        ];
+        $this->assertSame($expected, $filters);
+    }
+
     public function testFindGlobalsAndRouteFilters()
     {
         $collection = $this->createRouteCollection();

From 8ba28059d3c4cec1c4f6bd14970a70f058374545 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 6 Feb 2022 09:35:58 +0900
Subject: [PATCH 1520/2325] docs: remove out of dated comment

---
 system/Commands/Utilities/Routes.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
index 6231a9a564ad..29a01786daed 100644
--- a/system/Commands/Utilities/Routes.php
+++ b/system/Commands/Utilities/Routes.php
@@ -96,7 +96,6 @@ public function run(array $params)
             $routes = $collection->getRoutes($method);
 
             foreach ($routes as $route => $handler) {
-                // filter for strings, as callbacks aren't displayable
                 if (is_string($handler) || $handler instanceof Closure) {
                     $sampleUri = $uriGenerator->get($route);
                     $filters   = $filterCollector->get($method, $sampleUri);

From 91114e0632eb450d50a375eb473e1c780e9696fd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 6 Feb 2022 09:37:19 +0900
Subject: [PATCH 1521/2325] feat: change output table headers

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

diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
index 29a01786daed..e4bfec05b5a5 100644
--- a/system/Commands/Utilities/Routes.php
+++ b/system/Commands/Utilities/Routes.php
@@ -132,8 +132,8 @@ public function run(array $params)
             'Method',
             'Route',
             'Handler',
-            'Filters:before',
-            'Filters:after',
+            'Before Filters',
+            'After Filters',
         ];
 
         CLI::table($tbody, $thead);

From c65cb31d3c36110c3f976f9049955cd4d4ace467 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 6 Feb 2022 09:47:36 +0900
Subject: [PATCH 1522/2325] docs: update documentation

---
 user_guide_src/source/changelogs/v4.2.0.rst |  1 +
 user_guide_src/source/incoming/routing.rst  | 22 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 161fba26ffa7..3d2a2223350f 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -28,6 +28,7 @@ Enhancements
 - Added Validation Strict Rules. See :ref:`validation-traditional-and-strict-rules`.
 - Added new OCI8 driver for database.
     - It can access Oracle Database and supports SQL and PL/SQL statements.
+- The ``spark routes`` command now shows closure routes, auto routtes, and filters. See :ref:`URI Routing <spark-routes>`.
 
 Changes
 *******
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 5717aa5020bc..e54eeabce9a4 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -630,18 +630,16 @@ The output is like the following:
 
 .. code-block:: none
 
-    +--------+----------------------------+------------------------------------------------+----------------+-----------------------+
-    | Method | Route                      | Handler                                        | Filters:before | Filters:after         |
-    +--------+----------------------------+------------------------------------------------+----------------+-----------------------+
-    | GET    | /                          | \App\Controllers\Home::index                   | csrf           | secureheaders toolbar |
-    | CLI    | migrations/([^/]+)/([^/]+) | \CodeIgniter\Commands\MigrationsCommand::$1/$2 |                |                       |
-    | CLI    | migrations/([^/]+)         | \CodeIgniter\Commands\MigrationsCommand::$1    |                |                       |
-    | CLI    | migrations                 | \CodeIgniter\Commands\MigrationsCommand::index |                |                       |
-    | CLI    | ci(.*)                     | \CodeIgniter\CLI\CommandRunner::index/$1       |                |                       |
-    | auto   | /                          | \App\Controllers\Home::index                   | csrf           | secureheaders toolbar |
-    | auto   | home                       | \App\Controllers\Home::index                   | csrf           | secureheaders toolbar |
-    | auto   | home/index[/...]           | \App\Controllers\Home::index                   | csrf           | secureheaders toolbar |
-    +--------+----------------------------+------------------------------------------------+----------------+-----------------------+
+    +--------+------------------+------------------------------------------+----------------+-----------------------+
+    | Method | Route            | Handler                                  | Before Filters | After Filters         |
+    +--------+------------------+------------------------------------------+----------------+-----------------------+
+    | GET    | /                | \App\Controllers\Home::index             | invalidchars   | secureheaders toolbar |
+    | GET    | feed             | (Closure)                                | invalidchars   | secureheaders toolbar |
+    | CLI    | ci(.*)           | \CodeIgniter\CLI\CommandRunner::index/$1 |                |                       |
+    | auto   | /                | \App\Controllers\Home::index             | invalidchars   | secureheaders toolbar |
+    | auto   | home             | \App\Controllers\Home::index             | invalidchars   | secureheaders toolbar |
+    | auto   | home/index[/...] | \App\Controllers\Home::index             | invalidchars   | secureheaders toolbar |
+    +--------+------------------+------------------------------------------+----------------+-----------------------+
 
 The *Method* column shows the HTTP method that the route is listening for. ``auto`` means that the route is discovered by auto routing, so it is not defined in **app/Config/Routes.php**.
 

From d6220531ad4aac50dbb6203115461d2d2eea84fa Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 6 Feb 2022 11:55:05 +0900
Subject: [PATCH 1523/2325] docs: fix RST format error

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

diff --git a/user_guide_src/source/outgoing/view_renderer.rst b/user_guide_src/source/outgoing/view_renderer.rst
index 62fc30f5920e..15d1488aabbb 100644
--- a/user_guide_src/source/outgoing/view_renderer.rst
+++ b/user_guide_src/source/outgoing/view_renderer.rst
@@ -98,8 +98,7 @@ View Renderer Options
 Several options can be passed to the ``render()`` or ``renderString()`` methods:
 
 -   ``cache`` - the time in seconds, to save a view's results; ignored for renderString()
--   ``cache_name`` - the ID used to save/retrieve a cached view result; defaults to the viewpath;
-        ignored for renderString()
+-   ``cache_name`` - the ID used to save/retrieve a cached view result; defaults to the viewpath; ignored for ``renderString()``
 -   ``saveData`` - true if the view data parameters should be retained for subsequent calls
 
 .. note:: ``saveData`` as defined by the interface must be a boolean, but implementing

From a1143dc813078929fb42cddc58354aeb807d368d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 6 Feb 2022 11:55:36 +0900
Subject: [PATCH 1524/2325] docs: change the body text to a warning

Because it is a security matter.
---
 user_guide_src/source/outgoing/view_renderer.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/outgoing/view_renderer.rst b/user_guide_src/source/outgoing/view_renderer.rst
index 15d1488aabbb..bd5928134aa5 100644
--- a/user_guide_src/source/outgoing/view_renderer.rst
+++ b/user_guide_src/source/outgoing/view_renderer.rst
@@ -135,7 +135,7 @@ Class Reference
 
             echo $view->renderString('<div>My Sharona</div>');
 
-        This could be used for displaying content that might have been stored in a database,
+    .. warning:: This could be used for displaying content that might have been stored in a database,
         but you need to be aware that this is a potential security vulnerability,
         and that you **must** validate any such data, and probably escape it
         appropriately!

From fb5309b3dec1ecce90f696a58a04e3f21f02d59b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 6 Feb 2022 11:58:48 +0900
Subject: [PATCH 1525/2325] docs: add spaces in method signatures

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

diff --git a/user_guide_src/source/outgoing/view_renderer.rst b/user_guide_src/source/outgoing/view_renderer.rst
index bd5928134aa5..3a0ee71bf533 100644
--- a/user_guide_src/source/outgoing/view_renderer.rst
+++ b/user_guide_src/source/outgoing/view_renderer.rst
@@ -109,7 +109,7 @@ Class Reference
 
 .. php:class:: CodeIgniter\\View\\View
 
-    .. php:method:: render($view[, $options[, $saveData=false]])
+    .. php:method:: render($view[, $options[, $saveData = false]])
         :noindex:
 
         :param  string       $view: File name of the view source
@@ -122,7 +122,7 @@ Class Reference
 
             echo $view->render('myview');
 
-    .. php:method:: renderString($view[, $options[, $saveData=false]])
+    .. php:method:: renderString($view[, $options[, $saveData = false]])
         :noindex:
 
         :param  string       $view: Contents of the view to render, for instance content retrieved from a database
@@ -140,7 +140,7 @@ Class Reference
         and that you **must** validate any such data, and probably escape it
         appropriately!
 
-    .. php:method:: setData([$data[, $context=null]])
+    .. php:method:: setData([$data[, $context = null]])
         :noindex:
 
         :param  array   $data: Array of view data strings, as key/value pairs
@@ -158,7 +158,7 @@ Class Reference
         Each call adds to the array of data that the object is accumulating,
         until the view is rendered.
 
-    .. php:method:: setVar($name[, $value=null[, $context=null]])
+    .. php:method:: setVar($name[, $value = null[, $context = null]])
         :noindex:
 
         :param  string  $name: Name of the view data variable

From 388adf136f8bda5f095ee3de33b5b330b8aaf8eb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 6 Feb 2022 11:59:19 +0900
Subject: [PATCH 1526/2325] docs: change text decoration

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

diff --git a/user_guide_src/source/outgoing/view_renderer.rst b/user_guide_src/source/outgoing/view_renderer.rst
index 3a0ee71bf533..7da85b6f9546 100644
--- a/user_guide_src/source/outgoing/view_renderer.rst
+++ b/user_guide_src/source/outgoing/view_renderer.rst
@@ -48,7 +48,7 @@ to you to process the array appropriately in your PHP code.
 Method Chaining
 ===============
 
-The `setVar()` and `setData()` methods are chainable, allowing you to combine a
+The ``setVar()`` and ``setData()`` methods are chainable, allowing you to combine a
 number of different calls together in a chain::
 
     $view->setVar('one', $one)
@@ -62,7 +62,7 @@ When you pass data to the ``setVar()`` and ``setData()`` functions you have the
 against cross-site scripting attacks. As the last parameter in either method, you can pass the desired context to
 escape the data for. See below for context descriptions.
 
-If you don't want the data to be escaped, you can pass `null` or `raw` as the final parameter to each function::
+If you don't want the data to be escaped, you can pass ``null`` or ``'raw'`` as the final parameter to each function::
 
     $view->setVar('one', $one, 'raw');
 
@@ -78,7 +78,7 @@ Escaping Contexts
 By default, the ``esc()`` and, in turn, the ``setVar()`` and ``setData()`` functions assume that the data you want to
 escape is intended to be used within standard HTML. However, if the data is intended for use in Javascript, CSS,
 or in an href attribute, you would need different escaping rules to be effective. You can pass in the name of the
-context as the second parameter. Valid contexts are 'html', 'js', 'css', 'url', and 'attr'::
+context as the second parameter. Valid contexts are ``'html'``, ``'js'``, ``'css'``, ``'url'``, and ``'attr'``::
 
     <a href="<?= esc($url, 'url') ?>" data-foo="<?= esc($bar, 'attr') ?>">Some Link</a>
 
@@ -152,8 +152,8 @@ Class Reference
 
             $view->setData(['name'=>'George', 'position'=>'Boss']);
 
-        Supported escape contexts: html, css, js, url, or attr or raw.
-        If 'raw', no escaping will happen.
+        Supported escape contexts: ``html``, ``css``, ``js``, ``url``, or ``attr`` or ``raw``.
+        If ``'raw'``, no escaping will happen.
 
         Each call adds to the array of data that the object is accumulating,
         until the view is rendered.
@@ -171,8 +171,8 @@ Class Reference
 
             $view->setVar('name','Joe','html');
 
-        Supported escape contexts: html, css, js, url, attr or raw.
-        If 'raw', no escaping will happen.
+        Supported escape contexts: ``html``, ``css``, ``js``, ``url``, ``attr`` or ``raw``.
+        If ``'raw'``, no escaping will happen.
 
         If you use the a view data variable that you have previously used
         for this object, the new value will replace the existing one.

From 7f779c58dc3dfc01b6b0532debca551117c4e699 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 7 Feb 2022 11:03:46 +0900
Subject: [PATCH 1527/2325] docs: add warning about $method filters

---
 app/Config/Filters.php                               | 6 +++++-
 user_guide_src/source/incoming/filters.rst           | 4 ++++
 user_guide_src/source/installation/upgrade_415.rst   | 4 ++++
 user_guide_src/source/libraries/security.rst         | 4 ++++
 user_guide_src/source/libraries/throttler.rst        | 6 +++++-
 user_guide_src/source/tutorial/create_news_items.rst | 4 ++++
 6 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/Config/Filters.php b/app/Config/Filters.php
index 14685207f71b..cef3e546f5de 100644
--- a/app/Config/Filters.php
+++ b/app/Config/Filters.php
@@ -49,7 +49,11 @@ class Filters extends BaseConfig
      * particular HTTP method (GET, POST, etc.).
      *
      * Example:
-     * 'post' => ['csrf', 'throttle']
+     * 'post' => ['foo', 'bar']
+     *
+     * If you use this, you should disable auto-routing. Because auto-routing
+     * permits any HTTP method to access a controller. Accessing the controller
+     * with a method you don’t expect could bypass the filter.
      *
      * @var array
      */
diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index 8677f1925dee..21bfe44627d0 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -176,6 +176,10 @@ specify the method name in lowercase. It's value would be an array of filters to
 In addition to the standard HTTP methods, this also supports one special case: 'cli'. The 'cli' method would apply to
 all requests that were run from the command line.
 
+.. Warning:: If you use ``$methods`` filters, you should :ref:`disable auto-routing <use-defined-routes-only>`.
+    Because auto-routing permits any HTTP method to access a controller.
+    Accessing the controller with a method you don't expect could bypass the filter.
+
 $filters
 ========
 
diff --git a/user_guide_src/source/installation/upgrade_415.rst b/user_guide_src/source/installation/upgrade_415.rst
index d995a58d8ffd..a632f776d0b5 100644
--- a/user_guide_src/source/installation/upgrade_415.rst
+++ b/user_guide_src/source/installation/upgrade_415.rst
@@ -53,6 +53,10 @@ If you want the same behavior as the previous version, set the CSRF filter like
 
 Protecting **GET** method needs only when you use ``form_open()`` auto-generation of CSRF field.
 
+.. Warning:: In general, if you use ``$methods`` filters, you should :ref:`disable auto-routing <use-defined-routes-only>`.
+    Because auto-routing permits any HTTP method to access a controller.
+    Accessing the controller with a method you don't expect could bypass the filter.
+
 CURLRequest header change
 -------------------------
 
diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index 00c6173ee4f3..2fe2f685d136 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -129,6 +129,10 @@ It is also possible to enable the CSRF filter only for specific methods::
         'post' => ['csrf'],
     ];
 
+.. Warning:: If you use ``$methods`` filters, you should :ref:`disable auto-routing <use-defined-routes-only>`.
+    Because auto-routing permits any HTTP method to access a controller.
+    Accessing the controller with a method you don't expect could bypass the filter.
+
 HTML Forms
 ==========
 
diff --git a/user_guide_src/source/libraries/throttler.rst b/user_guide_src/source/libraries/throttler.rst
index 463efcbec9a4..dead804b73d3 100644
--- a/user_guide_src/source/libraries/throttler.rst
+++ b/user_guide_src/source/libraries/throttler.rst
@@ -117,9 +117,13 @@ filter::
 Next, we assign it to all POST requests made on the site::
 
     public $methods = [
-        'post' => ['throttle', 'csrf'],
+        'post' => ['throttle'],
     ];
 
+.. Warning:: If you use ``$methods`` filters, you should :ref:`disable auto-routing <use-defined-routes-only>`.
+    Because auto-routing permits any HTTP method to access a controller.
+    Accessing the controller with a method you don't expect could bypass the filter.
+
 And that's all there is to it. Now all POST requests made on the site will have to be rate limited.
 
 ***************
diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index 604c2373314e..a0214eae4e84 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -20,6 +20,10 @@ Open the **app/Config/Filters.php** file and update the ``$methods`` property li
 It configures the CSRF filter to be enabled for all **POST** requests.
 You can read more about the CSRF protection in :doc:`Security </libraries/security>` library.
 
+.. Warning:: In general, if you use ``$methods`` filters, you should :ref:`disable auto-routing <use-defined-routes-only>`.
+    Because auto-routing permits any HTTP method to access a controller.
+    Accessing the controller with a method you don't expect could bypass the filter.
+
 Create a form
 -------------
 

From 7541fe9e796bd3aeab7c824c4a623103b8029b0e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 7 Feb 2022 15:53:25 +0900
Subject: [PATCH 1528/2325] docs: remove out of dated explanation

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

diff --git a/user_guide_src/source/extending/basecontroller.rst b/user_guide_src/source/extending/basecontroller.rst
index bd5a76bf2386..229783df0369 100644
--- a/user_guide_src/source/extending/basecontroller.rst
+++ b/user_guide_src/source/extending/basecontroller.rst
@@ -40,7 +40,7 @@ example, if your project uses the Session Library heavily you may want to initia
 Additional Methods
 ==================
 
-The base controller is not routable (system config routes it to 404 Page Not Found). As an added security
+The base controller is not routable. As an added security
 measure **all** new methods you create should be declared as ``protected`` or ``private`` and only be accessed through the
 controllers you create that extend ``BaseController``.
 

From a838fba8e7186dfa07d140852aeda1cb209e6a9e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 8 Feb 2022 09:05:12 +0900
Subject: [PATCH 1529/2325] fix: Config `$redirect = false` does not work

---
 phpstan-baseline.neon.dist   | 58 +++---------------------------------
 system/Security/Security.php |  2 ++
 2 files changed, 6 insertions(+), 54 deletions(-)

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index 8d8834cb57dc..f1b7e7286411 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -741,63 +741,13 @@ parameters:
 			path: system/Router/Router.php
 
 		-
-			message: "#^Property Config\\\\App\\:\\:\\$CSRFCookieName \\(string\\) on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: system/Security/Security.php
-
-		-
-			message: "#^Property Config\\\\App\\:\\:\\$CSRFExpire \\(int\\) on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: system/Security/Security.php
-
-		-
-			message: "#^Property Config\\\\App\\:\\:\\$CSRFHeaderName \\(string\\) on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: system/Security/Security.php
-
-		-
-			message: "#^Property Config\\\\App\\:\\:\\$CSRFRegenerate \\(bool\\) on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: system/Security/Security.php
-
-		-
-			message: "#^Property Config\\\\App\\:\\:\\$CSRFTokenName \\(string\\) on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: system/Security/Security.php
-
-		-
-			message: "#^Property Config\\\\Security\\:\\:\\$cookieName \\(string\\) on left side of \\?\\? is not nullable\\.$#"
-			count: 1
+			message: "#^Property Config\\\\App\\:\\:\\$CSRF[a-zA-Z]+ \\([a-zA-Z]+\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 6
 			path: system/Security/Security.php
 
 		-
-			message: "#^Property Config\\\\Security\\:\\:\\$csrfProtection \\(string\\) on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: system/Security/Security.php
-
-		-
-			message: "#^Property Config\\\\Security\\:\\:\\$expires \\(int\\) on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: system/Security/Security.php
-
-		-
-			message: "#^Property Config\\\\Security\\:\\:\\$headerName \\(string\\) on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: system/Security/Security.php
-
-		-
-			message: "#^Property Config\\\\Security\\:\\:\\$regenerate \\(bool\\) on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: system/Security/Security.php
-
-		-
-			message: "#^Property Config\\\\Security\\:\\:\\$tokenName \\(string\\) on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: system/Security/Security.php
-
-		-
-			message: "#^Property Config\\\\Security\\:\\:\\$tokenRandomize \\(bool\\) on left side of \\?\\? is not nullable\\.$#"
-			count: 1
+			message: "#^Property Config\\\\Security\\:\\:\\$[a-zA-Z]+ \\([a-zA-Z]+\\) on left side of \\?\\? is not nullable\\.$#"
+			count: 8
 			path: system/Security/Security.php
 
 		-
diff --git a/system/Security/Security.php b/system/Security/Security.php
index 5d0daf46dfae..b5d861ea08a4 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -169,6 +169,7 @@ public function __construct(App $config)
             $this->tokenName      = $security->tokenName ?? $this->tokenName;
             $this->headerName     = $security->headerName ?? $this->headerName;
             $this->regenerate     = $security->regenerate ?? $this->regenerate;
+            $this->redirect       = $security->redirect ?? $this->redirect;
             $this->rawCookieName  = $security->cookieName ?? $this->rawCookieName;
             $this->expires        = $security->expires ?? $this->expires;
             $this->tokenRandomize = $security->tokenRandomize ?? $this->tokenRandomize;
@@ -179,6 +180,7 @@ public function __construct(App $config)
             $this->regenerate    = $config->CSRFRegenerate ?? $this->regenerate;
             $this->rawCookieName = $config->CSRFCookieName ?? $this->rawCookieName;
             $this->expires       = $config->CSRFExpire ?? $this->expires;
+            $this->redirect      = $config->CSRFRedirect ?? $this->redirect;
         }
 
         if ($this->isCSRFCookie()) {

From 231844618ea739721538e7d887ad4bd930827f32 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 8 Feb 2022 09:06:19 +0900
Subject: [PATCH 1530/2325] docs: update PHPDoc

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

diff --git a/app/Config/App.php b/app/Config/App.php
index 4d52cd430499..7ab0c7d7cfcb 100644
--- a/app/Config/App.php
+++ b/app/Config/App.php
@@ -436,7 +436,7 @@ class App extends BaseConfig
      * Defaults to `Lax` as recommended in this link:
      *
      * @see https://portswigger.net/web-security/csrf/samesite-cookies
-     * @deprecated Use `Config\Security` $samesite property instead of using this property.
+     * @deprecated `Config\Cookie` $samesite property is used.
      *
      * @var string
      */
diff --git a/app/Config/Security.php b/app/Config/Security.php
index 05083f8b1db1..107bd9549dc5 100644
--- a/app/Config/Security.php
+++ b/app/Config/Security.php
@@ -111,7 +111,7 @@ class Security extends BaseConfig
      *
      * @var string
      *
-     * @deprecated
+     * @deprecated `Config\Cookie` $samesite property is used.
      */
     public $samesite = 'Lax';
 }
diff --git a/system/Security/Security.php b/system/Security/Security.php
index b5d861ea08a4..b9309797f580 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -136,7 +136,7 @@ class Security implements SecurityInterface
      *
      * @var string
      *
-     * @deprecated
+     * @deprecated `Config\Cookie` $samesite property is used.
      */
     protected $samesite = Cookie::SAMESITE_LAX;
 

From cd5052dd181d181a251e969c4c94e54ba74b1bf9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 8 Feb 2022 10:05:28 +0900
Subject: [PATCH 1531/2325] docs: fix sample code

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

diff --git a/user_guide_src/source/testing/mocking.rst b/user_guide_src/source/testing/mocking.rst
index 758f6c2f3a50..972ad1a40f96 100644
--- a/user_guide_src/source/testing/mocking.rst
+++ b/user_guide_src/source/testing/mocking.rst
@@ -17,7 +17,7 @@ Cache
 You can mock the cache with the ``mock()`` method, using the ``CacheFactory`` as its only parameter.
 ::
 
-    $mock = mock(CodeIgniter\Cache\CacheFactory::class);
+    $mock = mock(\CodeIgniter\Cache\CacheFactory::class);
 
 While this returns an instance of ``CodeIgniter\Test\Mock\MockCache`` that you can use directly, it also inserts the
 mock into the Service class, so any calls within your code to ``service('cache')`` or ``Config\Services::cache()`` will
@@ -33,7 +33,7 @@ You can instruct the mocked cache handler to never do any caching with the ``byp
 using the dummy handler and ensures that your test does not rely on cached data for your tests.
 ::
 
-    $mock = mock(CodeIgniter\Cache\CacheFactory::class);
+    $mock = mock(\CodeIgniter\Cache\CacheFactory::class);
     // Never cache any items during this test.
     $mock->bypass();
 
@@ -43,7 +43,7 @@ Available Assertions
 The following new assertions are available on the mocked class for using during testing:
 ::
 
-    $mock = mock(CodeIgniter\Cache\CacheFactory::class);
+    $mock = mock(\CodeIgniter\Cache\CacheFactory::class);
 
     // Assert that a cached item named $key exists
     $mock->assertHas($key);

From aa37a14d313c79949d91f666b84dc325d33f257b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 9 Feb 2022 09:20:51 +0900
Subject: [PATCH 1532/2325] docs: add about "auto routes"

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

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index e54eeabce9a4..2edd9052c369 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -6,11 +6,29 @@ URI Routing
     :local:
     :depth: 2
 
+******************************
+Auto Routes and Defined Routes
+******************************
+
+Auto Routes
+===========
+
 Typically there is a one-to-one relationship between a URL string and its corresponding
 controller class/method. The segments in a URI normally follow this pattern::
 
     example.com/class/method/id/
 
+We call this "**Auto Routes**". CodeIgniter automatically routes a HTTP request,
+and executes the corresponding controller method. The auto-routing is enabled by default.
+
+.. note:: To prevent misconfiguration and miscoding, we recommend that you disable
+    the auto-routing feature. See :ref:`use-defined-routes-only`.
+
+.. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method.
+
+Defined Routes
+==============
+
 In some instances, however, you may want to remap this relationship so that a different
 class/method can be called instead of the one corresponding to the URL.
 
@@ -23,9 +41,10 @@ For example, let’s say you want your URLs to have this prototype::
 
 Normally the second segment of the URL path is reserved for the method name, but in the example
 above it instead has a product ID. To overcome this, CodeIgniter allows you to remap the URI handler.
+We call this "**Defined Routes**".
 
 ******************************
-Setting your own routing rules
+Setting Your Own Routing Rules
 ******************************
 
 Routing rules are defined in the **app/Config/Routes.php** file. In it you'll see that

From 74840071c55c9c7e4c1278222fa7d5451a8cc5fe Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 9 Feb 2022 11:40:48 +0900
Subject: [PATCH 1533/2325] fix: only allows PUT, PATCH, DELETE when Method
 Spoofing

---
 system/CodeIgniter.php           |  5 ++++-
 tests/system/CodeIgniterTest.php | 36 ++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 09844471e478..5704e57be92e 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -983,7 +983,10 @@ public function spoofRequestMethod()
             return;
         }
 
-        $this->request = $this->request->setMethod($method);
+        // Only allows PUT, PATCH, DELETE
+        if (in_array(strtoupper($method), ['PUT', 'PATCH', 'DELETE'], true)) {
+            $this->request = $this->request->setMethod($method);
+        }
     }
 
     /**
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index cdaf5c6b9164..10facadf875a 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -444,4 +444,40 @@ public function testRunCLIRoute()
 
         $this->assertStringContainsString('Method Not Allowed', $output);
     }
+
+    public function testSpoofRequestMethodCanUsePUT()
+    {
+        $_SERVER['argv'] = ['index.php'];
+        $_SERVER['argc'] = 1;
+
+        $_SERVER['REQUEST_URI']     = '/';
+        $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
+        $_SERVER['REQUEST_METHOD']  = 'POST';
+
+        $_POST['_method'] = 'PUT';
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run();
+        ob_get_clean();
+
+        $this->assertSame('put', Services::request()->getMethod());
+    }
+
+    public function testSpoofRequestMethodCannotUseGET()
+    {
+        $_SERVER['argv'] = ['index.php'];
+        $_SERVER['argc'] = 1;
+
+        $_SERVER['REQUEST_URI']     = '/';
+        $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
+        $_SERVER['REQUEST_METHOD']  = 'POST';
+
+        $_POST['_method'] = 'GET';
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run();
+        ob_get_clean();
+
+        $this->assertSame('post', Services::request()->getMethod());
+    }
 }

From ea39ea8f4b29f4222041d878e5d64bd905086a0a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 9 Feb 2022 12:46:49 +0900
Subject: [PATCH 1534/2325] test: fix failure of testRoutesCommand()

---
 tests/system/Commands/CommandTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/system/Commands/CommandTest.php b/tests/system/Commands/CommandTest.php
index 3333d215ba78..e44524f7e577 100644
--- a/tests/system/Commands/CommandTest.php
+++ b/tests/system/Commands/CommandTest.php
@@ -27,6 +27,8 @@ final class CommandTest extends CIUnitTestCase
 
     protected function setUp(): void
     {
+        $this->resetServices();
+
         parent::setUp();
 
         CITestStreamFilter::$buffer = '';

From 2985af3b53d7436f094d4490c083fdcaaa4f07e1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 9 Feb 2022 13:02:17 +0900
Subject: [PATCH 1535/2325] docs: add changelog

---
 CHANGELOG.md                                | 1 +
 user_guide_src/source/changelogs/v4.1.9.rst | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d93525498dd..85928ad2b111 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 **SECURITY**
 
 * *Remote CLI Command Execution Vulnerability* was fixed. See the [Security advisory](https://github.com/codeigniter4/CodeIgniter4/security/advisories/GHSA-xjp4-6w75-qrj7) for more information.
+* *Cross-Site Request Forgery (CSRF) Protection Bypass Vulnerability* was fixed. See the [Security advisory](https://github.com/codeigniter4/CodeIgniter4/security/advisories/GHSA-4v37-24gm-h554) for more information.
 
 ## [v4.1.8](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.8) (2022-01-24)
 
diff --git a/user_guide_src/source/changelogs/v4.1.9.rst b/user_guide_src/source/changelogs/v4.1.9.rst
index efc82b49b3f3..ea41903d979d 100644
--- a/user_guide_src/source/changelogs/v4.1.9.rst
+++ b/user_guide_src/source/changelogs/v4.1.9.rst
@@ -12,4 +12,5 @@ Release Date: February xx, 2022
 SECURITY
 ********
 
-- *Remote CLI Command Execution Vulnerability* was fixed. See the `Security advisory <https://github.com/codeigniter4/CodeIgniter4/security/advisories/GHSA-xjp4-6w75-qrj7>`_ for more information.
+- *Remote CLI Command Execution Vulnerability* was fixed. See the `Security advisory GHSA-xjp4-6w75-qrj7 <https://github.com/codeigniter4/CodeIgniter4/security/advisories/GHSA-xjp4-6w75-qrj7>`_ for more information.
+- *Cross-Site Request Forgery (CSRF) Protection Bypass Vulnerability* was fixed. See the `Security advisory GHSA-4v37-24gm-h554 <https://github.com/codeigniter4/CodeIgniter4/security/advisories/GHSA-4v37-24gm-h554>`_ for more information.

From 4fb099786ca39d1a9113e57b93c635229b346adf Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 9 Feb 2022 14:36:50 +0900
Subject: [PATCH 1536/2325] docs: fix typo

Co-authored-by: Lonnie Ezell <lonnieje@gmail.com>
---
 user_guide_src/source/incoming/routing.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 2edd9052c369..0ca6f8c93d59 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -18,7 +18,7 @@ controller class/method. The segments in a URI normally follow this pattern::
 
     example.com/class/method/id/
 
-We call this "**Auto Routes**". CodeIgniter automatically routes a HTTP request,
+We call this "**Auto Routes**". CodeIgniter automatically routes an HTTP request,
 and executes the corresponding controller method. The auto-routing is enabled by default.
 
 .. note:: To prevent misconfiguration and miscoding, we recommend that you disable

From d0c7ec6c0eccb12bd5cb890184a6c4302aaee814 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 9 Feb 2022 22:19:04 +0800
Subject: [PATCH 1537/2325] Permit use of latest php-cs-fixer v3.6

---
 composer.json                                     | 2 +-
 spark                                             | 9 +++++++++
 system/Test/Mock/MockSecurityConfig.php           | 2 +-
 tests/system/Config/ServicesTest.php              | 2 +-
 tests/system/Cookie/CookieStoreTest.php           | 2 +-
 tests/system/Helpers/SecurityHelperTest.php       | 2 +-
 tests/system/Log/Handlers/ErrorlogHandlerTest.php | 2 +-
 7 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 5475def9c5c6..30465eb41a41 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.1",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "3.4.*",
+        "friendsofphp/php-cs-fixer": "^3.6",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.3",
         "nexusphp/tachycardia": "^1.0",
diff --git a/spark b/spark
index 9a5a5db90284..c8b1991ce477 100755
--- a/spark
+++ b/spark
@@ -1,6 +1,15 @@
 #!/usr/bin/env php
 <?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.
+ */
+
 /*
  * --------------------------------------------------------------------
  * CodeIgniter command-line tools
diff --git a/system/Test/Mock/MockSecurityConfig.php b/system/Test/Mock/MockSecurityConfig.php
index 67e9e289dde7..e01f30cdf396 100644
--- a/system/Test/Mock/MockSecurityConfig.php
+++ b/system/Test/Mock/MockSecurityConfig.php
@@ -11,7 +11,7 @@
 
 namespace CodeIgniter\Test\Mock;
 
-use Config\Security as Security;
+use Config\Security;
 
 /**
  * @deprecated
diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php
index 5f8cc476ae88..b33ff13f9387 100644
--- a/tests/system/Config/ServicesTest.php
+++ b/tests/system/Config/ServicesTest.php
@@ -43,7 +43,7 @@
 use CodeIgniter\View\Parser;
 use Config\App;
 use Config\Exceptions;
-use Tests\Support\Config\Services as Services;
+use Tests\Support\Config\Services;
 
 /**
  * @internal
diff --git a/tests/system/Cookie/CookieStoreTest.php b/tests/system/Cookie/CookieStoreTest.php
index eeebb6a2cf3f..96b74ae919f1 100644
--- a/tests/system/Cookie/CookieStoreTest.php
+++ b/tests/system/Cookie/CookieStoreTest.php
@@ -107,7 +107,7 @@ public function testCookieDispatching(): void
         $prod = $cookies['prod']->getOptions();
 
         /**
-         * @var MockObject&CookieStore $store
+         * @var CookieStore&MockObject $store
          */
         $store = $this->getMockBuilder(CookieStore::class)
             ->setConstructorArgs([$cookies])
diff --git a/tests/system/Helpers/SecurityHelperTest.php b/tests/system/Helpers/SecurityHelperTest.php
index 4d8169f6f712..08e276e62be6 100644
--- a/tests/system/Helpers/SecurityHelperTest.php
+++ b/tests/system/Helpers/SecurityHelperTest.php
@@ -14,7 +14,7 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockSecurity;
 use Config\App;
-use Tests\Support\Config\Services as Services;
+use Tests\Support\Config\Services;
 
 /**
  * @internal
diff --git a/tests/system/Log/Handlers/ErrorlogHandlerTest.php b/tests/system/Log/Handlers/ErrorlogHandlerTest.php
index d564fab7e660..f184f5a2db57 100644
--- a/tests/system/Log/Handlers/ErrorlogHandlerTest.php
+++ b/tests/system/Log/Handlers/ErrorlogHandlerTest.php
@@ -35,7 +35,7 @@ public function testErrorLoggingWithErrorLog(): void
     }
 
     /**
-     * @return MockObject&ErrorlogHandler
+     * @return ErrorlogHandler&MockObject
      */
     private function getMockedHandler(array $config = [])
     {

From a53559200ac1fd7378239915b0f49ac765fa5ba7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Feb 2022 15:04:49 +0000
Subject: [PATCH 1538/2325] chore(deps-dev): update rector/rector requirement

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

---
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 5475def9c5c6..69e360099fe0 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.15"
+        "rector/rector": "0.12.16"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From 559b9e57ed55b87bdee96a48fb998ad0d1b9f9d2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 10 Feb 2022 13:37:40 +0900
Subject: [PATCH 1539/2325] docs: remove @var

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

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 62d7f84f4fbf..8558e72658c8 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -17,7 +17,6 @@
 use CodeIgniter\Exceptions\FrameworkException;
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\CLIRequest;
-use CodeIgniter\HTTP\ContentSecurityPolicy;
 use CodeIgniter\HTTP\DownloadResponse;
 use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\RedirectResponse;
@@ -258,7 +257,6 @@ protected function initializeKint()
             Kint::$plugins = $config->plugins;
         }
 
-        /** @var ContentSecurityPolicy $csp */
         $csp = Services::csp();
         if ($csp->enabled()) {
             RichRenderer::$js_nonce  = $csp->getScriptNonce();

From 708e42ac098bc49d1b2152de2ffa736913f4f19a Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 9 Feb 2022 22:20:04 +0800
Subject: [PATCH 1540/2325] Remove unnecessary overrides

---
 .no-header.php-cs-fixer.dist.php | 12 +-----------
 .php-cs-fixer.dist.php           | 12 +-----------
 admin/framework/composer.json    |  2 +-
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/.no-header.php-cs-fixer.dist.php b/.no-header.php-cs-fixer.dist.php
index 9417a859e07e..153ac5bd1328 100644
--- a/.no-header.php-cs-fixer.dist.php
+++ b/.no-header.php-cs-fixer.dist.php
@@ -30,17 +30,7 @@
         __DIR__ . '/admin/starter/builds',
     ]);
 
-$overrides = [
-    'ordered_class_elements' => [
-        'order' => [
-            'use_trait',
-            'constant',
-            'property',
-            'method',
-        ],
-        'sort_algorithm' => 'none',
-    ],
-];
+$overrides = [];
 
 $options = [
     'cacheFile'    => 'build/.no-header.php-cs-fixer.cache',
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 5df3c5e90a52..3c9e05fe3b74 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -34,17 +34,7 @@
         __DIR__ . '/spark',
     ]);
 
-$overrides = [
-    'ordered_class_elements' => [
-        'order' => [
-            'use_trait',
-            'constant',
-            'property',
-            'method',
-        ],
-        'sort_algorithm' => 'none',
-    ],
-];
+$overrides = [];
 
 $options = [
     'cacheFile'    => 'build/.php-cs-fixer.cache',
diff --git a/admin/framework/composer.json b/admin/framework/composer.json
index 68b46c10092c..e55568065d6a 100644
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@@ -17,7 +17,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.1",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "^3.1",
+        "friendsofphp/php-cs-fixer": "^3.6",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.3",
         "phpunit/phpunit": "^9.1",

From 4b1b463c250406f900217e5068c643f455fe6e7d Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Thu, 10 Feb 2022 13:44:21 +0800
Subject: [PATCH 1541/2325] Auto-review `require-dev` matching

---
 tests/AutoReview/ComposerJsonTest.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/tests/AutoReview/ComposerJsonTest.php b/tests/AutoReview/ComposerJsonTest.php
index 752f9723e0ed..2d205c5fc872 100644
--- a/tests/AutoReview/ComposerJsonTest.php
+++ b/tests/AutoReview/ComposerJsonTest.php
@@ -36,6 +36,32 @@ public function testFrameworkRequireIsTheSameWithDevRequire(): void
         );
     }
 
+    public function testFrameworkRequireDevIsTheSameWithDevRequireDev(): void
+    {
+        $devComposer       = $this->getComposerJson(dirname(__DIR__, 2) . '/composer.json');
+        $frameworkComposer = $this->getComposerJson(dirname(__DIR__, 2) . '/admin/framework/composer.json');
+
+        $devRequireDev = $devComposer['require-dev'];
+        $fwRequireDev  = $frameworkComposer['require-dev'];
+
+        foreach ($devRequireDev as $dependency => $expectedVersion) {
+            if (! isset($fwRequireDev[$dependency])) {
+                $this->addToAssertionCount(1);
+
+                continue;
+            }
+
+            $this->assertSame($expectedVersion, $fwRequireDev[$dependency], sprintf(
+                'Framework\'s "%s" dev dependency is expected to have version constraint of "%s", found "%s" instead.' .
+                "\nPlease update the version constraint at %s.",
+                $dependency,
+                $expectedVersion,
+                $fwRequireDev[$dependency],
+                clean_path(dirname(__DIR__, 2) . '/admin/framework/composer.json')
+            ));
+        }
+    }
+
     private function getComposerJson(string $path): array
     {
         try {

From cda21d479d2a1e5f47288069311baad3dd52e4e1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 10 Feb 2022 14:09:58 +0900
Subject: [PATCH 1542/2325] fix: $builder->ignore()->insertBatch() only ignores
 on first iteration of batch

---
 system/Database/BaseBuilder.php              |  5 ++-
 system/Test/Mock/MockBuilder.php             |  5 +++
 tests/system/Database/Builder/InsertTest.php | 37 ++++++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index a3fc6c7563d3..a684ff525b7f 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1662,7 +1662,10 @@ public function insertBatch(?array $set = null, ?bool $escape = null, int $batch
             }
 
             if (! $hasQBSet) {
-                $this->resetWrite();
+                $this->resetRun([
+                    'QBSet'  => [],
+                    'QBKeys' => [],
+                ]);
             }
         }
 
diff --git a/system/Test/Mock/MockBuilder.php b/system/Test/Mock/MockBuilder.php
index 63002436b4e4..ae28190b0337 100644
--- a/system/Test/Mock/MockBuilder.php
+++ b/system/Test/Mock/MockBuilder.php
@@ -15,4 +15,9 @@
 
 class MockBuilder extends BaseBuilder
 {
+    protected $supportedIgnoreStatements = [
+        'update' => 'IGNORE',
+        'insert' => 'IGNORE',
+        'delete' => 'IGNORE',
+    ];
 }
diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php
index 5235a3bdbf58..1844434d3a1c 100644
--- a/tests/system/Database/Builder/InsertTest.php
+++ b/tests/system/Database/Builder/InsertTest.php
@@ -100,6 +100,43 @@ public function testInsertBatch()
         $this->assertSame($expected, str_replace("\n", ' ', $query->getQuery()));
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5671
+     */
+    public function testInsertBatchIgnore()
+    {
+        $builder = $this->db->table('jobs');
+
+        $insertData = [
+            [
+                'id'          => 2,
+                'name'        => 'Commedian',
+                'description' => 'There\'s something in your teeth',
+            ],
+            [
+                'id'          => 3,
+                'name'        => 'Cab Driver',
+                'description' => 'I am yellow',
+            ],
+        ];
+
+        $this->db->shouldReturn('execute', 1)->shouldReturn('affectedRows', 1);
+        $builder->ignore()->insertBatch($insertData, true, 1);
+
+        $query = $this->db->getLastQuery();
+        $this->assertInstanceOf(Query::class, $query);
+
+        $raw = <<<'SQL'
+            INSERT IGNORE INTO "jobs" ("description", "id", "name") VALUES ('I am yellow',3,'Cab Driver')
+            SQL;
+        $this->assertSame($raw, str_replace("\n", ' ', $query->getOriginalQuery()));
+
+        $expected = <<<'SQL'
+            INSERT IGNORE INTO "jobs" ("description", "id", "name") VALUES ('I am yellow',3,'Cab Driver')
+            SQL;
+        $this->assertSame($expected, str_replace("\n", ' ', $query->getQuery()));
+    }
+
     public function testInsertBatchWithoutEscape()
     {
         $builder = $this->db->table('jobs');

From ed31c1616b627c182f9f14b245b57979327d4a73 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 10 Feb 2022 22:08:39 +0800
Subject: [PATCH 1543/2325] Apply suggestions from code review

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 system/Commands/Utilities/Routes/AutoRouteCollector.php     | 1 +
 system/Commands/Utilities/Routes/ControllerMethodReader.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/system/Commands/Utilities/Routes/AutoRouteCollector.php b/system/Commands/Utilities/Routes/AutoRouteCollector.php
index 4585bc297ab8..30c8eecfee9d 100644
--- a/system/Commands/Utilities/Routes/AutoRouteCollector.php
+++ b/system/Commands/Utilities/Routes/AutoRouteCollector.php
@@ -36,6 +36,7 @@ public function __construct(string $namespace, string $defaultController, string
 
     /**
      * @return array<int, array<int, string>>
+     * @phpstan-return list<list<string>>
      */
     public function get(): array
     {
diff --git a/system/Commands/Utilities/Routes/ControllerMethodReader.php b/system/Commands/Utilities/Routes/ControllerMethodReader.php
index 2acf204ca6a4..27bdad046a99 100644
--- a/system/Commands/Utilities/Routes/ControllerMethodReader.php
+++ b/system/Commands/Utilities/Routes/ControllerMethodReader.php
@@ -36,6 +36,7 @@ public function __construct(string $namespace)
      * @phpstan-param class-string $class
      *
      * @return array<int, array{route: string, handler: string}>
+     * @phpstan-return list<array{route: string, handler: string}>
      */
     public function read(string $class, string $defaultController = 'Home', string $defaultMethod = 'index'): array
     {

From e3d3b71e6073d853674b49a7a2aa8f016b2fdaf5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 12 Feb 2022 12:53:34 +0900
Subject: [PATCH 1544/2325] fix: do not call header() if headers have already
 been sent

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

diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index a65be7a2ad2f..e8249271733a 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -109,7 +109,9 @@ public function exceptionHandler(Throwable $exception)
 
         if (! is_cli()) {
             $this->response->setStatusCode($statusCode);
-            header(sprintf('HTTP/%s %s %s', $this->request->getProtocolVersion(), $this->response->getStatusCode(), $this->response->getReasonPhrase()), true, $statusCode);
+            if (! headers_sent()) {
+                header(sprintf('HTTP/%s %s %s', $this->request->getProtocolVersion(), $this->response->getStatusCode(), $this->response->getReasonPhrase()), true, $statusCode);
+            }
 
             if (strpos($this->request->getHeaderLine('accept'), 'text/html') === false) {
                 $this->respond(ENVIRONMENT === 'development' ? $this->collectVars($exception, $statusCode) : '', $statusCode)->send();

From 8815745381595e22aed361b9e03a79e3d5e21518 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 3 Feb 2022 17:02:19 +0900
Subject: [PATCH 1545/2325] refactor: CodeIgniter has context: web, php-cli,
 spark

Make the constant SPARKED deprecated.
Remove is_cli() in CodeIgniter.
---
 public/index.php                              |  5 +-
 spark                                         |  9 ++-
 system/CodeIgniter.php                        | 65 +++++++++++++++----
 system/Test/FeatureTestCase.php               |  1 +
 system/Test/FeatureTestTrait.php              |  1 +
 tests/system/CLI/ConsoleTest.php              |  1 +
 tests/system/CodeIgniterTest.php              |  2 +
 tests/system/ControllerTest.php               |  1 +
 .../system/RESTful/ResourceControllerTest.php |  1 +
 .../system/RESTful/ResourcePresenterTest.php  |  1 +
 10 files changed, 74 insertions(+), 13 deletions(-)

diff --git a/public/index.php b/public/index.php
index 77373025f96d..f1c2f7e1e72f 100644
--- a/public/index.php
+++ b/public/index.php
@@ -25,7 +25,10 @@
 
 // Location of the framework bootstrap file.
 $bootstrap = rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
-$app       = require realpath($bootstrap) ?: $bootstrap;
+/** @var CodeIgniter\CodeIgniter $app */
+$app     = require realpath($bootstrap) ?: $bootstrap;
+$context = is_cli() ? 'php-cli' : 'web';
+$app->setContext($context);
 
 /*
  *---------------------------------------------------------------
diff --git a/spark b/spark
index c8b1991ce477..7d8b8eb64557 100755
--- a/spark
+++ b/spark
@@ -21,6 +21,11 @@
  * this class mainly acts as a passthru to the framework itself.
  */
 
+/**
+ * @var bool
+ *
+ * @deprecated No longer in use. `CodeIgniter` has `$context` property.
+ */
 define('SPARKED', true);
 
 /*
@@ -51,7 +56,9 @@ $paths = new Config\Paths();
 chdir(FCPATH);
 
 $bootstrap = rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
-$app       = require realpath($bootstrap) ?: $bootstrap;
+/** @var CodeIgniter\CodeIgniter $app */
+$app = require realpath($bootstrap) ?: $bootstrap;
+$app->setContext('spark');
 
 // Grab our Console
 $console = new CodeIgniter\CLI\Console($app);
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 4cc1978a96f1..094c2faa2962 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -141,6 +141,11 @@ class CodeIgniter
      */
     protected $useSafeOutput = false;
 
+    /**
+     * Context: 'web', 'php-cli', 'spark'
+     */
+    protected string $context;
+
     /**
      * Constructor.
      */
@@ -294,6 +299,8 @@ protected function initializeKint()
      */
     public function run(?RouteCollectionInterface $routes = null, bool $returnResponse = false)
     {
+        assert($this->context !== null, 'Context must be set before run() is called');
+
         $this->startBenchmark();
 
         $this->getRequestObject();
@@ -321,7 +328,7 @@ public function run(?RouteCollectionInterface $routes = null, bool $returnRespon
         }
 
         // spark command has nothing to do with HTTP redirect and 404
-        if (defined('SPARKED')) {
+        if ($this->isSparked()) {
             return $this->handleRequest($routes, $cacheConfig, $returnResponse);
         }
 
@@ -358,6 +365,30 @@ public function useSafeOutput(bool $safe = true)
         return $this;
     }
 
+    /**
+     * Invoked via spark command?
+     */
+    private function isSparked(): bool
+    {
+        return $this->context === 'spark';
+    }
+
+    /**
+     * Invoked via php-cli command?
+     */
+    private function isPhpCli(): bool
+    {
+        return $this->context === 'php-cli';
+    }
+
+    /**
+     * Web access?
+     */
+    private function isWeb(): bool
+    {
+        return $this->context === 'web';
+    }
+
     /**
      * Handles the main request logic and fires the controller.
      *
@@ -389,7 +420,7 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
         }
 
         // Never run filters when running through Spark cli
-        if (! defined('SPARKED')) {
+        if (! $this->isSparked()) {
             // Run "before" filters
             $this->benchmark->start('before_filters');
             $possibleResponse = $filters->run($uri, 'before');
@@ -430,7 +461,7 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
         $this->gatherOutput($cacheConfig, $returned);
 
         // Never run filters when running through Spark cli
-        if (! defined('SPARKED')) {
+        if (! $this->isSparked()) {
             $filters->setResponse($this->response);
 
             // Run "after" filters
@@ -548,10 +579,8 @@ protected function getRequestObject()
             return;
         }
 
-        if (is_cli() && ENVIRONMENT !== 'testing') {
-            // @codeCoverageIgnoreStart
+        if ($this->isSparked() || $this->isPhpCli()) {
             $this->request = Services::clirequest($this->config);
-        // @codeCoverageIgnoreEnd
         } else {
             $this->request = Services::request($this->config);
             // guess at protocol if needed
@@ -567,7 +596,7 @@ protected function getResponseObject()
     {
         $this->response = Services::response($this->config);
 
-        if (! is_cli() || ENVIRONMENT === 'testing') {
+        if ($this->isWeb()) {
             $this->response->setProtocolVersion($this->request->getProtocolVersion());
         }
 
@@ -826,7 +855,7 @@ protected function createController()
     protected function runController($class)
     {
         // If this is a console request then use the input segments as parameters
-        $params = defined('SPARKED') ? $this->request->getSegments() : $this->router->params();
+        $params = $this->isSparked() ? $this->request->getSegments() : $this->router->params();
 
         if (method_exists($class, '_remap')) {
             $output = $class->_remap($this->method, ...$params);
@@ -884,7 +913,9 @@ protected function display404errors(PageNotFoundException $e)
             ob_end_flush(); // @codeCoverageIgnore
         }
 
-        throw PageNotFoundException::forPageNotFound(ENVIRONMENT !== 'production' || is_cli() ? $e->getMessage() : '');
+        throw PageNotFoundException::forPageNotFound(
+            ENVIRONMENT !== 'production' || ! $this->isWeb() ? $e->getMessage() : ''
+        );
     }
 
     /**
@@ -950,8 +981,8 @@ protected function gatherOutput(?Cache $cacheConfig = null, $returned = null)
     public function storePreviousURL($uri)
     {
         // Ignore CLI requests
-        if (is_cli() && ENVIRONMENT !== 'testing') {
-            return; // @codeCoverageIgnore
+        if (! $this->isWeb()) {
+            return;
         }
         // Ignore AJAX requests
         if (method_exists($this->request, 'isAJAX') && $this->request->isAJAX()) {
@@ -1015,4 +1046,16 @@ protected function callExit($code)
     {
         exit($code); // @codeCoverageIgnore
     }
+
+    /**
+     * Sets the app context.
+     *
+     * @return $this
+     */
+    public function setContext(string $context)
+    {
+        $this->context = $context;
+
+        return $this;
+    }
 }
diff --git a/system/Test/FeatureTestCase.php b/system/Test/FeatureTestCase.php
index b89ad5fb2fcc..dc0c65b4a8b7 100644
--- a/system/Test/FeatureTestCase.php
+++ b/system/Test/FeatureTestCase.php
@@ -194,6 +194,7 @@ public function call(string $method, string $path, ?array $params = null)
         Services::injectMock('filters', Services::filters(null, false));
 
         $response = $this->app
+            ->setContext('web')
             ->setRequest($request)
             ->run($routes, true);
 
diff --git a/system/Test/FeatureTestTrait.php b/system/Test/FeatureTestTrait.php
index a31852daf2cc..790de784e237 100644
--- a/system/Test/FeatureTestTrait.php
+++ b/system/Test/FeatureTestTrait.php
@@ -184,6 +184,7 @@ public function call(string $method, string $path, ?array $params = null)
         Services::injectMock('filters', Services::filters(null, false));
 
         $response = $this->app
+            ->setContext('web')
             ->setRequest($request)
             ->run($routes, true);
 
diff --git a/tests/system/CLI/ConsoleTest.php b/tests/system/CLI/ConsoleTest.php
index 087c28c12072..61905e71c613 100644
--- a/tests/system/CLI/ConsoleTest.php
+++ b/tests/system/CLI/ConsoleTest.php
@@ -49,6 +49,7 @@ protected function setUp(): void
         CLI::init();
 
         $this->app = new MockCodeIgniter(new MockCLIConfig());
+        $this->app->setContext('spark');
     }
 
     protected function tearDown(): void
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index a34664d9c9e1..124ce3fdbcfc 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -41,6 +41,7 @@ protected function setUp(): void
         $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
 
         $this->codeigniter = new MockCodeIgniter(new App());
+        $this->codeigniter->setContext('web');
     }
 
     protected function tearDown(): void
@@ -257,6 +258,7 @@ public function testRunForceSecure()
         $config->forceGlobalSecureRequests = true;
 
         $codeigniter = new MockCodeIgniter($config);
+        $codeigniter->setContext('web');
 
         $this->getPrivateMethodInvoker($codeigniter, 'getRequestObject')();
         $this->getPrivateMethodInvoker($codeigniter, 'getResponseObject')();
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index d4be0c503b7a..59546ab26077 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -71,6 +71,7 @@ protected function setUp(): void
         $this->response    = new Response($this->config);
         $this->logger      = \Config\Services::logger();
         $this->codeigniter = new MockCodeIgniter($this->config);
+        $this->codeigniter->setContext('web');
     }
 
     public function testConstructor()
diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index e6098527d09c..93554ee3c1d2 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -65,6 +65,7 @@ protected function setUp(): void
 
         $config            = new App();
         $this->codeigniter = new MockCodeIgniter($config);
+        $this->codeigniter->setContext('web');
     }
 
     protected function tearDown(): void
diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php
index 26ea1084b196..8176cc92bdc7 100644
--- a/tests/system/RESTful/ResourcePresenterTest.php
+++ b/tests/system/RESTful/ResourcePresenterTest.php
@@ -59,6 +59,7 @@ protected function setUp(): void
 
         $config            = new App();
         $this->codeigniter = new MockCodeIgniter($config);
+        $this->codeigniter->setContext('web');
     }
 
     protected function tearDown(): void

From 641aa56d24bbe805c013f562f47ef207ec56a9ed Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 6 Feb 2022 11:09:43 +0900
Subject: [PATCH 1546/2325] docs: improve PHPDocs

---
 system/CodeIgniter.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 094c2faa2962..acc2a97eacce 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -142,7 +142,12 @@ class CodeIgniter
     protected $useSafeOutput = false;
 
     /**
-     * Context: 'web', 'php-cli', 'spark'
+     * Context
+     *  web:     Invoked by HTTP request
+     *  php-cli: Invoked by CLI via `php public/index.php`
+     *  spark:   Invoked by CLI via the `spark` command
+     *
+     * @phpstan-var 'php-cli'|'spark'|'web'
      */
     protected string $context;
 
@@ -1050,6 +1055,8 @@ protected function callExit($code)
     /**
      * Sets the app context.
      *
+     * @phpstan-param 'php-cli'|'spark'|'web' $context
+     *
      * @return $this
      */
     public function setContext(string $context)

From ce41eef1563b95912f6b49978b9bab7598f689b8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 6 Feb 2022 11:17:49 +0900
Subject: [PATCH 1547/2325] test: add default $context = 'web' in
 MockCodeIgniter

---
 system/Test/Mock/MockCodeIgniter.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/system/Test/Mock/MockCodeIgniter.php b/system/Test/Mock/MockCodeIgniter.php
index bf2f54afdee0..f93d7eb4e782 100644
--- a/system/Test/Mock/MockCodeIgniter.php
+++ b/system/Test/Mock/MockCodeIgniter.php
@@ -15,6 +15,16 @@
 
 class MockCodeIgniter extends CodeIgniter
 {
+    /**
+     * Context
+     *  web:     Invoked by HTTP request
+     *  php-cli: Invoked by CLI via `php public/index.php`
+     *  spark:   Invoked by CLI via the `spark` command
+     *
+     * @phpstan-var 'php-cli'|'spark'|'web'
+     */
+    protected string $context = 'web';
+
     protected function callExit($code)
     {
         // Do not call exit() in testing.

From 0f424a89d919de95b38c225426f5a5c669302004 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 8 Feb 2022 10:11:46 +0900
Subject: [PATCH 1548/2325] docs: drop PHPDocs

---
 system/Test/Mock/MockCodeIgniter.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/system/Test/Mock/MockCodeIgniter.php b/system/Test/Mock/MockCodeIgniter.php
index f93d7eb4e782..81bd7e23122e 100644
--- a/system/Test/Mock/MockCodeIgniter.php
+++ b/system/Test/Mock/MockCodeIgniter.php
@@ -15,14 +15,6 @@
 
 class MockCodeIgniter extends CodeIgniter
 {
-    /**
-     * Context
-     *  web:     Invoked by HTTP request
-     *  php-cli: Invoked by CLI via `php public/index.php`
-     *  spark:   Invoked by CLI via the `spark` command
-     *
-     * @phpstan-var 'php-cli'|'spark'|'web'
-     */
     protected string $context = 'web';
 
     protected function callExit($code)

From 2f9f580ef891e334d41ee8b08b5c0cba1c015b1b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 8 Feb 2022 10:15:01 +0900
Subject: [PATCH 1549/2325] test: remove setContext('web')

It is MockCodeIgniter's default.
---
 tests/system/CodeIgniterTest.php                | 1 -
 tests/system/ControllerTest.php                 | 1 -
 tests/system/RESTful/ResourceControllerTest.php | 1 -
 tests/system/RESTful/ResourcePresenterTest.php  | 1 -
 4 files changed, 4 deletions(-)

diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index 124ce3fdbcfc..c6b87c84afb0 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -41,7 +41,6 @@ protected function setUp(): void
         $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
 
         $this->codeigniter = new MockCodeIgniter(new App());
-        $this->codeigniter->setContext('web');
     }
 
     protected function tearDown(): void
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index 59546ab26077..d4be0c503b7a 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -71,7 +71,6 @@ protected function setUp(): void
         $this->response    = new Response($this->config);
         $this->logger      = \Config\Services::logger();
         $this->codeigniter = new MockCodeIgniter($this->config);
-        $this->codeigniter->setContext('web');
     }
 
     public function testConstructor()
diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index 93554ee3c1d2..e6098527d09c 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -65,7 +65,6 @@ protected function setUp(): void
 
         $config            = new App();
         $this->codeigniter = new MockCodeIgniter($config);
-        $this->codeigniter->setContext('web');
     }
 
     protected function tearDown(): void
diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php
index 8176cc92bdc7..26ea1084b196 100644
--- a/tests/system/RESTful/ResourcePresenterTest.php
+++ b/tests/system/RESTful/ResourcePresenterTest.php
@@ -59,7 +59,6 @@ protected function setUp(): void
 
         $config            = new App();
         $this->codeigniter = new MockCodeIgniter($config);
-        $this->codeigniter->setContext('web');
     }
 
     protected function tearDown(): void

From 9b58580c02e37b2711a666b136e3c7f04198b6a7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 8 Feb 2022 10:19:37 +0900
Subject: [PATCH 1550/2325] style: add parentheses to avoid confusion

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

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index acc2a97eacce..ed84a8b68d6b 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -919,7 +919,7 @@ protected function display404errors(PageNotFoundException $e)
         }
 
         throw PageNotFoundException::forPageNotFound(
-            ENVIRONMENT !== 'production' || ! $this->isWeb() ? $e->getMessage() : ''
+            (ENVIRONMENT !== 'production' || ! $this->isWeb()) ? $e->getMessage() : ''
         );
     }
 

From 6eb8bf728f559c5c98c6d1ade7eeea836c7ba07e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 8 Feb 2022 10:27:52 +0900
Subject: [PATCH 1551/2325] chore: RemoveUnusedPrivateMethodRector skips
 CodeIgniter.php

---
 rector.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rector.php b/rector.php
index f82fe9134873..b90225d80fcf 100644
--- a/rector.php
+++ b/rector.php
@@ -81,9 +81,11 @@
         // requires php 8
         RemoveUnusedPromotedPropertyRector::class,
 
-        // private method called via getPrivateMethodInvoker
         RemoveUnusedPrivateMethodRector::class => [
+            // private method called via getPrivateMethodInvoker
             __DIR__ . '/tests/system/Test/ReflectionHelperTest.php',
+            // Rector bug?
+            __DIR__ . '/system/CodeIgniter.php',
         ],
 
         // call on purpose for nothing happen check

From c6ee79f533322312843f8aa8fcfbb5f401949584 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 10 Feb 2022 13:11:54 +0900
Subject: [PATCH 1552/2325] docs: add upgrade note

---
 .../source/installation/upgrade_420.rst       | 60 +++++++++++++++++++
 .../source/installation/upgrading.rst         |  1 +
 2 files changed, 61 insertions(+)
 create mode 100644 user_guide_src/source/installation/upgrade_420.rst

diff --git a/user_guide_src/source/installation/upgrade_420.rst b/user_guide_src/source/installation/upgrade_420.rst
new file mode 100644
index 000000000000..d2050e08fa36
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_420.rst
@@ -0,0 +1,60 @@
+#############################
+Upgrading from 4.1.8 to 4.2.0
+#############################
+
+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
+**********************
+
+The following files received significant changes and
+**you must merge the updated versions** with your application:
+
+* ``public/index.php``
+* ``spark``
+
+Breaking Changes
+****************
+
+
+
+Breaking Enhancements
+*********************
+
+none.
+
+Project Files
+*************
+
+Numerous 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>`_.
+
+.. note:: Except in very rare cases for bug fixes, no changes made to files for the project space
+    will break your application. All changes noted here are optional until the next major version,
+    and any mandatory changes will be covered in the sections above.
+
+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:
+
+*
+
+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:
+
+*
diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index 911f5b836528..1e1d63abe9f1 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -8,6 +8,7 @@ upgrading from.
 .. toctree::
     :titlesonly:
 
+    Upgrading from 4.1.8 to 4.2.0 <upgrade_420>
     Upgrading from 4.1.7 to 4.1.8 <upgrade_418>
     Upgrading from 4.1.6 to 4.1.7 <upgrade_417>
     Upgrading from 4.1.5 to 4.1.6 <upgrade_416>

From a10bde7560fad77c274b6bfb680ded2d16960365 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 12 Feb 2022 17:08:56 +0900
Subject: [PATCH 1553/2325] refactor: improve error message

---
 system/CodeIgniter.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index ed84a8b68d6b..0e82ceac30ef 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -304,7 +304,10 @@ protected function initializeKint()
      */
     public function run(?RouteCollectionInterface $routes = null, bool $returnResponse = false)
     {
-        assert($this->context !== null, 'Context must be set before run() is called');
+        assert(
+            $this->context !== null,
+            'Context must be set before run() is called. If you are upgrading from 4.1.x, you need to merge `public/index.php` and `spark` file from `vendor/codeigniter4/framework`.'
+        );
 
         $this->startBenchmark();
 

From e0cdc372ae61e84fa26c009d02d4c4d9a3663b52 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 12 Feb 2022 17:21:12 +0900
Subject: [PATCH 1554/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 app/Config/Filters.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Config/Filters.php b/app/Config/Filters.php
index cef3e546f5de..d0a97238b1d1 100644
--- a/app/Config/Filters.php
+++ b/app/Config/Filters.php
@@ -51,7 +51,7 @@ class Filters extends BaseConfig
      * Example:
      * 'post' => ['foo', 'bar']
      *
-     * If you use this, you should disable auto-routing. Because auto-routing
+     * If you use this, you should disable auto-routing because auto-routing
      * permits any HTTP method to access a controller. Accessing the controller
      * with a method you don’t expect could bypass the filter.
      *

From e72fb33189d8770cb05ad4cacc59803730129458 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 12 Feb 2022 17:21:34 +0900
Subject: [PATCH 1555/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/incoming/filters.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index 21bfe44627d0..9d5c1e8fd031 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -176,8 +176,8 @@ specify the method name in lowercase. It's value would be an array of filters to
 In addition to the standard HTTP methods, this also supports one special case: 'cli'. The 'cli' method would apply to
 all requests that were run from the command line.
 
-.. Warning:: If you use ``$methods`` filters, you should :ref:`disable auto-routing <use-defined-routes-only>`.
-    Because auto-routing permits any HTTP method to access a controller.
+.. Warning:: If you use ``$methods`` filters, you should :ref:`disable auto-routing <use-defined-routes-only>`
+    because auto-routing permits any HTTP method to access a controller.
     Accessing the controller with a method you don't expect could bypass the filter.
 
 $filters

From bc22dead6fbf313ea1aeab091ec1ced3429e7c04 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 12 Feb 2022 17:21:42 +0900
Subject: [PATCH 1556/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/libraries/security.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index 2fe2f685d136..08c23d4ff337 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -129,8 +129,8 @@ It is also possible to enable the CSRF filter only for specific methods::
         'post' => ['csrf'],
     ];
 
-.. Warning:: If you use ``$methods`` filters, you should :ref:`disable auto-routing <use-defined-routes-only>`.
-    Because auto-routing permits any HTTP method to access a controller.
+.. Warning:: If you use ``$methods`` filters, you should :ref:`disable auto-routing <use-defined-routes-only>`
+    because auto-routing permits any HTTP method to access a controller.
     Accessing the controller with a method you don't expect could bypass the filter.
 
 HTML Forms

From 664a4e96c61f8c3df66ce9d50436d0de72c1fa81 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 12 Feb 2022 17:21:50 +0900
Subject: [PATCH 1557/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/libraries/throttler.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/libraries/throttler.rst b/user_guide_src/source/libraries/throttler.rst
index dead804b73d3..cd5a6d8e2898 100644
--- a/user_guide_src/source/libraries/throttler.rst
+++ b/user_guide_src/source/libraries/throttler.rst
@@ -120,8 +120,8 @@ Next, we assign it to all POST requests made on the site::
         'post' => ['throttle'],
     ];
 
-.. Warning:: If you use ``$methods`` filters, you should :ref:`disable auto-routing <use-defined-routes-only>`.
-    Because auto-routing permits any HTTP method to access a controller.
+.. Warning:: If you use ``$methods`` filters, you should :ref:`disable auto-routing <use-defined-routes-only>`
+    because auto-routing permits any HTTP method to access a controller.
     Accessing the controller with a method you don't expect could bypass the filter.
 
 And that's all there is to it. Now all POST requests made on the site will have to be rate limited.

From 09c21577608139c36d0202bfebf67f1332d84b51 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 12 Feb 2022 17:22:00 +0900
Subject: [PATCH 1558/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/installation/upgrade_415.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_415.rst b/user_guide_src/source/installation/upgrade_415.rst
index a632f776d0b5..c35c00126864 100644
--- a/user_guide_src/source/installation/upgrade_415.rst
+++ b/user_guide_src/source/installation/upgrade_415.rst
@@ -53,8 +53,8 @@ If you want the same behavior as the previous version, set the CSRF filter like
 
 Protecting **GET** method needs only when you use ``form_open()`` auto-generation of CSRF field.
 
-.. Warning:: In general, if you use ``$methods`` filters, you should :ref:`disable auto-routing <use-defined-routes-only>`.
-    Because auto-routing permits any HTTP method to access a controller.
+.. Warning:: In general, if you use ``$methods`` filters, you should :ref:`disable auto-routing <use-defined-routes-only>`
+    because auto-routing permits any HTTP method to access a controller.
     Accessing the controller with a method you don't expect could bypass the filter.
 
 CURLRequest header change

From 7f182e18c334b445a23814400508296f7f84241d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 12 Feb 2022 17:22:06 +0900
Subject: [PATCH 1559/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/tutorial/create_news_items.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index a0214eae4e84..81a84e71f927 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -20,8 +20,8 @@ Open the **app/Config/Filters.php** file and update the ``$methods`` property li
 It configures the CSRF filter to be enabled for all **POST** requests.
 You can read more about the CSRF protection in :doc:`Security </libraries/security>` library.
 
-.. Warning:: In general, if you use ``$methods`` filters, you should :ref:`disable auto-routing <use-defined-routes-only>`.
-    Because auto-routing permits any HTTP method to access a controller.
+.. Warning:: In general, if you use ``$methods`` filters, you should :ref:`disable auto-routing <use-defined-routes-only>`
+    because auto-routing permits any HTTP method to access a controller.
     Accessing the controller with a method you don't expect could bypass the filter.
 
 Create a form

From 9c3f6e973a5ce9f7d87fdceaf810494e26a3b55d Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sat, 12 Feb 2022 12:37:31 +0800
Subject: [PATCH 1560/2325] Deprecate both `Exceptions::cleanPath()` and
 `BaseCollector::cleanPath()`

---
 app/Views/errors/html/error_exception.php     | 10 +++---
 system/Debug/Exceptions.php                   |  2 ++
 .../Toolbar/Collectors/BaseCollector.php      |  8 ++---
 system/Debug/Toolbar/Collectors/Files.php     |  2 +-
 tests/system/Debug/ExceptionsTest.php         | 32 -------------------
 user_guide_src/source/changelogs/v4.2.0.rst   |  1 +
 6 files changed, 12 insertions(+), 43 deletions(-)

diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
index 693afed491f5..4ddeac1a2ec4 100644
--- a/app/Views/errors/html/error_exception.php
+++ b/app/Views/errors/html/error_exception.php
@@ -30,7 +30,7 @@
 
 	<!-- Source -->
 	<div class="container">
-		<p><b><?= esc(static::cleanPath($file, $line)) ?></b> at line <b><?= esc($line) ?></b></p>
+		<p><b><?= esc(clean_path($file)) ?></b> at line <b><?= esc($line) ?></b></p>
 
 		<?php if (is_file($file)) : ?>
 			<div class="source">
@@ -64,12 +64,12 @@
 							<?php if (isset($row['file']) && is_file($row['file'])) :?>
 								<?php
                                 if (isset($row['function']) && in_array($row['function'], ['include', 'include_once', 'require', 'require_once'], true)) {
-                                    echo esc($row['function'] . ' ' . static::cleanPath($row['file']));
+                                    echo esc($row['function'] . ' ' . clean_path($row['file']));
                                 } else {
-                                    echo esc(static::cleanPath($row['file']) . ' : ' . $row['line']);
+                                    echo esc(clean_path($row['file']) . ' : ' . $row['line']);
                                 }
                                 ?>
-							<?php else : ?>
+							<?php else: ?>
 								{PHP internal code}
 							<?php endif; ?>
 
@@ -350,7 +350,7 @@
 
 				<ol>
 				<?php foreach ($files as $file) :?>
-					<li><?= esc(static::cleanPath($file)) ?></li>
+					<li><?= esc(clean_path($file)) ?></li>
 				<?php endforeach ?>
 				</ol>
 			</div>
diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index a65be7a2ad2f..0dbc7e293ae9 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -318,6 +318,8 @@ protected function determineCodes(Throwable $exception): array
 
     /**
      * This makes nicer looking paths for the error output.
+     *
+     * @deprecated Use dedicated `clean_path()` function.
      */
     public static function cleanPath(string $file): string
     {
diff --git a/system/Debug/Toolbar/Collectors/BaseCollector.php b/system/Debug/Toolbar/Collectors/BaseCollector.php
index 5d8d39ff169f..e8aaad9ba115 100644
--- a/system/Debug/Toolbar/Collectors/BaseCollector.php
+++ b/system/Debug/Toolbar/Collectors/BaseCollector.php
@@ -11,8 +11,6 @@
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
 
-use CodeIgniter\Debug\Exceptions;
-
 /**
  * Base Toolbar collector
  */
@@ -174,13 +172,13 @@ public function display()
     }
 
     /**
-     * Clean Path
-     *
      * This makes nicer looking paths for the error output.
+     *
+     * @deprecated Use the dedicated `clean_path()` function.
      */
     public function cleanPath(string $file): string
     {
-        return Exceptions::cleanPath($file);
+        return clean_path($file);
     }
 
     /**
diff --git a/system/Debug/Toolbar/Collectors/Files.php b/system/Debug/Toolbar/Collectors/Files.php
index d6aefd2c3fe9..ea14dcfd1ec3 100644
--- a/system/Debug/Toolbar/Collectors/Files.php
+++ b/system/Debug/Toolbar/Collectors/Files.php
@@ -58,7 +58,7 @@ public function display(): array
         $userFiles = [];
 
         foreach ($rawFiles as $file) {
-            $path = $this->cleanPath($file);
+            $path = clean_path($file);
 
             if (strpos($path, 'SYSTEMPATH') !== false) {
                 $coreFiles[] = [
diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php
index 08d521ede2f4..247629933c69 100644
--- a/tests/system/Debug/ExceptionsTest.php
+++ b/tests/system/Debug/ExceptionsTest.php
@@ -61,36 +61,4 @@ public function testDetermineCodes(): void
         $this->assertSame([500, 1], $determineCodes(new RuntimeException('That.', 600)));
         $this->assertSame([404, 1], $determineCodes(new RuntimeException('There.', 404)));
     }
-
-    /**
-     * @dataProvider dirtyPathsProvider
-     */
-    public function testCleanPaths(string $file, string $expected): void
-    {
-        $this->assertSame($expected, Exceptions::cleanPath($file));
-    }
-
-    public function dirtyPathsProvider()
-    {
-        $ds = DIRECTORY_SEPARATOR;
-
-        yield from [
-            [
-                APPPATH . 'Config' . $ds . 'App.php',
-                'APPPATH' . $ds . 'Config' . $ds . 'App.php',
-            ],
-            [
-                SYSTEMPATH . 'CodeIgniter.php',
-                'SYSTEMPATH' . $ds . 'CodeIgniter.php',
-            ],
-            [
-                VENDORPATH . 'autoload.php',
-                'VENDORPATH' . $ds . 'autoload.php',
-            ],
-            [
-                FCPATH . 'index.php',
-                'FCPATH' . $ds . 'index.php',
-            ],
-        ];
-    }
 }
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 3d2a2223350f..395408641e9f 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -40,6 +40,7 @@ Deprecations
 ************
 
 - ``CodeIgniter\Database\SQLSRV\Connection::getError()`` is deprecated. Use ``CodeIgniter\Database\SQLSRV\Connection::error()`` instead.
+- ``CodeIgniter\Debug\Exceptions::cleanPath()`` and ``CodeIgniter\Debug\Toolbar\Collectors\BaseCollector::cleanPath()`` are deprecated. Use the ``clean_path()`` function instead.
 
 Bugs Fixed
 **********

From 40446ff96bfa98ffe22ebc8ae6e8c04e7f2421af Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sun, 13 Feb 2022 00:35:05 +0800
Subject: [PATCH 1561/2325] Deprecate also `Logger::cleanFilenames` and
 `TestLogger::cleanup`

---
 system/Log/Logger.php                       |  9 ++++-----
 system/Test/TestLogger.php                  | 10 ++++++++--
 tests/system/Log/LoggerTest.php             | 20 +++-----------------
 user_guide_src/source/changelogs/v4.2.0.rst |  1 +
 4 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/system/Log/Logger.php b/system/Log/Logger.php
index cee971161f36..515a065647ee 100644
--- a/system/Log/Logger.php
+++ b/system/Log/Logger.php
@@ -398,7 +398,7 @@ public function determineFile(): array
         // Find the first reference to a Logger class method
         foreach ($stackFrames as $frame) {
             if (\in_array($frame['function'], $logFunctions, true)) {
-                $file = isset($frame['file']) ? $this->cleanFileNames($frame['file']) : 'unknown';
+                $file = isset($frame['file']) ? clean_path($frame['file']) : 'unknown';
                 $line = $frame['line'] ?? 'unknown';
 
                 return [
@@ -421,12 +421,11 @@ public function determineFile(): array
      *  /var/www/site/app/Controllers/Home.php
      *      becomes:
      *  APPPATH/Controllers/Home.php
+     *
+     * @deprecated Use dedicated `clean_path()` function.
      */
     protected function cleanFileNames(string $file): string
     {
-        $file = str_replace(APPPATH, 'APPPATH/', $file);
-        $file = str_replace(SYSTEMPATH, 'SYSTEMPATH/', $file);
-
-        return str_replace(FCPATH, 'FCPATH/', $file);
+        return clean_path($file);
     }
 }
diff --git a/system/Test/TestLogger.php b/system/Test/TestLogger.php
index 22d9f811cfc2..68e45674eb0e 100644
--- a/system/Test/TestLogger.php
+++ b/system/Test/TestLogger.php
@@ -70,9 +70,15 @@ public static function didLog(string $level, $message)
         return false;
     }
 
-    // Expose cleanFileNames()
+    /**
+     * Expose filenames.
+     *
+     * @param string $file
+     *
+     * @deprecated No longer needed as underlying protected method is also deprecated.
+     */
     public function cleanup($file)
     {
-        return $this->cleanFileNames($file);
+        return clean_path($file);
     }
 }
diff --git a/tests/system/Log/LoggerTest.php b/tests/system/Log/LoggerTest.php
index a97e16a51f1a..cbddab72cbbc 100644
--- a/tests/system/Log/LoggerTest.php
+++ b/tests/system/Log/LoggerTest.php
@@ -15,7 +15,6 @@
 use CodeIgniter\Log\Exceptions\LogException;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockLogger as LoggerConfig;
-use CodeIgniter\Test\TestLogger;
 use Exception;
 use Tests\Support\Log\Handlers\TestHandler;
 
@@ -32,7 +31,7 @@ public function testThrowsExceptionWithBadHandlerSettings()
         $this->expectException(FrameworkException::class);
         $this->expectExceptionMessage(lang('Core.noHandlers', ['LoggerConfig']));
 
-        $logger = new Logger($config);
+        new Logger($config);
     }
 
     public function testLogThrowsExceptionOnInvalidLevel()
@@ -60,12 +59,9 @@ public function testLogReturnsFalseWhenLogNotHandled()
     public function testLogActuallyLogs()
     {
         $config = new LoggerConfig();
-        //      $Config->handlers['TestHandler']['handles'] =  [LogLevel::CRITICAL];
-
         $logger = new Logger($config);
 
         $expected = 'DEBUG - ' . date('Y-m-d') . ' --> Test message';
-
         $logger->log('debug', 'Test message');
 
         $logs = TestHandler::getLogs();
@@ -76,7 +72,8 @@ public function testLogActuallyLogs()
 
     public function testLogDoesnotLogUnhandledLevels()
     {
-        $config                                                                = new LoggerConfig();
+        $config = new LoggerConfig();
+
         $config->handlers['Tests\Support\Log\Handlers\TestHandler']['handles'] = ['critical'];
 
         $logger = new Logger($config);
@@ -374,17 +371,6 @@ public function testNonStringMessage()
         $this->assertStringContainsString($expected, $logs[0]);
     }
 
-    public function testFilenameCleaning()
-    {
-        $config = new LoggerConfig();
-        $logger = new TestLogger($config);
-
-        $ohoh     = APPPATH . 'LoggerTest';
-        $expected = 'APPPATH/LoggerTest';
-
-        $this->assertSame($expected, $logger->cleanup($ohoh));
-    }
-
     public function testDetermineFileNoStackTrace()
     {
         $config = new LoggerConfig();
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 395408641e9f..6886f92e6555 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -41,6 +41,7 @@ Deprecations
 
 - ``CodeIgniter\Database\SQLSRV\Connection::getError()`` is deprecated. Use ``CodeIgniter\Database\SQLSRV\Connection::error()`` instead.
 - ``CodeIgniter\Debug\Exceptions::cleanPath()`` and ``CodeIgniter\Debug\Toolbar\Collectors\BaseCollector::cleanPath()`` are deprecated. Use the ``clean_path()`` function instead.
+- ``CodeIgniter\Log\Logger::cleanFilenames()`` and ``CodeIgniter\Test\TestLogger::cleanup()`` are both deprecated. Use the ``clean_path()`` function instead.
 
 Bugs Fixed
 **********

From d51fdba50bf43e4c25756033da4749952c3c7195 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 12 Feb 2022 19:16:33 +0900
Subject: [PATCH 1562/2325] fix: $routes->setDefaultMethod() does not work

The default method may be not `index`, and it is set in the constructor.
---
 system/Router/Router.php           |  5 +----
 tests/system/Router/RouterTest.php | 12 ++++++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/system/Router/Router.php b/system/Router/Router.php
index 1b80377e26cf..04397d31d065 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -675,10 +675,7 @@ protected function setDefaultController()
             throw RouterException::forMissingDefaultRoute();
         }
 
-        // Is the method being specified?
-        if (sscanf($this->controller, '%[^/]/%s', $class, $this->method) !== 2) {
-            $this->method = 'index';
-        }
+        sscanf($this->controller, '%[^/]/%s', $class, $this->method);
 
         if (! is_file(APPPATH . 'Controllers/' . $this->directory . ucfirst($class) . '.php')) {
             return;
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index 3ba45ee03351..4ba9972b1288 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -199,6 +199,18 @@ public function testClosures()
         $this->assertSame($expects, '123-alpha');
     }
 
+    public function testAutoRouteFindsDefaultControllerAndMethod()
+    {
+        $this->collection->setDefaultController('Test');
+        $this->collection->setDefaultMethod('test');
+        $router = new Router($this->collection, $this->request);
+
+        $router->autoRoute('/');
+
+        $this->assertSame('Test', $router->controllerName());
+        $this->assertSame('test', $router->methodName());
+    }
+
     public function testAutoRouteFindsControllerWithFileAndMethod()
     {
         $router = new Router($this->collection, $this->request);

From 61b9a2319d6d58c74db0df260e7d25c44c3b3197 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 12 Feb 2022 20:54:48 +0900
Subject: [PATCH 1563/2325] style: make multiple lines into a single line

---
 system/Router/Router.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/system/Router/Router.php b/system/Router/Router.php
index 04397d31d065..1993c60aba30 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -427,10 +427,7 @@ protected function checkRoutes(string $uri): bool
                 } elseif (strpos($val, '$') !== false && strpos($key, '(') !== false) {
                     $val = preg_replace('#^' . $key . '$#u', $val, $uri);
                 } elseif (strpos($val, '/') !== false) {
-                    [
-                        $controller,
-                        $method,
-                    ] = explode('::', $val);
+                    [$controller, $method] = explode('::', $val);
 
                     // Only replace slashes in the controller, not in the method.
                     $controller = str_replace('/', '\\', $controller);

From 2822a186f61b95f3ef6b69272f384834e691b13a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 13 Feb 2022 08:56:14 +0900
Subject: [PATCH 1564/2325] refactor: do not use and deprecate
 setDefaultController() method

The constructor of the Router class already defines the default controller.
---
 system/Router/Router.php                    | 13 +++++--------
 user_guide_src/source/changelogs/v4.2.0.rst |  1 +
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/system/Router/Router.php b/system/Router/Router.php
index 1993c60aba30..9755e146fe77 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -459,15 +459,12 @@ public function autoRoute(string $uri)
     {
         $segments = explode('/', $uri);
 
+        // WARNING: Directories get shifted out of the segments array.
         $segments = $this->scanControllers($segments);
 
-        // If we don't have any segments left - try the default controller;
-        // WARNING: Directories get shifted out of the segments array.
-        if (empty($segments)) {
-            $this->setDefaultController();
-        }
+        // If we don't have any segments left - use the default controller;
         // If not empty, then the first segment should be the controller
-        else {
+        if (! empty($segments)) {
             $this->controller = ucfirst(array_shift($segments));
         }
 
@@ -643,8 +640,6 @@ protected function setRequest(array $segments = [])
     {
         // If we don't have any segments - try the default controller;
         if (empty($segments)) {
-            $this->setDefaultController();
-
             return;
         }
 
@@ -665,6 +660,8 @@ protected function setRequest(array $segments = [])
 
     /**
      * Sets the default controller based on the info set in the RouteCollection.
+     *
+     * @deprecated This was an unnecessary method, so it is no longer used.
      */
     protected function setDefaultController()
     {
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 6886f92e6555..d088879a6122 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -42,6 +42,7 @@ Deprecations
 - ``CodeIgniter\Database\SQLSRV\Connection::getError()`` is deprecated. Use ``CodeIgniter\Database\SQLSRV\Connection::error()`` instead.
 - ``CodeIgniter\Debug\Exceptions::cleanPath()`` and ``CodeIgniter\Debug\Toolbar\Collectors\BaseCollector::cleanPath()`` are deprecated. Use the ``clean_path()`` function instead.
 - ``CodeIgniter\Log\Logger::cleanFilenames()`` and ``CodeIgniter\Test\TestLogger::cleanup()`` are both deprecated. Use the ``clean_path()`` function instead.
+- ``CodeIgniter\Router\setDefaultController()`` is deprecated.
 
 Bugs Fixed
 **********

From 562a990ce4732ea2edccb402e690f217c857e5d4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 13 Feb 2022 09:31:11 +0900
Subject: [PATCH 1565/2325] docs: improve explanation

---
 user_guide_src/source/incoming/routing.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 0ca6f8c93d59..71942ab4ce5e 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -48,7 +48,7 @@ Setting Your Own Routing Rules
 ******************************
 
 Routing rules are defined in the **app/Config/Routes.php** file. In it you'll see that
-it creates an instance of the RouteCollection class that permits you to specify your own routing criteria.
+it creates an instance of the RouteCollection class (``$routes``) that permits you to specify your own routing criteria.
 Routes can be specified using placeholders or Regular Expressions.
 
 A route simply takes the URI path on the left, and maps it to the controller and method on the right,
@@ -57,10 +57,11 @@ be listed in the same way that you would use a static method, by separating the
 and its method with a double-colon, like ``Users::list``. If that method requires parameters to be
 passed to it, then they would be listed after the method name, separated by forward-slashes::
 
-    // Calls the $Users->list()
-    Users::list
+    // Calls $Users->list()
+    $routes->get('users', 'Users::list');
+
     // Calls $Users->list(1, 23)
-    Users::list/1/23
+    $routes->get('users/1/23', 'Users::list/1/23');
 
 Placeholders
 ============

From ead5c0d79a8825f8260d6023eae0ce59f291533c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 13 Feb 2022 09:31:29 +0900
Subject: [PATCH 1566/2325] docs: fix inaccurate explanation

The classnames may not be fully-namespaced.
---
 user_guide_src/source/incoming/routing.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 71942ab4ce5e..cb1dc106d98c 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -53,7 +53,7 @@ Routes can be specified using placeholders or Regular Expressions.
 
 A route simply takes the URI path on the left, and maps it to the controller and method on the right,
 along with any parameters that should be passed to the controller. The controller and method should
-be listed in the same way that you would use a static method, by separating the fully-namespaced class
+be listed in the same way that you would use a static method, by separating the class
 and its method with a double-colon, like ``Users::list``. If that method requires parameters to be
 passed to it, then they would be listed after the method name, separated by forward-slashes::
 

From ca58f384ec5f3957e6732db9ffc69414805ea85a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 13 Feb 2022 09:54:20 +0900
Subject: [PATCH 1567/2325] docs: do not use `add()` in explanations

The `add()` is not recommended to use.
---
 user_guide_src/source/incoming/routing.rst | 107 +++++++++++----------
 1 file changed, 57 insertions(+), 50 deletions(-)

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index cb1dc106d98c..b48c5785780b 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -51,6 +51,11 @@ Routing rules are defined in the **app/Config/Routes.php** file. In it you'll se
 it creates an instance of the RouteCollection class (``$routes``) that permits you to specify your own routing criteria.
 Routes can be specified using placeholders or Regular Expressions.
 
+When you specify a route, you choose a method to corresponding to HTTP verbs (request method).
+If you expect a GET request, you use the ``get()`` method::
+
+    $routes->get('/', 'Home::index');
+
 A route simply takes the URI path on the left, and maps it to the controller and method on the right,
 along with any parameters that should be passed to the controller. The controller and method should
 be listed in the same way that you would use a static method, by separating the class
@@ -63,12 +68,22 @@ passed to it, then they would be listed after the method name, separated by forw
     // Calls $Users->list(1, 23)
     $routes->get('users/1/23', 'Users::list/1/23');
 
+You can use any standard HTTP verb (GET, POST, PUT, DELETE, etc)::
+
+    $routes->post('products', 'Product::feature');
+    $routes->put('products/1', 'Product::feature');
+    $routes->delete('products/1', 'Product::feature');
+
+You can supply multiple verbs that a route should match by passing them in as an array to the ``match()`` method::
+
+    $routes->match(['get', 'put'], 'products', 'Product::feature');
+
 Placeholders
 ============
 
 A typical route might look something like this::
 
-    $routes->add('product/(:num)', 'Catalog::productLookup');
+    $routes->get('product/(:num)', 'Catalog::productLookup');
 
 In a route, the first parameter contains the URI to be matched, while the second parameter
 contains the destination it should be routed to. In the above example, if the literal word
@@ -103,26 +118,26 @@ Here are a few basic routing examples.
 A URL containing the word **journals** in the first segment will be remapped to the ``\App\Controllers\Blogs`` class,
 and the default method, which is usually ``index()``::
 
-    $routes->add('journals', 'Blogs');
+    $routes->get('journals', 'Blogs');
 
 A URL containing the segments **blog/joe** will be remapped to the ``\App\Controllers\Blogs`` class and the ``users`` method.
 The ID will be set to ``34``::
 
-    $routes->add('blog/joe', 'Blogs::users/34');
+    $routes->get('blog/joe', 'Blogs::users/34');
 
 A URL with **product** as the first segment, and anything in the second will be remapped to the ``\App\Controllers\Catalog`` class
 and the ``productLookup`` method::
 
-    $routes->add('product/(:any)', 'Catalog::productLookup');
+    $routes->get('product/(:any)', 'Catalog::productLookup');
 
 A URL with **product** as the first segment, and a number in the second will be remapped to the ``\App\Controllers\Catalog`` class
 and the ``productLookupByID`` method passing in the match as a variable to the method::
 
-    $routes->add('product/(:num)', 'Catalog::productLookupByID/$1');
+    $routes->get('product/(:num)', 'Catalog::productLookupByID/$1');
 
 Note that a single ``(:any)`` will match multiple segments in the URL if present. For example the route::
 
-    $routes->add('product/(:any)', 'Catalog::productLookup/$1');
+    $routes->get('product/(:any)', 'Catalog::productLookup/$1');
 
 will match **product/123**, **product/123/456**, **product/123/456/789** and so on. The implementation in the
 Controller should take into account the maximum parameters::
@@ -136,19 +151,10 @@ Controller should take into account the maximum parameters::
 If matching multiple segments is not the intended behavior, ``(:segment)`` should be used when defining the
 routes. With the examples URLs from above::
 
-    $routes->add('product/(:segment)', 'Catalog::productLookup/$1');
+    $routes->get('product/(:segment)', 'Catalog::productLookup/$1');
 
 will only match **product/123** and generate 404 errors for other example.
 
-.. warning:: While the ``add()`` method is convenient, it is recommended to always use the HTTP-verb-based
-    routes, described below, as it is more secure. If you use the :doc:`CSRF protection </libraries/security>`, it does not protect **GET**
-    requests. If the URI specified in the ``add()`` method is accessible by the GET method, the CSRF protection
-    will not work.
-
-.. note:: Using the HTTP-verb-based routes will also provide a slight performance increase, since
-    only routes that match the current request method are stored, resulting in fewer routes to scan through
-    when trying to find a match.
-
 Custom Placeholders
 ===================
 
@@ -160,7 +166,7 @@ the placeholder. The second parameter is the Regular Expression pattern it shoul
 This must be called before you add the route::
 
     $routes->addPlaceholder('uuid', '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}');
-    $routes->add('users/(:uuid)', 'Users::show/$1');
+    $routes->get('users/(:uuid)', 'Users::show/$1');
 
 Regular Expressions
 ===================
@@ -171,7 +177,7 @@ is allowed, as are back-references.
 .. important:: Note: If you use back-references you must use the dollar syntax rather than the double backslash syntax.
     A typical RegEx route might look something like this::
 
-    $routes->add('products/([a-z]+)/(\d+)', 'Products::show/$1/id_$2');
+    $routes->get('products/([a-z]+)/(\d+)', 'Products::show/$1/id_$2');
 
 In the above example, a URI similar to **products/shirts/123** would instead call the ``show`` method
 of the ``Products`` controller class, with the original first and second segment passed as arguments to it.
@@ -182,7 +188,7 @@ represent the delimiter between multiple segments.
 For example, if a user accesses a password protected area of your web application and you wish to be able to
 redirect them back to the same page after they log in, you may find this example useful::
 
-    $routes->add('login/(.+)', 'Auth::login/$1');
+    $routes->get('login/(.+)', 'Auth::login/$1');
 
 For those of you who don’t know regular expressions and want to learn more about them,
 `regular-expressions.info <https://www.regular-expressions.info/>`_ might be a good starting point.
@@ -196,7 +202,7 @@ You can use an anonymous function, or Closure, as the destination that a route m
 executed when the user visits that URI. This is handy for quickly executing small tasks, or even just showing
 a simple view::
 
-    $routes->add('feed', function () {
+    $routes->get('feed', function () {
         $rss = new RSSFeeder();
 
         return $rss->feed('general');
@@ -225,7 +231,7 @@ second parameter is either the new URI to redirect to, or the name of a named ro
 the HTTP status code that should be sent along with the redirect. The default value is ``302`` which is a temporary
 redirect and is recommended in most cases::
 
-    $routes->add('users/profile', 'Users::profile', ['as' => 'profile']);
+    $routes->get('users/profile', 'Users::profile', ['as' => 'profile']);
 
     // Redirect to a named route
     $routes->addRedirect('users/about', 'profile');
@@ -243,8 +249,8 @@ appears prior to the routes defined inside of the group. This allows you to redu
 extensive set of routes that all share the opening string, like when building an admin area::
 
     $routes->group('admin', function ($routes) {
-        $routes->add('users', 'Admin\Users::index');
-        $routes->add('blog', 'Admin\Blog::index');
+        $routes->get('users', 'Admin\Users::index');
+        $routes->get('blog', 'Admin\Blog::index');
     });
 
 This would prefix the **users** and **blog** URIs with **admin**, handling URLs like **admin/users** and **admin/blog**.
@@ -270,7 +276,7 @@ It is possible to nest groups within groups for finer organization if you need i
 
     $routes->group('admin', function ($routes) {
         $routes->group('users', function ($routes) {
-            $routes->add('list', 'Admin\Users::list');
+            $routes->get('list', 'Admin\Users::list');
         });
     });
 
@@ -298,7 +304,7 @@ This can be done with the ``environment()`` method. The first parameter is the n
 routes defined within this closure are only accessible from the given environment::
 
     $routes->environment('development', function ($routes) {
-        $routes->add('builder', 'Tools\Builder::index');
+        $routes->get('builder', 'Tools\Builder::index');
     });
 
 Reverse Routing
@@ -314,7 +320,7 @@ separated by a double colon (``::``), much like you would use when writing the i
 should be passed to the route are passed in next::
 
     // The route is defined as:
-    $routes->add('users/(:num)/gallery(:any)', 'App\Controllers\Galleries::showUserGallery/$1/$2');
+    $routes->get('users/(:num)/gallery(:any)', 'App\Controllers\Galleries::showUserGallery/$1/$2');
 
     // Generate the relative URL to link to user ID 15, gallery 12
     // Generates: /users/15/gallery/12
@@ -329,7 +335,7 @@ will still work without you having to make any changes. A route is named by pass
 with the name of the route::
 
     // The route is defined as:
-    $routes->add('users/(:num)/gallery(:any)', 'Galleries::showUserGallery/$1/$2', ['as' => 'user_gallery']);
+    $routes->get('users/(:num)/gallery(:any)', 'Galleries::showUserGallery/$1/$2', ['as' => 'user_gallery']);
 
     // Generate the relative URL to link to user ID 15, gallery 12
     // Generates: /users/15/gallery/12
@@ -337,21 +343,22 @@ with the name of the route::
 
 This has the added benefit of making the views more readable, too.
 
-Using HTTP verbs in routes
+Routes with any HTTP verbs
 ==========================
 
-It is possible to use HTTP verbs (request method) to define your routing rules. This is particularly
-useful when building RESTFUL applications. You can use any standard HTTP verb (GET, POST, PUT, DELETE, etc).
-Each verb has its own method you can use::
+It is possible to define a route with any HTTP verbs.
+You can use the ``add()`` method::
 
-    $routes->get('products', 'Product::feature');
-    $routes->post('products', 'Product::feature');
-    $routes->put('products/(:num)', 'Product::feature');
-    $routes->delete('products/(:num)', 'Product::feature');
+    $routes->add('products', 'Product::feature');
 
-You can supply multiple verbs that a route should match by passing them in as an array to the ``match()`` method::
+.. warning:: While the ``add()`` method seems to be convenient, it is recommended to always use the HTTP-verb-based
+    routes, described above, as it is more secure. If you use the :doc:`CSRF protection </libraries/security>`, it does not protect **GET**
+    requests. If the URI specified in the ``add()`` method is accessible by the GET method, the CSRF protection
+    will not work.
 
-    $routes->match(['get', 'put'], 'products', 'Product::feature');
+.. note:: Using the HTTP-verb-based routes will also provide a slight performance increase, since
+    only routes that match the current request method are stored, resulting in fewer routes to scan through
+    when trying to find a match.
 
 Command-Line only Routes
 ========================
@@ -406,17 +413,17 @@ See :doc:`Controller filters <filters>` for more information on setting up filte
 
 You specify an alias defined in **app/Config/Filters.php** for the filter value::
 
-    $routes->add('admin',' AdminController::index', ['filter' => 'admin-auth']);
+    $routes->get('admin',' AdminController::index', ['filter' => 'admin-auth']);
 
 You may also supply arguments to be passed to the alias filter's ``before()`` and ``after()`` methods::
 
-    $routes->add('users/delete/(:segment)', 'AdminController::index', ['filter' => 'admin-auth:dual,noreturn']);
+    $routes->post('users/delete/(:segment)', 'AdminController::index', ['filter' => 'admin-auth:dual,noreturn']);
 
 **Classname filter**
 
 You specify a filter classname for the filter value::
 
-    $routes->add('admin',' AdminController::index', ['filter' => \App\Filters\SomeFilter::class]);
+    $routes->get('admin',' AdminController::index', ['filter' => \App\Filters\SomeFilter::class]);
 
 **Multiple filters**
 
@@ -424,7 +431,7 @@ You specify a filter classname for the filter value::
 
 You specify an array for the filter value::
 
-    $routes->add('admin',' AdminController::index', ['filter' => ['admin-auth', \App\Filters\SomeFilter::class]]);
+    $routes->get('admin',' AdminController::index', ['filter' => ['admin-auth', \App\Filters\SomeFilter::class]]);
 
 .. _assigning-namespace:
 
@@ -436,7 +443,7 @@ a different namespace to be used in any options array, with the ``namespace`` op
 namespace you want modified::
 
     // Routes to \Admin\Users::index()
-    $routes->add('admin/users', 'Users::index', ['namespace' => 'Admin']);
+    $routes->get('admin/users', 'Users::index', ['namespace' => 'Admin']);
 
 The new namespace is only applied during that call for any methods that create a single route, like get, post, etc.
 For any methods that create multiple routes, the new namespace is attached to all routes generated by that function
@@ -460,13 +467,13 @@ When the ``subdomain`` option is present, the system will restrict the routes to
 sub-domain. The route will only be matched if the subdomain is the one the application is being viewed through::
 
     // Limit to media.example.com
-    $routes->add('from', 'to', ['subdomain' => 'media']);
+    $routes->get('from', 'to', ['subdomain' => 'media']);
 
 You can restrict it to any subdomain by setting the value to an asterisk, (``*``). If you are viewing from a URL
 that does not have any subdomain present, this will not be matched::
 
     // Limit to any sub-domain
-    $routes->add('from', 'to', ['subdomain' => '*']);
+    $routes->get('from', 'to', ['subdomain' => '*']);
 
 .. important:: The system is not perfect and should be tested for your specific domain before being used in production.
     Most domains should work fine but some edge case ones, especially with a period in the domain itself (not used
@@ -501,10 +508,10 @@ route priority in the processing queue::
     $routes->setPrioritize();
 
     // App\Config\Routes
-    $routes->add('(.*)', 'Posts::index', ['priority' => 1]);
+    $routes->get('(.*)', 'Posts::index', ['priority' => 1]);
 
     // Modules\Acme\Config\Routes
-    $routes->add('admin', 'Admin::index');
+    $routes->get('admin', 'Admin::index');
 
     // The "admin" route will now be processed before the wildcard router.
 
@@ -537,10 +544,10 @@ controller::
     $routes->setDefaultNamespace('');
 
     // Controller is \Users
-    $routes->add('users', 'Users::index');
+    $routes->get('users', 'Users::index');
 
     // Controller is \Admin\Users
-    $routes->add('users', 'Admin\Users::index');
+    $routes->get('users', 'Admin\Users::index');
 
 If your controllers are not explicitly namespaced, there is no need to change this. If you namespace your controllers,
 then you can change this value to save typing::
@@ -548,10 +555,10 @@ then you can change this value to save typing::
     $routes->setDefaultNamespace('App');
 
     // Controller is \App\Users
-    $routes->add('users', 'Users::index');
+    $routes->get('users', 'Users::index');
 
     // Controller is \App\Admin\Users
-    $routes->add('users', 'Admin\Users::index');
+    $routes->get('users', 'Admin\Users::index');
 
 Default Controller
 ==================

From 6a7b242843dc6827569297c28bff5026debbf23f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 14 Feb 2022 09:59:03 +0900
Subject: [PATCH 1568/2325] docs: add note about $attributes

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

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

From 8d47121441dc252f291d4189c6239e132c3c4988 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 14 Feb 2022 11:44:48 +0900
Subject: [PATCH 1569/2325] docs: add about Model and Query Builder

See https://github.com/codeigniter4/CodeIgniter4/issues/5549
---
 user_guide_src/source/models/model.rst | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index f3a75ef41056..707491b2cb37 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -9,7 +9,10 @@ Using CodeIgniter's Model
 Models
 ======
 
-Models provide a way to interact with a specific **table** in your database. They come out of the box with helper
+The CodeIgniter's Model provides convenience features and additional functionality
+that people commonly use to make working with a **single table** in your database more convenient.
+
+It comes out of the box with helper
 methods for much of the standard ways you would need to interact with a database table, including finding records,
 updating records, deleting records, and more.
 
@@ -705,6 +708,11 @@ very elegant use::
                        ->orderBy('last_login', 'asc')
                        ->findAll();
 
+.. important:: The Model does not provide a perfect interface to the Query Builder.
+    The Model and the Query Builder are separate classes with different purposes.
+    They should not be expected to return the same data.
+    For example, if you need to get the compiledInsert you should do so directly on the builder instance.
+
 .. note:: You can also access the model's database connection seamlessly::
 
     $user_name = $userModel->escape($name);

From b36b015ac4e326df83d48182a2eed4512828050a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Feb 2022 13:31:25 +0800
Subject: [PATCH 1570/2325] chore(deps): bump actions/github-script from 5 to 6
 (#5695)

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

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

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/deploy-framework.yml | 4 ++--
 .github/workflows/test-phpunit.yml     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy-framework.yml b/.github/workflows/deploy-framework.yml
index cdd23f3c7242..339565dcfdfc 100644
--- a/.github/workflows/deploy-framework.yml
+++ b/.github/workflows/deploy-framework.yml
@@ -36,7 +36,7 @@ jobs:
         run: ./source/.github/scripts/deploy-framework ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/framework ${GITHUB_REF##*/}
 
       - name: Release
-        uses: actions/github-script@v5
+        uses: actions/github-script@v6
         with:
           github-token: ${{secrets.ACCESS_TOKEN}}
           script: |
@@ -81,7 +81,7 @@ jobs:
         run: ./source/.github/scripts/deploy-appstarter ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/appstarter ${GITHUB_REF##*/}
 
       - name: Release
-        uses: actions/github-script@v5
+        uses: actions/github-script@v6
         with:
           github-token: ${{secrets.ACCESS_TOKEN}}
           script: |
diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 5f2189f41e42..1d788f9d86e1 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -157,7 +157,7 @@ jobs:
         run: echo "TACHYCARDIA_MONITOR_GA=enabled" >> $GITHUB_ENV
 
       - name: Compute coverage option
-        uses: actions/github-script@v3
+        uses: actions/github-script@v6
         id: phpunit-coverage-option
         with:
           script: 'return "${{ matrix.php-versions }}" == "8.0" ? "" : "--no-coverage"'

From ad5f6f70e12d72d578fba92cf1682ca7c276bf00 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 1 Feb 2022 19:32:59 +0900
Subject: [PATCH 1571/2325] feat: add Controller::validateData()

---
 system/Controller.php           | 29 ++++++++++++++++++++++++++---
 tests/system/ControllerTest.php | 23 +++++++++++++++++++++++
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/system/Controller.php b/system/Controller.php
index 625bb1639b4c..3005ca4613b8 100644
--- a/system/Controller.php
+++ b/system/Controller.php
@@ -128,13 +128,36 @@ protected function loadHelpers()
     }
 
     /**
-     * A shortcut to performing validation on input data. If validation
-     * is not successful, a $errors property will be set on this class.
+     * A shortcut to performing validation on Request data.
      *
      * @param array|string $rules
      * @param array        $messages An array of custom error messages
      */
     protected function validate($rules, array $messages = []): bool
+    {
+        $this->setValidator($rules, $messages);
+
+        return $this->validator->withRequest($this->request)->run();
+    }
+
+    /**
+     * A shortcut to performing validation on any input data.
+     *
+     * @param array        $data     The data to validate
+     * @param array|string $rules
+     * @param array        $messages An array of custom error messages
+     */
+    protected function validateData(array $data, $rules, array $messages = []): bool
+    {
+        $this->setValidator($rules, $messages);
+
+        return $this->validator->run($data);
+    }
+
+    /**
+     * @param array|string $rules
+     */
+    private function setValidator($rules, array $messages): void
     {
         $this->validator = Services::validation();
 
@@ -157,6 +180,6 @@ protected function validate($rules, array $messages = []): bool
             $rules = $validation->{$rules};
         }
 
-        return $this->validator->withRequest($this->request)->setRules($rules, $messages)->run();
+        $this->validator->setRules($rules, $messages);
     }
 }
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index d4be0c503b7a..31c69405e382 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -168,6 +168,29 @@ public function testValidateWithStringRulesFoundUseMessagesParameter()
         $this->assertSame('You must choose a username.', Services::validation()->getError());
     }
 
+    public function testValidateData()
+    {
+        // make sure we can instantiate one
+        $this->controller = new Controller();
+        $this->controller->initController($this->request, $this->response, $this->logger);
+
+        $method = $this->getPrivateMethodInvoker($this->controller, 'validateData');
+
+        $data = [
+            'username' => 'mike',
+            'password' => '123',
+        ];
+        $rule = [
+            'username' => 'required',
+            'password' => 'required|min_length[10]',
+        ];
+        $this->assertFalse($method($data, $rule));
+        $this->assertSame(
+            'The password field must be at least 10 characters in length.',
+            Services::validation()->getError('password')
+        );
+    }
+
     public function testHelpers()
     {
         $this->controller      = new class () extends Controller {

From d48c5931a0f6928b105c5f250a7d18e2ab792853 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 15 Feb 2022 14:51:06 +0900
Subject: [PATCH 1572/2325] feat: add param $dbGroup to validateData()

No reason to restrict params.
---
 system/Controller.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/Controller.php b/system/Controller.php
index 3005ca4613b8..6116160c0fcb 100644
--- a/system/Controller.php
+++ b/system/Controller.php
@@ -146,12 +146,13 @@ protected function validate($rules, array $messages = []): bool
      * @param array        $data     The data to validate
      * @param array|string $rules
      * @param array        $messages An array of custom error messages
+     * @param string|null  $dbGroup  The database group to use
      */
-    protected function validateData(array $data, $rules, array $messages = []): bool
+    protected function validateData(array $data, $rules, array $messages = [], ?string $dbGroup = null): bool
     {
         $this->setValidator($rules, $messages);
 
-        return $this->validator->run($data);
+        return $this->validator->run($data, null, $dbGroup);
     }
 
     /**

From 9295bbe4cef7b37c624cbc994b7f95224b72f8f6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 15 Feb 2022 15:15:12 +0900
Subject: [PATCH 1573/2325] docs: add user guide

---
 .../source/incoming/controllers.rst           | 32 ++++++++++++++++++-
 .../source/libraries/validation.rst           |  2 +-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 67d9ed572bef..2fee4580dffb 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -350,8 +350,13 @@ inside the controller::
         protected $helpers = ['url', 'form'];
     }
 
+.. _controllers-validating-data:
+
 Validating data
-======================
+===============
+
+$this->validate()
+-----------------
 
 To simplify data checking, the controller also provides the convenience method ``validate()``.
 The method accepts an array of rules in the first parameter,
@@ -391,6 +396,31 @@ the ``$rules`` array with the name of the group as defined in ``Config\Validatio
 
 .. note:: Validation can also be handled automatically in the model, but sometimes it's easier to do it in the controller. Where is up to you.
 
+$this->validateData()
+---------------------
+
+Sometimes you may want to check the controller method parameters or other custom data.
+In that case, you can use the ``$this->validateData()`` method.
+The method accepts an array of data to validate in the first parameter::
+
+    public function product(int $id)
+    {
+        $data = [
+            'id'   => $id,
+            'name' => $this->request->getVar('name'),
+        ];
+        $rule = [
+            'id'   => 'integer',
+            'name' => 'required|max_length[255]',
+        ];
+
+        if (! $this->validateData($data, $rule) {
+            // ...
+        }
+
+        // ...
+    }
+
 That's it!
 ==========
 
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 9029b6edb169..f57b470cc708 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -152,7 +152,7 @@ If you submit the form you should simply see the form reload. That's
 because you haven't set up any validation rules in ``$this->validate()`` yet.
 
 The ``validate()`` method is a method in the Controller. It uses
-the **Validation class** inside. See *Validating data* in :doc:`/incoming/controllers`.
+the **Validation class** inside. See :ref:`controllers-validating-data`.
 
 .. note:: Since you haven't told the ``validate()`` method to validate anything
     yet, it **returns false** (boolean false) **by default**. The ``validate()``

From f664e0a67fbbf6ae58da697b43acd2bb3ec6a9e8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 15 Feb 2022 15:41:39 +0900
Subject: [PATCH 1574/2325] docs: update comment

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

diff --git a/system/Router/Router.php b/system/Router/Router.php
index 9755e146fe77..da00d054e4af 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -638,7 +638,7 @@ private function isValidSegment(string $segment): bool
      */
     protected function setRequest(array $segments = [])
     {
-        // If we don't have any segments - try the default controller;
+        // If we don't have any segments - use the default controller;
         if (empty($segments)) {
             return;
         }

From 35d50f41771e34d16a3187ac98211ad7c84ccb7c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 15 Feb 2022 15:43:45 +0900
Subject: [PATCH 1575/2325] docs: fix classname

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/changelogs/v4.2.0.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index d088879a6122..369c45eb1fc0 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -42,7 +42,7 @@ Deprecations
 - ``CodeIgniter\Database\SQLSRV\Connection::getError()`` is deprecated. Use ``CodeIgniter\Database\SQLSRV\Connection::error()`` instead.
 - ``CodeIgniter\Debug\Exceptions::cleanPath()`` and ``CodeIgniter\Debug\Toolbar\Collectors\BaseCollector::cleanPath()`` are deprecated. Use the ``clean_path()`` function instead.
 - ``CodeIgniter\Log\Logger::cleanFilenames()`` and ``CodeIgniter\Test\TestLogger::cleanup()`` are both deprecated. Use the ``clean_path()`` function instead.
-- ``CodeIgniter\Router\setDefaultController()`` is deprecated.
+- ``CodeIgniter\Router\Router::setDefaultController()`` is deprecated.
 
 Bugs Fixed
 **********

From 7dce1aa7d58b7b34cf81ad51c82644a4ca9f89bb Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Mon, 24 Jan 2022 02:29:15 +0800
Subject: [PATCH 1576/2325] Fix: Validation. Error key for field with asterisk

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/Validation/Validation.php              | 13 ++++++++----
 tests/system/Validation/ValidationTest.php    | 18 +++++++++++++----
 .../source/libraries/validation.rst           | 20 +++++++++++++++++++
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 2ebe361fa5c8..d8b8358c55c7 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -139,7 +139,12 @@ public function run(?array $data = null, ?string $group = null, ?string $dbGroup
                 $rules = $this->splitRules($rules);
             }
 
-            $values = dot_array_search($field, $data);
+            $values = strpos($field, '*') !== false
+                ? array_filter(array_flatten_with_dots($data), static fn ($key) => preg_match(
+                    '/^' . str_replace('\.\*', '\..+', preg_quote($field, '/')) . '$/',
+                    $key
+                ), ARRAY_FILTER_USE_KEY)
+                : dot_array_search($field, $data);
 
             if ($values === []) {
                 // We'll process the values right away if an empty array
@@ -148,10 +153,10 @@ public function run(?array $data = null, ?string $group = null, ?string $dbGroup
                 continue;
             }
 
-            if (strpos($field, '*') !== false && is_array($values)) {
+            if (strpos($field, '*') !== false) {
                 // Process multiple fields
-                foreach ($values as $value) {
-                    $this->processRules($field, $setup['label'] ?? $field, $value, $rules, $data);
+                foreach ($values as $dotField => $value) {
+                    $this->processRules($dotField, $setup['label'] ?? $field, $value, $rules, $data);
                 }
             } else {
                 // Process single field
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index fa5e769411b0..448ba7bc3f2e 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -825,21 +825,31 @@ public function testRulesForSingleRuleWithAsteriskWillReturnError(): void
             ],
             'name_user' => [
                 123,
+                'alpha',
                 'xyz098',
             ],
+            'contacts' => [
+                'friends' => [
+                    ['name' => ''],
+                    ['name' => 'John'],
+                ],
+            ],
         ];
 
         $request = new IncomingRequest($config, new URI(), 'php://input', new UserAgent());
 
         $this->validation->setRules([
-            'id_user.*'   => 'numeric',
-            'name_user.*' => 'alpha',
+            'id_user.*'       => 'numeric',
+            'name_user.*'     => 'alpha',
+            'contacts.*.name' => 'required',
         ]);
 
         $this->validation->withRequest($request->withMethod('post'))->run();
         $this->assertSame([
-            'id_user.*'   => 'The id_user.* field must contain only numbers.',
-            'name_user.*' => 'The name_user.* field may only contain alphabetical characters.',
+            'id_user.0'               => 'The id_user.* field must contain only numbers.',
+            'name_user.0'             => 'The name_user.* field may only contain alphabetical characters.',
+            'name_user.2'             => 'The name_user.* field may only contain alphabetical characters.',
+            'contacts.friends.0.name' => 'The contacts.*.name field is required.',
         ], $this->validation->getErrors());
     }
 
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 9029b6edb169..ca1b435f76e0 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -618,6 +618,26 @@ If you need to retrieve all error messages for failed fields, you can use the ``
 
 If no errors exist, an empty array will be returned.
 
+When using a wildcard, the error will point to a specific field, replacing the asterisk with the appropriate key/keys.::
+
+    // for data
+    'contacts' => [
+        'friends' => [
+            [
+                'name' => 'Fred Flinstone',
+            ],
+            [
+                'name' => '',
+            ],
+        ]
+    ]
+
+    //rule
+    contacts.*.name => 'required'
+
+    // error will be
+    'contacts.friends.1.name' => 'The contacts.*.name field is required.',
+
 Getting a Single Error
 ======================
 

From 1d637100d36da70bc45b9c4b79946250d3f0aeb9 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Mon, 24 Jan 2022 03:45:24 +0800
Subject: [PATCH 1577/2325] Changing test for strict rules

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 .../Validation/StrictRules/ValidationTest.php  | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/tests/system/Validation/StrictRules/ValidationTest.php b/tests/system/Validation/StrictRules/ValidationTest.php
index 34211ca80425..c6aa06b3541d 100644
--- a/tests/system/Validation/StrictRules/ValidationTest.php
+++ b/tests/system/Validation/StrictRules/ValidationTest.php
@@ -722,21 +722,31 @@ public function testRulesForSingleRuleWithAsteriskWillReturnError(): void
             ],
             'name_user' => [
                 123,
+                'alpha',
                 'xyz098',
             ],
+            'contacts' => [
+                'friends' => [
+                    ['name' => ''],
+                    ['name' => 'John'],
+                ],
+            ],
         ];
 
         $request = new IncomingRequest($config, new URI(), 'php://input', new UserAgent());
 
         $this->validation->setRules([
-            'id_user.*'   => 'numeric',
-            'name_user.*' => 'alpha',
+            'id_user.*'       => 'numeric',
+            'name_user.*'     => 'alpha',
+            'contacts.*.name' => 'required',
         ]);
 
         $this->validation->withRequest($request->withMethod('post'))->run();
         $this->assertSame([
-            'id_user.*'   => 'The id_user.* field must contain only numbers.',
-            'name_user.*' => 'The name_user.* field may only contain alphabetical characters.',
+            'id_user.0'               => 'The id_user.* field must contain only numbers.',
+            'name_user.0'             => 'The name_user.* field may only contain alphabetical characters.',
+            'name_user.2'             => 'The name_user.* field may only contain alphabetical characters.',
+            'contacts.friends.0.name' => 'The contacts.*.name field is required.',
         ], $this->validation->getErrors());
     }
 

From d67379a50211b3b9f1aec670d4cdd064136067bd Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Tue, 25 Jan 2022 11:20:30 +0800
Subject: [PATCH 1578/2325] Changelog

---
 user_guide_src/source/changelogs/v4.2.0.rst    | 1 +
 user_guide_src/source/libraries/validation.rst | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index a4eaaac9eab6..d53989e0417a 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -36,6 +36,7 @@ Changes
 - Update minimal PHP requirement to 7.4.
 - The current version of Content Security Policy (CSP) outputs one nonce for script and one for style tags. The previous version outputted one nonce for each tag.
 - The process of sending cookies has been moved to the ``Response`` class. Now the ``Session`` class doesn't send cookies, set them to the Response.
+- Validation. Changed generation of errors when using fields with a wildcard (*). Now the error key contains the full path. See :ref:`validation-getting-all-errors`.
 
 Deprecations
 ************
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index ca1b435f76e0..d1eacf4abe47 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -603,6 +603,8 @@ We can simply use the language lines defined in this file, like this::
         ]
     );
 
+.. _validation-getting-all-errors:
+
 Getting All Errors
 ==================
 

From a8b64799b062beb77dc5f16f411fe218694d7339 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Wed, 26 Jan 2022 17:56:35 +0800
Subject: [PATCH 1579/2325] Validation::hasError() wildcard

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/Validation/Validation.php               |  4 +++-
 .../Validation/StrictRules/ValidationTest.php  | 18 ++++++++++++++++--
 tests/system/Validation/ValidationTest.php     | 18 ++++++++++++++++--
 user_guide_src/source/libraries/validation.rst | 12 +++++++++++-
 4 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index d8b8358c55c7..48f5e0db0f79 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -631,7 +631,9 @@ protected function fillPlaceholders(array $rules, array $data): array
      */
     public function hasError(string $field): bool
     {
-        return array_key_exists($field, $this->getErrors());
+        $pattern = '/^' . str_replace('\.\*', '\..+', preg_quote($field, '/')) . '$/';
+
+        return (bool) preg_grep($pattern, array_keys($this->getErrors()));
     }
 
     /**
diff --git a/tests/system/Validation/StrictRules/ValidationTest.php b/tests/system/Validation/StrictRules/ValidationTest.php
index c6aa06b3541d..5f2ad2fd9324 100644
--- a/tests/system/Validation/StrictRules/ValidationTest.php
+++ b/tests/system/Validation/StrictRules/ValidationTest.php
@@ -530,10 +530,24 @@ public function testNotRealCustomRule(): void
 
     public function testHasError(): void
     {
-        $data = ['foo' => 'notanumber'];
-        $this->validation->setRules(['foo' => 'is_numeric']);
+        $data = [
+            'foo' => 'notanumber',
+            'bar' => [
+                ['baz' => 'string'],
+                ['baz' => ''],
+            ],
+        ];
+
+        $this->validation->setRules([
+            'foo'       => 'is_numeric',
+            'bar.*.baz' => 'required',
+        ]);
+
         $this->validation->run($data);
         $this->assertTrue($this->validation->hasError('foo'));
+        $this->assertTrue($this->validation->hasError('bar.*.baz'));
+        $this->assertFalse($this->validation->hasError('bar.0.baz'));
+        $this->assertTrue($this->validation->hasError('bar.1.baz'));
     }
 
     public function testSplitRulesTrue(): void
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index 448ba7bc3f2e..f4bff6b96cf3 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -633,10 +633,24 @@ public function testNotRealCustomRule(): void
 
     public function testHasError(): void
     {
-        $data = ['foo' => 'notanumber'];
-        $this->validation->setRules(['foo' => 'is_numeric']);
+        $data = [
+            'foo' => 'notanumber',
+            'bar' => [
+                ['baz' => 'string'],
+                ['baz' => ''],
+            ],
+        ];
+
+        $this->validation->setRules([
+            'foo'       => 'is_numeric',
+            'bar.*.baz' => 'required',
+        ]);
+
         $this->validation->run($data);
         $this->assertTrue($this->validation->hasError('foo'));
+        $this->assertTrue($this->validation->hasError('bar.*.baz'));
+        $this->assertFalse($this->validation->hasError('bar.0.baz'));
+        $this->assertTrue($this->validation->hasError('bar.1.baz'));
     }
 
     public function testSplitRulesTrue(): void
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index d1eacf4abe47..265bdc7e576d 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -634,7 +634,7 @@ When using a wildcard, the error will point to a specific field, replacing the a
         ]
     ]
 
-    //rule
+    // rule
     contacts.*.name => 'required'
 
     // error will be
@@ -659,6 +659,16 @@ You can check to see if an error exists with the ``hasError()`` method. The only
         echo $validation->getError('username');
     }
 
+When specifying a field with a wildcard, all errors matching the mask will be checked.::
+
+    // for errors
+    [
+        'foo.0.bar'   => 'Error',
+        'foo.baz.bar' => 'Error',
+    ]
+
+    $validation->hasError('foo.*.bar'); // return true
+
 Customizing Error Display
 *************************
 

From 8f4147e64d431c3c8ab1016ea31cf1c388a472d4 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Wed, 26 Jan 2022 18:30:18 +0800
Subject: [PATCH 1580/2325] Validation::getError() wildcard

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/Validation/Validation.php                       |  7 ++++++-
 tests/system/Validation/StrictRules/ValidationTest.php | 10 ++++++++++
 tests/system/Validation/ValidationTest.php             | 10 ++++++++++
 user_guide_src/source/libraries/validation.rst         |  2 ++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 48f5e0db0f79..155efc223492 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -646,7 +646,12 @@ public function getError(?string $field = null): string
             $field = array_key_first($this->rules);
         }
 
-        return array_key_exists($field, $this->getErrors()) ? $this->errors[$field] : '';
+        $errors = array_filter($this->getErrors(), static fn ($key) => preg_match(
+            '/^' . str_replace('\.\*', '\..+', preg_quote($field, '/')) . '$/',
+            $key
+        ), ARRAY_FILTER_USE_KEY);
+
+        return $errors === [] ? '' : implode("\n", $errors);
     }
 
     /**
diff --git a/tests/system/Validation/StrictRules/ValidationTest.php b/tests/system/Validation/StrictRules/ValidationTest.php
index 5f2ad2fd9324..865d3a026d9c 100644
--- a/tests/system/Validation/StrictRules/ValidationTest.php
+++ b/tests/system/Validation/StrictRules/ValidationTest.php
@@ -762,6 +762,16 @@ public function testRulesForSingleRuleWithAsteriskWillReturnError(): void
             'name_user.2'             => 'The name_user.* field may only contain alphabetical characters.',
             'contacts.friends.0.name' => 'The contacts.*.name field is required.',
         ], $this->validation->getErrors());
+
+        $this->assertSame(
+            "The name_user.* field may only contain alphabetical characters.\n"
+            . 'The name_user.* field may only contain alphabetical characters.',
+            $this->validation->getError('name_user.*')
+        );
+        $this->assertSame(
+            'The contacts.*.name field is required.',
+            $this->validation->getError('contacts.*.name')
+        );
     }
 
     public function testRulesForSingleRuleWithSingleValue(): void
diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index f4bff6b96cf3..664a92d5527f 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -865,6 +865,16 @@ public function testRulesForSingleRuleWithAsteriskWillReturnError(): void
             'name_user.2'             => 'The name_user.* field may only contain alphabetical characters.',
             'contacts.friends.0.name' => 'The contacts.*.name field is required.',
         ], $this->validation->getErrors());
+
+        $this->assertSame(
+            "The name_user.* field may only contain alphabetical characters.\n"
+            . 'The name_user.* field may only contain alphabetical characters.',
+            $this->validation->getError('name_user.*')
+        );
+        $this->assertSame(
+            'The contacts.*.name field is required.',
+            $this->validation->getError('contacts.*.name')
+        );
     }
 
     public function testRulesForSingleRuleWithSingleValue(): void
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 265bdc7e576d..deaa987922a9 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -650,6 +650,8 @@ name::
 
 If no error exists, an empty string will be returned.
 
+.. note:: When using a wildcard, all found errors that match the mask will be combined into one line separated by the EOL character.
+
 Check If Error Exists
 =====================
 

From 133653950c54d75f04164d0c825aa1e6afef85af Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Wed, 26 Jan 2022 19:05:59 +0800
Subject: [PATCH 1581/2325] Validation::getError() wildcard

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 user_guide_src/source/changelogs/v4.2.0.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index d53989e0417a..51a0dc3a7e12 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -37,6 +37,7 @@ Changes
 - The current version of Content Security Policy (CSP) outputs one nonce for script and one for style tags. The previous version outputted one nonce for each tag.
 - The process of sending cookies has been moved to the ``Response`` class. Now the ``Session`` class doesn't send cookies, set them to the Response.
 - Validation. Changed generation of errors when using fields with a wildcard (*). Now the error key contains the full path. See :ref:`validation-getting-all-errors`.
+- ``Validation::getError()`` when using a wildcard will return all found errors matching the mask as a string.
 
 Deprecations
 ************

From e667325ab8f5fa44d40af18a2482b9ee357b3c26 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sun, 13 Feb 2022 00:26:24 +0800
Subject: [PATCH 1582/2325] Refactor exception logging

---
 system/Debug/Exceptions.php           | 58 ++++++++++++++++++++++++++-
 tests/system/Debug/ExceptionsTest.php | 16 ++++++++
 2 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/system/Debug/Exceptions.php b/system/Debug/Exceptions.php
index 0d96d7c087ca..879dab718a16 100644
--- a/system/Debug/Exceptions.php
+++ b/system/Debug/Exceptions.php
@@ -102,8 +102,11 @@ public function exceptionHandler(Throwable $exception)
         [$statusCode, $exitCode] = $this->determineCodes($exception);
 
         if ($this->config->log === true && ! in_array($statusCode, $this->config->ignoreCodes, true)) {
-            log_message('critical', $exception->getMessage() . "\n{trace}", [
-                'trace' => $exception->getTraceAsString(),
+            log_message('critical', "{message}\nin {exFile} on line {exLine}.\n{trace}", [
+                'message' => $exception->getMessage(),
+                'exFile'  => clean_path($exception->getFile()), // {file} refers to THIS file
+                'exLine'  => $exception->getLine(), // {line} refers to THIS line
+                'trace'   => self::renderBacktrace($exception->getTrace()),
             ]);
         }
 
@@ -434,4 +437,55 @@ public static function highlightFile(string $file, int $lineNumber, int $lines =
 
         return '<pre><code>' . $out . '</code></pre>';
     }
+
+    private static function renderBacktrace(array $backtrace): string
+    {
+        $backtraces = [];
+
+        foreach ($backtrace as $index => $trace) {
+            $frame = $trace + ['file' => '[internal function]', 'line' => '', 'class' => '', 'type' => '', 'args' => []];
+
+            if ($frame['file'] !== '[internal function]') {
+                $frame['file'] = sprintf('%s(%s)', $frame['file'], $frame['line']);
+            }
+
+            unset($frame['line']);
+            $idx = $index;
+            $idx = str_pad((string) ++$idx, 2, ' ', STR_PAD_LEFT);
+
+            $args = implode(', ', array_map(static function ($value): string {
+                switch (true) {
+                    case is_object($value):
+                        return sprintf('Object(%s)', get_class($value));
+
+                    case is_array($value):
+                        return $value !== [] ? '[...]' : '[]';
+
+                    case $value === null:
+                        return 'null';
+
+                    case is_resource($value):
+                        return sprintf('resource (%s)', get_resource_type($value));
+
+                    case is_string($value):
+                        return var_export(clean_path($value), true);
+
+                    default:
+                        return var_export($value, true);
+                }
+            }, $frame['args']));
+
+            $backtraces[] = sprintf(
+                '%s %s: %s%s%s(%s)',
+                $idx,
+                clean_path($frame['file']),
+                $frame['class'],
+                $frame['type'],
+                $frame['function'],
+                $args
+            );
+        }
+
+        return implode("\n", $backtraces);
+    }
 }
diff --git a/tests/system/Debug/ExceptionsTest.php b/tests/system/Debug/ExceptionsTest.php
index 247629933c69..8bd4f01e0925 100644
--- a/tests/system/Debug/ExceptionsTest.php
+++ b/tests/system/Debug/ExceptionsTest.php
@@ -61,4 +61,20 @@ public function testDetermineCodes(): void
         $this->assertSame([500, 1], $determineCodes(new RuntimeException('That.', 600)));
         $this->assertSame([404, 1], $determineCodes(new RuntimeException('There.', 404)));
     }
+
+    public function testRenderBacktrace(): void
+    {
+        $renderer  = self::getPrivateMethodInvoker(Exceptions::class, 'renderBacktrace');
+        $exception = new RuntimeException('This.');
+
+        $renderedBacktrace = $renderer($exception->getTrace());
+        $renderedBacktrace = explode("\n", $renderedBacktrace);
+
+        foreach ($renderedBacktrace as $trace) {
+            $this->assertMatchesRegularExpression(
+                '/^\s*\d* .+(?:\(\d+\))?: \S+(?:(?:\->|::)\S+)?\(.*\)$/',
+                $trace
+            );
+        }
+    }
 }

From 825534e1f1d6f0fb07e9828f5047908c9c4dc75f Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 15 Feb 2022 17:27:44 +0800
Subject: [PATCH 1583/2325] Add changes to changelog

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index abb5e9dc3c01..cc1561a98949 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -29,6 +29,8 @@ Enhancements
 - Added new OCI8 driver for database.
     - It can access Oracle Database and supports SQL and PL/SQL statements.
 - The ``spark routes`` command now shows closure routes, auto routtes, and filters. See :ref:`URI Routing <spark-routes>`.
+- Exception information logged through ``log_message()`` has now improved. It now includes the file and line where the exception originated. It also does not truncate the message anymore.
+    - The log format has also changed. If users are depending on the log format in their apps, the new log format is "<1-based count> <cleaned filepath>(<line>): <class><function><args>"
 
 Changes
 *******

From 9ddb49d46eef936ce9e2dfce03d57e6206d77f93 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 16 Feb 2022 11:41:55 +0900
Subject: [PATCH 1584/2325] docs: fix out of dated description

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

diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst
index beb8da256f0b..c9aa280c7a9d 100644
--- a/user_guide_src/source/concepts/autoloader.rst
+++ b/user_guide_src/source/concepts/autoloader.rst
@@ -10,10 +10,9 @@ hard-coding that location into your files in a series of ``requires()`` is a mas
 headache and very error-prone. That's where autoloaders come in.
 
 CodeIgniter provides a very flexible autoloader that can be used with very little configuration.
-It can locate individual non-namespaced classes, namespaced classes that adhere to
+It can locate individual namespaced classes that adhere to
 `PSR-4 <https://www.php-fig.org/psr/psr-4/>`_ autoloading
-directory structures, and will even attempt to locate classes in common directories (like Controllers,
-Models, etc).
+directory structures.
 
 For performance improvement, the core CodeIgniter components have been added to the classmap.
 

From e2914dad3ec637b8dbd6269d00efef9f98765df1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 16 Feb 2022 13:27:35 +0900
Subject: [PATCH 1585/2325] fix: missing argument $group

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

diff --git a/system/BaseModel.php b/system/BaseModel.php
index cda9c23433e7..64753be5b3e3 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -1076,7 +1076,7 @@ public function paginate(?int $perPage = null, string $group = 'default', ?int $
         $pager = Services::pager(null, null, false);
 
         if ($segment) {
-            $pager->setSegment($segment);
+            $pager->setSegment($segment, $group);
         }
 
         $page = $page >= 1 ? $page : $pager->getCurrentPage($group);

From 2fbd9b64a1b9fc767a5487179832845622718454 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 16 Feb 2022 13:42:53 +0900
Subject: [PATCH 1586/2325] refactor: replace deprecated Response::getReason()
 with getReasonPhrase()

---
 app/Views/errors/html/error_exception.php  | 2 +-
 system/HTTP/ResponseTrait.php              | 2 +-
 tests/system/HTTP/DownloadResponseTest.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
index 4ddeac1a2ec4..60fb16c2f899 100644
--- a/app/Views/errors/html/error_exception.php
+++ b/app/Views/errors/html/error_exception.php
@@ -314,7 +314,7 @@
 				<table>
 					<tr>
 						<td style="width: 15em">Response Status</td>
-						<td><?= esc($response->getStatusCode() . ' - ' . $response->getReason()) ?></td>
+						<td><?= esc($response->getStatusCode() . ' - ' . $response->getReasonPhrase()) ?></td>
 					</tr>
 				</table>
 
diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
index 412e7b970e7c..0e945b6288f1 100644
--- a/system/HTTP/ResponseTrait.php
+++ b/system/HTTP/ResponseTrait.php
@@ -467,7 +467,7 @@ public function sendHeaders()
         }
 
         // HTTP Status
-        header(sprintf('HTTP/%s %s %s', $this->getProtocolVersion(), $this->getStatusCode(), $this->getReason()), true, $this->getStatusCode());
+        header(sprintf('HTTP/%s %s %s', $this->getProtocolVersion(), $this->getStatusCode(), $this->getReasonPhrase()), true, $this->getStatusCode());
 
         // Send all of our headers
         foreach (array_keys($this->getHeaders()) as $name) {
diff --git a/tests/system/HTTP/DownloadResponseTest.php b/tests/system/HTTP/DownloadResponseTest.php
index 736558dcf9d2..5c66052f164d 100644
--- a/tests/system/HTTP/DownloadResponseTest.php
+++ b/tests/system/HTTP/DownloadResponseTest.php
@@ -277,7 +277,7 @@ public function testThrowExceptionWhenNoSetDownloadSource()
     public function testGetReason()
     {
         $response = new DownloadResponse('unit-test.php', false);
-        $this->assertSame('OK', $response->getReason());
+        $this->assertSame('OK', $response->getReasonPhrase());
     }
 
     public function testPretendOutput()

From da7e6c47af2615ebe96e7e10aaf1201342b254de Mon Sep 17 00:00:00 2001
From: ZongLiang <649236041@qq.com>
Date: Wed, 16 Feb 2022 18:05:59 +0800
Subject: [PATCH 1587/2325] Update Toolbar.php

---
 system/Debug/Toolbar.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index bf502f1f1563..4113293553f0 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -151,7 +151,12 @@ public function run(float $startTime, float $totalTime, RequestInterface $reques
             'statusCode'  => $response->getStatusCode(),
             'reason'      => esc($response->getReasonPhrase()),
             'contentType' => esc($response->getHeaderLine('content-type')),
+            'headers' => [],
         ];
+        
+        foreach ($response->headers() as $header) {
+            $data['vars']['response']['headers'][esc($header->getName())] = esc($header->getValueLine());
+        }
 
         $data['config'] = Config::display();
 

From 284142dac2ea253becfccc62ed2dec484899dacf Mon Sep 17 00:00:00 2001
From: ZongLiang <649236041@qq.com>
Date: Wed, 16 Feb 2022 18:11:24 +0800
Subject: [PATCH 1588/2325] Update toolbar.tpl.php

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

diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php
index 65cf2a4c3edf..077fc9f070ba 100644
--- a/system/Debug/Toolbar/Views/toolbar.tpl.php
+++ b/system/Debug/Toolbar/Views/toolbar.tpl.php
@@ -239,7 +239,7 @@
 			<span>( <?= $vars['response']['statusCode'] . ' - ' . $vars['response']['reason'] ?> )</span>
 		</h2>
 
-		<?php if (isset($vars['headers']) && $headers = $vars['headers']) : ?>
+		<?php if (isset($vars['response']['headers']) && $headers = $vars['response']['headers']) : ?>
 			<a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('response_headers'); return false;">
 				<h3>Headers</h3>
 			</a>

From b348513654a4c6eacf728ccd53a40c86bfa850b5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 17 Feb 2022 09:10:06 +0900
Subject: [PATCH 1589/2325] test: fix Popcorn controller

---
 tests/_support/Controllers/Popcorn.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/_support/Controllers/Popcorn.php b/tests/_support/Controllers/Popcorn.php
index 71a316685a32..660a405cccc2 100644
--- a/tests/_support/Controllers/Popcorn.php
+++ b/tests/_support/Controllers/Popcorn.php
@@ -30,7 +30,7 @@ public function index()
 
     public function pop()
     {
-        $this->respond('Oops', 567, 'Surprise');
+        return $this->respond('Oops', 567, 'Surprise');
     }
 
     public function popper()
@@ -40,12 +40,12 @@ public function popper()
 
     public function weasel()
     {
-        $this->respond('', 200);
+        return $this->respond('', 200);
     }
 
     public function oops()
     {
-        $this->failUnauthorized();
+        return $this->failUnauthorized();
     }
 
     public function goaway()
@@ -72,12 +72,12 @@ public function cat()
 
     public function json()
     {
-        $this->respond(['answer' => 42]);
+        return $this->respond(['answer' => 42]);
     }
 
     public function xml()
     {
-        $this->respond('<my><pet>cat</pet></my>');
+        return $this->respond('<my><pet>cat</pet></my>');
     }
 
     public function toindex()

From 44a35f5f115af631fabc44ae59619b73db796ea6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 17 Feb 2022 09:11:04 +0900
Subject: [PATCH 1590/2325] fix: 404 override controller does not output
 Response object body

---
 system/CodeIgniter.php           |  6 ++++--
 tests/system/CodeIgniterTest.php | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 4cc1978a96f1..8d651f7a4c70 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -847,6 +847,8 @@ protected function display404errors(PageNotFoundException $e)
     {
         // Is there a 404 Override available?
         if ($override = $this->router->get404Override()) {
+            $returned = null;
+
             if ($override instanceof Closure) {
                 echo $override($e->getMessage());
             } elseif (is_array($override)) {
@@ -857,13 +859,13 @@ protected function display404errors(PageNotFoundException $e)
                 $this->method     = $override[1];
 
                 $controller = $this->createController();
-                $this->runController($controller);
+                $returned   = $this->runController($controller);
             }
 
             unset($override);
 
             $cacheConfig = new Cache();
-            $this->gatherOutput($cacheConfig);
+            $this->gatherOutput($cacheConfig, $returned);
             $this->sendResponse();
 
             return;
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index a34664d9c9e1..4b09c8cce75e 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -105,6 +105,25 @@ public function testRun404Override()
         $this->assertStringContainsString('Welcome to CodeIgniter', $output);
     }
 
+    public function testRun404OverrideControllerReturnsResponse()
+    {
+        $_SERVER['argv'] = ['index.php', '/'];
+        $_SERVER['argc'] = 2;
+
+        // Inject mock router.
+        $routes = Services::routes();
+        $routes->setAutoRoute(false);
+        $routes->set404Override('Tests\Support\Controllers\Popcorn::pop');
+        $router = Services::router($routes, Services::request());
+        Services::injectMock('router', $router);
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run($routes);
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString('Oops', $output);
+    }
+
     public function testRun404OverrideByClosure()
     {
         $_SERVER['argv'] = ['index.php', '/'];

From a22a145201fba044ebae3465f78724fc1ea807d8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 17 Feb 2022 09:17:38 +0900
Subject: [PATCH 1591/2325] docs: update PHPDoc types

---
 system/CodeIgniter.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 8d651f7a4c70..6769911f2da0 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -777,6 +777,8 @@ public function setPath(string $path)
      * Now that everything has been setup, this method attempts to run the
      * controller method and make the script go. If it's not able to, will
      * show the appropriate Page Not Found error.
+     *
+     * @return ResponseInterface|string|void
      */
     protected function startController()
     {
@@ -804,7 +806,7 @@ protected function startController()
     /**
      * Instantiates the controller class.
      *
-     * @return mixed
+     * @return Controller
      */
     protected function createController()
     {
@@ -821,7 +823,7 @@ protected function createController()
      *
      * @param mixed $class
      *
-     * @return mixed
+     * @return false|ResponseInterface|string|void
      */
     protected function runController($class)
     {
@@ -893,7 +895,7 @@ protected function display404errors(PageNotFoundException $e)
      * Gathers the script output from the buffer, replaces some execution
      * time tag in the output and displays the debug toolbar, if required.
      *
-     * @param mixed|null $returned
+     * @param ResponseInterface|string|null $returned
      */
     protected function gatherOutput(?Cache $cacheConfig = null, $returned = null)
     {

From ba7f5df17d0a614d7f7f8842706a3f6e7f1a8548 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 17 Feb 2022 09:17:54 +0900
Subject: [PATCH 1592/2325] test: fix test code

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

diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index 4b09c8cce75e..b4117673e785 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -94,15 +94,15 @@ public function testRun404Override()
         // Inject mock router.
         $routes = Services::routes();
         $routes->setAutoRoute(false);
-        $routes->set404Override('Home::index');
+        $routes->set404Override('Tests\Support\Controllers\Hello::index');
         $router = Services::router($routes, Services::request());
         Services::injectMock('router', $router);
 
         ob_start();
-        $this->codeigniter->useSafeOutput(true)->run();
+        $this->codeigniter->useSafeOutput(true)->run($routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString('Welcome to CodeIgniter', $output);
+        $this->assertStringContainsString('Hello', $output);
     }
 
     public function testRun404OverrideControllerReturnsResponse()

From 82adc8bfe71affa3fbe0a8760882d2db62db11ca Mon Sep 17 00:00:00 2001
From: ZongLiang <649236041@qq.com>
Date: Thu, 17 Feb 2022 09:14:33 +0800
Subject: [PATCH 1593/2325] Update Toolbar.php

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

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 4113293553f0..72328e6c334f 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -151,9 +151,9 @@ public function run(float $startTime, float $totalTime, RequestInterface $reques
             'statusCode'  => $response->getStatusCode(),
             'reason'      => esc($response->getReasonPhrase()),
             'contentType' => esc($response->getHeaderLine('content-type')),
-            'headers' => [],
+            'headers'     => [],
         ];
-        
+
         foreach ($response->headers() as $header) {
             $data['vars']['response']['headers'][esc($header->getName())] = esc($header->getValueLine());
         }

From e6af132e152760bba4b1de5f5cb2e2c3f1fb44fd Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sat, 19 Feb 2022 06:49:57 +0700
Subject: [PATCH 1594/2325] Make CodeIgniter::context nullable to handle access
 before initialization

---
 system/CodeIgniter.php               | 2 +-
 system/Test/Mock/MockCodeIgniter.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 6ab61aa0f5c0..dac6f7feaaf5 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -149,7 +149,7 @@ class CodeIgniter
      *
      * @phpstan-var 'php-cli'|'spark'|'web'
      */
-    protected string $context;
+    protected ?string $context = null;
 
     /**
      * Constructor.
diff --git a/system/Test/Mock/MockCodeIgniter.php b/system/Test/Mock/MockCodeIgniter.php
index 81bd7e23122e..e6d6ac0f6c61 100644
--- a/system/Test/Mock/MockCodeIgniter.php
+++ b/system/Test/Mock/MockCodeIgniter.php
@@ -15,7 +15,7 @@
 
 class MockCodeIgniter extends CodeIgniter
 {
-    protected string $context = 'web';
+    protected ?string $context = 'web';
 
     protected function callExit($code)
     {

From 5010f64ddc54f959c3e2fa720684ee57da8e1c1c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 19 Feb 2022 10:01:12 +0900
Subject: [PATCH 1595/2325] docs: fix incorrect description about Uploaded
 Files

---
 .../source/incoming/incomingrequest.rst       | 19 +++----------------
 .../source/libraries/uploaded_files.rst       |  2 ++
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index 46ebd35b4bf9..5e77e9253804 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -285,27 +285,14 @@ functions use, so this is a helpful way to "spoof" an incoming request for testi
 Uploaded Files
 --------------
 
-Information about all uploaded files can be retrieved through ``$request->getFiles()``, which returns a
-:doc:`FileCollection </libraries/uploaded_files>` instance. This helps to ease the pain of working with uploaded files,
+Information about all uploaded files can be retrieved through ``$request->getFiles()``, which returns an array of
+``CodeIgniter\HTTP\Files\UploadedFile`` instance. This helps to ease the pain of working with uploaded files,
 and uses best practices to minimize any security risks.
 ::
 
     $files = $request->getFiles();
 
-    // Grab the file by name given in HTML form
-    if ($files->hasFile('userfile')) {
-        $file = $files->getFile('userfile');
-
-        // Generate a new secure name
-        $name = $file->getRandomName();
-
-        // Move the file to it's new home
-        $file->move('/path/to/dir', $name);
-
-        echo $file->getSize('mb'); // 1.23
-        echo $file->getExtension(); // jpg
-        echo $file->getType(); // image/jpg
-    }
+See :ref:`Working with Uploaded Files <uploaded-files-accessing-files>` for the details.
 
 You can retrieve a single file uploaded on its own, based on the filename given in the HTML file input::
 
diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index c38620935060..9640809ba99b 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -166,6 +166,8 @@ You should see an upload form. Try uploading an image file (either a
 **jpg**, **gif**, **png**, or **webp**). If the path in your controller is correct it should
 work.
 
+.. _uploaded-files-accessing-files:
+
 ***************
 Accessing Files
 ***************

From 21a21cc0e78754e691b23a611d16bb7f5ad15d66 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 16 Oct 2021 14:36:37 +0900
Subject: [PATCH 1596/2325] fix: options are not passed to Command $params

---
 phpstan-baseline.neon.dist             |  5 -----
 system/CodeIgniter.php                 | 25 +++++++++++++++++------
 system/HTTP/CLIRequest.php             | 17 ++++++++++++++++
 tests/system/CLI/CommandRunnerTest.php |  3 +++
 tests/system/HTTP/CLIRequestTest.php   | 28 ++++++++++++++++++++++++++
 5 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index f1b7e7286411..24cf6cbbafdc 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -105,11 +105,6 @@ parameters:
 			count: 1
 			path: system/CodeIgniter.php
 
-		-
-			message: "#^Call to an undefined method CodeIgniter\\\\HTTP\\\\Request\\:\\:getSegments\\(\\)\\.$#"
-			count: 1
-			path: system/CodeIgniter.php
-
 		-
 			message: "#^Call to an undefined method CodeIgniter\\\\HTTP\\\\Request\\:\\:setLocale\\(\\)\\.$#"
 			count: 1
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index dac6f7feaaf5..7444fe616b4b 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -858,21 +858,34 @@ protected function createController()
     /**
      * Runs the controller, allowing for _remap methods to function.
      *
+     * CI4 supports three types of requests:
+     *  1. Web: URI segments become parameters, sent to Controllers via Routes,
+     *      output controlled by Headers to browser
+     *  2. Spark: accessed by CLI via the spark command, arguments are Command arguments,
+     *      sent to Commands by CommandRunner, output controlled by CLI class
+     *  3. PHP CLI: accessed by CLI via php public/index.php, arguments become URI segments,
+     *      sent to Controllers via Routes, output varies
+     *
      * @param mixed $class
      *
      * @return false|ResponseInterface|string|void
      */
     protected function runController($class)
     {
-        // If this is a console request then use the input segments as parameters
-        $params = $this->isSparked() ? $this->request->getSegments() : $this->router->params();
-
-        if (method_exists($class, '_remap')) {
-            $output = $class->_remap($this->method, ...$params);
+        if ($this->isSparked()) {
+            // This is a Spark request
+            /** @var CLIRequest $request */
+            $request = $this->request;
+            $params  = $request->getArgs();
         } else {
-            $output = $class->{$this->method}(...$params);
+            // This is a Web request or PHP CLI request
+            $params = $this->router->params();
         }
 
+        $output = method_exists($class, '_remap')
+            ? $class->_remap($this->method, ...$params)
+            : $class->{$this->method}(...$params);
+
         $this->benchmark->stop('controller');
 
         return $output;
diff --git a/system/HTTP/CLIRequest.php b/system/HTTP/CLIRequest.php
index c015571cde40..5f2c70b19ff7 100644
--- a/system/HTTP/CLIRequest.php
+++ b/system/HTTP/CLIRequest.php
@@ -41,6 +41,13 @@ class CLIRequest extends Request
      */
     protected $options = [];
 
+    /**
+     * Command line arguments (segments and options).
+     *
+     * @var array
+     */
+    protected $args = [];
+
     /**
      * Set the expected HTTP verb
      *
@@ -94,6 +101,14 @@ public function getOptions(): array
         return $this->options;
     }
 
+    /**
+     * Returns an array of all CLI arguments (segments and options).
+     */
+    public function getArgs(): array
+    {
+        return $this->args;
+    }
+
     /**
      * Returns the path segments.
      */
@@ -173,6 +188,7 @@ protected function parseCommand()
                     $optionValue = false;
                 } else {
                     $this->segments[] = $arg;
+                    $this->args[]     = $arg;
                 }
 
                 continue;
@@ -187,6 +203,7 @@ protected function parseCommand()
             }
 
             $this->options[$arg] = $value;
+            $this->args[$arg]    = $value;
         }
     }
 
diff --git a/tests/system/CLI/CommandRunnerTest.php b/tests/system/CLI/CommandRunnerTest.php
index 9e219954f7a2..32ca71357e75 100644
--- a/tests/system/CLI/CommandRunnerTest.php
+++ b/tests/system/CLI/CommandRunnerTest.php
@@ -118,6 +118,9 @@ public function testBadCommand()
         $this->assertStringContainsString('Command "bogus" not found', CITestStreamFilter::$buffer);
     }
 
+    /**
+     * @TODO When the first param is empty? Use case?
+     */
     public function testRemapEmptyFirstParams()
     {
         self::$runner->_remap('anyvalue', null, 'list');
diff --git a/tests/system/HTTP/CLIRequestTest.php b/tests/system/HTTP/CLIRequestTest.php
index 42679c2c48ae..6bd37e954520 100644
--- a/tests/system/HTTP/CLIRequestTest.php
+++ b/tests/system/HTTP/CLIRequestTest.php
@@ -162,6 +162,34 @@ public function testParsingNoOptions()
         $this->assertSame($expected, $this->request->getOptionString());
     }
 
+    public function testParsingArgs()
+    {
+        $_SERVER['argv'] = [
+            'spark',
+            'command',
+            'param1',
+            'param2',
+            '--opt1',
+            'opt1val',
+            '--opt-2',
+            'opt 2 val',
+            'param3',
+        ];
+
+        // reinstantiate it to force parsing
+        $this->request = new CLIRequest(new App());
+
+        $options = [
+            'command',
+            'param1',
+            'param2',
+            'opt1'  => 'opt1val',
+            'opt-2' => 'opt 2 val',
+            'param3',
+        ];
+        $this->assertSame($options, $this->request->getArgs());
+    }
+
     public function testParsingPath()
     {
         $_SERVER['argv'] = [

From 7d3cc1db1cd3b3bc0fe08795c2a7e866bb09c968 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 20 Feb 2022 16:27:05 +0900
Subject: [PATCH 1597/2325] fix: auto routes incorrectly display route filters
 with GET method

---
 system/Commands/Utilities/Routes.php  |  4 +-
 tests/system/Commands/CommandTest.php | 10 ----
 tests/system/Commands/RoutesTest.php  | 73 +++++++++++++++++++++++++++
 3 files changed, 76 insertions(+), 11 deletions(-)
 create mode 100644 tests/system/Commands/RoutesTest.php

diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
index e4bfec05b5a5..754c1b9b2380 100644
--- a/system/Commands/Utilities/Routes.php
+++ b/system/Commands/Utilities/Routes.php
@@ -120,7 +120,9 @@ public function run(array $params)
             $autoRoutes = $autoRouteCollector->get();
 
             foreach ($autoRoutes as &$routes) {
-                $filters  = $filterCollector->get('get', $uriGenerator->get($routes[1]));
+                // There is no `auto` method, but it is intentional not to get route filters.
+                $filters = $filterCollector->get('auto', $uriGenerator->get($routes[1]));
+
                 $routes[] = implode(' ', array_map('class_basename', $filters['before']));
                 $routes[] = implode(' ', array_map('class_basename', $filters['after']));
             }
diff --git a/tests/system/Commands/CommandTest.php b/tests/system/Commands/CommandTest.php
index 30cf3cce38b8..65f39dba3741 100644
--- a/tests/system/Commands/CommandTest.php
+++ b/tests/system/Commands/CommandTest.php
@@ -106,16 +106,6 @@ public function testNamespacesCommand()
         $this->assertStringContainsString('| Yes', $this->getBuffer());
     }
 
-    public function testRoutesCommand()
-    {
-        command('routes');
-
-        $this->assertStringContainsString('| (Closure)', $this->getBuffer());
-        $this->assertStringContainsString('| Route', $this->getBuffer());
-        $this->assertStringContainsString('| testing', $this->getBuffer());
-        $this->assertStringContainsString('\\TestController::index', $this->getBuffer());
-    }
-
     public function testInexistentCommandWithNoAlternatives()
     {
         command('app:oops');
diff --git a/tests/system/Commands/RoutesTest.php b/tests/system/Commands/RoutesTest.php
new file mode 100644
index 000000000000..0f569a2e42ad
--- /dev/null
+++ b/tests/system/Commands/RoutesTest.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\Filters\CITestStreamFilter;
+use Config\Services;
+
+/**
+ * @internal
+ */
+final class RoutesTest extends CIUnitTestCase
+{
+    private $streamFilter;
+    protected $logger;
+    protected $commands;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        CITestStreamFilter::$buffer = '';
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+
+        $this->logger   = Services::logger();
+        $this->commands = Services::commands();
+    }
+
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->streamFilter);
+    }
+
+    protected function getBuffer()
+    {
+        return CITestStreamFilter::$buffer;
+    }
+
+    public function testRoutesCommand()
+    {
+        command('routes');
+
+        $this->assertStringContainsString('| (Closure)', $this->getBuffer());
+        $this->assertStringContainsString('| Route', $this->getBuffer());
+        $this->assertStringContainsString('| testing', $this->getBuffer());
+        $this->assertStringContainsString('\\TestController::index', $this->getBuffer());
+    }
+
+    public function testRoutesCommandRouteFilterAndAutoRoute()
+    {
+        $routes = Services::routes();
+        $routes->resetRoutes();
+        $routes->get('/', 'Home::index', ['filter' => 'csrf']);
+
+        command('routes');
+
+        $this->assertStringContainsString(
+            '|auto|/|\App\Controllers\Home::index||toolbar|',
+            str_replace(' ', '', $this->getBuffer())
+        );
+    }
+}

From 5c2995c584f7e7caadc9ebdea3c4853681a66001 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 20 Feb 2022 17:42:33 +0900
Subject: [PATCH 1598/2325] test: fix failed test

---
 .../system/Commands/Utilities/Routes/FilterCollectorTest.php  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php
index c27157ca7856..6002323d3393 100644
--- a/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php
+++ b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Commands\Utilities\Routes;
 
 use CodeIgniter\Test\CIUnitTestCase;
+use Config\Services;
 
 /**
  * @internal
@@ -20,6 +21,9 @@ final class FilterCollectorTest extends CIUnitTestCase
 {
     public function testGet()
     {
+        $routes = Services::routes();
+        $routes->resetRoutes();
+
         $collector = new FilterCollector();
 
         $filters = $collector->get('get', '/');

From e6f878510cd71bb207ab11f8ece67caa57972dfb Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Tue, 8 Feb 2022 17:09:05 +0100
Subject: [PATCH 1599/2325] Extract php examples in docs to php files.

---
 .../source/changelogs/v4.0.0-alpha.2.rst      |   1 -
 .../source/changelogs/v4.0.0-alpha.3.rst      |   1 -
 .../source/changelogs/v4.0.0-beta.1.rst       |   4 +-
 .../source/changelogs/v4.0.0-beta.2.rst       |   3 +-
 .../source/changelogs/v4.0.0-beta.4.rst       |   2 -
 .../source/changelogs/v4.0.0-rc.2.rst         |   1 -
 .../source/changelogs/v4.0.0-rc.3.rst         |   2 -
 .../source/changelogs/v4.0.0-rc.4.rst         |   1 -
 user_guide_src/source/changelogs/v4.0.4.rst   |   2 -
 user_guide_src/source/changelogs/v4.2.0.rst   |   1 -
 user_guide_src/source/cli/cli.rst             |  21 +-
 user_guide_src/source/cli/cli/001.php         |  13 +
 user_guide_src/source/cli/cli/002.php         |   3 +
 user_guide_src/source/cli/cli_commands.rst    |  72 +-
 .../source/cli/cli_commands/001.php           |   3 +
 .../source/cli/cli_commands/002.php           |  18 +
 .../source/cli/cli_commands/003.php           |   3 +
 .../source/cli/cli_commands/004.php           |  11 +
 .../source/cli/cli_commands/005.php           |   4 +
 .../source/cli/cli_commands/006.php           |   7 +
 .../source/cli/cli_commands/007.php           |  11 +
 user_guide_src/source/cli/cli_library.rst     | 189 ++--
 user_guide_src/source/cli/cli_library/001.php |  10 +
 user_guide_src/source/cli/cli_library/002.php |   3 +
 user_guide_src/source/cli/cli_library/003.php |   3 +
 user_guide_src/source/cli/cli_library/004.php |   3 +
 user_guide_src/source/cli/cli_library/005.php |   3 +
 user_guide_src/source/cli/cli_library/006.php |   3 +
 user_guide_src/source/cli/cli_library/007.php |  10 +
 user_guide_src/source/cli/cli_library/008.php |  14 +
 user_guide_src/source/cli/cli_library/009.php |   3 +
 user_guide_src/source/cli/cli_library/010.php |   3 +
 user_guide_src/source/cli/cli_library/011.php |   3 +
 user_guide_src/source/cli/cli_library/012.php |   5 +
 user_guide_src/source/cli/cli_library/013.php |   3 +
 user_guide_src/source/cli/cli_library/014.php |   3 +
 user_guide_src/source/cli/cli_library/015.php |   4 +
 user_guide_src/source/cli/cli_library/016.php |   4 +
 user_guide_src/source/cli/cli_library/017.php |  29 +
 user_guide_src/source/cli/cli_library/018.php |   3 +
 user_guide_src/source/cli/cli_library/019.php |   3 +
 user_guide_src/source/cli/cli_library/020.php |  12 +
 user_guide_src/source/cli/cli_library/021.php |   9 +
 user_guide_src/source/cli/cli_library/022.php |  10 +
 user_guide_src/source/cli/cli_request.rst     |  38 +-
 user_guide_src/source/cli/cli_request/001.php |   4 +
 user_guide_src/source/cli/cli_request/002.php |   4 +
 user_guide_src/source/cli/cli_request/003.php |   4 +
 user_guide_src/source/cli/cli_request/004.php |   5 +
 user_guide_src/source/cli/cli_request/005.php |   4 +
 user_guide_src/source/cli/cli_request/006.php |   5 +
 user_guide_src/source/concepts/autoloader.rst |  20 +-
 .../source/concepts/autoloader/001.php        |   6 +
 .../source/concepts/autoloader/002.php        |   3 +
 .../source/concepts/autoloader/003.php        |   5 +
 user_guide_src/source/concepts/factories.rst  |  59 +-
 .../source/concepts/factories/001.php         |   5 +
 .../source/concepts/factories/002.php         |   3 +
 .../source/concepts/factories/003.php         |   7 +
 .../source/concepts/factories/004.php         |   4 +
 .../source/concepts/factories/005.php         |  13 +
 .../source/concepts/factories/006.php         |   6 +
 .../source/concepts/factories/007.php         |   4 +
 user_guide_src/source/concepts/http.rst       |  46 +-
 user_guide_src/source/concepts/http/001.php   |  28 +
 user_guide_src/source/concepts/http/002.php   |  14 +
 user_guide_src/source/concepts/services.rst   |  91 +-
 .../source/concepts/services/001.php          |   3 +
 .../source/concepts/services/002.php          |   3 +
 .../source/concepts/services/003.php          |   3 +
 .../source/concepts/services/004.php          |   3 +
 .../source/concepts/services/005.php          |   3 +
 .../source/concepts/services/006.php          |   6 +
 .../source/concepts/services/007.php          |   6 +
 .../source/concepts/services/008.php          |   6 +
 .../source/concepts/services/009.php          |   3 +
 .../source/concepts/services/010.php          |  13 +
 .../source/concepts/services/011.php          |  13 +
 .../source/concepts/services/012.php          |   3 +
 .../source/database/call_function.rst         |  22 +-
 .../source/database/call_function/001.php     |   3 +
 .../source/database/call_function/002.php     |   3 +
 .../source/database/call_function/003.php     |   3 +
 .../source/database/call_function/004.php     |   5 +
 .../source/database/configuration.rst         | 134 +--
 .../source/database/configuration/001.php     |  20 +
 .../source/database/configuration/002.php     |   7 +
 .../source/database/configuration/003.php     |   3 +
 .../source/database/configuration/004.php     |   6 +
 .../source/database/configuration/005.php     |  36 +
 .../source/database/configuration/006.php     |  20 +
 .../source/database/configuration/007.php     |   3 +
 .../source/database/configuration/008.php     |  13 +
 .../source/database/configuration/009.php     |   3 +
 user_guide_src/source/database/connecting.rst |  61 +-
 .../source/database/connecting/001.php        |   3 +
 .../source/database/connecting/002.php        |   3 +
 .../source/database/connecting/003.php        |   3 +
 .../source/database/connecting/004.php        |   3 +
 .../source/database/connecting/005.php        |   4 +
 .../source/database/connecting/006.php        |  22 +
 .../source/database/connecting/007.php        |   3 +
 .../source/database/connecting/008.php        |   3 +
 user_guide_src/source/database/events.rst     |  12 +-
 user_guide_src/source/database/events/001.php |  10 +
 user_guide_src/source/database/examples.rst   |  73 +-
 .../source/database/examples/001.php          |   3 +
 .../source/database/examples/002.php          |  12 +
 .../source/database/examples/003.php          |  10 +
 .../source/database/examples/004.php          |   5 +
 .../source/database/examples/005.php          |   5 +
 .../source/database/examples/006.php          |   5 +
 .../source/database/examples/007.php          |   7 +
 .../source/database/examples/008.php          |  10 +
 user_guide_src/source/database/helpers.rst    |  24 +-
 .../source/database/helpers/001.php           |   5 +
 .../source/database/helpers/002.php           |   5 +
 .../source/database/helpers/003.php           |   3 +
 .../source/database/helpers/004.php           |   3 +
 user_guide_src/source/database/metadata.rst   |  83 +-
 .../source/database/metadata/001.php          |   7 +
 .../source/database/metadata/002.php          |   5 +
 .../source/database/metadata/003.php          |   7 +
 .../source/database/metadata/004.php          |   7 +
 .../source/database/metadata/005.php          |   5 +
 .../source/database/metadata/006.php          |  10 +
 .../source/database/metadata/007.php          |   4 +
 .../source/database/metadata/008.php          |   9 +
 .../source/database/metadata/009.php          |  11 +
 user_guide_src/source/database/queries.rst    | 199 ++--
 .../source/database/queries/001.php           |   4 +
 .../source/database/queries/002.php           |   3 +
 .../source/database/queries/003.php           |   7 +
 .../source/database/queries/004.php           |   3 +
 .../source/database/queries/005.php           |   4 +
 .../source/database/queries/006.php           |   3 +
 .../source/database/queries/007.php           |   3 +
 .../source/database/queries/008.php           |   3 +
 .../source/database/queries/009.php           |   3 +
 .../source/database/queries/010.php           |   3 +
 .../source/database/queries/011.php           |   5 +
 .../source/database/queries/012.php           |   4 +
 .../source/database/queries/013.php           |   4 +
 .../source/database/queries/014.php           |   8 +
 .../source/database/queries/015.php           |   5 +
 .../source/database/queries/016.php           |   9 +
 .../source/database/queries/017.php           |   9 +
 .../source/database/queries/018.php           |   9 +
 .../source/database/queries/019.php           |  18 +
 .../source/database/queries/020.php           |   3 +
 .../source/database/queries/021.php           |   4 +
 .../source/database/queries/022.php           |   3 +
 .../source/database/queries/023.php           |   3 +
 .../source/database/queries/024.php           |   3 +
 .../source/database/queries/025.php           |   6 +
 .../source/database/queries/026.php           |   5 +
 .../source/database/queries/027.php           |   3 +
 .../source/database/queries/028.php           |   3 +
 .../source/database/queries/029.php           |   3 +
 .../source/database/query_builder.rst         | 883 ++++++------------
 .../source/database/query_builder/001.php     |   4 +
 .../source/database/query_builder/002.php     |   4 +
 .../source/database/query_builder/003.php     |   6 +
 .../source/database/query_builder/004.php     |   7 +
 .../source/database/query_builder/005.php     |   6 +
 .../source/database/query_builder/006.php     |  10 +
 .../source/database/query_builder/007.php     |   3 +
 .../source/database/query_builder/008.php     |   6 +
 .../source/database/query_builder/009.php     |   4 +
 .../source/database/query_builder/010.php     |   9 +
 .../source/database/query_builder/011.php     |   5 +
 .../source/database/query_builder/012.php     |   5 +
 .../source/database/query_builder/013.php     |   5 +
 .../source/database/query_builder/014.php     |   5 +
 .../source/database/query_builder/015.php     |   7 +
 .../source/database/query_builder/016.php     |   7 +
 .../source/database/query_builder/017.php     |   7 +
 .../source/database/query_builder/018.php     |   9 +
 .../source/database/query_builder/019.php     |   4 +
 .../source/database/query_builder/020.php     |   4 +
 .../source/database/query_builder/021.php     |   6 +
 .../source/database/query_builder/022.php     |   5 +
 .../source/database/query_builder/023.php     |   5 +
 .../source/database/query_builder/024.php     |   4 +
 .../source/database/query_builder/025.php     |   4 +
 .../source/database/query_builder/026.php     |   5 +
 .../source/database/query_builder/027.php     |  13 +
 .../source/database/query_builder/028.php     |   5 +
 .../source/database/query_builder/029.php     |   5 +
 .../source/database/query_builder/030.php     |  11 +
 .../source/database/query_builder/031.php     |   5 +
 .../source/database/query_builder/032.php     |  12 +
 .../source/database/query_builder/033.php     |   5 +
 .../source/database/query_builder/034.php     |  12 +
 .../source/database/query_builder/035.php     |   5 +
 .../source/database/query_builder/036.php     |  12 +
 .../source/database/query_builder/037.php     |   4 +
 .../source/database/query_builder/038.php     |   5 +
 .../source/database/query_builder/039.php     |   5 +
 .../source/database/query_builder/040.php     |   5 +
 .../source/database/query_builder/041.php     |   4 +
 .../source/database/query_builder/042.php     |   3 +
 .../source/database/query_builder/043.php     |   5 +
 .../source/database/query_builder/044.php     |   4 +
 .../source/database/query_builder/045.php     |   4 +
 .../source/database/query_builder/046.php     |   5 +
 .../source/database/query_builder/047.php     |   4 +
 .../source/database/query_builder/048.php     |   4 +
 .../source/database/query_builder/049.php     |   4 +
 .../source/database/query_builder/050.php     |   5 +
 .../source/database/query_builder/051.php     |  11 +
 .../source/database/query_builder/052.php     |   5 +
 .../source/database/query_builder/053.php     |  12 +
 .../source/database/query_builder/054.php     |   5 +
 .../source/database/query_builder/055.php     |  12 +
 .../source/database/query_builder/056.php     |   5 +
 .../source/database/query_builder/057.php     |  12 +
 .../source/database/query_builder/058.php     |   4 +
 .../source/database/query_builder/059.php     |   5 +
 .../source/database/query_builder/060.php     |   5 +
 .../source/database/query_builder/061.php     |   5 +
 .../source/database/query_builder/062.php     |   4 +
 .../source/database/query_builder/063.php     |   4 +
 .../source/database/query_builder/064.php     |   5 +
 .../source/database/query_builder/065.php     |   4 +
 .../source/database/query_builder/066.php     |   4 +
 .../source/database/query_builder/067.php     |   5 +
 .../source/database/query_builder/068.php     |   7 +
 .../source/database/query_builder/069.php     |   4 +
 .../source/database/query_builder/070.php     |   4 +
 .../source/database/query_builder/071.php     |   6 +
 .../source/database/query_builder/072.php     |   3 +
 .../source/database/query_builder/073.php     |   3 +
 .../source/database/query_builder/074.php     |  15 +
 .../source/database/query_builder/075.php     |  10 +
 .../source/database/query_builder/076.php     |  12 +
 .../source/database/query_builder/077.php     |  10 +
 .../source/database/query_builder/078.php     |  12 +
 .../source/database/query_builder/079.php     |   9 +
 .../source/database/query_builder/080.php     |  17 +
 .../source/database/query_builder/081.php     |  11 +
 .../source/database/query_builder/082.php     |   5 +
 .../source/database/query_builder/083.php     |   6 +
 .../source/database/query_builder/084.php     |  11 +
 .../source/database/query_builder/085.php     |  10 +
 .../source/database/query_builder/086.php     |  12 +
 .../source/database/query_builder/087.php     |  15 +
 .../source/database/query_builder/088.php     |  17 +
 .../source/database/query_builder/089.php     |   3 +
 .../source/database/query_builder/090.php     |   3 +
 .../source/database/query_builder/091.php     |  27 +
 .../source/database/query_builder/092.php     |   4 +
 .../source/database/query_builder/093.php     |   8 +
 .../source/database/query_builder/094.php     |   4 +
 .../source/database/query_builder/095.php     |   6 +
 .../source/database/query_builder/096.php     |   6 +
 .../source/database/query_builder/097.php     |  16 +
 user_guide_src/source/database/results.rst    | 248 ++---
 .../source/database/results/001.php           |   9 +
 .../source/database/results/002.php           |   9 +
 .../source/database/results/003.php           |   8 +
 .../source/database/results/004.php           |   9 +
 .../source/database/results/005.php           |  11 +
 .../source/database/results/006.php           |   3 +
 .../source/database/results/007.php           |   7 +
 .../source/database/results/008.php           |  11 +
 .../source/database/results/009.php           |   3 +
 .../source/database/results/010.php           |   9 +
 .../source/database/results/011.php           |  16 +
 .../source/database/results/012.php           |   5 +
 .../source/database/results/013.php           |  29 +
 .../source/database/results/014.php           |  11 +
 .../source/database/results/015.php           |  10 +
 .../source/database/results/016.php           |   3 +
 .../source/database/results/017.php           |   5 +
 .../source/database/results/018.php           |   5 +
 .../source/database/results/019.php           |   5 +
 .../source/database/results/020.php           |  15 +
 .../source/database/results/021.php           |   5 +
 .../source/database/transactions.rst          |  56 +-
 .../source/database/transactions/001.php      |   7 +
 .../source/database/transactions/002.php      |   3 +
 .../source/database/transactions/003.php      |  10 +
 .../source/database/transactions/004.php      |   6 +
 .../source/database/transactions/005.php      |   5 +
 .../source/database/transactions/006.php      |  13 +
 user_guide_src/source/database/utilities.rst  |  16 +-
 .../source/database/utilities/001.php         |  12 +
 user_guide_src/source/dbmgmt/forge.rst        | 228 ++---
 user_guide_src/source/dbmgmt/forge/001.php    |   3 +
 user_guide_src/source/dbmgmt/forge/002.php    |   3 +
 user_guide_src/source/dbmgmt/forge/003.php    |   5 +
 user_guide_src/source/dbmgmt/forge/004.php    |   5 +
 user_guide_src/source/dbmgmt/forge/005.php    |   5 +
 user_guide_src/source/dbmgmt/forge/006.php    |   9 +
 user_guide_src/source/dbmgmt/forge/007.php    |  29 +
 user_guide_src/source/dbmgmt/forge/008.php    |   3 +
 user_guide_src/source/dbmgmt/forge/009.php    |   4 +
 user_guide_src/source/dbmgmt/forge/010.php    |  17 +
 user_guide_src/source/dbmgmt/forge/011.php    |   7 +
 user_guide_src/source/dbmgmt/forge/012.php    |   7 +
 user_guide_src/source/dbmgmt/forge/013.php    |   7 +
 user_guide_src/source/dbmgmt/forge/014.php    |   4 +
 user_guide_src/source/dbmgmt/forge/015.php    |   4 +
 user_guide_src/source/dbmgmt/forge/016.php    |   5 +
 user_guide_src/source/dbmgmt/forge/017.php    |   7 +
 user_guide_src/source/dbmgmt/forge/018.php    |   4 +
 user_guide_src/source/dbmgmt/forge/019.php    |   4 +
 user_guide_src/source/dbmgmt/forge/020.php    |   4 +
 user_guide_src/source/dbmgmt/forge/021.php    |   4 +
 user_guide_src/source/dbmgmt/forge/022.php    |   7 +
 user_guide_src/source/dbmgmt/forge/023.php    |  11 +
 user_guide_src/source/dbmgmt/forge/024.php    |   3 +
 user_guide_src/source/dbmgmt/forge/025.php    |   4 +
 user_guide_src/source/dbmgmt/forge/026.php    |  10 +
 user_guide_src/source/dbmgmt/migration.rst    | 115 +--
 .../source/dbmgmt/migration/001.php           |  35 +
 .../source/dbmgmt/migration/002.php           |  10 +
 .../source/dbmgmt/migration/003.php           |  20 +
 .../source/dbmgmt/migration/004.php           |   6 +
 .../source/dbmgmt/migration/005.php           |  17 +
 .../source/dbmgmt/migration/006.php           |   4 +
 .../source/dbmgmt/migration/007.php           |   3 +
 .../source/dbmgmt/migration/008.php           |   3 +
 user_guide_src/source/dbmgmt/seeds.rst        |  57 +-
 user_guide_src/source/dbmgmt/seeds/001.php    |  22 +
 user_guide_src/source/dbmgmt/seeds/002.php    |  15 +
 user_guide_src/source/dbmgmt/seeds/003.php    |   7 +
 user_guide_src/source/dbmgmt/seeds/004.php    |   4 +
 .../source/extending/basecontroller.rst       |  37 +-
 .../source/extending/basecontroller/001.php   |  10 +
 .../source/extending/basecontroller/002.php   |   3 +
 .../source/extending/basecontroller/003.php   |   9 +
 .../source/extending/basecontroller/004.php   |   6 +
 .../source/extending/core_classes.rst         |  56 +-
 .../source/extending/core_classes/001.php     |  10 +
 .../source/extending/core_classes/002.php     |  10 +
 .../source/extending/core_classes/003.php     |  10 +
 .../source/extending/core_classes/004.php     |  15 +
 user_guide_src/source/extending/events.rst    |  62 +-
 .../source/extending/events/001.php           |   5 +
 .../source/extending/events/002.php           |  17 +
 .../source/extending/events/003.php           |   3 +
 .../source/extending/events/004.php           |   5 +
 .../source/extending/events/005.php           |   3 +
 .../source/extending/events/006.php           |   7 +
 .../source/extending/events/007.php           |   3 +
 .../source/extending/events/008.php           |   3 +
 user_guide_src/source/general/ajax.rst        |   3 -
 user_guide_src/source/general/caching.rst     |   5 +-
 user_guide_src/source/general/caching/001.php |   3 +
 .../source/general/common_functions.rst       |  82 +-
 .../source/general/common_functions/001.php   |   4 +
 .../source/general/common_functions/002.php   |  13 +
 .../source/general/common_functions/003.php   |   9 +
 .../source/general/common_functions/004.php   |   5 +
 .../source/general/common_functions/005.php   |  22 +
 .../source/general/common_functions/006.php   |   4 +
 .../source/general/common_functions/007.php   |   4 +
 .../source/general/common_functions/008.php   |   4 +
 .../source/general/configuration.rst          | 129 +--
 .../source/general/configuration/001.php      |   4 +
 .../source/general/configuration/002.php      |  11 +
 .../source/general/configuration/003.php      |   5 +
 .../source/general/configuration/004.php      |  12 +
 .../source/general/configuration/005.php      |   5 +
 .../source/general/configuration/006.php      |   4 +
 .../source/general/configuration/007.php      |  13 +
 .../source/general/configuration/008.php      |   5 +
 .../source/general/configuration/009.php      |  14 +
 .../source/general/configuration/010.php      |  14 +
 .../source/general/configuration/011.php      |   4 +
 .../source/general/environments.rst           |   1 -
 user_guide_src/source/general/errors.rst      |  73 +-
 user_guide_src/source/general/errors/001.php  |   3 +
 user_guide_src/source/general/errors/002.php  |   7 +
 user_guide_src/source/general/errors/003.php  |   5 +
 user_guide_src/source/general/errors/004.php  |   7 +
 user_guide_src/source/general/errors/005.php  |   6 +
 user_guide_src/source/general/errors/006.php  |   6 +
 user_guide_src/source/general/errors/007.php  |   5 +
 user_guide_src/source/general/errors/008.php  |   3 +
 user_guide_src/source/general/errors/009.php  |   3 +
 user_guide_src/source/general/errors/010.php  |   3 +
 user_guide_src/source/general/errors/011.php  |   3 +
 user_guide_src/source/general/helpers.rst     |  49 +-
 user_guide_src/source/general/helpers/001.php |   3 +
 user_guide_src/source/general/helpers/002.php |   3 +
 user_guide_src/source/general/helpers/003.php |   3 +
 user_guide_src/source/general/helpers/004.php |   3 +
 user_guide_src/source/general/helpers/005.php |   1 +
 user_guide_src/source/general/helpers/006.php |  23 +
 user_guide_src/source/general/logging.rst     |  47 +-
 user_guide_src/source/general/logging/001.php |   5 +
 user_guide_src/source/general/logging/002.php |   3 +
 user_guide_src/source/general/logging/003.php |   4 +
 user_guide_src/source/general/logging/004.php |   8 +
 user_guide_src/source/general/logging/005.php |   9 +
 user_guide_src/source/general/logging/006.php |   7 +
 .../source/general/managing_apps.rst          |  24 +-
 .../source/general/managing_apps/001.php      |   3 +
 .../source/general/managing_apps/002.php      |   4 +
 .../source/general/managing_apps/003.php      |   4 +
 .../source/general/managing_apps/004.php      |   3 +
 user_guide_src/source/general/modules.rst     |  75 +-
 user_guide_src/source/general/modules/001.php |   7 +
 user_guide_src/source/general/modules/002.php |   7 +
 user_guide_src/source/general/modules/003.php |   7 +
 user_guide_src/source/general/modules/004.php |   3 +
 user_guide_src/source/general/modules/005.php |   3 +
 user_guide_src/source/general/modules/006.php |   4 +
 user_guide_src/source/general/modules/007.php |   5 +
 user_guide_src/source/general/modules/008.php |   3 +
 user_guide_src/source/general/modules/009.php |   3 +
 user_guide_src/source/general/modules/010.php |   3 +
 user_guide_src/source/general/modules/011.php |   3 +
 user_guide_src/source/general/modules/012.php |   3 +
 .../source/helpers/array_helper.rst           | 173 +---
 .../source/helpers/array_helper/001.php       |   3 +
 .../source/helpers/array_helper/002.php       |  12 +
 .../source/helpers/array_helper/003.php       |   7 +
 .../source/helpers/array_helper/004.php       |   4 +
 .../source/helpers/array_helper/005.php       |  15 +
 .../source/helpers/array_helper/006.php       |  31 +
 .../source/helpers/array_helper/007.php       |   6 +
 .../source/helpers/array_helper/008.php       |  31 +
 .../source/helpers/array_helper/009.php       |  13 +
 .../source/helpers/array_helper/010.php       |   9 +
 .../source/helpers/array_helper/011.php       |  13 +
 .../source/helpers/cookie_helper.rst          |  13 +-
 .../source/helpers/cookie_helper/001.php      |   3 +
 .../source/helpers/cookie_helper/002.php      |   3 +
 .../source/helpers/cookie_helper/003.php      |   3 +
 user_guide_src/source/helpers/date_helper.rst |  13 +-
 .../source/helpers/date_helper/001.php        |   3 +
 .../source/helpers/date_helper/002.php        |   3 +
 .../source/helpers/date_helper/003.php        |   3 +
 .../source/helpers/filesystem_helper.rst      |  97 +-
 .../source/helpers/filesystem_helper/001.php  |   3 +
 .../source/helpers/filesystem_helper/002.php  |   3 +
 .../source/helpers/filesystem_helper/003.php  |   3 +
 .../source/helpers/filesystem_helper/004.php  |   3 +
 .../source/helpers/filesystem_helper/005.php  |   7 +
 .../source/helpers/filesystem_helper/006.php  |   9 +
 .../source/helpers/filesystem_helper/007.php  |   3 +
 .../source/helpers/filesystem_helper/008.php  |   3 +
 .../source/helpers/filesystem_helper/009.php  |   3 +
 .../source/helpers/filesystem_helper/010.php  |   3 +
 .../source/helpers/filesystem_helper/011.php  |   3 +
 .../source/helpers/filesystem_helper/012.php  |   3 +
 .../source/helpers/filesystem_helper/013.php  |   3 +
 .../source/helpers/filesystem_helper/014.php  |   3 +
 .../source/helpers/filesystem_helper/015.php  |  15 +
 user_guide_src/source/helpers/form_helper.rst | 339 ++-----
 .../source/helpers/form_helper/001.php        |   3 +
 .../source/helpers/form_helper/002.php        |   5 +
 .../source/helpers/form_helper/003.php        |   3 +
 .../source/helpers/form_helper/004.php        |   3 +
 .../source/helpers/form_helper/005.php        |   4 +
 .../source/helpers/form_helper/006.php        |   3 +
 .../source/helpers/form_helper/007.php        |   3 +
 .../source/helpers/form_helper/008.php        |   4 +
 .../source/helpers/form_helper/009.php        |   4 +
 .../source/helpers/form_helper/010.php        |  17 +
 .../source/helpers/form_helper/011.php        |  17 +
 .../source/helpers/form_helper/012.php        |  17 +
 .../source/helpers/form_helper/013.php        |   3 +
 .../source/helpers/form_helper/014.php        |  18 +
 .../source/helpers/form_helper/015.php        |   4 +
 .../source/helpers/form_helper/016.php        |   4 +
 .../source/helpers/form_helper/017.php        |   9 +
 .../source/helpers/form_helper/018.php        |  35 +
 .../source/helpers/form_helper/019.php        |   4 +
 .../source/helpers/form_helper/020.php        |   7 +
 .../source/helpers/form_helper/021.php        |  14 +
 .../source/helpers/form_helper/022.php        |  19 +
 .../source/helpers/form_helper/023.php        |   5 +
 .../source/helpers/form_helper/024.php        |   4 +
 .../source/helpers/form_helper/025.php        |  12 +
 .../source/helpers/form_helper/026.php        |   4 +
 .../source/helpers/form_helper/027.php        |   4 +
 .../source/helpers/form_helper/028.php        |   4 +
 .../source/helpers/form_helper/029.php        |   9 +
 .../source/helpers/form_helper/030.php        |   4 +
 .../source/helpers/form_helper/031.php        |   4 +
 .../source/helpers/form_helper/032.php        |  12 +
 .../source/helpers/form_helper/033.php        |   4 +
 .../source/helpers/form_helper/034.php        |   5 +
 user_guide_src/source/helpers/html_helper.rst | 223 ++---
 .../source/helpers/html_helper/001.php        |   3 +
 .../source/helpers/html_helper/002.php        |   4 +
 .../source/helpers/html_helper/003.php        |   4 +
 .../source/helpers/html_helper/004.php        |  14 +
 .../source/helpers/html_helper/005.php        |   4 +
 .../source/helpers/html_helper/006.php        |   3 +
 .../source/helpers/html_helper/007.php        |   4 +
 .../source/helpers/html_helper/008.php        |   7 +
 .../source/helpers/html_helper/009.php        |  11 +
 .../source/helpers/html_helper/010.php        |   4 +
 .../source/helpers/html_helper/011.php        |   6 +
 .../source/helpers/html_helper/012.php        |  15 +
 .../source/helpers/html_helper/013.php        |  38 +
 .../source/helpers/html_helper/014.php        |  26 +
 .../source/helpers/html_helper/015.php        |   4 +
 .../source/helpers/html_helper/016.php        |   4 +
 .../source/helpers/html_helper/017.php        |  13 +
 .../source/helpers/html_helper/018.php        |   4 +
 .../source/helpers/html_helper/019.php        |   4 +
 .../source/helpers/html_helper/020.php        |   7 +
 .../source/helpers/inflector_helper.rst       |  65 +-
 .../source/helpers/inflector_helper/001.php   |   3 +
 .../source/helpers/inflector_helper/002.php   |   3 +
 .../source/helpers/inflector_helper/003.php   |   3 +
 .../source/helpers/inflector_helper/004.php   |   3 +
 .../source/helpers/inflector_helper/005.php   |   3 +
 .../source/helpers/inflector_helper/006.php   |   3 +
 .../source/helpers/inflector_helper/007.php   |   3 +
 .../source/helpers/inflector_helper/008.php   |   3 +
 .../source/helpers/inflector_helper/009.php   |   3 +
 .../source/helpers/inflector_helper/010.php   |   3 +
 .../source/helpers/inflector_helper/011.php   |   3 +
 .../source/helpers/inflector_helper/012.php   |   3 +
 .../source/helpers/inflector_helper/013.php   |   3 +
 .../source/helpers/number_helper.rst          |  62 +-
 .../source/helpers/number_helper/001.php      |   3 +
 .../source/helpers/number_helper/002.php      |   9 +
 .../source/helpers/number_helper/003.php      |   3 +
 .../source/helpers/number_helper/004.php      |   6 +
 .../source/helpers/number_helper/005.php      |   6 +
 .../source/helpers/number_helper/006.php      |   3 +
 .../source/helpers/number_helper/007.php      |   3 +
 .../source/helpers/number_helper/008.php      |   6 +
 .../source/helpers/number_helper/009.php      |   5 +
 .../source/helpers/security_helper.rst        |  15 +-
 .../source/helpers/security_helper/001.php    |   3 +
 .../source/helpers/security_helper/002.php    |   3 +
 .../source/helpers/security_helper/003.php    |   3 +
 user_guide_src/source/helpers/test_helper.rst |  15 +-
 .../source/helpers/test_helper/001.php        |   3 +
 .../source/helpers/test_helper/002.php        |   8 +
 user_guide_src/source/helpers/text_helper.rst | 154 ++-
 .../source/helpers/text_helper/001.php        |   3 +
 .../source/helpers/text_helper/002.php        |   3 +
 .../source/helpers/text_helper/003.php        |   5 +
 .../source/helpers/text_helper/004.php        |   5 +
 .../source/helpers/text_helper/005.php        |   5 +
 .../source/helpers/text_helper/006.php        |   4 +
 .../source/helpers/text_helper/007.php        |   8 +
 .../source/helpers/text_helper/008.php        |   6 +
 .../source/helpers/text_helper/009.php        |   4 +
 .../source/helpers/text_helper/010.php        |   4 +
 .../source/helpers/text_helper/011.php        |   4 +
 .../source/helpers/text_helper/012.php        |   4 +
 .../source/helpers/text_helper/013.php        |   5 +
 .../source/helpers/text_helper/014.php        |   5 +
 .../source/helpers/text_helper/015.php        |   3 +
 .../source/helpers/text_helper/016.php        |   3 +
 .../source/helpers/text_helper/017.php        |   4 +
 .../source/helpers/text_helper/018.php        |   3 +
 .../source/helpers/text_helper/019.php        |   4 +
 .../source/helpers/text_helper/020.php        |  12 +
 .../source/helpers/text_helper/021.php        |   4 +
 .../source/helpers/text_helper/022.php        |  12 +
 user_guide_src/source/helpers/url_helper.rst  | 145 ++-
 .../source/helpers/url_helper/001.php         |   3 +
 .../source/helpers/url_helper/002-2.php       |   3 +
 .../source/helpers/url_helper/002-3.php       |   3 +
 .../source/helpers/url_helper/002-4.php       |   3 +
 .../source/helpers/url_helper/002.php         |   4 +
 .../source/helpers/url_helper/003.php         |   3 +
 .../source/helpers/url_helper/004.php         |   3 +
 .../source/helpers/url_helper/005.php         |  10 +
 .../source/helpers/url_helper/006.php         |  14 +
 .../source/helpers/url_helper/007.php         |   3 +
 .../source/helpers/url_helper/008.php         |   3 +
 .../source/helpers/url_helper/009.php         |   4 +
 .../source/helpers/url_helper/010.php         |   3 +
 .../source/helpers/url_helper/011.php         |   3 +
 .../source/helpers/url_helper/012.php         |   3 +
 .../source/helpers/url_helper/013.php         |   3 +
 .../source/helpers/url_helper/014.php         |   5 +
 .../source/helpers/url_helper/015.php         |   5 +
 .../source/helpers/url_helper/016.php         |   5 +
 .../source/helpers/url_helper/017.php         |   3 +
 .../source/helpers/url_helper/018.php         |   3 +
 .../source/helpers/url_helper/019.php         |   3 +
 .../source/helpers/url_helper/020.php         |   3 +
 .../source/helpers/url_helper/021.php         |   3 +
 user_guide_src/source/helpers/xml_helper.rst  |  12 +-
 .../source/helpers/xml_helper/001.php         |   3 +
 .../source/helpers/xml_helper/002.php         |   5 +
 .../source/incoming/content_negotiation.rst   |  56 +-
 .../incoming/content_negotiation/001.php      |   3 +
 .../incoming/content_negotiation/002.php      |   3 +
 .../incoming/content_negotiation/003.php      |  11 +
 .../incoming/content_negotiation/004.php      |   5 +
 .../incoming/content_negotiation/005.php      |  10 +
 .../incoming/content_negotiation/006.php      |   5 +
 .../incoming/content_negotiation/007.php      |   5 +
 .../source/incoming/controllers.rst           | 222 ++---
 .../source/incoming/controllers/001.php       |  11 +
 .../source/incoming/controllers/002.php       |   8 +
 .../source/incoming/controllers/003.php       |   8 +
 .../source/incoming/controllers/004.php       |   8 +
 .../source/incoming/controllers/005.php       |   5 +
 .../source/incoming/controllers/006.php       |  16 +
 .../source/incoming/controllers/007.php       |  12 +
 .../source/incoming/controllers/008.php       |   3 +
 .../source/incoming/controllers/009.php       |   3 +
 .../source/incoming/controllers/010.php       |   6 +
 .../source/incoming/controllers/011.php       |  10 +
 .../source/incoming/controllers/012.php       |  12 +
 .../source/incoming/controllers/013.php       |   6 +
 .../source/incoming/controllers/014.php       |   5 +
 .../source/incoming/controllers/015.php       |   5 +
 .../source/incoming/controllers/016.php       |   8 +
 .../source/incoming/controllers/017.php       |  15 +
 .../source/incoming/controllers/018.php       |  12 +
 .../source/incoming/controllers/019.php       |  19 +
 user_guide_src/source/incoming/filters.rst    | 111 +--
 .../source/incoming/filters/001.php           |  20 +
 .../source/incoming/filters/002.php           |  10 +
 .../source/incoming/filters/003.php           |   5 +
 .../source/incoming/filters/004.php           |   8 +
 .../source/incoming/filters/005.php           |   8 +
 .../source/incoming/filters/006.php           |   8 +
 .../source/incoming/filters/007.php           |   8 +
 .../source/incoming/filters/008.php           |   6 +
 .../source/incoming/filters/009.php           |   6 +
 .../source/incoming/filters/010.php           |   3 +
 .../source/incoming/filters/011.php           |   6 +
 .../source/incoming/incomingrequest/001.php   |  15 +
 .../source/incoming/incomingrequest/002.php   |   3 +
 .../source/incoming/incomingrequest/003.php   |  15 +
 .../source/incoming/incomingrequest/004.php   |  11 +
 .../source/incoming/incomingrequest/005.php   |   4 +
 .../source/incoming/incomingrequest/006.php   |   4 +
 .../source/incoming/incomingrequest/007.php   |   5 +
 .../source/incoming/incomingrequest/008.php   |   3 +
 .../source/incoming/incomingrequest/009.php   |   3 +
 .../source/incoming/incomingrequest/010.php   |   3 +
 .../source/incoming/incomingrequest/011.php   |  14 +
 .../source/incoming/incomingrequest/012.php   |   8 +
 .../source/incoming/incomingrequest/013.php   |   3 +
 .../source/incoming/incomingrequest/014.php   |   8 +
 .../source/incoming/incomingrequest/015.php   |   3 +
 .../source/incoming/incomingrequest/016.php   |   9 +
 .../source/incoming/incomingrequest/017.php   |   6 +
 .../source/incoming/incomingrequest/018.php   |   5 +
 .../source/incoming/incomingrequest/019.php   |   4 +
 .../source/incoming/incomingrequest/020.php   |   3 +
 .../source/incoming/incomingrequest/021.php   |   3 +
 .../source/incoming/incomingrequest/022.php   |  14 +
 .../source/incoming/incomingrequest/023.php   |  11 +
 .../source/incoming/incomingrequest/024.php   |  18 +
 .../source/incoming/incomingrequest/025.php   |   3 +
 .../source/incoming/incomingrequest/026.php   |   3 +
 .../source/incoming/incomingrequest/027.php   |   7 +
 .../source/incoming/incomingrequest/028.php   |   3 +
 .../source/incoming/incomingrequest/029.php   |   3 +
 .../source/incoming/incomingrequest/030.php   |   4 +
 .../source/incoming/incomingrequest/031.php   |   3 +
 .../source/incoming/incomingrequest/032.php   |   3 +
 .../source/incoming/incomingrequest/033.php   |   3 +
 .../source/incoming/incomingrequest/034.php   |   3 +
 .../source/incoming/incomingrequest/035.php   |   4 +
 .../source/incoming/incomingrequest/036.php   |   3 +
 .../source/incoming/incomingrequest/037.php   |   3 +
 .../source/incoming/incomingrequest/038.php   |   3 +
 .../source/incoming/incomingrequest/039.php   |   3 +
 user_guide_src/source/incoming/message.rst    |  70 +-
 .../source/incoming/message/001.php           |   3 +
 .../source/incoming/message/002.php           |   6 +
 .../source/incoming/message/003.php           |  19 +
 .../source/incoming/message/004.php           |   3 +
 .../source/incoming/message/005.php           |   6 +
 .../source/incoming/message/006.php           |   3 +
 .../source/incoming/message/007.php           |   3 +
 .../source/incoming/message/008.php           |   3 +
 .../source/incoming/message/009.php           |   3 +
 .../source/incoming/message/010.php           |   3 +
 user_guide_src/source/incoming/request.rst    |  38 +-
 .../source/incoming/request/001.php           |   3 +
 .../source/incoming/request/002.php           |   7 +
 .../source/incoming/request/003.php           |   5 +
 .../source/incoming/request/004.php           |   3 +
 .../source/incoming/request/005.php           |   3 +
 .../source/incoming/request/006.php           |   3 +
 .../source/incoming/request/007.php           |   3 +
 user_guide_src/source/incoming/restful.rst    | 154 +--
 .../source/incoming/restful/001.php           |  13 +
 .../source/incoming/restful/002.php           |   7 +
 .../source/incoming/restful/003.php           |   6 +
 .../source/incoming/restful/004.php           |   6 +
 .../source/incoming/restful/005.php           |   3 +
 .../source/incoming/restful/006.php           |   3 +
 .../source/incoming/restful/007.php           |  18 +
 .../source/incoming/restful/008.php           |   3 +
 .../source/incoming/restful/009.php           |  15 +
 .../source/incoming/restful/010.php           |   4 +
 .../source/incoming/restful/011.php           |   6 +
 .../source/incoming/restful/012.php           |   6 +
 .../source/incoming/restful/013.php           |   3 +
 .../source/incoming/restful/014.php           |   3 +
 .../source/incoming/restful/015.php           |  18 +
 .../source/incoming/restful/016.php           |   3 +
 user_guide_src/source/incoming/routing.rst    | 348 +++----
 .../source/incoming/routing/000.php           |   3 +
 .../source/incoming/routing/001.php           |   7 +
 .../source/incoming/routing/002.php           |   3 +
 .../source/incoming/routing/003.php           |   3 +
 .../source/incoming/routing/004.php           |   3 +
 .../source/incoming/routing/005.php           |   3 +
 .../source/incoming/routing/006.php           |   3 +
 .../source/incoming/routing/007.php           |   3 +
 .../source/incoming/routing/008.php           |   7 +
 .../source/incoming/routing/009.php           |   3 +
 .../source/incoming/routing/010.php           |   4 +
 .../source/incoming/routing/011.php           |   3 +
 .../source/incoming/routing/012.php           |   3 +
 .../source/incoming/routing/013.php           |   7 +
 .../source/incoming/routing/014.php           |   8 +
 .../source/incoming/routing/015.php           |   8 +
 .../source/incoming/routing/016.php           |   6 +
 .../source/incoming/routing/017.php           |   5 +
 .../source/incoming/routing/018.php           |   5 +
 .../source/incoming/routing/019.php           |   7 +
 .../source/incoming/routing/020.php           |   7 +
 .../source/incoming/routing/021.php           |   5 +
 .../source/incoming/routing/022.php           |   8 +
 .../source/incoming/routing/023-2.php         |   3 +
 .../source/incoming/routing/023.php           |   8 +
 .../source/incoming/routing/024.php           |   5 +
 .../source/incoming/routing/025.php           |   3 +
 .../source/incoming/routing/026.php           |   3 +
 .../source/incoming/routing/027.php           |  14 +
 .../source/incoming/routing/028.php           |   3 +
 .../source/incoming/routing/029.php           |   3 +
 .../source/incoming/routing/030.php           |   3 +
 .../source/incoming/routing/031.php           |   3 +
 .../source/incoming/routing/032.php           |   4 +
 .../source/incoming/routing/033.php           |   3 +
 .../source/incoming/routing/034.php           |   4 +
 .../source/incoming/routing/035.php           |   4 +
 .../source/incoming/routing/036.php           |   6 +
 .../source/incoming/routing/037.php           |  12 +
 .../source/incoming/routing/038.php           |   3 +
 .../source/incoming/routing/039.php           |   9 +
 .../source/incoming/routing/040.php           |   9 +
 .../source/incoming/routing/041.php           |   4 +
 .../source/incoming/routing/042.php           |   3 +
 .../source/incoming/routing/043.php           |   3 +
 .../source/incoming/routing/044.php           |   3 +
 .../source/incoming/routing/045.php           |  10 +
 .../source/incoming/routing/046.php           |   7 +
 user_guide_src/source/index.rst               |   1 -
 .../installation/installing_composer.rst      |   1 -
 .../source/installation/installing_manual.rst |   1 -
 .../source/installation/troubleshooting.rst   |  10 +-
 .../installation/troubleshooting/001.php      |   3 +
 .../installation/troubleshooting/002.php      |   3 +
 .../source/installation/upgrade_404.rst       |  13 +-
 .../source/installation/upgrade_404/001.php   |   4 +
 .../source/installation/upgrade_404/002.php   |   4 +
 .../source/installation/upgrade_412.rst       |  23 +-
 .../source/installation/upgrade_412/001.php   |   8 +
 .../source/installation/upgrade_412/002.php   |  11 +
 .../source/installation/upgrade_414.rst       |   1 -
 .../source/installation/upgrade_415.rst       |   8 +-
 .../source/installation/upgrade_415/001.php   |   6 +
 .../installation/upgrade_configuration.rst    |  24 +-
 .../upgrade_configuration/001.php             |   6 +
 .../upgrade_configuration/002.php             |  11 +
 .../installation/upgrade_controllers.rst      |  30 +-
 .../installation/upgrade_controllers/001.php  |   9 +
 .../installation/upgrade_controllers/002.php  |  11 +
 .../source/installation/upgrade_database.rst  |  19 +-
 .../installation/upgrade_database/001.php     |   6 +
 .../installation/upgrade_database/002.php     |   8 +
 .../source/installation/upgrade_emails.rst    |  30 +-
 .../installation/upgrade_emails/001.php       |  13 +
 .../installation/upgrade_emails/002.php       |  13 +
 .../installation/upgrade_encryption.rst       |  23 +-
 .../installation/upgrade_encryption/001.php   |   9 +
 .../installation/upgrade_encryption/002.php   |   9 +
 .../installation/upgrade_file_upload.rst      |  71 +-
 .../installation/upgrade_file_upload/001.php  |  36 +
 .../installation/upgrade_file_upload/002.php  |  30 +
 .../installation/upgrade_html_tables.rst      |  26 +-
 .../installation/upgrade_html_tables/001.php  |  11 +
 .../installation/upgrade_html_tables/002.php  |  11 +
 .../installation/upgrade_localization.rst     |  37 +-
 .../installation/upgrade_localization/001.php |   3 +
 .../installation/upgrade_localization/002.php |  11 +
 .../installation/upgrade_localization/003.php |  17 +
 .../installation/upgrade_migrations.rst       |  78 +-
 .../installation/upgrade_migrations/001.php   |  33 +
 .../installation/upgrade_migrations/002.php   |  35 +
 .../source/installation/upgrade_models.rst    |  30 +-
 .../installation/upgrade_models/001.php       |  13 +
 .../installation/upgrade_models/002.php       |  10 +
 .../installation/upgrade_pagination.rst       |  28 +-
 .../installation/upgrade_pagination/001.php   |  13 +
 .../installation/upgrade_pagination/002.php   |  10 +
 .../source/installation/upgrade_responses.rst |  19 +-
 .../installation/upgrade_responses/001.php    |   9 +
 .../installation/upgrade_responses/002.php    |   7 +
 .../source/installation/upgrade_routing.rst   |  44 +-
 .../installation/upgrade_routing/001.php      |  12 +
 .../installation/upgrade_routing/002.php      |  24 +
 .../source/installation/upgrade_security.rst  |  29 +-
 .../installation/upgrade_security/001.php     |   8 +
 .../installation/upgrade_security/002.php     |  17 +
 .../source/installation/upgrade_sessions.rst  |  19 +-
 .../installation/upgrade_sessions/001.php     |   7 +
 .../installation/upgrade_sessions/002.php     |   8 +
 .../installation/upgrade_validations.rst      |  59 +-
 .../installation/upgrade_validations/001.php  |   7 +
 .../installation/upgrade_validations/002.php  |  19 +
 .../installation/upgrade_validations/003.php  |  23 +
 .../installation/upgrade_view_parser.rst      |  26 +-
 .../installation/upgrade_view_parser/001.php  |  11 +
 .../installation/upgrade_view_parser/002.php  |  11 +
 .../source/installation/upgrade_views.rst     |  40 +-
 .../source/installation/upgrade_views/001.php |  17 +
 .../source/installation/upgrade_views/002.php |  17 +
 user_guide_src/source/libraries/caching.rst   |  97 +-
 .../source/libraries/caching/001.php          |  11 +
 .../source/libraries/caching/002.php          |   5 +
 .../source/libraries/caching/003.php          |   3 +
 .../source/libraries/caching/004.php          |   3 +
 .../source/libraries/caching/005.php          |   3 +
 .../source/libraries/caching/006.php          |   4 +
 .../source/libraries/caching/007.php          |   5 +
 .../source/libraries/caching/008.php          |   5 +
 .../source/libraries/caching/009.php          |   3 +
 .../source/libraries/caching/010.php          |   3 +
 .../source/libraries/caching/011.php          |   3 +
 .../source/libraries/caching/012.php          |   3 +
 .../source/libraries/caching/013.php          |   8 +
 .../source/libraries/caching/014.php          |   9 +
 user_guide_src/source/libraries/cookies.rst   | 281 +-----
 .../source/libraries/cookies/001.php          |  40 +
 .../source/libraries/cookies/002.php          |  16 +
 .../source/libraries/cookies/003.php          |  10 +
 .../source/libraries/cookies/004.php          |  42 +
 .../source/libraries/cookies/005.php          |  12 +
 .../source/libraries/cookies/006.php          |   7 +
 .../source/libraries/cookies/007.php          |   5 +
 .../source/libraries/cookies/008.php          |  22 +
 .../source/libraries/cookies/009.php          |  21 +
 .../source/libraries/cookies/010.php          |  20 +
 .../source/libraries/cookies/011.php          |   4 +
 .../source/libraries/cookies/012.php          |   3 +
 .../source/libraries/cookies/013.php          |   9 +
 .../source/libraries/cookies/014.php          |  16 +
 .../source/libraries/cookies/015.php          |  11 +
 .../source/libraries/cookies/016.php          |  11 +
 .../source/libraries/curlrequest.rst          | 240 ++---
 .../source/libraries/curlrequest/001.php      |   3 +
 .../source/libraries/curlrequest/002.php      |   3 +
 .../source/libraries/curlrequest/003.php      |   7 +
 .../source/libraries/curlrequest/004.php      |   8 +
 .../source/libraries/curlrequest/005.php      |   7 +
 .../source/libraries/curlrequest/006.php      |   6 +
 .../source/libraries/curlrequest/007.php      |   9 +
 .../source/libraries/curlrequest/008.php      |  11 +
 .../source/libraries/curlrequest/009.php      |   4 +
 .../source/libraries/curlrequest/010.php      |   9 +
 .../source/libraries/curlrequest/011.php      |   3 +
 .../source/libraries/curlrequest/012.php      |   5 +
 .../source/libraries/curlrequest/013.php      |   3 +
 .../source/libraries/curlrequest/014.php      |   8 +
 .../source/libraries/curlrequest/015.php      |   6 +
 .../source/libraries/curlrequest/016.php      |   3 +
 .../source/libraries/curlrequest/017.php      |   3 +
 .../source/libraries/curlrequest/018.php      |   3 +
 .../source/libraries/curlrequest/019.php      |   3 +
 .../source/libraries/curlrequest/020.php      |   3 +
 .../source/libraries/curlrequest/021.php      |   3 +
 .../source/libraries/curlrequest/022.php      |   3 +
 .../source/libraries/curlrequest/023.php      |   4 +
 .../source/libraries/curlrequest/024.php      |   8 +
 .../source/libraries/curlrequest/025.php      |   9 +
 .../source/libraries/curlrequest/026.php      |   8 +
 .../source/libraries/curlrequest/027.php      |   3 +
 .../source/libraries/curlrequest/028.php      |   6 +
 .../source/libraries/curlrequest/029.php      |   4 +
 .../source/libraries/curlrequest/030.php      |   3 +
 .../source/libraries/curlrequest/031.php      |   3 +
 .../source/libraries/curlrequest/032.php      |  10 +
 .../source/libraries/curlrequest/033.php      |   4 +
 user_guide_src/source/libraries/email.rst     | 160 ++--
 user_guide_src/source/libraries/email/001.php |  13 +
 user_guide_src/source/libraries/email/002.php |   8 +
 user_guide_src/source/libraries/email/003.php |   3 +
 user_guide_src/source/libraries/email/004.php |   3 +
 user_guide_src/source/libraries/email/005.php |   3 +
 user_guide_src/source/libraries/email/006.php |   3 +
 user_guide_src/source/libraries/email/007.php |   3 +
 user_guide_src/source/libraries/email/008.php |   3 +
 user_guide_src/source/libraries/email/009.php |   3 +
 user_guide_src/source/libraries/email/010.php |   3 +
 user_guide_src/source/libraries/email/011.php |   3 +
 user_guide_src/source/libraries/email/012.php |   4 +
 user_guide_src/source/libraries/email/013.php |  12 +
 user_guide_src/source/libraries/email/014.php |   3 +
 user_guide_src/source/libraries/email/015.php |   5 +
 user_guide_src/source/libraries/email/016.php |   5 +
 user_guide_src/source/libraries/email/017.php |   5 +
 user_guide_src/source/libraries/email/018.php |   3 +
 user_guide_src/source/libraries/email/019.php |   3 +
 user_guide_src/source/libraries/email/020.php |   3 +
 user_guide_src/source/libraries/email/021.php |   3 +
 user_guide_src/source/libraries/email/022.php |  11 +
 user_guide_src/source/libraries/email/023.php |   9 +
 .../source/libraries/encryption.rst           |  91 +-
 .../source/libraries/encryption/001.php       |   3 +
 .../source/libraries/encryption/002.php       |   7 +
 .../source/libraries/encryption/003.php       |   7 +
 .../source/libraries/encryption/004.php       |   8 +
 .../source/libraries/encryption/005.php       |   3 +
 .../source/libraries/encryption/006.php       |   8 +
 .../source/libraries/encryption/007.php       |   4 +
 .../source/libraries/encryption/008.php       |   7 +
 .../source/libraries/encryption/009.php       |   7 +
 .../source/libraries/encryption/010.php       |   3 +
 .../source/libraries/encryption/011.php       |   7 +
 .../source/libraries/encryption/012.php       |   7 +
 user_guide_src/source/libraries/files.rst     | 124 +--
 user_guide_src/source/libraries/files/001.php |   3 +
 user_guide_src/source/libraries/files/002.php |  19 +
 user_guide_src/source/libraries/files/003.php |   4 +
 user_guide_src/source/libraries/files/004.php |   3 +
 user_guide_src/source/libraries/files/005.php |   5 +
 user_guide_src/source/libraries/files/006.php |   5 +
 user_guide_src/source/libraries/files/007.php |   4 +
 user_guide_src/source/libraries/files/008.php |   3 +
 user_guide_src/source/libraries/files/009.php |   4 +
 user_guide_src/source/libraries/files/010.php |   3 +
 user_guide_src/source/libraries/files/011.php |   7 +
 user_guide_src/source/libraries/files/012.php |   6 +
 user_guide_src/source/libraries/files/013.php |   9 +
 user_guide_src/source/libraries/files/014.php |   9 +
 user_guide_src/source/libraries/files/015.php |  10 +
 user_guide_src/source/libraries/honeypot.rst  |  16 +-
 .../source/libraries/honeypot/001.php         |  12 +
 user_guide_src/source/libraries/images.rst    | 134 +--
 .../source/libraries/images/001.php           |   3 +
 .../source/libraries/images/002.php           |   3 +
 .../source/libraries/images/003.php           |   6 +
 .../source/libraries/images/004.php           |   8 +
 .../source/libraries/images/005.php           |   6 +
 .../source/libraries/images/006.php           |   6 +
 .../source/libraries/images/007.php           |  10 +
 .../source/libraries/images/008.php           |  14 +
 .../source/libraries/images/009.php           |   6 +
 .../source/libraries/images/010.php           |   6 +
 .../source/libraries/images/011.php           |  11 +
 .../source/libraries/images/012.php           |   6 +
 .../source/libraries/images/013.php           |   6 +
 .../source/libraries/images/014.php           |  13 +
 .../source/libraries/pagination.rst           | 227 +----
 .../source/libraries/pagination/001.php       |   3 +
 .../source/libraries/pagination/002.php       |  20 +
 .../source/libraries/pagination/003.php       |  22 +
 .../source/libraries/pagination/004.php       |  20 +
 .../source/libraries/pagination/005.php       |   6 +
 .../source/libraries/pagination/006.php       |   3 +
 .../source/libraries/pagination/007.php       |   5 +
 .../source/libraries/pagination/008.php       |   4 +
 .../source/libraries/pagination/009.php       |   4 +
 .../source/libraries/pagination/010.php       |   6 +
 .../source/libraries/pagination/011.php       |   3 +
 .../source/libraries/pagination/012.php       |   3 +
 .../source/libraries/pagination/013.php       |   7 +
 .../source/libraries/pagination/014.php       |  39 +
 .../source/libraries/pagination/015.php       |   7 +
 .../source/libraries/pagination/016.php       |  37 +
 user_guide_src/source/libraries/publisher.rst | 217 +----
 .../source/libraries/publisher/001.php        |   3 +
 .../source/libraries/publisher/002.php        |   3 +
 .../source/libraries/publisher/003.php        |  19 +
 .../source/libraries/publisher/004.php        |  10 +
 .../source/libraries/publisher/005.php        |  13 +
 .../source/libraries/publisher/006.php        |   3 +
 .../source/libraries/publisher/007.php        |  25 +
 .../source/libraries/publisher/008.php        |   3 +
 .../source/libraries/publisher/009.php        |  45 +
 .../source/libraries/publisher/010.php        |  42 +
 .../source/libraries/publisher/011.php        |  10 +
 .../source/libraries/publisher/012.php        |  10 +
 user_guide_src/source/libraries/security.rst  |  65 +-
 .../source/libraries/security/001.php         |   3 +
 .../source/libraries/security/002.php         |   3 +
 .../source/libraries/security/003.php         |   3 +
 .../source/libraries/security/004.php         |   3 +
 .../source/libraries/security/005.php         |   3 +
 .../source/libraries/security/006.php         |   8 +
 .../source/libraries/security/007.php         |   7 +
 .../source/libraries/security/008.php         |   7 +
 .../source/libraries/security/009.php         |   6 +
 .../source/libraries/security/010.php         |   3 +
 user_guide_src/source/libraries/sessions.rst  | 269 +++---
 .../source/libraries/sessions/001.php         |   3 +
 .../source/libraries/sessions/002.php         |   3 +
 .../source/libraries/sessions/003.php         |   3 +
 .../source/libraries/sessions/004.php         |   3 +
 .../source/libraries/sessions/005.php         |   3 +
 .../source/libraries/sessions/006.php         |   3 +
 .../source/libraries/sessions/007.php         |   3 +
 .../source/libraries/sessions/008.php         |   3 +
 .../source/libraries/sessions/009.php         |  11 +
 .../source/libraries/sessions/010.php         |   7 +
 .../source/libraries/sessions/011.php         |   3 +
 .../source/libraries/sessions/012.php         |   9 +
 .../source/libraries/sessions/013.php         |   3 +
 .../source/libraries/sessions/014.php         |   5 +
 .../source/libraries/sessions/015.php         |   3 +
 .../source/libraries/sessions/016.php         |   3 +
 .../source/libraries/sessions/017.php         |  10 +
 .../source/libraries/sessions/018.php         |   3 +
 .../source/libraries/sessions/019.php         |   4 +
 .../source/libraries/sessions/020.php         |   3 +
 .../source/libraries/sessions/021.php         |   3 +
 .../source/libraries/sessions/022.php         |   4 +
 .../source/libraries/sessions/023.php         |   3 +
 .../source/libraries/sessions/024.php         |   3 +
 .../source/libraries/sessions/025.php         |   3 +
 .../source/libraries/sessions/026.php         |   3 +
 .../source/libraries/sessions/027.php         |   4 +
 .../source/libraries/sessions/028.php         |   4 +
 .../source/libraries/sessions/029.php         |  11 +
 .../source/libraries/sessions/030.php         |   4 +
 .../source/libraries/sessions/031.php         |   3 +
 .../source/libraries/sessions/032.php         |   4 +
 .../source/libraries/sessions/033.php         |   3 +
 .../source/libraries/sessions/034.php         |   3 +
 .../source/libraries/sessions/035.php         |   3 +
 .../source/libraries/sessions/036.php         |   3 +
 .../source/libraries/sessions/037.php         |   3 +
 .../source/libraries/sessions/038.php         |   7 +
 .../source/libraries/sessions/039.php         |   3 +
 .../source/libraries/sessions/040.php         |   4 +
 .../source/libraries/sessions/041.php         |   3 +
 .../source/libraries/sessions/042.php         |   4 +
 .../source/libraries/sessions/043.php         |   4 +
 .../source/libraries/sessions/044.php         |   5 +
 user_guide_src/source/libraries/throttler.rst |  68 +-
 .../source/libraries/throttler/001.php        |   4 +
 .../source/libraries/throttler/002.php        |  42 +
 .../source/libraries/throttler/003.php        |   6 +
 .../source/libraries/throttler/004.php        |   5 +
 user_guide_src/source/libraries/time.rst      | 329 +++----
 user_guide_src/source/libraries/time/001.php  |   6 +
 user_guide_src/source/libraries/time/002.php  |   3 +
 user_guide_src/source/libraries/time/003.php  |   3 +
 user_guide_src/source/libraries/time/004.php  |   3 +
 user_guide_src/source/libraries/time/005.php  |   3 +
 user_guide_src/source/libraries/time/006.php  |   3 +
 user_guide_src/source/libraries/time/007.php  |   3 +
 user_guide_src/source/libraries/time/008.php  |   5 +
 user_guide_src/source/libraries/time/009.php  |   5 +
 user_guide_src/source/libraries/time/010.php  |   3 +
 user_guide_src/source/libraries/time/011.php  |   3 +
 user_guide_src/source/libraries/time/012.php  |   3 +
 user_guide_src/source/libraries/time/013.php  |   4 +
 user_guide_src/source/libraries/time/014.php  |   3 +
 user_guide_src/source/libraries/time/015.php  |   4 +
 user_guide_src/source/libraries/time/016.php  |   4 +
 user_guide_src/source/libraries/time/017.php  |   4 +
 user_guide_src/source/libraries/time/018.php  |   4 +
 user_guide_src/source/libraries/time/019.php  |   6 +
 user_guide_src/source/libraries/time/020.php  |  17 +
 user_guide_src/source/libraries/time/021.php  |  17 +
 user_guide_src/source/libraries/time/022.php  |   6 +
 user_guide_src/source/libraries/time/023.php  |   4 +
 user_guide_src/source/libraries/time/024.php  |   4 +
 user_guide_src/source/libraries/time/025.php  |   4 +
 user_guide_src/source/libraries/time/026.php  |   7 +
 user_guide_src/source/libraries/time/027.php  |   4 +
 user_guide_src/source/libraries/time/028.php  |  10 +
 user_guide_src/source/libraries/time/029.php  |  10 +
 user_guide_src/source/libraries/time/030.php  |   7 +
 user_guide_src/source/libraries/time/031.php  |  15 +
 user_guide_src/source/libraries/time/032.php  |   6 +
 user_guide_src/source/libraries/time/033.php  |   3 +
 user_guide_src/source/libraries/time/034.php  |   7 +
 user_guide_src/source/libraries/time/035.php  |   7 +
 user_guide_src/source/libraries/time/036.php  |   3 +
 user_guide_src/source/libraries/time/037.php  |   7 +
 user_guide_src/source/libraries/time/038.php  |   7 +
 user_guide_src/source/libraries/time/039.php  |  14 +
 user_guide_src/source/libraries/time/040.php  |   9 +
 user_guide_src/source/libraries/time/041.php  |   8 +
 .../source/libraries/typography.rst           |  20 +-
 .../source/libraries/typography/001.php       |   3 +
 .../source/libraries/typography/002.php       |   3 +
 .../source/libraries/typography/003.php       |   3 +
 .../source/libraries/typography/004.php       |   3 +
 .../source/libraries/uploaded_files.rst       | 215 ++---
 .../source/libraries/uploaded_files/000.php   |  23 +
 .../source/libraries/uploaded_files/001.php   |  48 +
 .../source/libraries/uploaded_files/002.php   |   3 +
 .../source/libraries/uploaded_files/003.php   |   5 +
 .../source/libraries/uploaded_files/004.php   |   9 +
 .../source/libraries/uploaded_files/005.php   |  11 +
 .../source/libraries/uploaded_files/006.php   |   3 +
 .../source/libraries/uploaded_files/007.php   |   3 +
 .../source/libraries/uploaded_files/008.php   |  10 +
 .../source/libraries/uploaded_files/009.php   |   4 +
 .../source/libraries/uploaded_files/010.php   |   3 +
 .../source/libraries/uploaded_files/011.php   |   4 +
 .../source/libraries/uploaded_files/012.php   |   5 +
 .../source/libraries/uploaded_files/013.php   |   3 +
 .../source/libraries/uploaded_files/014.php   |   3 +
 .../source/libraries/uploaded_files/015.php   |   3 +
 .../source/libraries/uploaded_files/016.php   |   3 +
 .../source/libraries/uploaded_files/017.php   |   5 +
 .../source/libraries/uploaded_files/018.php   |   3 +
 .../source/libraries/uploaded_files/019.php   |   4 +
 .../source/libraries/uploaded_files/020.php   |   5 +
 .../source/libraries/uploaded_files/021.php   |   3 +
 .../source/libraries/uploaded_files/022.php   |   3 +
 user_guide_src/source/libraries/uri.rst       | 197 ++--
 user_guide_src/source/libraries/uri/001.php   |   3 +
 user_guide_src/source/libraries/uri/002.php   |   3 +
 user_guide_src/source/libraries/uri/003.php   |   4 +
 user_guide_src/source/libraries/uri/004.php   |   3 +
 user_guide_src/source/libraries/uri/005.php   |   3 +
 user_guide_src/source/libraries/uri/006.php   |   4 +
 user_guide_src/source/libraries/uri/007.php   |   6 +
 user_guide_src/source/libraries/uri/008.php   |   6 +
 user_guide_src/source/libraries/uri/009.php   |   5 +
 user_guide_src/source/libraries/uri/010.php   |   7 +
 user_guide_src/source/libraries/uri/011.php   |   3 +
 user_guide_src/source/libraries/uri/012.php   |   3 +
 user_guide_src/source/libraries/uri/013.php   |   4 +
 user_guide_src/source/libraries/uri/014.php   |   6 +
 user_guide_src/source/libraries/uri/015.php   |   6 +
 user_guide_src/source/libraries/uri/016.php   |   6 +
 user_guide_src/source/libraries/uri/017.php   |   6 +
 user_guide_src/source/libraries/uri/018.php   |   3 +
 user_guide_src/source/libraries/uri/019.php   |   3 +
 user_guide_src/source/libraries/uri/020.php   |   9 +
 user_guide_src/source/libraries/uri/021.php   |   9 +
 user_guide_src/source/libraries/uri/022.php   |   6 +
 user_guide_src/source/libraries/uri/023.php   |   8 +
 user_guide_src/source/libraries/uri/024.php   |  14 +
 user_guide_src/source/libraries/uri/025.php   |   3 +
 user_guide_src/source/libraries/uri/026.php   |  10 +
 user_guide_src/source/libraries/uri/027.php   |   7 +
 .../source/libraries/user_agent.rst           |  49 +-
 .../source/libraries/user_agent/001.php       |   3 +
 .../source/libraries/user_agent/002.php       |  17 +
 .../source/libraries/user_agent/003.php       |   7 +
 .../source/libraries/user_agent/004.php       |   9 +
 .../source/libraries/user_agent/005.php       |   5 +
 .../source/libraries/validation.rst           | 453 +++------
 .../source/libraries/validation/001.php       |  21 +
 .../source/libraries/validation/002.php       |  10 +
 .../source/libraries/validation/003.php       |   8 +
 .../source/libraries/validation/004.php       |   3 +
 .../source/libraries/validation/005.php       |   4 +
 .../source/libraries/validation/006.php       |   6 +
 .../source/libraries/validation/007.php       |   6 +
 .../source/libraries/validation/008.php       |   3 +
 .../source/libraries/validation/009.php       |  24 +
 .../source/libraries/validation/010.php       |   6 +
 .../source/libraries/validation/011.php       |  12 +
 .../source/libraries/validation/012.php       |   3 +
 .../source/libraries/validation/013.php       |  11 +
 .../source/libraries/validation/014.php       |   3 +
 .../source/libraries/validation/015.php       |  20 +
 .../source/libraries/validation/016.php       |  19 +
 .../source/libraries/validation/017.php       |   3 +
 .../source/libraries/validation/018.php       |   3 +
 .../source/libraries/validation/019.php       |  10 +
 .../source/libraries/validation/020.php       |   5 +
 .../source/libraries/validation/021.php       |   6 +
 .../source/libraries/validation/022.php       |   5 +
 .../source/libraries/validation/023.php       |  15 +
 .../source/libraries/validation/024.php       |  19 +
 .../source/libraries/validation/025.php       |   3 +
 .../source/libraries/validation/026.php       |  19 +
 .../source/libraries/validation/027.php       |   9 +
 .../source/libraries/validation/028.php       |   3 +
 .../source/libraries/validation/029-2.php     |   7 +
 .../source/libraries/validation/029.php       |   5 +
 .../source/libraries/validation/030.php       |   6 +
 .../source/libraries/validation/031.php       |   7 +
 .../source/libraries/validation/032.php       |  13 +
 .../source/libraries/validation/033.php       |   9 +
 .../source/libraries/validation/034.php       |  12 +
 .../source/libraries/validation/035.php       |   5 +
 .../source/libraries/validation/036.php       |  34 +
 .../source/libraries/validation/037.php       |  10 +
 user_guide_src/source/models/entities.rst     | 364 ++------
 user_guide_src/source/models/entities/001.php |  10 +
 user_guide_src/source/models/entities/002.php |  15 +
 user_guide_src/source/models/entities/003.php |  22 +
 user_guide_src/source/models/entities/004.php |   7 +
 user_guide_src/source/models/entities/005.php |   6 +
 user_guide_src/source/models/entities/006.php |  35 +
 user_guide_src/source/models/entities/007.php |   5 +
 user_guide_src/source/models/entities/008.php |  17 +
 user_guide_src/source/models/entities/009.php |  21 +
 user_guide_src/source/models/entities/010.php |  10 +
 user_guide_src/source/models/entities/011.php |  10 +
 user_guide_src/source/models/entities/012.php |  13 +
 user_guide_src/source/models/entities/013.php |  14 +
 user_guide_src/source/models/entities/014.php |   9 +
 user_guide_src/source/models/entities/015.php |  12 +
 user_guide_src/source/models/entities/016.php |   3 +
 user_guide_src/source/models/entities/017.php |  19 +
 user_guide_src/source/models/entities/018.php |  23 +
 user_guide_src/source/models/entities/019.php |  11 +
 user_guide_src/source/models/entities/020.php |  11 +
 user_guide_src/source/models/entities/021.php |  19 +
 user_guide_src/source/models/entities/022.php |   7 +
 user_guide_src/source/models/entities/023.php |   3 +
 user_guide_src/source/models/model.rst        | 530 +++--------
 user_guide_src/source/models/model/001.php    |  16 +
 user_guide_src/source/models/model/002.php    |  10 +
 user_guide_src/source/models/model/003.php    |  17 +
 user_guide_src/source/models/model/004.php    |  10 +
 user_guide_src/source/models/model/005.php    |  27 +
 user_guide_src/source/models/model/006.php    |   3 +
 user_guide_src/source/models/model/007.php    |   3 +
 user_guide_src/source/models/model/008.php    |   3 +
 user_guide_src/source/models/model/009.php    |   3 +
 user_guide_src/source/models/model/010.php    |   4 +
 user_guide_src/source/models/model/011.php    |   3 +
 user_guide_src/source/models/model/012.php    |   4 +
 user_guide_src/source/models/model/013.php    |   7 +
 user_guide_src/source/models/model/014.php    |   3 +
 user_guide_src/source/models/model/015.php    |   8 +
 user_guide_src/source/models/model/016.php    |   8 +
 user_guide_src/source/models/model/017.php    |   7 +
 user_guide_src/source/models/model/018.php    |   6 +
 user_guide_src/source/models/model/019.php    |  20 +
 user_guide_src/source/models/model/020.php    |  24 +
 user_guide_src/source/models/model/021.php    |  12 +
 user_guide_src/source/models/model/022.php    |  10 +
 user_guide_src/source/models/model/023.php    |   3 +
 user_guide_src/source/models/model/024.php    |   3 +
 user_guide_src/source/models/model/025.php    |   3 +
 user_guide_src/source/models/model/026.php    |   3 +
 user_guide_src/source/models/model/027.php    |  17 +
 user_guide_src/source/models/model/028.php    |   6 +
 user_guide_src/source/models/model/029.php    |  12 +
 user_guide_src/source/models/model/030.php    |   7 +
 user_guide_src/source/models/model/031.php    |   9 +
 user_guide_src/source/models/model/032.php    |   5 +
 user_guide_src/source/models/model/033.php    |   7 +
 user_guide_src/source/models/model/034.php    |   6 +
 user_guide_src/source/models/model/035.php    |   3 +
 user_guide_src/source/models/model/036.php    |   3 +
 user_guide_src/source/models/model/037.php    |   6 +
 user_guide_src/source/models/model/038.php    |   5 +
 user_guide_src/source/models/model/039.php    |   6 +
 user_guide_src/source/models/model/040.php    |   5 +
 user_guide_src/source/models/model/041.php    |   3 +
 user_guide_src/source/models/model/042.php    |   5 +
 user_guide_src/source/models/model/043.php    |   3 +
 user_guide_src/source/models/model/044.php    |   3 +
 user_guide_src/source/models/model/045.php    |   5 +
 user_guide_src/source/models/model/046.php    |   3 +
 user_guide_src/source/models/model/047.php    |   3 +
 user_guide_src/source/models/model/048.php    |   7 +
 user_guide_src/source/models/model/049.php    |   6 +
 user_guide_src/source/models/model/050.php    |  13 +
 user_guide_src/source/models/model/051.php    |   4 +
 user_guide_src/source/models/model/052.php    |   3 +
 user_guide_src/source/models/model/053.php    |   4 +
 user_guide_src/source/models/model/054.php    |  16 +
 user_guide_src/source/models/model/055.php    |  15 +
 .../source/outgoing/alternative_php.rst       |  28 +-
 .../source/outgoing/alternative_php/001.php   |   9 +
 .../source/outgoing/alternative_php/002.php   |  13 +
 .../source/outgoing/api_responses.rst         | 153 +--
 .../source/outgoing/api_responses/001.php     |  19 +
 .../source/outgoing/api_responses/002.php     |  37 +
 .../source/outgoing/api_responses/003.php     |   6 +
 .../source/outgoing/api_responses/004.php     |   6 +
 .../source/outgoing/api_responses/005.php     |   3 +
 .../source/outgoing/api_responses/006.php     |  10 +
 .../source/outgoing/api_responses/007.php     |   4 +
 .../source/outgoing/api_responses/008.php     |   4 +
 .../source/outgoing/api_responses/009.php     |   4 +
 .../source/outgoing/api_responses/010.php     |   3 +
 .../source/outgoing/api_responses/011.php     |   3 +
 .../source/outgoing/api_responses/012.php     |   3 +
 .../source/outgoing/api_responses/013.php     |   3 +
 .../source/outgoing/api_responses/014.php     |   3 +
 .../source/outgoing/api_responses/015.php     |   3 +
 .../source/outgoing/api_responses/016.php     |   3 +
 .../source/outgoing/api_responses/017.php     |   3 +
 .../source/outgoing/localization.rst          | 176 +---
 .../source/outgoing/localization/001.php      |   3 +
 .../source/outgoing/localization/002.php      |   3 +
 .../source/outgoing/localization/003.php      |   3 +
 .../source/outgoing/localization/004.php      |   3 +
 .../source/outgoing/localization/005.php      |  11 +
 .../source/outgoing/localization/006.php      |   3 +
 .../source/outgoing/localization/007.php      |   3 +
 .../source/outgoing/localization/008.php      |   7 +
 .../source/outgoing/localization/009.php      |  12 +
 .../source/outgoing/localization/010.php      |   3 +
 .../source/outgoing/localization/011.php      |   3 +
 .../source/outgoing/localization/012.php      |  11 +
 .../source/outgoing/localization/013.php      |   4 +
 .../source/outgoing/localization/014.php      |   4 +
 .../source/outgoing/localization/015.php      |  40 +
 .../source/outgoing/localization/016.php      |   9 +
 .../source/outgoing/localization/017.php      |  17 +
 user_guide_src/source/outgoing/response.rst   | 202 ++--
 .../source/outgoing/response/001.php          |   3 +
 .../source/outgoing/response/002.php          |   3 +
 .../source/outgoing/response/003.php          |  10 +
 .../source/outgoing/response/004.php          |   4 +
 .../source/outgoing/response/005.php          |   4 +
 .../source/outgoing/response/006.php          |   3 +
 .../source/outgoing/response/007.php          |   5 +
 .../source/outgoing/response/008.php          |   4 +
 .../source/outgoing/response/009.php          |   3 +
 .../source/outgoing/response/010.php          |   8 +
 .../source/outgoing/response/011.php          |   3 +
 .../source/outgoing/response/012.php          |  30 +
 .../source/outgoing/response/013.php          |   6 +
 .../source/outgoing/response/014.php          |   3 +
 .../source/outgoing/response/015.php          |   3 +
 .../source/outgoing/response/016.php          |   3 +
 .../source/outgoing/response/017.php          |   3 +
 .../source/outgoing/response/018.php          |   4 +
 .../source/outgoing/response/019.php          |   5 +
 .../source/outgoing/response/020.php          |   3 +
 .../source/outgoing/response/021.php          |   6 +
 .../source/outgoing/response/022.php          |   4 +
 .../source/outgoing/response/023.php          |  15 +
 .../source/outgoing/response/024.php          |   3 +
 .../source/outgoing/response/025.php          |   3 +
 .../source/outgoing/response/026.php          |   3 +
 .../source/outgoing/response/027.php          |   3 +
 user_guide_src/source/outgoing/table.rst      | 216 +----
 user_guide_src/source/outgoing/table/001.php  |   3 +
 user_guide_src/source/outgoing/table/002.php  |  12 +
 user_guide_src/source/outgoing/table/003.php  |   7 +
 user_guide_src/source/outgoing/table/004.php  |  11 +
 user_guide_src/source/outgoing/table/005.php  |  11 +
 user_guide_src/source/outgoing/table/006.php  |  38 +
 user_guide_src/source/outgoing/table/007.php  |   7 +
 user_guide_src/source/outgoing/table/008.php  |   7 +
 user_guide_src/source/outgoing/table/009.php  |   9 +
 user_guide_src/source/outgoing/table/010.php  |   3 +
 user_guide_src/source/outgoing/table/011.php  |   5 +
 user_guide_src/source/outgoing/table/012.php  |   5 +
 user_guide_src/source/outgoing/table/013.php  |   5 +
 user_guide_src/source/outgoing/table/014.php  |   7 +
 user_guide_src/source/outgoing/table/015.php  |  20 +
 user_guide_src/source/outgoing/table/016.php  |   7 +
 user_guide_src/source/outgoing/table/017.php  |   3 +
 user_guide_src/source/outgoing/table/018.php  |  21 +
 .../source/outgoing/view_decorators.rst       |  25 +-
 .../source/outgoing/view_decorators/001.php   |  15 +
 .../source/outgoing/view_decorators/002.php   |   5 +
 .../source/outgoing/view_layouts.rst          |   9 +-
 .../source/outgoing/view_layouts/001.php      |   6 +
 .../source/outgoing/view_parser.rst           | 274 ++----
 .../source/outgoing/view_parser/001.php       |   3 +
 .../source/outgoing/view_parser/002.php       |   3 +
 .../source/outgoing/view_parser/003.php       |   9 +
 .../source/outgoing/view_parser/004.php       |   6 +
 .../source/outgoing/view_parser/005.php       |   8 +
 .../source/outgoing/view_parser/006.php       |  16 +
 .../source/outgoing/view_parser/007.php       |  12 +
 .../source/outgoing/view_parser/008.php       |  13 +
 .../source/outgoing/view_parser/009.php       |  11 +
 .../source/outgoing/view_parser/010-2.php     |   3 +
 .../source/outgoing/view_parser/010.php       |  14 +
 .../source/outgoing/view_parser/011.php       |   6 +
 .../source/outgoing/view_parser/012.php       |   5 +
 .../source/outgoing/view_parser/013.php       |   8 +
 .../source/outgoing/view_parser/014.php       |  15 +
 .../source/outgoing/view_parser/015.php       |   8 +
 .../source/outgoing/view_parser/016.php       |   7 +
 .../source/outgoing/view_parser/017.php       |  12 +
 .../source/outgoing/view_parser/018.php       |  12 +
 .../source/outgoing/view_parser/019.php       |  16 +
 .../source/outgoing/view_parser/020.php       |  19 +
 .../source/outgoing/view_parser/021.php       |   3 +
 .../source/outgoing/view_parser/022.php       |   3 +
 .../source/outgoing/view_parser/023.php       |   3 +
 .../source/outgoing/view_parser/024.php       |   3 +
 .../source/outgoing/view_parser/025.php       |   3 +
 .../source/outgoing/view_renderer.rst         |  42 +-
 .../source/outgoing/view_renderer/001.php     |   3 +
 .../source/outgoing/view_renderer/002.php     |   3 +
 .../source/outgoing/view_renderer/003.php     |   5 +
 .../source/outgoing/view_renderer/004.php     |   3 +
 .../source/outgoing/view_renderer/005.php     |   3 +
 .../source/outgoing/view_renderer/006.php     |   3 +
 .../source/outgoing/view_renderer/007.php     |   3 +
 .../source/outgoing/view_renderer/008.php     |   3 +
 user_guide_src/source/outgoing/views.rst      | 142 +--
 user_guide_src/source/outgoing/views/001.php  |   3 +
 user_guide_src/source/outgoing/views/002.php  |  11 +
 user_guide_src/source/outgoing/views/003.php  |  18 +
 user_guide_src/source/outgoing/views/004.php  |   3 +
 user_guide_src/source/outgoing/views/005.php  |   3 +
 user_guide_src/source/outgoing/views/006.php  |   4 +
 user_guide_src/source/outgoing/views/007.php  |   4 +
 user_guide_src/source/outgoing/views/008.php  |   9 +
 user_guide_src/source/outgoing/views/009.php  |  14 +
 user_guide_src/source/outgoing/views/010.php  |   9 +
 user_guide_src/source/outgoing/views/011.php  |  17 +
 user_guide_src/source/outgoing/views/012.php  |  19 +
 user_guide_src/source/testing/benchmark.rst   |  72 +-
 .../source/testing/benchmark/001.php          |   4 +
 .../source/testing/benchmark/002.php          |   3 +
 .../source/testing/benchmark/003.php          |   7 +
 .../source/testing/benchmark/004.php          |  12 +
 .../source/testing/benchmark/005.php          |   3 +
 .../source/testing/benchmark/006.php          |   4 +
 .../source/testing/benchmark/007.php          |  13 +
 .../source/testing/benchmark/008.php          |   4 +
 .../source/testing/benchmark/009.php          |   4 +
 user_guide_src/source/testing/controllers.rst | 174 +---
 .../source/testing/controllers/001.php        |  12 +
 .../source/testing/controllers/002.php        |  21 +
 .../source/testing/controllers/003.php        |   3 +
 .../source/testing/controllers/004.php        |   4 +
 .../source/testing/controllers/005.php        |   8 +
 .../source/testing/controllers/006.php        |   8 +
 .../source/testing/controllers/007.php        |   7 +
 .../source/testing/controllers/008.php        |   8 +
 .../source/testing/controllers/009.php        |   5 +
 .../source/testing/controllers/010.php        |   7 +
 .../source/testing/controllers/011.php        |  11 +
 .../source/testing/controllers/012.php        |  13 +
 .../source/testing/controllers/013.php        |   3 +
 .../source/testing/controllers/014.php        |   9 +
 .../source/testing/controllers/015.php        |   4 +
 .../source/testing/controllers/016.php        |   4 +
 .../source/testing/controllers/017.php        |   4 +
 .../source/testing/controllers/018.php        |   4 +
 user_guide_src/source/testing/database.rst    |  96 +-
 .../source/testing/database/001.php           |  13 +
 .../source/testing/database/002.php           |  25 +
 .../source/testing/database/003.php           |  15 +
 .../source/testing/database/004.php           |   7 +
 .../source/testing/database/005.php           |   7 +
 .../source/testing/database/006.php           |   3 +
 .../source/testing/database/007.php           |   7 +
 .../source/testing/database/008.php           |   6 +
 user_guide_src/source/testing/debugging.rst   |  70 +-
 .../source/testing/debugging/001.php          |   3 +
 .../source/testing/debugging/002.php          |   3 +
 .../source/testing/debugging/003.php          |  12 +
 .../source/testing/debugging/004.php          |  16 +
 .../source/testing/debugging/005.php          |   8 +
 .../source/testing/debugging/006.php          |  12 +
 user_guide_src/source/testing/fabricator.rst  | 210 ++---
 .../source/testing/fabricator/001.php         |   3 +
 .../source/testing/fabricator/002.php         |   6 +
 .../source/testing/fabricator/003.php         |   5 +
 .../source/testing/fabricator/004.php         |  10 +
 .../source/testing/fabricator/005.php         |  14 +
 .../source/testing/fabricator/006.php         |   8 +
 .../source/testing/fabricator/007.php         |   3 +
 .../source/testing/fabricator/008.php         |   5 +
 .../source/testing/fabricator/009.php         |   9 +
 .../source/testing/fabricator/010.php         |   3 +
 .../source/testing/fabricator/011.php         |   5 +
 .../source/testing/fabricator/012.php         |  12 +
 .../source/testing/fabricator/013.php         |   3 +
 .../source/testing/fabricator/014.php         |   6 +
 .../source/testing/fabricator/015.php         |   4 +
 .../source/testing/fabricator/016.php         |  17 +
 .../source/testing/fabricator/017.php         |   5 +
 .../source/testing/fabricator/018.php         |  17 +
 .../source/testing/fabricator/019.php         |   4 +
 .../source/testing/fabricator/020.php         |   5 +
 .../source/testing/fabricator/021.php         |  14 +
 user_guide_src/source/testing/feature.rst     |  94 +-
 user_guide_src/source/testing/feature/001.php |  25 +
 user_guide_src/source/testing/feature/002.php |  10 +
 user_guide_src/source/testing/feature/003.php |   8 +
 user_guide_src/source/testing/feature/004.php |   7 +
 user_guide_src/source/testing/feature/005.php |  13 +
 user_guide_src/source/testing/feature/006.php |   7 +
 user_guide_src/source/testing/feature/007.php |   3 +
 user_guide_src/source/testing/feature/008.php |   7 +
 user_guide_src/source/testing/mocking.rst     |  21 +-
 user_guide_src/source/testing/mocking/001.php |   3 +
 user_guide_src/source/testing/mocking/002.php |   5 +
 user_guide_src/source/testing/mocking/003.php |  10 +
 user_guide_src/source/testing/overview.rst    | 230 ++---
 .../source/testing/overview/001.php           |  13 +
 .../source/testing/overview/002.php           |  13 +
 .../source/testing/overview/003.php           |   6 +
 .../source/testing/overview/004.php           |   7 +
 .../source/testing/overview/005.php           |   8 +
 .../source/testing/overview/006.php           |  12 +
 .../source/testing/overview/007.php           |  15 +
 .../source/testing/overview/008.php           |   9 +
 .../source/testing/overview/009.php           |   9 +
 .../source/testing/overview/010.php           |   9 +
 .../source/testing/overview/011.php           |   9 +
 .../source/testing/overview/012.php           |   5 +
 .../source/testing/overview/013.php           |   5 +
 .../source/testing/overview/014.php           |  10 +
 .../source/testing/overview/015.php           |   7 +
 .../source/testing/overview/016.php           |   9 +
 .../source/testing/overview/017.php           |  11 +
 .../source/testing/overview/018.php           |   9 +
 .../source/testing/overview/019.php           |  19 +
 user_guide_src/source/testing/response.rst    | 217 ++---
 .../source/testing/response/001.php           |   4 +
 .../source/testing/response/002.php           |   3 +
 .../source/testing/response/003.php           |   3 +
 .../source/testing/response/004.php           |   5 +
 .../source/testing/response/005.php           |   3 +
 .../source/testing/response/006.php           |   5 +
 .../source/testing/response/007.php           |   3 +
 .../source/testing/response/008.php           |   3 +
 .../source/testing/response/009.php           |   4 +
 .../source/testing/response/010.php           |   3 +
 .../source/testing/response/011.php           |   3 +
 .../source/testing/response/012.php           |   3 +
 .../source/testing/response/013.php           |   3 +
 .../source/testing/response/014.php           |   3 +
 .../source/testing/response/015.php           |   3 +
 .../source/testing/response/016.php           |   3 +
 .../source/testing/response/017.php           |   3 +
 .../source/testing/response/018.php           |  10 +
 .../source/testing/response/019.php           |   6 +
 .../source/testing/response/020.php           |   8 +
 .../source/testing/response/021.php           |   6 +
 .../source/testing/response/022.php           |   6 +
 .../source/testing/response/023.php           |   6 +
 .../source/testing/response/024.php           |  10 +
 .../source/testing/response/025.php           |   6 +
 .../source/testing/response/026.php           |   6 +
 .../source/testing/response/027.php           |   4 +
 .../source/testing/response/028.php           |   6 +
 .../source/testing/response/029.php           |   6 +
 .../source/testing/response/030.php           |  11 +
 .../source/testing/response/031.php           |   4 +
 .../source/testing/response/032.php           |   9 +
 .../source/tutorial/create_news_items.rst     |  55 +-
 .../source/tutorial/create_news_items/001.php |   5 +
 .../source/tutorial/create_news_items/002.php |  23 +
 .../source/tutorial/create_news_items/003.php |  12 +
 .../source/tutorial/create_news_items/004.php |   6 +
 user_guide_src/source/tutorial/index.rst      |   2 -
 .../source/tutorial/news_section.rst          | 125 +--
 .../source/tutorial/news_section/001.php      |  10 +
 .../source/tutorial/news_section/002.php      |  10 +
 .../source/tutorial/news_section/003.php      |  22 +
 .../source/tutorial/news_section/004.php      |  15 +
 .../source/tutorial/news_section/005.php      |  22 +
 .../source/tutorial/news_section/006.php      |  18 +
 .../source/tutorial/news_section/007.php      |   2 +
 .../source/tutorial/news_section/008.php      |   5 +
 .../source/tutorial/static_pages.rst          |  56 +-
 .../source/tutorial/static_pages/001.php      |  16 +
 .../source/tutorial/static_pages/002.php      |  15 +
 .../source/tutorial/static_pages/003.php      |   3 +
 .../source/tutorial/static_pages/004.php      |   3 +
 1570 files changed, 14360 insertions(+), 9352 deletions(-)
 create mode 100644 user_guide_src/source/cli/cli/001.php
 create mode 100644 user_guide_src/source/cli/cli/002.php
 create mode 100644 user_guide_src/source/cli/cli_commands/001.php
 create mode 100644 user_guide_src/source/cli/cli_commands/002.php
 create mode 100644 user_guide_src/source/cli/cli_commands/003.php
 create mode 100644 user_guide_src/source/cli/cli_commands/004.php
 create mode 100644 user_guide_src/source/cli/cli_commands/005.php
 create mode 100644 user_guide_src/source/cli/cli_commands/006.php
 create mode 100644 user_guide_src/source/cli/cli_commands/007.php
 create mode 100644 user_guide_src/source/cli/cli_library/001.php
 create mode 100644 user_guide_src/source/cli/cli_library/002.php
 create mode 100644 user_guide_src/source/cli/cli_library/003.php
 create mode 100644 user_guide_src/source/cli/cli_library/004.php
 create mode 100644 user_guide_src/source/cli/cli_library/005.php
 create mode 100644 user_guide_src/source/cli/cli_library/006.php
 create mode 100644 user_guide_src/source/cli/cli_library/007.php
 create mode 100644 user_guide_src/source/cli/cli_library/008.php
 create mode 100644 user_guide_src/source/cli/cli_library/009.php
 create mode 100644 user_guide_src/source/cli/cli_library/010.php
 create mode 100644 user_guide_src/source/cli/cli_library/011.php
 create mode 100644 user_guide_src/source/cli/cli_library/012.php
 create mode 100644 user_guide_src/source/cli/cli_library/013.php
 create mode 100644 user_guide_src/source/cli/cli_library/014.php
 create mode 100644 user_guide_src/source/cli/cli_library/015.php
 create mode 100644 user_guide_src/source/cli/cli_library/016.php
 create mode 100644 user_guide_src/source/cli/cli_library/017.php
 create mode 100644 user_guide_src/source/cli/cli_library/018.php
 create mode 100644 user_guide_src/source/cli/cli_library/019.php
 create mode 100644 user_guide_src/source/cli/cli_library/020.php
 create mode 100644 user_guide_src/source/cli/cli_library/021.php
 create mode 100644 user_guide_src/source/cli/cli_library/022.php
 create mode 100644 user_guide_src/source/cli/cli_request/001.php
 create mode 100644 user_guide_src/source/cli/cli_request/002.php
 create mode 100644 user_guide_src/source/cli/cli_request/003.php
 create mode 100644 user_guide_src/source/cli/cli_request/004.php
 create mode 100644 user_guide_src/source/cli/cli_request/005.php
 create mode 100644 user_guide_src/source/cli/cli_request/006.php
 create mode 100644 user_guide_src/source/concepts/autoloader/001.php
 create mode 100644 user_guide_src/source/concepts/autoloader/002.php
 create mode 100644 user_guide_src/source/concepts/autoloader/003.php
 create mode 100644 user_guide_src/source/concepts/factories/001.php
 create mode 100644 user_guide_src/source/concepts/factories/002.php
 create mode 100644 user_guide_src/source/concepts/factories/003.php
 create mode 100644 user_guide_src/source/concepts/factories/004.php
 create mode 100644 user_guide_src/source/concepts/factories/005.php
 create mode 100644 user_guide_src/source/concepts/factories/006.php
 create mode 100644 user_guide_src/source/concepts/factories/007.php
 create mode 100644 user_guide_src/source/concepts/http/001.php
 create mode 100644 user_guide_src/source/concepts/http/002.php
 create mode 100644 user_guide_src/source/concepts/services/001.php
 create mode 100644 user_guide_src/source/concepts/services/002.php
 create mode 100644 user_guide_src/source/concepts/services/003.php
 create mode 100644 user_guide_src/source/concepts/services/004.php
 create mode 100644 user_guide_src/source/concepts/services/005.php
 create mode 100644 user_guide_src/source/concepts/services/006.php
 create mode 100644 user_guide_src/source/concepts/services/007.php
 create mode 100644 user_guide_src/source/concepts/services/008.php
 create mode 100644 user_guide_src/source/concepts/services/009.php
 create mode 100644 user_guide_src/source/concepts/services/010.php
 create mode 100644 user_guide_src/source/concepts/services/011.php
 create mode 100644 user_guide_src/source/concepts/services/012.php
 create mode 100644 user_guide_src/source/database/call_function/001.php
 create mode 100644 user_guide_src/source/database/call_function/002.php
 create mode 100644 user_guide_src/source/database/call_function/003.php
 create mode 100644 user_guide_src/source/database/call_function/004.php
 create mode 100644 user_guide_src/source/database/configuration/001.php
 create mode 100644 user_guide_src/source/database/configuration/002.php
 create mode 100644 user_guide_src/source/database/configuration/003.php
 create mode 100644 user_guide_src/source/database/configuration/004.php
 create mode 100644 user_guide_src/source/database/configuration/005.php
 create mode 100644 user_guide_src/source/database/configuration/006.php
 create mode 100644 user_guide_src/source/database/configuration/007.php
 create mode 100644 user_guide_src/source/database/configuration/008.php
 create mode 100644 user_guide_src/source/database/configuration/009.php
 create mode 100644 user_guide_src/source/database/connecting/001.php
 create mode 100644 user_guide_src/source/database/connecting/002.php
 create mode 100644 user_guide_src/source/database/connecting/003.php
 create mode 100644 user_guide_src/source/database/connecting/004.php
 create mode 100644 user_guide_src/source/database/connecting/005.php
 create mode 100644 user_guide_src/source/database/connecting/006.php
 create mode 100644 user_guide_src/source/database/connecting/007.php
 create mode 100644 user_guide_src/source/database/connecting/008.php
 create mode 100644 user_guide_src/source/database/events/001.php
 create mode 100644 user_guide_src/source/database/examples/001.php
 create mode 100644 user_guide_src/source/database/examples/002.php
 create mode 100644 user_guide_src/source/database/examples/003.php
 create mode 100644 user_guide_src/source/database/examples/004.php
 create mode 100644 user_guide_src/source/database/examples/005.php
 create mode 100644 user_guide_src/source/database/examples/006.php
 create mode 100644 user_guide_src/source/database/examples/007.php
 create mode 100644 user_guide_src/source/database/examples/008.php
 create mode 100644 user_guide_src/source/database/helpers/001.php
 create mode 100644 user_guide_src/source/database/helpers/002.php
 create mode 100644 user_guide_src/source/database/helpers/003.php
 create mode 100644 user_guide_src/source/database/helpers/004.php
 create mode 100644 user_guide_src/source/database/metadata/001.php
 create mode 100644 user_guide_src/source/database/metadata/002.php
 create mode 100644 user_guide_src/source/database/metadata/003.php
 create mode 100644 user_guide_src/source/database/metadata/004.php
 create mode 100644 user_guide_src/source/database/metadata/005.php
 create mode 100644 user_guide_src/source/database/metadata/006.php
 create mode 100644 user_guide_src/source/database/metadata/007.php
 create mode 100644 user_guide_src/source/database/metadata/008.php
 create mode 100644 user_guide_src/source/database/metadata/009.php
 create mode 100644 user_guide_src/source/database/queries/001.php
 create mode 100644 user_guide_src/source/database/queries/002.php
 create mode 100644 user_guide_src/source/database/queries/003.php
 create mode 100644 user_guide_src/source/database/queries/004.php
 create mode 100644 user_guide_src/source/database/queries/005.php
 create mode 100644 user_guide_src/source/database/queries/006.php
 create mode 100644 user_guide_src/source/database/queries/007.php
 create mode 100644 user_guide_src/source/database/queries/008.php
 create mode 100644 user_guide_src/source/database/queries/009.php
 create mode 100644 user_guide_src/source/database/queries/010.php
 create mode 100644 user_guide_src/source/database/queries/011.php
 create mode 100644 user_guide_src/source/database/queries/012.php
 create mode 100644 user_guide_src/source/database/queries/013.php
 create mode 100644 user_guide_src/source/database/queries/014.php
 create mode 100644 user_guide_src/source/database/queries/015.php
 create mode 100644 user_guide_src/source/database/queries/016.php
 create mode 100644 user_guide_src/source/database/queries/017.php
 create mode 100644 user_guide_src/source/database/queries/018.php
 create mode 100644 user_guide_src/source/database/queries/019.php
 create mode 100644 user_guide_src/source/database/queries/020.php
 create mode 100644 user_guide_src/source/database/queries/021.php
 create mode 100644 user_guide_src/source/database/queries/022.php
 create mode 100644 user_guide_src/source/database/queries/023.php
 create mode 100644 user_guide_src/source/database/queries/024.php
 create mode 100644 user_guide_src/source/database/queries/025.php
 create mode 100644 user_guide_src/source/database/queries/026.php
 create mode 100644 user_guide_src/source/database/queries/027.php
 create mode 100644 user_guide_src/source/database/queries/028.php
 create mode 100644 user_guide_src/source/database/queries/029.php
 create mode 100644 user_guide_src/source/database/query_builder/001.php
 create mode 100644 user_guide_src/source/database/query_builder/002.php
 create mode 100644 user_guide_src/source/database/query_builder/003.php
 create mode 100644 user_guide_src/source/database/query_builder/004.php
 create mode 100644 user_guide_src/source/database/query_builder/005.php
 create mode 100644 user_guide_src/source/database/query_builder/006.php
 create mode 100644 user_guide_src/source/database/query_builder/007.php
 create mode 100644 user_guide_src/source/database/query_builder/008.php
 create mode 100644 user_guide_src/source/database/query_builder/009.php
 create mode 100644 user_guide_src/source/database/query_builder/010.php
 create mode 100644 user_guide_src/source/database/query_builder/011.php
 create mode 100644 user_guide_src/source/database/query_builder/012.php
 create mode 100644 user_guide_src/source/database/query_builder/013.php
 create mode 100644 user_guide_src/source/database/query_builder/014.php
 create mode 100644 user_guide_src/source/database/query_builder/015.php
 create mode 100644 user_guide_src/source/database/query_builder/016.php
 create mode 100644 user_guide_src/source/database/query_builder/017.php
 create mode 100644 user_guide_src/source/database/query_builder/018.php
 create mode 100644 user_guide_src/source/database/query_builder/019.php
 create mode 100644 user_guide_src/source/database/query_builder/020.php
 create mode 100644 user_guide_src/source/database/query_builder/021.php
 create mode 100644 user_guide_src/source/database/query_builder/022.php
 create mode 100644 user_guide_src/source/database/query_builder/023.php
 create mode 100644 user_guide_src/source/database/query_builder/024.php
 create mode 100644 user_guide_src/source/database/query_builder/025.php
 create mode 100644 user_guide_src/source/database/query_builder/026.php
 create mode 100644 user_guide_src/source/database/query_builder/027.php
 create mode 100644 user_guide_src/source/database/query_builder/028.php
 create mode 100644 user_guide_src/source/database/query_builder/029.php
 create mode 100644 user_guide_src/source/database/query_builder/030.php
 create mode 100644 user_guide_src/source/database/query_builder/031.php
 create mode 100644 user_guide_src/source/database/query_builder/032.php
 create mode 100644 user_guide_src/source/database/query_builder/033.php
 create mode 100644 user_guide_src/source/database/query_builder/034.php
 create mode 100644 user_guide_src/source/database/query_builder/035.php
 create mode 100644 user_guide_src/source/database/query_builder/036.php
 create mode 100644 user_guide_src/source/database/query_builder/037.php
 create mode 100644 user_guide_src/source/database/query_builder/038.php
 create mode 100644 user_guide_src/source/database/query_builder/039.php
 create mode 100644 user_guide_src/source/database/query_builder/040.php
 create mode 100644 user_guide_src/source/database/query_builder/041.php
 create mode 100644 user_guide_src/source/database/query_builder/042.php
 create mode 100644 user_guide_src/source/database/query_builder/043.php
 create mode 100644 user_guide_src/source/database/query_builder/044.php
 create mode 100644 user_guide_src/source/database/query_builder/045.php
 create mode 100644 user_guide_src/source/database/query_builder/046.php
 create mode 100644 user_guide_src/source/database/query_builder/047.php
 create mode 100644 user_guide_src/source/database/query_builder/048.php
 create mode 100644 user_guide_src/source/database/query_builder/049.php
 create mode 100644 user_guide_src/source/database/query_builder/050.php
 create mode 100644 user_guide_src/source/database/query_builder/051.php
 create mode 100644 user_guide_src/source/database/query_builder/052.php
 create mode 100644 user_guide_src/source/database/query_builder/053.php
 create mode 100644 user_guide_src/source/database/query_builder/054.php
 create mode 100644 user_guide_src/source/database/query_builder/055.php
 create mode 100644 user_guide_src/source/database/query_builder/056.php
 create mode 100644 user_guide_src/source/database/query_builder/057.php
 create mode 100644 user_guide_src/source/database/query_builder/058.php
 create mode 100644 user_guide_src/source/database/query_builder/059.php
 create mode 100644 user_guide_src/source/database/query_builder/060.php
 create mode 100644 user_guide_src/source/database/query_builder/061.php
 create mode 100644 user_guide_src/source/database/query_builder/062.php
 create mode 100644 user_guide_src/source/database/query_builder/063.php
 create mode 100644 user_guide_src/source/database/query_builder/064.php
 create mode 100644 user_guide_src/source/database/query_builder/065.php
 create mode 100644 user_guide_src/source/database/query_builder/066.php
 create mode 100644 user_guide_src/source/database/query_builder/067.php
 create mode 100644 user_guide_src/source/database/query_builder/068.php
 create mode 100644 user_guide_src/source/database/query_builder/069.php
 create mode 100644 user_guide_src/source/database/query_builder/070.php
 create mode 100644 user_guide_src/source/database/query_builder/071.php
 create mode 100644 user_guide_src/source/database/query_builder/072.php
 create mode 100644 user_guide_src/source/database/query_builder/073.php
 create mode 100644 user_guide_src/source/database/query_builder/074.php
 create mode 100644 user_guide_src/source/database/query_builder/075.php
 create mode 100644 user_guide_src/source/database/query_builder/076.php
 create mode 100644 user_guide_src/source/database/query_builder/077.php
 create mode 100644 user_guide_src/source/database/query_builder/078.php
 create mode 100644 user_guide_src/source/database/query_builder/079.php
 create mode 100644 user_guide_src/source/database/query_builder/080.php
 create mode 100644 user_guide_src/source/database/query_builder/081.php
 create mode 100644 user_guide_src/source/database/query_builder/082.php
 create mode 100644 user_guide_src/source/database/query_builder/083.php
 create mode 100644 user_guide_src/source/database/query_builder/084.php
 create mode 100644 user_guide_src/source/database/query_builder/085.php
 create mode 100644 user_guide_src/source/database/query_builder/086.php
 create mode 100644 user_guide_src/source/database/query_builder/087.php
 create mode 100644 user_guide_src/source/database/query_builder/088.php
 create mode 100644 user_guide_src/source/database/query_builder/089.php
 create mode 100644 user_guide_src/source/database/query_builder/090.php
 create mode 100644 user_guide_src/source/database/query_builder/091.php
 create mode 100644 user_guide_src/source/database/query_builder/092.php
 create mode 100644 user_guide_src/source/database/query_builder/093.php
 create mode 100644 user_guide_src/source/database/query_builder/094.php
 create mode 100644 user_guide_src/source/database/query_builder/095.php
 create mode 100644 user_guide_src/source/database/query_builder/096.php
 create mode 100644 user_guide_src/source/database/query_builder/097.php
 create mode 100644 user_guide_src/source/database/results/001.php
 create mode 100644 user_guide_src/source/database/results/002.php
 create mode 100644 user_guide_src/source/database/results/003.php
 create mode 100644 user_guide_src/source/database/results/004.php
 create mode 100644 user_guide_src/source/database/results/005.php
 create mode 100644 user_guide_src/source/database/results/006.php
 create mode 100644 user_guide_src/source/database/results/007.php
 create mode 100644 user_guide_src/source/database/results/008.php
 create mode 100644 user_guide_src/source/database/results/009.php
 create mode 100644 user_guide_src/source/database/results/010.php
 create mode 100644 user_guide_src/source/database/results/011.php
 create mode 100644 user_guide_src/source/database/results/012.php
 create mode 100644 user_guide_src/source/database/results/013.php
 create mode 100644 user_guide_src/source/database/results/014.php
 create mode 100644 user_guide_src/source/database/results/015.php
 create mode 100644 user_guide_src/source/database/results/016.php
 create mode 100644 user_guide_src/source/database/results/017.php
 create mode 100644 user_guide_src/source/database/results/018.php
 create mode 100644 user_guide_src/source/database/results/019.php
 create mode 100644 user_guide_src/source/database/results/020.php
 create mode 100644 user_guide_src/source/database/results/021.php
 create mode 100644 user_guide_src/source/database/transactions/001.php
 create mode 100644 user_guide_src/source/database/transactions/002.php
 create mode 100644 user_guide_src/source/database/transactions/003.php
 create mode 100644 user_guide_src/source/database/transactions/004.php
 create mode 100644 user_guide_src/source/database/transactions/005.php
 create mode 100644 user_guide_src/source/database/transactions/006.php
 create mode 100644 user_guide_src/source/database/utilities/001.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/001.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/002.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/003.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/004.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/005.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/006.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/007.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/008.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/009.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/010.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/011.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/012.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/013.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/014.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/015.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/016.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/017.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/018.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/019.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/020.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/021.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/022.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/023.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/024.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/025.php
 create mode 100644 user_guide_src/source/dbmgmt/forge/026.php
 create mode 100644 user_guide_src/source/dbmgmt/migration/001.php
 create mode 100644 user_guide_src/source/dbmgmt/migration/002.php
 create mode 100644 user_guide_src/source/dbmgmt/migration/003.php
 create mode 100644 user_guide_src/source/dbmgmt/migration/004.php
 create mode 100644 user_guide_src/source/dbmgmt/migration/005.php
 create mode 100644 user_guide_src/source/dbmgmt/migration/006.php
 create mode 100644 user_guide_src/source/dbmgmt/migration/007.php
 create mode 100644 user_guide_src/source/dbmgmt/migration/008.php
 create mode 100644 user_guide_src/source/dbmgmt/seeds/001.php
 create mode 100644 user_guide_src/source/dbmgmt/seeds/002.php
 create mode 100644 user_guide_src/source/dbmgmt/seeds/003.php
 create mode 100644 user_guide_src/source/dbmgmt/seeds/004.php
 create mode 100644 user_guide_src/source/extending/basecontroller/001.php
 create mode 100644 user_guide_src/source/extending/basecontroller/002.php
 create mode 100644 user_guide_src/source/extending/basecontroller/003.php
 create mode 100644 user_guide_src/source/extending/basecontroller/004.php
 create mode 100644 user_guide_src/source/extending/core_classes/001.php
 create mode 100644 user_guide_src/source/extending/core_classes/002.php
 create mode 100644 user_guide_src/source/extending/core_classes/003.php
 create mode 100644 user_guide_src/source/extending/core_classes/004.php
 create mode 100644 user_guide_src/source/extending/events/001.php
 create mode 100644 user_guide_src/source/extending/events/002.php
 create mode 100644 user_guide_src/source/extending/events/003.php
 create mode 100644 user_guide_src/source/extending/events/004.php
 create mode 100644 user_guide_src/source/extending/events/005.php
 create mode 100644 user_guide_src/source/extending/events/006.php
 create mode 100644 user_guide_src/source/extending/events/007.php
 create mode 100644 user_guide_src/source/extending/events/008.php
 create mode 100644 user_guide_src/source/general/caching/001.php
 create mode 100644 user_guide_src/source/general/common_functions/001.php
 create mode 100644 user_guide_src/source/general/common_functions/002.php
 create mode 100644 user_guide_src/source/general/common_functions/003.php
 create mode 100644 user_guide_src/source/general/common_functions/004.php
 create mode 100644 user_guide_src/source/general/common_functions/005.php
 create mode 100644 user_guide_src/source/general/common_functions/006.php
 create mode 100644 user_guide_src/source/general/common_functions/007.php
 create mode 100644 user_guide_src/source/general/common_functions/008.php
 create mode 100644 user_guide_src/source/general/configuration/001.php
 create mode 100644 user_guide_src/source/general/configuration/002.php
 create mode 100644 user_guide_src/source/general/configuration/003.php
 create mode 100644 user_guide_src/source/general/configuration/004.php
 create mode 100644 user_guide_src/source/general/configuration/005.php
 create mode 100644 user_guide_src/source/general/configuration/006.php
 create mode 100644 user_guide_src/source/general/configuration/007.php
 create mode 100644 user_guide_src/source/general/configuration/008.php
 create mode 100644 user_guide_src/source/general/configuration/009.php
 create mode 100644 user_guide_src/source/general/configuration/010.php
 create mode 100644 user_guide_src/source/general/configuration/011.php
 create mode 100644 user_guide_src/source/general/errors/001.php
 create mode 100644 user_guide_src/source/general/errors/002.php
 create mode 100644 user_guide_src/source/general/errors/003.php
 create mode 100644 user_guide_src/source/general/errors/004.php
 create mode 100644 user_guide_src/source/general/errors/005.php
 create mode 100644 user_guide_src/source/general/errors/006.php
 create mode 100644 user_guide_src/source/general/errors/007.php
 create mode 100644 user_guide_src/source/general/errors/008.php
 create mode 100644 user_guide_src/source/general/errors/009.php
 create mode 100644 user_guide_src/source/general/errors/010.php
 create mode 100644 user_guide_src/source/general/errors/011.php
 create mode 100644 user_guide_src/source/general/helpers/001.php
 create mode 100644 user_guide_src/source/general/helpers/002.php
 create mode 100644 user_guide_src/source/general/helpers/003.php
 create mode 100644 user_guide_src/source/general/helpers/004.php
 create mode 100644 user_guide_src/source/general/helpers/005.php
 create mode 100644 user_guide_src/source/general/helpers/006.php
 create mode 100644 user_guide_src/source/general/logging/001.php
 create mode 100644 user_guide_src/source/general/logging/002.php
 create mode 100644 user_guide_src/source/general/logging/003.php
 create mode 100644 user_guide_src/source/general/logging/004.php
 create mode 100644 user_guide_src/source/general/logging/005.php
 create mode 100644 user_guide_src/source/general/logging/006.php
 create mode 100644 user_guide_src/source/general/managing_apps/001.php
 create mode 100644 user_guide_src/source/general/managing_apps/002.php
 create mode 100644 user_guide_src/source/general/managing_apps/003.php
 create mode 100644 user_guide_src/source/general/managing_apps/004.php
 create mode 100644 user_guide_src/source/general/modules/001.php
 create mode 100644 user_guide_src/source/general/modules/002.php
 create mode 100644 user_guide_src/source/general/modules/003.php
 create mode 100644 user_guide_src/source/general/modules/004.php
 create mode 100644 user_guide_src/source/general/modules/005.php
 create mode 100644 user_guide_src/source/general/modules/006.php
 create mode 100644 user_guide_src/source/general/modules/007.php
 create mode 100644 user_guide_src/source/general/modules/008.php
 create mode 100644 user_guide_src/source/general/modules/009.php
 create mode 100644 user_guide_src/source/general/modules/010.php
 create mode 100644 user_guide_src/source/general/modules/011.php
 create mode 100644 user_guide_src/source/general/modules/012.php
 create mode 100644 user_guide_src/source/helpers/array_helper/001.php
 create mode 100644 user_guide_src/source/helpers/array_helper/002.php
 create mode 100644 user_guide_src/source/helpers/array_helper/003.php
 create mode 100644 user_guide_src/source/helpers/array_helper/004.php
 create mode 100644 user_guide_src/source/helpers/array_helper/005.php
 create mode 100644 user_guide_src/source/helpers/array_helper/006.php
 create mode 100644 user_guide_src/source/helpers/array_helper/007.php
 create mode 100644 user_guide_src/source/helpers/array_helper/008.php
 create mode 100644 user_guide_src/source/helpers/array_helper/009.php
 create mode 100644 user_guide_src/source/helpers/array_helper/010.php
 create mode 100644 user_guide_src/source/helpers/array_helper/011.php
 create mode 100644 user_guide_src/source/helpers/cookie_helper/001.php
 create mode 100644 user_guide_src/source/helpers/cookie_helper/002.php
 create mode 100644 user_guide_src/source/helpers/cookie_helper/003.php
 create mode 100644 user_guide_src/source/helpers/date_helper/001.php
 create mode 100644 user_guide_src/source/helpers/date_helper/002.php
 create mode 100644 user_guide_src/source/helpers/date_helper/003.php
 create mode 100644 user_guide_src/source/helpers/filesystem_helper/001.php
 create mode 100644 user_guide_src/source/helpers/filesystem_helper/002.php
 create mode 100644 user_guide_src/source/helpers/filesystem_helper/003.php
 create mode 100644 user_guide_src/source/helpers/filesystem_helper/004.php
 create mode 100644 user_guide_src/source/helpers/filesystem_helper/005.php
 create mode 100644 user_guide_src/source/helpers/filesystem_helper/006.php
 create mode 100644 user_guide_src/source/helpers/filesystem_helper/007.php
 create mode 100644 user_guide_src/source/helpers/filesystem_helper/008.php
 create mode 100644 user_guide_src/source/helpers/filesystem_helper/009.php
 create mode 100644 user_guide_src/source/helpers/filesystem_helper/010.php
 create mode 100644 user_guide_src/source/helpers/filesystem_helper/011.php
 create mode 100644 user_guide_src/source/helpers/filesystem_helper/012.php
 create mode 100644 user_guide_src/source/helpers/filesystem_helper/013.php
 create mode 100644 user_guide_src/source/helpers/filesystem_helper/014.php
 create mode 100644 user_guide_src/source/helpers/filesystem_helper/015.php
 create mode 100644 user_guide_src/source/helpers/form_helper/001.php
 create mode 100644 user_guide_src/source/helpers/form_helper/002.php
 create mode 100644 user_guide_src/source/helpers/form_helper/003.php
 create mode 100644 user_guide_src/source/helpers/form_helper/004.php
 create mode 100644 user_guide_src/source/helpers/form_helper/005.php
 create mode 100644 user_guide_src/source/helpers/form_helper/006.php
 create mode 100644 user_guide_src/source/helpers/form_helper/007.php
 create mode 100644 user_guide_src/source/helpers/form_helper/008.php
 create mode 100644 user_guide_src/source/helpers/form_helper/009.php
 create mode 100644 user_guide_src/source/helpers/form_helper/010.php
 create mode 100644 user_guide_src/source/helpers/form_helper/011.php
 create mode 100644 user_guide_src/source/helpers/form_helper/012.php
 create mode 100644 user_guide_src/source/helpers/form_helper/013.php
 create mode 100644 user_guide_src/source/helpers/form_helper/014.php
 create mode 100644 user_guide_src/source/helpers/form_helper/015.php
 create mode 100644 user_guide_src/source/helpers/form_helper/016.php
 create mode 100644 user_guide_src/source/helpers/form_helper/017.php
 create mode 100644 user_guide_src/source/helpers/form_helper/018.php
 create mode 100644 user_guide_src/source/helpers/form_helper/019.php
 create mode 100644 user_guide_src/source/helpers/form_helper/020.php
 create mode 100644 user_guide_src/source/helpers/form_helper/021.php
 create mode 100644 user_guide_src/source/helpers/form_helper/022.php
 create mode 100644 user_guide_src/source/helpers/form_helper/023.php
 create mode 100644 user_guide_src/source/helpers/form_helper/024.php
 create mode 100644 user_guide_src/source/helpers/form_helper/025.php
 create mode 100644 user_guide_src/source/helpers/form_helper/026.php
 create mode 100644 user_guide_src/source/helpers/form_helper/027.php
 create mode 100644 user_guide_src/source/helpers/form_helper/028.php
 create mode 100644 user_guide_src/source/helpers/form_helper/029.php
 create mode 100644 user_guide_src/source/helpers/form_helper/030.php
 create mode 100644 user_guide_src/source/helpers/form_helper/031.php
 create mode 100644 user_guide_src/source/helpers/form_helper/032.php
 create mode 100644 user_guide_src/source/helpers/form_helper/033.php
 create mode 100644 user_guide_src/source/helpers/form_helper/034.php
 create mode 100644 user_guide_src/source/helpers/html_helper/001.php
 create mode 100644 user_guide_src/source/helpers/html_helper/002.php
 create mode 100644 user_guide_src/source/helpers/html_helper/003.php
 create mode 100644 user_guide_src/source/helpers/html_helper/004.php
 create mode 100644 user_guide_src/source/helpers/html_helper/005.php
 create mode 100644 user_guide_src/source/helpers/html_helper/006.php
 create mode 100644 user_guide_src/source/helpers/html_helper/007.php
 create mode 100644 user_guide_src/source/helpers/html_helper/008.php
 create mode 100644 user_guide_src/source/helpers/html_helper/009.php
 create mode 100644 user_guide_src/source/helpers/html_helper/010.php
 create mode 100644 user_guide_src/source/helpers/html_helper/011.php
 create mode 100644 user_guide_src/source/helpers/html_helper/012.php
 create mode 100644 user_guide_src/source/helpers/html_helper/013.php
 create mode 100644 user_guide_src/source/helpers/html_helper/014.php
 create mode 100644 user_guide_src/source/helpers/html_helper/015.php
 create mode 100644 user_guide_src/source/helpers/html_helper/016.php
 create mode 100644 user_guide_src/source/helpers/html_helper/017.php
 create mode 100644 user_guide_src/source/helpers/html_helper/018.php
 create mode 100644 user_guide_src/source/helpers/html_helper/019.php
 create mode 100644 user_guide_src/source/helpers/html_helper/020.php
 create mode 100644 user_guide_src/source/helpers/inflector_helper/001.php
 create mode 100644 user_guide_src/source/helpers/inflector_helper/002.php
 create mode 100644 user_guide_src/source/helpers/inflector_helper/003.php
 create mode 100644 user_guide_src/source/helpers/inflector_helper/004.php
 create mode 100644 user_guide_src/source/helpers/inflector_helper/005.php
 create mode 100644 user_guide_src/source/helpers/inflector_helper/006.php
 create mode 100644 user_guide_src/source/helpers/inflector_helper/007.php
 create mode 100644 user_guide_src/source/helpers/inflector_helper/008.php
 create mode 100644 user_guide_src/source/helpers/inflector_helper/009.php
 create mode 100644 user_guide_src/source/helpers/inflector_helper/010.php
 create mode 100644 user_guide_src/source/helpers/inflector_helper/011.php
 create mode 100644 user_guide_src/source/helpers/inflector_helper/012.php
 create mode 100644 user_guide_src/source/helpers/inflector_helper/013.php
 create mode 100644 user_guide_src/source/helpers/number_helper/001.php
 create mode 100644 user_guide_src/source/helpers/number_helper/002.php
 create mode 100644 user_guide_src/source/helpers/number_helper/003.php
 create mode 100644 user_guide_src/source/helpers/number_helper/004.php
 create mode 100644 user_guide_src/source/helpers/number_helper/005.php
 create mode 100644 user_guide_src/source/helpers/number_helper/006.php
 create mode 100644 user_guide_src/source/helpers/number_helper/007.php
 create mode 100644 user_guide_src/source/helpers/number_helper/008.php
 create mode 100644 user_guide_src/source/helpers/number_helper/009.php
 create mode 100644 user_guide_src/source/helpers/security_helper/001.php
 create mode 100644 user_guide_src/source/helpers/security_helper/002.php
 create mode 100644 user_guide_src/source/helpers/security_helper/003.php
 create mode 100644 user_guide_src/source/helpers/test_helper/001.php
 create mode 100644 user_guide_src/source/helpers/test_helper/002.php
 create mode 100644 user_guide_src/source/helpers/text_helper/001.php
 create mode 100644 user_guide_src/source/helpers/text_helper/002.php
 create mode 100644 user_guide_src/source/helpers/text_helper/003.php
 create mode 100644 user_guide_src/source/helpers/text_helper/004.php
 create mode 100644 user_guide_src/source/helpers/text_helper/005.php
 create mode 100644 user_guide_src/source/helpers/text_helper/006.php
 create mode 100644 user_guide_src/source/helpers/text_helper/007.php
 create mode 100644 user_guide_src/source/helpers/text_helper/008.php
 create mode 100644 user_guide_src/source/helpers/text_helper/009.php
 create mode 100644 user_guide_src/source/helpers/text_helper/010.php
 create mode 100644 user_guide_src/source/helpers/text_helper/011.php
 create mode 100644 user_guide_src/source/helpers/text_helper/012.php
 create mode 100644 user_guide_src/source/helpers/text_helper/013.php
 create mode 100644 user_guide_src/source/helpers/text_helper/014.php
 create mode 100644 user_guide_src/source/helpers/text_helper/015.php
 create mode 100644 user_guide_src/source/helpers/text_helper/016.php
 create mode 100644 user_guide_src/source/helpers/text_helper/017.php
 create mode 100644 user_guide_src/source/helpers/text_helper/018.php
 create mode 100644 user_guide_src/source/helpers/text_helper/019.php
 create mode 100644 user_guide_src/source/helpers/text_helper/020.php
 create mode 100644 user_guide_src/source/helpers/text_helper/021.php
 create mode 100644 user_guide_src/source/helpers/text_helper/022.php
 create mode 100644 user_guide_src/source/helpers/url_helper/001.php
 create mode 100644 user_guide_src/source/helpers/url_helper/002-2.php
 create mode 100644 user_guide_src/source/helpers/url_helper/002-3.php
 create mode 100644 user_guide_src/source/helpers/url_helper/002-4.php
 create mode 100644 user_guide_src/source/helpers/url_helper/002.php
 create mode 100644 user_guide_src/source/helpers/url_helper/003.php
 create mode 100644 user_guide_src/source/helpers/url_helper/004.php
 create mode 100644 user_guide_src/source/helpers/url_helper/005.php
 create mode 100644 user_guide_src/source/helpers/url_helper/006.php
 create mode 100644 user_guide_src/source/helpers/url_helper/007.php
 create mode 100644 user_guide_src/source/helpers/url_helper/008.php
 create mode 100644 user_guide_src/source/helpers/url_helper/009.php
 create mode 100644 user_guide_src/source/helpers/url_helper/010.php
 create mode 100644 user_guide_src/source/helpers/url_helper/011.php
 create mode 100644 user_guide_src/source/helpers/url_helper/012.php
 create mode 100644 user_guide_src/source/helpers/url_helper/013.php
 create mode 100644 user_guide_src/source/helpers/url_helper/014.php
 create mode 100644 user_guide_src/source/helpers/url_helper/015.php
 create mode 100644 user_guide_src/source/helpers/url_helper/016.php
 create mode 100644 user_guide_src/source/helpers/url_helper/017.php
 create mode 100644 user_guide_src/source/helpers/url_helper/018.php
 create mode 100644 user_guide_src/source/helpers/url_helper/019.php
 create mode 100644 user_guide_src/source/helpers/url_helper/020.php
 create mode 100644 user_guide_src/source/helpers/url_helper/021.php
 create mode 100644 user_guide_src/source/helpers/xml_helper/001.php
 create mode 100644 user_guide_src/source/helpers/xml_helper/002.php
 create mode 100644 user_guide_src/source/incoming/content_negotiation/001.php
 create mode 100644 user_guide_src/source/incoming/content_negotiation/002.php
 create mode 100644 user_guide_src/source/incoming/content_negotiation/003.php
 create mode 100644 user_guide_src/source/incoming/content_negotiation/004.php
 create mode 100644 user_guide_src/source/incoming/content_negotiation/005.php
 create mode 100644 user_guide_src/source/incoming/content_negotiation/006.php
 create mode 100644 user_guide_src/source/incoming/content_negotiation/007.php
 create mode 100644 user_guide_src/source/incoming/controllers/001.php
 create mode 100644 user_guide_src/source/incoming/controllers/002.php
 create mode 100644 user_guide_src/source/incoming/controllers/003.php
 create mode 100644 user_guide_src/source/incoming/controllers/004.php
 create mode 100644 user_guide_src/source/incoming/controllers/005.php
 create mode 100644 user_guide_src/source/incoming/controllers/006.php
 create mode 100644 user_guide_src/source/incoming/controllers/007.php
 create mode 100644 user_guide_src/source/incoming/controllers/008.php
 create mode 100644 user_guide_src/source/incoming/controllers/009.php
 create mode 100644 user_guide_src/source/incoming/controllers/010.php
 create mode 100644 user_guide_src/source/incoming/controllers/011.php
 create mode 100644 user_guide_src/source/incoming/controllers/012.php
 create mode 100644 user_guide_src/source/incoming/controllers/013.php
 create mode 100644 user_guide_src/source/incoming/controllers/014.php
 create mode 100644 user_guide_src/source/incoming/controllers/015.php
 create mode 100644 user_guide_src/source/incoming/controllers/016.php
 create mode 100644 user_guide_src/source/incoming/controllers/017.php
 create mode 100644 user_guide_src/source/incoming/controllers/018.php
 create mode 100644 user_guide_src/source/incoming/controllers/019.php
 create mode 100644 user_guide_src/source/incoming/filters/001.php
 create mode 100644 user_guide_src/source/incoming/filters/002.php
 create mode 100644 user_guide_src/source/incoming/filters/003.php
 create mode 100644 user_guide_src/source/incoming/filters/004.php
 create mode 100644 user_guide_src/source/incoming/filters/005.php
 create mode 100644 user_guide_src/source/incoming/filters/006.php
 create mode 100644 user_guide_src/source/incoming/filters/007.php
 create mode 100644 user_guide_src/source/incoming/filters/008.php
 create mode 100644 user_guide_src/source/incoming/filters/009.php
 create mode 100644 user_guide_src/source/incoming/filters/010.php
 create mode 100644 user_guide_src/source/incoming/filters/011.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/001.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/002.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/003.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/004.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/005.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/006.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/007.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/008.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/009.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/010.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/011.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/012.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/013.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/014.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/015.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/016.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/017.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/018.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/019.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/020.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/021.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/022.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/023.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/024.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/025.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/026.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/027.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/028.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/029.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/030.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/031.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/032.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/033.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/034.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/035.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/036.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/037.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/038.php
 create mode 100644 user_guide_src/source/incoming/incomingrequest/039.php
 create mode 100644 user_guide_src/source/incoming/message/001.php
 create mode 100644 user_guide_src/source/incoming/message/002.php
 create mode 100644 user_guide_src/source/incoming/message/003.php
 create mode 100644 user_guide_src/source/incoming/message/004.php
 create mode 100644 user_guide_src/source/incoming/message/005.php
 create mode 100644 user_guide_src/source/incoming/message/006.php
 create mode 100644 user_guide_src/source/incoming/message/007.php
 create mode 100644 user_guide_src/source/incoming/message/008.php
 create mode 100644 user_guide_src/source/incoming/message/009.php
 create mode 100644 user_guide_src/source/incoming/message/010.php
 create mode 100644 user_guide_src/source/incoming/request/001.php
 create mode 100644 user_guide_src/source/incoming/request/002.php
 create mode 100644 user_guide_src/source/incoming/request/003.php
 create mode 100644 user_guide_src/source/incoming/request/004.php
 create mode 100644 user_guide_src/source/incoming/request/005.php
 create mode 100644 user_guide_src/source/incoming/request/006.php
 create mode 100644 user_guide_src/source/incoming/request/007.php
 create mode 100644 user_guide_src/source/incoming/restful/001.php
 create mode 100644 user_guide_src/source/incoming/restful/002.php
 create mode 100644 user_guide_src/source/incoming/restful/003.php
 create mode 100644 user_guide_src/source/incoming/restful/004.php
 create mode 100644 user_guide_src/source/incoming/restful/005.php
 create mode 100644 user_guide_src/source/incoming/restful/006.php
 create mode 100644 user_guide_src/source/incoming/restful/007.php
 create mode 100644 user_guide_src/source/incoming/restful/008.php
 create mode 100644 user_guide_src/source/incoming/restful/009.php
 create mode 100644 user_guide_src/source/incoming/restful/010.php
 create mode 100644 user_guide_src/source/incoming/restful/011.php
 create mode 100644 user_guide_src/source/incoming/restful/012.php
 create mode 100644 user_guide_src/source/incoming/restful/013.php
 create mode 100644 user_guide_src/source/incoming/restful/014.php
 create mode 100644 user_guide_src/source/incoming/restful/015.php
 create mode 100644 user_guide_src/source/incoming/restful/016.php
 create mode 100644 user_guide_src/source/incoming/routing/000.php
 create mode 100644 user_guide_src/source/incoming/routing/001.php
 create mode 100644 user_guide_src/source/incoming/routing/002.php
 create mode 100644 user_guide_src/source/incoming/routing/003.php
 create mode 100644 user_guide_src/source/incoming/routing/004.php
 create mode 100644 user_guide_src/source/incoming/routing/005.php
 create mode 100644 user_guide_src/source/incoming/routing/006.php
 create mode 100644 user_guide_src/source/incoming/routing/007.php
 create mode 100644 user_guide_src/source/incoming/routing/008.php
 create mode 100644 user_guide_src/source/incoming/routing/009.php
 create mode 100644 user_guide_src/source/incoming/routing/010.php
 create mode 100644 user_guide_src/source/incoming/routing/011.php
 create mode 100644 user_guide_src/source/incoming/routing/012.php
 create mode 100644 user_guide_src/source/incoming/routing/013.php
 create mode 100644 user_guide_src/source/incoming/routing/014.php
 create mode 100644 user_guide_src/source/incoming/routing/015.php
 create mode 100644 user_guide_src/source/incoming/routing/016.php
 create mode 100644 user_guide_src/source/incoming/routing/017.php
 create mode 100644 user_guide_src/source/incoming/routing/018.php
 create mode 100644 user_guide_src/source/incoming/routing/019.php
 create mode 100644 user_guide_src/source/incoming/routing/020.php
 create mode 100644 user_guide_src/source/incoming/routing/021.php
 create mode 100644 user_guide_src/source/incoming/routing/022.php
 create mode 100644 user_guide_src/source/incoming/routing/023-2.php
 create mode 100644 user_guide_src/source/incoming/routing/023.php
 create mode 100644 user_guide_src/source/incoming/routing/024.php
 create mode 100644 user_guide_src/source/incoming/routing/025.php
 create mode 100644 user_guide_src/source/incoming/routing/026.php
 create mode 100644 user_guide_src/source/incoming/routing/027.php
 create mode 100644 user_guide_src/source/incoming/routing/028.php
 create mode 100644 user_guide_src/source/incoming/routing/029.php
 create mode 100644 user_guide_src/source/incoming/routing/030.php
 create mode 100644 user_guide_src/source/incoming/routing/031.php
 create mode 100644 user_guide_src/source/incoming/routing/032.php
 create mode 100644 user_guide_src/source/incoming/routing/033.php
 create mode 100644 user_guide_src/source/incoming/routing/034.php
 create mode 100644 user_guide_src/source/incoming/routing/035.php
 create mode 100644 user_guide_src/source/incoming/routing/036.php
 create mode 100644 user_guide_src/source/incoming/routing/037.php
 create mode 100644 user_guide_src/source/incoming/routing/038.php
 create mode 100644 user_guide_src/source/incoming/routing/039.php
 create mode 100644 user_guide_src/source/incoming/routing/040.php
 create mode 100644 user_guide_src/source/incoming/routing/041.php
 create mode 100644 user_guide_src/source/incoming/routing/042.php
 create mode 100644 user_guide_src/source/incoming/routing/043.php
 create mode 100644 user_guide_src/source/incoming/routing/044.php
 create mode 100644 user_guide_src/source/incoming/routing/045.php
 create mode 100644 user_guide_src/source/incoming/routing/046.php
 create mode 100644 user_guide_src/source/installation/troubleshooting/001.php
 create mode 100644 user_guide_src/source/installation/troubleshooting/002.php
 create mode 100644 user_guide_src/source/installation/upgrade_404/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_404/002.php
 create mode 100644 user_guide_src/source/installation/upgrade_412/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_412/002.php
 create mode 100644 user_guide_src/source/installation/upgrade_415/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_configuration/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_configuration/002.php
 create mode 100644 user_guide_src/source/installation/upgrade_controllers/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_controllers/002.php
 create mode 100644 user_guide_src/source/installation/upgrade_database/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_database/002.php
 create mode 100644 user_guide_src/source/installation/upgrade_emails/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_emails/002.php
 create mode 100644 user_guide_src/source/installation/upgrade_encryption/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_encryption/002.php
 create mode 100644 user_guide_src/source/installation/upgrade_file_upload/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_file_upload/002.php
 create mode 100644 user_guide_src/source/installation/upgrade_html_tables/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_html_tables/002.php
 create mode 100644 user_guide_src/source/installation/upgrade_localization/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_localization/002.php
 create mode 100644 user_guide_src/source/installation/upgrade_localization/003.php
 create mode 100644 user_guide_src/source/installation/upgrade_migrations/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_migrations/002.php
 create mode 100644 user_guide_src/source/installation/upgrade_models/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_models/002.php
 create mode 100644 user_guide_src/source/installation/upgrade_pagination/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_pagination/002.php
 create mode 100644 user_guide_src/source/installation/upgrade_responses/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_responses/002.php
 create mode 100644 user_guide_src/source/installation/upgrade_routing/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_routing/002.php
 create mode 100644 user_guide_src/source/installation/upgrade_security/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_security/002.php
 create mode 100644 user_guide_src/source/installation/upgrade_sessions/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_sessions/002.php
 create mode 100644 user_guide_src/source/installation/upgrade_validations/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_validations/002.php
 create mode 100644 user_guide_src/source/installation/upgrade_validations/003.php
 create mode 100644 user_guide_src/source/installation/upgrade_view_parser/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_view_parser/002.php
 create mode 100644 user_guide_src/source/installation/upgrade_views/001.php
 create mode 100644 user_guide_src/source/installation/upgrade_views/002.php
 create mode 100644 user_guide_src/source/libraries/caching/001.php
 create mode 100644 user_guide_src/source/libraries/caching/002.php
 create mode 100644 user_guide_src/source/libraries/caching/003.php
 create mode 100644 user_guide_src/source/libraries/caching/004.php
 create mode 100644 user_guide_src/source/libraries/caching/005.php
 create mode 100644 user_guide_src/source/libraries/caching/006.php
 create mode 100644 user_guide_src/source/libraries/caching/007.php
 create mode 100644 user_guide_src/source/libraries/caching/008.php
 create mode 100644 user_guide_src/source/libraries/caching/009.php
 create mode 100644 user_guide_src/source/libraries/caching/010.php
 create mode 100644 user_guide_src/source/libraries/caching/011.php
 create mode 100644 user_guide_src/source/libraries/caching/012.php
 create mode 100644 user_guide_src/source/libraries/caching/013.php
 create mode 100644 user_guide_src/source/libraries/caching/014.php
 create mode 100644 user_guide_src/source/libraries/cookies/001.php
 create mode 100644 user_guide_src/source/libraries/cookies/002.php
 create mode 100644 user_guide_src/source/libraries/cookies/003.php
 create mode 100644 user_guide_src/source/libraries/cookies/004.php
 create mode 100644 user_guide_src/source/libraries/cookies/005.php
 create mode 100644 user_guide_src/source/libraries/cookies/006.php
 create mode 100644 user_guide_src/source/libraries/cookies/007.php
 create mode 100644 user_guide_src/source/libraries/cookies/008.php
 create mode 100644 user_guide_src/source/libraries/cookies/009.php
 create mode 100644 user_guide_src/source/libraries/cookies/010.php
 create mode 100644 user_guide_src/source/libraries/cookies/011.php
 create mode 100644 user_guide_src/source/libraries/cookies/012.php
 create mode 100644 user_guide_src/source/libraries/cookies/013.php
 create mode 100644 user_guide_src/source/libraries/cookies/014.php
 create mode 100644 user_guide_src/source/libraries/cookies/015.php
 create mode 100644 user_guide_src/source/libraries/cookies/016.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/001.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/002.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/003.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/004.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/005.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/006.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/007.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/008.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/009.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/010.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/011.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/012.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/013.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/014.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/015.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/016.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/017.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/018.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/019.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/020.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/021.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/022.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/023.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/024.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/025.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/026.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/027.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/028.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/029.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/030.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/031.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/032.php
 create mode 100644 user_guide_src/source/libraries/curlrequest/033.php
 create mode 100644 user_guide_src/source/libraries/email/001.php
 create mode 100644 user_guide_src/source/libraries/email/002.php
 create mode 100644 user_guide_src/source/libraries/email/003.php
 create mode 100644 user_guide_src/source/libraries/email/004.php
 create mode 100644 user_guide_src/source/libraries/email/005.php
 create mode 100644 user_guide_src/source/libraries/email/006.php
 create mode 100644 user_guide_src/source/libraries/email/007.php
 create mode 100644 user_guide_src/source/libraries/email/008.php
 create mode 100644 user_guide_src/source/libraries/email/009.php
 create mode 100644 user_guide_src/source/libraries/email/010.php
 create mode 100644 user_guide_src/source/libraries/email/011.php
 create mode 100644 user_guide_src/source/libraries/email/012.php
 create mode 100644 user_guide_src/source/libraries/email/013.php
 create mode 100644 user_guide_src/source/libraries/email/014.php
 create mode 100644 user_guide_src/source/libraries/email/015.php
 create mode 100644 user_guide_src/source/libraries/email/016.php
 create mode 100644 user_guide_src/source/libraries/email/017.php
 create mode 100644 user_guide_src/source/libraries/email/018.php
 create mode 100644 user_guide_src/source/libraries/email/019.php
 create mode 100644 user_guide_src/source/libraries/email/020.php
 create mode 100644 user_guide_src/source/libraries/email/021.php
 create mode 100644 user_guide_src/source/libraries/email/022.php
 create mode 100644 user_guide_src/source/libraries/email/023.php
 create mode 100644 user_guide_src/source/libraries/encryption/001.php
 create mode 100644 user_guide_src/source/libraries/encryption/002.php
 create mode 100644 user_guide_src/source/libraries/encryption/003.php
 create mode 100644 user_guide_src/source/libraries/encryption/004.php
 create mode 100644 user_guide_src/source/libraries/encryption/005.php
 create mode 100644 user_guide_src/source/libraries/encryption/006.php
 create mode 100644 user_guide_src/source/libraries/encryption/007.php
 create mode 100644 user_guide_src/source/libraries/encryption/008.php
 create mode 100644 user_guide_src/source/libraries/encryption/009.php
 create mode 100644 user_guide_src/source/libraries/encryption/010.php
 create mode 100644 user_guide_src/source/libraries/encryption/011.php
 create mode 100644 user_guide_src/source/libraries/encryption/012.php
 create mode 100644 user_guide_src/source/libraries/files/001.php
 create mode 100644 user_guide_src/source/libraries/files/002.php
 create mode 100644 user_guide_src/source/libraries/files/003.php
 create mode 100644 user_guide_src/source/libraries/files/004.php
 create mode 100644 user_guide_src/source/libraries/files/005.php
 create mode 100644 user_guide_src/source/libraries/files/006.php
 create mode 100644 user_guide_src/source/libraries/files/007.php
 create mode 100644 user_guide_src/source/libraries/files/008.php
 create mode 100644 user_guide_src/source/libraries/files/009.php
 create mode 100644 user_guide_src/source/libraries/files/010.php
 create mode 100644 user_guide_src/source/libraries/files/011.php
 create mode 100644 user_guide_src/source/libraries/files/012.php
 create mode 100644 user_guide_src/source/libraries/files/013.php
 create mode 100644 user_guide_src/source/libraries/files/014.php
 create mode 100644 user_guide_src/source/libraries/files/015.php
 create mode 100644 user_guide_src/source/libraries/honeypot/001.php
 create mode 100644 user_guide_src/source/libraries/images/001.php
 create mode 100644 user_guide_src/source/libraries/images/002.php
 create mode 100644 user_guide_src/source/libraries/images/003.php
 create mode 100644 user_guide_src/source/libraries/images/004.php
 create mode 100644 user_guide_src/source/libraries/images/005.php
 create mode 100644 user_guide_src/source/libraries/images/006.php
 create mode 100644 user_guide_src/source/libraries/images/007.php
 create mode 100644 user_guide_src/source/libraries/images/008.php
 create mode 100644 user_guide_src/source/libraries/images/009.php
 create mode 100644 user_guide_src/source/libraries/images/010.php
 create mode 100644 user_guide_src/source/libraries/images/011.php
 create mode 100644 user_guide_src/source/libraries/images/012.php
 create mode 100644 user_guide_src/source/libraries/images/013.php
 create mode 100644 user_guide_src/source/libraries/images/014.php
 create mode 100644 user_guide_src/source/libraries/pagination/001.php
 create mode 100644 user_guide_src/source/libraries/pagination/002.php
 create mode 100644 user_guide_src/source/libraries/pagination/003.php
 create mode 100644 user_guide_src/source/libraries/pagination/004.php
 create mode 100644 user_guide_src/source/libraries/pagination/005.php
 create mode 100644 user_guide_src/source/libraries/pagination/006.php
 create mode 100644 user_guide_src/source/libraries/pagination/007.php
 create mode 100644 user_guide_src/source/libraries/pagination/008.php
 create mode 100644 user_guide_src/source/libraries/pagination/009.php
 create mode 100644 user_guide_src/source/libraries/pagination/010.php
 create mode 100644 user_guide_src/source/libraries/pagination/011.php
 create mode 100644 user_guide_src/source/libraries/pagination/012.php
 create mode 100644 user_guide_src/source/libraries/pagination/013.php
 create mode 100644 user_guide_src/source/libraries/pagination/014.php
 create mode 100644 user_guide_src/source/libraries/pagination/015.php
 create mode 100644 user_guide_src/source/libraries/pagination/016.php
 create mode 100644 user_guide_src/source/libraries/publisher/001.php
 create mode 100644 user_guide_src/source/libraries/publisher/002.php
 create mode 100644 user_guide_src/source/libraries/publisher/003.php
 create mode 100644 user_guide_src/source/libraries/publisher/004.php
 create mode 100644 user_guide_src/source/libraries/publisher/005.php
 create mode 100644 user_guide_src/source/libraries/publisher/006.php
 create mode 100644 user_guide_src/source/libraries/publisher/007.php
 create mode 100644 user_guide_src/source/libraries/publisher/008.php
 create mode 100644 user_guide_src/source/libraries/publisher/009.php
 create mode 100644 user_guide_src/source/libraries/publisher/010.php
 create mode 100644 user_guide_src/source/libraries/publisher/011.php
 create mode 100644 user_guide_src/source/libraries/publisher/012.php
 create mode 100644 user_guide_src/source/libraries/security/001.php
 create mode 100644 user_guide_src/source/libraries/security/002.php
 create mode 100644 user_guide_src/source/libraries/security/003.php
 create mode 100644 user_guide_src/source/libraries/security/004.php
 create mode 100644 user_guide_src/source/libraries/security/005.php
 create mode 100644 user_guide_src/source/libraries/security/006.php
 create mode 100644 user_guide_src/source/libraries/security/007.php
 create mode 100644 user_guide_src/source/libraries/security/008.php
 create mode 100644 user_guide_src/source/libraries/security/009.php
 create mode 100644 user_guide_src/source/libraries/security/010.php
 create mode 100644 user_guide_src/source/libraries/sessions/001.php
 create mode 100644 user_guide_src/source/libraries/sessions/002.php
 create mode 100644 user_guide_src/source/libraries/sessions/003.php
 create mode 100644 user_guide_src/source/libraries/sessions/004.php
 create mode 100644 user_guide_src/source/libraries/sessions/005.php
 create mode 100644 user_guide_src/source/libraries/sessions/006.php
 create mode 100644 user_guide_src/source/libraries/sessions/007.php
 create mode 100644 user_guide_src/source/libraries/sessions/008.php
 create mode 100644 user_guide_src/source/libraries/sessions/009.php
 create mode 100644 user_guide_src/source/libraries/sessions/010.php
 create mode 100644 user_guide_src/source/libraries/sessions/011.php
 create mode 100644 user_guide_src/source/libraries/sessions/012.php
 create mode 100644 user_guide_src/source/libraries/sessions/013.php
 create mode 100644 user_guide_src/source/libraries/sessions/014.php
 create mode 100644 user_guide_src/source/libraries/sessions/015.php
 create mode 100644 user_guide_src/source/libraries/sessions/016.php
 create mode 100644 user_guide_src/source/libraries/sessions/017.php
 create mode 100644 user_guide_src/source/libraries/sessions/018.php
 create mode 100644 user_guide_src/source/libraries/sessions/019.php
 create mode 100644 user_guide_src/source/libraries/sessions/020.php
 create mode 100644 user_guide_src/source/libraries/sessions/021.php
 create mode 100644 user_guide_src/source/libraries/sessions/022.php
 create mode 100644 user_guide_src/source/libraries/sessions/023.php
 create mode 100644 user_guide_src/source/libraries/sessions/024.php
 create mode 100644 user_guide_src/source/libraries/sessions/025.php
 create mode 100644 user_guide_src/source/libraries/sessions/026.php
 create mode 100644 user_guide_src/source/libraries/sessions/027.php
 create mode 100644 user_guide_src/source/libraries/sessions/028.php
 create mode 100644 user_guide_src/source/libraries/sessions/029.php
 create mode 100644 user_guide_src/source/libraries/sessions/030.php
 create mode 100644 user_guide_src/source/libraries/sessions/031.php
 create mode 100644 user_guide_src/source/libraries/sessions/032.php
 create mode 100644 user_guide_src/source/libraries/sessions/033.php
 create mode 100644 user_guide_src/source/libraries/sessions/034.php
 create mode 100644 user_guide_src/source/libraries/sessions/035.php
 create mode 100644 user_guide_src/source/libraries/sessions/036.php
 create mode 100644 user_guide_src/source/libraries/sessions/037.php
 create mode 100644 user_guide_src/source/libraries/sessions/038.php
 create mode 100644 user_guide_src/source/libraries/sessions/039.php
 create mode 100644 user_guide_src/source/libraries/sessions/040.php
 create mode 100644 user_guide_src/source/libraries/sessions/041.php
 create mode 100644 user_guide_src/source/libraries/sessions/042.php
 create mode 100644 user_guide_src/source/libraries/sessions/043.php
 create mode 100644 user_guide_src/source/libraries/sessions/044.php
 create mode 100644 user_guide_src/source/libraries/throttler/001.php
 create mode 100644 user_guide_src/source/libraries/throttler/002.php
 create mode 100644 user_guide_src/source/libraries/throttler/003.php
 create mode 100644 user_guide_src/source/libraries/throttler/004.php
 create mode 100644 user_guide_src/source/libraries/time/001.php
 create mode 100644 user_guide_src/source/libraries/time/002.php
 create mode 100644 user_guide_src/source/libraries/time/003.php
 create mode 100644 user_guide_src/source/libraries/time/004.php
 create mode 100644 user_guide_src/source/libraries/time/005.php
 create mode 100644 user_guide_src/source/libraries/time/006.php
 create mode 100644 user_guide_src/source/libraries/time/007.php
 create mode 100644 user_guide_src/source/libraries/time/008.php
 create mode 100644 user_guide_src/source/libraries/time/009.php
 create mode 100644 user_guide_src/source/libraries/time/010.php
 create mode 100644 user_guide_src/source/libraries/time/011.php
 create mode 100644 user_guide_src/source/libraries/time/012.php
 create mode 100644 user_guide_src/source/libraries/time/013.php
 create mode 100644 user_guide_src/source/libraries/time/014.php
 create mode 100644 user_guide_src/source/libraries/time/015.php
 create mode 100644 user_guide_src/source/libraries/time/016.php
 create mode 100644 user_guide_src/source/libraries/time/017.php
 create mode 100644 user_guide_src/source/libraries/time/018.php
 create mode 100644 user_guide_src/source/libraries/time/019.php
 create mode 100644 user_guide_src/source/libraries/time/020.php
 create mode 100644 user_guide_src/source/libraries/time/021.php
 create mode 100644 user_guide_src/source/libraries/time/022.php
 create mode 100644 user_guide_src/source/libraries/time/023.php
 create mode 100644 user_guide_src/source/libraries/time/024.php
 create mode 100644 user_guide_src/source/libraries/time/025.php
 create mode 100644 user_guide_src/source/libraries/time/026.php
 create mode 100644 user_guide_src/source/libraries/time/027.php
 create mode 100644 user_guide_src/source/libraries/time/028.php
 create mode 100644 user_guide_src/source/libraries/time/029.php
 create mode 100644 user_guide_src/source/libraries/time/030.php
 create mode 100644 user_guide_src/source/libraries/time/031.php
 create mode 100644 user_guide_src/source/libraries/time/032.php
 create mode 100644 user_guide_src/source/libraries/time/033.php
 create mode 100644 user_guide_src/source/libraries/time/034.php
 create mode 100644 user_guide_src/source/libraries/time/035.php
 create mode 100644 user_guide_src/source/libraries/time/036.php
 create mode 100644 user_guide_src/source/libraries/time/037.php
 create mode 100644 user_guide_src/source/libraries/time/038.php
 create mode 100644 user_guide_src/source/libraries/time/039.php
 create mode 100644 user_guide_src/source/libraries/time/040.php
 create mode 100644 user_guide_src/source/libraries/time/041.php
 create mode 100644 user_guide_src/source/libraries/typography/001.php
 create mode 100644 user_guide_src/source/libraries/typography/002.php
 create mode 100644 user_guide_src/source/libraries/typography/003.php
 create mode 100644 user_guide_src/source/libraries/typography/004.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/000.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/001.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/002.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/003.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/004.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/005.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/006.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/007.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/008.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/009.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/010.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/011.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/012.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/013.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/014.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/015.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/016.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/017.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/018.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/019.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/020.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/021.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/022.php
 create mode 100644 user_guide_src/source/libraries/uri/001.php
 create mode 100644 user_guide_src/source/libraries/uri/002.php
 create mode 100644 user_guide_src/source/libraries/uri/003.php
 create mode 100644 user_guide_src/source/libraries/uri/004.php
 create mode 100644 user_guide_src/source/libraries/uri/005.php
 create mode 100644 user_guide_src/source/libraries/uri/006.php
 create mode 100644 user_guide_src/source/libraries/uri/007.php
 create mode 100644 user_guide_src/source/libraries/uri/008.php
 create mode 100644 user_guide_src/source/libraries/uri/009.php
 create mode 100644 user_guide_src/source/libraries/uri/010.php
 create mode 100644 user_guide_src/source/libraries/uri/011.php
 create mode 100644 user_guide_src/source/libraries/uri/012.php
 create mode 100644 user_guide_src/source/libraries/uri/013.php
 create mode 100644 user_guide_src/source/libraries/uri/014.php
 create mode 100644 user_guide_src/source/libraries/uri/015.php
 create mode 100644 user_guide_src/source/libraries/uri/016.php
 create mode 100644 user_guide_src/source/libraries/uri/017.php
 create mode 100644 user_guide_src/source/libraries/uri/018.php
 create mode 100644 user_guide_src/source/libraries/uri/019.php
 create mode 100644 user_guide_src/source/libraries/uri/020.php
 create mode 100644 user_guide_src/source/libraries/uri/021.php
 create mode 100644 user_guide_src/source/libraries/uri/022.php
 create mode 100644 user_guide_src/source/libraries/uri/023.php
 create mode 100644 user_guide_src/source/libraries/uri/024.php
 create mode 100644 user_guide_src/source/libraries/uri/025.php
 create mode 100644 user_guide_src/source/libraries/uri/026.php
 create mode 100644 user_guide_src/source/libraries/uri/027.php
 create mode 100644 user_guide_src/source/libraries/user_agent/001.php
 create mode 100644 user_guide_src/source/libraries/user_agent/002.php
 create mode 100644 user_guide_src/source/libraries/user_agent/003.php
 create mode 100644 user_guide_src/source/libraries/user_agent/004.php
 create mode 100644 user_guide_src/source/libraries/user_agent/005.php
 create mode 100644 user_guide_src/source/libraries/validation/001.php
 create mode 100644 user_guide_src/source/libraries/validation/002.php
 create mode 100644 user_guide_src/source/libraries/validation/003.php
 create mode 100644 user_guide_src/source/libraries/validation/004.php
 create mode 100644 user_guide_src/source/libraries/validation/005.php
 create mode 100644 user_guide_src/source/libraries/validation/006.php
 create mode 100644 user_guide_src/source/libraries/validation/007.php
 create mode 100644 user_guide_src/source/libraries/validation/008.php
 create mode 100644 user_guide_src/source/libraries/validation/009.php
 create mode 100644 user_guide_src/source/libraries/validation/010.php
 create mode 100644 user_guide_src/source/libraries/validation/011.php
 create mode 100644 user_guide_src/source/libraries/validation/012.php
 create mode 100644 user_guide_src/source/libraries/validation/013.php
 create mode 100644 user_guide_src/source/libraries/validation/014.php
 create mode 100644 user_guide_src/source/libraries/validation/015.php
 create mode 100644 user_guide_src/source/libraries/validation/016.php
 create mode 100644 user_guide_src/source/libraries/validation/017.php
 create mode 100644 user_guide_src/source/libraries/validation/018.php
 create mode 100644 user_guide_src/source/libraries/validation/019.php
 create mode 100644 user_guide_src/source/libraries/validation/020.php
 create mode 100644 user_guide_src/source/libraries/validation/021.php
 create mode 100644 user_guide_src/source/libraries/validation/022.php
 create mode 100644 user_guide_src/source/libraries/validation/023.php
 create mode 100644 user_guide_src/source/libraries/validation/024.php
 create mode 100644 user_guide_src/source/libraries/validation/025.php
 create mode 100644 user_guide_src/source/libraries/validation/026.php
 create mode 100644 user_guide_src/source/libraries/validation/027.php
 create mode 100644 user_guide_src/source/libraries/validation/028.php
 create mode 100644 user_guide_src/source/libraries/validation/029-2.php
 create mode 100644 user_guide_src/source/libraries/validation/029.php
 create mode 100644 user_guide_src/source/libraries/validation/030.php
 create mode 100644 user_guide_src/source/libraries/validation/031.php
 create mode 100644 user_guide_src/source/libraries/validation/032.php
 create mode 100644 user_guide_src/source/libraries/validation/033.php
 create mode 100644 user_guide_src/source/libraries/validation/034.php
 create mode 100644 user_guide_src/source/libraries/validation/035.php
 create mode 100644 user_guide_src/source/libraries/validation/036.php
 create mode 100644 user_guide_src/source/libraries/validation/037.php
 create mode 100644 user_guide_src/source/models/entities/001.php
 create mode 100644 user_guide_src/source/models/entities/002.php
 create mode 100644 user_guide_src/source/models/entities/003.php
 create mode 100644 user_guide_src/source/models/entities/004.php
 create mode 100644 user_guide_src/source/models/entities/005.php
 create mode 100644 user_guide_src/source/models/entities/006.php
 create mode 100644 user_guide_src/source/models/entities/007.php
 create mode 100644 user_guide_src/source/models/entities/008.php
 create mode 100644 user_guide_src/source/models/entities/009.php
 create mode 100644 user_guide_src/source/models/entities/010.php
 create mode 100644 user_guide_src/source/models/entities/011.php
 create mode 100644 user_guide_src/source/models/entities/012.php
 create mode 100644 user_guide_src/source/models/entities/013.php
 create mode 100644 user_guide_src/source/models/entities/014.php
 create mode 100644 user_guide_src/source/models/entities/015.php
 create mode 100644 user_guide_src/source/models/entities/016.php
 create mode 100644 user_guide_src/source/models/entities/017.php
 create mode 100644 user_guide_src/source/models/entities/018.php
 create mode 100644 user_guide_src/source/models/entities/019.php
 create mode 100644 user_guide_src/source/models/entities/020.php
 create mode 100644 user_guide_src/source/models/entities/021.php
 create mode 100644 user_guide_src/source/models/entities/022.php
 create mode 100644 user_guide_src/source/models/entities/023.php
 create mode 100644 user_guide_src/source/models/model/001.php
 create mode 100644 user_guide_src/source/models/model/002.php
 create mode 100644 user_guide_src/source/models/model/003.php
 create mode 100644 user_guide_src/source/models/model/004.php
 create mode 100644 user_guide_src/source/models/model/005.php
 create mode 100644 user_guide_src/source/models/model/006.php
 create mode 100644 user_guide_src/source/models/model/007.php
 create mode 100644 user_guide_src/source/models/model/008.php
 create mode 100644 user_guide_src/source/models/model/009.php
 create mode 100644 user_guide_src/source/models/model/010.php
 create mode 100644 user_guide_src/source/models/model/011.php
 create mode 100644 user_guide_src/source/models/model/012.php
 create mode 100644 user_guide_src/source/models/model/013.php
 create mode 100644 user_guide_src/source/models/model/014.php
 create mode 100644 user_guide_src/source/models/model/015.php
 create mode 100644 user_guide_src/source/models/model/016.php
 create mode 100644 user_guide_src/source/models/model/017.php
 create mode 100644 user_guide_src/source/models/model/018.php
 create mode 100644 user_guide_src/source/models/model/019.php
 create mode 100644 user_guide_src/source/models/model/020.php
 create mode 100644 user_guide_src/source/models/model/021.php
 create mode 100644 user_guide_src/source/models/model/022.php
 create mode 100644 user_guide_src/source/models/model/023.php
 create mode 100644 user_guide_src/source/models/model/024.php
 create mode 100644 user_guide_src/source/models/model/025.php
 create mode 100644 user_guide_src/source/models/model/026.php
 create mode 100644 user_guide_src/source/models/model/027.php
 create mode 100644 user_guide_src/source/models/model/028.php
 create mode 100644 user_guide_src/source/models/model/029.php
 create mode 100644 user_guide_src/source/models/model/030.php
 create mode 100644 user_guide_src/source/models/model/031.php
 create mode 100644 user_guide_src/source/models/model/032.php
 create mode 100644 user_guide_src/source/models/model/033.php
 create mode 100644 user_guide_src/source/models/model/034.php
 create mode 100644 user_guide_src/source/models/model/035.php
 create mode 100644 user_guide_src/source/models/model/036.php
 create mode 100644 user_guide_src/source/models/model/037.php
 create mode 100644 user_guide_src/source/models/model/038.php
 create mode 100644 user_guide_src/source/models/model/039.php
 create mode 100644 user_guide_src/source/models/model/040.php
 create mode 100644 user_guide_src/source/models/model/041.php
 create mode 100644 user_guide_src/source/models/model/042.php
 create mode 100644 user_guide_src/source/models/model/043.php
 create mode 100644 user_guide_src/source/models/model/044.php
 create mode 100644 user_guide_src/source/models/model/045.php
 create mode 100644 user_guide_src/source/models/model/046.php
 create mode 100644 user_guide_src/source/models/model/047.php
 create mode 100644 user_guide_src/source/models/model/048.php
 create mode 100644 user_guide_src/source/models/model/049.php
 create mode 100644 user_guide_src/source/models/model/050.php
 create mode 100644 user_guide_src/source/models/model/051.php
 create mode 100644 user_guide_src/source/models/model/052.php
 create mode 100644 user_guide_src/source/models/model/053.php
 create mode 100644 user_guide_src/source/models/model/054.php
 create mode 100644 user_guide_src/source/models/model/055.php
 create mode 100644 user_guide_src/source/outgoing/alternative_php/001.php
 create mode 100644 user_guide_src/source/outgoing/alternative_php/002.php
 create mode 100644 user_guide_src/source/outgoing/api_responses/001.php
 create mode 100644 user_guide_src/source/outgoing/api_responses/002.php
 create mode 100644 user_guide_src/source/outgoing/api_responses/003.php
 create mode 100644 user_guide_src/source/outgoing/api_responses/004.php
 create mode 100644 user_guide_src/source/outgoing/api_responses/005.php
 create mode 100644 user_guide_src/source/outgoing/api_responses/006.php
 create mode 100644 user_guide_src/source/outgoing/api_responses/007.php
 create mode 100644 user_guide_src/source/outgoing/api_responses/008.php
 create mode 100644 user_guide_src/source/outgoing/api_responses/009.php
 create mode 100644 user_guide_src/source/outgoing/api_responses/010.php
 create mode 100644 user_guide_src/source/outgoing/api_responses/011.php
 create mode 100644 user_guide_src/source/outgoing/api_responses/012.php
 create mode 100644 user_guide_src/source/outgoing/api_responses/013.php
 create mode 100644 user_guide_src/source/outgoing/api_responses/014.php
 create mode 100644 user_guide_src/source/outgoing/api_responses/015.php
 create mode 100644 user_guide_src/source/outgoing/api_responses/016.php
 create mode 100644 user_guide_src/source/outgoing/api_responses/017.php
 create mode 100644 user_guide_src/source/outgoing/localization/001.php
 create mode 100644 user_guide_src/source/outgoing/localization/002.php
 create mode 100644 user_guide_src/source/outgoing/localization/003.php
 create mode 100644 user_guide_src/source/outgoing/localization/004.php
 create mode 100644 user_guide_src/source/outgoing/localization/005.php
 create mode 100644 user_guide_src/source/outgoing/localization/006.php
 create mode 100644 user_guide_src/source/outgoing/localization/007.php
 create mode 100644 user_guide_src/source/outgoing/localization/008.php
 create mode 100644 user_guide_src/source/outgoing/localization/009.php
 create mode 100644 user_guide_src/source/outgoing/localization/010.php
 create mode 100644 user_guide_src/source/outgoing/localization/011.php
 create mode 100644 user_guide_src/source/outgoing/localization/012.php
 create mode 100644 user_guide_src/source/outgoing/localization/013.php
 create mode 100644 user_guide_src/source/outgoing/localization/014.php
 create mode 100644 user_guide_src/source/outgoing/localization/015.php
 create mode 100644 user_guide_src/source/outgoing/localization/016.php
 create mode 100644 user_guide_src/source/outgoing/localization/017.php
 create mode 100644 user_guide_src/source/outgoing/response/001.php
 create mode 100644 user_guide_src/source/outgoing/response/002.php
 create mode 100644 user_guide_src/source/outgoing/response/003.php
 create mode 100644 user_guide_src/source/outgoing/response/004.php
 create mode 100644 user_guide_src/source/outgoing/response/005.php
 create mode 100644 user_guide_src/source/outgoing/response/006.php
 create mode 100644 user_guide_src/source/outgoing/response/007.php
 create mode 100644 user_guide_src/source/outgoing/response/008.php
 create mode 100644 user_guide_src/source/outgoing/response/009.php
 create mode 100644 user_guide_src/source/outgoing/response/010.php
 create mode 100644 user_guide_src/source/outgoing/response/011.php
 create mode 100644 user_guide_src/source/outgoing/response/012.php
 create mode 100644 user_guide_src/source/outgoing/response/013.php
 create mode 100644 user_guide_src/source/outgoing/response/014.php
 create mode 100644 user_guide_src/source/outgoing/response/015.php
 create mode 100644 user_guide_src/source/outgoing/response/016.php
 create mode 100644 user_guide_src/source/outgoing/response/017.php
 create mode 100644 user_guide_src/source/outgoing/response/018.php
 create mode 100644 user_guide_src/source/outgoing/response/019.php
 create mode 100644 user_guide_src/source/outgoing/response/020.php
 create mode 100644 user_guide_src/source/outgoing/response/021.php
 create mode 100644 user_guide_src/source/outgoing/response/022.php
 create mode 100644 user_guide_src/source/outgoing/response/023.php
 create mode 100644 user_guide_src/source/outgoing/response/024.php
 create mode 100644 user_guide_src/source/outgoing/response/025.php
 create mode 100644 user_guide_src/source/outgoing/response/026.php
 create mode 100644 user_guide_src/source/outgoing/response/027.php
 create mode 100644 user_guide_src/source/outgoing/table/001.php
 create mode 100644 user_guide_src/source/outgoing/table/002.php
 create mode 100644 user_guide_src/source/outgoing/table/003.php
 create mode 100644 user_guide_src/source/outgoing/table/004.php
 create mode 100644 user_guide_src/source/outgoing/table/005.php
 create mode 100644 user_guide_src/source/outgoing/table/006.php
 create mode 100644 user_guide_src/source/outgoing/table/007.php
 create mode 100644 user_guide_src/source/outgoing/table/008.php
 create mode 100644 user_guide_src/source/outgoing/table/009.php
 create mode 100644 user_guide_src/source/outgoing/table/010.php
 create mode 100644 user_guide_src/source/outgoing/table/011.php
 create mode 100644 user_guide_src/source/outgoing/table/012.php
 create mode 100644 user_guide_src/source/outgoing/table/013.php
 create mode 100644 user_guide_src/source/outgoing/table/014.php
 create mode 100644 user_guide_src/source/outgoing/table/015.php
 create mode 100644 user_guide_src/source/outgoing/table/016.php
 create mode 100644 user_guide_src/source/outgoing/table/017.php
 create mode 100644 user_guide_src/source/outgoing/table/018.php
 create mode 100644 user_guide_src/source/outgoing/view_decorators/001.php
 create mode 100644 user_guide_src/source/outgoing/view_decorators/002.php
 create mode 100644 user_guide_src/source/outgoing/view_layouts/001.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/001.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/002.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/003.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/004.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/005.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/006.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/007.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/008.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/009.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/010-2.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/010.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/011.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/012.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/013.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/014.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/015.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/016.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/017.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/018.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/019.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/020.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/021.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/022.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/023.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/024.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/025.php
 create mode 100644 user_guide_src/source/outgoing/view_renderer/001.php
 create mode 100644 user_guide_src/source/outgoing/view_renderer/002.php
 create mode 100644 user_guide_src/source/outgoing/view_renderer/003.php
 create mode 100644 user_guide_src/source/outgoing/view_renderer/004.php
 create mode 100644 user_guide_src/source/outgoing/view_renderer/005.php
 create mode 100644 user_guide_src/source/outgoing/view_renderer/006.php
 create mode 100644 user_guide_src/source/outgoing/view_renderer/007.php
 create mode 100644 user_guide_src/source/outgoing/view_renderer/008.php
 create mode 100644 user_guide_src/source/outgoing/views/001.php
 create mode 100644 user_guide_src/source/outgoing/views/002.php
 create mode 100644 user_guide_src/source/outgoing/views/003.php
 create mode 100644 user_guide_src/source/outgoing/views/004.php
 create mode 100644 user_guide_src/source/outgoing/views/005.php
 create mode 100644 user_guide_src/source/outgoing/views/006.php
 create mode 100644 user_guide_src/source/outgoing/views/007.php
 create mode 100644 user_guide_src/source/outgoing/views/008.php
 create mode 100644 user_guide_src/source/outgoing/views/009.php
 create mode 100644 user_guide_src/source/outgoing/views/010.php
 create mode 100644 user_guide_src/source/outgoing/views/011.php
 create mode 100644 user_guide_src/source/outgoing/views/012.php
 create mode 100644 user_guide_src/source/testing/benchmark/001.php
 create mode 100644 user_guide_src/source/testing/benchmark/002.php
 create mode 100644 user_guide_src/source/testing/benchmark/003.php
 create mode 100644 user_guide_src/source/testing/benchmark/004.php
 create mode 100644 user_guide_src/source/testing/benchmark/005.php
 create mode 100644 user_guide_src/source/testing/benchmark/006.php
 create mode 100644 user_guide_src/source/testing/benchmark/007.php
 create mode 100644 user_guide_src/source/testing/benchmark/008.php
 create mode 100644 user_guide_src/source/testing/benchmark/009.php
 create mode 100644 user_guide_src/source/testing/controllers/001.php
 create mode 100644 user_guide_src/source/testing/controllers/002.php
 create mode 100644 user_guide_src/source/testing/controllers/003.php
 create mode 100644 user_guide_src/source/testing/controllers/004.php
 create mode 100644 user_guide_src/source/testing/controllers/005.php
 create mode 100644 user_guide_src/source/testing/controllers/006.php
 create mode 100644 user_guide_src/source/testing/controllers/007.php
 create mode 100644 user_guide_src/source/testing/controllers/008.php
 create mode 100644 user_guide_src/source/testing/controllers/009.php
 create mode 100644 user_guide_src/source/testing/controllers/010.php
 create mode 100644 user_guide_src/source/testing/controllers/011.php
 create mode 100644 user_guide_src/source/testing/controllers/012.php
 create mode 100644 user_guide_src/source/testing/controllers/013.php
 create mode 100644 user_guide_src/source/testing/controllers/014.php
 create mode 100644 user_guide_src/source/testing/controllers/015.php
 create mode 100644 user_guide_src/source/testing/controllers/016.php
 create mode 100644 user_guide_src/source/testing/controllers/017.php
 create mode 100644 user_guide_src/source/testing/controllers/018.php
 create mode 100644 user_guide_src/source/testing/database/001.php
 create mode 100644 user_guide_src/source/testing/database/002.php
 create mode 100644 user_guide_src/source/testing/database/003.php
 create mode 100644 user_guide_src/source/testing/database/004.php
 create mode 100644 user_guide_src/source/testing/database/005.php
 create mode 100644 user_guide_src/source/testing/database/006.php
 create mode 100644 user_guide_src/source/testing/database/007.php
 create mode 100644 user_guide_src/source/testing/database/008.php
 create mode 100644 user_guide_src/source/testing/debugging/001.php
 create mode 100644 user_guide_src/source/testing/debugging/002.php
 create mode 100644 user_guide_src/source/testing/debugging/003.php
 create mode 100644 user_guide_src/source/testing/debugging/004.php
 create mode 100644 user_guide_src/source/testing/debugging/005.php
 create mode 100644 user_guide_src/source/testing/debugging/006.php
 create mode 100644 user_guide_src/source/testing/fabricator/001.php
 create mode 100644 user_guide_src/source/testing/fabricator/002.php
 create mode 100644 user_guide_src/source/testing/fabricator/003.php
 create mode 100644 user_guide_src/source/testing/fabricator/004.php
 create mode 100644 user_guide_src/source/testing/fabricator/005.php
 create mode 100644 user_guide_src/source/testing/fabricator/006.php
 create mode 100644 user_guide_src/source/testing/fabricator/007.php
 create mode 100644 user_guide_src/source/testing/fabricator/008.php
 create mode 100644 user_guide_src/source/testing/fabricator/009.php
 create mode 100644 user_guide_src/source/testing/fabricator/010.php
 create mode 100644 user_guide_src/source/testing/fabricator/011.php
 create mode 100644 user_guide_src/source/testing/fabricator/012.php
 create mode 100644 user_guide_src/source/testing/fabricator/013.php
 create mode 100644 user_guide_src/source/testing/fabricator/014.php
 create mode 100644 user_guide_src/source/testing/fabricator/015.php
 create mode 100644 user_guide_src/source/testing/fabricator/016.php
 create mode 100644 user_guide_src/source/testing/fabricator/017.php
 create mode 100644 user_guide_src/source/testing/fabricator/018.php
 create mode 100644 user_guide_src/source/testing/fabricator/019.php
 create mode 100644 user_guide_src/source/testing/fabricator/020.php
 create mode 100644 user_guide_src/source/testing/fabricator/021.php
 create mode 100644 user_guide_src/source/testing/feature/001.php
 create mode 100644 user_guide_src/source/testing/feature/002.php
 create mode 100644 user_guide_src/source/testing/feature/003.php
 create mode 100644 user_guide_src/source/testing/feature/004.php
 create mode 100644 user_guide_src/source/testing/feature/005.php
 create mode 100644 user_guide_src/source/testing/feature/006.php
 create mode 100644 user_guide_src/source/testing/feature/007.php
 create mode 100644 user_guide_src/source/testing/feature/008.php
 create mode 100644 user_guide_src/source/testing/mocking/001.php
 create mode 100644 user_guide_src/source/testing/mocking/002.php
 create mode 100644 user_guide_src/source/testing/mocking/003.php
 create mode 100644 user_guide_src/source/testing/overview/001.php
 create mode 100644 user_guide_src/source/testing/overview/002.php
 create mode 100644 user_guide_src/source/testing/overview/003.php
 create mode 100644 user_guide_src/source/testing/overview/004.php
 create mode 100644 user_guide_src/source/testing/overview/005.php
 create mode 100644 user_guide_src/source/testing/overview/006.php
 create mode 100644 user_guide_src/source/testing/overview/007.php
 create mode 100644 user_guide_src/source/testing/overview/008.php
 create mode 100644 user_guide_src/source/testing/overview/009.php
 create mode 100644 user_guide_src/source/testing/overview/010.php
 create mode 100644 user_guide_src/source/testing/overview/011.php
 create mode 100644 user_guide_src/source/testing/overview/012.php
 create mode 100644 user_guide_src/source/testing/overview/013.php
 create mode 100644 user_guide_src/source/testing/overview/014.php
 create mode 100644 user_guide_src/source/testing/overview/015.php
 create mode 100644 user_guide_src/source/testing/overview/016.php
 create mode 100644 user_guide_src/source/testing/overview/017.php
 create mode 100644 user_guide_src/source/testing/overview/018.php
 create mode 100644 user_guide_src/source/testing/overview/019.php
 create mode 100644 user_guide_src/source/testing/response/001.php
 create mode 100644 user_guide_src/source/testing/response/002.php
 create mode 100644 user_guide_src/source/testing/response/003.php
 create mode 100644 user_guide_src/source/testing/response/004.php
 create mode 100644 user_guide_src/source/testing/response/005.php
 create mode 100644 user_guide_src/source/testing/response/006.php
 create mode 100644 user_guide_src/source/testing/response/007.php
 create mode 100644 user_guide_src/source/testing/response/008.php
 create mode 100644 user_guide_src/source/testing/response/009.php
 create mode 100644 user_guide_src/source/testing/response/010.php
 create mode 100644 user_guide_src/source/testing/response/011.php
 create mode 100644 user_guide_src/source/testing/response/012.php
 create mode 100644 user_guide_src/source/testing/response/013.php
 create mode 100644 user_guide_src/source/testing/response/014.php
 create mode 100644 user_guide_src/source/testing/response/015.php
 create mode 100644 user_guide_src/source/testing/response/016.php
 create mode 100644 user_guide_src/source/testing/response/017.php
 create mode 100644 user_guide_src/source/testing/response/018.php
 create mode 100644 user_guide_src/source/testing/response/019.php
 create mode 100644 user_guide_src/source/testing/response/020.php
 create mode 100644 user_guide_src/source/testing/response/021.php
 create mode 100644 user_guide_src/source/testing/response/022.php
 create mode 100644 user_guide_src/source/testing/response/023.php
 create mode 100644 user_guide_src/source/testing/response/024.php
 create mode 100644 user_guide_src/source/testing/response/025.php
 create mode 100644 user_guide_src/source/testing/response/026.php
 create mode 100644 user_guide_src/source/testing/response/027.php
 create mode 100644 user_guide_src/source/testing/response/028.php
 create mode 100644 user_guide_src/source/testing/response/029.php
 create mode 100644 user_guide_src/source/testing/response/030.php
 create mode 100644 user_guide_src/source/testing/response/031.php
 create mode 100644 user_guide_src/source/testing/response/032.php
 create mode 100644 user_guide_src/source/tutorial/create_news_items/001.php
 create mode 100644 user_guide_src/source/tutorial/create_news_items/002.php
 create mode 100644 user_guide_src/source/tutorial/create_news_items/003.php
 create mode 100644 user_guide_src/source/tutorial/create_news_items/004.php
 create mode 100644 user_guide_src/source/tutorial/news_section/001.php
 create mode 100644 user_guide_src/source/tutorial/news_section/002.php
 create mode 100644 user_guide_src/source/tutorial/news_section/003.php
 create mode 100644 user_guide_src/source/tutorial/news_section/004.php
 create mode 100644 user_guide_src/source/tutorial/news_section/005.php
 create mode 100644 user_guide_src/source/tutorial/news_section/006.php
 create mode 100644 user_guide_src/source/tutorial/news_section/007.php
 create mode 100644 user_guide_src/source/tutorial/news_section/008.php
 create mode 100644 user_guide_src/source/tutorial/static_pages/001.php
 create mode 100644 user_guide_src/source/tutorial/static_pages/002.php
 create mode 100644 user_guide_src/source/tutorial/static_pages/003.php
 create mode 100644 user_guide_src/source/tutorial/static_pages/004.php

diff --git a/user_guide_src/source/changelogs/v4.0.0-alpha.2.rst b/user_guide_src/source/changelogs/v4.0.0-alpha.2.rst
index a99b431f3a89..7c780ecf09d8 100644
--- a/user_guide_src/source/changelogs/v4.0.0-alpha.2.rst
+++ b/user_guide_src/source/changelogs/v4.0.0-alpha.2.rst
@@ -107,7 +107,6 @@ tests /
         - ParserTest #1311
     - EntityTest #1319
 
-
 user_guide_src /source/
     - cli/
         - cli_request #1303
diff --git a/user_guide_src/source/changelogs/v4.0.0-alpha.3.rst b/user_guide_src/source/changelogs/v4.0.0-alpha.3.rst
index f9e9dc537af4..20536f5f723e 100644
--- a/user_guide_src/source/changelogs/v4.0.0-alpha.3.rst
+++ b/user_guide_src/source/changelogs/v4.0.0-alpha.3.rst
@@ -5,7 +5,6 @@ Release Date: November 30, 2018
 
 **Next alpha release of CodeIgniter4**
 
-
 The list of changed files follows, with PR numbers shown.
 
 - admin/
diff --git a/user_guide_src/source/changelogs/v4.0.0-beta.1.rst b/user_guide_src/source/changelogs/v4.0.0-beta.1.rst
index 64a46373e23b..87cb1f5c6897 100644
--- a/user_guide_src/source/changelogs/v4.0.0-beta.1.rst
+++ b/user_guide_src/source/changelogs/v4.0.0-beta.1.rst
@@ -158,7 +158,7 @@ PRs merged:
 - #1737 Added support for dropTable and modifyTable with SQLite driver
 - #1736 Accommodate long travis execution times
 - #1733 Fix increment and decrement errors with Postgres
-- #1732 Don't check from CLI in Routes. Fixes #1724 
+- #1732 Don't check from CLI in Routes. Fixes #1724
 - #1729 New View Layout functionality for simple template
 - #1725 Update Request.php
 - #1723 Log an error if redis authentication is failed
@@ -176,4 +176,4 @@ PRs merged:
 - #4f4a37 remove debugging from Model.
 - #1699 Fix install link in user guide
 - #1696 Fix page structure etc
-- #1695 Tidy up code blocks in the user guide
\ No newline at end of file
+- #1695 Tidy up code blocks in the user guide
diff --git a/user_guide_src/source/changelogs/v4.0.0-beta.2.rst b/user_guide_src/source/changelogs/v4.0.0-beta.2.rst
index acb5559d97eb..557b0805adba 100644
--- a/user_guide_src/source/changelogs/v4.0.0-beta.2.rst
+++ b/user_guide_src/source/changelogs/v4.0.0-beta.2.rst
@@ -153,7 +153,6 @@ The list of changed files follows, with PR numbers shown.
         - ViewTest #1827, #1836
     - ControllerTest #1850
 
-
 - user_guide_src/
     - cli/
         - cli_commands #1777
@@ -265,4 +264,4 @@ PRs merged:
 - #1769 Correction in Methods and Spellings
 - #1762 Fix: decimal rule. shouldn't it accept integers?
 - #1746 Improve: Update Model, to selective update created_at / updated_at field.
-- #1590 Improve: Enhance 404Override
\ No newline at end of file
+- #1590 Improve: Enhance 404Override
diff --git a/user_guide_src/source/changelogs/v4.0.0-beta.4.rst b/user_guide_src/source/changelogs/v4.0.0-beta.4.rst
index 9530c782888f..9939285bf85c 100644
--- a/user_guide_src/source/changelogs/v4.0.0-beta.4.rst
+++ b/user_guide_src/source/changelogs/v4.0.0-beta.4.rst
@@ -17,7 +17,6 @@ New messages:
 
 App changes:
 
-
 Testing changes:
 
 - enhanced database & migration testing in tests/_support
@@ -152,7 +151,6 @@ The list of changed files follows, with PR numbers shown.
     - testing/
         - database #2051, #2053
 
-
 PRs merged:
 -----------
 
diff --git a/user_guide_src/source/changelogs/v4.0.0-rc.2.rst b/user_guide_src/source/changelogs/v4.0.0-rc.2.rst
index 28768bd15192..5272a72561c4 100644
--- a/user_guide_src/source/changelogs/v4.0.0-rc.2.rst
+++ b/user_guide_src/source/changelogs/v4.0.0-rc.2.rst
@@ -162,7 +162,6 @@ The list of changed files follows, with PR numbers shown.
         - news_section #2221
         - static_pages #2221
 
-
 PRs merged:
 --------------------------
 
diff --git a/user_guide_src/source/changelogs/v4.0.0-rc.3.rst b/user_guide_src/source/changelogs/v4.0.0-rc.3.rst
index b282fdaf22a0..df1a8719ce42 100644
--- a/user_guide_src/source/changelogs/v4.0.0-rc.3.rst
+++ b/user_guide_src/source/changelogs/v4.0.0-rc.3.rst
@@ -16,7 +16,6 @@ App changes:
 
 Message changes:
 
-
 The list of changed files follows, with PR numbers shown.
 
 - admin/
@@ -121,7 +120,6 @@ The list of changed files follows, with PR numbers shown.
     - outgoing/
         - table #2337
 
-
 PRs merged:
 -----------
 
diff --git a/user_guide_src/source/changelogs/v4.0.0-rc.4.rst b/user_guide_src/source/changelogs/v4.0.0-rc.4.rst
index b5693913b7bc..c7fd44aec27e 100644
--- a/user_guide_src/source/changelogs/v4.0.0-rc.4.rst
+++ b/user_guide_src/source/changelogs/v4.0.0-rc.4.rst
@@ -12,7 +12,6 @@ Enhancements:
 - Add validation function `is_not_unique`
 - Various improvements and cleanup to the Email class
 
-
 PRs merged:
 -----------
 - #2527 Update manual.rst
diff --git a/user_guide_src/source/changelogs/v4.0.4.rst b/user_guide_src/source/changelogs/v4.0.4.rst
index 3860473e6630..21828161ea31 100644
--- a/user_guide_src/source/changelogs/v4.0.4.rst
+++ b/user_guide_src/source/changelogs/v4.0.4.rst
@@ -31,7 +31,6 @@ Enhancements:
 - Cookies and headers can be copied from the global Response object when doing a redirect using the new ``withCookies()`` and ``withHeaders()`` methods.
 - Support for special prefix "hex2bin:" which can be used with ``$key`` parameter in :doc:`Encryption class</libraries/encryption>` or in .env file.
 
-
 Bugs Fixed:
 
 - Fixed location for the SQLite3 database which by default will be now located in a ``writable`` folder instead of the ``public`` folder.
@@ -56,4 +55,3 @@ Bugs Fixed:
 - Fix is_unique/is_not_unique validation called on POST/PUT via API in Postgresql
 - Added ``$arguments`` parameter to after() and before() in FilterInterface. This is a breaking change, so all code implementing the FilterInterface must be updated
 - Fixed a bug where filter arguments were not passed to after()
-
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index cc1561a98949..22593531edb6 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -14,7 +14,6 @@ BREAKING
 
 - The method signature of ``Validation::setRule()`` has been changed. The ``string`` typehint on the ``$rules`` parameter was removed. Extending classes should likewise remove the parameter so as not to break LSP.
 
-
 Enhancements
 ************
 
diff --git a/user_guide_src/source/cli/cli.rst b/user_guide_src/source/cli/cli.rst
index d426eb005a29..ba5305e433a6 100644
--- a/user_guide_src/source/cli/cli.rst
+++ b/user_guide_src/source/cli/cli.rst
@@ -36,21 +36,9 @@ Let's try it: Hello World!
 
 Let's create a simple controller so you can see it in action. Using your
 text editor, create a file called Tools.php, and put the following code
-in it::
+in it:
 
-    <?php
-
-    namespace App\Controllers;
-
-    use CodeIgniter\Controller;
-
-    class Tools extends Controller
-    {
-        public function message($to = 'World')
-        {
-            echo "Hello {$to}!" . PHP_EOL;
-        }
-    }
+.. literalinclude:: cli/001.php
 
 Then save the file to your **app/Controllers/** directory.
 
@@ -94,9 +82,10 @@ CLI-Only Routing
 In your **Routes.php** file you can create routes that are only accessible from
 the CLI as easily as you would create any other route. Instead of using the ``get()``,
 ``post()``, or similar method, you would use the ``cli()`` method. Everything else
-works exactly like a normal route definition::
+works exactly like a normal route definition:
 
-    $routes->cli('tools/message/(:segment)', 'Tools::message/$1');
+.. literalinclude:: cli/002.php
+   :lines: 2-
 
 For more information, see the :doc:`Routes </incoming/routing>` page.
 
diff --git a/user_guide_src/source/cli/cli/001.php b/user_guide_src/source/cli/cli/001.php
new file mode 100644
index 000000000000..b407ee50b145
--- /dev/null
+++ b/user_guide_src/source/cli/cli/001.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Controllers;
+
+use CodeIgniter\Controller;
+
+class Tools extends Controller
+{
+    public function message($to = 'World')
+    {
+        echo "Hello {$to}!" . PHP_EOL;
+    }
+}
diff --git a/user_guide_src/source/cli/cli/002.php b/user_guide_src/source/cli/cli/002.php
new file mode 100644
index 000000000000..53ee66af9a08
--- /dev/null
+++ b/user_guide_src/source/cli/cli/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->cli('tools/message/(:segment)', 'Tools::message/$1');
diff --git a/user_guide_src/source/cli/cli_commands.rst b/user_guide_src/source/cli/cli_commands.rst
index 6f0fe21ee4bd..075ab86558f5 100644
--- a/user_guide_src/source/cli/cli_commands.rst
+++ b/user_guide_src/source/cli/cli_commands.rst
@@ -47,9 +47,8 @@ Calling Commands
 Commands can also be ran from within your own code. This is most often done within a controller for cronjob tasks,
 but they can be used at any time. You do this by using the ``command()`` function. This function is always available.
 
-::
-
-    echo command('migrate:create TestMigration');
+.. literalinclude:: cli_commands/001.php
+   :lines: 2-
 
 The only argument is string that is the command called and any parameters. This appears exactly as you would call
 it from the command line.
@@ -101,26 +100,9 @@ An Example Command
 
 Let's step through an example command whose only function is to report basic information about the application
 itself, for demonstration purposes. Start by creating a new file at **/app/Commands/AppInfo.php**. It
-should contain the following code::
-
-    <?php
-
-    namespace App\Commands;
-
-    use CodeIgniter\CLI\BaseCommand;
-    use CodeIgniter\CLI\CLI;
+should contain the following code:
 
-    class AppInfo extends BaseCommand
-    {
-        protected $group       = 'demo';
-        protected $name        = 'app:info';
-        protected $description = 'Displays basic application information.';
-
-        public function run(array $params)
-        {
-            // ...
-        }
-    }
+.. literalinclude:: cli_commands/002.php
 
 If you run the **list** command, you will see the new command listed under its own ``demo`` group. If you take
 a close look, you should see how this works fairly easily. The ``$group`` property simply tells it how to organize
@@ -142,24 +124,18 @@ any CLI arguments after the command name for your use. If the CLI string was::
 
     > php spark foo bar baz
 
-Then **foo** is the command name, and the ``$params`` array would be::
+Then **foo** is the command name, and the ``$params`` array would be:
 
-    $params = ['bar', 'baz'];
+.. literalinclude:: cli_commands/003.php
+   :lines: 2-
 
 This can also be accessed through the :doc:`CLI </cli/cli_library>` library, but this already has your command removed
 from the string. These parameters can be used to customize how your scripts behave.
 
-Our demo command might have a ``run`` method something like::
+Our demo command might have a ``run`` method something like:
 
-    public function run(array $params)
-    {
-        CLI::write('PHP Version: '. CLI::color(phpversion(), 'yellow'));
-        CLI::write('CI Version: '. CLI::color(\CodeIgniter\CodeIgniter::CI_VERSION, 'yellow'));
-        CLI::write('APPPATH: '. CLI::color(APPPATH, 'yellow'));
-        CLI::write('SYSTEMPATH: '. CLI::color(SYSTEMPATH, 'yellow'));
-        CLI::write('ROOTPATH: '. CLI::color(ROOTPATH, 'yellow'));
-        CLI::write('Included files: '. CLI::color(count(get_included_files()), 'yellow'));
-    }
+.. literalinclude:: cli_commands/004.php
+   :lines: 2-
 
 ***********
 BaseCommand
@@ -176,22 +152,19 @@ be familiar with when creating your own commands. It also has a :doc:`Logger </g
         :param string $command: The name of another command to call.
         :param array $params: Additional CLI arguments to make available to that command.
 
-        This method allows you to run other commands during the execution of your current command::
+        This method allows you to run other commands during the execution of your current command:
 
-        $this->call('command_one');
-        $this->call('command_two', $params);
+        .. literalinclude:: cli_commands/005.php
+           :lines: 2-
 
     .. php:method:: showError(Throwable $e)
 
         :param Throwable $e: The exception to use for error reporting.
 
-        A convenience method to maintain a consistent and clear error output to the CLI::
+        A convenience method to maintain a consistent and clear error output to the CLI:
 
-            try {
-                . . .
-            } catch (\Exception $e) {
-                $this->showError($e);
-            }
+        .. literalinclude:: cli_commands/006.php
+           :lines: 2-
 
     .. php:method:: showHelp()
 
@@ -202,14 +175,7 @@ be familiar with when creating your own commands. It also has a :doc:`Logger </g
         :param array    $array: The  $key => $value array.
         :param integer  $pad: The pad spaces.
 
-        A method to calculate padding for $key => $value array output. The padding can be used to output a will formatted table in CLI::
-
-            $pad = $this->getPad($this->options, 6);
-
-            foreach ($this->options as $option => $description) {
-                CLI::write($tab . CLI::color(str_pad($option, $pad), 'green') . $description, 'yellow');
-            }
+        A method to calculate padding for $key => $value array output. The padding can be used to output a will formatted table in CLI:
 
-            // Output will be
-            -n                  Set migration namespace
-            -r                  override file
+        .. literalinclude:: cli_commands/007.php
+           :lines: 2-
diff --git a/user_guide_src/source/cli/cli_commands/001.php b/user_guide_src/source/cli/cli_commands/001.php
new file mode 100644
index 000000000000..0069c7247d43
--- /dev/null
+++ b/user_guide_src/source/cli/cli_commands/001.php
@@ -0,0 +1,3 @@
+<?php
+
+echo command('migrate:create TestMigration');
diff --git a/user_guide_src/source/cli/cli_commands/002.php b/user_guide_src/source/cli/cli_commands/002.php
new file mode 100644
index 000000000000..aa5d12a4438e
--- /dev/null
+++ b/user_guide_src/source/cli/cli_commands/002.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Commands;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+
+class AppInfo extends BaseCommand
+{
+    protected $group       = 'demo';
+    protected $name        = 'app:info';
+    protected $description = 'Displays basic application information.';
+
+    public function run(array $params)
+    {
+        // ...
+    }
+}
diff --git a/user_guide_src/source/cli/cli_commands/003.php b/user_guide_src/source/cli/cli_commands/003.php
new file mode 100644
index 000000000000..f6feec03380c
--- /dev/null
+++ b/user_guide_src/source/cli/cli_commands/003.php
@@ -0,0 +1,3 @@
+<?php
+
+$params = ['bar', 'baz'];
diff --git a/user_guide_src/source/cli/cli_commands/004.php b/user_guide_src/source/cli/cli_commands/004.php
new file mode 100644
index 000000000000..64b5af943315
--- /dev/null
+++ b/user_guide_src/source/cli/cli_commands/004.php
@@ -0,0 +1,11 @@
+<?php
+
+public function run(array $params)
+{
+    CLI::write('PHP Version: '. CLI::color(phpversion(), 'yellow'));
+    CLI::write('CI Version: '. CLI::color(\CodeIgniter\CodeIgniter::CI_VERSION, 'yellow'));
+    CLI::write('APPPATH: '. CLI::color(APPPATH, 'yellow'));
+    CLI::write('SYSTEMPATH: '. CLI::color(SYSTEMPATH, 'yellow'));
+    CLI::write('ROOTPATH: '. CLI::color(ROOTPATH, 'yellow'));
+    CLI::write('Included files: '. CLI::color(count(get_included_files()), 'yellow'));
+}
diff --git a/user_guide_src/source/cli/cli_commands/005.php b/user_guide_src/source/cli/cli_commands/005.php
new file mode 100644
index 000000000000..4d19af3a1ff9
--- /dev/null
+++ b/user_guide_src/source/cli/cli_commands/005.php
@@ -0,0 +1,4 @@
+<?php
+
+$this->call('command_one');
+$this->call('command_two', $params);
diff --git a/user_guide_src/source/cli/cli_commands/006.php b/user_guide_src/source/cli/cli_commands/006.php
new file mode 100644
index 000000000000..43c03cdab049
--- /dev/null
+++ b/user_guide_src/source/cli/cli_commands/006.php
@@ -0,0 +1,7 @@
+<?php
+
+try {
+    . . .
+} catch (\Exception $e) {
+    $this->showError($e);
+}
diff --git a/user_guide_src/source/cli/cli_commands/007.php b/user_guide_src/source/cli/cli_commands/007.php
new file mode 100644
index 000000000000..71456025ddac
--- /dev/null
+++ b/user_guide_src/source/cli/cli_commands/007.php
@@ -0,0 +1,11 @@
+<?php
+
+$pad = $this->getPad($this->options, 6);
+
+foreach ($this->options as $option => $description) {
+    CLI::write($tab . CLI::color(str_pad($option, $pad), 'green') . $description, 'yellow');
+}
+
+// Output will be
+-n                  Set migration namespace
+-r                  override file
diff --git a/user_guide_src/source/cli/cli_library.rst b/user_guide_src/source/cli/cli_library.rst
index 6ba08ab80554..946e264a0225 100644
--- a/user_guide_src/source/cli/cli_library.rst
+++ b/user_guide_src/source/cli/cli_library.rst
@@ -18,18 +18,9 @@ Initializing the Class
 ======================
 
 You do not need to create an instance of the CLI library, since all of it's methods are static. Instead, you simply
-need to ensure your controller can locate it via a ``use`` statement above your class::
+need to ensure your controller can locate it via a ``use`` statement above your class:
 
-    <?php
-
-    namespace App\Controllers;
-
-    use CodeIgniter\CLI\CLI;
-
-    class MyController extends \CodeIgniter\Controller
-    {
-        // ...
-    }
+.. literalinclude:: cli_library/001.php
 
 The class is automatically initialized when the file is loaded the first time.
 
@@ -40,56 +31,44 @@ Sometimes you need to ask the user for more information. They might not have pro
 arguments, or the script may have encountered an existing file and needs confirmation before overwriting. This is
 handled with the ``prompt()`` or ``promptByKey()`` method.
 
-You can provide a question by passing it in as the first parameter::
+You can provide a question by passing it in as the first parameter:
 
-    $color = CLI::prompt('What is your favorite color?');
+.. literalinclude:: cli_library/002.php
+   :lines: 2-
 
 You can provide a default answer that will be used if the user just hits enter by passing the default in the
-second parameter::
-
-    $color = CLI::prompt('What is your favorite color?', 'blue');
+second parameter:
 
-You can restrict the acceptable answers by passing in an array of allowed answers as the second parameter::
+.. literalinclude:: cli_library/003.php
+   :lines: 2-
 
-    $overwrite = CLI::prompt('File exists. Overwrite?', ['y','n']);
+You can restrict the acceptable answers by passing in an array of allowed answers as the second parameter:
 
-Finally, you can pass :ref:`validation <validation>` rules to the answer input as the third parameter::
+.. literalinclude:: cli_library/004.php
+   :lines: 2-
 
-    $email = CLI::prompt('What is your email?', null, 'required|valid_email');
+Finally, you can pass :ref:`validation <validation>` rules to the answer input as the third parameter:
 
-Validation rules can also be written in the array syntax.::
+.. literalinclude:: cli_library/005.php
+   :lines: 2-
 
-    $email = CLI::prompt('What is your email?', null, ['required', 'valid_email']);
+Validation rules can also be written in the array syntax.:
 
+.. literalinclude:: cli_library/006.php
+   :lines: 2-
 
 **promptByKey()**
 
 Predefined answers (options) for prompt sometimes need to be described or are too complex to select via their value.
-``promptByKey()`` allows the user to select an option by its key instead of its value::
+``promptByKey()`` allows the user to select an option by its key instead of its value:
 
-    $fruit = CLI::promptByKey('These are your choices:', ['The red apple', 'The plump orange', 'The ripe banana']);
+.. literalinclude:: cli_library/007.php
+   :lines: 2-
 
-    //These are your choices:
-    //  [0]  The red apple
-    //  [1]  The plump orange
-    //  [2]  The ripe banana
-    //
-    //[0, 1, 2]:
+Named keys are also possible:
 
-Named keys are also possible::
-
-    $fruit = CLI::promptByKey(['These are your choices:', 'Which would you like?'], [
-        'apple' => 'The red apple',
-        'orange' => 'The plump orange',
-        'banana' => 'The ripe banana'
-    ]);
-
-    //These are your choices:
-    //  [apple]   The red apple
-    //  [orange]  The plump orange
-    //  [banana]  The ripe banana
-    //
-    //Which would you like? [apple, orange, banana]:
+.. literalinclude:: cli_library/008.php
+   :lines: 2-
 
 Finally, you can pass :ref:`validation <validation>` rules to the answer input as the third parameter, the acceptable answers are automatically restricted to the passed options.
 
@@ -100,18 +79,21 @@ Providing Feedback
 
 Several methods are provided for you to provide feedback to your users. This can be as simple as a single status update
 or a complex table of information that wraps to the user's terminal window. At the core of this is the ``write()``
-method which takes the string to output as the first parameter::
+method which takes the string to output as the first parameter:
 
-    CLI::write('The rain in Spain falls mainly on the plains.');
+.. literalinclude:: cli_library/009.php
+   :lines: 2-
 
-You can change the color of the text by passing in a color name as the second parameter::
+You can change the color of the text by passing in a color name as the second parameter:
 
-    CLI::write('File created.', 'green');
+.. literalinclude:: cli_library/010.php
+   :lines: 2-
 
 This could be used to differentiate messages by status, or create 'headers' by using a different color. You can
-even set background colors by passing the color name in as the third parameter::
+even set background colors by passing the color name in as the third parameter:
 
-    CLI::write('File overwritten.', 'light_red', 'dark_gray');
+.. literalinclude:: cli_library/011.php
+   :lines: 2-
 
 The following foreground colors are available:
 
@@ -149,20 +131,20 @@ And a smaller number are available as background colors:
 Print functions identically to the ``write()`` method, except that it does not force a newline either before or after.
 Instead it prints it to the screen wherever the cursor is currently. This allows you to print multiple items all on
 the same line, from different calls. This is especially helpful when you want to show a status, do something, then
-print "Done" on the same line::
+print "Done" on the same line:
 
-    for ($i = 0; $i <= 10; $i++) {
-        CLI::print($i);
-    }
+.. literalinclude:: cli_library/012.php
+   :lines: 2-
 
 **color()**
 
 While the ``write()`` command will write a single line to the terminal, ending it with a EOL character, you can
 use the ``color()`` method to make a string fragment that can be used in the same way, except that it will not force
 an EOL after printing. This allows you to create multiple outputs on the same row. Or, more commonly, you can use
-it inside of a ``write()`` method to create a string of a different color inside::
+it inside of a ``write()`` method to create a string of a different color inside:
 
-    CLI::write("fileA \t". CLI::color('/path/to/file', 'white'), 'yellow');
+.. literalinclude:: cli_library/013.php
+   :lines: 2-
 
 This example would write a single line to the window, with ``fileA`` in yellow, followed by a tab, and then
 ``/path/to/file`` in white text.
@@ -172,60 +154,35 @@ This example would write a single line to the window, with ``fileA`` in yellow,
 If you need to output errors, you should use the appropriately named ``error()`` method. This writes light-red text
 to STDERR, instead of STDOUT, like ``write()`` and ``color()`` do. This can be useful if you have scripts watching
 for errors so they don't have to sift through all of the information, only the actual error messages. You use it
-exactly as you would the ``write()`` method::
+exactly as you would the ``write()`` method:
 
-    CLI::error('Cannot write to file: ' . $file);
+.. literalinclude:: cli_library/014.php
+   :lines: 2-
 
 **wrap()**
 
 This command will take a string, start printing it on the current line, and wrap it to a set length on new lines.
 This might be useful when displaying a list of options with descriptions that you want to wrap in the current
-window and not go off screen::
+window and not go off screen:
 
-    CLI::color("task1\t", 'yellow');
-    CLI::wrap("Some long description goes here that might be longer than the current window.");
+.. literalinclude:: cli_library/015.php
+   :lines: 2-
 
 By default, the string will wrap at the terminal width. Windows currently doesn't provide a way to determine
 the window size, so we default to 80 characters. If you want to restrict the width to something shorter that
 you can be pretty sure fits within the window, pass the maximum line-length as the second parameter. This
 will break the string at the nearest word barrier so that words are not broken.
-::
 
-    // Wrap the text at max 20 characters wide
-    CLI::wrap($description, 20);
+.. literalinclude:: cli_library/016.php
+   :lines: 2-
 
 You may find that you want a column on the left of titles, files, or tasks, while you want a column of text
 on the right with their descriptions. By default, this will wrap back to the left edge of the window, which
 doesn't allow things to line up in columns. In cases like this, you can pass in a number of spaces to pad
-every line after the first line, so that you will have a crisp column edge on the left::
-
-    $titles = [
-        'task1a',
-        'task1abc',
-    ];
-    $descriptions = [
-        'Lorem Ipsum is simply dummy text of the printing and typesetting industry.',
-        "Lorem Ipsum has been the industry's standard dummy text ever since the",
-    ];
-
-    // Determine the maximum length of all titles
-    // to determine the width of the left column
-    $maxlen = max(array_map('strlen', $titles));
-
-    for ($i = 0; $i < count($titles); $i++) {
-        CLI::write(
-            // Display the title on the left of the row
-            substr(
-                $titles[$i] . str_repeat(' ', $maxlen + 3),
-                0,
-                $maxlen + 3
-            ) .
-            // Wrap the descriptions in a right-hand column
-            // with its left side 3 characters wider than
-            // the longest item on the left.
-            CLI::wrap($descriptions[$i], 40, $maxlen + 3)
-        );
-    }
+every line after the first line, so that you will have a crisp column edge on the left:
+
+.. literalinclude:: cli_library/017.php
+   :lines: 2-
 
 Would create something like this:
 
@@ -240,17 +197,19 @@ Would create something like this:
 
 **newLine()**
 
-The ``newLine()`` method displays a blank line to the user. It does not take any parameters::
+The ``newLine()`` method displays a blank line to the user. It does not take any parameters:
 
-    CLI::newLine();
+.. literalinclude:: cli_library/018.php
+   :lines: 2-
 
 **clearScreen()**
 
 You can clear the current terminal window with the ``clearScreen()`` method. In most versions of Windows, this will
 simply insert 40 blank lines since Windows doesn't support this feature. Windows 10 bash integration should change
-this::
+this:
 
-    CLI::clearScreen();
+.. literalinclude:: cli_library/019.php
+   :lines: 2-
 
 **showProgress()**
 
@@ -266,30 +225,14 @@ This block is animated in place for a very nice effect.
 To use it, pass in the current step as the first parameter, and the total number of steps as the second parameter.
 The percent complete and the length of the display will be determined based on that number. When you are done,
 pass ``false`` as the first parameter and the progress bar will be removed.
-::
 
-    $totalSteps = count($tasks);
-    $currStep   = 1;
-
-    foreach ($tasks as $task) {
-        CLI::showProgress($currStep++, $totalSteps);
-        $task->run();
-    }
-
-    // Done, so erase it...
-    CLI::showProgress(false);
+.. literalinclude:: cli_library/020.php
+   :lines: 2-
 
 **table()**
 
-::
-
-    $thead = ['ID', 'Title', 'Updated At', 'Active'];
-    $tbody = [
-        [7, 'A great item title', '2017-11-15 10:35:02', 1],
-        [8, 'Another great item title', '2017-11-16 13:46:54', 0]
-    ];
-
-    CLI::table($tbody, $thead);
+.. literalinclude:: cli_library/021.php
+   :lines: 2-
 
 .. code-block:: none
 
@@ -305,13 +248,5 @@ pass ``false`` as the first parameter and the progress bar will be removed.
 Waits a certain number of seconds, optionally showing a wait message and
 waiting for a key press.
 
-::
-
-        // wait for specified interval, with countdown displayed
-        CLI::wait($seconds, true);
-
-        // show continuation message and wait for input
-        CLI::wait(0, false);
-
-        // wait for specified interval
-        CLI::wait($seconds, false);
+.. literalinclude:: cli_library/022.php
+   :lines: 2-
diff --git a/user_guide_src/source/cli/cli_library/001.php b/user_guide_src/source/cli/cli_library/001.php
new file mode 100644
index 000000000000..d0b0af7095c1
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/001.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Controllers;
+
+use CodeIgniter\CLI\CLI;
+
+class MyController extends \CodeIgniter\Controller
+{
+    // ...
+}
diff --git a/user_guide_src/source/cli/cli_library/002.php b/user_guide_src/source/cli/cli_library/002.php
new file mode 100644
index 000000000000..076bf0c4442c
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$color = CLI::prompt('What is your favorite color?');
diff --git a/user_guide_src/source/cli/cli_library/003.php b/user_guide_src/source/cli/cli_library/003.php
new file mode 100644
index 000000000000..7385fef697e3
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/003.php
@@ -0,0 +1,3 @@
+<?php
+
+$color = CLI::prompt('What is your favorite color?', 'blue');
diff --git a/user_guide_src/source/cli/cli_library/004.php b/user_guide_src/source/cli/cli_library/004.php
new file mode 100644
index 000000000000..10a92407bcbd
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/004.php
@@ -0,0 +1,3 @@
+<?php
+
+$overwrite = CLI::prompt('File exists. Overwrite?', ['y','n']);
diff --git a/user_guide_src/source/cli/cli_library/005.php b/user_guide_src/source/cli/cli_library/005.php
new file mode 100644
index 000000000000..7ca14c1494cb
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/005.php
@@ -0,0 +1,3 @@
+<?php
+
+$email = CLI::prompt('What is your email?', null, 'required|valid_email');
diff --git a/user_guide_src/source/cli/cli_library/006.php b/user_guide_src/source/cli/cli_library/006.php
new file mode 100644
index 000000000000..052a540ba758
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/006.php
@@ -0,0 +1,3 @@
+<?php
+
+$email = CLI::prompt('What is your email?', null, ['required', 'valid_email']);
diff --git a/user_guide_src/source/cli/cli_library/007.php b/user_guide_src/source/cli/cli_library/007.php
new file mode 100644
index 000000000000..474229ba6e6a
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/007.php
@@ -0,0 +1,10 @@
+<?php
+
+$fruit = CLI::promptByKey('These are your choices:', ['The red apple', 'The plump orange', 'The ripe banana']);
+
+//These are your choices:
+//  [0]  The red apple
+//  [1]  The plump orange
+//  [2]  The ripe banana
+//
+//[0, 1, 2]:
diff --git a/user_guide_src/source/cli/cli_library/008.php b/user_guide_src/source/cli/cli_library/008.php
new file mode 100644
index 000000000000..003c9a362444
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/008.php
@@ -0,0 +1,14 @@
+<?php
+
+$fruit = CLI::promptByKey(['These are your choices:', 'Which would you like?'], [
+    'apple' => 'The red apple',
+    'orange' => 'The plump orange',
+    'banana' => 'The ripe banana'
+]);
+
+//These are your choices:
+//  [apple]   The red apple
+//  [orange]  The plump orange
+//  [banana]  The ripe banana
+//
+//Which would you like? [apple, orange, banana]:
diff --git a/user_guide_src/source/cli/cli_library/009.php b/user_guide_src/source/cli/cli_library/009.php
new file mode 100644
index 000000000000..a5bc3f49ac65
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/009.php
@@ -0,0 +1,3 @@
+<?php
+
+CLI::write('The rain in Spain falls mainly on the plains.');
diff --git a/user_guide_src/source/cli/cli_library/010.php b/user_guide_src/source/cli/cli_library/010.php
new file mode 100644
index 000000000000..63b709c06a1f
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/010.php
@@ -0,0 +1,3 @@
+<?php
+
+CLI::write('File created.', 'green');
diff --git a/user_guide_src/source/cli/cli_library/011.php b/user_guide_src/source/cli/cli_library/011.php
new file mode 100644
index 000000000000..e2366162bcab
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/011.php
@@ -0,0 +1,3 @@
+<?php
+
+CLI::write('File overwritten.', 'light_red', 'dark_gray');
diff --git a/user_guide_src/source/cli/cli_library/012.php b/user_guide_src/source/cli/cli_library/012.php
new file mode 100644
index 000000000000..106bc6d8bfa7
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/012.php
@@ -0,0 +1,5 @@
+<?php
+
+for ($i = 0; $i <= 10; $i++) {
+    CLI::print($i);
+}
diff --git a/user_guide_src/source/cli/cli_library/013.php b/user_guide_src/source/cli/cli_library/013.php
new file mode 100644
index 000000000000..cfbeb34a3ffa
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/013.php
@@ -0,0 +1,3 @@
+<?php
+
+CLI::write("fileA \t". CLI::color('/path/to/file', 'white'), 'yellow');
diff --git a/user_guide_src/source/cli/cli_library/014.php b/user_guide_src/source/cli/cli_library/014.php
new file mode 100644
index 000000000000..4ceea8dc098a
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/014.php
@@ -0,0 +1,3 @@
+<?php
+
+CLI::error('Cannot write to file: ' . $file);
diff --git a/user_guide_src/source/cli/cli_library/015.php b/user_guide_src/source/cli/cli_library/015.php
new file mode 100644
index 000000000000..c43abc860710
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/015.php
@@ -0,0 +1,4 @@
+<?php
+
+CLI::color("task1\t", 'yellow');
+CLI::wrap("Some long description goes here that might be longer than the current window.");
diff --git a/user_guide_src/source/cli/cli_library/016.php b/user_guide_src/source/cli/cli_library/016.php
new file mode 100644
index 000000000000..f929d6b0d1d1
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/016.php
@@ -0,0 +1,4 @@
+<?php
+
+// Wrap the text at max 20 characters wide
+CLI::wrap($description, 20);
diff --git a/user_guide_src/source/cli/cli_library/017.php b/user_guide_src/source/cli/cli_library/017.php
new file mode 100644
index 000000000000..83b373487f3f
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/017.php
@@ -0,0 +1,29 @@
+<?php
+
+$titles = [
+    'task1a',
+    'task1abc',
+];
+$descriptions = [
+    'Lorem Ipsum is simply dummy text of the printing and typesetting industry.',
+    "Lorem Ipsum has been the industry's standard dummy text ever since the",
+];
+
+// Determine the maximum length of all titles
+// to determine the width of the left column
+$maxlen = max(array_map('strlen', $titles));
+
+for ($i = 0; $i < count($titles); $i++) {
+    CLI::write(
+        // Display the title on the left of the row
+        substr(
+            $titles[$i] . str_repeat(' ', $maxlen + 3),
+            0,
+            $maxlen + 3
+        ) .
+        // Wrap the descriptions in a right-hand column
+        // with its left side 3 characters wider than
+        // the longest item on the left.
+        CLI::wrap($descriptions[$i], 40, $maxlen + 3)
+    );
+}
diff --git a/user_guide_src/source/cli/cli_library/018.php b/user_guide_src/source/cli/cli_library/018.php
new file mode 100644
index 000000000000..88ebf6cf7609
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/018.php
@@ -0,0 +1,3 @@
+<?php
+
+CLI::newLine();
diff --git a/user_guide_src/source/cli/cli_library/019.php b/user_guide_src/source/cli/cli_library/019.php
new file mode 100644
index 000000000000..e08c79664ce3
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/019.php
@@ -0,0 +1,3 @@
+<?php
+
+CLI::clearScreen();
diff --git a/user_guide_src/source/cli/cli_library/020.php b/user_guide_src/source/cli/cli_library/020.php
new file mode 100644
index 000000000000..61b5fd37cfed
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/020.php
@@ -0,0 +1,12 @@
+<?php
+
+$totalSteps = count($tasks);
+$currStep   = 1;
+
+foreach ($tasks as $task) {
+    CLI::showProgress($currStep++, $totalSteps);
+    $task->run();
+}
+
+// Done, so erase it...
+CLI::showProgress(false);
diff --git a/user_guide_src/source/cli/cli_library/021.php b/user_guide_src/source/cli/cli_library/021.php
new file mode 100644
index 000000000000..54c25fca5c42
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/021.php
@@ -0,0 +1,9 @@
+<?php
+
+$thead = ['ID', 'Title', 'Updated At', 'Active'];
+$tbody = [
+    [7, 'A great item title', '2017-11-15 10:35:02', 1],
+    [8, 'Another great item title', '2017-11-16 13:46:54', 0]
+];
+
+CLI::table($tbody, $thead);
diff --git a/user_guide_src/source/cli/cli_library/022.php b/user_guide_src/source/cli/cli_library/022.php
new file mode 100644
index 000000000000..dcd1a2ef3d44
--- /dev/null
+++ b/user_guide_src/source/cli/cli_library/022.php
@@ -0,0 +1,10 @@
+<?php
+
+// wait for specified interval, with countdown displayed
+CLI::wait($seconds, true);
+
+// show continuation message and wait for input
+CLI::wait(0, false);
+
+// wait for specified interval
+CLI::wait($seconds, false);
diff --git a/user_guide_src/source/cli/cli_request.rst b/user_guide_src/source/cli/cli_request.rst
index 0fa29f2735ab..01302b24b3da 100644
--- a/user_guide_src/source/cli/cli_request.rst
+++ b/user_guide_src/source/cli/cli_request.rst
@@ -12,42 +12,40 @@ Additional Accessors
 
 **getSegments()**
 
-Returns an array of the command line arguments deemed to be part of a path::
+Returns an array of the command line arguments deemed to be part of a path:
 
-    // command line: php index.php users 21 profile --foo bar
-    echo $request->getSegments();  // ['users', '21', 'profile']
+.. literalinclude:: cli_request/001.php
+   :lines: 2-
 
 **getPath()**
 
-Returns the reconstructed path as a string::
+Returns the reconstructed path as a string:
 
-    // command line: php index.php users 21 profile --foo bar
-    echo $request->getPath();  // users/21/profile
+.. literalinclude:: cli_request/002.php
+   :lines: 2-
 
 **getOptions()**
 
-Returns an array of the command line arguments deemed to be options::
+Returns an array of the command line arguments deemed to be options:
 
-    // command line: php index.php users 21 profile --foo bar
-    echo $request->getOptions();  // ['foo' => 'bar']
+.. literalinclude:: cli_request/003.php
+   :lines: 2-
 
 **getOption($which)**
 
-Returns the value of a specific command line argument deemed to be an option::
+Returns the value of a specific command line argument deemed to be an option:
 
-    // command line: php index.php users 21 profile --foo bar
-    echo $request->getOption('foo');  // bar
-    echo $request->getOption('notthere'); // null
+.. literalinclude:: cli_request/004.php
+   :lines: 2-
 
 **getOptionString()**
 
-Returns the reconstructed command line string for the options::
+Returns the reconstructed command line string for the options:
 
-    // command line: php index.php users 21 profile --foo bar
-    echo $request->getOptionString();  // -foo bar
+.. literalinclude:: cli_request/005.php
+   :lines: 2-
 
-Passing ``true`` to the first argument will try to write long options using two dashes::
+Passing ``true`` to the first argument will try to write long options using two dashes:
 
-    // php index.php user 21 --foo bar -f
-    echo $request->getOptionString(); // -foo bar -f
-    echo $request->getOptionString(true); // --foo bar -f
+.. literalinclude:: cli_request/006.php
+   :lines: 2-
diff --git a/user_guide_src/source/cli/cli_request/001.php b/user_guide_src/source/cli/cli_request/001.php
new file mode 100644
index 000000000000..ca92a2724f32
--- /dev/null
+++ b/user_guide_src/source/cli/cli_request/001.php
@@ -0,0 +1,4 @@
+<?php
+
+// command line: php index.php users 21 profile --foo bar
+echo $request->getSegments();  // ['users', '21', 'profile']
diff --git a/user_guide_src/source/cli/cli_request/002.php b/user_guide_src/source/cli/cli_request/002.php
new file mode 100644
index 000000000000..55e498d1cdf2
--- /dev/null
+++ b/user_guide_src/source/cli/cli_request/002.php
@@ -0,0 +1,4 @@
+<?php
+
+// command line: php index.php users 21 profile --foo bar
+echo $request->getPath();  // users/21/profile
diff --git a/user_guide_src/source/cli/cli_request/003.php b/user_guide_src/source/cli/cli_request/003.php
new file mode 100644
index 000000000000..29d820ac0d55
--- /dev/null
+++ b/user_guide_src/source/cli/cli_request/003.php
@@ -0,0 +1,4 @@
+<?php
+
+// command line: php index.php users 21 profile --foo bar
+echo $request->getOptions();  // ['foo' => 'bar']
diff --git a/user_guide_src/source/cli/cli_request/004.php b/user_guide_src/source/cli/cli_request/004.php
new file mode 100644
index 000000000000..91e4f020361d
--- /dev/null
+++ b/user_guide_src/source/cli/cli_request/004.php
@@ -0,0 +1,5 @@
+<?php
+
+// command line: php index.php users 21 profile --foo bar
+echo $request->getOption('foo');  // bar
+echo $request->getOption('notthere'); // null
diff --git a/user_guide_src/source/cli/cli_request/005.php b/user_guide_src/source/cli/cli_request/005.php
new file mode 100644
index 000000000000..2aef44f73d5a
--- /dev/null
+++ b/user_guide_src/source/cli/cli_request/005.php
@@ -0,0 +1,4 @@
+<?php
+
+// command line: php index.php users 21 profile --foo bar
+echo $request->getOptionString();  // -foo bar
diff --git a/user_guide_src/source/cli/cli_request/006.php b/user_guide_src/source/cli/cli_request/006.php
new file mode 100644
index 000000000000..d7efe5b40095
--- /dev/null
+++ b/user_guide_src/source/cli/cli_request/006.php
@@ -0,0 +1,5 @@
+<?php
+
+// php index.php user 21 --foo bar -f
+echo $request->getOptionString(); // -foo bar -f
+echo $request->getOptionString(true); // --foo bar -f
diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst
index c9aa280c7a9d..84d028c718d8 100644
--- a/user_guide_src/source/concepts/autoloader.rst
+++ b/user_guide_src/source/concepts/autoloader.rst
@@ -37,12 +37,10 @@ Namespaces
 The recommended method for organizing your classes is to create one or more namespaces for your
 application's files. This is most important for any business-logic related classes, entity classes,
 etc. The ``psr4`` array in the configuration file allows you to map the namespace to the directory
-those classes can be found in::
+those classes can be found in:
 
-    $psr4 = [
-        'App'         => APPPATH,
-        'CodeIgniter' => SYSTEMPATH,
-    ];
+.. literalinclude:: autoloader/001.php
+   :lines: 2-
 
 The key of each row is the namespace itself. This does not need a trailing slash. If you use double-quotes
 to define the array, be sure to escape the backward slash. That means that it would be ``My\\App``,
@@ -52,9 +50,10 @@ have a trailing slash.
 By default, the application folder is namespace to the ``App`` namespace. While you are not forced to namespace the controllers,
 libraries, or models in the application directory, if you do, they will be found under the ``App`` namespace.
 You may change this namespace by editing the **/app/Config/Constants.php** file and setting the
-new namespace value under the ``APP_NAMESPACE`` setting::
+new namespace value under the ``APP_NAMESPACE`` setting:
 
-    define('APP_NAMESPACE', 'App');
+.. literalinclude:: autoloader/002.php
+   :lines: 2-
 
 You will need to modify any existing files that are referencing the current namespace.
 
@@ -67,11 +66,10 @@ Classmap
 
 The classmap is used extensively by CodeIgniter to eke the last ounces of performance out of the system
 by not hitting the file-system with extra ``is_file()`` calls. You can use the classmap to link to
-third-party libraries that are not namespaced::
+third-party libraries that are not namespaced:
 
-    $classmap = [
-        'Markdown' => APPPATH . 'third_party/markdown.php'
-    ];
+.. literalinclude:: autoloader/003.php
+   :lines: 2-
 
 The key of each row is the name of the class that you want to locate. The value is the path to locate it at.
 
diff --git a/user_guide_src/source/concepts/autoloader/001.php b/user_guide_src/source/concepts/autoloader/001.php
new file mode 100644
index 000000000000..45ae094fbb3f
--- /dev/null
+++ b/user_guide_src/source/concepts/autoloader/001.php
@@ -0,0 +1,6 @@
+<?php
+
+$psr4 = [
+    'App'         => APPPATH,
+    'CodeIgniter' => SYSTEMPATH,
+];
diff --git a/user_guide_src/source/concepts/autoloader/002.php b/user_guide_src/source/concepts/autoloader/002.php
new file mode 100644
index 000000000000..bf19e818c668
--- /dev/null
+++ b/user_guide_src/source/concepts/autoloader/002.php
@@ -0,0 +1,3 @@
+<?php
+
+define('APP_NAMESPACE', 'App');
diff --git a/user_guide_src/source/concepts/autoloader/003.php b/user_guide_src/source/concepts/autoloader/003.php
new file mode 100644
index 000000000000..43fc56c171e0
--- /dev/null
+++ b/user_guide_src/source/concepts/autoloader/003.php
@@ -0,0 +1,5 @@
+<?php
+
+$classmap = [
+    'Markdown' => APPPATH . 'third_party/markdown.php'
+];
diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst
index 978c6bc26fe9..43bca81f3abd 100644
--- a/user_guide_src/source/concepts/factories.rst
+++ b/user_guide_src/source/concepts/factories.rst
@@ -17,29 +17,26 @@ multiple instances loaded across your app.
 
 Anything can be loaded by Factories, but the best examples are those classes that are used
 to work on or transmit common data. The framework itself uses Factories internally, e.g., to
-make sure the correct configuration is loaded when using the ``Config`` class. 
+make sure the correct configuration is loaded when using the ``Config`` class.
 
 Take a look at ``Models`` as an example. You can access the Factory specific to ``Models``
 by using the magic static method of the Factories class, ``Factories::models()``. Because of
 the common path structure for namespaces and folders, Factories know that the model files
-and classes are found within **Models**, so you can request a model by its shorthand base name::
+and classes are found within **Models**, so you can request a model by its shorthand base name:
 
-    use CodeIgniter\Config\Factories;
+.. literalinclude:: factories/001.php
+   :lines: 2-
 
-    $users = Factories::models('UserModel');
+Or you could also request a specific class:
 
-Or you could also request a specific class::
-
-    $widgets = Factories::models('Some\Namespace\Models\WidgetModel');
+.. literalinclude:: factories/002.php
+   :lines: 2-
 
 Next time you ask for the same class anywhere in your code, ``Factories`` will be sure
-you get back the instance as before::
+you get back the instance as before:
 
-    class SomeOtherClass
-    {
-        $widgets = Factories::models('WidgetModel');
-        // ...
-    }
+.. literalinclude:: factories/003.php
+   :lines: 2-
 
 Factory Parameters
 ==================
@@ -50,10 +47,10 @@ These directives will override the default options configured for each component
 Any more parameters passed at the same time will be forwarded on to the class
 constructor, making it easy to configure your class instance on-the-fly. For example, say
 your app uses a separate database for authentication and you want to be sure that any attempts
-to access user records always go through that connection::
+to access user records always go through that connection:
 
-    $conn  = db_connect('AuthDatabase');
-    $users = Factories::models('UserModel', [], $conn);
+.. literalinclude:: factories/004.php
+   :lines: 2-
 
 Now any time the ``UserModel`` is loaded from ``Factories`` it will in fact be returning a
 class instance that uses the alternate database connection.
@@ -96,21 +93,9 @@ Configurations
 To set default component options, create a new Config files at **app/Config/Factory.php**
 that supplies options as an array property that matches the name of the component. For example,
 if you wanted to ensure that all Filters used by your app were valid framework instances,
-your **Factories.php** file might look like this::
-
-    <?php
-
-    namespace Config;
-
-    use CodeIgniter\Config\Factory as BaseFactory;
-    use CodeIgniter\Filters\FilterInterface;
+your **Factories.php** file might look like this:
 
-    class Factories extends BaseFactory
-    {
-        public $filters = [
-            'instanceOf' => FilterInterface::class,
-        ];
-    }
+.. literalinclude:: factories/005.php
 
 This would prevent conflict of an unrelated third-party module which happened to have an
 unrelated "Filters" path in its namespace.
@@ -120,12 +105,10 @@ setOptions Method
 
 The ``Factories`` class has a static method to allow runtime option configuration: simply
 supply the desired array of options using the ``setOptions()`` method and they will be
-merged with the default values and stored for the next call::
+merged with the default values and stored for the next call:
 
-    Factories::setOptions('filters', [
-        'instanceOf' => FilterInterface::class,
-        'prefersApp' => false,
-    ]);
+.. literalinclude:: factories/006.php
+   :lines: 2-
 
 Parameter Options
 -----------------
@@ -137,7 +120,7 @@ names as keys to each overriding value.
 
 For example, by default ``Factories`` assumes that you want to locate a shared instance of
 a component. By adding a second parameter to the magic static call, you can control whether
-that single call will return a new or shared instance::
+that single call will return a new or shared instance:
 
-    $users = Factories::models('UserModel', ['getShared' => true]); // Default; will always be the same instance
-    $other = Factories::models('UserModel', ['getShared' => false]); // Will always create a new instance
+.. literalinclude:: factories/007.php
+   :lines: 2-
\ No newline at end of file
diff --git a/user_guide_src/source/concepts/factories/001.php b/user_guide_src/source/concepts/factories/001.php
new file mode 100644
index 000000000000..6b6e5f10e8ce
--- /dev/null
+++ b/user_guide_src/source/concepts/factories/001.php
@@ -0,0 +1,5 @@
+<?php
+
+use CodeIgniter\Config\Factories;
+
+$users = Factories::models('UserModel');
diff --git a/user_guide_src/source/concepts/factories/002.php b/user_guide_src/source/concepts/factories/002.php
new file mode 100644
index 000000000000..cbc19d8b2730
--- /dev/null
+++ b/user_guide_src/source/concepts/factories/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$widgets = Factories::models('Some\Namespace\Models\WidgetModel');
diff --git a/user_guide_src/source/concepts/factories/003.php b/user_guide_src/source/concepts/factories/003.php
new file mode 100644
index 000000000000..6c5b966f35cc
--- /dev/null
+++ b/user_guide_src/source/concepts/factories/003.php
@@ -0,0 +1,7 @@
+<?php
+
+class SomeOtherClass
+{
+    $widgets = Factories::models('WidgetModel');
+    // ...
+}
diff --git a/user_guide_src/source/concepts/factories/004.php b/user_guide_src/source/concepts/factories/004.php
new file mode 100644
index 000000000000..9f6360b8ff5c
--- /dev/null
+++ b/user_guide_src/source/concepts/factories/004.php
@@ -0,0 +1,4 @@
+<?php
+
+$conn  = db_connect('AuthDatabase');
+$users = Factories::models('UserModel', [], $conn);
diff --git a/user_guide_src/source/concepts/factories/005.php b/user_guide_src/source/concepts/factories/005.php
new file mode 100644
index 000000000000..10a82b828d73
--- /dev/null
+++ b/user_guide_src/source/concepts/factories/005.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\Factory as BaseFactory;
+use CodeIgniter\Filters\FilterInterface;
+
+class Factories extends BaseFactory
+{
+    public $filters = [
+        'instanceOf' => FilterInterface::class,
+    ];
+}
diff --git a/user_guide_src/source/concepts/factories/006.php b/user_guide_src/source/concepts/factories/006.php
new file mode 100644
index 000000000000..98c1c70888ac
--- /dev/null
+++ b/user_guide_src/source/concepts/factories/006.php
@@ -0,0 +1,6 @@
+<?php
+
+Factories::setOptions('filters', [
+    'instanceOf' => FilterInterface::class,
+    'prefersApp' => false,
+]);
diff --git a/user_guide_src/source/concepts/factories/007.php b/user_guide_src/source/concepts/factories/007.php
new file mode 100644
index 000000000000..4a3f894c7286
--- /dev/null
+++ b/user_guide_src/source/concepts/factories/007.php
@@ -0,0 +1,4 @@
+<?php
+
+$users = Factories::models('UserModel', ['getShared' => true]); // Default; will always be the same instance
+$other = Factories::models('UserModel', ['getShared' => false]); // Will always create a new instance
diff --git a/user_guide_src/source/concepts/http.rst b/user_guide_src/source/concepts/http.rst
index d5c82f2a1492..dfbb8e29f8ee 100644
--- a/user_guide_src/source/concepts/http.rst
+++ b/user_guide_src/source/concepts/http.rst
@@ -68,34 +68,10 @@ Working with Requests and Responses
 
 While PHP provides ways to interact with the request and response headers, CodeIgniter, like most frameworks,
 abstracts them so that you have a consistent, simple interface to them. The :doc:`IncomingRequest class </incoming/incomingrequest>`
-is an object-oriented representation of the HTTP request. It provides everything you need::
+is an object-oriented representation of the HTTP request. It provides everything you need:
 
-    use CodeIgniter\HTTP\IncomingRequest;
-
-    $request = service('request');
-
-    // the URI being requested (i.e., /about)
-    $request->getUri()->getPath();
-
-    // Retrieve $_GET and $_POST variables
-    $request->getGet('foo');
-    $request->getPost('foo');
-
-    // Retrieve from $_REQUEST which should include
-    // both $_GET and $_POST contents
-    $request->getVar('foo');
-
-    // Retrieve JSON from AJAX calls
-    $request->getJSON();
-
-    // Retrieve server variables
-    $request->getServer('Host');
-
-    // Retrieve an HTTP Request header, with case-insensitive names
-    $request->getHeader('host');
-    $request->getHeader('Content-Type');
-
-    $request->getMethod();  // get, post, put, etc
+.. literalinclude:: http/001.php
+   :lines: 2-
 
 The request class does a lot of work in the background for you, that you never need to worry about.
 The ``isAJAX()`` and ``isSecure()`` methods check several different methods to determine the correct answer.
@@ -103,19 +79,9 @@ The ``isAJAX()`` and ``isSecure()`` methods check several different methods to d
 .. note:: The ``isAJAX()`` method depends on the ``X-Requested-With`` header, which in some cases is not sent by default in XHR requests via JavaScript (i.e., fetch). See the :doc:`AJAX Requests </general/ajax>` section on how to avoid this problem.
 
 CodeIgniter also provides a :doc:`Response class </outgoing/response>` that is an object-oriented representation
-of the HTTP response. This gives you an easy and powerful way to construct your response to the client::
-
-  use CodeIgniter\HTTP\Response;
-
-  $response = service('response');
-
-  $response->setStatusCode(Response::HTTP_OK);
-  $response->setBody($output);
-  $response->setHeader('Content-type', 'text/html');
-  $response->noCache();
+of the HTTP response. This gives you an easy and powerful way to construct your response to the client:
 
-  // Sends the output to the browser
-  // This is typically handled by the framework
-  $response->send();
+.. literalinclude:: http/002.php
+   :lines: 2-
 
 In addition, the Response class allows you to work the HTTP cache layer for the best performance.
diff --git a/user_guide_src/source/concepts/http/001.php b/user_guide_src/source/concepts/http/001.php
new file mode 100644
index 000000000000..59b5798a3541
--- /dev/null
+++ b/user_guide_src/source/concepts/http/001.php
@@ -0,0 +1,28 @@
+<?php
+
+use CodeIgniter\HTTP\IncomingRequest;
+
+$request = service('request');
+
+// the URI being requested (i.e., /about)
+$request->getUri()->getPath();
+
+// Retrieve $_GET and $_POST variables
+$request->getGet('foo');
+$request->getPost('foo');
+
+// Retrieve from $_REQUEST which should include
+// both $_GET and $_POST contents
+$request->getVar('foo');
+
+// Retrieve JSON from AJAX calls
+$request->getJSON();
+
+// Retrieve server variables
+$request->getServer('Host');
+
+// Retrieve an HTTP Request header, with case-insensitive names
+$request->getHeader('host');
+$request->getHeader('Content-Type');
+
+$request->getMethod();  // get, post, put, etc
diff --git a/user_guide_src/source/concepts/http/002.php b/user_guide_src/source/concepts/http/002.php
new file mode 100644
index 000000000000..e5fc38efeec2
--- /dev/null
+++ b/user_guide_src/source/concepts/http/002.php
@@ -0,0 +1,14 @@
+<?php
+
+use CodeIgniter\HTTP\Response;
+
+$response = service('response');
+
+$response->setStatusCode(Response::HTTP_OK);
+$response->setBody($output);
+$response->setHeader('Content-type', 'text/html');
+$response->noCache();
+
+// Sends the output to the browser
+// This is typically handled by the framework
+$response->send();
diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst
index 8ede85bfbd62..66f569a701ea 100644
--- a/user_guide_src/source/concepts/services.rst
+++ b/user_guide_src/source/concepts/services.rst
@@ -14,9 +14,10 @@ of hard-coding a class name to load, the classes to call are defined within a ve
 configuration file. This file acts as a type of factory to create new instances of the required class.
 
 A quick example will probably make things clearer, so imagine that you need to pull in an instance
-of the Timer class. The simplest method would simply be to create a new instance of that class::
+of the Timer class. The simplest method would simply be to create a new instance of that class:
 
-    $timer = new \CodeIgniter\Debug\Timer();
+.. literalinclude:: services/001.php
+   :lines: 2-
 
 And this works great. Until you decide that you want to use a different timer class in its place.
 Maybe this one has some advanced reporting the default timer does not provide. In order to do this,
@@ -28,9 +29,10 @@ come in handy.
 Instead of creating the instance ourself, we let a central class create an instance of the
 class for us. This class is kept very simple. It only contains a method for each class that we want
 to use as a service. The method typically returns a shared instance of that class, passing any dependencies
-it might have into it. Then, we would replace our timer creation code with code that calls this new class::
+it might have into it. Then, we would replace our timer creation code with code that calls this new class:
 
-    $timer = \Config\Services::timer();
+.. literalinclude:: services/002.php
+   :lines: 2-
 
 When you need to change the implementation used, you can modify the services configuration file, and
 the change happens automatically throughout your application without you having to do anything. Now
@@ -39,7 +41,6 @@ error-resistant.
 
 .. note:: It is recommended to only create services within controllers. Other files, like models and libraries should have the dependencies either passed into the constructor or through a setter method.
 
-
 Convenience Functions
 ---------------------
 
@@ -48,18 +49,21 @@ Two functions have been provided for getting a service. These functions are alwa
 The first is ``service()`` which returns a new instance of the requested service. The only
 required parameter is the service name. This is the same as the method name within the Services
 file always returns a SHARED instance of the class, so calling the function multiple times should
-always return the same instance::
+always return the same instance:
 
-    $logger = service('logger');
+.. literalinclude:: services/003.php
+   :lines: 2-
 
-If the creation method requires additional parameters, they can be passed after the service name::
+If the creation method requires additional parameters, they can be passed after the service name:
 
-    $renderer = service('renderer', APPPATH . 'views/');
+.. literalinclude:: services/004.php
+   :lines: 2-
 
 The second function, ``single_service()`` works just like ``service()`` but returns a new instance of
-the class::
+the class:
 
-    $logger = single_service('logger');
+.. literalinclude:: services/005.php
+   :lines: 2-
 
 Defining Services
 =================
@@ -72,20 +76,16 @@ the classes are compatible.
 
 For example, the ``RouterCollection`` class implements the ``RouterCollectionInterface``. When you
 want to create a replacement that provides a different way to create routes, you just need to
-create a new class that implements the ``RouterCollectionInterface``::
+create a new class that implements the ``RouterCollectionInterface``:
 
-    class MyRouter implements \CodeIgniter\Router\RouteCollectionInterface
-    {
-        // Implement required methods here.
-    }
+.. literalinclude:: services/006.php
+   :lines: 2-
 
 Finally, modify **/app/Config/Services.php** to create a new instance of ``MyRouter``
-instead of ``CodeIgniter\Router\RouterCollection``::
+instead of ``CodeIgniter\Router\RouterCollection``:
 
-    public static function routes()
-    {
-        return new \App\Router\MyRouter();
-    }
+.. literalinclude:: services/007.php
+   :lines: 2-
 
 Allowing Parameters
 -------------------
@@ -96,17 +96,16 @@ Since the services file is a very simple class, it is easy to make this work.
 A good example is the ``renderer`` service. By default, we want this class to be able
 to find the views at ``APPPATH.views/``. We want the developer to have the option of
 changing that path, though, if their needs require it. So the class accepts the ``$viewPath``
-as a constructor parameter. The service method looks like this::
+as a constructor parameter. The service method looks like this:
 
-    public static function renderer($viewPath = APPPATH . 'views/')
-    {
-        return new \CodeIgniter\View\View($viewPath);
-    }
+.. literalinclude:: services/008.php
+   :lines: 2-
 
 This sets the default path in the constructor method, but allows for easily changing
-the path it uses::
+the path it uses:
 
-    $renderer = \Config\Services::renderer('/shared/views');
+.. literalinclude:: services/009.php
+   :lines: 2-
 
 Shared Classes
 -----------------
@@ -115,19 +114,10 @@ There are occasions where you need to require that only a single instance of a s
 is created. This is easily handled with the ``getSharedInstance()`` method that is called from within the
 factory method. This handles checking if an instance has been created and saved
 within the class, and, if not, creates a new one. All of the factory methods provide a
-``$getShared = true`` value as the last parameter. You should stick to the method also::
-
-    class Services
-    {
-        public static function routes($getShared = false)
-        {
-            if (! $getShared) {
-                return new \CodeIgniter\Router\RouteCollection();
-            }
+``$getShared = true`` value as the last parameter. You should stick to the method also:
 
-            return static::getSharedInstance('routes');
-        }
-    }
+.. literalinclude:: services/010.php
+   :lines: 2-
 
 Service Discovery
 -----------------
@@ -144,25 +134,14 @@ A small example should clarify this.
 
 Imagine that you've created a new directory, ``Blog`` in your root directory. This will hold a **blog module** with controllers,
 models, etc, and you'd like to make some of the classes available as a service. The first step is to create a new file:
-``Blog\Config\Services.php``. The skeleton of the file should be::
-
-    <?php
-
-    namespace Blog\Config;
-
-    use CodeIgniter\Config\BaseService;
+``Blog\Config\Services.php``. The skeleton of the file should be:
 
-    class Services extends BaseService
-    {
-        public static function postManager()
-        {
-            // ...
-        }
-    }
+.. literalinclude:: services/011.php
 
 Now you can use this file as described above. When you want to grab the posts service from any controller, you
-would simply use the framework's ``Config\Services`` class to grab your service::
+would simply use the framework's ``Config\Services`` class to grab your service:
 
-    $postManager = Config\Services::postManager();
+.. literalinclude:: services/012.php
+   :lines: 2-
 
 .. note:: If multiple Services files have the same method name, the first one found will be the instance returned.
diff --git a/user_guide_src/source/concepts/services/001.php b/user_guide_src/source/concepts/services/001.php
new file mode 100644
index 000000000000..1ef57b345f26
--- /dev/null
+++ b/user_guide_src/source/concepts/services/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$timer = new \CodeIgniter\Debug\Timer();
diff --git a/user_guide_src/source/concepts/services/002.php b/user_guide_src/source/concepts/services/002.php
new file mode 100644
index 000000000000..cb292ecaeb42
--- /dev/null
+++ b/user_guide_src/source/concepts/services/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$timer = \Config\Services::timer();
diff --git a/user_guide_src/source/concepts/services/003.php b/user_guide_src/source/concepts/services/003.php
new file mode 100644
index 000000000000..ebbd1d89c30d
--- /dev/null
+++ b/user_guide_src/source/concepts/services/003.php
@@ -0,0 +1,3 @@
+<?php
+
+$logger = service('logger');
diff --git a/user_guide_src/source/concepts/services/004.php b/user_guide_src/source/concepts/services/004.php
new file mode 100644
index 000000000000..2e044fe27625
--- /dev/null
+++ b/user_guide_src/source/concepts/services/004.php
@@ -0,0 +1,3 @@
+<?php
+
+$renderer = service('renderer', APPPATH . 'views/');
diff --git a/user_guide_src/source/concepts/services/005.php b/user_guide_src/source/concepts/services/005.php
new file mode 100644
index 000000000000..8f2bcf566ce2
--- /dev/null
+++ b/user_guide_src/source/concepts/services/005.php
@@ -0,0 +1,3 @@
+<?php
+
+$logger = single_service('logger');
diff --git a/user_guide_src/source/concepts/services/006.php b/user_guide_src/source/concepts/services/006.php
new file mode 100644
index 000000000000..65d27f7c734a
--- /dev/null
+++ b/user_guide_src/source/concepts/services/006.php
@@ -0,0 +1,6 @@
+<?php
+
+class MyRouter implements \CodeIgniter\Router\RouteCollectionInterface
+{
+    // Implement required methods here.
+}
diff --git a/user_guide_src/source/concepts/services/007.php b/user_guide_src/source/concepts/services/007.php
new file mode 100644
index 000000000000..64a1119f0ace
--- /dev/null
+++ b/user_guide_src/source/concepts/services/007.php
@@ -0,0 +1,6 @@
+<?php
+
+public static function routes()
+{
+    return new \App\Router\MyRouter();
+}
diff --git a/user_guide_src/source/concepts/services/008.php b/user_guide_src/source/concepts/services/008.php
new file mode 100644
index 000000000000..36efba2156bd
--- /dev/null
+++ b/user_guide_src/source/concepts/services/008.php
@@ -0,0 +1,6 @@
+<?php
+
+public static function renderer($viewPath = APPPATH . 'views/')
+{
+    return new \CodeIgniter\View\View($viewPath);
+}
diff --git a/user_guide_src/source/concepts/services/009.php b/user_guide_src/source/concepts/services/009.php
new file mode 100644
index 000000000000..1bdf73954e16
--- /dev/null
+++ b/user_guide_src/source/concepts/services/009.php
@@ -0,0 +1,3 @@
+<?php
+
+$renderer = \Config\Services::renderer('/shared/views');
diff --git a/user_guide_src/source/concepts/services/010.php b/user_guide_src/source/concepts/services/010.php
new file mode 100644
index 000000000000..e3b031234d81
--- /dev/null
+++ b/user_guide_src/source/concepts/services/010.php
@@ -0,0 +1,13 @@
+<?php
+
+class Services
+{
+    public static function routes($getShared = false)
+    {
+        if (! $getShared) {
+            return new \CodeIgniter\Router\RouteCollection();
+        }
+
+        return static::getSharedInstance('routes');
+    }
+}
diff --git a/user_guide_src/source/concepts/services/011.php b/user_guide_src/source/concepts/services/011.php
new file mode 100644
index 000000000000..f7695f84b09e
--- /dev/null
+++ b/user_guide_src/source/concepts/services/011.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Blog\Config;
+
+use CodeIgniter\Config\BaseService;
+
+class Services extends BaseService
+{
+    public static function postManager()
+    {
+        // ...
+    }
+}
diff --git a/user_guide_src/source/concepts/services/012.php b/user_guide_src/source/concepts/services/012.php
new file mode 100644
index 000000000000..cc4b63b4e20c
--- /dev/null
+++ b/user_guide_src/source/concepts/services/012.php
@@ -0,0 +1,3 @@
+<?php
+
+$postManager = Config\Services::postManager();
diff --git a/user_guide_src/source/database/call_function.rst b/user_guide_src/source/database/call_function.rst
index 9617c2361df0..40045caf1df2 100644
--- a/user_guide_src/source/database/call_function.rst
+++ b/user_guide_src/source/database/call_function.rst
@@ -13,9 +13,10 @@ This function enables you to call PHP database functions that are not
 natively included in CodeIgniter, in a platform-independent manner. For
 example, let's say you want to call the ``mysql_get_client_info()``
 function, which is **not** natively supported by CodeIgniter. You could
-do so like this::
+do so like this:
 
-    $db->callFunction('get_client_info');
+.. literalinclude:: call_function/001.php
+   :lines: 2-
 
 You must supply the name of the function, **without** the mysql\_
 prefix, in the first parameter. The prefix is added automatically based
@@ -27,17 +28,16 @@ how useful this function can be in terms of portability.
 Any parameters needed by the function you are calling will be added to
 the second parameter.
 
-::
-
-    $db->callFunction('some_function', $param1, $param2, etc..);
+.. literalinclude:: call_function/002.php
+   :lines: 2-
 
 Often, you will either need to supply a database connection ID or a
-database result ID. The connection ID can be accessed using::
-
-    $db->connID;
+database result ID. The connection ID can be accessed using:
 
-The result ID can be accessed from within your result object, like this::
+.. literalinclude:: call_function/003.php
+   :lines: 2-
 
-    $query = $db->query("SOME QUERY");
+The result ID can be accessed from within your result object, like this:
 
-    $query->resultID;
+.. literalinclude:: call_function/004.php
+   :lines: 2-
diff --git a/user_guide_src/source/database/call_function/001.php b/user_guide_src/source/database/call_function/001.php
new file mode 100644
index 000000000000..ee964da51c3a
--- /dev/null
+++ b/user_guide_src/source/database/call_function/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$db->callFunction('get_client_info');
diff --git a/user_guide_src/source/database/call_function/002.php b/user_guide_src/source/database/call_function/002.php
new file mode 100644
index 000000000000..807a43266dac
--- /dev/null
+++ b/user_guide_src/source/database/call_function/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$db->callFunction('some_function', $param1, $param2, etc..);
diff --git a/user_guide_src/source/database/call_function/003.php b/user_guide_src/source/database/call_function/003.php
new file mode 100644
index 000000000000..320c5c4ecfd9
--- /dev/null
+++ b/user_guide_src/source/database/call_function/003.php
@@ -0,0 +1,3 @@
+<?php
+
+$db->connID;
diff --git a/user_guide_src/source/database/call_function/004.php b/user_guide_src/source/database/call_function/004.php
new file mode 100644
index 000000000000..2739752f852d
--- /dev/null
+++ b/user_guide_src/source/database/call_function/004.php
@@ -0,0 +1,5 @@
+<?php
+
+$query = $db->query("SOME QUERY");
+
+$query->resultID;
diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst
index f1776d93151d..33332cccac31 100644
--- a/user_guide_src/source/database/configuration.rst
+++ b/user_guide_src/source/database/configuration.rst
@@ -12,26 +12,10 @@ file is located at **app/Config/Database.php**. You can also set
 database connection values in the **.env** file. See below for more details.
 
 The config settings are stored in a class property that is an array with this
-prototype::
-
-    public $default = [
-        'DSN'      => '',
-        'hostname' => 'localhost',
-        'username' => 'root',
-        'password' => '',
-        'database' => 'database_name',
-        'DBDriver' => 'MySQLi',
-        'DBPrefix' => '',
-        'pConnect' => true,
-        'DBDebug'  => true,
-        'charset'  => 'utf8',
-        'DBCollat' => 'utf8_general_ci',
-        'swapPre'  => '',
-        'encrypt'  => false,
-        'compress' => false,
-        'strictOn' => false,
-        'failover' => [],
-    ];
+prototype:
+
+.. literalinclude:: configuration/001.php
+   :lines: 2-
 
 The name of the class property is the connection name, and can be used
 while connecting to specify a group name.
@@ -42,70 +26,34 @@ while connecting to specify a group name.
 Some database drivers (such as PDO, PostgreSQL, Oracle, ODBC) might
 require a full DSN string to be provided. If that is the case, you
 should use the 'DSN' configuration setting, as if you're using the
-driver's underlying native PHP extension, like this::
-
-    // PDO
-    $default['DSN'] = 'pgsql:host=localhost;port=5432;dbname=database_name';
+driver's underlying native PHP extension, like this:
 
-    // Oracle
-    $default['DSN'] = '//localhost/XE';
+.. literalinclude:: configuration/002.php
+   :lines: 2-
 
 .. note:: If you do not specify a DSN string for a driver that requires it, CodeIgniter
     will try to build it with the rest of the provided settings.
 
-You can also set a Data Source Name in universal manner (URL like). In that case DSNs must have this prototype::
+You can also set a Data Source Name in universal manner (URL like). In that case DSNs must have this prototype:
 
-    $default['DSN'] = 'DBDriver://username:password@hostname:port/database';
+.. literalinclude:: configuration/003.php
+   :lines: 2-
 
 To override default config values when connecting with a universal version of the DSN string,
-add the config variables as a query string::
+add the config variables as a query string:
 
-    // MySQLi
-    $default['DSN'] = 'MySQLi://username:password@hostname:3306/database?charset=utf8&DBCollat=utf8_general_ci';
-    // Postgre
-    $default['DSN'] = 'Postgre://username:password@hostname:5432/database?charset=utf8&connect_timeout=5&sslmode=1';
+.. literalinclude:: configuration/004.php
+   :lines: 2-
 
 .. note:: If you provide a DSN string and it is missing some valid settings (e.g., the
     database character set), which are present in the rest of the configuration
     fields, CodeIgniter will append them.
 
 You can also specify failovers for the situation when the main connection cannot connect for some reason.
-These failovers can be specified by setting the failover for a connection like this::
-
-    $default['failover'] = [
-        [
-            'hostname' => 'localhost1',
-            'username' => '',
-            'password' => '',
-            'database' => '',
-            'DBDriver' => 'MySQLi',
-            'DBPrefix' => '',
-            'pConnect' => true,
-            'DBDebug'  => true,
-            'charset'  => 'utf8',
-            'DBCollat' => 'utf8_general_ci',
-            'swapPre'  => '',
-            'encrypt'  => false,
-            'compress' => false,
-            'strictOn' => false,
-        ],
-        [
-            'hostname' => 'localhost2',
-            'username' => '',
-            'password' => '',
-            'database' => '',
-            'DBDriver' => 'MySQLi',
-            'DBPrefix' => '',
-            'pConnect' => true,
-            'DBDebug'  => true,
-            'charset'  => 'utf8',
-            'DBCollat' => 'utf8_general_ci',
-            'swapPre'  => '',
-            'encrypt'  => false,
-            'compress' => false,
-            'strictOn' => false,
-        ]
-    ];
+These failovers can be specified by setting the failover for a connection like this:
+
+.. literalinclude:: configuration/005.php
+   :lines: 2-
 
 You can specify as many failovers as you like.
 
@@ -113,31 +61,16 @@ You may optionally store multiple sets of connection
 values. If, for example, you run multiple environments (development,
 production, test, etc.) under a single installation, you can set up a
 connection group for each, then switch between groups as needed. For
-example, to set up a "test" environment you would do this::
-
-    public $test = [
-        'DSN'      => '',
-        'hostname' => 'localhost',
-        'username' => 'root',
-        'password' => '',
-        'database' => 'database_name',
-        'DBDriver' => 'MySQLi',
-        'DBPrefix' => '',
-        'pConnect' => true,
-        'DBDebug'  => true,
-        'charset'  => 'utf8',
-        'DBCollat' => 'utf8_general_ci',
-        'swapPre'  => '',
-        'compress' => false,
-        'encrypt'  => false,
-        'strictOn' => false,
-        'failover' => []
-    );
+example, to set up a "test" environment you would do this:
+
+.. literalinclude:: configuration/006.php
+   :lines: 2-
 
 Then, to globally tell the system to use that group you would set this
-variable located in the config file::
+variable located in the config file:
 
-    $defaultGroup = 'test';
+.. literalinclude:: configuration/007.php
+   :lines: 2-
 
 .. note:: The name 'test' is arbitrary. It can be anything you want. By
     default we've used the word "default" for the primary connection,
@@ -145,19 +78,10 @@ variable located in the config file::
 
 You could modify the config file to detect the environment and automatically
 update the `defaultGroup` value to the correct one by adding the required logic
-within the class' constructor::
-
-    class Database
-    {
-        public $development = [...];
-        public $test        = [...];
-        public $production  = [...];
+within the class' constructor:
 
-        public function __construct()
-        {
-            $this->defaultGroup = ENVIRONMENT;
-        }
-    }
+.. literalinclude:: configuration/008.php
+   :lines: 2-
 
 Configuring With .env File
 --------------------------
@@ -215,9 +139,9 @@ Explanation of Values:
 **strictOn**    true/false (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL
                 while developing an application.
 **port**        The database port number. To use this value you have to add a line to the database config array.
-                ::
 
-                    $default['port'] = 5432;
+                .. literalinclude:: configuration/009.php
+                    :lines: 2-
 
 ==============  ===========================================================================================================
 
diff --git a/user_guide_src/source/database/configuration/001.php b/user_guide_src/source/database/configuration/001.php
new file mode 100644
index 000000000000..c868ee08eb37
--- /dev/null
+++ b/user_guide_src/source/database/configuration/001.php
@@ -0,0 +1,20 @@
+<?php
+
+public $default = [
+    'DSN'      => '',
+    'hostname' => 'localhost',
+    'username' => 'root',
+    'password' => '',
+    'database' => 'database_name',
+    'DBDriver' => 'MySQLi',
+    'DBPrefix' => '',
+    'pConnect' => true,
+    'DBDebug'  => true,
+    'charset'  => 'utf8',
+    'DBCollat' => 'utf8_general_ci',
+    'swapPre'  => '',
+    'encrypt'  => false,
+    'compress' => false,
+    'strictOn' => false,
+    'failover' => [],
+];
diff --git a/user_guide_src/source/database/configuration/002.php b/user_guide_src/source/database/configuration/002.php
new file mode 100644
index 000000000000..e46448b54914
--- /dev/null
+++ b/user_guide_src/source/database/configuration/002.php
@@ -0,0 +1,7 @@
+<?php
+
+// PDO
+$default['DSN'] = 'pgsql:host=localhost;port=5432;dbname=database_name';
+
+// Oracle
+$default['DSN'] = '//localhost/XE';
diff --git a/user_guide_src/source/database/configuration/003.php b/user_guide_src/source/database/configuration/003.php
new file mode 100644
index 000000000000..0ab30c3f4489
--- /dev/null
+++ b/user_guide_src/source/database/configuration/003.php
@@ -0,0 +1,3 @@
+<?php
+
+$default['DSN'] = 'DBDriver://username:password@hostname:port/database';
diff --git a/user_guide_src/source/database/configuration/004.php b/user_guide_src/source/database/configuration/004.php
new file mode 100644
index 000000000000..82d9bb33a02a
--- /dev/null
+++ b/user_guide_src/source/database/configuration/004.php
@@ -0,0 +1,6 @@
+<?php
+
+// MySQLi
+$default['DSN'] = 'MySQLi://username:password@hostname:3306/database?charset=utf8&DBCollat=utf8_general_ci';
+// Postgre
+$default['DSN'] = 'Postgre://username:password@hostname:5432/database?charset=utf8&connect_timeout=5&sslmode=1';
diff --git a/user_guide_src/source/database/configuration/005.php b/user_guide_src/source/database/configuration/005.php
new file mode 100644
index 000000000000..acc4a7b8db70
--- /dev/null
+++ b/user_guide_src/source/database/configuration/005.php
@@ -0,0 +1,36 @@
+<?php
+
+$default['failover'] = [
+    [
+        'hostname' => 'localhost1',
+        'username' => '',
+        'password' => '',
+        'database' => '',
+        'DBDriver' => 'MySQLi',
+        'DBPrefix' => '',
+        'pConnect' => true,
+        'DBDebug'  => true,
+        'charset'  => 'utf8',
+        'DBCollat' => 'utf8_general_ci',
+        'swapPre'  => '',
+        'encrypt'  => false,
+        'compress' => false,
+        'strictOn' => false,
+    ],
+    [
+        'hostname' => 'localhost2',
+        'username' => '',
+        'password' => '',
+        'database' => '',
+        'DBDriver' => 'MySQLi',
+        'DBPrefix' => '',
+        'pConnect' => true,
+        'DBDebug'  => true,
+        'charset'  => 'utf8',
+        'DBCollat' => 'utf8_general_ci',
+        'swapPre'  => '',
+        'encrypt'  => false,
+        'compress' => false,
+        'strictOn' => false,
+    ]
+];
diff --git a/user_guide_src/source/database/configuration/006.php b/user_guide_src/source/database/configuration/006.php
new file mode 100644
index 000000000000..31b56a677829
--- /dev/null
+++ b/user_guide_src/source/database/configuration/006.php
@@ -0,0 +1,20 @@
+<?php
+
+public $test = [
+    'DSN'      => '',
+    'hostname' => 'localhost',
+    'username' => 'root',
+    'password' => '',
+    'database' => 'database_name',
+    'DBDriver' => 'MySQLi',
+    'DBPrefix' => '',
+    'pConnect' => true,
+    'DBDebug'  => true,
+    'charset'  => 'utf8',
+    'DBCollat' => 'utf8_general_ci',
+    'swapPre'  => '',
+    'compress' => false,
+    'encrypt'  => false,
+    'strictOn' => false,
+    'failover' => []
+);
diff --git a/user_guide_src/source/database/configuration/007.php b/user_guide_src/source/database/configuration/007.php
new file mode 100644
index 000000000000..97e8523fc621
--- /dev/null
+++ b/user_guide_src/source/database/configuration/007.php
@@ -0,0 +1,3 @@
+<?php
+
+$defaultGroup = 'test';
diff --git a/user_guide_src/source/database/configuration/008.php b/user_guide_src/source/database/configuration/008.php
new file mode 100644
index 000000000000..780c89a9b532
--- /dev/null
+++ b/user_guide_src/source/database/configuration/008.php
@@ -0,0 +1,13 @@
+<?php
+
+class Database
+{
+    public $development = [...];
+    public $test        = [...];
+    public $production  = [...];
+
+    public function __construct()
+    {
+        $this->defaultGroup = ENVIRONMENT;
+    }
+}
diff --git a/user_guide_src/source/database/configuration/009.php b/user_guide_src/source/database/configuration/009.php
new file mode 100644
index 000000000000..106c39c148ac
--- /dev/null
+++ b/user_guide_src/source/database/configuration/009.php
@@ -0,0 +1,3 @@
+<?php
+
+$default['port'] = 5432;
diff --git a/user_guide_src/source/database/connecting.rst b/user_guide_src/source/database/connecting.rst
index 41a42e5f0f2f..4efda4e11847 100644
--- a/user_guide_src/source/database/connecting.rst
+++ b/user_guide_src/source/database/connecting.rst
@@ -10,18 +10,18 @@ You can connect to your database by adding this line of code in any
 function where it is needed, or in your class constructor to make the
 database available globally in that class.
 
-::
-
-    $db = \Config\Database::connect();
+.. literalinclude:: connecting/001.php
+   :lines: 2-
 
 If the above function does **not** contain any information in the first
 parameter, it will connect to the default group specified in your database config
 file. For most people, this is the preferred method of use.
 
 A convenience method exists that is purely a wrapper around the above line
-and is provided for your convenience::
+and is provided for your convenience:
 
-    $db = db_connect();
+.. literalinclude:: connecting/002.php
+   :lines: 2-
 
 Available Parameters
 --------------------
@@ -38,9 +38,10 @@ Manually Connecting to a Database
 The first parameter of this function can **optionally** be used to
 specify a particular database group from your config file. Examples:
 
-To choose a specific group from your config file you can do this::
+To choose a specific group from your config file you can do this:
 
-    $db = \Config\Database::connect('group_name');
+.. literalinclude:: connecting/003.php
+   :lines: 2-
 
 Where group_name is the name of the connection group from your config
 file.
@@ -50,18 +51,19 @@ Multiple Connections to Same Database
 
 By default, the ``connect()`` method will return the same instance of the
 database connection every time. If you need to have a separate connection
-to the same database, send ``false`` as the second parameter::
+to the same database, send ``false`` as the second parameter:
 
-    $db = \Config\Database::connect('group_name', false);
+.. literalinclude:: connecting/004.php
+   :lines: 2-
 
 Connecting to Multiple Databases
 ================================
 
 If you need to connect to more than one database simultaneously you can
-do so as follows::
+do so as follows:
 
-    $db1 = \Config\Database::connect('group_one');
-    $db2 = \Config\Database::connect('group_two');
+.. literalinclude:: connecting/005.php
+   :lines: 2-
 
 Note: Change the words ``group_one`` and ``group_two`` to the specific
 group names you are connecting to.
@@ -76,29 +78,10 @@ Connecting with Custom Settings
 
 You can pass in an array of database settings instead of a group name to get
 a connection that uses your custom settings. The array passed in must be
-the same format as the groups are defined in the configuration file::
-
-    $custom = [
-        'DSN'      => '',
-        'hostname' => 'localhost',
-        'username' => '',
-        'password' => '',
-        'database' => '',
-        'DBDriver' => 'MySQLi',
-        'DBPrefix' => '',
-        'pConnect' => false,
-        'DBDebug'  => (ENVIRONMENT !== 'production'),
-        'charset'  => 'utf8',
-        'DBCollat' => 'utf8_general_ci',
-        'swapPre'  => '',
-        'encrypt'  => false,
-        'compress' => false,
-        'strictOn' => false,
-        'failover' => [],
-        'port'     => 3306,
-    ];
-    $db = \Config\Database::connect($custom);
+the same format as the groups are defined in the configuration file:
 
+.. literalinclude:: connecting/006.php
+   :lines: 2-
 
 Reconnecting / Keeping the Connection Alive
 ===========================================
@@ -112,9 +95,8 @@ or re-establish it.
 .. important:: If you are using MySQLi database driver, the ``reconnect()`` method
     does not ping the server but it closes the connection then connects again.
 
-::
-
-    $db->reconnect();
+.. literalinclude:: connecting/007.php
+   :lines: 2-
 
 Manually closing the Connection
 ===============================
@@ -122,6 +104,5 @@ Manually closing the Connection
 While CodeIgniter intelligently takes care of closing your database
 connections, you can explicitly close the connection.
 
-::
-
-    $db->close();
+.. literalinclude:: connecting/008.php
+   :lines: 2-
diff --git a/user_guide_src/source/database/connecting/001.php b/user_guide_src/source/database/connecting/001.php
new file mode 100644
index 000000000000..74e502c387ea
--- /dev/null
+++ b/user_guide_src/source/database/connecting/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$db = \Config\Database::connect();
diff --git a/user_guide_src/source/database/connecting/002.php b/user_guide_src/source/database/connecting/002.php
new file mode 100644
index 000000000000..b6de983ba4b3
--- /dev/null
+++ b/user_guide_src/source/database/connecting/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$db = db_connect();
diff --git a/user_guide_src/source/database/connecting/003.php b/user_guide_src/source/database/connecting/003.php
new file mode 100644
index 000000000000..498c5cff34aa
--- /dev/null
+++ b/user_guide_src/source/database/connecting/003.php
@@ -0,0 +1,3 @@
+<?php
+
+$db = \Config\Database::connect('group_name');
diff --git a/user_guide_src/source/database/connecting/004.php b/user_guide_src/source/database/connecting/004.php
new file mode 100644
index 000000000000..21e887e2b627
--- /dev/null
+++ b/user_guide_src/source/database/connecting/004.php
@@ -0,0 +1,3 @@
+<?php
+
+$db = \Config\Database::connect('group_name', false);
diff --git a/user_guide_src/source/database/connecting/005.php b/user_guide_src/source/database/connecting/005.php
new file mode 100644
index 000000000000..a40deceecadd
--- /dev/null
+++ b/user_guide_src/source/database/connecting/005.php
@@ -0,0 +1,4 @@
+<?php
+
+$db1 = \Config\Database::connect('group_one');
+$db2 = \Config\Database::connect('group_two');
diff --git a/user_guide_src/source/database/connecting/006.php b/user_guide_src/source/database/connecting/006.php
new file mode 100644
index 000000000000..f0d7d969cbf5
--- /dev/null
+++ b/user_guide_src/source/database/connecting/006.php
@@ -0,0 +1,22 @@
+<?php
+
+$custom = [
+    'DSN'      => '',
+    'hostname' => 'localhost',
+    'username' => '',
+    'password' => '',
+    'database' => '',
+    'DBDriver' => 'MySQLi',
+    'DBPrefix' => '',
+    'pConnect' => false,
+    'DBDebug'  => (ENVIRONMENT !== 'production'),
+    'charset'  => 'utf8',
+    'DBCollat' => 'utf8_general_ci',
+    'swapPre'  => '',
+    'encrypt'  => false,
+    'compress' => false,
+    'strictOn' => false,
+    'failover' => [],
+    'port'     => 3306,
+];
+$db = \Config\Database::connect($custom);
diff --git a/user_guide_src/source/database/connecting/007.php b/user_guide_src/source/database/connecting/007.php
new file mode 100644
index 000000000000..310b758bff1f
--- /dev/null
+++ b/user_guide_src/source/database/connecting/007.php
@@ -0,0 +1,3 @@
+<?php
+
+$db->reconnect();
diff --git a/user_guide_src/source/database/connecting/008.php b/user_guide_src/source/database/connecting/008.php
new file mode 100644
index 000000000000..9c95c27fe72c
--- /dev/null
+++ b/user_guide_src/source/database/connecting/008.php
@@ -0,0 +1,3 @@
+<?php
+
+$db->close();
diff --git a/user_guide_src/source/database/events.rst b/user_guide_src/source/database/events.rst
index 14ff4e01d346..eb9495405299 100644
--- a/user_guide_src/source/database/events.rst
+++ b/user_guide_src/source/database/events.rst
@@ -20,13 +20,7 @@ The Events
 This event is triggered whenever a new query has been run, whether successful or not. The only parameter is
 a :doc:`Query </database/queries>` instance of the current query. You could use this to display all queries
 in STDOUT, or logging to a file, or even creating tools to do automatic query analysis to help you spot
-potentially missing indexes, slow queries, etc. An example usage might be::
+potentially missing indexes, slow queries, etc. An example usage might be:
 
-    // In Config\Events.php
-    Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
-
-    // Collect the queries so something can be done with them later.
-    public static function collect(CodeIgniter\Database\Query $query)
-    {
-        static::$queries[] = $query;
-    }
+.. literalinclude:: events/001.php
+   :lines: 2-
diff --git a/user_guide_src/source/database/events/001.php b/user_guide_src/source/database/events/001.php
new file mode 100644
index 000000000000..1c8b56b1d1ca
--- /dev/null
+++ b/user_guide_src/source/database/events/001.php
@@ -0,0 +1,10 @@
+<?php
+
+// In Config\Events.php
+Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
+
+// Collect the queries so something can be done with them later.
+public static function collect(CodeIgniter\Database\Query $query)
+{
+    static::$queries[] = $query;
+}
diff --git a/user_guide_src/source/database/examples.rst b/user_guide_src/source/database/examples.rst
index de41c39f1366..6d1d656de2af 100644
--- a/user_guide_src/source/database/examples.rst
+++ b/user_guide_src/source/database/examples.rst
@@ -14,9 +14,10 @@ Initializing the Database Class
 ===============================
 
 The following code loads and initializes the database class based on
-your :doc:`configuration <configuration>` settings::
+your :doc:`configuration <configuration>` settings:
 
-    $db = \Config\Database::connect();
+.. literalinclude:: examples/001.php
+   :lines: 2-
 
 Once loaded the class is ready to be used as described below.
 
@@ -26,18 +27,8 @@ Once loaded the class is ready to be used as described below.
 Standard Query With Multiple Results (Object Version)
 =====================================================
 
-::
-
-    $query   = $db->query('SELECT name, title, email FROM my_table');
-    $results = $query->getResult();
-
-    foreach ($results as $row) {
-        echo $row->title;
-        echo $row->name;
-        echo $row->email;
-    }
-
-    echo 'Total Results: ' . count($results);
+.. literalinclude:: examples/002.php
+   :lines: 2-
 
 | The above ``getResult()`` function returns an array of **objects**.
 | Example: ``$row->title``
@@ -45,16 +36,8 @@ Standard Query With Multiple Results (Object Version)
 Standard Query With Multiple Results (Array Version)
 ====================================================
 
-::
-
-    $query   = $db->query('SELECT name, title, email FROM my_table');
-    $results = $query->getResultArray();
-
-    foreach ($results as $row) {
-        echo $row['title'];
-        echo $row['name'];
-        echo $row['email'];
-    }
+.. literalinclude:: examples/003.php
+   :lines: 2-
 
 | The above ``getResultArray()`` function returns an array of standard array
   indexes.
@@ -63,22 +46,16 @@ Standard Query With Multiple Results (Array Version)
 Standard Query With Single Result
 =================================
 
-::
-
-    $query = $db->query('SELECT name FROM my_table LIMIT 1');
-    $row   = $query->getRow();
-    echo $row->name;
+.. literalinclude:: examples/004.php
+   :lines: 2-
 
 The above ``getRow()`` function returns an **object**. Example: ``$row->name``
 
 Standard Query With Single Result (Array version)
 =================================================
 
-::
-
-    $query = $db->query('SELECT name FROM my_table LIMIT 1');
-    $row   = $query->getRowArray();
-    echo $row['name'];
+.. literalinclude:: examples/005.php
+   :lines: 2-
 
 The above ``getRowArray()`` function returns an **array**. Example:
 ``$row['name']``.
@@ -86,23 +63,17 @@ The above ``getRowArray()`` function returns an **array**. Example:
 Standard Insert
 ===============
 
-::
-
-    $sql = "INSERT INTO mytable (title, name) VALUES (".$db->escape($title).", ".$db->escape($name).")";
-    $db->query($sql);
-    echo $db->affectedRows();
+.. literalinclude:: examples/006.php
+   :lines: 2-
 
 Query Builder Query
 ===================
 
 The :doc:`Query Builder Pattern <query_builder>` gives you a simplified
-means of retrieving data::
-
-    $query = $db->table('table_name')->get();
+means of retrieving data:
 
-    foreach ($query->getResult() as $row) {
-        echo $row->title;
-    }
+.. literalinclude:: examples/007.php
+   :lines: 2-
 
 The above ``get()`` function retrieves all the results from the supplied
 table. The :doc:`Query Builder <query_builder>` class contains a full
@@ -111,13 +82,5 @@ complement of functions for working with data.
 Query Builder Insert
 ====================
 
-::
-
-    $data = [
-        'title' => $title,
-        'name'  => $name,
-        'date'  => $date
-    ];
-
-    $db->table('mytable')->insert($data);
-    // Produces: INSERT INTO mytable (title, name, date) VALUES ('{$title}', '{$name}', '{$date}')
+.. literalinclude:: examples/008.php
+   :lines: 2-
diff --git a/user_guide_src/source/database/examples/001.php b/user_guide_src/source/database/examples/001.php
new file mode 100644
index 000000000000..74e502c387ea
--- /dev/null
+++ b/user_guide_src/source/database/examples/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$db = \Config\Database::connect();
diff --git a/user_guide_src/source/database/examples/002.php b/user_guide_src/source/database/examples/002.php
new file mode 100644
index 000000000000..a7c00c03e4db
--- /dev/null
+++ b/user_guide_src/source/database/examples/002.php
@@ -0,0 +1,12 @@
+<?php
+
+$query   = $db->query('SELECT name, title, email FROM my_table');
+$results = $query->getResult();
+
+foreach ($results as $row) {
+    echo $row->title;
+    echo $row->name;
+    echo $row->email;
+}
+
+echo 'Total Results: ' . count($results);
diff --git a/user_guide_src/source/database/examples/003.php b/user_guide_src/source/database/examples/003.php
new file mode 100644
index 000000000000..d80605f4c503
--- /dev/null
+++ b/user_guide_src/source/database/examples/003.php
@@ -0,0 +1,10 @@
+<?php
+
+$query   = $db->query('SELECT name, title, email FROM my_table');
+$results = $query->getResultArray();
+
+foreach ($results as $row) {
+    echo $row['title'];
+    echo $row['name'];
+    echo $row['email'];
+}
diff --git a/user_guide_src/source/database/examples/004.php b/user_guide_src/source/database/examples/004.php
new file mode 100644
index 000000000000..9650679651b1
--- /dev/null
+++ b/user_guide_src/source/database/examples/004.php
@@ -0,0 +1,5 @@
+<?php
+
+$query = $db->query('SELECT name FROM my_table LIMIT 1');
+$row   = $query->getRow();
+echo $row->name;
diff --git a/user_guide_src/source/database/examples/005.php b/user_guide_src/source/database/examples/005.php
new file mode 100644
index 000000000000..0b72a87f35d6
--- /dev/null
+++ b/user_guide_src/source/database/examples/005.php
@@ -0,0 +1,5 @@
+<?php
+
+$query = $db->query('SELECT name FROM my_table LIMIT 1');
+$row   = $query->getRowArray();
+echo $row['name'];
diff --git a/user_guide_src/source/database/examples/006.php b/user_guide_src/source/database/examples/006.php
new file mode 100644
index 000000000000..1f7ac810d441
--- /dev/null
+++ b/user_guide_src/source/database/examples/006.php
@@ -0,0 +1,5 @@
+<?php
+
+$sql = "INSERT INTO mytable (title, name) VALUES (".$db->escape($title).", ".$db->escape($name).")";
+$db->query($sql);
+echo $db->affectedRows();
diff --git a/user_guide_src/source/database/examples/007.php b/user_guide_src/source/database/examples/007.php
new file mode 100644
index 000000000000..3a1e25b2e032
--- /dev/null
+++ b/user_guide_src/source/database/examples/007.php
@@ -0,0 +1,7 @@
+<?php
+
+$query = $db->table('table_name')->get();
+
+foreach ($query->getResult() as $row) {
+    echo $row->title;
+}
diff --git a/user_guide_src/source/database/examples/008.php b/user_guide_src/source/database/examples/008.php
new file mode 100644
index 000000000000..00ed0b27dbfc
--- /dev/null
+++ b/user_guide_src/source/database/examples/008.php
@@ -0,0 +1,10 @@
+<?php
+
+$data = [
+    'title' => $title,
+    'name'  => $name,
+    'date'  => $date
+];
+
+$db->table('mytable')->insert($data);
+// Produces: INSERT INTO mytable (title, name, date) VALUES ('{$title}', '{$name}', '{$date}')
diff --git a/user_guide_src/source/database/helpers.rst b/user_guide_src/source/database/helpers.rst
index a9a160a26713..0e948403091b 100644
--- a/user_guide_src/source/database/helpers.rst
+++ b/user_guide_src/source/database/helpers.rst
@@ -38,31 +38,31 @@ Information About Your Database
 
 Permits you to determine the number of rows in a particular table.
 Submit the table name in the first parameter. This is part of Query Builder.
-Example::
+Example:
 
-    echo $db->table('my_table')->countAll();
-
-    // Produces an integer, like 25
+.. literalinclude:: helpers/001.php
+   :lines: 2-
 
 **$db->countAllResults()**
 
 Permits you to determine the number of rows in a particular result set.
 Submit the table name in the first parameter. This is part of Query Builder.
-Example::
-
-    echo $db->table('my_table')->like('title', 'match')->countAllResults();
+Example:
 
-    // Produces an integer, like 5
+.. literalinclude:: helpers/002.php
+   :lines: 2-
 
 **$db->getPlatform()**
 
 Outputs the database platform you are running (MySQL, MS SQL, Postgres,
-etc...)::
+etc...):
 
-    echo $db->getPlatform();
+.. literalinclude:: helpers/003.php
+   :lines: 2-
 
 **$db->getVersion()**
 
-Outputs the database version you are running::
+Outputs the database version you are running:
 
-    echo $db->getVersion();
+.. literalinclude:: helpers/004.php
+   :lines: 2-
diff --git a/user_guide_src/source/database/helpers/001.php b/user_guide_src/source/database/helpers/001.php
new file mode 100644
index 000000000000..f5dea164c946
--- /dev/null
+++ b/user_guide_src/source/database/helpers/001.php
@@ -0,0 +1,5 @@
+<?php
+
+echo $db->table('my_table')->countAll();
+
+// Produces an integer, like 25
diff --git a/user_guide_src/source/database/helpers/002.php b/user_guide_src/source/database/helpers/002.php
new file mode 100644
index 000000000000..d43cf8dbc3bc
--- /dev/null
+++ b/user_guide_src/source/database/helpers/002.php
@@ -0,0 +1,5 @@
+<?php
+
+echo $db->table('my_table')->like('title', 'match')->countAllResults();
+
+// Produces an integer, like 5
diff --git a/user_guide_src/source/database/helpers/003.php b/user_guide_src/source/database/helpers/003.php
new file mode 100644
index 000000000000..8c1412b29118
--- /dev/null
+++ b/user_guide_src/source/database/helpers/003.php
@@ -0,0 +1,3 @@
+<?php
+
+echo $db->getPlatform();
diff --git a/user_guide_src/source/database/helpers/004.php b/user_guide_src/source/database/helpers/004.php
new file mode 100644
index 000000000000..d131c3ec196a
--- /dev/null
+++ b/user_guide_src/source/database/helpers/004.php
@@ -0,0 +1,3 @@
+<?php
+
+echo $db->getVersion();
diff --git a/user_guide_src/source/database/metadata.rst b/user_guide_src/source/database/metadata.rst
index fd19a1aa35b5..ef832daca249 100644
--- a/user_guide_src/source/database/metadata.rst
+++ b/user_guide_src/source/database/metadata.rst
@@ -18,13 +18,10 @@ List the Tables in Your Database
 **$db->listTables();**
 
 Returns an array containing the names of all the tables in the database
-you are currently connected to. Example::
+you are currently connected to. Example:
 
-    $tables = $db->listTables();
-
-    foreach ($tables as $table) {
-        echo $table;
-    }
+.. literalinclude:: metadata/001.php
+   :lines: 2-
 
 .. note:: Some drivers have additional system tables that are excluded from this return.
 
@@ -34,11 +31,10 @@ Determine If a Table Exists
 **$db->tableExists();**
 
 Sometimes it's helpful to know whether a particular table exists before
-running an operation on it. Returns a boolean true/false. Usage example::
+running an operation on it. Returns a boolean true/false. Usage example:
 
-    if ($db->tableExists('table_name')) {
-        // some code...
-    }
+.. literalinclude:: metadata/002.php
+   :lines: 2-
 
 .. note:: Replace *table_name* with the name of the table you are looking for.
 
@@ -54,22 +50,16 @@ List the Fields in a Table
 Returns an array containing the field names. This query can be called
 two ways:
 
-1. You can supply the table name and call it from the ``$db->object``::
-
-    $fields = $db->getFieldNames('table_name');
+1. You can supply the table name and call it from the ``$db->object``:
 
-    foreach ($fields as $field) {
-        echo $field;
-    }
+   .. literalinclude:: metadata/003.php
+       :lines: 2-
 
 2. You can gather the field names associated with any query you run by
-calling the function from your query result object::
-
-    $query = $db->query('SELECT * FROM some_table');
+calling the function from your query result object:
 
-    foreach ($query->getFieldNames() as $field) {
-        echo $field;
-    }
+.. literalinclude:: metadata/004.php
+    :lines: 2-
 
 Determine If a Field is Present in a Table
 ==========================================
@@ -77,11 +67,10 @@ Determine If a Field is Present in a Table
 **$db->fieldExists()**
 
 Sometimes it's helpful to know whether a particular field exists before
-performing an action. Returns a boolean true/false. Usage example::
+performing an action. Returns a boolean true/false. Usage example:
 
-    if ($db->fieldExists('field_name', 'table_name')) {
-        // some code...
-    }
+.. literalinclude:: metadata/005.php
+   :lines: 2-
 
 .. note:: Replace *field_name* with the name of the column you are looking
     for, and replace *table_name* with the name of the table you are
@@ -99,22 +88,16 @@ the column type, max length, etc.
 
 .. note:: Not all databases provide meta-data.
 
-Usage example::
+Usage example:
 
-    $fields = $db->getFieldData('table_name');
-
-    foreach ($fields as $field) {
-        echo $field->name;
-        echo $field->type;
-        echo $field->max_length;
-        echo $field->primary_key;
-    }
+.. literalinclude:: metadata/006.php
+   :lines: 2-
 
 If you have run a query already you can use the result object instead of
-supplying the table name::
+supplying the table name:
 
-    $query  = $db->query("YOUR QUERY");
-    $fields = $query->fieldData();
+.. literalinclude:: metadata/007.php
+   :lines: 2-
 
 The following data is available from this function if supported by your
 database:
@@ -131,15 +114,10 @@ List the Indexes in a Table
 
 Returns an array of objects containing index information.
 
-Usage example::
-
-    $keys = $db->getIndexData('table_name');
+Usage example:
 
-    foreach ($keys as $key) {
-        echo $key->name;
-        echo $key->type;
-        echo $key->fields; // array of field names
-    }
+.. literalinclude:: metadata/008.php
+   :lines: 2-
 
 The key types may be unique to the database you are using.
 For instance, MySQL will return one of primary, fulltext, spatial, index or unique
@@ -149,17 +127,10 @@ for each key associated with a table.
 
 Returns an array of objects containing foreign key information.
 
-Usage example::
-
-    $keys = $db->getForeignKeyData('table_name');
+Usage example:
 
-    foreach ($keys as $key) {
-        echo $key->constraint_name;
-        echo $key->table_name;
-        echo $key->column_name;
-        echo $key->foreign_table_name;
-        echo $key->foreign_column_name;
-    }
+.. literalinclude:: metadata/009.php
+   :lines: 2-
 
 The object fields may be unique to the database you are using. For instance, SQLite3 does
 not return data on column names, but has the additional *sequence* field for compound
diff --git a/user_guide_src/source/database/metadata/001.php b/user_guide_src/source/database/metadata/001.php
new file mode 100644
index 000000000000..a4d50427b93a
--- /dev/null
+++ b/user_guide_src/source/database/metadata/001.php
@@ -0,0 +1,7 @@
+<?php
+
+$tables = $db->listTables();
+
+foreach ($tables as $table) {
+    echo $table;
+}
diff --git a/user_guide_src/source/database/metadata/002.php b/user_guide_src/source/database/metadata/002.php
new file mode 100644
index 000000000000..5198eaff081b
--- /dev/null
+++ b/user_guide_src/source/database/metadata/002.php
@@ -0,0 +1,5 @@
+<?php
+
+if ($db->tableExists('table_name')) {
+    // some code...
+}
diff --git a/user_guide_src/source/database/metadata/003.php b/user_guide_src/source/database/metadata/003.php
new file mode 100644
index 000000000000..64e708bbeda7
--- /dev/null
+++ b/user_guide_src/source/database/metadata/003.php
@@ -0,0 +1,7 @@
+<?php
+
+$fields = $db->getFieldNames('table_name');
+
+foreach ($fields as $field) {
+    echo $field;
+}
diff --git a/user_guide_src/source/database/metadata/004.php b/user_guide_src/source/database/metadata/004.php
new file mode 100644
index 000000000000..a9d866b42d06
--- /dev/null
+++ b/user_guide_src/source/database/metadata/004.php
@@ -0,0 +1,7 @@
+<?php
+
+$query = $db->query('SELECT * FROM some_table');
+
+foreach ($query->getFieldNames() as $field) {
+    echo $field;
+}
diff --git a/user_guide_src/source/database/metadata/005.php b/user_guide_src/source/database/metadata/005.php
new file mode 100644
index 000000000000..14d6b49b4fe6
--- /dev/null
+++ b/user_guide_src/source/database/metadata/005.php
@@ -0,0 +1,5 @@
+<?php
+
+if ($db->fieldExists('field_name', 'table_name')) {
+    // some code...
+}
diff --git a/user_guide_src/source/database/metadata/006.php b/user_guide_src/source/database/metadata/006.php
new file mode 100644
index 000000000000..c7a05c9d152b
--- /dev/null
+++ b/user_guide_src/source/database/metadata/006.php
@@ -0,0 +1,10 @@
+<?php
+
+$fields = $db->getFieldData('table_name');
+
+foreach ($fields as $field) {
+    echo $field->name;
+    echo $field->type;
+    echo $field->max_length;
+    echo $field->primary_key;
+}
diff --git a/user_guide_src/source/database/metadata/007.php b/user_guide_src/source/database/metadata/007.php
new file mode 100644
index 000000000000..fdac8c74ffec
--- /dev/null
+++ b/user_guide_src/source/database/metadata/007.php
@@ -0,0 +1,4 @@
+<?php
+
+$query  = $db->query("YOUR QUERY");
+$fields = $query->fieldData();
diff --git a/user_guide_src/source/database/metadata/008.php b/user_guide_src/source/database/metadata/008.php
new file mode 100644
index 000000000000..7014fb11fe1a
--- /dev/null
+++ b/user_guide_src/source/database/metadata/008.php
@@ -0,0 +1,9 @@
+<?php
+
+$keys = $db->getIndexData('table_name');
+
+foreach ($keys as $key) {
+    echo $key->name;
+    echo $key->type;
+    echo $key->fields; // array of field names
+}
diff --git a/user_guide_src/source/database/metadata/009.php b/user_guide_src/source/database/metadata/009.php
new file mode 100644
index 000000000000..c46169afab22
--- /dev/null
+++ b/user_guide_src/source/database/metadata/009.php
@@ -0,0 +1,11 @@
+<?php
+
+$keys = $db->getForeignKeyData('table_name');
+
+foreach ($keys as $key) {
+    echo $key->constraint_name;
+    echo $key->table_name;
+    echo $key->column_name;
+    echo $key->foreign_table_name;
+    echo $key->foreign_column_name;
+}
diff --git a/user_guide_src/source/database/queries.rst b/user_guide_src/source/database/queries.rst
index 23a2407a48ec..0ab160d54c95 100644
--- a/user_guide_src/source/database/queries.rst
+++ b/user_guide_src/source/database/queries.rst
@@ -13,19 +13,20 @@ Query Basics
 Regular Queries
 ===============
 
-To submit a query, use the **query** function::
+To submit a query, use the **query** function:
 
-    $db = db_connect();
-    $db->query('YOUR QUERY HERE');
+.. literalinclude:: queries/001.php
+   :lines: 2-
 
 The ``query()`` function returns a database result **object** when "read"
 type queries are run which you can use to :doc:`show your
 results <results>`. When "write" type queries are run it simply
 returns true or false depending on success or failure. When retrieving
 data you will typically assign the query to your own variable, like
-this::
+this:
 
-    $query = $db->query('YOUR QUERY HERE');
+.. literalinclude:: queries/002.php
+   :lines: 2-
 
 .. note:: If you are using OCI8 Driver, SQL statements should not end with a semi-colon (``;``).
     PL/SQL statements should end with a semi-colon (``;``).
@@ -45,13 +46,8 @@ such as INSERT, DELETE or UPDATE statements (which is what it really
 should be used for) and a resource/object on success for queries with
 fetchable results.
 
-::
-
-    if ($db->simpleQuery('YOUR QUERY')) {
-        echo "Success!";
-    } else {
-        echo "Query failed!";
-    }
+.. literalinclude:: queries/003.php
+   :lines: 2-
 
 .. note:: PostgreSQL's ``pg_exec()`` function (for example) always
     returns a resource on success even for write type queries.
@@ -63,19 +59,21 @@ Working with Database prefixes manually
 
 If you have configured a database prefix and would like to prepend it to
 a table name for use in a native SQL query for example, then you can use
-the following::
+the following:
 
-    $db->prefixTable('tablename'); // outputs prefix_tablename
+.. literalinclude:: queries/004.php
+   :lines: 2-
 
 If for any reason you would like to change the prefix programmatically
-without needing to create a new connection you can use this method::
+without needing to create a new connection you can use this method:
 
-    $db->setPrefix('newprefix_');
-    $db->prefixTable('tablename'); // outputs newprefix_tablename
+.. literalinclude:: queries/005.php
+   :lines: 2-
 
-You can get the current prefix any time with this method::
+You can get the current prefix any time with this method:
 
-    $DBPrefix = $db->getPrefix();
+.. literalinclude:: queries/006.php
+   :lines: 2-
 
 **********************
 Protecting identifiers
@@ -84,9 +82,10 @@ Protecting identifiers
 In many databases, it is advisable to protect table and field names - for
 example with backticks in MySQL. **Query Builder queries are
 automatically protected**, but if you need to manually protect an
-identifier you can use::
+identifier you can use:
 
-    $db->protectIdentifiers('table_name');
+.. literalinclude:: queries/007.php
+   :lines: 2-
 
 .. important:: Although the Query Builder will try its best to properly
     quote any field and table names that you feed it. Note that it
@@ -95,9 +94,10 @@ identifier you can use::
 
 This function will also add a table prefix to your table, assuming you
 have a prefix specified in your database config file. To enable the
-prefixing set true (boolean) via the second parameter::
+prefixing set true (boolean) via the second parameter:
 
-    $db->protectIdentifiers('table_name', true);
+.. literalinclude:: queries/008.php
+   :lines: 2-
 
 ****************
 Escaping Queries
@@ -110,26 +110,23 @@ this:
 #. **$db->escape()** This function determines the data type so
    that it can escape only string data. It also automatically adds
    single quotes around the data so you don't have to:
-   ::
 
-        $sql = "INSERT INTO table (title) VALUES(" . $db->escape($title) . ")";
+   .. literalinclude:: queries/009.php
+      :lines: 2-
 
 #. **$db->escapeString()** This function escapes the data passed to
    it, regardless of type. Most of the time you'll use the above
    function rather than this one. Use the function like this:
-   ::
 
-        $sql = "INSERT INTO table (title) VALUES('" . $db->escapeString($title) . "')";
+   .. literalinclude:: queries/010.php
+      :lines: 2-
 
 #. **$db->escapeLikeString()** This method should be used when
    strings are to be used in LIKE conditions so that LIKE wildcards
    ('%', '\_') in the string are also properly escaped.
 
-::
-
-    $search = '20% raise';
-    $sql = "SELECT id FROM table WHERE column LIKE '%" .
-    $db->escapeLikeString($search) . "%' ESCAPE '!'";
+.. literalinclude:: queries/011.php
+   :lines: 2-
 
 .. important:: The ``escapeLikeString()`` method uses '!' (exclamation mark)
     to escape special characters for *LIKE* conditions. Because this
@@ -142,18 +139,18 @@ Query Bindings
 **************
 
 Bindings enable you to simplify your query syntax by letting the system
-put the queries together for you. Consider the following example::
+put the queries together for you. Consider the following example:
 
-    $sql = "SELECT * FROM some_table WHERE id = ? AND status = ? AND author = ?";
-    $db->query($sql, [3, 'live', 'Rick']);
+.. literalinclude:: queries/012.php
+   :lines: 2-
 
 The question marks in the query are automatically replaced with the
 values in the array in the second parameter of the query function.
 
-Binding also work with arrays, which will be transformed to IN sets::
+Binding also work with arrays, which will be transformed to IN sets:
 
-    $sql = "SELECT * FROM some_table WHERE id IN ? AND status = ? AND author = ?";
-    $db->query($sql, [[3, 6], 'live', 'Rick']);
+.. literalinclude:: queries/013.php
+   :lines: 2-
 
 The resulting query will be::
 
@@ -168,14 +165,10 @@ Named Bindings
 
 Instead of using the question mark to mark the location of the bound values,
 you can name the bindings, allowing the keys of the values passed in to match
-placeholders in the query::
+placeholders in the query:
 
-        $sql = "SELECT * FROM some_table WHERE id = :id: AND status = :status: AND author = :name:";
-        $db->query($sql, [
-            'id'     => 3,
-            'status' => 'live',
-            'name'   => 'Rick',
-        ]);
+.. literalinclude:: queries/014.php
+   :lines: 2-
 
 .. note:: Each name in the query MUST be surrounded by colons.
 
@@ -187,11 +180,10 @@ Handling Errors
 
 If you need to get the last error that has occurred, the ``error()`` method
 will return an array containing its code and message. Here's a quick
-example::
+example:
 
-    if (! $db->simpleQuery('SELECT `example_field` FROM `example_table`')) {
-        $error = $db->error(); // Has keys 'code' and 'message'
-    }
+.. literalinclude:: queries/015.php
+   :lines: 2-
 
 ****************
 Prepared Queries
@@ -212,37 +204,22 @@ This can be easily done with the ``prepare()`` method. This takes a single param
 a query object. Query objects are automatically generated by any of the "final" type queries, including **insert**,
 **update**, **delete**, **replace**, and **get**. This is handled the easiest by using the Query Builder to
 run a query. The query is not actually run, and the values don't matter since they're never applied, acting instead
-as placeholders. This returns a PreparedQuery object::
+as placeholders. This returns a PreparedQuery object:
 
-    $pQuery = $db->prepare(function ($db) {
-        return $db->table('user')->insert([
-            'name'    => 'x',
-            'email'   => 'y',
-            'country' => 'US'
-        ]);
-    });
+.. literalinclude:: queries/016.php
+   :lines: 2-
 
 If you don't want to use the Query Builder you can create the Query object manually using question marks for
-value placeholders::
-
-    use CodeIgniter\Database\Query;
-
-    $pQuery = $db->prepare(function ($db) {
-        $sql = "INSERT INTO user (name, email, country) VALUES (?, ?, ?)";
+value placeholders:
 
-        return (new Query($db))->setQuery($sql);
-    });
+.. literalinclude:: queries/017.php
+   :lines: 2-
 
 If the database requires an array of options passed to it during the prepare statement phase you can pass that
-array through in the second parameter::
+array through in the second parameter:
 
-    use CodeIgniter\Database\Query;
-
-    $pQuery = $db->prepare(function ($db) {
-        $sql = "INSERT INTO user (name, email, country) VALUES (?, ?, ?)";
-
-        return (new Query($db))->setQuery($sql);
-    }, $options);
+.. literalinclude:: queries/018.php
+   :lines: 2-
 
 Executing the Query
 ===================
@@ -250,24 +227,10 @@ Executing the Query
 Once you have a prepared query you can use the ``execute()`` method to actually run the query. You can pass in as
 many variables as you need in the query parameters. The number of parameters you pass must match the number of
 placeholders in the query. They must also be passed in the same order as the placeholders appear in the original
-query::
-
-    // Prepare the Query
-    $pQuery = $db->prepare(function ($db) {
-        return $db->table('user')->insert([
-            'name'    => 'x',
-            'email'   => 'y',
-            'country' => 'US'
-        ]);
-    });
-
-    // Collect the Data
-    $name    = 'John Doe';
-    $email   = 'j.doe@example.com';
-    $country = 'US';
+query:
 
-    // Run the Query
-    $results = $pQuery->execute($name, $email, $country);
+.. literalinclude:: queries/019.php
+   :lines: 2-
 
 This returns a standard :doc:`result set </database/results>`.
 
@@ -279,9 +242,10 @@ In addition to these two primary methods, the prepared query object also has the
 **close()**
 
 While PHP does a pretty good job of closing all open statements with the database it's always a good idea to
-close out the prepared statement when you're done with it::
+close out the prepared statement when you're done with it:
 
-    $pQuery->close();
+.. literalinclude:: queries/020.php
+   :lines: 2-
 
 **getQueryString()**
 
@@ -308,10 +272,10 @@ data about its query.
 **getLastQuery()**
 
 When you just need to retrieve the last Query object, use the
-getLastQuery() method::
+getLastQuery() method:
 
-    $query = $db->getLastQuery();
-    echo (string) $query;
+.. literalinclude:: queries/021.php
+   :lines: 2-
 
 The Query Class
 ===============
@@ -323,56 +287,59 @@ as well.
 **getQuery()**
 
 Returns the final query after all processing has happened. This is the exact
-query that was sent to the database::
+query that was sent to the database:
 
-    $sql = $query->getQuery();
+.. literalinclude:: queries/022.php
+   :lines: 2-
 
-This same value can be retrieved by casting the Query object to a string::
+This same value can be retrieved by casting the Query object to a string:
 
-    $sql = (string) $query;
+.. literalinclude:: queries/023.php
+   :lines: 2-
 
 **getOriginalQuery()**
 
 Returns the raw SQL that was passed into the object. This will not have any
-binds in it, or prefixes swapped out, etc::
+binds in it, or prefixes swapped out, etc:
 
-    $sql = $query->getOriginalQuery();
+.. literalinclude:: queries/024.php
+   :lines: 2-
 
 **hasError()**
 
 If an error was encountered during the execution of this query this method
-will return true::
+will return true:
 
-    if ($query->hasError()) {
-        echo 'Code: ' . $query->getErrorCode();
-        echo 'Error: ' . $query->getErrorMessage();
-    }
+.. literalinclude:: queries/025.php
+   :lines: 2-
 
 **isWriteType()**
 
 Returns true if the query was determined to be a write-type query (i.e.,
-INSERT, UPDATE, DELETE, etc)::
+INSERT, UPDATE, DELETE, etc):
 
-    if ($query->isWriteType()) {
-        // ... do something
-    }
+.. literalinclude:: queries/026.php
+   :lines: 2-
 
 **swapPrefix()**
 
 Replaces one table prefix with another value in the SQL. The first
 parameter is the original prefix that you want replaced, and the second
-parameter is the value you want it replaced with::
+parameter is the value you want it replaced with:
 
-    $sql = $query->swapPrefix('ci3_', 'ci4_');
+.. literalinclude:: queries/027.php
+   :lines: 2-
 
 **getStartTime()**
 
-Gets the time the query was executed in seconds with microseconds::
+Gets the time the query was executed in seconds with microseconds:
 
-    $microtime = $query->getStartTime();
+.. literalinclude:: queries/028.php
+   :lines: 2-
 
 **getDuration()**
 
-Returns a float with the duration of the query in seconds with microseconds::
+Returns a float with the duration of the query in seconds with microseconds:
 
-    $microtime = $query->getDuration();
+.. literalinclude:: queries/029.php
+   :lines: 2-
diff --git a/user_guide_src/source/database/queries/001.php b/user_guide_src/source/database/queries/001.php
new file mode 100644
index 000000000000..1913eae2542d
--- /dev/null
+++ b/user_guide_src/source/database/queries/001.php
@@ -0,0 +1,4 @@
+<?php
+
+$db = db_connect();
+$db->query('YOUR QUERY HERE');
diff --git a/user_guide_src/source/database/queries/002.php b/user_guide_src/source/database/queries/002.php
new file mode 100644
index 000000000000..2e7a108fc634
--- /dev/null
+++ b/user_guide_src/source/database/queries/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$query = $db->query('YOUR QUERY HERE');
diff --git a/user_guide_src/source/database/queries/003.php b/user_guide_src/source/database/queries/003.php
new file mode 100644
index 000000000000..9980b5d1701e
--- /dev/null
+++ b/user_guide_src/source/database/queries/003.php
@@ -0,0 +1,7 @@
+<?php
+
+if ($db->simpleQuery('YOUR QUERY')) {
+    echo "Success!";
+} else {
+    echo "Query failed!";
+}
diff --git a/user_guide_src/source/database/queries/004.php b/user_guide_src/source/database/queries/004.php
new file mode 100644
index 000000000000..a32fb776c499
--- /dev/null
+++ b/user_guide_src/source/database/queries/004.php
@@ -0,0 +1,3 @@
+<?php
+
+$db->prefixTable('tablename'); // outputs prefix_tablename
diff --git a/user_guide_src/source/database/queries/005.php b/user_guide_src/source/database/queries/005.php
new file mode 100644
index 000000000000..0bca8a2f1f8a
--- /dev/null
+++ b/user_guide_src/source/database/queries/005.php
@@ -0,0 +1,4 @@
+<?php
+
+$db->setPrefix('newprefix_');
+$db->prefixTable('tablename'); // outputs newprefix_tablename
diff --git a/user_guide_src/source/database/queries/006.php b/user_guide_src/source/database/queries/006.php
new file mode 100644
index 000000000000..74c92ab23a53
--- /dev/null
+++ b/user_guide_src/source/database/queries/006.php
@@ -0,0 +1,3 @@
+<?php
+
+$DBPrefix = $db->getPrefix();
diff --git a/user_guide_src/source/database/queries/007.php b/user_guide_src/source/database/queries/007.php
new file mode 100644
index 000000000000..97269be2518d
--- /dev/null
+++ b/user_guide_src/source/database/queries/007.php
@@ -0,0 +1,3 @@
+<?php
+
+$db->protectIdentifiers('table_name');
diff --git a/user_guide_src/source/database/queries/008.php b/user_guide_src/source/database/queries/008.php
new file mode 100644
index 000000000000..f64ae9e3fdec
--- /dev/null
+++ b/user_guide_src/source/database/queries/008.php
@@ -0,0 +1,3 @@
+<?php
+
+$db->protectIdentifiers('table_name', true);
diff --git a/user_guide_src/source/database/queries/009.php b/user_guide_src/source/database/queries/009.php
new file mode 100644
index 000000000000..e93ca2da877c
--- /dev/null
+++ b/user_guide_src/source/database/queries/009.php
@@ -0,0 +1,3 @@
+<?php
+
+$sql = "INSERT INTO table (title) VALUES(" . $db->escape($title) . ")";
diff --git a/user_guide_src/source/database/queries/010.php b/user_guide_src/source/database/queries/010.php
new file mode 100644
index 000000000000..933419610bab
--- /dev/null
+++ b/user_guide_src/source/database/queries/010.php
@@ -0,0 +1,3 @@
+<?php
+
+$sql = "INSERT INTO table (title) VALUES('" . $db->escapeString($title) . "')";
diff --git a/user_guide_src/source/database/queries/011.php b/user_guide_src/source/database/queries/011.php
new file mode 100644
index 000000000000..4b4e40660456
--- /dev/null
+++ b/user_guide_src/source/database/queries/011.php
@@ -0,0 +1,5 @@
+<?php
+
+$search = '20% raise';
+$sql = "SELECT id FROM table WHERE column LIKE '%" .
+$db->escapeLikeString($search) . "%' ESCAPE '!'";
diff --git a/user_guide_src/source/database/queries/012.php b/user_guide_src/source/database/queries/012.php
new file mode 100644
index 000000000000..5aebc0688a14
--- /dev/null
+++ b/user_guide_src/source/database/queries/012.php
@@ -0,0 +1,4 @@
+<?php
+
+$sql = "SELECT * FROM some_table WHERE id = ? AND status = ? AND author = ?";
+$db->query($sql, [3, 'live', 'Rick']);
diff --git a/user_guide_src/source/database/queries/013.php b/user_guide_src/source/database/queries/013.php
new file mode 100644
index 000000000000..572886ee41b8
--- /dev/null
+++ b/user_guide_src/source/database/queries/013.php
@@ -0,0 +1,4 @@
+<?php
+
+$sql = "SELECT * FROM some_table WHERE id IN ? AND status = ? AND author = ?";
+$db->query($sql, [[3, 6], 'live', 'Rick']);
diff --git a/user_guide_src/source/database/queries/014.php b/user_guide_src/source/database/queries/014.php
new file mode 100644
index 000000000000..6fadb198fd45
--- /dev/null
+++ b/user_guide_src/source/database/queries/014.php
@@ -0,0 +1,8 @@
+<?php
+
+$sql = "SELECT * FROM some_table WHERE id = :id: AND status = :status: AND author = :name:";
+$db->query($sql, [
+    'id'     => 3,
+    'status' => 'live',
+    'name'   => 'Rick',
+]);
diff --git a/user_guide_src/source/database/queries/015.php b/user_guide_src/source/database/queries/015.php
new file mode 100644
index 000000000000..4ce3e46ecb9b
--- /dev/null
+++ b/user_guide_src/source/database/queries/015.php
@@ -0,0 +1,5 @@
+<?php
+
+if (! $db->simpleQuery('SELECT `example_field` FROM `example_table`')) {
+    $error = $db->error(); // Has keys 'code' and 'message'
+}
diff --git a/user_guide_src/source/database/queries/016.php b/user_guide_src/source/database/queries/016.php
new file mode 100644
index 000000000000..b614183dfa83
--- /dev/null
+++ b/user_guide_src/source/database/queries/016.php
@@ -0,0 +1,9 @@
+<?php
+
+$pQuery = $db->prepare(function ($db) {
+    return $db->table('user')->insert([
+        'name'    => 'x',
+        'email'   => 'y',
+        'country' => 'US'
+    ]);
+});
diff --git a/user_guide_src/source/database/queries/017.php b/user_guide_src/source/database/queries/017.php
new file mode 100644
index 000000000000..3862d566dd3f
--- /dev/null
+++ b/user_guide_src/source/database/queries/017.php
@@ -0,0 +1,9 @@
+<?php
+
+use CodeIgniter\Database\Query;
+
+$pQuery = $db->prepare(function ($db) {
+    $sql = "INSERT INTO user (name, email, country) VALUES (?, ?, ?)";
+
+    return (new Query($db))->setQuery($sql);
+});
diff --git a/user_guide_src/source/database/queries/018.php b/user_guide_src/source/database/queries/018.php
new file mode 100644
index 000000000000..ddf8aa0dd58f
--- /dev/null
+++ b/user_guide_src/source/database/queries/018.php
@@ -0,0 +1,9 @@
+<?php
+
+use CodeIgniter\Database\Query;
+
+$pQuery = $db->prepare(function ($db) {
+    $sql = "INSERT INTO user (name, email, country) VALUES (?, ?, ?)";
+
+    return (new Query($db))->setQuery($sql);
+}, $options);
diff --git a/user_guide_src/source/database/queries/019.php b/user_guide_src/source/database/queries/019.php
new file mode 100644
index 000000000000..73467a9394e5
--- /dev/null
+++ b/user_guide_src/source/database/queries/019.php
@@ -0,0 +1,18 @@
+<?php
+
+// Prepare the Query
+$pQuery = $db->prepare(function ($db) {
+    return $db->table('user')->insert([
+        'name'    => 'x',
+        'email'   => 'y',
+        'country' => 'US'
+    ]);
+});
+
+// Collect the Data
+$name    = 'John Doe';
+$email   = 'j.doe@example.com';
+$country = 'US';
+
+// Run the Query
+$results = $pQuery->execute($name, $email, $country);
diff --git a/user_guide_src/source/database/queries/020.php b/user_guide_src/source/database/queries/020.php
new file mode 100644
index 000000000000..6d53cea811fa
--- /dev/null
+++ b/user_guide_src/source/database/queries/020.php
@@ -0,0 +1,3 @@
+<?php
+
+$pQuery->close();
diff --git a/user_guide_src/source/database/queries/021.php b/user_guide_src/source/database/queries/021.php
new file mode 100644
index 000000000000..c26ed8319c7d
--- /dev/null
+++ b/user_guide_src/source/database/queries/021.php
@@ -0,0 +1,4 @@
+<?php
+
+$query = $db->getLastQuery();
+echo (string) $query;
diff --git a/user_guide_src/source/database/queries/022.php b/user_guide_src/source/database/queries/022.php
new file mode 100644
index 000000000000..89ebbbaa8faa
--- /dev/null
+++ b/user_guide_src/source/database/queries/022.php
@@ -0,0 +1,3 @@
+<?php
+
+$sql = $query->getQuery();
diff --git a/user_guide_src/source/database/queries/023.php b/user_guide_src/source/database/queries/023.php
new file mode 100644
index 000000000000..3ea68c6f7591
--- /dev/null
+++ b/user_guide_src/source/database/queries/023.php
@@ -0,0 +1,3 @@
+<?php
+
+$sql = (string) $query;
diff --git a/user_guide_src/source/database/queries/024.php b/user_guide_src/source/database/queries/024.php
new file mode 100644
index 000000000000..769e35209d58
--- /dev/null
+++ b/user_guide_src/source/database/queries/024.php
@@ -0,0 +1,3 @@
+<?php
+
+$sql = $query->getOriginalQuery();
diff --git a/user_guide_src/source/database/queries/025.php b/user_guide_src/source/database/queries/025.php
new file mode 100644
index 000000000000..367e09a86b7f
--- /dev/null
+++ b/user_guide_src/source/database/queries/025.php
@@ -0,0 +1,6 @@
+<?php
+
+if ($query->hasError()) {
+    echo 'Code: ' . $query->getErrorCode();
+    echo 'Error: ' . $query->getErrorMessage();
+}
diff --git a/user_guide_src/source/database/queries/026.php b/user_guide_src/source/database/queries/026.php
new file mode 100644
index 000000000000..f174275e9fbc
--- /dev/null
+++ b/user_guide_src/source/database/queries/026.php
@@ -0,0 +1,5 @@
+<?php
+
+if ($query->isWriteType()) {
+    // ... do something
+}
diff --git a/user_guide_src/source/database/queries/027.php b/user_guide_src/source/database/queries/027.php
new file mode 100644
index 000000000000..9837a11c4ca9
--- /dev/null
+++ b/user_guide_src/source/database/queries/027.php
@@ -0,0 +1,3 @@
+<?php
+
+$sql = $query->swapPrefix('ci3_', 'ci4_');
diff --git a/user_guide_src/source/database/queries/028.php b/user_guide_src/source/database/queries/028.php
new file mode 100644
index 000000000000..6dddc407604c
--- /dev/null
+++ b/user_guide_src/source/database/queries/028.php
@@ -0,0 +1,3 @@
+<?php
+
+$microtime = $query->getStartTime();
diff --git a/user_guide_src/source/database/queries/029.php b/user_guide_src/source/database/queries/029.php
new file mode 100644
index 000000000000..0f3010e6bcbc
--- /dev/null
+++ b/user_guide_src/source/database/queries/029.php
@@ -0,0 +1,3 @@
+<?php
+
+$microtime = $query->getDuration();
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index e4283cf52f67..1969620b63a8 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -25,10 +25,10 @@ Loading the Query Builder
 
 The Query Builder is loaded through the ``table()`` method on the
 database connection. This sets the **FROM** portion of the query for you
-and returns a new instance of the Query Builder class::
+and returns a new instance of the Query Builder class:
 
-    $db      = \Config\Database::connect();
-    $builder = $db->table('users');
+.. literalinclude:: query_builder/001.php
+   :lines: 2-
 
 The Query Builder is only loaded into memory when you specifically request
 the class, so no resources are used by default.
@@ -45,27 +45,22 @@ Get
 **$builder->get()**
 
 Runs the selection query and returns the result. Can be used by itself
-to retrieve all records from a table::
+to retrieve all records from a table:
 
-    $builder = $db->table('mytable');
-    $query   = $builder->get();  // Produces: SELECT * FROM mytable
+.. literalinclude:: query_builder/002.php
+   :lines: 2-
 
 The first and second parameters enable you to set a limit and offset
-clause::
+clause:
 
-    $query = $builder->get(10, 20);
-
-    // Executes: SELECT * FROM mytable LIMIT 20, 10
-    // (in MySQL. Other databases have slightly different syntax)
+.. literalinclude:: query_builder/003.php
+   :lines: 2-
 
 You'll notice that the above method is assigned to a variable named
-$query, which can be used to show the results::
-
-    $query = $builder->get();
+$query, which can be used to show the results:
 
-    foreach ($query->getResult() as $row) {
-        echo $row->title;
-    }
+.. literalinclude:: query_builder/004.php
+   :lines: 2-
 
 Please visit the :doc:`getResult*() method <results>` page for a full
 discussion regarding result generation.
@@ -75,24 +70,16 @@ discussion regarding result generation.
 Compiles the selection query just like ``$builder->get()`` but does not *run*
 the query. This method simply returns the SQL query as a string.
 
-Example::
-
-    $sql = $builder->getCompiledSelect();
-    echo $sql;
+Example:
 
-    // Prints string: SELECT * FROM mytable
+.. literalinclude:: query_builder/005.php
+   :lines: 2-
 
 The first parameter enables you to set whether or not the query builder query
-will be reset (by default it will be reset, just like when using ``$builder->get()``)::
-
-    echo $builder->limit(10,20)->getCompiledSelect(false);
-
-    // Prints string: SELECT * FROM mytable LIMIT 20, 10
-    // (in MySQL. Other databases have slightly different syntax)
-
-    echo $builder->select('title, content, date')->getCompiledSelect();
+will be reset (by default it will be reset, just like when using ``$builder->get()``):
 
-    // Prints string: SELECT title, content, date FROM mytable LIMIT 20, 10
+.. literalinclude:: query_builder/006.php
+   :lines: 2-
 
 The key thing to notice in the above example is that the second query did not
 utilize ``$builder->from()`` and did not pass a table name into the first
@@ -104,9 +91,10 @@ using ``$builder->resetQuery()``.
 
 Identical to the ``get()`` method except that it permits you to add a
 "where" clause in the first parameter, instead of using the ``$builder->where()``
-method::
+method:
 
-    $query = $builder->getWhere(['id' => $id], $limit, $offset);
+.. literalinclude:: query_builder/007.php
+   :lines: 2-
 
 Please read about the ``where()`` method below for more information.
 
@@ -115,12 +103,10 @@ Select
 
 **$builder->select()**
 
-Permits you to write the **SELECT** portion of your query::
+Permits you to write the **SELECT** portion of your query:
 
-    $builder->select('title, content, date');
-    $query = $builder->get();
-
-    // Executes: SELECT title, content, date FROM mytable
+.. literalinclude:: query_builder/008.php
+   :lines: 2-
 
 .. note:: If you are selecting all (``*``) from a table you do not need to
     use this method. When omitted, CodeIgniter assumes that you wish
@@ -131,25 +117,16 @@ to ``false``, CodeIgniter will not try to protect your field or table names.
 This is useful if you need a compound select statement where automatic
 escaping of fields may break them.
 
-::
-
-    $builder->select('(SELECT SUM(payments.amount) FROM payments WHERE payments.invoice_id=4) AS amount_paid', false);
-    $query = $builder->get();
+.. literalinclude:: query_builder/009.php
+   :lines: 2-
 
 **$builder->selectMax()**
 
 Writes a **SELECT MAX(field)** portion for your query. You can optionally
 include a second parameter to rename the resulting field.
 
-::
-
-    $builder->selectMax('age');
-    $query = $builder->get();
-    // Produces: SELECT MAX(age) as age FROM mytable
-
-    $builder->selectMax('age', 'member_age');
-    $query = $builder->get();
-    // Produces: SELECT MAX(age) as member_age FROM mytable
+.. literalinclude:: query_builder/010.php
+   :lines: 2-
 
 **$builder->selectMin()**
 
@@ -157,11 +134,8 @@ Writes a **SELECT MIN(field)** portion for your query. As with
 ``selectMax()``, You can optionally include a second parameter to rename
 the resulting field.
 
-::
-
-    $builder->selectMin('age');
-    $query = $builder->get();
-    // Produces: SELECT MIN(age) as age FROM mytable
+.. literalinclude:: query_builder/011.php
+   :lines: 2-
 
 **$builder->selectAvg()**
 
@@ -169,11 +143,8 @@ Writes a **SELECT AVG(field)** portion for your query. As with
 ``selectMax()``, You can optionally include a second parameter to rename
 the resulting field.
 
-::
-
-    $builder->selectAvg('age');
-    $query = $builder->get();
-    // Produces: SELECT AVG(age) as age FROM mytable
+.. literalinclude:: query_builder/012.php
+   :lines: 2-
 
 **$builder->selectSum()**
 
@@ -181,11 +152,8 @@ Writes a **SELECT SUM(field)** portion for your query. As with
 ``selectMax()``, You can optionally include a second parameter to rename
 the resulting field.
 
-::
-
-    $builder->selectSum('age');
-    $query = $builder->get();
-    // Produces: SELECT SUM(age) as age FROM mytable
+.. literalinclude:: query_builder/013.php
+   :lines: 2-
 
 **$builder->selectCount()**
 
@@ -196,24 +164,18 @@ the resulting field.
 .. note:: This method is particularly helpful when used with ``groupBy()``. For
         counting results generally see ``countAll()`` or ``countAllResults()``.
 
-::
-
-    $builder->selectCount('age');
-    $query = $builder->get();
-    // Produces: SELECT COUNT(age) as age FROM mytable
+.. literalinclude:: query_builder/014.php
+   :lines: 2-
 
 From
 ====
 
 **$builder->from()**
 
-Permits you to write the **FROM** portion of your query::
+Permits you to write the **FROM** portion of your query:
 
-    $builder = $db->table('users');
-    $builder->select('title, content, date');
-    $builder->from('mytable');
-    $query = $builder->get();
-    // Produces: SELECT title, content, date FROM users, mytable
+.. literalinclude:: query_builder/015.php
+   :lines: 2-
 
 .. note:: As shown earlier, the **FROM** portion of your query can be specified
     in the ``$db->table()`` method. Additional calls to ``from()`` will add more tables
@@ -228,36 +190,25 @@ Subqueries
 
 Permits you to write part of a **FROM** query as a subquery.
 
-This is where we add a subquery to an existing table.::
+This is where we add a subquery to an existing table.:
 
-    $subquery = $db->table('users');
-    $builder  = $db->table('jobs')->fromSubquery($subquery, 'alias');
-    $query = $builder->get();
+.. literalinclude:: query_builder/016.php
+   :lines: 2-
 
-    // Produces: SELECT * FROM `jobs`, (SELECT * FROM `users`) AS `alias`
+Use the ``$db->newQuery()`` method to make a subquery the main table.:
 
-Use the ``$db->newQuery()`` method to make a subquery the main table.::
-
-    $subquery = $db->table('users')->select('id, name');
-    $builder  = $db->newQuery()->fromSubquery($subquery, 't');
-    $query = $builder->get();
-
-    // Produces: SELECT * FROM (SELECT `id`, `name` FROM users) AS `t`
+.. literalinclude:: query_builder/017.php
+   :lines: 2-
 
 Join
 ====
 
 **$builder->join()**
 
-Permits you to write the **JOIN** portion of your query::
-
-    $builder = $db->table('blogs');
-    $builder->select('*');
-    $builder->join('comments', 'comments.id = blogs.id');
-    $query = $builder->get();
+Permits you to write the **JOIN** portion of your query:
 
-    // Produces:
-    // SELECT * FROM blogs JOIN comments ON comments.id = blogs.id
+.. literalinclude:: query_builder/018.php
+   :lines: 2-
 
 Multiple method calls can be made if you need several joins in one
 query.
@@ -266,10 +217,8 @@ If you need a specific type of **JOIN** you can specify it via the third
 parameter of the method. Options are: ``left``, ``right``, ``outer``, ``inner``, ``left
 outer``, and ``right outer``.
 
-::
-
-    $builder->join('comments', 'comments.id = blogs.id', 'left');
-    // Produces: LEFT JOIN comments ON comments.id = blogs.id
+.. literalinclude:: query_builder/019.php
+   :lines: 2-
 
 *************************
 Looking for Specific Data
@@ -288,172 +237,114 @@ methods:
 
 #. **Simple key/value method:**
 
-    ::
-
-        $builder->where('name', $name);
-        // Produces: WHERE name = 'Joe'
+    .. literalinclude:: query_builder/020.php
+       :lines: 2-
 
     Notice that the equal sign is added for you.
 
     If you use multiple method calls they will be chained together with
-    **AND** between them::
+    **AND** between them:
 
-        $builder->where('name', $name);
-        $builder->where('title', $title);
-        $builder->where('status', $status);
-        // WHERE name = 'Joe' AND title = 'boss' AND status = 'active'
+    .. literalinclude:: query_builder/021.php
+       :lines: 2-
 
 #. **Custom key/value method:**
 
     You can include an operator in the first parameter in order to
-    control the comparison::
+    control the comparison:
 
-        $builder->where('name !=', $name);
-        $builder->where('id <', $id);
-        // Produces: WHERE name != 'Joe' AND id < 45
+    .. literalinclude:: query_builder/022.php
+       :lines: 2-
 
 #. **Associative array method:**
 
-    ::
-
-        $array = ['name' => $name, 'title' => $title, 'status' => $status];
-        $builder->where($array);
-        // Produces: WHERE name = 'Joe' AND title = 'boss' AND status = 'active'
+    .. literalinclude:: query_builder/023.php
+       :lines: 2-
 
-    You can include your own operators using this method as well::
+    You can include your own operators using this method as well:
 
-        $array = ['name !=' => $name, 'id <' => $id, 'date >' => $date];
-        $builder->where($array);
+    .. literalinclude:: query_builder/024.php
+       :lines: 2-
 
 #. **Custom string:**
 
-    You can write your own clauses manually::
+    You can write your own clauses manually:
 
-        $where = "name='Joe' AND status='boss' OR status='active'";
-        $builder->where($where);
+    .. literalinclude:: query_builder/025.php
+       :lines: 2-
 
     .. warning:: If you are using user-supplied data within the string, you MUST escape the
         data manually. Failure to do so could result in SQL injections.
 
-        ::
-
-        $name = $builder->db->escape('Joe');
-        $where = "name={$name} AND status='boss' OR status='active'";
-        $builder->where($where);
+        .. literalinclude:: query_builder/026.php
+           :lines: 2-
 
 .. _query-builder-where-subquery:
 
 5. **Subqueries:**
 
-    ::
-
-        // With closure
-
-        $builder->where('advance_amount <', function (BaseBuilder $builder) {
-            return $builder->select('MAX(advance_amount)', false)->from('orders')->where('id >', 2);
-        });
-
-        // Produces: WHERE "advance_amount" < (SELECT MAX(advance_amount) FROM "orders" WHERE "id" > 2)
-
-        // With builder directly
-        $subQuery = $db->table('orders')->select('MAX(advance_amount)', false)->where('id >', 2)
-        $builder->where('advance_amount <', $subQuery);
+    .. literalinclude:: query_builder/027.php
+       :lines: 2-
 
 **$builder->orWhere()**
 
 This method is identical to the one above, except that multiple
-instances are joined by **OR**::
+instances are joined by **OR**:
 
-    $builder->where('name !=', $name);
-    $builder->orWhere('id >', $id);
-    // Produces: WHERE name != 'Joe' OR id > 50
+.. literalinclude:: query_builder/028.php
+   :lines: 2-
 
 **$builder->whereIn()**
 
 Generates a **WHERE** field IN ('item', 'item') SQL query joined with **AND** if
-appropriate::
+appropriate:
 
-    $names = ['Frank', 'Todd', 'James'];
-    $builder->whereIn('username', $names);
-    // Produces: WHERE username IN ('Frank', 'Todd', 'James')
+.. literalinclude:: query_builder/029.php
+   :lines: 2-
 
-You can use subqueries instead of an array of values::
+You can use subqueries instead of an array of values:
 
-    // With closure
-    $builder->whereIn('id', function (BaseBuilder $builder) {
-        return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
-    });
-    // Produces: WHERE "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
-
-    // With builder directly
-    $subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
-    $builder->whereIn('id', $subQuery);
+.. literalinclude:: query_builder/030.php
+   :lines: 2-
 
 **$builder->orWhereIn()**
 
 Generates a **WHERE field IN ('item', 'item')** SQL query joined with **OR** if
-appropriate::
-
-        $names = ['Frank', 'Todd', 'James'];
-        $builder->orWhereIn('username', $names);
-        // Produces: OR username IN ('Frank', 'Todd', 'James')
-
-You can use subqueries instead of an array of values::
+appropriate:
 
-        // With closure
-        $builder->orWhereIn('id', function (BaseBuilder $builder) {
-            return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
-        });
+.. literalinclude:: query_builder/031.php
+   :lines: 2-
 
-        // Produces: OR "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
+You can use subqueries instead of an array of values:
 
-        // With builder directly
-        $subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
-        $builder->orWhereIn('id', $subQuery);
+.. literalinclude:: query_builder/032.php
+   :lines: 2-
 
 **$builder->whereNotIn()**
 
 Generates a **WHERE field NOT IN ('item', 'item')** SQL query joined with
-**AND** if appropriate::
+**AND** if appropriate:
 
-    $names = ['Frank', 'Todd', 'James'];
-    $builder->whereNotIn('username', $names);
-    // Produces: WHERE username NOT IN ('Frank', 'Todd', 'James')
+.. literalinclude:: query_builder/033.php
+   :lines: 2-
 
-You can use subqueries instead of an array of values::
+You can use subqueries instead of an array of values:
 
-    // With closure
-    $builder->whereNotIn('id', function (BaseBuilder $builder) {
-        return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
-    });
-
-    // Produces: WHERE "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
-
-    // With builder directly
-    $subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
-    $builder->whereNotIn('id', $subQuery);
+.. literalinclude:: query_builder/034.php
+   :lines: 2-
 
 **$builder->orWhereNotIn()**
 
 Generates a **WHERE field NOT IN ('item', 'item')** SQL query joined with **OR**
-if appropriate::
-
-    $names = ['Frank', 'Todd', 'James'];
-    $builder->orWhereNotIn('username', $names);
-    // Produces: OR username NOT IN ('Frank', 'Todd', 'James')
+if appropriate:
 
-You can use subqueries instead of an array of values::
+.. literalinclude:: query_builder/035.php
+   :lines: 2-
 
-    // With closure
-    $builder->orWhereNotIn('id', function (BaseBuilder $builder) {
-        return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
-    });
+You can use subqueries instead of an array of values:
 
-    // Produces: OR "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
-
-    // With builder directly
-    $subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
-    $builder->orWhereNotIn('id', $subQuery);
+.. literalinclude:: query_builder/036.php
+   :lines: 2-
 
 ************************
 Looking for Similar Data
@@ -473,103 +364,89 @@ searches.
 
 #. **Simple key/value method:**
 
-    ::
-
-        $builder->like('title', 'match');
-        // Produces: WHERE `title` LIKE '%match%' ESCAPE '!'
+    .. literalinclude:: query_builder/037.php
+       :lines: 2-
 
     If you use multiple method calls they will be chained together with
-    **AND** between them::
+    **AND** between them:
 
-        $builder->like('title', 'match');
-        $builder->like('body', 'match');
-        // WHERE `title` LIKE '%match%' ESCAPE '!' AND  `body` LIKE '%match%' ESCAPE '!'
+    .. literalinclude:: query_builder/038.php
+       :lines: 2-
 
     If you want to control where the wildcard (**%**) is placed, you can use
     an optional third argument. Your options are ``before``, ``after`` and
     ``both`` (which is the default).
 
-    ::
-
-        $builder->like('title', 'match', 'before'); // Produces: WHERE `title` LIKE '%match' ESCAPE '!'
-        $builder->like('title', 'match', 'after');  // Produces: WHERE `title` LIKE 'match%' ESCAPE '!'
-        $builder->like('title', 'match', 'both');   // Produces: WHERE `title` LIKE '%match%' ESCAPE '!'
+    .. literalinclude:: query_builder/039.php
+       :lines: 2-
 
 #. **Associative array method:**
 
-    ::
-
-        $array = ['title' => $match, 'page1' => $match, 'page2' => $match];
-        $builder->like($array);
-        // WHERE `title` LIKE '%match%' ESCAPE '!' AND  `page1` LIKE '%match%' ESCAPE '!' AND  `page2` LIKE '%match%' ESCAPE '!'
+       .. literalinclude:: query_builder/040.php
+          :lines: 2-
 
 **$builder->orLike()**
 
 This method is identical to the one above, except that multiple
-instances are joined by **OR**::
+instances are joined by **OR**:
 
-    $builder->like('title', 'match'); $builder->orLike('body', $match);
-    // WHERE `title` LIKE '%match%' ESCAPE '!' OR  `body` LIKE '%match%' ESCAPE '!'
+.. literalinclude:: query_builder/041.php
+   :lines: 2-
 
 **$builder->notLike()**
 
 This method is identical to ``like()``, except that it generates
-**NOT LIKE** statements::
+**NOT LIKE** statements:
 
-    $builder->notLike('title', 'match'); // WHERE `title` NOT LIKE '%match% ESCAPE '!'
+.. literalinclude:: query_builder/042.php
+   :lines: 2-
 
 **$builder->orNotLike()**
 
 This method is identical to ``notLike()``, except that multiple
-instances are joined by **OR**::
+instances are joined by **OR**:
 
-    $builder->like('title', 'match');
-    $builder->orNotLike('body', 'match');
-    // WHERE `title` LIKE '%match% OR  `body` NOT LIKE '%match%' ESCAPE '!'
+.. literalinclude:: query_builder/043.php
+   :lines: 2-
 
 **$builder->groupBy()**
 
-Permits you to write the **GROUP BY** portion of your query::
+Permits you to write the **GROUP BY** portion of your query:
 
-    $builder->groupBy("title");
-    // Produces: GROUP BY title
+.. literalinclude:: query_builder/044.php
+   :lines: 2-
 
-You can also pass an array of multiple values as well::
+You can also pass an array of multiple values as well:
 
-    $builder->groupBy(["title", "date"]);
-    // Produces: GROUP BY title, date
+.. literalinclude:: query_builder/045.php
+   :lines: 2-
 
 **$builder->distinct()**
 
 Adds the **DISTINCT** keyword to a query
 
-::
-
-    $builder->distinct();
-    $builder->get();
-    // Produces: SELECT DISTINCT * FROM mytable
+.. literalinclude:: query_builder/046.php
+   :lines: 2-
 
 **$builder->having()**
 
 Permits you to write the **HAVING** portion of your query. There are 2
-possible syntaxes, 1 argument or 2::
+possible syntaxes, 1 argument or 2:
 
-    $builder->having('user_id = 45'); // Produces: HAVING user_id = 45
-    $builder->having('user_id',  45); // Produces: HAVING user_id = 45
+.. literalinclude:: query_builder/047.php
+   :lines: 2-
 
-You can also pass an array of multiple values as well::
+You can also pass an array of multiple values as well:
 
-    $builder->having(['title =' => 'My Title', 'id <' => $id]);
-    // Produces: HAVING title = 'My Title', id < 45
+.. literalinclude:: query_builder/048.php
+   :lines: 2-
 
 If you are using a database that CodeIgniter escapes queries for, you
 can prevent escaping content by passing an optional third argument, and
 setting it to ``false``.
 
-::
-
-    $builder->having('user_id',  45); // Produces: HAVING `user_id` = 45 in some databases such as MySQL
-    $builder->having('user_id',  45, false); // Produces: HAVING user_id = 45
+.. literalinclude:: query_builder/049.php
+   :lines: 2-
 
 **$builder->orHaving()**
 
@@ -578,95 +455,54 @@ Identical to ``having()``, only separates multiple clauses with **OR**.
 **$builder->havingIn()**
 
 Generates a **HAVING field IN ('item', 'item')** SQL query joined with **AND** if
-appropriate::
-
-    $groups = [1, 2, 3];
-    $builder->havingIn('group_id', $groups);
-    // Produces: HAVING group_id IN (1, 2, 3)
+appropriate:
 
-You can use subqueries instead of an array of values.::
+.. literalinclude:: query_builder/050.php
+   :lines: 2-
 
-    // With closure
-    $builder->havingIn('id', function (BaseBuilder $builder) {
-        return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
-    });
-    // Produces: HAVING "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
+You can use subqueries instead of an array of values.:
 
-    // With builder directly
-    $subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
-    $builder->havingIn('id', $subQuery);
+.. literalinclude:: query_builder/051.php
+   :lines: 2-
 
 **$builder->orHavingIn()**
 
 Generates a **HAVING field IN ('item', 'item')** SQL query joined with **OR** if
 appropriate
 
-::
+.. literalinclude:: query_builder/052.php
+   :lines: 2-
 
-    $groups = [1, 2, 3];
-    $builder->orHavingIn('group_id', $groups);
-    // Produces: OR group_id IN (1, 2, 3)
+You can use subqueries instead of an array of values.:
 
-You can use subqueries instead of an array of values.::
-
-    //With closure
-    $builder->orHavingIn('id', function (BaseBuilder $builder) {
-        return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
-    });
-
-    // Produces: OR "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
-
-    // With builder directly
-    $subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
-    $builder->orHavingIn('id', $subQuery);
+.. literalinclude:: query_builder/053.php
+   :lines: 2-
 
 **$builder->havingNotIn()**
 
 Generates a **HAVING field NOT IN ('item', 'item')** SQL query joined with
 **AND** if appropriate
 
-::
-
-    $groups = [1, 2, 3];
-    $builder->havingNotIn('group_id', $groups);
-    // Produces: HAVING group_id NOT IN (1, 2, 3)
-
-You can use subqueries instead of an array of values.::
+.. literalinclude:: query_builder/054.php
+   :lines: 2-
 
-    //With closure
-    $builder->havingNotIn('id', function (BaseBuilder $builder) {
-        return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
-    });
+You can use subqueries instead of an array of values.:
 
-    // Produces: HAVING "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
-
-    // With builder directly
-    $subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
-    $builder->havingNotIn('id', $subQuery);
+.. literalinclude:: query_builder/055.php
+   :lines: 2-
 
 **$builder->orHavingNotIn()**
 
 Generates a **HAVING field NOT IN ('item', 'item')** SQL query joined with **OR**
 if appropriate
 
-::
-
-    $groups = [1, 2, 3];
-    $builder->havingNotIn('group_id', $groups);
-    // Produces: OR group_id NOT IN (1, 2, 3)
-
-You can use subqueries instead of an array of values.::
+.. literalinclude:: query_builder/056.php
+   :lines: 2-
 
-    //With closure
-    $builder->orHavingNotIn('id', function (BaseBuilder $builder) {
-        return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
-    });
+You can use subqueries instead of an array of values.:
 
-    // Produces: OR "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
-
-    // With builder directly
-    $subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
-    $builder->orHavingNotIn('id', $subQuery);
+.. literalinclude:: query_builder/057.php
+   :lines: 2-
 
 **$builder->havingLike()**
 
@@ -682,60 +518,50 @@ searches.
 
 #. **Simple key/value method:**
 
-    ::
-
-        $builder->havingLike('title', 'match');
-        // Produces: HAVING `title` LIKE '%match%' ESCAPE '!'
+    .. literalinclude:: query_builder/058.php
+       :lines: 2-
 
     If you use multiple method calls they will be chained together with
-    **AND** between them::
+    **AND** between them:
 
-        $builder->havingLike('title', 'match');
-        $builder->havingLike('body', 'match');
-        // HAVING `title` LIKE '%match%' ESCAPE '!' AND  `body` LIKE '%match% ESCAPE '!'
+    .. literalinclude:: query_builder/059.php
+       :lines: 2-
 
     If you want to control where the wildcard (**%**) is placed, you can use
     an optional third argument. Your options are ``before``, ``after`` and
     ``both`` (which is the default).
 
-    ::
-
-        $builder->havingLike('title', 'match', 'before'); // Produces: HAVING `title` LIKE '%match' ESCAPE '!'
-        $builder->havingLike('title', 'match', 'after');  // Produces: HAVING `title` LIKE 'match%' ESCAPE '!'
-        $builder->havingLike('title', 'match', 'both');   // Produces: HAVING `title` LIKE '%match%' ESCAPE '!'
+    .. literalinclude:: query_builder/060.php
+       :lines: 2-
 
 #. **Associative array method:**
 
-    ::
-
-        $array = ['title' => $match, 'page1' => $match, 'page2' => $match];
-        $builder->havingLike($array);
-        // HAVING `title` LIKE '%match%' ESCAPE '!' AND  `page1` LIKE '%match%' ESCAPE '!' AND  `page2` LIKE '%match%' ESCAPE '!'
+       .. literalinclude:: query_builder/061.php
+          :lines: 2-
 
 **$builder->orHavingLike()**
 
 This method is identical to the one above, except that multiple
-instances are joined by **OR**::
+instances are joined by **OR**:
 
-    $builder->havingLike('title', 'match'); $builder->orHavingLike('body', $match);
-    // HAVING `title` LIKE '%match%' ESCAPE '!' OR  `body` LIKE '%match%' ESCAPE '!'
+.. literalinclude:: query_builder/062.php
+   :lines: 2-
 
 **$builder->notHavingLike()**
 
 This method is identical to ``havingLike()``, except that it generates
-**NOT LIKE** statements::
+**NOT LIKE** statements:
 
-    $builder->notHavingLike('title', 'match');
-    // HAVING `title` NOT LIKE '%match% ESCAPE '!'
+.. literalinclude:: query_builder/063.php
+   :lines: 2-
 
 **$builder->orNotHavingLike()**
 
 This method is identical to ``notHavingLike()``, except that multiple
-instances are joined by **OR**::
+instances are joined by **OR**:
 
-    $builder->havingLike('title', 'match');
-    $builder->orNotHavingLike('body', 'match');
-    // HAVING `title` LIKE '%match% OR  `body` NOT LIKE '%match%' ESCAPE '!'
+.. literalinclude:: query_builder/064.php
+   :lines: 2-
 
 ****************
 Ordering Results
@@ -750,34 +576,24 @@ The first parameter contains the name of the column you would like to order by.
 The second parameter lets you set the direction of the result.
 Options are ``ASC``, ``DESC`` AND ``RANDOM``.
 
-::
-
-    $builder->orderBy('title', 'DESC');
-    // Produces: ORDER BY `title` DESC
+.. literalinclude:: query_builder/065.php
+   :lines: 2-
 
-You can also pass your own string in the first parameter::
+You can also pass your own string in the first parameter:
 
-    $builder->orderBy('title DESC, name ASC');
-    // Produces: ORDER BY `title` DESC, `name` ASC
+.. literalinclude:: query_builder/066.php
+   :lines: 2-
 
 Or multiple method calls can be made if you need multiple fields.
 
-::
-
-    $builder->orderBy('title', 'DESC');
-    $builder->orderBy('name', 'ASC');
-    // Produces: ORDER BY `title` DESC, `name` ASC
+.. literalinclude:: query_builder/067.php
+   :lines: 2-
 
 If you choose the ``RANDOM`` direction option, then the first parameters will
 be ignored, unless you specify a numeric seed value.
 
-::
-
-    $builder->orderBy('title', 'RANDOM');
-    // Produces: ORDER BY RAND()
-
-    $builder->orderBy(42, 'RANDOM');
-    // Produces: ORDER BY RAND(42)
+.. literalinclude:: query_builder/068.php
+   :lines: 2-
 
 ****************************
 Limiting or Counting Results
@@ -785,44 +601,39 @@ Limiting or Counting Results
 
 **$builder->limit()**
 
-Lets you limit the number of rows you would like returned by the query::
+Lets you limit the number of rows you would like returned by the query:
 
-    $builder->limit(10);
-    // Produces: LIMIT 10
+.. literalinclude:: query_builder/069.php
+   :lines: 2-
 
 The second parameter lets you set a result offset.
 
-::
-
-    $builder->limit(10, 20);
-    // Produces: LIMIT 20, 10 (in MySQL. Other databases have slightly different syntax)
-
+.. literalinclude:: query_builder/070.php
+   :lines: 2-
 
 **$builder->countAllResults()**
 
 Permits you to determine the number of rows in a particular Query
 Builder query. Queries will accept Query Builder restrictors such as
-``where()``, ``orWhere()``, ``like()``, ``orLike()``, etc. Example::
+``where()``, ``orWhere()``, ``like()``, ``orLike()``, etc. Example:
 
-    echo $builder->countAllResults(); // Produces an integer, like 25
-    $builder->like('title', 'match');
-    $builder->from('my_table');
-    echo $builder->countAllResults(); // Produces an integer, like 17
+.. literalinclude:: query_builder/071.php
+   :lines: 2-
 
 However, this method also resets any field values that you may have passed
 to ``select()``. If you need to keep them, you can pass ``false`` as the
 first parameter.
 
-::
-
-    echo $builder->countAllResults(false); // Produces an integer, like 17
+.. literalinclude:: query_builder/072.php
+   :lines: 2-
 
 **$builder->countAll()**
 
 Permits you to determine the number of rows in a particular table.
-Example::
+Example:
 
-    echo $builder->countAll(); // Produces an integer, like 25
+.. literalinclude:: query_builder/073.php
+   :lines: 2-
 
 As is in ``countAllResult()`` method, this method resets any field values that you may have passed
 to ``select()`` as well. If you need to keep them, you can pass ``false`` as the
@@ -833,21 +644,10 @@ Query grouping
 **************
 
 Query grouping allows you to create groups of **WHERE** clauses by enclosing them in parentheses. This will allow
-you to create queries with complex **WHERE** clauses. Nested groups are supported. Example::
-
-    $builder->select('*')->from('my_table')
-        ->groupStart()
-            ->where('a', 'a')
-            ->orGroupStart()
-                ->where('b', 'b')
-                ->where('c', 'c')
-            ->groupEnd()
-        ->groupEnd()
-        ->where('d', 'd')
-    ->get();
-
-    // Generates:
-    // SELECT * FROM (`my_table`) WHERE ( `a` = 'a' OR ( `b` = 'b' AND `c` = 'c' ) ) AND `d` = 'd'
+you to create queries with complex **WHERE** clauses. Nested groups are supported. Example:
+
+.. literalinclude:: query_builder/074.php
+   :lines: 2-
 
 .. note:: Groups need to be balanced, make sure every ``groupStart()`` is matched by a ``groupEnd()``.
 
@@ -899,31 +699,17 @@ Inserting Data
 
 Generates an insert string based on the data you supply, and runs the
 query. You can either pass an **array** or an **object** to the
-method. Here is an example using an array::
-
-    $data = [
-        'title' => 'My title',
-        'name'  => 'My Name',
-        'date'  => 'My date',
-    ];
+method. Here is an example using an array:
 
-    $builder->insert($data);
-    // Produces: INSERT INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')
+.. literalinclude:: query_builder/075.php
+   :lines: 2-
 
 The first parameter is an associative array of values.
 
-Here is an example using an object::
-
-    class Myclass
-    {
-        public $title   = 'My Title';
-        public $content = 'My Content';
-        public $date    = 'My Date';
-    }
+Here is an example using an object:
 
-    $object = new Myclass;
-    $builder->insert($object);
-    // Produces: INSERT INTO mytable (title, content, date) VALUES ('My Title', 'My Content', 'My Date')
+.. literalinclude:: query_builder/076.php
+   :lines: 2-
 
 The first parameter is an object.
 
@@ -933,46 +719,26 @@ The first parameter is an object.
 
 Generates an insert ignore string based on the data you supply, and runs the
 query. So if an entry with the same primary key already exists, the query won't be inserted.
-You can optionally pass an **boolean** to the method. Here is an example using the array of the above example::
-
-    $data = [
-        'title' => 'My title',
-        'name'  => 'My Name',
-        'date'  => 'My date',
-    ];
-
-    $builder->ignore(true)->insert($data);
-    // Produces: INSERT OR IGNORE INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')
+You can optionally pass an **boolean** to the method. Here is an example using the array of the above example:
 
+.. literalinclude:: query_builder/077.php
+   :lines: 2-
 
 **$builder->getCompiledInsert()**
 
 Compiles the insertion query just like ``$builder->insert()`` but does not
 *run* the query. This method simply returns the SQL query as a string.
 
-Example::
-
-    $data = [
-        'title' => 'My title',
-        'name'  => 'My Name',
-        'date'  => 'My date',
-    ];
+Example:
 
-    $sql = $builder->set($data)->getCompiledInsert();
-    echo $sql;
-
-    // Produces string: INSERT INTO mytable (`title`, `name`, `date`) VALUES ('My title', 'My name', 'My date')
+.. literalinclude:: query_builder/078.php
+   :lines: 2-
 
 The first parameter enables you to set whether or not the query builder query
-will be reset (by default it will be--just like ``$builder->insert()``)::
-
-    echo $builder->set('title', 'My Title')->getCompiledInsert(false);
+will be reset (by default it will be--just like ``$builder->insert()``):
 
-    // Produces string: INSERT INTO mytable (`title`) VALUES ('My Title')
-
-    echo $builder->set('content', 'My Content')->getCompiledInsert();
-
-    // Produces string: INSERT INTO mytable (`title`, `content`) VALUES ('My Title', 'My Content')
+.. literalinclude:: query_builder/079.php
+   :lines: 2-
 
 The reason the second query worked is that the query has not been executed
 using ``$builder->insert()`` which resets values or reset directly using
@@ -984,23 +750,10 @@ using ``$builder->insert()`` which resets values or reset directly using
 
 Generates an insert string based on the data you supply, and runs the
 query. You can either pass an **array** or an **object** to the
-method. Here is an example using an array::
-
-    $data = [
-        [
-            'title' => 'My title',
-            'name'  => 'My Name',
-            'date'  => 'My date',
-        ],
-        [
-            'title' => 'Another title',
-            'name'  => 'Another Name',
-            'date'  => 'Another date',
-        ],
-    ];
-
-    $builder->insertBatch($data);
-    // Produces: INSERT INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date'),  ('Another title', 'Another name', 'Another date')
+method. Here is an example using an array:
+
+.. literalinclude:: query_builder/080.php
+   :lines: 2-
 
 The first parameter is an associative array of values.
 
@@ -1019,17 +772,10 @@ In our case, it will save you from the need to implement complex
 logics with different combinations of  ``select()``, ``update()``,
 ``delete()`` and ``insert()`` calls.
 
-Example::
+Example:
 
-    $data = [
-        'title' => 'My title',
-        'name'  => 'My Name',
-        'date'  => 'My date',
-    ];
-
-    $builder->replace($data);
-
-    // Executes: REPLACE INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')
+.. literalinclude:: query_builder/081.php
+   :lines: 2-
 
 In the above example, if we assume that the ``title`` field is our primary
 key, then if a row containing ``My title`` as the ``title`` value, that row
@@ -1045,110 +791,60 @@ This method enables you to set values for inserts or updates.
 **It can be used instead of passing a data array directly to the insert()
 or update() methods:**
 
-::
-
-    $builder->set('name', $name);
-    $builder->insert();
-    // Produces: INSERT INTO mytable (`name`) VALUES ('{$name}')
+.. literalinclude:: query_builder/082.php
+   :lines: 2-
 
 If you use multiple method called they will be assembled properly
-based on whether you are doing an insert or an update::
+based on whether you are doing an insert or an update:
 
-    $builder->set('name', $name);
-    $builder->set('title', $title);
-    $builder->set('status', $status);
-    $builder->insert();
+.. literalinclude:: query_builder/083.php
+   :lines: 2-
 
 ``set()`` will also accept an optional third parameter (``$escape``), that
 will prevent data from being escaped if set to ``false``. To illustrate the
 difference, here is ``set()`` used both with and without the escape
 parameter.
 
-::
+.. literalinclude:: query_builder/084.php
+   :lines: 2-
 
-    $builder->set('field', 'field+1', false);
-    $builder->where('id', 2);
-    $builder->update();
-    // gives UPDATE mytable SET field = field+1 WHERE `id` = 2
+You can also pass an associative array to this method:
 
-    $builder->set('field', 'field+1');
-    $builder->where('id', 2);
-    $builder->update();
-    // gives UPDATE `mytable` SET `field` = 'field+1' WHERE `id` = 2
+.. literalinclude:: query_builder/085.php
+   :lines: 2-
 
-You can also pass an associative array to this method::
+Or an object:
 
-    $array = [
-        'name'   => $name,
-        'title'  => $title,
-        'status' => $status,
-    ];
-
-    $builder->set($array);
-    $builder->insert();
-
-Or an object::
-
-    class Myclass
-    {
-        public $title   = 'My Title';
-        public $content = 'My Content';
-        public $date    = 'My Date';
-    }
-
-    $object = new Myclass;
-    $builder->set($object);
-    $builder->insert();
+.. literalinclude:: query_builder/086.php
+   :lines: 2-
 
 **$builder->update()**
 
 Generates an update string and runs the query based on the data you
 supply. You can pass an **array** or an **object** to the method. Here
-is an example using an array::
-
-    $data = [
-        'title' => $title,
-        'name'  => $name,
-        'date'  => $date,
-    ];
-
-    $builder->where('id', $id);
-    $builder->update($data);
-    // Produces:
-    //
-    // UPDATE mytable
-    // SET title = '{$title}', name = '{$name}', date = '{$date}'
-    // WHERE id = $id
-
-Or you can supply an object::
-
-    class Myclass
-    {
-        public $title   = 'My Title';
-        public $content = 'My Content';
-        public $date    = 'My Date';
-    }
-
-    $object = new Myclass;
-    $builder->where('id', $id);
-    $builder->update($object);
-    // Produces:
-    //
-    // UPDATE `mytable`
-    // SET `title` = '{$title}', `name` = '{$name}', `date` = '{$date}'
-    // WHERE id = `$id`
+is an example using an array:
+
+.. literalinclude:: query_builder/087.php
+   :lines: 2-
+
+Or you can supply an object:
+
+.. literalinclude:: query_builder/088.php
+   :lines: 2-
 
 .. note:: All values are escaped automatically producing safer queries.
 
 You'll notice the use of the ``$builder->where()`` method, enabling you
 to set the **WHERE** clause. You can optionally pass this information
-directly into the ``update()`` method as a string::
+directly into the ``update()`` method as a string:
 
-    $builder->update($data, "id = 4");
+.. literalinclude:: query_builder/089.php
+   :lines: 2-
 
-Or as an array::
+Or as an array:
 
-    $builder->update($data, ['id' => $id]);
+.. literalinclude:: query_builder/090.php
+   :lines: 2-
 
 You may also use the ``$builder->set()`` method described above when
 performing updates.
@@ -1157,33 +853,10 @@ performing updates.
 
 Generates an update string based on the data you supply, and runs the query.
 You can either pass an **array** or an **object** to the method.
-Here is an example using an array::
-
-    $data = [
-       [
-          'title' => 'My title' ,
-          'name'  => 'My Name 2' ,
-          'date'  => 'My date 2',
-       ],
-       [
-          'title' => 'Another title' ,
-          'name'  => 'Another Name 2' ,
-          'date'  => 'Another date 2',
-       ],
-    ];
-
-    $builder->updateBatch($data, 'title');
-
-    // Produces:
-    // UPDATE `mytable` SET `name` = CASE
-    // WHEN `title` = 'My title' THEN 'My Name 2'
-    // WHEN `title` = 'Another title' THEN 'Another Name 2'
-    // ELSE `name` END,
-    // `date` = CASE
-    // WHEN `title` = 'My title' THEN 'My date 2'
-    // WHEN `title` = 'Another title' THEN 'Another date 2'
-    // ELSE `date` END
-    // WHERE `title` IN ('My title','Another title')
+Here is an example using an array:
+
+.. literalinclude:: query_builder/091.php
+   :lines: 2-
 
 The first parameter is an associative array of values, the second parameter is the where key.
 
@@ -1210,21 +883,15 @@ Deleting Data
 
 Generates a **DELETE** SQL string and runs the query.
 
-::
-
-    $builder->delete(['id' => $id]);
-    // Produces: // DELETE FROM mytable  // WHERE id = $id
+.. literalinclude:: query_builder/092.php
+   :lines: 2-
 
 The first parameter is the where clause.
 You can also use the ``where()`` or ``or_where()`` methods instead of passing
-the data to the first parameter of the method::
-
-    $builder->where('id', $id);
-    $builder->delete();
+the data to the first parameter of the method:
 
-    // Produces:
-    // DELETE FROM mytable
-    // WHERE id = $id
+.. literalinclude:: query_builder/093.php
+   :lines: 2-
 
 If you want to delete all data from a table, you can use the ``truncate()``
 method, or ``emptyTable()``.
@@ -1232,21 +899,17 @@ method, or ``emptyTable()``.
 **$builder->emptyTable()**
 
 Generates a **DELETE** SQL string and runs the
-query::
+query:
 
-      $builder->emptyTable('mytable');
-      // Produces: DELETE FROM mytable
+.. literalinclude:: query_builder/094.php
+   :lines: 2-
 
 **$builder->truncate()**
 
 Generates a **TRUNCATE** SQL string and runs the query.
 
-::
-
-    $builder->truncate();
-
-    // Produce:
-    // TRUNCATE mytable
+.. literalinclude:: query_builder/095.php
+   :lines: 2-
 
 .. note:: If the TRUNCATE command isn't available, ``truncate()`` will
     execute as "DELETE FROM table".
@@ -1263,12 +926,10 @@ Method Chaining
 ***************
 
 Method chaining allows you to simplify your syntax by connecting
-multiple methods. Consider this example::
+multiple methods. Consider this example:
 
-    $query = $builder->select('title')
-                     ->where('id', $id)
-                     ->limit(10, 20)
-                     ->get();
+.. literalinclude:: query_builder/096.php
+   :lines: 2-
 
 .. _ar-caching:
 
@@ -1283,22 +944,10 @@ executing it first using a method like ``$builder->get()`` or ``$builder->insert
 
 This is useful in situations where you are using Query Builder to generate SQL
 (e.g., ``$builder->getCompiledSelect()``) but then choose to, for instance,
-run the query::
-
-    // Note that the second parameter of the ``get_compiled_select`` method is false
-    $sql = $builder->select(['field1','field2'])
-                   ->where('field3',5)
-                   ->getCompiledSelect(false);
-
-    // ...
-    // Do something crazy with the SQL code... like add it to a cron script for
-    // later execution or something...
-    // ...
-
-    $data = $builder->get()->getResultArray();
+run the query:
 
-    // Would execute and return an array of results of the following query:
-    // SELECT field1, field1 from mytable where field3 = 5;
+.. literalinclude:: query_builder/097.php
+   :lines: 2-
 
 ***************
 Class Reference
diff --git a/user_guide_src/source/database/query_builder/001.php b/user_guide_src/source/database/query_builder/001.php
new file mode 100644
index 000000000000..eea94ebba32b
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/001.php
@@ -0,0 +1,4 @@
+<?php
+
+$db      = \Config\Database::connect();
+$builder = $db->table('users');
diff --git a/user_guide_src/source/database/query_builder/002.php b/user_guide_src/source/database/query_builder/002.php
new file mode 100644
index 000000000000..741e40974d1f
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/002.php
@@ -0,0 +1,4 @@
+<?php
+
+$builder = $db->table('mytable');
+$query   = $builder->get();  // Produces: SELECT * FROM mytable
diff --git a/user_guide_src/source/database/query_builder/003.php b/user_guide_src/source/database/query_builder/003.php
new file mode 100644
index 000000000000..26a9470fb6ef
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/003.php
@@ -0,0 +1,6 @@
+<?php
+
+$query = $builder->get(10, 20);
+
+// Executes: SELECT * FROM mytable LIMIT 20, 10
+// (in MySQL. Other databases have slightly different syntax)
diff --git a/user_guide_src/source/database/query_builder/004.php b/user_guide_src/source/database/query_builder/004.php
new file mode 100644
index 000000000000..4f2de0913438
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/004.php
@@ -0,0 +1,7 @@
+<?php
+
+$query = $builder->get();
+
+foreach ($query->getResult() as $row) {
+    echo $row->title;
+}
diff --git a/user_guide_src/source/database/query_builder/005.php b/user_guide_src/source/database/query_builder/005.php
new file mode 100644
index 000000000000..38bc63a577e7
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/005.php
@@ -0,0 +1,6 @@
+<?php
+
+$sql = $builder->getCompiledSelect();
+echo $sql;
+
+// Prints string: SELECT * FROM mytable
diff --git a/user_guide_src/source/database/query_builder/006.php b/user_guide_src/source/database/query_builder/006.php
new file mode 100644
index 000000000000..2868aaa49fee
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/006.php
@@ -0,0 +1,10 @@
+<?php
+
+echo $builder->limit(10,20)->getCompiledSelect(false);
+
+// Prints string: SELECT * FROM mytable LIMIT 20, 10
+// (in MySQL. Other databases have slightly different syntax)
+
+echo $builder->select('title, content, date')->getCompiledSelect();
+
+// Prints string: SELECT title, content, date FROM mytable LIMIT 20, 10
diff --git a/user_guide_src/source/database/query_builder/007.php b/user_guide_src/source/database/query_builder/007.php
new file mode 100644
index 000000000000..4b47891a037c
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/007.php
@@ -0,0 +1,3 @@
+<?php
+
+$query = $builder->getWhere(['id' => $id], $limit, $offset);
diff --git a/user_guide_src/source/database/query_builder/008.php b/user_guide_src/source/database/query_builder/008.php
new file mode 100644
index 000000000000..e2b594d51865
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/008.php
@@ -0,0 +1,6 @@
+<?php
+
+$builder->select('title, content, date');
+$query = $builder->get();
+
+// Executes: SELECT title, content, date FROM mytable
diff --git a/user_guide_src/source/database/query_builder/009.php b/user_guide_src/source/database/query_builder/009.php
new file mode 100644
index 000000000000..0ca5e7be3656
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/009.php
@@ -0,0 +1,4 @@
+<?php
+
+$builder->select('(SELECT SUM(payments.amount) FROM payments WHERE payments.invoice_id=4) AS amount_paid', false);
+$query = $builder->get();
diff --git a/user_guide_src/source/database/query_builder/010.php b/user_guide_src/source/database/query_builder/010.php
new file mode 100644
index 000000000000..bf35bc62c5fd
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/010.php
@@ -0,0 +1,9 @@
+<?php
+
+$builder->selectMax('age');
+$query = $builder->get();
+// Produces: SELECT MAX(age) as age FROM mytable
+
+$builder->selectMax('age', 'member_age');
+$query = $builder->get();
+// Produces: SELECT MAX(age) as member_age FROM mytable
diff --git a/user_guide_src/source/database/query_builder/011.php b/user_guide_src/source/database/query_builder/011.php
new file mode 100644
index 000000000000..3fd9ec73f1b3
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/011.php
@@ -0,0 +1,5 @@
+<?php
+
+$builder->selectMin('age');
+$query = $builder->get();
+// Produces: SELECT MIN(age) as age FROM mytable
diff --git a/user_guide_src/source/database/query_builder/012.php b/user_guide_src/source/database/query_builder/012.php
new file mode 100644
index 000000000000..b452eb725440
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/012.php
@@ -0,0 +1,5 @@
+<?php
+
+$builder->selectAvg('age');
+$query = $builder->get();
+// Produces: SELECT AVG(age) as age FROM mytable
diff --git a/user_guide_src/source/database/query_builder/013.php b/user_guide_src/source/database/query_builder/013.php
new file mode 100644
index 000000000000..99dac54175a1
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/013.php
@@ -0,0 +1,5 @@
+<?php
+
+$builder->selectSum('age');
+$query = $builder->get();
+// Produces: SELECT SUM(age) as age FROM mytable
diff --git a/user_guide_src/source/database/query_builder/014.php b/user_guide_src/source/database/query_builder/014.php
new file mode 100644
index 000000000000..b160724ab70c
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/014.php
@@ -0,0 +1,5 @@
+<?php
+
+$builder->selectCount('age');
+$query = $builder->get();
+// Produces: SELECT COUNT(age) as age FROM mytable
diff --git a/user_guide_src/source/database/query_builder/015.php b/user_guide_src/source/database/query_builder/015.php
new file mode 100644
index 000000000000..727a7e5bd3e8
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/015.php
@@ -0,0 +1,7 @@
+<?php
+
+$builder = $db->table('users');
+$builder->select('title, content, date');
+$builder->from('mytable');
+$query = $builder->get();
+// Produces: SELECT title, content, date FROM users, mytable
diff --git a/user_guide_src/source/database/query_builder/016.php b/user_guide_src/source/database/query_builder/016.php
new file mode 100644
index 000000000000..e505681ddc57
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/016.php
@@ -0,0 +1,7 @@
+<?php
+
+$subquery = $db->table('users');
+$builder  = $db->table('jobs')->fromSubquery($subquery, 'alias');
+$query = $builder->get();
+
+// Produces: SELECT * FROM `jobs`, (SELECT * FROM `users`) AS `alias`
diff --git a/user_guide_src/source/database/query_builder/017.php b/user_guide_src/source/database/query_builder/017.php
new file mode 100644
index 000000000000..938edc98c72c
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/017.php
@@ -0,0 +1,7 @@
+<?php
+
+$subquery = $db->table('users')->select('id, name');
+$builder  = $db->newQuery()->fromSubquery($subquery, 't');
+$query = $builder->get();
+
+// Produces: SELECT * FROM (SELECT `id`, `name` FROM users) AS `t`
diff --git a/user_guide_src/source/database/query_builder/018.php b/user_guide_src/source/database/query_builder/018.php
new file mode 100644
index 000000000000..870a45e638e6
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/018.php
@@ -0,0 +1,9 @@
+<?php
+
+$builder = $db->table('blogs');
+$builder->select('*');
+$builder->join('comments', 'comments.id = blogs.id');
+$query = $builder->get();
+
+// Produces:
+// SELECT * FROM blogs JOIN comments ON comments.id = blogs.id
diff --git a/user_guide_src/source/database/query_builder/019.php b/user_guide_src/source/database/query_builder/019.php
new file mode 100644
index 000000000000..428451dfb822
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/019.php
@@ -0,0 +1,4 @@
+<?php
+
+$builder->join('comments', 'comments.id = blogs.id', 'left');
+// Produces: LEFT JOIN comments ON comments.id = blogs.id
diff --git a/user_guide_src/source/database/query_builder/020.php b/user_guide_src/source/database/query_builder/020.php
new file mode 100644
index 000000000000..cf0ce1b24ff2
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/020.php
@@ -0,0 +1,4 @@
+<?php
+
+$builder->where('name', $name);
+// Produces: WHERE name = 'Joe'
diff --git a/user_guide_src/source/database/query_builder/021.php b/user_guide_src/source/database/query_builder/021.php
new file mode 100644
index 000000000000..08d3c63f40d5
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/021.php
@@ -0,0 +1,6 @@
+<?php
+
+$builder->where('name', $name);
+$builder->where('title', $title);
+$builder->where('status', $status);
+// WHERE name = 'Joe' AND title = 'boss' AND status = 'active'
diff --git a/user_guide_src/source/database/query_builder/022.php b/user_guide_src/source/database/query_builder/022.php
new file mode 100644
index 000000000000..e6950008ff68
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/022.php
@@ -0,0 +1,5 @@
+<?php
+
+$builder->where('name !=', $name);
+$builder->where('id <', $id);
+// Produces: WHERE name != 'Joe' AND id < 45
diff --git a/user_guide_src/source/database/query_builder/023.php b/user_guide_src/source/database/query_builder/023.php
new file mode 100644
index 000000000000..36fdf370be96
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/023.php
@@ -0,0 +1,5 @@
+<?php
+
+$array = ['name' => $name, 'title' => $title, 'status' => $status];
+$builder->where($array);
+// Produces: WHERE name = 'Joe' AND title = 'boss' AND status = 'active'
diff --git a/user_guide_src/source/database/query_builder/024.php b/user_guide_src/source/database/query_builder/024.php
new file mode 100644
index 000000000000..d136a85683a9
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/024.php
@@ -0,0 +1,4 @@
+<?php
+
+$array = ['name !=' => $name, 'id <' => $id, 'date >' => $date];
+$builder->where($array);
diff --git a/user_guide_src/source/database/query_builder/025.php b/user_guide_src/source/database/query_builder/025.php
new file mode 100644
index 000000000000..10175cc40a71
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/025.php
@@ -0,0 +1,4 @@
+<?php
+
+$where = "name='Joe' AND status='boss' OR status='active'";
+$builder->where($where);
diff --git a/user_guide_src/source/database/query_builder/026.php b/user_guide_src/source/database/query_builder/026.php
new file mode 100644
index 000000000000..d4e93699151c
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/026.php
@@ -0,0 +1,5 @@
+<?php
+
+$name = $builder->db->escape('Joe');
+$where = "name={$name} AND status='boss' OR status='active'";
+$builder->where($where);
diff --git a/user_guide_src/source/database/query_builder/027.php b/user_guide_src/source/database/query_builder/027.php
new file mode 100644
index 000000000000..8d1b6495e232
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/027.php
@@ -0,0 +1,13 @@
+<?php
+
+// With closure
+
+$builder->where('advance_amount <', function (BaseBuilder $builder) {
+    return $builder->select('MAX(advance_amount)', false)->from('orders')->where('id >', 2);
+});
+
+// Produces: WHERE "advance_amount" < (SELECT MAX(advance_amount) FROM "orders" WHERE "id" > 2)
+
+// With builder directly
+$subQuery = $db->table('orders')->select('MAX(advance_amount)', false)->where('id >', 2)
+$builder->where('advance_amount <', $subQuery);
diff --git a/user_guide_src/source/database/query_builder/028.php b/user_guide_src/source/database/query_builder/028.php
new file mode 100644
index 000000000000..d925a347e428
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/028.php
@@ -0,0 +1,5 @@
+<?php
+
+$builder->where('name !=', $name);
+$builder->orWhere('id >', $id);
+// Produces: WHERE name != 'Joe' OR id > 50
diff --git a/user_guide_src/source/database/query_builder/029.php b/user_guide_src/source/database/query_builder/029.php
new file mode 100644
index 000000000000..6683a842eb99
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/029.php
@@ -0,0 +1,5 @@
+<?php
+
+$names = ['Frank', 'Todd', 'James'];
+$builder->whereIn('username', $names);
+// Produces: WHERE username IN ('Frank', 'Todd', 'James')
diff --git a/user_guide_src/source/database/query_builder/030.php b/user_guide_src/source/database/query_builder/030.php
new file mode 100644
index 000000000000..7f80507b4435
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/030.php
@@ -0,0 +1,11 @@
+<?php
+
+// With closure
+$builder->whereIn('id', function (BaseBuilder $builder) {
+    return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
+});
+// Produces: WHERE "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
+
+// With builder directly
+$subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
+$builder->whereIn('id', $subQuery);
diff --git a/user_guide_src/source/database/query_builder/031.php b/user_guide_src/source/database/query_builder/031.php
new file mode 100644
index 000000000000..b1fea4626937
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/031.php
@@ -0,0 +1,5 @@
+<?php
+
+$names = ['Frank', 'Todd', 'James'];
+$builder->orWhereIn('username', $names);
+// Produces: OR username IN ('Frank', 'Todd', 'James')
diff --git a/user_guide_src/source/database/query_builder/032.php b/user_guide_src/source/database/query_builder/032.php
new file mode 100644
index 000000000000..07aee709b79c
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/032.php
@@ -0,0 +1,12 @@
+<?php
+
+// With closure
+$builder->orWhereIn('id', function (BaseBuilder $builder) {
+    return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
+});
+
+// Produces: OR "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
+
+// With builder directly
+$subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
+$builder->orWhereIn('id', $subQuery);
diff --git a/user_guide_src/source/database/query_builder/033.php b/user_guide_src/source/database/query_builder/033.php
new file mode 100644
index 000000000000..46b196764e71
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/033.php
@@ -0,0 +1,5 @@
+<?php
+
+$names = ['Frank', 'Todd', 'James'];
+$builder->whereNotIn('username', $names);
+// Produces: WHERE username NOT IN ('Frank', 'Todd', 'James')
diff --git a/user_guide_src/source/database/query_builder/034.php b/user_guide_src/source/database/query_builder/034.php
new file mode 100644
index 000000000000..e5e366acb069
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/034.php
@@ -0,0 +1,12 @@
+<?php
+
+// With closure
+$builder->whereNotIn('id', function (BaseBuilder $builder) {
+    return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
+});
+
+// Produces: WHERE "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
+
+// With builder directly
+$subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
+$builder->whereNotIn('id', $subQuery);
diff --git a/user_guide_src/source/database/query_builder/035.php b/user_guide_src/source/database/query_builder/035.php
new file mode 100644
index 000000000000..d37209c5efd8
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/035.php
@@ -0,0 +1,5 @@
+<?php
+
+$names = ['Frank', 'Todd', 'James'];
+$builder->orWhereNotIn('username', $names);
+// Produces: OR username NOT IN ('Frank', 'Todd', 'James')
diff --git a/user_guide_src/source/database/query_builder/036.php b/user_guide_src/source/database/query_builder/036.php
new file mode 100644
index 000000000000..8b3087cac1c1
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/036.php
@@ -0,0 +1,12 @@
+<?php
+
+// With closure
+$builder->orWhereNotIn('id', function (BaseBuilder $builder) {
+    return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
+});
+
+// Produces: OR "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
+
+// With builder directly
+$subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
+$builder->orWhereNotIn('id', $subQuery);
diff --git a/user_guide_src/source/database/query_builder/037.php b/user_guide_src/source/database/query_builder/037.php
new file mode 100644
index 000000000000..d5218d2f8f59
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/037.php
@@ -0,0 +1,4 @@
+<?php
+
+$builder->like('title', 'match');
+// Produces: WHERE `title` LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/038.php b/user_guide_src/source/database/query_builder/038.php
new file mode 100644
index 000000000000..a8ae3efa1d27
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/038.php
@@ -0,0 +1,5 @@
+<?php
+
+$builder->like('title', 'match');
+$builder->like('body', 'match');
+// WHERE `title` LIKE '%match%' ESCAPE '!' AND  `body` LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/039.php b/user_guide_src/source/database/query_builder/039.php
new file mode 100644
index 000000000000..519686f9e4d9
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/039.php
@@ -0,0 +1,5 @@
+<?php
+
+$builder->like('title', 'match', 'before'); // Produces: WHERE `title` LIKE '%match' ESCAPE '!'
+$builder->like('title', 'match', 'after');  // Produces: WHERE `title` LIKE 'match%' ESCAPE '!'
+$builder->like('title', 'match', 'both');   // Produces: WHERE `title` LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/040.php b/user_guide_src/source/database/query_builder/040.php
new file mode 100644
index 000000000000..0583a2a79187
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/040.php
@@ -0,0 +1,5 @@
+<?php
+
+$array = ['title' => $match, 'page1' => $match, 'page2' => $match];
+$builder->like($array);
+// WHERE `title` LIKE '%match%' ESCAPE '!' AND  `page1` LIKE '%match%' ESCAPE '!' AND  `page2` LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/041.php b/user_guide_src/source/database/query_builder/041.php
new file mode 100644
index 000000000000..7c9935e4f356
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/041.php
@@ -0,0 +1,4 @@
+<?php
+
+$builder->like('title', 'match'); $builder->orLike('body', $match);
+// WHERE `title` LIKE '%match%' ESCAPE '!' OR  `body` LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/042.php b/user_guide_src/source/database/query_builder/042.php
new file mode 100644
index 000000000000..983068b45fef
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/042.php
@@ -0,0 +1,3 @@
+<?php
+
+$builder->notLike('title', 'match'); // WHERE `title` NOT LIKE '%match% ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/043.php b/user_guide_src/source/database/query_builder/043.php
new file mode 100644
index 000000000000..f0f442dfeb78
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/043.php
@@ -0,0 +1,5 @@
+<?php
+
+$builder->like('title', 'match');
+$builder->orNotLike('body', 'match');
+// WHERE `title` LIKE '%match% OR  `body` NOT LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/044.php b/user_guide_src/source/database/query_builder/044.php
new file mode 100644
index 000000000000..1c0a0e15991d
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/044.php
@@ -0,0 +1,4 @@
+<?php
+
+$builder->groupBy("title");
+// Produces: GROUP BY title
diff --git a/user_guide_src/source/database/query_builder/045.php b/user_guide_src/source/database/query_builder/045.php
new file mode 100644
index 000000000000..5758e29187be
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/045.php
@@ -0,0 +1,4 @@
+<?php
+
+$builder->groupBy(["title", "date"]);
+// Produces: GROUP BY title, date
diff --git a/user_guide_src/source/database/query_builder/046.php b/user_guide_src/source/database/query_builder/046.php
new file mode 100644
index 000000000000..0e6f6415d6f7
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/046.php
@@ -0,0 +1,5 @@
+<?php
+
+$builder->distinct();
+$builder->get();
+// Produces: SELECT DISTINCT * FROM mytable
diff --git a/user_guide_src/source/database/query_builder/047.php b/user_guide_src/source/database/query_builder/047.php
new file mode 100644
index 000000000000..cf439e52d0fb
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/047.php
@@ -0,0 +1,4 @@
+<?php
+
+$builder->having('user_id = 45'); // Produces: HAVING user_id = 45
+$builder->having('user_id',  45); // Produces: HAVING user_id = 45
diff --git a/user_guide_src/source/database/query_builder/048.php b/user_guide_src/source/database/query_builder/048.php
new file mode 100644
index 000000000000..e911e5e87302
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/048.php
@@ -0,0 +1,4 @@
+<?php
+
+$builder->having(['title =' => 'My Title', 'id <' => $id]);
+// Produces: HAVING title = 'My Title', id < 45
diff --git a/user_guide_src/source/database/query_builder/049.php b/user_guide_src/source/database/query_builder/049.php
new file mode 100644
index 000000000000..4a22eccffc4d
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/049.php
@@ -0,0 +1,4 @@
+<?php
+
+$builder->having('user_id',  45); // Produces: HAVING `user_id` = 45 in some databases such as MySQL
+$builder->having('user_id',  45, false); // Produces: HAVING user_id = 45
diff --git a/user_guide_src/source/database/query_builder/050.php b/user_guide_src/source/database/query_builder/050.php
new file mode 100644
index 000000000000..bc6f5a3e1412
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/050.php
@@ -0,0 +1,5 @@
+<?php
+
+$groups = [1, 2, 3];
+$builder->havingIn('group_id', $groups);
+// Produces: HAVING group_id IN (1, 2, 3)
diff --git a/user_guide_src/source/database/query_builder/051.php b/user_guide_src/source/database/query_builder/051.php
new file mode 100644
index 000000000000..325e99679082
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/051.php
@@ -0,0 +1,11 @@
+<?php
+
+// With closure
+$builder->havingIn('id', function (BaseBuilder $builder) {
+    return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
+});
+// Produces: HAVING "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
+
+// With builder directly
+$subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
+$builder->havingIn('id', $subQuery);
diff --git a/user_guide_src/source/database/query_builder/052.php b/user_guide_src/source/database/query_builder/052.php
new file mode 100644
index 000000000000..aa07cad01be9
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/052.php
@@ -0,0 +1,5 @@
+<?php
+
+$groups = [1, 2, 3];
+$builder->orHavingIn('group_id', $groups);
+// Produces: OR group_id IN (1, 2, 3)
diff --git a/user_guide_src/source/database/query_builder/053.php b/user_guide_src/source/database/query_builder/053.php
new file mode 100644
index 000000000000..3bbf43645915
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/053.php
@@ -0,0 +1,12 @@
+<?php
+
+//With closure
+$builder->orHavingIn('id', function (BaseBuilder $builder) {
+    return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
+});
+
+// Produces: OR "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
+
+// With builder directly
+$subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
+$builder->orHavingIn('id', $subQuery);
diff --git a/user_guide_src/source/database/query_builder/054.php b/user_guide_src/source/database/query_builder/054.php
new file mode 100644
index 000000000000..875a2afcbfe4
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/054.php
@@ -0,0 +1,5 @@
+<?php
+
+$groups = [1, 2, 3];
+$builder->havingNotIn('group_id', $groups);
+// Produces: HAVING group_id NOT IN (1, 2, 3)
diff --git a/user_guide_src/source/database/query_builder/055.php b/user_guide_src/source/database/query_builder/055.php
new file mode 100644
index 000000000000..2c032a5b1cec
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/055.php
@@ -0,0 +1,12 @@
+<?php
+
+//With closure
+$builder->havingNotIn('id', function (BaseBuilder $builder) {
+    return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
+});
+
+// Produces: HAVING "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
+
+// With builder directly
+$subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
+$builder->havingNotIn('id', $subQuery);
diff --git a/user_guide_src/source/database/query_builder/056.php b/user_guide_src/source/database/query_builder/056.php
new file mode 100644
index 000000000000..6d5a27ad2b95
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/056.php
@@ -0,0 +1,5 @@
+<?php
+
+$groups = [1, 2, 3];
+$builder->havingNotIn('group_id', $groups);
+// Produces: OR group_id NOT IN (1, 2, 3)
diff --git a/user_guide_src/source/database/query_builder/057.php b/user_guide_src/source/database/query_builder/057.php
new file mode 100644
index 000000000000..7960a3382f79
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/057.php
@@ -0,0 +1,12 @@
+<?php
+
+//With closure
+$builder->orHavingNotIn('id', function (BaseBuilder $builder) {
+    return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
+});
+
+// Produces: OR "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
+
+// With builder directly
+$subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
+$builder->orHavingNotIn('id', $subQuery);
diff --git a/user_guide_src/source/database/query_builder/058.php b/user_guide_src/source/database/query_builder/058.php
new file mode 100644
index 000000000000..e24f2ed0ef45
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/058.php
@@ -0,0 +1,4 @@
+<?php
+
+$builder->havingLike('title', 'match');
+// Produces: HAVING `title` LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/059.php b/user_guide_src/source/database/query_builder/059.php
new file mode 100644
index 000000000000..9ef7f263e19f
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/059.php
@@ -0,0 +1,5 @@
+<?php
+
+$builder->havingLike('title', 'match');
+$builder->havingLike('body', 'match');
+// HAVING `title` LIKE '%match%' ESCAPE '!' AND  `body` LIKE '%match% ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/060.php b/user_guide_src/source/database/query_builder/060.php
new file mode 100644
index 000000000000..3acc5d4f0fd4
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/060.php
@@ -0,0 +1,5 @@
+<?php
+
+$builder->havingLike('title', 'match', 'before'); // Produces: HAVING `title` LIKE '%match' ESCAPE '!'
+$builder->havingLike('title', 'match', 'after');  // Produces: HAVING `title` LIKE 'match%' ESCAPE '!'
+$builder->havingLike('title', 'match', 'both');   // Produces: HAVING `title` LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/061.php b/user_guide_src/source/database/query_builder/061.php
new file mode 100644
index 000000000000..ba1767f6706e
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/061.php
@@ -0,0 +1,5 @@
+<?php
+
+$array = ['title' => $match, 'page1' => $match, 'page2' => $match];
+$builder->havingLike($array);
+// HAVING `title` LIKE '%match%' ESCAPE '!' AND  `page1` LIKE '%match%' ESCAPE '!' AND  `page2` LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/062.php b/user_guide_src/source/database/query_builder/062.php
new file mode 100644
index 000000000000..0b7543273430
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/062.php
@@ -0,0 +1,4 @@
+<?php
+
+$builder->havingLike('title', 'match'); $builder->orHavingLike('body', $match);
+// HAVING `title` LIKE '%match%' ESCAPE '!' OR  `body` LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/063.php b/user_guide_src/source/database/query_builder/063.php
new file mode 100644
index 000000000000..a5c028d78e2c
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/063.php
@@ -0,0 +1,4 @@
+<?php
+
+$builder->notHavingLike('title', 'match');
+// HAVING `title` NOT LIKE '%match% ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/064.php b/user_guide_src/source/database/query_builder/064.php
new file mode 100644
index 000000000000..194a382baa13
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/064.php
@@ -0,0 +1,5 @@
+<?php
+
+$builder->havingLike('title', 'match');
+$builder->orNotHavingLike('body', 'match');
+// HAVING `title` LIKE '%match% OR  `body` NOT LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/065.php b/user_guide_src/source/database/query_builder/065.php
new file mode 100644
index 000000000000..f36b6af2b449
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/065.php
@@ -0,0 +1,4 @@
+<?php
+
+$builder->orderBy('title', 'DESC');
+// Produces: ORDER BY `title` DESC
diff --git a/user_guide_src/source/database/query_builder/066.php b/user_guide_src/source/database/query_builder/066.php
new file mode 100644
index 000000000000..01ef14c9a1c3
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/066.php
@@ -0,0 +1,4 @@
+<?php
+
+$builder->orderBy('title DESC, name ASC');
+// Produces: ORDER BY `title` DESC, `name` ASC
diff --git a/user_guide_src/source/database/query_builder/067.php b/user_guide_src/source/database/query_builder/067.php
new file mode 100644
index 000000000000..6ba7dc157b59
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/067.php
@@ -0,0 +1,5 @@
+<?php
+
+$builder->orderBy('title', 'DESC');
+$builder->orderBy('name', 'ASC');
+// Produces: ORDER BY `title` DESC, `name` ASC
diff --git a/user_guide_src/source/database/query_builder/068.php b/user_guide_src/source/database/query_builder/068.php
new file mode 100644
index 000000000000..f038c3e67184
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/068.php
@@ -0,0 +1,7 @@
+<?php
+
+$builder->orderBy('title', 'RANDOM');
+// Produces: ORDER BY RAND()
+
+$builder->orderBy(42, 'RANDOM');
+// Produces: ORDER BY RAND(42)
diff --git a/user_guide_src/source/database/query_builder/069.php b/user_guide_src/source/database/query_builder/069.php
new file mode 100644
index 000000000000..dadbdc5dea19
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/069.php
@@ -0,0 +1,4 @@
+<?php
+
+$builder->limit(10);
+// Produces: LIMIT 10
diff --git a/user_guide_src/source/database/query_builder/070.php b/user_guide_src/source/database/query_builder/070.php
new file mode 100644
index 000000000000..0bfcab7b1fcf
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/070.php
@@ -0,0 +1,4 @@
+<?php
+
+$builder->limit(10, 20);
+// Produces: LIMIT 20, 10 (in MySQL. Other databases have slightly different syntax)
diff --git a/user_guide_src/source/database/query_builder/071.php b/user_guide_src/source/database/query_builder/071.php
new file mode 100644
index 000000000000..4b1c33356b7e
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/071.php
@@ -0,0 +1,6 @@
+<?php
+
+echo $builder->countAllResults(); // Produces an integer, like 25
+$builder->like('title', 'match');
+$builder->from('my_table');
+echo $builder->countAllResults(); // Produces an integer, like 17
diff --git a/user_guide_src/source/database/query_builder/072.php b/user_guide_src/source/database/query_builder/072.php
new file mode 100644
index 000000000000..bb3a9c4d4b63
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/072.php
@@ -0,0 +1,3 @@
+<?php
+
+echo $builder->countAllResults(false); // Produces an integer, like 17
diff --git a/user_guide_src/source/database/query_builder/073.php b/user_guide_src/source/database/query_builder/073.php
new file mode 100644
index 000000000000..11bc5421cb42
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/073.php
@@ -0,0 +1,3 @@
+<?php
+
+echo $builder->countAll(); // Produces an integer, like 25
diff --git a/user_guide_src/source/database/query_builder/074.php b/user_guide_src/source/database/query_builder/074.php
new file mode 100644
index 000000000000..20025bc32cee
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/074.php
@@ -0,0 +1,15 @@
+<?php
+
+$builder->select('*')->from('my_table')
+    ->groupStart()
+        ->where('a', 'a')
+        ->orGroupStart()
+            ->where('b', 'b')
+            ->where('c', 'c')
+        ->groupEnd()
+    ->groupEnd()
+    ->where('d', 'd')
+->get();
+
+// Generates:
+// SELECT * FROM (`my_table`) WHERE ( `a` = 'a' OR ( `b` = 'b' AND `c` = 'c' ) ) AND `d` = 'd'
diff --git a/user_guide_src/source/database/query_builder/075.php b/user_guide_src/source/database/query_builder/075.php
new file mode 100644
index 000000000000..2e87e8345dd0
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/075.php
@@ -0,0 +1,10 @@
+<?php
+
+$data = [
+    'title' => 'My title',
+    'name'  => 'My Name',
+    'date'  => 'My date',
+];
+
+$builder->insert($data);
+// Produces: INSERT INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')
diff --git a/user_guide_src/source/database/query_builder/076.php b/user_guide_src/source/database/query_builder/076.php
new file mode 100644
index 000000000000..cdacf0a53df5
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/076.php
@@ -0,0 +1,12 @@
+<?php
+
+class Myclass
+{
+    public $title   = 'My Title';
+    public $content = 'My Content';
+    public $date    = 'My Date';
+}
+
+$object = new Myclass;
+$builder->insert($object);
+// Produces: INSERT INTO mytable (title, content, date) VALUES ('My Title', 'My Content', 'My Date')
diff --git a/user_guide_src/source/database/query_builder/077.php b/user_guide_src/source/database/query_builder/077.php
new file mode 100644
index 000000000000..bb07bc8bdd9c
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/077.php
@@ -0,0 +1,10 @@
+<?php
+
+$data = [
+    'title' => 'My title',
+    'name'  => 'My Name',
+    'date'  => 'My date',
+];
+
+$builder->ignore(true)->insert($data);
+// Produces: INSERT OR IGNORE INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')
diff --git a/user_guide_src/source/database/query_builder/078.php b/user_guide_src/source/database/query_builder/078.php
new file mode 100644
index 000000000000..e4ddf03e6732
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/078.php
@@ -0,0 +1,12 @@
+<?php
+
+$data = [
+    'title' => 'My title',
+    'name'  => 'My Name',
+    'date'  => 'My date',
+];
+
+$sql = $builder->set($data)->getCompiledInsert();
+echo $sql;
+
+// Produces string: INSERT INTO mytable (`title`, `name`, `date`) VALUES ('My title', 'My name', 'My date')
diff --git a/user_guide_src/source/database/query_builder/079.php b/user_guide_src/source/database/query_builder/079.php
new file mode 100644
index 000000000000..4e095f9e0c72
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/079.php
@@ -0,0 +1,9 @@
+<?php
+
+echo $builder->set('title', 'My Title')->getCompiledInsert(false);
+
+// Produces string: INSERT INTO mytable (`title`) VALUES ('My Title')
+
+echo $builder->set('content', 'My Content')->getCompiledInsert();
+
+// Produces string: INSERT INTO mytable (`title`, `content`) VALUES ('My Title', 'My Content')
diff --git a/user_guide_src/source/database/query_builder/080.php b/user_guide_src/source/database/query_builder/080.php
new file mode 100644
index 000000000000..0f263005c18e
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/080.php
@@ -0,0 +1,17 @@
+<?php
+
+$data = [
+    [
+        'title' => 'My title',
+        'name'  => 'My Name',
+        'date'  => 'My date',
+    ],
+    [
+        'title' => 'Another title',
+        'name'  => 'Another Name',
+        'date'  => 'Another date',
+    ],
+];
+
+$builder->insertBatch($data);
+// Produces: INSERT INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date'),  ('Another title', 'Another name', 'Another date')
diff --git a/user_guide_src/source/database/query_builder/081.php b/user_guide_src/source/database/query_builder/081.php
new file mode 100644
index 000000000000..bb263a3b4eba
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/081.php
@@ -0,0 +1,11 @@
+<?php
+
+$data = [
+    'title' => 'My title',
+    'name'  => 'My Name',
+    'date'  => 'My date',
+];
+
+$builder->replace($data);
+
+// Executes: REPLACE INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')
diff --git a/user_guide_src/source/database/query_builder/082.php b/user_guide_src/source/database/query_builder/082.php
new file mode 100644
index 000000000000..59d14e130215
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/082.php
@@ -0,0 +1,5 @@
+<?php
+
+$builder->set('name', $name);
+$builder->insert();
+// Produces: INSERT INTO mytable (`name`) VALUES ('{$name}')
diff --git a/user_guide_src/source/database/query_builder/083.php b/user_guide_src/source/database/query_builder/083.php
new file mode 100644
index 000000000000..8e2fbe2fabe5
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/083.php
@@ -0,0 +1,6 @@
+<?php
+
+$builder->set('name', $name);
+$builder->set('title', $title);
+$builder->set('status', $status);
+$builder->insert();
diff --git a/user_guide_src/source/database/query_builder/084.php b/user_guide_src/source/database/query_builder/084.php
new file mode 100644
index 000000000000..2e76bea9e5d5
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/084.php
@@ -0,0 +1,11 @@
+<?php
+
+$builder->set('field', 'field+1', false);
+$builder->where('id', 2);
+$builder->update();
+// gives UPDATE mytable SET field = field+1 WHERE `id` = 2
+
+$builder->set('field', 'field+1');
+$builder->where('id', 2);
+$builder->update();
+// gives UPDATE `mytable` SET `field` = 'field+1' WHERE `id` = 2
diff --git a/user_guide_src/source/database/query_builder/085.php b/user_guide_src/source/database/query_builder/085.php
new file mode 100644
index 000000000000..319e29a88142
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/085.php
@@ -0,0 +1,10 @@
+<?php
+
+$array = [
+    'name'   => $name,
+    'title'  => $title,
+    'status' => $status,
+];
+
+$builder->set($array);
+$builder->insert();
diff --git a/user_guide_src/source/database/query_builder/086.php b/user_guide_src/source/database/query_builder/086.php
new file mode 100644
index 000000000000..c7dcd01aa071
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/086.php
@@ -0,0 +1,12 @@
+<?php
+
+class Myclass
+{
+    public $title   = 'My Title';
+    public $content = 'My Content';
+    public $date    = 'My Date';
+}
+
+$object = new Myclass;
+$builder->set($object);
+$builder->insert();
diff --git a/user_guide_src/source/database/query_builder/087.php b/user_guide_src/source/database/query_builder/087.php
new file mode 100644
index 000000000000..1b99a6196706
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/087.php
@@ -0,0 +1,15 @@
+<?php
+
+$data = [
+    'title' => $title,
+    'name'  => $name,
+    'date'  => $date,
+];
+
+$builder->where('id', $id);
+$builder->update($data);
+// Produces:
+//
+// UPDATE mytable
+// SET title = '{$title}', name = '{$name}', date = '{$date}'
+// WHERE id = $id
diff --git a/user_guide_src/source/database/query_builder/088.php b/user_guide_src/source/database/query_builder/088.php
new file mode 100644
index 000000000000..c789d85e02bf
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/088.php
@@ -0,0 +1,17 @@
+<?php
+
+class Myclass
+{
+    public $title   = 'My Title';
+    public $content = 'My Content';
+    public $date    = 'My Date';
+}
+
+$object = new Myclass;
+$builder->where('id', $id);
+$builder->update($object);
+// Produces:
+//
+// UPDATE `mytable`
+// SET `title` = '{$title}', `name` = '{$name}', `date` = '{$date}'
+// WHERE id = `$id`
diff --git a/user_guide_src/source/database/query_builder/089.php b/user_guide_src/source/database/query_builder/089.php
new file mode 100644
index 000000000000..2a4a01cc6346
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/089.php
@@ -0,0 +1,3 @@
+<?php
+
+$builder->update($data, "id = 4");
diff --git a/user_guide_src/source/database/query_builder/090.php b/user_guide_src/source/database/query_builder/090.php
new file mode 100644
index 000000000000..66a1ee575cee
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/090.php
@@ -0,0 +1,3 @@
+<?php
+
+$builder->update($data, ['id' => $id]);
diff --git a/user_guide_src/source/database/query_builder/091.php b/user_guide_src/source/database/query_builder/091.php
new file mode 100644
index 000000000000..545641a98f74
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/091.php
@@ -0,0 +1,27 @@
+<?php
+
+$data = [
+   [
+      'title' => 'My title' ,
+      'name'  => 'My Name 2' ,
+      'date'  => 'My date 2',
+   ],
+   [
+      'title' => 'Another title' ,
+      'name'  => 'Another Name 2' ,
+      'date'  => 'Another date 2',
+   ],
+];
+
+$builder->updateBatch($data, 'title');
+
+// Produces:
+// UPDATE `mytable` SET `name` = CASE
+// WHEN `title` = 'My title' THEN 'My Name 2'
+// WHEN `title` = 'Another title' THEN 'Another Name 2'
+// ELSE `name` END,
+// `date` = CASE
+// WHEN `title` = 'My title' THEN 'My date 2'
+// WHEN `title` = 'Another title' THEN 'Another date 2'
+// ELSE `date` END
+// WHERE `title` IN ('My title','Another title')
diff --git a/user_guide_src/source/database/query_builder/092.php b/user_guide_src/source/database/query_builder/092.php
new file mode 100644
index 000000000000..605d533162bd
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/092.php
@@ -0,0 +1,4 @@
+<?php
+
+$builder->delete(['id' => $id]);
+// Produces: // DELETE FROM mytable  // WHERE id = $id
diff --git a/user_guide_src/source/database/query_builder/093.php b/user_guide_src/source/database/query_builder/093.php
new file mode 100644
index 000000000000..6628a09b5056
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/093.php
@@ -0,0 +1,8 @@
+<?php
+
+$builder->where('id', $id);
+$builder->delete();
+
+// Produces:
+// DELETE FROM mytable
+// WHERE id = $id
diff --git a/user_guide_src/source/database/query_builder/094.php b/user_guide_src/source/database/query_builder/094.php
new file mode 100644
index 000000000000..0251fe47031d
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/094.php
@@ -0,0 +1,4 @@
+<?php
+
+$builder->emptyTable('mytable');
+// Produces: DELETE FROM mytable
diff --git a/user_guide_src/source/database/query_builder/095.php b/user_guide_src/source/database/query_builder/095.php
new file mode 100644
index 000000000000..0cdf6ef52bfa
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/095.php
@@ -0,0 +1,6 @@
+<?php
+
+$builder->truncate();
+
+// Produce:
+// TRUNCATE mytable
diff --git a/user_guide_src/source/database/query_builder/096.php b/user_guide_src/source/database/query_builder/096.php
new file mode 100644
index 000000000000..78b57dd13df5
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/096.php
@@ -0,0 +1,6 @@
+<?php
+
+$query = $builder->select('title')
+                 ->where('id', $id)
+                 ->limit(10, 20)
+                 ->get();
diff --git a/user_guide_src/source/database/query_builder/097.php b/user_guide_src/source/database/query_builder/097.php
new file mode 100644
index 000000000000..f484292a9d27
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/097.php
@@ -0,0 +1,16 @@
+<?php
+
+// Note that the second parameter of the ``get_compiled_select`` method is false
+$sql = $builder->select(['field1','field2'])
+               ->where('field3',5)
+               ->getCompiledSelect(false);
+
+// ...
+// Do something crazy with the SQL code... like add it to a cron script for
+// later execution or something...
+// ...
+
+$data = $builder->get()->getResultArray();
+
+// Would execute and return an array of results of the following query:
+// SELECT field1, field1 from mytable where field3 = 5;
diff --git a/user_guide_src/source/database/results.rst b/user_guide_src/source/database/results.rst
index 809de018d3c3..f50272867b20 100644
--- a/user_guide_src/source/database/results.rst
+++ b/user_guide_src/source/database/results.rst
@@ -16,42 +16,26 @@ Result Arrays
 
 This method returns the query result as an array of **objects**, or
 **an empty array** on failure. Typically you'll use this in a foreach
-loop, like this::
+loop, like this:
 
-    $query = $db->query("YOUR QUERY");
-
-    foreach ($query->getResult() as $row) {
-        echo $row->title;
-        echo $row->name;
-        echo $row->body;
-    }
+.. literalinclude:: results/001.php
+   :lines: 2-
 
 The above method is an alias of ``getResultObject()``.
 
 You can pass in the string 'array' if you wish to get your results
-as an array of arrays::
-
-    $query = $db->query("YOUR QUERY");
+as an array of arrays:
 
-    foreach ($query->getResult('array') as $row) {
-        echo $row['title'];
-        echo $row['name'];
-        echo $row['body'];
-    }
+.. literalinclude:: results/002.php
+   :lines: 2-
 
 The above usage is an alias of ``getResultArray()``.
 
 You can also pass a string to ``getResult()`` which represents a class to
 instantiate for each result object
 
-::
-
-    $query = $db->query("SELECT * FROM users;");
-
-    foreach ($query->getResult('User') as $user) {
-        echo $user->name; // access attributes
-        echo $user->reverseName(); // or methods defined on the 'User' class
-    }
+.. literalinclude:: results/003.php
+   :lines: 2-
 
 The above method is an alias of ``getCustomResultObject()``.
 
@@ -59,15 +43,10 @@ The above method is an alias of ``getCustomResultObject()``.
 
 This method returns the query result as a pure array, or an empty
 array when no result is produced. Typically you'll use this in a foreach
-loop, like this::
-
-    $query = $db->query("YOUR QUERY");
+loop, like this:
 
-    foreach ($query->getResultArray() as $row) {
-        echo $row['title'];
-        echo $row['name'];
-        echo $row['body'];
-    }
+.. literalinclude:: results/004.php
+   :lines: 2-
 
 ***********
 Result Rows
@@ -77,51 +56,36 @@ Result Rows
 
 This method returns a single result row. If your query has more than
 one row, it returns only the first row. The result is returned as an
-**object**. Here's a usage example::
+**object**. Here's a usage example:
 
-    $query = $db->query("YOUR QUERY");
-
-    $row = $query->getRow();
-
-    if (isset($row)) {
-        echo $row->title;
-        echo $row->name;
-        echo $row->body;
-    }
+.. literalinclude:: results/005.php
+   :lines: 2-
 
 If you want a specific row returned you can submit the row number as a
-digit in the first parameter::
+digit in the first parameter:
 
-    $row = $query->getRow(5);
+.. literalinclude:: results/006.php
+   :lines: 2-
 
 You can also add a second String parameter, which is the name of a class
-to instantiate the row with::
+to instantiate the row with:
 
-    $query = $db->query("SELECT * FROM users LIMIT 1;");
-    $row = $query->getRow(0, 'User');
-
-    echo $row->name; // access attributes
-    echo $row->reverse_name(); // or methods defined on the 'User' class
+.. literalinclude:: results/007.php
+   :lines: 2-
 
 **getRowArray()**
 
 Identical to the above ``row()`` method, except it returns an array.
-Example::
-
-    $query = $db->query("YOUR QUERY");
+Example:
 
-    $row = $query->getRowArray();
-
-    if (isset($row)) {
-        echo $row['title'];
-        echo $row['name'];
-        echo $row['body'];
-    }
+.. literalinclude:: results/008.php
+   :lines: 2-
 
 If you want a specific row returned you can submit the row number as a
-digit in the first parameter::
+digit in the first parameter:
 
-    $row = $query->getRowArray(5);
+.. literalinclude:: results/009.php
+   :lines: 2-
 
 In addition, you can walk forward/backwards/first/last through your
 results using these variations:
@@ -149,52 +113,30 @@ This method returns a single result row without prefetching the whole
 result in memory as ``row()`` does. If your query has more than one row,
 it returns the current row and moves the internal data pointer ahead.
 
-::
-
-    $query = $db->query("YOUR QUERY");
+.. literalinclude:: results/010.php
+   :lines: 2-
 
-    while ($row = $query->getUnbufferedRow()) {
-        echo $row->title;
-        echo $row->name;
-        echo $row->body;
-    }
-
-For use with MySQLi you may set MySQLi's result mode to 
-``MYSQLI_USE_RESULT`` for maximum memory savings. Use of this is not 
-generally recommended but it can be beneficial in some circumstances 
-such as writing large queries to csv. If you change the result mode 
+For use with MySQLi you may set MySQLi's result mode to
+``MYSQLI_USE_RESULT`` for maximum memory savings. Use of this is not
+generally recommended but it can be beneficial in some circumstances
+such as writing large queries to csv. If you change the result mode
 be aware of the tradeoffs associated with it.
 
-::
-
-    $db->resultMode = MYSQLI_USE_RESULT; // for unbuffered results
-
-    $query = $db->query("YOUR QUERY");
-
-    $file = new \CodeIgniter\Files\File(WRITEPATH.'data.csv');
-
-    $csv = $file->openFile('w');
-
-    while ($row = $query->getUnbufferedRow('array'))
-    {
-        $csv->fputcsv($row);
-    }
+.. literalinclude:: results/011.php
+   :lines: 2-
 
-    $db->resultMode = MYSQLI_STORE_RESULT; // return to default mode
-
-.. note:: When using ``MYSQLI_USE_RESULT`` all subsequent calls on the same  
-    connection will result in error until all records have been fetched or 
-    a ``freeResult()`` call has been made. The ``getNumRows()`` method will only 
-    return the number of rows based on the current position of the data pointer. 
-    MyISAM tables will remain locked until all the records have been fetched 
+.. note:: When using ``MYSQLI_USE_RESULT`` all subsequent calls on the same
+    connection will result in error until all records have been fetched or
+    a ``freeResult()`` call has been made. The ``getNumRows()`` method will only
+    return the number of rows based on the current position of the data pointer.
+    MyISAM tables will remain locked until all the records have been fetched
     or a ``freeResult()`` call has been made.
 
 You can optionally pass 'object' (default) or 'array' in order to specify
-the returned value's type::
+the returned value's type:
 
-    $query->getUnbufferedRow();         // object
-    $query->getUnbufferedRow('object'); // object
-    $query->getUnbufferedRow('array');  // associative array
+.. literalinclude:: results/012.php
+   :lines: 2-
 
 *********************
 Custom Result Objects
@@ -207,35 +149,10 @@ will attempt to load it. The object will have all values returned from the
 database set as properties. If these have been declared and are non-public
 then you should provide a ``__set()`` method to allow them to be set.
 
-Example::
-
-    class User
-    {
-        public $id;
-        public $email;
-        public $username;
-
-        protected $last_login;
-
-        public function lastLogin($format)
-        {
-            return $this->lastLogin->format($format);
-        }
-
-        public function __set($name, $value)
-        {
-            if ($name === 'lastLogin') {
-                $this->lastLogin = DateTime::createFromFormat('U', $value);
-            }
-        }
+Example:
 
-        public function __get($name)
-        {
-            if (isset($this->$name)) {
-                return $this->$name;
-            }
-        }
-    }
+.. literalinclude:: results/013.php
+   :lines: 2-
 
 In addition to the two methods listed below, the following methods also can
 take a class name to return the results as: ``getFirstRow()``, ``getLastRow()``,
@@ -246,39 +163,27 @@ take a class name to return the results as: ``getFirstRow()``, ``getLastRow()``,
 Returns the entire result set as an array of instances of the class requested.
 The only parameter is the name of the class to instantiate.
 
-Example::
+Example:
 
-    $query = $db->query("YOUR QUERY");
-
-    $rows = $query->getCustomResultObject('User');
-
-    foreach ($rows as $row) {
-        echo $row->id;
-        echo $row->email;
-        echo $row->last_login('Y-m-d');
-    }
+.. literalinclude:: results/014.php
+   :lines: 2-
 
 **getCustomRowObject()**
 
 Returns a single row from your query results. The first parameter is the row
 number of the results. The second parameter is the class name to instantiate.
 
-Example::
-
-    $query = $db->query("YOUR QUERY");
-
-    $row = $query->getCustomRowObject(0, 'User');
+Example:
 
-    if (isset($row)) {
-        echo $row->email;               // access attributes
-        echo $row->last_login('Y-m-d'); // access class methods
-    }
+.. literalinclude:: results/015.php
+   :lines: 2-
 
 You can also use the ``getRow()`` method in exactly the same way.
 
-Example::
+Example:
 
-    $row = $query->getCustomRowObject(0, 'User');
+.. literalinclude:: results/016.php
+   :lines: 2-
 
 *********************
 Result Helper Methods
@@ -287,29 +192,26 @@ Result Helper Methods
 **getFieldCount()**
 
 The number of FIELDS (columns) returned by the query. Make sure to call
-the method using your query result object::
+the method using your query result object:
 
-    $query = $db->query('SELECT * FROM my_table');
-
-    echo $query->getFieldCount();
+.. literalinclude:: results/017.php
+   :lines: 2-
 
 **getFieldNames()**
 
 Returns an array with the names of the FIELDS (columns) returned by the query.
-Make sure to call the method using your query result object::
-
-    $query = $db->query('SELECT * FROM my_table');
+Make sure to call the method using your query result object:
 
-    echo $query->getFieldNames();
+.. literalinclude:: results/018.php
+   :lines: 2-
 
 **getNumRows()**
 
 The number of records returned by the query. Make sure to call
-the method using your query result object::
+the method using your query result object:
 
-    $query = $db->query('SELECT * FROM my_table');
-
-    echo $query->getNumRows();
+.. literalinclude:: results/019.php
+   :lines: 2-
 
 .. note:: Because SQLite3 lacks an efficient method returning a record count,
     CodeIgniter will fetch and buffer the query result records internally and
@@ -323,21 +225,10 @@ script execution. However, if you are running a lot of queries in a
 particular script you might want to free the result after each query
 result has been generated in order to cut down on memory consumption.
 
-Example::
-
-    $query = $thisdb->query('SELECT title FROM my_table');
+Example:
 
-    foreach ($query->getResult() as $row) {
-        echo $row->title;
-    }
-
-    $query->freeResult(); // The $query result object will no longer be available
-
-    $query2 = $db->query('SELECT name FROM some_table');
-
-    $row = $query2->getRow();
-    echo $row->name;
-    $query2->freeResult(); // The $query2 result object will no longer be available
+.. literalinclude:: results/020.php
+   :lines: 2-
 
 **dataSeek()**
 
@@ -347,11 +238,8 @@ fetched. It is only useful in combination with ``getUnbufferedRow()``.
 It accepts a positive integer value, which defaults to 0 and returns
 true on success or false on failure.
 
-::
-
-    $query = $db->query('SELECT `field_name` FROM `table_name`');
-    $query->dataSeek(5); // Skip the first 5 rows
-    $row = $query->getUnbufferedRow();
+.. literalinclude:: results/021.php
+   :lines: 2-
 
 .. note:: Not all database drivers support this feature and will return false.
     Most notably - you won't be able to use it with PDO.
diff --git a/user_guide_src/source/database/results/001.php b/user_guide_src/source/database/results/001.php
new file mode 100644
index 000000000000..0cbecfb88ba9
--- /dev/null
+++ b/user_guide_src/source/database/results/001.php
@@ -0,0 +1,9 @@
+<?php
+
+$query = $db->query("YOUR QUERY");
+
+foreach ($query->getResult() as $row) {
+    echo $row->title;
+    echo $row->name;
+    echo $row->body;
+}
diff --git a/user_guide_src/source/database/results/002.php b/user_guide_src/source/database/results/002.php
new file mode 100644
index 000000000000..8b702c8e1150
--- /dev/null
+++ b/user_guide_src/source/database/results/002.php
@@ -0,0 +1,9 @@
+<?php
+
+$query = $db->query("YOUR QUERY");
+
+foreach ($query->getResult('array') as $row) {
+    echo $row['title'];
+    echo $row['name'];
+    echo $row['body'];
+}
diff --git a/user_guide_src/source/database/results/003.php b/user_guide_src/source/database/results/003.php
new file mode 100644
index 000000000000..1ad7d7dcb9fe
--- /dev/null
+++ b/user_guide_src/source/database/results/003.php
@@ -0,0 +1,8 @@
+<?php
+
+$query = $db->query("SELECT * FROM users;");
+
+foreach ($query->getResult('User') as $user) {
+    echo $user->name; // access attributes
+    echo $user->reverseName(); // or methods defined on the 'User' class
+}
diff --git a/user_guide_src/source/database/results/004.php b/user_guide_src/source/database/results/004.php
new file mode 100644
index 000000000000..e8e9acecdcdc
--- /dev/null
+++ b/user_guide_src/source/database/results/004.php
@@ -0,0 +1,9 @@
+<?php
+
+$query = $db->query("YOUR QUERY");
+
+foreach ($query->getResultArray() as $row) {
+    echo $row['title'];
+    echo $row['name'];
+    echo $row['body'];
+}
diff --git a/user_guide_src/source/database/results/005.php b/user_guide_src/source/database/results/005.php
new file mode 100644
index 000000000000..af79170b8b89
--- /dev/null
+++ b/user_guide_src/source/database/results/005.php
@@ -0,0 +1,11 @@
+<?php
+
+$query = $db->query("YOUR QUERY");
+
+$row = $query->getRow();
+
+if (isset($row)) {
+    echo $row->title;
+    echo $row->name;
+    echo $row->body;
+}
diff --git a/user_guide_src/source/database/results/006.php b/user_guide_src/source/database/results/006.php
new file mode 100644
index 000000000000..d0aab2c96df1
--- /dev/null
+++ b/user_guide_src/source/database/results/006.php
@@ -0,0 +1,3 @@
+<?php
+
+$row = $query->getRow(5);
diff --git a/user_guide_src/source/database/results/007.php b/user_guide_src/source/database/results/007.php
new file mode 100644
index 000000000000..4b46945c285e
--- /dev/null
+++ b/user_guide_src/source/database/results/007.php
@@ -0,0 +1,7 @@
+<?php
+
+$query = $db->query("SELECT * FROM users LIMIT 1;");
+$row = $query->getRow(0, 'User');
+
+echo $row->name; // access attributes
+echo $row->reverse_name(); // or methods defined on the 'User' class
diff --git a/user_guide_src/source/database/results/008.php b/user_guide_src/source/database/results/008.php
new file mode 100644
index 000000000000..8b576d1d3117
--- /dev/null
+++ b/user_guide_src/source/database/results/008.php
@@ -0,0 +1,11 @@
+<?php
+
+$query = $db->query("YOUR QUERY");
+
+$row = $query->getRowArray();
+
+if (isset($row)) {
+    echo $row['title'];
+    echo $row['name'];
+    echo $row['body'];
+}
diff --git a/user_guide_src/source/database/results/009.php b/user_guide_src/source/database/results/009.php
new file mode 100644
index 000000000000..a386fe7e3f91
--- /dev/null
+++ b/user_guide_src/source/database/results/009.php
@@ -0,0 +1,3 @@
+<?php
+
+$row = $query->getRowArray(5);
diff --git a/user_guide_src/source/database/results/010.php b/user_guide_src/source/database/results/010.php
new file mode 100644
index 000000000000..ad0b4c326d0f
--- /dev/null
+++ b/user_guide_src/source/database/results/010.php
@@ -0,0 +1,9 @@
+<?php
+
+$query = $db->query("YOUR QUERY");
+
+while ($row = $query->getUnbufferedRow()) {
+    echo $row->title;
+    echo $row->name;
+    echo $row->body;
+}
diff --git a/user_guide_src/source/database/results/011.php b/user_guide_src/source/database/results/011.php
new file mode 100644
index 000000000000..f57aa21a2504
--- /dev/null
+++ b/user_guide_src/source/database/results/011.php
@@ -0,0 +1,16 @@
+<?php
+
+$db->resultMode = MYSQLI_USE_RESULT; // for unbuffered results
+
+$query = $db->query("YOUR QUERY");
+
+$file = new \CodeIgniter\Files\File(WRITEPATH.'data.csv');
+
+$csv = $file->openFile('w');
+
+while ($row = $query->getUnbufferedRow('array'))
+{
+    $csv->fputcsv($row);
+}
+
+$db->resultMode = MYSQLI_STORE_RESULT; // return to default mode
diff --git a/user_guide_src/source/database/results/012.php b/user_guide_src/source/database/results/012.php
new file mode 100644
index 000000000000..ee288e0d9347
--- /dev/null
+++ b/user_guide_src/source/database/results/012.php
@@ -0,0 +1,5 @@
+<?php
+
+$query->getUnbufferedRow();         // object
+$query->getUnbufferedRow('object'); // object
+$query->getUnbufferedRow('array');  // associative array
diff --git a/user_guide_src/source/database/results/013.php b/user_guide_src/source/database/results/013.php
new file mode 100644
index 000000000000..6c47fe5bf256
--- /dev/null
+++ b/user_guide_src/source/database/results/013.php
@@ -0,0 +1,29 @@
+<?php
+
+class User
+{
+    public $id;
+    public $email;
+    public $username;
+
+    protected $last_login;
+
+    public function lastLogin($format)
+    {
+        return $this->lastLogin->format($format);
+    }
+
+    public function __set($name, $value)
+    {
+        if ($name === 'lastLogin') {
+            $this->lastLogin = DateTime::createFromFormat('U', $value);
+        }
+    }
+
+    public function __get($name)
+    {
+        if (isset($this->$name)) {
+            return $this->$name;
+        }
+    }
+}
diff --git a/user_guide_src/source/database/results/014.php b/user_guide_src/source/database/results/014.php
new file mode 100644
index 000000000000..df6073c5ed79
--- /dev/null
+++ b/user_guide_src/source/database/results/014.php
@@ -0,0 +1,11 @@
+<?php
+
+$query = $db->query("YOUR QUERY");
+
+$rows = $query->getCustomResultObject('User');
+
+foreach ($rows as $row) {
+    echo $row->id;
+    echo $row->email;
+    echo $row->last_login('Y-m-d');
+}
diff --git a/user_guide_src/source/database/results/015.php b/user_guide_src/source/database/results/015.php
new file mode 100644
index 000000000000..a57dddfa42d0
--- /dev/null
+++ b/user_guide_src/source/database/results/015.php
@@ -0,0 +1,10 @@
+<?php
+
+$query = $db->query("YOUR QUERY");
+
+$row = $query->getCustomRowObject(0, 'User');
+
+if (isset($row)) {
+    echo $row->email;               // access attributes
+    echo $row->last_login('Y-m-d'); // access class methods
+}
diff --git a/user_guide_src/source/database/results/016.php b/user_guide_src/source/database/results/016.php
new file mode 100644
index 000000000000..ed5ac68c4b1a
--- /dev/null
+++ b/user_guide_src/source/database/results/016.php
@@ -0,0 +1,3 @@
+<?php
+
+$row = $query->getCustomRowObject(0, 'User');
diff --git a/user_guide_src/source/database/results/017.php b/user_guide_src/source/database/results/017.php
new file mode 100644
index 000000000000..d3b1cd9e4535
--- /dev/null
+++ b/user_guide_src/source/database/results/017.php
@@ -0,0 +1,5 @@
+<?php
+
+$query = $db->query('SELECT * FROM my_table');
+
+echo $query->getFieldCount();
diff --git a/user_guide_src/source/database/results/018.php b/user_guide_src/source/database/results/018.php
new file mode 100644
index 000000000000..40166273af69
--- /dev/null
+++ b/user_guide_src/source/database/results/018.php
@@ -0,0 +1,5 @@
+<?php
+
+$query = $db->query('SELECT * FROM my_table');
+
+echo $query->getFieldNames();
diff --git a/user_guide_src/source/database/results/019.php b/user_guide_src/source/database/results/019.php
new file mode 100644
index 000000000000..2af07ead332e
--- /dev/null
+++ b/user_guide_src/source/database/results/019.php
@@ -0,0 +1,5 @@
+<?php
+
+$query = $db->query('SELECT * FROM my_table');
+
+echo $query->getNumRows();
diff --git a/user_guide_src/source/database/results/020.php b/user_guide_src/source/database/results/020.php
new file mode 100644
index 000000000000..04df0c0252d8
--- /dev/null
+++ b/user_guide_src/source/database/results/020.php
@@ -0,0 +1,15 @@
+<?php
+
+$query = $thisdb->query('SELECT title FROM my_table');
+
+foreach ($query->getResult() as $row) {
+    echo $row->title;
+}
+
+$query->freeResult(); // The $query result object will no longer be available
+
+$query2 = $db->query('SELECT name FROM some_table');
+
+$row = $query2->getRow();
+echo $row->name;
+$query2->freeResult(); // The $query2 result object will no longer be available
diff --git a/user_guide_src/source/database/results/021.php b/user_guide_src/source/database/results/021.php
new file mode 100644
index 000000000000..ddd5532ebe69
--- /dev/null
+++ b/user_guide_src/source/database/results/021.php
@@ -0,0 +1,5 @@
+<?php
+
+$query = $db->query('SELECT `field_name` FROM `table_name`');
+$query->dataSeek(5); // Skip the first 5 rows
+$row = $query->getUnbufferedRow();
diff --git a/user_guide_src/source/database/transactions.rst b/user_guide_src/source/database/transactions.rst
index a3c8ba9f9866..e1522e57a178 100644
--- a/user_guide_src/source/database/transactions.rst
+++ b/user_guide_src/source/database/transactions.rst
@@ -37,13 +37,10 @@ Running Transactions
 
 To run your queries using transactions you will use the
 ``$this->db->transStart()`` and ``$this->db->transComplete()`` functions as
-follows::
+follows:
 
-    $this->db->transStart();
-    $this->db->query('AN SQL QUERY...');
-    $this->db->query('ANOTHER QUERY...');
-    $this->db->query('AND YET ANOTHER QUERY...');
-    $this->db->transComplete();
+.. literalinclude:: transactions/001.php
+   :lines: 2-
 
 You can run as many queries as you want between the start/complete
 functions and they will all be committed or rolled back based on the success
@@ -58,36 +55,29 @@ one group fails all groups will be rolled back. If strict mode is
 disabled, each group is treated independently, meaning a failure of one
 group will not affect any others.
 
-Strict Mode can be disabled as follows::
+Strict Mode can be disabled as follows:
 
-    $this->db->transStrict(false);
+.. literalinclude:: transactions/002.php
+   :lines: 2-
 
 Managing Errors
 ===============
 
 If you have error reporting enabled in your Config/Database.php file
 you'll see a standard error message if the commit was unsuccessful. If
-debugging is turned off, you can manage your own errors like this::
+debugging is turned off, you can manage your own errors like this:
 
-    $this->db->transStart();
-    $this->db->query('AN SQL QUERY...');
-    $this->db->query('ANOTHER QUERY...');
-    $this->db->transComplete();
-
-    if ($this->db->transStatus() === false) {
-        // generate an error... or use the log_message() function to log your error
-    }
+.. literalinclude:: transactions/003.php
+   :lines: 2-
 
 Disabling Transactions
 ======================
 
 Transactions are enabled by default. If you would like to disable transactions you
-can do so using ``$this->db->transOff()``::
+can do so using ``$this->db->transOff()``:
 
-    $this->db->transOff();
-    $this->db->transStart();
-    $this->db->query('AN SQL QUERY...');
-    $this->db->transComplete();
+.. literalinclude:: transactions/004.php
+   :lines: 2-
 
 When transactions are disabled, your queries will be auto-committed, just
 as they are when running queries without transactions.
@@ -98,28 +88,18 @@ Test Mode
 You can optionally put the transaction system into "test mode", which
 will cause your queries to be rolled back -- even if the queries produce
 a valid result. To use test mode simply set the first parameter in the
-``$this->db->transStart()`` function to true::
+``$this->db->transStart()`` function to true:
 
-    $this->db->transStart(true); // Query will be rolled back
-    $this->db->query('AN SQL QUERY...');
-    $this->db->transComplete();
+.. literalinclude:: transactions/005.php
+   :lines: 2-
 
 Running Transactions Manually
 =============================
 
-If you would like to run transactions manually you can do so as follows::
-
-    $this->db->transBegin();
-
-    $this->db->query('AN SQL QUERY...');
-    $this->db->query('ANOTHER QUERY...');
-    $this->db->query('AND YET ANOTHER QUERY...');
+If you would like to run transactions manually you can do so as follows:
 
-    if ($this->db->transStatus() === false) {
-        $this->db->transRollback();
-    } else {
-        $this->db->transCommit();
-    }
+.. literalinclude:: transactions/006.php
+   :lines: 2-
 
 .. note:: Make sure to use ``$this->db->transBegin()`` when running manual
     transactions, **NOT** ``$this->db->transStart()``.
diff --git a/user_guide_src/source/database/transactions/001.php b/user_guide_src/source/database/transactions/001.php
new file mode 100644
index 000000000000..7df64e00a76a
--- /dev/null
+++ b/user_guide_src/source/database/transactions/001.php
@@ -0,0 +1,7 @@
+<?php
+
+$this->db->transStart();
+$this->db->query('AN SQL QUERY...');
+$this->db->query('ANOTHER QUERY...');
+$this->db->query('AND YET ANOTHER QUERY...');
+$this->db->transComplete();
diff --git a/user_guide_src/source/database/transactions/002.php b/user_guide_src/source/database/transactions/002.php
new file mode 100644
index 000000000000..3325f87fdb72
--- /dev/null
+++ b/user_guide_src/source/database/transactions/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$this->db->transStrict(false);
diff --git a/user_guide_src/source/database/transactions/003.php b/user_guide_src/source/database/transactions/003.php
new file mode 100644
index 000000000000..a2026c29f95b
--- /dev/null
+++ b/user_guide_src/source/database/transactions/003.php
@@ -0,0 +1,10 @@
+<?php
+
+$this->db->transStart();
+$this->db->query('AN SQL QUERY...');
+$this->db->query('ANOTHER QUERY...');
+$this->db->transComplete();
+
+if ($this->db->transStatus() === false) {
+    // generate an error... or use the log_message() function to log your error
+}
diff --git a/user_guide_src/source/database/transactions/004.php b/user_guide_src/source/database/transactions/004.php
new file mode 100644
index 000000000000..2600cacf813a
--- /dev/null
+++ b/user_guide_src/source/database/transactions/004.php
@@ -0,0 +1,6 @@
+<?php
+
+$this->db->transOff();
+$this->db->transStart();
+$this->db->query('AN SQL QUERY...');
+$this->db->transComplete();
diff --git a/user_guide_src/source/database/transactions/005.php b/user_guide_src/source/database/transactions/005.php
new file mode 100644
index 000000000000..2902bcdf290a
--- /dev/null
+++ b/user_guide_src/source/database/transactions/005.php
@@ -0,0 +1,5 @@
+<?php
+
+$this->db->transStart(true); // Query will be rolled back
+$this->db->query('AN SQL QUERY...');
+$this->db->transComplete();
diff --git a/user_guide_src/source/database/transactions/006.php b/user_guide_src/source/database/transactions/006.php
new file mode 100644
index 000000000000..0e4bc9a9c899
--- /dev/null
+++ b/user_guide_src/source/database/transactions/006.php
@@ -0,0 +1,13 @@
+<?php
+
+$this->db->transBegin();
+
+$this->db->query('AN SQL QUERY...');
+$this->db->query('ANOTHER QUERY...');
+$this->db->query('AND YET ANOTHER QUERY...');
+
+if ($this->db->transStatus() === false) {
+    $this->db->transRollback();
+} else {
+    $this->db->transCommit();
+}
diff --git a/user_guide_src/source/database/utilities.rst b/user_guide_src/source/database/utilities.rst
index dfaa51864510..9d095a712aff 100644
--- a/user_guide_src/source/database/utilities.rst
+++ b/user_guide_src/source/database/utilities.rst
@@ -14,18 +14,10 @@ Get XML FROM Result
 
 **getXMLFromResult()**
 
-This method returns the xml result from database result. You can do like this::
-
-    $model = new class extends \CodeIgniter\Model {
-        protected $table      = 'foo';
-        protected $primaryKey = 'id';
-    };
-    $db = \Closure::bind(function ($model) {
-        return $model->db;
-    }, null, $model)($model);
-
-    $util = (new \CodeIgniter\Database\Database())->loadUtils($db);
-    echo $util->getXMLFromResult($model->get());
+This method returns the xml result from database result. You can do like this:
+
+.. literalinclude:: utilities/001.php
+   :lines: 2-
 
 and it will get the following xml result::
 
diff --git a/user_guide_src/source/database/utilities/001.php b/user_guide_src/source/database/utilities/001.php
new file mode 100644
index 000000000000..9b0e88d70753
--- /dev/null
+++ b/user_guide_src/source/database/utilities/001.php
@@ -0,0 +1,12 @@
+<?php
+
+$model = new class extends \CodeIgniter\Model {
+    protected $table      = 'foo';
+    protected $primaryKey = 'id';
+};
+$db = \Closure::bind(function ($model) {
+    return $model->db;
+}, null, $model)($model);
+
+$util = (new \CodeIgniter\Database\Database())->loadUtils($db);
+echo $util->getXMLFromResult($model->get());
diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index 2dedbc9af2dc..9c3b16d56588 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -15,14 +15,16 @@ Initializing the Forge Class
 .. important:: In order to initialize the Forge class, your database
     driver must already be running, since the Forge class relies on it.
 
-Load the Forge Class as follows::
+Load the Forge Class as follows:
 
-    $forge = \Config\Database::forge();
+.. literalinclude:: forge/001.php
+   :lines: 2-
 
 You can also pass another database group name to the DB Forge loader, in case
-the database you want to manage isn't the default one::
+the database you want to manage isn't the default one:
 
-    $this->myforge = \Config\Database::forge('other_db');
+.. literalinclude:: forge/002.php
+   :lines: 2-
 
 In the above example, we're passing the name of a different database group
 to connect to as the first parameter.
@@ -34,29 +36,24 @@ Creating and Dropping Databases
 **$forge->createDatabase('db_name')**
 
 Permits you to create the database specified in the first parameter.
-Returns true/false based on success or failure::
+Returns true/false based on success or failure:
 
-    if ($forge->createDatabase('my_db')) {
-        echo 'Database created!';
-    }
+.. literalinclude:: forge/003.php
+   :lines: 2-
 
 An optional second parameter set to true will add ``IF EXISTS`` statement
 or will check if a database exists before create it (depending on DBMS).
 
-::
-
-    $forge->createDatabase('my_db', true);
-    // gives CREATE DATABASE IF NOT EXISTS `my_db`
-    // or will check if a database exists
+.. literalinclude:: forge/004.php
+   :lines: 2-
 
 **$forge->dropDatabase('db_name')**
 
 Permits you to drop the database specified in the first parameter.
-Returns true/false based on success or failure::
+Returns true/false based on success or failure:
 
-    if ($forge->dropDatabase('my_db')) {
-        echo 'Database deleted!';
-    }
+.. literalinclude:: forge/005.php
+   :lines: 2-
 
 Creating Databases in the Command Line
 ======================================
@@ -99,15 +96,8 @@ include a ``type`` key that relates to the datatype of the field. For
 example, INT, VARCHAR, TEXT, etc. Many datatypes (for example VARCHAR)
 also require a ``constraint`` key.
 
-::
-
-    $fields = [
-        'users' => [
-            'type'       => 'VARCHAR',
-            'constraint' => 100,
-        ],
-    ];
-    // will translate to "users VARCHAR(100)" when the field is added.
+.. literalinclude:: forge/006.php
+   :lines: 2-
 
 Additionally, the following key/values can be used:
 
@@ -120,35 +110,8 @@ Additionally, the following key/values can be used:
    such as integer.
 -  ``unique``/true : to generate a unique key for the field definition.
 
-::
-
-    $fields = [
-        'id'          => [
-            'type'           => 'INT',
-            'constraint'     => 5,
-            'unsigned'       => true,
-            'auto_increment' => true
-        ],
-        'title'       => [
-            'type'           => 'VARCHAR',
-            'constraint'     => '100',
-            'unique'         => true,
-        ],
-        'author'      => [
-            'type'           =>'VARCHAR',
-            'constraint'     => 100,
-            'default'        => 'King of Town',
-        ],
-        'description' => [
-            'type'           => 'TEXT',
-            'null'           => true,
-        ],
-        'status'      => [
-            'type'           => 'ENUM',
-            'constraint'     => ['publish', 'pending', 'draft'],
-            'default'        => 'pending',
-        ],
-    ];
+.. literalinclude:: forge/007.php
+   :lines: 2-
 
 After the fields have been defined, they can be added using
 ``$forge->addField($fields)`` followed by a call to the
@@ -162,9 +125,10 @@ Passing strings as fields
 -------------------------
 
 If you know exactly how you want a field to be created, you can pass the
-string into the field definitions with ``addField()``::
+string into the field definitions with ``addField()``:
 
-    $forge->addField("label varchar(100) NOT NULL DEFAULT 'default label'");
+.. literalinclude:: forge/008.php
+   :lines: 2-
 
 .. note:: Passing raw strings as fields cannot be followed by ``addKey()`` calls on those fields.
 
@@ -177,10 +141,8 @@ There is a special exception for creating id fields. A field with type
 id will automatically be assigned as an INT(9) auto_incrementing
 Primary Key.
 
-::
-
-    $forge->addField('id');
-    // gives `id` INT(9) NOT NULL AUTO_INCREMENT
+.. literalinclude:: forge/009.php
+   :lines: 2-
 
 Adding Keys
 ===========
@@ -194,32 +156,14 @@ must be followed by a call to ``createTable()``.
 Multiple column non-primary keys must be sent as an array. Sample output
 below is for MySQL.
 
-::
-
-    $forge->addKey('blog_id', true);
-    // gives PRIMARY KEY `blog_id` (`blog_id`)
-
-    $forge->addKey('blog_id', true);
-    $forge->addKey('site_id', true);
-    // gives PRIMARY KEY `blog_id_site_id` (`blog_id`, `site_id`)
-
-    $forge->addKey('blog_name');
-    // gives KEY `blog_name` (`blog_name`)
-
-    $forge->addKey(['blog_name', 'blog_label']);
-    // gives KEY `blog_name_blog_label` (`blog_name`, `blog_label`)
-
-    $forge->addKey(['blog_id', 'uri'], false, true);
-    // gives UNIQUE KEY `blog_id_uri` (`blog_id`, `uri`)
+.. literalinclude:: forge/010.php
+   :lines: 2-
 
 To make code reading more objective it is also possible to add primary
-and unique keys with specific methods::
+and unique keys with specific methods:
 
-    $forge->addPrimaryKey('blog_id');
-    // gives PRIMARY KEY `blog_id` (`blog_id`)
-
-    $forge->addUniqueKey(['blog_id', 'uri']);
-    // gives UNIQUE KEY `blog_id_uri` (`blog_id`, `uri`)
+.. literalinclude:: forge/011.php
+   :lines: 2-
 
 .. _adding-foreign-keys:
 
@@ -227,21 +171,15 @@ Adding Foreign Keys
 ===================
 
 Foreign Keys help to enforce relationships and actions across your tables. For tables that support Foreign Keys,
-you may add them directly in forge::
-
-    $forge->addForeignKey('users_id', 'users', 'id');
-    // gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`) REFERENCES `users`(`id`)
+you may add them directly in forge:
 
-    $forge->addForeignKey(['users_id', 'users_name'], 'users', ['id', 'name']);
-    // gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`, `users_name`) REFERENCES `users`(`id`, `name`)
+.. literalinclude:: forge/012.php
+   :lines: 2-
 
-You can specify the desired action for the "on delete" and "on update" properties of the constraint::
+You can specify the desired action for the "on delete" and "on update" properties of the constraint:
 
-    $forge->addForeignKey('users_id', 'users', 'id', 'CASCADE', 'CASCADE');
-    // gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`) REFERENCES `users`(`id`) ON DELETE CASCADE ON UPDATE CASCADE
-
-    $forge->addForeignKey(['users_id', 'users_name'], 'users', ['id', 'name'], 'CASCADE', 'CASCADE');
-    // gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`, `users_name`) REFERENCES `users`(`id`, `name`) ON DELETE CASCADE ON UPDATE CASCADE
+.. literalinclude:: forge/013.php
+   :lines: 2-
 
 Creating a Table
 ================
@@ -249,24 +187,19 @@ Creating a Table
 After fields and keys have been declared, you can create a new table
 with
 
-::
-
-    $forge->createTable('table_name');
-    // gives CREATE TABLE table_name
+.. literalinclude:: forge/014.php
+   :lines: 2-
 
 An optional second parameter set to true adds an ``IF NOT EXISTS`` clause
 into the definition
 
-::
-
-    $forge->createTable('table_name', true);
-    // gives CREATE TABLE IF NOT EXISTS table_name
+.. literalinclude:: forge/015.php
+   :lines: 2-
 
-You could also pass optional table attributes, such as MySQL's ``ENGINE``::
+You could also pass optional table attributes, such as MySQL's ``ENGINE``:
 
-    $attributes = ['ENGINE' => 'InnoDB'];
-    $forge->createTable('table_name', false, $attributes);
-    // produces: CREATE TABLE `table_name` (...) ENGINE = InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci
+.. literalinclude:: forge/016.php
+   :lines: 2-
 
 .. note:: Unless you specify the ``CHARACTER SET`` and/or ``COLLATE`` attributes,
     ``createTable()`` will always add them with your configured *charset*
@@ -277,52 +210,38 @@ Dropping a Table
 
 Execute a ``DROP TABLE`` statement and optionally add an ``IF EXISTS`` clause.
 
-::
-
-    // Produces: DROP TABLE `table_name`
-    $forge->dropTable('table_name');
-
-    // Produces: DROP TABLE IF EXISTS `table_name`
-    $forge->dropTable('table_name', true);
+.. literalinclude:: forge/017.php
+   :lines: 2-
 
 A third parameter can be passed to add a ``CASCADE`` option, which might be required for some
 drivers to handle removal of tables with foreign keys.
 
-::
-
-    // Produces: DROP TABLE `table_name` CASCADE
-    $forge->dropTable('table_name', false, true);
+.. literalinclude:: forge/018.php
+   :lines: 2-
 
 Dropping a Foreign Key
 ======================
 
 Execute a DROP FOREIGN KEY.
 
-::
-
-    // Produces: ALTER TABLE `tablename` DROP FOREIGN KEY `users_foreign`
-    $forge->dropForeignKey('tablename', 'users_foreign');
-
+.. literalinclude:: forge/019.php
+   :lines: 2-
 
 Dropping a Key
 ======================
 
 Execute a DROP KEY.
 
-::
-
-    // Produces: DROP INDEX `users_index` ON `tablename`
-    $forge->dropKey('tablename', 'users_index');
+.. literalinclude:: forge/020.php
+   :lines: 2-
 
 Renaming a Table
 ================
 
 Executes a TABLE rename
 
-::
-
-    $forge->renameTable('old_table_name', 'new_table_name');
-    // gives ALTER TABLE `old_table_name` RENAME TO `new_table_name`
+.. literalinclude:: forge/021.php
+   :lines: 2-
 
 ****************
 Modifying Tables
@@ -337,28 +256,16 @@ The ``addColumn()`` method is used to modify an existing table. It
 accepts the same field array as above, and can be used for an unlimited
 number of additional fields.
 
-::
-
-    $fields = [
-        'preferences' => ['type' => 'TEXT']
-    ];
-    $forge->addColumn('table_name', $fields);
-    // Executes: ALTER TABLE `table_name` ADD `preferences` TEXT
+.. literalinclude:: forge/022.php
+   :lines: 2-
 
 If you are using MySQL or CUBIRD, then you can take advantage of their
 ``AFTER`` and ``FIRST`` clauses to position the new column.
 
-Examples::
+Examples:
 
-    // Will place the new column after the `another_field` column:
-    $fields = [
-        'preferences' => ['type' => 'TEXT', 'after' => 'another_field']
-    ];
-
-    // Will place the new column at the start of the table definition:
-    $fields = [
-        'preferences' => ['type' => 'TEXT', 'first' => true]
-    ];
+.. literalinclude:: forge/023.php
+   :lines: 2-
 
 Dropping Columns From a Table
 ==============================
@@ -367,16 +274,13 @@ Dropping Columns From a Table
 
 Used to remove a column from a table.
 
-::
-
-    $forge->dropColumn('table_name', 'column_to_drop'); // to drop one single column
+.. literalinclude:: forge/024.php
+   :lines: 2-
 
 Used to remove multiple columns from a table.
 
-::
-
-    $forge->dropColumn('table_name', 'column_1,column_2'); // by proving comma separated column names
-    $forge->dropColumn('table_name', ['column_1', 'column_2']); // by proving array of column names
+.. literalinclude:: forge/025.php
+   :lines: 2-
 
 Modifying a Column in a Table
 =============================
@@ -387,16 +291,8 @@ The usage of this method is identical to ``addColumn()``, except it
 alters an existing column rather than adding a new one. In order to
 change the name, you can add a "name" key into the field defining array.
 
-::
-
-    $fields = [
-        'old_name' => [
-            'name' => 'new_name',
-            'type' => 'TEXT',
-        ],
-    ];
-    $forge->modifyColumn('table_name', $fields);
-    // gives ALTER TABLE `table_name` CHANGE `old_name` `new_name` TEXT
+.. literalinclude:: forge/026.php
+   :lines: 2-
 
 ***************
 Class Reference
diff --git a/user_guide_src/source/dbmgmt/forge/001.php b/user_guide_src/source/dbmgmt/forge/001.php
new file mode 100644
index 000000000000..e1891c1b162e
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$forge = \Config\Database::forge();
diff --git a/user_guide_src/source/dbmgmt/forge/002.php b/user_guide_src/source/dbmgmt/forge/002.php
new file mode 100644
index 000000000000..c6e8694acf7a
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$this->myforge = \Config\Database::forge('other_db');
diff --git a/user_guide_src/source/dbmgmt/forge/003.php b/user_guide_src/source/dbmgmt/forge/003.php
new file mode 100644
index 000000000000..9030218fdc63
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/003.php
@@ -0,0 +1,5 @@
+<?php
+
+if ($forge->createDatabase('my_db')) {
+    echo 'Database created!';
+}
diff --git a/user_guide_src/source/dbmgmt/forge/004.php b/user_guide_src/source/dbmgmt/forge/004.php
new file mode 100644
index 000000000000..c514b3c0e46a
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/004.php
@@ -0,0 +1,5 @@
+<?php
+
+$forge->createDatabase('my_db', true);
+// gives CREATE DATABASE IF NOT EXISTS `my_db`
+// or will check if a database exists
diff --git a/user_guide_src/source/dbmgmt/forge/005.php b/user_guide_src/source/dbmgmt/forge/005.php
new file mode 100644
index 000000000000..584fc2145b13
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/005.php
@@ -0,0 +1,5 @@
+<?php
+
+if ($forge->dropDatabase('my_db')) {
+    echo 'Database deleted!';
+}
diff --git a/user_guide_src/source/dbmgmt/forge/006.php b/user_guide_src/source/dbmgmt/forge/006.php
new file mode 100644
index 000000000000..c05c2a3fd055
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/006.php
@@ -0,0 +1,9 @@
+<?php
+
+$fields = [
+    'users' => [
+        'type'       => 'VARCHAR',
+        'constraint' => 100,
+    ],
+];
+// will translate to "users VARCHAR(100)" when the field is added.
diff --git a/user_guide_src/source/dbmgmt/forge/007.php b/user_guide_src/source/dbmgmt/forge/007.php
new file mode 100644
index 000000000000..5150dd8495ef
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/007.php
@@ -0,0 +1,29 @@
+<?php
+
+$fields = [
+    'id'          => [
+        'type'           => 'INT',
+        'constraint'     => 5,
+        'unsigned'       => true,
+        'auto_increment' => true
+    ],
+    'title'       => [
+        'type'           => 'VARCHAR',
+        'constraint'     => '100',
+        'unique'         => true,
+    ],
+    'author'      => [
+        'type'           =>'VARCHAR',
+        'constraint'     => 100,
+        'default'        => 'King of Town',
+    ],
+    'description' => [
+        'type'           => 'TEXT',
+        'null'           => true,
+    ],
+    'status'      => [
+        'type'           => 'ENUM',
+        'constraint'     => ['publish', 'pending', 'draft'],
+        'default'        => 'pending',
+    ],
+];
diff --git a/user_guide_src/source/dbmgmt/forge/008.php b/user_guide_src/source/dbmgmt/forge/008.php
new file mode 100644
index 000000000000..df5a69d46094
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/008.php
@@ -0,0 +1,3 @@
+<?php
+
+$forge->addField("label varchar(100) NOT NULL DEFAULT 'default label'");
diff --git a/user_guide_src/source/dbmgmt/forge/009.php b/user_guide_src/source/dbmgmt/forge/009.php
new file mode 100644
index 000000000000..2496a80daa1c
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/009.php
@@ -0,0 +1,4 @@
+<?php
+
+$forge->addField('id');
+// gives `id` INT(9) NOT NULL AUTO_INCREMENT
diff --git a/user_guide_src/source/dbmgmt/forge/010.php b/user_guide_src/source/dbmgmt/forge/010.php
new file mode 100644
index 000000000000..4d5644247deb
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/010.php
@@ -0,0 +1,17 @@
+<?php
+
+$forge->addKey('blog_id', true);
+// gives PRIMARY KEY `blog_id` (`blog_id`)
+
+$forge->addKey('blog_id', true);
+$forge->addKey('site_id', true);
+// gives PRIMARY KEY `blog_id_site_id` (`blog_id`, `site_id`)
+
+$forge->addKey('blog_name');
+// gives KEY `blog_name` (`blog_name`)
+
+$forge->addKey(['blog_name', 'blog_label']);
+// gives KEY `blog_name_blog_label` (`blog_name`, `blog_label`)
+
+$forge->addKey(['blog_id', 'uri'], false, true);
+// gives UNIQUE KEY `blog_id_uri` (`blog_id`, `uri`)
diff --git a/user_guide_src/source/dbmgmt/forge/011.php b/user_guide_src/source/dbmgmt/forge/011.php
new file mode 100644
index 000000000000..4da2f48ce532
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/011.php
@@ -0,0 +1,7 @@
+<?php
+
+$forge->addPrimaryKey('blog_id');
+// gives PRIMARY KEY `blog_id` (`blog_id`)
+
+$forge->addUniqueKey(['blog_id', 'uri']);
+// gives UNIQUE KEY `blog_id_uri` (`blog_id`, `uri`)
diff --git a/user_guide_src/source/dbmgmt/forge/012.php b/user_guide_src/source/dbmgmt/forge/012.php
new file mode 100644
index 000000000000..dc6ccdb24ec5
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/012.php
@@ -0,0 +1,7 @@
+<?php
+
+$forge->addForeignKey('users_id', 'users', 'id');
+// gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`) REFERENCES `users`(`id`)
+
+$forge->addForeignKey(['users_id', 'users_name'], 'users', ['id', 'name']);
+// gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`, `users_name`) REFERENCES `users`(`id`, `name`)
diff --git a/user_guide_src/source/dbmgmt/forge/013.php b/user_guide_src/source/dbmgmt/forge/013.php
new file mode 100644
index 000000000000..33aa485380ee
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/013.php
@@ -0,0 +1,7 @@
+<?php
+
+$forge->addForeignKey('users_id', 'users', 'id', 'CASCADE', 'CASCADE');
+// gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`) REFERENCES `users`(`id`) ON DELETE CASCADE ON UPDATE CASCADE
+
+$forge->addForeignKey(['users_id', 'users_name'], 'users', ['id', 'name'], 'CASCADE', 'CASCADE');
+// gives CONSTRAINT `TABLENAME_users_foreign` FOREIGN KEY(`users_id`, `users_name`) REFERENCES `users`(`id`, `name`) ON DELETE CASCADE ON UPDATE CASCADE
diff --git a/user_guide_src/source/dbmgmt/forge/014.php b/user_guide_src/source/dbmgmt/forge/014.php
new file mode 100644
index 000000000000..ca5d58847be9
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/014.php
@@ -0,0 +1,4 @@
+<?php
+
+$forge->createTable('table_name');
+// gives CREATE TABLE table_name
diff --git a/user_guide_src/source/dbmgmt/forge/015.php b/user_guide_src/source/dbmgmt/forge/015.php
new file mode 100644
index 000000000000..ad478406a903
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/015.php
@@ -0,0 +1,4 @@
+<?php
+
+$forge->createTable('table_name', true);
+// gives CREATE TABLE IF NOT EXISTS table_name
diff --git a/user_guide_src/source/dbmgmt/forge/016.php b/user_guide_src/source/dbmgmt/forge/016.php
new file mode 100644
index 000000000000..e8db91a9ed63
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/016.php
@@ -0,0 +1,5 @@
+<?php
+
+$attributes = ['ENGINE' => 'InnoDB'];
+$forge->createTable('table_name', false, $attributes);
+// produces: CREATE TABLE `table_name` (...) ENGINE = InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci
diff --git a/user_guide_src/source/dbmgmt/forge/017.php b/user_guide_src/source/dbmgmt/forge/017.php
new file mode 100644
index 000000000000..fd630b627b54
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/017.php
@@ -0,0 +1,7 @@
+<?php
+
+// Produces: DROP TABLE `table_name`
+$forge->dropTable('table_name');
+
+// Produces: DROP TABLE IF EXISTS `table_name`
+$forge->dropTable('table_name', true);
diff --git a/user_guide_src/source/dbmgmt/forge/018.php b/user_guide_src/source/dbmgmt/forge/018.php
new file mode 100644
index 000000000000..80ee53439a59
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/018.php
@@ -0,0 +1,4 @@
+<?php
+
+// Produces: DROP TABLE `table_name` CASCADE
+$forge->dropTable('table_name', false, true);
diff --git a/user_guide_src/source/dbmgmt/forge/019.php b/user_guide_src/source/dbmgmt/forge/019.php
new file mode 100644
index 000000000000..650180f701b8
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/019.php
@@ -0,0 +1,4 @@
+<?php
+
+// Produces: ALTER TABLE `tablename` DROP FOREIGN KEY `users_foreign`
+$forge->dropForeignKey('tablename', 'users_foreign');
diff --git a/user_guide_src/source/dbmgmt/forge/020.php b/user_guide_src/source/dbmgmt/forge/020.php
new file mode 100644
index 000000000000..7ce99e8bc426
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/020.php
@@ -0,0 +1,4 @@
+<?php
+
+// Produces: DROP INDEX `users_index` ON `tablename`
+$forge->dropKey('tablename', 'users_index');
diff --git a/user_guide_src/source/dbmgmt/forge/021.php b/user_guide_src/source/dbmgmt/forge/021.php
new file mode 100644
index 000000000000..4ebf94cfef40
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/021.php
@@ -0,0 +1,4 @@
+<?php
+
+$forge->renameTable('old_table_name', 'new_table_name');
+// gives ALTER TABLE `old_table_name` RENAME TO `new_table_name`
diff --git a/user_guide_src/source/dbmgmt/forge/022.php b/user_guide_src/source/dbmgmt/forge/022.php
new file mode 100644
index 000000000000..22b335fc992c
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/022.php
@@ -0,0 +1,7 @@
+<?php
+
+$fields = [
+    'preferences' => ['type' => 'TEXT']
+];
+$forge->addColumn('table_name', $fields);
+// Executes: ALTER TABLE `table_name` ADD `preferences` TEXT
diff --git a/user_guide_src/source/dbmgmt/forge/023.php b/user_guide_src/source/dbmgmt/forge/023.php
new file mode 100644
index 000000000000..50a5bc799909
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/023.php
@@ -0,0 +1,11 @@
+<?php
+
+// Will place the new column after the `another_field` column:
+$fields = [
+    'preferences' => ['type' => 'TEXT', 'after' => 'another_field']
+];
+
+// Will place the new column at the start of the table definition:
+$fields = [
+    'preferences' => ['type' => 'TEXT', 'first' => true]
+];
diff --git a/user_guide_src/source/dbmgmt/forge/024.php b/user_guide_src/source/dbmgmt/forge/024.php
new file mode 100644
index 000000000000..7f2e168782b1
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/024.php
@@ -0,0 +1,3 @@
+<?php
+
+$forge->dropColumn('table_name', 'column_to_drop'); // to drop one single column
diff --git a/user_guide_src/source/dbmgmt/forge/025.php b/user_guide_src/source/dbmgmt/forge/025.php
new file mode 100644
index 000000000000..7e1aa8ebd320
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/025.php
@@ -0,0 +1,4 @@
+<?php
+
+$forge->dropColumn('table_name', 'column_1,column_2'); // by proving comma separated column names
+$forge->dropColumn('table_name', ['column_1', 'column_2']); // by proving array of column names
diff --git a/user_guide_src/source/dbmgmt/forge/026.php b/user_guide_src/source/dbmgmt/forge/026.php
new file mode 100644
index 000000000000..bd923d8a6ec0
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/026.php
@@ -0,0 +1,10 @@
+<?php
+
+$fields = [
+    'old_name' => [
+        'name' => 'new_name',
+        'type' => 'TEXT',
+    ],
+];
+$forge->modifyColumn('table_name', $fields);
+// gives ALTER TABLE `table_name` CHANGE `old_name` `new_name` TEXT
diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst
index f3278d520e3f..908577edced3 100644
--- a/user_guide_src/source/dbmgmt/migration.rst
+++ b/user_guide_src/source/dbmgmt/migration.rst
@@ -42,43 +42,8 @@ Create a Migration
 This will be the first migration for a new site which has a blog. All
 migrations go in the **app/Database/Migrations/** directory and have names such
 as **2022-01-31-013057_AddBlog.php**.
-::
 
-    <?php
-
-    namespace App\Database\Migrations;
-
-    use CodeIgniter\Database\Migration;
-
-    class AddBlog extends Migration
-    {
-        public function up()
-        {
-            $this->forge->addField([
-                'blog_id'          => [
-                    'type'           => 'INT',
-                    'constraint'     => 5,
-                    'unsigned'       => true,
-                    'auto_increment' => true,
-                ],
-                'blog_title'       => [
-                    'type'       => 'VARCHAR',
-                    'constraint' => '100',
-                ],
-                'blog_description' => [
-                    'type' => 'TEXT',
-                    'null' => true,
-                ],
-            ]);
-            $this->forge->addKey('blog_id', true);
-            $this->forge->createTable('blog');
-        }
-
-        public function down()
-        {
-            $this->forge->dropTable('blog');
-        }
-    }
+.. literalinclude:: migration/001.php
 
 The database connection and the database Forge class are both available to you through
 ``$this->db`` and ``$this->forge``, respectively.
@@ -95,16 +60,8 @@ When your tables include Foreign Keys, migrations can often cause problems as yo
 To temporarily bypass the foreign key checks while running migrations, use the ``disableForeignKeyChecks()`` and
 ``enableForeignKeyChecks()`` methods on the database connection.
 
-::
-
-    public function up()
-    {
-        $this->db->disableForeignKeyChecks()
-
-        // Migration rules would go here..
-
-        $this->db->enableForeignKeyChecks();
-    }
+.. literalinclude:: migration/002.php
+   :lines: 2-
 
 Database Groups
 ===============
@@ -115,28 +72,9 @@ in that same configuration file. There may be times when you need different sche
 database groups. Perhaps you have one database that is used for all general site information, while
 another database is used for mission critical data. You can ensure that migrations are run only
 against the proper group by setting the ``$DBGroup`` property on your migration. This name must
-match the name of the database group exactly::
-
-    <?php
-
-    namespace App\Database\Migrations;
+match the name of the database group exactly:
 
-    use CodeIgniter\Database\Migration;
-
-    class AddBlog extends Migration
-    {
-        protected $DBGroup = 'alternate_db_group';
-
-        public function up()
-        {
-            // ...
-        }
-
-        public function down()
-        {
-            // ...
-        }
-    }
+.. literalinclude:: migration/003.php
 
 Namespaces
 ==========
@@ -149,12 +87,10 @@ it finds in Database/Migrations.
 Each namespace has its own version sequence, this will help you upgrade and downgrade each module (namespace) without affecting other namespaces.
 
 For example, assume that we have the following namespaces defined in our Autoload
-configuration file::
+configuration file:
 
-    $psr4 = [
-        'App'       => APPPATH,
-        'MyCompany' => ROOTPATH . 'MyCompany',
-    ];
+.. literalinclude:: migration/004.php
+   :lines: 2-
 
 This will look for any migrations located at both **APPPATH/Database/Migrations** and
 **ROOTPATH/MyCompany/Database/Migrations**. This makes it simple to include migrations in your
@@ -165,25 +101,9 @@ Usage Example
 *************
 
 In this example some simple code is placed in **app/Controllers/Migrate.php**
-to update the schema::
-
-    <?php
-
-    namespace App\Controllers;
-
-    class Migrate extends \CodeIgniter\Controller
-    {
-        public function index()
-        {
-            $migrate = \Config\Services::migrations();
+to update the schema:
 
-            try {
-                $migrate->latest();
-            } catch (\Throwable $e) {
-                // Do something with the error here...
-            }
-        }
-    }
+.. literalinclude:: migration/005.php
 
 .. _command-line-tools:
 
@@ -313,10 +233,9 @@ Class Reference
         :rtype:    bool
 
         Regress can be used to roll back changes to a previous state, batch by batch.
-        ::
 
-            $migration->regress(5);
-            $migration->regress(-1);
+        .. literalinclude:: migration/006.php
+           :lines: 2-
 
     .. php:method:: force($path, $namespace, $group)
 
@@ -336,9 +255,10 @@ Class Reference
         :returns:   The current MigrationRunner instance
         :rtype:     CodeIgniter\\Database\\MigrationRunner
 
-        Sets the namespace the library should look for migration files::
+        Sets the namespace the library should look for migration files:
 
-            $migration->setNamespace($namespace)->latest();
+        .. literalinclude:: migration/007.php
+           :lines: 2-
 
     .. php:method:: setGroup($group)
 
@@ -346,6 +266,7 @@ Class Reference
         :returns:   The current MigrationRunner instance
         :rtype:     CodeIgniter\\Database\\MigrationRunner
 
-        Sets the group the library should look for migration files::
+        Sets the group the library should look for migration files:
 
-            $migration->setGroup($group)->latest();
+        .. literalinclude:: migration/008.php
+           :lines: 2-
diff --git a/user_guide_src/source/dbmgmt/migration/001.php b/user_guide_src/source/dbmgmt/migration/001.php
new file mode 100644
index 000000000000..0d08e2b44308
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/migration/001.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class AddBlog extends Migration
+{
+    public function up()
+    {
+        $this->forge->addField([
+            'blog_id'          => [
+                'type'           => 'INT',
+                'constraint'     => 5,
+                'unsigned'       => true,
+                'auto_increment' => true,
+            ],
+            'blog_title'       => [
+                'type'       => 'VARCHAR',
+                'constraint' => '100',
+            ],
+            'blog_description' => [
+                'type' => 'TEXT',
+                'null' => true,
+            ],
+        ]);
+        $this->forge->addKey('blog_id', true);
+        $this->forge->createTable('blog');
+    }
+
+    public function down()
+    {
+        $this->forge->dropTable('blog');
+    }
+}
diff --git a/user_guide_src/source/dbmgmt/migration/002.php b/user_guide_src/source/dbmgmt/migration/002.php
new file mode 100644
index 000000000000..07d2b2034775
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/migration/002.php
@@ -0,0 +1,10 @@
+<?php
+
+public function up()
+{
+    $this->db->disableForeignKeyChecks()
+
+    // Migration rules would go here..
+
+    $this->db->enableForeignKeyChecks();
+}
diff --git a/user_guide_src/source/dbmgmt/migration/003.php b/user_guide_src/source/dbmgmt/migration/003.php
new file mode 100644
index 000000000000..c68f8840b1ba
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/migration/003.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class AddBlog extends Migration
+{
+    protected $DBGroup = 'alternate_db_group';
+
+    public function up()
+    {
+        // ...
+    }
+
+    public function down()
+    {
+        // ...
+    }
+}
diff --git a/user_guide_src/source/dbmgmt/migration/004.php b/user_guide_src/source/dbmgmt/migration/004.php
new file mode 100644
index 000000000000..1e4c831c8219
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/migration/004.php
@@ -0,0 +1,6 @@
+<?php
+
+$psr4 = [
+    'App'       => APPPATH,
+    'MyCompany' => ROOTPATH . 'MyCompany',
+];
diff --git a/user_guide_src/source/dbmgmt/migration/005.php b/user_guide_src/source/dbmgmt/migration/005.php
new file mode 100644
index 000000000000..854744f68e5e
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/migration/005.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Controllers;
+
+class Migrate extends \CodeIgniter\Controller
+{
+    public function index()
+    {
+        $migrate = \Config\Services::migrations();
+
+        try {
+            $migrate->latest();
+        } catch (\Throwable $e) {
+            // Do something with the error here...
+        }
+    }
+}
diff --git a/user_guide_src/source/dbmgmt/migration/006.php b/user_guide_src/source/dbmgmt/migration/006.php
new file mode 100644
index 000000000000..376d94a4c72b
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/migration/006.php
@@ -0,0 +1,4 @@
+<?php
+
+$migration->regress(5);
+$migration->regress(-1);
diff --git a/user_guide_src/source/dbmgmt/migration/007.php b/user_guide_src/source/dbmgmt/migration/007.php
new file mode 100644
index 000000000000..5c651232d922
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/migration/007.php
@@ -0,0 +1,3 @@
+<?php
+
+$migration->setNamespace($namespace)->latest();
diff --git a/user_guide_src/source/dbmgmt/migration/008.php b/user_guide_src/source/dbmgmt/migration/008.php
new file mode 100644
index 000000000000..57b750866bc0
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/migration/008.php
@@ -0,0 +1,3 @@
+<?php
+
+$migration->setGroup($group)->latest();
diff --git a/user_guide_src/source/dbmgmt/seeds.rst b/user_guide_src/source/dbmgmt/seeds.rst
index e79496efbffb..620dbda8d472 100644
--- a/user_guide_src/source/dbmgmt/seeds.rst
+++ b/user_guide_src/source/dbmgmt/seeds.rst
@@ -11,69 +11,30 @@ Database seeds are simple classes that must have a **run()** method, and extend
 Within the **run()** the class can create any form of data that it needs to. It has access to the database
 connection and the forge through ``$this->db`` and ``$this->forge``, respectively. Seed files must be
 stored within the **app/Database/Seeds** directory. The name of the file must match the name of the class.
-::
-
-    <?php
-
-    namespace App\Database\Seeds;
-
-    use CodeIgniter\Database\Seeder;
-
-    class SimpleSeeder extends Seeder
-    {
-        public function run()
-        {
-            $data = [
-                'username' => 'darth',
-                'email'    => 'darth@theempire.com'
-            ];
 
-            // Simple Queries
-            $this->db->query("INSERT INTO users (username, email) VALUES(:username:, :email:)", $data);
-
-            // Using Query Builder
-            $this->db->table('users')->insert($data);
-        }
-    }
+.. literalinclude:: seeds/001.php
 
 Nesting Seeders
 ===============
 
 Seeders can call other seeders, with the **call()** method. This allows you to easily organize a central seeder,
-but organize the tasks into separate seeder files::
-
-    <?php
-
-    namespace App\Database\Seeds;
-
-    use CodeIgniter\Database\Seeder;
+but organize the tasks into separate seeder files:
 
-    class TestSeeder extends Seeder
-    {
-        public function run()
-        {
-            $this->call('UserSeeder');
-            $this->call('CountrySeeder');
-            $this->call('JobSeeder');
-        }
-    }
+.. literalinclude:: seeds/002.php
 
 You can also use a fully-qualified class name in the **call()** method, allowing you to keep your seeders
-anywhere the autoloader can find them. This is great for more modular code bases::
+anywhere the autoloader can find them. This is great for more modular code bases:
 
-    public function run()
-    {
-        $this->call('UserSeeder');
-        $this->call('My\Database\Seeds\CountrySeeder');
-    }
+.. literalinclude:: seeds/003.php
+   :lines: 2-
 
 Using Seeders
 =============
 
-You can grab a copy of the main seeder through the database config class::
+You can grab a copy of the main seeder through the database config class:
 
-    $seeder = \Config\Database::seeder();
-    $seeder->call('TestSeeder');
+.. literalinclude:: seeds/004.php
+   :lines: 2-
 
 Command Line Seeding
 --------------------
diff --git a/user_guide_src/source/dbmgmt/seeds/001.php b/user_guide_src/source/dbmgmt/seeds/001.php
new file mode 100644
index 000000000000..627f554fc515
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/seeds/001.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Database\Seeds;
+
+use CodeIgniter\Database\Seeder;
+
+class SimpleSeeder extends Seeder
+{
+    public function run()
+    {
+        $data = [
+            'username' => 'darth',
+            'email'    => 'darth@theempire.com'
+        ];
+
+        // Simple Queries
+        $this->db->query("INSERT INTO users (username, email) VALUES(:username:, :email:)", $data);
+
+        // Using Query Builder
+        $this->db->table('users')->insert($data);
+    }
+}
diff --git a/user_guide_src/source/dbmgmt/seeds/002.php b/user_guide_src/source/dbmgmt/seeds/002.php
new file mode 100644
index 000000000000..7c045fbbcbea
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/seeds/002.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Database\Seeds;
+
+use CodeIgniter\Database\Seeder;
+
+class TestSeeder extends Seeder
+{
+    public function run()
+    {
+        $this->call('UserSeeder');
+        $this->call('CountrySeeder');
+        $this->call('JobSeeder');
+    }
+}
diff --git a/user_guide_src/source/dbmgmt/seeds/003.php b/user_guide_src/source/dbmgmt/seeds/003.php
new file mode 100644
index 000000000000..12dbcbd74835
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/seeds/003.php
@@ -0,0 +1,7 @@
+<?php
+
+public function run()
+{
+    $this->call('UserSeeder');
+    $this->call('My\Database\Seeds\CountrySeeder');
+}
diff --git a/user_guide_src/source/dbmgmt/seeds/004.php b/user_guide_src/source/dbmgmt/seeds/004.php
new file mode 100644
index 000000000000..be137c21d0d6
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/seeds/004.php
@@ -0,0 +1,4 @@
+<?php
+
+$seeder = \Config\Database::seeder();
+$seeder->call('TestSeeder');
diff --git a/user_guide_src/source/extending/basecontroller.rst b/user_guide_src/source/extending/basecontroller.rst
index 229783df0369..7f6fdfab4a7b 100644
--- a/user_guide_src/source/extending/basecontroller.rst
+++ b/user_guide_src/source/extending/basecontroller.rst
@@ -4,38 +4,25 @@ Extending the Controller
 
 CodeIgniter's core Controller should not be changed, but a default class extension is provided for you at
 **app/Controllers/BaseController.php**. Any new controllers you make should extend ``BaseController`` to take
-advantage of preloaded components and any additional functionality you provide::
+advantage of preloaded components and any additional functionality you provide:
 
-    <?php
-
-    namespace App\Controllers;
-
-    use CodeIgniter\Controller;
-
-    class Home extends BaseController
-    {
-        // ...
-    }
+.. literalinclude:: basecontroller/001.php
 
 Preloading Components
 =====================
 
 The base controller is a great place to load any helpers, models, libraries, services, etc. that you intend to
 use every time your project runs. Helpers should be added to the pre-defined ``$helpers`` array. For example, if
-you want the HTML and Text helpers universally available::
+you want the HTML and Text helpers universally available:
 
-    protected $helpers = ['html', 'text'];
+.. literalinclude:: basecontroller/002.php
+   :lines: 2-
 
 Any other components to load or data to process should be added to the constructor ``initController()``. For
-example, if your project uses the Session Library heavily you may want to initiate it here::
+example, if your project uses the Session Library heavily you may want to initiate it here:
 
-    public function initController(...)
-    {
-        // Do Not Edit This Line
-        parent::initController($request, $response, $logger);
-        
-        $this->session = \Config\Services::session();
-    }
+.. literalinclude:: basecontroller/003.php
+   :lines: 2-
 
 Additional Methods
 ==================
@@ -52,9 +39,7 @@ has an involved public interface and a simple administrative portal you may want
 the public controllers and make ``AdminController`` for any administrative controllers.
 
 If you do not want to use the base controller you may bypass it by having your controllers extend the system
-Controller instead::
+Controller instead:
 
-    class Home extends \CodeIgniter\Controller
-    {
-    
-    }
+.. literalinclude:: basecontroller/004.php
+   :lines: 2-
diff --git a/user_guide_src/source/extending/basecontroller/001.php b/user_guide_src/source/extending/basecontroller/001.php
new file mode 100644
index 000000000000..f201f751b0e0
--- /dev/null
+++ b/user_guide_src/source/extending/basecontroller/001.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Controllers;
+
+use CodeIgniter\Controller;
+
+class Home extends BaseController
+{
+    // ...
+}
diff --git a/user_guide_src/source/extending/basecontroller/002.php b/user_guide_src/source/extending/basecontroller/002.php
new file mode 100644
index 000000000000..dee702c36ecb
--- /dev/null
+++ b/user_guide_src/source/extending/basecontroller/002.php
@@ -0,0 +1,3 @@
+<?php
+
+protected $helpers = ['html', 'text'];
diff --git a/user_guide_src/source/extending/basecontroller/003.php b/user_guide_src/source/extending/basecontroller/003.php
new file mode 100644
index 000000000000..efc4168c43ac
--- /dev/null
+++ b/user_guide_src/source/extending/basecontroller/003.php
@@ -0,0 +1,9 @@
+<?php
+
+public function initController(...)
+{
+    // Do Not Edit This Line
+    parent::initController($request, $response, $logger);
+
+    $this->session = \Config\Services::session();
+}
diff --git a/user_guide_src/source/extending/basecontroller/004.php b/user_guide_src/source/extending/basecontroller/004.php
new file mode 100644
index 000000000000..427b0662ff80
--- /dev/null
+++ b/user_guide_src/source/extending/basecontroller/004.php
@@ -0,0 +1,6 @@
+<?php
+
+class Home extends \CodeIgniter\Controller
+{
+
+}
diff --git a/user_guide_src/source/extending/core_classes.rst b/user_guide_src/source/extending/core_classes.rst
index 9ef3330e23bc..adfbfd49b5f3 100644
--- a/user_guide_src/source/extending/core_classes.rst
+++ b/user_guide_src/source/extending/core_classes.rst
@@ -47,29 +47,14 @@ can find your class, that your new class extends the appropriate interface, and
 :doc:`Service <../concepts/services>` to load your class in place of the core class.
 
 For example, if you have a new ``App\Libraries\RouteCollection`` class that you would like to use in place of
-the core system class, you would create your class like this::
+the core system class, you would create your class like this:
 
-    <?php
+.. literalinclude:: core_classes/001.php
 
-    namespace App\Libraries;
+Then you would add the ``routes`` service in **app/Config/Services.php** to load your class instead:
 
-    use CodeIgniter\Router\RouteCollectionInterface;
-
-    class RouteCollection implements RouteCollectionInterface
-    {
-        // ...
-    }
-
-Then you would add the ``routes`` service in **app/Config/Services.php** to load your class instead::
-
-    public static function routes(bool $getShared = true)
-    {
-        if ($getShared) {
-            return static::getSharedInstance('routes');
-        }
-
-        return new \App\Libraries\RouteCollection(static::locator(), config('Modules'));
-    }
+.. literalinclude:: core_classes/002.php
+   :lines: 2-
 
 Extending Core Classes
 ======================
@@ -80,36 +65,13 @@ identical to replacing a class with one exception:
 
 * The class declaration must extend the parent class.
 
-For example, to extend the native RouteCollection class, you would declare your class with::
-
-    <?php
-
-    namespace App\Libraries;
-
-    use CodeIgniter\Router\RouteCollection;
-
-    class RouteCollection extends RouteCollection
-    {
-        // ...
-    }
-
-If you need to use a constructor in your class make sure you extend the parent constructor::
-
-    <?php
-
-    namespace App\Libraries;
+For example, to extend the native RouteCollection class, you would declare your class with:
 
-    use CodeIgniter\Router\RouteCollection as BaseRouteCollection;
+.. literalinclude:: core_classes/003.php
 
-    class RouteCollection extends BaseRouteCollection
-    {
-        public function __construct()
-        {
-            parent::__construct();
+If you need to use a constructor in your class make sure you extend the parent constructor:
 
-            // your code here
-        }
-    }
+.. literalinclude:: core_classes/004.php
 
 **Tip:**  Any functions in your class that are named identically to the methods in the parent class will be used
 instead of the native ones (this is known as “method overriding”). This allows you to substantially alter the CodeIgniter core.
diff --git a/user_guide_src/source/extending/core_classes/001.php b/user_guide_src/source/extending/core_classes/001.php
new file mode 100644
index 000000000000..bf81bc0cd557
--- /dev/null
+++ b/user_guide_src/source/extending/core_classes/001.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Libraries;
+
+use CodeIgniter\Router\RouteCollectionInterface;
+
+class RouteCollection implements RouteCollectionInterface
+{
+    // ...
+}
diff --git a/user_guide_src/source/extending/core_classes/002.php b/user_guide_src/source/extending/core_classes/002.php
new file mode 100644
index 000000000000..65fb5c240f41
--- /dev/null
+++ b/user_guide_src/source/extending/core_classes/002.php
@@ -0,0 +1,10 @@
+<?php
+
+public static function routes(bool $getShared = true)
+{
+    if ($getShared) {
+        return static::getSharedInstance('routes');
+    }
+
+    return new \App\Libraries\RouteCollection(static::locator(), config('Modules'));
+}
diff --git a/user_guide_src/source/extending/core_classes/003.php b/user_guide_src/source/extending/core_classes/003.php
new file mode 100644
index 000000000000..c726b71ea95d
--- /dev/null
+++ b/user_guide_src/source/extending/core_classes/003.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Libraries;
+
+use CodeIgniter\Router\RouteCollection;
+
+class RouteCollection extends RouteCollection
+{
+    // ...
+}
diff --git a/user_guide_src/source/extending/core_classes/004.php b/user_guide_src/source/extending/core_classes/004.php
new file mode 100644
index 000000000000..958428af7788
--- /dev/null
+++ b/user_guide_src/source/extending/core_classes/004.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Libraries;
+
+use CodeIgniter\Router\RouteCollection as BaseRouteCollection;
+
+class RouteCollection extends BaseRouteCollection
+{
+    public function __construct()
+    {
+        parent::__construct();
+
+        // your code here
+    }
+}
diff --git a/user_guide_src/source/extending/events.rst b/user_guide_src/source/extending/events.rst
index 79a8636b4bc7..8761b23175b2 100644
--- a/user_guide_src/source/extending/events.rst
+++ b/user_guide_src/source/extending/events.rst
@@ -21,49 +21,35 @@ Defining an Event
 
 Most events are defined within the **app/Config/Events.php** file. You can subscribe an action to an event with
 the Events class' ``on()`` method. The first parameter is the name of the event to subscribe to. The second parameter is
-a callable that will be run when that event is triggered::
+a callable that will be run when that event is triggered:
 
-    use CodeIgniter\Events\Events;
-
-    Events::on('pre_system', ['MyClass', 'MyFunction']);
+.. literalinclude:: events/001.php
+   :lines: 2-
 
 In this example, whenever the **pre_controller** event is executed, an instance of ``MyClass`` is created and the
 ``MyFunction`` method is run. Note that the second parameter can be *any* form of
-`callable <https://www.php.net/manual/en/function.is-callable.php>`_ that PHP recognizes::
-
-    // Call a standalone function
-    Events::on('pre_system', 'some_function');
-
-    // Call on an instance method
-    $user = new User();
-    Events::on('pre_system', [$user, 'some_method']);
+`callable <https://www.php.net/manual/en/function.is-callable.php>`_ that PHP recognizes:
 
-    // Call on a static method
-    Events::on('pre_system', 'SomeClass::someMethod');
-
-    // Use a Closure
-    Events::on('pre_system', function (...$params)
-    {
-        . . .
-    });
+.. literalinclude:: events/002.php
+   :lines: 2-
 
 Setting Priorities
 ------------------
 
 Since multiple methods can be subscribed to a single event, you will need a way to define in what order those methods
 are called. You can do this by passing a priority value as the third parameter of the ``on()`` method. Lower values
-are executed first, with a value of 1 having the highest priority, and there being no limit on the lower values::
+are executed first, with a value of 1 having the highest priority, and there being no limit on the lower values:
 
-    Events::on('post_controller_constructor', 'some_function', 25);
+.. literalinclude:: events/003.php
+   :lines: 2-
 
 Any subscribers with the same priority will be executed in the order they were defined.
 
 Three constants are defined for your use, that set some helpful ranges on the values. You are not required to use these
-but you might find they aid readability::
+but you might find they aid readability:
 
-    define('EVENT_PRIORITY_LOW', 200);
-    define('EVENT_PRIORITY_NORMAL', 100);
-    define('EVENT_PRIORITY_HIGH', 10);
+.. literalinclude:: events/004.php
+   :lines: 2-
 
 Once sorted, all subscribers are executed in order. If any subscriber returns a boolean false value, then execution of
 the subscribers will stop.
@@ -72,18 +58,16 @@ Publishing your own Events
 ==========================
 
 The Events library makes it simple for you to create events in your own code, also. To use this feature, you would simply
-need to call the ``trigger()`` method on the **Events** class with the name of the event::
+need to call the ``trigger()`` method on the **Events** class with the name of the event:
 
-    \CodeIgniter\Events\Events::trigger('some_event');
+.. literalinclude:: events/005.php
+   :lines: 2-
 
 You can pass any number of arguments to the subscribers by adding them as additional parameters. Subscribers will be
-given the arguments in the same order as defined::
-
-    \CodeIgniter\Events\Events::trigger('some_events', $foo, $bar, $baz);
+given the arguments in the same order as defined:
 
-    Events::on('some_event', function ($foo, $bar, $baz) {
-        ...
-    });
+.. literalinclude:: events/006.php
+   :lines: 2-
 
 Simulating Events
 =================
@@ -92,13 +76,13 @@ During testing, you might not want the events to actually fire, as sending out h
 and counter-productive. You can tell the Events class to only simulate running the events with the ``simulate()`` method.
 When **true**, all events will be skipped over during the trigger method. Everything else will work as normal, though.
 
-::
-
-    Events::simulate(true);
+.. literalinclude:: events/007.php
+   :lines: 2-
 
-You can stop simulation by passing false::
+You can stop simulation by passing false:
 
-    Events::simulate(false);
+.. literalinclude:: events/008.php
+   :lines: 2-
 
 Event Points
 ============
diff --git a/user_guide_src/source/extending/events/001.php b/user_guide_src/source/extending/events/001.php
new file mode 100644
index 000000000000..2a3ee317e594
--- /dev/null
+++ b/user_guide_src/source/extending/events/001.php
@@ -0,0 +1,5 @@
+<?php
+
+use CodeIgniter\Events\Events;
+
+Events::on('pre_system', ['MyClass', 'MyFunction']);
diff --git a/user_guide_src/source/extending/events/002.php b/user_guide_src/source/extending/events/002.php
new file mode 100644
index 000000000000..e41a9880c232
--- /dev/null
+++ b/user_guide_src/source/extending/events/002.php
@@ -0,0 +1,17 @@
+<?php
+
+// Call a standalone function
+Events::on('pre_system', 'some_function');
+
+// Call on an instance method
+$user = new User();
+Events::on('pre_system', [$user, 'some_method']);
+
+// Call on a static method
+Events::on('pre_system', 'SomeClass::someMethod');
+
+// Use a Closure
+Events::on('pre_system', function (...$params)
+{
+    . . .
+});
diff --git a/user_guide_src/source/extending/events/003.php b/user_guide_src/source/extending/events/003.php
new file mode 100644
index 000000000000..39638696f5ff
--- /dev/null
+++ b/user_guide_src/source/extending/events/003.php
@@ -0,0 +1,3 @@
+<?php
+
+Events::on('post_controller_constructor', 'some_function', 25);
diff --git a/user_guide_src/source/extending/events/004.php b/user_guide_src/source/extending/events/004.php
new file mode 100644
index 000000000000..df0ce3b16958
--- /dev/null
+++ b/user_guide_src/source/extending/events/004.php
@@ -0,0 +1,5 @@
+<?php
+
+define('EVENT_PRIORITY_LOW', 200);
+define('EVENT_PRIORITY_NORMAL', 100);
+define('EVENT_PRIORITY_HIGH', 10);
diff --git a/user_guide_src/source/extending/events/005.php b/user_guide_src/source/extending/events/005.php
new file mode 100644
index 000000000000..3bd11f846ade
--- /dev/null
+++ b/user_guide_src/source/extending/events/005.php
@@ -0,0 +1,3 @@
+<?php
+
+\CodeIgniter\Events\Events::trigger('some_event');
diff --git a/user_guide_src/source/extending/events/006.php b/user_guide_src/source/extending/events/006.php
new file mode 100644
index 000000000000..ff866f8e2392
--- /dev/null
+++ b/user_guide_src/source/extending/events/006.php
@@ -0,0 +1,7 @@
+<?php
+
+\CodeIgniter\Events\Events::trigger('some_events', $foo, $bar, $baz);
+
+Events::on('some_event', function ($foo, $bar, $baz) {
+    ...
+});
diff --git a/user_guide_src/source/extending/events/007.php b/user_guide_src/source/extending/events/007.php
new file mode 100644
index 000000000000..b6539f2fff55
--- /dev/null
+++ b/user_guide_src/source/extending/events/007.php
@@ -0,0 +1,3 @@
+<?php
+
+Events::simulate(true);
diff --git a/user_guide_src/source/extending/events/008.php b/user_guide_src/source/extending/events/008.php
new file mode 100644
index 000000000000..99e21a64a4c3
--- /dev/null
+++ b/user_guide_src/source/extending/events/008.php
@@ -0,0 +1,3 @@
+<?php
+
+Events::simulate(false);
diff --git a/user_guide_src/source/general/ajax.rst b/user_guide_src/source/general/ajax.rst
index d3fd5945f1ff..ef1424013a2a 100644
--- a/user_guide_src/source/general/ajax.rst
+++ b/user_guide_src/source/general/ajax.rst
@@ -25,7 +25,6 @@ Fetch API
         }
     });
 
-
 jQuery
 ======
 
@@ -38,7 +37,6 @@ For libraries like jQuery for example, it is not necessary to make explicit the
         headers: {'X-Requested-With': 'XMLHttpRequest'}
     });
 
-
 VueJS
 =====
 
@@ -48,7 +46,6 @@ In VueJS you just need to add the following code to the ``created`` function, as
 
     axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
 
-
 React
 =====
 
diff --git a/user_guide_src/source/general/caching.rst b/user_guide_src/source/general/caching.rst
index b3d5e152b879..f11988518ad3 100644
--- a/user_guide_src/source/general/caching.rst
+++ b/user_guide_src/source/general/caching.rst
@@ -34,9 +34,10 @@ Enabling Caching
 ================
 
 To enable caching, put the following tag in any of your controller
-methods::
+methods:
 
-    $this->cachePage($n);
+.. literalinclude:: caching/001.php
+   :lines: 2-
 
 Where ``$n`` is the number of **seconds** you wish the page to remain
 cached between refreshes.
diff --git a/user_guide_src/source/general/caching/001.php b/user_guide_src/source/general/caching/001.php
new file mode 100644
index 000000000000..2b243084add7
--- /dev/null
+++ b/user_guide_src/source/general/caching/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$this->cachePage($n);
diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index 381430023426..5a40fe8dcdda 100755
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -9,7 +9,6 @@ These do not require loading any additional libraries or helpers.
     :local:
     :depth: 2
 
-
 ================
 Global Functions
 ================
@@ -27,10 +26,10 @@ Service Accessors
     is provided, will return the value of $key as stored in the cache currently,
     or null if no value is found.
 
-    Examples::
+    Examples:
 
-        $foo = cache('foo');
-        $cache = cache();
+    .. literalinclude:: common_functions/001.php
+       :lines: 2-
 
 .. php:function:: cookie(string $name[, string $value = ''[, array $options = []]])
 
@@ -119,19 +118,10 @@ Service Accessors
 
     Provides a simple way to access "old input data" from submitting a form.
 
-    Example::
-
-        // in controller, checking form submittal
-        if (! $model->save($user)) {
-            // 'withInput' is what specifies "old data"
-            // should be saved.
-            return redirect()->back()->withInput();
-        }
+    Example:
 
-        // In the view
-        <input type="email" name="email" value="<?= old('email') ?>">
-        // Or with arrays
-        <input type="email" name="user[email]" value="<?= old('user.email') ?>">
+    .. literalinclude:: common_functions/002.php
+       :lines: 2-
 
 .. note:: If you are using the :doc:`form helper </helpers/form_helper>`, this feature is built-in. You only
         need to use this function when not using the form helper.
@@ -155,15 +145,10 @@ Service Accessors
     of a benchmark point as the only parameter. This will start timing from this point, or stop
     timing if a timer with this name is already running.
 
-    Example::
-
-        // Get an instance
-        $timer = timer();
+    Example:
 
-        // Set timer start and stop points
-        timer('controller_loading');    // Will start the timer
-        . . .
-        timer('controller_loading');    // Will stop the running timer
+    .. literalinclude:: common_functions/003.php
+       :lines: 2-
 
 .. php:function:: view ($name [, $data [, $options ]])
 
@@ -187,11 +172,10 @@ Service Accessors
     The ``$option`` array is provided primarily to facilitate third-party integrations with
     libraries like Twig.
 
-    Example::
+    Example:
 
-        $data = ['user' => $user];
-
-        echo view('user_profile', $data);
+    .. literalinclude:: common_functions/004.php
+       :lines: 2-
 
     For more details, see the :doc:`Views </outgoing/views>` page.
 
@@ -319,34 +303,16 @@ Miscellaneous Functions
 
     :param  string  $route: The reverse-routed or named route to redirect the user to.
 
-    Returns a RedirectResponse instance allowing you to easily create redirects::
-
-        // Go back to the previous page
-        return redirect()->back();
-
-        // Go to specific URI
-        return redirect()->to('/admin');
-
-        // Go to a named route
-        return redirect()->route('named_route');
-
-        // Keep the old input values upon redirect so they can be used by the `old()` function
-        return redirect()->back()->withInput();
-
-        // Set a flash message
-        return redirect()->back()->with('foo', 'message');
-
-        // Copies all cookies from global response instance
-        return redirect()->back()->withCookies();
+    Returns a RedirectResponse instance allowing you to easily create redirects:
 
-        // Copies all headers from the global response instance
-        return redirect()->back()->withHeaders();
+    .. literalinclude:: common_functions/005.php
+       :lines: 2-
 
     When passing an argument into the function, it is treated as a named/reverse-routed route, not a relative/full URI,
-    treating it the same as using ``redirect()->route()``::
+    treating it the same as using ``redirect()->route()``:
 
-        // Go to a named/reverse-routed URI
-        return redirect('named_route');
+    .. literalinclude:: common_functions/006.php
+       :lines: 2-
 
 .. php:function:: remove_invisible_characters($str[, $urlEncoded = true])
 
@@ -358,10 +324,10 @@ Miscellaneous Functions
     This function prevents inserting null characters between ASCII
     characters, like Java\\0script.
 
-    Example::
+    Example:
 
-        remove_invisible_characters('Java\\0script');
-        // Returns: 'Javascript'
+    .. literalinclude:: common_functions/007.php
+       :lines: 2-
 
 .. php:function:: route_to ( $method [, ...$params] )
 
@@ -384,10 +350,10 @@ Miscellaneous Functions
     This will always return a shared instance of the class, so no matter how many times this is called
     during a single request, only one class instance will be created.
 
-    Example::
+    Example:
 
-        $logger = service('logger');
-        $renderer = service('renderer', APPPATH.'views/');
+    .. literalinclude:: common_functions/008.php
+       :lines: 2-
 
 .. php:function:: single_service ( $name [, ...$params] )
 
diff --git a/user_guide_src/source/general/common_functions/001.php b/user_guide_src/source/general/common_functions/001.php
new file mode 100644
index 000000000000..f4d4e1521fff
--- /dev/null
+++ b/user_guide_src/source/general/common_functions/001.php
@@ -0,0 +1,4 @@
+<?php
+
+$foo = cache('foo');
+$cache = cache();
diff --git a/user_guide_src/source/general/common_functions/002.php b/user_guide_src/source/general/common_functions/002.php
new file mode 100644
index 000000000000..7ee178f4e741
--- /dev/null
+++ b/user_guide_src/source/general/common_functions/002.php
@@ -0,0 +1,13 @@
+<?php
+
+// in controller, checking form submittal
+if (! $model->save($user)) {
+    // 'withInput' is what specifies "old data"
+    // should be saved.
+    return redirect()->back()->withInput();
+}
+
+// In the view
+<input type="email" name="email" value="<?= old('email') ?>">
+// Or with arrays
+<input type="email" name="user[email]" value="<?= old('user.email') ?>">
diff --git a/user_guide_src/source/general/common_functions/003.php b/user_guide_src/source/general/common_functions/003.php
new file mode 100644
index 000000000000..fd713d756325
--- /dev/null
+++ b/user_guide_src/source/general/common_functions/003.php
@@ -0,0 +1,9 @@
+<?php
+
+// Get an instance
+$timer = timer();
+
+// Set timer start and stop points
+timer('controller_loading');    // Will start the timer
+. . .
+timer('controller_loading');    // Will stop the running timer
diff --git a/user_guide_src/source/general/common_functions/004.php b/user_guide_src/source/general/common_functions/004.php
new file mode 100644
index 000000000000..0864c1d772b6
--- /dev/null
+++ b/user_guide_src/source/general/common_functions/004.php
@@ -0,0 +1,5 @@
+<?php
+
+$data = ['user' => $user];
+
+echo view('user_profile', $data);
diff --git a/user_guide_src/source/general/common_functions/005.php b/user_guide_src/source/general/common_functions/005.php
new file mode 100644
index 000000000000..0b2197de88ed
--- /dev/null
+++ b/user_guide_src/source/general/common_functions/005.php
@@ -0,0 +1,22 @@
+<?php
+
+// Go back to the previous page
+return redirect()->back();
+
+// Go to specific URI
+return redirect()->to('/admin');
+
+// Go to a named route
+return redirect()->route('named_route');
+
+// Keep the old input values upon redirect so they can be used by the `old()` function
+return redirect()->back()->withInput();
+
+// Set a flash message
+return redirect()->back()->with('foo', 'message');
+
+// Copies all cookies from global response instance
+return redirect()->back()->withCookies();
+
+// Copies all headers from the global response instance
+return redirect()->back()->withHeaders();
diff --git a/user_guide_src/source/general/common_functions/006.php b/user_guide_src/source/general/common_functions/006.php
new file mode 100644
index 000000000000..7df72c5dca79
--- /dev/null
+++ b/user_guide_src/source/general/common_functions/006.php
@@ -0,0 +1,4 @@
+<?php
+
+// Go to a named/reverse-routed URI
+return redirect('named_route');
diff --git a/user_guide_src/source/general/common_functions/007.php b/user_guide_src/source/general/common_functions/007.php
new file mode 100644
index 000000000000..7dadef8dcc17
--- /dev/null
+++ b/user_guide_src/source/general/common_functions/007.php
@@ -0,0 +1,4 @@
+<?php
+
+remove_invisible_characters('Java\\0script');
+// Returns: 'Javascript'
diff --git a/user_guide_src/source/general/common_functions/008.php b/user_guide_src/source/general/common_functions/008.php
new file mode 100644
index 000000000000..2b6ea90d2c4f
--- /dev/null
+++ b/user_guide_src/source/general/common_functions/008.php
@@ -0,0 +1,4 @@
+<?php
+
+$logger = service('logger');
+$renderer = service('renderer', APPPATH.'views/');
diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst
index 813f523c7fa2..f72106670629 100644
--- a/user_guide_src/source/general/configuration.rst
+++ b/user_guide_src/source/general/configuration.rst
@@ -20,28 +20,20 @@ Working With Configuration Files
 
 You can access configuration files for your classes in several different ways.
 
-- By using the ``new`` keyword to create an instance::
+- By using the ``new`` keyword to create an instance:
 
-    // Creating new configuration object by hand
-    $config = new \Config\Pager();
+  .. literalinclude:: configuration/001.php
+     :lines: 2-
 
-- By using the ``config()`` function::
+- By using the ``config()`` function:
 
-    // Get shared instance with config function
-    $config = config('Pager');
+  .. literalinclude:: configuration/002.php
+     :lines: 2-
 
-    // Access config class with namespace
-    $config = config('Config\\Pager');
-    $config = config(\Config\Pager::class);
+All configuration object properties are public, so you access the settings like any other property:
 
-    // Creating a new object with config function
-    $config = config('Pager', false);
-
-All configuration object properties are public, so you access the settings like any other property::
-
-    $config = config('Pager');
-    // Access settings as object properties
-    $pageSize = $config->perPage;
+.. literalinclude:: configuration/003.php
+   :lines: 2-
 
 If no namespace is provided, it will look for the file in all defined namespaces
 as well as **/app/Config/**.
@@ -63,20 +55,9 @@ The default file location (recommended for most cases) is **/app/Config**.
 The class should use the appropriate namespace, and it should extend
 ``CodeIgniter\Config\BaseConfig`` to ensure that it can receive environment-specific settings.
 
-Define the class and fill it with public properties that represent your settings.::
-
-    <?php
-
-    namespace Config;
-
-    use CodeIgniter\Config\BaseConfig;
-
-    class CustomClass extends BaseConfig
-    {
-        public $siteName  = 'My Great Site';
-        public $siteEmail = 'webmaster@example.com';
+Define the class and fill it with public properties that represent your settings.:
 
-    }
+.. literalinclude:: configuration/004.php
 
 Environment Variables
 =====================
@@ -110,11 +91,9 @@ When your application runs, **.env** will be loaded automatically, and the varia
 into the environment. If a variable already exists in the environment, it will NOT be
 overwritten. The loaded Environment variables are accessed using any of the following:
 ``getenv()``, ``$_SERVER``, or ``$_ENV``.
-::
 
-    $s3_bucket = getenv('S3_BUCKET');
-    $s3_bucket = $_ENV['S3_BUCKET'];
-    $s3_bucket = $_SERVER['S3_BUCKET'];
+.. literalinclude:: configuration/005.php
+   :lines: 2-
 
 .. warning:: Note that your settings from the **.env** file are added to Environment Variables. As a side effect, this means that if your CodeIgniter application is (for example) generating a ``var_dump($_ENV)`` or ``phpinfo()`` (for debugging or other valid reasons) **your secure credentials are publicly exposed**.
 
@@ -122,7 +101,9 @@ Nesting Variables
 =================
 
 To save on typing, you can reuse variables that you've already specified in the file by wrapping the
-variable name within ``${...}``::
+variable name within ``${...}``:
+
+::
 
     BASE_DIR="/var/webroot/project-root"
     CACHE_DIR="${BASE_DIR}/cache"
@@ -138,6 +119,7 @@ This problem is solved by "*namespacing*" the variables.
 Namespaced variables use a dot notation to qualify variable names so they will be unique
 when incorporated into the environment. This is done by including a distinguishing
 prefix followed by a dot (.), and then the variable name itself.
+
 ::
 
     // not namespaced variables
@@ -163,17 +145,18 @@ property. If it matches an existing configuration property, the environment vari
 value will replace the corresponding value from the configuration file. If there is no match,
 the configuration class properties are left unchanged. In this usage, the prefix must be
 the full (case-sensitive) namespace of the class.
+
 ::
 
     Config\App.forceGlobalSecureRequests = true
     Config\App.CSPEnabled = true
 
-
 .. note:: Both the namespace prefix and the property name are case-sensitive. They must exactly match the full namespace and property names as defined in the configuration class file.
 
 The same holds for a *short prefix*, which is a namespace using only the lowercase version of
 the configuration class name. If the short prefix matches the class name,
 the value from **.env** replaces the configuration file value.
+
 ::
 
     app.forceGlobalSecureRequests = true
@@ -182,6 +165,7 @@ the value from **.env** replaces the configuration file value.
 .. note:: When using the *short prefix* the property names must still exactly match the class defined name.
 
 Some environments do not permit variable name with dots. In such case, you could also use ``_`` as a seperator.
+
 ::
 
     app_forceGlobalSecureRequests = true
@@ -209,6 +193,7 @@ A namespaced environment variable can be further treated as an array.
 If the prefix matches the configuration class, then the remainder of the
 environment variable name is treated as an array reference if it also
 contains a dot.
+
 ::
 
     // regular namespaced variable
@@ -218,22 +203,22 @@ contains a dot.
     Config\SimpleConfig.address.city = "Berlin"
     Config\SimpleConfig.address.country = "Germany"
 
-If this was referring to a SimpleConfig configuration object, the above example would be treated as::
+If this was referring to a SimpleConfig configuration object, the above example would be treated as:
 
-    $address['city']    = "Berlin";
-    $address['country'] = "Germany";
+.. literalinclude:: configuration/006.php
+   :lines: 2-
 
 Any other elements of the ``$address`` property would be unchanged.
 
 You can also use the array property name as a prefix. If the environment file
 held the following then the result would be the same as above.
+
 ::
 
     // array namespaced variables
     Config\SimpleConfig.address.city = "Berlin"
     address.country = "Germany"
 
-
 Handling Different Environments
 ===============================
 
@@ -264,19 +249,10 @@ is enabled in :doc:`Modules </general/modules>`. These files are classes whose m
 named for each configuration class you wish to extend. For example, a third-party module might
 wish to supply an additional template to ``Pager`` without overwriting whatever a develop has
 already configured. In **src/Config/Registrar.php** there would be a ``Registrar`` class with
-the single ``Pager()`` method (note the case-sensitivity)::
-
-    class Registrar
-    {
-        public static function Pager(): array
-        {
-            return [
-                'templates' => [
-                    'module_pager' => 'MyModule\Views\Pager',
-                ],
-            ];
-        }
-    }
+the single ``Pager()`` method (note the case-sensitivity):
+
+.. literalinclude:: configuration/007.php
+   :lines: 2-
 
 Registrar methods must always return an array, with keys corresponding to the properties
 of the target config file. Existing values are merged, and Registrar properties have
@@ -287,11 +263,10 @@ Explicit Registrars
 
 A configuration file can also specify any number of registrars explicitly.
 This is done by adding a ``$registrars`` property to your configuration file,
-holding an array of the names of candidate registrars.::
+holding an array of the names of candidate registrars.:
 
-    public static $registrars = [
-        SupportingPackageRegistrar::class
-    ];
+.. literalinclude:: configuration/008.php
+   :lines: 2-
 
 In order to act as a "registrar" the classes so identified must have a
 static function with the same name as the configuration class, and it should return an associative
@@ -301,43 +276,17 @@ When your configuration object is instantiated, it will loop over the
 designated classes in ``$registrars``. For each of these classes it will invoke
 the method named for the configuration class and incorporate any returned properties.
 
-A sample configuration class setup for this::
-
-    <?php
-
-    namespace App\Config;
-
-    use CodeIgniter\Config\BaseConfig;
-
-    class MySalesConfig extends BaseConfig
-    {
-        public $target            = 100;
-        public $campaign          = "Winter Wonderland";
-        public static $registrars = [
-            '\App\Models\RegionalSales'
-        ];
-    }
-
-... and the associated regional sales model might look like::
+A sample configuration class setup for this:
 
-    <?php
+.. literalinclude:: configuration/009.php
 
-    namespace App\Models;
+... and the associated regional sales model might look like:
 
-    class RegionalSales
-    {
-        public static function MySalesConfig()
-        {
-            return [
-                'target' => 45,
-                'actual' => 72,
-            ];
-        }
-    }
+.. literalinclude:: configuration/010.php
 
 With the above example, when ``MySalesConfig`` is instantiated, it will end up with
 the two properties declared, but the value of the ``$target`` property will be overridden
-by treating ``RegionalSales`` as a "registrar". The resulting configuration properties::
+by treating ``RegionalSales`` as a "registrar". The resulting configuration properties:
 
-    $target   = 45;
-    $campaign = "Winter Wonderland";
+.. literalinclude:: configuration/011.php
+   :lines: 2-
diff --git a/user_guide_src/source/general/configuration/001.php b/user_guide_src/source/general/configuration/001.php
new file mode 100644
index 000000000000..574881308e60
--- /dev/null
+++ b/user_guide_src/source/general/configuration/001.php
@@ -0,0 +1,4 @@
+<?php
+
+// Creating new configuration object by hand
+$config = new \Config\Pager();
diff --git a/user_guide_src/source/general/configuration/002.php b/user_guide_src/source/general/configuration/002.php
new file mode 100644
index 000000000000..7b3a531ac4c7
--- /dev/null
+++ b/user_guide_src/source/general/configuration/002.php
@@ -0,0 +1,11 @@
+<?php
+
+// Get shared instance with config function
+$config = config('Pager');
+
+// Access config class with namespace
+$config = config('Config\\Pager');
+$config = config(\Config\Pager::class);
+
+// Creating a new object with config function
+$config = config('Pager', false);
diff --git a/user_guide_src/source/general/configuration/003.php b/user_guide_src/source/general/configuration/003.php
new file mode 100644
index 000000000000..4a06b6c2763b
--- /dev/null
+++ b/user_guide_src/source/general/configuration/003.php
@@ -0,0 +1,5 @@
+<?php
+
+$config = config('Pager');
+// Access settings as object properties
+$pageSize = $config->perPage;
diff --git a/user_guide_src/source/general/configuration/004.php b/user_guide_src/source/general/configuration/004.php
new file mode 100644
index 000000000000..5d39a34c48b5
--- /dev/null
+++ b/user_guide_src/source/general/configuration/004.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class CustomClass extends BaseConfig
+{
+    public $siteName  = 'My Great Site';
+    public $siteEmail = 'webmaster@example.com';
+
+}
diff --git a/user_guide_src/source/general/configuration/005.php b/user_guide_src/source/general/configuration/005.php
new file mode 100644
index 000000000000..3205fd73f989
--- /dev/null
+++ b/user_guide_src/source/general/configuration/005.php
@@ -0,0 +1,5 @@
+<?php
+
+$s3_bucket = getenv('S3_BUCKET');
+$s3_bucket = $_ENV['S3_BUCKET'];
+$s3_bucket = $_SERVER['S3_BUCKET'];
diff --git a/user_guide_src/source/general/configuration/006.php b/user_guide_src/source/general/configuration/006.php
new file mode 100644
index 000000000000..e260cb6dc30d
--- /dev/null
+++ b/user_guide_src/source/general/configuration/006.php
@@ -0,0 +1,4 @@
+<?php
+
+$address['city']    = "Berlin";
+$address['country'] = "Germany";
diff --git a/user_guide_src/source/general/configuration/007.php b/user_guide_src/source/general/configuration/007.php
new file mode 100644
index 000000000000..3a77c1ca5aa6
--- /dev/null
+++ b/user_guide_src/source/general/configuration/007.php
@@ -0,0 +1,13 @@
+<?php
+
+class Registrar
+{
+    public static function Pager(): array
+    {
+        return [
+            'templates' => [
+                'module_pager' => 'MyModule\Views\Pager',
+            ],
+        ];
+    }
+}
diff --git a/user_guide_src/source/general/configuration/008.php b/user_guide_src/source/general/configuration/008.php
new file mode 100644
index 000000000000..54072ca22fba
--- /dev/null
+++ b/user_guide_src/source/general/configuration/008.php
@@ -0,0 +1,5 @@
+<?php
+
+public static $registrars = [
+    SupportingPackageRegistrar::class
+];
diff --git a/user_guide_src/source/general/configuration/009.php b/user_guide_src/source/general/configuration/009.php
new file mode 100644
index 000000000000..5b1cb6e22b91
--- /dev/null
+++ b/user_guide_src/source/general/configuration/009.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class MySalesConfig extends BaseConfig
+{
+    public $target            = 100;
+    public $campaign          = "Winter Wonderland";
+    public static $registrars = [
+        '\App\Models\RegionalSales'
+    ];
+}
diff --git a/user_guide_src/source/general/configuration/010.php b/user_guide_src/source/general/configuration/010.php
new file mode 100644
index 000000000000..103b3c6c952b
--- /dev/null
+++ b/user_guide_src/source/general/configuration/010.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Models;
+
+class RegionalSales
+{
+    public static function MySalesConfig()
+    {
+        return [
+            'target' => 45,
+            'actual' => 72,
+        ];
+    }
+}
diff --git a/user_guide_src/source/general/configuration/011.php b/user_guide_src/source/general/configuration/011.php
new file mode 100644
index 000000000000..88a419140123
--- /dev/null
+++ b/user_guide_src/source/general/configuration/011.php
@@ -0,0 +1,4 @@
+<?php
+
+$target   = 45;
+$campaign = "Winter Wonderland";
diff --git a/user_guide_src/source/general/environments.rst b/user_guide_src/source/general/environments.rst
index ae9c877c81fd..49ec2d6ed788 100644
--- a/user_guide_src/source/general/environments.rst
+++ b/user_guide_src/source/general/environments.rst
@@ -102,4 +102,3 @@ all PHP errors to be rendered to the browser when they occur.
 Conversely, setting the constant to ``production`` will disable all error
 output. Disabling error reporting in production is a
 :doc:`good security practice </concepts/security>`.
-
diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst
index 921b1130ecf5..bbe83c39cd42 100644
--- a/user_guide_src/source/general/errors.rst
+++ b/user_guide_src/source/general/errors.rst
@@ -18,37 +18,31 @@ Using Exceptions
 This section is a quick overview for newer programmers, or for developers who are not experienced with using exceptions.
 
 Exceptions are simply events that happen when the exception is "thrown". This halts the current flow of the script, and
-execution is then sent to the error handler which displays the appropriate error page::
+execution is then sent to the error handler which displays the appropriate error page:
 
-    throw new \Exception("Some message goes here");
+.. literalinclude:: errors/001.php
+   :lines: 2-
 
-If you are calling a method that might throw an exception, you can catch that exception using a ``try/catch`` block::
+If you are calling a method that might throw an exception, you can catch that exception using a ``try/catch`` block:
 
-    try {
-        $user = $userModel->find($id);
-    } catch (\Exception $e) {
-        die($e->getMessage());
-    }
+.. literalinclude:: errors/002.php
+   :lines: 2-
 
 If the ``$userModel`` throws an exception, it is caught and the code within the catch block is executed. In this example,
 the scripts dies, echoing the error message that the ``UserModel`` defined.
 
 In the example above, we catch any type of Exception. If we only want to watch for specific types of exceptions, like
 a ``UnknownFileException``, we can specify that in the catch parameter. Any other exceptions that are thrown and are
-not child classes of the caught exception will be passed on to the error handler::
+not child classes of the caught exception will be passed on to the error handler:
 
-    catch (\CodeIgniter\UnknownFileException $e) {
-        // do something here...
-    }
+.. literalinclude:: errors/003.php
+   :lines: 2-
 
 This can be handy for handling the error yourself, or for performing cleanup before the script ends. If you want
-the error handler to function as normal, you can throw a new exception within the catch block::
+the error handler to function as normal, you can throw a new exception within the catch block:
 
-    catch (\CodeIgniter\UnknownFileException $e) {
-        // do something here...
-
-        throw new \RuntimeException($e->getMessage(), $e->getCode(), $e);
-    }
+.. literalinclude:: errors/004.php
+   :lines: 2-
 
 Configuration
 =============
@@ -63,19 +57,15 @@ Logging Exceptions
 ------------------
 
 By default, all Exceptions other than 404 - Page Not Found exceptions are logged. This can be turned on and off
-by setting the ``$log`` value of **app/Config/Exceptions.php**::
+by setting the ``$log`` value of **app/Config/Exceptions.php**:
 
-    class Exceptions extends BaseConfig
-    {
-        public $log = true;
-    }
+.. literalinclude:: errors/005.php
+   :lines: 2-
 
-To ignore logging on other status codes, you can set the status code to ignore in the same file::
+To ignore logging on other status codes, you can set the status code to ignore in the same file:
 
-    class Exceptions extends BaseConfig
-    {
-        public $ignoredCodes = [ 404 ];
-    }
+.. literalinclude:: errors/006.php
+   :lines: 2-
 
 .. note:: It is possible that logging still will not happen for exceptions if your current Log settings
     are not set up to log **critical** errors, which all exceptions are logged as.
@@ -91,11 +81,10 @@ PageNotFoundException
 This is used to signal a 404, Page Not Found error. When thrown, the system will show the view found at
 **app/Views/errors/html/error_404.php**. You should customize all of the error views for your site.
 If, in **app/Config/Routes.php**, you have specified a 404 Override, that will be called instead of the standard
-404 page::
+404 page:
 
-    if (! $page = $pageModel->find($id)) {
-        throw \CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound();
-    }
+.. literalinclude:: errors/007.php
+   :lines: 2-
 
 You can pass a message into the exception that will be displayed in place of the default message on the 404 page.
 
@@ -103,9 +92,10 @@ ConfigException
 ---------------
 
 This exception should be used when the values from the configuration class are invalid, or when the config class
-is not the right type, etc::
+is not the right type, etc:
 
-    throw new \CodeIgniter\Exceptions\ConfigException();
+.. literalinclude:: errors/008.php
+   :lines: 2-
 
 This provides an HTTP status code of 500 and an exit code of 3.
 
@@ -113,9 +103,10 @@ DatabaseException
 -----------------
 
 This exception is thrown for database errors, such as when the database connection cannot be created,
-or when it is temporarily lost::
+or when it is temporarily lost:
 
-    throw new \CodeIgniter\Database\Exceptions\DatabaseException();
+.. literalinclude:: errors/009.php
+   :lines: 2-
 
 This provides an HTTP status code of 500 and an exit code of 8.
 
@@ -123,11 +114,13 @@ RedirectException
 -----------------
 
 This exception is a special case allowing for overriding of all other response routing and
-forcing a redirect to a specific route or URL::
+forcing a redirect to a specific route or URL:
 
-    throw new \CodeIgniter\Router\Exceptions\RedirectException($route);
+.. literalinclude:: errors/010.php
+   :lines: 2-
 
 ``$route`` may be a named route, relative URI, or a complete URL. You can also supply a
-redirect code to use instead of the default (``302``, "temporary redirect")::
+redirect code to use instead of the default (``302``, "temporary redirect"):
 
-    throw new \CodeIgniter\Router\Exceptions\RedirectException($route, 301);
+.. literalinclude:: errors/011.php
+   :lines: 2-
diff --git a/user_guide_src/source/general/errors/001.php b/user_guide_src/source/general/errors/001.php
new file mode 100644
index 000000000000..b994b1b63f3e
--- /dev/null
+++ b/user_guide_src/source/general/errors/001.php
@@ -0,0 +1,3 @@
+<?php
+
+throw new \Exception("Some message goes here");
diff --git a/user_guide_src/source/general/errors/002.php b/user_guide_src/source/general/errors/002.php
new file mode 100644
index 000000000000..f8991487795d
--- /dev/null
+++ b/user_guide_src/source/general/errors/002.php
@@ -0,0 +1,7 @@
+<?php
+
+try {
+    $user = $userModel->find($id);
+} catch (\Exception $e) {
+    die($e->getMessage());
+}
diff --git a/user_guide_src/source/general/errors/003.php b/user_guide_src/source/general/errors/003.php
new file mode 100644
index 000000000000..e93d32ed37d5
--- /dev/null
+++ b/user_guide_src/source/general/errors/003.php
@@ -0,0 +1,5 @@
+<?php
+
+catch (\CodeIgniter\UnknownFileException $e) {
+    // do something here...
+}
diff --git a/user_guide_src/source/general/errors/004.php b/user_guide_src/source/general/errors/004.php
new file mode 100644
index 000000000000..06a972cfc4d8
--- /dev/null
+++ b/user_guide_src/source/general/errors/004.php
@@ -0,0 +1,7 @@
+<?php
+
+catch (\CodeIgniter\UnknownFileException $e) {
+    // do something here...
+
+    throw new \RuntimeException($e->getMessage(), $e->getCode(), $e);
+}
diff --git a/user_guide_src/source/general/errors/005.php b/user_guide_src/source/general/errors/005.php
new file mode 100644
index 000000000000..463d1460ba8e
--- /dev/null
+++ b/user_guide_src/source/general/errors/005.php
@@ -0,0 +1,6 @@
+<?php
+
+class Exceptions extends BaseConfig
+{
+    public $log = true;
+}
diff --git a/user_guide_src/source/general/errors/006.php b/user_guide_src/source/general/errors/006.php
new file mode 100644
index 000000000000..e661df24cbf6
--- /dev/null
+++ b/user_guide_src/source/general/errors/006.php
@@ -0,0 +1,6 @@
+<?php
+
+class Exceptions extends BaseConfig
+{
+    public $ignoredCodes = [ 404 ];
+}
diff --git a/user_guide_src/source/general/errors/007.php b/user_guide_src/source/general/errors/007.php
new file mode 100644
index 000000000000..a06e5000737a
--- /dev/null
+++ b/user_guide_src/source/general/errors/007.php
@@ -0,0 +1,5 @@
+<?php
+
+if (! $page = $pageModel->find($id)) {
+    throw \CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound();
+}
diff --git a/user_guide_src/source/general/errors/008.php b/user_guide_src/source/general/errors/008.php
new file mode 100644
index 000000000000..5e39b61fdcd6
--- /dev/null
+++ b/user_guide_src/source/general/errors/008.php
@@ -0,0 +1,3 @@
+<?php
+
+throw new \CodeIgniter\Exceptions\ConfigException();
diff --git a/user_guide_src/source/general/errors/009.php b/user_guide_src/source/general/errors/009.php
new file mode 100644
index 000000000000..98b72a493f38
--- /dev/null
+++ b/user_guide_src/source/general/errors/009.php
@@ -0,0 +1,3 @@
+<?php
+
+throw new \CodeIgniter\Database\Exceptions\DatabaseException();
diff --git a/user_guide_src/source/general/errors/010.php b/user_guide_src/source/general/errors/010.php
new file mode 100644
index 000000000000..ff9cfee974ef
--- /dev/null
+++ b/user_guide_src/source/general/errors/010.php
@@ -0,0 +1,3 @@
+<?php
+
+throw new \CodeIgniter\Router\Exceptions\RedirectException($route);
diff --git a/user_guide_src/source/general/errors/011.php b/user_guide_src/source/general/errors/011.php
new file mode 100644
index 000000000000..83c868e26946
--- /dev/null
+++ b/user_guide_src/source/general/errors/011.php
@@ -0,0 +1,3 @@
+<?php
+
+throw new \CodeIgniter\Router\Exceptions\RedirectException($route, 301);
diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst
index c454bee36180..5cfae58cfd40 100644
--- a/user_guide_src/source/general/helpers.rst
+++ b/user_guide_src/source/general/helpers.rst
@@ -32,22 +32,25 @@ global **system/Helpers** directory.
 Loading a Helper
 ================
 
-Loading a helper file is quite simple using the following method::
+Loading a helper file is quite simple using the following method:
 
-    helper('name');
+.. literalinclude:: helpers/001.php
+   :lines: 2-
 
 Where ``name`` is the file name of the helper, without the "**.php**" file
 extension or the "**_helper**" part.
 
 For example, to load the **Cookie Helper** file, which is named
-**cookie_helper.php**, you would do this::
+**cookie_helper.php**, you would do this:
 
-    helper('cookie');
+.. literalinclude:: helpers/002.php
+   :lines: 2-
 
 If you need to load more than one helper at a time, you can pass
-an array of file names in and all of them will be loaded::
+an array of file names in and all of them will be loaded:
 
-    helper(['cookie', 'date']);
+.. literalinclude:: helpers/003.php
+   :lines: 2-
 
 A helper can be loaded anywhere within your controller methods (or
 even within your View files, although that's not a good practice), as
@@ -76,9 +79,10 @@ code into its own namespace, ``Example\Blog``. The files exist on our server at
 **/Modules/Blog/**. So, we would put our Helper files for the blog module in
 **/Modules/Blog/Helpers/**. A **blog_helper** file would be at
 **/Modules/Blog/Helpers/blog_helper.php**. Within our controller we could
-use the following command to load the helper for us::
+use the following command to load the helper for us:
 
-    helper('Example\Blog\blog');
+.. literalinclude:: helpers/004.php
+   :lines: 2-
 
 .. note:: The functions within files loaded this way are not truly namespaced.
     The namespace is simply used as a convenient way to locate the files.
@@ -90,9 +94,9 @@ Once you've loaded the Helper File containing the function you intend to
 use, you'll call it the way you would a standard PHP function.
 
 For example, to create a link using the ``anchor()`` function in one of
-your view files you would do this::
+your view files you would do this:
 
-    <?= anchor('blog/comments', 'Click Here') ?>
+.. literalinclude:: helpers/005.php
 
 Where ``Click Here`` is the name of the link, and ``blog/comments`` is the
 URI to the controller/method you wish to link to.
@@ -115,29 +119,10 @@ your version. In this case, it's better to simply "extend" the Helper.
 
 For example, to extend the native **Array Helper** you'll create a file
 named **app/Helpers/array_helper.php**, and add or override
-functions::
+functions:
 
-    // any_in_array() is not in the Array Helper, so it defines a new function
-    function any_in_array($needle, $haystack)
-    {
-        $needle = is_array($needle) ? $needle : [$needle];
-
-        foreach ($needle as $item) {
-            if (in_array($item, $haystack, true)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    // random_element() is included in Array Helper, so it overrides the native function
-    function random_element($array)
-    {
-        shuffle($array);
-
-        return array_pop($array);
-    }
+.. literalinclude:: helpers/006.php
+   :lines: 2-
 
 The ``helper()`` method will scan through all PSR-4 namespaces defined in **app/Config/Autoload.php**
 and load in ALL matching helpers of the same name. This allows any module's helpers
diff --git a/user_guide_src/source/general/helpers/001.php b/user_guide_src/source/general/helpers/001.php
new file mode 100644
index 000000000000..8e4628fd5685
--- /dev/null
+++ b/user_guide_src/source/general/helpers/001.php
@@ -0,0 +1,3 @@
+<?php
+
+helper('name');
diff --git a/user_guide_src/source/general/helpers/002.php b/user_guide_src/source/general/helpers/002.php
new file mode 100644
index 000000000000..b14d063e9be0
--- /dev/null
+++ b/user_guide_src/source/general/helpers/002.php
@@ -0,0 +1,3 @@
+<?php
+
+helper('cookie');
diff --git a/user_guide_src/source/general/helpers/003.php b/user_guide_src/source/general/helpers/003.php
new file mode 100644
index 000000000000..07f250ebe95c
--- /dev/null
+++ b/user_guide_src/source/general/helpers/003.php
@@ -0,0 +1,3 @@
+<?php
+
+helper(['cookie', 'date']);
diff --git a/user_guide_src/source/general/helpers/004.php b/user_guide_src/source/general/helpers/004.php
new file mode 100644
index 000000000000..032d4a8f20cf
--- /dev/null
+++ b/user_guide_src/source/general/helpers/004.php
@@ -0,0 +1,3 @@
+<?php
+
+helper('Example\Blog\blog');
diff --git a/user_guide_src/source/general/helpers/005.php b/user_guide_src/source/general/helpers/005.php
new file mode 100644
index 000000000000..8d58b073035b
--- /dev/null
+++ b/user_guide_src/source/general/helpers/005.php
@@ -0,0 +1 @@
+<?= anchor('blog/comments', 'Click Here') ?>
diff --git a/user_guide_src/source/general/helpers/006.php b/user_guide_src/source/general/helpers/006.php
new file mode 100644
index 000000000000..38711967b075
--- /dev/null
+++ b/user_guide_src/source/general/helpers/006.php
@@ -0,0 +1,23 @@
+<?php
+
+// any_in_array() is not in the Array Helper, so it defines a new function
+function any_in_array($needle, $haystack)
+{
+    $needle = is_array($needle) ? $needle : [$needle];
+
+    foreach ($needle as $item) {
+        if (in_array($item, $haystack, true)) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+// random_element() is included in Array Helper, so it overrides the native function
+function random_element($array)
+{
+    shuffle($array);
+
+    return array_pop($array);
+}
diff --git a/user_guide_src/source/general/logging.rst b/user_guide_src/source/general/logging.rst
index 08e60d60988c..1622920313de 100644
--- a/user_guide_src/source/general/logging.rst
+++ b/user_guide_src/source/general/logging.rst
@@ -8,11 +8,10 @@ Logging Information
 
 You can log information to the local log files by using the ``log_message()`` method. You must supply
 the "level" of the error in the first parameter, indicating what type of message it is (debug, error, etc).
-The second parameter is the message itself::
+The second parameter is the message itself:
 
-    if ($some_var === '') {
-        log_message('error', 'Some variable did not contain a value.');
-    }
+.. literalinclude:: logging/001.php
+   :lines: 2-
 
 There are eight different log levels, matching to the `RFC 5424 <https://tools.ietf.org/html/rfc5424>`_ levels, and they are as follows:
 
@@ -45,17 +44,18 @@ are requested to be logged by the application, but the threshold doesn't allow t
 ignored. The simplest method to use is to set this value to the minimum level that you want to have logged. For example,
 if you want to log warning messages, and not information messages, you would set the threshold to ``5``. Any log requests with
 a level of 5 or less (which includes runtime errors, system errors, etc) would be logged and info, notices, and debug
-would be ignored::
+would be ignored:
 
-    public $threshold = 5;
+.. literalinclude:: logging/002.php
+   :lines: 2-
 
 A complete list of levels and their corresponding threshold value is in the configuration file for your reference.
 
 You can pick and choose the specific levels that you would like logged by assigning an array of log level numbers
-to the threshold value::
+to the threshold value:
 
-    // Log only debug and info type messages
-    public $threshold = [5, 8];
+.. literalinclude:: logging/003.php
+   :lines: 2-
 
 Using Multiple Log Handlers
 ---------------------------
@@ -76,14 +76,9 @@ an array of handlers and their configuration. Each handler is specified with the
 name-spaced class name. The value will be an array of varying properties, specific to each handler.
 Each handler's section will have one property in common: ``handles``, which is an array of log level
 *names* that the handler will log information for.
-::
 
-    public $handlers = [
-        // File Handler
-        'CodeIgniter\Log\Handlers\FileHandler' => [
-            'handles' => ['critical', 'alert', 'emergency', 'debug', 'error', 'info', 'notice', 'warning'],
-        ]
-    ];
+.. literalinclude:: logging/004.php
+   :lines: 2-
 
 Modifying the Message With Context
 ==================================
@@ -92,25 +87,17 @@ You will often want to modify the details of your message based on the context o
 You might need to log a user id, an IP address, the current POST variables, etc. You can do this by use
 placeholders in your message. Each placeholder must be wrapped in curly braces. In the third parameter,
 you must provide an array of placeholder names (without the braces) and their values. These will be inserted
-into the message string::
+into the message string:
 
-    // Generates a message like: User 123 logged into the system from 127.0.0.1
-    $info = [
-        'id' => $user->id,
-        'ip_address' => $this->request->getIPAddress()
-    ];
-
-    log_message('info', 'User {id} logged into the system from {ip_address}', $info);
+.. literalinclude:: logging/005.php
+   :lines: 2-
 
 If you want to log an Exception or an Error, you can use the key of 'exception', and the value being the
 Exception or Error itself. A string will be generated from that object containing the error message, the
-file name and line number. You must still provide the exception placeholder in the message::
+file name and line number. You must still provide the exception placeholder in the message:
 
-    try {
-        // Something throws error here
-    } catch (\Exception $e) {
-        log_message('error', '[ERROR] {exception}', ['exception' => $e]);
-    }
+.. literalinclude:: logging/006.php
+   :lines: 2-
 
 Several core placeholders exist that will be automatically expanded for you based on the current page request:
 
diff --git a/user_guide_src/source/general/logging/001.php b/user_guide_src/source/general/logging/001.php
new file mode 100644
index 000000000000..fc3a67668025
--- /dev/null
+++ b/user_guide_src/source/general/logging/001.php
@@ -0,0 +1,5 @@
+<?php
+
+if ($some_var === '') {
+    log_message('error', 'Some variable did not contain a value.');
+}
diff --git a/user_guide_src/source/general/logging/002.php b/user_guide_src/source/general/logging/002.php
new file mode 100644
index 000000000000..bf08b8722b63
--- /dev/null
+++ b/user_guide_src/source/general/logging/002.php
@@ -0,0 +1,3 @@
+<?php
+
+public $threshold = 5;
diff --git a/user_guide_src/source/general/logging/003.php b/user_guide_src/source/general/logging/003.php
new file mode 100644
index 000000000000..54e0da7ee48c
--- /dev/null
+++ b/user_guide_src/source/general/logging/003.php
@@ -0,0 +1,4 @@
+<?php
+
+// Log only debug and info type messages
+public $threshold = [5, 8];
diff --git a/user_guide_src/source/general/logging/004.php b/user_guide_src/source/general/logging/004.php
new file mode 100644
index 000000000000..7e135b87915d
--- /dev/null
+++ b/user_guide_src/source/general/logging/004.php
@@ -0,0 +1,8 @@
+<?php
+
+public $handlers = [
+    // File Handler
+    'CodeIgniter\Log\Handlers\FileHandler' => [
+        'handles' => ['critical', 'alert', 'emergency', 'debug', 'error', 'info', 'notice', 'warning'],
+    ]
+];
diff --git a/user_guide_src/source/general/logging/005.php b/user_guide_src/source/general/logging/005.php
new file mode 100644
index 000000000000..5f4a43915a26
--- /dev/null
+++ b/user_guide_src/source/general/logging/005.php
@@ -0,0 +1,9 @@
+<?php
+
+// Generates a message like: User 123 logged into the system from 127.0.0.1
+$info = [
+    'id' => $user->id,
+    'ip_address' => $this->request->getIPAddress()
+];
+
+log_message('info', 'User {id} logged into the system from {ip_address}', $info);
diff --git a/user_guide_src/source/general/logging/006.php b/user_guide_src/source/general/logging/006.php
new file mode 100644
index 000000000000..7186f9761f6e
--- /dev/null
+++ b/user_guide_src/source/general/logging/006.php
@@ -0,0 +1,7 @@
+<?php
+
+try {
+    // Something throws error here
+} catch (\Exception $e) {
+    log_message('error', '[ERROR] {exception}', ['exception' => $e]);
+}
diff --git a/user_guide_src/source/general/managing_apps.rst b/user_guide_src/source/general/managing_apps.rst
index 8b82a697698c..7bef3620cb40 100644
--- a/user_guide_src/source/general/managing_apps.rst
+++ b/user_guide_src/source/general/managing_apps.rst
@@ -18,25 +18,24 @@ Renaming or Relocating the Application Directory
 If you would like to rename your application directory or even move
 it to a different location on your server, other than your project root, open
 your main **app/Config/Paths.php** and set a *full server path* in the
-``$appDirectory`` variable (at about line 44)::
+``$appDirectory`` variable (at about line 44):
 
-    public $appDirectory = '/path/to/your/app';
+.. literalinclude:: managing_apps/001.php
+   :lines: 2-
 
 You will need to modify two additional files in your project root, so that
 they can find the **Paths** configuration file:
 
-- **/spark** runs command line apps; the path is specified on or about line 35::
-
-    $pathsConfig = 'app/Config/Paths.php';
-    // ^^^ Change this line if you move your application folder
+- **/spark** runs command line apps; the path is specified on or about line 35:
 
+  .. literalinclude:: managing_apps/002.php
+     :lines: 2-
 
 - **/public/index.php** is the front controller for your webapp; the config
-  path is specified on or about line 20::
-
-    $pathsConfig = FCPATH . '../app/Config/Paths.php';
-    // ^^^ Change this if you move your application folder
+  path is specified on or about line 20:
 
+  .. literalinclude:: managing_apps/003.php
+     :lines: 2-
 
 Running Multiple Applications with one CodeIgniter Installation
 ===============================================================
@@ -76,6 +75,7 @@ If either of the applications had a command-line component, then you would also
 modify **spark** inside each application's project folder, as directed above.
 
 When you use Composer autoloader, fix the ``COMPOSER_PATH`` constant in **app/Config/Constants.php** inside each
-of those::
+of those:
 
-    defined('COMPOSER_PATH') || define('COMPOSER_PATH', ROOTPATH . '../vendor/autoload.php');
+.. literalinclude:: managing_apps/004.php
+   :lines: 2-
diff --git a/user_guide_src/source/general/managing_apps/001.php b/user_guide_src/source/general/managing_apps/001.php
new file mode 100644
index 000000000000..27deaaf4b994
--- /dev/null
+++ b/user_guide_src/source/general/managing_apps/001.php
@@ -0,0 +1,3 @@
+<?php
+
+public $appDirectory = '/path/to/your/app';
diff --git a/user_guide_src/source/general/managing_apps/002.php b/user_guide_src/source/general/managing_apps/002.php
new file mode 100644
index 000000000000..f44809350aaf
--- /dev/null
+++ b/user_guide_src/source/general/managing_apps/002.php
@@ -0,0 +1,4 @@
+<?php
+
+$pathsConfig = 'app/Config/Paths.php';
+// ^^^ Change this line if you move your application folder
diff --git a/user_guide_src/source/general/managing_apps/003.php b/user_guide_src/source/general/managing_apps/003.php
new file mode 100644
index 000000000000..fec44c48b42b
--- /dev/null
+++ b/user_guide_src/source/general/managing_apps/003.php
@@ -0,0 +1,4 @@
+<?php
+
+$pathsConfig = FCPATH . '../app/Config/Paths.php';
+// ^^^ Change this if you move your application folder
diff --git a/user_guide_src/source/general/managing_apps/004.php b/user_guide_src/source/general/managing_apps/004.php
new file mode 100644
index 000000000000..8d030d4a3412
--- /dev/null
+++ b/user_guide_src/source/general/managing_apps/004.php
@@ -0,0 +1,3 @@
+<?php
+
+defined('COMPOSER_PATH') || define('COMPOSER_PATH', ROOTPATH . '../vendor/autoload.php');
diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst
index 15a4040f020a..b319c551e06d 100644
--- a/user_guide_src/source/general/modules.rst
+++ b/user_guide_src/source/general/modules.rst
@@ -30,13 +30,10 @@ directory in the main project root::
     /tests
     /writable
 
-Open **app/Config/Autoload.php** and add the **Acme** namespace to the ``psr4`` array property::
+Open **app/Config/Autoload.php** and add the **Acme** namespace to the ``psr4`` array property:
 
-    public $psr4 = [
-        APP_NAMESPACE => APPPATH, // For custom namespace
-        'Config'      => APPPATH . 'Config',
-        'Acme'        => ROOTPATH . 'acme',
-    ];
+.. literalinclude:: modules/001.php
+   :lines: 2-
 
 Now that this is set up, we can access any file within the **acme** folder through the ``Acme`` namespace. This alone
 takes care of 80% of what is needed for modules to work, so you should be sure to familiarize yourself with namespaces
@@ -75,13 +72,8 @@ Another approach provided by CodeIgniter is to autoload these *non-class* files
 your classes. All we need to do is provide the list of paths to those files and include them in the
 ``$files`` property of your **app/Config/Autoload.php** file.
 
-::
-
-    public $files = [
-        'path/to/my/functions.php',
-        'path/to/my/constants.php',
-        'path/to/my/bootstrap.php',
-    ];
+.. literalinclude:: modules/002.php
+   :lines: 2-
 
 ==============
 Auto-Discovery
@@ -103,13 +95,8 @@ The auto-discovery system works by scanning for particular directories and files
 To make auto-discovery work for our **Blog** namespace, we need to make one small adjustment.
 **Acme** needs to be changed to **Acme\\Blog** because each "module" within the namespace needs to be fully defined.
 
-::
-
-    public $psr4 = [
-        APP_NAMESPACE => APPPATH, // For custom namespace
-        'Config'      => APPPATH . 'Config',
-        'Acme\Blog'   => ROOTPATH . 'acme/Blog', // Change
-    ];
+.. literalinclude:: modules/003.php
+   :lines: 2-
 
 Once your module folder path is defined, the discovery process would look for discoverable items on that path and should, for example, find the routes file at **/acme/Blog/Config/Routes.php**.
 
@@ -132,9 +119,10 @@ Packages installed via Composer using PSR-4 namespaces will also be discovered b
 PSR-0 namespaced packages will not be detected.
 
 If you do not want all of Composer's known directories to be scanned when locating files, you can turn this off
-by editing the ``$discoverInComposer`` variable in ``Config\Modules.php``::
+by editing the ``$discoverInComposer`` variable in ``Config\Modules.php``:
 
-    public $discoverInComposer = false;
+.. literalinclude:: modules/004.php
+   :lines: 2-
 
 ==================
 Working With Files
@@ -165,32 +153,33 @@ It can be turned off in the **Modules** config file, described above.
 .. note:: Since the files are being included into the current scope, the ``$filters`` instance is already defined for you.
     It will cause errors if you attempt to redefine that class.
 
-In the module's **Config/Filters.php** file, you need to define the aliases of the filters you use.::
+In the module's **Config/Filters.php** file, you need to define the aliases of the filters you use.:
 
-    $filters->aliases['menus'] = MenusFilter::class;
+.. literalinclude:: modules/005.php
+   :lines: 2-
 
 Controllers
 ===========
 
 Controllers outside of the main **app/Controllers** directory cannot be automatically routed by URI detection,
-but must be specified within the Routes file itself::
+but must be specified within the Routes file itself:
 
-    // Routes.php
-    $routes->get('blog', 'Acme\Blog\Controllers\Blog::index');
+.. literalinclude:: modules/006.php
+   :lines: 2-
 
-To reduce the amount of typing needed here, the **group** routing feature is helpful::
+To reduce the amount of typing needed here, the **group** routing feature is helpful:
 
-    $routes->group('blog', ['namespace' => 'Acme\Blog\Controllers'], function ($routes) {
-        $routes->get('/', 'Blog::index');
-    });
+.. literalinclude:: modules/007.php
+   :lines: 2-
 
 Config Files
 ============
 
 No special change is needed when working with configuration files. These are still namespaced classes and loaded
-with the ``new`` command::
+with the ``new`` command:
 
-    $config = new \Acme\Blog\Config\Blog();
+.. literalinclude:: modules/008.php
+   :lines: 2-
 
 Config files are automatically discovered whenever using the **config()** function that is always available.
 
@@ -219,9 +208,10 @@ Helpers
 =======
 
 Helpers will be located automatically from defined namespaces when using the ``helper()`` method, as long as it
-is within the namespaces **Helpers** directory::
+is within the namespaces **Helpers** directory:
 
-    helper('blog');
+.. literalinclude:: modules/009.php
+   :lines: 2-
 
 Language Files
 ==============
@@ -232,20 +222,23 @@ file follows the same directory structures as the main application directory.
 Libraries
 =========
 
-Libraries are always instantiated by their fully-qualified class name, so no special access is provided::
+Libraries are always instantiated by their fully-qualified class name, so no special access is provided:
 
-    $lib = new \Acme\Blog\Libraries\BlogLib();
+.. literalinclude:: modules/010.php
+   :lines: 2-
 
 Models
 ======
 
-Models are always instantiated by their fully-qualified class name, so no special access is provided::
+Models are always instantiated by their fully-qualified class name, so no special access is provided:
 
-    $model = new \Acme\Blog\Models\PostModel();
+.. literalinclude:: modules/011.php
+   :lines: 2-
 
 Views
 =====
 
-Views can be loaded using the class namespace as described in the :doc:`views </outgoing/views>` documentation::
+Views can be loaded using the class namespace as described in the :doc:`views </outgoing/views>` documentation:
 
-    echo view('Acme\Blog\Views\index');
+.. literalinclude:: modules/012.php
+   :lines: 2-
diff --git a/user_guide_src/source/general/modules/001.php b/user_guide_src/source/general/modules/001.php
new file mode 100644
index 000000000000..a70a5a28c026
--- /dev/null
+++ b/user_guide_src/source/general/modules/001.php
@@ -0,0 +1,7 @@
+<?php
+
+public $psr4 = [
+    APP_NAMESPACE => APPPATH, // For custom namespace
+    'Config'      => APPPATH . 'Config',
+    'Acme'        => ROOTPATH . 'acme',
+];
diff --git a/user_guide_src/source/general/modules/002.php b/user_guide_src/source/general/modules/002.php
new file mode 100644
index 000000000000..7cab63838ec5
--- /dev/null
+++ b/user_guide_src/source/general/modules/002.php
@@ -0,0 +1,7 @@
+<?php
+
+public $files = [
+    'path/to/my/functions.php',
+    'path/to/my/constants.php',
+    'path/to/my/bootstrap.php',
+];
diff --git a/user_guide_src/source/general/modules/003.php b/user_guide_src/source/general/modules/003.php
new file mode 100644
index 000000000000..b9c5f592a01b
--- /dev/null
+++ b/user_guide_src/source/general/modules/003.php
@@ -0,0 +1,7 @@
+<?php
+
+public $psr4 = [
+    APP_NAMESPACE => APPPATH, // For custom namespace
+    'Config'      => APPPATH . 'Config',
+    'Acme\Blog'   => ROOTPATH . 'acme/Blog', // Change
+];
diff --git a/user_guide_src/source/general/modules/004.php b/user_guide_src/source/general/modules/004.php
new file mode 100644
index 000000000000..56804cc2e579
--- /dev/null
+++ b/user_guide_src/source/general/modules/004.php
@@ -0,0 +1,3 @@
+<?php
+
+public $discoverInComposer = false;
diff --git a/user_guide_src/source/general/modules/005.php b/user_guide_src/source/general/modules/005.php
new file mode 100644
index 000000000000..ff0ae7b9ead4
--- /dev/null
+++ b/user_guide_src/source/general/modules/005.php
@@ -0,0 +1,3 @@
+<?php
+
+$filters->aliases['menus'] = MenusFilter::class;
diff --git a/user_guide_src/source/general/modules/006.php b/user_guide_src/source/general/modules/006.php
new file mode 100644
index 000000000000..663705d523a6
--- /dev/null
+++ b/user_guide_src/source/general/modules/006.php
@@ -0,0 +1,4 @@
+<?php
+
+// Routes.php
+$routes->get('blog', 'Acme\Blog\Controllers\Blog::index');
diff --git a/user_guide_src/source/general/modules/007.php b/user_guide_src/source/general/modules/007.php
new file mode 100644
index 000000000000..06038f690a8c
--- /dev/null
+++ b/user_guide_src/source/general/modules/007.php
@@ -0,0 +1,5 @@
+<?php
+
+$routes->group('blog', ['namespace' => 'Acme\Blog\Controllers'], function ($routes) {
+    $routes->get('/', 'Blog::index');
+});
diff --git a/user_guide_src/source/general/modules/008.php b/user_guide_src/source/general/modules/008.php
new file mode 100644
index 000000000000..b502d164c5cb
--- /dev/null
+++ b/user_guide_src/source/general/modules/008.php
@@ -0,0 +1,3 @@
+<?php
+
+$config = new \Acme\Blog\Config\Blog();
diff --git a/user_guide_src/source/general/modules/009.php b/user_guide_src/source/general/modules/009.php
new file mode 100644
index 000000000000..0e2c33c57b32
--- /dev/null
+++ b/user_guide_src/source/general/modules/009.php
@@ -0,0 +1,3 @@
+<?php
+
+helper('blog');
diff --git a/user_guide_src/source/general/modules/010.php b/user_guide_src/source/general/modules/010.php
new file mode 100644
index 000000000000..1065ff9328f9
--- /dev/null
+++ b/user_guide_src/source/general/modules/010.php
@@ -0,0 +1,3 @@
+<?php
+
+$lib = new \Acme\Blog\Libraries\BlogLib();
diff --git a/user_guide_src/source/general/modules/011.php b/user_guide_src/source/general/modules/011.php
new file mode 100644
index 000000000000..2619f95e6599
--- /dev/null
+++ b/user_guide_src/source/general/modules/011.php
@@ -0,0 +1,3 @@
+<?php
+
+$model = new \Acme\Blog\Models\PostModel();
diff --git a/user_guide_src/source/general/modules/012.php b/user_guide_src/source/general/modules/012.php
new file mode 100644
index 000000000000..1df7e1f71a2f
--- /dev/null
+++ b/user_guide_src/source/general/modules/012.php
@@ -0,0 +1,3 @@
+<?php
+
+echo view('Acme\Blog\Views\index');
diff --git a/user_guide_src/source/helpers/array_helper.rst b/user_guide_src/source/helpers/array_helper.rst
index 21e798a1ee2e..318dfad5c2c4 100644
--- a/user_guide_src/source/helpers/array_helper.rst
+++ b/user_guide_src/source/helpers/array_helper.rst
@@ -12,9 +12,10 @@ any of the existing functionality that PHP provides - unless it is to vastly sim
 Loading this Helper
 ===================
 
-This helper is loaded using the following code::
+This helper is loaded using the following code:
 
-    helper('array');
+.. literalinclude:: array_helper/001.php
+   :lines: 2-
 
 Available Functions
 ===================
@@ -29,51 +30,28 @@ The following functions are available:
     :rtype: mixed
 
     This method allows you to use dot-notation to search through an array for a specific-key,
-    and allows the use of a the '*' wildcard. Given the following array::
-
-        $data = [
-            'foo' => [
-                'buzz' => [
-                    'fizz' => 11,
-                ],
-                'bar' => [
-                    'baz' => 23,
-                ]
-            ]
-        ]
+    and allows the use of a the '*' wildcard. Given the following array:
 
-    We can locate the value of 'fizz' by using the search string "foo.buzz.fizz". Likewise, the value
-    of baz can be found with "foo.bar.baz"::
+    .. literalinclude:: array_helper/002.php
+       :lines: 2-
 
-        // Returns: 11
-        $fizz = dot_array_search('foo.buzz.fizz', $data);
+    We can locate the value of 'fizz' by using the search string "foo.buzz.fizz". Likewise, the value
+    of baz can be found with "foo.bar.baz":
 
-        // Returns: 23
-        $baz = dot_array_search('foo.bar.baz', $data);
+    .. literalinclude:: array_helper/003.php
+       :lines: 2-
 
     You can use the asterisk as a wildcard to replace any of the segments. When found, it will search through all
     of the child nodes until it finds it. This is handy if you don't know the values, or if your values
-    have a numeric index::
-
-        // Returns: 23
-        $baz = dot_array_search('foo.*.baz', $data);
+    have a numeric index:
 
-    If the array key contains a dot, then the key can be escaped with a backslash::
+    .. literalinclude:: array_helper/004.php
+       :lines: 2-
 
-        $data = [
-            'foo' => [
-                'bar.baz' => 23,
-            ],
-            'foo.bar' => [
-                'baz' => 43,
-            ],
-        ];
-
-        // Returns: 23
-        $barBaz = dot_array_search('foo.bar\.baz', $data);
-        // Returns: 43
-        $fooBar = dot_array_search('foo\.bar.baz', $data);
+    If the array key contains a dot, then the key can be escaped with a backslash:
 
+    .. literalinclude:: array_helper/005.php
+       :lines: 2-
 
 ..  php:function:: array_deep_search($key, array $array)
 
@@ -94,79 +72,23 @@ The following functions are available:
 
     This method sorts the elements of a multidimensional array by the values of one or
     more keys in a hierarchical way. Take the following array, that might be returned
-    from, e.g., the ``find()`` function of a model::
-
-        $players = [
-            0 => [
-                'name'     => 'John',
-                'team_id'  => 2,
-                'position' => 3,
-                'team'     => [
-                    'id'    => 1,
-                    'order' => 2,
-                ],
-            ],
-            1 => [
-                'name'     => 'Maria',
-                'team_id'  => 5,
-                'position' => 4,
-                'team'     => [
-                    'id'    => 5,
-                    'order' => 1,
-                ],
-            ],
-            2 => [
-                'name'     => 'Frank',
-                'team_id'  => 5,
-                'position' => 1,
-                'team'     => [
-                    'id'    => 5,
-                    'order' => 1,
-                ],
-            ],
-        ];
+    from, e.g., the ``find()`` function of a model:
+
+    .. literalinclude:: array_helper/006.php
+       :lines: 2-
 
     Now sort this array by two keys. Note that the method supports the dot-notation
-    to access values in deeper array levels, but does not support wildcards::
+    to access values in deeper array levels, but does not support wildcards:
 
-        array_sort_by_multiple_keys($players, [
-            'team.order' => SORT_ASC,
-            'position'   => SORT_ASC,
-        ]);
+    .. literalinclude:: array_helper/007.php
+       :lines: 2-
 
     The ``$players`` array is now sorted by the 'order' value in each players'
     'team' subarray. If this value is equal for several players, these players
-    will be ordered by their 'position'. The resulting array is::
-
-        $players = [
-            0 => [
-                'name'     => 'Frank',
-                'team_id'  => 5,
-                'position' => 1,
-                'team'     => [
-                    'id' => 5,
-                    'order' => 1,
-                ],
-            ],
-            1 => [
-                'name'     => 'Maria',
-                'team_id'  => 5,
-                'position' => 4,
-                'team'     => [
-                    'id' => 5,
-                    'order' => 1,
-                ],
-            ],
-            2 => [
-                'name'     => 'John',
-                'team_id'  => 2,
-                'position' => 3,
-                'team'     => [
-                    'id' => 1,
-                    'order' => 2,
-                ],
-            ],
-        ];
+    will be ordered by their 'position'. The resulting array is:
+
+    .. literalinclude:: array_helper/008.php
+       :lines: 2-
 
     In the same way, the method can also handle an array of objects. In the example
     above it is further possible that each 'player' is represented by an array,
@@ -183,44 +105,17 @@ The following functions are available:
     This function flattens a multidimensional array to a single key-value array by using dots
     as separators for the keys.
 
-    ::
-
-        $arrayToFlatten = [
-            'personal' => [
-                'first_name' => 'john',
-                'last_name'  => 'smith',
-                'age'        => '26',
-                'address'    => 'US',
-            ],
-            'other_details' => 'marines officer',
-        ];
-
-        $flattened = array_flatten_with_dots($arrayToFlatten);
+    .. literalinclude:: array_helper/009.php
+       :lines: 2-
 
-    On inspection, ``$flattened`` is equal to::
+    On inspection, ``$flattened`` is equal to:
 
-        [
-            'personal.first_name' => 'john',
-            'personal.last_name'  => 'smith',
-            'personal.age'        => '26',
-            'personal.address'    => 'US',
-            'other_details'       => 'marines officer',
-        ];
+    .. literalinclude:: array_helper/010.php
+       :lines: 2-
 
     Users may use the ``$id`` parameter on their own, but are not required to do so.
     The function uses this parameter internally to track the flattened keys. If users
     will be supplying an initial ``$id``, it will be prepended to all keys.
 
-    ::
-
-        // using the same data from above
-        $flattened = array_flatten_with_dots($arrayToFlatten, 'foo_');
-
-        // $flattened is now:
-        [
-            'foo_personal.first_name' => 'john',
-            'foo_personal.last_name'  => 'smith',
-            'foo_personal.age'        => '26',
-            'foo_personal.address'    => 'US',
-            'foo_other_details'       => 'marines officer',
-        ];
+    .. literalinclude:: array_helper/011.php
+       :lines: 2-
diff --git a/user_guide_src/source/helpers/array_helper/001.php b/user_guide_src/source/helpers/array_helper/001.php
new file mode 100644
index 000000000000..0475b1057517
--- /dev/null
+++ b/user_guide_src/source/helpers/array_helper/001.php
@@ -0,0 +1,3 @@
+<?php
+
+helper('array');
diff --git a/user_guide_src/source/helpers/array_helper/002.php b/user_guide_src/source/helpers/array_helper/002.php
new file mode 100644
index 000000000000..64f6a2891fa0
--- /dev/null
+++ b/user_guide_src/source/helpers/array_helper/002.php
@@ -0,0 +1,12 @@
+<?php
+
+$data = [
+    'foo' => [
+        'buzz' => [
+            'fizz' => 11,
+        ],
+        'bar' => [
+            'baz' => 23,
+        ]
+    ]
+]
diff --git a/user_guide_src/source/helpers/array_helper/003.php b/user_guide_src/source/helpers/array_helper/003.php
new file mode 100644
index 000000000000..366d5d68ddda
--- /dev/null
+++ b/user_guide_src/source/helpers/array_helper/003.php
@@ -0,0 +1,7 @@
+<?php
+
+// Returns: 11
+$fizz = dot_array_search('foo.buzz.fizz', $data);
+
+// Returns: 23
+$baz = dot_array_search('foo.bar.baz', $data);
diff --git a/user_guide_src/source/helpers/array_helper/004.php b/user_guide_src/source/helpers/array_helper/004.php
new file mode 100644
index 000000000000..bafb429da8b7
--- /dev/null
+++ b/user_guide_src/source/helpers/array_helper/004.php
@@ -0,0 +1,4 @@
+<?php
+
+// Returns: 23
+$baz = dot_array_search('foo.*.baz', $data);
diff --git a/user_guide_src/source/helpers/array_helper/005.php b/user_guide_src/source/helpers/array_helper/005.php
new file mode 100644
index 000000000000..6e62b258aa08
--- /dev/null
+++ b/user_guide_src/source/helpers/array_helper/005.php
@@ -0,0 +1,15 @@
+<?php
+
+$data = [
+    'foo' => [
+        'bar.baz' => 23,
+    ],
+    'foo.bar' => [
+        'baz' => 43,
+    ],
+];
+
+// Returns: 23
+$barBaz = dot_array_search('foo.bar\.baz', $data);
+// Returns: 43
+$fooBar = dot_array_search('foo\.bar.baz', $data);
diff --git a/user_guide_src/source/helpers/array_helper/006.php b/user_guide_src/source/helpers/array_helper/006.php
new file mode 100644
index 000000000000..e868faeb5e91
--- /dev/null
+++ b/user_guide_src/source/helpers/array_helper/006.php
@@ -0,0 +1,31 @@
+<?php
+
+$players = [
+    0 => [
+        'name'     => 'John',
+        'team_id'  => 2,
+        'position' => 3,
+        'team'     => [
+            'id'    => 1,
+            'order' => 2,
+        ],
+    ],
+    1 => [
+        'name'     => 'Maria',
+        'team_id'  => 5,
+        'position' => 4,
+        'team'     => [
+            'id'    => 5,
+            'order' => 1,
+        ],
+    ],
+    2 => [
+        'name'     => 'Frank',
+        'team_id'  => 5,
+        'position' => 1,
+        'team'     => [
+            'id'    => 5,
+            'order' => 1,
+        ],
+    ],
+];
diff --git a/user_guide_src/source/helpers/array_helper/007.php b/user_guide_src/source/helpers/array_helper/007.php
new file mode 100644
index 000000000000..2d3729405231
--- /dev/null
+++ b/user_guide_src/source/helpers/array_helper/007.php
@@ -0,0 +1,6 @@
+<?php
+
+array_sort_by_multiple_keys($players, [
+    'team.order' => SORT_ASC,
+    'position'   => SORT_ASC,
+]);
diff --git a/user_guide_src/source/helpers/array_helper/008.php b/user_guide_src/source/helpers/array_helper/008.php
new file mode 100644
index 000000000000..14c6213b8410
--- /dev/null
+++ b/user_guide_src/source/helpers/array_helper/008.php
@@ -0,0 +1,31 @@
+<?php
+
+$players = [
+    0 => [
+        'name'     => 'Frank',
+        'team_id'  => 5,
+        'position' => 1,
+        'team'     => [
+            'id' => 5,
+            'order' => 1,
+        ],
+    ],
+    1 => [
+        'name'     => 'Maria',
+        'team_id'  => 5,
+        'position' => 4,
+        'team'     => [
+            'id' => 5,
+            'order' => 1,
+        ],
+    ],
+    2 => [
+        'name'     => 'John',
+        'team_id'  => 2,
+        'position' => 3,
+        'team'     => [
+            'id' => 1,
+            'order' => 2,
+        ],
+    ],
+];
diff --git a/user_guide_src/source/helpers/array_helper/009.php b/user_guide_src/source/helpers/array_helper/009.php
new file mode 100644
index 000000000000..fb194b1ec87f
--- /dev/null
+++ b/user_guide_src/source/helpers/array_helper/009.php
@@ -0,0 +1,13 @@
+<?php
+
+$arrayToFlatten = [
+    'personal' => [
+        'first_name' => 'john',
+        'last_name'  => 'smith',
+        'age'        => '26',
+        'address'    => 'US',
+    ],
+    'other_details' => 'marines officer',
+];
+
+$flattened = array_flatten_with_dots($arrayToFlatten);
diff --git a/user_guide_src/source/helpers/array_helper/010.php b/user_guide_src/source/helpers/array_helper/010.php
new file mode 100644
index 000000000000..300363de3257
--- /dev/null
+++ b/user_guide_src/source/helpers/array_helper/010.php
@@ -0,0 +1,9 @@
+<?php
+
+[
+    'personal.first_name' => 'john',
+    'personal.last_name'  => 'smith',
+    'personal.age'        => '26',
+    'personal.address'    => 'US',
+    'other_details'       => 'marines officer',
+];
diff --git a/user_guide_src/source/helpers/array_helper/011.php b/user_guide_src/source/helpers/array_helper/011.php
new file mode 100644
index 000000000000..754588747d6c
--- /dev/null
+++ b/user_guide_src/source/helpers/array_helper/011.php
@@ -0,0 +1,13 @@
+<?php
+
+// using the same data from above
+$flattened = array_flatten_with_dots($arrayToFlatten, 'foo_');
+
+// $flattened is now:
+[
+    'foo_personal.first_name' => 'john',
+    'foo_personal.last_name'  => 'smith',
+    'foo_personal.age'        => '26',
+    'foo_personal.address'    => 'US',
+    'foo_other_details'       => 'marines officer',
+];
diff --git a/user_guide_src/source/helpers/cookie_helper.rst b/user_guide_src/source/helpers/cookie_helper.rst
index be6bde64d61e..a7761e24a358 100755
--- a/user_guide_src/source/helpers/cookie_helper.rst
+++ b/user_guide_src/source/helpers/cookie_helper.rst
@@ -12,9 +12,10 @@ cookies.
 Loading this Helper
 ===================
 
-This helper is loaded using the following code::
+This helper is loaded using the following code:
 
-    helper('cookie');
+.. literalinclude:: cookie_helper/001.php
+   :lines: 2-
 
 Available Functions
 ===================
@@ -65,17 +66,17 @@ The following functions are available:
 
     Lets you delete a cookie. Unless you've set a custom path or other
     values, only the name of the cookie is needed.
-    ::
 
-        delete_cookie('name');
+    .. literalinclude:: cookie_helper/002.php
+       :lines: 2-
 
     This function is otherwise identical to ``set_cookie()``, except that it
     does not have the value and expiration parameters. You can submit an
     array of values in the first parameter or you can set discrete
     parameters.
-    ::
 
-        delete_cookie($name, $domain, $path, $prefix);
+    .. literalinclude:: cookie_helper/003.php
+       :lines: 2-
 
 .. php:function:: has_cookie(string $name[, ?string $value = null[, string $prefix = '']])
 
diff --git a/user_guide_src/source/helpers/cookie_helper/001.php b/user_guide_src/source/helpers/cookie_helper/001.php
new file mode 100644
index 000000000000..b14d063e9be0
--- /dev/null
+++ b/user_guide_src/source/helpers/cookie_helper/001.php
@@ -0,0 +1,3 @@
+<?php
+
+helper('cookie');
diff --git a/user_guide_src/source/helpers/cookie_helper/002.php b/user_guide_src/source/helpers/cookie_helper/002.php
new file mode 100644
index 000000000000..e86b26771170
--- /dev/null
+++ b/user_guide_src/source/helpers/cookie_helper/002.php
@@ -0,0 +1,3 @@
+<?php
+
+delete_cookie('name');
diff --git a/user_guide_src/source/helpers/cookie_helper/003.php b/user_guide_src/source/helpers/cookie_helper/003.php
new file mode 100644
index 000000000000..660cc6293f0e
--- /dev/null
+++ b/user_guide_src/source/helpers/cookie_helper/003.php
@@ -0,0 +1,3 @@
+<?php
+
+delete_cookie($name, $domain, $path, $prefix);
diff --git a/user_guide_src/source/helpers/date_helper.rst b/user_guide_src/source/helpers/date_helper.rst
index cc97b46a9dbf..8d7efaed937d 100644
--- a/user_guide_src/source/helpers/date_helper.rst
+++ b/user_guide_src/source/helpers/date_helper.rst
@@ -12,9 +12,10 @@ dates.
 Loading this Helper
 ===================
 
-This helper is loaded using the following code::
+This helper is loaded using the following code:
 
-    helper('date');
+.. literalinclude:: date_helper/001.php
+   :lines: 2-
 
 Available Functions
 ===================
@@ -33,9 +34,9 @@ The following functions are available:
     any other PHP supported timezone (which you'll typically do if you run a site
     that lets each user set their own timezone settings) there is no benefit to using
     this function over PHP's ``time()`` function.
-    ::
 
-        echo now('Australia/Victoria');
+    .. literalinclude:: date_helper/002.php
+       :lines: 2-
 
     If a timezone is not provided, it will return ``time()`` based on the
     **time_reference** setting.
@@ -52,9 +53,9 @@ The following functions are available:
     Generates a `select` form field of available timezones (optionally filtered by `$what` and `$country`).
     You can supply an option class to apply to the field to make formatting easier, as well as a default
     selected value.
-    ::
 
-        echo timezone_select('custom-select', 'America/New_York');
+    .. literalinclude:: date_helper/003.php
+       :lines: 2-
 
 Many functions previously found in the CodeIgniter 3 ``date_helper`` have been moved to the ``I18n``
 module in CodeIgniter 4.
diff --git a/user_guide_src/source/helpers/date_helper/001.php b/user_guide_src/source/helpers/date_helper/001.php
new file mode 100644
index 000000000000..3ceea1278e72
--- /dev/null
+++ b/user_guide_src/source/helpers/date_helper/001.php
@@ -0,0 +1,3 @@
+<?php
+
+helper('date');
diff --git a/user_guide_src/source/helpers/date_helper/002.php b/user_guide_src/source/helpers/date_helper/002.php
new file mode 100644
index 000000000000..6631bccdd4cc
--- /dev/null
+++ b/user_guide_src/source/helpers/date_helper/002.php
@@ -0,0 +1,3 @@
+<?php
+
+echo now('Australia/Victoria');
diff --git a/user_guide_src/source/helpers/date_helper/003.php b/user_guide_src/source/helpers/date_helper/003.php
new file mode 100644
index 000000000000..149f03282b0c
--- /dev/null
+++ b/user_guide_src/source/helpers/date_helper/003.php
@@ -0,0 +1,3 @@
+<?php
+
+echo timezone_select('custom-select', 'America/New_York');
diff --git a/user_guide_src/source/helpers/filesystem_helper.rst b/user_guide_src/source/helpers/filesystem_helper.rst
index 93111a7e8c55..e81a1a0aa447 100644
--- a/user_guide_src/source/helpers/filesystem_helper.rst
+++ b/user_guide_src/source/helpers/filesystem_helper.rst
@@ -14,9 +14,8 @@ Loading this Helper
 
 This helper is loaded using the following code:
 
-::
-
-    helper('filesystem');
+.. literalinclude:: filesystem_helper/001.php
+   :lines: 2-
 
 Available Functions
 ===================
@@ -31,23 +30,26 @@ The following functions are available:
     :returns:    An array of files
     :rtype:    array
 
-    Examples::
+    Examples:
 
-        $map = directory_map('./mydirectory/');
+    .. literalinclude:: filesystem_helper/002.php
+       :lines: 2-
 
     .. note:: Paths are almost always relative to your main index.php file.
 
     Sub-folders contained within the directory will be mapped as well. If
     you wish to control the recursion depth, you can do so using the second
-    parameter (integer). A depth of 1 will only map the top level directory::
+    parameter (integer). A depth of 1 will only map the top level directory:
 
-        $map = directory_map('./mydirectory/', 1);
+    .. literalinclude:: filesystem_helper/003.php
+       :lines: 2-
 
     By default, hidden files will not be included in the returned array and
     hidden directories will be skipped. To override this behavior, you may
-    set a third parameter to true (boolean)::
+    set a third parameter to true (boolean):
 
-        $map = directory_map('./mydirectory/', false, true);
+    .. literalinclude:: filesystem_helper/004.php
+       :lines: 2-
 
     Each folder name will be an array index, while its contained files will
     be numerically indexed. Here is an example of a typical array::
@@ -90,13 +92,10 @@ The following functions are available:
     Recursively copies the files and directories of the origin directory
     into the target directory, i.e. "mirror" its contents.
 
-    Example::
+    Example:
 
-        try {     
-            directory_mirror($uploadedImages, FCPATH . 'images/');
-        } catch (Throwable $e) {     
-            echo 'Failed to export uploads!';
-        }
+    .. literalinclude:: filesystem_helper/005.php
+       :lines: 2-
 
     You can optionally change the overwrite behavior via the third parameter.
 
@@ -111,19 +110,15 @@ The following functions are available:
     Writes data to the file specified in the path. If the file does not exist then the
     function will create it.
 
-    Example::
-
-        $data = 'Some file data';
+    Example:
 
-        if (! write_file('./path/to/file.php', $data)) {     
-            echo 'Unable to write the file';
-        } else {     
-            echo 'File written!';
-        }
+    .. literalinclude:: filesystem_helper/006.php
+       :lines: 2-
 
-    You can optionally set the write mode via the third parameter::
+    You can optionally set the write mode via the third parameter:
 
-        write_file('./path/to/file.php', $data, 'r+');
+    .. literalinclude:: filesystem_helper/007.php
+       :lines: 2-
 
     The default mode is 'wb'. Please see the `PHP user guide <https://www.php.net/manual/en/function.fopen.php>`_
     for mode options.
@@ -149,16 +144,18 @@ The following functions are available:
 
     Deletes ALL files contained in the supplied path.
 
-    Example::
+    Example:
 
-        delete_files('./path/to/directory/');
+    .. literalinclude:: filesystem_helper/008.php
+       :lines: 2-
 
     If the second parameter is set to true, any directories contained within the supplied
     root path will be deleted as well.
 
-    Example::
+    Example:
 
-        delete_files('./path/to/directory/', true);
+    .. literalinclude:: filesystem_helper/009.php
+       :lines: 2-
 
     .. note:: The files must be writable or owned by the system in order to be deleted.
 
@@ -175,9 +172,10 @@ The following functions are available:
     the second parameter to 'relative' for relative paths or any other non-empty value for
     a full file path.
 
-    Example::
+    Example:
 
-        $controllers = get_filenames(APPPATH.'controllers/');
+    .. literalinclude:: filesystem_helper/010.php
+       :lines: 2-
 
 .. php:function:: get_dir_file_info($source_dir, $top_level_only)
 
@@ -191,9 +189,10 @@ The following functions are available:
     if forced by sending the second parameter to false, as this can be an intensive
     operation.
 
-    Example::
+    Example:
 
-        $models_info = get_dir_file_info(APPPATH.'models/');
+    .. literalinclude:: filesystem_helper/011.php
+       :lines: 2-
 
 .. php:function:: get_file_info($file[, $returned_values = ['name', 'server_path', 'size', 'date']])
 
@@ -218,9 +217,8 @@ The following functions are available:
     Takes numeric permissions (such as is returned by ``fileperms()``) and returns
     standard symbolic notation of file permissions.
 
-    ::
-
-        echo symbolic_permissions(fileperms('./index.php'));  // -rw-r--r--
+    .. literalinclude:: filesystem_helper/012.php
+       :lines: 2-
 
 .. php:function:: octal_permissions($perms)
 
@@ -231,9 +229,8 @@ The following functions are available:
     Takes numeric permissions (such as is returned by ``fileperms()``) and returns
     a three character octal notation of file permissions.
 
-    ::
-
-        echo octal_permissions(fileperms('./index.php')); // 644
+    .. literalinclude:: filesystem_helper/013.php
+       :lines: 2-
 
 .. php:function:: same_file($file1, $file2)
 
@@ -244,9 +241,8 @@ The following functions are available:
 
     Compares two files to see if they are the same (based on their MD5 hash).
 
-    ::
-
-        echo same_file($newFile, $oldFile) ? 'Same!' : 'Different!';
+    .. literalinclude:: filesystem_helper/014.php
+       :lines: 2-
 
 .. php:function:: set_realpath($path[, $check_existence = false])
 
@@ -259,18 +255,7 @@ The following functions are available:
     relative directory structures. An optional second argument will
     cause an error to be triggered if the path cannot be resolved.
 
-    Examples::
-
-        $file = '/etc/php5/apache2/php.ini';
-        echo set_realpath($file); // Prints '/etc/php5/apache2/php.ini'
-
-        $non_existent_file = '/path/to/non-exist-file.txt';
-        echo set_realpath($non_existent_file, true);    // Shows an error, as the path cannot be resolved
-        echo set_realpath($non_existent_file, false);   // Prints '/path/to/non-exist-file.txt'
-
-        $directory = '/etc/php5';
-        echo set_realpath($directory);  // Prints '/etc/php5/'
+    Examples:
 
-        $non_existent_directory = '/path/to/nowhere';
-        echo set_realpath($non_existent_directory, true);   // Shows an error, as the path cannot be resolved
-        echo set_realpath($non_existent_directory, false);  // Prints '/path/to/nowhere'
+    .. literalinclude:: filesystem_helper/015.php
+       :lines: 2-
diff --git a/user_guide_src/source/helpers/filesystem_helper/001.php b/user_guide_src/source/helpers/filesystem_helper/001.php
new file mode 100644
index 000000000000..ba711c180b48
--- /dev/null
+++ b/user_guide_src/source/helpers/filesystem_helper/001.php
@@ -0,0 +1,3 @@
+<?php
+
+helper('filesystem');
diff --git a/user_guide_src/source/helpers/filesystem_helper/002.php b/user_guide_src/source/helpers/filesystem_helper/002.php
new file mode 100644
index 000000000000..b54d3ad4362a
--- /dev/null
+++ b/user_guide_src/source/helpers/filesystem_helper/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$map = directory_map('./mydirectory/');
diff --git a/user_guide_src/source/helpers/filesystem_helper/003.php b/user_guide_src/source/helpers/filesystem_helper/003.php
new file mode 100644
index 000000000000..575afe441cea
--- /dev/null
+++ b/user_guide_src/source/helpers/filesystem_helper/003.php
@@ -0,0 +1,3 @@
+<?php
+
+$map = directory_map('./mydirectory/', 1);
diff --git a/user_guide_src/source/helpers/filesystem_helper/004.php b/user_guide_src/source/helpers/filesystem_helper/004.php
new file mode 100644
index 000000000000..6b1e065cc0a5
--- /dev/null
+++ b/user_guide_src/source/helpers/filesystem_helper/004.php
@@ -0,0 +1,3 @@
+<?php
+
+$map = directory_map('./mydirectory/', false, true);
diff --git a/user_guide_src/source/helpers/filesystem_helper/005.php b/user_guide_src/source/helpers/filesystem_helper/005.php
new file mode 100644
index 000000000000..f1b155034deb
--- /dev/null
+++ b/user_guide_src/source/helpers/filesystem_helper/005.php
@@ -0,0 +1,7 @@
+<?php
+
+try {
+    directory_mirror($uploadedImages, FCPATH . 'images/');
+} catch (Throwable $e) {
+    echo 'Failed to export uploads!';
+}
diff --git a/user_guide_src/source/helpers/filesystem_helper/006.php b/user_guide_src/source/helpers/filesystem_helper/006.php
new file mode 100644
index 000000000000..5f2d7ac2ec92
--- /dev/null
+++ b/user_guide_src/source/helpers/filesystem_helper/006.php
@@ -0,0 +1,9 @@
+<?php
+
+$data = 'Some file data';
+
+if (! write_file('./path/to/file.php', $data)) {
+    echo 'Unable to write the file';
+} else {
+    echo 'File written!';
+}
diff --git a/user_guide_src/source/helpers/filesystem_helper/007.php b/user_guide_src/source/helpers/filesystem_helper/007.php
new file mode 100644
index 000000000000..7a343cdccc8f
--- /dev/null
+++ b/user_guide_src/source/helpers/filesystem_helper/007.php
@@ -0,0 +1,3 @@
+<?php
+
+write_file('./path/to/file.php', $data, 'r+');
diff --git a/user_guide_src/source/helpers/filesystem_helper/008.php b/user_guide_src/source/helpers/filesystem_helper/008.php
new file mode 100644
index 000000000000..06ffc08ab0f3
--- /dev/null
+++ b/user_guide_src/source/helpers/filesystem_helper/008.php
@@ -0,0 +1,3 @@
+<?php
+
+delete_files('./path/to/directory/');
diff --git a/user_guide_src/source/helpers/filesystem_helper/009.php b/user_guide_src/source/helpers/filesystem_helper/009.php
new file mode 100644
index 000000000000..8d9fca4d39b0
--- /dev/null
+++ b/user_guide_src/source/helpers/filesystem_helper/009.php
@@ -0,0 +1,3 @@
+<?php
+
+delete_files('./path/to/directory/', true);
diff --git a/user_guide_src/source/helpers/filesystem_helper/010.php b/user_guide_src/source/helpers/filesystem_helper/010.php
new file mode 100644
index 000000000000..9c703479fe68
--- /dev/null
+++ b/user_guide_src/source/helpers/filesystem_helper/010.php
@@ -0,0 +1,3 @@
+<?php
+
+$controllers = get_filenames(APPPATH.'controllers/');
diff --git a/user_guide_src/source/helpers/filesystem_helper/011.php b/user_guide_src/source/helpers/filesystem_helper/011.php
new file mode 100644
index 000000000000..830fb581242b
--- /dev/null
+++ b/user_guide_src/source/helpers/filesystem_helper/011.php
@@ -0,0 +1,3 @@
+<?php
+
+$models_info = get_dir_file_info(APPPATH.'models/');
diff --git a/user_guide_src/source/helpers/filesystem_helper/012.php b/user_guide_src/source/helpers/filesystem_helper/012.php
new file mode 100644
index 000000000000..f69902c2d040
--- /dev/null
+++ b/user_guide_src/source/helpers/filesystem_helper/012.php
@@ -0,0 +1,3 @@
+<?php
+
+echo symbolic_permissions(fileperms('./index.php'));  // -rw-r--r--
diff --git a/user_guide_src/source/helpers/filesystem_helper/013.php b/user_guide_src/source/helpers/filesystem_helper/013.php
new file mode 100644
index 000000000000..c7f697d1cbb3
--- /dev/null
+++ b/user_guide_src/source/helpers/filesystem_helper/013.php
@@ -0,0 +1,3 @@
+<?php
+
+echo octal_permissions(fileperms('./index.php')); // 644
diff --git a/user_guide_src/source/helpers/filesystem_helper/014.php b/user_guide_src/source/helpers/filesystem_helper/014.php
new file mode 100644
index 000000000000..0cdff679c199
--- /dev/null
+++ b/user_guide_src/source/helpers/filesystem_helper/014.php
@@ -0,0 +1,3 @@
+<?php
+
+echo same_file($newFile, $oldFile) ? 'Same!' : 'Different!';
diff --git a/user_guide_src/source/helpers/filesystem_helper/015.php b/user_guide_src/source/helpers/filesystem_helper/015.php
new file mode 100644
index 000000000000..f0f475118b90
--- /dev/null
+++ b/user_guide_src/source/helpers/filesystem_helper/015.php
@@ -0,0 +1,15 @@
+<?php
+
+$file = '/etc/php5/apache2/php.ini';
+echo set_realpath($file); // Prints '/etc/php5/apache2/php.ini'
+
+$non_existent_file = '/path/to/non-exist-file.txt';
+echo set_realpath($non_existent_file, true);    // Shows an error, as the path cannot be resolved
+echo set_realpath($non_existent_file, false);   // Prints '/path/to/non-exist-file.txt'
+
+$directory = '/etc/php5';
+echo set_realpath($directory);  // Prints '/etc/php5/'
+
+$non_existent_directory = '/path/to/nowhere';
+echo set_realpath($non_existent_directory, true);   // Shows an error, as the path cannot be resolved
+echo set_realpath($non_existent_directory, false);  // Prints '/path/to/nowhere'
diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst
index 490a4cd3ccc1..938a6c968cc8 100644
--- a/user_guide_src/source/helpers/form_helper.rst
+++ b/user_guide_src/source/helpers/form_helper.rst
@@ -12,9 +12,10 @@ forms.
 Loading this Helper
 ===================
 
-This helper is loaded using the following code::
+This helper is loaded using the following code:
 
-    helper('form');
+.. literalinclude:: form_helper/001.php
+   :lines: 2-
 
 Escaping field values
 =====================
@@ -24,11 +25,10 @@ elements. In order to do that safely, you'll need to use
 :doc:`common function <../general/common_functions>`
 :func:`esc()`.
 
-Consider the following example::
+Consider the following example:
 
-    $string = 'Here is a string containing "quoted" text.';
-
-    <input type="text" name="myfield" value="<?= $string ?>" />
+.. literalinclude:: form_helper/002.php
+   :lines: 2-
 
 Since the above string contains a set of quotes, it will cause the form
 to break. The :php:func:`esc()` function converts HTML special
@@ -63,18 +63,20 @@ The following functions are available:
     The main benefit of using this tag rather than hard coding your own HTML is that
     it permits your site to be more portable in the event your URLs ever change.
 
-    Here's a simple example::
+    Here's a simple example:
 
-        echo form_open('email/send');
+    .. literalinclude:: form_helper/003.php
+       :lines: 2-
 
     The above example would create a form that points to your site URL plus the
     "email/send" URI segments, like this::
 
         <form action="http://example.com/index.php/email/send" method="post" accept-charset="utf-8">
 
-    You can also add {locale} like the following::
+    You can also add {locale} like the following:
 
-        echo form_open('{locale}/email/send');
+    .. literalinclude:: form_helper/004.php
+       :lines: 2-
 
     The above example would create a form that points to your site URL plus the current request locale with
     "email/send" URI segments, like this::
@@ -84,22 +86,24 @@ The following functions are available:
     **Adding Attributes**
 
         Attributes can be added by passing an associative array to the second
-        parameter, like this::
+        parameter, like this:
 
-            $attributes = ['class' => 'email', 'id' => 'myform'];
-            echo form_open('email/send', $attributes);
+        .. literalinclude:: form_helper/005.php
+           :lines: 2-
 
-        Alternatively, you can specify the second parameter as a string::
+        Alternatively, you can specify the second parameter as a string:
 
-            echo form_open('email/send', 'class="email" id="myform"');
+        .. literalinclude:: form_helper/006.php
+           :lines: 2-
 
         The above examples would create a form similar to this::
 
             <form action="http://example.com/index.php/email/send" class="email" id="myform" method="post" accept-charset="utf-8">
 
-        If CSRF filter is turned on `form_open()` will generate CSRF field at the beginning of the form. You can specify ID of this field by passing csrf_id as one of the ``$attribute`` array::
+        If CSRF filter is turned on `form_open()` will generate CSRF field at the beginning of the form. You can specify ID of this field by passing csrf_id as one of the ``$attribute`` array:
 
-            echo form_open('/u/sign-up', ['csrf_id' => 'my-id']);
+        .. literalinclude:: form_helper/007.php
+           :lines: 2-
 
         will return::
 
@@ -111,10 +115,10 @@ The following functions are available:
     **Adding Hidden Input Fields**
 
         Hidden fields can be added by passing an associative array to the
-        third parameter, like this::
+        third parameter, like this:
 
-            $hidden = ['username' => 'Joe', 'member_id' => '234'];
-            echo form_open('email/send', '', $hidden);
+        .. literalinclude:: form_helper/008.php
+           :lines: 2-
 
         You can skip the second parameter by passing any false value to it.
 
@@ -144,64 +148,25 @@ The following functions are available:
     :rtype:    string
 
     Lets you generate hidden input fields. You can either submit a
-    name/value string to create one field::
-
-        form_hidden('username', 'johndoe');
-        // Would produce: <input type="hidden" name="username" value="johndoe" />
-
-    ... or you can submit an associative array to create multiple fields::
-
-        $data = [
-            'name'  => 'John Doe',
-            'email' => 'john@example.com',
-            'url'   => 'http://example.com',
-        ];
-
-        echo form_hidden($data);
-
-        /*
-            Would produce:
-
-            <input type="hidden" name="name" value="John Doe" />
-            <input type="hidden" name="email" value="john@example.com" />
-            <input type="hidden" name="url" value="http://example.com" />
-        */
-
-    You can also pass an associative array to the value field::
-
-        $data = [
-            'name'  => 'John Doe',
-            'email' => 'john@example.com',
-            'url'   => 'http://example.com',
-        ];
+    name/value string to create one field:
 
-        echo form_hidden('my_array', $data);
+    .. literalinclude:: form_helper/009.php
+       :lines: 2-
 
-        /*
-            Would produce:
+    ... or you can submit an associative array to create multiple fields:
 
-            <input type="hidden" name="my_array[name]" value="John Doe" />
-            <input type="hidden" name="my_array[email]" value="john@example.com" />
-            <input type="hidden" name="my_array[url]" value="http://example.com" />
-        */
+    .. literalinclude:: form_helper/010.php
+       :lines: 2-
 
-    If you want to create hidden input fields with extra attributes::
+    You can also pass an associative array to the value field:
 
-        $data = [
-            'type'  => 'hidden',
-            'name'  => 'email',
-            'id'    => 'hiddenemail',
-            'value' => 'john@example.com',
-            'class' => 'hiddenemail',
-        ];
+    .. literalinclude:: form_helper/011.php
+       :lines: 2-
 
-        echo form_input($data);
+    If you want to create hidden input fields with extra attributes:
 
-        /*
-            Would produce:
-
-            <input type="hidden" name="email" value="john@example.com" id="hiddenemail" class="hiddenemail" />
-        */
+    .. literalinclude:: form_helper/012.php
+       :lines: 2-
 
 .. php:function:: form_input([$data = ''[, $value = ''[, $extra = ''[, $type = 'text']]]])
 
@@ -213,50 +178,32 @@ The following functions are available:
     :rtype:    string
 
     Lets you generate a standard text input field. You can minimally pass
-    the field name and value in the first and second parameter::
+    the field name and value in the first and second parameter:
 
-        echo form_input('username', 'johndoe');
+    .. literalinclude:: form_helper/013.php
+       :lines: 2-
 
     Or you can pass an associative array containing any data you wish your
-    form to contain::
-
-        $data = [
-            'name'      => 'username',
-            'id'        => 'username',
-            'value'     => 'johndoe',
-            'maxlength' => '100',
-            'size'      => '50',
-            'style'     => 'width:50%',
-        ];
-
-        echo form_input($data);
-
-        /*
-            Would produce:
+    form to contain:
 
-            <input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%" />
-        */
+    .. literalinclude:: form_helper/014.php
+       :lines: 2-
 
     If you would like your form to contain some additional data, like
-    JavaScript, you can pass it as a string in the third parameter::
+    JavaScript, you can pass it as a string in the third parameter:
 
-        $js = 'onClick="some_function ()"';
-        echo form_input('username', 'johndoe', $js);
+    .. literalinclude:: form_helper/015.php
+       :lines: 2-
 
-    Or you can pass it as an array::
+    Or you can pass it as an array:
 
-        $js = ['onClick' => 'some_function ();'];
-        echo form_input('username', 'johndoe', $js);
+    .. literalinclude:: form_helper/016.php
+       :lines: 2-
 
-    To support the expanded range of HTML5 input fields, you can pass an input type in as the fourth parameter::
+    To support the expanded range of HTML5 input fields, you can pass an input type in as the fourth parameter:
 
-        echo form_input('email', 'joe@example.com', ['placeholder' => 'Email Address...'], 'email');
-
-        /*
-             Would produce:
-
-            <input type="email" name="email" value="joe@example.com" placeholder="Email Address..." />
-        */
+    .. literalinclude:: form_helper/017.php
+       :lines: 2-
 
 .. php:function:: form_password([$data = ''[, $value = ''[, $extra = '']]])
 
@@ -311,56 +258,22 @@ The following functions are available:
     items through the third parameter, and the helper will create a
     multiple select for you.
 
-    Example::
-
-        $options = [
-            'small'  => 'Small Shirt',
-            'med'    => 'Medium Shirt',
-            'large'  => 'Large Shirt',
-            'xlarge' => 'Extra Large Shirt',
-        ];
+    Example:
 
-        $shirts_on_sale = ['small', 'large'];
-        echo form_dropdown('shirts', $options, 'large');
-
-        /*
-            Would produce:
-
-            <select name="shirts">
-                <option value="small">Small Shirt</option>
-                <option value="med">Medium Shirt</option>
-                <option value="large" selected="selected">Large Shirt</option>
-                <option value="xlarge">Extra Large Shirt</option>
-            </select>
-        */
-
-        echo form_dropdown('shirts', $options, $shirts_on_sale);
-
-        /*
-            Would produce:
-
-            <select name="shirts" multiple="multiple">
-                <option value="small" selected="selected">Small Shirt</option>
-                <option value="med">Medium Shirt</option>
-                <option value="large" selected="selected">Large Shirt</option>
-                <option value="xlarge">Extra Large Shirt</option>
-            </select>
-        */
+    .. literalinclude:: form_helper/018.php
+       :lines: 2-
 
     If you would like the opening <select> to contain additional data, like
     an id attribute or JavaScript, you can pass it as a string in the fourth
-    parameter::
+    parameter:
 
-        $js = 'id="shirts" onChange="some_function();"';
-        echo form_dropdown('shirts', $options, 'large', $js);
+    .. literalinclude:: form_helper/019.php
+       :lines: 2-
 
-    Or you can pass it as an array::
+    Or you can pass it as an array:
 
-        $js = [
-            'id'       => 'shirts',
-            'onChange' => 'some_function();'
-        ];
-        echo form_dropdown('shirts', $options, 'large', $js);
+    .. literalinclude:: form_helper/020.php
+       :lines: 2-
 
     If the array passed as ``$options`` is a multidimensional array, then
     ``form_dropdown()`` will produce an <optgroup> with the array key as the
@@ -393,41 +306,16 @@ The following functions are available:
 
     Lets you generate fieldset/legend fields.
 
-    Example::
-
-        echo form_fieldset('Address Information');
-        echo "<p>fieldset content here</p>\n";
-        echo form_fieldset_close();
-
-        /*
-            Produces:
+    Example:
 
-            <fieldset>
-                <legend>Address Information</legend>
-                <p>form content here</p>
-            </fieldset>
-        */
+    .. literalinclude:: form_helper/021.php
+       :lines: 2-
 
     Similar to other functions, you can submit an associative array in the
-    second parameter if you prefer to set additional attributes::
+    second parameter if you prefer to set additional attributes:
 
-        $attributes = [
-            'id'    => 'address_info',
-            'class' => 'address_info'
-        ];
-
-        echo form_fieldset('Address Information', $attributes);
-        echo "<p>fieldset content here</p>\n";
-        echo form_fieldset_close();
-
-        /*
-            Produces:
-
-            <fieldset id="address_info" class="address_info">
-                <legend>Address Information</legend>
-                <p>form content here</p>
-            </fieldset>
-        */
+    .. literalinclude:: form_helper/022.php
+       :lines: 2-
 
 .. php:function:: form_fieldset_close([$extra = ''])
 
@@ -439,11 +327,8 @@ The following functions are available:
     function is it permits you to pass data to it which will be added below
     the tag. For example
 
-    ::
-
-        $string = '</div></div>';
-        echo form_fieldset_close($string);
-        // Would produce: </fieldset></div></div>
+    .. literalinclude:: form_helper/023.php
+       :lines: 2-
 
 .. php:function:: form_checkbox([$data = ''[, $value = ''[, $checked = false[, $extra = '']]]])
 
@@ -454,39 +339,31 @@ The following functions are available:
     :returns:    An HTML checkbox input tag
     :rtype:    string
 
-    Lets you generate a checkbox field. Simple example::
+    Lets you generate a checkbox field. Simple example:
 
-        echo form_checkbox('newsletter', 'accept', true);
-        // Would produce:  <input type="checkbox" name="newsletter" value="accept" checked="checked" />
+    .. literalinclude:: form_helper/024.php
+       :lines: 2-
 
     The third parameter contains a boolean true/false to determine whether
     the box should be checked or not.
 
     Similar to the other form functions in this helper, you can also pass an
-    array of attributes to the function::
+    array of attributes to the function:
 
-        $data = [
-            'name'    => 'newsletter',
-            'id'      => 'newsletter',
-            'value'   => 'accept',
-            'checked' => true,
-            'style'   => 'margin:10px'
-        ];
-
-        echo form_checkbox($data);
-        // Would produce: <input type="checkbox" name="newsletter" id="newsletter" value="accept" checked="checked" style="margin:10px" />
+    .. literalinclude:: form_helper/025.php
+       :lines: 2-
 
     Also as with other functions, if you would like the tag to contain
     additional data like JavaScript, you can pass it as a string in the
-    fourth parameter::
+    fourth parameter:
 
-        $js = 'onClick="some_function()"';
-        echo form_checkbox('newsletter', 'accept', true, $js);
+    .. literalinclude:: form_helper/026.php
+       :lines: 2-
 
-    Or you can pass it as an array::
+    Or you can pass it as an array:
 
-        $js = ['onClick' => 'some_function();'];
-        echo form_checkbox('newsletter', 'accept', true, $js);
+    .. literalinclude:: form_helper/027.php
+       :lines: 2-
 
 .. php:function:: form_radio([$data = ''[, $value = ''[, $checked = false[, $extra = '']]]])
 
@@ -508,23 +385,18 @@ The following functions are available:
     :returns:    An HTML field label tag
     :rtype:    string
 
-    Lets you generate a <label>. Simple example::
+    Lets you generate a <label>. Simple example:
 
-        echo form_label('What is your Name', 'username');
-        // Would produce:  <label for="username">What is your Name</label>
+    .. literalinclude:: form_helper/028.php
+       :lines: 2-
 
     Similar to other functions, you can submit an associative array in the
     third parameter if you prefer to set additional attributes.
 
-    Example::
-
-        $attributes = [
-            'class' => 'mycustomclass',
-            'style' => 'color: #000;'
-        ];
+    Example:
 
-        echo form_label('What is your Name', 'username', $attributes);
-        // Would produce:  <label for="username" class="mycustomclass" style="color: #000;">What is your Name</label>
+    .. literalinclude:: form_helper/029.php
+       :lines: 2-
 
 .. php:function:: form_submit([$data = ''[, $value = ''[, $extra = '']]])
 
@@ -534,10 +406,10 @@ The following functions are available:
     :returns:    An HTML input submit tag
     :rtype:    string
 
-    Lets you generate a standard submit button. Simple example::
+    Lets you generate a standard submit button. Simple example:
 
-        echo form_submit('mysubmit', 'Submit Post!');
-        // Would produce:  <input type="submit" name="mysubmit" value="Submit Post!" />
+    .. literalinclude:: form_helper/030.php
+       :lines: 2-
 
     Similar to other functions, you can submit an associative array in the
     first parameter if you prefer to set your own attributes. The third
@@ -563,30 +435,22 @@ The following functions are available:
     :rtype:    string
 
     Lets you generate a standard button element. You can minimally pass the
-    button name and content in the first and second parameter::
+    button name and content in the first and second parameter:
 
-        echo form_button('name','content');
-        // Would produce: <button name="name" type="button">Content</button>
+    .. literalinclude:: form_helper/031.php
+       :lines: 2-
 
     Or you can pass an associative array containing any data you wish your
-    form to contain::
-
-        $data = [
-            'name'    => 'button',
-            'id'      => 'button',
-            'value'   => 'true',
-            'type'    => 'reset',
-            'content' => 'Reset',
-        ];
+    form to contain:
 
-        echo form_button($data);
-        // Would produce: <button name="button" id="button" value="true" type="reset">Reset</button>
+    .. literalinclude:: form_helper/032.php
+       :lines: 2-
 
     If you would like your form to contain some additional data, like
-    JavaScript, you can pass it as a string in the third parameter::
+    JavaScript, you can pass it as a string in the third parameter:
 
-        $js = 'onClick="some_function()"';
-        echo form_button('mybutton', 'Click Me', $js);
+    .. literalinclude:: form_helper/033.php
+       :lines: 2-
 
 .. php:function:: form_close([$extra = ''])
 
@@ -596,11 +460,10 @@ The following functions are available:
 
     Produces a closing </form> tag. The only advantage to using this
     function is it permits you to pass data to it which will be added below
-    the tag. For example::
+    the tag. For example:
 
-        $string = '</div></div>';
-        echo form_close($string);
-        // Would produce:  </form> </div></div>
+    .. literalinclude:: form_helper/034.php
+       :lines: 2-
 
 .. php:function:: set_value($field[, $default = ''[, $html_escape = true]])
 
diff --git a/user_guide_src/source/helpers/form_helper/001.php b/user_guide_src/source/helpers/form_helper/001.php
new file mode 100644
index 000000000000..c4fcc133f505
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/001.php
@@ -0,0 +1,3 @@
+<?php
+
+helper('form');
diff --git a/user_guide_src/source/helpers/form_helper/002.php b/user_guide_src/source/helpers/form_helper/002.php
new file mode 100644
index 000000000000..0313910da1b5
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/002.php
@@ -0,0 +1,5 @@
+<?php
+
+$string = 'Here is a string containing "quoted" text.';
+
+<input type="text" name="myfield" value="<?= $string ?>" />
diff --git a/user_guide_src/source/helpers/form_helper/003.php b/user_guide_src/source/helpers/form_helper/003.php
new file mode 100644
index 000000000000..48bb6d05eab2
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/003.php
@@ -0,0 +1,3 @@
+<?php
+
+echo form_open('email/send');
diff --git a/user_guide_src/source/helpers/form_helper/004.php b/user_guide_src/source/helpers/form_helper/004.php
new file mode 100644
index 000000000000..d481741ee273
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/004.php
@@ -0,0 +1,3 @@
+<?php
+
+echo form_open('{locale}/email/send');
diff --git a/user_guide_src/source/helpers/form_helper/005.php b/user_guide_src/source/helpers/form_helper/005.php
new file mode 100644
index 000000000000..5f98befd17b3
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/005.php
@@ -0,0 +1,4 @@
+<?php
+
+$attributes = ['class' => 'email', 'id' => 'myform'];
+echo form_open('email/send', $attributes);
diff --git a/user_guide_src/source/helpers/form_helper/006.php b/user_guide_src/source/helpers/form_helper/006.php
new file mode 100644
index 000000000000..524f6b95b810
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/006.php
@@ -0,0 +1,3 @@
+<?php
+
+echo form_open('email/send', 'class="email" id="myform"');
diff --git a/user_guide_src/source/helpers/form_helper/007.php b/user_guide_src/source/helpers/form_helper/007.php
new file mode 100644
index 000000000000..740187a9964f
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/007.php
@@ -0,0 +1,3 @@
+<?php
+
+echo form_open('/u/sign-up', ['csrf_id' => 'my-id']);
diff --git a/user_guide_src/source/helpers/form_helper/008.php b/user_guide_src/source/helpers/form_helper/008.php
new file mode 100644
index 000000000000..c46a93cecb10
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/008.php
@@ -0,0 +1,4 @@
+<?php
+
+$hidden = ['username' => 'Joe', 'member_id' => '234'];
+echo form_open('email/send', '', $hidden);
diff --git a/user_guide_src/source/helpers/form_helper/009.php b/user_guide_src/source/helpers/form_helper/009.php
new file mode 100644
index 000000000000..c9bccc345179
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/009.php
@@ -0,0 +1,4 @@
+<?php
+
+form_hidden('username', 'johndoe');
+// Would produce: <input type="hidden" name="username" value="johndoe" />
diff --git a/user_guide_src/source/helpers/form_helper/010.php b/user_guide_src/source/helpers/form_helper/010.php
new file mode 100644
index 000000000000..8efbdfdeddf1
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/010.php
@@ -0,0 +1,17 @@
+<?php
+
+$data = [
+    'name'  => 'John Doe',
+    'email' => 'john@example.com',
+    'url'   => 'http://example.com',
+];
+
+echo form_hidden($data);
+
+/*
+    Would produce:
+
+    <input type="hidden" name="name" value="John Doe" />
+    <input type="hidden" name="email" value="john@example.com" />
+    <input type="hidden" name="url" value="http://example.com" />
+*/
diff --git a/user_guide_src/source/helpers/form_helper/011.php b/user_guide_src/source/helpers/form_helper/011.php
new file mode 100644
index 000000000000..26641f577429
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/011.php
@@ -0,0 +1,17 @@
+<?php
+
+$data = [
+    'name'  => 'John Doe',
+    'email' => 'john@example.com',
+    'url'   => 'http://example.com',
+];
+
+echo form_hidden('my_array', $data);
+
+/*
+    Would produce:
+
+    <input type="hidden" name="my_array[name]" value="John Doe" />
+    <input type="hidden" name="my_array[email]" value="john@example.com" />
+    <input type="hidden" name="my_array[url]" value="http://example.com" />
+*/
diff --git a/user_guide_src/source/helpers/form_helper/012.php b/user_guide_src/source/helpers/form_helper/012.php
new file mode 100644
index 000000000000..1059821da652
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/012.php
@@ -0,0 +1,17 @@
+<?php
+
+$data = [
+    'type'  => 'hidden',
+    'name'  => 'email',
+    'id'    => 'hiddenemail',
+    'value' => 'john@example.com',
+    'class' => 'hiddenemail',
+];
+
+echo form_input($data);
+
+/*
+    Would produce:
+
+    <input type="hidden" name="email" value="john@example.com" id="hiddenemail" class="hiddenemail" />
+*/
diff --git a/user_guide_src/source/helpers/form_helper/013.php b/user_guide_src/source/helpers/form_helper/013.php
new file mode 100644
index 000000000000..5ef76dfaf99e
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/013.php
@@ -0,0 +1,3 @@
+<?php
+
+echo form_input('username', 'johndoe');
diff --git a/user_guide_src/source/helpers/form_helper/014.php b/user_guide_src/source/helpers/form_helper/014.php
new file mode 100644
index 000000000000..6143aed6eaaf
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/014.php
@@ -0,0 +1,18 @@
+<?php
+
+$data = [
+    'name'      => 'username',
+    'id'        => 'username',
+    'value'     => 'johndoe',
+    'maxlength' => '100',
+    'size'      => '50',
+    'style'     => 'width:50%',
+];
+
+echo form_input($data);
+
+/*
+    Would produce:
+
+    <input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%" />
+*/
diff --git a/user_guide_src/source/helpers/form_helper/015.php b/user_guide_src/source/helpers/form_helper/015.php
new file mode 100644
index 000000000000..13413c93de0a
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/015.php
@@ -0,0 +1,4 @@
+<?php
+
+$js = 'onClick="some_function ()"';
+echo form_input('username', 'johndoe', $js);
diff --git a/user_guide_src/source/helpers/form_helper/016.php b/user_guide_src/source/helpers/form_helper/016.php
new file mode 100644
index 000000000000..f9a1c775338b
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/016.php
@@ -0,0 +1,4 @@
+<?php
+
+$js = ['onClick' => 'some_function ();'];
+echo form_input('username', 'johndoe', $js);
diff --git a/user_guide_src/source/helpers/form_helper/017.php b/user_guide_src/source/helpers/form_helper/017.php
new file mode 100644
index 000000000000..0ec6a19ca99f
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/017.php
@@ -0,0 +1,9 @@
+<?php
+
+echo form_input('email', 'joe@example.com', ['placeholder' => 'Email Address...'], 'email');
+
+/*
+     Would produce:
+
+    <input type="email" name="email" value="joe@example.com" placeholder="Email Address..." />
+*/
diff --git a/user_guide_src/source/helpers/form_helper/018.php b/user_guide_src/source/helpers/form_helper/018.php
new file mode 100644
index 000000000000..fc6521be6e06
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/018.php
@@ -0,0 +1,35 @@
+<?php
+
+$options = [
+    'small'  => 'Small Shirt',
+    'med'    => 'Medium Shirt',
+    'large'  => 'Large Shirt',
+    'xlarge' => 'Extra Large Shirt',
+];
+
+$shirts_on_sale = ['small', 'large'];
+echo form_dropdown('shirts', $options, 'large');
+
+/*
+    Would produce:
+
+    <select name="shirts">
+        <option value="small">Small Shirt</option>
+        <option value="med">Medium Shirt</option>
+        <option value="large" selected="selected">Large Shirt</option>
+        <option value="xlarge">Extra Large Shirt</option>
+    </select>
+*/
+
+echo form_dropdown('shirts', $options, $shirts_on_sale);
+
+/*
+    Would produce:
+
+    <select name="shirts" multiple="multiple">
+        <option value="small" selected="selected">Small Shirt</option>
+        <option value="med">Medium Shirt</option>
+        <option value="large" selected="selected">Large Shirt</option>
+        <option value="xlarge">Extra Large Shirt</option>
+    </select>
+*/
diff --git a/user_guide_src/source/helpers/form_helper/019.php b/user_guide_src/source/helpers/form_helper/019.php
new file mode 100644
index 000000000000..6916b86b9df1
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/019.php
@@ -0,0 +1,4 @@
+<?php
+
+$js = 'id="shirts" onChange="some_function();"';
+echo form_dropdown('shirts', $options, 'large', $js);
diff --git a/user_guide_src/source/helpers/form_helper/020.php b/user_guide_src/source/helpers/form_helper/020.php
new file mode 100644
index 000000000000..02fe8f5386af
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/020.php
@@ -0,0 +1,7 @@
+<?php
+
+$js = [
+    'id'       => 'shirts',
+    'onChange' => 'some_function();'
+];
+echo form_dropdown('shirts', $options, 'large', $js);
diff --git a/user_guide_src/source/helpers/form_helper/021.php b/user_guide_src/source/helpers/form_helper/021.php
new file mode 100644
index 000000000000..82b3062ff61f
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/021.php
@@ -0,0 +1,14 @@
+<?php
+
+echo form_fieldset('Address Information');
+echo "<p>fieldset content here</p>\n";
+echo form_fieldset_close();
+
+/*
+    Produces:
+
+    <fieldset>
+        <legend>Address Information</legend>
+        <p>form content here</p>
+    </fieldset>
+*/
diff --git a/user_guide_src/source/helpers/form_helper/022.php b/user_guide_src/source/helpers/form_helper/022.php
new file mode 100644
index 000000000000..5a706b3c3071
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/022.php
@@ -0,0 +1,19 @@
+<?php
+
+$attributes = [
+    'id'    => 'address_info',
+    'class' => 'address_info'
+];
+
+echo form_fieldset('Address Information', $attributes);
+echo "<p>fieldset content here</p>\n";
+echo form_fieldset_close();
+
+/*
+    Produces:
+
+    <fieldset id="address_info" class="address_info">
+        <legend>Address Information</legend>
+        <p>form content here</p>
+    </fieldset>
+*/
diff --git a/user_guide_src/source/helpers/form_helper/023.php b/user_guide_src/source/helpers/form_helper/023.php
new file mode 100644
index 000000000000..677beb30e825
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/023.php
@@ -0,0 +1,5 @@
+<?php
+
+$string = '</div></div>';
+echo form_fieldset_close($string);
+// Would produce: </fieldset></div></div>
diff --git a/user_guide_src/source/helpers/form_helper/024.php b/user_guide_src/source/helpers/form_helper/024.php
new file mode 100644
index 000000000000..efde91326e34
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/024.php
@@ -0,0 +1,4 @@
+<?php
+
+echo form_checkbox('newsletter', 'accept', true);
+// Would produce:  <input type="checkbox" name="newsletter" value="accept" checked="checked" />
diff --git a/user_guide_src/source/helpers/form_helper/025.php b/user_guide_src/source/helpers/form_helper/025.php
new file mode 100644
index 000000000000..d889aab62591
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/025.php
@@ -0,0 +1,12 @@
+<?php
+
+$data = [
+    'name'    => 'newsletter',
+    'id'      => 'newsletter',
+    'value'   => 'accept',
+    'checked' => true,
+    'style'   => 'margin:10px'
+];
+
+echo form_checkbox($data);
+// Would produce: <input type="checkbox" name="newsletter" id="newsletter" value="accept" checked="checked" style="margin:10px" />
diff --git a/user_guide_src/source/helpers/form_helper/026.php b/user_guide_src/source/helpers/form_helper/026.php
new file mode 100644
index 000000000000..803d5fcd43c4
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/026.php
@@ -0,0 +1,4 @@
+<?php
+
+$js = 'onClick="some_function()"';
+echo form_checkbox('newsletter', 'accept', true, $js);
diff --git a/user_guide_src/source/helpers/form_helper/027.php b/user_guide_src/source/helpers/form_helper/027.php
new file mode 100644
index 000000000000..390f1fb39cbd
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/027.php
@@ -0,0 +1,4 @@
+<?php
+
+$js = ['onClick' => 'some_function();'];
+echo form_checkbox('newsletter', 'accept', true, $js);
diff --git a/user_guide_src/source/helpers/form_helper/028.php b/user_guide_src/source/helpers/form_helper/028.php
new file mode 100644
index 000000000000..1f9b3da50b2b
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/028.php
@@ -0,0 +1,4 @@
+<?php
+
+echo form_label('What is your Name', 'username');
+// Would produce:  <label for="username">What is your Name</label>
diff --git a/user_guide_src/source/helpers/form_helper/029.php b/user_guide_src/source/helpers/form_helper/029.php
new file mode 100644
index 000000000000..c05370129514
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/029.php
@@ -0,0 +1,9 @@
+<?php
+
+$attributes = [
+    'class' => 'mycustomclass',
+    'style' => 'color: #000;'
+];
+
+echo form_label('What is your Name', 'username', $attributes);
+// Would produce:  <label for="username" class="mycustomclass" style="color: #000;">What is your Name</label>
diff --git a/user_guide_src/source/helpers/form_helper/030.php b/user_guide_src/source/helpers/form_helper/030.php
new file mode 100644
index 000000000000..5c5fded94e77
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/030.php
@@ -0,0 +1,4 @@
+<?php
+
+echo form_submit('mysubmit', 'Submit Post!');
+// Would produce:  <input type="submit" name="mysubmit" value="Submit Post!" />
diff --git a/user_guide_src/source/helpers/form_helper/031.php b/user_guide_src/source/helpers/form_helper/031.php
new file mode 100644
index 000000000000..671a69fcf6d8
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/031.php
@@ -0,0 +1,4 @@
+<?php
+
+echo form_button('name','content');
+// Would produce: <button name="name" type="button">Content</button>
diff --git a/user_guide_src/source/helpers/form_helper/032.php b/user_guide_src/source/helpers/form_helper/032.php
new file mode 100644
index 000000000000..24ddbfe669f6
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/032.php
@@ -0,0 +1,12 @@
+<?php
+
+$data = [
+    'name'    => 'button',
+    'id'      => 'button',
+    'value'   => 'true',
+    'type'    => 'reset',
+    'content' => 'Reset',
+];
+
+echo form_button($data);
+// Would produce: <button name="button" id="button" value="true" type="reset">Reset</button>
diff --git a/user_guide_src/source/helpers/form_helper/033.php b/user_guide_src/source/helpers/form_helper/033.php
new file mode 100644
index 000000000000..058ffd122bb5
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/033.php
@@ -0,0 +1,4 @@
+<?php
+
+$js = 'onClick="some_function()"';
+echo form_button('mybutton', 'Click Me', $js);
diff --git a/user_guide_src/source/helpers/form_helper/034.php b/user_guide_src/source/helpers/form_helper/034.php
new file mode 100644
index 000000000000..126e7f309097
--- /dev/null
+++ b/user_guide_src/source/helpers/form_helper/034.php
@@ -0,0 +1,5 @@
+<?php
+
+$string = '</div></div>';
+echo form_close($string);
+// Would produce:  </form> </div></div>
diff --git a/user_guide_src/source/helpers/html_helper.rst b/user_guide_src/source/helpers/html_helper.rst
index b73b3222f711..0398a735d820 100755
--- a/user_guide_src/source/helpers/html_helper.rst
+++ b/user_guide_src/source/helpers/html_helper.rst
@@ -12,9 +12,10 @@ HTML.
 Loading this Helper
 ===================
 
-This helper is loaded using the following code::
+This helper is loaded using the following code:
 
-    helper('html');
+.. literalinclude:: html_helper/001.php
+   :lines: 2-
 
 Available Functions
 ===================
@@ -30,37 +31,27 @@ The following functions are available:
     :rtype: string
 
     Lets you create HTML ``<img />`` tags. The first parameter contains the
-    image source. Example::
+    image source. Example:
 
-        echo img('images/picture.jpg');
-        // <img src="http://site.com/images/picture.jpg" />
+    .. literalinclude:: html_helper/002.php
+       :lines: 2-
 
     There is an optional second parameter that is a true/false value that
     specifics if the *src* should have the page specified by
     ``$config['indexPage']`` added to the address it creates.
-    Presumably, this would be if you were using a media controller::
+    Presumably, this would be if you were using a media controller:
 
-        echo img('images/picture.jpg', true);
-        // <img src="http://site.com/index.php/images/picture.jpg" alt="" />
+    .. literalinclude:: html_helper/003.php
+       :lines: 2-
 
     Additionally, an associative array can be passed as the first parameter,
     for complete control over all attributes and values. If an *alt* attribute
     is not provided, CodeIgniter will generate an empty string.
 
-    Example::
+    Example:
 
-        $imageProperties = [
-            'src'    => 'images/picture.jpg',
-            'alt'    => 'Me, demonstrating how to eat 4 slices of pizza at one time',
-            'class'  => 'post_images',
-            'width'  => '200',
-            'height' => '200',
-            'title'  => 'That was quite a night',
-            'rel'    => 'lightbox',
-        ];
-
-        img($imageProperties);
-        // <img src="http://site.com/index.php/images/picture.jpg" alt="Me, demonstrating how to eat 4 slices of pizza at one time" class="post_images" width="200" height="200" title="That was quite a night" rel="lightbox" />
+    .. literalinclude:: html_helper/004.php
+       :lines: 2-
 
 .. php:function:: img_data([$src = ''[, $indexPage = false[, $attributes = '']]])
 
@@ -70,15 +61,16 @@ The following functions are available:
     :rtype: string
 
     Generates a src-ready string from an image using the "data:" protocol.
-    Example::
+    Example:
 
-        $src = img_data('public/images/picture.jpg'); // data:image/jpg;base64,R0lGODl...
-        echo img($src);
+    .. literalinclude:: html_helper/005.php
+       :lines: 2-
 
     There is an optional second parameter to specify the MIME type, otherwise the
-    function will use your Mimes config to guess::
+    function will use your Mimes config to guess:
 
-        $src = img_data('path/img_without_extension', 'image/png'); // data:image/png;base64,HT5A822...
+    .. literalinclude:: html_helper/006.php
+       :lines: 2-
 
     Note that ``$path`` must exist and be a readable image format supported by the ``data:`` protocol.
     This function is not recommended for very large files, but it provides a convenient way
@@ -103,31 +95,21 @@ The following functions are available:
     *indexPage* is a boolean value that specifies if the *href* should have
     the page specified by ``$config['indexPage']`` added to the address it creates.
 
-    Example::
-
-        echo link_tag('css/mystyles.css');
-        // <link href="http://site.com/css/mystyles.css" rel="stylesheet" type="text/css" />
+    Example:
 
-    Further examples::
+    .. literalinclude:: html_helper/007.php
+       :lines: 2-
 
-        echo link_tag('favicon.ico', 'shortcut icon', 'image/ico');
-        // <link href="http://site.com/favicon.ico" rel="shortcut icon" type="image/ico" />
+    Further examples:
 
-        echo link_tag('feed', 'alternate', 'application/rss+xml', 'My RSS Feed');
-        // <link href="http://site.com/feed" rel="alternate" type="application/rss+xml" title="My RSS Feed" />
+    .. literalinclude:: html_helper/008.php
+       :lines: 2-
 
     Alternately, an associative array can be passed to the ``link_tag()`` function
-    for complete control over all attributes and values::
-
-        $link = [
-            'href'  => 'css/printer.css',
-            'rel'   => 'stylesheet',
-            'type'  => 'text/css',
-            'media' => 'print',
-        ];
+    for complete control over all attributes and values:
 
-        echo link_tag($link);
-        // <link href="http://site.com/css/printer.css" rel="stylesheet" type="text/css" media="print" />
+    .. literalinclude:: html_helper/009.php
+       :lines: 2-
 
 .. php:function:: script_tag([$src = ''[, $indexPage = false]])
 
@@ -141,18 +123,16 @@ The following functions are available:
     *indexPage* is a boolean value that specifies if the *src* should have
     the page specified by ``$config['indexPage']`` added to the address it creates.
 
-    Example::
+    Example:
 
-        echo script_tag('js/mystyles.js');
-        // <script src="http://site.com/js/mystyles.js" type="text/javascript"></script>
+    .. literalinclude:: html_helper/010.php
+       :lines: 2-
 
     Alternately, an associative array can be passed to the ``script_tag()`` function
-    for complete control over all attributes and values::
+    for complete control over all attributes and values:
 
-        $script = ['src'  => 'js/printer.js'];
-
-        echo script_tag($script);
-        // <script src="http://site.com/js/printer.js" type="text/javascript"></script>
+    .. literalinclude:: html_helper/011.php
+       :lines: 2-
 
 .. php:function:: ul($list[, $attributes = ''])
 
@@ -162,21 +142,10 @@ The following functions are available:
     :rtype: string
 
     Permits you to generate unordered HTML lists from simple or
-    multi-dimensional arrays. Example::
-
-        $list = [
-            'red',
-            'blue',
-            'green',
-            'yellow',
-        ];
+    multi-dimensional arrays. Example:
 
-        $attributes = [
-            'class' => 'boldlist',
-            'id'    => 'mylist',
-        ];
-
-        echo ul($list, $attributes);
+    .. literalinclude:: html_helper/012.php
+       :lines: 2-
 
     The above code will produce this:
 
@@ -189,44 +158,10 @@ The following functions are available:
             <li>yellow</li>
         </ul>
 
-    Here is a more complex example, using a multi-dimensional array::
-
-        $attributes = [
-            'class' => 'boldlist',
-            'id'    => 'mylist',
-        ];
-
-        $list = [
-            'colors' => [
-                'red',
-                'blue',
-                'green',
-            ],
-            'shapes' => [
-                'round',
-                'square',
-                'circles' => [
-                    'ellipse',
-                    'oval',
-                    'sphere',
-                ],
-            ],
-            'moods'  => [
-                'happy',
-                'upset'   => [
-                    'defeated' => [
-                        'dejected',
-                        'disheartened',
-                        'depressed',
-                    ],
-                    'annoyed',
-                    'cross',
-                    'angry',
-                ]
-            ]
-        ];
-
-        echo ul($list, $attributes);
+    Here is a more complex example, using a multi-dimensional array:
+
+    .. literalinclude:: html_helper/013.php
+       :lines: 2-
 
     The above code will produce this:
 
@@ -295,32 +230,10 @@ The following functions are available:
     :rtype: string
 
     Permits you to generate HTML video element from simple or
-    source arrays. Example::
-
-        $tracks = [
-            track('subtitles_no.vtt', 'subtitles', 'no', 'Norwegian No'),
-            track('subtitles_yes.vtt', 'subtitles', 'yes', 'Norwegian Yes')
-        ];
-
-        echo video('test.mp4', 'Your browser does not support the video tag.', 'controls');
-
-        echo video(
-            'http://www.codeigniter.com/test.mp4',
-            'Your browser does not support the video tag.',
-            'controls',
-            $tracks
-        );
-
-        echo video([
-            source('movie.mp4', 'video/mp4', 'class="test"'),
-            source('movie.ogg', 'video/ogg'),
-            source('movie.mov', 'video/quicktime'),
-            source('movie.ogv', 'video/ogv; codecs=dirac, speex')
-        ],
-            'Your browser does not support the video tag.',
-            'class="test" controls',
-            $tracks
-         );
+    source arrays. Example:
+
+    .. literalinclude:: html_helper/014.php
+       :lines: 2-
 
     The above code will produce this:
 
@@ -367,10 +280,10 @@ The following functions are available:
     :rtype: string
 
     Lets you create HTML ``<source />`` tags. The first parameter contains the
-    source source. Example::
+    source source. Example:
 
-        echo source('movie.mp4', 'video/mp4', 'class="test"');
-        // <source src="movie.mp4" type="video/mp4" class="test" />
+    .. literalinclude:: html_helper/015.php
+       :lines: 2-
 
 .. php:function:: embed($src = ''[, $type = false[, $attributes = ''[, $indexPage = false]]])
 
@@ -382,10 +295,10 @@ The following functions are available:
     :rtype: string
 
     Lets you create HTML ``<embed />`` tags. The first parameter contains the
-    embed source. Example::
+    embed source. Example:
 
-        echo embed('movie.mov', 'video/quicktime', 'class="test"');
-        // <embed src="movie.mov" type="video/quicktime" class="test"/>
+    .. literalinclude:: html_helper/016.php
+       :lines: 2-
 
 .. php:function:: object($data = ''[, $type = false[, $attributes = '']])
 
@@ -397,19 +310,10 @@ The following functions are available:
     :rtype: string
 
     Lets you create HTML ``<object />`` tags. The first parameter contains the
-    object data. Example::
+    object data. Example:
 
-        echo object('movie.swf', 'application/x-shockwave-flash', 'class="test"');
-
-        echo object(
-            'movie.swf',
-            'application/x-shockwave-flash',
-            'class="test"',
-            [
-                param('foo', 'bar', 'ref', 'class="test"'),
-                param('hello', 'world', 'ref', 'class="test"')
-            ]
-        );
+    .. literalinclude:: html_helper/017.php
+       :lines: 2-
 
     The above code will produce this:
 
@@ -431,10 +335,10 @@ The following functions are available:
     :rtype: string
 
     Lets you create HTML ``<param />`` tags. The first parameter contains the
-    param source. Example::
+    param source. Example:
 
-        echo param('movie.mov', 'video/quicktime', 'class="test"');
-        // <param src="movie.mov" type="video/quicktime" class="test"/>
+    .. literalinclude:: html_helper/018.php
+       :lines: 2-
 
 .. php:function:: track($name = ''[, $type = false[, $attributes = '']])
 
@@ -445,10 +349,10 @@ The following functions are available:
     :rtype: string
 
     Generates a track element to specify timed tracks. The tracks are
-    formatted in WebVTT format. Example::
+    formatted in WebVTT format. Example:
 
-        echo track('subtitles_no.vtt', 'subtitles', 'no', 'Norwegian No');
-        // <track src="subtitles_no.vtt" kind="subtitles" srclang="no" label="Norwegian No" />
+    .. literalinclude:: html_helper/019.php
+       :lines: 2-
 
 .. php:function:: doctype([$type = 'html5'])
 
@@ -459,13 +363,10 @@ The following functions are available:
     Helps you generate document type declarations, or DTD's. HTML 5
     is used by default, but many doctypes are available.
 
-    Example::
-
-        echo doctype();
-        // <!DOCTYPE html>
+    Example:
 
-        echo doctype('html4-trans');
-        // <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+    .. literalinclude:: html_helper/020.php
+       :lines: 2-
 
     The following is a list of the pre-defined doctype choices. These are configurable,
     pulled from **app/Config/DocTypes.php**, or they could be over-ridden in your **.env** configuration.
diff --git a/user_guide_src/source/helpers/html_helper/001.php b/user_guide_src/source/helpers/html_helper/001.php
new file mode 100644
index 000000000000..8163b563fc6e
--- /dev/null
+++ b/user_guide_src/source/helpers/html_helper/001.php
@@ -0,0 +1,3 @@
+<?php
+
+helper('html');
diff --git a/user_guide_src/source/helpers/html_helper/002.php b/user_guide_src/source/helpers/html_helper/002.php
new file mode 100644
index 000000000000..83dd68073970
--- /dev/null
+++ b/user_guide_src/source/helpers/html_helper/002.php
@@ -0,0 +1,4 @@
+<?php
+
+echo img('images/picture.jpg');
+// <img src="http://site.com/images/picture.jpg" />
diff --git a/user_guide_src/source/helpers/html_helper/003.php b/user_guide_src/source/helpers/html_helper/003.php
new file mode 100644
index 000000000000..1cf332ede621
--- /dev/null
+++ b/user_guide_src/source/helpers/html_helper/003.php
@@ -0,0 +1,4 @@
+<?php
+
+echo img('images/picture.jpg', true);
+// <img src="http://site.com/index.php/images/picture.jpg" alt="" />
diff --git a/user_guide_src/source/helpers/html_helper/004.php b/user_guide_src/source/helpers/html_helper/004.php
new file mode 100644
index 000000000000..79769391f49f
--- /dev/null
+++ b/user_guide_src/source/helpers/html_helper/004.php
@@ -0,0 +1,14 @@
+<?php
+
+$imageProperties = [
+    'src'    => 'images/picture.jpg',
+    'alt'    => 'Me, demonstrating how to eat 4 slices of pizza at one time',
+    'class'  => 'post_images',
+    'width'  => '200',
+    'height' => '200',
+    'title'  => 'That was quite a night',
+    'rel'    => 'lightbox',
+];
+
+img($imageProperties);
+// <img src="http://site.com/index.php/images/picture.jpg" alt="Me, demonstrating how to eat 4 slices of pizza at one time" class="post_images" width="200" height="200" title="That was quite a night" rel="lightbox" />
diff --git a/user_guide_src/source/helpers/html_helper/005.php b/user_guide_src/source/helpers/html_helper/005.php
new file mode 100644
index 000000000000..07c05813e74b
--- /dev/null
+++ b/user_guide_src/source/helpers/html_helper/005.php
@@ -0,0 +1,4 @@
+<?php
+
+$src = img_data('public/images/picture.jpg'); // data:image/jpg;base64,R0lGODl...
+echo img($src);
diff --git a/user_guide_src/source/helpers/html_helper/006.php b/user_guide_src/source/helpers/html_helper/006.php
new file mode 100644
index 000000000000..8285a12ba963
--- /dev/null
+++ b/user_guide_src/source/helpers/html_helper/006.php
@@ -0,0 +1,3 @@
+<?php
+
+$src = img_data('path/img_without_extension', 'image/png'); // data:image/png;base64,HT5A822...
diff --git a/user_guide_src/source/helpers/html_helper/007.php b/user_guide_src/source/helpers/html_helper/007.php
new file mode 100644
index 000000000000..3aaf220aac0c
--- /dev/null
+++ b/user_guide_src/source/helpers/html_helper/007.php
@@ -0,0 +1,4 @@
+<?php
+
+echo link_tag('css/mystyles.css');
+// <link href="http://site.com/css/mystyles.css" rel="stylesheet" type="text/css" />
diff --git a/user_guide_src/source/helpers/html_helper/008.php b/user_guide_src/source/helpers/html_helper/008.php
new file mode 100644
index 000000000000..ec6741ede834
--- /dev/null
+++ b/user_guide_src/source/helpers/html_helper/008.php
@@ -0,0 +1,7 @@
+<?php
+
+echo link_tag('favicon.ico', 'shortcut icon', 'image/ico');
+// <link href="http://site.com/favicon.ico" rel="shortcut icon" type="image/ico" />
+
+echo link_tag('feed', 'alternate', 'application/rss+xml', 'My RSS Feed');
+// <link href="http://site.com/feed" rel="alternate" type="application/rss+xml" title="My RSS Feed" />
diff --git a/user_guide_src/source/helpers/html_helper/009.php b/user_guide_src/source/helpers/html_helper/009.php
new file mode 100644
index 000000000000..b598137dba11
--- /dev/null
+++ b/user_guide_src/source/helpers/html_helper/009.php
@@ -0,0 +1,11 @@
+<?php
+
+$link = [
+    'href'  => 'css/printer.css',
+    'rel'   => 'stylesheet',
+    'type'  => 'text/css',
+    'media' => 'print',
+];
+
+echo link_tag($link);
+// <link href="http://site.com/css/printer.css" rel="stylesheet" type="text/css" media="print" />
diff --git a/user_guide_src/source/helpers/html_helper/010.php b/user_guide_src/source/helpers/html_helper/010.php
new file mode 100644
index 000000000000..45e68400e6c9
--- /dev/null
+++ b/user_guide_src/source/helpers/html_helper/010.php
@@ -0,0 +1,4 @@
+<?php
+
+echo script_tag('js/mystyles.js');
+// <script src="http://site.com/js/mystyles.js" type="text/javascript"></script>
diff --git a/user_guide_src/source/helpers/html_helper/011.php b/user_guide_src/source/helpers/html_helper/011.php
new file mode 100644
index 000000000000..0d15fc0e6c69
--- /dev/null
+++ b/user_guide_src/source/helpers/html_helper/011.php
@@ -0,0 +1,6 @@
+<?php
+
+$script = ['src'  => 'js/printer.js'];
+
+echo script_tag($script);
+// <script src="http://site.com/js/printer.js" type="text/javascript"></script>
diff --git a/user_guide_src/source/helpers/html_helper/012.php b/user_guide_src/source/helpers/html_helper/012.php
new file mode 100644
index 000000000000..941de51da134
--- /dev/null
+++ b/user_guide_src/source/helpers/html_helper/012.php
@@ -0,0 +1,15 @@
+<?php
+
+$list = [
+    'red',
+    'blue',
+    'green',
+    'yellow',
+];
+
+$attributes = [
+    'class' => 'boldlist',
+    'id'    => 'mylist',
+];
+
+echo ul($list, $attributes);
diff --git a/user_guide_src/source/helpers/html_helper/013.php b/user_guide_src/source/helpers/html_helper/013.php
new file mode 100644
index 000000000000..435ebc5535d2
--- /dev/null
+++ b/user_guide_src/source/helpers/html_helper/013.php
@@ -0,0 +1,38 @@
+<?php
+
+$attributes = [
+    'class' => 'boldlist',
+    'id'    => 'mylist',
+];
+
+$list = [
+    'colors' => [
+        'red',
+        'blue',
+        'green',
+    ],
+    'shapes' => [
+        'round',
+        'square',
+        'circles' => [
+            'ellipse',
+            'oval',
+            'sphere',
+        ],
+    ],
+    'moods'  => [
+        'happy',
+        'upset'   => [
+            'defeated' => [
+                'dejected',
+                'disheartened',
+                'depressed',
+            ],
+            'annoyed',
+            'cross',
+            'angry',
+        ]
+    ]
+];
+
+echo ul($list, $attributes);
diff --git a/user_guide_src/source/helpers/html_helper/014.php b/user_guide_src/source/helpers/html_helper/014.php
new file mode 100644
index 000000000000..505b771d5f1b
--- /dev/null
+++ b/user_guide_src/source/helpers/html_helper/014.php
@@ -0,0 +1,26 @@
+<?php
+
+$tracks = [
+    track('subtitles_no.vtt', 'subtitles', 'no', 'Norwegian No'),
+    track('subtitles_yes.vtt', 'subtitles', 'yes', 'Norwegian Yes')
+];
+
+echo video('test.mp4', 'Your browser does not support the video tag.', 'controls');
+
+echo video(
+    'http://www.codeigniter.com/test.mp4',
+    'Your browser does not support the video tag.',
+    'controls',
+    $tracks
+);
+
+echo video([
+    source('movie.mp4', 'video/mp4', 'class="test"'),
+    source('movie.ogg', 'video/ogg'),
+    source('movie.mov', 'video/quicktime'),
+    source('movie.ogv', 'video/ogv; codecs=dirac, speex')
+],
+    'Your browser does not support the video tag.',
+    'class="test" controls',
+    $tracks
+ );
diff --git a/user_guide_src/source/helpers/html_helper/015.php b/user_guide_src/source/helpers/html_helper/015.php
new file mode 100644
index 000000000000..9fa510b0dcdb
--- /dev/null
+++ b/user_guide_src/source/helpers/html_helper/015.php
@@ -0,0 +1,4 @@
+<?php
+
+echo source('movie.mp4', 'video/mp4', 'class="test"');
+// <source src="movie.mp4" type="video/mp4" class="test" />
diff --git a/user_guide_src/source/helpers/html_helper/016.php b/user_guide_src/source/helpers/html_helper/016.php
new file mode 100644
index 000000000000..6e8c60a8dd7c
--- /dev/null
+++ b/user_guide_src/source/helpers/html_helper/016.php
@@ -0,0 +1,4 @@
+<?php
+
+echo embed('movie.mov', 'video/quicktime', 'class="test"');
+// <embed src="movie.mov" type="video/quicktime" class="test"/>
diff --git a/user_guide_src/source/helpers/html_helper/017.php b/user_guide_src/source/helpers/html_helper/017.php
new file mode 100644
index 000000000000..a0b38b79e672
--- /dev/null
+++ b/user_guide_src/source/helpers/html_helper/017.php
@@ -0,0 +1,13 @@
+<?php
+
+echo object('movie.swf', 'application/x-shockwave-flash', 'class="test"');
+
+echo object(
+    'movie.swf',
+    'application/x-shockwave-flash',
+    'class="test"',
+    [
+        param('foo', 'bar', 'ref', 'class="test"'),
+        param('hello', 'world', 'ref', 'class="test"')
+    ]
+);
diff --git a/user_guide_src/source/helpers/html_helper/018.php b/user_guide_src/source/helpers/html_helper/018.php
new file mode 100644
index 000000000000..6056be4ff66b
--- /dev/null
+++ b/user_guide_src/source/helpers/html_helper/018.php
@@ -0,0 +1,4 @@
+<?php
+
+echo param('movie.mov', 'video/quicktime', 'class="test"');
+// <param src="movie.mov" type="video/quicktime" class="test"/>
diff --git a/user_guide_src/source/helpers/html_helper/019.php b/user_guide_src/source/helpers/html_helper/019.php
new file mode 100644
index 000000000000..d073fa12df96
--- /dev/null
+++ b/user_guide_src/source/helpers/html_helper/019.php
@@ -0,0 +1,4 @@
+<?php
+
+echo track('subtitles_no.vtt', 'subtitles', 'no', 'Norwegian No');
+// <track src="subtitles_no.vtt" kind="subtitles" srclang="no" label="Norwegian No" />
diff --git a/user_guide_src/source/helpers/html_helper/020.php b/user_guide_src/source/helpers/html_helper/020.php
new file mode 100644
index 000000000000..1bd614043095
--- /dev/null
+++ b/user_guide_src/source/helpers/html_helper/020.php
@@ -0,0 +1,7 @@
+<?php
+
+echo doctype();
+// <!DOCTYPE html>
+
+echo doctype('html4-trans');
+// <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
diff --git a/user_guide_src/source/helpers/inflector_helper.rst b/user_guide_src/source/helpers/inflector_helper.rst
index 924ee5b75559..690430ea1b63 100755
--- a/user_guide_src/source/helpers/inflector_helper.rst
+++ b/user_guide_src/source/helpers/inflector_helper.rst
@@ -12,9 +12,10 @@ The Inflector Helper file contains functions that permit you to change
 Loading this Helper
 ===================
 
-This helper is loaded using the following code::
+This helper is loaded using the following code:
 
-    helper('inflector');
+.. literalinclude:: inflector_helper/001.php
+   :lines: 2-
 
 Available Functions
 ===================
@@ -27,9 +28,10 @@ The following functions are available:
     :returns:    A singular word
     :rtype:    string
 
-    Changes a plural word to singular. Example::
+    Changes a plural word to singular. Example:
 
-        echo singular('dogs'); // Prints 'dog'
+    .. literalinclude:: inflector_helper/002.php
+       :lines: 2-
 
 .. php:function:: plural($string)
 
@@ -37,9 +39,10 @@ The following functions are available:
     :returns:    A plural word
     :rtype:    string
 
-    Changes a singular word to plural. Example::
+    Changes a singular word to plural. Example:
 
-        echo plural('dog'); // Prints 'dogs'
+    .. literalinclude:: inflector_helper/003.php
+       :lines: 2-
 
 .. php:function:: counted($count, $string)
 
@@ -48,9 +51,10 @@ The following functions are available:
     :returns:    A singular or plural phrase
     :rtype:    string
 
-    Changes a word and its count to a phrase. Example::
+    Changes a word and its count to a phrase. Example:
 
-        echo counted(3, 'dog'); // Prints '3 dogs'
+    .. literalinclude:: inflector_helper/004.php
+       :lines: 2-
 
 .. php:function:: camelize($string)
 
@@ -59,9 +63,10 @@ The following functions are available:
     :rtype:    string
 
     Changes a string of words separated by spaces or underscores to camel
-    case. Example::
+    case. Example:
 
-        echo camelize('my_dog_spot'); // Prints 'myDogSpot'
+    .. literalinclude:: inflector_helper/005.php
+       :lines: 2-
 
 .. php:function:: pascalize($string)
 
@@ -70,9 +75,10 @@ The following functions are available:
     :rtype:    string
 
     Changes a string of words separated by spaces or underscores to Pascal
-    case, which is camel case with the first letter capitalized. Example::
+    case, which is camel case with the first letter capitalized. Example:
 
-        echo pascalize('my_dog_spot'); // Prints 'MyDogSpot'
+    .. literalinclude:: inflector_helper/006.php
+       :lines: 2-
 
 .. php:function:: underscore($string)
 
@@ -81,9 +87,10 @@ The following functions are available:
     :rtype:    string
 
     Takes multiple words separated by spaces and underscores them.
-    Example::
+    Example:
 
-        echo underscore('my dog spot'); // Prints 'my_dog_spot'
+    .. literalinclude:: inflector_helper/007.php
+       :lines: 2-
 
 .. php:function:: humanize($string[, $separator = '_'])
 
@@ -95,13 +102,15 @@ The following functions are available:
     Takes multiple words separated by underscores and adds spaces between
     them. Each word is capitalized.
 
-    Example::
+    Example:
 
-        echo humanize('my_dog_spot'); // Prints 'My Dog Spot'
+    .. literalinclude:: inflector_helper/008.php
+       :lines: 2-
 
-    To use dashes instead of underscores::
+    To use dashes instead of underscores:
 
-        echo humanize('my-dog-spot', '-'); // Prints 'My Dog Spot'
+    .. literalinclude:: inflector_helper/009.php
+       :lines: 2-
 
 .. php:function:: is_pluralizable($word)
 
@@ -109,9 +118,10 @@ The following functions are available:
     :returns:    true if the word is countable or false if not
     :rtype:    bool
 
-    Checks if the given word has a plural version. Example::
+    Checks if the given word has a plural version. Example:
 
-        is_pluralizable('equipment'); // Returns false
+    .. literalinclude:: inflector_helper/010.php
+       :lines: 2-
 
 .. php:function:: dasherize($string)
 
@@ -119,9 +129,10 @@ The following functions are available:
     :returns:    Dasherized string
     :rtype:    string
 
-    Replaces underscores with dashes in the string. Example::
+    Replaces underscores with dashes in the string. Example:
 
-        dasherize('hello_world'); // Returns 'hello-world'
+    .. literalinclude:: inflector_helper/011.php
+       :lines: 2-
 
 .. php:function:: ordinal($integer)
 
@@ -131,9 +142,10 @@ The following functions are available:
 
     Returns the suffix that should be added to a
     number to denote the position such as
-    1st, 2nd, 3rd, 4th. Example::
+    1st, 2nd, 3rd, 4th. Example:
 
-        ordinal(1); // Returns 'st'
+    .. literalinclude:: inflector_helper/012.php
+       :lines: 2-
 
 .. php:function:: ordinalize($integer)
 
@@ -143,6 +155,7 @@ The following functions are available:
 
     Turns a number into an ordinal string used
     to denote the position such as 1st, 2nd, 3rd, 4th.
-    Example::
+    Example:
 
-        ordinalize(1); // Returns '1st'
+    .. literalinclude:: inflector_helper/013.php
+       :lines: 2-
diff --git a/user_guide_src/source/helpers/inflector_helper/001.php b/user_guide_src/source/helpers/inflector_helper/001.php
new file mode 100644
index 000000000000..985243995503
--- /dev/null
+++ b/user_guide_src/source/helpers/inflector_helper/001.php
@@ -0,0 +1,3 @@
+<?php
+
+helper('inflector');
diff --git a/user_guide_src/source/helpers/inflector_helper/002.php b/user_guide_src/source/helpers/inflector_helper/002.php
new file mode 100644
index 000000000000..d93c0469b5bf
--- /dev/null
+++ b/user_guide_src/source/helpers/inflector_helper/002.php
@@ -0,0 +1,3 @@
+<?php
+
+echo singular('dogs'); // Prints 'dog'
diff --git a/user_guide_src/source/helpers/inflector_helper/003.php b/user_guide_src/source/helpers/inflector_helper/003.php
new file mode 100644
index 000000000000..146c180a8818
--- /dev/null
+++ b/user_guide_src/source/helpers/inflector_helper/003.php
@@ -0,0 +1,3 @@
+<?php
+
+echo plural('dog'); // Prints 'dogs'
diff --git a/user_guide_src/source/helpers/inflector_helper/004.php b/user_guide_src/source/helpers/inflector_helper/004.php
new file mode 100644
index 000000000000..b73d7004e0c6
--- /dev/null
+++ b/user_guide_src/source/helpers/inflector_helper/004.php
@@ -0,0 +1,3 @@
+<?php
+
+echo counted(3, 'dog'); // Prints '3 dogs'
diff --git a/user_guide_src/source/helpers/inflector_helper/005.php b/user_guide_src/source/helpers/inflector_helper/005.php
new file mode 100644
index 000000000000..6aa2b39957ff
--- /dev/null
+++ b/user_guide_src/source/helpers/inflector_helper/005.php
@@ -0,0 +1,3 @@
+<?php
+
+echo camelize('my_dog_spot'); // Prints 'myDogSpot'
diff --git a/user_guide_src/source/helpers/inflector_helper/006.php b/user_guide_src/source/helpers/inflector_helper/006.php
new file mode 100644
index 000000000000..ddb4f00984d0
--- /dev/null
+++ b/user_guide_src/source/helpers/inflector_helper/006.php
@@ -0,0 +1,3 @@
+<?php
+
+echo pascalize('my_dog_spot'); // Prints 'MyDogSpot'
diff --git a/user_guide_src/source/helpers/inflector_helper/007.php b/user_guide_src/source/helpers/inflector_helper/007.php
new file mode 100644
index 000000000000..20682c30d59d
--- /dev/null
+++ b/user_guide_src/source/helpers/inflector_helper/007.php
@@ -0,0 +1,3 @@
+<?php
+
+echo underscore('my dog spot'); // Prints 'my_dog_spot'
diff --git a/user_guide_src/source/helpers/inflector_helper/008.php b/user_guide_src/source/helpers/inflector_helper/008.php
new file mode 100644
index 000000000000..8a3eb04f7d7c
--- /dev/null
+++ b/user_guide_src/source/helpers/inflector_helper/008.php
@@ -0,0 +1,3 @@
+<?php
+
+echo humanize('my_dog_spot'); // Prints 'My Dog Spot'
diff --git a/user_guide_src/source/helpers/inflector_helper/009.php b/user_guide_src/source/helpers/inflector_helper/009.php
new file mode 100644
index 000000000000..de7d42b90a19
--- /dev/null
+++ b/user_guide_src/source/helpers/inflector_helper/009.php
@@ -0,0 +1,3 @@
+<?php
+
+echo humanize('my-dog-spot', '-'); // Prints 'My Dog Spot'
diff --git a/user_guide_src/source/helpers/inflector_helper/010.php b/user_guide_src/source/helpers/inflector_helper/010.php
new file mode 100644
index 000000000000..60d0377435f9
--- /dev/null
+++ b/user_guide_src/source/helpers/inflector_helper/010.php
@@ -0,0 +1,3 @@
+<?php
+
+is_pluralizable('equipment'); // Returns false
diff --git a/user_guide_src/source/helpers/inflector_helper/011.php b/user_guide_src/source/helpers/inflector_helper/011.php
new file mode 100644
index 000000000000..48c0875dca20
--- /dev/null
+++ b/user_guide_src/source/helpers/inflector_helper/011.php
@@ -0,0 +1,3 @@
+<?php
+
+dasherize('hello_world'); // Returns 'hello-world'
diff --git a/user_guide_src/source/helpers/inflector_helper/012.php b/user_guide_src/source/helpers/inflector_helper/012.php
new file mode 100644
index 000000000000..3deeb59f8283
--- /dev/null
+++ b/user_guide_src/source/helpers/inflector_helper/012.php
@@ -0,0 +1,3 @@
+<?php
+
+ordinal(1); // Returns 'st'
diff --git a/user_guide_src/source/helpers/inflector_helper/013.php b/user_guide_src/source/helpers/inflector_helper/013.php
new file mode 100644
index 000000000000..082248b14f46
--- /dev/null
+++ b/user_guide_src/source/helpers/inflector_helper/013.php
@@ -0,0 +1,3 @@
+<?php
+
+ordinalize(1); // Returns '1st'
diff --git a/user_guide_src/source/helpers/number_helper.rst b/user_guide_src/source/helpers/number_helper.rst
index c085a59f8d12..41d0802fbe40 100644
--- a/user_guide_src/source/helpers/number_helper.rst
+++ b/user_guide_src/source/helpers/number_helper.rst
@@ -12,9 +12,10 @@ numeric data in a locale-aware manner.
 Loading this Helper
 ===================
 
-This helper is loaded using the following code::
+This helper is loaded using the following code:
 
-    helper('number');
+.. literalinclude:: number_helper/001.php
+   :lines: 2-
 
 When Things Go Wrong
 ====================
@@ -36,29 +37,23 @@ The following functions are available:
     :rtype:     string
 
     Formats numbers as bytes, based on size, and adds the appropriate
-    suffix. Examples::
+    suffix. Examples:
 
-        echo number_to_size(456); // Returns 456 Bytes
-        echo number_to_size(4567); // Returns 4.5 KB
-        echo number_to_size(45678); // Returns 44.6 KB
-        echo number_to_size(456789); // Returns 447.8 KB
-        echo number_to_size(3456789); // Returns 3.3 MB
-        echo number_to_size(12345678912345); // Returns 1.8 GB
-        echo number_to_size(123456789123456789); // Returns 11,228.3 TB
+    .. literalinclude:: number_helper/002.php
+       :lines: 2-
 
-    An optional second parameter allows you to set the precision of the result::
+    An optional second parameter allows you to set the precision of the result:
 
-        echo number_to_size(45678, 2); // Returns 44.61 KB
+    .. literalinclude:: number_helper/003.php
+       :lines: 2-
 
     An optional third parameter allows you to specify the locale that should
     be used when generating the number, and can affect the formatting. If no
     locale is specified, the Request will be analyzed and an appropriate
-    locale taken from the headers, or the app-default::
+    locale taken from the headers, or the app-default:
 
-        // Generates 11.2 TB
-        echo number_to_size(12345678912345, 1, 'en_US');
-        // Generates 11,2 TB
-        echo number_to_size(12345678912345, 1, 'fr_FR');
+    .. literalinclude:: number_helper/004.php
+       :lines: 2-
 
     .. note:: The text generated by this function is found in the following
         language file: *language/<your_lang>/Number.php*
@@ -72,20 +67,20 @@ The following functions are available:
     :rtype:     string
 
     Converts a number into a human-readable version, like **123.4 trillion**
-    for numbers up to the quadrillions. Examples::
+    for numbers up to the quadrillions. Examples:
 
-        echo number_to_amount(123456); // Returns 123 thousand
-        echo number_to_amount(123456789); // Returns 123 million
-        echo number_to_amount(1234567890123, 2); // Returns 1.23 trillion
-        echo number_to_amount('123,456,789,012', 2); // Returns 123.46 billion
+    .. literalinclude:: number_helper/005.php
+       :lines: 2-
 
-    An optional second parameter allows you to set the precision of the result::
+    An optional second parameter allows you to set the precision of the result:
 
-        echo number_to_amount(45678, 2); // Returns 45.68 thousand
+    .. literalinclude:: number_helper/006.php
+       :lines: 2-
 
-    An optional third parameter allows the locale to be specified::
+    An optional third parameter allows the locale to be specified:
 
-        echo number_to_amount('123,456,789,012', 2, 'de_DE'); // Returns 123,46 billion
+    .. literalinclude:: number_helper/007.php
+       :lines: 2-
 
 .. php:function:: number_to_currency($num, $currency[, $locale = null[, $fraction = 0]])
 
@@ -96,12 +91,10 @@ The following functions are available:
     :returns: The number as the appropriate currency for the locale
     :rtype: string
 
-    Converts a number in common currency formats, like USD, EUR, GBP, etc::
+    Converts a number in common currency formats, like USD, EUR, GBP, etc:
 
-        echo number_to_currency(1234.56, 'USD', 'en_US', 2);  // Returns $1,234.56
-        echo number_to_currency(1234.56, 'EUR', 'de_DE', 2);  // Returns 1.234,56 €
-        echo number_to_currency(1234.56, 'GBP', 'en_GB', 2);  // Returns £1,234.56
-        echo number_to_currency(1234.56, 'YEN', 'ja_JP', 2);  // Returns YEN 1,234.56
+    .. literalinclude:: number_helper/008.php
+       :lines: 2-
 
     If you don't specify a locale, the Request locale is used.
 
@@ -111,11 +104,10 @@ The following functions are available:
     :returns: The roman number converted from given parameter
     :rtype: string|null
 
-    Converts a number into roman::
+    Converts a number into roman:
 
-        echo number_to_roman(23);  // Returns XXIII
-        echo number_to_roman(324);  // Returns CCCXXIV
-        echo number_to_roman(2534);  // Returns MMDXXXIV
+    .. literalinclude:: number_helper/009.php
+       :lines: 2-
 
     This function only handles numbers in the range 1 through 3999.
     It will return null for any value outside that range.
diff --git a/user_guide_src/source/helpers/number_helper/001.php b/user_guide_src/source/helpers/number_helper/001.php
new file mode 100644
index 000000000000..9ff7e68b56c6
--- /dev/null
+++ b/user_guide_src/source/helpers/number_helper/001.php
@@ -0,0 +1,3 @@
+<?php
+
+helper('number');
diff --git a/user_guide_src/source/helpers/number_helper/002.php b/user_guide_src/source/helpers/number_helper/002.php
new file mode 100644
index 000000000000..befd65b84f95
--- /dev/null
+++ b/user_guide_src/source/helpers/number_helper/002.php
@@ -0,0 +1,9 @@
+<?php
+
+echo number_to_size(456); // Returns 456 Bytes
+echo number_to_size(4567); // Returns 4.5 KB
+echo number_to_size(45678); // Returns 44.6 KB
+echo number_to_size(456789); // Returns 447.8 KB
+echo number_to_size(3456789); // Returns 3.3 MB
+echo number_to_size(12345678912345); // Returns 1.8 GB
+echo number_to_size(123456789123456789); // Returns 11,228.3 TB
diff --git a/user_guide_src/source/helpers/number_helper/003.php b/user_guide_src/source/helpers/number_helper/003.php
new file mode 100644
index 000000000000..569e2cad6b78
--- /dev/null
+++ b/user_guide_src/source/helpers/number_helper/003.php
@@ -0,0 +1,3 @@
+<?php
+
+echo number_to_size(45678, 2); // Returns 44.61 KB
diff --git a/user_guide_src/source/helpers/number_helper/004.php b/user_guide_src/source/helpers/number_helper/004.php
new file mode 100644
index 000000000000..b5aa5cfa848a
--- /dev/null
+++ b/user_guide_src/source/helpers/number_helper/004.php
@@ -0,0 +1,6 @@
+<?php
+
+// Generates 11.2 TB
+echo number_to_size(12345678912345, 1, 'en_US');
+// Generates 11,2 TB
+echo number_to_size(12345678912345, 1, 'fr_FR');
diff --git a/user_guide_src/source/helpers/number_helper/005.php b/user_guide_src/source/helpers/number_helper/005.php
new file mode 100644
index 000000000000..f2bd4b646bf1
--- /dev/null
+++ b/user_guide_src/source/helpers/number_helper/005.php
@@ -0,0 +1,6 @@
+<?php
+
+echo number_to_amount(123456); // Returns 123 thousand
+echo number_to_amount(123456789); // Returns 123 million
+echo number_to_amount(1234567890123, 2); // Returns 1.23 trillion
+echo number_to_amount('123,456,789,012', 2); // Returns 123.46 billion
diff --git a/user_guide_src/source/helpers/number_helper/006.php b/user_guide_src/source/helpers/number_helper/006.php
new file mode 100644
index 000000000000..d9776905b0e8
--- /dev/null
+++ b/user_guide_src/source/helpers/number_helper/006.php
@@ -0,0 +1,3 @@
+<?php
+
+echo number_to_amount(45678, 2); // Returns 45.68 thousand
diff --git a/user_guide_src/source/helpers/number_helper/007.php b/user_guide_src/source/helpers/number_helper/007.php
new file mode 100644
index 000000000000..8ed9eb065bc1
--- /dev/null
+++ b/user_guide_src/source/helpers/number_helper/007.php
@@ -0,0 +1,3 @@
+<?php
+
+echo number_to_amount('123,456,789,012', 2, 'de_DE'); // Returns 123,46 billion
diff --git a/user_guide_src/source/helpers/number_helper/008.php b/user_guide_src/source/helpers/number_helper/008.php
new file mode 100644
index 000000000000..37aca1170e40
--- /dev/null
+++ b/user_guide_src/source/helpers/number_helper/008.php
@@ -0,0 +1,6 @@
+<?php
+
+echo number_to_currency(1234.56, 'USD', 'en_US', 2);  // Returns $1,234.56
+echo number_to_currency(1234.56, 'EUR', 'de_DE', 2);  // Returns 1.234,56 €
+echo number_to_currency(1234.56, 'GBP', 'en_GB', 2);  // Returns £1,234.56
+echo number_to_currency(1234.56, 'YEN', 'ja_JP', 2);  // Returns YEN 1,234.56
diff --git a/user_guide_src/source/helpers/number_helper/009.php b/user_guide_src/source/helpers/number_helper/009.php
new file mode 100644
index 000000000000..0a520a198943
--- /dev/null
+++ b/user_guide_src/source/helpers/number_helper/009.php
@@ -0,0 +1,5 @@
+<?php
+
+echo number_to_roman(23);  // Returns XXIII
+echo number_to_roman(324);  // Returns CCCXXIV
+echo number_to_roman(2534);  // Returns MMDXXXIV
diff --git a/user_guide_src/source/helpers/security_helper.rst b/user_guide_src/source/helpers/security_helper.rst
index b5ada61fe254..e5087556f83d 100644
--- a/user_guide_src/source/helpers/security_helper.rst
+++ b/user_guide_src/source/helpers/security_helper.rst
@@ -11,9 +11,10 @@ The Security Helper file contains security related functions.
 Loading this Helper
 ===================
 
-This helper is loaded using the following code::
+This helper is loaded using the following code:
 
-    helper('security');
+.. literalinclude:: security_helper/001.php
+   :lines: 2-
 
 Available Functions
 ===================
@@ -41,9 +42,10 @@ The following functions are available:
     This is a security function that will strip image tags from a string.
     It leaves the image URL as plain text.
 
-    Example::
+    Example:
 
-        $string = strip_image_tags($string);
+    .. literalinclude:: security_helper/002.php
+       :lines: 2-
 
 .. php:function:: encode_php_tags($str)
 
@@ -53,6 +55,7 @@ The following functions are available:
 
     This is a security function that converts PHP tags to entities.
 
-    Example::
+    Example:
 
-        $string = encode_php_tags($string);
+    .. literalinclude:: security_helper/003.php
+       :lines: 2-
diff --git a/user_guide_src/source/helpers/security_helper/001.php b/user_guide_src/source/helpers/security_helper/001.php
new file mode 100644
index 000000000000..e06bb8876dec
--- /dev/null
+++ b/user_guide_src/source/helpers/security_helper/001.php
@@ -0,0 +1,3 @@
+<?php
+
+helper('security');
diff --git a/user_guide_src/source/helpers/security_helper/002.php b/user_guide_src/source/helpers/security_helper/002.php
new file mode 100644
index 000000000000..692c5518bae9
--- /dev/null
+++ b/user_guide_src/source/helpers/security_helper/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$string = strip_image_tags($string);
diff --git a/user_guide_src/source/helpers/security_helper/003.php b/user_guide_src/source/helpers/security_helper/003.php
new file mode 100644
index 000000000000..1cfbb1288be2
--- /dev/null
+++ b/user_guide_src/source/helpers/security_helper/003.php
@@ -0,0 +1,3 @@
+<?php
+
+$string = encode_php_tags($string);
diff --git a/user_guide_src/source/helpers/test_helper.rst b/user_guide_src/source/helpers/test_helper.rst
index f6a59d6e6c11..d0678f853158 100644
--- a/user_guide_src/source/helpers/test_helper.rst
+++ b/user_guide_src/source/helpers/test_helper.rst
@@ -11,9 +11,10 @@ The Test Helper file contains functions that assist in testing your project.
 Loading this Helper
 ===================
 
-This helper is loaded using the following code::
+This helper is loaded using the following code:
 
-    helper('test');
+.. literalinclude:: test_helper/001.php
+   :lines: 2-
 
 Available Functions
 ===================
@@ -29,11 +30,7 @@ The following functions are available:
 
     Uses ``CodeIgniter\Test\Fabricator`` to create a random item and add it to the database.
 
-    Usage example::
+    Usage example:
 
-        public function testUserAccess()
-        {
-            $user = fake('App\Models\UserModel');
-            
-            $this->assertTrue($this->userHasAccess($user));
-        }
+    .. literalinclude:: test_helper/002.php
+       :lines: 2-
diff --git a/user_guide_src/source/helpers/test_helper/001.php b/user_guide_src/source/helpers/test_helper/001.php
new file mode 100644
index 000000000000..6bbc62605b25
--- /dev/null
+++ b/user_guide_src/source/helpers/test_helper/001.php
@@ -0,0 +1,3 @@
+<?php
+
+helper('test');
diff --git a/user_guide_src/source/helpers/test_helper/002.php b/user_guide_src/source/helpers/test_helper/002.php
new file mode 100644
index 000000000000..58decc5bfeb3
--- /dev/null
+++ b/user_guide_src/source/helpers/test_helper/002.php
@@ -0,0 +1,8 @@
+<?php
+
+public function testUserAccess()
+{
+    $user = fake('App\Models\UserModel');
+
+    $this->assertTrue($this->userHasAccess($user));
+}
diff --git a/user_guide_src/source/helpers/text_helper.rst b/user_guide_src/source/helpers/text_helper.rst
index 0c842677a001..ebc1784c305c 100755
--- a/user_guide_src/source/helpers/text_helper.rst
+++ b/user_guide_src/source/helpers/text_helper.rst
@@ -11,9 +11,10 @@ The Text Helper file contains functions that assist in working with Text.
 Loading this Helper
 ===================
 
-This helper is loaded using the following code::
+This helper is loaded using the following code:
 
-    helper('text');
+.. literalinclude:: text_helper/001.php
+   :lines: 2-
 
 Available Functions
 ===================
@@ -42,9 +43,10 @@ The following functions are available:
     - **sha1**: An encrypted random number based on ``sha1()`` (fixed length of 40).
     - **crypto**: A random string based on ``random_bytes()``.
 
-    Usage example::
+    Usage example:
 
-        echo random_string('alnum', 16);
+    .. literalinclude:: text_helper/002.php
+       :lines: 2-
 
 .. php:function:: increment_string($str[, $separator = '_'[, $first = 1]])
 
@@ -58,11 +60,10 @@ The following functions are available:
     number. Useful for creating "copies" or a file or duplicating database
     content which has unique titles or slugs.
 
-    Usage example::
+    Usage example:
 
-        echo increment_string('file', '_'); // "file_1"
-        echo increment_string('file', '-', 2); // "file-2"
-        echo increment_string('file_4'); // "file_5"
+    .. literalinclude:: text_helper/003.php
+       :lines: 2-
 
 .. php:function:: alternator($args)
 
@@ -71,20 +72,16 @@ The following functions are available:
     :rtype:    mixed
 
     Allows two or more items to be alternated between, when cycling through
-    a loop. Example::
+    a loop. Example:
 
-        for ($i = 0; $i < 10; $i++) {     
-            echo alternator('string one', 'string two');
-        }
+    .. literalinclude:: text_helper/004.php
+       :lines: 2-
 
     You can add as many parameters as you want, and with each iteration of
     your loop the next item will be returned.
 
-    ::
-
-        for ($i = 0; $i < 10; $i++) {     
-            echo alternator('one', 'two', 'three', 'four', 'five');
-        }
+    .. literalinclude:: text_helper/005.php
+       :lines: 2-
 
     .. note:: To use multiple separate calls to this function simply call the
         function with no arguments to re-initialize.
@@ -98,10 +95,10 @@ The following functions are available:
     Converts double slashes in a string to a single slash, except those
     found in URL protocol prefixes (e.g., http&#58;//).
 
-    Example::
+    Example:
 
-        $string = "http://example.com//index.php";
-        echo reduce_double_slashes($string); // results in "http://example.com/index.php"
+    .. literalinclude:: text_helper/006.php
+       :lines: 2-
 
 .. php:function:: strip_slashes($data)
 
@@ -111,21 +108,15 @@ The following functions are available:
 
     Removes any slashes from an array of strings.
 
-    Example::
-
-        $str = [
-            'question' => "Is your name O\'reilly?",
-            'answer'   => "No, my name is O\'connor."
-        ];
+    Example:
 
-        $str = strip_slashes($str);
+    .. literalinclude:: text_helper/007.php
+       :lines: 2-
 
-    The above will return the following array::
+    The above will return the following array:
 
-        [
-            'question' => "Is your name O'reilly?",
-            'answer'   => "No, my name is O'connor."
-        ];
+    .. literalinclude:: text_helper/008.php
+       :lines: 2-
 
     .. note:: For historical reasons, this function will also accept
         and handle string inputs. This however makes it just an
@@ -140,16 +131,16 @@ The following functions are available:
     :rtype:    string
 
     Reduces multiple instances of a particular character occurring directly
-    after each other. Example::
+    after each other. Example:
 
-        $string = "Fred, Bill,, Joe, Jimmy";
-        $string = reduce_multiples($string, ","); // results in "Fred, Bill, Joe, Jimmy"
+    .. literalinclude:: text_helper/009.php
+       :lines: 2-
 
     If the third parameter is set to true it will remove occurrences of the
-    character at the beginning and the end of the string. Example::
+    character at the beginning and the end of the string. Example:
 
-        $string = ",Fred, Bill,, Joe, Jimmy,";
-        $string = reduce_multiples($string, ", ", true); // results in "Fred, Bill, Joe, Jimmy"
+    .. literalinclude:: text_helper/010.php
+       :lines: 2-
 
 .. php:function:: quotes_to_entities($str)
 
@@ -158,10 +149,10 @@ The following functions are available:
     :rtype:    string
 
     Converts single and double quotes in a string to the corresponding HTML
-    entities. Example::
+    entities. Example:
 
-        $string = "Joe's \"dinner\"";
-        $string = quotes_to_entities($string); //results in "Joe&#39;s &quot;dinner&quot;"
+    .. literalinclude:: text_helper/011.php
+       :lines: 2-
 
 .. php:function:: strip_quotes($str)
 
@@ -169,10 +160,10 @@ The following functions are available:
     :returns:    String with quotes stripped
     :rtype:    string
 
-    Removes single and double quotes from a string. Example::
+    Removes single and double quotes from a string. Example:
 
-        $string = "Joe's \"dinner\"";
-        $string = strip_quotes($string); //results in "Joes dinner"
+    .. literalinclude:: text_helper/012.php
+       :lines: 2-
 
 .. php:function:: word_limiter($str[, $limit = 100[, $end_char = '&#8230;']])
 
@@ -182,11 +173,10 @@ The following functions are available:
     :returns:    Word-limited string
     :rtype:    string
 
-    Truncates a string to the number of *words* specified. Example::
+    Truncates a string to the number of *words* specified. Example:
 
-        $string = "Here is a nice text string consisting of eleven words.";
-        $string = word_limiter($string, 4);
-        // Returns:  Here is a nice
+    .. literalinclude:: text_helper/013.php
+       :lines: 2-
 
     The third parameter is an optional suffix added to the string. By
     default it adds an ellipsis.
@@ -203,11 +193,10 @@ The following functions are available:
     maintains the integrity of words so the character count may be slightly
     more or less than what you specify.
 
-    Example::
+    Example:
 
-        $string = "Here is a nice text string consisting of eleven words.";
-        $string = character_limiter($string, 20);
-        // Returns:  Here is a nice text string
+    .. literalinclude:: text_helper/014.php
+       :lines: 2-
 
     The third parameter is an optional suffix added to the string, if
     undeclared this helper uses an ellipsis.
@@ -229,9 +218,10 @@ The following functions are available:
     but for the most part, it should correctly identify characters outside
     the normal range (like accented characters).
 
-    Example::
+    Example:
 
-        $string = ascii_to_entities($string);
+    .. literalinclude:: text_helper/015.php
+       :lines: 2-
 
 .. php:function:: entities_to_ascii($str[, $all = true])
 
@@ -253,9 +243,10 @@ The following functions are available:
     when non-English characters need to be used where only standard ASCII
     characters are safely used, for instance, in URLs.
 
-    Example::
+    Example:
 
-        $string = convert_accented_characters($string);
+    .. literalinclude:: text_helper/016.php
+       :lines: 2-
 
     .. note:: This function uses a companion config file
         **app/Config/ForeignCharacters.php** to define the to and
@@ -275,10 +266,10 @@ The following functions are available:
     a replacement value for the words. If not specified they are replaced
     with pound signs: ####.
 
-    Example::
+    Example:
 
-        $disallowed = ['darn', 'shucks', 'golly', 'phooey'];
-        $string     = word_censor($string, $disallowed, 'Beep!');
+    .. literalinclude:: text_helper/017.php
+       :lines: 2-
 
 .. php:function:: highlight_code($str)
 
@@ -286,9 +277,10 @@ The following functions are available:
     :returns:    String with code highlighted via HTML
     :rtype:    string
 
-    Colorizes a string of code (PHP, HTML, etc.). Example::
+    Colorizes a string of code (PHP, HTML, etc.). Example:
 
-        $string = highlight_code($string);
+    .. literalinclude:: text_helper/018.php
+       :lines: 2-
 
     The function uses PHP's ``highlight_string()`` function, so the
     colors used are the ones specified in your php.ini file.
@@ -307,10 +299,10 @@ The following functions are available:
     to highlight. The third and fourth parameters will contain the
     opening/closing HTML tags you would like the phrase wrapped in.
 
-    Example::
+    Example:
 
-        $string = "Here is a nice text string about nothing in particular.";
-        echo highlight_phrase($string, "nice text", '<span style="color:#990000;">', '</span>');
+    .. literalinclude:: text_helper/019.php
+       :lines: 2-
 
     The above code prints::
 
@@ -336,18 +328,10 @@ The following functions are available:
     Wraps text at the specified *character* count while maintaining
     complete words.
 
-    Example::
-
-        $string = "Here is a simple string of text that will help us demonstrate this function.";
-        echo word_wrap($string, 25);
+    Example:
 
-        // Would produce:
-        // Here is a simple string
-        // of text that will help us
-        // demonstrate this
-        // function.
-
-        Excessively long words will be split, but URLs will not be.
+    .. literalinclude:: text_helper/020.php
+       :lines: 2-
 
 .. php:function:: ellipsize($str, $max_length[, $position = 1[, $ellipsis = '&hellip;']])
 
@@ -370,10 +354,10 @@ The following functions are available:
     An optional fourth parameter is the kind of ellipsis. By default,
     &hellip; will be inserted.
 
-    Example::
+    Example:
 
-        $str = 'this_string_is_entirely_too_long_and_might_break_my_design.jpg';
-        echo ellipsize($str, 32, .5);
+    .. literalinclude:: text_helper/021.php
+       :lines: 2-
 
     Produces::
 
@@ -397,18 +381,10 @@ The following functions are available:
     passed, the excerpt will include the first $radius characters with the ellipsis
     at the end.
 
-    Example::
-
-        $text = 'Ut vel faucibus odio. Quisque quis congue libero. Etiam gravida
-        eros lorem, eget porttitor augue dignissim tincidunt. In eget risus eget
-        mauris faucibus molestie vitae ultricies odio. Vestibulum id ultricies diam.
-        Curabitur non mauris lectus. Phasellus eu sodales sem. Integer dictum purus
-        ac enim hendrerit gravida. Donec ac magna vel nunc tincidunt molestie sed
-        vitae nisl. Cras sed auctor mauris, non dictum tortor. Nulla vel scelerisque
-        arcu. Cras ac ipsum sit amet augue laoreet laoreet. Aenean a risus lacus.
-        Sed ut tortor diam.';
+    Example:
 
-        echo excerpt($text, 'Donec');
+    .. literalinclude:: text_helper/022.php
+       :lines: 2-
 
     Produces::
 
diff --git a/user_guide_src/source/helpers/text_helper/001.php b/user_guide_src/source/helpers/text_helper/001.php
new file mode 100644
index 000000000000..fdf999c3d9c6
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/001.php
@@ -0,0 +1,3 @@
+<?php
+
+helper('text');
diff --git a/user_guide_src/source/helpers/text_helper/002.php b/user_guide_src/source/helpers/text_helper/002.php
new file mode 100644
index 000000000000..54ee0e766c46
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/002.php
@@ -0,0 +1,3 @@
+<?php
+
+echo random_string('alnum', 16);
diff --git a/user_guide_src/source/helpers/text_helper/003.php b/user_guide_src/source/helpers/text_helper/003.php
new file mode 100644
index 000000000000..a87d8372686e
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/003.php
@@ -0,0 +1,5 @@
+<?php
+
+echo increment_string('file', '_'); // "file_1"
+echo increment_string('file', '-', 2); // "file-2"
+echo increment_string('file_4'); // "file_5"
diff --git a/user_guide_src/source/helpers/text_helper/004.php b/user_guide_src/source/helpers/text_helper/004.php
new file mode 100644
index 000000000000..9cf47e02fd7a
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/004.php
@@ -0,0 +1,5 @@
+<?php
+
+for ($i = 0; $i < 10; $i++) {
+    echo alternator('string one', 'string two');
+}
diff --git a/user_guide_src/source/helpers/text_helper/005.php b/user_guide_src/source/helpers/text_helper/005.php
new file mode 100644
index 000000000000..8863848dbc01
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/005.php
@@ -0,0 +1,5 @@
+<?php
+
+for ($i = 0; $i < 10; $i++) {
+    echo alternator('one', 'two', 'three', 'four', 'five');
+}
diff --git a/user_guide_src/source/helpers/text_helper/006.php b/user_guide_src/source/helpers/text_helper/006.php
new file mode 100644
index 000000000000..4c564c6da0f6
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/006.php
@@ -0,0 +1,4 @@
+<?php
+
+$string = "http://example.com//index.php";
+echo reduce_double_slashes($string); // results in "http://example.com/index.php"
diff --git a/user_guide_src/source/helpers/text_helper/007.php b/user_guide_src/source/helpers/text_helper/007.php
new file mode 100644
index 000000000000..82306af31aab
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/007.php
@@ -0,0 +1,8 @@
+<?php
+
+$str = [
+    'question' => "Is your name O\'reilly?",
+    'answer'   => "No, my name is O\'connor."
+];
+
+$str = strip_slashes($str);
diff --git a/user_guide_src/source/helpers/text_helper/008.php b/user_guide_src/source/helpers/text_helper/008.php
new file mode 100644
index 000000000000..073f97ff0046
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/008.php
@@ -0,0 +1,6 @@
+<?php
+
+[
+    'question' => "Is your name O'reilly?",
+    'answer'   => "No, my name is O'connor."
+];
diff --git a/user_guide_src/source/helpers/text_helper/009.php b/user_guide_src/source/helpers/text_helper/009.php
new file mode 100644
index 000000000000..8081482f17eb
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/009.php
@@ -0,0 +1,4 @@
+<?php
+
+$string = "Fred, Bill,, Joe, Jimmy";
+$string = reduce_multiples($string, ","); // results in "Fred, Bill, Joe, Jimmy"
diff --git a/user_guide_src/source/helpers/text_helper/010.php b/user_guide_src/source/helpers/text_helper/010.php
new file mode 100644
index 000000000000..45cdcc98bf21
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/010.php
@@ -0,0 +1,4 @@
+<?php
+
+$string = ",Fred, Bill,, Joe, Jimmy,";
+$string = reduce_multiples($string, ", ", true); // results in "Fred, Bill, Joe, Jimmy"
diff --git a/user_guide_src/source/helpers/text_helper/011.php b/user_guide_src/source/helpers/text_helper/011.php
new file mode 100644
index 000000000000..793d3551b555
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/011.php
@@ -0,0 +1,4 @@
+<?php
+
+$string = "Joe's \"dinner\"";
+$string = quotes_to_entities($string); //results in "Joe&#39;s &quot;dinner&quot;"
diff --git a/user_guide_src/source/helpers/text_helper/012.php b/user_guide_src/source/helpers/text_helper/012.php
new file mode 100644
index 000000000000..1aacfb1e5dc8
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/012.php
@@ -0,0 +1,4 @@
+<?php
+
+$string = "Joe's \"dinner\"";
+$string = strip_quotes($string); //results in "Joes dinner"
diff --git a/user_guide_src/source/helpers/text_helper/013.php b/user_guide_src/source/helpers/text_helper/013.php
new file mode 100644
index 000000000000..a48bc596d2fb
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/013.php
@@ -0,0 +1,5 @@
+<?php
+
+$string = "Here is a nice text string consisting of eleven words.";
+$string = word_limiter($string, 4);
+// Returns:  Here is a nice
diff --git a/user_guide_src/source/helpers/text_helper/014.php b/user_guide_src/source/helpers/text_helper/014.php
new file mode 100644
index 000000000000..853da16b0346
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/014.php
@@ -0,0 +1,5 @@
+<?php
+
+$string = "Here is a nice text string consisting of eleven words.";
+$string = character_limiter($string, 20);
+// Returns:  Here is a nice text string
diff --git a/user_guide_src/source/helpers/text_helper/015.php b/user_guide_src/source/helpers/text_helper/015.php
new file mode 100644
index 000000000000..abeaeab7c339
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/015.php
@@ -0,0 +1,3 @@
+<?php
+
+$string = ascii_to_entities($string);
diff --git a/user_guide_src/source/helpers/text_helper/016.php b/user_guide_src/source/helpers/text_helper/016.php
new file mode 100644
index 000000000000..756bc901b56e
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/016.php
@@ -0,0 +1,3 @@
+<?php
+
+$string = convert_accented_characters($string);
diff --git a/user_guide_src/source/helpers/text_helper/017.php b/user_guide_src/source/helpers/text_helper/017.php
new file mode 100644
index 000000000000..b1be7eceed3c
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/017.php
@@ -0,0 +1,4 @@
+<?php
+
+$disallowed = ['darn', 'shucks', 'golly', 'phooey'];
+$string     = word_censor($string, $disallowed, 'Beep!');
diff --git a/user_guide_src/source/helpers/text_helper/018.php b/user_guide_src/source/helpers/text_helper/018.php
new file mode 100644
index 000000000000..b8803c0aad9f
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/018.php
@@ -0,0 +1,3 @@
+<?php
+
+$string = highlight_code($string);
diff --git a/user_guide_src/source/helpers/text_helper/019.php b/user_guide_src/source/helpers/text_helper/019.php
new file mode 100644
index 000000000000..e543d6784a78
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/019.php
@@ -0,0 +1,4 @@
+<?php
+
+$string = "Here is a nice text string about nothing in particular.";
+echo highlight_phrase($string, "nice text", '<span style="color:#990000;">', '</span>');
diff --git a/user_guide_src/source/helpers/text_helper/020.php b/user_guide_src/source/helpers/text_helper/020.php
new file mode 100644
index 000000000000..a6de1d0f67f0
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/020.php
@@ -0,0 +1,12 @@
+<?php
+
+$string = "Here is a simple string of text that will help us demonstrate this function.";
+echo word_wrap($string, 25);
+
+// Would produce:
+// Here is a simple string
+// of text that will help us
+// demonstrate this
+// function.
+
+Excessively long words will be split, but URLs will not be.
\ No newline at end of file
diff --git a/user_guide_src/source/helpers/text_helper/021.php b/user_guide_src/source/helpers/text_helper/021.php
new file mode 100644
index 000000000000..d99033311105
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/021.php
@@ -0,0 +1,4 @@
+<?php
+
+$str = 'this_string_is_entirely_too_long_and_might_break_my_design.jpg';
+echo ellipsize($str, 32, .5);
diff --git a/user_guide_src/source/helpers/text_helper/022.php b/user_guide_src/source/helpers/text_helper/022.php
new file mode 100644
index 000000000000..76a300a7fe6c
--- /dev/null
+++ b/user_guide_src/source/helpers/text_helper/022.php
@@ -0,0 +1,12 @@
+<?php
+
+$text = 'Ut vel faucibus odio. Quisque quis congue libero. Etiam gravida
+eros lorem, eget porttitor augue dignissim tincidunt. In eget risus eget
+mauris faucibus molestie vitae ultricies odio. Vestibulum id ultricies diam.
+Curabitur non mauris lectus. Phasellus eu sodales sem. Integer dictum purus
+ac enim hendrerit gravida. Donec ac magna vel nunc tincidunt molestie sed
+vitae nisl. Cras sed auctor mauris, non dictum tortor. Nulla vel scelerisque
+arcu. Cras ac ipsum sit amet augue laoreet laoreet. Aenean a risus lacus.
+Sed ut tortor diam.';
+
+echo excerpt($text, 'Donec');
diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst
index b3f5daf5e439..5ce922578e45 100644
--- a/user_guide_src/source/helpers/url_helper.rst
+++ b/user_guide_src/source/helpers/url_helper.rst
@@ -36,17 +36,18 @@ The following functions are available:
     changes.
 
     Segments can be optionally passed to the function as a string or an
-    array. Here is a string example::
+    array. Here is a string example:
 
-        echo site_url('news/local/123');
+    .. literalinclude:: url_helper/001.php
+       :lines: 2-
 
     The above example would return something like:
     *http://example.com/index.php/news/local/123*
 
-    Here is an example of segments passed as an array::
+    Here is an example of segments passed as an array:
 
-        $segments = ['news', 'local', '123'];
-        echo site_url($segments);
+    .. literalinclude:: url_helper/002.php
+       :lines: 2-
 
     You may find the alternate configuration useful if generating URLs for a
     different site than yours, which contains different configuration preferences.
@@ -59,25 +60,28 @@ The following functions are available:
     :returns: Base URL
     :rtype: string
 
-    Returns your site base URL, as specified in your config file. Example::
+    Returns your site base URL, as specified in your config file. Example:
 
-        echo base_url();
+    .. literalinclude:: url_helper/002-2.php
+       :lines: 2-
 
     This function returns the same thing as :php:func:`site_url()`, without
     the *indexPage* being appended.
 
     Also like :php:func:`site_url()`, you can supply segments as a string or
-    an array. Here is a string example::
+    an array. Here is a string example:
 
-        echo base_url('blog/post/123');
+    .. literalinclude:: url_helper/002-3.php
+       :lines: 2-
 
     The above example would return something like:
     *http://example.com/blog/post/123*
 
     This is useful because unlike :php:func:`site_url()`, you can supply a
-    string to a file, such as an image or stylesheet. For example::
+    string to a file, such as an image or stylesheet. For example:
 
-        echo base_url('images/icons/edit.png');
+    .. literalinclude:: url_helper/002-4.php
+       :lines: 2-
 
     This would give you something like:
     *http://example.com/images/icons/edit.png*
@@ -93,9 +97,9 @@ The following functions are available:
     viewed.
 
     .. note:: Calling this function is the same as doing this:
-        ::
 
-            site_url(uri_string());
+        .. literalinclude:: url_helper/003.php
+           :lines: 2-
 
 .. important:: Prior to **4.1.2** this function had a bug causing it to ignore the configuration on ``App::$indexPage``.
 
@@ -141,9 +145,10 @@ The following functions are available:
     :rtype:    string
 
     Returns your site **indexPage**, as specified in your config file.
-    Example::
+    Example:
 
-        echo index_page();
+    .. literalinclude:: url_helper/004.php
+       :lines: 2-
 
     As with :php:func:`site_url()`, you may specify an alternate configuration.
     You may find the alternate configuration useful if generating URLs for a
@@ -177,16 +182,10 @@ The following functions are available:
     added to the link. The attributes can be a simple string or an
     associative array.
 
-    Here are some examples::
+    Here are some examples:
 
-        echo anchor('news/local/123', 'My News', 'title="News title"');
-        // Prints: <a href="http://example.com/index.php/news/local/123" title="News title">My News</a>
-
-        echo anchor('news/local/123', 'My News', ['title' => 'The best news!']);
-        // Prints: <a href="http://example.com/index.php/news/local/123" title="The best news!">My News</a>
-
-        echo anchor('', 'Click here');
-        // Prints: <a href="http://example.com/index.php">Click here</a>
+    .. literalinclude:: url_helper/005.php
+       :lines: 2-
 
     As above, you may specify an alternate configuration.
     You may find the alternate configuration useful if generating links for a
@@ -210,20 +209,10 @@ The following functions are available:
     If the third parameter is not set it will simply open a new window with
     your own browser settings.
 
-    Here is an example with attributes::
-
-        $atts = [
-            'width'       => 800,
-            'height'      => 600,
-            'scrollbars'  => 'yes',
-            'status'      => 'yes',
-            'resizable'   => 'yes',
-            'screenx'     => 0,
-            'screeny'     => 0,
-            'window_name' => '_blank',
-        ];
+    Here is an example with attributes:
 
-        echo anchor_popup('news/local/123', 'Click Me!', $atts);
+    .. literalinclude:: url_helper/006.php
+       :lines: 2-
 
     As above, you may specify an alternate configuration.
     You may find the alternate configuration useful if generating links for a
@@ -233,9 +222,10 @@ The following functions are available:
     .. note:: The above attributes are the function defaults so you only need to
         set the ones that are different from what you need. If you want the
         function to use all of its defaults simply pass an empty array in the
-        third parameter::
+        third parameter:
 
-            echo anchor_popup('news/local/123', 'Click Me!', []);
+        .. literalinclude:: url_helper/007.php
+           :lines: 2-
 
     .. note:: The **window_name** is not really an attribute, but an argument to
         the JavaScript `window.open() <https://www.w3schools.com/jsref/met_win_open.asp>`_
@@ -254,15 +244,16 @@ The following functions are available:
     :returns: A "mail to" hyperlink
     :rtype: string
 
-    Creates a standard HTML e-mail link. Usage example::
+    Creates a standard HTML e-mail link. Usage example:
 
-        echo mailto('me@my-site.com', 'Click Here to Contact Me');
+    .. literalinclude:: url_helper/008.php
+       :lines: 2-
 
     As with the :php:func:`anchor()` tab above, you can set attributes using the
-    third parameter::
+    third parameter:
 
-        $attributes = ['title' => 'Mail me'];
-        echo mailto('me@my-site.com', 'Contact Me', $attributes);
+    .. literalinclude:: url_helper/009.php
+       :lines: 2-
 
     .. note:: Attributes passed into the mailto function are automatically escaped to protected against XSS attacks.
 
@@ -287,27 +278,31 @@ The following functions are available:
     :rtype: string
 
     Automatically turns URLs and e-mail addresses contained in a string into
-    links. Example::
+    links. Example:
 
-        $string = auto_link($string);
+    .. literalinclude:: url_helper/010.php
+       :lines: 2-
 
     The second parameter determines whether URLs and e-mails are converted or
     just one or the other. The default behavior is both if the parameter is not
     specified. E-mail links are encoded as :php:func:`safe_mailto()` as shown
     above.
 
-    Converts only URLs::
+    Converts only URLs:
 
-        $string = auto_link($string, 'url');
+    .. literalinclude:: url_helper/011.php
+       :lines: 2-
 
-    Converts only e-mail addresses::
+    Converts only e-mail addresses:
 
-        $string = auto_link($string, 'email');
+    .. literalinclude:: url_helper/012.php
+       :lines: 2-
 
     The third parameter determines whether links are shown in a new window.
-    The value can be true or false (boolean)::
+    The value can be true or false (boolean):
 
-        $string = auto_link($string, 'both', true);
+    .. literalinclude:: url_helper/013.php
+       :lines: 2-
 
     .. note:: The only URLs recognized are those that start with "www." or with "://".
 
@@ -321,29 +316,26 @@ The following functions are available:
 
     Takes a string as input and creates a human-friendly URL string. This is
     useful if, for example, you have a blog in which you'd like to use the
-    title of your entries in the URL. Example::
+    title of your entries in the URL. Example:
 
-        $title     = "What's wrong with CSS?";
-        $url_title = url_title($title);
-        // Produces: Whats-wrong-with-CSS
+    .. literalinclude:: url_helper/014.php
+       :lines: 2-
 
     The second parameter determines the word delimiter. By default dashes
     are used. Preferred options are: **-** (dash) or **_** (underscore).
 
-    Example::
+    Example:
 
-        $title     = "What's wrong with CSS?";
-        $url_title = url_title($title, '_');
-        // Produces: Whats_wrong_with_CSS
+    .. literalinclude:: url_helper/015.php
+       :lines: 2-
 
     The third parameter determines whether or not lowercase characters are
     forced. By default they are not. Options are boolean true/false.
 
-    Example::
+    Example:
 
-        $title     = "What's wrong with CSS?";
-        $url_title = url_title($title, '-', true);
-        // Produces: whats-wrong-with-css
+    .. literalinclude:: url_helper/016.php
+       :lines: 2-
 
 .. php:function:: mb_url_title($str[, $separator = '-'[, $lowercase = false]])
 
@@ -366,9 +358,10 @@ The following functions are available:
     This function will add *http://* or *https://* in the event that a protocol prefix
     is missing from a URL.
 
-    Pass the URL string to the function like this::
+    Pass the URL string to the function like this:
 
-        $url = prep_url('example.com');
+    .. literalinclude:: url_helper/017.php
+       :lines: 2-
 
 .. php:function:: url_to($controller[, ...$args])
 
@@ -377,14 +370,16 @@ The following functions are available:
     :returns: Absolute URL
     :rtype: string
 
-    Builds an absolute URL to a controller method in your app. Example::
+    Builds an absolute URL to a controller method in your app. Example:
 
-        echo url_to('Home::index');
+    .. literalinclude:: url_helper/018.php
+       :lines: 2-
 
     You can also add arguments to the route.
-    Here is an example::
+    Here is an example:
 
-        echo url_to('Page::index', 'home');
+    .. literalinclude:: url_helper/019.php
+       :lines: 2-
 
     The above example would return something like:
     *http://example.com/page/home*
@@ -397,14 +392,16 @@ The following functions are available:
     :param string $path: The path to check the current URI path against.
     :rtype: boolean
 
-    Compares the current URL's path against the given path to see if they match. Example::
+    Compares the current URL's path against the given path to see if they match. Example:
 
-        if (url_is('admin')) { ... }
+    .. literalinclude:: url_helper/020.php
+       :lines: 2-
 
     This would match ``http://example.com/admin``. You can use the ``*`` wildcard to match
-    any other applicable characters in the URL::
+    any other applicable characters in the URL:
 
-        if (url_is('admin*')) { ... }
+    .. literalinclude:: url_helper/021.php
+       :lines: 2-
 
     This would match any of the following:
 
diff --git a/user_guide_src/source/helpers/url_helper/001.php b/user_guide_src/source/helpers/url_helper/001.php
new file mode 100644
index 000000000000..cf11aa2d2541
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/001.php
@@ -0,0 +1,3 @@
+<?php
+
+echo site_url('news/local/123');
diff --git a/user_guide_src/source/helpers/url_helper/002-2.php b/user_guide_src/source/helpers/url_helper/002-2.php
new file mode 100644
index 000000000000..fc388607fec6
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/002-2.php
@@ -0,0 +1,3 @@
+<?php
+
+echo base_url();
diff --git a/user_guide_src/source/helpers/url_helper/002-3.php b/user_guide_src/source/helpers/url_helper/002-3.php
new file mode 100644
index 000000000000..e820085b3c59
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/002-3.php
@@ -0,0 +1,3 @@
+<?php
+
+echo base_url('blog/post/123');
diff --git a/user_guide_src/source/helpers/url_helper/002-4.php b/user_guide_src/source/helpers/url_helper/002-4.php
new file mode 100644
index 000000000000..c2f4d9d7a632
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/002-4.php
@@ -0,0 +1,3 @@
+<?php
+
+echo base_url('images/icons/edit.png');
diff --git a/user_guide_src/source/helpers/url_helper/002.php b/user_guide_src/source/helpers/url_helper/002.php
new file mode 100644
index 000000000000..bffe46e40094
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/002.php
@@ -0,0 +1,4 @@
+<?php
+
+$segments = ['news', 'local', '123'];
+echo site_url($segments);
diff --git a/user_guide_src/source/helpers/url_helper/003.php b/user_guide_src/source/helpers/url_helper/003.php
new file mode 100644
index 000000000000..e6bd1a239fcd
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/003.php
@@ -0,0 +1,3 @@
+<?php
+
+site_url(uri_string());
diff --git a/user_guide_src/source/helpers/url_helper/004.php b/user_guide_src/source/helpers/url_helper/004.php
new file mode 100644
index 000000000000..35ae47978306
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/004.php
@@ -0,0 +1,3 @@
+<?php
+
+echo index_page();
diff --git a/user_guide_src/source/helpers/url_helper/005.php b/user_guide_src/source/helpers/url_helper/005.php
new file mode 100644
index 000000000000..01919bd92af4
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/005.php
@@ -0,0 +1,10 @@
+<?php
+
+echo anchor('news/local/123', 'My News', 'title="News title"');
+// Prints: <a href="http://example.com/index.php/news/local/123" title="News title">My News</a>
+
+echo anchor('news/local/123', 'My News', ['title' => 'The best news!']);
+// Prints: <a href="http://example.com/index.php/news/local/123" title="The best news!">My News</a>
+
+echo anchor('', 'Click here');
+// Prints: <a href="http://example.com/index.php">Click here</a>
diff --git a/user_guide_src/source/helpers/url_helper/006.php b/user_guide_src/source/helpers/url_helper/006.php
new file mode 100644
index 000000000000..960bc6f0430e
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/006.php
@@ -0,0 +1,14 @@
+<?php
+
+$atts = [
+    'width'       => 800,
+    'height'      => 600,
+    'scrollbars'  => 'yes',
+    'status'      => 'yes',
+    'resizable'   => 'yes',
+    'screenx'     => 0,
+    'screeny'     => 0,
+    'window_name' => '_blank',
+];
+
+echo anchor_popup('news/local/123', 'Click Me!', $atts);
diff --git a/user_guide_src/source/helpers/url_helper/007.php b/user_guide_src/source/helpers/url_helper/007.php
new file mode 100644
index 000000000000..cb1e202af757
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/007.php
@@ -0,0 +1,3 @@
+<?php
+
+echo anchor_popup('news/local/123', 'Click Me!', []);
diff --git a/user_guide_src/source/helpers/url_helper/008.php b/user_guide_src/source/helpers/url_helper/008.php
new file mode 100644
index 000000000000..82026cdbfef8
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/008.php
@@ -0,0 +1,3 @@
+<?php
+
+echo mailto('me@my-site.com', 'Click Here to Contact Me');
diff --git a/user_guide_src/source/helpers/url_helper/009.php b/user_guide_src/source/helpers/url_helper/009.php
new file mode 100644
index 000000000000..dcd65cd2bfcf
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/009.php
@@ -0,0 +1,4 @@
+<?php
+
+$attributes = ['title' => 'Mail me'];
+echo mailto('me@my-site.com', 'Contact Me', $attributes);
diff --git a/user_guide_src/source/helpers/url_helper/010.php b/user_guide_src/source/helpers/url_helper/010.php
new file mode 100644
index 000000000000..65bf083b99cf
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/010.php
@@ -0,0 +1,3 @@
+<?php
+
+$string = auto_link($string);
diff --git a/user_guide_src/source/helpers/url_helper/011.php b/user_guide_src/source/helpers/url_helper/011.php
new file mode 100644
index 000000000000..24c9ecf27d7e
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/011.php
@@ -0,0 +1,3 @@
+<?php
+
+$string = auto_link($string, 'url');
diff --git a/user_guide_src/source/helpers/url_helper/012.php b/user_guide_src/source/helpers/url_helper/012.php
new file mode 100644
index 000000000000..905e2b9c1338
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/012.php
@@ -0,0 +1,3 @@
+<?php
+
+$string = auto_link($string, 'email');
diff --git a/user_guide_src/source/helpers/url_helper/013.php b/user_guide_src/source/helpers/url_helper/013.php
new file mode 100644
index 000000000000..4ee151df4b12
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/013.php
@@ -0,0 +1,3 @@
+<?php
+
+$string = auto_link($string, 'both', true);
diff --git a/user_guide_src/source/helpers/url_helper/014.php b/user_guide_src/source/helpers/url_helper/014.php
new file mode 100644
index 000000000000..84a8191e27a1
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/014.php
@@ -0,0 +1,5 @@
+<?php
+
+$title     = "What's wrong with CSS?";
+$url_title = url_title($title);
+// Produces: Whats-wrong-with-CSS
diff --git a/user_guide_src/source/helpers/url_helper/015.php b/user_guide_src/source/helpers/url_helper/015.php
new file mode 100644
index 000000000000..550029c6c3aa
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/015.php
@@ -0,0 +1,5 @@
+<?php
+
+$title     = "What's wrong with CSS?";
+$url_title = url_title($title, '_');
+// Produces: Whats_wrong_with_CSS
diff --git a/user_guide_src/source/helpers/url_helper/016.php b/user_guide_src/source/helpers/url_helper/016.php
new file mode 100644
index 000000000000..1aa3a23aad7e
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/016.php
@@ -0,0 +1,5 @@
+<?php
+
+$title     = "What's wrong with CSS?";
+$url_title = url_title($title, '-', true);
+// Produces: whats-wrong-with-css
diff --git a/user_guide_src/source/helpers/url_helper/017.php b/user_guide_src/source/helpers/url_helper/017.php
new file mode 100644
index 000000000000..0e104faa8fb6
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/017.php
@@ -0,0 +1,3 @@
+<?php
+
+$url = prep_url('example.com');
diff --git a/user_guide_src/source/helpers/url_helper/018.php b/user_guide_src/source/helpers/url_helper/018.php
new file mode 100644
index 000000000000..64f4916d018e
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/018.php
@@ -0,0 +1,3 @@
+<?php
+
+echo url_to('Home::index');
diff --git a/user_guide_src/source/helpers/url_helper/019.php b/user_guide_src/source/helpers/url_helper/019.php
new file mode 100644
index 000000000000..ec799947ec72
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/019.php
@@ -0,0 +1,3 @@
+<?php
+
+echo url_to('Page::index', 'home');
diff --git a/user_guide_src/source/helpers/url_helper/020.php b/user_guide_src/source/helpers/url_helper/020.php
new file mode 100644
index 000000000000..2c17057179f9
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/020.php
@@ -0,0 +1,3 @@
+<?php
+
+if (url_is('admin')) { ... }
diff --git a/user_guide_src/source/helpers/url_helper/021.php b/user_guide_src/source/helpers/url_helper/021.php
new file mode 100644
index 000000000000..54e3270e6789
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/021.php
@@ -0,0 +1,3 @@
+<?php
+
+if (url_is('admin*')) { ... }
diff --git a/user_guide_src/source/helpers/xml_helper.rst b/user_guide_src/source/helpers/xml_helper.rst
index ac72f26891f9..7ab8e0a1e0e1 100644
--- a/user_guide_src/source/helpers/xml_helper.rst
+++ b/user_guide_src/source/helpers/xml_helper.rst
@@ -14,9 +14,8 @@ Loading this Helper
 
 This helper is loaded using the following code
 
-::
-
-    helper('xml');
+.. literalinclude:: xml_helper/001.php
+   :lines: 2-
 
 Available Functions
 ===================
@@ -39,11 +38,10 @@ The following functions are available:
       - Dashes: -
 
     This function ignores ampersands if they are part of existing numbered
-    character entities, e.g., &#123;. Example::
+    character entities, e.g., &#123;. Example:
 
-        $string = '<p>Here is a paragraph & an entity (&#123;).</p>';
-        $string = xml_convert($string);
-        echo $string;
+    .. literalinclude:: xml_helper/002.php
+       :lines: 2-
 
     outputs:
 
diff --git a/user_guide_src/source/helpers/xml_helper/001.php b/user_guide_src/source/helpers/xml_helper/001.php
new file mode 100644
index 000000000000..f92f3a7da3c2
--- /dev/null
+++ b/user_guide_src/source/helpers/xml_helper/001.php
@@ -0,0 +1,3 @@
+<?php
+
+helper('xml');
diff --git a/user_guide_src/source/helpers/xml_helper/002.php b/user_guide_src/source/helpers/xml_helper/002.php
new file mode 100644
index 000000000000..ef0b5c09c10f
--- /dev/null
+++ b/user_guide_src/source/helpers/xml_helper/002.php
@@ -0,0 +1,5 @@
+<?php
+
+$string = '<p>Here is a paragraph & an entity (&#123;).</p>';
+$string = xml_convert($string);
+echo $string;
diff --git a/user_guide_src/source/incoming/content_negotiation.rst b/user_guide_src/source/incoming/content_negotiation.rst
index 8122a4a910b5..0db8e8f23c5d 100644
--- a/user_guide_src/source/incoming/content_negotiation.rst
+++ b/user_guide_src/source/incoming/content_negotiation.rst
@@ -13,17 +13,19 @@ can handle this for you.
 Loading the Class
 =================
 
-You can load an instance of the class manually through the Service class::
+You can load an instance of the class manually through the Service class:
 
-    $negotiate = \Config\Services::negotiator();
+.. literalinclude:: content_negotiation/001.php
+   :lines: 2-
 
 This will grab the current request instance and automatically inject it into the Negotiator class.
 
 This class does not need to be loaded on it's own. Instead, it can be accessed through this request's ``IncomingRequest``
 instance. While you cannot access it directly this way, you can easily access all of methods through the ``negotiate()``
-method::
+method:
 
-    $request->negotiate('media', ['foo', 'bar']);
+.. literalinclude:: content_negotiation/002.php
+   :lines: 2-
 
 When accessed this way, the first parameter is the type of content you're trying to find a match for, while the
 second is an array of supported values.
@@ -47,26 +49,18 @@ from an API endpoint::
     Accept: application/json
 
 The server now needs to provide a list of what type of content it can provide. In this example, the API might
-be able to return data as raw HTML, JSON, or XML. This list should be provided in order of preference::
+be able to return data as raw HTML, JSON, or XML. This list should be provided in order of preference:
 
-    $supported = [
-        'application/json',
-        'text/html',
-        'application/xml',
-    ];
-
-    $format = $request->negotiate('media', $supported);
-    // or
-    $format = $negotiate->media($supported);
+.. literalinclude:: content_negotiation/003.php
+   :lines: 2-
 
 In this case, both the client and the server can agree on formatting the data as JSON so 'json' is returned from
 the negotiate method. By default, if no match is found, the first element in the ``$supported`` array would be returned.
 In some cases, though, you might need to enforce the format to be a strict match. If you pass ``true`` as the
-final value, it will return an empty string if no match is found::
+final value, it will return an empty string if no match is found:
 
-    $format = $request->negotiate('media', $supported, true);
-    // or
-    $format = $negotiate->media($supported, true);
+.. literalinclude:: content_negotiation/004.php
+   :lines: 2-
 
 Language
 ========
@@ -80,16 +74,10 @@ header::
     Accept-Language: fr; q=1.0, en; q=0.5
 
 In this example, the browser would prefer French, with a second choice of English. If your website supports English
-and German you would do something like::
-
-    $supported = [
-        'en',
-        'de',
-    ];
+and German you would do something like:
 
-    $lang = $request->negotiate('language', $supported);
-    // or
-    $lang = $negotiate->language($supported);
+.. literalinclude:: content_negotiation/005.php
+   :lines: 2-
 
 In this example, 'en' would be returned as the current language. If no match is found, it will return the first element
 in the ``$supported`` array, so that should always be the preferred language.
@@ -103,11 +91,10 @@ specify the type of compression the client supports::
     GET /foo HTTP/1.1
     Accept-Encoding: compress, gzip
 
-Your web server will define what types of compression you can use. Some, like Apache, only support **gzip**::
+Your web server will define what types of compression you can use. Some, like Apache, only support **gzip**:
 
-    $type = $request->negotiate('encoding', ['gzip']);
-    // or
-    $type = $negotiate->encoding(['gzip']);
+.. literalinclude:: content_negotiation/006.php
+   :lines: 2-
 
 See more at `Wikipedia <https://en.wikipedia.org/wiki/HTTP_compression>`_.
 
@@ -119,8 +106,7 @@ The desired character set is passed through the ``Accept-Charset`` header::
     GET /foo HTTP/1.1
     Accept-Charset: utf-16, utf-8
 
-By default, if no matches are found, **utf-8** will be returned::
+By default, if no matches are found, **utf-8** will be returned:
 
-    $charset = $request->negotiate('charset', ['utf-8']);
-    // or
-    $charset = $negotiate->charset(['utf-8']);
+.. literalinclude:: content_negotiation/007.php
+   :lines: 2-
diff --git a/user_guide_src/source/incoming/content_negotiation/001.php b/user_guide_src/source/incoming/content_negotiation/001.php
new file mode 100644
index 000000000000..3c55e788eff9
--- /dev/null
+++ b/user_guide_src/source/incoming/content_negotiation/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$negotiate = \Config\Services::negotiator();
diff --git a/user_guide_src/source/incoming/content_negotiation/002.php b/user_guide_src/source/incoming/content_negotiation/002.php
new file mode 100644
index 000000000000..ff54d077b0e3
--- /dev/null
+++ b/user_guide_src/source/incoming/content_negotiation/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$request->negotiate('media', ['foo', 'bar']);
diff --git a/user_guide_src/source/incoming/content_negotiation/003.php b/user_guide_src/source/incoming/content_negotiation/003.php
new file mode 100644
index 000000000000..262a4d74f3be
--- /dev/null
+++ b/user_guide_src/source/incoming/content_negotiation/003.php
@@ -0,0 +1,11 @@
+<?php
+
+$supported = [
+    'application/json',
+    'text/html',
+    'application/xml',
+];
+
+$format = $request->negotiate('media', $supported);
+// or
+$format = $negotiate->media($supported);
diff --git a/user_guide_src/source/incoming/content_negotiation/004.php b/user_guide_src/source/incoming/content_negotiation/004.php
new file mode 100644
index 000000000000..c02b2219fb2b
--- /dev/null
+++ b/user_guide_src/source/incoming/content_negotiation/004.php
@@ -0,0 +1,5 @@
+<?php
+
+$format = $request->negotiate('media', $supported, true);
+// or
+$format = $negotiate->media($supported, true);
diff --git a/user_guide_src/source/incoming/content_negotiation/005.php b/user_guide_src/source/incoming/content_negotiation/005.php
new file mode 100644
index 000000000000..a5413d43f94d
--- /dev/null
+++ b/user_guide_src/source/incoming/content_negotiation/005.php
@@ -0,0 +1,10 @@
+<?php
+
+$supported = [
+    'en',
+    'de',
+];
+
+$lang = $request->negotiate('language', $supported);
+// or
+$lang = $negotiate->language($supported);
diff --git a/user_guide_src/source/incoming/content_negotiation/006.php b/user_guide_src/source/incoming/content_negotiation/006.php
new file mode 100644
index 000000000000..3cd6d0378617
--- /dev/null
+++ b/user_guide_src/source/incoming/content_negotiation/006.php
@@ -0,0 +1,5 @@
+<?php
+
+$type = $request->negotiate('encoding', ['gzip']);
+// or
+$type = $negotiate->encoding(['gzip']);
diff --git a/user_guide_src/source/incoming/content_negotiation/007.php b/user_guide_src/source/incoming/content_negotiation/007.php
new file mode 100644
index 000000000000..eeaf3a26c876
--- /dev/null
+++ b/user_guide_src/source/incoming/content_negotiation/007.php
@@ -0,0 +1,5 @@
+<?php
+
+$charset = $request->negotiate('charset', ['utf-8']);
+// or
+$charset = $negotiate->charset(['utf-8']);
diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 2fee4580dffb..6d0dbcc8e055 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -8,7 +8,6 @@ Controllers are the heart of your application, as they determine how HTTP reques
     :local:
     :depth: 2
 
-
 What is a Controller?
 =====================
 
@@ -32,19 +31,9 @@ also extend the ``CodeIgniter\Controller`` if you do not need the functionality
 The BaseController provides a convenient place for loading components and performing functions that are needed by all your
 controllers. You can extend this class in any new controller.
 
-For security reasons be sure to declare any new utility methods as ``protected`` or ``private``.::
-
-    <?php
+For security reasons be sure to declare any new utility methods as ``protected`` or ``private``.:
 
-    namespace App\Controllers;
-
-    class Helloworld extends BaseController
-    {
-        public function index()
-        {
-            echo 'Hello World!';
-        }
-    }
+.. literalinclude:: controllers/001.php
 
 Then save the file to your **/app/Controllers/** directory.
 
@@ -60,38 +49,17 @@ If you did it right you should see::
 
 .. important:: Controller class names MUST start with an uppercase letter and ONLY the first character can be uppercase.
 
-This is valid::
-
-    <?php
-
-    namespace App\Controllers;
-
-    class Helloworld extends BaseController
-    {
-
-    }
+This is valid:
 
-This is **not** valid::
+.. literalinclude:: controllers/002.php
 
-    <?php
+This is **not** valid:
 
-    namespace App\Controllers;
+.. literalinclude:: controllers/003.php
 
-    class helloworld extends BaseController
-    {
+This is **not** valid:
 
-    }
-
-This is **not** valid::
-
-    <?php
-
-    namespace App\Controllers;
-
-    class HelloWorld extends BaseController
-    {
-
-    }
+.. literalinclude:: controllers/004.php
 
 Also, always make sure your controller extends the parent controller
 class so that it can inherit all its methods.
@@ -103,11 +71,10 @@ class so that it can inherit all its methods.
     If you want another naming convention you need to manually define it using the
     :doc:`URI Routing <routing>` feature.
 
-    Here is an example based on PSR-4 Autoloader::
-
-        \<NamespaceName>(\<SubNamespaceNames>)*\<ClassName>
+    Here is an example based on PSR-4 Autoloader:
 
-        $routes->get('helloworld', '\App\Controllers\HelloWorld::index');
+    .. literalinclude:: controllers/005.php
+       :lines: 2-
 
 Methods
 =======
@@ -121,24 +88,9 @@ empty. Another way to show your "Hello World" message would be this::
 **The second segment of the URI determines which method in the
 controller gets called.**
 
-Let's try it. Add a new method to your controller::
+Let's try it. Add a new method to your controller:
 
-    <?php
-
-    namespace App\Controllers;
-
-    class Helloworld extends BaseController
-    {
-        public function index()
-        {
-            echo 'Hello World!';
-        }
-
-        public function comment()
-        {
-            echo 'I am not flat!';
-        }
-    }
+.. literalinclude:: controllers/006.php
 
 Now load the following URL to see the comment method::
 
@@ -156,20 +108,9 @@ For example, let's say you have a URI like this::
 
     example.com/index.php/products/shoes/sandals/123
 
-Your method will be passed URI segments 3 and 4 (``'sandals'`` and ``'123'``)::
+Your method will be passed URI segments 3 and 4 (``'sandals'`` and ``'123'``):
 
-    <?php
-
-    namespace App\Controllers;
-
-    class Products extends BaseController
-    {
-        public function shoes($sandals, $id)
-        {
-            echo $sandals;
-            echo $id;
-        }
-    }
+.. literalinclude:: controllers/007.php
 
 .. important:: If you are using the :doc:`URI Routing <routing>`
     feature, the segments passed to your method will be the re-routed
@@ -183,15 +124,17 @@ present, as will be the case when only your site root URL is requested. Let's tr
 with the ``Helloworld`` controller.
 
 To specify a default controller open your **app/Config/Routes.php**
-file and set this variable::
+file and set this variable:
 
-    $routes->setDefaultController('Helloworld');
+.. literalinclude:: controllers/008.php
+   :lines: 2-
 
 Where ``Helloworld`` is the name of the controller class you want to be used.
 
-A few lines further down **Routes.php** in the "Route Definitions" section, comment out the line::
+A few lines further down **Routes.php** in the "Route Definitions" section, comment out the line:
 
-    $routes->get('/', 'Home::index');
+.. literalinclude:: controllers/009.php
+   :lines: 2-
 
 If you now browse to your site without specifying any URI segments you'll
 see the “Hello World” message.
@@ -206,12 +149,10 @@ Remapping Method Calls
 
 As noted above, the second segment of the URI typically determines which
 method in the controller gets called. CodeIgniter permits you to override
-this behavior through the use of the ``_remap()`` method::
+this behavior through the use of the ``_remap()`` method:
 
-    public function _remap()
-    {
-        // Some code here...
-    }
+.. literalinclude:: controllers/010.php
+   :lines: 2-
 
 .. important:: If your controller contains a method named ``_remap()``,
     it will **always** get called regardless of what your URI contains. It
@@ -219,32 +160,18 @@ this behavior through the use of the ``_remap()`` method::
     is called, allowing you to define your own method routing rules.
 
 The overridden method call (typically the second segment of the URI) will
-be passed as a parameter to the ``_remap()`` method::
+be passed as a parameter to the ``_remap()`` method:
 
-    public function _remap($method)
-    {
-        if ($method === 'some_method') {
-            return $this->$method();
-        } else {
-            return $this->default_method();
-        }
-    }
+.. literalinclude:: controllers/011.php
+   :lines: 2-
 
 Any extra segments after the method name are passed into ``_remap()``. These parameters can be passed to the method
 to emulate CodeIgniter's default behavior.
 
-Example::
-
-    public function _remap($method, ...$params)
-    {
-        $method = 'process_'.$method;
+Example:
 
-        if (method_exists($this, $method)) {
-            return $this->$method(...$params);
-        }
-
-        throw \CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound();
-    }
+.. literalinclude:: controllers/012.php
+   :lines: 2-
 
 Private methods
 ===============
@@ -252,12 +179,10 @@ Private methods
 In some cases, you may want certain methods hidden from public access.
 To achieve this, simply declare the method as ``private`` or ``protected``.
 That will prevent it from being served by a URL request. For example,
-if you were to define a method like this for the ``Helloworld`` controller::
+if you were to define a method like this for the ``Helloworld`` controller:
 
-    protected function utility()
-    {
-        // some code
-    }
+.. literalinclude:: controllers/013.php
+   :lines: 2-
 
 then trying to access it using the following URL will not work::
 
@@ -295,7 +220,6 @@ your **app/Config/Routes.php** file.
 
 CodeIgniter also permits you to remap your URIs using its :doc:`URI Routing <routing>` feature.
 
-
 Included Properties
 ===================
 
@@ -320,19 +244,17 @@ An instance of the :doc:`Logger <../general/logging>` class is available as a cl
 **forceHTTPS**
 
 A convenience method for forcing a method to be accessed via HTTPS is available within all
-controllers::
+controllers:
 
-    if (! $this->request->isSecure()) {
-        $this->forceHTTPS();
-    }
+.. literalinclude:: controllers/014.php
+   :lines: 2-
 
 By default, and in modern browsers that support the HTTP Strict Transport Security header, this
 call should force the browser to convert non-HTTPS calls to HTTPS calls for one year. You can
-modify this by passing the duration (in seconds) as the first parameter::
+modify this by passing the duration (in seconds) as the first parameter:
 
-    if (! $this->request->isSecure()) {
-        $this->forceHTTPS(31536000); // one year
-    }
+.. literalinclude:: controllers/015.php
+   :lines: 2-
 
 .. note:: A number of :doc:`time-based constants </general/common_functions>` are always available for you to use, including ``YEAR``, ``MONTH``, and more.
 
@@ -341,14 +263,10 @@ Helpers
 
 You can define an array of helper files as a class property. Whenever the controller is loaded
 these helper files will be automatically loaded into memory so that you can use their methods anywhere
-inside the controller::
-
-    namespace App\Controllers;
+inside the controller:
 
-    class MyController extends BaseController
-    {
-        protected $helpers = ['url', 'form'];
-    }
+.. literalinclude:: controllers/016.php
+   :lines: 2-
 
 .. _controllers-validating-data:
 
@@ -364,35 +282,16 @@ and in the optional second parameter, an array of custom error messages to displ
 if the items are not valid. Internally, this uses the controller's
 ``$this->request`` instance to get the data to be validated.
 The :doc:`Validation Library docs </libraries/validation>` have details on
-rule and message array formats, as well as available rules.::
-
-    public function updateUser(int $userID)
-    {
-        if (! $this->validate([
-            'email' => "required|is_unique[users.email,id,{$userID}]",
-            'name'  => 'required|alpha_numeric_spaces'
-        ])) {
-            return view('users/update', [
-                'errors' => $this->validator->getErrors()
-            ]);
-        }
-
-        // do something here if successful...
-    }
+rule and message array formats, as well as available rules.:
 
-If you find it simpler to keep the rules in the configuration file, you can replace
-the ``$rules`` array with the name of the group as defined in ``Config\Validation.php``::
+.. literalinclude:: controllers/017.php
+   :lines: 2-
 
-    public function updateUser(int $userID)
-    {
-        if (! $this->validate('userRules')) {
-            return view('users/update', [
-                'errors' => $this->validator->getErrors()
-            ]);
-        }
+If you find it simpler to keep the rules in the configuration file, you can replace
+the ``$rules`` array with the name of the group as defined in ``Config\Validation.php``:
 
-        // do something here if successful...
-    }
+.. literalinclude:: controllers/018.php
+   :lines: 2-
 
 .. note:: Validation can also be handled automatically in the model, but sometimes it's easier to do it in the controller. Where is up to you.
 
@@ -401,25 +300,10 @@ $this->validateData()
 
 Sometimes you may want to check the controller method parameters or other custom data.
 In that case, you can use the ``$this->validateData()`` method.
-The method accepts an array of data to validate in the first parameter::
-
-    public function product(int $id)
-    {
-        $data = [
-            'id'   => $id,
-            'name' => $this->request->getVar('name'),
-        ];
-        $rule = [
-            'id'   => 'integer',
-            'name' => 'required|max_length[255]',
-        ];
-
-        if (! $this->validateData($data, $rule) {
-            // ...
-        }
-
-        // ...
-    }
+The method accepts an array of data to validate in the first parameter:
+
+.. literalinclude:: controllers/019.php
+   :lines: 2-
 
 That's it!
 ==========
diff --git a/user_guide_src/source/incoming/controllers/001.php b/user_guide_src/source/incoming/controllers/001.php
new file mode 100644
index 000000000000..926de1e9fbdf
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/001.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Controllers;
+
+class Helloworld extends BaseController
+{
+    public function index()
+    {
+        echo 'Hello World!';
+    }
+}
diff --git a/user_guide_src/source/incoming/controllers/002.php b/user_guide_src/source/incoming/controllers/002.php
new file mode 100644
index 000000000000..663ac8682499
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/002.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Controllers;
+
+class Helloworld extends BaseController
+{
+
+}
diff --git a/user_guide_src/source/incoming/controllers/003.php b/user_guide_src/source/incoming/controllers/003.php
new file mode 100644
index 000000000000..cc324c127c55
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/003.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Controllers;
+
+class helloworld extends BaseController
+{
+
+}
diff --git a/user_guide_src/source/incoming/controllers/004.php b/user_guide_src/source/incoming/controllers/004.php
new file mode 100644
index 000000000000..7eb66a416bba
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/004.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Controllers;
+
+class HelloWorld extends BaseController
+{
+
+}
diff --git a/user_guide_src/source/incoming/controllers/005.php b/user_guide_src/source/incoming/controllers/005.php
new file mode 100644
index 000000000000..5d3892bfafb8
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/005.php
@@ -0,0 +1,5 @@
+<?php
+
+\<NamespaceName>(\<SubNamespaceNames>)*\<ClassName>
+
+$routes->get('helloworld', '\App\Controllers\HelloWorld::index');
diff --git a/user_guide_src/source/incoming/controllers/006.php b/user_guide_src/source/incoming/controllers/006.php
new file mode 100644
index 000000000000..e43c3e4f2b34
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/006.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Controllers;
+
+class Helloworld extends BaseController
+{
+    public function index()
+    {
+        echo 'Hello World!';
+    }
+
+    public function comment()
+    {
+        echo 'I am not flat!';
+    }
+}
diff --git a/user_guide_src/source/incoming/controllers/007.php b/user_guide_src/source/incoming/controllers/007.php
new file mode 100644
index 000000000000..319fd8471a7b
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/007.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Controllers;
+
+class Products extends BaseController
+{
+    public function shoes($sandals, $id)
+    {
+        echo $sandals;
+        echo $id;
+    }
+}
diff --git a/user_guide_src/source/incoming/controllers/008.php b/user_guide_src/source/incoming/controllers/008.php
new file mode 100644
index 000000000000..2de1b716d040
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/008.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->setDefaultController('Helloworld');
diff --git a/user_guide_src/source/incoming/controllers/009.php b/user_guide_src/source/incoming/controllers/009.php
new file mode 100644
index 000000000000..d799d1cf0fb5
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/009.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->get('/', 'Home::index');
diff --git a/user_guide_src/source/incoming/controllers/010.php b/user_guide_src/source/incoming/controllers/010.php
new file mode 100644
index 000000000000..e017dcd45cdb
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/010.php
@@ -0,0 +1,6 @@
+<?php
+
+public function _remap()
+{
+    // Some code here...
+}
diff --git a/user_guide_src/source/incoming/controllers/011.php b/user_guide_src/source/incoming/controllers/011.php
new file mode 100644
index 000000000000..14844a8afc1d
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/011.php
@@ -0,0 +1,10 @@
+<?php
+
+public function _remap($method)
+{
+    if ($method === 'some_method') {
+        return $this->$method();
+    } else {
+        return $this->default_method();
+    }
+}
diff --git a/user_guide_src/source/incoming/controllers/012.php b/user_guide_src/source/incoming/controllers/012.php
new file mode 100644
index 000000000000..25d064b859cd
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/012.php
@@ -0,0 +1,12 @@
+<?php
+
+public function _remap($method, ...$params)
+{
+    $method = 'process_'.$method;
+
+    if (method_exists($this, $method)) {
+        return $this->$method(...$params);
+    }
+
+    throw \CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound();
+}
diff --git a/user_guide_src/source/incoming/controllers/013.php b/user_guide_src/source/incoming/controllers/013.php
new file mode 100644
index 000000000000..eed95b673ad2
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/013.php
@@ -0,0 +1,6 @@
+<?php
+
+protected function utility()
+{
+    // some code
+}
diff --git a/user_guide_src/source/incoming/controllers/014.php b/user_guide_src/source/incoming/controllers/014.php
new file mode 100644
index 000000000000..9414addbb81a
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/014.php
@@ -0,0 +1,5 @@
+<?php
+
+if (! $this->request->isSecure()) {
+    $this->forceHTTPS();
+}
diff --git a/user_guide_src/source/incoming/controllers/015.php b/user_guide_src/source/incoming/controllers/015.php
new file mode 100644
index 000000000000..c3309ddbf201
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/015.php
@@ -0,0 +1,5 @@
+<?php
+
+if (! $this->request->isSecure()) {
+    $this->forceHTTPS(31536000); // one year
+}
diff --git a/user_guide_src/source/incoming/controllers/016.php b/user_guide_src/source/incoming/controllers/016.php
new file mode 100644
index 000000000000..ff3ab9edfcf1
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/016.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Controllers;
+
+class MyController extends BaseController
+{
+    protected $helpers = ['url', 'form'];
+}
diff --git a/user_guide_src/source/incoming/controllers/017.php b/user_guide_src/source/incoming/controllers/017.php
new file mode 100644
index 000000000000..11a9df5d8a34
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/017.php
@@ -0,0 +1,15 @@
+<?php
+
+public function updateUser(int $userID)
+{
+    if (! $this->validate([
+        'email' => "required|is_unique[users.email,id,{$userID}]",
+        'name'  => 'required|alpha_numeric_spaces'
+    ])) {
+        return view('users/update', [
+            'errors' => $this->validator->getErrors()
+        ]);
+    }
+
+    // do something here if successful...
+}
diff --git a/user_guide_src/source/incoming/controllers/018.php b/user_guide_src/source/incoming/controllers/018.php
new file mode 100644
index 000000000000..54697409827a
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/018.php
@@ -0,0 +1,12 @@
+<?php
+
+public function updateUser(int $userID)
+{
+    if (! $this->validate('userRules')) {
+        return view('users/update', [
+            'errors' => $this->validator->getErrors()
+        ]);
+    }
+
+    // do something here if successful...
+}
diff --git a/user_guide_src/source/incoming/controllers/019.php b/user_guide_src/source/incoming/controllers/019.php
new file mode 100644
index 000000000000..e5a96084c2c2
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/019.php
@@ -0,0 +1,19 @@
+<?php
+
+public function product(int $id)
+{
+    $data = [
+        'id'   => $id,
+        'name' => $this->request->getVar('name'),
+    ];
+    $rule = [
+        'id'   => 'integer',
+        'name' => 'required|max_length[255]',
+    ];
+
+    if (! $this->validateData($data, $rule) {
+        // ...
+    }
+
+    // ...
+}
\ No newline at end of file
diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index 1b01d7c81e2e..df45851ea514 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -25,28 +25,9 @@ Creating a Filter
 Filters are simple classes that implement ``CodeIgniter\Filters\FilterInterface``.
 They contain two methods: ``before()`` and ``after()`` which hold the code that
 will run before and after the controller respectively. Your class must contain both methods
-but may leave the methods empty if they are not needed. A skeleton filter class looks like::
+but may leave the methods empty if they are not needed. A skeleton filter class looks like:
 
-    <?php
-
-    namespace App\Filters;
-
-    use CodeIgniter\HTTP\RequestInterface;
-    use CodeIgniter\HTTP\ResponseInterface;
-    use CodeIgniter\Filters\FilterInterface;
-
-    class MyFilter implements FilterInterface
-    {
-        public function before(RequestInterface $request, $arguments = null)
-        {
-            // Do something here
-        }
-
-        public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
-        {
-            // Do something here
-        }
-    }
+.. literalinclude:: filters/001.php
 
 Before Filters
 ==============
@@ -61,16 +42,10 @@ stop the execution of the later filters after a certain filter. You can easily d
 filters will still be executed. An exception to the non-empty result rule is the ``Request`` instance.
 Returning it in the before filter will not stop the execution but only replace the current ``$request`` object.
 
-This is typically used to perform redirects, like in this example::
-
-    public function before(RequestInterface $request, $arguments = null)
-    {
-        $auth = service('auth');
+This is typically used to perform redirects, like in this example:
 
-        if (! $auth->isLoggedIn()) {
-            return redirect()->to(site_url('login'));
-        }
-    }
+.. literalinclude:: filters/002.php
+   :lines: 2-
 
 If a ``Response`` instance is returned, the Response will be sent back to the client and script execution will stop.
 This can be useful for implementing rate limiting for APIs. See :doc:`Throttler </libraries/throttler>` for an
@@ -102,24 +77,19 @@ $aliases
 ========
 
 The ``$aliases`` array is used to associate a simple name with one or more fully-qualified class names that are the
-filters to run::
+filters to run:
 
-    public $aliases = [
-        'csrf' => \CodeIgniter\Filters\CSRF::class,
-    ];
+.. literalinclude:: filters/003.php
+   :lines: 2-
 
 Aliases are mandatory and if you try to use a full class name later, the system will throw an error. Defining them
 in this way makes it simple to switch out the class used. Great for when you decided you need to change to a
 different authentication system since you only change the filter's class and you're done.
 
-You can combine multiple filters into one alias, making complex sets of filters simple to apply::
+You can combine multiple filters into one alias, making complex sets of filters simple to apply:
 
-    public $aliases = [
-        'apiPrep' => [
-            \App\Filters\Negotiate::class,
-            \App\Filters\ApiAuth::class,
-        ]
-    ];
+.. literalinclude:: filters/004.php
+   :lines: 2-
 
 You should define as many aliases as you need.
 
@@ -128,50 +98,36 @@ $globals
 
 The second section allows you to define any filters that should be applied to every request made by the framework.
 You should take care with how many you use here, since it could have performance implications to have too many
-run on every request. Filters can be specified by adding their alias to either the before or after array::
+run on every request. Filters can be specified by adding their alias to either the before or after array:
 
-    public $globals = [
-        'before' => [
-            'csrf',
-        ],
-        'after' => [],
-    ];
+.. literalinclude:: filters/005.php
+   :lines: 2-
 
 There are times where you want to apply a filter to almost every request, but have a few that should be left alone.
 One common example is if you need to exclude a few URI's from the CSRF protection filter to allow requests from
 third-party websites to hit one or two specific URI's, while keeping the rest of them protected. To do this, add
-an array with the 'except' key and a URI to match as the value alongside the alias::
+an array with the 'except' key and a URI to match as the value alongside the alias:
 
-    public $globals = [
-        'before' => [
-            'csrf' => ['except' => 'api/*'],
-        ],
-        'after' => [],
-    ];
+.. literalinclude:: filters/006.php
+   :lines: 2-
 
 Any place you can use a URI in the filter settings, you can use a regular expression or, like in this example, use
 an asterisk for a wildcard that will match all characters after that. In this example, any URL's starting with ``api/``
 would be exempted from CSRF protection, but the site's forms would all be protected. If you need to specify multiple
-URI's you can use an array of URI patterns::
+URI's you can use an array of URI patterns:
 
-    public $globals = [
-        'before' => [
-            'csrf' => ['except' => ['foo/*', 'bar/*']],
-        ],
-        'after' => [],
-    ];
+.. literalinclude:: filters/007.php
+   :lines: 2-
 
 $methods
 ========
 
 You can apply filters to all requests of a certain HTTP method, like POST, GET, PUT, etc. In this array, you would
 specify the method name in lowercase. It's value would be an array of filters to run. Unlike the ``$globals`` or the
-``$filters`` properties, these will only run as before filters::
+``$filters`` properties, these will only run as before filters:
 
-    public $methods = [
-        'post' => ['foo', 'bar'],
-        'get'  => ['baz'],
-    ]
+.. literalinclude:: filters/008.php
+   :lines: 2-
 
 In addition to the standard HTTP methods, this also supports one special case: 'cli'. The 'cli' method would apply to
 all requests that were run from the command line.
@@ -184,19 +140,18 @@ $filters
 ========
 
 This property is an array of filter aliases. For each alias, you can specify before and after arrays that contain
-a list of URI patterns that filter should apply to::
+a list of URI patterns that filter should apply to:
 
-    public filters = [
-        'foo' => ['before' => ['admin/*'], 'after' => ['users/*']],
-        'bar' => ['before' => ['api/*', 'admin/*']],
-    ];
+.. literalinclude:: filters/009.php
+   :lines: 2-
 
 Filter arguments
 =================
 
-When configuring filters, additional arguments may be passed to a filter when setting up the route::
+When configuring filters, additional arguments may be passed to a filter when setting up the route:
 
-    $routes->add('users/delete/(:segment)', 'AdminController::index', ['filter' => 'admin-auth:dual,noreturn']);
+.. literalinclude:: filters/010.php
+   :lines: 2-
 
 In this example, the array ``['dual', 'noreturn']`` will be passed in ``$arguments`` to the filter's ``before()`` and ``after()`` implementation methods.
 
@@ -228,11 +183,9 @@ SecureHeaders
 
 This filter adds HTTP response headers that your application can use to increase the security of your application.
 
-If you want to customize the headers, extend ``CodeIgniter\Filters\SecureHeaders`` and override the ``$headers`` property. And change the ``$aliases`` property in **app/Config/Filters.php**::
+If you want to customize the headers, extend ``CodeIgniter\Filters\SecureHeaders`` and override the ``$headers`` property. And change the ``$aliases`` property in **app/Config/Filters.php**:
 
-    public $aliases = [
-        ...
-        'secureheaders' => \App\Filters\SecureHeaders::class,
-    ];
+.. literalinclude:: filters/011.php
+   :lines: 2-
 
 If you want to know about secure headers, see `OWASP Secure Headers Project <https://owasp.org/www-project-secure-headers/>`_.
diff --git a/user_guide_src/source/incoming/filters/001.php b/user_guide_src/source/incoming/filters/001.php
new file mode 100644
index 000000000000..442cbadb89be
--- /dev/null
+++ b/user_guide_src/source/incoming/filters/001.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Filters;
+
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use CodeIgniter\Filters\FilterInterface;
+
+class MyFilter implements FilterInterface
+{
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        // Do something here
+    }
+
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+        // Do something here
+    }
+}
diff --git a/user_guide_src/source/incoming/filters/002.php b/user_guide_src/source/incoming/filters/002.php
new file mode 100644
index 000000000000..792921a348ef
--- /dev/null
+++ b/user_guide_src/source/incoming/filters/002.php
@@ -0,0 +1,10 @@
+<?php
+
+public function before(RequestInterface $request, $arguments = null)
+{
+    $auth = service('auth');
+
+    if (! $auth->isLoggedIn()) {
+        return redirect()->to(site_url('login'));
+    }
+}
diff --git a/user_guide_src/source/incoming/filters/003.php b/user_guide_src/source/incoming/filters/003.php
new file mode 100644
index 000000000000..1ef6a461f3c6
--- /dev/null
+++ b/user_guide_src/source/incoming/filters/003.php
@@ -0,0 +1,5 @@
+<?php
+
+public $aliases = [
+    'csrf' => \CodeIgniter\Filters\CSRF::class,
+];
diff --git a/user_guide_src/source/incoming/filters/004.php b/user_guide_src/source/incoming/filters/004.php
new file mode 100644
index 000000000000..a7f31363edad
--- /dev/null
+++ b/user_guide_src/source/incoming/filters/004.php
@@ -0,0 +1,8 @@
+<?php
+
+public $aliases = [
+    'apiPrep' => [
+        \App\Filters\Negotiate::class,
+        \App\Filters\ApiAuth::class,
+    ]
+];
diff --git a/user_guide_src/source/incoming/filters/005.php b/user_guide_src/source/incoming/filters/005.php
new file mode 100644
index 000000000000..3f3801f5ce59
--- /dev/null
+++ b/user_guide_src/source/incoming/filters/005.php
@@ -0,0 +1,8 @@
+<?php
+
+public $globals = [
+    'before' => [
+        'csrf',
+    ],
+    'after' => [],
+];
diff --git a/user_guide_src/source/incoming/filters/006.php b/user_guide_src/source/incoming/filters/006.php
new file mode 100644
index 000000000000..3706979688cd
--- /dev/null
+++ b/user_guide_src/source/incoming/filters/006.php
@@ -0,0 +1,8 @@
+<?php
+
+public $globals = [
+    'before' => [
+        'csrf' => ['except' => 'api/*'],
+    ],
+    'after' => [],
+];
diff --git a/user_guide_src/source/incoming/filters/007.php b/user_guide_src/source/incoming/filters/007.php
new file mode 100644
index 000000000000..a6790adbf9b7
--- /dev/null
+++ b/user_guide_src/source/incoming/filters/007.php
@@ -0,0 +1,8 @@
+<?php
+
+public $globals = [
+    'before' => [
+        'csrf' => ['except' => ['foo/*', 'bar/*']],
+    ],
+    'after' => [],
+];
diff --git a/user_guide_src/source/incoming/filters/008.php b/user_guide_src/source/incoming/filters/008.php
new file mode 100644
index 000000000000..2f216281e982
--- /dev/null
+++ b/user_guide_src/source/incoming/filters/008.php
@@ -0,0 +1,6 @@
+<?php
+
+public $methods = [
+    'post' => ['foo', 'bar'],
+    'get'  => ['baz'],
+]
diff --git a/user_guide_src/source/incoming/filters/009.php b/user_guide_src/source/incoming/filters/009.php
new file mode 100644
index 000000000000..258edd689d3c
--- /dev/null
+++ b/user_guide_src/source/incoming/filters/009.php
@@ -0,0 +1,6 @@
+<?php
+
+public filters = [
+    'foo' => ['before' => ['admin/*'], 'after' => ['users/*']],
+    'bar' => ['before' => ['api/*', 'admin/*']],
+];
diff --git a/user_guide_src/source/incoming/filters/010.php b/user_guide_src/source/incoming/filters/010.php
new file mode 100644
index 000000000000..7a486fb1d7c3
--- /dev/null
+++ b/user_guide_src/source/incoming/filters/010.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->add('users/delete/(:segment)', 'AdminController::index', ['filter' => 'admin-auth:dual,noreturn']);
diff --git a/user_guide_src/source/incoming/filters/011.php b/user_guide_src/source/incoming/filters/011.php
new file mode 100644
index 000000000000..4065ef7d1743
--- /dev/null
+++ b/user_guide_src/source/incoming/filters/011.php
@@ -0,0 +1,6 @@
+<?php
+
+public $aliases = [
+    ...
+    'secureheaders' => \App\Filters\SecureHeaders::class,
+];
diff --git a/user_guide_src/source/incoming/incomingrequest/001.php b/user_guide_src/source/incoming/incomingrequest/001.php
new file mode 100644
index 000000000000..5513e012fb0e
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/001.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Controllers;
+
+use CodeIgniter\Controller;
+
+class UserController extends Controller
+{
+    public function index()
+    {
+        if ($this->request->isAJAX()) {
+            // ...
+        }
+    }
+}
diff --git a/user_guide_src/source/incoming/incomingrequest/002.php b/user_guide_src/source/incoming/incomingrequest/002.php
new file mode 100644
index 000000000000..94d680abbdc3
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$request = \Config\Services::request();
diff --git a/user_guide_src/source/incoming/incomingrequest/003.php b/user_guide_src/source/incoming/incomingrequest/003.php
new file mode 100644
index 000000000000..5668f74a86a8
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/003.php
@@ -0,0 +1,15 @@
+<?php
+
+use CodeIgniter\HTTP\RequestInterface;
+
+class SomeClass
+{
+    protected $request;
+
+    public function __construct(RequestInterface $request)
+    {
+        $this->request = $request;
+    }
+}
+
+$someClass = new SomeClass(\Config\Services::request());
diff --git a/user_guide_src/source/incoming/incomingrequest/004.php b/user_guide_src/source/incoming/incomingrequest/004.php
new file mode 100644
index 000000000000..9f54a85874cb
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/004.php
@@ -0,0 +1,11 @@
+<?php
+
+// Check for AJAX request.
+if ($request->isAJAX()) {
+    // ...
+}
+
+// Check for CLI Request
+if ($request->isCLI()) {
+    // ...
+}
diff --git a/user_guide_src/source/incoming/incomingrequest/005.php b/user_guide_src/source/incoming/incomingrequest/005.php
new file mode 100644
index 000000000000..3c93e74b7664
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/005.php
@@ -0,0 +1,4 @@
+<?php
+
+// Returns 'post'
+$method = $request->getMethod();
diff --git a/user_guide_src/source/incoming/incomingrequest/006.php b/user_guide_src/source/incoming/incomingrequest/006.php
new file mode 100644
index 000000000000..99e269157152
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/006.php
@@ -0,0 +1,4 @@
+<?php
+
+// Returns 'GET'
+$method = str_to_upper($request->getMethod());
diff --git a/user_guide_src/source/incoming/incomingrequest/007.php b/user_guide_src/source/incoming/incomingrequest/007.php
new file mode 100644
index 000000000000..d2956fab66d4
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/007.php
@@ -0,0 +1,5 @@
+<?php
+
+if (! $request->isSecure()) {
+    force_https();
+}
diff --git a/user_guide_src/source/incoming/incomingrequest/008.php b/user_guide_src/source/incoming/incomingrequest/008.php
new file mode 100644
index 000000000000..1c7a14b45ed5
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/008.php
@@ -0,0 +1,3 @@
+<?php
+
+$something = isset($_POST['foo']) ? $_POST['foo'] : null;
diff --git a/user_guide_src/source/incoming/incomingrequest/009.php b/user_guide_src/source/incoming/incomingrequest/009.php
new file mode 100644
index 000000000000..c1ee739bf50c
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/009.php
@@ -0,0 +1,3 @@
+<?php
+
+$something = $request->getVar('foo');
diff --git a/user_guide_src/source/incoming/incomingrequest/010.php b/user_guide_src/source/incoming/incomingrequest/010.php
new file mode 100644
index 000000000000..f9c2c4a22fa1
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/010.php
@@ -0,0 +1,3 @@
+<?php
+
+$json = $request->getJSON();
diff --git a/user_guide_src/source/incoming/incomingrequest/011.php b/user_guide_src/source/incoming/incomingrequest/011.php
new file mode 100644
index 000000000000..56f9522366b0
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/011.php
@@ -0,0 +1,14 @@
+<?php
+
+// With a request body of:
+{
+    "foo": "bar",
+    "fizz": {
+        "buzz": "baz"
+    }
+}
+$data = $request->getVar('foo');
+// $data = "bar"
+
+$data = $request->getVar('fizz.buzz');
+// $data = "baz"
diff --git a/user_guide_src/source/incoming/incomingrequest/012.php b/user_guide_src/source/incoming/incomingrequest/012.php
new file mode 100644
index 000000000000..a4ca2686f6e8
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/012.php
@@ -0,0 +1,8 @@
+<?php
+
+// With the same request as above
+$data = $request->getJsonVar('fizz');
+// $data->buzz = "baz"
+
+$data = $request->getJsonVar('fizz', true);
+// $data = ["buzz" => "baz"]
diff --git a/user_guide_src/source/incoming/incomingrequest/013.php b/user_guide_src/source/incoming/incomingrequest/013.php
new file mode 100644
index 000000000000..8a46e0d01114
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/013.php
@@ -0,0 +1,3 @@
+<?php
+
+$data = $request->getRawInput();
diff --git a/user_guide_src/source/incoming/incomingrequest/014.php b/user_guide_src/source/incoming/incomingrequest/014.php
new file mode 100644
index 000000000000..2b5ffb8498e0
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/014.php
@@ -0,0 +1,8 @@
+<?php
+
+var_dump($request->getRawInput());
+
+[
+    'Param1' => 'Value1',
+    'Param2' => 'Value2'
+]
diff --git a/user_guide_src/source/incoming/incomingrequest/015.php b/user_guide_src/source/incoming/incomingrequest/015.php
new file mode 100644
index 000000000000..564fc543143b
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/015.php
@@ -0,0 +1,3 @@
+<?php
+
+$email = $request->getVar('email', FILTER_SANITIZE_EMAIL);
diff --git a/user_guide_src/source/incoming/incomingrequest/016.php b/user_guide_src/source/incoming/incomingrequest/016.php
new file mode 100644
index 000000000000..1584967d3bd8
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/016.php
@@ -0,0 +1,9 @@
+<?php
+
+var_dump($request->headers());
+
+[
+    'Host'          => CodeIgniter\HTTP\Header,
+    'Cache-Control' => CodeIgniter\HTTP\Header,
+    'Accept'        => CodeIgniter\HTTP\Header,
+]
diff --git a/user_guide_src/source/incoming/incomingrequest/017.php b/user_guide_src/source/incoming/incomingrequest/017.php
new file mode 100644
index 000000000000..3fd3b6d81ff2
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/017.php
@@ -0,0 +1,6 @@
+<?php
+
+// these are all equivalent
+$host = $request->header('host');
+$host = $request->header('Host');
+$host = $request->header('HOST');
diff --git a/user_guide_src/source/incoming/incomingrequest/018.php b/user_guide_src/source/incoming/incomingrequest/018.php
new file mode 100644
index 000000000000..a557845e482e
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/018.php
@@ -0,0 +1,5 @@
+<?php
+
+if ($request->hasHeader('DNT')) {
+    // Don't track something...
+}
diff --git a/user_guide_src/source/incoming/incomingrequest/019.php b/user_guide_src/source/incoming/incomingrequest/019.php
new file mode 100644
index 000000000000..80243598d821
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/019.php
@@ -0,0 +1,4 @@
+<?php
+
+// Accept-Encoding: gzip, deflate, sdch
+echo 'Accept-Encoding: '.$request->getHeaderLine('accept-encoding');
diff --git a/user_guide_src/source/incoming/incomingrequest/020.php b/user_guide_src/source/incoming/incomingrequest/020.php
new file mode 100644
index 000000000000..14e917083397
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/020.php
@@ -0,0 +1,3 @@
+<?php
+
+echo (string)$header;
diff --git a/user_guide_src/source/incoming/incomingrequest/021.php b/user_guide_src/source/incoming/incomingrequest/021.php
new file mode 100644
index 000000000000..890bb9aabac4
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/021.php
@@ -0,0 +1,3 @@
+<?php
+
+$uri = (string) $request->getUri();
diff --git a/user_guide_src/source/incoming/incomingrequest/022.php b/user_guide_src/source/incoming/incomingrequest/022.php
new file mode 100644
index 000000000000..672efa42b02e
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/022.php
@@ -0,0 +1,14 @@
+<?php
+
+$uri = $request->getUri();
+
+echo $uri->getScheme();         // http
+echo $uri->getAuthority();      // snoopy:password@example.com:88
+echo $uri->getUserInfo();       // snoopy:password
+echo $uri->getHost();           // example.com
+echo $uri->getPort();           // 88
+echo $uri->getPath();           // /path/to/page
+echo $uri->getQuery();          // foo=bar&bar=baz
+echo $uri->getSegments();       // ['path', 'to', 'page']
+echo $uri->getSegment(1);       // 'path'
+echo $uri->getTotalSegments();  // 3
diff --git a/user_guide_src/source/incoming/incomingrequest/023.php b/user_guide_src/source/incoming/incomingrequest/023.php
new file mode 100644
index 000000000000..55484f98a10b
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/023.php
@@ -0,0 +1,11 @@
+<?php
+
+class MyMenuTest extends CIUnitTestCase
+{
+    public function testActiveLinkUsesCurrentUrl()
+    {
+        service('request')->setPath('users/list');
+        $menu = new MyMenu();
+        $this->assertTrue('users/list', $menu->getActiveLink());
+    }
+}
diff --git a/user_guide_src/source/incoming/incomingrequest/024.php b/user_guide_src/source/incoming/incomingrequest/024.php
new file mode 100644
index 000000000000..e29f87b9f419
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/024.php
@@ -0,0 +1,18 @@
+<?php
+
+$files = $request->getFiles();
+
+// Grab the file by name given in HTML form
+if ($files->hasFile('userfile')) {
+    $file = $files->getFile('userfile');
+
+    // Generate a new secure name
+    $name = $file->getRandomName();
+
+    // Move the file to it's new home
+    $file->move('/path/to/dir', $name);
+
+    echo $file->getSize('mb'); // 1.23
+    echo $file->getExtension(); // jpg
+    echo $file->getType(); // image/jpg
+}
diff --git a/user_guide_src/source/incoming/incomingrequest/025.php b/user_guide_src/source/incoming/incomingrequest/025.php
new file mode 100644
index 000000000000..cfa3525255ae
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/025.php
@@ -0,0 +1,3 @@
+<?php
+
+$file = $request->getFile('userfile');
diff --git a/user_guide_src/source/incoming/incomingrequest/026.php b/user_guide_src/source/incoming/incomingrequest/026.php
new file mode 100644
index 000000000000..912a709d2729
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/026.php
@@ -0,0 +1,3 @@
+<?php
+
+$files = $request->getFileMultiple('userfile');
diff --git a/user_guide_src/source/incoming/incomingrequest/027.php b/user_guide_src/source/incoming/incomingrequest/027.php
new file mode 100644
index 000000000000..f5d9b96f3315
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/027.php
@@ -0,0 +1,7 @@
+<?php
+
+$language    = $request->negotiate('language', ['en-US', 'en-GB', 'fr', 'es-mx']);
+$imageType   = $request->negotiate('media', ['image/png', 'image/jpg']);
+$charset     = $request->negotiate('charset', ['UTF-8', 'UTF-16']);
+$contentType = $request->negotiate('media', ['text/html', 'text/xml']);
+$encoding    = $request->negotiate('encoding', ['gzip', 'compress']);
diff --git a/user_guide_src/source/incoming/incomingrequest/028.php b/user_guide_src/source/incoming/incomingrequest/028.php
new file mode 100644
index 000000000000..aa4f01787b4b
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/028.php
@@ -0,0 +1,3 @@
+<?php
+
+$request->getVar('some_data');
diff --git a/user_guide_src/source/incoming/incomingrequest/029.php b/user_guide_src/source/incoming/incomingrequest/029.php
new file mode 100644
index 000000000000..3bc49822b301
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/029.php
@@ -0,0 +1,3 @@
+<?php
+
+$request->getVar('some_data', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
diff --git a/user_guide_src/source/incoming/incomingrequest/030.php b/user_guide_src/source/incoming/incomingrequest/030.php
new file mode 100644
index 000000000000..62390522b9b6
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/030.php
@@ -0,0 +1,4 @@
+<?php
+
+$request->getVar(null, FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+// returns all POST items with string sanitation
diff --git a/user_guide_src/source/incoming/incomingrequest/031.php b/user_guide_src/source/incoming/incomingrequest/031.php
new file mode 100644
index 000000000000..9e555a2f3143
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/031.php
@@ -0,0 +1,3 @@
+<?php
+
+$request->getVar(['field1', 'field2']);
diff --git a/user_guide_src/source/incoming/incomingrequest/032.php b/user_guide_src/source/incoming/incomingrequest/032.php
new file mode 100644
index 000000000000..98c6f35e367d
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/032.php
@@ -0,0 +1,3 @@
+<?php
+
+$request->getVar(['field1', 'field2'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
diff --git a/user_guide_src/source/incoming/incomingrequest/033.php b/user_guide_src/source/incoming/incomingrequest/033.php
new file mode 100644
index 000000000000..27d669d99406
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/033.php
@@ -0,0 +1,3 @@
+<?php
+
+$request->getPostGet('field1');
diff --git a/user_guide_src/source/incoming/incomingrequest/034.php b/user_guide_src/source/incoming/incomingrequest/034.php
new file mode 100644
index 000000000000..837ca9c26b40
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/034.php
@@ -0,0 +1,3 @@
+<?php
+
+$request->getGetPost('field1');
diff --git a/user_guide_src/source/incoming/incomingrequest/035.php b/user_guide_src/source/incoming/incomingrequest/035.php
new file mode 100644
index 000000000000..befc56fd551f
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/035.php
@@ -0,0 +1,4 @@
+<?php
+
+$request->getCookie('some_cookie');
+$request->getCookie('some_cookie', FILTER_SANITIZE_FULL_SPECIAL_CHARS); // with filter
diff --git a/user_guide_src/source/incoming/incomingrequest/036.php b/user_guide_src/source/incoming/incomingrequest/036.php
new file mode 100644
index 000000000000..e0c3b50803d6
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/036.php
@@ -0,0 +1,3 @@
+<?php
+
+$request->getCookie(['some_cookie', 'some_cookie2']);
diff --git a/user_guide_src/source/incoming/incomingrequest/037.php b/user_guide_src/source/incoming/incomingrequest/037.php
new file mode 100644
index 000000000000..e05381317b95
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/037.php
@@ -0,0 +1,3 @@
+<?php
+
+$request->getServer('some_data');
diff --git a/user_guide_src/source/incoming/incomingrequest/038.php b/user_guide_src/source/incoming/incomingrequest/038.php
new file mode 100644
index 000000000000..0dabcaa7d528
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/038.php
@@ -0,0 +1,3 @@
+<?php
+
+$request->getServer(['SERVER_PROTOCOL', 'REQUEST_URI']);
diff --git a/user_guide_src/source/incoming/incomingrequest/039.php b/user_guide_src/source/incoming/incomingrequest/039.php
new file mode 100644
index 000000000000..bbb5fcc909e7
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/039.php
@@ -0,0 +1,3 @@
+<?php
+
+$request->getUserAgent();
diff --git a/user_guide_src/source/incoming/message.rst b/user_guide_src/source/incoming/message.rst
index e5f5a49ab4af..8333a51d7157 100644
--- a/user_guide_src/source/incoming/message.rst
+++ b/user_guide_src/source/incoming/message.rst
@@ -41,9 +41,10 @@ Class Reference
         :returns: The current message body
         :rtype: mixed
 
-        Returns the current message body, if any has been set. If not body exists, returns null::
+        Returns the current message body, if any has been set. If not body exists, returns null:
 
-            echo $message->getBody();
+        .. literalinclude:: message/001.php
+           :lines: 2-
 
     .. php:method:: setBody($data)
 
@@ -88,37 +89,21 @@ Class Reference
         :rtype: \CodeIgniter\\HTTP\\Header|array
 
         Allows you to retrieve the current value of a single message header. ``$name`` is the case-insensitive header name.
-        While the header is converted internally as described above, you can access the header with any type of case::
+        While the header is converted internally as described above, you can access the header with any type of case:
 
-            // These are all the same:
-            $message->header('HOST');
-            $message->header('Host');
-            $message->header('host');
+        .. literalinclude:: message/002.php
+           :lines: 2-
 
         If the header has multiple values, ``getValue()`` will return as an array of values. You can use the ``getValueLine()``
-        method to retrieve the values as a string::
+        method to retrieve the values as a string:
 
-            echo $message->header('Accept-Language');
+        .. literalinclude:: message/003.php
+           :lines: 2-
 
-            // Outputs something like:
-            'Accept-Language: en,en-US'
+        You can filter the header by passing a filter value in as the second parameter:
 
-            echo $message->header('Accept-Language')->getValue();
-
-            // Outputs something like:
-            [
-                'en',
-                'en-US'
-            ]
-
-            echo $message->header('Accept-Language')->getValueLine();
-
-            // Outputs something like:
-            'en,en-US'
-
-        You can filter the header by passing a filter value in as the second parameter::
-
-            $message->header('Document-URI', FILTER_SANITIZE_URL);
+        .. literalinclude:: message/004.php
+           :lines: 2-
 
     .. php:method:: hasHeader($name)
 
@@ -133,12 +118,10 @@ Class Reference
         :rtype: string
 
         Returns the value(s) of the header as a string. This method allows you to easily get a string representation
-        of the header values when the header has multiple values. The values are appropriately joined::
-
-            echo $message->getHeaderLine('Accept-Language');
+        of the header values when the header has multiple values. The values are appropriately joined:
 
-            // Outputs:
-            en, en-US
+        .. literalinclude:: message/005.php
+           :lines: 2-
 
     .. php:method:: setHeader($name, $value)
 
@@ -149,9 +132,10 @@ Class Reference
 
         Sets the value of a single header. ``$name`` is the case-insensitive name of the header. If the header
         doesn't already exist in the collection, it will be created. The ``$value`` can be either a string
-        or an array of strings::
+        or an array of strings:
 
-            $message->setHeader('Host', 'codeigniter.com');
+        .. literalinclude:: message/006.php
+           :lines: 2-
 
     .. php:method:: removeHeader($name)
 
@@ -159,9 +143,10 @@ Class Reference
         :returns: The current message instance
         :rtype: CodeIgniter\\HTTP\\Message
 
-        Removes the header from the Message. ``$name`` is the case-insensitive name of the header::
+        Removes the header from the Message. ``$name`` is the case-insensitive name of the header:
 
-            $message->removeHeader('Host');
+        .. literalinclude:: message/007.php
+           :lines: 2-
 
     .. php:method:: appendHeader($name, $value)
 
@@ -172,9 +157,9 @@ Class Reference
 
         Adds a value to an existing header. The header must already be an array of values instead of a single string.
         If it is a string then a LogicException will be thrown.
-        ::
 
-            $message->appendHeader('Accept-Language', 'en-US; q=0.8');
+        .. literalinclude:: message/008.php
+           :lines: 2-
 
     .. php:method:: prependHeader($name, $value)
 
@@ -185,9 +170,9 @@ Class Reference
 
         Prepends a value to an existing header. The header must already be an array of values instead of a single string.
         If it is a string then a LogicException will be thrown.
-        ::
 
-            $message->prependHeader('Accept-Language', 'en,');
+        .. literalinclude:: message/009.php
+           :lines: 2-
 
     .. php:method:: getProtocolVersion()
 
@@ -203,6 +188,7 @@ Class Reference
         :returns: The current message instance
         :rtype: CodeIgniter\\HTTP\\Message
 
-        Sets the HTTP protocol version this Message uses. Valid values are ``1.0``, ``1.1`` and ``2.0``::
+        Sets the HTTP protocol version this Message uses. Valid values are ``1.0``, ``1.1`` and ``2.0``:
 
-            $message->setProtocolVersion('1.1');
+        .. literalinclude:: message/010.php
+           :lines: 2-
diff --git a/user_guide_src/source/incoming/message/001.php b/user_guide_src/source/incoming/message/001.php
new file mode 100644
index 000000000000..a54dc3212036
--- /dev/null
+++ b/user_guide_src/source/incoming/message/001.php
@@ -0,0 +1,3 @@
+<?php
+
+echo $message->getBody();
diff --git a/user_guide_src/source/incoming/message/002.php b/user_guide_src/source/incoming/message/002.php
new file mode 100644
index 000000000000..0a55ae7824a9
--- /dev/null
+++ b/user_guide_src/source/incoming/message/002.php
@@ -0,0 +1,6 @@
+<?php
+
+// These are all the same:
+$message->header('HOST');
+$message->header('Host');
+$message->header('host');
diff --git a/user_guide_src/source/incoming/message/003.php b/user_guide_src/source/incoming/message/003.php
new file mode 100644
index 000000000000..3ef7db58835a
--- /dev/null
+++ b/user_guide_src/source/incoming/message/003.php
@@ -0,0 +1,19 @@
+<?php
+
+echo $message->header('Accept-Language');
+
+// Outputs something like:
+'Accept-Language: en,en-US'
+
+echo $message->header('Accept-Language')->getValue();
+
+// Outputs something like:
+[
+    'en',
+    'en-US'
+]
+
+echo $message->header('Accept-Language')->getValueLine();
+
+// Outputs something like:
+'en,en-US'
diff --git a/user_guide_src/source/incoming/message/004.php b/user_guide_src/source/incoming/message/004.php
new file mode 100644
index 000000000000..534bbcf93349
--- /dev/null
+++ b/user_guide_src/source/incoming/message/004.php
@@ -0,0 +1,3 @@
+<?php
+
+$message->header('Document-URI', FILTER_SANITIZE_URL);
diff --git a/user_guide_src/source/incoming/message/005.php b/user_guide_src/source/incoming/message/005.php
new file mode 100644
index 000000000000..dd643a1250e4
--- /dev/null
+++ b/user_guide_src/source/incoming/message/005.php
@@ -0,0 +1,6 @@
+<?php
+
+echo $message->getHeaderLine('Accept-Language');
+
+// Outputs:
+en, en-US
diff --git a/user_guide_src/source/incoming/message/006.php b/user_guide_src/source/incoming/message/006.php
new file mode 100644
index 000000000000..74f6cde18eb0
--- /dev/null
+++ b/user_guide_src/source/incoming/message/006.php
@@ -0,0 +1,3 @@
+<?php
+
+$message->setHeader('Host', 'codeigniter.com');
diff --git a/user_guide_src/source/incoming/message/007.php b/user_guide_src/source/incoming/message/007.php
new file mode 100644
index 000000000000..bd7a4f9052ce
--- /dev/null
+++ b/user_guide_src/source/incoming/message/007.php
@@ -0,0 +1,3 @@
+<?php
+
+$message->removeHeader('Host');
diff --git a/user_guide_src/source/incoming/message/008.php b/user_guide_src/source/incoming/message/008.php
new file mode 100644
index 000000000000..e14ed62b3636
--- /dev/null
+++ b/user_guide_src/source/incoming/message/008.php
@@ -0,0 +1,3 @@
+<?php
+
+$message->appendHeader('Accept-Language', 'en-US; q=0.8');
diff --git a/user_guide_src/source/incoming/message/009.php b/user_guide_src/source/incoming/message/009.php
new file mode 100644
index 000000000000..c6cdd1ca6d05
--- /dev/null
+++ b/user_guide_src/source/incoming/message/009.php
@@ -0,0 +1,3 @@
+<?php
+
+$message->prependHeader('Accept-Language', 'en,');
diff --git a/user_guide_src/source/incoming/message/010.php b/user_guide_src/source/incoming/message/010.php
new file mode 100644
index 000000000000..b5e056ab447d
--- /dev/null
+++ b/user_guide_src/source/incoming/message/010.php
@@ -0,0 +1,3 @@
+<?php
+
+$message->setProtocolVersion('1.1');
diff --git a/user_guide_src/source/incoming/request.rst b/user_guide_src/source/incoming/request.rst
index 109c22a7bd7e..d5af007b40bd 100644
--- a/user_guide_src/source/incoming/request.rst
+++ b/user_guide_src/source/incoming/request.rst
@@ -22,9 +22,10 @@ Class Reference
         :rtype:   string
 
         Returns the IP address for the current user. If the IP address is not valid, the method
-        will return '0.0.0.0'::
+        will return '0.0.0.0':
 
-            echo $request->getIPAddress();
+        .. literalinclude:: request/001.php
+           :lines: 2-
 
         .. important:: This method takes into account the ``App->proxyIPs`` setting and will
             return the reported HTTP_X_FORWARDED_FOR, HTTP_CLIENT_IP, HTTP_X_CLIENT_IP, or
@@ -44,13 +45,8 @@ Class Reference
 
         .. note:: The $request->getIPAddress() method above automatically validates the IP address.
 
-            ::
-
-                if (! $request->isValidIP($ip)) {
-                    echo 'Not Valid';
-                } else {
-                    echo 'Valid';
-                }
+            .. literalinclude:: request/002.php
+               :lines: 2-
 
         Accepts an optional second string parameter of 'ipv4' or 'ipv6' to specify
         an IP format. The default checks for both formats.
@@ -65,11 +61,9 @@ Class Reference
 
         Returns the ``$_SERVER['REQUEST_METHOD']``, with the option to set it
         in uppercase or lowercase.
-        ::
 
-            echo $request->getMethod(true); // Outputs: POST
-            echo $request->getMethod(false); // Outputs: post
-            echo $request->getMethod(); // Outputs: post
+        .. literalinclude:: request/003.php
+           :lines: 2-
 
     .. php:method:: setMethod($method)
 
@@ -86,15 +80,16 @@ Class Reference
         :rtype:   mixed
 
         This method is identical to the ``post()``, ``get()`` and ``cookie()`` methods from the
-        :doc:`IncomingRequest Class </incoming/incomingrequest>`, only it fetches server data (``$_SERVER``)::
+        :doc:`IncomingRequest Class </incoming/incomingrequest>`, only it fetches server data (``$_SERVER``):
 
-            $request->getServer('some_data');
+        .. literalinclude:: request/004.php
+           :lines: 2-
 
         To return an array of multiple ``$_SERVER`` values, pass all the required keys
         as an array.
-        ::
 
-            $require->getServer(['SERVER_PROTOCOL', 'REQUEST_URI']);
+        .. literalinclude:: request/005.php
+           :lines: 2-
 
     .. php:method:: getEnv([$index = null[, $filter = null[, $flags = null]]])
 
@@ -105,15 +100,16 @@ Class Reference
         :rtype:   mixed
 
         This method is identical to the ``post()``, ``get()`` and ``cookie()`` methods from the
-        :doc:`IncomingRequest Class </incoming/incomingrequest>`, only it fetches getEnv data (``$_ENV``)::
+        :doc:`IncomingRequest Class </incoming/incomingrequest>`, only it fetches getEnv data (``$_ENV``):
 
-            $request->getEnv('some_data');
+        .. literalinclude:: request/006.php
+           :lines: 2-
 
         To return an array of multiple ``$_ENV`` values, pass all the required keys
         as an array.
-        ::
 
-            $require->getEnv(['CI_ENVIRONMENT', 'S3_BUCKET']);
+        .. literalinclude:: request/007.php
+           :lines: 2-
 
     .. php:method:: setGlobal($method, $value)
 
diff --git a/user_guide_src/source/incoming/request/001.php b/user_guide_src/source/incoming/request/001.php
new file mode 100644
index 000000000000..09c19433908f
--- /dev/null
+++ b/user_guide_src/source/incoming/request/001.php
@@ -0,0 +1,3 @@
+<?php
+
+echo $request->getIPAddress();
diff --git a/user_guide_src/source/incoming/request/002.php b/user_guide_src/source/incoming/request/002.php
new file mode 100644
index 000000000000..4b2e39489f72
--- /dev/null
+++ b/user_guide_src/source/incoming/request/002.php
@@ -0,0 +1,7 @@
+<?php
+
+if (! $request->isValidIP($ip)) {
+    echo 'Not Valid';
+} else {
+    echo 'Valid';
+}
diff --git a/user_guide_src/source/incoming/request/003.php b/user_guide_src/source/incoming/request/003.php
new file mode 100644
index 000000000000..fbfda408e272
--- /dev/null
+++ b/user_guide_src/source/incoming/request/003.php
@@ -0,0 +1,5 @@
+<?php
+
+echo $request->getMethod(true); // Outputs: POST
+echo $request->getMethod(false); // Outputs: post
+echo $request->getMethod(); // Outputs: post
diff --git a/user_guide_src/source/incoming/request/004.php b/user_guide_src/source/incoming/request/004.php
new file mode 100644
index 000000000000..e05381317b95
--- /dev/null
+++ b/user_guide_src/source/incoming/request/004.php
@@ -0,0 +1,3 @@
+<?php
+
+$request->getServer('some_data');
diff --git a/user_guide_src/source/incoming/request/005.php b/user_guide_src/source/incoming/request/005.php
new file mode 100644
index 000000000000..ba2c43023c92
--- /dev/null
+++ b/user_guide_src/source/incoming/request/005.php
@@ -0,0 +1,3 @@
+<?php
+
+$require->getServer(['SERVER_PROTOCOL', 'REQUEST_URI']);
diff --git a/user_guide_src/source/incoming/request/006.php b/user_guide_src/source/incoming/request/006.php
new file mode 100644
index 000000000000..b503574b79cc
--- /dev/null
+++ b/user_guide_src/source/incoming/request/006.php
@@ -0,0 +1,3 @@
+<?php
+
+$request->getEnv('some_data');
diff --git a/user_guide_src/source/incoming/request/007.php b/user_guide_src/source/incoming/request/007.php
new file mode 100644
index 000000000000..95952d206a44
--- /dev/null
+++ b/user_guide_src/source/incoming/request/007.php
@@ -0,0 +1,3 @@
+<?php
+
+$require->getEnv(['CI_ENVIRONMENT', 'S3_BUCKET']);
diff --git a/user_guide_src/source/incoming/restful.rst b/user_guide_src/source/incoming/restful.rst
index 8992221590a0..93d31a76e957 100644
--- a/user_guide_src/source/incoming/restful.rst
+++ b/user_guide_src/source/incoming/restful.rst
@@ -28,19 +28,10 @@ Resource Routes
 You can quickly create a handful of RESTful routes for a single resource with the ``resource()`` method. This
 creates the five most common routes needed for full CRUD of a resource: create a new resource, update an existing one,
 list all of that resource, show a single resource, and delete a single resource. The first parameter is the resource
-name::
+name:
 
-    $routes->resource('photos');
-
-    // Equivalent to the following:
-    $routes->get('photos/new',             'Photos::new');
-    $routes->post('photos',                'Photos::create');
-    $routes->get('photos',                 'Photos::index');
-    $routes->get('photos/(:segment)',      'Photos::show/$1');
-    $routes->get('photos/(:segment)/edit', 'Photos::edit/$1');
-    $routes->put('photos/(:segment)',      'Photos::update/$1');
-    $routes->patch('photos/(:segment)',    'Photos::update/$1');
-    $routes->delete('photos/(:segment)',   'Photos::delete/$1');
+.. literalinclude:: restful/001.php
+   :lines: 2-
 
 .. note:: The ordering above is for clarity, whereas the actual order the routes are created in, in RouteCollection, ensures proper route resolution
 
@@ -48,47 +39,42 @@ name::
 
 The second parameter accepts an array of options that can be used to modify the routes that are generated. While these
 routes are geared toward API-usage, where more methods are allowed, you can pass in the ``websafe`` option to have it
-generate update and delete methods that work with HTML forms::
-
-    $routes->resource('photos', ['websafe' => 1]);
+generate update and delete methods that work with HTML forms:
 
-    // The following equivalent routes are created:
-    $routes->post('photos/(:segment)/delete', 'Photos::delete/$1');
-    $routes->post('photos/(:segment)',        'Photos::update/$1');
+.. literalinclude:: restful/002.php
+   :lines: 2-
 
 Change the Controller Used
 --------------------------
 
 You can specify the controller that should be used by passing in the ``controller`` option with the name of
-the controller that should be used::
-
-    $routes->resource('photos', ['controller' =>'App\Gallery']);
+the controller that should be used:
 
-    // Would create routes like:
-    $routes->get('photos', 'App\Gallery::index');
+.. literalinclude:: restful/003.php
+   :lines: 2-
 
 Change the Placeholder Used
 ---------------------------
 
 By default, the ``(:segment)`` placeholder is used when a resource ID is needed. You can change this by passing
-in the ``placeholder`` option with the new string to use::
+in the ``placeholder`` option with the new string to use:
 
-    $routes->resource('photos', ['placeholder' => '(:num)']);
-
-    // Generates routes like:
-    $routes->get('photos/(:num)', 'Photos::show/$1');
+.. literalinclude:: restful/004.php
+   :lines: 2-
 
 Limit the Routes Made
 ---------------------
 
 You can restrict the routes generated with the ``only`` option. This should be **an array** or **comma separated list** of method names that should
-be created. Only routes that match one of these methods will be created. The rest will be ignored::
+be created. Only routes that match one of these methods will be created. The rest will be ignored:
 
-    $routes->resource('photos', ['only' => ['index', 'show']]);
+.. literalinclude:: restful/005.php
+   :lines: 2-
 
-Otherwise you can remove unused routes with the ``except`` option. This should also be **an array** or **comma separated list** of method names. This option run after ``only``::
+Otherwise you can remove unused routes with the ``except`` option. This should also be **an array** or **comma separated list** of method names. This option run after ``only``:
 
-    $routes->resource('photos', ['except' => 'new,edit']);
+.. literalinclude:: restful/006.php
+   :lines: 2-
 
 Valid methods are: ``index``, ``show``, ``create``, ``update``, ``new``, ``edit`` and ``delete``.
 
@@ -99,30 +85,14 @@ The ``ResourceController`` provides a convenient starting point for your RESTful
 with methods that correspond to the resource routes above.
 
 Extend it, over-riding the ``modelName`` and ``format`` properties, and then
-implement those methods that you want handled.::
-
-    <?php
+implement those methods that you want handled.:
 
-    namespace App\Controllers;
+.. literalinclude:: restful/007.php
 
-    use CodeIgniter\RESTful\ResourceController;
+The routing for this would be:
 
-    class Photos extends ResourceController
-    {
-        protected $modelName = 'App\Models\Photos';
-        protected $format    = 'json';
-
-        public function index()
-        {
-            return $this->respond($this->model->findAll());
-        }
-
-        // ...
-    }
-
-The routing for this would be::
-
-    $routes->resource('photos');
+.. literalinclude:: restful/008.php
+   :lines: 2-
 
 Presenter Routes
 ============================================================
@@ -134,30 +104,18 @@ for your resource, or process forms submitted from those views.
 
 It is not needed, since the presentation can be handled with
 a conventional controller - it is a convenience.
-Its usage is similar to the resource routing::
-
-    $routes->presenter('photos');
-
-    // Equivalent to the following:
-    $routes->get('photos/new',                'Photos::new');
-    $routes->post('photos/create',            'Photos::create');
-    $routes->post('photos',                   'Photos::create');   // alias
-    $routes->get('photos',                    'Photos::index');
-    $routes->get('photos/show/(:segment)',    'Photos::show/$1');
-    $routes->get('photos/(:segment)',         'Photos::show/$1');  // alias
-    $routes->get('photos/edit/(:segment)',    'Photos::edit/$1');
-    $routes->post('photos/update/(:segment)', 'Photos::update/$1');
-    $routes->get('photos/remove/(:segment)',  'Photos::remove/$1');
-    $routes->post('photos/delete/(:segment)', 'Photos::delete/$1');
+Its usage is similar to the resource routing:
+
+.. literalinclude:: restful/009.php
+   :lines: 2-
 
 .. note:: The ordering above is for clarity, whereas the actual order the routes are created in, in RouteCollection, ensures proper route resolution
 
 You would not have routes for `photos` for both a resource and a presenter
-controller. You need to distinguish them, for instance::
-
-    $routes->resource('api/photo');
-    $routes->presenter('admin/photos');
+controller. You need to distinguish them, for instance:
 
+.. literalinclude:: restful/010.php
+   :lines: 2-
 
 The second parameter accepts an array of options that can be used to modify the routes that are generated.
 
@@ -165,35 +123,33 @@ Change the Controller Used
 --------------------------
 
 You can specify the controller that should be used by passing in the ``controller`` option with the name of
-the controller that should be used::
-
-    $routes->presenter('photos', ['controller' =>'App\Gallery']);
+the controller that should be used:
 
-    // Would create routes like:
-    $routes->get('photos', 'App\Gallery::index');
+.. literalinclude:: restful/011.php
+   :lines: 2-
 
 Change the Placeholder Used
 ---------------------------
 
 By default, the ``(:segment)`` placeholder is used when a resource ID is needed. You can change this by passing
-in the ``placeholder`` option with the new string to use::
-
-    $routes->presenter('photos', ['placeholder' => '(:num)']);
+in the ``placeholder`` option with the new string to use:
 
-    // Generates routes like:
-    $routes->get('photos/(:num)', 'Photos::show/$1');
+.. literalinclude:: restful/012.php
+   :lines: 2-
 
 Limit the Routes Made
 ---------------------
 
 You can restrict the routes generated with the ``only`` option. This should be **an array** or **comma separated list** of method names that should
-be created. Only routes that match one of these methods will be created. The rest will be ignored::
+be created. Only routes that match one of these methods will be created. The rest will be ignored:
 
-    $routes->presenter('photos', ['only' => ['index', 'show']]);
+.. literalinclude:: restful/013.php
+   :lines: 2-
 
-Otherwise you can remove unused routes with the ``except`` option. This should also be **an array** or **comma separated list** of method names. This option run after ``only``::
+Otherwise you can remove unused routes with the ``except`` option. This should also be **an array** or **comma separated list** of method names. This option run after ``only``:
 
-    $routes->presenter('photos', ['except' => 'new,edit']);
+.. literalinclude:: restful/014.php
+   :lines: 2-
 
 Valid methods are: ``index``, ``show``, ``new``, ``create``, ``edit``, ``update``, ``remove`` and ``delete``.
 
@@ -205,30 +161,14 @@ of your resource, and processing data from forms in those views,
 with methods that align to the resource routes above.
 
 Extend it, over-riding the ``modelName`` property, and then
-implement those methods that you want handled.::
-
-    <?php
-
-    namespace App\Controllers;
-
-    use CodeIgniter\RESTful\ResourcePresenter;
-
-    class Photos extends ResourcePresenter
-    {
-
-        protected $modelName = 'App\Models\Photos';
-
-        public function index()
-        {
-            return view('templates/list', $this->model->findAll());
-        }
+implement those methods that you want handled.:
 
-        // ...
-    }
+.. literalinclude:: restful/015.php
 
-The routing for this would be::
+The routing for this would be:
 
-    $routes->presenter('photos');
+.. literalinclude:: restful/016.php
+   :lines: 2-
 
 Presenter/Controller Comparison
 =============================================================
diff --git a/user_guide_src/source/incoming/restful/001.php b/user_guide_src/source/incoming/restful/001.php
new file mode 100644
index 000000000000..4a3ee8133b7d
--- /dev/null
+++ b/user_guide_src/source/incoming/restful/001.php
@@ -0,0 +1,13 @@
+<?php
+
+$routes->resource('photos');
+
+// Equivalent to the following:
+$routes->get('photos/new',             'Photos::new');
+$routes->post('photos',                'Photos::create');
+$routes->get('photos',                 'Photos::index');
+$routes->get('photos/(:segment)',      'Photos::show/$1');
+$routes->get('photos/(:segment)/edit', 'Photos::edit/$1');
+$routes->put('photos/(:segment)',      'Photos::update/$1');
+$routes->patch('photos/(:segment)',    'Photos::update/$1');
+$routes->delete('photos/(:segment)',   'Photos::delete/$1');
diff --git a/user_guide_src/source/incoming/restful/002.php b/user_guide_src/source/incoming/restful/002.php
new file mode 100644
index 000000000000..cc879a2ab667
--- /dev/null
+++ b/user_guide_src/source/incoming/restful/002.php
@@ -0,0 +1,7 @@
+<?php
+
+$routes->resource('photos', ['websafe' => 1]);
+
+// The following equivalent routes are created:
+$routes->post('photos/(:segment)/delete', 'Photos::delete/$1');
+$routes->post('photos/(:segment)',        'Photos::update/$1');
diff --git a/user_guide_src/source/incoming/restful/003.php b/user_guide_src/source/incoming/restful/003.php
new file mode 100644
index 000000000000..1485f3c4edea
--- /dev/null
+++ b/user_guide_src/source/incoming/restful/003.php
@@ -0,0 +1,6 @@
+<?php
+
+$routes->resource('photos', ['controller' =>'App\Gallery']);
+
+// Would create routes like:
+$routes->get('photos', 'App\Gallery::index');
diff --git a/user_guide_src/source/incoming/restful/004.php b/user_guide_src/source/incoming/restful/004.php
new file mode 100644
index 000000000000..540fbb84aeed
--- /dev/null
+++ b/user_guide_src/source/incoming/restful/004.php
@@ -0,0 +1,6 @@
+<?php
+
+$routes->resource('photos', ['placeholder' => '(:num)']);
+
+// Generates routes like:
+$routes->get('photos/(:num)', 'Photos::show/$1');
diff --git a/user_guide_src/source/incoming/restful/005.php b/user_guide_src/source/incoming/restful/005.php
new file mode 100644
index 000000000000..4ac8480f8ca2
--- /dev/null
+++ b/user_guide_src/source/incoming/restful/005.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->resource('photos', ['only' => ['index', 'show']]);
diff --git a/user_guide_src/source/incoming/restful/006.php b/user_guide_src/source/incoming/restful/006.php
new file mode 100644
index 000000000000..a1a98809adc1
--- /dev/null
+++ b/user_guide_src/source/incoming/restful/006.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->resource('photos', ['except' => 'new,edit']);
diff --git a/user_guide_src/source/incoming/restful/007.php b/user_guide_src/source/incoming/restful/007.php
new file mode 100644
index 000000000000..930c61f28e8c
--- /dev/null
+++ b/user_guide_src/source/incoming/restful/007.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Controllers;
+
+use CodeIgniter\RESTful\ResourceController;
+
+class Photos extends ResourceController
+{
+    protected $modelName = 'App\Models\Photos';
+    protected $format    = 'json';
+
+    public function index()
+    {
+        return $this->respond($this->model->findAll());
+    }
+
+    // ...
+}
diff --git a/user_guide_src/source/incoming/restful/008.php b/user_guide_src/source/incoming/restful/008.php
new file mode 100644
index 000000000000..d1a6c08dd03c
--- /dev/null
+++ b/user_guide_src/source/incoming/restful/008.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->resource('photos');
diff --git a/user_guide_src/source/incoming/restful/009.php b/user_guide_src/source/incoming/restful/009.php
new file mode 100644
index 000000000000..5918a044fab5
--- /dev/null
+++ b/user_guide_src/source/incoming/restful/009.php
@@ -0,0 +1,15 @@
+<?php
+
+$routes->presenter('photos');
+
+// Equivalent to the following:
+$routes->get('photos/new',                'Photos::new');
+$routes->post('photos/create',            'Photos::create');
+$routes->post('photos',                   'Photos::create');   // alias
+$routes->get('photos',                    'Photos::index');
+$routes->get('photos/show/(:segment)',    'Photos::show/$1');
+$routes->get('photos/(:segment)',         'Photos::show/$1');  // alias
+$routes->get('photos/edit/(:segment)',    'Photos::edit/$1');
+$routes->post('photos/update/(:segment)', 'Photos::update/$1');
+$routes->get('photos/remove/(:segment)',  'Photos::remove/$1');
+$routes->post('photos/delete/(:segment)', 'Photos::delete/$1');
diff --git a/user_guide_src/source/incoming/restful/010.php b/user_guide_src/source/incoming/restful/010.php
new file mode 100644
index 000000000000..b36c7ed8973e
--- /dev/null
+++ b/user_guide_src/source/incoming/restful/010.php
@@ -0,0 +1,4 @@
+<?php
+
+$routes->resource('api/photo');
+$routes->presenter('admin/photos');
diff --git a/user_guide_src/source/incoming/restful/011.php b/user_guide_src/source/incoming/restful/011.php
new file mode 100644
index 000000000000..5c949d80cc29
--- /dev/null
+++ b/user_guide_src/source/incoming/restful/011.php
@@ -0,0 +1,6 @@
+<?php
+
+$routes->presenter('photos', ['controller' =>'App\Gallery']);
+
+// Would create routes like:
+$routes->get('photos', 'App\Gallery::index');
diff --git a/user_guide_src/source/incoming/restful/012.php b/user_guide_src/source/incoming/restful/012.php
new file mode 100644
index 000000000000..0bd42b5120f0
--- /dev/null
+++ b/user_guide_src/source/incoming/restful/012.php
@@ -0,0 +1,6 @@
+<?php
+
+$routes->presenter('photos', ['placeholder' => '(:num)']);
+
+// Generates routes like:
+$routes->get('photos/(:num)', 'Photos::show/$1');
diff --git a/user_guide_src/source/incoming/restful/013.php b/user_guide_src/source/incoming/restful/013.php
new file mode 100644
index 000000000000..1a3cc23a9004
--- /dev/null
+++ b/user_guide_src/source/incoming/restful/013.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->presenter('photos', ['only' => ['index', 'show']]);
diff --git a/user_guide_src/source/incoming/restful/014.php b/user_guide_src/source/incoming/restful/014.php
new file mode 100644
index 000000000000..0d88d4ba5cdc
--- /dev/null
+++ b/user_guide_src/source/incoming/restful/014.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->presenter('photos', ['except' => 'new,edit']);
diff --git a/user_guide_src/source/incoming/restful/015.php b/user_guide_src/source/incoming/restful/015.php
new file mode 100644
index 000000000000..fc5713b20d61
--- /dev/null
+++ b/user_guide_src/source/incoming/restful/015.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Controllers;
+
+use CodeIgniter\RESTful\ResourcePresenter;
+
+class Photos extends ResourcePresenter
+{
+
+    protected $modelName = 'App\Models\Photos';
+
+    public function index()
+    {
+        return view('templates/list', $this->model->findAll());
+    }
+
+    // ...
+}
diff --git a/user_guide_src/source/incoming/restful/016.php b/user_guide_src/source/incoming/restful/016.php
new file mode 100644
index 000000000000..d0511180ee22
--- /dev/null
+++ b/user_guide_src/source/incoming/restful/016.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->presenter('photos');
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index b48c5785780b..1dbfd47c1d80 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -52,38 +52,37 @@ it creates an instance of the RouteCollection class (``$routes``) that permits y
 Routes can be specified using placeholders or Regular Expressions.
 
 When you specify a route, you choose a method to corresponding to HTTP verbs (request method).
-If you expect a GET request, you use the ``get()`` method::
+If you expect a GET request, you use the ``get()`` method:
 
-    $routes->get('/', 'Home::index');
+.. literalinclude:: routing/000.php
+   :lines: 2-
 
 A route simply takes the URI path on the left, and maps it to the controller and method on the right,
 along with any parameters that should be passed to the controller. The controller and method should
 be listed in the same way that you would use a static method, by separating the class
 and its method with a double-colon, like ``Users::list``. If that method requires parameters to be
-passed to it, then they would be listed after the method name, separated by forward-slashes::
+passed to it, then they would be listed after the method name, separated by forward-slashes:
 
-    // Calls $Users->list()
-    $routes->get('users', 'Users::list');
+.. literalinclude:: routing/001.php
+   :lines: 2-
 
-    // Calls $Users->list(1, 23)
-    $routes->get('users/1/23', 'Users::list/1/23');
+You can use any standard HTTP verb (GET, POST, PUT, DELETE, etc):
 
-You can use any standard HTTP verb (GET, POST, PUT, DELETE, etc)::
+.. literalinclude:: routing/024.php
+   :lines: 2-
 
-    $routes->post('products', 'Product::feature');
-    $routes->put('products/1', 'Product::feature');
-    $routes->delete('products/1', 'Product::feature');
+You can supply multiple verbs that a route should match by passing them in as an array to the ``match()`` method:
 
-You can supply multiple verbs that a route should match by passing them in as an array to the ``match()`` method::
-
-    $routes->match(['get', 'put'], 'products', 'Product::feature');
+.. literalinclude:: routing/025.php
+   :lines: 2-
 
 Placeholders
 ============
 
-A typical route might look something like this::
+A typical route might look something like this:
 
-    $routes->get('product/(:num)', 'Catalog::productLookup');
+.. literalinclude:: routing/002.php
+   :lines: 2-
 
 In a route, the first parameter contains the URI to be matched, while the second parameter
 contains the destination it should be routed to. In the above example, if the literal word
@@ -116,42 +115,45 @@ Examples
 Here are a few basic routing examples.
 
 A URL containing the word **journals** in the first segment will be remapped to the ``\App\Controllers\Blogs`` class,
-and the default method, which is usually ``index()``::
+and the default method, which is usually ``index()``:
 
-    $routes->get('journals', 'Blogs');
+.. literalinclude:: routing/003.php
+   :lines: 2-
 
 A URL containing the segments **blog/joe** will be remapped to the ``\App\Controllers\Blogs`` class and the ``users`` method.
-The ID will be set to ``34``::
+The ID will be set to ``34``:
 
-    $routes->get('blog/joe', 'Blogs::users/34');
+.. literalinclude:: routing/004.php
+   :lines: 2-
 
 A URL with **product** as the first segment, and anything in the second will be remapped to the ``\App\Controllers\Catalog`` class
-and the ``productLookup`` method::
+and the ``productLookup`` method:
 
-    $routes->get('product/(:any)', 'Catalog::productLookup');
+.. literalinclude:: routing/005.php
+   :lines: 2-
 
 A URL with **product** as the first segment, and a number in the second will be remapped to the ``\App\Controllers\Catalog`` class
-and the ``productLookupByID`` method passing in the match as a variable to the method::
+and the ``productLookupByID`` method passing in the match as a variable to the method:
 
-    $routes->get('product/(:num)', 'Catalog::productLookupByID/$1');
+.. literalinclude:: routing/006.php
+   :lines: 2-
 
-Note that a single ``(:any)`` will match multiple segments in the URL if present. For example the route::
+Note that a single ``(:any)`` will match multiple segments in the URL if present. For example the route:
 
-    $routes->get('product/(:any)', 'Catalog::productLookup/$1');
+.. literalinclude:: routing/007.php
+   :lines: 2-
 
 will match **product/123**, **product/123/456**, **product/123/456/789** and so on. The implementation in the
-Controller should take into account the maximum parameters::
+Controller should take into account the maximum parameters:
 
-    public function productLookup($seg1 = false, $seg2 = false, $seg3 = false) {
-        echo $seg1; // Will be 123 in all examples
-        echo $seg2; // false in first, 456 in second and third example
-        echo $seg3; // false in first and second, 789 in third
-    }
+.. literalinclude:: routing/008.php
+   :lines: 2-
 
 If matching multiple segments is not the intended behavior, ``(:segment)`` should be used when defining the
-routes. With the examples URLs from above::
+routes. With the examples URLs from above:
 
-    $routes->get('product/(:segment)', 'Catalog::productLookup/$1');
+.. literalinclude:: routing/009.php
+   :lines: 2-
 
 will only match **product/123** and generate 404 errors for other example.
 
@@ -163,10 +165,10 @@ and readability.
 
 You add new placeholders with the ``addPlaceholder()`` method. The first parameter is the string to be used as
 the placeholder. The second parameter is the Regular Expression pattern it should be replaced with.
-This must be called before you add the route::
+This must be called before you add the route:
 
-    $routes->addPlaceholder('uuid', '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}');
-    $routes->get('users/(:uuid)', 'Users::show/$1');
+.. literalinclude:: routing/010.php
+   :lines: 2-
 
 Regular Expressions
 ===================
@@ -175,9 +177,10 @@ If you prefer you can use regular expressions to define your routing rules. Any
 is allowed, as are back-references.
 
 .. important:: Note: If you use back-references you must use the dollar syntax rather than the double backslash syntax.
-    A typical RegEx route might look something like this::
+    A typical RegEx route might look something like this:
 
-    $routes->get('products/([a-z]+)/(\d+)', 'Products::show/$1/id_$2');
+    .. literalinclude:: routing/011.php
+       :lines: 2-
 
 In the above example, a URI similar to **products/shirts/123** would instead call the ``show`` method
 of the ``Products`` controller class, with the original first and second segment passed as arguments to it.
@@ -186,9 +189,10 @@ With regular expressions, you can also catch a segment containing a forward slas
 represent the delimiter between multiple segments.
 
 For example, if a user accesses a password protected area of your web application and you wish to be able to
-redirect them back to the same page after they log in, you may find this example useful::
+redirect them back to the same page after they log in, you may find this example useful:
 
-    $routes->get('login/(.+)', 'Auth::login/$1');
+.. literalinclude:: routing/012.php
+   :lines: 2-
 
 For those of you who don’t know regular expressions and want to learn more about them,
 `regular-expressions.info <https://www.regular-expressions.info/>`_ might be a good starting point.
@@ -200,27 +204,20 @@ Closures
 
 You can use an anonymous function, or Closure, as the destination that a route maps to. This function will be
 executed when the user visits that URI. This is handy for quickly executing small tasks, or even just showing
-a simple view::
-
-    $routes->get('feed', function () {
-        $rss = new RSSFeeder();
+a simple view:
 
-        return $rss->feed('general');
-    });
+.. literalinclude:: routing/013.php
+   :lines: 2-
 
 Mapping multiple routes
 =======================
 
 While the ``add()`` method is simple to use, it is often handier to work with multiple routes at once, using
 the ``map()`` method. Instead of calling the ``add()`` method for each route that you need to add, you can
-define an array of routes and then pass it as the first parameter to the ``map()`` method::
-
-    $multipleRoutes = [
-        'product/(:num)'      => 'Catalog::productLookupById',
-        'product/(:alphanum)' => 'Catalog::productLookupByName',
-    ];
+define an array of routes and then pass it as the first parameter to the ``map()`` method:
 
-    $routes->map($multipleRoutes);
+.. literalinclude:: routing/014.php
+   :lines: 2-
 
 Redirecting Routes
 ==================
@@ -229,14 +226,10 @@ Any site that lives long enough is bound to have pages that move. You can specif
 to other routes with the ``addRedirect()`` method. The first parameter is the URI pattern for the old route. The
 second parameter is either the new URI to redirect to, or the name of a named route. The third parameter is
 the HTTP status code that should be sent along with the redirect. The default value is ``302`` which is a temporary
-redirect and is recommended in most cases::
+redirect and is recommended in most cases:
 
-    $routes->get('users/profile', 'Users::profile', ['as' => 'profile']);
-
-    // Redirect to a named route
-    $routes->addRedirect('users/about', 'profile');
-    // Redirect to a URI
-    $routes->addRedirect('users/about', 'users/profile');
+.. literalinclude:: routing/015.php
+   :lines: 2-
 
 If a redirect route is matched during a page load, the user will be immediately redirected to the new page before a
 controller can be loaded.
@@ -246,39 +239,32 @@ Grouping Routes
 
 You can group your routes under a common name with the ``group()`` method. The group name becomes a segment that
 appears prior to the routes defined inside of the group. This allows you to reduce the typing needed to build out an
-extensive set of routes that all share the opening string, like when building an admin area::
+extensive set of routes that all share the opening string, like when building an admin area:
 
-    $routes->group('admin', function ($routes) {
-        $routes->get('users', 'Admin\Users::index');
-        $routes->get('blog', 'Admin\Blog::index');
-    });
+.. literalinclude:: routing/016.php
+   :lines: 2-
 
 This would prefix the **users** and **blog** URIs with **admin**, handling URLs like **admin/users** and **admin/blog**.
 
-If you need to assign options to a group, like a :ref:`assigning-namespace`, do it before the callback::
+If you need to assign options to a group, like a :ref:`assigning-namespace`, do it before the callback:
 
-    $routes->group('api', ['namespace' => 'App\API\v1'], function ($routes) {
-        $routes->resource('users');
-    });
+.. literalinclude:: routing/017.php
+   :lines: 2-
 
 This would handle a resource route to the ``App\API\v1\Users`` controller with the **api/users** URI.
 
 You can also use a specific :doc:`filter <filters>` for a group of routes. This will always
-run the filter before or after the controller. This is especially handy during authentication or api logging::
+run the filter before or after the controller. This is especially handy during authentication or api logging:
 
-    $routes->group('api', ['filter' => 'api-auth'], function ($routes) {
-        $routes->resource('users');
-    });
+.. literalinclude:: routing/018.php
+   :lines: 2-
 
 The value for the filter must match one of the aliases defined within **app/Config/Filters.php**.
 
-It is possible to nest groups within groups for finer organization if you need it::
+It is possible to nest groups within groups for finer organization if you need it:
 
-    $routes->group('admin', function ($routes) {
-        $routes->group('users', function ($routes) {
-            $routes->get('list', 'Admin\Users::list');
-        });
-    });
+.. literalinclude:: routing/019.php
+   :lines: 2-
 
 This would handle the URL at **admin/users/list**.
 
@@ -287,13 +273,10 @@ This would handle the URL at **admin/users/list**.
 At some point, you may want to group routes for the purpose of applying filters or other route
 config options like namespace, subdomain, etc. Without necessarily needing to add a prefix to the group, you can pass
 an empty string in place of the prefix and the routes in the group will be routed as though the group never existed but with the
-given route config options::
+given route config options:
 
-    $routes->group('', ['namespace' => 'Myth\Auth\Controllers'], static function ($routes) {
-        $routes->get('login', 'AuthController::login', ['as' => 'login']);
-        $routes->post('login', 'AuthController::attemptLogin');
-        $routes->get('logout', 'AuthController::logout');
-    });
+.. literalinclude:: routing/020.php
+   :lines: 2-
 
 Environment Restrictions
 ========================
@@ -301,11 +284,10 @@ Environment Restrictions
 You can create a set of routes that will only be viewable in a certain environment. This allows you to create
 tools that only the developer can use on their local machines that are not reachable on testing or production servers.
 This can be done with the ``environment()`` method. The first parameter is the name of the environment. Any
-routes defined within this closure are only accessible from the given environment::
+routes defined within this closure are only accessible from the given environment:
 
-    $routes->environment('development', function ($routes) {
-        $routes->get('builder', 'Tools\Builder::index');
-    });
+.. literalinclude:: routing/021.php
+   :lines: 2-
 
 Reverse Routing
 ===============
@@ -317,14 +299,10 @@ to update your application code. This is typically used within views to create l
 For example, if you have a route to a photo gallery that you want to link to, you can use the ``route_to()`` helper
 function to get the current route that should be used. The first parameter is the fully qualified Controller and method,
 separated by a double colon (``::``), much like you would use when writing the initial route itself. Any parameters that
-should be passed to the route are passed in next::
-
-    // The route is defined as:
-    $routes->get('users/(:num)/gallery(:any)', 'App\Controllers\Galleries::showUserGallery/$1/$2');
+should be passed to the route are passed in next:
 
-    // Generate the relative URL to link to user ID 15, gallery 12
-    // Generates: /users/15/gallery/12
-    <a href="<?= route_to('App\Controllers\Galleries::showUserGallery', 15, 12) ?>">View Gallery</a>
+.. literalinclude:: routing/022.php
+   :lines: 2-
 
 Using Named Routes
 ==================
@@ -332,14 +310,10 @@ Using Named Routes
 You can name routes to make your application less fragile. This applies a name to a route that can be called
 later, and even if the route definition changes, all of the links in your application built with ``route_to()``
 will still work without you having to make any changes. A route is named by passing in the ``as`` option
-with the name of the route::
+with the name of the route:
 
-    // The route is defined as:
-    $routes->get('users/(:num)/gallery(:any)', 'Galleries::showUserGallery/$1/$2', ['as' => 'user_gallery']);
-
-    // Generate the relative URL to link to user ID 15, gallery 12
-    // Generates: /users/15/gallery/12
-    <a href="<?= route_to('user_gallery', 15, 12) ?>">View Gallery</a>
+.. literalinclude:: routing/023.php
+   :lines: 2-
 
 This has the added benefit of making the views more readable, too.
 
@@ -347,9 +321,10 @@ Routes with any HTTP verbs
 ==========================
 
 It is possible to define a route with any HTTP verbs.
-You can use the ``add()`` method::
+You can use the ``add()`` method:
 
-    $routes->add('products', 'Product::feature');
+.. literalinclude:: routing/023-2.php
+   :lines: 2-
 
 .. warning:: While the ``add()`` method seems to be convenient, it is recommended to always use the HTTP-verb-based
     routes, described above, as it is more secure. If you use the :doc:`CSRF protection </libraries/security>`, it does not protect **GET**
@@ -366,28 +341,19 @@ Command-Line only Routes
 You can create routes that work only from the command-line, and are inaccessible from the web browser, with the
 ``cli()`` method. This is great for building cron jobs or CLI-only tools. Any route created by any of the HTTP-verb-based
 route methods will also be inaccessible from the CLI, but routes created by the ``add()`` method will still be
-available from the command line::
+available from the command line:
 
-    $routes->cli('migrate', 'App\Database::migrate');
+.. literalinclude:: routing/026.php
+   :lines: 2-
 
 Global Options
 ==============
 
 All of the methods for creating a route (add, get, post, :doc:`resource <restful>` etc) can take an array of options that
-can modify the generated routes, or further restrict them. The ``$options`` array is always the last parameter::
-
-    $routes->add('from', 'to', $options);
-    $routes->get('from', 'to', $options);
-    $routes->post('from', 'to', $options);
-    $routes->put('from', 'to', $options);
-    $routes->head('from', 'to', $options);
-    $routes->options('from', 'to', $options);
-    $routes->delete('from', 'to', $options);
-    $routes->patch('from', 'to', $options);
-    $routes->match(['get', 'put'], 'from', 'to', $options);
-    $routes->resource('photos', $options);
-    $routes->map($array, $options);
-    $routes->group('name', $options, function ());
+can modify the generated routes, or further restrict them. The ``$options`` array is always the last parameter:
+
+.. literalinclude:: routing/027.php
+   :lines: 2-
 
 .. _applying-filters:
 
@@ -411,27 +377,31 @@ See :doc:`Controller filters <filters>` for more information on setting up filte
 
 **Alias filter**
 
-You specify an alias defined in **app/Config/Filters.php** for the filter value::
+You specify an alias defined in **app/Config/Filters.php** for the filter value:
 
-    $routes->get('admin',' AdminController::index', ['filter' => 'admin-auth']);
+.. literalinclude:: routing/028.php
+   :lines: 2-
 
-You may also supply arguments to be passed to the alias filter's ``before()`` and ``after()`` methods::
+You may also supply arguments to be passed to the alias filter's ``before()`` and ``after()`` methods:
 
-    $routes->post('users/delete/(:segment)', 'AdminController::index', ['filter' => 'admin-auth:dual,noreturn']);
+.. literalinclude:: routing/029.php
+   :lines: 2-
 
 **Classname filter**
 
-You specify a filter classname for the filter value::
+You specify a filter classname for the filter value:
 
-    $routes->get('admin',' AdminController::index', ['filter' => \App\Filters\SomeFilter::class]);
+.. literalinclude:: routing/030.php
+   :lines: 2-
 
 **Multiple filters**
 
 .. important:: *Multiple filters* is disabled by default. Because it breaks backward compatibility. If you want to use it, you need to configure. See :ref:`upgrade-415-multiple-filters-for-a-route` for the details.
 
-You specify an array for the filter value::
+You specify an array for the filter value:
 
-    $routes->get('admin',' AdminController::index', ['filter' => ['admin-auth', \App\Filters\SomeFilter::class]]);
+.. literalinclude:: routing/031.php
+   :lines: 2-
 
 .. _assigning-namespace:
 
@@ -440,10 +410,10 @@ Assigning Namespace
 
 While a default namespace will be prepended to the generated controllers (see below), you can also specify
 a different namespace to be used in any options array, with the ``namespace`` option. The value should be the
-namespace you want modified::
+namespace you want modified:
 
-    // Routes to \Admin\Users::index()
-    $routes->get('admin/users', 'Users::index', ['namespace' => 'Admin']);
+.. literalinclude:: routing/032.php
+   :lines: 2-
 
 The new namespace is only applied during that call for any methods that create a single route, like get, post, etc.
 For any methods that create multiple routes, the new namespace is attached to all routes generated by that function
@@ -453,9 +423,10 @@ Limit to Hostname
 -----------------
 
 You can restrict groups of routes to function only in certain domain or sub-domains of your application
-by passing the "hostname" option along with the desired domain to allow it on as part of the options array::
+by passing the "hostname" option along with the desired domain to allow it on as part of the options array:
 
-    $routes->get('from', 'to', ['hostname' => 'accounts.example.com']);
+.. literalinclude:: routing/033.php
+   :lines: 2-
 
 This example would only allow the specified hosts to work if the domain exactly matched **accounts.example.com**.
 It would not work under the main site at **example.com**.
@@ -464,16 +435,16 @@ Limit to Subdomains
 -------------------
 
 When the ``subdomain`` option is present, the system will restrict the routes to only be available on that
-sub-domain. The route will only be matched if the subdomain is the one the application is being viewed through::
+sub-domain. The route will only be matched if the subdomain is the one the application is being viewed through:
 
-    // Limit to media.example.com
-    $routes->get('from', 'to', ['subdomain' => 'media']);
+.. literalinclude:: routing/034.php
+   :lines: 2-
 
 You can restrict it to any subdomain by setting the value to an asterisk, (``*``). If you are viewing from a URL
-that does not have any subdomain present, this will not be matched::
+that does not have any subdomain present, this will not be matched:
 
-    // Limit to any sub-domain
-    $routes->get('from', 'to', ['subdomain' => '*']);
+.. literalinclude:: routing/035.php
+   :lines: 2-
 
 .. important:: The system is not perfect and should be tested for your specific domain before being used in production.
     Most domains should work fine but some edge case ones, especially with a period in the domain itself (not used
@@ -486,12 +457,10 @@ You can offset the matched parameters in your route by any numeric value with th
 value being the number of segments to offset.
 
 This can be beneficial when developing API's with the first URI segment being the version number. It can also
-be used when the first parameter is a language string::
-
-    $routes->get('users/(:num)', 'users/show/$1', ['offset' => 1]);
+be used when the first parameter is a language string:
 
-    // Creates:
-    $routes['users/(:num)'] = 'users/show/$2';
+.. literalinclude:: routing/036.php
+   :lines: 2-
 
 .. _routing-priority:
 
@@ -502,23 +471,15 @@ When working with modules, it can be a problem if the routes in the application
 Then the module routes will not be processed correctly.
 You can solve this problem by lowering the priority of route processing using the ``priority`` option. The parameter
 accepts positive integers and zero. The higher the number specified in the ``priority``, the lower
-route priority in the processing queue::
-
-    // First you need to enable sorting.
-    $routes->setPrioritize();
-
-    // App\Config\Routes
-    $routes->get('(.*)', 'Posts::index', ['priority' => 1]);
+route priority in the processing queue:
 
-    // Modules\Acme\Config\Routes
-    $routes->get('admin', 'Admin::index');
+.. literalinclude:: routing/037.php
+   :lines: 2-
 
-    // The "admin" route will now be processed before the wildcard router.
+To disable this functionality, you must call the method with the parameter ``false``:
 
-
-To disable this functionality, you must call the method with the parameter ``false``::
-
-    $routes->setPrioritize(false);
+.. literalinclude:: routing/038.php
+   :lines: 2-
 
 .. note:: By default, all routes have a priority of 0.
     Negative integers will be cast to the absolute value.
@@ -539,36 +500,26 @@ When matching a controller to a route, the router will add the default namespace
 specified by the route. By default, this value is ``App\Controllers``.
 
 If you set the value empty string (``''``), it leaves each route to specify the fully namespaced
-controller::
-
-    $routes->setDefaultNamespace('');
+controller:
 
-    // Controller is \Users
-    $routes->get('users', 'Users::index');
-
-    // Controller is \Admin\Users
-    $routes->get('users', 'Admin\Users::index');
+.. literalinclude:: routing/039.php
+   :lines: 2-
 
 If your controllers are not explicitly namespaced, there is no need to change this. If you namespace your controllers,
-then you can change this value to save typing::
-
-    $routes->setDefaultNamespace('App');
+then you can change this value to save typing:
 
-    // Controller is \App\Users
-    $routes->get('users', 'Users::index');
-
-    // Controller is \App\Admin\Users
-    $routes->get('users', 'Admin\Users::index');
+.. literalinclude:: routing/040.php
+   :lines: 2-
 
 Default Controller
 ==================
 
 When a user visits the root of your site (i.e., example.com) the controller to use is determined by the value set by
 the ``setDefaultController()`` method, unless a route exists for it explicitly. The default value for this is ``Home``
-which matches the controller at **app/Controllers/Home.php**::
+which matches the controller at **app/Controllers/Home.php**:
 
-    // example.com routes to app/Controllers/Welcome.php
-    $routes->setDefaultController('Welcome');
+.. literalinclude:: routing/041.php
+   :lines: 2-
 
 The default controller is also used when no matching route has been found, and the URI would point to a directory
 in the controllers directory. For example, if the user visits **example.com/admin**, if a controller was found at
@@ -582,18 +533,20 @@ when a controller is found that matches the URI, but no segment exists for the m
 ``index``.
 
 In this example, if the user were to visit **example.com/products**, and a ``Products`` controller existed, the
-``Products::listAll()`` method would be executed::
+``Products::listAll()`` method would be executed:
 
-    $routes->setDefaultMethod('listAll');
+.. literalinclude:: routing/042.php
+   :lines: 2-
 
 Translate URI Dashes
 ====================
 
 This option enables you to automatically replace dashes (``-``) with underscores in the controller and method
 URI segments, thus saving you additional route entries if you need to do that. This is required because the
-dash isn’t a valid class or method name character and would cause a fatal error if you try to use it::
+dash isn’t a valid class or method name character and would cause a fatal error if you try to use it:
 
-    $routes->setTranslateURIDashes(true);
+.. literalinclude:: routing/043.php
+   :lines: 2-
 
 .. _use-defined-routes-only:
 
@@ -602,9 +555,10 @@ Use Defined Routes Only
 
 When no defined route is found that matches the URI, the system will attempt to match that URI against the
 controllers and methods as described above. You can disable this automatic matching, and restrict routes
-to only those defined by you, by setting the ``setAutoRoute()`` option to false::
+to only those defined by you, by setting the ``setAutoRoute()`` option to false:
 
-    $routes->setAutoRoute(false);
+.. literalinclude:: routing/044.php
+   :lines: 2-
 
 .. warning:: If you use the :doc:`CSRF protection </libraries/security>`, it does not protect **GET**
     requests. If the URI is accessible by the GET method, the CSRF protection will not work.
@@ -614,30 +568,20 @@ to only those defined by you, by setting the ``setAutoRoute()`` option to false:
 
 When a page is not found that matches the current URI, the system will show a generic 404 view. You can change
 what happens by specifying an action to happen with the ``set404Override()`` method. The value can be either
-a valid class/method pair, just like you would show in any route, or a Closure::
-
-    // Would execute the show404 method of the App\Errors class
-    $routes->set404Override('App\Errors::show404');
-
-    // Will display a custom view
-    $routes->set404Override(function ()
-    {
-        echo view('my_errors/not_found.html');
-    });
+a valid class/method pair, just like you would show in any route, or a Closure:
 
+.. literalinclude:: routing/045.php
+   :lines: 2-
 
 Route processing by priority
 ============================
 
 Enables or disables processing of the routes queue by priority. Lowering the priority is defined in the route option.
 Disabled by default. This functionality affects all routes.
-For an example use of lowering the priority see :ref:`routing-priority`::
-
-    // to enable
-    $routes->setPrioritize();
+For an example use of lowering the priority see :ref:`routing-priority`:
 
-    // to disable
-    $routes->setPrioritize(false);
+.. literalinclude:: routing/046.php
+   :lines: 2-
 
 *****************
 Confirming Routes
@@ -675,4 +619,4 @@ But ``[/...]`` in the route of an auto route is indicates any number of segments
 
 .. note:: When auto routing is enabled, if you have the route ``home``, it can be also accessd by ``Home``, or maybe by ``hOme``, ``hoMe``, ``HOME``, etc. But the command shows only ``home``.
 
-.. important:: The system is not perfect. If you use Custom Placeholders, *Filters* might not be correct. But the filters defined in **app/Config/Routes.php** are always displayed correctly.
+.. important:: The system is not perfect. If you use Custom Placeholders, *Filters* might not be correct. But the filters defined in **app/Config/Routes.php** are always displayed correctly.
\ No newline at end of file
diff --git a/user_guide_src/source/incoming/routing/000.php b/user_guide_src/source/incoming/routing/000.php
new file mode 100644
index 000000000000..d799d1cf0fb5
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/000.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->get('/', 'Home::index');
diff --git a/user_guide_src/source/incoming/routing/001.php b/user_guide_src/source/incoming/routing/001.php
new file mode 100644
index 000000000000..4ddfd31abaed
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/001.php
@@ -0,0 +1,7 @@
+<?php
+
+// Calls $Users->list()
+$routes->get('users', 'Users::list');
+
+// Calls $Users->list(1, 23)
+$routes->get('users/1/23', 'Users::list/1/23');
\ No newline at end of file
diff --git a/user_guide_src/source/incoming/routing/002.php b/user_guide_src/source/incoming/routing/002.php
new file mode 100644
index 000000000000..ba4d8d98a28a
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->get('product/(:num)', 'Catalog::productLookup');
diff --git a/user_guide_src/source/incoming/routing/003.php b/user_guide_src/source/incoming/routing/003.php
new file mode 100644
index 000000000000..7a9075b57b2f
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/003.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->get('journals', 'Blogs');
diff --git a/user_guide_src/source/incoming/routing/004.php b/user_guide_src/source/incoming/routing/004.php
new file mode 100644
index 000000000000..4ee87c0af53a
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/004.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->get('blog/joe', 'Blogs::users/34');
diff --git a/user_guide_src/source/incoming/routing/005.php b/user_guide_src/source/incoming/routing/005.php
new file mode 100644
index 000000000000..d840165c7809
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/005.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->get('product/(:any)', 'Catalog::productLookup');
diff --git a/user_guide_src/source/incoming/routing/006.php b/user_guide_src/source/incoming/routing/006.php
new file mode 100644
index 000000000000..638ed4492220
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/006.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->get('product/(:num)', 'Catalog::productLookupByID/$1');
diff --git a/user_guide_src/source/incoming/routing/007.php b/user_guide_src/source/incoming/routing/007.php
new file mode 100644
index 000000000000..c88bc65573a3
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/007.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->get('product/(:any)', 'Catalog::productLookup/$1');
diff --git a/user_guide_src/source/incoming/routing/008.php b/user_guide_src/source/incoming/routing/008.php
new file mode 100644
index 000000000000..11437a5881c2
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/008.php
@@ -0,0 +1,7 @@
+<?php
+
+public function productLookup($seg1 = false, $seg2 = false, $seg3 = false) {
+    echo $seg1; // Will be 123 in all examples
+    echo $seg2; // false in first, 456 in second and third example
+    echo $seg3; // false in first and second, 789 in third
+}
diff --git a/user_guide_src/source/incoming/routing/009.php b/user_guide_src/source/incoming/routing/009.php
new file mode 100644
index 000000000000..cee3785eb0d8
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/009.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->get('product/(:segment)', 'Catalog::productLookup/$1');
diff --git a/user_guide_src/source/incoming/routing/010.php b/user_guide_src/source/incoming/routing/010.php
new file mode 100644
index 000000000000..cb1cdda7c78c
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/010.php
@@ -0,0 +1,4 @@
+<?php
+
+$routes->addPlaceholder('uuid', '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}');
+$routes->get('users/(:uuid)', 'Users::show/$1');
diff --git a/user_guide_src/source/incoming/routing/011.php b/user_guide_src/source/incoming/routing/011.php
new file mode 100644
index 000000000000..a1619a4bf080
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/011.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->get('products/([a-z]+)/(\d+)', 'Products::show/$1/id_$2');
diff --git a/user_guide_src/source/incoming/routing/012.php b/user_guide_src/source/incoming/routing/012.php
new file mode 100644
index 000000000000..c9ddfae73610
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/012.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->get('login/(.+)', 'Auth::login/$1');
diff --git a/user_guide_src/source/incoming/routing/013.php b/user_guide_src/source/incoming/routing/013.php
new file mode 100644
index 000000000000..2d0f48cb284e
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/013.php
@@ -0,0 +1,7 @@
+<?php
+
+$routes->get('feed', function () {
+    $rss = new RSSFeeder();
+
+    return $rss->feed('general');
+});
diff --git a/user_guide_src/source/incoming/routing/014.php b/user_guide_src/source/incoming/routing/014.php
new file mode 100644
index 000000000000..8ebc27e3f9f5
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/014.php
@@ -0,0 +1,8 @@
+<?php
+
+$multipleRoutes = [
+    'product/(:num)'      => 'Catalog::productLookupById',
+    'product/(:alphanum)' => 'Catalog::productLookupByName',
+];
+
+$routes->map($multipleRoutes);
diff --git a/user_guide_src/source/incoming/routing/015.php b/user_guide_src/source/incoming/routing/015.php
new file mode 100644
index 000000000000..d92d9934db5a
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/015.php
@@ -0,0 +1,8 @@
+<?php
+
+$routes->get('users/profile', 'Users::profile', ['as' => 'profile']);
+
+// Redirect to a named route
+$routes->addRedirect('users/about', 'profile');
+// Redirect to a URI
+$routes->addRedirect('users/about', 'users/profile');
diff --git a/user_guide_src/source/incoming/routing/016.php b/user_guide_src/source/incoming/routing/016.php
new file mode 100644
index 000000000000..8c770fd05f24
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/016.php
@@ -0,0 +1,6 @@
+<?php
+
+$routes->group('admin', function ($routes) {
+    $routes->get('users', 'Admin\Users::index');
+    $routes->get('blog', 'Admin\Blog::index');
+});
diff --git a/user_guide_src/source/incoming/routing/017.php b/user_guide_src/source/incoming/routing/017.php
new file mode 100644
index 000000000000..678e90700e74
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/017.php
@@ -0,0 +1,5 @@
+<?php
+
+$routes->group('api', ['namespace' => 'App\API\v1'], function ($routes) {
+    $routes->resource('users');
+});
diff --git a/user_guide_src/source/incoming/routing/018.php b/user_guide_src/source/incoming/routing/018.php
new file mode 100644
index 000000000000..395ddfe6c8c8
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/018.php
@@ -0,0 +1,5 @@
+<?php
+
+$routes->group('api', ['filter' => 'api-auth'], function ($routes) {
+    $routes->resource('users');
+});
diff --git a/user_guide_src/source/incoming/routing/019.php b/user_guide_src/source/incoming/routing/019.php
new file mode 100644
index 000000000000..08169acec275
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/019.php
@@ -0,0 +1,7 @@
+<?php
+
+$routes->group('admin', function ($routes) {
+    $routes->group('users', function ($routes) {
+        $routes->get('list', 'Admin\Users::list');
+    });
+});
diff --git a/user_guide_src/source/incoming/routing/020.php b/user_guide_src/source/incoming/routing/020.php
new file mode 100644
index 000000000000..d7624ddc6d5c
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/020.php
@@ -0,0 +1,7 @@
+<?php
+
+$routes->group('', ['namespace' => 'Myth\Auth\Controllers'], static function ($routes) {
+    $routes->get('login', 'AuthController::login', ['as' => 'login']);
+    $routes->post('login', 'AuthController::attemptLogin');
+    $routes->get('logout', 'AuthController::logout');
+});
diff --git a/user_guide_src/source/incoming/routing/021.php b/user_guide_src/source/incoming/routing/021.php
new file mode 100644
index 000000000000..69a4c184ab36
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/021.php
@@ -0,0 +1,5 @@
+<?php
+
+$routes->environment('development', function ($routes) {
+    $routes->get('builder', 'Tools\Builder::index');
+});
diff --git a/user_guide_src/source/incoming/routing/022.php b/user_guide_src/source/incoming/routing/022.php
new file mode 100644
index 000000000000..0af87a58c3b5
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/022.php
@@ -0,0 +1,8 @@
+<?php
+
+// The route is defined as:
+$routes->get('users/(:num)/gallery(:any)', 'App\Controllers\Galleries::showUserGallery/$1/$2');
+
+// Generate the relative URL to link to user ID 15, gallery 12
+// Generates: /users/15/gallery/12
+<a href="<?= route_to('App\Controllers\Galleries::showUserGallery', 15, 12) ?>">View Gallery</a>
diff --git a/user_guide_src/source/incoming/routing/023-2.php b/user_guide_src/source/incoming/routing/023-2.php
new file mode 100644
index 000000000000..e2a3784f335f
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/023-2.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->add('products', 'Product::feature');
diff --git a/user_guide_src/source/incoming/routing/023.php b/user_guide_src/source/incoming/routing/023.php
new file mode 100644
index 000000000000..5469c79db91a
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/023.php
@@ -0,0 +1,8 @@
+<?php
+
+// The route is defined as:
+$routes->get('users/(:num)/gallery(:any)', 'Galleries::showUserGallery/$1/$2', ['as' => 'user_gallery']);
+
+// Generate the relative URL to link to user ID 15, gallery 12
+// Generates: /users/15/gallery/12
+<a href="<?= route_to('user_gallery', 15, 12) ?>">View Gallery</a>
diff --git a/user_guide_src/source/incoming/routing/024.php b/user_guide_src/source/incoming/routing/024.php
new file mode 100644
index 000000000000..7351142dea77
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/024.php
@@ -0,0 +1,5 @@
+<?php
+
+$routes->post('products', 'Product::feature');
+$routes->put('products/1', 'Product::feature');
+$routes->delete('products/1', 'Product::feature');
diff --git a/user_guide_src/source/incoming/routing/025.php b/user_guide_src/source/incoming/routing/025.php
new file mode 100644
index 000000000000..a071f75cd156
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/025.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->match(['get', 'put'], 'products', 'Product::feature');
diff --git a/user_guide_src/source/incoming/routing/026.php b/user_guide_src/source/incoming/routing/026.php
new file mode 100644
index 000000000000..a82d57ebc5c7
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/026.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->cli('migrate', 'App\Database::migrate');
diff --git a/user_guide_src/source/incoming/routing/027.php b/user_guide_src/source/incoming/routing/027.php
new file mode 100644
index 000000000000..31c1dda07a70
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/027.php
@@ -0,0 +1,14 @@
+<?php
+
+$routes->add('from', 'to', $options);
+$routes->get('from', 'to', $options);
+$routes->post('from', 'to', $options);
+$routes->put('from', 'to', $options);
+$routes->head('from', 'to', $options);
+$routes->options('from', 'to', $options);
+$routes->delete('from', 'to', $options);
+$routes->patch('from', 'to', $options);
+$routes->match(['get', 'put'], 'from', 'to', $options);
+$routes->resource('photos', $options);
+$routes->map($array, $options);
+$routes->group('name', $options, function ());
diff --git a/user_guide_src/source/incoming/routing/028.php b/user_guide_src/source/incoming/routing/028.php
new file mode 100644
index 000000000000..ca1121e0786d
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/028.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->get('admin',' AdminController::index', ['filter' => 'admin-auth']);
diff --git a/user_guide_src/source/incoming/routing/029.php b/user_guide_src/source/incoming/routing/029.php
new file mode 100644
index 000000000000..b50db49bd962
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/029.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->post('users/delete/(:segment)', 'AdminController::index', ['filter' => 'admin-auth:dual,noreturn']);
diff --git a/user_guide_src/source/incoming/routing/030.php b/user_guide_src/source/incoming/routing/030.php
new file mode 100644
index 000000000000..14d5142de2f0
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/030.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->get('admin',' AdminController::index', ['filter' => \App\Filters\SomeFilter::class]);
diff --git a/user_guide_src/source/incoming/routing/031.php b/user_guide_src/source/incoming/routing/031.php
new file mode 100644
index 000000000000..24cf6c5dbc2d
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/031.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->get('admin',' AdminController::index', ['filter' => ['admin-auth', \App\Filters\SomeFilter::class]]);
diff --git a/user_guide_src/source/incoming/routing/032.php b/user_guide_src/source/incoming/routing/032.php
new file mode 100644
index 000000000000..b992deb96ecf
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/032.php
@@ -0,0 +1,4 @@
+<?php
+
+// Routes to \Admin\Users::index()
+$routes->get('admin/users', 'Users::index', ['namespace' => 'Admin']);
diff --git a/user_guide_src/source/incoming/routing/033.php b/user_guide_src/source/incoming/routing/033.php
new file mode 100644
index 000000000000..5b415a50138b
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/033.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->get('from', 'to', ['hostname' => 'accounts.example.com']);
diff --git a/user_guide_src/source/incoming/routing/034.php b/user_guide_src/source/incoming/routing/034.php
new file mode 100644
index 000000000000..32a74934eb3a
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/034.php
@@ -0,0 +1,4 @@
+<?php
+
+// Limit to media.example.com
+$routes->get('from', 'to', ['subdomain' => 'media']);
diff --git a/user_guide_src/source/incoming/routing/035.php b/user_guide_src/source/incoming/routing/035.php
new file mode 100644
index 000000000000..0d0fd0e67fb4
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/035.php
@@ -0,0 +1,4 @@
+<?php
+
+// Limit to any sub-domain
+$routes->get('from', 'to', ['subdomain' => '*']);
diff --git a/user_guide_src/source/incoming/routing/036.php b/user_guide_src/source/incoming/routing/036.php
new file mode 100644
index 000000000000..ec7fa680f65e
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/036.php
@@ -0,0 +1,6 @@
+<?php
+
+$routes->get('users/(:num)', 'users/show/$1', ['offset' => 1]);
+
+// Creates:
+$routes['users/(:num)'] = 'users/show/$2';
diff --git a/user_guide_src/source/incoming/routing/037.php b/user_guide_src/source/incoming/routing/037.php
new file mode 100644
index 000000000000..29fc83e59f17
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/037.php
@@ -0,0 +1,12 @@
+<?php
+
+// First you need to enable sorting.
+$routes->setPrioritize();
+
+// App\Config\Routes
+$routes->get('(.*)', 'Posts::index', ['priority' => 1]);
+
+// Modules\Acme\Config\Routes
+$routes->get('admin', 'Admin::index');
+
+// The "admin" route will now be processed before the wildcard router.
diff --git a/user_guide_src/source/incoming/routing/038.php b/user_guide_src/source/incoming/routing/038.php
new file mode 100644
index 000000000000..9465f4147e2c
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/038.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->setPrioritize(false);
diff --git a/user_guide_src/source/incoming/routing/039.php b/user_guide_src/source/incoming/routing/039.php
new file mode 100644
index 000000000000..98aef9276f9d
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/039.php
@@ -0,0 +1,9 @@
+<?php
+
+$routes->setDefaultNamespace('');
+
+// Controller is \Users
+$routes->get('users', 'Users::index');
+
+// Controller is \Admin\Users
+$routes->get('users', 'Admin\Users::index');
diff --git a/user_guide_src/source/incoming/routing/040.php b/user_guide_src/source/incoming/routing/040.php
new file mode 100644
index 000000000000..fbbbee2300df
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/040.php
@@ -0,0 +1,9 @@
+<?php
+
+$routes->setDefaultNamespace('App');
+
+// Controller is \App\Users
+$routes->get('users', 'Users::index');
+
+// Controller is \App\Admin\Users
+$routes->get('users', 'Admin\Users::index');
diff --git a/user_guide_src/source/incoming/routing/041.php b/user_guide_src/source/incoming/routing/041.php
new file mode 100644
index 000000000000..5d17df8130d4
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/041.php
@@ -0,0 +1,4 @@
+<?php
+
+// example.com routes to app/Controllers/Welcome.php
+$routes->setDefaultController('Welcome');
diff --git a/user_guide_src/source/incoming/routing/042.php b/user_guide_src/source/incoming/routing/042.php
new file mode 100644
index 000000000000..e926e651287d
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/042.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->setDefaultMethod('listAll');
diff --git a/user_guide_src/source/incoming/routing/043.php b/user_guide_src/source/incoming/routing/043.php
new file mode 100644
index 000000000000..31d49508ab86
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/043.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->setTranslateURIDashes(true);
diff --git a/user_guide_src/source/incoming/routing/044.php b/user_guide_src/source/incoming/routing/044.php
new file mode 100644
index 000000000000..c331102cd9f4
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/044.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->setAutoRoute(false);
diff --git a/user_guide_src/source/incoming/routing/045.php b/user_guide_src/source/incoming/routing/045.php
new file mode 100644
index 000000000000..1f3758e244d4
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/045.php
@@ -0,0 +1,10 @@
+<?php
+
+// Would execute the show404 method of the App\Errors class
+$routes->set404Override('App\Errors::show404');
+
+// Will display a custom view
+$routes->set404Override(function ()
+{
+    echo view('my_errors/not_found.html');
+});
diff --git a/user_guide_src/source/incoming/routing/046.php b/user_guide_src/source/incoming/routing/046.php
new file mode 100644
index 000000000000..e3dd9f60c989
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/046.php
@@ -0,0 +1,7 @@
+<?php
+
+// to enable
+$routes->setPrioritize();
+
+// to disable
+$routes->setPrioritize(false);
diff --git a/user_guide_src/source/index.rst b/user_guide_src/source/index.rst
index 3f337e5b1f2a..7cc3b84742c4 100644
--- a/user_guide_src/source/index.rst
+++ b/user_guide_src/source/index.rst
@@ -75,7 +75,6 @@ Handling Databases
 
     dbmgmt/index
 
-
 *******************
 Libraries & Helpers
 *******************
diff --git a/user_guide_src/source/installation/installing_composer.rst b/user_guide_src/source/installation/installing_composer.rst
index 7133e2cb80bf..ddda93bccf72 100644
--- a/user_guide_src/source/installation/installing_composer.rst
+++ b/user_guide_src/source/installation/installing_composer.rst
@@ -173,7 +173,6 @@ Folders in your project after set up:
 - app, public, writable (when using ``--prefer-source``)
 - vendor/codeigniter4/framework/system
 
-
 Translations Installation
 =========================
 
diff --git a/user_guide_src/source/installation/installing_manual.rst b/user_guide_src/source/installation/installing_manual.rst
index ebd231cdb2cf..c51f0964272e 100644
--- a/user_guide_src/source/installation/installing_manual.rst
+++ b/user_guide_src/source/installation/installing_manual.rst
@@ -52,7 +52,6 @@ Structure
 Folders in your project after set up:
 app, public, system, writable
 
-
 Translations Installation
 =========================
 
diff --git a/user_guide_src/source/installation/troubleshooting.rst b/user_guide_src/source/installation/troubleshooting.rst
index 0da650bdf07c..9ae2b5ac843a 100644
--- a/user_guide_src/source/installation/troubleshooting.rst
+++ b/user_guide_src/source/installation/troubleshooting.rst
@@ -34,13 +34,15 @@ first step, open your **app/Config/App.php** file and look for
 the URI Protocol information. It will recommend that you try a couple of
 alternate settings. If it still doesn't work after you've tried this
 you'll need to force CodeIgniter to add a question mark to your URLs. To
-do this open your **app/Config/App.php** file and change this::
+do this open your **app/Config/App.php** file and change this:
 
-    public $indexPage = 'index.php';
+.. literalinclude:: troubleshooting/001.php
+   :lines: 2-
 
-To this::
+To this:
 
-    public $indexPage = 'index.php?';
+.. literalinclude:: troubleshooting/002.php
+   :lines: 2-
 
 The tutorial gives 404 errors everywhere :(
 -------------------------------------------
diff --git a/user_guide_src/source/installation/troubleshooting/001.php b/user_guide_src/source/installation/troubleshooting/001.php
new file mode 100644
index 000000000000..54798c261dae
--- /dev/null
+++ b/user_guide_src/source/installation/troubleshooting/001.php
@@ -0,0 +1,3 @@
+<?php
+
+public $indexPage = 'index.php';
diff --git a/user_guide_src/source/installation/troubleshooting/002.php b/user_guide_src/source/installation/troubleshooting/002.php
new file mode 100644
index 000000000000..1021e7c877b6
--- /dev/null
+++ b/user_guide_src/source/installation/troubleshooting/002.php
@@ -0,0 +1,3 @@
+<?php
+
+public $indexPage = 'index.php?';
diff --git a/user_guide_src/source/installation/upgrade_404.rst b/user_guide_src/source/installation/upgrade_404.rst
index 8703e3bd6680..4a52f1c7e9eb 100644
--- a/user_guide_src/source/installation/upgrade_404.rst
+++ b/user_guide_src/source/installation/upgrade_404.rst
@@ -8,13 +8,12 @@ code implementing the ``FilterInterface``.
 **Update FilterInterface declarations**
 
 The method signatures for ``after()`` and ``before()`` must be updated to include ``$arguments``. The function
-definitions should be changed from::
+definitions should be changed from:
 
-    public function before(RequestInterface $request)
-    public function after(RequestInterface $request, ResponseInterface $response)
+.. literalinclude:: upgrade_404/001.php
+   :lines: 2-
 
-to::
-
-    public function before(RequestInterface $request, $arguments = null)
-    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+to:
 
+.. literalinclude:: upgrade_404/002.php
+   :lines: 2-
diff --git a/user_guide_src/source/installation/upgrade_404/001.php b/user_guide_src/source/installation/upgrade_404/001.php
new file mode 100644
index 000000000000..8dce457c82ec
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_404/001.php
@@ -0,0 +1,4 @@
+<?php
+
+public function before(RequestInterface $request)
+public function after(RequestInterface $request, ResponseInterface $response)
diff --git a/user_guide_src/source/installation/upgrade_404/002.php b/user_guide_src/source/installation/upgrade_404/002.php
new file mode 100644
index 000000000000..45a7eb869f60
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_404/002.php
@@ -0,0 +1,4 @@
+<?php
+
+public function before(RequestInterface $request, $arguments = null)
+public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
diff --git a/user_guide_src/source/installation/upgrade_412.rst b/user_guide_src/source/installation/upgrade_412.rst
index b1b8576d23b3..0798b0b2bd4f 100644
--- a/user_guide_src/source/installation/upgrade_412.rst
+++ b/user_guide_src/source/installation/upgrade_412.rst
@@ -47,26 +47,15 @@ own test cases. Most notably test extensions have moved to Traits to make them e
 pick-and-choose across various test case needs. The ``CIDatabaseTestCase`` and ``FeatureTestCase``
 classes have been deprecated and their methods moved to ``DatabaseTestTrait`` and
 ``FeatureTestTrait`` respectively. Update your test cases to extend the main test case
-and use any traits you need. For example::
+and use any traits you need. For example:
 
-    use CodeIgniter\Test\DatabaseTestCase;
+.. literalinclude:: upgrade_412/001.php
+   :lines: 2-
 
-    class MyDatabaseTest extends DatabaseTestCase
-    {
-        public function testBadRow()
-        {
+... becomes:
 
-... becomes::
-
-    use CodeIgniter\Test\CIUnitTestCase;
-    use CodeIgniter\Test\DatabaseTestTrait;
-
-    class MyDatabaseTest extends CIUnitTestCase
-    {
-        use DatabaseTestTrait;
-
-        public function testBadRow()
-        {
+.. literalinclude:: upgrade_412/002.php
+   :lines: 2-
 
 Finally, ``ControllerTester`` has been superseded by ``ControllerTestTrait`` to standardize
 approach and take advantage of the updated response testing (below).
diff --git a/user_guide_src/source/installation/upgrade_412/001.php b/user_guide_src/source/installation/upgrade_412/001.php
new file mode 100644
index 000000000000..9b9373ac6cf0
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_412/001.php
@@ -0,0 +1,8 @@
+<?php
+
+use CodeIgniter\Test\DatabaseTestCase;
+
+class MyDatabaseTest extends DatabaseTestCase
+{
+    public function testBadRow()
+    {
diff --git a/user_guide_src/source/installation/upgrade_412/002.php b/user_guide_src/source/installation/upgrade_412/002.php
new file mode 100644
index 000000000000..4fc229a77927
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_412/002.php
@@ -0,0 +1,11 @@
+<?php
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+
+class MyDatabaseTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+
+    public function testBadRow()
+    {
diff --git a/user_guide_src/source/installation/upgrade_414.rst b/user_guide_src/source/installation/upgrade_414.rst
index d3e19b0a9954..60cdc46f0e40 100644
--- a/user_guide_src/source/installation/upgrade_414.rst
+++ b/user_guide_src/source/installation/upgrade_414.rst
@@ -34,7 +34,6 @@ If you relied on any of these methods being public (highly unlikely) adjust your
 * ``CodeIgniter\Test\Mock\MockIncomingRequest::detectURI()``
 * ``CodeIgniter\Test\Mock\MockSecurity.php::sendCookie()``
 
-
 Project Files
 =============
 
diff --git a/user_guide_src/source/installation/upgrade_415.rst b/user_guide_src/source/installation/upgrade_415.rst
index c35c00126864..cde5c4daae3d 100644
--- a/user_guide_src/source/installation/upgrade_415.rst
+++ b/user_guide_src/source/installation/upgrade_415.rst
@@ -44,12 +44,10 @@ now CSRF protection works on not only **POST** but also **PUT/PATCH/DELETE** req
 When you use **PUT/PATCH/DELETE** requests, you need to send CSRF token. Or remove the CSRF filter
 for such requests if you don't need CSRF protection for them.
 
-If you want the same behavior as the previous version, set the CSRF filter like the following in **app/Config/Filters.php**::
+If you want the same behavior as the previous version, set the CSRF filter like the following in **app/Config/Filters.php**:
 
-    public $methods = [
-        'get'  => ['csrf'],
-        'post' => ['csrf'],
-    ];
+.. literalinclude:: upgrade_415/001.php
+   :lines: 2-
 
 Protecting **GET** method needs only when you use ``form_open()`` auto-generation of CSRF field.
 
diff --git a/user_guide_src/source/installation/upgrade_415/001.php b/user_guide_src/source/installation/upgrade_415/001.php
new file mode 100644
index 000000000000..e2b03e79ba25
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_415/001.php
@@ -0,0 +1,6 @@
+<?php
+
+public $methods = [
+    'get'  => ['csrf'],
+    'post' => ['csrf'],
+];
diff --git a/user_guide_src/source/installation/upgrade_configuration.rst b/user_guide_src/source/installation/upgrade_configuration.rst
index fa168b2627ed..21ae6101c158 100644
--- a/user_guide_src/source/installation/upgrade_configuration.rst
+++ b/user_guide_src/source/installation/upgrade_configuration.rst
@@ -11,7 +11,6 @@ Documentations
 - `Config Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/config.html>`_
 - :doc:`Configuration Documentation CodeIgniter 4.X </general/configuration>`
 
-
 What has been changed
 =====================
 
@@ -39,28 +38,13 @@ Code Example
 CodeIgniter Version 3.x
 ------------------------
 
-Path: **application/config**::
-
-    <?php
-
-    defined('BASEPATH') OR exit('No direct script access allowed');
+Path: **application/config**:
 
-    $siteName  = 'My Great Site';
-    $siteEmail = 'webmaster@example.com';
+.. literalinclude:: upgrade_configuration/001.php
 
 CodeIgniter Version 4.x
 -----------------------
 
-Path: **app/Config**::
-
-   <?php
-
-   namespace Config;
-
-   use CodeIgniter\Config\BaseConfig;
+Path: **app/Config**:
 
-   class CustomClass extends BaseConfig
-   {
-      public $siteName  = 'My Great Site';
-      public $siteEmail = 'webmaster@example.com';
-   }
+.. literalinclude:: upgrade_configuration/002.php
diff --git a/user_guide_src/source/installation/upgrade_configuration/001.php b/user_guide_src/source/installation/upgrade_configuration/001.php
new file mode 100644
index 000000000000..09a92a1b1cd7
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_configuration/001.php
@@ -0,0 +1,6 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$siteName  = 'My Great Site';
+$siteEmail = 'webmaster@example.com';
diff --git a/user_guide_src/source/installation/upgrade_configuration/002.php b/user_guide_src/source/installation/upgrade_configuration/002.php
new file mode 100644
index 000000000000..5150d6b8896d
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_configuration/002.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class CustomClass extends BaseConfig
+{
+   public $siteName  = 'My Great Site';
+   public $siteEmail = 'webmaster@example.com';
+}
diff --git a/user_guide_src/source/installation/upgrade_controllers.rst b/user_guide_src/source/installation/upgrade_controllers.rst
index 60d4e4bd3d2e..5c6160284e88 100644
--- a/user_guide_src/source/installation/upgrade_controllers.rst
+++ b/user_guide_src/source/installation/upgrade_controllers.rst
@@ -17,7 +17,7 @@ What has been changed
 - Since namespaces have been added to CodeIgniter 4, the controllers must be changed to support namespaces.
 - Controllers don’t use constructors any more (to invoke CI “magic”) unless those are part of base controllers you make.
 - CI provides Request and Response objects for you to work with - more powerful than the CI3-way.
-- If you want a base controller (``MY_Controller`` in CI3), make it where you like, 
+- If you want a base controller (``MY_Controller`` in CI3), make it where you like,
   e.g., BaseController extends Controller, and then have your controllers extend it
 
 Upgrade Guide
@@ -29,7 +29,7 @@ Upgrade Guide
 
 | If you use sub-directories in your controller structure, you have to change the namespace according to that.
 | For example, you have a version 3 controller located in **application/controllers/users/auth/Register.php**,
-    the namespace has to be ``namespace App\Controllers\Users\Auth;`` and the controller path in the version 4 
+    the namespace has to be ``namespace App\Controllers\Users\Auth;`` and the controller path in the version 4
     should look like this: **app/Controllers/Users/Auth/Register.php**. Make sure to have the first letters of
     the sub-directories as capitalized.
 | After that you have to insert a ``use`` statement below the namespace definition in order to extend the ``BaseController``:
@@ -41,31 +41,13 @@ Code Example
 CodeIgniter Version 3.x
 ------------------------
 
-Path: **application/controllers**::
+Path: **application/controllers**:
 
-    <?php
-
-    class Helloworld extends CI_Controller
-    {
-        public function index($name)
-        {
-            echo "Hello $name! ";
-        }
-    }
+.. literalinclude:: upgrade_controllers/001.php
 
 CodeIgniter Version 4.x
 -----------------------
 
-Path: **app/Controllers**::
-
-    <?php
-
-    namespace App\Controllers;
+Path: **app/Controllers**:
 
-    class Helloworld extends BaseController
-    {
-        public function index($name)
-        {
-            echo 'Hello ' . esc($name) . '!';
-        }
-    }
+.. literalinclude:: upgrade_controllers/002.php
diff --git a/user_guide_src/source/installation/upgrade_controllers/001.php b/user_guide_src/source/installation/upgrade_controllers/001.php
new file mode 100644
index 000000000000..d6a01bdea8b1
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_controllers/001.php
@@ -0,0 +1,9 @@
+<?php
+
+class Helloworld extends CI_Controller
+{
+    public function index($name)
+    {
+        echo "Hello $name! ";
+    }
+}
diff --git a/user_guide_src/source/installation/upgrade_controllers/002.php b/user_guide_src/source/installation/upgrade_controllers/002.php
new file mode 100644
index 000000000000..5f292b54d1b8
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_controllers/002.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Controllers;
+
+class Helloworld extends BaseController
+{
+    public function index($name)
+    {
+        echo 'Hello ' . esc($name) . '!';
+    }
+}
diff --git a/user_guide_src/source/installation/upgrade_database.rst b/user_guide_src/source/installation/upgrade_database.rst
index 7d41152ccad8..8d52f2c0b2be 100644
--- a/user_guide_src/source/installation/upgrade_database.rst
+++ b/user_guide_src/source/installation/upgrade_database.rst
@@ -5,14 +5,12 @@ Upgrade Database
     :local:
     :depth: 2
 
-
 Documentations
 ==============
 
 - `Database Reference Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/database/index.html>`_
 - :doc:`Working with Databases Documentation CodeIgniter 4.X </database/index>`
 
-
 What has been changed
 =====================
 - The functionality in CI3 is basically the same as in CI4.
@@ -42,26 +40,17 @@ Upgrade Guide
     - ``$this->db->join('comments', 'comments.id = blogs.id');`` to ``$builder->join('comments', 'comments.id = blogs.id');``
     - ``$this->db->having('user_id',  45);`` to ``$builder->having('user_id',  45);``
 
-
 Code Example
 ============
 
 CodeIgniter Version 3.x
 ------------------------
-::
 
-   $query = $this->db->select('title')
-                ->where('id', $id)
-                ->limit(10, 20)
-                ->get('mytable');
+.. literalinclude:: upgrade_database/001.php
+   :lines: 2-
 
 CodeIgniter Version 4.x
 -----------------------
-::
-
-    $builder = $db->table('mytable');
 
-    $query = $builder->select('title')
-                 ->where('id', $id)
-                 ->limit(10, 20)
-                 ->get();
+.. literalinclude:: upgrade_database/002.php
+   :lines: 2-
diff --git a/user_guide_src/source/installation/upgrade_database/001.php b/user_guide_src/source/installation/upgrade_database/001.php
new file mode 100644
index 000000000000..5dd7b11a60e7
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_database/001.php
@@ -0,0 +1,6 @@
+<?php
+
+$query = $this->db->select('title')
+             ->where('id', $id)
+             ->limit(10, 20)
+             ->get('mytable');
diff --git a/user_guide_src/source/installation/upgrade_database/002.php b/user_guide_src/source/installation/upgrade_database/002.php
new file mode 100644
index 000000000000..65fdc4c24d1b
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_database/002.php
@@ -0,0 +1,8 @@
+<?php
+
+$builder = $db->table('mytable');
+
+$query = $builder->select('title')
+             ->where('id', $id)
+             ->limit(10, 20)
+             ->get();
diff --git a/user_guide_src/source/installation/upgrade_emails.rst b/user_guide_src/source/installation/upgrade_emails.rst
index af5e532262aa..155562ba4a1a 100644
--- a/user_guide_src/source/installation/upgrade_emails.rst
+++ b/user_guide_src/source/installation/upgrade_emails.rst
@@ -5,14 +5,12 @@ Upgrade Emails
     :local:
     :depth: 2
 
-
 Documentations
 ==============
 
 - `Email Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/email.html>`_
 - :doc:`Email Documentation CodeIgniter 4.X </libraries/email>`
 
-
 What has been changed
 =====================
 - Only small things like the method names and the loading of the library have changed.
@@ -29,32 +27,12 @@ Code Example
 
 CodeIgniter Version 3.x
 ------------------------
-::
-
-    $this->load->library('email');
-
-    $this->email->from('your@example.com', 'Your Name');
-    $this->email->to('someone@example.com');
-    $this->email->cc('another@another-example.com');
-    $this->email->bcc('them@their-example.com');
 
-    $this->email->subject('Email Test');
-    $this->email->message('Testing the email class.');
-
-    $this->email->send();
+.. literalinclude:: upgrade_emails/001.php
+   :lines: 2-
 
 CodeIgniter Version 4.x
 -----------------------
-::
-
-    $email = service('email');
-
-    $email->setFrom('your@example.com', 'Your Name');
-    $email->setTo('someone@example.com');
-    $email->setCC('another@another-example.com');
-    $email->setBCC('them@their-example.com');
-
-    $email->setSubject('Email Test');
-    $email->setMessage('Testing the email class.');
 
-    $email->send();
+.. literalinclude:: upgrade_emails/002.php
+   :lines: 2-
diff --git a/user_guide_src/source/installation/upgrade_emails/001.php b/user_guide_src/source/installation/upgrade_emails/001.php
new file mode 100644
index 000000000000..e9144bb87f6e
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_emails/001.php
@@ -0,0 +1,13 @@
+<?php
+
+$this->load->library('email');
+
+$this->email->from('your@example.com', 'Your Name');
+$this->email->to('someone@example.com');
+$this->email->cc('another@another-example.com');
+$this->email->bcc('them@their-example.com');
+
+$this->email->subject('Email Test');
+$this->email->message('Testing the email class.');
+
+$this->email->send();
diff --git a/user_guide_src/source/installation/upgrade_emails/002.php b/user_guide_src/source/installation/upgrade_emails/002.php
new file mode 100644
index 000000000000..f7873714bab5
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_emails/002.php
@@ -0,0 +1,13 @@
+<?php
+
+$email = service('email');
+
+$email->setFrom('your@example.com', 'Your Name');
+$email->setTo('someone@example.com');
+$email->setCC('another@another-example.com');
+$email->setBCC('them@their-example.com');
+
+$email->setSubject('Email Test');
+$email->setMessage('Testing the email class.');
+
+$email->send();
diff --git a/user_guide_src/source/installation/upgrade_encryption.rst b/user_guide_src/source/installation/upgrade_encryption.rst
index d9a29af62650..5915ca00dca1 100644
--- a/user_guide_src/source/installation/upgrade_encryption.rst
+++ b/user_guide_src/source/installation/upgrade_encryption.rst
@@ -5,14 +5,12 @@ Upgrade Encryption
     :local:
     :depth: 2
 
-
 Documentations
 ==============
 
 - `Encryption Library Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/encryption.html>`_
 - :doc:`Encryption Service Documentation CodeIgniter 4.X </libraries/encryption>`
 
-
 What has been changed
 =====================
 - The support for ``MCrypt`` has been dropped, as that has been deprecated as of PHP 7.2.
@@ -27,25 +25,12 @@ Code Example
 
 CodeIgniter Version 3.x
 ------------------------
-::
-
-    $this->load->library('encryption');
-
-    $plain_text = 'This is a plain-text message!';
-    $ciphertext = $this->encryption->encrypt($plain_text);
-
-    // Outputs: This is a plain-text message!
-    echo $this->encryption->decrypt($ciphertext);
 
+.. literalinclude:: upgrade_encryption/001.php
+   :lines: 2-
 
 CodeIgniter Version 4.x
 -----------------------
-::
-
-    $encrypter = service('encrypter');
-
-    $plainText = 'This is a plain-text message!';
-    $ciphertext = $encrypter->encrypt($plainText);
 
-    // Outputs: This is a plain-text message!
-    echo $encrypter->decrypt($ciphertext);
+.. literalinclude:: upgrade_encryption/002.php
+   :lines: 2-
diff --git a/user_guide_src/source/installation/upgrade_encryption/001.php b/user_guide_src/source/installation/upgrade_encryption/001.php
new file mode 100644
index 000000000000..b20ba8aec855
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_encryption/001.php
@@ -0,0 +1,9 @@
+<?php
+
+$this->load->library('encryption');
+
+$plain_text = 'This is a plain-text message!';
+$ciphertext = $this->encryption->encrypt($plain_text);
+
+// Outputs: This is a plain-text message!
+echo $this->encryption->decrypt($ciphertext);
diff --git a/user_guide_src/source/installation/upgrade_encryption/002.php b/user_guide_src/source/installation/upgrade_encryption/002.php
new file mode 100644
index 000000000000..91b00ee54e83
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_encryption/002.php
@@ -0,0 +1,9 @@
+<?php
+
+$encrypter = service('encrypter');
+
+$plainText = 'This is a plain-text message!';
+$ciphertext = $encrypter->encrypt($plainText);
+
+// Outputs: This is a plain-text message!
+echo $encrypter->decrypt($ciphertext);
diff --git a/user_guide_src/source/installation/upgrade_file_upload.rst b/user_guide_src/source/installation/upgrade_file_upload.rst
index 27bd74e19a74..f0eb3a24c405 100644
--- a/user_guide_src/source/installation/upgrade_file_upload.rst
+++ b/user_guide_src/source/installation/upgrade_file_upload.rst
@@ -5,7 +5,6 @@ Upgrade Working with Uploaded Files
     :local:
     :depth: 2
 
-
 Documentations
 ==============
 - `Output Class Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/file_uploading.html>`_
@@ -27,76 +26,10 @@ Code Example
 
 CodeIgniter Version 3.x
 ------------------------
-::
-
-    <?php
-
-    class Upload extends CI_Controller {
-
-        public function __construct()
-        {
-            parent::__construct();
-            $this->load->helper(array('form', 'url'));
-        }
-
-        public function index()
-        {
-            $this->load->view('upload_form', array('error' => ' ' ));
-        }
-
-        public function do_upload()
-        {
-            $config['upload_path']   = './uploads/';
-            $config['allowed_types'] = 'png|jpg|gif';
-            $config['max_size']      = 100;
-            $config['max_width']     = 1024;
-            $config['max_height']    = 768;
-
-            $this->load->library('upload', $config);
-
-            if (! $this->upload->do_upload('userfile')) {
-                $error = array('error' => $this->upload->display_errors());
 
-                $this->load->view('upload_form', $error);
-            } else {
-                $data = array('upload_data' => $this->upload->data());
-
-                $this->load->view('upload_success', $data);
-            }
-        }
-    }
+.. literalinclude:: upgrade_file_upload/001.php
 
 CodeIgniter Version 4.x
 -----------------------
-::
-
-    <?php
-
-    namespace App\Controllers;
-
-    class Upload extends BaseController {
-
-        public function index()
-        {
-            echo view('upload_form', ['error' => ' ']);
-        }
-
-        public function do_upload()
-        {
-            $this->validate([
-                'userfile' => 'uploaded[userfile]|max_size[userfile,100]'
-                               . '|mime_in[userfile,image/png,image/jpg,image/gif]'
-                               . '|ext_in[userfile,png,jpg,gif]|max_dims[userfile,1024,768]'
-            ]);
-
-            $file = $this->request->getFile('userfile');
-
-            if (! $path = $file->store()) {
-                echo view('upload_form', ['error' => "upload failed"]);
-            } else {
-                $data = ['upload_file_path' => $path];
 
-                echo view('upload_success', $data);
-            }
-        }
-    }
+.. literalinclude:: upgrade_file_upload/002.php
diff --git a/user_guide_src/source/installation/upgrade_file_upload/001.php b/user_guide_src/source/installation/upgrade_file_upload/001.php
new file mode 100644
index 000000000000..f6bb20c64de3
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_file_upload/001.php
@@ -0,0 +1,36 @@
+<?php
+
+class Upload extends CI_Controller {
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->load->helper(array('form', 'url'));
+    }
+
+    public function index()
+    {
+        $this->load->view('upload_form', array('error' => ' ' ));
+    }
+
+    public function do_upload()
+    {
+        $config['upload_path']   = './uploads/';
+        $config['allowed_types'] = 'png|jpg|gif';
+        $config['max_size']      = 100;
+        $config['max_width']     = 1024;
+        $config['max_height']    = 768;
+
+        $this->load->library('upload', $config);
+
+        if (! $this->upload->do_upload('userfile')) {
+            $error = array('error' => $this->upload->display_errors());
+
+            $this->load->view('upload_form', $error);
+        } else {
+            $data = array('upload_data' => $this->upload->data());
+
+            $this->load->view('upload_success', $data);
+        }
+    }
+}
diff --git a/user_guide_src/source/installation/upgrade_file_upload/002.php b/user_guide_src/source/installation/upgrade_file_upload/002.php
new file mode 100644
index 000000000000..29de4bf665dc
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_file_upload/002.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Controllers;
+
+class Upload extends BaseController {
+
+    public function index()
+    {
+        echo view('upload_form', ['error' => ' ']);
+    }
+
+    public function do_upload()
+    {
+        $this->validate([
+            'userfile' => 'uploaded[userfile]|max_size[userfile,100]'
+                           . '|mime_in[userfile,image/png,image/jpg,image/gif]'
+                           . '|ext_in[userfile,png,jpg,gif]|max_dims[userfile,1024,768]'
+        ]);
+
+        $file = $this->request->getFile('userfile');
+
+        if (! $path = $file->store()) {
+            echo view('upload_form', ['error' => "upload failed"]);
+        } else {
+            $data = ['upload_file_path' => $path];
+
+            echo view('upload_success', $data);
+        }
+    }
+}
diff --git a/user_guide_src/source/installation/upgrade_html_tables.rst b/user_guide_src/source/installation/upgrade_html_tables.rst
index 1fb70790ccbc..23e6aea3526b 100644
--- a/user_guide_src/source/installation/upgrade_html_tables.rst
+++ b/user_guide_src/source/installation/upgrade_html_tables.rst
@@ -5,14 +5,12 @@ Upgrade HTML Tables
     :local:
     :depth: 2
 
-
 Documentations
 ==============
 
 - `HTML Table Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/table.html>`_
 - :doc:`HTML Table Documentation CodeIgniter 4.X </outgoing/table>`
 
-
 What has been changed
 =====================
 - Only small things like the method names and the loading of the library have changed.
@@ -28,28 +26,12 @@ Code Example
 
 CodeIgniter Version 3.x
 ------------------------
-::
-
-    $this->load->library('table');
-
-    $this->table->set_heading('Name', 'Color', 'Size');
 
-    $this->table->add_row('Fred', 'Blue', 'Small');
-    $this->table->add_row('Mary', 'Red', 'Large');
-    $this->table->add_row('John', 'Green', 'Medium');
-
-    echo $this->table->generate();
+.. literalinclude:: upgrade_html_tables/001.php
+   :lines: 2-
 
 CodeIgniter Version 4.x
 -----------------------
-::
-
-    $table = new \CodeIgniter\View\Table();
-
-    $table->setHeading('Name', 'Color', 'Size');
-
-    $table->addRow('Fred', 'Blue', 'Small');
-    $table->addRow('Mary', 'Red', 'Large');
-    $table->addRow('John', 'Green', 'Medium');
 
-    echo $table->generate();
+.. literalinclude:: upgrade_html_tables/002.php
+   :lines: 2-
diff --git a/user_guide_src/source/installation/upgrade_html_tables/001.php b/user_guide_src/source/installation/upgrade_html_tables/001.php
new file mode 100644
index 000000000000..5e607318c36f
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_html_tables/001.php
@@ -0,0 +1,11 @@
+<?php
+
+$this->load->library('table');
+
+$this->table->set_heading('Name', 'Color', 'Size');
+
+$this->table->add_row('Fred', 'Blue', 'Small');
+$this->table->add_row('Mary', 'Red', 'Large');
+$this->table->add_row('John', 'Green', 'Medium');
+
+echo $this->table->generate();
diff --git a/user_guide_src/source/installation/upgrade_html_tables/002.php b/user_guide_src/source/installation/upgrade_html_tables/002.php
new file mode 100644
index 000000000000..0d0679305409
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_html_tables/002.php
@@ -0,0 +1,11 @@
+<?php
+
+$table = new \CodeIgniter\View\Table();
+
+$table->setHeading('Name', 'Color', 'Size');
+
+$table->addRow('Fred', 'Blue', 'Small');
+$table->addRow('Mary', 'Red', 'Large');
+$table->addRow('John', 'Green', 'Medium');
+
+echo $table->generate();
diff --git a/user_guide_src/source/installation/upgrade_localization.rst b/user_guide_src/source/installation/upgrade_localization.rst
index 8362b711aa3f..3fec8c15cce0 100644
--- a/user_guide_src/source/installation/upgrade_localization.rst
+++ b/user_guide_src/source/installation/upgrade_localization.rst
@@ -5,23 +5,22 @@ Upgrade Localization
     :local:
     :depth: 2
 
-
 Documentations
 ==============
 
 - `Language Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/language.html>`_
 - :doc:`Localization Documentation CodeIgniter 4.X </outgoing/localization>`
 
-
 What has been changed
 =====================
 - In CI4 the language files return the language lines as array.
 
 Upgrade Guide
 =============
-1. Specify the default language in **Config/App.php**::
+1. Specify the default language in **Config/App.php**:
 
-    public $defaultLocale = 'en';
+   .. literalinclude:: upgrade_localization/001.php
+      :lines: 2-
 
 2. Now move your language files to **app/Language/<locale>**.
 3. After that you have to change the syntax within the language files. Below in the Code Example you will see how the language array within the file should look like.
@@ -33,34 +32,12 @@ Code Example
 
 CodeIgniter Version 3.x
 ------------------------
-::
-
-    // error.php
-    $lang['error_email_missing']    = 'You must submit an email address';
-    $lang['error_url_missing']      = 'You must submit a URL';
-    $lang['error_username_missing'] = 'You must submit a username';
 
-    ...
-
-    $this->lang->load('error', $lang);
-    echo $this->lang->line('error_email_missing');
+.. literalinclude:: upgrade_localization/002.php
+   :lines: 2-
 
 CodeIgniter Version 4.x
 -----------------------
-::
-
-    // Errors.php
-    return [
-        'errorEmailMissing'    => 'You must submit an email address',
-        'errorURLMissing'      => 'You must submit a URL',
-        'errorUsernameMissing' => 'You must submit a username',
-        'nested'               => [
-            'error' => [
-                'message' => 'A specific error message',
-            ],
-        ],
-    ];
-
-    ...
 
-    echo lang('Errors.errorEmailMissing');
+.. literalinclude:: upgrade_localization/003.php
+   :lines: 2-
diff --git a/user_guide_src/source/installation/upgrade_localization/001.php b/user_guide_src/source/installation/upgrade_localization/001.php
new file mode 100644
index 000000000000..c3b3de65be20
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_localization/001.php
@@ -0,0 +1,3 @@
+<?php
+
+public $defaultLocale = 'en';
diff --git a/user_guide_src/source/installation/upgrade_localization/002.php b/user_guide_src/source/installation/upgrade_localization/002.php
new file mode 100644
index 000000000000..a377d18193fc
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_localization/002.php
@@ -0,0 +1,11 @@
+<?php
+
+// error.php
+$lang['error_email_missing']    = 'You must submit an email address';
+$lang['error_url_missing']      = 'You must submit a URL';
+$lang['error_username_missing'] = 'You must submit a username';
+
+...
+
+$this->lang->load('error', $lang);
+echo $this->lang->line('error_email_missing');
diff --git a/user_guide_src/source/installation/upgrade_localization/003.php b/user_guide_src/source/installation/upgrade_localization/003.php
new file mode 100644
index 000000000000..e0149516841d
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_localization/003.php
@@ -0,0 +1,17 @@
+<?php
+
+// Errors.php
+return [
+    'errorEmailMissing'    => 'You must submit an email address',
+    'errorURLMissing'      => 'You must submit a URL',
+    'errorUsernameMissing' => 'You must submit a username',
+    'nested'               => [
+        'error' => [
+            'message' => 'A specific error message',
+        ],
+    ],
+];
+
+...
+
+echo lang('Errors.errorEmailMissing');
diff --git a/user_guide_src/source/installation/upgrade_migrations.rst b/user_guide_src/source/installation/upgrade_migrations.rst
index cf9b7c951511..07dc32e96675 100644
--- a/user_guide_src/source/installation/upgrade_migrations.rst
+++ b/user_guide_src/source/installation/upgrade_migrations.rst
@@ -51,82 +51,16 @@ Code Example
 CodeIgniter Version 3.x
 ------------------------
 
-Path: **application/migrations**::
-
-    <?php
-
-    defined('BASEPATH') OR exit('No direct script access allowed');
-
-    class Migration_Add_blog extends CI_Migration
-    {
-        public function up()
-        {
-            $this->dbforge->add_field(array(
-                'blog_id' => array(
-                    'type'           => 'INT',
-                    'constraint'     => 5,
-                    'unsigned'       => true,
-                    'auto_increment' => true,
-                ),
-                'blog_title' => array(
-                    'type'       => 'VARCHAR',
-                    'constraint' => '100',
-                ),
-                'blog_description' => array(
-                    'type' => 'TEXT',
-                    'null' => true,
-                ),
-            ));
-            $this->dbforge->add_key('blog_id', true);
-            $this->dbforge->create_table('blog');
-        }
-
-        public function down()
-        {
-            $this->dbforge->drop_table('blog');
-        }
-    }
+Path: **application/migrations**:
+
+.. literalinclude:: upgrade_migrations/001.php
 
 CodeIgniter Version 4.x
 -----------------------
 
-Path: **app/Database/Migrations**::
-
-    <?php
-
-    namespace App\Database\Migrations;
-
-    use CodeIgniter\Database\Migration;
-
-    class AddBlog extends Migration
-    {
-        public function up()
-        {
-            $this->forge->addField([
-                'blog_id' => [
-                    'type'           => 'INT',
-                    'constraint'     => 5,
-                    'unsigned'       => true,
-                    'auto_increment' => true,
-                ],
-                'blog_title' => [
-                    'type'       => 'VARCHAR',
-                    'constraint' => '100',
-                ],
-                'blog_description' => [
-                    'type' => 'TEXT',
-                    'null' => true,
-                ],
-            ]);
-            $this->forge->addKey('blog_id', true);
-            $this->forge->createTable('blog');
-        }
-
-        public function down()
-        {
-            $this->forge->dropTable('blog');
-        }
-    }
+Path: **app/Database/Migrations**:
+
+.. literalinclude:: upgrade_migrations/002.php
 
 Search & Replace
 ================
diff --git a/user_guide_src/source/installation/upgrade_migrations/001.php b/user_guide_src/source/installation/upgrade_migrations/001.php
new file mode 100644
index 000000000000..2437a8d5fa99
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_migrations/001.php
@@ -0,0 +1,33 @@
+<?php
+
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+class Migration_Add_blog extends CI_Migration
+{
+    public function up()
+    {
+        $this->dbforge->add_field(array(
+            'blog_id' => array(
+                'type'           => 'INT',
+                'constraint'     => 5,
+                'unsigned'       => true,
+                'auto_increment' => true,
+            ),
+            'blog_title' => array(
+                'type'       => 'VARCHAR',
+                'constraint' => '100',
+            ),
+            'blog_description' => array(
+                'type' => 'TEXT',
+                'null' => true,
+            ),
+        ));
+        $this->dbforge->add_key('blog_id', true);
+        $this->dbforge->create_table('blog');
+    }
+
+    public function down()
+    {
+        $this->dbforge->drop_table('blog');
+    }
+}
diff --git a/user_guide_src/source/installation/upgrade_migrations/002.php b/user_guide_src/source/installation/upgrade_migrations/002.php
new file mode 100644
index 000000000000..3f73906231f1
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_migrations/002.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
+class AddBlog extends Migration
+{
+    public function up()
+    {
+        $this->forge->addField([
+            'blog_id' => [
+                'type'           => 'INT',
+                'constraint'     => 5,
+                'unsigned'       => true,
+                'auto_increment' => true,
+            ],
+            'blog_title' => [
+                'type'       => 'VARCHAR',
+                'constraint' => '100',
+            ],
+            'blog_description' => [
+                'type' => 'TEXT',
+                'null' => true,
+            ],
+        ]);
+        $this->forge->addKey('blog_id', true);
+        $this->forge->createTable('blog');
+    }
+
+    public function down()
+    {
+        $this->forge->dropTable('blog');
+    }
+}
diff --git a/user_guide_src/source/installation/upgrade_models.rst b/user_guide_src/source/installation/upgrade_models.rst
index dce4dd31377a..1b01819d9455 100644
--- a/user_guide_src/source/installation/upgrade_models.rst
+++ b/user_guide_src/source/installation/upgrade_models.rst
@@ -11,7 +11,6 @@ Documentations
 - `Model Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/general/models.html>`_
 - :doc:`Model Documentation CodeIgniter 4.X </models/model>`
 
-
 What has been changed
 =====================
 
@@ -41,36 +40,15 @@ Code Example
 CodeIgniter Version 3.x
 ------------------------
 
-Path: **application/models**::
-
-    <?php
+Path: **application/models**:
 
-    class User_contact extends CI_Model
-    {
-        public function insert($name, $address, $email)
-        {
-            $this->db->insert('user_contacts', array(
-                'name'    => $name,
-                'address' => $address,
-                'email'   => $email,
-            ));
-        }
-    }
+.. literalinclude:: upgrade_models/001.php
 
 CodeIgniter Version 4.x
 -----------------------
 
-Path: **app/Models**::
-
-    <?php
-
-    namespace App\Models;
-
-    use CodeIgniter\Model;
+Path: **app/Models**:
 
-    class UserContact extends Model
-    {
-        // insert() method already implemented in parent
-    }
+.. literalinclude:: upgrade_models/002.php
 
 To insert data you can just directly call the ``$model->insert()`` method because this method is built-in since CI4.
diff --git a/user_guide_src/source/installation/upgrade_models/001.php b/user_guide_src/source/installation/upgrade_models/001.php
new file mode 100644
index 000000000000..1ab3917c6a7f
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_models/001.php
@@ -0,0 +1,13 @@
+<?php
+
+class User_contact extends CI_Model
+{
+    public function insert($name, $address, $email)
+    {
+        $this->db->insert('user_contacts', array(
+            'name'    => $name,
+            'address' => $address,
+            'email'   => $email,
+        ));
+    }
+}
diff --git a/user_guide_src/source/installation/upgrade_models/002.php b/user_guide_src/source/installation/upgrade_models/002.php
new file mode 100644
index 000000000000..0d7882ed2f52
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_models/002.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class UserContact extends Model
+{
+    // insert() method already implemented in parent
+}
diff --git a/user_guide_src/source/installation/upgrade_pagination.rst b/user_guide_src/source/installation/upgrade_pagination.rst
index 99ba213547f0..416bd2f2e6d2 100644
--- a/user_guide_src/source/installation/upgrade_pagination.rst
+++ b/user_guide_src/source/installation/upgrade_pagination.rst
@@ -5,14 +5,12 @@ Upgrade Pagination
     :local:
     :depth: 2
 
-
 Documentations
 ==============
 
 - `Pagination Class Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/pagination.html>`_
 - :doc:`Pagination Documentation CodeIgniter 4.X </libraries/pagination>`
 
-
 What has been changed
 =====================
 - You have to change the views and also the controller in order to use the new pagination library.
@@ -30,35 +28,17 @@ Upgrade Guide
 
     - You can use the built-in ``paginate()`` method on every Model. Have a look at the code example below to see how you setup the pagination on a specific model.
 
-
 Code Example
 ============
 
 CodeIgniter Version 3.x
 ------------------------
-::
-
-    $this->load->library('pagination');
-    $config['base_url']    = base_url().'users/index/';
-    $config['total_rows']  = $this->db->count_all('users');
-    $config['per_page']    = 10;
-    $config['uri_segment'] = 3;
-    $config['attributes']  = array('class' => 'pagination-link');
-    $this->pagination->initialize($config);
 
-    $data['users'] = $this->user_model->get_users(FALSE, $config['per_page'], $offset);
-
-    $this->load->view('posts/index', $data);
+.. literalinclude:: upgrade_pagination/001.php
+   :lines: 2-
 
 CodeIgniter Version 4.x
 -----------------------
-::
-
-    $model = new \App\Models\UserModel();
-
-    $data = [
-        'users' => $model->paginate(10),
-        'pager' => $model->pager,
-    ];
 
-    echo view('users/index', $data);
+.. literalinclude:: upgrade_pagination/002.php
+   :lines: 2-
diff --git a/user_guide_src/source/installation/upgrade_pagination/001.php b/user_guide_src/source/installation/upgrade_pagination/001.php
new file mode 100644
index 000000000000..37a6f849c67c
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_pagination/001.php
@@ -0,0 +1,13 @@
+<?php
+
+$this->load->library('pagination');
+$config['base_url']    = base_url().'users/index/';
+$config['total_rows']  = $this->db->count_all('users');
+$config['per_page']    = 10;
+$config['uri_segment'] = 3;
+$config['attributes']  = array('class' => 'pagination-link');
+$this->pagination->initialize($config);
+
+$data['users'] = $this->user_model->get_users(FALSE, $config['per_page'], $offset);
+
+$this->load->view('posts/index', $data);
diff --git a/user_guide_src/source/installation/upgrade_pagination/002.php b/user_guide_src/source/installation/upgrade_pagination/002.php
new file mode 100644
index 000000000000..fa1b373a5fc6
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_pagination/002.php
@@ -0,0 +1,10 @@
+<?php
+
+$model = new \App\Models\UserModel();
+
+$data = [
+    'users' => $model->paginate(10),
+    'pager' => $model->pager,
+];
+
+echo view('users/index', $data);
diff --git a/user_guide_src/source/installation/upgrade_responses.rst b/user_guide_src/source/installation/upgrade_responses.rst
index 4518836371c9..9af660e35097 100644
--- a/user_guide_src/source/installation/upgrade_responses.rst
+++ b/user_guide_src/source/installation/upgrade_responses.rst
@@ -5,7 +5,6 @@ Upgrade HTTP Responses
     :local:
     :depth: 2
 
-
 Documentations
 ==============
 - `Output Class Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/output.html>`_
@@ -25,22 +24,12 @@ Code Example
 
 CodeIgniter Version 3.x
 ------------------------
-::
-
-    $this->output->set_status_header(404);
-
-    ...
 
-    $this->output
-        ->set_content_type('application/json')
-        ->set_output(json_encode(array('foo' => 'bar')));
+.. literalinclude:: upgrade_responses/001.php
+   :lines: 2-
 
 CodeIgniter Version 4.x
 -----------------------
-::
-
-    $this->response->setStatusCode(404);
-
-    ...
 
-    return $this->response->setJSON(['foo' => 'bar']);
+.. literalinclude:: upgrade_responses/002.php
+   :lines: 2-
diff --git a/user_guide_src/source/installation/upgrade_responses/001.php b/user_guide_src/source/installation/upgrade_responses/001.php
new file mode 100644
index 000000000000..f837ab8b6c3b
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_responses/001.php
@@ -0,0 +1,9 @@
+<?php
+
+$this->output->set_status_header(404);
+
+...
+
+$this->output
+    ->set_content_type('application/json')
+    ->set_output(json_encode(array('foo' => 'bar')));
diff --git a/user_guide_src/source/installation/upgrade_responses/002.php b/user_guide_src/source/installation/upgrade_responses/002.php
new file mode 100644
index 000000000000..e84279cf273c
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_responses/002.php
@@ -0,0 +1,7 @@
+<?php
+
+$this->response->setStatusCode(404);
+
+...
+
+return $this->response->setJSON(['foo' => 'bar']);
diff --git a/user_guide_src/source/installation/upgrade_routing.rst b/user_guide_src/source/installation/upgrade_routing.rst
index b3fe276d6fcc..533826babd29 100644
--- a/user_guide_src/source/installation/upgrade_routing.rst
+++ b/user_guide_src/source/installation/upgrade_routing.rst
@@ -5,14 +5,12 @@ Upgrade Routing
     :local:
     :depth: 2
 
-
 Documentations
 ==============
 
 - `URI Routing Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/general/routing.html>`_
 - :doc:`URI Routing Documentation CodeIgniter 4.X </incoming/routing>`
 
-
 What has been changed
 =====================
 - In CI4 the routing is no longer configured by setting the routes as array.
@@ -30,46 +28,12 @@ Code Example
 
 CodeIgniter Version 3.x
 ------------------------
-Path: **application/config/routes.php**::
-
-    <?php
-    defined('BASEPATH') OR exit('No direct script access allowed');
+Path: **application/config/routes.php**:
 
-    $route['posts/index'] = 'posts/index';
-    $route['teams/create'] = 'teams/create';
-    $route['teams/update'] = 'teams/update';
-
-    $route['posts/create'] = 'posts/create';
-    $route['posts/update'] = 'posts/update';
-    $route['drivers/create'] = 'drivers/create';
-    $route['drivers/update'] = 'drivers/update';
-    $route['posts/(:any)'] = 'posts/view/$1';
+.. literalinclude:: upgrade_routing/001.php
 
 CodeIgniter Version 4.x
 -----------------------
-Path: **app/Config/Routes.php**::
-
-    <?php
-
-    namespace Config;
-
-    // Create a new instance of our RouteCollection class.
-    $routes = Services::routes();
-
-    // Load the system's routing file first, so that the app and ENVIRONMENT
-    // can override as needed.
-    if (file_exists(SYSTEMPATH . 'Config/Routes.php')) {
-        require SYSTEMPATH . 'Config/Routes.php';
-    }
-
-    ...
-
-    $routes->add('posts/index', 'Posts::index');
-    $routes->add('teams/create', 'Teams::create');
-    $routes->add('teams/update', 'Teams::update');
+Path: **app/Config/Routes.php**:
 
-    $routes->add('posts/create', 'Posts::create');
-    $routes->add('posts/update', 'Posts::update');
-    $routes->add('drivers/create', 'Drivers::create');
-    $routes->add('drivers/update', 'Drivers::update');
-    $routes->add('posts/(:any)', 'Posts::view/$1');
+.. literalinclude:: upgrade_routing/002.php
diff --git a/user_guide_src/source/installation/upgrade_routing/001.php b/user_guide_src/source/installation/upgrade_routing/001.php
new file mode 100644
index 000000000000..31875312f013
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_routing/001.php
@@ -0,0 +1,12 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+$route['posts/index'] = 'posts/index';
+$route['teams/create'] = 'teams/create';
+$route['teams/update'] = 'teams/update';
+
+$route['posts/create'] = 'posts/create';
+$route['posts/update'] = 'posts/update';
+$route['drivers/create'] = 'drivers/create';
+$route['drivers/update'] = 'drivers/update';
+$route['posts/(:any)'] = 'posts/view/$1';
diff --git a/user_guide_src/source/installation/upgrade_routing/002.php b/user_guide_src/source/installation/upgrade_routing/002.php
new file mode 100644
index 000000000000..14097435e586
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_routing/002.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Config;
+
+// Create a new instance of our RouteCollection class.
+$routes = Services::routes();
+
+// Load the system's routing file first, so that the app and ENVIRONMENT
+// can override as needed.
+if (file_exists(SYSTEMPATH . 'Config/Routes.php')) {
+    require SYSTEMPATH . 'Config/Routes.php';
+}
+
+...
+
+$routes->add('posts/index', 'Posts::index');
+$routes->add('teams/create', 'Teams::create');
+$routes->add('teams/update', 'Teams::update');
+
+$routes->add('posts/create', 'Posts::create');
+$routes->add('posts/update', 'Posts::update');
+$routes->add('drivers/create', 'Drivers::create');
+$routes->add('drivers/update', 'Drivers::update');
+$routes->add('posts/(:any)', 'Posts::view/$1');
diff --git a/user_guide_src/source/installation/upgrade_security.rst b/user_guide_src/source/installation/upgrade_security.rst
index ad1fc80e945b..6fbdbc2428a6 100644
--- a/user_guide_src/source/installation/upgrade_security.rst
+++ b/user_guide_src/source/installation/upgrade_security.rst
@@ -5,7 +5,6 @@ Upgrade Security
     :local:
     :depth: 2
 
-
 Documentations
 ==============
 
@@ -21,14 +20,10 @@ What has been changed
 
 Upgrade Guide
 =============
-1. To enable CSRF protection in CI4 you have to enable it in **app/Config/Filters.php**::
+1. To enable CSRF protection in CI4 you have to enable it in **app/Config/Filters.php**:
 
-    public $globals = [
-        'before' => [
-            //'honeypot',
-            'csrf',
-        ]
-    ];
+   .. literalinclude:: upgrade_security/001.php
+      :lines: 2-
 
 2. Within your HTML forms you have to remove the CSRF input field which looks similar to ``<input type="hidden" name="<?= $csrf['name'] ?>" value="<?= $csrf['hash'] ?>" />``.
 3. Now, within your HTML forms you have to add ``<?= csrf_field() ?>`` somewhere in the form body, unless you are using ``form_open()``.
@@ -38,23 +33,9 @@ Code Example
 
 CodeIgniter Version 3.x
 ------------------------
-::
-
-    $csrf = array(
-        'name' => $this->security->get_csrf_token_name(),
-        'hash' => $this->security->get_csrf_hash()
-    );
 
-    ...
-
-    <form>
-        <input name="name" type="text">
-        <input name="email" type="text">
-        <input name="password" type="password">
-
-        <input type="hidden" name="<?= $csrf['name'] ?>" value="<?= $csrf['hash'] ?>" />
-        <input type="submit" value="Save">
-    </form>
+.. literalinclude:: upgrade_security/002.php
+   :lines: 2-
 
 CodeIgniter Version 4.x
 -----------------------
diff --git a/user_guide_src/source/installation/upgrade_security/001.php b/user_guide_src/source/installation/upgrade_security/001.php
new file mode 100644
index 000000000000..d1bc3788b2ce
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_security/001.php
@@ -0,0 +1,8 @@
+<?php
+
+public $globals = [
+    'before' => [
+        //'honeypot',
+        'csrf',
+    ]
+];
diff --git a/user_guide_src/source/installation/upgrade_security/002.php b/user_guide_src/source/installation/upgrade_security/002.php
new file mode 100644
index 000000000000..0419285423b0
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_security/002.php
@@ -0,0 +1,17 @@
+<?php
+
+$csrf = array(
+    'name' => $this->security->get_csrf_token_name(),
+    'hash' => $this->security->get_csrf_hash()
+);
+
+...
+
+<form>
+    <input name="name" type="text">
+    <input name="email" type="text">
+    <input name="password" type="password">
+
+    <input type="hidden" name="<?= $csrf['name'] ?>" value="<?= $csrf['hash'] ?>" />
+    <input type="submit" value="Save">
+</form>
diff --git a/user_guide_src/source/installation/upgrade_sessions.rst b/user_guide_src/source/installation/upgrade_sessions.rst
index 6785907ba061..447703854284 100644
--- a/user_guide_src/source/installation/upgrade_sessions.rst
+++ b/user_guide_src/source/installation/upgrade_sessions.rst
@@ -5,14 +5,12 @@ Upgrade Sessions
     :local:
     :depth: 2
 
-
 Documentations
 ==============
 
 - `Session Library Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/sessions.html>`_
 - :doc:`Session Library Documentation CodeIgniter 4.X </libraries/sessions>`
 
-
 What has been changed
 =====================
 - Only small things like the method names and the loading of the library have changed.
@@ -32,21 +30,12 @@ Code Example
 
 CodeIgniter Version 3.x
 ------------------------
-::
 
-    $this->load->library('session');
-
-    $_SESSION['item'];
-    $this->session->item;
-    $this->session->userdata('item');
+.. literalinclude:: upgrade_sessions/001.php
+   :lines: 2-
 
 CodeIgniter Version 4.x
 -----------------------
-::
-
-    $session = session();
 
-    $_SESSION['item'];
-    $session->get('item');
-    $session->item;
-    session('item');
+.. literalinclude:: upgrade_sessions/002.php
+   :lines: 2-
diff --git a/user_guide_src/source/installation/upgrade_sessions/001.php b/user_guide_src/source/installation/upgrade_sessions/001.php
new file mode 100644
index 000000000000..73e69c5dfa9f
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_sessions/001.php
@@ -0,0 +1,7 @@
+<?php
+
+$this->load->library('session');
+
+$_SESSION['item'];
+$this->session->item;
+$this->session->userdata('item');
diff --git a/user_guide_src/source/installation/upgrade_sessions/002.php b/user_guide_src/source/installation/upgrade_sessions/002.php
new file mode 100644
index 000000000000..0bfeeb7f9487
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_sessions/002.php
@@ -0,0 +1,8 @@
+<?php
+
+$session = session();
+
+$_SESSION['item'];
+$session->get('item');
+$session->item;
+session('item');
diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
index 1a71ef0b5065..54b7281d4839 100644
--- a/user_guide_src/source/installation/upgrade_validations.rst
+++ b/user_guide_src/source/installation/upgrade_validations.rst
@@ -5,14 +5,12 @@ Upgrade Validations
     :local:
     :depth: 2
 
-
 Documentations of Library
 =========================
 
 - `Form Validation Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/form_validation.html>`_
 - :doc:`Validation Documentation CodeIgniter 4.X </libraries/validation>`
 
-
 What has been changed
 =====================
 - If you want to change validation error display, you have to set CI4 validation View templates.
@@ -33,13 +31,10 @@ Upgrade Guide
     - ``if ($this->form_validation->run() == FALSE)`` to ``if (! $this->validate([]))``
     - ``$this->load->view('myform');`` to ``echo view('myform', ['validation' => $this->validator,]);``
 
-3. You have to change the validation rules. The new syntax is to set the rules as array in the controller::
+3. You have to change the validation rules. The new syntax is to set the rules as array in the controller:
 
-    $isValid = $this->validate([
-        'name'  => 'required|min_length[3]',
-        'email' => 'required|valid_email',
-        'phone' => 'required|numeric|max_length[10]'
-    ]);
+   .. literalinclude:: upgrade_validations/001.php
+      :lines: 2-
 
 Code Example
 ============
@@ -77,27 +72,9 @@ Path: **application/views**::
     </body>
     </html>
 
-Path: **application/controllers**::
-
-    <?php
-
-    class Form extends CI_Controller {
-
-        public function index()
-        {
-            $this->load->helper(array('form', 'url'));
-
-            $this->load->library('form_validation');
+Path: **application/controllers**:
 
-            // Set validation rules
-
-            if ($this->form_validation->run() == FALSE) {
-                    $this->load->view('myform');
-            } else {
-                    $this->load->view('formsuccess');
-            }
-        }
-    }
+.. literalinclude:: upgrade_validations/002.php
 
 CodeIgniter Version 4.x
 -----------------------
@@ -132,28 +109,6 @@ Path: **app/Views**::
     </body>
     </html>
 
-Path: **app/Controllers**::
-
-    <?php
-
-    namespace App\Controllers;
-
-    use CodeIgniter\Controller;
-
-    class Form extends Controller
-    {
-        public function index()
-        {
-            helper(['form', 'url']);
+Path: **app/Controllers**:
 
-            if (! $this->validate([
-                // Validation rules
-            ])) {
-                echo view('myform', [
-                    'validation' => $this->validator,
-                ]);
-            } else {
-                echo view('formsuccess');
-            }
-        }
-    }
+.. literalinclude:: upgrade_validations/003.php
diff --git a/user_guide_src/source/installation/upgrade_validations/001.php b/user_guide_src/source/installation/upgrade_validations/001.php
new file mode 100644
index 000000000000..f9730b8f3e3f
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_validations/001.php
@@ -0,0 +1,7 @@
+<?php
+
+$isValid = $this->validate([
+    'name'  => 'required|min_length[3]',
+    'email' => 'required|valid_email',
+    'phone' => 'required|numeric|max_length[10]'
+]);
diff --git a/user_guide_src/source/installation/upgrade_validations/002.php b/user_guide_src/source/installation/upgrade_validations/002.php
new file mode 100644
index 000000000000..3c6505455d91
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_validations/002.php
@@ -0,0 +1,19 @@
+<?php
+
+class Form extends CI_Controller {
+
+    public function index()
+    {
+        $this->load->helper(array('form', 'url'));
+
+        $this->load->library('form_validation');
+
+        // Set validation rules
+
+        if ($this->form_validation->run() == FALSE) {
+                $this->load->view('myform');
+        } else {
+                $this->load->view('formsuccess');
+        }
+    }
+}
diff --git a/user_guide_src/source/installation/upgrade_validations/003.php b/user_guide_src/source/installation/upgrade_validations/003.php
new file mode 100644
index 000000000000..ddbed1ede5fc
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_validations/003.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Controllers;
+
+use CodeIgniter\Controller;
+
+class Form extends Controller
+{
+    public function index()
+    {
+        helper(['form', 'url']);
+
+        if (! $this->validate([
+            // Validation rules
+        ])) {
+            echo view('myform', [
+                'validation' => $this->validator,
+            ]);
+        } else {
+            echo view('formsuccess');
+        }
+    }
+}
diff --git a/user_guide_src/source/installation/upgrade_view_parser.rst b/user_guide_src/source/installation/upgrade_view_parser.rst
index b2c57adbf0e6..4931eb467ede 100644
--- a/user_guide_src/source/installation/upgrade_view_parser.rst
+++ b/user_guide_src/source/installation/upgrade_view_parser.rst
@@ -5,14 +5,12 @@ Upgrade View Parser
     :local:
     :depth: 2
 
-
 Documentations
 ==============
 
 - `Template Parser Documentation CodeIgniter 3.X <http://codeigniter.com/userguide3/libraries/parser.html>`_
 - :doc:`View Parser Documentation CodeIgniter 4.X </outgoing/view_parser>`
 
-
 What has been changed
 =====================
 - You have to change the implementation and loading of the Parser Library.
@@ -28,28 +26,12 @@ Code Example
 
 CodeIgniter Version 3.x
 ------------------------
-::
-
-    $this->load->library('parser');
 
-    $data = array(
-        'blog_title'   => 'My Blog Title',
-        'blog_heading' => 'My Blog Heading'
-    );
-
-    $this->parser
-        ->parse('blog_template', $data);
+.. literalinclude:: upgrade_view_parser/001.php
+   :lines: 2-
 
 CodeIgniter Version 4.x
 -----------------------
-::
-
-    $parser = service('parser');
-
-    $data = [
-        'blog_title'   => 'My Blog Title',
-        'blog_heading' => 'My Blog Heading'
-    ];
 
-    echo $parser->setData($data)
-        ->render('blog_template');
+.. literalinclude:: upgrade_view_parser/002.php
+   :lines: 2-
diff --git a/user_guide_src/source/installation/upgrade_view_parser/001.php b/user_guide_src/source/installation/upgrade_view_parser/001.php
new file mode 100644
index 000000000000..c44e00968315
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_view_parser/001.php
@@ -0,0 +1,11 @@
+<?php
+
+$this->load->library('parser');
+
+$data = array(
+    'blog_title'   => 'My Blog Title',
+    'blog_heading' => 'My Blog Heading'
+);
+
+$this->parser
+    ->parse('blog_template', $data);
diff --git a/user_guide_src/source/installation/upgrade_view_parser/002.php b/user_guide_src/source/installation/upgrade_view_parser/002.php
new file mode 100644
index 000000000000..2f4607092635
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_view_parser/002.php
@@ -0,0 +1,11 @@
+<?php
+
+$parser = service('parser');
+
+$data = [
+    'blog_title'   => 'My Blog Title',
+    'blog_heading' => 'My Blog Heading'
+];
+
+echo $parser->setData($data)
+    ->render('blog_template');
diff --git a/user_guide_src/source/installation/upgrade_views.rst b/user_guide_src/source/installation/upgrade_views.rst
index 0aef96b113e8..773ad6541931 100644
--- a/user_guide_src/source/installation/upgrade_views.rst
+++ b/user_guide_src/source/installation/upgrade_views.rst
@@ -34,45 +34,13 @@ Code Example
 CodeIgniter Version 3.x
 ------------------------
 
-Path: **application/views**::
+Path: **application/views**:
 
-    <html>
-    <head>
-        <title><?php echo $title; ?></title>
-    </head>
-    <body>
-        <h1><?php echo $heading; ?></h1>
-
-        <h3>My Todo List</h3>
-
-        <ul>
-        <?php foreach ($todo_list as $item): ?>
-            <li><?php echo $item; ?></li>
-        <?php endforeach; ?>
-        </ul>
-
-    </body>
-    </html>
+.. literalinclude:: upgrade_views/001.php
 
 CodeIgniter Version 4.x
 -----------------------
 
-Path: **app/Views**::
-
-    <html>
-    <head>
-        <title><?= esc($title) ?></title>
-    </head>
-    <body>
-        <h1><?= esc($heading) ?></h1>
-
-        <h3>My Todo List</h3>
-
-        <ul>
-        <?php foreach ($todo_list as $item): ?>
-            <li><?= esc($item) ?></li>
-        <?php endforeach ?>
-        </ul>
+Path: **app/Views**:
 
-    </body>
-    </html>
+.. literalinclude:: upgrade_views/002.php
diff --git a/user_guide_src/source/installation/upgrade_views/001.php b/user_guide_src/source/installation/upgrade_views/001.php
new file mode 100644
index 000000000000..f0b7c348666d
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_views/001.php
@@ -0,0 +1,17 @@
+<html>
+<head>
+    <title><?php echo $title; ?></title>
+</head>
+<body>
+    <h1><?php echo $heading; ?></h1>
+
+    <h3>My Todo List</h3>
+
+    <ul>
+    <?php foreach ($todo_list as $item): ?>
+        <li><?php echo $item; ?></li>
+    <?php endforeach; ?>
+    </ul>
+
+</body>
+</html>
diff --git a/user_guide_src/source/installation/upgrade_views/002.php b/user_guide_src/source/installation/upgrade_views/002.php
new file mode 100644
index 000000000000..d4d043fea310
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_views/002.php
@@ -0,0 +1,17 @@
+<html>
+<head>
+    <title><?= esc($title) ?></title>
+</head>
+<body>
+    <h1><?= esc($heading) ?></h1>
+
+    <h3>My Todo List</h3>
+
+    <ul>
+    <?php foreach ($todo_list as $item): ?>
+        <li><?= esc($item) ?></li>
+    <?php endforeach ?>
+    </ul>
+
+</body>
+</html>
diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst
index cc9049ee9a5d..6f4fb8071c74 100644
--- a/user_guide_src/source/libraries/caching.rst
+++ b/user_guide_src/source/libraries/caching.rst
@@ -17,23 +17,13 @@ Example Usage
 
 The following example shows a common usage pattern within your controllers.
 
-::
+.. literalinclude:: caching/001.php
+   :lines: 2-
 
-    if (! $foo = cache('foo')) {
-        echo 'Saving to the cache!<br />';
-        $foo = 'foobarbaz!';
+You can grab an instance of the cache engine directly through the Services class:
 
-        // Save into the cache for 5 minutes
-        cache()->save('foo', $foo, 300);
-    }
-
-    echo $foo;
-
-You can grab an instance of the cache engine directly through the Services class::
-
-    $cache = \Config\Services::cache();
-
-    $foo = $cache->get('foo');
+.. literalinclude:: caching/002.php
+   :lines: 2-
 
 =====================
 Configuring the Cache
@@ -94,9 +84,10 @@ Class Reference
     This method will attempt to fetch an item from the cache store. If the
     item does not exist, the method will return null.
 
-    Example::
+    Example:
 
-        $foo = $cache->get('my_cached_item');
+    .. literalinclude:: caching/003.php
+       :lines: 2-
 
 .. php:method:: remember(string $key, int $ttl, Closure $callback)
 
@@ -121,9 +112,10 @@ Class Reference
     This method will save an item to the cache store. If saving fails, the
     method will return ``false``.
 
-    Example::
+    Example:
 
-        $cache->save('cache_item_id', 'data_to_cache');
+    .. literalinclude:: caching/004.php
+       :lines: 2-
 
 .. note:: The ``$raw`` parameter is only utilized by Memcache,
     in order to allow usage of ``increment()`` and ``decrement()``.
@@ -137,9 +129,10 @@ Class Reference
     This method will delete a specific item from the cache store. If item
     deletion fails, the method will return false.
 
-    Example::
+    Example:
 
-        $cache->delete('cache_item_id');
+    .. literalinclude:: caching/005.php
+       :lines: 2-
 
 .. php:method:: deleteMatching($pattern): integer
 
@@ -153,10 +146,10 @@ Class Reference
     .. important:: This method is only implemented for File, Redis and Predis handlers.
         Due to limitations, it couldn't be implemented for Memcached and Wincache handlers.
 
-    Example::
+    Example:
 
-        $cache->deleteMatching('prefix_*'); // deletes all items of which keys start with "prefix_"
-        $cache->deleteMatching('*_suffix'); // deletes all items of which keys end with "_suffix"
+    .. literalinclude:: caching/006.php
+       :lines: 2-
 
     For more information on glob-style syntax, please see
     `Glob (programming) <https://en.wikipedia.org/wiki/Glob_(programming)#Syntax>`_.
@@ -170,11 +163,10 @@ Class Reference
 
     Performs atomic incrementation of a raw stored value.
 
-    Example::
+    Example:
 
-        // 'iterator' has a value of 2
-        $cache->increment('iterator'); // 'iterator' is now 3
-        $cache->increment('iterator', 3); // 'iterator' is now 6
+    .. literalinclude:: caching/007.php
+       :lines: 2-
 
 .. php:method:: decrement($key[, $offset = 1]): mixed
 
@@ -185,11 +177,10 @@ Class Reference
 
     Performs atomic decrementation of a raw stored value.
 
-    Example::
+    Example:
 
-        // 'iterator' has a value of 6
-        $cache->decrement('iterator'); // 'iterator' is now 5
-        $cache->decrement('iterator', 2); // 'iterator' is now 3
+    .. literalinclude:: caching/008.php
+       :lines: 2-
 
 .. php:method:: clean()
 
@@ -199,9 +190,10 @@ Class Reference
     This method will 'clean' the entire cache. If the deletion of the
     cache files fails, the method will return false.
 
-    Example::
+    Example:
 
-        $cache->clean();
+    .. literalinclude:: caching/009.php
+       :lines: 2-
 
 .. php:method:: getCacheInfo()
 
@@ -210,9 +202,10 @@ Class Reference
 
     This method will return information on the entire cache.
 
-    Example::
+    Example:
 
-        var_dump($cache->getCacheInfo());
+    .. literalinclude:: caching/010.php
+       :lines: 2-
 
 .. note:: The information returned and the structure of the data is dependent
     on which adapter is being used.
@@ -226,9 +219,10 @@ Class Reference
     This method will return detailed information on a specific item in the
     cache.
 
-    Example::
+    Example:
 
-        var_dump($cache->getMetadata('my_cached_item'));
+    .. literalinclude:: caching/011.php
+       :lines: 2-
 
 .. note:: The information returned and the structure of the data is dependent
           on which adapter is being used. Some adapters (File, Memcached, Wincache)
@@ -244,10 +238,10 @@ Class Reference
     This method is used by handler methods to check that keys are valid. It will throw
     an ``InvalidArgumentException`` for non-strings, invalid characters, and empty lengths.
 
-    Example::
-
-        $prefixedKey = BaseHandler::validateKey($key, $prefix);
+    Example:
 
+    .. literalinclude:: caching/012.php
+       :lines: 2-
 
 *******
 Drivers
@@ -267,14 +261,10 @@ directory to be really writable by the application.
 Memcached Caching
 =================
 
-Memcached servers can be specified in the cache configuration file. Available options are::
+Memcached servers can be specified in the cache configuration file. Available options are:
 
-    public $memcached = [
-        'host'   => '127.0.0.1',
-        'port'   => 11211,
-        'weight' => 1,
-        'raw'    => false,
-    ];
+.. literalinclude:: caching/013.php
+   :lines: 2-
 
 For more information on Memcached, please see
 `https://www.php.net/memcached <https://www.php.net/memcached>`_.
@@ -295,15 +285,10 @@ Redis Caching
 Redis is an in-memory key-value store which can operate in LRU cache mode.
 To use it, you need `Redis server and phpredis PHP extension <https://github.com/phpredis/phpredis>`_.
 
-Config options to connect to redis server stored in the cache configuration file. Available options are::
+Config options to connect to redis server stored in the cache configuration file. Available options are:
 
-    public $redis = [
-        'host'     => '127.0.0.1',
-        'password' => null,
-        'port'     => 6379,
-        'timeout'  => 0,
-        'database' => 0,
-    ];
+.. literalinclude:: caching/014.php
+   :lines: 2-
 
 For more information on Redis, please see
 `https://redis.io <https://redis.io>`_.
diff --git a/user_guide_src/source/libraries/caching/001.php b/user_guide_src/source/libraries/caching/001.php
new file mode 100644
index 000000000000..491746ba14b4
--- /dev/null
+++ b/user_guide_src/source/libraries/caching/001.php
@@ -0,0 +1,11 @@
+<?php
+
+if (! $foo = cache('foo')) {
+    echo 'Saving to the cache!<br />';
+    $foo = 'foobarbaz!';
+
+    // Save into the cache for 5 minutes
+    cache()->save('foo', $foo, 300);
+}
+
+echo $foo;
diff --git a/user_guide_src/source/libraries/caching/002.php b/user_guide_src/source/libraries/caching/002.php
new file mode 100644
index 000000000000..ed453264b505
--- /dev/null
+++ b/user_guide_src/source/libraries/caching/002.php
@@ -0,0 +1,5 @@
+<?php
+
+$cache = \Config\Services::cache();
+
+$foo = $cache->get('foo');
diff --git a/user_guide_src/source/libraries/caching/003.php b/user_guide_src/source/libraries/caching/003.php
new file mode 100644
index 000000000000..4913a816e5e2
--- /dev/null
+++ b/user_guide_src/source/libraries/caching/003.php
@@ -0,0 +1,3 @@
+<?php
+
+$foo = $cache->get('my_cached_item');
diff --git a/user_guide_src/source/libraries/caching/004.php b/user_guide_src/source/libraries/caching/004.php
new file mode 100644
index 000000000000..f343a5bee486
--- /dev/null
+++ b/user_guide_src/source/libraries/caching/004.php
@@ -0,0 +1,3 @@
+<?php
+
+$cache->save('cache_item_id', 'data_to_cache');
diff --git a/user_guide_src/source/libraries/caching/005.php b/user_guide_src/source/libraries/caching/005.php
new file mode 100644
index 000000000000..1d8a3b905588
--- /dev/null
+++ b/user_guide_src/source/libraries/caching/005.php
@@ -0,0 +1,3 @@
+<?php
+
+$cache->delete('cache_item_id');
diff --git a/user_guide_src/source/libraries/caching/006.php b/user_guide_src/source/libraries/caching/006.php
new file mode 100644
index 000000000000..1afc08644ace
--- /dev/null
+++ b/user_guide_src/source/libraries/caching/006.php
@@ -0,0 +1,4 @@
+<?php
+
+$cache->deleteMatching('prefix_*'); // deletes all items of which keys start with "prefix_"
+$cache->deleteMatching('*_suffix'); // deletes all items of which keys end with "_suffix"
diff --git a/user_guide_src/source/libraries/caching/007.php b/user_guide_src/source/libraries/caching/007.php
new file mode 100644
index 000000000000..6256d6e0e721
--- /dev/null
+++ b/user_guide_src/source/libraries/caching/007.php
@@ -0,0 +1,5 @@
+<?php
+
+// 'iterator' has a value of 2
+$cache->increment('iterator'); // 'iterator' is now 3
+$cache->increment('iterator', 3); // 'iterator' is now 6
diff --git a/user_guide_src/source/libraries/caching/008.php b/user_guide_src/source/libraries/caching/008.php
new file mode 100644
index 000000000000..4e74cbb0a47f
--- /dev/null
+++ b/user_guide_src/source/libraries/caching/008.php
@@ -0,0 +1,5 @@
+<?php
+
+// 'iterator' has a value of 6
+$cache->decrement('iterator'); // 'iterator' is now 5
+$cache->decrement('iterator', 2); // 'iterator' is now 3
diff --git a/user_guide_src/source/libraries/caching/009.php b/user_guide_src/source/libraries/caching/009.php
new file mode 100644
index 000000000000..a5a9e5725f23
--- /dev/null
+++ b/user_guide_src/source/libraries/caching/009.php
@@ -0,0 +1,3 @@
+<?php
+
+$cache->clean();
diff --git a/user_guide_src/source/libraries/caching/010.php b/user_guide_src/source/libraries/caching/010.php
new file mode 100644
index 000000000000..22a5cb08b8b9
--- /dev/null
+++ b/user_guide_src/source/libraries/caching/010.php
@@ -0,0 +1,3 @@
+<?php
+
+var_dump($cache->getCacheInfo());
diff --git a/user_guide_src/source/libraries/caching/011.php b/user_guide_src/source/libraries/caching/011.php
new file mode 100644
index 000000000000..1fedd92c28b4
--- /dev/null
+++ b/user_guide_src/source/libraries/caching/011.php
@@ -0,0 +1,3 @@
+<?php
+
+var_dump($cache->getMetadata('my_cached_item'));
diff --git a/user_guide_src/source/libraries/caching/012.php b/user_guide_src/source/libraries/caching/012.php
new file mode 100644
index 000000000000..90395ed77429
--- /dev/null
+++ b/user_guide_src/source/libraries/caching/012.php
@@ -0,0 +1,3 @@
+<?php
+
+$prefixedKey = BaseHandler::validateKey($key, $prefix);
diff --git a/user_guide_src/source/libraries/caching/013.php b/user_guide_src/source/libraries/caching/013.php
new file mode 100644
index 000000000000..66f0fa99e959
--- /dev/null
+++ b/user_guide_src/source/libraries/caching/013.php
@@ -0,0 +1,8 @@
+<?php
+
+public $memcached = [
+    'host'   => '127.0.0.1',
+    'port'   => 11211,
+    'weight' => 1,
+    'raw'    => false,
+];
diff --git a/user_guide_src/source/libraries/caching/014.php b/user_guide_src/source/libraries/caching/014.php
new file mode 100644
index 000000000000..20dfb69ce9b0
--- /dev/null
+++ b/user_guide_src/source/libraries/caching/014.php
@@ -0,0 +1,9 @@
+<?php
+
+public $redis = [
+    'host'     => '127.0.0.1',
+    'password' => null,
+    'port'     => 6379,
+    'timeout'  => 0,
+    'database' => 0,
+];
diff --git a/user_guide_src/source/libraries/cookies.rst b/user_guide_src/source/libraries/cookies.rst
index 86d36dec9a25..a5baea10ce1d 100644
--- a/user_guide_src/source/libraries/cookies.rst
+++ b/user_guide_src/source/libraries/cookies.rst
@@ -28,84 +28,24 @@ Creating Cookies
 
 There are currently four (4) ways to create a new ``Cookie`` value object.
 
-::
-
-    use CodeIgniter\Cookie\Cookie;
-    use DateTime;
-
-    // Using the constructor
-    $cookie = new Cookie(
-        'remember_token',
-        'f699c7fd18a8e082d0228932f3acd40e1ef5ef92efcedda32842a211d62f0aa6',
-        [
-            'expires'  => new DateTime('+2 hours'),
-            'prefix'   => '__Secure-',
-            'path'     => '/',
-            'domain'   => '',
-            'secure'   => true,
-            'httponly' => true,
-            'raw'      => false,
-            'samesite' => Cookie::SAMESITE_LAX,
-        ]
-    );
-
-    // Supplying a Set-Cookie header string
-    $cookie = Cookie::fromHeaderString(
-        'remember_token=f699c7fd18a8e082d0228932f3acd40e1ef5ef92efcedda32842a211d62f0aa6; Path=/; Secure; HttpOnly; SameSite=Lax',
-        false, // raw
-    );
-
-    // Using the fluent builder interface
-    $cookie = (new Cookie('remember_token'))
-        ->withValue('f699c7fd18a8e082d0228932f3acd40e1ef5ef92efcedda32842a211d62f0aa6')
-        ->withPrefix('__Secure-')
-        ->withExpires(new DateTime('+2 hours'))
-        ->withPath('/')
-        ->withDomain('')
-        ->withSecure(true)
-        ->withHTTPOnly(true)
-        ->withSameSite(Cookie::SAMESITE_LAX);
-
-    // Using the global function `cookie` which implicitly calls `new Cookie()`
-    $cookie = cookie('remember_token', 'f699c7fd18a8e082d0228932f3acd40e1ef5ef92efcedda32842a211d62f0aa6');
+.. literalinclude:: cookies/001.php
+   :lines: 2-
 
 When constructing the ``Cookie`` object, only the ``name`` attribute is required. All other else are optional.
 If the optional attributes are not modified, their values will be filled up by the default values saved in
 the ``Cookie`` class. To override the defaults currently stored in the class, you can pass a ``Config\Cookie``
 instance or an array of defaults to the static ``Cookie::setDefaults()`` method.
 
-::
-
-    use CodeIgniter\Cookie\Cookie;
-    use Config\Cookie as CookieConfig;
-
-    // pass in an Config\Cookie instance before constructing a Cookie class
-    Cookie::setDefaults(new CookieConfig());
-    $cookie = new Cookie('login_token');
-
-    // pass in an array of defaults
-    $myDefaults = [
-        'expires'  => 0,
-        'samesite' => Cookie::SAMESITE_STRICT,
-    ];
-    Cookie::setDefaults($myDefaults);
-    $cookie = new Cookie('login_token');
+.. literalinclude:: cookies/002.php
+   :lines: 2-
 
 Passing the ``Config\Cookie`` instance or an array to ``Cookie::setDefaults()`` will effectively
 overwrite your defaults and will persist until new defaults are passed. If you do not want this
 behavior but only want to change defaults for a limited time, you can take advantage of
 ``Cookie::setDefaults()`` return which returns the old defaults array.
 
-::
-
-    use CodeIgniter\Cookie\Cookie;
-    use Config\Cookie as CookieConfig;
-
-    $oldDefaults = Cookie::setDefaults(new CookieConfig());
-    $cookie = new Cookie('my_token', 'muffins');
-
-    // return the old defaults
-    Cookie::setDefaults($oldDefaults);
+.. literalinclude:: cookies/003.php
+   :lines: 2-
 
 *****************************
 Accessing Cookie's Attributes
@@ -113,48 +53,8 @@ Accessing Cookie's Attributes
 
 Once instantiated, you can easily access a ``Cookie``'s attribute by using one of its getter methods.
 
-::
-
-    use CodeIgniter\Cookie\Cookie;
-    use DateTime;
-    use DateTimeZone;
-
-    $cookie = new Cookie(
-        'remember_token',
-        'f699c7fd18a8e082d0228932f3acd40e1ef5ef92efcedda32842a211d62f0aa6',
-        [
-            'expires'  => new DateTime('2025-02-14 00:00:00', new DateTimeZone('UTC')),
-            'prefix'   => '__Secure-',
-            'path'     => '/',
-            'domain'   => '',
-            'secure'   => true,
-            'httponly' => true,
-            'raw'      => false,
-            'samesite' => Cookie::SAMESITE_LAX,
-        ]
-    );
-
-    $cookie->getName(); // 'remember_token'
-    $cookie->getPrefix(); // '__Secure-'
-    $cookie->getPrefixedName(); // '__Secure-remember_token'
-    $cookie->getExpiresTimestamp(); // Unix timestamp
-    $cookie->getExpiresString(); // 'Fri, 14-Feb-2025 00:00:00 GMT'
-    $cookie->isExpired(); // false
-    $cookie->getMaxAge(); // the difference from time() to expires
-    $cookie->isRaw(); // false
-    $cookie->isSecure(); // true
-    $cookie->getPath(); // '/'
-    $cookie->getDomain(); // ''
-    $cookie->isHTTPOnly(); // true
-    $cookie->getSameSite(); // 'Lax'
-
-    // additional getter
-    $cookie->getId(); // '__Secure-remember_token;;/'
-
-    // when using `setcookie()`'s alternative signature on PHP 7.3+
-    // you can easily use the `getOptions()` method to supply the
-    // $options parameter
-    $cookie->getOptions();
+.. literalinclude:: cookies/004.php
+   :lines: 2-
 
 *****************
 Immutable Cookies
@@ -164,18 +64,8 @@ A new ``Cookie`` instance is an immutable value object representation of an HTTP
 modifying any of the instance's attributes will not affect the original instance. The modification **always**
 returns a new instance. You need to retain this new instance in order to use it.
 
-::
-
-    use CodeIgniter\Cookie\Cookie;
-
-    $cookie = new Cookie('login_token', 'admin');
-    $cookie->getName(); // 'login_token'
-
-    $cookie->withName('remember_token');
-    $cookie->getName(); // 'login_token'
-
-    $new = $cookie->withName('remember_token');
-    $new->getName(); // 'remember_token'
+.. literalinclude:: cookies/005.php
+   :lines: 2-
 
 ********************************
 Validating a Cookie's Attributes
@@ -232,13 +122,8 @@ If the SameSite is set to ``None`` you need to make sure that ``Secure`` is also
 When writing the SameSite attribute, the ``Cookie`` class accepts any of the values case-insensitively. You can
 also take advantage of the class's constants to make it not a hassle.
 
-::
-
-    use CodeIgniter\Cookie\Cookie;
-
-    Cookie::SAMESITE_LAX; // 'lax'
-    Cookie::SAMESITE_STRICT; // 'strict'
-    Cookie::SAMESITE_NONE; // 'none'
+.. literalinclude:: cookies/006.php
+   :lines: 2-
 
 **********************
 Using the Cookie Store
@@ -247,36 +132,13 @@ Using the Cookie Store
 The ``CookieStore`` class represents an immutable collection of ``Cookie`` objects. The ``CookieStore``
 instance can be accessed from the current ``Response`` object.
 
-::
-
-    use Config\Services;
-
-    $cookieStore = Services::response()->getCookieStore();
+.. literalinclude:: cookies/007.php
+   :lines: 2-
 
 CodeIgniter provides three (3) other ways to create a new instance of the ``CookieStore``.
 
-::
-
-    use CodeIgniter\Cookie\Cookie;
-    use CodeIgniter\Cookie\CookieStore;
-
-    // Passing an array of `Cookie` objects in the constructor
-    $store = new CookieStore([
-        new Cookie('login_token'),
-        new Cookie('remember_token'),
-    ]);
-
-    // Passing an array of `Set-Cookie` header strings
-    $store = CookieStore::fromCookieHeaders([
-        'remember_token=me; Path=/; SameSite=Lax',
-        'login_token=admin; Path=/; SameSite=Lax',
-    ]);
-
-    // using the global `cookies` function
-    $store = cookies([new Cookie('login_token')], false);
-
-    // retrieving the `CookieStore` instance saved in our current `Response` object
-    $store = cookies();
+.. literalinclude:: cookies/008.php
+   :lines: 2-
 
 .. note:: When using the global ``cookies()`` function, the passed ``Cookie`` array will only be considered
     if the second argument, ``$getGlobal``, is set to ``false``.
@@ -284,79 +146,36 @@ CodeIgniter provides three (3) other ways to create a new instance of the ``Cook
 Checking Cookies in Store
 =========================
 
-To check whether a ``Cookie`` object exists in the ``CookieStore`` instance, you can use several ways::
-
-    use CodeIgniter\Cookie\Cookie;
-    use CodeIgniter\Cookie\CookieStore;
-    use Config\Services;
+To check whether a ``Cookie`` object exists in the ``CookieStore`` instance, you can use several ways:
 
-    // check if cookie is in the current cookie collection
-    $store = new CookieStore([
-        new Cookie('login_token'),
-        new Cookie('remember_token'),
-    ]);
-    $store->has('login_token');
-
-    // check if cookie is in the current Response's cookie collection
-    cookies()->has('login_token');
-    Services::response()->hasCookie('remember_token');
-
-    // using the cookie helper to check the current Response
-    // not available to v4.1.1 and lower
-    helper('cookie');
-    has_cookie('login_token');
+.. literalinclude:: cookies/009.php
+   :lines: 2-
 
 Getting Cookies in Store
 ========================
 
-Retrieving a ``Cookie`` instance in a cookie collection is very easy::
-
-    use CodeIgniter\Cookie\Cookie;
-    use CodeIgniter\Cookie\CookieStore;
-    use Config\Services;
-
-    // getting cookie in the current cookie collection
-    $store = new CookieStore([
-        new Cookie('login_token'),
-        new Cookie('remember_token'),
-    ]);
-    $store->get('login_token');
-
-    // getting cookie in the current Response's cookie collection
-    cookies()->get('login_token');
-    Services::response()->getCookie('remember_token');
+Retrieving a ``Cookie`` instance in a cookie collection is very easy:
 
-    // using the cookie helper to get cookie from the Response's cookie collection
-    helper('cookie');
-    get_cookie('remember_token');
+.. literalinclude:: cookies/010.php
+   :lines: 2-
 
 When getting a ``Cookie`` instance directly from a ``CookieStore``, an invalid name
 will throw a ``CookieException``.
 
-::
-
-    // throws CookieException
-    $store->get('unknown_cookie');
+.. literalinclude:: cookies/011.php
+   :lines: 2-
 
 When getting a ``Cookie`` instance from the current ``Response``'s cookie collection,
 an invalid name will just return ``null``.
 
-::
-
-    cookies()->get('unknown_cookie'); // null
+.. literalinclude:: cookies/012.php
+   :lines: 2-
 
 If no arguments are supplied in when getting cookies from the ``Response``, all ``Cookie`` objects
 in store will be displayed.
 
-::
-
-    cookies()->get(); // array of Cookie objects
-
-    // alternatively, you can use the display method
-    cookies()->display();
-
-    // or even from the Response
-    Services::response()->getCookies();
+.. literalinclude:: cookies/013.php
+   :lines: 2-
 
 .. note:: The helper function ``get_cookie()`` gets the cookie from the current ``Request`` object, not
     from ``Response``. This function checks the `$_COOKIE` array if that cookie is set and fetches it
@@ -368,22 +187,8 @@ Adding/Removing Cookies in Store
 As previously mentioned, ``CookieStore`` objects are immutable. You need to save the modified instance
 in order to work on it. The original instance is left unchanged.
 
-::
-
-    use CodeIgniter\Cookie\Cookie;
-    use CodeIgniter\Cookie\CookieStore;
-    use Config\Services;
-
-    $store = new CookieStore([
-        new Cookie('login_token'),
-        new Cookie('remember_token'),
-    ]);
-
-    // adding a new Cookie instance
-    $new = $store->put(new Cookie('admin_token', 'yes'));
-
-    // removing a Cookie instance
-    $new = $store->remove('login_token');
+.. literalinclude:: cookies/014.php
+   :lines: 2-
 
 .. note:: Removing a cookie from the store **DOES NOT** delete it from the browser.
     If you intend to delete a cookie *from the browser*, you must put an empty value
@@ -393,17 +198,8 @@ When interacting with the cookies in store in the current ``Response`` object, y
 cookies without worrying the immutable nature of the cookie collection. The ``Response`` object will replace
 the instance with the modified instance.
 
-::
-
-    use Config\Services;
-
-    Services::response()->setCookie('admin_token', 'yes');
-    Services::response()->deleteCookie('login_token');
-
-    // using the cookie helper
-    helper('cookie');
-    set_cookie('admin_token', 'yes');
-    delete_cookie('login_token');
+.. literalinclude:: cookies/015.php
+   :lines: 2-
 
 Dispatching Cookies in Store
 ============================
@@ -413,17 +209,8 @@ for you. However, if you really need to manually send cookies, you can use the `
 in sending other headers, you need to make sure the headers are not yet sent by checking the value
 of ``headers_sent()``.
 
-::
-
-    use CodeIgniter\Cookie\Cookie;
-    use CodeIgniter\Cookie\CookieStore;
-
-    $store = new CookieStore([
-        new Cookie('login_token'),
-        new Cookie('remember_token'),
-    ]);
-
-    $store->dispatch(); // After dispatch, the collection is now empty.
+.. literalinclude:: cookies/016.php
+   :lines: 2-
 
 **********************
 Cookie Personalization
diff --git a/user_guide_src/source/libraries/cookies/001.php b/user_guide_src/source/libraries/cookies/001.php
new file mode 100644
index 000000000000..777e74f111f5
--- /dev/null
+++ b/user_guide_src/source/libraries/cookies/001.php
@@ -0,0 +1,40 @@
+<?php
+
+use CodeIgniter\Cookie\Cookie;
+use DateTime;
+
+// Using the constructor
+$cookie = new Cookie(
+    'remember_token',
+    'f699c7fd18a8e082d0228932f3acd40e1ef5ef92efcedda32842a211d62f0aa6',
+    [
+        'expires'  => new DateTime('+2 hours'),
+        'prefix'   => '__Secure-',
+        'path'     => '/',
+        'domain'   => '',
+        'secure'   => true,
+        'httponly' => true,
+        'raw'      => false,
+        'samesite' => Cookie::SAMESITE_LAX,
+    ]
+);
+
+// Supplying a Set-Cookie header string
+$cookie = Cookie::fromHeaderString(
+    'remember_token=f699c7fd18a8e082d0228932f3acd40e1ef5ef92efcedda32842a211d62f0aa6; Path=/; Secure; HttpOnly; SameSite=Lax',
+    false, // raw
+);
+
+// Using the fluent builder interface
+$cookie = (new Cookie('remember_token'))
+    ->withValue('f699c7fd18a8e082d0228932f3acd40e1ef5ef92efcedda32842a211d62f0aa6')
+    ->withPrefix('__Secure-')
+    ->withExpires(new DateTime('+2 hours'))
+    ->withPath('/')
+    ->withDomain('')
+    ->withSecure(true)
+    ->withHTTPOnly(true)
+    ->withSameSite(Cookie::SAMESITE_LAX);
+
+// Using the global function `cookie` which implicitly calls `new Cookie()`
+$cookie = cookie('remember_token', 'f699c7fd18a8e082d0228932f3acd40e1ef5ef92efcedda32842a211d62f0aa6');
diff --git a/user_guide_src/source/libraries/cookies/002.php b/user_guide_src/source/libraries/cookies/002.php
new file mode 100644
index 000000000000..3feb4347d330
--- /dev/null
+++ b/user_guide_src/source/libraries/cookies/002.php
@@ -0,0 +1,16 @@
+<?php
+
+use CodeIgniter\Cookie\Cookie;
+use Config\Cookie as CookieConfig;
+
+// pass in an Config\Cookie instance before constructing a Cookie class
+Cookie::setDefaults(new CookieConfig());
+$cookie = new Cookie('login_token');
+
+// pass in an array of defaults
+$myDefaults = [
+    'expires'  => 0,
+    'samesite' => Cookie::SAMESITE_STRICT,
+];
+Cookie::setDefaults($myDefaults);
+$cookie = new Cookie('login_token');
diff --git a/user_guide_src/source/libraries/cookies/003.php b/user_guide_src/source/libraries/cookies/003.php
new file mode 100644
index 000000000000..2b41c1e4209f
--- /dev/null
+++ b/user_guide_src/source/libraries/cookies/003.php
@@ -0,0 +1,10 @@
+<?php
+
+use CodeIgniter\Cookie\Cookie;
+use Config\Cookie as CookieConfig;
+
+$oldDefaults = Cookie::setDefaults(new CookieConfig());
+$cookie = new Cookie('my_token', 'muffins');
+
+// return the old defaults
+Cookie::setDefaults($oldDefaults);
diff --git a/user_guide_src/source/libraries/cookies/004.php b/user_guide_src/source/libraries/cookies/004.php
new file mode 100644
index 000000000000..ca0cf0a74bb8
--- /dev/null
+++ b/user_guide_src/source/libraries/cookies/004.php
@@ -0,0 +1,42 @@
+<?php
+
+use CodeIgniter\Cookie\Cookie;
+use DateTime;
+use DateTimeZone;
+
+$cookie = new Cookie(
+    'remember_token',
+    'f699c7fd18a8e082d0228932f3acd40e1ef5ef92efcedda32842a211d62f0aa6',
+    [
+        'expires'  => new DateTime('2025-02-14 00:00:00', new DateTimeZone('UTC')),
+        'prefix'   => '__Secure-',
+        'path'     => '/',
+        'domain'   => '',
+        'secure'   => true,
+        'httponly' => true,
+        'raw'      => false,
+        'samesite' => Cookie::SAMESITE_LAX,
+    ]
+);
+
+$cookie->getName(); // 'remember_token'
+$cookie->getPrefix(); // '__Secure-'
+$cookie->getPrefixedName(); // '__Secure-remember_token'
+$cookie->getExpiresTimestamp(); // Unix timestamp
+$cookie->getExpiresString(); // 'Fri, 14-Feb-2025 00:00:00 GMT'
+$cookie->isExpired(); // false
+$cookie->getMaxAge(); // the difference from time() to expires
+$cookie->isRaw(); // false
+$cookie->isSecure(); // true
+$cookie->getPath(); // '/'
+$cookie->getDomain(); // ''
+$cookie->isHTTPOnly(); // true
+$cookie->getSameSite(); // 'Lax'
+
+// additional getter
+$cookie->getId(); // '__Secure-remember_token;;/'
+
+// when using `setcookie()`'s alternative signature on PHP 7.3+
+// you can easily use the `getOptions()` method to supply the
+// $options parameter
+$cookie->getOptions();
diff --git a/user_guide_src/source/libraries/cookies/005.php b/user_guide_src/source/libraries/cookies/005.php
new file mode 100644
index 000000000000..264d06782104
--- /dev/null
+++ b/user_guide_src/source/libraries/cookies/005.php
@@ -0,0 +1,12 @@
+<?php
+
+use CodeIgniter\Cookie\Cookie;
+
+$cookie = new Cookie('login_token', 'admin');
+$cookie->getName(); // 'login_token'
+
+$cookie->withName('remember_token');
+$cookie->getName(); // 'login_token'
+
+$new = $cookie->withName('remember_token');
+$new->getName(); // 'remember_token'
diff --git a/user_guide_src/source/libraries/cookies/006.php b/user_guide_src/source/libraries/cookies/006.php
new file mode 100644
index 000000000000..a8be634a9925
--- /dev/null
+++ b/user_guide_src/source/libraries/cookies/006.php
@@ -0,0 +1,7 @@
+<?php
+
+use CodeIgniter\Cookie\Cookie;
+
+Cookie::SAMESITE_LAX; // 'lax'
+Cookie::SAMESITE_STRICT; // 'strict'
+Cookie::SAMESITE_NONE; // 'none'
diff --git a/user_guide_src/source/libraries/cookies/007.php b/user_guide_src/source/libraries/cookies/007.php
new file mode 100644
index 000000000000..ff79582a5d07
--- /dev/null
+++ b/user_guide_src/source/libraries/cookies/007.php
@@ -0,0 +1,5 @@
+<?php
+
+use Config\Services;
+
+$cookieStore = Services::response()->getCookieStore();
diff --git a/user_guide_src/source/libraries/cookies/008.php b/user_guide_src/source/libraries/cookies/008.php
new file mode 100644
index 000000000000..d387a507abd0
--- /dev/null
+++ b/user_guide_src/source/libraries/cookies/008.php
@@ -0,0 +1,22 @@
+<?php
+
+use CodeIgniter\Cookie\Cookie;
+use CodeIgniter\Cookie\CookieStore;
+
+// Passing an array of `Cookie` objects in the constructor
+$store = new CookieStore([
+    new Cookie('login_token'),
+    new Cookie('remember_token'),
+]);
+
+// Passing an array of `Set-Cookie` header strings
+$store = CookieStore::fromCookieHeaders([
+    'remember_token=me; Path=/; SameSite=Lax',
+    'login_token=admin; Path=/; SameSite=Lax',
+]);
+
+// using the global `cookies` function
+$store = cookies([new Cookie('login_token')], false);
+
+// retrieving the `CookieStore` instance saved in our current `Response` object
+$store = cookies();
diff --git a/user_guide_src/source/libraries/cookies/009.php b/user_guide_src/source/libraries/cookies/009.php
new file mode 100644
index 000000000000..6db5a50bfc1e
--- /dev/null
+++ b/user_guide_src/source/libraries/cookies/009.php
@@ -0,0 +1,21 @@
+<?php
+
+use CodeIgniter\Cookie\Cookie;
+use CodeIgniter\Cookie\CookieStore;
+use Config\Services;
+
+// check if cookie is in the current cookie collection
+$store = new CookieStore([
+    new Cookie('login_token'),
+    new Cookie('remember_token'),
+]);
+$store->has('login_token');
+
+// check if cookie is in the current Response's cookie collection
+cookies()->has('login_token');
+Services::response()->hasCookie('remember_token');
+
+// using the cookie helper to check the current Response
+// not available to v4.1.1 and lower
+helper('cookie');
+has_cookie('login_token');
diff --git a/user_guide_src/source/libraries/cookies/010.php b/user_guide_src/source/libraries/cookies/010.php
new file mode 100644
index 000000000000..8211a4a2b23e
--- /dev/null
+++ b/user_guide_src/source/libraries/cookies/010.php
@@ -0,0 +1,20 @@
+<?php
+
+use CodeIgniter\Cookie\Cookie;
+use CodeIgniter\Cookie\CookieStore;
+use Config\Services;
+
+// getting cookie in the current cookie collection
+$store = new CookieStore([
+    new Cookie('login_token'),
+    new Cookie('remember_token'),
+]);
+$store->get('login_token');
+
+// getting cookie in the current Response's cookie collection
+cookies()->get('login_token');
+Services::response()->getCookie('remember_token');
+
+// using the cookie helper to get cookie from the Response's cookie collection
+helper('cookie');
+get_cookie('remember_token');
diff --git a/user_guide_src/source/libraries/cookies/011.php b/user_guide_src/source/libraries/cookies/011.php
new file mode 100644
index 000000000000..79937ad3f367
--- /dev/null
+++ b/user_guide_src/source/libraries/cookies/011.php
@@ -0,0 +1,4 @@
+<?php
+
+// throws CookieException
+$store->get('unknown_cookie');
diff --git a/user_guide_src/source/libraries/cookies/012.php b/user_guide_src/source/libraries/cookies/012.php
new file mode 100644
index 000000000000..cde062c20bd0
--- /dev/null
+++ b/user_guide_src/source/libraries/cookies/012.php
@@ -0,0 +1,3 @@
+<?php
+
+cookies()->get('unknown_cookie'); // null
diff --git a/user_guide_src/source/libraries/cookies/013.php b/user_guide_src/source/libraries/cookies/013.php
new file mode 100644
index 000000000000..e9c09b49052a
--- /dev/null
+++ b/user_guide_src/source/libraries/cookies/013.php
@@ -0,0 +1,9 @@
+<?php
+
+cookies()->get(); // array of Cookie objects
+
+// alternatively, you can use the display method
+cookies()->display();
+
+// or even from the Response
+Services::response()->getCookies();
diff --git a/user_guide_src/source/libraries/cookies/014.php b/user_guide_src/source/libraries/cookies/014.php
new file mode 100644
index 000000000000..0e6ae6772146
--- /dev/null
+++ b/user_guide_src/source/libraries/cookies/014.php
@@ -0,0 +1,16 @@
+<?php
+
+use CodeIgniter\Cookie\Cookie;
+use CodeIgniter\Cookie\CookieStore;
+use Config\Services;
+
+$store = new CookieStore([
+    new Cookie('login_token'),
+    new Cookie('remember_token'),
+]);
+
+// adding a new Cookie instance
+$new = $store->put(new Cookie('admin_token', 'yes'));
+
+// removing a Cookie instance
+$new = $store->remove('login_token');
diff --git a/user_guide_src/source/libraries/cookies/015.php b/user_guide_src/source/libraries/cookies/015.php
new file mode 100644
index 000000000000..040a2f8a9882
--- /dev/null
+++ b/user_guide_src/source/libraries/cookies/015.php
@@ -0,0 +1,11 @@
+<?php
+
+use Config\Services;
+
+Services::response()->setCookie('admin_token', 'yes');
+Services::response()->deleteCookie('login_token');
+
+// using the cookie helper
+helper('cookie');
+set_cookie('admin_token', 'yes');
+delete_cookie('login_token');
diff --git a/user_guide_src/source/libraries/cookies/016.php b/user_guide_src/source/libraries/cookies/016.php
new file mode 100644
index 000000000000..ec04f12f1cb7
--- /dev/null
+++ b/user_guide_src/source/libraries/cookies/016.php
@@ -0,0 +1,11 @@
+<?php
+
+use CodeIgniter\Cookie\Cookie;
+use CodeIgniter\Cookie\CookieStore;
+
+$store = new CookieStore([
+    new Cookie('login_token'),
+    new Cookie('remember_token'),
+]);
+
+$store->dispatch(); // After dispatch, the collection is now empty.
diff --git a/user_guide_src/source/libraries/curlrequest.rst b/user_guide_src/source/libraries/curlrequest.rst
index 62e6ebbaa0c8..0d2789816953 100644
--- a/user_guide_src/source/libraries/curlrequest.rst
+++ b/user_guide_src/source/libraries/curlrequest.rst
@@ -30,9 +30,10 @@ Due to historical reasons, by default, the CURLRequest shares all the options be
 If you send more than one request with an instance of the class,
 this behavior may cause an error request with unnecessary headers.
 
-You can change the behavior by editing the following config parameter value in **app/Config/CURLRequest.php** to ``false``::
+You can change the behavior by editing the following config parameter value in **app/Config/CURLRequest.php** to ``false``:
 
-    public $shareOptions = false;
+.. literalinclude:: curlrequest/001.php
+   :lines: 2-
 
 *******************
 Loading the Library
@@ -40,31 +41,25 @@ Loading the Library
 
 The library can be loaded either manually or through the :doc:`Services class </concepts/services>`.
 
-To load with the Services class call the ``curlrequest()`` method::
+To load with the Services class call the ``curlrequest()`` method:
 
-    $client = \Config\Services::curlrequest();
+.. literalinclude:: curlrequest/002.php
+   :lines: 2-
 
 You can pass in an array of default options as the first parameter to modify how cURL will handle the request.
-The options are described later in this document::
+The options are described later in this document:
 
-    $options = [
-        'baseURI' => 'http://example.com/api/v1/',
-        'timeout'  => 3,
-    ];
-    $client = \Config\Services::curlrequest($options);
+.. literalinclude:: curlrequest/003.php
+   :lines: 2-
 
 .. note:: When ``$shareOptions`` is false, the default options passed to the class constructor will be used for all requests. Other options will be reset after sending a request.
 
 When creating the class manually, you need to pass a few dependencies in. The first parameter is an
 instance of the ``Config\App`` class. The second parameter is a URI instance. The third
-parameter is a Response object. The fourth parameter is the optional default ``$options`` array::
+parameter is a Response object. The fourth parameter is the optional default ``$options`` array:
 
-    $client = new \CodeIgniter\HTTP\CURLRequest(
-        new \Config\App(),
-        new \CodeIgniter\HTTP\URI(),
-        new \CodeIgniter\HTTP\Response(new \Config\App()),
-        $options
-    );
+.. literalinclude:: curlrequest/004.php
+   :lines: 2-
 
 ************************
 Working with the Library
@@ -79,51 +74,33 @@ Making Requests
 
 Most communication is done through the ``request()`` method, which fires off the request, and then returns
 a Response instance to you. This takes the HTTP method, the url and an array of options as the parameters.
-::
 
-    $client = \Config\Services::curlrequest();
-
-    $response = $client->request('GET', 'https://api.github.com/user', [
-        'auth' => ['user', 'pass'],
-    ]);
+.. literalinclude:: curlrequest/005.php
+   :lines: 2-
 
 .. note:: When ``$shareOptions`` is false, the options passed to the method will be used for the request. After sending the request, they will be cleared. If you want to use the options to all requests, pass the options in the constructor.
 
 Since the response is an instance of ``CodeIgniter\HTTP\Response`` you have all of the normal information
-available to you::
+available to you:
 
-    echo $response->getStatusCode();
-    echo $response->getBody();
-    echo $response->getHeader('Content-Type');
-    $language = $response->negotiateLanguage(['en', 'fr']);
+.. literalinclude:: curlrequest/006.php
+   :lines: 2-
 
 While the ``request()`` method is the most flexible, you can also use the following shortcut methods. They
-each take the URL as the first parameter and an array of options as the second::
+each take the URL as the first parameter and an array of options as the second:
 
-    $client->get('http://example.com');
-    $client->delete('http://example.com');
-    $client->head('http://example.com');
-    $client->options('http://example.com');
-    $client->patch('http://example.com');
-    $client->put('http://example.com');
-    $client->post('http://example.com');
+.. literalinclude:: curlrequest/007.php
+   :lines: 2-
 
 Base URI
 --------
 
 A ``baseURI`` can be set as one of the options during the instantiation of the class. This allows you to
 set a base URI, and then make all requests with that client using relative URLs. This is especially handy
-when working with APIs::
-
-    $client = \Config\Services::curlrequest([
-        'baseURI' => 'https://example.com/api/v1/',
-    ]);
+when working with APIs:
 
-    // GET http:example.com/api/v1/photos
-    $client->get('photos');
-
-    // GET http:example.com/api/v1/photos/13
-    $client->delete('photos/13');
+.. literalinclude:: curlrequest/008.php
+   :lines: 2-
 
 When a relative URI is provided to the ``request()`` method or any of the shortcut methods, it will be combined
 with the baseURI according to the rules described by
@@ -147,31 +124,26 @@ Using Responses
 Each ``request()`` call returns a Response object that contains a lot of useful information and some helpful
 methods. The most commonly used methods let you determine the response itself.
 
-You can get the status code and reason phrase of the response::
-
-    $code   = $response->getStatusCode(); // 200
-    $reason = $response->getReason(); // OK
+You can get the status code and reason phrase of the response:
 
-You can retrieve headers from the response::
+.. literalinclude:: curlrequest/009.php
+   :lines: 2-
 
-    // Get a header line
-    echo $response->getHeaderLine('Content-Type');
+You can retrieve headers from the response:
 
-    // Get all headers
-    foreach ($response->getHeaders() as $name => $value) {
-        echo $name .': '. $response->getHeaderLine($name) ."\n";
-    }
+.. literalinclude:: curlrequest/010.php
+   :lines: 2-
 
-The body can be retrieved using the ``getBody()`` method::
+The body can be retrieved using the ``getBody()`` method:
 
-    $body = $response->getBody();
+.. literalinclude:: curlrequest/011.php
+   :lines: 2-
 
 The body is the raw body provided by the remote server. If the content type requires formatting, you will need
-to ensure that your script handles that::
+to ensure that your script handles that:
 
-    if (strpos($response->getHeader('content-type'), 'application/json') !== false) {
-        $body = json_decode($body);
-    }
+.. literalinclude:: curlrequest/012.php
+   :lines: 2-
 
 ***************
 Request Options
@@ -186,25 +158,20 @@ allow_redirects
 By default, cURL will follow all "Location:" headers the remote servers send back. The ``allow_redirects`` option
 allows you to modify how that works.
 
-If you set the value to ``false``, then it will not follow any redirects at all::
+If you set the value to ``false``, then it will not follow any redirects at all:
 
-    $client->request('GET', 'http://example.com', ['allow_redirects' => false]);
+.. literalinclude:: curlrequest/013.php
+   :lines: 2-
 
-Setting it to ``true`` will apply the default settings to the request::
+Setting it to ``true`` will apply the default settings to the request:
 
-    $client->request('GET', 'http://example.com', ['allow_redirects' => true]);
+.. literalinclude:: curlrequest/014.php
+   :lines: 2-
 
-    // Sets the following defaults:
-    'max'       => 5, // Maximum number of redirects to follow before stopping
-    'strict'    => true, // Ensure POST requests stay POST requests through redirects
-    'protocols' => ['http', 'https'] // Restrict redirects to one or more protocols
+You can pass in array as the value of the ``allow_redirects`` option to specify new settings in place of the defaults:
 
-You can pass in array as the value of the ``allow_redirects`` option to specify new settings in place of the defaults::
-
-    $client->request('GET', 'http://example.com', ['allow_redirects' => [
-        'max'       => 10,
-        'protocols' => ['https'] // Force HTTPS domains only.
-    ]]);
+.. literalinclude:: curlrequest/015.php
+   :lines: 2-
 
 .. note:: Following redirects does not work when PHP is in safe_mode or open_basedir is enabled.
 
@@ -215,49 +182,55 @@ Allows you to provide Authentication details for `HTTP Basic <https://www.ietf.o
 `Digest <https://www.ietf.org/rfc/rfc2069.txt>`_ and authentication. Your script may have to do extra to support
 Digest authentication - this simply passes the username and password along for you. The value must be an
 array where the first element is the username, and the second is the password. The third parameter should be
-the type of authentication to use, either ``basic`` or ``digest``::
+the type of authentication to use, either ``basic`` or ``digest``:
 
-    $client->request('GET', 'http://example.com', ['auth' => ['username', 'password', 'digest']]);
+.. literalinclude:: curlrequest/016.php
+   :lines: 2-
 
 body
 ====
 
 There are two ways to set the body of the request for request types that support them, like PUT, OR POST.
-The first way is to use the ``setBody()`` method::
+The first way is to use the ``setBody()`` method:
 
-    $client->setBody($body) ->request('put', 'http://example.com');
+.. literalinclude:: curlrequest/017.php
+   :lines: 2-
 
 The second method is by passing a ``body`` option in. This is provided to maintain Guzzle API compatibility,
-and functions the exact same way as the previous example. The value must be a string::
+and functions the exact same way as the previous example. The value must be a string:
 
-    $client->request('put', 'http://example.com', ['body' => $body]);
+.. literalinclude:: curlrequest/018.php
+   :lines: 2-
 
 cert
 ====
 
 To specify the location of a PEM formatted client-side certificate, pass a string with the full path to the
 file as the ``cert`` option. If a password is required, set the value to an array with the first element
-as the path to the certificate, and the second as the password::
+as the path to the certificate, and the second as the password:
 
-    $client->request('get', '/', ['cert' => ['/path/server.pem', 'password']);
+.. literalinclude:: curlrequest/019.php
+   :lines: 2-
 
 connect_timeout
 ===============
 
 By default, CodeIgniter does not impose a limit for cURL to attempt to connect to a website. If you need to
 modify this value, you can do so by passing the amount of time in seconds with the ``connect_timeout`` option.
-You can pass 0 to wait indefinitely::
+You can pass 0 to wait indefinitely:
 
-    $response->request('GET', 'http://example.com', ['connect_timeout' => 0]);
+.. literalinclude:: curlrequest/020.php
+   :lines: 2-
 
 cookie
 ======
 
 This specifies the filename that CURL should use to read cookie values from, and
 to save cookie values to. This is done using the CURL_COOKIEJAR and CURL_COOKIEFILE options.
-An example::
+An example:
 
-    $response->request('GET', 'http://example.com', ['cookie' => WRITEPATH . 'CookieSaver.txt']);
+.. literalinclude:: curlrequest/021.php
+   :lines: 2-
 
 debug
 =====
@@ -269,31 +242,28 @@ the server's error log.
 
     $response->request('GET', 'http://example.com', ['debug' => true]);
 
-You can pass a filename as the value for debug to have the output written to a file::
+You can pass a filename as the value for debug to have the output written to a file:
 
-    $response->request('GET', 'http://example.com', ['debug' => '/usr/local/curl_log.txt']);
+.. literalinclude:: curlrequest/022.php
+   :lines: 2-
 
 delay
 =====
 
-Allows you to pause a number of milliseconds before sending the request::
+Allows you to pause a number of milliseconds before sending the request:
 
-    // Delay for 2 seconds
-    $response->request('GET', 'http://example.com', ['delay' => 2000]);
+.. literalinclude:: curlrequest/023.php
+   :lines: 2-
 
 form_params
 ===========
 
 You can send form data in an application/x-www-form-urlencoded POST request by passing an associative array in
 the ``form_params`` option. This will set the ``Content-Type`` header to ``application/x-www-form-urlencoded``
-if it's not already set::
+if it's not already set:
 
-    $client->request('POST', '/post', [
-        'form_params' => [
-            'foo' => 'bar',
-            'baz' => ['hi', 'there'],
-        ],
-    ]);
+.. literalinclude:: curlrequest/024.php
+   :lines: 2-
 
 .. note:: ``form_params`` cannot be used with the ``multipart`` option. You will need to use one or the other.
         Use ``form_params`` for ``application/x-www-form-urlencoded`` request, and ``multipart`` for ``multipart/form-data``
@@ -306,15 +276,10 @@ headers
 
 While you can set any headers this request needs by using the ``setHeader()`` method, you can also pass an associative
 array of headers in as an option. Each key is the name of a header, and each value is a string or array of strings
-representing the header field values::
+representing the header field values:
 
-    $client->request('get', '/', [
-        'headers' => [
-            'User-Agent' => 'testing/1.0',
-            'Accept'     => 'application/json',
-            'X-Foo'      => ['Bar', 'Baz'],
-        ],
-    ]);
+.. literalinclude:: curlrequest/025.php
+   :lines: 2-
 
 If headers are passed into the constructor they are treated as default values that will be overridden later by any
 further headers arrays or calls to ``setHeader()``.
@@ -323,23 +288,20 @@ http_errors
 ===========
 
 By default, CURLRequest will fail if the HTTP code returned is greater than or equal to 400. You can set
-``http_errors`` to ``false`` to return the content instead::
-
-    $client->request('GET', '/status/500');
-    // Will fail verbosely
+``http_errors`` to ``false`` to return the content instead:
 
-    $res = $client->request('GET', '/status/500', ['http_errors' => false]);
-    echo $res->getStatusCode();
-    // 500
+.. literalinclude:: curlrequest/026.php
+   :lines: 2-
 
 json
 ====
 
 The ``json`` option is used to easily upload JSON encoded data as the body of a request. A Content-Type header
 of ``application/json`` is added, overwriting any Content-Type that might be already set. The data provided to
-this option can be any value that ``json_encode()`` accepts::
+this option can be any value that ``json_encode()`` accepts:
 
-    $response = $client->request('PUT', '/put', ['json' => ['foo' => 'bar']]);
+.. literalinclude:: curlrequest/027.php
+   :lines: 2-
 
 .. note:: This option does not allow for any customization of the ``json_encode()`` function, or the Content-Type
         header. If you need that ability, you will need to encode the data manually, passing it through the ``setBody()``
@@ -351,12 +313,10 @@ multipart
 When you need to send files and other data via a POST request, you can use the ``multipart`` option, along with
 the `CURLFile Class <https://www.php.net/manual/en/class.curlfile.php>`_. The values should be an associative array
 of POST data to send. For safer usage, the legacy method of uploading files by prefixing their name with an `@`
-has been disabled. Any files that you want to send must be passed as instances of CURLFile::
+has been disabled. Any files that you want to send must be passed as instances of CURLFile:
 
-    $post_data = [
-        'foo'      => 'bar',
-        'userfile' => new \CURLFile('/path/to/file.txt'),
-    ];
+.. literalinclude:: curlrequest/028.php
+   :lines: 2-
 
 .. note:: ``multipart`` cannot be used with the ``form_params`` option. You can only use one or the other. Use
         ``form_params`` for ``application/x-www-form-urlencoded`` requests, and ``multipart`` for ``multipart/form-data``
@@ -365,25 +325,27 @@ has been disabled. Any files that you want to send must be passed as instances o
 query
 =====
 
-You can pass along data to send as query string variables by passing an associative array as the ``query`` option::
+You can pass along data to send as query string variables by passing an associative array as the ``query`` option:
 
-    // Send a GET request to /get?foo=bar
-    $client->request('GET', '/get', ['query' => ['foo' => 'bar']]);
+.. literalinclude:: curlrequest/029.php
+   :lines: 2-
 
 timeout
 =======
 
 By default, cURL functions are allowed to run as long as they take, with no time limit. You can modify this with the ``timeout``
-option. The value should be the number of seconds you want the functions to execute for. Use 0 to wait indefinitely::
+option. The value should be the number of seconds you want the functions to execute for. Use 0 to wait indefinitely:
 
-    $response->request('GET', 'http://example.com', ['timeout' => 5]);
+.. literalinclude:: curlrequest/030.php
+   :lines: 2-
 
 user_agent
 ==========
 
-Allows specifying the User Agent for requests::
+Allows specifying the User Agent for requests:
 
-    $response->request('GET', 'http://example.com', ['user_agent' => 'CodeIgniter Framework v4']);
+.. literalinclude:: curlrequest/031.php
+   :lines: 2-
 
 verify
 ======
@@ -392,22 +354,16 @@ This option describes the SSL certificate verification behavior. If the ``verify
 SSL certificate verification and uses the default CA bundle provided by the operating system. If set to ``false`` it
 will disable the certificate verification (this is insecure, and allows man-in-the-middle attacks!). You can set it
 to a string that contains the path to a CA bundle to enable verification with a custom certificate. The default value
-is true::
-
-    // Use the system's CA bundle (this is the default setting)
-    $client->request('GET', '/', ['verify' => true]);
-
-    // Use a custom SSL certificate on disk.
-    $client->request('GET', '/', ['verify' => '/path/to/cert.pem']);
+is true:
 
-    // Disable validation entirely. (Insecure!)
-    $client->request('GET', '/', ['verify' => false]);
+.. literalinclude:: curlrequest/032.php
+   :lines: 2-
 
 version
 =======
 
 To set the HTTP protocol to use, you can pass a string or float with the version number (typically either 1.0
-or 1.1, 2.0 is currently unsupported.)::
+or 1.1, 2.0 is currently unsupported.):
 
-    // Force HTTP/1.0
-    $client->request('GET', '/', ['version' => 1.0]);
+.. literalinclude:: curlrequest/033.php
+   :lines: 2-
diff --git a/user_guide_src/source/libraries/curlrequest/001.php b/user_guide_src/source/libraries/curlrequest/001.php
new file mode 100644
index 000000000000..43e1f74bc943
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/001.php
@@ -0,0 +1,3 @@
+<?php
+
+public $shareOptions = false;
diff --git a/user_guide_src/source/libraries/curlrequest/002.php b/user_guide_src/source/libraries/curlrequest/002.php
new file mode 100644
index 000000000000..5d84bfe442b5
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$client = \Config\Services::curlrequest();
diff --git a/user_guide_src/source/libraries/curlrequest/003.php b/user_guide_src/source/libraries/curlrequest/003.php
new file mode 100644
index 000000000000..9eb5d0d1e591
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/003.php
@@ -0,0 +1,7 @@
+<?php
+
+$options = [
+    'baseURI' => 'http://example.com/api/v1/',
+    'timeout'  => 3,
+];
+$client = \Config\Services::curlrequest($options);
diff --git a/user_guide_src/source/libraries/curlrequest/004.php b/user_guide_src/source/libraries/curlrequest/004.php
new file mode 100644
index 000000000000..4d6a14fadbb0
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/004.php
@@ -0,0 +1,8 @@
+<?php
+
+$client = new \CodeIgniter\HTTP\CURLRequest(
+    new \Config\App(),
+    new \CodeIgniter\HTTP\URI(),
+    new \CodeIgniter\HTTP\Response(new \Config\App()),
+    $options
+);
diff --git a/user_guide_src/source/libraries/curlrequest/005.php b/user_guide_src/source/libraries/curlrequest/005.php
new file mode 100644
index 000000000000..ab2b479c4a18
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/005.php
@@ -0,0 +1,7 @@
+<?php
+
+$client = \Config\Services::curlrequest();
+
+$response = $client->request('GET', 'https://api.github.com/user', [
+    'auth' => ['user', 'pass'],
+]);
diff --git a/user_guide_src/source/libraries/curlrequest/006.php b/user_guide_src/source/libraries/curlrequest/006.php
new file mode 100644
index 000000000000..114b14e2251d
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/006.php
@@ -0,0 +1,6 @@
+<?php
+
+echo $response->getStatusCode();
+echo $response->getBody();
+echo $response->getHeader('Content-Type');
+$language = $response->negotiateLanguage(['en', 'fr']);
diff --git a/user_guide_src/source/libraries/curlrequest/007.php b/user_guide_src/source/libraries/curlrequest/007.php
new file mode 100644
index 000000000000..d509f3e3fa29
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/007.php
@@ -0,0 +1,9 @@
+<?php
+
+$client->get('http://example.com');
+$client->delete('http://example.com');
+$client->head('http://example.com');
+$client->options('http://example.com');
+$client->patch('http://example.com');
+$client->put('http://example.com');
+$client->post('http://example.com');
diff --git a/user_guide_src/source/libraries/curlrequest/008.php b/user_guide_src/source/libraries/curlrequest/008.php
new file mode 100644
index 000000000000..611909c2df7d
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/008.php
@@ -0,0 +1,11 @@
+<?php
+
+$client = \Config\Services::curlrequest([
+    'baseURI' => 'https://example.com/api/v1/',
+]);
+
+// GET http:example.com/api/v1/photos
+$client->get('photos');
+
+// GET http:example.com/api/v1/photos/13
+$client->delete('photos/13');
diff --git a/user_guide_src/source/libraries/curlrequest/009.php b/user_guide_src/source/libraries/curlrequest/009.php
new file mode 100644
index 000000000000..49eaa5ec7562
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/009.php
@@ -0,0 +1,4 @@
+<?php
+
+$code   = $response->getStatusCode(); // 200
+$reason = $response->getReason(); // OK
diff --git a/user_guide_src/source/libraries/curlrequest/010.php b/user_guide_src/source/libraries/curlrequest/010.php
new file mode 100644
index 000000000000..e13fa1c5e7e3
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/010.php
@@ -0,0 +1,9 @@
+<?php
+
+// Get a header line
+echo $response->getHeaderLine('Content-Type');
+
+// Get all headers
+foreach ($response->getHeaders() as $name => $value) {
+    echo $name .': '. $response->getHeaderLine($name) ."\n";
+}
diff --git a/user_guide_src/source/libraries/curlrequest/011.php b/user_guide_src/source/libraries/curlrequest/011.php
new file mode 100644
index 000000000000..ee93e3dac0e9
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/011.php
@@ -0,0 +1,3 @@
+<?php
+
+$body = $response->getBody();
diff --git a/user_guide_src/source/libraries/curlrequest/012.php b/user_guide_src/source/libraries/curlrequest/012.php
new file mode 100644
index 000000000000..2dc0eea65d0d
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/012.php
@@ -0,0 +1,5 @@
+<?php
+
+if (strpos($response->getHeader('content-type'), 'application/json') !== false) {
+    $body = json_decode($body);
+}
diff --git a/user_guide_src/source/libraries/curlrequest/013.php b/user_guide_src/source/libraries/curlrequest/013.php
new file mode 100644
index 000000000000..342b6af55ea7
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/013.php
@@ -0,0 +1,3 @@
+<?php
+
+$client->request('GET', 'http://example.com', ['allow_redirects' => false]);
diff --git a/user_guide_src/source/libraries/curlrequest/014.php b/user_guide_src/source/libraries/curlrequest/014.php
new file mode 100644
index 000000000000..452f30dd45ed
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/014.php
@@ -0,0 +1,8 @@
+<?php
+
+$client->request('GET', 'http://example.com', ['allow_redirects' => true]);
+
+// Sets the following defaults:
+'max'       => 5, // Maximum number of redirects to follow before stopping
+'strict'    => true, // Ensure POST requests stay POST requests through redirects
+'protocols' => ['http', 'https'] // Restrict redirects to one or more protocols
diff --git a/user_guide_src/source/libraries/curlrequest/015.php b/user_guide_src/source/libraries/curlrequest/015.php
new file mode 100644
index 000000000000..c8c85ee7f116
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/015.php
@@ -0,0 +1,6 @@
+<?php
+
+$client->request('GET', 'http://example.com', ['allow_redirects' => [
+    'max'       => 10,
+    'protocols' => ['https'] // Force HTTPS domains only.
+]]);
diff --git a/user_guide_src/source/libraries/curlrequest/016.php b/user_guide_src/source/libraries/curlrequest/016.php
new file mode 100644
index 000000000000..3c3fa945f535
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/016.php
@@ -0,0 +1,3 @@
+<?php
+
+$client->request('GET', 'http://example.com', ['auth' => ['username', 'password', 'digest']]);
diff --git a/user_guide_src/source/libraries/curlrequest/017.php b/user_guide_src/source/libraries/curlrequest/017.php
new file mode 100644
index 000000000000..fbc6302a68ec
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/017.php
@@ -0,0 +1,3 @@
+<?php
+
+$client->setBody($body) ->request('put', 'http://example.com');
diff --git a/user_guide_src/source/libraries/curlrequest/018.php b/user_guide_src/source/libraries/curlrequest/018.php
new file mode 100644
index 000000000000..16fba53e2e8b
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/018.php
@@ -0,0 +1,3 @@
+<?php
+
+$client->request('put', 'http://example.com', ['body' => $body]);
diff --git a/user_guide_src/source/libraries/curlrequest/019.php b/user_guide_src/source/libraries/curlrequest/019.php
new file mode 100644
index 000000000000..96f86c9ea6a2
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/019.php
@@ -0,0 +1,3 @@
+<?php
+
+$client->request('get', '/', ['cert' => ['/path/server.pem', 'password']);
diff --git a/user_guide_src/source/libraries/curlrequest/020.php b/user_guide_src/source/libraries/curlrequest/020.php
new file mode 100644
index 000000000000..6e0b1e3726a7
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/020.php
@@ -0,0 +1,3 @@
+<?php
+
+$response->request('GET', 'http://example.com', ['connect_timeout' => 0]);
diff --git a/user_guide_src/source/libraries/curlrequest/021.php b/user_guide_src/source/libraries/curlrequest/021.php
new file mode 100644
index 000000000000..4acf82aa9e0b
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/021.php
@@ -0,0 +1,3 @@
+<?php
+
+$response->request('GET', 'http://example.com', ['cookie' => WRITEPATH . 'CookieSaver.txt']);
diff --git a/user_guide_src/source/libraries/curlrequest/022.php b/user_guide_src/source/libraries/curlrequest/022.php
new file mode 100644
index 000000000000..6acbcf0a7784
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/022.php
@@ -0,0 +1,3 @@
+<?php
+
+$response->request('GET', 'http://example.com', ['debug' => '/usr/local/curl_log.txt']);
diff --git a/user_guide_src/source/libraries/curlrequest/023.php b/user_guide_src/source/libraries/curlrequest/023.php
new file mode 100644
index 000000000000..b6846257ad83
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/023.php
@@ -0,0 +1,4 @@
+<?php
+
+// Delay for 2 seconds
+$response->request('GET', 'http://example.com', ['delay' => 2000]);
diff --git a/user_guide_src/source/libraries/curlrequest/024.php b/user_guide_src/source/libraries/curlrequest/024.php
new file mode 100644
index 000000000000..bbc6285e0eec
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/024.php
@@ -0,0 +1,8 @@
+<?php
+
+$client->request('POST', '/post', [
+    'form_params' => [
+        'foo' => 'bar',
+        'baz' => ['hi', 'there'],
+    ],
+]);
diff --git a/user_guide_src/source/libraries/curlrequest/025.php b/user_guide_src/source/libraries/curlrequest/025.php
new file mode 100644
index 000000000000..acc8b40002ef
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/025.php
@@ -0,0 +1,9 @@
+<?php
+
+$client->request('get', '/', [
+    'headers' => [
+        'User-Agent' => 'testing/1.0',
+        'Accept'     => 'application/json',
+        'X-Foo'      => ['Bar', 'Baz'],
+    ],
+]);
diff --git a/user_guide_src/source/libraries/curlrequest/026.php b/user_guide_src/source/libraries/curlrequest/026.php
new file mode 100644
index 000000000000..36ea74cb9293
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/026.php
@@ -0,0 +1,8 @@
+<?php
+
+$client->request('GET', '/status/500');
+// Will fail verbosely
+
+$res = $client->request('GET', '/status/500', ['http_errors' => false]);
+echo $res->getStatusCode();
+// 500
diff --git a/user_guide_src/source/libraries/curlrequest/027.php b/user_guide_src/source/libraries/curlrequest/027.php
new file mode 100644
index 000000000000..bd91655f3dbe
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/027.php
@@ -0,0 +1,3 @@
+<?php
+
+$response = $client->request('PUT', '/put', ['json' => ['foo' => 'bar']]);
diff --git a/user_guide_src/source/libraries/curlrequest/028.php b/user_guide_src/source/libraries/curlrequest/028.php
new file mode 100644
index 000000000000..fcce227c1d9a
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/028.php
@@ -0,0 +1,6 @@
+<?php
+
+$post_data = [
+    'foo'      => 'bar',
+    'userfile' => new \CURLFile('/path/to/file.txt'),
+];
diff --git a/user_guide_src/source/libraries/curlrequest/029.php b/user_guide_src/source/libraries/curlrequest/029.php
new file mode 100644
index 000000000000..7a19976bd0a2
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/029.php
@@ -0,0 +1,4 @@
+<?php
+
+// Send a GET request to /get?foo=bar
+$client->request('GET', '/get', ['query' => ['foo' => 'bar']]);
diff --git a/user_guide_src/source/libraries/curlrequest/030.php b/user_guide_src/source/libraries/curlrequest/030.php
new file mode 100644
index 000000000000..83bf718e33e4
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/030.php
@@ -0,0 +1,3 @@
+<?php
+
+$response->request('GET', 'http://example.com', ['timeout' => 5]);
diff --git a/user_guide_src/source/libraries/curlrequest/031.php b/user_guide_src/source/libraries/curlrequest/031.php
new file mode 100644
index 000000000000..1709d6d90b9c
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/031.php
@@ -0,0 +1,3 @@
+<?php
+
+$response->request('GET', 'http://example.com', ['user_agent' => 'CodeIgniter Framework v4']);
diff --git a/user_guide_src/source/libraries/curlrequest/032.php b/user_guide_src/source/libraries/curlrequest/032.php
new file mode 100644
index 000000000000..13e2fba21f04
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/032.php
@@ -0,0 +1,10 @@
+<?php
+
+// Use the system's CA bundle (this is the default setting)
+$client->request('GET', '/', ['verify' => true]);
+
+// Use a custom SSL certificate on disk.
+$client->request('GET', '/', ['verify' => '/path/to/cert.pem']);
+
+// Disable validation entirely. (Insecure!)
+$client->request('GET', '/', ['verify' => false]);
diff --git a/user_guide_src/source/libraries/curlrequest/033.php b/user_guide_src/source/libraries/curlrequest/033.php
new file mode 100644
index 000000000000..a7a8df45589c
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/033.php
@@ -0,0 +1,4 @@
+<?php
+
+// Force HTTP/1.0
+$client->request('GET', '/', ['version' => 1.0]);
diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index e56af313b005..800816ed4bbd 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -30,19 +30,10 @@ Sending Email
 Sending email is not only simple, but you can configure it on the fly or
 set your preferences in the **app/Config/Email.php** file.
 
-Here is a basic example demonstrating how you might send email::
+Here is a basic example demonstrating how you might send email:
 
-    $email = \Config\Services::email();
-
-    $email->setFrom('your@example.com', 'Your Name');
-    $email->setTo('someone@example.com');
-    $email->setCC('another@another-example.com');
-    $email->setBCC('them@their-example.com');
-
-    $email->setSubject('Email Test');
-    $email->setMessage('Testing the email class.');
-
-    $email->send();
+.. literalinclude:: email/001.php
+   :lines: 2-
 
 .. _setting-email-preferences:
 
@@ -56,14 +47,10 @@ below:
 
 Preferences are set by passing an array of preference values to the
 email initialize method. Here is an example of how you might set some
-preferences::
+preferences:
 
-    $config['protocol'] = 'sendmail';
-    $config['mailPath'] = '/usr/sbin/sendmail';
-    $config['charset']  = 'iso-8859-1';
-    $config['wordWrap'] = true;
-
-    $email->initialize($config);
+.. literalinclude:: email/002.php
+   :lines: 2-
 
 .. note:: Most of the preferences have default values that will be used
     if you do not set them.
@@ -167,7 +154,6 @@ message like this::
     More text that will be
     wrapped normally.
 
-
 Place the item you do not want word-wrapped between: {unwrap} {/unwrap}
 
 ***************
@@ -184,13 +170,15 @@ Class Reference
         :returns:    CodeIgniter\\Email\\Email instance (method chaining)
         :rtype:    CodeIgniter\\Email\\Email
 
-        Sets the email address and name of the person sending the email::
+        Sets the email address and name of the person sending the email:
 
-            $email->setFrom('you@example.com', 'Your Name');
+        .. literalinclude:: email/003.php
+           :lines: 2-
 
-        You can also set a Return-Path, to help redirect undelivered mail::
+        You can also set a Return-Path, to help redirect undelivered mail:
 
-            $email->setFrom('you@example.com', 'Your Name', 'returned_emails@example.com');
+        .. literalinclude:: email/004.php
+           :lines: 2-
 
         .. note:: Return-Path can't be used if you've configured 'smtp' as
             your protocol.
@@ -203,9 +191,10 @@ Class Reference
         :rtype:    CodeIgniter\\Email\\Email
 
         Sets the reply-to address. If the information is not provided the
-        information in the `setFrom <#setFrom>`_ method is used. Example::
+        information in the `setFrom <#setFrom>`_ method is used. Example:
 
-            $email->setReplyTo('you@example.com', 'Your Name');
+        .. literalinclude:: email/005.php
+           :lines: 2-
 
     .. php:method:: setTo($to)
 
@@ -214,17 +203,16 @@ Class Reference
         :rtype:    CodeIgniter\\Email\\Email
 
         Sets the email address(s) of the recipient(s). Can be a single e-mail,
-        a comma-delimited list or an array::
-
-            $email->setTo('someone@example.com');
+        a comma-delimited list or an array:
 
-        ::
+        .. literalinclude:: email/006.php
+           :lines: 2-
 
-            $email->setTo('one@example.com, two@example.com, three@example.com');
+        .. literalinclude:: email/007.php
+           :lines: 2-
 
-        ::
-
-            $email->setTo(['one@example.com', 'two@example.com', 'three@example.com']);
+        .. literalinclude:: email/008.php
+           :lines: 2-
 
     .. php:method:: setCC($cc)
 
@@ -255,9 +243,10 @@ Class Reference
         :returns:    CodeIgniter\\Email\\Email instance (method chaining)
         :rtype:    CodeIgniter\\Email\\Email
 
-        Sets the email subject::
+        Sets the email subject:
 
-            $email->setSubject('This is my subject');
+        .. literalinclude:: email/009.php
+           :lines: 2-
 
     .. php:method:: setMessage($body)
 
@@ -265,9 +254,10 @@ Class Reference
         :returns:    CodeIgniter\\Email\\Email instance (method chaining)
         :rtype:    CodeIgniter\\Email\\Email
 
-        Sets the e-mail message body::
+        Sets the e-mail message body:
 
-            $email->setMessage('This is my message');
+        .. literalinclude:: email/010.php
+           :lines: 2-
 
     .. php:method:: setAltMessage($str)
 
@@ -275,9 +265,10 @@ Class Reference
         :returns:    CodeIgniter\\Email\\Email instance (method chaining)
         :rtype:    CodeIgniter\\Email\\Email
 
-        Sets the alternative e-mail message body::
+        Sets the alternative e-mail message body:
 
-            $email->setAltMessage('This is the alternative message');
+        .. literalinclude:: email/011.php
+           :lines: 2-
 
         This is an optional message string which can be used if you send
         HTML formatted email. It lets you specify an alternative message
@@ -294,10 +285,10 @@ Class Reference
         :returns:    CodeIgniter\\Email\\Email instance (method chaining)
         :rtype: CodeIgniter\\Email\\Email
 
-        Appends additional headers to the e-mail::
+        Appends additional headers to the e-mail:
 
-            $email->setHeader('Header1', 'Value1');
-            $email->setHeader('Header2', 'Value2');
+        .. literalinclude:: email/012.php
+           :lines: 2-
 
     .. php:method:: clear($clearAttachments = false)
 
@@ -309,23 +300,14 @@ Class Reference
         is intended for use if you run the email sending method in a loop,
         permitting the data to be reset between cycles.
 
-        ::
-
-            foreach ($list as $name => $address)
-            {
-                $email->clear();
-
-                $email->setTo($address);
-                $email->setFrom('your@example.com');
-                $email->setSubject('Here is your info '.$name);
-                $email->setMessage('Hi ' . $name . ' Here is the info you requested.');
-                $email->send();
-            }
+        .. literalinclude:: email/013.php
+           :lines: 2-
 
         If you set the parameter to true any attachments will be cleared as
-        well::
+        well:
 
-            $email->clear(true);
+        .. literalinclude:: email/014.php
+           :lines: 2-
 
     .. php:method:: send($autoClear = true)
 
@@ -334,18 +316,16 @@ Class Reference
         :rtype:    bool
 
         The e-mail sending method. Returns boolean true or false based on
-        success or failure, enabling it to be used conditionally::
+        success or failure, enabling it to be used conditionally:
 
-            if (! $email->send()) {
-                // Generate error
-            }
+        .. literalinclude:: email/015.php
+           :lines: 2-
 
         This method will automatically clear all parameters if the request was
-        successful. To stop this behaviour pass false::
+        successful. To stop this behaviour pass false:
 
-            if ($email->send(false)) {
-                // Parameters won't be cleared
-            }
+        .. literalinclude:: email/016.php
+           :lines: 2-
 
         .. note:: In order to use the ``printDebugger()`` method, you need
             to avoid clearing the email parameters.
@@ -367,30 +347,33 @@ Class Reference
 
         Enables you to send an attachment. Put the file path/name in the first
         parameter. For multiple attachments use the method multiple times.
-        For example::
+        For example:
 
-            $email->attach('/path/to/photo1.jpg');
-            $email->attach('/path/to/photo2.jpg');
-            $email->attach('/path/to/photo3.jpg');
+        .. literalinclude:: email/017.php
+           :lines: 2-
 
         To use the default disposition (attachment), leave the second parameter blank,
-        otherwise use a custom disposition::
+        otherwise use a custom disposition:
 
-            $email->attach('image.jpg', 'inline');
+        .. literalinclude:: email/018.php
+           :lines: 2-
 
-        You can also use a URL::
+        You can also use a URL:
 
-            $email->attach('http://example.com/filename.pdf');
+        .. literalinclude:: email/019.php
+           :lines: 2-
 
-        If you'd like to use a custom file name, you can use the third parameter::
+        If you'd like to use a custom file name, you can use the third parameter:
 
-            $email->attach('filename.pdf', 'attachment', 'report.pdf');
+        .. literalinclude:: email/020.php
+           :lines: 2-
 
         If you need to use a buffer string instead of a real - physical - file you can
         use the first parameter as buffer, the third parameter as file name and the fourth
-        parameter as mime-type::
+        parameter as mime-type:
 
-            $email->attach($buffer, 'attachment', 'report.pdf', 'application/pdf');
+        .. literalinclude:: email/021.php
+           :lines: 2-
 
     .. php:method:: setAttachmentCID($filename)
 
@@ -400,17 +383,9 @@ Class Reference
 
         Sets and returns an attachment's Content-ID, which enables your to embed an inline
         (picture) attachment into HTML. First parameter must be the already attached file name.
-        ::
 
-            $filename = '/img/photo1.jpg';
-            $email->attach($filename);
-
-            foreach ($list as $address) {
-                $email->setTo($address);
-                $cid = $email->setAttachmentCID($filename);
-                $email->setMessage('<img src="cid:'. $cid .'" alt="photo1" />');
-                $email->send();
-            }
+        .. literalinclude:: email/022.php
+           :lines: 2-
 
         .. note:: Content-ID for each e-mail must be re-created for it to be unique.
 
@@ -426,14 +401,9 @@ Class Reference
         You can optionally specify which parts of the message should be printed.
         Valid options are: **headers**, **subject**, **body**.
 
-        Example::
-
-            // You need to pass false while sending in order for the email data
-            // to not be cleared - if that happens, printDebugger() would have
-            // nothing to output.
-            $email->send(false);
+        Example:
 
-            // Will only print the email headers, excluding the message subject and body
-            $email->printDebugger(['headers']);
+        .. literalinclude:: email/023.php
+           :lines: 2-
 
         .. note:: By default, all of the raw data will be printed.
diff --git a/user_guide_src/source/libraries/email/001.php b/user_guide_src/source/libraries/email/001.php
new file mode 100644
index 000000000000..914193c15203
--- /dev/null
+++ b/user_guide_src/source/libraries/email/001.php
@@ -0,0 +1,13 @@
+<?php
+
+$email = \Config\Services::email();
+
+$email->setFrom('your@example.com', 'Your Name');
+$email->setTo('someone@example.com');
+$email->setCC('another@another-example.com');
+$email->setBCC('them@their-example.com');
+
+$email->setSubject('Email Test');
+$email->setMessage('Testing the email class.');
+
+$email->send();
diff --git a/user_guide_src/source/libraries/email/002.php b/user_guide_src/source/libraries/email/002.php
new file mode 100644
index 000000000000..02268ee6079d
--- /dev/null
+++ b/user_guide_src/source/libraries/email/002.php
@@ -0,0 +1,8 @@
+<?php
+
+$config['protocol'] = 'sendmail';
+$config['mailPath'] = '/usr/sbin/sendmail';
+$config['charset']  = 'iso-8859-1';
+$config['wordWrap'] = true;
+
+$email->initialize($config);
diff --git a/user_guide_src/source/libraries/email/003.php b/user_guide_src/source/libraries/email/003.php
new file mode 100644
index 000000000000..b2ade5bab56b
--- /dev/null
+++ b/user_guide_src/source/libraries/email/003.php
@@ -0,0 +1,3 @@
+<?php
+
+$email->setFrom('you@example.com', 'Your Name');
diff --git a/user_guide_src/source/libraries/email/004.php b/user_guide_src/source/libraries/email/004.php
new file mode 100644
index 000000000000..9d8195de4ea5
--- /dev/null
+++ b/user_guide_src/source/libraries/email/004.php
@@ -0,0 +1,3 @@
+<?php
+
+$email->setFrom('you@example.com', 'Your Name', 'returned_emails@example.com');
diff --git a/user_guide_src/source/libraries/email/005.php b/user_guide_src/source/libraries/email/005.php
new file mode 100644
index 000000000000..ba6033c281c0
--- /dev/null
+++ b/user_guide_src/source/libraries/email/005.php
@@ -0,0 +1,3 @@
+<?php
+
+$email->setReplyTo('you@example.com', 'Your Name');
diff --git a/user_guide_src/source/libraries/email/006.php b/user_guide_src/source/libraries/email/006.php
new file mode 100644
index 000000000000..1998618a5b5f
--- /dev/null
+++ b/user_guide_src/source/libraries/email/006.php
@@ -0,0 +1,3 @@
+<?php
+
+$email->setTo('someone@example.com');
diff --git a/user_guide_src/source/libraries/email/007.php b/user_guide_src/source/libraries/email/007.php
new file mode 100644
index 000000000000..b0622d0ac56f
--- /dev/null
+++ b/user_guide_src/source/libraries/email/007.php
@@ -0,0 +1,3 @@
+<?php
+
+$email->setTo('one@example.com, two@example.com, three@example.com');
diff --git a/user_guide_src/source/libraries/email/008.php b/user_guide_src/source/libraries/email/008.php
new file mode 100644
index 000000000000..d3ac20661d04
--- /dev/null
+++ b/user_guide_src/source/libraries/email/008.php
@@ -0,0 +1,3 @@
+<?php
+
+$email->setTo(['one@example.com', 'two@example.com', 'three@example.com']);
diff --git a/user_guide_src/source/libraries/email/009.php b/user_guide_src/source/libraries/email/009.php
new file mode 100644
index 000000000000..566736474df4
--- /dev/null
+++ b/user_guide_src/source/libraries/email/009.php
@@ -0,0 +1,3 @@
+<?php
+
+$email->setSubject('This is my subject');
diff --git a/user_guide_src/source/libraries/email/010.php b/user_guide_src/source/libraries/email/010.php
new file mode 100644
index 000000000000..6383ac2e112d
--- /dev/null
+++ b/user_guide_src/source/libraries/email/010.php
@@ -0,0 +1,3 @@
+<?php
+
+$email->setMessage('This is my message');
diff --git a/user_guide_src/source/libraries/email/011.php b/user_guide_src/source/libraries/email/011.php
new file mode 100644
index 000000000000..75f8fe87587d
--- /dev/null
+++ b/user_guide_src/source/libraries/email/011.php
@@ -0,0 +1,3 @@
+<?php
+
+$email->setAltMessage('This is the alternative message');
diff --git a/user_guide_src/source/libraries/email/012.php b/user_guide_src/source/libraries/email/012.php
new file mode 100644
index 000000000000..b5fdc3f86ddd
--- /dev/null
+++ b/user_guide_src/source/libraries/email/012.php
@@ -0,0 +1,4 @@
+<?php
+
+$email->setHeader('Header1', 'Value1');
+$email->setHeader('Header2', 'Value2');
diff --git a/user_guide_src/source/libraries/email/013.php b/user_guide_src/source/libraries/email/013.php
new file mode 100644
index 000000000000..744360f49cc1
--- /dev/null
+++ b/user_guide_src/source/libraries/email/013.php
@@ -0,0 +1,12 @@
+<?php
+
+foreach ($list as $name => $address)
+{
+    $email->clear();
+
+    $email->setTo($address);
+    $email->setFrom('your@example.com');
+    $email->setSubject('Here is your info '.$name);
+    $email->setMessage('Hi ' . $name . ' Here is the info you requested.');
+    $email->send();
+}
diff --git a/user_guide_src/source/libraries/email/014.php b/user_guide_src/source/libraries/email/014.php
new file mode 100644
index 000000000000..01bf56c01116
--- /dev/null
+++ b/user_guide_src/source/libraries/email/014.php
@@ -0,0 +1,3 @@
+<?php
+
+$email->clear(true);
diff --git a/user_guide_src/source/libraries/email/015.php b/user_guide_src/source/libraries/email/015.php
new file mode 100644
index 000000000000..60512f6b6416
--- /dev/null
+++ b/user_guide_src/source/libraries/email/015.php
@@ -0,0 +1,5 @@
+<?php
+
+if (! $email->send()) {
+    // Generate error
+}
diff --git a/user_guide_src/source/libraries/email/016.php b/user_guide_src/source/libraries/email/016.php
new file mode 100644
index 000000000000..2eb092b49787
--- /dev/null
+++ b/user_guide_src/source/libraries/email/016.php
@@ -0,0 +1,5 @@
+<?php
+
+if ($email->send(false)) {
+    // Parameters won't be cleared
+}
diff --git a/user_guide_src/source/libraries/email/017.php b/user_guide_src/source/libraries/email/017.php
new file mode 100644
index 000000000000..391cd43214c8
--- /dev/null
+++ b/user_guide_src/source/libraries/email/017.php
@@ -0,0 +1,5 @@
+<?php
+
+$email->attach('/path/to/photo1.jpg');
+$email->attach('/path/to/photo2.jpg');
+$email->attach('/path/to/photo3.jpg');
diff --git a/user_guide_src/source/libraries/email/018.php b/user_guide_src/source/libraries/email/018.php
new file mode 100644
index 000000000000..5f17f0aae311
--- /dev/null
+++ b/user_guide_src/source/libraries/email/018.php
@@ -0,0 +1,3 @@
+<?php
+
+$email->attach('image.jpg', 'inline');
diff --git a/user_guide_src/source/libraries/email/019.php b/user_guide_src/source/libraries/email/019.php
new file mode 100644
index 000000000000..d5fc39267e3c
--- /dev/null
+++ b/user_guide_src/source/libraries/email/019.php
@@ -0,0 +1,3 @@
+<?php
+
+$email->attach('http://example.com/filename.pdf');
diff --git a/user_guide_src/source/libraries/email/020.php b/user_guide_src/source/libraries/email/020.php
new file mode 100644
index 000000000000..e14badb97d6b
--- /dev/null
+++ b/user_guide_src/source/libraries/email/020.php
@@ -0,0 +1,3 @@
+<?php
+
+$email->attach('filename.pdf', 'attachment', 'report.pdf');
diff --git a/user_guide_src/source/libraries/email/021.php b/user_guide_src/source/libraries/email/021.php
new file mode 100644
index 000000000000..103d8bc02c45
--- /dev/null
+++ b/user_guide_src/source/libraries/email/021.php
@@ -0,0 +1,3 @@
+<?php
+
+$email->attach($buffer, 'attachment', 'report.pdf', 'application/pdf');
diff --git a/user_guide_src/source/libraries/email/022.php b/user_guide_src/source/libraries/email/022.php
new file mode 100644
index 000000000000..a6d9bfadeb70
--- /dev/null
+++ b/user_guide_src/source/libraries/email/022.php
@@ -0,0 +1,11 @@
+<?php
+
+$filename = '/img/photo1.jpg';
+$email->attach($filename);
+
+foreach ($list as $address) {
+    $email->setTo($address);
+    $cid = $email->setAttachmentCID($filename);
+    $email->setMessage('<img src="cid:'. $cid .'" alt="photo1" />');
+    $email->send();
+}
diff --git a/user_guide_src/source/libraries/email/023.php b/user_guide_src/source/libraries/email/023.php
new file mode 100644
index 000000000000..82813787c1c9
--- /dev/null
+++ b/user_guide_src/source/libraries/email/023.php
@@ -0,0 +1,9 @@
+<?php
+
+// You need to pass false while sending in order for the email data
+// to not be cleared - if that happens, printDebugger() would have
+// nothing to output.
+$email->send(false);
+
+// Will only print the email headers, excluding the message subject and body
+$email->printDebugger(['headers']);
diff --git a/user_guide_src/source/libraries/encryption.rst b/user_guide_src/source/libraries/encryption.rst
index 1a8bf834d94c..f14d433641b6 100644
--- a/user_guide_src/source/libraries/encryption.rst
+++ b/user_guide_src/source/libraries/encryption.rst
@@ -40,19 +40,17 @@ A more comprehensive package like `Halite <https://github.com/paragonie/halite>`
 Using the Encryption Library
 ****************************
 
-Like all services in CodeIgniter, it can be loaded via ``Config\Services``::
+Like all services in CodeIgniter, it can be loaded via ``Config\Services``:
 
-    $encrypter = \Config\Services::encrypter();
+.. literalinclude:: encryption/001.php
+   :lines: 2-
 
 Assuming you have set your starting key (see :ref:`configuration`),
 encrypting and decrypting data is simple - pass the appropriate string to ``encrypt()``
-and/or ``decrypt()`` methods::
+and/or ``decrypt()`` methods:
 
-    $plainText = 'This is a plain-text message!';
-    $ciphertext = $encrypter->encrypt($plainText);
-
-    // Outputs: This is a plain-text message!
-    echo $encrypter->decrypt($ciphertext);
+.. literalinclude:: encryption/002.php
+   :lines: 2-
 
 And that's it! The Encryption library will do everything necessary
 for the whole process to be cryptographically secure out-of-the-box.
@@ -77,13 +75,9 @@ digest     Message digest algorithm (``SHA512``)
 You can replace the config file's settings by passing a configuration
 object of your own to the ``Services`` call. The ``$config`` variable must be
 an instance of the ``Config\Encryption`` class.
-::
-
-    $config         = new \Config\Encryption();
-    $config->key    = 'aBigsecret_ofAtleast32Characters';
-    $config->driver = 'OpenSSL';
 
-    $encrypter = \Config\Services::encrypter($config);
+.. literalinclude:: encryption/003.php
+   :lines: 2-
 
 Default Behavior
 ================
@@ -100,22 +94,18 @@ For AES-256, that's 256 bits or 32 bytes (characters) long.
 The key should be as random as possible, and it **must not** be a regular text string,
 nor the output of a hashing function, etc. To create a proper key,
 you can use the Encryption library's ``createKey()`` method.
-::
-
-    // $key will be assigned a 32-byte (256-bit) random key
-    $key = \CodeIgniter\Encryption\Encryption::createKey();
 
-    // for the SodiumHandler, you can use either:
-    $key = sodium_crypto_secretbox_keygen();
-    $key = \CodeIgniter\Encryption\Encryption::createKey(SODIUM_CRYPTO_SECRETBOX_KEYBYTES);
+.. literalinclude:: encryption/004.php
+   :lines: 2-
 
 The key can be stored in **app/Config/Encryption.php**, or you can design
 a storage mechanism of your own and pass the key dynamically when encrypting/decrypting.
 
 To save your key to your **app/Config/Encryption.php**, open the file
-and set::
+and set:
 
-    public $key = 'YOUR KEY';
+.. literalinclude:: encryption/005.php
+   :lines: 2-
 
 Encoding Keys or Results
 ------------------------
@@ -123,20 +113,16 @@ Encoding Keys or Results
 You'll notice that the ``createKey()`` method outputs binary data, which
 is hard to deal with (i.e., a copy-paste may damage it), so you may use
 ``bin2hex()``, or ``base64_encode`` to work with the key in
-a more friendly manner. For example::
-
-    // Get a hex-encoded representation of the key:
-    $encoded = bin2hex(\CodeIgniter\Encryption\Encryption::createKey(32));
+a more friendly manner. For example:
 
-    // Put the same value with hex2bin(),
-    // so that it is still passed as binary to the library:
-    $key = hex2bin('your-hex-encoded-key');
+.. literalinclude:: encryption/006.php
+   :lines: 2-
 
 You might find the same technique useful for the results
-of encryption::
+of encryption:
 
-    // Encrypt some text & make the results text
-    $encoded = base64_encode($encrypter->encrypt($plaintext));
+.. literalinclude:: encryption/007.php
+   :lines: 2-
 
 Using Prefixes in Storing Keys
 ------------------------------
@@ -146,13 +132,9 @@ encryption keys: ``hex2bin:`` and ``base64:``. When these prefixes
 immediately precede the value of your key, ``Encryption`` will
 intelligently parse the key and still pass a binary string to
 the library.
-::
-
-    // In Encryption, you may use
-    public $key = 'hex2bin:<your-hex-encoded-key>'
 
-    // or
-    public $key = 'base64:<your-base64-encoded-key>'
+.. literalinclude:: encryption/008.php
+   :lines: 2-
 
 Similarly, you can use these prefixes in your **.env** file, too!
 ::
@@ -231,13 +213,9 @@ Using the Encryption Service Directly
 
 Instead of (or in addition to) using ``Services`` as described in :ref:`usage`,
 you can create an "Encrypter" directly, or change the settings of an existing instance.
-::
-
-    // create an Encryption instance
-    $encryption = new \CodeIgniter\Encryption\Encryption();
 
-    // reconfigure an instance with different settings
-    $encrypter = $encryption->initialize($config);
+.. literalinclude:: encryption/009.php
+   :lines: 2-
 
 Remember, that ``$config`` must be an instance of ``Config\Encryption`` class.
 
@@ -265,9 +243,10 @@ Class Reference
 
         Initializes (configures) the library to use different settings.
 
-        Example::
+        Example:
 
-            $encrypter = $encryption->initialize(['cipher' => '3des']);
+        .. literalinclude:: encryption/010.php
+           :lines: 2-
 
         Please refer to the :ref:`configuration` section for detailed info.
 
@@ -290,13 +269,10 @@ Class Reference
         If you are using the SodiumHandler and want to pass a different ``blockSize``
         on runtime, pass the ``blockSize`` key in the ``$params`` array.
 
-        Examples::
+        Examples:
 
-            $ciphertext = $encrypter->encrypt('My secret message');
-            $ciphertext = $encrypter->encrypt('My secret message', ['key' => 'New secret key']);
-            $ciphertext = $encrypter->encrypt('My secret message', ['key' => 'New secret key', 'blockSize' => 32]);
-            $ciphertext = $encrypter->encrypt('My secret message', 'New secret key');
-            $ciphertext = $encrypter->encrypt('My secret message', ['blockSize' => 32]);
+        .. literalinclude:: encryption/011.php
+           :lines: 2-
 
     .. php:method:: decrypt($data[, $params = null])
 
@@ -315,10 +291,7 @@ Class Reference
         If you are using the SodiumHandler and want to pass a different ``blockSize``
         on runtime, pass the ``blockSize`` key in the ``$params`` array.
 
-        Examples::
+        Examples:
 
-            echo $encrypter->decrypt($ciphertext);
-            echo $encrypter->decrypt($ciphertext, ['key' => 'New secret key']);
-            echo $encrypter->decrypt($ciphertext, ['key' => 'New secret key', 'blockSize' => 32]);
-            echo $encrypter->decrypt($ciphertext, 'New secret key');
-            echo $encrypter->decrypt($ciphertext, ['blockSize' => 32]);
+        .. literalinclude:: encryption/012.php
+           :lines: 2-
diff --git a/user_guide_src/source/libraries/encryption/001.php b/user_guide_src/source/libraries/encryption/001.php
new file mode 100644
index 000000000000..8f840be59245
--- /dev/null
+++ b/user_guide_src/source/libraries/encryption/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$encrypter = \Config\Services::encrypter();
diff --git a/user_guide_src/source/libraries/encryption/002.php b/user_guide_src/source/libraries/encryption/002.php
new file mode 100644
index 000000000000..c7dccced0797
--- /dev/null
+++ b/user_guide_src/source/libraries/encryption/002.php
@@ -0,0 +1,7 @@
+<?php
+
+$plainText = 'This is a plain-text message!';
+$ciphertext = $encrypter->encrypt($plainText);
+
+// Outputs: This is a plain-text message!
+echo $encrypter->decrypt($ciphertext);
diff --git a/user_guide_src/source/libraries/encryption/003.php b/user_guide_src/source/libraries/encryption/003.php
new file mode 100644
index 000000000000..772a2172417f
--- /dev/null
+++ b/user_guide_src/source/libraries/encryption/003.php
@@ -0,0 +1,7 @@
+<?php
+
+$config         = new \Config\Encryption();
+$config->key    = 'aBigsecret_ofAtleast32Characters';
+$config->driver = 'OpenSSL';
+
+$encrypter = \Config\Services::encrypter($config);
diff --git a/user_guide_src/source/libraries/encryption/004.php b/user_guide_src/source/libraries/encryption/004.php
new file mode 100644
index 000000000000..30d861e74a40
--- /dev/null
+++ b/user_guide_src/source/libraries/encryption/004.php
@@ -0,0 +1,8 @@
+<?php
+
+// $key will be assigned a 32-byte (256-bit) random key
+$key = \CodeIgniter\Encryption\Encryption::createKey();
+
+// for the SodiumHandler, you can use either:
+$key = sodium_crypto_secretbox_keygen();
+$key = \CodeIgniter\Encryption\Encryption::createKey(SODIUM_CRYPTO_SECRETBOX_KEYBYTES);
diff --git a/user_guide_src/source/libraries/encryption/005.php b/user_guide_src/source/libraries/encryption/005.php
new file mode 100644
index 000000000000..18c449480333
--- /dev/null
+++ b/user_guide_src/source/libraries/encryption/005.php
@@ -0,0 +1,3 @@
+<?php
+
+public $key = 'YOUR KEY';
diff --git a/user_guide_src/source/libraries/encryption/006.php b/user_guide_src/source/libraries/encryption/006.php
new file mode 100644
index 000000000000..43e52f0bcad2
--- /dev/null
+++ b/user_guide_src/source/libraries/encryption/006.php
@@ -0,0 +1,8 @@
+<?php
+
+// Get a hex-encoded representation of the key:
+$encoded = bin2hex(\CodeIgniter\Encryption\Encryption::createKey(32));
+
+// Put the same value with hex2bin(),
+// so that it is still passed as binary to the library:
+$key = hex2bin('your-hex-encoded-key');
diff --git a/user_guide_src/source/libraries/encryption/007.php b/user_guide_src/source/libraries/encryption/007.php
new file mode 100644
index 000000000000..d373ea68247f
--- /dev/null
+++ b/user_guide_src/source/libraries/encryption/007.php
@@ -0,0 +1,4 @@
+<?php
+
+// Encrypt some text & make the results text
+$encoded = base64_encode($encrypter->encrypt($plaintext));
diff --git a/user_guide_src/source/libraries/encryption/008.php b/user_guide_src/source/libraries/encryption/008.php
new file mode 100644
index 000000000000..3e5899ec4cdf
--- /dev/null
+++ b/user_guide_src/source/libraries/encryption/008.php
@@ -0,0 +1,7 @@
+<?php
+
+// In Encryption, you may use
+public $key = 'hex2bin:<your-hex-encoded-key>'
+
+// or
+public $key = 'base64:<your-base64-encoded-key>'
diff --git a/user_guide_src/source/libraries/encryption/009.php b/user_guide_src/source/libraries/encryption/009.php
new file mode 100644
index 000000000000..ec40cae6127c
--- /dev/null
+++ b/user_guide_src/source/libraries/encryption/009.php
@@ -0,0 +1,7 @@
+<?php
+
+// create an Encryption instance
+$encryption = new \CodeIgniter\Encryption\Encryption();
+
+// reconfigure an instance with different settings
+$encrypter = $encryption->initialize($config);
diff --git a/user_guide_src/source/libraries/encryption/010.php b/user_guide_src/source/libraries/encryption/010.php
new file mode 100644
index 000000000000..1bc9ebbbb2a5
--- /dev/null
+++ b/user_guide_src/source/libraries/encryption/010.php
@@ -0,0 +1,3 @@
+<?php
+
+$encrypter = $encryption->initialize(['cipher' => '3des']);
diff --git a/user_guide_src/source/libraries/encryption/011.php b/user_guide_src/source/libraries/encryption/011.php
new file mode 100644
index 000000000000..8b675de0f16f
--- /dev/null
+++ b/user_guide_src/source/libraries/encryption/011.php
@@ -0,0 +1,7 @@
+<?php
+
+$ciphertext = $encrypter->encrypt('My secret message');
+$ciphertext = $encrypter->encrypt('My secret message', ['key' => 'New secret key']);
+$ciphertext = $encrypter->encrypt('My secret message', ['key' => 'New secret key', 'blockSize' => 32]);
+$ciphertext = $encrypter->encrypt('My secret message', 'New secret key');
+$ciphertext = $encrypter->encrypt('My secret message', ['blockSize' => 32]);
diff --git a/user_guide_src/source/libraries/encryption/012.php b/user_guide_src/source/libraries/encryption/012.php
new file mode 100644
index 000000000000..491e16f876e4
--- /dev/null
+++ b/user_guide_src/source/libraries/encryption/012.php
@@ -0,0 +1,7 @@
+<?php
+
+echo $encrypter->decrypt($ciphertext);
+echo $encrypter->decrypt($ciphertext, ['key' => 'New secret key']);
+echo $encrypter->decrypt($ciphertext, ['key' => 'New secret key', 'blockSize' => 32]);
+echo $encrypter->decrypt($ciphertext, 'New secret key');
+echo $encrypter->decrypt($ciphertext, ['blockSize' => 32]);
diff --git a/user_guide_src/source/libraries/files.rst b/user_guide_src/source/libraries/files.rst
index 6734e98d5fda..0cc766937028 100644
--- a/user_guide_src/source/libraries/files.rst
+++ b/user_guide_src/source/libraries/files.rst
@@ -17,32 +17,16 @@ You create a new File instance by passing in the path to the file in the constru
 By default, the file does not need to exist. However, you can pass an additional argument of "true"
 to check that the file exists and throw ``FileNotFoundException()`` if it does not.
 
-::
-
-    $file = new \CodeIgniter\Files\File($path);
+.. literalinclude:: files/001.php
+   :lines: 2-
 
 Taking Advantage of Spl
 =======================
 
-Once you have an instance, you have the full power of the SplFileInfo class at the ready, including::
-
-    // Get the file's basename
-    echo $file->getBasename();
-    // Get last modified time
-    echo $file->getMTime();
-    // Get the true real path
-    echo $file->getRealPath();
-    // Get the file permissions
-    echo $file->getPerms();
+Once you have an instance, you have the full power of the SplFileInfo class at the ready, including:
 
-    // Write CSV rows to it.
-    if ($file->isWritable()) {
-        $csv = $file->openFile('w');
-
-        foreach ($rows as $row) {
-            $csv->fputcsv($row);
-        }
-    }
+.. literalinclude:: files/002.php
+   :lines: 2-
 
 New Features
 ============
@@ -52,61 +36,62 @@ In addition to all of the methods in the SplFileInfo class, you get some new too
 **getRandomName()**
 
 You can generate a cryptographically secure random filename, with the current timestamp prepended, with the ``getRandomName()``
-method. This is especially useful to rename files when moving it so that the filename is unguessable::
+method. This is especially useful to rename files when moving it so that the filename is unguessable:
 
-    // Generates something like: 1465965676_385e33f741.jpg
-    $newName = $file->getRandomName();
+.. literalinclude:: files/003.php
+   :lines: 2-
 
 **getSize()**
 
-Returns the size of the uploaded file in bytes::
+Returns the size of the uploaded file in bytes:
 
-    $size     = $file->getSize(); // 256901
+.. literalinclude:: files/004.php
+   :lines: 2-
 
 **getSizeByUnit()**
 
 Returns the size of the uploaded file default in bytes. You can pass in either 'kb' or 'mb' as the first parameter to get
-the results in kilobytes or megabytes, respectively::
+the results in kilobytes or megabytes, respectively:
 
-    $bytes     = $file->getSizeByUnit(); // 256901
-    $kilobytes = $file->getSizeByUnit('kb'); // 250.880
-    $megabytes = $file->getSizeByUnit('mb'); // 0.245
+.. literalinclude:: files/005.php
+   :lines: 2-
 
 **getMimeType()**
 
 Retrieve the media type (mime type) of the file. Uses methods that are considered as secure as possible when determining
-the type of file::
-
-    $type = $file->getMimeType();
+the type of file:
 
-    echo $type; // image/png
+.. literalinclude:: files/006.php
+   :lines: 2-
 
 **guessExtension()**
 
 Attempts to determine the file extension based on the trusted ``getMimeType()`` method. If the mime type is unknown,
 will return null. This is often a more trusted source than simply using the extension provided by the filename. Uses
-the values in **app/Config/Mimes.php** to determine extension::
+the values in **app/Config/Mimes.php** to determine extension:
 
-    // Returns 'jpg' (WITHOUT the period)
-    $ext = $file->guessExtension();
+.. literalinclude:: files/007.php
+   :lines: 2-
 
 Moving Files
 ------------
 
 Each file can be moved to its new location with the aptly named ``move()`` method. This takes the directory to move
-the file to as the first parameter::
+the file to as the first parameter:
 
-    $file->move(WRITEPATH . 'uploads');
+.. literalinclude:: files/008.php
+   :lines: 2-
 
-By default, the original filename was used. You can specify a new filename by passing it as the second parameter::
+By default, the original filename was used. You can specify a new filename by passing it as the second parameter:
 
-    $newName = $file->getRandomName();
-    $file->move(WRITEPATH . 'uploads', $newName);
+.. literalinclude:: files/009.php
+   :lines: 2-
 
 The move() method returns a new File instance that for the relocated file, so you must capture the result if the
-resulting location is needed::
+resulting location is needed:
 
-    $file = $file->move(WRITEPATH . 'uploads');
+.. literalinclude:: files/010.php
+   :lines: 2-
 
 ****************
 File Collections
@@ -114,32 +99,22 @@ File Collections
 
 Working with groups of files can be cumbersome, so the framework supplies the ``FileCollection`` class to facilitate
 locating and working with groups of files across the filesystem. At its most basic, ``FileCollection`` is an index
-of files you set or build::
+of files you set or build:
 
-    $files = new FileCollection([
-        FCPATH . 'index.php',
-        ROOTPATH . 'spark',
-    ]);
-    $files->addDirectory(APPPATH . 'Filters');
+.. literalinclude:: files/011.php
+   :lines: 2-
 
 After you have input the files you would like to work with you may remove files or use the filtering commands to remove
-or retain files matching a certain regex or glob-style pattern::
+or retain files matching a certain regex or glob-style pattern:
 
-    $files->removeFile(APPPATH . 'Filters/DevelopToolbar');
-
-    $files->removePattern('#\.gitkeep#');
-    $files->retainPattern('*.php');
+.. literalinclude:: files/012.php
+   :lines: 2-
 
 When your collection is complete, you can use ``get()`` to retrieve the final list of file paths, or take advantage of
-``FileCollection`` being countable and iterable to work directly with each ``File``::
-
-    echo 'My files: ' . implode(PHP_EOL, $files->get());
-    echo 'I have ' . count($files) . ' files!';
+``FileCollection`` being countable and iterable to work directly with each ``File``:
 
-    foreach ($files as $file) {
-        echo 'Moving ' . $file->getBasename() . ', ' . $file->getSizeByUnit('mb');
-        $file->move(WRITABLE . $file->getRandomName());
-    }
+.. literalinclude:: files/013.php
+   :lines: 2-
 
 Below are the specific methods for working with a ``FileCollection``.
 
@@ -154,15 +129,10 @@ The constructor accepts an optional array of file paths to use as the initial co
 **define()**
 
 Allows child classes to define their own initial files. This method is called by the constructor and allows
-predefined collections without having to use their methods. Example::
+predefined collections without having to use their methods. Example:
 
-    class ConfigCollection extends \CodeIgniter\Files\FileCollection
-    {
-        protected function define(): void
-        {
-            $this->add(APPPATH . 'Config', true)->retainPattern('*.php');
-        }
-    }
+.. literalinclude:: files/014.php
+   :lines: 2-
 
 Now you may use the ``ConfigCollection`` anywhere in your project to access all App Config files without
 having to re-call the collection methods every time.
@@ -208,16 +178,10 @@ to ``glob()`` (like ``*.css``).
 If a ``$scope`` is provided then only files in or under that directory will be considered (i.e. files
 outside of ``$scope`` are always retained). When no scope is provided then all files are subject.
 
-Examples::
-
-    $files = new FileCollection();
-    $files->add(APPPATH . 'Config', true); // Adds all Config files and directories
-
-    $files->removePattern('*tion.php'); // Would remove Encryption.php, Validation.php, and boot/production.php
-    $files->removePattern('*tion.php', APPPATH . 'Config/boot'); // Would only remove boot/production.php
+Examples:
 
-    $files->retainPattern('#A.+php$#'); // Would keep only Autoload.php
-    $files->retainPattern('#d.+php$#', APPPATH . 'Config/boot'); // Would keep everything but boot/production.php and boot/testing.php
+.. literalinclude:: files/015.php
+   :lines: 2-
 
 Retrieving Files
 ================
diff --git a/user_guide_src/source/libraries/files/001.php b/user_guide_src/source/libraries/files/001.php
new file mode 100644
index 000000000000..643758d14ca8
--- /dev/null
+++ b/user_guide_src/source/libraries/files/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$file = new \CodeIgniter\Files\File($path);
diff --git a/user_guide_src/source/libraries/files/002.php b/user_guide_src/source/libraries/files/002.php
new file mode 100644
index 000000000000..9f058a42b472
--- /dev/null
+++ b/user_guide_src/source/libraries/files/002.php
@@ -0,0 +1,19 @@
+<?php
+
+// Get the file's basename
+echo $file->getBasename();
+// Get last modified time
+echo $file->getMTime();
+// Get the true real path
+echo $file->getRealPath();
+// Get the file permissions
+echo $file->getPerms();
+
+// Write CSV rows to it.
+if ($file->isWritable()) {
+    $csv = $file->openFile('w');
+
+    foreach ($rows as $row) {
+        $csv->fputcsv($row);
+    }
+}
diff --git a/user_guide_src/source/libraries/files/003.php b/user_guide_src/source/libraries/files/003.php
new file mode 100644
index 000000000000..53327d59bd0f
--- /dev/null
+++ b/user_guide_src/source/libraries/files/003.php
@@ -0,0 +1,4 @@
+<?php
+
+// Generates something like: 1465965676_385e33f741.jpg
+$newName = $file->getRandomName();
diff --git a/user_guide_src/source/libraries/files/004.php b/user_guide_src/source/libraries/files/004.php
new file mode 100644
index 000000000000..e73de3b6cd74
--- /dev/null
+++ b/user_guide_src/source/libraries/files/004.php
@@ -0,0 +1,3 @@
+<?php
+
+$size     = $file->getSize(); // 256901
diff --git a/user_guide_src/source/libraries/files/005.php b/user_guide_src/source/libraries/files/005.php
new file mode 100644
index 000000000000..ee9043ff92a6
--- /dev/null
+++ b/user_guide_src/source/libraries/files/005.php
@@ -0,0 +1,5 @@
+<?php
+
+$bytes     = $file->getSizeByUnit(); // 256901
+$kilobytes = $file->getSizeByUnit('kb'); // 250.880
+$megabytes = $file->getSizeByUnit('mb'); // 0.245
diff --git a/user_guide_src/source/libraries/files/006.php b/user_guide_src/source/libraries/files/006.php
new file mode 100644
index 000000000000..5c8ae9a08945
--- /dev/null
+++ b/user_guide_src/source/libraries/files/006.php
@@ -0,0 +1,5 @@
+<?php
+
+$type = $file->getMimeType();
+
+echo $type; // image/png
diff --git a/user_guide_src/source/libraries/files/007.php b/user_guide_src/source/libraries/files/007.php
new file mode 100644
index 000000000000..26be30a2c7bc
--- /dev/null
+++ b/user_guide_src/source/libraries/files/007.php
@@ -0,0 +1,4 @@
+<?php
+
+// Returns 'jpg' (WITHOUT the period)
+$ext = $file->guessExtension();
diff --git a/user_guide_src/source/libraries/files/008.php b/user_guide_src/source/libraries/files/008.php
new file mode 100644
index 000000000000..12499a3ca1ba
--- /dev/null
+++ b/user_guide_src/source/libraries/files/008.php
@@ -0,0 +1,3 @@
+<?php
+
+$file->move(WRITEPATH . 'uploads');
diff --git a/user_guide_src/source/libraries/files/009.php b/user_guide_src/source/libraries/files/009.php
new file mode 100644
index 000000000000..2e6b39645a4b
--- /dev/null
+++ b/user_guide_src/source/libraries/files/009.php
@@ -0,0 +1,4 @@
+<?php
+
+$newName = $file->getRandomName();
+$file->move(WRITEPATH . 'uploads', $newName);
diff --git a/user_guide_src/source/libraries/files/010.php b/user_guide_src/source/libraries/files/010.php
new file mode 100644
index 000000000000..2a3fcab40957
--- /dev/null
+++ b/user_guide_src/source/libraries/files/010.php
@@ -0,0 +1,3 @@
+<?php
+
+$file = $file->move(WRITEPATH . 'uploads');
diff --git a/user_guide_src/source/libraries/files/011.php b/user_guide_src/source/libraries/files/011.php
new file mode 100644
index 000000000000..fb15a5ca6cbd
--- /dev/null
+++ b/user_guide_src/source/libraries/files/011.php
@@ -0,0 +1,7 @@
+<?php
+
+$files = new FileCollection([
+    FCPATH . 'index.php',
+    ROOTPATH . 'spark',
+]);
+$files->addDirectory(APPPATH . 'Filters');
diff --git a/user_guide_src/source/libraries/files/012.php b/user_guide_src/source/libraries/files/012.php
new file mode 100644
index 000000000000..db0f881014c0
--- /dev/null
+++ b/user_guide_src/source/libraries/files/012.php
@@ -0,0 +1,6 @@
+<?php
+
+$files->removeFile(APPPATH . 'Filters/DevelopToolbar');
+
+$files->removePattern('#\.gitkeep#');
+$files->retainPattern('*.php');
diff --git a/user_guide_src/source/libraries/files/013.php b/user_guide_src/source/libraries/files/013.php
new file mode 100644
index 000000000000..a529fd0bcd6c
--- /dev/null
+++ b/user_guide_src/source/libraries/files/013.php
@@ -0,0 +1,9 @@
+<?php
+
+echo 'My files: ' . implode(PHP_EOL, $files->get());
+echo 'I have ' . count($files) . ' files!';
+
+foreach ($files as $file) {
+    echo 'Moving ' . $file->getBasename() . ', ' . $file->getSizeByUnit('mb');
+    $file->move(WRITABLE . $file->getRandomName());
+}
diff --git a/user_guide_src/source/libraries/files/014.php b/user_guide_src/source/libraries/files/014.php
new file mode 100644
index 000000000000..a768829427f3
--- /dev/null
+++ b/user_guide_src/source/libraries/files/014.php
@@ -0,0 +1,9 @@
+<?php
+
+class ConfigCollection extends \CodeIgniter\Files\FileCollection
+{
+    protected function define(): void
+    {
+        $this->add(APPPATH . 'Config', true)->retainPattern('*.php');
+    }
+}
diff --git a/user_guide_src/source/libraries/files/015.php b/user_guide_src/source/libraries/files/015.php
new file mode 100644
index 000000000000..7e5c65e9a3d6
--- /dev/null
+++ b/user_guide_src/source/libraries/files/015.php
@@ -0,0 +1,10 @@
+<?php
+
+$files = new FileCollection();
+$files->add(APPPATH . 'Config', true); // Adds all Config files and directories
+
+$files->removePattern('*tion.php'); // Would remove Encryption.php, Validation.php, and boot/production.php
+$files->removePattern('*tion.php', APPPATH . 'Config/boot'); // Would only remove boot/production.php
+
+$files->retainPattern('#A.+php$#'); // Would keep only Autoload.php
+$files->retainPattern('#d.+php$#', APPPATH . 'Config/boot'); // Would keep everything but boot/production.php and boot/testing.php
diff --git a/user_guide_src/source/libraries/honeypot.rst b/user_guide_src/source/libraries/honeypot.rst
index 0b9114456cf0..69c23e47ca03 100644
--- a/user_guide_src/source/libraries/honeypot.rst
+++ b/user_guide_src/source/libraries/honeypot.rst
@@ -15,18 +15,10 @@ Enabling Honeypot
 =====================
 
 To enable a Honeypot, changes have to be made to the **app/Config/Filters.php**. Just uncomment honeypot
-from the ``$globals`` array, like...::
-
-    public $globals = [
-        'before' => [
-            'honeypot'
-            // 'csrf',
-        ],
-        'after' => [
-            'toolbar',
-            'honeypot',
-        ],
-    ];
+from the ``$globals`` array, like...:
+
+.. literalinclude:: honeypot/001.php
+   :lines: 2-
 
 A sample Honeypot filter is bundled, as ``system/Filters/Honeypot.php``.
 If it is not suitable, make your own at ``app/Filters/Honeypot.php``,
diff --git a/user_guide_src/source/libraries/honeypot/001.php b/user_guide_src/source/libraries/honeypot/001.php
new file mode 100644
index 000000000000..1ed16460a9a4
--- /dev/null
+++ b/user_guide_src/source/libraries/honeypot/001.php
@@ -0,0 +1,12 @@
+<?php
+
+public $globals = [
+    'before' => [
+        'honeypot'
+        // 'csrf',
+    ],
+    'after' => [
+        'toolbar',
+        'honeypot',
+    ],
+];
diff --git a/user_guide_src/source/libraries/images.rst b/user_guide_src/source/libraries/images.rst
index bd71be9657f2..029c534cacbe 100644
--- a/user_guide_src/source/libraries/images.rst
+++ b/user_guide_src/source/libraries/images.rst
@@ -22,14 +22,16 @@ Initializing the Class
 **********************
 
 Like most other classes in CodeIgniter, the image class is initialized
-in your controller by calling the Services class::
+in your controller by calling the Services class:
 
-    $image = \Config\Services::image();
+.. literalinclude:: images/001.php
+   :lines: 2-
 
 You can pass the alias for the image library you wish to use into the
-Service function::
+Service function:
 
-    $image = Config\Services::image('imagick');
+.. literalinclude:: images/002.php
+   :lines: 2-
 
 The available Handlers are as follows:
 
@@ -50,12 +52,10 @@ Regardless of the type of processing you would like to perform
 (resizing, cropping, rotation, or watermarking), the general process is
 identical. You will set some preferences corresponding to the action you
 intend to perform, then call one of the available processing functions.
-For example, to create an image thumbnail you'll do this::
+For example, to create an image thumbnail you'll do this:
 
-    $image = \Config\Services::image()
-        ->withFile('/path/to/image/mypic.jpg')
-        ->fit(100, 100, 'center')
-        ->save('/path/to/image/mypic_thumb.jpg');
+.. literalinclude:: images/003.php
+   :lines: 2-
 
 The above code tells the library to look for an image
 called *mypic.jpg* located in the source_image folder, then create a
@@ -67,14 +67,10 @@ desired aspect ratio, and then crop and resize the result.
 An image can be processed through as many of the available methods as
 needed before saving. The original image is left untouched, and a new image
 is used and passed through each method, applying the results on top of the
-previous results::
+previous results:
 
-    $image = \Config\Services::image()
-        ->withFile('/path/to/image/mypic.jpg')
-        ->reorient()
-        ->rotate(90)
-        ->crop(100, 100, 0, 0)
-        ->save('/path/to/image/mypic_thumb.jpg');
+.. literalinclude:: images/004.php
+   :lines: 2-
 
 This example would take the same image and first fix any mobile phone orientation issues,
 rotate the image by 90 degrees, and then crop the result into a 100x100 pixel image,
@@ -94,22 +90,18 @@ Image Quality
 
 ``save()`` can take an additional parameter ``$quality`` to alter the resulting image
 quality. Values range from 0 to 100 with 90 being the framework default. This parameter
-only applies to JPEG images and will be ignored otherwise::
+only applies to JPEG images and will be ignored otherwise:
 
-    $image = \Config\Services::image()
-        ->withFile('/path/to/image/mypic.jpg')
-        // processing methods
-        ->save('/path/to/image/my_low_quality_pic.jpg', 10);
+.. literalinclude:: images/005.php
+   :lines: 2-
 
 .. note:: Higher quality will result in larger file sizes. See also https://www.php.net/manual/en/function.imagejpeg.php
 
 If you are only interested in changing the image quality without doing any processing.
-You will need to include the image resource or you will end up with an exact copy::
+You will need to include the image resource or you will end up with an exact copy:
 
-    $image = \Config\Services::image()
-        ->withFile('/path/to/image/mypic.jpg')
-        ->withResource()
-        ->save('/path/to/image/my_low_quality_pic.jpg', 10);
+.. literalinclude:: images/006.php
+   :lines: 2-
 
 Processing Methods
 ==================
@@ -128,16 +120,10 @@ There are seven available processing methods:
 These methods return the class instance so they can be chained together, as shown above.
 If they fail they will throw a ``CodeIgniter\Images\ImageException`` that contains
 the error message. A good practice is to catch the exceptions, showing an
-error upon failure, like this::
+error upon failure, like this:
 
-    try {
-        $image = \Config\Services::image()
-            ->withFile('/path/to/image/mypic.jpg')
-            ->fit(100, 100, 'center')
-            ->save('/path/to/image/mypic_thumb.jpg');
-    } catch (CodeIgniter\Images\ImageException $e) {
-        echo $e->getMessage();
-    }
+.. literalinclude:: images/007.php
+   :lines: 2-
 
 Cropping Images
 ---------------
@@ -155,20 +141,10 @@ thumbnail images that should match a certain size/aspect ratio. This is handled
 - **$masterDim** specifies which dimension should be left untouched when $maintainRatio is true. Values can be: 'width', 'height', or 'auto'.
 
 To take a 50x50 pixel square out of the center of an image, you would need to first calculate the appropriate x and y
-offset values::
+offset values:
 
-    $info = \Config\Services::image('imagick')
-        ->withFile('/path/to/image/mypic.jpg')
-        ->getFile()
-        ->getProperties(true);
-
-    $xOffset = ($info['width'] / 2) - 25;
-    $yOffset = ($info['height'] / 2) - 25;
-
-    \Config\Services::image('imagick')
-        ->withFile('/path/to/image/mypic.jpg')
-        ->crop(50, 50, $xOffset, $yOffset)
-        ->save('/path/to/new/image.jpg');
+.. literalinclude:: images/008.php
+   :lines: 2-
 
 Converting Images
 -----------------
@@ -177,12 +153,10 @@ The ``convert()`` method changes the library's internal indicator for the desire
 
     convert(int $imageType)
 
-- **$imageType** is one of PHP's image type constants (see for example https://www.php.net/manual/en/function.image-type-to-mime-type.php)::
+- **$imageType** is one of PHP's image type constants (see for example https://www.php.net/manual/en/function.image-type-to-mime-type.php):
 
-    \Config\Services::image()
-        ->withFile('/path/to/image/mypic.jpg')
-        ->convert(IMAGETYPE_PNG)
-        ->save('/path/to/new/image.png');
+  .. literalinclude:: images/009.php
+     :lines: 2-
 
 .. note:: ImageMagick already saves files in the type
     indicated by their extension, ignoring **$imageType**
@@ -204,12 +178,10 @@ The ``fit()`` method aims to help simplify cropping a portion of an image in a "
 - **$height** is the desired final height of the image.
 - **$position** determines the portion of the image to crop out. Allowed positions: 'top-left', 'top', 'top-right', 'left', 'center', 'right', 'bottom-left', 'bottom', 'bottom-right'.
 
-This provides a much simpler way to crop that will always maintain the aspect ratio::
+This provides a much simpler way to crop that will always maintain the aspect ratio:
 
-    \Config\Services::image('imagick')
-        ->withFile('/path/to/image/mypic.jpg')
-        ->fit(100, 150, 'left')
-        ->save('/path/to/new/image.jpg');
+.. literalinclude:: images/010.php
+   :lines: 2-
 
 Flattening Images
 -----------------
@@ -226,17 +198,8 @@ The ``flatten()`` method aims to add a background color behind transparent image
 - **$green** is the green value of the background.
 - **$blue** is the blue value of the background.
 
-::
-
-    \Config\Services::image('imagick')
-        ->withFile('/path/to/image/mypic.png')
-        ->flatten()
-        ->save('/path/to/new/image.jpg');
-
-    \Config\Services::image('imagick')
-        ->withFile('/path/to/image/mypic.png')
-        ->flatten(25,25,112)
-        ->save('/path/to/new/image.jpg');
+.. literalinclude:: images/011.php
+   :lines: 2-
 
 Flipping Images
 ---------------
@@ -247,12 +210,8 @@ Images can be flipped along either their horizontal or vertical axis::
 
 - **$dir** specifies the axis to flip along. Can be either 'vertical' or 'horizontal'.
 
-::
-
-    \Config\Services::image('imagick')
-        ->withFile('/path/to/image/mypic.jpg')
-        ->flip('horizontal')
-        ->save('/path/to/new/image.jpg');
+.. literalinclude:: images/012.php
+   :lines: 2-
 
 Resizing Images
 ---------------
@@ -270,12 +229,8 @@ When resizing images you can choose whether to maintain the ratio of the origina
 image to fit the desired dimensions. If $maintainRatio is true, the dimension specified by $masterDim will stay the same,
 while the other dimension will be altered to match the original image's aspect ratio.
 
-::
-
-    \Config\Services::image('imagick')
-        ->withFile('/path/to/image/mypic.jpg')
-        ->resize(200, 100, true, 'height')
-        ->save('/path/to/new/image.jpg');
+.. literalinclude:: images/013.php
+   :lines: 2-
 
 Rotating Images
 ---------------
@@ -301,19 +256,10 @@ products.
     text(string $text, array $options = [])
 
 The first parameter is the string of text that you wish to display. The second parameter is an array of options
-that allow you to specify how the text should be displayed::
-
-    \Config\Services::image('imagick')
-        ->withFile('/path/to/image/mypic.jpg')
-        ->text('Copyright 2017 My Photo Co', [
-            'color'      => '#fff',
-            'opacity'    => 0.5,
-            'withShadow' => true,
-            'hAlign'     => 'center',
-            'vAlign'     => 'bottom',
-            'fontSize'   => 20
-        ])
-        ->save('/path/to/new/image.jpg');
+that allow you to specify how the text should be displayed:
+
+.. literalinclude:: images/014.php
+   :lines: 2-
 
 The possible options that are recognized are as follows:
 
diff --git a/user_guide_src/source/libraries/images/001.php b/user_guide_src/source/libraries/images/001.php
new file mode 100644
index 000000000000..780bb37b3a4d
--- /dev/null
+++ b/user_guide_src/source/libraries/images/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$image = \Config\Services::image();
diff --git a/user_guide_src/source/libraries/images/002.php b/user_guide_src/source/libraries/images/002.php
new file mode 100644
index 000000000000..b0f698c3d768
--- /dev/null
+++ b/user_guide_src/source/libraries/images/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$image = Config\Services::image('imagick');
diff --git a/user_guide_src/source/libraries/images/003.php b/user_guide_src/source/libraries/images/003.php
new file mode 100644
index 000000000000..3877ff56af12
--- /dev/null
+++ b/user_guide_src/source/libraries/images/003.php
@@ -0,0 +1,6 @@
+<?php
+
+$image = \Config\Services::image()
+    ->withFile('/path/to/image/mypic.jpg')
+    ->fit(100, 100, 'center')
+    ->save('/path/to/image/mypic_thumb.jpg');
diff --git a/user_guide_src/source/libraries/images/004.php b/user_guide_src/source/libraries/images/004.php
new file mode 100644
index 000000000000..ec6026592341
--- /dev/null
+++ b/user_guide_src/source/libraries/images/004.php
@@ -0,0 +1,8 @@
+<?php
+
+$image = \Config\Services::image()
+    ->withFile('/path/to/image/mypic.jpg')
+    ->reorient()
+    ->rotate(90)
+    ->crop(100, 100, 0, 0)
+    ->save('/path/to/image/mypic_thumb.jpg');
diff --git a/user_guide_src/source/libraries/images/005.php b/user_guide_src/source/libraries/images/005.php
new file mode 100644
index 000000000000..3f7470ee82ac
--- /dev/null
+++ b/user_guide_src/source/libraries/images/005.php
@@ -0,0 +1,6 @@
+<?php
+
+$image = \Config\Services::image()
+    ->withFile('/path/to/image/mypic.jpg')
+    // processing methods
+    ->save('/path/to/image/my_low_quality_pic.jpg', 10);
diff --git a/user_guide_src/source/libraries/images/006.php b/user_guide_src/source/libraries/images/006.php
new file mode 100644
index 000000000000..9bfcb18b3b7e
--- /dev/null
+++ b/user_guide_src/source/libraries/images/006.php
@@ -0,0 +1,6 @@
+<?php
+
+$image = \Config\Services::image()
+    ->withFile('/path/to/image/mypic.jpg')
+    ->withResource()
+    ->save('/path/to/image/my_low_quality_pic.jpg', 10);
diff --git a/user_guide_src/source/libraries/images/007.php b/user_guide_src/source/libraries/images/007.php
new file mode 100644
index 000000000000..503c038cf81c
--- /dev/null
+++ b/user_guide_src/source/libraries/images/007.php
@@ -0,0 +1,10 @@
+<?php
+
+try {
+    $image = \Config\Services::image()
+        ->withFile('/path/to/image/mypic.jpg')
+        ->fit(100, 100, 'center')
+        ->save('/path/to/image/mypic_thumb.jpg');
+} catch (CodeIgniter\Images\ImageException $e) {
+    echo $e->getMessage();
+}
diff --git a/user_guide_src/source/libraries/images/008.php b/user_guide_src/source/libraries/images/008.php
new file mode 100644
index 000000000000..01406733d31b
--- /dev/null
+++ b/user_guide_src/source/libraries/images/008.php
@@ -0,0 +1,14 @@
+<?php
+
+$info = \Config\Services::image('imagick')
+    ->withFile('/path/to/image/mypic.jpg')
+    ->getFile()
+    ->getProperties(true);
+
+$xOffset = ($info['width'] / 2) - 25;
+$yOffset = ($info['height'] / 2) - 25;
+
+\Config\Services::image('imagick')
+    ->withFile('/path/to/image/mypic.jpg')
+    ->crop(50, 50, $xOffset, $yOffset)
+    ->save('/path/to/new/image.jpg');
diff --git a/user_guide_src/source/libraries/images/009.php b/user_guide_src/source/libraries/images/009.php
new file mode 100644
index 000000000000..6314181ef435
--- /dev/null
+++ b/user_guide_src/source/libraries/images/009.php
@@ -0,0 +1,6 @@
+<?php
+
+\Config\Services::image()
+    ->withFile('/path/to/image/mypic.jpg')
+    ->convert(IMAGETYPE_PNG)
+    ->save('/path/to/new/image.png');
diff --git a/user_guide_src/source/libraries/images/010.php b/user_guide_src/source/libraries/images/010.php
new file mode 100644
index 000000000000..b70b179815cd
--- /dev/null
+++ b/user_guide_src/source/libraries/images/010.php
@@ -0,0 +1,6 @@
+<?php
+
+\Config\Services::image('imagick')
+    ->withFile('/path/to/image/mypic.jpg')
+    ->fit(100, 150, 'left')
+    ->save('/path/to/new/image.jpg');
diff --git a/user_guide_src/source/libraries/images/011.php b/user_guide_src/source/libraries/images/011.php
new file mode 100644
index 000000000000..c72932893af8
--- /dev/null
+++ b/user_guide_src/source/libraries/images/011.php
@@ -0,0 +1,11 @@
+<?php
+
+\Config\Services::image('imagick')
+    ->withFile('/path/to/image/mypic.png')
+    ->flatten()
+    ->save('/path/to/new/image.jpg');
+
+\Config\Services::image('imagick')
+    ->withFile('/path/to/image/mypic.png')
+    ->flatten(25,25,112)
+    ->save('/path/to/new/image.jpg');
diff --git a/user_guide_src/source/libraries/images/012.php b/user_guide_src/source/libraries/images/012.php
new file mode 100644
index 000000000000..581a984238bd
--- /dev/null
+++ b/user_guide_src/source/libraries/images/012.php
@@ -0,0 +1,6 @@
+<?php
+
+\Config\Services::image('imagick')
+    ->withFile('/path/to/image/mypic.jpg')
+    ->flip('horizontal')
+    ->save('/path/to/new/image.jpg');
diff --git a/user_guide_src/source/libraries/images/013.php b/user_guide_src/source/libraries/images/013.php
new file mode 100644
index 000000000000..c51a7126be8d
--- /dev/null
+++ b/user_guide_src/source/libraries/images/013.php
@@ -0,0 +1,6 @@
+<?php
+
+\Config\Services::image('imagick')
+    ->withFile('/path/to/image/mypic.jpg')
+    ->resize(200, 100, true, 'height')
+    ->save('/path/to/new/image.jpg');
diff --git a/user_guide_src/source/libraries/images/014.php b/user_guide_src/source/libraries/images/014.php
new file mode 100644
index 000000000000..4afd1e12d420
--- /dev/null
+++ b/user_guide_src/source/libraries/images/014.php
@@ -0,0 +1,13 @@
+<?php
+
+\Config\Services::image('imagick')
+    ->withFile('/path/to/image/mypic.jpg')
+    ->text('Copyright 2017 My Photo Co', [
+        'color'      => '#fff',
+        'opacity'    => 0.5,
+        'withShadow' => true,
+        'hAlign'     => 'center',
+        'vAlign'     => 'bottom',
+        'fontSize'   => 20
+    ])
+    ->save('/path/to/new/image.jpg');
diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index dfab3b6c80f4..8a79531326d6 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -14,9 +14,10 @@ Loading the Library
 *******************
 
 Like all services in CodeIgniter, it can be loaded via ``Config\Services``, though you usually will not need
-to load it manually::
+to load it manually:
 
-    $pager = \Config\Services::pager();
+.. literalinclude:: pagination/001.php
+   :lines: 2-
 
 ***************************
 Paginating Database Results
@@ -27,28 +28,9 @@ When using the :doc:`Model </models/model>` class, you can use its built-in ``pa
 retrieve the current batch of results, as well as set up the Pager library so it's ready to use in your controllers.
 It even reads the current page it should display from the current URL via a ``page=X`` query variable.
 
-To provide a paginated list of users in your application, your controller's method would look something like::
+To provide a paginated list of users in your application, your controller's method would look something like:
 
-    <?php
-
-    namespace App\Controllers;
-
-    use CodeIgniter\Controller;
-
-    class UserController extends Controller
-    {
-        public function index()
-        {
-            $model = new \App\Models\UserModel();
-
-            $data = [
-                'users' => $model->paginate(10),
-                'pager' => $model->pager,
-            ];
-
-            echo view('users/index', $data);
-        }
-    }
+.. literalinclude:: pagination/002.php
 
 In this example, we first create a new instance of our ``UserModel``. Then we populate the data to send to the view.
 The first element is the results from the database, **users**, which is retrieved for the correct page, returning
@@ -60,28 +42,10 @@ that and assign it to the ``$pager`` variable in the view.
     Therefore, trying to use ``$db->query()`` and Model::paginate() **will not work** because ``$db->query()`` executes
     the query immediately and is not associated with a QueryBuilder.
 
-To define conditions for pagination in a model, you can::
+To define conditions for pagination in a model, you can:
 
-    // You can specify conditions directly.
-    $model = new \App\Models\UserModel();
-
-    $data = [
-        'users' => $model->where('ban', 1)->paginate(10),
-        'pager' => $model->pager,
-    ];
-
-    // You can move the conditions to a separate method.
-    // Model method
-    public function banned()
-    {
-        $this->builder()->where('ban', 1);
-        return $this; // This will allow the call chain to be used.
-    }
-
-    $data = [
-        'users' => $model->banned()->paginate(10),
-        'pager' => $model->pager,
-    ];
+.. literalinclude:: pagination/003.php
+   :lines: 2-
 
 Within the view, we then need to tell it where to display the resulting links::
 
@@ -106,26 +70,10 @@ Paginating Multiple Results
 ===========================
 
 If you need to provide links from two different result sets, you can pass group names to most of the pagination
-methods to keep the data separate::
-
-    // In the Controller
-    public function index()
-    {
-        $userModel = new \App\Models\UserModel();
-        $pageModel = new \App\Models\PageModel();
-
-        $data = [
-            'users' => $userModel->paginate(10, 'group1'),
-            'pages' => $pageModel->paginate(15, 'group2'),
-            'pager' => $userModel->pager,
-        ];
+methods to keep the data separate:
 
-        echo view('users/index', $data);
-    }
-
-    // In the views:
-    <?= $pager->links('group1') ?>
-    <?= $pager->simpleLinks('group2') ?>
+.. literalinclude:: pagination/004.php
+   :lines: 2-
 
 Setting Page Manually
 =====================
@@ -133,12 +81,8 @@ Setting Page Manually
 If you need to specify which page of results to return you can specify the page as the 3rd argument. This can be
 handy when you have a different manner than the default ``$_GET`` varibable to control which page to show.
 
-::
-
-     $userModel = new \App\Models\UserModel();
-     $page = 3;
-
-     $users = $userModel->paginate(10, 'group1', $page);
+.. literalinclude:: pagination/005.php
+   :lines: 2-
 
 Specifying the URI Segment for Page
 ===================================
@@ -147,9 +91,8 @@ It is also possible to use a URI segment for the page number, instead of the pag
 segment number to use as the fourth argument. URIs generated by the pager would then look
 like **https://domain.tld/foo/bar/[pageNumber]** instead of **https://domain.tld/foo/bar?page=[pageNumber]**.
 
-::
-
-    $users = $userModel->paginate(10, 'group1', null, $segment);
+.. literalinclude:: pagination/006.php
+   :lines: 2-
 
 Please note: ``$segment`` value cannot be greater than the number of URI segments plus 1.
 
@@ -179,11 +122,10 @@ the previous section. Specify the segment number to use as the fifth parameter t
 
 Please note: ``$segment`` value cannot be greater than the number of URI segments plus 1.
 
-If you in need to show many pagers on one page then additional parameter which will define a group could be helpful::
+If you in need to show many pagers on one page then additional parameter which will define a group could be helpful:
 
-    $pager = service('pager');
-    $pager->setPath('path/for/my-group', 'my-group'); // Additionally you could define path for every group.
-    $pager->makeLinks($page, $perPage, $total, 'template_name', $segment, 'my-group');
+.. literalinclude:: pagination/007.php
+   :lines: 2-
 
 Pagination library uses **page** query parameter for HTTP queries by default (if no group or ``default`` group name given) or ``page_[groupName]`` for custom group names.
 
@@ -192,15 +134,15 @@ Paginating with Only Expected Queries
 
 By default, all GET queries are shown in the pagination links.
 
-For example, when accessing the URL **https://domain.tld?search=foo&order=asc&hello=i+am+here&page=2**, the page 3 link can be generated, along with the other links, as follows::
+For example, when accessing the URL **https://domain.tld?search=foo&order=asc&hello=i+am+here&page=2**, the page 3 link can be generated, along with the other links, as follows:
 
-    echo $pager->links();
-    // Page 3 link: https://domain.tld?search=foo&order=asc&hello=i+am+here&page=3
+.. literalinclude:: pagination/008.php
+   :lines: 2-
 
-The ``only()`` method allows you to limit this just to queries already expected::
+The ``only()`` method allows you to limit this just to queries already expected:
 
-    echo $pager->only(['search', 'order'])->links();
-    // Page 3 link: https://domain.tld?search=foo&order=asc&page=3
+.. literalinclude:: pagination/009.php
+   :lines: 2-
 
 The *page* query is enabled by default. And ``only()`` acts in all pagination links.
 
@@ -212,12 +154,10 @@ View Configuration
 ==================
 
 When the links are rendered out to the page, they use a view file to describe the HTML. You can easily change the view
-that is used by editing **app/Config/Pager.php**::
+that is used by editing **app/Config/Pager.php**:
 
-    public $templates = [
-        'default_full'   => 'CodeIgniter\Pager\Views\default_full',
-        'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
-    ];
+.. literalinclude:: pagination/010.php
+   :lines: 2-
 
 This setting stores the alias and :doc:`namespaced view paths </outgoing/views>` for the view that
 should be used. The ``default_full`` and ``default_simple`` views are used for the ``links()`` and ``simpleLinks()``
@@ -226,25 +166,23 @@ methods, respectively. To change the way those are displayed application-wide, y
 For example, say you create a new view file that works with the Foundation CSS framework, and
 you place that file at **app/Views/Pagers/foundation_full.php**. Since the **application** directory is
 namespaced as ``App``, and all directories underneath it map directly to segments of the namespace, you can locate
-the view file through it's namespace::
+the view file through it's namespace:
 
-    'default_full'   => 'App\Views\Pagers\foundation_full',
+.. literalinclude:: pagination/011.php
+   :lines: 2-
 
 Since it is under the standard **app/Views** directory, though, you do not need to namespace it since the
-``view()`` method can locate it by filename. In that case, you can simply give the sub-directory and file name::
+``view()`` method can locate it by filename. In that case, you can simply give the sub-directory and file name:
 
-    'default_full'   => 'Pagers/foundation_full',
+.. literalinclude:: pagination/012.php
+   :lines: 2-
 
 Once you have created the view and set it in the configuration, it will automatically be used. You don't have to
 replace the existing templates. You can create as many additional templates as you need in the configuration
 file. A common situation would be needing different styles for the frontend and the backend of your application.
-::
 
-    public $templates = [
-        'default_full'   => 'CodeIgniter\Pager\Views\default_full',
-        'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
-        'front_full'     => 'App\Views\Pagers\foundation_full',
-    ];
+.. literalinclude:: pagination/013.php
+   :lines: 2-
 
 Once configured, you can specify it as a the last parameter in the ``links()``, ``simpleLinks()``, and ``makeLinks()``
 methods::
@@ -258,47 +196,9 @@ Creating the View
 
 When you create a new view, you only need to create the code that is needed for creating the pagination links themselves.
 You should not create unnecessary wrapping divs since it might be used in multiple places and you only limit their
-usefulness. It is easiest to demonstrate creating a new view by showing you the existing ``default_full`` template::
-
-    <?php $pager->setSurroundCount(2) ?>
-
-    <nav aria-label="Page navigation">
-        <ul class="pagination">
-        <?php if ($pager->hasPrevious()) : ?>
-            <li>
-                <a href="<?= $pager->getFirst() ?>" aria-label="<?= lang('Pager.first') ?>">
-                    <span aria-hidden="true"><?= lang('Pager.first') ?></span>
-                </a>
-            </li>
-            <li>
-                <a href="<?= $pager->getPrevious() ?>" aria-label="<?= lang('Pager.previous') ?>">
-                    <span aria-hidden="true"><?= lang('Pager.previous') ?></span>
-                </a>
-            </li>
-        <?php endif ?>
-
-        <?php foreach ($pager->links() as $link): ?>
-            <li <?= $link['active'] ? 'class="active"' : '' ?>>
-                <a href="<?= $link['uri'] ?>">
-                    <?= $link['title'] ?>
-                </a>
-            </li>
-        <?php endforeach ?>
-
-        <?php if ($pager->hasNext()) : ?>
-            <li>
-                <a href="<?= $pager->getNext() ?>" aria-label="<?= lang('Pager.next') ?>">
-                    <span aria-hidden="true"><?= lang('Pager.next') ?></span>
-                </a>
-            </li>
-            <li>
-                <a href="<?= $pager->getLast() ?>" aria-label="<?= lang('Pager.last') ?>">
-                    <span aria-hidden="true"><?= lang('Pager.last') ?></span>
-                </a>
-            </li>
-        <?php endif ?>
-        </ul>
-    </nav>
+usefulness. It is easiest to demonstrate creating a new view by showing you the existing ``default_full`` template:
+
+.. literalinclude:: pagination/014.php
 
 **setSurroundCount()**
 
@@ -326,57 +226,18 @@ result set.
 **links()**
 
 Returns an array of data about all of the numbered links. Each link's array contains the uri for the link, the
-title, which is just the number, and a boolean that tells whether the link is the current/active link or not::
+title, which is just the number, and a boolean that tells whether the link is the current/active link or not:
 
-    $link = [
-        'active' => false,
-        'uri'    => 'https://example.com/foo?page=2',
-        'title'  => 1,
-    ];
+.. literalinclude:: pagination/015.php
+   :lines: 2-
 
 In the code presented for the standard pagination structure, the methods ``getPrevious()`` and ``getNext()`` are used to obtain the links to the previous and next pagination groups respectively.
 
 If you want to use the pagination structure where prev and next will be links to the previous and next pages based on the current page, just replace the ``getPrevious()`` and ``getNext()`` methods with ``getPreviousPage()`` and ``getNextPage()``, and the methods ``hasPrevious()`` and ``hasNext()`` by ``hasPreviousPage()`` and ``hasNextPage()`` respectively.
 
-See following an example with these changes::
-
-    <nav aria-label="<?= lang('Pager.pageNavigation') ?>">
-        <ul class="pagination">
-            <?php if ($pager->hasPreviousPage()) : ?>
-                <li>
-                    <a href="<?= $pager->getFirst() ?>" aria-label="<?= lang('Pager.first') ?>">
-                        <span aria-hidden="true"><?= lang('Pager.first') ?></span>
-                    </a>
-                </li>
-                <li>
-                    <a href="<?= $pager->getPreviousPage() ?>" aria-label="<?= lang('Pager.previous') ?>">
-                        <span aria-hidden="true"><?= lang('Pager.previous') ?></span>
-                    </a>
-                </li>
-            <?php endif ?>
-
-            <?php foreach ($pager->links() as $link): ?>
-                <li <?= $link['active'] ? 'class="active"' : '' ?>>
-                    <a href="<?= $link['uri'] ?>">
-                        <?= $link['title'] ?>
-                    </a>
-                </li>
-            <?php endforeach ?>
-
-            <?php if ($pager->hasNextPage()) : ?>
-                <li>
-                    <a href="<?= $pager->getNextPage() ?>" aria-label="<?= lang('Pager.next') ?>">
-                        <span aria-hidden="true"><?= lang('Pager.next') ?></span>
-                    </a>
-                </li>
-                <li>
-                    <a href="<?= $pager->getLast() ?>" aria-label="<?= lang('Pager.last') ?>">
-                        <span aria-hidden="true"><?= lang('Pager.last') ?></span>
-                    </a>
-                </li>
-            <?php endif ?>
-        </ul>
-    </nav>
+See following an example with these changes:
+
+.. literalinclude:: pagination/016.php
 
 **hasPreviousPage()** & **hasNextPage()**
 
diff --git a/user_guide_src/source/libraries/pagination/001.php b/user_guide_src/source/libraries/pagination/001.php
new file mode 100644
index 000000000000..ec86f0e73490
--- /dev/null
+++ b/user_guide_src/source/libraries/pagination/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$pager = \Config\Services::pager();
diff --git a/user_guide_src/source/libraries/pagination/002.php b/user_guide_src/source/libraries/pagination/002.php
new file mode 100644
index 000000000000..baaa8471111f
--- /dev/null
+++ b/user_guide_src/source/libraries/pagination/002.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Controllers;
+
+use CodeIgniter\Controller;
+
+class UserController extends Controller
+{
+    public function index()
+    {
+        $model = new \App\Models\UserModel();
+
+        $data = [
+            'users' => $model->paginate(10),
+            'pager' => $model->pager,
+        ];
+
+        echo view('users/index', $data);
+    }
+}
diff --git a/user_guide_src/source/libraries/pagination/003.php b/user_guide_src/source/libraries/pagination/003.php
new file mode 100644
index 000000000000..f0ea0d90ed76
--- /dev/null
+++ b/user_guide_src/source/libraries/pagination/003.php
@@ -0,0 +1,22 @@
+<?php
+
+// You can specify conditions directly.
+$model = new \App\Models\UserModel();
+
+$data = [
+    'users' => $model->where('ban', 1)->paginate(10),
+    'pager' => $model->pager,
+];
+
+// You can move the conditions to a separate method.
+// Model method
+public function banned()
+{
+    $this->builder()->where('ban', 1);
+    return $this; // This will allow the call chain to be used.
+}
+
+$data = [
+    'users' => $model->banned()->paginate(10),
+    'pager' => $model->pager,
+];
diff --git a/user_guide_src/source/libraries/pagination/004.php b/user_guide_src/source/libraries/pagination/004.php
new file mode 100644
index 000000000000..a61b3c3bad2a
--- /dev/null
+++ b/user_guide_src/source/libraries/pagination/004.php
@@ -0,0 +1,20 @@
+<?php
+
+// In the Controller
+public function index()
+{
+    $userModel = new \App\Models\UserModel();
+    $pageModel = new \App\Models\PageModel();
+
+    $data = [
+        'users' => $userModel->paginate(10, 'group1'),
+        'pages' => $pageModel->paginate(15, 'group2'),
+        'pager' => $userModel->pager,
+    ];
+
+    echo view('users/index', $data);
+}
+
+// In the views:
+<?= $pager->links('group1') ?>
+<?= $pager->simpleLinks('group2') ?>
diff --git a/user_guide_src/source/libraries/pagination/005.php b/user_guide_src/source/libraries/pagination/005.php
new file mode 100644
index 000000000000..149f369b321c
--- /dev/null
+++ b/user_guide_src/source/libraries/pagination/005.php
@@ -0,0 +1,6 @@
+<?php
+
+$userModel = new \App\Models\UserModel();
+$page = 3;
+
+$users = $userModel->paginate(10, 'group1', $page);
diff --git a/user_guide_src/source/libraries/pagination/006.php b/user_guide_src/source/libraries/pagination/006.php
new file mode 100644
index 000000000000..9d754431ce58
--- /dev/null
+++ b/user_guide_src/source/libraries/pagination/006.php
@@ -0,0 +1,3 @@
+<?php
+
+$users = $userModel->paginate(10, 'group1', null, $segment);
diff --git a/user_guide_src/source/libraries/pagination/007.php b/user_guide_src/source/libraries/pagination/007.php
new file mode 100644
index 000000000000..be726a996116
--- /dev/null
+++ b/user_guide_src/source/libraries/pagination/007.php
@@ -0,0 +1,5 @@
+<?php
+
+$pager = service('pager');
+$pager->setPath('path/for/my-group', 'my-group'); // Additionally you could define path for every group.
+$pager->makeLinks($page, $perPage, $total, 'template_name', $segment, 'my-group');
diff --git a/user_guide_src/source/libraries/pagination/008.php b/user_guide_src/source/libraries/pagination/008.php
new file mode 100644
index 000000000000..0b8219ff43e3
--- /dev/null
+++ b/user_guide_src/source/libraries/pagination/008.php
@@ -0,0 +1,4 @@
+<?php
+
+echo $pager->links();
+// Page 3 link: https://domain.tld?search=foo&order=asc&hello=i+am+here&page=3
diff --git a/user_guide_src/source/libraries/pagination/009.php b/user_guide_src/source/libraries/pagination/009.php
new file mode 100644
index 000000000000..6f309ca10552
--- /dev/null
+++ b/user_guide_src/source/libraries/pagination/009.php
@@ -0,0 +1,4 @@
+<?php
+
+echo $pager->only(['search', 'order'])->links();
+// Page 3 link: https://domain.tld?search=foo&order=asc&page=3
diff --git a/user_guide_src/source/libraries/pagination/010.php b/user_guide_src/source/libraries/pagination/010.php
new file mode 100644
index 000000000000..95d27f8e4e3c
--- /dev/null
+++ b/user_guide_src/source/libraries/pagination/010.php
@@ -0,0 +1,6 @@
+<?php
+
+public $templates = [
+    'default_full'   => 'CodeIgniter\Pager\Views\default_full',
+    'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
+];
diff --git a/user_guide_src/source/libraries/pagination/011.php b/user_guide_src/source/libraries/pagination/011.php
new file mode 100644
index 000000000000..86c5e0bcd8b5
--- /dev/null
+++ b/user_guide_src/source/libraries/pagination/011.php
@@ -0,0 +1,3 @@
+<?php
+
+'default_full'   => 'App\Views\Pagers\foundation_full',
diff --git a/user_guide_src/source/libraries/pagination/012.php b/user_guide_src/source/libraries/pagination/012.php
new file mode 100644
index 000000000000..841118b57ae1
--- /dev/null
+++ b/user_guide_src/source/libraries/pagination/012.php
@@ -0,0 +1,3 @@
+<?php
+
+'default_full'   => 'Pagers/foundation_full',
diff --git a/user_guide_src/source/libraries/pagination/013.php b/user_guide_src/source/libraries/pagination/013.php
new file mode 100644
index 000000000000..fa59edbacf9b
--- /dev/null
+++ b/user_guide_src/source/libraries/pagination/013.php
@@ -0,0 +1,7 @@
+<?php
+
+public $templates = [
+    'default_full'   => 'CodeIgniter\Pager\Views\default_full',
+    'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
+    'front_full'     => 'App\Views\Pagers\foundation_full',
+];
diff --git a/user_guide_src/source/libraries/pagination/014.php b/user_guide_src/source/libraries/pagination/014.php
new file mode 100644
index 000000000000..00bdee764c7f
--- /dev/null
+++ b/user_guide_src/source/libraries/pagination/014.php
@@ -0,0 +1,39 @@
+<?php $pager->setSurroundCount(2) ?>
+
+<nav aria-label="Page navigation">
+    <ul class="pagination">
+    <?php if ($pager->hasPrevious()) : ?>
+        <li>
+            <a href="<?= $pager->getFirst() ?>" aria-label="<?= lang('Pager.first') ?>">
+                <span aria-hidden="true"><?= lang('Pager.first') ?></span>
+            </a>
+        </li>
+        <li>
+            <a href="<?= $pager->getPrevious() ?>" aria-label="<?= lang('Pager.previous') ?>">
+                <span aria-hidden="true"><?= lang('Pager.previous') ?></span>
+            </a>
+        </li>
+    <?php endif ?>
+
+    <?php foreach ($pager->links() as $link): ?>
+        <li <?= $link['active'] ? 'class="active"' : '' ?>>
+            <a href="<?= $link['uri'] ?>">
+                <?= $link['title'] ?>
+            </a>
+        </li>
+    <?php endforeach ?>
+
+    <?php if ($pager->hasNext()) : ?>
+        <li>
+            <a href="<?= $pager->getNext() ?>" aria-label="<?= lang('Pager.next') ?>">
+                <span aria-hidden="true"><?= lang('Pager.next') ?></span>
+            </a>
+        </li>
+        <li>
+            <a href="<?= $pager->getLast() ?>" aria-label="<?= lang('Pager.last') ?>">
+                <span aria-hidden="true"><?= lang('Pager.last') ?></span>
+            </a>
+        </li>
+    <?php endif ?>
+    </ul>
+</nav>
diff --git a/user_guide_src/source/libraries/pagination/015.php b/user_guide_src/source/libraries/pagination/015.php
new file mode 100644
index 000000000000..43a8f2624d64
--- /dev/null
+++ b/user_guide_src/source/libraries/pagination/015.php
@@ -0,0 +1,7 @@
+<?php
+
+$link = [
+    'active' => false,
+    'uri'    => 'https://example.com/foo?page=2',
+    'title'  => 1,
+];
diff --git a/user_guide_src/source/libraries/pagination/016.php b/user_guide_src/source/libraries/pagination/016.php
new file mode 100644
index 000000000000..e827bd15a457
--- /dev/null
+++ b/user_guide_src/source/libraries/pagination/016.php
@@ -0,0 +1,37 @@
+<nav aria-label="<?= lang('Pager.pageNavigation') ?>">
+    <ul class="pagination">
+        <?php if ($pager->hasPreviousPage()) : ?>
+            <li>
+                <a href="<?= $pager->getFirst() ?>" aria-label="<?= lang('Pager.first') ?>">
+                    <span aria-hidden="true"><?= lang('Pager.first') ?></span>
+                </a>
+            </li>
+            <li>
+                <a href="<?= $pager->getPreviousPage() ?>" aria-label="<?= lang('Pager.previous') ?>">
+                    <span aria-hidden="true"><?= lang('Pager.previous') ?></span>
+                </a>
+            </li>
+        <?php endif ?>
+
+        <?php foreach ($pager->links() as $link): ?>
+            <li <?= $link['active'] ? 'class="active"' : '' ?>>
+                <a href="<?= $link['uri'] ?>">
+                    <?= $link['title'] ?>
+                </a>
+            </li>
+        <?php endforeach ?>
+
+        <?php if ($pager->hasNextPage()) : ?>
+            <li>
+                <a href="<?= $pager->getNextPage() ?>" aria-label="<?= lang('Pager.next') ?>">
+                    <span aria-hidden="true"><?= lang('Pager.next') ?></span>
+                </a>
+            </li>
+            <li>
+                <a href="<?= $pager->getLast() ?>" aria-label="<?= lang('Pager.last') ?>">
+                    <span aria-hidden="true"><?= lang('Pager.last') ?></span>
+                </a>
+            </li>
+        <?php endif ?>
+    </ul>
+</nav>
diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
index 895d74bee7b3..3657a124317c 100644
--- a/user_guide_src/source/libraries/publisher.rst
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -13,9 +13,10 @@ Loading the Library
 *******************
 
 Because Publisher instances are specific to their source and destination this library is not available
-through ``Services`` but should be instantiated or extended directly. E.g.::
+through ``Services`` but should be instantiated or extended directly. E.g.:
 
-    $publisher = new \CodeIgniter\Publisher\Publisher();
+.. literalinclude:: publisher/001.php
+   :lines: 2-
 
 *****************
 Concept and Usage
@@ -36,43 +37,23 @@ the class and leveraging its discovery with ``spark publish``.
 On Demand
 =========
 
-Access ``Publisher`` directly by instantiating a new instance of the class::
+Access ``Publisher`` directly by instantiating a new instance of the class:
 
-    $publisher = new \CodeIgniter\Publisher\Publisher();
+.. literalinclude:: publisher/001.php
+   :lines: 2-
 
 By default the source and destination will be set to ``ROOTPATH`` and ``FCPATH`` respectively, giving ``Publisher``
 easy access to take any file from your project and make it web-accessible. Alternatively you may pass a new source
-or source and destination into the constructor::
+or source and destination into the constructor:
 
-    use CodeIgniter\Publisher\Publisher;
-    
-    $vendorPublisher = new Publisher(ROOTPATH . 'vendor');
-    $filterPublisher = new Publisher('/path/to/module/Filters', APPPATH . 'Filters');
-
-    // Once the source and destination are set you may start adding relative input files
-    $frameworkPublisher = new Publisher(ROOTPATH . 'vendor/codeigniter4/codeigniter4');
-
-    // All "path" commands are relative to $source
-    $frameworkPublisher->addPath('app/Config/Cookie.php');
-
-    // You may also add from outside the source, but the files will not be merged into subdirectories
-    $frameworkPublisher->addFiles([
-        '/opt/mail/susan',
-        '/opt/mail/ubuntu',
-    ]);
-    $frameworkPublisher->addDirectory(SUPPORTPATH . 'Images');
+.. literalinclude:: publisher/003.php
+   :lines: 2-
 
 Once all the files are staged use one of the output commands (**copy()** or **merge()**) to process the staged files
-to their destination(s)::
-
-    // Place all files into $destination
-    $frameworkPublisher->copy();
+to their destination(s):
 
-    // Place all files into $destination, overwriting existing files
-    $frameworkPublisher->copy(true);
-
-    // Place files into their relative $destination directories, overwriting and saving the boolean result
-    $result = $frameworkPublisher->merge(true);
+.. literalinclude:: publisher/004.php
+   :lines: 2-
 
 See the :ref:`reference` for a full description of available methods.
 
@@ -80,24 +61,16 @@ Automation and Discovery
 ========================
 
 You may have regular publication tasks embedded as part of your application deployment or upkeep. ``Publisher`` leverages
-the powerful ``Autoloader`` to locate any child classes primed for publication::
-
-    use CodeIgniter\CLI\CLI;
-    use CodeIgniter\Publisher\Publisher;
-    
-    foreach (Publisher::discover() as $publisher)
-    {
-        $result = $publisher->publish();
+the powerful ``Autoloader`` to locate any child classes primed for publication:
 
-        if ($result === false) {
-            CLI::error(get_class($publisher) . ' failed to publish!', 'red');
-        }
-    }
+.. literalinclude:: publisher/005.php
+   :lines: 2-
 
 By default ``discover()`` will search for the "Publishers" directory across all namespaces, but you may specify a
-different directory and it will return any child classes found::
+different directory and it will return any child classes found:
 
-    $memePublishers = Publisher::discover('CatGIFs');
+.. literalinclude:: publisher/006.php
+   :lines: 2-
 
 Most of the time you will not need to handle your own discovery, just use the provided "publish" command::
 
@@ -131,92 +104,25 @@ File Sync Example
 
 You want to display a "photo of the day" image on your homepage. You have a feed for daily photos but you
 need to get the actual file into a browsable location in your project at **public/images/daily_photo.jpg**.
-You can set up :doc:`Custom Command </cli/cli_commands>` to run daily that will handle this for you::
-
-    <?php
-
-    namespace App\Commands;
+You can set up :doc:`Custom Command </cli/cli_commands>` to run daily that will handle this for you:
 
-    use CodeIgniter\CLI\BaseCommand;
-    use CodeIgniter\Publisher\Publisher;
-    use Throwable;
-
-    class DailyPhoto extends BaseCommand
-    {
-        protected $group       = 'Publication';
-        protected $name        = 'publish:daily';
-        protected $description = 'Publishes the latest daily photo to the homepage.';
-
-        public function run(array $params)
-        {
-            $publisher = new Publisher('/path/to/photos/', FCPATH . 'assets/images');
-
-            try {
-                $publisher->addPath('daily_photo.jpg')->copy(true); // `true` to enable overwrites
-            } catch (Throwable $e) {
-                $this->showError($e);
-            }
-        }
-    }
+.. literalinclude:: publisher/007.php
 
 Now running ``spark publish:daily`` will keep your homepage's image up-to-date. What if the photo is
 coming from an external API? You can use ``addUri()`` in place of ``addPath()`` to download the remote
-resource and publish it out instead::
+resource and publish it out instead:
 
-    $publisher->addUri('https://example.com/feeds/daily_photo.jpg')->copy(true);
+.. literalinclude:: publisher/008.php
+   :lines: 2-
 
 Asset Dependencies Example
 ==========================
 
 You want to integrate the frontend library "Bootstrap" into your project, but the frequent updates makes it a hassle
 to keep up with. You can create a publication definition in your project to sync frontend assets by extending
-``Publisher`` in your project. So **app/Publishers/BootstrapPublisher.php** might look like this::
-
-    <?php
-    
-    namespace App\Publishers;
-
-    use CodeIgniter\Publisher\Publisher;
-
-    class BootstrapPublisher extends Publisher
-    {
-        /**
-         * Tell Publisher where to get the files.
-         * Since we will use Composer to download
-         * them we point to the "vendor" directory.
-         *
-         * @var string
-         */
-        protected $source = 'vendor/twbs/bootstrap/';
-
-        /**
-         * FCPATH is always the default destination,
-         * but we may want them to go in a sub-folder
-         * to keep things organized.
-         *
-         * @var string
-         */
-        protected $destination = FCPATH . 'bootstrap';
-
-        /**
-         * Use the "publish" method to indicate that this
-         * class is ready to be discovered and automated.
-         *
-         * @return boolean
-         */
-        public function publish(): bool
-        {
-            return $this
-                // Add all the files relative to $source
-                ->addPath('dist')
-
-                // Indicate we only want the minimized versions
-                ->retainPattern('*.min.*')
-
-                // Merge-and-replace to retain the original directory structure
-                ->merge(true);
-        }
-    }
+``Publisher`` in your project. So **app/Publishers/BootstrapPublisher.php** might look like this:
+
+.. literalinclude:: publisher/009.php
 
 Now add the dependency via Composer and call ``spark publish`` to run the publication::
 
@@ -254,50 +160,9 @@ Module Deployment Example
 
 You want to allow developers using your popular authentication module the ability to expand on the default behavior
 of your Migration, Controller, and Model. You can create your own module "publish" command to inject these components
-into an application for use::
-
-    <?php
-
-    namespace Math\Auth\Commands;
-
-    use CodeIgniter\CLI\BaseCommand;
-    use CodeIgniter\Publisher\Publisher;
-    use Throwable;
-
-    class AuthPublish extends BaseCommand
-    {
-        protected $group       = 'Auth';
-        protected $name        = 'auth:publish';
-        protected $description = 'Publish Auth components into the current application.';
-
-        public function run(array $params)
-        {
-            // Use the Autoloader to figure out the module path
-            $source = service('autoloader')->getNamespace('Math\\Auth');
-
-            $publisher = new Publisher($source, APPATH);
-
-            try {
-                // Add only the desired components
-                $publisher->addPaths([
-                    'Controllers',
-                    'Database/Migrations',
-                    'Models',
-                ])->merge(false); // Be careful not to overwrite anything
-            } catch (Throwable $e) {
-                $this->showError($e);
-                return;
-            }
-
-            // If publication succeeded then update namespaces
-            foreach ($publisher->getPublished() as $file) {
-                // Replace the namespace
-                $contents = file_get_contents($file);
-                $contents = str_replace('namespace Math\\Auth', 'namespace ' . APP_NAMESPACE, $contents);
-                file_put_contents($file, $contents);
-            }
-        }
-    }
+into an application for use:
+
+.. literalinclude:: publisher/010.php
 
 Now when your module users run ``php spark auth:publish`` they will have the following added to their project::
 
@@ -370,16 +235,10 @@ Copies all files into the ``$destination``. This does not recreate the directory
 from the current list will end up in the same destination directory. Using ``$replace`` will cause files
 to overwrite when there is already an existing file. Returns success or failure, use ``getPublished()``
 and ``getErrors()`` to troubleshoot failures.
-Be mindful of duplicate basename collisions, for example::
-
-    $publisher = new Publisher('/home/source', '/home/destination');
-    $publisher->addPaths([
-        'pencil/lead.png',
-        'metal/lead.png',
-    ]);
+Be mindful of duplicate basename collisions, for example:
 
-    // This is bad! Only one file will remain at /home/destination/lead.png
-    $publisher->copy(true);
+.. literalinclude:: publisher/011.php
+   :lines: 2-
 
 **merge(bool $replace = true): bool**
 
@@ -390,13 +249,7 @@ to overwrite when there is already an existing file; since directories are merge
 affect other files in the destination. Returns success or failure, use ``getPublished()`` and
 ``getErrors()`` to troubleshoot failures.
 
-Example::
-
-    $publisher = new Publisher('/home/source', '/home/destination');
-    $publisher->addPaths([
-        'pencil/lead.png',
-        'metal/lead.png',
-    ]);
+Example:
 
-    // Results in "/home/destination/pencil/lead.png" and "/home/destination/metal/lead.png"
-    $publisher->merge();
+.. literalinclude:: publisher/012.php
+   :lines: 2-
diff --git a/user_guide_src/source/libraries/publisher/001.php b/user_guide_src/source/libraries/publisher/001.php
new file mode 100644
index 000000000000..6312e0d034f4
--- /dev/null
+++ b/user_guide_src/source/libraries/publisher/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$publisher = new \CodeIgniter\Publisher\Publisher();
diff --git a/user_guide_src/source/libraries/publisher/002.php b/user_guide_src/source/libraries/publisher/002.php
new file mode 100644
index 000000000000..6312e0d034f4
--- /dev/null
+++ b/user_guide_src/source/libraries/publisher/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$publisher = new \CodeIgniter\Publisher\Publisher();
diff --git a/user_guide_src/source/libraries/publisher/003.php b/user_guide_src/source/libraries/publisher/003.php
new file mode 100644
index 000000000000..acfc9717bd09
--- /dev/null
+++ b/user_guide_src/source/libraries/publisher/003.php
@@ -0,0 +1,19 @@
+<?php
+
+use CodeIgniter\Publisher\Publisher;
+
+$vendorPublisher = new Publisher(ROOTPATH . 'vendor');
+$filterPublisher = new Publisher('/path/to/module/Filters', APPPATH . 'Filters');
+
+// Once the source and destination are set you may start adding relative input files
+$frameworkPublisher = new Publisher(ROOTPATH . 'vendor/codeigniter4/codeigniter4');
+
+// All "path" commands are relative to $source
+$frameworkPublisher->addPath('app/Config/Cookie.php');
+
+// You may also add from outside the source, but the files will not be merged into subdirectories
+$frameworkPublisher->addFiles([
+    '/opt/mail/susan',
+    '/opt/mail/ubuntu',
+]);
+$frameworkPublisher->addDirectory(SUPPORTPATH . 'Images');
diff --git a/user_guide_src/source/libraries/publisher/004.php b/user_guide_src/source/libraries/publisher/004.php
new file mode 100644
index 000000000000..f516a8cab4aa
--- /dev/null
+++ b/user_guide_src/source/libraries/publisher/004.php
@@ -0,0 +1,10 @@
+<?php
+
+// Place all files into $destination
+$frameworkPublisher->copy();
+
+// Place all files into $destination, overwriting existing files
+$frameworkPublisher->copy(true);
+
+// Place files into their relative $destination directories, overwriting and saving the boolean result
+$result = $frameworkPublisher->merge(true);
diff --git a/user_guide_src/source/libraries/publisher/005.php b/user_guide_src/source/libraries/publisher/005.php
new file mode 100644
index 000000000000..5d598c3f7d1c
--- /dev/null
+++ b/user_guide_src/source/libraries/publisher/005.php
@@ -0,0 +1,13 @@
+<?php
+
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\Publisher\Publisher;
+
+foreach (Publisher::discover() as $publisher)
+{
+    $result = $publisher->publish();
+
+    if ($result === false) {
+        CLI::error(get_class($publisher) . ' failed to publish!', 'red');
+    }
+}
diff --git a/user_guide_src/source/libraries/publisher/006.php b/user_guide_src/source/libraries/publisher/006.php
new file mode 100644
index 000000000000..9ec20cc403e2
--- /dev/null
+++ b/user_guide_src/source/libraries/publisher/006.php
@@ -0,0 +1,3 @@
+<?php
+
+$memePublishers = Publisher::discover('CatGIFs');
diff --git a/user_guide_src/source/libraries/publisher/007.php b/user_guide_src/source/libraries/publisher/007.php
new file mode 100644
index 000000000000..d56ab2d9294a
--- /dev/null
+++ b/user_guide_src/source/libraries/publisher/007.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Commands;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\Publisher\Publisher;
+use Throwable;
+
+class DailyPhoto extends BaseCommand
+{
+    protected $group       = 'Publication';
+    protected $name        = 'publish:daily';
+    protected $description = 'Publishes the latest daily photo to the homepage.';
+
+    public function run(array $params)
+    {
+        $publisher = new Publisher('/path/to/photos/', FCPATH . 'assets/images');
+
+        try {
+            $publisher->addPath('daily_photo.jpg')->copy(true); // `true` to enable overwrites
+        } catch (Throwable $e) {
+            $this->showError($e);
+        }
+    }
+}
diff --git a/user_guide_src/source/libraries/publisher/008.php b/user_guide_src/source/libraries/publisher/008.php
new file mode 100644
index 000000000000..23467e5b28bf
--- /dev/null
+++ b/user_guide_src/source/libraries/publisher/008.php
@@ -0,0 +1,3 @@
+<?php
+
+$publisher->addUri('https://example.com/feeds/daily_photo.jpg')->copy(true);
diff --git a/user_guide_src/source/libraries/publisher/009.php b/user_guide_src/source/libraries/publisher/009.php
new file mode 100644
index 000000000000..4756956740bd
--- /dev/null
+++ b/user_guide_src/source/libraries/publisher/009.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Publishers;
+
+use CodeIgniter\Publisher\Publisher;
+
+class BootstrapPublisher extends Publisher
+{
+    /**
+     * Tell Publisher where to get the files.
+     * Since we will use Composer to download
+     * them we point to the "vendor" directory.
+     *
+     * @var string
+     */
+    protected $source = 'vendor/twbs/bootstrap/';
+
+    /**
+     * FCPATH is always the default destination,
+     * but we may want them to go in a sub-folder
+     * to keep things organized.
+     *
+     * @var string
+     */
+    protected $destination = FCPATH . 'bootstrap';
+
+    /**
+     * Use the "publish" method to indicate that this
+     * class is ready to be discovered and automated.
+     *
+     * @return boolean
+     */
+    public function publish(): bool
+    {
+        return $this
+            // Add all the files relative to $source
+            ->addPath('dist')
+
+            // Indicate we only want the minimized versions
+            ->retainPattern('*.min.*')
+
+            // Merge-and-replace to retain the original directory structure
+            ->merge(true);
+    }
+}
diff --git a/user_guide_src/source/libraries/publisher/010.php b/user_guide_src/source/libraries/publisher/010.php
new file mode 100644
index 000000000000..3ea9c40e24b6
--- /dev/null
+++ b/user_guide_src/source/libraries/publisher/010.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Math\Auth\Commands;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\Publisher\Publisher;
+use Throwable;
+
+class AuthPublish extends BaseCommand
+{
+    protected $group       = 'Auth';
+    protected $name        = 'auth:publish';
+    protected $description = 'Publish Auth components into the current application.';
+
+    public function run(array $params)
+    {
+        // Use the Autoloader to figure out the module path
+        $source = service('autoloader')->getNamespace('Math\\Auth');
+
+        $publisher = new Publisher($source, APPATH);
+
+        try {
+            // Add only the desired components
+            $publisher->addPaths([
+                'Controllers',
+                'Database/Migrations',
+                'Models',
+            ])->merge(false); // Be careful not to overwrite anything
+        } catch (Throwable $e) {
+            $this->showError($e);
+            return;
+        }
+
+        // If publication succeeded then update namespaces
+        foreach ($publisher->getPublished() as $file) {
+            // Replace the namespace
+            $contents = file_get_contents($file);
+            $contents = str_replace('namespace Math\\Auth', 'namespace ' . APP_NAMESPACE, $contents);
+            file_put_contents($file, $contents);
+        }
+    }
+}
diff --git a/user_guide_src/source/libraries/publisher/011.php b/user_guide_src/source/libraries/publisher/011.php
new file mode 100644
index 000000000000..b48e43282de1
--- /dev/null
+++ b/user_guide_src/source/libraries/publisher/011.php
@@ -0,0 +1,10 @@
+<?php
+
+$publisher = new Publisher('/home/source', '/home/destination');
+$publisher->addPaths([
+    'pencil/lead.png',
+    'metal/lead.png',
+]);
+
+// This is bad! Only one file will remain at /home/destination/lead.png
+$publisher->copy(true);
diff --git a/user_guide_src/source/libraries/publisher/012.php b/user_guide_src/source/libraries/publisher/012.php
new file mode 100644
index 000000000000..32ec11f13b33
--- /dev/null
+++ b/user_guide_src/source/libraries/publisher/012.php
@@ -0,0 +1,10 @@
+<?php
+
+$publisher = new Publisher('/home/source', '/home/destination');
+$publisher->addPaths([
+    'pencil/lead.png',
+    'metal/lead.png',
+]);
+
+// Results in "/home/destination/pencil/lead.png" and "/home/destination/metal/lead.png"
+$publisher->merge();
diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index 08c23d4ff337..d3a2b6cc0785 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -15,9 +15,10 @@ Loading the Library
 If your only interest in loading the library is to handle CSRF protection, then you will never need to load it,
 as it runs as a filter and has no manual interaction.
 
-If you find a case where you do need direct access though, you may load it through the Services file::
+If you find a case where you do need direct access though, you may load it through the Services file:
 
-    $security = \Config\Services::security();
+.. literalinclude:: security/001.php
+   :lines: 2-
 
 .. _cross-site-request-forgery:
 
@@ -44,9 +45,10 @@ You can also use Session based CSRF Protection. It is
 `Synchronizer Token Pattern <https://cheatsheetseries.owasp.org/cheatsheets/Cross-Site_Request_Forgery_Prevention_Cheat_Sheet.html#synchronizer-token-pattern>`_.
 
 You can set to use the Session based CSRF protection by editing the following config parameter value in
-**app/Config/Security.php**::
+**app/Config/Security.php**:
 
-    public $csrfProtection = 'session';
+.. literalinclude:: security/002.php
+   :lines: 2-
 
 Token Randomization
 -------------------
@@ -58,9 +60,10 @@ If you enable it, a random mask is added to the token and used to scramble it.
 .. _`BREACH`: https://en.wikipedia.org/wiki/BREACH
 
 You can enable it by editing the following config parameter value in
-**app/Config/Security.php**::
+**app/Config/Security.php**:
 
-    public $tokenRandomize = true;
+.. literalinclude:: security/003.php
+   :lines: 2-
 
 Token Regeneration
 ------------------
@@ -71,9 +74,10 @@ regeneration of tokens provides stricter security, but may result
 in usability concerns as other tokens become invalid (back/forward
 navigation, multiple tabs/windows, asynchronous actions, etc). You
 may alter this behavior by editing the following config parameter value in
-**app/Config/Security.php**::
+**app/Config/Security.php**:
 
-    public $regenerate  = true;
+.. literalinclude:: security/004.php
+   :lines: 2-
 
 Redirection on Failure
 ----------------------
@@ -85,9 +89,10 @@ setting an ``error`` flash message that you can display to the end user with the
 
 This provides a nicer experience
 than simply crashing. This can be turned off by editing the following config parameter value in
-**app/Config/Security.php**::
+**app/Config/Security.php**:
 
-    public $redirect = false;
+.. literalinclude:: security/005.php
+   :lines: 2-
 
 Even when the redirect value is ``true``, AJAX calls will not redirect, but will throw an error.
 
@@ -95,39 +100,27 @@ Enable CSRF Protection
 ======================
 
 You can enable CSRF protection by altering your **app/Config/Filters.php**
-and enabling the `csrf` filter globally::
+and enabling the `csrf` filter globally:
 
-    public $globals = [
-        'before' => [
-            // 'honeypot',
-            'csrf',
-        ],
-    ];
+.. literalinclude:: security/006.php
+   :lines: 2-
 
 Select URIs can be whitelisted from CSRF protection (for example API
 endpoints expecting externally POSTed content). You can add these URIs
-by adding them as exceptions in the filter::
+by adding them as exceptions in the filter:
 
-    public $globals = [
-        'before' => [
-            'csrf' => ['except' => ['api/record/save']],
-        ],
-    ];
+.. literalinclude:: security/007.php
+   :lines: 2-
 
-Regular expressions are also supported (case-insensitive)::
+Regular expressions are also supported (case-insensitive):
 
-    public $globals = [
-        'before' => [
-            'csrf' => ['except' => ['api/record/[0-9]+']],
-        ],
-    ];
+.. literalinclude:: security/008.php
+   :lines: 2-
 
-It is also possible to enable the CSRF filter only for specific methods::
+It is also possible to enable the CSRF filter only for specific methods:
 
-    public $methods = [
-        'get'  => ['csrf'],
-        'post' => ['csrf'],
-    ];
+.. literalinclude:: security/009.php
+   :lines: 2-
 
 .. Warning:: If you use ``$methods`` filters, you should :ref:`disable auto-routing <use-defined-routes-only>`
     because auto-routing permits any HTTP method to access a controller.
@@ -188,6 +181,6 @@ particularly useful for files that were supplied via user input. The first param
 
 If it is acceptable for the user input to include relative paths, e.g., **file/in/some/approved/folder.txt**, you can set
 the second optional parameter, ``$relativePath`` to ``true``.
-::
 
-    $path = $security->sanitizeFilename($request->getVar('filepath'));
+.. literalinclude:: security/010.php
+   :lines: 2-
diff --git a/user_guide_src/source/libraries/security/001.php b/user_guide_src/source/libraries/security/001.php
new file mode 100644
index 000000000000..fe504ef35a8e
--- /dev/null
+++ b/user_guide_src/source/libraries/security/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$security = \Config\Services::security();
diff --git a/user_guide_src/source/libraries/security/002.php b/user_guide_src/source/libraries/security/002.php
new file mode 100644
index 000000000000..292d5a9410dc
--- /dev/null
+++ b/user_guide_src/source/libraries/security/002.php
@@ -0,0 +1,3 @@
+<?php
+
+public $csrfProtection = 'session';
diff --git a/user_guide_src/source/libraries/security/003.php b/user_guide_src/source/libraries/security/003.php
new file mode 100644
index 000000000000..2d5f7fd89e18
--- /dev/null
+++ b/user_guide_src/source/libraries/security/003.php
@@ -0,0 +1,3 @@
+<?php
+
+public $tokenRandomize = true;
diff --git a/user_guide_src/source/libraries/security/004.php b/user_guide_src/source/libraries/security/004.php
new file mode 100644
index 000000000000..cf3007d83bd5
--- /dev/null
+++ b/user_guide_src/source/libraries/security/004.php
@@ -0,0 +1,3 @@
+<?php
+
+public $regenerate  = true;
diff --git a/user_guide_src/source/libraries/security/005.php b/user_guide_src/source/libraries/security/005.php
new file mode 100644
index 000000000000..80e931c5e387
--- /dev/null
+++ b/user_guide_src/source/libraries/security/005.php
@@ -0,0 +1,3 @@
+<?php
+
+public $redirect = false;
diff --git a/user_guide_src/source/libraries/security/006.php b/user_guide_src/source/libraries/security/006.php
new file mode 100644
index 000000000000..3533227938cd
--- /dev/null
+++ b/user_guide_src/source/libraries/security/006.php
@@ -0,0 +1,8 @@
+<?php
+
+public $globals = [
+    'before' => [
+        // 'honeypot',
+        'csrf',
+    ],
+];
diff --git a/user_guide_src/source/libraries/security/007.php b/user_guide_src/source/libraries/security/007.php
new file mode 100644
index 000000000000..d647d1b8c120
--- /dev/null
+++ b/user_guide_src/source/libraries/security/007.php
@@ -0,0 +1,7 @@
+<?php
+
+public $globals = [
+    'before' => [
+        'csrf' => ['except' => ['api/record/save']],
+    ],
+];
diff --git a/user_guide_src/source/libraries/security/008.php b/user_guide_src/source/libraries/security/008.php
new file mode 100644
index 000000000000..c78d18937b08
--- /dev/null
+++ b/user_guide_src/source/libraries/security/008.php
@@ -0,0 +1,7 @@
+<?php
+
+public $globals = [
+    'before' => [
+        'csrf' => ['except' => ['api/record/[0-9]+']],
+    ],
+];
diff --git a/user_guide_src/source/libraries/security/009.php b/user_guide_src/source/libraries/security/009.php
new file mode 100644
index 000000000000..e2b03e79ba25
--- /dev/null
+++ b/user_guide_src/source/libraries/security/009.php
@@ -0,0 +1,6 @@
+<?php
+
+public $methods = [
+    'get'  => ['csrf'],
+    'post' => ['csrf'],
+];
diff --git a/user_guide_src/source/libraries/security/010.php b/user_guide_src/source/libraries/security/010.php
new file mode 100644
index 000000000000..228df8107fda
--- /dev/null
+++ b/user_guide_src/source/libraries/security/010.php
@@ -0,0 +1,3 @@
+<?php
+
+$path = $security->sanitizeFilename($request->getVar('filepath'));
diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
index cb6e78c25330..889ad559d8bb 100644
--- a/user_guide_src/source/libraries/sessions.rst
+++ b/user_guide_src/source/libraries/sessions.rst
@@ -21,24 +21,26 @@ Initializing a Session
 Sessions will typically run globally with each page load, so the Session
 class should be magically initialized.
 
-To access and initialize the session::
+To access and initialize the session:
 
-    $session = \Config\Services::session($config);
+.. literalinclude:: sessions/001.php
+   :lines: 2-
 
 The ``$config`` parameter is optional - your application configuration.
 If not provided, the services register will instantiate your default
 one.
 
-Once loaded, the Sessions library object will be available using::
+Once loaded, the Sessions library object will be available using:
 
-    $session
+.. literalinclude:: sessions/002.php
+   :lines: 2-
 
 Alternatively, you can use the helper function that will use the default
 configuration options. This version is a little friendlier to read,
 but does not take any configuration options.
-::
 
-    $session = session();
+.. literalinclude:: sessions/003.php
+   :lines: 2-
 
 How do Sessions work?
 =====================
@@ -89,9 +91,9 @@ Locking is not the issue, it is a solution. Your issue is that you still
 have the session open, while you've already processed it and therefore no
 longer need it. So, what you need is to close the session for the
 current request after you no longer need it.
-::
 
-    session_write_close();
+.. literalinclude:: sessions/004.php
+   :lines: 2-
 
 What is Session Data?
 =====================
@@ -115,47 +117,41 @@ Retrieving Session Data
 =======================
 
 Any piece of information from the session array is available through the
-``$_SESSION`` superglobal::
+``$_SESSION`` superglobal:
 
-    $_SESSION['item']
+.. literalinclude:: sessions/005.php
+   :lines: 2-
 
-Or through the conventional accessor method::
+Or through the conventional accessor method:
 
-    $session->get('item');
+.. literalinclude:: sessions/006.php
+   :lines: 2-
 
-Or through the magic getter::
+Or through the magic getter:
 
-    $session->item
+.. literalinclude:: sessions/007.php
+   :lines: 2-
 
-Or even through the session helper method::
+Or even through the session helper method:
 
-    session('item');
+.. literalinclude:: sessions/008.php
+   :lines: 2-
 
 Where ``item`` is the array key corresponding to the item you wish to fetch.
 For example, to assign a previously stored 'name' item to the ``$name``
-variable, you will do this::
-
-    $name = $_SESSION['name'];
-
-    // or:
-
-    $name = $session->name
+variable, you will do this:
 
-    // or:
-
-    $name = $session->get('name');
+.. literalinclude:: sessions/009.php
+   :lines: 2-
 
 .. note:: The ``get()`` method returns null if the item you are trying
     to access does not exist.
 
 If you want to retrieve all of the existing userdata, you can simply
-omit the item key (magic getter only works for single property values)::
-
-    $_SESSION
+omit the item key (magic getter only works for single property values):
 
-    // or:
-
-    $session->get();
+.. literalinclude:: sessions/010.php
+   :lines: 2-
 
 Adding Session Data
 ===================
@@ -170,71 +166,64 @@ variable. Or as a property of ``$session``.
 
 The former userdata method is deprecated,
 but you can pass an array containing your new session data to the
-``set()`` method::
+``set()`` method:
 
-    $session->set($array);
+.. literalinclude:: sessions/011.php
+   :lines: 2-
 
 Where ``$array`` is an associative array containing your new data. Here's
-an example::
-
-    $newdata = [
-        'username'  => 'johndoe',
-        'email'     => 'johndoe@some-site.com',
-        'logged_in' => true,
-    ];
+an example:
 
-    $session->set($newdata);
+.. literalinclude:: sessions/012.php
+   :lines: 2-
 
 If you want to add session data one value at a time, ``set()`` also
-supports this syntax::
+supports this syntax:
 
-    $session->set('some_name', 'some_value');
+.. literalinclude:: sessions/013.php
+   :lines: 2-
 
 If you want to verify that a session value exists, simply check with
-``isset()``::
+``isset()``:
 
-    // returns false if the 'some_name' item doesn't exist or is null,
-    // true otherwise:
-    isset($_SESSION['some_name'])
+.. literalinclude:: sessions/014.php
+   :lines: 2-
 
-Or you can call ``has()``::
+Or you can call ``has()``:
 
-    $session->has('some_name');
+.. literalinclude:: sessions/015.php
+   :lines: 2-
 
 Pushing new value to session data
 =================================
 
 The push method is used to push a new value onto a session value that is an array.
-For instance, if the 'hobbies' key contains an array of hobbies, you can add a new value onto the array like so::
+For instance, if the 'hobbies' key contains an array of hobbies, you can add a new value onto the array like so:
 
-$session->push('hobbies', ['sport'=>'tennis']);
+.. literalinclude:: sessions/016.php
+   :lines: 2-
 
 Removing Session Data
 =====================
 
 Just as with any other variable, unsetting a value in ``$_SESSION`` can be
-done through ``unset()``::
+done through ``unset()``:
 
-    unset($_SESSION['some_name']);
-
-    // or multiple values:
-
-    unset(
-        $_SESSION['some_name'],
-        $_SESSION['another_name']
-    );
+.. literalinclude:: sessions/017.php
+   :lines: 2-
 
 Also, just as ``set()`` can be used to add information to a
 session, ``remove()`` can be used to remove it, by passing the
 session key. For example, if you wanted to remove 'some_name' from your
-session data array::
+session data array:
 
-    $session->remove('some_name');
+.. literalinclude:: sessions/018.php
+   :lines: 2-
 
-This method also accepts an array of item keys to unset::
+This method also accepts an array of item keys to unset:
 
-    $array_items = ['username', 'email'];
-    $session->remove($array_items);
+.. literalinclude:: sessions/019.php
+   :lines: 2-
 
 Flashdata
 =========
@@ -248,44 +237,50 @@ status messages (for example: "Record 2 deleted").
 It should be noted that flashdata variables are regular session variables,
 managed inside the CodeIgniter session handler.
 
-To mark an existing item as "flashdata"::
+To mark an existing item as "flashdata":
 
-    $session->markAsFlashdata('item');
+.. literalinclude:: sessions/020.php
+   :lines: 2-
 
 If you want to mark multiple items as flashdata, simply pass the keys as an
-array::
+array:
 
-    $session->markAsFlashdata(['item', 'item2']);
+.. literalinclude:: sessions/021.php
+   :lines: 2-
 
-To add flashdata::
+To add flashdata:
 
-    $_SESSION['item'] = 'value';
-    $session->markAsFlashdata('item');
+.. literalinclude:: sessions/022.php
+   :lines: 2-
 
-Or alternatively, using the ``setFlashdata()`` method::
+Or alternatively, using the ``setFlashdata()`` method:
 
-    $session->setFlashdata('item', 'value');
+.. literalinclude:: sessions/023.php
+   :lines: 2-
 
 You can also pass an array to ``setFlashdata()``, in the same manner as
 ``set()``.
 
 Reading flashdata variables is the same as reading regular session data
-through ``$_SESSION``::
+through ``$_SESSION``:
 
-    $_SESSION['item']
+.. literalinclude:: sessions/005.php
+   :lines: 2-
 
 .. important:: The ``get()`` method WILL return flashdata items when
     retrieving a single item by key. It will not return flashdata when
     grabbing all userdata from the session, however.
 
 However, if you want to be sure that you're reading "flashdata" (and not
-any other kind), you can also use the ``getFlashdata()`` method::
+any other kind), you can also use the ``getFlashdata()`` method:
 
-    $session->getFlashdata('item');
+.. literalinclude:: sessions/025.php
+   :lines: 2-
 
-Or to get an array with all flashdata, simply omit the key parameter::
+Or to get an array with all flashdata, simply omit the key parameter:
 
-    $session->getFlashdata();
+.. literalinclude:: sessions/026.php
+   :lines: 2-
 
 .. note:: The ``getFlashdata()`` method returns null if the item cannot be
     found.
@@ -294,10 +289,8 @@ If you find that you need to preserve a flashdata variable through an
 additional request, you can do so using the ``keepFlashdata()`` method.
 You can either pass a single item or an array of flashdata items to keep.
 
-::
-
-    $session->keepFlashdata('item');
-    $session->keepFlashdata(['item1', 'item2', 'item3']);
+.. literalinclude:: sessions/027.php
+   :lines: 2-
 
 Tempdata
 ========
@@ -310,73 +303,72 @@ Similarly to flashdata, tempdata variables are managed internally by the
 CodeIgniter session handler.
 
 To mark an existing item as "tempdata", simply pass its key and expiry time
-(in seconds!) to the ``markAsTempdata()`` method::
+(in seconds!) to the ``markAsTempdata()`` method:
 
-    // 'item' will be erased after 300 seconds
-    $session->markAsTempdata('item', 300);
+.. literalinclude:: sessions/028.php
+   :lines: 2-
 
 You can mark multiple items as tempdata in two ways, depending on whether
-you want them all to have the same expiry time or not::
+you want them all to have the same expiry time or not:
 
-    // Both 'item' and 'item2' will expire after 300 seconds
-    $session->markAsTempdata(['item', 'item2'], 300);
+.. literalinclude:: sessions/029.php
+   :lines: 2-
 
-    // 'item' will be erased after 300 seconds, while 'item2'
-    // will do so after only 240 seconds
-    $session->markAsTempdata([
-        'item'    => 300,
-        'item2'    => 240,
-    ]);
+To add tempdata:
 
-To add tempdata::
+.. literalinclude:: sessions/030.php
+   :lines: 2-
 
-    $_SESSION['item'] = 'value';
-    $session->markAsTempdata('item', 300); // Expire in 5 minutes
+Or alternatively, using the ``setTempdata()`` method:
 
-Or alternatively, using the ``setTempdata()`` method::
+.. literalinclude:: sessions/031.php
+   :lines: 2-
 
-    $session->setTempdata('item', 'value', 300);
+You can also pass an array to ``setTempdata()``:
 
-You can also pass an array to ``setTempdata()``::
-
-    $tempdata = ['newuser' => true, 'message' => 'Thanks for joining!'];
-    $session->setTempdata($tempdata, null, $expire);
+.. literalinclude:: sessions/032.php
+   :lines: 2-
 
 .. note:: If the expiration is omitted or set to 0, the default
     time-to-live value of 300 seconds (or 5 minutes) will be used.
 
 To read a tempdata variable, again you can just access it through the
-``$_SESSION`` superglobal array::
+``$_SESSION`` superglobal array:
 
-    $_SESSION['item']
+.. literalinclude:: sessions/005.php
+   :lines: 2-
 
 .. important:: The ``get()`` method WILL return tempdata items when
     retrieving a single item by key. It will not return tempdata when
     grabbing all userdata from the session, however.
 
 Or if you want to be sure that you're reading "tempdata" (and not any
-other kind), you can also use the ``getTempdata()`` method::
+other kind), you can also use the ``getTempdata()`` method:
 
-    $session->getTempdata('item');
+.. literalinclude:: sessions/034.php
+   :lines: 2-
 
-And of course, if you want to retrieve all existing tempdata::
+And of course, if you want to retrieve all existing tempdata:
 
-    $session->getTempdata();
+.. literalinclude:: sessions/035.php
+   :lines: 2-
 
 .. note:: The ``getTempdata()`` method returns null if the item cannot be
     found.
 
 If you need to remove a tempdata value before it expires, you can directly
-unset it from the ``$_SESSION`` array::
+unset it from the ``$_SESSION`` array:
 
-    unset($_SESSION['item']);
+.. literalinclude:: sessions/036.php
+   :lines: 2-
 
 However, this won't remove the marker that makes this specific item to be
 tempdata (it will be invalidated on the next HTTP request), so if you
 intend to reuse that same key in the same request, you'd want to use
-``removeTempdata()``::
+``removeTempdata()``:
 
-    $session->removeTempdata('item');
+.. literalinclude:: sessions/037.php
+   :lines: 2-
 
 Destroying a Session
 ====================
@@ -384,13 +376,10 @@ Destroying a Session
 To clear the current session (for example, during a logout), you may
 simply use either PHP's `session_destroy() <https://www.php.net/session_destroy>`_
 function, or the library's ``destroy()`` method. Both will work in exactly the
-same way::
-
-    session_destroy();
+same way:
 
-    // or
-
-    $session->destroy();
+.. literalinclude:: sessions/038.php
+   :lines: 2-
 
 .. note:: This must be the last session-related operation that you do
     during the same request. All session data (including flashdata and
@@ -399,9 +388,10 @@ same way::
 
 You may also use the ``stop()`` method to completely kill the session
 by removing the old session_id, destroying all data, and destroying
-the cookie that contained the session id::
+the cookie that contained the session id:
 
-    $session->stop();
+.. literalinclude:: sessions/039.php
+   :lines: 2-
 
 Accessing session metadata
 ==========================
@@ -463,7 +453,6 @@ Preference                     Default                                      Opti
     (often the default value of ``1440``). This needs to be changed in
     ``php.ini`` or via ``ini_set()`` as needed.
 
-
 In addition to the values above, the cookie and native drivers apply the
 following configuration values shared by the :doc:`IncomingRequest </incoming/incomingrequest>` and
 :doc:`Security <security>` classes:
@@ -575,10 +564,10 @@ In order to use the 'DatabaseHandler' session driver, you must also create this
 table that we already mentioned and then set it as your
 ``$sessionSavePath`` value.
 For example, if you would like to use 'ci_sessions' as your table name,
-you would do this::
+you would do this:
 
-    public $sessionDriver   = 'CodeIgniter\Session\Handlers\DatabaseHandler';
-    public $sessionSavePath = 'ci_sessions';
+.. literalinclude:: sessions/040.php
+   :lines: 2-
 
 And then of course, create the database table ...
 
@@ -616,9 +605,10 @@ setting**. The examples below work both on MySQL and PostgreSQL::
     ALTER TABLE ci_sessions DROP PRIMARY KEY;
 
 You can choose the Database group to use by adding a new line to the
-**app/Config/App.php** file with the name of the group to use::
+**app/Config/App.php** file with the name of the group to use:
 
-  public $sessionDBGroup = 'groupName';
+.. literalinclude:: sessions/041.php
+   :lines: 2-
 
 If you'd rather not do all of this by hand, you can use the ``session:migration`` command
 from the cli to generate a migration file for you::
@@ -669,10 +659,10 @@ link you to it:
     the link above.
 
 For the most common case however, a simple ``host:port`` pair should be
-sufficient::
+sufficient:
 
-    public $sessionDiver    = 'CodeIgniter\Session\Handlers\RedisHandler';
-    public $sessionSavePath = 'tcp://localhost:6379';
+.. literalinclude:: sessions/042.php
+   :lines: 2-
 
 MemcachedHandler Driver
 =======================
@@ -697,10 +687,10 @@ expire earlier than that time). This happens very rarely, but should be
 considered as it may result in loss of sessions.
 
 The ``$sessionSavePath`` format is fairly straightforward here,
-being just a ``host:port`` pair::
+being just a ``host:port`` pair:
 
-    public $sessionDriver   = 'CodeIgniter\Session\Handlers\MemcachedHandler';
-    public $sessionSavePath = 'localhost:11211';
+.. literalinclude:: sessions/043.php
+   :lines: 2-
 
 Bonus Tip
 ---------
@@ -710,8 +700,7 @@ third colon-separated (``:weight``) value is also supported, but we have
 to note that we haven't tested if that is reliable.
 
 If you want to experiment with this feature (on your own risk), simply
-separate the multiple server paths with commas::
+separate the multiple server paths with commas:
 
-    // localhost will be given higher priority (5) here,
-    // compared to 192.0.2.1 with a weight of 1.
-    public $sessionSavePath = 'localhost:11211:5,192.0.2.1:11211:1';
+.. literalinclude:: sessions/044.php
+   :lines: 2-
diff --git a/user_guide_src/source/libraries/sessions/001.php b/user_guide_src/source/libraries/sessions/001.php
new file mode 100644
index 000000000000..b1fa9aac3530
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$session = \Config\Services::session($config);
diff --git a/user_guide_src/source/libraries/sessions/002.php b/user_guide_src/source/libraries/sessions/002.php
new file mode 100644
index 000000000000..e154d8544546
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$session
diff --git a/user_guide_src/source/libraries/sessions/003.php b/user_guide_src/source/libraries/sessions/003.php
new file mode 100644
index 000000000000..ba2650b4808a
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/003.php
@@ -0,0 +1,3 @@
+<?php
+
+$session = session();
diff --git a/user_guide_src/source/libraries/sessions/004.php b/user_guide_src/source/libraries/sessions/004.php
new file mode 100644
index 000000000000..ed979ddc0738
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/004.php
@@ -0,0 +1,3 @@
+<?php
+
+session_write_close();
diff --git a/user_guide_src/source/libraries/sessions/005.php b/user_guide_src/source/libraries/sessions/005.php
new file mode 100644
index 000000000000..4f09358d5fc8
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/005.php
@@ -0,0 +1,3 @@
+<?php
+
+$_SESSION['item']
diff --git a/user_guide_src/source/libraries/sessions/006.php b/user_guide_src/source/libraries/sessions/006.php
new file mode 100644
index 000000000000..2688d7427618
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/006.php
@@ -0,0 +1,3 @@
+<?php
+
+$session->get('item');
diff --git a/user_guide_src/source/libraries/sessions/007.php b/user_guide_src/source/libraries/sessions/007.php
new file mode 100644
index 000000000000..d3d4aaf2aaf8
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/007.php
@@ -0,0 +1,3 @@
+<?php
+
+$session->item
diff --git a/user_guide_src/source/libraries/sessions/008.php b/user_guide_src/source/libraries/sessions/008.php
new file mode 100644
index 000000000000..ebe59d510994
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/008.php
@@ -0,0 +1,3 @@
+<?php
+
+session('item');
diff --git a/user_guide_src/source/libraries/sessions/009.php b/user_guide_src/source/libraries/sessions/009.php
new file mode 100644
index 000000000000..7c66bb38e442
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/009.php
@@ -0,0 +1,11 @@
+<?php
+
+$name = $_SESSION['name'];
+
+// or:
+
+$name = $session->name
+
+// or:
+
+$name = $session->get('name');
diff --git a/user_guide_src/source/libraries/sessions/010.php b/user_guide_src/source/libraries/sessions/010.php
new file mode 100644
index 000000000000..e723f1b13ddd
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/010.php
@@ -0,0 +1,7 @@
+<?php
+
+$_SESSION
+
+// or:
+
+$session->get();
diff --git a/user_guide_src/source/libraries/sessions/011.php b/user_guide_src/source/libraries/sessions/011.php
new file mode 100644
index 000000000000..b8b949797d22
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/011.php
@@ -0,0 +1,3 @@
+<?php
+
+$session->set($array);
diff --git a/user_guide_src/source/libraries/sessions/012.php b/user_guide_src/source/libraries/sessions/012.php
new file mode 100644
index 000000000000..01bbbe1670b0
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/012.php
@@ -0,0 +1,9 @@
+<?php
+
+$newdata = [
+    'username'  => 'johndoe',
+    'email'     => 'johndoe@some-site.com',
+    'logged_in' => true,
+];
+
+$session->set($newdata);
diff --git a/user_guide_src/source/libraries/sessions/013.php b/user_guide_src/source/libraries/sessions/013.php
new file mode 100644
index 000000000000..0d9c4699281a
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/013.php
@@ -0,0 +1,3 @@
+<?php
+
+$session->set('some_name', 'some_value');
diff --git a/user_guide_src/source/libraries/sessions/014.php b/user_guide_src/source/libraries/sessions/014.php
new file mode 100644
index 000000000000..4cab41e404aa
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/014.php
@@ -0,0 +1,5 @@
+<?php
+
+// returns false if the 'some_name' item doesn't exist or is null,
+// true otherwise:
+isset($_SESSION['some_name'])
diff --git a/user_guide_src/source/libraries/sessions/015.php b/user_guide_src/source/libraries/sessions/015.php
new file mode 100644
index 000000000000..5b00a839dcb8
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/015.php
@@ -0,0 +1,3 @@
+<?php
+
+$session->has('some_name');
diff --git a/user_guide_src/source/libraries/sessions/016.php b/user_guide_src/source/libraries/sessions/016.php
new file mode 100644
index 000000000000..ef48af6552cc
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/016.php
@@ -0,0 +1,3 @@
+<?php
+
+$session->push('hobbies', ['sport'=>'tennis']);
diff --git a/user_guide_src/source/libraries/sessions/017.php b/user_guide_src/source/libraries/sessions/017.php
new file mode 100644
index 000000000000..66a5f8662b39
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/017.php
@@ -0,0 +1,10 @@
+<?php
+
+unset($_SESSION['some_name']);
+
+// or multiple values:
+
+unset(
+    $_SESSION['some_name'],
+    $_SESSION['another_name']
+);
diff --git a/user_guide_src/source/libraries/sessions/018.php b/user_guide_src/source/libraries/sessions/018.php
new file mode 100644
index 000000000000..7c7dbf3ca32a
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/018.php
@@ -0,0 +1,3 @@
+<?php
+
+$session->remove('some_name');
diff --git a/user_guide_src/source/libraries/sessions/019.php b/user_guide_src/source/libraries/sessions/019.php
new file mode 100644
index 000000000000..2ebd4f8a4e5f
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/019.php
@@ -0,0 +1,4 @@
+<?php
+
+$array_items = ['username', 'email'];
+$session->remove($array_items);
diff --git a/user_guide_src/source/libraries/sessions/020.php b/user_guide_src/source/libraries/sessions/020.php
new file mode 100644
index 000000000000..471c5c5fef96
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/020.php
@@ -0,0 +1,3 @@
+<?php
+
+$session->markAsFlashdata('item');
diff --git a/user_guide_src/source/libraries/sessions/021.php b/user_guide_src/source/libraries/sessions/021.php
new file mode 100644
index 000000000000..4be42e7f3a62
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/021.php
@@ -0,0 +1,3 @@
+<?php
+
+$session->markAsFlashdata(['item', 'item2']);
diff --git a/user_guide_src/source/libraries/sessions/022.php b/user_guide_src/source/libraries/sessions/022.php
new file mode 100644
index 000000000000..d87dd8763d34
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/022.php
@@ -0,0 +1,4 @@
+<?php
+
+$_SESSION['item'] = 'value';
+$session->markAsFlashdata('item');
diff --git a/user_guide_src/source/libraries/sessions/023.php b/user_guide_src/source/libraries/sessions/023.php
new file mode 100644
index 000000000000..f22af522ab61
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/023.php
@@ -0,0 +1,3 @@
+<?php
+
+$session->setFlashdata('item', 'value');
diff --git a/user_guide_src/source/libraries/sessions/024.php b/user_guide_src/source/libraries/sessions/024.php
new file mode 100644
index 000000000000..4f09358d5fc8
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/024.php
@@ -0,0 +1,3 @@
+<?php
+
+$_SESSION['item']
diff --git a/user_guide_src/source/libraries/sessions/025.php b/user_guide_src/source/libraries/sessions/025.php
new file mode 100644
index 000000000000..407208d20b4a
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/025.php
@@ -0,0 +1,3 @@
+<?php
+
+$session->getFlashdata('item');
diff --git a/user_guide_src/source/libraries/sessions/026.php b/user_guide_src/source/libraries/sessions/026.php
new file mode 100644
index 000000000000..7c387b5a4fa2
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/026.php
@@ -0,0 +1,3 @@
+<?php
+
+$session->getFlashdata();
diff --git a/user_guide_src/source/libraries/sessions/027.php b/user_guide_src/source/libraries/sessions/027.php
new file mode 100644
index 000000000000..94a299006a5d
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/027.php
@@ -0,0 +1,4 @@
+<?php
+
+$session->keepFlashdata('item');
+$session->keepFlashdata(['item1', 'item2', 'item3']);
diff --git a/user_guide_src/source/libraries/sessions/028.php b/user_guide_src/source/libraries/sessions/028.php
new file mode 100644
index 000000000000..d2ed461826c0
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/028.php
@@ -0,0 +1,4 @@
+<?php
+
+// 'item' will be erased after 300 seconds
+$session->markAsTempdata('item', 300);
diff --git a/user_guide_src/source/libraries/sessions/029.php b/user_guide_src/source/libraries/sessions/029.php
new file mode 100644
index 000000000000..978341190b52
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/029.php
@@ -0,0 +1,11 @@
+<?php
+
+// Both 'item' and 'item2' will expire after 300 seconds
+$session->markAsTempdata(['item', 'item2'], 300);
+
+// 'item' will be erased after 300 seconds, while 'item2'
+// will do so after only 240 seconds
+$session->markAsTempdata([
+    'item'    => 300,
+    'item2'    => 240,
+]);
diff --git a/user_guide_src/source/libraries/sessions/030.php b/user_guide_src/source/libraries/sessions/030.php
new file mode 100644
index 000000000000..d4e8941b5d34
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/030.php
@@ -0,0 +1,4 @@
+<?php
+
+$_SESSION['item'] = 'value';
+$session->markAsTempdata('item', 300); // Expire in 5 minutes
diff --git a/user_guide_src/source/libraries/sessions/031.php b/user_guide_src/source/libraries/sessions/031.php
new file mode 100644
index 000000000000..444c045adae9
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/031.php
@@ -0,0 +1,3 @@
+<?php
+
+$session->setTempdata('item', 'value', 300);
diff --git a/user_guide_src/source/libraries/sessions/032.php b/user_guide_src/source/libraries/sessions/032.php
new file mode 100644
index 000000000000..f7099d76289a
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/032.php
@@ -0,0 +1,4 @@
+<?php
+
+$tempdata = ['newuser' => true, 'message' => 'Thanks for joining!'];
+$session->setTempdata($tempdata, null, $expire);
diff --git a/user_guide_src/source/libraries/sessions/033.php b/user_guide_src/source/libraries/sessions/033.php
new file mode 100644
index 000000000000..4f09358d5fc8
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/033.php
@@ -0,0 +1,3 @@
+<?php
+
+$_SESSION['item']
diff --git a/user_guide_src/source/libraries/sessions/034.php b/user_guide_src/source/libraries/sessions/034.php
new file mode 100644
index 000000000000..e940ed0e6a02
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/034.php
@@ -0,0 +1,3 @@
+<?php
+
+$session->getTempdata('item');
diff --git a/user_guide_src/source/libraries/sessions/035.php b/user_guide_src/source/libraries/sessions/035.php
new file mode 100644
index 000000000000..f44b959eee81
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/035.php
@@ -0,0 +1,3 @@
+<?php
+
+$session->getTempdata();
diff --git a/user_guide_src/source/libraries/sessions/036.php b/user_guide_src/source/libraries/sessions/036.php
new file mode 100644
index 000000000000..f063fa2907f4
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/036.php
@@ -0,0 +1,3 @@
+<?php
+
+unset($_SESSION['item']);
diff --git a/user_guide_src/source/libraries/sessions/037.php b/user_guide_src/source/libraries/sessions/037.php
new file mode 100644
index 000000000000..0c3302fb6db3
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/037.php
@@ -0,0 +1,3 @@
+<?php
+
+$session->removeTempdata('item');
diff --git a/user_guide_src/source/libraries/sessions/038.php b/user_guide_src/source/libraries/sessions/038.php
new file mode 100644
index 000000000000..72c7d5d07602
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/038.php
@@ -0,0 +1,7 @@
+<?php
+
+session_destroy();
+
+// or
+
+$session->destroy();
diff --git a/user_guide_src/source/libraries/sessions/039.php b/user_guide_src/source/libraries/sessions/039.php
new file mode 100644
index 000000000000..7b43795e71e4
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/039.php
@@ -0,0 +1,3 @@
+<?php
+
+$session->stop();
diff --git a/user_guide_src/source/libraries/sessions/040.php b/user_guide_src/source/libraries/sessions/040.php
new file mode 100644
index 000000000000..a3724620886d
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/040.php
@@ -0,0 +1,4 @@
+<?php
+
+public $sessionDriver   = 'CodeIgniter\Session\Handlers\DatabaseHandler';
+public $sessionSavePath = 'ci_sessions';
diff --git a/user_guide_src/source/libraries/sessions/041.php b/user_guide_src/source/libraries/sessions/041.php
new file mode 100644
index 000000000000..88cd3d7030d6
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/041.php
@@ -0,0 +1,3 @@
+<?php
+
+public $sessionDBGroup = 'groupName';
diff --git a/user_guide_src/source/libraries/sessions/042.php b/user_guide_src/source/libraries/sessions/042.php
new file mode 100644
index 000000000000..ab2dbf89153c
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/042.php
@@ -0,0 +1,4 @@
+<?php
+
+public $sessionDiver    = 'CodeIgniter\Session\Handlers\RedisHandler';
+public $sessionSavePath = 'tcp://localhost:6379';
diff --git a/user_guide_src/source/libraries/sessions/043.php b/user_guide_src/source/libraries/sessions/043.php
new file mode 100644
index 000000000000..9a50340f6af7
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/043.php
@@ -0,0 +1,4 @@
+<?php
+
+public $sessionDriver   = 'CodeIgniter\Session\Handlers\MemcachedHandler';
+public $sessionSavePath = 'localhost:11211';
diff --git a/user_guide_src/source/libraries/sessions/044.php b/user_guide_src/source/libraries/sessions/044.php
new file mode 100644
index 000000000000..e188b256cbe1
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/044.php
@@ -0,0 +1,5 @@
+<?php
+
+// localhost will be given higher priority (5) here,
+// compared to 192.0.2.1 with a weight of 1.
+public $sessionSavePath = 'localhost:11211:5,192.0.2.1:11211:1';
diff --git a/user_guide_src/source/libraries/throttler.rst b/user_guide_src/source/libraries/throttler.rst
index cd5a6d8e2898..21583d817d54 100644
--- a/user_guide_src/source/libraries/throttler.rst
+++ b/user_guide_src/source/libraries/throttler.rst
@@ -22,10 +22,10 @@ you tell it how large the bucket is, and how many tokens it can hold and the tim
 
 Let's say we want an action to happen once every second. The first call to the Throttler would look like the following.
 The first parameter is the bucket name, the second parameter the number of tokens the bucket holds, and
-the third being the amount of time it takes the bucket to refill::
+the third being the amount of time it takes the bucket to refill:
 
-    $throttler = \Config\Services::throttler();
-    $throttler->check($name, 60, MINUTE);
+.. literalinclude:: throttler/001.php
+   :lines: 2-
 
 Here we're using one of the :doc:`global constants </general/common_functions>` for the time, to make it a little
 more readable. This says that the bucket allows 60 actions every minute, or 1 action every second.
@@ -50,50 +50,9 @@ The Code
 ========
 
 You could make your own Throttler filter, at **app/Filters/Throttle.php**,
-along the lines of::
-
-    <?php
-
-    namespace App\Filters;
-
-    use CodeIgniter\Filters\FilterInterface;
-    use CodeIgniter\HTTP\RequestInterface;
-    use CodeIgniter\HTTP\ResponseInterface;
-    use Config\Services;
-
-    class Throttle implements FilterInterface
-    {
-        /**
-         * This is a demo implementation of using the Throttler class
-         * to implement rate limiting for your application.
-         *
-         * @param array|null $arguments
-         *
-         * @return mixed
-         */
-        public function before(RequestInterface $request, $arguments = null)
-        {
-            $throttler = Services::throttler();
-
-            // Restrict an IP address to no more than 1 request
-            // per second across the entire site.
-            if ($throttler->check(md5($request->getIPAddress()), 60, MINUTE) === false) {
-                return Services::response()->setStatusCode(429);
-            }
-        }
-
-        /**
-         * We don't have anything to do here.
-         *
-         * @param array|null $arguments
-         *
-         * @return mixed
-         */
-        public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
-        {
-            // ...
-        }
-    }
+along the lines of:
+
+.. literalinclude:: throttler/002.php
 
 When run, this method first grabs an instance of the throttler. Next, it uses the IP address as the bucket name,
 and sets things to limit them to one request per second. If the throttler rejects the check, returning false,
@@ -107,18 +66,15 @@ Applying the Filter
 We don't necessarily need to throttle every page on the site. For many web applications, this makes the most sense
 to apply only to POST requests, though API's might want to limit every request made by a user. In order to apply
 this to incoming requests, you need to edit **/app/Config/Filters.php** and first add an alias to the
-filter::
+filter:
 
-    public $aliases = [
-        ...
-        'throttle' => \App\Filters\Throttle::class,
-    ];
+.. literalinclude:: throttler/003.php
+   :lines: 2-
 
-Next, we assign it to all POST requests made on the site::
+Next, we assign it to all POST requests made on the site:
 
-    public $methods = [
-        'post' => ['throttle'],
-    ];
+.. literalinclude:: throttler/004.php
+   :lines: 2-
 
 .. Warning:: If you use ``$methods`` filters, you should :ref:`disable auto-routing <use-defined-routes-only>`
     because auto-routing permits any HTTP method to access a controller.
diff --git a/user_guide_src/source/libraries/throttler/001.php b/user_guide_src/source/libraries/throttler/001.php
new file mode 100644
index 000000000000..20086d3fc60a
--- /dev/null
+++ b/user_guide_src/source/libraries/throttler/001.php
@@ -0,0 +1,4 @@
+<?php
+
+$throttler = \Config\Services::throttler();
+$throttler->check($name, 60, MINUTE);
diff --git a/user_guide_src/source/libraries/throttler/002.php b/user_guide_src/source/libraries/throttler/002.php
new file mode 100644
index 000000000000..91c89ca83d97
--- /dev/null
+++ b/user_guide_src/source/libraries/throttler/002.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Filters;
+
+use CodeIgniter\Filters\FilterInterface;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+use Config\Services;
+
+class Throttle implements FilterInterface
+{
+    /**
+     * This is a demo implementation of using the Throttler class
+     * to implement rate limiting for your application.
+     *
+     * @param array|null $arguments
+     *
+     * @return mixed
+     */
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        $throttler = Services::throttler();
+
+        // Restrict an IP address to no more than 1 request
+        // per second across the entire site.
+        if ($throttler->check(md5($request->getIPAddress()), 60, MINUTE) === false) {
+            return Services::response()->setStatusCode(429);
+        }
+    }
+
+    /**
+     * We don't have anything to do here.
+     *
+     * @param array|null $arguments
+     *
+     * @return mixed
+     */
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
+    {
+        // ...
+    }
+}
diff --git a/user_guide_src/source/libraries/throttler/003.php b/user_guide_src/source/libraries/throttler/003.php
new file mode 100644
index 000000000000..af756092e30d
--- /dev/null
+++ b/user_guide_src/source/libraries/throttler/003.php
@@ -0,0 +1,6 @@
+<?php
+
+public $aliases = [
+    ...
+    'throttle' => \App\Filters\Throttle::class,
+];
diff --git a/user_guide_src/source/libraries/throttler/004.php b/user_guide_src/source/libraries/throttler/004.php
new file mode 100644
index 000000000000..455874cd5730
--- /dev/null
+++ b/user_guide_src/source/libraries/throttler/004.php
@@ -0,0 +1,5 @@
+<?php
+
+public $methods = [
+    'post' => ['throttle'],
+];
diff --git a/user_guide_src/source/libraries/time.rst b/user_guide_src/source/libraries/time.rst
index 6e55cf87aed3..b8788eee17b7 100644
--- a/user_guide_src/source/libraries/time.rst
+++ b/user_guide_src/source/libraries/time.rst
@@ -19,21 +19,18 @@ Instantiating
 
 There are several ways that a new Time instance can be created. The first is simply to create a new instance
 like any other class. When you do it this way, you can pass in a string representing the desired time. This can
-be any string that PHP's strtotime function can parse::
+be any string that PHP's strtotime function can parse:
 
-    use CodeIgniter\I18n\Time;
-
-    $myTime = new Time('+3 week');
-    $myTime = new Time('now');
+.. literalinclude:: time/001.php
+   :lines: 2-
 
 You can pass in strings representing the timezone and the locale in the second and parameters, respectively. Timezones
 can be any supported by PHP's `DateTimeZone <https://www.php.net/manual/en/timezones.php>`__ class. The locale can be
 any supported by PHP's `Locale <https://www.php.net/manual/en/class.locale.php>`__ class. If no locale or timezone is
 provided, the application defaults will be used.
 
-::
-
-    $myTime = new Time('now', 'America/Chicago', 'en_US');
+.. literalinclude:: time/002.php
+   :lines: 2-
 
 now()
 -----
@@ -42,106 +39,111 @@ The Time class has several helper methods to instantiate the class. The first of
 that returns a new instance set to the current time. You can pass in strings representing the timezone and the locale
 in the second and parameters, respectively. If no locale or timezone is provided, the application defaults will be used.
 
-::
-
-    $myTime = Time::now('America/Chicago', 'en_US');
+.. literalinclude:: time/003.php
+   :lines: 2-
 
 parse()
 -------
 
 This helper method is a static version of the default constructor. It takes a string acceptable as DateTime's
-constructor as the first parameter, a timezone as the second parameter, and the locale as the third parameter.::
+constructor as the first parameter, a timezone as the second parameter, and the locale as the third parameter.:
 
-    $myTime = Time::parse('next Tuesday', 'America/Chicago', 'en_US');
+.. literalinclude:: time/004.php
+   :lines: 2-
 
 today()
 -------
 
 Returns a new instance with the date set to the current date, and the time set to midnight. It accepts strings
-for the timezone and locale in the first and second parameters::
+for the timezone and locale in the first and second parameters:
 
-    $myTime = Time::today('America/Chicago', 'en_US');
+.. literalinclude:: time/005.php
+   :lines: 2-
 
 yesterday()
 -----------
 
 Returns a new instance with the date set to the yesterday's date and the time set to midnight. It accepts strings
-for the timezone and locale in the first and second parameters::
+for the timezone and locale in the first and second parameters:
 
-    $myTime = Time::yesterday('America/Chicago', 'en_US');
+.. literalinclude:: time/006.php
+   :lines: 2-
 
 tomorrow()
 -----------
 
 Returns a new instance with the date set to tomorrow's date and the time set to midnight. It accepts strings
-for the timezone and locale in the first and second parameters::
+for the timezone and locale in the first and second parameters:
 
-    $myTime = Time::tomorrow('America/Chicago', 'en_US');
+.. literalinclude:: time/007.php
+   :lines: 2-
 
 createFromDate()
 ----------------
 
 Given separate inputs for **year**, **month**, and **day**, will return a new instance. If any of these parameters
 are not provided, it will use the current value to fill it in. Accepts strings for the timezone and locale in the
-fourth and fifth parameters::
+fourth and fifth parameters:
 
-    $today       = Time::createFromDate();     // Uses current year, month, and day
-    $anniversary = Time::createFromDate(2018); // Uses current month and day
-    $date        = Time::createFromDate(2018, 3, 15, 'America/Chicago', 'en_US');
+.. literalinclude:: time/008.php
+   :lines: 2-
 
 createFromTime()
 ----------------
 
 Like ``createFromDate()`` except it is only concerned with the **hours**, **minutes**, and **seconds**. Uses the
 current day for the date portion of the Time instance. Accepts strings for the timezone and locale in the
-fourth and fifth parameters::
+fourth and fifth parameters:
 
-    $lunch  = Time::createFromTime(11, 30);     // 11:30 am today
-    $dinner = Time::createFromTime(18, 00, 00); // 6:00 pm today
-    $time   = Time::createFromTime($hour, $minutes, $seconds, $timezone, $locale);
+.. literalinclude:: time/009.php
+   :lines: 2-
 
 create()
 --------
 
 A combination of the previous two methods, takes **year**, **month**, **day**, **hour**, **minutes**, and **seconds**
 as separate parameters. Any value not provided will use the current date and time to determine. Accepts strings for the
-timezone and locale in the fourth and fifth parameters::
+timezone and locale in the fourth and fifth parameters:
 
-    $time = Time::create($year, $month, $day, $hour, $minutes, $seconds, $timezone, $locale);
+.. literalinclude:: time/010.php
+   :lines: 2-
 
 createFromFormat()
 ------------------
 
 This is a replacement for DateTime's method of the same name. This allows the timezone to be set at the same time,
-and returns a ``Time`` instance, instead of DateTime::
+and returns a ``Time`` instance, instead of DateTime:
 
-    $time = Time::createFromFormat('j-M-Y', '15-Feb-2009', 'America/Chicago');
+.. literalinclude:: time/011.php
+   :lines: 2-
 
 createFromTimestamp()
 ---------------------
 
-This method takes a UNIX timestamp and, optionally, the timezone and locale, to create a new Time instance::
+This method takes a UNIX timestamp and, optionally, the timezone and locale, to create a new Time instance:
 
-    $time = Time::createFromTimestamp(1501821586, 'America/Chicago', 'en_US');
+.. literalinclude:: time/012.php
+   :lines: 2-
 
 createFromInstance()
 --------------------
 
 When working with other libraries that provide a DateTime instance, you can use this method to convert that
 to a Time instance, optionally setting the locale. The timezone will be automatically determined from the DateTime
-instance passed in::
+instance passed in:
 
-    $dt   = new DateTime('now');
-    $time = Time::createFromInstance($dt, 'en_US');
+.. literalinclude:: time/013.php
+   :lines: 2-
 
 toDateTime()
 ------------
 
 While not an instantiator, this method is the opposite of the **instance** method, allowing you to convert a Time
 instance into a DateTime instance. This preserves the timezone setting, but loses the locale, since DateTime is
-not aware of locales::
+not aware of locales:
 
-    $datetime = Time::toDateTime();
+.. literalinclude:: time/014.php
+   :lines: 2-
 
 ====================
 Displaying the Value
@@ -157,47 +159,44 @@ toLocalizedString()
 This is the localized version of DateTime's ``format()`` method. Instead of using the values you might be familiar with, though,
 you must use values acceptable to the `IntlDateFormatter <https://www.php.net/manual/en/class.intldateformatter.php>`__ class.
 A full listing of values can be found `here <https://unicode-org.github.io/icu-docs/apidoc/released/icu4c/classSimpleDateFormat.html#details>`__.
-::
 
-    $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
-    echo $time->toLocalizedString('MMM d, yyyy'); // March 9, 2016
+.. literalinclude:: time/015.php
+   :lines: 2-
 
 toDateTimeString()
 ------------------
 
 This is the first of three helper methods to work with the IntlDateFormatter without having to remember their values.
-This will return a string formatted as you would commonly use for datetime columns in a database (Y-m-d H:i:s)::
+This will return a string formatted as you would commonly use for datetime columns in a database (Y-m-d H:i:s):
 
-    $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
-    echo $time->toDateTimeString(); // 2016-03-09 12:00:00
+.. literalinclude:: time/016.php
+   :lines: 2-
 
 toDateString()
 --------------
 
-Displays just the date portion of the Time::
+Displays just the date portion of the Time:
 
-    $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
-    echo $time->toDateString(); // 2016-03-09
+.. literalinclude:: time/017.php
+   :lines: 2-
 
 toTimeString()
 --------------
 
-Displays just the time portion of the value::
+Displays just the time portion of the value:
 
-    $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
-    echo $time->toTimeString(); // 12:00:00
+.. literalinclude:: time/018.php
+   :lines: 2-
 
 humanize()
 ----------
 
 This methods returns a string that displays the difference between the current date/time and the instance in a
 human readable format that is geared towards being easily understood. It can create strings like '3 hours ago',
-'in 1 month', etc::
-
-    // Assume current time is: March 10, 2017 (America/Chicago)
-    $time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
+'in 1 month', etc:
 
-    echo $time->humanize(); // 1 year ago
+.. literalinclude:: time/019.php
+   :lines: 2-
 
 The exact time displayed is determined in the following manner:
 
@@ -230,96 +229,65 @@ like ``getYear()`` can also be accessed through ``$time->year``, and so on.
 Getters
 -------
 
-The following basic getters exist::
-
-    $time = Time::parse('August 12, 2016 4:15:23pm');
-
-    echo $time->getYear();   // 2016
-    echo $time->getMonth();  // 8
-    echo $time->getDay();    // 12
-    echo $time->getHour();   // 16
-    echo $time->getMinute(); // 15
-    echo $time->getSecond(); // 23
-
-    echo $time->year;   // 2016
-    echo $time->month;  // 8
-    echo $time->day;    // 12
-    echo $time->hour;   // 16
-    echo $time->minute; // 15
-    echo $time->second; // 23
+The following basic getters exist:
 
-In addition to these, a number of methods exist to provide additional information about the date::
+.. literalinclude:: time/020.php
+   :lines: 2-
 
-    $time = Time::parse('August 12, 2016 4:15:23pm');
+In addition to these, a number of methods exist to provide additional information about the date:
 
-    echo $time->getDayOfWeek();   // 6 - but may vary based on locale's starting day of the week
-    echo $time->getDayOfYear();   // 225
-    echo $time->getWeekOfMonth(); // 2
-    echo $time->getWeekOfYear();  // 33
-    echo $time->getTimestamp();   // 1471018523 - UNIX timestamp
-    echo $time->getQuarter();     // 3
-
-    echo $time->dayOfWeek;   // 6
-    echo $time->dayOfYear;   // 225
-    echo $time->weekOfMonth; // 2
-    echo $time->weekOfYear;  // 33
-    echo $time->timestamp;   // 1471018523
-    echo $time->quarter;     // 3
+.. literalinclude:: time/021.php
+   :lines: 2-
 
 getAge()
 --------
 
 Returns the age, in years, of between the Time's instance and the current time. Perfect for checking
-the age of someone based on their birthday::
-
-    $time = Time::parse('5 years ago');
+the age of someone based on their birthday:
 
-    echo $time->getAge(); // 5
-    echo $time->age;      // 5
+.. literalinclude:: time/022.php
+   :lines: 2-
 
 getDST()
 --------
 
-Returns boolean true/false based on whether the Time instance is currently observing Daylight Savings Time::
+Returns boolean true/false based on whether the Time instance is currently observing Daylight Savings Time:
 
-    echo Time::createFromDate(2012, 1, 1)->getDst(); // false
-    echo Time::createFromDate(2012, 9, 1)->dst;      // true
+.. literalinclude:: time/023.php
+   :lines: 2-
 
 getLocal()
 ----------
 
-Returns boolean true if the Time instance is in the same timezone as the application is currently running in::
+Returns boolean true if the Time instance is in the same timezone as the application is currently running in:
 
-    echo Time::now()->getLocal();    // true
-    echo Time::now('Europe/London'); // false
+.. literalinclude:: time/024.php
+   :lines: 2-
 
 getUtc()
 --------
 
-Returns boolean true if the Time instance is in UTC time::
+Returns boolean true if the Time instance is in UTC time:
 
-    echo Time::now('America/Chicago')->getUtc(); // false
-    echo Time::now('UTC')->utc;                  // true
+.. literalinclude:: time/025.php
+   :lines: 2-
 
 getTimezone()
 -------------
 
 Returns a new `DateTimeZone <https://www.php.net/manual/en/class.datetimezone.php>`__ object set the timezone of the Time
-instance::
-
-    $tz = Time::now()->getTimezone();
-    $tz = Time::now()->timezone;
+instance:
 
-    echo $tz->getName();
-    echo $tz->getOffset();
+.. literalinclude:: time/026.php
+   :lines: 2-
 
 getTimezoneName()
 -----------------
 
-Returns the full `timezone string <https://www.php.net/manual/en/timezones.php>`__ of the Time instance::
+Returns the full `timezone string <https://www.php.net/manual/en/timezones.php>`__ of the Time instance:
 
-    echo Time::now('America/Chicago')->getTimezoneName(); // America/Chicago
-    echo Time::now('Europe/London')->timezoneName;        // Europe/London
+.. literalinclude:: time/027.php
+   :lines: 2-
 
 Setters
 =======
@@ -331,41 +299,24 @@ thrown.
 
 .. note:: All setters will throw an InvalidArgumentException if the value is out of range.
 
-::
-
-    $time = $time->setYear(2017);
-    $time = $time->setMonth(4);       // April
-    $time = $time->setMonth('April');
-    $time = $time->setMonth('Feb');   // February
-    $time = $time->setDay(25);
-    $time = $time->setHour(14);       // 2:00 pm
-    $time = $time->setMinute(30);
-    $time = $time->setSecond(54);
+.. literalinclude:: time/028.php
+   :lines: 2-
 
 setTimezone()
 -------------
 
-Converts the time from it's current timezone into the new one::
-
-    $time  = Time::parse('13 May 2020 10:00', 'America/Chicago');
-    $time2 = $time->setTimezone('Europe/London'); // Returns new instance converted to new timezone
-
-    echo $time->getTimezoneName();  // American/Chicago
-    echo $time2->getTimezoneName(); // Europe/London
+Converts the time from it's current timezone into the new one:
 
-    echo $time->toDateTimeString();  // 2020-05-13 10:00:00
-    echo $time2->toDateTimeString(); // 2020-05-13 18:00:00
+.. literalinclude:: time/029.php
+   :lines: 2-
 
 setTimestamp()
 --------------
 
-Returns a new instance with the date set to the new timestamp::
+Returns a new instance with the date set to the new timestamp:
 
-    $time = Time::parse('May 10, 2017', 'America/Chicago');
-    $time2 = $time->setTimestamp(strtotime('April 1, 2017'));
-
-    echo $time->toDateTimeString();  // 2017-05-10 00:00:00
-    echo $time2->toDateTimeString(); // 2017-04-01 00:00:00
+.. literalinclude:: time/030.php
+   :lines: 2-
 
 Modifying the Value
 ===================
@@ -373,21 +324,8 @@ Modifying the Value
 The following methods allow you to modify the date by adding or subtracting values to the current Time. This will not
 modify the existing Time instance, but will return a new instance.
 
-::
-
-    $time = $time->addSeconds(23);
-    $time = $time->addMinutes(15);
-    $time = $time->addHours(12);
-    $time = $time->addDays(21);
-    $time = $time->addMonths(14);
-    $time = $time->addYears(5);
-
-    $time = $time->subSeconds(23);
-    $time = $time->subMinutes(15);
-    $time = $time->subHours(12);
-    $time = $time->subDays(21);
-    $time = $time->subMonths(14);
-    $time = $time->subYears(5);
+.. literalinclude:: time/031.php
+   :lines: 2-
 
 Comparing Two Times
 ===================
@@ -400,113 +338,82 @@ equals()
 
 Determines if the datetime passed in is equal to the current instance. Equal in this case means that they represent the
 same moment in time, and are not required to be in the same timezone, as both times are converted to UTC and compared
-that way::
+that way:
 
-    $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
-    $time2 = Time::parse('January 11, 2017 03:50:00', 'Europe/London');
-
-    $time1->equals($time2); // true
+.. literalinclude:: time/032.php
+   :lines: 2-
 
 The value being tested against can be a Time instance, a DateTime instance, or a string with the full date time in
 a manner that a new DateTime instance can understand. When passing a string as the first parameter, you can pass
-a timezone string in as the second parameter. If no timezone is given, the system default will be used::
+a timezone string in as the second parameter. If no timezone is given, the system default will be used:
 
-    $time1->equals('January 11, 2017 03:50:00', 'Europe/London'); // true
+.. literalinclude:: time/033.php
+   :lines: 2-
 
 sameAs()
 --------
 
 This is identical to the ``equals()`` method, except that it only returns true when the date, time, AND timezone are
-all identical::
-
-    $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
-    $time2 = Time::parse('January 11, 2017 03:50:00', 'Europe/London');
+all identical:
 
-    $time1->sameAs($time2); // false
-    $time2->sameAs('January 10, 2017 21:50:00', 'America/Chicago'); // true
+.. literalinclude:: time/034.php
+   :lines: 2-
 
 isBefore()
 ----------
 
 Checks if the passed in time is before the current instance. The comparison is done against the UTC versions of
-both times::
-
-    $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
-    $time2 = Time::parse('January 11, 2017 03:50:00', 'America/Chicago');
+both times:
 
-    $time1->isBefore($time2); // true
-    $time2->isBefore($time1); // false
+.. literalinclude:: time/035.php
+   :lines: 2-
 
 The value being tested against can be a Time instance, a DateTime instance, or a string with the full date time in
 a manner that a new DateTime instance can understand. When passing a string as the first parameter, you can pass
-a timezone string in as the second parameter. If no timezone is given, the system default will be used::
+a timezone string in as the second parameter. If no timezone is given, the system default will be used:
 
-    $time1->isBefore('March 15, 2013', 'America/Chicago'); // false
+.. literalinclude:: time/036.php
+   :lines: 2-
 
 isAfter()
 ---------
 
-Works exactly the same as ``isBefore()`` except checks if the time is after the time passed in::
+Works exactly the same as ``isBefore()`` except checks if the time is after the time passed in:
 
-    $time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
-    $time2 = Time::parse('January 11, 2017 03:50:00', 'America/Chicago');
-
-    $time1->isAfter($time2); // false
-    $time2->isAfter($time1); // true
+.. literalinclude:: time/037.php
+   :lines: 2-
 
 Viewing Differences
 ===================
 
 To compare two Times directly, you would use the ``difference()`` method, which returns a ``CodeIgniter\I18n\TimeDifference``
 instance. The first parameter is either a Time instance, a DateTime instance, or a string with the date/time. If
-a string is passed in the first parameter, the second parameter can be a timezone string::
-
-    $time = Time::parse('March 10, 2017', 'America/Chicago');
+a string is passed in the first parameter, the second parameter can be a timezone string:
 
-    $diff = $time->difference(Time::now());
-    $diff = $time->difference(new DateTime('July 4, 1975', 'America/Chicago');
-    $diff = $time->difference('July 4, 1975 13:32:05', 'America/Chicago');
+.. literalinclude:: time/038.php
+   :lines: 2-
 
 Once you have the TimeDifference instance, you have several methods you can use to find information about the difference
 between the two times. The value returned will be negative if it was in the past, or positive if in the future from
-the original time::
-
-    $current = Time::parse('March 10, 2017', 'America/Chicago');
-    $test    = Time::parse('March 10, 2010', 'America/Chicago');
+the original time:
 
-    $diff = $current->difference($test);
+.. literalinclude:: time/039.php
+   :lines: 2-
 
-    echo $diff->getYears();   // -7
-    echo $diff->getMonths();  // -84
-    echo $diff->getWeeks();   // -365
-    echo $diff->getDays();    // -2557
-    echo $diff->getHours();   // -61368
-    echo $diff->getMinutes(); // -3682080
-    echo $diff->getSeconds(); // -220924800
+You can use either ``getX()`` methods, or access the calculate values as if they were properties:
 
-You can use either ``getX()`` methods, or access the calculate values as if they were properties::
-
-    echo $diff->years;   // -7
-    echo $diff->months;  // -84
-    echo $diff->weeks;   // -365
-    echo $diff->days;    // -2557
-    echo $diff->hours;   // -61368
-    echo $diff->minutes; // -3682080
-    echo $diff->seconds; // -220924800
+.. literalinclude:: time/040.php
+   :lines: 2-
 
 humanize()
 ----------
 
 Much like Time's ``humanize()`` method, this returns a string that displays the difference between the times in a
 human readable format that is geared towards being easily understood. It can create strings like '3 hours ago',
-'in 1 month', etc. The biggest differences are in how very recent dates are handled::
-
-    $current = Time::parse('March 10, 2017', 'America/Chicago')
-    $test    = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
-
-    $diff = $current->difference($test)
+'in 1 month', etc. The biggest differences are in how very recent dates are handled:
 
-    echo $diff->humanize(); // 1 year ago
+.. literalinclude:: time/041.php
+   :lines: 2-
 
 The exact time displayed is determined in the following manner:
 
diff --git a/user_guide_src/source/libraries/time/001.php b/user_guide_src/source/libraries/time/001.php
new file mode 100644
index 000000000000..ba7e4d3b36bc
--- /dev/null
+++ b/user_guide_src/source/libraries/time/001.php
@@ -0,0 +1,6 @@
+<?php
+
+use CodeIgniter\I18n\Time;
+
+$myTime = new Time('+3 week');
+$myTime = new Time('now');
diff --git a/user_guide_src/source/libraries/time/002.php b/user_guide_src/source/libraries/time/002.php
new file mode 100644
index 000000000000..46b84050adc9
--- /dev/null
+++ b/user_guide_src/source/libraries/time/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$myTime = new Time('now', 'America/Chicago', 'en_US');
diff --git a/user_guide_src/source/libraries/time/003.php b/user_guide_src/source/libraries/time/003.php
new file mode 100644
index 000000000000..4178f420bdd5
--- /dev/null
+++ b/user_guide_src/source/libraries/time/003.php
@@ -0,0 +1,3 @@
+<?php
+
+$myTime = Time::now('America/Chicago', 'en_US');
diff --git a/user_guide_src/source/libraries/time/004.php b/user_guide_src/source/libraries/time/004.php
new file mode 100644
index 000000000000..1d31920a6031
--- /dev/null
+++ b/user_guide_src/source/libraries/time/004.php
@@ -0,0 +1,3 @@
+<?php
+
+$myTime = Time::parse('next Tuesday', 'America/Chicago', 'en_US');
diff --git a/user_guide_src/source/libraries/time/005.php b/user_guide_src/source/libraries/time/005.php
new file mode 100644
index 000000000000..8f820510cf92
--- /dev/null
+++ b/user_guide_src/source/libraries/time/005.php
@@ -0,0 +1,3 @@
+<?php
+
+$myTime = Time::today('America/Chicago', 'en_US');
diff --git a/user_guide_src/source/libraries/time/006.php b/user_guide_src/source/libraries/time/006.php
new file mode 100644
index 000000000000..79ec74a63519
--- /dev/null
+++ b/user_guide_src/source/libraries/time/006.php
@@ -0,0 +1,3 @@
+<?php
+
+$myTime = Time::yesterday('America/Chicago', 'en_US');
diff --git a/user_guide_src/source/libraries/time/007.php b/user_guide_src/source/libraries/time/007.php
new file mode 100644
index 000000000000..03eacf76f313
--- /dev/null
+++ b/user_guide_src/source/libraries/time/007.php
@@ -0,0 +1,3 @@
+<?php
+
+$myTime = Time::tomorrow('America/Chicago', 'en_US');
diff --git a/user_guide_src/source/libraries/time/008.php b/user_guide_src/source/libraries/time/008.php
new file mode 100644
index 000000000000..d145eabdea83
--- /dev/null
+++ b/user_guide_src/source/libraries/time/008.php
@@ -0,0 +1,5 @@
+<?php
+
+$today       = Time::createFromDate();     // Uses current year, month, and day
+$anniversary = Time::createFromDate(2018); // Uses current month and day
+$date        = Time::createFromDate(2018, 3, 15, 'America/Chicago', 'en_US');
diff --git a/user_guide_src/source/libraries/time/009.php b/user_guide_src/source/libraries/time/009.php
new file mode 100644
index 000000000000..5bff03093c94
--- /dev/null
+++ b/user_guide_src/source/libraries/time/009.php
@@ -0,0 +1,5 @@
+<?php
+
+$lunch  = Time::createFromTime(11, 30);     // 11:30 am today
+$dinner = Time::createFromTime(18, 00, 00); // 6:00 pm today
+$time   = Time::createFromTime($hour, $minutes, $seconds, $timezone, $locale);
diff --git a/user_guide_src/source/libraries/time/010.php b/user_guide_src/source/libraries/time/010.php
new file mode 100644
index 000000000000..aa9b0f5d7d1f
--- /dev/null
+++ b/user_guide_src/source/libraries/time/010.php
@@ -0,0 +1,3 @@
+<?php
+
+$time = Time::create($year, $month, $day, $hour, $minutes, $seconds, $timezone, $locale);
diff --git a/user_guide_src/source/libraries/time/011.php b/user_guide_src/source/libraries/time/011.php
new file mode 100644
index 000000000000..912fb0666fa6
--- /dev/null
+++ b/user_guide_src/source/libraries/time/011.php
@@ -0,0 +1,3 @@
+<?php
+
+$time = Time::createFromFormat('j-M-Y', '15-Feb-2009', 'America/Chicago');
diff --git a/user_guide_src/source/libraries/time/012.php b/user_guide_src/source/libraries/time/012.php
new file mode 100644
index 000000000000..951717d05db6
--- /dev/null
+++ b/user_guide_src/source/libraries/time/012.php
@@ -0,0 +1,3 @@
+<?php
+
+$time = Time::createFromTimestamp(1501821586, 'America/Chicago', 'en_US');
diff --git a/user_guide_src/source/libraries/time/013.php b/user_guide_src/source/libraries/time/013.php
new file mode 100644
index 000000000000..87d19cbb48fb
--- /dev/null
+++ b/user_guide_src/source/libraries/time/013.php
@@ -0,0 +1,4 @@
+<?php
+
+$dt   = new DateTime('now');
+$time = Time::createFromInstance($dt, 'en_US');
diff --git a/user_guide_src/source/libraries/time/014.php b/user_guide_src/source/libraries/time/014.php
new file mode 100644
index 000000000000..62332644e388
--- /dev/null
+++ b/user_guide_src/source/libraries/time/014.php
@@ -0,0 +1,3 @@
+<?php
+
+$datetime = Time::toDateTime();
diff --git a/user_guide_src/source/libraries/time/015.php b/user_guide_src/source/libraries/time/015.php
new file mode 100644
index 000000000000..959309b33c92
--- /dev/null
+++ b/user_guide_src/source/libraries/time/015.php
@@ -0,0 +1,4 @@
+<?php
+
+$time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
+echo $time->toLocalizedString('MMM d, yyyy'); // March 9, 2016
diff --git a/user_guide_src/source/libraries/time/016.php b/user_guide_src/source/libraries/time/016.php
new file mode 100644
index 000000000000..32fa8a8fe83f
--- /dev/null
+++ b/user_guide_src/source/libraries/time/016.php
@@ -0,0 +1,4 @@
+<?php
+
+$time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
+echo $time->toDateTimeString(); // 2016-03-09 12:00:00
diff --git a/user_guide_src/source/libraries/time/017.php b/user_guide_src/source/libraries/time/017.php
new file mode 100644
index 000000000000..5ff0734c8add
--- /dev/null
+++ b/user_guide_src/source/libraries/time/017.php
@@ -0,0 +1,4 @@
+<?php
+
+$time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
+echo $time->toDateString(); // 2016-03-09
diff --git a/user_guide_src/source/libraries/time/018.php b/user_guide_src/source/libraries/time/018.php
new file mode 100644
index 000000000000..4d0fcaf8c216
--- /dev/null
+++ b/user_guide_src/source/libraries/time/018.php
@@ -0,0 +1,4 @@
+<?php
+
+$time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
+echo $time->toTimeString(); // 12:00:00
diff --git a/user_guide_src/source/libraries/time/019.php b/user_guide_src/source/libraries/time/019.php
new file mode 100644
index 000000000000..50088537061c
--- /dev/null
+++ b/user_guide_src/source/libraries/time/019.php
@@ -0,0 +1,6 @@
+<?php
+
+// Assume current time is: March 10, 2017 (America/Chicago)
+$time = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
+
+echo $time->humanize(); // 1 year ago
diff --git a/user_guide_src/source/libraries/time/020.php b/user_guide_src/source/libraries/time/020.php
new file mode 100644
index 000000000000..8d83bcaf5747
--- /dev/null
+++ b/user_guide_src/source/libraries/time/020.php
@@ -0,0 +1,17 @@
+<?php
+
+$time = Time::parse('August 12, 2016 4:15:23pm');
+
+echo $time->getYear();   // 2016
+echo $time->getMonth();  // 8
+echo $time->getDay();    // 12
+echo $time->getHour();   // 16
+echo $time->getMinute(); // 15
+echo $time->getSecond(); // 23
+
+echo $time->year;   // 2016
+echo $time->month;  // 8
+echo $time->day;    // 12
+echo $time->hour;   // 16
+echo $time->minute; // 15
+echo $time->second; // 23
diff --git a/user_guide_src/source/libraries/time/021.php b/user_guide_src/source/libraries/time/021.php
new file mode 100644
index 000000000000..a3e0f128c5d7
--- /dev/null
+++ b/user_guide_src/source/libraries/time/021.php
@@ -0,0 +1,17 @@
+<?php
+
+$time = Time::parse('August 12, 2016 4:15:23pm');
+
+echo $time->getDayOfWeek();   // 6 - but may vary based on locale's starting day of the week
+echo $time->getDayOfYear();   // 225
+echo $time->getWeekOfMonth(); // 2
+echo $time->getWeekOfYear();  // 33
+echo $time->getTimestamp();   // 1471018523 - UNIX timestamp
+echo $time->getQuarter();     // 3
+
+echo $time->dayOfWeek;   // 6
+echo $time->dayOfYear;   // 225
+echo $time->weekOfMonth; // 2
+echo $time->weekOfYear;  // 33
+echo $time->timestamp;   // 1471018523
+echo $time->quarter;     // 3
diff --git a/user_guide_src/source/libraries/time/022.php b/user_guide_src/source/libraries/time/022.php
new file mode 100644
index 000000000000..facfdc5a9d02
--- /dev/null
+++ b/user_guide_src/source/libraries/time/022.php
@@ -0,0 +1,6 @@
+<?php
+
+$time = Time::parse('5 years ago');
+
+echo $time->getAge(); // 5
+echo $time->age;      // 5
diff --git a/user_guide_src/source/libraries/time/023.php b/user_guide_src/source/libraries/time/023.php
new file mode 100644
index 000000000000..970aaad45d76
--- /dev/null
+++ b/user_guide_src/source/libraries/time/023.php
@@ -0,0 +1,4 @@
+<?php
+
+echo Time::createFromDate(2012, 1, 1)->getDst(); // false
+echo Time::createFromDate(2012, 9, 1)->dst;      // true
diff --git a/user_guide_src/source/libraries/time/024.php b/user_guide_src/source/libraries/time/024.php
new file mode 100644
index 000000000000..1919e1d097cf
--- /dev/null
+++ b/user_guide_src/source/libraries/time/024.php
@@ -0,0 +1,4 @@
+<?php
+
+echo Time::now()->getLocal();    // true
+echo Time::now('Europe/London'); // false
diff --git a/user_guide_src/source/libraries/time/025.php b/user_guide_src/source/libraries/time/025.php
new file mode 100644
index 000000000000..b25d5de4aef9
--- /dev/null
+++ b/user_guide_src/source/libraries/time/025.php
@@ -0,0 +1,4 @@
+<?php
+
+echo Time::now('America/Chicago')->getUtc(); // false
+echo Time::now('UTC')->utc;                  // true
diff --git a/user_guide_src/source/libraries/time/026.php b/user_guide_src/source/libraries/time/026.php
new file mode 100644
index 000000000000..030102f72d70
--- /dev/null
+++ b/user_guide_src/source/libraries/time/026.php
@@ -0,0 +1,7 @@
+<?php
+
+$tz = Time::now()->getTimezone();
+$tz = Time::now()->timezone;
+
+echo $tz->getName();
+echo $tz->getOffset();
diff --git a/user_guide_src/source/libraries/time/027.php b/user_guide_src/source/libraries/time/027.php
new file mode 100644
index 000000000000..dde3a39bec92
--- /dev/null
+++ b/user_guide_src/source/libraries/time/027.php
@@ -0,0 +1,4 @@
+<?php
+
+echo Time::now('America/Chicago')->getTimezoneName(); // America/Chicago
+echo Time::now('Europe/London')->timezoneName;        // Europe/London
diff --git a/user_guide_src/source/libraries/time/028.php b/user_guide_src/source/libraries/time/028.php
new file mode 100644
index 000000000000..97a3c26764d3
--- /dev/null
+++ b/user_guide_src/source/libraries/time/028.php
@@ -0,0 +1,10 @@
+<?php
+
+$time = $time->setYear(2017);
+$time = $time->setMonth(4);       // April
+$time = $time->setMonth('April');
+$time = $time->setMonth('Feb');   // February
+$time = $time->setDay(25);
+$time = $time->setHour(14);       // 2:00 pm
+$time = $time->setMinute(30);
+$time = $time->setSecond(54);
diff --git a/user_guide_src/source/libraries/time/029.php b/user_guide_src/source/libraries/time/029.php
new file mode 100644
index 000000000000..d65f408fe05d
--- /dev/null
+++ b/user_guide_src/source/libraries/time/029.php
@@ -0,0 +1,10 @@
+<?php
+
+$time  = Time::parse('13 May 2020 10:00', 'America/Chicago');
+$time2 = $time->setTimezone('Europe/London'); // Returns new instance converted to new timezone
+
+echo $time->getTimezoneName();  // American/Chicago
+echo $time2->getTimezoneName(); // Europe/London
+
+echo $time->toDateTimeString();  // 2020-05-13 10:00:00
+echo $time2->toDateTimeString(); // 2020-05-13 18:00:00
diff --git a/user_guide_src/source/libraries/time/030.php b/user_guide_src/source/libraries/time/030.php
new file mode 100644
index 000000000000..929a9f272e28
--- /dev/null
+++ b/user_guide_src/source/libraries/time/030.php
@@ -0,0 +1,7 @@
+<?php
+
+$time = Time::parse('May 10, 2017', 'America/Chicago');
+$time2 = $time->setTimestamp(strtotime('April 1, 2017'));
+
+echo $time->toDateTimeString();  // 2017-05-10 00:00:00
+echo $time2->toDateTimeString(); // 2017-04-01 00:00:00
diff --git a/user_guide_src/source/libraries/time/031.php b/user_guide_src/source/libraries/time/031.php
new file mode 100644
index 000000000000..3737ae67a3c1
--- /dev/null
+++ b/user_guide_src/source/libraries/time/031.php
@@ -0,0 +1,15 @@
+<?php
+
+$time = $time->addSeconds(23);
+$time = $time->addMinutes(15);
+$time = $time->addHours(12);
+$time = $time->addDays(21);
+$time = $time->addMonths(14);
+$time = $time->addYears(5);
+
+$time = $time->subSeconds(23);
+$time = $time->subMinutes(15);
+$time = $time->subHours(12);
+$time = $time->subDays(21);
+$time = $time->subMonths(14);
+$time = $time->subYears(5);
diff --git a/user_guide_src/source/libraries/time/032.php b/user_guide_src/source/libraries/time/032.php
new file mode 100644
index 000000000000..9207945c5242
--- /dev/null
+++ b/user_guide_src/source/libraries/time/032.php
@@ -0,0 +1,6 @@
+<?php
+
+$time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
+$time2 = Time::parse('January 11, 2017 03:50:00', 'Europe/London');
+
+$time1->equals($time2); // true
diff --git a/user_guide_src/source/libraries/time/033.php b/user_guide_src/source/libraries/time/033.php
new file mode 100644
index 000000000000..73962921a299
--- /dev/null
+++ b/user_guide_src/source/libraries/time/033.php
@@ -0,0 +1,3 @@
+<?php
+
+$time1->equals('January 11, 2017 03:50:00', 'Europe/London'); // true
diff --git a/user_guide_src/source/libraries/time/034.php b/user_guide_src/source/libraries/time/034.php
new file mode 100644
index 000000000000..229dfe82c094
--- /dev/null
+++ b/user_guide_src/source/libraries/time/034.php
@@ -0,0 +1,7 @@
+<?php
+
+$time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
+$time2 = Time::parse('January 11, 2017 03:50:00', 'Europe/London');
+
+$time1->sameAs($time2); // false
+$time2->sameAs('January 10, 2017 21:50:00', 'America/Chicago'); // true
diff --git a/user_guide_src/source/libraries/time/035.php b/user_guide_src/source/libraries/time/035.php
new file mode 100644
index 000000000000..e21714c2f2ef
--- /dev/null
+++ b/user_guide_src/source/libraries/time/035.php
@@ -0,0 +1,7 @@
+<?php
+
+$time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
+$time2 = Time::parse('January 11, 2017 03:50:00', 'America/Chicago');
+
+$time1->isBefore($time2); // true
+$time2->isBefore($time1); // false
diff --git a/user_guide_src/source/libraries/time/036.php b/user_guide_src/source/libraries/time/036.php
new file mode 100644
index 000000000000..817f31e4dce8
--- /dev/null
+++ b/user_guide_src/source/libraries/time/036.php
@@ -0,0 +1,3 @@
+<?php
+
+$time1->isBefore('March 15, 2013', 'America/Chicago'); // false
diff --git a/user_guide_src/source/libraries/time/037.php b/user_guide_src/source/libraries/time/037.php
new file mode 100644
index 000000000000..103d228e1bc3
--- /dev/null
+++ b/user_guide_src/source/libraries/time/037.php
@@ -0,0 +1,7 @@
+<?php
+
+$time1 = Time::parse('January 10, 2017 21:50:00', 'America/Chicago');
+$time2 = Time::parse('January 11, 2017 03:50:00', 'America/Chicago');
+
+$time1->isAfter($time2); // false
+$time2->isAfter($time1); // true
diff --git a/user_guide_src/source/libraries/time/038.php b/user_guide_src/source/libraries/time/038.php
new file mode 100644
index 000000000000..5284ee5d5828
--- /dev/null
+++ b/user_guide_src/source/libraries/time/038.php
@@ -0,0 +1,7 @@
+<?php
+
+$time = Time::parse('March 10, 2017', 'America/Chicago');
+
+$diff = $time->difference(Time::now());
+$diff = $time->difference(new DateTime('July 4, 1975', 'America/Chicago');
+$diff = $time->difference('July 4, 1975 13:32:05', 'America/Chicago');
diff --git a/user_guide_src/source/libraries/time/039.php b/user_guide_src/source/libraries/time/039.php
new file mode 100644
index 000000000000..12cc3d638f2c
--- /dev/null
+++ b/user_guide_src/source/libraries/time/039.php
@@ -0,0 +1,14 @@
+<?php
+
+$current = Time::parse('March 10, 2017', 'America/Chicago');
+$test    = Time::parse('March 10, 2010', 'America/Chicago');
+
+$diff = $current->difference($test);
+
+echo $diff->getYears();   // -7
+echo $diff->getMonths();  // -84
+echo $diff->getWeeks();   // -365
+echo $diff->getDays();    // -2557
+echo $diff->getHours();   // -61368
+echo $diff->getMinutes(); // -3682080
+echo $diff->getSeconds(); // -220924800
diff --git a/user_guide_src/source/libraries/time/040.php b/user_guide_src/source/libraries/time/040.php
new file mode 100644
index 000000000000..1af52b88fd75
--- /dev/null
+++ b/user_guide_src/source/libraries/time/040.php
@@ -0,0 +1,9 @@
+<?php
+
+echo $diff->years;   // -7
+echo $diff->months;  // -84
+echo $diff->weeks;   // -365
+echo $diff->days;    // -2557
+echo $diff->hours;   // -61368
+echo $diff->minutes; // -3682080
+echo $diff->seconds; // -220924800
diff --git a/user_guide_src/source/libraries/time/041.php b/user_guide_src/source/libraries/time/041.php
new file mode 100644
index 000000000000..98a67ecf7998
--- /dev/null
+++ b/user_guide_src/source/libraries/time/041.php
@@ -0,0 +1,8 @@
+<?php
+
+$current = Time::parse('March 10, 2017', 'America/Chicago')
+$test    = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
+
+$diff = $current->difference($test)
+
+echo $diff->humanize(); // 1 year ago
diff --git a/user_guide_src/source/libraries/typography.rst b/user_guide_src/source/libraries/typography.rst
index 0a4ded63a898..adbb868ae902 100644
--- a/user_guide_src/source/libraries/typography.rst
+++ b/user_guide_src/source/libraries/typography.rst
@@ -14,9 +14,10 @@ Loading the Library
 *******************
 
 Like all services in CodeIgniter, it can be loaded via ``Config\Services``, though you usually will not need
-to load it manually::
+to load it manually:
 
-    $typography = \Config\Services::typography();
+.. literalinclude:: typography/001.php
+   :lines: 2-
 
 **************************
 Available static functions
@@ -34,9 +35,10 @@ The following functions are available:
     Formats text so that it is semantically and typographically correct
     HTML.
 
-    Usage example::
+    Usage example:
 
-        $string = $typography->autoTypography($string);
+    .. literalinclude:: typography/002.php
+       :lines: 2-
 
     .. note:: Typographic formatting can be processor intensive, particularly if
         you have a lot of content being formatted. If you choose to use this
@@ -53,9 +55,10 @@ The following functions are available:
     to curly entities, but it also converts em-dashes,
     double spaces, and ampersands.
 
-    Usage example::
+    Usage example:
 
-        $string = $typography->formatCharacters($string);
+    .. literalinclude:: typography/003.php
+       :lines: 2-
 
 .. php:function:: nl2brExceptPre($str)
 
@@ -67,6 +70,7 @@ The following functions are available:
     This function is identical to the native PHP ``nl2br()`` function,
     except that it ignores ``<pre>`` tags.
 
-    Usage example::
+    Usage example:
 
-        $string = $typography->nl2brExceptPre($string);
+    .. literalinclude:: typography/004.php
+       :lines: 2-
diff --git a/user_guide_src/source/libraries/typography/001.php b/user_guide_src/source/libraries/typography/001.php
new file mode 100644
index 000000000000..0c82ed0e95fa
--- /dev/null
+++ b/user_guide_src/source/libraries/typography/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$typography = \Config\Services::typography();
diff --git a/user_guide_src/source/libraries/typography/002.php b/user_guide_src/source/libraries/typography/002.php
new file mode 100644
index 000000000000..09172ffab430
--- /dev/null
+++ b/user_guide_src/source/libraries/typography/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$string = $typography->autoTypography($string);
diff --git a/user_guide_src/source/libraries/typography/003.php b/user_guide_src/source/libraries/typography/003.php
new file mode 100644
index 000000000000..1c2d51a9afdd
--- /dev/null
+++ b/user_guide_src/source/libraries/typography/003.php
@@ -0,0 +1,3 @@
+<?php
+
+$string = $typography->formatCharacters($string);
diff --git a/user_guide_src/source/libraries/typography/004.php b/user_guide_src/source/libraries/typography/004.php
new file mode 100644
index 000000000000..3d5b4347aafc
--- /dev/null
+++ b/user_guide_src/source/libraries/typography/004.php
@@ -0,0 +1,3 @@
+<?php
+
+$string = $typography->nl2brExceptPre($string);
diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index 9640809ba99b..b2117f37c37a 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -33,31 +33,9 @@ Creating the Upload Form
 ========================
 
 Using a text editor, create a form called upload_form.php. In it, place
-this code and save it to your **app/Views/** directory::
+this code and save it to your **app/Views/** directory:
 
-    <!DOCTYPE html>
-    <html lang="en">
-    <head>
-        <title>Upload Form</title>
-    </head>
-    <body>
-
-    <?php foreach ($errors as $error): ?>
-        <li><?= esc($error) ?></li>
-    <?php endforeach ?>
-
-    <?= form_open_multipart('upload/upload') ?>
-
-    <input type="file" name="userfile" size="20" />
-
-    <br /><br />
-
-    <input type="submit" value="upload" />
-
-    </form>
-
-    </body>
-    </html>
+.. literalinclude:: uploaded_files/000.php
 
 You'll notice we are using a form helper to create the opening form tag.
 File uploads require a multipart form, so the helper creates the proper
@@ -95,56 +73,9 @@ The Controller
 ==============
 
 Using a text editor, create a controller called Upload.php. In it, place
-this code and save it to your **app/Controllers/** directory::
-
-    <?php
-
-    namespace App\Controllers;
-
-    use CodeIgniter\Files\File;
-
-    class Upload extends BaseController
-    {
-        protected $helpers = ['form'];
-
-        public function index()
-        {
-            return view('upload_form', ['errors' => []]);
-        }
-
-        public function upload()
-        {
-            $validationRule = [
-                'userfile' => [
-                    'label' => 'Image File',
-                    'rules' => 'uploaded[userfile]'
-                        . '|is_image[userfile]'
-                        . '|mime_in[userfile,image/jpg,image/jpeg,image/gif,image/png,image/webp]'
-                        . '|max_size[userfile,100]'
-                        . '|max_dims[userfile,1024,768]',
-                ],
-            ];
-            if (! $this->validate($validationRule)) {
-                $data = ['errors' => $this->validator->getErrors()];
+this code and save it to your **app/Controllers/** directory:
 
-                return view('upload_form', $data);
-            }
-
-            $img = $this->request->getFile('userfile');
-
-            if (! $img->hasMoved()) {
-                $filepath = WRITEPATH . 'uploads/' . $img->store();
-
-                $data = ['uploaded_flleinfo' => new File($filepath)];
-
-                return view('upload_success', $data);
-            } else {
-                $data = ['errors' => 'The file has already been moved.'];
-
-                return view('upload_form', $data);
-            }
-        }
-    }
+.. literalinclude:: uploaded_files/001.php
 
 .. note:: Since the value of a file upload HTML field doesn't exist, and is stored in the ``$_FILES`` global,
     only :ref:`rules-for-file-uploads` can be used to validate upload file with :doc:`validation`.
@@ -181,20 +112,20 @@ are not aware of. CodeIgniter helps with both of these situations by standardizi
 common interface.
 
 Files are accessed through the current ``IncomingRequest`` instance. To retrieve all files that were uploaded with this
-request, use ``getFiles()``. This will return an array of files represented by instances of ``CodeIgniter\HTTP\Files\UploadedFile``::
+request, use ``getFiles()``. This will return an array of files represented by instances of ``CodeIgniter\HTTP\Files\UploadedFile``:
 
-    $files = $this->request->getFiles();
+.. literalinclude:: uploaded_files/002.php
+   :lines: 2-
 
 Of course, there are multiple ways to name the file input, and anything but the simplest can create strange results.
 The array returns in a manner that you would expect. With the simplest usage, a single file might be submitted like::
 
     <input type="file" name="avatar" />
 
-Which would return a simple array like::
+Which would return a simple array like:
 
-    [
-        'avatar' => // UploadedFile instance
-    ]
+.. literalinclude:: uploaded_files/003.php
+   :lines: 2-
 
 .. note:: The UploadedFile instance corresponds to ``$_FILES``. Even if a user just clicks the submit button and does not upload any file, the instance will still exist. You can check that the file was actually uploaded by the ``isValid()`` method in UploadedFile. See :ref:`verify-a-file`.
 
@@ -202,32 +133,20 @@ If you used an array notation for the name, the input would look something like:
 
     <input type="file" name="my-form[details][avatar]" />
 
-The array returned by ``getFiles()`` would look more like this::
+The array returned by ``getFiles()`` would look more like this:
 
-    [
-        'my-form' => [
-            'details' => [
-                'avatar' => // UploadedFile instance
-            ]
-        ]
-    ]
+.. literalinclude:: uploaded_files/004.php
+   :lines: 2-
 
 In some cases, you may specify an array of files to upload::
 
     Upload an avatar: <input type="file" name="my-form[details][avatars][]" />
     Upload an avatar: <input type="file" name="my-form[details][avatars][]" />
 
-In this case, the returned array of files would be more like::
+In this case, the returned array of files would be more like:
 
-    [
-        'my-form' => [
-            'details' => [
-                'avatar' => [
-                    0 => /* UploadedFile instance */,
-                    1 => /* UploadedFile instance */
-            ]
-        ]
-    ]
+.. literalinclude:: uploaded_files/005.php
+   :lines: 2-
 
 Single File
 ===========
@@ -241,9 +160,10 @@ With the simplest usage, a single file might be submitted like::
 
     <input type="file" name="userfile" />
 
-Which would return a simple file instance like::
+Which would return a simple file instance like:
 
-    $file = $this->request->getFile('userfile');
+.. literalinclude:: uploaded_files/006.php
+   :lines: 2-
 
 Array notation
 --------------
@@ -252,9 +172,10 @@ If you used an array notation for the name, the input would look something like:
 
     <input type="file" name="my-form[details][avatar]" />
 
-For get the file instance::
+For get the file instance:
 
-    $file = $this->request->getFile('my-form.details.avatar');
+.. literalinclude:: uploaded_files/007.php
+   :lines: 2-
 
 Multiple files
 ==============
@@ -263,40 +184,34 @@ Multiple files
 
     <input type="file" name="images[]" multiple />
 
-In controller::
+In controller:
 
-    if ($imagefile = $this->request->getFiles()) {
-        foreach($imagefile['images'] as $img) {
-            if ($img->isValid() && ! $img->hasMoved()) {
-                $newName = $img->getRandomName();
-                $img->move(WRITEPATH . 'uploads', $newName);
-            }
-        }
-    }
+.. literalinclude:: uploaded_files/008.php
+   :lines: 2-
 
 where the ``images`` is a loop from the form field name.
 
 If there are multiple files with the same name you can use ``getFile()`` to retrieve every file individually.
 
-In controller::
-
-    $file1 = $this->request->getFile('images.0');
-    $file2 = $this->request->getFile('images.1');
+In controller:
 
-You might find it easier to use ``getFileMultiple()``, to get an array of uploaded files with the same name::
+.. literalinclude:: uploaded_files/009.php
+   :lines: 2-
 
-    $files = $this->request->getFileMultiple('images');
+You might find it easier to use ``getFileMultiple()``, to get an array of uploaded files with the same name:
 
+.. literalinclude:: uploaded_files/010.php
+   :lines: 2-
 
 Another example::
 
     Upload an avatar: <input type="file" name="my-form[details][avatars][]" />
     Upload an avatar: <input type="file" name="my-form[details][avatars][]" />
 
-In controller::
+In controller:
 
-    $file1 = $this->request->getFile('my-form.details.avatars.0');
-    $file2 = $this->request->getFile('my-form.details.avatars.1');
+.. literalinclude:: uploaded_files/011.php
+   :lines: 2-
 
 .. note:: Using ``getFiles()`` is more appropriate.
 
@@ -312,11 +227,10 @@ move the file to a new location.
 Verify a File
 =============
 
-You can check that a file was actually uploaded via HTTP with no errors by calling the ``isValid()`` method::
+You can check that a file was actually uploaded via HTTP with no errors by calling the ``isValid()`` method:
 
-    if (! $file->isValid()) {
-        throw new \RuntimeException($file->getErrorString() . '(' . $file->getError() . ')');
-    }
+.. literalinclude:: uploaded_files/012.php
+   :lines: 2-
 
 As seen in this example, if a file had an upload error, you can retrieve the error code (an integer) and the error
 message with the ``getError()`` and ``getErrorString()`` methods. The following errors can be discovered through
@@ -337,61 +251,64 @@ File Names
 
 You can retrieve the original filename provided by the client with the ``getName()`` method. This will typically be the
 filename sent by the client, and should not be trusted. If the file has been moved, this will return the final name of
-the moved file::
+the moved file:
 
-    $name = $file->getName();
+.. literalinclude:: uploaded_files/013.php
+   :lines: 2-
 
 **getClientName()**
 
-Always returns the original name of the uploaded file as sent by the client, even if the file has been moved::
+Always returns the original name of the uploaded file as sent by the client, even if the file has been moved:
 
-  $originalName = $file->getClientName();
+.. literalinclude:: uploaded_files/014.php
+   :lines: 2-
 
 **getTempName()**
 
-To get the full path of the temp file that was created during the upload, you can use the ``getTempName()`` method::
+To get the full path of the temp file that was created during the upload, you can use the ``getTempName()`` method:
 
-    $tempfile = $file->getTempName();
+.. literalinclude:: uploaded_files/015.php
+   :lines: 2-
 
 Other File Info
 ===============
 
 **getClientExtension()**
 
-Returns the original file extension, based on the file name that was uploaded::
+Returns the original file extension, based on the file name that was uploaded:
 
-    $ext = $file->getClientExtension();
+.. literalinclude:: uploaded_files/016.php
+   :lines: 2-
 
 .. warning:: This is NOT a trusted source. For a trusted version, use ``guessExtension()`` instead.
 
 **getClientMimeType()**
 
 Returns the mime type (mime type) of the file as provided by the client. This is NOT a trusted value. For a trusted
-version, use ``getMimeType()`` instead::
-
-    $type = $file->getClientMimeType();
+version, use ``getMimeType()`` instead:
 
-    echo $type; // image/png
+.. literalinclude:: uploaded_files/017.php
+   :lines: 2-
 
 Moving Files
 ============
 
 Each file can be moved to its new location with the aptly named ``move()`` method. This takes the directory to move
-the file to as the first parameter::
+the file to as the first parameter:
 
-    $file->move(WRITEPATH . 'uploads');
+.. literalinclude:: uploaded_files/018.php
+   :lines: 2-
 
-By default, the original filename was used. You can specify a new filename by passing it as the second parameter::
+By default, the original filename was used. You can specify a new filename by passing it as the second parameter:
 
-    $newName = $file->getRandomName();
-    $file->move(WRITEPATH . 'uploads', $newName);
+.. literalinclude:: uploaded_files/019.php
+   :lines: 2-
 
 Once the file has been removed the temporary file is deleted. You can check if a file has been moved already with
-the ``hasMoved()`` method, which returns a boolean::
+the ``hasMoved()`` method, which returns a boolean:
 
-    if ($file->isValid() && ! $file->hasMoved()) {
-        $file->move($path);
-    }
+.. literalinclude:: uploaded_files/020.php
+   :lines: 2-
 
 Moving an uploaded file can fail, with an HTTPException, under several circumstances:
 
@@ -409,14 +326,16 @@ With the simplest usage, a single file might be submitted like::
     <input type="file" name="userfile" />
 
 By default, upload files are saved in **writable/uploads** directory. The **YYYYMMDD** folder
-and random file name will be created. Returns a file path::
+and random file name will be created. Returns a file path:
 
-    $path = $this->request->getFile('userfile')->store();
+.. literalinclude:: uploaded_files/021.php
+   :lines: 2-
 
 You can specify a directory to move the file to as the first parameter. A new filename by
-passing it as the second parameter::
+passing it as the second parameter:
 
-    $path = $this->request->getFile('userfile')->store('head_img/', 'user_name.jpg');
+.. literalinclude:: uploaded_files/022.php
+   :lines: 2-
 
 Moving an uploaded file can fail, with an ``HTTPException``, under several circumstances:
 
diff --git a/user_guide_src/source/libraries/uploaded_files/000.php b/user_guide_src/source/libraries/uploaded_files/000.php
new file mode 100644
index 000000000000..d58b7664d28b
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/000.php
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Upload Form</title>
+</head>
+<body>
+
+<?php foreach ($errors as $error): ?>
+    <li><?= esc($error) ?></li>
+<?php endforeach ?>
+
+<?= form_open_multipart('upload/upload') ?>
+
+<input type="file" name="userfile" size="20" />
+
+<br /><br />
+
+<input type="submit" value="upload" />
+
+</form>
+
+</body>
+</html>
diff --git a/user_guide_src/source/libraries/uploaded_files/001.php b/user_guide_src/source/libraries/uploaded_files/001.php
new file mode 100644
index 000000000000..f186d517fd96
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/001.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Controllers;
+
+use CodeIgniter\Files\File;
+
+class Upload extends BaseController
+{
+    protected $helpers = ['form'];
+
+    public function index()
+    {
+        return view('upload_form', ['errors' => []]);
+    }
+
+    public function upload()
+    {
+        $validationRule = [
+            'userfile' => [
+                'label' => 'Image File',
+                'rules' => 'uploaded[userfile]'
+                    . '|is_image[userfile]'
+                    . '|mime_in[userfile,image/jpg,image/jpeg,image/gif,image/png,image/webp]'
+                    . '|max_size[userfile,100]'
+                    . '|max_dims[userfile,1024,768]',
+            ],
+        ];
+        if (! $this->validate($validationRule)) {
+            $data = ['errors' => $this->validator->getErrors()];
+
+            return view('upload_form', $data);
+        }
+
+        $img = $this->request->getFile('userfile');
+
+        if (! $img->hasMoved()) {
+            $filepath = WRITEPATH . 'uploads/' . $img->store();
+
+            $data = ['uploaded_flleinfo' => new File($filepath)];
+
+            return view('upload_success', $data);
+        } else {
+            $data = ['errors' => 'The file has already been moved.'];
+
+            return view('upload_form', $data);
+        }
+    }
+}
diff --git a/user_guide_src/source/libraries/uploaded_files/002.php b/user_guide_src/source/libraries/uploaded_files/002.php
new file mode 100644
index 000000000000..17141efbdde8
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$files = $this->request->getFiles();
diff --git a/user_guide_src/source/libraries/uploaded_files/003.php b/user_guide_src/source/libraries/uploaded_files/003.php
new file mode 100644
index 000000000000..368facf4f7ab
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/003.php
@@ -0,0 +1,5 @@
+<?php
+
+[
+    'avatar' => // UploadedFile instance
+]
diff --git a/user_guide_src/source/libraries/uploaded_files/004.php b/user_guide_src/source/libraries/uploaded_files/004.php
new file mode 100644
index 000000000000..bf31373e57bd
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/004.php
@@ -0,0 +1,9 @@
+<?php
+
+[
+    'my-form' => [
+        'details' => [
+            'avatar' => // UploadedFile instance
+        ]
+    ]
+]
diff --git a/user_guide_src/source/libraries/uploaded_files/005.php b/user_guide_src/source/libraries/uploaded_files/005.php
new file mode 100644
index 000000000000..c53d82a298fc
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/005.php
@@ -0,0 +1,11 @@
+<?php
+
+[
+    'my-form' => [
+        'details' => [
+            'avatar' => [
+                0 => /* UploadedFile instance */,
+                1 => /* UploadedFile instance */
+        ]
+    ]
+]
diff --git a/user_guide_src/source/libraries/uploaded_files/006.php b/user_guide_src/source/libraries/uploaded_files/006.php
new file mode 100644
index 000000000000..e5f6440d96fb
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/006.php
@@ -0,0 +1,3 @@
+<?php
+
+$file = $this->request->getFile('userfile');
diff --git a/user_guide_src/source/libraries/uploaded_files/007.php b/user_guide_src/source/libraries/uploaded_files/007.php
new file mode 100644
index 000000000000..ad71bd5575fb
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/007.php
@@ -0,0 +1,3 @@
+<?php
+
+$file = $this->request->getFile('my-form.details.avatar');
diff --git a/user_guide_src/source/libraries/uploaded_files/008.php b/user_guide_src/source/libraries/uploaded_files/008.php
new file mode 100644
index 000000000000..f37491c04821
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/008.php
@@ -0,0 +1,10 @@
+<?php
+
+if ($imagefile = $this->request->getFiles()) {
+    foreach($imagefile['images'] as $img) {
+        if ($img->isValid() && ! $img->hasMoved()) {
+            $newName = $img->getRandomName();
+            $img->move(WRITEPATH . 'uploads', $newName);
+        }
+    }
+}
diff --git a/user_guide_src/source/libraries/uploaded_files/009.php b/user_guide_src/source/libraries/uploaded_files/009.php
new file mode 100644
index 000000000000..da51d17dbd15
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/009.php
@@ -0,0 +1,4 @@
+<?php
+
+$file1 = $this->request->getFile('images.0');
+$file2 = $this->request->getFile('images.1');
diff --git a/user_guide_src/source/libraries/uploaded_files/010.php b/user_guide_src/source/libraries/uploaded_files/010.php
new file mode 100644
index 000000000000..646e6bb0b8b9
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/010.php
@@ -0,0 +1,3 @@
+<?php
+
+$files = $this->request->getFileMultiple('images');
diff --git a/user_guide_src/source/libraries/uploaded_files/011.php b/user_guide_src/source/libraries/uploaded_files/011.php
new file mode 100644
index 000000000000..d18a755ba234
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/011.php
@@ -0,0 +1,4 @@
+<?php
+
+$file1 = $this->request->getFile('my-form.details.avatars.0');
+$file2 = $this->request->getFile('my-form.details.avatars.1');
diff --git a/user_guide_src/source/libraries/uploaded_files/012.php b/user_guide_src/source/libraries/uploaded_files/012.php
new file mode 100644
index 000000000000..094ea73c1064
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/012.php
@@ -0,0 +1,5 @@
+<?php
+
+if (! $file->isValid()) {
+    throw new \RuntimeException($file->getErrorString() . '(' . $file->getError() . ')');
+}
diff --git a/user_guide_src/source/libraries/uploaded_files/013.php b/user_guide_src/source/libraries/uploaded_files/013.php
new file mode 100644
index 000000000000..057a56b3e9a0
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/013.php
@@ -0,0 +1,3 @@
+<?php
+
+$name = $file->getName();
diff --git a/user_guide_src/source/libraries/uploaded_files/014.php b/user_guide_src/source/libraries/uploaded_files/014.php
new file mode 100644
index 000000000000..4fb0cae0ad12
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/014.php
@@ -0,0 +1,3 @@
+<?php
+
+$originalName = $file->getClientName();
diff --git a/user_guide_src/source/libraries/uploaded_files/015.php b/user_guide_src/source/libraries/uploaded_files/015.php
new file mode 100644
index 000000000000..c9e4774a4bbf
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/015.php
@@ -0,0 +1,3 @@
+<?php
+
+$tempfile = $file->getTempName();
diff --git a/user_guide_src/source/libraries/uploaded_files/016.php b/user_guide_src/source/libraries/uploaded_files/016.php
new file mode 100644
index 000000000000..867877238c76
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/016.php
@@ -0,0 +1,3 @@
+<?php
+
+$ext = $file->getClientExtension();
diff --git a/user_guide_src/source/libraries/uploaded_files/017.php b/user_guide_src/source/libraries/uploaded_files/017.php
new file mode 100644
index 000000000000..dd1288e441c3
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/017.php
@@ -0,0 +1,5 @@
+<?php
+
+$type = $file->getClientMimeType();
+
+echo $type; // image/png
diff --git a/user_guide_src/source/libraries/uploaded_files/018.php b/user_guide_src/source/libraries/uploaded_files/018.php
new file mode 100644
index 000000000000..12499a3ca1ba
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/018.php
@@ -0,0 +1,3 @@
+<?php
+
+$file->move(WRITEPATH . 'uploads');
diff --git a/user_guide_src/source/libraries/uploaded_files/019.php b/user_guide_src/source/libraries/uploaded_files/019.php
new file mode 100644
index 000000000000..2e6b39645a4b
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/019.php
@@ -0,0 +1,4 @@
+<?php
+
+$newName = $file->getRandomName();
+$file->move(WRITEPATH . 'uploads', $newName);
diff --git a/user_guide_src/source/libraries/uploaded_files/020.php b/user_guide_src/source/libraries/uploaded_files/020.php
new file mode 100644
index 000000000000..7f49d1f5232e
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/020.php
@@ -0,0 +1,5 @@
+<?php
+
+if ($file->isValid() && ! $file->hasMoved()) {
+    $file->move($path);
+}
diff --git a/user_guide_src/source/libraries/uploaded_files/021.php b/user_guide_src/source/libraries/uploaded_files/021.php
new file mode 100644
index 000000000000..90f9495eaf7b
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/021.php
@@ -0,0 +1,3 @@
+<?php
+
+$path = $this->request->getFile('userfile')->store();
diff --git a/user_guide_src/source/libraries/uploaded_files/022.php b/user_guide_src/source/libraries/uploaded_files/022.php
new file mode 100644
index 000000000000..0e552f417d52
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/022.php
@@ -0,0 +1,3 @@
+<?php
+
+$path = $this->request->getFile('userfile')->store('head_img/', 'user_name.jpg');
diff --git a/user_guide_src/source/libraries/uri.rst b/user_guide_src/source/libraries/uri.rst
index 4f5e9dda6fb6..25e7c92566b0 100644
--- a/user_guide_src/source/libraries/uri.rst
+++ b/user_guide_src/source/libraries/uri.rst
@@ -14,58 +14,59 @@ relative URI to an existing one and have it resolved safely and correctly.
 Creating URI instances
 ======================
 
-Creating a URI instance is as simple as creating a new class instance::
+Creating a URI instance is as simple as creating a new class instance:
 
-    $uri = new \CodeIgniter\HTTP\URI();
+.. literalinclude:: uri/001.php
+   :lines: 2-
 
-Alternatively, you can use the ``service()`` function to return an instance for you::
+Alternatively, you can use the ``service()`` function to return an instance for you:
 
-    $uri = service('uri');
+.. literalinclude:: uri/002.php
+   :lines: 2-
 
 When you create the new instance, you can pass a full or partial URL in the constructor and it will be parsed
-into its appropriate sections::
+into its appropriate sections:
 
-    $uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path');
-    $uri = service('uri', 'http://www.example.com/some/path');
+.. literalinclude:: uri/003.php
+   :lines: 2-
 
 The Current URI
 ---------------
 
 Many times, all you really want is an object representing the current URL of this request.
-You can use one of the functions available in the **url_helper**::
+You can use one of the functions available in the **url_helper**:
 
-    $uri = current_url(true);
+.. literalinclude:: uri/004.php
+   :lines: 2-
 
 You must pass ``true`` as the first parameter, otherwise, it will return the string representation of the current URL.
 This URI is based on the path (relative to your ``baseURL``) as determined by the current request object and
 your settings in ``Config\App`` (baseURL, indexPage, and forceGlobalSecureRequests).
-Assuming that you're in a controller that extends ``CodeIgniter\Controller`` you can get this relative path::
+Assuming that you're in a controller that extends ``CodeIgniter\Controller`` you can get this relative path:
 
-    $path = $this->request->getPath();
+.. literalinclude:: uri/005.php
+   :lines: 2-
 
 ===========
 URI Strings
 ===========
 
 Many times, all you really want is to get a string representation of a URI. This is easy to do by simply casting
-the URI as a string::
+the URI as a string:
 
-    $uri = current_url(true);
-    echo (string) $uri;  // http://example.com/index.php
+.. literalinclude:: uri/006.php
+   :lines: 2-
 
 If you know the pieces of the URI and just want to ensure it's all formatted correctly, you can generate a string
-using the URI class' static ``createURIString()`` method::
+using the URI class' static ``createURIString()`` method:
 
-    $uriString = URI::createURIString($scheme, $authority, $path, $query, $fragment);
-
-    // Creates: http://exmample.com/some/path?foo=bar#first-heading
-    echo URI::createURIString('http', 'example.com', 'some/path', 'foo=bar', 'first-heading');
+.. literalinclude:: uri/007.php
+   :lines: 2-
 
 .. important:: When ``URI`` is cast to a string, it will attempt to adjust project URLs to the
     settings defined in ``Config\App``. If you need the exact, unaltered string representation
     then use ``URI::createURIString()`` instead.
 
-
 =============
 The URI Parts
 =============
@@ -77,12 +78,9 @@ Scheme
 ------
 
 The scheme is frequently 'http' or 'https', but any scheme is supported, including 'file', 'mailto', etc.
-::
-
-    $uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path');
 
-    echo $uri->getScheme(); // 'http'
-    $uri->setScheme('https');
+.. literalinclude:: uri/008.php
+   :lines: 2-
 
 Authority
 ---------
@@ -90,25 +88,21 @@ Authority
 Many URIs contain several elements that are collectively known as the 'authority'. This includes any user info,
 the host and the port number. You can retrieve all of these pieces as one single string with the ``getAuthority()``
 method, or you can manipulate the individual parts.
-::
 
-    $uri = new \CodeIgniter\HTTP\URI('ftp://user:password@example.com:21/some/path');
-
-    echo $uri->getAuthority();  // user@example.com:21
+.. literalinclude:: uri/009.php
+   :lines: 2-
 
 By default, this will not display the password portion since you wouldn't want to show that to anyone. If you want
 to show the password, you can use the ``showPassword()`` method. This URI instance will continue to show that password
-until you turn it off again, so always make sure that you turn it off as soon as you are finished with it::
-
-    echo $uri->getAuthority();  // user@example.com:21
-    echo $uri->showPassword()->getAuthority();   // user:password@example.com:21
+until you turn it off again, so always make sure that you turn it off as soon as you are finished with it:
 
-    // Turn password display off again.
-    $uri->showPassword(false);
+.. literalinclude:: uri/010.php
+   :lines: 2-
 
-If you do not want to display the port, pass in ``true`` as the only parameter::
+If you do not want to display the port, pass in ``true`` as the only parameter:
 
-    echo $uri->getAuthority(true);  // user@example.com
+.. literalinclude:: uri/011.php
+   :lines: 2-
 
 .. note:: If the current port is the default port for the scheme it will never be displayed.
 
@@ -116,36 +110,32 @@ Userinfo
 --------
 
 The userinfo section is simply the username and password that you might see with an FTP URI. While you can get
-this as part of the Authority, you can also retrieve it yourself::
+this as part of the Authority, you can also retrieve it yourself:
 
-    echo $uri->getUserInfo();   // user
+.. literalinclude:: uri/012.php
+   :lines: 2-
 
-By default, it will not display the password, but you can override that with the ``showPassword()`` method::
+By default, it will not display the password, but you can override that with the ``showPassword()`` method:
 
-    echo $uri->showPassword()->getUserInfo();   // user:password
-    $uri->showPassword(false);
+.. literalinclude:: uri/013.php
+   :lines: 2-
 
 Host
 ----
 
 The host portion of the URI is typically the domain name of the URL. This can be easily set and retrieved with the
-``getHost()`` and ``setHost()`` methods::
+``getHost()`` and ``setHost()`` methods:
 
-    $uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path');
-
-    echo $uri->getHost();   // www.example.com
-    echo $uri->setHost('anotherexample.com')->getHost();    // anotherexample.com
+.. literalinclude:: uri/014.php
+   :lines: 2-
 
 Port
 ----
 
 The port is an integer number between 0 and 65535. Each sheme has a default value associated with it.
-::
-
-    $uri = new \CodeIgniter\HTTP\URI('ftp://user:password@example.com:21/some/path');
 
-    echo $uri->getPort();   // 21
-    echo $uri->setPort(2201)->getPort(); // 2201
+.. literalinclude:: uri/015.php
+   :lines: 2-
 
 When using the ``setPort()`` method, the port will be checked that it is within the valid range and assigned.
 
@@ -153,12 +143,10 @@ Path
 ----
 
 The path are all of the segments within the site itself. As expected, the ``getPath()`` and ``setPath()`` methods
-can be used to manipulate it::
+can be used to manipulate it:
 
-    $uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path');
-
-    echo $uri->getPath();   // 'some/path'
-    echo $uri->setPath('another/path')->getPath();  // 'another/path'
+.. literalinclude:: uri/016.php
+   :lines: 2-
 
 .. note:: When setting the path this way, or any other way the class allows, it is sanitized to encode any dangerous
     characters, and remove dot segments for safety.
@@ -168,48 +156,37 @@ Query
 
 The query variables can be manipulated through the class using simple string representations. Query values can only
 be set as a string currently.
-::
-
-    $uri = new \CodeIgniter\HTTP\URI('http://www.example.com?foo=bar');
 
-    echo $uri->getQuery();  // 'foo=bar'
-    $uri->setQuery('foo=bar&bar=baz');
+.. literalinclude:: uri/017.php
+   :lines: 2-
 
 .. note:: Query values cannot contain fragments. An InvalidArgumentException will be thrown if it does.
 
-You can set query values using an array::
+You can set query values using an array:
 
-    $uri->setQueryArray(['foo' => 'bar', 'bar' => 'baz']);
+.. literalinclude:: uri/018.php
+   :lines: 2-
 
 The ``setQuery()`` and ``setQueryArray()`` methods overwrite any existing query variables. You can add a value to the
 query variables collection without destroying the existing query variables with the ``addQuery()`` method. The first
-parameter is the name of the variable, and the second parameter is the value::
+parameter is the name of the variable, and the second parameter is the value:
 
-    $uri->addQuery('foo', 'bar');
+.. literalinclude:: uri/019.php
+   :lines: 2-
 
 **Filtering Query Values**
 
 You can filter the query values returned by passing an options array to the ``getQuery()`` method, with either an
-*only* or an *except* key::
+*only* or an *except* key:
 
-    $uri = new \CodeIgniter\HTTP\URI('http://www.example.com?foo=bar&bar=baz&baz=foz');
-
-    // Returns 'foo=bar'
-    echo $uri->getQuery(['only' => ['foo']);
-
-    // Returns 'foo=bar&baz=foz'
-    echo $uri->getQuery(['except' => ['bar']]);
+.. literalinclude:: uri/020.php
+   :lines: 2-
 
 This only changes the values returned during this one call. If you need to modify the URI's query values more permanently,
-you can use the ``stripQuery()`` and ``keepQuery()`` methods to change the actual object's query variable collection::
-
-    $uri = new \CodeIgniter\HTTP\URI('http://www.example.com?foo=bar&bar=baz&baz=foz');
+you can use the ``stripQuery()`` and ``keepQuery()`` methods to change the actual object's query variable collection:
 
-    // Leaves just the 'baz' variable
-    $uri->stripQuery('foo', 'bar');
-
-    // Leaves just the 'foo' variable
-    $uri->keepQuery('foo');
+.. literalinclude:: uri/021.php
+   :lines: 2-
 
 .. note:: By default ``setQuery()`` and ``setQueryArray()`` methods uses native ``parse_str()`` function to prepare data.
     If you want to use more liberal rules (which allow key names to contain dots), you can use a special method
@@ -220,12 +197,9 @@ Fragment
 
 Fragments are the portion at the end of the URL, preceded by the pound-sign (#). In HTML URL's these are links
 to an on-page anchor. Media URI's can make use of them in various other ways.
-::
-
-    $uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path#first-heading');
 
-    echo $uri->getFragment();   // 'first-heading'
-    echo $uri->setFragment('second-heading')->getFragment();    // 'second-heading'
+.. literalinclude:: uri/022.php
+   :lines: 2-
 
 ============
 URI Segments
@@ -233,45 +207,24 @@ URI Segments
 
 Each section of the path between the slashes is a single segment. The URI class provides a simple way to determine
 what the values of the segments are. The segments start at 1 being the furthest left of the path.
-::
 
-    // URI = http://example.com/users/15/profile
-
-    // Prints '15'
-    if ($uri->getSegment(1) == 'users') {
-        echo $uri->getSegment(2);
-    }
+.. literalinclude:: uri/023.php
+   :lines: 2-
 
 You can also set a different default value for a particular segment by using the second parameter of the ``getSegment()`` method. The default is empty string.
-::
-
-    // URI = http://example.com/users/15/profile
 
-    // will print 'profile'
-    echo $uri->getSegment(3, 'foo');
-    // will print 'bar'
-    echo $uri->getSegment(4, 'bar');
-    // will throw an exception
-    echo $uri->getSegment(5, 'baz');
-    // will print 'baz'
-    echo $uri->setSilent()->getSegment(5, 'baz');
-    // will print '' (empty string)
-    echo $uri->setSilent()->getSegment(5);
+.. literalinclude:: uri/024.php
+   :lines: 2-
 
-You can get a count of the total segments::
+You can get a count of the total segments:
 
-    $total = $uri->getTotalSegments(); // 3
+.. literalinclude:: uri/025.php
+   :lines: 2-
 
-Finally, you can retrieve an array of all of the segments::
+Finally, you can retrieve an array of all of the segments:
 
-    $segments = $uri->getSegments();
-
-    // $segments =
-    [
-        0 => 'users',
-        1 => '15',
-        2 => 'profile'
-    ]
+.. literalinclude:: uri/026.php
+   :lines: 2-
 
 ===========================
 Disable Throwing Exceptions
@@ -279,10 +232,6 @@ Disable Throwing Exceptions
 
 By default, some methods of this class may throw an exception. If you want to disable it, you can set a special flag
 that will prevent throwing exceptions.
-::
-
-    // Disable throwing exceptions
-    $uri->setSilent();
 
-    // Enable throwing exceptions (default)
-    $uri->setSilent(false);
+.. literalinclude:: uri/027.php
+   :lines: 2-
diff --git a/user_guide_src/source/libraries/uri/001.php b/user_guide_src/source/libraries/uri/001.php
new file mode 100644
index 000000000000..524e67669110
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$uri = new \CodeIgniter\HTTP\URI();
diff --git a/user_guide_src/source/libraries/uri/002.php b/user_guide_src/source/libraries/uri/002.php
new file mode 100644
index 000000000000..5548432e8f6b
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$uri = service('uri');
diff --git a/user_guide_src/source/libraries/uri/003.php b/user_guide_src/source/libraries/uri/003.php
new file mode 100644
index 000000000000..0ccb286ca81e
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/003.php
@@ -0,0 +1,4 @@
+<?php
+
+$uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path');
+$uri = service('uri', 'http://www.example.com/some/path');
diff --git a/user_guide_src/source/libraries/uri/004.php b/user_guide_src/source/libraries/uri/004.php
new file mode 100644
index 000000000000..0be48b277bf7
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/004.php
@@ -0,0 +1,3 @@
+<?php
+
+$uri = current_url(true);
diff --git a/user_guide_src/source/libraries/uri/005.php b/user_guide_src/source/libraries/uri/005.php
new file mode 100644
index 000000000000..f2dc17959270
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/005.php
@@ -0,0 +1,3 @@
+<?php
+
+$path = $this->request->getPath();
diff --git a/user_guide_src/source/libraries/uri/006.php b/user_guide_src/source/libraries/uri/006.php
new file mode 100644
index 000000000000..3cdabe4db4e8
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/006.php
@@ -0,0 +1,4 @@
+<?php
+
+$uri = current_url(true);
+echo (string) $uri;  // http://example.com/index.php
diff --git a/user_guide_src/source/libraries/uri/007.php b/user_guide_src/source/libraries/uri/007.php
new file mode 100644
index 000000000000..3329798cffb0
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/007.php
@@ -0,0 +1,6 @@
+<?php
+
+$uriString = URI::createURIString($scheme, $authority, $path, $query, $fragment);
+
+// Creates: http://exmample.com/some/path?foo=bar#first-heading
+echo URI::createURIString('http', 'example.com', 'some/path', 'foo=bar', 'first-heading');
diff --git a/user_guide_src/source/libraries/uri/008.php b/user_guide_src/source/libraries/uri/008.php
new file mode 100644
index 000000000000..66746092b49f
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/008.php
@@ -0,0 +1,6 @@
+<?php
+
+$uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path');
+
+echo $uri->getScheme(); // 'http'
+$uri->setScheme('https');
diff --git a/user_guide_src/source/libraries/uri/009.php b/user_guide_src/source/libraries/uri/009.php
new file mode 100644
index 000000000000..44043fbe63d0
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/009.php
@@ -0,0 +1,5 @@
+<?php
+
+$uri = new \CodeIgniter\HTTP\URI('ftp://user:password@example.com:21/some/path');
+
+echo $uri->getAuthority();  // user@example.com:21
diff --git a/user_guide_src/source/libraries/uri/010.php b/user_guide_src/source/libraries/uri/010.php
new file mode 100644
index 000000000000..7b723837fd7f
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/010.php
@@ -0,0 +1,7 @@
+<?php
+
+echo $uri->getAuthority();  // user@example.com:21
+echo $uri->showPassword()->getAuthority();   // user:password@example.com:21
+
+// Turn password display off again.
+$uri->showPassword(false);
diff --git a/user_guide_src/source/libraries/uri/011.php b/user_guide_src/source/libraries/uri/011.php
new file mode 100644
index 000000000000..ac1297380583
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/011.php
@@ -0,0 +1,3 @@
+<?php
+
+echo $uri->getAuthority(true);  // user@example.com
diff --git a/user_guide_src/source/libraries/uri/012.php b/user_guide_src/source/libraries/uri/012.php
new file mode 100644
index 000000000000..0f733222f408
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/012.php
@@ -0,0 +1,3 @@
+<?php
+
+echo $uri->getUserInfo();   // user
diff --git a/user_guide_src/source/libraries/uri/013.php b/user_guide_src/source/libraries/uri/013.php
new file mode 100644
index 000000000000..65836aa97865
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/013.php
@@ -0,0 +1,4 @@
+<?php
+
+echo $uri->showPassword()->getUserInfo();   // user:password
+$uri->showPassword(false);
diff --git a/user_guide_src/source/libraries/uri/014.php b/user_guide_src/source/libraries/uri/014.php
new file mode 100644
index 000000000000..79192a56955d
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/014.php
@@ -0,0 +1,6 @@
+<?php
+
+$uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path');
+
+echo $uri->getHost();   // www.example.com
+echo $uri->setHost('anotherexample.com')->getHost();    // anotherexample.com
diff --git a/user_guide_src/source/libraries/uri/015.php b/user_guide_src/source/libraries/uri/015.php
new file mode 100644
index 000000000000..f5b43c3a65d0
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/015.php
@@ -0,0 +1,6 @@
+<?php
+
+$uri = new \CodeIgniter\HTTP\URI('ftp://user:password@example.com:21/some/path');
+
+echo $uri->getPort();   // 21
+echo $uri->setPort(2201)->getPort(); // 2201
diff --git a/user_guide_src/source/libraries/uri/016.php b/user_guide_src/source/libraries/uri/016.php
new file mode 100644
index 000000000000..a9e680ac38de
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/016.php
@@ -0,0 +1,6 @@
+<?php
+
+$uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path');
+
+echo $uri->getPath();   // 'some/path'
+echo $uri->setPath('another/path')->getPath();  // 'another/path'
diff --git a/user_guide_src/source/libraries/uri/017.php b/user_guide_src/source/libraries/uri/017.php
new file mode 100644
index 000000000000..dd45fb157f4b
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/017.php
@@ -0,0 +1,6 @@
+<?php
+
+$uri = new \CodeIgniter\HTTP\URI('http://www.example.com?foo=bar');
+
+echo $uri->getQuery();  // 'foo=bar'
+$uri->setQuery('foo=bar&bar=baz');
diff --git a/user_guide_src/source/libraries/uri/018.php b/user_guide_src/source/libraries/uri/018.php
new file mode 100644
index 000000000000..64d5ab6f359c
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/018.php
@@ -0,0 +1,3 @@
+<?php
+
+$uri->setQueryArray(['foo' => 'bar', 'bar' => 'baz']);
diff --git a/user_guide_src/source/libraries/uri/019.php b/user_guide_src/source/libraries/uri/019.php
new file mode 100644
index 000000000000..076fbf4652c1
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/019.php
@@ -0,0 +1,3 @@
+<?php
+
+$uri->addQuery('foo', 'bar');
diff --git a/user_guide_src/source/libraries/uri/020.php b/user_guide_src/source/libraries/uri/020.php
new file mode 100644
index 000000000000..ab991a826cff
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/020.php
@@ -0,0 +1,9 @@
+<?php
+
+$uri = new \CodeIgniter\HTTP\URI('http://www.example.com?foo=bar&bar=baz&baz=foz');
+
+// Returns 'foo=bar'
+echo $uri->getQuery(['only' => ['foo']);
+
+// Returns 'foo=bar&baz=foz'
+echo $uri->getQuery(['except' => ['bar']]);
diff --git a/user_guide_src/source/libraries/uri/021.php b/user_guide_src/source/libraries/uri/021.php
new file mode 100644
index 000000000000..ed2976e6e1d3
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/021.php
@@ -0,0 +1,9 @@
+<?php
+
+$uri = new \CodeIgniter\HTTP\URI('http://www.example.com?foo=bar&bar=baz&baz=foz');
+
+// Leaves just the 'baz' variable
+$uri->stripQuery('foo', 'bar');
+
+// Leaves just the 'foo' variable
+$uri->keepQuery('foo');
diff --git a/user_guide_src/source/libraries/uri/022.php b/user_guide_src/source/libraries/uri/022.php
new file mode 100644
index 000000000000..e2df019dcb87
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/022.php
@@ -0,0 +1,6 @@
+<?php
+
+$uri = new \CodeIgniter\HTTP\URI('http://www.example.com/some/path#first-heading');
+
+echo $uri->getFragment();   // 'first-heading'
+echo $uri->setFragment('second-heading')->getFragment();    // 'second-heading'
diff --git a/user_guide_src/source/libraries/uri/023.php b/user_guide_src/source/libraries/uri/023.php
new file mode 100644
index 000000000000..8c611f066c28
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/023.php
@@ -0,0 +1,8 @@
+<?php
+
+// URI = http://example.com/users/15/profile
+
+// Prints '15'
+if ($uri->getSegment(1) == 'users') {
+    echo $uri->getSegment(2);
+}
diff --git a/user_guide_src/source/libraries/uri/024.php b/user_guide_src/source/libraries/uri/024.php
new file mode 100644
index 000000000000..61a951db93c3
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/024.php
@@ -0,0 +1,14 @@
+<?php
+
+// URI = http://example.com/users/15/profile
+
+// will print 'profile'
+echo $uri->getSegment(3, 'foo');
+// will print 'bar'
+echo $uri->getSegment(4, 'bar');
+// will throw an exception
+echo $uri->getSegment(5, 'baz');
+// will print 'baz'
+echo $uri->setSilent()->getSegment(5, 'baz');
+// will print '' (empty string)
+echo $uri->setSilent()->getSegment(5);
diff --git a/user_guide_src/source/libraries/uri/025.php b/user_guide_src/source/libraries/uri/025.php
new file mode 100644
index 000000000000..ce130a2c6f8b
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/025.php
@@ -0,0 +1,3 @@
+<?php
+
+$total = $uri->getTotalSegments(); // 3
diff --git a/user_guide_src/source/libraries/uri/026.php b/user_guide_src/source/libraries/uri/026.php
new file mode 100644
index 000000000000..c5be0f68c2ff
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/026.php
@@ -0,0 +1,10 @@
+<?php
+
+$segments = $uri->getSegments();
+
+// $segments =
+[
+    0 => 'users',
+    1 => '15',
+    2 => 'profile'
+]
diff --git a/user_guide_src/source/libraries/uri/027.php b/user_guide_src/source/libraries/uri/027.php
new file mode 100644
index 000000000000..8ad2f883ffe4
--- /dev/null
+++ b/user_guide_src/source/libraries/uri/027.php
@@ -0,0 +1,7 @@
+<?php
+
+// Disable throwing exceptions
+$uri->setSilent();
+
+// Enable throwing exceptions (default)
+$uri->setSilent(false);
diff --git a/user_guide_src/source/libraries/user_agent.rst b/user_guide_src/source/libraries/user_agent.rst
index 576798bf4b2a..fad24a91d403 100644
--- a/user_guide_src/source/libraries/user_agent.rst
+++ b/user_guide_src/source/libraries/user_agent.rst
@@ -18,9 +18,10 @@ Initializing the Class
 
 The User Agent class is always available directly from the current :doc:`IncomingRequest </incoming/incomingrequest>` instance.
 By default, you will have a request instance in your controller that you can retrieve the
-User Agent class from::
+User Agent class from:
 
-    $agent = $this->request->getUserAgent();
+.. literalinclude:: user_agent/001.php
+   :lines: 2-
 
 User Agent Definitions
 ======================
@@ -35,23 +36,10 @@ Example
 When the User Agent class is initialized it will attempt to determine
 whether the user agent browsing your site is a web browser, a mobile
 device, or a robot. It will also gather the platform information if it
-is available::
+is available:
 
-    $agent = $this->request->getUserAgent();
-
-    if ($agent->isBrowser()) {
-        $currentAgent = $agent->getBrowser() . ' ' . $agent->getVersion();
-    } elseif ($agent->isRobot()) {
-        $currentAgent = $agent->getRobot();
-    } elseif ($agent->isMobile()) {
-        $currentAgent = $agent->getMobile();
-    } else {
-        $currentAgent = 'Unidentified User Agent';
-    }
-
-    echo $currentAgent;
-
-    echo $agent->getPlatform(); // Platform info (Windows, Linux, Mac, etc.)
+.. literalinclude:: user_agent/002.php
+   :lines: 2-
 
 ***************
 Class Reference
@@ -66,13 +54,9 @@ Class Reference
         :rtype:    bool
 
         Returns true/false (boolean) if the user agent is a known web browser.
-        ::
 
-            if ($agent->isBrowser('Safari')) {
-                echo 'You are using Safari.';
-            } elseif ($agent->isBrowser()) {
-                echo 'You are using a browser.';
-            }
+        .. literalinclude:: user_agent/003.php
+           :lines: 2-
 
         .. note:: The string "Safari" in this example is an array key in the list of browser definitions.
                   You can find this list in **app/Config/UserAgents.php** if you want to add new
@@ -85,15 +69,9 @@ Class Reference
         :rtype:    bool
 
         Returns true/false (boolean) if the user agent is a known mobile device.
-        ::
 
-            if ($agent->isMobile('iphone')) {
-                echo view('iphone/home');
-            } elseif ($agent->isMobile()) {
-                echo view('mobile/home');
-            } else {
-                echo view('web/home');
-            }
+        .. literalinclude:: user_agent/004.php
+           :lines: 2-
 
     .. php:method:: isRobot([$key = null])
 
@@ -155,11 +133,10 @@ Class Reference
         :returns:    Detected referrer or an empty string
         :rtype:    string
 
-        The referrer, if the user agent was referred from another site. Typically you'll test for this as follows::
+        The referrer, if the user agent was referred from another site. Typically you'll test for this as follows:
 
-            if ($agent->isReferral()) {
-                echo $agent->referrer();
-            }
+        .. literalinclude:: user_agent/005.php
+           :lines: 2-
 
     .. php:method:: getAgentString()
 
diff --git a/user_guide_src/source/libraries/user_agent/001.php b/user_guide_src/source/libraries/user_agent/001.php
new file mode 100644
index 000000000000..f8af7f7cfaee
--- /dev/null
+++ b/user_guide_src/source/libraries/user_agent/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$agent = $this->request->getUserAgent();
diff --git a/user_guide_src/source/libraries/user_agent/002.php b/user_guide_src/source/libraries/user_agent/002.php
new file mode 100644
index 000000000000..0a92a06bc2f7
--- /dev/null
+++ b/user_guide_src/source/libraries/user_agent/002.php
@@ -0,0 +1,17 @@
+<?php
+
+$agent = $this->request->getUserAgent();
+
+if ($agent->isBrowser()) {
+    $currentAgent = $agent->getBrowser() . ' ' . $agent->getVersion();
+} elseif ($agent->isRobot()) {
+    $currentAgent = $agent->getRobot();
+} elseif ($agent->isMobile()) {
+    $currentAgent = $agent->getMobile();
+} else {
+    $currentAgent = 'Unidentified User Agent';
+}
+
+echo $currentAgent;
+
+echo $agent->getPlatform(); // Platform info (Windows, Linux, Mac, etc.)
diff --git a/user_guide_src/source/libraries/user_agent/003.php b/user_guide_src/source/libraries/user_agent/003.php
new file mode 100644
index 000000000000..0abfbf22d7d8
--- /dev/null
+++ b/user_guide_src/source/libraries/user_agent/003.php
@@ -0,0 +1,7 @@
+<?php
+
+if ($agent->isBrowser('Safari')) {
+    echo 'You are using Safari.';
+} elseif ($agent->isBrowser()) {
+    echo 'You are using a browser.';
+}
diff --git a/user_guide_src/source/libraries/user_agent/004.php b/user_guide_src/source/libraries/user_agent/004.php
new file mode 100644
index 000000000000..80405bff519d
--- /dev/null
+++ b/user_guide_src/source/libraries/user_agent/004.php
@@ -0,0 +1,9 @@
+<?php
+
+if ($agent->isMobile('iphone')) {
+    echo view('iphone/home');
+} elseif ($agent->isMobile()) {
+    echo view('mobile/home');
+} else {
+    echo view('web/home');
+}
diff --git a/user_guide_src/source/libraries/user_agent/005.php b/user_guide_src/source/libraries/user_agent/005.php
new file mode 100644
index 000000000000..944c70975971
--- /dev/null
+++ b/user_guide_src/source/libraries/user_agent/005.php
@@ -0,0 +1,5 @@
+<?php
+
+if ($agent->isReferral()) {
+    echo $agent->referrer();
+}
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 89eb4740179d..0f43f911a506 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -117,29 +117,9 @@ The Controller
 ================================================
 
 Using a text editor, create a controller called **Form.php**. In it, place
-this code and save it to your **app/Controllers/** folder::
+this code and save it to your **app/Controllers/** folder:
 
-    <?php
-
-    namespace App\Controllers;
-
-    use CodeIgniter\Controller;
-
-    class Form extends Controller
-    {
-        public function index()
-        {
-            helper(['form', 'url']);
-
-            if (! $this->validate([])) {
-                echo view('Signup', [
-                    'validation' => $this->validator,
-                ]);
-            } else {
-                echo view('Success');
-            }
-        }
-    }
+.. literalinclude:: validation/001.php
 
 Try it!
 ================================================
@@ -188,16 +168,10 @@ form or the success page.
 Add Validation Rules
 ================================================
 
-Then add validation rules in the controller (**Form.php**)::
+Then add validation rules in the controller (**Form.php**):
 
-            if (! $this->validate([
-                'username' => 'required',
-                'password' => 'required|min_length[10]',
-                'passconf' => 'required|matches[password]',
-                'email'    => 'required|valid_email',
-            ])) {
-                ...
-            }
+.. literalinclude:: validation/002.php
+   :lines: 2-
 
 If you submit the form you should see the success page or the form with error messages.
 
@@ -228,21 +202,18 @@ The **Strict Rules** don't use implicit type conversion.
 Using Strict Rules
 ------------------
 
-If you want to use these rules, you need to change the rule classes in **app/Config/Validation.php**::
+If you want to use these rules, you need to change the rule classes in **app/Config/Validation.php**:
 
-        public $ruleSets = [
-            \CodeIgniter\Validation\StrictRules\CreditCardRules::class,
-            \CodeIgniter\Validation\StrictRules\FileRules::class,
-            \CodeIgniter\Validation\StrictRules\FormatRules::class,
-            \CodeIgniter\Validation\StrictRules\Rules::class,
-        ];
+.. literalinclude:: validation/003.php
+   :lines: 2-
 
 Loading the Library
 ************************************************
 
-The library is loaded as a service named **validation**::
+The library is loaded as a service named **validation**:
 
-    $validation =  \Config\Services::validation();
+.. literalinclude:: validation/004.php
+   :lines: 2-
 
 This automatically loads the ``Config\Validation`` file which contains settings
 for including multiple Rulesets, and collections of rules that can be easily reused.
@@ -265,10 +236,10 @@ This method sets a single rule. It has the method signature::
 
     setRule(string $field, ?string $label, array|string $rules[, array $errors = []])
 
-The ``$rules`` either takes in a pipe-delimited list of rules or an array collection of rules::
+The ``$rules`` either takes in a pipe-delimited list of rules or an array collection of rules:
 
-    $validation->setRule('username', 'Username', 'required|min_length[3]');
-    $validation->setRule('password', 'Password', ['required', 'min_length[8]', 'alpha_numeric_punct']);
+.. literalinclude:: validation/005.php
+   :lines: 2-
 
 The value you pass to ``$field`` must match the key of any data array that is sent in. If
 the data is taken directly from ``$_POST``, then it must be an exact match for
@@ -282,19 +253,15 @@ the form input name.
 setRules()
 ==========
 
-Like ``setRule()``, but accepts an array of field names and their rules::
+Like ``setRule()``, but accepts an array of field names and their rules:
 
-    $validation->setRules([
-        'username' => 'required',
-        'password' => 'required|min_length[10]',
-    ]);
+.. literalinclude:: validation/006.php
+   :lines: 2-
 
-To give a labeled error message you can set up as::
+To give a labeled error message you can set up as:
 
-    $validation->setRules([
-        'username' => ['label' => 'Username', 'rules' => 'required'],
-        'password' => ['label' => 'Password', 'rules' => 'required|min_length[10]'],
-    ]);
+.. literalinclude:: validation/007.php
+   :lines: 2-
 
 withRequest()
 =============
@@ -302,9 +269,10 @@ withRequest()
 One of the most common times you will use the validation library is when validating
 data that was input from an HTTP Request. If desired, you can pass an instance of the
 current Request object and it will take all of the input data and set it as the
-data to be validated::
+data to be validated:
 
-    $validation->withRequest($this->request)->run();
+.. literalinclude:: validation/008.php
+   :lines: 2-
 
 Working with Validation
 ************************************************
@@ -313,58 +281,29 @@ Validating Keys that are Arrays
 ================================================
 
 If your data is in a nested associative array, you can use "dot array syntax" to
-easily validate your data::
+easily validate your data:
 
-    // The data to test:
-    'contacts' => [
-        'name' => 'Joe Smith',
-        'friends' => [
-            [
-                'name' => 'Fred Flinstone',
-            ],
-            [
-                'name' => 'Wilma',
-            ],
-        ]
-    ]
+.. literalinclude:: validation/009.php
+   :lines: 2-
 
-    // Joe Smith
-    $validation->setRules([
-        'contacts.name' => 'required',
-    ]);
-
-    // Fred Flintsone & Wilma
-    $validation->setRules([
-        'contacts.friends.name' => 'required',
-    ]);
+You can use the '*' wildcard symbol to match any one level of the array:
 
-You can use the '*' wildcard symbol to match any one level of the array::
-
-    // Fred Flintsone & Wilma
-    $validation->setRules([
-        'contacts.*.name' => 'required',
-    ]);
+.. literalinclude:: validation/010.php
+   :lines: 2-
 
 "dot array syntax" can also be useful when you have single dimension array data.
-For example, data returned by multi select dropdown::
+For example, data returned by multi select dropdown:
 
-    // The data to test:
-    'user_ids' => [
-        1,
-        2,
-        3,
-    ]
-    // Rule
-    $validation->setRules([
-        'user_ids.*' => 'required',
-    ]);
+.. literalinclude:: validation/011.php
+   :lines: 2-
 
 Validate 1 Value
 ================================================
 
-Validate one value against a rule::
+Validate one value against a rule:
 
-    $validation->check($value, 'required');
+.. literalinclude:: validation/012.php
+   :lines: 2-
 
 Saving Sets of Validation Rules to the Config File
 =======================================================
@@ -381,64 +320,27 @@ How to save your rules
 
 To store your validation rules, simply create a new public property in the ``Config\Validation``
 class with the name of your group. This element will hold an array with your validation
-rules. As shown earlier, the validation array will have this prototype::
+rules. As shown earlier, the validation array will have this prototype:
 
-    class Validation
-    {
-        public $signup = [
-            'username'     => 'required',
-            'password'     => 'required',
-            'pass_confirm' => 'required|matches[password]',
-            'email'        => 'required|valid_email',
-        ];
-    }
+.. literalinclude:: validation/013.php
+   :lines: 2-
 
-You can specify the group to use when you call the ``run()`` method::
+You can specify the group to use when you call the ``run()`` method:
 
-    $validation->run($data, 'signup');
+.. literalinclude:: validation/014.php
+   :lines: 2-
 
 You can also store custom error messages in this configuration file by naming the
 property the same as the group, and appended with ``_errors``. These will automatically
-be used for any errors when this group is used::
-
-    class Validation
-    {
-        public $signup = [
-            'username'     => 'required',
-            'password'     => 'required',
-            'pass_confirm' => 'required|matches[password]',
-            'email'        => 'required|valid_email',
-        ];
-
-        public $signup_errors = [
-            'username' => [
-                'required'    => 'You must choose a username.',
-            ],
-            'email'    => [
-                'valid_email' => 'Please check the Email field. It does not appear to be valid.',
-            ],
-        ];
-    }
-
-Or pass all settings in an array::
-
-    class Validation
-    {
-        public $signup = [
-            'username' => [
-                'rules'  => 'required',
-                'errors' => [
-                    'required' => 'You must choose a Username.',
-                ],
-            ],
-            'email'    => [
-                'rules'  => 'required|valid_email',
-                'errors' => [
-                    'valid_email' => 'Please check the Email field. It does not appear to be valid.',
-                ],
-            ],
-        ];
-    }
+be used for any errors when this group is used:
+
+.. literalinclude:: validation/015.php
+   :lines: 2-
+
+Or pass all settings in an array:
+
+.. literalinclude:: validation/016.php
+   :lines: 2-
 
 See below for details on the formatting of the array.
 
@@ -447,15 +349,17 @@ Getting & Setting Rule Groups
 
 **Get Rule Group**
 
-This method gets a rule group from the validation configuration::
+This method gets a rule group from the validation configuration:
 
-    $validation->getRuleGroup('signup');
+.. literalinclude:: validation/017.php
+   :lines: 2-
 
 **Set Rule Group**
 
-This method sets a rule group from the validation configuration to the validation service::
+This method sets a rule group from the validation configuration to the validation service:
 
-    $validation->setRuleGroup('signup');
+.. literalinclude:: validation/018.php
+   :lines: 2-
 
 Running Multiple Validations
 =======================================================
@@ -467,16 +371,10 @@ Running Multiple Validations
 If you intend to run multiple validations, for instance on different data sets or with different
 rules after one another, you might need to call ``$validation->reset()`` before each run to get rid of
 errors from previous run. Be aware that ``reset()`` will invalidate any data, rule or custom error
-you previously set, so ``setRules()``, ``setRuleGroup()`` etc. need to be repeated::
+you previously set, so ``setRules()``, ``setRuleGroup()`` etc. need to be repeated:
 
-    foreach ($userAccounts as $user) {
-        $validation->reset();
-        $validation->setRules($userAccountRules);
-
-        if (! $validation->run($user)) {
-            // handle validation errors
-        }
-    }
+.. literalinclude:: validation/019.php
+   :lines: 2-
 
 Validation Placeholders
 =======================================================
@@ -484,25 +382,21 @@ Validation Placeholders
 The Validation class provides a simple method to replace parts of your rules based on data that's being passed into it. This
 sounds fairly obscure but can be especially handy with the ``is_unique`` validation rule. Placeholders are simply
 the name of the field (or array key) that was passed in as ``$data`` surrounded by curly brackets. It will be
-replaced by the **value** of the matched incoming field. An example should clarify this::
+replaced by the **value** of the matched incoming field. An example should clarify this:
 
-    $validation->setRules([
-        'email' => 'required|valid_email|is_unique[users.email,id,{id}]',
-    ]);
+.. literalinclude:: validation/020.php
+   :lines: 2-
 
 In this set of rules, it states that the email address should be unique in the database, except for the row
-that has an id matching the placeholder's value. Assuming that the form POST data had the following::
+that has an id matching the placeholder's value. Assuming that the form POST data had the following:
 
-    $_POST = [
-        'id' => 4,
-        'email' => 'foo@example.com',
-    ];
+.. literalinclude:: validation/021.php
+   :lines: 2-
 
-then the ``{id}`` placeholder would be replaced with the number **4**, giving this revised rule::
+then the ``{id}`` placeholder would be replaced with the number **4**, giving this revised rule:
 
-    $validation->setRules([
-        'email' => 'required|valid_email|is_unique[users.email,id,4]',
-    ]);
+.. literalinclude:: validation/022.php
+   :lines: 2-
 
 So it will ignore the row in the database that has ``id=4`` when it verifies the email is unique.
 
@@ -530,46 +424,21 @@ instance. If not custom error message is provided, the default value will be use
 
 These are two ways to provide custom error messages.
 
-As the last parameter::
+As the last parameter:
 
-    $validation->setRules([
-            'username' => 'required|is_unique[users.username]',
-            'password' => 'required|min_length[10]'
-        ],
-        [   // Errors
-            'username' => [
-                'required' => 'All accounts must have usernames provided',
-            ],
-            'password' => [
-                'min_length' => 'Your password is too short. You want to get hacked?',
-            ],
-        ]
-    );
+.. literalinclude:: validation/023.php
+   :lines: 2-
 
-Or as a labeled style::
+Or as a labeled style:
 
-    $validation->setRules([
-            'username' => [
-                'label'  => 'Username',
-                'rules'  => 'required|is_unique[users.username]',
-                'errors' => [
-                    'required' => 'All accounts must have {field} provided',
-                ],
-            ],
-            'password' => [
-                'label'  => 'Password',
-                'rules'  => 'required|min_length[10]',
-                'errors' => [
-                    'min_length' => 'Your {field} is too short. You want to get hacked?',
-                ],
-            ]
-        ]
-    );
+.. literalinclude:: validation/024.php
+   :lines: 2-
 
 If you’d like to include a field’s “human” name, or the optional parameter some rules allow for (such as max_length),
-or the value that was validated you can add the ``{field}``, ``{param}`` and ``{value}`` tags to your message, respectively::
+or the value that was validated you can add the ``{field}``, ``{param}`` and ``{value}`` tags to your message, respectively:
 
-    'min_length' => 'Supplied value ({value}) for {field} must have at least {param} characters.'
+.. literalinclude:: validation/025.php
+   :lines: 2-
 
 On a field with the human name Username and a rule of ``min_length[6]`` with a value of “Pizza”, an error would display: “Supplied value (Pizza) for Username must have
 at least 6 characters.”
@@ -583,40 +452,20 @@ Translation Of Messages And Validation Labels
 
 To use translated strings from language files, we can simply use the dot syntax.
 Let's say we have a file with translations located here: ``app/Languages/en/Rules.php``.
-We can simply use the language lines defined in this file, like this::
-
-    $validation->setRules([
-            'username' => [
-                'label'  => 'Rules.username',
-                'rules'  => 'required|is_unique[users.username]',
-                'errors' => [
-                    'required' => 'Rules.username.required',
-                ],
-            ],
-            'password' => [
-                'label'  => 'Rules.password',
-                'rules'  => 'required|min_length[10]',
-                'errors' => [
-                    'min_length' => 'Rules.password.min_length',
-                ],
-            ],
-        ]
-    );
+We can simply use the language lines defined in this file, like this:
+
+.. literalinclude:: validation/026.php
+   :lines: 2-
 
 .. _validation-getting-all-errors:
 
 Getting All Errors
 ==================
 
-If you need to retrieve all error messages for failed fields, you can use the ``getErrors()`` method::
-
-    $errors = $validation->getErrors();
+If you need to retrieve all error messages for failed fields, you can use the ``getErrors()`` method:
 
-    // Returns:
-    [
-        'field1' => 'error message',
-        'field2' => 'error message',
-    ]
+.. literalinclude:: validation/027.php
+   :lines: 2-
 
 If no errors exist, an empty array will be returned.
 
@@ -644,9 +493,10 @@ Getting a Single Error
 ======================
 
 You can retrieve the error for a single field with the ``getError()`` method. The only parameter is the field
-name::
+name:
 
-    $error = $validation->getError('username');
+.. literalinclude:: validation/028.php
+   :lines: 2-
 
 If no error exists, an empty string will be returned.
 
@@ -655,11 +505,10 @@ If no error exists, an empty string will be returned.
 Check If Error Exists
 =====================
 
-You can check to see if an error exists with the ``hasError()`` method. The only parameter is the field name::
+You can check to see if an error exists with the ``hasError()`` method. The only parameter is the field name:
 
-    if ($validation->hasError('username')) {
-        echo $validation->getError('username');
-    }
+.. literalinclude:: validation/029.php
+   :lines: 2-
 
 When specifying a field with a wildcard, all errors matching the mask will be checked.::
 
@@ -683,23 +532,15 @@ Creating the Views
 
 The first step is to create custom views. These can be placed anywhere that the ``view()`` method can locate them,
 which means the standard View directory, or any namespaced View folder will work. For example, you could create
-a new view at **/app/Views/_errors_list.php**::
+a new view at **/app/Views/_errors_list.php**:
 
-    <div class="alert alert-danger" role="alert">
-        <ul>
-        <?php foreach ($errors as $error): ?>
-            <li><?= esc($error) ?></li>
-        <?php endforeach ?>
-        </ul>
-    </div>
+.. literalinclude:: validation/029-2.php
 
 An array named ``$errors`` is available within the view that contains a list of the errors, where the key is
-the name of the field that had the error, and the value is the error message, like this::
+the name of the field that had the error, and the value is the error message, like this:
 
-    $errors = [
-        'username' => 'The username field must be unique.',
-        'email'    => 'You must provide a valid email address.'
-    ];
+.. literalinclude:: validation/030.php
+   :lines: 2-
 
 There are actually two types of views that you can create. The first has an array of all of the errors, and is what
 we just looked at. The other type is simpler, and only contains a single variable, ``$error`` that contains the
@@ -712,13 +553,10 @@ Configuration
 
 Once you have your views created, you need to let the Validation library know about them. Open ``Config/Validation.php``.
 Inside, you'll find the ``$templates`` property where you can list as many custom views as you want, and provide an
-short alias they can be referenced by. If we were to add our example file from above, it would look something like::
+short alias they can be referenced by. If we were to add our example file from above, it would look something like:
 
-    public $templates = [
-        'list'    => 'CodeIgniter\Validation\Views\list',
-        'single'  => 'CodeIgniter\Validation\Views\single',
-        'my_list' => '_errors_list',
-    ];
+.. literalinclude:: validation/031.php
+   :lines: 2-
 
 Specifying the Template
 =======================
@@ -737,94 +575,41 @@ Creating Custom Rules
 
 Rules are stored within simple, namespaced classes. They can be stored any location you would like, as long as the
 autoloader can find it. These files are called RuleSets. To add a new RuleSet, edit **Config/Validation.php** and
-add the new file to the ``$ruleSets`` array::
-
-    use CodeIgniter\Validation\CreditCardRules;
-    use CodeIgniter\Validation\FileRules;
-    use CodeIgniter\Validation\FormatRules;
-    use CodeIgniter\Validation\Rules;
+add the new file to the ``$ruleSets`` array:
 
-    public $ruleSets = [
-        Rules::class,
-        FormatRules::class,
-        FileRules::class,
-        CreditCardRules::class,
-    ];
+.. literalinclude:: validation/032.php
+   :lines: 2-
 
 You can add it as either a simple string with the fully qualified class name, or using the ``::class`` suffix as
 shown above. The primary benefit here is that it provides some extra navigation capabilities in more advanced IDEs.
 
 Within the file itself, each method is a rule and must accept a string as the first parameter, and must return
-a boolean true or false value signifying true if it passed the test or false if it did not::
+a boolean true or false value signifying true if it passed the test or false if it did not:
 
-    class MyRules
-    {
-        public function even(string $str): bool
-        {
-            return (int) $str % 2 == 0;
-        }
-    }
+.. literalinclude:: validation/033.php
+   :lines: 2-
 
 By default, the system will look within ``CodeIgniter\Language\en\Validation.php`` for the language strings used
 within errors. In custom rules, you may provide error messages by accepting a ``$error`` variable by reference in the
-second parameter::
+second parameter:
 
-    public function even(string $str, string &$error = null): bool
-    {
-        if ((int) $str % 2 !== 0) {
-            $error = lang('myerrors.evenError');
+.. literalinclude:: validation/034.php
+   :lines: 2-
 
-            return false;
-        }
+Your new custom rule could now be used just like any other rule:
 
-        return true;
-    }
-
-Your new custom rule could now be used just like any other rule::
-
-    $this->validate($request, [
-        'foo' => 'required|even',
-    ]);
+.. literalinclude:: validation/035.php
+   :lines: 2-
 
 Allowing Parameters
 ===================
 
 If your method needs to work with parameters, the function will need a minimum of three parameters: the string to validate,
 the parameter string, and an array with all of the data that was submitted the form. The ``$data`` array is especially handy
-for rules like ``require_with`` that needs to check the value of another submitted field to base its result on::
-
-    public function required_with($str, string $fields, array $data): bool
-    {
-        $fields = explode(',', $fields);
-
-        // If the field is present we can safely assume that
-        // the field is here, no matter whether the corresponding
-        // search field is present or not.
-        $present = $this->required($str ?? '');
+for rules like ``require_with`` that needs to check the value of another submitted field to base its result on:
 
-        if ($present) {
-            return true;
-        }
-
-        // Still here? Then we fail this test if
-        // any of the fields are present in $data
-        // as $fields is the lis
-        $requiredFields = [];
-
-        foreach ($fields as $field) {
-            if (array_key_exists($field, $data)) {
-                $requiredFields[] = $field;
-            }
-        }
-
-        // Remove any keys with empty values since, that means they
-        // weren't truly there, as far as this is concerned.
-        $requiredFields = array_filter($requiredFields, function ($item) use ($data) {
-            return ! empty($data[$item]);
-        });
-
-        return empty($requiredFields);
-    }
+.. literalinclude:: validation/036.php
+   :lines: 2-
 
 Custom errors can be returned as the fourth parameter, just as described above.
 
@@ -836,16 +621,8 @@ The following is a list of all the native rules that are available to use:
 .. note:: Rule is a string; there must be **no spaces** between the parameters, especially the ``is_unique`` rule.
     There can be no spaces before and after ``ignore_value``.
 
-::
-
-    // is_unique[table.field,ignore_field,ignore_value]
-
-    $validation->setRules([
-        'name' => "is_unique[supplier.name,uuid, $uuid]",  // is not ok
-        'name' => "is_unique[supplier.name,uuid,$uuid ]",  // is not ok
-        'name' => "is_unique[supplier.name,uuid,$uuid]",   // is ok
-        'name' => "is_unique[supplier.name,uuid,{uuid}]",  // is ok - see "Validation Placeholders"
-    ]);
+.. literalinclude:: validation/037.php
+   :lines: 2-
 
 ======================= ========== ============================================= ===================================================
 Rule                    Parameter  Description                                   Example
diff --git a/user_guide_src/source/libraries/validation/001.php b/user_guide_src/source/libraries/validation/001.php
new file mode 100644
index 000000000000..e52362c46cea
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/001.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Controllers;
+
+use CodeIgniter\Controller;
+
+class Form extends Controller
+{
+    public function index()
+    {
+        helper(['form', 'url']);
+
+        if (! $this->validate([])) {
+            echo view('Signup', [
+                'validation' => $this->validator,
+            ]);
+        } else {
+            echo view('Success');
+        }
+    }
+}
diff --git a/user_guide_src/source/libraries/validation/002.php b/user_guide_src/source/libraries/validation/002.php
new file mode 100644
index 000000000000..46322fe586bd
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/002.php
@@ -0,0 +1,10 @@
+<?php
+
+if (! $this->validate([
+    'username' => 'required',
+    'password' => 'required|min_length[10]',
+    'passconf' => 'required|matches[password]',
+    'email'    => 'required|valid_email',
+])) {
+    ...
+}
diff --git a/user_guide_src/source/libraries/validation/003.php b/user_guide_src/source/libraries/validation/003.php
new file mode 100644
index 000000000000..a6ae3a4a6fff
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/003.php
@@ -0,0 +1,8 @@
+<?php
+
+public $ruleSets = [
+    \CodeIgniter\Validation\StrictRules\CreditCardRules::class,
+    \CodeIgniter\Validation\StrictRules\FileRules::class,
+    \CodeIgniter\Validation\StrictRules\FormatRules::class,
+    \CodeIgniter\Validation\StrictRules\Rules::class,
+];
diff --git a/user_guide_src/source/libraries/validation/004.php b/user_guide_src/source/libraries/validation/004.php
new file mode 100644
index 000000000000..60b31dec6d82
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/004.php
@@ -0,0 +1,3 @@
+<?php
+
+$validation =  \Config\Services::validation();
diff --git a/user_guide_src/source/libraries/validation/005.php b/user_guide_src/source/libraries/validation/005.php
new file mode 100644
index 000000000000..9d129e6425e1
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/005.php
@@ -0,0 +1,4 @@
+<?php
+
+$validation->setRule('username', 'Username', 'required|min_length[3]');
+$validation->setRule('password', 'Password', ['required', 'min_length[8]', 'alpha_numeric_punct']);
diff --git a/user_guide_src/source/libraries/validation/006.php b/user_guide_src/source/libraries/validation/006.php
new file mode 100644
index 000000000000..24a771f70e31
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/006.php
@@ -0,0 +1,6 @@
+<?php
+
+$validation->setRules([
+    'username' => 'required',
+    'password' => 'required|min_length[10]',
+]);
diff --git a/user_guide_src/source/libraries/validation/007.php b/user_guide_src/source/libraries/validation/007.php
new file mode 100644
index 000000000000..b211d9c1cec5
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/007.php
@@ -0,0 +1,6 @@
+<?php
+
+$validation->setRules([
+    'username' => ['label' => 'Username', 'rules' => 'required'],
+    'password' => ['label' => 'Password', 'rules' => 'required|min_length[10]'],
+]);
diff --git a/user_guide_src/source/libraries/validation/008.php b/user_guide_src/source/libraries/validation/008.php
new file mode 100644
index 000000000000..1b570f1aad82
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/008.php
@@ -0,0 +1,3 @@
+<?php
+
+$validation->withRequest($this->request)->run();
diff --git a/user_guide_src/source/libraries/validation/009.php b/user_guide_src/source/libraries/validation/009.php
new file mode 100644
index 000000000000..1678d5530f27
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/009.php
@@ -0,0 +1,24 @@
+<?php
+
+// The data to test:
+'contacts' => [
+    'name' => 'Joe Smith',
+    'friends' => [
+        [
+            'name' => 'Fred Flinstone',
+        ],
+        [
+            'name' => 'Wilma',
+        ],
+    ]
+]
+
+// Joe Smith
+$validation->setRules([
+    'contacts.name' => 'required',
+]);
+
+// Fred Flintsone & Wilma
+$validation->setRules([
+    'contacts.friends.name' => 'required',
+]);
diff --git a/user_guide_src/source/libraries/validation/010.php b/user_guide_src/source/libraries/validation/010.php
new file mode 100644
index 000000000000..94c6919311d5
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/010.php
@@ -0,0 +1,6 @@
+<?php
+
+// Fred Flintsone & Wilma
+$validation->setRules([
+    'contacts.*.name' => 'required',
+]);
diff --git a/user_guide_src/source/libraries/validation/011.php b/user_guide_src/source/libraries/validation/011.php
new file mode 100644
index 000000000000..023712f4315e
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/011.php
@@ -0,0 +1,12 @@
+<?php
+
+// The data to test:
+'user_ids' => [
+    1,
+    2,
+    3,
+]
+// Rule
+$validation->setRules([
+    'user_ids.*' => 'required',
+]);
diff --git a/user_guide_src/source/libraries/validation/012.php b/user_guide_src/source/libraries/validation/012.php
new file mode 100644
index 000000000000..a43f9ab1a498
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/012.php
@@ -0,0 +1,3 @@
+<?php
+
+$validation->check($value, 'required');
diff --git a/user_guide_src/source/libraries/validation/013.php b/user_guide_src/source/libraries/validation/013.php
new file mode 100644
index 000000000000..f90dfc0ba5fc
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/013.php
@@ -0,0 +1,11 @@
+<?php
+
+class Validation
+{
+    public $signup = [
+        'username'     => 'required',
+        'password'     => 'required',
+        'pass_confirm' => 'required|matches[password]',
+        'email'        => 'required|valid_email',
+    ];
+}
diff --git a/user_guide_src/source/libraries/validation/014.php b/user_guide_src/source/libraries/validation/014.php
new file mode 100644
index 000000000000..1aa5b7f521c0
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/014.php
@@ -0,0 +1,3 @@
+<?php
+
+$validation->run($data, 'signup');
diff --git a/user_guide_src/source/libraries/validation/015.php b/user_guide_src/source/libraries/validation/015.php
new file mode 100644
index 000000000000..31cf681b92a7
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/015.php
@@ -0,0 +1,20 @@
+<?php
+
+class Validation
+{
+    public $signup = [
+        'username'     => 'required',
+        'password'     => 'required',
+        'pass_confirm' => 'required|matches[password]',
+        'email'        => 'required|valid_email',
+    ];
+
+    public $signup_errors = [
+        'username' => [
+            'required'    => 'You must choose a username.',
+        ],
+        'email'    => [
+            'valid_email' => 'Please check the Email field. It does not appear to be valid.',
+        ],
+    ];
+}
diff --git a/user_guide_src/source/libraries/validation/016.php b/user_guide_src/source/libraries/validation/016.php
new file mode 100644
index 000000000000..55d9f6985cf9
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/016.php
@@ -0,0 +1,19 @@
+<?php
+
+class Validation
+{
+    public $signup = [
+        'username' => [
+            'rules'  => 'required',
+            'errors' => [
+                'required' => 'You must choose a Username.',
+            ],
+        ],
+        'email'    => [
+            'rules'  => 'required|valid_email',
+            'errors' => [
+                'valid_email' => 'Please check the Email field. It does not appear to be valid.',
+            ],
+        ],
+    ];
+}
diff --git a/user_guide_src/source/libraries/validation/017.php b/user_guide_src/source/libraries/validation/017.php
new file mode 100644
index 000000000000..f84561eb5375
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/017.php
@@ -0,0 +1,3 @@
+<?php
+
+$validation->getRuleGroup('signup');
diff --git a/user_guide_src/source/libraries/validation/018.php b/user_guide_src/source/libraries/validation/018.php
new file mode 100644
index 000000000000..245c4b6932cf
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/018.php
@@ -0,0 +1,3 @@
+<?php
+
+$validation->setRuleGroup('signup');
diff --git a/user_guide_src/source/libraries/validation/019.php b/user_guide_src/source/libraries/validation/019.php
new file mode 100644
index 000000000000..bf158323f638
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/019.php
@@ -0,0 +1,10 @@
+<?php
+
+foreach ($userAccounts as $user) {
+    $validation->reset();
+    $validation->setRules($userAccountRules);
+
+    if (! $validation->run($user)) {
+        // handle validation errors
+    }
+}
diff --git a/user_guide_src/source/libraries/validation/020.php b/user_guide_src/source/libraries/validation/020.php
new file mode 100644
index 000000000000..d9ab8f75fcdc
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/020.php
@@ -0,0 +1,5 @@
+<?php
+
+$validation->setRules([
+    'email' => 'required|valid_email|is_unique[users.email,id,{id}]',
+]);
diff --git a/user_guide_src/source/libraries/validation/021.php b/user_guide_src/source/libraries/validation/021.php
new file mode 100644
index 000000000000..ab70fa937a5d
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/021.php
@@ -0,0 +1,6 @@
+<?php
+
+$_POST = [
+    'id' => 4,
+    'email' => 'foo@example.com',
+];
diff --git a/user_guide_src/source/libraries/validation/022.php b/user_guide_src/source/libraries/validation/022.php
new file mode 100644
index 000000000000..9c0f3ab7410d
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/022.php
@@ -0,0 +1,5 @@
+<?php
+
+$validation->setRules([
+    'email' => 'required|valid_email|is_unique[users.email,id,4]',
+]);
diff --git a/user_guide_src/source/libraries/validation/023.php b/user_guide_src/source/libraries/validation/023.php
new file mode 100644
index 000000000000..5d0618b338ee
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/023.php
@@ -0,0 +1,15 @@
+<?php
+
+$validation->setRules([
+        'username' => 'required|is_unique[users.username]',
+        'password' => 'required|min_length[10]'
+    ],
+    [   // Errors
+        'username' => [
+            'required' => 'All accounts must have usernames provided',
+        ],
+        'password' => [
+            'min_length' => 'Your password is too short. You want to get hacked?',
+        ],
+    ]
+);
diff --git a/user_guide_src/source/libraries/validation/024.php b/user_guide_src/source/libraries/validation/024.php
new file mode 100644
index 000000000000..b6b7c7464a5d
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/024.php
@@ -0,0 +1,19 @@
+<?php
+
+$validation->setRules([
+        'username' => [
+            'label'  => 'Username',
+            'rules'  => 'required|is_unique[users.username]',
+            'errors' => [
+                'required' => 'All accounts must have {field} provided',
+            ],
+        ],
+        'password' => [
+            'label'  => 'Password',
+            'rules'  => 'required|min_length[10]',
+            'errors' => [
+                'min_length' => 'Your {field} is too short. You want to get hacked?',
+            ],
+        ]
+    ]
+);
diff --git a/user_guide_src/source/libraries/validation/025.php b/user_guide_src/source/libraries/validation/025.php
new file mode 100644
index 000000000000..0531b84be47c
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/025.php
@@ -0,0 +1,3 @@
+<?php
+
+'min_length' => 'Supplied value ({value}) for {field} must have at least {param} characters.'
diff --git a/user_guide_src/source/libraries/validation/026.php b/user_guide_src/source/libraries/validation/026.php
new file mode 100644
index 000000000000..50bd0147aaf2
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/026.php
@@ -0,0 +1,19 @@
+<?php
+
+$validation->setRules([
+        'username' => [
+            'label'  => 'Rules.username',
+            'rules'  => 'required|is_unique[users.username]',
+            'errors' => [
+                'required' => 'Rules.username.required',
+            ],
+        ],
+        'password' => [
+            'label'  => 'Rules.password',
+            'rules'  => 'required|min_length[10]',
+            'errors' => [
+                'min_length' => 'Rules.password.min_length',
+            ],
+        ],
+    ]
+);
diff --git a/user_guide_src/source/libraries/validation/027.php b/user_guide_src/source/libraries/validation/027.php
new file mode 100644
index 000000000000..57aa5a31cb84
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/027.php
@@ -0,0 +1,9 @@
+<?php
+
+$errors = $validation->getErrors();
+
+// Returns:
+[
+    'field1' => 'error message',
+    'field2' => 'error message',
+]
diff --git a/user_guide_src/source/libraries/validation/028.php b/user_guide_src/source/libraries/validation/028.php
new file mode 100644
index 000000000000..2a3cffba88fc
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/028.php
@@ -0,0 +1,3 @@
+<?php
+
+$error = $validation->getError('username');
diff --git a/user_guide_src/source/libraries/validation/029-2.php b/user_guide_src/source/libraries/validation/029-2.php
new file mode 100644
index 000000000000..f7c69eb42e99
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/029-2.php
@@ -0,0 +1,7 @@
+<div class="alert alert-danger" role="alert">
+    <ul>
+    <?php foreach ($errors as $error): ?>
+        <li><?= esc($error) ?></li>
+    <?php endforeach ?>
+    </ul>
+</div>
diff --git a/user_guide_src/source/libraries/validation/029.php b/user_guide_src/source/libraries/validation/029.php
new file mode 100644
index 000000000000..2334c3c00f50
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/029.php
@@ -0,0 +1,5 @@
+<?php
+
+if ($validation->hasError('username')) {
+    echo $validation->getError('username');
+}
diff --git a/user_guide_src/source/libraries/validation/030.php b/user_guide_src/source/libraries/validation/030.php
new file mode 100644
index 000000000000..0da86ca2d054
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/030.php
@@ -0,0 +1,6 @@
+<?php
+
+$errors = [
+    'username' => 'The username field must be unique.',
+    'email'    => 'You must provide a valid email address.'
+];
diff --git a/user_guide_src/source/libraries/validation/031.php b/user_guide_src/source/libraries/validation/031.php
new file mode 100644
index 000000000000..110b159a41cc
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/031.php
@@ -0,0 +1,7 @@
+<?php
+
+public $templates = [
+    'list'    => 'CodeIgniter\Validation\Views\list',
+    'single'  => 'CodeIgniter\Validation\Views\single',
+    'my_list' => '_errors_list',
+];
diff --git a/user_guide_src/source/libraries/validation/032.php b/user_guide_src/source/libraries/validation/032.php
new file mode 100644
index 000000000000..ccee27b08ad7
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/032.php
@@ -0,0 +1,13 @@
+<?php
+
+use CodeIgniter\Validation\CreditCardRules;
+use CodeIgniter\Validation\FileRules;
+use CodeIgniter\Validation\FormatRules;
+use CodeIgniter\Validation\Rules;
+
+public $ruleSets = [
+    Rules::class,
+    FormatRules::class,
+    FileRules::class,
+    CreditCardRules::class,
+];
diff --git a/user_guide_src/source/libraries/validation/033.php b/user_guide_src/source/libraries/validation/033.php
new file mode 100644
index 000000000000..d7a10b5071cd
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/033.php
@@ -0,0 +1,9 @@
+<?php
+
+class MyRules
+{
+    public function even(string $str): bool
+    {
+        return (int) $str % 2 == 0;
+    }
+}
diff --git a/user_guide_src/source/libraries/validation/034.php b/user_guide_src/source/libraries/validation/034.php
new file mode 100644
index 000000000000..a6a9b07f54ef
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/034.php
@@ -0,0 +1,12 @@
+<?php
+
+public function even(string $str, string &$error = null): bool
+{
+    if ((int) $str % 2 !== 0) {
+        $error = lang('myerrors.evenError');
+
+        return false;
+    }
+
+    return true;
+}
diff --git a/user_guide_src/source/libraries/validation/035.php b/user_guide_src/source/libraries/validation/035.php
new file mode 100644
index 000000000000..99db5f30eae4
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/035.php
@@ -0,0 +1,5 @@
+<?php
+
+$this->validate($request, [
+    'foo' => 'required|even',
+]);
diff --git a/user_guide_src/source/libraries/validation/036.php b/user_guide_src/source/libraries/validation/036.php
new file mode 100644
index 000000000000..9511380c04f5
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/036.php
@@ -0,0 +1,34 @@
+<?php
+
+public function required_with($str, string $fields, array $data): bool
+{
+    $fields = explode(',', $fields);
+
+    // If the field is present we can safely assume that
+    // the field is here, no matter whether the corresponding
+    // search field is present or not.
+    $present = $this->required($str ?? '');
+
+    if ($present) {
+        return true;
+    }
+
+    // Still here? Then we fail this test if
+    // any of the fields are present in $data
+    // as $fields is the lis
+    $requiredFields = [];
+
+    foreach ($fields as $field) {
+        if (array_key_exists($field, $data)) {
+            $requiredFields[] = $field;
+        }
+    }
+
+    // Remove any keys with empty values since, that means they
+    // weren't truly there, as far as this is concerned.
+    $requiredFields = array_filter($requiredFields, function ($item) use ($data) {
+        return ! empty($data[$item]);
+    });
+
+    return empty($requiredFields);
+}
diff --git a/user_guide_src/source/libraries/validation/037.php b/user_guide_src/source/libraries/validation/037.php
new file mode 100644
index 000000000000..089b0eeaf465
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/037.php
@@ -0,0 +1,10 @@
+<?php
+
+// is_unique[table.field,ignore_field,ignore_value]
+
+$validation->setRules([
+    'name' => "is_unique[supplier.name,uuid, $uuid]",  // is not ok
+    'name' => "is_unique[supplier.name,uuid,$uuid ]",  // is not ok
+    'name' => "is_unique[supplier.name,uuid,$uuid]",   // is ok
+    'name' => "is_unique[supplier.name,uuid,{uuid}]",  // is ok - see "Validation Placeholders"
+]);
diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst
index dda716209451..3a9d9b705bc2 100644
--- a/user_guide_src/source/models/entities.rst
+++ b/user_guide_src/source/models/entities.rst
@@ -38,41 +38,16 @@ Now create a new Entity class. Since there's no default location to store these
 in with the existing directory structure, create a new directory at **app/Entities**. Create the
 Entity itself at **app/Entities/User.php**.
 
-::
-
-    <?php
-
-    namespace App\Entities;
-
-    use CodeIgniter\Entity\Entity;
-
-    class User extends Entity
-    {
-        // ...
-    }
+.. literalinclude:: entities/001.php
 
 At its simplest, this is all you need to do, though we'll make it more useful in a minute.
 
 Create the Model
 ----------------
 
-Create the model first at **app/Models/UserModel.php** so that we can interact with it::
-
-    <?php
+Create the model first at **app/Models/UserModel.php** so that we can interact with it:
 
-    namespace App\Models;
-
-    use CodeIgniter\Model;
-
-    class UserModel extends Model
-    {
-        protected $table         = 'users';
-        protected $allowedFields = [
-            'username', 'email', 'password',
-        ];
-        protected $returnType    = \App\Entities\User::class;
-        protected $useTimestamps = true;
-    }
+.. literalinclude:: entities/002.php
 
 The model uses the ``users`` table in the database for all of its activities. We've set the ``$allowedFields`` property
 to include all of the fields that we want outside classes to change. The ``id``, ``created_at``, and ``updated_at`` fields
@@ -83,28 +58,10 @@ instances of our User Entity class instead of an object or array like normal.
 Working With the Entity Class
 -----------------------------
 
-Now that all of the pieces are in place, you would work with the Entity class as you would any other class::
-
-    $user = $userModel->find($id);
-
-    // Display
-    echo $user->username;
-    echo $user->email;
+Now that all of the pieces are in place, you would work with the Entity class as you would any other class:
 
-    // Updating
-    unset($user->username);
-
-    if (! isset($user->username) {
-        $user->username = 'something new';
-    }
-
-    $userModel->save($user);
-
-    // Create
-    $user = new \App\Entities\User();
-    $user->username = 'foo';
-    $user->email    = 'foo@example.com';
-    $userModel->save($user);
+.. literalinclude:: entities/003.php
+   :lines: 2-
 
 You may have noticed that the ``User`` class has not set any properties for the columns, but you can still
 access them as if they were public properties. The base class, ``CodeIgniter\Entity\Entity``, takes care of this for you, as
@@ -128,22 +85,13 @@ and populate the class properties. Any property in the array will be set on the
 the model, only the fields in ``$allowedFields`` will actually be saved to the database, so you can store additional data
 on your entities without worrying much about stray fields getting saved incorrectly.
 
-::
-
-    $data = $this->request->getPost();
-
-    $user = new \App\Entities\User();
-    $user->fill($data);
-    $userModel->save($user);
+.. literalinclude:: entities/004.php
+   :lines: 2-
 
 You can also pass the data in the constructor and the data will be passed through the ``fill()`` method during instantiation.
 
-::
-
-    $data = $this->request->getPost();
-
-    $user = new \App\Entities\User($data);
-    $userModel->save($user);
+.. literalinclude:: entities/005.php
+   :lines: 2-
 
 Bulk Accessing Properties
 -------------------------
@@ -160,43 +108,9 @@ While the examples above are convenient, they don't help enforce any business lo
 some smart ``__get()`` and ``__set()`` methods that will check for special methods and use those instead of using
 the attributes directly, allowing you to enforce any business logic or data conversion that you need.
 
-Here's an updated User entity to provide some examples of how this could be used::
-
-    <?php
+Here's an updated User entity to provide some examples of how this could be used:
 
-    namespace App\Entities;
-
-    use CodeIgniter\Entity\Entity;
-    use CodeIgniter\I18n\Time;
-
-    class User extends Entity
-    {
-        public function setPassword(string $pass)
-        {
-            $this->attributes['password'] = password_hash($pass, PASSWORD_BCRYPT);
-
-            return $this;
-        }
-
-        public function setCreatedAt(string $dateString)
-        {
-            $this->attributes['created_at'] = new Time($dateString, 'UTC');
-
-            return $this;
-        }
-
-        public function getCreatedAt(string $format = 'Y-m-d H:i:s')
-        {
-            // Convert to CodeIgniter\I18n\Time object
-            $this->attributes['created_at'] = $this->mutateDate($this->attributes['created_at']);
-
-            $timezone = $this->timezone ?? app_timezone();
-
-            $this->attributes['created_at']->setTimezone($timezone);
-
-            return $this->attributes['created_at']->format($format);
-        }
-    }
+.. literalinclude:: entities/006.php
 
 The first thing to notice is the name of the methods we've added. For each one, the class expects the snake_case
 column name to be converted into PascalCase, and prefixed with either ``set`` or ``get``. These methods will then
@@ -216,11 +130,8 @@ a formatted string in the application's current timezone.
 While fairly simple, these examples show that using Entity classes can provide a very flexible way to enforce
 business logic and create objects that are pleasant to use.
 
-::
-
-    // Auto-hash the password - both do the same thing
-    $user->password = 'my great password';
-    $user->setPassword('my great password');
+.. literalinclude:: entities/007.php
+   :lines: 2-
 
 Data Mapping
 ============
@@ -230,25 +141,9 @@ original column names in the database no longer make sense. Or you find that you
 class properties, but your database schema required snake_case names. These situations can be easily handled
 with the Entity class' data mapping features.
 
-As an example, imagine you have the simplified User Entity that is used throughout your application::
-
-    <?php
-
-    namespace App\Entities;
-
-    use CodeIgniter\Entity\Entity;
+As an example, imagine you have the simplified User Entity that is used throughout your application:
 
-    class User extends Entity
-    {
-        protected $attributes = [
-            'id'         => null,
-            'name'       => null, // Represents a username
-            'email'      => null,
-            'password'   => null,
-            'created_at' => null,
-            'updated_at' => null,
-        ];
-    }
+.. literalinclude:: entities/008.php
 
 Your boss comes to you and says that no one uses usernames anymore, so you're switching to just use emails for login.
 But they do want to personalize the application a bit, so they want you to change the name field to represent a user's
@@ -257,29 +152,9 @@ in the database you whip up a migration to rename the `name` field to `full_name
 
 Ignoring how contrived this example is, we now have two choices on how to fix the User class. We could modify the class
 property from ``$name`` to ``$full_name``, but that would require changes throughout the application. Instead, we can
-simply map the ``full_name`` column in the database to the ``$name`` property, and be done with the Entity changes::
-
-    <?php
-
-    namespace App\Entities;
-
-    use CodeIgniter\Entity\Entity;
-
-    class User extends Entity
-    {
-        protected $attributes = [
-            'id'         => null,
-            'full_name'  => null, // In the $attributes, the key is the column name
-            'email'      => null,
-            'password'   => null,
-            'created_at' => null,
-            'updated_at' => null,
-        ];
+simply map the ``full_name`` column in the database to the ``$name`` property, and be done with the Entity changes:
 
-        protected $datamap = [
-            'name' => 'full_name',
-        ];
-    }
+.. literalinclude:: entities/009.php
 
 By adding our new database name to the ``$datamap`` array, we can tell the class what class property the database column
 should be accessible through. The key of the array is class property to map it to, where the value in the array is the
@@ -301,30 +176,15 @@ By default, the Entity class will convert fields named `created_at`, `updated_at
 :doc:`Time </libraries/time>` instances whenever they are set or retrieved. The Time class provides a large number
 of helpful methods in an immutable, localized way.
 
-You can define which properties are automatically converted by adding the name to the ``$dates`` property::
+You can define which properties are automatically converted by adding the name to the ``$dates`` property:
 
-    <?php
-
-    namespace App\Entities;
-
-    use CodeIgniter\Entity\Entity;
-
-    class User extends Entity
-    {
-        protected $dates = ['created_at', 'updated_at', 'deleted_at'];
-    }
+.. literalinclude:: entities/010.php
 
 Now, when any of those properties are set, they will be converted to a Time instance, using the application's
-current timezone, as set in **app/Config/App.php**::
-
-    $user = new \App\Entities\User();
-
-    // Converted to Time instance
-    $user->created_at = 'April 15, 2017 10:30:00';
+current timezone, as set in **app/Config/App.php**:
 
-    // Can now use any Time methods:
-    echo $user->created_at->humanize();
-    echo $user->created_at->setTimezone('Europe/London')->toDateString();
+.. literalinclude:: entities/011.php
+   :lines: 2-
 
 Property Casting
 ----------------
@@ -336,21 +196,9 @@ either the entity or the database. Properties can be cast to any of the followin
 **integer**, **float**, **double**, **string**, **boolean**, **object**, **array**, **datetime**, **timestamp**, and **uri**.
 Add a question mark at the beginning of type to mark property as nullable, i.e., **?string**, **?integer**.
 
-For example, if you had a User entity with an ``is_banned`` property, you can cast it as a boolean::
+For example, if you had a User entity with an ``is_banned`` property, you can cast it as a boolean:
 
-    <?php
-
-    namespace App\Entities;
-
-    use CodeIgniter\Entity\Entity;
-
-    class User extends Entity
-    {
-        protected $casts = [
-            'is_banned'          => 'boolean',
-            'is_banned_nullable' => '?boolean',
-        ];
-    }
+.. literalinclude:: entities/012.php
 
 Array/Json Casting
 ------------------
@@ -367,32 +215,12 @@ Unlike the rest of the data types that you can cast properties into, the:
 * **array** cast type will serialize,
 * **json** and **json-array** cast will use json_encode function on
 
-the value whenever the property is set::
-
-    <?php
+the value whenever the property is set:
 
-    namespace App\Entities;
+.. literalinclude:: entities/013.php
 
-    use CodeIgniter\Entity\Entity;
-
-    class User extends Entity
-    {
-        protected $casts = [
-            'options'        => 'array',
-            'options_object' => 'json',
-            'options_array'  => 'json-array',
-        ];
-    }
-
-::
-
-    $user    = $userModel->find(15);
-    $options = $user->options;
-
-    $options['foo'] = 'bar';
-
-    $user->options = $options;
-    $userModel->save($user);
+.. literalinclude:: entities/014.php
+   :lines: 2-
 
 CSV Casting
 -----------
@@ -400,24 +228,14 @@ CSV Casting
 If you know you have a flat array of simple values, encoding them as a serialized or JSON string
 may be more complex than the original structure. Casting as Comma-Separated Values (CSV) is
 a simpler alternative will result in a string that uses less space and is more easily read
-by humans::
-
-    <?php
-
-    namespace App\Entities;
-
-    use CodeIgniter\Entity\Entity;
+by humans:
 
-    class Widget extends Entity
-    {
-        protected $casts = [
-            'colors' => 'csv',
-        ];
-    }
+.. literalinclude:: entities/015.php
 
-Stored in the database as "red,yellow,green"::
+Stored in the database as "red,yellow,green":
 
-    $widget->colors = ['red', 'yellow', 'green'];
+.. literalinclude:: entities/016.php
+   :lines: 2-
 
 .. note:: Casting as CSV uses PHP's internal ``implode`` and ``explode`` methods and assumes all values are string-safe and free of commas. For more complex data casts try ``array`` or ``json``.
 
@@ -427,67 +245,18 @@ Custom casting
 You can define your own conversion types for getting and setting data.
 
 At first you need to create a handler class for your type.
-Let's say the class will be located in the **app/Entities/Cast** directory::
+Let's say the class will be located in the **app/Entities/Cast** directory:
 
-    <?php
+.. literalinclude:: entities/017.php
 
-    namespace App\Entities\Cast;
+Now you need to register it:
 
-    use CodeIgniter\Entity\Cast\BaseCast;
+.. literalinclude:: entities/018.php
 
-    // The class must inherit the CodeIgniter\Entity\Cast\BaseCast class
-    class CastBase64 extends BaseCast
-    {
-        public static function get($value, array $params = [])
-        {
-            return base64_decode($value);
-        }
-
-        public static function set($value, array $params = [])
-        {
-            return base64_encode($value);
-        }
-    }
-
-Now you need to register it::
-
-    <?php
-
-    namespace App\Entities;
-
-    use CodeIgniter\Entity\Entity;
-
-    class MyEntity extends Entity
-    {
-        // Specifying the type for the field
-        protected $casts = [
-            'key' => 'base64',
-        ];
-
-        // Bind the type to the handler
-        protected $castHandlers = [
-            'base64' => \App\Entities\Cast\CastBase64::class,
-        ];
-    }
-
-    // ...
-
-    $entity->key = 'test'; // dGVzdA==
-    echo $entity->key;     // test
-
-
-If you don't need to change values when getting or setting a value. Then just don't implement the appropriate method::
-
-    use CodeIgniter\Entity\Cast\BaseCast;
-
-    class CastBase64 extends BaseCast
-    {
-        public static function get($value, array $params = [])
-        {
-            return base64_decode($value);
-        }
-    }
+If you don't need to change values when getting or setting a value. Then just don't implement the appropriate method:
 
+.. literalinclude:: entities/019.php
+   :lines: 2-
 
 **Parameters**
 
@@ -496,55 +265,26 @@ Additional parameters are indicated in square brackets and listed with a comma.
 
 **type[param1, param2]**
 
-::
-
-    // Defining a type with parameters
-    protected $casts = [
-        'some_attribute' => 'class[App\SomeClass, param2, param3]',
-    ];
-
-    // Bind the type to the handler
-    protected $castHandlers = [
-        'class' => 'SomeHandler',
-    ];
-
-::
-
-    use CodeIgniter\Entity\Cast\BaseCast;
-
-    class SomeHandler extends BaseCast
-    {
-        public static function get($value, array $params = [])
-        {
-            var_dump($params);
-            // array(3) {
-            //   [0]=>
-            //   string(13) "App\SomeClass"
-            //   [1]=>
-            //   string(6) "param2"
-            //   [2]=>
-            //   string(6) "param3"
-            // }
-        }
-    }
+.. literalinclude:: entities/020.php
+   :lines: 2-
+
+.. literalinclude:: entities/021.php
+   :lines: 2-
 
 .. note:: If the casting type is marked as nullable ``?bool`` and the passed value is not null, then the parameter with
     the value ``nullable`` will be passed to the casting type handler.
     If casting type has predefined parameters, then ``nullable`` will be added to the end of the list.
 
-
 Checking for Changed Attributes
 ===============================
 
 You can check if an Entity attribute has changed since it was created. The only parameter is the name of the
-attribute to check::
-
-    $user = new \App\Entities\User();
-    $user->hasChanged('name'); // false
+attribute to check:
 
-    $user->name = 'Fred';
-    $user->hasChanged('name'); // true
+.. literalinclude:: entities/022.php
+   :lines: 2-
 
-Or to check the whole entity for changed values omit the parameter::
+Or to check the whole entity for changed values omit the parameter:
 
-    $user->hasChanged(); // true
+.. literalinclude:: entities/023.php
+   :lines: 2-
diff --git a/user_guide_src/source/models/entities/001.php b/user_guide_src/source/models/entities/001.php
new file mode 100644
index 000000000000..2da022b25edd
--- /dev/null
+++ b/user_guide_src/source/models/entities/001.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Entities;
+
+use CodeIgniter\Entity\Entity;
+
+class User extends Entity
+{
+    // ...
+}
diff --git a/user_guide_src/source/models/entities/002.php b/user_guide_src/source/models/entities/002.php
new file mode 100644
index 000000000000..05d0c63aeac8
--- /dev/null
+++ b/user_guide_src/source/models/entities/002.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class UserModel extends Model
+{
+    protected $table         = 'users';
+    protected $allowedFields = [
+        'username', 'email', 'password',
+    ];
+    protected $returnType    = \App\Entities\User::class;
+    protected $useTimestamps = true;
+}
diff --git a/user_guide_src/source/models/entities/003.php b/user_guide_src/source/models/entities/003.php
new file mode 100644
index 000000000000..4b29ea153692
--- /dev/null
+++ b/user_guide_src/source/models/entities/003.php
@@ -0,0 +1,22 @@
+<?php
+
+$user = $userModel->find($id);
+
+// Display
+echo $user->username;
+echo $user->email;
+
+// Updating
+unset($user->username);
+
+if (! isset($user->username) {
+    $user->username = 'something new';
+}
+
+$userModel->save($user);
+
+// Create
+$user = new \App\Entities\User();
+$user->username = 'foo';
+$user->email    = 'foo@example.com';
+$userModel->save($user);
diff --git a/user_guide_src/source/models/entities/004.php b/user_guide_src/source/models/entities/004.php
new file mode 100644
index 000000000000..e5307d38b1a2
--- /dev/null
+++ b/user_guide_src/source/models/entities/004.php
@@ -0,0 +1,7 @@
+<?php
+
+$data = $this->request->getPost();
+
+$user = new \App\Entities\User();
+$user->fill($data);
+$userModel->save($user);
diff --git a/user_guide_src/source/models/entities/005.php b/user_guide_src/source/models/entities/005.php
new file mode 100644
index 000000000000..5dd5d47af1f5
--- /dev/null
+++ b/user_guide_src/source/models/entities/005.php
@@ -0,0 +1,6 @@
+<?php
+
+$data = $this->request->getPost();
+
+$user = new \App\Entities\User($data);
+$userModel->save($user);
diff --git a/user_guide_src/source/models/entities/006.php b/user_guide_src/source/models/entities/006.php
new file mode 100644
index 000000000000..0a271a37a73d
--- /dev/null
+++ b/user_guide_src/source/models/entities/006.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Entities;
+
+use CodeIgniter\Entity\Entity;
+use CodeIgniter\I18n\Time;
+
+class User extends Entity
+{
+    public function setPassword(string $pass)
+    {
+        $this->attributes['password'] = password_hash($pass, PASSWORD_BCRYPT);
+
+        return $this;
+    }
+
+    public function setCreatedAt(string $dateString)
+    {
+        $this->attributes['created_at'] = new Time($dateString, 'UTC');
+
+        return $this;
+    }
+
+    public function getCreatedAt(string $format = 'Y-m-d H:i:s')
+    {
+        // Convert to CodeIgniter\I18n\Time object
+        $this->attributes['created_at'] = $this->mutateDate($this->attributes['created_at']);
+
+        $timezone = $this->timezone ?? app_timezone();
+
+        $this->attributes['created_at']->setTimezone($timezone);
+
+        return $this->attributes['created_at']->format($format);
+    }
+}
diff --git a/user_guide_src/source/models/entities/007.php b/user_guide_src/source/models/entities/007.php
new file mode 100644
index 000000000000..36a39a017e43
--- /dev/null
+++ b/user_guide_src/source/models/entities/007.php
@@ -0,0 +1,5 @@
+<?php
+
+// Auto-hash the password - both do the same thing
+$user->password = 'my great password';
+$user->setPassword('my great password');
diff --git a/user_guide_src/source/models/entities/008.php b/user_guide_src/source/models/entities/008.php
new file mode 100644
index 000000000000..f0612ce0e4b9
--- /dev/null
+++ b/user_guide_src/source/models/entities/008.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Entities;
+
+use CodeIgniter\Entity\Entity;
+
+class User extends Entity
+{
+    protected $attributes = [
+        'id'         => null,
+        'name'       => null, // Represents a username
+        'email'      => null,
+        'password'   => null,
+        'created_at' => null,
+        'updated_at' => null,
+    ];
+}
diff --git a/user_guide_src/source/models/entities/009.php b/user_guide_src/source/models/entities/009.php
new file mode 100644
index 000000000000..411961833749
--- /dev/null
+++ b/user_guide_src/source/models/entities/009.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Entities;
+
+use CodeIgniter\Entity\Entity;
+
+class User extends Entity
+{
+    protected $attributes = [
+        'id'         => null,
+        'full_name'  => null, // In the $attributes, the key is the column name
+        'email'      => null,
+        'password'   => null,
+        'created_at' => null,
+        'updated_at' => null,
+    ];
+
+    protected $datamap = [
+        'name' => 'full_name',
+    ];
+}
diff --git a/user_guide_src/source/models/entities/010.php b/user_guide_src/source/models/entities/010.php
new file mode 100644
index 000000000000..e8636fa0fbcc
--- /dev/null
+++ b/user_guide_src/source/models/entities/010.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Entities;
+
+use CodeIgniter\Entity\Entity;
+
+class User extends Entity
+{
+    protected $dates = ['created_at', 'updated_at', 'deleted_at'];
+}
diff --git a/user_guide_src/source/models/entities/011.php b/user_guide_src/source/models/entities/011.php
new file mode 100644
index 000000000000..9dedc28458b8
--- /dev/null
+++ b/user_guide_src/source/models/entities/011.php
@@ -0,0 +1,10 @@
+<?php
+
+$user = new \App\Entities\User();
+
+// Converted to Time instance
+$user->created_at = 'April 15, 2017 10:30:00';
+
+// Can now use any Time methods:
+echo $user->created_at->humanize();
+echo $user->created_at->setTimezone('Europe/London')->toDateString();
diff --git a/user_guide_src/source/models/entities/012.php b/user_guide_src/source/models/entities/012.php
new file mode 100644
index 000000000000..0c14d2f822c6
--- /dev/null
+++ b/user_guide_src/source/models/entities/012.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Entities;
+
+use CodeIgniter\Entity\Entity;
+
+class User extends Entity
+{
+    protected $casts = [
+        'is_banned'          => 'boolean',
+        'is_banned_nullable' => '?boolean',
+    ];
+}
diff --git a/user_guide_src/source/models/entities/013.php b/user_guide_src/source/models/entities/013.php
new file mode 100644
index 000000000000..460f42435304
--- /dev/null
+++ b/user_guide_src/source/models/entities/013.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Entities;
+
+use CodeIgniter\Entity\Entity;
+
+class User extends Entity
+{
+    protected $casts = [
+        'options'        => 'array',
+        'options_object' => 'json',
+        'options_array'  => 'json-array',
+    ];
+}
diff --git a/user_guide_src/source/models/entities/014.php b/user_guide_src/source/models/entities/014.php
new file mode 100644
index 000000000000..0a6523818e5c
--- /dev/null
+++ b/user_guide_src/source/models/entities/014.php
@@ -0,0 +1,9 @@
+<?php
+
+$user    = $userModel->find(15);
+$options = $user->options;
+
+$options['foo'] = 'bar';
+
+$user->options = $options;
+$userModel->save($user);
diff --git a/user_guide_src/source/models/entities/015.php b/user_guide_src/source/models/entities/015.php
new file mode 100644
index 000000000000..079797096bec
--- /dev/null
+++ b/user_guide_src/source/models/entities/015.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Entities;
+
+use CodeIgniter\Entity\Entity;
+
+class Widget extends Entity
+{
+    protected $casts = [
+        'colors' => 'csv',
+    ];
+}
diff --git a/user_guide_src/source/models/entities/016.php b/user_guide_src/source/models/entities/016.php
new file mode 100644
index 000000000000..739ab9f3237a
--- /dev/null
+++ b/user_guide_src/source/models/entities/016.php
@@ -0,0 +1,3 @@
+<?php
+
+$widget->colors = ['red', 'yellow', 'green'];
diff --git a/user_guide_src/source/models/entities/017.php b/user_guide_src/source/models/entities/017.php
new file mode 100644
index 000000000000..422a28cd1c37
--- /dev/null
+++ b/user_guide_src/source/models/entities/017.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Entities\Cast;
+
+use CodeIgniter\Entity\Cast\BaseCast;
+
+// The class must inherit the CodeIgniter\Entity\Cast\BaseCast class
+class CastBase64 extends BaseCast
+{
+    public static function get($value, array $params = [])
+    {
+        return base64_decode($value);
+    }
+
+    public static function set($value, array $params = [])
+    {
+        return base64_encode($value);
+    }
+}
diff --git a/user_guide_src/source/models/entities/018.php b/user_guide_src/source/models/entities/018.php
new file mode 100644
index 000000000000..dc793bb8de81
--- /dev/null
+++ b/user_guide_src/source/models/entities/018.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Entities;
+
+use CodeIgniter\Entity\Entity;
+
+class MyEntity extends Entity
+{
+    // Specifying the type for the field
+    protected $casts = [
+        'key' => 'base64',
+    ];
+
+    // Bind the type to the handler
+    protected $castHandlers = [
+        'base64' => \App\Entities\Cast\CastBase64::class,
+    ];
+}
+
+// ...
+
+$entity->key = 'test'; // dGVzdA==
+echo $entity->key;     // test
diff --git a/user_guide_src/source/models/entities/019.php b/user_guide_src/source/models/entities/019.php
new file mode 100644
index 000000000000..7d3744cc037c
--- /dev/null
+++ b/user_guide_src/source/models/entities/019.php
@@ -0,0 +1,11 @@
+<?php
+
+use CodeIgniter\Entity\Cast\BaseCast;
+
+class CastBase64 extends BaseCast
+{
+    public static function get($value, array $params = [])
+    {
+        return base64_decode($value);
+    }
+}
diff --git a/user_guide_src/source/models/entities/020.php b/user_guide_src/source/models/entities/020.php
new file mode 100644
index 000000000000..4e7908e5c20d
--- /dev/null
+++ b/user_guide_src/source/models/entities/020.php
@@ -0,0 +1,11 @@
+<?php
+
+// Defining a type with parameters
+protected $casts = [
+    'some_attribute' => 'class[App\SomeClass, param2, param3]',
+];
+
+// Bind the type to the handler
+protected $castHandlers = [
+    'class' => 'SomeHandler',
+];
diff --git a/user_guide_src/source/models/entities/021.php b/user_guide_src/source/models/entities/021.php
new file mode 100644
index 000000000000..12a805850827
--- /dev/null
+++ b/user_guide_src/source/models/entities/021.php
@@ -0,0 +1,19 @@
+<?php
+
+use CodeIgniter\Entity\Cast\BaseCast;
+
+class SomeHandler extends BaseCast
+{
+    public static function get($value, array $params = [])
+    {
+        var_dump($params);
+        // array(3) {
+        //   [0]=>
+        //   string(13) "App\SomeClass"
+        //   [1]=>
+        //   string(6) "param2"
+        //   [2]=>
+        //   string(6) "param3"
+        // }
+    }
+}
diff --git a/user_guide_src/source/models/entities/022.php b/user_guide_src/source/models/entities/022.php
new file mode 100644
index 000000000000..07dc560038a3
--- /dev/null
+++ b/user_guide_src/source/models/entities/022.php
@@ -0,0 +1,7 @@
+<?php
+
+$user = new \App\Entities\User();
+$user->hasChanged('name'); // false
+
+$user->name = 'Fred';
+$user->hasChanged('name'); // true
diff --git a/user_guide_src/source/models/entities/023.php b/user_guide_src/source/models/entities/023.php
new file mode 100644
index 000000000000..1e336bcf9d3c
--- /dev/null
+++ b/user_guide_src/source/models/entities/023.php
@@ -0,0 +1,3 @@
+<?php
+
+$user->hasChanged(); // true
diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index 707491b2cb37..abf096b90857 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -24,23 +24,8 @@ location within the directory, like ``namespace App\Models``.
 
 You can access models within your classes by creating a new instance or using the ``model()`` helper function.
 
-::
-
-    // Create a new class manually
-    $userModel = new \App\Models\UserModel();
-
-    // Create a new class with the model function
-    $userModel = model('App\Models\UserModel', false);
-
-    // Create a shared instance of the model
-    $userModel = model('App\Models\UserModel');
-
-    // Create shared instance with a supplied database connection
-    // When no namespace is given, it will search through all namespaces
-    // the system knows about and attempt to located the UserModel class.
-    $db = db_connect('custom');
-    $userModel = model('UserModel', true, $db);
-
+.. literalinclude:: model/001.php
+   :lines: 2-
 
 CodeIgniter's Model
 ===================
@@ -60,43 +45,18 @@ Creating Your Model
 ===================
 
 To take advantage of CodeIgniter's model, you would simply create a new model class
-that extends ``CodeIgniter\Model``::
-
-    <?php
+that extends ``CodeIgniter\Model``:
 
-    namespace App\Models;
-
-    use CodeIgniter\Model;
-
-    class UserModel extends Model
-    {
-        // ...
-    }
+.. literalinclude:: model/002.php
 
 This empty class provides convenient access to the database connection, the Query Builder,
 and a number of additional convenience methods.
 
 Should you need additional setup in your model you may extend the ``initialize()`` function
 which will be run immediately after the Model's constructor. This allows you to perform
-extra steps without repeating the constructor parameters, for example extending other models::
-
-    <?php
+extra steps without repeating the constructor parameters, for example extending other models:
 
-    namespace App\Models;
-
-    use Modules\Authentication\Models\UserAuthModel;
-
-    class UserModel extends UserAuthModel
-    {
-        /**
-         * Called during initialization. Appends
-         * our custom field to the module's model.
-         */
-        protected function initialize()
-        {
-            $this->allowedFields[] = 'middlename';
-        }
-    }
+.. literalinclude:: model/003.php
 
 Connecting to the Database
 --------------------------
@@ -106,18 +66,8 @@ it will automatically connect to the default database group, as set in the confi
 modify which group is used on a per-model basis by adding the ``$DBGroup`` property to your class.
 This ensures that within the model any references to ``$this->db`` are made through the appropriate
 connection.
-::
-
-    <?php
 
-    namespace App\Models;
-
-    use CodeIgniter\Model;
-
-    class UserModel extends Model
-    {
-        protected $DBGroup = 'group_name';
-    }
+.. literalinclude:: model/004.php
 
 You would replace "group_name" with the name of a defined database group from the database
 configuration file.
@@ -127,35 +77,9 @@ Configuring Your Model
 
 The model class has a few configuration options that can be set to allow the class' methods
 to work seamlessly for you. The first two are used by all of the CRUD methods to determine
-what table to use and how we can find the required records::
-
-    <?php
-
-    namespace App\Models;
-
-    use CodeIgniter\Model;
-
-    class UserModel extends Model
-    {
-        protected $table      = 'users';
-        protected $primaryKey = 'id';
+what table to use and how we can find the required records:
 
-        protected $useAutoIncrement = true;
-
-        protected $returnType     = 'array';
-        protected $useSoftDeletes = true;
-
-        protected $allowedFields = ['name', 'email'];
-
-        protected $useTimestamps = false;
-        protected $createdField  = 'created_at';
-        protected $updatedField  = 'updated_at';
-        protected $deletedField  = 'deleted_at';
-
-        protected $validationRules    = [];
-        protected $validationMessages = [];
-        protected $skipValidation     = false;
-    }
+.. literalinclude:: model/005.php
 
 **$table**
 
@@ -276,70 +200,71 @@ Several functions are provided for doing basic CRUD work on your tables, includi
 
 **find()**
 
-Returns a single row where the primary key matches the value passed in as the first parameter::
+Returns a single row where the primary key matches the value passed in as the first parameter:
 
-    $user = $userModel->find($user_id);
+.. literalinclude:: model/006.php
+   :lines: 2-
 
 The value is returned in the format specified in ``$returnType``.
 
 You can specify more than one row to return by passing an array of primaryKey values instead
-of just one::
+of just one:
 
-    $users = $userModel->find([1,2,3]);
+.. literalinclude:: model/007.php
+   :lines: 2-
 
 If no parameters are passed in, will return all rows in that model's table, effectively acting
 like ``findAll()``, though less explicit.
 
 **findColumn()**
 
-Returns null or an indexed array of column values::
+Returns null or an indexed array of column values:
 
-    $user = $userModel->findColumn($column_name);
+.. literalinclude:: model/008.php
+   :lines: 2-
 
 ``$column_name`` should be a name of single column else you will get the DataException.
 
 **findAll()**
 
-Returns all results::
+Returns all results:
 
-    $users = $userModel->findAll();
+.. literalinclude:: model/009.php
+   :lines: 2-
 
-This query may be modified by interjecting Query Builder commands as needed prior to calling this method::
+This query may be modified by interjecting Query Builder commands as needed prior to calling this method:
 
-    $users = $userModel->where('active', 1)
-                       ->findAll();
+.. literalinclude:: model/010.php
+   :lines: 2-
 
 You can pass in a limit and offset values as the first and second
-parameters, respectively::
+parameters, respectively:
 
-    $users = $userModel->findAll($limit, $offset);
+.. literalinclude:: model/011.php
+   :lines: 2-
 
 **first()**
 
 Returns the first row in the result set. This is best used in combination with the query builder.
-::
 
-    $user = $userModel->where('deleted', 0)
-                      ->first();
+.. literalinclude:: model/012.php
+   :lines: 2-
 
 **withDeleted()**
 
 If ``$useSoftDeletes`` is true, then the **find*()** methods will not return any rows where 'deleted_at IS NOT NULL'.
 To temporarily override this, you can use the ``withDeleted()`` method prior to calling the **find*()** method.
-::
-
-    // Only gets non-deleted rows (deleted = 0)
-    $activeUsers = $userModel->findAll();
 
-    // Gets all rows
-    $allUsers = $userModel->withDeleted()->findAll();
+.. literalinclude:: model/013.php
+   :lines: 2-
 
 **onlyDeleted()**
 
 Whereas ``withDeleted()`` will return both deleted and not-deleted rows, this method modifies
-the next **find*()** methods to return only soft deleted rows::
+the next **find*()** methods to return only soft deleted rows:
 
-    $deletedUsers = $userModel->onlyDeleted()->findAll();
+.. literalinclude:: model/014.php
+   :lines: 2-
 
 Saving Data
 -----------
@@ -348,67 +273,38 @@ Saving Data
 
 An associative array of data is passed into this method as the only parameter to create a new
 row of data in the database. The array's keys must match the name of the columns in a ``$table``, while
-the array's values are the values to save for that key::
-
-    $data = [
-        'username' => 'darth',
-        'email'    => 'd.vader@theempire.com',
-    ];
+the array's values are the values to save for that key:
 
-    $userModel->insert($data);
+.. literalinclude:: model/015.php
+   :lines: 2-
 
 **update()**
 
 Updates an existing record in the database. The first parameter is the ``$primaryKey`` of the record to update.
 An associative array of data is passed into this method as the second parameter. The array's keys must match the name
-of the columns in a ``$table``, while the array's values are the values to save for that key::
+of the columns in a ``$table``, while the array's values are the values to save for that key:
 
-    $data = [
-        'username' => 'darth',
-        'email'    => 'd.vader@theempire.com',
-    ];
+.. literalinclude:: model/016.php
+   :lines: 2-
 
-    $userModel->update($id, $data);
+Multiple records may be updated with a single call by passing an array of primary keys as the first parameter:
 
-Multiple records may be updated with a single call by passing an array of primary keys as the first parameter::
-
-    $data = [
-        'active' => 1,
-    ];
-
-    $userModel->update([1, 2, 3], $data);
+.. literalinclude:: model/017.php
+   :lines: 2-
 
 When you need a more flexible solution, you can leave the parameters empty and it functions like the Query Builder's
-update command, with the added benefit of validation, events, etc::
+update command, with the added benefit of validation, events, etc:
 
-    $userModel
-        ->whereIn('id', [1,2,3])
-        ->set(['active' => 1])
-        ->update();
+.. literalinclude:: model/018.php
+   :lines: 2-
 
 **save()**
 
 This is a wrapper around the ``insert()`` and ``update()`` methods that handle inserting or updating the record
-automatically, based on whether it finds an array key matching the **primary key** value::
-
-    // Defined as a model property
-    $primaryKey = 'id';
+automatically, based on whether it finds an array key matching the **primary key** value:
 
-    // Does an insert()
-    $data = [
-        'username' => 'darth',
-        'email'    => 'd.vader@theempire.com',
-    ];
-
-    $userModel->save($data);
-
-    // Performs an update, since the primary key, 'id', is found.
-    $data = [
-        'id'       => 3,
-        'username' => 'darth',
-        'email'    => 'd.vader@theempire.com',
-    ];
-    $userModel->save($data);
+.. literalinclude:: model/019.php
+   :lines: 2-
 
 The save method also can make working with custom class result objects much simpler by recognizing a non-simple
 object and grabbing its public and protected values into an array, which is then passed to the appropriate
@@ -416,56 +312,22 @@ insert or update method. This allows you to work with Entity classes in a very c
 simple classes that represent a single instance of an object type, like a user, a blog post, job, etc. This
 class is responsible for maintaining the business logic surrounding the object itself, like formatting
 elements in a certain way, etc. They shouldn't have any idea about how they are saved to the database. At their
-simplest, they might look like this::
-
-    namespace App\Entities;
-
-    class Job
-    {
-        protected $id;
-        protected $name;
-        protected $description;
-
-        public function __get($key)
-        {
-            if (property_exists($this, $key)) {
-                return $this->$key;
-            }
-        }
-
-        public function __set($key, $value)
-        {
-            if (property_exists($this, $key)) {
-                $this->$key = $value;
-            }
-        }
-    }
-
-A very simple model to work with this might look like::
-
-    use CodeIgniter\Model;
-
-    class JobModel extends Model
-    {
-        protected $table = 'jobs';
-        protected $returnType = '\App\Entities\Job';
-        protected $allowedFields = [
-            'name', 'description'
-        ];
-    }
+simplest, they might look like this:
 
-This model works with data from the ``jobs`` table, and returns all results as an instance of ``App\Entities\Job``.
-When you need to persist that record to the database, you will need to either write custom methods, or use the
-model's ``save()`` method to inspect the class, grab any public and private properties, and save them to the database::
+.. literalinclude:: model/020.php
+   :lines: 2-
+
+A very simple model to work with this might look like:
 
-    // Retrieve a Job instance
-    $job = $model->find(15);
+.. literalinclude:: model/021.php
+   :lines: 2-
 
-    // Make some changes
-    $job->name = "Foobar";
+This model works with data from the ``jobs`` table, and returns all results as an instance of ``App\Entities\Job``.
+When you need to persist that record to the database, you will need to either write custom methods, or use the
+model's ``save()`` method to inspect the class, grab any public and private properties, and save them to the database:
 
-    // Save the changes
-    $model->save($job);
+.. literalinclude:: model/022.php
+   :lines: 2-
 
 .. note:: If you find yourself working with Entities a lot, CodeIgniter provides a built-in :doc:`Entity class </models/entities>`
     that provides several handy features that make developing Entities simpler.
@@ -475,27 +337,31 @@ Deleting Data
 
 **delete()**
 
-Takes a primary key value as the first parameter and deletes the matching record from the model's table::
+Takes a primary key value as the first parameter and deletes the matching record from the model's table:
 
-    $userModel->delete(12);
+.. literalinclude:: model/023.php
+   :lines: 2-
 
 If the model's ``$useSoftDeletes`` value is true, this will update the row to set ``deleted_at`` to the current
 date and time. You can force a permanent delete by setting the second parameter as true.
 
-An array of primary keys can be passed in as the first parameter to delete multiple records at once::
+An array of primary keys can be passed in as the first parameter to delete multiple records at once:
 
-    $userModel->delete([1,2,3]);
+.. literalinclude:: model/024.php
+   :lines: 2-
 
 If no parameters are passed in, will act like the Query Builder's delete method, requiring a where call
-previously::
+previously:
 
-    $userModel->where('id', 12)->delete();
+.. literalinclude:: model/025.php
+   :lines: 2-
 
 **purgeDeleted()**
 
-Cleans out the database table by permanently removing all rows that have 'deleted_at IS NOT NULL'. ::
+Cleans out the database table by permanently removing all rows that have 'deleted_at IS NOT NULL'.
 
-    $userModel->purgeDeleted();
+.. literalinclude:: model/026.php
+   :lines: 2-
 
 Validating Data
 ---------------
@@ -505,23 +371,10 @@ standard, without duplicating code. The Model class provides a way to automatica
 prior to saving to the database with the ``insert()``, ``update()``, or ``save()`` methods.
 
 The first step is to fill out the ``$validationRules`` class property with the fields and rules that should
-be applied. If you have custom error message that you want to use, place them in the ``$validationMessages`` array::
-
-    class UserModel extends Model
-    {
-        protected $validationRules    = [
-            'username'     => 'required|alpha_numeric_space|min_length[3]',
-            'email'        => 'required|valid_email|is_unique[users.email]',
-            'password'     => 'required|min_length[8]',
-            'pass_confirm' => 'required_with[password]|matches[password]',
-        ];
-
-        protected $validationMessages = [
-            'email'        => [
-                'is_unique' => 'Sorry. That email has already been taken. Please choose another.',
-            ],
-        ];
-    }
+be applied. If you have custom error message that you want to use, place them in the ``$validationMessages`` array:
+
+.. literalinclude:: model/027.php
+   :lines: 2-
 
 The other way to set the validation rules to fields by functions,
 
@@ -532,12 +385,10 @@ The other way to set the validation rules to fields by functions,
 
     This function will set the field validation rules.
 
-    Usage example::
-
-        $fieldName = 'username';
-        $fieldRules = 'required|alpha_numeric_space|min_length[3]';
+    Usage example:
 
-        $model->setValidationRule($fieldName, $fieldRules);
+    .. literalinclude:: model/028.php
+       :lines: 2-
 
 .. php:function:: setValidationRules($validationRules)
 
@@ -545,18 +396,10 @@ The other way to set the validation rules to fields by functions,
 
     This function will set the validation rules.
 
-    Usage example::
+    Usage example:
 
-        $validationRules = [
-            'username' => 'required|alpha_numeric_space|min_length[3]',
-            'email' => [
-                'rules'  => 'required|valid_email|is_unique[users.email]',
-                'errors' => [
-                    'required' => 'We really need your email.',
-                ],
-            ],
-        ];
-        $model->setValidationRules($validationRules);
+    .. literalinclude:: model/029.php
+       :lines: 2-
 
 The other way to set the validation message to fields by functions,
 
@@ -567,13 +410,10 @@ The other way to set the validation message to fields by functions,
 
     This function will set the field wise error messages.
 
-    Usage example::
+    Usage example:
 
-        $fieldName = 'name';
-        $fieldValidationMessage = [
-            'required' => 'Your name is required here',
-        ];
-        $model->setValidationMessage($fieldName, $fieldValidationMessage);
+    .. literalinclude:: model/030.php
+       :lines: 2-
 
 .. php:function:: setValidationMessages($fieldMessages)
 
@@ -581,63 +421,49 @@ The other way to set the validation message to fields by functions,
 
     This function will set the field messages.
 
-    Usage example::
+    Usage example:
 
-        $fieldValidationMessage = [
-            'name' => [
-                'required'   => 'Your baby name is missing.',
-                'min_length' => 'Too short, man!',
-            ],
-        ];
-        $model->setValidationMessages($fieldValidationMessage);
+    .. literalinclude:: model/031.php
+       :lines: 2-
 
 Now, whenever you call the ``insert()``, ``update()``, or ``save()`` methods, the data will be validated. If it fails,
-the model will return boolean **false**. You can use the ``errors()`` method to retrieve the validation errors::
+the model will return boolean **false**. You can use the ``errors()`` method to retrieve the validation errors:
 
-    if ($model->save($data) === false) {
-        return view('updateUser', ['errors' => $model->errors()]);
-    }
+.. literalinclude:: model/032.php
+   :lines: 2-
 
 This returns an array with the field names and their associated errors that can be used to either show all of the
-errors at the top of the form, or to display them individually::
+errors at the top of the form, or to display them individually:
 
-    <?php if (! empty($errors)): ?>
-        <div class="alert alert-danger">
-        <?php foreach ($errors as $field => $error): ?>
-            <p><?= $error ?></p>
-        <?php endforeach ?>
-        </div>
-    <?php endif ?>
+.. literalinclude:: model/033.php
 
 If you'd rather organize your rules and error messages within the Validation configuration file, you can do that
-and simply set ``$validationRules`` to the name of the validation rule group you created::
+and simply set ``$validationRules`` to the name of the validation rule group you created:
 
-    class UserModel extends Model
-    {
-        protected $validationRules = 'users';
-    }
+.. literalinclude:: model/034.php
+   :lines: 2-
 
 Retrieving Validation Rules
 ---------------------------
 
 You can retrieve a model's validation rules by accessing its ``validationRules``
-property::
+property:
 
-    $rules = $model->validationRules;
+.. literalinclude:: model/035.php
+   :lines: 2-
 
 You can also retrieve just a subset of those rules by calling the accessor
-method directly, with options::
+method directly, with options:
 
-    $rules = $model->getValidationRules($options);
+.. literalinclude:: model/036.php
+   :lines: 2-
 
 The ``$options`` parameter is an associative array with one element,
 whose key is either ``'except'`` or ``'only'``, and which has as its
-value an array of fieldnames of interest.::
+value an array of fieldnames of interest.:
 
-    // get the rules for all but the "username" field
-    $rules = $model->getValidationRules(['except' => ['username']]);
-    // get the rules for only the "city" and "state" fields
-    $rules = $model->getValidationRules(['only' => ['city', 'state']]);
+.. literalinclude:: model/037.php
+   :lines: 2-
 
 Validation Placeholders
 -----------------------
@@ -645,25 +471,21 @@ Validation Placeholders
 The model provides a simple method to replace parts of your rules based on data that's being passed into it. This
 sounds fairly obscure but can be especially handy with the ``is_unique`` validation rule. Placeholders are simply
 the name of the field (or array key) that was passed in as ``$data`` surrounded by curly brackets. It will be
-replaced by the **value** of the matched incoming field. An example should clarify this::
+replaced by the **value** of the matched incoming field. An example should clarify this:
 
-    protected $validationRules = [
-        'email' => 'required|valid_email|is_unique[users.email,id,{id}]'
-    ];
+.. literalinclude:: model/038.php
+   :lines: 2-
 
 In this set of rules, it states that the email address should be unique in the database, except for the row
-that has an id matching the placeholder's value. Assuming that the form POST data had the following::
+that has an id matching the placeholder's value. Assuming that the form POST data had the following:
 
-    $_POST = [
-        'id' => 4,
-        'email' => 'foo@example.com'
-    ];
+.. literalinclude:: model/039.php
+   :lines: 2-
 
-then the ``{id}`` placeholder would be replaced with the number **4**, giving this revised rule::
+then the ``{id}`` placeholder would be replaced with the number **4**, giving this revised rule:
 
-    protected $validationRules = [
-        'email' => 'required|valid_email|is_unique[users.email,id,4]'
-    ];
+.. literalinclude:: model/040.php
+   :lines: 2-
 
 So it will ignore the row in the database that has ``id=4`` when it verifies the email is unique.
 
@@ -677,45 +499,46 @@ To help protect against Mass Assignment Attacks, the Model class **requires** th
 that can be changed during inserts and updates in the ``$allowedFields`` class property. Any data provided
 in addition to these will be removed prior to hitting the database. This is great for ensuring that timestamps,
 or primary keys do not get changed.
-::
 
-    protected $allowedFields = ['name', 'email', 'address'];
+.. literalinclude:: model/041.php
+   :lines: 2-
 
 Occasionally, you will find times where you need to be able to change these elements. This is often during
-testing, migrations, or seeds. In these cases, you can turn the protection on or off::
+testing, migrations, or seeds. In these cases, you can turn the protection on or off:
 
-    $model->protect(false)
-          ->insert($data)
-          ->protect(true);
+.. literalinclude:: model/042.php
+   :lines: 2-
 
 Working With Query Builder
 --------------------------
 
 You can get access to a shared instance of the Query Builder for that model's database connection any time you
-need it::
+need it:
 
-    $builder = $userModel->builder();
+.. literalinclude:: model/043.php
+   :lines: 2-
 
 This builder is already set up with the model's ``$table``. If you need access to another table
-you can pass it in as a parameter, but be aware that this will not return a shared instance::
+you can pass it in as a parameter, but be aware that this will not return a shared instance:
 
-    $groupBuilder = $userModel->builder('groups');
+.. literalinclude:: model/044.php
+   :lines: 2-
 
 You can also use Query Builder methods and the Model's CRUD methods in the same chained call, allowing for
-very elegant use::
+very elegant use:
 
-    $users = $userModel->where('status', 'active')
-                       ->orderBy('last_login', 'asc')
-                       ->findAll();
+.. literalinclude:: model/045.php
+   :lines: 2-
 
 .. important:: The Model does not provide a perfect interface to the Query Builder.
     The Model and the Query Builder are separate classes with different purposes.
     They should not be expected to return the same data.
     For example, if you need to get the compiledInsert you should do so directly on the builder instance.
 
-.. note:: You can also access the model's database connection seamlessly::
+.. note:: You can also access the model's database connection seamlessly:
 
-    $user_name = $userModel->escape($name);
+    .. literalinclude:: model/046.php
+       :lines: 2-
 
 Runtime Return Type Changes
 ----------------------------
@@ -729,19 +552,17 @@ provides methods that allow you to do just that.
 
 **asArray()**
 
-Returns data from the next **find*()** method as associative arrays::
+Returns data from the next **find*()** method as associative arrays:
 
-    $users = $userModel->asArray()->where('status', 'active')->findAll();
+.. literalinclude:: model/047.php
+   :lines: 2-
 
 **asObject()**
 
-Returns data from the next **find*()** method as standard objects or custom class intances::
+Returns data from the next **find*()** method as standard objects or custom class intances:
 
-    // Return as standard objects
-    $users = $userModel->asObject()->where('status', 'active')->findAll();
-
-    // Return as custom class instances
-    $users = $userModel->asObject('User')->where('status', 'active')->findAll();
+.. literalinclude:: model/048.php
+   :lines: 2-
 
 Processing Large Amounts of Data
 --------------------------------
@@ -752,12 +573,9 @@ do your work on. The first parameter is the number of rows to retrieve in a sing
 parameter is a Closure that will be called for each row of data.
 
 This is best used during cronjobs, data exports, or other large tasks.
-::
 
-    $userModel->chunk(100, function ($data) {
-        // do something.
-        // $data is a single row of data.
-    });
+.. literalinclude:: model/049.php
+   :lines: 2-
 
 Model Events
 ============
@@ -777,38 +595,28 @@ of the insert* or update* methods, that will be the key/value pairs that are bei
 main array will also contain the other values passed to the method, and be detailed later. The callback method
 must return the original $data array so other callbacks have the full information.
 
-::
-
-    protected function hashPassword(array $data)
-    {
-        if (! isset($data['data']['password'])) {
-            return $data;
-        }
-
-        $data['data']['password_hash'] = password_hash($data['data']['password'], PASSWORD_DEFAULT);
-        unset($data['data']['password']);
-
-        return $data;
-    }
+.. literalinclude:: model/050.php
+   :lines: 2-
 
 Specifying Callbacks To Run
 ---------------------------
 
 You specify when to run the callbacks by adding the method name to the appropriate class property (``$beforeInsert``, ``$afterUpdate``,
 etc). Multiple callbacks can be added to a single event and they will be processed one after the other. You can
-use the same callback in multiple events::
+use the same callback in multiple events:
 
-    protected $beforeInsert = ['hashPassword'];
-    protected $beforeUpdate = ['hashPassword'];
+.. literalinclude:: model/051.php
+   :lines: 2-
 
-Additionally, each model may allow (default) or deny callbacks class-wide by setting its ``$allowCallbacks`` property::
+Additionally, each model may allow (default) or deny callbacks class-wide by setting its ``$allowCallbacks`` property:
 
-    protected $allowCallbacks = false;
+.. literalinclude:: model/052.php
+   :lines: 2-
 
-You may also change this setting temporarily for a single model call sing the ``allowCallbacks()`` method::
+You may also change this setting temporarily for a single model call sing the ``allowCallbacks()`` method:
 
-    $model->allowCallbacks(false)->find(1); // No callbacks triggered
-    $model->find(1); // Callbacks subject to original property value
+.. literalinclude:: model/053.php
+   :lines: 2-
 
 Event Parameters
 ----------------
@@ -851,22 +659,10 @@ Modifying Find* Data
 The ``beforeFind`` and ``afterFind`` methods can both return a modified set of data to override the normal response
 from the model. For ``afterFind`` any changes made to ``data`` in the return array will automatically be passed back
 to the calling context. In order for ``beforeFind`` to intercept the find workflow it must also return an additional
-boolean, ``returnData``::
-
-    protected $beforeFind = ['checkCache'];
-    // ...
-    protected function checkCache(array $data)
-    {
-        // Check if the requested item is already in our cache
-        if (isset($data['id']) && $item = $this->getCachedItem($data['id']])) {
-            $data['data']       = $item;
-            $data['returnData'] = true;
-
-            return $data;
-        }
+boolean, ``returnData``:
 
-        // ...
-    }
+.. literalinclude:: model/054.php
+   :lines: 2-
 
 Manual Model Creation
 =====================
@@ -875,20 +671,4 @@ You do not need to extend any special class to create a model for your applicati
 instance of the database connection and you're good to go. This allows you to bypass the features CodeIgniter's
 Model gives you out of the box, and create a fully custom experience.
 
-::
-
-    <?php
-
-    namespace App\Models;
-
-    use CodeIgniter\Database\ConnectionInterface;
-
-    class UserModel
-    {
-        protected $db;
-
-        public function __construct(ConnectionInterface &$db)
-        {
-            $this->db = &$db;
-        }
-    }
+.. literalinclude:: model/055.php
diff --git a/user_guide_src/source/models/model/001.php b/user_guide_src/source/models/model/001.php
new file mode 100644
index 000000000000..ac8ede5c3dec
--- /dev/null
+++ b/user_guide_src/source/models/model/001.php
@@ -0,0 +1,16 @@
+<?php
+
+// Create a new class manually
+$userModel = new \App\Models\UserModel();
+
+// Create a new class with the model function
+$userModel = model('App\Models\UserModel', false);
+
+// Create a shared instance of the model
+$userModel = model('App\Models\UserModel');
+
+// Create shared instance with a supplied database connection
+// When no namespace is given, it will search through all namespaces
+// the system knows about and attempt to located the UserModel class.
+$db = db_connect('custom');
+$userModel = model('UserModel', true, $db);
diff --git a/user_guide_src/source/models/model/002.php b/user_guide_src/source/models/model/002.php
new file mode 100644
index 000000000000..ec4460aa9136
--- /dev/null
+++ b/user_guide_src/source/models/model/002.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class UserModel extends Model
+{
+    // ...
+}
diff --git a/user_guide_src/source/models/model/003.php b/user_guide_src/source/models/model/003.php
new file mode 100644
index 000000000000..1b70cea84a84
--- /dev/null
+++ b/user_guide_src/source/models/model/003.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Models;
+
+use Modules\Authentication\Models\UserAuthModel;
+
+class UserModel extends UserAuthModel
+{
+    /**
+     * Called during initialization. Appends
+     * our custom field to the module's model.
+     */
+    protected function initialize()
+    {
+        $this->allowedFields[] = 'middlename';
+    }
+}
diff --git a/user_guide_src/source/models/model/004.php b/user_guide_src/source/models/model/004.php
new file mode 100644
index 000000000000..1ae028acbf7a
--- /dev/null
+++ b/user_guide_src/source/models/model/004.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class UserModel extends Model
+{
+    protected $DBGroup = 'group_name';
+}
diff --git a/user_guide_src/source/models/model/005.php b/user_guide_src/source/models/model/005.php
new file mode 100644
index 000000000000..080c2426d4a2
--- /dev/null
+++ b/user_guide_src/source/models/model/005.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class UserModel extends Model
+{
+    protected $table      = 'users';
+    protected $primaryKey = 'id';
+
+    protected $useAutoIncrement = true;
+
+    protected $returnType     = 'array';
+    protected $useSoftDeletes = true;
+
+    protected $allowedFields = ['name', 'email'];
+
+    protected $useTimestamps = false;
+    protected $createdField  = 'created_at';
+    protected $updatedField  = 'updated_at';
+    protected $deletedField  = 'deleted_at';
+
+    protected $validationRules    = [];
+    protected $validationMessages = [];
+    protected $skipValidation     = false;
+}
diff --git a/user_guide_src/source/models/model/006.php b/user_guide_src/source/models/model/006.php
new file mode 100644
index 000000000000..c4440cf78e59
--- /dev/null
+++ b/user_guide_src/source/models/model/006.php
@@ -0,0 +1,3 @@
+<?php
+
+$user = $userModel->find($user_id);
diff --git a/user_guide_src/source/models/model/007.php b/user_guide_src/source/models/model/007.php
new file mode 100644
index 000000000000..1c5d65b7d93e
--- /dev/null
+++ b/user_guide_src/source/models/model/007.php
@@ -0,0 +1,3 @@
+<?php
+
+$users = $userModel->find([1,2,3]);
diff --git a/user_guide_src/source/models/model/008.php b/user_guide_src/source/models/model/008.php
new file mode 100644
index 000000000000..981f887120e3
--- /dev/null
+++ b/user_guide_src/source/models/model/008.php
@@ -0,0 +1,3 @@
+<?php
+
+$user = $userModel->findColumn($column_name);
diff --git a/user_guide_src/source/models/model/009.php b/user_guide_src/source/models/model/009.php
new file mode 100644
index 000000000000..881962a52c3b
--- /dev/null
+++ b/user_guide_src/source/models/model/009.php
@@ -0,0 +1,3 @@
+<?php
+
+$users = $userModel->findAll();
diff --git a/user_guide_src/source/models/model/010.php b/user_guide_src/source/models/model/010.php
new file mode 100644
index 000000000000..bc654f2703c9
--- /dev/null
+++ b/user_guide_src/source/models/model/010.php
@@ -0,0 +1,4 @@
+<?php
+
+$users = $userModel->where('active', 1)
+                   ->findAll();
diff --git a/user_guide_src/source/models/model/011.php b/user_guide_src/source/models/model/011.php
new file mode 100644
index 000000000000..a906bda6142e
--- /dev/null
+++ b/user_guide_src/source/models/model/011.php
@@ -0,0 +1,3 @@
+<?php
+
+$users = $userModel->findAll($limit, $offset);
diff --git a/user_guide_src/source/models/model/012.php b/user_guide_src/source/models/model/012.php
new file mode 100644
index 000000000000..117771f78ca8
--- /dev/null
+++ b/user_guide_src/source/models/model/012.php
@@ -0,0 +1,4 @@
+<?php
+
+$user = $userModel->where('deleted', 0)
+                  ->first();
diff --git a/user_guide_src/source/models/model/013.php b/user_guide_src/source/models/model/013.php
new file mode 100644
index 000000000000..1abc1e3be49b
--- /dev/null
+++ b/user_guide_src/source/models/model/013.php
@@ -0,0 +1,7 @@
+<?php
+
+// Only gets non-deleted rows (deleted = 0)
+$activeUsers = $userModel->findAll();
+
+// Gets all rows
+$allUsers = $userModel->withDeleted()->findAll();
diff --git a/user_guide_src/source/models/model/014.php b/user_guide_src/source/models/model/014.php
new file mode 100644
index 000000000000..f12fc5e0cb6a
--- /dev/null
+++ b/user_guide_src/source/models/model/014.php
@@ -0,0 +1,3 @@
+<?php
+
+$deletedUsers = $userModel->onlyDeleted()->findAll();
diff --git a/user_guide_src/source/models/model/015.php b/user_guide_src/source/models/model/015.php
new file mode 100644
index 000000000000..23414a8c9a01
--- /dev/null
+++ b/user_guide_src/source/models/model/015.php
@@ -0,0 +1,8 @@
+<?php
+
+$data = [
+    'username' => 'darth',
+    'email'    => 'd.vader@theempire.com',
+];
+
+$userModel->insert($data);
diff --git a/user_guide_src/source/models/model/016.php b/user_guide_src/source/models/model/016.php
new file mode 100644
index 000000000000..efecefe6ba81
--- /dev/null
+++ b/user_guide_src/source/models/model/016.php
@@ -0,0 +1,8 @@
+<?php
+
+$data = [
+    'username' => 'darth',
+    'email'    => 'd.vader@theempire.com',
+];
+
+$userModel->update($id, $data);
diff --git a/user_guide_src/source/models/model/017.php b/user_guide_src/source/models/model/017.php
new file mode 100644
index 000000000000..5032c34a4613
--- /dev/null
+++ b/user_guide_src/source/models/model/017.php
@@ -0,0 +1,7 @@
+<?php
+
+$data = [
+    'active' => 1,
+];
+
+$userModel->update([1, 2, 3], $data);
diff --git a/user_guide_src/source/models/model/018.php b/user_guide_src/source/models/model/018.php
new file mode 100644
index 000000000000..8c13a5a85e2a
--- /dev/null
+++ b/user_guide_src/source/models/model/018.php
@@ -0,0 +1,6 @@
+<?php
+
+$userModel
+    ->whereIn('id', [1,2,3])
+    ->set(['active' => 1])
+    ->update();
diff --git a/user_guide_src/source/models/model/019.php b/user_guide_src/source/models/model/019.php
new file mode 100644
index 000000000000..789218001968
--- /dev/null
+++ b/user_guide_src/source/models/model/019.php
@@ -0,0 +1,20 @@
+<?php
+
+// Defined as a model property
+$primaryKey = 'id';
+
+// Does an insert()
+$data = [
+    'username' => 'darth',
+    'email'    => 'd.vader@theempire.com',
+];
+
+$userModel->save($data);
+
+// Performs an update, since the primary key, 'id', is found.
+$data = [
+    'id'       => 3,
+    'username' => 'darth',
+    'email'    => 'd.vader@theempire.com',
+];
+$userModel->save($data);
diff --git a/user_guide_src/source/models/model/020.php b/user_guide_src/source/models/model/020.php
new file mode 100644
index 000000000000..ebc37ee608c1
--- /dev/null
+++ b/user_guide_src/source/models/model/020.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Entities;
+
+class Job
+{
+    protected $id;
+    protected $name;
+    protected $description;
+
+    public function __get($key)
+    {
+        if (property_exists($this, $key)) {
+            return $this->$key;
+        }
+    }
+
+    public function __set($key, $value)
+    {
+        if (property_exists($this, $key)) {
+            $this->$key = $value;
+        }
+    }
+}
diff --git a/user_guide_src/source/models/model/021.php b/user_guide_src/source/models/model/021.php
new file mode 100644
index 000000000000..a49cfe210163
--- /dev/null
+++ b/user_guide_src/source/models/model/021.php
@@ -0,0 +1,12 @@
+<?php
+
+use CodeIgniter\Model;
+
+class JobModel extends Model
+{
+    protected $table = 'jobs';
+    protected $returnType = '\App\Entities\Job';
+    protected $allowedFields = [
+        'name', 'description'
+    ];
+}
diff --git a/user_guide_src/source/models/model/022.php b/user_guide_src/source/models/model/022.php
new file mode 100644
index 000000000000..e1137c8fa845
--- /dev/null
+++ b/user_guide_src/source/models/model/022.php
@@ -0,0 +1,10 @@
+<?php
+
+// Retrieve a Job instance
+$job = $model->find(15);
+
+// Make some changes
+$job->name = "Foobar";
+
+// Save the changes
+$model->save($job);
diff --git a/user_guide_src/source/models/model/023.php b/user_guide_src/source/models/model/023.php
new file mode 100644
index 000000000000..c1045eecbbb2
--- /dev/null
+++ b/user_guide_src/source/models/model/023.php
@@ -0,0 +1,3 @@
+<?php
+
+$userModel->delete(12);
diff --git a/user_guide_src/source/models/model/024.php b/user_guide_src/source/models/model/024.php
new file mode 100644
index 000000000000..f6769f061142
--- /dev/null
+++ b/user_guide_src/source/models/model/024.php
@@ -0,0 +1,3 @@
+<?php
+
+$userModel->delete([1,2,3]);
diff --git a/user_guide_src/source/models/model/025.php b/user_guide_src/source/models/model/025.php
new file mode 100644
index 000000000000..dc520c882d8e
--- /dev/null
+++ b/user_guide_src/source/models/model/025.php
@@ -0,0 +1,3 @@
+<?php
+
+$userModel->where('id', 12)->delete();
diff --git a/user_guide_src/source/models/model/026.php b/user_guide_src/source/models/model/026.php
new file mode 100644
index 000000000000..c06642313a0c
--- /dev/null
+++ b/user_guide_src/source/models/model/026.php
@@ -0,0 +1,3 @@
+<?php
+
+$userModel->purgeDeleted();
diff --git a/user_guide_src/source/models/model/027.php b/user_guide_src/source/models/model/027.php
new file mode 100644
index 000000000000..b0d19738c5c0
--- /dev/null
+++ b/user_guide_src/source/models/model/027.php
@@ -0,0 +1,17 @@
+<?php
+
+class UserModel extends Model
+{
+    protected $validationRules    = [
+        'username'     => 'required|alpha_numeric_space|min_length[3]',
+        'email'        => 'required|valid_email|is_unique[users.email]',
+        'password'     => 'required|min_length[8]',
+        'pass_confirm' => 'required_with[password]|matches[password]',
+    ];
+
+    protected $validationMessages = [
+        'email'        => [
+            'is_unique' => 'Sorry. That email has already been taken. Please choose another.',
+        ],
+    ];
+}
diff --git a/user_guide_src/source/models/model/028.php b/user_guide_src/source/models/model/028.php
new file mode 100644
index 000000000000..c9bea660de81
--- /dev/null
+++ b/user_guide_src/source/models/model/028.php
@@ -0,0 +1,6 @@
+<?php
+
+$fieldName = 'username';
+$fieldRules = 'required|alpha_numeric_space|min_length[3]';
+
+$model->setValidationRule($fieldName, $fieldRules);
diff --git a/user_guide_src/source/models/model/029.php b/user_guide_src/source/models/model/029.php
new file mode 100644
index 000000000000..15221f2505a6
--- /dev/null
+++ b/user_guide_src/source/models/model/029.php
@@ -0,0 +1,12 @@
+<?php
+
+$validationRules = [
+    'username' => 'required|alpha_numeric_space|min_length[3]',
+    'email' => [
+        'rules'  => 'required|valid_email|is_unique[users.email]',
+        'errors' => [
+            'required' => 'We really need your email.',
+        ],
+    ],
+];
+$model->setValidationRules($validationRules);
diff --git a/user_guide_src/source/models/model/030.php b/user_guide_src/source/models/model/030.php
new file mode 100644
index 000000000000..deca0d44f722
--- /dev/null
+++ b/user_guide_src/source/models/model/030.php
@@ -0,0 +1,7 @@
+<?php
+
+$fieldName = 'name';
+$fieldValidationMessage = [
+    'required' => 'Your name is required here',
+];
+$model->setValidationMessage($fieldName, $fieldValidationMessage);
diff --git a/user_guide_src/source/models/model/031.php b/user_guide_src/source/models/model/031.php
new file mode 100644
index 000000000000..902cea408f1f
--- /dev/null
+++ b/user_guide_src/source/models/model/031.php
@@ -0,0 +1,9 @@
+<?php
+
+$fieldValidationMessage = [
+    'name' => [
+        'required'   => 'Your baby name is missing.',
+        'min_length' => 'Too short, man!',
+    ],
+];
+$model->setValidationMessages($fieldValidationMessage);
diff --git a/user_guide_src/source/models/model/032.php b/user_guide_src/source/models/model/032.php
new file mode 100644
index 000000000000..0e93993557b4
--- /dev/null
+++ b/user_guide_src/source/models/model/032.php
@@ -0,0 +1,5 @@
+<?php
+
+if ($model->save($data) === false) {
+    return view('updateUser', ['errors' => $model->errors()]);
+}
diff --git a/user_guide_src/source/models/model/033.php b/user_guide_src/source/models/model/033.php
new file mode 100644
index 000000000000..32005c35b635
--- /dev/null
+++ b/user_guide_src/source/models/model/033.php
@@ -0,0 +1,7 @@
+<?php if (! empty($errors)): ?>
+    <div class="alert alert-danger">
+    <?php foreach ($errors as $field => $error): ?>
+        <p><?= $error ?></p>
+    <?php endforeach ?>
+    </div>
+<?php endif ?>
diff --git a/user_guide_src/source/models/model/034.php b/user_guide_src/source/models/model/034.php
new file mode 100644
index 000000000000..8de746bec4cd
--- /dev/null
+++ b/user_guide_src/source/models/model/034.php
@@ -0,0 +1,6 @@
+<?php
+
+class UserModel extends Model
+{
+    protected $validationRules = 'users';
+}
diff --git a/user_guide_src/source/models/model/035.php b/user_guide_src/source/models/model/035.php
new file mode 100644
index 000000000000..1fb0c575c1ae
--- /dev/null
+++ b/user_guide_src/source/models/model/035.php
@@ -0,0 +1,3 @@
+<?php
+
+$rules = $model->validationRules;
diff --git a/user_guide_src/source/models/model/036.php b/user_guide_src/source/models/model/036.php
new file mode 100644
index 000000000000..af5a3eef010e
--- /dev/null
+++ b/user_guide_src/source/models/model/036.php
@@ -0,0 +1,3 @@
+<?php
+
+$rules = $model->getValidationRules($options);
diff --git a/user_guide_src/source/models/model/037.php b/user_guide_src/source/models/model/037.php
new file mode 100644
index 000000000000..ff15de70d9c5
--- /dev/null
+++ b/user_guide_src/source/models/model/037.php
@@ -0,0 +1,6 @@
+<?php
+
+// get the rules for all but the "username" field
+$rules = $model->getValidationRules(['except' => ['username']]);
+// get the rules for only the "city" and "state" fields
+$rules = $model->getValidationRules(['only' => ['city', 'state']]);
diff --git a/user_guide_src/source/models/model/038.php b/user_guide_src/source/models/model/038.php
new file mode 100644
index 000000000000..0a0dffd7dba5
--- /dev/null
+++ b/user_guide_src/source/models/model/038.php
@@ -0,0 +1,5 @@
+<?php
+
+protected $validationRules = [
+    'email' => 'required|valid_email|is_unique[users.email,id,{id}]'
+];
diff --git a/user_guide_src/source/models/model/039.php b/user_guide_src/source/models/model/039.php
new file mode 100644
index 000000000000..00ab7df2a766
--- /dev/null
+++ b/user_guide_src/source/models/model/039.php
@@ -0,0 +1,6 @@
+<?php
+
+$_POST = [
+    'id' => 4,
+    'email' => 'foo@example.com'
+];
diff --git a/user_guide_src/source/models/model/040.php b/user_guide_src/source/models/model/040.php
new file mode 100644
index 000000000000..68f9c5c13143
--- /dev/null
+++ b/user_guide_src/source/models/model/040.php
@@ -0,0 +1,5 @@
+<?php
+
+protected $validationRules = [
+    'email' => 'required|valid_email|is_unique[users.email,id,4]'
+];
diff --git a/user_guide_src/source/models/model/041.php b/user_guide_src/source/models/model/041.php
new file mode 100644
index 000000000000..8aaa151c61a1
--- /dev/null
+++ b/user_guide_src/source/models/model/041.php
@@ -0,0 +1,3 @@
+<?php
+
+protected $allowedFields = ['name', 'email', 'address'];
diff --git a/user_guide_src/source/models/model/042.php b/user_guide_src/source/models/model/042.php
new file mode 100644
index 000000000000..a3742c451104
--- /dev/null
+++ b/user_guide_src/source/models/model/042.php
@@ -0,0 +1,5 @@
+<?php
+
+$model->protect(false)
+      ->insert($data)
+      ->protect(true);
diff --git a/user_guide_src/source/models/model/043.php b/user_guide_src/source/models/model/043.php
new file mode 100644
index 000000000000..44a962a082f8
--- /dev/null
+++ b/user_guide_src/source/models/model/043.php
@@ -0,0 +1,3 @@
+<?php
+
+$builder = $userModel->builder();
diff --git a/user_guide_src/source/models/model/044.php b/user_guide_src/source/models/model/044.php
new file mode 100644
index 000000000000..229af898adcb
--- /dev/null
+++ b/user_guide_src/source/models/model/044.php
@@ -0,0 +1,3 @@
+<?php
+
+$groupBuilder = $userModel->builder('groups');
diff --git a/user_guide_src/source/models/model/045.php b/user_guide_src/source/models/model/045.php
new file mode 100644
index 000000000000..9b064dd4fbff
--- /dev/null
+++ b/user_guide_src/source/models/model/045.php
@@ -0,0 +1,5 @@
+<?php
+
+$users = $userModel->where('status', 'active')
+                   ->orderBy('last_login', 'asc')
+                   ->findAll();
diff --git a/user_guide_src/source/models/model/046.php b/user_guide_src/source/models/model/046.php
new file mode 100644
index 000000000000..13b84dc5d71c
--- /dev/null
+++ b/user_guide_src/source/models/model/046.php
@@ -0,0 +1,3 @@
+<?php
+
+$user_name = $userModel->escape($name);
diff --git a/user_guide_src/source/models/model/047.php b/user_guide_src/source/models/model/047.php
new file mode 100644
index 000000000000..ab2dfdecc85b
--- /dev/null
+++ b/user_guide_src/source/models/model/047.php
@@ -0,0 +1,3 @@
+<?php
+
+$users = $userModel->asArray()->where('status', 'active')->findAll();
diff --git a/user_guide_src/source/models/model/048.php b/user_guide_src/source/models/model/048.php
new file mode 100644
index 000000000000..799e88726d93
--- /dev/null
+++ b/user_guide_src/source/models/model/048.php
@@ -0,0 +1,7 @@
+<?php
+
+// Return as standard objects
+$users = $userModel->asObject()->where('status', 'active')->findAll();
+
+// Return as custom class instances
+$users = $userModel->asObject('User')->where('status', 'active')->findAll();
diff --git a/user_guide_src/source/models/model/049.php b/user_guide_src/source/models/model/049.php
new file mode 100644
index 000000000000..0aace6d0fc28
--- /dev/null
+++ b/user_guide_src/source/models/model/049.php
@@ -0,0 +1,6 @@
+<?php
+
+$userModel->chunk(100, function ($data) {
+    // do something.
+    // $data is a single row of data.
+});
diff --git a/user_guide_src/source/models/model/050.php b/user_guide_src/source/models/model/050.php
new file mode 100644
index 000000000000..a933f49d5f3e
--- /dev/null
+++ b/user_guide_src/source/models/model/050.php
@@ -0,0 +1,13 @@
+<?php
+
+protected function hashPassword(array $data)
+{
+    if (! isset($data['data']['password'])) {
+        return $data;
+    }
+
+    $data['data']['password_hash'] = password_hash($data['data']['password'], PASSWORD_DEFAULT);
+    unset($data['data']['password']);
+
+    return $data;
+}
diff --git a/user_guide_src/source/models/model/051.php b/user_guide_src/source/models/model/051.php
new file mode 100644
index 000000000000..3e8eaa755359
--- /dev/null
+++ b/user_guide_src/source/models/model/051.php
@@ -0,0 +1,4 @@
+<?php
+
+protected $beforeInsert = ['hashPassword'];
+protected $beforeUpdate = ['hashPassword'];
diff --git a/user_guide_src/source/models/model/052.php b/user_guide_src/source/models/model/052.php
new file mode 100644
index 000000000000..3e3d559de92c
--- /dev/null
+++ b/user_guide_src/source/models/model/052.php
@@ -0,0 +1,3 @@
+<?php
+
+protected $allowCallbacks = false;
diff --git a/user_guide_src/source/models/model/053.php b/user_guide_src/source/models/model/053.php
new file mode 100644
index 000000000000..0dbbe8e133f2
--- /dev/null
+++ b/user_guide_src/source/models/model/053.php
@@ -0,0 +1,4 @@
+<?php
+
+$model->allowCallbacks(false)->find(1); // No callbacks triggered
+$model->find(1); // Callbacks subject to original property value
diff --git a/user_guide_src/source/models/model/054.php b/user_guide_src/source/models/model/054.php
new file mode 100644
index 000000000000..dd8bb573b5dd
--- /dev/null
+++ b/user_guide_src/source/models/model/054.php
@@ -0,0 +1,16 @@
+<?php
+
+protected $beforeFind = ['checkCache'];
+// ...
+protected function checkCache(array $data)
+{
+    // Check if the requested item is already in our cache
+    if (isset($data['id']) && $item = $this->getCachedItem($data['id']])) {
+        $data['data']       = $item;
+        $data['returnData'] = true;
+
+        return $data;
+    }
+
+    // ...
+}
diff --git a/user_guide_src/source/models/model/055.php b/user_guide_src/source/models/model/055.php
new file mode 100644
index 000000000000..1d62c54ba058
--- /dev/null
+++ b/user_guide_src/source/models/model/055.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Database\ConnectionInterface;
+
+class UserModel
+{
+    protected $db;
+
+    public function __construct(ConnectionInterface &$db)
+    {
+        $this->db = &$db;
+    }
+}
diff --git a/user_guide_src/source/outgoing/alternative_php.rst b/user_guide_src/source/outgoing/alternative_php.rst
index 369808874413..b4a2b10257e5 100644
--- a/user_guide_src/source/outgoing/alternative_php.rst
+++ b/user_guide_src/source/outgoing/alternative_php.rst
@@ -25,17 +25,9 @@ Alternative Control Structures
 ==============================
 
 Controls structures, like if, for, foreach, and while can be written in
-a simplified format as well. Here is an example using ``foreach``::
+a simplified format as well. Here is an example using ``foreach``:
 
-    <ul>
-
-    <?php foreach ($todo as $item): ?>
-
-        <li><?= $item ?></li>
-
-    <?php endforeach ?>
-
-    </ul>
+.. literalinclude:: alternative_php/001.php
 
 Notice that there are no braces. Instead, the end brace is replaced with
 ``endforeach``. Each of the control structures listed above has a similar
@@ -44,18 +36,6 @@ closing syntax: ``endif``, ``endfor``, ``endforeach``, and ``endwhile``
 Also notice that instead of using a semicolon after each structure
 (except the last one), there is a colon. This is important!
 
-Here is another example, using ``if``/``elseif``/``else``. Notice the colons::
-
-    <?php if ($username === 'sally'): ?>
-
-        <h3>Hi Sally</h3>
-
-    <?php elseif ($username === 'joe'): ?>
-
-        <h3>Hi Joe</h3>
-
-    <?php else: ?>
-
-        <h3>Hi unknown user</h3>
+Here is another example, using ``if``/``elseif``/``else``. Notice the colons:
 
-    <?php endif ?>
+.. literalinclude:: alternative_php/002.php
diff --git a/user_guide_src/source/outgoing/alternative_php/001.php b/user_guide_src/source/outgoing/alternative_php/001.php
new file mode 100644
index 000000000000..9158fe27dccc
--- /dev/null
+++ b/user_guide_src/source/outgoing/alternative_php/001.php
@@ -0,0 +1,9 @@
+<ul>
+
+<?php foreach ($todo as $item): ?>
+
+    <li><?= $item ?></li>
+
+<?php endforeach ?>
+
+</ul>
diff --git a/user_guide_src/source/outgoing/alternative_php/002.php b/user_guide_src/source/outgoing/alternative_php/002.php
new file mode 100644
index 000000000000..47c5afcfb95a
--- /dev/null
+++ b/user_guide_src/source/outgoing/alternative_php/002.php
@@ -0,0 +1,13 @@
+<?php if ($username === 'sally'): ?>
+
+    <h3>Hi Sally</h3>
+
+<?php elseif ($username === 'joe'): ?>
+
+    <h3>Hi Joe</h3>
+
+<?php else: ?>
+
+    <h3>Hi unknown user</h3>
+
+<?php endif ?>
diff --git a/user_guide_src/source/outgoing/api_responses.rst b/user_guide_src/source/outgoing/api_responses.rst
index 92eaa066f36f..1e6e2bba735f 100644
--- a/user_guide_src/source/outgoing/api_responses.rst
+++ b/user_guide_src/source/outgoing/api_responses.rst
@@ -17,66 +17,13 @@ Example Usage
 
 The following example shows a common usage pattern within your controllers.
 
-::
-
-    <?php
-
-    namespace App\Controllers;
-
-    use CodeIgniter\API\ResponseTrait;
-
-    class Users extends \CodeIgniter\Controller
-    {
-        use ResponseTrait;
-
-        public function createUser()
-        {
-            $model = new UserModel();
-            $user  = $model->save($this->request->getPost());
-
-            // Respond with 201 status code
-            return $this->respondCreated();
-        }
-    }
+.. literalinclude:: api_responses/001.php
 
 In this example, an HTTP status code of 201 is returned, with the generic status message, 'Created'. Methods
-exist for the most common use cases::
-
-    // Generic response method
-    $this->respond($data, 200);
-
-    // Generic failure response
-    $this->fail($errors, 400);
-
-    // Item created response
-    $this->respondCreated($data);
-
-    // Item successfully deleted
-    $this->respondDeleted($data);
-
-    // Command executed by no response required
-    $this->respondNoContent($message);
-
-    // Client isn't authorized
-    $this->failUnauthorized($description);
-
-    // Forbidden action
-    $this->failForbidden($description);
-
-    // Resource Not Found
-    $this->failNotFound($description);
-
-    // Data did not validate
-    $this->failValidationError($description);
+exist for the most common use cases:
 
-    // Resource already exists
-    $this->failResourceExists($description);
-
-    // Resource previously deleted
-    $this->failResourceGone($description);
-
-    // Client made too many requests
-    $this->failTooManyRequests($description);
+.. literalinclude:: api_responses/002.php
+   :lines: 2-
 
 ***********************
 Handling Response Types
@@ -92,12 +39,10 @@ the following criteria:
 
 To define the formatter that is used, edit **Config/Format.php**. The ``$supportedResponseFormats`` contains a list of
 mime types that your application can automatically format the response for. By default, the system knows how to
-format both XML and JSON responses::
+format both XML and JSON responses:
 
-        public $supportedResponseFormats = [
-            'application/json',
-            'application/xml',
-        ];
+.. literalinclude:: api_responses/003.php
+   :lines: 2-
 
 This is the array that is used during :doc:`Content Negotiation </incoming/content_negotiation>` to determine which
 type of response to return. If no matches are found between what the client requested and what you support, the first
@@ -105,12 +50,10 @@ format in this array is what will be returned.
 
 Next, you need to define the class that is used to format the array of data. This must be a fully qualified class
 name, and the class must implement ``CodeIgniter\Format\FormatterInterface``. Formatters come out of the box that
-support both JSON and XML::
+support both JSON and XML:
 
-    public $formatters = [
-        'application/json' => \CodeIgniter\Format\JSONFormatter::class,
-        'application/xml'  => \CodeIgniter\Format\XMLFormatter::class,
-    ];
+.. literalinclude:: api_responses/004.php
+   :lines: 2-
 
 So, if your request asks for JSON formatted data in an **Accept** header, the data array you pass any of the
 ``respond*`` or ``fail*`` methods will be formatted by the ``CodeIgniter\Format\JSONFormatter`` class. The resulting
@@ -125,10 +68,8 @@ Class Reference
     This defines the format to be used when formatting arrays in responses. If you provide a ``null`` value for
     ``$format``, it will be automatically determined through content negotiation.
 
-::
-
-    return $this->setResponseFormat('json')->respond(['error' => false]);
-
+.. literalinclude:: api_responses/005.php
+   :lines: 2-
 
 .. php:method:: respond($data[, $statusCode = 200[, $message = '']])
 
@@ -171,16 +112,10 @@ Class Reference
     that match the status code.
 
     The response is an array with two elements: ``error`` and ``messages``. The ``error`` element contains the status
-    code of the error. The ``messages`` element contains an array of error messages. It would look something like::
+    code of the error. The ``messages`` element contains an array of error messages. It would look something like:
 
-        $response = [
-            'status'   => 400,
-            'code'     => '321a',
-            'messages' => [
-                'Error message 1',
-                'Error message 2',
-            ],
-        ];
+    .. literalinclude:: api_responses/006.php
+       :lines: 2-
 
 .. php:method:: respondCreated($data = null[, string $message = ''])
 
@@ -188,10 +123,10 @@ Class Reference
     :param string $message: A custom "reason" message to return.
     :returns: The value of the Response object's send() method.
 
-    Sets the appropriate status code to use when a new resource was created, typically 201.::
+    Sets the appropriate status code to use when a new resource was created, typically 201.:
 
-        $user = $userModel->insert($data);
-        return $this->respondCreated($user);
+    .. literalinclude:: api_responses/007.php
+       :lines: 2-
 
 .. php:method:: respondDeleted($data = null[, string $message = ''])
 
@@ -201,10 +136,8 @@ Class Reference
 
     Sets the appropriate status code to use when a new resource was deleted as the result of this API call, typically 200.
 
-    ::
-
-        $user = $userModel->delete($id);
-        return $this->respondDeleted(['id' => $id]);
+    .. literalinclude:: api_responses/008.php
+       :lines: 2-
 
 .. php:method:: respondNoContent(string $message = 'No Content')
 
@@ -214,10 +147,8 @@ Class Reference
     Sets the appropriate status code to use when a command was successfully executed by the server but there is no
     meaningful reply to send back to the client, typically 204.
 
-    ::
-
-        sleep(1);
-        return $this->respondNoContent();
+    .. literalinclude:: api_responses/009.php
+       :lines: 2-
 
 .. php:method:: failUnauthorized(string $description = 'Unauthorized'[, string $code = null[, string $message = '']])
 
@@ -229,9 +160,8 @@ Class Reference
     Sets the appropriate status code to use when the user either has not been authorized,
     or has incorrect authorization. Status code is 401.
 
-    ::
-
-        return $this->failUnauthorized('Invalid Auth token');
+    .. literalinclude:: api_responses/010.php
+       :lines: 2-
 
 .. php:method:: failForbidden(string $description = 'Forbidden'[, string $code=null[, string $message = '']])
 
@@ -244,9 +174,8 @@ Class Reference
     Unauthorized implies the client is encouraged to try again with different credentials. Forbidden means
     the client should not try again because it won't help. Status code is 403.
 
-    ::
-
-        return $this->failForbidden('Invalid API endpoint.');
+    .. literalinclude:: api_responses/011.php
+       :lines: 2-
 
 .. php:method:: failNotFound(string $description = 'Not Found'[, string $code=null[, string $message = '']])
 
@@ -257,9 +186,8 @@ Class Reference
 
     Sets the appropriate status code to use when the requested resource cannot be found. Status code is 404.
 
-    ::
-
-        return $this->failNotFound('User 13 cannot be found.');
+    .. literalinclude:: api_responses/012.php
+       :lines: 2-
 
 .. php:method:: failValidationErrors($errors[, string $code=null[, string $message = '']])
 
@@ -270,9 +198,8 @@ Class Reference
 
     Sets the appropriate status code to use when data the client sent did not pass validation rules. Status code is typically 400.
 
-    ::
-
-        return $this->failValidationErrors($validation->getErrors());
+    .. literalinclude:: api_responses/013.php
+       :lines: 2-
 
 .. php:method:: failResourceExists(string $description = 'Conflict'[, string $code=null[, string $message = '']])
 
@@ -284,9 +211,8 @@ Class Reference
     Sets the appropriate status code to use when the resource the client is trying to create already exists.
     Status code is typically 409.
 
-    ::
-
-        return $this->failResourceExists('A user already exists with that email.');
+    .. literalinclude:: api_responses/014.php
+       :lines: 2-
 
 .. php:method:: failResourceGone(string $description = 'Gone'[, string $code=null[, string $message = '']])
 
@@ -298,9 +224,8 @@ Class Reference
     Sets the appropriate status code to use when the requested resource was previously deleted and
     is no longer available. Status code is typically 410.
 
-    ::
-
-        return $this->failResourceGone('That user has been previously deleted.');
+    .. literalinclude:: api_responses/015.php
+       :lines: 2-
 
 .. php:method:: failTooManyRequests(string $description = 'Too Many Requests'[, string $code=null[, string $message = '']])
 
@@ -312,9 +237,8 @@ Class Reference
     Sets the appropriate status code to use when the client has called an API endpoint too many times.
     This might be due to some form of throttling or rate limiting. Status code is typically 400.
 
-    ::
-
-        return $this->failTooManyRequests('You must wait 15 seconds before making another request.');
+    .. literalinclude:: api_responses/016.php
+       :lines: 2-
 
 .. php:method:: failServerError(string $description = 'Internal Server Error'[, string $code = null[, string $message = '']])
 
@@ -325,6 +249,5 @@ Class Reference
 
     Sets the appropriate status code to use when there is a server error.
 
-    ::
-
-        return $this->failServerError('Server error.');
+    .. literalinclude:: api_responses/017.php
+       :lines: 2-
diff --git a/user_guide_src/source/outgoing/api_responses/001.php b/user_guide_src/source/outgoing/api_responses/001.php
new file mode 100644
index 000000000000..c2a196482b58
--- /dev/null
+++ b/user_guide_src/source/outgoing/api_responses/001.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Controllers;
+
+use CodeIgniter\API\ResponseTrait;
+
+class Users extends \CodeIgniter\Controller
+{
+    use ResponseTrait;
+
+    public function createUser()
+    {
+        $model = new UserModel();
+        $user  = $model->save($this->request->getPost());
+
+        // Respond with 201 status code
+        return $this->respondCreated();
+    }
+}
diff --git a/user_guide_src/source/outgoing/api_responses/002.php b/user_guide_src/source/outgoing/api_responses/002.php
new file mode 100644
index 000000000000..e383ddc3c09f
--- /dev/null
+++ b/user_guide_src/source/outgoing/api_responses/002.php
@@ -0,0 +1,37 @@
+<?php
+
+// Generic response method
+$this->respond($data, 200);
+
+// Generic failure response
+$this->fail($errors, 400);
+
+// Item created response
+$this->respondCreated($data);
+
+// Item successfully deleted
+$this->respondDeleted($data);
+
+// Command executed by no response required
+$this->respondNoContent($message);
+
+// Client isn't authorized
+$this->failUnauthorized($description);
+
+// Forbidden action
+$this->failForbidden($description);
+
+// Resource Not Found
+$this->failNotFound($description);
+
+// Data did not validate
+$this->failValidationError($description);
+
+// Resource already exists
+$this->failResourceExists($description);
+
+// Resource previously deleted
+$this->failResourceGone($description);
+
+// Client made too many requests
+$this->failTooManyRequests($description);
diff --git a/user_guide_src/source/outgoing/api_responses/003.php b/user_guide_src/source/outgoing/api_responses/003.php
new file mode 100644
index 000000000000..ab1db7ccdc45
--- /dev/null
+++ b/user_guide_src/source/outgoing/api_responses/003.php
@@ -0,0 +1,6 @@
+<?php
+
+public $supportedResponseFormats = [
+    'application/json',
+    'application/xml',
+];
diff --git a/user_guide_src/source/outgoing/api_responses/004.php b/user_guide_src/source/outgoing/api_responses/004.php
new file mode 100644
index 000000000000..efff1747de80
--- /dev/null
+++ b/user_guide_src/source/outgoing/api_responses/004.php
@@ -0,0 +1,6 @@
+<?php
+
+public $formatters = [
+    'application/json' => \CodeIgniter\Format\JSONFormatter::class,
+    'application/xml'  => \CodeIgniter\Format\XMLFormatter::class,
+];
diff --git a/user_guide_src/source/outgoing/api_responses/005.php b/user_guide_src/source/outgoing/api_responses/005.php
new file mode 100644
index 000000000000..dbe887df0b63
--- /dev/null
+++ b/user_guide_src/source/outgoing/api_responses/005.php
@@ -0,0 +1,3 @@
+<?php
+
+return $this->setResponseFormat('json')->respond(['error' => false]);
diff --git a/user_guide_src/source/outgoing/api_responses/006.php b/user_guide_src/source/outgoing/api_responses/006.php
new file mode 100644
index 000000000000..3c910d6566b5
--- /dev/null
+++ b/user_guide_src/source/outgoing/api_responses/006.php
@@ -0,0 +1,10 @@
+<?php
+
+$response = [
+    'status'   => 400,
+    'code'     => '321a',
+    'messages' => [
+        'Error message 1',
+        'Error message 2',
+    ],
+];
diff --git a/user_guide_src/source/outgoing/api_responses/007.php b/user_guide_src/source/outgoing/api_responses/007.php
new file mode 100644
index 000000000000..568075938d3a
--- /dev/null
+++ b/user_guide_src/source/outgoing/api_responses/007.php
@@ -0,0 +1,4 @@
+<?php
+
+$user = $userModel->insert($data);
+return $this->respondCreated($user);
diff --git a/user_guide_src/source/outgoing/api_responses/008.php b/user_guide_src/source/outgoing/api_responses/008.php
new file mode 100644
index 000000000000..5c1fe47efb65
--- /dev/null
+++ b/user_guide_src/source/outgoing/api_responses/008.php
@@ -0,0 +1,4 @@
+<?php
+
+$user = $userModel->delete($id);
+return $this->respondDeleted(['id' => $id]);
diff --git a/user_guide_src/source/outgoing/api_responses/009.php b/user_guide_src/source/outgoing/api_responses/009.php
new file mode 100644
index 000000000000..e7672d94a610
--- /dev/null
+++ b/user_guide_src/source/outgoing/api_responses/009.php
@@ -0,0 +1,4 @@
+<?php
+
+sleep(1);
+return $this->respondNoContent();
diff --git a/user_guide_src/source/outgoing/api_responses/010.php b/user_guide_src/source/outgoing/api_responses/010.php
new file mode 100644
index 000000000000..3de055d94cba
--- /dev/null
+++ b/user_guide_src/source/outgoing/api_responses/010.php
@@ -0,0 +1,3 @@
+<?php
+
+return $this->failUnauthorized('Invalid Auth token');
diff --git a/user_guide_src/source/outgoing/api_responses/011.php b/user_guide_src/source/outgoing/api_responses/011.php
new file mode 100644
index 000000000000..44f3c4eeb23e
--- /dev/null
+++ b/user_guide_src/source/outgoing/api_responses/011.php
@@ -0,0 +1,3 @@
+<?php
+
+return $this->failForbidden('Invalid API endpoint.');
diff --git a/user_guide_src/source/outgoing/api_responses/012.php b/user_guide_src/source/outgoing/api_responses/012.php
new file mode 100644
index 000000000000..2c8d8b29175a
--- /dev/null
+++ b/user_guide_src/source/outgoing/api_responses/012.php
@@ -0,0 +1,3 @@
+<?php
+
+return $this->failNotFound('User 13 cannot be found.');
diff --git a/user_guide_src/source/outgoing/api_responses/013.php b/user_guide_src/source/outgoing/api_responses/013.php
new file mode 100644
index 000000000000..d470b1079d3b
--- /dev/null
+++ b/user_guide_src/source/outgoing/api_responses/013.php
@@ -0,0 +1,3 @@
+<?php
+
+return $this->failValidationErrors($validation->getErrors());
diff --git a/user_guide_src/source/outgoing/api_responses/014.php b/user_guide_src/source/outgoing/api_responses/014.php
new file mode 100644
index 000000000000..d0772239c43e
--- /dev/null
+++ b/user_guide_src/source/outgoing/api_responses/014.php
@@ -0,0 +1,3 @@
+<?php
+
+return $this->failResourceExists('A user already exists with that email.');
diff --git a/user_guide_src/source/outgoing/api_responses/015.php b/user_guide_src/source/outgoing/api_responses/015.php
new file mode 100644
index 000000000000..a8ce10dc9ff6
--- /dev/null
+++ b/user_guide_src/source/outgoing/api_responses/015.php
@@ -0,0 +1,3 @@
+<?php
+
+return $this->failResourceGone('That user has been previously deleted.');
diff --git a/user_guide_src/source/outgoing/api_responses/016.php b/user_guide_src/source/outgoing/api_responses/016.php
new file mode 100644
index 000000000000..197376fe271f
--- /dev/null
+++ b/user_guide_src/source/outgoing/api_responses/016.php
@@ -0,0 +1,3 @@
+<?php
+
+return $this->failTooManyRequests('You must wait 15 seconds before making another request.');
diff --git a/user_guide_src/source/outgoing/api_responses/017.php b/user_guide_src/source/outgoing/api_responses/017.php
new file mode 100644
index 000000000000..5bb665f3dd60
--- /dev/null
+++ b/user_guide_src/source/outgoing/api_responses/017.php
@@ -0,0 +1,3 @@
+<?php
+
+return $this->failServerError('Server error.');
diff --git a/user_guide_src/source/outgoing/localization.rst b/user_guide_src/source/outgoing/localization.rst
index 58b24c48524f..cb87e8717f1a 100644
--- a/user_guide_src/source/outgoing/localization.rst
+++ b/user_guide_src/source/outgoing/localization.rst
@@ -30,9 +30,10 @@ supported language::
 Configuring the Locale
 ======================
 
-Every site will have a default language/locale they operate in. This can be set in **Config/App.php**::
+Every site will have a default language/locale they operate in. This can be set in **Config/App.php**:
 
-    public $defaultLocale = 'en';
+.. literalinclude:: localization/001.php
+   :lines: 2-
 
 The value can be any string that your application uses to manage text strings and other formats. It is
 recommended that a `BCP 47 <http://www.rfc-editor.org/rfc/bcp/bcp47.txt>`_ language code is used. This results in
@@ -58,25 +59,28 @@ Content Negotiation
 -------------------
 
 You can set up content negotiation to happen automatically by setting two additional settings in Config/App.
-The first value tells the Request class that we do want to negotiate a locale, so simply set it to true::
+The first value tells the Request class that we do want to negotiate a locale, so simply set it to true:
 
-    public $negotiateLocale = true;
+.. literalinclude:: localization/002.php
+   :lines: 2-
 
 Once this is enabled, the system will automatically negotiate the correct language based upon an array
 of locales that you have defined in ``$supportLocales``. If no match is found between the languages
 that you support, and the requested language, the first item in $supportedLocales will be used. In
-the following example, the **en** locale would be used if no match is found::
+the following example, the **en** locale would be used if no match is found:
 
-    public $supportedLocales = ['en', 'es', 'fr-FR'];
+.. literalinclude:: localization/003.php
+   :lines: 2-
 
 In Routes
 ---------
 
 The second method uses a custom placeholder to detect the desired locale and set it on the Request. The
 placeholder ``{locale}`` can be placed as a segment in your route. If present, the contents of the matching
-segment will be your locale::
+segment will be your locale:
 
-    $routes->get('{locale}/books', 'App\Books::index');
+.. literalinclude:: localization/004.php
+   :lines: 2-
 
 In this example, if the user tried to visit ``http://example.com/fr/books``, then the locale would be
 set to ``fr``, assuming it was configured as a valid locale.
@@ -88,23 +92,14 @@ Retrieving the Current Locale
 =============================
 
 The current locale can always be retrieved from the IncomingRequest object, through the ``getLocale()`` method.
-If your controller is extending ``CodeIgniter\Controller``, this will be available through ``$this->request``::
+If your controller is extending ``CodeIgniter\Controller``, this will be available through ``$this->request``:
 
-    <?php
+.. literalinclude:: localization/005.php
 
-    namespace App\Controllers;
+Alternatively, you can use the :doc:`Services class </concepts/services>` to retrieve the current request:
 
-    class UserController extends \CodeIgniter\Controller
-    {
-        public function index()
-        {
-            $locale = $this->request->getLocale();
-        }
-    }
-
-Alternatively, you can use the :doc:`Services class </concepts/services>` to retrieve the current request::
-
-    $locale = service('request')->getLocale();
+.. literalinclude:: localization/006.php
+   :lines: 2-
 
 *********************
 Language Localization
@@ -117,43 +112,33 @@ Languages do not have any specific naming convention that are required. The file
 describe the type of content it holds. For example, let's say you want to create a file containing error messages.
 You might name it simply: **Errors.php**.
 
-Within the file, you would return an array, where each element in the array has a language key and can have string to return::
+Within the file, you would return an array, where each element in the array has a language key and can have string to return:
 
-    'languageKey' => 'The actual message to be shown.'
+.. literalinclude:: localization/007.php
+   :lines: 2-
 
-It also support nested definition::
+It also support nested definition:
 
-    'languageKey' => [
-        'nested' => [
-            'key' => 'The actual message to be shown.',
-        ],
-    ],
+.. literalinclude:: localization/008.php
+   :lines: 2-
 
-::
-
-    return [
-        'errorEmailMissing'    => 'You must submit an email address',
-        'errorURLMissing'      => 'You must submit a URL',
-        'errorUsernameMissing' => 'You must submit a username',
-        'nested'               => [
-            'error' => [
-                'message' => 'A specific error message',
-            ],
-        ],
-    ];
+.. literalinclude:: localization/009.php
+   :lines: 2-
 
 Basic Usage
 ===========
 
 You can use the ``lang()`` helper function to retrieve text from any of the language files, by passing the
 filename and the language key as the first parameter, separated by a period (.). For example, to load the
-``errorEmailMissing`` string from the ``Errors`` language file, you would do the following::
+``errorEmailMissing`` string from the ``Errors`` language file, you would do the following:
 
-    echo lang('Errors.errorEmailMissing');
+.. literalinclude:: localization/010.php
+   :lines: 2-
 
-For nested definition, you would do the following::
+For nested definition, you would do the following:
 
-    echo lang('Errors.nested.error.message');
+.. literalinclude:: localization/011.php
+   :lines: 2-
 
 If the requested language key doesn't exist in the file for the current locale, the string will be passed
 back, unchanged. In this example, it would return 'Errors.errorEmailMissing' or 'Errors.nested.error.message' if it didn't exist.
@@ -166,27 +151,20 @@ Replacing Parameters
     A great overview can be found over at `Sitepoint <https://www.sitepoint.com/localization-demystified-understanding-php-intl/>`_.
 
 You can pass an array of values to replace placeholders in the language string as the second parameter to the
-``lang()`` function. This allows for very simple number translations and formatting::
-
-    // The language file, Tests.php:
-    return [
-        'apples'      => 'I have {0, number} apples.',
-        'men'         => 'The top {1, number} men out-performed the remaining {0, number}',
-        'namedApples' => 'I have {number_apples, number, integer} apples.',
-    ];
+``lang()`` function. This allows for very simple number translations and formatting:
 
-    // Displays "I have 3 apples."
-    echo lang('Tests.apples', [ 3 ]);
+.. literalinclude:: localization/012.php
+   :lines: 2-
 
-The first item in the placeholder corresponds to the index of the item in the array, if it's numerical::
+The first item in the placeholder corresponds to the index of the item in the array, if it's numerical:
 
-    // Displays "The top 23 men out-performed the remaining 20"
-    echo lang('Tests.men', [20, 23]);
+.. literalinclude:: localization/013.php
+   :lines: 2-
 
-You can also use named keys to make it easier to keep things straight, if you'd like::
+You can also use named keys to make it easier to keep things straight, if you'd like:
 
-    // Displays "I have 3 apples."
-    echo lang('Tests.namedApples', ['number_apples' => 3]);
+.. literalinclude:: localization/014.php
+   :lines: 2-
 
 Obviously, you can do more than just number replacement. According to the
 `official ICU docs <https://unicode-org.github.io/icu-docs/apidoc/released/icu4c/classMessageFormat.html#details>`_ for the underlying
@@ -199,46 +177,10 @@ library, the following types of data can be replaced:
 * ordinal
 * duration
 
-Here are a few examples::
-
-    // The language file, Tests.php
-    return [
-        'shortTime'  => 'The time is now {0, time, short}.',
-        'mediumTime' => 'The time is now {0, time, medium}.',
-        'longTime'   => 'The time is now {0, time, long}.',
-        'fullTime'   => 'The time is now {0, time, full}.',
-        'shortDate'  => 'The date is now {0, date, short}.',
-        'mediumDate' => 'The date is now {0, date, medium}.',
-        'longDate'   => 'The date is now {0, date, long}.',
-        'fullDate'   => 'The date is now {0, date, full}.',
-        'spelledOut' => '34 is {0, spellout}',
-        'ordinal'    => 'The ordinal is {0, ordinal}',
-        'duration'   => 'It has been {0, duration}',
-    ];
-
-    // Displays "The time is now 11:18 PM"
-    echo lang('Tests.shortTime', [time()]);
-    // Displays "The time is now 11:18:50 PM"
-    echo lang('Tests.mediumTime', [time()]);
-    // Displays "The time is now 11:19:09 PM CDT"
-    echo lang('Tests.longTime', [time()]);
-    // Displays "The time is now 11:19:26 PM Central Daylight Time"
-    echo lang('Tests.fullTime', [time()]);
-
-    // Displays "The date is now 8/14/16"
-    echo lang('Tests.shortDate', [time()]);
-    // Displays "The date is now Aug 14, 2016"
-    echo lang('Tests.mediumDate', [time()]);
-    // Displays "The date is now August 14, 2016"
-    echo lang('Tests.longDate', [time()]);
-    // Displays "The date is now Sunday, August 14, 2016"
-    echo lang('Tests.fullDate', [time()]);
-
-    // Displays "34 is thirty-four"
-    echo lang('Tests.spelledOut', [34]);
-
-    // Displays "It has been 408,676:24:35"
-    echo lang('Tests.ordinal', [time()]);
+Here are a few examples:
+
+.. literalinclude:: localization/015.php
+   :lines: 2-
 
 You should be sure to read up on the MessageFormatter class and the underlying ICU formatting to get a better
 idea on what capabilities it has, like performing the conditional replacement, pluralization, and more. Both of the links provided
@@ -249,37 +191,17 @@ Specifying Locale
 
 To specify a different locale to be used when replacing parameters, you can pass the locale in as the
 third parameter to the ``lang()`` method.
-::
-
-    // Displays "The time is now 23:21:28 GMT-5"
-    echo lang('Test.longTime', [time()], 'ru-RU');
 
-    // Displays "£7.41"
-    echo lang('{price, number, currency}', ['price' => 7.41], 'en-GB');
-    // Displays "$7.41"
-    echo lang('{price, number, currency}', ['price' => 7.41], 'en-US');
+.. literalinclude:: localization/016.php
+   :lines: 2-
 
 Nested Arrays
 -------------
 
 Language files also allow nested arrays to make working with lists, etc... easier.
-::
-
-    // Language/en/Fruit.php
-
-    return [
-        'list' => [
-            'Apples',
-            'Bananas',
-            'Grapes',
-            'Lemons',
-            'Oranges',
-            'Strawberries',
-        ],
-    ];
-
-    // Displays "Apples, Bananas, Grapes, Lemons, Oranges, Strawberries"
-    echo implode(', ', lang('Fruit.list'));
+
+.. literalinclude:: localization/017.php
+   :lines: 2-
 
 Language Fallback
 =================
diff --git a/user_guide_src/source/outgoing/localization/001.php b/user_guide_src/source/outgoing/localization/001.php
new file mode 100644
index 000000000000..c3b3de65be20
--- /dev/null
+++ b/user_guide_src/source/outgoing/localization/001.php
@@ -0,0 +1,3 @@
+<?php
+
+public $defaultLocale = 'en';
diff --git a/user_guide_src/source/outgoing/localization/002.php b/user_guide_src/source/outgoing/localization/002.php
new file mode 100644
index 000000000000..13769b9d9678
--- /dev/null
+++ b/user_guide_src/source/outgoing/localization/002.php
@@ -0,0 +1,3 @@
+<?php
+
+public $negotiateLocale = true;
diff --git a/user_guide_src/source/outgoing/localization/003.php b/user_guide_src/source/outgoing/localization/003.php
new file mode 100644
index 000000000000..67ee698ce54a
--- /dev/null
+++ b/user_guide_src/source/outgoing/localization/003.php
@@ -0,0 +1,3 @@
+<?php
+
+public $supportedLocales = ['en', 'es', 'fr-FR'];
diff --git a/user_guide_src/source/outgoing/localization/004.php b/user_guide_src/source/outgoing/localization/004.php
new file mode 100644
index 000000000000..88d0c0fa7f5a
--- /dev/null
+++ b/user_guide_src/source/outgoing/localization/004.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->get('{locale}/books', 'App\Books::index');
diff --git a/user_guide_src/source/outgoing/localization/005.php b/user_guide_src/source/outgoing/localization/005.php
new file mode 100644
index 000000000000..09d2d5cae03d
--- /dev/null
+++ b/user_guide_src/source/outgoing/localization/005.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Controllers;
+
+class UserController extends \CodeIgniter\Controller
+{
+    public function index()
+    {
+        $locale = $this->request->getLocale();
+    }
+}
diff --git a/user_guide_src/source/outgoing/localization/006.php b/user_guide_src/source/outgoing/localization/006.php
new file mode 100644
index 000000000000..06eee03102b5
--- /dev/null
+++ b/user_guide_src/source/outgoing/localization/006.php
@@ -0,0 +1,3 @@
+<?php
+
+$locale = service('request')->getLocale();
diff --git a/user_guide_src/source/outgoing/localization/007.php b/user_guide_src/source/outgoing/localization/007.php
new file mode 100644
index 000000000000..48dc3e455282
--- /dev/null
+++ b/user_guide_src/source/outgoing/localization/007.php
@@ -0,0 +1,3 @@
+<?php
+
+'languageKey' => 'The actual message to be shown.'
diff --git a/user_guide_src/source/outgoing/localization/008.php b/user_guide_src/source/outgoing/localization/008.php
new file mode 100644
index 000000000000..b8975a521320
--- /dev/null
+++ b/user_guide_src/source/outgoing/localization/008.php
@@ -0,0 +1,7 @@
+<?php
+
+'languageKey' => [
+    'nested' => [
+        'key' => 'The actual message to be shown.',
+    ],
+],
diff --git a/user_guide_src/source/outgoing/localization/009.php b/user_guide_src/source/outgoing/localization/009.php
new file mode 100644
index 000000000000..07e6924dcdab
--- /dev/null
+++ b/user_guide_src/source/outgoing/localization/009.php
@@ -0,0 +1,12 @@
+<?php
+
+return [
+    'errorEmailMissing'    => 'You must submit an email address',
+    'errorURLMissing'      => 'You must submit a URL',
+    'errorUsernameMissing' => 'You must submit a username',
+    'nested'               => [
+        'error' => [
+            'message' => 'A specific error message',
+        ],
+    ],
+];
diff --git a/user_guide_src/source/outgoing/localization/010.php b/user_guide_src/source/outgoing/localization/010.php
new file mode 100644
index 000000000000..7631da71f069
--- /dev/null
+++ b/user_guide_src/source/outgoing/localization/010.php
@@ -0,0 +1,3 @@
+<?php
+
+echo lang('Errors.errorEmailMissing');
diff --git a/user_guide_src/source/outgoing/localization/011.php b/user_guide_src/source/outgoing/localization/011.php
new file mode 100644
index 000000000000..6465cad62061
--- /dev/null
+++ b/user_guide_src/source/outgoing/localization/011.php
@@ -0,0 +1,3 @@
+<?php
+
+echo lang('Errors.nested.error.message');
diff --git a/user_guide_src/source/outgoing/localization/012.php b/user_guide_src/source/outgoing/localization/012.php
new file mode 100644
index 000000000000..7e3990788c5b
--- /dev/null
+++ b/user_guide_src/source/outgoing/localization/012.php
@@ -0,0 +1,11 @@
+<?php
+
+// The language file, Tests.php:
+return [
+    'apples'      => 'I have {0, number} apples.',
+    'men'         => 'The top {1, number} men out-performed the remaining {0, number}',
+    'namedApples' => 'I have {number_apples, number, integer} apples.',
+];
+
+// Displays "I have 3 apples."
+echo lang('Tests.apples', [ 3 ]);
diff --git a/user_guide_src/source/outgoing/localization/013.php b/user_guide_src/source/outgoing/localization/013.php
new file mode 100644
index 000000000000..c74a8f868f6e
--- /dev/null
+++ b/user_guide_src/source/outgoing/localization/013.php
@@ -0,0 +1,4 @@
+<?php
+
+// Displays "The top 23 men out-performed the remaining 20"
+echo lang('Tests.men', [20, 23]);
diff --git a/user_guide_src/source/outgoing/localization/014.php b/user_guide_src/source/outgoing/localization/014.php
new file mode 100644
index 000000000000..f439217e3cc7
--- /dev/null
+++ b/user_guide_src/source/outgoing/localization/014.php
@@ -0,0 +1,4 @@
+<?php
+
+// Displays "I have 3 apples."
+echo lang('Tests.namedApples', ['number_apples' => 3]);
diff --git a/user_guide_src/source/outgoing/localization/015.php b/user_guide_src/source/outgoing/localization/015.php
new file mode 100644
index 000000000000..04e15f558f69
--- /dev/null
+++ b/user_guide_src/source/outgoing/localization/015.php
@@ -0,0 +1,40 @@
+<?php
+
+// The language file, Tests.php
+return [
+    'shortTime'  => 'The time is now {0, time, short}.',
+    'mediumTime' => 'The time is now {0, time, medium}.',
+    'longTime'   => 'The time is now {0, time, long}.',
+    'fullTime'   => 'The time is now {0, time, full}.',
+    'shortDate'  => 'The date is now {0, date, short}.',
+    'mediumDate' => 'The date is now {0, date, medium}.',
+    'longDate'   => 'The date is now {0, date, long}.',
+    'fullDate'   => 'The date is now {0, date, full}.',
+    'spelledOut' => '34 is {0, spellout}',
+    'ordinal'    => 'The ordinal is {0, ordinal}',
+    'duration'   => 'It has been {0, duration}',
+];
+
+// Displays "The time is now 11:18 PM"
+echo lang('Tests.shortTime', [time()]);
+// Displays "The time is now 11:18:50 PM"
+echo lang('Tests.mediumTime', [time()]);
+// Displays "The time is now 11:19:09 PM CDT"
+echo lang('Tests.longTime', [time()]);
+// Displays "The time is now 11:19:26 PM Central Daylight Time"
+echo lang('Tests.fullTime', [time()]);
+
+// Displays "The date is now 8/14/16"
+echo lang('Tests.shortDate', [time()]);
+// Displays "The date is now Aug 14, 2016"
+echo lang('Tests.mediumDate', [time()]);
+// Displays "The date is now August 14, 2016"
+echo lang('Tests.longDate', [time()]);
+// Displays "The date is now Sunday, August 14, 2016"
+echo lang('Tests.fullDate', [time()]);
+
+// Displays "34 is thirty-four"
+echo lang('Tests.spelledOut', [34]);
+
+// Displays "It has been 408,676:24:35"
+echo lang('Tests.ordinal', [time()]);
diff --git a/user_guide_src/source/outgoing/localization/016.php b/user_guide_src/source/outgoing/localization/016.php
new file mode 100644
index 000000000000..93b709a73e99
--- /dev/null
+++ b/user_guide_src/source/outgoing/localization/016.php
@@ -0,0 +1,9 @@
+<?php
+
+// Displays "The time is now 23:21:28 GMT-5"
+echo lang('Test.longTime', [time()], 'ru-RU');
+
+// Displays "£7.41"
+echo lang('{price, number, currency}', ['price' => 7.41], 'en-GB');
+// Displays "$7.41"
+echo lang('{price, number, currency}', ['price' => 7.41], 'en-US');
diff --git a/user_guide_src/source/outgoing/localization/017.php b/user_guide_src/source/outgoing/localization/017.php
new file mode 100644
index 000000000000..bd6218e927b5
--- /dev/null
+++ b/user_guide_src/source/outgoing/localization/017.php
@@ -0,0 +1,17 @@
+<?php
+
+// Language/en/Fruit.php
+
+return [
+    'list' => [
+        'Apples',
+        'Bananas',
+        'Grapes',
+        'Lemons',
+        'Oranges',
+        'Strawberries',
+    ],
+];
+
+// Displays "Apples, Bananas, Grapes, Lemons, Oranges, Strawberries"
+echo implode(', ', lang('Fruit.list'));
diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
index a573710ad8c8..6a1fcd81b85c 100644
--- a/user_guide_src/source/outgoing/response.rst
+++ b/user_guide_src/source/outgoing/response.rst
@@ -23,26 +23,22 @@ Setting the Output
 
 When you need to set the output of the script directly, and not rely on CodeIgniter to automatically get it, you
 do it manually with the ``setBody`` method. This is usually used in conjunction with setting the status code of
-the response::
+the response:
 
-    $this->response->setStatusCode(404)->setBody($body);
+.. literalinclude:: response/001.php
+   :lines: 2-
 
 The reason phrase ('OK', 'Created', 'Moved Permanently') will be automatically added, but you can add custom reasons
-as the second parameter of the ``setStatusCode()`` method::
+as the second parameter of the ``setStatusCode()`` method:
 
-    $this->response->setStatusCode(404, 'Nope. Not here.');
+.. literalinclude:: response/002.php
+   :lines: 2-
 
 You can set format an array into either JSON or XML and set the content type header to the appropriate mime with the
-``setJSON`` and ``setXML`` methods. Typically, you will send an array of data to be converted::
+``setJSON`` and ``setXML`` methods. Typically, you will send an array of data to be converted:
 
-    $data = [
-        'success' => true,
-        'id' => 123,
-    ];
-
-    return $this->response->setJSON($data);
-    // or
-    return $this->response->setXML($data);
+.. literalinclude:: response/003.php
+   :lines: 2-
 
 Setting Headers
 ---------------
@@ -52,24 +48,22 @@ with the ``setHeader()`` method. The first parameter is the name of the header.
 which can be either a string or an array of values that will be combined correctly when sent to the client.
 Using these functions instead of using the native PHP functions allows you to ensure that no headers are sent
 prematurely, causing errors, and makes testing possible.
-::
 
-    $response->setHeader('Location', 'http://example.com')
-             ->setHeader('WWW-Authenticate', 'Negotiate');
+.. literalinclude:: response/004.php
+   :lines: 2-
 
 If the header exists and can have more than one value, you may use the ``appendHeader()`` and ``prependHeader()``
 methods to add the value to the end or beginning of the values list, respectively. The first parameter is the name
 of the header, while the second is the value to append or prepend.
-::
 
-    $response->setHeader('Cache-Control', 'no-cache')
-             ->appendHeader('Cache-Control', 'must-revalidate');
+.. literalinclude:: response/005.php
+   :lines: 2-
 
 Headers can be removed from the response with the ``removeHeader()`` method, which takes the header name as the only
 parameter. This is not case-sensitive.
-::
 
-    $response->removeHeader('Location');
+.. literalinclude:: response/006.php
+   :lines: 2-
 
 Force File Download
 ===================
@@ -87,21 +81,21 @@ If you set the third parameter to boolean true, then the actual file MIME type
 (based on the filename extension) will be sent, so that if your browser has a
 handler for that type - it can use it.
 
-Example::
+Example:
 
-    $data = 'Here is some text!';
-    $name = 'mytext.txt';
-    return $response->download($name, $data);
+.. literalinclude:: response/007.php
+   :lines: 2-
 
 If you want to download an existing file from your server you'll need to
-pass ``null`` explicitly for the second parameter::
+pass ``null`` explicitly for the second parameter:
 
-    // Contents of photo.jpg will be automatically read
-    return $response->download('/path/to/photo.jpg', null);
+.. literalinclude:: response/008.php
+   :lines: 2-
 
-Use the optional ``setFileName()`` method to change the filename as it is sent to the client's browser::
+Use the optional ``setFileName()`` method to change the filename as it is sent to the client's browser:
 
-    return $response->download('awkwardEncryptedFileName.fakeExt', null)->setFileName('expenses.csv');
+.. literalinclude:: response/009.php
+   :lines: 2-
 
 .. note:: The response object MUST be returned for the download to be sent to the client. This allows the response
     to be passed through all **after** filters before being sent to the client.
@@ -119,14 +113,10 @@ introduction to all of the cache headers power, but you can get a good understan
 
 By default, all response objects sent through CodeIgniter have HTTP caching turned off. The options and exact
 circumstances are too varied for us to be able to create a good default other than turning it off. It's simple
-to set the Cache values to what you need, through the ``setCache()`` method::
+to set the Cache values to what you need, through the ``setCache()`` method:
 
-    $options = [
-        'max-age'  => 300,
-        's-maxage' => 900,
-        'etag'     => 'abcde'
-    ];
-    $this->response->setCache($options);
+.. literalinclude:: response/010.php
+   :lines: 2-
 
 The ``$options`` array simply takes an array of key/value pairs that are, with a couple of exceptions, assigned
 to the ``Cache-Control`` header. You are free to set all of the options exactly as you need for your specific
@@ -159,9 +149,10 @@ Turning CSP On
 --------------
 
 By default, support for this is off. To enable support in your application, edit the ``CSPEnabled`` value in
-**app/Config/App.php**::
+**app/Config/App.php**:
 
-    public $CSPEnabled = true;
+.. literalinclude:: response/011.php
+   :lines: 2-
 
 When enabled, the response object will contain an instance of ``CodeIgniter\HTTP\ContentSecurityPolicy``. The
 values set in **app/Config/ContentSecurityPolicy.php** are applied to that instance, and if no changes are
@@ -184,48 +175,20 @@ Runtime Configuration
 If your application needs to make changes at run-time, you can access the instance at ``$response->CSP``. The
 class holds a number of methods that map pretty clearly to the appropriate header value that you need to set.
 Examples are shown below, with different combinations of parameters, though all accept either a directive
-name or an array of them.::
-
-    // specify the default directive treatment
-    $response->CSP->reportOnly(false);
-
-    // specify the origin to use if none provided for a directive
-    $response->CSP->setDefaultSrc('cdn.example.com');
-
-    // specify the URL that "report-only" reports get sent to
-    $response->CSP->setReportURI('http://example.com/csp/reports');
-
-    // specify that HTTP requests be upgraded to HTTPS
-    $response->CSP->upgradeInsecureRequests(true);
-
-    // add types or origins to CSP directives
-    // assuming that the default treatment is to block rather than just report
-    $response->CSP->addBaseURI('example.com', true); // report only
-    $response->CSP->addChildSrc('https://youtube.com'); // blocked
-    $response->CSP->addConnectSrc('https://*.facebook.com', false); // blocked
-    $response->CSP->addFontSrc('fonts.example.com');
-    $response->CSP->addFormAction('self');
-    $response->CSP->addFrameAncestor('none', true); // report this one
-    $response->CSP->addImageSrc('cdn.example.com');
-    $response->CSP->addMediaSrc('cdn.example.com');
-    $response->CSP->addManifestSrc('cdn.example.com');
-    $response->CSP->addObjectSrc('cdn.example.com', false); // reject from here
-    $response->CSP->addPluginType('application/pdf', false); // reject this media type
-    $response->CSP->addScriptSrc('scripts.example.com', true); // allow but report requests from here
-    $response->CSP->addStyleSrc('css.example.com');
-    $response->CSP->addSandbox(['allow-forms', 'allow-scripts']);
+name or an array of them.:
+
+.. literalinclude:: response/012.php
+   :lines: 2-
 
 The first parameter to each of the "add" methods is an appropriate string value,
 or an array of them.
 
 The ``reportOnly`` method allows you to specify the default reporting treatment
 for subsequent sources, unless over-ridden. For instance, you could specify
-that youtube.com was allowed, and then provide several allowed but reported sources::
+that youtube.com was allowed, and then provide several allowed but reported sources:
 
-    $response->addChildSrc('https://youtube.com'); // allowed
-    $response->reportOnly(true);
-    $response->addChildSrc('https://metube.com'); // allowed but reported
-    $response->addChildSrc('https://ourtube.com',false); // allowed
+.. literalinclude:: response/013.php
+   :lines: 2-
 
 Inline Content
 --------------
@@ -305,9 +268,10 @@ The methods provided by the parent class that are available are:
         :rtype: int
 
         Returns the currently status code for this response. If no status code has been set, a BadMethodCallException
-        will be thrown::
+        will be thrown:
 
-            echo $response->getStatusCode();
+        .. literalinclude:: response/014.php
+           :lines: 2-
 
     .. php:method:: setStatusCode($code[, $reason=''])
 
@@ -316,23 +280,26 @@ The methods provided by the parent class that are available are:
         :returns: The current Response instance
         :rtype: ``CodeIgniter\HTTP\Response``
 
-        Sets the HTTP status code that should be sent with this response::
+        Sets the HTTP status code that should be sent with this response:
 
-            $response->setStatusCode(404);
+        .. literalinclude:: response/015.php
+           :lines: 2-
 
         The reason phrase will be automatically generated based upon the official lists. If you need to set your own
-        for a custom status code, you can pass the reason phrase as the second parameter::
+        for a custom status code, you can pass the reason phrase as the second parameter:
 
-            $response->setStatusCode(230, "Tardis initiated");
+        .. literalinclude:: response/016.php
+           :lines: 2-
 
     .. php:method:: getReasonPhrase()
 
         :returns: The current reason phrase.
         :rtype: string
 
-        Returns the current status code for this response. If not status has been set, will return an empty string::
+        Returns the current status code for this response. If not status has been set, will return an empty string:
 
-            echo $response->getReasonPhrase();
+        .. literalinclude:: response/017.php
+           :lines: 2-
 
     .. php:method:: setDate($date)
 
@@ -340,10 +307,10 @@ The methods provided by the parent class that are available are:
         :returns: The current response instance.
         :rtype: ``CodeIgniter\HTTP\Response``
 
-        Sets the date used for this response. The ``$date`` argument must be an instance of ``DateTime``::
+        Sets the date used for this response. The ``$date`` argument must be an instance of ``DateTime``:
 
-            $date = DateTime::createFromFormat('j-M-Y', '15-Feb-2016');
-            $response->setDate($date);
+        .. literalinclude:: response/018.php
+           :lines: 2-
 
     .. php:method:: setContentType($mime[, $charset='UTF-8'])
 
@@ -352,16 +319,16 @@ The methods provided by the parent class that are available are:
         :returns: The current response instance.
         :rtype: ``CodeIgniter\HTTP\Response``
 
-        Sets the content type this response represents::
+        Sets the content type this response represents:
 
-            $response->setContentType('text/plain');
-            $response->setContentType('text/html');
-            $response->setContentType('application/json');
+        .. literalinclude:: response/019.php
+           :lines: 2-
 
         By default, the method sets the character set to ``UTF-8``. If you need to change this, you can
-        pass the character set as the second parameter::
+        pass the character set as the second parameter:
 
-            $response->setContentType('text/plain', 'x-pig-latin');
+        .. literalinclude:: response/020.php
+           :lines: 2-
 
     .. php:method:: noCache()
 
@@ -369,12 +336,10 @@ The methods provided by the parent class that are available are:
         :rtype: ``CodeIgniter\HTTP\Response``
 
         Sets the ``Cache-Control`` header to turn off all HTTP caching. This is the default setting
-        of all response messages::
+        of all response messages:
 
-            $response->noCache();
-
-            // Sets the following header:
-            Cache-Control: no-store, max-age=0, no-cache
+        .. literalinclude:: response/021.php
+           :lines: 2-
 
     .. php:method:: setCache($options)
 
@@ -403,10 +368,10 @@ The methods provided by the parent class that are available are:
         :rtype: ``CodeIgniter\HTTP\Response``
 
         Sets the ``Last-Modified`` header. The ``$date`` object can be either a string or a ``DateTime``
-        instance::
+        instance:
 
-            $response->setLastModified(date('D, d M Y H:i:s'));
-            $response->setLastModified(DateTime::createFromFormat('u', $time));
+        .. literalinclude:: response/022.php
+           :lines: 2-
 
     .. php:method:: send(): Response
 
@@ -437,21 +402,10 @@ The methods provided by the parent class that are available are:
         **Array Method**
 
         Using this method, an associative array is passed as the first
-        parameter::
-
-            $cookie = [
-                'name'   => 'The Cookie Name',
-                'value'  => 'The Value',
-                'expire' => '86500',
-                'domain' => '.some-domain.com',
-                'path'   => '/',
-                'prefix' => 'myprefix_',
-                'secure' => true,
-                'httponly' => false,
-                'samesite' => 'Lax'
-            ];
-
-            $response->setCookie($cookie);
+        parameter:
+
+        .. literalinclude:: response/023.php
+           :lines: 2-
 
         **Notes**
 
@@ -482,9 +436,10 @@ The methods provided by the parent class that are available are:
         **Discrete Parameters**
 
         If you prefer, you can set the cookie by passing data using individual
-        parameters::
+        parameters:
 
-            $response->setCookie($name, $value, $expire, $domain, $path, $prefix, $secure, $httponly, $samesite);
+        .. literalinclude:: response/024.php
+           :lines: 2-
 
     .. php:method:: deleteCookie($name = ''[, $domain = ''[, $path = '/'[, $prefix = '']]])
 
@@ -510,9 +465,10 @@ The methods provided by the parent class that are available are:
         If any of the optional parameters are empty, then the same-named
         cookie will be deleted across all that apply.
 
-        Example::
+        Example:
 
-            $response->deleteCookie($name);
+        .. literalinclude:: response/025.php
+           :lines: 2-
 
     .. php:method:: hasCookie($name = ''[, $value = null[, $prefix = '']])
 
@@ -531,9 +487,10 @@ The methods provided by the parent class that are available are:
         If a value is given, then the method checks that the cookie exists, and that it
         has the prescribed value.
 
-        Example::
+        Example:
 
-            if ($response->hasCookie($name)) ...
+        .. literalinclude:: response/026.php
+           :lines: 2-
 
     .. php:method:: getCookie($name = ''[, $prefix = ''])
 
@@ -544,9 +501,10 @@ The methods provided by the parent class that are available are:
         Returns the named cookie, if found, or ``null``.
         If no name is given, returns the array of ``Cookie`` objects.
 
-        Example::
+        Example:
 
-            $cookie = $response->getCookie($name);
+        .. literalinclude:: response/027.php
+           :lines: 2-
 
     .. php:method:: getCookies()
 
diff --git a/user_guide_src/source/outgoing/response/001.php b/user_guide_src/source/outgoing/response/001.php
new file mode 100644
index 000000000000..9815f6f1475d
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$this->response->setStatusCode(404)->setBody($body);
diff --git a/user_guide_src/source/outgoing/response/002.php b/user_guide_src/source/outgoing/response/002.php
new file mode 100644
index 000000000000..d5ed0fd87d96
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$this->response->setStatusCode(404, 'Nope. Not here.');
diff --git a/user_guide_src/source/outgoing/response/003.php b/user_guide_src/source/outgoing/response/003.php
new file mode 100644
index 000000000000..e8d671f81739
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/003.php
@@ -0,0 +1,10 @@
+<?php
+
+$data = [
+    'success' => true,
+    'id' => 123,
+];
+
+return $this->response->setJSON($data);
+// or
+return $this->response->setXML($data);
diff --git a/user_guide_src/source/outgoing/response/004.php b/user_guide_src/source/outgoing/response/004.php
new file mode 100644
index 000000000000..2777aea2795b
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/004.php
@@ -0,0 +1,4 @@
+<?php
+
+$response->setHeader('Location', 'http://example.com')
+         ->setHeader('WWW-Authenticate', 'Negotiate');
diff --git a/user_guide_src/source/outgoing/response/005.php b/user_guide_src/source/outgoing/response/005.php
new file mode 100644
index 000000000000..acc3254fa49a
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/005.php
@@ -0,0 +1,4 @@
+<?php
+
+$response->setHeader('Cache-Control', 'no-cache')
+         ->appendHeader('Cache-Control', 'must-revalidate');
diff --git a/user_guide_src/source/outgoing/response/006.php b/user_guide_src/source/outgoing/response/006.php
new file mode 100644
index 000000000000..a2fdee1e9ed5
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/006.php
@@ -0,0 +1,3 @@
+<?php
+
+$response->removeHeader('Location');
diff --git a/user_guide_src/source/outgoing/response/007.php b/user_guide_src/source/outgoing/response/007.php
new file mode 100644
index 000000000000..c8e545831e00
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/007.php
@@ -0,0 +1,5 @@
+<?php
+
+$data = 'Here is some text!';
+$name = 'mytext.txt';
+return $response->download($name, $data);
diff --git a/user_guide_src/source/outgoing/response/008.php b/user_guide_src/source/outgoing/response/008.php
new file mode 100644
index 000000000000..832d75fc0616
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/008.php
@@ -0,0 +1,4 @@
+<?php
+
+// Contents of photo.jpg will be automatically read
+return $response->download('/path/to/photo.jpg', null);
diff --git a/user_guide_src/source/outgoing/response/009.php b/user_guide_src/source/outgoing/response/009.php
new file mode 100644
index 000000000000..e75c386647cb
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/009.php
@@ -0,0 +1,3 @@
+<?php
+
+return $response->download('awkwardEncryptedFileName.fakeExt', null)->setFileName('expenses.csv');
diff --git a/user_guide_src/source/outgoing/response/010.php b/user_guide_src/source/outgoing/response/010.php
new file mode 100644
index 000000000000..724c1fb213a1
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/010.php
@@ -0,0 +1,8 @@
+<?php
+
+$options = [
+    'max-age'  => 300,
+    's-maxage' => 900,
+    'etag'     => 'abcde'
+];
+$this->response->setCache($options);
diff --git a/user_guide_src/source/outgoing/response/011.php b/user_guide_src/source/outgoing/response/011.php
new file mode 100644
index 000000000000..37d2234a5527
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/011.php
@@ -0,0 +1,3 @@
+<?php
+
+public $CSPEnabled = true;
diff --git a/user_guide_src/source/outgoing/response/012.php b/user_guide_src/source/outgoing/response/012.php
new file mode 100644
index 000000000000..6d0d84b19143
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/012.php
@@ -0,0 +1,30 @@
+<?php
+
+// specify the default directive treatment
+$response->CSP->reportOnly(false);
+
+// specify the origin to use if none provided for a directive
+$response->CSP->setDefaultSrc('cdn.example.com');
+
+// specify the URL that "report-only" reports get sent to
+$response->CSP->setReportURI('http://example.com/csp/reports');
+
+// specify that HTTP requests be upgraded to HTTPS
+$response->CSP->upgradeInsecureRequests(true);
+
+// add types or origins to CSP directives
+// assuming that the default treatment is to block rather than just report
+$response->CSP->addBaseURI('example.com', true); // report only
+$response->CSP->addChildSrc('https://youtube.com'); // blocked
+$response->CSP->addConnectSrc('https://*.facebook.com', false); // blocked
+$response->CSP->addFontSrc('fonts.example.com');
+$response->CSP->addFormAction('self');
+$response->CSP->addFrameAncestor('none', true); // report this one
+$response->CSP->addImageSrc('cdn.example.com');
+$response->CSP->addMediaSrc('cdn.example.com');
+$response->CSP->addManifestSrc('cdn.example.com');
+$response->CSP->addObjectSrc('cdn.example.com', false); // reject from here
+$response->CSP->addPluginType('application/pdf', false); // reject this media type
+$response->CSP->addScriptSrc('scripts.example.com', true); // allow but report requests from here
+$response->CSP->addStyleSrc('css.example.com');
+$response->CSP->addSandbox(['allow-forms', 'allow-scripts']);
diff --git a/user_guide_src/source/outgoing/response/013.php b/user_guide_src/source/outgoing/response/013.php
new file mode 100644
index 000000000000..8cebd2451096
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/013.php
@@ -0,0 +1,6 @@
+<?php
+
+$response->addChildSrc('https://youtube.com'); // allowed
+$response->reportOnly(true);
+$response->addChildSrc('https://metube.com'); // allowed but reported
+$response->addChildSrc('https://ourtube.com',false); // allowed
diff --git a/user_guide_src/source/outgoing/response/014.php b/user_guide_src/source/outgoing/response/014.php
new file mode 100644
index 000000000000..c05ef6fbe606
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/014.php
@@ -0,0 +1,3 @@
+<?php
+
+echo $response->getStatusCode();
diff --git a/user_guide_src/source/outgoing/response/015.php b/user_guide_src/source/outgoing/response/015.php
new file mode 100644
index 000000000000..3fbc71bc6371
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/015.php
@@ -0,0 +1,3 @@
+<?php
+
+$response->setStatusCode(404);
diff --git a/user_guide_src/source/outgoing/response/016.php b/user_guide_src/source/outgoing/response/016.php
new file mode 100644
index 000000000000..38d6a8e3b690
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/016.php
@@ -0,0 +1,3 @@
+<?php
+
+$response->setStatusCode(230, "Tardis initiated");
diff --git a/user_guide_src/source/outgoing/response/017.php b/user_guide_src/source/outgoing/response/017.php
new file mode 100644
index 000000000000..78ce30be95bb
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/017.php
@@ -0,0 +1,3 @@
+<?php
+
+echo $response->getReasonPhrase();
diff --git a/user_guide_src/source/outgoing/response/018.php b/user_guide_src/source/outgoing/response/018.php
new file mode 100644
index 000000000000..606424af8f79
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/018.php
@@ -0,0 +1,4 @@
+<?php
+
+$date = DateTime::createFromFormat('j-M-Y', '15-Feb-2016');
+$response->setDate($date);
diff --git a/user_guide_src/source/outgoing/response/019.php b/user_guide_src/source/outgoing/response/019.php
new file mode 100644
index 000000000000..f74953ae772d
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/019.php
@@ -0,0 +1,5 @@
+<?php
+
+$response->setContentType('text/plain');
+$response->setContentType('text/html');
+$response->setContentType('application/json');
diff --git a/user_guide_src/source/outgoing/response/020.php b/user_guide_src/source/outgoing/response/020.php
new file mode 100644
index 000000000000..fdbc546b6fad
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/020.php
@@ -0,0 +1,3 @@
+<?php
+
+$response->setContentType('text/plain', 'x-pig-latin');
diff --git a/user_guide_src/source/outgoing/response/021.php b/user_guide_src/source/outgoing/response/021.php
new file mode 100644
index 000000000000..41745631aaac
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/021.php
@@ -0,0 +1,6 @@
+<?php
+
+$response->noCache();
+
+// Sets the following header:
+Cache-Control: no-store, max-age=0, no-cache
diff --git a/user_guide_src/source/outgoing/response/022.php b/user_guide_src/source/outgoing/response/022.php
new file mode 100644
index 000000000000..5a841f28d2ce
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/022.php
@@ -0,0 +1,4 @@
+<?php
+
+$response->setLastModified(date('D, d M Y H:i:s'));
+$response->setLastModified(DateTime::createFromFormat('u', $time));
diff --git a/user_guide_src/source/outgoing/response/023.php b/user_guide_src/source/outgoing/response/023.php
new file mode 100644
index 000000000000..35d072f354d9
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/023.php
@@ -0,0 +1,15 @@
+<?php
+
+$cookie = [
+    'name'   => 'The Cookie Name',
+    'value'  => 'The Value',
+    'expire' => '86500',
+    'domain' => '.some-domain.com',
+    'path'   => '/',
+    'prefix' => 'myprefix_',
+    'secure' => true,
+    'httponly' => false,
+    'samesite' => 'Lax'
+];
+
+$response->setCookie($cookie);
diff --git a/user_guide_src/source/outgoing/response/024.php b/user_guide_src/source/outgoing/response/024.php
new file mode 100644
index 000000000000..3b75c4004362
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/024.php
@@ -0,0 +1,3 @@
+<?php
+
+$response->setCookie($name, $value, $expire, $domain, $path, $prefix, $secure, $httponly, $samesite);
diff --git a/user_guide_src/source/outgoing/response/025.php b/user_guide_src/source/outgoing/response/025.php
new file mode 100644
index 000000000000..a2343928babe
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/025.php
@@ -0,0 +1,3 @@
+<?php
+
+$response->deleteCookie($name);
diff --git a/user_guide_src/source/outgoing/response/026.php b/user_guide_src/source/outgoing/response/026.php
new file mode 100644
index 000000000000..55149496da87
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/026.php
@@ -0,0 +1,3 @@
+<?php
+
+if ($response->hasCookie($name)) ...
diff --git a/user_guide_src/source/outgoing/response/027.php b/user_guide_src/source/outgoing/response/027.php
new file mode 100644
index 000000000000..1d76679940c8
--- /dev/null
+++ b/user_guide_src/source/outgoing/response/027.php
@@ -0,0 +1,3 @@
+<?php
+
+$cookie = $response->getCookie($name);
diff --git a/user_guide_src/source/outgoing/table.rst b/user_guide_src/source/outgoing/table.rst
index 01b7dabe5cef..9890a18acbe4 100644
--- a/user_guide_src/source/outgoing/table.rst
+++ b/user_guide_src/source/outgoing/table.rst
@@ -17,9 +17,10 @@ Initializing the Class
 ======================
 
 The Table class is not provided as a service, and should be instantiated
-"normally", for instance::
+"normally", for instance:
 
-    $table = new \CodeIgniter\View\Table();
+.. literalinclude:: table/001.php
+   :lines: 2-
 
 Examples
 ========
@@ -29,100 +30,37 @@ multi-dimensional array. Note that the first array index will become the
 table heading (or you can set your own headings using the ``setHeading()``
 method described in the function reference below).
 
-::
-
-    $table = new \CodeIgniter\View\Table();
-
-    $data = [
-        ['Name', 'Color', 'Size'],
-        ['Fred', 'Blue',  'Small'],
-        ['Mary', 'Red',   'Large'],
-        ['John', 'Green', 'Medium'],
-    ];
-
-    echo $table->generate($data);
+.. literalinclude:: table/002.php
+   :lines: 2-
 
 Here is an example of a table created from a database query result. The
 table class will automatically generate the headings based on the table
 names (or you can set your own headings using the ``setHeading()``
 method described in the class reference below).
 
-::
-
-    $table = new \CodeIgniter\View\Table();
-
-    $query = $db->query('SELECT * FROM my_table');
-
-    echo $table->generate($query);
+.. literalinclude:: table/003.php
+   :lines: 2-
 
 Here is an example showing how you might create a table using discrete
-parameters::
+parameters:
 
-    $table = new \CodeIgniter\View\Table();
-
-    $table->setHeading('Name', 'Color', 'Size');
-
-    $table->addRow('Fred', 'Blue', 'Small');
-    $table->addRow('Mary', 'Red', 'Large');
-    $table->addRow('John', 'Green', 'Medium');
-
-    echo $table->generate();
+.. literalinclude:: table/004.php
+   :lines: 2-
 
 Here is the same example, except instead of individual parameters,
-arrays are used::
-
-    $table = new \CodeIgniter\View\Table();
-
-    $table->setHeading(array('Name', 'Color', 'Size'));
+arrays are used:
 
-    $table->addRow(['Fred', 'Blue', 'Small']);
-    $table->addRow(['Mary', 'Red', 'Large']);
-    $table->addRow(['John', 'Green', 'Medium']);
-
-    echo $table->generate();
+.. literalinclude:: table/005.php
+   :lines: 2-
 
 Changing the Look of Your Table
 ===============================
 
 The Table Class permits you to set a table template with which you can
-specify the design of your layout. Here is the template prototype::
-
-    $template = [
-        'table_open'         => '<table border="0" cellpadding="4" cellspacing="0">',
-
-        'thead_open'         => '<thead>',
-        'thead_close'        => '</thead>',
-
-        'heading_row_start'  => '<tr>',
-        'heading_row_end'    => '</tr>',
-        'heading_cell_start' => '<th>',
-        'heading_cell_end'   => '</th>',
-
-        'tfoot_open'         => '<tfoot>',
-        'tfoot_close'        => '</tfoot>',
-
-        'footing_row_start'  => '<tr>',
-        'footing_row_end'    => '</tr>',
-        'footing_cell_start' => '<td>',
-        'footing_cell_end'   => '</td>',
-
-        'tbody_open'         => '<tbody>',
-        'tbody_close'        => '</tbody>',
-
-        'row_start'          => '<tr>',
-        'row_end'            => '</tr>',
-        'cell_start'         => '<td>',
-        'cell_end'           => '</td>',
-
-        'row_alt_start'      => '<tr>',
-        'row_alt_end'        => '</tr>',
-        'cell_alt_start'     => '<td>',
-        'cell_alt_end'       => '</td>',
-
-        'table_close'        => '</table>'
-    ];
+specify the design of your layout. Here is the template prototype:
 
-    $table->setTemplate($template);
+.. literalinclude:: table/006.php
+   :lines: 2-
 
 .. note:: You'll notice there are two sets of "row" blocks in the
     template. These permit you to create alternating row colors or design
@@ -130,23 +68,16 @@ specify the design of your layout. Here is the template prototype::
 
 You are NOT required to submit a complete template. If you only need to
 change parts of the layout you can simply submit those elements. In this
-example, only the table opening tag is being changed::
+example, only the table opening tag is being changed:
 
-    $template = [
-        'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">'
-    ];
-
-    $table->setTemplate($template);
+.. literalinclude:: table/007.php
+   :lines: 2-
 
 You can also set defaults for these by passing an array of template settings
-to the Table constructor.::
-
-    $customSettings = [
-        'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">'
-    ];
-
-    $table = new \CodeIgniter\View\Table($customSettings);
+to the Table constructor.:
 
+.. literalinclude:: table/008.php
+   :lines: 2-
 
 ***************
 Class Reference
@@ -157,15 +88,9 @@ Class Reference
     .. attribute:: $function = null
 
         Allows you to specify a native PHP function or a valid function array object to be applied to all cell data.
-        ::
-
-            $table = new \CodeIgniter\View\Table();
-
-            $table->setHeading('Name', 'Color', 'Size');
-            $table->addRow('Fred', '<strong>Blue</strong>', 'Small');
 
-            $table->function = 'htmlspecialchars';
-            echo $table->generate();
+        .. literalinclude:: table/009.php
+           :lines: 2-
 
         In the above example, all cell data would be run through PHP's :php:func:`htmlspecialchars()` function, resulting in::
 
@@ -186,9 +111,9 @@ Class Reference
         :rtype:    Table
 
         Permits you to add a caption to the table.
-        ::
 
-            $table->setCaption('Colors');
+        .. literalinclude:: table/010.php
+           :lines: 2-
 
     .. php:method:: setHeading([$args = [] [, ...]])
 
@@ -196,11 +121,10 @@ Class Reference
         :returns:    Table instance (method chaining)
         :rtype:    Table
 
-        Permits you to set the table heading. You can submit an array or discrete params::
+        Permits you to set the table heading. You can submit an array or discrete params:
 
-            $table->setHeading('Name', 'Color', 'Size'); // or
-
-            $table->setHeading(['Name', 'Color', 'Size']);
+        .. literalinclude:: table/011.php
+           :lines: 2-
 
     .. php:method:: setFooting([$args = [] [, ...]])
 
@@ -208,11 +132,10 @@ Class Reference
         :returns:    Table instance (method chaining)
         :rtype:    Table
 
-        Permits you to set the table footing. You can submit an array or discrete params::
-
-            $table->setFooting('Subtotal', $subtotal, $notes); // or
+        Permits you to set the table footing. You can submit an array or discrete params:
 
-            $table->setFooting(['Subtotal', $subtotal, $notes]);
+        .. literalinclude:: table/012.php
+           :lines: 2-
 
     .. php:method:: addRow([$args = [] [, ...]])
 
@@ -220,20 +143,16 @@ Class Reference
         :returns:    Table instance (method chaining)
         :rtype:    Table
 
-        Permits you to add a row to your table. You can submit an array or discrete params::
-
-            $table->addRow('Blue', 'Red', 'Green'); // or
+        Permits you to add a row to your table. You can submit an array or discrete params:
 
-            $table->addRow(['Blue', 'Red', 'Green']);
+        .. literalinclude:: table/013.php
+           :lines: 2-
 
         If you would like to set an individual cell's tag attributes, you can use an associative array for that cell.
-        The associative key **data** defines the cell's data. Any other key => val pairs are added as key='val' attributes to the tag::
+        The associative key **data** defines the cell's data. Any other key => val pairs are added as key='val' attributes to the tag:
 
-            $cell = ['data' => 'Blue', 'class' => 'highlight', 'colspan' => 2];
-            $table->addRow($cell, 'Red', 'Green');
-
-            // generates
-            // <td class='highlight' colspan='2'>Blue</td><td>Red</td><td>Green</td>
+        .. literalinclude:: table/014.php
+           :lines: 2-
 
     .. php:method:: makeColumns([$array = [] [, $columnLimit = 0]])
 
@@ -243,27 +162,10 @@ Class Reference
         :rtype:    array
 
         This method takes a one-dimensional array as input and creates a multi-dimensional array with a depth equal to the number of columns desired.
-        This allows a single array with many elements to be displayed in a table that has a fixed column count. Consider this example::
-
-            $list = ['one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve'];
-
-            $newList = $table->makeColumns($list, 3);
-
-            $table->generate($newList);
-
-            // Generates a table with this prototype
-
-            <table border="0" cellpadding="4" cellspacing="0">
-            <tr>
-            <td>one</td><td>two</td><td>three</td>
-            </tr><tr>
-            <td>four</td><td>five</td><td>six</td>
-            </tr><tr>
-            <td>seven</td><td>eight</td><td>nine</td>
-            </tr><tr>
-            <td>ten</td><td>eleven</td><td>twelve</td></tr>
-            </table>
+        This allows a single array with many elements to be displayed in a table that has a fixed column count. Consider this example:
 
+        .. literalinclude:: table/015.php
+           :lines: 2-
 
     .. php:method:: setTemplate($template)
 
@@ -272,13 +174,9 @@ Class Reference
         :rtype:    bool
 
         Permits you to set your template. You can submit a full or partial template.
-        ::
-
-            $template = [
-                'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">'
-            ];
 
-            $table->setTemplate($template);
+        .. literalinclude:: table/016.php
+           :lines: 2-
 
     .. php:method:: setEmpty($value)
 
@@ -287,9 +185,10 @@ Class Reference
         :rtype:    Table
 
         Lets you set a default value for use in any table cells that are empty.
-        You might, for example, set a non-breaking space::
+        You might, for example, set a non-breaking space:
 
-            $table->setEmpty("&nbsp;");
+        .. literalinclude:: table/017.php
+           :lines: 2-
 
     .. php:method:: clear()
 
@@ -301,24 +200,7 @@ Class Reference
         should to call this method after each table has been
         generated to clear the previous table information.
 
-        Example ::
-
-            $table = new \CodeIgniter\View\Table();
-
-            $table->setCaption('Preferences')
-                ->setHeading('Name', 'Color', 'Size')
-                ->addRow('Fred', 'Blue', 'Small')
-                ->addRow('Mary', 'Red', 'Large')
-                ->addRow('John', 'Green', 'Medium');
-
-            echo $table->generate();
-
-            $table->clear();
-
-            $table->setCaption('Shipping')
-                ->setHeading('Name', 'Day', 'Delivery')
-                ->addRow('Fred', 'Wednesday', 'Express')
-                ->addRow('Mary', 'Monday', 'Air')
-                ->addRow('John', 'Saturday', 'Overnight');
+        Example
 
-            echo $table->generate();
+        .. literalinclude:: table/018.php
+           :lines: 2-
diff --git a/user_guide_src/source/outgoing/table/001.php b/user_guide_src/source/outgoing/table/001.php
new file mode 100644
index 000000000000..dbd5ba323335
--- /dev/null
+++ b/user_guide_src/source/outgoing/table/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$table = new \CodeIgniter\View\Table();
diff --git a/user_guide_src/source/outgoing/table/002.php b/user_guide_src/source/outgoing/table/002.php
new file mode 100644
index 000000000000..284053415d1a
--- /dev/null
+++ b/user_guide_src/source/outgoing/table/002.php
@@ -0,0 +1,12 @@
+<?php
+
+$table = new \CodeIgniter\View\Table();
+
+$data = [
+    ['Name', 'Color', 'Size'],
+    ['Fred', 'Blue',  'Small'],
+    ['Mary', 'Red',   'Large'],
+    ['John', 'Green', 'Medium'],
+];
+
+echo $table->generate($data);
diff --git a/user_guide_src/source/outgoing/table/003.php b/user_guide_src/source/outgoing/table/003.php
new file mode 100644
index 000000000000..91218de3f143
--- /dev/null
+++ b/user_guide_src/source/outgoing/table/003.php
@@ -0,0 +1,7 @@
+<?php
+
+$table = new \CodeIgniter\View\Table();
+
+$query = $db->query('SELECT * FROM my_table');
+
+echo $table->generate($query);
diff --git a/user_guide_src/source/outgoing/table/004.php b/user_guide_src/source/outgoing/table/004.php
new file mode 100644
index 000000000000..0d0679305409
--- /dev/null
+++ b/user_guide_src/source/outgoing/table/004.php
@@ -0,0 +1,11 @@
+<?php
+
+$table = new \CodeIgniter\View\Table();
+
+$table->setHeading('Name', 'Color', 'Size');
+
+$table->addRow('Fred', 'Blue', 'Small');
+$table->addRow('Mary', 'Red', 'Large');
+$table->addRow('John', 'Green', 'Medium');
+
+echo $table->generate();
diff --git a/user_guide_src/source/outgoing/table/005.php b/user_guide_src/source/outgoing/table/005.php
new file mode 100644
index 000000000000..06eaf75d9f8d
--- /dev/null
+++ b/user_guide_src/source/outgoing/table/005.php
@@ -0,0 +1,11 @@
+<?php
+
+$table = new \CodeIgniter\View\Table();
+
+$table->setHeading(array('Name', 'Color', 'Size'));
+
+$table->addRow(['Fred', 'Blue', 'Small']);
+$table->addRow(['Mary', 'Red', 'Large']);
+$table->addRow(['John', 'Green', 'Medium']);
+
+echo $table->generate();
diff --git a/user_guide_src/source/outgoing/table/006.php b/user_guide_src/source/outgoing/table/006.php
new file mode 100644
index 000000000000..2bc38b546950
--- /dev/null
+++ b/user_guide_src/source/outgoing/table/006.php
@@ -0,0 +1,38 @@
+<?php
+
+$template = [
+    'table_open'         => '<table border="0" cellpadding="4" cellspacing="0">',
+
+    'thead_open'         => '<thead>',
+    'thead_close'        => '</thead>',
+
+    'heading_row_start'  => '<tr>',
+    'heading_row_end'    => '</tr>',
+    'heading_cell_start' => '<th>',
+    'heading_cell_end'   => '</th>',
+
+    'tfoot_open'         => '<tfoot>',
+    'tfoot_close'        => '</tfoot>',
+
+    'footing_row_start'  => '<tr>',
+    'footing_row_end'    => '</tr>',
+    'footing_cell_start' => '<td>',
+    'footing_cell_end'   => '</td>',
+
+    'tbody_open'         => '<tbody>',
+    'tbody_close'        => '</tbody>',
+
+    'row_start'          => '<tr>',
+    'row_end'            => '</tr>',
+    'cell_start'         => '<td>',
+    'cell_end'           => '</td>',
+
+    'row_alt_start'      => '<tr>',
+    'row_alt_end'        => '</tr>',
+    'cell_alt_start'     => '<td>',
+    'cell_alt_end'       => '</td>',
+
+    'table_close'        => '</table>'
+];
+
+$table->setTemplate($template);
diff --git a/user_guide_src/source/outgoing/table/007.php b/user_guide_src/source/outgoing/table/007.php
new file mode 100644
index 000000000000..307d2e9a6c26
--- /dev/null
+++ b/user_guide_src/source/outgoing/table/007.php
@@ -0,0 +1,7 @@
+<?php
+
+$template = [
+    'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">'
+];
+
+$table->setTemplate($template);
diff --git a/user_guide_src/source/outgoing/table/008.php b/user_guide_src/source/outgoing/table/008.php
new file mode 100644
index 000000000000..9d6dbddd40c6
--- /dev/null
+++ b/user_guide_src/source/outgoing/table/008.php
@@ -0,0 +1,7 @@
+<?php
+
+$customSettings = [
+    'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">'
+];
+
+$table = new \CodeIgniter\View\Table($customSettings);
diff --git a/user_guide_src/source/outgoing/table/009.php b/user_guide_src/source/outgoing/table/009.php
new file mode 100644
index 000000000000..c08af5b1fa9a
--- /dev/null
+++ b/user_guide_src/source/outgoing/table/009.php
@@ -0,0 +1,9 @@
+<?php
+
+$table = new \CodeIgniter\View\Table();
+
+$table->setHeading('Name', 'Color', 'Size');
+$table->addRow('Fred', '<strong>Blue</strong>', 'Small');
+
+$table->function = 'htmlspecialchars';
+echo $table->generate();
diff --git a/user_guide_src/source/outgoing/table/010.php b/user_guide_src/source/outgoing/table/010.php
new file mode 100644
index 000000000000..0c6a74ea5b35
--- /dev/null
+++ b/user_guide_src/source/outgoing/table/010.php
@@ -0,0 +1,3 @@
+<?php
+
+$table->setCaption('Colors');
diff --git a/user_guide_src/source/outgoing/table/011.php b/user_guide_src/source/outgoing/table/011.php
new file mode 100644
index 000000000000..a6657c8690e4
--- /dev/null
+++ b/user_guide_src/source/outgoing/table/011.php
@@ -0,0 +1,5 @@
+<?php
+
+$table->setHeading('Name', 'Color', 'Size'); // or
+
+$table->setHeading(['Name', 'Color', 'Size']);
diff --git a/user_guide_src/source/outgoing/table/012.php b/user_guide_src/source/outgoing/table/012.php
new file mode 100644
index 000000000000..01a26b237908
--- /dev/null
+++ b/user_guide_src/source/outgoing/table/012.php
@@ -0,0 +1,5 @@
+<?php
+
+$table->setFooting('Subtotal', $subtotal, $notes); // or
+
+$table->setFooting(['Subtotal', $subtotal, $notes]);
diff --git a/user_guide_src/source/outgoing/table/013.php b/user_guide_src/source/outgoing/table/013.php
new file mode 100644
index 000000000000..1229bd01d7cd
--- /dev/null
+++ b/user_guide_src/source/outgoing/table/013.php
@@ -0,0 +1,5 @@
+<?php
+
+$table->addRow('Blue', 'Red', 'Green'); // or
+
+$table->addRow(['Blue', 'Red', 'Green']);
diff --git a/user_guide_src/source/outgoing/table/014.php b/user_guide_src/source/outgoing/table/014.php
new file mode 100644
index 000000000000..eb2e3d729a8c
--- /dev/null
+++ b/user_guide_src/source/outgoing/table/014.php
@@ -0,0 +1,7 @@
+<?php
+
+$cell = ['data' => 'Blue', 'class' => 'highlight', 'colspan' => 2];
+$table->addRow($cell, 'Red', 'Green');
+
+// generates
+// <td class='highlight' colspan='2'>Blue</td><td>Red</td><td>Green</td>
diff --git a/user_guide_src/source/outgoing/table/015.php b/user_guide_src/source/outgoing/table/015.php
new file mode 100644
index 000000000000..4f4349ec66b4
--- /dev/null
+++ b/user_guide_src/source/outgoing/table/015.php
@@ -0,0 +1,20 @@
+<?php
+
+$list = ['one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve'];
+
+$newList = $table->makeColumns($list, 3);
+
+$table->generate($newList);
+
+// Generates a table with this prototype
+
+<table border="0" cellpadding="4" cellspacing="0">
+<tr>
+<td>one</td><td>two</td><td>three</td>
+</tr><tr>
+<td>four</td><td>five</td><td>six</td>
+</tr><tr>
+<td>seven</td><td>eight</td><td>nine</td>
+</tr><tr>
+<td>ten</td><td>eleven</td><td>twelve</td></tr>
+</table>
diff --git a/user_guide_src/source/outgoing/table/016.php b/user_guide_src/source/outgoing/table/016.php
new file mode 100644
index 000000000000..307d2e9a6c26
--- /dev/null
+++ b/user_guide_src/source/outgoing/table/016.php
@@ -0,0 +1,7 @@
+<?php
+
+$template = [
+    'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">'
+];
+
+$table->setTemplate($template);
diff --git a/user_guide_src/source/outgoing/table/017.php b/user_guide_src/source/outgoing/table/017.php
new file mode 100644
index 000000000000..41ecff5926c7
--- /dev/null
+++ b/user_guide_src/source/outgoing/table/017.php
@@ -0,0 +1,3 @@
+<?php
+
+$table->setEmpty("&nbsp;");
diff --git a/user_guide_src/source/outgoing/table/018.php b/user_guide_src/source/outgoing/table/018.php
new file mode 100644
index 000000000000..c67c746bde9b
--- /dev/null
+++ b/user_guide_src/source/outgoing/table/018.php
@@ -0,0 +1,21 @@
+<?php
+
+$table = new \CodeIgniter\View\Table();
+
+$table->setCaption('Preferences')
+    ->setHeading('Name', 'Color', 'Size')
+    ->addRow('Fred', 'Blue', 'Small')
+    ->addRow('Mary', 'Red', 'Large')
+    ->addRow('John', 'Green', 'Medium');
+
+echo $table->generate();
+
+$table->clear();
+
+$table->setCaption('Shipping')
+    ->setHeading('Name', 'Day', 'Delivery')
+    ->addRow('Fred', 'Wednesday', 'Express')
+    ->addRow('Mary', 'Monday', 'Air')
+    ->addRow('John', 'Saturday', 'Overnight');
+
+echo $table->generate();
diff --git a/user_guide_src/source/outgoing/view_decorators.rst b/user_guide_src/source/outgoing/view_decorators.rst
index 513e9c1a3f0a..1620446785b0 100644
--- a/user_guide_src/source/outgoing/view_decorators.rst
+++ b/user_guide_src/source/outgoing/view_decorators.rst
@@ -13,29 +13,12 @@ Creating your own view decorators requires creating a new class that implements
 This requires a single method that takes the generated HTML string, performs any modifications on it, and returns
 the resulting HTML.
 
-::
+.. literalinclude:: view_decorators/001.php
 
-    <?php
+Once created, the class must be registered in ``app/Config/View.php``:
 
-    namespace App\Views\Decorators;
-
-    use CodeIgniter\Views\ViewDecoratorInterface;
-
-    class MyDecorator implements ViewDecoratorInterface
-    {
-        public static function decorate(string $html): string
-        {
-            // Modify the output here
-
-            return $html;
-        }
-    }
-
-Once created, the class must be registered in ``app/Config/View.php``::
-
-    public array $decorators = [
-        'App\Views\Decorators\MyDecorator',
-    ];
+.. literalinclude:: view_decorators/002.php
+   :lines: 2-
 
 Now that it's registered the decorator will be called for every view that is rendered or parsed.
 Decorators are called in the order specified in this configuration setting.
diff --git a/user_guide_src/source/outgoing/view_decorators/001.php b/user_guide_src/source/outgoing/view_decorators/001.php
new file mode 100644
index 000000000000..be05e93b5818
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_decorators/001.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Views\Decorators;
+
+use CodeIgniter\Views\ViewDecoratorInterface;
+
+class MyDecorator implements ViewDecoratorInterface
+{
+    public static function decorate(string $html): string
+    {
+        // Modify the output here
+
+        return $html;
+    }
+}
diff --git a/user_guide_src/source/outgoing/view_decorators/002.php b/user_guide_src/source/outgoing/view_decorators/002.php
new file mode 100644
index 000000000000..6b6b05a295eb
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_decorators/002.php
@@ -0,0 +1,5 @@
+<?php
+
+public array $decorators = [
+    'App\Views\Decorators\MyDecorator',
+];
diff --git a/user_guide_src/source/outgoing/view_layouts.rst b/user_guide_src/source/outgoing/view_layouts.rst
index 8bc8f6df829c..2dca286b6052 100644
--- a/user_guide_src/source/outgoing/view_layouts.rst
+++ b/user_guide_src/source/outgoing/view_layouts.rst
@@ -73,17 +73,14 @@ Sections can contain nested sections::
         <?= $this->endSection() ?>
     <?= $this->endSection() ?>
 
-
 ******************
 Rendering the View
 ******************
 
-Rendering the view and it's layout is done exactly as any other view would be displayed within a controller::
+Rendering the view and it's layout is done exactly as any other view would be displayed within a controller:
 
-    public function index()
-    {
-        echo view('some_view');
-    }
+.. literalinclude:: view_layouts/001.php
+   :lines: 2-
 
 It renders the View **app/Views/some_view.php** and if it extends ``default``,
 the Layout **app/Views/default.php** is also used automatically.
diff --git a/user_guide_src/source/outgoing/view_layouts/001.php b/user_guide_src/source/outgoing/view_layouts/001.php
new file mode 100644
index 000000000000..5c6136bfe9ee
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_layouts/001.php
@@ -0,0 +1,6 @@
+<?php
+
+public function index()
+{
+    echo view('some_view');
+}
diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index 9aae57f1af00..3013be1c2690 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -43,14 +43,16 @@ representations that allow you to eliminate PHP from your templates
 Using the View Parser Class
 ***************************
 
-The simplest method to load the parser class is through its service::
+The simplest method to load the parser class is through its service:
 
-    $parser = \Config\Services::parser();
+.. literalinclude:: view_parser/001.php
+   :lines: 2-
 
 Alternately, if you are not using the ``Parser`` class as your default renderer, you
-can instantiate it directly::
+can instantiate it directly:
 
-    $parser = new \CodeIgniter\View\Parser();
+.. literalinclude:: view_parser/002.php
+   :lines: 2-
 
 Then you can use any of the three standard rendering methods that it provides:
 ``render(viewpath, options, save)``, ``setVar(name, value, context)`` and
@@ -85,15 +87,10 @@ Parser templates
 ================
 
 You can use the ``render()`` method to parse (or render) simple templates,
-like this::
+like this:
 
-    $data = [
-        'blog_title'   => 'My Blog Title',
-        'blog_heading' => 'My Blog Heading',
-    ];
-
-    echo $parser->setData($data)
-                ->render('blog_template');
+.. literalinclude:: view_parser/003.php
+   :lines: 2-
 
 View parameters are passed to ``setData()`` as an associative
 array of data to be replaced in the template. In the above example, the
@@ -116,12 +113,8 @@ Several options can be passed to the ``render()`` or ``renderString()`` methods.
 -   ``cascadeData`` - true if pseudo-variable settings should be passed on to nested
     substitutions; default is **true**
 
-::
-
-    echo $parser->render('blog_template', [
-        'cache'      => HOUR,
-        'cache_name' => 'something_unique',
-    ]);
+.. literalinclude:: view_parser/004.php
+   :lines: 2-
 
 ***********************
 Substitution Variations
@@ -132,14 +125,10 @@ Substitutions are performed in the same sequence that pseudo-variables were adde
 
 The **simple substitution** performed by the parser is a one-to-one
 replacement of pseudo-variables where the corresponding data parameter
-has either a scalar or string value, as in this example::
-
-    $template = '<head><title>{blog_title}</title></head>';
-    $data     = ['blog_title' => 'My ramblings'];
-
-    echo $parser->setData($data)->renderString($template);
+has either a scalar or string value, as in this example:
 
-    // Result: <head><title>My ramblings</title></head>
+.. literalinclude:: view_parser/005.php
+   :lines: 2-
 
 The ``Parser`` takes substitution a lot further with "variable pairs",
 used for nested substitutions or looping, and with some advanced
@@ -184,22 +173,10 @@ the number of rows in the "blog_entries" element of the parameters array.
 
 Parsing variable pairs is done using the identical code shown above to
 parse single variables, except, you will add a multi-dimensional array
-corresponding to your variable pair data. Consider this example::
+corresponding to your variable pair data. Consider this example:
 
-    $data = [
-        'blog_title'   => 'My Blog Title',
-        'blog_heading' => 'My Blog Heading',
-        'blog_entries' => [
-            ['title' => 'Title 1', 'body' => 'Body 1'],
-            ['title' => 'Title 2', 'body' => 'Body 2'],
-            ['title' => 'Title 3', 'body' => 'Body 3'],
-            ['title' => 'Title 4', 'body' => 'Body 4'],
-            ['title' => 'Title 5', 'body' => 'Body 5'],
-        ],
-    ];
-
-    echo $parser->setData($data)
-                ->render('blog_template');
+.. literalinclude:: view_parser/006.php
+   :lines: 2-
 
 The value for the pseudo-variable ``blog_entries`` is a sequential
 array of associative arrays. The outer level does not have keys associated
@@ -207,18 +184,10 @@ with each of the nested "rows".
 
 If your "pair" data is coming from a database result, which is already a
 multi-dimensional array, you can simply use the database ``getResultArray()``
-method::
-
-    $query = $db->query("SELECT * FROM blog");
-
-    $data = [
-        'blog_title'   => 'My Blog Title',
-        'blog_heading' => 'My Blog Heading',
-        'blog_entries' => $query->getResultArray(),
-    ];
+method:
 
-    echo $parser->setData($data)
-                ->render('blog_template');
+.. literalinclude:: view_parser/007.php
+   :lines: 2-
 
 If the array you are trying to loop over contains objects instead of arrays,
 the parser will first look for an ``asArray()`` method on the object. If it exists,
@@ -234,19 +203,10 @@ Nested Substitutions
 ====================
 
 A nested substitution happens when the value for a pseudo-variable is
-an associative array of values, like a record from a database::
-
-    $data = [
-        'blog_title'   => 'My Blog Title',
-        'blog_heading' => 'My Blog Heading',
-        'blog_entry'   => [
-            'title' => 'Title 1',
-            'body'  => 'Body 1',
-        ],
-    ];
+an associative array of values, like a record from a database:
 
-    echo $parser->setData($data)
-                ->render('blog_template');
+.. literalinclude:: view_parser/008.php
+   :lines: 2-
 
 The value for the pseudo-variable ``blog_entry`` is an associative
 array. The key/value pairs defined inside it will be exposed inside
@@ -287,32 +247,15 @@ Cascading Data
 With both a nested and a loop substitution, you have the option of cascading
 data pairs into the inner substitution.
 
-The following example is not impacted by cascading::
-
-    $template = '{name} lives in {location}{city} on {planet}{/location}.';
-
-    $data = [
-        'name'     => 'George',
-        'location' => ['city' => 'Red City', 'planet' => 'Mars'],
-    ];
-
-    echo $parser->setData($data)->renderString($template);
-    // Result: George lives in Red City on Mars.
-
-This example gives different results, depending on cascading::
-
-    $template = '{location}{name} lives in {city} on {planet}{/location}.';
+The following example is not impacted by cascading:
 
-    $data = [
-        'name'     => 'George',
-        'location' => ['city' => 'Red City', 'planet' => 'Mars'],
-    ];
+.. literalinclude:: view_parser/009.php
+   :lines: 2-
 
-    echo $parser->setData($data)->renderString($template, ['cascadeData'=>false]);
-    // Result: {name} lives in Red City on Mars.
+This example gives different results, depending on cascading:
 
-    echo $parser->setData($data)->renderString($template, ['cascadeData'=>true]);
-    // Result: George lives in Red City on Mars.
+.. literalinclude:: view_parser/010.php
+   :lines: 2-
 
 Preventing Parsing
 ==================
@@ -336,11 +279,9 @@ blocks must be closed with an ``endif`` tag::
         <h1>Welcome, Admin!</h1>
     {endif}
 
-This simple block is converted to the following during parsing::
+This simple block is converted to the following during parsing:
 
-    <?php if ($role=='admin'): ?>
-        <h1>Welcome, Admin!</h1>
-    <?php endif ?>
+.. literalinclude:: view_parser/010-2.php
 
 All variables used within if statements must have been previously set with the same name. Other than that, it is
 treated exactly like a standard PHP conditional, and all standard PHP rules would apply here. You can use any
@@ -470,23 +411,20 @@ Custom Filters
 
 You can easily create your own filters by editing **app/Config/View.php** and adding new entries to the
 ``$filters`` array. Each key is the name of the filter is called by in the view, and its value is any valid PHP
-callable::
+callable:
 
-    public $filters = [
-        'abs'        => '\CodeIgniter\View\Filters::abs',
-        'capitalize' => '\CodeIgniter\View\Filters::capitalize',
-    ];
+.. literalinclude:: view_parser/011.php
+   :lines: 2-
 
 PHP Native functions as Filters
 -------------------------------
 
 You can use native php function as filters by editing **app/Config/View.php** and adding new entries to the
 ``$filters`` array.Each key is the name of the native PHP function is called by in the view, and its value is any valid native PHP
-function prefixed with::
+function prefixed with:
 
-    public $filters = [
-        'str_repeat' => '\str_repeat',
-    ];
+.. literalinclude:: view_parser/012.php
+   :lines: 2-
 
 Parser Plugins
 ==============
@@ -541,100 +479,50 @@ Registering a Plugin
 
 At its simplest, all you need to do to register a new plugin and make it ready for use is to add it to the
 **app/Config/View.php**, under the **$plugins** array. The key is the name of the plugin that is
-used within the template file. The value is any valid PHP callable, including static class methods, and closures::
-
-    public $plugins = [
-        'foo' => '\Some\Class::methodName',
-        'bar' => function ($str, array $params=[]) {
-            return $str;
-        },
-    ];
-
-Any closures that are being used must be defined in the config file's constructor::
+used within the template file. The value is any valid PHP callable, including static class methods, and closures:
 
-    class View extends \CodeIgniter\Config\View
-    {
-        public $plugins = [];
+.. literalinclude:: view_parser/013.php
+   :lines: 2-
 
-        public function __construct()
-        {
-            $this->plugins['bar'] = function (array $params=[]) {
-                return $params[0] ?? '';
-            };
+Any closures that are being used must be defined in the config file's constructor:
 
-            parent::__construct();
-        }
-    }
+.. literalinclude:: view_parser/014.php
+   :lines: 2-
 
 If the callable is on its own, it is treated as a single tag, not a open/close one. It will be replaced by
-the return value from the plugin::
+the return value from the plugin:
 
-    public $plugins = [
-        'foo' => '\Some\Class::methodName'
-    ];
-
-    // Tag is replaced by the return value of Some\Class::methodName static function.
-    {+ foo +}
+.. literalinclude:: view_parser/015.php
+   :lines: 2-
 
 If the callable is wrapped in an array, it is treated as an open/close tag pair that can operate on any of
-the content between its tags::
-
-    public $plugins = [
-        'foo' => ['\Some\Class::methodName']
-    ];
+the content between its tags:
 
-    {+ foo +} inner content {+ /foo +}
+.. literalinclude:: view_parser/016.php
+   :lines: 2-
 
 ***********
 Usage Notes
 ***********
 
 If you include substitution parameters that are not referenced in your
-template, they are ignored::
-
-    $template = 'Hello, {firstname} {lastname}';
-    $data = [
-        'title'     => 'Mr',
-        'firstname' => 'John',
-        'lastname'  => 'Doe'
-    ];
-    echo $parser->setData($data)
-                ->renderString($template);
+template, they are ignored:
 
-    // Result: Hello, John Doe
+.. literalinclude:: view_parser/017.php
+   :lines: 2-
 
 If you do not include a substitution parameter that is referenced in your
-template, the original pseudo-variable is shown in the result::
+template, the original pseudo-variable is shown in the result:
 
-    $template = 'Hello, {firstname} {initials} {lastname}';
-    $data = [
-        'title'     => 'Mr',
-        'firstname' => 'John',
-        'lastname'  => 'Doe',
-    ];
-    echo $parser->setData($data)
-                ->renderString($template);
-
-    // Result: Hello, John {initials} Doe
+.. literalinclude:: view_parser/018.php
+   :lines: 2-
 
 If you provide a string substitution parameter when an array is expected,
 i.e., for a variable pair, the substitution is done for the opening variable
-pair tag, but the closing variable pair tag is not rendered properly::
+pair tag, but the closing variable pair tag is not rendered properly:
 
-    $template = 'Hello, {firstname} {lastname} ({degrees}{degree} {/degrees})';
-    $data = [
-        'degrees'   => 'Mr',
-        'firstname' => 'John',
-        'lastname'  => 'Doe',
-        'titles'    => [
-            ['degree' => 'BSc'],
-            ['degree' => 'PhD'],
-        ],
-    ];
-    echo $parser->setData($data)
-                ->renderString($template);
-
-    // Result: Hello, John Doe (Mr{degree} {/degrees})
+.. literalinclude:: view_parser/019.php
+   :lines: 2-
 
 View Fragments
 ==============
@@ -667,25 +555,10 @@ Result::
     </ul>
 
 An example with the iteration controlled in the controller,
-using a view fragment::
-
-    $temp = '';
-    $template1 = '<li><a href="{link}">{title}</a></li>';
-    $data1 = [
-        ['title' => 'First Link', 'link' => '/first'],
-        ['title' => 'Second Link', 'link' => '/second'],
-    ];
-
-    foreach ($data1 as $menuItem),{
-        $temp .= $parser->setData($menuItem)->renderString($template1);
-    }
+using a view fragment:
 
-    $template2 = '<ul>{menuitems}</ul>';
-    $data = [
-        'menuitems' => $temp,
-    ];
-    echo $parser->setData($data)
-                ->renderString($template2);
+.. literalinclude:: view_parser/020.php
+   :lines: 2-
 
 Result::
 
@@ -708,9 +581,10 @@ Class Reference
         :returns: The rendered text for the chosen view
         :rtype: string
 
-        Builds the output based upon a file name and any data that has already been set::
+        Builds the output based upon a file name and any data that has already been set:
 
-            echo $parser->render('myview');
+        .. literalinclude:: view_parser/021.php
+           :lines: 2-
 
         Options supported:
 
@@ -732,9 +606,10 @@ Class Reference
         :returns: The rendered text for the chosen view
         :rtype: string
 
-        Builds the output based upon a provided template source and any data that has already been set::
+        Builds the output based upon a provided template source and any data that has already been set:
 
-            echo $parser->render('myview');
+        .. literalinclude:: view_parser/021.php
+           :lines: 2-
 
         Options supported, and behavior, as above.
 
@@ -745,9 +620,10 @@ Class Reference
         :returns: The Renderer, for method chaining
         :rtype: CodeIgniter\\View\\RendererInterface.
 
-        Sets several pieces of view data at once::
+        Sets several pieces of view data at once:
 
-            $renderer->setData(['name' => 'George', 'position' => 'Boss']);
+        .. literalinclude:: view_parser/023.php
+           :lines: 2-
 
         Supported escape contexts: html, css, js, url, or attr or raw.
         If 'raw', no escaping will happen.
@@ -760,9 +636,10 @@ Class Reference
         :returns: The Renderer, for method chaining
         :rtype: CodeIgniter\\View\\RendererInterface.
 
-        Sets a single piece of view data::
+        Sets a single piece of view data:
 
-            $renderer->setVar('name','Joe','html');
+        .. literalinclude:: view_parser/024.php
+           :lines: 2-
 
         Supported escape contexts: html, css, js, url, attr or raw.
         If 'raw', no escaping will happen.
@@ -774,6 +651,7 @@ Class Reference
         :returns: The Renderer, for method chaining
         :rtype: CodeIgniter\\View\\RendererInterface.
 
-        Override the substitution field delimiters::
+        Override the substitution field delimiters:
 
-            $renderer->setDelimiters('[',']');
+        .. literalinclude:: view_parser/025.php
+           :lines: 2-
diff --git a/user_guide_src/source/outgoing/view_parser/001.php b/user_guide_src/source/outgoing/view_parser/001.php
new file mode 100644
index 000000000000..56f7f51e4a07
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$parser = \Config\Services::parser();
diff --git a/user_guide_src/source/outgoing/view_parser/002.php b/user_guide_src/source/outgoing/view_parser/002.php
new file mode 100644
index 000000000000..a57951d052b0
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$parser = new \CodeIgniter\View\Parser();
diff --git a/user_guide_src/source/outgoing/view_parser/003.php b/user_guide_src/source/outgoing/view_parser/003.php
new file mode 100644
index 000000000000..0eefa68d2781
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/003.php
@@ -0,0 +1,9 @@
+<?php
+
+$data = [
+    'blog_title'   => 'My Blog Title',
+    'blog_heading' => 'My Blog Heading',
+];
+
+echo $parser->setData($data)
+            ->render('blog_template');
diff --git a/user_guide_src/source/outgoing/view_parser/004.php b/user_guide_src/source/outgoing/view_parser/004.php
new file mode 100644
index 000000000000..70862b585adc
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/004.php
@@ -0,0 +1,6 @@
+<?php
+
+echo $parser->render('blog_template', [
+    'cache'      => HOUR,
+    'cache_name' => 'something_unique',
+]);
diff --git a/user_guide_src/source/outgoing/view_parser/005.php b/user_guide_src/source/outgoing/view_parser/005.php
new file mode 100644
index 000000000000..6681b588d74e
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/005.php
@@ -0,0 +1,8 @@
+<?php
+
+$template = '<head><title>{blog_title}</title></head>';
+$data     = ['blog_title' => 'My ramblings'];
+
+echo $parser->setData($data)->renderString($template);
+
+// Result: <head><title>My ramblings</title></head>
diff --git a/user_guide_src/source/outgoing/view_parser/006.php b/user_guide_src/source/outgoing/view_parser/006.php
new file mode 100644
index 000000000000..1bedecc07c0a
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/006.php
@@ -0,0 +1,16 @@
+<?php
+
+$data = [
+    'blog_title'   => 'My Blog Title',
+    'blog_heading' => 'My Blog Heading',
+    'blog_entries' => [
+        ['title' => 'Title 1', 'body' => 'Body 1'],
+        ['title' => 'Title 2', 'body' => 'Body 2'],
+        ['title' => 'Title 3', 'body' => 'Body 3'],
+        ['title' => 'Title 4', 'body' => 'Body 4'],
+        ['title' => 'Title 5', 'body' => 'Body 5'],
+    ],
+];
+
+echo $parser->setData($data)
+            ->render('blog_template');
diff --git a/user_guide_src/source/outgoing/view_parser/007.php b/user_guide_src/source/outgoing/view_parser/007.php
new file mode 100644
index 000000000000..8932712a7835
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/007.php
@@ -0,0 +1,12 @@
+<?php
+
+$query = $db->query("SELECT * FROM blog");
+
+$data = [
+    'blog_title'   => 'My Blog Title',
+    'blog_heading' => 'My Blog Heading',
+    'blog_entries' => $query->getResultArray(),
+];
+
+echo $parser->setData($data)
+            ->render('blog_template');
diff --git a/user_guide_src/source/outgoing/view_parser/008.php b/user_guide_src/source/outgoing/view_parser/008.php
new file mode 100644
index 000000000000..ef502cf5e3af
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/008.php
@@ -0,0 +1,13 @@
+<?php
+
+$data = [
+    'blog_title'   => 'My Blog Title',
+    'blog_heading' => 'My Blog Heading',
+    'blog_entry'   => [
+        'title' => 'Title 1',
+        'body'  => 'Body 1',
+    ],
+];
+
+echo $parser->setData($data)
+            ->render('blog_template');
diff --git a/user_guide_src/source/outgoing/view_parser/009.php b/user_guide_src/source/outgoing/view_parser/009.php
new file mode 100644
index 000000000000..6b112fdd6829
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/009.php
@@ -0,0 +1,11 @@
+<?php
+
+$template = '{name} lives in {location}{city} on {planet}{/location}.';
+
+$data = [
+    'name'     => 'George',
+    'location' => ['city' => 'Red City', 'planet' => 'Mars'],
+];
+
+echo $parser->setData($data)->renderString($template);
+// Result: George lives in Red City on Mars.
diff --git a/user_guide_src/source/outgoing/view_parser/010-2.php b/user_guide_src/source/outgoing/view_parser/010-2.php
new file mode 100644
index 000000000000..8030f44e8883
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/010-2.php
@@ -0,0 +1,3 @@
+<?php if ($role=='admin'): ?>
+    <h1>Welcome, Admin!</h1>
+<?php endif ?>
diff --git a/user_guide_src/source/outgoing/view_parser/010.php b/user_guide_src/source/outgoing/view_parser/010.php
new file mode 100644
index 000000000000..33439f861407
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/010.php
@@ -0,0 +1,14 @@
+<?php
+
+$template = '{location}{name} lives in {city} on {planet}{/location}.';
+
+$data = [
+    'name'     => 'George',
+    'location' => ['city' => 'Red City', 'planet' => 'Mars'],
+];
+
+echo $parser->setData($data)->renderString($template, ['cascadeData'=>false]);
+// Result: {name} lives in Red City on Mars.
+
+echo $parser->setData($data)->renderString($template, ['cascadeData'=>true]);
+// Result: George lives in Red City on Mars.
diff --git a/user_guide_src/source/outgoing/view_parser/011.php b/user_guide_src/source/outgoing/view_parser/011.php
new file mode 100644
index 000000000000..39eae3da0177
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/011.php
@@ -0,0 +1,6 @@
+<?php
+
+public $filters = [
+    'abs'        => '\CodeIgniter\View\Filters::abs',
+    'capitalize' => '\CodeIgniter\View\Filters::capitalize',
+];
diff --git a/user_guide_src/source/outgoing/view_parser/012.php b/user_guide_src/source/outgoing/view_parser/012.php
new file mode 100644
index 000000000000..dbb096b416fb
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/012.php
@@ -0,0 +1,5 @@
+<?php
+
+public $filters = [
+    'str_repeat' => '\str_repeat',
+];
diff --git a/user_guide_src/source/outgoing/view_parser/013.php b/user_guide_src/source/outgoing/view_parser/013.php
new file mode 100644
index 000000000000..d959d153d415
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/013.php
@@ -0,0 +1,8 @@
+<?php
+
+public $plugins = [
+    'foo' => '\Some\Class::methodName',
+    'bar' => function ($str, array $params=[]) {
+        return $str;
+    },
+];
diff --git a/user_guide_src/source/outgoing/view_parser/014.php b/user_guide_src/source/outgoing/view_parser/014.php
new file mode 100644
index 000000000000..bac6137888f1
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/014.php
@@ -0,0 +1,15 @@
+<?php
+
+class View extends \CodeIgniter\Config\View
+{
+    public $plugins = [];
+
+    public function __construct()
+    {
+        $this->plugins['bar'] = function (array $params=[]) {
+            return $params[0] ?? '';
+        };
+
+        parent::__construct();
+    }
+}
diff --git a/user_guide_src/source/outgoing/view_parser/015.php b/user_guide_src/source/outgoing/view_parser/015.php
new file mode 100644
index 000000000000..74a18943365c
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/015.php
@@ -0,0 +1,8 @@
+<?php
+
+public $plugins = [
+    'foo' => '\Some\Class::methodName'
+];
+
+// Tag is replaced by the return value of Some\Class::methodName static function.
+{+ foo +}
diff --git a/user_guide_src/source/outgoing/view_parser/016.php b/user_guide_src/source/outgoing/view_parser/016.php
new file mode 100644
index 000000000000..30d72b247059
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/016.php
@@ -0,0 +1,7 @@
+<?php
+
+public $plugins = [
+    'foo' => ['\Some\Class::methodName']
+];
+
+{+ foo +} inner content {+ /foo +}
diff --git a/user_guide_src/source/outgoing/view_parser/017.php b/user_guide_src/source/outgoing/view_parser/017.php
new file mode 100644
index 000000000000..cd9ca09109b9
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/017.php
@@ -0,0 +1,12 @@
+<?php
+
+$template = 'Hello, {firstname} {lastname}';
+$data = [
+    'title'     => 'Mr',
+    'firstname' => 'John',
+    'lastname'  => 'Doe'
+];
+echo $parser->setData($data)
+            ->renderString($template);
+
+// Result: Hello, John Doe
diff --git a/user_guide_src/source/outgoing/view_parser/018.php b/user_guide_src/source/outgoing/view_parser/018.php
new file mode 100644
index 000000000000..dfce0c26ccb4
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/018.php
@@ -0,0 +1,12 @@
+<?php
+
+$template = 'Hello, {firstname} {initials} {lastname}';
+$data = [
+    'title'     => 'Mr',
+    'firstname' => 'John',
+    'lastname'  => 'Doe',
+];
+echo $parser->setData($data)
+            ->renderString($template);
+
+// Result: Hello, John {initials} Doe
diff --git a/user_guide_src/source/outgoing/view_parser/019.php b/user_guide_src/source/outgoing/view_parser/019.php
new file mode 100644
index 000000000000..371fa9a21f14
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/019.php
@@ -0,0 +1,16 @@
+<?php
+
+$template = 'Hello, {firstname} {lastname} ({degrees}{degree} {/degrees})';
+$data = [
+    'degrees'   => 'Mr',
+    'firstname' => 'John',
+    'lastname'  => 'Doe',
+    'titles'    => [
+        ['degree' => 'BSc'],
+        ['degree' => 'PhD'],
+    ],
+];
+echo $parser->setData($data)
+            ->renderString($template);
+
+// Result: Hello, John Doe (Mr{degree} {/degrees})
diff --git a/user_guide_src/source/outgoing/view_parser/020.php b/user_guide_src/source/outgoing/view_parser/020.php
new file mode 100644
index 000000000000..cf7b31fa7e30
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/020.php
@@ -0,0 +1,19 @@
+<?php
+
+$temp = '';
+$template1 = '<li><a href="{link}">{title}</a></li>';
+$data1 = [
+    ['title' => 'First Link', 'link' => '/first'],
+    ['title' => 'Second Link', 'link' => '/second'],
+];
+
+foreach ($data1 as $menuItem),{
+    $temp .= $parser->setData($menuItem)->renderString($template1);
+}
+
+$template2 = '<ul>{menuitems}</ul>';
+$data = [
+    'menuitems' => $temp,
+];
+echo $parser->setData($data)
+            ->renderString($template2);
diff --git a/user_guide_src/source/outgoing/view_parser/021.php b/user_guide_src/source/outgoing/view_parser/021.php
new file mode 100644
index 000000000000..022450bb6fd6
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/021.php
@@ -0,0 +1,3 @@
+<?php
+
+echo $parser->render('myview');
diff --git a/user_guide_src/source/outgoing/view_parser/022.php b/user_guide_src/source/outgoing/view_parser/022.php
new file mode 100644
index 000000000000..022450bb6fd6
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/022.php
@@ -0,0 +1,3 @@
+<?php
+
+echo $parser->render('myview');
diff --git a/user_guide_src/source/outgoing/view_parser/023.php b/user_guide_src/source/outgoing/view_parser/023.php
new file mode 100644
index 000000000000..42ddfa949331
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/023.php
@@ -0,0 +1,3 @@
+<?php
+
+$renderer->setData(['name' => 'George', 'position' => 'Boss']);
diff --git a/user_guide_src/source/outgoing/view_parser/024.php b/user_guide_src/source/outgoing/view_parser/024.php
new file mode 100644
index 000000000000..76ba0b537f96
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/024.php
@@ -0,0 +1,3 @@
+<?php
+
+$renderer->setVar('name','Joe','html');
diff --git a/user_guide_src/source/outgoing/view_parser/025.php b/user_guide_src/source/outgoing/view_parser/025.php
new file mode 100644
index 000000000000..a8633d5717c7
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/025.php
@@ -0,0 +1,3 @@
+<?php
+
+$renderer->setDelimiters('[',']');
diff --git a/user_guide_src/source/outgoing/view_renderer.rst b/user_guide_src/source/outgoing/view_renderer.rst
index 7da85b6f9546..bf1570cede9c 100644
--- a/user_guide_src/source/outgoing/view_renderer.rst
+++ b/user_guide_src/source/outgoing/view_renderer.rst
@@ -12,14 +12,16 @@ Using the View Renderer
 The ``view()`` function is a convenience function that grabs an instance of the
 ``renderer`` service, sets the data, and renders the view. While this is often
 exactly what you want, you may find times where you want to work with it more directly.
-In that case you can access the View service directly::
+In that case you can access the View service directly:
 
-    $view = \Config\Services::renderer();
+.. literalinclude:: view_renderer/001.php
+   :lines: 2-
 
 Alternately, if you are not using the ``View`` class as your default renderer, you
-can instantiate it directly::
+can instantiate it directly:
 
-    $view = new \CodeIgniter\View\View();
+.. literalinclude:: view_renderer/002.php
+   :lines: 2-
 
 .. important:: You should create services only within controllers. If you need
     access to the View class from a library, you should set that as a dependency
@@ -49,11 +51,10 @@ Method Chaining
 ===============
 
 The ``setVar()`` and ``setData()`` methods are chainable, allowing you to combine a
-number of different calls together in a chain::
+number of different calls together in a chain:
 
-    $view->setVar('one', $one)
-         ->setVar('two', $two)
-         ->render('myView');
+.. literalinclude:: view_renderer/003.php
+   :lines: 2-
 
 Escaping Data
 =============
@@ -62,9 +63,10 @@ When you pass data to the ``setVar()`` and ``setData()`` functions you have the
 against cross-site scripting attacks. As the last parameter in either method, you can pass the desired context to
 escape the data for. See below for context descriptions.
 
-If you don't want the data to be escaped, you can pass ``null`` or ``'raw'`` as the final parameter to each function::
+If you don't want the data to be escaped, you can pass ``null`` or ``'raw'`` as the final parameter to each function:
 
-    $view->setVar('one', $one, 'raw');
+.. literalinclude:: view_renderer/004.php
+   :lines: 2-
 
 If you choose not to escape data, or you are passing in an object instance, you can manually escape the data within
 the view with the ``esc()`` function. The first parameter is the string to escape. The second parameter is the
@@ -118,9 +120,10 @@ Class Reference
         :returns: The rendered text for the chosen view
         :rtype: string
 
-        Builds the output based upon a file name and any data that has already been set::
+        Builds the output based upon a file name and any data that has already been set:
 
-            echo $view->render('myview');
+        .. literalinclude:: view_renderer/005.php
+           :lines: 2-
 
     .. php:method:: renderString($view[, $options[, $saveData = false]])
         :noindex:
@@ -131,9 +134,10 @@ Class Reference
         :returns: The rendered text for the chosen view
         :rtype: string
 
-        Builds the output based upon a view fragment and any data that has already been set::
+        Builds the output based upon a view fragment and any data that has already been set:
 
-            echo $view->renderString('<div>My Sharona</div>');
+        .. literalinclude:: view_renderer/006.php
+           :lines: 2-
 
     .. warning:: This could be used for displaying content that might have been stored in a database,
         but you need to be aware that this is a potential security vulnerability,
@@ -148,9 +152,10 @@ Class Reference
         :returns: The Renderer, for method chaining
         :rtype: CodeIgniter\\View\\RendererInterface.
 
-        Sets several pieces of view data at once::
+        Sets several pieces of view data at once:
 
-            $view->setData(['name'=>'George', 'position'=>'Boss']);
+        .. literalinclude:: view_renderer/007.php
+           :lines: 2-
 
         Supported escape contexts: ``html``, ``css``, ``js``, ``url``, or ``attr`` or ``raw``.
         If ``'raw'``, no escaping will happen.
@@ -167,9 +172,10 @@ Class Reference
         :returns: The Renderer, for method chaining
         :rtype: CodeIgniter\\View\\RendererInterface.
 
-        Sets a single piece of view data::
+        Sets a single piece of view data:
 
-            $view->setVar('name','Joe','html');
+        .. literalinclude:: view_renderer/008.php
+           :lines: 2-
 
         Supported escape contexts: ``html``, ``css``, ``js``, ``url``, ``attr`` or ``raw``.
         If ``'raw'``, no escaping will happen.
diff --git a/user_guide_src/source/outgoing/view_renderer/001.php b/user_guide_src/source/outgoing/view_renderer/001.php
new file mode 100644
index 000000000000..2772e22cad0d
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_renderer/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$view = \Config\Services::renderer();
diff --git a/user_guide_src/source/outgoing/view_renderer/002.php b/user_guide_src/source/outgoing/view_renderer/002.php
new file mode 100644
index 000000000000..05fedb3b7b6b
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_renderer/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$view = new \CodeIgniter\View\View();
diff --git a/user_guide_src/source/outgoing/view_renderer/003.php b/user_guide_src/source/outgoing/view_renderer/003.php
new file mode 100644
index 000000000000..c4609b018c58
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_renderer/003.php
@@ -0,0 +1,5 @@
+<?php
+
+$view->setVar('one', $one)
+     ->setVar('two', $two)
+     ->render('myView');
diff --git a/user_guide_src/source/outgoing/view_renderer/004.php b/user_guide_src/source/outgoing/view_renderer/004.php
new file mode 100644
index 000000000000..b690f3478c82
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_renderer/004.php
@@ -0,0 +1,3 @@
+<?php
+
+$view->setVar('one', $one, 'raw');
diff --git a/user_guide_src/source/outgoing/view_renderer/005.php b/user_guide_src/source/outgoing/view_renderer/005.php
new file mode 100644
index 000000000000..9bb35502f352
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_renderer/005.php
@@ -0,0 +1,3 @@
+<?php
+
+echo $view->render('myview');
diff --git a/user_guide_src/source/outgoing/view_renderer/006.php b/user_guide_src/source/outgoing/view_renderer/006.php
new file mode 100644
index 000000000000..8f3c21abd99d
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_renderer/006.php
@@ -0,0 +1,3 @@
+<?php
+
+echo $view->renderString('<div>My Sharona</div>');
diff --git a/user_guide_src/source/outgoing/view_renderer/007.php b/user_guide_src/source/outgoing/view_renderer/007.php
new file mode 100644
index 000000000000..1b45fef3dca5
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_renderer/007.php
@@ -0,0 +1,3 @@
+<?php
+
+$view->setData(['name'=>'George', 'position'=>'Boss']);
diff --git a/user_guide_src/source/outgoing/view_renderer/008.php b/user_guide_src/source/outgoing/view_renderer/008.php
new file mode 100644
index 000000000000..284b58caf6be
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_renderer/008.php
@@ -0,0 +1,3 @@
+<?php
+
+$view->setVar('name','Joe','html');
diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst
index 96e350216ce7..9c386f3feb7c 100644
--- a/user_guide_src/source/outgoing/views.rst
+++ b/user_guide_src/source/outgoing/views.rst
@@ -35,27 +35,18 @@ Then save the file in your **app/Views** directory.
 Displaying a View
 =================
 
-To load and display a particular view file you will use the following function::
+To load and display a particular view file you will use the following function:
 
-    echo view('name');
+.. literalinclude:: views/001.php
+   :lines: 2-
 
 Where *name* is the name of your view file.
 
 .. important:: If the file extension is omitted, then the views are expected to end with the .php extension.
 
-Now, open the controller file you made earlier called ``Blog.php``, and replace the echo statement with the view function::
+Now, open the controller file you made earlier called ``Blog.php``, and replace the echo statement with the view function:
 
-    <?php
-
-    namespace App\Controllers;
-
-    class Blog extends \CodeIgniter\Controller
-    {
-        public function index()
-        {
-            echo view('blog_view');
-        }
-    }
+.. literalinclude:: views/002.php
 
 If you visit your site using the URL you did earlier you should see your new view. The URL was similar to this::
 
@@ -69,26 +60,9 @@ Loading Multiple Views
 
 CodeIgniter will intelligently handle multiple calls to ``view()`` from within a controller. If more than one
 call happens they will be appended together. For example, you may wish to have a header view, a menu view, a
-content view, and a footer view. That might look something like this::
-
-    <?php
-
-    namespace App\Controllers;
-
-    class Page extends \CodeIgniter\Controller
-    {
-        public function index()
-        {
-            $data = [
-                'page_title' => 'Your title',
-            ];
+content view, and a footer view. That might look something like this:
 
-            echo view('header');
-            echo view('menu');
-            echo view('content', $data);
-            echo view('footer');
-        }
-    }
+.. literalinclude:: views/003.php
 
 In the example above, we are using "dynamically added data", which you will see below.
 
@@ -96,9 +70,10 @@ Storing Views within Sub-directories
 ====================================
 
 Your view files can also be stored within sub-directories if you prefer that type of organization.
-When doing so you will need to include the directory name loading the view. Example::
+When doing so you will need to include the directory name loading the view. Example:
 
-    echo view('directory_name/file_name');
+.. literalinclude:: views/004.php
+   :lines: 2-
 
 Namespaced Views
 ================
@@ -109,9 +84,10 @@ to package your views together in a module-like fashion for easy re-use or distr
 
 If you have ``example/blog`` directory that has a PSR-4 mapping set up in the :doc:`Autoloader </concepts/autoloader>` living
 under the namespace ``Example\Blog``, you could retrieve view files as if they were namespaced also. Following this
-example, you could load the **blog_view.php** file from **example/blog/Views** by prepending the namespace to the view name::
+example, you could load the **blog_view.php** file from **example/blog/Views** by prepending the namespace to the view name:
 
-    echo view('Example\Blog\Views\blog_view');
+.. literalinclude:: views/005.php
+   :lines: 2-
 
 .. _caching-views:
 
@@ -119,47 +95,29 @@ Caching Views
 =============
 
 You can cache a view with the ``view`` command by passing a ``cache`` option with the number of seconds to cache
-the view for, in the third parameter::
+the view for, in the third parameter:
 
-    // Cache the view for 60 seconds
-    echo view('file_name', $data, ['cache' => 60]);
+.. literalinclude:: views/006.php
+   :lines: 2-
 
 By default, the view will be cached using the same name as the view file itself. You can customize this by passing
-along ``cache_name`` and the cache ID you wish to use::
+along ``cache_name`` and the cache ID you wish to use:
 
-    // Cache the view for 60 seconds
-    echo view('file_name', $data, ['cache' => 60, 'cache_name' => 'my_cached_view']);
+.. literalinclude:: views/007.php
+   :lines: 2-
 
 Adding Dynamic Data to the View
 ===============================
 
 Data is passed from the controller to the view by way of an array in the second parameter of the view function.
-Here's an example::
+Here's an example:
 
-    $data = [
-        'title'   => 'My title',
-        'heading' => 'My Heading',
-        'message' => 'My Message',
-    ];
+.. literalinclude:: views/008.php
+   :lines: 2-
 
-    echo view('blog_view', $data);
+Let's try it with your controller file. Open it and add this code:
 
-Let's try it with your controller file. Open it and add this code::
-
-    <?php
-
-    namespace App\Controllers;
-
-    class Blog extends \CodeIgniter\Controller
-    {
-        public function index()
-        {
-            $data['title']   = "My Real Title";
-            $data['heading'] = "My Real Heading";
-
-            echo view('blog_view', $data);
-        }
-    }
+.. literalinclude:: views/009.php
 
 Now open your view file and change the text to variables that correspond to the array keys in your data::
 
@@ -178,15 +136,9 @@ The data passed in is only available during one call to `view`. If you call the
 in a single request, you will have to pass the desired data to each view. This keeps any data from "bleeding" into
 other views, potentially causing issues. If you would prefer the data to persist, you can pass the `saveData` option
 into the `$option` array in the third parameter.
-::
-
-    $data = [
-        'title'   => 'My title',
-        'heading' => 'My Heading',
-        'message' => 'My Message',
-    ];
 
-    echo view('blog_view', $data, ['saveData' => true]);
+.. literalinclude:: views/010.php
+   :lines: 2-
 
 Additionally, if you would like the default functionality of the view function to be that it does save the data
 between calls, you can set ``$saveData`` to **true** in **app/Config/Views.php**.
@@ -198,44 +150,10 @@ The data array you pass to your view files is not limited to simple variables. Y
 arrays, which can be looped to generate multiple rows. For example, if you pull data from your database it will
 typically be in the form of a multi-dimensional array.
 
-Here’s a simple example. Add this to your controller::
+Here’s a simple example. Add this to your controller:
 
-    <?php
+.. literalinclude:: views/011.php
 
-    namespace App\Controllers;
+Now open your view file and create a loop:
 
-    class Blog extends \CodeIgniter\Controller
-    {
-        public function index()
-        {
-            $data = [
-                'todo_list' => ['Clean House', 'Call Mom', 'Run Errands'],
-                'title'     => 'My Real Title',
-                'heading'   => 'My Real Heading',
-            ];
-
-            echo view('blog_view', $data);
-        }
-    }
-
-Now open your view file and create a loop::
-
-    <html>
-    <head>
-        <title><?= esc($title) ?></title>
-    </head>
-    <body>
-        <h1><?= esc($heading) ?></h1>
-
-        <h3>My Todo List</h3>
-
-        <ul>
-        <?php foreach ($todo_list as $item): ?>
-
-            <li><?= esc($item) ?></li>
-
-        <?php endforeach ?>
-        </ul>
-
-    </body>
-    </html>
+.. literalinclude:: views/012.php
diff --git a/user_guide_src/source/outgoing/views/001.php b/user_guide_src/source/outgoing/views/001.php
new file mode 100644
index 000000000000..90c817235bf5
--- /dev/null
+++ b/user_guide_src/source/outgoing/views/001.php
@@ -0,0 +1,3 @@
+<?php
+
+echo view('name');
diff --git a/user_guide_src/source/outgoing/views/002.php b/user_guide_src/source/outgoing/views/002.php
new file mode 100644
index 000000000000..263ba6afe957
--- /dev/null
+++ b/user_guide_src/source/outgoing/views/002.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Controllers;
+
+class Blog extends \CodeIgniter\Controller
+{
+    public function index()
+    {
+        echo view('blog_view');
+    }
+}
diff --git a/user_guide_src/source/outgoing/views/003.php b/user_guide_src/source/outgoing/views/003.php
new file mode 100644
index 000000000000..aa61ad6d1614
--- /dev/null
+++ b/user_guide_src/source/outgoing/views/003.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Controllers;
+
+class Page extends \CodeIgniter\Controller
+{
+    public function index()
+    {
+        $data = [
+            'page_title' => 'Your title',
+        ];
+
+        echo view('header');
+        echo view('menu');
+        echo view('content', $data);
+        echo view('footer');
+    }
+}
diff --git a/user_guide_src/source/outgoing/views/004.php b/user_guide_src/source/outgoing/views/004.php
new file mode 100644
index 000000000000..d77e328657f3
--- /dev/null
+++ b/user_guide_src/source/outgoing/views/004.php
@@ -0,0 +1,3 @@
+<?php
+
+echo view('directory_name/file_name');
diff --git a/user_guide_src/source/outgoing/views/005.php b/user_guide_src/source/outgoing/views/005.php
new file mode 100644
index 000000000000..d5070aee9fe6
--- /dev/null
+++ b/user_guide_src/source/outgoing/views/005.php
@@ -0,0 +1,3 @@
+<?php
+
+echo view('Example\Blog\Views\blog_view');
diff --git a/user_guide_src/source/outgoing/views/006.php b/user_guide_src/source/outgoing/views/006.php
new file mode 100644
index 000000000000..98414c50db23
--- /dev/null
+++ b/user_guide_src/source/outgoing/views/006.php
@@ -0,0 +1,4 @@
+<?php
+
+// Cache the view for 60 seconds
+echo view('file_name', $data, ['cache' => 60]);
diff --git a/user_guide_src/source/outgoing/views/007.php b/user_guide_src/source/outgoing/views/007.php
new file mode 100644
index 000000000000..b1d22eb55260
--- /dev/null
+++ b/user_guide_src/source/outgoing/views/007.php
@@ -0,0 +1,4 @@
+<?php
+
+// Cache the view for 60 seconds
+echo view('file_name', $data, ['cache' => 60, 'cache_name' => 'my_cached_view']);
diff --git a/user_guide_src/source/outgoing/views/008.php b/user_guide_src/source/outgoing/views/008.php
new file mode 100644
index 000000000000..c9b2ab2f5bbd
--- /dev/null
+++ b/user_guide_src/source/outgoing/views/008.php
@@ -0,0 +1,9 @@
+<?php
+
+$data = [
+    'title'   => 'My title',
+    'heading' => 'My Heading',
+    'message' => 'My Message',
+];
+
+echo view('blog_view', $data);
diff --git a/user_guide_src/source/outgoing/views/009.php b/user_guide_src/source/outgoing/views/009.php
new file mode 100644
index 000000000000..02ce288dd6c8
--- /dev/null
+++ b/user_guide_src/source/outgoing/views/009.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Controllers;
+
+class Blog extends \CodeIgniter\Controller
+{
+    public function index()
+    {
+        $data['title']   = "My Real Title";
+        $data['heading'] = "My Real Heading";
+
+        echo view('blog_view', $data);
+    }
+}
diff --git a/user_guide_src/source/outgoing/views/010.php b/user_guide_src/source/outgoing/views/010.php
new file mode 100644
index 000000000000..c7dda333df20
--- /dev/null
+++ b/user_guide_src/source/outgoing/views/010.php
@@ -0,0 +1,9 @@
+<?php
+
+$data = [
+    'title'   => 'My title',
+    'heading' => 'My Heading',
+    'message' => 'My Message',
+];
+
+echo view('blog_view', $data, ['saveData' => true]);
diff --git a/user_guide_src/source/outgoing/views/011.php b/user_guide_src/source/outgoing/views/011.php
new file mode 100644
index 000000000000..2f3cb13c2989
--- /dev/null
+++ b/user_guide_src/source/outgoing/views/011.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Controllers;
+
+class Blog extends \CodeIgniter\Controller
+{
+    public function index()
+    {
+        $data = [
+            'todo_list' => ['Clean House', 'Call Mom', 'Run Errands'],
+            'title'     => 'My Real Title',
+            'heading'   => 'My Real Heading',
+        ];
+
+        echo view('blog_view', $data);
+    }
+}
diff --git a/user_guide_src/source/outgoing/views/012.php b/user_guide_src/source/outgoing/views/012.php
new file mode 100644
index 000000000000..5a3781fe6720
--- /dev/null
+++ b/user_guide_src/source/outgoing/views/012.php
@@ -0,0 +1,19 @@
+<html>
+<head>
+    <title><?= esc($title) ?></title>
+</head>
+<body>
+    <h1><?= esc($heading) ?></h1>
+
+    <h3>My Todo List</h3>
+
+    <ul>
+    <?php foreach ($todo_list as $item): ?>
+
+        <li><?= esc($item) ?></li>
+
+    <?php endforeach ?>
+    </ul>
+
+</body>
+</html>
diff --git a/user_guide_src/source/testing/benchmark.rst b/user_guide_src/source/testing/benchmark.rst
index 780dcfe8ac08..33fe7c200be9 100644
--- a/user_guide_src/source/testing/benchmark.rst
+++ b/user_guide_src/source/testing/benchmark.rst
@@ -23,48 +23,39 @@ it simple to measure the performance of different aspects of your application. A
 the ``start()`` and ``stop()`` methods.
 
 The ``start()`` methods takes a single parameter: the name of this timer. You can use any string as the name
-of the timer. It is only used for you to reference later to know which measurement is which::
+of the timer. It is only used for you to reference later to know which measurement is which:
 
-    $benchmark = \Config\Services::timer();
-    $benchmark->start('render view');
+.. literalinclude:: benchmark/001.php
+   :lines: 2-
 
-The ``stop()`` method takes the name of the timer that you want to stop as the only parameter, also::
+The ``stop()`` method takes the name of the timer that you want to stop as the only parameter, also:
 
-    $benchmark->stop('render view');
+.. literalinclude:: benchmark/002.php
+   :lines: 2-
 
 The name is not case-sensitive, but otherwise must match the name you gave it when you started the timer.
 
 Alternatively, you can use the :doc:`global function </general/common_functions>` ``timer()`` to start
-and stop timers::
+and stop timers:
 
-    // Start the timer
-    timer('render view');
-    // Stop a running timer,
-    // if one of this name has been started
-    timer('render view');
+.. literalinclude:: benchmark/003.php
+   :lines: 2-
 
 Viewing Your Benchmark Points
 =============================
 
 When your application runs, all of the timers that you have set are collected by the Timer class. It does
 not automatically display them, though. You can retrieve all of your timers by calling the ``getTimers()`` method.
-This returns an array of benchmark information, including start, end, and duration::
+This returns an array of benchmark information, including start, end, and duration:
 
-    $timers = $benchmark->getTimers();
-
-    // Timers =
-    [
-        'render view'  => [
-            'start'    => 1234567890,
-            'end'      => 1345678920,
-            'duration' => 15.4315, // number of seconds
-        ]
-    ]
+.. literalinclude:: benchmark/004.php
+   :lines: 2-
 
 You can change the precision of the calculated duration by passing in the number of decimal places you want to be shown as
-the only parameter. The default value is 4 numbers behind the decimal point::
+the only parameter. The default value is 4 numbers behind the decimal point:
 
-    $timers = $benchmark->getTimers(6);
+.. literalinclude:: benchmark/005.php
+   :lines: 2-
 
 The timers are automatically displayed in the :doc:`Debub Toolbar </testing/debugging>`.
 
@@ -73,10 +64,10 @@ Displaying Execution Time
 
 While the ``getTimers()`` method will give you the raw data for all of the timers in your project, you can retrieve
 the duration of a single timer, in seconds, with the `getElapsedTime()` method. The first parameter is the name of
-the timer to display. The second is the number of decimal places to display. This defaults to 4::
+the timer to display. The second is the number of decimal places to display. This defaults to 4:
 
-    echo timer()->getElapsedTime('render view');
-    // Displays: 0.0234
+.. literalinclude:: benchmark/006.php
+   :lines: 2-
 
 ==================
 Using the Iterator
@@ -92,32 +83,23 @@ Creating Tasks To Run
 
 Tasks are defined within Closures. Any output the task creates will be discarded automatically. They are
 added to the Iterator class through the `add()` method. The first parameter is a name you want to refer to
-this test by. The second parameter is the Closure, itself::
-
-    $iterator = new \CodeIgniter\Benchmark\Iterator();
-
-    // Add a new task
-    $iterator->add('single_concat', function () {
-        $str = 'Some basic'.'little'.'string concatenation test.';
-    });
+this test by. The second parameter is the Closure, itself:
 
-    // Add another task
-    $iterator->add('double', function ($a = 'little') {
-        $str = "Some basic {$little} string test.";
-    });
+.. literalinclude:: benchmark/007.php
+   :lines: 2-
 
 Running the Tasks
 =================
 
 Once you've added the tasks to run, you can use the ``run()`` method to loop over the tasks many times.
 By default, it will run each task 1000 times. This is probably sufficient for most simple tests. If you need
-to run the tests more times than that, you can pass the number as the first parameter::
+to run the tests more times than that, you can pass the number as the first parameter:
 
-    // Run the tests 3000 times.
-    $iterator->run(3000);
+.. literalinclude:: benchmark/008.php
+   :lines: 2-
 
 Once it has run, it will return an HTML table with the results of the test. If you don't want the results
-displayed, you can pass in `false` as the second parameter::
+displayed, you can pass in `false` as the second parameter:
 
-    // Don't display the results.
-    $iterator->run(1000, false);
+.. literalinclude:: benchmark/009.php
+   :lines: 2-
diff --git a/user_guide_src/source/testing/benchmark/001.php b/user_guide_src/source/testing/benchmark/001.php
new file mode 100644
index 000000000000..ce3bd09ac87f
--- /dev/null
+++ b/user_guide_src/source/testing/benchmark/001.php
@@ -0,0 +1,4 @@
+<?php
+
+$benchmark = \Config\Services::timer();
+$benchmark->start('render view');
diff --git a/user_guide_src/source/testing/benchmark/002.php b/user_guide_src/source/testing/benchmark/002.php
new file mode 100644
index 000000000000..003d1cc18cf7
--- /dev/null
+++ b/user_guide_src/source/testing/benchmark/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$benchmark->stop('render view');
diff --git a/user_guide_src/source/testing/benchmark/003.php b/user_guide_src/source/testing/benchmark/003.php
new file mode 100644
index 000000000000..861dbd8232a5
--- /dev/null
+++ b/user_guide_src/source/testing/benchmark/003.php
@@ -0,0 +1,7 @@
+<?php
+
+// Start the timer
+timer('render view');
+// Stop a running timer,
+// if one of this name has been started
+timer('render view');
diff --git a/user_guide_src/source/testing/benchmark/004.php b/user_guide_src/source/testing/benchmark/004.php
new file mode 100644
index 000000000000..112aea9f2e82
--- /dev/null
+++ b/user_guide_src/source/testing/benchmark/004.php
@@ -0,0 +1,12 @@
+<?php
+
+$timers = $benchmark->getTimers();
+
+// Timers =
+[
+    'render view'  => [
+        'start'    => 1234567890,
+        'end'      => 1345678920,
+        'duration' => 15.4315, // number of seconds
+    ]
+]
diff --git a/user_guide_src/source/testing/benchmark/005.php b/user_guide_src/source/testing/benchmark/005.php
new file mode 100644
index 000000000000..309c02f92a9b
--- /dev/null
+++ b/user_guide_src/source/testing/benchmark/005.php
@@ -0,0 +1,3 @@
+<?php
+
+$timers = $benchmark->getTimers(6);
diff --git a/user_guide_src/source/testing/benchmark/006.php b/user_guide_src/source/testing/benchmark/006.php
new file mode 100644
index 000000000000..a5f93a20fbf9
--- /dev/null
+++ b/user_guide_src/source/testing/benchmark/006.php
@@ -0,0 +1,4 @@
+<?php
+
+echo timer()->getElapsedTime('render view');
+// Displays: 0.0234
diff --git a/user_guide_src/source/testing/benchmark/007.php b/user_guide_src/source/testing/benchmark/007.php
new file mode 100644
index 000000000000..c126ed4a9670
--- /dev/null
+++ b/user_guide_src/source/testing/benchmark/007.php
@@ -0,0 +1,13 @@
+<?php
+
+$iterator = new \CodeIgniter\Benchmark\Iterator();
+
+// Add a new task
+$iterator->add('single_concat', function () {
+    $str = 'Some basic'.'little'.'string concatenation test.';
+});
+
+// Add another task
+$iterator->add('double', function ($a = 'little') {
+    $str = "Some basic {$little} string test.";
+});
diff --git a/user_guide_src/source/testing/benchmark/008.php b/user_guide_src/source/testing/benchmark/008.php
new file mode 100644
index 000000000000..da0f6a83b5fa
--- /dev/null
+++ b/user_guide_src/source/testing/benchmark/008.php
@@ -0,0 +1,4 @@
+<?php
+
+// Run the tests 3000 times.
+$iterator->run(3000);
diff --git a/user_guide_src/source/testing/benchmark/009.php b/user_guide_src/source/testing/benchmark/009.php
new file mode 100644
index 000000000000..1f30692559b2
--- /dev/null
+++ b/user_guide_src/source/testing/benchmark/009.php
@@ -0,0 +1,4 @@
+<?php
+
+// Don't display the results.
+$iterator->run(1000, false);
diff --git a/user_guide_src/source/testing/controllers.rst b/user_guide_src/source/testing/controllers.rst
index d5dd2d379b8b..590e491ed687 100644
--- a/user_guide_src/source/testing/controllers.rst
+++ b/user_guide_src/source/testing/controllers.rst
@@ -17,47 +17,16 @@ case you need it.
 The Helper Trait
 ================
 
-To enable Controller Testing you need to use the ``ControllerTestTrait`` trait within your tests::
+To enable Controller Testing you need to use the ``ControllerTestTrait`` trait within your tests:
 
-    <?php
-
-    namespace CodeIgniter;
-
-    use CodeIgniter\Test\ControllerTestTrait;
-    use CodeIgniter\Test\CIUnitTestCase;
-    use CodeIgniter\Test\DatabaseTestTrait;
-
-    class TestControllerA extends CIUnitTestCase
-    {
-        use ControllerTestTrait, DatabaseTestTrait;
-    }
+.. literalinclude:: controllers/001.php
 
 Once the trait has been included, you can start setting up the environment, including the request and response classes,
 the request body, URI, and more. You specify the controller to use with the ``controller()`` method, passing in the
 fully qualified class name of your controller. Finally, call the ``execute()`` method with the name of the method
-to run as the parameter::
-
-    <?php
-
-    namespace CodeIgniter;
+to run as the parameter:
 
-    use CodeIgniter\Test\ControllerTestTrait;
-    use CodeIgniter\Test\CIUnitTestCase;
-    use CodeIgniter\Test\DatabaseTestTrait;
-
-    class TestControllerA extends CIUnitTestCase
-    {
-        use ControllerTestTrait, DatabaseTestTrait;
-
-        public function testShowCategories()
-        {
-            $result = $this->withURI('http://example.com/categories')
-                           ->controller(\App\Controllers\ForumController::class)
-                           ->execute('showCategories');
-
-            $this->assertTrue($result->isOK());
-        }
-    }
+.. literalinclude:: controllers/002.php
 
 Helper Methods
 ==============
@@ -65,16 +34,17 @@ Helper Methods
 **controller($class)**
 
 Specifies the class name of the controller to test. The first parameter must be a fully qualified class name
-(i.e., include the namespace)::
+(i.e., include the namespace):
 
-    $this->controller(\App\Controllers\ForumController::class);
+.. literalinclude:: controllers/003.php
+   :lines: 2-
 
 **execute(string $method, ...$params)**
 
-Executes the specified method within the controller. The first parameter is the name of the method to run::
+Executes the specified method within the controller. The first parameter is the name of the method to run:
 
-    $results = $this->controller(\App\Controllers\ForumController::class)
-                    ->execute('showCategories');
+.. literalinclude:: controllers/004.php
+   :lines: 2-
 
 By specifying the second and subsequent parameters, you can pass them to the controller method.
 
@@ -83,54 +53,39 @@ for details.
 
 **withConfig($config)**
 
-Allows you to pass in a modified version of **Config\App.php** to test with different settings::
+Allows you to pass in a modified version of **Config\App.php** to test with different settings:
 
-    $config = new Config\App();
-    $config->appTimezone = 'America/Chicago';
-
-    $results = $this->withConfig($config)
-                    ->controller(\App\Controllers\ForumController::class)
-                    ->execute('showCategories');
+.. literalinclude:: controllers/005.php
+   :lines: 2-
 
 If you do not provide one, the application's App config file will be used.
 
 **withRequest($request)**
 
-Allows you to provide an **IncomingRequest** instance tailored to your testing needs::
-
-    $request = new \CodeIgniter\HTTP\IncomingRequest(new \Config\App(), new URI('http://example.com'));
-    $request->setLocale($locale);
+Allows you to provide an **IncomingRequest** instance tailored to your testing needs:
 
-    $results = $this->withRequest($request)
-                    ->controller(\App\Controllers\ForumController::class)
-                    ->execute('showCategories');
+.. literalinclude:: controllers/006.php
+   :lines: 2-
 
 If you do not provide one, a new IncomingRequest instance with the default application values will be passed
 into your controller.
 
 **withResponse($response)**
 
-Allows you to provide a **Response** instance::
+Allows you to provide a **Response** instance:
 
-    $response = new \CodeIgniter\HTTP\Response(new \Config\App());
-
-    $results = $this->withResponse($response)
-                    ->controller(\App\Controllers\ForumController::class)
-                    ->execute('showCategories');
+.. literalinclude:: controllers/007.php
+   :lines: 2-
 
 If you do not provide one, a new Response instance with the default application values will be passed
 into your controller.
 
 **withLogger($logger)**
 
-Allows you to provide a **Logger** instance::
-
-    $logger = new \CodeIgniter\Log\Handlers\FileHandler();
+Allows you to provide a **Logger** instance:
 
-    $results = $this->withResponse($response)
-                    ->withLogger($logger)
-                    ->controller(\App\Controllers\ForumController::class)
-                    ->execute('showCategories');
+.. literalinclude:: controllers/008.php
+   :lines: 2-
 
 If you do not provide one, a new Logger instance with the default configuration values will be passed
 into your controller.
@@ -139,24 +94,20 @@ into your controller.
 
 Allows you to provide a new URI that simulates the URL the client was visiting when this controller was run.
 This is helpful if you need to check URI segments within your controller. The only parameter is a string
-representing a valid URI::
+representing a valid URI:
 
-    $results = $this->withURI('http://example.com/forums/categories')
-                    ->controller(\App\Controllers\ForumController::class)
-                    ->execute('showCategories');
+.. literalinclude:: controllers/009.php
+   :lines: 2-
 
 It is a good practice to always provide the URI during testing to avoid surprises.
 
 **withBody($body)**
 
 Allows you to provide a custom body for the request. This can be helpful when testing API controllers where
-you need to set a JSON value as the body. The only parameter is a string that represents the body of the request::
-
-    $body = json_encode(['foo' => 'bar']);
+you need to set a JSON value as the body. The only parameter is a string that represents the body of the request:
 
-    $results = $this->withBody($body)
-                    ->controller(\App\Controllers\ForumController::class)
-                    ->execute('showCategories');
+.. literalinclude:: controllers/010.php
+   :lines: 2-
 
 Checking the Response
 =====================
@@ -174,19 +125,9 @@ The Helper Trait
 ----------------
 
 Just like with the Controller Tester you need to include the ``FilterTestTrait`` in your test
-cases to enable these features::
-
-    <?php
-
-    namespace CodeIgniter;
+cases to enable these features:
 
-    use CodeIgniter\Test\CIUnitTestCase;
-    use CodeIgniter\Test\FilterTestTrait;
-
-    class FilterTestCase extends CIUnitTestCase
-    {
-        use FilterTestTrait;
-    }
+.. literalinclude:: controllers/011.php
 
 Configuration
 -------------
@@ -205,19 +146,10 @@ you can alter any of the properties before calling the support methods:
 
 The default configuration will usually be best for your testing since it most closely emulates
 a "live" project, but (for example) if you wanted to simulate a filter triggering accidentally
-on an unfiltered route you could add it to the Config::
-
-    class FilterTestCase extends CIUnitTestCase
-    {
-        use FilterTestTrait;
+on an unfiltered route you could add it to the Config:
 
-        protected function testFilterFailsOnAdminRoute()
-        {
-            $this->filtersConfig->globals['before'] = ['admin-only-filter'];
-
-            $this->assertHasFilters('unfiltered/route', 'before');
-        }
-    ...
+.. literalinclude:: controllers/012.php
+   :lines: 2-
 
 Checking Routes
 ---------------
@@ -234,9 +166,10 @@ a large performance advantage over Controller and HTTP Testing.
     :returns:    Aliases for each filter that would have run
     :rtype:    string[]
 
-    Usage example::
+    Usage example:
 
-        $result = $this->getFiltersForRoute('/', 'after'); // ['toolbar']
+    .. literalinclude:: controllers/013.php
+       :lines: 2-
 
 Calling Filter Methods
 ----------------------
@@ -252,15 +185,10 @@ method using these properties to test your Filter code safely and check the resu
     :returns:    A callable method to run the simulated Filter event
     :rtype:    Closure
 
-    Usage example::
-
-        protected function testUnauthorizedAccessRedirects()
-        {
-            $caller = $this->getFilterCaller('permission', 'before');
-            $result = $caller('MayEditWidgets');
+    Usage example:
 
-            $this->assertInstanceOf('CodeIgniter\HTTP\RedirectResponse', $result);
-        }
+    .. literalinclude:: controllers/014.php
+       :lines: 2-
 
     Notice how the ``Closure`` can take input parameters which are passed to your filter method.
 
@@ -270,22 +198,22 @@ Assertions
 In addition to the helper methods above ``FilterTestTrait`` also comes with some assertions
 to streamline your test methods.
 
-The **assertFilter()** method checks that the given route at position uses the filter (by its alias)::
+The **assertFilter()** method checks that the given route at position uses the filter (by its alias):
 
-    // Make sure users are logged in before checking their account
-    $this->assertFilter('users/account', 'before', 'login');
+.. literalinclude:: controllers/015.php
+   :lines: 2-
 
-The **assertNotFilter()** method checks that the given route at position does not use the filter (by its alias)::
+The **assertNotFilter()** method checks that the given route at position does not use the filter (by its alias):
 
-    // Make sure API calls do not try to use the Debug Toolbar
-    $this->assertNotFilter('api/v1/widgets', 'after', 'toolbar');
+.. literalinclude:: controllers/016.php
+   :lines: 2-
 
-The **assertHasFilters()** method checks that the given route at position has at least one filter set::
+The **assertHasFilters()** method checks that the given route at position has at least one filter set:
 
-    // Make sure that filters are enabled
-    $this->assertHasFilters('filtered/route', 'after');
+.. literalinclude:: controllers/017.php
+   :lines: 2-
 
-The **assertNotHasFilters()** method checks that the given route at position has no filters set::
+The **assertNotHasFilters()** method checks that the given route at position has no filters set:
 
-    // Make sure no filters run for our static pages
-    $this->assertNotHasFilters('about/contact', 'before');
+.. literalinclude:: controllers/018.php
+   :lines: 2-
diff --git a/user_guide_src/source/testing/controllers/001.php b/user_guide_src/source/testing/controllers/001.php
new file mode 100644
index 000000000000..9c31d5b62d00
--- /dev/null
+++ b/user_guide_src/source/testing/controllers/001.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace CodeIgniter;
+
+use CodeIgniter\Test\ControllerTestTrait;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+
+class TestControllerA extends CIUnitTestCase
+{
+    use ControllerTestTrait, DatabaseTestTrait;
+}
diff --git a/user_guide_src/source/testing/controllers/002.php b/user_guide_src/source/testing/controllers/002.php
new file mode 100644
index 000000000000..708f7761afbf
--- /dev/null
+++ b/user_guide_src/source/testing/controllers/002.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace CodeIgniter;
+
+use CodeIgniter\Test\ControllerTestTrait;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+
+class TestControllerA extends CIUnitTestCase
+{
+    use ControllerTestTrait, DatabaseTestTrait;
+
+    public function testShowCategories()
+    {
+        $result = $this->withURI('http://example.com/categories')
+                       ->controller(\App\Controllers\ForumController::class)
+                       ->execute('showCategories');
+
+        $this->assertTrue($result->isOK());
+    }
+}
diff --git a/user_guide_src/source/testing/controllers/003.php b/user_guide_src/source/testing/controllers/003.php
new file mode 100644
index 000000000000..51e810538e87
--- /dev/null
+++ b/user_guide_src/source/testing/controllers/003.php
@@ -0,0 +1,3 @@
+<?php
+
+$this->controller(\App\Controllers\ForumController::class);
diff --git a/user_guide_src/source/testing/controllers/004.php b/user_guide_src/source/testing/controllers/004.php
new file mode 100644
index 000000000000..d06bb51768c3
--- /dev/null
+++ b/user_guide_src/source/testing/controllers/004.php
@@ -0,0 +1,4 @@
+<?php
+
+$results = $this->controller(\App\Controllers\ForumController::class)
+                ->execute('showCategories');
diff --git a/user_guide_src/source/testing/controllers/005.php b/user_guide_src/source/testing/controllers/005.php
new file mode 100644
index 000000000000..bffc4c9c8f95
--- /dev/null
+++ b/user_guide_src/source/testing/controllers/005.php
@@ -0,0 +1,8 @@
+<?php
+
+$config = new Config\App();
+$config->appTimezone = 'America/Chicago';
+
+$results = $this->withConfig($config)
+                ->controller(\App\Controllers\ForumController::class)
+                ->execute('showCategories');
diff --git a/user_guide_src/source/testing/controllers/006.php b/user_guide_src/source/testing/controllers/006.php
new file mode 100644
index 000000000000..aef7e41e071e
--- /dev/null
+++ b/user_guide_src/source/testing/controllers/006.php
@@ -0,0 +1,8 @@
+<?php
+
+$request = new \CodeIgniter\HTTP\IncomingRequest(new \Config\App(), new URI('http://example.com'));
+$request->setLocale($locale);
+
+$results = $this->withRequest($request)
+                ->controller(\App\Controllers\ForumController::class)
+                ->execute('showCategories');
diff --git a/user_guide_src/source/testing/controllers/007.php b/user_guide_src/source/testing/controllers/007.php
new file mode 100644
index 000000000000..73b1d4e122c2
--- /dev/null
+++ b/user_guide_src/source/testing/controllers/007.php
@@ -0,0 +1,7 @@
+<?php
+
+$response = new \CodeIgniter\HTTP\Response(new \Config\App());
+
+$results = $this->withResponse($response)
+                ->controller(\App\Controllers\ForumController::class)
+                ->execute('showCategories');
diff --git a/user_guide_src/source/testing/controllers/008.php b/user_guide_src/source/testing/controllers/008.php
new file mode 100644
index 000000000000..4ea1c84dee20
--- /dev/null
+++ b/user_guide_src/source/testing/controllers/008.php
@@ -0,0 +1,8 @@
+<?php
+
+$logger = new \CodeIgniter\Log\Handlers\FileHandler();
+
+$results = $this->withResponse($response)
+                ->withLogger($logger)
+                ->controller(\App\Controllers\ForumController::class)
+                ->execute('showCategories');
diff --git a/user_guide_src/source/testing/controllers/009.php b/user_guide_src/source/testing/controllers/009.php
new file mode 100644
index 000000000000..4559dd8f4711
--- /dev/null
+++ b/user_guide_src/source/testing/controllers/009.php
@@ -0,0 +1,5 @@
+<?php
+
+$results = $this->withURI('http://example.com/forums/categories')
+                ->controller(\App\Controllers\ForumController::class)
+                ->execute('showCategories');
diff --git a/user_guide_src/source/testing/controllers/010.php b/user_guide_src/source/testing/controllers/010.php
new file mode 100644
index 000000000000..2cf6d9919c31
--- /dev/null
+++ b/user_guide_src/source/testing/controllers/010.php
@@ -0,0 +1,7 @@
+<?php
+
+$body = json_encode(['foo' => 'bar']);
+
+$results = $this->withBody($body)
+                ->controller(\App\Controllers\ForumController::class)
+                ->execute('showCategories');
diff --git a/user_guide_src/source/testing/controllers/011.php b/user_guide_src/source/testing/controllers/011.php
new file mode 100644
index 000000000000..f2ab558b8da2
--- /dev/null
+++ b/user_guide_src/source/testing/controllers/011.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace CodeIgniter;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\FilterTestTrait;
+
+class FilterTestCase extends CIUnitTestCase
+{
+    use FilterTestTrait;
+}
diff --git a/user_guide_src/source/testing/controllers/012.php b/user_guide_src/source/testing/controllers/012.php
new file mode 100644
index 000000000000..dd3b600d90fd
--- /dev/null
+++ b/user_guide_src/source/testing/controllers/012.php
@@ -0,0 +1,13 @@
+<?php
+
+class FilterTestCase extends CIUnitTestCase
+{
+    use FilterTestTrait;
+
+    protected function testFilterFailsOnAdminRoute()
+    {
+        $this->filtersConfig->globals['before'] = ['admin-only-filter'];
+
+        $this->assertHasFilters('unfiltered/route', 'before');
+    }
+...
diff --git a/user_guide_src/source/testing/controllers/013.php b/user_guide_src/source/testing/controllers/013.php
new file mode 100644
index 000000000000..e205f0f4ea54
--- /dev/null
+++ b/user_guide_src/source/testing/controllers/013.php
@@ -0,0 +1,3 @@
+<?php
+
+$result = $this->getFiltersForRoute('/', 'after'); // ['toolbar']
diff --git a/user_guide_src/source/testing/controllers/014.php b/user_guide_src/source/testing/controllers/014.php
new file mode 100644
index 000000000000..19f2310392fa
--- /dev/null
+++ b/user_guide_src/source/testing/controllers/014.php
@@ -0,0 +1,9 @@
+<?php
+
+protected function testUnauthorizedAccessRedirects()
+{
+    $caller = $this->getFilterCaller('permission', 'before');
+    $result = $caller('MayEditWidgets');
+
+    $this->assertInstanceOf('CodeIgniter\HTTP\RedirectResponse', $result);
+}
diff --git a/user_guide_src/source/testing/controllers/015.php b/user_guide_src/source/testing/controllers/015.php
new file mode 100644
index 000000000000..866d2e80ce43
--- /dev/null
+++ b/user_guide_src/source/testing/controllers/015.php
@@ -0,0 +1,4 @@
+<?php
+
+// Make sure users are logged in before checking their account
+$this->assertFilter('users/account', 'before', 'login');
diff --git a/user_guide_src/source/testing/controllers/016.php b/user_guide_src/source/testing/controllers/016.php
new file mode 100644
index 000000000000..cdbf08ccc36b
--- /dev/null
+++ b/user_guide_src/source/testing/controllers/016.php
@@ -0,0 +1,4 @@
+<?php
+
+// Make sure API calls do not try to use the Debug Toolbar
+$this->assertNotFilter('api/v1/widgets', 'after', 'toolbar');
diff --git a/user_guide_src/source/testing/controllers/017.php b/user_guide_src/source/testing/controllers/017.php
new file mode 100644
index 000000000000..15db694e5419
--- /dev/null
+++ b/user_guide_src/source/testing/controllers/017.php
@@ -0,0 +1,4 @@
+<?php
+
+// Make sure that filters are enabled
+$this->assertHasFilters('filtered/route', 'after');
diff --git a/user_guide_src/source/testing/controllers/018.php b/user_guide_src/source/testing/controllers/018.php
new file mode 100644
index 000000000000..33606c0e122e
--- /dev/null
+++ b/user_guide_src/source/testing/controllers/018.php
@@ -0,0 +1,4 @@
+<?php
+
+// Make sure no filters run for our static pages
+$this->assertNotHasFilters('about/contact', 'before');
diff --git a/user_guide_src/source/testing/database.rst b/user_guide_src/source/testing/database.rst
index 86b91537917e..614099449e29 100644
--- a/user_guide_src/source/testing/database.rst
+++ b/user_guide_src/source/testing/database.rst
@@ -10,51 +10,15 @@ The Test Class
 ==============
 
 In order to take advantage of the built-in database tools that CodeIgniter provides for testing, your
-tests must extend ``CIUnitTestCase`` and use the ``DatabaseTestTrait``::
+tests must extend ``CIUnitTestCase`` and use the ``DatabaseTestTrait``:
 
-    <?php
-
-    namespace App\Database;
-
-    use CodeIgniter\Test\CIUnitTestCase;
-    use CodeIgniter\Test\DatabaseTestTrait;
-
-    class MyTests extends CIUnitTestCase
-    {
-        use DatabaseTestTrait;
-
-        // ...
-    }
+.. literalinclude:: database/001.php
 
 Because special functionality executed during the ``setUp()`` and ``tearDown()`` phases, you must ensure
 that you call the parent's methods if you need to use those methods, otherwise you will lose much
-of the functionality described here::
-
-    <?php
-
-    namespace App\Database;
-
-    use CodeIgniter\Test\CIUnitTestCase;
-    use CodeIgniter\Test\DatabaseTestTrait;
-
-    class MyTests extends CIUnitTestCase
-    {
-        use DatabaseTestTrait;
+of the functionality described here:
 
-        public function setUp()
-        {
-            parent::setUp();
-
-            // Do something here....
-        }
-
-        public function tearDown()
-        {
-            parent::tearDown();
-
-            // Do something here....
-        }
-    }
+.. literalinclude:: database/002.php
 
 Setting Up a Test Database
 ==========================
@@ -79,23 +43,8 @@ Migrations and Seeds
 When running tests, you need to ensure that your database has the correct schema set up and that
 it is in a known state for every test. You can use migrations and seeds to set up your database,
 by adding a couple of class properties to your test.
-::
-
-    <?php
-
-    namespace App\Database;
-
-    use CodeIgniter\Test\CIUnitTestCase;
-    use CodeIgniter\Test\DatabaseTestTrait;
-
-    class MyTests extends CIUnitTestCase
-    {
-        use DatabaseTestTrait;
 
-        protected $refresh  = true;
-        protected $seed     = 'TestSeeder';
-        protected $basePath = 'path/to/database/files';
-    }
+.. literalinclude:: database/003.php
 
 **$migrate**
 
@@ -159,51 +108,36 @@ must be present within the path specified in ``$basePath``.
 **dontSeeInDatabase($table, $criteria)**
 
 Asserts that a row with criteria matching the key/value pairs in ``$criteria`` DOES NOT exist in the database.
-::
 
-    $criteria = [
-        'email'  => 'joe@example.com',
-        'active' => 1,
-    ];
-    $this->dontSeeInDatabase('users', $criteria);
+.. literalinclude:: database/004.php
+   :lines: 2-
 
 **seeInDatabase($table, $criteria)**
 
 Asserts that a row with criteria matching the key/value pairs in ``$criteria`` DOES exist in the database.
-::
 
-    $criteria = [
-        'email'  => 'joe@example.com',
-        'active' => 1,
-    ];
-    $this->seeInDatabase('users', $criteria);
+.. literalinclude:: database/005.php
+   :lines: 2-
 
 **grabFromDatabase($table, $column, $criteria)**
 
 Returns the value of ``$column`` from the specified table where the row matches ``$criteria``. If more than one
 row is found, it will only test against the first one.
-::
 
-    $username = $this->grabFromDatabase('users', 'username', ['email' => 'joe@example.com']);
+.. literalinclude:: database/006.php
+   :lines: 2-
 
 **hasInDatabase($table, $data)**
 
 Inserts a new row into the database. This row is removed after the current test runs. ``$data`` is an associative
 array with the data to insert into the table.
-::
 
-    $data = [
-        'email' => 'joe@example.com',
-        'name'  => 'Joe Cool',
-    ];
-    $this->hasInDatabase('users', $data);
+.. literalinclude:: database/007.php
+   :lines: 2-
 
 **seeNumRecords($expected, $table, $criteria)**
 
 Asserts that a number of matching rows are found in the database that match ``$criteria``.
-::
 
-    $criteria = [
-        'active' => 1,
-    ];
-    $this->seeNumRecords(2, 'users', $criteria);
+.. literalinclude:: database/008.php
+   :lines: 2-
diff --git a/user_guide_src/source/testing/database/001.php b/user_guide_src/source/testing/database/001.php
new file mode 100644
index 000000000000..809cd59d8c0f
--- /dev/null
+++ b/user_guide_src/source/testing/database/001.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Database;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+
+class MyTests extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+
+    // ...
+}
diff --git a/user_guide_src/source/testing/database/002.php b/user_guide_src/source/testing/database/002.php
new file mode 100644
index 000000000000..4702f22d35ba
--- /dev/null
+++ b/user_guide_src/source/testing/database/002.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Database;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+
+class MyTests extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        // Do something here....
+    }
+
+    public function tearDown()
+    {
+        parent::tearDown();
+
+        // Do something here....
+    }
+}
diff --git a/user_guide_src/source/testing/database/003.php b/user_guide_src/source/testing/database/003.php
new file mode 100644
index 000000000000..d293cce95f81
--- /dev/null
+++ b/user_guide_src/source/testing/database/003.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Database;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+
+class MyTests extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+
+    protected $refresh  = true;
+    protected $seed     = 'TestSeeder';
+    protected $basePath = 'path/to/database/files';
+}
\ No newline at end of file
diff --git a/user_guide_src/source/testing/database/004.php b/user_guide_src/source/testing/database/004.php
new file mode 100644
index 000000000000..8cc336ef7cd0
--- /dev/null
+++ b/user_guide_src/source/testing/database/004.php
@@ -0,0 +1,7 @@
+<?php
+
+$criteria = [
+    'email'  => 'joe@example.com',
+    'active' => 1,
+];
+$this->dontSeeInDatabase('users', $criteria);
diff --git a/user_guide_src/source/testing/database/005.php b/user_guide_src/source/testing/database/005.php
new file mode 100644
index 000000000000..960ba5e5b91e
--- /dev/null
+++ b/user_guide_src/source/testing/database/005.php
@@ -0,0 +1,7 @@
+<?php
+
+$criteria = [
+    'email'  => 'joe@example.com',
+    'active' => 1,
+];
+$this->seeInDatabase('users', $criteria);
diff --git a/user_guide_src/source/testing/database/006.php b/user_guide_src/source/testing/database/006.php
new file mode 100644
index 000000000000..951736b95611
--- /dev/null
+++ b/user_guide_src/source/testing/database/006.php
@@ -0,0 +1,3 @@
+<?php
+
+$username = $this->grabFromDatabase('users', 'username', ['email' => 'joe@example.com']);
diff --git a/user_guide_src/source/testing/database/007.php b/user_guide_src/source/testing/database/007.php
new file mode 100644
index 000000000000..46ebb8fbe695
--- /dev/null
+++ b/user_guide_src/source/testing/database/007.php
@@ -0,0 +1,7 @@
+<?php
+
+$data = [
+    'email' => 'joe@example.com',
+    'name'  => 'Joe Cool',
+];
+$this->hasInDatabase('users', $data);
diff --git a/user_guide_src/source/testing/database/008.php b/user_guide_src/source/testing/database/008.php
new file mode 100644
index 000000000000..9a60e154d331
--- /dev/null
+++ b/user_guide_src/source/testing/database/008.php
@@ -0,0 +1,6 @@
+<?php
+
+$criteria = [
+    'active' => 1,
+];
+$this->seeNumRecords(2, 'users', $criteria);
diff --git a/user_guide_src/source/testing/debugging.rst b/user_guide_src/source/testing/debugging.rst
index 22c77141e116..0b841517846e 100644
--- a/user_guide_src/source/testing/debugging.rst
+++ b/user_guide_src/source/testing/debugging.rst
@@ -29,9 +29,10 @@ Using Kint
 **d()**
 
 The ``d()`` method dumps all of the data it knows about the contents passed as the only parameter to the screen, and
-allows the script to continue executing::
+allows the script to continue executing:
 
-    d($_SERVER);
+.. literalinclude:: debugging/001.php
+   :lines: 2-
 
 **dd()**
 
@@ -39,9 +40,10 @@ This method is identical to ``d()``, except that it also ``dies()`` and no furth
 
 **trace()**
 
-This provides a backtrace to the current execution point, with Kint's own unique spin::
+This provides a backtrace to the current execution point, with Kint's own unique spin:
 
-    trace();
+.. literalinclude:: debugging/002.php
+   :lines: 2-
 
 For more information, see `Kint's page <https://kint-php.github.io/kint//>`_.
 
@@ -74,18 +76,10 @@ Choosing What to Show
 
 CodeIgniter ships with several Collectors that, as the name implies, collect data to display on the toolbar. You
 can easily make your own to customize the toolbar. To determine which collectors are shown, again head over to
-the **app/Config/Toolbar.php** configuration file::
-
-    public $collectors = [
-        \CodeIgniter\Debug\Toolbar\Collectors\Timers::class,
-        \CodeIgniter\Debug\Toolbar\Collectors\Database::class,
-        \CodeIgniter\Debug\Toolbar\Collectors\Logs::class,
-        \CodeIgniter\Debug\Toolbar\Collectors\Views::class,
-        \CodeIgniter\Debug\Toolbar\Collectors\Cache::class,
-        \CodeIgniter\Debug\Toolbar\Collectors\Files::class,
-        \CodeIgniter\Debug\Toolbar\Collectors\Routes::class,
-        \CodeIgniter\Debug\Toolbar\Collectors\Events::class,
-    ];
+the **app/Config/Toolbar.php** configuration file:
+
+.. literalinclude:: debugging/003.php
+   :lines: 2-
 
 Comment out any collectors that you do not want to show. Add custom Collectors here by providing the fully-qualified
 class name. The exact collectors that appear here will affect which tabs are shown, as well as what information is
@@ -119,24 +113,8 @@ Creating custom collectors is a straightforward task. You create a new class, fu
 can locate it, that extends ``CodeIgniter\Debug\Toolbar\Collectors\BaseCollector``. This provides a number of methods
 that you can override, and has four required class properties that you must correctly set depending on how you want
 the Collector to work
-::
-
-    <?php
-
-    namespace MyNamespace;
-
-    use CodeIgniter\Debug\Toolbar\Collectors\BaseCollector;
 
-    class MyCollector extends BaseCollector
-    {
-        protected $hasTimeline = false;
-
-        protected $hasTabContent = false;
-
-        protected $hasVarData = false;
-
-        protected $title = '';
-    }
+.. literalinclude:: debugging/004.php
 
 **$hasTimeline** should be set to ``true`` for any Collector that wants to display information in the toolbar's
 timeline. If this is true, you will need to implement the ``formatTimelineData()`` method to format and return the
@@ -178,14 +156,10 @@ To provide information to be displayed in the Timeline you must:
 2. Implement the ``formatTimelineData()`` method.
 
 The ``formatTimelineData()`` method must return an array of arrays formatted in a way that the timeline can use
-it to sort it correctly and display the correct information. The inner arrays must include the following information::
+it to sort it correctly and display the correct information. The inner arrays must include the following information:
 
-    $data[] = [
-        'name'      => '',     // Name displayed on the left of the timeline
-        'component' => '',     // Name of the Component listed in the middle of timeline
-        'start'     => 0.00,   // start time, like microtime(true)
-        'duration'  => 0.00,   // duration, like mircrotime(true) - microtime(true)
-    ];
+.. literalinclude:: debugging/005.php
+   :lines: 2-
 
 Providing Vars
 --------------
@@ -196,15 +170,7 @@ To add data to the Vars tab you must:
 2. Implement ``getVarData()`` method.
 
 The ``getVarData()`` method should return an array containing arrays of key/value pairs to display. The name of the
-outer array's key is the name of the section on the Vars tab::
-
-    $data = [
-        'section 1' => [
-            'foo' => 'bar',
-            'bar' => 'baz',
-        ],
-        'section 2' => [
-            'foo' => 'bar',
-            'bar' => 'baz',
-        ],
-     ];
+outer array's key is the name of the section on the Vars tab:
+
+.. literalinclude:: debugging/006.php
+   :lines: 2-
diff --git a/user_guide_src/source/testing/debugging/001.php b/user_guide_src/source/testing/debugging/001.php
new file mode 100644
index 000000000000..f54b4701f98e
--- /dev/null
+++ b/user_guide_src/source/testing/debugging/001.php
@@ -0,0 +1,3 @@
+<?php
+
+d($_SERVER);
diff --git a/user_guide_src/source/testing/debugging/002.php b/user_guide_src/source/testing/debugging/002.php
new file mode 100644
index 000000000000..3e38303cdaf6
--- /dev/null
+++ b/user_guide_src/source/testing/debugging/002.php
@@ -0,0 +1,3 @@
+<?php
+
+trace();
diff --git a/user_guide_src/source/testing/debugging/003.php b/user_guide_src/source/testing/debugging/003.php
new file mode 100644
index 000000000000..b7e19588fae9
--- /dev/null
+++ b/user_guide_src/source/testing/debugging/003.php
@@ -0,0 +1,12 @@
+<?php
+
+public $collectors = [
+    \CodeIgniter\Debug\Toolbar\Collectors\Timers::class,
+    \CodeIgniter\Debug\Toolbar\Collectors\Database::class,
+    \CodeIgniter\Debug\Toolbar\Collectors\Logs::class,
+    \CodeIgniter\Debug\Toolbar\Collectors\Views::class,
+    \CodeIgniter\Debug\Toolbar\Collectors\Cache::class,
+    \CodeIgniter\Debug\Toolbar\Collectors\Files::class,
+    \CodeIgniter\Debug\Toolbar\Collectors\Routes::class,
+    \CodeIgniter\Debug\Toolbar\Collectors\Events::class,
+];
diff --git a/user_guide_src/source/testing/debugging/004.php b/user_guide_src/source/testing/debugging/004.php
new file mode 100644
index 000000000000..c4c56bfc823e
--- /dev/null
+++ b/user_guide_src/source/testing/debugging/004.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace MyNamespace;
+
+use CodeIgniter\Debug\Toolbar\Collectors\BaseCollector;
+
+class MyCollector extends BaseCollector
+{
+    protected $hasTimeline = false;
+
+    protected $hasTabContent = false;
+
+    protected $hasVarData = false;
+
+    protected $title = '';
+}
diff --git a/user_guide_src/source/testing/debugging/005.php b/user_guide_src/source/testing/debugging/005.php
new file mode 100644
index 000000000000..7f2c8674241a
--- /dev/null
+++ b/user_guide_src/source/testing/debugging/005.php
@@ -0,0 +1,8 @@
+<?php
+
+$data[] = [
+    'name'      => '',     // Name displayed on the left of the timeline
+    'component' => '',     // Name of the Component listed in the middle of timeline
+    'start'     => 0.00,   // start time, like microtime(true)
+    'duration'  => 0.00,   // duration, like mircrotime(true) - microtime(true)
+];
diff --git a/user_guide_src/source/testing/debugging/006.php b/user_guide_src/source/testing/debugging/006.php
new file mode 100644
index 000000000000..3140ea7e4a81
--- /dev/null
+++ b/user_guide_src/source/testing/debugging/006.php
@@ -0,0 +1,12 @@
+<?php
+
+$data = [
+    'section 1' => [
+        'foo' => 'bar',
+        'bar' => 'baz',
+    ],
+    'section 2' => [
+        'foo' => 'bar',
+        'bar' => 'baz',
+    ],
+ ];
diff --git a/user_guide_src/source/testing/fabricator.rst b/user_guide_src/source/testing/fabricator.rst
index abd68d8af86b..3e419353ef07 100644
--- a/user_guide_src/source/testing/fabricator.rst
+++ b/user_guide_src/source/testing/fabricator.rst
@@ -14,27 +14,25 @@ Supported Models
 ================
 
 ``Fabricator`` supports any model that extends the framework's core model, ``CodeIgniter\Model``.
-You may use your own custom models by ensuring they implement ``CodeIgniter\Test\Interfaces\FabricatorModel``::
+You may use your own custom models by ensuring they implement ``CodeIgniter\Test\Interfaces\FabricatorModel``:
 
-    class MyModel implements CodeIgniter\Test\Interfaces\FabricatorModel
+.. literalinclude:: fabricator/001.php
+   :lines: 2-
 
 .. note:: In addition to methods, the interface outlines some necessary properties for the target model. Please see the interface code for details.
 
 Loading Fabricators
 ===================
 
-At its most basic a fabricator takes the model to act on::
+At its most basic a fabricator takes the model to act on:
 
-    use App\Models\UserModel;
-    use CodeIgniter\Test\Fabricator;
+.. literalinclude:: fabricator/002.php
+   :lines: 2-
 
-    $fabricator = new Fabricator(UserModel::class);
+The parameter can be a string specifying the name of the model, or an instance of the model itself:
 
-The parameter can be a string specifying the name of the model, or an instance of the model itself::
-
-    $model = new UserModel($testDbConnection);
-
-    $fabricator = new Fabricator($model);
+.. literalinclude:: fabricator/003.php
+   :lines: 2-
 
 Defining Formatters
 ===================
@@ -43,16 +41,10 @@ Faker generates data by requesting it from a formatter. With no formatters defin
 attempt to guess at the most appropriate fit based on the field name and properties of the model it
 represents, falling back on ``$fabricator->defaultFormatter``. This may be fine if your field names
 correspond with common formatters, or if you don't care much about the content of the fields, but most
-of the time you will want to specify the formatters to use as the second parameter to the constructor::
-
-    $formatters = [
-        'first'  => 'firstName',
-        'email'  => 'email',
-        'phone'  => 'phoneNumber',
-        'avatar' => 'imageUrl',
-    ];
+of the time you will want to specify the formatters to use as the second parameter to the constructor:
 
-    $fabricator = new Fabricator(UserModel::class, $formatters);
+.. literalinclude:: fabricator/004.php
+   :lines: 2-
 
 You can also change the formatters after a fabricator is initialized by using the ``setFormatters()`` method.
 
@@ -60,41 +52,28 @@ You can also change the formatters after a fabricator is initialized by using th
 
 Sometimes the default return of a formatter is not enough. Faker providers allow parameters to most formatters
 to further limit the scope of random data. A fabricator will check its representative model for the ``fake()``
-method where you can define exactly what the faked data should look like::
-
-    class UserModel
-    {
-        public function fake(Generator &$faker)
-        {
-            return [
-                'first'  => $faker->firstName,
-                'email'  => $faker->email,
-                'phone'  => $faker->phoneNumber,
-                'avatar' => Faker\Provider\Image::imageUrl(800, 400),
-                'login'  => config('Auth')->allowRemembering ? date('Y-m-d') : null,
-            ];
-        }
+method where you can define exactly what the faked data should look like:
+
+.. literalinclude:: fabricator/005.php
+   :lines: 2-
 
 Notice in this example how the first three values are equivalent to the formatters from before. However for ``avatar``
 we have requested an image size other than the default and ``login`` uses a conditional based on app configuration,
 neither of which are possible using the ``$formatters`` parameter.
 You may want to keep your test data separate from your production models, so it is a good practice to define
-a child class in your test support folder::
-
-    namespace Tests\Support\Models;
+a child class in your test support folder:
 
-    class UserFabricator extends \App\Models\UserModel
-    {
-        public function fake(&$faker)
-        {
+.. literalinclude:: fabricator/006.php
+   :lines: 2-
 
 Localization
 ============
 
 Faker supports a lot of different locales. Check their documentation to determine which providers
-support your locale. Specify a locale in the third parameter while initiating a fabricator::
+support your locale. Specify a locale in the third parameter while initiating a fabricator:
 
-    $fabricator = new Fabricator(UserModel::class, null, 'fr_FR');
+.. literalinclude:: fabricator/007.php
+   :lines: 2-
 
 If no locale is specified it will use the one defined in **app/Config/App.php** as ``defaultLocale``.
 You can check the locale of an existing fabricator using its ``getLocale()`` method.
@@ -102,114 +81,72 @@ You can check the locale of an existing fabricator using its ``getLocale()`` met
 Faking the Data
 ===============
 
-Once you have a properly-initialized fabricator it is easy to generate test data with the ``make()`` command::
+Once you have a properly-initialized fabricator it is easy to generate test data with the ``make()`` command:
 
-    $fabricator = new Fabricator(UserFabricator::class);
-    $testUser   = $fabricator->make();
-    print_r($testUser);
+.. literalinclude:: fabricator/008.php
+   :lines: 2-
 
-You might get back something like this::
+You might get back something like this:
 
-    array(
-        'first'  => "Maynard",
-        'email'  => "king.alford@example.org",
-        'phone'  => "201-886-0269 x3767",
-        'avatar' => "http://lorempixel.com/800/400/",
-        'login'  => null,
-    )
+.. literalinclude:: fabricator/009.php
+   :lines: 2-
 
-You can also get a lot of them back by supplying a count::
+You can also get a lot of them back by supplying a count:
 
-    $users = $fabricator->make(10);
+.. literalinclude:: fabricator/010.php
+   :lines: 2-
 
 The return type of ``make()`` mimics what is defined in the representative model, but you can
-force a type using the methods directly::
+force a type using the methods directly:
 
-    $userArray  = $fabricator->makeArray();
-    $userObject = $fabricator->makeObject();
-    $userEntity = $fabricator->makeObject('App\Entities\User');
+.. literalinclude:: fabricator/011.php
+   :lines: 2-
 
 The return from ``make()`` is ready to be used in tests or inserted into the database. Alternatively
 ``Fabricator`` includes the ``create()`` command to insert it for you, and return the result. Due
 to model callbacks, database formatting, and special keys like primary and timestamps the return
-from ``create()`` can differ from ``make()``. You might get back something like this::
+from ``create()`` can differ from ``make()``. You might get back something like this:
 
-    array(
-        'id'         => 1,
-        'first'      => "Rachel",
-        'email'      => "bradley72@gmail.com",
-        'phone'      => "741-241-2356",
-        'avatar'     => "http://lorempixel.com/800/400/",
-        'login'      => null,
-        'created_at' => "2020-05-08 14:52:10",
-        'updated_at' => "2020-05-08 14:52:10",
-    )
+.. literalinclude:: fabricator/012.php
+   :lines: 2-
 
-Similar to ``make()`` you can supply a count to insert and return an array of objects::
+Similar to ``make()`` you can supply a count to insert and return an array of objects:
 
-    $users = $fabricator->create(100);
+.. literalinclude:: fabricator/013.php
+   :lines: 2-
 
 Finally, there may be times you want to test with the full database object but you are not actually
 using a database. ``create()`` takes a second parameter to allowing mocking the object, returning
-the object with extra database fields above without actually touching the database::
-
-    $user = $fabricator(null, true);
+the object with extra database fields above without actually touching the database:
 
-    $this->assertIsNumeric($user->id);
-    $this->dontSeeInDatabase('user', ['id' => $user->id]);
+.. literalinclude:: fabricator/014.php
+   :lines: 2-
 
 Specifying Test Data
 ====================
 
 Generated data is great, but sometimes you may want to supply a specific field for a test without
 compromising your formatters configuration. Rather then creating a new fabricator for each variant
-you can use ``setOverrides()`` to specify the value for any fields::
+you can use ``setOverrides()`` to specify the value for any fields:
 
-    $fabricator->setOverrides(['first' => 'Bobby']);
-    $bobbyUser = $fabricator->make();
+.. literalinclude:: fabricator/015.php
+   :lines: 2-
 
-Now any data generated with ``make()`` or ``create()`` will always use "Bobby" for the ``first`` field::
+Now any data generated with ``make()`` or ``create()`` will always use "Bobby" for the ``first`` field:
 
-    array(
-        'first'  => "Bobby",
-        'email'  => "latta.kindel@company.org",
-        'phone'  => "251-806-2169",
-        'avatar' => "http://lorempixel.com/800/400/",
-        'login'  => null,
-    )
-
-    array(
-        'first'  => "Bobby",
-        'email'  => "melissa.strike@fabricon.us",
-        'phone'  => "525-214-2656 x23546",
-        'avatar' => "http://lorempixel.com/800/400/",
-        'login'  => null,
-    )
+.. literalinclude:: fabricator/016.php
+   :lines: 2-
 
 ``setOverrides()`` can take a second parameter to indicate whether this should be a persistent
-override or only for a single action::
-
-    $fabricator->setOverrides(['first' => 'Bobby'], $persist = false);
-    $bobbyUser = $fabricator->make();
-    $bobbyUser = $fabricator->make();
-
-Notice after the first return the fabricator stops using the overrides::
-
-    array(
-        'first'  => "Bobby",
-        'email'  => "belingadon142@example.org",
-        'phone'  => "741-857-1933 x1351",
-        'avatar' => "http://lorempixel.com/800/400/",
-        'login'  => null,
-    )
-
-    array(
-        'first'  => "Hans",
-        'email'  => "hoppifur@metraxalon.com",
-        'phone'  => "487-235-7006",
-        'avatar' => "http://lorempixel.com/800/400/",
-        'login'  => null,
-    )
+override or only for a single action:
+
+.. literalinclude:: fabricator/017.php
+   :lines: 2-
+
+Notice after the first return the fabricator stops using the overrides:
+
+.. literalinclude:: fabricator/018.php
+   :lines: 2-
 
 If no second parameter is supplied then passed values will persist by default.
 
@@ -217,16 +154,15 @@ Test Helper
 ===========
 
 Often all you will need is a one-and-done fake object for testing. The Test Helper provides
-the ``fake($model, $overrides, $persist = true)`` function to do just this::
+the ``fake($model, $overrides, $persist = true)`` function to do just this:
 
-    helper('test');
-    $user = fake('App\Models\UserModel', ['name' => 'Gerry']);
+.. literalinclude:: fabricator/019.php
+   :lines: 2-
 
-This is equivalent to::
+This is equivalent to:
 
-    $fabricator = new Fabricator('App\Models\UserModel');
-    $fabricator->setOverrides(['name' => 'Gerry']);
-    $user = $fabricator->create();
+.. literalinclude:: fabricator/020.php
+   :lines: 2-
 
 If you just need a fake object without saving it to the database you can pass false into the persist parameter.
 
@@ -240,20 +176,10 @@ example:
 Your project has users and groups. In your test case you want to create various scenarios
 with groups of different sizes, so you use ``Fabricator`` to create a bunch of groups.
 Now you want to create fake users but don't want to assign them to a non-existant group ID.
-Your model's fake method could look like this::
-
-    class UserModel
-    {
-        protected $table = 'users';
-
-        public function fake(Generator &$faker)
-        {
-            return [
-                'first'    => $faker->firstName,
-                'email'    => $faker->email,
-                'group_id' => rand(1, Fabricator::getCount('groups')),
-            ];
-        }
+Your model's fake method could look like this:
+
+.. literalinclude:: fabricator/021.php
+   :lines: 2-
 
 Now creating a new user will ensure it is a part of a valid group: ``$user = fake(UserModel::class);``
 
diff --git a/user_guide_src/source/testing/fabricator/001.php b/user_guide_src/source/testing/fabricator/001.php
new file mode 100644
index 000000000000..f5f2e33ff455
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/001.php
@@ -0,0 +1,3 @@
+<?php
+
+class MyModel implements CodeIgniter\Test\Interfaces\FabricatorModel
diff --git a/user_guide_src/source/testing/fabricator/002.php b/user_guide_src/source/testing/fabricator/002.php
new file mode 100644
index 000000000000..03bfff4204c0
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/002.php
@@ -0,0 +1,6 @@
+<?php
+
+use App\Models\UserModel;
+use CodeIgniter\Test\Fabricator;
+
+$fabricator = new Fabricator(UserModel::class);
diff --git a/user_guide_src/source/testing/fabricator/003.php b/user_guide_src/source/testing/fabricator/003.php
new file mode 100644
index 000000000000..5432bba5728a
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/003.php
@@ -0,0 +1,5 @@
+<?php
+
+$model = new UserModel($testDbConnection);
+
+$fabricator = new Fabricator($model);
diff --git a/user_guide_src/source/testing/fabricator/004.php b/user_guide_src/source/testing/fabricator/004.php
new file mode 100644
index 000000000000..d999fbba3a2d
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/004.php
@@ -0,0 +1,10 @@
+<?php
+
+$formatters = [
+    'first'  => 'firstName',
+    'email'  => 'email',
+    'phone'  => 'phoneNumber',
+    'avatar' => 'imageUrl',
+];
+
+$fabricator = new Fabricator(UserModel::class, $formatters);
diff --git a/user_guide_src/source/testing/fabricator/005.php b/user_guide_src/source/testing/fabricator/005.php
new file mode 100644
index 000000000000..d5dc3ab38932
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/005.php
@@ -0,0 +1,14 @@
+<?php
+
+class UserModel
+{
+    public function fake(Generator &$faker)
+    {
+        return [
+            'first'  => $faker->firstName,
+            'email'  => $faker->email,
+            'phone'  => $faker->phoneNumber,
+            'avatar' => Faker\Provider\Image::imageUrl(800, 400),
+            'login'  => config('Auth')->allowRemembering ? date('Y-m-d') : null,
+        ];
+    }
diff --git a/user_guide_src/source/testing/fabricator/006.php b/user_guide_src/source/testing/fabricator/006.php
new file mode 100644
index 000000000000..587a0697d1fa
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/006.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Tests\Support\Models;
+
+class UserFabricator extends \App\Models\UserModel
+{
+    public function fake(&$faker)
+    {
diff --git a/user_guide_src/source/testing/fabricator/007.php b/user_guide_src/source/testing/fabricator/007.php
new file mode 100644
index 000000000000..906a210eb943
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/007.php
@@ -0,0 +1,3 @@
+<?php
+
+$fabricator = new Fabricator(UserModel::class, null, 'fr_FR');
diff --git a/user_guide_src/source/testing/fabricator/008.php b/user_guide_src/source/testing/fabricator/008.php
new file mode 100644
index 000000000000..d726613fa0a6
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/008.php
@@ -0,0 +1,5 @@
+<?php
+
+$fabricator = new Fabricator(UserFabricator::class);
+$testUser   = $fabricator->make();
+print_r($testUser);
diff --git a/user_guide_src/source/testing/fabricator/009.php b/user_guide_src/source/testing/fabricator/009.php
new file mode 100644
index 000000000000..3a7507430265
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/009.php
@@ -0,0 +1,9 @@
+<?php
+
+array(
+    'first'  => "Maynard",
+    'email'  => "king.alford@example.org",
+    'phone'  => "201-886-0269 x3767",
+    'avatar' => "http://lorempixel.com/800/400/",
+    'login'  => null,
+)
diff --git a/user_guide_src/source/testing/fabricator/010.php b/user_guide_src/source/testing/fabricator/010.php
new file mode 100644
index 000000000000..54b795ee2f72
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/010.php
@@ -0,0 +1,3 @@
+<?php
+
+$users = $fabricator->make(10);
diff --git a/user_guide_src/source/testing/fabricator/011.php b/user_guide_src/source/testing/fabricator/011.php
new file mode 100644
index 000000000000..9b9f62fd84ee
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/011.php
@@ -0,0 +1,5 @@
+<?php
+
+$userArray  = $fabricator->makeArray();
+$userObject = $fabricator->makeObject();
+$userEntity = $fabricator->makeObject('App\Entities\User');
diff --git a/user_guide_src/source/testing/fabricator/012.php b/user_guide_src/source/testing/fabricator/012.php
new file mode 100644
index 000000000000..782c58f8917f
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/012.php
@@ -0,0 +1,12 @@
+<?php
+
+array(
+    'id'         => 1,
+    'first'      => "Rachel",
+    'email'      => "bradley72@gmail.com",
+    'phone'      => "741-241-2356",
+    'avatar'     => "http://lorempixel.com/800/400/",
+    'login'      => null,
+    'created_at' => "2020-05-08 14:52:10",
+    'updated_at' => "2020-05-08 14:52:10",
+)
diff --git a/user_guide_src/source/testing/fabricator/013.php b/user_guide_src/source/testing/fabricator/013.php
new file mode 100644
index 000000000000..6e89dd774eb9
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/013.php
@@ -0,0 +1,3 @@
+<?php
+
+$users = $fabricator->create(100);
diff --git a/user_guide_src/source/testing/fabricator/014.php b/user_guide_src/source/testing/fabricator/014.php
new file mode 100644
index 000000000000..60f0161b795f
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/014.php
@@ -0,0 +1,6 @@
+<?php
+
+$user = $fabricator(null, true);
+
+$this->assertIsNumeric($user->id);
+$this->dontSeeInDatabase('user', ['id' => $user->id]);
diff --git a/user_guide_src/source/testing/fabricator/015.php b/user_guide_src/source/testing/fabricator/015.php
new file mode 100644
index 000000000000..277c32fa370b
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/015.php
@@ -0,0 +1,4 @@
+<?php
+
+$fabricator->setOverrides(['first' => 'Bobby']);
+$bobbyUser = $fabricator->make();
diff --git a/user_guide_src/source/testing/fabricator/016.php b/user_guide_src/source/testing/fabricator/016.php
new file mode 100644
index 000000000000..72f2b946366e
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/016.php
@@ -0,0 +1,17 @@
+<?php
+
+array(
+    'first'  => "Bobby",
+    'email'  => "latta.kindel@company.org",
+    'phone'  => "251-806-2169",
+    'avatar' => "http://lorempixel.com/800/400/",
+    'login'  => null,
+)
+
+array(
+    'first'  => "Bobby",
+    'email'  => "melissa.strike@fabricon.us",
+    'phone'  => "525-214-2656 x23546",
+    'avatar' => "http://lorempixel.com/800/400/",
+    'login'  => null,
+)
diff --git a/user_guide_src/source/testing/fabricator/017.php b/user_guide_src/source/testing/fabricator/017.php
new file mode 100644
index 000000000000..ee79ea6f8d03
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/017.php
@@ -0,0 +1,5 @@
+<?php
+
+$fabricator->setOverrides(['first' => 'Bobby'], $persist = false);
+$bobbyUser = $fabricator->make();
+$bobbyUser = $fabricator->make();
diff --git a/user_guide_src/source/testing/fabricator/018.php b/user_guide_src/source/testing/fabricator/018.php
new file mode 100644
index 000000000000..73a3b932052e
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/018.php
@@ -0,0 +1,17 @@
+<?php
+
+array(
+    'first'  => "Bobby",
+    'email'  => "belingadon142@example.org",
+    'phone'  => "741-857-1933 x1351",
+    'avatar' => "http://lorempixel.com/800/400/",
+    'login'  => null,
+)
+
+array(
+    'first'  => "Hans",
+    'email'  => "hoppifur@metraxalon.com",
+    'phone'  => "487-235-7006",
+    'avatar' => "http://lorempixel.com/800/400/",
+    'login'  => null,
+)
diff --git a/user_guide_src/source/testing/fabricator/019.php b/user_guide_src/source/testing/fabricator/019.php
new file mode 100644
index 000000000000..4c1de5f23dd2
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/019.php
@@ -0,0 +1,4 @@
+<?php
+
+helper('test');
+$user = fake('App\Models\UserModel', ['name' => 'Gerry']);
diff --git a/user_guide_src/source/testing/fabricator/020.php b/user_guide_src/source/testing/fabricator/020.php
new file mode 100644
index 000000000000..385646b2ea2c
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/020.php
@@ -0,0 +1,5 @@
+<?php
+
+$fabricator = new Fabricator('App\Models\UserModel');
+$fabricator->setOverrides(['name' => 'Gerry']);
+$user = $fabricator->create();
diff --git a/user_guide_src/source/testing/fabricator/021.php b/user_guide_src/source/testing/fabricator/021.php
new file mode 100644
index 000000000000..a1b0111e0903
--- /dev/null
+++ b/user_guide_src/source/testing/fabricator/021.php
@@ -0,0 +1,14 @@
+<?php
+
+class UserModel
+{
+    protected $table = 'users';
+
+    public function fake(Generator &$faker)
+    {
+        return [
+            'first'    => $faker->firstName,
+            'email'    => $faker->email,
+            'group_id' => rand(1, Fabricator::getCount('groups')),
+        ];
+    }
diff --git a/user_guide_src/source/testing/feature.rst b/user_guide_src/source/testing/feature.rst
index 2a9eb96a348a..54cb6035a804 100644
--- a/user_guide_src/source/testing/feature.rst
+++ b/user_guide_src/source/testing/feature.rst
@@ -18,33 +18,8 @@ Feature testing requires that all of your test classes use the ``CodeIgniter\Tes
 and ``CodeIgniter\Test\FeatureTestTrait`` traits. Since these testing tools rely on proper database
 staging you must always ensure that ``parent::setUp()`` and ``parent::tearDown()``
 are called if you implement your own methods.
-::
 
-    <?php
-
-    namespace App;
-
-    use CodeIgniter\Test\DatabaseTestTrait;
-    use CodeIgniter\Test\FeatureTestTrait;
-
-    class TestFoo extends CIUnitTestCase
-    {
-        use DatabaseTestTrait, FeatureTestTrait;
-
-        protected function setUp(): void
-        {
-            parent::setUp();
-
-            $this->myClassMethod();
-        }
-
-        protected function tearDown(): void
-        {
-            parent::tearDown();
-
-            $this->anotherClassMethod();
-        }
-    }
+.. literalinclude:: feature/001.php
 
 Requesting A Page
 =================
@@ -54,25 +29,14 @@ to do this, you use the ``call()`` method. The first parameter is the HTTP metho
 The second parameter is the path on your site to test. The third parameter accepts an array that is used to populate the
 superglobal variables for the HTTP verb you are using. So, a method of **GET** would have the **$_GET** variable
 populated, while a **post** request would have the **$_POST** array populated.
-::
-
-    // Get a simple page
-    $result = $this->call('get', '/');
 
-    // Submit a form
-    $result = $this->call('post', 'contact'), [
-        'name'  => 'Fred Flintstone',
-        'email' => 'flintyfred@example.com'
-    ]);
+.. literalinclude:: feature/002.php
+   :lines: 2-
 
-Shorthand methods for each of the HTTP verbs exist to ease typing and make things clearer::
+Shorthand methods for each of the HTTP verbs exist to ease typing and make things clearer:
 
-    $this->get($path, $params);
-    $this->post($path, $params);
-    $this->put($path, $params);
-    $this->patch($path, $params);
-    $this->delete($path, $params);
-    $this->options($path, $params);
+.. literalinclude:: feature/003.php
+   :lines: 2-
 
 .. note:: The ``$params`` array does not make sense for every HTTP verb, but is included for consistency.
 
@@ -80,57 +44,41 @@ Setting Different Routes
 ------------------------
 
 You can use a custom collection of routes by passing an array of "routes" into the ``withRoutes()`` method. This will
-override any existing routes in the system::
+override any existing routes in the system:
 
-    $routes = [
-        ['get', 'users', 'UserController::list'],
-    ];
-
-    $result = $this->withRoutes($routes)->get('users');
+.. literalinclude:: feature/004.php
+   :lines: 2-
 
 Each of the "routes" is a 3 element array containing the HTTP verb (or "add" for all),
 the URI to match, and the routing destination.
 
-
 Setting Session Values
 ----------------------
 
 You can set custom session values to use during a single test with the ``withSession()`` method. This takes an array
 of key/value pairs that should exist within the ``$_SESSION`` variable when this request is made, or ``null`` to indicate
 that the current values of ``$_SESSION`` should be used. This is handy for testing authentication and more.
-::
-
-    $values = [
-        'logged_in' => 123,
-    ];
-
-    $result = $this->withSession($values)->get('admin');
 
-    // Or...
-
-    $_SESSION['logged_in'] = 123;
-
-    $result = $this->withSession()->get('admin');
+.. literalinclude:: feature/005.php
+   :lines: 2-
 
 Setting Headers
 ---------------
 
 You can set header values with the ``withHeaders()`` method. This takes an array of key/value pairs that would be
-passed as a header into the call.::
+passed as a header into the call.:
 
-    $headers = [
-        'CONTENT_TYPE' => 'application/json',
-    ];
-
-    $result = $this->withHeaders($headers)->post('users');
+.. literalinclude:: feature/006.php
+   :lines: 2-
 
 Bypassing Events
 ----------------
 
 Events are handy to use in your application, but can be problematic during testing. Especially events that are used
-to send out emails. You can tell the system to skip any event handling with the ``skipEvents()`` method::
+to send out emails. You can tell the system to skip any event handling with the ``skipEvents()`` method:
 
-    $result = $this->skipEvents()->post('users', $userInfo);
+.. literalinclude:: feature/007.php
+   :lines: 2-
 
 Formatting The Request
 -----------------------
@@ -139,13 +87,9 @@ You can set the format of your request's body using the ``withBodyFormat()`` met
 `json` or `xml`. This will take the parameters passed into ``call()``, ``post()``, ``get()``... and assign them to the
 body of the request in the given format. This will also set the `Content-Type` header for your request accordingly.
 This is useful when testing JSON or XML API's so that you can set the request in the form that the controller will expect.
-::
-
-    // If your feature test contains this:
-    $result = $this->withBodyFormat('json')->post('users', $userInfo);
 
-    // Your controller can then get the parameters passed in with:
-    $userInfo = $this->request->getJson();
+.. literalinclude:: feature/008.php
+   :lines: 2-
 
 Setting the Body
 ----------------
diff --git a/user_guide_src/source/testing/feature/001.php b/user_guide_src/source/testing/feature/001.php
new file mode 100644
index 000000000000..5449332fe266
--- /dev/null
+++ b/user_guide_src/source/testing/feature/001.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App;
+
+use CodeIgniter\Test\DatabaseTestTrait;
+use CodeIgniter\Test\FeatureTestTrait;
+
+class TestFoo extends CIUnitTestCase
+{
+    use DatabaseTestTrait, FeatureTestTrait;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->myClassMethod();
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        $this->anotherClassMethod();
+    }
+}
diff --git a/user_guide_src/source/testing/feature/002.php b/user_guide_src/source/testing/feature/002.php
new file mode 100644
index 000000000000..c5f67f42b36c
--- /dev/null
+++ b/user_guide_src/source/testing/feature/002.php
@@ -0,0 +1,10 @@
+<?php
+
+// Get a simple page
+$result = $this->call('get', '/');
+
+// Submit a form
+$result = $this->call('post', 'contact'), [
+    'name'  => 'Fred Flintstone',
+    'email' => 'flintyfred@example.com'
+]);
diff --git a/user_guide_src/source/testing/feature/003.php b/user_guide_src/source/testing/feature/003.php
new file mode 100644
index 000000000000..1905a2dcf110
--- /dev/null
+++ b/user_guide_src/source/testing/feature/003.php
@@ -0,0 +1,8 @@
+<?php
+
+$this->get($path, $params);
+$this->post($path, $params);
+$this->put($path, $params);
+$this->patch($path, $params);
+$this->delete($path, $params);
+$this->options($path, $params);
diff --git a/user_guide_src/source/testing/feature/004.php b/user_guide_src/source/testing/feature/004.php
new file mode 100644
index 000000000000..4f98ced2f8d6
--- /dev/null
+++ b/user_guide_src/source/testing/feature/004.php
@@ -0,0 +1,7 @@
+<?php
+
+$routes = [
+    ['get', 'users', 'UserController::list'],
+];
+
+$result = $this->withRoutes($routes)->get('users');
diff --git a/user_guide_src/source/testing/feature/005.php b/user_guide_src/source/testing/feature/005.php
new file mode 100644
index 000000000000..448e68800a4e
--- /dev/null
+++ b/user_guide_src/source/testing/feature/005.php
@@ -0,0 +1,13 @@
+<?php
+
+$values = [
+    'logged_in' => 123,
+];
+
+$result = $this->withSession($values)->get('admin');
+
+// Or...
+
+$_SESSION['logged_in'] = 123;
+
+$result = $this->withSession()->get('admin');
diff --git a/user_guide_src/source/testing/feature/006.php b/user_guide_src/source/testing/feature/006.php
new file mode 100644
index 000000000000..e3cf72b69b47
--- /dev/null
+++ b/user_guide_src/source/testing/feature/006.php
@@ -0,0 +1,7 @@
+<?php
+
+$headers = [
+    'CONTENT_TYPE' => 'application/json',
+];
+
+$result = $this->withHeaders($headers)->post('users');
diff --git a/user_guide_src/source/testing/feature/007.php b/user_guide_src/source/testing/feature/007.php
new file mode 100644
index 000000000000..f44369c79865
--- /dev/null
+++ b/user_guide_src/source/testing/feature/007.php
@@ -0,0 +1,3 @@
+<?php
+
+$result = $this->skipEvents()->post('users', $userInfo);
diff --git a/user_guide_src/source/testing/feature/008.php b/user_guide_src/source/testing/feature/008.php
new file mode 100644
index 000000000000..f5118ea42091
--- /dev/null
+++ b/user_guide_src/source/testing/feature/008.php
@@ -0,0 +1,7 @@
+<?php
+
+// If your feature test contains this:
+$result = $this->withBodyFormat('json')->post('users', $userInfo);
+
+// Your controller can then get the parameters passed in with:
+$userInfo = $this->request->getJson();
diff --git a/user_guide_src/source/testing/mocking.rst b/user_guide_src/source/testing/mocking.rst
index 972ad1a40f96..8c4b8b54d222 100644
--- a/user_guide_src/source/testing/mocking.rst
+++ b/user_guide_src/source/testing/mocking.rst
@@ -15,9 +15,9 @@ Cache
 =====
 
 You can mock the cache with the ``mock()`` method, using the ``CacheFactory`` as its only parameter.
-::
 
-    $mock = mock(\CodeIgniter\Cache\CacheFactory::class);
+.. literalinclude:: mocking/001.php
+   :lines: 2-
 
 While this returns an instance of ``CodeIgniter\Test\Mock\MockCache`` that you can use directly, it also inserts the
 mock into the Service class, so any calls within your code to ``service('cache')`` or ``Config\Services::cache()`` will
@@ -31,23 +31,14 @@ Additional Methods
 
 You can instruct the mocked cache handler to never do any caching with the ``bypass()`` method. This will emulate
 using the dummy handler and ensures that your test does not rely on cached data for your tests.
-::
 
-    $mock = mock(\CodeIgniter\Cache\CacheFactory::class);
-    // Never cache any items during this test.
-    $mock->bypass();
+.. literalinclude:: mocking/002.php
+   :lines: 2-
 
 Available Assertions
 --------------------
 
 The following new assertions are available on the mocked class for using during testing:
-::
 
-    $mock = mock(\CodeIgniter\Cache\CacheFactory::class);
-
-    // Assert that a cached item named $key exists
-    $mock->assertHas($key);
-    // Assert that a cached item named $key exists with a value of $value
-    $mock->assertHasValue($key, $value);
-    // Assert that a cached item named $key does NOT exist
-    $mock->assertMissing($key);
+.. literalinclude:: mocking/003.php
+   :lines: 2-
diff --git a/user_guide_src/source/testing/mocking/001.php b/user_guide_src/source/testing/mocking/001.php
new file mode 100644
index 000000000000..69e69239049d
--- /dev/null
+++ b/user_guide_src/source/testing/mocking/001.php
@@ -0,0 +1,3 @@
+<?php
+
+$mock = mock(\CodeIgniter\Cache\CacheFactory::class);
diff --git a/user_guide_src/source/testing/mocking/002.php b/user_guide_src/source/testing/mocking/002.php
new file mode 100644
index 000000000000..7afe011ef20b
--- /dev/null
+++ b/user_guide_src/source/testing/mocking/002.php
@@ -0,0 +1,5 @@
+<?php
+
+$mock = mock(\CodeIgniter\Cache\CacheFactory::class);
+// Never cache any items during this test.
+$mock->bypass();
diff --git a/user_guide_src/source/testing/mocking/003.php b/user_guide_src/source/testing/mocking/003.php
new file mode 100644
index 000000000000..4a3babddaf54
--- /dev/null
+++ b/user_guide_src/source/testing/mocking/003.php
@@ -0,0 +1,10 @@
+<?php
+
+$mock = mock(\CodeIgniter\Cache\CacheFactory::class);
+
+// Assert that a cached item named $key exists
+$mock->assertHas($key);
+// Assert that a cached item named $key exists with a value of $value
+$mock->assertHasValue($key, $value);
+// Assert that a cached item named $key does NOT exist
+$mock->assertMissing($key);
diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst
index 4b4cdce7beed..9c3fec194ab4 100644
--- a/user_guide_src/source/testing/overview.rst
+++ b/user_guide_src/source/testing/overview.rst
@@ -43,7 +43,6 @@ Phar
 The other option is to download the .phar file from the `PHPUnit <https://phpunit.de/getting-started/phpunit-7.html>`__ site.
 This is a standalone file that should be placed within your project root.
 
-
 ************************
 Testing Your Application
 ************************
@@ -64,38 +63,13 @@ The Test Class
 In order to take advantage of the additional tools provided, your tests must extend ``CIUnitTestCase``. All tests
 are expected to be located in the **tests/app** directory by default.
 
-To test a new library, **Foo**, you would create a new file at **tests/app/Libraries/FooTest.php**::
-
-    <?php
-
-    namespace App\Libraries;
-
-    use CodeIgniter\Test\CIUnitTestCase;
-
-    class FooTest extends CIUnitTestCase
-    {
-        public function testFooNotBar()
-        {
-            // ...
-        }
-    }
-
-To test one of your models, you might end up with something like this in **tests/app/Models/OneOfMyModelsTest.php**::
-
-    <?php
-
-    namespace App\Models;
+To test a new library, **Foo**, you would create a new file at **tests/app/Libraries/FooTest.php**:
 
-    use CodeIgniter\Test\CIUnitTestCase;
+.. literalinclude:: overview/001.php
 
-    class OneOfMyModelsTest extends CIUnitTestCase
-    {
-        public function testFooNotBar()
-        {
-            // ...
-        }
-    }
+To test one of your models, you might end up with something like this in **tests/app/Models/OneOfMyModelsTest.php**:
 
+.. literalinclude:: overview/002.php
 
 You can create any directory structure that fits your testing style/needs. When namespacing the test classes,
 remember that the **app** directory is the root of the ``App`` namespace, so any classes you use must
@@ -109,46 +83,29 @@ Staging
 -------
 
 Most tests require some preparation in order to run correctly. PHPUnit's ``TestCase`` provides four methods
-to help with staging and clean up::
+to help with staging and clean up:
 
-    public static function setUpBeforeClass(): void
-    public static function tearDownAfterClass(): void
-    public function setUp(): void
-    public function tearDown(): void
+.. literalinclude:: overview/003.php
+   :lines: 2-
 
 The static methods run before and after the entire test case, whereas the local methods run
 between each test. If you implement any of these special functions make sure you run their
-parent as well so extended test cases do not interfere with staging::
+parent as well so extended test cases do not interfere with staging:
 
-    public function setUp(): void
-    {
-        parent::setUp();
-        helper('text');
-    }
+.. literalinclude:: overview/004.php
+   :lines: 2-
 
 In addition to these methods, ``CIUnitTestCase`` also comes with a convenience property for
-parameter-free methods you want run during set up and tear down::
+parameter-free methods you want run during set up and tear down:
 
-    protected $setUpMethods = [
-        'mockEmail',
-        'mockSession',
-    ];
-
-    protected $tearDownMethods = [];
+.. literalinclude:: overview/005.php
+   :lines: 2-
 
 You can see by default these handle the mocking of intrusive services, but your class may override
-that or provide their own::
-
-    class OneOfMyModelsTest extends CIUnitTestCase
-    {
-        protected $tearDownMethods = [
-            'purgeRows',
-        ];
+that or provide their own:
 
-        protected function purgeRows()
-        {
-            $this->model->purgeDeleted()
-        }
+.. literalinclude:: overview/006.php
+   :lines: 2-
 
 Traits
 ------
@@ -157,22 +114,10 @@ A common way to enhance your tests is by using traits to consolidate staging acr
 test cases. ``CIUnitTestCase`` will detect any class traits and look for staging methods
 to run named for the trait itself. For example, if you needed to add authentication to some
 of your test cases you could create an authentication trait with a set up method to fake a
-logged in user::
-
-    trait AuthTrait
-    {
-        protected setUpAuthTrait()
-        {
-            $user = $this->createFakeUser();
-            $this->logInUser($user);
-        }
-    ...
-
-    class AuthenticationFeatureTest
-    {
-        use AuthTrait;
-    ...
+logged in user:
 
+.. literalinclude:: overview/007.php
+   :lines: 2-
 
 Additional Assertions
 ---------------------
@@ -181,54 +126,34 @@ Additional Assertions
 
 **assertLogged($level, $expectedMessage)**
 
-Ensure that something you expected to be logged actually was::
+Ensure that something you expected to be logged actually was:
 
-        $config = new LoggerConfig();
-        $logger = new Logger($config);
-
-        ... do something that you expect a log entry from
-        $logger->log('error', "That's no moon");
-
-        $this->assertLogged('error', "That's no moon");
+.. literalinclude:: overview/008.php
+   :lines: 2-
 
 **assertEventTriggered($eventName)**
 
-Ensure that an event you expected to be triggered actually was::
-
-    Events::on('foo', function ($arg) use(&$result) {
-        $result = $arg;
-    });
-
-    Events::trigger('foo', 'bar');
+Ensure that an event you expected to be triggered actually was:
 
-    $this->assertEventTriggered('foo');
+.. literalinclude:: overview/009.php
+   :lines: 2-
 
 **assertHeaderEmitted($header, $ignoreCase = false)**
 
-Ensure that a header or cookie was actually emitted::
+Ensure that a header or cookie was actually emitted:
 
-    $response->setCookie('foo', 'bar');
-
-    ob_start();
-    $this->response->send();
-    $output = ob_get_clean(); // in case you want to check the actual body
-
-    $this->assertHeaderEmitted("Set-Cookie: foo=bar");
+.. literalinclude:: overview/010.php
+   :lines: 2-
 
 Note: the test case with this should be `run as a separate process
 in PHPunit <https://phpunit.readthedocs.io/en/9.5/annotations.html#runinseparateprocess>`_.
 
 **assertHeaderNotEmitted($header, $ignoreCase = false)**
 
-Ensure that a header or cookie was not emitted::
-
-    $response->setCookie('foo', 'bar');
-
-    ob_start();
-    $this->response->send();
-    $output = ob_get_clean(); // in case you want to check the actual body
+Ensure that a header or cookie was not emitted:
 
-    $this->assertHeaderNotEmitted("Set-Cookie: banana");
+.. literalinclude:: overview/011.php
+   :lines: 2-
 
 Note: the test case with this should be `run as a separate process
 in PHPunit <https://phpunit.readthedocs.io/en/9.5/annotations.html#runinseparateprocess>`_.
@@ -236,26 +161,23 @@ in PHPunit <https://phpunit.readthedocs.io/en/9.5/annotations.html#runinseparate
 **assertCloseEnough($expected, $actual, $message = '', $tolerance = 1)**
 
 For extended execution time testing, tests that the absolute difference
-between expected and actual time is within the prescribed tolerance.::
+between expected and actual time is within the prescribed tolerance.:
 
-    $timer = new Timer();
-    $timer->start('longjohn', strtotime('-11 minutes'));
-    $this->assertCloseEnough(11 * 60, $timer->getElapsedTime('longjohn'));
+.. literalinclude:: overview/012.php
+   :lines: 2-
 
 The above test will allow the actual time to be either 660 or 661 seconds.
 
 **assertCloseEnoughString($expected, $actual, $message = '', $tolerance = 1)**
 
 For extended execution time testing, tests that the absolute difference
-between expected and actual time, formatted as strings, is within the prescribed tolerance.::
+between expected and actual time, formatted as strings, is within the prescribed tolerance.:
 
-    $timer = new Timer();
-    $timer->start('longjohn', strtotime('-11 minutes'));
-    $this->assertCloseEnoughString(11 * 60, $timer->getElapsedTime('longjohn'));
+.. literalinclude:: overview/013.php
+   :lines: 2-
 
 The above test will allow the actual time to be either 660 or 661 seconds.
 
-
 Accessing Protected/Private Properties
 --------------------------------------
 
@@ -267,42 +189,24 @@ properties in the classes that you are testing.
 Enables you to call private methods from outside the class. This returns a function that can be called. The first
 parameter is an instance of the class to test. The second parameter is the name of the method you want to call.
 
-::
-
-    // Create an instance of the class to test
-    $obj = new Foo();
-
-    // Get the invoker for the 'privateMethod' method.
-    $method = $this->getPrivateMethodInvoker($obj, 'privateMethod');
-
-    // Test the results
-    $this->assertEquals('bar', $method('param1', 'param2'));
+.. literalinclude:: overview/014.php
+   :lines: 2-
 
 **getPrivateProperty($instance, $property)**
 
 Retrieves the value of a private/protected class property from an instance of a class. The first parameter is an
 instance of the class to test. The second parameter is the name of the property.
 
-::
-
-    // Create an instance of the class to test
-    $obj = new Foo();
-
-    // Test the value
-    $this->assertEquals('bar', $this->getPrivateProperty($obj, 'baz'));
+.. literalinclude:: overview/015.php
+   :lines: 2-
 
 **setPrivateProperty($instance, $property, $value)**
 
 Set a protected value within a class instance. The first parameter is an instance of the class to test. The second
-parameter is the name of the property to set the value of. The third parameter is the value to set it to::
-
-    // Create an instance of the class to test
-    $obj = new Foo();
-
-    // Set the value
-    $this->setPrivateProperty($obj, 'baz', 'oops!');
+parameter is the name of the property to set the value of. The third parameter is the value to set it to:
 
-    // Do normal testing...
+.. literalinclude:: overview/016.php
+   :lines: 2-
 
 Mocking Services
 ================
@@ -316,17 +220,9 @@ to simplify this.
 
 This method allows you to define the exact instance that will be returned by the Services class. You can use this to
 set properties of a service so that it behaves in a certain way, or replace a service with a mocked class.
-::
 
-    public function testSomething()
-    {
-        $curlrequest = $this->getMockBuilder('CodeIgniter\HTTP\CURLRequest')
-                            ->setMethods(['request'])
-                            ->getMock();
-        Services::injectMock('curlrequest', $curlrequest);
-
-        // Do normal testing here....
-    }
+.. literalinclude:: overview/017.php
+   :lines: 2-
 
 The first parameter is the service that you are replacing. The name must match the function name in the Services
 class exactly. The second parameter is the instance to replace it with.
@@ -347,15 +243,10 @@ Mocking Factory Instances
 Similar to Services, you may find yourself needing to supply a pre-configured class instance
 during testing that will be used with ``Factories``. Use the same ``injectMock()`` and ``reset()``
 static methods like **Services**, but they take an additional preceding parameter for the
-component name::
-
-    protected function setUp()
-    {
-        parent::setUp();
+component name:
 
-        $model = new MockUserModel();
-        Factories::injectMock('models', 'App\Models\UserModel', $model);
-    }
+.. literalinclude:: overview/018.php
+   :lines: 2-
 
 .. note:: All component Factories are reset by default between each test. Modify your test case's ``$setUpMethods`` if you need instances to persist.
 
@@ -367,22 +258,7 @@ Stream Filters
 You may need to test things that are difficult to test. Sometimes, capturing a stream, like PHP's own STDOUT, or STDERR,
 might be helpful. The ``CITestStreamFilter`` helps you capture the output from the stream of your choice.
 
-An example demonstrating this inside one of your test cases::
-
-    public function setUp()
-    {
-        CITestStreamFilter::$buffer = '';
-        $this->stream_filter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-    }
-
-    public function tearDown()
-    {
-        stream_filter_remove($this->stream_filter);
-    }
-
-    public function testSomeOutput()
-    {
-        CLI::write('first.');
-        $expected = "first.\n";
-        $this->assertSame($expected, CITestStreamFilter::$buffer);
-    }
+An example demonstrating this inside one of your test cases:
+
+.. literalinclude:: overview/019.php
+   :lines: 2-
diff --git a/user_guide_src/source/testing/overview/001.php b/user_guide_src/source/testing/overview/001.php
new file mode 100644
index 000000000000..6dac95d2b671
--- /dev/null
+++ b/user_guide_src/source/testing/overview/001.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Libraries;
+
+use CodeIgniter\Test\CIUnitTestCase;
+
+class FooTest extends CIUnitTestCase
+{
+    public function testFooNotBar()
+    {
+        // ...
+    }
+}
diff --git a/user_guide_src/source/testing/overview/002.php b/user_guide_src/source/testing/overview/002.php
new file mode 100644
index 000000000000..eca8ef906203
--- /dev/null
+++ b/user_guide_src/source/testing/overview/002.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Test\CIUnitTestCase;
+
+class OneOfMyModelsTest extends CIUnitTestCase
+{
+    public function testFooNotBar()
+    {
+        // ...
+    }
+}
diff --git a/user_guide_src/source/testing/overview/003.php b/user_guide_src/source/testing/overview/003.php
new file mode 100644
index 000000000000..9623bc2c7773
--- /dev/null
+++ b/user_guide_src/source/testing/overview/003.php
@@ -0,0 +1,6 @@
+<?php
+
+public static function setUpBeforeClass(): void
+public static function tearDownAfterClass(): void
+public function setUp(): void
+public function tearDown(): void
diff --git a/user_guide_src/source/testing/overview/004.php b/user_guide_src/source/testing/overview/004.php
new file mode 100644
index 000000000000..6b6fef8e11bb
--- /dev/null
+++ b/user_guide_src/source/testing/overview/004.php
@@ -0,0 +1,7 @@
+<?php
+
+public function setUp(): void
+{
+    parent::setUp();
+    helper('text');
+}
diff --git a/user_guide_src/source/testing/overview/005.php b/user_guide_src/source/testing/overview/005.php
new file mode 100644
index 000000000000..609ff84c6d8d
--- /dev/null
+++ b/user_guide_src/source/testing/overview/005.php
@@ -0,0 +1,8 @@
+<?php
+
+protected $setUpMethods = [
+    'mockEmail',
+    'mockSession',
+];
+
+protected $tearDownMethods = [];
diff --git a/user_guide_src/source/testing/overview/006.php b/user_guide_src/source/testing/overview/006.php
new file mode 100644
index 000000000000..bbd2a333a349
--- /dev/null
+++ b/user_guide_src/source/testing/overview/006.php
@@ -0,0 +1,12 @@
+<?php
+
+class OneOfMyModelsTest extends CIUnitTestCase
+{
+    protected $tearDownMethods = [
+        'purgeRows',
+    ];
+
+    protected function purgeRows()
+    {
+        $this->model->purgeDeleted()
+    }
diff --git a/user_guide_src/source/testing/overview/007.php b/user_guide_src/source/testing/overview/007.php
new file mode 100644
index 000000000000..74bbb533de38
--- /dev/null
+++ b/user_guide_src/source/testing/overview/007.php
@@ -0,0 +1,15 @@
+<?php
+
+trait AuthTrait
+{
+    protected setUpAuthTrait()
+    {
+        $user = $this->createFakeUser();
+        $this->logInUser($user);
+    }
+...
+
+class AuthenticationFeatureTest
+{
+    use AuthTrait;
+...
diff --git a/user_guide_src/source/testing/overview/008.php b/user_guide_src/source/testing/overview/008.php
new file mode 100644
index 000000000000..9d84f888c1d4
--- /dev/null
+++ b/user_guide_src/source/testing/overview/008.php
@@ -0,0 +1,9 @@
+<?php
+
+$config = new LoggerConfig();
+$logger = new Logger($config);
+
+... do something that you expect a log entry from
+$logger->log('error', "That's no moon");
+
+$this->assertLogged('error', "That's no moon");
diff --git a/user_guide_src/source/testing/overview/009.php b/user_guide_src/source/testing/overview/009.php
new file mode 100644
index 000000000000..115cf6bda9e4
--- /dev/null
+++ b/user_guide_src/source/testing/overview/009.php
@@ -0,0 +1,9 @@
+<?php
+
+Events::on('foo', function ($arg) use(&$result) {
+    $result = $arg;
+});
+
+Events::trigger('foo', 'bar');
+
+$this->assertEventTriggered('foo');
diff --git a/user_guide_src/source/testing/overview/010.php b/user_guide_src/source/testing/overview/010.php
new file mode 100644
index 000000000000..4884f9a4a9f2
--- /dev/null
+++ b/user_guide_src/source/testing/overview/010.php
@@ -0,0 +1,9 @@
+<?php
+
+$response->setCookie('foo', 'bar');
+
+ob_start();
+$this->response->send();
+$output = ob_get_clean(); // in case you want to check the actual body
+
+$this->assertHeaderEmitted("Set-Cookie: foo=bar");
diff --git a/user_guide_src/source/testing/overview/011.php b/user_guide_src/source/testing/overview/011.php
new file mode 100644
index 000000000000..a2aa11c7bb64
--- /dev/null
+++ b/user_guide_src/source/testing/overview/011.php
@@ -0,0 +1,9 @@
+<?php
+
+$response->setCookie('foo', 'bar');
+
+ob_start();
+$this->response->send();
+$output = ob_get_clean(); // in case you want to check the actual body
+
+$this->assertHeaderNotEmitted("Set-Cookie: banana");
diff --git a/user_guide_src/source/testing/overview/012.php b/user_guide_src/source/testing/overview/012.php
new file mode 100644
index 000000000000..c9b85aef7f87
--- /dev/null
+++ b/user_guide_src/source/testing/overview/012.php
@@ -0,0 +1,5 @@
+<?php
+
+$timer = new Timer();
+$timer->start('longjohn', strtotime('-11 minutes'));
+$this->assertCloseEnough(11 * 60, $timer->getElapsedTime('longjohn'));
diff --git a/user_guide_src/source/testing/overview/013.php b/user_guide_src/source/testing/overview/013.php
new file mode 100644
index 000000000000..1c03733868e4
--- /dev/null
+++ b/user_guide_src/source/testing/overview/013.php
@@ -0,0 +1,5 @@
+<?php
+
+$timer = new Timer();
+$timer->start('longjohn', strtotime('-11 minutes'));
+$this->assertCloseEnoughString(11 * 60, $timer->getElapsedTime('longjohn'));
diff --git a/user_guide_src/source/testing/overview/014.php b/user_guide_src/source/testing/overview/014.php
new file mode 100644
index 000000000000..f228dcf28963
--- /dev/null
+++ b/user_guide_src/source/testing/overview/014.php
@@ -0,0 +1,10 @@
+<?php
+
+// Create an instance of the class to test
+$obj = new Foo();
+
+// Get the invoker for the 'privateMethod' method.
+$method = $this->getPrivateMethodInvoker($obj, 'privateMethod');
+
+// Test the results
+$this->assertEquals('bar', $method('param1', 'param2'));
diff --git a/user_guide_src/source/testing/overview/015.php b/user_guide_src/source/testing/overview/015.php
new file mode 100644
index 000000000000..1befb710253e
--- /dev/null
+++ b/user_guide_src/source/testing/overview/015.php
@@ -0,0 +1,7 @@
+<?php
+
+// Create an instance of the class to test
+$obj = new Foo();
+
+// Test the value
+$this->assertEquals('bar', $this->getPrivateProperty($obj, 'baz'));
diff --git a/user_guide_src/source/testing/overview/016.php b/user_guide_src/source/testing/overview/016.php
new file mode 100644
index 000000000000..c2e815953dd9
--- /dev/null
+++ b/user_guide_src/source/testing/overview/016.php
@@ -0,0 +1,9 @@
+<?php
+
+// Create an instance of the class to test
+$obj = new Foo();
+
+// Set the value
+$this->setPrivateProperty($obj, 'baz', 'oops!');
+
+// Do normal testing...
diff --git a/user_guide_src/source/testing/overview/017.php b/user_guide_src/source/testing/overview/017.php
new file mode 100644
index 000000000000..653c7d0947ba
--- /dev/null
+++ b/user_guide_src/source/testing/overview/017.php
@@ -0,0 +1,11 @@
+<?php
+
+public function testSomething()
+{
+    $curlrequest = $this->getMockBuilder('CodeIgniter\HTTP\CURLRequest')
+                        ->setMethods(['request'])
+                        ->getMock();
+    Services::injectMock('curlrequest', $curlrequest);
+
+    // Do normal testing here....
+}
diff --git a/user_guide_src/source/testing/overview/018.php b/user_guide_src/source/testing/overview/018.php
new file mode 100644
index 000000000000..743074117d9e
--- /dev/null
+++ b/user_guide_src/source/testing/overview/018.php
@@ -0,0 +1,9 @@
+<?php
+
+protected function setUp()
+{
+    parent::setUp();
+
+    $model = new MockUserModel();
+    Factories::injectMock('models', 'App\Models\UserModel', $model);
+}
diff --git a/user_guide_src/source/testing/overview/019.php b/user_guide_src/source/testing/overview/019.php
new file mode 100644
index 000000000000..41fcfeb08925
--- /dev/null
+++ b/user_guide_src/source/testing/overview/019.php
@@ -0,0 +1,19 @@
+<?php
+
+public function setUp()
+{
+    CITestStreamFilter::$buffer = '';
+    $this->stream_filter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+}
+
+public function tearDown()
+{
+    stream_filter_remove($this->stream_filter);
+}
+
+public function testSomeOutput()
+{
+    CLI::write('first.');
+    $expected = "first.\n";
+    $this->assertSame($expected, CITestStreamFilter::$buffer);
+}
diff --git a/user_guide_src/source/testing/response.rst b/user_guide_src/source/testing/response.rst
index 6c22e7e9cbdb..e695064825fe 100644
--- a/user_guide_src/source/testing/response.rst
+++ b/user_guide_src/source/testing/response.rst
@@ -5,10 +5,10 @@ Testing Responses
 The ``TestResponse`` class provides a number of helpful functions for parsing and testing responses
 from your test cases. Usually a ``TestResponse`` will be provided for you as a result of your
 :doc:`Controller Tests <controllers>` or :doc:`HTTP Feature Tests <feature>`, but you can always
-create your own directly using any ``ResponseInterface``::
+create your own directly using any ``ResponseInterface``:
 
-    $result = new \CodeIgniter\Test\TestResponse($response);
-    $result->assertOK();
+.. literalinclude:: response/001.php
+   :lines: 2-
 
 .. contents::
     :local:
@@ -25,15 +25,17 @@ Accessing Request/Response
 
 **request()**
 
-You can access directly the Request object, if it was set during testing::
+You can access directly the Request object, if it was set during testing:
 
-    $request = $results->request();
+.. literalinclude:: response/002.php
+   :lines: 2-
 
 **response()**
 
-This allows you direct access to the response object::
+This allows you direct access to the response object:
 
-    $response = $results->response();
+.. literalinclude:: response/003.php
+   :lines: 2-
 
 Checking Response Status
 ------------------------
@@ -42,58 +44,52 @@ Checking Response Status
 
 Returns a boolean true/false based on whether the response is perceived to be "ok". This is primarily determined by
 a response status code in the 200 or 300's. An empty body is not considered valid, unless in redirects.
-::
 
-    if ($result->isOK()) {
-        ...
-    }
+.. literalinclude:: response/004.php
+   :lines: 2-
 
 **assertOK()**
 
 This assertion simply uses the **isOK()** method to test a response. **assertNotOK** is the inverse of this assertion.
-::
 
-    $result->assertOK();
+.. literalinclude:: response/005.php
+   :lines: 2-
 
 **isRedirect()**
 
 Returns a boolean true/false based on whether the response is a redirected response.
-::
 
-    if ($result->isRedirect()) {
-        ...
-    }
+.. literalinclude:: response/006.php
+   :lines: 2-
 
 **assertRedirect()**
 
 Asserts that the Response is an instance of RedirectResponse. **assertNotRedirect** is the inverse of this assertion.
-::
 
-    $result->assertRedirect();
+.. literalinclude:: response/007.php
+   :lines: 2-
 
 **assertRedirectTo()**
 
 Asserts that the Response is an instance of RedirectResponse and the destination
 matches the uri given.
-::
 
-    $result->assertRedirectTo('foo/bar');
+.. literalinclude:: response/008.php
+   :lines: 2-
 
 **getRedirectUrl()**
 
 Returns the URL set for a RedirectResponse, or null for failure.
-::
 
-    $url = $result->getRedirectUrl();
-    $this->assertEquals(site_url('foo/bar'), $url);
+.. literalinclude:: response/009.php
+   :lines: 2-
 
 **assertStatus(int $code)**
 
 Asserts that the HTTP status code returned matches $code.
-::
-
-    $result->assertStatus(403);
 
+.. literalinclude:: response/010.php
+   :lines: 2-
 
 Session Assertions
 ------------------
@@ -102,17 +98,16 @@ Session Assertions
 
 Asserts that a value exists in the resulting session. If $value is passed, will also assert that the variable's value
 matches what was specified.
-::
 
-    $result->assertSessionHas('logged_in', 123);
+.. literalinclude:: response/011.php
+   :lines: 2-
 
 **assertSessionMissing(string $key)**
 
 Asserts that the resulting session does not include the specified $key.
-::
-
-    $result->assertSessionMissin('logged_in');
 
+.. literalinclude:: response/012.php
+   :lines: 2-
 
 Header Assertions
 -----------------
@@ -121,17 +116,16 @@ Header Assertions
 
 Asserts that a header named **$key** exists in the response. If **$value** is not empty, will also assert that
 the values match.
-::
 
-    $result->assertHeader('Content-Type', 'text/html');
+.. literalinclude:: response/013.php
+   :lines: 2-
 
 **assertHeaderMissing(string $key)**
 
 Asserts that a header name **$key** does not exist in the response.
-::
-
-    $result->assertHeader('Accepts');
 
+.. literalinclude:: response/014.php
+   :lines: 2-
 
 Cookie Assertions
 -----------------
@@ -140,24 +134,24 @@ Cookie Assertions
 
 Asserts that a cookie named **$key** exists in the response. If **$value** is not empty, will also assert that
 the values match. You can set the cookie prefix, if needed, by passing it in as the third parameter.
-::
 
-    $result->assertCookie('foo', 'bar');
+.. literalinclude:: response/015.php
+   :lines: 2-
 
 **assertCookieMissing(string $key)**
 
 Asserts that a cookie named **$key** does not exist in the response.
-::
 
-    $result->assertCookieMissing('ci_session');
+.. literalinclude:: response/016.php
+   :lines: 2-
 
 **assertCookieExpired(string $key, string $prefix = '')**
 
 Asserts that a cookie named **$key** exists, but has expired. You can set the cookie prefix, if needed, by passing it
 in as the second parameter.
-::
 
-    $result->assertCookieExpired('foo');
+.. literalinclude:: response/017.php
+   :lines: 2-
 
 DOM Helpers
 -----------
@@ -166,54 +160,36 @@ The response you get back contains a number of helper methods to inspect the HTM
 are useful for using within assertions in your tests.
 
 The **see()** method checks the text on the page to see if it exists either by itself, or more specifically within
-a tag, as specified by type, class, or id::
+a tag, as specified by type, class, or id:
 
-    // Check that "Hello World" is on the page
-    $results->see('Hello World');
-    // Check that "Hello World" is within an h1 tag
-    $results->see('Hello World', 'h1');
-    // Check that "Hello World" is within an element with the "notice" class
-    $results->see('Hello World', '.notice');
-    // Check that "Hello World" is within an element with id of "title"
-    $results->see('Hellow World', '#title');
+.. literalinclude:: response/018.php
+   :lines: 2-
 
-The **dontSee()** method is the exact opposite::
+The **dontSee()** method is the exact opposite:
 
-    // Checks that "Hello World" does NOT exist on the page
-    $results->dontSee('Hello World');
-    // Checks that "Hellow World" does NOT exist within any h1 tag
-    $results->dontSee('Hello World', 'h1');
+.. literalinclude:: response/019.php
+   :lines: 2-
 
 The **seeElement()** and **dontSeeElement()** are very similar to the previous methods, but do not look at the
-values of the elements. Instead, they simply check that the elements exist on the page::
+values of the elements. Instead, they simply check that the elements exist on the page:
 
-    // Check that an element with class 'notice' exists
-    $results->seeElement('.notice');
-    // Check that an element with id 'title' exists
-    $results->seeElement('#title')
-    // Verify that an element with id 'title' does NOT exist
-    $results->dontSeeElement('#title');
+.. literalinclude:: response/020.php
+   :lines: 2-
 
-You can use **seeLink()** to ensure that a link appears on the page with the specified text::
+You can use **seeLink()** to ensure that a link appears on the page with the specified text:
 
-    // Check that a link exists with 'Upgrade Account' as the text::
-    $results->seeLink('Upgrade Account');
-    // Check that a link exists with 'Upgrade Account' as the text, AND a class of 'upsell'
-    $results->seeLink('Upgrade Account', '.upsell');
+.. literalinclude:: response/021.php
+   :lines: 2-
 
-The **seeInField()** method checks for any input tags exist with the name and value::
+The **seeInField()** method checks for any input tags exist with the name and value:
 
-    // Check that an input exists named 'user' with the value 'John Snow'
-    $results->seeInField('user', 'John Snow');
-    // Check a multi-dimensional input
-    $results->seeInField('user[name]', 'John Snow');
+.. literalinclude:: response/022.php
+   :lines: 2-
 
-Finally, you can check if a checkbox exists and is checked with the **seeCheckboxIsChecked()** method::
+Finally, you can check if a checkbox exists and is checked with the **seeCheckboxIsChecked()** method:
 
-    // Check if checkbox is checked with class of 'foo'
-    $results->seeCheckboxIsChecked('.foo');
-    // Check if checkbox with id of 'bar' is checked
-    $results->seeCheckboxIsChecked('#bar');
+.. literalinclude:: response/023.php
+   :lines: 2-
 
 DOM Assertions
 --------------
@@ -224,62 +200,46 @@ assertions.
 **assertSee(string $search = null, string $element = null)**
 
 Asserts that text/HTML is on the page, either by itself or - more specifically - within
-a tag, as specified by type, class, or id::
-
-    // Check that "Hello World" is on the page
-    $result->assertSee('Hello World');
-    // Check that "Hello World" is within an h1 tag
-    $result->assertSee('Hello World', 'h1');
-    // Check that "Hello World" is within an element with the "notice" class
-    $result->assertSee('Hello World', '.notice');
-    // Check that "Hello World" is within an element with id of "title"
-    $result->assertSee('Hellow World', '#title');
+a tag, as specified by type, class, or id:
 
+.. literalinclude:: response/024.php
+   :lines: 2-
 
 **assertDontSee(string $search = null, string $element = null)**
 
-Asserts the exact opposite of the **assertSee()** method::
+Asserts the exact opposite of the **assertSee()** method:
 
-    // Checks that "Hello World" does NOT exist on the page
-    $results->dontSee('Hello World');
-    // Checks that "Hello World" does NOT exist within any h1 tag
-    $results->dontSee('Hello World', 'h1');
+.. literalinclude:: response/025.php
+   :lines: 2-
 
 **assertSeeElement(string $search)**
 
-Similar to **assertSee()**, however this only checks for an existing element. It does not check for specific text::
+Similar to **assertSee()**, however this only checks for an existing element. It does not check for specific text:
 
-    // Check that an element with class 'notice' exists
-    $results->seeElement('.notice');
-    // Check that an element with id 'title' exists
-    $results->seeElement('#title')
+.. literalinclude:: response/026.php
+   :lines: 2-
 
 **assertDontSeeElement(string $search)**
 
 Similar to **assertSee()**, however this only checks for an existing element that is missing. It does not check for
-specific text::
+specific text:
 
-    // Verify that an element with id 'title' does NOT exist
-    $results->dontSeeElement('#title');
+.. literalinclude:: response/027.php
+   :lines: 2-
 
 **assertSeeLink(string $text, string $details=null)**
 
-Asserts that an anchor tag is found with matching **$text** as the body of the tag::
+Asserts that an anchor tag is found with matching **$text** as the body of the tag:
 
-    // Check that a link exists with 'Upgrade Account' as the text::
-    $results->seeLink('Upgrade Account');
-    // Check that a link exists with 'Upgrade Account' as the text, AND a class of 'upsell'
-    $results->seeLink('Upgrade Account', '.upsell');
+.. literalinclude:: response/021.php
+   :lines: 2-
 
 **assertSeeInField(string $field, string $value=null)**
 
-Asserts that an input tag exists with the name and value::
-
-    // Check that an input exists named 'user' with the value 'John Snow'
-    $results->assertSeeInField('user', 'John Snow');
-    // Check a multi-dimensional input
-    $results->assertSeeInField('user[name]', 'John Snow');
+Asserts that an input tag exists with the name and value:
 
+.. literalinclude:: response/029.php
+   :lines: 2-
 
 Working With JSON
 -----------------
@@ -289,22 +249,15 @@ can help to test the responses.
 
 **getJSON()**
 
-This method will return the body of the response as a JSON string::
+This method will return the body of the response as a JSON string:
 
-    // Response body is this:
-    ['foo' => 'bar']
+.. literalinclude:: response/030.php
+   :lines: 2-
 
-    $json = $result->getJSON();
+You can use this method to determine if ``$response`` actually holds JSON content:
 
-    // $json is this:
-    {
-        "foo": "bar"
-    }
-
-You can use this method to determine if ``$response`` actually holds JSON content::
-
-    // Verify the response is JSON
-    $this->assertTrue($result->getJSON() !== false)
+.. literalinclude:: response/031.php
+   :lines: 2-
 
 .. note:: Be aware that the JSON string will be pretty-printed in the result.
 
@@ -312,21 +265,13 @@ You can use this method to determine if ``$response`` actually holds JSON conten
 
 Asserts that $fragment is found within the JSON response. It does not need to match the entire JSON value.
 
-::
-
-    // Response body is this:
-    [
-        'config' => ['key-a', 'key-b'],
-    ]
-
-    // Is true
-    $result->assertJSONFragment(['config' => ['key-a']]);
+.. literalinclude:: response/032.php
+   :lines: 2-
 
 **assertJSONExact($test)**
 
 Similar to **assertJSONFragment()**, but checks the entire JSON response to ensure exact matches.
 
-
 Working With XML
 ----------------
 
diff --git a/user_guide_src/source/testing/response/001.php b/user_guide_src/source/testing/response/001.php
new file mode 100644
index 000000000000..0e37cfec37ba
--- /dev/null
+++ b/user_guide_src/source/testing/response/001.php
@@ -0,0 +1,4 @@
+<?php
+
+$result = new \CodeIgniter\Test\TestResponse($response);
+$result->assertOK();
diff --git a/user_guide_src/source/testing/response/002.php b/user_guide_src/source/testing/response/002.php
new file mode 100644
index 000000000000..a835659904db
--- /dev/null
+++ b/user_guide_src/source/testing/response/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$request = $results->request();
diff --git a/user_guide_src/source/testing/response/003.php b/user_guide_src/source/testing/response/003.php
new file mode 100644
index 000000000000..c0cb73899f30
--- /dev/null
+++ b/user_guide_src/source/testing/response/003.php
@@ -0,0 +1,3 @@
+<?php
+
+$response = $results->response();
diff --git a/user_guide_src/source/testing/response/004.php b/user_guide_src/source/testing/response/004.php
new file mode 100644
index 000000000000..3cb56ea74b8f
--- /dev/null
+++ b/user_guide_src/source/testing/response/004.php
@@ -0,0 +1,5 @@
+<?php
+
+if ($result->isOK()) {
+    ...
+}
diff --git a/user_guide_src/source/testing/response/005.php b/user_guide_src/source/testing/response/005.php
new file mode 100644
index 000000000000..9c01964bc050
--- /dev/null
+++ b/user_guide_src/source/testing/response/005.php
@@ -0,0 +1,3 @@
+<?php
+
+$result->assertOK();
diff --git a/user_guide_src/source/testing/response/006.php b/user_guide_src/source/testing/response/006.php
new file mode 100644
index 000000000000..90da5662c383
--- /dev/null
+++ b/user_guide_src/source/testing/response/006.php
@@ -0,0 +1,5 @@
+<?php
+
+if ($result->isRedirect()) {
+    ...
+}
diff --git a/user_guide_src/source/testing/response/007.php b/user_guide_src/source/testing/response/007.php
new file mode 100644
index 000000000000..38b43a99b200
--- /dev/null
+++ b/user_guide_src/source/testing/response/007.php
@@ -0,0 +1,3 @@
+<?php
+
+$result->assertRedirect();
diff --git a/user_guide_src/source/testing/response/008.php b/user_guide_src/source/testing/response/008.php
new file mode 100644
index 000000000000..62b8da3db6af
--- /dev/null
+++ b/user_guide_src/source/testing/response/008.php
@@ -0,0 +1,3 @@
+<?php
+
+$result->assertRedirectTo('foo/bar');
diff --git a/user_guide_src/source/testing/response/009.php b/user_guide_src/source/testing/response/009.php
new file mode 100644
index 000000000000..ba58bc23bb9e
--- /dev/null
+++ b/user_guide_src/source/testing/response/009.php
@@ -0,0 +1,4 @@
+<?php
+
+$url = $result->getRedirectUrl();
+$this->assertEquals(site_url('foo/bar'), $url);
diff --git a/user_guide_src/source/testing/response/010.php b/user_guide_src/source/testing/response/010.php
new file mode 100644
index 000000000000..70faf34078e1
--- /dev/null
+++ b/user_guide_src/source/testing/response/010.php
@@ -0,0 +1,3 @@
+<?php
+
+$result->assertStatus(403);
diff --git a/user_guide_src/source/testing/response/011.php b/user_guide_src/source/testing/response/011.php
new file mode 100644
index 000000000000..e9fccd725002
--- /dev/null
+++ b/user_guide_src/source/testing/response/011.php
@@ -0,0 +1,3 @@
+<?php
+
+$result->assertSessionHas('logged_in', 123);
diff --git a/user_guide_src/source/testing/response/012.php b/user_guide_src/source/testing/response/012.php
new file mode 100644
index 000000000000..671330ac32a4
--- /dev/null
+++ b/user_guide_src/source/testing/response/012.php
@@ -0,0 +1,3 @@
+<?php
+
+$result->assertSessionMissin('logged_in');
diff --git a/user_guide_src/source/testing/response/013.php b/user_guide_src/source/testing/response/013.php
new file mode 100644
index 000000000000..761b39943842
--- /dev/null
+++ b/user_guide_src/source/testing/response/013.php
@@ -0,0 +1,3 @@
+<?php
+
+$result->assertHeader('Content-Type', 'text/html');
diff --git a/user_guide_src/source/testing/response/014.php b/user_guide_src/source/testing/response/014.php
new file mode 100644
index 000000000000..109ce46d1097
--- /dev/null
+++ b/user_guide_src/source/testing/response/014.php
@@ -0,0 +1,3 @@
+<?php
+
+$result->assertHeader('Accepts');
diff --git a/user_guide_src/source/testing/response/015.php b/user_guide_src/source/testing/response/015.php
new file mode 100644
index 000000000000..ded077e66a9b
--- /dev/null
+++ b/user_guide_src/source/testing/response/015.php
@@ -0,0 +1,3 @@
+<?php
+
+$result->assertCookie('foo', 'bar');
diff --git a/user_guide_src/source/testing/response/016.php b/user_guide_src/source/testing/response/016.php
new file mode 100644
index 000000000000..3aa73f14899a
--- /dev/null
+++ b/user_guide_src/source/testing/response/016.php
@@ -0,0 +1,3 @@
+<?php
+
+$result->assertCookieMissing('ci_session');
diff --git a/user_guide_src/source/testing/response/017.php b/user_guide_src/source/testing/response/017.php
new file mode 100644
index 000000000000..5ce2b3e2ab9f
--- /dev/null
+++ b/user_guide_src/source/testing/response/017.php
@@ -0,0 +1,3 @@
+<?php
+
+$result->assertCookieExpired('foo');
diff --git a/user_guide_src/source/testing/response/018.php b/user_guide_src/source/testing/response/018.php
new file mode 100644
index 000000000000..e6860f412e08
--- /dev/null
+++ b/user_guide_src/source/testing/response/018.php
@@ -0,0 +1,10 @@
+<?php
+
+// Check that "Hello World" is on the page
+$results->see('Hello World');
+// Check that "Hello World" is within an h1 tag
+$results->see('Hello World', 'h1');
+// Check that "Hello World" is within an element with the "notice" class
+$results->see('Hello World', '.notice');
+// Check that "Hello World" is within an element with id of "title"
+$results->see('Hellow World', '#title');
diff --git a/user_guide_src/source/testing/response/019.php b/user_guide_src/source/testing/response/019.php
new file mode 100644
index 000000000000..f96493b52e91
--- /dev/null
+++ b/user_guide_src/source/testing/response/019.php
@@ -0,0 +1,6 @@
+<?php
+
+// Checks that "Hello World" does NOT exist on the page
+$results->dontSee('Hello World');
+// Checks that "Hellow World" does NOT exist within any h1 tag
+$results->dontSee('Hello World', 'h1');
diff --git a/user_guide_src/source/testing/response/020.php b/user_guide_src/source/testing/response/020.php
new file mode 100644
index 000000000000..cb490d8a98ff
--- /dev/null
+++ b/user_guide_src/source/testing/response/020.php
@@ -0,0 +1,8 @@
+<?php
+
+// Check that an element with class 'notice' exists
+$results->seeElement('.notice');
+// Check that an element with id 'title' exists
+$results->seeElement('#title')
+// Verify that an element with id 'title' does NOT exist
+$results->dontSeeElement('#title');
diff --git a/user_guide_src/source/testing/response/021.php b/user_guide_src/source/testing/response/021.php
new file mode 100644
index 000000000000..bc74e3ad9124
--- /dev/null
+++ b/user_guide_src/source/testing/response/021.php
@@ -0,0 +1,6 @@
+<?php
+
+// Check that a link exists with 'Upgrade Account' as the text::
+$results->seeLink('Upgrade Account');
+// Check that a link exists with 'Upgrade Account' as the text, AND a class of 'upsell'
+$results->seeLink('Upgrade Account', '.upsell');
diff --git a/user_guide_src/source/testing/response/022.php b/user_guide_src/source/testing/response/022.php
new file mode 100644
index 000000000000..9bb549c9db5f
--- /dev/null
+++ b/user_guide_src/source/testing/response/022.php
@@ -0,0 +1,6 @@
+<?php
+
+// Check that an input exists named 'user' with the value 'John Snow'
+$results->seeInField('user', 'John Snow');
+// Check a multi-dimensional input
+$results->seeInField('user[name]', 'John Snow');
diff --git a/user_guide_src/source/testing/response/023.php b/user_guide_src/source/testing/response/023.php
new file mode 100644
index 000000000000..3378144f6eb7
--- /dev/null
+++ b/user_guide_src/source/testing/response/023.php
@@ -0,0 +1,6 @@
+<?php
+
+// Check if checkbox is checked with class of 'foo'
+$results->seeCheckboxIsChecked('.foo');
+// Check if checkbox with id of 'bar' is checked
+$results->seeCheckboxIsChecked('#bar');
diff --git a/user_guide_src/source/testing/response/024.php b/user_guide_src/source/testing/response/024.php
new file mode 100644
index 000000000000..021910b4e3f7
--- /dev/null
+++ b/user_guide_src/source/testing/response/024.php
@@ -0,0 +1,10 @@
+<?php
+
+// Check that "Hello World" is on the page
+$result->assertSee('Hello World');
+// Check that "Hello World" is within an h1 tag
+$result->assertSee('Hello World', 'h1');
+// Check that "Hello World" is within an element with the "notice" class
+$result->assertSee('Hello World', '.notice');
+// Check that "Hello World" is within an element with id of "title"
+$result->assertSee('Hellow World', '#title');
diff --git a/user_guide_src/source/testing/response/025.php b/user_guide_src/source/testing/response/025.php
new file mode 100644
index 000000000000..b255f4155ac5
--- /dev/null
+++ b/user_guide_src/source/testing/response/025.php
@@ -0,0 +1,6 @@
+<?php
+
+// Checks that "Hello World" does NOT exist on the page
+$results->dontSee('Hello World');
+// Checks that "Hello World" does NOT exist within any h1 tag
+$results->dontSee('Hello World', 'h1');
diff --git a/user_guide_src/source/testing/response/026.php b/user_guide_src/source/testing/response/026.php
new file mode 100644
index 000000000000..773b7dd04833
--- /dev/null
+++ b/user_guide_src/source/testing/response/026.php
@@ -0,0 +1,6 @@
+<?php
+
+// Check that an element with class 'notice' exists
+$results->seeElement('.notice');
+// Check that an element with id 'title' exists
+$results->seeElement('#title')
diff --git a/user_guide_src/source/testing/response/027.php b/user_guide_src/source/testing/response/027.php
new file mode 100644
index 000000000000..9780489133ee
--- /dev/null
+++ b/user_guide_src/source/testing/response/027.php
@@ -0,0 +1,4 @@
+<?php
+
+// Verify that an element with id 'title' does NOT exist
+$results->dontSeeElement('#title');
diff --git a/user_guide_src/source/testing/response/028.php b/user_guide_src/source/testing/response/028.php
new file mode 100644
index 000000000000..bc74e3ad9124
--- /dev/null
+++ b/user_guide_src/source/testing/response/028.php
@@ -0,0 +1,6 @@
+<?php
+
+// Check that a link exists with 'Upgrade Account' as the text::
+$results->seeLink('Upgrade Account');
+// Check that a link exists with 'Upgrade Account' as the text, AND a class of 'upsell'
+$results->seeLink('Upgrade Account', '.upsell');
diff --git a/user_guide_src/source/testing/response/029.php b/user_guide_src/source/testing/response/029.php
new file mode 100644
index 000000000000..1ae7910e9776
--- /dev/null
+++ b/user_guide_src/source/testing/response/029.php
@@ -0,0 +1,6 @@
+<?php
+
+// Check that an input exists named 'user' with the value 'John Snow'
+$results->assertSeeInField('user', 'John Snow');
+// Check a multi-dimensional input
+$results->assertSeeInField('user[name]', 'John Snow');
diff --git a/user_guide_src/source/testing/response/030.php b/user_guide_src/source/testing/response/030.php
new file mode 100644
index 000000000000..e6417035e73f
--- /dev/null
+++ b/user_guide_src/source/testing/response/030.php
@@ -0,0 +1,11 @@
+<?php
+
+// Response body is this:
+['foo' => 'bar']
+
+$json = $result->getJSON();
+
+// $json is this:
+{
+    "foo": "bar"
+}
diff --git a/user_guide_src/source/testing/response/031.php b/user_guide_src/source/testing/response/031.php
new file mode 100644
index 000000000000..0c9ded88a7f5
--- /dev/null
+++ b/user_guide_src/source/testing/response/031.php
@@ -0,0 +1,4 @@
+<?php
+
+// Verify the response is JSON
+$this->assertTrue($result->getJSON() !== false)
diff --git a/user_guide_src/source/testing/response/032.php b/user_guide_src/source/testing/response/032.php
new file mode 100644
index 000000000000..e808ca1a43dd
--- /dev/null
+++ b/user_guide_src/source/testing/response/032.php
@@ -0,0 +1,9 @@
+<?php
+
+// Response body is this:
+[
+    'config' => ['key-a', 'key-b'],
+]
+
+// Is true
+$result->assertJSONFragment(['config' => ['key-a']]);
diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index 81a84e71f927..acf04e52d0f6 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -11,11 +11,10 @@ Enable CSRF Filter
 
 Before creating a form, let's enable the CSRF protection.
 
-Open the **app/Config/Filters.php** file and update the ``$methods`` property like the following::
+Open the **app/Config/Filters.php** file and update the ``$methods`` property like the following:
 
-    public $methods = [
-        'post' => ['csrf'],
-    ];
+.. literalinclude:: create_news_items/001.php
+   :lines: 2-
 
 It configures the CSRF filter to be enabled for all **POST** requests.
 You can read more about the CSRF protection in :doc:`Security </libraries/security>` library.
@@ -67,29 +66,8 @@ check whether the form was submitted and whether the submitted data
 passed the validation rules. You'll use the :doc:`form
 validation <../libraries/validation>` library to do this.
 
-::
-
-    public function create()
-    {
-        $model = model(NewsModel::class);
-
-        if ($this->request->getMethod() === 'post' && $this->validate([
-            'title' => 'required|min_length[3]|max_length[255]',
-            'body'  => 'required',
-        ])) {
-            $model->save([
-                'title' => $this->request->getPost('title'),
-                'slug'  => url_title($this->request->getPost('title'), '-', true),
-                'body'  => $this->request->getPost('body'),
-            ]);
-
-            echo view('news/success');
-        } else {
-            echo view('templates/header', ['title' => 'Create a news item']);
-            echo view('news/create');
-            echo view('templates/footer');
-        }
-    }
+.. literalinclude:: create_news_items/002.php
+   :lines: 2-
 
 The code above adds a lot of functionality. First we load the NewsModel.
 After that, we check if we deal with the **POST** request and then
@@ -134,20 +112,7 @@ not actually save any data because it doesn't know what fields are
 safe to be updated. Edit the **NewsModel** to provide it a list of updatable
 fields in the ``$allowedFields`` property.
 
-::
-
-    <?php
-
-    namespace App\Models;
-
-    use CodeIgniter\Model;
-
-    class NewsModel extends Model
-    {
-        protected $table = 'news';
-
-        protected $allowedFields = ['title', 'slug', 'body'];
-    }
+.. literalinclude:: create_news_items/003.php
 
 This new property now contains the fields that we allow to be saved to the
 database. Notice that we leave out the ``id``? That's because you will almost
@@ -164,12 +129,8 @@ file contains the following. This makes sure CodeIgniter sees ``create``
 as a method instead of a news item's slug. You can read more about different
 routing types :doc:`here </incoming/routing>`.
 
-::
-
-    $routes->match(['get', 'post'], 'news/create', 'News::create');
-    $routes->get('news/(:segment)', 'News::view/$1');
-    $routes->get('news', 'News::index');
-    $routes->get('(:any)', 'Pages::view/$1');
+.. literalinclude:: create_news_items/004.php
+   :lines: 2-
 
 Now point your browser to your local development environment where you
 installed CodeIgniter and add ``/news/create`` to the URL.
diff --git a/user_guide_src/source/tutorial/create_news_items/001.php b/user_guide_src/source/tutorial/create_news_items/001.php
new file mode 100644
index 000000000000..80d86db34633
--- /dev/null
+++ b/user_guide_src/source/tutorial/create_news_items/001.php
@@ -0,0 +1,5 @@
+<?php
+
+public $methods = [
+    'post' => ['csrf'],
+];
diff --git a/user_guide_src/source/tutorial/create_news_items/002.php b/user_guide_src/source/tutorial/create_news_items/002.php
new file mode 100644
index 000000000000..2dc230c3a720
--- /dev/null
+++ b/user_guide_src/source/tutorial/create_news_items/002.php
@@ -0,0 +1,23 @@
+<?php
+
+public function create()
+{
+    $model = model(NewsModel::class);
+
+    if ($this->request->getMethod() === 'post' && $this->validate([
+        'title' => 'required|min_length[3]|max_length[255]',
+        'body'  => 'required',
+    ])) {
+        $model->save([
+            'title' => $this->request->getPost('title'),
+            'slug'  => url_title($this->request->getPost('title'), '-', true),
+            'body'  => $this->request->getPost('body'),
+        ]);
+
+        echo view('news/success');
+    } else {
+        echo view('templates/header', ['title' => 'Create a news item']);
+        echo view('news/create');
+        echo view('templates/footer');
+    }
+}
diff --git a/user_guide_src/source/tutorial/create_news_items/003.php b/user_guide_src/source/tutorial/create_news_items/003.php
new file mode 100644
index 000000000000..83e03f18eb2b
--- /dev/null
+++ b/user_guide_src/source/tutorial/create_news_items/003.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class NewsModel extends Model
+{
+    protected $table = 'news';
+
+    protected $allowedFields = ['title', 'slug', 'body'];
+}
diff --git a/user_guide_src/source/tutorial/create_news_items/004.php b/user_guide_src/source/tutorial/create_news_items/004.php
new file mode 100644
index 000000000000..c8c66824fd82
--- /dev/null
+++ b/user_guide_src/source/tutorial/create_news_items/004.php
@@ -0,0 +1,6 @@
+<?php
+
+$routes->match(['get', 'post'], 'news/create', 'News::create');
+$routes->get('news/(:segment)', 'News::view/$1');
+$routes->get('news', 'News::index');
+$routes->get('(:any)', 'Pages::view/$1');
diff --git a/user_guide_src/source/tutorial/index.rst b/user_guide_src/source/tutorial/index.rst
index 798341a6ce96..35cb5ba9ba7f 100644
--- a/user_guide_src/source/tutorial/index.rst
+++ b/user_guide_src/source/tutorial/index.rst
@@ -84,7 +84,6 @@ command line from the root of your project::
 
     > php spark serve
 
-
 The Welcome Page
 ****************
 
@@ -127,6 +126,5 @@ There are a couple of things to note here:
 
 Everything else should be clear when you see it.
 
-
 Now that we know how to get started and how to debug a little, let's get started building this
 small news application.
diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
index 396c74255962..3e5c7b0dd631 100644
--- a/user_guide_src/source/tutorial/news_section.rst
+++ b/user_guide_src/source/tutorial/news_section.rst
@@ -75,18 +75,7 @@ You can read more about it :doc:`here </models/model>`.
 Open up the **app/Models/** directory and create a new file called
 **NewsModel.php** and add the following code.
 
-::
-
-    <?php
-
-    namespace App\Models;
-
-    use CodeIgniter\Model;
-
-    class NewsModel extends Model
-    {
-        protected $table = 'news';
-    }
+.. literalinclude:: news_section/001.php
 
 This code looks similar to the controller code that was used earlier. It
 creates a new model by extending ``CodeIgniter\Model`` and loads the database
@@ -103,16 +92,8 @@ also allows you to easily work with the Query Builder and provides
 some additional tools to make working with data simpler. Add the
 following code to your model.
 
-::
-
-    public function getNews($slug = false)
-    {
-        if ($slug === false) {
-            return $this->findAll();
-        }
-
-        return $this->where(['slug' => $slug])->first();
-    }
+.. literalinclude:: news_section/002.php
+   :lines: 2-
 
 With this code, you can perform two different queries. You can get all
 news records, or get a news item by its slug. You might have
@@ -135,30 +116,7 @@ in our ``Pages`` controller created earlier, but for the sake of clarity,
 a new ``News`` controller is defined. Create the new controller at
 **app/Controllers/News.php**.
 
-::
-
-    <?php
-
-    namespace App\Controllers;
-
-    use App\Models\NewsModel;
-
-    class News extends BaseController
-    {
-        public function index()
-        {
-            $model = model(NewsModel::class);
-
-            $data['news'] = $model->getNews();
-        }
-
-        public function view($slug = null)
-        {
-            $model = model(NewsModel::class);
-
-            $data['news'] = $model->getNews($slug);
-        }
-    }
+.. literalinclude:: news_section/003.php
 
 Looking at the code, you may see some similarity with the files we
 created earlier. First, it extends a core CodeIgniter class, ``Controller``,
@@ -179,21 +137,10 @@ news item to be returned.
 
 Now the data is retrieved by the controller through our model, but
 nothing is displayed yet. The next thing to do is, passing this data to
-the views. Modify the ``index()`` method to look like this::
-
-    public function index()
-    {
-        $model = model(NewsModel::class);
-
-        $data = [
-            'news'  => $model->getNews(),
-            'title' => 'News archive',
-        ];
+the views. Modify the ``index()`` method to look like this:
 
-        echo view('templates/header', $data);
-        echo view('news/overview', $data);
-        echo view('templates/footer', $data);
-    }
+.. literalinclude:: news_section/004.php
+   :lines: 2-
 
 The code above gets all news records from the model and assigns it to a
 variable. The value for the title is also assigned to the ``$data['title']``
@@ -201,31 +148,7 @@ element and all data is passed to the views. You now need to create a
 view to render the news items. Create **app/Views/news/overview.php**
 and add the next piece of code.
 
-::
-
-    <h2><?= esc($title) ?></h2>
-
-    <?php if (! empty($news) && is_array($news)): ?>
-
-        <?php foreach ($news as $news_item): ?>
-
-            <h3><?= esc($news_item['title']) ?></h3>
-
-            <div class="main">
-                <?= esc($news_item['body']) ?>
-            </div>
-            <p><a href="/news/<?= esc($news_item['slug'], 'url') ?>">View article</a></p>
-
-        <?php endforeach ?>
-
-    <?php else: ?>
-
-        <h3>No News</h3>
-
-        <p>Unable to find any news for you.</p>
-
-    <?php endif ?>
-
+.. literalinclude:: news_section/005.php
 
 .. note:: We are again using using ``esc()`` to help prevent XSS attacks.
     But this time we also passed "url" as a second parameter. That's because
@@ -243,34 +166,15 @@ a way that it can easily be used for this functionality. You only need to
 add some code to the controller and create a new view. Go back to the
 ``News`` controller and update the ``view()`` method with the following:
 
-::
-
-    public function view($slug = null)
-    {
-        $model = model(NewsModel::class);
-
-        $data['news'] = $model->getNews($slug);
-
-        if (empty($data['news'])) {
-            throw new \CodeIgniter\Exceptions\PageNotFoundException('Cannot find the news item: ' . $slug);
-        }
-
-        $data['title'] = $data['news']['title'];
-
-        echo view('templates/header', $data);
-        echo view('news/view', $data);
-        echo view('templates/footer', $data);
-    }
+.. literalinclude:: news_section/006.php
+   :lines: 2-
 
 Instead of calling the ``getNews()`` method without a parameter, the
 ``$slug`` variable is passed, so it will return the specific news item.
 The only thing left to do is create the corresponding view at
 **app/Views/news/view.php**. Put the following code in this file.
 
-::
-
-    <h2><?= esc($news['title']) ?></h2>
-    <p><?= esc($news['body']) ?></p>
+.. literalinclude:: news_section/007.php
 
 Routing
 -------------------------------------------------------
@@ -282,11 +186,8 @@ This makes sure the requests reach the ``News`` controller instead of
 going directly to the ``Pages`` controller. The first line routes URI's
 with a slug to the ``view()`` method in the ``News`` controller.
 
-::
-
-    $routes->get('news/(:segment)', 'News::view/$1');
-    $routes->get('news', 'News::index');
-    $routes->get('(:any)', 'Pages::view/$1');
+.. literalinclude:: news_section/008.php
+   :lines: 2-
 
 Point your browser to your "news" page, i.e., ``localhost:8080/news``,
 you should see a list of the news items, each of which has a link
diff --git a/user_guide_src/source/tutorial/news_section/001.php b/user_guide_src/source/tutorial/news_section/001.php
new file mode 100644
index 000000000000..b565d4a82f25
--- /dev/null
+++ b/user_guide_src/source/tutorial/news_section/001.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class NewsModel extends Model
+{
+    protected $table = 'news';
+}
diff --git a/user_guide_src/source/tutorial/news_section/002.php b/user_guide_src/source/tutorial/news_section/002.php
new file mode 100644
index 000000000000..bf8f4217be57
--- /dev/null
+++ b/user_guide_src/source/tutorial/news_section/002.php
@@ -0,0 +1,10 @@
+<?php
+
+public function getNews($slug = false)
+{
+    if ($slug === false) {
+        return $this->findAll();
+    }
+
+    return $this->where(['slug' => $slug])->first();
+}
diff --git a/user_guide_src/source/tutorial/news_section/003.php b/user_guide_src/source/tutorial/news_section/003.php
new file mode 100644
index 000000000000..13c3b7263db6
--- /dev/null
+++ b/user_guide_src/source/tutorial/news_section/003.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Controllers;
+
+use App\Models\NewsModel;
+
+class News extends BaseController
+{
+    public function index()
+    {
+        $model = model(NewsModel::class);
+
+        $data['news'] = $model->getNews();
+    }
+
+    public function view($slug = null)
+    {
+        $model = model(NewsModel::class);
+
+        $data['news'] = $model->getNews($slug);
+    }
+}
diff --git a/user_guide_src/source/tutorial/news_section/004.php b/user_guide_src/source/tutorial/news_section/004.php
new file mode 100644
index 000000000000..0fac31909775
--- /dev/null
+++ b/user_guide_src/source/tutorial/news_section/004.php
@@ -0,0 +1,15 @@
+<?php
+
+public function index()
+{
+    $model = model(NewsModel::class);
+
+    $data = [
+        'news'  => $model->getNews(),
+        'title' => 'News archive',
+    ];
+
+    echo view('templates/header', $data);
+    echo view('news/overview', $data);
+    echo view('templates/footer', $data);
+}
diff --git a/user_guide_src/source/tutorial/news_section/005.php b/user_guide_src/source/tutorial/news_section/005.php
new file mode 100644
index 000000000000..39db0a4319f7
--- /dev/null
+++ b/user_guide_src/source/tutorial/news_section/005.php
@@ -0,0 +1,22 @@
+<h2><?= esc($title) ?></h2>
+
+<?php if (! empty($news) && is_array($news)): ?>
+
+    <?php foreach ($news as $news_item): ?>
+
+        <h3><?= esc($news_item['title']) ?></h3>
+
+        <div class="main">
+            <?= esc($news_item['body']) ?>
+        </div>
+        <p><a href="/news/<?= esc($news_item['slug'], 'url') ?>">View article</a></p>
+
+    <?php endforeach ?>
+
+<?php else: ?>
+
+    <h3>No News</h3>
+
+    <p>Unable to find any news for you.</p>
+
+<?php endif ?>
diff --git a/user_guide_src/source/tutorial/news_section/006.php b/user_guide_src/source/tutorial/news_section/006.php
new file mode 100644
index 000000000000..ea7331dbf77f
--- /dev/null
+++ b/user_guide_src/source/tutorial/news_section/006.php
@@ -0,0 +1,18 @@
+<?php
+
+public function view($slug = null)
+{
+    $model = model(NewsModel::class);
+
+    $data['news'] = $model->getNews($slug);
+
+    if (empty($data['news'])) {
+        throw new \CodeIgniter\Exceptions\PageNotFoundException('Cannot find the news item: ' . $slug);
+    }
+
+    $data['title'] = $data['news']['title'];
+
+    echo view('templates/header', $data);
+    echo view('news/view', $data);
+    echo view('templates/footer', $data);
+}
diff --git a/user_guide_src/source/tutorial/news_section/007.php b/user_guide_src/source/tutorial/news_section/007.php
new file mode 100644
index 000000000000..9975baad0cbb
--- /dev/null
+++ b/user_guide_src/source/tutorial/news_section/007.php
@@ -0,0 +1,2 @@
+<h2><?= esc($news['title']) ?></h2>
+<p><?= esc($news['body']) ?></p>
diff --git a/user_guide_src/source/tutorial/news_section/008.php b/user_guide_src/source/tutorial/news_section/008.php
new file mode 100644
index 000000000000..8943925258bd
--- /dev/null
+++ b/user_guide_src/source/tutorial/news_section/008.php
@@ -0,0 +1,5 @@
+<?php
+
+$routes->get('news/(:segment)', 'News::view/$1');
+$routes->get('news', 'News::index');
+$routes->get('(:any)', 'Pages::view/$1');
diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
index ecf6e87e03c5..0b64ca40baba 100644
--- a/user_guide_src/source/tutorial/static_pages.rst
+++ b/user_guide_src/source/tutorial/static_pages.rst
@@ -33,25 +33,7 @@ Let's make our first controller
 Create a file at **app/Controllers/Pages.php** with the following
 code.
 
-::
-
-    <?php
-
-    namespace App\Controllers;
-
-    class Pages extends BaseController
-    {
-        public function index()
-        {
-            return view('welcome_message');
-        }
-
-        public function view($page = 'home')
-        {
-            // ...
-        }
-    }
-
+.. literalinclude:: static_pages/001.php
 
 You have created a class named ``Pages``, with a ``view()`` method that accepts
 one argument named ``$page``. It also has an ``index()`` method, the same
@@ -78,9 +60,7 @@ templates. We will be creating two "views" (page templates) that act as
 our page footer and header.
 
 Create the header at **app/Views/templates/header.php** and add
-the following code:
-
-::
+the following code::
 
     <!doctype html>
     <html>
@@ -95,9 +75,7 @@ The header contains the basic HTML code that you'll want to display
 before loading the main view, together with a heading. It will also
 output the ``$title`` variable, which we'll define later in the controller.
 Now, create a footer at **app/Views/templates/footer.php** that
-includes the following code:
-
-::
+includes the following code::
 
         <em>&copy; 2021</em>
     </body>
@@ -123,21 +101,8 @@ In order to load those pages, you'll have to check whether the requested
 page actually exists. This will be the body of the ``view()`` method
 in the ``Pages`` controller created above:
 
-::
-
-    public function view($page = 'home')
-    {
-        if (! is_file(APPPATH . 'Views/pages/' . $page . '.php')) {
-            // Whoops, we don't have a page for that!
-            throw new \CodeIgniter\Exceptions\PageNotFoundException($page);
-        }
-
-        $data['title'] = ucfirst($page); // Capitalize the first letter
-
-        echo view('templates/header', $data);
-        echo view('pages/' . $page, $data);
-        echo view('templates/footer', $data);
-    }
+.. literalinclude:: static_pages/002.php
+   :lines: 2-
 
 Now, when the requested page does exist, it is loaded, including the header and
 footer, and displayed to the user. If the requested page doesn't exist, a "404
@@ -212,7 +177,6 @@ controller you made above produces...
     |                                 | `app/Views/pages/shop.php`                                      |
     +---------------------------------+-----------------------------------------------------------------+
 
-
 Routing
 -------------------------------------------------------
 
@@ -231,18 +195,16 @@ section of the configuration file.
 
 The only uncommented line there to start with should be:
 
-::
-
-    $routes->get('/', 'Home::index');
+.. literalinclude:: static_pages/003.php
+   :lines: 2-
 
 This directive says that any incoming request without any content
 specified should be handled by the ``index()`` method inside the ``Home`` controller.
 
 Add the following line, **after** the route directive for '/'.
 
-::
-
-    $routes->get('(:any)', 'Pages::view/$1');
+.. literalinclude:: static_pages/004.php
+   :lines: 2-
 
 CodeIgniter reads its routing rules from top to bottom and routes the
 request to the first matching rule. Each rule is a regular expression
diff --git a/user_guide_src/source/tutorial/static_pages/001.php b/user_guide_src/source/tutorial/static_pages/001.php
new file mode 100644
index 000000000000..0cedb8e44906
--- /dev/null
+++ b/user_guide_src/source/tutorial/static_pages/001.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Controllers;
+
+class Pages extends BaseController
+{
+    public function index()
+    {
+        return view('welcome_message');
+    }
+
+    public function view($page = 'home')
+    {
+        // ...
+    }
+}
diff --git a/user_guide_src/source/tutorial/static_pages/002.php b/user_guide_src/source/tutorial/static_pages/002.php
new file mode 100644
index 000000000000..4f5901845f9d
--- /dev/null
+++ b/user_guide_src/source/tutorial/static_pages/002.php
@@ -0,0 +1,15 @@
+<?php
+
+public function view($page = 'home')
+{
+    if (! is_file(APPPATH . 'Views/pages/' . $page . '.php')) {
+        // Whoops, we don't have a page for that!
+        throw new \CodeIgniter\Exceptions\PageNotFoundException($page);
+    }
+
+    $data['title'] = ucfirst($page); // Capitalize the first letter
+
+    echo view('templates/header', $data);
+    echo view('pages/' . $page, $data);
+    echo view('templates/footer', $data);
+}
diff --git a/user_guide_src/source/tutorial/static_pages/003.php b/user_guide_src/source/tutorial/static_pages/003.php
new file mode 100644
index 000000000000..d799d1cf0fb5
--- /dev/null
+++ b/user_guide_src/source/tutorial/static_pages/003.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->get('/', 'Home::index');
diff --git a/user_guide_src/source/tutorial/static_pages/004.php b/user_guide_src/source/tutorial/static_pages/004.php
new file mode 100644
index 000000000000..f998b89762fd
--- /dev/null
+++ b/user_guide_src/source/tutorial/static_pages/004.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->get('(:any)', 'Pages::view/$1');

From c18c392c01d009a6fb068871e4f8fdf714ad42f1 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Sun, 20 Feb 2022 00:04:17 +0100
Subject: [PATCH 1600/2325] Segregate duplicates.

---
 user_guide_src/source/libraries/publisher.rst        | 2 +-
 user_guide_src/source/libraries/sessions.rst         | 4 ++--
 user_guide_src/source/libraries/sessions/005-1.php   | 3 +++
 user_guide_src/source/libraries/sessions/005-2.php   | 3 +++
 user_guide_src/source/outgoing/view_parser.rst       | 2 +-
 user_guide_src/source/outgoing/view_parser/021-1.php | 3 +++
 user_guide_src/source/testing/response.rst           | 2 +-
 user_guide_src/source/testing/response/021-2.php     | 6 ++++++
 8 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 user_guide_src/source/libraries/sessions/005-1.php
 create mode 100644 user_guide_src/source/libraries/sessions/005-2.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/021-1.php
 create mode 100644 user_guide_src/source/testing/response/021-2.php

diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
index 3657a124317c..ebe0716d2bcb 100644
--- a/user_guide_src/source/libraries/publisher.rst
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -39,7 +39,7 @@ On Demand
 
 Access ``Publisher`` directly by instantiating a new instance of the class:
 
-.. literalinclude:: publisher/001.php
+.. literalinclude:: publisher/002.php
    :lines: 2-
 
 By default the source and destination will be set to ``ROOTPATH`` and ``FCPATH`` respectively, giving ``Publisher``
diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
index 889ad559d8bb..fcab322aa3d9 100644
--- a/user_guide_src/source/libraries/sessions.rst
+++ b/user_guide_src/source/libraries/sessions.rst
@@ -119,7 +119,7 @@ Retrieving Session Data
 Any piece of information from the session array is available through the
 ``$_SESSION`` superglobal:
 
-.. literalinclude:: sessions/005.php
+.. literalinclude:: sessions/005-2.php
    :lines: 2-
 
 Or through the conventional accessor method:
@@ -335,7 +335,7 @@ You can also pass an array to ``setTempdata()``:
 To read a tempdata variable, again you can just access it through the
 ``$_SESSION`` superglobal array:
 
-.. literalinclude:: sessions/005.php
+.. literalinclude:: sessions/005-1.php
    :lines: 2-
 
 .. important:: The ``get()`` method WILL return tempdata items when
diff --git a/user_guide_src/source/libraries/sessions/005-1.php b/user_guide_src/source/libraries/sessions/005-1.php
new file mode 100644
index 000000000000..4f09358d5fc8
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/005-1.php
@@ -0,0 +1,3 @@
+<?php
+
+$_SESSION['item']
diff --git a/user_guide_src/source/libraries/sessions/005-2.php b/user_guide_src/source/libraries/sessions/005-2.php
new file mode 100644
index 000000000000..4f09358d5fc8
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/005-2.php
@@ -0,0 +1,3 @@
+<?php
+
+$_SESSION['item']
diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index 3013be1c2690..4681711398d0 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -608,7 +608,7 @@ Class Reference
 
         Builds the output based upon a provided template source and any data that has already been set:
 
-        .. literalinclude:: view_parser/021.php
+        .. literalinclude:: view_parser/021-1.php
            :lines: 2-
 
         Options supported, and behavior, as above.
diff --git a/user_guide_src/source/outgoing/view_parser/021-1.php b/user_guide_src/source/outgoing/view_parser/021-1.php
new file mode 100644
index 000000000000..022450bb6fd6
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/021-1.php
@@ -0,0 +1,3 @@
+<?php
+
+echo $parser->render('myview');
diff --git a/user_guide_src/source/testing/response.rst b/user_guide_src/source/testing/response.rst
index e695064825fe..ae6eb2deb97e 100644
--- a/user_guide_src/source/testing/response.rst
+++ b/user_guide_src/source/testing/response.rst
@@ -178,7 +178,7 @@ values of the elements. Instead, they simply check that the elements exist on th
 
 You can use **seeLink()** to ensure that a link appears on the page with the specified text:
 
-.. literalinclude:: response/021.php
+.. literalinclude:: response/021-2.php
    :lines: 2-
 
 The **seeInField()** method checks for any input tags exist with the name and value:
diff --git a/user_guide_src/source/testing/response/021-2.php b/user_guide_src/source/testing/response/021-2.php
new file mode 100644
index 000000000000..bc74e3ad9124
--- /dev/null
+++ b/user_guide_src/source/testing/response/021-2.php
@@ -0,0 +1,6 @@
+<?php
+
+// Check that a link exists with 'Upgrade Account' as the text::
+$results->seeLink('Upgrade Account');
+// Check that a link exists with 'Upgrade Account' as the text, AND a class of 'upsell'
+$results->seeLink('Upgrade Account', '.upsell');

From a85a2e843ef01971af68e9068c27e1c8c60676db Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Sun, 20 Feb 2022 09:04:37 +0100
Subject: [PATCH 1601/2325] Renumerate examples.

---
 user_guide_src/source/helpers/url_helper.rst  | 44 ++++-----
 .../source/helpers/url_helper/002-2.php       |  3 -
 .../source/helpers/url_helper/002-3.php       |  3 -
 .../source/helpers/url_helper/002-4.php       |  3 -
 .../source/helpers/url_helper/003.php         |  2 +-
 .../source/helpers/url_helper/004.php         |  2 +-
 .../source/helpers/url_helper/005.php         |  9 +-
 .../source/helpers/url_helper/006.php         | 13 +--
 .../source/helpers/url_helper/007.php         |  2 +-
 .../source/helpers/url_helper/008.php         |  9 +-
 .../source/helpers/url_helper/009.php         | 14 ++-
 .../source/helpers/url_helper/010.php         |  2 +-
 .../source/helpers/url_helper/011.php         |  2 +-
 .../source/helpers/url_helper/012.php         |  3 +-
 .../source/helpers/url_helper/013.php         |  2 +-
 .../source/helpers/url_helper/014.php         |  4 +-
 .../source/helpers/url_helper/015.php         |  4 +-
 .../source/helpers/url_helper/016.php         |  4 +-
 .../source/helpers/url_helper/017.php         |  4 +-
 .../source/helpers/url_helper/018.php         |  4 +-
 .../source/helpers/url_helper/019.php         |  4 +-
 .../source/helpers/url_helper/020.php         |  2 +-
 .../source/helpers/url_helper/021.php         |  2 +-
 .../source/helpers/url_helper/022.php         |  3 +
 .../source/helpers/url_helper/023.php         |  3 +
 .../source/helpers/url_helper/024.php         |  3 +
 user_guide_src/source/incoming/routing.rst    | 96 +++++++++----------
 .../source/incoming/routing/000.php           |  3 -
 .../source/incoming/routing/001.php           |  6 +-
 .../source/incoming/routing/002.php           |  6 +-
 .../source/incoming/routing/003.php           |  4 +-
 .../source/incoming/routing/004.php           |  2 +-
 .../source/incoming/routing/005.php           |  2 +-
 .../source/incoming/routing/006.php           |  2 +-
 .../source/incoming/routing/007.php           |  2 +-
 .../source/incoming/routing/008.php           |  6 +-
 .../source/incoming/routing/009.php           |  2 +-
 .../source/incoming/routing/010.php           |  3 +-
 .../source/incoming/routing/011.php           |  6 +-
 .../source/incoming/routing/012.php           |  2 +-
 .../source/incoming/routing/013.php           |  7 +-
 .../source/incoming/routing/014.php           |  7 +-
 .../source/incoming/routing/015.php           |  7 +-
 .../source/incoming/routing/016.php           |  7 +-
 .../source/incoming/routing/017.php           |  9 +-
 .../source/incoming/routing/018.php           |  9 +-
 .../source/incoming/routing/019.php           |  5 +-
 .../source/incoming/routing/020.php           |  6 +-
 .../source/incoming/routing/021.php           |  4 +-
 .../source/incoming/routing/022.php           | 11 +--
 .../source/incoming/routing/023-2.php         |  3 -
 .../source/incoming/routing/023.php           | 11 +--
 .../source/incoming/routing/024.php           |  6 +-
 .../source/incoming/routing/025.php           |  7 +-
 .../source/incoming/routing/026.php           |  7 +-
 .../source/incoming/routing/027.php           | 13 +--
 .../source/incoming/routing/028.php           |  2 +-
 .../source/incoming/routing/029.php           | 13 ++-
 .../source/incoming/routing/030.php           |  2 +-
 .../source/incoming/routing/031.php           |  2 +-
 .../source/incoming/routing/032.php           |  3 +-
 .../source/incoming/routing/033.php           |  2 +-
 .../source/incoming/routing/034.php           |  4 +-
 .../source/incoming/routing/035.php           |  3 +-
 .../source/incoming/routing/036.php           |  6 +-
 .../source/incoming/routing/037.php           | 12 +--
 .../source/incoming/routing/038.php           |  5 +-
 .../source/incoming/routing/039.php           | 13 ++-
 .../source/incoming/routing/040.php           |  8 +-
 .../source/incoming/routing/041.php           |  9 +-
 .../source/incoming/routing/042.php           |  8 +-
 .../source/incoming/routing/043.php           |  3 +-
 .../source/incoming/routing/044.php           |  2 +-
 .../source/incoming/routing/045.php           |  9 +-
 .../source/incoming/routing/046.php           |  6 +-
 .../source/incoming/routing/047.php           | 10 ++
 .../source/incoming/routing/048.php           |  7 ++
 user_guide_src/source/libraries/sessions.rst  |  6 +-
 .../source/libraries/sessions/005-1.php       |  3 -
 .../source/libraries/sessions/005-2.php       |  3 -
 .../source/libraries/uploaded_files.rst       | 46 ++++-----
 .../source/libraries/uploaded_files/000.php   | 23 -----
 .../source/libraries/uploaded_files/001.php   | 57 ++++-------
 .../source/libraries/uploaded_files/002.php   | 47 ++++++++-
 .../source/libraries/uploaded_files/003.php   |  4 +-
 .../source/libraries/uploaded_files/004.php   |  6 +-
 .../source/libraries/uploaded_files/005.php   |  4 +-
 .../source/libraries/uploaded_files/006.php   | 10 +-
 .../source/libraries/uploaded_files/007.php   |  2 +-
 .../source/libraries/uploaded_files/008.php   |  9 +-
 .../source/libraries/uploaded_files/009.php   | 10 +-
 .../source/libraries/uploaded_files/010.php   |  3 +-
 .../source/libraries/uploaded_files/011.php   |  3 +-
 .../source/libraries/uploaded_files/012.php   |  5 +-
 .../source/libraries/uploaded_files/013.php   |  4 +-
 .../source/libraries/uploaded_files/014.php   |  2 +-
 .../source/libraries/uploaded_files/015.php   |  2 +-
 .../source/libraries/uploaded_files/016.php   |  2 +-
 .../source/libraries/uploaded_files/017.php   |  4 +-
 .../source/libraries/uploaded_files/018.php   |  4 +-
 .../source/libraries/uploaded_files/019.php   |  3 +-
 .../source/libraries/uploaded_files/020.php   |  5 +-
 .../source/libraries/uploaded_files/021.php   |  4 +-
 .../source/libraries/uploaded_files/022.php   |  2 +-
 .../source/libraries/uploaded_files/023.php   |  3 +
 .../source/libraries/validation.rst           | 18 ++--
 .../source/libraries/validation/029-2.php     |  7 --
 .../source/libraries/validation/030.php       | 13 +--
 .../source/libraries/validation/031.php       |  7 +-
 .../source/libraries/validation/032.php       | 14 +--
 .../source/libraries/validation/033.php       | 18 ++--
 .../source/libraries/validation/034.php       | 11 +--
 .../source/libraries/validation/035.php       | 13 ++-
 .../source/libraries/validation/036.php       | 35 +------
 .../source/libraries/validation/037.php       | 40 ++++++--
 .../source/libraries/validation/038.php       | 10 ++
 .../source/outgoing/view_parser.rst           | 32 +++----
 .../source/outgoing/view_parser/010-2.php     |  3 -
 .../source/outgoing/view_parser/011.php       |  9 +-
 .../source/outgoing/view_parser/012.php       |  3 +-
 .../source/outgoing/view_parser/013.php       |  7 +-
 .../source/outgoing/view_parser/014.php       | 19 ++--
 .../source/outgoing/view_parser/015.php       | 17 +++-
 .../source/outgoing/view_parser/016.php       |  5 +-
 .../source/outgoing/view_parser/017.php       | 11 +--
 .../source/outgoing/view_parser/018.php       |  6 +-
 .../source/outgoing/view_parser/019.php       | 10 +-
 .../source/outgoing/view_parser/020.php       | 25 +++--
 .../source/outgoing/view_parser/021-1.php     |  3 -
 .../source/outgoing/view_parser/021.php       | 18 +++-
 .../source/outgoing/view_parser/023.php       |  2 +-
 .../source/outgoing/view_parser/024.php       |  2 +-
 .../source/outgoing/view_parser/025.php       |  2 +-
 .../source/outgoing/view_parser/026.php       |  3 +
 user_guide_src/source/testing/response.rst    |  4 +-
 .../source/testing/response/021-2.php         |  6 --
 136 files changed, 587 insertions(+), 602 deletions(-)
 delete mode 100644 user_guide_src/source/helpers/url_helper/002-2.php
 delete mode 100644 user_guide_src/source/helpers/url_helper/002-3.php
 delete mode 100644 user_guide_src/source/helpers/url_helper/002-4.php
 create mode 100644 user_guide_src/source/helpers/url_helper/022.php
 create mode 100644 user_guide_src/source/helpers/url_helper/023.php
 create mode 100644 user_guide_src/source/helpers/url_helper/024.php
 delete mode 100644 user_guide_src/source/incoming/routing/000.php
 delete mode 100644 user_guide_src/source/incoming/routing/023-2.php
 create mode 100644 user_guide_src/source/incoming/routing/047.php
 create mode 100644 user_guide_src/source/incoming/routing/048.php
 delete mode 100644 user_guide_src/source/libraries/sessions/005-1.php
 delete mode 100644 user_guide_src/source/libraries/sessions/005-2.php
 delete mode 100644 user_guide_src/source/libraries/uploaded_files/000.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/023.php
 delete mode 100644 user_guide_src/source/libraries/validation/029-2.php
 create mode 100644 user_guide_src/source/libraries/validation/038.php
 delete mode 100644 user_guide_src/source/outgoing/view_parser/010-2.php
 delete mode 100644 user_guide_src/source/outgoing/view_parser/021-1.php
 create mode 100644 user_guide_src/source/outgoing/view_parser/026.php
 delete mode 100644 user_guide_src/source/testing/response/021-2.php

diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst
index 5ce922578e45..0713a770b5f7 100644
--- a/user_guide_src/source/helpers/url_helper.rst
+++ b/user_guide_src/source/helpers/url_helper.rst
@@ -62,7 +62,7 @@ The following functions are available:
 
     Returns your site base URL, as specified in your config file. Example:
 
-    .. literalinclude:: url_helper/002-2.php
+    .. literalinclude:: url_helper/003.php
        :lines: 2-
 
     This function returns the same thing as :php:func:`site_url()`, without
@@ -71,7 +71,7 @@ The following functions are available:
     Also like :php:func:`site_url()`, you can supply segments as a string or
     an array. Here is a string example:
 
-    .. literalinclude:: url_helper/002-3.php
+    .. literalinclude:: url_helper/004.php
        :lines: 2-
 
     The above example would return something like:
@@ -80,7 +80,7 @@ The following functions are available:
     This is useful because unlike :php:func:`site_url()`, you can supply a
     string to a file, such as an image or stylesheet. For example:
 
-    .. literalinclude:: url_helper/002-4.php
+    .. literalinclude:: url_helper/005.php
        :lines: 2-
 
     This would give you something like:
@@ -98,7 +98,7 @@ The following functions are available:
 
     .. note:: Calling this function is the same as doing this:
 
-        .. literalinclude:: url_helper/003.php
+        .. literalinclude:: url_helper/006.php
            :lines: 2-
 
 .. important:: Prior to **4.1.2** this function had a bug causing it to ignore the configuration on ``App::$indexPage``.
@@ -147,7 +147,7 @@ The following functions are available:
     Returns your site **indexPage**, as specified in your config file.
     Example:
 
-    .. literalinclude:: url_helper/004.php
+    .. literalinclude:: url_helper/007.php
        :lines: 2-
 
     As with :php:func:`site_url()`, you may specify an alternate configuration.
@@ -184,7 +184,7 @@ The following functions are available:
 
     Here are some examples:
 
-    .. literalinclude:: url_helper/005.php
+    .. literalinclude:: url_helper/008.php
        :lines: 2-
 
     As above, you may specify an alternate configuration.
@@ -211,7 +211,7 @@ The following functions are available:
 
     Here is an example with attributes:
 
-    .. literalinclude:: url_helper/006.php
+    .. literalinclude:: url_helper/009.php
        :lines: 2-
 
     As above, you may specify an alternate configuration.
@@ -224,7 +224,7 @@ The following functions are available:
         function to use all of its defaults simply pass an empty array in the
         third parameter:
 
-        .. literalinclude:: url_helper/007.php
+        .. literalinclude:: url_helper/010.php
            :lines: 2-
 
     .. note:: The **window_name** is not really an attribute, but an argument to
@@ -246,13 +246,13 @@ The following functions are available:
 
     Creates a standard HTML e-mail link. Usage example:
 
-    .. literalinclude:: url_helper/008.php
+    .. literalinclude:: url_helper/011.php
        :lines: 2-
 
     As with the :php:func:`anchor()` tab above, you can set attributes using the
     third parameter:
 
-    .. literalinclude:: url_helper/009.php
+    .. literalinclude:: url_helper/012.php
        :lines: 2-
 
     .. note:: Attributes passed into the mailto function are automatically escaped to protected against XSS attacks.
@@ -280,7 +280,7 @@ The following functions are available:
     Automatically turns URLs and e-mail addresses contained in a string into
     links. Example:
 
-    .. literalinclude:: url_helper/010.php
+    .. literalinclude:: url_helper/013.php
        :lines: 2-
 
     The second parameter determines whether URLs and e-mails are converted or
@@ -290,18 +290,18 @@ The following functions are available:
 
     Converts only URLs:
 
-    .. literalinclude:: url_helper/011.php
+    .. literalinclude:: url_helper/014.php
        :lines: 2-
 
     Converts only e-mail addresses:
 
-    .. literalinclude:: url_helper/012.php
+    .. literalinclude:: url_helper/015.php
        :lines: 2-
 
     The third parameter determines whether links are shown in a new window.
     The value can be true or false (boolean):
 
-    .. literalinclude:: url_helper/013.php
+    .. literalinclude:: url_helper/016.php
        :lines: 2-
 
     .. note:: The only URLs recognized are those that start with "www." or with "://".
@@ -318,7 +318,7 @@ The following functions are available:
     useful if, for example, you have a blog in which you'd like to use the
     title of your entries in the URL. Example:
 
-    .. literalinclude:: url_helper/014.php
+    .. literalinclude:: url_helper/017.php
        :lines: 2-
 
     The second parameter determines the word delimiter. By default dashes
@@ -326,7 +326,7 @@ The following functions are available:
 
     Example:
 
-    .. literalinclude:: url_helper/015.php
+    .. literalinclude:: url_helper/018.php
        :lines: 2-
 
     The third parameter determines whether or not lowercase characters are
@@ -334,7 +334,7 @@ The following functions are available:
 
     Example:
 
-    .. literalinclude:: url_helper/016.php
+    .. literalinclude:: url_helper/019.php
        :lines: 2-
 
 .. php:function:: mb_url_title($str[, $separator = '-'[, $lowercase = false]])
@@ -360,7 +360,7 @@ The following functions are available:
 
     Pass the URL string to the function like this:
 
-    .. literalinclude:: url_helper/017.php
+    .. literalinclude:: url_helper/020.php
        :lines: 2-
 
 .. php:function:: url_to($controller[, ...$args])
@@ -372,13 +372,13 @@ The following functions are available:
 
     Builds an absolute URL to a controller method in your app. Example:
 
-    .. literalinclude:: url_helper/018.php
+    .. literalinclude:: url_helper/021.php
        :lines: 2-
 
     You can also add arguments to the route.
     Here is an example:
 
-    .. literalinclude:: url_helper/019.php
+    .. literalinclude:: url_helper/022.php
        :lines: 2-
 
     The above example would return something like:
@@ -394,13 +394,13 @@ The following functions are available:
 
     Compares the current URL's path against the given path to see if they match. Example:
 
-    .. literalinclude:: url_helper/020.php
+    .. literalinclude:: url_helper/023.php
        :lines: 2-
 
     This would match ``http://example.com/admin``. You can use the ``*`` wildcard to match
     any other applicable characters in the URL:
 
-    .. literalinclude:: url_helper/021.php
+    .. literalinclude:: url_helper/024.php
        :lines: 2-
 
     This would match any of the following:
diff --git a/user_guide_src/source/helpers/url_helper/002-2.php b/user_guide_src/source/helpers/url_helper/002-2.php
deleted file mode 100644
index fc388607fec6..000000000000
--- a/user_guide_src/source/helpers/url_helper/002-2.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-echo base_url();
diff --git a/user_guide_src/source/helpers/url_helper/002-3.php b/user_guide_src/source/helpers/url_helper/002-3.php
deleted file mode 100644
index e820085b3c59..000000000000
--- a/user_guide_src/source/helpers/url_helper/002-3.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-echo base_url('blog/post/123');
diff --git a/user_guide_src/source/helpers/url_helper/002-4.php b/user_guide_src/source/helpers/url_helper/002-4.php
deleted file mode 100644
index c2f4d9d7a632..000000000000
--- a/user_guide_src/source/helpers/url_helper/002-4.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-echo base_url('images/icons/edit.png');
diff --git a/user_guide_src/source/helpers/url_helper/003.php b/user_guide_src/source/helpers/url_helper/003.php
index e6bd1a239fcd..fc388607fec6 100644
--- a/user_guide_src/source/helpers/url_helper/003.php
+++ b/user_guide_src/source/helpers/url_helper/003.php
@@ -1,3 +1,3 @@
 <?php
 
-site_url(uri_string());
+echo base_url();
diff --git a/user_guide_src/source/helpers/url_helper/004.php b/user_guide_src/source/helpers/url_helper/004.php
index 35ae47978306..e820085b3c59 100644
--- a/user_guide_src/source/helpers/url_helper/004.php
+++ b/user_guide_src/source/helpers/url_helper/004.php
@@ -1,3 +1,3 @@
 <?php
 
-echo index_page();
+echo base_url('blog/post/123');
diff --git a/user_guide_src/source/helpers/url_helper/005.php b/user_guide_src/source/helpers/url_helper/005.php
index 01919bd92af4..c2f4d9d7a632 100644
--- a/user_guide_src/source/helpers/url_helper/005.php
+++ b/user_guide_src/source/helpers/url_helper/005.php
@@ -1,10 +1,3 @@
 <?php
 
-echo anchor('news/local/123', 'My News', 'title="News title"');
-// Prints: <a href="http://example.com/index.php/news/local/123" title="News title">My News</a>
-
-echo anchor('news/local/123', 'My News', ['title' => 'The best news!']);
-// Prints: <a href="http://example.com/index.php/news/local/123" title="The best news!">My News</a>
-
-echo anchor('', 'Click here');
-// Prints: <a href="http://example.com/index.php">Click here</a>
+echo base_url('images/icons/edit.png');
diff --git a/user_guide_src/source/helpers/url_helper/006.php b/user_guide_src/source/helpers/url_helper/006.php
index 960bc6f0430e..e6bd1a239fcd 100644
--- a/user_guide_src/source/helpers/url_helper/006.php
+++ b/user_guide_src/source/helpers/url_helper/006.php
@@ -1,14 +1,3 @@
 <?php
 
-$atts = [
-    'width'       => 800,
-    'height'      => 600,
-    'scrollbars'  => 'yes',
-    'status'      => 'yes',
-    'resizable'   => 'yes',
-    'screenx'     => 0,
-    'screeny'     => 0,
-    'window_name' => '_blank',
-];
-
-echo anchor_popup('news/local/123', 'Click Me!', $atts);
+site_url(uri_string());
diff --git a/user_guide_src/source/helpers/url_helper/007.php b/user_guide_src/source/helpers/url_helper/007.php
index cb1e202af757..35ae47978306 100644
--- a/user_guide_src/source/helpers/url_helper/007.php
+++ b/user_guide_src/source/helpers/url_helper/007.php
@@ -1,3 +1,3 @@
 <?php
 
-echo anchor_popup('news/local/123', 'Click Me!', []);
+echo index_page();
diff --git a/user_guide_src/source/helpers/url_helper/008.php b/user_guide_src/source/helpers/url_helper/008.php
index 82026cdbfef8..01919bd92af4 100644
--- a/user_guide_src/source/helpers/url_helper/008.php
+++ b/user_guide_src/source/helpers/url_helper/008.php
@@ -1,3 +1,10 @@
 <?php
 
-echo mailto('me@my-site.com', 'Click Here to Contact Me');
+echo anchor('news/local/123', 'My News', 'title="News title"');
+// Prints: <a href="http://example.com/index.php/news/local/123" title="News title">My News</a>
+
+echo anchor('news/local/123', 'My News', ['title' => 'The best news!']);
+// Prints: <a href="http://example.com/index.php/news/local/123" title="The best news!">My News</a>
+
+echo anchor('', 'Click here');
+// Prints: <a href="http://example.com/index.php">Click here</a>
diff --git a/user_guide_src/source/helpers/url_helper/009.php b/user_guide_src/source/helpers/url_helper/009.php
index dcd65cd2bfcf..960bc6f0430e 100644
--- a/user_guide_src/source/helpers/url_helper/009.php
+++ b/user_guide_src/source/helpers/url_helper/009.php
@@ -1,4 +1,14 @@
 <?php
 
-$attributes = ['title' => 'Mail me'];
-echo mailto('me@my-site.com', 'Contact Me', $attributes);
+$atts = [
+    'width'       => 800,
+    'height'      => 600,
+    'scrollbars'  => 'yes',
+    'status'      => 'yes',
+    'resizable'   => 'yes',
+    'screenx'     => 0,
+    'screeny'     => 0,
+    'window_name' => '_blank',
+];
+
+echo anchor_popup('news/local/123', 'Click Me!', $atts);
diff --git a/user_guide_src/source/helpers/url_helper/010.php b/user_guide_src/source/helpers/url_helper/010.php
index 65bf083b99cf..cb1e202af757 100644
--- a/user_guide_src/source/helpers/url_helper/010.php
+++ b/user_guide_src/source/helpers/url_helper/010.php
@@ -1,3 +1,3 @@
 <?php
 
-$string = auto_link($string);
+echo anchor_popup('news/local/123', 'Click Me!', []);
diff --git a/user_guide_src/source/helpers/url_helper/011.php b/user_guide_src/source/helpers/url_helper/011.php
index 24c9ecf27d7e..82026cdbfef8 100644
--- a/user_guide_src/source/helpers/url_helper/011.php
+++ b/user_guide_src/source/helpers/url_helper/011.php
@@ -1,3 +1,3 @@
 <?php
 
-$string = auto_link($string, 'url');
+echo mailto('me@my-site.com', 'Click Here to Contact Me');
diff --git a/user_guide_src/source/helpers/url_helper/012.php b/user_guide_src/source/helpers/url_helper/012.php
index 905e2b9c1338..dcd65cd2bfcf 100644
--- a/user_guide_src/source/helpers/url_helper/012.php
+++ b/user_guide_src/source/helpers/url_helper/012.php
@@ -1,3 +1,4 @@
 <?php
 
-$string = auto_link($string, 'email');
+$attributes = ['title' => 'Mail me'];
+echo mailto('me@my-site.com', 'Contact Me', $attributes);
diff --git a/user_guide_src/source/helpers/url_helper/013.php b/user_guide_src/source/helpers/url_helper/013.php
index 4ee151df4b12..65bf083b99cf 100644
--- a/user_guide_src/source/helpers/url_helper/013.php
+++ b/user_guide_src/source/helpers/url_helper/013.php
@@ -1,3 +1,3 @@
 <?php
 
-$string = auto_link($string, 'both', true);
+$string = auto_link($string);
diff --git a/user_guide_src/source/helpers/url_helper/014.php b/user_guide_src/source/helpers/url_helper/014.php
index 84a8191e27a1..24c9ecf27d7e 100644
--- a/user_guide_src/source/helpers/url_helper/014.php
+++ b/user_guide_src/source/helpers/url_helper/014.php
@@ -1,5 +1,3 @@
 <?php
 
-$title     = "What's wrong with CSS?";
-$url_title = url_title($title);
-// Produces: Whats-wrong-with-CSS
+$string = auto_link($string, 'url');
diff --git a/user_guide_src/source/helpers/url_helper/015.php b/user_guide_src/source/helpers/url_helper/015.php
index 550029c6c3aa..905e2b9c1338 100644
--- a/user_guide_src/source/helpers/url_helper/015.php
+++ b/user_guide_src/source/helpers/url_helper/015.php
@@ -1,5 +1,3 @@
 <?php
 
-$title     = "What's wrong with CSS?";
-$url_title = url_title($title, '_');
-// Produces: Whats_wrong_with_CSS
+$string = auto_link($string, 'email');
diff --git a/user_guide_src/source/helpers/url_helper/016.php b/user_guide_src/source/helpers/url_helper/016.php
index 1aa3a23aad7e..4ee151df4b12 100644
--- a/user_guide_src/source/helpers/url_helper/016.php
+++ b/user_guide_src/source/helpers/url_helper/016.php
@@ -1,5 +1,3 @@
 <?php
 
-$title     = "What's wrong with CSS?";
-$url_title = url_title($title, '-', true);
-// Produces: whats-wrong-with-css
+$string = auto_link($string, 'both', true);
diff --git a/user_guide_src/source/helpers/url_helper/017.php b/user_guide_src/source/helpers/url_helper/017.php
index 0e104faa8fb6..84a8191e27a1 100644
--- a/user_guide_src/source/helpers/url_helper/017.php
+++ b/user_guide_src/source/helpers/url_helper/017.php
@@ -1,3 +1,5 @@
 <?php
 
-$url = prep_url('example.com');
+$title     = "What's wrong with CSS?";
+$url_title = url_title($title);
+// Produces: Whats-wrong-with-CSS
diff --git a/user_guide_src/source/helpers/url_helper/018.php b/user_guide_src/source/helpers/url_helper/018.php
index 64f4916d018e..550029c6c3aa 100644
--- a/user_guide_src/source/helpers/url_helper/018.php
+++ b/user_guide_src/source/helpers/url_helper/018.php
@@ -1,3 +1,5 @@
 <?php
 
-echo url_to('Home::index');
+$title     = "What's wrong with CSS?";
+$url_title = url_title($title, '_');
+// Produces: Whats_wrong_with_CSS
diff --git a/user_guide_src/source/helpers/url_helper/019.php b/user_guide_src/source/helpers/url_helper/019.php
index ec799947ec72..1aa3a23aad7e 100644
--- a/user_guide_src/source/helpers/url_helper/019.php
+++ b/user_guide_src/source/helpers/url_helper/019.php
@@ -1,3 +1,5 @@
 <?php
 
-echo url_to('Page::index', 'home');
+$title     = "What's wrong with CSS?";
+$url_title = url_title($title, '-', true);
+// Produces: whats-wrong-with-css
diff --git a/user_guide_src/source/helpers/url_helper/020.php b/user_guide_src/source/helpers/url_helper/020.php
index 2c17057179f9..0e104faa8fb6 100644
--- a/user_guide_src/source/helpers/url_helper/020.php
+++ b/user_guide_src/source/helpers/url_helper/020.php
@@ -1,3 +1,3 @@
 <?php
 
-if (url_is('admin')) { ... }
+$url = prep_url('example.com');
diff --git a/user_guide_src/source/helpers/url_helper/021.php b/user_guide_src/source/helpers/url_helper/021.php
index 54e3270e6789..64f4916d018e 100644
--- a/user_guide_src/source/helpers/url_helper/021.php
+++ b/user_guide_src/source/helpers/url_helper/021.php
@@ -1,3 +1,3 @@
 <?php
 
-if (url_is('admin*')) { ... }
+echo url_to('Home::index');
diff --git a/user_guide_src/source/helpers/url_helper/022.php b/user_guide_src/source/helpers/url_helper/022.php
new file mode 100644
index 000000000000..ec799947ec72
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/022.php
@@ -0,0 +1,3 @@
+<?php
+
+echo url_to('Page::index', 'home');
diff --git a/user_guide_src/source/helpers/url_helper/023.php b/user_guide_src/source/helpers/url_helper/023.php
new file mode 100644
index 000000000000..2c17057179f9
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/023.php
@@ -0,0 +1,3 @@
+<?php
+
+if (url_is('admin')) { ... }
diff --git a/user_guide_src/source/helpers/url_helper/024.php b/user_guide_src/source/helpers/url_helper/024.php
new file mode 100644
index 000000000000..54e3270e6789
--- /dev/null
+++ b/user_guide_src/source/helpers/url_helper/024.php
@@ -0,0 +1,3 @@
+<?php
+
+if (url_is('admin*')) { ... }
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 1dbfd47c1d80..14d98a8c84ed 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -54,7 +54,7 @@ Routes can be specified using placeholders or Regular Expressions.
 When you specify a route, you choose a method to corresponding to HTTP verbs (request method).
 If you expect a GET request, you use the ``get()`` method:
 
-.. literalinclude:: routing/000.php
+.. literalinclude:: routing/001.php
    :lines: 2-
 
 A route simply takes the URI path on the left, and maps it to the controller and method on the right,
@@ -63,17 +63,17 @@ be listed in the same way that you would use a static method, by separating the
 and its method with a double-colon, like ``Users::list``. If that method requires parameters to be
 passed to it, then they would be listed after the method name, separated by forward-slashes:
 
-.. literalinclude:: routing/001.php
+.. literalinclude:: routing/002.php
    :lines: 2-
 
 You can use any standard HTTP verb (GET, POST, PUT, DELETE, etc):
 
-.. literalinclude:: routing/024.php
+.. literalinclude:: routing/003.php
    :lines: 2-
 
 You can supply multiple verbs that a route should match by passing them in as an array to the ``match()`` method:
 
-.. literalinclude:: routing/025.php
+.. literalinclude:: routing/004.php
    :lines: 2-
 
 Placeholders
@@ -81,7 +81,7 @@ Placeholders
 
 A typical route might look something like this:
 
-.. literalinclude:: routing/002.php
+.. literalinclude:: routing/005.php
    :lines: 2-
 
 In a route, the first parameter contains the URI to be matched, while the second parameter
@@ -117,42 +117,42 @@ Here are a few basic routing examples.
 A URL containing the word **journals** in the first segment will be remapped to the ``\App\Controllers\Blogs`` class,
 and the default method, which is usually ``index()``:
 
-.. literalinclude:: routing/003.php
+.. literalinclude:: routing/006.php
    :lines: 2-
 
 A URL containing the segments **blog/joe** will be remapped to the ``\App\Controllers\Blogs`` class and the ``users`` method.
 The ID will be set to ``34``:
 
-.. literalinclude:: routing/004.php
+.. literalinclude:: routing/007.php
    :lines: 2-
 
 A URL with **product** as the first segment, and anything in the second will be remapped to the ``\App\Controllers\Catalog`` class
 and the ``productLookup`` method:
 
-.. literalinclude:: routing/005.php
+.. literalinclude:: routing/008.php
    :lines: 2-
 
 A URL with **product** as the first segment, and a number in the second will be remapped to the ``\App\Controllers\Catalog`` class
 and the ``productLookupByID`` method passing in the match as a variable to the method:
 
-.. literalinclude:: routing/006.php
+.. literalinclude:: routing/009.php
    :lines: 2-
 
 Note that a single ``(:any)`` will match multiple segments in the URL if present. For example the route:
 
-.. literalinclude:: routing/007.php
+.. literalinclude:: routing/010.php
    :lines: 2-
 
 will match **product/123**, **product/123/456**, **product/123/456/789** and so on. The implementation in the
 Controller should take into account the maximum parameters:
 
-.. literalinclude:: routing/008.php
+.. literalinclude:: routing/011.php
    :lines: 2-
 
 If matching multiple segments is not the intended behavior, ``(:segment)`` should be used when defining the
 routes. With the examples URLs from above:
 
-.. literalinclude:: routing/009.php
+.. literalinclude:: routing/012.php
    :lines: 2-
 
 will only match **product/123** and generate 404 errors for other example.
@@ -167,7 +167,7 @@ You add new placeholders with the ``addPlaceholder()`` method. The first paramet
 the placeholder. The second parameter is the Regular Expression pattern it should be replaced with.
 This must be called before you add the route:
 
-.. literalinclude:: routing/010.php
+.. literalinclude:: routing/013.php
    :lines: 2-
 
 Regular Expressions
@@ -179,7 +179,7 @@ is allowed, as are back-references.
 .. important:: Note: If you use back-references you must use the dollar syntax rather than the double backslash syntax.
     A typical RegEx route might look something like this:
 
-    .. literalinclude:: routing/011.php
+    .. literalinclude:: routing/014.php
        :lines: 2-
 
 In the above example, a URI similar to **products/shirts/123** would instead call the ``show`` method
@@ -191,7 +191,7 @@ represent the delimiter between multiple segments.
 For example, if a user accesses a password protected area of your web application and you wish to be able to
 redirect them back to the same page after they log in, you may find this example useful:
 
-.. literalinclude:: routing/012.php
+.. literalinclude:: routing/015.php
    :lines: 2-
 
 For those of you who don’t know regular expressions and want to learn more about them,
@@ -206,7 +206,7 @@ You can use an anonymous function, or Closure, as the destination that a route m
 executed when the user visits that URI. This is handy for quickly executing small tasks, or even just showing
 a simple view:
 
-.. literalinclude:: routing/013.php
+.. literalinclude:: routing/016.php
    :lines: 2-
 
 Mapping multiple routes
@@ -216,7 +216,7 @@ While the ``add()`` method is simple to use, it is often handier to work with mu
 the ``map()`` method. Instead of calling the ``add()`` method for each route that you need to add, you can
 define an array of routes and then pass it as the first parameter to the ``map()`` method:
 
-.. literalinclude:: routing/014.php
+.. literalinclude:: routing/017.php
    :lines: 2-
 
 Redirecting Routes
@@ -228,7 +228,7 @@ second parameter is either the new URI to redirect to, or the name of a named ro
 the HTTP status code that should be sent along with the redirect. The default value is ``302`` which is a temporary
 redirect and is recommended in most cases:
 
-.. literalinclude:: routing/015.php
+.. literalinclude:: routing/018.php
    :lines: 2-
 
 If a redirect route is matched during a page load, the user will be immediately redirected to the new page before a
@@ -241,14 +241,14 @@ You can group your routes under a common name with the ``group()`` method. The g
 appears prior to the routes defined inside of the group. This allows you to reduce the typing needed to build out an
 extensive set of routes that all share the opening string, like when building an admin area:
 
-.. literalinclude:: routing/016.php
+.. literalinclude:: routing/019.php
    :lines: 2-
 
 This would prefix the **users** and **blog** URIs with **admin**, handling URLs like **admin/users** and **admin/blog**.
 
 If you need to assign options to a group, like a :ref:`assigning-namespace`, do it before the callback:
 
-.. literalinclude:: routing/017.php
+.. literalinclude:: routing/020.php
    :lines: 2-
 
 This would handle a resource route to the ``App\API\v1\Users`` controller with the **api/users** URI.
@@ -256,14 +256,14 @@ This would handle a resource route to the ``App\API\v1\Users`` controller with t
 You can also use a specific :doc:`filter <filters>` for a group of routes. This will always
 run the filter before or after the controller. This is especially handy during authentication or api logging:
 
-.. literalinclude:: routing/018.php
+.. literalinclude:: routing/021.php
    :lines: 2-
 
 The value for the filter must match one of the aliases defined within **app/Config/Filters.php**.
 
 It is possible to nest groups within groups for finer organization if you need it:
 
-.. literalinclude:: routing/019.php
+.. literalinclude:: routing/022.php
    :lines: 2-
 
 This would handle the URL at **admin/users/list**.
@@ -275,7 +275,7 @@ config options like namespace, subdomain, etc. Without necessarily needing to ad
 an empty string in place of the prefix and the routes in the group will be routed as though the group never existed but with the
 given route config options:
 
-.. literalinclude:: routing/020.php
+.. literalinclude:: routing/023.php
    :lines: 2-
 
 Environment Restrictions
@@ -286,7 +286,7 @@ tools that only the developer can use on their local machines that are not reach
 This can be done with the ``environment()`` method. The first parameter is the name of the environment. Any
 routes defined within this closure are only accessible from the given environment:
 
-.. literalinclude:: routing/021.php
+.. literalinclude:: routing/024.php
    :lines: 2-
 
 Reverse Routing
@@ -301,7 +301,7 @@ function to get the current route that should be used. The first parameter is th
 separated by a double colon (``::``), much like you would use when writing the initial route itself. Any parameters that
 should be passed to the route are passed in next:
 
-.. literalinclude:: routing/022.php
+.. literalinclude:: routing/025.php
    :lines: 2-
 
 Using Named Routes
@@ -312,7 +312,7 @@ later, and even if the route definition changes, all of the links in your applic
 will still work without you having to make any changes. A route is named by passing in the ``as`` option
 with the name of the route:
 
-.. literalinclude:: routing/023.php
+.. literalinclude:: routing/026.php
    :lines: 2-
 
 This has the added benefit of making the views more readable, too.
@@ -323,7 +323,7 @@ Routes with any HTTP verbs
 It is possible to define a route with any HTTP verbs.
 You can use the ``add()`` method:
 
-.. literalinclude:: routing/023-2.php
+.. literalinclude:: routing/027.php
    :lines: 2-
 
 .. warning:: While the ``add()`` method seems to be convenient, it is recommended to always use the HTTP-verb-based
@@ -343,7 +343,7 @@ You can create routes that work only from the command-line, and are inaccessible
 route methods will also be inaccessible from the CLI, but routes created by the ``add()`` method will still be
 available from the command line:
 
-.. literalinclude:: routing/026.php
+.. literalinclude:: routing/028.php
    :lines: 2-
 
 Global Options
@@ -352,7 +352,7 @@ Global Options
 All of the methods for creating a route (add, get, post, :doc:`resource <restful>` etc) can take an array of options that
 can modify the generated routes, or further restrict them. The ``$options`` array is always the last parameter:
 
-.. literalinclude:: routing/027.php
+.. literalinclude:: routing/029.php
    :lines: 2-
 
 .. _applying-filters:
@@ -379,19 +379,19 @@ See :doc:`Controller filters <filters>` for more information on setting up filte
 
 You specify an alias defined in **app/Config/Filters.php** for the filter value:
 
-.. literalinclude:: routing/028.php
+.. literalinclude:: routing/030.php
    :lines: 2-
 
 You may also supply arguments to be passed to the alias filter's ``before()`` and ``after()`` methods:
 
-.. literalinclude:: routing/029.php
+.. literalinclude:: routing/031.php
    :lines: 2-
 
 **Classname filter**
 
 You specify a filter classname for the filter value:
 
-.. literalinclude:: routing/030.php
+.. literalinclude:: routing/032.php
    :lines: 2-
 
 **Multiple filters**
@@ -400,7 +400,7 @@ You specify a filter classname for the filter value:
 
 You specify an array for the filter value:
 
-.. literalinclude:: routing/031.php
+.. literalinclude:: routing/033.php
    :lines: 2-
 
 .. _assigning-namespace:
@@ -412,7 +412,7 @@ While a default namespace will be prepended to the generated controllers (see be
 a different namespace to be used in any options array, with the ``namespace`` option. The value should be the
 namespace you want modified:
 
-.. literalinclude:: routing/032.php
+.. literalinclude:: routing/034.php
    :lines: 2-
 
 The new namespace is only applied during that call for any methods that create a single route, like get, post, etc.
@@ -425,7 +425,7 @@ Limit to Hostname
 You can restrict groups of routes to function only in certain domain or sub-domains of your application
 by passing the "hostname" option along with the desired domain to allow it on as part of the options array:
 
-.. literalinclude:: routing/033.php
+.. literalinclude:: routing/035.php
    :lines: 2-
 
 This example would only allow the specified hosts to work if the domain exactly matched **accounts.example.com**.
@@ -437,13 +437,13 @@ Limit to Subdomains
 When the ``subdomain`` option is present, the system will restrict the routes to only be available on that
 sub-domain. The route will only be matched if the subdomain is the one the application is being viewed through:
 
-.. literalinclude:: routing/034.php
+.. literalinclude:: routing/036.php
    :lines: 2-
 
 You can restrict it to any subdomain by setting the value to an asterisk, (``*``). If you are viewing from a URL
 that does not have any subdomain present, this will not be matched:
 
-.. literalinclude:: routing/035.php
+.. literalinclude:: routing/037.php
    :lines: 2-
 
 .. important:: The system is not perfect and should be tested for your specific domain before being used in production.
@@ -459,7 +459,7 @@ value being the number of segments to offset.
 This can be beneficial when developing API's with the first URI segment being the version number. It can also
 be used when the first parameter is a language string:
 
-.. literalinclude:: routing/036.php
+.. literalinclude:: routing/038.php
    :lines: 2-
 
 .. _routing-priority:
@@ -473,12 +473,12 @@ You can solve this problem by lowering the priority of route processing using th
 accepts positive integers and zero. The higher the number specified in the ``priority``, the lower
 route priority in the processing queue:
 
-.. literalinclude:: routing/037.php
+.. literalinclude:: routing/039.php
    :lines: 2-
 
 To disable this functionality, you must call the method with the parameter ``false``:
 
-.. literalinclude:: routing/038.php
+.. literalinclude:: routing/040.php
    :lines: 2-
 
 .. note:: By default, all routes have a priority of 0.
@@ -502,13 +502,13 @@ specified by the route. By default, this value is ``App\Controllers``.
 If you set the value empty string (``''``), it leaves each route to specify the fully namespaced
 controller:
 
-.. literalinclude:: routing/039.php
+.. literalinclude:: routing/041.php
    :lines: 2-
 
 If your controllers are not explicitly namespaced, there is no need to change this. If you namespace your controllers,
 then you can change this value to save typing:
 
-.. literalinclude:: routing/040.php
+.. literalinclude:: routing/042.php
    :lines: 2-
 
 Default Controller
@@ -518,7 +518,7 @@ When a user visits the root of your site (i.e., example.com) the controller to u
 the ``setDefaultController()`` method, unless a route exists for it explicitly. The default value for this is ``Home``
 which matches the controller at **app/Controllers/Home.php**:
 
-.. literalinclude:: routing/041.php
+.. literalinclude:: routing/043.php
    :lines: 2-
 
 The default controller is also used when no matching route has been found, and the URI would point to a directory
@@ -535,7 +535,7 @@ when a controller is found that matches the URI, but no segment exists for the m
 In this example, if the user were to visit **example.com/products**, and a ``Products`` controller existed, the
 ``Products::listAll()`` method would be executed:
 
-.. literalinclude:: routing/042.php
+.. literalinclude:: routing/044.php
    :lines: 2-
 
 Translate URI Dashes
@@ -545,7 +545,7 @@ This option enables you to automatically replace dashes (``-``) with underscores
 URI segments, thus saving you additional route entries if you need to do that. This is required because the
 dash isn’t a valid class or method name character and would cause a fatal error if you try to use it:
 
-.. literalinclude:: routing/043.php
+.. literalinclude:: routing/045.php
    :lines: 2-
 
 .. _use-defined-routes-only:
@@ -557,7 +557,7 @@ When no defined route is found that matches the URI, the system will attempt to
 controllers and methods as described above. You can disable this automatic matching, and restrict routes
 to only those defined by you, by setting the ``setAutoRoute()`` option to false:
 
-.. literalinclude:: routing/044.php
+.. literalinclude:: routing/046.php
    :lines: 2-
 
 .. warning:: If you use the :doc:`CSRF protection </libraries/security>`, it does not protect **GET**
@@ -570,7 +570,7 @@ When a page is not found that matches the current URI, the system will show a ge
 what happens by specifying an action to happen with the ``set404Override()`` method. The value can be either
 a valid class/method pair, just like you would show in any route, or a Closure:
 
-.. literalinclude:: routing/045.php
+.. literalinclude:: routing/047.php
    :lines: 2-
 
 Route processing by priority
@@ -580,7 +580,7 @@ Enables or disables processing of the routes queue by priority. Lowering the pri
 Disabled by default. This functionality affects all routes.
 For an example use of lowering the priority see :ref:`routing-priority`:
 
-.. literalinclude:: routing/046.php
+.. literalinclude:: routing/048.php
    :lines: 2-
 
 *****************
diff --git a/user_guide_src/source/incoming/routing/000.php b/user_guide_src/source/incoming/routing/000.php
deleted file mode 100644
index d799d1cf0fb5..000000000000
--- a/user_guide_src/source/incoming/routing/000.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$routes->get('/', 'Home::index');
diff --git a/user_guide_src/source/incoming/routing/001.php b/user_guide_src/source/incoming/routing/001.php
index 4ddfd31abaed..d799d1cf0fb5 100644
--- a/user_guide_src/source/incoming/routing/001.php
+++ b/user_guide_src/source/incoming/routing/001.php
@@ -1,7 +1,3 @@
 <?php
 
-// Calls $Users->list()
-$routes->get('users', 'Users::list');
-
-// Calls $Users->list(1, 23)
-$routes->get('users/1/23', 'Users::list/1/23');
\ No newline at end of file
+$routes->get('/', 'Home::index');
diff --git a/user_guide_src/source/incoming/routing/002.php b/user_guide_src/source/incoming/routing/002.php
index ba4d8d98a28a..4ddfd31abaed 100644
--- a/user_guide_src/source/incoming/routing/002.php
+++ b/user_guide_src/source/incoming/routing/002.php
@@ -1,3 +1,7 @@
 <?php
 
-$routes->get('product/(:num)', 'Catalog::productLookup');
+// Calls $Users->list()
+$routes->get('users', 'Users::list');
+
+// Calls $Users->list(1, 23)
+$routes->get('users/1/23', 'Users::list/1/23');
\ No newline at end of file
diff --git a/user_guide_src/source/incoming/routing/003.php b/user_guide_src/source/incoming/routing/003.php
index 7a9075b57b2f..7351142dea77 100644
--- a/user_guide_src/source/incoming/routing/003.php
+++ b/user_guide_src/source/incoming/routing/003.php
@@ -1,3 +1,5 @@
 <?php
 
-$routes->get('journals', 'Blogs');
+$routes->post('products', 'Product::feature');
+$routes->put('products/1', 'Product::feature');
+$routes->delete('products/1', 'Product::feature');
diff --git a/user_guide_src/source/incoming/routing/004.php b/user_guide_src/source/incoming/routing/004.php
index 4ee87c0af53a..a071f75cd156 100644
--- a/user_guide_src/source/incoming/routing/004.php
+++ b/user_guide_src/source/incoming/routing/004.php
@@ -1,3 +1,3 @@
 <?php
 
-$routes->get('blog/joe', 'Blogs::users/34');
+$routes->match(['get', 'put'], 'products', 'Product::feature');
diff --git a/user_guide_src/source/incoming/routing/005.php b/user_guide_src/source/incoming/routing/005.php
index d840165c7809..ba4d8d98a28a 100644
--- a/user_guide_src/source/incoming/routing/005.php
+++ b/user_guide_src/source/incoming/routing/005.php
@@ -1,3 +1,3 @@
 <?php
 
-$routes->get('product/(:any)', 'Catalog::productLookup');
+$routes->get('product/(:num)', 'Catalog::productLookup');
diff --git a/user_guide_src/source/incoming/routing/006.php b/user_guide_src/source/incoming/routing/006.php
index 638ed4492220..7a9075b57b2f 100644
--- a/user_guide_src/source/incoming/routing/006.php
+++ b/user_guide_src/source/incoming/routing/006.php
@@ -1,3 +1,3 @@
 <?php
 
-$routes->get('product/(:num)', 'Catalog::productLookupByID/$1');
+$routes->get('journals', 'Blogs');
diff --git a/user_guide_src/source/incoming/routing/007.php b/user_guide_src/source/incoming/routing/007.php
index c88bc65573a3..4ee87c0af53a 100644
--- a/user_guide_src/source/incoming/routing/007.php
+++ b/user_guide_src/source/incoming/routing/007.php
@@ -1,3 +1,3 @@
 <?php
 
-$routes->get('product/(:any)', 'Catalog::productLookup/$1');
+$routes->get('blog/joe', 'Blogs::users/34');
diff --git a/user_guide_src/source/incoming/routing/008.php b/user_guide_src/source/incoming/routing/008.php
index 11437a5881c2..d840165c7809 100644
--- a/user_guide_src/source/incoming/routing/008.php
+++ b/user_guide_src/source/incoming/routing/008.php
@@ -1,7 +1,3 @@
 <?php
 
-public function productLookup($seg1 = false, $seg2 = false, $seg3 = false) {
-    echo $seg1; // Will be 123 in all examples
-    echo $seg2; // false in first, 456 in second and third example
-    echo $seg3; // false in first and second, 789 in third
-}
+$routes->get('product/(:any)', 'Catalog::productLookup');
diff --git a/user_guide_src/source/incoming/routing/009.php b/user_guide_src/source/incoming/routing/009.php
index cee3785eb0d8..638ed4492220 100644
--- a/user_guide_src/source/incoming/routing/009.php
+++ b/user_guide_src/source/incoming/routing/009.php
@@ -1,3 +1,3 @@
 <?php
 
-$routes->get('product/(:segment)', 'Catalog::productLookup/$1');
+$routes->get('product/(:num)', 'Catalog::productLookupByID/$1');
diff --git a/user_guide_src/source/incoming/routing/010.php b/user_guide_src/source/incoming/routing/010.php
index cb1cdda7c78c..c88bc65573a3 100644
--- a/user_guide_src/source/incoming/routing/010.php
+++ b/user_guide_src/source/incoming/routing/010.php
@@ -1,4 +1,3 @@
 <?php
 
-$routes->addPlaceholder('uuid', '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}');
-$routes->get('users/(:uuid)', 'Users::show/$1');
+$routes->get('product/(:any)', 'Catalog::productLookup/$1');
diff --git a/user_guide_src/source/incoming/routing/011.php b/user_guide_src/source/incoming/routing/011.php
index a1619a4bf080..11437a5881c2 100644
--- a/user_guide_src/source/incoming/routing/011.php
+++ b/user_guide_src/source/incoming/routing/011.php
@@ -1,3 +1,7 @@
 <?php
 
-$routes->get('products/([a-z]+)/(\d+)', 'Products::show/$1/id_$2');
+public function productLookup($seg1 = false, $seg2 = false, $seg3 = false) {
+    echo $seg1; // Will be 123 in all examples
+    echo $seg2; // false in first, 456 in second and third example
+    echo $seg3; // false in first and second, 789 in third
+}
diff --git a/user_guide_src/source/incoming/routing/012.php b/user_guide_src/source/incoming/routing/012.php
index c9ddfae73610..cee3785eb0d8 100644
--- a/user_guide_src/source/incoming/routing/012.php
+++ b/user_guide_src/source/incoming/routing/012.php
@@ -1,3 +1,3 @@
 <?php
 
-$routes->get('login/(.+)', 'Auth::login/$1');
+$routes->get('product/(:segment)', 'Catalog::productLookup/$1');
diff --git a/user_guide_src/source/incoming/routing/013.php b/user_guide_src/source/incoming/routing/013.php
index 2d0f48cb284e..cb1cdda7c78c 100644
--- a/user_guide_src/source/incoming/routing/013.php
+++ b/user_guide_src/source/incoming/routing/013.php
@@ -1,7 +1,4 @@
 <?php
 
-$routes->get('feed', function () {
-    $rss = new RSSFeeder();
-
-    return $rss->feed('general');
-});
+$routes->addPlaceholder('uuid', '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}');
+$routes->get('users/(:uuid)', 'Users::show/$1');
diff --git a/user_guide_src/source/incoming/routing/014.php b/user_guide_src/source/incoming/routing/014.php
index 8ebc27e3f9f5..a1619a4bf080 100644
--- a/user_guide_src/source/incoming/routing/014.php
+++ b/user_guide_src/source/incoming/routing/014.php
@@ -1,8 +1,3 @@
 <?php
 
-$multipleRoutes = [
-    'product/(:num)'      => 'Catalog::productLookupById',
-    'product/(:alphanum)' => 'Catalog::productLookupByName',
-];
-
-$routes->map($multipleRoutes);
+$routes->get('products/([a-z]+)/(\d+)', 'Products::show/$1/id_$2');
diff --git a/user_guide_src/source/incoming/routing/015.php b/user_guide_src/source/incoming/routing/015.php
index d92d9934db5a..c9ddfae73610 100644
--- a/user_guide_src/source/incoming/routing/015.php
+++ b/user_guide_src/source/incoming/routing/015.php
@@ -1,8 +1,3 @@
 <?php
 
-$routes->get('users/profile', 'Users::profile', ['as' => 'profile']);
-
-// Redirect to a named route
-$routes->addRedirect('users/about', 'profile');
-// Redirect to a URI
-$routes->addRedirect('users/about', 'users/profile');
+$routes->get('login/(.+)', 'Auth::login/$1');
diff --git a/user_guide_src/source/incoming/routing/016.php b/user_guide_src/source/incoming/routing/016.php
index 8c770fd05f24..2d0f48cb284e 100644
--- a/user_guide_src/source/incoming/routing/016.php
+++ b/user_guide_src/source/incoming/routing/016.php
@@ -1,6 +1,7 @@
 <?php
 
-$routes->group('admin', function ($routes) {
-    $routes->get('users', 'Admin\Users::index');
-    $routes->get('blog', 'Admin\Blog::index');
+$routes->get('feed', function () {
+    $rss = new RSSFeeder();
+
+    return $rss->feed('general');
 });
diff --git a/user_guide_src/source/incoming/routing/017.php b/user_guide_src/source/incoming/routing/017.php
index 678e90700e74..8ebc27e3f9f5 100644
--- a/user_guide_src/source/incoming/routing/017.php
+++ b/user_guide_src/source/incoming/routing/017.php
@@ -1,5 +1,8 @@
 <?php
 
-$routes->group('api', ['namespace' => 'App\API\v1'], function ($routes) {
-    $routes->resource('users');
-});
+$multipleRoutes = [
+    'product/(:num)'      => 'Catalog::productLookupById',
+    'product/(:alphanum)' => 'Catalog::productLookupByName',
+];
+
+$routes->map($multipleRoutes);
diff --git a/user_guide_src/source/incoming/routing/018.php b/user_guide_src/source/incoming/routing/018.php
index 395ddfe6c8c8..d92d9934db5a 100644
--- a/user_guide_src/source/incoming/routing/018.php
+++ b/user_guide_src/source/incoming/routing/018.php
@@ -1,5 +1,8 @@
 <?php
 
-$routes->group('api', ['filter' => 'api-auth'], function ($routes) {
-    $routes->resource('users');
-});
+$routes->get('users/profile', 'Users::profile', ['as' => 'profile']);
+
+// Redirect to a named route
+$routes->addRedirect('users/about', 'profile');
+// Redirect to a URI
+$routes->addRedirect('users/about', 'users/profile');
diff --git a/user_guide_src/source/incoming/routing/019.php b/user_guide_src/source/incoming/routing/019.php
index 08169acec275..8c770fd05f24 100644
--- a/user_guide_src/source/incoming/routing/019.php
+++ b/user_guide_src/source/incoming/routing/019.php
@@ -1,7 +1,6 @@
 <?php
 
 $routes->group('admin', function ($routes) {
-    $routes->group('users', function ($routes) {
-        $routes->get('list', 'Admin\Users::list');
-    });
+    $routes->get('users', 'Admin\Users::index');
+    $routes->get('blog', 'Admin\Blog::index');
 });
diff --git a/user_guide_src/source/incoming/routing/020.php b/user_guide_src/source/incoming/routing/020.php
index d7624ddc6d5c..678e90700e74 100644
--- a/user_guide_src/source/incoming/routing/020.php
+++ b/user_guide_src/source/incoming/routing/020.php
@@ -1,7 +1,5 @@
 <?php
 
-$routes->group('', ['namespace' => 'Myth\Auth\Controllers'], static function ($routes) {
-    $routes->get('login', 'AuthController::login', ['as' => 'login']);
-    $routes->post('login', 'AuthController::attemptLogin');
-    $routes->get('logout', 'AuthController::logout');
+$routes->group('api', ['namespace' => 'App\API\v1'], function ($routes) {
+    $routes->resource('users');
 });
diff --git a/user_guide_src/source/incoming/routing/021.php b/user_guide_src/source/incoming/routing/021.php
index 69a4c184ab36..395ddfe6c8c8 100644
--- a/user_guide_src/source/incoming/routing/021.php
+++ b/user_guide_src/source/incoming/routing/021.php
@@ -1,5 +1,5 @@
 <?php
 
-$routes->environment('development', function ($routes) {
-    $routes->get('builder', 'Tools\Builder::index');
+$routes->group('api', ['filter' => 'api-auth'], function ($routes) {
+    $routes->resource('users');
 });
diff --git a/user_guide_src/source/incoming/routing/022.php b/user_guide_src/source/incoming/routing/022.php
index 0af87a58c3b5..08169acec275 100644
--- a/user_guide_src/source/incoming/routing/022.php
+++ b/user_guide_src/source/incoming/routing/022.php
@@ -1,8 +1,7 @@
 <?php
 
-// The route is defined as:
-$routes->get('users/(:num)/gallery(:any)', 'App\Controllers\Galleries::showUserGallery/$1/$2');
-
-// Generate the relative URL to link to user ID 15, gallery 12
-// Generates: /users/15/gallery/12
-<a href="<?= route_to('App\Controllers\Galleries::showUserGallery', 15, 12) ?>">View Gallery</a>
+$routes->group('admin', function ($routes) {
+    $routes->group('users', function ($routes) {
+        $routes->get('list', 'Admin\Users::list');
+    });
+});
diff --git a/user_guide_src/source/incoming/routing/023-2.php b/user_guide_src/source/incoming/routing/023-2.php
deleted file mode 100644
index e2a3784f335f..000000000000
--- a/user_guide_src/source/incoming/routing/023-2.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$routes->add('products', 'Product::feature');
diff --git a/user_guide_src/source/incoming/routing/023.php b/user_guide_src/source/incoming/routing/023.php
index 5469c79db91a..d7624ddc6d5c 100644
--- a/user_guide_src/source/incoming/routing/023.php
+++ b/user_guide_src/source/incoming/routing/023.php
@@ -1,8 +1,7 @@
 <?php
 
-// The route is defined as:
-$routes->get('users/(:num)/gallery(:any)', 'Galleries::showUserGallery/$1/$2', ['as' => 'user_gallery']);
-
-// Generate the relative URL to link to user ID 15, gallery 12
-// Generates: /users/15/gallery/12
-<a href="<?= route_to('user_gallery', 15, 12) ?>">View Gallery</a>
+$routes->group('', ['namespace' => 'Myth\Auth\Controllers'], static function ($routes) {
+    $routes->get('login', 'AuthController::login', ['as' => 'login']);
+    $routes->post('login', 'AuthController::attemptLogin');
+    $routes->get('logout', 'AuthController::logout');
+});
diff --git a/user_guide_src/source/incoming/routing/024.php b/user_guide_src/source/incoming/routing/024.php
index 7351142dea77..69a4c184ab36 100644
--- a/user_guide_src/source/incoming/routing/024.php
+++ b/user_guide_src/source/incoming/routing/024.php
@@ -1,5 +1,5 @@
 <?php
 
-$routes->post('products', 'Product::feature');
-$routes->put('products/1', 'Product::feature');
-$routes->delete('products/1', 'Product::feature');
+$routes->environment('development', function ($routes) {
+    $routes->get('builder', 'Tools\Builder::index');
+});
diff --git a/user_guide_src/source/incoming/routing/025.php b/user_guide_src/source/incoming/routing/025.php
index a071f75cd156..0af87a58c3b5 100644
--- a/user_guide_src/source/incoming/routing/025.php
+++ b/user_guide_src/source/incoming/routing/025.php
@@ -1,3 +1,8 @@
 <?php
 
-$routes->match(['get', 'put'], 'products', 'Product::feature');
+// The route is defined as:
+$routes->get('users/(:num)/gallery(:any)', 'App\Controllers\Galleries::showUserGallery/$1/$2');
+
+// Generate the relative URL to link to user ID 15, gallery 12
+// Generates: /users/15/gallery/12
+<a href="<?= route_to('App\Controllers\Galleries::showUserGallery', 15, 12) ?>">View Gallery</a>
diff --git a/user_guide_src/source/incoming/routing/026.php b/user_guide_src/source/incoming/routing/026.php
index a82d57ebc5c7..5469c79db91a 100644
--- a/user_guide_src/source/incoming/routing/026.php
+++ b/user_guide_src/source/incoming/routing/026.php
@@ -1,3 +1,8 @@
 <?php
 
-$routes->cli('migrate', 'App\Database::migrate');
+// The route is defined as:
+$routes->get('users/(:num)/gallery(:any)', 'Galleries::showUserGallery/$1/$2', ['as' => 'user_gallery']);
+
+// Generate the relative URL to link to user ID 15, gallery 12
+// Generates: /users/15/gallery/12
+<a href="<?= route_to('user_gallery', 15, 12) ?>">View Gallery</a>
diff --git a/user_guide_src/source/incoming/routing/027.php b/user_guide_src/source/incoming/routing/027.php
index 31c1dda07a70..e2a3784f335f 100644
--- a/user_guide_src/source/incoming/routing/027.php
+++ b/user_guide_src/source/incoming/routing/027.php
@@ -1,14 +1,3 @@
 <?php
 
-$routes->add('from', 'to', $options);
-$routes->get('from', 'to', $options);
-$routes->post('from', 'to', $options);
-$routes->put('from', 'to', $options);
-$routes->head('from', 'to', $options);
-$routes->options('from', 'to', $options);
-$routes->delete('from', 'to', $options);
-$routes->patch('from', 'to', $options);
-$routes->match(['get', 'put'], 'from', 'to', $options);
-$routes->resource('photos', $options);
-$routes->map($array, $options);
-$routes->group('name', $options, function ());
+$routes->add('products', 'Product::feature');
diff --git a/user_guide_src/source/incoming/routing/028.php b/user_guide_src/source/incoming/routing/028.php
index ca1121e0786d..a82d57ebc5c7 100644
--- a/user_guide_src/source/incoming/routing/028.php
+++ b/user_guide_src/source/incoming/routing/028.php
@@ -1,3 +1,3 @@
 <?php
 
-$routes->get('admin',' AdminController::index', ['filter' => 'admin-auth']);
+$routes->cli('migrate', 'App\Database::migrate');
diff --git a/user_guide_src/source/incoming/routing/029.php b/user_guide_src/source/incoming/routing/029.php
index b50db49bd962..31c1dda07a70 100644
--- a/user_guide_src/source/incoming/routing/029.php
+++ b/user_guide_src/source/incoming/routing/029.php
@@ -1,3 +1,14 @@
 <?php
 
-$routes->post('users/delete/(:segment)', 'AdminController::index', ['filter' => 'admin-auth:dual,noreturn']);
+$routes->add('from', 'to', $options);
+$routes->get('from', 'to', $options);
+$routes->post('from', 'to', $options);
+$routes->put('from', 'to', $options);
+$routes->head('from', 'to', $options);
+$routes->options('from', 'to', $options);
+$routes->delete('from', 'to', $options);
+$routes->patch('from', 'to', $options);
+$routes->match(['get', 'put'], 'from', 'to', $options);
+$routes->resource('photos', $options);
+$routes->map($array, $options);
+$routes->group('name', $options, function ());
diff --git a/user_guide_src/source/incoming/routing/030.php b/user_guide_src/source/incoming/routing/030.php
index 14d5142de2f0..ca1121e0786d 100644
--- a/user_guide_src/source/incoming/routing/030.php
+++ b/user_guide_src/source/incoming/routing/030.php
@@ -1,3 +1,3 @@
 <?php
 
-$routes->get('admin',' AdminController::index', ['filter' => \App\Filters\SomeFilter::class]);
+$routes->get('admin',' AdminController::index', ['filter' => 'admin-auth']);
diff --git a/user_guide_src/source/incoming/routing/031.php b/user_guide_src/source/incoming/routing/031.php
index 24cf6c5dbc2d..b50db49bd962 100644
--- a/user_guide_src/source/incoming/routing/031.php
+++ b/user_guide_src/source/incoming/routing/031.php
@@ -1,3 +1,3 @@
 <?php
 
-$routes->get('admin',' AdminController::index', ['filter' => ['admin-auth', \App\Filters\SomeFilter::class]]);
+$routes->post('users/delete/(:segment)', 'AdminController::index', ['filter' => 'admin-auth:dual,noreturn']);
diff --git a/user_guide_src/source/incoming/routing/032.php b/user_guide_src/source/incoming/routing/032.php
index b992deb96ecf..14d5142de2f0 100644
--- a/user_guide_src/source/incoming/routing/032.php
+++ b/user_guide_src/source/incoming/routing/032.php
@@ -1,4 +1,3 @@
 <?php
 
-// Routes to \Admin\Users::index()
-$routes->get('admin/users', 'Users::index', ['namespace' => 'Admin']);
+$routes->get('admin',' AdminController::index', ['filter' => \App\Filters\SomeFilter::class]);
diff --git a/user_guide_src/source/incoming/routing/033.php b/user_guide_src/source/incoming/routing/033.php
index 5b415a50138b..24cf6c5dbc2d 100644
--- a/user_guide_src/source/incoming/routing/033.php
+++ b/user_guide_src/source/incoming/routing/033.php
@@ -1,3 +1,3 @@
 <?php
 
-$routes->get('from', 'to', ['hostname' => 'accounts.example.com']);
+$routes->get('admin',' AdminController::index', ['filter' => ['admin-auth', \App\Filters\SomeFilter::class]]);
diff --git a/user_guide_src/source/incoming/routing/034.php b/user_guide_src/source/incoming/routing/034.php
index 32a74934eb3a..b992deb96ecf 100644
--- a/user_guide_src/source/incoming/routing/034.php
+++ b/user_guide_src/source/incoming/routing/034.php
@@ -1,4 +1,4 @@
 <?php
 
-// Limit to media.example.com
-$routes->get('from', 'to', ['subdomain' => 'media']);
+// Routes to \Admin\Users::index()
+$routes->get('admin/users', 'Users::index', ['namespace' => 'Admin']);
diff --git a/user_guide_src/source/incoming/routing/035.php b/user_guide_src/source/incoming/routing/035.php
index 0d0fd0e67fb4..5b415a50138b 100644
--- a/user_guide_src/source/incoming/routing/035.php
+++ b/user_guide_src/source/incoming/routing/035.php
@@ -1,4 +1,3 @@
 <?php
 
-// Limit to any sub-domain
-$routes->get('from', 'to', ['subdomain' => '*']);
+$routes->get('from', 'to', ['hostname' => 'accounts.example.com']);
diff --git a/user_guide_src/source/incoming/routing/036.php b/user_guide_src/source/incoming/routing/036.php
index ec7fa680f65e..32a74934eb3a 100644
--- a/user_guide_src/source/incoming/routing/036.php
+++ b/user_guide_src/source/incoming/routing/036.php
@@ -1,6 +1,4 @@
 <?php
 
-$routes->get('users/(:num)', 'users/show/$1', ['offset' => 1]);
-
-// Creates:
-$routes['users/(:num)'] = 'users/show/$2';
+// Limit to media.example.com
+$routes->get('from', 'to', ['subdomain' => 'media']);
diff --git a/user_guide_src/source/incoming/routing/037.php b/user_guide_src/source/incoming/routing/037.php
index 29fc83e59f17..0d0fd0e67fb4 100644
--- a/user_guide_src/source/incoming/routing/037.php
+++ b/user_guide_src/source/incoming/routing/037.php
@@ -1,12 +1,4 @@
 <?php
 
-// First you need to enable sorting.
-$routes->setPrioritize();
-
-// App\Config\Routes
-$routes->get('(.*)', 'Posts::index', ['priority' => 1]);
-
-// Modules\Acme\Config\Routes
-$routes->get('admin', 'Admin::index');
-
-// The "admin" route will now be processed before the wildcard router.
+// Limit to any sub-domain
+$routes->get('from', 'to', ['subdomain' => '*']);
diff --git a/user_guide_src/source/incoming/routing/038.php b/user_guide_src/source/incoming/routing/038.php
index 9465f4147e2c..ec7fa680f65e 100644
--- a/user_guide_src/source/incoming/routing/038.php
+++ b/user_guide_src/source/incoming/routing/038.php
@@ -1,3 +1,6 @@
 <?php
 
-$routes->setPrioritize(false);
+$routes->get('users/(:num)', 'users/show/$1', ['offset' => 1]);
+
+// Creates:
+$routes['users/(:num)'] = 'users/show/$2';
diff --git a/user_guide_src/source/incoming/routing/039.php b/user_guide_src/source/incoming/routing/039.php
index 98aef9276f9d..29fc83e59f17 100644
--- a/user_guide_src/source/incoming/routing/039.php
+++ b/user_guide_src/source/incoming/routing/039.php
@@ -1,9 +1,12 @@
 <?php
 
-$routes->setDefaultNamespace('');
+// First you need to enable sorting.
+$routes->setPrioritize();
 
-// Controller is \Users
-$routes->get('users', 'Users::index');
+// App\Config\Routes
+$routes->get('(.*)', 'Posts::index', ['priority' => 1]);
 
-// Controller is \Admin\Users
-$routes->get('users', 'Admin\Users::index');
+// Modules\Acme\Config\Routes
+$routes->get('admin', 'Admin::index');
+
+// The "admin" route will now be processed before the wildcard router.
diff --git a/user_guide_src/source/incoming/routing/040.php b/user_guide_src/source/incoming/routing/040.php
index fbbbee2300df..9465f4147e2c 100644
--- a/user_guide_src/source/incoming/routing/040.php
+++ b/user_guide_src/source/incoming/routing/040.php
@@ -1,9 +1,3 @@
 <?php
 
-$routes->setDefaultNamespace('App');
-
-// Controller is \App\Users
-$routes->get('users', 'Users::index');
-
-// Controller is \App\Admin\Users
-$routes->get('users', 'Admin\Users::index');
+$routes->setPrioritize(false);
diff --git a/user_guide_src/source/incoming/routing/041.php b/user_guide_src/source/incoming/routing/041.php
index 5d17df8130d4..98aef9276f9d 100644
--- a/user_guide_src/source/incoming/routing/041.php
+++ b/user_guide_src/source/incoming/routing/041.php
@@ -1,4 +1,9 @@
 <?php
 
-// example.com routes to app/Controllers/Welcome.php
-$routes->setDefaultController('Welcome');
+$routes->setDefaultNamespace('');
+
+// Controller is \Users
+$routes->get('users', 'Users::index');
+
+// Controller is \Admin\Users
+$routes->get('users', 'Admin\Users::index');
diff --git a/user_guide_src/source/incoming/routing/042.php b/user_guide_src/source/incoming/routing/042.php
index e926e651287d..fbbbee2300df 100644
--- a/user_guide_src/source/incoming/routing/042.php
+++ b/user_guide_src/source/incoming/routing/042.php
@@ -1,3 +1,9 @@
 <?php
 
-$routes->setDefaultMethod('listAll');
+$routes->setDefaultNamespace('App');
+
+// Controller is \App\Users
+$routes->get('users', 'Users::index');
+
+// Controller is \App\Admin\Users
+$routes->get('users', 'Admin\Users::index');
diff --git a/user_guide_src/source/incoming/routing/043.php b/user_guide_src/source/incoming/routing/043.php
index 31d49508ab86..5d17df8130d4 100644
--- a/user_guide_src/source/incoming/routing/043.php
+++ b/user_guide_src/source/incoming/routing/043.php
@@ -1,3 +1,4 @@
 <?php
 
-$routes->setTranslateURIDashes(true);
+// example.com routes to app/Controllers/Welcome.php
+$routes->setDefaultController('Welcome');
diff --git a/user_guide_src/source/incoming/routing/044.php b/user_guide_src/source/incoming/routing/044.php
index c331102cd9f4..e926e651287d 100644
--- a/user_guide_src/source/incoming/routing/044.php
+++ b/user_guide_src/source/incoming/routing/044.php
@@ -1,3 +1,3 @@
 <?php
 
-$routes->setAutoRoute(false);
+$routes->setDefaultMethod('listAll');
diff --git a/user_guide_src/source/incoming/routing/045.php b/user_guide_src/source/incoming/routing/045.php
index 1f3758e244d4..31d49508ab86 100644
--- a/user_guide_src/source/incoming/routing/045.php
+++ b/user_guide_src/source/incoming/routing/045.php
@@ -1,10 +1,3 @@
 <?php
 
-// Would execute the show404 method of the App\Errors class
-$routes->set404Override('App\Errors::show404');
-
-// Will display a custom view
-$routes->set404Override(function ()
-{
-    echo view('my_errors/not_found.html');
-});
+$routes->setTranslateURIDashes(true);
diff --git a/user_guide_src/source/incoming/routing/046.php b/user_guide_src/source/incoming/routing/046.php
index e3dd9f60c989..c331102cd9f4 100644
--- a/user_guide_src/source/incoming/routing/046.php
+++ b/user_guide_src/source/incoming/routing/046.php
@@ -1,7 +1,3 @@
 <?php
 
-// to enable
-$routes->setPrioritize();
-
-// to disable
-$routes->setPrioritize(false);
+$routes->setAutoRoute(false);
diff --git a/user_guide_src/source/incoming/routing/047.php b/user_guide_src/source/incoming/routing/047.php
new file mode 100644
index 000000000000..1f3758e244d4
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/047.php
@@ -0,0 +1,10 @@
+<?php
+
+// Would execute the show404 method of the App\Errors class
+$routes->set404Override('App\Errors::show404');
+
+// Will display a custom view
+$routes->set404Override(function ()
+{
+    echo view('my_errors/not_found.html');
+});
diff --git a/user_guide_src/source/incoming/routing/048.php b/user_guide_src/source/incoming/routing/048.php
new file mode 100644
index 000000000000..e3dd9f60c989
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/048.php
@@ -0,0 +1,7 @@
+<?php
+
+// to enable
+$routes->setPrioritize();
+
+// to disable
+$routes->setPrioritize(false);
diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
index fcab322aa3d9..ad45f9fea4f3 100644
--- a/user_guide_src/source/libraries/sessions.rst
+++ b/user_guide_src/source/libraries/sessions.rst
@@ -119,7 +119,7 @@ Retrieving Session Data
 Any piece of information from the session array is available through the
 ``$_SESSION`` superglobal:
 
-.. literalinclude:: sessions/005-2.php
+.. literalinclude:: sessions/005.php
    :lines: 2-
 
 Or through the conventional accessor method:
@@ -264,7 +264,7 @@ You can also pass an array to ``setFlashdata()``, in the same manner as
 Reading flashdata variables is the same as reading regular session data
 through ``$_SESSION``:
 
-.. literalinclude:: sessions/005.php
+.. literalinclude:: sessions/024.php
    :lines: 2-
 
 .. important:: The ``get()`` method WILL return flashdata items when
@@ -335,7 +335,7 @@ You can also pass an array to ``setTempdata()``:
 To read a tempdata variable, again you can just access it through the
 ``$_SESSION`` superglobal array:
 
-.. literalinclude:: sessions/005-1.php
+.. literalinclude:: sessions/033.php
    :lines: 2-
 
 .. important:: The ``get()`` method WILL return tempdata items when
diff --git a/user_guide_src/source/libraries/sessions/005-1.php b/user_guide_src/source/libraries/sessions/005-1.php
deleted file mode 100644
index 4f09358d5fc8..000000000000
--- a/user_guide_src/source/libraries/sessions/005-1.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$_SESSION['item']
diff --git a/user_guide_src/source/libraries/sessions/005-2.php b/user_guide_src/source/libraries/sessions/005-2.php
deleted file mode 100644
index 4f09358d5fc8..000000000000
--- a/user_guide_src/source/libraries/sessions/005-2.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$_SESSION['item']
diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index b2117f37c37a..265eb87dc20a 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -35,7 +35,7 @@ Creating the Upload Form
 Using a text editor, create a form called upload_form.php. In it, place
 this code and save it to your **app/Views/** directory:
 
-.. literalinclude:: uploaded_files/000.php
+.. literalinclude:: uploaded_files/001.php
 
 You'll notice we are using a form helper to create the opening form tag.
 File uploads require a multipart form, so the helper creates the proper
@@ -75,7 +75,7 @@ The Controller
 Using a text editor, create a controller called Upload.php. In it, place
 this code and save it to your **app/Controllers/** directory:
 
-.. literalinclude:: uploaded_files/001.php
+.. literalinclude:: uploaded_files/002.php
 
 .. note:: Since the value of a file upload HTML field doesn't exist, and is stored in the ``$_FILES`` global,
     only :ref:`rules-for-file-uploads` can be used to validate upload file with :doc:`validation`.
@@ -114,7 +114,7 @@ common interface.
 Files are accessed through the current ``IncomingRequest`` instance. To retrieve all files that were uploaded with this
 request, use ``getFiles()``. This will return an array of files represented by instances of ``CodeIgniter\HTTP\Files\UploadedFile``:
 
-.. literalinclude:: uploaded_files/002.php
+.. literalinclude:: uploaded_files/003.php
    :lines: 2-
 
 Of course, there are multiple ways to name the file input, and anything but the simplest can create strange results.
@@ -124,7 +124,7 @@ The array returns in a manner that you would expect. With the simplest usage, a
 
 Which would return a simple array like:
 
-.. literalinclude:: uploaded_files/003.php
+.. literalinclude:: uploaded_files/004.php
    :lines: 2-
 
 .. note:: The UploadedFile instance corresponds to ``$_FILES``. Even if a user just clicks the submit button and does not upload any file, the instance will still exist. You can check that the file was actually uploaded by the ``isValid()`` method in UploadedFile. See :ref:`verify-a-file`.
@@ -135,7 +135,7 @@ If you used an array notation for the name, the input would look something like:
 
 The array returned by ``getFiles()`` would look more like this:
 
-.. literalinclude:: uploaded_files/004.php
+.. literalinclude:: uploaded_files/005.php
    :lines: 2-
 
 In some cases, you may specify an array of files to upload::
@@ -145,7 +145,7 @@ In some cases, you may specify an array of files to upload::
 
 In this case, the returned array of files would be more like:
 
-.. literalinclude:: uploaded_files/005.php
+.. literalinclude:: uploaded_files/006.php
    :lines: 2-
 
 Single File
@@ -162,7 +162,7 @@ With the simplest usage, a single file might be submitted like::
 
 Which would return a simple file instance like:
 
-.. literalinclude:: uploaded_files/006.php
+.. literalinclude:: uploaded_files/007.php
    :lines: 2-
 
 Array notation
@@ -174,7 +174,7 @@ If you used an array notation for the name, the input would look something like:
 
 For get the file instance:
 
-.. literalinclude:: uploaded_files/007.php
+.. literalinclude:: uploaded_files/008.php
    :lines: 2-
 
 Multiple files
@@ -186,7 +186,7 @@ Multiple files
 
 In controller:
 
-.. literalinclude:: uploaded_files/008.php
+.. literalinclude:: uploaded_files/009.php
    :lines: 2-
 
 where the ``images`` is a loop from the form field name.
@@ -195,12 +195,12 @@ If there are multiple files with the same name you can use ``getFile()`` to retr
 
 In controller:
 
-.. literalinclude:: uploaded_files/009.php
+.. literalinclude:: uploaded_files/010.php
    :lines: 2-
 
 You might find it easier to use ``getFileMultiple()``, to get an array of uploaded files with the same name:
 
-.. literalinclude:: uploaded_files/010.php
+.. literalinclude:: uploaded_files/011.php
    :lines: 2-
 
 Another example::
@@ -210,7 +210,7 @@ Another example::
 
 In controller:
 
-.. literalinclude:: uploaded_files/011.php
+.. literalinclude:: uploaded_files/012.php
    :lines: 2-
 
 .. note:: Using ``getFiles()`` is more appropriate.
@@ -229,7 +229,7 @@ Verify a File
 
 You can check that a file was actually uploaded via HTTP with no errors by calling the ``isValid()`` method:
 
-.. literalinclude:: uploaded_files/012.php
+.. literalinclude:: uploaded_files/013.php
    :lines: 2-
 
 As seen in this example, if a file had an upload error, you can retrieve the error code (an integer) and the error
@@ -253,21 +253,21 @@ You can retrieve the original filename provided by the client with the ``getName
 filename sent by the client, and should not be trusted. If the file has been moved, this will return the final name of
 the moved file:
 
-.. literalinclude:: uploaded_files/013.php
+.. literalinclude:: uploaded_files/014.php
    :lines: 2-
 
 **getClientName()**
 
 Always returns the original name of the uploaded file as sent by the client, even if the file has been moved:
 
-.. literalinclude:: uploaded_files/014.php
+.. literalinclude:: uploaded_files/015.php
    :lines: 2-
 
 **getTempName()**
 
 To get the full path of the temp file that was created during the upload, you can use the ``getTempName()`` method:
 
-.. literalinclude:: uploaded_files/015.php
+.. literalinclude:: uploaded_files/016.php
    :lines: 2-
 
 Other File Info
@@ -277,7 +277,7 @@ Other File Info
 
 Returns the original file extension, based on the file name that was uploaded:
 
-.. literalinclude:: uploaded_files/016.php
+.. literalinclude:: uploaded_files/017.php
    :lines: 2-
 
 .. warning:: This is NOT a trusted source. For a trusted version, use ``guessExtension()`` instead.
@@ -287,7 +287,7 @@ Returns the original file extension, based on the file name that was uploaded:
 Returns the mime type (mime type) of the file as provided by the client. This is NOT a trusted value. For a trusted
 version, use ``getMimeType()`` instead:
 
-.. literalinclude:: uploaded_files/017.php
+.. literalinclude:: uploaded_files/018.php
    :lines: 2-
 
 Moving Files
@@ -296,18 +296,18 @@ Moving Files
 Each file can be moved to its new location with the aptly named ``move()`` method. This takes the directory to move
 the file to as the first parameter:
 
-.. literalinclude:: uploaded_files/018.php
+.. literalinclude:: uploaded_files/019.php
    :lines: 2-
 
 By default, the original filename was used. You can specify a new filename by passing it as the second parameter:
 
-.. literalinclude:: uploaded_files/019.php
+.. literalinclude:: uploaded_files/020.php
    :lines: 2-
 
 Once the file has been removed the temporary file is deleted. You can check if a file has been moved already with
 the ``hasMoved()`` method, which returns a boolean:
 
-.. literalinclude:: uploaded_files/020.php
+.. literalinclude:: uploaded_files/021.php
    :lines: 2-
 
 Moving an uploaded file can fail, with an HTTPException, under several circumstances:
@@ -328,13 +328,13 @@ With the simplest usage, a single file might be submitted like::
 By default, upload files are saved in **writable/uploads** directory. The **YYYYMMDD** folder
 and random file name will be created. Returns a file path:
 
-.. literalinclude:: uploaded_files/021.php
+.. literalinclude:: uploaded_files/022.php
    :lines: 2-
 
 You can specify a directory to move the file to as the first parameter. A new filename by
 passing it as the second parameter:
 
-.. literalinclude:: uploaded_files/022.php
+.. literalinclude:: uploaded_files/023.php
    :lines: 2-
 
 Moving an uploaded file can fail, with an ``HTTPException``, under several circumstances:
diff --git a/user_guide_src/source/libraries/uploaded_files/000.php b/user_guide_src/source/libraries/uploaded_files/000.php
deleted file mode 100644
index d58b7664d28b..000000000000
--- a/user_guide_src/source/libraries/uploaded_files/000.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <title>Upload Form</title>
-</head>
-<body>
-
-<?php foreach ($errors as $error): ?>
-    <li><?= esc($error) ?></li>
-<?php endforeach ?>
-
-<?= form_open_multipart('upload/upload') ?>
-
-<input type="file" name="userfile" size="20" />
-
-<br /><br />
-
-<input type="submit" value="upload" />
-
-</form>
-
-</body>
-</html>
diff --git a/user_guide_src/source/libraries/uploaded_files/001.php b/user_guide_src/source/libraries/uploaded_files/001.php
index f186d517fd96..d58b7664d28b 100644
--- a/user_guide_src/source/libraries/uploaded_files/001.php
+++ b/user_guide_src/source/libraries/uploaded_files/001.php
@@ -1,48 +1,23 @@
-<?php
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Upload Form</title>
+</head>
+<body>
 
-namespace App\Controllers;
+<?php foreach ($errors as $error): ?>
+    <li><?= esc($error) ?></li>
+<?php endforeach ?>
 
-use CodeIgniter\Files\File;
+<?= form_open_multipart('upload/upload') ?>
 
-class Upload extends BaseController
-{
-    protected $helpers = ['form'];
+<input type="file" name="userfile" size="20" />
 
-    public function index()
-    {
-        return view('upload_form', ['errors' => []]);
-    }
+<br /><br />
 
-    public function upload()
-    {
-        $validationRule = [
-            'userfile' => [
-                'label' => 'Image File',
-                'rules' => 'uploaded[userfile]'
-                    . '|is_image[userfile]'
-                    . '|mime_in[userfile,image/jpg,image/jpeg,image/gif,image/png,image/webp]'
-                    . '|max_size[userfile,100]'
-                    . '|max_dims[userfile,1024,768]',
-            ],
-        ];
-        if (! $this->validate($validationRule)) {
-            $data = ['errors' => $this->validator->getErrors()];
+<input type="submit" value="upload" />
 
-            return view('upload_form', $data);
-        }
+</form>
 
-        $img = $this->request->getFile('userfile');
-
-        if (! $img->hasMoved()) {
-            $filepath = WRITEPATH . 'uploads/' . $img->store();
-
-            $data = ['uploaded_flleinfo' => new File($filepath)];
-
-            return view('upload_success', $data);
-        } else {
-            $data = ['errors' => 'The file has already been moved.'];
-
-            return view('upload_form', $data);
-        }
-    }
-}
+</body>
+</html>
diff --git a/user_guide_src/source/libraries/uploaded_files/002.php b/user_guide_src/source/libraries/uploaded_files/002.php
index 17141efbdde8..f186d517fd96 100644
--- a/user_guide_src/source/libraries/uploaded_files/002.php
+++ b/user_guide_src/source/libraries/uploaded_files/002.php
@@ -1,3 +1,48 @@
 <?php
 
-$files = $this->request->getFiles();
+namespace App\Controllers;
+
+use CodeIgniter\Files\File;
+
+class Upload extends BaseController
+{
+    protected $helpers = ['form'];
+
+    public function index()
+    {
+        return view('upload_form', ['errors' => []]);
+    }
+
+    public function upload()
+    {
+        $validationRule = [
+            'userfile' => [
+                'label' => 'Image File',
+                'rules' => 'uploaded[userfile]'
+                    . '|is_image[userfile]'
+                    . '|mime_in[userfile,image/jpg,image/jpeg,image/gif,image/png,image/webp]'
+                    . '|max_size[userfile,100]'
+                    . '|max_dims[userfile,1024,768]',
+            ],
+        ];
+        if (! $this->validate($validationRule)) {
+            $data = ['errors' => $this->validator->getErrors()];
+
+            return view('upload_form', $data);
+        }
+
+        $img = $this->request->getFile('userfile');
+
+        if (! $img->hasMoved()) {
+            $filepath = WRITEPATH . 'uploads/' . $img->store();
+
+            $data = ['uploaded_flleinfo' => new File($filepath)];
+
+            return view('upload_success', $data);
+        } else {
+            $data = ['errors' => 'The file has already been moved.'];
+
+            return view('upload_form', $data);
+        }
+    }
+}
diff --git a/user_guide_src/source/libraries/uploaded_files/003.php b/user_guide_src/source/libraries/uploaded_files/003.php
index 368facf4f7ab..17141efbdde8 100644
--- a/user_guide_src/source/libraries/uploaded_files/003.php
+++ b/user_guide_src/source/libraries/uploaded_files/003.php
@@ -1,5 +1,3 @@
 <?php
 
-[
-    'avatar' => // UploadedFile instance
-]
+$files = $this->request->getFiles();
diff --git a/user_guide_src/source/libraries/uploaded_files/004.php b/user_guide_src/source/libraries/uploaded_files/004.php
index bf31373e57bd..368facf4f7ab 100644
--- a/user_guide_src/source/libraries/uploaded_files/004.php
+++ b/user_guide_src/source/libraries/uploaded_files/004.php
@@ -1,9 +1,5 @@
 <?php
 
 [
-    'my-form' => [
-        'details' => [
-            'avatar' => // UploadedFile instance
-        ]
-    ]
+    'avatar' => // UploadedFile instance
 ]
diff --git a/user_guide_src/source/libraries/uploaded_files/005.php b/user_guide_src/source/libraries/uploaded_files/005.php
index c53d82a298fc..bf31373e57bd 100644
--- a/user_guide_src/source/libraries/uploaded_files/005.php
+++ b/user_guide_src/source/libraries/uploaded_files/005.php
@@ -3,9 +3,7 @@
 [
     'my-form' => [
         'details' => [
-            'avatar' => [
-                0 => /* UploadedFile instance */,
-                1 => /* UploadedFile instance */
+            'avatar' => // UploadedFile instance
         ]
     ]
 ]
diff --git a/user_guide_src/source/libraries/uploaded_files/006.php b/user_guide_src/source/libraries/uploaded_files/006.php
index e5f6440d96fb..c53d82a298fc 100644
--- a/user_guide_src/source/libraries/uploaded_files/006.php
+++ b/user_guide_src/source/libraries/uploaded_files/006.php
@@ -1,3 +1,11 @@
 <?php
 
-$file = $this->request->getFile('userfile');
+[
+    'my-form' => [
+        'details' => [
+            'avatar' => [
+                0 => /* UploadedFile instance */,
+                1 => /* UploadedFile instance */
+        ]
+    ]
+]
diff --git a/user_guide_src/source/libraries/uploaded_files/007.php b/user_guide_src/source/libraries/uploaded_files/007.php
index ad71bd5575fb..e5f6440d96fb 100644
--- a/user_guide_src/source/libraries/uploaded_files/007.php
+++ b/user_guide_src/source/libraries/uploaded_files/007.php
@@ -1,3 +1,3 @@
 <?php
 
-$file = $this->request->getFile('my-form.details.avatar');
+$file = $this->request->getFile('userfile');
diff --git a/user_guide_src/source/libraries/uploaded_files/008.php b/user_guide_src/source/libraries/uploaded_files/008.php
index f37491c04821..ad71bd5575fb 100644
--- a/user_guide_src/source/libraries/uploaded_files/008.php
+++ b/user_guide_src/source/libraries/uploaded_files/008.php
@@ -1,10 +1,3 @@
 <?php
 
-if ($imagefile = $this->request->getFiles()) {
-    foreach($imagefile['images'] as $img) {
-        if ($img->isValid() && ! $img->hasMoved()) {
-            $newName = $img->getRandomName();
-            $img->move(WRITEPATH . 'uploads', $newName);
-        }
-    }
-}
+$file = $this->request->getFile('my-form.details.avatar');
diff --git a/user_guide_src/source/libraries/uploaded_files/009.php b/user_guide_src/source/libraries/uploaded_files/009.php
index da51d17dbd15..f37491c04821 100644
--- a/user_guide_src/source/libraries/uploaded_files/009.php
+++ b/user_guide_src/source/libraries/uploaded_files/009.php
@@ -1,4 +1,10 @@
 <?php
 
-$file1 = $this->request->getFile('images.0');
-$file2 = $this->request->getFile('images.1');
+if ($imagefile = $this->request->getFiles()) {
+    foreach($imagefile['images'] as $img) {
+        if ($img->isValid() && ! $img->hasMoved()) {
+            $newName = $img->getRandomName();
+            $img->move(WRITEPATH . 'uploads', $newName);
+        }
+    }
+}
diff --git a/user_guide_src/source/libraries/uploaded_files/010.php b/user_guide_src/source/libraries/uploaded_files/010.php
index 646e6bb0b8b9..da51d17dbd15 100644
--- a/user_guide_src/source/libraries/uploaded_files/010.php
+++ b/user_guide_src/source/libraries/uploaded_files/010.php
@@ -1,3 +1,4 @@
 <?php
 
-$files = $this->request->getFileMultiple('images');
+$file1 = $this->request->getFile('images.0');
+$file2 = $this->request->getFile('images.1');
diff --git a/user_guide_src/source/libraries/uploaded_files/011.php b/user_guide_src/source/libraries/uploaded_files/011.php
index d18a755ba234..646e6bb0b8b9 100644
--- a/user_guide_src/source/libraries/uploaded_files/011.php
+++ b/user_guide_src/source/libraries/uploaded_files/011.php
@@ -1,4 +1,3 @@
 <?php
 
-$file1 = $this->request->getFile('my-form.details.avatars.0');
-$file2 = $this->request->getFile('my-form.details.avatars.1');
+$files = $this->request->getFileMultiple('images');
diff --git a/user_guide_src/source/libraries/uploaded_files/012.php b/user_guide_src/source/libraries/uploaded_files/012.php
index 094ea73c1064..d18a755ba234 100644
--- a/user_guide_src/source/libraries/uploaded_files/012.php
+++ b/user_guide_src/source/libraries/uploaded_files/012.php
@@ -1,5 +1,4 @@
 <?php
 
-if (! $file->isValid()) {
-    throw new \RuntimeException($file->getErrorString() . '(' . $file->getError() . ')');
-}
+$file1 = $this->request->getFile('my-form.details.avatars.0');
+$file2 = $this->request->getFile('my-form.details.avatars.1');
diff --git a/user_guide_src/source/libraries/uploaded_files/013.php b/user_guide_src/source/libraries/uploaded_files/013.php
index 057a56b3e9a0..094ea73c1064 100644
--- a/user_guide_src/source/libraries/uploaded_files/013.php
+++ b/user_guide_src/source/libraries/uploaded_files/013.php
@@ -1,3 +1,5 @@
 <?php
 
-$name = $file->getName();
+if (! $file->isValid()) {
+    throw new \RuntimeException($file->getErrorString() . '(' . $file->getError() . ')');
+}
diff --git a/user_guide_src/source/libraries/uploaded_files/014.php b/user_guide_src/source/libraries/uploaded_files/014.php
index 4fb0cae0ad12..057a56b3e9a0 100644
--- a/user_guide_src/source/libraries/uploaded_files/014.php
+++ b/user_guide_src/source/libraries/uploaded_files/014.php
@@ -1,3 +1,3 @@
 <?php
 
-$originalName = $file->getClientName();
+$name = $file->getName();
diff --git a/user_guide_src/source/libraries/uploaded_files/015.php b/user_guide_src/source/libraries/uploaded_files/015.php
index c9e4774a4bbf..4fb0cae0ad12 100644
--- a/user_guide_src/source/libraries/uploaded_files/015.php
+++ b/user_guide_src/source/libraries/uploaded_files/015.php
@@ -1,3 +1,3 @@
 <?php
 
-$tempfile = $file->getTempName();
+$originalName = $file->getClientName();
diff --git a/user_guide_src/source/libraries/uploaded_files/016.php b/user_guide_src/source/libraries/uploaded_files/016.php
index 867877238c76..c9e4774a4bbf 100644
--- a/user_guide_src/source/libraries/uploaded_files/016.php
+++ b/user_guide_src/source/libraries/uploaded_files/016.php
@@ -1,3 +1,3 @@
 <?php
 
-$ext = $file->getClientExtension();
+$tempfile = $file->getTempName();
diff --git a/user_guide_src/source/libraries/uploaded_files/017.php b/user_guide_src/source/libraries/uploaded_files/017.php
index dd1288e441c3..867877238c76 100644
--- a/user_guide_src/source/libraries/uploaded_files/017.php
+++ b/user_guide_src/source/libraries/uploaded_files/017.php
@@ -1,5 +1,3 @@
 <?php
 
-$type = $file->getClientMimeType();
-
-echo $type; // image/png
+$ext = $file->getClientExtension();
diff --git a/user_guide_src/source/libraries/uploaded_files/018.php b/user_guide_src/source/libraries/uploaded_files/018.php
index 12499a3ca1ba..dd1288e441c3 100644
--- a/user_guide_src/source/libraries/uploaded_files/018.php
+++ b/user_guide_src/source/libraries/uploaded_files/018.php
@@ -1,3 +1,5 @@
 <?php
 
-$file->move(WRITEPATH . 'uploads');
+$type = $file->getClientMimeType();
+
+echo $type; // image/png
diff --git a/user_guide_src/source/libraries/uploaded_files/019.php b/user_guide_src/source/libraries/uploaded_files/019.php
index 2e6b39645a4b..12499a3ca1ba 100644
--- a/user_guide_src/source/libraries/uploaded_files/019.php
+++ b/user_guide_src/source/libraries/uploaded_files/019.php
@@ -1,4 +1,3 @@
 <?php
 
-$newName = $file->getRandomName();
-$file->move(WRITEPATH . 'uploads', $newName);
+$file->move(WRITEPATH . 'uploads');
diff --git a/user_guide_src/source/libraries/uploaded_files/020.php b/user_guide_src/source/libraries/uploaded_files/020.php
index 7f49d1f5232e..2e6b39645a4b 100644
--- a/user_guide_src/source/libraries/uploaded_files/020.php
+++ b/user_guide_src/source/libraries/uploaded_files/020.php
@@ -1,5 +1,4 @@
 <?php
 
-if ($file->isValid() && ! $file->hasMoved()) {
-    $file->move($path);
-}
+$newName = $file->getRandomName();
+$file->move(WRITEPATH . 'uploads', $newName);
diff --git a/user_guide_src/source/libraries/uploaded_files/021.php b/user_guide_src/source/libraries/uploaded_files/021.php
index 90f9495eaf7b..7f49d1f5232e 100644
--- a/user_guide_src/source/libraries/uploaded_files/021.php
+++ b/user_guide_src/source/libraries/uploaded_files/021.php
@@ -1,3 +1,5 @@
 <?php
 
-$path = $this->request->getFile('userfile')->store();
+if ($file->isValid() && ! $file->hasMoved()) {
+    $file->move($path);
+}
diff --git a/user_guide_src/source/libraries/uploaded_files/022.php b/user_guide_src/source/libraries/uploaded_files/022.php
index 0e552f417d52..90f9495eaf7b 100644
--- a/user_guide_src/source/libraries/uploaded_files/022.php
+++ b/user_guide_src/source/libraries/uploaded_files/022.php
@@ -1,3 +1,3 @@
 <?php
 
-$path = $this->request->getFile('userfile')->store('head_img/', 'user_name.jpg');
+$path = $this->request->getFile('userfile')->store();
diff --git a/user_guide_src/source/libraries/uploaded_files/023.php b/user_guide_src/source/libraries/uploaded_files/023.php
new file mode 100644
index 000000000000..0e552f417d52
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/023.php
@@ -0,0 +1,3 @@
+<?php
+
+$path = $this->request->getFile('userfile')->store('head_img/', 'user_name.jpg');
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 0f43f911a506..a74bca7904d8 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -534,12 +534,12 @@ The first step is to create custom views. These can be placed anywhere that the
 which means the standard View directory, or any namespaced View folder will work. For example, you could create
 a new view at **/app/Views/_errors_list.php**:
 
-.. literalinclude:: validation/029-2.php
+.. literalinclude:: validation/030.php
 
 An array named ``$errors`` is available within the view that contains a list of the errors, where the key is
 the name of the field that had the error, and the value is the error message, like this:
 
-.. literalinclude:: validation/030.php
+.. literalinclude:: validation/031.php
    :lines: 2-
 
 There are actually two types of views that you can create. The first has an array of all of the errors, and is what
@@ -555,7 +555,7 @@ Once you have your views created, you need to let the Validation library know ab
 Inside, you'll find the ``$templates`` property where you can list as many custom views as you want, and provide an
 short alias they can be referenced by. If we were to add our example file from above, it would look something like:
 
-.. literalinclude:: validation/031.php
+.. literalinclude:: validation/032.php
    :lines: 2-
 
 Specifying the Template
@@ -577,7 +577,7 @@ Rules are stored within simple, namespaced classes. They can be stored any locat
 autoloader can find it. These files are called RuleSets. To add a new RuleSet, edit **Config/Validation.php** and
 add the new file to the ``$ruleSets`` array:
 
-.. literalinclude:: validation/032.php
+.. literalinclude:: validation/033.php
    :lines: 2-
 
 You can add it as either a simple string with the fully qualified class name, or using the ``::class`` suffix as
@@ -586,19 +586,19 @@ shown above. The primary benefit here is that it provides some extra navigation
 Within the file itself, each method is a rule and must accept a string as the first parameter, and must return
 a boolean true or false value signifying true if it passed the test or false if it did not:
 
-.. literalinclude:: validation/033.php
+.. literalinclude:: validation/034.php
    :lines: 2-
 
 By default, the system will look within ``CodeIgniter\Language\en\Validation.php`` for the language strings used
 within errors. In custom rules, you may provide error messages by accepting a ``$error`` variable by reference in the
 second parameter:
 
-.. literalinclude:: validation/034.php
+.. literalinclude:: validation/035.php
    :lines: 2-
 
 Your new custom rule could now be used just like any other rule:
 
-.. literalinclude:: validation/035.php
+.. literalinclude:: validation/036.php
    :lines: 2-
 
 Allowing Parameters
@@ -608,7 +608,7 @@ If your method needs to work with parameters, the function will need a minimum o
 the parameter string, and an array with all of the data that was submitted the form. The ``$data`` array is especially handy
 for rules like ``require_with`` that needs to check the value of another submitted field to base its result on:
 
-.. literalinclude:: validation/036.php
+.. literalinclude:: validation/037.php
    :lines: 2-
 
 Custom errors can be returned as the fourth parameter, just as described above.
@@ -621,7 +621,7 @@ The following is a list of all the native rules that are available to use:
 .. note:: Rule is a string; there must be **no spaces** between the parameters, especially the ``is_unique`` rule.
     There can be no spaces before and after ``ignore_value``.
 
-.. literalinclude:: validation/037.php
+.. literalinclude:: validation/038.php
    :lines: 2-
 
 ======================= ========== ============================================= ===================================================
diff --git a/user_guide_src/source/libraries/validation/029-2.php b/user_guide_src/source/libraries/validation/029-2.php
deleted file mode 100644
index f7c69eb42e99..000000000000
--- a/user_guide_src/source/libraries/validation/029-2.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="alert alert-danger" role="alert">
-    <ul>
-    <?php foreach ($errors as $error): ?>
-        <li><?= esc($error) ?></li>
-    <?php endforeach ?>
-    </ul>
-</div>
diff --git a/user_guide_src/source/libraries/validation/030.php b/user_guide_src/source/libraries/validation/030.php
index 0da86ca2d054..f7c69eb42e99 100644
--- a/user_guide_src/source/libraries/validation/030.php
+++ b/user_guide_src/source/libraries/validation/030.php
@@ -1,6 +1,7 @@
-<?php
-
-$errors = [
-    'username' => 'The username field must be unique.',
-    'email'    => 'You must provide a valid email address.'
-];
+<div class="alert alert-danger" role="alert">
+    <ul>
+    <?php foreach ($errors as $error): ?>
+        <li><?= esc($error) ?></li>
+    <?php endforeach ?>
+    </ul>
+</div>
diff --git a/user_guide_src/source/libraries/validation/031.php b/user_guide_src/source/libraries/validation/031.php
index 110b159a41cc..0da86ca2d054 100644
--- a/user_guide_src/source/libraries/validation/031.php
+++ b/user_guide_src/source/libraries/validation/031.php
@@ -1,7 +1,6 @@
 <?php
 
-public $templates = [
-    'list'    => 'CodeIgniter\Validation\Views\list',
-    'single'  => 'CodeIgniter\Validation\Views\single',
-    'my_list' => '_errors_list',
+$errors = [
+    'username' => 'The username field must be unique.',
+    'email'    => 'You must provide a valid email address.'
 ];
diff --git a/user_guide_src/source/libraries/validation/032.php b/user_guide_src/source/libraries/validation/032.php
index ccee27b08ad7..110b159a41cc 100644
--- a/user_guide_src/source/libraries/validation/032.php
+++ b/user_guide_src/source/libraries/validation/032.php
@@ -1,13 +1,7 @@
 <?php
 
-use CodeIgniter\Validation\CreditCardRules;
-use CodeIgniter\Validation\FileRules;
-use CodeIgniter\Validation\FormatRules;
-use CodeIgniter\Validation\Rules;
-
-public $ruleSets = [
-    Rules::class,
-    FormatRules::class,
-    FileRules::class,
-    CreditCardRules::class,
+public $templates = [
+    'list'    => 'CodeIgniter\Validation\Views\list',
+    'single'  => 'CodeIgniter\Validation\Views\single',
+    'my_list' => '_errors_list',
 ];
diff --git a/user_guide_src/source/libraries/validation/033.php b/user_guide_src/source/libraries/validation/033.php
index d7a10b5071cd..ccee27b08ad7 100644
--- a/user_guide_src/source/libraries/validation/033.php
+++ b/user_guide_src/source/libraries/validation/033.php
@@ -1,9 +1,13 @@
 <?php
 
-class MyRules
-{
-    public function even(string $str): bool
-    {
-        return (int) $str % 2 == 0;
-    }
-}
+use CodeIgniter\Validation\CreditCardRules;
+use CodeIgniter\Validation\FileRules;
+use CodeIgniter\Validation\FormatRules;
+use CodeIgniter\Validation\Rules;
+
+public $ruleSets = [
+    Rules::class,
+    FormatRules::class,
+    FileRules::class,
+    CreditCardRules::class,
+];
diff --git a/user_guide_src/source/libraries/validation/034.php b/user_guide_src/source/libraries/validation/034.php
index a6a9b07f54ef..d7a10b5071cd 100644
--- a/user_guide_src/source/libraries/validation/034.php
+++ b/user_guide_src/source/libraries/validation/034.php
@@ -1,12 +1,9 @@
 <?php
 
-public function even(string $str, string &$error = null): bool
+class MyRules
 {
-    if ((int) $str % 2 !== 0) {
-        $error = lang('myerrors.evenError');
-
-        return false;
+    public function even(string $str): bool
+    {
+        return (int) $str % 2 == 0;
     }
-
-    return true;
 }
diff --git a/user_guide_src/source/libraries/validation/035.php b/user_guide_src/source/libraries/validation/035.php
index 99db5f30eae4..a6a9b07f54ef 100644
--- a/user_guide_src/source/libraries/validation/035.php
+++ b/user_guide_src/source/libraries/validation/035.php
@@ -1,5 +1,12 @@
 <?php
 
-$this->validate($request, [
-    'foo' => 'required|even',
-]);
+public function even(string $str, string &$error = null): bool
+{
+    if ((int) $str % 2 !== 0) {
+        $error = lang('myerrors.evenError');
+
+        return false;
+    }
+
+    return true;
+}
diff --git a/user_guide_src/source/libraries/validation/036.php b/user_guide_src/source/libraries/validation/036.php
index 9511380c04f5..99db5f30eae4 100644
--- a/user_guide_src/source/libraries/validation/036.php
+++ b/user_guide_src/source/libraries/validation/036.php
@@ -1,34 +1,5 @@
 <?php
 
-public function required_with($str, string $fields, array $data): bool
-{
-    $fields = explode(',', $fields);
-
-    // If the field is present we can safely assume that
-    // the field is here, no matter whether the corresponding
-    // search field is present or not.
-    $present = $this->required($str ?? '');
-
-    if ($present) {
-        return true;
-    }
-
-    // Still here? Then we fail this test if
-    // any of the fields are present in $data
-    // as $fields is the lis
-    $requiredFields = [];
-
-    foreach ($fields as $field) {
-        if (array_key_exists($field, $data)) {
-            $requiredFields[] = $field;
-        }
-    }
-
-    // Remove any keys with empty values since, that means they
-    // weren't truly there, as far as this is concerned.
-    $requiredFields = array_filter($requiredFields, function ($item) use ($data) {
-        return ! empty($data[$item]);
-    });
-
-    return empty($requiredFields);
-}
+$this->validate($request, [
+    'foo' => 'required|even',
+]);
diff --git a/user_guide_src/source/libraries/validation/037.php b/user_guide_src/source/libraries/validation/037.php
index 089b0eeaf465..9511380c04f5 100644
--- a/user_guide_src/source/libraries/validation/037.php
+++ b/user_guide_src/source/libraries/validation/037.php
@@ -1,10 +1,34 @@
 <?php
 
-// is_unique[table.field,ignore_field,ignore_value]
-
-$validation->setRules([
-    'name' => "is_unique[supplier.name,uuid, $uuid]",  // is not ok
-    'name' => "is_unique[supplier.name,uuid,$uuid ]",  // is not ok
-    'name' => "is_unique[supplier.name,uuid,$uuid]",   // is ok
-    'name' => "is_unique[supplier.name,uuid,{uuid}]",  // is ok - see "Validation Placeholders"
-]);
+public function required_with($str, string $fields, array $data): bool
+{
+    $fields = explode(',', $fields);
+
+    // If the field is present we can safely assume that
+    // the field is here, no matter whether the corresponding
+    // search field is present or not.
+    $present = $this->required($str ?? '');
+
+    if ($present) {
+        return true;
+    }
+
+    // Still here? Then we fail this test if
+    // any of the fields are present in $data
+    // as $fields is the lis
+    $requiredFields = [];
+
+    foreach ($fields as $field) {
+        if (array_key_exists($field, $data)) {
+            $requiredFields[] = $field;
+        }
+    }
+
+    // Remove any keys with empty values since, that means they
+    // weren't truly there, as far as this is concerned.
+    $requiredFields = array_filter($requiredFields, function ($item) use ($data) {
+        return ! empty($data[$item]);
+    });
+
+    return empty($requiredFields);
+}
diff --git a/user_guide_src/source/libraries/validation/038.php b/user_guide_src/source/libraries/validation/038.php
new file mode 100644
index 000000000000..089b0eeaf465
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/038.php
@@ -0,0 +1,10 @@
+<?php
+
+// is_unique[table.field,ignore_field,ignore_value]
+
+$validation->setRules([
+    'name' => "is_unique[supplier.name,uuid, $uuid]",  // is not ok
+    'name' => "is_unique[supplier.name,uuid,$uuid ]",  // is not ok
+    'name' => "is_unique[supplier.name,uuid,$uuid]",   // is ok
+    'name' => "is_unique[supplier.name,uuid,{uuid}]",  // is ok - see "Validation Placeholders"
+]);
diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index 4681711398d0..ef17f8d7fa6e 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -281,7 +281,7 @@ blocks must be closed with an ``endif`` tag::
 
 This simple block is converted to the following during parsing:
 
-.. literalinclude:: view_parser/010-2.php
+.. literalinclude:: view_parser/011.php
 
 All variables used within if statements must have been previously set with the same name. Other than that, it is
 treated exactly like a standard PHP conditional, and all standard PHP rules would apply here. You can use any
@@ -413,7 +413,7 @@ You can easily create your own filters by editing **app/Config/View.php** and ad
 ``$filters`` array. Each key is the name of the filter is called by in the view, and its value is any valid PHP
 callable:
 
-.. literalinclude:: view_parser/011.php
+.. literalinclude:: view_parser/012.php
    :lines: 2-
 
 PHP Native functions as Filters
@@ -423,7 +423,7 @@ You can use native php function as filters by editing **app/Config/View.php** an
 ``$filters`` array.Each key is the name of the native PHP function is called by in the view, and its value is any valid native PHP
 function prefixed with:
 
-.. literalinclude:: view_parser/012.php
+.. literalinclude:: view_parser/013.php
    :lines: 2-
 
 Parser Plugins
@@ -481,24 +481,24 @@ At its simplest, all you need to do to register a new plugin and make it ready f
 **app/Config/View.php**, under the **$plugins** array. The key is the name of the plugin that is
 used within the template file. The value is any valid PHP callable, including static class methods, and closures:
 
-.. literalinclude:: view_parser/013.php
+.. literalinclude:: view_parser/014.php
    :lines: 2-
 
 Any closures that are being used must be defined in the config file's constructor:
 
-.. literalinclude:: view_parser/014.php
+.. literalinclude:: view_parser/015.php
    :lines: 2-
 
 If the callable is on its own, it is treated as a single tag, not a open/close one. It will be replaced by
 the return value from the plugin:
 
-.. literalinclude:: view_parser/015.php
+.. literalinclude:: view_parser/016.php
    :lines: 2-
 
 If the callable is wrapped in an array, it is treated as an open/close tag pair that can operate on any of
 the content between its tags:
 
-.. literalinclude:: view_parser/016.php
+.. literalinclude:: view_parser/017.php
    :lines: 2-
 
 ***********
@@ -508,20 +508,20 @@ Usage Notes
 If you include substitution parameters that are not referenced in your
 template, they are ignored:
 
-.. literalinclude:: view_parser/017.php
+.. literalinclude:: view_parser/018.php
    :lines: 2-
 
 If you do not include a substitution parameter that is referenced in your
 template, the original pseudo-variable is shown in the result:
 
-.. literalinclude:: view_parser/018.php
+.. literalinclude:: view_parser/019.php
    :lines: 2-
 
 If you provide a string substitution parameter when an array is expected,
 i.e., for a variable pair, the substitution is done for the opening variable
 pair tag, but the closing variable pair tag is not rendered properly:
 
-.. literalinclude:: view_parser/019.php
+.. literalinclude:: view_parser/020.php
    :lines: 2-
 
 View Fragments
@@ -557,7 +557,7 @@ Result::
 An example with the iteration controlled in the controller,
 using a view fragment:
 
-.. literalinclude:: view_parser/020.php
+.. literalinclude:: view_parser/021.php
    :lines: 2-
 
 Result::
@@ -583,7 +583,7 @@ Class Reference
 
         Builds the output based upon a file name and any data that has already been set:
 
-        .. literalinclude:: view_parser/021.php
+        .. literalinclude:: view_parser/022.php
            :lines: 2-
 
         Options supported:
@@ -608,7 +608,7 @@ Class Reference
 
         Builds the output based upon a provided template source and any data that has already been set:
 
-        .. literalinclude:: view_parser/021-1.php
+        .. literalinclude:: view_parser/023.php
            :lines: 2-
 
         Options supported, and behavior, as above.
@@ -622,7 +622,7 @@ Class Reference
 
         Sets several pieces of view data at once:
 
-        .. literalinclude:: view_parser/023.php
+        .. literalinclude:: view_parser/024.php
            :lines: 2-
 
         Supported escape contexts: html, css, js, url, or attr or raw.
@@ -638,7 +638,7 @@ Class Reference
 
         Sets a single piece of view data:
 
-        .. literalinclude:: view_parser/024.php
+        .. literalinclude:: view_parser/025.php
            :lines: 2-
 
         Supported escape contexts: html, css, js, url, attr or raw.
@@ -653,5 +653,5 @@ Class Reference
 
         Override the substitution field delimiters:
 
-        .. literalinclude:: view_parser/025.php
+        .. literalinclude:: view_parser/026.php
            :lines: 2-
diff --git a/user_guide_src/source/outgoing/view_parser/010-2.php b/user_guide_src/source/outgoing/view_parser/010-2.php
deleted file mode 100644
index 8030f44e8883..000000000000
--- a/user_guide_src/source/outgoing/view_parser/010-2.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php if ($role=='admin'): ?>
-    <h1>Welcome, Admin!</h1>
-<?php endif ?>
diff --git a/user_guide_src/source/outgoing/view_parser/011.php b/user_guide_src/source/outgoing/view_parser/011.php
index 39eae3da0177..8030f44e8883 100644
--- a/user_guide_src/source/outgoing/view_parser/011.php
+++ b/user_guide_src/source/outgoing/view_parser/011.php
@@ -1,6 +1,3 @@
-<?php
-
-public $filters = [
-    'abs'        => '\CodeIgniter\View\Filters::abs',
-    'capitalize' => '\CodeIgniter\View\Filters::capitalize',
-];
+<?php if ($role=='admin'): ?>
+    <h1>Welcome, Admin!</h1>
+<?php endif ?>
diff --git a/user_guide_src/source/outgoing/view_parser/012.php b/user_guide_src/source/outgoing/view_parser/012.php
index dbb096b416fb..39eae3da0177 100644
--- a/user_guide_src/source/outgoing/view_parser/012.php
+++ b/user_guide_src/source/outgoing/view_parser/012.php
@@ -1,5 +1,6 @@
 <?php
 
 public $filters = [
-    'str_repeat' => '\str_repeat',
+    'abs'        => '\CodeIgniter\View\Filters::abs',
+    'capitalize' => '\CodeIgniter\View\Filters::capitalize',
 ];
diff --git a/user_guide_src/source/outgoing/view_parser/013.php b/user_guide_src/source/outgoing/view_parser/013.php
index d959d153d415..dbb096b416fb 100644
--- a/user_guide_src/source/outgoing/view_parser/013.php
+++ b/user_guide_src/source/outgoing/view_parser/013.php
@@ -1,8 +1,5 @@
 <?php
 
-public $plugins = [
-    'foo' => '\Some\Class::methodName',
-    'bar' => function ($str, array $params=[]) {
-        return $str;
-    },
+public $filters = [
+    'str_repeat' => '\str_repeat',
 ];
diff --git a/user_guide_src/source/outgoing/view_parser/014.php b/user_guide_src/source/outgoing/view_parser/014.php
index bac6137888f1..d959d153d415 100644
--- a/user_guide_src/source/outgoing/view_parser/014.php
+++ b/user_guide_src/source/outgoing/view_parser/014.php
@@ -1,15 +1,8 @@
 <?php
 
-class View extends \CodeIgniter\Config\View
-{
-    public $plugins = [];
-
-    public function __construct()
-    {
-        $this->plugins['bar'] = function (array $params=[]) {
-            return $params[0] ?? '';
-        };
-
-        parent::__construct();
-    }
-}
+public $plugins = [
+    'foo' => '\Some\Class::methodName',
+    'bar' => function ($str, array $params=[]) {
+        return $str;
+    },
+];
diff --git a/user_guide_src/source/outgoing/view_parser/015.php b/user_guide_src/source/outgoing/view_parser/015.php
index 74a18943365c..bac6137888f1 100644
--- a/user_guide_src/source/outgoing/view_parser/015.php
+++ b/user_guide_src/source/outgoing/view_parser/015.php
@@ -1,8 +1,15 @@
 <?php
 
-public $plugins = [
-    'foo' => '\Some\Class::methodName'
-];
+class View extends \CodeIgniter\Config\View
+{
+    public $plugins = [];
 
-// Tag is replaced by the return value of Some\Class::methodName static function.
-{+ foo +}
+    public function __construct()
+    {
+        $this->plugins['bar'] = function (array $params=[]) {
+            return $params[0] ?? '';
+        };
+
+        parent::__construct();
+    }
+}
diff --git a/user_guide_src/source/outgoing/view_parser/016.php b/user_guide_src/source/outgoing/view_parser/016.php
index 30d72b247059..74a18943365c 100644
--- a/user_guide_src/source/outgoing/view_parser/016.php
+++ b/user_guide_src/source/outgoing/view_parser/016.php
@@ -1,7 +1,8 @@
 <?php
 
 public $plugins = [
-    'foo' => ['\Some\Class::methodName']
+    'foo' => '\Some\Class::methodName'
 ];
 
-{+ foo +} inner content {+ /foo +}
+// Tag is replaced by the return value of Some\Class::methodName static function.
+{+ foo +}
diff --git a/user_guide_src/source/outgoing/view_parser/017.php b/user_guide_src/source/outgoing/view_parser/017.php
index cd9ca09109b9..30d72b247059 100644
--- a/user_guide_src/source/outgoing/view_parser/017.php
+++ b/user_guide_src/source/outgoing/view_parser/017.php
@@ -1,12 +1,7 @@
 <?php
 
-$template = 'Hello, {firstname} {lastname}';
-$data = [
-    'title'     => 'Mr',
-    'firstname' => 'John',
-    'lastname'  => 'Doe'
+public $plugins = [
+    'foo' => ['\Some\Class::methodName']
 ];
-echo $parser->setData($data)
-            ->renderString($template);
 
-// Result: Hello, John Doe
+{+ foo +} inner content {+ /foo +}
diff --git a/user_guide_src/source/outgoing/view_parser/018.php b/user_guide_src/source/outgoing/view_parser/018.php
index dfce0c26ccb4..cd9ca09109b9 100644
--- a/user_guide_src/source/outgoing/view_parser/018.php
+++ b/user_guide_src/source/outgoing/view_parser/018.php
@@ -1,12 +1,12 @@
 <?php
 
-$template = 'Hello, {firstname} {initials} {lastname}';
+$template = 'Hello, {firstname} {lastname}';
 $data = [
     'title'     => 'Mr',
     'firstname' => 'John',
-    'lastname'  => 'Doe',
+    'lastname'  => 'Doe'
 ];
 echo $parser->setData($data)
             ->renderString($template);
 
-// Result: Hello, John {initials} Doe
+// Result: Hello, John Doe
diff --git a/user_guide_src/source/outgoing/view_parser/019.php b/user_guide_src/source/outgoing/view_parser/019.php
index 371fa9a21f14..dfce0c26ccb4 100644
--- a/user_guide_src/source/outgoing/view_parser/019.php
+++ b/user_guide_src/source/outgoing/view_parser/019.php
@@ -1,16 +1,12 @@
 <?php
 
-$template = 'Hello, {firstname} {lastname} ({degrees}{degree} {/degrees})';
+$template = 'Hello, {firstname} {initials} {lastname}';
 $data = [
-    'degrees'   => 'Mr',
+    'title'     => 'Mr',
     'firstname' => 'John',
     'lastname'  => 'Doe',
-    'titles'    => [
-        ['degree' => 'BSc'],
-        ['degree' => 'PhD'],
-    ],
 ];
 echo $parser->setData($data)
             ->renderString($template);
 
-// Result: Hello, John Doe (Mr{degree} {/degrees})
+// Result: Hello, John {initials} Doe
diff --git a/user_guide_src/source/outgoing/view_parser/020.php b/user_guide_src/source/outgoing/view_parser/020.php
index cf7b31fa7e30..371fa9a21f14 100644
--- a/user_guide_src/source/outgoing/view_parser/020.php
+++ b/user_guide_src/source/outgoing/view_parser/020.php
@@ -1,19 +1,16 @@
 <?php
 
-$temp = '';
-$template1 = '<li><a href="{link}">{title}</a></li>';
-$data1 = [
-    ['title' => 'First Link', 'link' => '/first'],
-    ['title' => 'Second Link', 'link' => '/second'],
-];
-
-foreach ($data1 as $menuItem),{
-    $temp .= $parser->setData($menuItem)->renderString($template1);
-}
-
-$template2 = '<ul>{menuitems}</ul>';
+$template = 'Hello, {firstname} {lastname} ({degrees}{degree} {/degrees})';
 $data = [
-    'menuitems' => $temp,
+    'degrees'   => 'Mr',
+    'firstname' => 'John',
+    'lastname'  => 'Doe',
+    'titles'    => [
+        ['degree' => 'BSc'],
+        ['degree' => 'PhD'],
+    ],
 ];
 echo $parser->setData($data)
-            ->renderString($template2);
+            ->renderString($template);
+
+// Result: Hello, John Doe (Mr{degree} {/degrees})
diff --git a/user_guide_src/source/outgoing/view_parser/021-1.php b/user_guide_src/source/outgoing/view_parser/021-1.php
deleted file mode 100644
index 022450bb6fd6..000000000000
--- a/user_guide_src/source/outgoing/view_parser/021-1.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-echo $parser->render('myview');
diff --git a/user_guide_src/source/outgoing/view_parser/021.php b/user_guide_src/source/outgoing/view_parser/021.php
index 022450bb6fd6..cf7b31fa7e30 100644
--- a/user_guide_src/source/outgoing/view_parser/021.php
+++ b/user_guide_src/source/outgoing/view_parser/021.php
@@ -1,3 +1,19 @@
 <?php
 
-echo $parser->render('myview');
+$temp = '';
+$template1 = '<li><a href="{link}">{title}</a></li>';
+$data1 = [
+    ['title' => 'First Link', 'link' => '/first'],
+    ['title' => 'Second Link', 'link' => '/second'],
+];
+
+foreach ($data1 as $menuItem),{
+    $temp .= $parser->setData($menuItem)->renderString($template1);
+}
+
+$template2 = '<ul>{menuitems}</ul>';
+$data = [
+    'menuitems' => $temp,
+];
+echo $parser->setData($data)
+            ->renderString($template2);
diff --git a/user_guide_src/source/outgoing/view_parser/023.php b/user_guide_src/source/outgoing/view_parser/023.php
index 42ddfa949331..022450bb6fd6 100644
--- a/user_guide_src/source/outgoing/view_parser/023.php
+++ b/user_guide_src/source/outgoing/view_parser/023.php
@@ -1,3 +1,3 @@
 <?php
 
-$renderer->setData(['name' => 'George', 'position' => 'Boss']);
+echo $parser->render('myview');
diff --git a/user_guide_src/source/outgoing/view_parser/024.php b/user_guide_src/source/outgoing/view_parser/024.php
index 76ba0b537f96..42ddfa949331 100644
--- a/user_guide_src/source/outgoing/view_parser/024.php
+++ b/user_guide_src/source/outgoing/view_parser/024.php
@@ -1,3 +1,3 @@
 <?php
 
-$renderer->setVar('name','Joe','html');
+$renderer->setData(['name' => 'George', 'position' => 'Boss']);
diff --git a/user_guide_src/source/outgoing/view_parser/025.php b/user_guide_src/source/outgoing/view_parser/025.php
index a8633d5717c7..76ba0b537f96 100644
--- a/user_guide_src/source/outgoing/view_parser/025.php
+++ b/user_guide_src/source/outgoing/view_parser/025.php
@@ -1,3 +1,3 @@
 <?php
 
-$renderer->setDelimiters('[',']');
+$renderer->setVar('name','Joe','html');
diff --git a/user_guide_src/source/outgoing/view_parser/026.php b/user_guide_src/source/outgoing/view_parser/026.php
new file mode 100644
index 000000000000..a8633d5717c7
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/026.php
@@ -0,0 +1,3 @@
+<?php
+
+$renderer->setDelimiters('[',']');
diff --git a/user_guide_src/source/testing/response.rst b/user_guide_src/source/testing/response.rst
index ae6eb2deb97e..e39df524affc 100644
--- a/user_guide_src/source/testing/response.rst
+++ b/user_guide_src/source/testing/response.rst
@@ -178,7 +178,7 @@ values of the elements. Instead, they simply check that the elements exist on th
 
 You can use **seeLink()** to ensure that a link appears on the page with the specified text:
 
-.. literalinclude:: response/021-2.php
+.. literalinclude:: response/021.php
    :lines: 2-
 
 The **seeInField()** method checks for any input tags exist with the name and value:
@@ -231,7 +231,7 @@ specific text:
 
 Asserts that an anchor tag is found with matching **$text** as the body of the tag:
 
-.. literalinclude:: response/021.php
+.. literalinclude:: response/028.php
    :lines: 2-
 
 **assertSeeInField(string $field, string $value=null)**
diff --git a/user_guide_src/source/testing/response/021-2.php b/user_guide_src/source/testing/response/021-2.php
deleted file mode 100644
index bc74e3ad9124..000000000000
--- a/user_guide_src/source/testing/response/021-2.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-// Check that a link exists with 'Upgrade Account' as the text::
-$results->seeLink('Upgrade Account');
-// Check that a link exists with 'Upgrade Account' as the text, AND a class of 'upsell'
-$results->seeLink('Upgrade Account', '.upsell');

From 5b84072e32e7dc70a143accdd4f6d4f80b7c784b Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Sun, 20 Feb 2022 09:57:37 +0100
Subject: [PATCH 1602/2325] Fix merge conflicts.

---
 .../source/incoming/incomingrequest.rst       | 282 +++++++-----------
 .../source/incoming/incomingrequest/006.php   |   4 -
 .../source/incoming/incomingrequest/024.php   |  18 --
 .../incomingrequest/{001.php => 1.php}        |   0
 .../incomingrequest/{011.php => 10.php}       |   0
 .../incomingrequest/{012.php => 11.php}       |   0
 .../incomingrequest/{013.php => 12.php}       |   0
 .../incomingrequest/{014.php => 13.php}       |   0
 .../incomingrequest/{015.php => 14.php}       |   0
 .../incomingrequest/{016.php => 15.php}       |   0
 .../incomingrequest/{017.php => 16.php}       |   0
 .../incomingrequest/{018.php => 17.php}       |   0
 .../incomingrequest/{019.php => 18.php}       |   0
 .../incomingrequest/{020.php => 19.php}       |   0
 .../incomingrequest/{002.php => 2.php}        |   0
 .../incomingrequest/{021.php => 20.php}       |   0
 .../incomingrequest/{022.php => 21.php}       |   0
 .../incomingrequest/{023.php => 22.php}       |   0
 .../source/incoming/incomingrequest/23.php    |   3 +
 .../incomingrequest/{025.php => 24.php}       |   0
 .../incomingrequest/{026.php => 25.php}       |   0
 .../incomingrequest/{027.php => 26.php}       |   0
 .../incomingrequest/{028.php => 27.php}       |   0
 .../incomingrequest/{029.php => 28.php}       |   0
 .../incomingrequest/{030.php => 29.php}       |   0
 .../incomingrequest/{003.php => 3.php}        |   0
 .../incomingrequest/{031.php => 30.php}       |   0
 .../incomingrequest/{032.php => 31.php}       |   0
 .../incomingrequest/{033.php => 32.php}       |   0
 .../incomingrequest/{034.php => 33.php}       |   0
 .../incomingrequest/{035.php => 34.php}       |   0
 .../incomingrequest/{036.php => 35.php}       |   0
 .../incomingrequest/{037.php => 36.php}       |   0
 .../incomingrequest/{038.php => 37.php}       |   0
 .../incomingrequest/{039.php => 38.php}       |   0
 .../incomingrequest/{004.php => 4.php}        |   0
 .../incomingrequest/{005.php => 5.php}        |   0
 .../incomingrequest/{007.php => 6.php}        |   0
 .../incomingrequest/{008.php => 7.php}        |   0
 .../incomingrequest/{009.php => 8.php}        |   0
 .../incomingrequest/{010.php => 9.php}        |   0
 41 files changed, 111 insertions(+), 196 deletions(-)
 delete mode 100644 user_guide_src/source/incoming/incomingrequest/006.php
 delete mode 100644 user_guide_src/source/incoming/incomingrequest/024.php
 rename user_guide_src/source/incoming/incomingrequest/{001.php => 1.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{011.php => 10.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{012.php => 11.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{013.php => 12.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{014.php => 13.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{015.php => 14.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{016.php => 15.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{017.php => 16.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{018.php => 17.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{019.php => 18.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{020.php => 19.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{002.php => 2.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{021.php => 20.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{022.php => 21.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{023.php => 22.php} (100%)
 create mode 100644 user_guide_src/source/incoming/incomingrequest/23.php
 rename user_guide_src/source/incoming/incomingrequest/{025.php => 24.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{026.php => 25.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{027.php => 26.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{028.php => 27.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{029.php => 28.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{030.php => 29.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{003.php => 3.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{031.php => 30.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{032.php => 31.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{033.php => 32.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{034.php => 33.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{035.php => 34.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{036.php => 35.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{037.php => 36.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{038.php => 37.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{039.php => 38.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{004.php => 4.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{005.php => 5.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{007.php => 6.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{008.php => 7.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{009.php => 8.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{010.php => 9.php} (100%)

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index 5e77e9253804..70692d1aa4c4 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -13,72 +13,38 @@ Accessing the Request
 ---------------------
 
 An instance of the request class already populated for you if the current class is a descendant of
-``CodeIgniter\Controller`` and can be accessed as a class property::
+``CodeIgniter\Controller`` and can be accessed as a class property:
 
-    <?php
-
-    namespace App\Controllers;
-
-    use CodeIgniter\Controller;
-
-    class UserController extends Controller
-    {
-        public function index()
-        {
-            if ($this->request->isAJAX()) {
-                // ...
-            }
-        }
-    }
+.. literalinclude:: incomingrequest/1.php
 
 If you are not within a controller, but still need access to the application's Request object, you can
-get a copy of it through the :doc:`Services class </concepts/services>`::
+get a copy of it through the :doc:`Services class </concepts/services>`:
 
-    $request = \Config\Services::request();
+.. literalinclude:: incomingrequest/2.php
+   :lines: 2-
 
 It's preferable, though, to pass the request in as a dependency if the class is anything other than
-the controller, where you can save it as a class property::
-
-    <?php
-
-    use CodeIgniter\HTTP\RequestInterface;
-
-    class SomeClass
-    {
-        protected $request;
-
-        public function __construct(RequestInterface $request)
-        {
-            $this->request = $request;
-        }
-    }
+the controller, where you can save it as a class property:
 
-    $someClass = new SomeClass(\Config\Services::request());
+.. literalinclude:: incomingrequest/3.php
 
 Determining Request Type
 ------------------------
 
 A request could be of several types, including an AJAX request or a request from the command line. This can
-be checked with the ``isAJAX()`` and ``isCLI()`` methods::
+be checked with the ``isAJAX()`` and ``isCLI()`` methods:
 
-    // Check for AJAX request.
-    if ($request->isAJAX()) {
-        // ...
-    }
-
-    // Check for CLI Request
-    if ($request->isCLI()) {
-        // ...
-    }
+.. literalinclude:: incomingrequest/4.php
+   :lines: 2-
 
 .. note:: The ``isAJAX()`` method depends on the ``X-Requested-With`` header,
     which in some cases is not sent by default in XHR requests via JavaScript (i.e., fetch).
     See the :doc:`AJAX Requests </general/ajax>` section on how to avoid this problem.
 
-You can check the HTTP method that this request represents with the ``method()`` method::
+You can check the HTTP method that this request represents with the ``method()`` method:
 
-    // Returns 'post'
-    $method = $request->getMethod();
+.. literalinclude:: incomingrequest/5.php
+   :lines: 2-
 
 By default, the method is returned as a lower-case string (i.e., 'get', 'post', etc). You can get an
 uppercase version by wrapping the call in ``str_to_upper()``::
@@ -86,11 +52,10 @@ uppercase version by wrapping the call in ``str_to_upper()``::
     // Returns 'GET'
     $method = str_to_upper($request->getMethod());
 
-You can also check if the request was made through and HTTPS connection with the ``isSecure()`` method::
+You can also check if the request was made through and HTTPS connection with the ``isSecure()`` method:
 
-    if (! $request->isSecure()) {
-        force_https();
-    }
+.. literalinclude:: incomingrequest/6.php
+   :lines: 2-
 
 Retrieving Input
 ----------------
@@ -100,13 +65,15 @@ The data is not automatically filtered and returns the raw input data as passed
 advantages to using these methods instead of accessing them directly ($_POST['something']), is that they
 will return null if the item doesn't exist, and you can have the data filtered. This lets you conveniently
 use data without having to test whether an item exists first. In other words, normally you might do something
-like this::
+like this:
 
-    $something = isset($_POST['foo']) ? $_POST['foo'] : null;
+.. literalinclude:: incomingrequest/7.php
+   :lines: 2-
 
-With CodeIgniter’s built in methods you can simply do this::
+With CodeIgniter’s built in methods you can simply do this:
 
-    $something = $request->getVar('foo');
+.. literalinclude:: incomingrequest/8.php
+   :lines: 2-
 
 The ``getVar()`` method will pull from $_REQUEST, so will return any data from $_GET, $POST, or $_COOKIE. While this
 is convenient, you will often need to use a more specific method, like:
@@ -129,9 +96,9 @@ You can grab the contents of php://input as a JSON stream with ``getJSON()``.
 .. note::  This has no way of checking if the incoming data is valid JSON or not, you should only use this
     method if you know that you're expecting JSON.
 
-::
 
-    $json = $request->getJSON();
+.. literalinclude:: incomingrequest/9.php
+   :lines: 2-
 
 By default, this will return any objects in the JSON data as objects. If you want that converted to associative
 arrays, pass in ``true`` as the first parameter.
@@ -147,51 +114,32 @@ the JSON stream. Using ``getVar()`` in this way will always return an object.
 You can get a specific piece of data from a JSON stream by passing a variable name into ``getVar()`` for the
 data that you want or you can use "dot" notation to dig into the JSON to get data that is not on the root level.
 
-::
-
-    // With a request body of:
-    {
-        "foo": "bar",
-        "fizz": {
-            "buzz": "baz"
-        }
-    }
-    $data = $request->getVar('foo');
-    // $data = "bar"
 
-    $data = $request->getVar('fizz.buzz');
-    // $data = "baz"
+.. literalinclude:: incomingrequest/10.php
+   :lines: 2-
 
 
 If you want the result to be an associative array instead of an object, you can use ``getJsonVar()`` instead and pass
 true in the second parameter. This function can also be used if you can't guarantee that the incoming request will have the
 correct ``CONTENT_TYPE`` header.
 
-::
 
-    // With the same request as above
-    $data = $request->getJsonVar('fizz');
-    // $data->buzz = "baz"
-
-    $data = $request->getJsonVar('fizz', true);
-    // $data = ["buzz" => "baz"]
+.. literalinclude:: incomingrequest/11.php
+   :lines: 2-
 
 .. note:: See the documentation for ``dot_array_search()`` in the ``Array`` helper for more information on "dot" notation.
 
 **Retrieving Raw data (PUT, PATCH, DELETE)**
 
-Finally, you can grab the contents of php://input as a raw stream with ``getRawInput()``::
-
-    $data = $request->getRawInput();
+Finally, you can grab the contents of php://input as a raw stream with ``getRawInput()``:
 
-This will retrieve data and convert it to an array. Like this::
+.. literalinclude:: incomingrequest/12.php
+   :lines: 2-
 
-    var_dump($request->getRawInput());
+This will retrieve data and convert it to an array. Like this:
 
-    [
-        'Param1' => 'Value1',
-        'Param2' => 'Value2'
-    ]
+.. literalinclude:: incomingrequest/13.php
+   :lines: 2-
 
 **Filtering Input Data**
 
@@ -200,9 +148,10 @@ pass the type of filter to use as the second parameter of any of these methods.
 function is used for the filtering. Head over to the PHP manual for a list of `valid
 filter types <https://www.php.net/manual/en/filter.filters.php>`_.
 
-Filtering a POST variable would look like this::
+Filtering a POST variable would look like this:
 
-    $email = $request->getVar('email', FILTER_SANITIZE_EMAIL);
+.. literalinclude:: incomingrequest/14.php
+   :lines: 2-
 
 All of the methods mentioned above support the filter type passed in as the second parameter, with the
 exception of ``getJSON()``.
@@ -212,75 +161,52 @@ Retrieving Headers
 
 You can get access to any header that was sent with the request with the ``headers()`` method, which returns
 an array of all headers, with the key as the name of the header, and the value is an instance of
-``CodeIgniter\HTTP\Header``::
+``CodeIgniter\HTTP\Header``:
 
-    var_dump($request->headers());
-
-    [
-        'Host'          => CodeIgniter\HTTP\Header,
-        'Cache-Control' => CodeIgniter\HTTP\Header,
-        'Accept'        => CodeIgniter\HTTP\Header,
-    ]
+.. literalinclude:: incomingrequest/15.php
+   :lines: 2-
 
 If you only need a single header, you can pass the name into the ``header()`` method. This will grab the
-specified header object in a case-insensitive manner if it exists. If not, then it will return ``null``::
+specified header object in a case-insensitive manner if it exists. If not, then it will return ``null``:
 
-    // these are all equivalent
-    $host = $request->header('host');
-    $host = $request->header('Host');
-    $host = $request->header('HOST');
+.. literalinclude:: incomingrequest/16.php
+   :lines: 2-
 
-You can always use ``hasHeader()`` to see if the header existed in this request::
+You can always use ``hasHeader()`` to see if the header existed in this request:
 
-    if ($request->hasHeader('DNT')) {
-        // Don't track something...
-    }
+.. literalinclude:: incomingrequest/17.php
+   :lines: 2-
 
-If you need the value of header as a string with all values on one line, you can use the ``getHeaderLine()`` method::
+If you need the value of header as a string with all values on one line, you can use the ``getHeaderLine()`` method:
 
-    // Accept-Encoding: gzip, deflate, sdch
-    echo 'Accept-Encoding: '.$request->getHeaderLine('accept-encoding');
+.. literalinclude:: incomingrequest/18.php
+   :lines: 2-
 
-If you need the entire header, with the name and values in a single string, simply cast the header as a string::
+If you need the entire header, with the name and values in a single string, simply cast the header as a string:
 
-    echo (string)$header;
+.. literalinclude:: incomingrequest/19.php
+   :lines: 2-
 
 The Request URL
 ---------------
 
 You can retrieve a :doc:`URI </libraries/uri>` object that represents the current URI for this request through the
-``$request->getUri()`` method. You can cast this object as a string to get a full URL for the current request::
-
-    $uri = (string) $request->getUri();
+``$request->getUri()`` method. You can cast this object as a string to get a full URL for the current request:
 
-The object gives you full abilities to grab any part of the request on it's own::
+.. literalinclude:: incomingrequest/20.php
+   :lines: 2-
 
-    $uri = $request->getUri();
+The object gives you full abilities to grab any part of the request on it's own:
 
-    echo $uri->getScheme();         // http
-    echo $uri->getAuthority();      // snoopy:password@example.com:88
-    echo $uri->getUserInfo();       // snoopy:password
-    echo $uri->getHost();           // example.com
-    echo $uri->getPort();           // 88
-    echo $uri->getPath();           // /path/to/page
-    echo $uri->getQuery();          // foo=bar&bar=baz
-    echo $uri->getSegments();       // ['path', 'to', 'page']
-    echo $uri->getSegment(1);       // 'path'
-    echo $uri->getTotalSegments();  // 3
+.. literalinclude:: incomingrequest/21.php
+   :lines: 2-
 
 You can work with the current URI string (the path relative to your baseURL) using the ``getPath()`` and ``setPath()`` methods.
 Note that this relative path on the shared instance of ``IncomingRequest`` is what the :doc:`URL Helper </helpers/url_helper>`
-functions use, so this is a helpful way to "spoof" an incoming request for testing::
-
-    class MyMenuTest extends CIUnitTestCase
-    {
-        public function testActiveLinkUsesCurrentUrl()
-        {
-            service('request')->setPath('users/list');
-            $menu = new MyMenu();
-            $this->assertTrue('users/list', $menu->getActiveLink());
-        }
-    }
+functions use, so this is a helpful way to "spoof" an incoming request for testing:
+
+.. literalinclude:: incomingrequest/22.php
+   :lines: 2-
 
 Uploaded Files
 --------------
@@ -288,33 +214,32 @@ Uploaded Files
 Information about all uploaded files can be retrieved through ``$request->getFiles()``, which returns an array of
 ``CodeIgniter\HTTP\Files\UploadedFile`` instance. This helps to ease the pain of working with uploaded files,
 and uses best practices to minimize any security risks.
-::
 
-    $files = $request->getFiles();
+.. literalinclude:: incomingrequest/23.php
+   :lines: 2-
 
 See :ref:`Working with Uploaded Files <uploaded-files-accessing-files>` for the details.
 
-You can retrieve a single file uploaded on its own, based on the filename given in the HTML file input::
+You can retrieve a single file uploaded on its own, based on the filename given in the HTML file input:
 
-    $file = $request->getFile('userfile');
+.. literalinclude:: incomingrequest/24.php
+   :lines: 2-
 
 You can retrieve an array of same-named files uploaded as part of a
-multi-file upload, based on the filename given in the HTML file input::
+multi-file upload, based on the filename given in the HTML file input:
 
-    $files = $request->getFileMultiple('userfile');
+.. literalinclude:: incomingrequest/25.php
+   :lines: 2-
 
 .. note:: The files here correspond to ``$_FILES``. Even if a user just clicks submit button of a form and does not upload any file, the file will still exist. You can check that the file was actually uploaded by the ``isValid()`` method in UploadedFile. See :ref:`verify-a-file` for more details.
 
 Content Negotiation
 -------------------
 
-You can easily negotiate content types with the request through the ``negotiate()`` method::
+You can easily negotiate content types with the request through the ``negotiate()`` method:
 
-    $language    = $request->negotiate('language', ['en-US', 'en-GB', 'fr', 'es-mx']);
-    $imageType   = $request->negotiate('media', ['image/png', 'image/jpg']);
-    $charset     = $request->negotiate('charset', ['UTF-8', 'UTF-16']);
-    $contentType = $request->negotiate('media', ['text/html', 'text/xml']);
-    $encoding    = $request->negotiate('encoding', ['gzip', 'compress']);
+.. literalinclude:: incomingrequest/26.php
+   :lines: 2-
 
 See the :doc:`Content Negotiation </incoming/content_negotiation>` page for more details.
 
@@ -376,35 +301,39 @@ The methods provided by the parent classes that are available are:
         :returns:   $_REQUEST if no parameters supplied, otherwise the REQUEST value if found, or null if not
         :rtype: mixed|null
 
-        The first parameter will contain the name of the REQUEST item you are looking for::
+        The first parameter will contain the name of the REQUEST item you are looking for:
 
-            $request->getVar('some_data');
+        .. literalinclude:: incomingrequest/27.php
+           :lines: 2-
 
         The method returns null if the item you are attempting to retrieve
         does not exist.
 
         The second optional parameter lets you run the data through the PHP's
-        filters. Pass in the desired filter type as the second parameter::
+        filters. Pass in the desired filter type as the second parameter:
 
-            $request->getVar('some_data', FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        .. literalinclude:: incomingrequest/28.php
+           :lines: 2-
 
         To return an array of all POST items call without any parameters.
 
         To return all POST items and pass them through the filter, set the
         first parameter to null while setting the second parameter to the filter
-        you want to use::
+        you want to use:
 
-            $request->getVar(null, FILTER_SANITIZE_FULL_SPECIAL_CHARS);
-            // returns all POST items with string sanitation
+        .. literalinclude:: incomingrequest/29.php
+           :lines: 2-
 
-        To return an array of multiple POST parameters, pass all the required keys as an array::
+        To return an array of multiple POST parameters, pass all the required keys as an array:
 
-            $request->getVar(['field1', 'field2']);
+        .. literalinclude:: incomingrequest/30.php
+           :lines: 2-
 
         Same rule applied here, to retrieve the parameters with filtering, set the second parameter to
-        the filter type to apply::
+        the filter type to apply:
 
-            $request->getVar(['field1', 'field2'], FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        .. literalinclude:: incomingrequest/31.php
+           :lines: 2-
 
     .. php:method:: getGet([$index = null[, $filter = null[, $flags = null]]])
 
@@ -442,9 +371,10 @@ The methods provided by the parent classes that are available are:
 
         This method works pretty much the same way as ``getPost()`` and ``getGet()``, only combined.
         It will search through both POST and GET streams for data, looking first in POST, and
-        then in GET::
+        then in GET:
 
-            $request->getPostGet('field1');
+        .. literalinclude:: incomingrequest/32.php
+           :lines: 2-
 
     .. php:method:: getGetPost([$index = null[, $filter = null[, $flags = null]]])
 
@@ -458,9 +388,10 @@ The methods provided by the parent classes that are available are:
 
         This method works pretty much the same way as ``getPost()`` and ``getGet()``, only combined.
         It will search through both POST and GET streams for data, looking first in GET, and
-        then in POST::
+        then in POST:
 
-            $request->getGetPost('field1');
+        .. literalinclude:: incomingrequest/33.php
+           :lines: 2-
 
     .. php:method:: getCookie([$index = null[, $filter = null[, $flags = null]]])
         :noindex:
@@ -473,14 +404,15 @@ The methods provided by the parent classes that are available are:
         :returns:        $_COOKIE if no parameters supplied, otherwise the COOKIE value if found or null if not
         :rtype:    mixed
 
-        This method is identical to ``getPost()`` and ``getGet()``, only it fetches cookie data::
+        This method is identical to ``getPost()`` and ``getGet()``, only it fetches cookie data:
 
-            $request->getCookie('some_cookie');
-            $request->getCookie('some_cookie', FILTER_SANITIZE_FULL_SPECIAL_CHARS); // with filter
+        .. literalinclude:: incomingrequest/34.php
+           :lines: 2-
 
-        To return an array of multiple cookie values, pass all the required keys as an array::
+        To return an array of multiple cookie values, pass all the required keys as an array:
 
-            $request->getCookie(['some_cookie', 'some_cookie2']);
+        .. literalinclude:: incomingrequest/35.php
+           :lines: 2-
 
         .. note:: Unlike the :doc:`Cookie Helper <../helpers/cookie_helper>`
             function :php:func:`get_cookie()`, this method does NOT prepend
@@ -498,15 +430,16 @@ The methods provided by the parent classes that are available are:
         :rtype:    mixed
 
         This method is identical to the ``getPost()``, ``getGet()`` and ``getCookie()``
-        methods, only it fetches getServer data (``$_SERVER``)::
+        methods, only it fetches getServer data (``$_SERVER``):
 
-            $request->getServer('some_data');
+        .. literalinclude:: incomingrequest/36.php
+           :lines: 2-
 
         To return an array of multiple ``$_SERVER`` values, pass all the required keys
         as an array.
-        ::
 
-            $request->getServer(['SERVER_PROTOCOL', 'REQUEST_URI']);
+        .. literalinclude:: incomingrequest/37.php
+           :lines: 2-
 
     .. php:method:: getUserAgent([$filter = null])
 
@@ -515,9 +448,10 @@ The methods provided by the parent classes that are available are:
         :returns:  The User Agent string, as found in the SERVER data, or null if not found.
         :rtype: mixed
 
-        This method returns the User Agent string from the SERVER data::
+        This method returns the User Agent string from the SERVER data:
 
-            $request->getUserAgent();
+        .. literalinclude:: incomingrequest/38.php
+           :lines: 2-
 
     .. php:method:: getPath()
 
diff --git a/user_guide_src/source/incoming/incomingrequest/006.php b/user_guide_src/source/incoming/incomingrequest/006.php
deleted file mode 100644
index 99e269157152..000000000000
--- a/user_guide_src/source/incoming/incomingrequest/006.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-// Returns 'GET'
-$method = str_to_upper($request->getMethod());
diff --git a/user_guide_src/source/incoming/incomingrequest/024.php b/user_guide_src/source/incoming/incomingrequest/024.php
deleted file mode 100644
index e29f87b9f419..000000000000
--- a/user_guide_src/source/incoming/incomingrequest/024.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-$files = $request->getFiles();
-
-// Grab the file by name given in HTML form
-if ($files->hasFile('userfile')) {
-    $file = $files->getFile('userfile');
-
-    // Generate a new secure name
-    $name = $file->getRandomName();
-
-    // Move the file to it's new home
-    $file->move('/path/to/dir', $name);
-
-    echo $file->getSize('mb'); // 1.23
-    echo $file->getExtension(); // jpg
-    echo $file->getType(); // image/jpg
-}
diff --git a/user_guide_src/source/incoming/incomingrequest/001.php b/user_guide_src/source/incoming/incomingrequest/1.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/001.php
rename to user_guide_src/source/incoming/incomingrequest/1.php
diff --git a/user_guide_src/source/incoming/incomingrequest/011.php b/user_guide_src/source/incoming/incomingrequest/10.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/011.php
rename to user_guide_src/source/incoming/incomingrequest/10.php
diff --git a/user_guide_src/source/incoming/incomingrequest/012.php b/user_guide_src/source/incoming/incomingrequest/11.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/012.php
rename to user_guide_src/source/incoming/incomingrequest/11.php
diff --git a/user_guide_src/source/incoming/incomingrequest/013.php b/user_guide_src/source/incoming/incomingrequest/12.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/013.php
rename to user_guide_src/source/incoming/incomingrequest/12.php
diff --git a/user_guide_src/source/incoming/incomingrequest/014.php b/user_guide_src/source/incoming/incomingrequest/13.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/014.php
rename to user_guide_src/source/incoming/incomingrequest/13.php
diff --git a/user_guide_src/source/incoming/incomingrequest/015.php b/user_guide_src/source/incoming/incomingrequest/14.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/015.php
rename to user_guide_src/source/incoming/incomingrequest/14.php
diff --git a/user_guide_src/source/incoming/incomingrequest/016.php b/user_guide_src/source/incoming/incomingrequest/15.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/016.php
rename to user_guide_src/source/incoming/incomingrequest/15.php
diff --git a/user_guide_src/source/incoming/incomingrequest/017.php b/user_guide_src/source/incoming/incomingrequest/16.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/017.php
rename to user_guide_src/source/incoming/incomingrequest/16.php
diff --git a/user_guide_src/source/incoming/incomingrequest/018.php b/user_guide_src/source/incoming/incomingrequest/17.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/018.php
rename to user_guide_src/source/incoming/incomingrequest/17.php
diff --git a/user_guide_src/source/incoming/incomingrequest/019.php b/user_guide_src/source/incoming/incomingrequest/18.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/019.php
rename to user_guide_src/source/incoming/incomingrequest/18.php
diff --git a/user_guide_src/source/incoming/incomingrequest/020.php b/user_guide_src/source/incoming/incomingrequest/19.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/020.php
rename to user_guide_src/source/incoming/incomingrequest/19.php
diff --git a/user_guide_src/source/incoming/incomingrequest/002.php b/user_guide_src/source/incoming/incomingrequest/2.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/002.php
rename to user_guide_src/source/incoming/incomingrequest/2.php
diff --git a/user_guide_src/source/incoming/incomingrequest/021.php b/user_guide_src/source/incoming/incomingrequest/20.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/021.php
rename to user_guide_src/source/incoming/incomingrequest/20.php
diff --git a/user_guide_src/source/incoming/incomingrequest/022.php b/user_guide_src/source/incoming/incomingrequest/21.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/022.php
rename to user_guide_src/source/incoming/incomingrequest/21.php
diff --git a/user_guide_src/source/incoming/incomingrequest/023.php b/user_guide_src/source/incoming/incomingrequest/22.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/023.php
rename to user_guide_src/source/incoming/incomingrequest/22.php
diff --git a/user_guide_src/source/incoming/incomingrequest/23.php b/user_guide_src/source/incoming/incomingrequest/23.php
new file mode 100644
index 000000000000..de3c1601647d
--- /dev/null
+++ b/user_guide_src/source/incoming/incomingrequest/23.php
@@ -0,0 +1,3 @@
+<?php
+
+$files = $request->getFiles();
diff --git a/user_guide_src/source/incoming/incomingrequest/025.php b/user_guide_src/source/incoming/incomingrequest/24.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/025.php
rename to user_guide_src/source/incoming/incomingrequest/24.php
diff --git a/user_guide_src/source/incoming/incomingrequest/026.php b/user_guide_src/source/incoming/incomingrequest/25.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/026.php
rename to user_guide_src/source/incoming/incomingrequest/25.php
diff --git a/user_guide_src/source/incoming/incomingrequest/027.php b/user_guide_src/source/incoming/incomingrequest/26.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/027.php
rename to user_guide_src/source/incoming/incomingrequest/26.php
diff --git a/user_guide_src/source/incoming/incomingrequest/028.php b/user_guide_src/source/incoming/incomingrequest/27.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/028.php
rename to user_guide_src/source/incoming/incomingrequest/27.php
diff --git a/user_guide_src/source/incoming/incomingrequest/029.php b/user_guide_src/source/incoming/incomingrequest/28.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/029.php
rename to user_guide_src/source/incoming/incomingrequest/28.php
diff --git a/user_guide_src/source/incoming/incomingrequest/030.php b/user_guide_src/source/incoming/incomingrequest/29.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/030.php
rename to user_guide_src/source/incoming/incomingrequest/29.php
diff --git a/user_guide_src/source/incoming/incomingrequest/003.php b/user_guide_src/source/incoming/incomingrequest/3.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/003.php
rename to user_guide_src/source/incoming/incomingrequest/3.php
diff --git a/user_guide_src/source/incoming/incomingrequest/031.php b/user_guide_src/source/incoming/incomingrequest/30.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/031.php
rename to user_guide_src/source/incoming/incomingrequest/30.php
diff --git a/user_guide_src/source/incoming/incomingrequest/032.php b/user_guide_src/source/incoming/incomingrequest/31.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/032.php
rename to user_guide_src/source/incoming/incomingrequest/31.php
diff --git a/user_guide_src/source/incoming/incomingrequest/033.php b/user_guide_src/source/incoming/incomingrequest/32.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/033.php
rename to user_guide_src/source/incoming/incomingrequest/32.php
diff --git a/user_guide_src/source/incoming/incomingrequest/034.php b/user_guide_src/source/incoming/incomingrequest/33.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/034.php
rename to user_guide_src/source/incoming/incomingrequest/33.php
diff --git a/user_guide_src/source/incoming/incomingrequest/035.php b/user_guide_src/source/incoming/incomingrequest/34.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/035.php
rename to user_guide_src/source/incoming/incomingrequest/34.php
diff --git a/user_guide_src/source/incoming/incomingrequest/036.php b/user_guide_src/source/incoming/incomingrequest/35.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/036.php
rename to user_guide_src/source/incoming/incomingrequest/35.php
diff --git a/user_guide_src/source/incoming/incomingrequest/037.php b/user_guide_src/source/incoming/incomingrequest/36.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/037.php
rename to user_guide_src/source/incoming/incomingrequest/36.php
diff --git a/user_guide_src/source/incoming/incomingrequest/038.php b/user_guide_src/source/incoming/incomingrequest/37.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/038.php
rename to user_guide_src/source/incoming/incomingrequest/37.php
diff --git a/user_guide_src/source/incoming/incomingrequest/039.php b/user_guide_src/source/incoming/incomingrequest/38.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/039.php
rename to user_guide_src/source/incoming/incomingrequest/38.php
diff --git a/user_guide_src/source/incoming/incomingrequest/004.php b/user_guide_src/source/incoming/incomingrequest/4.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/004.php
rename to user_guide_src/source/incoming/incomingrequest/4.php
diff --git a/user_guide_src/source/incoming/incomingrequest/005.php b/user_guide_src/source/incoming/incomingrequest/5.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/005.php
rename to user_guide_src/source/incoming/incomingrequest/5.php
diff --git a/user_guide_src/source/incoming/incomingrequest/007.php b/user_guide_src/source/incoming/incomingrequest/6.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/007.php
rename to user_guide_src/source/incoming/incomingrequest/6.php
diff --git a/user_guide_src/source/incoming/incomingrequest/008.php b/user_guide_src/source/incoming/incomingrequest/7.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/008.php
rename to user_guide_src/source/incoming/incomingrequest/7.php
diff --git a/user_guide_src/source/incoming/incomingrequest/009.php b/user_guide_src/source/incoming/incomingrequest/8.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/009.php
rename to user_guide_src/source/incoming/incomingrequest/8.php
diff --git a/user_guide_src/source/incoming/incomingrequest/010.php b/user_guide_src/source/incoming/incomingrequest/9.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/010.php
rename to user_guide_src/source/incoming/incomingrequest/9.php

From b135145df6ddb40ecae45926be50cbac9373f1ce Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Sun, 20 Feb 2022 09:04:22 +0100
Subject: [PATCH 1603/2325] Add script for automatic renumeration of examples.

---
 .php-cs-fixer.dist.php        |  1 +
 user_guide_src/renumerate.php | 98 +++++++++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+)
 create mode 100644 user_guide_src/renumerate.php

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 3c9e05fe3b74..ec0ceaeb0172 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -32,6 +32,7 @@
         __DIR__ . '/.no-header.php-cs-fixer.dist.php',
         __DIR__ . '/rector.php',
         __DIR__ . '/spark',
+        __DIR__ . '/user_guide_src/renumerate.php',
     ]);
 
 $overrides = [];
diff --git a/user_guide_src/renumerate.php b/user_guide_src/renumerate.php
new file mode 100644
index 000000000000..ca885551d168
--- /dev/null
+++ b/user_guide_src/renumerate.php
@@ -0,0 +1,98 @@
+<?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.
+ */
+
+$srcFolder = __DIR__ . '/source';
+
+// Exclude static folders
+$excludes = ['_static', 'images'];
+
+// Safety prefix
+$prefix = 'old_';
+
+// Begin user info
+echo 'The following sections were renumerated:', PHP_EOL;
+
+// Loop source directory
+$srcIterator = new DirectoryIterator($srcFolder);
+
+foreach ($srcIterator as $chapterInfo) {
+    if (! $chapterInfo->isDot() && $chapterInfo->isDir() && ! in_array($chapterInfo->getFilename(), $excludes, true)) {
+        $chapterName = $chapterInfo->getFilename();
+
+        // Iterate the working directory
+        $chapterIterator = new DirectoryIterator($chapterInfo->getPathname());
+
+        foreach ($chapterIterator as $sectionInfo) {
+            if (! $sectionInfo->isDot() && $sectionInfo->isFile() && $sectionInfo->getExtension() === 'rst') {
+                $sectionName   = $sectionInfo->getBasename('.rst');
+                $sectionFolder = $sectionInfo->getPath() . '/' . $sectionName;
+
+                // Read the section file
+                $sectionContent = file_get_contents($sectionInfo->getPathname());
+
+                // Match all includes
+                preg_match_all("~\\.\\. literalinclude:: {$sectionName}\\/(.+)\\.php(\n[ ]*:lines: 2\\-)?~", $sectionContent, $matches);
+                $includeStrings = $matches[0];
+                $exampleNames   = $matches[1];
+
+                // Exit early if no matches
+                if (count($exampleNames) === 0) {
+                    continue;
+                }
+
+                // Check if examples are consecutive
+                $consecutive = true;
+
+                foreach ($exampleNames as $exampleIndex => $exampleName) {
+                    if (str_pad($exampleIndex + 1, 3, '0', STR_PAD_LEFT) !== $exampleName) {
+                        $consecutive = false;
+                        break;
+                    }
+                }
+
+                // Exit if examples are already consecutive
+                if ($consecutive) {
+                    continue;
+                }
+
+                // Rename all example files to avoid conflicts
+                $exampleIterator = new DirectoryIterator($sectionFolder);
+
+                foreach ($exampleIterator as $exampleInfo) {
+                    if (! $exampleInfo->isDot() && $exampleInfo->isFile() && $exampleInfo->getExtension() === 'php') {
+                        rename($exampleInfo->getPathname(), $exampleInfo->getPath() . '/' . $prefix . $exampleInfo->getFilename());
+                    }
+                }
+                $sectionContent = preg_replace("~\\.\\. literalinclude:: {$sectionName}\\/(.+)\\.php~", ".. literalinclude:: {$sectionName}/{$prefix}$1.php", $sectionContent);
+
+                // Renumerate examples
+                foreach ($exampleNames as $exampleIndex => $exampleName) {
+                    $newName = str_pad($exampleIndex + 1, 3, '0', STR_PAD_LEFT);
+
+                    // Rename example file
+                    rename($sectionFolder . '/' . $prefix . $exampleName . '.php', $sectionFolder . '/' . $newName . '.php');
+
+                    // Fix include link
+                    $sectionContent = preg_replace(preg_quote(str_replace($exampleName, $prefix . $exampleName, $includeStrings[$exampleIndex]), '~'), str_replace($exampleName, $newName, $includeStrings[$exampleIndex]), $sectionContent, 1, $count);
+                }
+
+                // Write new content to rst
+                file_put_contents($sectionInfo->getPathname(), $sectionContent);
+
+                // User info
+                echo $chapterName, '/', $sectionName, PHP_EOL;
+            }
+        }
+    }
+}
+
+// End user info
+echo 'Renumerating finished.', PHP_EOL;

From dfce69826845d1b0eba58461004051de61d61c47 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 21 Feb 2022 10:22:16 +0900
Subject: [PATCH 1604/2325] docs: add comment about
 RecursiveIteratorIterator::hasChildren()

---
 system/HTTP/Files/FileCollection.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/system/HTTP/Files/FileCollection.php b/system/HTTP/Files/FileCollection.php
index 10e58c2eb824..bff2e5d609b4 100644
--- a/system/HTTP/Files/FileCollection.php
+++ b/system/HTTP/Files/FileCollection.php
@@ -220,6 +220,10 @@ protected function fixFilesArray(array $data): array
                     $pointer = &$stack[count($stack) - 1];
                     $pointer = &$pointer[$key];
                     $stack[] = &$pointer;
+
+                    // RecursiveIteratorIterator::hasChildren() can be used. RecursiveIteratorIterator
+                    // forwards all unknown method calls to the underlying RecursiveIterator internally.
+                    // See https://github.com/php/doc-en/issues/787#issuecomment-881446121
                     if (! $iterator->hasChildren()) {
                         $pointer[$field] = $val;
                     }

From 2c525a49f983c87151817e1e922e9e8bbfb41d87 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 21 Feb 2022 10:22:58 +0900
Subject: [PATCH 1605/2325] docs: fix typo

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

diff --git a/system/HTTP/Files/FileCollection.php b/system/HTTP/Files/FileCollection.php
index bff2e5d609b4..87f31ee511ea 100644
--- a/system/HTTP/Files/FileCollection.php
+++ b/system/HTTP/Files/FileCollection.php
@@ -235,7 +235,7 @@ protected function fixFilesArray(array $data): array
     }
 
     /**
-     * Navigate through a array looking for a particular index
+     * Navigate through an array looking for a particular index
      *
      * @param array $index The index sequence we are navigating down
      * @param array $value The portion of the array to process

From bb7dc422dbffbcdae6f6023a2d50e98d6f1e8962 Mon Sep 17 00:00:00 2001
From: Nudasoft <30935025+Nudasoft@users.noreply.github.com>
Date: Mon, 21 Feb 2022 11:28:40 +0530
Subject: [PATCH 1606/2325] Fix alignment issues on few buttons in debug toobar
 and few cosmetic tweaks.

---
 system/Debug/Toolbar/Views/toolbar.css | 32 ++++++++------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
index ed4230be0988..47e74d9a4f1b 100644
--- a/system/Debug/Toolbar/Views/toolbar.css
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -39,16 +39,9 @@
   font-size: 16px;
   font-weight: 400; }
   #debug-bar h1 {
-    bottom: 0;
-    display: inline-block;
-    font-size: 14px;
+    display: flex;
     font-weight: normal;
-    margin: 0 16px 0 0;
-    padding: 0;
-    position: absolute;
-    right: 30px;
-    text-align: left;
-    top: 0; }
+    margin: 0 0 0 auto; }
     #debug-bar h1 svg {
       width: 16px;
       margin-right: 5px; }
@@ -135,15 +128,8 @@
     #debug-bar #toolbar-theme a:hover {
       text-decoration: none; }
   #debug-bar #debug-bar-link {
-    bottom: 0;
-    display: inline-block;
-    font-size: 16px;
-    line-height: 36px;
     padding: 6px;
-    position: absolute;
-    right: 10px;
-    top: 0;
-    width: 24px; }
+    display: flex; }
   #debug-bar .ci-label {
     display: inline-flex;
     font-size: 14px; }
@@ -329,7 +315,7 @@
   #debug-bar .ci-label:hover {
     background-color: #DFDFDF; }
   #debug-bar .ci-label .badge {
-    background-color: #5BC0DE;
+    background-color: #DD7359;
     color: #FFFFFF; }
   #debug-bar .tab {
     background-color: #FFFFFF;
@@ -420,8 +406,8 @@
     #debug-bar .ci-label:hover {
       background-color: #252525; }
     #debug-bar .ci-label .badge {
-      background-color: #5BC0DE;
-      color: #DFDFDF; }
+      background-color: #DD7359;
+      color: #FFFFFF; }
     #debug-bar .tab {
       background-color: #252525;
       box-shadow: 0 -1px 4px #434343;
@@ -509,8 +495,8 @@
   #toolbarContainer.dark #debug-bar .ci-label:hover {
     background-color: #252525; }
   #toolbarContainer.dark #debug-bar .ci-label .badge {
-    background-color: #5BC0DE;
-    color: #DFDFDF; }
+    background-color: #DD7359;
+    color: #FFFFFF; }
   #toolbarContainer.dark #debug-bar .tab {
     background-color: #252525;
     box-shadow: 0 -1px 4px #434343;
@@ -602,7 +588,7 @@
   #toolbarContainer.light #debug-bar .ci-label:hover {
     background-color: #DFDFDF; }
   #toolbarContainer.light #debug-bar .ci-label .badge {
-    background-color: #5BC0DE;
+    background-color: #DD7359;
     color: #FFFFFF; }
   #toolbarContainer.light #debug-bar .tab {
     background-color: #FFFFFF;

From 2c52bd674693281a70950d04e8cac7b02c1a5ab6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 22 Feb 2022 08:49:29 +0900
Subject: [PATCH 1607/2325] docs: fix typo

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index cc1561a98949..941875c03b8f 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -28,7 +28,7 @@ Enhancements
 - Added Validation Strict Rules. See :ref:`validation-traditional-and-strict-rules`.
 - Added new OCI8 driver for database.
     - It can access Oracle Database and supports SQL and PL/SQL statements.
-- The ``spark routes`` command now shows closure routes, auto routtes, and filters. See :ref:`URI Routing <spark-routes>`.
+- The ``spark routes`` command now shows closure routes, auto routes, and filters. See :ref:`URI Routing <spark-routes>`.
 - Exception information logged through ``log_message()`` has now improved. It now includes the file and line where the exception originated. It also does not truncate the message anymore.
     - The log format has also changed. If users are depending on the log format in their apps, the new log format is "<1-based count> <cleaned filepath>(<line>): <class><function><args>"
 

From 60abb80ba558105196e9b05274e77d55414471fe Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 22 Feb 2022 08:54:34 +0900
Subject: [PATCH 1608/2325] docs: add SPARKED in Deprecations

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 941875c03b8f..daad84d662fb 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -48,6 +48,7 @@ Deprecations
 - ``CodeIgniter\Debug\Exceptions::cleanPath()`` and ``CodeIgniter\Debug\Toolbar\Collectors\BaseCollector::cleanPath()`` are deprecated. Use the ``clean_path()`` function instead.
 - ``CodeIgniter\Log\Logger::cleanFilenames()`` and ``CodeIgniter\Test\TestLogger::cleanup()`` are both deprecated. Use the ``clean_path()`` function instead.
 - ``CodeIgniter\Router\Router::setDefaultController()`` is deprecated.
+- The constant ``SPARKED`` in **spark** is deprecated. Use the ``$context`` property in ``CodeIgniter\CodeIgniter`` instead.
 
 Bugs Fixed
 **********

From 3a216d0f5e7f711c932355f828f1956b43a8c419 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 22 Feb 2022 09:39:09 +0900
Subject: [PATCH 1609/2325] docs: add note about how to check CI version

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

diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index 1e1d63abe9f1..322302d3e011 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -5,6 +5,10 @@ Upgrading From a Previous Version
 Please read the upgrade notes corresponding to the version you are
 upgrading from.
 
+.. note:: If you don't know what version of CodeIgniter you are currently running,
+    you can get it from :ref:`the Debug Toolbar <the-debug-toolbar>`,
+    or simply echo the constant ``\CodeIgniter\CodeIgniter::CI_VERSION``.
+
 .. toctree::
     :titlesonly:
 

From 52fc49c701774ce7dcacbdced7d20cc633ed143c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 22 Feb 2022 15:08:44 +0900
Subject: [PATCH 1610/2325] docs: make the file path more detailed

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

diff --git a/user_guide_src/source/cli/cli.rst b/user_guide_src/source/cli/cli.rst
index ba5305e433a6..9c7aa04cd835 100644
--- a/user_guide_src/source/cli/cli.rst
+++ b/user_guide_src/source/cli/cli.rst
@@ -79,7 +79,7 @@ you with CLI-only tools.
 CLI-Only Routing
 ----------------
 
-In your **Routes.php** file you can create routes that are only accessible from
+In your **app/Config/Routes.php** file you can create routes that are only accessible from
 the CLI as easily as you would create any other route. Instead of using the ``get()``,
 ``post()``, or similar method, you would use the ``cli()`` method. Everything else
 works exactly like a normal route definition:

From 59715c7b9a7ae0781795f6ae3078e33ce13656ee Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 22 Feb 2022 15:10:14 +0900
Subject: [PATCH 1611/2325] docs: improve page link

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

diff --git a/user_guide_src/source/cli/cli.rst b/user_guide_src/source/cli/cli.rst
index 9c7aa04cd835..e88fc6817f5b 100644
--- a/user_guide_src/source/cli/cli.rst
+++ b/user_guide_src/source/cli/cli.rst
@@ -87,7 +87,7 @@ works exactly like a normal route definition:
 .. literalinclude:: cli/002.php
    :lines: 2-
 
-For more information, see the :doc:`Routes </incoming/routing>` page.
+For more information, see the :ref:`Routes <command-line-only-routes>` page.
 
 The CLI Library
 ---------------
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 14d98a8c84ed..c57e08fa3bd3 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -335,7 +335,9 @@ You can use the ``add()`` method:
     only routes that match the current request method are stored, resulting in fewer routes to scan through
     when trying to find a match.
 
-Command-Line only Routes
+.. _command-line-only-routes:
+
+Command-Line Only Routes
 ========================
 
 You can create routes that work only from the command-line, and are inaccessible from the web browser, with the

From 7c84a3052de2f5ff7ae68e6f86e96d572d0cd633 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 22 Feb 2022 15:10:30 +0900
Subject: [PATCH 1612/2325] docs: add warning about auto-routing

---
 user_guide_src/source/cli/cli.rst          | 3 +++
 user_guide_src/source/incoming/routing.rst | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/user_guide_src/source/cli/cli.rst b/user_guide_src/source/cli/cli.rst
index e88fc6817f5b..45db6a1e6e3e 100644
--- a/user_guide_src/source/cli/cli.rst
+++ b/user_guide_src/source/cli/cli.rst
@@ -89,6 +89,9 @@ works exactly like a normal route definition:
 
 For more information, see the :ref:`Routes <command-line-only-routes>` page.
 
+.. warning:: If you don't disable auto-routing and place the command file in **app/Controllers**,
+    anyone could access the command with the help of auto-routing via HTTP.
+
 The CLI Library
 ---------------
 
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index c57e08fa3bd3..a5c527c3eedb 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -348,6 +348,9 @@ available from the command line:
 .. literalinclude:: routing/028.php
    :lines: 2-
 
+.. warning:: If you don't disable auto-routing and place the command file in **app/Controllers**,
+    anyone could access the command with the help of auto-routing via HTTP.
+
 Global Options
 ==============
 

From a915d8697808288e98cc9d819231034684407b14 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Tue, 22 Feb 2022 10:19:56 +0100
Subject: [PATCH 1613/2325] Convert non-php code.

---
 .../source/cli/cli_commands/006.php           |  2 +-
 .../source/cli/cli_commands/007.php           |  4 ++--
 .../source/database/call_function/002.php     |  2 +-
 .../source/database/configuration/008.php     |  6 ++---
 .../source/database/query_builder/027.php     |  2 +-
 .../source/extending/events/002.php           |  2 +-
 .../source/extending/events/006.php           |  2 +-
 .../source/general/common_functions/003.php   |  2 +-
 .../source/helpers/array_helper/002.php       |  2 +-
 .../source/helpers/text_helper/020.php        | 15 +++++++-----
 .../source/helpers/url_helper/009.php         |  4 ++--
 .../source/helpers/url_helper/023.php         |  4 +++-
 .../source/helpers/url_helper/024.php         |  4 +++-
 .../source/incoming/filters/011.php           |  2 +-
 .../source/incoming/incomingrequest/10.php    | 15 +++++++-----
 .../source/incoming/incomingrequest/13.php    |  2 +-
 .../source/incoming/incomingrequest/15.php    |  2 +-
 .../source/incoming/message/003.php           | 24 ++++++++++++-------
 .../source/incoming/message/005.php           |  6 +++--
 .../source/incoming/routing/029.php           |  2 +-
 .../source/installation/upgrade_412/001.php   |  3 +++
 .../source/installation/upgrade_412/002.php   |  3 +++
 .../installation/upgrade_localization/002.php |  2 +-
 .../installation/upgrade_localization/003.php |  2 +-
 .../installation/upgrade_responses/001.php    |  2 +-
 .../installation/upgrade_responses/002.php    |  2 +-
 .../installation/upgrade_routing/002.php      |  2 +-
 .../installation/upgrade_security/002.php     |  2 +-
 .../source/libraries/curlrequest/014.php      | 11 +++++----
 .../source/libraries/curlrequest/019.php      |  2 +-
 .../source/libraries/pagination/011.php       |  2 +-
 .../source/libraries/pagination/012.php       |  2 +-
 .../source/libraries/sessions/002.php         |  2 +-
 .../source/libraries/sessions/005.php         |  2 +-
 .../source/libraries/sessions/007.php         |  2 +-
 .../source/libraries/sessions/009.php         |  2 +-
 .../source/libraries/sessions/010.php         |  2 +-
 .../source/libraries/sessions/014.php         |  2 +-
 .../source/libraries/sessions/024.php         |  2 +-
 .../source/libraries/sessions/033.php         |  2 +-
 .../source/libraries/throttler/003.php        |  2 +-
 user_guide_src/source/libraries/time/038.php  |  2 +-
 user_guide_src/source/libraries/time/041.php  |  4 ++--
 .../source/libraries/uploaded_files/004.php   |  4 ++--
 .../source/libraries/uploaded_files/005.php   |  4 ++--
 .../source/libraries/uploaded_files/006.php   |  7 +++---
 user_guide_src/source/libraries/uri/020.php   |  2 +-
 user_guide_src/source/libraries/uri/026.php   |  2 +-
 .../source/libraries/validation/002.php       |  2 +-
 .../source/libraries/validation/009.php       | 22 +++++++++--------
 .../source/libraries/validation/011.php       | 13 ++++++----
 .../source/libraries/validation/025.php       |  2 +-
 .../source/libraries/validation/027.php       |  2 +-
 user_guide_src/source/models/entities/003.php |  2 +-
 .../source/outgoing/localization/007.php      |  2 +-
 .../source/outgoing/localization/008.php      | 11 +++++----
 .../source/outgoing/response/021.php          |  2 +-
 .../source/outgoing/response/026.php          |  4 +++-
 .../source/outgoing/view_parser/016.php       |  2 +-
 .../source/outgoing/view_parser/017.php       |  2 +-
 .../source/outgoing/view_parser/021.php       |  2 +-
 .../source/testing/benchmark/004.php          |  2 +-
 .../source/testing/controllers/012.php        |  4 +++-
 .../source/testing/fabricator/001.php         |  4 +++-
 .../source/testing/fabricator/005.php         |  1 +
 .../source/testing/fabricator/006.php         |  3 +++
 .../source/testing/fabricator/009.php         |  2 +-
 .../source/testing/fabricator/012.php         |  2 +-
 .../source/testing/fabricator/016.php         |  4 ++--
 .../source/testing/fabricator/018.php         |  4 ++--
 .../source/testing/fabricator/021.php         |  1 +
 user_guide_src/source/testing/feature/002.php |  2 +-
 .../source/testing/overview/006.php           |  1 +
 .../source/testing/overview/007.php           |  8 +++++--
 .../source/testing/overview/008.php           |  2 +-
 .../source/testing/response/004.php           |  2 +-
 .../source/testing/response/006.php           |  2 +-
 .../source/testing/response/020.php           |  2 +-
 .../source/testing/response/026.php           |  2 +-
 .../source/testing/response/030.php           | 12 ++++++----
 .../source/testing/response/031.php           |  2 +-
 .../source/testing/response/032.php           |  2 +-
 82 files changed, 184 insertions(+), 130 deletions(-)

diff --git a/user_guide_src/source/cli/cli_commands/006.php b/user_guide_src/source/cli/cli_commands/006.php
index 43c03cdab049..bdc252c957be 100644
--- a/user_guide_src/source/cli/cli_commands/006.php
+++ b/user_guide_src/source/cli/cli_commands/006.php
@@ -1,7 +1,7 @@
 <?php
 
 try {
-    . . .
+    // ...
 } catch (\Exception $e) {
     $this->showError($e);
 }
diff --git a/user_guide_src/source/cli/cli_commands/007.php b/user_guide_src/source/cli/cli_commands/007.php
index 71456025ddac..7fcb90ccf083 100644
--- a/user_guide_src/source/cli/cli_commands/007.php
+++ b/user_guide_src/source/cli/cli_commands/007.php
@@ -7,5 +7,5 @@
 }
 
 // Output will be
--n                  Set migration namespace
--r                  override file
+// -n        Set migration namespace
+// -r        override file
diff --git a/user_guide_src/source/database/call_function/002.php b/user_guide_src/source/database/call_function/002.php
index 807a43266dac..64d5e0fbc85f 100644
--- a/user_guide_src/source/database/call_function/002.php
+++ b/user_guide_src/source/database/call_function/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$db->callFunction('some_function', $param1, $param2, etc..);
+$db->callFunction('some_function', $param1, $param2, /* ... */);
diff --git a/user_guide_src/source/database/configuration/008.php b/user_guide_src/source/database/configuration/008.php
index 780c89a9b532..9d2d76336d94 100644
--- a/user_guide_src/source/database/configuration/008.php
+++ b/user_guide_src/source/database/configuration/008.php
@@ -2,9 +2,9 @@
 
 class Database
 {
-    public $development = [...];
-    public $test        = [...];
-    public $production  = [...];
+    public $development = [/* ... */];
+    public $test        = [/* ... */];
+    public $production  = [/* ... */];
 
     public function __construct()
     {
diff --git a/user_guide_src/source/database/query_builder/027.php b/user_guide_src/source/database/query_builder/027.php
index 8d1b6495e232..7583487da1a2 100644
--- a/user_guide_src/source/database/query_builder/027.php
+++ b/user_guide_src/source/database/query_builder/027.php
@@ -9,5 +9,5 @@
 // Produces: WHERE "advance_amount" < (SELECT MAX(advance_amount) FROM "orders" WHERE "id" > 2)
 
 // With builder directly
-$subQuery = $db->table('orders')->select('MAX(advance_amount)', false)->where('id >', 2)
+$subQuery = $db->table('orders')->select('MAX(advance_amount)', false)->where('id >', 2);
 $builder->where('advance_amount <', $subQuery);
diff --git a/user_guide_src/source/extending/events/002.php b/user_guide_src/source/extending/events/002.php
index e41a9880c232..1c28aa8dc471 100644
--- a/user_guide_src/source/extending/events/002.php
+++ b/user_guide_src/source/extending/events/002.php
@@ -13,5 +13,5 @@
 // Use a Closure
 Events::on('pre_system', function (...$params)
 {
-    . . .
+    // ...
 });
diff --git a/user_guide_src/source/extending/events/006.php b/user_guide_src/source/extending/events/006.php
index ff866f8e2392..5233c94e1808 100644
--- a/user_guide_src/source/extending/events/006.php
+++ b/user_guide_src/source/extending/events/006.php
@@ -3,5 +3,5 @@
 \CodeIgniter\Events\Events::trigger('some_events', $foo, $bar, $baz);
 
 Events::on('some_event', function ($foo, $bar, $baz) {
-    ...
+    // ...
 });
diff --git a/user_guide_src/source/general/common_functions/003.php b/user_guide_src/source/general/common_functions/003.php
index fd713d756325..4fecfb8fc9a0 100644
--- a/user_guide_src/source/general/common_functions/003.php
+++ b/user_guide_src/source/general/common_functions/003.php
@@ -5,5 +5,5 @@
 
 // Set timer start and stop points
 timer('controller_loading');    // Will start the timer
-. . .
+// ...
 timer('controller_loading');    // Will stop the running timer
diff --git a/user_guide_src/source/helpers/array_helper/002.php b/user_guide_src/source/helpers/array_helper/002.php
index 64f6a2891fa0..50ce70084c86 100644
--- a/user_guide_src/source/helpers/array_helper/002.php
+++ b/user_guide_src/source/helpers/array_helper/002.php
@@ -9,4 +9,4 @@
             'baz' => 23,
         ]
     ]
-]
+];
diff --git a/user_guide_src/source/helpers/text_helper/020.php b/user_guide_src/source/helpers/text_helper/020.php
index a6de1d0f67f0..e5e6be9350a6 100644
--- a/user_guide_src/source/helpers/text_helper/020.php
+++ b/user_guide_src/source/helpers/text_helper/020.php
@@ -3,10 +3,13 @@
 $string = "Here is a simple string of text that will help us demonstrate this function.";
 echo word_wrap($string, 25);
 
-// Would produce:
-// Here is a simple string
-// of text that will help us
-// demonstrate this
-// function.
+/*
+  Would produce:
 
-Excessively long words will be split, but URLs will not be.
\ No newline at end of file
+    Here is a simple string
+    of text that will help us
+    demonstrate this
+    function.
+
+  Excessively long words will be split, but URLs will not be.
+*/
\ No newline at end of file
diff --git a/user_guide_src/source/helpers/url_helper/009.php b/user_guide_src/source/helpers/url_helper/009.php
index 960bc6f0430e..d8a04af25055 100644
--- a/user_guide_src/source/helpers/url_helper/009.php
+++ b/user_guide_src/source/helpers/url_helper/009.php
@@ -4,8 +4,8 @@
     'width'       => 800,
     'height'      => 600,
     'scrollbars'  => 'yes',
-    'status'      => 'yes',
-    'resizable'   => 'yes',
+    'status'      => 'yes',
+    'resizable'   => 'yes',
     'screenx'     => 0,
     'screeny'     => 0,
     'window_name' => '_blank',
diff --git a/user_guide_src/source/helpers/url_helper/023.php b/user_guide_src/source/helpers/url_helper/023.php
index 2c17057179f9..5f12524f3029 100644
--- a/user_guide_src/source/helpers/url_helper/023.php
+++ b/user_guide_src/source/helpers/url_helper/023.php
@@ -1,3 +1,5 @@
 <?php
 
-if (url_is('admin')) { ... }
+if (url_is('admin')) {
+    // ...
+}
diff --git a/user_guide_src/source/helpers/url_helper/024.php b/user_guide_src/source/helpers/url_helper/024.php
index 54e3270e6789..9ea3f15daf55 100644
--- a/user_guide_src/source/helpers/url_helper/024.php
+++ b/user_guide_src/source/helpers/url_helper/024.php
@@ -1,3 +1,5 @@
 <?php
 
-if (url_is('admin*')) { ... }
+if (url_is('admin*')) {
+    // ...
+}
diff --git a/user_guide_src/source/incoming/filters/011.php b/user_guide_src/source/incoming/filters/011.php
index 4065ef7d1743..10db5ad2eb40 100644
--- a/user_guide_src/source/incoming/filters/011.php
+++ b/user_guide_src/source/incoming/filters/011.php
@@ -1,6 +1,6 @@
 <?php
 
 public $aliases = [
-    ...
+    // ...
     'secureheaders' => \App\Filters\SecureHeaders::class,
 ];
diff --git a/user_guide_src/source/incoming/incomingrequest/10.php b/user_guide_src/source/incoming/incomingrequest/10.php
index 56f9522366b0..d4118cebda7c 100644
--- a/user_guide_src/source/incoming/incomingrequest/10.php
+++ b/user_guide_src/source/incoming/incomingrequest/10.php
@@ -1,12 +1,15 @@
 <?php
 
-// With a request body of:
-{
-    "foo": "bar",
-    "fizz": {
-        "buzz": "baz"
+/*
+     With a request body of:
+    {
+        "foo": "bar",
+        "fizz": {
+            "buzz": "baz"
+        }
     }
-}
+*/
+
 $data = $request->getVar('foo');
 // $data = "bar"
 
diff --git a/user_guide_src/source/incoming/incomingrequest/13.php b/user_guide_src/source/incoming/incomingrequest/13.php
index 2b5ffb8498e0..cf4be2eb10ac 100644
--- a/user_guide_src/source/incoming/incomingrequest/13.php
+++ b/user_guide_src/source/incoming/incomingrequest/13.php
@@ -5,4 +5,4 @@
 [
     'Param1' => 'Value1',
     'Param2' => 'Value2'
-]
+];
diff --git a/user_guide_src/source/incoming/incomingrequest/15.php b/user_guide_src/source/incoming/incomingrequest/15.php
index 1584967d3bd8..c6e85bfef577 100644
--- a/user_guide_src/source/incoming/incomingrequest/15.php
+++ b/user_guide_src/source/incoming/incomingrequest/15.php
@@ -6,4 +6,4 @@
     'Host'          => CodeIgniter\HTTP\Header,
     'Cache-Control' => CodeIgniter\HTTP\Header,
     'Accept'        => CodeIgniter\HTTP\Header,
-]
+];
diff --git a/user_guide_src/source/incoming/message/003.php b/user_guide_src/source/incoming/message/003.php
index 3ef7db58835a..41aa837fb49f 100644
--- a/user_guide_src/source/incoming/message/003.php
+++ b/user_guide_src/source/incoming/message/003.php
@@ -2,18 +2,24 @@
 
 echo $message->header('Accept-Language');
 
-// Outputs something like:
-'Accept-Language: en,en-US'
+/*
+    Outputs something like:
+    'Accept-Language: en,en-US'
+*/
 
 echo $message->header('Accept-Language')->getValue();
 
-// Outputs something like:
-[
-    'en',
-    'en-US'
-]
+/*
+    Outputs something like:
+    [
+        'en',
+        'en-US'
+    ]
+*/
 
 echo $message->header('Accept-Language')->getValueLine();
 
-// Outputs something like:
-'en,en-US'
+/*
+    Outputs something like:
+   'en,en-US'
+*/
diff --git a/user_guide_src/source/incoming/message/005.php b/user_guide_src/source/incoming/message/005.php
index dd643a1250e4..ea54a21a4407 100644
--- a/user_guide_src/source/incoming/message/005.php
+++ b/user_guide_src/source/incoming/message/005.php
@@ -2,5 +2,7 @@
 
 echo $message->getHeaderLine('Accept-Language');
 
-// Outputs:
-en, en-US
+/*
+    Outputs:
+    en, en-US
+*/
diff --git a/user_guide_src/source/incoming/routing/029.php b/user_guide_src/source/incoming/routing/029.php
index 31c1dda07a70..fad1213d3f22 100644
--- a/user_guide_src/source/incoming/routing/029.php
+++ b/user_guide_src/source/incoming/routing/029.php
@@ -11,4 +11,4 @@
 $routes->match(['get', 'put'], 'from', 'to', $options);
 $routes->resource('photos', $options);
 $routes->map($array, $options);
-$routes->group('name', $options, function ());
+$routes->group('name', $options, function (){});
diff --git a/user_guide_src/source/installation/upgrade_412/001.php b/user_guide_src/source/installation/upgrade_412/001.php
index 9b9373ac6cf0..94fb395e8077 100644
--- a/user_guide_src/source/installation/upgrade_412/001.php
+++ b/user_guide_src/source/installation/upgrade_412/001.php
@@ -6,3 +6,6 @@ class MyDatabaseTest extends DatabaseTestCase
 {
     public function testBadRow()
     {
+        // ...
+    }
+}
diff --git a/user_guide_src/source/installation/upgrade_412/002.php b/user_guide_src/source/installation/upgrade_412/002.php
index 4fc229a77927..75ac87d0e9cf 100644
--- a/user_guide_src/source/installation/upgrade_412/002.php
+++ b/user_guide_src/source/installation/upgrade_412/002.php
@@ -9,3 +9,6 @@ class MyDatabaseTest extends CIUnitTestCase
 
     public function testBadRow()
     {
+        // ...
+    }
+}
diff --git a/user_guide_src/source/installation/upgrade_localization/002.php b/user_guide_src/source/installation/upgrade_localization/002.php
index a377d18193fc..9c2b650415d9 100644
--- a/user_guide_src/source/installation/upgrade_localization/002.php
+++ b/user_guide_src/source/installation/upgrade_localization/002.php
@@ -5,7 +5,7 @@
 $lang['error_url_missing']      = 'You must submit a URL';
 $lang['error_username_missing'] = 'You must submit a username';
 
-...
+// ...
 
 $this->lang->load('error', $lang);
 echo $this->lang->line('error_email_missing');
diff --git a/user_guide_src/source/installation/upgrade_localization/003.php b/user_guide_src/source/installation/upgrade_localization/003.php
index e0149516841d..8fa627284bdd 100644
--- a/user_guide_src/source/installation/upgrade_localization/003.php
+++ b/user_guide_src/source/installation/upgrade_localization/003.php
@@ -12,6 +12,6 @@
     ],
 ];
 
-...
+// ...
 
 echo lang('Errors.errorEmailMissing');
diff --git a/user_guide_src/source/installation/upgrade_responses/001.php b/user_guide_src/source/installation/upgrade_responses/001.php
index f837ab8b6c3b..74ff3a5dc5c8 100644
--- a/user_guide_src/source/installation/upgrade_responses/001.php
+++ b/user_guide_src/source/installation/upgrade_responses/001.php
@@ -2,7 +2,7 @@
 
 $this->output->set_status_header(404);
 
-...
+// ...
 
 $this->output
     ->set_content_type('application/json')
diff --git a/user_guide_src/source/installation/upgrade_responses/002.php b/user_guide_src/source/installation/upgrade_responses/002.php
index e84279cf273c..469c1c1467f2 100644
--- a/user_guide_src/source/installation/upgrade_responses/002.php
+++ b/user_guide_src/source/installation/upgrade_responses/002.php
@@ -2,6 +2,6 @@
 
 $this->response->setStatusCode(404);
 
-...
+// ...
 
 return $this->response->setJSON(['foo' => 'bar']);
diff --git a/user_guide_src/source/installation/upgrade_routing/002.php b/user_guide_src/source/installation/upgrade_routing/002.php
index 14097435e586..4bc53ace4321 100644
--- a/user_guide_src/source/installation/upgrade_routing/002.php
+++ b/user_guide_src/source/installation/upgrade_routing/002.php
@@ -11,7 +11,7 @@
     require SYSTEMPATH . 'Config/Routes.php';
 }
 
-...
+// ...
 
 $routes->add('posts/index', 'Posts::index');
 $routes->add('teams/create', 'Teams::create');
diff --git a/user_guide_src/source/installation/upgrade_security/002.php b/user_guide_src/source/installation/upgrade_security/002.php
index 0419285423b0..c1604ae48317 100644
--- a/user_guide_src/source/installation/upgrade_security/002.php
+++ b/user_guide_src/source/installation/upgrade_security/002.php
@@ -5,7 +5,7 @@
     'hash' => $this->security->get_csrf_hash()
 );
 
-...
+// ...
 
 <form>
     <input name="name" type="text">
diff --git a/user_guide_src/source/libraries/curlrequest/014.php b/user_guide_src/source/libraries/curlrequest/014.php
index 452f30dd45ed..04f6e02ffb18 100644
--- a/user_guide_src/source/libraries/curlrequest/014.php
+++ b/user_guide_src/source/libraries/curlrequest/014.php
@@ -2,7 +2,10 @@
 
 $client->request('GET', 'http://example.com', ['allow_redirects' => true]);
 
-// Sets the following defaults:
-'max'       => 5, // Maximum number of redirects to follow before stopping
-'strict'    => true, // Ensure POST requests stay POST requests through redirects
-'protocols' => ['http', 'https'] // Restrict redirects to one or more protocols
+/*
+    Sets the following defaults:
+
+    'max'       => 5, // Maximum number of redirects to follow before stopping
+    'strict'    => true, // Ensure POST requests stay POST requests through redirects
+    'protocols' => ['http', 'https'] // Restrict redirects to one or more protocols
+*/
\ No newline at end of file
diff --git a/user_guide_src/source/libraries/curlrequest/019.php b/user_guide_src/source/libraries/curlrequest/019.php
index 96f86c9ea6a2..0382d08e1bbc 100644
--- a/user_guide_src/source/libraries/curlrequest/019.php
+++ b/user_guide_src/source/libraries/curlrequest/019.php
@@ -1,3 +1,3 @@
 <?php
 
-$client->request('get', '/', ['cert' => ['/path/server.pem', 'password']);
+$client->request('get', '/', ['cert' => ['/path/server.pem', 'password']]);
diff --git a/user_guide_src/source/libraries/pagination/011.php b/user_guide_src/source/libraries/pagination/011.php
index 86c5e0bcd8b5..8000e782737c 100644
--- a/user_guide_src/source/libraries/pagination/011.php
+++ b/user_guide_src/source/libraries/pagination/011.php
@@ -1,3 +1,3 @@
 <?php
 
-'default_full'   => 'App\Views\Pagers\foundation_full',
+['default_full'   => 'App\Views\Pagers\foundation_full'];
diff --git a/user_guide_src/source/libraries/pagination/012.php b/user_guide_src/source/libraries/pagination/012.php
index 841118b57ae1..5a00b20f70c3 100644
--- a/user_guide_src/source/libraries/pagination/012.php
+++ b/user_guide_src/source/libraries/pagination/012.php
@@ -1,3 +1,3 @@
 <?php
 
-'default_full'   => 'Pagers/foundation_full',
+['default_full'   => 'Pagers/foundation_full'];
diff --git a/user_guide_src/source/libraries/sessions/002.php b/user_guide_src/source/libraries/sessions/002.php
index e154d8544546..2ed7fb3cda92 100644
--- a/user_guide_src/source/libraries/sessions/002.php
+++ b/user_guide_src/source/libraries/sessions/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$session
+$session;
diff --git a/user_guide_src/source/libraries/sessions/005.php b/user_guide_src/source/libraries/sessions/005.php
index 4f09358d5fc8..02fecf74f1b2 100644
--- a/user_guide_src/source/libraries/sessions/005.php
+++ b/user_guide_src/source/libraries/sessions/005.php
@@ -1,3 +1,3 @@
 <?php
 
-$_SESSION['item']
+$_SESSION['item'];
diff --git a/user_guide_src/source/libraries/sessions/007.php b/user_guide_src/source/libraries/sessions/007.php
index d3d4aaf2aaf8..a3537d4344ff 100644
--- a/user_guide_src/source/libraries/sessions/007.php
+++ b/user_guide_src/source/libraries/sessions/007.php
@@ -1,3 +1,3 @@
 <?php
 
-$session->item
+$session->item;
diff --git a/user_guide_src/source/libraries/sessions/009.php b/user_guide_src/source/libraries/sessions/009.php
index 7c66bb38e442..12632835f531 100644
--- a/user_guide_src/source/libraries/sessions/009.php
+++ b/user_guide_src/source/libraries/sessions/009.php
@@ -4,7 +4,7 @@
 
 // or:
 
-$name = $session->name
+$name = $session->name;
 
 // or:
 
diff --git a/user_guide_src/source/libraries/sessions/010.php b/user_guide_src/source/libraries/sessions/010.php
index e723f1b13ddd..c65740c91dbb 100644
--- a/user_guide_src/source/libraries/sessions/010.php
+++ b/user_guide_src/source/libraries/sessions/010.php
@@ -1,6 +1,6 @@
 <?php
 
-$_SESSION
+$_SESSION;
 
 // or:
 
diff --git a/user_guide_src/source/libraries/sessions/014.php b/user_guide_src/source/libraries/sessions/014.php
index 4cab41e404aa..96a8903ea825 100644
--- a/user_guide_src/source/libraries/sessions/014.php
+++ b/user_guide_src/source/libraries/sessions/014.php
@@ -2,4 +2,4 @@
 
 // returns false if the 'some_name' item doesn't exist or is null,
 // true otherwise:
-isset($_SESSION['some_name'])
+isset($_SESSION['some_name']);
diff --git a/user_guide_src/source/libraries/sessions/024.php b/user_guide_src/source/libraries/sessions/024.php
index 4f09358d5fc8..02fecf74f1b2 100644
--- a/user_guide_src/source/libraries/sessions/024.php
+++ b/user_guide_src/source/libraries/sessions/024.php
@@ -1,3 +1,3 @@
 <?php
 
-$_SESSION['item']
+$_SESSION['item'];
diff --git a/user_guide_src/source/libraries/sessions/033.php b/user_guide_src/source/libraries/sessions/033.php
index 4f09358d5fc8..02fecf74f1b2 100644
--- a/user_guide_src/source/libraries/sessions/033.php
+++ b/user_guide_src/source/libraries/sessions/033.php
@@ -1,3 +1,3 @@
 <?php
 
-$_SESSION['item']
+$_SESSION['item'];
diff --git a/user_guide_src/source/libraries/throttler/003.php b/user_guide_src/source/libraries/throttler/003.php
index af756092e30d..98e496c8a6d2 100644
--- a/user_guide_src/source/libraries/throttler/003.php
+++ b/user_guide_src/source/libraries/throttler/003.php
@@ -1,6 +1,6 @@
 <?php
 
 public $aliases = [
-    ...
+    // ...
     'throttle' => \App\Filters\Throttle::class,
 ];
diff --git a/user_guide_src/source/libraries/time/038.php b/user_guide_src/source/libraries/time/038.php
index 5284ee5d5828..880bf193a590 100644
--- a/user_guide_src/source/libraries/time/038.php
+++ b/user_guide_src/source/libraries/time/038.php
@@ -3,5 +3,5 @@
 $time = Time::parse('March 10, 2017', 'America/Chicago');
 
 $diff = $time->difference(Time::now());
-$diff = $time->difference(new DateTime('July 4, 1975', 'America/Chicago');
+$diff = $time->difference(new DateTime('July 4, 1975', 'America/Chicago'));
 $diff = $time->difference('July 4, 1975 13:32:05', 'America/Chicago');
diff --git a/user_guide_src/source/libraries/time/041.php b/user_guide_src/source/libraries/time/041.php
index 98a67ecf7998..754e1e25a58d 100644
--- a/user_guide_src/source/libraries/time/041.php
+++ b/user_guide_src/source/libraries/time/041.php
@@ -1,8 +1,8 @@
 <?php
 
-$current = Time::parse('March 10, 2017', 'America/Chicago')
+$current = Time::parse('March 10, 2017', 'America/Chicago');
 $test    = Time::parse('March 9, 2016 12:00:00', 'America/Chicago');
 
-$diff = $current->difference($test)
+$diff = $current->difference($test);
 
 echo $diff->humanize(); // 1 year ago
diff --git a/user_guide_src/source/libraries/uploaded_files/004.php b/user_guide_src/source/libraries/uploaded_files/004.php
index 368facf4f7ab..51b1732bc522 100644
--- a/user_guide_src/source/libraries/uploaded_files/004.php
+++ b/user_guide_src/source/libraries/uploaded_files/004.php
@@ -1,5 +1,5 @@
 <?php
 
 [
-    'avatar' => // UploadedFile instance
-]
+    'avatar' => '...' // UploadedFile instance
+];
diff --git a/user_guide_src/source/libraries/uploaded_files/005.php b/user_guide_src/source/libraries/uploaded_files/005.php
index bf31373e57bd..190021513ef5 100644
--- a/user_guide_src/source/libraries/uploaded_files/005.php
+++ b/user_guide_src/source/libraries/uploaded_files/005.php
@@ -3,7 +3,7 @@
 [
     'my-form' => [
         'details' => [
-            'avatar' => // UploadedFile instance
+            'avatar' => '...' // UploadedFile instance
         ]
     ]
-]
+];
diff --git a/user_guide_src/source/libraries/uploaded_files/006.php b/user_guide_src/source/libraries/uploaded_files/006.php
index c53d82a298fc..9a1fde0f053e 100644
--- a/user_guide_src/source/libraries/uploaded_files/006.php
+++ b/user_guide_src/source/libraries/uploaded_files/006.php
@@ -4,8 +4,9 @@
     'my-form' => [
         'details' => [
             'avatar' => [
-                0 => /* UploadedFile instance */,
-                1 => /* UploadedFile instance */
+                0 => '...' /* UploadedFile instance */,
+                1 => '...' /* UploadedFile instance */
+            ]
         ]
     ]
-]
+];
\ No newline at end of file
diff --git a/user_guide_src/source/libraries/uri/020.php b/user_guide_src/source/libraries/uri/020.php
index ab991a826cff..53c3b8d66dd9 100644
--- a/user_guide_src/source/libraries/uri/020.php
+++ b/user_guide_src/source/libraries/uri/020.php
@@ -3,7 +3,7 @@
 $uri = new \CodeIgniter\HTTP\URI('http://www.example.com?foo=bar&bar=baz&baz=foz');
 
 // Returns 'foo=bar'
-echo $uri->getQuery(['only' => ['foo']);
+echo $uri->getQuery(['only' => ['foo']]);
 
 // Returns 'foo=bar&baz=foz'
 echo $uri->getQuery(['except' => ['bar']]);
diff --git a/user_guide_src/source/libraries/uri/026.php b/user_guide_src/source/libraries/uri/026.php
index c5be0f68c2ff..53a42eb788f4 100644
--- a/user_guide_src/source/libraries/uri/026.php
+++ b/user_guide_src/source/libraries/uri/026.php
@@ -7,4 +7,4 @@
     0 => 'users',
     1 => '15',
     2 => 'profile'
-]
+];
diff --git a/user_guide_src/source/libraries/validation/002.php b/user_guide_src/source/libraries/validation/002.php
index 46322fe586bd..1cc4b9e188ab 100644
--- a/user_guide_src/source/libraries/validation/002.php
+++ b/user_guide_src/source/libraries/validation/002.php
@@ -6,5 +6,5 @@
     'passconf' => 'required|matches[password]',
     'email'    => 'required|valid_email',
 ])) {
-    ...
+    // ...
 }
diff --git a/user_guide_src/source/libraries/validation/009.php b/user_guide_src/source/libraries/validation/009.php
index 1678d5530f27..aec2e980c5dc 100644
--- a/user_guide_src/source/libraries/validation/009.php
+++ b/user_guide_src/source/libraries/validation/009.php
@@ -1,17 +1,19 @@
 <?php
 
 // The data to test:
-'contacts' => [
-    'name' => 'Joe Smith',
-    'friends' => [
-        [
-            'name' => 'Fred Flinstone',
-        ],
-        [
-            'name' => 'Wilma',
-        ],
+[
+    'contacts' => [
+       'name' => 'Joe Smith',
+        'friends' => [
+            [
+                'name' => 'Fred Flinstone',
+            ],
+            [
+                'name' => 'Wilma',
+            ],
+        ]
     ]
-]
+];
 
 // Joe Smith
 $validation->setRules([
diff --git a/user_guide_src/source/libraries/validation/011.php b/user_guide_src/source/libraries/validation/011.php
index 023712f4315e..66fbcda5e1a7 100644
--- a/user_guide_src/source/libraries/validation/011.php
+++ b/user_guide_src/source/libraries/validation/011.php
@@ -1,11 +1,14 @@
 <?php
 
 // The data to test:
-'user_ids' => [
-    1,
-    2,
-    3,
-]
+[
+    'user_ids' => [
+        1,
+        2,
+       3,
+    ]
+];
+
 // Rule
 $validation->setRules([
     'user_ids.*' => 'required',
diff --git a/user_guide_src/source/libraries/validation/025.php b/user_guide_src/source/libraries/validation/025.php
index 0531b84be47c..a71f46f29f92 100644
--- a/user_guide_src/source/libraries/validation/025.php
+++ b/user_guide_src/source/libraries/validation/025.php
@@ -1,3 +1,3 @@
 <?php
 
-'min_length' => 'Supplied value ({value}) for {field} must have at least {param} characters.'
+['min_length' => 'Supplied value ({value}) for {field} must have at least {param} characters.'];
diff --git a/user_guide_src/source/libraries/validation/027.php b/user_guide_src/source/libraries/validation/027.php
index 57aa5a31cb84..c6afaf393f2a 100644
--- a/user_guide_src/source/libraries/validation/027.php
+++ b/user_guide_src/source/libraries/validation/027.php
@@ -6,4 +6,4 @@
 [
     'field1' => 'error message',
     'field2' => 'error message',
-]
+];
diff --git a/user_guide_src/source/models/entities/003.php b/user_guide_src/source/models/entities/003.php
index 4b29ea153692..c8cfd58c14db 100644
--- a/user_guide_src/source/models/entities/003.php
+++ b/user_guide_src/source/models/entities/003.php
@@ -9,7 +9,7 @@
 // Updating
 unset($user->username);
 
-if (! isset($user->username) {
+if (! isset($user->username)) {
     $user->username = 'something new';
 }
 
diff --git a/user_guide_src/source/outgoing/localization/007.php b/user_guide_src/source/outgoing/localization/007.php
index 48dc3e455282..e2de3a4644d6 100644
--- a/user_guide_src/source/outgoing/localization/007.php
+++ b/user_guide_src/source/outgoing/localization/007.php
@@ -1,3 +1,3 @@
 <?php
 
-'languageKey' => 'The actual message to be shown.'
+['languageKey' => 'The actual message to be shown.'];
diff --git a/user_guide_src/source/outgoing/localization/008.php b/user_guide_src/source/outgoing/localization/008.php
index b8975a521320..eac50a5f4861 100644
--- a/user_guide_src/source/outgoing/localization/008.php
+++ b/user_guide_src/source/outgoing/localization/008.php
@@ -1,7 +1,10 @@
 <?php
 
-'languageKey' => [
-    'nested' => [
-        'key' => 'The actual message to be shown.',
+[
+    'languageKey' => [
+        'nested' => [
+            'key' => 'The actual message to be shown.',
+        ],
     ],
-],
+]
+;
\ No newline at end of file
diff --git a/user_guide_src/source/outgoing/response/021.php b/user_guide_src/source/outgoing/response/021.php
index 41745631aaac..092a758b18db 100644
--- a/user_guide_src/source/outgoing/response/021.php
+++ b/user_guide_src/source/outgoing/response/021.php
@@ -3,4 +3,4 @@
 $response->noCache();
 
 // Sets the following header:
-Cache-Control: no-store, max-age=0, no-cache
+// Cache-Control: no-store, max-age=0, no-cache
diff --git a/user_guide_src/source/outgoing/response/026.php b/user_guide_src/source/outgoing/response/026.php
index 55149496da87..4287ddb889ba 100644
--- a/user_guide_src/source/outgoing/response/026.php
+++ b/user_guide_src/source/outgoing/response/026.php
@@ -1,3 +1,5 @@
 <?php
 
-if ($response->hasCookie($name)) ...
+if ($response->hasCookie($name)) {
+    // ...
+}
\ No newline at end of file
diff --git a/user_guide_src/source/outgoing/view_parser/016.php b/user_guide_src/source/outgoing/view_parser/016.php
index 74a18943365c..e93bd3986957 100644
--- a/user_guide_src/source/outgoing/view_parser/016.php
+++ b/user_guide_src/source/outgoing/view_parser/016.php
@@ -5,4 +5,4 @@
 ];
 
 // Tag is replaced by the return value of Some\Class::methodName static function.
-{+ foo +}
+// {+ foo +}
diff --git a/user_guide_src/source/outgoing/view_parser/017.php b/user_guide_src/source/outgoing/view_parser/017.php
index 30d72b247059..4e699d190bcd 100644
--- a/user_guide_src/source/outgoing/view_parser/017.php
+++ b/user_guide_src/source/outgoing/view_parser/017.php
@@ -4,4 +4,4 @@
     'foo' => ['\Some\Class::methodName']
 ];
 
-{+ foo +} inner content {+ /foo +}
+// {+ foo +} inner content {+ /foo +}
diff --git a/user_guide_src/source/outgoing/view_parser/021.php b/user_guide_src/source/outgoing/view_parser/021.php
index cf7b31fa7e30..6dce1f1316e2 100644
--- a/user_guide_src/source/outgoing/view_parser/021.php
+++ b/user_guide_src/source/outgoing/view_parser/021.php
@@ -7,7 +7,7 @@
     ['title' => 'Second Link', 'link' => '/second'],
 ];
 
-foreach ($data1 as $menuItem),{
+foreach ($data1 as $menuItem){
     $temp .= $parser->setData($menuItem)->renderString($template1);
 }
 
diff --git a/user_guide_src/source/testing/benchmark/004.php b/user_guide_src/source/testing/benchmark/004.php
index 112aea9f2e82..bf84bf6ed21f 100644
--- a/user_guide_src/source/testing/benchmark/004.php
+++ b/user_guide_src/source/testing/benchmark/004.php
@@ -9,4 +9,4 @@
         'end'      => 1345678920,
         'duration' => 15.4315, // number of seconds
     ]
-]
+];
diff --git a/user_guide_src/source/testing/controllers/012.php b/user_guide_src/source/testing/controllers/012.php
index dd3b600d90fd..e9425a085488 100644
--- a/user_guide_src/source/testing/controllers/012.php
+++ b/user_guide_src/source/testing/controllers/012.php
@@ -10,4 +10,6 @@ protected function testFilterFailsOnAdminRoute()
 
         $this->assertHasFilters('unfiltered/route', 'before');
     }
-...
+
+    // ...
+}
diff --git a/user_guide_src/source/testing/fabricator/001.php b/user_guide_src/source/testing/fabricator/001.php
index f5f2e33ff455..a4e6456549a6 100644
--- a/user_guide_src/source/testing/fabricator/001.php
+++ b/user_guide_src/source/testing/fabricator/001.php
@@ -1,3 +1,5 @@
 <?php
 
-class MyModel implements CodeIgniter\Test\Interfaces\FabricatorModel
+class MyModel implements CodeIgniter\Test\Interfaces\FabricatorModel {
+    // ...
+}
diff --git a/user_guide_src/source/testing/fabricator/005.php b/user_guide_src/source/testing/fabricator/005.php
index d5dc3ab38932..1bee37a0b99a 100644
--- a/user_guide_src/source/testing/fabricator/005.php
+++ b/user_guide_src/source/testing/fabricator/005.php
@@ -12,3 +12,4 @@ public function fake(Generator &$faker)
             'login'  => config('Auth')->allowRemembering ? date('Y-m-d') : null,
         ];
     }
+}
\ No newline at end of file
diff --git a/user_guide_src/source/testing/fabricator/006.php b/user_guide_src/source/testing/fabricator/006.php
index 587a0697d1fa..cfb130f21ede 100644
--- a/user_guide_src/source/testing/fabricator/006.php
+++ b/user_guide_src/source/testing/fabricator/006.php
@@ -6,3 +6,6 @@ class UserFabricator extends \App\Models\UserModel
 {
     public function fake(&$faker)
     {
+        // ...
+    }
+}
\ No newline at end of file
diff --git a/user_guide_src/source/testing/fabricator/009.php b/user_guide_src/source/testing/fabricator/009.php
index 3a7507430265..9c8d366d8684 100644
--- a/user_guide_src/source/testing/fabricator/009.php
+++ b/user_guide_src/source/testing/fabricator/009.php
@@ -6,4 +6,4 @@
     'phone'  => "201-886-0269 x3767",
     'avatar' => "http://lorempixel.com/800/400/",
     'login'  => null,
-)
+);
diff --git a/user_guide_src/source/testing/fabricator/012.php b/user_guide_src/source/testing/fabricator/012.php
index 782c58f8917f..89731845f145 100644
--- a/user_guide_src/source/testing/fabricator/012.php
+++ b/user_guide_src/source/testing/fabricator/012.php
@@ -9,4 +9,4 @@
     'login'      => null,
     'created_at' => "2020-05-08 14:52:10",
     'updated_at' => "2020-05-08 14:52:10",
-)
+);
diff --git a/user_guide_src/source/testing/fabricator/016.php b/user_guide_src/source/testing/fabricator/016.php
index 72f2b946366e..eb9edc657239 100644
--- a/user_guide_src/source/testing/fabricator/016.php
+++ b/user_guide_src/source/testing/fabricator/016.php
@@ -6,7 +6,7 @@
     'phone'  => "251-806-2169",
     'avatar' => "http://lorempixel.com/800/400/",
     'login'  => null,
-)
+);
 
 array(
     'first'  => "Bobby",
@@ -14,4 +14,4 @@
     'phone'  => "525-214-2656 x23546",
     'avatar' => "http://lorempixel.com/800/400/",
     'login'  => null,
-)
+);
diff --git a/user_guide_src/source/testing/fabricator/018.php b/user_guide_src/source/testing/fabricator/018.php
index 73a3b932052e..60599b602f6e 100644
--- a/user_guide_src/source/testing/fabricator/018.php
+++ b/user_guide_src/source/testing/fabricator/018.php
@@ -6,7 +6,7 @@
     'phone'  => "741-857-1933 x1351",
     'avatar' => "http://lorempixel.com/800/400/",
     'login'  => null,
-)
+);
 
 array(
     'first'  => "Hans",
@@ -14,4 +14,4 @@
     'phone'  => "487-235-7006",
     'avatar' => "http://lorempixel.com/800/400/",
     'login'  => null,
-)
+);
diff --git a/user_guide_src/source/testing/fabricator/021.php b/user_guide_src/source/testing/fabricator/021.php
index a1b0111e0903..df10c0b137d7 100644
--- a/user_guide_src/source/testing/fabricator/021.php
+++ b/user_guide_src/source/testing/fabricator/021.php
@@ -12,3 +12,4 @@ public function fake(Generator &$faker)
             'group_id' => rand(1, Fabricator::getCount('groups')),
         ];
     }
+}
\ No newline at end of file
diff --git a/user_guide_src/source/testing/feature/002.php b/user_guide_src/source/testing/feature/002.php
index c5f67f42b36c..553aaa0bfd03 100644
--- a/user_guide_src/source/testing/feature/002.php
+++ b/user_guide_src/source/testing/feature/002.php
@@ -4,7 +4,7 @@
 $result = $this->call('get', '/');
 
 // Submit a form
-$result = $this->call('post', 'contact'), [
+$result = $this->call('post', 'contact', [
     'name'  => 'Fred Flintstone',
     'email' => 'flintyfred@example.com'
 ]);
diff --git a/user_guide_src/source/testing/overview/006.php b/user_guide_src/source/testing/overview/006.php
index bbd2a333a349..1ab3e692f0eb 100644
--- a/user_guide_src/source/testing/overview/006.php
+++ b/user_guide_src/source/testing/overview/006.php
@@ -10,3 +10,4 @@ protected function purgeRows()
     {
         $this->model->purgeDeleted()
     }
+}
diff --git a/user_guide_src/source/testing/overview/007.php b/user_guide_src/source/testing/overview/007.php
index 74bbb533de38..d6ec1d6c45c5 100644
--- a/user_guide_src/source/testing/overview/007.php
+++ b/user_guide_src/source/testing/overview/007.php
@@ -7,9 +7,13 @@ trait AuthTrait
         $user = $this->createFakeUser();
         $this->logInUser($user);
     }
-...
+    
+    // ...
+}
 
 class AuthenticationFeatureTest
 {
     use AuthTrait;
-...
+
+    // ...
+}
\ No newline at end of file
diff --git a/user_guide_src/source/testing/overview/008.php b/user_guide_src/source/testing/overview/008.php
index 9d84f888c1d4..55077ed36818 100644
--- a/user_guide_src/source/testing/overview/008.php
+++ b/user_guide_src/source/testing/overview/008.php
@@ -3,7 +3,7 @@
 $config = new LoggerConfig();
 $logger = new Logger($config);
 
-... do something that you expect a log entry from
+// ... do something that you expect a log entry from
 $logger->log('error', "That's no moon");
 
 $this->assertLogged('error', "That's no moon");
diff --git a/user_guide_src/source/testing/response/004.php b/user_guide_src/source/testing/response/004.php
index 3cb56ea74b8f..d3ccbf4f4d12 100644
--- a/user_guide_src/source/testing/response/004.php
+++ b/user_guide_src/source/testing/response/004.php
@@ -1,5 +1,5 @@
 <?php
 
 if ($result->isOK()) {
-    ...
+    // ...
 }
diff --git a/user_guide_src/source/testing/response/006.php b/user_guide_src/source/testing/response/006.php
index 90da5662c383..dcca55a4938b 100644
--- a/user_guide_src/source/testing/response/006.php
+++ b/user_guide_src/source/testing/response/006.php
@@ -1,5 +1,5 @@
 <?php
 
 if ($result->isRedirect()) {
-    ...
+    // ...
 }
diff --git a/user_guide_src/source/testing/response/020.php b/user_guide_src/source/testing/response/020.php
index cb490d8a98ff..8b716717b696 100644
--- a/user_guide_src/source/testing/response/020.php
+++ b/user_guide_src/source/testing/response/020.php
@@ -3,6 +3,6 @@
 // Check that an element with class 'notice' exists
 $results->seeElement('.notice');
 // Check that an element with id 'title' exists
-$results->seeElement('#title')
+$results->seeElement('#title');
 // Verify that an element with id 'title' does NOT exist
 $results->dontSeeElement('#title');
diff --git a/user_guide_src/source/testing/response/026.php b/user_guide_src/source/testing/response/026.php
index 773b7dd04833..4afd20161b23 100644
--- a/user_guide_src/source/testing/response/026.php
+++ b/user_guide_src/source/testing/response/026.php
@@ -3,4 +3,4 @@
 // Check that an element with class 'notice' exists
 $results->seeElement('.notice');
 // Check that an element with id 'title' exists
-$results->seeElement('#title')
+$results->seeElement('#title');
diff --git a/user_guide_src/source/testing/response/030.php b/user_guide_src/source/testing/response/030.php
index e6417035e73f..7dfa89e51cc1 100644
--- a/user_guide_src/source/testing/response/030.php
+++ b/user_guide_src/source/testing/response/030.php
@@ -1,11 +1,13 @@
 <?php
 
 // Response body is this:
-['foo' => 'bar']
+['foo' => 'bar'];
 
 $json = $result->getJSON();
 
-// $json is this:
-{
-    "foo": "bar"
-}
+/*
+    $json is this:
+    {
+        "foo": "bar"
+    }
+`*/
diff --git a/user_guide_src/source/testing/response/031.php b/user_guide_src/source/testing/response/031.php
index 0c9ded88a7f5..6e746800e034 100644
--- a/user_guide_src/source/testing/response/031.php
+++ b/user_guide_src/source/testing/response/031.php
@@ -1,4 +1,4 @@
 <?php
 
 // Verify the response is JSON
-$this->assertTrue($result->getJSON() !== false)
+$this->assertTrue($result->getJSON() !== false);
diff --git a/user_guide_src/source/testing/response/032.php b/user_guide_src/source/testing/response/032.php
index e808ca1a43dd..c2d093443b9d 100644
--- a/user_guide_src/source/testing/response/032.php
+++ b/user_guide_src/source/testing/response/032.php
@@ -3,7 +3,7 @@
 // Response body is this:
 [
     'config' => ['key-a', 'key-b'],
-]
+];
 
 // Is true
 $result->assertJSONFragment(['config' => ['key-a']]);

From 32e72c813123a0973e08fda92d3a688e0a2331cf Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 22 Feb 2022 18:54:07 +0900
Subject: [PATCH 1614/2325] docs: fix @param of view cell

---
 system/Common.php    | 2 +-
 system/View/Cell.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/Common.php b/system/Common.php
index 690275c4fedf..257c238d2b42 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -1125,7 +1125,7 @@ function view(string $name, array $data = [], array $options = []): string
      * View cells are used within views to insert HTML chunks that are managed
      * by other classes.
      *
-     * @param null $params
+     * @param array|string|null $params
      *
      * @throws ReflectionException
      */
diff --git a/system/View/Cell.php b/system/View/Cell.php
index 50168a153be6..c4fa23a6fbba 100644
--- a/system/View/Cell.php
+++ b/system/View/Cell.php
@@ -62,7 +62,7 @@ public function __construct(CacheInterface $cache)
     /**
      * Render a cell, returning its body as a string.
      *
-     * @param null $params
+     * @param array|string|null $params
      *
      * @throws ReflectionException
      */
@@ -141,7 +141,7 @@ public function render(string $library, $params = null, int $ttl = 0, ?string $c
      * If a string, it should be in the format "key1=value key2=value".
      * It will be split and returned as an array.
      *
-     * @param mixed $params
+     * @param array|string|null $params
      *
      * @return array|null
      */

From dd80915f52bdca560d60257889a136a7ab38d06a Mon Sep 17 00:00:00 2001
From: Nudasoft <30935025+Nudasoft@users.noreply.github.com>
Date: Tue, 22 Feb 2022 17:34:56 +0530
Subject: [PATCH 1615/2325] Use native $g-red: #DD4814; color for badge
 background.

Use native $g-red: #DD4814; color for badge background instead a custom color.
---
 system/Debug/Toolbar/Views/toolbar.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
index 47e74d9a4f1b..f160dba91f29 100644
--- a/system/Debug/Toolbar/Views/toolbar.css
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -315,7 +315,7 @@
   #debug-bar .ci-label:hover {
     background-color: #DFDFDF; }
   #debug-bar .ci-label .badge {
-    background-color: #DD7359;
+    background-color: #DD4814;
     color: #FFFFFF; }
   #debug-bar .tab {
     background-color: #FFFFFF;
@@ -406,7 +406,7 @@
     #debug-bar .ci-label:hover {
       background-color: #252525; }
     #debug-bar .ci-label .badge {
-      background-color: #DD7359;
+      background-color: #DD4814;
       color: #FFFFFF; }
     #debug-bar .tab {
       background-color: #252525;
@@ -495,7 +495,7 @@
   #toolbarContainer.dark #debug-bar .ci-label:hover {
     background-color: #252525; }
   #toolbarContainer.dark #debug-bar .ci-label .badge {
-    background-color: #DD7359;
+    background-color: #DD4814;
     color: #FFFFFF; }
   #toolbarContainer.dark #debug-bar .tab {
     background-color: #252525;
@@ -588,7 +588,7 @@
   #toolbarContainer.light #debug-bar .ci-label:hover {
     background-color: #DFDFDF; }
   #toolbarContainer.light #debug-bar .ci-label .badge {
-    background-color: #DD7359;
+    background-color: #DD4814;
     color: #FFFFFF; }
   #toolbarContainer.light #debug-bar .tab {
     background-color: #FFFFFF;

From 09b4b8db7047dd3adc31cec1d3c2ce892a9e953e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 22 Feb 2022 21:20:36 +0900
Subject: [PATCH 1616/2325] refactor: remove `&` before $db

$db is an object. We don't need to use reference.
---
 system/Database/BaseBuilder.php       | 2 +-
 system/Database/BasePreparedQuery.php | 2 +-
 system/Database/BaseUtils.php         | 4 ++--
 system/Database/Forge.php             | 2 +-
 system/Database/Query.php             | 2 +-
 system/Database/SQLSRV/Utils.php      | 2 +-
 system/Database/Seeder.php            | 2 +-
 system/Model.php                      | 4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index a3fc6c7563d3..ccfa5bd9d8bb 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -270,7 +270,7 @@ class BaseBuilder
      *
      * @throws DatabaseException
      */
-    public function __construct($tableName, ConnectionInterface &$db, ?array $options = null)
+    public function __construct($tableName, ConnectionInterface $db, ?array $options = null)
     {
         if (empty($tableName)) {
             throw new DatabaseException('A table must be specified when creating a new Query Builder.');
diff --git a/system/Database/BasePreparedQuery.php b/system/Database/BasePreparedQuery.php
index ba36915c79fe..b6e2db706d2a 100644
--- a/system/Database/BasePreparedQuery.php
+++ b/system/Database/BasePreparedQuery.php
@@ -57,7 +57,7 @@ abstract class BasePreparedQuery implements PreparedQueryInterface
 
     public function __construct(BaseConnection $db)
     {
-        $this->db = &$db;
+        $this->db = $db;
     }
 
     /**
diff --git a/system/Database/BaseUtils.php b/system/Database/BaseUtils.php
index 7848ae75ecf0..9ba48c927619 100644
--- a/system/Database/BaseUtils.php
+++ b/system/Database/BaseUtils.php
@@ -49,9 +49,9 @@ abstract class BaseUtils
     /**
      * Class constructor
      */
-    public function __construct(ConnectionInterface &$db)
+    public function __construct(ConnectionInterface $db)
     {
-        $this->db = &$db;
+        $this->db = $db;
     }
 
     /**
diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index 60095ae2496f..e5f8c9aedc68 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -179,7 +179,7 @@ class Forge
      */
     public function __construct(BaseConnection $db)
     {
-        $this->db = &$db;
+        $this->db = $db;
     }
 
     /**
diff --git a/system/Database/Query.php b/system/Database/Query.php
index b9dc4619dd06..702575ca857c 100644
--- a/system/Database/Query.php
+++ b/system/Database/Query.php
@@ -91,7 +91,7 @@ class Query implements QueryInterface
      */
     public $db;
 
-    public function __construct(ConnectionInterface &$db)
+    public function __construct(ConnectionInterface $db)
     {
         $this->db = $db;
     }
diff --git a/system/Database/SQLSRV/Utils.php b/system/Database/SQLSRV/Utils.php
index cf94d3dad783..22a12bcdf02a 100755
--- a/system/Database/SQLSRV/Utils.php
+++ b/system/Database/SQLSRV/Utils.php
@@ -34,7 +34,7 @@ class Utils extends BaseUtils
      */
     protected $optimizeTable = 'ALTER INDEX all ON %s REORGANIZE';
 
-    public function __construct(ConnectionInterface &$db)
+    public function __construct(ConnectionInterface $db)
     {
         parent::__construct($db);
 
diff --git a/system/Database/Seeder.php b/system/Database/Seeder.php
index 94bd0612e393..893de7d56ec4 100644
--- a/system/Database/Seeder.php
+++ b/system/Database/Seeder.php
@@ -92,7 +92,7 @@ public function __construct(Database $config, ?BaseConnection $db = null)
 
         $db ??= Database::connect($this->DBGroup);
 
-        $this->db    = &$db;
+        $this->db    = $db;
         $this->forge = Database::forge($this->DBGroup);
     }
 
diff --git a/system/Model.php b/system/Model.php
index e2f5b0fca891..31447cb00d72 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -100,14 +100,14 @@ class Model extends BaseModel
         'getCompiledUpdate',
     ];
 
-    public function __construct(?ConnectionInterface &$db = null, ?ValidationInterface $validation = null)
+    public function __construct(?ConnectionInterface $db = null, ?ValidationInterface $validation = null)
     {
         /**
          * @var BaseConnection|null $db
          */
         $db ??= Database::connect($this->DBGroup);
 
-        $this->db = &$db;
+        $this->db = $db;
 
         parent::__construct($validation);
     }

From b4fa714feea036b2a596487004ed10e5fc3eb7bf Mon Sep 17 00:00:00 2001
From: Nudasoft <nudasoft@gmail.com>
Date: Tue, 22 Feb 2022 22:00:45 +0530
Subject: [PATCH 1617/2325] Use red background color for badges instead using
 blue. This red background color makes text color pop more and go align with
 the CI4 theme color.

---
 admin/css/debug-toolbar/_theme-dark.scss  | 4 ++--
 admin/css/debug-toolbar/_theme-light.scss | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/css/debug-toolbar/_theme-dark.scss b/admin/css/debug-toolbar/_theme-dark.scss
index 801b75664f22..ead7d02a58e3 100644
--- a/admin/css/debug-toolbar/_theme-dark.scss
+++ b/admin/css/debug-toolbar/_theme-dark.scss
@@ -129,8 +129,8 @@
         }
 
         .badge {
-            background-color: $g-blue;
-            color: $m-gray;
+            background-color: $g-red;
+            color: $t-light;
         }
     }
 
diff --git a/admin/css/debug-toolbar/_theme-light.scss b/admin/css/debug-toolbar/_theme-light.scss
index 41dbb9175fde..4e4295ccd131 100644
--- a/admin/css/debug-toolbar/_theme-light.scss
+++ b/admin/css/debug-toolbar/_theme-light.scss
@@ -125,7 +125,7 @@
         }
 
         .badge {
-            background-color: $g-blue;
+            background-color: $g-red;
             color: $t-light;
         }
     }

From dc43271dbc0eb67db80c531feb7998409e4743a2 Mon Sep 17 00:00:00 2001
From: Nudasoft <nudasoft@gmail.com>
Date: Tue, 22 Feb 2022 22:01:32 +0530
Subject: [PATCH 1618/2325] Fix alignment issues on few buttons.

---
 admin/css/debug-toolbar/toolbar.scss | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/admin/css/debug-toolbar/toolbar.scss b/admin/css/debug-toolbar/toolbar.scss
index c73510182ac7..d9bc347c4b3b 100644
--- a/admin/css/debug-toolbar/toolbar.scss
+++ b/admin/css/debug-toolbar/toolbar.scss
@@ -77,16 +77,9 @@
 
     // General elements
     h1 {
-        bottom: 0;
-        display: inline-block;
-        font-size: $base-size - 2;
+        display: flex;
         font-weight: normal;
-        margin: 0 16px 0 0;
-        padding: 0;
-        position: absolute;
-        right: 30px;
-        text-align: left;
-        top: 0;
+        margin: 0 0 0 auto;
 
         svg {
             width: 16px;
@@ -238,15 +231,8 @@
 
     // The "Open/Close" toggle
     #debug-bar-link {
-        bottom: 0;
-        display: inline-block;
-        font-size: $base-size;
-        line-height: 36px;
+        display: flex;
         padding: 6px;
-        position: absolute;
-        right: 10px;
-        top: 0;
-        width: 24px;
     }
 
     // The toolbar menus

From 0e18a6ca4c07dd4c438de22d12c57cb724152515 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 23 Feb 2022 09:40:33 +0900
Subject: [PATCH 1619/2325] docs: change "previous version" to a specific
 version

---
 user_guide_src/source/libraries/sessions.rst       | 2 +-
 user_guide_src/source/libraries/uploaded_files.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
index ad45f9fea4f3..6c4e71081173 100644
--- a/user_guide_src/source/libraries/sessions.rst
+++ b/user_guide_src/source/libraries/sessions.rst
@@ -69,7 +69,7 @@ Unless you're developing a website with heavy AJAX usage, you can skip this
 section. If you are, however, and if you're experiencing performance
 issues, then this note is exactly what you're looking for.
 
-Sessions in previous versions of CodeIgniter didn't implement locking,
+Sessions in CodeIgniter v2.x didn't implement locking,
 which meant that two HTTP requests using the same session could run exactly
 at the same time. To use a more appropriate technical term - requests were
 non-blocking.
diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index 265eb87dc20a..90a4df446d1a 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -5,7 +5,7 @@ Working with Uploaded Files
 CodeIgniter makes working with files uploaded through a form much simpler and more secure than using PHP's ``$_FILES``
 array directly. This extends the :doc:`File class </libraries/files>` and thus gains all of the features of that class.
 
-.. note:: This is not the same as the File Uploading class in previous versions of CodeIgniter. This provides a raw
+.. note:: This is not the same as the File Uploading class in CodeIgniter v3.x. This provides a raw
     interface to the uploaded files with a few small features.
 
 .. contents::

From 6e1219508ce3bbc544e6e2f272bb375b2289f71e Mon Sep 17 00:00:00 2001
From: Mostafa Khudair <59371810+mostafakhudair@users.noreply.github.com>
Date: Wed, 23 Feb 2022 17:18:45 +0200
Subject: [PATCH 1620/2325] Update Forge.php

---
 system/Database/OCI8/Forge.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/Database/OCI8/Forge.php b/system/Database/OCI8/Forge.php
index d5ca20a9e4d9..9cd5bad945cd 100644
--- a/system/Database/OCI8/Forge.php
+++ b/system/Database/OCI8/Forge.php
@@ -11,10 +11,12 @@
 
 namespace CodeIgniter\Database\OCI8;
 
+use CodeIgniter\Database\Forge as BaseForge;
+
 /**
  * Forge for OCI8
  */
-class Forge extends \CodeIgniter\Database\Forge
+class Forge extends BaseForge
 {
     /**
      * DROP INDEX statement

From 97640c9b107b8213e9b1518f62f5927058a86c28 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 24 Feb 2022 09:11:31 +0900
Subject: [PATCH 1621/2325] fix: forceGlobalSecureRequests break URI schemes
 other than HTTP

---
 system/HTTP/URI.php           |  5 ++++-
 tests/system/HTTP/URITest.php | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index 70305ae5864c..2fe9b430213a 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -586,7 +586,10 @@ public function __toString(): string
         $baseUri = new self($config->baseURL);
 
         // If the hosts matches then assume this should be relative to baseURL
-        if ($this->getHost() === $baseUri->getHost()) {
+        if (
+            substr($this->getScheme(), 0, 4) === 'http'
+            && $this->getHost() === $baseUri->getHost()
+        ) {
             // Check for additional segments
             $basePath = trim($baseUri->getPath(), '/') . '/';
             $trimPath = ltrim($path, '/');
diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php
index 8536fcc7c801..a4faacfbdd80 100644
--- a/tests/system/HTTP/URITest.php
+++ b/tests/system/HTTP/URITest.php
@@ -985,4 +985,20 @@ public function testCreateURIString()
 
         $this->assertSame($expected, $uri);
     }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5728
+     */
+    public function testForceGlobalSecureRequestsAndNonHTTPProtocol()
+    {
+        $config                            = new App();
+        $config->forceGlobalSecureRequests = true;
+        $config->baseURL                   = 'https://localhost/';
+        Factories::injectMock('config', 'App', $config);
+
+        $expected = 'ftp://localhost/path/to/test.txt';
+        $uri      = new URI($expected);
+
+        $this->assertSame($expected, (string) $uri);
+    }
 }

From 7c74eae490a92c7b3827d4a76ac31409919e4dd1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 24 Feb 2022 10:33:31 +0900
Subject: [PATCH 1622/2325] refactor: extract the logic to be deprecated

---
 system/HTTP/URI.php | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/system/HTTP/URI.php b/system/HTTP/URI.php
index 2fe9b430213a..e0a6ff9f2386 100644
--- a/system/HTTP/URI.php
+++ b/system/HTTP/URI.php
@@ -581,11 +581,30 @@ public function __toString(): string
         $path   = $this->getPath();
         $scheme = $this->getScheme();
 
+        // If the hosts matches then assume this should be relative to baseURL
+        [$scheme, $path] = $this->changeSchemeAndPath($scheme, $path);
+
+        return static::createURIString(
+            $scheme,
+            $this->getAuthority(),
+            $path, // Absolute URIs should use a "/" for an empty path
+            $this->getQuery(),
+            $this->getFragment()
+        );
+    }
+
+    /**
+     * Change the path (and scheme) assuming URIs with the same host as baseURL
+     * should be relative to the project's configuration.
+     *
+     * @deprecated This method will be deleted.
+     */
+    private function changeSchemeAndPath(string $scheme, string $path): array
+    {
         // Check if this is an internal URI
         $config  = config('App');
         $baseUri = new self($config->baseURL);
 
-        // If the hosts matches then assume this should be relative to baseURL
         if (
             substr($this->getScheme(), 0, 4) === 'http'
             && $this->getHost() === $baseUri->getHost()
@@ -604,13 +623,7 @@ public function __toString(): string
             }
         }
 
-        return static::createURIString(
-            $scheme,
-            $this->getAuthority(),
-            $path, // Absolute URIs should use a "/" for an empty path
-            $this->getQuery(),
-            $this->getFragment()
-        );
+        return [$scheme, $path];
     }
 
     /**

From f8e7c78cea6a73e2c6a91e32df8a389f2525d9ab Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Thu, 24 Feb 2022 10:57:24 +0800
Subject: [PATCH 1623/2325] Add workflow to test SCSS compilation

---
 .github/workflows/test-scss.yml | 51 +++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 .github/workflows/test-scss.yml

diff --git a/.github/workflows/test-scss.yml b/.github/workflows/test-scss.yml
new file mode 100644
index 000000000000..b7f66a17f29b
--- /dev/null
+++ b/.github/workflows/test-scss.yml
@@ -0,0 +1,51 @@
+name: SCSS Compilation
+
+on:
+  pull_request:
+    branches:
+      - 'develop'
+      - 'v4.x'
+    paths:
+      - '**.scss'
+      - '**.css'
+      - '.github/workflows/test-scss.yml'
+
+  push:
+    branches:
+      - 'develop'
+      - 'v4.x'
+    paths:
+      - '**.scss'
+      - '**.css'
+      - '.github/workflows/test-scss.yml'
+
+jobs:
+  build:
+    name: Compilation of SCSS (Dart Sass)
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup Node
+        uses: actions/setup-node@v2
+        with:
+          # node version based on dart-sass test workflow
+          node-version: 16
+
+      - name: Install Dart Sass
+        run: |
+          npm install --global sass
+          sass --version
+
+      - name: Run Dart Sass
+        run: sass --no-source-map admin/css/debug-toolbar/toolbar.scss system/Debug/Toolbar/Views/toolbar.css
+
+      - name: Check for changed CSS files
+        run: |
+          if [[ -n "$(git status --porcelain 2>/dev/null)" ]]; then
+            echo "Your changes to the SCSS files did not match the expected CSS output."
+            git diff-files --patch
+            exit 1
+          fi

From ea9ffb0f284b5e37acaa7e9b481aedf57d20d67f Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Thu, 24 Feb 2022 10:59:22 +0800
Subject: [PATCH 1624/2325] Update contribution guide

---
 contributing/css.md | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/contributing/css.md b/contributing/css.md
index 3108319a0e1b..7accf5e83801 100644
--- a/contributing/css.md
+++ b/contributing/css.md
@@ -1,6 +1,6 @@
-# Contribution CSS
+# Contribution to Debug Toolbar CSS
 
-CodeIgniter uses SASS to generate the debug toolbar's CSS. Therefore,
+CodeIgniter uses Dart Sass to generate the debug toolbar's CSS. Therefore,
 you will need to install it first. You can find further instructions on
 the official website: <https://sass-lang.com/install>
 
@@ -9,34 +9,32 @@ the official website: <https://sass-lang.com/install>
 Open your terminal, and navigate to CodeIgniter's root folder. To
 generate the CSS file, use the following command:
 
-`sass --no-cache --sourcemap=none admin/css/debug-toolbar/toolbar.scss system/Debug/Toolbar/Views/toolbar.css`
+`sass --no-source-map admin/css/debug-toolbar/toolbar.scss system/Debug/Toolbar/Views/toolbar.css`
 
-Details: 
-- `--no-cache` is a parameter defined to disable SASS cache,
-this prevents a "cache" folder from being created 
-- `--sourcemap=none` is a parameter which prevents soucemap files from being generated 
-- `admin/css/debug-toolbar/toolbar.scss` is the SASS source 
+Details:
+- `--no-source-map` is an option which prevents sourcemap files from being generated
+- `admin/css/debug-toolbar/toolbar.scss` is the SASS source
 - `system/Debug/Toolbar/Views/toolbar.css` is he CSS destination
 
 ## Color scheme
 
 **Themes**
 
-Dark: `#252525` / `rgb(37, 37, 37)`  
-Light: `#FFFFFF` / `rgb(255, 255, 255)`  
+Dark: `#252525` / `rgb(37, 37, 37)`
+Light: `#FFFFFF` / `rgb(255, 255, 255)`
 
 **Glossy colors**
 
-Blue: `#5BC0DE` / `rgb(91, 192, 222)`  
-Gray: `#434343` / `rgb(67, 67, 67)`  
-Green: `#9ACE25` / `rgb(154, 206, 37)`  
-Orange: `#DD8615` / `rgb(221, 134, 21)`  
-Red: `#DD4814` / `rgb(221, 72, 20)`  
+Blue: `#5BC0DE` / `rgb(91, 192, 222)`
+Gray: `#434343` / `rgb(67, 67, 67)`
+Green: `#9ACE25` / `rgb(154, 206, 37)`
+Orange: `#DD8615` / `rgb(221, 134, 21)`
+Red: `#DD4814` / `rgb(221, 72, 20)`
 
 **Matt colors**
 
-Blue: `#D8EAF0` / `rgb(216, 234, 240)`  
-Gray: `#DFDFDF` / `rgb(223, 223, 223)`  
-Green: `#DFF0D8` / `rgb(223, 240, 216)`  
-Orange: `#FDC894` / `rgb(253, 200, 148)`  
-Red: `#EF9090` / `rgb(239, 144, 144)`  
+Blue: `#D8EAF0` / `rgb(216, 234, 240)`
+Gray: `#DFDFDF` / `rgb(223, 223, 223)`
+Green: `#DFF0D8` / `rgb(223, 240, 216)`
+Orange: `#FDC894` / `rgb(253, 200, 148)`
+Red: `#EF9090` / `rgb(239, 144, 144)`

From 8721abd5728c8b4ab0cdf7b3825773240573654f Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Thu, 24 Feb 2022 10:59:45 +0800
Subject: [PATCH 1625/2325] Fix formatting

---
 system/Debug/Toolbar/Views/toolbar.css | 1211 ++++++++++++++----------
 1 file changed, 687 insertions(+), 524 deletions(-)

diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
index f160dba91f29..8fb9c15737c5 100644
--- a/system/Debug/Toolbar/Views/toolbar.css
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -16,16 +16,20 @@
   margin: 0px;
   padding: 0px;
   clear: both;
-  text-align: center; }
-  #debug-icon a svg {
-    margin: 8px;
-    max-width: 20px;
-    max-height: 20px; }
-  #debug-icon.fixed-top {
-    bottom: auto;
-    top: 0; }
-  #debug-icon .debug-bar-ndisplay {
-    display: none; }
+  text-align: center;
+}
+#debug-icon a svg {
+  margin: 8px;
+  max-width: 20px;
+  max-height: 20px;
+}
+#debug-icon.fixed-top {
+  bottom: auto;
+  top: 0;
+}
+#debug-icon .debug-bar-ndisplay {
+  display: none;
+}
 
 #debug-bar {
   bottom: 0;
@@ -37,199 +41,250 @@
   line-height: 36px;
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
   font-size: 16px;
-  font-weight: 400; }
-  #debug-bar h1 {
-    display: flex;
-    font-weight: normal;
-    margin: 0 0 0 auto; }
-    #debug-bar h1 svg {
-      width: 16px;
-      margin-right: 5px; }
-  #debug-bar h2 {
-    font-size: 16px;
-    margin: 0;
-    padding: 5px 0 10px 0; }
-    #debug-bar h2 span {
-      font-size: 13px; }
-  #debug-bar h3 {
-    font-size: 12px;
-    font-weight: 200;
-    margin: 0 0 0 10px;
-    padding: 0;
-    text-transform: uppercase; }
-  #debug-bar p {
-    font-size: 12px;
-    margin: 0 0 0 15px;
-    padding: 0; }
-  #debug-bar a {
-    text-decoration: none; }
-    #debug-bar a:hover {
-      text-decoration: underline; }
-  #debug-bar button {
-    border: 1px solid;
-    border-radius: 4px;
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    cursor: pointer;
-    line-height: 15px; }
-    #debug-bar button:hover {
-      text-decoration: underline; }
-  #debug-bar table {
-    border-collapse: collapse;
-    font-size: 14px;
-    line-height: normal;
-    margin: 5px 10px 15px 10px;
-    width: calc(100% - 10px); }
-    #debug-bar table strong {
-      font-weight: 500; }
-    #debug-bar table th {
-      display: table-cell;
-      font-weight: 600;
-      padding-bottom: 0.7em;
-      text-align: left; }
-    #debug-bar table tr {
-      border: none; }
-    #debug-bar table td {
-      border: none;
-      display: table-cell;
-      margin: 0;
-      text-align: left; }
-      #debug-bar table td:first-child {
-        max-width: 20%; }
-        #debug-bar table td:first-child.narrow {
-          width: 7em; }
-  #debug-bar td[data-debugbar-route] form {
-    display: none; }
-  #debug-bar td[data-debugbar-route]:hover form {
-    display: block; }
-  #debug-bar td[data-debugbar-route]:hover > div {
-    display: none; }
-  #debug-bar td[data-debugbar-route] input[type=text] {
-    padding: 2px; }
-  #debug-bar .toolbar {
-    display: flex;
-    overflow: hidden;
-    overflow-y: auto;
-    padding: 0 12px 0 12px;
-    white-space: nowrap;
-    z-index: 10000; }
-  #debug-bar.fixed-top {
-    bottom: auto;
-    top: 0; }
-    #debug-bar.fixed-top .tab {
-      bottom: auto;
-      top: 36px; }
-  #debug-bar #toolbar-position a,
-  #debug-bar #toolbar-theme a {
-    padding: 0 6px;
-    display: inline-flex;
-    vertical-align: top; }
-    #debug-bar #toolbar-position a:hover,
-    #debug-bar #toolbar-theme a:hover {
-      text-decoration: none; }
-  #debug-bar #debug-bar-link {
-    padding: 6px;
-    display: flex; }
-  #debug-bar .ci-label {
-    display: inline-flex;
-    font-size: 14px; }
-    #debug-bar .ci-label:hover {
-      cursor: pointer; }
-    #debug-bar .ci-label a {
-      color: inherit;
-      display: flex;
-      letter-spacing: normal;
-      padding: 0 10px;
-      text-decoration: none;
-      align-items: center; }
-    #debug-bar .ci-label img {
-      margin: 6px 3px 6px 0;
-      width: 16px !important; }
-    #debug-bar .ci-label .badge {
-      border-radius: 12px;
-      -moz-border-radius: 12px;
-      -webkit-border-radius: 12px;
-      display: inline-block;
-      font-size: 75%;
-      font-weight: bold;
-      line-height: 12px;
-      margin-left: 5px;
-      padding: 2px 5px;
-      text-align: center;
-      vertical-align: baseline;
-      white-space: nowrap; }
-  #debug-bar .tab {
-    bottom: 35px;
-    display: none;
-    left: 0;
-    max-height: 62%;
-    overflow: hidden;
-    overflow-y: auto;
-    padding: 1em 2em;
-    position: fixed;
-    right: 0;
-    z-index: 9999; }
-  #debug-bar .timeline {
-    margin-left: 0;
-    width: 100%; }
-    #debug-bar .timeline th {
-      border-left: 1px solid;
-      font-size: 12px;
-      font-weight: 200;
-      padding: 5px 5px 10px 5px;
-      position: relative;
-      text-align: left; }
-      #debug-bar .timeline th:first-child {
-        border-left: 0; }
-    #debug-bar .timeline td {
-      border-left: 1px solid;
-      padding: 5px;
-      position: relative; }
-      #debug-bar .timeline td:first-child {
-        border-left: 0;
-        max-width: none; }
-      #debug-bar .timeline td.child-container {
-        padding: 0px; }
-        #debug-bar .timeline td.child-container .timeline {
-          margin: 0px; }
-          #debug-bar .timeline td.child-container .timeline td:first-child:not(.child-container) {
-            padding-left: calc(5px + 10px * var(--level)); }
-    #debug-bar .timeline .timer {
-      border-radius: 4px;
-      -moz-border-radius: 4px;
-      -webkit-border-radius: 4px;
-      display: inline-block;
-      padding: 5px;
-      position: absolute;
-      top: 30%; }
-    #debug-bar .timeline .timeline-parent {
-      cursor: pointer; }
-      #debug-bar .timeline .timeline-parent td:first-child nav {
-        background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxwYXRoIGQ9Ik02IDdoMThsLTkgMTV6bTAgMzBoMThsLTkgMTV6bTAgNDVoMThsLTktMTV6bTAgMzBoMThsLTktMTV6bTAgMTJsMTggMThtLTE4IDBsMTgtMTgiIGZpbGw9IiM1NTUiLz48cGF0aCBkPSJNNiAxMjZsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSIjNTU1Ii8+PC9zdmc+") no-repeat scroll 0 0/15px 75px transparent;
-        background-position: 0 25%;
-        display: inline-block;
-        height: 15px;
-        width: 15px;
-        margin-right: 3px;
-        vertical-align: middle; }
-    #debug-bar .timeline .timeline-parent-open {
-      background-color: #DFDFDF; }
-      #debug-bar .timeline .timeline-parent-open td:first-child nav {
-        background-position: 0 75%; }
-    #debug-bar .timeline .child-row:hover {
-      background: transparent; }
-  #debug-bar .route-params,
-  #debug-bar .route-params-item {
-    vertical-align: top; }
-    #debug-bar .route-params td:first-child,
-    #debug-bar .route-params-item td:first-child {
-      font-style: italic;
-      padding-left: 1em;
-      text-align: right; }
+  font-weight: 400;
+}
+#debug-bar h1 {
+  display: flex;
+  font-weight: normal;
+  margin: 0 0 0 auto;
+}
+#debug-bar h1 svg {
+  width: 16px;
+  margin-right: 5px;
+}
+#debug-bar h2 {
+  font-size: 16px;
+  margin: 0;
+  padding: 5px 0 10px 0;
+}
+#debug-bar h2 span {
+  font-size: 13px;
+}
+#debug-bar h3 {
+  font-size: 12px;
+  font-weight: 200;
+  margin: 0 0 0 10px;
+  padding: 0;
+  text-transform: uppercase;
+}
+#debug-bar p {
+  font-size: 12px;
+  margin: 0 0 0 15px;
+  padding: 0;
+}
+#debug-bar a {
+  text-decoration: none;
+}
+#debug-bar a:hover {
+  text-decoration: underline;
+}
+#debug-bar button {
+  border: 1px solid;
+  border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  cursor: pointer;
+  line-height: 15px;
+}
+#debug-bar button:hover {
+  text-decoration: underline;
+}
+#debug-bar table {
+  border-collapse: collapse;
+  font-size: 14px;
+  line-height: normal;
+  margin: 5px 10px 15px 10px;
+  width: calc(100% - 10px);
+}
+#debug-bar table strong {
+  font-weight: 500;
+}
+#debug-bar table th {
+  display: table-cell;
+  font-weight: 600;
+  padding-bottom: 0.7em;
+  text-align: left;
+}
+#debug-bar table tr {
+  border: none;
+}
+#debug-bar table td {
+  border: none;
+  display: table-cell;
+  margin: 0;
+  text-align: left;
+}
+#debug-bar table td:first-child {
+  max-width: 20%;
+}
+#debug-bar table td:first-child.narrow {
+  width: 7em;
+}
+#debug-bar td[data-debugbar-route] form {
+  display: none;
+}
+#debug-bar td[data-debugbar-route]:hover form {
+  display: block;
+}
+#debug-bar td[data-debugbar-route]:hover > div {
+  display: none;
+}
+#debug-bar td[data-debugbar-route] input[type=text] {
+  padding: 2px;
+}
+#debug-bar .toolbar {
+  display: flex;
+  overflow: hidden;
+  overflow-y: auto;
+  padding: 0 12px 0 12px;
+  white-space: nowrap;
+  z-index: 10000;
+}
+#debug-bar.fixed-top {
+  bottom: auto;
+  top: 0;
+}
+#debug-bar.fixed-top .tab {
+  bottom: auto;
+  top: 36px;
+}
+#debug-bar #toolbar-position a,
+#debug-bar #toolbar-theme a {
+  padding: 0 6px;
+  display: inline-flex;
+  vertical-align: top;
+}
+#debug-bar #toolbar-position a:hover,
+#debug-bar #toolbar-theme a:hover {
+  text-decoration: none;
+}
+#debug-bar #debug-bar-link {
+  display: flex;
+  padding: 6px;
+}
+#debug-bar .ci-label {
+  display: inline-flex;
+  font-size: 14px;
+}
+#debug-bar .ci-label:hover {
+  cursor: pointer;
+}
+#debug-bar .ci-label a {
+  color: inherit;
+  display: flex;
+  letter-spacing: normal;
+  padding: 0 10px;
+  text-decoration: none;
+  align-items: center;
+}
+#debug-bar .ci-label img {
+  margin: 6px 3px 6px 0;
+  width: 16px !important;
+}
+#debug-bar .ci-label .badge {
+  border-radius: 12px;
+  -moz-border-radius: 12px;
+  -webkit-border-radius: 12px;
+  display: inline-block;
+  font-size: 75%;
+  font-weight: bold;
+  line-height: 12px;
+  margin-left: 5px;
+  padding: 2px 5px;
+  text-align: center;
+  vertical-align: baseline;
+  white-space: nowrap;
+}
+#debug-bar .tab {
+  bottom: 35px;
+  display: none;
+  left: 0;
+  max-height: 62%;
+  overflow: hidden;
+  overflow-y: auto;
+  padding: 1em 2em;
+  position: fixed;
+  right: 0;
+  z-index: 9999;
+}
+#debug-bar .timeline {
+  margin-left: 0;
+  width: 100%;
+}
+#debug-bar .timeline th {
+  border-left: 1px solid;
+  font-size: 12px;
+  font-weight: 200;
+  padding: 5px 5px 10px 5px;
+  position: relative;
+  text-align: left;
+}
+#debug-bar .timeline th:first-child {
+  border-left: 0;
+}
+#debug-bar .timeline td {
+  border-left: 1px solid;
+  padding: 5px;
+  position: relative;
+}
+#debug-bar .timeline td:first-child {
+  border-left: 0;
+  max-width: none;
+}
+#debug-bar .timeline td.child-container {
+  padding: 0px;
+}
+#debug-bar .timeline td.child-container .timeline {
+  margin: 0px;
+}
+#debug-bar .timeline td.child-container .timeline td:first-child:not(.child-container) {
+  padding-left: calc(5px + 10px * var(--level));
+}
+#debug-bar .timeline .timer {
+  border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  display: inline-block;
+  padding: 5px;
+  position: absolute;
+  top: 30%;
+}
+#debug-bar .timeline .timeline-parent {
+  cursor: pointer;
+}
+#debug-bar .timeline .timeline-parent td:first-child nav {
+  background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxwYXRoIGQ9Ik02IDdoMThsLTkgMTV6bTAgMzBoMThsLTkgMTV6bTAgNDVoMThsLTktMTV6bTAgMzBoMThsLTktMTV6bTAgMTJsMTggMThtLTE4IDBsMTgtMTgiIGZpbGw9IiM1NTUiLz48cGF0aCBkPSJNNiAxMjZsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSIjNTU1Ii8+PC9zdmc+") no-repeat scroll 0 0/15px 75px transparent;
+  background-position: 0 25%;
+  display: inline-block;
+  height: 15px;
+  width: 15px;
+  margin-right: 3px;
+  vertical-align: middle;
+}
+#debug-bar .timeline .timeline-parent-open {
+  background-color: #DFDFDF;
+}
+#debug-bar .timeline .timeline-parent-open td:first-child nav {
+  background-position: 0 75%;
+}
+#debug-bar .timeline .child-row:hover {
+  background: transparent;
+}
+#debug-bar .route-params,
+#debug-bar .route-params-item {
+  vertical-align: top;
+}
+#debug-bar .route-params td:first-child,
+#debug-bar .route-params-item td:first-child {
+  font-style: italic;
+  padding-left: 1em;
+  text-align: right;
+}
 
 .debug-view.show-view {
   border: 1px solid;
-  margin: 4px; }
+  margin: 4px;
+}
 
 .debug-view-path {
   font-family: monospace;
@@ -237,403 +292,511 @@
   letter-spacing: normal;
   min-height: 16px;
   padding: 2px;
-  text-align: left; }
+  text-align: left;
+}
 
 .show-view .debug-view-path {
-  display: block !important; }
+  display: block !important;
+}
 
 @media screen and (max-width: 1024px) {
   #debug-bar .ci-label img {
-    margin: unset; }
-  .hide-sm {
-    display: none !important; } }
+    margin: unset;
+  }
 
+  .hide-sm {
+    display: none !important;
+  }
+}
 #debug-icon {
   background-color: #FFFFFF;
   box-shadow: 0 0 4px #DFDFDF;
   -moz-box-shadow: 0 0 4px #DFDFDF;
-  -webkit-box-shadow: 0 0 4px #DFDFDF; }
-  #debug-icon a:active,
-  #debug-icon a:link,
-  #debug-icon a:visited {
-    color: #DD8615; }
+  -webkit-box-shadow: 0 0 4px #DFDFDF;
+}
+#debug-icon a:active,
+#debug-icon a:link,
+#debug-icon a:visited {
+  color: #DD8615;
+}
 
 #debug-bar {
   background-color: #FFFFFF;
-  color: #434343; }
+  color: #434343;
+}
+#debug-bar h1,
+#debug-bar h2,
+#debug-bar h3,
+#debug-bar p,
+#debug-bar a,
+#debug-bar button,
+#debug-bar table,
+#debug-bar thead,
+#debug-bar tr,
+#debug-bar td,
+#debug-bar button,
+#debug-bar .toolbar {
+  background-color: transparent;
+  color: #434343;
+}
+#debug-bar button {
+  background-color: #FFFFFF;
+}
+#debug-bar table strong {
+  color: #DD8615;
+}
+#debug-bar table tbody tr:hover {
+  background-color: #DFDFDF;
+}
+#debug-bar table tbody tr.current {
+  background-color: #FDC894;
+}
+#debug-bar table tbody tr.current:hover td {
+  background-color: #DD4814;
+  color: #FFFFFF;
+}
+#debug-bar .toolbar {
+  background-color: #FFFFFF;
+  box-shadow: 0 0 4px #DFDFDF;
+  -moz-box-shadow: 0 0 4px #DFDFDF;
+  -webkit-box-shadow: 0 0 4px #DFDFDF;
+}
+#debug-bar .toolbar img {
+  filter: brightness(0) invert(0.4);
+}
+#debug-bar.fixed-top .toolbar {
+  box-shadow: 0 0 4px #DFDFDF;
+  -moz-box-shadow: 0 0 4px #DFDFDF;
+  -webkit-box-shadow: 0 0 4px #DFDFDF;
+}
+#debug-bar.fixed-top .tab {
+  box-shadow: 0 1px 4px #DFDFDF;
+  -moz-box-shadow: 0 1px 4px #DFDFDF;
+  -webkit-box-shadow: 0 1px 4px #DFDFDF;
+}
+#debug-bar .muted {
+  color: #434343;
+}
+#debug-bar .muted td {
+  color: #DFDFDF;
+}
+#debug-bar .muted:hover td {
+  color: #434343;
+}
+#debug-bar #toolbar-position,
+#debug-bar #toolbar-theme {
+  filter: brightness(0) invert(0.6);
+}
+#debug-bar .ci-label.active {
+  background-color: #DFDFDF;
+}
+#debug-bar .ci-label:hover {
+  background-color: #DFDFDF;
+}
+#debug-bar .ci-label .badge {
+  background-color: #DD4814;
+  color: #FFFFFF;
+}
+#debug-bar .tab {
+  background-color: #FFFFFF;
+  box-shadow: 0 -1px 4px #DFDFDF;
+  -moz-box-shadow: 0 -1px 4px #DFDFDF;
+  -webkit-box-shadow: 0 -1px 4px #DFDFDF;
+}
+#debug-bar .timeline th,
+#debug-bar .timeline td {
+  border-color: #DFDFDF;
+}
+#debug-bar .timeline .timer {
+  background-color: #DD8615;
+}
+
+.debug-view.show-view {
+  border-color: #DD8615;
+}
+
+.debug-view-path {
+  background-color: #FDC894;
+  color: #434343;
+}
+
+@media (prefers-color-scheme: dark) {
+  #debug-icon {
+    background-color: #252525;
+    box-shadow: 0 0 4px #DFDFDF;
+    -moz-box-shadow: 0 0 4px #DFDFDF;
+    -webkit-box-shadow: 0 0 4px #DFDFDF;
+  }
+  #debug-icon a:active,
+#debug-icon a:link,
+#debug-icon a:visited {
+    color: #DD8615;
+  }
+
+  #debug-bar {
+    background-color: #252525;
+    color: #DFDFDF;
+  }
   #debug-bar h1,
-  #debug-bar h2,
-  #debug-bar h3,
-  #debug-bar p,
-  #debug-bar a,
-  #debug-bar button,
-  #debug-bar table,
-  #debug-bar thead,
-  #debug-bar tr,
-  #debug-bar td,
-  #debug-bar button,
-  #debug-bar .toolbar {
+#debug-bar h2,
+#debug-bar h3,
+#debug-bar p,
+#debug-bar a,
+#debug-bar button,
+#debug-bar table,
+#debug-bar thead,
+#debug-bar tr,
+#debug-bar td,
+#debug-bar button,
+#debug-bar .toolbar {
     background-color: transparent;
-    color: #434343; }
+    color: #DFDFDF;
+  }
   #debug-bar button {
-    background-color: #FFFFFF; }
+    background-color: #252525;
+  }
   #debug-bar table strong {
-    color: #DD8615; }
+    color: #DD8615;
+  }
   #debug-bar table tbody tr:hover {
-    background-color: #DFDFDF; }
+    background-color: #434343;
+  }
   #debug-bar table tbody tr.current {
-    background-color: #FDC894; }
-    #debug-bar table tbody tr.current:hover td {
-      background-color: #DD4814;
-      color: #FFFFFF; }
+    background-color: #FDC894;
+  }
+  #debug-bar table tbody tr.current td {
+    color: #252525;
+  }
+  #debug-bar table tbody tr.current:hover td {
+    background-color: #DD4814;
+    color: #FFFFFF;
+  }
   #debug-bar .toolbar {
-    background-color: #FFFFFF;
-    box-shadow: 0 0 4px #DFDFDF;
-    -moz-box-shadow: 0 0 4px #DFDFDF;
-    -webkit-box-shadow: 0 0 4px #DFDFDF; }
-    #debug-bar .toolbar img {
-      filter: brightness(0) invert(0.4); }
+    background-color: #434343;
+    box-shadow: 0 0 4px #434343;
+    -moz-box-shadow: 0 0 4px #434343;
+    -webkit-box-shadow: 0 0 4px #434343;
+  }
+  #debug-bar .toolbar img {
+    filter: brightness(0) invert(1);
+  }
   #debug-bar.fixed-top .toolbar {
-    box-shadow: 0 0 4px #DFDFDF;
-    -moz-box-shadow: 0 0 4px #DFDFDF;
-    -webkit-box-shadow: 0 0 4px #DFDFDF; }
+    box-shadow: 0 0 4px #434343;
+    -moz-box-shadow: 0 0 4px #434343;
+    -webkit-box-shadow: 0 0 4px #434343;
+  }
   #debug-bar.fixed-top .tab {
-    box-shadow: 0 1px 4px #DFDFDF;
-    -moz-box-shadow: 0 1px 4px #DFDFDF;
-    -webkit-box-shadow: 0 1px 4px #DFDFDF; }
+    box-shadow: 0 1px 4px #434343;
+    -moz-box-shadow: 0 1px 4px #434343;
+    -webkit-box-shadow: 0 1px 4px #434343;
+  }
   #debug-bar .muted {
-    color: #434343; }
-    #debug-bar .muted td {
-      color: #DFDFDF; }
-    #debug-bar .muted:hover td {
-      color: #434343; }
+    color: #DFDFDF;
+  }
+  #debug-bar .muted td {
+    color: #434343;
+  }
+  #debug-bar .muted:hover td {
+    color: #DFDFDF;
+  }
   #debug-bar #toolbar-position,
-  #debug-bar #toolbar-theme {
-    filter: brightness(0) invert(0.6); }
+#debug-bar #toolbar-theme {
+    filter: brightness(0) invert(0.6);
+  }
   #debug-bar .ci-label.active {
-    background-color: #DFDFDF; }
+    background-color: #252525;
+  }
   #debug-bar .ci-label:hover {
-    background-color: #DFDFDF; }
+    background-color: #252525;
+  }
   #debug-bar .ci-label .badge {
     background-color: #DD4814;
-    color: #FFFFFF; }
+    color: #FFFFFF;
+  }
   #debug-bar .tab {
-    background-color: #FFFFFF;
-    box-shadow: 0 -1px 4px #DFDFDF;
-    -moz-box-shadow: 0 -1px 4px #DFDFDF;
-    -webkit-box-shadow: 0 -1px 4px #DFDFDF; }
+    background-color: #252525;
+    box-shadow: 0 -1px 4px #434343;
+    -moz-box-shadow: 0 -1px 4px #434343;
+    -webkit-box-shadow: 0 -1px 4px #434343;
+  }
   #debug-bar .timeline th,
-  #debug-bar .timeline td {
-    border-color: #DFDFDF; }
+#debug-bar .timeline td {
+    border-color: #434343;
+  }
   #debug-bar .timeline .timer {
-    background-color: #DD8615; }
-
-.debug-view.show-view {
-  border-color: #DD8615; }
-#debug-bar tr[data-toggle] {
-  cursor: pointer; }
+    background-color: #DD8615;
+  }
 
-.debug-view-path {
-  background-color: #FDC894;
-  color: #434343; }
-
-@media (prefers-color-scheme: dark) {
-  #debug-icon {
-    background-color: #252525;
-    box-shadow: 0 0 4px #DFDFDF;
-    -moz-box-shadow: 0 0 4px #DFDFDF;
-    -webkit-box-shadow: 0 0 4px #DFDFDF; }
-    #debug-icon a:active,
-    #debug-icon a:link,
-    #debug-icon a:visited {
-      color: #DD8615; }
-  #debug-bar {
-    background-color: #252525;
-    color: #DFDFDF; }
-    #debug-bar h1,
-    #debug-bar h2,
-    #debug-bar h3,
-    #debug-bar p,
-    #debug-bar a,
-    #debug-bar button,
-    #debug-bar table,
-    #debug-bar thead,
-    #debug-bar tr,
-    #debug-bar td,
-    #debug-bar button,
-    #debug-bar .toolbar {
-      background-color: transparent;
-      color: #DFDFDF; }
-    #debug-bar button {
-      background-color: #252525; }
-    #debug-bar table strong {
-      color: #DD8615; }
-    #debug-bar table tbody tr:hover {
-      background-color: #434343; }
-    #debug-bar table tbody tr.current {
-      background-color: #FDC894; }
-      #debug-bar table tbody tr.current td {
-        color: #252525; }
-      #debug-bar table tbody tr.current:hover td {
-        background-color: #DD4814;
-        color: #FFFFFF; }
-    #debug-bar .toolbar {
-      background-color: #434343;
-      box-shadow: 0 0 4px #434343;
-      -moz-box-shadow: 0 0 4px #434343;
-      -webkit-box-shadow: 0 0 4px #434343; }
-      #debug-bar .toolbar img {
-        filter: brightness(0) invert(1); }
-    #debug-bar.fixed-top .toolbar {
-      box-shadow: 0 0 4px #434343;
-      -moz-box-shadow: 0 0 4px #434343;
-      -webkit-box-shadow: 0 0 4px #434343; }
-    #debug-bar.fixed-top .tab {
-      box-shadow: 0 1px 4px #434343;
-      -moz-box-shadow: 0 1px 4px #434343;
-      -webkit-box-shadow: 0 1px 4px #434343; }
-    #debug-bar .muted {
-      color: #DFDFDF; }
-      #debug-bar .muted td {
-        color: #797979; }
-      #debug-bar .muted:hover td {
-        color: #DFDFDF; }
-    #debug-bar #toolbar-position,
-    #debug-bar #toolbar-theme {
-      filter: brightness(0) invert(0.6); }
-    #debug-bar .ci-label.active {
-      background-color: #252525; }
-    #debug-bar .ci-label:hover {
-      background-color: #252525; }
-    #debug-bar .ci-label .badge {
-      background-color: #DD4814;
-      color: #FFFFFF; }
-    #debug-bar .tab {
-      background-color: #252525;
-      box-shadow: 0 -1px 4px #434343;
-      -moz-box-shadow: 0 -1px 4px #434343;
-      -webkit-box-shadow: 0 -1px 4px #434343; }
-    #debug-bar .timeline th,
-    #debug-bar .timeline td {
-      border-color: #434343; }
-    #debug-bar .timeline .timer {
-      background-color: #DD8615; }
   .debug-view.show-view {
-    border-color: #DD8615; }
+    border-color: #DD8615;
+  }
+
   .debug-view-path {
     background-color: #FDC894;
-    color: #434343; } }
-
+    color: #434343;
+  }
+}
 #toolbarContainer.dark #debug-icon {
   background-color: #252525;
   box-shadow: 0 0 4px #DFDFDF;
   -moz-box-shadow: 0 0 4px #DFDFDF;
-  -webkit-box-shadow: 0 0 4px #DFDFDF; }
-  #toolbarContainer.dark #debug-icon a:active,
-  #toolbarContainer.dark #debug-icon a:link,
-  #toolbarContainer.dark #debug-icon a:visited {
-    color: #DD8615; }
-
+  -webkit-box-shadow: 0 0 4px #DFDFDF;
+}
+#toolbarContainer.dark #debug-icon a:active,
+#toolbarContainer.dark #debug-icon a:link,
+#toolbarContainer.dark #debug-icon a:visited {
+  color: #DD8615;
+}
 #toolbarContainer.dark #debug-bar {
   background-color: #252525;
-  color: #DFDFDF; }
-  #toolbarContainer.dark #debug-bar h1,
-  #toolbarContainer.dark #debug-bar h2,
-  #toolbarContainer.dark #debug-bar h3,
-  #toolbarContainer.dark #debug-bar p,
-  #toolbarContainer.dark #debug-bar a,
-  #toolbarContainer.dark #debug-bar button,
-  #toolbarContainer.dark #debug-bar table,
-  #toolbarContainer.dark #debug-bar thead,
-  #toolbarContainer.dark #debug-bar tr,
-  #toolbarContainer.dark #debug-bar td,
-  #toolbarContainer.dark #debug-bar button,
-  #toolbarContainer.dark #debug-bar .toolbar {
-    background-color: transparent;
-    color: #DFDFDF; }
-  #toolbarContainer.dark #debug-bar button {
-    background-color: #252525; }
-  #toolbarContainer.dark #debug-bar table strong {
-    color: #DD8615; }
-  #toolbarContainer.dark #debug-bar table tbody tr:hover {
-    background-color: #434343; }
-  #toolbarContainer.dark #debug-bar table tbody tr.current {
-    background-color: #FDC894; }
-  #toolbarContainer.dark #ci-database table tbody tr.duplicate {
-    background-color: #434343;}
-    #toolbarContainer.dark #debug-bar table tbody tr.current td {
-      color: #252525; }
-    #toolbarContainer.dark #debug-bar table tbody tr.current:hover td {
-      background-color: #DD4814;
-      color: #FFFFFF; }
-  #toolbarContainer.dark #debug-bar .toolbar {
-    background-color: #434343;
-    box-shadow: 0 0 4px #434343;
-    -moz-box-shadow: 0 0 4px #434343;
-    -webkit-box-shadow: 0 0 4px #434343; }
-    #toolbarContainer.dark #debug-bar .toolbar img {
-      filter: brightness(0) invert(1); }
-  #toolbarContainer.dark #debug-bar.fixed-top .toolbar {
-    box-shadow: 0 0 4px #434343;
-    -moz-box-shadow: 0 0 4px #434343;
-    -webkit-box-shadow: 0 0 4px #434343; }
-  #toolbarContainer.dark #debug-bar.fixed-top .tab {
-    box-shadow: 0 1px 4px #434343;
-    -moz-box-shadow: 0 1px 4px #434343;
-    -webkit-box-shadow: 0 1px 4px #434343; }
-  #toolbarContainer.dark #debug-bar .muted {
-    color: #DFDFDF; }
-    #toolbarContainer.dark #debug-bar .muted td {
-      color: #797979; }
-    #toolbarContainer.dark #debug-bar .muted:hover td {
-      color: #DFDFDF; }
-  #toolbarContainer.dark #debug-bar #toolbar-position,
-  #toolbarContainer.dark #debug-bar #toolbar-theme {
-    filter: brightness(0) invert(0.6); }
-  #toolbarContainer.dark #debug-bar .ci-label.active {
-    background-color: #252525; }
-  #toolbarContainer.dark #debug-bar .ci-label:hover {
-    background-color: #252525; }
-  #toolbarContainer.dark #debug-bar .ci-label .badge {
-    background-color: #DD4814;
-    color: #FFFFFF; }
-  #toolbarContainer.dark #debug-bar .tab {
-    background-color: #252525;
-    box-shadow: 0 -1px 4px #434343;
-    -moz-box-shadow: 0 -1px 4px #434343;
-    -webkit-box-shadow: 0 -1px 4px #434343; }
-  #toolbarContainer.dark #debug-bar .timeline th,
-  #toolbarContainer.dark #debug-bar .timeline td {
-    border-color: #434343; }
-  #toolbarContainer.dark #debug-bar .timeline .timer {
-    background-color: #DD8615; }
-
+  color: #DFDFDF;
+}
+#toolbarContainer.dark #debug-bar h1,
+#toolbarContainer.dark #debug-bar h2,
+#toolbarContainer.dark #debug-bar h3,
+#toolbarContainer.dark #debug-bar p,
+#toolbarContainer.dark #debug-bar a,
+#toolbarContainer.dark #debug-bar button,
+#toolbarContainer.dark #debug-bar table,
+#toolbarContainer.dark #debug-bar thead,
+#toolbarContainer.dark #debug-bar tr,
+#toolbarContainer.dark #debug-bar td,
+#toolbarContainer.dark #debug-bar button,
+#toolbarContainer.dark #debug-bar .toolbar {
+  background-color: transparent;
+  color: #DFDFDF;
+}
+#toolbarContainer.dark #debug-bar button {
+  background-color: #252525;
+}
+#toolbarContainer.dark #debug-bar table strong {
+  color: #DD8615;
+}
+#toolbarContainer.dark #debug-bar table tbody tr:hover {
+  background-color: #434343;
+}
+#toolbarContainer.dark #debug-bar table tbody tr.current {
+  background-color: #FDC894;
+}
+#toolbarContainer.dark #debug-bar table tbody tr.current td {
+  color: #252525;
+}
+#toolbarContainer.dark #debug-bar table tbody tr.current:hover td {
+  background-color: #DD4814;
+  color: #FFFFFF;
+}
+#toolbarContainer.dark #debug-bar .toolbar {
+  background-color: #434343;
+  box-shadow: 0 0 4px #434343;
+  -moz-box-shadow: 0 0 4px #434343;
+  -webkit-box-shadow: 0 0 4px #434343;
+}
+#toolbarContainer.dark #debug-bar .toolbar img {
+  filter: brightness(0) invert(1);
+}
+#toolbarContainer.dark #debug-bar.fixed-top .toolbar {
+  box-shadow: 0 0 4px #434343;
+  -moz-box-shadow: 0 0 4px #434343;
+  -webkit-box-shadow: 0 0 4px #434343;
+}
+#toolbarContainer.dark #debug-bar.fixed-top .tab {
+  box-shadow: 0 1px 4px #434343;
+  -moz-box-shadow: 0 1px 4px #434343;
+  -webkit-box-shadow: 0 1px 4px #434343;
+}
+#toolbarContainer.dark #debug-bar .muted {
+  color: #DFDFDF;
+}
+#toolbarContainer.dark #debug-bar .muted td {
+  color: #434343;
+}
+#toolbarContainer.dark #debug-bar .muted:hover td {
+  color: #DFDFDF;
+}
+#toolbarContainer.dark #debug-bar #toolbar-position,
+#toolbarContainer.dark #debug-bar #toolbar-theme {
+  filter: brightness(0) invert(0.6);
+}
+#toolbarContainer.dark #debug-bar .ci-label.active {
+  background-color: #252525;
+}
+#toolbarContainer.dark #debug-bar .ci-label:hover {
+  background-color: #252525;
+}
+#toolbarContainer.dark #debug-bar .ci-label .badge {
+  background-color: #DD4814;
+  color: #FFFFFF;
+}
+#toolbarContainer.dark #debug-bar .tab {
+  background-color: #252525;
+  box-shadow: 0 -1px 4px #434343;
+  -moz-box-shadow: 0 -1px 4px #434343;
+  -webkit-box-shadow: 0 -1px 4px #434343;
+}
+#toolbarContainer.dark #debug-bar .timeline th,
+#toolbarContainer.dark #debug-bar .timeline td {
+  border-color: #434343;
+}
+#toolbarContainer.dark #debug-bar .timeline .timer {
+  background-color: #DD8615;
+}
 #toolbarContainer.dark .debug-view.show-view {
-  border-color: #DD8615; }
-
+  border-color: #DD8615;
+}
 #toolbarContainer.dark .debug-view-path {
   background-color: #FDC894;
-  color: #434343; }
-
+  color: #434343;
+}
 #toolbarContainer.dark td[data-debugbar-route] input[type=text] {
   background: #000;
-  color: #fff; }
+  color: #fff;
+}
 
 #toolbarContainer.light #debug-icon {
   background-color: #FFFFFF;
   box-shadow: 0 0 4px #DFDFDF;
   -moz-box-shadow: 0 0 4px #DFDFDF;
-  -webkit-box-shadow: 0 0 4px #DFDFDF; }
-  #toolbarContainer.light #debug-icon a:active,
-  #toolbarContainer.light #debug-icon a:link,
-  #toolbarContainer.light #debug-icon a:visited {
-    color: #DD8615; }
-
+  -webkit-box-shadow: 0 0 4px #DFDFDF;
+}
+#toolbarContainer.light #debug-icon a:active,
+#toolbarContainer.light #debug-icon a:link,
+#toolbarContainer.light #debug-icon a:visited {
+  color: #DD8615;
+}
 #toolbarContainer.light #debug-bar {
   background-color: #FFFFFF;
-  color: #434343; }
-  #toolbarContainer.light #debug-bar h1,
-  #toolbarContainer.light #debug-bar h2,
-  #toolbarContainer.light #debug-bar h3,
-  #toolbarContainer.light #debug-bar p,
-  #toolbarContainer.light #debug-bar a,
-  #toolbarContainer.light #debug-bar button,
-  #toolbarContainer.light #debug-bar table,
-  #toolbarContainer.light #debug-bar thead,
-  #toolbarContainer.light #debug-bar tr,
-  #toolbarContainer.light #debug-bar td,
-  #toolbarContainer.light #debug-bar button,
-  #toolbarContainer.light #debug-bar .toolbar {
-    background-color: transparent;
-    color: #434343; }
-  #toolbarContainer.light #debug-bar button {
-    background-color: #FFFFFF; }
-  #toolbarContainer.light #debug-bar table strong {
-    color: #DD8615; }
-  #toolbarContainer.light #debug-bar table tbody tr:hover {
-    background-color: #DFDFDF; }
-  #toolbarContainer.light #debug-bar table tbody tr.current {
-    background-color: #FDC894; }
-  #toolbarContainer.light #ci-database table tbody tr.duplicate {
-    background-color: #DFDFDF;}
-    #toolbarContainer.light #debug-bar table tbody tr.current:hover td {
-      background-color: #DD4814;
-      color: #FFFFFF; }
-  #toolbarContainer.light #debug-bar .toolbar {
-    background-color: #FFFFFF;
-    box-shadow: 0 0 4px #DFDFDF;
-    -moz-box-shadow: 0 0 4px #DFDFDF;
-    -webkit-box-shadow: 0 0 4px #DFDFDF; }
-    #toolbarContainer.light #debug-bar .toolbar img {
-      filter: brightness(0) invert(0.4); }
-  #toolbarContainer.light #debug-bar.fixed-top .toolbar {
-    box-shadow: 0 0 4px #DFDFDF;
-    -moz-box-shadow: 0 0 4px #DFDFDF;
-    -webkit-box-shadow: 0 0 4px #DFDFDF; }
-  #toolbarContainer.light #debug-bar.fixed-top .tab {
-    box-shadow: 0 1px 4px #DFDFDF;
-    -moz-box-shadow: 0 1px 4px #DFDFDF;
-    -webkit-box-shadow: 0 1px 4px #DFDFDF; }
-  #toolbarContainer.light #debug-bar .muted {
-    color: #797979; }
-    #toolbarContainer.light #debug-bar .muted td {
-      color: #797979; }
-    #toolbarContainer.light #debug-bar .muted:hover td {
-      color: #434343; }
-  #toolbarContainer.light #debug-bar #toolbar-position,
-  #toolbarContainer.light #debug-bar #toolbar-theme {
-    filter: brightness(0) invert(0.6); }
-  #toolbarContainer.light #debug-bar .ci-label.active {
-    background-color: #DFDFDF; }
-  #toolbarContainer.light #debug-bar .ci-label:hover {
-    background-color: #DFDFDF; }
-  #toolbarContainer.light #debug-bar .ci-label .badge {
-    background-color: #DD4814;
-    color: #FFFFFF; }
-  #toolbarContainer.light #debug-bar .tab {
-    background-color: #FFFFFF;
-    box-shadow: 0 -1px 4px #DFDFDF;
-    -moz-box-shadow: 0 -1px 4px #DFDFDF;
-    -webkit-box-shadow: 0 -1px 4px #DFDFDF; }
-  #toolbarContainer.light #debug-bar .timeline th,
-  #toolbarContainer.light #debug-bar .timeline td {
-    border-color: #DFDFDF; }
-  #toolbarContainer.light #debug-bar .timeline .timer {
-    background-color: #DD8615; }
-
+  color: #434343;
+}
+#toolbarContainer.light #debug-bar h1,
+#toolbarContainer.light #debug-bar h2,
+#toolbarContainer.light #debug-bar h3,
+#toolbarContainer.light #debug-bar p,
+#toolbarContainer.light #debug-bar a,
+#toolbarContainer.light #debug-bar button,
+#toolbarContainer.light #debug-bar table,
+#toolbarContainer.light #debug-bar thead,
+#toolbarContainer.light #debug-bar tr,
+#toolbarContainer.light #debug-bar td,
+#toolbarContainer.light #debug-bar button,
+#toolbarContainer.light #debug-bar .toolbar {
+  background-color: transparent;
+  color: #434343;
+}
+#toolbarContainer.light #debug-bar button {
+  background-color: #FFFFFF;
+}
+#toolbarContainer.light #debug-bar table strong {
+  color: #DD8615;
+}
+#toolbarContainer.light #debug-bar table tbody tr:hover {
+  background-color: #DFDFDF;
+}
+#toolbarContainer.light #debug-bar table tbody tr.current {
+  background-color: #FDC894;
+}
+#toolbarContainer.light #debug-bar table tbody tr.current:hover td {
+  background-color: #DD4814;
+  color: #FFFFFF;
+}
+#toolbarContainer.light #debug-bar .toolbar {
+  background-color: #FFFFFF;
+  box-shadow: 0 0 4px #DFDFDF;
+  -moz-box-shadow: 0 0 4px #DFDFDF;
+  -webkit-box-shadow: 0 0 4px #DFDFDF;
+}
+#toolbarContainer.light #debug-bar .toolbar img {
+  filter: brightness(0) invert(0.4);
+}
+#toolbarContainer.light #debug-bar.fixed-top .toolbar {
+  box-shadow: 0 0 4px #DFDFDF;
+  -moz-box-shadow: 0 0 4px #DFDFDF;
+  -webkit-box-shadow: 0 0 4px #DFDFDF;
+}
+#toolbarContainer.light #debug-bar.fixed-top .tab {
+  box-shadow: 0 1px 4px #DFDFDF;
+  -moz-box-shadow: 0 1px 4px #DFDFDF;
+  -webkit-box-shadow: 0 1px 4px #DFDFDF;
+}
+#toolbarContainer.light #debug-bar .muted {
+  color: #434343;
+}
+#toolbarContainer.light #debug-bar .muted td {
+  color: #DFDFDF;
+}
+#toolbarContainer.light #debug-bar .muted:hover td {
+  color: #434343;
+}
+#toolbarContainer.light #debug-bar #toolbar-position,
+#toolbarContainer.light #debug-bar #toolbar-theme {
+  filter: brightness(0) invert(0.6);
+}
+#toolbarContainer.light #debug-bar .ci-label.active {
+  background-color: #DFDFDF;
+}
+#toolbarContainer.light #debug-bar .ci-label:hover {
+  background-color: #DFDFDF;
+}
+#toolbarContainer.light #debug-bar .ci-label .badge {
+  background-color: #DD4814;
+  color: #FFFFFF;
+}
+#toolbarContainer.light #debug-bar .tab {
+  background-color: #FFFFFF;
+  box-shadow: 0 -1px 4px #DFDFDF;
+  -moz-box-shadow: 0 -1px 4px #DFDFDF;
+  -webkit-box-shadow: 0 -1px 4px #DFDFDF;
+}
+#toolbarContainer.light #debug-bar .timeline th,
+#toolbarContainer.light #debug-bar .timeline td {
+  border-color: #DFDFDF;
+}
+#toolbarContainer.light #debug-bar .timeline .timer {
+  background-color: #DD8615;
+}
 #toolbarContainer.light .debug-view.show-view {
-  border-color: #DD8615; }
-
+  border-color: #DD8615;
+}
 #toolbarContainer.light .debug-view-path {
   background-color: #FDC894;
-  color: #434343; }
+  color: #434343;
+}
 
 .debug-bar-width30 {
-  width: 30%; }
+  width: 30%;
+}
 
 .debug-bar-width10 {
-  width: 10%; }
+  width: 10%;
+}
 
 .debug-bar-width70p {
-  width: 70px; }
+  width: 70px;
+}
 
 .debug-bar-width140p {
-  width: 140px; }
+  width: 140px;
+}
 
 .debug-bar-width20e {
-  width: 20em; }
+  width: 20em;
+}
 
 .debug-bar-width6r {
-  width: 6rem; }
+  width: 6rem;
+}
 
 .debug-bar-ndisplay {
-  display: none; }
+  display: none;
+}
 
 .debug-bar-alignRight {
-  text-align: right; }
+  text-align: right;
+}
 
 .debug-bar-alignLeft {
-  text-align: left; }
+  text-align: left;
+}
 
 .debug-bar-noverflow {
-  overflow: hidden; }
+  overflow: hidden;
+}

From 950d45bf22d0934cc6a3d57250159f4a13512de0 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Thu, 24 Feb 2022 11:40:01 +0800
Subject: [PATCH 1626/2325] Nonce generation optimization.

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/HTTP/ContentSecurityPolicy.php           | 16 +++++-----------
 tests/system/HTTP/ContentSecurityPolicyTest.php | 14 ++++++++++++--
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index b7f9b066d7d8..a2d3ec6f0a24 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -671,18 +671,12 @@ protected function generateNonces(ResponseInterface &$response)
             return;
         }
 
-        // Replace style placeholders with nonces
-        $pattern = '/' . preg_quote($this->styleNonceTag, '/') . '/';
-        $body    = preg_replace_callback($pattern, function () {
-            $nonce = $this->getStyleNonce();
+        // Replace style and script placeholders with nonces
+        $pattern = '/(' . preg_quote($this->styleNonceTag, '/')
+            . '|' . preg_quote($this->scriptNonceTag, '/') . ')/';
 
-            return "nonce=\"{$nonce}\"";
-        }, $body);
-
-        // Replace script placeholders with nonces
-        $pattern = '/' . preg_quote($this->scriptNonceTag, '/') . '/';
-        $body    = preg_replace_callback($pattern, function () {
-            $nonce = $this->getScriptNonce();
+        $body = preg_replace_callback($pattern, function ($match) {
+            $nonce = $match[0] === $this->styleNonceTag ? $this->getStyleNonce() : $this->getScriptNonce();
 
             return "nonce=\"{$nonce}\"";
         }, $body);
diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php
index 2ab6ee747d91..d2113e28e366 100644
--- a/tests/system/HTTP/ContentSecurityPolicyTest.php
+++ b/tests/system/HTTP/ContentSecurityPolicyTest.php
@@ -459,11 +459,16 @@ public function testBodyScriptNonce()
         $this->response->setBody($body);
         $this->csp->addScriptSrc('cdn.cloudy.com');
 
-        $result = $this->work($body);
+        $result     = $this->work($body);
+        $nonceStyle = array_filter(
+            $this->getPrivateProperty($this->csp, 'styleSrc'),
+            static fn ($value) => strpos($value, 'nonce-') === 0
+        );
 
         $this->assertStringContainsString('nonce=', $this->response->getBody());
         $result = $this->getHeaderEmitted('Content-Security-Policy');
         $this->assertStringContainsString('nonce-', $result);
+        $this->assertSame([], $nonceStyle);
     }
 
     public function testBodyScriptNonceCustomScriptTag()
@@ -525,11 +530,16 @@ public function testBodyStyleNonce()
         $this->response->setBody($body);
         $this->csp->addStyleSrc('cdn.cloudy.com');
 
-        $result = $this->work($body);
+        $result      = $this->work($body);
+        $nonceScript = array_filter(
+            $this->getPrivateProperty($this->csp, 'scriptSrc'),
+            static fn ($value) => strpos($value, 'nonce-') === 0
+        );
 
         $this->assertStringContainsString('nonce=', $this->response->getBody());
         $result = $this->getHeaderEmitted('Content-Security-Policy');
         $this->assertStringContainsString('nonce-', $result);
+        $this->assertSame([], $nonceScript);
     }
 
     public function testBodyStyleNonceCustomStyleTag()

From b7c26b68941e256462e443731993317ce8793645 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 24 Feb 2022 13:35:53 +0900
Subject: [PATCH 1627/2325] refactor: remove unneeded `&` references

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

diff --git a/system/HTTP/ContentSecurityPolicy.php b/system/HTTP/ContentSecurityPolicy.php
index b7f9b066d7d8..0428431ed41d 100644
--- a/system/HTTP/ContentSecurityPolicy.php
+++ b/system/HTTP/ContentSecurityPolicy.php
@@ -298,7 +298,7 @@ public function getScriptNonce(): string
      *
      * Should be called just prior to sending the response to the user agent.
      */
-    public function finalize(ResponseInterface &$response)
+    public function finalize(ResponseInterface $response)
     {
         if ($this->autoNonce === false) {
             return;
@@ -663,7 +663,7 @@ protected function addOption($options, string $target, ?bool $explicitReporting
      * placeholders with actual nonces, that we'll then add to our
      * headers.
      */
-    protected function generateNonces(ResponseInterface &$response)
+    protected function generateNonces(ResponseInterface $response)
     {
         $body = $response->getBody();
 
@@ -695,7 +695,7 @@ protected function generateNonces(ResponseInterface &$response)
      * Content-Security-Policy and Content-Security-Policy-Report-Only headers
      * with their values to the response object.
      */
-    protected function buildHeaders(ResponseInterface &$response)
+    protected function buildHeaders(ResponseInterface $response)
     {
         /**
          * Ensure both headers are available and arrays...

From 1541d0665ae3e29a8527e519f28dc294049e5539 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Thu, 24 Feb 2022 13:22:49 +0800
Subject: [PATCH 1628/2325] Feature: Subquery for SELECT

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/Database/BaseBuilder.php                  | 16 ++++++++++++++++
 tests/system/Database/Builder/SelectTest.php     | 13 +++++++++++++
 user_guide_src/source/changelogs/v4.2.0.rst      |  1 +
 user_guide_src/source/database/query_builder.rst | 16 ++++++++++++++++
 .../source/database/query_builder/098.php        |  7 +++++++
 5 files changed, 53 insertions(+)
 create mode 100644 user_guide_src/source/database/query_builder/098.php

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index a3fc6c7563d3..92d35945565e 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -445,6 +445,22 @@ public function selectCount(string $select = '', string $alias = '')
         return $this->maxMinAvgSum($select, $alias, 'COUNT');
     }
 
+    /**
+     * Adds a subquery to the selection
+     *
+     * @return static
+     */
+    public function selectSubquery(BaseBuilder $subquery, string $as)
+    {
+        if (! $this->isSubquery($subquery)) {
+            throw new DatabaseException('The BaseBuilder::selectSubquery method expects a BaseBuilder instance');
+        }
+
+        $this->QBSelect[] = $this->buildSubquery($subquery, true, $as);
+
+        return $this;
+    }
+
     /**
      * SELECT [MAX|MIN|AVG|SUM|COUNT]()
      *
diff --git a/tests/system/Database/Builder/SelectTest.php b/tests/system/Database/Builder/SelectTest.php
index 7a9e7570221d..97460f0010da 100644
--- a/tests/system/Database/Builder/SelectTest.php
+++ b/tests/system/Database/Builder/SelectTest.php
@@ -246,4 +246,17 @@ public function testSimpleSelectWithSQLSRV()
 
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
+
+    public function testSelectSubquery()
+    {
+        $builder  = new BaseBuilder('users', $this->db);
+        $subquery = new BaseBuilder('countries', $this->db);
+
+        $subquery->select('name')->where('id', 1);
+        $builder->select('name')->selectSubquery($subquery, 'country');
+
+        $expected = 'SELECT "name", (SELECT "name" FROM "countries" WHERE "id" = 1) AS "country" FROM "users"';
+
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 }
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index f22ddae1aa17..a1660d8cf8ca 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -24,6 +24,7 @@ Enhancements
     - See :ref:`content-security-policy` for details.
 - New View Decorators allow modifying the generated HTML prior to caching.
 - Added Subqueries in the FROM section. See :ref:`query-builder-from-subquery`.
+- Added Subqueries in the SELECT section.
 - Added Validation Strict Rules. See :ref:`validation-traditional-and-strict-rules`.
 - Added new OCI8 driver for database.
     - It can access Oracle Database and supports SQL and PL/SQL statements.
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 1969620b63a8..0a1861e23810 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -167,6 +167,13 @@ the resulting field.
 .. literalinclude:: query_builder/014.php
    :lines: 2-
 
+**$builder->selectSubquery()**
+
+Adds a subquery to the SELECT section.
+
+.. literalinclude:: query_builder/098.php
+   :lines: 2-
+
 From
 ====
 
@@ -1066,6 +1073,15 @@ Class Reference
 
         Adds a ``SELECT COUNT(field)`` clause to a query.
 
+.. php:method:: selectSubquery(BaseBuilder $subquery, string $as)
+
+        :param string $subquery: Instance of BaseBuilder
+        :param string $as: Alias for the resulting value name
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
+
+        Adds a subquery to the selection
+
     .. php:method:: distinct([$val = true])
 
         :param bool $val: Desired value of the "distinct" flag
diff --git a/user_guide_src/source/database/query_builder/098.php b/user_guide_src/source/database/query_builder/098.php
new file mode 100644
index 000000000000..96d1d0d9025b
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/098.php
@@ -0,0 +1,7 @@
+<?php
+
+$subquery = $db->table('countries')->select('name')->where('id', 1);
+$builder  = $db->table('users')->select('name')->selectSubquery($subquery, 'country');
+$query = $builder->get();
+
+// Produces: SELECT `name`, (SELECT `name` FROM `countries` WHERE `id` = 1) AS `country` FROM `users`
\ No newline at end of file

From f668b8d91e646b5418193658d1c29d853f9a92ac Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Thu, 24 Feb 2022 10:24:55 +0800
Subject: [PATCH 1629/2325] Limit running PHP workflows to related PHP files

---
 .github/workflows/test-deptrac.yml |  8 ++++----
 .github/workflows/test-phpcpd.yml  | 13 +++++++------
 .github/workflows/test-phpstan.yml | 19 +++++++++++--------
 .github/workflows/test-phpunit.yml | 13 +++++++++----
 .github/workflows/test-rector.yml  | 17 +++++++++--------
 5 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/test-deptrac.yml b/.github/workflows/test-deptrac.yml
index 52b58d51d5d8..262da202c02f 100644
--- a/.github/workflows/test-deptrac.yml
+++ b/.github/workflows/test-deptrac.yml
@@ -8,8 +8,8 @@ on:
       - 'develop'
       - 'v4.*'
     paths:
-      - 'app/**'
-      - 'system/**'
+      - 'app/**.php'
+      - 'system/**.php'
       - 'composer.json'
       - 'depfile.yaml'
       - '.github/workflows/test-deptrac.yml'
@@ -18,8 +18,8 @@ on:
       - 'develop'
       - 'v4.*'
     paths:
-      - 'app/**'
-      - 'system/**'
+      - 'app/**.php'
+      - 'system/**.php'
       - 'composer.json'
       - 'depfile.yaml'
       - '.github/workflows/test-deptrac.yml'
diff --git a/.github/workflows/test-phpcpd.yml b/.github/workflows/test-phpcpd.yml
index 018acd11cbd2..6cfd76a054f1 100644
--- a/.github/workflows/test-phpcpd.yml
+++ b/.github/workflows/test-phpcpd.yml
@@ -8,18 +8,19 @@ on:
       - 'develop'
       - 'v4.*'
     paths:
-      - 'app/**'
-      - 'public/**'
-      - 'system/**'
+      - 'app/**.php'
+      - 'public/**.php'
+      - 'system/**.php'
       - '.github/workflows/test-phpcpd.yml'
+
   push:
     branches:
       - 'develop'
       - 'v4.*'
     paths:
-      - 'app/**'
-      - 'public/**'
-      - 'system/**'
+      - 'app/**.php'
+      - 'public/**.php'
+      - 'system/**.php'
       - '.github/workflows/test-phpcpd.yml'
 
 jobs:
diff --git a/.github/workflows/test-phpstan.yml b/.github/workflows/test-phpstan.yml
index 6c0d40efa83a..d0235ec9beb6 100644
--- a/.github/workflows/test-phpstan.yml
+++ b/.github/workflows/test-phpstan.yml
@@ -8,21 +8,24 @@ on:
       - 'develop'
       - 'v4.*'
     paths:
-      - 'app/**'
-      - 'system/**'
+      - 'app/**.php'
+      - 'system/**.php'
+      - 'utils/**.php'
       - composer.json
-      - phpstan.neon.dist
-      - phpstan-baseline.neon.dist
+      - '**.neon.dist'
+      - '.github/workflows/test-phpstan.yml'
+
   push:
     branches:
       - 'develop'
       - 'v4.*'
     paths:
-      - 'app/**'
-      - 'system/**'
+      - 'app/**.php'
+      - 'system/**.php'
+      - 'utils/**.php'
       - composer.json
-      - phpstan.neon.dist
-      - phpstan-baseline.neon.dist
+      - '**.neon.dist'
+      - '.github/workflows/test-phpstan.yml'
 
 jobs:
   build:
diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 1d788f9d86e1..964f9fcb3f72 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -5,20 +5,25 @@ on:
     branches:
       - develop
     paths:
+      - 'app/**.php'
+      - 'system/**.php'
+      - 'tests/**.php'
+      - 'spark'
       - composer.json
-      - spark
       - phpunit.xml.dist
-      - '**.php'
       - .github/workflows/test-phpunit.yml
+
   pull_request:
     branches:
       - develop
       - 'v4.*'
     paths:
+      - 'app/**.php'
+      - 'system/**.php'
+      - 'tests/**.php'
+      - 'spark'
       - composer.json
-      - spark
       - phpunit.xml.dist
-      - '**.php'
       - .github/workflows/test-phpunit.yml
 
 jobs:
diff --git a/.github/workflows/test-rector.yml b/.github/workflows/test-rector.yml
index 03aa90f9bb8c..1282205c8bf6 100644
--- a/.github/workflows/test-rector.yml
+++ b/.github/workflows/test-rector.yml
@@ -8,23 +8,24 @@ on:
       - 'develop'
       - 'v4.*'
     paths:
-      - 'app/**'
-      - 'system/**'
+      - 'app/**.php'
+      - 'system/**.php'
+      - 'tests/**.php'
+      - 'utils/**.php'
       - '.github/workflows/test-rector.yml'
       - composer.json
-      - 'utils/Rector/**'
-      - 'rector.php'
+
   push:
     branches:
       - 'develop'
       - 'v4.*'
     paths:
-      - 'app/**'
-      - 'system/**'
+      - 'app/**.php'
+      - 'system/**.php'
+      - 'tests/**.php'
+      - 'utils/**.php'
       - '.github/workflows/test-rector.yml'
       - composer.json
-      - 'utils/Rector/**'
-      - 'rector.php'
 
 jobs:
   build:

From c49c8a60abb1f5876bac81162f408a6875a66882 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Thu, 24 Feb 2022 08:29:44 +0100
Subject: [PATCH 1630/2325] Fix newlines.

---
 user_guide_src/source/helpers/text_helper/020.php      | 2 +-
 user_guide_src/source/libraries/curlrequest/014.php    | 2 +-
 user_guide_src/source/libraries/uploaded_files/006.php | 2 +-
 user_guide_src/source/outgoing/localization/008.php    | 3 +--
 user_guide_src/source/outgoing/response/026.php        | 2 +-
 user_guide_src/source/testing/fabricator/005.php       | 2 +-
 user_guide_src/source/testing/fabricator/006.php       | 2 +-
 user_guide_src/source/testing/fabricator/021.php       | 2 +-
 user_guide_src/source/testing/overview/007.php         | 2 +-
 9 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/user_guide_src/source/helpers/text_helper/020.php b/user_guide_src/source/helpers/text_helper/020.php
index e5e6be9350a6..1b235b77497e 100644
--- a/user_guide_src/source/helpers/text_helper/020.php
+++ b/user_guide_src/source/helpers/text_helper/020.php
@@ -12,4 +12,4 @@
     function.
 
   Excessively long words will be split, but URLs will not be.
-*/
\ No newline at end of file
+*/
diff --git a/user_guide_src/source/libraries/curlrequest/014.php b/user_guide_src/source/libraries/curlrequest/014.php
index 04f6e02ffb18..9147c8861423 100644
--- a/user_guide_src/source/libraries/curlrequest/014.php
+++ b/user_guide_src/source/libraries/curlrequest/014.php
@@ -8,4 +8,4 @@
     'max'       => 5, // Maximum number of redirects to follow before stopping
     'strict'    => true, // Ensure POST requests stay POST requests through redirects
     'protocols' => ['http', 'https'] // Restrict redirects to one or more protocols
-*/
\ No newline at end of file
+*/
diff --git a/user_guide_src/source/libraries/uploaded_files/006.php b/user_guide_src/source/libraries/uploaded_files/006.php
index 9a1fde0f053e..f046d86b63bc 100644
--- a/user_guide_src/source/libraries/uploaded_files/006.php
+++ b/user_guide_src/source/libraries/uploaded_files/006.php
@@ -9,4 +9,4 @@
             ]
         ]
     ]
-];
\ No newline at end of file
+];
diff --git a/user_guide_src/source/outgoing/localization/008.php b/user_guide_src/source/outgoing/localization/008.php
index eac50a5f4861..1b9b79725642 100644
--- a/user_guide_src/source/outgoing/localization/008.php
+++ b/user_guide_src/source/outgoing/localization/008.php
@@ -6,5 +6,4 @@
             'key' => 'The actual message to be shown.',
         ],
     ],
-]
-;
\ No newline at end of file
+];
diff --git a/user_guide_src/source/outgoing/response/026.php b/user_guide_src/source/outgoing/response/026.php
index 4287ddb889ba..ee92fa38c094 100644
--- a/user_guide_src/source/outgoing/response/026.php
+++ b/user_guide_src/source/outgoing/response/026.php
@@ -2,4 +2,4 @@
 
 if ($response->hasCookie($name)) {
     // ...
-}
\ No newline at end of file
+}
diff --git a/user_guide_src/source/testing/fabricator/005.php b/user_guide_src/source/testing/fabricator/005.php
index 1bee37a0b99a..de1e6d7ef6c5 100644
--- a/user_guide_src/source/testing/fabricator/005.php
+++ b/user_guide_src/source/testing/fabricator/005.php
@@ -12,4 +12,4 @@ public function fake(Generator &$faker)
             'login'  => config('Auth')->allowRemembering ? date('Y-m-d') : null,
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/user_guide_src/source/testing/fabricator/006.php b/user_guide_src/source/testing/fabricator/006.php
index cfb130f21ede..13b4b96cb07d 100644
--- a/user_guide_src/source/testing/fabricator/006.php
+++ b/user_guide_src/source/testing/fabricator/006.php
@@ -8,4 +8,4 @@ public function fake(&$faker)
     {
         // ...
     }
-}
\ No newline at end of file
+}
diff --git a/user_guide_src/source/testing/fabricator/021.php b/user_guide_src/source/testing/fabricator/021.php
index df10c0b137d7..d6c848ac3c06 100644
--- a/user_guide_src/source/testing/fabricator/021.php
+++ b/user_guide_src/source/testing/fabricator/021.php
@@ -12,4 +12,4 @@ public function fake(Generator &$faker)
             'group_id' => rand(1, Fabricator::getCount('groups')),
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/user_guide_src/source/testing/overview/007.php b/user_guide_src/source/testing/overview/007.php
index d6ec1d6c45c5..c829e5b99cce 100644
--- a/user_guide_src/source/testing/overview/007.php
+++ b/user_guide_src/source/testing/overview/007.php
@@ -16,4 +16,4 @@ class AuthenticationFeatureTest
     use AuthTrait;
 
     // ...
-}
\ No newline at end of file
+}

From 9594c458d97b2dd20861170d9d20b7d9a9049a5f Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA"
 <51850998+paulbalandan@users.noreply.github.com>
Date: Thu, 24 Feb 2022 15:35:10 +0800
Subject: [PATCH 1631/2325] Delete stale.yml

---
 stale.yml | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 stale.yml

diff --git a/stale.yml b/stale.yml
deleted file mode 100644
index 897cc082a10e..000000000000
--- a/stale.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 60
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 7
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-# Label to use when marking an issue as stale
-staleLabel: wontfix
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be automatically closed in a week if no further activity occurs. 
-  Thank you for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

From af4995f2cda37024ab64f32b7bd3b5761638ccb0 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <40514119+sfadschm@users.noreply.github.com>
Date: Thu, 24 Feb 2022 11:01:00 +0100
Subject: [PATCH 1632/2325] Fix space.

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 user_guide_src/source/incoming/incomingrequest/10.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/incomingrequest/10.php b/user_guide_src/source/incoming/incomingrequest/10.php
index d4118cebda7c..e223b7772d54 100644
--- a/user_guide_src/source/incoming/incomingrequest/10.php
+++ b/user_guide_src/source/incoming/incomingrequest/10.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
-     With a request body of:
+    With a request body of:
     {
         "foo": "bar",
         "fizz": {

From df2e2239cb2e4c458f51f03a0ba44f868341b371 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Thu, 24 Feb 2022 11:33:28 +0100
Subject: [PATCH 1633/2325] Convert array dumps and prints to comments.

---
 .../source/incoming/incomingrequest/13.php    | 12 ++++++---
 .../source/incoming/incomingrequest/15.php    | 14 ++++++----
 user_guide_src/source/libraries/uri/026.php   | 15 ++++++-----
 .../source/libraries/validation/009.php       | 27 ++++++++++---------
 .../source/libraries/validation/011.php       | 17 +++++++-----
 .../source/libraries/validation/027.php       | 13 +++++----
 .../source/testing/benchmark/004.php          | 17 +++++++-----
 .../source/testing/response/030.php           |  8 ++++--
 .../source/testing/response/032.php           | 11 +++++---
 9 files changed, 82 insertions(+), 52 deletions(-)

diff --git a/user_guide_src/source/incoming/incomingrequest/13.php b/user_guide_src/source/incoming/incomingrequest/13.php
index cf4be2eb10ac..8f62b6dd32a9 100644
--- a/user_guide_src/source/incoming/incomingrequest/13.php
+++ b/user_guide_src/source/incoming/incomingrequest/13.php
@@ -2,7 +2,11 @@
 
 var_dump($request->getRawInput());
 
-[
-    'Param1' => 'Value1',
-    'Param2' => 'Value2'
-];
+/*
+    Outputs:
+
+    [
+        'Param1' => 'Value1',
+        'Param2' => 'Value2'
+    ]
+*/
diff --git a/user_guide_src/source/incoming/incomingrequest/15.php b/user_guide_src/source/incoming/incomingrequest/15.php
index c6e85bfef577..95d483206211 100644
--- a/user_guide_src/source/incoming/incomingrequest/15.php
+++ b/user_guide_src/source/incoming/incomingrequest/15.php
@@ -2,8 +2,12 @@
 
 var_dump($request->headers());
 
-[
-    'Host'          => CodeIgniter\HTTP\Header,
-    'Cache-Control' => CodeIgniter\HTTP\Header,
-    'Accept'        => CodeIgniter\HTTP\Header,
-];
+/*
+    Outputs:
+
+    [
+        'Host'          => CodeIgniter\HTTP\Header,
+        'Cache-Control' => CodeIgniter\HTTP\Header,
+        'Accept'        => CodeIgniter\HTTP\Header,
+    ]
+*/
diff --git a/user_guide_src/source/libraries/uri/026.php b/user_guide_src/source/libraries/uri/026.php
index 53a42eb788f4..6491e0d20ca4 100644
--- a/user_guide_src/source/libraries/uri/026.php
+++ b/user_guide_src/source/libraries/uri/026.php
@@ -2,9 +2,12 @@
 
 $segments = $uri->getSegments();
 
-// $segments =
-[
-    0 => 'users',
-    1 => '15',
-    2 => 'profile'
-];
+/*
+    Produces:
+
+    [
+        0 => 'users',
+        1 => '15',
+        2 => 'profile'
+    ]
+*/
diff --git a/user_guide_src/source/libraries/validation/009.php b/user_guide_src/source/libraries/validation/009.php
index aec2e980c5dc..8792a8a8f728 100644
--- a/user_guide_src/source/libraries/validation/009.php
+++ b/user_guide_src/source/libraries/validation/009.php
@@ -1,19 +1,22 @@
 <?php
 
-// The data to test:
-[
-    'contacts' => [
-       'name' => 'Joe Smith',
-        'friends' => [
-            [
-                'name' => 'Fred Flinstone',
-            ],
-            [
-                'name' => 'Wilma',
-            ],
+/*
+    The data to test:
+
+    [
+        'contacts' => [
+           'name' => 'Joe Smith',
+            'friends' => [
+                [
+                    'name' => 'Fred Flinstone',
+                ],
+                [
+                    'name' => 'Wilma',
+                ],
+            ]
         ]
     ]
-];
+*/
 
 // Joe Smith
 $validation->setRules([
diff --git a/user_guide_src/source/libraries/validation/011.php b/user_guide_src/source/libraries/validation/011.php
index 66fbcda5e1a7..ec6b9c9adbab 100644
--- a/user_guide_src/source/libraries/validation/011.php
+++ b/user_guide_src/source/libraries/validation/011.php
@@ -1,13 +1,16 @@
 <?php
 
-// The data to test:
-[
-    'user_ids' => [
-        1,
-        2,
-       3,
+/*
+    The data to test:
+
+    [
+        'user_ids' => [
+            1,
+            2,
+            3,
+        ]
     ]
-];
+*/
 
 // Rule
 $validation->setRules([
diff --git a/user_guide_src/source/libraries/validation/027.php b/user_guide_src/source/libraries/validation/027.php
index c6afaf393f2a..e633f5cdd1e3 100644
--- a/user_guide_src/source/libraries/validation/027.php
+++ b/user_guide_src/source/libraries/validation/027.php
@@ -2,8 +2,11 @@
 
 $errors = $validation->getErrors();
 
-// Returns:
-[
-    'field1' => 'error message',
-    'field2' => 'error message',
-];
+/*
+   Produces:
+
+    [
+        'field1' => 'error message',
+        'field2' => 'error message',
+    ]
+*/
diff --git a/user_guide_src/source/testing/benchmark/004.php b/user_guide_src/source/testing/benchmark/004.php
index bf84bf6ed21f..3048a2851ff3 100644
--- a/user_guide_src/source/testing/benchmark/004.php
+++ b/user_guide_src/source/testing/benchmark/004.php
@@ -2,11 +2,14 @@
 
 $timers = $benchmark->getTimers();
 
-// Timers =
-[
-    'render view'  => [
-        'start'    => 1234567890,
-        'end'      => 1345678920,
-        'duration' => 15.4315, // number of seconds
+/*
+    Produces:
+
+    [
+        'render view'  => [
+            'start'    => 1234567890,
+            'end'      => 1345678920,
+            'duration' => 15.4315, // number of seconds
+        ]
     ]
-];
+*/
diff --git a/user_guide_src/source/testing/response/030.php b/user_guide_src/source/testing/response/030.php
index 7dfa89e51cc1..53887b278572 100644
--- a/user_guide_src/source/testing/response/030.php
+++ b/user_guide_src/source/testing/response/030.php
@@ -1,12 +1,16 @@
 <?php
 
-// Response body is this:
-['foo' => 'bar'];
+/*
+    Response body is this:
+
+    ['foo' => 'bar'];
+*/
 
 $json = $result->getJSON();
 
 /*
     $json is this:
+
     {
         "foo": "bar"
     }
diff --git a/user_guide_src/source/testing/response/032.php b/user_guide_src/source/testing/response/032.php
index c2d093443b9d..6de63a9cfce8 100644
--- a/user_guide_src/source/testing/response/032.php
+++ b/user_guide_src/source/testing/response/032.php
@@ -1,9 +1,12 @@
 <?php
 
-// Response body is this:
-[
-    'config' => ['key-a', 'key-b'],
-];
+/*
+    Response body is this:
+
+    [
+        'config' => ['key-a', 'key-b'],
+    ]
+*/
 
 // Is true
 $result->assertJSONFragment(['config' => ['key-a']]);

From 36976f5945df3484ddf33c0df217e862aee9961a Mon Sep 17 00:00:00 2001
From: Alex Schmitz <40514119+sfadschm@users.noreply.github.com>
Date: Thu, 24 Feb 2022 11:38:03 +0100
Subject: [PATCH 1634/2325] Fix output of getHeaderLine.

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 user_guide_src/source/incoming/message/005.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/message/005.php b/user_guide_src/source/incoming/message/005.php
index ea54a21a4407..b67851a9258a 100644
--- a/user_guide_src/source/incoming/message/005.php
+++ b/user_guide_src/source/incoming/message/005.php
@@ -4,5 +4,5 @@
 
 /*
     Outputs:
-    en, en-US
+    'en,en-US'
 */

From 087ef29cb56348c1fb437a474b7e23a04ed60c9c Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Thu, 24 Feb 2022 11:52:32 +0100
Subject: [PATCH 1635/2325] Fix delimiters in renumerate script.

---
 user_guide_src/{renumerate.php => renumerate} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename user_guide_src/{renumerate.php => renumerate} (93%)

diff --git a/user_guide_src/renumerate.php b/user_guide_src/renumerate
similarity index 93%
rename from user_guide_src/renumerate.php
rename to user_guide_src/renumerate
index ca885551d168..814ea18430d0 100644
--- a/user_guide_src/renumerate.php
+++ b/user_guide_src/renumerate
@@ -81,7 +81,7 @@
                     rename($sectionFolder . '/' . $prefix . $exampleName . '.php', $sectionFolder . '/' . $newName . '.php');
 
                     // Fix include link
-                    $sectionContent = preg_replace(preg_quote(str_replace($exampleName, $prefix . $exampleName, $includeStrings[$exampleIndex]), '~'), str_replace($exampleName, $newName, $includeStrings[$exampleIndex]), $sectionContent, 1, $count);
+                    $sectionContent = preg_replace('~' . preg_quote(str_replace($exampleName, $prefix . $exampleName, $includeStrings[$exampleIndex]), '~') . '~', str_replace($exampleName, $newName, $includeStrings[$exampleIndex]), $sectionContent, 1, $count);
                 }
 
                 // Write new content to rst

From da96ff3519b5a0eca6fa9e61d834cabe6cd575c9 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Thu, 24 Feb 2022 11:58:29 +0100
Subject: [PATCH 1636/2325] Revert extraction of single array elements.

---
 user_guide_src/source/libraries/pagination.rst     | 10 ++++------
 user_guide_src/source/libraries/pagination/011.php |  3 ---
 user_guide_src/source/libraries/pagination/012.php |  3 ---
 user_guide_src/source/libraries/validation.rst     |  5 ++---
 user_guide_src/source/libraries/validation/025.php |  3 ---
 5 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 user_guide_src/source/libraries/pagination/011.php
 delete mode 100644 user_guide_src/source/libraries/pagination/012.php
 delete mode 100644 user_guide_src/source/libraries/validation/025.php

diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index 8a79531326d6..5eec05cf0c43 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -166,16 +166,14 @@ methods, respectively. To change the way those are displayed application-wide, y
 For example, say you create a new view file that works with the Foundation CSS framework, and
 you place that file at **app/Views/Pagers/foundation_full.php**. Since the **application** directory is
 namespaced as ``App``, and all directories underneath it map directly to segments of the namespace, you can locate
-the view file through it's namespace:
+the view file through it's namespace::
 
-.. literalinclude:: pagination/011.php
-   :lines: 2-
+    'default_full' => 'App\Views\Pagers\foundation_full'
 
 Since it is under the standard **app/Views** directory, though, you do not need to namespace it since the
-``view()`` method can locate it by filename. In that case, you can simply give the sub-directory and file name:
+``view()`` method can locate it by filename. In that case, you can simply give the sub-directory and file name::
 
-.. literalinclude:: pagination/012.php
-   :lines: 2-
+    'default_full' => 'Pagers/foundation_full'
 
 Once you have created the view and set it in the configuration, it will automatically be used. You don't have to
 replace the existing templates. You can create as many additional templates as you need in the configuration
diff --git a/user_guide_src/source/libraries/pagination/011.php b/user_guide_src/source/libraries/pagination/011.php
deleted file mode 100644
index 8000e782737c..000000000000
--- a/user_guide_src/source/libraries/pagination/011.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-['default_full'   => 'App\Views\Pagers\foundation_full'];
diff --git a/user_guide_src/source/libraries/pagination/012.php b/user_guide_src/source/libraries/pagination/012.php
deleted file mode 100644
index 5a00b20f70c3..000000000000
--- a/user_guide_src/source/libraries/pagination/012.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-['default_full'   => 'Pagers/foundation_full'];
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index a74bca7904d8..4f53eab33260 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -435,10 +435,9 @@ Or as a labeled style:
    :lines: 2-
 
 If you’d like to include a field’s “human” name, or the optional parameter some rules allow for (such as max_length),
-or the value that was validated you can add the ``{field}``, ``{param}`` and ``{value}`` tags to your message, respectively:
+or the value that was validated you can add the ``{field}``, ``{param}`` and ``{value}`` tags to your message, respectively::
 
-.. literalinclude:: validation/025.php
-   :lines: 2-
+    'min_length' => 'Supplied value ({value}) for {field} must have at least {param} characters.'
 
 On a field with the human name Username and a rule of ``min_length[6]`` with a value of “Pizza”, an error would display: “Supplied value (Pizza) for Username must have
 at least 6 characters.”
diff --git a/user_guide_src/source/libraries/validation/025.php b/user_guide_src/source/libraries/validation/025.php
deleted file mode 100644
index a71f46f29f92..000000000000
--- a/user_guide_src/source/libraries/validation/025.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-['min_length' => 'Supplied value ({value}) for {field} must have at least {param} characters.'];

From c2883077a6acf35cd53676935f4d35583ee126f8 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Thu, 24 Feb 2022 11:58:35 +0100
Subject: [PATCH 1637/2325] Add return statement for localization arrays.

---
 user_guide_src/source/outgoing/localization/007.php | 4 +++-
 user_guide_src/source/outgoing/localization/008.php | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/outgoing/localization/007.php b/user_guide_src/source/outgoing/localization/007.php
index e2de3a4644d6..adc24e5d6242 100644
--- a/user_guide_src/source/outgoing/localization/007.php
+++ b/user_guide_src/source/outgoing/localization/007.php
@@ -1,3 +1,5 @@
 <?php
 
-['languageKey' => 'The actual message to be shown.'];
+return [
+    'languageKey' => 'The actual message to be shown.'
+];
diff --git a/user_guide_src/source/outgoing/localization/008.php b/user_guide_src/source/outgoing/localization/008.php
index 1b9b79725642..319fa750429b 100644
--- a/user_guide_src/source/outgoing/localization/008.php
+++ b/user_guide_src/source/outgoing/localization/008.php
@@ -1,6 +1,6 @@
 <?php
 
-[
+return [
     'languageKey' => [
         'nested' => [
             'key' => 'The actual message to be shown.',

From c4d4281274fb016517d197674eb284151dc70dba Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Thu, 24 Feb 2022 11:59:15 +0100
Subject: [PATCH 1638/2325] Remove wrong semicolon in response body.

---
 user_guide_src/source/testing/response/030.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/testing/response/030.php b/user_guide_src/source/testing/response/030.php
index 53887b278572..060f5c551a87 100644
--- a/user_guide_src/source/testing/response/030.php
+++ b/user_guide_src/source/testing/response/030.php
@@ -3,7 +3,7 @@
 /*
     Response body is this:
 
-    ['foo' => 'bar'];
+    ['foo' => 'bar']
 */
 
 $json = $result->getJSON();

From b7bb3f29afad9e577b3fd406ca88e8ded08b5f6d Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Thu, 24 Feb 2022 12:00:43 +0100
Subject: [PATCH 1639/2325] Renumerate incomingrequest, pagination and
 validation.

---
 .../source/incoming/incomingrequest.rst       | 76 +++++++++----------
 .../incomingrequest/{1.php => 001.php}        |  0
 .../incomingrequest/{2.php => 002.php}        |  0
 .../incomingrequest/{3.php => 003.php}        |  0
 .../incomingrequest/{4.php => 004.php}        |  0
 .../incomingrequest/{5.php => 005.php}        |  0
 .../incomingrequest/{6.php => 006.php}        |  0
 .../incomingrequest/{7.php => 007.php}        |  0
 .../incomingrequest/{8.php => 008.php}        |  0
 .../incomingrequest/{9.php => 009.php}        |  0
 .../incomingrequest/{10.php => 010.php}       |  0
 .../incomingrequest/{11.php => 011.php}       |  0
 .../incomingrequest/{12.php => 012.php}       |  0
 .../incomingrequest/{13.php => 013.php}       |  0
 .../incomingrequest/{14.php => 014.php}       |  0
 .../incomingrequest/{15.php => 015.php}       |  0
 .../incomingrequest/{16.php => 016.php}       |  0
 .../incomingrequest/{17.php => 017.php}       |  0
 .../incomingrequest/{18.php => 018.php}       |  0
 .../incomingrequest/{19.php => 019.php}       |  0
 .../incomingrequest/{20.php => 020.php}       |  0
 .../incomingrequest/{21.php => 021.php}       |  0
 .../incomingrequest/{22.php => 022.php}       |  0
 .../incomingrequest/{23.php => 023.php}       |  0
 .../incomingrequest/{24.php => 024.php}       |  0
 .../incomingrequest/{25.php => 025.php}       |  0
 .../incomingrequest/{26.php => 026.php}       |  0
 .../incomingrequest/{27.php => 027.php}       |  0
 .../incomingrequest/{28.php => 028.php}       |  0
 .../incomingrequest/{29.php => 029.php}       |  0
 .../incomingrequest/{30.php => 030.php}       |  0
 .../incomingrequest/{31.php => 031.php}       |  0
 .../incomingrequest/{32.php => 032.php}       |  0
 .../incomingrequest/{33.php => 033.php}       |  0
 .../incomingrequest/{34.php => 034.php}       |  0
 .../incomingrequest/{35.php => 035.php}       |  0
 .../incomingrequest/{36.php => 036.php}       |  0
 .../incomingrequest/{37.php => 037.php}       |  0
 .../incomingrequest/{38.php => 038.php}       |  0
 .../source/libraries/pagination.rst           |  8 +-
 .../source/libraries/pagination/011.php       |  7 ++
 .../source/libraries/pagination/012.php       | 39 ++++++++++
 .../source/libraries/pagination/013.php       |  8 +-
 .../source/libraries/pagination/014.php       | 66 ++++++++--------
 .../source/libraries/pagination/015.php       |  7 --
 .../source/libraries/pagination/016.php       | 37 ---------
 .../source/libraries/validation.rst           | 26 +++----
 .../source/libraries/validation/025.php       | 19 +++++
 .../source/libraries/validation/026.php       | 25 +++---
 .../source/libraries/validation/027.php       | 11 +--
 .../source/libraries/validation/028.php       |  4 +-
 .../source/libraries/validation/029.php       | 12 +--
 .../source/libraries/validation/030.php       | 13 ++--
 .../source/libraries/validation/031.php       |  7 +-
 .../source/libraries/validation/032.php       | 14 +++-
 .../source/libraries/validation/033.php       | 18 ++---
 .../source/libraries/validation/034.php       | 11 ++-
 .../source/libraries/validation/035.php       | 13 +---
 .../source/libraries/validation/036.php       | 35 ++++++++-
 .../source/libraries/validation/037.php       | 40 ++--------
 .../source/libraries/validation/038.php       | 10 ---
 61 files changed, 253 insertions(+), 253 deletions(-)
 rename user_guide_src/source/incoming/incomingrequest/{1.php => 001.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{2.php => 002.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{3.php => 003.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{4.php => 004.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{5.php => 005.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{6.php => 006.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{7.php => 007.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{8.php => 008.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{9.php => 009.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{10.php => 010.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{11.php => 011.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{12.php => 012.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{13.php => 013.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{14.php => 014.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{15.php => 015.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{16.php => 016.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{17.php => 017.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{18.php => 018.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{19.php => 019.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{20.php => 020.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{21.php => 021.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{22.php => 022.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{23.php => 023.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{24.php => 024.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{25.php => 025.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{26.php => 026.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{27.php => 027.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{28.php => 028.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{29.php => 029.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{30.php => 030.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{31.php => 031.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{32.php => 032.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{33.php => 033.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{34.php => 034.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{35.php => 035.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{36.php => 036.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{37.php => 037.php} (100%)
 rename user_guide_src/source/incoming/incomingrequest/{38.php => 038.php} (100%)
 create mode 100644 user_guide_src/source/libraries/pagination/011.php
 create mode 100644 user_guide_src/source/libraries/pagination/012.php
 delete mode 100644 user_guide_src/source/libraries/pagination/015.php
 delete mode 100644 user_guide_src/source/libraries/pagination/016.php
 create mode 100644 user_guide_src/source/libraries/validation/025.php
 delete mode 100644 user_guide_src/source/libraries/validation/038.php

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index 70692d1aa4c4..2691a034aeaf 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -15,18 +15,18 @@ Accessing the Request
 An instance of the request class already populated for you if the current class is a descendant of
 ``CodeIgniter\Controller`` and can be accessed as a class property:
 
-.. literalinclude:: incomingrequest/1.php
+.. literalinclude:: incomingrequest/001.php
 
 If you are not within a controller, but still need access to the application's Request object, you can
 get a copy of it through the :doc:`Services class </concepts/services>`:
 
-.. literalinclude:: incomingrequest/2.php
+.. literalinclude:: incomingrequest/002.php
    :lines: 2-
 
 It's preferable, though, to pass the request in as a dependency if the class is anything other than
 the controller, where you can save it as a class property:
 
-.. literalinclude:: incomingrequest/3.php
+.. literalinclude:: incomingrequest/003.php
 
 Determining Request Type
 ------------------------
@@ -34,7 +34,7 @@ Determining Request Type
 A request could be of several types, including an AJAX request or a request from the command line. This can
 be checked with the ``isAJAX()`` and ``isCLI()`` methods:
 
-.. literalinclude:: incomingrequest/4.php
+.. literalinclude:: incomingrequest/004.php
    :lines: 2-
 
 .. note:: The ``isAJAX()`` method depends on the ``X-Requested-With`` header,
@@ -43,7 +43,7 @@ be checked with the ``isAJAX()`` and ``isCLI()`` methods:
 
 You can check the HTTP method that this request represents with the ``method()`` method:
 
-.. literalinclude:: incomingrequest/5.php
+.. literalinclude:: incomingrequest/005.php
    :lines: 2-
 
 By default, the method is returned as a lower-case string (i.e., 'get', 'post', etc). You can get an
@@ -54,7 +54,7 @@ uppercase version by wrapping the call in ``str_to_upper()``::
 
 You can also check if the request was made through and HTTPS connection with the ``isSecure()`` method:
 
-.. literalinclude:: incomingrequest/6.php
+.. literalinclude:: incomingrequest/006.php
    :lines: 2-
 
 Retrieving Input
@@ -67,12 +67,12 @@ will return null if the item doesn't exist, and you can have the data filtered.
 use data without having to test whether an item exists first. In other words, normally you might do something
 like this:
 
-.. literalinclude:: incomingrequest/7.php
+.. literalinclude:: incomingrequest/007.php
    :lines: 2-
 
 With CodeIgniter’s built in methods you can simply do this:
 
-.. literalinclude:: incomingrequest/8.php
+.. literalinclude:: incomingrequest/008.php
    :lines: 2-
 
 The ``getVar()`` method will pull from $_REQUEST, so will return any data from $_GET, $POST, or $_COOKIE. While this
@@ -97,7 +97,7 @@ You can grab the contents of php://input as a JSON stream with ``getJSON()``.
     method if you know that you're expecting JSON.
 
 
-.. literalinclude:: incomingrequest/9.php
+.. literalinclude:: incomingrequest/009.php
    :lines: 2-
 
 By default, this will return any objects in the JSON data as objects. If you want that converted to associative
@@ -115,7 +115,7 @@ You can get a specific piece of data from a JSON stream by passing a variable na
 data that you want or you can use "dot" notation to dig into the JSON to get data that is not on the root level.
 
 
-.. literalinclude:: incomingrequest/10.php
+.. literalinclude:: incomingrequest/010.php
    :lines: 2-
 
 
@@ -124,7 +124,7 @@ true in the second parameter. This function can also be used if you can't guaran
 correct ``CONTENT_TYPE`` header.
 
 
-.. literalinclude:: incomingrequest/11.php
+.. literalinclude:: incomingrequest/011.php
    :lines: 2-
 
 .. note:: See the documentation for ``dot_array_search()`` in the ``Array`` helper for more information on "dot" notation.
@@ -133,12 +133,12 @@ correct ``CONTENT_TYPE`` header.
 
 Finally, you can grab the contents of php://input as a raw stream with ``getRawInput()``:
 
-.. literalinclude:: incomingrequest/12.php
+.. literalinclude:: incomingrequest/012.php
    :lines: 2-
 
 This will retrieve data and convert it to an array. Like this:
 
-.. literalinclude:: incomingrequest/13.php
+.. literalinclude:: incomingrequest/013.php
    :lines: 2-
 
 **Filtering Input Data**
@@ -150,7 +150,7 @@ filter types <https://www.php.net/manual/en/filter.filters.php>`_.
 
 Filtering a POST variable would look like this:
 
-.. literalinclude:: incomingrequest/14.php
+.. literalinclude:: incomingrequest/014.php
    :lines: 2-
 
 All of the methods mentioned above support the filter type passed in as the second parameter, with the
@@ -163,28 +163,28 @@ You can get access to any header that was sent with the request with the ``heade
 an array of all headers, with the key as the name of the header, and the value is an instance of
 ``CodeIgniter\HTTP\Header``:
 
-.. literalinclude:: incomingrequest/15.php
+.. literalinclude:: incomingrequest/015.php
    :lines: 2-
 
 If you only need a single header, you can pass the name into the ``header()`` method. This will grab the
 specified header object in a case-insensitive manner if it exists. If not, then it will return ``null``:
 
-.. literalinclude:: incomingrequest/16.php
+.. literalinclude:: incomingrequest/016.php
    :lines: 2-
 
 You can always use ``hasHeader()`` to see if the header existed in this request:
 
-.. literalinclude:: incomingrequest/17.php
+.. literalinclude:: incomingrequest/017.php
    :lines: 2-
 
 If you need the value of header as a string with all values on one line, you can use the ``getHeaderLine()`` method:
 
-.. literalinclude:: incomingrequest/18.php
+.. literalinclude:: incomingrequest/018.php
    :lines: 2-
 
 If you need the entire header, with the name and values in a single string, simply cast the header as a string:
 
-.. literalinclude:: incomingrequest/19.php
+.. literalinclude:: incomingrequest/019.php
    :lines: 2-
 
 The Request URL
@@ -193,19 +193,19 @@ The Request URL
 You can retrieve a :doc:`URI </libraries/uri>` object that represents the current URI for this request through the
 ``$request->getUri()`` method. You can cast this object as a string to get a full URL for the current request:
 
-.. literalinclude:: incomingrequest/20.php
+.. literalinclude:: incomingrequest/020.php
    :lines: 2-
 
 The object gives you full abilities to grab any part of the request on it's own:
 
-.. literalinclude:: incomingrequest/21.php
+.. literalinclude:: incomingrequest/021.php
    :lines: 2-
 
 You can work with the current URI string (the path relative to your baseURL) using the ``getPath()`` and ``setPath()`` methods.
 Note that this relative path on the shared instance of ``IncomingRequest`` is what the :doc:`URL Helper </helpers/url_helper>`
 functions use, so this is a helpful way to "spoof" an incoming request for testing:
 
-.. literalinclude:: incomingrequest/22.php
+.. literalinclude:: incomingrequest/022.php
    :lines: 2-
 
 Uploaded Files
@@ -215,20 +215,20 @@ Information about all uploaded files can be retrieved through ``$request->getFil
 ``CodeIgniter\HTTP\Files\UploadedFile`` instance. This helps to ease the pain of working with uploaded files,
 and uses best practices to minimize any security risks.
 
-.. literalinclude:: incomingrequest/23.php
+.. literalinclude:: incomingrequest/023.php
    :lines: 2-
 
 See :ref:`Working with Uploaded Files <uploaded-files-accessing-files>` for the details.
 
 You can retrieve a single file uploaded on its own, based on the filename given in the HTML file input:
 
-.. literalinclude:: incomingrequest/24.php
+.. literalinclude:: incomingrequest/024.php
    :lines: 2-
 
 You can retrieve an array of same-named files uploaded as part of a
 multi-file upload, based on the filename given in the HTML file input:
 
-.. literalinclude:: incomingrequest/25.php
+.. literalinclude:: incomingrequest/025.php
    :lines: 2-
 
 .. note:: The files here correspond to ``$_FILES``. Even if a user just clicks submit button of a form and does not upload any file, the file will still exist. You can check that the file was actually uploaded by the ``isValid()`` method in UploadedFile. See :ref:`verify-a-file` for more details.
@@ -238,7 +238,7 @@ Content Negotiation
 
 You can easily negotiate content types with the request through the ``negotiate()`` method:
 
-.. literalinclude:: incomingrequest/26.php
+.. literalinclude:: incomingrequest/026.php
    :lines: 2-
 
 See the :doc:`Content Negotiation </incoming/content_negotiation>` page for more details.
@@ -303,7 +303,7 @@ The methods provided by the parent classes that are available are:
 
         The first parameter will contain the name of the REQUEST item you are looking for:
 
-        .. literalinclude:: incomingrequest/27.php
+        .. literalinclude:: incomingrequest/027.php
            :lines: 2-
 
         The method returns null if the item you are attempting to retrieve
@@ -312,7 +312,7 @@ The methods provided by the parent classes that are available are:
         The second optional parameter lets you run the data through the PHP's
         filters. Pass in the desired filter type as the second parameter:
 
-        .. literalinclude:: incomingrequest/28.php
+        .. literalinclude:: incomingrequest/028.php
            :lines: 2-
 
         To return an array of all POST items call without any parameters.
@@ -321,18 +321,18 @@ The methods provided by the parent classes that are available are:
         first parameter to null while setting the second parameter to the filter
         you want to use:
 
-        .. literalinclude:: incomingrequest/29.php
+        .. literalinclude:: incomingrequest/029.php
            :lines: 2-
 
         To return an array of multiple POST parameters, pass all the required keys as an array:
 
-        .. literalinclude:: incomingrequest/30.php
+        .. literalinclude:: incomingrequest/030.php
            :lines: 2-
 
         Same rule applied here, to retrieve the parameters with filtering, set the second parameter to
         the filter type to apply:
 
-        .. literalinclude:: incomingrequest/31.php
+        .. literalinclude:: incomingrequest/031.php
            :lines: 2-
 
     .. php:method:: getGet([$index = null[, $filter = null[, $flags = null]]])
@@ -373,7 +373,7 @@ The methods provided by the parent classes that are available are:
         It will search through both POST and GET streams for data, looking first in POST, and
         then in GET:
 
-        .. literalinclude:: incomingrequest/32.php
+        .. literalinclude:: incomingrequest/032.php
            :lines: 2-
 
     .. php:method:: getGetPost([$index = null[, $filter = null[, $flags = null]]])
@@ -390,7 +390,7 @@ The methods provided by the parent classes that are available are:
         It will search through both POST and GET streams for data, looking first in GET, and
         then in POST:
 
-        .. literalinclude:: incomingrequest/33.php
+        .. literalinclude:: incomingrequest/033.php
            :lines: 2-
 
     .. php:method:: getCookie([$index = null[, $filter = null[, $flags = null]]])
@@ -406,12 +406,12 @@ The methods provided by the parent classes that are available are:
 
         This method is identical to ``getPost()`` and ``getGet()``, only it fetches cookie data:
 
-        .. literalinclude:: incomingrequest/34.php
+        .. literalinclude:: incomingrequest/034.php
            :lines: 2-
 
         To return an array of multiple cookie values, pass all the required keys as an array:
 
-        .. literalinclude:: incomingrequest/35.php
+        .. literalinclude:: incomingrequest/035.php
            :lines: 2-
 
         .. note:: Unlike the :doc:`Cookie Helper <../helpers/cookie_helper>`
@@ -432,13 +432,13 @@ The methods provided by the parent classes that are available are:
         This method is identical to the ``getPost()``, ``getGet()`` and ``getCookie()``
         methods, only it fetches getServer data (``$_SERVER``):
 
-        .. literalinclude:: incomingrequest/36.php
+        .. literalinclude:: incomingrequest/036.php
            :lines: 2-
 
         To return an array of multiple ``$_SERVER`` values, pass all the required keys
         as an array.
 
-        .. literalinclude:: incomingrequest/37.php
+        .. literalinclude:: incomingrequest/037.php
            :lines: 2-
 
     .. php:method:: getUserAgent([$filter = null])
@@ -450,7 +450,7 @@ The methods provided by the parent classes that are available are:
 
         This method returns the User Agent string from the SERVER data:
 
-        .. literalinclude:: incomingrequest/38.php
+        .. literalinclude:: incomingrequest/038.php
            :lines: 2-
 
     .. php:method:: getPath()
diff --git a/user_guide_src/source/incoming/incomingrequest/1.php b/user_guide_src/source/incoming/incomingrequest/001.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/1.php
rename to user_guide_src/source/incoming/incomingrequest/001.php
diff --git a/user_guide_src/source/incoming/incomingrequest/2.php b/user_guide_src/source/incoming/incomingrequest/002.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/2.php
rename to user_guide_src/source/incoming/incomingrequest/002.php
diff --git a/user_guide_src/source/incoming/incomingrequest/3.php b/user_guide_src/source/incoming/incomingrequest/003.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/3.php
rename to user_guide_src/source/incoming/incomingrequest/003.php
diff --git a/user_guide_src/source/incoming/incomingrequest/4.php b/user_guide_src/source/incoming/incomingrequest/004.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/4.php
rename to user_guide_src/source/incoming/incomingrequest/004.php
diff --git a/user_guide_src/source/incoming/incomingrequest/5.php b/user_guide_src/source/incoming/incomingrequest/005.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/5.php
rename to user_guide_src/source/incoming/incomingrequest/005.php
diff --git a/user_guide_src/source/incoming/incomingrequest/6.php b/user_guide_src/source/incoming/incomingrequest/006.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/6.php
rename to user_guide_src/source/incoming/incomingrequest/006.php
diff --git a/user_guide_src/source/incoming/incomingrequest/7.php b/user_guide_src/source/incoming/incomingrequest/007.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/7.php
rename to user_guide_src/source/incoming/incomingrequest/007.php
diff --git a/user_guide_src/source/incoming/incomingrequest/8.php b/user_guide_src/source/incoming/incomingrequest/008.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/8.php
rename to user_guide_src/source/incoming/incomingrequest/008.php
diff --git a/user_guide_src/source/incoming/incomingrequest/9.php b/user_guide_src/source/incoming/incomingrequest/009.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/9.php
rename to user_guide_src/source/incoming/incomingrequest/009.php
diff --git a/user_guide_src/source/incoming/incomingrequest/10.php b/user_guide_src/source/incoming/incomingrequest/010.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/10.php
rename to user_guide_src/source/incoming/incomingrequest/010.php
diff --git a/user_guide_src/source/incoming/incomingrequest/11.php b/user_guide_src/source/incoming/incomingrequest/011.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/11.php
rename to user_guide_src/source/incoming/incomingrequest/011.php
diff --git a/user_guide_src/source/incoming/incomingrequest/12.php b/user_guide_src/source/incoming/incomingrequest/012.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/12.php
rename to user_guide_src/source/incoming/incomingrequest/012.php
diff --git a/user_guide_src/source/incoming/incomingrequest/13.php b/user_guide_src/source/incoming/incomingrequest/013.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/13.php
rename to user_guide_src/source/incoming/incomingrequest/013.php
diff --git a/user_guide_src/source/incoming/incomingrequest/14.php b/user_guide_src/source/incoming/incomingrequest/014.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/14.php
rename to user_guide_src/source/incoming/incomingrequest/014.php
diff --git a/user_guide_src/source/incoming/incomingrequest/15.php b/user_guide_src/source/incoming/incomingrequest/015.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/15.php
rename to user_guide_src/source/incoming/incomingrequest/015.php
diff --git a/user_guide_src/source/incoming/incomingrequest/16.php b/user_guide_src/source/incoming/incomingrequest/016.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/16.php
rename to user_guide_src/source/incoming/incomingrequest/016.php
diff --git a/user_guide_src/source/incoming/incomingrequest/17.php b/user_guide_src/source/incoming/incomingrequest/017.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/17.php
rename to user_guide_src/source/incoming/incomingrequest/017.php
diff --git a/user_guide_src/source/incoming/incomingrequest/18.php b/user_guide_src/source/incoming/incomingrequest/018.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/18.php
rename to user_guide_src/source/incoming/incomingrequest/018.php
diff --git a/user_guide_src/source/incoming/incomingrequest/19.php b/user_guide_src/source/incoming/incomingrequest/019.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/19.php
rename to user_guide_src/source/incoming/incomingrequest/019.php
diff --git a/user_guide_src/source/incoming/incomingrequest/20.php b/user_guide_src/source/incoming/incomingrequest/020.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/20.php
rename to user_guide_src/source/incoming/incomingrequest/020.php
diff --git a/user_guide_src/source/incoming/incomingrequest/21.php b/user_guide_src/source/incoming/incomingrequest/021.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/21.php
rename to user_guide_src/source/incoming/incomingrequest/021.php
diff --git a/user_guide_src/source/incoming/incomingrequest/22.php b/user_guide_src/source/incoming/incomingrequest/022.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/22.php
rename to user_guide_src/source/incoming/incomingrequest/022.php
diff --git a/user_guide_src/source/incoming/incomingrequest/23.php b/user_guide_src/source/incoming/incomingrequest/023.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/23.php
rename to user_guide_src/source/incoming/incomingrequest/023.php
diff --git a/user_guide_src/source/incoming/incomingrequest/24.php b/user_guide_src/source/incoming/incomingrequest/024.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/24.php
rename to user_guide_src/source/incoming/incomingrequest/024.php
diff --git a/user_guide_src/source/incoming/incomingrequest/25.php b/user_guide_src/source/incoming/incomingrequest/025.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/25.php
rename to user_guide_src/source/incoming/incomingrequest/025.php
diff --git a/user_guide_src/source/incoming/incomingrequest/26.php b/user_guide_src/source/incoming/incomingrequest/026.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/26.php
rename to user_guide_src/source/incoming/incomingrequest/026.php
diff --git a/user_guide_src/source/incoming/incomingrequest/27.php b/user_guide_src/source/incoming/incomingrequest/027.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/27.php
rename to user_guide_src/source/incoming/incomingrequest/027.php
diff --git a/user_guide_src/source/incoming/incomingrequest/28.php b/user_guide_src/source/incoming/incomingrequest/028.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/28.php
rename to user_guide_src/source/incoming/incomingrequest/028.php
diff --git a/user_guide_src/source/incoming/incomingrequest/29.php b/user_guide_src/source/incoming/incomingrequest/029.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/29.php
rename to user_guide_src/source/incoming/incomingrequest/029.php
diff --git a/user_guide_src/source/incoming/incomingrequest/30.php b/user_guide_src/source/incoming/incomingrequest/030.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/30.php
rename to user_guide_src/source/incoming/incomingrequest/030.php
diff --git a/user_guide_src/source/incoming/incomingrequest/31.php b/user_guide_src/source/incoming/incomingrequest/031.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/31.php
rename to user_guide_src/source/incoming/incomingrequest/031.php
diff --git a/user_guide_src/source/incoming/incomingrequest/32.php b/user_guide_src/source/incoming/incomingrequest/032.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/32.php
rename to user_guide_src/source/incoming/incomingrequest/032.php
diff --git a/user_guide_src/source/incoming/incomingrequest/33.php b/user_guide_src/source/incoming/incomingrequest/033.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/33.php
rename to user_guide_src/source/incoming/incomingrequest/033.php
diff --git a/user_guide_src/source/incoming/incomingrequest/34.php b/user_guide_src/source/incoming/incomingrequest/034.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/34.php
rename to user_guide_src/source/incoming/incomingrequest/034.php
diff --git a/user_guide_src/source/incoming/incomingrequest/35.php b/user_guide_src/source/incoming/incomingrequest/035.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/35.php
rename to user_guide_src/source/incoming/incomingrequest/035.php
diff --git a/user_guide_src/source/incoming/incomingrequest/36.php b/user_guide_src/source/incoming/incomingrequest/036.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/36.php
rename to user_guide_src/source/incoming/incomingrequest/036.php
diff --git a/user_guide_src/source/incoming/incomingrequest/37.php b/user_guide_src/source/incoming/incomingrequest/037.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/37.php
rename to user_guide_src/source/incoming/incomingrequest/037.php
diff --git a/user_guide_src/source/incoming/incomingrequest/38.php b/user_guide_src/source/incoming/incomingrequest/038.php
similarity index 100%
rename from user_guide_src/source/incoming/incomingrequest/38.php
rename to user_guide_src/source/incoming/incomingrequest/038.php
diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index 5eec05cf0c43..37163c1ec14d 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -179,7 +179,7 @@ Once you have created the view and set it in the configuration, it will automati
 replace the existing templates. You can create as many additional templates as you need in the configuration
 file. A common situation would be needing different styles for the frontend and the backend of your application.
 
-.. literalinclude:: pagination/013.php
+.. literalinclude:: pagination/011.php
    :lines: 2-
 
 Once configured, you can specify it as a the last parameter in the ``links()``, ``simpleLinks()``, and ``makeLinks()``
@@ -196,7 +196,7 @@ When you create a new view, you only need to create the code that is needed for
 You should not create unnecessary wrapping divs since it might be used in multiple places and you only limit their
 usefulness. It is easiest to demonstrate creating a new view by showing you the existing ``default_full`` template:
 
-.. literalinclude:: pagination/014.php
+.. literalinclude:: pagination/012.php
 
 **setSurroundCount()**
 
@@ -226,7 +226,7 @@ result set.
 Returns an array of data about all of the numbered links. Each link's array contains the uri for the link, the
 title, which is just the number, and a boolean that tells whether the link is the current/active link or not:
 
-.. literalinclude:: pagination/015.php
+.. literalinclude:: pagination/013.php
    :lines: 2-
 
 In the code presented for the standard pagination structure, the methods ``getPrevious()`` and ``getNext()`` are used to obtain the links to the previous and next pagination groups respectively.
@@ -235,7 +235,7 @@ If you want to use the pagination structure where prev and next will be links to
 
 See following an example with these changes:
 
-.. literalinclude:: pagination/016.php
+.. literalinclude:: pagination/014.php
 
 **hasPreviousPage()** & **hasNextPage()**
 
diff --git a/user_guide_src/source/libraries/pagination/011.php b/user_guide_src/source/libraries/pagination/011.php
new file mode 100644
index 000000000000..fa59edbacf9b
--- /dev/null
+++ b/user_guide_src/source/libraries/pagination/011.php
@@ -0,0 +1,7 @@
+<?php
+
+public $templates = [
+    'default_full'   => 'CodeIgniter\Pager\Views\default_full',
+    'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
+    'front_full'     => 'App\Views\Pagers\foundation_full',
+];
diff --git a/user_guide_src/source/libraries/pagination/012.php b/user_guide_src/source/libraries/pagination/012.php
new file mode 100644
index 000000000000..00bdee764c7f
--- /dev/null
+++ b/user_guide_src/source/libraries/pagination/012.php
@@ -0,0 +1,39 @@
+<?php $pager->setSurroundCount(2) ?>
+
+<nav aria-label="Page navigation">
+    <ul class="pagination">
+    <?php if ($pager->hasPrevious()) : ?>
+        <li>
+            <a href="<?= $pager->getFirst() ?>" aria-label="<?= lang('Pager.first') ?>">
+                <span aria-hidden="true"><?= lang('Pager.first') ?></span>
+            </a>
+        </li>
+        <li>
+            <a href="<?= $pager->getPrevious() ?>" aria-label="<?= lang('Pager.previous') ?>">
+                <span aria-hidden="true"><?= lang('Pager.previous') ?></span>
+            </a>
+        </li>
+    <?php endif ?>
+
+    <?php foreach ($pager->links() as $link): ?>
+        <li <?= $link['active'] ? 'class="active"' : '' ?>>
+            <a href="<?= $link['uri'] ?>">
+                <?= $link['title'] ?>
+            </a>
+        </li>
+    <?php endforeach ?>
+
+    <?php if ($pager->hasNext()) : ?>
+        <li>
+            <a href="<?= $pager->getNext() ?>" aria-label="<?= lang('Pager.next') ?>">
+                <span aria-hidden="true"><?= lang('Pager.next') ?></span>
+            </a>
+        </li>
+        <li>
+            <a href="<?= $pager->getLast() ?>" aria-label="<?= lang('Pager.last') ?>">
+                <span aria-hidden="true"><?= lang('Pager.last') ?></span>
+            </a>
+        </li>
+    <?php endif ?>
+    </ul>
+</nav>
diff --git a/user_guide_src/source/libraries/pagination/013.php b/user_guide_src/source/libraries/pagination/013.php
index fa59edbacf9b..43a8f2624d64 100644
--- a/user_guide_src/source/libraries/pagination/013.php
+++ b/user_guide_src/source/libraries/pagination/013.php
@@ -1,7 +1,7 @@
 <?php
 
-public $templates = [
-    'default_full'   => 'CodeIgniter\Pager\Views\default_full',
-    'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
-    'front_full'     => 'App\Views\Pagers\foundation_full',
+$link = [
+    'active' => false,
+    'uri'    => 'https://example.com/foo?page=2',
+    'title'  => 1,
 ];
diff --git a/user_guide_src/source/libraries/pagination/014.php b/user_guide_src/source/libraries/pagination/014.php
index 00bdee764c7f..e827bd15a457 100644
--- a/user_guide_src/source/libraries/pagination/014.php
+++ b/user_guide_src/source/libraries/pagination/014.php
@@ -1,39 +1,37 @@
-<?php $pager->setSurroundCount(2) ?>
-
-<nav aria-label="Page navigation">
+<nav aria-label="<?= lang('Pager.pageNavigation') ?>">
     <ul class="pagination">
-    <?php if ($pager->hasPrevious()) : ?>
-        <li>
-            <a href="<?= $pager->getFirst() ?>" aria-label="<?= lang('Pager.first') ?>">
-                <span aria-hidden="true"><?= lang('Pager.first') ?></span>
-            </a>
-        </li>
-        <li>
-            <a href="<?= $pager->getPrevious() ?>" aria-label="<?= lang('Pager.previous') ?>">
-                <span aria-hidden="true"><?= lang('Pager.previous') ?></span>
-            </a>
-        </li>
-    <?php endif ?>
+        <?php if ($pager->hasPreviousPage()) : ?>
+            <li>
+                <a href="<?= $pager->getFirst() ?>" aria-label="<?= lang('Pager.first') ?>">
+                    <span aria-hidden="true"><?= lang('Pager.first') ?></span>
+                </a>
+            </li>
+            <li>
+                <a href="<?= $pager->getPreviousPage() ?>" aria-label="<?= lang('Pager.previous') ?>">
+                    <span aria-hidden="true"><?= lang('Pager.previous') ?></span>
+                </a>
+            </li>
+        <?php endif ?>
 
-    <?php foreach ($pager->links() as $link): ?>
-        <li <?= $link['active'] ? 'class="active"' : '' ?>>
-            <a href="<?= $link['uri'] ?>">
-                <?= $link['title'] ?>
-            </a>
-        </li>
-    <?php endforeach ?>
+        <?php foreach ($pager->links() as $link): ?>
+            <li <?= $link['active'] ? 'class="active"' : '' ?>>
+                <a href="<?= $link['uri'] ?>">
+                    <?= $link['title'] ?>
+                </a>
+            </li>
+        <?php endforeach ?>
 
-    <?php if ($pager->hasNext()) : ?>
-        <li>
-            <a href="<?= $pager->getNext() ?>" aria-label="<?= lang('Pager.next') ?>">
-                <span aria-hidden="true"><?= lang('Pager.next') ?></span>
-            </a>
-        </li>
-        <li>
-            <a href="<?= $pager->getLast() ?>" aria-label="<?= lang('Pager.last') ?>">
-                <span aria-hidden="true"><?= lang('Pager.last') ?></span>
-            </a>
-        </li>
-    <?php endif ?>
+        <?php if ($pager->hasNextPage()) : ?>
+            <li>
+                <a href="<?= $pager->getNextPage() ?>" aria-label="<?= lang('Pager.next') ?>">
+                    <span aria-hidden="true"><?= lang('Pager.next') ?></span>
+                </a>
+            </li>
+            <li>
+                <a href="<?= $pager->getLast() ?>" aria-label="<?= lang('Pager.last') ?>">
+                    <span aria-hidden="true"><?= lang('Pager.last') ?></span>
+                </a>
+            </li>
+        <?php endif ?>
     </ul>
 </nav>
diff --git a/user_guide_src/source/libraries/pagination/015.php b/user_guide_src/source/libraries/pagination/015.php
deleted file mode 100644
index 43a8f2624d64..000000000000
--- a/user_guide_src/source/libraries/pagination/015.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-$link = [
-    'active' => false,
-    'uri'    => 'https://example.com/foo?page=2',
-    'title'  => 1,
-];
diff --git a/user_guide_src/source/libraries/pagination/016.php b/user_guide_src/source/libraries/pagination/016.php
deleted file mode 100644
index e827bd15a457..000000000000
--- a/user_guide_src/source/libraries/pagination/016.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<nav aria-label="<?= lang('Pager.pageNavigation') ?>">
-    <ul class="pagination">
-        <?php if ($pager->hasPreviousPage()) : ?>
-            <li>
-                <a href="<?= $pager->getFirst() ?>" aria-label="<?= lang('Pager.first') ?>">
-                    <span aria-hidden="true"><?= lang('Pager.first') ?></span>
-                </a>
-            </li>
-            <li>
-                <a href="<?= $pager->getPreviousPage() ?>" aria-label="<?= lang('Pager.previous') ?>">
-                    <span aria-hidden="true"><?= lang('Pager.previous') ?></span>
-                </a>
-            </li>
-        <?php endif ?>
-
-        <?php foreach ($pager->links() as $link): ?>
-            <li <?= $link['active'] ? 'class="active"' : '' ?>>
-                <a href="<?= $link['uri'] ?>">
-                    <?= $link['title'] ?>
-                </a>
-            </li>
-        <?php endforeach ?>
-
-        <?php if ($pager->hasNextPage()) : ?>
-            <li>
-                <a href="<?= $pager->getNextPage() ?>" aria-label="<?= lang('Pager.next') ?>">
-                    <span aria-hidden="true"><?= lang('Pager.next') ?></span>
-                </a>
-            </li>
-            <li>
-                <a href="<?= $pager->getLast() ?>" aria-label="<?= lang('Pager.last') ?>">
-                    <span aria-hidden="true"><?= lang('Pager.last') ?></span>
-                </a>
-            </li>
-        <?php endif ?>
-    </ul>
-</nav>
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 4f53eab33260..b4d50282c750 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -453,7 +453,7 @@ To use translated strings from language files, we can simply use the dot syntax.
 Let's say we have a file with translations located here: ``app/Languages/en/Rules.php``.
 We can simply use the language lines defined in this file, like this:
 
-.. literalinclude:: validation/026.php
+.. literalinclude:: validation/025.php
    :lines: 2-
 
 .. _validation-getting-all-errors:
@@ -463,7 +463,7 @@ Getting All Errors
 
 If you need to retrieve all error messages for failed fields, you can use the ``getErrors()`` method:
 
-.. literalinclude:: validation/027.php
+.. literalinclude:: validation/026.php
    :lines: 2-
 
 If no errors exist, an empty array will be returned.
@@ -494,7 +494,7 @@ Getting a Single Error
 You can retrieve the error for a single field with the ``getError()`` method. The only parameter is the field
 name:
 
-.. literalinclude:: validation/028.php
+.. literalinclude:: validation/027.php
    :lines: 2-
 
 If no error exists, an empty string will be returned.
@@ -506,7 +506,7 @@ Check If Error Exists
 
 You can check to see if an error exists with the ``hasError()`` method. The only parameter is the field name:
 
-.. literalinclude:: validation/029.php
+.. literalinclude:: validation/028.php
    :lines: 2-
 
 When specifying a field with a wildcard, all errors matching the mask will be checked.::
@@ -533,12 +533,12 @@ The first step is to create custom views. These can be placed anywhere that the
 which means the standard View directory, or any namespaced View folder will work. For example, you could create
 a new view at **/app/Views/_errors_list.php**:
 
-.. literalinclude:: validation/030.php
+.. literalinclude:: validation/029.php
 
 An array named ``$errors`` is available within the view that contains a list of the errors, where the key is
 the name of the field that had the error, and the value is the error message, like this:
 
-.. literalinclude:: validation/031.php
+.. literalinclude:: validation/030.php
    :lines: 2-
 
 There are actually two types of views that you can create. The first has an array of all of the errors, and is what
@@ -554,7 +554,7 @@ Once you have your views created, you need to let the Validation library know ab
 Inside, you'll find the ``$templates`` property where you can list as many custom views as you want, and provide an
 short alias they can be referenced by. If we were to add our example file from above, it would look something like:
 
-.. literalinclude:: validation/032.php
+.. literalinclude:: validation/031.php
    :lines: 2-
 
 Specifying the Template
@@ -576,7 +576,7 @@ Rules are stored within simple, namespaced classes. They can be stored any locat
 autoloader can find it. These files are called RuleSets. To add a new RuleSet, edit **Config/Validation.php** and
 add the new file to the ``$ruleSets`` array:
 
-.. literalinclude:: validation/033.php
+.. literalinclude:: validation/032.php
    :lines: 2-
 
 You can add it as either a simple string with the fully qualified class name, or using the ``::class`` suffix as
@@ -585,19 +585,19 @@ shown above. The primary benefit here is that it provides some extra navigation
 Within the file itself, each method is a rule and must accept a string as the first parameter, and must return
 a boolean true or false value signifying true if it passed the test or false if it did not:
 
-.. literalinclude:: validation/034.php
+.. literalinclude:: validation/033.php
    :lines: 2-
 
 By default, the system will look within ``CodeIgniter\Language\en\Validation.php`` for the language strings used
 within errors. In custom rules, you may provide error messages by accepting a ``$error`` variable by reference in the
 second parameter:
 
-.. literalinclude:: validation/035.php
+.. literalinclude:: validation/034.php
    :lines: 2-
 
 Your new custom rule could now be used just like any other rule:
 
-.. literalinclude:: validation/036.php
+.. literalinclude:: validation/035.php
    :lines: 2-
 
 Allowing Parameters
@@ -607,7 +607,7 @@ If your method needs to work with parameters, the function will need a minimum o
 the parameter string, and an array with all of the data that was submitted the form. The ``$data`` array is especially handy
 for rules like ``require_with`` that needs to check the value of another submitted field to base its result on:
 
-.. literalinclude:: validation/037.php
+.. literalinclude:: validation/036.php
    :lines: 2-
 
 Custom errors can be returned as the fourth parameter, just as described above.
@@ -620,7 +620,7 @@ The following is a list of all the native rules that are available to use:
 .. note:: Rule is a string; there must be **no spaces** between the parameters, especially the ``is_unique`` rule.
     There can be no spaces before and after ``ignore_value``.
 
-.. literalinclude:: validation/038.php
+.. literalinclude:: validation/037.php
    :lines: 2-
 
 ======================= ========== ============================================= ===================================================
diff --git a/user_guide_src/source/libraries/validation/025.php b/user_guide_src/source/libraries/validation/025.php
new file mode 100644
index 000000000000..50bd0147aaf2
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/025.php
@@ -0,0 +1,19 @@
+<?php
+
+$validation->setRules([
+        'username' => [
+            'label'  => 'Rules.username',
+            'rules'  => 'required|is_unique[users.username]',
+            'errors' => [
+                'required' => 'Rules.username.required',
+            ],
+        ],
+        'password' => [
+            'label'  => 'Rules.password',
+            'rules'  => 'required|min_length[10]',
+            'errors' => [
+                'min_length' => 'Rules.password.min_length',
+            ],
+        ],
+    ]
+);
diff --git a/user_guide_src/source/libraries/validation/026.php b/user_guide_src/source/libraries/validation/026.php
index 50bd0147aaf2..e633f5cdd1e3 100644
--- a/user_guide_src/source/libraries/validation/026.php
+++ b/user_guide_src/source/libraries/validation/026.php
@@ -1,19 +1,12 @@
 <?php
 
-$validation->setRules([
-        'username' => [
-            'label'  => 'Rules.username',
-            'rules'  => 'required|is_unique[users.username]',
-            'errors' => [
-                'required' => 'Rules.username.required',
-            ],
-        ],
-        'password' => [
-            'label'  => 'Rules.password',
-            'rules'  => 'required|min_length[10]',
-            'errors' => [
-                'min_length' => 'Rules.password.min_length',
-            ],
-        ],
+$errors = $validation->getErrors();
+
+/*
+   Produces:
+
+    [
+        'field1' => 'error message',
+        'field2' => 'error message',
     ]
-);
+*/
diff --git a/user_guide_src/source/libraries/validation/027.php b/user_guide_src/source/libraries/validation/027.php
index e633f5cdd1e3..2a3cffba88fc 100644
--- a/user_guide_src/source/libraries/validation/027.php
+++ b/user_guide_src/source/libraries/validation/027.php
@@ -1,12 +1,3 @@
 <?php
 
-$errors = $validation->getErrors();
-
-/*
-   Produces:
-
-    [
-        'field1' => 'error message',
-        'field2' => 'error message',
-    ]
-*/
+$error = $validation->getError('username');
diff --git a/user_guide_src/source/libraries/validation/028.php b/user_guide_src/source/libraries/validation/028.php
index 2a3cffba88fc..2334c3c00f50 100644
--- a/user_guide_src/source/libraries/validation/028.php
+++ b/user_guide_src/source/libraries/validation/028.php
@@ -1,3 +1,5 @@
 <?php
 
-$error = $validation->getError('username');
+if ($validation->hasError('username')) {
+    echo $validation->getError('username');
+}
diff --git a/user_guide_src/source/libraries/validation/029.php b/user_guide_src/source/libraries/validation/029.php
index 2334c3c00f50..f7c69eb42e99 100644
--- a/user_guide_src/source/libraries/validation/029.php
+++ b/user_guide_src/source/libraries/validation/029.php
@@ -1,5 +1,7 @@
-<?php
-
-if ($validation->hasError('username')) {
-    echo $validation->getError('username');
-}
+<div class="alert alert-danger" role="alert">
+    <ul>
+    <?php foreach ($errors as $error): ?>
+        <li><?= esc($error) ?></li>
+    <?php endforeach ?>
+    </ul>
+</div>
diff --git a/user_guide_src/source/libraries/validation/030.php b/user_guide_src/source/libraries/validation/030.php
index f7c69eb42e99..0da86ca2d054 100644
--- a/user_guide_src/source/libraries/validation/030.php
+++ b/user_guide_src/source/libraries/validation/030.php
@@ -1,7 +1,6 @@
-<div class="alert alert-danger" role="alert">
-    <ul>
-    <?php foreach ($errors as $error): ?>
-        <li><?= esc($error) ?></li>
-    <?php endforeach ?>
-    </ul>
-</div>
+<?php
+
+$errors = [
+    'username' => 'The username field must be unique.',
+    'email'    => 'You must provide a valid email address.'
+];
diff --git a/user_guide_src/source/libraries/validation/031.php b/user_guide_src/source/libraries/validation/031.php
index 0da86ca2d054..110b159a41cc 100644
--- a/user_guide_src/source/libraries/validation/031.php
+++ b/user_guide_src/source/libraries/validation/031.php
@@ -1,6 +1,7 @@
 <?php
 
-$errors = [
-    'username' => 'The username field must be unique.',
-    'email'    => 'You must provide a valid email address.'
+public $templates = [
+    'list'    => 'CodeIgniter\Validation\Views\list',
+    'single'  => 'CodeIgniter\Validation\Views\single',
+    'my_list' => '_errors_list',
 ];
diff --git a/user_guide_src/source/libraries/validation/032.php b/user_guide_src/source/libraries/validation/032.php
index 110b159a41cc..ccee27b08ad7 100644
--- a/user_guide_src/source/libraries/validation/032.php
+++ b/user_guide_src/source/libraries/validation/032.php
@@ -1,7 +1,13 @@
 <?php
 
-public $templates = [
-    'list'    => 'CodeIgniter\Validation\Views\list',
-    'single'  => 'CodeIgniter\Validation\Views\single',
-    'my_list' => '_errors_list',
+use CodeIgniter\Validation\CreditCardRules;
+use CodeIgniter\Validation\FileRules;
+use CodeIgniter\Validation\FormatRules;
+use CodeIgniter\Validation\Rules;
+
+public $ruleSets = [
+    Rules::class,
+    FormatRules::class,
+    FileRules::class,
+    CreditCardRules::class,
 ];
diff --git a/user_guide_src/source/libraries/validation/033.php b/user_guide_src/source/libraries/validation/033.php
index ccee27b08ad7..d7a10b5071cd 100644
--- a/user_guide_src/source/libraries/validation/033.php
+++ b/user_guide_src/source/libraries/validation/033.php
@@ -1,13 +1,9 @@
 <?php
 
-use CodeIgniter\Validation\CreditCardRules;
-use CodeIgniter\Validation\FileRules;
-use CodeIgniter\Validation\FormatRules;
-use CodeIgniter\Validation\Rules;
-
-public $ruleSets = [
-    Rules::class,
-    FormatRules::class,
-    FileRules::class,
-    CreditCardRules::class,
-];
+class MyRules
+{
+    public function even(string $str): bool
+    {
+        return (int) $str % 2 == 0;
+    }
+}
diff --git a/user_guide_src/source/libraries/validation/034.php b/user_guide_src/source/libraries/validation/034.php
index d7a10b5071cd..a6a9b07f54ef 100644
--- a/user_guide_src/source/libraries/validation/034.php
+++ b/user_guide_src/source/libraries/validation/034.php
@@ -1,9 +1,12 @@
 <?php
 
-class MyRules
+public function even(string $str, string &$error = null): bool
 {
-    public function even(string $str): bool
-    {
-        return (int) $str % 2 == 0;
+    if ((int) $str % 2 !== 0) {
+        $error = lang('myerrors.evenError');
+
+        return false;
     }
+
+    return true;
 }
diff --git a/user_guide_src/source/libraries/validation/035.php b/user_guide_src/source/libraries/validation/035.php
index a6a9b07f54ef..99db5f30eae4 100644
--- a/user_guide_src/source/libraries/validation/035.php
+++ b/user_guide_src/source/libraries/validation/035.php
@@ -1,12 +1,5 @@
 <?php
 
-public function even(string $str, string &$error = null): bool
-{
-    if ((int) $str % 2 !== 0) {
-        $error = lang('myerrors.evenError');
-
-        return false;
-    }
-
-    return true;
-}
+$this->validate($request, [
+    'foo' => 'required|even',
+]);
diff --git a/user_guide_src/source/libraries/validation/036.php b/user_guide_src/source/libraries/validation/036.php
index 99db5f30eae4..9511380c04f5 100644
--- a/user_guide_src/source/libraries/validation/036.php
+++ b/user_guide_src/source/libraries/validation/036.php
@@ -1,5 +1,34 @@
 <?php
 
-$this->validate($request, [
-    'foo' => 'required|even',
-]);
+public function required_with($str, string $fields, array $data): bool
+{
+    $fields = explode(',', $fields);
+
+    // If the field is present we can safely assume that
+    // the field is here, no matter whether the corresponding
+    // search field is present or not.
+    $present = $this->required($str ?? '');
+
+    if ($present) {
+        return true;
+    }
+
+    // Still here? Then we fail this test if
+    // any of the fields are present in $data
+    // as $fields is the lis
+    $requiredFields = [];
+
+    foreach ($fields as $field) {
+        if (array_key_exists($field, $data)) {
+            $requiredFields[] = $field;
+        }
+    }
+
+    // Remove any keys with empty values since, that means they
+    // weren't truly there, as far as this is concerned.
+    $requiredFields = array_filter($requiredFields, function ($item) use ($data) {
+        return ! empty($data[$item]);
+    });
+
+    return empty($requiredFields);
+}
diff --git a/user_guide_src/source/libraries/validation/037.php b/user_guide_src/source/libraries/validation/037.php
index 9511380c04f5..089b0eeaf465 100644
--- a/user_guide_src/source/libraries/validation/037.php
+++ b/user_guide_src/source/libraries/validation/037.php
@@ -1,34 +1,10 @@
 <?php
 
-public function required_with($str, string $fields, array $data): bool
-{
-    $fields = explode(',', $fields);
-
-    // If the field is present we can safely assume that
-    // the field is here, no matter whether the corresponding
-    // search field is present or not.
-    $present = $this->required($str ?? '');
-
-    if ($present) {
-        return true;
-    }
-
-    // Still here? Then we fail this test if
-    // any of the fields are present in $data
-    // as $fields is the lis
-    $requiredFields = [];
-
-    foreach ($fields as $field) {
-        if (array_key_exists($field, $data)) {
-            $requiredFields[] = $field;
-        }
-    }
-
-    // Remove any keys with empty values since, that means they
-    // weren't truly there, as far as this is concerned.
-    $requiredFields = array_filter($requiredFields, function ($item) use ($data) {
-        return ! empty($data[$item]);
-    });
-
-    return empty($requiredFields);
-}
+// is_unique[table.field,ignore_field,ignore_value]
+
+$validation->setRules([
+    'name' => "is_unique[supplier.name,uuid, $uuid]",  // is not ok
+    'name' => "is_unique[supplier.name,uuid,$uuid ]",  // is not ok
+    'name' => "is_unique[supplier.name,uuid,$uuid]",   // is ok
+    'name' => "is_unique[supplier.name,uuid,{uuid}]",  // is ok - see "Validation Placeholders"
+]);
diff --git a/user_guide_src/source/libraries/validation/038.php b/user_guide_src/source/libraries/validation/038.php
deleted file mode 100644
index 089b0eeaf465..000000000000
--- a/user_guide_src/source/libraries/validation/038.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-// is_unique[table.field,ignore_field,ignore_value]
-
-$validation->setRules([
-    'name' => "is_unique[supplier.name,uuid, $uuid]",  // is not ok
-    'name' => "is_unique[supplier.name,uuid,$uuid ]",  // is not ok
-    'name' => "is_unique[supplier.name,uuid,$uuid]",   // is ok
-    'name' => "is_unique[supplier.name,uuid,{uuid}]",  // is ok - see "Validation Placeholders"
-]);

From f2d74b2b88817518f37a627770f74e210a9f8b3b Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Thu, 24 Feb 2022 12:47:50 +0100
Subject: [PATCH 1640/2325] Fix array style in comments.

---
 user_guide_src/source/incoming/incomingrequest/013.php | 2 +-
 user_guide_src/source/libraries/uri/026.php            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/incoming/incomingrequest/013.php b/user_guide_src/source/incoming/incomingrequest/013.php
index 8f62b6dd32a9..bdb8b43b5206 100644
--- a/user_guide_src/source/incoming/incomingrequest/013.php
+++ b/user_guide_src/source/incoming/incomingrequest/013.php
@@ -7,6 +7,6 @@
 
     [
         'Param1' => 'Value1',
-        'Param2' => 'Value2'
+        'Param2' => 'Value2',
     ]
 */
diff --git a/user_guide_src/source/libraries/uri/026.php b/user_guide_src/source/libraries/uri/026.php
index 6491e0d20ca4..60c076bc13cf 100644
--- a/user_guide_src/source/libraries/uri/026.php
+++ b/user_guide_src/source/libraries/uri/026.php
@@ -8,6 +8,6 @@
     [
         0 => 'users',
         1 => '15',
-        2 => 'profile'
+        2 => 'profile',
     ]
 */

From 65f4cdb732dd10b954f2bedceabdfa8836a3f3da Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Thu, 24 Feb 2022 14:16:51 +0100
Subject: [PATCH 1641/2325] Revert extraction of uploaded_files array.

---
 .../source/libraries/uploaded_files.rst       | 35 +++++++++++++------
 .../source/libraries/uploaded_files/004.php   |  5 ---
 .../source/libraries/uploaded_files/005.php   |  9 -----
 .../source/libraries/uploaded_files/006.php   | 12 -------
 4 files changed, 25 insertions(+), 36 deletions(-)
 delete mode 100644 user_guide_src/source/libraries/uploaded_files/004.php
 delete mode 100644 user_guide_src/source/libraries/uploaded_files/005.php
 delete mode 100644 user_guide_src/source/libraries/uploaded_files/006.php

diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index 265eb87dc20a..198868d19c52 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -122,10 +122,11 @@ The array returns in a manner that you would expect. With the simplest usage, a
 
     <input type="file" name="avatar" />
 
-Which would return a simple array like:
+Which would return a simple array like::
 
-.. literalinclude:: uploaded_files/004.php
-   :lines: 2-
+    [
+        'avatar' => // UploadedFile instance,
+    ];
 
 .. note:: The UploadedFile instance corresponds to ``$_FILES``. Even if a user just clicks the submit button and does not upload any file, the instance will still exist. You can check that the file was actually uploaded by the ``isValid()`` method in UploadedFile. See :ref:`verify-a-file`.
 
@@ -133,20 +134,34 @@ If you used an array notation for the name, the input would look something like:
 
     <input type="file" name="my-form[details][avatar]" />
 
-The array returned by ``getFiles()`` would look more like this:
+The array returned by ``getFiles()`` would look more like this::
+
+    [
+         'my-form' => [
+            'details' => [
+                'avatar' => '...' // UploadedFile instance
+            ],
+        ],
+    ]
 
-.. literalinclude:: uploaded_files/005.php
-   :lines: 2-
 
 In some cases, you may specify an array of files to upload::
 
     Upload an avatar: <input type="file" name="my-form[details][avatars][]" />
     Upload an avatar: <input type="file" name="my-form[details][avatars][]" />
 
-In this case, the returned array of files would be more like:
-
-.. literalinclude:: uploaded_files/006.php
-   :lines: 2-
+In this case, the returned array of files would be more like::
+
+    [
+        'my-form' => [
+            'details' => [
+                'avatar' => [
+                    0 => // UploadedFile instance,
+                    1 => // UploadedFile instance,
+                ],
+            ],
+        ],
+    ]
 
 Single File
 ===========
diff --git a/user_guide_src/source/libraries/uploaded_files/004.php b/user_guide_src/source/libraries/uploaded_files/004.php
deleted file mode 100644
index 51b1732bc522..000000000000
--- a/user_guide_src/source/libraries/uploaded_files/004.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-[
-    'avatar' => '...' // UploadedFile instance
-];
diff --git a/user_guide_src/source/libraries/uploaded_files/005.php b/user_guide_src/source/libraries/uploaded_files/005.php
deleted file mode 100644
index 190021513ef5..000000000000
--- a/user_guide_src/source/libraries/uploaded_files/005.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-[
-    'my-form' => [
-        'details' => [
-            'avatar' => '...' // UploadedFile instance
-        ]
-    ]
-];
diff --git a/user_guide_src/source/libraries/uploaded_files/006.php b/user_guide_src/source/libraries/uploaded_files/006.php
deleted file mode 100644
index f046d86b63bc..000000000000
--- a/user_guide_src/source/libraries/uploaded_files/006.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-[
-    'my-form' => [
-        'details' => [
-            'avatar' => [
-                0 => '...' /* UploadedFile instance */,
-                1 => '...' /* UploadedFile instance */
-            ]
-        ]
-    ]
-];

From 5a685df6d89cc91ed5f3891f9daba60b46056c2a Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Thu, 24 Feb 2022 14:23:49 +0100
Subject: [PATCH 1642/2325] Fix sessions examples.

---
 user_guide_src/source/libraries/sessions.rst     | 5 ++---
 user_guide_src/source/libraries/sessions/002.php | 3 ---
 user_guide_src/source/libraries/sessions/005.php | 2 +-
 user_guide_src/source/libraries/sessions/006.php | 2 +-
 user_guide_src/source/libraries/sessions/007.php | 2 +-
 user_guide_src/source/libraries/sessions/008.php | 2 +-
 user_guide_src/source/libraries/sessions/010.php | 4 ++--
 user_guide_src/source/libraries/sessions/014.php | 4 +++-
 user_guide_src/source/libraries/sessions/024.php | 2 +-
 user_guide_src/source/libraries/sessions/033.php | 2 +-
 10 files changed, 13 insertions(+), 15 deletions(-)
 delete mode 100644 user_guide_src/source/libraries/sessions/002.php

diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
index ad45f9fea4f3..911ea5645ec6 100644
--- a/user_guide_src/source/libraries/sessions.rst
+++ b/user_guide_src/source/libraries/sessions.rst
@@ -30,10 +30,9 @@ The ``$config`` parameter is optional - your application configuration.
 If not provided, the services register will instantiate your default
 one.
 
-Once loaded, the Sessions library object will be available using:
+Once loaded, the Sessions library object will be available using::
 
-.. literalinclude:: sessions/002.php
-   :lines: 2-
+    $session
 
 Alternatively, you can use the helper function that will use the default
 configuration options. This version is a little friendlier to read,
diff --git a/user_guide_src/source/libraries/sessions/002.php b/user_guide_src/source/libraries/sessions/002.php
deleted file mode 100644
index 2ed7fb3cda92..000000000000
--- a/user_guide_src/source/libraries/sessions/002.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$session;
diff --git a/user_guide_src/source/libraries/sessions/005.php b/user_guide_src/source/libraries/sessions/005.php
index 02fecf74f1b2..ec1e40879798 100644
--- a/user_guide_src/source/libraries/sessions/005.php
+++ b/user_guide_src/source/libraries/sessions/005.php
@@ -1,3 +1,3 @@
 <?php
 
-$_SESSION['item'];
+$item = $_SESSION['item'];
diff --git a/user_guide_src/source/libraries/sessions/006.php b/user_guide_src/source/libraries/sessions/006.php
index 2688d7427618..3248324f7ee6 100644
--- a/user_guide_src/source/libraries/sessions/006.php
+++ b/user_guide_src/source/libraries/sessions/006.php
@@ -1,3 +1,3 @@
 <?php
 
-$session->get('item');
+$item = $session->get('item');
diff --git a/user_guide_src/source/libraries/sessions/007.php b/user_guide_src/source/libraries/sessions/007.php
index a3537d4344ff..180d52833615 100644
--- a/user_guide_src/source/libraries/sessions/007.php
+++ b/user_guide_src/source/libraries/sessions/007.php
@@ -1,3 +1,3 @@
 <?php
 
-$session->item;
+$item = $session->item;
diff --git a/user_guide_src/source/libraries/sessions/008.php b/user_guide_src/source/libraries/sessions/008.php
index ebe59d510994..2825b97d5c4b 100644
--- a/user_guide_src/source/libraries/sessions/008.php
+++ b/user_guide_src/source/libraries/sessions/008.php
@@ -1,3 +1,3 @@
 <?php
 
-session('item');
+$item = session('item');
diff --git a/user_guide_src/source/libraries/sessions/010.php b/user_guide_src/source/libraries/sessions/010.php
index c65740c91dbb..fd3471eba73e 100644
--- a/user_guide_src/source/libraries/sessions/010.php
+++ b/user_guide_src/source/libraries/sessions/010.php
@@ -1,7 +1,7 @@
 <?php
 
-$_SESSION;
+$userData = $_SESSION;
 
 // or:
 
-$session->get();
+$userData = $session->get();
diff --git a/user_guide_src/source/libraries/sessions/014.php b/user_guide_src/source/libraries/sessions/014.php
index 96a8903ea825..50b76d2409b5 100644
--- a/user_guide_src/source/libraries/sessions/014.php
+++ b/user_guide_src/source/libraries/sessions/014.php
@@ -2,4 +2,6 @@
 
 // returns false if the 'some_name' item doesn't exist or is null,
 // true otherwise:
-isset($_SESSION['some_name']);
+if(isset($_SESSION['some_name'])) {
+    // ...
+}
diff --git a/user_guide_src/source/libraries/sessions/024.php b/user_guide_src/source/libraries/sessions/024.php
index 02fecf74f1b2..ec1e40879798 100644
--- a/user_guide_src/source/libraries/sessions/024.php
+++ b/user_guide_src/source/libraries/sessions/024.php
@@ -1,3 +1,3 @@
 <?php
 
-$_SESSION['item'];
+$item = $_SESSION['item'];
diff --git a/user_guide_src/source/libraries/sessions/033.php b/user_guide_src/source/libraries/sessions/033.php
index 02fecf74f1b2..ec1e40879798 100644
--- a/user_guide_src/source/libraries/sessions/033.php
+++ b/user_guide_src/source/libraries/sessions/033.php
@@ -1,3 +1,3 @@
 <?php
 
-$_SESSION['item'];
+$item = $_SESSION['item'];

From ae6cee724ae3ff08a3b8426aecfff4aeda0ce2fd Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Thu, 24 Feb 2022 08:15:30 -0600
Subject: [PATCH 1643/2325] Revert "junk"

---
 .github/workflows/deploy-userguide.yml | 53 --------------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 .github/workflows/deploy-userguide.yml

diff --git a/.github/workflows/deploy-userguide.yml b/.github/workflows/deploy-userguide.yml
deleted file mode 100644
index ad0b48ae6559..000000000000
--- a/.github/workflows/deploy-userguide.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-# When changes are pushed to the master branch,
-# build the current version of the User Guide
-# with Sphinx and deploy it to the production server.
-#
-# @todo Consolidate checkouts
-name: Deploy User Guide
-
-on:
-  push:
-    branches:
-      - 'master'
-    paths:
-      - 'user_guide_src/**'
-
-jobs:
-  build:
-    name: Deploy to production
-    if: (github.repository == 'codeigniter4/CodeIgniter4')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      # Build the latest User Guide
-      - name: Build with Sphinx
-        uses: ammaraskar/sphinx-action@0.4
-        with:
-          docs-folder: user_guide_src/
-
-      # Create an artifact of the html output
-      - name: Upload artifact
-        uses: actions/upload-artifact@v2
-        with:
-          name: HTML Documentation
-          path: user_guide_src/build/html/
-
-      - name: Install SSH key
-        uses: shimataro/ssh-key-action@v2
-        with:
-          key: ${{ secrets.DEPLOY_KEY }}
-          name: id_rsa
-          known_hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
-
-      - name: Deploy to Webserver
-        uses: yeshan333/rsync-deploy-action@main
-        id: rsync-deploy-action
-        with:
-          ssh_login_username: ${{ secrets.DEPLOY_USER }}
-          remote_server_ip: ${{ secrets.DEPLOY_SSH_BOX }}
-          ssh_port: ${{ secrets.DEPLOY_PORT }}
-          ssh_private_key: ${{ secrets.DEPLOY_KEY }}
-          source_path: "user_guide_src/build/html/*"
-          destination_path: "/home/public_html/userguides/user_guide_4/"

From 2b4c7bb7bbffca7845c86b21bdb4d5d21ded8001 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Fri, 25 Feb 2022 06:32:24 +0800
Subject: [PATCH 1644/2325] doc

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 user_guide_src/source/changelogs/v4.2.0.rst      | 2 +-
 user_guide_src/source/database/query_builder.rst | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index a1660d8cf8ca..6f683aecd9ec 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -24,7 +24,7 @@ Enhancements
     - See :ref:`content-security-policy` for details.
 - New View Decorators allow modifying the generated HTML prior to caching.
 - Added Subqueries in the FROM section. See :ref:`query-builder-from-subquery`.
-- Added Subqueries in the SELECT section.
+- Added Subqueries in the SELECT section. See :ref:`query-builder-select-subquery`.
 - Added Validation Strict Rules. See :ref:`validation-traditional-and-strict-rules`.
 - Added new OCI8 driver for database.
     - It can access Oracle Database and supports SQL and PL/SQL statements.
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 0a1861e23810..faa3adc5924b 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -167,6 +167,8 @@ the resulting field.
 .. literalinclude:: query_builder/014.php
    :lines: 2-
 
+.. _query-builder-select-subquery:
+
 **$builder->selectSubquery()**
 
 Adds a subquery to the SELECT section.

From 143cf3545b204043ec858134301810519a6df39c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 25 Feb 2022 09:15:41 +0900
Subject: [PATCH 1645/2325] fix: TypeError when `$tokenRandomize = true` and no
 token posted

---
 system/Security/Security.php                      |  6 ++++--
 .../SecurityCSRFSessionRandomizeTokenTest.php     | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/system/Security/Security.php b/system/Security/Security.php
index b9309797f580..4d52f9317bc6 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -277,8 +277,10 @@ public function verify(RequestInterface $request)
             return $this;
         }
 
-        $token = $this->tokenRandomize ? $this->derandomize($this->getPostedToken($request))
-            : $this->getPostedToken($request);
+        $rawToken = $this->getPostedToken($request);
+        if ($rawToken !== null) {
+            $token = $this->tokenRandomize ? $this->derandomize($rawToken) : $rawToken;
+        }
 
         // Do the tokens match?
         if (! isset($token, $this->hash) || ! hash_equals($this->hash, $token)) {
diff --git a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
index ea416f896a96..97b3330e8f24 100644
--- a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
+++ b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
@@ -108,6 +108,21 @@ public function testHashIsReadFromSession()
         );
     }
 
+    public function testCSRFVerifyPostNoToken()
+    {
+        $this->expectException(SecurityException::class);
+        $this->expectExceptionMessage('The action you requested is not allowed.');
+
+        $_SERVER['REQUEST_METHOD'] = 'POST';
+        unset($_POST['csrf_test_name']);
+
+        $request = new IncomingRequest(new MockAppConfig(), new URI('http://badurl.com'), null, new UserAgent());
+
+        $security = new Security(new MockAppConfig());
+
+        $security->verify($request);
+    }
+
     public function testCSRFVerifyPostThrowsExceptionOnNoMatch()
     {
         $this->expectException(SecurityException::class);

From e7cd0c62015170a87b8cf037a998e8711f1a40a9 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Fri, 25 Feb 2022 08:46:03 +0800
Subject: [PATCH 1646/2325] Checking if the subquery uses the same object as
 the main query

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/Database/BaseBuilder.php            |  4 ++++
 tests/system/Database/Builder/BaseTest.php | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index ccfa5bd9d8bb..842aae3c8a29 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -2763,6 +2763,10 @@ protected function buildSubquery($builder, bool $wrapped = false, string $alias
             $builder($builder = $this->db->newQuery());
         }
 
+        if ($builder === $this) {
+            throw new DatabaseException('The subquery cannot be the same object as the main query object.');
+        }
+
         $subquery = strtr($builder->getCompiledSelect(), "\n", ' ');
 
         if ($wrapped) {
diff --git a/tests/system/Database/Builder/BaseTest.php b/tests/system/Database/Builder/BaseTest.php
index 1390e4668200..5a2a4f1578db 100644
--- a/tests/system/Database/Builder/BaseTest.php
+++ b/tests/system/Database/Builder/BaseTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Database\Builder;
 
+use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
@@ -53,4 +54,15 @@ public function testGetTableIgnoresFrom()
         $result = $builder->getTable();
         $this->assertSame('jobs', $result);
     }
+
+    public function testSubquerySameBaseBuilderObject()
+    {
+        $this->expectException(DatabaseException::class);
+        $this->expectExceptionMessage('The subquery cannot be the same object as the main query object.');
+
+        $builder = $this->db->table('users');
+
+        $builder->fromSubquery($builder, 'sub');
+        $builder->getCompiledSelect();
+    }
 }

From ab420a71e692b3d02f98abd7aa21ad99f7c04dc5 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Fri, 25 Feb 2022 08:57:07 +0800
Subject: [PATCH 1647/2325] Fix

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/Database/BaseBuilder.php                      | 4 +++-
 user_guide_src/source/changelogs/v4.2.0.rst          | 2 +-
 user_guide_src/source/database/query_builder.rst     | 4 ++--
 user_guide_src/source/database/query_builder/098.php | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 92d35945565e..cb9efc1664e9 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -453,7 +453,9 @@ public function selectCount(string $select = '', string $alias = '')
     public function selectSubquery(BaseBuilder $subquery, string $as)
     {
         if (! $this->isSubquery($subquery)) {
-            throw new DatabaseException('The BaseBuilder::selectSubquery method expects a BaseBuilder instance');
+            throw new DatabaseException(
+                'The BaseBuilder::selectSubquery() method expects a BaseBuilder instance.'
+            );
         }
 
         $this->QBSelect[] = $this->buildSubquery($subquery, true, $as);
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 6f683aecd9ec..9751dd06fee0 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -24,7 +24,7 @@ Enhancements
     - See :ref:`content-security-policy` for details.
 - New View Decorators allow modifying the generated HTML prior to caching.
 - Added Subqueries in the FROM section. See :ref:`query-builder-from-subquery`.
-- Added Subqueries in the SELECT section. See :ref:`query-builder-select-subquery`.
+- Added Subqueries in the SELECT section. See :ref:`query-builder-select`.
 - Added Validation Strict Rules. See :ref:`validation-traditional-and-strict-rules`.
 - Added new OCI8 driver for database.
     - It can access Oracle Database and supports SQL and PL/SQL statements.
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index faa3adc5924b..a4a240471053 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -98,6 +98,8 @@ method:
 
 Please read about the ``where()`` method below for more information.
 
+.. _query-builder-select:
+
 Select
 ======
 
@@ -167,8 +169,6 @@ the resulting field.
 .. literalinclude:: query_builder/014.php
    :lines: 2-
 
-.. _query-builder-select-subquery:
-
 **$builder->selectSubquery()**
 
 Adds a subquery to the SELECT section.
diff --git a/user_guide_src/source/database/query_builder/098.php b/user_guide_src/source/database/query_builder/098.php
index 96d1d0d9025b..e9be12b58273 100644
--- a/user_guide_src/source/database/query_builder/098.php
+++ b/user_guide_src/source/database/query_builder/098.php
@@ -4,4 +4,4 @@
 $builder  = $db->table('users')->select('name')->selectSubquery($subquery, 'country');
 $query = $builder->get();
 
-// Produces: SELECT `name`, (SELECT `name` FROM `countries` WHERE `id` = 1) AS `country` FROM `users`
\ No newline at end of file
+// Produces: SELECT `name`, (SELECT `name` FROM `countries` WHERE `id` = 1) AS `country` FROM `users`

From 3c047af726b56cfa6369d24829a4b410410f319c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 25 Feb 2022 10:57:01 +0900
Subject: [PATCH 1648/2325] docs: fix @return

---
 system/Filters/CSRF.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/Filters/CSRF.php b/system/Filters/CSRF.php
index 02894491de8d..9cce85fb7ada 100644
--- a/system/Filters/CSRF.php
+++ b/system/Filters/CSRF.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Filters;
 
+use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Security\Exceptions\SecurityException;
@@ -39,7 +40,7 @@ class CSRF implements FilterInterface
      *
      * @throws SecurityException
      *
-     * @return mixed|void
+     * @return RedirectResponse|void
      */
     public function before(RequestInterface $request, $arguments = null)
     {
@@ -65,7 +66,7 @@ public function before(RequestInterface $request, $arguments = null)
      *
      * @param array|null $arguments
      *
-     * @return mixed|void
+     * @return void
      */
     public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
     {

From cd01a650e46170b3e9e340ddea5ad130e8b167b4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 25 Feb 2022 13:01:54 +0900
Subject: [PATCH 1649/2325] chore: update Kint to 4.1.2 in ThirdParty

---
 system/ThirdParty/Kint/Kint.php               |  6 +++---
 .../Kint/Parser/TimestampPlugin.php           |  4 ++++
 .../ThirdParty/Kint/Renderer/CliRenderer.php  |  2 +-
 system/ThirdParty/Kint/init_helpers.php       | 20 ++++++++-----------
 .../Kint/resources/compiled/aante-light.css   |  2 +-
 .../Kint/resources/compiled/original.css      |  2 +-
 .../Kint/resources/compiled/rich.js           |  2 +-
 .../resources/compiled/solarized-dark.css     |  2 +-
 .../Kint/resources/compiled/solarized.css     |  2 +-
 9 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/system/ThirdParty/Kint/Kint.php b/system/ThirdParty/Kint/Kint.php
index f11ed498c45f..e2145b062cf4 100644
--- a/system/ThirdParty/Kint/Kint.php
+++ b/system/ThirdParty/Kint/Kint.php
@@ -548,9 +548,11 @@ public static function trace()
      *
      * Functionally equivalent to Kint::dump(1) or Kint::dump(debug_backtrace())
      *
+     * @param mixed ...$args
+     *
      * @return int|string
      */
-    public static function dump()
+    public static function dump(...$args)
     {
         if (false === static::$enabled_mode) {
             return 0;
@@ -558,8 +560,6 @@ public static function dump()
 
         Utils::normalizeAliases(static::$aliases);
 
-        $args = \func_get_args();
-
         $call_info = static::getCallInfo(static::$aliases, \debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS), \count($args));
 
         $statics = static::getStatics();
diff --git a/system/ThirdParty/Kint/Parser/TimestampPlugin.php b/system/ThirdParty/Kint/Parser/TimestampPlugin.php
index fa8d743dea89..9e08c455c8a9 100644
--- a/system/ThirdParty/Kint/Parser/TimestampPlugin.php
+++ b/system/ThirdParty/Kint/Parser/TimestampPlugin.php
@@ -52,6 +52,10 @@ public function parse(&$var, Value &$o, $trigger)
             return;
         }
 
+        if ($var < 0) {
+            return;
+        }
+
         if (\in_array($var, self::$blacklist, true)) {
             return;
         }
diff --git a/system/ThirdParty/Kint/Renderer/CliRenderer.php b/system/ThirdParty/Kint/Renderer/CliRenderer.php
index 12b18d036b62..ae626167ad36 100644
--- a/system/ThirdParty/Kint/Renderer/CliRenderer.php
+++ b/system/ThirdParty/Kint/Renderer/CliRenderer.php
@@ -32,7 +32,7 @@
 class CliRenderer extends TextRenderer
 {
     /**
-     * @var bool enable colors when Kint is run in *UNIX* command line
+     * @var bool enable colors
      */
     public static $cli_colors = true;
 
diff --git a/system/ThirdParty/Kint/init_helpers.php b/system/ThirdParty/Kint/init_helpers.php
index 3dca84c35f08..8cd0fdb9fe9e 100644
--- a/system/ThirdParty/Kint/init_helpers.php
+++ b/system/ThirdParty/Kint/init_helpers.php
@@ -30,13 +30,13 @@
     /**
      * Alias of Kint::dump().
      *
+     * @param mixed ...$args
+     *
      * @return int|string
      */
-    function d()
+    function d(...$args)
     {
-        $args = \func_get_args();
-
-        return \call_user_func_array(['Kint', 'dump'], $args);
+        return Kint::dump(...$args);
     }
 
     Kint::$aliases[] = 'd';
@@ -49,16 +49,13 @@ function d()
      * Alias of Kint::dump(), however the output is in plain htmlescaped text
      * with some minor visibility enhancements added.
      *
-     * If run in CLI mode, output is not escaped.
-     *
-     * To force rendering mode without autodetecting anything:
+     * If run in CLI colors are disabled
      *
-     * Kint::$enabled_mode = Kint::MODE_PLAIN;
-     * Kint::dump( $variable );
+     * @param mixed ...$args
      *
      * @return int|string
      */
-    function s()
+    function s(...$args)
     {
         if (false === Kint::$enabled_mode) {
             return 0;
@@ -77,8 +74,7 @@ function s()
 
         CliRenderer::$cli_colors = false;
 
-        $args = \func_get_args();
-        $out = \call_user_func_array(['Kint', 'dump'], $args);
+        $out = Kint::dump(...$args);
 
         Kint::$enabled_mode = $kstash;
         CliRenderer::$cli_colors = $cstash;
diff --git a/system/ThirdParty/Kint/resources/compiled/aante-light.css b/system/ThirdParty/Kint/resources/compiled/aante-light.css
index dc7a40a73489..832dee718de4 100644
--- a/system/ThirdParty/Kint/resources/compiled/aante-light.css
+++ b/system/ThirdParty/Kint/resources/compiled/aante-light.css
@@ -1 +1 @@
-.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,0.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:8px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#aaa;color:#1d1e1e}.kint-rich .kint-focused{box-shadow:0 0 3px 2px red}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#1d1e1e;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:8px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#f8f8f8;border:1px solid #d7d7d7;color:#1d1e1e;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:4px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#aaa}.kint-rich>dl dl{padding:0 0 0 12px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxwYXRoIGQ9Ik02IDdoMThsLTkgMTV6bTAgMzBoMThsLTkgMTV6bTAgNDVoMThsLTktMTV6bTAgMzBoMThsLTktMTV6bTAgMTJsMTggMThtLTE4IDBsMTgtMTgiIGZpbGw9IiM1NTUiLz48cGF0aCBkPSJNNiAxMjZsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSIjNTU1Ii8+PC9zdmc+") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #d7d7d7}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#06f;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:red}.kint-rich dfn{font-style:normal;font-family:monospace;color:#1d1e1e}.kint-rich pre{color:#1d1e1e;margin:0 0 0 12px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #d7d7d7;background:#f8f8f8;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(29,30,30,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#f8f8f8;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#1d1e1e;background:#f8f8f8}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #d7d7d7;border-top-width:0;border-bottom-width:0;padding:4px;float:right !important;margin:-4px 0;color:#1d1e1e;background:#f8f8f8;height:24px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#f8f8f8;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#f8f8f8}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#f8f8f8;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#1d1e1e}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#1d1e1e;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#1d1e1e;border-bottom:1px dotted #1d1e1e}.kint-rich ul{list-style:none;padding-left:12px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #d7d7d7}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 12px;padding-left:0;background:#f8f8f8;border:1px solid #d7d7d7;border-top:0}.kint-rich ul.kint-tabs>li{background:#f8f8f8;border:1px solid #d7d7d7;cursor:pointer;display:inline-block;height:24px;margin:2px;padding:0 12px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#aaa;color:red}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#f8f8f8;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:20px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#aaa;color:red}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #d7d7d7;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#aaa}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #d7d7d7;padding:2px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#f8f8f8;color:#1d1e1e}.kint-rich table td{background:#f8f8f8;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #aaa inset}.kint-rich table tr:hover var{color:red}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:4px;padding-bottom:4px;border-bottom:1px solid #f8f8f8}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #aaa;padding-right:8px;margin-right:8px}.kint-rich pre.kint-source>div.kint-highlight{background:#f8f8f8}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #aaa,0 1px #aaa,1px 0 #aaa,0 -1px #aaa;color:#f8f8f8;font-weight:bold}.kint-rich .kint-focused{box-shadow:0 0 3px 2px red}.kint-rich dt{font-weight:normal}.kint-rich dt.kint-parent{margin-top:4px}.kint-rich dl dl{margin-top:4px;padding-left:25px;border-left:none}.kint-rich>dl>dt{background:#f8f8f8}.kint-rich ul{margin:0;padding-left:0}.kint-rich ul:not(.kint-tabs)>li{border-left:0}.kint-rich ul.kint-tabs{background:#f8f8f8;border:1px solid #d7d7d7;border-width:0 1px 1px 1px;padding:4px 0 0 12px;margin-left:-1px;margin-top:-1px}.kint-rich ul.kint-tabs li,.kint-rich ul.kint-tabs li+li{margin:0 0 0 4px}.kint-rich ul.kint-tabs li{border-bottom-width:0;height:25px}.kint-rich ul.kint-tabs li:first-child{margin-left:0}.kint-rich ul.kint-tabs li.kint-active-tab{border-top:1px solid #d7d7d7;background:#fff;font-weight:bold;padding-top:0;border-bottom:1px solid #fff !important;margin-bottom:-1px}.kint-rich ul.kint-tabs li.kint-active-tab:hover{border-bottom:1px solid #fff}.kint-rich ul>li>pre{border:1px solid #d7d7d7}.kint-rich dt:hover+dd>ul{border-color:#aaa}.kint-rich pre{background:#fff;margin-top:4px;margin-left:25px}.kint-rich .kint-source{margin-left:-1px}.kint-rich .kint-source .kint-highlight{background:#cfc}.kint-rich .kint-parent.kint-show>.kint-search{border-bottom-width:1px}.kint-rich table td{background:#fff}.kint-rich table td>dl{padding:0;margin:0}.kint-rich table td>dl>dt.kint-parent{margin:0}.kint-rich table td:first-child,.kint-rich table td,.kint-rich table th{padding:2px 4px}.kint-rich table dd,.kint-rich table dt{background:#fff}.kint-rich table tr:hover>td{box-shadow:none;background:#cfc}
+.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,0.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:8px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#aaa;color:#1d1e1e}.kint-rich .kint-focused{box-shadow:0 0 3px 2px red}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#1d1e1e;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:8px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#f8f8f8;border:1px solid #d7d7d7;color:#1d1e1e;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:4px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#aaa}.kint-rich>dl dl{padding:0 0 0 12px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxwYXRoIGQ9Ik02IDdoMThsLTkgMTV6bTAgMzBoMThsLTkgMTV6bTAgNDVoMThsLTktMTV6bTAgMzBoMThsLTktMTV6bTAgMTJsMTggMThtLTE4IDBsMTgtMTgiIGZpbGw9IiM1NTUiLz48cGF0aCBkPSJNNiAxMjZsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZS13aWR0aD0iMiIgc3Ryb2tlPSIjNTU1Ii8+PC9zdmc+") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #d7d7d7}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#06f;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:red}.kint-rich dfn{font-style:normal;font-family:monospace;color:#1d1e1e}.kint-rich pre{color:#1d1e1e;margin:0 0 0 12px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #d7d7d7;background:#f8f8f8;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(29,30,30,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#f8f8f8;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#1d1e1e;background:#f8f8f8}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #d7d7d7;border-top-width:0;border-bottom-width:0;padding:4px;float:right !important;margin:-4px 0;color:#1d1e1e;background:#f8f8f8;height:24px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#f8f8f8;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#f8f8f8}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#f8f8f8;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#1d1e1e}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#1d1e1e;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#1d1e1e;border-bottom:1px dotted #1d1e1e}.kint-rich ul{list-style:none;padding-left:12px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #d7d7d7}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 12px;padding-left:0;background:#f8f8f8;border:1px solid #d7d7d7;border-top:0}.kint-rich ul.kint-tabs>li{background:#f8f8f8;border:1px solid #d7d7d7;cursor:pointer;display:inline-block;height:24px;margin:2px;padding:0 12px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#aaa;color:red}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#f8f8f8;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:20px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#aaa;color:red}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #d7d7d7;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#aaa}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #d7d7d7;padding:2px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#f8f8f8;color:#1d1e1e}.kint-rich table td{background:#f8f8f8;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #aaa inset}.kint-rich table tr:hover var{color:red}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:4px;padding-bottom:4px;border-bottom:1px solid #f8f8f8}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #aaa;padding-right:8px;margin-right:8px}.kint-rich pre.kint-source>div.kint-highlight{background:#f8f8f8}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #aaa,0 1px #aaa,1px 0 #aaa,0 -1px #aaa;color:#f8f8f8;font-weight:bold}input.kint-note-input{width:100%}.kint-rich .kint-focused{box-shadow:0 0 3px 2px red}.kint-rich dt{font-weight:normal}.kint-rich dt.kint-parent{margin-top:4px}.kint-rich dl dl{margin-top:4px;padding-left:25px;border-left:none}.kint-rich>dl>dt{background:#f8f8f8}.kint-rich ul{margin:0;padding-left:0}.kint-rich ul:not(.kint-tabs)>li{border-left:0}.kint-rich ul.kint-tabs{background:#f8f8f8;border:1px solid #d7d7d7;border-width:0 1px 1px 1px;padding:4px 0 0 12px;margin-left:-1px;margin-top:-1px}.kint-rich ul.kint-tabs li,.kint-rich ul.kint-tabs li+li{margin:0 0 0 4px}.kint-rich ul.kint-tabs li{border-bottom-width:0;height:25px}.kint-rich ul.kint-tabs li:first-child{margin-left:0}.kint-rich ul.kint-tabs li.kint-active-tab{border-top:1px solid #d7d7d7;background:#fff;font-weight:bold;padding-top:0;border-bottom:1px solid #fff !important;margin-bottom:-1px}.kint-rich ul.kint-tabs li.kint-active-tab:hover{border-bottom:1px solid #fff}.kint-rich ul>li>pre{border:1px solid #d7d7d7}.kint-rich dt:hover+dd>ul{border-color:#aaa}.kint-rich pre{background:#fff;margin-top:4px;margin-left:25px}.kint-rich .kint-source{margin-left:-1px}.kint-rich .kint-source .kint-highlight{background:#cfc}.kint-rich .kint-parent.kint-show>.kint-search{border-bottom-width:1px}.kint-rich table td{background:#fff}.kint-rich table td>dl{padding:0;margin:0}.kint-rich table td>dl>dt.kint-parent{margin:0}.kint-rich table td:first-child,.kint-rich table td,.kint-rich table th{padding:2px 4px}.kint-rich table dd,.kint-rich table dt{background:#fff}.kint-rich table tr:hover>td{box-shadow:none;background:#cfc}
diff --git a/system/ThirdParty/Kint/resources/compiled/original.css b/system/ThirdParty/Kint/resources/compiled/original.css
index 4a320a6835c8..e3c2bf413adb 100644
--- a/system/ThirdParty/Kint/resources/compiled/original.css
+++ b/system/ThirdParty/Kint/resources/compiled/original.css
@@ -1 +1 @@
-.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,0.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:8px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#0092db;color:#1d1e1e}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #5cb730}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#1d1e1e;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:8px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#e0eaef;border:1px solid #b6cedb;color:#1d1e1e;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:4px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#0092db}.kint-rich>dl dl{padding:0 0 0 12px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxnIHN0cm9rZS13aWR0aD0iMiIgZmlsbD0iI0ZGRiI+PHBhdGggZD0iTTEgMWgyOHYyOEgxem01IDE0aDE4bS05IDlWNk0xIDYxaDI4djI4SDF6bTUgMTRoMTgiIHN0cm9rZT0iIzM3OSIvPjxwYXRoIGQ9Ik0xIDMxaDI4djI4SDF6bTUgMTRoMThtLTkgOVYzNk0xIDkxaDI4djI4SDF6bTUgMTRoMTgiIHN0cm9rZT0iIzVBMyIvPjxwYXRoIGQ9Ik0xIDEyMWgyOHYyOEgxem01IDVsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZT0iI0NDQyIvPjwvZz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #b6cedb}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#0092db;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#5cb730}.kint-rich dfn{font-style:normal;font-family:monospace;color:#1d1e1e}.kint-rich pre{color:#1d1e1e;margin:0 0 0 12px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #b6cedb;background:#e0eaef;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(29,30,30,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#e0eaef;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#1d1e1e;background:#e0eaef}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #b6cedb;border-top-width:0;border-bottom-width:0;padding:4px;float:right !important;margin:-4px 0;color:#1d1e1e;background:#c1d4df;height:24px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#d0d0d0;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#e8e8e8}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#c1d4df;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#1d1e1e}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#1d1e1e;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#1d1e1e;border-bottom:1px dotted #1d1e1e}.kint-rich ul{list-style:none;padding-left:12px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #b6cedb}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 12px;padding-left:0;background:#e0eaef;border:1px solid #b6cedb;border-top:0}.kint-rich ul.kint-tabs>li{background:#c1d4df;border:1px solid #b6cedb;cursor:pointer;display:inline-block;height:24px;margin:2px;padding:0 12px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#0092db;color:#5cb730}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#e0eaef;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:20px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#0092db;color:#5cb730}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #b6cedb;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#0092db}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #b6cedb;padding:2px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#c1d4df;color:#1d1e1e}.kint-rich table td{background:#e0eaef;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #0092db inset}.kint-rich table tr:hover var{color:#5cb730}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:4px;padding-bottom:4px;border-bottom:1px solid #c1d4df}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #0092db;padding-right:8px;margin-right:8px}.kint-rich pre.kint-source>div.kint-highlight{background:#c1d4df}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #0092db,0 1px #0092db,1px 0 #0092db,0 -1px #0092db;color:#e0eaef;font-weight:bold}.kint-rich>dl>dt{background:linear-gradient(to bottom, #e3ecf0 0, #c0d4df 100%)}.kint-rich ul.kint-tabs{background:linear-gradient(to bottom, #9dbed0 0px, #b2ccda 100%)}.kint-rich>dl:not(.kint-trace)>dd>ul.kint-tabs li{background:#e0eaef}.kint-rich>dl:not(.kint-trace)>dd>ul.kint-tabs li.kint-active-tab{background:#c1d4df}.kint-rich>dl.kint-trace>dt{background:linear-gradient(to bottom, #c0d4df 0px, #e3ecf0 100%)}.kint-rich .kint-source .kint-highlight{background:#f0eb96}
+.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,0.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:8px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#0092db;color:#1d1e1e}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #5cb730}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#1d1e1e;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:8px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#e0eaef;border:1px solid #b6cedb;color:#1d1e1e;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:4px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#0092db}.kint-rich>dl dl{padding:0 0 0 12px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzMCAxNTAiPjxnIHN0cm9rZS13aWR0aD0iMiIgZmlsbD0iI0ZGRiI+PHBhdGggZD0iTTEgMWgyOHYyOEgxem01IDE0aDE4bS05IDlWNk0xIDYxaDI4djI4SDF6bTUgMTRoMTgiIHN0cm9rZT0iIzM3OSIvPjxwYXRoIGQ9Ik0xIDMxaDI4djI4SDF6bTUgMTRoMThtLTkgOVYzNk0xIDkxaDI4djI4SDF6bTUgMTRoMTgiIHN0cm9rZT0iIzVBMyIvPjxwYXRoIGQ9Ik0xIDEyMWgyOHYyOEgxem01IDVsMTggMThtLTE4IDBsMTgtMTgiIHN0cm9rZT0iI0NDQyIvPjwvZz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #b6cedb}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#0092db;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#5cb730}.kint-rich dfn{font-style:normal;font-family:monospace;color:#1d1e1e}.kint-rich pre{color:#1d1e1e;margin:0 0 0 12px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #b6cedb;background:#e0eaef;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(29,30,30,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#e0eaef;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#1d1e1e;background:#e0eaef}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #b6cedb;border-top-width:0;border-bottom-width:0;padding:4px;float:right !important;margin:-4px 0;color:#1d1e1e;background:#c1d4df;height:24px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#d0d0d0;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#e8e8e8}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#c1d4df;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#1d1e1e}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#1d1e1e;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#1d1e1e;border-bottom:1px dotted #1d1e1e}.kint-rich ul{list-style:none;padding-left:12px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #b6cedb}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 12px;padding-left:0;background:#e0eaef;border:1px solid #b6cedb;border-top:0}.kint-rich ul.kint-tabs>li{background:#c1d4df;border:1px solid #b6cedb;cursor:pointer;display:inline-block;height:24px;margin:2px;padding:0 12px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#0092db;color:#5cb730}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#e0eaef;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:20px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#0092db;color:#5cb730}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #b6cedb;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#0092db}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #b6cedb;padding:2px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#c1d4df;color:#1d1e1e}.kint-rich table td{background:#e0eaef;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #0092db inset}.kint-rich table tr:hover var{color:#5cb730}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:4px;padding-bottom:4px;border-bottom:1px solid #c1d4df}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #0092db;padding-right:8px;margin-right:8px}.kint-rich pre.kint-source>div.kint-highlight{background:#c1d4df}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #0092db,0 1px #0092db,1px 0 #0092db,0 -1px #0092db;color:#e0eaef;font-weight:bold}input.kint-note-input{width:100%}.kint-rich>dl>dt{background:linear-gradient(to bottom, #e3ecf0 0, #c0d4df 100%)}.kint-rich ul.kint-tabs{background:linear-gradient(to bottom, #9dbed0 0px, #b2ccda 100%)}.kint-rich>dl:not(.kint-trace)>dd>ul.kint-tabs li{background:#e0eaef}.kint-rich>dl:not(.kint-trace)>dd>ul.kint-tabs li.kint-active-tab{background:#c1d4df}.kint-rich>dl.kint-trace>dt{background:linear-gradient(to bottom, #c0d4df 0px, #e3ecf0 100%)}.kint-rich .kint-source .kint-highlight{background:#f0eb96}
diff --git a/system/ThirdParty/Kint/resources/compiled/rich.js b/system/ThirdParty/Kint/resources/compiled/rich.js
index 5648cda6de9e..7ab616cf62c1 100644
--- a/system/ThirdParty/Kint/resources/compiled/rich.js
+++ b/system/ThirdParty/Kint/resources/compiled/rich.js
@@ -1 +1 @@
-void 0===window.kintRich&&(window.kintRich=function(){"use strict";var i={selectText:function(e){var t=window.getSelection(),a=document.createRange();a.selectNodeContents(e),t.removeAllRanges(),t.addRange(a)},each:function(e,t){Array.prototype.slice.call(document.querySelectorAll(e),0).forEach(t)},hasClass:function(e,t){return!!e.classList&&e.classList.contains(t=void 0===t?"kint-show":t)},addClass:function(e,t){e.classList.add(t=void 0===t?"kint-show":t)},removeClass:function(e,t){return e.classList.remove(t=void 0===t?"kint-show":t),e},toggle:function(e,t){var a=i.getChildren(e);a&&((t=void 0===t?i.hasClass(e):t)?i.removeClass(e):i.addClass(e),1===a.childNodes.length&&(a=a.childNodes[0].childNodes[0])&&i.hasClass(a,"kint-parent")&&i.toggle(a,t))},toggleChildren:function(e,t){var a=i.getChildren(e);if(a){var o=a.getElementsByClassName("kint-parent"),r=o.length;for(void 0===t&&(t=!i.hasClass(e));r--;)i.toggle(o[r],t)}},toggleAll:function(e){for(var t=document.getElementsByClassName("kint-parent"),a=t.length,o=!i.hasClass(e.parentNode);a--;)i.toggle(t[a],o)},switchTab:function(e){var t=e.previousSibling,a=0;for(i.removeClass(e.parentNode.getElementsByClassName("kint-active-tab")[0],"kint-active-tab"),i.addClass(e,"kint-active-tab");t;)1===t.nodeType&&a++,t=t.previousSibling;for(var o=e.parentNode.nextSibling.childNodes,r=0;r<o.length;r++)r===a?(i.addClass(o[r]),1===o[r].childNodes.length&&(t=o[r].childNodes[0].childNodes[0])&&i.hasClass(t,"kint-parent")&&i.toggle(t,!1)):i.removeClass(o[r])},mktag:function(e){return"<"+e+">"},openInNewWindow:function(e){var t=window.open();t&&(t.document.open(),t.document.write(i.mktag("html")+i.mktag("head")+i.mktag("title")+"Kint ("+(new Date).toISOString()+")"+i.mktag("/title")+i.mktag('meta charset="utf-8"')+document.getElementsByClassName("kint-rich-script")[0].outerHTML+document.getElementsByClassName("kint-rich-style")[0].outerHTML+i.mktag("/head")+i.mktag("body")+'<input style="width: 100%" placeholder="Take some notes!"><div class="kint-rich">'+e.parentNode.outerHTML+"</div>"+i.mktag("/body")),t.document.close())},sortTable:function(e,a){var t=e.tBodies[0];[].slice.call(e.tBodies[0].rows).sort(function(e,t){if(e=e.cells[a].textContent.trim().toLocaleLowerCase(),t=t.cells[a].textContent.trim().toLocaleLowerCase(),isNaN(e)||isNaN(t)){if(isNaN(e)&&!isNaN(t))return 1;if(isNaN(t)&&!isNaN(e))return-1}else e=parseFloat(e),t=parseFloat(t);return e<t?-1:t<e?1:0}).forEach(function(e){t.appendChild(e)})},showAccessPath:function(e){for(var t=e.childNodes,a=0;a<t.length;a++)if(i.hasClass(t[a],"access-path"))return void(i.hasClass(t[a],"kint-show")?i.removeClass(t[a]):(i.addClass(t[a]),i.selectText(t[a])))},showSearchBox:function(e){var t=e.querySelector(".kint-search");t&&(i.hasClass(t)?(i.removeClass(t),i.removeClass(e.parentNode,"kint-search-root")):(i.addClass(e),i.addClass(t),t.focus(),t.select(),i.search(e.parentNode,t.value)))},search:function(e,t){var a=e.querySelectorAll(".kint-search-match");[].forEach.call(a,function(e){i.removeClass(e,"kint-search-match")}),i.removeClass(e,"kint-search-match"),t.length?(i.addClass(e,"kint-search-root"),i.findMatches(e,t)):i.removeClass(e,"kint-search-root")},findMatches:function(e,t){var a,o,r,s=e.cloneNode(!0);if(s.querySelectorAll(".access-path").forEach(function(e){e.remove()}),-1!=s.textContent.toUpperCase().indexOf(t.toUpperCase())){for(n in i.addClass(e,"kint-search-match"),e.childNodes)if("DD"==e.childNodes[n].tagName){a=e.childNodes[n];break}if(a)if([].forEach.call(a.childNodes,function(e){"DL"==e.tagName?i.findMatches(e,t):"UL"==e.tagName&&(i.hasClass(e,"kint-tabs")?o=e.childNodes:i.hasClass(e,"kint-tab-contents")&&(r=e.childNodes))}),o&&r&&o.length==r.length)for(var n=0;n<o.length;n++){var l=!1;-1!=o[n].textContent.toUpperCase().indexOf(t.toUpperCase())?l=!0:((s=r[n].cloneNode(!0)).querySelectorAll(".access-path").forEach(function(e){e.remove()}),-1!=s.textContent.toUpperCase().indexOf(t.toUpperCase())&&(l=!0)),l&&(i.addClass(o[n],"kint-search-match"),[].forEach.call(r[n].childNodes,function(e){"DL"==e.tagName&&i.findMatches(e,t)}))}}},getParentByClass:function(e,t){for(void 0===t&&(t="kint-rich");(e=e.parentNode)&&!i.hasClass(e,t););return e},getParentHeader:function(e,t){for(var a=e.nodeName.toLowerCase();"dd"!==a&&"dt"!==a&&i.getParentByClass(e);)a=(e=e.parentNode).nodeName.toLowerCase();return i.getParentByClass(e)?(e="dd"===a&&t?e.previousElementSibling:e)&&"dt"===e.nodeName.toLowerCase()&&i.hasClass(e,"kint-parent")?e:void 0:null},getChildren:function(e){for(;(e=e.nextElementSibling)&&"dd"!==e.nodeName.toLowerCase(););return e},isFolderOpen:function(){if(i.folder&&i.folder.querySelector("dd.kint-foldout"))return i.hasClass(i.folder.querySelector("dd.kint-foldout").previousSibling)},initLoad:function(){i.style=window.kintShared.dedupe("style.kint-rich-style",i.style),i.script=window.kintShared.dedupe("script.kint-rich-script",i.script),i.folder=window.kintShared.dedupe(".kint-rich.kint-folder",i.folder);var t,e=document.querySelectorAll("input.kint-search");[].forEach.call(e,function(t){function e(e){window.clearTimeout(a),t.value!==o&&(a=window.setTimeout(function(){o=t.value,i.search(t.parentNode.parentNode,o)},500))}var a=null,o=null;t.removeEventListener("keyup",e),t.addEventListener("keyup",e)}),i.folder&&(t=i.folder.querySelector("dd"),[].forEach.call(document.querySelectorAll(".kint-rich.kint-file"),function(e){e.parentNode!==i.folder&&t.appendChild(e)}),document.body.appendChild(i.folder),i.addClass(i.folder))},keyboardNav:{targets:[],target:0,active:!1,fetchTargets:function(){var e=i.keyboardNav.targets[i.keyboardNav.target];i.keyboardNav.targets=[],i.each(".kint-rich nav, .kint-tabs>li:not(.kint-active-tab)",function(e){i.isFolderOpen()&&!i.folder.contains(e)||0===e.offsetWidth&&0===e.offsetHeight||i.keyboardNav.targets.push(e)}),e&&-1!==i.keyboardNav.targets.indexOf(e)&&(i.keyboardNav.target=i.keyboardNav.targets.indexOf(e))},sync:function(e){var t=document.querySelector(".kint-focused");t&&i.removeClass(t,"kint-focused"),i.keyboardNav.active&&(t=i.keyboardNav.targets[i.keyboardNav.target],i.addClass(t,"kint-focused"),e||i.keyboardNav.scroll(t))},scroll:function(e){var t,a;e!==i.folder.querySelector("dt > nav")&&(a=(t=function(e){return e.offsetTop+(e.offsetParent?t(e.offsetParent):0)})(e),i.isFolderOpen()?(e=i.folder.querySelector("dd.kint-foldout")).scrollTo(0,a-e.clientHeight/2):window.scrollTo(0,a-window.innerHeight/2))},moveCursor:function(e){for(i.keyboardNav.target+=e;i.keyboardNav.target<0;)i.keyboardNav.target+=i.keyboardNav.targets.length;for(;i.keyboardNav.target>=i.keyboardNav.targets.length;)i.keyboardNav.target-=i.keyboardNav.targets.length;i.keyboardNav.sync()},setCursor:function(e){if(i.isFolderOpen()&&!i.folder.contains(e))return!1;i.keyboardNav.fetchTargets();for(var t=0;t<i.keyboardNav.targets.length;t++)if(e===i.keyboardNav.targets[t])return i.keyboardNav.target=t,!0;return!1}},mouseNav:{lastClickTarget:null,lastClickTimer:null,lastClickCount:0,renewLastClick:function(){window.clearTimeout(i.mouseNav.lastClickTimer),i.mouseNav.lastClickTimer=window.setTimeout(function(){i.mouseNav.lastClickTarget=null,i.mouseNav.lastClickTimer=null,i.mouseNav.lastClickCount=0},250)}},style:null,script:null,folder:null};return window.addEventListener("click",function(e){var t=e.target,a=t.nodeName.toLowerCase();if(i.mouseNav.lastClickTarget&&i.mouseNav.lastClickTimer&&i.mouseNav.lastClickCount)return t=i.mouseNav.lastClickTarget,void(1===i.mouseNav.lastClickCount?(i.toggleChildren(t.parentNode),i.keyboardNav.setCursor(t),i.keyboardNav.sync(!0),i.mouseNav.lastClickCount++,i.mouseNav.renewLastClick()):(i.toggleAll(t),i.keyboardNav.setCursor(t),i.keyboardNav.sync(!0),i.keyboardNav.scroll(t),window.clearTimeout(i.mouseNav.lastClickTimer),i.mouseNav.lastClickTarget=null,i.mouseNav.lastClickTarget=null,i.mouseNav.lastClickCount=0));if(i.getParentByClass(t)){if("dfn"===a)i.selectText(t);else if("th"===a)return void(e.ctrlKey||i.sortTable(t.parentNode.parentNode.parentNode,t.cellIndex));if((t=i.getParentHeader(t))&&(i.keyboardNav.setCursor(t.querySelector("nav")),i.keyboardNav.sync(!0)),t=e.target,"li"===a&&"kint-tabs"===t.parentNode.className)"kint-active-tab"!==t.className&&i.switchTab(t),(t=i.getParentHeader(t,!0))&&(i.keyboardNav.setCursor(t.querySelector("nav")),i.keyboardNav.sync(!0));else if("nav"===a)"footer"===t.parentNode.nodeName.toLowerCase()?(i.keyboardNav.setCursor(t),i.keyboardNav.sync(!0),t=t.parentNode,i.hasClass(t)?i.removeClass(t):i.addClass(t)):(i.toggle(t.parentNode),i.keyboardNav.fetchTargets(),i.mouseNav.lastClickCount=1,i.mouseNav.lastClickTarget=t,i.mouseNav.renewLastClick());else if(i.hasClass(t,"kint-popup-trigger")){var o=t.parentNode;if("footer"===o.nodeName.toLowerCase())o=o.previousSibling;else for(;o&&!i.hasClass(o,"kint-parent");)o=o.parentNode;i.openInNewWindow(o)}else i.hasClass(t,"kint-access-path-trigger")?i.showAccessPath(t.parentNode):i.hasClass(t,"kint-search-trigger")?i.showSearchBox(t.parentNode):i.hasClass(t,"kint-search")||("pre"===a&&3===e.detail?i.selectText(t):i.getParentByClass(t,"kint-source")&&3===e.detail?i.selectText(i.getParentByClass(t,"kint-source")):i.hasClass(t,"access-path")?i.selectText(t):"a"!==a&&(t=i.getParentHeader(t))&&(i.toggle(t),i.keyboardNav.fetchTargets()))}},!0),window.addEventListener("keydown",function(e){if(e.target===document.body&&!e.altKey&&!e.ctrlKey){if(68===e.keyCode){if(i.keyboardNav.active)i.keyboardNav.active=!1;else if(i.keyboardNav.active=!0,i.keyboardNav.fetchTargets(),0===i.keyboardNav.targets.length)return void(i.keyboardNav.active=!1);return i.keyboardNav.sync(),void e.preventDefault()}if(i.keyboardNav.active){if(9===e.keyCode)return i.keyboardNav.moveCursor(e.shiftKey?-1:1),void e.preventDefault();if(38===e.keyCode||75===e.keyCode)return i.keyboardNav.moveCursor(-1),void e.preventDefault();if(40===e.keyCode||74===e.keyCode)return i.keyboardNav.moveCursor(1),void e.preventDefault();var t,a,o=i.keyboardNav.targets[i.keyboardNav.target];if("li"===o.nodeName.toLowerCase()){if(32===e.keyCode||13===e.keyCode)return i.switchTab(o),i.keyboardNav.fetchTargets(),i.keyboardNav.sync(),void e.preventDefault();if(39===e.keyCode||76===e.keyCode)return i.keyboardNav.moveCursor(1),void e.preventDefault();if(37===e.keyCode||72===e.keyCode)return i.keyboardNav.moveCursor(-1),void e.preventDefault()}o=o.parentNode,65===e.keyCode?(i.showAccessPath(o),e.preventDefault()):"footer"===o.nodeName.toLowerCase()&&i.hasClass(o.parentNode,"kint-rich")?32===e.keyCode||13===e.keyCode?(i.hasClass(o)?i.removeClass(o):i.addClass(o),e.preventDefault()):37===e.keyCode||72===e.keyCode?(i.removeClass(o),e.preventDefault()):39!==e.keyCode&&76!==e.keyCode||(i.addClass(o),e.preventDefault()):32===e.keyCode||13===e.keyCode?(i.toggle(o),i.keyboardNav.fetchTargets(),e.preventDefault()):39!==e.keyCode&&76!==e.keyCode&&37!==e.keyCode&&72!==e.keyCode||(t=37===e.keyCode||72===e.keyCode,i.hasClass(o)?i.toggleChildren(o,t):!t||(a=i.getParentHeader(o.parentNode.parentNode,!0))&&(i.keyboardNav.setCursor((o=a).querySelector("nav")),i.keyboardNav.sync()),i.toggle(o,t),i.keyboardNav.fetchTargets(),e.preventDefault())}}},!0),i}()),window.kintShared.runOnce(window.kintRich.initLoad);
+void 0===window.kintRich&&(window.kintRich=function(){"use strict";var l={selectText:function(e){var t=window.getSelection(),a=document.createRange();a.selectNodeContents(e),t.removeAllRanges(),t.addRange(a)},each:function(e,t){Array.prototype.slice.call(document.querySelectorAll(e),0).forEach(t)},hasClass:function(e,t){return!!e.classList&&e.classList.contains(t=void 0===t?"kint-show":t)},addClass:function(e,t){e.classList.add(t=void 0===t?"kint-show":t)},removeClass:function(e,t){return e.classList.remove(t=void 0===t?"kint-show":t),e},toggle:function(e,t){var a=l.getChildren(e);a&&((t=void 0===t?l.hasClass(e):t)?l.removeClass(e):l.addClass(e),1===a.childNodes.length&&(a=a.childNodes[0].childNodes[0])&&l.hasClass(a,"kint-parent")&&l.toggle(a,t))},toggleChildren:function(e,t){var a=l.getChildren(e);if(a){var o=a.getElementsByClassName("kint-parent"),r=o.length;for(void 0===t&&(t=!l.hasClass(e));r--;)l.toggle(o[r],t)}},toggleAll:function(e){for(var t=document.getElementsByClassName("kint-parent"),a=t.length,o=!l.hasClass(e.parentNode);a--;)l.toggle(t[a],o)},switchTab:function(e){var t=e.previousSibling,a=0;for(l.removeClass(e.parentNode.getElementsByClassName("kint-active-tab")[0],"kint-active-tab"),l.addClass(e,"kint-active-tab");t;)1===t.nodeType&&a++,t=t.previousSibling;for(var o=e.parentNode.nextSibling.childNodes,r=0;r<o.length;r++)r===a?(l.addClass(o[r]),1===o[r].childNodes.length&&(t=o[r].childNodes[0].childNodes[0])&&l.hasClass(t,"kint-parent")&&l.toggle(t,!1)):l.removeClass(o[r])},mktag:function(e){return"<"+e+">"},openInNewWindow:function(e){var t=window.open();t&&(t.document.open(),t.document.write(l.mktag("html")+l.mktag("head")+l.mktag("title")+"Kint ("+(new Date).toISOString()+")"+l.mktag("/title")+l.mktag('meta charset="utf-8"')+l.mktag('script class="kint-rich-script" nonce="'+l.script.nonce+'"')+l.script.innerHTML+l.mktag("/script")+l.mktag('style class="kint-rich-style" nonce="'+l.style.nonce+'"')+l.style.innerHTML+l.mktag("/style")+l.mktag("/head")+l.mktag("body")+'<input class="kint-note-input" placeholder="Take some notes!"><div class="kint-rich">'+e.parentNode.outerHTML+"</div>"+l.mktag("/body")),t.document.close())},sortTable:function(e,a){var t=e.tBodies[0];[].slice.call(e.tBodies[0].rows).sort(function(e,t){if(e=e.cells[a].textContent.trim().toLocaleLowerCase(),t=t.cells[a].textContent.trim().toLocaleLowerCase(),isNaN(e)||isNaN(t)){if(isNaN(e)&&!isNaN(t))return 1;if(isNaN(t)&&!isNaN(e))return-1}else e=parseFloat(e),t=parseFloat(t);return e<t?-1:t<e?1:0}).forEach(function(e){t.appendChild(e)})},showAccessPath:function(e){for(var t=e.childNodes,a=0;a<t.length;a++)if(l.hasClass(t[a],"access-path"))return void(l.hasClass(t[a],"kint-show")?l.removeClass(t[a]):(l.addClass(t[a]),l.selectText(t[a])))},showSearchBox:function(e){var t=e.querySelector(".kint-search");t&&(l.hasClass(t)?(l.removeClass(t),l.removeClass(e.parentNode,"kint-search-root")):(l.addClass(e),l.addClass(t),t.focus(),t.select(),l.search(e.parentNode,t.value)))},search:function(e,t){var a=e.querySelectorAll(".kint-search-match");[].forEach.call(a,function(e){l.removeClass(e,"kint-search-match")}),l.removeClass(e,"kint-search-match"),t.length?(l.addClass(e,"kint-search-root"),l.findMatches(e,t)):l.removeClass(e,"kint-search-root")},findMatches:function(e,t){var a,o,r,s=e.cloneNode(!0);if(s.querySelectorAll(".access-path").forEach(function(e){e.remove()}),-1!=s.textContent.toUpperCase().indexOf(t.toUpperCase())){for(n in l.addClass(e,"kint-search-match"),e.childNodes)if("DD"==e.childNodes[n].tagName){a=e.childNodes[n];break}if(a)if([].forEach.call(a.childNodes,function(e){"DL"==e.tagName?l.findMatches(e,t):"UL"==e.tagName&&(l.hasClass(e,"kint-tabs")?o=e.childNodes:l.hasClass(e,"kint-tab-contents")&&(r=e.childNodes))}),o&&r&&o.length==r.length)for(var n=0;n<o.length;n++){var i=!1;-1!=o[n].textContent.toUpperCase().indexOf(t.toUpperCase())?i=!0:((s=r[n].cloneNode(!0)).querySelectorAll(".access-path").forEach(function(e){e.remove()}),-1!=s.textContent.toUpperCase().indexOf(t.toUpperCase())&&(i=!0)),i&&(l.addClass(o[n],"kint-search-match"),[].forEach.call(r[n].childNodes,function(e){"DL"==e.tagName&&l.findMatches(e,t)}))}}},getParentByClass:function(e,t){for(void 0===t&&(t="kint-rich");(e=e.parentNode)&&!l.hasClass(e,t););return e},getParentHeader:function(e,t){for(var a=e.nodeName.toLowerCase();"dd"!==a&&"dt"!==a&&l.getParentByClass(e);)a=(e=e.parentNode).nodeName.toLowerCase();return l.getParentByClass(e)?(e="dd"===a&&t?e.previousElementSibling:e)&&"dt"===e.nodeName.toLowerCase()&&l.hasClass(e,"kint-parent")?e:void 0:null},getChildren:function(e){for(;(e=e.nextElementSibling)&&"dd"!==e.nodeName.toLowerCase(););return e},isFolderOpen:function(){if(l.folder&&l.folder.querySelector("dd.kint-foldout"))return l.hasClass(l.folder.querySelector("dd.kint-foldout").previousSibling)},initLoad:function(){l.style=window.kintShared.dedupe("style.kint-rich-style",l.style),l.script=window.kintShared.dedupe("script.kint-rich-script",l.script),l.folder=window.kintShared.dedupe(".kint-rich.kint-folder",l.folder);var t,e=document.querySelectorAll("input.kint-search");[].forEach.call(e,function(t){function e(e){window.clearTimeout(a),t.value!==o&&(a=window.setTimeout(function(){o=t.value,l.search(t.parentNode.parentNode,o)},500))}var a=null,o=null;t.removeEventListener("keyup",e),t.addEventListener("keyup",e)}),l.folder&&(t=l.folder.querySelector("dd"),[].forEach.call(document.querySelectorAll(".kint-rich.kint-file"),function(e){e.parentNode!==l.folder&&t.appendChild(e)}),document.body.appendChild(l.folder),l.addClass(l.folder))},keyboardNav:{targets:[],target:0,active:!1,fetchTargets:function(){var e=l.keyboardNav.targets[l.keyboardNav.target];l.keyboardNav.targets=[],l.each(".kint-rich nav, .kint-tabs>li:not(.kint-active-tab)",function(e){l.isFolderOpen()&&!l.folder.contains(e)||0===e.offsetWidth&&0===e.offsetHeight||l.keyboardNav.targets.push(e)}),e&&-1!==l.keyboardNav.targets.indexOf(e)&&(l.keyboardNav.target=l.keyboardNav.targets.indexOf(e))},sync:function(e){var t=document.querySelector(".kint-focused");t&&l.removeClass(t,"kint-focused"),l.keyboardNav.active&&(t=l.keyboardNav.targets[l.keyboardNav.target],l.addClass(t,"kint-focused"),e||l.keyboardNav.scroll(t))},scroll:function(e){var t,a;e!==l.folder.querySelector("dt > nav")&&(a=(t=function(e){return e.offsetTop+(e.offsetParent?t(e.offsetParent):0)})(e),l.isFolderOpen()?(e=l.folder.querySelector("dd.kint-foldout")).scrollTo(0,a-e.clientHeight/2):window.scrollTo(0,a-window.innerHeight/2))},moveCursor:function(e){for(l.keyboardNav.target+=e;l.keyboardNav.target<0;)l.keyboardNav.target+=l.keyboardNav.targets.length;for(;l.keyboardNav.target>=l.keyboardNav.targets.length;)l.keyboardNav.target-=l.keyboardNav.targets.length;l.keyboardNav.sync()},setCursor:function(e){if(l.isFolderOpen()&&!l.folder.contains(e))return!1;l.keyboardNav.fetchTargets();for(var t=0;t<l.keyboardNav.targets.length;t++)if(e===l.keyboardNav.targets[t])return l.keyboardNav.target=t,!0;return!1}},mouseNav:{lastClickTarget:null,lastClickTimer:null,lastClickCount:0,renewLastClick:function(){window.clearTimeout(l.mouseNav.lastClickTimer),l.mouseNav.lastClickTimer=window.setTimeout(function(){l.mouseNav.lastClickTarget=null,l.mouseNav.lastClickTimer=null,l.mouseNav.lastClickCount=0},250)}},style:null,script:null,folder:null};return window.addEventListener("click",function(e){var t=e.target,a=t.nodeName.toLowerCase();if(l.mouseNav.lastClickTarget&&l.mouseNav.lastClickTimer&&l.mouseNav.lastClickCount)return t=l.mouseNav.lastClickTarget,void(1===l.mouseNav.lastClickCount?(l.toggleChildren(t.parentNode),l.keyboardNav.setCursor(t),l.keyboardNav.sync(!0),l.mouseNav.lastClickCount++,l.mouseNav.renewLastClick()):(l.toggleAll(t),l.keyboardNav.setCursor(t),l.keyboardNav.sync(!0),l.keyboardNav.scroll(t),window.clearTimeout(l.mouseNav.lastClickTimer),l.mouseNav.lastClickTarget=null,l.mouseNav.lastClickTarget=null,l.mouseNav.lastClickCount=0));if(l.getParentByClass(t)){if("dfn"===a)l.selectText(t);else if("th"===a)return void(e.ctrlKey||l.sortTable(t.parentNode.parentNode.parentNode,t.cellIndex));if((t=l.getParentHeader(t))&&(l.keyboardNav.setCursor(t.querySelector("nav")),l.keyboardNav.sync(!0)),t=e.target,"li"===a&&"kint-tabs"===t.parentNode.className)"kint-active-tab"!==t.className&&l.switchTab(t),(t=l.getParentHeader(t,!0))&&(l.keyboardNav.setCursor(t.querySelector("nav")),l.keyboardNav.sync(!0));else if("nav"===a)"footer"===t.parentNode.nodeName.toLowerCase()?(l.keyboardNav.setCursor(t),l.keyboardNav.sync(!0),t=t.parentNode,l.hasClass(t)?l.removeClass(t):l.addClass(t)):(l.toggle(t.parentNode),l.keyboardNav.fetchTargets(),l.mouseNav.lastClickCount=1,l.mouseNav.lastClickTarget=t,l.mouseNav.renewLastClick());else if(l.hasClass(t,"kint-popup-trigger")){var o=t.parentNode;if("footer"===o.nodeName.toLowerCase())o=o.previousSibling;else for(;o&&!l.hasClass(o,"kint-parent");)o=o.parentNode;l.openInNewWindow(o)}else l.hasClass(t,"kint-access-path-trigger")?l.showAccessPath(t.parentNode):l.hasClass(t,"kint-search-trigger")?l.showSearchBox(t.parentNode):l.hasClass(t,"kint-search")||("pre"===a&&3===e.detail?l.selectText(t):l.getParentByClass(t,"kint-source")&&3===e.detail?l.selectText(l.getParentByClass(t,"kint-source")):l.hasClass(t,"access-path")?l.selectText(t):"a"!==a&&(t=l.getParentHeader(t))&&(l.toggle(t),l.keyboardNav.fetchTargets()))}},!0),window.addEventListener("keydown",function(e){if(e.target===document.body&&!e.altKey&&!e.ctrlKey){if(68===e.keyCode){if(l.keyboardNav.active)l.keyboardNav.active=!1;else if(l.keyboardNav.active=!0,l.keyboardNav.fetchTargets(),0===l.keyboardNav.targets.length)return void(l.keyboardNav.active=!1);return l.keyboardNav.sync(),void e.preventDefault()}if(l.keyboardNav.active){if(9===e.keyCode)return l.keyboardNav.moveCursor(e.shiftKey?-1:1),void e.preventDefault();if(38===e.keyCode||75===e.keyCode)return l.keyboardNav.moveCursor(-1),void e.preventDefault();if(40===e.keyCode||74===e.keyCode)return l.keyboardNav.moveCursor(1),void e.preventDefault();var t,a,o=l.keyboardNav.targets[l.keyboardNav.target];if("li"===o.nodeName.toLowerCase()){if(32===e.keyCode||13===e.keyCode)return l.switchTab(o),l.keyboardNav.fetchTargets(),l.keyboardNav.sync(),void e.preventDefault();if(39===e.keyCode||76===e.keyCode)return l.keyboardNav.moveCursor(1),void e.preventDefault();if(37===e.keyCode||72===e.keyCode)return l.keyboardNav.moveCursor(-1),void e.preventDefault()}o=o.parentNode,65===e.keyCode?(l.showAccessPath(o),e.preventDefault()):"footer"===o.nodeName.toLowerCase()&&l.hasClass(o.parentNode,"kint-rich")?32===e.keyCode||13===e.keyCode?(l.hasClass(o)?l.removeClass(o):l.addClass(o),e.preventDefault()):37===e.keyCode||72===e.keyCode?(l.removeClass(o),e.preventDefault()):39!==e.keyCode&&76!==e.keyCode||(l.addClass(o),e.preventDefault()):32===e.keyCode||13===e.keyCode?(l.toggle(o),l.keyboardNav.fetchTargets(),e.preventDefault()):39!==e.keyCode&&76!==e.keyCode&&37!==e.keyCode&&72!==e.keyCode||(t=37===e.keyCode||72===e.keyCode,l.hasClass(o)?l.toggleChildren(o,t):!t||(a=l.getParentHeader(o.parentNode.parentNode,!0))&&(l.keyboardNav.setCursor((o=a).querySelector("nav")),l.keyboardNav.sync()),l.toggle(o,t),l.keyboardNav.fetchTargets(),e.preventDefault())}}},!0),l}()),window.kintShared.runOnce(window.kintRich.initLoad);
diff --git a/system/ThirdParty/Kint/resources/compiled/solarized-dark.css b/system/ThirdParty/Kint/resources/compiled/solarized-dark.css
index 685e6208c12b..1d3c28b0b80c 100644
--- a/system/ThirdParty/Kint/resources/compiled/solarized-dark.css
+++ b/system/ThirdParty/Kint/resources/compiled/solarized-dark.css
@@ -1 +1 @@
-.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:#073642}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:10px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#268bd2;color:#839496}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #2aa198}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#839496;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:10px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#002b36;border:1px solid #586e75;color:#839496;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:5px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#268bd2}.kint-rich>dl dl{padding:0 0 0 15px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMzAgMTUwIj48ZGVmcz48cGF0aCBzdHJva2UtbGluZWpvaW49InJvdW5kIiBkPSJNNCAzYTI0IDMyIDAgMCAxIDAgMjQgNDAgMjAtMTAgMCAxIDIzLTEyQTQwIDIwIDEwIDAgMSA0IDN6IiBpZD0iYSIvPjwvZGVmcz48ZyBmaWxsPSIjOTNhMWExIiBzdHJva2U9IiM5M2ExYTEiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxnIGZpbGw9IiM1ODZlNzUiIHN0cm9rZT0iIzU4NmU3NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAzMCkiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxwYXRoIGQ9Ik02IDEyNmwxOCAxOG0tMTggMGwxOC0xOCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2U9IiM1ODZlNzUiLz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #586e75}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#268bd2;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#2aa198}.kint-rich dfn{font-style:normal;font-family:monospace;color:#93a1a1}.kint-rich pre{color:#839496;margin:0 0 0 15px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #586e75;background:#002b36;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(131,148,150,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#002b36;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#839496;background:#002b36}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #586e75;border-top-width:0;border-bottom-width:0;padding:5px;float:right !important;margin:-5px 0;color:#93a1a1;background:#073642;height:26px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#252525;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#1b1b1b}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#073642;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#839496}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#839496;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#93a1a1;border-bottom:1px dotted #93a1a1}.kint-rich ul{list-style:none;padding-left:15px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #586e75}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 15px;padding-left:0;background:#002b36;border:1px solid #586e75;border-top:0}.kint-rich ul.kint-tabs>li{background:#073642;border:1px solid #586e75;cursor:pointer;display:inline-block;height:30px;margin:3px;padding:0 15px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#268bd2;color:#2aa198}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#002b36;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:25px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#268bd2;color:#2aa198}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #586e75;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#268bd2}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2.5px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #586e75;padding:2.5px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#073642;color:#93a1a1}.kint-rich table td{background:#002b36;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #268bd2 inset}.kint-rich table tr:hover var{color:#2aa198}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:5px;padding-bottom:5px;border-bottom:1px solid #073642}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #268bd2;padding-right:10px;margin-right:10px}.kint-rich pre.kint-source>div.kint-highlight{background:#073642}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #268bd2,0 1px #268bd2,1px 0 #268bd2,0 -1px #268bd2;color:#002b36;font-weight:bold}body{background:#073642;color:#fff}.kint-rich{box-shadow:0 0 5px 3px #073642}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #859900 inset;border-radius:7px}.kint-rich>dl>dt,.kint-rich ul.kint-tabs{box-shadow:4px 0 2px -3px #268bd2 inset}.kint-rich ul.kint-tabs li.kint-active-tab{padding-top:7px;height:34px}.kint-rich footer li{color:#ddd}
+.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:#073642}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:10px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#268bd2;color:#839496}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #2aa198}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#839496;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:10px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#002b36;border:1px solid #586e75;color:#839496;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:5px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#268bd2}.kint-rich>dl dl{padding:0 0 0 15px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMzAgMTUwIj48ZGVmcz48cGF0aCBzdHJva2UtbGluZWpvaW49InJvdW5kIiBkPSJNNCAzYTI0IDMyIDAgMCAxIDAgMjQgNDAgMjAtMTAgMCAxIDIzLTEyQTQwIDIwIDEwIDAgMSA0IDN6IiBpZD0iYSIvPjwvZGVmcz48ZyBmaWxsPSIjOTNhMWExIiBzdHJva2U9IiM5M2ExYTEiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxnIGZpbGw9IiM1ODZlNzUiIHN0cm9rZT0iIzU4NmU3NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAzMCkiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxwYXRoIGQ9Ik02IDEyNmwxOCAxOG0tMTggMGwxOC0xOCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2U9IiM1ODZlNzUiLz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #586e75}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#268bd2;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#2aa198}.kint-rich dfn{font-style:normal;font-family:monospace;color:#93a1a1}.kint-rich pre{color:#839496;margin:0 0 0 15px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #586e75;background:#002b36;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(131,148,150,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#002b36;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#839496;background:#002b36}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #586e75;border-top-width:0;border-bottom-width:0;padding:5px;float:right !important;margin:-5px 0;color:#93a1a1;background:#073642;height:26px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#252525;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#1b1b1b}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#073642;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#839496}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#839496;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#93a1a1;border-bottom:1px dotted #93a1a1}.kint-rich ul{list-style:none;padding-left:15px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #586e75}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 15px;padding-left:0;background:#002b36;border:1px solid #586e75;border-top:0}.kint-rich ul.kint-tabs>li{background:#073642;border:1px solid #586e75;cursor:pointer;display:inline-block;height:30px;margin:3px;padding:0 15px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#268bd2;color:#2aa198}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#002b36;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:25px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#268bd2;color:#2aa198}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #586e75;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#268bd2}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2.5px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #586e75;padding:2.5px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#073642;color:#93a1a1}.kint-rich table td{background:#002b36;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #268bd2 inset}.kint-rich table tr:hover var{color:#2aa198}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:5px;padding-bottom:5px;border-bottom:1px solid #073642}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #268bd2;padding-right:10px;margin-right:10px}.kint-rich pre.kint-source>div.kint-highlight{background:#073642}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #268bd2,0 1px #268bd2,1px 0 #268bd2,0 -1px #268bd2;color:#002b36;font-weight:bold}input.kint-note-input{width:100%}body{background:#073642;color:#fff}.kint-rich{box-shadow:0 0 5px 3px #073642}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #859900 inset;border-radius:7px}.kint-rich>dl>dt,.kint-rich ul.kint-tabs{box-shadow:4px 0 2px -3px #268bd2 inset}.kint-rich ul.kint-tabs li.kint-active-tab{padding-top:7px;height:34px}.kint-rich footer li{color:#ddd}
diff --git a/system/ThirdParty/Kint/resources/compiled/solarized.css b/system/ThirdParty/Kint/resources/compiled/solarized.css
index fa04f2de8f4d..952453edc311 100644
--- a/system/ThirdParty/Kint/resources/compiled/solarized.css
+++ b/system/ThirdParty/Kint/resources/compiled/solarized.css
@@ -1 +1 @@
-.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,0.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:10px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#268bd2;color:#657b83}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #2aa198}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#657b83;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:10px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#fdf6e3;border:1px solid #93a1a1;color:#657b83;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:5px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#268bd2}.kint-rich>dl dl{padding:0 0 0 15px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMzAgMTUwIj48ZGVmcz48cGF0aCBzdHJva2UtbGluZWpvaW49InJvdW5kIiBkPSJNNCAzYTI0IDMyIDAgMCAxIDAgMjQgNDAgMjAtMTAgMCAxIDIzLTEyQTQwIDIwIDEwIDAgMSA0IDN6IiBpZD0iYSIvPjwvZGVmcz48ZyBmaWxsPSIjOTNhMWExIiBzdHJva2U9IiM5M2ExYTEiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxnIGZpbGw9IiM1ODZlNzUiIHN0cm9rZT0iIzU4NmU3NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAzMCkiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxwYXRoIGQ9Ik02IDEyNmwxOCAxOG0tMTggMGwxOC0xOCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2U9IiM1ODZlNzUiLz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #93a1a1}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#268bd2;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#2aa198}.kint-rich dfn{font-style:normal;font-family:monospace;color:#586e75}.kint-rich pre{color:#657b83;margin:0 0 0 15px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #93a1a1;background:#fdf6e3;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(101,123,131,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#fdf6e3;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#657b83;background:#fdf6e3}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #93a1a1;border-top-width:0;border-bottom-width:0;padding:5px;float:right !important;margin:-5px 0;color:#586e75;background:#eee8d5;height:26px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#e2e2e2;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#f0f0f0}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#eee8d5;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#657b83}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#657b83;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#586e75;border-bottom:1px dotted #586e75}.kint-rich ul{list-style:none;padding-left:15px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #93a1a1}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 15px;padding-left:0;background:#fdf6e3;border:1px solid #93a1a1;border-top:0}.kint-rich ul.kint-tabs>li{background:#eee8d5;border:1px solid #93a1a1;cursor:pointer;display:inline-block;height:30px;margin:3px;padding:0 15px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#268bd2;color:#2aa198}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#fdf6e3;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:25px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#268bd2;color:#2aa198}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #93a1a1;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#268bd2}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2.5px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #93a1a1;padding:2.5px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#eee8d5;color:#586e75}.kint-rich table td{background:#fdf6e3;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #268bd2 inset}.kint-rich table tr:hover var{color:#2aa198}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:5px;padding-bottom:5px;border-bottom:1px solid #eee8d5}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #268bd2;padding-right:10px;margin-right:10px}.kint-rich pre.kint-source>div.kint-highlight{background:#eee8d5}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #268bd2,0 1px #268bd2,1px 0 #268bd2,0 -1px #268bd2;color:#fdf6e3;font-weight:bold}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #859900 inset;border-radius:7px}.kint-rich>dl>dt,.kint-rich ul.kint-tabs{box-shadow:4px 0 2px -3px #268bd2 inset}.kint-rich ul.kint-tabs li.kint-active-tab{padding-top:7px;height:34px}
+.kint-rich{font-size:13px;overflow-x:auto;white-space:nowrap;background:rgba(255,255,255,0.9)}.kint-rich.kint-folder{position:fixed;bottom:0;left:0;right:0;z-index:999999;width:100%;margin:0;display:block}.kint-rich.kint-folder dd.kint-foldout{max-height:calc(100vh - 100px);padding-right:10px;overflow-y:scroll;display:none}.kint-rich.kint-folder dd.kint-foldout.kint-show{display:block}.kint-rich::selection,.kint-rich::-moz-selection,.kint-rich::-webkit-selection{background:#268bd2;color:#657b83}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #2aa198}.kint-rich,.kint-rich::before,.kint-rich::after,.kint-rich *,.kint-rich *::before,.kint-rich *::after{box-sizing:border-box;border-radius:0;color:#657b83;float:none !important;font-family:Consolas, Menlo, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace, serif;line-height:15px;margin:0;padding:0;text-align:left}.kint-rich{margin:10px 0}.kint-rich dt,.kint-rich dl{width:auto}.kint-rich dt,.kint-rich div.access-path{background:#fdf6e3;border:1px solid #93a1a1;color:#657b83;display:block;font-weight:bold;list-style:none outside none;overflow:auto;padding:5px}.kint-rich dt:hover,.kint-rich div.access-path:hover{border-color:#268bd2}.kint-rich>dl dl{padding:0 0 0 15px}.kint-rich dt.kint-parent>nav,.kint-rich>footer>nav{background:url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMzAgMTUwIj48ZGVmcz48cGF0aCBzdHJva2UtbGluZWpvaW49InJvdW5kIiBkPSJNNCAzYTI0IDMyIDAgMCAxIDAgMjQgNDAgMjAtMTAgMCAxIDIzLTEyQTQwIDIwIDEwIDAgMSA0IDN6IiBpZD0iYSIvPjwvZGVmcz48ZyBmaWxsPSIjOTNhMWExIiBzdHJva2U9IiM5M2ExYTEiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxnIGZpbGw9IiM1ODZlNzUiIHN0cm9rZT0iIzU4NmU3NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAzMCkiPjx1c2UgeGxpbms6aHJlZj0iI2EiLz48dXNlIHhsaW5rOmhyZWY9IiNhIiB0cmFuc2Zvcm09InJvdGF0ZSg5MCAtMTUgNDUpIi8+PC9nPjxwYXRoIGQ9Ik02IDEyNmwxOCAxOG0tMTggMGwxOC0xOCIgc3Ryb2tlLXdpZHRoPSIyIiBzdHJva2U9IiM1ODZlNzUiLz48L3N2Zz4=") no-repeat scroll 0 0/15px 75px transparent;cursor:pointer;display:inline-block;height:15px;width:15px;margin-right:3px;vertical-align:middle}.kint-rich dt.kint-parent:hover>nav,.kint-rich>footer>nav:hover{background-position:0 25%}.kint-rich dt.kint-parent.kint-show>nav,.kint-rich>footer.kint-show>nav{background-position:0 50%}.kint-rich dt.kint-parent.kint-show:hover>nav,.kint-rich>footer.kint-show>nav:hover{background-position:0 75%}.kint-rich dt.kint-parent.kint-locked>nav{background-position:0 100%}.kint-rich dt.kint-parent+dd{display:none;border-left:1px dashed #93a1a1}.kint-rich dt.kint-parent.kint-show+dd{display:block}.kint-rich var,.kint-rich var a{color:#268bd2;font-style:normal}.kint-rich dt:hover var,.kint-rich dt:hover var a{color:#2aa198}.kint-rich dfn{font-style:normal;font-family:monospace;color:#586e75}.kint-rich pre{color:#657b83;margin:0 0 0 15px;padding:5px;overflow-y:hidden;border-top:0;border:1px solid #93a1a1;background:#fdf6e3;display:block;word-break:normal}.kint-rich .kint-popup-trigger,.kint-rich .kint-access-path-trigger,.kint-rich .kint-search-trigger{background:rgba(101,123,131,0.8);border-radius:3px;height:16px;font-size:16px;margin-left:5px;font-weight:bold;width:16px;text-align:center;float:right !important;cursor:pointer;color:#fdf6e3;position:relative;overflow:hidden;line-height:17.6px}.kint-rich .kint-popup-trigger:hover,.kint-rich .kint-access-path-trigger:hover,.kint-rich .kint-search-trigger:hover{color:#657b83;background:#fdf6e3}.kint-rich dt.kint-parent>.kint-popup-trigger{line-height:19.2px}.kint-rich .kint-search-trigger{font-size:20px}.kint-rich input.kint-search{display:none;border:1px solid #93a1a1;border-top-width:0;border-bottom-width:0;padding:5px;float:right !important;margin:-5px 0;color:#586e75;background:#eee8d5;height:26px;width:160px;position:relative;z-index:100}.kint-rich input.kint-search.kint-show{display:block}.kint-rich .kint-search-root ul.kint-tabs>li:not(.kint-search-match){background:#e2e2e2;opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match){opacity:0.5}.kint-rich .kint-search-root dl:not(.kint-search-match)>dt{background:#f0f0f0}.kint-rich .kint-search-root dl:not(.kint-search-match) dl,.kint-rich .kint-search-root dl:not(.kint-search-match) ul.kint-tabs>li:not(.kint-search-match){opacity:1}.kint-rich div.access-path{background:#eee8d5;display:none;margin-top:5px;padding:4px;white-space:pre}.kint-rich div.access-path.kint-show{display:block}.kint-rich footer{padding:0 3px 3px;font-size:9px;background:transparent}.kint-rich footer>.kint-popup-trigger{background:transparent;color:#657b83}.kint-rich footer nav{height:10px;width:10px;background-size:10px 50px}.kint-rich footer>ol{display:none;margin-left:32px}.kint-rich footer.kint-show>ol{display:block}.kint-rich a{color:#657b83;text-shadow:none;text-decoration:underline}.kint-rich a:hover{color:#586e75;border-bottom:1px dotted #586e75}.kint-rich ul{list-style:none;padding-left:15px}.kint-rich ul:not(.kint-tabs) li{border-left:1px dashed #93a1a1}.kint-rich ul:not(.kint-tabs) li>dl{border-left:none}.kint-rich ul.kint-tabs{margin:0 0 0 15px;padding-left:0;background:#fdf6e3;border:1px solid #93a1a1;border-top:0}.kint-rich ul.kint-tabs>li{background:#eee8d5;border:1px solid #93a1a1;cursor:pointer;display:inline-block;height:30px;margin:3px;padding:0 15px;vertical-align:top}.kint-rich ul.kint-tabs>li:hover,.kint-rich ul.kint-tabs>li.kint-active-tab:hover{border-color:#268bd2;color:#2aa198}.kint-rich ul.kint-tabs>li.kint-active-tab{background:#fdf6e3;border-top:0;margin-top:-1px;height:27px;line-height:24px}.kint-rich ul.kint-tabs>li:not(.kint-active-tab){line-height:25px}.kint-rich ul.kint-tabs li+li{margin-left:0}.kint-rich ul.kint-tab-contents>li{display:none}.kint-rich ul.kint-tab-contents>li.kint-show{display:block}.kint-rich dt:hover+dd>ul>li.kint-active-tab{border-color:#268bd2;color:#2aa198}.kint-rich dt>.kint-color-preview{width:16px;height:16px;display:inline-block;vertical-align:middle;margin-left:10px;border:1px solid #93a1a1;background-color:#ccc;background-image:url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2 2"><path fill="%23FFF" d="M0 0h1v2h1V1H0z"/></svg>');background-size:100%}.kint-rich dt>.kint-color-preview:hover{border-color:#268bd2}.kint-rich dt>.kint-color-preview>div{width:100%;height:100%}.kint-rich table{border-collapse:collapse;empty-cells:show;border-spacing:0}.kint-rich table *{font-size:12px}.kint-rich table dt{background:none;padding:2.5px}.kint-rich table dt .kint-parent{min-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.kint-rich table td,.kint-rich table th{border:1px solid #93a1a1;padding:2.5px;vertical-align:center}.kint-rich table th{cursor:alias}.kint-rich table td:first-child,.kint-rich table th{font-weight:bold;background:#eee8d5;color:#586e75}.kint-rich table td{background:#fdf6e3;white-space:pre}.kint-rich table td>dl{padding:0}.kint-rich table pre{border-top:0;border-right:0}.kint-rich table thead th:first-child{background:none;border:0}.kint-rich table tr:hover>td{box-shadow:0 0 1px 0 #268bd2 inset}.kint-rich table tr:hover var{color:#2aa198}.kint-rich table ul.kint-tabs li.kint-active-tab{height:20px;line-height:17px}.kint-rich pre.kint-source{margin-left:-1px}.kint-rich pre.kint-source[data-kint-filename]:before{display:block;content:attr(data-kint-filename);margin-bottom:5px;padding-bottom:5px;border-bottom:1px solid #eee8d5}.kint-rich pre.kint-source>div:before{display:inline-block;content:counter(kint-l);counter-increment:kint-l;border-right:1px solid #268bd2;padding-right:10px;margin-right:10px}.kint-rich pre.kint-source>div.kint-highlight{background:#eee8d5}.kint-rich .kint-microtime-lap{text-shadow:-1px 0 #268bd2,0 1px #268bd2,1px 0 #268bd2,0 -1px #268bd2;color:#fdf6e3;font-weight:bold}input.kint-note-input{width:100%}.kint-rich .kint-focused{box-shadow:0 0 3px 2px #859900 inset;border-radius:7px}.kint-rich>dl>dt,.kint-rich ul.kint-tabs{box-shadow:4px 0 2px -3px #268bd2 inset}.kint-rich ul.kint-tabs li.kint-active-tab{padding-top:7px;height:34px}

From 464ed0350e800e1ff18608ae1e2ed8e1c082265f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 20 Feb 2022 21:28:57 +0900
Subject: [PATCH 1650/2325] feat: can add route handler as callable

E.g.:
$routes->add('home', [Hello::class, 'index']);
$routes->add('product/(:num)/(:num)', [[Hello::class, 'index'], '$1/$2']);
---
 system/Router/RouteCollection.php             | 50 +++++++++++++++++++
 tests/system/Router/RouteCollectionTest.php   | 40 +++++++++++++++
 user_guide_src/source/incoming/routing.rst    | 25 ++++++++++
 .../source/incoming/routing/004_1.php         |  3 ++
 .../source/incoming/routing/004_2.php         |  5 ++
 .../source/incoming/routing/004_3.php         |  8 +++
 .../source/incoming/routing/004_4.php         |  8 +++
 7 files changed, 139 insertions(+)
 create mode 100644 user_guide_src/source/incoming/routing/004_1.php
 create mode 100644 user_guide_src/source/incoming/routing/004_2.php
 create mode 100644 user_guide_src/source/incoming/routing/004_3.php
 create mode 100644 user_guide_src/source/incoming/routing/004_4.php

diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 1724f8b906c9..5350aa95a6c3 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1137,6 +1137,10 @@ protected function create(string $verb, string $from, $to, ?array $options = nul
             $from = trim($from, '/');
         }
 
+        if (is_array($to)) {
+            $to = $this->processArrayCallableSyntax($from, $to);
+        }
+
         $options = array_merge($this->currentOptions ?? [], $options ?? []);
 
         // Route priority detect
@@ -1227,6 +1231,52 @@ protected function create(string $verb, string $from, $to, ?array $options = nul
         }
     }
 
+    /**
+     * @return string
+     */
+    private function processArrayCallableSyntax(string $from, array $to)
+    {
+        // [classname, method]
+        // eg, [Home::class, 'index']
+        if (is_callable($to, true, $callableName)) {
+            // If the route has placeholders, add params automatically.
+            $params = $this->getMethodParams($from);
+
+            return '\\' . $callableName . $params;
+        }
+
+        // [[classname, method], params]
+        // eg, [[Home::class, 'index'], '$1/$2']
+        if (
+            isset($to[0], $to[1])
+            && is_callable($to[0], true, $callableName)
+            && is_string($to[1])
+        ) {
+            $to = '\\' . $callableName . '/' . $to[1];
+        }
+
+        return $to;
+    }
+
+    /**
+     * Returns the method param string like `/$1/$2` for placeholders
+     */
+    private function getMethodParams(string $from): string
+    {
+        preg_match_all('/\(.+?\)/', $from, $matches);
+        $count = is_countable($matches[0]) ? count($matches[0]) : 0;
+
+        $params = '';
+
+        if ($count > 0) {
+            for ($i = 1; $i <= $count; $i++) {
+                $params .= '/$' . $i;
+            }
+        }
+
+        return $params;
+    }
+
     /**
      * Compares the subdomain(s) passed in against the current subdomain
      * on this page request.
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index cebbc454bc48..513658b57642 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -15,6 +15,7 @@
 use CodeIgniter\Router\Exceptions\RouterException;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Modules;
+use Tests\Support\Controllers\Hello;
 
 /**
  * @backupGlobals enabled
@@ -58,6 +59,45 @@ public function testBasicAdd()
         $this->assertSame($expects, $routes);
     }
 
+    public function testBasicAddCallable()
+    {
+        $routes = $this->getCollector();
+
+        $routes->add('home', [Hello::class, 'index']);
+
+        $routes  = $routes->getRoutes();
+        $expects = [
+            'home' => '\Tests\Support\Controllers\Hello::index',
+        ];
+        $this->assertSame($expects, $routes);
+    }
+
+    public function testBasicAddCallableWithParamsString()
+    {
+        $routes = $this->getCollector();
+
+        $routes->add('product/(:num)/(:num)', [[Hello::class, 'index'], '$2/$1']);
+
+        $routes  = $routes->getRoutes();
+        $expects = [
+            'product/([0-9]+)/([0-9]+)' => '\Tests\Support\Controllers\Hello::index/$2/$1',
+        ];
+        $this->assertSame($expects, $routes);
+    }
+
+    public function testBasicAddCallableWithParamsWithoutString()
+    {
+        $routes = $this->getCollector();
+
+        $routes->add('product/(:num)/(:num)', [Hello::class, 'index']);
+
+        $routes  = $routes->getRoutes();
+        $expects = [
+            'product/([0-9]+)/([0-9]+)' => '\Tests\Support\Controllers\Hello::index/$1/$2',
+        ];
+        $this->assertSame($expects, $routes);
+    }
+
     public function testAddPrefixesDefaultNamespaceWhenNoneExist()
     {
         $routes = $this->getCollector();
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index a5c527c3eedb..8eb6b845e55d 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -157,6 +157,31 @@ routes. With the examples URLs from above:
 
 will only match **product/123** and generate 404 errors for other example.
 
+
+Array Callable Syntax
+=====================
+
+Since v4.2.0, you can use array callable syntax to specify the controller:
+
+.. literalinclude:: routing/004_1.php
+   :lines: 2-
+
+Or using ``use`` keyword:
+
+.. literalinclude:: routing/004_2.php
+   :lines: 2-
+
+If there are placeholders, it will automatically set the parameters in the specified order:
+
+.. literalinclude:: routing/004_3.php
+   :lines: 2-
+
+But the auto-configured parameters may not be correct if you use regular expressions in routes.
+In such a case, you can specify the parameters manually:
+
+.. literalinclude:: routing/004_4.php
+   :lines: 2-
+
 Custom Placeholders
 ===================
 
diff --git a/user_guide_src/source/incoming/routing/004_1.php b/user_guide_src/source/incoming/routing/004_1.php
new file mode 100644
index 000000000000..b562d01ba3b2
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/004_1.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->get('/', [\App\Controllers\Home::class, 'index']);
diff --git a/user_guide_src/source/incoming/routing/004_2.php b/user_guide_src/source/incoming/routing/004_2.php
new file mode 100644
index 000000000000..6105564b13f3
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/004_2.php
@@ -0,0 +1,5 @@
+<?php
+
+use App\Controllers\Home;
+
+$routes->get('/', [Home::class, 'index']);
diff --git a/user_guide_src/source/incoming/routing/004_3.php b/user_guide_src/source/incoming/routing/004_3.php
new file mode 100644
index 000000000000..cd98314d8fe8
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/004_3.php
@@ -0,0 +1,8 @@
+<?php
+
+use App\Controllers\Product;
+
+$routes->get('product/(:num)/(:num)', [Product::class, 'index']);
+
+// The above code is the same as the following:
+$routes->get('product/(:num)/(:num)', 'Product::index/$1/$2');
diff --git a/user_guide_src/source/incoming/routing/004_4.php b/user_guide_src/source/incoming/routing/004_4.php
new file mode 100644
index 000000000000..aed6cc5176df
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/004_4.php
@@ -0,0 +1,8 @@
+<?php
+
+use App\Controllers\Product;
+
+$routes->get('product/(:num)/(:num)', [[Product::class, 'index'], '$2/$1']);
+
+// The above code is the same as the following:
+$routes->get('product/(:num)/(:num)', 'Product::index/$2/$1');

From c2422fd7da95c5993a509dbe8a5167b8f81f2ae0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Feb 2022 14:49:06 +0800
Subject: [PATCH 1651/2325] chore(deps): bump actions/setup-node from 2 to
 3.0.0 (#5740)

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2 to 3.0.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v2...v3.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/test-scss.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-scss.yml b/.github/workflows/test-scss.yml
index b7f66a17f29b..ff65863fe3a6 100644
--- a/.github/workflows/test-scss.yml
+++ b/.github/workflows/test-scss.yml
@@ -29,7 +29,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3.0.0
         with:
           # node version based on dart-sass test workflow
           node-version: 16

From ee0e6f1f8cc245d6b112d8299266e764a4e6abd9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 25 Feb 2022 16:24:40 +0900
Subject: [PATCH 1652/2325] refactor: remove `if`

---
 system/Security/Security.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/system/Security/Security.php b/system/Security/Security.php
index 4d52f9317bc6..3135374a1f02 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -278,9 +278,7 @@ public function verify(RequestInterface $request)
         }
 
         $rawToken = $this->getPostedToken($request);
-        if ($rawToken !== null) {
-            $token = $this->tokenRandomize ? $this->derandomize($rawToken) : $rawToken;
-        }
+        $token    = ($rawToken !== null && $this->tokenRandomize) ? $this->derandomize($rawToken) : $rawToken;
 
         // Do the tokens match?
         if (! isset($token, $this->hash) || ! hash_equals($this->hash, $token)) {

From e9220c0be95914b2cc225827901a71b0719340e9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 25 Feb 2022 16:26:28 +0900
Subject: [PATCH 1653/2325] refactor: fix variable name

---
 system/Security/Security.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/Security/Security.php b/system/Security/Security.php
index 3135374a1f02..3adb7bf68857 100644
--- a/system/Security/Security.php
+++ b/system/Security/Security.php
@@ -277,8 +277,9 @@ public function verify(RequestInterface $request)
             return $this;
         }
 
-        $rawToken = $this->getPostedToken($request);
-        $token    = ($rawToken !== null && $this->tokenRandomize) ? $this->derandomize($rawToken) : $rawToken;
+        $postedToken = $this->getPostedToken($request);
+        $token       = ($postedToken !== null && $this->tokenRandomize)
+            ? $this->derandomize($postedToken) : $postedToken;
 
         // Do the tokens match?
         if (! isset($token, $this->hash) || ! hash_equals($this->hash, $token)) {

From b4ae161ccd7751a1713384b9bfb3d6c3460b3ec8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 25 Feb 2022 16:30:47 +0900
Subject: [PATCH 1654/2325] refactor: add return type

---
 system/Router/RouteCollection.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 5350aa95a6c3..01b767520c68 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1231,10 +1231,7 @@ protected function create(string $verb, string $from, $to, ?array $options = nul
         }
     }
 
-    /**
-     * @return string
-     */
-    private function processArrayCallableSyntax(string $from, array $to)
+    private function processArrayCallableSyntax(string $from, array $to): string
     {
         // [classname, method]
         // eg, [Home::class, 'index']

From 13aa84e1d512ddc5e8e34727ee9473c08e3a1290 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 25 Feb 2022 16:31:11 +0900
Subject: [PATCH 1655/2325] refactor: remove unnecessary `if`

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

diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 01b767520c68..c3895d5c3b98 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1265,10 +1265,8 @@ private function getMethodParams(string $from): string
 
         $params = '';
 
-        if ($count > 0) {
-            for ($i = 1; $i <= $count; $i++) {
-                $params .= '/$' . $i;
-            }
+        for ($i = 1; $i <= $count; $i++) {
+            $params .= '/$' . $i;
         }
 
         return $params;

From 21e7c4ef5a20dcf4346d5f6da014a2a6eb6c3122 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <40514119+sfadschm@users.noreply.github.com>
Date: Fri, 25 Feb 2022 08:53:24 +0100
Subject: [PATCH 1656/2325] Fix UploadedFile instance.

Thanks, missed that.

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

diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index 198868d19c52..3580519e8d39 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -139,7 +139,7 @@ The array returned by ``getFiles()`` would look more like this::
     [
          'my-form' => [
             'details' => [
-                'avatar' => '...' // UploadedFile instance
+                'avatar' => // UploadedFile instance
             ],
         ],
     ]

From 71050295d324c5a8bfd2a0bccedcd1f1b716806d Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Fri, 25 Feb 2022 16:15:30 +0800
Subject: [PATCH 1657/2325] return type

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/Database/BaseBuilder.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index cb9efc1664e9..cc3e245a107b 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -447,10 +447,8 @@ public function selectCount(string $select = '', string $alias = '')
 
     /**
      * Adds a subquery to the selection
-     *
-     * @return static
      */
-    public function selectSubquery(BaseBuilder $subquery, string $as)
+    public function selectSubquery(BaseBuilder $subquery, string $as): self
     {
         if (! $this->isSubquery($subquery)) {
             throw new DatabaseException(

From 8ed1223204f254c28a0780c016e364815865752e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 25 Feb 2022 17:23:28 +0900
Subject: [PATCH 1658/2325] fix: add missing condition of array callable syntax
 route

---
 system/Router/RouteCollection.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index c3895d5c3b98..7eded3411b7f 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1137,7 +1137,8 @@ protected function create(string $verb, string $from, $to, ?array $options = nul
             $from = trim($from, '/');
         }
 
-        if (is_array($to)) {
+        // When redirecting to named route, $to is an array like `['zombies' => '\Zombies::index']`.
+        if (is_array($to) && count($to) === 2) {
             $to = $this->processArrayCallableSyntax($from, $to);
         }
 

From f05298d34d2e027f3c71b313823b422faa488572 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Tue, 22 Feb 2022 11:02:14 +0100
Subject: [PATCH 1659/2325] Replace .:

---
 user_guide_src/source/cli/cli_library.rst        |  2 +-
 user_guide_src/source/database/query_builder.rst | 12 ++++++------
 user_guide_src/source/general/configuration.rst  |  4 ++--
 user_guide_src/source/general/modules.rst        |  2 +-
 user_guide_src/source/incoming/controllers.rst   |  4 ++--
 user_guide_src/source/incoming/restful.rst       |  4 ++--
 user_guide_src/source/libraries/honeypot.rst     |  2 +-
 user_guide_src/source/libraries/time.rst         |  2 +-
 user_guide_src/source/models/model.rst           |  2 +-
 user_guide_src/source/outgoing/api_responses.rst |  2 +-
 user_guide_src/source/outgoing/response.rst      |  2 +-
 user_guide_src/source/outgoing/table.rst         |  2 +-
 user_guide_src/source/testing/feature.rst        |  2 +-
 user_guide_src/source/testing/overview.rst       |  4 ++--
 14 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/user_guide_src/source/cli/cli_library.rst b/user_guide_src/source/cli/cli_library.rst
index 946e264a0225..6ca89cf61468 100644
--- a/user_guide_src/source/cli/cli_library.rst
+++ b/user_guide_src/source/cli/cli_library.rst
@@ -52,7 +52,7 @@ Finally, you can pass :ref:`validation <validation>` rules to the answer input a
 .. literalinclude:: cli_library/005.php
    :lines: 2-
 
-Validation rules can also be written in the array syntax.:
+Validation rules can also be written in the array syntax:
 
 .. literalinclude:: cli_library/006.php
    :lines: 2-
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 1969620b63a8..a3f74091c8b6 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -190,12 +190,12 @@ Subqueries
 
 Permits you to write part of a **FROM** query as a subquery.
 
-This is where we add a subquery to an existing table.:
+This is where we add a subquery to an existing table:
 
 .. literalinclude:: query_builder/016.php
    :lines: 2-
 
-Use the ``$db->newQuery()`` method to make a subquery the main table.:
+Use the ``$db->newQuery()`` method to make a subquery the main table:
 
 .. literalinclude:: query_builder/017.php
    :lines: 2-
@@ -460,7 +460,7 @@ appropriate:
 .. literalinclude:: query_builder/050.php
    :lines: 2-
 
-You can use subqueries instead of an array of values.:
+You can use subqueries instead of an array of values:
 
 .. literalinclude:: query_builder/051.php
    :lines: 2-
@@ -473,7 +473,7 @@ appropriate
 .. literalinclude:: query_builder/052.php
    :lines: 2-
 
-You can use subqueries instead of an array of values.:
+You can use subqueries instead of an array of values:
 
 .. literalinclude:: query_builder/053.php
    :lines: 2-
@@ -486,7 +486,7 @@ Generates a **HAVING field NOT IN ('item', 'item')** SQL query joined with
 .. literalinclude:: query_builder/054.php
    :lines: 2-
 
-You can use subqueries instead of an array of values.:
+You can use subqueries instead of an array of values:
 
 .. literalinclude:: query_builder/055.php
    :lines: 2-
@@ -499,7 +499,7 @@ if appropriate
 .. literalinclude:: query_builder/056.php
    :lines: 2-
 
-You can use subqueries instead of an array of values.:
+You can use subqueries instead of an array of values:
 
 .. literalinclude:: query_builder/057.php
    :lines: 2-
diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst
index f72106670629..b0d4d33b2a14 100644
--- a/user_guide_src/source/general/configuration.rst
+++ b/user_guide_src/source/general/configuration.rst
@@ -55,7 +55,7 @@ The default file location (recommended for most cases) is **/app/Config**.
 The class should use the appropriate namespace, and it should extend
 ``CodeIgniter\Config\BaseConfig`` to ensure that it can receive environment-specific settings.
 
-Define the class and fill it with public properties that represent your settings.:
+Define the class and fill it with public properties that represent your settings:
 
 .. literalinclude:: configuration/004.php
 
@@ -263,7 +263,7 @@ Explicit Registrars
 
 A configuration file can also specify any number of registrars explicitly.
 This is done by adding a ``$registrars`` property to your configuration file,
-holding an array of the names of candidate registrars.:
+holding an array of the names of candidate registrars:
 
 .. literalinclude:: configuration/008.php
    :lines: 2-
diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst
index b319c551e06d..ad3e92b5a874 100644
--- a/user_guide_src/source/general/modules.rst
+++ b/user_guide_src/source/general/modules.rst
@@ -153,7 +153,7 @@ It can be turned off in the **Modules** config file, described above.
 .. note:: Since the files are being included into the current scope, the ``$filters`` instance is already defined for you.
     It will cause errors if you attempt to redefine that class.
 
-In the module's **Config/Filters.php** file, you need to define the aliases of the filters you use.:
+In the module's **Config/Filters.php** file, you need to define the aliases of the filters you use:
 
 .. literalinclude:: modules/005.php
    :lines: 2-
diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 6d0dbcc8e055..02f672c1cfcf 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -31,7 +31,7 @@ also extend the ``CodeIgniter\Controller`` if you do not need the functionality
 The BaseController provides a convenient place for loading components and performing functions that are needed by all your
 controllers. You can extend this class in any new controller.
 
-For security reasons be sure to declare any new utility methods as ``protected`` or ``private``.:
+For security reasons be sure to declare any new utility methods as ``protected`` or ``private``:
 
 .. literalinclude:: controllers/001.php
 
@@ -282,7 +282,7 @@ and in the optional second parameter, an array of custom error messages to displ
 if the items are not valid. Internally, this uses the controller's
 ``$this->request`` instance to get the data to be validated.
 The :doc:`Validation Library docs </libraries/validation>` have details on
-rule and message array formats, as well as available rules.:
+rule and message array formats, as well as available rules:
 
 .. literalinclude:: controllers/017.php
    :lines: 2-
diff --git a/user_guide_src/source/incoming/restful.rst b/user_guide_src/source/incoming/restful.rst
index 93d31a76e957..4dae7e0f40b9 100644
--- a/user_guide_src/source/incoming/restful.rst
+++ b/user_guide_src/source/incoming/restful.rst
@@ -85,7 +85,7 @@ The ``ResourceController`` provides a convenient starting point for your RESTful
 with methods that correspond to the resource routes above.
 
 Extend it, over-riding the ``modelName`` and ``format`` properties, and then
-implement those methods that you want handled.:
+implement those methods that you want handled:
 
 .. literalinclude:: restful/007.php
 
@@ -161,7 +161,7 @@ of your resource, and processing data from forms in those views,
 with methods that align to the resource routes above.
 
 Extend it, over-riding the ``modelName`` property, and then
-implement those methods that you want handled.:
+implement those methods that you want handled:
 
 .. literalinclude:: restful/015.php
 
diff --git a/user_guide_src/source/libraries/honeypot.rst b/user_guide_src/source/libraries/honeypot.rst
index 69c23e47ca03..3a713b3f8c6d 100644
--- a/user_guide_src/source/libraries/honeypot.rst
+++ b/user_guide_src/source/libraries/honeypot.rst
@@ -15,7 +15,7 @@ Enabling Honeypot
 =====================
 
 To enable a Honeypot, changes have to be made to the **app/Config/Filters.php**. Just uncomment honeypot
-from the ``$globals`` array, like...:
+from the ``$globals`` array, like:
 
 .. literalinclude:: honeypot/001.php
    :lines: 2-
diff --git a/user_guide_src/source/libraries/time.rst b/user_guide_src/source/libraries/time.rst
index b8788eee17b7..0c3b8fb59280 100644
--- a/user_guide_src/source/libraries/time.rst
+++ b/user_guide_src/source/libraries/time.rst
@@ -46,7 +46,7 @@ parse()
 -------
 
 This helper method is a static version of the default constructor. It takes a string acceptable as DateTime's
-constructor as the first parameter, a timezone as the second parameter, and the locale as the third parameter.:
+constructor as the first parameter, a timezone as the second parameter, and the locale as the third parameter:
 
 .. literalinclude:: time/004.php
    :lines: 2-
diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index abf096b90857..78ec71365afd 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -460,7 +460,7 @@ method directly, with options:
 
 The ``$options`` parameter is an associative array with one element,
 whose key is either ``'except'`` or ``'only'``, and which has as its
-value an array of fieldnames of interest.:
+value an array of fieldnames of interest:
 
 .. literalinclude:: model/037.php
    :lines: 2-
diff --git a/user_guide_src/source/outgoing/api_responses.rst b/user_guide_src/source/outgoing/api_responses.rst
index 1e6e2bba735f..a0a5321899af 100644
--- a/user_guide_src/source/outgoing/api_responses.rst
+++ b/user_guide_src/source/outgoing/api_responses.rst
@@ -123,7 +123,7 @@ Class Reference
     :param string $message: A custom "reason" message to return.
     :returns: The value of the Response object's send() method.
 
-    Sets the appropriate status code to use when a new resource was created, typically 201.:
+    Sets the appropriate status code to use when a new resource was created, typically 201:
 
     .. literalinclude:: api_responses/007.php
        :lines: 2-
diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
index 6a1fcd81b85c..48e21ec311a2 100644
--- a/user_guide_src/source/outgoing/response.rst
+++ b/user_guide_src/source/outgoing/response.rst
@@ -175,7 +175,7 @@ Runtime Configuration
 If your application needs to make changes at run-time, you can access the instance at ``$response->CSP``. The
 class holds a number of methods that map pretty clearly to the appropriate header value that you need to set.
 Examples are shown below, with different combinations of parameters, though all accept either a directive
-name or an array of them.:
+name or an array of them:
 
 .. literalinclude:: response/012.php
    :lines: 2-
diff --git a/user_guide_src/source/outgoing/table.rst b/user_guide_src/source/outgoing/table.rst
index 9890a18acbe4..159152f1b93b 100644
--- a/user_guide_src/source/outgoing/table.rst
+++ b/user_guide_src/source/outgoing/table.rst
@@ -74,7 +74,7 @@ example, only the table opening tag is being changed:
    :lines: 2-
 
 You can also set defaults for these by passing an array of template settings
-to the Table constructor.:
+to the Table constructor:
 
 .. literalinclude:: table/008.php
    :lines: 2-
diff --git a/user_guide_src/source/testing/feature.rst b/user_guide_src/source/testing/feature.rst
index 54cb6035a804..36ab73d4eea2 100644
--- a/user_guide_src/source/testing/feature.rst
+++ b/user_guide_src/source/testing/feature.rst
@@ -66,7 +66,7 @@ Setting Headers
 ---------------
 
 You can set header values with the ``withHeaders()`` method. This takes an array of key/value pairs that would be
-passed as a header into the call.:
+passed as a header into the call:
 
 .. literalinclude:: feature/006.php
    :lines: 2-
diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst
index 9c3fec194ab4..1b32a3337c63 100644
--- a/user_guide_src/source/testing/overview.rst
+++ b/user_guide_src/source/testing/overview.rst
@@ -161,7 +161,7 @@ in PHPunit <https://phpunit.readthedocs.io/en/9.5/annotations.html#runinseparate
 **assertCloseEnough($expected, $actual, $message = '', $tolerance = 1)**
 
 For extended execution time testing, tests that the absolute difference
-between expected and actual time is within the prescribed tolerance.:
+between expected and actual time is within the prescribed tolerance:
 
 .. literalinclude:: overview/012.php
    :lines: 2-
@@ -171,7 +171,7 @@ The above test will allow the actual time to be either 660 or 661 seconds.
 **assertCloseEnoughString($expected, $actual, $message = '', $tolerance = 1)**
 
 For extended execution time testing, tests that the absolute difference
-between expected and actual time, formatted as strings, is within the prescribed tolerance.:
+between expected and actual time, formatted as strings, is within the prescribed tolerance:
 
 .. literalinclude:: overview/013.php
    :lines: 2-

From f0e473c76f12099c2f4524fd334c397588f229b1 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Fri, 25 Feb 2022 09:39:40 +0100
Subject: [PATCH 1660/2325] Replace utf-8 chars.

---
 .../source/changelogs/v4.0.0-alpha.2.rst           | 10 +++++-----
 user_guide_src/source/changelogs/v4.0.0-beta.2.rst |  2 +-
 user_guide_src/source/changelogs/v4.0.0-beta.4.rst |  2 +-
 user_guide_src/source/database/queries.rst         |  2 +-
 user_guide_src/source/dbmgmt/forge.rst             |  4 ++--
 user_guide_src/source/extending/core_classes.rst   |  2 +-
 user_guide_src/source/general/configuration.rst    |  8 ++++----
 user_guide_src/source/incoming/controllers.rst     |  2 +-
 user_guide_src/source/incoming/incomingrequest.rst |  2 +-
 user_guide_src/source/incoming/routing.rst         |  6 +++---
 user_guide_src/source/installation/running.rst     | 14 +++++++-------
 user_guide_src/source/installation/upgrade_4xx.rst |  4 ++--
 .../source/installation/upgrade_controllers.rst    |  2 +-
 .../source/installation/upgrade_models.rst         |  2 +-
 .../source/installation/upgrade_views.rst          |  2 +-
 user_guide_src/source/libraries/cookies.rst        |  2 +-
 user_guide_src/source/libraries/validation.rst     | 12 ++++++------
 user_guide_src/source/outgoing/views.rst           |  4 ++--
 user_guide_src/source/tutorial/news_section.rst    |  4 ++--
 user_guide_src/source/tutorial/static_pages.rst    |  2 +-
 20 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.0.0-alpha.2.rst b/user_guide_src/source/changelogs/v4.0.0-alpha.2.rst
index 7c780ecf09d8..3a3f6b21f613 100644
--- a/user_guide_src/source/changelogs/v4.0.0-alpha.2.rst
+++ b/user_guide_src/source/changelogs/v4.0.0-alpha.2.rst
@@ -170,20 +170,20 @@ PRs merged:
 - #1316 Refactor TimeTest
 - #1314 Fix & expand Honeypot & its tests
 - #1313 Clean exception
-- #1311 Entities store an original stack of values to compare against so we d…
+- #1311 Entities store an original stack of values to compare against so we d...
 - #1306 Testing3/http
 - #1305 Change chdir('public') to chdir($public)
 - #1304 Refactor script name stripping in parseRequestURI()
 - #1303 Testing/http
-- #1302 Exception：No Formatter defined for mime type ''
+- #1302 Exception: No Formatter defined for mime type ''
 - #1300 Allow redirect with Query Vars from the current request.
 - #1295 Fix grammar in front controller comment.
 - #1294 Updated final tutorial page. Fixes #1292
 - #1291 Allows extending of helpers. Fixes #1264
 - #1286 Cookies
-- #1285 Ensure current HTTP verb routes are matched prior to any * matched ro…
+- #1285 Ensure current HTTP verb routes are matched prior to any * matched ro...
 - #1283 Entities
-- #1282 system/Test/FeatureTestCase::setupRequest(), minor fixes phpdoc block…
+- #1282 system/Test/FeatureTestCase::setupRequest(), minor fixes phpdoc block...
 - #1281 Tut
 - #1280 Add contributing reference to user guide
 - #1273 Fix/timing
@@ -193,6 +193,6 @@ PRs merged:
 - #1266 Adjusting the release build scripts
 - #1265 WIP Fix docs re PHP server
 - #1245 Fix #1244 (form_hidden declaration)
-- #1239 【Unsolicited PR】I changed the download method to testable.
+- #1239 [Unsolicited PR] I changed the download method to testable.
 - #1217 Optional parameter for resetSelect() call in Builder's countAll();
 - #1209 Fix undefined function xml_convert at Database\BaseUtils
diff --git a/user_guide_src/source/changelogs/v4.0.0-beta.2.rst b/user_guide_src/source/changelogs/v4.0.0-beta.2.rst
index 557b0805adba..b470f353c076 100644
--- a/user_guide_src/source/changelogs/v4.0.0-beta.2.rst
+++ b/user_guide_src/source/changelogs/v4.0.0-beta.2.rst
@@ -232,7 +232,7 @@ PRs merged:
 - #1839 Dont replace slashes with backslashes in the to route
 - #1836 Test: Improve View\View coverage
 - #1831 Fix some PHPDoc comments error
-- #1829 Improve: Models now require a primary key. This is partially to keep the code …
+- #1829 Improve: Models now require a primary key. This is partially to keep the code ...
 - #1828 Fix: Remove bootstrap styles from validation views.
 - #1827 Fix: Adding include method to View library to render view partials... views.
 - #1823 Docs: Remove legacy Bootstrap references in Pagination class
diff --git a/user_guide_src/source/changelogs/v4.0.0-beta.4.rst b/user_guide_src/source/changelogs/v4.0.0-beta.4.rst
index 9939285bf85c..69e3caee6540 100644
--- a/user_guide_src/source/changelogs/v4.0.0-beta.4.rst
+++ b/user_guide_src/source/changelogs/v4.0.0-beta.4.rst
@@ -189,7 +189,7 @@ PRs merged:
 - #2005 Plugin closures docs update and test
 - #2004 Allow hasChanged() without parameter
 - #2002 Entity Refactor
-- #1999 use CodeIgniter\Controller; not needed since Home Controller extends …
+- #1999 use CodeIgniter\Controller; not needed since Home Controller extends ...
 - #1996 Attempting to fix CURLRequest debug issue. #1994
 - #e21823 Corrected docs for parser plugins. Closes #1995
 - #1989 argument set() must by type of string - cannot agree
diff --git a/user_guide_src/source/database/queries.rst b/user_guide_src/source/database/queries.rst
index 0ab160d54c95..5aff248a5aed 100644
--- a/user_guide_src/source/database/queries.rst
+++ b/user_guide_src/source/database/queries.rst
@@ -158,7 +158,7 @@ The resulting query will be::
 
 The secondary benefit of using binds is that the values are
 automatically escaped producing safer queries.
-You don't have to remember to manually escape data — the engine does it automatically for you.
+You don't have to remember to manually escape data - the engine does it automatically for you.
 
 Named Bindings
 ==============
diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index 9c3b16d56588..95374ae354a2 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -322,8 +322,8 @@ Class Reference
         :param    string|string[]    $fieldName: Name of a key field or an array of fields
         :param    string    $tableName: Name of a parent table
         :param    string|string[]    $tableField: Name of a parent table field or an array of fields
-        :param    string    $onUpdate: Desired action for the “on update”
-        :param    string    $onDelete: Desired action for the “on delete”
+        :param    string    $onUpdate: Desired action for the "on update"
+        :param    string    $onDelete: Desired action for the "on delete"
         :returns:    \CodeIgniter\Database\Forge instance (method chaining)
         :rtype:    \CodeIgniter\Database\Forge
 
diff --git a/user_guide_src/source/extending/core_classes.rst b/user_guide_src/source/extending/core_classes.rst
index adfbfd49b5f3..6c87d764410e 100644
--- a/user_guide_src/source/extending/core_classes.rst
+++ b/user_guide_src/source/extending/core_classes.rst
@@ -74,4 +74,4 @@ If you need to use a constructor in your class make sure you extend the parent c
 .. literalinclude:: core_classes/004.php
 
 **Tip:**  Any functions in your class that are named identically to the methods in the parent class will be used
-instead of the native ones (this is known as “method overriding”). This allows you to substantially alter the CodeIgniter core.
+instead of the native ones (this is known as "method overriding"). This allows you to substantially alter the CodeIgniter core.
diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst
index b0d4d33b2a14..9ce38839dc5b 100644
--- a/user_guide_src/source/general/configuration.rst
+++ b/user_guide_src/source/general/configuration.rst
@@ -62,18 +62,18 @@ Define the class and fill it with public properties that represent your settings
 Environment Variables
 =====================
 
-One of today’s best practices for application setup is to use Environment Variables. One reason for this is that Environment Variables are easy to change between deploys without changing any code. Configuration can change a lot across deploys, but code does not. For instance, multiple environments, such as the developer’s local machine and the production server, usually need different configuration values for each particular setup.
+One of today's best practices for application setup is to use Environment Variables. One reason for this is that Environment Variables are easy to change between deploys without changing any code. Configuration can change a lot across deploys, but code does not. For instance, multiple environments, such as the developer's local machine and the production server, usually need different configuration values for each particular setup.
 
 Environment Variables should also be used for anything private such as passwords, API keys, or other sensitive data.
 
 Environment Variables and CodeIgniter
 =====================================
 
-CodeIgniter makes it simple and painless to set Environment Variables by using a “dotenv” file. The term comes from the file name, which starts with a dot before the text “env”.
+CodeIgniter makes it simple and painless to set Environment Variables by using a "dotenv" file. The term comes from the file name, which starts with a dot before the text "env".
 
 CodeIgniter expects **.env** to be at the root of your project alongside the ``system``
-and ``app`` directories. There is a template file distributed with CodeIgniter that’s
-located at the project root named **env** (Notice there’s no dot (**.**) at the start?).
+and ``app`` directories. There is a template file distributed with CodeIgniter that's
+located at the project root named **env** (Notice there's no dot (**.**) at the start?).
 It has a large collection of variables your project might use that have been assigned
 empty, dummy, or default values. You can use this file as a starting place for your
 application by either renaming the template to **.env**, or by making a copy of it named **.env**.
diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 02f672c1cfcf..5dabad7ce003 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -137,7 +137,7 @@ A few lines further down **Routes.php** in the "Route Definitions" section, comm
    :lines: 2-
 
 If you now browse to your site without specifying any URI segments you'll
-see the “Hello World” message.
+see the "Hello World" message.
 
 .. note:: The line ``$routes->get('/', 'Home::index');`` is an optimization that you will want to use in a "real-world" app. But for demonstration purposes we don't want to use that feature. ``$routes->get()`` is explained in :doc:`URI Routing <routing>`
 
diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index 2691a034aeaf..24ac0a9a183b 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -70,7 +70,7 @@ like this:
 .. literalinclude:: incomingrequest/007.php
    :lines: 2-
 
-With CodeIgniter’s built in methods you can simply do this:
+With CodeIgniter's built-in methods you can simply do this:
 
 .. literalinclude:: incomingrequest/008.php
    :lines: 2-
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index a5c527c3eedb..acd72c0d3ac5 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -32,7 +32,7 @@ Defined Routes
 In some instances, however, you may want to remap this relationship so that a different
 class/method can be called instead of the one corresponding to the URL.
 
-For example, let’s say you want your URLs to have this prototype::
+For example, let's say you want your URLs to have this prototype::
 
     example.com/product/1/
     example.com/product/2/
@@ -194,7 +194,7 @@ redirect them back to the same page after they log in, you may find this example
 .. literalinclude:: routing/015.php
    :lines: 2-
 
-For those of you who don’t know regular expressions and want to learn more about them,
+For those of you who don't know regular expressions and want to learn more about them,
 `regular-expressions.info <https://www.regular-expressions.info/>`_ might be a good starting point.
 
 .. important:: Note: You can also mix and match wildcards with regular expressions.
@@ -548,7 +548,7 @@ Translate URI Dashes
 
 This option enables you to automatically replace dashes (``-``) with underscores in the controller and method
 URI segments, thus saving you additional route entries if you need to do that. This is required because the
-dash isn’t a valid class or method name character and would cause a fatal error if you try to use it:
+dash isn't a valid class or method name character and would cause a fatal error if you try to use it:
 
 .. literalinclude:: routing/045.php
    :lines: 2-
diff --git a/user_guide_src/source/installation/running.rst b/user_guide_src/source/installation/running.rst
index a914d43d37ca..9d53658257c8 100644
--- a/user_guide_src/source/installation/running.rst
+++ b/user_guide_src/source/installation/running.rst
@@ -6,10 +6,10 @@ Running Your App
     :depth: 2
 
 A CodeIgniter 4 app can be run in a number of different ways: hosted on a web server,
-using virtualization, or using CodeIgniter’s command line tool for testing.
+using virtualization, or using CodeIgniter's command line tool for testing.
 This section addresses how to use each technique, and explains some of the pros and cons of them.
 
-If you’re new to CodeIgniter, please read the :doc:`Getting Started </intro/index>`
+If you're new to CodeIgniter, please read the :doc:`Getting Started </intro/index>`
 section of the User Guide to begin learning how to build dynamic PHP applications. Enjoy!
 
 Initial Configuration & Set Up
@@ -74,7 +74,7 @@ Hosting with Apache
 ===================
 
 A CodeIgniter4 webapp is normally hosted on a web server.
-Apache’s ``httpd`` is the "standard" platform, and assumed in much of our documentation.
+Apache's ``httpd`` is the "standard" platform, and assumed in much of our documentation.
 
 Apache is bundled with many platforms, but can also be downloaded in a bundle
 with a database engine and PHP from `Bitnami <https://bitnami.com/stacks/infrastructure>`_.
@@ -82,7 +82,7 @@ with a database engine and PHP from `Bitnami <https://bitnami.com/stacks/infrast
 .htaccess
 ---------
 
-The “mod_rewrite” module enables URLs without “index.php” in them, and is assumed
+The "mod_rewrite" module enables URLs without "index.php" in them, and is assumed
 in our user guide.
 
 Make sure that the rewrite module is enabled (uncommented) in the main
@@ -102,7 +102,7 @@ in the "AllowOverride" setting::
 Virtual Hosting
 ---------------
 
-We recommend using “virtual hosting” to run your apps.
+We recommend using "virtual hosting" to run your apps.
 You can set up different aliases for each of the apps you work on,
 
 Make sure that the virtual hosting module is enabled (uncommented) in the main
@@ -110,7 +110,7 @@ configuration file, e.g., ``apache2/conf/httpd.conf``::
 
     LoadModule vhost_alias_module modules/mod_vhost_alias.so
 
-Add a host alias in your “hosts” file, typically ``/etc/hosts`` on unix-type platforms,
+Add a host alias in your "hosts" file, typically ``/etc/hosts`` on unix-type platforms,
 or ``c:/Windows/System32/drivers/etc/hosts`` on Windows.
 Add a line to the file. This could be "myproject.local" or "myproject.test", for instance::
 
@@ -207,7 +207,7 @@ Hosting with Nginx
 Nginx is the second most widely used HTTP server for web hosting.
 Here you can find an example configuration using PHP 7.3 FPM (unix sockets) under Ubuntu Server.
 
-This configuration enables URLs without “index.php” in them and using CodeIgniter's “404 - File Not Found” for URLs ending with “.php”.
+This configuration enables URLs without "index.php" in them and using CodeIgniter's "404 - File Not Found" for URLs ending with ".php".
 
 .. code-block:: nginx
 
diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst
index face3339341b..03d72ac160eb 100644
--- a/user_guide_src/source/installation/upgrade_4xx.rst
+++ b/user_guide_src/source/installation/upgrade_4xx.rst
@@ -116,8 +116,8 @@ General Adjustments
 Upgrading Libraries
 ===================
 
-- Your app classes can still go inside **app/Libraries**, but they don’t have to.
-- Instead of CI3’s ``$this->load->library(x);`` you can now use ``$this->x = new X();``,
+- Your app classes can still go inside **app/Libraries**, but they don't have to.
+- Instead of CI3's ``$this->load->library(x);`` you can now use ``$this->x = new X();``,
   following namespaced conventions for your component.
 - Some libraries from CodeIgniter 3 no longer exists in Version 4. For all these
   libraries, you have to find a new way to implement your functions. These
diff --git a/user_guide_src/source/installation/upgrade_controllers.rst b/user_guide_src/source/installation/upgrade_controllers.rst
index 5c6160284e88..fc0bcb4d37d7 100644
--- a/user_guide_src/source/installation/upgrade_controllers.rst
+++ b/user_guide_src/source/installation/upgrade_controllers.rst
@@ -15,7 +15,7 @@ What has been changed
 =====================
 
 - Since namespaces have been added to CodeIgniter 4, the controllers must be changed to support namespaces.
-- Controllers don’t use constructors any more (to invoke CI “magic”) unless those are part of base controllers you make.
+- Controllers don't use constructors any more (to invoke CI 'magic') unless those are part of base controllers you make.
 - CI provides Request and Response objects for you to work with - more powerful than the CI3-way.
 - If you want a base controller (``MY_Controller`` in CI3), make it where you like,
   e.g., BaseController extends Controller, and then have your controllers extend it
diff --git a/user_guide_src/source/installation/upgrade_models.rst b/user_guide_src/source/installation/upgrade_models.rst
index 1b01819d9455..ea9928a8f47e 100644
--- a/user_guide_src/source/installation/upgrade_models.rst
+++ b/user_guide_src/source/installation/upgrade_models.rst
@@ -24,7 +24,7 @@ Upgrade Guide
 2. Add this line just after the opening php tag: ``namespace App\Models;``.
 3. Below the ``namespace App\Models;`` line add this line: ``use CodeIgniter\Model;``.
 4. Replace ``extends CI_Model`` with ``extends Model``.
-5. Instead of CI3’s ``$this->load->model(x);``, you would now use ``$this->x = new X();``, following namespaced conventions for your component. Alternatively, you can use the ``model()`` function: ``$this->x = model('X');``.
+5. Instead of CI3's ``$this->load->model(x);``, you would now use ``$this->x = new X();``, following namespaced conventions for your component. Alternatively, you can use the ``model()`` function: ``$this->x = model('X');``.
 
 If you use sub-directories in your model structure you have to change the namespace according to that.
 Example: You have a version 3 model located in **application/models/users/user_contact.php** the namespace has to be ``namespace App\Models\Users;`` and the model path in the version 4 should look like this: **app/Models/Users/UserContact.php**
diff --git a/user_guide_src/source/installation/upgrade_views.rst b/user_guide_src/source/installation/upgrade_views.rst
index 773ad6541931..ac7df48f2844 100644
--- a/user_guide_src/source/installation/upgrade_views.rst
+++ b/user_guide_src/source/installation/upgrade_views.rst
@@ -14,7 +14,7 @@ Documentations
 What has been changed
 =====================
 
-- Your views look much like before, but they are invoked differently … instead of CI3’s
+- Your views look much like before, but they are invoked differently ... instead of CI3's
   ``$this->load->view(x);``, you can use ``echo view(x);``.
 - CI4 supports *View Cells* to build your response in pieces, and *View Layouts* for page layout.
 - The template parser is still there, and substantially enhanced.
diff --git a/user_guide_src/source/libraries/cookies.rst b/user_guide_src/source/libraries/cookies.rst
index a5baea10ce1d..7869bacf183d 100644
--- a/user_guide_src/source/libraries/cookies.rst
+++ b/user_guide_src/source/libraries/cookies.rst
@@ -5,7 +5,7 @@ Cookies
 An **HTTP cookie** (web cookie, browser cookie) is a small piece of data that a server
 sends to the user's web browser. The browser may store it and send it back with later
 requests to the same server. Typically, it's used to tell if two requests came from
-the same browser — keeping a user logged-in, for example.
+the same browser - keeping a user logged-in, for example.
 It remembers stateful information for the stateless HTTP protocol.
 
 Cookies are mainly used for three purposes:
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index b4d50282c750..778857d4f01b 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -434,13 +434,13 @@ Or as a labeled style:
 .. literalinclude:: validation/024.php
    :lines: 2-
 
-If you’d like to include a field’s “human” name, or the optional parameter some rules allow for (such as max_length),
-or the value that was validated you can add the ``{field}``, ``{param}`` and ``{value}`` tags to your message, respectively::
+If you'd like to include a field's "human" name, or the optional parameter some rules allow for (such as max_length),
+or the value that was validated you can add the ``{field}``, ``{param}`` and ``{value}`` tags to your message, respectively:
 
     'min_length' => 'Supplied value ({value}) for {field} must have at least {param} characters.'
 
-On a field with the human name Username and a rule of ``min_length[6]`` with a value of “Pizza”, an error would display: “Supplied value (Pizza) for Username must have
-at least 6 characters.”
+On a field with the human name Username and a rule of ``min_length[6]`` with a value of "Pizza", an error would display: "Supplied value (Pizza) for Username must have
+at least 6 characters."
 
 .. warning:: If you get the error messages with ``getErrors()`` or ``getError()``, the messages are not HTML escaped. If you use user input data like ``({value})`` to make the error message, it might contain HTML tags. If you don't escape the messages before displying them, XSS attacks are possible.
 
@@ -714,8 +714,8 @@ valid_email             No         Fails if field does not contain a valid
 valid_emails            No         Fails if any value provided in a comma
                                    separated list is not a valid email.
 valid_ip                No         Fails if the supplied IP is not valid.        valid_ip[ipv6]
-                                   Accepts an optional parameter of ‘ipv4’ or
-                                   ‘ipv6’ to specify an IP format.
+                                   Accepts an optional parameter of 'ipv4' or
+                                   'ipv6' to specify an IP format.
 valid_url               No         Fails if field does not contain (loosely) a
                                    URL. Includes simple strings that could be
                                    hostnames, like "codeigniter".
diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst
index 9c386f3feb7c..2960a3c3c79a 100644
--- a/user_guide_src/source/outgoing/views.rst
+++ b/user_guide_src/source/outgoing/views.rst
@@ -14,7 +14,7 @@ Views are never called directly, they must be loaded by a controller. Remember t
 the Controller acts as the traffic cop, so it is responsible for fetching a particular view. If you have
 not read the :doc:`Controllers </incoming/controllers>` page, you should do so before continuing.
 
-Using the example controller you created in the controller page, let’s add a view to it.
+Using the example controller you created in the controller page, let's add a view to it.
 
 Creating a View
 ===============
@@ -150,7 +150,7 @@ The data array you pass to your view files is not limited to simple variables. Y
 arrays, which can be looped to generate multiple rows. For example, if you pull data from your database it will
 typically be in the form of a multi-dimensional array.
 
-Here’s a simple example. Add this to your controller:
+Here's a simple example. Add this to your controller:
 
 .. literalinclude:: views/011.php
 
diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
index 3e5c7b0dd631..f51e68c5abc7 100644
--- a/user_guide_src/source/tutorial/news_section.rst
+++ b/user_guide_src/source/tutorial/news_section.rst
@@ -84,8 +84,8 @@ library. This will make the database class available through the
 
 Now that the database and a model have been set up, you'll need a method
 to get all of our posts from our database. To do this, the database
-abstraction layer that is included with CodeIgniter —
-:doc:`Query Builder <../database/query_builder>` — is used. This makes it
+abstraction layer that is included with CodeIgniter -
+:doc:`Query Builder <../database/query_builder>` - is used. This makes it
 possible to write your 'queries' once and make them work on :doc:`all
 supported database systems <../intro/requirements>`. The Model class
 also allows you to easily work with the Query Builder and provides
diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
index 0b64ca40baba..a5bcaf7fa94b 100644
--- a/user_guide_src/source/tutorial/static_pages.rst
+++ b/user_guide_src/source/tutorial/static_pages.rst
@@ -94,7 +94,7 @@ static page bodies will be located in the **app/Views/pages/**
 directory.
 
 In that directory, create two files named **home.php** and **about.php**.
-Within those files, type some text − anything you'd like − and save them.
+Within those files, type some text - anything you'd like - and save them.
 If you like to be particularly un-original, try "Hello World!".
 
 In order to load those pages, you'll have to check whether the requested

From fcd95942d193ec5cccfbea18ec313eaeeee84ae7 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Fri, 25 Feb 2022 09:57:57 +0100
Subject: [PATCH 1661/2325] Extract.

---
 user_guide_src/source/libraries/validation.rst    | 15 +++++----------
 .../source/libraries/validation/028.2.php         | 13 +++++++++++++
 2 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 user_guide_src/source/libraries/validation/028.2.php

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 778857d4f01b..664aefb96661 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -468,7 +468,7 @@ If you need to retrieve all error messages for failed fields, you can use the ``
 
 If no errors exist, an empty array will be returned.
 
-When using a wildcard, the error will point to a specific field, replacing the asterisk with the appropriate key/keys.::
+When using a wildcard, the error will point to a specific field, replacing the asterisk with the appropriate key/keys::
 
     // for data
     'contacts' => [
@@ -486,7 +486,7 @@ When using a wildcard, the error will point to a specific field, replacing the a
     contacts.*.name => 'required'
 
     // error will be
-    'contacts.friends.1.name' => 'The contacts.*.name field is required.',
+    'contacts.friends.1.name' => 'The contacts.*.name field is required.'
 
 Getting a Single Error
 ======================
@@ -509,15 +509,10 @@ You can check to see if an error exists with the ``hasError()`` method. The only
 .. literalinclude:: validation/028.php
    :lines: 2-
 
-When specifying a field with a wildcard, all errors matching the mask will be checked.::
+When specifying a field with a wildcard, all errors matching the mask will be checked:
 
-    // for errors
-    [
-        'foo.0.bar'   => 'Error',
-        'foo.baz.bar' => 'Error',
-    ]
-
-    $validation->hasError('foo.*.bar'); // return true
+.. literalinclude:: validation/028.2.php
+   :lines: 2-
 
 Customizing Error Display
 *************************
diff --git a/user_guide_src/source/libraries/validation/028.2.php b/user_guide_src/source/libraries/validation/028.2.php
new file mode 100644
index 000000000000..6ad70098c789
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/028.2.php
@@ -0,0 +1,13 @@
+<?php
+
+/*
+    For errors:
+
+    [
+        'foo.0.bar'   => 'Error',
+        'foo.baz.bar' => 'Error',
+    ]
+*/
+
+// returns true
+$validation->hasError('foo.*.bar');

From 28aed3f3f8f3fbf6190d8e13371684dc890c4de1 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <40514119+sfadschm@users.noreply.github.com>
Date: Sat, 26 Feb 2022 00:34:55 +0100
Subject: [PATCH 1662/2325] [Docs] Show opening tags. (#5723)

* No need to carry the :lines: directive around anymore.

* Display php opening tag.

* Add closing tag for mixed HTML.

* Remove unneeded comment.

* Convert comment.

* Convert comment to HTML.
---
 user_guide_src/renumerate                     |  2 +-
 user_guide_src/source/cli/cli.rst             |  1 -
 user_guide_src/source/cli/cli_commands.rst    |  6 --
 user_guide_src/source/cli/cli_library.rst     | 21 ----
 user_guide_src/source/cli/cli_request.rst     |  6 --
 user_guide_src/source/concepts/autoloader.rst |  3 -
 user_guide_src/source/concepts/factories.rst  |  5 -
 user_guide_src/source/concepts/http.rst       |  2 -
 user_guide_src/source/concepts/services.rst   | 11 ---
 .../source/database/call_function.rst         |  4 -
 .../source/database/configuration.rst         |  9 --
 user_guide_src/source/database/connecting.rst |  8 --
 user_guide_src/source/database/events.rst     |  1 -
 user_guide_src/source/database/examples.rst   |  8 --
 user_guide_src/source/database/helpers.rst    |  4 -
 user_guide_src/source/database/metadata.rst   |  9 --
 user_guide_src/source/database/queries.rst    | 29 ------
 .../source/database/query_builder.rst         | 97 -------------------
 user_guide_src/source/database/results.rst    | 21 ----
 .../source/database/transactions.rst          |  6 --
 user_guide_src/source/database/utilities.rst  |  1 -
 user_guide_src/source/dbmgmt/forge.rst        | 26 -----
 user_guide_src/source/dbmgmt/migration.rst    |  5 -
 user_guide_src/source/dbmgmt/seeds.rst        |  2 -
 .../source/extending/basecontroller.rst       |  3 -
 .../source/extending/core_classes.rst         |  1 -
 user_guide_src/source/extending/events.rst    |  8 --
 user_guide_src/source/general/caching.rst     |  1 -
 .../source/general/common_functions.rst       |  8 --
 .../source/general/common_functions/002.php   |  7 +-
 .../source/general/configuration.rst          |  8 --
 user_guide_src/source/general/errors.rst      | 11 ---
 user_guide_src/source/general/helpers.rst     |  5 -
 user_guide_src/source/general/logging.rst     |  6 --
 .../source/general/managing_apps.rst          |  4 -
 user_guide_src/source/general/modules.rst     | 12 ---
 .../source/helpers/array_helper.rst           | 11 ---
 .../source/helpers/cookie_helper.rst          |  3 -
 user_guide_src/source/helpers/date_helper.rst |  3 -
 .../source/helpers/filesystem_helper.rst      | 15 ---
 user_guide_src/source/helpers/form_helper.rst | 34 -------
 .../source/helpers/form_helper/002.php        |  2 +
 .../source/helpers/form_helper/021.php        | 13 ++-
 .../source/helpers/form_helper/022.php        | 13 ++-
 user_guide_src/source/helpers/html_helper.rst | 20 ----
 .../source/helpers/inflector_helper.rst       | 13 ---
 .../source/helpers/number_helper.rst          |  9 --
 .../source/helpers/security_helper.rst        |  3 -
 user_guide_src/source/helpers/test_helper.rst |  2 -
 user_guide_src/source/helpers/text_helper.rst | 22 -----
 user_guide_src/source/helpers/url_helper.rst  | 24 -----
 user_guide_src/source/helpers/xml_helper.rst  |  2 -
 .../source/incoming/content_negotiation.rst   |  7 --
 .../source/incoming/controllers.rst           | 13 ---
 user_guide_src/source/incoming/filters.rst    | 10 --
 .../source/incoming/incomingrequest.rst       | 36 -------
 user_guide_src/source/incoming/message.rst    | 10 --
 user_guide_src/source/incoming/request.rst    |  7 --
 user_guide_src/source/incoming/restful.rst    | 14 ---
 user_guide_src/source/incoming/routing.rst    | 48 ---------
 .../source/incoming/routing/025.php           |  6 +-
 .../source/incoming/routing/026.php           |  6 +-
 .../source/installation/troubleshooting.rst   |  2 -
 .../source/installation/upgrade_404.rst       |  2 -
 .../source/installation/upgrade_412.rst       |  2 -
 .../source/installation/upgrade_415.rst       |  1 -
 .../source/installation/upgrade_database.rst  |  2 -
 .../source/installation/upgrade_emails.rst    |  2 -
 .../installation/upgrade_encryption.rst       |  2 -
 .../installation/upgrade_html_tables.rst      |  2 -
 .../installation/upgrade_localization.rst     |  3 -
 .../installation/upgrade_pagination.rst       |  2 -
 .../source/installation/upgrade_responses.rst |  2 -
 .../source/installation/upgrade_security.rst  |  2 -
 .../installation/upgrade_security/002.php     |  2 +-
 .../source/installation/upgrade_sessions.rst  |  2 -
 .../installation/upgrade_validations.rst      |  1 -
 .../installation/upgrade_view_parser.rst      |  2 -
 user_guide_src/source/libraries/caching.rst   | 14 ---
 user_guide_src/source/libraries/cookies.rst   | 16 ---
 .../source/libraries/curlrequest.rst          | 33 -------
 user_guide_src/source/libraries/email.rst     | 23 -----
 .../source/libraries/encryption.rst           | 12 ---
 user_guide_src/source/libraries/files.rst     | 15 ---
 user_guide_src/source/libraries/honeypot.rst  |  1 -
 user_guide_src/source/libraries/images.rst    | 14 ---
 .../source/libraries/pagination.rst           | 11 ---
 .../source/libraries/pagination/004.php       |  4 +-
 user_guide_src/source/libraries/publisher.rst |  9 --
 user_guide_src/source/libraries/security.rst  | 10 --
 user_guide_src/source/libraries/sessions.rst  | 43 --------
 user_guide_src/source/libraries/throttler.rst |  3 -
 user_guide_src/source/libraries/time.rst      | 41 --------
 .../source/libraries/typography.rst           |  4 -
 .../source/libraries/uploaded_files.rst       | 18 ----
 user_guide_src/source/libraries/uri.rst       | 27 ------
 .../source/libraries/user_agent.rst           |  5 -
 .../source/libraries/validation.rst           | 36 -------
 user_guide_src/source/models/entities.rst     | 12 ---
 user_guide_src/source/models/model.rst        | 49 ----------
 .../source/outgoing/api_responses.rst         | 16 ---
 .../source/outgoing/localization.rst          | 16 ---
 user_guide_src/source/outgoing/response.rst   | 27 ------
 user_guide_src/source/outgoing/table.rst      | 18 ----
 user_guide_src/source/outgoing/table/014.php  |  6 +-
 user_guide_src/source/outgoing/table/015.php  | 31 ++++--
 .../source/outgoing/view_decorators.rst       |  1 -
 .../source/outgoing/view_layouts.rst          |  1 -
 .../source/outgoing/view_parser.rst           | 25 -----
 .../source/outgoing/view_renderer.rst         |  8 --
 user_guide_src/source/outgoing/views.rst      |  7 --
 user_guide_src/source/testing/benchmark.rst   |  9 --
 user_guide_src/source/testing/controllers.rst | 15 ---
 user_guide_src/source/testing/database.rst    |  5 -
 user_guide_src/source/testing/debugging.rst   |  5 -
 user_guide_src/source/testing/fabricator.rst  | 21 ----
 user_guide_src/source/testing/feature.rst     |  7 --
 user_guide_src/source/testing/mocking.rst     |  3 -
 user_guide_src/source/testing/overview.rst    | 17 ----
 user_guide_src/source/testing/response.rst    | 32 ------
 .../source/tutorial/create_news_items.rst     |  3 -
 .../source/tutorial/news_section.rst          |  4 -
 .../source/tutorial/static_pages.rst          |  3 -
 123 files changed, 58 insertions(+), 1360 deletions(-)

diff --git a/user_guide_src/renumerate b/user_guide_src/renumerate
index 814ea18430d0..7ecf1a631e4b 100644
--- a/user_guide_src/renumerate
+++ b/user_guide_src/renumerate
@@ -39,7 +39,7 @@ foreach ($srcIterator as $chapterInfo) {
                 $sectionContent = file_get_contents($sectionInfo->getPathname());
 
                 // Match all includes
-                preg_match_all("~\\.\\. literalinclude:: {$sectionName}\\/(.+)\\.php(\n[ ]*:lines: 2\\-)?~", $sectionContent, $matches);
+                preg_match_all("~\\.\\. literalinclude:: {$sectionName}\\/(.+)\\.php~", $sectionContent, $matches);
                 $includeStrings = $matches[0];
                 $exampleNames   = $matches[1];
 
diff --git a/user_guide_src/source/cli/cli.rst b/user_guide_src/source/cli/cli.rst
index 45db6a1e6e3e..f3ffcc9285f6 100644
--- a/user_guide_src/source/cli/cli.rst
+++ b/user_guide_src/source/cli/cli.rst
@@ -85,7 +85,6 @@ the CLI as easily as you would create any other route. Instead of using the ``ge
 works exactly like a normal route definition:
 
 .. literalinclude:: cli/002.php
-   :lines: 2-
 
 For more information, see the :ref:`Routes <command-line-only-routes>` page.
 
diff --git a/user_guide_src/source/cli/cli_commands.rst b/user_guide_src/source/cli/cli_commands.rst
index 075ab86558f5..30d92a195390 100644
--- a/user_guide_src/source/cli/cli_commands.rst
+++ b/user_guide_src/source/cli/cli_commands.rst
@@ -48,7 +48,6 @@ Commands can also be ran from within your own code. This is most often done with
 but they can be used at any time. You do this by using the ``command()`` function. This function is always available.
 
 .. literalinclude:: cli_commands/001.php
-   :lines: 2-
 
 The only argument is string that is the command called and any parameters. This appears exactly as you would call
 it from the command line.
@@ -127,7 +126,6 @@ any CLI arguments after the command name for your use. If the CLI string was::
 Then **foo** is the command name, and the ``$params`` array would be:
 
 .. literalinclude:: cli_commands/003.php
-   :lines: 2-
 
 This can also be accessed through the :doc:`CLI </cli/cli_library>` library, but this already has your command removed
 from the string. These parameters can be used to customize how your scripts behave.
@@ -135,7 +133,6 @@ from the string. These parameters can be used to customize how your scripts beha
 Our demo command might have a ``run`` method something like:
 
 .. literalinclude:: cli_commands/004.php
-   :lines: 2-
 
 ***********
 BaseCommand
@@ -155,7 +152,6 @@ be familiar with when creating your own commands. It also has a :doc:`Logger </g
         This method allows you to run other commands during the execution of your current command:
 
         .. literalinclude:: cli_commands/005.php
-           :lines: 2-
 
     .. php:method:: showError(Throwable $e)
 
@@ -164,7 +160,6 @@ be familiar with when creating your own commands. It also has a :doc:`Logger </g
         A convenience method to maintain a consistent and clear error output to the CLI:
 
         .. literalinclude:: cli_commands/006.php
-           :lines: 2-
 
     .. php:method:: showHelp()
 
@@ -178,4 +173,3 @@ be familiar with when creating your own commands. It also has a :doc:`Logger </g
         A method to calculate padding for $key => $value array output. The padding can be used to output a will formatted table in CLI:
 
         .. literalinclude:: cli_commands/007.php
-           :lines: 2-
diff --git a/user_guide_src/source/cli/cli_library.rst b/user_guide_src/source/cli/cli_library.rst
index 6ca89cf61468..4ea8e71e4996 100644
--- a/user_guide_src/source/cli/cli_library.rst
+++ b/user_guide_src/source/cli/cli_library.rst
@@ -34,28 +34,23 @@ handled with the ``prompt()`` or ``promptByKey()`` method.
 You can provide a question by passing it in as the first parameter:
 
 .. literalinclude:: cli_library/002.php
-   :lines: 2-
 
 You can provide a default answer that will be used if the user just hits enter by passing the default in the
 second parameter:
 
 .. literalinclude:: cli_library/003.php
-   :lines: 2-
 
 You can restrict the acceptable answers by passing in an array of allowed answers as the second parameter:
 
 .. literalinclude:: cli_library/004.php
-   :lines: 2-
 
 Finally, you can pass :ref:`validation <validation>` rules to the answer input as the third parameter:
 
 .. literalinclude:: cli_library/005.php
-   :lines: 2-
 
 Validation rules can also be written in the array syntax:
 
 .. literalinclude:: cli_library/006.php
-   :lines: 2-
 
 **promptByKey()**
 
@@ -63,12 +58,10 @@ Predefined answers (options) for prompt sometimes need to be described or are to
 ``promptByKey()`` allows the user to select an option by its key instead of its value:
 
 .. literalinclude:: cli_library/007.php
-   :lines: 2-
 
 Named keys are also possible:
 
 .. literalinclude:: cli_library/008.php
-   :lines: 2-
 
 Finally, you can pass :ref:`validation <validation>` rules to the answer input as the third parameter, the acceptable answers are automatically restricted to the passed options.
 
@@ -82,18 +75,15 @@ or a complex table of information that wraps to the user's terminal window. At t
 method which takes the string to output as the first parameter:
 
 .. literalinclude:: cli_library/009.php
-   :lines: 2-
 
 You can change the color of the text by passing in a color name as the second parameter:
 
 .. literalinclude:: cli_library/010.php
-   :lines: 2-
 
 This could be used to differentiate messages by status, or create 'headers' by using a different color. You can
 even set background colors by passing the color name in as the third parameter:
 
 .. literalinclude:: cli_library/011.php
-   :lines: 2-
 
 The following foreground colors are available:
 
@@ -134,7 +124,6 @@ the same line, from different calls. This is especially helpful when you want to
 print "Done" on the same line:
 
 .. literalinclude:: cli_library/012.php
-   :lines: 2-
 
 **color()**
 
@@ -144,7 +133,6 @@ an EOL after printing. This allows you to create multiple outputs on the same ro
 it inside of a ``write()`` method to create a string of a different color inside:
 
 .. literalinclude:: cli_library/013.php
-   :lines: 2-
 
 This example would write a single line to the window, with ``fileA`` in yellow, followed by a tab, and then
 ``/path/to/file`` in white text.
@@ -157,7 +145,6 @@ for errors so they don't have to sift through all of the information, only the a
 exactly as you would the ``write()`` method:
 
 .. literalinclude:: cli_library/014.php
-   :lines: 2-
 
 **wrap()**
 
@@ -166,7 +153,6 @@ This might be useful when displaying a list of options with descriptions that yo
 window and not go off screen:
 
 .. literalinclude:: cli_library/015.php
-   :lines: 2-
 
 By default, the string will wrap at the terminal width. Windows currently doesn't provide a way to determine
 the window size, so we default to 80 characters. If you want to restrict the width to something shorter that
@@ -174,7 +160,6 @@ you can be pretty sure fits within the window, pass the maximum line-length as t
 will break the string at the nearest word barrier so that words are not broken.
 
 .. literalinclude:: cli_library/016.php
-   :lines: 2-
 
 You may find that you want a column on the left of titles, files, or tasks, while you want a column of text
 on the right with their descriptions. By default, this will wrap back to the left edge of the window, which
@@ -182,7 +167,6 @@ doesn't allow things to line up in columns. In cases like this, you can pass in
 every line after the first line, so that you will have a crisp column edge on the left:
 
 .. literalinclude:: cli_library/017.php
-   :lines: 2-
 
 Would create something like this:
 
@@ -200,7 +184,6 @@ Would create something like this:
 The ``newLine()`` method displays a blank line to the user. It does not take any parameters:
 
 .. literalinclude:: cli_library/018.php
-   :lines: 2-
 
 **clearScreen()**
 
@@ -209,7 +192,6 @@ simply insert 40 blank lines since Windows doesn't support this feature. Windows
 this:
 
 .. literalinclude:: cli_library/019.php
-   :lines: 2-
 
 **showProgress()**
 
@@ -227,12 +209,10 @@ The percent complete and the length of the display will be determined based on t
 pass ``false`` as the first parameter and the progress bar will be removed.
 
 .. literalinclude:: cli_library/020.php
-   :lines: 2-
 
 **table()**
 
 .. literalinclude:: cli_library/021.php
-   :lines: 2-
 
 .. code-block:: none
 
@@ -249,4 +229,3 @@ Waits a certain number of seconds, optionally showing a wait message and
 waiting for a key press.
 
 .. literalinclude:: cli_library/022.php
-   :lines: 2-
diff --git a/user_guide_src/source/cli/cli_request.rst b/user_guide_src/source/cli/cli_request.rst
index 01302b24b3da..8ef96d40ee6f 100644
--- a/user_guide_src/source/cli/cli_request.rst
+++ b/user_guide_src/source/cli/cli_request.rst
@@ -15,37 +15,31 @@ Additional Accessors
 Returns an array of the command line arguments deemed to be part of a path:
 
 .. literalinclude:: cli_request/001.php
-   :lines: 2-
 
 **getPath()**
 
 Returns the reconstructed path as a string:
 
 .. literalinclude:: cli_request/002.php
-   :lines: 2-
 
 **getOptions()**
 
 Returns an array of the command line arguments deemed to be options:
 
 .. literalinclude:: cli_request/003.php
-   :lines: 2-
 
 **getOption($which)**
 
 Returns the value of a specific command line argument deemed to be an option:
 
 .. literalinclude:: cli_request/004.php
-   :lines: 2-
 
 **getOptionString()**
 
 Returns the reconstructed command line string for the options:
 
 .. literalinclude:: cli_request/005.php
-   :lines: 2-
 
 Passing ``true`` to the first argument will try to write long options using two dashes:
 
 .. literalinclude:: cli_request/006.php
-   :lines: 2-
diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst
index 84d028c718d8..b748e520fd98 100644
--- a/user_guide_src/source/concepts/autoloader.rst
+++ b/user_guide_src/source/concepts/autoloader.rst
@@ -40,7 +40,6 @@ etc. The ``psr4`` array in the configuration file allows you to map the namespac
 those classes can be found in:
 
 .. literalinclude:: autoloader/001.php
-   :lines: 2-
 
 The key of each row is the namespace itself. This does not need a trailing slash. If you use double-quotes
 to define the array, be sure to escape the backward slash. That means that it would be ``My\\App``,
@@ -53,7 +52,6 @@ You may change this namespace by editing the **/app/Config/Constants.php** file
 new namespace value under the ``APP_NAMESPACE`` setting:
 
 .. literalinclude:: autoloader/002.php
-   :lines: 2-
 
 You will need to modify any existing files that are referencing the current namespace.
 
@@ -69,7 +67,6 @@ by not hitting the file-system with extra ``is_file()`` calls. You can use the c
 third-party libraries that are not namespaced:
 
 .. literalinclude:: autoloader/003.php
-   :lines: 2-
 
 The key of each row is the name of the class that you want to locate. The value is the path to locate it at.
 
diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst
index 43bca81f3abd..db48a58e8f74 100644
--- a/user_guide_src/source/concepts/factories.rst
+++ b/user_guide_src/source/concepts/factories.rst
@@ -25,18 +25,15 @@ the common path structure for namespaces and folders, Factories know that the mo
 and classes are found within **Models**, so you can request a model by its shorthand base name:
 
 .. literalinclude:: factories/001.php
-   :lines: 2-
 
 Or you could also request a specific class:
 
 .. literalinclude:: factories/002.php
-   :lines: 2-
 
 Next time you ask for the same class anywhere in your code, ``Factories`` will be sure
 you get back the instance as before:
 
 .. literalinclude:: factories/003.php
-   :lines: 2-
 
 Factory Parameters
 ==================
@@ -50,7 +47,6 @@ your app uses a separate database for authentication and you want to be sure tha
 to access user records always go through that connection:
 
 .. literalinclude:: factories/004.php
-   :lines: 2-
 
 Now any time the ``UserModel`` is loaded from ``Factories`` it will in fact be returning a
 class instance that uses the alternate database connection.
@@ -108,7 +104,6 @@ supply the desired array of options using the ``setOptions()`` method and they w
 merged with the default values and stored for the next call:
 
 .. literalinclude:: factories/006.php
-   :lines: 2-
 
 Parameter Options
 -----------------
diff --git a/user_guide_src/source/concepts/http.rst b/user_guide_src/source/concepts/http.rst
index dfbb8e29f8ee..6833c95f22c1 100644
--- a/user_guide_src/source/concepts/http.rst
+++ b/user_guide_src/source/concepts/http.rst
@@ -71,7 +71,6 @@ abstracts them so that you have a consistent, simple interface to them. The :doc
 is an object-oriented representation of the HTTP request. It provides everything you need:
 
 .. literalinclude:: http/001.php
-   :lines: 2-
 
 The request class does a lot of work in the background for you, that you never need to worry about.
 The ``isAJAX()`` and ``isSecure()`` methods check several different methods to determine the correct answer.
@@ -82,6 +81,5 @@ CodeIgniter also provides a :doc:`Response class </outgoing/response>` that is a
 of the HTTP response. This gives you an easy and powerful way to construct your response to the client:
 
 .. literalinclude:: http/002.php
-   :lines: 2-
 
 In addition, the Response class allows you to work the HTTP cache layer for the best performance.
diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst
index 66f569a701ea..84860e65f5c3 100644
--- a/user_guide_src/source/concepts/services.rst
+++ b/user_guide_src/source/concepts/services.rst
@@ -17,7 +17,6 @@ A quick example will probably make things clearer, so imagine that you need to p
 of the Timer class. The simplest method would simply be to create a new instance of that class:
 
 .. literalinclude:: services/001.php
-   :lines: 2-
 
 And this works great. Until you decide that you want to use a different timer class in its place.
 Maybe this one has some advanced reporting the default timer does not provide. In order to do this,
@@ -32,7 +31,6 @@ to use as a service. The method typically returns a shared instance of that clas
 it might have into it. Then, we would replace our timer creation code with code that calls this new class:
 
 .. literalinclude:: services/002.php
-   :lines: 2-
 
 When you need to change the implementation used, you can modify the services configuration file, and
 the change happens automatically throughout your application without you having to do anything. Now
@@ -52,18 +50,15 @@ file always returns a SHARED instance of the class, so calling the function mult
 always return the same instance:
 
 .. literalinclude:: services/003.php
-   :lines: 2-
 
 If the creation method requires additional parameters, they can be passed after the service name:
 
 .. literalinclude:: services/004.php
-   :lines: 2-
 
 The second function, ``single_service()`` works just like ``service()`` but returns a new instance of
 the class:
 
 .. literalinclude:: services/005.php
-   :lines: 2-
 
 Defining Services
 =================
@@ -79,13 +74,11 @@ want to create a replacement that provides a different way to create routes, you
 create a new class that implements the ``RouterCollectionInterface``:
 
 .. literalinclude:: services/006.php
-   :lines: 2-
 
 Finally, modify **/app/Config/Services.php** to create a new instance of ``MyRouter``
 instead of ``CodeIgniter\Router\RouterCollection``:
 
 .. literalinclude:: services/007.php
-   :lines: 2-
 
 Allowing Parameters
 -------------------
@@ -99,13 +92,11 @@ changing that path, though, if their needs require it. So the class accepts the
 as a constructor parameter. The service method looks like this:
 
 .. literalinclude:: services/008.php
-   :lines: 2-
 
 This sets the default path in the constructor method, but allows for easily changing
 the path it uses:
 
 .. literalinclude:: services/009.php
-   :lines: 2-
 
 Shared Classes
 -----------------
@@ -117,7 +108,6 @@ within the class, and, if not, creates a new one. All of the factory methods pro
 ``$getShared = true`` value as the last parameter. You should stick to the method also:
 
 .. literalinclude:: services/010.php
-   :lines: 2-
 
 Service Discovery
 -----------------
@@ -142,6 +132,5 @@ Now you can use this file as described above. When you want to grab the posts se
 would simply use the framework's ``Config\Services`` class to grab your service:
 
 .. literalinclude:: services/012.php
-   :lines: 2-
 
 .. note:: If multiple Services files have the same method name, the first one found will be the instance returned.
diff --git a/user_guide_src/source/database/call_function.rst b/user_guide_src/source/database/call_function.rst
index 40045caf1df2..f91e7c4bfbc5 100644
--- a/user_guide_src/source/database/call_function.rst
+++ b/user_guide_src/source/database/call_function.rst
@@ -16,7 +16,6 @@ function, which is **not** natively supported by CodeIgniter. You could
 do so like this:
 
 .. literalinclude:: call_function/001.php
-   :lines: 2-
 
 You must supply the name of the function, **without** the mysql\_
 prefix, in the first parameter. The prefix is added automatically based
@@ -29,15 +28,12 @@ Any parameters needed by the function you are calling will be added to
 the second parameter.
 
 .. literalinclude:: call_function/002.php
-   :lines: 2-
 
 Often, you will either need to supply a database connection ID or a
 database result ID. The connection ID can be accessed using:
 
 .. literalinclude:: call_function/003.php
-   :lines: 2-
 
 The result ID can be accessed from within your result object, like this:
 
 .. literalinclude:: call_function/004.php
-   :lines: 2-
diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst
index 33332cccac31..b8eb2be48292 100644
--- a/user_guide_src/source/database/configuration.rst
+++ b/user_guide_src/source/database/configuration.rst
@@ -15,7 +15,6 @@ The config settings are stored in a class property that is an array with this
 prototype:
 
 .. literalinclude:: configuration/001.php
-   :lines: 2-
 
 The name of the class property is the connection name, and can be used
 while connecting to specify a group name.
@@ -29,7 +28,6 @@ should use the 'DSN' configuration setting, as if you're using the
 driver's underlying native PHP extension, like this:
 
 .. literalinclude:: configuration/002.php
-   :lines: 2-
 
 .. note:: If you do not specify a DSN string for a driver that requires it, CodeIgniter
     will try to build it with the rest of the provided settings.
@@ -37,13 +35,11 @@ driver's underlying native PHP extension, like this:
 You can also set a Data Source Name in universal manner (URL like). In that case DSNs must have this prototype:
 
 .. literalinclude:: configuration/003.php
-   :lines: 2-
 
 To override default config values when connecting with a universal version of the DSN string,
 add the config variables as a query string:
 
 .. literalinclude:: configuration/004.php
-   :lines: 2-
 
 .. note:: If you provide a DSN string and it is missing some valid settings (e.g., the
     database character set), which are present in the rest of the configuration
@@ -53,7 +49,6 @@ You can also specify failovers for the situation when the main connection cannot
 These failovers can be specified by setting the failover for a connection like this:
 
 .. literalinclude:: configuration/005.php
-   :lines: 2-
 
 You can specify as many failovers as you like.
 
@@ -64,13 +59,11 @@ connection group for each, then switch between groups as needed. For
 example, to set up a "test" environment you would do this:
 
 .. literalinclude:: configuration/006.php
-   :lines: 2-
 
 Then, to globally tell the system to use that group you would set this
 variable located in the config file:
 
 .. literalinclude:: configuration/007.php
-   :lines: 2-
 
 .. note:: The name 'test' is arbitrary. It can be anything you want. By
     default we've used the word "default" for the primary connection,
@@ -81,7 +74,6 @@ update the `defaultGroup` value to the correct one by adding the required logic
 within the class' constructor:
 
 .. literalinclude:: configuration/008.php
-   :lines: 2-
 
 Configuring With .env File
 --------------------------
@@ -141,7 +133,6 @@ Explanation of Values:
 **port**        The database port number. To use this value you have to add a line to the database config array.
 
                 .. literalinclude:: configuration/009.php
-                    :lines: 2-
 
 ==============  ===========================================================================================================
 
diff --git a/user_guide_src/source/database/connecting.rst b/user_guide_src/source/database/connecting.rst
index 4efda4e11847..aa6089e52339 100644
--- a/user_guide_src/source/database/connecting.rst
+++ b/user_guide_src/source/database/connecting.rst
@@ -11,7 +11,6 @@ function where it is needed, or in your class constructor to make the
 database available globally in that class.
 
 .. literalinclude:: connecting/001.php
-   :lines: 2-
 
 If the above function does **not** contain any information in the first
 parameter, it will connect to the default group specified in your database config
@@ -21,7 +20,6 @@ A convenience method exists that is purely a wrapper around the above line
 and is provided for your convenience:
 
 .. literalinclude:: connecting/002.php
-   :lines: 2-
 
 Available Parameters
 --------------------
@@ -41,7 +39,6 @@ specify a particular database group from your config file. Examples:
 To choose a specific group from your config file you can do this:
 
 .. literalinclude:: connecting/003.php
-   :lines: 2-
 
 Where group_name is the name of the connection group from your config
 file.
@@ -54,7 +51,6 @@ database connection every time. If you need to have a separate connection
 to the same database, send ``false`` as the second parameter:
 
 .. literalinclude:: connecting/004.php
-   :lines: 2-
 
 Connecting to Multiple Databases
 ================================
@@ -63,7 +59,6 @@ If you need to connect to more than one database simultaneously you can
 do so as follows:
 
 .. literalinclude:: connecting/005.php
-   :lines: 2-
 
 Note: Change the words ``group_one`` and ``group_two`` to the specific
 group names you are connecting to.
@@ -81,7 +76,6 @@ a connection that uses your custom settings. The array passed in must be
 the same format as the groups are defined in the configuration file:
 
 .. literalinclude:: connecting/006.php
-   :lines: 2-
 
 Reconnecting / Keeping the Connection Alive
 ===========================================
@@ -96,7 +90,6 @@ or re-establish it.
     does not ping the server but it closes the connection then connects again.
 
 .. literalinclude:: connecting/007.php
-   :lines: 2-
 
 Manually closing the Connection
 ===============================
@@ -105,4 +98,3 @@ While CodeIgniter intelligently takes care of closing your database
 connections, you can explicitly close the connection.
 
 .. literalinclude:: connecting/008.php
-   :lines: 2-
diff --git a/user_guide_src/source/database/events.rst b/user_guide_src/source/database/events.rst
index eb9495405299..628f2316ef8b 100644
--- a/user_guide_src/source/database/events.rst
+++ b/user_guide_src/source/database/events.rst
@@ -23,4 +23,3 @@ in STDOUT, or logging to a file, or even creating tools to do automatic query an
 potentially missing indexes, slow queries, etc. An example usage might be:
 
 .. literalinclude:: events/001.php
-   :lines: 2-
diff --git a/user_guide_src/source/database/examples.rst b/user_guide_src/source/database/examples.rst
index 6d1d656de2af..bee7e9066597 100644
--- a/user_guide_src/source/database/examples.rst
+++ b/user_guide_src/source/database/examples.rst
@@ -17,7 +17,6 @@ The following code loads and initializes the database class based on
 your :doc:`configuration <configuration>` settings:
 
 .. literalinclude:: examples/001.php
-   :lines: 2-
 
 Once loaded the class is ready to be used as described below.
 
@@ -28,7 +27,6 @@ Standard Query With Multiple Results (Object Version)
 =====================================================
 
 .. literalinclude:: examples/002.php
-   :lines: 2-
 
 | The above ``getResult()`` function returns an array of **objects**.
 | Example: ``$row->title``
@@ -37,7 +35,6 @@ Standard Query With Multiple Results (Array Version)
 ====================================================
 
 .. literalinclude:: examples/003.php
-   :lines: 2-
 
 | The above ``getResultArray()`` function returns an array of standard array
   indexes.
@@ -47,7 +44,6 @@ Standard Query With Single Result
 =================================
 
 .. literalinclude:: examples/004.php
-   :lines: 2-
 
 The above ``getRow()`` function returns an **object**. Example: ``$row->name``
 
@@ -55,7 +51,6 @@ Standard Query With Single Result (Array version)
 =================================================
 
 .. literalinclude:: examples/005.php
-   :lines: 2-
 
 The above ``getRowArray()`` function returns an **array**. Example:
 ``$row['name']``.
@@ -64,7 +59,6 @@ Standard Insert
 ===============
 
 .. literalinclude:: examples/006.php
-   :lines: 2-
 
 Query Builder Query
 ===================
@@ -73,7 +67,6 @@ The :doc:`Query Builder Pattern <query_builder>` gives you a simplified
 means of retrieving data:
 
 .. literalinclude:: examples/007.php
-   :lines: 2-
 
 The above ``get()`` function retrieves all the results from the supplied
 table. The :doc:`Query Builder <query_builder>` class contains a full
@@ -83,4 +76,3 @@ Query Builder Insert
 ====================
 
 .. literalinclude:: examples/008.php
-   :lines: 2-
diff --git a/user_guide_src/source/database/helpers.rst b/user_guide_src/source/database/helpers.rst
index 0e948403091b..223b797ec640 100644
--- a/user_guide_src/source/database/helpers.rst
+++ b/user_guide_src/source/database/helpers.rst
@@ -41,7 +41,6 @@ Submit the table name in the first parameter. This is part of Query Builder.
 Example:
 
 .. literalinclude:: helpers/001.php
-   :lines: 2-
 
 **$db->countAllResults()**
 
@@ -50,7 +49,6 @@ Submit the table name in the first parameter. This is part of Query Builder.
 Example:
 
 .. literalinclude:: helpers/002.php
-   :lines: 2-
 
 **$db->getPlatform()**
 
@@ -58,11 +56,9 @@ Outputs the database platform you are running (MySQL, MS SQL, Postgres,
 etc...):
 
 .. literalinclude:: helpers/003.php
-   :lines: 2-
 
 **$db->getVersion()**
 
 Outputs the database version you are running:
 
 .. literalinclude:: helpers/004.php
-   :lines: 2-
diff --git a/user_guide_src/source/database/metadata.rst b/user_guide_src/source/database/metadata.rst
index ef832daca249..20b00f5e4671 100644
--- a/user_guide_src/source/database/metadata.rst
+++ b/user_guide_src/source/database/metadata.rst
@@ -21,7 +21,6 @@ Returns an array containing the names of all the tables in the database
 you are currently connected to. Example:
 
 .. literalinclude:: metadata/001.php
-   :lines: 2-
 
 .. note:: Some drivers have additional system tables that are excluded from this return.
 
@@ -34,7 +33,6 @@ Sometimes it's helpful to know whether a particular table exists before
 running an operation on it. Returns a boolean true/false. Usage example:
 
 .. literalinclude:: metadata/002.php
-   :lines: 2-
 
 .. note:: Replace *table_name* with the name of the table you are looking for.
 
@@ -53,13 +51,11 @@ two ways:
 1. You can supply the table name and call it from the ``$db->object``:
 
    .. literalinclude:: metadata/003.php
-       :lines: 2-
 
 2. You can gather the field names associated with any query you run by
 calling the function from your query result object:
 
 .. literalinclude:: metadata/004.php
-    :lines: 2-
 
 Determine If a Field is Present in a Table
 ==========================================
@@ -70,7 +66,6 @@ Sometimes it's helpful to know whether a particular field exists before
 performing an action. Returns a boolean true/false. Usage example:
 
 .. literalinclude:: metadata/005.php
-   :lines: 2-
 
 .. note:: Replace *field_name* with the name of the column you are looking
     for, and replace *table_name* with the name of the table you are
@@ -91,13 +86,11 @@ the column type, max length, etc.
 Usage example:
 
 .. literalinclude:: metadata/006.php
-   :lines: 2-
 
 If you have run a query already you can use the result object instead of
 supplying the table name:
 
 .. literalinclude:: metadata/007.php
-   :lines: 2-
 
 The following data is available from this function if supported by your
 database:
@@ -117,7 +110,6 @@ Returns an array of objects containing index information.
 Usage example:
 
 .. literalinclude:: metadata/008.php
-   :lines: 2-
 
 The key types may be unique to the database you are using.
 For instance, MySQL will return one of primary, fulltext, spatial, index or unique
@@ -130,7 +122,6 @@ Returns an array of objects containing foreign key information.
 Usage example:
 
 .. literalinclude:: metadata/009.php
-   :lines: 2-
 
 The object fields may be unique to the database you are using. For instance, SQLite3 does
 not return data on column names, but has the additional *sequence* field for compound
diff --git a/user_guide_src/source/database/queries.rst b/user_guide_src/source/database/queries.rst
index 5aff248a5aed..5161000d8614 100644
--- a/user_guide_src/source/database/queries.rst
+++ b/user_guide_src/source/database/queries.rst
@@ -16,7 +16,6 @@ Regular Queries
 To submit a query, use the **query** function:
 
 .. literalinclude:: queries/001.php
-   :lines: 2-
 
 The ``query()`` function returns a database result **object** when "read"
 type queries are run which you can use to :doc:`show your
@@ -26,7 +25,6 @@ data you will typically assign the query to your own variable, like
 this:
 
 .. literalinclude:: queries/002.php
-   :lines: 2-
 
 .. note:: If you are using OCI8 Driver, SQL statements should not end with a semi-colon (``;``).
     PL/SQL statements should end with a semi-colon (``;``).
@@ -47,7 +45,6 @@ should be used for) and a resource/object on success for queries with
 fetchable results.
 
 .. literalinclude:: queries/003.php
-   :lines: 2-
 
 .. note:: PostgreSQL's ``pg_exec()`` function (for example) always
     returns a resource on success even for write type queries.
@@ -62,18 +59,15 @@ a table name for use in a native SQL query for example, then you can use
 the following:
 
 .. literalinclude:: queries/004.php
-   :lines: 2-
 
 If for any reason you would like to change the prefix programmatically
 without needing to create a new connection you can use this method:
 
 .. literalinclude:: queries/005.php
-   :lines: 2-
 
 You can get the current prefix any time with this method:
 
 .. literalinclude:: queries/006.php
-   :lines: 2-
 
 **********************
 Protecting identifiers
@@ -85,7 +79,6 @@ automatically protected**, but if you need to manually protect an
 identifier you can use:
 
 .. literalinclude:: queries/007.php
-   :lines: 2-
 
 .. important:: Although the Query Builder will try its best to properly
     quote any field and table names that you feed it. Note that it
@@ -97,7 +90,6 @@ have a prefix specified in your database config file. To enable the
 prefixing set true (boolean) via the second parameter:
 
 .. literalinclude:: queries/008.php
-   :lines: 2-
 
 ****************
 Escaping Queries
@@ -112,21 +104,18 @@ this:
    single quotes around the data so you don't have to:
 
    .. literalinclude:: queries/009.php
-      :lines: 2-
 
 #. **$db->escapeString()** This function escapes the data passed to
    it, regardless of type. Most of the time you'll use the above
    function rather than this one. Use the function like this:
 
    .. literalinclude:: queries/010.php
-      :lines: 2-
 
 #. **$db->escapeLikeString()** This method should be used when
    strings are to be used in LIKE conditions so that LIKE wildcards
    ('%', '\_') in the string are also properly escaped.
 
 .. literalinclude:: queries/011.php
-   :lines: 2-
 
 .. important:: The ``escapeLikeString()`` method uses '!' (exclamation mark)
     to escape special characters for *LIKE* conditions. Because this
@@ -142,7 +131,6 @@ Bindings enable you to simplify your query syntax by letting the system
 put the queries together for you. Consider the following example:
 
 .. literalinclude:: queries/012.php
-   :lines: 2-
 
 The question marks in the query are automatically replaced with the
 values in the array in the second parameter of the query function.
@@ -150,7 +138,6 @@ values in the array in the second parameter of the query function.
 Binding also work with arrays, which will be transformed to IN sets:
 
 .. literalinclude:: queries/013.php
-   :lines: 2-
 
 The resulting query will be::
 
@@ -168,7 +155,6 @@ you can name the bindings, allowing the keys of the values passed in to match
 placeholders in the query:
 
 .. literalinclude:: queries/014.php
-   :lines: 2-
 
 .. note:: Each name in the query MUST be surrounded by colons.
 
@@ -183,7 +169,6 @@ will return an array containing its code and message. Here's a quick
 example:
 
 .. literalinclude:: queries/015.php
-   :lines: 2-
 
 ****************
 Prepared Queries
@@ -207,19 +192,16 @@ run a query. The query is not actually run, and the values don't matter since th
 as placeholders. This returns a PreparedQuery object:
 
 .. literalinclude:: queries/016.php
-   :lines: 2-
 
 If you don't want to use the Query Builder you can create the Query object manually using question marks for
 value placeholders:
 
 .. literalinclude:: queries/017.php
-   :lines: 2-
 
 If the database requires an array of options passed to it during the prepare statement phase you can pass that
 array through in the second parameter:
 
 .. literalinclude:: queries/018.php
-   :lines: 2-
 
 Executing the Query
 ===================
@@ -230,7 +212,6 @@ placeholders in the query. They must also be passed in the same order as the pla
 query:
 
 .. literalinclude:: queries/019.php
-   :lines: 2-
 
 This returns a standard :doc:`result set </database/results>`.
 
@@ -245,7 +226,6 @@ While PHP does a pretty good job of closing all open statements with the databas
 close out the prepared statement when you're done with it:
 
 .. literalinclude:: queries/020.php
-   :lines: 2-
 
 **getQueryString()**
 
@@ -275,7 +255,6 @@ When you just need to retrieve the last Query object, use the
 getLastQuery() method:
 
 .. literalinclude:: queries/021.php
-   :lines: 2-
 
 The Query Class
 ===============
@@ -290,12 +269,10 @@ Returns the final query after all processing has happened. This is the exact
 query that was sent to the database:
 
 .. literalinclude:: queries/022.php
-   :lines: 2-
 
 This same value can be retrieved by casting the Query object to a string:
 
 .. literalinclude:: queries/023.php
-   :lines: 2-
 
 **getOriginalQuery()**
 
@@ -303,7 +280,6 @@ Returns the raw SQL that was passed into the object. This will not have any
 binds in it, or prefixes swapped out, etc:
 
 .. literalinclude:: queries/024.php
-   :lines: 2-
 
 **hasError()**
 
@@ -311,7 +287,6 @@ If an error was encountered during the execution of this query this method
 will return true:
 
 .. literalinclude:: queries/025.php
-   :lines: 2-
 
 **isWriteType()**
 
@@ -319,7 +294,6 @@ Returns true if the query was determined to be a write-type query (i.e.,
 INSERT, UPDATE, DELETE, etc):
 
 .. literalinclude:: queries/026.php
-   :lines: 2-
 
 **swapPrefix()**
 
@@ -328,18 +302,15 @@ parameter is the original prefix that you want replaced, and the second
 parameter is the value you want it replaced with:
 
 .. literalinclude:: queries/027.php
-   :lines: 2-
 
 **getStartTime()**
 
 Gets the time the query was executed in seconds with microseconds:
 
 .. literalinclude:: queries/028.php
-   :lines: 2-
 
 **getDuration()**
 
 Returns a float with the duration of the query in seconds with microseconds:
 
 .. literalinclude:: queries/029.php
-   :lines: 2-
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index a3f74091c8b6..8313ec6b214f 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -28,7 +28,6 @@ database connection. This sets the **FROM** portion of the query for you
 and returns a new instance of the Query Builder class:
 
 .. literalinclude:: query_builder/001.php
-   :lines: 2-
 
 The Query Builder is only loaded into memory when you specifically request
 the class, so no resources are used by default.
@@ -48,19 +47,16 @@ Runs the selection query and returns the result. Can be used by itself
 to retrieve all records from a table:
 
 .. literalinclude:: query_builder/002.php
-   :lines: 2-
 
 The first and second parameters enable you to set a limit and offset
 clause:
 
 .. literalinclude:: query_builder/003.php
-   :lines: 2-
 
 You'll notice that the above method is assigned to a variable named
 $query, which can be used to show the results:
 
 .. literalinclude:: query_builder/004.php
-   :lines: 2-
 
 Please visit the :doc:`getResult*() method <results>` page for a full
 discussion regarding result generation.
@@ -73,13 +69,11 @@ the query. This method simply returns the SQL query as a string.
 Example:
 
 .. literalinclude:: query_builder/005.php
-   :lines: 2-
 
 The first parameter enables you to set whether or not the query builder query
 will be reset (by default it will be reset, just like when using ``$builder->get()``):
 
 .. literalinclude:: query_builder/006.php
-   :lines: 2-
 
 The key thing to notice in the above example is that the second query did not
 utilize ``$builder->from()`` and did not pass a table name into the first
@@ -94,7 +88,6 @@ Identical to the ``get()`` method except that it permits you to add a
 method:
 
 .. literalinclude:: query_builder/007.php
-   :lines: 2-
 
 Please read about the ``where()`` method below for more information.
 
@@ -106,7 +99,6 @@ Select
 Permits you to write the **SELECT** portion of your query:
 
 .. literalinclude:: query_builder/008.php
-   :lines: 2-
 
 .. note:: If you are selecting all (``*``) from a table you do not need to
     use this method. When omitted, CodeIgniter assumes that you wish
@@ -118,7 +110,6 @@ This is useful if you need a compound select statement where automatic
 escaping of fields may break them.
 
 .. literalinclude:: query_builder/009.php
-   :lines: 2-
 
 **$builder->selectMax()**
 
@@ -126,7 +117,6 @@ Writes a **SELECT MAX(field)** portion for your query. You can optionally
 include a second parameter to rename the resulting field.
 
 .. literalinclude:: query_builder/010.php
-   :lines: 2-
 
 **$builder->selectMin()**
 
@@ -135,7 +125,6 @@ Writes a **SELECT MIN(field)** portion for your query. As with
 the resulting field.
 
 .. literalinclude:: query_builder/011.php
-   :lines: 2-
 
 **$builder->selectAvg()**
 
@@ -144,7 +133,6 @@ Writes a **SELECT AVG(field)** portion for your query. As with
 the resulting field.
 
 .. literalinclude:: query_builder/012.php
-   :lines: 2-
 
 **$builder->selectSum()**
 
@@ -153,7 +141,6 @@ Writes a **SELECT SUM(field)** portion for your query. As with
 the resulting field.
 
 .. literalinclude:: query_builder/013.php
-   :lines: 2-
 
 **$builder->selectCount()**
 
@@ -165,7 +152,6 @@ the resulting field.
         counting results generally see ``countAll()`` or ``countAllResults()``.
 
 .. literalinclude:: query_builder/014.php
-   :lines: 2-
 
 From
 ====
@@ -175,7 +161,6 @@ From
 Permits you to write the **FROM** portion of your query:
 
 .. literalinclude:: query_builder/015.php
-   :lines: 2-
 
 .. note:: As shown earlier, the **FROM** portion of your query can be specified
     in the ``$db->table()`` method. Additional calls to ``from()`` will add more tables
@@ -193,12 +178,10 @@ Permits you to write part of a **FROM** query as a subquery.
 This is where we add a subquery to an existing table:
 
 .. literalinclude:: query_builder/016.php
-   :lines: 2-
 
 Use the ``$db->newQuery()`` method to make a subquery the main table:
 
 .. literalinclude:: query_builder/017.php
-   :lines: 2-
 
 Join
 ====
@@ -208,7 +191,6 @@ Join
 Permits you to write the **JOIN** portion of your query:
 
 .. literalinclude:: query_builder/018.php
-   :lines: 2-
 
 Multiple method calls can be made if you need several joins in one
 query.
@@ -218,7 +200,6 @@ parameter of the method. Options are: ``left``, ``right``, ``outer``, ``inner``,
 outer``, and ``right outer``.
 
 .. literalinclude:: query_builder/019.php
-   :lines: 2-
 
 *************************
 Looking for Specific Data
@@ -238,7 +219,6 @@ methods:
 #. **Simple key/value method:**
 
     .. literalinclude:: query_builder/020.php
-       :lines: 2-
 
     Notice that the equal sign is added for you.
 
@@ -246,7 +226,6 @@ methods:
     **AND** between them:
 
     .. literalinclude:: query_builder/021.php
-       :lines: 2-
 
 #. **Custom key/value method:**
 
@@ -254,37 +233,31 @@ methods:
     control the comparison:
 
     .. literalinclude:: query_builder/022.php
-       :lines: 2-
 
 #. **Associative array method:**
 
     .. literalinclude:: query_builder/023.php
-       :lines: 2-
 
     You can include your own operators using this method as well:
 
     .. literalinclude:: query_builder/024.php
-       :lines: 2-
 
 #. **Custom string:**
 
     You can write your own clauses manually:
 
     .. literalinclude:: query_builder/025.php
-       :lines: 2-
 
     .. warning:: If you are using user-supplied data within the string, you MUST escape the
         data manually. Failure to do so could result in SQL injections.
 
         .. literalinclude:: query_builder/026.php
-           :lines: 2-
 
 .. _query-builder-where-subquery:
 
 5. **Subqueries:**
 
     .. literalinclude:: query_builder/027.php
-       :lines: 2-
 
 **$builder->orWhere()**
 
@@ -292,7 +265,6 @@ This method is identical to the one above, except that multiple
 instances are joined by **OR**:
 
 .. literalinclude:: query_builder/028.php
-   :lines: 2-
 
 **$builder->whereIn()**
 
@@ -300,12 +272,10 @@ Generates a **WHERE** field IN ('item', 'item') SQL query joined with **AND** if
 appropriate:
 
 .. literalinclude:: query_builder/029.php
-   :lines: 2-
 
 You can use subqueries instead of an array of values:
 
 .. literalinclude:: query_builder/030.php
-   :lines: 2-
 
 **$builder->orWhereIn()**
 
@@ -313,12 +283,10 @@ Generates a **WHERE field IN ('item', 'item')** SQL query joined with **OR** if
 appropriate:
 
 .. literalinclude:: query_builder/031.php
-   :lines: 2-
 
 You can use subqueries instead of an array of values:
 
 .. literalinclude:: query_builder/032.php
-   :lines: 2-
 
 **$builder->whereNotIn()**
 
@@ -326,12 +294,10 @@ Generates a **WHERE field NOT IN ('item', 'item')** SQL query joined with
 **AND** if appropriate:
 
 .. literalinclude:: query_builder/033.php
-   :lines: 2-
 
 You can use subqueries instead of an array of values:
 
 .. literalinclude:: query_builder/034.php
-   :lines: 2-
 
 **$builder->orWhereNotIn()**
 
@@ -339,12 +305,10 @@ Generates a **WHERE field NOT IN ('item', 'item')** SQL query joined with **OR**
 if appropriate:
 
 .. literalinclude:: query_builder/035.php
-   :lines: 2-
 
 You can use subqueries instead of an array of values:
 
 .. literalinclude:: query_builder/036.php
-   :lines: 2-
 
 ************************
 Looking for Similar Data
@@ -365,25 +329,21 @@ searches.
 #. **Simple key/value method:**
 
     .. literalinclude:: query_builder/037.php
-       :lines: 2-
 
     If you use multiple method calls they will be chained together with
     **AND** between them:
 
     .. literalinclude:: query_builder/038.php
-       :lines: 2-
 
     If you want to control where the wildcard (**%**) is placed, you can use
     an optional third argument. Your options are ``before``, ``after`` and
     ``both`` (which is the default).
 
     .. literalinclude:: query_builder/039.php
-       :lines: 2-
 
 #. **Associative array method:**
 
        .. literalinclude:: query_builder/040.php
-          :lines: 2-
 
 **$builder->orLike()**
 
@@ -391,7 +351,6 @@ This method is identical to the one above, except that multiple
 instances are joined by **OR**:
 
 .. literalinclude:: query_builder/041.php
-   :lines: 2-
 
 **$builder->notLike()**
 
@@ -399,7 +358,6 @@ This method is identical to ``like()``, except that it generates
 **NOT LIKE** statements:
 
 .. literalinclude:: query_builder/042.php
-   :lines: 2-
 
 **$builder->orNotLike()**
 
@@ -407,26 +365,22 @@ This method is identical to ``notLike()``, except that multiple
 instances are joined by **OR**:
 
 .. literalinclude:: query_builder/043.php
-   :lines: 2-
 
 **$builder->groupBy()**
 
 Permits you to write the **GROUP BY** portion of your query:
 
 .. literalinclude:: query_builder/044.php
-   :lines: 2-
 
 You can also pass an array of multiple values as well:
 
 .. literalinclude:: query_builder/045.php
-   :lines: 2-
 
 **$builder->distinct()**
 
 Adds the **DISTINCT** keyword to a query
 
 .. literalinclude:: query_builder/046.php
-   :lines: 2-
 
 **$builder->having()**
 
@@ -434,19 +388,16 @@ Permits you to write the **HAVING** portion of your query. There are 2
 possible syntaxes, 1 argument or 2:
 
 .. literalinclude:: query_builder/047.php
-   :lines: 2-
 
 You can also pass an array of multiple values as well:
 
 .. literalinclude:: query_builder/048.php
-   :lines: 2-
 
 If you are using a database that CodeIgniter escapes queries for, you
 can prevent escaping content by passing an optional third argument, and
 setting it to ``false``.
 
 .. literalinclude:: query_builder/049.php
-   :lines: 2-
 
 **$builder->orHaving()**
 
@@ -458,12 +409,10 @@ Generates a **HAVING field IN ('item', 'item')** SQL query joined with **AND** i
 appropriate:
 
 .. literalinclude:: query_builder/050.php
-   :lines: 2-
 
 You can use subqueries instead of an array of values:
 
 .. literalinclude:: query_builder/051.php
-   :lines: 2-
 
 **$builder->orHavingIn()**
 
@@ -471,12 +420,10 @@ Generates a **HAVING field IN ('item', 'item')** SQL query joined with **OR** if
 appropriate
 
 .. literalinclude:: query_builder/052.php
-   :lines: 2-
 
 You can use subqueries instead of an array of values:
 
 .. literalinclude:: query_builder/053.php
-   :lines: 2-
 
 **$builder->havingNotIn()**
 
@@ -484,12 +431,10 @@ Generates a **HAVING field NOT IN ('item', 'item')** SQL query joined with
 **AND** if appropriate
 
 .. literalinclude:: query_builder/054.php
-   :lines: 2-
 
 You can use subqueries instead of an array of values:
 
 .. literalinclude:: query_builder/055.php
-   :lines: 2-
 
 **$builder->orHavingNotIn()**
 
@@ -497,12 +442,10 @@ Generates a **HAVING field NOT IN ('item', 'item')** SQL query joined with **OR*
 if appropriate
 
 .. literalinclude:: query_builder/056.php
-   :lines: 2-
 
 You can use subqueries instead of an array of values:
 
 .. literalinclude:: query_builder/057.php
-   :lines: 2-
 
 **$builder->havingLike()**
 
@@ -519,25 +462,21 @@ searches.
 #. **Simple key/value method:**
 
     .. literalinclude:: query_builder/058.php
-       :lines: 2-
 
     If you use multiple method calls they will be chained together with
     **AND** between them:
 
     .. literalinclude:: query_builder/059.php
-       :lines: 2-
 
     If you want to control where the wildcard (**%**) is placed, you can use
     an optional third argument. Your options are ``before``, ``after`` and
     ``both`` (which is the default).
 
     .. literalinclude:: query_builder/060.php
-       :lines: 2-
 
 #. **Associative array method:**
 
        .. literalinclude:: query_builder/061.php
-          :lines: 2-
 
 **$builder->orHavingLike()**
 
@@ -545,7 +484,6 @@ This method is identical to the one above, except that multiple
 instances are joined by **OR**:
 
 .. literalinclude:: query_builder/062.php
-   :lines: 2-
 
 **$builder->notHavingLike()**
 
@@ -553,7 +491,6 @@ This method is identical to ``havingLike()``, except that it generates
 **NOT LIKE** statements:
 
 .. literalinclude:: query_builder/063.php
-   :lines: 2-
 
 **$builder->orNotHavingLike()**
 
@@ -561,7 +498,6 @@ This method is identical to ``notHavingLike()``, except that multiple
 instances are joined by **OR**:
 
 .. literalinclude:: query_builder/064.php
-   :lines: 2-
 
 ****************
 Ordering Results
@@ -577,23 +513,19 @@ The second parameter lets you set the direction of the result.
 Options are ``ASC``, ``DESC`` AND ``RANDOM``.
 
 .. literalinclude:: query_builder/065.php
-   :lines: 2-
 
 You can also pass your own string in the first parameter:
 
 .. literalinclude:: query_builder/066.php
-   :lines: 2-
 
 Or multiple method calls can be made if you need multiple fields.
 
 .. literalinclude:: query_builder/067.php
-   :lines: 2-
 
 If you choose the ``RANDOM`` direction option, then the first parameters will
 be ignored, unless you specify a numeric seed value.
 
 .. literalinclude:: query_builder/068.php
-   :lines: 2-
 
 ****************************
 Limiting or Counting Results
@@ -604,12 +536,10 @@ Limiting or Counting Results
 Lets you limit the number of rows you would like returned by the query:
 
 .. literalinclude:: query_builder/069.php
-   :lines: 2-
 
 The second parameter lets you set a result offset.
 
 .. literalinclude:: query_builder/070.php
-   :lines: 2-
 
 **$builder->countAllResults()**
 
@@ -618,14 +548,12 @@ Builder query. Queries will accept Query Builder restrictors such as
 ``where()``, ``orWhere()``, ``like()``, ``orLike()``, etc. Example:
 
 .. literalinclude:: query_builder/071.php
-   :lines: 2-
 
 However, this method also resets any field values that you may have passed
 to ``select()``. If you need to keep them, you can pass ``false`` as the
 first parameter.
 
 .. literalinclude:: query_builder/072.php
-   :lines: 2-
 
 **$builder->countAll()**
 
@@ -633,7 +561,6 @@ Permits you to determine the number of rows in a particular table.
 Example:
 
 .. literalinclude:: query_builder/073.php
-   :lines: 2-
 
 As is in ``countAllResult()`` method, this method resets any field values that you may have passed
 to ``select()`` as well. If you need to keep them, you can pass ``false`` as the
@@ -647,7 +574,6 @@ Query grouping allows you to create groups of **WHERE** clauses by enclosing the
 you to create queries with complex **WHERE** clauses. Nested groups are supported. Example:
 
 .. literalinclude:: query_builder/074.php
-   :lines: 2-
 
 .. note:: Groups need to be balanced, make sure every ``groupStart()`` is matched by a ``groupEnd()``.
 
@@ -702,14 +628,12 @@ query. You can either pass an **array** or an **object** to the
 method. Here is an example using an array:
 
 .. literalinclude:: query_builder/075.php
-   :lines: 2-
 
 The first parameter is an associative array of values.
 
 Here is an example using an object:
 
 .. literalinclude:: query_builder/076.php
-   :lines: 2-
 
 The first parameter is an object.
 
@@ -722,7 +646,6 @@ query. So if an entry with the same primary key already exists, the query won't
 You can optionally pass an **boolean** to the method. Here is an example using the array of the above example:
 
 .. literalinclude:: query_builder/077.php
-   :lines: 2-
 
 **$builder->getCompiledInsert()**
 
@@ -732,13 +655,11 @@ Compiles the insertion query just like ``$builder->insert()`` but does not
 Example:
 
 .. literalinclude:: query_builder/078.php
-   :lines: 2-
 
 The first parameter enables you to set whether or not the query builder query
 will be reset (by default it will be--just like ``$builder->insert()``):
 
 .. literalinclude:: query_builder/079.php
-   :lines: 2-
 
 The reason the second query worked is that the query has not been executed
 using ``$builder->insert()`` which resets values or reset directly using
@@ -753,7 +674,6 @@ query. You can either pass an **array** or an **object** to the
 method. Here is an example using an array:
 
 .. literalinclude:: query_builder/080.php
-   :lines: 2-
 
 The first parameter is an associative array of values.
 
@@ -775,7 +695,6 @@ logics with different combinations of  ``select()``, ``update()``,
 Example:
 
 .. literalinclude:: query_builder/081.php
-   :lines: 2-
 
 In the above example, if we assume that the ``title`` field is our primary
 key, then if a row containing ``My title`` as the ``title`` value, that row
@@ -792,13 +711,11 @@ This method enables you to set values for inserts or updates.
 or update() methods:**
 
 .. literalinclude:: query_builder/082.php
-   :lines: 2-
 
 If you use multiple method called they will be assembled properly
 based on whether you are doing an insert or an update:
 
 .. literalinclude:: query_builder/083.php
-   :lines: 2-
 
 ``set()`` will also accept an optional third parameter (``$escape``), that
 will prevent data from being escaped if set to ``false``. To illustrate the
@@ -806,17 +723,14 @@ difference, here is ``set()`` used both with and without the escape
 parameter.
 
 .. literalinclude:: query_builder/084.php
-   :lines: 2-
 
 You can also pass an associative array to this method:
 
 .. literalinclude:: query_builder/085.php
-   :lines: 2-
 
 Or an object:
 
 .. literalinclude:: query_builder/086.php
-   :lines: 2-
 
 **$builder->update()**
 
@@ -825,12 +739,10 @@ supply. You can pass an **array** or an **object** to the method. Here
 is an example using an array:
 
 .. literalinclude:: query_builder/087.php
-   :lines: 2-
 
 Or you can supply an object:
 
 .. literalinclude:: query_builder/088.php
-   :lines: 2-
 
 .. note:: All values are escaped automatically producing safer queries.
 
@@ -839,12 +751,10 @@ to set the **WHERE** clause. You can optionally pass this information
 directly into the ``update()`` method as a string:
 
 .. literalinclude:: query_builder/089.php
-   :lines: 2-
 
 Or as an array:
 
 .. literalinclude:: query_builder/090.php
-   :lines: 2-
 
 You may also use the ``$builder->set()`` method described above when
 performing updates.
@@ -856,7 +766,6 @@ You can either pass an **array** or an **object** to the method.
 Here is an example using an array:
 
 .. literalinclude:: query_builder/091.php
-   :lines: 2-
 
 The first parameter is an associative array of values, the second parameter is the where key.
 
@@ -884,14 +793,12 @@ Deleting Data
 Generates a **DELETE** SQL string and runs the query.
 
 .. literalinclude:: query_builder/092.php
-   :lines: 2-
 
 The first parameter is the where clause.
 You can also use the ``where()`` or ``or_where()`` methods instead of passing
 the data to the first parameter of the method:
 
 .. literalinclude:: query_builder/093.php
-   :lines: 2-
 
 If you want to delete all data from a table, you can use the ``truncate()``
 method, or ``emptyTable()``.
@@ -902,14 +809,12 @@ Generates a **DELETE** SQL string and runs the
 query:
 
 .. literalinclude:: query_builder/094.php
-   :lines: 2-
 
 **$builder->truncate()**
 
 Generates a **TRUNCATE** SQL string and runs the query.
 
 .. literalinclude:: query_builder/095.php
-   :lines: 2-
 
 .. note:: If the TRUNCATE command isn't available, ``truncate()`` will
     execute as "DELETE FROM table".
@@ -929,7 +834,6 @@ Method chaining allows you to simplify your syntax by connecting
 multiple methods. Consider this example:
 
 .. literalinclude:: query_builder/096.php
-   :lines: 2-
 
 .. _ar-caching:
 
@@ -947,7 +851,6 @@ This is useful in situations where you are using Query Builder to generate SQL
 run the query:
 
 .. literalinclude:: query_builder/097.php
-   :lines: 2-
 
 ***************
 Class Reference
diff --git a/user_guide_src/source/database/results.rst b/user_guide_src/source/database/results.rst
index f50272867b20..b415a0936f77 100644
--- a/user_guide_src/source/database/results.rst
+++ b/user_guide_src/source/database/results.rst
@@ -19,7 +19,6 @@ This method returns the query result as an array of **objects**, or
 loop, like this:
 
 .. literalinclude:: results/001.php
-   :lines: 2-
 
 The above method is an alias of ``getResultObject()``.
 
@@ -27,7 +26,6 @@ You can pass in the string 'array' if you wish to get your results
 as an array of arrays:
 
 .. literalinclude:: results/002.php
-   :lines: 2-
 
 The above usage is an alias of ``getResultArray()``.
 
@@ -35,7 +33,6 @@ You can also pass a string to ``getResult()`` which represents a class to
 instantiate for each result object
 
 .. literalinclude:: results/003.php
-   :lines: 2-
 
 The above method is an alias of ``getCustomResultObject()``.
 
@@ -46,7 +43,6 @@ array when no result is produced. Typically you'll use this in a foreach
 loop, like this:
 
 .. literalinclude:: results/004.php
-   :lines: 2-
 
 ***********
 Result Rows
@@ -59,19 +55,16 @@ one row, it returns only the first row. The result is returned as an
 **object**. Here's a usage example:
 
 .. literalinclude:: results/005.php
-   :lines: 2-
 
 If you want a specific row returned you can submit the row number as a
 digit in the first parameter:
 
 .. literalinclude:: results/006.php
-   :lines: 2-
 
 You can also add a second String parameter, which is the name of a class
 to instantiate the row with:
 
 .. literalinclude:: results/007.php
-   :lines: 2-
 
 **getRowArray()**
 
@@ -79,13 +72,11 @@ Identical to the above ``row()`` method, except it returns an array.
 Example:
 
 .. literalinclude:: results/008.php
-   :lines: 2-
 
 If you want a specific row returned you can submit the row number as a
 digit in the first parameter:
 
 .. literalinclude:: results/009.php
-   :lines: 2-
 
 In addition, you can walk forward/backwards/first/last through your
 results using these variations:
@@ -114,7 +105,6 @@ result in memory as ``row()`` does. If your query has more than one row,
 it returns the current row and moves the internal data pointer ahead.
 
 .. literalinclude:: results/010.php
-   :lines: 2-
 
 For use with MySQLi you may set MySQLi's result mode to
 ``MYSQLI_USE_RESULT`` for maximum memory savings. Use of this is not
@@ -123,7 +113,6 @@ such as writing large queries to csv. If you change the result mode
 be aware of the tradeoffs associated with it.
 
 .. literalinclude:: results/011.php
-   :lines: 2-
 
 .. note:: When using ``MYSQLI_USE_RESULT`` all subsequent calls on the same
     connection will result in error until all records have been fetched or
@@ -136,7 +125,6 @@ You can optionally pass 'object' (default) or 'array' in order to specify
 the returned value's type:
 
 .. literalinclude:: results/012.php
-   :lines: 2-
 
 *********************
 Custom Result Objects
@@ -152,7 +140,6 @@ then you should provide a ``__set()`` method to allow them to be set.
 Example:
 
 .. literalinclude:: results/013.php
-   :lines: 2-
 
 In addition to the two methods listed below, the following methods also can
 take a class name to return the results as: ``getFirstRow()``, ``getLastRow()``,
@@ -166,7 +153,6 @@ The only parameter is the name of the class to instantiate.
 Example:
 
 .. literalinclude:: results/014.php
-   :lines: 2-
 
 **getCustomRowObject()**
 
@@ -176,14 +162,12 @@ number of the results. The second parameter is the class name to instantiate.
 Example:
 
 .. literalinclude:: results/015.php
-   :lines: 2-
 
 You can also use the ``getRow()`` method in exactly the same way.
 
 Example:
 
 .. literalinclude:: results/016.php
-   :lines: 2-
 
 *********************
 Result Helper Methods
@@ -195,7 +179,6 @@ The number of FIELDS (columns) returned by the query. Make sure to call
 the method using your query result object:
 
 .. literalinclude:: results/017.php
-   :lines: 2-
 
 **getFieldNames()**
 
@@ -203,7 +186,6 @@ Returns an array with the names of the FIELDS (columns) returned by the query.
 Make sure to call the method using your query result object:
 
 .. literalinclude:: results/018.php
-   :lines: 2-
 
 **getNumRows()**
 
@@ -211,7 +193,6 @@ The number of records returned by the query. Make sure to call
 the method using your query result object:
 
 .. literalinclude:: results/019.php
-   :lines: 2-
 
 .. note:: Because SQLite3 lacks an efficient method returning a record count,
     CodeIgniter will fetch and buffer the query result records internally and
@@ -228,7 +209,6 @@ result has been generated in order to cut down on memory consumption.
 Example:
 
 .. literalinclude:: results/020.php
-   :lines: 2-
 
 **dataSeek()**
 
@@ -239,7 +219,6 @@ It accepts a positive integer value, which defaults to 0 and returns
 true on success or false on failure.
 
 .. literalinclude:: results/021.php
-   :lines: 2-
 
 .. note:: Not all database drivers support this feature and will return false.
     Most notably - you won't be able to use it with PDO.
diff --git a/user_guide_src/source/database/transactions.rst b/user_guide_src/source/database/transactions.rst
index e1522e57a178..a5612362cb8c 100644
--- a/user_guide_src/source/database/transactions.rst
+++ b/user_guide_src/source/database/transactions.rst
@@ -40,7 +40,6 @@ To run your queries using transactions you will use the
 follows:
 
 .. literalinclude:: transactions/001.php
-   :lines: 2-
 
 You can run as many queries as you want between the start/complete
 functions and they will all be committed or rolled back based on the success
@@ -58,7 +57,6 @@ group will not affect any others.
 Strict Mode can be disabled as follows:
 
 .. literalinclude:: transactions/002.php
-   :lines: 2-
 
 Managing Errors
 ===============
@@ -68,7 +66,6 @@ you'll see a standard error message if the commit was unsuccessful. If
 debugging is turned off, you can manage your own errors like this:
 
 .. literalinclude:: transactions/003.php
-   :lines: 2-
 
 Disabling Transactions
 ======================
@@ -77,7 +74,6 @@ Transactions are enabled by default. If you would like to disable transactions y
 can do so using ``$this->db->transOff()``:
 
 .. literalinclude:: transactions/004.php
-   :lines: 2-
 
 When transactions are disabled, your queries will be auto-committed, just
 as they are when running queries without transactions.
@@ -91,7 +87,6 @@ a valid result. To use test mode simply set the first parameter in the
 ``$this->db->transStart()`` function to true:
 
 .. literalinclude:: transactions/005.php
-   :lines: 2-
 
 Running Transactions Manually
 =============================
@@ -99,7 +94,6 @@ Running Transactions Manually
 If you would like to run transactions manually you can do so as follows:
 
 .. literalinclude:: transactions/006.php
-   :lines: 2-
 
 .. note:: Make sure to use ``$this->db->transBegin()`` when running manual
     transactions, **NOT** ``$this->db->transStart()``.
diff --git a/user_guide_src/source/database/utilities.rst b/user_guide_src/source/database/utilities.rst
index 9d095a712aff..20d4953247e5 100644
--- a/user_guide_src/source/database/utilities.rst
+++ b/user_guide_src/source/database/utilities.rst
@@ -17,7 +17,6 @@ Get XML FROM Result
 This method returns the xml result from database result. You can do like this:
 
 .. literalinclude:: utilities/001.php
-   :lines: 2-
 
 and it will get the following xml result::
 
diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index 95374ae354a2..3777d86e2ad9 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -18,13 +18,11 @@ Initializing the Forge Class
 Load the Forge Class as follows:
 
 .. literalinclude:: forge/001.php
-   :lines: 2-
 
 You can also pass another database group name to the DB Forge loader, in case
 the database you want to manage isn't the default one:
 
 .. literalinclude:: forge/002.php
-   :lines: 2-
 
 In the above example, we're passing the name of a different database group
 to connect to as the first parameter.
@@ -39,13 +37,11 @@ Permits you to create the database specified in the first parameter.
 Returns true/false based on success or failure:
 
 .. literalinclude:: forge/003.php
-   :lines: 2-
 
 An optional second parameter set to true will add ``IF EXISTS`` statement
 or will check if a database exists before create it (depending on DBMS).
 
 .. literalinclude:: forge/004.php
-   :lines: 2-
 
 **$forge->dropDatabase('db_name')**
 
@@ -53,7 +49,6 @@ Permits you to drop the database specified in the first parameter.
 Returns true/false based on success or failure:
 
 .. literalinclude:: forge/005.php
-   :lines: 2-
 
 Creating Databases in the Command Line
 ======================================
@@ -97,7 +92,6 @@ example, INT, VARCHAR, TEXT, etc. Many datatypes (for example VARCHAR)
 also require a ``constraint`` key.
 
 .. literalinclude:: forge/006.php
-   :lines: 2-
 
 Additionally, the following key/values can be used:
 
@@ -111,7 +105,6 @@ Additionally, the following key/values can be used:
 -  ``unique``/true : to generate a unique key for the field definition.
 
 .. literalinclude:: forge/007.php
-   :lines: 2-
 
 After the fields have been defined, they can be added using
 ``$forge->addField($fields)`` followed by a call to the
@@ -128,7 +121,6 @@ If you know exactly how you want a field to be created, you can pass the
 string into the field definitions with ``addField()``:
 
 .. literalinclude:: forge/008.php
-   :lines: 2-
 
 .. note:: Passing raw strings as fields cannot be followed by ``addKey()`` calls on those fields.
 
@@ -142,7 +134,6 @@ id will automatically be assigned as an INT(9) auto_incrementing
 Primary Key.
 
 .. literalinclude:: forge/009.php
-   :lines: 2-
 
 Adding Keys
 ===========
@@ -157,13 +148,11 @@ Multiple column non-primary keys must be sent as an array. Sample output
 below is for MySQL.
 
 .. literalinclude:: forge/010.php
-   :lines: 2-
 
 To make code reading more objective it is also possible to add primary
 and unique keys with specific methods:
 
 .. literalinclude:: forge/011.php
-   :lines: 2-
 
 .. _adding-foreign-keys:
 
@@ -174,12 +163,10 @@ Foreign Keys help to enforce relationships and actions across your tables. For t
 you may add them directly in forge:
 
 .. literalinclude:: forge/012.php
-   :lines: 2-
 
 You can specify the desired action for the "on delete" and "on update" properties of the constraint:
 
 .. literalinclude:: forge/013.php
-   :lines: 2-
 
 Creating a Table
 ================
@@ -188,18 +175,15 @@ After fields and keys have been declared, you can create a new table
 with
 
 .. literalinclude:: forge/014.php
-   :lines: 2-
 
 An optional second parameter set to true adds an ``IF NOT EXISTS`` clause
 into the definition
 
 .. literalinclude:: forge/015.php
-   :lines: 2-
 
 You could also pass optional table attributes, such as MySQL's ``ENGINE``:
 
 .. literalinclude:: forge/016.php
-   :lines: 2-
 
 .. note:: Unless you specify the ``CHARACTER SET`` and/or ``COLLATE`` attributes,
     ``createTable()`` will always add them with your configured *charset*
@@ -211,13 +195,11 @@ Dropping a Table
 Execute a ``DROP TABLE`` statement and optionally add an ``IF EXISTS`` clause.
 
 .. literalinclude:: forge/017.php
-   :lines: 2-
 
 A third parameter can be passed to add a ``CASCADE`` option, which might be required for some
 drivers to handle removal of tables with foreign keys.
 
 .. literalinclude:: forge/018.php
-   :lines: 2-
 
 Dropping a Foreign Key
 ======================
@@ -225,7 +207,6 @@ Dropping a Foreign Key
 Execute a DROP FOREIGN KEY.
 
 .. literalinclude:: forge/019.php
-   :lines: 2-
 
 Dropping a Key
 ======================
@@ -233,7 +214,6 @@ Dropping a Key
 Execute a DROP KEY.
 
 .. literalinclude:: forge/020.php
-   :lines: 2-
 
 Renaming a Table
 ================
@@ -241,7 +221,6 @@ Renaming a Table
 Executes a TABLE rename
 
 .. literalinclude:: forge/021.php
-   :lines: 2-
 
 ****************
 Modifying Tables
@@ -257,7 +236,6 @@ accepts the same field array as above, and can be used for an unlimited
 number of additional fields.
 
 .. literalinclude:: forge/022.php
-   :lines: 2-
 
 If you are using MySQL or CUBIRD, then you can take advantage of their
 ``AFTER`` and ``FIRST`` clauses to position the new column.
@@ -265,7 +243,6 @@ If you are using MySQL or CUBIRD, then you can take advantage of their
 Examples:
 
 .. literalinclude:: forge/023.php
-   :lines: 2-
 
 Dropping Columns From a Table
 ==============================
@@ -275,12 +252,10 @@ Dropping Columns From a Table
 Used to remove a column from a table.
 
 .. literalinclude:: forge/024.php
-   :lines: 2-
 
 Used to remove multiple columns from a table.
 
 .. literalinclude:: forge/025.php
-   :lines: 2-
 
 Modifying a Column in a Table
 =============================
@@ -292,7 +267,6 @@ alters an existing column rather than adding a new one. In order to
 change the name, you can add a "name" key into the field defining array.
 
 .. literalinclude:: forge/026.php
-   :lines: 2-
 
 ***************
 Class Reference
diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst
index 908577edced3..cd5787328a96 100644
--- a/user_guide_src/source/dbmgmt/migration.rst
+++ b/user_guide_src/source/dbmgmt/migration.rst
@@ -61,7 +61,6 @@ To temporarily bypass the foreign key checks while running migrations, use the `
 ``enableForeignKeyChecks()`` methods on the database connection.
 
 .. literalinclude:: migration/002.php
-   :lines: 2-
 
 Database Groups
 ===============
@@ -90,7 +89,6 @@ For example, assume that we have the following namespaces defined in our Autoloa
 configuration file:
 
 .. literalinclude:: migration/004.php
-   :lines: 2-
 
 This will look for any migrations located at both **APPPATH/Database/Migrations** and
 **ROOTPATH/MyCompany/Database/Migrations**. This makes it simple to include migrations in your
@@ -235,7 +233,6 @@ Class Reference
         Regress can be used to roll back changes to a previous state, batch by batch.
 
         .. literalinclude:: migration/006.php
-           :lines: 2-
 
     .. php:method:: force($path, $namespace, $group)
 
@@ -258,7 +255,6 @@ Class Reference
         Sets the namespace the library should look for migration files:
 
         .. literalinclude:: migration/007.php
-           :lines: 2-
 
     .. php:method:: setGroup($group)
 
@@ -269,4 +265,3 @@ Class Reference
         Sets the group the library should look for migration files:
 
         .. literalinclude:: migration/008.php
-           :lines: 2-
diff --git a/user_guide_src/source/dbmgmt/seeds.rst b/user_guide_src/source/dbmgmt/seeds.rst
index 620dbda8d472..3ed29914159f 100644
--- a/user_guide_src/source/dbmgmt/seeds.rst
+++ b/user_guide_src/source/dbmgmt/seeds.rst
@@ -26,7 +26,6 @@ You can also use a fully-qualified class name in the **call()** method, allowing
 anywhere the autoloader can find them. This is great for more modular code bases:
 
 .. literalinclude:: seeds/003.php
-   :lines: 2-
 
 Using Seeders
 =============
@@ -34,7 +33,6 @@ Using Seeders
 You can grab a copy of the main seeder through the database config class:
 
 .. literalinclude:: seeds/004.php
-   :lines: 2-
 
 Command Line Seeding
 --------------------
diff --git a/user_guide_src/source/extending/basecontroller.rst b/user_guide_src/source/extending/basecontroller.rst
index 7f6fdfab4a7b..790eac099060 100644
--- a/user_guide_src/source/extending/basecontroller.rst
+++ b/user_guide_src/source/extending/basecontroller.rst
@@ -16,13 +16,11 @@ use every time your project runs. Helpers should be added to the pre-defined ``$
 you want the HTML and Text helpers universally available:
 
 .. literalinclude:: basecontroller/002.php
-   :lines: 2-
 
 Any other components to load or data to process should be added to the constructor ``initController()``. For
 example, if your project uses the Session Library heavily you may want to initiate it here:
 
 .. literalinclude:: basecontroller/003.php
-   :lines: 2-
 
 Additional Methods
 ==================
@@ -42,4 +40,3 @@ If you do not want to use the base controller you may bypass it by having your c
 Controller instead:
 
 .. literalinclude:: basecontroller/004.php
-   :lines: 2-
diff --git a/user_guide_src/source/extending/core_classes.rst b/user_guide_src/source/extending/core_classes.rst
index 6c87d764410e..fc06e2c305f8 100644
--- a/user_guide_src/source/extending/core_classes.rst
+++ b/user_guide_src/source/extending/core_classes.rst
@@ -54,7 +54,6 @@ the core system class, you would create your class like this:
 Then you would add the ``routes`` service in **app/Config/Services.php** to load your class instead:
 
 .. literalinclude:: core_classes/002.php
-   :lines: 2-
 
 Extending Core Classes
 ======================
diff --git a/user_guide_src/source/extending/events.rst b/user_guide_src/source/extending/events.rst
index 8761b23175b2..cf15415813a4 100644
--- a/user_guide_src/source/extending/events.rst
+++ b/user_guide_src/source/extending/events.rst
@@ -24,14 +24,12 @@ the Events class' ``on()`` method. The first parameter is the name of the event
 a callable that will be run when that event is triggered:
 
 .. literalinclude:: events/001.php
-   :lines: 2-
 
 In this example, whenever the **pre_controller** event is executed, an instance of ``MyClass`` is created and the
 ``MyFunction`` method is run. Note that the second parameter can be *any* form of
 `callable <https://www.php.net/manual/en/function.is-callable.php>`_ that PHP recognizes:
 
 .. literalinclude:: events/002.php
-   :lines: 2-
 
 Setting Priorities
 ------------------
@@ -41,7 +39,6 @@ are called. You can do this by passing a priority value as the third parameter o
 are executed first, with a value of 1 having the highest priority, and there being no limit on the lower values:
 
 .. literalinclude:: events/003.php
-   :lines: 2-
 
 Any subscribers with the same priority will be executed in the order they were defined.
 
@@ -49,7 +46,6 @@ Three constants are defined for your use, that set some helpful ranges on the va
 but you might find they aid readability:
 
 .. literalinclude:: events/004.php
-   :lines: 2-
 
 Once sorted, all subscribers are executed in order. If any subscriber returns a boolean false value, then execution of
 the subscribers will stop.
@@ -61,13 +57,11 @@ The Events library makes it simple for you to create events in your own code, al
 need to call the ``trigger()`` method on the **Events** class with the name of the event:
 
 .. literalinclude:: events/005.php
-   :lines: 2-
 
 You can pass any number of arguments to the subscribers by adding them as additional parameters. Subscribers will be
 given the arguments in the same order as defined:
 
 .. literalinclude:: events/006.php
-   :lines: 2-
 
 Simulating Events
 =================
@@ -77,12 +71,10 @@ and counter-productive. You can tell the Events class to only simulate running t
 When **true**, all events will be skipped over during the trigger method. Everything else will work as normal, though.
 
 .. literalinclude:: events/007.php
-   :lines: 2-
 
 You can stop simulation by passing false:
 
 .. literalinclude:: events/008.php
-   :lines: 2-
 
 Event Points
 ============
diff --git a/user_guide_src/source/general/caching.rst b/user_guide_src/source/general/caching.rst
index f11988518ad3..04a144141ff2 100644
--- a/user_guide_src/source/general/caching.rst
+++ b/user_guide_src/source/general/caching.rst
@@ -37,7 +37,6 @@ To enable caching, put the following tag in any of your controller
 methods:
 
 .. literalinclude:: caching/001.php
-   :lines: 2-
 
 Where ``$n`` is the number of **seconds** you wish the page to remain
 cached between refreshes.
diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index 5a40fe8dcdda..920e2496b43b 100755
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -29,7 +29,6 @@ Service Accessors
     Examples:
 
     .. literalinclude:: common_functions/001.php
-       :lines: 2-
 
 .. php:function:: cookie(string $name[, string $value = ''[, array $options = []]])
 
@@ -121,7 +120,6 @@ Service Accessors
     Example:
 
     .. literalinclude:: common_functions/002.php
-       :lines: 2-
 
 .. note:: If you are using the :doc:`form helper </helpers/form_helper>`, this feature is built-in. You only
         need to use this function when not using the form helper.
@@ -148,7 +146,6 @@ Service Accessors
     Example:
 
     .. literalinclude:: common_functions/003.php
-       :lines: 2-
 
 .. php:function:: view ($name [, $data [, $options ]])
 
@@ -175,7 +172,6 @@ Service Accessors
     Example:
 
     .. literalinclude:: common_functions/004.php
-       :lines: 2-
 
     For more details, see the :doc:`Views </outgoing/views>` page.
 
@@ -306,13 +302,11 @@ Miscellaneous Functions
     Returns a RedirectResponse instance allowing you to easily create redirects:
 
     .. literalinclude:: common_functions/005.php
-       :lines: 2-
 
     When passing an argument into the function, it is treated as a named/reverse-routed route, not a relative/full URI,
     treating it the same as using ``redirect()->route()``:
 
     .. literalinclude:: common_functions/006.php
-       :lines: 2-
 
 .. php:function:: remove_invisible_characters($str[, $urlEncoded = true])
 
@@ -327,7 +321,6 @@ Miscellaneous Functions
     Example:
 
     .. literalinclude:: common_functions/007.php
-       :lines: 2-
 
 .. php:function:: route_to ( $method [, ...$params] )
 
@@ -353,7 +346,6 @@ Miscellaneous Functions
     Example:
 
     .. literalinclude:: common_functions/008.php
-       :lines: 2-
 
 .. php:function:: single_service ( $name [, ...$params] )
 
diff --git a/user_guide_src/source/general/common_functions/002.php b/user_guide_src/source/general/common_functions/002.php
index 7ee178f4e741..1ade75d94317 100644
--- a/user_guide_src/source/general/common_functions/002.php
+++ b/user_guide_src/source/general/common_functions/002.php
@@ -7,7 +7,10 @@
     return redirect()->back()->withInput();
 }
 
-// In the view
+?>
+
+<!-- In your view file: -->
 <input type="email" name="email" value="<?= old('email') ?>">
-// Or with arrays
+
+<!-- Or with arrays: -->
 <input type="email" name="user[email]" value="<?= old('user.email') ?>">
diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst
index 9ce38839dc5b..85bdc91fe62c 100644
--- a/user_guide_src/source/general/configuration.rst
+++ b/user_guide_src/source/general/configuration.rst
@@ -23,17 +23,14 @@ You can access configuration files for your classes in several different ways.
 - By using the ``new`` keyword to create an instance:
 
   .. literalinclude:: configuration/001.php
-     :lines: 2-
 
 - By using the ``config()`` function:
 
   .. literalinclude:: configuration/002.php
-     :lines: 2-
 
 All configuration object properties are public, so you access the settings like any other property:
 
 .. literalinclude:: configuration/003.php
-   :lines: 2-
 
 If no namespace is provided, it will look for the file in all defined namespaces
 as well as **/app/Config/**.
@@ -93,7 +90,6 @@ overwritten. The loaded Environment variables are accessed using any of the foll
 ``getenv()``, ``$_SERVER``, or ``$_ENV``.
 
 .. literalinclude:: configuration/005.php
-   :lines: 2-
 
 .. warning:: Note that your settings from the **.env** file are added to Environment Variables. As a side effect, this means that if your CodeIgniter application is (for example) generating a ``var_dump($_ENV)`` or ``phpinfo()`` (for debugging or other valid reasons) **your secure credentials are publicly exposed**.
 
@@ -206,7 +202,6 @@ contains a dot.
 If this was referring to a SimpleConfig configuration object, the above example would be treated as:
 
 .. literalinclude:: configuration/006.php
-   :lines: 2-
 
 Any other elements of the ``$address`` property would be unchanged.
 
@@ -252,7 +247,6 @@ already configured. In **src/Config/Registrar.php** there would be a ``Registrar
 the single ``Pager()`` method (note the case-sensitivity):
 
 .. literalinclude:: configuration/007.php
-   :lines: 2-
 
 Registrar methods must always return an array, with keys corresponding to the properties
 of the target config file. Existing values are merged, and Registrar properties have
@@ -266,7 +260,6 @@ This is done by adding a ``$registrars`` property to your configuration file,
 holding an array of the names of candidate registrars:
 
 .. literalinclude:: configuration/008.php
-   :lines: 2-
 
 In order to act as a "registrar" the classes so identified must have a
 static function with the same name as the configuration class, and it should return an associative
@@ -289,4 +282,3 @@ the two properties declared, but the value of the ``$target`` property will be o
 by treating ``RegionalSales`` as a "registrar". The resulting configuration properties:
 
 .. literalinclude:: configuration/011.php
-   :lines: 2-
diff --git a/user_guide_src/source/general/errors.rst b/user_guide_src/source/general/errors.rst
index bbe83c39cd42..1709969c00b5 100644
--- a/user_guide_src/source/general/errors.rst
+++ b/user_guide_src/source/general/errors.rst
@@ -21,12 +21,10 @@ Exceptions are simply events that happen when the exception is "thrown". This ha
 execution is then sent to the error handler which displays the appropriate error page:
 
 .. literalinclude:: errors/001.php
-   :lines: 2-
 
 If you are calling a method that might throw an exception, you can catch that exception using a ``try/catch`` block:
 
 .. literalinclude:: errors/002.php
-   :lines: 2-
 
 If the ``$userModel`` throws an exception, it is caught and the code within the catch block is executed. In this example,
 the scripts dies, echoing the error message that the ``UserModel`` defined.
@@ -36,13 +34,11 @@ a ``UnknownFileException``, we can specify that in the catch parameter. Any othe
 not child classes of the caught exception will be passed on to the error handler:
 
 .. literalinclude:: errors/003.php
-   :lines: 2-
 
 This can be handy for handling the error yourself, or for performing cleanup before the script ends. If you want
 the error handler to function as normal, you can throw a new exception within the catch block:
 
 .. literalinclude:: errors/004.php
-   :lines: 2-
 
 Configuration
 =============
@@ -60,12 +56,10 @@ By default, all Exceptions other than 404 - Page Not Found exceptions are logged
 by setting the ``$log`` value of **app/Config/Exceptions.php**:
 
 .. literalinclude:: errors/005.php
-   :lines: 2-
 
 To ignore logging on other status codes, you can set the status code to ignore in the same file:
 
 .. literalinclude:: errors/006.php
-   :lines: 2-
 
 .. note:: It is possible that logging still will not happen for exceptions if your current Log settings
     are not set up to log **critical** errors, which all exceptions are logged as.
@@ -84,7 +78,6 @@ If, in **app/Config/Routes.php**, you have specified a 404 Override, that will b
 404 page:
 
 .. literalinclude:: errors/007.php
-   :lines: 2-
 
 You can pass a message into the exception that will be displayed in place of the default message on the 404 page.
 
@@ -95,7 +88,6 @@ This exception should be used when the values from the configuration class are i
 is not the right type, etc:
 
 .. literalinclude:: errors/008.php
-   :lines: 2-
 
 This provides an HTTP status code of 500 and an exit code of 3.
 
@@ -106,7 +98,6 @@ This exception is thrown for database errors, such as when the database connecti
 or when it is temporarily lost:
 
 .. literalinclude:: errors/009.php
-   :lines: 2-
 
 This provides an HTTP status code of 500 and an exit code of 8.
 
@@ -117,10 +108,8 @@ This exception is a special case allowing for overriding of all other response r
 forcing a redirect to a specific route or URL:
 
 .. literalinclude:: errors/010.php
-   :lines: 2-
 
 ``$route`` may be a named route, relative URI, or a complete URL. You can also supply a
 redirect code to use instead of the default (``302``, "temporary redirect"):
 
 .. literalinclude:: errors/011.php
-   :lines: 2-
diff --git a/user_guide_src/source/general/helpers.rst b/user_guide_src/source/general/helpers.rst
index 5cfae58cfd40..4113f6cf91ff 100644
--- a/user_guide_src/source/general/helpers.rst
+++ b/user_guide_src/source/general/helpers.rst
@@ -35,7 +35,6 @@ Loading a Helper
 Loading a helper file is quite simple using the following method:
 
 .. literalinclude:: helpers/001.php
-   :lines: 2-
 
 Where ``name`` is the file name of the helper, without the "**.php**" file
 extension or the "**_helper**" part.
@@ -44,13 +43,11 @@ For example, to load the **Cookie Helper** file, which is named
 **cookie_helper.php**, you would do this:
 
 .. literalinclude:: helpers/002.php
-   :lines: 2-
 
 If you need to load more than one helper at a time, you can pass
 an array of file names in and all of them will be loaded:
 
 .. literalinclude:: helpers/003.php
-   :lines: 2-
 
 A helper can be loaded anywhere within your controller methods (or
 even within your View files, although that's not a good practice), as
@@ -82,7 +79,6 @@ code into its own namespace, ``Example\Blog``. The files exist on our server at
 use the following command to load the helper for us:
 
 .. literalinclude:: helpers/004.php
-   :lines: 2-
 
 .. note:: The functions within files loaded this way are not truly namespaced.
     The namespace is simply used as a convenient way to locate the files.
@@ -122,7 +118,6 @@ named **app/Helpers/array_helper.php**, and add or override
 functions:
 
 .. literalinclude:: helpers/006.php
-   :lines: 2-
 
 The ``helper()`` method will scan through all PSR-4 namespaces defined in **app/Config/Autoload.php**
 and load in ALL matching helpers of the same name. This allows any module's helpers
diff --git a/user_guide_src/source/general/logging.rst b/user_guide_src/source/general/logging.rst
index 1622920313de..914cfe9299e9 100644
--- a/user_guide_src/source/general/logging.rst
+++ b/user_guide_src/source/general/logging.rst
@@ -11,7 +11,6 @@ the "level" of the error in the first parameter, indicating what type of message
 The second parameter is the message itself:
 
 .. literalinclude:: logging/001.php
-   :lines: 2-
 
 There are eight different log levels, matching to the `RFC 5424 <https://tools.ietf.org/html/rfc5424>`_ levels, and they are as follows:
 
@@ -47,7 +46,6 @@ a level of 5 or less (which includes runtime errors, system errors, etc) would b
 would be ignored:
 
 .. literalinclude:: logging/002.php
-   :lines: 2-
 
 A complete list of levels and their corresponding threshold value is in the configuration file for your reference.
 
@@ -55,7 +53,6 @@ You can pick and choose the specific levels that you would like logged by assign
 to the threshold value:
 
 .. literalinclude:: logging/003.php
-   :lines: 2-
 
 Using Multiple Log Handlers
 ---------------------------
@@ -78,7 +75,6 @@ Each handler's section will have one property in common: ``handles``, which is a
 *names* that the handler will log information for.
 
 .. literalinclude:: logging/004.php
-   :lines: 2-
 
 Modifying the Message With Context
 ==================================
@@ -90,14 +86,12 @@ you must provide an array of placeholder names (without the braces) and their va
 into the message string:
 
 .. literalinclude:: logging/005.php
-   :lines: 2-
 
 If you want to log an Exception or an Error, you can use the key of 'exception', and the value being the
 Exception or Error itself. A string will be generated from that object containing the error message, the
 file name and line number. You must still provide the exception placeholder in the message:
 
 .. literalinclude:: logging/006.php
-   :lines: 2-
 
 Several core placeholders exist that will be automatically expanded for you based on the current page request:
 
diff --git a/user_guide_src/source/general/managing_apps.rst b/user_guide_src/source/general/managing_apps.rst
index 7bef3620cb40..0681b1b534e6 100644
--- a/user_guide_src/source/general/managing_apps.rst
+++ b/user_guide_src/source/general/managing_apps.rst
@@ -21,7 +21,6 @@ your main **app/Config/Paths.php** and set a *full server path* in the
 ``$appDirectory`` variable (at about line 44):
 
 .. literalinclude:: managing_apps/001.php
-   :lines: 2-
 
 You will need to modify two additional files in your project root, so that
 they can find the **Paths** configuration file:
@@ -29,13 +28,11 @@ they can find the **Paths** configuration file:
 - **/spark** runs command line apps; the path is specified on or about line 35:
 
   .. literalinclude:: managing_apps/002.php
-     :lines: 2-
 
 - **/public/index.php** is the front controller for your webapp; the config
   path is specified on or about line 20:
 
   .. literalinclude:: managing_apps/003.php
-     :lines: 2-
 
 Running Multiple Applications with one CodeIgniter Installation
 ===============================================================
@@ -78,4 +75,3 @@ When you use Composer autoloader, fix the ``COMPOSER_PATH`` constant in **app/Co
 of those:
 
 .. literalinclude:: managing_apps/004.php
-   :lines: 2-
diff --git a/user_guide_src/source/general/modules.rst b/user_guide_src/source/general/modules.rst
index ad3e92b5a874..fe71bd006f72 100644
--- a/user_guide_src/source/general/modules.rst
+++ b/user_guide_src/source/general/modules.rst
@@ -33,7 +33,6 @@ directory in the main project root::
 Open **app/Config/Autoload.php** and add the **Acme** namespace to the ``psr4`` array property:
 
 .. literalinclude:: modules/001.php
-   :lines: 2-
 
 Now that this is set up, we can access any file within the **acme** folder through the ``Acme`` namespace. This alone
 takes care of 80% of what is needed for modules to work, so you should be sure to familiarize yourself with namespaces
@@ -73,7 +72,6 @@ your classes. All we need to do is provide the list of paths to those files and
 ``$files`` property of your **app/Config/Autoload.php** file.
 
 .. literalinclude:: modules/002.php
-   :lines: 2-
 
 ==============
 Auto-Discovery
@@ -96,7 +94,6 @@ To make auto-discovery work for our **Blog** namespace, we need to make one smal
 **Acme** needs to be changed to **Acme\\Blog** because each "module" within the namespace needs to be fully defined.
 
 .. literalinclude:: modules/003.php
-   :lines: 2-
 
 Once your module folder path is defined, the discovery process would look for discoverable items on that path and should, for example, find the routes file at **/acme/Blog/Config/Routes.php**.
 
@@ -122,7 +119,6 @@ If you do not want all of Composer's known directories to be scanned when locati
 by editing the ``$discoverInComposer`` variable in ``Config\Modules.php``:
 
 .. literalinclude:: modules/004.php
-   :lines: 2-
 
 ==================
 Working With Files
@@ -156,7 +152,6 @@ It can be turned off in the **Modules** config file, described above.
 In the module's **Config/Filters.php** file, you need to define the aliases of the filters you use:
 
 .. literalinclude:: modules/005.php
-   :lines: 2-
 
 Controllers
 ===========
@@ -165,12 +160,10 @@ Controllers outside of the main **app/Controllers** directory cannot be automati
 but must be specified within the Routes file itself:
 
 .. literalinclude:: modules/006.php
-   :lines: 2-
 
 To reduce the amount of typing needed here, the **group** routing feature is helpful:
 
 .. literalinclude:: modules/007.php
-   :lines: 2-
 
 Config Files
 ============
@@ -179,7 +172,6 @@ No special change is needed when working with configuration files. These are sti
 with the ``new`` command:
 
 .. literalinclude:: modules/008.php
-   :lines: 2-
 
 Config files are automatically discovered whenever using the **config()** function that is always available.
 
@@ -211,7 +203,6 @@ Helpers will be located automatically from defined namespaces when using the ``h
 is within the namespaces **Helpers** directory:
 
 .. literalinclude:: modules/009.php
-   :lines: 2-
 
 Language Files
 ==============
@@ -225,7 +216,6 @@ Libraries
 Libraries are always instantiated by their fully-qualified class name, so no special access is provided:
 
 .. literalinclude:: modules/010.php
-   :lines: 2-
 
 Models
 ======
@@ -233,7 +223,6 @@ Models
 Models are always instantiated by their fully-qualified class name, so no special access is provided:
 
 .. literalinclude:: modules/011.php
-   :lines: 2-
 
 Views
 =====
@@ -241,4 +230,3 @@ Views
 Views can be loaded using the class namespace as described in the :doc:`views </outgoing/views>` documentation:
 
 .. literalinclude:: modules/012.php
-   :lines: 2-
diff --git a/user_guide_src/source/helpers/array_helper.rst b/user_guide_src/source/helpers/array_helper.rst
index 318dfad5c2c4..845ccccf39b4 100644
--- a/user_guide_src/source/helpers/array_helper.rst
+++ b/user_guide_src/source/helpers/array_helper.rst
@@ -15,7 +15,6 @@ Loading this Helper
 This helper is loaded using the following code:
 
 .. literalinclude:: array_helper/001.php
-   :lines: 2-
 
 Available Functions
 ===================
@@ -33,25 +32,21 @@ The following functions are available:
     and allows the use of a the '*' wildcard. Given the following array:
 
     .. literalinclude:: array_helper/002.php
-       :lines: 2-
 
     We can locate the value of 'fizz' by using the search string "foo.buzz.fizz". Likewise, the value
     of baz can be found with "foo.bar.baz":
 
     .. literalinclude:: array_helper/003.php
-       :lines: 2-
 
     You can use the asterisk as a wildcard to replace any of the segments. When found, it will search through all
     of the child nodes until it finds it. This is handy if you don't know the values, or if your values
     have a numeric index:
 
     .. literalinclude:: array_helper/004.php
-       :lines: 2-
 
     If the array key contains a dot, then the key can be escaped with a backslash:
 
     .. literalinclude:: array_helper/005.php
-       :lines: 2-
 
 ..  php:function:: array_deep_search($key, array $array)
 
@@ -75,20 +70,17 @@ The following functions are available:
     from, e.g., the ``find()`` function of a model:
 
     .. literalinclude:: array_helper/006.php
-       :lines: 2-
 
     Now sort this array by two keys. Note that the method supports the dot-notation
     to access values in deeper array levels, but does not support wildcards:
 
     .. literalinclude:: array_helper/007.php
-       :lines: 2-
 
     The ``$players`` array is now sorted by the 'order' value in each players'
     'team' subarray. If this value is equal for several players, these players
     will be ordered by their 'position'. The resulting array is:
 
     .. literalinclude:: array_helper/008.php
-       :lines: 2-
 
     In the same way, the method can also handle an array of objects. In the example
     above it is further possible that each 'player' is represented by an array,
@@ -106,16 +98,13 @@ The following functions are available:
     as separators for the keys.
 
     .. literalinclude:: array_helper/009.php
-       :lines: 2-
 
     On inspection, ``$flattened`` is equal to:
 
     .. literalinclude:: array_helper/010.php
-       :lines: 2-
 
     Users may use the ``$id`` parameter on their own, but are not required to do so.
     The function uses this parameter internally to track the flattened keys. If users
     will be supplying an initial ``$id``, it will be prepended to all keys.
 
     .. literalinclude:: array_helper/011.php
-       :lines: 2-
diff --git a/user_guide_src/source/helpers/cookie_helper.rst b/user_guide_src/source/helpers/cookie_helper.rst
index a7761e24a358..66d6879a4fec 100755
--- a/user_guide_src/source/helpers/cookie_helper.rst
+++ b/user_guide_src/source/helpers/cookie_helper.rst
@@ -15,7 +15,6 @@ Loading this Helper
 This helper is loaded using the following code:
 
 .. literalinclude:: cookie_helper/001.php
-   :lines: 2-
 
 Available Functions
 ===================
@@ -68,7 +67,6 @@ The following functions are available:
     values, only the name of the cookie is needed.
 
     .. literalinclude:: cookie_helper/002.php
-       :lines: 2-
 
     This function is otherwise identical to ``set_cookie()``, except that it
     does not have the value and expiration parameters. You can submit an
@@ -76,7 +74,6 @@ The following functions are available:
     parameters.
 
     .. literalinclude:: cookie_helper/003.php
-       :lines: 2-
 
 .. php:function:: has_cookie(string $name[, ?string $value = null[, string $prefix = '']])
 
diff --git a/user_guide_src/source/helpers/date_helper.rst b/user_guide_src/source/helpers/date_helper.rst
index 8d7efaed937d..533364d4249d 100644
--- a/user_guide_src/source/helpers/date_helper.rst
+++ b/user_guide_src/source/helpers/date_helper.rst
@@ -15,7 +15,6 @@ Loading this Helper
 This helper is loaded using the following code:
 
 .. literalinclude:: date_helper/001.php
-   :lines: 2-
 
 Available Functions
 ===================
@@ -36,7 +35,6 @@ The following functions are available:
     this function over PHP's ``time()`` function.
 
     .. literalinclude:: date_helper/002.php
-       :lines: 2-
 
     If a timezone is not provided, it will return ``time()`` based on the
     **time_reference** setting.
@@ -55,7 +53,6 @@ The following functions are available:
     selected value.
 
     .. literalinclude:: date_helper/003.php
-       :lines: 2-
 
 Many functions previously found in the CodeIgniter 3 ``date_helper`` have been moved to the ``I18n``
 module in CodeIgniter 4.
diff --git a/user_guide_src/source/helpers/filesystem_helper.rst b/user_guide_src/source/helpers/filesystem_helper.rst
index e81a1a0aa447..4cb00fb23188 100644
--- a/user_guide_src/source/helpers/filesystem_helper.rst
+++ b/user_guide_src/source/helpers/filesystem_helper.rst
@@ -15,7 +15,6 @@ Loading this Helper
 This helper is loaded using the following code:
 
 .. literalinclude:: filesystem_helper/001.php
-   :lines: 2-
 
 Available Functions
 ===================
@@ -33,7 +32,6 @@ The following functions are available:
     Examples:
 
     .. literalinclude:: filesystem_helper/002.php
-       :lines: 2-
 
     .. note:: Paths are almost always relative to your main index.php file.
 
@@ -42,14 +40,12 @@ The following functions are available:
     parameter (integer). A depth of 1 will only map the top level directory:
 
     .. literalinclude:: filesystem_helper/003.php
-       :lines: 2-
 
     By default, hidden files will not be included in the returned array and
     hidden directories will be skipped. To override this behavior, you may
     set a third parameter to true (boolean):
 
     .. literalinclude:: filesystem_helper/004.php
-       :lines: 2-
 
     Each folder name will be an array index, while its contained files will
     be numerically indexed. Here is an example of a typical array::
@@ -95,7 +91,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: filesystem_helper/005.php
-       :lines: 2-
 
     You can optionally change the overwrite behavior via the third parameter.
 
@@ -113,12 +108,10 @@ The following functions are available:
     Example:
 
     .. literalinclude:: filesystem_helper/006.php
-       :lines: 2-
 
     You can optionally set the write mode via the third parameter:
 
     .. literalinclude:: filesystem_helper/007.php
-       :lines: 2-
 
     The default mode is 'wb'. Please see the `PHP user guide <https://www.php.net/manual/en/function.fopen.php>`_
     for mode options.
@@ -147,7 +140,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: filesystem_helper/008.php
-       :lines: 2-
 
     If the second parameter is set to true, any directories contained within the supplied
     root path will be deleted as well.
@@ -155,7 +147,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: filesystem_helper/009.php
-       :lines: 2-
 
     .. note:: The files must be writable or owned by the system in order to be deleted.
 
@@ -175,7 +166,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: filesystem_helper/010.php
-       :lines: 2-
 
 .. php:function:: get_dir_file_info($source_dir, $top_level_only)
 
@@ -192,7 +182,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: filesystem_helper/011.php
-       :lines: 2-
 
 .. php:function:: get_file_info($file[, $returned_values = ['name', 'server_path', 'size', 'date']])
 
@@ -218,7 +207,6 @@ The following functions are available:
     standard symbolic notation of file permissions.
 
     .. literalinclude:: filesystem_helper/012.php
-       :lines: 2-
 
 .. php:function:: octal_permissions($perms)
 
@@ -230,7 +218,6 @@ The following functions are available:
     a three character octal notation of file permissions.
 
     .. literalinclude:: filesystem_helper/013.php
-       :lines: 2-
 
 .. php:function:: same_file($file1, $file2)
 
@@ -242,7 +229,6 @@ The following functions are available:
     Compares two files to see if they are the same (based on their MD5 hash).
 
     .. literalinclude:: filesystem_helper/014.php
-       :lines: 2-
 
 .. php:function:: set_realpath($path[, $check_existence = false])
 
@@ -258,4 +244,3 @@ The following functions are available:
     Examples:
 
     .. literalinclude:: filesystem_helper/015.php
-       :lines: 2-
diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst
index 938a6c968cc8..676a16adf5cf 100644
--- a/user_guide_src/source/helpers/form_helper.rst
+++ b/user_guide_src/source/helpers/form_helper.rst
@@ -15,7 +15,6 @@ Loading this Helper
 This helper is loaded using the following code:
 
 .. literalinclude:: form_helper/001.php
-   :lines: 2-
 
 Escaping field values
 =====================
@@ -28,7 +27,6 @@ elements. In order to do that safely, you'll need to use
 Consider the following example:
 
 .. literalinclude:: form_helper/002.php
-   :lines: 2-
 
 Since the above string contains a set of quotes, it will cause the form
 to break. The :php:func:`esc()` function converts HTML special
@@ -66,7 +64,6 @@ The following functions are available:
     Here's a simple example:
 
     .. literalinclude:: form_helper/003.php
-       :lines: 2-
 
     The above example would create a form that points to your site URL plus the
     "email/send" URI segments, like this::
@@ -76,7 +73,6 @@ The following functions are available:
     You can also add {locale} like the following:
 
     .. literalinclude:: form_helper/004.php
-       :lines: 2-
 
     The above example would create a form that points to your site URL plus the current request locale with
     "email/send" URI segments, like this::
@@ -89,12 +85,10 @@ The following functions are available:
         parameter, like this:
 
         .. literalinclude:: form_helper/005.php
-           :lines: 2-
 
         Alternatively, you can specify the second parameter as a string:
 
         .. literalinclude:: form_helper/006.php
-           :lines: 2-
 
         The above examples would create a form similar to this::
 
@@ -103,7 +97,6 @@ The following functions are available:
         If CSRF filter is turned on `form_open()` will generate CSRF field at the beginning of the form. You can specify ID of this field by passing csrf_id as one of the ``$attribute`` array:
 
         .. literalinclude:: form_helper/007.php
-           :lines: 2-
 
         will return::
 
@@ -118,7 +111,6 @@ The following functions are available:
         third parameter, like this:
 
         .. literalinclude:: form_helper/008.php
-           :lines: 2-
 
         You can skip the second parameter by passing any false value to it.
 
@@ -151,22 +143,18 @@ The following functions are available:
     name/value string to create one field:
 
     .. literalinclude:: form_helper/009.php
-       :lines: 2-
 
     ... or you can submit an associative array to create multiple fields:
 
     .. literalinclude:: form_helper/010.php
-       :lines: 2-
 
     You can also pass an associative array to the value field:
 
     .. literalinclude:: form_helper/011.php
-       :lines: 2-
 
     If you want to create hidden input fields with extra attributes:
 
     .. literalinclude:: form_helper/012.php
-       :lines: 2-
 
 .. php:function:: form_input([$data = ''[, $value = ''[, $extra = ''[, $type = 'text']]]])
 
@@ -181,29 +169,24 @@ The following functions are available:
     the field name and value in the first and second parameter:
 
     .. literalinclude:: form_helper/013.php
-       :lines: 2-
 
     Or you can pass an associative array containing any data you wish your
     form to contain:
 
     .. literalinclude:: form_helper/014.php
-       :lines: 2-
 
     If you would like your form to contain some additional data, like
     JavaScript, you can pass it as a string in the third parameter:
 
     .. literalinclude:: form_helper/015.php
-       :lines: 2-
 
     Or you can pass it as an array:
 
     .. literalinclude:: form_helper/016.php
-       :lines: 2-
 
     To support the expanded range of HTML5 input fields, you can pass an input type in as the fourth parameter:
 
     .. literalinclude:: form_helper/017.php
-       :lines: 2-
 
 .. php:function:: form_password([$data = ''[, $value = ''[, $extra = '']]])
 
@@ -261,19 +244,16 @@ The following functions are available:
     Example:
 
     .. literalinclude:: form_helper/018.php
-       :lines: 2-
 
     If you would like the opening <select> to contain additional data, like
     an id attribute or JavaScript, you can pass it as a string in the fourth
     parameter:
 
     .. literalinclude:: form_helper/019.php
-       :lines: 2-
 
     Or you can pass it as an array:
 
     .. literalinclude:: form_helper/020.php
-       :lines: 2-
 
     If the array passed as ``$options`` is a multidimensional array, then
     ``form_dropdown()`` will produce an <optgroup> with the array key as the
@@ -309,13 +289,11 @@ The following functions are available:
     Example:
 
     .. literalinclude:: form_helper/021.php
-       :lines: 2-
 
     Similar to other functions, you can submit an associative array in the
     second parameter if you prefer to set additional attributes:
 
     .. literalinclude:: form_helper/022.php
-       :lines: 2-
 
 .. php:function:: form_fieldset_close([$extra = ''])
 
@@ -328,7 +306,6 @@ The following functions are available:
     the tag. For example
 
     .. literalinclude:: form_helper/023.php
-       :lines: 2-
 
 .. php:function:: form_checkbox([$data = ''[, $value = ''[, $checked = false[, $extra = '']]]])
 
@@ -342,7 +319,6 @@ The following functions are available:
     Lets you generate a checkbox field. Simple example:
 
     .. literalinclude:: form_helper/024.php
-       :lines: 2-
 
     The third parameter contains a boolean true/false to determine whether
     the box should be checked or not.
@@ -351,19 +327,16 @@ The following functions are available:
     array of attributes to the function:
 
     .. literalinclude:: form_helper/025.php
-       :lines: 2-
 
     Also as with other functions, if you would like the tag to contain
     additional data like JavaScript, you can pass it as a string in the
     fourth parameter:
 
     .. literalinclude:: form_helper/026.php
-       :lines: 2-
 
     Or you can pass it as an array:
 
     .. literalinclude:: form_helper/027.php
-       :lines: 2-
 
 .. php:function:: form_radio([$data = ''[, $value = ''[, $checked = false[, $extra = '']]]])
 
@@ -388,7 +361,6 @@ The following functions are available:
     Lets you generate a <label>. Simple example:
 
     .. literalinclude:: form_helper/028.php
-       :lines: 2-
 
     Similar to other functions, you can submit an associative array in the
     third parameter if you prefer to set additional attributes.
@@ -396,7 +368,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: form_helper/029.php
-       :lines: 2-
 
 .. php:function:: form_submit([$data = ''[, $value = ''[, $extra = '']]])
 
@@ -409,7 +380,6 @@ The following functions are available:
     Lets you generate a standard submit button. Simple example:
 
     .. literalinclude:: form_helper/030.php
-       :lines: 2-
 
     Similar to other functions, you can submit an associative array in the
     first parameter if you prefer to set your own attributes. The third
@@ -438,19 +408,16 @@ The following functions are available:
     button name and content in the first and second parameter:
 
     .. literalinclude:: form_helper/031.php
-       :lines: 2-
 
     Or you can pass an associative array containing any data you wish your
     form to contain:
 
     .. literalinclude:: form_helper/032.php
-       :lines: 2-
 
     If you would like your form to contain some additional data, like
     JavaScript, you can pass it as a string in the third parameter:
 
     .. literalinclude:: form_helper/033.php
-       :lines: 2-
 
 .. php:function:: form_close([$extra = ''])
 
@@ -463,7 +430,6 @@ The following functions are available:
     the tag. For example:
 
     .. literalinclude:: form_helper/034.php
-       :lines: 2-
 
 .. php:function:: set_value($field[, $default = ''[, $html_escape = true]])
 
diff --git a/user_guide_src/source/helpers/form_helper/002.php b/user_guide_src/source/helpers/form_helper/002.php
index 0313910da1b5..5854c3a12f1f 100644
--- a/user_guide_src/source/helpers/form_helper/002.php
+++ b/user_guide_src/source/helpers/form_helper/002.php
@@ -2,4 +2,6 @@
 
 $string = 'Here is a string containing "quoted" text.';
 
+?>
+
 <input type="text" name="myfield" value="<?= $string ?>" />
diff --git a/user_guide_src/source/helpers/form_helper/021.php b/user_guide_src/source/helpers/form_helper/021.php
index 82b3062ff61f..0944d2e7fae7 100644
--- a/user_guide_src/source/helpers/form_helper/021.php
+++ b/user_guide_src/source/helpers/form_helper/021.php
@@ -4,11 +4,10 @@
 echo "<p>fieldset content here</p>\n";
 echo form_fieldset_close();
 
-/*
-    Produces:
+?>
 
-    <fieldset>
-        <legend>Address Information</legend>
-        <p>form content here</p>
-    </fieldset>
-*/
+<!-- Produces: -->
+<fieldset>
+    <legend>Address Information</legend>
+    <p>form content here</p>
+</fieldset>
diff --git a/user_guide_src/source/helpers/form_helper/022.php b/user_guide_src/source/helpers/form_helper/022.php
index 5a706b3c3071..a8ca201db3e3 100644
--- a/user_guide_src/source/helpers/form_helper/022.php
+++ b/user_guide_src/source/helpers/form_helper/022.php
@@ -9,11 +9,10 @@
 echo "<p>fieldset content here</p>\n";
 echo form_fieldset_close();
 
-/*
-    Produces:
+?>
 
-    <fieldset id="address_info" class="address_info">
-        <legend>Address Information</legend>
-        <p>form content here</p>
-    </fieldset>
-*/
+<!-- Produces: --> 
+<fieldset id="address_info" class="address_info">
+    <legend>Address Information</legend>
+    <p>form content here</p>
+</fieldset>
diff --git a/user_guide_src/source/helpers/html_helper.rst b/user_guide_src/source/helpers/html_helper.rst
index 0398a735d820..44d0089ac6c7 100755
--- a/user_guide_src/source/helpers/html_helper.rst
+++ b/user_guide_src/source/helpers/html_helper.rst
@@ -15,7 +15,6 @@ Loading this Helper
 This helper is loaded using the following code:
 
 .. literalinclude:: html_helper/001.php
-   :lines: 2-
 
 Available Functions
 ===================
@@ -34,7 +33,6 @@ The following functions are available:
     image source. Example:
 
     .. literalinclude:: html_helper/002.php
-       :lines: 2-
 
     There is an optional second parameter that is a true/false value that
     specifics if the *src* should have the page specified by
@@ -42,7 +40,6 @@ The following functions are available:
     Presumably, this would be if you were using a media controller:
 
     .. literalinclude:: html_helper/003.php
-       :lines: 2-
 
     Additionally, an associative array can be passed as the first parameter,
     for complete control over all attributes and values. If an *alt* attribute
@@ -51,7 +48,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: html_helper/004.php
-       :lines: 2-
 
 .. php:function:: img_data([$src = ''[, $indexPage = false[, $attributes = '']]])
 
@@ -64,13 +60,11 @@ The following functions are available:
     Example:
 
     .. literalinclude:: html_helper/005.php
-       :lines: 2-
 
     There is an optional second parameter to specify the MIME type, otherwise the
     function will use your Mimes config to guess:
 
     .. literalinclude:: html_helper/006.php
-       :lines: 2-
 
     Note that ``$path`` must exist and be a readable image format supported by the ``data:`` protocol.
     This function is not recommended for very large files, but it provides a convenient way
@@ -98,18 +92,15 @@ The following functions are available:
     Example:
 
     .. literalinclude:: html_helper/007.php
-       :lines: 2-
 
     Further examples:
 
     .. literalinclude:: html_helper/008.php
-       :lines: 2-
 
     Alternately, an associative array can be passed to the ``link_tag()`` function
     for complete control over all attributes and values:
 
     .. literalinclude:: html_helper/009.php
-       :lines: 2-
 
 .. php:function:: script_tag([$src = ''[, $indexPage = false]])
 
@@ -126,13 +117,11 @@ The following functions are available:
     Example:
 
     .. literalinclude:: html_helper/010.php
-       :lines: 2-
 
     Alternately, an associative array can be passed to the ``script_tag()`` function
     for complete control over all attributes and values:
 
     .. literalinclude:: html_helper/011.php
-       :lines: 2-
 
 .. php:function:: ul($list[, $attributes = ''])
 
@@ -145,7 +134,6 @@ The following functions are available:
     multi-dimensional arrays. Example:
 
     .. literalinclude:: html_helper/012.php
-       :lines: 2-
 
     The above code will produce this:
 
@@ -161,7 +149,6 @@ The following functions are available:
     Here is a more complex example, using a multi-dimensional array:
 
     .. literalinclude:: html_helper/013.php
-       :lines: 2-
 
     The above code will produce this:
 
@@ -233,7 +220,6 @@ The following functions are available:
     source arrays. Example:
 
     .. literalinclude:: html_helper/014.php
-       :lines: 2-
 
     The above code will produce this:
 
@@ -283,7 +269,6 @@ The following functions are available:
     source source. Example:
 
     .. literalinclude:: html_helper/015.php
-       :lines: 2-
 
 .. php:function:: embed($src = ''[, $type = false[, $attributes = ''[, $indexPage = false]]])
 
@@ -298,7 +283,6 @@ The following functions are available:
     embed source. Example:
 
     .. literalinclude:: html_helper/016.php
-       :lines: 2-
 
 .. php:function:: object($data = ''[, $type = false[, $attributes = '']])
 
@@ -313,7 +297,6 @@ The following functions are available:
     object data. Example:
 
     .. literalinclude:: html_helper/017.php
-       :lines: 2-
 
     The above code will produce this:
 
@@ -338,7 +321,6 @@ The following functions are available:
     param source. Example:
 
     .. literalinclude:: html_helper/018.php
-       :lines: 2-
 
 .. php:function:: track($name = ''[, $type = false[, $attributes = '']])
 
@@ -352,7 +334,6 @@ The following functions are available:
     formatted in WebVTT format. Example:
 
     .. literalinclude:: html_helper/019.php
-       :lines: 2-
 
 .. php:function:: doctype([$type = 'html5'])
 
@@ -366,7 +347,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: html_helper/020.php
-       :lines: 2-
 
     The following is a list of the pre-defined doctype choices. These are configurable,
     pulled from **app/Config/DocTypes.php**, or they could be over-ridden in your **.env** configuration.
diff --git a/user_guide_src/source/helpers/inflector_helper.rst b/user_guide_src/source/helpers/inflector_helper.rst
index 690430ea1b63..d1b689811eaa 100755
--- a/user_guide_src/source/helpers/inflector_helper.rst
+++ b/user_guide_src/source/helpers/inflector_helper.rst
@@ -15,7 +15,6 @@ Loading this Helper
 This helper is loaded using the following code:
 
 .. literalinclude:: inflector_helper/001.php
-   :lines: 2-
 
 Available Functions
 ===================
@@ -31,7 +30,6 @@ The following functions are available:
     Changes a plural word to singular. Example:
 
     .. literalinclude:: inflector_helper/002.php
-       :lines: 2-
 
 .. php:function:: plural($string)
 
@@ -42,7 +40,6 @@ The following functions are available:
     Changes a singular word to plural. Example:
 
     .. literalinclude:: inflector_helper/003.php
-       :lines: 2-
 
 .. php:function:: counted($count, $string)
 
@@ -54,7 +51,6 @@ The following functions are available:
     Changes a word and its count to a phrase. Example:
 
     .. literalinclude:: inflector_helper/004.php
-       :lines: 2-
 
 .. php:function:: camelize($string)
 
@@ -66,7 +62,6 @@ The following functions are available:
     case. Example:
 
     .. literalinclude:: inflector_helper/005.php
-       :lines: 2-
 
 .. php:function:: pascalize($string)
 
@@ -78,7 +73,6 @@ The following functions are available:
     case, which is camel case with the first letter capitalized. Example:
 
     .. literalinclude:: inflector_helper/006.php
-       :lines: 2-
 
 .. php:function:: underscore($string)
 
@@ -90,7 +84,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: inflector_helper/007.php
-       :lines: 2-
 
 .. php:function:: humanize($string[, $separator = '_'])
 
@@ -105,12 +98,10 @@ The following functions are available:
     Example:
 
     .. literalinclude:: inflector_helper/008.php
-       :lines: 2-
 
     To use dashes instead of underscores:
 
     .. literalinclude:: inflector_helper/009.php
-       :lines: 2-
 
 .. php:function:: is_pluralizable($word)
 
@@ -121,7 +112,6 @@ The following functions are available:
     Checks if the given word has a plural version. Example:
 
     .. literalinclude:: inflector_helper/010.php
-       :lines: 2-
 
 .. php:function:: dasherize($string)
 
@@ -132,7 +122,6 @@ The following functions are available:
     Replaces underscores with dashes in the string. Example:
 
     .. literalinclude:: inflector_helper/011.php
-       :lines: 2-
 
 .. php:function:: ordinal($integer)
 
@@ -145,7 +134,6 @@ The following functions are available:
     1st, 2nd, 3rd, 4th. Example:
 
     .. literalinclude:: inflector_helper/012.php
-       :lines: 2-
 
 .. php:function:: ordinalize($integer)
 
@@ -158,4 +146,3 @@ The following functions are available:
     Example:
 
     .. literalinclude:: inflector_helper/013.php
-       :lines: 2-
diff --git a/user_guide_src/source/helpers/number_helper.rst b/user_guide_src/source/helpers/number_helper.rst
index 41d0802fbe40..d43967c502f7 100644
--- a/user_guide_src/source/helpers/number_helper.rst
+++ b/user_guide_src/source/helpers/number_helper.rst
@@ -15,7 +15,6 @@ Loading this Helper
 This helper is loaded using the following code:
 
 .. literalinclude:: number_helper/001.php
-   :lines: 2-
 
 When Things Go Wrong
 ====================
@@ -40,12 +39,10 @@ The following functions are available:
     suffix. Examples:
 
     .. literalinclude:: number_helper/002.php
-       :lines: 2-
 
     An optional second parameter allows you to set the precision of the result:
 
     .. literalinclude:: number_helper/003.php
-       :lines: 2-
 
     An optional third parameter allows you to specify the locale that should
     be used when generating the number, and can affect the formatting. If no
@@ -53,7 +50,6 @@ The following functions are available:
     locale taken from the headers, or the app-default:
 
     .. literalinclude:: number_helper/004.php
-       :lines: 2-
 
     .. note:: The text generated by this function is found in the following
         language file: *language/<your_lang>/Number.php*
@@ -70,17 +66,14 @@ The following functions are available:
     for numbers up to the quadrillions. Examples:
 
     .. literalinclude:: number_helper/005.php
-       :lines: 2-
 
     An optional second parameter allows you to set the precision of the result:
 
     .. literalinclude:: number_helper/006.php
-       :lines: 2-
 
     An optional third parameter allows the locale to be specified:
 
     .. literalinclude:: number_helper/007.php
-       :lines: 2-
 
 .. php:function:: number_to_currency($num, $currency[, $locale = null[, $fraction = 0]])
 
@@ -94,7 +87,6 @@ The following functions are available:
     Converts a number in common currency formats, like USD, EUR, GBP, etc:
 
     .. literalinclude:: number_helper/008.php
-       :lines: 2-
 
     If you don't specify a locale, the Request locale is used.
 
@@ -107,7 +99,6 @@ The following functions are available:
     Converts a number into roman:
 
     .. literalinclude:: number_helper/009.php
-       :lines: 2-
 
     This function only handles numbers in the range 1 through 3999.
     It will return null for any value outside that range.
diff --git a/user_guide_src/source/helpers/security_helper.rst b/user_guide_src/source/helpers/security_helper.rst
index e5087556f83d..500b7fd85b11 100644
--- a/user_guide_src/source/helpers/security_helper.rst
+++ b/user_guide_src/source/helpers/security_helper.rst
@@ -14,7 +14,6 @@ Loading this Helper
 This helper is loaded using the following code:
 
 .. literalinclude:: security_helper/001.php
-   :lines: 2-
 
 Available Functions
 ===================
@@ -45,7 +44,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: security_helper/002.php
-       :lines: 2-
 
 .. php:function:: encode_php_tags($str)
 
@@ -58,4 +56,3 @@ The following functions are available:
     Example:
 
     .. literalinclude:: security_helper/003.php
-       :lines: 2-
diff --git a/user_guide_src/source/helpers/test_helper.rst b/user_guide_src/source/helpers/test_helper.rst
index d0678f853158..8d23f7ef42be 100644
--- a/user_guide_src/source/helpers/test_helper.rst
+++ b/user_guide_src/source/helpers/test_helper.rst
@@ -14,7 +14,6 @@ Loading this Helper
 This helper is loaded using the following code:
 
 .. literalinclude:: test_helper/001.php
-   :lines: 2-
 
 Available Functions
 ===================
@@ -33,4 +32,3 @@ The following functions are available:
     Usage example:
 
     .. literalinclude:: test_helper/002.php
-       :lines: 2-
diff --git a/user_guide_src/source/helpers/text_helper.rst b/user_guide_src/source/helpers/text_helper.rst
index ebc1784c305c..2ec2a532b8ba 100755
--- a/user_guide_src/source/helpers/text_helper.rst
+++ b/user_guide_src/source/helpers/text_helper.rst
@@ -14,7 +14,6 @@ Loading this Helper
 This helper is loaded using the following code:
 
 .. literalinclude:: text_helper/001.php
-   :lines: 2-
 
 Available Functions
 ===================
@@ -46,7 +45,6 @@ The following functions are available:
     Usage example:
 
     .. literalinclude:: text_helper/002.php
-       :lines: 2-
 
 .. php:function:: increment_string($str[, $separator = '_'[, $first = 1]])
 
@@ -63,7 +61,6 @@ The following functions are available:
     Usage example:
 
     .. literalinclude:: text_helper/003.php
-       :lines: 2-
 
 .. php:function:: alternator($args)
 
@@ -75,13 +72,11 @@ The following functions are available:
     a loop. Example:
 
     .. literalinclude:: text_helper/004.php
-       :lines: 2-
 
     You can add as many parameters as you want, and with each iteration of
     your loop the next item will be returned.
 
     .. literalinclude:: text_helper/005.php
-       :lines: 2-
 
     .. note:: To use multiple separate calls to this function simply call the
         function with no arguments to re-initialize.
@@ -98,7 +93,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: text_helper/006.php
-       :lines: 2-
 
 .. php:function:: strip_slashes($data)
 
@@ -111,12 +105,10 @@ The following functions are available:
     Example:
 
     .. literalinclude:: text_helper/007.php
-       :lines: 2-
 
     The above will return the following array:
 
     .. literalinclude:: text_helper/008.php
-       :lines: 2-
 
     .. note:: For historical reasons, this function will also accept
         and handle string inputs. This however makes it just an
@@ -134,13 +126,11 @@ The following functions are available:
     after each other. Example:
 
     .. literalinclude:: text_helper/009.php
-       :lines: 2-
 
     If the third parameter is set to true it will remove occurrences of the
     character at the beginning and the end of the string. Example:
 
     .. literalinclude:: text_helper/010.php
-       :lines: 2-
 
 .. php:function:: quotes_to_entities($str)
 
@@ -152,7 +142,6 @@ The following functions are available:
     entities. Example:
 
     .. literalinclude:: text_helper/011.php
-       :lines: 2-
 
 .. php:function:: strip_quotes($str)
 
@@ -163,7 +152,6 @@ The following functions are available:
     Removes single and double quotes from a string. Example:
 
     .. literalinclude:: text_helper/012.php
-       :lines: 2-
 
 .. php:function:: word_limiter($str[, $limit = 100[, $end_char = '&#8230;']])
 
@@ -176,7 +164,6 @@ The following functions are available:
     Truncates a string to the number of *words* specified. Example:
 
     .. literalinclude:: text_helper/013.php
-       :lines: 2-
 
     The third parameter is an optional suffix added to the string. By
     default it adds an ellipsis.
@@ -196,7 +183,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: text_helper/014.php
-       :lines: 2-
 
     The third parameter is an optional suffix added to the string, if
     undeclared this helper uses an ellipsis.
@@ -221,7 +207,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: text_helper/015.php
-       :lines: 2-
 
 .. php:function:: entities_to_ascii($str[, $all = true])
 
@@ -246,7 +231,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: text_helper/016.php
-       :lines: 2-
 
     .. note:: This function uses a companion config file
         **app/Config/ForeignCharacters.php** to define the to and
@@ -269,7 +253,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: text_helper/017.php
-       :lines: 2-
 
 .. php:function:: highlight_code($str)
 
@@ -280,7 +263,6 @@ The following functions are available:
     Colorizes a string of code (PHP, HTML, etc.). Example:
 
     .. literalinclude:: text_helper/018.php
-       :lines: 2-
 
     The function uses PHP's ``highlight_string()`` function, so the
     colors used are the ones specified in your php.ini file.
@@ -302,7 +284,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: text_helper/019.php
-       :lines: 2-
 
     The above code prints::
 
@@ -331,7 +312,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: text_helper/020.php
-       :lines: 2-
 
 .. php:function:: ellipsize($str, $max_length[, $position = 1[, $ellipsis = '&hellip;']])
 
@@ -357,7 +337,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: text_helper/021.php
-       :lines: 2-
 
     Produces::
 
@@ -384,7 +363,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: text_helper/022.php
-       :lines: 2-
 
     Produces::
 
diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst
index 0713a770b5f7..37374890548e 100644
--- a/user_guide_src/source/helpers/url_helper.rst
+++ b/user_guide_src/source/helpers/url_helper.rst
@@ -39,7 +39,6 @@ The following functions are available:
     array. Here is a string example:
 
     .. literalinclude:: url_helper/001.php
-       :lines: 2-
 
     The above example would return something like:
     *http://example.com/index.php/news/local/123*
@@ -47,7 +46,6 @@ The following functions are available:
     Here is an example of segments passed as an array:
 
     .. literalinclude:: url_helper/002.php
-       :lines: 2-
 
     You may find the alternate configuration useful if generating URLs for a
     different site than yours, which contains different configuration preferences.
@@ -63,7 +61,6 @@ The following functions are available:
     Returns your site base URL, as specified in your config file. Example:
 
     .. literalinclude:: url_helper/003.php
-       :lines: 2-
 
     This function returns the same thing as :php:func:`site_url()`, without
     the *indexPage* being appended.
@@ -72,7 +69,6 @@ The following functions are available:
     an array. Here is a string example:
 
     .. literalinclude:: url_helper/004.php
-       :lines: 2-
 
     The above example would return something like:
     *http://example.com/blog/post/123*
@@ -81,7 +77,6 @@ The following functions are available:
     string to a file, such as an image or stylesheet. For example:
 
     .. literalinclude:: url_helper/005.php
-       :lines: 2-
 
     This would give you something like:
     *http://example.com/images/icons/edit.png*
@@ -99,7 +94,6 @@ The following functions are available:
     .. note:: Calling this function is the same as doing this:
 
         .. literalinclude:: url_helper/006.php
-           :lines: 2-
 
 .. important:: Prior to **4.1.2** this function had a bug causing it to ignore the configuration on ``App::$indexPage``.
 
@@ -148,7 +142,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: url_helper/007.php
-       :lines: 2-
 
     As with :php:func:`site_url()`, you may specify an alternate configuration.
     You may find the alternate configuration useful if generating URLs for a
@@ -185,7 +178,6 @@ The following functions are available:
     Here are some examples:
 
     .. literalinclude:: url_helper/008.php
-       :lines: 2-
 
     As above, you may specify an alternate configuration.
     You may find the alternate configuration useful if generating links for a
@@ -212,7 +204,6 @@ The following functions are available:
     Here is an example with attributes:
 
     .. literalinclude:: url_helper/009.php
-       :lines: 2-
 
     As above, you may specify an alternate configuration.
     You may find the alternate configuration useful if generating links for a
@@ -225,7 +216,6 @@ The following functions are available:
         third parameter:
 
         .. literalinclude:: url_helper/010.php
-           :lines: 2-
 
     .. note:: The **window_name** is not really an attribute, but an argument to
         the JavaScript `window.open() <https://www.w3schools.com/jsref/met_win_open.asp>`_
@@ -247,13 +237,11 @@ The following functions are available:
     Creates a standard HTML e-mail link. Usage example:
 
     .. literalinclude:: url_helper/011.php
-       :lines: 2-
 
     As with the :php:func:`anchor()` tab above, you can set attributes using the
     third parameter:
 
     .. literalinclude:: url_helper/012.php
-       :lines: 2-
 
     .. note:: Attributes passed into the mailto function are automatically escaped to protected against XSS attacks.
 
@@ -281,7 +269,6 @@ The following functions are available:
     links. Example:
 
     .. literalinclude:: url_helper/013.php
-       :lines: 2-
 
     The second parameter determines whether URLs and e-mails are converted or
     just one or the other. The default behavior is both if the parameter is not
@@ -291,18 +278,15 @@ The following functions are available:
     Converts only URLs:
 
     .. literalinclude:: url_helper/014.php
-       :lines: 2-
 
     Converts only e-mail addresses:
 
     .. literalinclude:: url_helper/015.php
-       :lines: 2-
 
     The third parameter determines whether links are shown in a new window.
     The value can be true or false (boolean):
 
     .. literalinclude:: url_helper/016.php
-       :lines: 2-
 
     .. note:: The only URLs recognized are those that start with "www." or with "://".
 
@@ -319,7 +303,6 @@ The following functions are available:
     title of your entries in the URL. Example:
 
     .. literalinclude:: url_helper/017.php
-       :lines: 2-
 
     The second parameter determines the word delimiter. By default dashes
     are used. Preferred options are: **-** (dash) or **_** (underscore).
@@ -327,7 +310,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: url_helper/018.php
-       :lines: 2-
 
     The third parameter determines whether or not lowercase characters are
     forced. By default they are not. Options are boolean true/false.
@@ -335,7 +317,6 @@ The following functions are available:
     Example:
 
     .. literalinclude:: url_helper/019.php
-       :lines: 2-
 
 .. php:function:: mb_url_title($str[, $separator = '-'[, $lowercase = false]])
 
@@ -361,7 +342,6 @@ The following functions are available:
     Pass the URL string to the function like this:
 
     .. literalinclude:: url_helper/020.php
-       :lines: 2-
 
 .. php:function:: url_to($controller[, ...$args])
 
@@ -373,13 +353,11 @@ The following functions are available:
     Builds an absolute URL to a controller method in your app. Example:
 
     .. literalinclude:: url_helper/021.php
-       :lines: 2-
 
     You can also add arguments to the route.
     Here is an example:
 
     .. literalinclude:: url_helper/022.php
-       :lines: 2-
 
     The above example would return something like:
     *http://example.com/page/home*
@@ -395,13 +373,11 @@ The following functions are available:
     Compares the current URL's path against the given path to see if they match. Example:
 
     .. literalinclude:: url_helper/023.php
-       :lines: 2-
 
     This would match ``http://example.com/admin``. You can use the ``*`` wildcard to match
     any other applicable characters in the URL:
 
     .. literalinclude:: url_helper/024.php
-       :lines: 2-
 
     This would match any of the following:
 
diff --git a/user_guide_src/source/helpers/xml_helper.rst b/user_guide_src/source/helpers/xml_helper.rst
index 7ab8e0a1e0e1..51aa611f2082 100644
--- a/user_guide_src/source/helpers/xml_helper.rst
+++ b/user_guide_src/source/helpers/xml_helper.rst
@@ -15,7 +15,6 @@ Loading this Helper
 This helper is loaded using the following code
 
 .. literalinclude:: xml_helper/001.php
-   :lines: 2-
 
 Available Functions
 ===================
@@ -41,7 +40,6 @@ The following functions are available:
     character entities, e.g., &#123;. Example:
 
     .. literalinclude:: xml_helper/002.php
-       :lines: 2-
 
     outputs:
 
diff --git a/user_guide_src/source/incoming/content_negotiation.rst b/user_guide_src/source/incoming/content_negotiation.rst
index 0db8e8f23c5d..5c945e258038 100644
--- a/user_guide_src/source/incoming/content_negotiation.rst
+++ b/user_guide_src/source/incoming/content_negotiation.rst
@@ -16,7 +16,6 @@ Loading the Class
 You can load an instance of the class manually through the Service class:
 
 .. literalinclude:: content_negotiation/001.php
-   :lines: 2-
 
 This will grab the current request instance and automatically inject it into the Negotiator class.
 
@@ -25,7 +24,6 @@ instance. While you cannot access it directly this way, you can easily access al
 method:
 
 .. literalinclude:: content_negotiation/002.php
-   :lines: 2-
 
 When accessed this way, the first parameter is the type of content you're trying to find a match for, while the
 second is an array of supported values.
@@ -52,7 +50,6 @@ The server now needs to provide a list of what type of content it can provide. I
 be able to return data as raw HTML, JSON, or XML. This list should be provided in order of preference:
 
 .. literalinclude:: content_negotiation/003.php
-   :lines: 2-
 
 In this case, both the client and the server can agree on formatting the data as JSON so 'json' is returned from
 the negotiate method. By default, if no match is found, the first element in the ``$supported`` array would be returned.
@@ -60,7 +57,6 @@ In some cases, though, you might need to enforce the format to be a strict match
 final value, it will return an empty string if no match is found:
 
 .. literalinclude:: content_negotiation/004.php
-   :lines: 2-
 
 Language
 ========
@@ -77,7 +73,6 @@ In this example, the browser would prefer French, with a second choice of Englis
 and German you would do something like:
 
 .. literalinclude:: content_negotiation/005.php
-   :lines: 2-
 
 In this example, 'en' would be returned as the current language. If no match is found, it will return the first element
 in the ``$supported`` array, so that should always be the preferred language.
@@ -94,7 +89,6 @@ specify the type of compression the client supports::
 Your web server will define what types of compression you can use. Some, like Apache, only support **gzip**:
 
 .. literalinclude:: content_negotiation/006.php
-   :lines: 2-
 
 See more at `Wikipedia <https://en.wikipedia.org/wiki/HTTP_compression>`_.
 
@@ -109,4 +103,3 @@ The desired character set is passed through the ``Accept-Charset`` header::
 By default, if no matches are found, **utf-8** will be returned:
 
 .. literalinclude:: content_negotiation/007.php
-   :lines: 2-
diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 5dabad7ce003..296e245bd35e 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -74,7 +74,6 @@ class so that it can inherit all its methods.
     Here is an example based on PSR-4 Autoloader:
 
     .. literalinclude:: controllers/005.php
-       :lines: 2-
 
 Methods
 =======
@@ -127,14 +126,12 @@ To specify a default controller open your **app/Config/Routes.php**
 file and set this variable:
 
 .. literalinclude:: controllers/008.php
-   :lines: 2-
 
 Where ``Helloworld`` is the name of the controller class you want to be used.
 
 A few lines further down **Routes.php** in the "Route Definitions" section, comment out the line:
 
 .. literalinclude:: controllers/009.php
-   :lines: 2-
 
 If you now browse to your site without specifying any URI segments you'll
 see the "Hello World" message.
@@ -152,7 +149,6 @@ method in the controller gets called. CodeIgniter permits you to override
 this behavior through the use of the ``_remap()`` method:
 
 .. literalinclude:: controllers/010.php
-   :lines: 2-
 
 .. important:: If your controller contains a method named ``_remap()``,
     it will **always** get called regardless of what your URI contains. It
@@ -163,7 +159,6 @@ The overridden method call (typically the second segment of the URI) will
 be passed as a parameter to the ``_remap()`` method:
 
 .. literalinclude:: controllers/011.php
-   :lines: 2-
 
 Any extra segments after the method name are passed into ``_remap()``. These parameters can be passed to the method
 to emulate CodeIgniter's default behavior.
@@ -171,7 +166,6 @@ to emulate CodeIgniter's default behavior.
 Example:
 
 .. literalinclude:: controllers/012.php
-   :lines: 2-
 
 Private methods
 ===============
@@ -182,7 +176,6 @@ That will prevent it from being served by a URL request. For example,
 if you were to define a method like this for the ``Helloworld`` controller:
 
 .. literalinclude:: controllers/013.php
-   :lines: 2-
 
 then trying to access it using the following URL will not work::
 
@@ -247,14 +240,12 @@ A convenience method for forcing a method to be accessed via HTTPS is available
 controllers:
 
 .. literalinclude:: controllers/014.php
-   :lines: 2-
 
 By default, and in modern browsers that support the HTTP Strict Transport Security header, this
 call should force the browser to convert non-HTTPS calls to HTTPS calls for one year. You can
 modify this by passing the duration (in seconds) as the first parameter:
 
 .. literalinclude:: controllers/015.php
-   :lines: 2-
 
 .. note:: A number of :doc:`time-based constants </general/common_functions>` are always available for you to use, including ``YEAR``, ``MONTH``, and more.
 
@@ -266,7 +257,6 @@ these helper files will be automatically loaded into memory so that you can use
 inside the controller:
 
 .. literalinclude:: controllers/016.php
-   :lines: 2-
 
 .. _controllers-validating-data:
 
@@ -285,13 +275,11 @@ The :doc:`Validation Library docs </libraries/validation>` have details on
 rule and message array formats, as well as available rules:
 
 .. literalinclude:: controllers/017.php
-   :lines: 2-
 
 If you find it simpler to keep the rules in the configuration file, you can replace
 the ``$rules`` array with the name of the group as defined in ``Config\Validation.php``:
 
 .. literalinclude:: controllers/018.php
-   :lines: 2-
 
 .. note:: Validation can also be handled automatically in the model, but sometimes it's easier to do it in the controller. Where is up to you.
 
@@ -303,7 +291,6 @@ In that case, you can use the ``$this->validateData()`` method.
 The method accepts an array of data to validate in the first parameter:
 
 .. literalinclude:: controllers/019.php
-   :lines: 2-
 
 That's it!
 ==========
diff --git a/user_guide_src/source/incoming/filters.rst b/user_guide_src/source/incoming/filters.rst
index df45851ea514..7fdbef70d3be 100644
--- a/user_guide_src/source/incoming/filters.rst
+++ b/user_guide_src/source/incoming/filters.rst
@@ -45,7 +45,6 @@ Returning it in the before filter will not stop the execution but only replace t
 This is typically used to perform redirects, like in this example:
 
 .. literalinclude:: filters/002.php
-   :lines: 2-
 
 If a ``Response`` instance is returned, the Response will be sent back to the client and script execution will stop.
 This can be useful for implementing rate limiting for APIs. See :doc:`Throttler </libraries/throttler>` for an
@@ -80,7 +79,6 @@ The ``$aliases`` array is used to associate a simple name with one or more fully
 filters to run:
 
 .. literalinclude:: filters/003.php
-   :lines: 2-
 
 Aliases are mandatory and if you try to use a full class name later, the system will throw an error. Defining them
 in this way makes it simple to switch out the class used. Great for when you decided you need to change to a
@@ -89,7 +87,6 @@ different authentication system since you only change the filter's class and you
 You can combine multiple filters into one alias, making complex sets of filters simple to apply:
 
 .. literalinclude:: filters/004.php
-   :lines: 2-
 
 You should define as many aliases as you need.
 
@@ -101,7 +98,6 @@ You should take care with how many you use here, since it could have performance
 run on every request. Filters can be specified by adding their alias to either the before or after array:
 
 .. literalinclude:: filters/005.php
-   :lines: 2-
 
 There are times where you want to apply a filter to almost every request, but have a few that should be left alone.
 One common example is if you need to exclude a few URI's from the CSRF protection filter to allow requests from
@@ -109,7 +105,6 @@ third-party websites to hit one or two specific URI's, while keeping the rest of
 an array with the 'except' key and a URI to match as the value alongside the alias:
 
 .. literalinclude:: filters/006.php
-   :lines: 2-
 
 Any place you can use a URI in the filter settings, you can use a regular expression or, like in this example, use
 an asterisk for a wildcard that will match all characters after that. In this example, any URL's starting with ``api/``
@@ -117,7 +112,6 @@ would be exempted from CSRF protection, but the site's forms would all be protec
 URI's you can use an array of URI patterns:
 
 .. literalinclude:: filters/007.php
-   :lines: 2-
 
 $methods
 ========
@@ -127,7 +121,6 @@ specify the method name in lowercase. It's value would be an array of filters to
 ``$filters`` properties, these will only run as before filters:
 
 .. literalinclude:: filters/008.php
-   :lines: 2-
 
 In addition to the standard HTTP methods, this also supports one special case: 'cli'. The 'cli' method would apply to
 all requests that were run from the command line.
@@ -143,7 +136,6 @@ This property is an array of filter aliases. For each alias, you can specify bef
 a list of URI patterns that filter should apply to:
 
 .. literalinclude:: filters/009.php
-   :lines: 2-
 
 Filter arguments
 =================
@@ -151,7 +143,6 @@ Filter arguments
 When configuring filters, additional arguments may be passed to a filter when setting up the route:
 
 .. literalinclude:: filters/010.php
-   :lines: 2-
 
 In this example, the array ``['dual', 'noreturn']`` will be passed in ``$arguments`` to the filter's ``before()`` and ``after()`` implementation methods.
 
@@ -186,6 +177,5 @@ This filter adds HTTP response headers that your application can use to increase
 If you want to customize the headers, extend ``CodeIgniter\Filters\SecureHeaders`` and override the ``$headers`` property. And change the ``$aliases`` property in **app/Config/Filters.php**:
 
 .. literalinclude:: filters/011.php
-   :lines: 2-
 
 If you want to know about secure headers, see `OWASP Secure Headers Project <https://owasp.org/www-project-secure-headers/>`_.
diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index 24ac0a9a183b..c20e897b92de 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -21,7 +21,6 @@ If you are not within a controller, but still need access to the application's R
 get a copy of it through the :doc:`Services class </concepts/services>`:
 
 .. literalinclude:: incomingrequest/002.php
-   :lines: 2-
 
 It's preferable, though, to pass the request in as a dependency if the class is anything other than
 the controller, where you can save it as a class property:
@@ -35,7 +34,6 @@ A request could be of several types, including an AJAX request or a request from
 be checked with the ``isAJAX()`` and ``isCLI()`` methods:
 
 .. literalinclude:: incomingrequest/004.php
-   :lines: 2-
 
 .. note:: The ``isAJAX()`` method depends on the ``X-Requested-With`` header,
     which in some cases is not sent by default in XHR requests via JavaScript (i.e., fetch).
@@ -44,7 +42,6 @@ be checked with the ``isAJAX()`` and ``isCLI()`` methods:
 You can check the HTTP method that this request represents with the ``method()`` method:
 
 .. literalinclude:: incomingrequest/005.php
-   :lines: 2-
 
 By default, the method is returned as a lower-case string (i.e., 'get', 'post', etc). You can get an
 uppercase version by wrapping the call in ``str_to_upper()``::
@@ -55,7 +52,6 @@ uppercase version by wrapping the call in ``str_to_upper()``::
 You can also check if the request was made through and HTTPS connection with the ``isSecure()`` method:
 
 .. literalinclude:: incomingrequest/006.php
-   :lines: 2-
 
 Retrieving Input
 ----------------
@@ -68,12 +64,10 @@ use data without having to test whether an item exists first. In other words, no
 like this:
 
 .. literalinclude:: incomingrequest/007.php
-   :lines: 2-
 
 With CodeIgniter's built-in methods you can simply do this:
 
 .. literalinclude:: incomingrequest/008.php
-   :lines: 2-
 
 The ``getVar()`` method will pull from $_REQUEST, so will return any data from $_GET, $POST, or $_COOKIE. While this
 is convenient, you will often need to use a more specific method, like:
@@ -98,7 +92,6 @@ You can grab the contents of php://input as a JSON stream with ``getJSON()``.
 
 
 .. literalinclude:: incomingrequest/009.php
-   :lines: 2-
 
 By default, this will return any objects in the JSON data as objects. If you want that converted to associative
 arrays, pass in ``true`` as the first parameter.
@@ -116,7 +109,6 @@ data that you want or you can use "dot" notation to dig into the JSON to get dat
 
 
 .. literalinclude:: incomingrequest/010.php
-   :lines: 2-
 
 
 If you want the result to be an associative array instead of an object, you can use ``getJsonVar()`` instead and pass
@@ -125,7 +117,6 @@ correct ``CONTENT_TYPE`` header.
 
 
 .. literalinclude:: incomingrequest/011.php
-   :lines: 2-
 
 .. note:: See the documentation for ``dot_array_search()`` in the ``Array`` helper for more information on "dot" notation.
 
@@ -134,12 +125,10 @@ correct ``CONTENT_TYPE`` header.
 Finally, you can grab the contents of php://input as a raw stream with ``getRawInput()``:
 
 .. literalinclude:: incomingrequest/012.php
-   :lines: 2-
 
 This will retrieve data and convert it to an array. Like this:
 
 .. literalinclude:: incomingrequest/013.php
-   :lines: 2-
 
 **Filtering Input Data**
 
@@ -151,7 +140,6 @@ filter types <https://www.php.net/manual/en/filter.filters.php>`_.
 Filtering a POST variable would look like this:
 
 .. literalinclude:: incomingrequest/014.php
-   :lines: 2-
 
 All of the methods mentioned above support the filter type passed in as the second parameter, with the
 exception of ``getJSON()``.
@@ -164,28 +152,23 @@ an array of all headers, with the key as the name of the header, and the value i
 ``CodeIgniter\HTTP\Header``:
 
 .. literalinclude:: incomingrequest/015.php
-   :lines: 2-
 
 If you only need a single header, you can pass the name into the ``header()`` method. This will grab the
 specified header object in a case-insensitive manner if it exists. If not, then it will return ``null``:
 
 .. literalinclude:: incomingrequest/016.php
-   :lines: 2-
 
 You can always use ``hasHeader()`` to see if the header existed in this request:
 
 .. literalinclude:: incomingrequest/017.php
-   :lines: 2-
 
 If you need the value of header as a string with all values on one line, you can use the ``getHeaderLine()`` method:
 
 .. literalinclude:: incomingrequest/018.php
-   :lines: 2-
 
 If you need the entire header, with the name and values in a single string, simply cast the header as a string:
 
 .. literalinclude:: incomingrequest/019.php
-   :lines: 2-
 
 The Request URL
 ---------------
@@ -194,19 +177,16 @@ You can retrieve a :doc:`URI </libraries/uri>` object that represents the curren
 ``$request->getUri()`` method. You can cast this object as a string to get a full URL for the current request:
 
 .. literalinclude:: incomingrequest/020.php
-   :lines: 2-
 
 The object gives you full abilities to grab any part of the request on it's own:
 
 .. literalinclude:: incomingrequest/021.php
-   :lines: 2-
 
 You can work with the current URI string (the path relative to your baseURL) using the ``getPath()`` and ``setPath()`` methods.
 Note that this relative path on the shared instance of ``IncomingRequest`` is what the :doc:`URL Helper </helpers/url_helper>`
 functions use, so this is a helpful way to "spoof" an incoming request for testing:
 
 .. literalinclude:: incomingrequest/022.php
-   :lines: 2-
 
 Uploaded Files
 --------------
@@ -216,20 +196,17 @@ Information about all uploaded files can be retrieved through ``$request->getFil
 and uses best practices to minimize any security risks.
 
 .. literalinclude:: incomingrequest/023.php
-   :lines: 2-
 
 See :ref:`Working with Uploaded Files <uploaded-files-accessing-files>` for the details.
 
 You can retrieve a single file uploaded on its own, based on the filename given in the HTML file input:
 
 .. literalinclude:: incomingrequest/024.php
-   :lines: 2-
 
 You can retrieve an array of same-named files uploaded as part of a
 multi-file upload, based on the filename given in the HTML file input:
 
 .. literalinclude:: incomingrequest/025.php
-   :lines: 2-
 
 .. note:: The files here correspond to ``$_FILES``. Even if a user just clicks submit button of a form and does not upload any file, the file will still exist. You can check that the file was actually uploaded by the ``isValid()`` method in UploadedFile. See :ref:`verify-a-file` for more details.
 
@@ -239,7 +216,6 @@ Content Negotiation
 You can easily negotiate content types with the request through the ``negotiate()`` method:
 
 .. literalinclude:: incomingrequest/026.php
-   :lines: 2-
 
 See the :doc:`Content Negotiation </incoming/content_negotiation>` page for more details.
 
@@ -304,7 +280,6 @@ The methods provided by the parent classes that are available are:
         The first parameter will contain the name of the REQUEST item you are looking for:
 
         .. literalinclude:: incomingrequest/027.php
-           :lines: 2-
 
         The method returns null if the item you are attempting to retrieve
         does not exist.
@@ -313,7 +288,6 @@ The methods provided by the parent classes that are available are:
         filters. Pass in the desired filter type as the second parameter:
 
         .. literalinclude:: incomingrequest/028.php
-           :lines: 2-
 
         To return an array of all POST items call without any parameters.
 
@@ -322,18 +296,15 @@ The methods provided by the parent classes that are available are:
         you want to use:
 
         .. literalinclude:: incomingrequest/029.php
-           :lines: 2-
 
         To return an array of multiple POST parameters, pass all the required keys as an array:
 
         .. literalinclude:: incomingrequest/030.php
-           :lines: 2-
 
         Same rule applied here, to retrieve the parameters with filtering, set the second parameter to
         the filter type to apply:
 
         .. literalinclude:: incomingrequest/031.php
-           :lines: 2-
 
     .. php:method:: getGet([$index = null[, $filter = null[, $flags = null]]])
 
@@ -374,7 +345,6 @@ The methods provided by the parent classes that are available are:
         then in GET:
 
         .. literalinclude:: incomingrequest/032.php
-           :lines: 2-
 
     .. php:method:: getGetPost([$index = null[, $filter = null[, $flags = null]]])
 
@@ -391,7 +361,6 @@ The methods provided by the parent classes that are available are:
         then in POST:
 
         .. literalinclude:: incomingrequest/033.php
-           :lines: 2-
 
     .. php:method:: getCookie([$index = null[, $filter = null[, $flags = null]]])
         :noindex:
@@ -407,12 +376,10 @@ The methods provided by the parent classes that are available are:
         This method is identical to ``getPost()`` and ``getGet()``, only it fetches cookie data:
 
         .. literalinclude:: incomingrequest/034.php
-           :lines: 2-
 
         To return an array of multiple cookie values, pass all the required keys as an array:
 
         .. literalinclude:: incomingrequest/035.php
-           :lines: 2-
 
         .. note:: Unlike the :doc:`Cookie Helper <../helpers/cookie_helper>`
             function :php:func:`get_cookie()`, this method does NOT prepend
@@ -433,13 +400,11 @@ The methods provided by the parent classes that are available are:
         methods, only it fetches getServer data (``$_SERVER``):
 
         .. literalinclude:: incomingrequest/036.php
-           :lines: 2-
 
         To return an array of multiple ``$_SERVER`` values, pass all the required keys
         as an array.
 
         .. literalinclude:: incomingrequest/037.php
-           :lines: 2-
 
     .. php:method:: getUserAgent([$filter = null])
 
@@ -451,7 +416,6 @@ The methods provided by the parent classes that are available are:
         This method returns the User Agent string from the SERVER data:
 
         .. literalinclude:: incomingrequest/038.php
-           :lines: 2-
 
     .. php:method:: getPath()
 
diff --git a/user_guide_src/source/incoming/message.rst b/user_guide_src/source/incoming/message.rst
index 8333a51d7157..ad1105277b0e 100644
--- a/user_guide_src/source/incoming/message.rst
+++ b/user_guide_src/source/incoming/message.rst
@@ -44,7 +44,6 @@ Class Reference
         Returns the current message body, if any has been set. If not body exists, returns null:
 
         .. literalinclude:: message/001.php
-           :lines: 2-
 
     .. php:method:: setBody($data)
 
@@ -92,18 +91,15 @@ Class Reference
         While the header is converted internally as described above, you can access the header with any type of case:
 
         .. literalinclude:: message/002.php
-           :lines: 2-
 
         If the header has multiple values, ``getValue()`` will return as an array of values. You can use the ``getValueLine()``
         method to retrieve the values as a string:
 
         .. literalinclude:: message/003.php
-           :lines: 2-
 
         You can filter the header by passing a filter value in as the second parameter:
 
         .. literalinclude:: message/004.php
-           :lines: 2-
 
     .. php:method:: hasHeader($name)
 
@@ -121,7 +117,6 @@ Class Reference
         of the header values when the header has multiple values. The values are appropriately joined:
 
         .. literalinclude:: message/005.php
-           :lines: 2-
 
     .. php:method:: setHeader($name, $value)
 
@@ -135,7 +130,6 @@ Class Reference
         or an array of strings:
 
         .. literalinclude:: message/006.php
-           :lines: 2-
 
     .. php:method:: removeHeader($name)
 
@@ -146,7 +140,6 @@ Class Reference
         Removes the header from the Message. ``$name`` is the case-insensitive name of the header:
 
         .. literalinclude:: message/007.php
-           :lines: 2-
 
     .. php:method:: appendHeader($name, $value)
 
@@ -159,7 +152,6 @@ Class Reference
         If it is a string then a LogicException will be thrown.
 
         .. literalinclude:: message/008.php
-           :lines: 2-
 
     .. php:method:: prependHeader($name, $value)
 
@@ -172,7 +164,6 @@ Class Reference
         If it is a string then a LogicException will be thrown.
 
         .. literalinclude:: message/009.php
-           :lines: 2-
 
     .. php:method:: getProtocolVersion()
 
@@ -191,4 +182,3 @@ Class Reference
         Sets the HTTP protocol version this Message uses. Valid values are ``1.0``, ``1.1`` and ``2.0``:
 
         .. literalinclude:: message/010.php
-           :lines: 2-
diff --git a/user_guide_src/source/incoming/request.rst b/user_guide_src/source/incoming/request.rst
index d5af007b40bd..4fe8d5d1727e 100644
--- a/user_guide_src/source/incoming/request.rst
+++ b/user_guide_src/source/incoming/request.rst
@@ -25,7 +25,6 @@ Class Reference
         will return '0.0.0.0':
 
         .. literalinclude:: request/001.php
-           :lines: 2-
 
         .. important:: This method takes into account the ``App->proxyIPs`` setting and will
             return the reported HTTP_X_FORWARDED_FOR, HTTP_CLIENT_IP, HTTP_X_CLIENT_IP, or
@@ -46,7 +45,6 @@ Class Reference
         .. note:: The $request->getIPAddress() method above automatically validates the IP address.
 
             .. literalinclude:: request/002.php
-               :lines: 2-
 
         Accepts an optional second string parameter of 'ipv4' or 'ipv6' to specify
         an IP format. The default checks for both formats.
@@ -63,7 +61,6 @@ Class Reference
         in uppercase or lowercase.
 
         .. literalinclude:: request/003.php
-           :lines: 2-
 
     .. php:method:: setMethod($method)
 
@@ -83,13 +80,11 @@ Class Reference
         :doc:`IncomingRequest Class </incoming/incomingrequest>`, only it fetches server data (``$_SERVER``):
 
         .. literalinclude:: request/004.php
-           :lines: 2-
 
         To return an array of multiple ``$_SERVER`` values, pass all the required keys
         as an array.
 
         .. literalinclude:: request/005.php
-           :lines: 2-
 
     .. php:method:: getEnv([$index = null[, $filter = null[, $flags = null]]])
 
@@ -103,13 +98,11 @@ Class Reference
         :doc:`IncomingRequest Class </incoming/incomingrequest>`, only it fetches getEnv data (``$_ENV``):
 
         .. literalinclude:: request/006.php
-           :lines: 2-
 
         To return an array of multiple ``$_ENV`` values, pass all the required keys
         as an array.
 
         .. literalinclude:: request/007.php
-           :lines: 2-
 
     .. php:method:: setGlobal($method, $value)
 
diff --git a/user_guide_src/source/incoming/restful.rst b/user_guide_src/source/incoming/restful.rst
index 4dae7e0f40b9..8fbefe0e1973 100644
--- a/user_guide_src/source/incoming/restful.rst
+++ b/user_guide_src/source/incoming/restful.rst
@@ -31,7 +31,6 @@ list all of that resource, show a single resource, and delete a single resource.
 name:
 
 .. literalinclude:: restful/001.php
-   :lines: 2-
 
 .. note:: The ordering above is for clarity, whereas the actual order the routes are created in, in RouteCollection, ensures proper route resolution
 
@@ -42,7 +41,6 @@ routes are geared toward API-usage, where more methods are allowed, you can pass
 generate update and delete methods that work with HTML forms:
 
 .. literalinclude:: restful/002.php
-   :lines: 2-
 
 Change the Controller Used
 --------------------------
@@ -51,7 +49,6 @@ You can specify the controller that should be used by passing in the ``controlle
 the controller that should be used:
 
 .. literalinclude:: restful/003.php
-   :lines: 2-
 
 Change the Placeholder Used
 ---------------------------
@@ -60,7 +57,6 @@ By default, the ``(:segment)`` placeholder is used when a resource ID is needed.
 in the ``placeholder`` option with the new string to use:
 
 .. literalinclude:: restful/004.php
-   :lines: 2-
 
 Limit the Routes Made
 ---------------------
@@ -69,12 +65,10 @@ You can restrict the routes generated with the ``only`` option. This should be *
 be created. Only routes that match one of these methods will be created. The rest will be ignored:
 
 .. literalinclude:: restful/005.php
-   :lines: 2-
 
 Otherwise you can remove unused routes with the ``except`` option. This should also be **an array** or **comma separated list** of method names. This option run after ``only``:
 
 .. literalinclude:: restful/006.php
-   :lines: 2-
 
 Valid methods are: ``index``, ``show``, ``create``, ``update``, ``new``, ``edit`` and ``delete``.
 
@@ -92,7 +86,6 @@ implement those methods that you want handled:
 The routing for this would be:
 
 .. literalinclude:: restful/008.php
-   :lines: 2-
 
 Presenter Routes
 ============================================================
@@ -107,7 +100,6 @@ a conventional controller - it is a convenience.
 Its usage is similar to the resource routing:
 
 .. literalinclude:: restful/009.php
-   :lines: 2-
 
 .. note:: The ordering above is for clarity, whereas the actual order the routes are created in, in RouteCollection, ensures proper route resolution
 
@@ -115,7 +107,6 @@ You would not have routes for `photos` for both a resource and a presenter
 controller. You need to distinguish them, for instance:
 
 .. literalinclude:: restful/010.php
-   :lines: 2-
 
 The second parameter accepts an array of options that can be used to modify the routes that are generated.
 
@@ -126,7 +117,6 @@ You can specify the controller that should be used by passing in the ``controlle
 the controller that should be used:
 
 .. literalinclude:: restful/011.php
-   :lines: 2-
 
 Change the Placeholder Used
 ---------------------------
@@ -135,7 +125,6 @@ By default, the ``(:segment)`` placeholder is used when a resource ID is needed.
 in the ``placeholder`` option with the new string to use:
 
 .. literalinclude:: restful/012.php
-   :lines: 2-
 
 Limit the Routes Made
 ---------------------
@@ -144,12 +133,10 @@ You can restrict the routes generated with the ``only`` option. This should be *
 be created. Only routes that match one of these methods will be created. The rest will be ignored:
 
 .. literalinclude:: restful/013.php
-   :lines: 2-
 
 Otherwise you can remove unused routes with the ``except`` option. This should also be **an array** or **comma separated list** of method names. This option run after ``only``:
 
 .. literalinclude:: restful/014.php
-   :lines: 2-
 
 Valid methods are: ``index``, ``show``, ``new``, ``create``, ``edit``, ``update``, ``remove`` and ``delete``.
 
@@ -168,7 +155,6 @@ implement those methods that you want handled:
 The routing for this would be:
 
 .. literalinclude:: restful/016.php
-   :lines: 2-
 
 Presenter/Controller Comparison
 =============================================================
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index acd72c0d3ac5..82cadb0a479a 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -55,7 +55,6 @@ When you specify a route, you choose a method to corresponding to HTTP verbs (re
 If you expect a GET request, you use the ``get()`` method:
 
 .. literalinclude:: routing/001.php
-   :lines: 2-
 
 A route simply takes the URI path on the left, and maps it to the controller and method on the right,
 along with any parameters that should be passed to the controller. The controller and method should
@@ -64,17 +63,14 @@ and its method with a double-colon, like ``Users::list``. If that method require
 passed to it, then they would be listed after the method name, separated by forward-slashes:
 
 .. literalinclude:: routing/002.php
-   :lines: 2-
 
 You can use any standard HTTP verb (GET, POST, PUT, DELETE, etc):
 
 .. literalinclude:: routing/003.php
-   :lines: 2-
 
 You can supply multiple verbs that a route should match by passing them in as an array to the ``match()`` method:
 
 .. literalinclude:: routing/004.php
-   :lines: 2-
 
 Placeholders
 ============
@@ -82,7 +78,6 @@ Placeholders
 A typical route might look something like this:
 
 .. literalinclude:: routing/005.php
-   :lines: 2-
 
 In a route, the first parameter contains the URI to be matched, while the second parameter
 contains the destination it should be routed to. In the above example, if the literal word
@@ -118,42 +113,35 @@ A URL containing the word **journals** in the first segment will be remapped to
 and the default method, which is usually ``index()``:
 
 .. literalinclude:: routing/006.php
-   :lines: 2-
 
 A URL containing the segments **blog/joe** will be remapped to the ``\App\Controllers\Blogs`` class and the ``users`` method.
 The ID will be set to ``34``:
 
 .. literalinclude:: routing/007.php
-   :lines: 2-
 
 A URL with **product** as the first segment, and anything in the second will be remapped to the ``\App\Controllers\Catalog`` class
 and the ``productLookup`` method:
 
 .. literalinclude:: routing/008.php
-   :lines: 2-
 
 A URL with **product** as the first segment, and a number in the second will be remapped to the ``\App\Controllers\Catalog`` class
 and the ``productLookupByID`` method passing in the match as a variable to the method:
 
 .. literalinclude:: routing/009.php
-   :lines: 2-
 
 Note that a single ``(:any)`` will match multiple segments in the URL if present. For example the route:
 
 .. literalinclude:: routing/010.php
-   :lines: 2-
 
 will match **product/123**, **product/123/456**, **product/123/456/789** and so on. The implementation in the
 Controller should take into account the maximum parameters:
 
 .. literalinclude:: routing/011.php
-   :lines: 2-
 
 If matching multiple segments is not the intended behavior, ``(:segment)`` should be used when defining the
 routes. With the examples URLs from above:
 
 .. literalinclude:: routing/012.php
-   :lines: 2-
 
 will only match **product/123** and generate 404 errors for other example.
 
@@ -168,7 +156,6 @@ the placeholder. The second parameter is the Regular Expression pattern it shoul
 This must be called before you add the route:
 
 .. literalinclude:: routing/013.php
-   :lines: 2-
 
 Regular Expressions
 ===================
@@ -180,7 +167,6 @@ is allowed, as are back-references.
     A typical RegEx route might look something like this:
 
     .. literalinclude:: routing/014.php
-       :lines: 2-
 
 In the above example, a URI similar to **products/shirts/123** would instead call the ``show`` method
 of the ``Products`` controller class, with the original first and second segment passed as arguments to it.
@@ -192,7 +178,6 @@ For example, if a user accesses a password protected area of your web applicatio
 redirect them back to the same page after they log in, you may find this example useful:
 
 .. literalinclude:: routing/015.php
-   :lines: 2-
 
 For those of you who don't know regular expressions and want to learn more about them,
 `regular-expressions.info <https://www.regular-expressions.info/>`_ might be a good starting point.
@@ -207,7 +192,6 @@ executed when the user visits that URI. This is handy for quickly executing smal
 a simple view:
 
 .. literalinclude:: routing/016.php
-   :lines: 2-
 
 Mapping multiple routes
 =======================
@@ -217,7 +201,6 @@ the ``map()`` method. Instead of calling the ``add()`` method for each route tha
 define an array of routes and then pass it as the first parameter to the ``map()`` method:
 
 .. literalinclude:: routing/017.php
-   :lines: 2-
 
 Redirecting Routes
 ==================
@@ -229,7 +212,6 @@ the HTTP status code that should be sent along with the redirect. The default va
 redirect and is recommended in most cases:
 
 .. literalinclude:: routing/018.php
-   :lines: 2-
 
 If a redirect route is matched during a page load, the user will be immediately redirected to the new page before a
 controller can be loaded.
@@ -242,14 +224,12 @@ appears prior to the routes defined inside of the group. This allows you to redu
 extensive set of routes that all share the opening string, like when building an admin area:
 
 .. literalinclude:: routing/019.php
-   :lines: 2-
 
 This would prefix the **users** and **blog** URIs with **admin**, handling URLs like **admin/users** and **admin/blog**.
 
 If you need to assign options to a group, like a :ref:`assigning-namespace`, do it before the callback:
 
 .. literalinclude:: routing/020.php
-   :lines: 2-
 
 This would handle a resource route to the ``App\API\v1\Users`` controller with the **api/users** URI.
 
@@ -257,14 +237,12 @@ You can also use a specific :doc:`filter <filters>` for a group of routes. This
 run the filter before or after the controller. This is especially handy during authentication or api logging:
 
 .. literalinclude:: routing/021.php
-   :lines: 2-
 
 The value for the filter must match one of the aliases defined within **app/Config/Filters.php**.
 
 It is possible to nest groups within groups for finer organization if you need it:
 
 .. literalinclude:: routing/022.php
-   :lines: 2-
 
 This would handle the URL at **admin/users/list**.
 
@@ -276,7 +254,6 @@ an empty string in place of the prefix and the routes in the group will be route
 given route config options:
 
 .. literalinclude:: routing/023.php
-   :lines: 2-
 
 Environment Restrictions
 ========================
@@ -287,7 +264,6 @@ This can be done with the ``environment()`` method. The first parameter is the n
 routes defined within this closure are only accessible from the given environment:
 
 .. literalinclude:: routing/024.php
-   :lines: 2-
 
 Reverse Routing
 ===============
@@ -302,7 +278,6 @@ separated by a double colon (``::``), much like you would use when writing the i
 should be passed to the route are passed in next:
 
 .. literalinclude:: routing/025.php
-   :lines: 2-
 
 Using Named Routes
 ==================
@@ -313,7 +288,6 @@ will still work without you having to make any changes. A route is named by pass
 with the name of the route:
 
 .. literalinclude:: routing/026.php
-   :lines: 2-
 
 This has the added benefit of making the views more readable, too.
 
@@ -324,7 +298,6 @@ It is possible to define a route with any HTTP verbs.
 You can use the ``add()`` method:
 
 .. literalinclude:: routing/027.php
-   :lines: 2-
 
 .. warning:: While the ``add()`` method seems to be convenient, it is recommended to always use the HTTP-verb-based
     routes, described above, as it is more secure. If you use the :doc:`CSRF protection </libraries/security>`, it does not protect **GET**
@@ -346,7 +319,6 @@ route methods will also be inaccessible from the CLI, but routes created by the
 available from the command line:
 
 .. literalinclude:: routing/028.php
-   :lines: 2-
 
 .. warning:: If you don't disable auto-routing and place the command file in **app/Controllers**,
     anyone could access the command with the help of auto-routing via HTTP.
@@ -358,7 +330,6 @@ All of the methods for creating a route (add, get, post, :doc:`resource <restful
 can modify the generated routes, or further restrict them. The ``$options`` array is always the last parameter:
 
 .. literalinclude:: routing/029.php
-   :lines: 2-
 
 .. _applying-filters:
 
@@ -385,19 +356,16 @@ See :doc:`Controller filters <filters>` for more information on setting up filte
 You specify an alias defined in **app/Config/Filters.php** for the filter value:
 
 .. literalinclude:: routing/030.php
-   :lines: 2-
 
 You may also supply arguments to be passed to the alias filter's ``before()`` and ``after()`` methods:
 
 .. literalinclude:: routing/031.php
-   :lines: 2-
 
 **Classname filter**
 
 You specify a filter classname for the filter value:
 
 .. literalinclude:: routing/032.php
-   :lines: 2-
 
 **Multiple filters**
 
@@ -406,7 +374,6 @@ You specify a filter classname for the filter value:
 You specify an array for the filter value:
 
 .. literalinclude:: routing/033.php
-   :lines: 2-
 
 .. _assigning-namespace:
 
@@ -418,7 +385,6 @@ a different namespace to be used in any options array, with the ``namespace`` op
 namespace you want modified:
 
 .. literalinclude:: routing/034.php
-   :lines: 2-
 
 The new namespace is only applied during that call for any methods that create a single route, like get, post, etc.
 For any methods that create multiple routes, the new namespace is attached to all routes generated by that function
@@ -431,7 +397,6 @@ You can restrict groups of routes to function only in certain domain or sub-doma
 by passing the "hostname" option along with the desired domain to allow it on as part of the options array:
 
 .. literalinclude:: routing/035.php
-   :lines: 2-
 
 This example would only allow the specified hosts to work if the domain exactly matched **accounts.example.com**.
 It would not work under the main site at **example.com**.
@@ -443,13 +408,11 @@ When the ``subdomain`` option is present, the system will restrict the routes to
 sub-domain. The route will only be matched if the subdomain is the one the application is being viewed through:
 
 .. literalinclude:: routing/036.php
-   :lines: 2-
 
 You can restrict it to any subdomain by setting the value to an asterisk, (``*``). If you are viewing from a URL
 that does not have any subdomain present, this will not be matched:
 
 .. literalinclude:: routing/037.php
-   :lines: 2-
 
 .. important:: The system is not perfect and should be tested for your specific domain before being used in production.
     Most domains should work fine but some edge case ones, especially with a period in the domain itself (not used
@@ -465,7 +428,6 @@ This can be beneficial when developing API's with the first URI segment being th
 be used when the first parameter is a language string:
 
 .. literalinclude:: routing/038.php
-   :lines: 2-
 
 .. _routing-priority:
 
@@ -479,12 +441,10 @@ accepts positive integers and zero. The higher the number specified in the ``pri
 route priority in the processing queue:
 
 .. literalinclude:: routing/039.php
-   :lines: 2-
 
 To disable this functionality, you must call the method with the parameter ``false``:
 
 .. literalinclude:: routing/040.php
-   :lines: 2-
 
 .. note:: By default, all routes have a priority of 0.
     Negative integers will be cast to the absolute value.
@@ -508,13 +468,11 @@ If you set the value empty string (``''``), it leaves each route to specify the
 controller:
 
 .. literalinclude:: routing/041.php
-   :lines: 2-
 
 If your controllers are not explicitly namespaced, there is no need to change this. If you namespace your controllers,
 then you can change this value to save typing:
 
 .. literalinclude:: routing/042.php
-   :lines: 2-
 
 Default Controller
 ==================
@@ -524,7 +482,6 @@ the ``setDefaultController()`` method, unless a route exists for it explicitly.
 which matches the controller at **app/Controllers/Home.php**:
 
 .. literalinclude:: routing/043.php
-   :lines: 2-
 
 The default controller is also used when no matching route has been found, and the URI would point to a directory
 in the controllers directory. For example, if the user visits **example.com/admin**, if a controller was found at
@@ -541,7 +498,6 @@ In this example, if the user were to visit **example.com/products**, and a ``Pro
 ``Products::listAll()`` method would be executed:
 
 .. literalinclude:: routing/044.php
-   :lines: 2-
 
 Translate URI Dashes
 ====================
@@ -551,7 +507,6 @@ URI segments, thus saving you additional route entries if you need to do that. T
 dash isn't a valid class or method name character and would cause a fatal error if you try to use it:
 
 .. literalinclude:: routing/045.php
-   :lines: 2-
 
 .. _use-defined-routes-only:
 
@@ -563,7 +518,6 @@ controllers and methods as described above. You can disable this automatic match
 to only those defined by you, by setting the ``setAutoRoute()`` option to false:
 
 .. literalinclude:: routing/046.php
-   :lines: 2-
 
 .. warning:: If you use the :doc:`CSRF protection </libraries/security>`, it does not protect **GET**
     requests. If the URI is accessible by the GET method, the CSRF protection will not work.
@@ -576,7 +530,6 @@ what happens by specifying an action to happen with the ``set404Override()`` met
 a valid class/method pair, just like you would show in any route, or a Closure:
 
 .. literalinclude:: routing/047.php
-   :lines: 2-
 
 Route processing by priority
 ============================
@@ -586,7 +539,6 @@ Disabled by default. This functionality affects all routes.
 For an example use of lowering the priority see :ref:`routing-priority`:
 
 .. literalinclude:: routing/048.php
-   :lines: 2-
 
 *****************
 Confirming Routes
diff --git a/user_guide_src/source/incoming/routing/025.php b/user_guide_src/source/incoming/routing/025.php
index 0af87a58c3b5..3379179f4be1 100644
--- a/user_guide_src/source/incoming/routing/025.php
+++ b/user_guide_src/source/incoming/routing/025.php
@@ -3,6 +3,8 @@
 // The route is defined as:
 $routes->get('users/(:num)/gallery(:any)', 'App\Controllers\Galleries::showUserGallery/$1/$2');
 
-// Generate the relative URL to link to user ID 15, gallery 12
-// Generates: /users/15/gallery/12
+?>
+
+<!-- Generate the relative URL to link to user ID 15, gallery 12: --> 
 <a href="<?= route_to('App\Controllers\Galleries::showUserGallery', 15, 12) ?>">View Gallery</a>
+<!-- Result: '/users/15/gallery/12' -->
diff --git a/user_guide_src/source/incoming/routing/026.php b/user_guide_src/source/incoming/routing/026.php
index 5469c79db91a..604e9f95b26e 100644
--- a/user_guide_src/source/incoming/routing/026.php
+++ b/user_guide_src/source/incoming/routing/026.php
@@ -3,6 +3,8 @@
 // The route is defined as:
 $routes->get('users/(:num)/gallery(:any)', 'Galleries::showUserGallery/$1/$2', ['as' => 'user_gallery']);
 
-// Generate the relative URL to link to user ID 15, gallery 12
-// Generates: /users/15/gallery/12
+?>
+
+<!-- Generate the relative URL to link to user ID 15, gallery 12: --> 
 <a href="<?= route_to('user_gallery', 15, 12) ?>">View Gallery</a>
+<!-- Result: '/users/15/gallery/12' -->
diff --git a/user_guide_src/source/installation/troubleshooting.rst b/user_guide_src/source/installation/troubleshooting.rst
index 9ae2b5ac843a..071f4cf9d5ce 100644
--- a/user_guide_src/source/installation/troubleshooting.rst
+++ b/user_guide_src/source/installation/troubleshooting.rst
@@ -37,12 +37,10 @@ you'll need to force CodeIgniter to add a question mark to your URLs. To
 do this open your **app/Config/App.php** file and change this:
 
 .. literalinclude:: troubleshooting/001.php
-   :lines: 2-
 
 To this:
 
 .. literalinclude:: troubleshooting/002.php
-   :lines: 2-
 
 The tutorial gives 404 errors everywhere :(
 -------------------------------------------
diff --git a/user_guide_src/source/installation/upgrade_404.rst b/user_guide_src/source/installation/upgrade_404.rst
index 4a52f1c7e9eb..ffcb2b1d85fe 100644
--- a/user_guide_src/source/installation/upgrade_404.rst
+++ b/user_guide_src/source/installation/upgrade_404.rst
@@ -11,9 +11,7 @@ The method signatures for ``after()`` and ``before()`` must be updated to includ
 definitions should be changed from:
 
 .. literalinclude:: upgrade_404/001.php
-   :lines: 2-
 
 to:
 
 .. literalinclude:: upgrade_404/002.php
-   :lines: 2-
diff --git a/user_guide_src/source/installation/upgrade_412.rst b/user_guide_src/source/installation/upgrade_412.rst
index 0798b0b2bd4f..991d048beed6 100644
--- a/user_guide_src/source/installation/upgrade_412.rst
+++ b/user_guide_src/source/installation/upgrade_412.rst
@@ -50,12 +50,10 @@ classes have been deprecated and their methods moved to ``DatabaseTestTrait`` an
 and use any traits you need. For example:
 
 .. literalinclude:: upgrade_412/001.php
-   :lines: 2-
 
 ... becomes:
 
 .. literalinclude:: upgrade_412/002.php
-   :lines: 2-
 
 Finally, ``ControllerTester`` has been superseded by ``ControllerTestTrait`` to standardize
 approach and take advantage of the updated response testing (below).
diff --git a/user_guide_src/source/installation/upgrade_415.rst b/user_guide_src/source/installation/upgrade_415.rst
index cde5c4daae3d..69969c09c651 100644
--- a/user_guide_src/source/installation/upgrade_415.rst
+++ b/user_guide_src/source/installation/upgrade_415.rst
@@ -47,7 +47,6 @@ for such requests if you don't need CSRF protection for them.
 If you want the same behavior as the previous version, set the CSRF filter like the following in **app/Config/Filters.php**:
 
 .. literalinclude:: upgrade_415/001.php
-   :lines: 2-
 
 Protecting **GET** method needs only when you use ``form_open()`` auto-generation of CSRF field.
 
diff --git a/user_guide_src/source/installation/upgrade_database.rst b/user_guide_src/source/installation/upgrade_database.rst
index 8d52f2c0b2be..4479c46ff5e8 100644
--- a/user_guide_src/source/installation/upgrade_database.rst
+++ b/user_guide_src/source/installation/upgrade_database.rst
@@ -47,10 +47,8 @@ CodeIgniter Version 3.x
 ------------------------
 
 .. literalinclude:: upgrade_database/001.php
-   :lines: 2-
 
 CodeIgniter Version 4.x
 -----------------------
 
 .. literalinclude:: upgrade_database/002.php
-   :lines: 2-
diff --git a/user_guide_src/source/installation/upgrade_emails.rst b/user_guide_src/source/installation/upgrade_emails.rst
index 155562ba4a1a..1ece732add8f 100644
--- a/user_guide_src/source/installation/upgrade_emails.rst
+++ b/user_guide_src/source/installation/upgrade_emails.rst
@@ -29,10 +29,8 @@ CodeIgniter Version 3.x
 ------------------------
 
 .. literalinclude:: upgrade_emails/001.php
-   :lines: 2-
 
 CodeIgniter Version 4.x
 -----------------------
 
 .. literalinclude:: upgrade_emails/002.php
-   :lines: 2-
diff --git a/user_guide_src/source/installation/upgrade_encryption.rst b/user_guide_src/source/installation/upgrade_encryption.rst
index 5915ca00dca1..fb617a5424d5 100644
--- a/user_guide_src/source/installation/upgrade_encryption.rst
+++ b/user_guide_src/source/installation/upgrade_encryption.rst
@@ -27,10 +27,8 @@ CodeIgniter Version 3.x
 ------------------------
 
 .. literalinclude:: upgrade_encryption/001.php
-   :lines: 2-
 
 CodeIgniter Version 4.x
 -----------------------
 
 .. literalinclude:: upgrade_encryption/002.php
-   :lines: 2-
diff --git a/user_guide_src/source/installation/upgrade_html_tables.rst b/user_guide_src/source/installation/upgrade_html_tables.rst
index 23e6aea3526b..2a0bbaacd5c7 100644
--- a/user_guide_src/source/installation/upgrade_html_tables.rst
+++ b/user_guide_src/source/installation/upgrade_html_tables.rst
@@ -28,10 +28,8 @@ CodeIgniter Version 3.x
 ------------------------
 
 .. literalinclude:: upgrade_html_tables/001.php
-   :lines: 2-
 
 CodeIgniter Version 4.x
 -----------------------
 
 .. literalinclude:: upgrade_html_tables/002.php
-   :lines: 2-
diff --git a/user_guide_src/source/installation/upgrade_localization.rst b/user_guide_src/source/installation/upgrade_localization.rst
index 3fec8c15cce0..0d1ed53f2ebb 100644
--- a/user_guide_src/source/installation/upgrade_localization.rst
+++ b/user_guide_src/source/installation/upgrade_localization.rst
@@ -20,7 +20,6 @@ Upgrade Guide
 1. Specify the default language in **Config/App.php**:
 
    .. literalinclude:: upgrade_localization/001.php
-      :lines: 2-
 
 2. Now move your language files to **app/Language/<locale>**.
 3. After that you have to change the syntax within the language files. Below in the Code Example you will see how the language array within the file should look like.
@@ -34,10 +33,8 @@ CodeIgniter Version 3.x
 ------------------------
 
 .. literalinclude:: upgrade_localization/002.php
-   :lines: 2-
 
 CodeIgniter Version 4.x
 -----------------------
 
 .. literalinclude:: upgrade_localization/003.php
-   :lines: 2-
diff --git a/user_guide_src/source/installation/upgrade_pagination.rst b/user_guide_src/source/installation/upgrade_pagination.rst
index 416bd2f2e6d2..c39638682534 100644
--- a/user_guide_src/source/installation/upgrade_pagination.rst
+++ b/user_guide_src/source/installation/upgrade_pagination.rst
@@ -35,10 +35,8 @@ CodeIgniter Version 3.x
 ------------------------
 
 .. literalinclude:: upgrade_pagination/001.php
-   :lines: 2-
 
 CodeIgniter Version 4.x
 -----------------------
 
 .. literalinclude:: upgrade_pagination/002.php
-   :lines: 2-
diff --git a/user_guide_src/source/installation/upgrade_responses.rst b/user_guide_src/source/installation/upgrade_responses.rst
index 9af660e35097..455e5aa1617c 100644
--- a/user_guide_src/source/installation/upgrade_responses.rst
+++ b/user_guide_src/source/installation/upgrade_responses.rst
@@ -26,10 +26,8 @@ CodeIgniter Version 3.x
 ------------------------
 
 .. literalinclude:: upgrade_responses/001.php
-   :lines: 2-
 
 CodeIgniter Version 4.x
 -----------------------
 
 .. literalinclude:: upgrade_responses/002.php
-   :lines: 2-
diff --git a/user_guide_src/source/installation/upgrade_security.rst b/user_guide_src/source/installation/upgrade_security.rst
index 6fbdbc2428a6..9000bea7167a 100644
--- a/user_guide_src/source/installation/upgrade_security.rst
+++ b/user_guide_src/source/installation/upgrade_security.rst
@@ -23,7 +23,6 @@ Upgrade Guide
 1. To enable CSRF protection in CI4 you have to enable it in **app/Config/Filters.php**:
 
    .. literalinclude:: upgrade_security/001.php
-      :lines: 2-
 
 2. Within your HTML forms you have to remove the CSRF input field which looks similar to ``<input type="hidden" name="<?= $csrf['name'] ?>" value="<?= $csrf['hash'] ?>" />``.
 3. Now, within your HTML forms you have to add ``<?= csrf_field() ?>`` somewhere in the form body, unless you are using ``form_open()``.
@@ -35,7 +34,6 @@ CodeIgniter Version 3.x
 ------------------------
 
 .. literalinclude:: upgrade_security/002.php
-   :lines: 2-
 
 CodeIgniter Version 4.x
 -----------------------
diff --git a/user_guide_src/source/installation/upgrade_security/002.php b/user_guide_src/source/installation/upgrade_security/002.php
index c1604ae48317..56b6a5905754 100644
--- a/user_guide_src/source/installation/upgrade_security/002.php
+++ b/user_guide_src/source/installation/upgrade_security/002.php
@@ -5,7 +5,7 @@
     'hash' => $this->security->get_csrf_hash()
 );
 
-// ...
+?>
 
 <form>
     <input name="name" type="text">
diff --git a/user_guide_src/source/installation/upgrade_sessions.rst b/user_guide_src/source/installation/upgrade_sessions.rst
index 447703854284..df5ff7daae85 100644
--- a/user_guide_src/source/installation/upgrade_sessions.rst
+++ b/user_guide_src/source/installation/upgrade_sessions.rst
@@ -32,10 +32,8 @@ CodeIgniter Version 3.x
 ------------------------
 
 .. literalinclude:: upgrade_sessions/001.php
-   :lines: 2-
 
 CodeIgniter Version 4.x
 -----------------------
 
 .. literalinclude:: upgrade_sessions/002.php
-   :lines: 2-
diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
index 54b7281d4839..22dd0a2aff00 100644
--- a/user_guide_src/source/installation/upgrade_validations.rst
+++ b/user_guide_src/source/installation/upgrade_validations.rst
@@ -34,7 +34,6 @@ Upgrade Guide
 3. You have to change the validation rules. The new syntax is to set the rules as array in the controller:
 
    .. literalinclude:: upgrade_validations/001.php
-      :lines: 2-
 
 Code Example
 ============
diff --git a/user_guide_src/source/installation/upgrade_view_parser.rst b/user_guide_src/source/installation/upgrade_view_parser.rst
index 4931eb467ede..a6faa488471e 100644
--- a/user_guide_src/source/installation/upgrade_view_parser.rst
+++ b/user_guide_src/source/installation/upgrade_view_parser.rst
@@ -28,10 +28,8 @@ CodeIgniter Version 3.x
 ------------------------
 
 .. literalinclude:: upgrade_view_parser/001.php
-   :lines: 2-
 
 CodeIgniter Version 4.x
 -----------------------
 
 .. literalinclude:: upgrade_view_parser/002.php
-   :lines: 2-
diff --git a/user_guide_src/source/libraries/caching.rst b/user_guide_src/source/libraries/caching.rst
index 6f4fb8071c74..57490e49e853 100644
--- a/user_guide_src/source/libraries/caching.rst
+++ b/user_guide_src/source/libraries/caching.rst
@@ -18,12 +18,10 @@ Example Usage
 The following example shows a common usage pattern within your controllers.
 
 .. literalinclude:: caching/001.php
-   :lines: 2-
 
 You can grab an instance of the cache engine directly through the Services class:
 
 .. literalinclude:: caching/002.php
-   :lines: 2-
 
 =====================
 Configuring the Cache
@@ -87,7 +85,6 @@ Class Reference
     Example:
 
     .. literalinclude:: caching/003.php
-       :lines: 2-
 
 .. php:method:: remember(string $key, int $ttl, Closure $callback)
 
@@ -115,7 +112,6 @@ Class Reference
     Example:
 
     .. literalinclude:: caching/004.php
-       :lines: 2-
 
 .. note:: The ``$raw`` parameter is only utilized by Memcache,
     in order to allow usage of ``increment()`` and ``decrement()``.
@@ -132,7 +128,6 @@ Class Reference
     Example:
 
     .. literalinclude:: caching/005.php
-       :lines: 2-
 
 .. php:method:: deleteMatching($pattern): integer
 
@@ -149,7 +144,6 @@ Class Reference
     Example:
 
     .. literalinclude:: caching/006.php
-       :lines: 2-
 
     For more information on glob-style syntax, please see
     `Glob (programming) <https://en.wikipedia.org/wiki/Glob_(programming)#Syntax>`_.
@@ -166,7 +160,6 @@ Class Reference
     Example:
 
     .. literalinclude:: caching/007.php
-       :lines: 2-
 
 .. php:method:: decrement($key[, $offset = 1]): mixed
 
@@ -180,7 +173,6 @@ Class Reference
     Example:
 
     .. literalinclude:: caching/008.php
-       :lines: 2-
 
 .. php:method:: clean()
 
@@ -193,7 +185,6 @@ Class Reference
     Example:
 
     .. literalinclude:: caching/009.php
-       :lines: 2-
 
 .. php:method:: getCacheInfo()
 
@@ -205,7 +196,6 @@ Class Reference
     Example:
 
     .. literalinclude:: caching/010.php
-       :lines: 2-
 
 .. note:: The information returned and the structure of the data is dependent
     on which adapter is being used.
@@ -222,7 +212,6 @@ Class Reference
     Example:
 
     .. literalinclude:: caching/011.php
-       :lines: 2-
 
 .. note:: The information returned and the structure of the data is dependent
           on which adapter is being used. Some adapters (File, Memcached, Wincache)
@@ -241,7 +230,6 @@ Class Reference
     Example:
 
     .. literalinclude:: caching/012.php
-       :lines: 2-
 
 *******
 Drivers
@@ -264,7 +252,6 @@ Memcached Caching
 Memcached servers can be specified in the cache configuration file. Available options are:
 
 .. literalinclude:: caching/013.php
-   :lines: 2-
 
 For more information on Memcached, please see
 `https://www.php.net/memcached <https://www.php.net/memcached>`_.
@@ -288,7 +275,6 @@ To use it, you need `Redis server and phpredis PHP extension <https://github.com
 Config options to connect to redis server stored in the cache configuration file. Available options are:
 
 .. literalinclude:: caching/014.php
-   :lines: 2-
 
 For more information on Redis, please see
 `https://redis.io <https://redis.io>`_.
diff --git a/user_guide_src/source/libraries/cookies.rst b/user_guide_src/source/libraries/cookies.rst
index 7869bacf183d..c167a88889c4 100644
--- a/user_guide_src/source/libraries/cookies.rst
+++ b/user_guide_src/source/libraries/cookies.rst
@@ -29,7 +29,6 @@ Creating Cookies
 There are currently four (4) ways to create a new ``Cookie`` value object.
 
 .. literalinclude:: cookies/001.php
-   :lines: 2-
 
 When constructing the ``Cookie`` object, only the ``name`` attribute is required. All other else are optional.
 If the optional attributes are not modified, their values will be filled up by the default values saved in
@@ -37,7 +36,6 @@ the ``Cookie`` class. To override the defaults currently stored in the class, yo
 instance or an array of defaults to the static ``Cookie::setDefaults()`` method.
 
 .. literalinclude:: cookies/002.php
-   :lines: 2-
 
 Passing the ``Config\Cookie`` instance or an array to ``Cookie::setDefaults()`` will effectively
 overwrite your defaults and will persist until new defaults are passed. If you do not want this
@@ -45,7 +43,6 @@ behavior but only want to change defaults for a limited time, you can take advan
 ``Cookie::setDefaults()`` return which returns the old defaults array.
 
 .. literalinclude:: cookies/003.php
-   :lines: 2-
 
 *****************************
 Accessing Cookie's Attributes
@@ -54,7 +51,6 @@ Accessing Cookie's Attributes
 Once instantiated, you can easily access a ``Cookie``'s attribute by using one of its getter methods.
 
 .. literalinclude:: cookies/004.php
-   :lines: 2-
 
 *****************
 Immutable Cookies
@@ -65,7 +61,6 @@ modifying any of the instance's attributes will not affect the original instance
 returns a new instance. You need to retain this new instance in order to use it.
 
 .. literalinclude:: cookies/005.php
-   :lines: 2-
 
 ********************************
 Validating a Cookie's Attributes
@@ -123,7 +118,6 @@ When writing the SameSite attribute, the ``Cookie`` class accepts any of the val
 also take advantage of the class's constants to make it not a hassle.
 
 .. literalinclude:: cookies/006.php
-   :lines: 2-
 
 **********************
 Using the Cookie Store
@@ -133,12 +127,10 @@ The ``CookieStore`` class represents an immutable collection of ``Cookie`` objec
 instance can be accessed from the current ``Response`` object.
 
 .. literalinclude:: cookies/007.php
-   :lines: 2-
 
 CodeIgniter provides three (3) other ways to create a new instance of the ``CookieStore``.
 
 .. literalinclude:: cookies/008.php
-   :lines: 2-
 
 .. note:: When using the global ``cookies()`` function, the passed ``Cookie`` array will only be considered
     if the second argument, ``$getGlobal``, is set to ``false``.
@@ -149,7 +141,6 @@ Checking Cookies in Store
 To check whether a ``Cookie`` object exists in the ``CookieStore`` instance, you can use several ways:
 
 .. literalinclude:: cookies/009.php
-   :lines: 2-
 
 Getting Cookies in Store
 ========================
@@ -157,25 +148,21 @@ Getting Cookies in Store
 Retrieving a ``Cookie`` instance in a cookie collection is very easy:
 
 .. literalinclude:: cookies/010.php
-   :lines: 2-
 
 When getting a ``Cookie`` instance directly from a ``CookieStore``, an invalid name
 will throw a ``CookieException``.
 
 .. literalinclude:: cookies/011.php
-   :lines: 2-
 
 When getting a ``Cookie`` instance from the current ``Response``'s cookie collection,
 an invalid name will just return ``null``.
 
 .. literalinclude:: cookies/012.php
-   :lines: 2-
 
 If no arguments are supplied in when getting cookies from the ``Response``, all ``Cookie`` objects
 in store will be displayed.
 
 .. literalinclude:: cookies/013.php
-   :lines: 2-
 
 .. note:: The helper function ``get_cookie()`` gets the cookie from the current ``Request`` object, not
     from ``Response``. This function checks the `$_COOKIE` array if that cookie is set and fetches it
@@ -188,7 +175,6 @@ As previously mentioned, ``CookieStore`` objects are immutable. You need to save
 in order to work on it. The original instance is left unchanged.
 
 .. literalinclude:: cookies/014.php
-   :lines: 2-
 
 .. note:: Removing a cookie from the store **DOES NOT** delete it from the browser.
     If you intend to delete a cookie *from the browser*, you must put an empty value
@@ -199,7 +185,6 @@ cookies without worrying the immutable nature of the cookie collection. The ``Re
 the instance with the modified instance.
 
 .. literalinclude:: cookies/015.php
-   :lines: 2-
 
 Dispatching Cookies in Store
 ============================
@@ -210,7 +195,6 @@ in sending other headers, you need to make sure the headers are not yet sent by
 of ``headers_sent()``.
 
 .. literalinclude:: cookies/016.php
-   :lines: 2-
 
 **********************
 Cookie Personalization
diff --git a/user_guide_src/source/libraries/curlrequest.rst b/user_guide_src/source/libraries/curlrequest.rst
index 0d2789816953..3d0b91b511fb 100644
--- a/user_guide_src/source/libraries/curlrequest.rst
+++ b/user_guide_src/source/libraries/curlrequest.rst
@@ -33,7 +33,6 @@ this behavior may cause an error request with unnecessary headers.
 You can change the behavior by editing the following config parameter value in **app/Config/CURLRequest.php** to ``false``:
 
 .. literalinclude:: curlrequest/001.php
-   :lines: 2-
 
 *******************
 Loading the Library
@@ -44,13 +43,11 @@ The library can be loaded either manually or through the :doc:`Services class </
 To load with the Services class call the ``curlrequest()`` method:
 
 .. literalinclude:: curlrequest/002.php
-   :lines: 2-
 
 You can pass in an array of default options as the first parameter to modify how cURL will handle the request.
 The options are described later in this document:
 
 .. literalinclude:: curlrequest/003.php
-   :lines: 2-
 
 .. note:: When ``$shareOptions`` is false, the default options passed to the class constructor will be used for all requests. Other options will be reset after sending a request.
 
@@ -59,7 +56,6 @@ instance of the ``Config\App`` class. The second parameter is a URI instance. Th
 parameter is a Response object. The fourth parameter is the optional default ``$options`` array:
 
 .. literalinclude:: curlrequest/004.php
-   :lines: 2-
 
 ************************
 Working with the Library
@@ -76,7 +72,6 @@ Most communication is done through the ``request()`` method, which fires off the
 a Response instance to you. This takes the HTTP method, the url and an array of options as the parameters.
 
 .. literalinclude:: curlrequest/005.php
-   :lines: 2-
 
 .. note:: When ``$shareOptions`` is false, the options passed to the method will be used for the request. After sending the request, they will be cleared. If you want to use the options to all requests, pass the options in the constructor.
 
@@ -84,13 +79,11 @@ Since the response is an instance of ``CodeIgniter\HTTP\Response`` you have all
 available to you:
 
 .. literalinclude:: curlrequest/006.php
-   :lines: 2-
 
 While the ``request()`` method is the most flexible, you can also use the following shortcut methods. They
 each take the URL as the first parameter and an array of options as the second:
 
 .. literalinclude:: curlrequest/007.php
-   :lines: 2-
 
 Base URI
 --------
@@ -100,7 +93,6 @@ set a base URI, and then make all requests with that client using relative URLs.
 when working with APIs:
 
 .. literalinclude:: curlrequest/008.php
-   :lines: 2-
 
 When a relative URI is provided to the ``request()`` method or any of the shortcut methods, it will be combined
 with the baseURI according to the rules described by
@@ -127,23 +119,19 @@ methods. The most commonly used methods let you determine the response itself.
 You can get the status code and reason phrase of the response:
 
 .. literalinclude:: curlrequest/009.php
-   :lines: 2-
 
 You can retrieve headers from the response:
 
 .. literalinclude:: curlrequest/010.php
-   :lines: 2-
 
 The body can be retrieved using the ``getBody()`` method:
 
 .. literalinclude:: curlrequest/011.php
-   :lines: 2-
 
 The body is the raw body provided by the remote server. If the content type requires formatting, you will need
 to ensure that your script handles that:
 
 .. literalinclude:: curlrequest/012.php
-   :lines: 2-
 
 ***************
 Request Options
@@ -161,17 +149,14 @@ allows you to modify how that works.
 If you set the value to ``false``, then it will not follow any redirects at all:
 
 .. literalinclude:: curlrequest/013.php
-   :lines: 2-
 
 Setting it to ``true`` will apply the default settings to the request:
 
 .. literalinclude:: curlrequest/014.php
-   :lines: 2-
 
 You can pass in array as the value of the ``allow_redirects`` option to specify new settings in place of the defaults:
 
 .. literalinclude:: curlrequest/015.php
-   :lines: 2-
 
 .. note:: Following redirects does not work when PHP is in safe_mode or open_basedir is enabled.
 
@@ -185,7 +170,6 @@ array where the first element is the username, and the second is the password. T
 the type of authentication to use, either ``basic`` or ``digest``:
 
 .. literalinclude:: curlrequest/016.php
-   :lines: 2-
 
 body
 ====
@@ -194,13 +178,11 @@ There are two ways to set the body of the request for request types that support
 The first way is to use the ``setBody()`` method:
 
 .. literalinclude:: curlrequest/017.php
-   :lines: 2-
 
 The second method is by passing a ``body`` option in. This is provided to maintain Guzzle API compatibility,
 and functions the exact same way as the previous example. The value must be a string:
 
 .. literalinclude:: curlrequest/018.php
-   :lines: 2-
 
 cert
 ====
@@ -210,7 +192,6 @@ file as the ``cert`` option. If a password is required, set the value to an arra
 as the path to the certificate, and the second as the password:
 
 .. literalinclude:: curlrequest/019.php
-   :lines: 2-
 
 connect_timeout
 ===============
@@ -220,7 +201,6 @@ modify this value, you can do so by passing the amount of time in seconds with t
 You can pass 0 to wait indefinitely:
 
 .. literalinclude:: curlrequest/020.php
-   :lines: 2-
 
 cookie
 ======
@@ -230,7 +210,6 @@ to save cookie values to. This is done using the CURL_COOKIEJAR and CURL_COOKIEF
 An example:
 
 .. literalinclude:: curlrequest/021.php
-   :lines: 2-
 
 debug
 =====
@@ -245,7 +224,6 @@ the server's error log.
 You can pass a filename as the value for debug to have the output written to a file:
 
 .. literalinclude:: curlrequest/022.php
-   :lines: 2-
 
 delay
 =====
@@ -253,7 +231,6 @@ delay
 Allows you to pause a number of milliseconds before sending the request:
 
 .. literalinclude:: curlrequest/023.php
-   :lines: 2-
 
 form_params
 ===========
@@ -263,7 +240,6 @@ the ``form_params`` option. This will set the ``Content-Type`` header to ``appli
 if it's not already set:
 
 .. literalinclude:: curlrequest/024.php
-   :lines: 2-
 
 .. note:: ``form_params`` cannot be used with the ``multipart`` option. You will need to use one or the other.
         Use ``form_params`` for ``application/x-www-form-urlencoded`` request, and ``multipart`` for ``multipart/form-data``
@@ -279,7 +255,6 @@ array of headers in as an option. Each key is the name of a header, and each val
 representing the header field values:
 
 .. literalinclude:: curlrequest/025.php
-   :lines: 2-
 
 If headers are passed into the constructor they are treated as default values that will be overridden later by any
 further headers arrays or calls to ``setHeader()``.
@@ -291,7 +266,6 @@ By default, CURLRequest will fail if the HTTP code returned is greater than or e
 ``http_errors`` to ``false`` to return the content instead:
 
 .. literalinclude:: curlrequest/026.php
-   :lines: 2-
 
 json
 ====
@@ -301,7 +275,6 @@ of ``application/json`` is added, overwriting any Content-Type that might be alr
 this option can be any value that ``json_encode()`` accepts:
 
 .. literalinclude:: curlrequest/027.php
-   :lines: 2-
 
 .. note:: This option does not allow for any customization of the ``json_encode()`` function, or the Content-Type
         header. If you need that ability, you will need to encode the data manually, passing it through the ``setBody()``
@@ -316,7 +289,6 @@ of POST data to send. For safer usage, the legacy method of uploading files by p
 has been disabled. Any files that you want to send must be passed as instances of CURLFile:
 
 .. literalinclude:: curlrequest/028.php
-   :lines: 2-
 
 .. note:: ``multipart`` cannot be used with the ``form_params`` option. You can only use one or the other. Use
         ``form_params`` for ``application/x-www-form-urlencoded`` requests, and ``multipart`` for ``multipart/form-data``
@@ -328,7 +300,6 @@ query
 You can pass along data to send as query string variables by passing an associative array as the ``query`` option:
 
 .. literalinclude:: curlrequest/029.php
-   :lines: 2-
 
 timeout
 =======
@@ -337,7 +308,6 @@ By default, cURL functions are allowed to run as long as they take, with no time
 option. The value should be the number of seconds you want the functions to execute for. Use 0 to wait indefinitely:
 
 .. literalinclude:: curlrequest/030.php
-   :lines: 2-
 
 user_agent
 ==========
@@ -345,7 +315,6 @@ user_agent
 Allows specifying the User Agent for requests:
 
 .. literalinclude:: curlrequest/031.php
-   :lines: 2-
 
 verify
 ======
@@ -357,7 +326,6 @@ to a string that contains the path to a CA bundle to enable verification with a
 is true:
 
 .. literalinclude:: curlrequest/032.php
-   :lines: 2-
 
 version
 =======
@@ -366,4 +334,3 @@ To set the HTTP protocol to use, you can pass a string or float with the version
 or 1.1, 2.0 is currently unsupported.):
 
 .. literalinclude:: curlrequest/033.php
-   :lines: 2-
diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index 800816ed4bbd..b610e69a20df 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -33,7 +33,6 @@ set your preferences in the **app/Config/Email.php** file.
 Here is a basic example demonstrating how you might send email:
 
 .. literalinclude:: email/001.php
-   :lines: 2-
 
 .. _setting-email-preferences:
 
@@ -50,7 +49,6 @@ email initialize method. Here is an example of how you might set some
 preferences:
 
 .. literalinclude:: email/002.php
-   :lines: 2-
 
 .. note:: Most of the preferences have default values that will be used
     if you do not set them.
@@ -173,12 +171,10 @@ Class Reference
         Sets the email address and name of the person sending the email:
 
         .. literalinclude:: email/003.php
-           :lines: 2-
 
         You can also set a Return-Path, to help redirect undelivered mail:
 
         .. literalinclude:: email/004.php
-           :lines: 2-
 
         .. note:: Return-Path can't be used if you've configured 'smtp' as
             your protocol.
@@ -194,7 +190,6 @@ Class Reference
         information in the `setFrom <#setFrom>`_ method is used. Example:
 
         .. literalinclude:: email/005.php
-           :lines: 2-
 
     .. php:method:: setTo($to)
 
@@ -206,13 +201,10 @@ Class Reference
         a comma-delimited list or an array:
 
         .. literalinclude:: email/006.php
-           :lines: 2-
 
         .. literalinclude:: email/007.php
-           :lines: 2-
 
         .. literalinclude:: email/008.php
-           :lines: 2-
 
     .. php:method:: setCC($cc)
 
@@ -246,7 +238,6 @@ Class Reference
         Sets the email subject:
 
         .. literalinclude:: email/009.php
-           :lines: 2-
 
     .. php:method:: setMessage($body)
 
@@ -257,7 +248,6 @@ Class Reference
         Sets the e-mail message body:
 
         .. literalinclude:: email/010.php
-           :lines: 2-
 
     .. php:method:: setAltMessage($str)
 
@@ -268,7 +258,6 @@ Class Reference
         Sets the alternative e-mail message body:
 
         .. literalinclude:: email/011.php
-           :lines: 2-
 
         This is an optional message string which can be used if you send
         HTML formatted email. It lets you specify an alternative message
@@ -288,7 +277,6 @@ Class Reference
         Appends additional headers to the e-mail:
 
         .. literalinclude:: email/012.php
-           :lines: 2-
 
     .. php:method:: clear($clearAttachments = false)
 
@@ -301,13 +289,11 @@ Class Reference
         permitting the data to be reset between cycles.
 
         .. literalinclude:: email/013.php
-           :lines: 2-
 
         If you set the parameter to true any attachments will be cleared as
         well:
 
         .. literalinclude:: email/014.php
-           :lines: 2-
 
     .. php:method:: send($autoClear = true)
 
@@ -319,13 +305,11 @@ Class Reference
         success or failure, enabling it to be used conditionally:
 
         .. literalinclude:: email/015.php
-           :lines: 2-
 
         This method will automatically clear all parameters if the request was
         successful. To stop this behaviour pass false:
 
         .. literalinclude:: email/016.php
-           :lines: 2-
 
         .. note:: In order to use the ``printDebugger()`` method, you need
             to avoid clearing the email parameters.
@@ -350,30 +334,25 @@ Class Reference
         For example:
 
         .. literalinclude:: email/017.php
-           :lines: 2-
 
         To use the default disposition (attachment), leave the second parameter blank,
         otherwise use a custom disposition:
 
         .. literalinclude:: email/018.php
-           :lines: 2-
 
         You can also use a URL:
 
         .. literalinclude:: email/019.php
-           :lines: 2-
 
         If you'd like to use a custom file name, you can use the third parameter:
 
         .. literalinclude:: email/020.php
-           :lines: 2-
 
         If you need to use a buffer string instead of a real - physical - file you can
         use the first parameter as buffer, the third parameter as file name and the fourth
         parameter as mime-type:
 
         .. literalinclude:: email/021.php
-           :lines: 2-
 
     .. php:method:: setAttachmentCID($filename)
 
@@ -385,7 +364,6 @@ Class Reference
         (picture) attachment into HTML. First parameter must be the already attached file name.
 
         .. literalinclude:: email/022.php
-           :lines: 2-
 
         .. note:: Content-ID for each e-mail must be re-created for it to be unique.
 
@@ -404,6 +382,5 @@ Class Reference
         Example:
 
         .. literalinclude:: email/023.php
-           :lines: 2-
 
         .. note:: By default, all of the raw data will be printed.
diff --git a/user_guide_src/source/libraries/encryption.rst b/user_guide_src/source/libraries/encryption.rst
index f14d433641b6..f707bcc0be7c 100644
--- a/user_guide_src/source/libraries/encryption.rst
+++ b/user_guide_src/source/libraries/encryption.rst
@@ -43,14 +43,12 @@ Using the Encryption Library
 Like all services in CodeIgniter, it can be loaded via ``Config\Services``:
 
 .. literalinclude:: encryption/001.php
-   :lines: 2-
 
 Assuming you have set your starting key (see :ref:`configuration`),
 encrypting and decrypting data is simple - pass the appropriate string to ``encrypt()``
 and/or ``decrypt()`` methods:
 
 .. literalinclude:: encryption/002.php
-   :lines: 2-
 
 And that's it! The Encryption library will do everything necessary
 for the whole process to be cryptographically secure out-of-the-box.
@@ -77,7 +75,6 @@ object of your own to the ``Services`` call. The ``$config`` variable must be
 an instance of the ``Config\Encryption`` class.
 
 .. literalinclude:: encryption/003.php
-   :lines: 2-
 
 Default Behavior
 ================
@@ -96,7 +93,6 @@ nor the output of a hashing function, etc. To create a proper key,
 you can use the Encryption library's ``createKey()`` method.
 
 .. literalinclude:: encryption/004.php
-   :lines: 2-
 
 The key can be stored in **app/Config/Encryption.php**, or you can design
 a storage mechanism of your own and pass the key dynamically when encrypting/decrypting.
@@ -105,7 +101,6 @@ To save your key to your **app/Config/Encryption.php**, open the file
 and set:
 
 .. literalinclude:: encryption/005.php
-   :lines: 2-
 
 Encoding Keys or Results
 ------------------------
@@ -116,13 +111,11 @@ is hard to deal with (i.e., a copy-paste may damage it), so you may use
 a more friendly manner. For example:
 
 .. literalinclude:: encryption/006.php
-   :lines: 2-
 
 You might find the same technique useful for the results
 of encryption:
 
 .. literalinclude:: encryption/007.php
-   :lines: 2-
 
 Using Prefixes in Storing Keys
 ------------------------------
@@ -134,7 +127,6 @@ intelligently parse the key and still pass a binary string to
 the library.
 
 .. literalinclude:: encryption/008.php
-   :lines: 2-
 
 Similarly, you can use these prefixes in your **.env** file, too!
 ::
@@ -215,7 +207,6 @@ Instead of (or in addition to) using ``Services`` as described in :ref:`usage`,
 you can create an "Encrypter" directly, or change the settings of an existing instance.
 
 .. literalinclude:: encryption/009.php
-   :lines: 2-
 
 Remember, that ``$config`` must be an instance of ``Config\Encryption`` class.
 
@@ -246,7 +237,6 @@ Class Reference
         Example:
 
         .. literalinclude:: encryption/010.php
-           :lines: 2-
 
         Please refer to the :ref:`configuration` section for detailed info.
 
@@ -272,7 +262,6 @@ Class Reference
         Examples:
 
         .. literalinclude:: encryption/011.php
-           :lines: 2-
 
     .. php:method:: decrypt($data[, $params = null])
 
@@ -294,4 +283,3 @@ Class Reference
         Examples:
 
         .. literalinclude:: encryption/012.php
-           :lines: 2-
diff --git a/user_guide_src/source/libraries/files.rst b/user_guide_src/source/libraries/files.rst
index 0cc766937028..d3950ae6c7a3 100644
--- a/user_guide_src/source/libraries/files.rst
+++ b/user_guide_src/source/libraries/files.rst
@@ -18,7 +18,6 @@ By default, the file does not need to exist. However, you can pass an additional
 to check that the file exists and throw ``FileNotFoundException()`` if it does not.
 
 .. literalinclude:: files/001.php
-   :lines: 2-
 
 Taking Advantage of Spl
 =======================
@@ -26,7 +25,6 @@ Taking Advantage of Spl
 Once you have an instance, you have the full power of the SplFileInfo class at the ready, including:
 
 .. literalinclude:: files/002.php
-   :lines: 2-
 
 New Features
 ============
@@ -39,14 +37,12 @@ You can generate a cryptographically secure random filename, with the current ti
 method. This is especially useful to rename files when moving it so that the filename is unguessable:
 
 .. literalinclude:: files/003.php
-   :lines: 2-
 
 **getSize()**
 
 Returns the size of the uploaded file in bytes:
 
 .. literalinclude:: files/004.php
-   :lines: 2-
 
 **getSizeByUnit()**
 
@@ -54,7 +50,6 @@ Returns the size of the uploaded file default in bytes. You can pass in either '
 the results in kilobytes or megabytes, respectively:
 
 .. literalinclude:: files/005.php
-   :lines: 2-
 
 **getMimeType()**
 
@@ -62,7 +57,6 @@ Retrieve the media type (mime type) of the file. Uses methods that are considere
 the type of file:
 
 .. literalinclude:: files/006.php
-   :lines: 2-
 
 **guessExtension()**
 
@@ -71,7 +65,6 @@ will return null. This is often a more trusted source than simply using the exte
 the values in **app/Config/Mimes.php** to determine extension:
 
 .. literalinclude:: files/007.php
-   :lines: 2-
 
 Moving Files
 ------------
@@ -80,18 +73,15 @@ Each file can be moved to its new location with the aptly named ``move()`` metho
 the file to as the first parameter:
 
 .. literalinclude:: files/008.php
-   :lines: 2-
 
 By default, the original filename was used. You can specify a new filename by passing it as the second parameter:
 
 .. literalinclude:: files/009.php
-   :lines: 2-
 
 The move() method returns a new File instance that for the relocated file, so you must capture the result if the
 resulting location is needed:
 
 .. literalinclude:: files/010.php
-   :lines: 2-
 
 ****************
 File Collections
@@ -102,19 +92,16 @@ locating and working with groups of files across the filesystem. At its most bas
 of files you set or build:
 
 .. literalinclude:: files/011.php
-   :lines: 2-
 
 After you have input the files you would like to work with you may remove files or use the filtering commands to remove
 or retain files matching a certain regex or glob-style pattern:
 
 .. literalinclude:: files/012.php
-   :lines: 2-
 
 When your collection is complete, you can use ``get()`` to retrieve the final list of file paths, or take advantage of
 ``FileCollection`` being countable and iterable to work directly with each ``File``:
 
 .. literalinclude:: files/013.php
-   :lines: 2-
 
 Below are the specific methods for working with a ``FileCollection``.
 
@@ -132,7 +119,6 @@ Allows child classes to define their own initial files. This method is called by
 predefined collections without having to use their methods. Example:
 
 .. literalinclude:: files/014.php
-   :lines: 2-
 
 Now you may use the ``ConfigCollection`` anywhere in your project to access all App Config files without
 having to re-call the collection methods every time.
@@ -181,7 +167,6 @@ outside of ``$scope`` are always retained). When no scope is provided then all f
 Examples:
 
 .. literalinclude:: files/015.php
-   :lines: 2-
 
 Retrieving Files
 ================
diff --git a/user_guide_src/source/libraries/honeypot.rst b/user_guide_src/source/libraries/honeypot.rst
index 3a713b3f8c6d..cdaa4eb1eb52 100644
--- a/user_guide_src/source/libraries/honeypot.rst
+++ b/user_guide_src/source/libraries/honeypot.rst
@@ -18,7 +18,6 @@ To enable a Honeypot, changes have to be made to the **app/Config/Filters.php**.
 from the ``$globals`` array, like:
 
 .. literalinclude:: honeypot/001.php
-   :lines: 2-
 
 A sample Honeypot filter is bundled, as ``system/Filters/Honeypot.php``.
 If it is not suitable, make your own at ``app/Filters/Honeypot.php``,
diff --git a/user_guide_src/source/libraries/images.rst b/user_guide_src/source/libraries/images.rst
index 029c534cacbe..f3a0de06fb3a 100644
--- a/user_guide_src/source/libraries/images.rst
+++ b/user_guide_src/source/libraries/images.rst
@@ -25,13 +25,11 @@ Like most other classes in CodeIgniter, the image class is initialized
 in your controller by calling the Services class:
 
 .. literalinclude:: images/001.php
-   :lines: 2-
 
 You can pass the alias for the image library you wish to use into the
 Service function:
 
 .. literalinclude:: images/002.php
-   :lines: 2-
 
 The available Handlers are as follows:
 
@@ -55,7 +53,6 @@ intend to perform, then call one of the available processing functions.
 For example, to create an image thumbnail you'll do this:
 
 .. literalinclude:: images/003.php
-   :lines: 2-
 
 The above code tells the library to look for an image
 called *mypic.jpg* located in the source_image folder, then create a
@@ -70,7 +67,6 @@ is used and passed through each method, applying the results on top of the
 previous results:
 
 .. literalinclude:: images/004.php
-   :lines: 2-
 
 This example would take the same image and first fix any mobile phone orientation issues,
 rotate the image by 90 degrees, and then crop the result into a 100x100 pixel image,
@@ -93,7 +89,6 @@ quality. Values range from 0 to 100 with 90 being the framework default. This pa
 only applies to JPEG images and will be ignored otherwise:
 
 .. literalinclude:: images/005.php
-   :lines: 2-
 
 .. note:: Higher quality will result in larger file sizes. See also https://www.php.net/manual/en/function.imagejpeg.php
 
@@ -101,7 +96,6 @@ If you are only interested in changing the image quality without doing any proce
 You will need to include the image resource or you will end up with an exact copy:
 
 .. literalinclude:: images/006.php
-   :lines: 2-
 
 Processing Methods
 ==================
@@ -123,7 +117,6 @@ the error message. A good practice is to catch the exceptions, showing an
 error upon failure, like this:
 
 .. literalinclude:: images/007.php
-   :lines: 2-
 
 Cropping Images
 ---------------
@@ -144,7 +137,6 @@ To take a 50x50 pixel square out of the center of an image, you would need to fi
 offset values:
 
 .. literalinclude:: images/008.php
-   :lines: 2-
 
 Converting Images
 -----------------
@@ -156,7 +148,6 @@ The ``convert()`` method changes the library's internal indicator for the desire
 - **$imageType** is one of PHP's image type constants (see for example https://www.php.net/manual/en/function.image-type-to-mime-type.php):
 
   .. literalinclude:: images/009.php
-     :lines: 2-
 
 .. note:: ImageMagick already saves files in the type
     indicated by their extension, ignoring **$imageType**
@@ -181,7 +172,6 @@ The ``fit()`` method aims to help simplify cropping a portion of an image in a "
 This provides a much simpler way to crop that will always maintain the aspect ratio:
 
 .. literalinclude:: images/010.php
-   :lines: 2-
 
 Flattening Images
 -----------------
@@ -199,7 +189,6 @@ The ``flatten()`` method aims to add a background color behind transparent image
 - **$blue** is the blue value of the background.
 
 .. literalinclude:: images/011.php
-   :lines: 2-
 
 Flipping Images
 ---------------
@@ -211,7 +200,6 @@ Images can be flipped along either their horizontal or vertical axis::
 - **$dir** specifies the axis to flip along. Can be either 'vertical' or 'horizontal'.
 
 .. literalinclude:: images/012.php
-   :lines: 2-
 
 Resizing Images
 ---------------
@@ -230,7 +218,6 @@ image to fit the desired dimensions. If $maintainRatio is true, the dimension sp
 while the other dimension will be altered to match the original image's aspect ratio.
 
 .. literalinclude:: images/013.php
-   :lines: 2-
 
 Rotating Images
 ---------------
@@ -259,7 +246,6 @@ The first parameter is the string of text that you wish to display. The second p
 that allow you to specify how the text should be displayed:
 
 .. literalinclude:: images/014.php
-   :lines: 2-
 
 The possible options that are recognized are as follows:
 
diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index 37163c1ec14d..9327d7b8cfc1 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -17,7 +17,6 @@ Like all services in CodeIgniter, it can be loaded via ``Config\Services``, thou
 to load it manually:
 
 .. literalinclude:: pagination/001.php
-   :lines: 2-
 
 ***************************
 Paginating Database Results
@@ -45,7 +44,6 @@ that and assign it to the ``$pager`` variable in the view.
 To define conditions for pagination in a model, you can:
 
 .. literalinclude:: pagination/003.php
-   :lines: 2-
 
 Within the view, we then need to tell it where to display the resulting links::
 
@@ -73,7 +71,6 @@ If you need to provide links from two different result sets, you can pass group
 methods to keep the data separate:
 
 .. literalinclude:: pagination/004.php
-   :lines: 2-
 
 Setting Page Manually
 =====================
@@ -82,7 +79,6 @@ If you need to specify which page of results to return you can specify the page
 handy when you have a different manner than the default ``$_GET`` varibable to control which page to show.
 
 .. literalinclude:: pagination/005.php
-   :lines: 2-
 
 Specifying the URI Segment for Page
 ===================================
@@ -92,7 +88,6 @@ segment number to use as the fourth argument. URIs generated by the pager would
 like **https://domain.tld/foo/bar/[pageNumber]** instead of **https://domain.tld/foo/bar?page=[pageNumber]**.
 
 .. literalinclude:: pagination/006.php
-   :lines: 2-
 
 Please note: ``$segment`` value cannot be greater than the number of URI segments plus 1.
 
@@ -125,7 +120,6 @@ Please note: ``$segment`` value cannot be greater than the number of URI segment
 If you in need to show many pagers on one page then additional parameter which will define a group could be helpful:
 
 .. literalinclude:: pagination/007.php
-   :lines: 2-
 
 Pagination library uses **page** query parameter for HTTP queries by default (if no group or ``default`` group name given) or ``page_[groupName]`` for custom group names.
 
@@ -137,12 +131,10 @@ By default, all GET queries are shown in the pagination links.
 For example, when accessing the URL **https://domain.tld?search=foo&order=asc&hello=i+am+here&page=2**, the page 3 link can be generated, along with the other links, as follows:
 
 .. literalinclude:: pagination/008.php
-   :lines: 2-
 
 The ``only()`` method allows you to limit this just to queries already expected:
 
 .. literalinclude:: pagination/009.php
-   :lines: 2-
 
 The *page* query is enabled by default. And ``only()`` acts in all pagination links.
 
@@ -157,7 +149,6 @@ When the links are rendered out to the page, they use a view file to describe th
 that is used by editing **app/Config/Pager.php**:
 
 .. literalinclude:: pagination/010.php
-   :lines: 2-
 
 This setting stores the alias and :doc:`namespaced view paths </outgoing/views>` for the view that
 should be used. The ``default_full`` and ``default_simple`` views are used for the ``links()`` and ``simpleLinks()``
@@ -180,7 +171,6 @@ replace the existing templates. You can create as many additional templates as y
 file. A common situation would be needing different styles for the frontend and the backend of your application.
 
 .. literalinclude:: pagination/011.php
-   :lines: 2-
 
 Once configured, you can specify it as a the last parameter in the ``links()``, ``simpleLinks()``, and ``makeLinks()``
 methods::
@@ -227,7 +217,6 @@ Returns an array of data about all of the numbered links. Each link's array cont
 title, which is just the number, and a boolean that tells whether the link is the current/active link or not:
 
 .. literalinclude:: pagination/013.php
-   :lines: 2-
 
 In the code presented for the standard pagination structure, the methods ``getPrevious()`` and ``getNext()`` are used to obtain the links to the previous and next pagination groups respectively.
 
diff --git a/user_guide_src/source/libraries/pagination/004.php b/user_guide_src/source/libraries/pagination/004.php
index a61b3c3bad2a..cd425a1026eb 100644
--- a/user_guide_src/source/libraries/pagination/004.php
+++ b/user_guide_src/source/libraries/pagination/004.php
@@ -15,6 +15,8 @@ public function index()
     echo view('users/index', $data);
 }
 
-// In the views:
+?>
+
+<!-- In your view file: -->
 <?= $pager->links('group1') ?>
 <?= $pager->simpleLinks('group2') ?>
diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
index ebe0716d2bcb..af683bc0afe2 100644
--- a/user_guide_src/source/libraries/publisher.rst
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -16,7 +16,6 @@ Because Publisher instances are specific to their source and destination this li
 through ``Services`` but should be instantiated or extended directly. E.g.:
 
 .. literalinclude:: publisher/001.php
-   :lines: 2-
 
 *****************
 Concept and Usage
@@ -40,20 +39,17 @@ On Demand
 Access ``Publisher`` directly by instantiating a new instance of the class:
 
 .. literalinclude:: publisher/002.php
-   :lines: 2-
 
 By default the source and destination will be set to ``ROOTPATH`` and ``FCPATH`` respectively, giving ``Publisher``
 easy access to take any file from your project and make it web-accessible. Alternatively you may pass a new source
 or source and destination into the constructor:
 
 .. literalinclude:: publisher/003.php
-   :lines: 2-
 
 Once all the files are staged use one of the output commands (**copy()** or **merge()**) to process the staged files
 to their destination(s):
 
 .. literalinclude:: publisher/004.php
-   :lines: 2-
 
 See the :ref:`reference` for a full description of available methods.
 
@@ -64,13 +60,11 @@ You may have regular publication tasks embedded as part of your application depl
 the powerful ``Autoloader`` to locate any child classes primed for publication:
 
 .. literalinclude:: publisher/005.php
-   :lines: 2-
 
 By default ``discover()`` will search for the "Publishers" directory across all namespaces, but you may specify a
 different directory and it will return any child classes found:
 
 .. literalinclude:: publisher/006.php
-   :lines: 2-
 
 Most of the time you will not need to handle your own discovery, just use the provided "publish" command::
 
@@ -113,7 +107,6 @@ coming from an external API? You can use ``addUri()`` in place of ``addPath()``
 resource and publish it out instead:
 
 .. literalinclude:: publisher/008.php
-   :lines: 2-
 
 Asset Dependencies Example
 ==========================
@@ -238,7 +231,6 @@ and ``getErrors()`` to troubleshoot failures.
 Be mindful of duplicate basename collisions, for example:
 
 .. literalinclude:: publisher/011.php
-   :lines: 2-
 
 **merge(bool $replace = true): bool**
 
@@ -252,4 +244,3 @@ affect other files in the destination. Returns success or failure, use ``getPubl
 Example:
 
 .. literalinclude:: publisher/012.php
-   :lines: 2-
diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index d3a2b6cc0785..7d69bc84ea2c 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -18,7 +18,6 @@ as it runs as a filter and has no manual interaction.
 If you find a case where you do need direct access though, you may load it through the Services file:
 
 .. literalinclude:: security/001.php
-   :lines: 2-
 
 .. _cross-site-request-forgery:
 
@@ -48,7 +47,6 @@ You can set to use the Session based CSRF protection by editing the following co
 **app/Config/Security.php**:
 
 .. literalinclude:: security/002.php
-   :lines: 2-
 
 Token Randomization
 -------------------
@@ -63,7 +61,6 @@ You can enable it by editing the following config parameter value in
 **app/Config/Security.php**:
 
 .. literalinclude:: security/003.php
-   :lines: 2-
 
 Token Regeneration
 ------------------
@@ -77,7 +74,6 @@ may alter this behavior by editing the following config parameter value in
 **app/Config/Security.php**:
 
 .. literalinclude:: security/004.php
-   :lines: 2-
 
 Redirection on Failure
 ----------------------
@@ -92,7 +88,6 @@ than simply crashing. This can be turned off by editing the following config par
 **app/Config/Security.php**:
 
 .. literalinclude:: security/005.php
-   :lines: 2-
 
 Even when the redirect value is ``true``, AJAX calls will not redirect, but will throw an error.
 
@@ -103,24 +98,20 @@ You can enable CSRF protection by altering your **app/Config/Filters.php**
 and enabling the `csrf` filter globally:
 
 .. literalinclude:: security/006.php
-   :lines: 2-
 
 Select URIs can be whitelisted from CSRF protection (for example API
 endpoints expecting externally POSTed content). You can add these URIs
 by adding them as exceptions in the filter:
 
 .. literalinclude:: security/007.php
-   :lines: 2-
 
 Regular expressions are also supported (case-insensitive):
 
 .. literalinclude:: security/008.php
-   :lines: 2-
 
 It is also possible to enable the CSRF filter only for specific methods:
 
 .. literalinclude:: security/009.php
-   :lines: 2-
 
 .. Warning:: If you use ``$methods`` filters, you should :ref:`disable auto-routing <use-defined-routes-only>`
     because auto-routing permits any HTTP method to access a controller.
@@ -183,4 +174,3 @@ If it is acceptable for the user input to include relative paths, e.g., **file/i
 the second optional parameter, ``$relativePath`` to ``true``.
 
 .. literalinclude:: security/010.php
-   :lines: 2-
diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
index 875c58e98c23..8dea63ab953f 100644
--- a/user_guide_src/source/libraries/sessions.rst
+++ b/user_guide_src/source/libraries/sessions.rst
@@ -24,7 +24,6 @@ class should be magically initialized.
 To access and initialize the session:
 
 .. literalinclude:: sessions/001.php
-   :lines: 2-
 
 The ``$config`` parameter is optional - your application configuration.
 If not provided, the services register will instantiate your default
@@ -39,7 +38,6 @@ configuration options. This version is a little friendlier to read,
 but does not take any configuration options.
 
 .. literalinclude:: sessions/003.php
-   :lines: 2-
 
 How do Sessions work?
 =====================
@@ -92,7 +90,6 @@ longer need it. So, what you need is to close the session for the
 current request after you no longer need it.
 
 .. literalinclude:: sessions/004.php
-   :lines: 2-
 
 What is Session Data?
 =====================
@@ -119,29 +116,24 @@ Any piece of information from the session array is available through the
 ``$_SESSION`` superglobal:
 
 .. literalinclude:: sessions/005.php
-   :lines: 2-
 
 Or through the conventional accessor method:
 
 .. literalinclude:: sessions/006.php
-   :lines: 2-
 
 Or through the magic getter:
 
 .. literalinclude:: sessions/007.php
-   :lines: 2-
 
 Or even through the session helper method:
 
 .. literalinclude:: sessions/008.php
-   :lines: 2-
 
 Where ``item`` is the array key corresponding to the item you wish to fetch.
 For example, to assign a previously stored 'name' item to the ``$name``
 variable, you will do this:
 
 .. literalinclude:: sessions/009.php
-   :lines: 2-
 
 .. note:: The ``get()`` method returns null if the item you are trying
     to access does not exist.
@@ -150,7 +142,6 @@ If you want to retrieve all of the existing userdata, you can simply
 omit the item key (magic getter only works for single property values):
 
 .. literalinclude:: sessions/010.php
-   :lines: 2-
 
 Adding Session Data
 ===================
@@ -168,30 +159,25 @@ but you can pass an array containing your new session data to the
 ``set()`` method:
 
 .. literalinclude:: sessions/011.php
-   :lines: 2-
 
 Where ``$array`` is an associative array containing your new data. Here's
 an example:
 
 .. literalinclude:: sessions/012.php
-   :lines: 2-
 
 If you want to add session data one value at a time, ``set()`` also
 supports this syntax:
 
 .. literalinclude:: sessions/013.php
-   :lines: 2-
 
 If you want to verify that a session value exists, simply check with
 ``isset()``:
 
 .. literalinclude:: sessions/014.php
-   :lines: 2-
 
 Or you can call ``has()``:
 
 .. literalinclude:: sessions/015.php
-   :lines: 2-
 
 Pushing new value to session data
 =================================
@@ -200,7 +186,6 @@ The push method is used to push a new value onto a session value that is an arra
 For instance, if the 'hobbies' key contains an array of hobbies, you can add a new value onto the array like so:
 
 .. literalinclude:: sessions/016.php
-   :lines: 2-
 
 Removing Session Data
 =====================
@@ -209,7 +194,6 @@ Just as with any other variable, unsetting a value in ``$_SESSION`` can be
 done through ``unset()``:
 
 .. literalinclude:: sessions/017.php
-   :lines: 2-
 
 Also, just as ``set()`` can be used to add information to a
 session, ``remove()`` can be used to remove it, by passing the
@@ -217,12 +201,10 @@ session key. For example, if you wanted to remove 'some_name' from your
 session data array:
 
 .. literalinclude:: sessions/018.php
-   :lines: 2-
 
 This method also accepts an array of item keys to unset:
 
 .. literalinclude:: sessions/019.php
-   :lines: 2-
 
 Flashdata
 =========
@@ -239,23 +221,19 @@ managed inside the CodeIgniter session handler.
 To mark an existing item as "flashdata":
 
 .. literalinclude:: sessions/020.php
-   :lines: 2-
 
 If you want to mark multiple items as flashdata, simply pass the keys as an
 array:
 
 .. literalinclude:: sessions/021.php
-   :lines: 2-
 
 To add flashdata:
 
 .. literalinclude:: sessions/022.php
-   :lines: 2-
 
 Or alternatively, using the ``setFlashdata()`` method:
 
 .. literalinclude:: sessions/023.php
-   :lines: 2-
 
 You can also pass an array to ``setFlashdata()``, in the same manner as
 ``set()``.
@@ -264,7 +242,6 @@ Reading flashdata variables is the same as reading regular session data
 through ``$_SESSION``:
 
 .. literalinclude:: sessions/024.php
-   :lines: 2-
 
 .. important:: The ``get()`` method WILL return flashdata items when
     retrieving a single item by key. It will not return flashdata when
@@ -274,12 +251,10 @@ However, if you want to be sure that you're reading "flashdata" (and not
 any other kind), you can also use the ``getFlashdata()`` method:
 
 .. literalinclude:: sessions/025.php
-   :lines: 2-
 
 Or to get an array with all flashdata, simply omit the key parameter:
 
 .. literalinclude:: sessions/026.php
-   :lines: 2-
 
 .. note:: The ``getFlashdata()`` method returns null if the item cannot be
     found.
@@ -289,7 +264,6 @@ additional request, you can do so using the ``keepFlashdata()`` method.
 You can either pass a single item or an array of flashdata items to keep.
 
 .. literalinclude:: sessions/027.php
-   :lines: 2-
 
 Tempdata
 ========
@@ -305,28 +279,23 @@ To mark an existing item as "tempdata", simply pass its key and expiry time
 (in seconds!) to the ``markAsTempdata()`` method:
 
 .. literalinclude:: sessions/028.php
-   :lines: 2-
 
 You can mark multiple items as tempdata in two ways, depending on whether
 you want them all to have the same expiry time or not:
 
 .. literalinclude:: sessions/029.php
-   :lines: 2-
 
 To add tempdata:
 
 .. literalinclude:: sessions/030.php
-   :lines: 2-
 
 Or alternatively, using the ``setTempdata()`` method:
 
 .. literalinclude:: sessions/031.php
-   :lines: 2-
 
 You can also pass an array to ``setTempdata()``:
 
 .. literalinclude:: sessions/032.php
-   :lines: 2-
 
 .. note:: If the expiration is omitted or set to 0, the default
     time-to-live value of 300 seconds (or 5 minutes) will be used.
@@ -335,7 +304,6 @@ To read a tempdata variable, again you can just access it through the
 ``$_SESSION`` superglobal array:
 
 .. literalinclude:: sessions/033.php
-   :lines: 2-
 
 .. important:: The ``get()`` method WILL return tempdata items when
     retrieving a single item by key. It will not return tempdata when
@@ -345,12 +313,10 @@ Or if you want to be sure that you're reading "tempdata" (and not any
 other kind), you can also use the ``getTempdata()`` method:
 
 .. literalinclude:: sessions/034.php
-   :lines: 2-
 
 And of course, if you want to retrieve all existing tempdata:
 
 .. literalinclude:: sessions/035.php
-   :lines: 2-
 
 .. note:: The ``getTempdata()`` method returns null if the item cannot be
     found.
@@ -359,7 +325,6 @@ If you need to remove a tempdata value before it expires, you can directly
 unset it from the ``$_SESSION`` array:
 
 .. literalinclude:: sessions/036.php
-   :lines: 2-
 
 However, this won't remove the marker that makes this specific item to be
 tempdata (it will be invalidated on the next HTTP request), so if you
@@ -367,7 +332,6 @@ intend to reuse that same key in the same request, you'd want to use
 ``removeTempdata()``:
 
 .. literalinclude:: sessions/037.php
-   :lines: 2-
 
 Destroying a Session
 ====================
@@ -378,7 +342,6 @@ function, or the library's ``destroy()`` method. Both will work in exactly the
 same way:
 
 .. literalinclude:: sessions/038.php
-   :lines: 2-
 
 .. note:: This must be the last session-related operation that you do
     during the same request. All session data (including flashdata and
@@ -390,7 +353,6 @@ by removing the old session_id, destroying all data, and destroying
 the cookie that contained the session id:
 
 .. literalinclude:: sessions/039.php
-   :lines: 2-
 
 Accessing session metadata
 ==========================
@@ -566,7 +528,6 @@ For example, if you would like to use 'ci_sessions' as your table name,
 you would do this:
 
 .. literalinclude:: sessions/040.php
-   :lines: 2-
 
 And then of course, create the database table ...
 
@@ -607,7 +568,6 @@ You can choose the Database group to use by adding a new line to the
 **app/Config/App.php** file with the name of the group to use:
 
 .. literalinclude:: sessions/041.php
-   :lines: 2-
 
 If you'd rather not do all of this by hand, you can use the ``session:migration`` command
 from the cli to generate a migration file for you::
@@ -661,7 +621,6 @@ For the most common case however, a simple ``host:port`` pair should be
 sufficient:
 
 .. literalinclude:: sessions/042.php
-   :lines: 2-
 
 MemcachedHandler Driver
 =======================
@@ -689,7 +648,6 @@ The ``$sessionSavePath`` format is fairly straightforward here,
 being just a ``host:port`` pair:
 
 .. literalinclude:: sessions/043.php
-   :lines: 2-
 
 Bonus Tip
 ---------
@@ -702,4 +660,3 @@ If you want to experiment with this feature (on your own risk), simply
 separate the multiple server paths with commas:
 
 .. literalinclude:: sessions/044.php
-   :lines: 2-
diff --git a/user_guide_src/source/libraries/throttler.rst b/user_guide_src/source/libraries/throttler.rst
index 21583d817d54..df0dfeb29d37 100644
--- a/user_guide_src/source/libraries/throttler.rst
+++ b/user_guide_src/source/libraries/throttler.rst
@@ -25,7 +25,6 @@ The first parameter is the bucket name, the second parameter the number of token
 the third being the amount of time it takes the bucket to refill:
 
 .. literalinclude:: throttler/001.php
-   :lines: 2-
 
 Here we're using one of the :doc:`global constants </general/common_functions>` for the time, to make it a little
 more readable. This says that the bucket allows 60 actions every minute, or 1 action every second.
@@ -69,12 +68,10 @@ this to incoming requests, you need to edit **/app/Config/Filters.php** and firs
 filter:
 
 .. literalinclude:: throttler/003.php
-   :lines: 2-
 
 Next, we assign it to all POST requests made on the site:
 
 .. literalinclude:: throttler/004.php
-   :lines: 2-
 
 .. Warning:: If you use ``$methods`` filters, you should :ref:`disable auto-routing <use-defined-routes-only>`
     because auto-routing permits any HTTP method to access a controller.
diff --git a/user_guide_src/source/libraries/time.rst b/user_guide_src/source/libraries/time.rst
index 0c3b8fb59280..6183b4c5f1a8 100644
--- a/user_guide_src/source/libraries/time.rst
+++ b/user_guide_src/source/libraries/time.rst
@@ -22,7 +22,6 @@ like any other class. When you do it this way, you can pass in a string represen
 be any string that PHP's strtotime function can parse:
 
 .. literalinclude:: time/001.php
-   :lines: 2-
 
 You can pass in strings representing the timezone and the locale in the second and parameters, respectively. Timezones
 can be any supported by PHP's `DateTimeZone <https://www.php.net/manual/en/timezones.php>`__ class. The locale can be
@@ -30,7 +29,6 @@ any supported by PHP's `Locale <https://www.php.net/manual/en/class.locale.php>`
 provided, the application defaults will be used.
 
 .. literalinclude:: time/002.php
-   :lines: 2-
 
 now()
 -----
@@ -40,7 +38,6 @@ that returns a new instance set to the current time. You can pass in strings rep
 in the second and parameters, respectively. If no locale or timezone is provided, the application defaults will be used.
 
 .. literalinclude:: time/003.php
-   :lines: 2-
 
 parse()
 -------
@@ -49,7 +46,6 @@ This helper method is a static version of the default constructor. It takes a st
 constructor as the first parameter, a timezone as the second parameter, and the locale as the third parameter:
 
 .. literalinclude:: time/004.php
-   :lines: 2-
 
 today()
 -------
@@ -58,7 +54,6 @@ Returns a new instance with the date set to the current date, and the time set t
 for the timezone and locale in the first and second parameters:
 
 .. literalinclude:: time/005.php
-   :lines: 2-
 
 yesterday()
 -----------
@@ -67,7 +62,6 @@ Returns a new instance with the date set to the yesterday's date and the time se
 for the timezone and locale in the first and second parameters:
 
 .. literalinclude:: time/006.php
-   :lines: 2-
 
 tomorrow()
 -----------
@@ -76,7 +70,6 @@ Returns a new instance with the date set to tomorrow's date and the time set to
 for the timezone and locale in the first and second parameters:
 
 .. literalinclude:: time/007.php
-   :lines: 2-
 
 createFromDate()
 ----------------
@@ -86,7 +79,6 @@ are not provided, it will use the current value to fill it in. Accepts strings f
 fourth and fifth parameters:
 
 .. literalinclude:: time/008.php
-   :lines: 2-
 
 createFromTime()
 ----------------
@@ -96,7 +88,6 @@ current day for the date portion of the Time instance. Accepts strings for the t
 fourth and fifth parameters:
 
 .. literalinclude:: time/009.php
-   :lines: 2-
 
 create()
 --------
@@ -106,7 +97,6 @@ as separate parameters. Any value not provided will use the current date and tim
 timezone and locale in the fourth and fifth parameters:
 
 .. literalinclude:: time/010.php
-   :lines: 2-
 
 createFromFormat()
 ------------------
@@ -115,7 +105,6 @@ This is a replacement for DateTime's method of the same name. This allows the ti
 and returns a ``Time`` instance, instead of DateTime:
 
 .. literalinclude:: time/011.php
-   :lines: 2-
 
 createFromTimestamp()
 ---------------------
@@ -123,7 +112,6 @@ createFromTimestamp()
 This method takes a UNIX timestamp and, optionally, the timezone and locale, to create a new Time instance:
 
 .. literalinclude:: time/012.php
-   :lines: 2-
 
 createFromInstance()
 --------------------
@@ -133,7 +121,6 @@ to a Time instance, optionally setting the locale. The timezone will be automati
 instance passed in:
 
 .. literalinclude:: time/013.php
-   :lines: 2-
 
 toDateTime()
 ------------
@@ -143,7 +130,6 @@ instance into a DateTime instance. This preserves the timezone setting, but lose
 not aware of locales:
 
 .. literalinclude:: time/014.php
-   :lines: 2-
 
 ====================
 Displaying the Value
@@ -161,7 +147,6 @@ you must use values acceptable to the `IntlDateFormatter <https://www.php.net/ma
 A full listing of values can be found `here <https://unicode-org.github.io/icu-docs/apidoc/released/icu4c/classSimpleDateFormat.html#details>`__.
 
 .. literalinclude:: time/015.php
-   :lines: 2-
 
 toDateTimeString()
 ------------------
@@ -170,7 +155,6 @@ This is the first of three helper methods to work with the IntlDateFormatter wit
 This will return a string formatted as you would commonly use for datetime columns in a database (Y-m-d H:i:s):
 
 .. literalinclude:: time/016.php
-   :lines: 2-
 
 toDateString()
 --------------
@@ -178,7 +162,6 @@ toDateString()
 Displays just the date portion of the Time:
 
 .. literalinclude:: time/017.php
-   :lines: 2-
 
 toTimeString()
 --------------
@@ -186,7 +169,6 @@ toTimeString()
 Displays just the time portion of the value:
 
 .. literalinclude:: time/018.php
-   :lines: 2-
 
 humanize()
 ----------
@@ -196,7 +178,6 @@ human readable format that is geared towards being easily understood. It can cre
 'in 1 month', etc:
 
 .. literalinclude:: time/019.php
-   :lines: 2-
 
 The exact time displayed is determined in the following manner:
 
@@ -232,12 +213,10 @@ Getters
 The following basic getters exist:
 
 .. literalinclude:: time/020.php
-   :lines: 2-
 
 In addition to these, a number of methods exist to provide additional information about the date:
 
 .. literalinclude:: time/021.php
-   :lines: 2-
 
 getAge()
 --------
@@ -246,7 +225,6 @@ Returns the age, in years, of between the Time's instance and the current time.
 the age of someone based on their birthday:
 
 .. literalinclude:: time/022.php
-   :lines: 2-
 
 getDST()
 --------
@@ -254,7 +232,6 @@ getDST()
 Returns boolean true/false based on whether the Time instance is currently observing Daylight Savings Time:
 
 .. literalinclude:: time/023.php
-   :lines: 2-
 
 getLocal()
 ----------
@@ -262,7 +239,6 @@ getLocal()
 Returns boolean true if the Time instance is in the same timezone as the application is currently running in:
 
 .. literalinclude:: time/024.php
-   :lines: 2-
 
 getUtc()
 --------
@@ -270,7 +246,6 @@ getUtc()
 Returns boolean true if the Time instance is in UTC time:
 
 .. literalinclude:: time/025.php
-   :lines: 2-
 
 getTimezone()
 -------------
@@ -279,7 +254,6 @@ Returns a new `DateTimeZone <https://www.php.net/manual/en/class.datetimezone.ph
 instance:
 
 .. literalinclude:: time/026.php
-   :lines: 2-
 
 getTimezoneName()
 -----------------
@@ -287,7 +261,6 @@ getTimezoneName()
 Returns the full `timezone string <https://www.php.net/manual/en/timezones.php>`__ of the Time instance:
 
 .. literalinclude:: time/027.php
-   :lines: 2-
 
 Setters
 =======
@@ -300,7 +273,6 @@ thrown.
 .. note:: All setters will throw an InvalidArgumentException if the value is out of range.
 
 .. literalinclude:: time/028.php
-   :lines: 2-
 
 setTimezone()
 -------------
@@ -308,7 +280,6 @@ setTimezone()
 Converts the time from it's current timezone into the new one:
 
 .. literalinclude:: time/029.php
-   :lines: 2-
 
 setTimestamp()
 --------------
@@ -316,7 +287,6 @@ setTimestamp()
 Returns a new instance with the date set to the new timestamp:
 
 .. literalinclude:: time/030.php
-   :lines: 2-
 
 Modifying the Value
 ===================
@@ -325,7 +295,6 @@ The following methods allow you to modify the date by adding or subtracting valu
 modify the existing Time instance, but will return a new instance.
 
 .. literalinclude:: time/031.php
-   :lines: 2-
 
 Comparing Two Times
 ===================
@@ -341,14 +310,12 @@ same moment in time, and are not required to be in the same timezone, as both ti
 that way:
 
 .. literalinclude:: time/032.php
-   :lines: 2-
 
 The value being tested against can be a Time instance, a DateTime instance, or a string with the full date time in
 a manner that a new DateTime instance can understand. When passing a string as the first parameter, you can pass
 a timezone string in as the second parameter. If no timezone is given, the system default will be used:
 
 .. literalinclude:: time/033.php
-   :lines: 2-
 
 sameAs()
 --------
@@ -357,7 +324,6 @@ This is identical to the ``equals()`` method, except that it only returns true w
 all identical:
 
 .. literalinclude:: time/034.php
-   :lines: 2-
 
 isBefore()
 ----------
@@ -366,14 +332,12 @@ Checks if the passed in time is before the current instance. The comparison is d
 both times:
 
 .. literalinclude:: time/035.php
-   :lines: 2-
 
 The value being tested against can be a Time instance, a DateTime instance, or a string with the full date time in
 a manner that a new DateTime instance can understand. When passing a string as the first parameter, you can pass
 a timezone string in as the second parameter. If no timezone is given, the system default will be used:
 
 .. literalinclude:: time/036.php
-   :lines: 2-
 
 isAfter()
 ---------
@@ -381,7 +345,6 @@ isAfter()
 Works exactly the same as ``isBefore()`` except checks if the time is after the time passed in:
 
 .. literalinclude:: time/037.php
-   :lines: 2-
 
 Viewing Differences
 ===================
@@ -391,19 +354,16 @@ instance. The first parameter is either a Time instance, a DateTime instance, or
 a string is passed in the first parameter, the second parameter can be a timezone string:
 
 .. literalinclude:: time/038.php
-   :lines: 2-
 
 Once you have the TimeDifference instance, you have several methods you can use to find information about the difference
 between the two times. The value returned will be negative if it was in the past, or positive if in the future from
 the original time:
 
 .. literalinclude:: time/039.php
-   :lines: 2-
 
 You can use either ``getX()`` methods, or access the calculate values as if they were properties:
 
 .. literalinclude:: time/040.php
-   :lines: 2-
 
 humanize()
 ----------
@@ -413,7 +373,6 @@ human readable format that is geared towards being easily understood. It can cre
 'in 1 month', etc. The biggest differences are in how very recent dates are handled:
 
 .. literalinclude:: time/041.php
-   :lines: 2-
 
 The exact time displayed is determined in the following manner:
 
diff --git a/user_guide_src/source/libraries/typography.rst b/user_guide_src/source/libraries/typography.rst
index adbb868ae902..111287d0c366 100644
--- a/user_guide_src/source/libraries/typography.rst
+++ b/user_guide_src/source/libraries/typography.rst
@@ -17,7 +17,6 @@ Like all services in CodeIgniter, it can be loaded via ``Config\Services``, thou
 to load it manually:
 
 .. literalinclude:: typography/001.php
-   :lines: 2-
 
 **************************
 Available static functions
@@ -38,7 +37,6 @@ The following functions are available:
     Usage example:
 
     .. literalinclude:: typography/002.php
-       :lines: 2-
 
     .. note:: Typographic formatting can be processor intensive, particularly if
         you have a lot of content being formatted. If you choose to use this
@@ -58,7 +56,6 @@ The following functions are available:
     Usage example:
 
     .. literalinclude:: typography/003.php
-       :lines: 2-
 
 .. php:function:: nl2brExceptPre($str)
 
@@ -73,4 +70,3 @@ The following functions are available:
     Usage example:
 
     .. literalinclude:: typography/004.php
-       :lines: 2-
diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index da542febb90d..b1a19d3e202c 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -115,7 +115,6 @@ Files are accessed through the current ``IncomingRequest`` instance. To retrieve
 request, use ``getFiles()``. This will return an array of files represented by instances of ``CodeIgniter\HTTP\Files\UploadedFile``:
 
 .. literalinclude:: uploaded_files/003.php
-   :lines: 2-
 
 Of course, there are multiple ways to name the file input, and anything but the simplest can create strange results.
 The array returns in a manner that you would expect. With the simplest usage, a single file might be submitted like::
@@ -178,7 +177,6 @@ With the simplest usage, a single file might be submitted like::
 Which would return a simple file instance like:
 
 .. literalinclude:: uploaded_files/007.php
-   :lines: 2-
 
 Array notation
 --------------
@@ -190,7 +188,6 @@ If you used an array notation for the name, the input would look something like:
 For get the file instance:
 
 .. literalinclude:: uploaded_files/008.php
-   :lines: 2-
 
 Multiple files
 ==============
@@ -202,7 +199,6 @@ Multiple files
 In controller:
 
 .. literalinclude:: uploaded_files/009.php
-   :lines: 2-
 
 where the ``images`` is a loop from the form field name.
 
@@ -211,12 +207,10 @@ If there are multiple files with the same name you can use ``getFile()`` to retr
 In controller:
 
 .. literalinclude:: uploaded_files/010.php
-   :lines: 2-
 
 You might find it easier to use ``getFileMultiple()``, to get an array of uploaded files with the same name:
 
 .. literalinclude:: uploaded_files/011.php
-   :lines: 2-
 
 Another example::
 
@@ -226,7 +220,6 @@ Another example::
 In controller:
 
 .. literalinclude:: uploaded_files/012.php
-   :lines: 2-
 
 .. note:: Using ``getFiles()`` is more appropriate.
 
@@ -245,7 +238,6 @@ Verify a File
 You can check that a file was actually uploaded via HTTP with no errors by calling the ``isValid()`` method:
 
 .. literalinclude:: uploaded_files/013.php
-   :lines: 2-
 
 As seen in this example, if a file had an upload error, you can retrieve the error code (an integer) and the error
 message with the ``getError()`` and ``getErrorString()`` methods. The following errors can be discovered through
@@ -269,21 +261,18 @@ filename sent by the client, and should not be trusted. If the file has been mov
 the moved file:
 
 .. literalinclude:: uploaded_files/014.php
-   :lines: 2-
 
 **getClientName()**
 
 Always returns the original name of the uploaded file as sent by the client, even if the file has been moved:
 
 .. literalinclude:: uploaded_files/015.php
-   :lines: 2-
 
 **getTempName()**
 
 To get the full path of the temp file that was created during the upload, you can use the ``getTempName()`` method:
 
 .. literalinclude:: uploaded_files/016.php
-   :lines: 2-
 
 Other File Info
 ===============
@@ -293,7 +282,6 @@ Other File Info
 Returns the original file extension, based on the file name that was uploaded:
 
 .. literalinclude:: uploaded_files/017.php
-   :lines: 2-
 
 .. warning:: This is NOT a trusted source. For a trusted version, use ``guessExtension()`` instead.
 
@@ -303,7 +291,6 @@ Returns the mime type (mime type) of the file as provided by the client. This is
 version, use ``getMimeType()`` instead:
 
 .. literalinclude:: uploaded_files/018.php
-   :lines: 2-
 
 Moving Files
 ============
@@ -312,18 +299,15 @@ Each file can be moved to its new location with the aptly named ``move()`` metho
 the file to as the first parameter:
 
 .. literalinclude:: uploaded_files/019.php
-   :lines: 2-
 
 By default, the original filename was used. You can specify a new filename by passing it as the second parameter:
 
 .. literalinclude:: uploaded_files/020.php
-   :lines: 2-
 
 Once the file has been removed the temporary file is deleted. You can check if a file has been moved already with
 the ``hasMoved()`` method, which returns a boolean:
 
 .. literalinclude:: uploaded_files/021.php
-   :lines: 2-
 
 Moving an uploaded file can fail, with an HTTPException, under several circumstances:
 
@@ -344,13 +328,11 @@ By default, upload files are saved in **writable/uploads** directory. The **YYYY
 and random file name will be created. Returns a file path:
 
 .. literalinclude:: uploaded_files/022.php
-   :lines: 2-
 
 You can specify a directory to move the file to as the first parameter. A new filename by
 passing it as the second parameter:
 
 .. literalinclude:: uploaded_files/023.php
-   :lines: 2-
 
 Moving an uploaded file can fail, with an ``HTTPException``, under several circumstances:
 
diff --git a/user_guide_src/source/libraries/uri.rst b/user_guide_src/source/libraries/uri.rst
index 25e7c92566b0..8dbd53cacbdb 100644
--- a/user_guide_src/source/libraries/uri.rst
+++ b/user_guide_src/source/libraries/uri.rst
@@ -17,18 +17,15 @@ Creating URI instances
 Creating a URI instance is as simple as creating a new class instance:
 
 .. literalinclude:: uri/001.php
-   :lines: 2-
 
 Alternatively, you can use the ``service()`` function to return an instance for you:
 
 .. literalinclude:: uri/002.php
-   :lines: 2-
 
 When you create the new instance, you can pass a full or partial URL in the constructor and it will be parsed
 into its appropriate sections:
 
 .. literalinclude:: uri/003.php
-   :lines: 2-
 
 The Current URI
 ---------------
@@ -37,7 +34,6 @@ Many times, all you really want is an object representing the current URL of thi
 You can use one of the functions available in the **url_helper**:
 
 .. literalinclude:: uri/004.php
-   :lines: 2-
 
 You must pass ``true`` as the first parameter, otherwise, it will return the string representation of the current URL.
 This URI is based on the path (relative to your ``baseURL``) as determined by the current request object and
@@ -45,7 +41,6 @@ your settings in ``Config\App`` (baseURL, indexPage, and forceGlobalSecureReques
 Assuming that you're in a controller that extends ``CodeIgniter\Controller`` you can get this relative path:
 
 .. literalinclude:: uri/005.php
-   :lines: 2-
 
 ===========
 URI Strings
@@ -55,13 +50,11 @@ Many times, all you really want is to get a string representation of a URI. This
 the URI as a string:
 
 .. literalinclude:: uri/006.php
-   :lines: 2-
 
 If you know the pieces of the URI and just want to ensure it's all formatted correctly, you can generate a string
 using the URI class' static ``createURIString()`` method:
 
 .. literalinclude:: uri/007.php
-   :lines: 2-
 
 .. important:: When ``URI`` is cast to a string, it will attempt to adjust project URLs to the
     settings defined in ``Config\App``. If you need the exact, unaltered string representation
@@ -80,7 +73,6 @@ Scheme
 The scheme is frequently 'http' or 'https', but any scheme is supported, including 'file', 'mailto', etc.
 
 .. literalinclude:: uri/008.php
-   :lines: 2-
 
 Authority
 ---------
@@ -90,19 +82,16 @@ the host and the port number. You can retrieve all of these pieces as one single
 method, or you can manipulate the individual parts.
 
 .. literalinclude:: uri/009.php
-   :lines: 2-
 
 By default, this will not display the password portion since you wouldn't want to show that to anyone. If you want
 to show the password, you can use the ``showPassword()`` method. This URI instance will continue to show that password
 until you turn it off again, so always make sure that you turn it off as soon as you are finished with it:
 
 .. literalinclude:: uri/010.php
-   :lines: 2-
 
 If you do not want to display the port, pass in ``true`` as the only parameter:
 
 .. literalinclude:: uri/011.php
-   :lines: 2-
 
 .. note:: If the current port is the default port for the scheme it will never be displayed.
 
@@ -113,12 +102,10 @@ The userinfo section is simply the username and password that you might see with
 this as part of the Authority, you can also retrieve it yourself:
 
 .. literalinclude:: uri/012.php
-   :lines: 2-
 
 By default, it will not display the password, but you can override that with the ``showPassword()`` method:
 
 .. literalinclude:: uri/013.php
-   :lines: 2-
 
 Host
 ----
@@ -127,7 +114,6 @@ The host portion of the URI is typically the domain name of the URL. This can be
 ``getHost()`` and ``setHost()`` methods:
 
 .. literalinclude:: uri/014.php
-   :lines: 2-
 
 Port
 ----
@@ -135,7 +121,6 @@ Port
 The port is an integer number between 0 and 65535. Each sheme has a default value associated with it.
 
 .. literalinclude:: uri/015.php
-   :lines: 2-
 
 When using the ``setPort()`` method, the port will be checked that it is within the valid range and assigned.
 
@@ -146,7 +131,6 @@ The path are all of the segments within the site itself. As expected, the ``getP
 can be used to manipulate it:
 
 .. literalinclude:: uri/016.php
-   :lines: 2-
 
 .. note:: When setting the path this way, or any other way the class allows, it is sanitized to encode any dangerous
     characters, and remove dot segments for safety.
@@ -158,21 +142,18 @@ The query variables can be manipulated through the class using simple string rep
 be set as a string currently.
 
 .. literalinclude:: uri/017.php
-   :lines: 2-
 
 .. note:: Query values cannot contain fragments. An InvalidArgumentException will be thrown if it does.
 
 You can set query values using an array:
 
 .. literalinclude:: uri/018.php
-   :lines: 2-
 
 The ``setQuery()`` and ``setQueryArray()`` methods overwrite any existing query variables. You can add a value to the
 query variables collection without destroying the existing query variables with the ``addQuery()`` method. The first
 parameter is the name of the variable, and the second parameter is the value:
 
 .. literalinclude:: uri/019.php
-   :lines: 2-
 
 **Filtering Query Values**
 
@@ -180,13 +161,11 @@ You can filter the query values returned by passing an options array to the ``ge
 *only* or an *except* key:
 
 .. literalinclude:: uri/020.php
-   :lines: 2-
 
 This only changes the values returned during this one call. If you need to modify the URI's query values more permanently,
 you can use the ``stripQuery()`` and ``keepQuery()`` methods to change the actual object's query variable collection:
 
 .. literalinclude:: uri/021.php
-   :lines: 2-
 
 .. note:: By default ``setQuery()`` and ``setQueryArray()`` methods uses native ``parse_str()`` function to prepare data.
     If you want to use more liberal rules (which allow key names to contain dots), you can use a special method
@@ -199,7 +178,6 @@ Fragments are the portion at the end of the URL, preceded by the pound-sign (#).
 to an on-page anchor. Media URI's can make use of them in various other ways.
 
 .. literalinclude:: uri/022.php
-   :lines: 2-
 
 ============
 URI Segments
@@ -209,22 +187,18 @@ Each section of the path between the slashes is a single segment. The URI class
 what the values of the segments are. The segments start at 1 being the furthest left of the path.
 
 .. literalinclude:: uri/023.php
-   :lines: 2-
 
 You can also set a different default value for a particular segment by using the second parameter of the ``getSegment()`` method. The default is empty string.
 
 .. literalinclude:: uri/024.php
-   :lines: 2-
 
 You can get a count of the total segments:
 
 .. literalinclude:: uri/025.php
-   :lines: 2-
 
 Finally, you can retrieve an array of all of the segments:
 
 .. literalinclude:: uri/026.php
-   :lines: 2-
 
 ===========================
 Disable Throwing Exceptions
@@ -234,4 +208,3 @@ By default, some methods of this class may throw an exception. If you want to di
 that will prevent throwing exceptions.
 
 .. literalinclude:: uri/027.php
-   :lines: 2-
diff --git a/user_guide_src/source/libraries/user_agent.rst b/user_guide_src/source/libraries/user_agent.rst
index fad24a91d403..20520a57429b 100644
--- a/user_guide_src/source/libraries/user_agent.rst
+++ b/user_guide_src/source/libraries/user_agent.rst
@@ -21,7 +21,6 @@ By default, you will have a request instance in your controller that you can ret
 User Agent class from:
 
 .. literalinclude:: user_agent/001.php
-   :lines: 2-
 
 User Agent Definitions
 ======================
@@ -39,7 +38,6 @@ device, or a robot. It will also gather the platform information if it
 is available:
 
 .. literalinclude:: user_agent/002.php
-   :lines: 2-
 
 ***************
 Class Reference
@@ -56,7 +54,6 @@ Class Reference
         Returns true/false (boolean) if the user agent is a known web browser.
 
         .. literalinclude:: user_agent/003.php
-           :lines: 2-
 
         .. note:: The string "Safari" in this example is an array key in the list of browser definitions.
                   You can find this list in **app/Config/UserAgents.php** if you want to add new
@@ -71,7 +68,6 @@ Class Reference
         Returns true/false (boolean) if the user agent is a known mobile device.
 
         .. literalinclude:: user_agent/004.php
-           :lines: 2-
 
     .. php:method:: isRobot([$key = null])
 
@@ -136,7 +132,6 @@ Class Reference
         The referrer, if the user agent was referred from another site. Typically you'll test for this as follows:
 
         .. literalinclude:: user_agent/005.php
-           :lines: 2-
 
     .. php:method:: getAgentString()
 
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 664aefb96661..1d2c8490d339 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -171,7 +171,6 @@ Add Validation Rules
 Then add validation rules in the controller (**Form.php**):
 
 .. literalinclude:: validation/002.php
-   :lines: 2-
 
 If you submit the form you should see the success page or the form with error messages.
 
@@ -205,7 +204,6 @@ Using Strict Rules
 If you want to use these rules, you need to change the rule classes in **app/Config/Validation.php**:
 
 .. literalinclude:: validation/003.php
-   :lines: 2-
 
 Loading the Library
 ************************************************
@@ -213,7 +211,6 @@ Loading the Library
 The library is loaded as a service named **validation**:
 
 .. literalinclude:: validation/004.php
-   :lines: 2-
 
 This automatically loads the ``Config\Validation`` file which contains settings
 for including multiple Rulesets, and collections of rules that can be easily reused.
@@ -239,7 +236,6 @@ This method sets a single rule. It has the method signature::
 The ``$rules`` either takes in a pipe-delimited list of rules or an array collection of rules:
 
 .. literalinclude:: validation/005.php
-   :lines: 2-
 
 The value you pass to ``$field`` must match the key of any data array that is sent in. If
 the data is taken directly from ``$_POST``, then it must be an exact match for
@@ -256,12 +252,10 @@ setRules()
 Like ``setRule()``, but accepts an array of field names and their rules:
 
 .. literalinclude:: validation/006.php
-   :lines: 2-
 
 To give a labeled error message you can set up as:
 
 .. literalinclude:: validation/007.php
-   :lines: 2-
 
 withRequest()
 =============
@@ -272,7 +266,6 @@ current Request object and it will take all of the input data and set it as the
 data to be validated:
 
 .. literalinclude:: validation/008.php
-   :lines: 2-
 
 Working with Validation
 ************************************************
@@ -284,18 +277,15 @@ If your data is in a nested associative array, you can use "dot array syntax" to
 easily validate your data:
 
 .. literalinclude:: validation/009.php
-   :lines: 2-
 
 You can use the '*' wildcard symbol to match any one level of the array:
 
 .. literalinclude:: validation/010.php
-   :lines: 2-
 
 "dot array syntax" can also be useful when you have single dimension array data.
 For example, data returned by multi select dropdown:
 
 .. literalinclude:: validation/011.php
-   :lines: 2-
 
 Validate 1 Value
 ================================================
@@ -303,7 +293,6 @@ Validate 1 Value
 Validate one value against a rule:
 
 .. literalinclude:: validation/012.php
-   :lines: 2-
 
 Saving Sets of Validation Rules to the Config File
 =======================================================
@@ -323,24 +312,20 @@ class with the name of your group. This element will hold an array with your val
 rules. As shown earlier, the validation array will have this prototype:
 
 .. literalinclude:: validation/013.php
-   :lines: 2-
 
 You can specify the group to use when you call the ``run()`` method:
 
 .. literalinclude:: validation/014.php
-   :lines: 2-
 
 You can also store custom error messages in this configuration file by naming the
 property the same as the group, and appended with ``_errors``. These will automatically
 be used for any errors when this group is used:
 
 .. literalinclude:: validation/015.php
-   :lines: 2-
 
 Or pass all settings in an array:
 
 .. literalinclude:: validation/016.php
-   :lines: 2-
 
 See below for details on the formatting of the array.
 
@@ -352,14 +337,12 @@ Getting & Setting Rule Groups
 This method gets a rule group from the validation configuration:
 
 .. literalinclude:: validation/017.php
-   :lines: 2-
 
 **Set Rule Group**
 
 This method sets a rule group from the validation configuration to the validation service:
 
 .. literalinclude:: validation/018.php
-   :lines: 2-
 
 Running Multiple Validations
 =======================================================
@@ -374,7 +357,6 @@ errors from previous run. Be aware that ``reset()`` will invalidate any data, ru
 you previously set, so ``setRules()``, ``setRuleGroup()`` etc. need to be repeated:
 
 .. literalinclude:: validation/019.php
-   :lines: 2-
 
 Validation Placeholders
 =======================================================
@@ -385,18 +367,15 @@ the name of the field (or array key) that was passed in as ``$data`` surrounded
 replaced by the **value** of the matched incoming field. An example should clarify this:
 
 .. literalinclude:: validation/020.php
-   :lines: 2-
 
 In this set of rules, it states that the email address should be unique in the database, except for the row
 that has an id matching the placeholder's value. Assuming that the form POST data had the following:
 
 .. literalinclude:: validation/021.php
-   :lines: 2-
 
 then the ``{id}`` placeholder would be replaced with the number **4**, giving this revised rule:
 
 .. literalinclude:: validation/022.php
-   :lines: 2-
 
 So it will ignore the row in the database that has ``id=4`` when it verifies the email is unique.
 
@@ -427,12 +406,10 @@ These are two ways to provide custom error messages.
 As the last parameter:
 
 .. literalinclude:: validation/023.php
-   :lines: 2-
 
 Or as a labeled style:
 
 .. literalinclude:: validation/024.php
-   :lines: 2-
 
 If you'd like to include a field's "human" name, or the optional parameter some rules allow for (such as max_length),
 or the value that was validated you can add the ``{field}``, ``{param}`` and ``{value}`` tags to your message, respectively:
@@ -454,7 +431,6 @@ Let's say we have a file with translations located here: ``app/Languages/en/Rule
 We can simply use the language lines defined in this file, like this:
 
 .. literalinclude:: validation/025.php
-   :lines: 2-
 
 .. _validation-getting-all-errors:
 
@@ -464,7 +440,6 @@ Getting All Errors
 If you need to retrieve all error messages for failed fields, you can use the ``getErrors()`` method:
 
 .. literalinclude:: validation/026.php
-   :lines: 2-
 
 If no errors exist, an empty array will be returned.
 
@@ -495,7 +470,6 @@ You can retrieve the error for a single field with the ``getError()`` method. Th
 name:
 
 .. literalinclude:: validation/027.php
-   :lines: 2-
 
 If no error exists, an empty string will be returned.
 
@@ -507,12 +481,10 @@ Check If Error Exists
 You can check to see if an error exists with the ``hasError()`` method. The only parameter is the field name:
 
 .. literalinclude:: validation/028.php
-   :lines: 2-
 
 When specifying a field with a wildcard, all errors matching the mask will be checked:
 
 .. literalinclude:: validation/028.2.php
-   :lines: 2-
 
 Customizing Error Display
 *************************
@@ -534,7 +506,6 @@ An array named ``$errors`` is available within the view that contains a list of
 the name of the field that had the error, and the value is the error message, like this:
 
 .. literalinclude:: validation/030.php
-   :lines: 2-
 
 There are actually two types of views that you can create. The first has an array of all of the errors, and is what
 we just looked at. The other type is simpler, and only contains a single variable, ``$error`` that contains the
@@ -550,7 +521,6 @@ Inside, you'll find the ``$templates`` property where you can list as many custo
 short alias they can be referenced by. If we were to add our example file from above, it would look something like:
 
 .. literalinclude:: validation/031.php
-   :lines: 2-
 
 Specifying the Template
 =======================
@@ -572,7 +542,6 @@ autoloader can find it. These files are called RuleSets. To add a new RuleSet, e
 add the new file to the ``$ruleSets`` array:
 
 .. literalinclude:: validation/032.php
-   :lines: 2-
 
 You can add it as either a simple string with the fully qualified class name, or using the ``::class`` suffix as
 shown above. The primary benefit here is that it provides some extra navigation capabilities in more advanced IDEs.
@@ -581,19 +550,16 @@ Within the file itself, each method is a rule and must accept a string as the fi
 a boolean true or false value signifying true if it passed the test or false if it did not:
 
 .. literalinclude:: validation/033.php
-   :lines: 2-
 
 By default, the system will look within ``CodeIgniter\Language\en\Validation.php`` for the language strings used
 within errors. In custom rules, you may provide error messages by accepting a ``$error`` variable by reference in the
 second parameter:
 
 .. literalinclude:: validation/034.php
-   :lines: 2-
 
 Your new custom rule could now be used just like any other rule:
 
 .. literalinclude:: validation/035.php
-   :lines: 2-
 
 Allowing Parameters
 ===================
@@ -603,7 +569,6 @@ the parameter string, and an array with all of the data that was submitted the f
 for rules like ``require_with`` that needs to check the value of another submitted field to base its result on:
 
 .. literalinclude:: validation/036.php
-   :lines: 2-
 
 Custom errors can be returned as the fourth parameter, just as described above.
 
@@ -616,7 +581,6 @@ The following is a list of all the native rules that are available to use:
     There can be no spaces before and after ``ignore_value``.
 
 .. literalinclude:: validation/037.php
-   :lines: 2-
 
 ======================= ========== ============================================= ===================================================
 Rule                    Parameter  Description                                   Example
diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst
index 3a9d9b705bc2..a1941fb31d97 100644
--- a/user_guide_src/source/models/entities.rst
+++ b/user_guide_src/source/models/entities.rst
@@ -61,7 +61,6 @@ Working With the Entity Class
 Now that all of the pieces are in place, you would work with the Entity class as you would any other class:
 
 .. literalinclude:: entities/003.php
-   :lines: 2-
 
 You may have noticed that the ``User`` class has not set any properties for the columns, but you can still
 access them as if they were public properties. The base class, ``CodeIgniter\Entity\Entity``, takes care of this for you, as
@@ -86,12 +85,10 @@ the model, only the fields in ``$allowedFields`` will actually be saved to the d
 on your entities without worrying much about stray fields getting saved incorrectly.
 
 .. literalinclude:: entities/004.php
-   :lines: 2-
 
 You can also pass the data in the constructor and the data will be passed through the ``fill()`` method during instantiation.
 
 .. literalinclude:: entities/005.php
-   :lines: 2-
 
 Bulk Accessing Properties
 -------------------------
@@ -131,7 +128,6 @@ While fairly simple, these examples show that using Entity classes can provide a
 business logic and create objects that are pleasant to use.
 
 .. literalinclude:: entities/007.php
-   :lines: 2-
 
 Data Mapping
 ============
@@ -184,7 +180,6 @@ Now, when any of those properties are set, they will be converted to a Time inst
 current timezone, as set in **app/Config/App.php**:
 
 .. literalinclude:: entities/011.php
-   :lines: 2-
 
 Property Casting
 ----------------
@@ -220,7 +215,6 @@ the value whenever the property is set:
 .. literalinclude:: entities/013.php
 
 .. literalinclude:: entities/014.php
-   :lines: 2-
 
 CSV Casting
 -----------
@@ -235,7 +229,6 @@ by humans:
 Stored in the database as "red,yellow,green":
 
 .. literalinclude:: entities/016.php
-   :lines: 2-
 
 .. note:: Casting as CSV uses PHP's internal ``implode`` and ``explode`` methods and assumes all values are string-safe and free of commas. For more complex data casts try ``array`` or ``json``.
 
@@ -256,7 +249,6 @@ Now you need to register it:
 If you don't need to change values when getting or setting a value. Then just don't implement the appropriate method:
 
 .. literalinclude:: entities/019.php
-   :lines: 2-
 
 **Parameters**
 
@@ -266,10 +258,8 @@ Additional parameters are indicated in square brackets and listed with a comma.
 **type[param1, param2]**
 
 .. literalinclude:: entities/020.php
-   :lines: 2-
 
 .. literalinclude:: entities/021.php
-   :lines: 2-
 
 .. note:: If the casting type is marked as nullable ``?bool`` and the passed value is not null, then the parameter with
     the value ``nullable`` will be passed to the casting type handler.
@@ -282,9 +272,7 @@ You can check if an Entity attribute has changed since it was created. The only
 attribute to check:
 
 .. literalinclude:: entities/022.php
-   :lines: 2-
 
 Or to check the whole entity for changed values omit the parameter:
 
 .. literalinclude:: entities/023.php
-   :lines: 2-
diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index 78ec71365afd..f55e60656c03 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -25,7 +25,6 @@ location within the directory, like ``namespace App\Models``.
 You can access models within your classes by creating a new instance or using the ``model()`` helper function.
 
 .. literalinclude:: model/001.php
-   :lines: 2-
 
 CodeIgniter's Model
 ===================
@@ -203,7 +202,6 @@ Several functions are provided for doing basic CRUD work on your tables, includi
 Returns a single row where the primary key matches the value passed in as the first parameter:
 
 .. literalinclude:: model/006.php
-   :lines: 2-
 
 The value is returned in the format specified in ``$returnType``.
 
@@ -211,7 +209,6 @@ You can specify more than one row to return by passing an array of primaryKey va
 of just one:
 
 .. literalinclude:: model/007.php
-   :lines: 2-
 
 If no parameters are passed in, will return all rows in that model's table, effectively acting
 like ``findAll()``, though less explicit.
@@ -221,7 +218,6 @@ like ``findAll()``, though less explicit.
 Returns null or an indexed array of column values:
 
 .. literalinclude:: model/008.php
-   :lines: 2-
 
 ``$column_name`` should be a name of single column else you will get the DataException.
 
@@ -230,25 +226,21 @@ Returns null or an indexed array of column values:
 Returns all results:
 
 .. literalinclude:: model/009.php
-   :lines: 2-
 
 This query may be modified by interjecting Query Builder commands as needed prior to calling this method:
 
 .. literalinclude:: model/010.php
-   :lines: 2-
 
 You can pass in a limit and offset values as the first and second
 parameters, respectively:
 
 .. literalinclude:: model/011.php
-   :lines: 2-
 
 **first()**
 
 Returns the first row in the result set. This is best used in combination with the query builder.
 
 .. literalinclude:: model/012.php
-   :lines: 2-
 
 **withDeleted()**
 
@@ -256,7 +248,6 @@ If ``$useSoftDeletes`` is true, then the **find*()** methods will not return any
 To temporarily override this, you can use the ``withDeleted()`` method prior to calling the **find*()** method.
 
 .. literalinclude:: model/013.php
-   :lines: 2-
 
 **onlyDeleted()**
 
@@ -264,7 +255,6 @@ Whereas ``withDeleted()`` will return both deleted and not-deleted rows, this me
 the next **find*()** methods to return only soft deleted rows:
 
 .. literalinclude:: model/014.php
-   :lines: 2-
 
 Saving Data
 -----------
@@ -276,7 +266,6 @@ row of data in the database. The array's keys must match the name of the columns
 the array's values are the values to save for that key:
 
 .. literalinclude:: model/015.php
-   :lines: 2-
 
 **update()**
 
@@ -285,18 +274,15 @@ An associative array of data is passed into this method as the second parameter.
 of the columns in a ``$table``, while the array's values are the values to save for that key:
 
 .. literalinclude:: model/016.php
-   :lines: 2-
 
 Multiple records may be updated with a single call by passing an array of primary keys as the first parameter:
 
 .. literalinclude:: model/017.php
-   :lines: 2-
 
 When you need a more flexible solution, you can leave the parameters empty and it functions like the Query Builder's
 update command, with the added benefit of validation, events, etc:
 
 .. literalinclude:: model/018.php
-   :lines: 2-
 
 **save()**
 
@@ -304,7 +290,6 @@ This is a wrapper around the ``insert()`` and ``update()`` methods that handle i
 automatically, based on whether it finds an array key matching the **primary key** value:
 
 .. literalinclude:: model/019.php
-   :lines: 2-
 
 The save method also can make working with custom class result objects much simpler by recognizing a non-simple
 object and grabbing its public and protected values into an array, which is then passed to the appropriate
@@ -315,19 +300,16 @@ elements in a certain way, etc. They shouldn't have any idea about how they are
 simplest, they might look like this:
 
 .. literalinclude:: model/020.php
-   :lines: 2-
 
 A very simple model to work with this might look like:
 
 .. literalinclude:: model/021.php
-   :lines: 2-
 
 This model works with data from the ``jobs`` table, and returns all results as an instance of ``App\Entities\Job``.
 When you need to persist that record to the database, you will need to either write custom methods, or use the
 model's ``save()`` method to inspect the class, grab any public and private properties, and save them to the database:
 
 .. literalinclude:: model/022.php
-   :lines: 2-
 
 .. note:: If you find yourself working with Entities a lot, CodeIgniter provides a built-in :doc:`Entity class </models/entities>`
     that provides several handy features that make developing Entities simpler.
@@ -340,7 +322,6 @@ Deleting Data
 Takes a primary key value as the first parameter and deletes the matching record from the model's table:
 
 .. literalinclude:: model/023.php
-   :lines: 2-
 
 If the model's ``$useSoftDeletes`` value is true, this will update the row to set ``deleted_at`` to the current
 date and time. You can force a permanent delete by setting the second parameter as true.
@@ -348,20 +329,17 @@ date and time. You can force a permanent delete by setting the second parameter
 An array of primary keys can be passed in as the first parameter to delete multiple records at once:
 
 .. literalinclude:: model/024.php
-   :lines: 2-
 
 If no parameters are passed in, will act like the Query Builder's delete method, requiring a where call
 previously:
 
 .. literalinclude:: model/025.php
-   :lines: 2-
 
 **purgeDeleted()**
 
 Cleans out the database table by permanently removing all rows that have 'deleted_at IS NOT NULL'.
 
 .. literalinclude:: model/026.php
-   :lines: 2-
 
 Validating Data
 ---------------
@@ -374,7 +352,6 @@ The first step is to fill out the ``$validationRules`` class property with the f
 be applied. If you have custom error message that you want to use, place them in the ``$validationMessages`` array:
 
 .. literalinclude:: model/027.php
-   :lines: 2-
 
 The other way to set the validation rules to fields by functions,
 
@@ -388,7 +365,6 @@ The other way to set the validation rules to fields by functions,
     Usage example:
 
     .. literalinclude:: model/028.php
-       :lines: 2-
 
 .. php:function:: setValidationRules($validationRules)
 
@@ -399,7 +375,6 @@ The other way to set the validation rules to fields by functions,
     Usage example:
 
     .. literalinclude:: model/029.php
-       :lines: 2-
 
 The other way to set the validation message to fields by functions,
 
@@ -413,7 +388,6 @@ The other way to set the validation message to fields by functions,
     Usage example:
 
     .. literalinclude:: model/030.php
-       :lines: 2-
 
 .. php:function:: setValidationMessages($fieldMessages)
 
@@ -424,13 +398,11 @@ The other way to set the validation message to fields by functions,
     Usage example:
 
     .. literalinclude:: model/031.php
-       :lines: 2-
 
 Now, whenever you call the ``insert()``, ``update()``, or ``save()`` methods, the data will be validated. If it fails,
 the model will return boolean **false**. You can use the ``errors()`` method to retrieve the validation errors:
 
 .. literalinclude:: model/032.php
-   :lines: 2-
 
 This returns an array with the field names and their associated errors that can be used to either show all of the
 errors at the top of the form, or to display them individually:
@@ -441,7 +413,6 @@ If you'd rather organize your rules and error messages within the Validation con
 and simply set ``$validationRules`` to the name of the validation rule group you created:
 
 .. literalinclude:: model/034.php
-   :lines: 2-
 
 Retrieving Validation Rules
 ---------------------------
@@ -450,20 +421,17 @@ You can retrieve a model's validation rules by accessing its ``validationRules``
 property:
 
 .. literalinclude:: model/035.php
-   :lines: 2-
 
 You can also retrieve just a subset of those rules by calling the accessor
 method directly, with options:
 
 .. literalinclude:: model/036.php
-   :lines: 2-
 
 The ``$options`` parameter is an associative array with one element,
 whose key is either ``'except'`` or ``'only'``, and which has as its
 value an array of fieldnames of interest:
 
 .. literalinclude:: model/037.php
-   :lines: 2-
 
 Validation Placeholders
 -----------------------
@@ -474,18 +442,15 @@ the name of the field (or array key) that was passed in as ``$data`` surrounded
 replaced by the **value** of the matched incoming field. An example should clarify this:
 
 .. literalinclude:: model/038.php
-   :lines: 2-
 
 In this set of rules, it states that the email address should be unique in the database, except for the row
 that has an id matching the placeholder's value. Assuming that the form POST data had the following:
 
 .. literalinclude:: model/039.php
-   :lines: 2-
 
 then the ``{id}`` placeholder would be replaced with the number **4**, giving this revised rule:
 
 .. literalinclude:: model/040.php
-   :lines: 2-
 
 So it will ignore the row in the database that has ``id=4`` when it verifies the email is unique.
 
@@ -501,13 +466,11 @@ in addition to these will be removed prior to hitting the database. This is grea
 or primary keys do not get changed.
 
 .. literalinclude:: model/041.php
-   :lines: 2-
 
 Occasionally, you will find times where you need to be able to change these elements. This is often during
 testing, migrations, or seeds. In these cases, you can turn the protection on or off:
 
 .. literalinclude:: model/042.php
-   :lines: 2-
 
 Working With Query Builder
 --------------------------
@@ -516,19 +479,16 @@ You can get access to a shared instance of the Query Builder for that model's da
 need it:
 
 .. literalinclude:: model/043.php
-   :lines: 2-
 
 This builder is already set up with the model's ``$table``. If you need access to another table
 you can pass it in as a parameter, but be aware that this will not return a shared instance:
 
 .. literalinclude:: model/044.php
-   :lines: 2-
 
 You can also use Query Builder methods and the Model's CRUD methods in the same chained call, allowing for
 very elegant use:
 
 .. literalinclude:: model/045.php
-   :lines: 2-
 
 .. important:: The Model does not provide a perfect interface to the Query Builder.
     The Model and the Query Builder are separate classes with different purposes.
@@ -538,7 +498,6 @@ very elegant use:
 .. note:: You can also access the model's database connection seamlessly:
 
     .. literalinclude:: model/046.php
-       :lines: 2-
 
 Runtime Return Type Changes
 ----------------------------
@@ -555,14 +514,12 @@ provides methods that allow you to do just that.
 Returns data from the next **find*()** method as associative arrays:
 
 .. literalinclude:: model/047.php
-   :lines: 2-
 
 **asObject()**
 
 Returns data from the next **find*()** method as standard objects or custom class intances:
 
 .. literalinclude:: model/048.php
-   :lines: 2-
 
 Processing Large Amounts of Data
 --------------------------------
@@ -575,7 +532,6 @@ parameter is a Closure that will be called for each row of data.
 This is best used during cronjobs, data exports, or other large tasks.
 
 .. literalinclude:: model/049.php
-   :lines: 2-
 
 Model Events
 ============
@@ -596,7 +552,6 @@ main array will also contain the other values passed to the method, and be detai
 must return the original $data array so other callbacks have the full information.
 
 .. literalinclude:: model/050.php
-   :lines: 2-
 
 Specifying Callbacks To Run
 ---------------------------
@@ -606,17 +561,14 @@ etc). Multiple callbacks can be added to a single event and they will be process
 use the same callback in multiple events:
 
 .. literalinclude:: model/051.php
-   :lines: 2-
 
 Additionally, each model may allow (default) or deny callbacks class-wide by setting its ``$allowCallbacks`` property:
 
 .. literalinclude:: model/052.php
-   :lines: 2-
 
 You may also change this setting temporarily for a single model call sing the ``allowCallbacks()`` method:
 
 .. literalinclude:: model/053.php
-   :lines: 2-
 
 Event Parameters
 ----------------
@@ -662,7 +614,6 @@ to the calling context. In order for ``beforeFind`` to intercept the find workfl
 boolean, ``returnData``:
 
 .. literalinclude:: model/054.php
-   :lines: 2-
 
 Manual Model Creation
 =====================
diff --git a/user_guide_src/source/outgoing/api_responses.rst b/user_guide_src/source/outgoing/api_responses.rst
index a0a5321899af..6d657e6bc765 100644
--- a/user_guide_src/source/outgoing/api_responses.rst
+++ b/user_guide_src/source/outgoing/api_responses.rst
@@ -23,7 +23,6 @@ In this example, an HTTP status code of 201 is returned, with the generic status
 exist for the most common use cases:
 
 .. literalinclude:: api_responses/002.php
-   :lines: 2-
 
 ***********************
 Handling Response Types
@@ -42,7 +41,6 @@ mime types that your application can automatically format the response for. By d
 format both XML and JSON responses:
 
 .. literalinclude:: api_responses/003.php
-   :lines: 2-
 
 This is the array that is used during :doc:`Content Negotiation </incoming/content_negotiation>` to determine which
 type of response to return. If no matches are found between what the client requested and what you support, the first
@@ -53,7 +51,6 @@ name, and the class must implement ``CodeIgniter\Format\FormatterInterface``. Fo
 support both JSON and XML:
 
 .. literalinclude:: api_responses/004.php
-   :lines: 2-
 
 So, if your request asks for JSON formatted data in an **Accept** header, the data array you pass any of the
 ``respond*`` or ``fail*`` methods will be formatted by the ``CodeIgniter\Format\JSONFormatter`` class. The resulting
@@ -69,7 +66,6 @@ Class Reference
     ``$format``, it will be automatically determined through content negotiation.
 
 .. literalinclude:: api_responses/005.php
-   :lines: 2-
 
 .. php:method:: respond($data[, $statusCode = 200[, $message = '']])
 
@@ -115,7 +111,6 @@ Class Reference
     code of the error. The ``messages`` element contains an array of error messages. It would look something like:
 
     .. literalinclude:: api_responses/006.php
-       :lines: 2-
 
 .. php:method:: respondCreated($data = null[, string $message = ''])
 
@@ -126,7 +121,6 @@ Class Reference
     Sets the appropriate status code to use when a new resource was created, typically 201:
 
     .. literalinclude:: api_responses/007.php
-       :lines: 2-
 
 .. php:method:: respondDeleted($data = null[, string $message = ''])
 
@@ -137,7 +131,6 @@ Class Reference
     Sets the appropriate status code to use when a new resource was deleted as the result of this API call, typically 200.
 
     .. literalinclude:: api_responses/008.php
-       :lines: 2-
 
 .. php:method:: respondNoContent(string $message = 'No Content')
 
@@ -148,7 +141,6 @@ Class Reference
     meaningful reply to send back to the client, typically 204.
 
     .. literalinclude:: api_responses/009.php
-       :lines: 2-
 
 .. php:method:: failUnauthorized(string $description = 'Unauthorized'[, string $code = null[, string $message = '']])
 
@@ -161,7 +153,6 @@ Class Reference
     or has incorrect authorization. Status code is 401.
 
     .. literalinclude:: api_responses/010.php
-       :lines: 2-
 
 .. php:method:: failForbidden(string $description = 'Forbidden'[, string $code=null[, string $message = '']])
 
@@ -175,7 +166,6 @@ Class Reference
     the client should not try again because it won't help. Status code is 403.
 
     .. literalinclude:: api_responses/011.php
-       :lines: 2-
 
 .. php:method:: failNotFound(string $description = 'Not Found'[, string $code=null[, string $message = '']])
 
@@ -187,7 +177,6 @@ Class Reference
     Sets the appropriate status code to use when the requested resource cannot be found. Status code is 404.
 
     .. literalinclude:: api_responses/012.php
-       :lines: 2-
 
 .. php:method:: failValidationErrors($errors[, string $code=null[, string $message = '']])
 
@@ -199,7 +188,6 @@ Class Reference
     Sets the appropriate status code to use when data the client sent did not pass validation rules. Status code is typically 400.
 
     .. literalinclude:: api_responses/013.php
-       :lines: 2-
 
 .. php:method:: failResourceExists(string $description = 'Conflict'[, string $code=null[, string $message = '']])
 
@@ -212,7 +200,6 @@ Class Reference
     Status code is typically 409.
 
     .. literalinclude:: api_responses/014.php
-       :lines: 2-
 
 .. php:method:: failResourceGone(string $description = 'Gone'[, string $code=null[, string $message = '']])
 
@@ -225,7 +212,6 @@ Class Reference
     is no longer available. Status code is typically 410.
 
     .. literalinclude:: api_responses/015.php
-       :lines: 2-
 
 .. php:method:: failTooManyRequests(string $description = 'Too Many Requests'[, string $code=null[, string $message = '']])
 
@@ -238,7 +224,6 @@ Class Reference
     This might be due to some form of throttling or rate limiting. Status code is typically 400.
 
     .. literalinclude:: api_responses/016.php
-       :lines: 2-
 
 .. php:method:: failServerError(string $description = 'Internal Server Error'[, string $code = null[, string $message = '']])
 
@@ -250,4 +235,3 @@ Class Reference
     Sets the appropriate status code to use when there is a server error.
 
     .. literalinclude:: api_responses/017.php
-       :lines: 2-
diff --git a/user_guide_src/source/outgoing/localization.rst b/user_guide_src/source/outgoing/localization.rst
index cb87e8717f1a..0a5845580459 100644
--- a/user_guide_src/source/outgoing/localization.rst
+++ b/user_guide_src/source/outgoing/localization.rst
@@ -33,7 +33,6 @@ Configuring the Locale
 Every site will have a default language/locale they operate in. This can be set in **Config/App.php**:
 
 .. literalinclude:: localization/001.php
-   :lines: 2-
 
 The value can be any string that your application uses to manage text strings and other formats. It is
 recommended that a `BCP 47 <http://www.rfc-editor.org/rfc/bcp/bcp47.txt>`_ language code is used. This results in
@@ -62,7 +61,6 @@ You can set up content negotiation to happen automatically by setting two additi
 The first value tells the Request class that we do want to negotiate a locale, so simply set it to true:
 
 .. literalinclude:: localization/002.php
-   :lines: 2-
 
 Once this is enabled, the system will automatically negotiate the correct language based upon an array
 of locales that you have defined in ``$supportLocales``. If no match is found between the languages
@@ -70,7 +68,6 @@ that you support, and the requested language, the first item in $supportedLocale
 the following example, the **en** locale would be used if no match is found:
 
 .. literalinclude:: localization/003.php
-   :lines: 2-
 
 In Routes
 ---------
@@ -80,7 +77,6 @@ placeholder ``{locale}`` can be placed as a segment in your route. If present, t
 segment will be your locale:
 
 .. literalinclude:: localization/004.php
-   :lines: 2-
 
 In this example, if the user tried to visit ``http://example.com/fr/books``, then the locale would be
 set to ``fr``, assuming it was configured as a valid locale.
@@ -99,7 +95,6 @@ If your controller is extending ``CodeIgniter\Controller``, this will be availab
 Alternatively, you can use the :doc:`Services class </concepts/services>` to retrieve the current request:
 
 .. literalinclude:: localization/006.php
-   :lines: 2-
 
 *********************
 Language Localization
@@ -115,15 +110,12 @@ You might name it simply: **Errors.php**.
 Within the file, you would return an array, where each element in the array has a language key and can have string to return:
 
 .. literalinclude:: localization/007.php
-   :lines: 2-
 
 It also support nested definition:
 
 .. literalinclude:: localization/008.php
-   :lines: 2-
 
 .. literalinclude:: localization/009.php
-   :lines: 2-
 
 Basic Usage
 ===========
@@ -133,12 +125,10 @@ filename and the language key as the first parameter, separated by a period (.).
 ``errorEmailMissing`` string from the ``Errors`` language file, you would do the following:
 
 .. literalinclude:: localization/010.php
-   :lines: 2-
 
 For nested definition, you would do the following:
 
 .. literalinclude:: localization/011.php
-   :lines: 2-
 
 If the requested language key doesn't exist in the file for the current locale, the string will be passed
 back, unchanged. In this example, it would return 'Errors.errorEmailMissing' or 'Errors.nested.error.message' if it didn't exist.
@@ -154,17 +144,14 @@ You can pass an array of values to replace placeholders in the language string a
 ``lang()`` function. This allows for very simple number translations and formatting:
 
 .. literalinclude:: localization/012.php
-   :lines: 2-
 
 The first item in the placeholder corresponds to the index of the item in the array, if it's numerical:
 
 .. literalinclude:: localization/013.php
-   :lines: 2-
 
 You can also use named keys to make it easier to keep things straight, if you'd like:
 
 .. literalinclude:: localization/014.php
-   :lines: 2-
 
 Obviously, you can do more than just number replacement. According to the
 `official ICU docs <https://unicode-org.github.io/icu-docs/apidoc/released/icu4c/classMessageFormat.html#details>`_ for the underlying
@@ -180,7 +167,6 @@ library, the following types of data can be replaced:
 Here are a few examples:
 
 .. literalinclude:: localization/015.php
-   :lines: 2-
 
 You should be sure to read up on the MessageFormatter class and the underlying ICU formatting to get a better
 idea on what capabilities it has, like performing the conditional replacement, pluralization, and more. Both of the links provided
@@ -193,7 +179,6 @@ To specify a different locale to be used when replacing parameters, you can pass
 third parameter to the ``lang()`` method.
 
 .. literalinclude:: localization/016.php
-   :lines: 2-
 
 Nested Arrays
 -------------
@@ -201,7 +186,6 @@ Nested Arrays
 Language files also allow nested arrays to make working with lists, etc... easier.
 
 .. literalinclude:: localization/017.php
-   :lines: 2-
 
 Language Fallback
 =================
diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
index 48e21ec311a2..6edafecb2bc3 100644
--- a/user_guide_src/source/outgoing/response.rst
+++ b/user_guide_src/source/outgoing/response.rst
@@ -26,19 +26,16 @@ do it manually with the ``setBody`` method. This is usually used in conjunction
 the response:
 
 .. literalinclude:: response/001.php
-   :lines: 2-
 
 The reason phrase ('OK', 'Created', 'Moved Permanently') will be automatically added, but you can add custom reasons
 as the second parameter of the ``setStatusCode()`` method:
 
 .. literalinclude:: response/002.php
-   :lines: 2-
 
 You can set format an array into either JSON or XML and set the content type header to the appropriate mime with the
 ``setJSON`` and ``setXML`` methods. Typically, you will send an array of data to be converted:
 
 .. literalinclude:: response/003.php
-   :lines: 2-
 
 Setting Headers
 ---------------
@@ -50,20 +47,17 @@ Using these functions instead of using the native PHP functions allows you to en
 prematurely, causing errors, and makes testing possible.
 
 .. literalinclude:: response/004.php
-   :lines: 2-
 
 If the header exists and can have more than one value, you may use the ``appendHeader()`` and ``prependHeader()``
 methods to add the value to the end or beginning of the values list, respectively. The first parameter is the name
 of the header, while the second is the value to append or prepend.
 
 .. literalinclude:: response/005.php
-   :lines: 2-
 
 Headers can be removed from the response with the ``removeHeader()`` method, which takes the header name as the only
 parameter. This is not case-sensitive.
 
 .. literalinclude:: response/006.php
-   :lines: 2-
 
 Force File Download
 ===================
@@ -84,18 +78,15 @@ handler for that type - it can use it.
 Example:
 
 .. literalinclude:: response/007.php
-   :lines: 2-
 
 If you want to download an existing file from your server you'll need to
 pass ``null`` explicitly for the second parameter:
 
 .. literalinclude:: response/008.php
-   :lines: 2-
 
 Use the optional ``setFileName()`` method to change the filename as it is sent to the client's browser:
 
 .. literalinclude:: response/009.php
-   :lines: 2-
 
 .. note:: The response object MUST be returned for the download to be sent to the client. This allows the response
     to be passed through all **after** filters before being sent to the client.
@@ -116,7 +107,6 @@ circumstances are too varied for us to be able to create a good default other th
 to set the Cache values to what you need, through the ``setCache()`` method:
 
 .. literalinclude:: response/010.php
-   :lines: 2-
 
 The ``$options`` array simply takes an array of key/value pairs that are, with a couple of exceptions, assigned
 to the ``Cache-Control`` header. You are free to set all of the options exactly as you need for your specific
@@ -152,7 +142,6 @@ By default, support for this is off. To enable support in your application, edit
 **app/Config/App.php**:
 
 .. literalinclude:: response/011.php
-   :lines: 2-
 
 When enabled, the response object will contain an instance of ``CodeIgniter\HTTP\ContentSecurityPolicy``. The
 values set in **app/Config/ContentSecurityPolicy.php** are applied to that instance, and if no changes are
@@ -178,7 +167,6 @@ Examples are shown below, with different combinations of parameters, though all
 name or an array of them:
 
 .. literalinclude:: response/012.php
-   :lines: 2-
 
 The first parameter to each of the "add" methods is an appropriate string value,
 or an array of them.
@@ -188,7 +176,6 @@ for subsequent sources, unless over-ridden. For instance, you could specify
 that youtube.com was allowed, and then provide several allowed but reported sources:
 
 .. literalinclude:: response/013.php
-   :lines: 2-
 
 Inline Content
 --------------
@@ -271,7 +258,6 @@ The methods provided by the parent class that are available are:
         will be thrown:
 
         .. literalinclude:: response/014.php
-           :lines: 2-
 
     .. php:method:: setStatusCode($code[, $reason=''])
 
@@ -283,13 +269,11 @@ The methods provided by the parent class that are available are:
         Sets the HTTP status code that should be sent with this response:
 
         .. literalinclude:: response/015.php
-           :lines: 2-
 
         The reason phrase will be automatically generated based upon the official lists. If you need to set your own
         for a custom status code, you can pass the reason phrase as the second parameter:
 
         .. literalinclude:: response/016.php
-           :lines: 2-
 
     .. php:method:: getReasonPhrase()
 
@@ -299,7 +283,6 @@ The methods provided by the parent class that are available are:
         Returns the current status code for this response. If not status has been set, will return an empty string:
 
         .. literalinclude:: response/017.php
-           :lines: 2-
 
     .. php:method:: setDate($date)
 
@@ -310,7 +293,6 @@ The methods provided by the parent class that are available are:
         Sets the date used for this response. The ``$date`` argument must be an instance of ``DateTime``:
 
         .. literalinclude:: response/018.php
-           :lines: 2-
 
     .. php:method:: setContentType($mime[, $charset='UTF-8'])
 
@@ -322,13 +304,11 @@ The methods provided by the parent class that are available are:
         Sets the content type this response represents:
 
         .. literalinclude:: response/019.php
-           :lines: 2-
 
         By default, the method sets the character set to ``UTF-8``. If you need to change this, you can
         pass the character set as the second parameter:
 
         .. literalinclude:: response/020.php
-           :lines: 2-
 
     .. php:method:: noCache()
 
@@ -339,7 +319,6 @@ The methods provided by the parent class that are available are:
         of all response messages:
 
         .. literalinclude:: response/021.php
-           :lines: 2-
 
     .. php:method:: setCache($options)
 
@@ -371,7 +350,6 @@ The methods provided by the parent class that are available are:
         instance:
 
         .. literalinclude:: response/022.php
-           :lines: 2-
 
     .. php:method:: send(): Response
 
@@ -405,7 +383,6 @@ The methods provided by the parent class that are available are:
         parameter:
 
         .. literalinclude:: response/023.php
-           :lines: 2-
 
         **Notes**
 
@@ -439,7 +416,6 @@ The methods provided by the parent class that are available are:
         parameters:
 
         .. literalinclude:: response/024.php
-           :lines: 2-
 
     .. php:method:: deleteCookie($name = ''[, $domain = ''[, $path = '/'[, $prefix = '']]])
 
@@ -468,7 +444,6 @@ The methods provided by the parent class that are available are:
         Example:
 
         .. literalinclude:: response/025.php
-           :lines: 2-
 
     .. php:method:: hasCookie($name = ''[, $value = null[, $prefix = '']])
 
@@ -490,7 +465,6 @@ The methods provided by the parent class that are available are:
         Example:
 
         .. literalinclude:: response/026.php
-           :lines: 2-
 
     .. php:method:: getCookie($name = ''[, $prefix = ''])
 
@@ -504,7 +478,6 @@ The methods provided by the parent class that are available are:
         Example:
 
         .. literalinclude:: response/027.php
-           :lines: 2-
 
     .. php:method:: getCookies()
 
diff --git a/user_guide_src/source/outgoing/table.rst b/user_guide_src/source/outgoing/table.rst
index 159152f1b93b..e40cf5d6ee57 100644
--- a/user_guide_src/source/outgoing/table.rst
+++ b/user_guide_src/source/outgoing/table.rst
@@ -20,7 +20,6 @@ The Table class is not provided as a service, and should be instantiated
 "normally", for instance:
 
 .. literalinclude:: table/001.php
-   :lines: 2-
 
 Examples
 ========
@@ -31,7 +30,6 @@ table heading (or you can set your own headings using the ``setHeading()``
 method described in the function reference below).
 
 .. literalinclude:: table/002.php
-   :lines: 2-
 
 Here is an example of a table created from a database query result. The
 table class will automatically generate the headings based on the table
@@ -39,19 +37,16 @@ names (or you can set your own headings using the ``setHeading()``
 method described in the class reference below).
 
 .. literalinclude:: table/003.php
-   :lines: 2-
 
 Here is an example showing how you might create a table using discrete
 parameters:
 
 .. literalinclude:: table/004.php
-   :lines: 2-
 
 Here is the same example, except instead of individual parameters,
 arrays are used:
 
 .. literalinclude:: table/005.php
-   :lines: 2-
 
 Changing the Look of Your Table
 ===============================
@@ -60,7 +55,6 @@ The Table Class permits you to set a table template with which you can
 specify the design of your layout. Here is the template prototype:
 
 .. literalinclude:: table/006.php
-   :lines: 2-
 
 .. note:: You'll notice there are two sets of "row" blocks in the
     template. These permit you to create alternating row colors or design
@@ -71,13 +65,11 @@ change parts of the layout you can simply submit those elements. In this
 example, only the table opening tag is being changed:
 
 .. literalinclude:: table/007.php
-   :lines: 2-
 
 You can also set defaults for these by passing an array of template settings
 to the Table constructor:
 
 .. literalinclude:: table/008.php
-   :lines: 2-
 
 ***************
 Class Reference
@@ -90,7 +82,6 @@ Class Reference
         Allows you to specify a native PHP function or a valid function array object to be applied to all cell data.
 
         .. literalinclude:: table/009.php
-           :lines: 2-
 
         In the above example, all cell data would be run through PHP's :php:func:`htmlspecialchars()` function, resulting in::
 
@@ -113,7 +104,6 @@ Class Reference
         Permits you to add a caption to the table.
 
         .. literalinclude:: table/010.php
-           :lines: 2-
 
     .. php:method:: setHeading([$args = [] [, ...]])
 
@@ -124,7 +114,6 @@ Class Reference
         Permits you to set the table heading. You can submit an array or discrete params:
 
         .. literalinclude:: table/011.php
-           :lines: 2-
 
     .. php:method:: setFooting([$args = [] [, ...]])
 
@@ -135,7 +124,6 @@ Class Reference
         Permits you to set the table footing. You can submit an array or discrete params:
 
         .. literalinclude:: table/012.php
-           :lines: 2-
 
     .. php:method:: addRow([$args = [] [, ...]])
 
@@ -146,13 +134,11 @@ Class Reference
         Permits you to add a row to your table. You can submit an array or discrete params:
 
         .. literalinclude:: table/013.php
-           :lines: 2-
 
         If you would like to set an individual cell's tag attributes, you can use an associative array for that cell.
         The associative key **data** defines the cell's data. Any other key => val pairs are added as key='val' attributes to the tag:
 
         .. literalinclude:: table/014.php
-           :lines: 2-
 
     .. php:method:: makeColumns([$array = [] [, $columnLimit = 0]])
 
@@ -165,7 +151,6 @@ Class Reference
         This allows a single array with many elements to be displayed in a table that has a fixed column count. Consider this example:
 
         .. literalinclude:: table/015.php
-           :lines: 2-
 
     .. php:method:: setTemplate($template)
 
@@ -176,7 +161,6 @@ Class Reference
         Permits you to set your template. You can submit a full or partial template.
 
         .. literalinclude:: table/016.php
-           :lines: 2-
 
     .. php:method:: setEmpty($value)
 
@@ -188,7 +172,6 @@ Class Reference
         You might, for example, set a non-breaking space:
 
         .. literalinclude:: table/017.php
-           :lines: 2-
 
     .. php:method:: clear()
 
@@ -203,4 +186,3 @@ Class Reference
         Example
 
         .. literalinclude:: table/018.php
-           :lines: 2-
diff --git a/user_guide_src/source/outgoing/table/014.php b/user_guide_src/source/outgoing/table/014.php
index eb2e3d729a8c..d19424fc9fe4 100644
--- a/user_guide_src/source/outgoing/table/014.php
+++ b/user_guide_src/source/outgoing/table/014.php
@@ -3,5 +3,7 @@
 $cell = ['data' => 'Blue', 'class' => 'highlight', 'colspan' => 2];
 $table->addRow($cell, 'Red', 'Green');
 
-// generates
-// <td class='highlight' colspan='2'>Blue</td><td>Red</td><td>Green</td>
+?>
+
+<!-- Generates: -->
+<td class='highlight' colspan='2'>Blue</td><td>Red</td><td>Green</td>
diff --git a/user_guide_src/source/outgoing/table/015.php b/user_guide_src/source/outgoing/table/015.php
index 4f4349ec66b4..5bc5a7029ed3 100644
--- a/user_guide_src/source/outgoing/table/015.php
+++ b/user_guide_src/source/outgoing/table/015.php
@@ -6,15 +6,28 @@
 
 $table->generate($newList);
 
-// Generates a table with this prototype
+?>
 
+<!-- Generates a table with this prototype: -->
 <table border="0" cellpadding="4" cellspacing="0">
-<tr>
-<td>one</td><td>two</td><td>three</td>
-</tr><tr>
-<td>four</td><td>five</td><td>six</td>
-</tr><tr>
-<td>seven</td><td>eight</td><td>nine</td>
-</tr><tr>
-<td>ten</td><td>eleven</td><td>twelve</td></tr>
+    <tr>
+        <td>one</td>
+        <td>two</td>
+        <td>three</td>
+    </tr>
+    <tr>
+        <td>four</td>
+        <td>five</td>
+        <td>six</td>
+    </tr>
+    <tr>
+        <td>seven</td>
+        <td>eight</td>
+        <td>nine</td>
+    </tr>
+    <tr>
+        <td>ten</td>
+        <td>eleven</td>
+        <td>twelve</td>
+    </tr>
 </table>
diff --git a/user_guide_src/source/outgoing/view_decorators.rst b/user_guide_src/source/outgoing/view_decorators.rst
index 1620446785b0..83f3154f54c5 100644
--- a/user_guide_src/source/outgoing/view_decorators.rst
+++ b/user_guide_src/source/outgoing/view_decorators.rst
@@ -18,7 +18,6 @@ the resulting HTML.
 Once created, the class must be registered in ``app/Config/View.php``:
 
 .. literalinclude:: view_decorators/002.php
-   :lines: 2-
 
 Now that it's registered the decorator will be called for every view that is rendered or parsed.
 Decorators are called in the order specified in this configuration setting.
diff --git a/user_guide_src/source/outgoing/view_layouts.rst b/user_guide_src/source/outgoing/view_layouts.rst
index 2dca286b6052..2600b1c08922 100644
--- a/user_guide_src/source/outgoing/view_layouts.rst
+++ b/user_guide_src/source/outgoing/view_layouts.rst
@@ -80,7 +80,6 @@ Rendering the View
 Rendering the view and it's layout is done exactly as any other view would be displayed within a controller:
 
 .. literalinclude:: view_layouts/001.php
-   :lines: 2-
 
 It renders the View **app/Views/some_view.php** and if it extends ``default``,
 the Layout **app/Views/default.php** is also used automatically.
diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index ef17f8d7fa6e..cee76727ef84 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -46,13 +46,11 @@ Using the View Parser Class
 The simplest method to load the parser class is through its service:
 
 .. literalinclude:: view_parser/001.php
-   :lines: 2-
 
 Alternately, if you are not using the ``Parser`` class as your default renderer, you
 can instantiate it directly:
 
 .. literalinclude:: view_parser/002.php
-   :lines: 2-
 
 Then you can use any of the three standard rendering methods that it provides:
 ``render(viewpath, options, save)``, ``setVar(name, value, context)`` and
@@ -90,7 +88,6 @@ You can use the ``render()`` method to parse (or render) simple templates,
 like this:
 
 .. literalinclude:: view_parser/003.php
-   :lines: 2-
 
 View parameters are passed to ``setData()`` as an associative
 array of data to be replaced in the template. In the above example, the
@@ -114,7 +111,6 @@ Several options can be passed to the ``render()`` or ``renderString()`` methods.
     substitutions; default is **true**
 
 .. literalinclude:: view_parser/004.php
-   :lines: 2-
 
 ***********************
 Substitution Variations
@@ -128,7 +124,6 @@ replacement of pseudo-variables where the corresponding data parameter
 has either a scalar or string value, as in this example:
 
 .. literalinclude:: view_parser/005.php
-   :lines: 2-
 
 The ``Parser`` takes substitution a lot further with "variable pairs",
 used for nested substitutions or looping, and with some advanced
@@ -176,7 +171,6 @@ parse single variables, except, you will add a multi-dimensional array
 corresponding to your variable pair data. Consider this example:
 
 .. literalinclude:: view_parser/006.php
-   :lines: 2-
 
 The value for the pseudo-variable ``blog_entries`` is a sequential
 array of associative arrays. The outer level does not have keys associated
@@ -187,7 +181,6 @@ multi-dimensional array, you can simply use the database ``getResultArray()``
 method:
 
 .. literalinclude:: view_parser/007.php
-   :lines: 2-
 
 If the array you are trying to loop over contains objects instead of arrays,
 the parser will first look for an ``asArray()`` method on the object. If it exists,
@@ -206,7 +199,6 @@ A nested substitution happens when the value for a pseudo-variable is
 an associative array of values, like a record from a database:
 
 .. literalinclude:: view_parser/008.php
-   :lines: 2-
 
 The value for the pseudo-variable ``blog_entry`` is an associative
 array. The key/value pairs defined inside it will be exposed inside
@@ -250,12 +242,10 @@ data pairs into the inner substitution.
 The following example is not impacted by cascading:
 
 .. literalinclude:: view_parser/009.php
-   :lines: 2-
 
 This example gives different results, depending on cascading:
 
 .. literalinclude:: view_parser/010.php
-   :lines: 2-
 
 Preventing Parsing
 ==================
@@ -414,7 +404,6 @@ You can easily create your own filters by editing **app/Config/View.php** and ad
 callable:
 
 .. literalinclude:: view_parser/012.php
-   :lines: 2-
 
 PHP Native functions as Filters
 -------------------------------
@@ -424,7 +413,6 @@ You can use native php function as filters by editing **app/Config/View.php** an
 function prefixed with:
 
 .. literalinclude:: view_parser/013.php
-   :lines: 2-
 
 Parser Plugins
 ==============
@@ -482,24 +470,20 @@ At its simplest, all you need to do to register a new plugin and make it ready f
 used within the template file. The value is any valid PHP callable, including static class methods, and closures:
 
 .. literalinclude:: view_parser/014.php
-   :lines: 2-
 
 Any closures that are being used must be defined in the config file's constructor:
 
 .. literalinclude:: view_parser/015.php
-   :lines: 2-
 
 If the callable is on its own, it is treated as a single tag, not a open/close one. It will be replaced by
 the return value from the plugin:
 
 .. literalinclude:: view_parser/016.php
-   :lines: 2-
 
 If the callable is wrapped in an array, it is treated as an open/close tag pair that can operate on any of
 the content between its tags:
 
 .. literalinclude:: view_parser/017.php
-   :lines: 2-
 
 ***********
 Usage Notes
@@ -509,20 +493,17 @@ If you include substitution parameters that are not referenced in your
 template, they are ignored:
 
 .. literalinclude:: view_parser/018.php
-   :lines: 2-
 
 If you do not include a substitution parameter that is referenced in your
 template, the original pseudo-variable is shown in the result:
 
 .. literalinclude:: view_parser/019.php
-   :lines: 2-
 
 If you provide a string substitution parameter when an array is expected,
 i.e., for a variable pair, the substitution is done for the opening variable
 pair tag, but the closing variable pair tag is not rendered properly:
 
 .. literalinclude:: view_parser/020.php
-   :lines: 2-
 
 View Fragments
 ==============
@@ -558,7 +539,6 @@ An example with the iteration controlled in the controller,
 using a view fragment:
 
 .. literalinclude:: view_parser/021.php
-   :lines: 2-
 
 Result::
 
@@ -584,7 +564,6 @@ Class Reference
         Builds the output based upon a file name and any data that has already been set:
 
         .. literalinclude:: view_parser/022.php
-           :lines: 2-
 
         Options supported:
 
@@ -609,7 +588,6 @@ Class Reference
         Builds the output based upon a provided template source and any data that has already been set:
 
         .. literalinclude:: view_parser/023.php
-           :lines: 2-
 
         Options supported, and behavior, as above.
 
@@ -623,7 +601,6 @@ Class Reference
         Sets several pieces of view data at once:
 
         .. literalinclude:: view_parser/024.php
-           :lines: 2-
 
         Supported escape contexts: html, css, js, url, or attr or raw.
         If 'raw', no escaping will happen.
@@ -639,7 +616,6 @@ Class Reference
         Sets a single piece of view data:
 
         .. literalinclude:: view_parser/025.php
-           :lines: 2-
 
         Supported escape contexts: html, css, js, url, attr or raw.
         If 'raw', no escaping will happen.
@@ -654,4 +630,3 @@ Class Reference
         Override the substitution field delimiters:
 
         .. literalinclude:: view_parser/026.php
-           :lines: 2-
diff --git a/user_guide_src/source/outgoing/view_renderer.rst b/user_guide_src/source/outgoing/view_renderer.rst
index bf1570cede9c..feda1affda3d 100644
--- a/user_guide_src/source/outgoing/view_renderer.rst
+++ b/user_guide_src/source/outgoing/view_renderer.rst
@@ -15,13 +15,11 @@ exactly what you want, you may find times where you want to work with it more di
 In that case you can access the View service directly:
 
 .. literalinclude:: view_renderer/001.php
-   :lines: 2-
 
 Alternately, if you are not using the ``View`` class as your default renderer, you
 can instantiate it directly:
 
 .. literalinclude:: view_renderer/002.php
-   :lines: 2-
 
 .. important:: You should create services only within controllers. If you need
     access to the View class from a library, you should set that as a dependency
@@ -54,7 +52,6 @@ The ``setVar()`` and ``setData()`` methods are chainable, allowing you to combin
 number of different calls together in a chain:
 
 .. literalinclude:: view_renderer/003.php
-   :lines: 2-
 
 Escaping Data
 =============
@@ -66,7 +63,6 @@ escape the data for. See below for context descriptions.
 If you don't want the data to be escaped, you can pass ``null`` or ``'raw'`` as the final parameter to each function:
 
 .. literalinclude:: view_renderer/004.php
-   :lines: 2-
 
 If you choose not to escape data, or you are passing in an object instance, you can manually escape the data within
 the view with the ``esc()`` function. The first parameter is the string to escape. The second parameter is the
@@ -123,7 +119,6 @@ Class Reference
         Builds the output based upon a file name and any data that has already been set:
 
         .. literalinclude:: view_renderer/005.php
-           :lines: 2-
 
     .. php:method:: renderString($view[, $options[, $saveData = false]])
         :noindex:
@@ -137,7 +132,6 @@ Class Reference
         Builds the output based upon a view fragment and any data that has already been set:
 
         .. literalinclude:: view_renderer/006.php
-           :lines: 2-
 
     .. warning:: This could be used for displaying content that might have been stored in a database,
         but you need to be aware that this is a potential security vulnerability,
@@ -155,7 +149,6 @@ Class Reference
         Sets several pieces of view data at once:
 
         .. literalinclude:: view_renderer/007.php
-           :lines: 2-
 
         Supported escape contexts: ``html``, ``css``, ``js``, ``url``, or ``attr`` or ``raw``.
         If ``'raw'``, no escaping will happen.
@@ -175,7 +168,6 @@ Class Reference
         Sets a single piece of view data:
 
         .. literalinclude:: view_renderer/008.php
-           :lines: 2-
 
         Supported escape contexts: ``html``, ``css``, ``js``, ``url``, ``attr`` or ``raw``.
         If ``'raw'``, no escaping will happen.
diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst
index 2960a3c3c79a..55da9ed98a22 100644
--- a/user_guide_src/source/outgoing/views.rst
+++ b/user_guide_src/source/outgoing/views.rst
@@ -38,7 +38,6 @@ Displaying a View
 To load and display a particular view file you will use the following function:
 
 .. literalinclude:: views/001.php
-   :lines: 2-
 
 Where *name* is the name of your view file.
 
@@ -73,7 +72,6 @@ Your view files can also be stored within sub-directories if you prefer that typ
 When doing so you will need to include the directory name loading the view. Example:
 
 .. literalinclude:: views/004.php
-   :lines: 2-
 
 Namespaced Views
 ================
@@ -87,7 +85,6 @@ under the namespace ``Example\Blog``, you could retrieve view files as if they w
 example, you could load the **blog_view.php** file from **example/blog/Views** by prepending the namespace to the view name:
 
 .. literalinclude:: views/005.php
-   :lines: 2-
 
 .. _caching-views:
 
@@ -98,13 +95,11 @@ You can cache a view with the ``view`` command by passing a ``cache`` option wit
 the view for, in the third parameter:
 
 .. literalinclude:: views/006.php
-   :lines: 2-
 
 By default, the view will be cached using the same name as the view file itself. You can customize this by passing
 along ``cache_name`` and the cache ID you wish to use:
 
 .. literalinclude:: views/007.php
-   :lines: 2-
 
 Adding Dynamic Data to the View
 ===============================
@@ -113,7 +108,6 @@ Data is passed from the controller to the view by way of an array in the second
 Here's an example:
 
 .. literalinclude:: views/008.php
-   :lines: 2-
 
 Let's try it with your controller file. Open it and add this code:
 
@@ -138,7 +132,6 @@ other views, potentially causing issues. If you would prefer the data to persist
 into the `$option` array in the third parameter.
 
 .. literalinclude:: views/010.php
-   :lines: 2-
 
 Additionally, if you would like the default functionality of the view function to be that it does save the data
 between calls, you can set ``$saveData`` to **true** in **app/Config/Views.php**.
diff --git a/user_guide_src/source/testing/benchmark.rst b/user_guide_src/source/testing/benchmark.rst
index 33fe7c200be9..1e7a5c9607b7 100644
--- a/user_guide_src/source/testing/benchmark.rst
+++ b/user_guide_src/source/testing/benchmark.rst
@@ -26,12 +26,10 @@ The ``start()`` methods takes a single parameter: the name of this timer. You ca
 of the timer. It is only used for you to reference later to know which measurement is which:
 
 .. literalinclude:: benchmark/001.php
-   :lines: 2-
 
 The ``stop()`` method takes the name of the timer that you want to stop as the only parameter, also:
 
 .. literalinclude:: benchmark/002.php
-   :lines: 2-
 
 The name is not case-sensitive, but otherwise must match the name you gave it when you started the timer.
 
@@ -39,7 +37,6 @@ Alternatively, you can use the :doc:`global function </general/common_functions>
 and stop timers:
 
 .. literalinclude:: benchmark/003.php
-   :lines: 2-
 
 Viewing Your Benchmark Points
 =============================
@@ -49,13 +46,11 @@ not automatically display them, though. You can retrieve all of your timers by c
 This returns an array of benchmark information, including start, end, and duration:
 
 .. literalinclude:: benchmark/004.php
-   :lines: 2-
 
 You can change the precision of the calculated duration by passing in the number of decimal places you want to be shown as
 the only parameter. The default value is 4 numbers behind the decimal point:
 
 .. literalinclude:: benchmark/005.php
-   :lines: 2-
 
 The timers are automatically displayed in the :doc:`Debub Toolbar </testing/debugging>`.
 
@@ -67,7 +62,6 @@ the duration of a single timer, in seconds, with the `getElapsedTime()` method.
 the timer to display. The second is the number of decimal places to display. This defaults to 4:
 
 .. literalinclude:: benchmark/006.php
-   :lines: 2-
 
 ==================
 Using the Iterator
@@ -86,7 +80,6 @@ added to the Iterator class through the `add()` method. The first parameter is a
 this test by. The second parameter is the Closure, itself:
 
 .. literalinclude:: benchmark/007.php
-   :lines: 2-
 
 Running the Tasks
 =================
@@ -96,10 +89,8 @@ By default, it will run each task 1000 times. This is probably sufficient for mo
 to run the tests more times than that, you can pass the number as the first parameter:
 
 .. literalinclude:: benchmark/008.php
-   :lines: 2-
 
 Once it has run, it will return an HTML table with the results of the test. If you don't want the results
 displayed, you can pass in `false` as the second parameter:
 
 .. literalinclude:: benchmark/009.php
-   :lines: 2-
diff --git a/user_guide_src/source/testing/controllers.rst b/user_guide_src/source/testing/controllers.rst
index 590e491ed687..604a118e4ead 100644
--- a/user_guide_src/source/testing/controllers.rst
+++ b/user_guide_src/source/testing/controllers.rst
@@ -37,14 +37,12 @@ Specifies the class name of the controller to test. The first parameter must be
 (i.e., include the namespace):
 
 .. literalinclude:: controllers/003.php
-   :lines: 2-
 
 **execute(string $method, ...$params)**
 
 Executes the specified method within the controller. The first parameter is the name of the method to run:
 
 .. literalinclude:: controllers/004.php
-   :lines: 2-
 
 By specifying the second and subsequent parameters, you can pass them to the controller method.
 
@@ -56,7 +54,6 @@ for details.
 Allows you to pass in a modified version of **Config\App.php** to test with different settings:
 
 .. literalinclude:: controllers/005.php
-   :lines: 2-
 
 If you do not provide one, the application's App config file will be used.
 
@@ -65,7 +62,6 @@ If you do not provide one, the application's App config file will be used.
 Allows you to provide an **IncomingRequest** instance tailored to your testing needs:
 
 .. literalinclude:: controllers/006.php
-   :lines: 2-
 
 If you do not provide one, a new IncomingRequest instance with the default application values will be passed
 into your controller.
@@ -75,7 +71,6 @@ into your controller.
 Allows you to provide a **Response** instance:
 
 .. literalinclude:: controllers/007.php
-   :lines: 2-
 
 If you do not provide one, a new Response instance with the default application values will be passed
 into your controller.
@@ -85,7 +80,6 @@ into your controller.
 Allows you to provide a **Logger** instance:
 
 .. literalinclude:: controllers/008.php
-   :lines: 2-
 
 If you do not provide one, a new Logger instance with the default configuration values will be passed
 into your controller.
@@ -97,7 +91,6 @@ This is helpful if you need to check URI segments within your controller. The on
 representing a valid URI:
 
 .. literalinclude:: controllers/009.php
-   :lines: 2-
 
 It is a good practice to always provide the URI during testing to avoid surprises.
 
@@ -107,7 +100,6 @@ Allows you to provide a custom body for the request. This can be helpful when te
 you need to set a JSON value as the body. The only parameter is a string that represents the body of the request:
 
 .. literalinclude:: controllers/010.php
-   :lines: 2-
 
 Checking the Response
 =====================
@@ -149,7 +141,6 @@ a "live" project, but (for example) if you wanted to simulate a filter triggerin
 on an unfiltered route you could add it to the Config:
 
 .. literalinclude:: controllers/012.php
-   :lines: 2-
 
 Checking Routes
 ---------------
@@ -169,7 +160,6 @@ a large performance advantage over Controller and HTTP Testing.
     Usage example:
 
     .. literalinclude:: controllers/013.php
-       :lines: 2-
 
 Calling Filter Methods
 ----------------------
@@ -188,7 +178,6 @@ method using these properties to test your Filter code safely and check the resu
     Usage example:
 
     .. literalinclude:: controllers/014.php
-       :lines: 2-
 
     Notice how the ``Closure`` can take input parameters which are passed to your filter method.
 
@@ -201,19 +190,15 @@ to streamline your test methods.
 The **assertFilter()** method checks that the given route at position uses the filter (by its alias):
 
 .. literalinclude:: controllers/015.php
-   :lines: 2-
 
 The **assertNotFilter()** method checks that the given route at position does not use the filter (by its alias):
 
 .. literalinclude:: controllers/016.php
-   :lines: 2-
 
 The **assertHasFilters()** method checks that the given route at position has at least one filter set:
 
 .. literalinclude:: controllers/017.php
-   :lines: 2-
 
 The **assertNotHasFilters()** method checks that the given route at position has no filters set:
 
 .. literalinclude:: controllers/018.php
-   :lines: 2-
diff --git a/user_guide_src/source/testing/database.rst b/user_guide_src/source/testing/database.rst
index 614099449e29..680c0a3f3518 100644
--- a/user_guide_src/source/testing/database.rst
+++ b/user_guide_src/source/testing/database.rst
@@ -110,14 +110,12 @@ must be present within the path specified in ``$basePath``.
 Asserts that a row with criteria matching the key/value pairs in ``$criteria`` DOES NOT exist in the database.
 
 .. literalinclude:: database/004.php
-   :lines: 2-
 
 **seeInDatabase($table, $criteria)**
 
 Asserts that a row with criteria matching the key/value pairs in ``$criteria`` DOES exist in the database.
 
 .. literalinclude:: database/005.php
-   :lines: 2-
 
 **grabFromDatabase($table, $column, $criteria)**
 
@@ -125,7 +123,6 @@ Returns the value of ``$column`` from the specified table where the row matches
 row is found, it will only test against the first one.
 
 .. literalinclude:: database/006.php
-   :lines: 2-
 
 **hasInDatabase($table, $data)**
 
@@ -133,11 +130,9 @@ Inserts a new row into the database. This row is removed after the current test
 array with the data to insert into the table.
 
 .. literalinclude:: database/007.php
-   :lines: 2-
 
 **seeNumRecords($expected, $table, $criteria)**
 
 Asserts that a number of matching rows are found in the database that match ``$criteria``.
 
 .. literalinclude:: database/008.php
-   :lines: 2-
diff --git a/user_guide_src/source/testing/debugging.rst b/user_guide_src/source/testing/debugging.rst
index 0b841517846e..fc04a08921d5 100644
--- a/user_guide_src/source/testing/debugging.rst
+++ b/user_guide_src/source/testing/debugging.rst
@@ -32,7 +32,6 @@ The ``d()`` method dumps all of the data it knows about the contents passed as t
 allows the script to continue executing:
 
 .. literalinclude:: debugging/001.php
-   :lines: 2-
 
 **dd()**
 
@@ -43,7 +42,6 @@ This method is identical to ``d()``, except that it also ``dies()`` and no furth
 This provides a backtrace to the current execution point, with Kint's own unique spin:
 
 .. literalinclude:: debugging/002.php
-   :lines: 2-
 
 For more information, see `Kint's page <https://kint-php.github.io/kint//>`_.
 
@@ -79,7 +77,6 @@ can easily make your own to customize the toolbar. To determine which collectors
 the **app/Config/Toolbar.php** configuration file:
 
 .. literalinclude:: debugging/003.php
-   :lines: 2-
 
 Comment out any collectors that you do not want to show. Add custom Collectors here by providing the fully-qualified
 class name. The exact collectors that appear here will affect which tabs are shown, as well as what information is
@@ -159,7 +156,6 @@ The ``formatTimelineData()`` method must return an array of arrays formatted in
 it to sort it correctly and display the correct information. The inner arrays must include the following information:
 
 .. literalinclude:: debugging/005.php
-   :lines: 2-
 
 Providing Vars
 --------------
@@ -173,4 +169,3 @@ The ``getVarData()`` method should return an array containing arrays of key/valu
 outer array's key is the name of the section on the Vars tab:
 
 .. literalinclude:: debugging/006.php
-   :lines: 2-
diff --git a/user_guide_src/source/testing/fabricator.rst b/user_guide_src/source/testing/fabricator.rst
index 3e419353ef07..9acec31b5db2 100644
--- a/user_guide_src/source/testing/fabricator.rst
+++ b/user_guide_src/source/testing/fabricator.rst
@@ -17,7 +17,6 @@ Supported Models
 You may use your own custom models by ensuring they implement ``CodeIgniter\Test\Interfaces\FabricatorModel``:
 
 .. literalinclude:: fabricator/001.php
-   :lines: 2-
 
 .. note:: In addition to methods, the interface outlines some necessary properties for the target model. Please see the interface code for details.
 
@@ -27,12 +26,10 @@ Loading Fabricators
 At its most basic a fabricator takes the model to act on:
 
 .. literalinclude:: fabricator/002.php
-   :lines: 2-
 
 The parameter can be a string specifying the name of the model, or an instance of the model itself:
 
 .. literalinclude:: fabricator/003.php
-   :lines: 2-
 
 Defining Formatters
 ===================
@@ -44,7 +41,6 @@ correspond with common formatters, or if you don't care much about the content o
 of the time you will want to specify the formatters to use as the second parameter to the constructor:
 
 .. literalinclude:: fabricator/004.php
-   :lines: 2-
 
 You can also change the formatters after a fabricator is initialized by using the ``setFormatters()`` method.
 
@@ -55,7 +51,6 @@ to further limit the scope of random data. A fabricator will check its represent
 method where you can define exactly what the faked data should look like:
 
 .. literalinclude:: fabricator/005.php
-   :lines: 2-
 
 Notice in this example how the first three values are equivalent to the formatters from before. However for ``avatar``
 we have requested an image size other than the default and ``login`` uses a conditional based on app configuration,
@@ -64,7 +59,6 @@ You may want to keep your test data separate from your production models, so it
 a child class in your test support folder:
 
 .. literalinclude:: fabricator/006.php
-   :lines: 2-
 
 Localization
 ============
@@ -73,7 +67,6 @@ Faker supports a lot of different locales. Check their documentation to determin
 support your locale. Specify a locale in the third parameter while initiating a fabricator:
 
 .. literalinclude:: fabricator/007.php
-   :lines: 2-
 
 If no locale is specified it will use the one defined in **app/Config/App.php** as ``defaultLocale``.
 You can check the locale of an existing fabricator using its ``getLocale()`` method.
@@ -84,23 +77,19 @@ Faking the Data
 Once you have a properly-initialized fabricator it is easy to generate test data with the ``make()`` command:
 
 .. literalinclude:: fabricator/008.php
-   :lines: 2-
 
 You might get back something like this:
 
 .. literalinclude:: fabricator/009.php
-   :lines: 2-
 
 You can also get a lot of them back by supplying a count:
 
 .. literalinclude:: fabricator/010.php
-   :lines: 2-
 
 The return type of ``make()`` mimics what is defined in the representative model, but you can
 force a type using the methods directly:
 
 .. literalinclude:: fabricator/011.php
-   :lines: 2-
 
 The return from ``make()`` is ready to be used in tests or inserted into the database. Alternatively
 ``Fabricator`` includes the ``create()`` command to insert it for you, and return the result. Due
@@ -108,19 +97,16 @@ to model callbacks, database formatting, and special keys like primary and times
 from ``create()`` can differ from ``make()``. You might get back something like this:
 
 .. literalinclude:: fabricator/012.php
-   :lines: 2-
 
 Similar to ``make()`` you can supply a count to insert and return an array of objects:
 
 .. literalinclude:: fabricator/013.php
-   :lines: 2-
 
 Finally, there may be times you want to test with the full database object but you are not actually
 using a database. ``create()`` takes a second parameter to allowing mocking the object, returning
 the object with extra database fields above without actually touching the database:
 
 .. literalinclude:: fabricator/014.php
-   :lines: 2-
 
 Specifying Test Data
 ====================
@@ -130,23 +116,19 @@ compromising your formatters configuration. Rather then creating a new fabricato
 you can use ``setOverrides()`` to specify the value for any fields:
 
 .. literalinclude:: fabricator/015.php
-   :lines: 2-
 
 Now any data generated with ``make()`` or ``create()`` will always use "Bobby" for the ``first`` field:
 
 .. literalinclude:: fabricator/016.php
-   :lines: 2-
 
 ``setOverrides()`` can take a second parameter to indicate whether this should be a persistent
 override or only for a single action:
 
 .. literalinclude:: fabricator/017.php
-   :lines: 2-
 
 Notice after the first return the fabricator stops using the overrides:
 
 .. literalinclude:: fabricator/018.php
-   :lines: 2-
 
 If no second parameter is supplied then passed values will persist by default.
 
@@ -157,12 +139,10 @@ Often all you will need is a one-and-done fake object for testing. The Test Help
 the ``fake($model, $overrides, $persist = true)`` function to do just this:
 
 .. literalinclude:: fabricator/019.php
-   :lines: 2-
 
 This is equivalent to:
 
 .. literalinclude:: fabricator/020.php
-   :lines: 2-
 
 If you just need a fake object without saving it to the database you can pass false into the persist parameter.
 
@@ -179,7 +159,6 @@ Now you want to create fake users but don't want to assign them to a non-existan
 Your model's fake method could look like this:
 
 .. literalinclude:: fabricator/021.php
-   :lines: 2-
 
 Now creating a new user will ensure it is a part of a valid group: ``$user = fake(UserModel::class);``
 
diff --git a/user_guide_src/source/testing/feature.rst b/user_guide_src/source/testing/feature.rst
index 36ab73d4eea2..df40937ed14b 100644
--- a/user_guide_src/source/testing/feature.rst
+++ b/user_guide_src/source/testing/feature.rst
@@ -31,12 +31,10 @@ superglobal variables for the HTTP verb you are using. So, a method of **GET** w
 populated, while a **post** request would have the **$_POST** array populated.
 
 .. literalinclude:: feature/002.php
-   :lines: 2-
 
 Shorthand methods for each of the HTTP verbs exist to ease typing and make things clearer:
 
 .. literalinclude:: feature/003.php
-   :lines: 2-
 
 .. note:: The ``$params`` array does not make sense for every HTTP verb, but is included for consistency.
 
@@ -47,7 +45,6 @@ You can use a custom collection of routes by passing an array of "routes" into t
 override any existing routes in the system:
 
 .. literalinclude:: feature/004.php
-   :lines: 2-
 
 Each of the "routes" is a 3 element array containing the HTTP verb (or "add" for all),
 the URI to match, and the routing destination.
@@ -60,7 +57,6 @@ of key/value pairs that should exist within the ``$_SESSION`` variable when this
 that the current values of ``$_SESSION`` should be used. This is handy for testing authentication and more.
 
 .. literalinclude:: feature/005.php
-   :lines: 2-
 
 Setting Headers
 ---------------
@@ -69,7 +65,6 @@ You can set header values with the ``withHeaders()`` method. This takes an array
 passed as a header into the call:
 
 .. literalinclude:: feature/006.php
-   :lines: 2-
 
 Bypassing Events
 ----------------
@@ -78,7 +73,6 @@ Events are handy to use in your application, but can be problematic during testi
 to send out emails. You can tell the system to skip any event handling with the ``skipEvents()`` method:
 
 .. literalinclude:: feature/007.php
-   :lines: 2-
 
 Formatting The Request
 -----------------------
@@ -89,7 +83,6 @@ body of the request in the given format. This will also set the `Content-Type` h
 This is useful when testing JSON or XML API's so that you can set the request in the form that the controller will expect.
 
 .. literalinclude:: feature/008.php
-   :lines: 2-
 
 Setting the Body
 ----------------
diff --git a/user_guide_src/source/testing/mocking.rst b/user_guide_src/source/testing/mocking.rst
index 8c4b8b54d222..967cfba7f634 100644
--- a/user_guide_src/source/testing/mocking.rst
+++ b/user_guide_src/source/testing/mocking.rst
@@ -17,7 +17,6 @@ Cache
 You can mock the cache with the ``mock()`` method, using the ``CacheFactory`` as its only parameter.
 
 .. literalinclude:: mocking/001.php
-   :lines: 2-
 
 While this returns an instance of ``CodeIgniter\Test\Mock\MockCache`` that you can use directly, it also inserts the
 mock into the Service class, so any calls within your code to ``service('cache')`` or ``Config\Services::cache()`` will
@@ -33,7 +32,6 @@ You can instruct the mocked cache handler to never do any caching with the ``byp
 using the dummy handler and ensures that your test does not rely on cached data for your tests.
 
 .. literalinclude:: mocking/002.php
-   :lines: 2-
 
 Available Assertions
 --------------------
@@ -41,4 +39,3 @@ Available Assertions
 The following new assertions are available on the mocked class for using during testing:
 
 .. literalinclude:: mocking/003.php
-   :lines: 2-
diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst
index 1b32a3337c63..b689a8e90259 100644
--- a/user_guide_src/source/testing/overview.rst
+++ b/user_guide_src/source/testing/overview.rst
@@ -86,26 +86,22 @@ Most tests require some preparation in order to run correctly. PHPUnit's ``TestC
 to help with staging and clean up:
 
 .. literalinclude:: overview/003.php
-   :lines: 2-
 
 The static methods run before and after the entire test case, whereas the local methods run
 between each test. If you implement any of these special functions make sure you run their
 parent as well so extended test cases do not interfere with staging:
 
 .. literalinclude:: overview/004.php
-   :lines: 2-
 
 In addition to these methods, ``CIUnitTestCase`` also comes with a convenience property for
 parameter-free methods you want run during set up and tear down:
 
 .. literalinclude:: overview/005.php
-   :lines: 2-
 
 You can see by default these handle the mocking of intrusive services, but your class may override
 that or provide their own:
 
 .. literalinclude:: overview/006.php
-   :lines: 2-
 
 Traits
 ------
@@ -117,7 +113,6 @@ of your test cases you could create an authentication trait with a set up method
 logged in user:
 
 .. literalinclude:: overview/007.php
-   :lines: 2-
 
 Additional Assertions
 ---------------------
@@ -129,21 +124,18 @@ Additional Assertions
 Ensure that something you expected to be logged actually was:
 
 .. literalinclude:: overview/008.php
-   :lines: 2-
 
 **assertEventTriggered($eventName)**
 
 Ensure that an event you expected to be triggered actually was:
 
 .. literalinclude:: overview/009.php
-   :lines: 2-
 
 **assertHeaderEmitted($header, $ignoreCase = false)**
 
 Ensure that a header or cookie was actually emitted:
 
 .. literalinclude:: overview/010.php
-   :lines: 2-
 
 Note: the test case with this should be `run as a separate process
 in PHPunit <https://phpunit.readthedocs.io/en/9.5/annotations.html#runinseparateprocess>`_.
@@ -153,7 +145,6 @@ in PHPunit <https://phpunit.readthedocs.io/en/9.5/annotations.html#runinseparate
 Ensure that a header or cookie was not emitted:
 
 .. literalinclude:: overview/011.php
-   :lines: 2-
 
 Note: the test case with this should be `run as a separate process
 in PHPunit <https://phpunit.readthedocs.io/en/9.5/annotations.html#runinseparateprocess>`_.
@@ -164,7 +155,6 @@ For extended execution time testing, tests that the absolute difference
 between expected and actual time is within the prescribed tolerance:
 
 .. literalinclude:: overview/012.php
-   :lines: 2-
 
 The above test will allow the actual time to be either 660 or 661 seconds.
 
@@ -174,7 +164,6 @@ For extended execution time testing, tests that the absolute difference
 between expected and actual time, formatted as strings, is within the prescribed tolerance:
 
 .. literalinclude:: overview/013.php
-   :lines: 2-
 
 The above test will allow the actual time to be either 660 or 661 seconds.
 
@@ -190,7 +179,6 @@ Enables you to call private methods from outside the class. This returns a funct
 parameter is an instance of the class to test. The second parameter is the name of the method you want to call.
 
 .. literalinclude:: overview/014.php
-   :lines: 2-
 
 **getPrivateProperty($instance, $property)**
 
@@ -198,7 +186,6 @@ Retrieves the value of a private/protected class property from an instance of a
 instance of the class to test. The second parameter is the name of the property.
 
 .. literalinclude:: overview/015.php
-   :lines: 2-
 
 **setPrivateProperty($instance, $property, $value)**
 
@@ -206,7 +193,6 @@ Set a protected value within a class instance. The first parameter is an instanc
 parameter is the name of the property to set the value of. The third parameter is the value to set it to:
 
 .. literalinclude:: overview/016.php
-   :lines: 2-
 
 Mocking Services
 ================
@@ -222,7 +208,6 @@ This method allows you to define the exact instance that will be returned by the
 set properties of a service so that it behaves in a certain way, or replace a service with a mocked class.
 
 .. literalinclude:: overview/017.php
-   :lines: 2-
 
 The first parameter is the service that you are replacing. The name must match the function name in the Services
 class exactly. The second parameter is the instance to replace it with.
@@ -246,7 +231,6 @@ static methods like **Services**, but they take an additional preceding paramete
 component name:
 
 .. literalinclude:: overview/018.php
-   :lines: 2-
 
 .. note:: All component Factories are reset by default between each test. Modify your test case's ``$setUpMethods`` if you need instances to persist.
 
@@ -261,4 +245,3 @@ might be helpful. The ``CITestStreamFilter`` helps you capture the output from t
 An example demonstrating this inside one of your test cases:
 
 .. literalinclude:: overview/019.php
-   :lines: 2-
diff --git a/user_guide_src/source/testing/response.rst b/user_guide_src/source/testing/response.rst
index e39df524affc..99c44be38c62 100644
--- a/user_guide_src/source/testing/response.rst
+++ b/user_guide_src/source/testing/response.rst
@@ -8,7 +8,6 @@ from your test cases. Usually a ``TestResponse`` will be provided for you as a r
 create your own directly using any ``ResponseInterface``:
 
 .. literalinclude:: response/001.php
-   :lines: 2-
 
 .. contents::
     :local:
@@ -28,14 +27,12 @@ Accessing Request/Response
 You can access directly the Request object, if it was set during testing:
 
 .. literalinclude:: response/002.php
-   :lines: 2-
 
 **response()**
 
 This allows you direct access to the response object:
 
 .. literalinclude:: response/003.php
-   :lines: 2-
 
 Checking Response Status
 ------------------------
@@ -46,28 +43,24 @@ Returns a boolean true/false based on whether the response is perceived to be "o
 a response status code in the 200 or 300's. An empty body is not considered valid, unless in redirects.
 
 .. literalinclude:: response/004.php
-   :lines: 2-
 
 **assertOK()**
 
 This assertion simply uses the **isOK()** method to test a response. **assertNotOK** is the inverse of this assertion.
 
 .. literalinclude:: response/005.php
-   :lines: 2-
 
 **isRedirect()**
 
 Returns a boolean true/false based on whether the response is a redirected response.
 
 .. literalinclude:: response/006.php
-   :lines: 2-
 
 **assertRedirect()**
 
 Asserts that the Response is an instance of RedirectResponse. **assertNotRedirect** is the inverse of this assertion.
 
 .. literalinclude:: response/007.php
-   :lines: 2-
 
 **assertRedirectTo()**
 
@@ -75,21 +68,18 @@ Asserts that the Response is an instance of RedirectResponse and the destination
 matches the uri given.
 
 .. literalinclude:: response/008.php
-   :lines: 2-
 
 **getRedirectUrl()**
 
 Returns the URL set for a RedirectResponse, or null for failure.
 
 .. literalinclude:: response/009.php
-   :lines: 2-
 
 **assertStatus(int $code)**
 
 Asserts that the HTTP status code returned matches $code.
 
 .. literalinclude:: response/010.php
-   :lines: 2-
 
 Session Assertions
 ------------------
@@ -100,14 +90,12 @@ Asserts that a value exists in the resulting session. If $value is passed, will
 matches what was specified.
 
 .. literalinclude:: response/011.php
-   :lines: 2-
 
 **assertSessionMissing(string $key)**
 
 Asserts that the resulting session does not include the specified $key.
 
 .. literalinclude:: response/012.php
-   :lines: 2-
 
 Header Assertions
 -----------------
@@ -118,14 +106,12 @@ Asserts that a header named **$key** exists in the response. If **$value** is no
 the values match.
 
 .. literalinclude:: response/013.php
-   :lines: 2-
 
 **assertHeaderMissing(string $key)**
 
 Asserts that a header name **$key** does not exist in the response.
 
 .. literalinclude:: response/014.php
-   :lines: 2-
 
 Cookie Assertions
 -----------------
@@ -136,14 +122,12 @@ Asserts that a cookie named **$key** exists in the response. If **$value** is no
 the values match. You can set the cookie prefix, if needed, by passing it in as the third parameter.
 
 .. literalinclude:: response/015.php
-   :lines: 2-
 
 **assertCookieMissing(string $key)**
 
 Asserts that a cookie named **$key** does not exist in the response.
 
 .. literalinclude:: response/016.php
-   :lines: 2-
 
 **assertCookieExpired(string $key, string $prefix = '')**
 
@@ -151,7 +135,6 @@ Asserts that a cookie named **$key** exists, but has expired. You can set the co
 in as the second parameter.
 
 .. literalinclude:: response/017.php
-   :lines: 2-
 
 DOM Helpers
 -----------
@@ -163,33 +146,27 @@ The **see()** method checks the text on the page to see if it exists either by i
 a tag, as specified by type, class, or id:
 
 .. literalinclude:: response/018.php
-   :lines: 2-
 
 The **dontSee()** method is the exact opposite:
 
 .. literalinclude:: response/019.php
-   :lines: 2-
 
 The **seeElement()** and **dontSeeElement()** are very similar to the previous methods, but do not look at the
 values of the elements. Instead, they simply check that the elements exist on the page:
 
 .. literalinclude:: response/020.php
-   :lines: 2-
 
 You can use **seeLink()** to ensure that a link appears on the page with the specified text:
 
 .. literalinclude:: response/021.php
-   :lines: 2-
 
 The **seeInField()** method checks for any input tags exist with the name and value:
 
 .. literalinclude:: response/022.php
-   :lines: 2-
 
 Finally, you can check if a checkbox exists and is checked with the **seeCheckboxIsChecked()** method:
 
 .. literalinclude:: response/023.php
-   :lines: 2-
 
 DOM Assertions
 --------------
@@ -203,21 +180,18 @@ Asserts that text/HTML is on the page, either by itself or - more specifically -
 a tag, as specified by type, class, or id:
 
 .. literalinclude:: response/024.php
-   :lines: 2-
 
 **assertDontSee(string $search = null, string $element = null)**
 
 Asserts the exact opposite of the **assertSee()** method:
 
 .. literalinclude:: response/025.php
-   :lines: 2-
 
 **assertSeeElement(string $search)**
 
 Similar to **assertSee()**, however this only checks for an existing element. It does not check for specific text:
 
 .. literalinclude:: response/026.php
-   :lines: 2-
 
 **assertDontSeeElement(string $search)**
 
@@ -225,21 +199,18 @@ Similar to **assertSee()**, however this only checks for an existing element tha
 specific text:
 
 .. literalinclude:: response/027.php
-   :lines: 2-
 
 **assertSeeLink(string $text, string $details=null)**
 
 Asserts that an anchor tag is found with matching **$text** as the body of the tag:
 
 .. literalinclude:: response/028.php
-   :lines: 2-
 
 **assertSeeInField(string $field, string $value=null)**
 
 Asserts that an input tag exists with the name and value:
 
 .. literalinclude:: response/029.php
-   :lines: 2-
 
 Working With JSON
 -----------------
@@ -252,12 +223,10 @@ can help to test the responses.
 This method will return the body of the response as a JSON string:
 
 .. literalinclude:: response/030.php
-   :lines: 2-
 
 You can use this method to determine if ``$response`` actually holds JSON content:
 
 .. literalinclude:: response/031.php
-   :lines: 2-
 
 .. note:: Be aware that the JSON string will be pretty-printed in the result.
 
@@ -266,7 +235,6 @@ You can use this method to determine if ``$response`` actually holds JSON conten
 Asserts that $fragment is found within the JSON response. It does not need to match the entire JSON value.
 
 .. literalinclude:: response/032.php
-   :lines: 2-
 
 **assertJSONExact($test)**
 
diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index acf04e52d0f6..7925edc05fd1 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -14,7 +14,6 @@ Before creating a form, let's enable the CSRF protection.
 Open the **app/Config/Filters.php** file and update the ``$methods`` property like the following:
 
 .. literalinclude:: create_news_items/001.php
-   :lines: 2-
 
 It configures the CSRF filter to be enabled for all **POST** requests.
 You can read more about the CSRF protection in :doc:`Security </libraries/security>` library.
@@ -67,7 +66,6 @@ passed the validation rules. You'll use the :doc:`form
 validation <../libraries/validation>` library to do this.
 
 .. literalinclude:: create_news_items/002.php
-   :lines: 2-
 
 The code above adds a lot of functionality. First we load the NewsModel.
 After that, we check if we deal with the **POST** request and then
@@ -130,7 +128,6 @@ as a method instead of a news item's slug. You can read more about different
 routing types :doc:`here </incoming/routing>`.
 
 .. literalinclude:: create_news_items/004.php
-   :lines: 2-
 
 Now point your browser to your local development environment where you
 installed CodeIgniter and add ``/news/create`` to the URL.
diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
index f51e68c5abc7..9a144dd06c19 100644
--- a/user_guide_src/source/tutorial/news_section.rst
+++ b/user_guide_src/source/tutorial/news_section.rst
@@ -93,7 +93,6 @@ some additional tools to make working with data simpler. Add the
 following code to your model.
 
 .. literalinclude:: news_section/002.php
-   :lines: 2-
 
 With this code, you can perform two different queries. You can get all
 news records, or get a news item by its slug. You might have
@@ -140,7 +139,6 @@ nothing is displayed yet. The next thing to do is, passing this data to
 the views. Modify the ``index()`` method to look like this:
 
 .. literalinclude:: news_section/004.php
-   :lines: 2-
 
 The code above gets all news records from the model and assigns it to a
 variable. The value for the title is also assigned to the ``$data['title']``
@@ -167,7 +165,6 @@ add some code to the controller and create a new view. Go back to the
 ``News`` controller and update the ``view()`` method with the following:
 
 .. literalinclude:: news_section/006.php
-   :lines: 2-
 
 Instead of calling the ``getNews()`` method without a parameter, the
 ``$slug`` variable is passed, so it will return the specific news item.
@@ -187,7 +184,6 @@ going directly to the ``Pages`` controller. The first line routes URI's
 with a slug to the ``view()`` method in the ``News`` controller.
 
 .. literalinclude:: news_section/008.php
-   :lines: 2-
 
 Point your browser to your "news" page, i.e., ``localhost:8080/news``,
 you should see a list of the news items, each of which has a link
diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
index a5bcaf7fa94b..090a4d79e2f8 100644
--- a/user_guide_src/source/tutorial/static_pages.rst
+++ b/user_guide_src/source/tutorial/static_pages.rst
@@ -102,7 +102,6 @@ page actually exists. This will be the body of the ``view()`` method
 in the ``Pages`` controller created above:
 
 .. literalinclude:: static_pages/002.php
-   :lines: 2-
 
 Now, when the requested page does exist, it is loaded, including the header and
 footer, and displayed to the user. If the requested page doesn't exist, a "404
@@ -196,7 +195,6 @@ section of the configuration file.
 The only uncommented line there to start with should be:
 
 .. literalinclude:: static_pages/003.php
-   :lines: 2-
 
 This directive says that any incoming request without any content
 specified should be handled by the ``index()`` method inside the ``Home`` controller.
@@ -204,7 +202,6 @@ specified should be handled by the ``index()`` method inside the ``Home`` contro
 Add the following line, **after** the route directive for '/'.
 
 .. literalinclude:: static_pages/004.php
-   :lines: 2-
 
 CodeIgniter reads its routing rules from top to bottom and routes the
 request to the first matching rule. Each rule is a regular expression

From e5bc03d8037fc1791ef912a85938fd0dabdfd00c Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Sat, 26 Feb 2022 07:59:09 +0800
Subject: [PATCH 1663/2325] Update tests/system/Database/Builder/BaseTest.php

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 tests/system/Database/Builder/BaseTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/system/Database/Builder/BaseTest.php b/tests/system/Database/Builder/BaseTest.php
index 5a2a4f1578db..c7386066aa74 100644
--- a/tests/system/Database/Builder/BaseTest.php
+++ b/tests/system/Database/Builder/BaseTest.php
@@ -63,6 +63,5 @@ public function testSubquerySameBaseBuilderObject()
         $builder = $this->db->table('users');
 
         $builder->fromSubquery($builder, 'sub');
-        $builder->getCompiledSelect();
     }
 }

From 6b35f0375de8d0733a1fe6cb1d93418d21dd425b Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Sat, 26 Feb 2022 00:47:27 +0000
Subject: [PATCH 1664/2325] Set release date

---
 CHANGELOG.md                                | 2 +-
 user_guide_src/source/changelogs/v4.1.9.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85928ad2b111..d2bf2ed7119c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [v4.1.9](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.9) (2022-02-xx)
+## [v4.1.9](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.9) (2022-02-25)
 
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.8...v4.1.9)
 
diff --git a/user_guide_src/source/changelogs/v4.1.9.rst b/user_guide_src/source/changelogs/v4.1.9.rst
index ea41903d979d..e409da06e271 100644
--- a/user_guide_src/source/changelogs/v4.1.9.rst
+++ b/user_guide_src/source/changelogs/v4.1.9.rst
@@ -1,7 +1,7 @@
 Version 4.1.9
 #############
 
-Release Date: February xx, 2022
+Release Date: February 25, 2022
 
 **4.1.9 release of CodeIgniter4**
 

From ab30e0ef0cf9c4b41db3792feea352a53d005e1e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 26 Feb 2022 11:45:43 +0900
Subject: [PATCH 1665/2325] test: fix failed tests

---
 tests/system/Commands/RoutesTest.php            | 5 +++++
 tests/system/Commands/ScaffoldGeneratorTest.php | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/tests/system/Commands/RoutesTest.php b/tests/system/Commands/RoutesTest.php
index 0f569a2e42ad..dd5e6b3280a8 100644
--- a/tests/system/Commands/RoutesTest.php
+++ b/tests/system/Commands/RoutesTest.php
@@ -26,6 +26,8 @@ final class RoutesTest extends CIUnitTestCase
 
     protected function setUp(): void
     {
+        $this->resetServices();
+
         parent::setUp();
 
         CITestStreamFilter::$buffer = '';
@@ -40,6 +42,8 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         stream_filter_remove($this->streamFilter);
+
+        $this->resetServices();
     }
 
     protected function getBuffer()
@@ -60,6 +64,7 @@ public function testRoutesCommand()
     public function testRoutesCommandRouteFilterAndAutoRoute()
     {
         $routes = Services::routes();
+        $routes->setDefaultNamespace('App\Controllers');
         $routes->resetRoutes();
         $routes->get('/', 'Home::index', ['filter' => 'csrf']);
 
diff --git a/tests/system/Commands/ScaffoldGeneratorTest.php b/tests/system/Commands/ScaffoldGeneratorTest.php
index d3cbf1088f30..3aa6164cc2c5 100644
--- a/tests/system/Commands/ScaffoldGeneratorTest.php
+++ b/tests/system/Commands/ScaffoldGeneratorTest.php
@@ -13,6 +13,9 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
+use Config\Autoload;
+use Config\Modules;
+use Config\Services;
 
 /**
  * @internal
@@ -23,6 +26,9 @@ final class ScaffoldGeneratorTest extends CIUnitTestCase
 
     protected function setUp(): void
     {
+        $this->resetServices();
+        Services::autoloader()->initialize(new Autoload(), new Modules());
+
         CITestStreamFilter::$buffer = '';
 
         $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');

From 257392b70a80c023c96dd56f2a5ee699d1c2da47 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 26 Feb 2022 11:46:51 +0900
Subject: [PATCH 1666/2325] test: remove deprecated `session:migration` command
 test

---
 .../system/Commands/SessionsCommandsTest.php  | 76 -------------------
 1 file changed, 76 deletions(-)

diff --git a/tests/system/Commands/SessionsCommandsTest.php b/tests/system/Commands/SessionsCommandsTest.php
index 6af2d09bf536..e69de29bb2d1 100644
--- a/tests/system/Commands/SessionsCommandsTest.php
+++ b/tests/system/Commands/SessionsCommandsTest.php
@@ -1,76 +0,0 @@
-<?php
-
-/**
- * This file is part of CodeIgniter 4 framework.
- *
- * (c) CodeIgniter Foundation <admin@codeigniter.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace CodeIgniter\Commands;
-
-use CodeIgniter\Test\CIUnitTestCase;
-use CodeIgniter\Test\Filters\CITestStreamFilter;
-
-/**
- * @internal
- */
-final class SessionsCommandsTest extends CIUnitTestCase
-{
-    private $streamFilter;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        CITestStreamFilter::$buffer = '';
-
-        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-    }
-
-    protected function tearDown(): void
-    {
-        stream_filter_remove($this->streamFilter);
-
-        $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
-        $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-        if (file_exists($file)) {
-            unlink($file);
-        }
-    }
-
-    public function testCreateMigrationCommand()
-    {
-        command('session:migration');
-
-        // make sure we end up with a migration class in the right place
-        // or at least that we claim to have done so
-        // separate assertions avoid console color codes
-        $this->assertStringContainsString('_CreateCiSessionsTable.php', CITestStreamFilter::$buffer);
-    }
-
-    public function testOverriddenCreateMigrationCommand()
-    {
-        command('session:migration -t mygoodies');
-
-        // make sure we end up with a migration class in the right place
-        $this->assertStringContainsString('_CreateMygoodiesTable.php', CITestStreamFilter::$buffer);
-    }
-
-    public function testCannotWriteFileOnCreateMigrationCommand()
-    {
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $this->markTestSkipped('chmod does not work as expected on Windows');
-        }
-
-        chmod(APPPATH . 'Database/Migrations', 0444);
-
-        command('session:migration');
-        $this->assertStringContainsString('Error while creating file:', CITestStreamFilter::$buffer);
-
-        chmod(APPPATH . 'Database/Migrations', 0755);
-    }
-}

From e14e709ea29b476d0d0697319d9ee94b6cdf6a54 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 26 Feb 2022 11:59:26 +0900
Subject: [PATCH 1667/2325] test: add param to $this->resetService()

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

diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
index 00d936cd4251..4fd3bca63016 100644
--- a/system/Test/CIUnitTestCase.php
+++ b/system/Test/CIUnitTestCase.php
@@ -299,9 +299,9 @@ protected function resetFactories()
     /**
      * Resets shared instanced for all Services
      */
-    protected function resetServices()
+    protected function resetServices(bool $initAutoloader = false)
     {
-        Services::reset();
+        Services::reset($initAutoloader);
     }
 
     /**

From 7198b3b556c5bf8d9bc65a1400871cc4660ce4ae Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 26 Feb 2022 15:59:53 +0900
Subject: [PATCH 1668/2325] docs: fix title level and move "Organizing Your
 Controllers into Sub-directories"

It is about auto-routing.
---
 .../source/incoming/controllers.rst           | 82 +++++++++----------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 296e245bd35e..43a8c8d99f04 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -9,7 +9,7 @@ Controllers are the heart of your application, as they determine how HTTP reques
     :depth: 2
 
 What is a Controller?
-=====================
+*********************
 
 A Controller is simply a class file that is named in a way that it can be associated with a URI.
 
@@ -141,8 +141,40 @@ see the "Hello World" message.
 For more information, please refer to the :ref:`routes-configuration-options` section of the
 :doc:`URI Routing <routing>` documentation.
 
+Organizing Your Controllers into Sub-directories
+================================================
+
+If you are building a large application you might want to hierarchically
+organize or structure your controllers into sub-directories. CodeIgniter
+permits you to do this.
+
+Simply create sub-directories under the main **app/Controllers/**,
+and place your controller classes within them.
+
+.. important:: Folder names MUST start with an uppercase letter and ONLY the first character can be uppercase.
+
+When using this feature the first segment of your URI must
+specify the folder. For example, let's say you have a controller located here::
+
+    app/Controllers/Products/Shoes.php
+
+To call the above controller your URI will look something like this::
+
+    example.com/index.php/products/shoes/show/123
+
+.. note:: You cannot have directories with the same name in **app/Controllers/** and **public/**.
+    This is because if there is a directory, the web server will search for it and
+    it will not be routed to CodeIgniter.
+
+Each of your sub-directories may contain a default controller which will be
+called if the URL contains *only* the sub-directory. Simply put a controller
+in there that matches the name of your default controller as specified in
+your **app/Config/Routes.php** file.
+
+CodeIgniter also permits you to remap your URIs using its :doc:`URI Routing <routing>` feature.
+
 Remapping Method Calls
-======================
+**********************
 
 As noted above, the second segment of the URI typically determines which
 method in the controller gets called. CodeIgniter permits you to override
@@ -168,7 +200,7 @@ Example:
 .. literalinclude:: controllers/012.php
 
 Private methods
-===============
+***************
 
 In some cases, you may want certain methods hidden from public access.
 To achieve this, simply declare the method as ``private`` or ``protected``.
@@ -181,40 +213,8 @@ then trying to access it using the following URL will not work::
 
     example.com/index.php/helloworld/utility/
 
-Organizing Your Controllers into Sub-directories
-================================================
-
-If you are building a large application you might want to hierarchically
-organize or structure your controllers into sub-directories. CodeIgniter
-permits you to do this.
-
-Simply create sub-directories under the main **app/Controllers/**,
-and place your controller classes within them.
-
-.. important:: Folder names MUST start with an uppercase letter and ONLY the first character can be uppercase.
-
-When using this feature the first segment of your URI must
-specify the folder. For example, let's say you have a controller located here::
-
-    app/Controllers/Products/Shoes.php
-
-To call the above controller your URI will look something like this::
-
-    example.com/index.php/products/shoes/show/123
-
-.. note:: You cannot have directories with the same name in **app/Controllers/** and **public/**.
-    This is because if there is a directory, the web server will search for it and
-    it will not be routed to CodeIgniter.
-
-Each of your sub-directories may contain a default controller which will be
-called if the URL contains *only* the sub-directory. Simply put a controller
-in there that matches the name of your default controller as specified in
-your **app/Config/Routes.php** file.
-
-CodeIgniter also permits you to remap your URIs using its :doc:`URI Routing <routing>` feature.
-
 Included Properties
-===================
+*******************
 
 Every controller you create should extend ``CodeIgniter\Controller`` class.
 This class provides several features that are available to all of your controllers.
@@ -250,7 +250,7 @@ modify this by passing the duration (in seconds) as the first parameter:
 .. note:: A number of :doc:`time-based constants </general/common_functions>` are always available for you to use, including ``YEAR``, ``MONTH``, and more.
 
 Helpers
--------
+=======
 
 You can define an array of helper files as a class property. Whenever the controller is loaded
 these helper files will be automatically loaded into memory so that you can use their methods anywhere
@@ -261,10 +261,10 @@ inside the controller:
 .. _controllers-validating-data:
 
 Validating data
-===============
+***************
 
 $this->validate()
------------------
+=================
 
 To simplify data checking, the controller also provides the convenience method ``validate()``.
 The method accepts an array of rules in the first parameter,
@@ -284,7 +284,7 @@ the ``$rules`` array with the name of the group as defined in ``Config\Validatio
 .. note:: Validation can also be handled automatically in the model, but sometimes it's easier to do it in the controller. Where is up to you.
 
 $this->validateData()
----------------------
+=====================
 
 Sometimes you may want to check the controller method parameters or other custom data.
 In that case, you can use the ``$this->validateData()`` method.
@@ -293,6 +293,6 @@ The method accepts an array of data to validate in the first parameter:
 .. literalinclude:: controllers/019.php
 
 That's it!
-==========
+**********
 
 That, in a nutshell, is all there is to know about controllers.

From 31a941cf6508cd9d7ac6a6b44480052d03d96f2d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 26 Feb 2022 16:04:54 +0900
Subject: [PATCH 1669/2325] docs: add section title "Auto Routing", and move
 the section below

---
 .../source/incoming/controllers.rst           | 241 +++++++++---------
 1 file changed, 122 insertions(+), 119 deletions(-)

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 43a8c8d99f04..277b17c0ae6a 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -13,6 +13,128 @@ What is a Controller?
 
 A Controller is simply a class file that is named in a way that it can be associated with a URI.
 
+Remapping Method Calls
+**********************
+
+As noted above, the second segment of the URI typically determines which
+method in the controller gets called. CodeIgniter permits you to override
+this behavior through the use of the ``_remap()`` method:
+
+.. literalinclude:: controllers/010.php
+
+.. important:: If your controller contains a method named ``_remap()``,
+    it will **always** get called regardless of what your URI contains. It
+    overrides the normal behavior in which the URI determines which method
+    is called, allowing you to define your own method routing rules.
+
+The overridden method call (typically the second segment of the URI) will
+be passed as a parameter to the ``_remap()`` method:
+
+.. literalinclude:: controllers/011.php
+
+Any extra segments after the method name are passed into ``_remap()``. These parameters can be passed to the method
+to emulate CodeIgniter's default behavior.
+
+Example:
+
+.. literalinclude:: controllers/012.php
+
+Private methods
+***************
+
+In some cases, you may want certain methods hidden from public access.
+To achieve this, simply declare the method as ``private`` or ``protected``.
+That will prevent it from being served by a URL request. For example,
+if you were to define a method like this for the ``Helloworld`` controller:
+
+.. literalinclude:: controllers/013.php
+
+then trying to access it using the following URL will not work::
+
+    example.com/index.php/helloworld/utility/
+
+Included Properties
+*******************
+
+Every controller you create should extend ``CodeIgniter\Controller`` class.
+This class provides several features that are available to all of your controllers.
+
+**Request Object**
+
+The application's main :doc:`Request Instance </incoming/request>` is always available
+as a class property, ``$this->request``.
+
+**Response Object**
+
+The application's main :doc:`Response Instance </outgoing/response>` is always available
+as a class property, ``$this->response``.
+
+**Logger Object**
+
+An instance of the :doc:`Logger <../general/logging>` class is available as a class property,
+``$this->logger``.
+
+**forceHTTPS**
+
+A convenience method for forcing a method to be accessed via HTTPS is available within all
+controllers:
+
+.. literalinclude:: controllers/014.php
+
+By default, and in modern browsers that support the HTTP Strict Transport Security header, this
+call should force the browser to convert non-HTTPS calls to HTTPS calls for one year. You can
+modify this by passing the duration (in seconds) as the first parameter:
+
+.. literalinclude:: controllers/015.php
+
+.. note:: A number of :doc:`time-based constants </general/common_functions>` are always available for you to use, including ``YEAR``, ``MONTH``, and more.
+
+Helpers
+=======
+
+You can define an array of helper files as a class property. Whenever the controller is loaded
+these helper files will be automatically loaded into memory so that you can use their methods anywhere
+inside the controller:
+
+.. literalinclude:: controllers/016.php
+
+.. _controllers-validating-data:
+
+Validating data
+***************
+
+$this->validate()
+=================
+
+To simplify data checking, the controller also provides the convenience method ``validate()``.
+The method accepts an array of rules in the first parameter,
+and in the optional second parameter, an array of custom error messages to display
+if the items are not valid. Internally, this uses the controller's
+``$this->request`` instance to get the data to be validated.
+The :doc:`Validation Library docs </libraries/validation>` have details on
+rule and message array formats, as well as available rules:
+
+.. literalinclude:: controllers/017.php
+
+If you find it simpler to keep the rules in the configuration file, you can replace
+the ``$rules`` array with the name of the group as defined in ``Config\Validation.php``:
+
+.. literalinclude:: controllers/018.php
+
+.. note:: Validation can also be handled automatically in the model, but sometimes it's easier to do it in the controller. Where is up to you.
+
+$this->validateData()
+=====================
+
+Sometimes you may want to check the controller method parameters or other custom data.
+In that case, you can use the ``$this->validateData()`` method.
+The method accepts an array of data to validate in the first parameter:
+
+.. literalinclude:: controllers/019.php
+
+Auto Routing
+************
+
 Consider this URI::
 
     example.com/index.php/helloworld/
@@ -173,125 +295,6 @@ your **app/Config/Routes.php** file.
 
 CodeIgniter also permits you to remap your URIs using its :doc:`URI Routing <routing>` feature.
 
-Remapping Method Calls
-**********************
-
-As noted above, the second segment of the URI typically determines which
-method in the controller gets called. CodeIgniter permits you to override
-this behavior through the use of the ``_remap()`` method:
-
-.. literalinclude:: controllers/010.php
-
-.. important:: If your controller contains a method named ``_remap()``,
-    it will **always** get called regardless of what your URI contains. It
-    overrides the normal behavior in which the URI determines which method
-    is called, allowing you to define your own method routing rules.
-
-The overridden method call (typically the second segment of the URI) will
-be passed as a parameter to the ``_remap()`` method:
-
-.. literalinclude:: controllers/011.php
-
-Any extra segments after the method name are passed into ``_remap()``. These parameters can be passed to the method
-to emulate CodeIgniter's default behavior.
-
-Example:
-
-.. literalinclude:: controllers/012.php
-
-Private methods
-***************
-
-In some cases, you may want certain methods hidden from public access.
-To achieve this, simply declare the method as ``private`` or ``protected``.
-That will prevent it from being served by a URL request. For example,
-if you were to define a method like this for the ``Helloworld`` controller:
-
-.. literalinclude:: controllers/013.php
-
-then trying to access it using the following URL will not work::
-
-    example.com/index.php/helloworld/utility/
-
-Included Properties
-*******************
-
-Every controller you create should extend ``CodeIgniter\Controller`` class.
-This class provides several features that are available to all of your controllers.
-
-**Request Object**
-
-The application's main :doc:`Request Instance </incoming/request>` is always available
-as a class property, ``$this->request``.
-
-**Response Object**
-
-The application's main :doc:`Response Instance </outgoing/response>` is always available
-as a class property, ``$this->response``.
-
-**Logger Object**
-
-An instance of the :doc:`Logger <../general/logging>` class is available as a class property,
-``$this->logger``.
-
-**forceHTTPS**
-
-A convenience method for forcing a method to be accessed via HTTPS is available within all
-controllers:
-
-.. literalinclude:: controllers/014.php
-
-By default, and in modern browsers that support the HTTP Strict Transport Security header, this
-call should force the browser to convert non-HTTPS calls to HTTPS calls for one year. You can
-modify this by passing the duration (in seconds) as the first parameter:
-
-.. literalinclude:: controllers/015.php
-
-.. note:: A number of :doc:`time-based constants </general/common_functions>` are always available for you to use, including ``YEAR``, ``MONTH``, and more.
-
-Helpers
-=======
-
-You can define an array of helper files as a class property. Whenever the controller is loaded
-these helper files will be automatically loaded into memory so that you can use their methods anywhere
-inside the controller:
-
-.. literalinclude:: controllers/016.php
-
-.. _controllers-validating-data:
-
-Validating data
-***************
-
-$this->validate()
-=================
-
-To simplify data checking, the controller also provides the convenience method ``validate()``.
-The method accepts an array of rules in the first parameter,
-and in the optional second parameter, an array of custom error messages to display
-if the items are not valid. Internally, this uses the controller's
-``$this->request`` instance to get the data to be validated.
-The :doc:`Validation Library docs </libraries/validation>` have details on
-rule and message array formats, as well as available rules:
-
-.. literalinclude:: controllers/017.php
-
-If you find it simpler to keep the rules in the configuration file, you can replace
-the ``$rules`` array with the name of the group as defined in ``Config\Validation.php``:
-
-.. literalinclude:: controllers/018.php
-
-.. note:: Validation can also be handled automatically in the model, but sometimes it's easier to do it in the controller. Where is up to you.
-
-$this->validateData()
-=====================
-
-Sometimes you may want to check the controller method parameters or other custom data.
-In that case, you can use the ``$this->validateData()`` method.
-The method accepts an array of data to validate in the first parameter:
-
-.. literalinclude:: controllers/019.php
-
 That's it!
 **********
 

From 1cb1ba695f0585e54f22d7fb3d52ba97d5d8ee17 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 26 Feb 2022 16:07:30 +0900
Subject: [PATCH 1670/2325] docs: add explanation for auto-routing

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

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 277b17c0ae6a..f21e1aa4d366 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -135,6 +135,15 @@ The method accepts an array of data to validate in the first parameter:
 Auto Routing
 ************
 
+This section describes the functionality of the auto-routing.
+It automatically routes an HTTP request, and executes the corresponding controller method
+without route definitions. The auto-routing is enabled by default.
+
+.. note:: To prevent misconfiguration and miscoding, we recommend that you disable
+    the auto-routing feature. See :ref:`use-defined-routes-only`.
+
+.. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method.
+
 Consider this URI::
 
     example.com/index.php/helloworld/

From d8a1a0a6a46d11963ed6dda0879d56816f180c28 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 26 Feb 2022 16:07:52 +0900
Subject: [PATCH 1671/2325] docs: update what's controller

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

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index f21e1aa4d366..fff2e02ff2ec 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -11,7 +11,7 @@ Controllers are the heart of your application, as they determine how HTTP reques
 What is a Controller?
 *********************
 
-A Controller is simply a class file that is named in a way that it can be associated with a URI.
+A Controller is simply a class file that handles a HTTP request. :doc:`URI Routing <routing>` associates a URI with a controller.
 
 Remapping Method Calls
 **********************

From 77efb6d96cec1b58bd8c536e02485313739b7f45 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 26 Feb 2022 16:09:42 +0900
Subject: [PATCH 1672/2325] docs: change the position of sections

---
 .../source/incoming/controllers.rst           | 80 +++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index fff2e02ff2ec..dced7111a363 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -13,46 +13,6 @@ What is a Controller?
 
 A Controller is simply a class file that handles a HTTP request. :doc:`URI Routing <routing>` associates a URI with a controller.
 
-Remapping Method Calls
-**********************
-
-As noted above, the second segment of the URI typically determines which
-method in the controller gets called. CodeIgniter permits you to override
-this behavior through the use of the ``_remap()`` method:
-
-.. literalinclude:: controllers/010.php
-
-.. important:: If your controller contains a method named ``_remap()``,
-    it will **always** get called regardless of what your URI contains. It
-    overrides the normal behavior in which the URI determines which method
-    is called, allowing you to define your own method routing rules.
-
-The overridden method call (typically the second segment of the URI) will
-be passed as a parameter to the ``_remap()`` method:
-
-.. literalinclude:: controllers/011.php
-
-Any extra segments after the method name are passed into ``_remap()``. These parameters can be passed to the method
-to emulate CodeIgniter's default behavior.
-
-Example:
-
-.. literalinclude:: controllers/012.php
-
-Private methods
-***************
-
-In some cases, you may want certain methods hidden from public access.
-To achieve this, simply declare the method as ``private`` or ``protected``.
-That will prevent it from being served by a URL request. For example,
-if you were to define a method like this for the ``Helloworld`` controller:
-
-.. literalinclude:: controllers/013.php
-
-then trying to access it using the following URL will not work::
-
-    example.com/index.php/helloworld/utility/
-
 Included Properties
 *******************
 
@@ -132,6 +92,20 @@ The method accepts an array of data to validate in the first parameter:
 
 .. literalinclude:: controllers/019.php
 
+Private methods
+***************
+
+In some cases, you may want certain methods hidden from public access.
+To achieve this, simply declare the method as ``private`` or ``protected``.
+That will prevent it from being served by a URL request. For example,
+if you were to define a method like this for the ``Helloworld`` controller:
+
+.. literalinclude:: controllers/013.php
+
+then trying to access it using the following URL will not work::
+
+    example.com/index.php/helloworld/utility/
+
 Auto Routing
 ************
 
@@ -304,6 +278,32 @@ your **app/Config/Routes.php** file.
 
 CodeIgniter also permits you to remap your URIs using its :doc:`URI Routing <routing>` feature.
 
+Remapping Method Calls
+**********************
+
+As noted above, the second segment of the URI typically determines which
+method in the controller gets called. CodeIgniter permits you to override
+this behavior through the use of the ``_remap()`` method:
+
+.. literalinclude:: controllers/010.php
+
+.. important:: If your controller contains a method named ``_remap()``,
+    it will **always** get called regardless of what your URI contains. It
+    overrides the normal behavior in which the URI determines which method
+    is called, allowing you to define your own method routing rules.
+
+The overridden method call (typically the second segment of the URI) will
+be passed as a parameter to the ``_remap()`` method:
+
+.. literalinclude:: controllers/011.php
+
+Any extra segments after the method name are passed into ``_remap()``. These parameters can be passed to the method
+to emulate CodeIgniter's default behavior.
+
+Example:
+
+.. literalinclude:: controllers/012.php
+
 That's it!
 **********
 

From ffbf4f628c7daa6c3d3e56ca3a1dfd7b11ae010d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 26 Feb 2022 16:10:29 +0900
Subject: [PATCH 1673/2325] docs: fix title level

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

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index dced7111a363..a4c248d3979d 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -34,7 +34,8 @@ as a class property, ``$this->response``.
 An instance of the :doc:`Logger <../general/logging>` class is available as a class property,
 ``$this->logger``.
 
-**forceHTTPS**
+forceHTTPS
+**********
 
 A convenience method for forcing a method to be accessed via HTTPS is available within all
 controllers:

From d9facbb20901e0e0074b15733ce766b3354cbc41 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 26 Feb 2022 16:13:47 +0900
Subject: [PATCH 1674/2325] docs: change the position of sections

---
 .../source/incoming/controllers.rst           | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index a4c248d3979d..0cc90da352a5 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -34,6 +34,17 @@ as a class property, ``$this->response``.
 An instance of the :doc:`Logger <../general/logging>` class is available as a class property,
 ``$this->logger``.
 
+Helpers
+=======
+
+You can define an array of helper files as a class property. Whenever the controller is loaded
+these helper files will be automatically loaded into memory so that you can use their methods anywhere
+inside the controller:
+
+.. literalinclude:: controllers/016.php
+
+.. _controllers-validating-data:
+
 forceHTTPS
 **********
 
@@ -50,17 +61,6 @@ modify this by passing the duration (in seconds) as the first parameter:
 
 .. note:: A number of :doc:`time-based constants </general/common_functions>` are always available for you to use, including ``YEAR``, ``MONTH``, and more.
 
-Helpers
-=======
-
-You can define an array of helper files as a class property. Whenever the controller is loaded
-these helper files will be automatically loaded into memory so that you can use their methods anywhere
-inside the controller:
-
-.. literalinclude:: controllers/016.php
-
-.. _controllers-validating-data:
-
 Validating data
 ***************
 

From 65c6ad200302b1bf6b0eaa39172b3a458cd1060e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 26 Feb 2022 16:13:58 +0900
Subject: [PATCH 1675/2325] docs: fix link to Request

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

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 0cc90da352a5..4456eb5c8aa3 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -21,7 +21,7 @@ This class provides several features that are available to all of your controlle
 
 **Request Object**
 
-The application's main :doc:`Request Instance </incoming/request>` is always available
+The application's main :doc:`Request Instance </incoming/incomingrequest>` is always available
 as a class property, ``$this->request``.
 
 **Response Object**

From 31451b5353f345558e1c0e454c91fd7cce7df6ca Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 26 Feb 2022 16:17:43 +0900
Subject: [PATCH 1676/2325] docs: change page order, now routing is before
 controllers

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

diff --git a/user_guide_src/source/incoming/index.rst b/user_guide_src/source/incoming/index.rst
index b334cc5c5ac2..b4399e18d1ba 100644
--- a/user_guide_src/source/incoming/index.rst
+++ b/user_guide_src/source/incoming/index.rst
@@ -7,8 +7,8 @@ Controllers handle incoming requests.
 .. toctree::
     :titlesonly:
 
-    controllers
     routing
+    controllers
     filters
     message
     request

From c83057baf505c7224b89ca7ba38aaca9e03086f2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 26 Feb 2022 16:58:16 +0900
Subject: [PATCH 1677/2325] docs: move auto-routing section down

---
 .../source/incoming/controllers.rst           |  2 +
 user_guide_src/source/incoming/routing.rst    | 76 +++++++++----------
 2 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 4456eb5c8aa3..21c717d9eace 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -107,6 +107,8 @@ then trying to access it using the following URL will not work::
 
     example.com/index.php/helloworld/utility/
 
+.. _controller-auto-routing:
+
 Auto Routing
 ************
 
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 716e71674962..1f3bde9a02f0 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -6,46 +6,13 @@ URI Routing
     :local:
     :depth: 2
 
-******************************
-Auto Routes and Defined Routes
-******************************
+What is URI Routing?
+********************
 
-Auto Routes
-===========
+URI Routing associates a URI with a controller's method.
 
-Typically there is a one-to-one relationship between a URL string and its corresponding
-controller class/method. The segments in a URI normally follow this pattern::
-
-    example.com/class/method/id/
-
-We call this "**Auto Routes**". CodeIgniter automatically routes an HTTP request,
-and executes the corresponding controller method. The auto-routing is enabled by default.
-
-.. note:: To prevent misconfiguration and miscoding, we recommend that you disable
-    the auto-routing feature. See :ref:`use-defined-routes-only`.
-
-.. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method.
-
-Defined Routes
-==============
-
-In some instances, however, you may want to remap this relationship so that a different
-class/method can be called instead of the one corresponding to the URL.
-
-For example, let's say you want your URLs to have this prototype::
-
-    example.com/product/1/
-    example.com/product/2/
-    example.com/product/3/
-    example.com/product/4/
-
-Normally the second segment of the URL path is reserved for the method name, but in the example
-above it instead has a product ID. To overcome this, CodeIgniter allows you to remap the URI handler.
-We call this "**Defined Routes**".
-
-******************************
-Setting Your Own Routing Rules
-******************************
+Setting Routing Rules
+*********************
 
 Routing rules are defined in the **app/Config/Routes.php** file. In it you'll see that
 it creates an instance of the RouteCollection class (``$routes``) that permits you to specify your own routing criteria.
@@ -56,7 +23,7 @@ If you expect a GET request, you use the ``get()`` method:
 
 .. literalinclude:: routing/001.php
 
-A route simply takes the URI path on the left, and maps it to the controller and method on the right,
+A route simply takes the URI path (``/``) on the left, and maps it to the controller and method (``Home::index``) on the right,
 along with any parameters that should be passed to the controller. The controller and method should
 be listed in the same way that you would use a static method, by separating the class
 and its method with a double-colon, like ``Users::list``. If that method requires parameters to be
@@ -539,7 +506,7 @@ Use Defined Routes Only
 =======================
 
 When no defined route is found that matches the URI, the system will attempt to match that URI against the
-controllers and methods as described above. You can disable this automatic matching, and restrict routes
+controllers and methods as described in :ref:`auto-routing`. You can disable this automatic matching, and restrict routes
 to only those defined by you, by setting the ``setAutoRoute()`` option to false:
 
 .. literalinclude:: routing/046.php
@@ -565,7 +532,32 @@ For an example use of lowering the priority see :ref:`routing-priority`:
 
 .. literalinclude:: routing/048.php
 
-*****************
+.. _auto-routing:
+
+Auto Routing
+************
+
+It is recommended that all routes are defined in the **app/Config/Routes.php** file.
+However, CodeIgniter can also automatically route HTTP requests based on conventions
+and execute the corresponding controller methods.
+
+Consider this URI::
+
+    example.com/index.php/helloworld/index/1
+
+In the above example, CodeIgniter would attempt to find a controller named **Helloworld.php**
+and executes ``index()`` method with passing ``'1'`` as the first argument.
+
+We call this "**Auto Routes**". CodeIgniter automatically routes an HTTP request,
+and executes the corresponding controller method. The auto-routing is enabled by default.
+
+.. note:: To prevent misconfiguration and miscoding, we recommend that you disable
+    the auto-routing feature. See :ref:`use-defined-routes-only`.
+
+.. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method.
+
+See :ref:`Auto Routing in Controllers <controller-auto-routing>` for more info.
+
 Confirming Routes
 *****************
 
@@ -601,4 +593,4 @@ But ``[/...]`` in the route of an auto route is indicates any number of segments
 
 .. note:: When auto routing is enabled, if you have the route ``home``, it can be also accessd by ``Home``, or maybe by ``hOme``, ``hoMe``, ``HOME``, etc. But the command shows only ``home``.
 
-.. important:: The system is not perfect. If you use Custom Placeholders, *Filters* might not be correct. But the filters defined in **app/Config/Routes.php** are always displayed correctly.
\ No newline at end of file
+.. important:: The system is not perfect. If you use Custom Placeholders, *Filters* might not be correct. But the filters defined in **app/Config/Routes.php** are always displayed correctly.

From 76d3acddbe7bb01d527ba73c33e82f879bd11778 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 26 Feb 2022 17:05:04 +0900
Subject: [PATCH 1678/2325] docs: move the description on auto-routing in
 general/urls.rst to incoming/routing.rst

---
 user_guide_src/source/general/urls.rst     | 15 ++-------------
 user_guide_src/source/incoming/routing.rst | 11 +++++++++++
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/user_guide_src/source/general/urls.rst b/user_guide_src/source/general/urls.rst
index da056cc96cbc..252a907358dd 100644
--- a/user_guide_src/source/general/urls.rst
+++ b/user_guide_src/source/general/urls.rst
@@ -11,20 +11,9 @@ By default, URLs in CodeIgniter are designed to be search-engine and human-frien
 
     example.com/news/article/my_article
 
-URI Segments
-============
+Your URLs can be defined using the :doc:`URI Routing </incoming/routing>` feature with flexibility.
 
-The segments in the URL, in following with the Model-View-Controller approach, usually represent::
-
-    example.com/class/method/ID
-
-1. The first segment represents the controller **class** that should be invoked.
-2. The second segment represents the class **method** that should be called.
-3. The third, and any additional segments, represent the ID and any variables that will be passed to the controller.
-
-The :doc:`URI Library <../libraries/uri>` and the :doc:`URL Helper <../helpers/url_helper>` contain functions that make it easy
-to work with your URI data. In addition, your URLs can be remapped using the :doc:`URI Routing </incoming/routing>`
-feature for more flexibility.
+The :doc:`URI Library <../libraries/uri>` and the :doc:`URL Helper <../helpers/url_helper>` contain functions that make it easy to work with your URI data.
 
 Removing the index.php file
 ===========================
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 1f3bde9a02f0..5c527b7d0ada 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -541,6 +541,17 @@ It is recommended that all routes are defined in the **app/Config/Routes.php** f
 However, CodeIgniter can also automatically route HTTP requests based on conventions
 and execute the corresponding controller methods.
 
+URI Segments
+============
+
+The segments in the URL, in following with the Model-View-Controller approach, usually represent::
+
+    example.com/class/method/ID
+
+1. The first segment represents the controller **class** that should be invoked.
+2. The second segment represents the class **method** that should be called.
+3. The third, and any additional segments, represent the ID and any variables that will be passed to the controller.
+
 Consider this URI::
 
     example.com/index.php/helloworld/index/1

From 3fb2756c9258c1da3ad89e35acfe318d6da5eed0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 26 Feb 2022 18:03:10 +0900
Subject: [PATCH 1679/2325] docs: fix section title level

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

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 5c527b7d0ada..e5e0d04be5cc 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -443,7 +443,6 @@ To disable this functionality, you must call the method with the parameter ``fal
 
 .. _routes-configuration-options:
 
-****************************
 Routes Configuration Options
 ****************************
 

From db4acf11d7b6280ca39a785391f33d834a5281b3 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sat, 26 Feb 2022 21:06:35 +0700
Subject: [PATCH 1680/2325] [Doc] Upgrading to 4.2.0 from 4.1.9

Latest version is 4.1.9, so the note should be from 4.1.9
---
 user_guide_src/source/installation/upgrade_420.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/installation/upgrade_420.rst b/user_guide_src/source/installation/upgrade_420.rst
index d2050e08fa36..a302f113ae61 100644
--- a/user_guide_src/source/installation/upgrade_420.rst
+++ b/user_guide_src/source/installation/upgrade_420.rst
@@ -1,5 +1,5 @@
 #############################
-Upgrading from 4.1.8 to 4.2.0
+Upgrading from 4.1.9 to 4.2.0
 #############################
 
 Please refer to the upgrade instructions corresponding to your installation method.

From 194c2a072e7060fe7f104ee120d09ceb27eba192 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 27 Feb 2022 09:23:12 +0900
Subject: [PATCH 1681/2325] docs: remove "simply"

See https://jameshfisher.com/2017/02/22/dont-use-simply/
---
 user_guide_src/source/incoming/routing.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index e5e0d04be5cc..83cb4cc95e6d 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -23,7 +23,7 @@ If you expect a GET request, you use the ``get()`` method:
 
 .. literalinclude:: routing/001.php
 
-A route simply takes the URI path (``/``) on the left, and maps it to the controller and method (``Home::index``) on the right,
+A route takes the URI path (``/``) on the left, and maps it to the controller and method (``Home::index``) on the right,
 along with any parameters that should be passed to the controller. The controller and method should
 be listed in the same way that you would use a static method, by separating the class
 and its method with a double-colon, like ``Users::list``. If that method requires parameters to be

From e838375e9435a21b67c064bcc985cbdb7285fda0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 27 Feb 2022 09:28:28 +0900
Subject: [PATCH 1682/2325] docs: make it clear to recommend Composer
 installation

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

diff --git a/user_guide_src/source/installation/index.rst b/user_guide_src/source/installation/index.rst
index 92fe78d38184..3312ee24a4bf 100644
--- a/user_guide_src/source/installation/index.rst
+++ b/user_guide_src/source/installation/index.rst
@@ -7,10 +7,9 @@ using `Composer <https://getcomposer.org>`_, or using
 `Git <https://git-scm.com/>`_.
 Which is right for you?
 
+- We recommend the Composer installation. Because it keeps CodeIgniter up to date easily.
 - If you would like the simple "download & go" install that CodeIgniter3
   is known for, choose the manual installation.
-- If you plan to add third party packages to your project, or want to keep
-  CodeIgniter up to date easily, we recommend the Composer installation.
 
 .. toctree::
     :titlesonly:

From cd7e011c951092210567efa6c7bd1e7d47f2edca Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 27 Feb 2022 09:29:10 +0900
Subject: [PATCH 1683/2325] docs: move up paragraph and note

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

diff --git a/user_guide_src/source/installation/index.rst b/user_guide_src/source/installation/index.rst
index 3312ee24a4bf..31d58ac25673 100644
--- a/user_guide_src/source/installation/index.rst
+++ b/user_guide_src/source/installation/index.rst
@@ -11,6 +11,15 @@ Which is right for you?
 - If you would like the simple "download & go" install that CodeIgniter3
   is known for, choose the manual installation.
 
+However you choose to install and run CodeIgniter4, the
+`user guide <https://codeigniter4.github.io/userguide/>`_ is accessible online.
+
+.. note:: Before using CodeIgniter 4, make sure that your server meets the
+    :doc:`requirements </intro/requirements>`, in particular the PHP
+    version and the PHP extensions that are needed.
+    You may find that you have to uncomment the ``php.ini`` "extension"
+    lines to enable "curl" and "intl", for instance.
+
 .. toctree::
     :titlesonly:
 
@@ -21,12 +30,3 @@ Which is right for you?
     upgrading
     troubleshooting
     repositories
-
-However you choose to install and run CodeIgniter4, the
-`user guide <https://codeigniter4.github.io/userguide/>`_ is accessible online.
-
-.. note:: Before using CodeIgniter 4, make sure that your server meets the
-    :doc:`requirements </intro/requirements>`, in particular the PHP
-    version and the PHP extensions that are needed.
-    You may find that you have to uncomment the ``php.ini`` "extension"
-    lines to enable "curl" and "intl", for instance.

From becabdc48324275e53cf4e238d59ce1fe2889d36 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 27 Feb 2022 19:06:23 +0900
Subject: [PATCH 1684/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/installation/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/installation/index.rst b/user_guide_src/source/installation/index.rst
index 31d58ac25673..243dd1a5b314 100644
--- a/user_guide_src/source/installation/index.rst
+++ b/user_guide_src/source/installation/index.rst
@@ -7,7 +7,7 @@ using `Composer <https://getcomposer.org>`_, or using
 `Git <https://git-scm.com/>`_.
 Which is right for you?
 
-- We recommend the Composer installation. Because it keeps CodeIgniter up to date easily.
+- We recommend the Composer installation because it keeps CodeIgniter up to date easily.
 - If you would like the simple "download & go" install that CodeIgniter3
   is known for, choose the manual installation.
 

From 7aa73b9cd5ce33d50696ad1b3478729bd715127b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 28 Feb 2022 10:08:23 +0900
Subject: [PATCH 1685/2325] docs: remove unneeded page titles

---
 .../source/installation/upgrading.rst         | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index 322302d3e011..aa79ef0d6bc7 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -12,15 +12,15 @@ upgrading from.
 .. toctree::
     :titlesonly:
 
-    Upgrading from 4.1.8 to 4.2.0 <upgrade_420>
-    Upgrading from 4.1.7 to 4.1.8 <upgrade_418>
-    Upgrading from 4.1.6 to 4.1.7 <upgrade_417>
-    Upgrading from 4.1.5 to 4.1.6 <upgrade_416>
-    Upgrading from 4.1.4 to 4.1.5 <upgrade_415>
-    Upgrading from 4.1.3 to 4.1.4 <upgrade_414>
-    Upgrading from 4.1.2 to 4.1.3 <upgrade_413>
-    Upgrading from 4.1.1 to 4.1.2 <upgrade_412>
-    Upgrading from 4.0.5 to 4.1.0 or 4.1.1 <upgrade_410>
-    Upgrading from 4.0.4 to 4.0.5 <upgrade_405>
-    Upgrading from 4.0.x to 4.0.4 <upgrade_404>
-    Upgrading from 3.x to 4.x <upgrade_4xx>
+    upgrade_420
+    upgrade_418
+    upgrade_417
+    upgrade_416
+    upgrade_415
+    upgrade_414
+    upgrade_413
+    upgrade_412
+    upgrade_410
+    upgrade_405
+    upgrade_404
+    upgrade_4xx

From 4aad6438e1f298170cedbb6a11bfe5c56f840293 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Mon, 28 Feb 2022 12:11:54 +0100
Subject: [PATCH 1686/2325] Fix cli.

---
 .../source/cli/cli_commands/004.php           | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/user_guide_src/source/cli/cli_commands/004.php b/user_guide_src/source/cli/cli_commands/004.php
index 64b5af943315..e6178256c524 100644
--- a/user_guide_src/source/cli/cli_commands/004.php
+++ b/user_guide_src/source/cli/cli_commands/004.php
@@ -1,11 +1,21 @@
 <?php
 
-public function run(array $params)
+namespace App\Commands;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+
+class AppInfo extends BaseCommand
 {
-    CLI::write('PHP Version: '. CLI::color(phpversion(), 'yellow'));
-    CLI::write('CI Version: '. CLI::color(\CodeIgniter\CodeIgniter::CI_VERSION, 'yellow'));
-    CLI::write('APPPATH: '. CLI::color(APPPATH, 'yellow'));
-    CLI::write('SYSTEMPATH: '. CLI::color(SYSTEMPATH, 'yellow'));
-    CLI::write('ROOTPATH: '. CLI::color(ROOTPATH, 'yellow'));
-    CLI::write('Included files: '. CLI::color(count(get_included_files()), 'yellow'));
+    // ...
+
+    public function run(array $params)
+    {
+        CLI::write('PHP Version: ' . CLI::color(PHP_VERSION, 'yellow'));
+        CLI::write('CI Version: ' . CLI::color(\CodeIgniter\CodeIgniter::CI_VERSION, 'yellow'));
+        CLI::write('APPPATH: ' . CLI::color(APPPATH, 'yellow'));
+        CLI::write('SYSTEMPATH: ' . CLI::color(SYSTEMPATH, 'yellow'));
+        CLI::write('ROOTPATH: ' . CLI::color(ROOTPATH, 'yellow'));
+        CLI::write('Included files: ' . CLI::color(count(get_included_files()), 'yellow'));
+    }
 }

From 847192909b8dc4dec2cb7096d5366d1de0204bbc Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Mon, 28 Feb 2022 12:12:20 +0100
Subject: [PATCH 1687/2325] Fix concepts.

---
 user_guide_src/source/concepts/factories/003.php | 8 ++++++--
 user_guide_src/source/concepts/services/007.php  | 7 +++++--
 user_guide_src/source/concepts/services/008.php  | 7 +++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/concepts/factories/003.php b/user_guide_src/source/concepts/factories/003.php
index 6c5b966f35cc..5b34b3ff4fcd 100644
--- a/user_guide_src/source/concepts/factories/003.php
+++ b/user_guide_src/source/concepts/factories/003.php
@@ -2,6 +2,10 @@
 
 class SomeOtherClass
 {
-    $widgets = Factories::models('WidgetModel');
-    // ...
+    public function someFunction()
+    {
+        $widgets = Factories::models('WidgetModel');
+
+        // ...
+    }
 }
diff --git a/user_guide_src/source/concepts/services/007.php b/user_guide_src/source/concepts/services/007.php
index 64a1119f0ace..6096fe592142 100644
--- a/user_guide_src/source/concepts/services/007.php
+++ b/user_guide_src/source/concepts/services/007.php
@@ -1,6 +1,9 @@
 <?php
 
-public static function routes()
+class Services extends BaseService
 {
-    return new \App\Router\MyRouter();
+    public static function routes()
+    {
+        return new \App\Router\MyRouter();
+    }
 }
diff --git a/user_guide_src/source/concepts/services/008.php b/user_guide_src/source/concepts/services/008.php
index 36efba2156bd..3fdffe4ddd9d 100644
--- a/user_guide_src/source/concepts/services/008.php
+++ b/user_guide_src/source/concepts/services/008.php
@@ -1,6 +1,9 @@
 <?php
 
-public static function renderer($viewPath = APPPATH . 'views/')
+class Services extends BaseService
 {
-    return new \CodeIgniter\View\View($viewPath);
+    public static function renderer($viewPath = APPPATH . 'views/')
+    {
+        return new \CodeIgniter\View\View($viewPath);
+    }
 }

From 257413dd810f3f437fcfcf779487a0d1a7b475a7 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Mon, 28 Feb 2022 12:12:33 +0100
Subject: [PATCH 1688/2325] Fix database.

---
 .../source/database/configuration/001.php     | 39 ++++++++++---------
 .../source/database/configuration/006.php     | 39 ++++++++++---------
 2 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/user_guide_src/source/database/configuration/001.php b/user_guide_src/source/database/configuration/001.php
index c868ee08eb37..5a59fabfcfdc 100644
--- a/user_guide_src/source/database/configuration/001.php
+++ b/user_guide_src/source/database/configuration/001.php
@@ -1,20 +1,23 @@
 <?php
 
-public $default = [
-    'DSN'      => '',
-    'hostname' => 'localhost',
-    'username' => 'root',
-    'password' => '',
-    'database' => 'database_name',
-    'DBDriver' => 'MySQLi',
-    'DBPrefix' => '',
-    'pConnect' => true,
-    'DBDebug'  => true,
-    'charset'  => 'utf8',
-    'DBCollat' => 'utf8_general_ci',
-    'swapPre'  => '',
-    'encrypt'  => false,
-    'compress' => false,
-    'strictOn' => false,
-    'failover' => [],
-];
+class Database extends Config
+{
+    public $default = [
+        'DSN'      => '',
+        'hostname' => 'localhost',
+        'username' => 'root',
+        'password' => '',
+        'database' => 'database_name',
+        'DBDriver' => 'MySQLi',
+        'DBPrefix' => '',
+        'pConnect' => true,
+        'DBDebug'  => true,
+        'charset'  => 'utf8',
+        'DBCollat' => 'utf8_general_ci',
+        'swapPre'  => '',
+        'encrypt'  => false,
+        'compress' => false,
+        'strictOn' => false,
+        'failover' => [],
+    ];
+}
diff --git a/user_guide_src/source/database/configuration/006.php b/user_guide_src/source/database/configuration/006.php
index 31b56a677829..d5b4a5d691d5 100644
--- a/user_guide_src/source/database/configuration/006.php
+++ b/user_guide_src/source/database/configuration/006.php
@@ -1,20 +1,23 @@
 <?php
 
-public $test = [
-    'DSN'      => '',
-    'hostname' => 'localhost',
-    'username' => 'root',
-    'password' => '',
-    'database' => 'database_name',
-    'DBDriver' => 'MySQLi',
-    'DBPrefix' => '',
-    'pConnect' => true,
-    'DBDebug'  => true,
-    'charset'  => 'utf8',
-    'DBCollat' => 'utf8_general_ci',
-    'swapPre'  => '',
-    'compress' => false,
-    'encrypt'  => false,
-    'strictOn' => false,
-    'failover' => []
-);
+class Database extends Config
+{
+    public $test = [
+        'DSN'      => '',
+        'hostname' => 'localhost',
+        'username' => 'root',
+        'password' => '',
+        'database' => 'database_name',
+        'DBDriver' => 'MySQLi',
+        'DBPrefix' => '',
+        'pConnect' => true,
+        'DBDebug'  => true,
+        'charset'  => 'utf8',
+        'DBCollat' => 'utf8_general_ci',
+        'swapPre'  => '',
+        'compress' => false,
+        'encrypt'  => false,
+        'strictOn' => false,
+        'failover' => [],
+    ];
+}

From b6fe091fed9b941e39fdde07891aed71b1c011cf Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Mon, 28 Feb 2022 12:12:44 +0100
Subject: [PATCH 1689/2325] Fix dbmgmt.

---
 user_guide_src/source/dbmgmt/migration/002.php | 12 +++++++-----
 user_guide_src/source/dbmgmt/seeds/003.php     |  9 ++++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/user_guide_src/source/dbmgmt/migration/002.php b/user_guide_src/source/dbmgmt/migration/002.php
index 07d2b2034775..35726a23aade 100644
--- a/user_guide_src/source/dbmgmt/migration/002.php
+++ b/user_guide_src/source/dbmgmt/migration/002.php
@@ -1,10 +1,12 @@
 <?php
 
-public function up()
+class AddBlog extends Migration
 {
-    $this->db->disableForeignKeyChecks()
+    public function up()
+    {
+        $this->db->disableForeignKeyChecks();
 
-    // Migration rules would go here..
-
-    $this->db->enableForeignKeyChecks();
+        // Migration rules would go here..
+        $this->db->enableForeignKeyChecks();
+    }
 }
diff --git a/user_guide_src/source/dbmgmt/seeds/003.php b/user_guide_src/source/dbmgmt/seeds/003.php
index 12dbcbd74835..099904f4f2ab 100644
--- a/user_guide_src/source/dbmgmt/seeds/003.php
+++ b/user_guide_src/source/dbmgmt/seeds/003.php
@@ -1,7 +1,10 @@
 <?php
 
-public function run()
+class SimpleSeeder extends Seeder
 {
-    $this->call('UserSeeder');
-    $this->call('My\Database\Seeds\CountrySeeder');
+    public function run()
+    {
+        $this->call('UserSeeder');
+        $this->call('My\Database\Seeds\CountrySeeder');
+    }
 }

From 6822f25618ba622edac30193523764353ad17383 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Mon, 28 Feb 2022 12:12:57 +0100
Subject: [PATCH 1690/2325] Fix extending.

---
 .../source/extending/basecontroller/002.php         |  5 ++++-
 .../source/extending/basecontroller/003.php         | 11 +++++++----
 .../source/extending/core_classes/002.php           | 13 ++++++++-----
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/user_guide_src/source/extending/basecontroller/002.php b/user_guide_src/source/extending/basecontroller/002.php
index dee702c36ecb..509bb27a8707 100644
--- a/user_guide_src/source/extending/basecontroller/002.php
+++ b/user_guide_src/source/extending/basecontroller/002.php
@@ -1,3 +1,6 @@
 <?php
 
-protected $helpers = ['html', 'text'];
+class Home extends BaseController
+{
+    protected $helpers = ['html', 'text'];
+}
diff --git a/user_guide_src/source/extending/basecontroller/003.php b/user_guide_src/source/extending/basecontroller/003.php
index efc4168c43ac..5c053a71669f 100644
--- a/user_guide_src/source/extending/basecontroller/003.php
+++ b/user_guide_src/source/extending/basecontroller/003.php
@@ -1,9 +1,12 @@
 <?php
 
-public function initController(...)
+class Home extends BaseController
 {
-    // Do Not Edit This Line
-    parent::initController($request, $response, $logger);
+    public function initController(/* ... */)
+    {
+        // Do Not Edit This Line
+        parent::initController($request, $response, $logger);
 
-    $this->session = \Config\Services::session();
+        $this->session = \Config\Services::session();
+    }
 }
diff --git a/user_guide_src/source/extending/core_classes/002.php b/user_guide_src/source/extending/core_classes/002.php
index 65fb5c240f41..cc3f38347ccf 100644
--- a/user_guide_src/source/extending/core_classes/002.php
+++ b/user_guide_src/source/extending/core_classes/002.php
@@ -1,10 +1,13 @@
 <?php
 
-public static function routes(bool $getShared = true)
+class Services extends BaseService
 {
-    if ($getShared) {
-        return static::getSharedInstance('routes');
-    }
+    public static function routes(bool $getShared = true)
+    {
+        if ($getShared) {
+            return static::getSharedInstance('routes');
+        }
 
-    return new \App\Libraries\RouteCollection(static::locator(), config('Modules'));
+        return new \App\Libraries\RouteCollection(static::locator(), config('Modules'));
+    }
 }

From 869e4c17e86cfd202f9fa4a0870389dd80cac259 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Mon, 28 Feb 2022 12:16:30 +0100
Subject: [PATCH 1691/2325] Fix events.

---
 user_guide_src/source/database/events/001.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/user_guide_src/source/database/events/001.php b/user_guide_src/source/database/events/001.php
index 1c8b56b1d1ca..2065ef3d426b 100644
--- a/user_guide_src/source/database/events/001.php
+++ b/user_guide_src/source/database/events/001.php
@@ -2,9 +2,3 @@
 
 // In Config\Events.php
 Events::on('DBQuery', 'CodeIgniter\Debug\Toolbar\Collectors\Database::collect');
-
-// Collect the queries so something can be done with them later.
-public static function collect(CodeIgniter\Database\Query $query)
-{
-    static::$queries[] = $query;
-}

From 591abc91f700137268670c39a3b8f2470647d875 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Mon, 28 Feb 2022 12:34:03 +0100
Subject: [PATCH 1692/2325] Fix testing.

---
 .../source/testing/controllers/014.php        | 13 ++++++---
 .../source/testing/debugging/003.php          | 23 ++++++++-------
 user_guide_src/source/testing/overview.rst    |  7 +++--
 .../source/testing/overview/003.php           |  6 ----
 .../source/testing/overview/004.php           |  9 ++++--
 .../source/testing/overview/005.php           | 14 +++++----
 .../source/testing/overview/006.php           |  4 +--
 .../source/testing/overview/007.php           |  8 +++--
 .../source/testing/overview/017.php           | 15 ++++++----
 .../source/testing/overview/018.php           | 11 ++++---
 .../source/testing/overview/019.php           | 29 ++++++++++---------
 11 files changed, 80 insertions(+), 59 deletions(-)
 delete mode 100644 user_guide_src/source/testing/overview/003.php

diff --git a/user_guide_src/source/testing/controllers/014.php b/user_guide_src/source/testing/controllers/014.php
index 19f2310392fa..bc6dc8bf9e18 100644
--- a/user_guide_src/source/testing/controllers/014.php
+++ b/user_guide_src/source/testing/controllers/014.php
@@ -1,9 +1,14 @@
 <?php
 
-protected function testUnauthorizedAccessRedirects()
+final class FilterTestCase extends CIUnitTestCase
 {
-    $caller = $this->getFilterCaller('permission', 'before');
-    $result = $caller('MayEditWidgets');
+    use FilterTestTrait;
 
-    $this->assertInstanceOf('CodeIgniter\HTTP\RedirectResponse', $result);
+    protected function testUnauthorizedAccessRedirects()
+    {
+        $caller = $this->getFilterCaller('permission', 'before');
+        $result = $caller('MayEditWidgets');
+
+        $this->assertInstanceOf('CodeIgniter\HTTP\RedirectResponse', $result);
+    }
 }
diff --git a/user_guide_src/source/testing/debugging/003.php b/user_guide_src/source/testing/debugging/003.php
index b7e19588fae9..de9476fe7d39 100644
--- a/user_guide_src/source/testing/debugging/003.php
+++ b/user_guide_src/source/testing/debugging/003.php
@@ -1,12 +1,15 @@
 <?php
 
-public $collectors = [
-    \CodeIgniter\Debug\Toolbar\Collectors\Timers::class,
-    \CodeIgniter\Debug\Toolbar\Collectors\Database::class,
-    \CodeIgniter\Debug\Toolbar\Collectors\Logs::class,
-    \CodeIgniter\Debug\Toolbar\Collectors\Views::class,
-    \CodeIgniter\Debug\Toolbar\Collectors\Cache::class,
-    \CodeIgniter\Debug\Toolbar\Collectors\Files::class,
-    \CodeIgniter\Debug\Toolbar\Collectors\Routes::class,
-    \CodeIgniter\Debug\Toolbar\Collectors\Events::class,
-];
+class Toolbar extends BaseConfig
+{
+    public $collectors = [
+        \CodeIgniter\Debug\Toolbar\Collectors\Timers::class,
+        \CodeIgniter\Debug\Toolbar\Collectors\Database::class,
+        \CodeIgniter\Debug\Toolbar\Collectors\Logs::class,
+        \CodeIgniter\Debug\Toolbar\Collectors\Views::class,
+        \CodeIgniter\Debug\Toolbar\Collectors\Cache::class,
+        \CodeIgniter\Debug\Toolbar\Collectors\Files::class,
+        \CodeIgniter\Debug\Toolbar\Collectors\Routes::class,
+        \CodeIgniter\Debug\Toolbar\Collectors\Events::class,
+    ];
+}
diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst
index b689a8e90259..648b3b4e79d9 100644
--- a/user_guide_src/source/testing/overview.rst
+++ b/user_guide_src/source/testing/overview.rst
@@ -83,9 +83,12 @@ Staging
 -------
 
 Most tests require some preparation in order to run correctly. PHPUnit's ``TestCase`` provides four methods
-to help with staging and clean up:
+to help with staging and clean up::
 
-.. literalinclude:: overview/003.php
+    public static function setUpBeforeClass(): void
+    public static function tearDownAfterClass(): void
+    public function setUp(): void
+    public function tearDown(): void
 
 The static methods run before and after the entire test case, whereas the local methods run
 between each test. If you implement any of these special functions make sure you run their
diff --git a/user_guide_src/source/testing/overview/003.php b/user_guide_src/source/testing/overview/003.php
deleted file mode 100644
index 9623bc2c7773..000000000000
--- a/user_guide_src/source/testing/overview/003.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-public static function setUpBeforeClass(): void
-public static function tearDownAfterClass(): void
-public function setUp(): void
-public function tearDown(): void
diff --git a/user_guide_src/source/testing/overview/004.php b/user_guide_src/source/testing/overview/004.php
index 6b6fef8e11bb..2f8a20c6ca52 100644
--- a/user_guide_src/source/testing/overview/004.php
+++ b/user_guide_src/source/testing/overview/004.php
@@ -1,7 +1,10 @@
 <?php
 
-public function setUp(): void
+final class OneOfMyModelsTest extends CIUnitTestCase
 {
-    parent::setUp();
-    helper('text');
+    protected function setUp(): void
+    {
+        parent::setUp();
+        helper('text');
+    }
 }
diff --git a/user_guide_src/source/testing/overview/005.php b/user_guide_src/source/testing/overview/005.php
index 609ff84c6d8d..68a0d15fda19 100644
--- a/user_guide_src/source/testing/overview/005.php
+++ b/user_guide_src/source/testing/overview/005.php
@@ -1,8 +1,10 @@
 <?php
 
-protected $setUpMethods = [
-    'mockEmail',
-    'mockSession',
-];
-
-protected $tearDownMethods = [];
+final class OneOfMyModelsTest extends CIUnitTestCase
+{
+    protected $setUpMethods = [
+        'mockEmail',
+        'mockSession',
+    ];
+    protected $tearDownMethods = [];
+}
diff --git a/user_guide_src/source/testing/overview/006.php b/user_guide_src/source/testing/overview/006.php
index 1ab3e692f0eb..e7d8031ba319 100644
--- a/user_guide_src/source/testing/overview/006.php
+++ b/user_guide_src/source/testing/overview/006.php
@@ -1,6 +1,6 @@
 <?php
 
-class OneOfMyModelsTest extends CIUnitTestCase
+final class OneOfMyModelsTest extends CIUnitTestCase
 {
     protected $tearDownMethods = [
         'purgeRows',
@@ -8,6 +8,6 @@ class OneOfMyModelsTest extends CIUnitTestCase
 
     protected function purgeRows()
     {
-        $this->model->purgeDeleted()
+        $this->model->purgeDeleted();
     }
 }
diff --git a/user_guide_src/source/testing/overview/007.php b/user_guide_src/source/testing/overview/007.php
index c829e5b99cce..1ba21e197b0a 100644
--- a/user_guide_src/source/testing/overview/007.php
+++ b/user_guide_src/source/testing/overview/007.php
@@ -2,16 +2,18 @@
 
 trait AuthTrait
 {
-    protected setUpAuthTrait()
+    protected function setUpAuthTrait()
     {
         $user = $this->createFakeUser();
         $this->logInUser($user);
     }
-    
     // ...
 }
 
-class AuthenticationFeatureTest
+/**
+ * @internal
+ */
+final class AuthenticationFeatureTest
 {
     use AuthTrait;
 
diff --git a/user_guide_src/source/testing/overview/017.php b/user_guide_src/source/testing/overview/017.php
index 653c7d0947ba..9fb311e795e3 100644
--- a/user_guide_src/source/testing/overview/017.php
+++ b/user_guide_src/source/testing/overview/017.php
@@ -1,11 +1,14 @@
 <?php
 
-public function testSomething()
+final class Sometest extends CIUnitTestCase
 {
-    $curlrequest = $this->getMockBuilder('CodeIgniter\HTTP\CURLRequest')
-                        ->setMethods(['request'])
-                        ->getMock();
-    Services::injectMock('curlrequest', $curlrequest);
+    public function testSomething()
+    {
+        $curlrequest = $this->getMockBuilder('CodeIgniter\HTTP\CURLRequest')
+            ->setMethods(['request'])
+            ->getMock();
+        Services::injectMock('curlrequest', $curlrequest);
 
-    // Do normal testing here....
+        // Do normal testing here....
+    }
 }
diff --git a/user_guide_src/source/testing/overview/018.php b/user_guide_src/source/testing/overview/018.php
index 743074117d9e..4c607dddb77e 100644
--- a/user_guide_src/source/testing/overview/018.php
+++ b/user_guide_src/source/testing/overview/018.php
@@ -1,9 +1,12 @@
 <?php
 
-protected function setUp()
+final class Sometest extends CIUnitTestCase
 {
-    parent::setUp();
+    protected function setUp()
+    {
+        parent::setUp();
 
-    $model = new MockUserModel();
-    Factories::injectMock('models', 'App\Models\UserModel', $model);
+        $model = new MockUserModel();
+        Factories::injectMock('models', 'App\Models\UserModel', $model);
+    }
 }
diff --git a/user_guide_src/source/testing/overview/019.php b/user_guide_src/source/testing/overview/019.php
index 41fcfeb08925..3ede5c1e1291 100644
--- a/user_guide_src/source/testing/overview/019.php
+++ b/user_guide_src/source/testing/overview/019.php
@@ -1,19 +1,22 @@
 <?php
 
-public function setUp()
+final class Sometest extends CIUnitTestCase
 {
-    CITestStreamFilter::$buffer = '';
-    $this->stream_filter = stream_filter_append(STDOUT, 'CITestStreamFilter');
-}
+    protected function setUp()
+    {
+        CITestStreamFilter::$buffer = '';
+        $this->stream_filter        = stream_filter_append(STDOUT, 'CITestStreamFilter');
+    }
 
-public function tearDown()
-{
-    stream_filter_remove($this->stream_filter);
-}
+    protected function tearDown()
+    {
+        stream_filter_remove($this->stream_filter);
+    }
 
-public function testSomeOutput()
-{
-    CLI::write('first.');
-    $expected = "first.\n";
-    $this->assertSame($expected, CITestStreamFilter::$buffer);
+    public function testSomeOutput()
+    {
+        CLI::write('first.');
+        $expected = "first.\n";
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
+    }
 }

From 237f218424869d0b0707d5b0db2571fdfd5500fd Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Mon, 28 Feb 2022 12:36:03 +0100
Subject: [PATCH 1693/2325] Fix helpers.

---
 user_guide_src/source/helpers/test_helper/002.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/helpers/test_helper/002.php b/user_guide_src/source/helpers/test_helper/002.php
index 58decc5bfeb3..10fb42b1260f 100644
--- a/user_guide_src/source/helpers/test_helper/002.php
+++ b/user_guide_src/source/helpers/test_helper/002.php
@@ -1,8 +1,11 @@
 <?php
 
-public function testUserAccess()
+final class MyTestClass extends \CodeIgniter\Test\CIUnitTestCase
 {
-    $user = fake('App\Models\UserModel');
+    public function testUserAccess()
+    {
+        $user = fake('App\Models\UserModel');
 
-    $this->assertTrue($this->userHasAccess($user));
+        $this->assertTrue($this->userHasAccess($user));
+    }
 }

From 7c9091c3fe900467d030bf444cdb0b256015ceb1 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Mon, 28 Feb 2022 13:38:10 +0100
Subject: [PATCH 1694/2325] Fix incoming.

---
 .../source/incoming/controllers/005.php       |  6 +++-
 .../source/incoming/controllers/010.php       |  7 +++--
 .../source/incoming/controllers/011.php       | 11 ++++---
 .../source/incoming/controllers/012.php       | 15 ++++++----
 .../source/incoming/controllers/013.php       |  7 +++--
 .../source/incoming/controllers/017.php       | 23 +++++++-------
 .../source/incoming/controllers/018.php       | 17 ++++++-----
 .../source/incoming/controllers/019.php       | 30 +++++++++++--------
 .../source/incoming/filters/002.php           | 11 ++++---
 .../source/incoming/filters/003.php           |  9 ++++--
 .../source/incoming/filters/004.php           | 15 ++++++----
 .../source/incoming/filters/005.php           | 15 ++++++----
 .../source/incoming/filters/006.php           | 15 ++++++----
 .../source/incoming/filters/007.php           | 15 ++++++----
 .../source/incoming/filters/008.php           | 11 ++++---
 .../source/incoming/filters/009.php           | 11 ++++---
 .../source/incoming/filters/011.php           | 11 ++++---
 .../source/incoming/routing/011.php           | 12 +++++---
 18 files changed, 149 insertions(+), 92 deletions(-)

diff --git a/user_guide_src/source/incoming/controllers/005.php b/user_guide_src/source/incoming/controllers/005.php
index 5d3892bfafb8..84b910be2507 100644
--- a/user_guide_src/source/incoming/controllers/005.php
+++ b/user_guide_src/source/incoming/controllers/005.php
@@ -1,5 +1,9 @@
 <?php
 
-\<NamespaceName>(\<SubNamespaceNames>)*\<ClassName>
+/*
+  Folder and file structure:
+
+  \<NamespaceName>(\<SubNamespaceNames>)*\<ClassName>
+ */
 
 $routes->get('helloworld', '\App\Controllers\HelloWorld::index');
diff --git a/user_guide_src/source/incoming/controllers/010.php b/user_guide_src/source/incoming/controllers/010.php
index e017dcd45cdb..b74d386d6289 100644
--- a/user_guide_src/source/incoming/controllers/010.php
+++ b/user_guide_src/source/incoming/controllers/010.php
@@ -1,6 +1,9 @@
 <?php
 
-public function _remap()
+class myController extends BaseController
 {
-    // Some code here...
+    public function _remap()
+    {
+        // Some code here...
+    }
 }
diff --git a/user_guide_src/source/incoming/controllers/011.php b/user_guide_src/source/incoming/controllers/011.php
index 14844a8afc1d..c6b648d617c4 100644
--- a/user_guide_src/source/incoming/controllers/011.php
+++ b/user_guide_src/source/incoming/controllers/011.php
@@ -1,10 +1,13 @@
 <?php
 
-public function _remap($method)
+class myController extends BaseController
 {
-    if ($method === 'some_method') {
-        return $this->$method();
-    } else {
+    public function _remap($method)
+    {
+        if ($method === 'some_method') {
+            return $this->{$method}();
+        }
+
         return $this->default_method();
     }
 }
diff --git a/user_guide_src/source/incoming/controllers/012.php b/user_guide_src/source/incoming/controllers/012.php
index 25d064b859cd..e6cc91140f6f 100644
--- a/user_guide_src/source/incoming/controllers/012.php
+++ b/user_guide_src/source/incoming/controllers/012.php
@@ -1,12 +1,15 @@
 <?php
 
-public function _remap($method, ...$params)
+class myController extends BaseController
 {
-    $method = 'process_'.$method;
+    public function _remap($method, ...$params)
+    {
+        $method = 'process_' . $method;
 
-    if (method_exists($this, $method)) {
-        return $this->$method(...$params);
-    }
+        if (method_exists($this, $method)) {
+            return $this->{$method}(...$params);
+        }
 
-    throw \CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound();
+        throw \CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound();
+    }
 }
diff --git a/user_guide_src/source/incoming/controllers/013.php b/user_guide_src/source/incoming/controllers/013.php
index eed95b673ad2..2586a7781dfe 100644
--- a/user_guide_src/source/incoming/controllers/013.php
+++ b/user_guide_src/source/incoming/controllers/013.php
@@ -1,6 +1,9 @@
 <?php
 
-protected function utility()
+class myController extends BaseController
 {
-    // some code
+    protected function utility()
+    {
+        // some code
+    }
 }
diff --git a/user_guide_src/source/incoming/controllers/017.php b/user_guide_src/source/incoming/controllers/017.php
index 11a9df5d8a34..8e4e5b50f96a 100644
--- a/user_guide_src/source/incoming/controllers/017.php
+++ b/user_guide_src/source/incoming/controllers/017.php
@@ -1,15 +1,18 @@
 <?php
 
-public function updateUser(int $userID)
+class userController extends BaseController
 {
-    if (! $this->validate([
-        'email' => "required|is_unique[users.email,id,{$userID}]",
-        'name'  => 'required|alpha_numeric_spaces'
-    ])) {
-        return view('users/update', [
-            'errors' => $this->validator->getErrors()
-        ]);
-    }
+    public function updateUser(int $userID)
+    {
+        if (! $this->validate([
+            'email' => "required|is_unique[users.email,id,{$userID}]",
+            'name' => 'required|alpha_numeric_spaces',
+        ])) {
+            return view('users/update', [
+                'errors' => $this->validator->getErrors(),
+            ]);
+        }
 
-    // do something here if successful...
+        // do something here if successful...
+    }
 }
diff --git a/user_guide_src/source/incoming/controllers/018.php b/user_guide_src/source/incoming/controllers/018.php
index 54697409827a..29c3780cc854 100644
--- a/user_guide_src/source/incoming/controllers/018.php
+++ b/user_guide_src/source/incoming/controllers/018.php
@@ -1,12 +1,15 @@
 <?php
 
-public function updateUser(int $userID)
+class userController extends BaseController
 {
-    if (! $this->validate('userRules')) {
-        return view('users/update', [
-            'errors' => $this->validator->getErrors()
-        ]);
-    }
+    public function updateUser(int $userID)
+    {
+        if (! $this->validate('userRules')) {
+            return view('users/update', [
+                'errors' => $this->validator->getErrors(),
+            ]);
+        }
 
-    // do something here if successful...
+        // do something here if successful...
+    }
 }
diff --git a/user_guide_src/source/incoming/controllers/019.php b/user_guide_src/source/incoming/controllers/019.php
index e5a96084c2c2..c27156d7232a 100644
--- a/user_guide_src/source/incoming/controllers/019.php
+++ b/user_guide_src/source/incoming/controllers/019.php
@@ -1,19 +1,23 @@
 <?php
 
-public function product(int $id)
+class storeController extends BaseController
 {
-    $data = [
-        'id'   => $id,
-        'name' => $this->request->getVar('name'),
-    ];
-    $rule = [
-        'id'   => 'integer',
-        'name' => 'required|max_length[255]',
-    ];
+    public function product(int $id)
+    {
+        $data = [
+            'id'   => $id,
+            'name' => $this->request->getVar('name'),
+        ];
+
+        $rule = [
+            'id'   => 'integer',
+            'name' => 'required|max_length[255]',
+        ];
+
+        if (! $this->validateData($data, $rule)) {
+            // ...
+        }
 
-    if (! $this->validateData($data, $rule) {
         // ...
     }
-
-    // ...
-}
\ No newline at end of file
+}
diff --git a/user_guide_src/source/incoming/filters/002.php b/user_guide_src/source/incoming/filters/002.php
index 792921a348ef..b6c77a2eaa34 100644
--- a/user_guide_src/source/incoming/filters/002.php
+++ b/user_guide_src/source/incoming/filters/002.php
@@ -1,10 +1,13 @@
 <?php
 
-public function before(RequestInterface $request, $arguments = null)
+class MyFilter implements FilterInterface
 {
-    $auth = service('auth');
+    public function before(RequestInterface $request, $arguments = null)
+    {
+        $auth = service('auth');
 
-    if (! $auth->isLoggedIn()) {
-        return redirect()->to(site_url('login'));
+        if (! $auth->isLoggedIn()) {
+            return redirect()->to(site_url('login'));
+        }
     }
 }
diff --git a/user_guide_src/source/incoming/filters/003.php b/user_guide_src/source/incoming/filters/003.php
index 1ef6a461f3c6..a757fdf8f029 100644
--- a/user_guide_src/source/incoming/filters/003.php
+++ b/user_guide_src/source/incoming/filters/003.php
@@ -1,5 +1,8 @@
 <?php
 
-public $aliases = [
-    'csrf' => \CodeIgniter\Filters\CSRF::class,
-];
+class Filters extends BaseConfig
+{
+    public $aliases = [
+        'csrf' => \CodeIgniter\Filters\CSRF::class,
+    ];
+}
diff --git a/user_guide_src/source/incoming/filters/004.php b/user_guide_src/source/incoming/filters/004.php
index a7f31363edad..3615cf8f6072 100644
--- a/user_guide_src/source/incoming/filters/004.php
+++ b/user_guide_src/source/incoming/filters/004.php
@@ -1,8 +1,11 @@
 <?php
 
-public $aliases = [
-    'apiPrep' => [
-        \App\Filters\Negotiate::class,
-        \App\Filters\ApiAuth::class,
-    ]
-];
+class Filters extends BaseConfig
+{
+    public $aliases = [
+        'apiPrep' => [
+            \App\Filters\Negotiate::class,
+            \App\Filters\ApiAuth::class,
+        ],
+    ];
+}
diff --git a/user_guide_src/source/incoming/filters/005.php b/user_guide_src/source/incoming/filters/005.php
index 3f3801f5ce59..7599c93e1203 100644
--- a/user_guide_src/source/incoming/filters/005.php
+++ b/user_guide_src/source/incoming/filters/005.php
@@ -1,8 +1,11 @@
 <?php
 
-public $globals = [
-    'before' => [
-        'csrf',
-    ],
-    'after' => [],
-];
+class Filters extends BaseConfig
+{
+    public $globals = [
+        'before' => [
+            'csrf',
+        ],
+        'after' => [],
+    ];
+}
diff --git a/user_guide_src/source/incoming/filters/006.php b/user_guide_src/source/incoming/filters/006.php
index 3706979688cd..3cd37f8224e9 100644
--- a/user_guide_src/source/incoming/filters/006.php
+++ b/user_guide_src/source/incoming/filters/006.php
@@ -1,8 +1,11 @@
 <?php
 
-public $globals = [
-    'before' => [
-        'csrf' => ['except' => 'api/*'],
-    ],
-    'after' => [],
-];
+class Filters extends BaseConfig
+{
+    public $globals = [
+        'before' => [
+            'csrf' => ['except' => 'api/*'],
+        ],
+        'after' => [],
+    ];
+}
diff --git a/user_guide_src/source/incoming/filters/007.php b/user_guide_src/source/incoming/filters/007.php
index a6790adbf9b7..e9c1dba48fc6 100644
--- a/user_guide_src/source/incoming/filters/007.php
+++ b/user_guide_src/source/incoming/filters/007.php
@@ -1,8 +1,11 @@
 <?php
 
-public $globals = [
-    'before' => [
-        'csrf' => ['except' => ['foo/*', 'bar/*']],
-    ],
-    'after' => [],
-];
+class Filters extends BaseConfig
+{
+    public $globals = [
+        'before' => [
+            'csrf' => ['except' => ['foo/*', 'bar/*']],
+        ],
+        'after' => [],
+    ];
+}
diff --git a/user_guide_src/source/incoming/filters/008.php b/user_guide_src/source/incoming/filters/008.php
index 2f216281e982..e50628a13bd5 100644
--- a/user_guide_src/source/incoming/filters/008.php
+++ b/user_guide_src/source/incoming/filters/008.php
@@ -1,6 +1,9 @@
 <?php
 
-public $methods = [
-    'post' => ['foo', 'bar'],
-    'get'  => ['baz'],
-]
+class Filters extends BaseConfig
+{
+    public $methods = [
+        'post' => ['foo', 'bar'],
+        'get'  => ['baz'],
+    ];
+}
diff --git a/user_guide_src/source/incoming/filters/009.php b/user_guide_src/source/incoming/filters/009.php
index 258edd689d3c..2505d8fcc2a2 100644
--- a/user_guide_src/source/incoming/filters/009.php
+++ b/user_guide_src/source/incoming/filters/009.php
@@ -1,6 +1,9 @@
 <?php
 
-public filters = [
-    'foo' => ['before' => ['admin/*'], 'after' => ['users/*']],
-    'bar' => ['before' => ['api/*', 'admin/*']],
-];
+class Filters extends BaseConfig
+{
+    public $filters = [
+        'foo' => ['before' => ['admin/*'], 'after' => ['users/*']],
+        'bar' => ['before' => ['api/*', 'admin/*']],
+    ];
+}
diff --git a/user_guide_src/source/incoming/filters/011.php b/user_guide_src/source/incoming/filters/011.php
index 10db5ad2eb40..54b276967859 100644
--- a/user_guide_src/source/incoming/filters/011.php
+++ b/user_guide_src/source/incoming/filters/011.php
@@ -1,6 +1,9 @@
 <?php
 
-public $aliases = [
-    // ...
-    'secureheaders' => \App\Filters\SecureHeaders::class,
-];
+class Filters extends BaseConfig
+{
+    public $aliases = [
+        // ...
+        'secureheaders' => \App\Filters\SecureHeaders::class,
+    ];
+}
diff --git a/user_guide_src/source/incoming/routing/011.php b/user_guide_src/source/incoming/routing/011.php
index 11437a5881c2..790f965912ca 100644
--- a/user_guide_src/source/incoming/routing/011.php
+++ b/user_guide_src/source/incoming/routing/011.php
@@ -1,7 +1,11 @@
 <?php
 
-public function productLookup($seg1 = false, $seg2 = false, $seg3 = false) {
-    echo $seg1; // Will be 123 in all examples
-    echo $seg2; // false in first, 456 in second and third example
-    echo $seg3; // false in first and second, 789 in third
+class productController extends BaseController
+{
+    public function productLookup($seg1 = false, $seg2 = false, $seg3 = false)
+    {
+        echo $seg1; // Will be 123 in all examples
+        echo $seg2; // false in first, 456 in second and third example
+        echo $seg3; // false in first and second, 789 in third
+    }
 }

From 91672e8503711942e40f1208b9f6f235e31fb2d7 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Mon, 28 Feb 2022 13:41:56 +0100
Subject: [PATCH 1695/2325] Fix installation.

---
 .../source/installation/troubleshooting/001.php   |  5 ++++-
 .../source/installation/troubleshooting/002.php   |  5 ++++-
 .../source/installation/upgrade_404.rst           | 10 ++++++----
 .../source/installation/upgrade_404/001.php       |  4 ----
 .../source/installation/upgrade_404/002.php       |  4 ----
 .../source/installation/upgrade_415/001.php       | 11 +++++++----
 .../installation/upgrade_localization/001.php     |  5 ++++-
 .../source/installation/upgrade_security/001.php  | 15 +++++++++------
 8 files changed, 34 insertions(+), 25 deletions(-)
 delete mode 100644 user_guide_src/source/installation/upgrade_404/001.php
 delete mode 100644 user_guide_src/source/installation/upgrade_404/002.php

diff --git a/user_guide_src/source/installation/troubleshooting/001.php b/user_guide_src/source/installation/troubleshooting/001.php
index 54798c261dae..c3aa124d6ce2 100644
--- a/user_guide_src/source/installation/troubleshooting/001.php
+++ b/user_guide_src/source/installation/troubleshooting/001.php
@@ -1,3 +1,6 @@
 <?php
 
-public $indexPage = 'index.php';
+class App extends BaseConfig
+{
+    public $indexPage = 'index.php';
+}
diff --git a/user_guide_src/source/installation/troubleshooting/002.php b/user_guide_src/source/installation/troubleshooting/002.php
index 1021e7c877b6..ca7c9183ddbf 100644
--- a/user_guide_src/source/installation/troubleshooting/002.php
+++ b/user_guide_src/source/installation/troubleshooting/002.php
@@ -1,3 +1,6 @@
 <?php
 
-public $indexPage = 'index.php?';
+class App extends BaseConfig
+{
+    public $indexPage = 'index.php?';
+}
diff --git a/user_guide_src/source/installation/upgrade_404.rst b/user_guide_src/source/installation/upgrade_404.rst
index ffcb2b1d85fe..8eb7dd9a753f 100644
--- a/user_guide_src/source/installation/upgrade_404.rst
+++ b/user_guide_src/source/installation/upgrade_404.rst
@@ -8,10 +8,12 @@ code implementing the ``FilterInterface``.
 **Update FilterInterface declarations**
 
 The method signatures for ``after()`` and ``before()`` must be updated to include ``$arguments``. The function
-definitions should be changed from:
+definitions should be changed from::
 
-.. literalinclude:: upgrade_404/001.php
+    public function before(RequestInterface $request)
+    public function after(RequestInterface $request, ResponseInterface $response)
 
-to:
+to::
 
-.. literalinclude:: upgrade_404/002.php
+    public function before(RequestInterface $request, $arguments = null)
+    public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
diff --git a/user_guide_src/source/installation/upgrade_404/001.php b/user_guide_src/source/installation/upgrade_404/001.php
deleted file mode 100644
index 8dce457c82ec..000000000000
--- a/user_guide_src/source/installation/upgrade_404/001.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-public function before(RequestInterface $request)
-public function after(RequestInterface $request, ResponseInterface $response)
diff --git a/user_guide_src/source/installation/upgrade_404/002.php b/user_guide_src/source/installation/upgrade_404/002.php
deleted file mode 100644
index 45a7eb869f60..000000000000
--- a/user_guide_src/source/installation/upgrade_404/002.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-public function before(RequestInterface $request, $arguments = null)
-public function after(RequestInterface $request, ResponseInterface $response, $arguments = null)
diff --git a/user_guide_src/source/installation/upgrade_415/001.php b/user_guide_src/source/installation/upgrade_415/001.php
index e2b03e79ba25..b2ffbeaadc37 100644
--- a/user_guide_src/source/installation/upgrade_415/001.php
+++ b/user_guide_src/source/installation/upgrade_415/001.php
@@ -1,6 +1,9 @@
 <?php
 
-public $methods = [
-    'get'  => ['csrf'],
-    'post' => ['csrf'],
-];
+class Filters extends BaseConfig
+{
+    public $methods = [
+        'get'  => ['csrf'],
+        'post' => ['csrf'],
+    ];
+}
diff --git a/user_guide_src/source/installation/upgrade_localization/001.php b/user_guide_src/source/installation/upgrade_localization/001.php
index c3b3de65be20..53d156de0545 100644
--- a/user_guide_src/source/installation/upgrade_localization/001.php
+++ b/user_guide_src/source/installation/upgrade_localization/001.php
@@ -1,3 +1,6 @@
 <?php
 
-public $defaultLocale = 'en';
+class App extends BaseConfig
+{
+    public $defaultLocale = 'en';
+}
diff --git a/user_guide_src/source/installation/upgrade_security/001.php b/user_guide_src/source/installation/upgrade_security/001.php
index d1bc3788b2ce..3e487bb37686 100644
--- a/user_guide_src/source/installation/upgrade_security/001.php
+++ b/user_guide_src/source/installation/upgrade_security/001.php
@@ -1,8 +1,11 @@
 <?php
 
-public $globals = [
-    'before' => [
-        //'honeypot',
-        'csrf',
-    ]
-];
+class Filters extends BaseConfig
+{
+    public $globals = [
+        'before' => [
+            // 'honeypot',
+            'csrf',
+        ],
+    ];
+}

From ab46edc81069ae1344a7a6e458ca2ca891fde39b Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Mon, 28 Feb 2022 14:15:04 +0100
Subject: [PATCH 1696/2325] Fix models.

---
 user_guide_src/source/models/entities/020.php | 19 ++++++++------
 user_guide_src/source/models/model/038.php    |  9 ++++---
 user_guide_src/source/models/model/040.php    |  9 ++++---
 user_guide_src/source/models/model/041.php    |  5 +++-
 user_guide_src/source/models/model/050.php    | 17 +++++++------
 user_guide_src/source/models/model/051.php    |  7 ++++--
 user_guide_src/source/models/model/052.php    |  5 +++-
 user_guide_src/source/models/model/054.php    | 25 +++++++++++--------
 8 files changed, 61 insertions(+), 35 deletions(-)

diff --git a/user_guide_src/source/models/entities/020.php b/user_guide_src/source/models/entities/020.php
index 4e7908e5c20d..0fa4e8e140df 100644
--- a/user_guide_src/source/models/entities/020.php
+++ b/user_guide_src/source/models/entities/020.php
@@ -1,11 +1,14 @@
 <?php
 
-// Defining a type with parameters
-protected $casts = [
-    'some_attribute' => 'class[App\SomeClass, param2, param3]',
-];
+class MyEntity extends Entity
+{
+    // Defining a type with parameters
+    protected $casts = [
+        'some_attribute' => 'class[App\SomeClass, param2, param3]',
+    ];
 
-// Bind the type to the handler
-protected $castHandlers = [
-    'class' => 'SomeHandler',
-];
+    // Bind the type to the handler
+    protected $castHandlers = [
+        'class' => 'SomeHandler',
+    ];
+}
diff --git a/user_guide_src/source/models/model/038.php b/user_guide_src/source/models/model/038.php
index 0a0dffd7dba5..d08b6333bc84 100644
--- a/user_guide_src/source/models/model/038.php
+++ b/user_guide_src/source/models/model/038.php
@@ -1,5 +1,8 @@
 <?php
 
-protected $validationRules = [
-    'email' => 'required|valid_email|is_unique[users.email,id,{id}]'
-];
+class MyModel extends Model
+{
+    protected $validationRules = [
+        'email' => 'required|valid_email|is_unique[users.email,id,{id}]',
+    ];
+}
diff --git a/user_guide_src/source/models/model/040.php b/user_guide_src/source/models/model/040.php
index 68f9c5c13143..9e3402559d62 100644
--- a/user_guide_src/source/models/model/040.php
+++ b/user_guide_src/source/models/model/040.php
@@ -1,5 +1,8 @@
 <?php
 
-protected $validationRules = [
-    'email' => 'required|valid_email|is_unique[users.email,id,4]'
-];
+class MyModel extends Model
+{
+    protected $validationRules = [
+        'email' => 'required|valid_email|is_unique[users.email,id,4]',
+    ];
+}
diff --git a/user_guide_src/source/models/model/041.php b/user_guide_src/source/models/model/041.php
index 8aaa151c61a1..f2f89729a632 100644
--- a/user_guide_src/source/models/model/041.php
+++ b/user_guide_src/source/models/model/041.php
@@ -1,3 +1,6 @@
 <?php
 
-protected $allowedFields = ['name', 'email', 'address'];
+class MyModel extends Model
+{
+    protected $allowedFields = ['name', 'email', 'address'];
+}
diff --git a/user_guide_src/source/models/model/050.php b/user_guide_src/source/models/model/050.php
index a933f49d5f3e..600d33afef59 100644
--- a/user_guide_src/source/models/model/050.php
+++ b/user_guide_src/source/models/model/050.php
@@ -1,13 +1,16 @@
 <?php
 
-protected function hashPassword(array $data)
+class MyModel extends Model
 {
-    if (! isset($data['data']['password'])) {
-        return $data;
-    }
+    protected function hashPassword(array $data)
+    {
+        if (! isset($data['data']['password'])) {
+            return $data;
+        }
 
-    $data['data']['password_hash'] = password_hash($data['data']['password'], PASSWORD_DEFAULT);
-    unset($data['data']['password']);
+        $data['data']['password_hash'] = password_hash($data['data']['password'], PASSWORD_DEFAULT);
+        unset($data['data']['password']);
 
-    return $data;
+        return $data;
+    }
 }
diff --git a/user_guide_src/source/models/model/051.php b/user_guide_src/source/models/model/051.php
index 3e8eaa755359..692e4df8ff32 100644
--- a/user_guide_src/source/models/model/051.php
+++ b/user_guide_src/source/models/model/051.php
@@ -1,4 +1,7 @@
 <?php
 
-protected $beforeInsert = ['hashPassword'];
-protected $beforeUpdate = ['hashPassword'];
+class MyModel extends Model
+{
+    protected $beforeInsert = ['hashPassword'];
+    protected $beforeUpdate = ['hashPassword'];
+}
diff --git a/user_guide_src/source/models/model/052.php b/user_guide_src/source/models/model/052.php
index 3e3d559de92c..131552f39c46 100644
--- a/user_guide_src/source/models/model/052.php
+++ b/user_guide_src/source/models/model/052.php
@@ -1,3 +1,6 @@
 <?php
 
-protected $allowCallbacks = false;
+class MyModel extends Model
+{
+    protected $allowCallbacks = false;
+}
diff --git a/user_guide_src/source/models/model/054.php b/user_guide_src/source/models/model/054.php
index dd8bb573b5dd..f4817da0ae19 100644
--- a/user_guide_src/source/models/model/054.php
+++ b/user_guide_src/source/models/model/054.php
@@ -1,16 +1,21 @@
 <?php
 
-protected $beforeFind = ['checkCache'];
-// ...
-protected function checkCache(array $data)
+class MyModel extends Model
 {
-    // Check if the requested item is already in our cache
-    if (isset($data['id']) && $item = $this->getCachedItem($data['id']])) {
-        $data['data']       = $item;
-        $data['returnData'] = true;
-
-        return $data;
-    }
+    protected $beforeFind = ['checkCache'];
 
     // ...
+
+    protected function checkCache(array $data)
+    {
+        // Check if the requested item is already in our cache
+        if (isset($data['id']) && $item = $this->getCachedItem($data['id'])) {
+            $data['data']       = $item;
+            $data['returnData'] = true;
+
+            return $data;
+        }
+
+        // ...
+    }
 }

From 9b8373600edfd565c990ff8a81c71a599c07d2dd Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Mon, 28 Feb 2022 15:43:42 +0100
Subject: [PATCH 1697/2325] Fix tutorial.

---
 .../source/tutorial/create_news_items/001.php |  9 +++--
 .../source/tutorial/create_news_items/002.php | 35 ++++++++++---------
 .../source/tutorial/news_section/002.php      | 13 ++++---
 .../source/tutorial/news_section/004.php      | 21 ++++++-----
 .../source/tutorial/news_section/006.php      | 23 ++++++------
 .../source/tutorial/static_pages/002.php      | 21 ++++++-----
 6 files changed, 70 insertions(+), 52 deletions(-)

diff --git a/user_guide_src/source/tutorial/create_news_items/001.php b/user_guide_src/source/tutorial/create_news_items/001.php
index 80d86db34633..5091ec750126 100644
--- a/user_guide_src/source/tutorial/create_news_items/001.php
+++ b/user_guide_src/source/tutorial/create_news_items/001.php
@@ -1,5 +1,8 @@
 <?php
 
-public $methods = [
-    'post' => ['csrf'],
-];
+class Filters extends BaseConfig
+{
+    public $methods = [
+        'post' => ['csrf'],
+    ];
+}
diff --git a/user_guide_src/source/tutorial/create_news_items/002.php b/user_guide_src/source/tutorial/create_news_items/002.php
index 2dc230c3a720..b5a5004e0961 100644
--- a/user_guide_src/source/tutorial/create_news_items/002.php
+++ b/user_guide_src/source/tutorial/create_news_items/002.php
@@ -1,23 +1,26 @@
 <?php
 
-public function create()
+class News extends BaseController
 {
-    $model = model(NewsModel::class);
+    public function create()
+    {
+        $model = model(NewsModel::class);
 
-    if ($this->request->getMethod() === 'post' && $this->validate([
-        'title' => 'required|min_length[3]|max_length[255]',
-        'body'  => 'required',
-    ])) {
-        $model->save([
-            'title' => $this->request->getPost('title'),
-            'slug'  => url_title($this->request->getPost('title'), '-', true),
-            'body'  => $this->request->getPost('body'),
-        ]);
+        if ($this->request->getMethod() === 'post' && $this->validate([
+            'title' => 'required|min_length[3]|max_length[255]',
+            'body' => 'required',
+        ])) {
+            $model->save([
+                'title' => $this->request->getPost('title'),
+                'slug'  => url_title($this->request->getPost('title'), '-', true),
+                'body'  => $this->request->getPost('body'),
+            ]);
 
-        echo view('news/success');
-    } else {
-        echo view('templates/header', ['title' => 'Create a news item']);
-        echo view('news/create');
-        echo view('templates/footer');
+            echo view('news/success');
+        } else {
+            echo view('templates/header', ['title' => 'Create a news item']);
+            echo view('news/create');
+            echo view('templates/footer');
+        }
     }
 }
diff --git a/user_guide_src/source/tutorial/news_section/002.php b/user_guide_src/source/tutorial/news_section/002.php
index bf8f4217be57..66a6d8f224dd 100644
--- a/user_guide_src/source/tutorial/news_section/002.php
+++ b/user_guide_src/source/tutorial/news_section/002.php
@@ -1,10 +1,13 @@
 <?php
 
-public function getNews($slug = false)
+class NewsModel extends Model
 {
-    if ($slug === false) {
-        return $this->findAll();
-    }
+    public function getNews($slug = false)
+    {
+        if ($slug === false) {
+            return $this->findAll();
+        }
 
-    return $this->where(['slug' => $slug])->first();
+        return $this->where(['slug' => $slug])->first();
+    }
 }
diff --git a/user_guide_src/source/tutorial/news_section/004.php b/user_guide_src/source/tutorial/news_section/004.php
index 0fac31909775..f6973a3deafc 100644
--- a/user_guide_src/source/tutorial/news_section/004.php
+++ b/user_guide_src/source/tutorial/news_section/004.php
@@ -1,15 +1,18 @@
 <?php
 
-public function index()
+class News extends BaseController
 {
-    $model = model(NewsModel::class);
+    public function index()
+    {
+        $model = model(NewsModel::class);
 
-    $data = [
-        'news'  => $model->getNews(),
-        'title' => 'News archive',
-    ];
+        $data = [
+            'news'  => $model->getNews(),
+            'title' => 'News archive',
+        ];
 
-    echo view('templates/header', $data);
-    echo view('news/overview', $data);
-    echo view('templates/footer', $data);
+        echo view('templates/header', $data);
+        echo view('news/overview', $data);
+        echo view('templates/footer', $data);
+    }
 }
diff --git a/user_guide_src/source/tutorial/news_section/006.php b/user_guide_src/source/tutorial/news_section/006.php
index ea7331dbf77f..afaa1cee5800 100644
--- a/user_guide_src/source/tutorial/news_section/006.php
+++ b/user_guide_src/source/tutorial/news_section/006.php
@@ -1,18 +1,21 @@
 <?php
 
-public function view($slug = null)
+class News extends BaseController
 {
-    $model = model(NewsModel::class);
+    public function view($slug = null)
+    {
+        $model = model(NewsModel::class);
 
-    $data['news'] = $model->getNews($slug);
+        $data['news'] = $model->getNews($slug);
 
-    if (empty($data['news'])) {
-        throw new \CodeIgniter\Exceptions\PageNotFoundException('Cannot find the news item: ' . $slug);
-    }
+        if (empty($data['news'])) {
+            throw new \CodeIgniter\Exceptions\PageNotFoundException('Cannot find the news item: ' . $slug);
+        }
 
-    $data['title'] = $data['news']['title'];
+        $data['title'] = $data['news']['title'];
 
-    echo view('templates/header', $data);
-    echo view('news/view', $data);
-    echo view('templates/footer', $data);
+        echo view('templates/header', $data);
+        echo view('news/view', $data);
+        echo view('templates/footer', $data);
+    }
 }
diff --git a/user_guide_src/source/tutorial/static_pages/002.php b/user_guide_src/source/tutorial/static_pages/002.php
index 4f5901845f9d..bd3eb8938a57 100644
--- a/user_guide_src/source/tutorial/static_pages/002.php
+++ b/user_guide_src/source/tutorial/static_pages/002.php
@@ -1,15 +1,18 @@
 <?php
 
-public function view($page = 'home')
+class Pages extends BaseController
 {
-    if (! is_file(APPPATH . 'Views/pages/' . $page . '.php')) {
-        // Whoops, we don't have a page for that!
-        throw new \CodeIgniter\Exceptions\PageNotFoundException($page);
-    }
+    public function view($page = 'home')
+    {
+        if (! is_file(APPPATH . 'Views/pages/' . $page . '.php')) {
+            // Whoops, we don't have a page for that!
+            throw new \CodeIgniter\Exceptions\PageNotFoundException($page);
+        }
 
-    $data['title'] = ucfirst($page); // Capitalize the first letter
+        $data['title'] = ucfirst($page); // Capitalize the first letter
 
-    echo view('templates/header', $data);
-    echo view('pages/' . $page, $data);
-    echo view('templates/footer', $data);
+        echo view('templates/header', $data);
+        echo view('pages/' . $page, $data);
+        echo view('templates/footer', $data);
+    }
 }

From b41a58fb75e0d365e55c92b87838016e9c1a9c69 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Mon, 28 Feb 2022 15:48:29 +0100
Subject: [PATCH 1698/2325] Fix general.

---
 .../source/general/configuration/008.php          |  9 ++++++---
 user_guide_src/source/general/errors/003.php      |  4 +++-
 user_guide_src/source/general/errors/004.php      |  4 +++-
 user_guide_src/source/general/logging/002.php     |  5 ++++-
 user_guide_src/source/general/logging/003.php     |  7 +++++--
 user_guide_src/source/general/logging/004.php     | 15 +++++++++------
 .../source/general/managing_apps/001.php          |  5 ++++-
 user_guide_src/source/general/modules/001.php     | 13 ++++++++-----
 user_guide_src/source/general/modules/002.php     | 13 ++++++++-----
 user_guide_src/source/general/modules/003.php     | 13 ++++++++-----
 user_guide_src/source/general/modules/004.php     |  5 ++++-
 11 files changed, 62 insertions(+), 31 deletions(-)

diff --git a/user_guide_src/source/general/configuration/008.php b/user_guide_src/source/general/configuration/008.php
index 54072ca22fba..dd301d8c69a1 100644
--- a/user_guide_src/source/general/configuration/008.php
+++ b/user_guide_src/source/general/configuration/008.php
@@ -1,5 +1,8 @@
 <?php
 
-public static $registrars = [
-    SupportingPackageRegistrar::class
-];
+class MyConfig extends BaseConfig
+{
+    public static $registrars = [
+        SupportingPackageRegistrar::class,
+    ];
+}
diff --git a/user_guide_src/source/general/errors/003.php b/user_guide_src/source/general/errors/003.php
index e93d32ed37d5..2d230d34f29a 100644
--- a/user_guide_src/source/general/errors/003.php
+++ b/user_guide_src/source/general/errors/003.php
@@ -1,5 +1,7 @@
 <?php
 
-catch (\CodeIgniter\UnknownFileException $e) {
+try {
+    $user = $userModel->find($id);
+} catch (\CodeIgniter\UnknownFileException $e) {
     // do something here...
 }
diff --git a/user_guide_src/source/general/errors/004.php b/user_guide_src/source/general/errors/004.php
index 06a972cfc4d8..752b23bdba30 100644
--- a/user_guide_src/source/general/errors/004.php
+++ b/user_guide_src/source/general/errors/004.php
@@ -1,6 +1,8 @@
 <?php
 
-catch (\CodeIgniter\UnknownFileException $e) {
+try {
+    $user = $userModel->find($id);
+} catch (\CodeIgniter\UnknownFileException $e) {
     // do something here...
 
     throw new \RuntimeException($e->getMessage(), $e->getCode(), $e);
diff --git a/user_guide_src/source/general/logging/002.php b/user_guide_src/source/general/logging/002.php
index bf08b8722b63..d542f40b4ccb 100644
--- a/user_guide_src/source/general/logging/002.php
+++ b/user_guide_src/source/general/logging/002.php
@@ -1,3 +1,6 @@
 <?php
 
-public $threshold = 5;
+class Logger extends BaseConfig
+{
+    public $threshold = 5;
+}
diff --git a/user_guide_src/source/general/logging/003.php b/user_guide_src/source/general/logging/003.php
index 54e0da7ee48c..7592b5674a50 100644
--- a/user_guide_src/source/general/logging/003.php
+++ b/user_guide_src/source/general/logging/003.php
@@ -1,4 +1,7 @@
 <?php
 
-// Log only debug and info type messages
-public $threshold = [5, 8];
+class Logger extends BaseConfig
+{
+    // Log only debug and info type messages
+    public $threshold = [5, 8];
+}
diff --git a/user_guide_src/source/general/logging/004.php b/user_guide_src/source/general/logging/004.php
index 7e135b87915d..00b79046e385 100644
--- a/user_guide_src/source/general/logging/004.php
+++ b/user_guide_src/source/general/logging/004.php
@@ -1,8 +1,11 @@
 <?php
 
-public $handlers = [
-    // File Handler
-    'CodeIgniter\Log\Handlers\FileHandler' => [
-        'handles' => ['critical', 'alert', 'emergency', 'debug', 'error', 'info', 'notice', 'warning'],
-    ]
-];
+class Logger extends BaseConfig
+{
+    public $handlers = [
+        // File Handler
+        'CodeIgniter\Log\Handlers\FileHandler' => [
+            'handles' => ['critical', 'alert', 'emergency', 'debug', 'error', 'info', 'notice', 'warning'],
+        ],
+    ];
+}
diff --git a/user_guide_src/source/general/managing_apps/001.php b/user_guide_src/source/general/managing_apps/001.php
index 27deaaf4b994..d1690bdd55e6 100644
--- a/user_guide_src/source/general/managing_apps/001.php
+++ b/user_guide_src/source/general/managing_apps/001.php
@@ -1,3 +1,6 @@
 <?php
 
-public $appDirectory = '/path/to/your/app';
+class Paths
+{
+    public $appDirectory = '/path/to/your/app';
+}
diff --git a/user_guide_src/source/general/modules/001.php b/user_guide_src/source/general/modules/001.php
index a70a5a28c026..47a56e70072f 100644
--- a/user_guide_src/source/general/modules/001.php
+++ b/user_guide_src/source/general/modules/001.php
@@ -1,7 +1,10 @@
 <?php
 
-public $psr4 = [
-    APP_NAMESPACE => APPPATH, // For custom namespace
-    'Config'      => APPPATH . 'Config',
-    'Acme'        => ROOTPATH . 'acme',
-];
+class Autoload extends AutoloadConfig
+{
+    public $psr4 = [
+        APP_NAMESPACE => APPPATH, // For custom namespace
+        'Config'      => APPPATH . 'Config',
+        'Acme'        => ROOTPATH . 'acme',
+    ];
+}
diff --git a/user_guide_src/source/general/modules/002.php b/user_guide_src/source/general/modules/002.php
index 7cab63838ec5..4d7b355da602 100644
--- a/user_guide_src/source/general/modules/002.php
+++ b/user_guide_src/source/general/modules/002.php
@@ -1,7 +1,10 @@
 <?php
 
-public $files = [
-    'path/to/my/functions.php',
-    'path/to/my/constants.php',
-    'path/to/my/bootstrap.php',
-];
+class Autoload extends AutoloadConfig
+{
+    public $files = [
+        'path/to/my/functions.php',
+        'path/to/my/constants.php',
+        'path/to/my/bootstrap.php',
+    ];
+}
diff --git a/user_guide_src/source/general/modules/003.php b/user_guide_src/source/general/modules/003.php
index b9c5f592a01b..1124ef4d04db 100644
--- a/user_guide_src/source/general/modules/003.php
+++ b/user_guide_src/source/general/modules/003.php
@@ -1,7 +1,10 @@
 <?php
 
-public $psr4 = [
-    APP_NAMESPACE => APPPATH, // For custom namespace
-    'Config'      => APPPATH . 'Config',
-    'Acme\Blog'   => ROOTPATH . 'acme/Blog', // Change
-];
+class Autoload extends AutoloadConfig
+{
+    public $psr4 = [
+        APP_NAMESPACE => APPPATH, // For custom namespace
+        'Config'      => APPPATH . 'Config',
+        'Acme\Blog'   => ROOTPATH . 'acme/Blog', // Change
+    ];
+}
diff --git a/user_guide_src/source/general/modules/004.php b/user_guide_src/source/general/modules/004.php
index 56804cc2e579..0f2c1c3967ad 100644
--- a/user_guide_src/source/general/modules/004.php
+++ b/user_guide_src/source/general/modules/004.php
@@ -1,3 +1,6 @@
 <?php
 
-public $discoverInComposer = false;
+class Modules extends BaseModules
+{
+    public $discoverInComposer = false;
+}

From 13be9ca018627e9512a5b0cf950b1b3edd30c42c Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Mon, 28 Feb 2022 16:18:16 +0100
Subject: [PATCH 1699/2325] Fix outgoing.

---
 .../source/outgoing/api_responses/003.php         | 11 +++++++----
 .../source/outgoing/api_responses/004.php         | 11 +++++++----
 .../source/outgoing/localization/001.php          |  5 ++++-
 .../source/outgoing/localization/002.php          |  5 ++++-
 .../source/outgoing/localization/003.php          |  5 ++++-
 user_guide_src/source/outgoing/response/011.php   |  5 ++++-
 .../source/outgoing/view_decorators/002.php       |  9 ++++++---
 .../source/outgoing/view_layouts/001.php          |  7 +++++--
 .../source/outgoing/view_parser/012.php           | 11 +++++++----
 .../source/outgoing/view_parser/013.php           |  9 ++++++---
 .../source/outgoing/view_parser/014.php           | 15 +++++++++------
 .../source/outgoing/view_parser/016.php           |  9 ++++++---
 .../source/outgoing/view_parser/017.php           |  9 ++++++---
 13 files changed, 75 insertions(+), 36 deletions(-)

diff --git a/user_guide_src/source/outgoing/api_responses/003.php b/user_guide_src/source/outgoing/api_responses/003.php
index ab1db7ccdc45..a8e8ed09de64 100644
--- a/user_guide_src/source/outgoing/api_responses/003.php
+++ b/user_guide_src/source/outgoing/api_responses/003.php
@@ -1,6 +1,9 @@
 <?php
 
-public $supportedResponseFormats = [
-    'application/json',
-    'application/xml',
-];
+class Format extends BaseConfig
+{
+    public $supportedResponseFormats = [
+        'application/json',
+        'application/xml',
+    ];
+}
diff --git a/user_guide_src/source/outgoing/api_responses/004.php b/user_guide_src/source/outgoing/api_responses/004.php
index efff1747de80..12ea88bd97df 100644
--- a/user_guide_src/source/outgoing/api_responses/004.php
+++ b/user_guide_src/source/outgoing/api_responses/004.php
@@ -1,6 +1,9 @@
 <?php
 
-public $formatters = [
-    'application/json' => \CodeIgniter\Format\JSONFormatter::class,
-    'application/xml'  => \CodeIgniter\Format\XMLFormatter::class,
-];
+class Format extends BaseConfig
+{
+    public $formatters = [
+        'application/json' => \CodeIgniter\Format\JSONFormatter::class,
+        'application/xml'  => \CodeIgniter\Format\XMLFormatter::class,
+    ];
+}
diff --git a/user_guide_src/source/outgoing/localization/001.php b/user_guide_src/source/outgoing/localization/001.php
index c3b3de65be20..53d156de0545 100644
--- a/user_guide_src/source/outgoing/localization/001.php
+++ b/user_guide_src/source/outgoing/localization/001.php
@@ -1,3 +1,6 @@
 <?php
 
-public $defaultLocale = 'en';
+class App extends BaseConfig
+{
+    public $defaultLocale = 'en';
+}
diff --git a/user_guide_src/source/outgoing/localization/002.php b/user_guide_src/source/outgoing/localization/002.php
index 13769b9d9678..30785b81d850 100644
--- a/user_guide_src/source/outgoing/localization/002.php
+++ b/user_guide_src/source/outgoing/localization/002.php
@@ -1,3 +1,6 @@
 <?php
 
-public $negotiateLocale = true;
+class App extends BaseConfig
+{
+    public $negotiateLocale = true;
+}
diff --git a/user_guide_src/source/outgoing/localization/003.php b/user_guide_src/source/outgoing/localization/003.php
index 67ee698ce54a..45d3e8e3b19e 100644
--- a/user_guide_src/source/outgoing/localization/003.php
+++ b/user_guide_src/source/outgoing/localization/003.php
@@ -1,3 +1,6 @@
 <?php
 
-public $supportedLocales = ['en', 'es', 'fr-FR'];
+class App extends BaseConfig
+{
+    public $supportedLocales = ['en', 'es', 'fr-FR'];
+}
diff --git a/user_guide_src/source/outgoing/response/011.php b/user_guide_src/source/outgoing/response/011.php
index 37d2234a5527..4e27ad6c43df 100644
--- a/user_guide_src/source/outgoing/response/011.php
+++ b/user_guide_src/source/outgoing/response/011.php
@@ -1,3 +1,6 @@
 <?php
 
-public $CSPEnabled = true;
+class App extends BaseConfig
+{
+    public $CSPEnabled = true;
+}
diff --git a/user_guide_src/source/outgoing/view_decorators/002.php b/user_guide_src/source/outgoing/view_decorators/002.php
index 6b6b05a295eb..49631992068b 100644
--- a/user_guide_src/source/outgoing/view_decorators/002.php
+++ b/user_guide_src/source/outgoing/view_decorators/002.php
@@ -1,5 +1,8 @@
 <?php
 
-public array $decorators = [
-    'App\Views\Decorators\MyDecorator',
-];
+class View extends BaseView
+{
+    public array $decorators = [
+        'App\Views\Decorators\MyDecorator',
+    ];
+}
diff --git a/user_guide_src/source/outgoing/view_layouts/001.php b/user_guide_src/source/outgoing/view_layouts/001.php
index 5c6136bfe9ee..801ebf92c42e 100644
--- a/user_guide_src/source/outgoing/view_layouts/001.php
+++ b/user_guide_src/source/outgoing/view_layouts/001.php
@@ -1,6 +1,9 @@
 <?php
 
-public function index()
+class MyController extends BaseController
 {
-    echo view('some_view');
+    public function index()
+    {
+        echo view('some_view');
+    }
 }
diff --git a/user_guide_src/source/outgoing/view_parser/012.php b/user_guide_src/source/outgoing/view_parser/012.php
index 39eae3da0177..626b3c21fe77 100644
--- a/user_guide_src/source/outgoing/view_parser/012.php
+++ b/user_guide_src/source/outgoing/view_parser/012.php
@@ -1,6 +1,9 @@
 <?php
 
-public $filters = [
-    'abs'        => '\CodeIgniter\View\Filters::abs',
-    'capitalize' => '\CodeIgniter\View\Filters::capitalize',
-];
+class View extends BaseView
+{
+    public $filters = [
+        'abs'        => '\CodeIgniter\View\Filters::abs',
+        'capitalize' => '\CodeIgniter\View\Filters::capitalize',
+    ];
+}
diff --git a/user_guide_src/source/outgoing/view_parser/013.php b/user_guide_src/source/outgoing/view_parser/013.php
index dbb096b416fb..78788515d081 100644
--- a/user_guide_src/source/outgoing/view_parser/013.php
+++ b/user_guide_src/source/outgoing/view_parser/013.php
@@ -1,5 +1,8 @@
 <?php
 
-public $filters = [
-    'str_repeat' => '\str_repeat',
-];
+class View extends BaseView
+{
+    public $filters = [
+        'str_repeat' => '\str_repeat',
+    ];
+}
diff --git a/user_guide_src/source/outgoing/view_parser/014.php b/user_guide_src/source/outgoing/view_parser/014.php
index d959d153d415..6219ce03b07d 100644
--- a/user_guide_src/source/outgoing/view_parser/014.php
+++ b/user_guide_src/source/outgoing/view_parser/014.php
@@ -1,8 +1,11 @@
 <?php
 
-public $plugins = [
-    'foo' => '\Some\Class::methodName',
-    'bar' => function ($str, array $params=[]) {
-        return $str;
-    },
-];
+class View extends BaseView
+{
+   'foo' => '\Some\Class::methodName',
+    public $plugins = [
+        'bar' => function($str, array $params = []) {
+            return $str;
+        },
+    ];
+}
diff --git a/user_guide_src/source/outgoing/view_parser/016.php b/user_guide_src/source/outgoing/view_parser/016.php
index e93bd3986957..5e2f5a2f0b0b 100644
--- a/user_guide_src/source/outgoing/view_parser/016.php
+++ b/user_guide_src/source/outgoing/view_parser/016.php
@@ -1,8 +1,11 @@
 <?php
 
-public $plugins = [
-    'foo' => '\Some\Class::methodName'
-];
+class View extends BaseView
+{
+    public $plugins = [
+        'foo' => '\Some\Class::methodName',
+    ];
+}
 
 // Tag is replaced by the return value of Some\Class::methodName static function.
 // {+ foo +}
diff --git a/user_guide_src/source/outgoing/view_parser/017.php b/user_guide_src/source/outgoing/view_parser/017.php
index 4e699d190bcd..d38e54c5274f 100644
--- a/user_guide_src/source/outgoing/view_parser/017.php
+++ b/user_guide_src/source/outgoing/view_parser/017.php
@@ -1,7 +1,10 @@
 <?php
 
-public $plugins = [
-    'foo' => ['\Some\Class::methodName']
-];
+class View extends BaseView
+{
+    public $plugins = [
+        'foo' => ['\Some\Class::methodName'],
+    ];
+}
 
 // {+ foo +} inner content {+ /foo +}

From e877550f220028a98bf330e484009d263c3be85a Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Mon, 28 Feb 2022 16:31:53 +0100
Subject: [PATCH 1700/2325] Fix libraries.

---
 .../source/libraries/caching/013.php          | 15 +++---
 .../source/libraries/caching/014.php          | 17 ++++---
 .../source/libraries/curlrequest/001.php      |  5 +-
 .../source/libraries/encryption/005.php       |  5 +-
 .../source/libraries/encryption/008.php       | 11 +++--
 .../source/libraries/honeypot/001.php         | 23 +++++----
 .../source/libraries/pagination/003.php       | 10 ++--
 .../source/libraries/pagination/004.php       | 22 +++++----
 .../source/libraries/pagination/010.php       | 11 +++--
 .../source/libraries/pagination/011.php       | 13 +++--
 .../source/libraries/security/002.php         |  5 +-
 .../source/libraries/security/003.php         |  5 +-
 .../source/libraries/security/004.php         |  5 +-
 .../source/libraries/security/005.php         |  5 +-
 .../source/libraries/security/006.php         | 15 +++---
 .../source/libraries/security/007.php         | 13 +++--
 .../source/libraries/security/008.php         | 13 +++--
 .../source/libraries/security/009.php         | 11 +++--
 .../source/libraries/sessions/040.php         |  7 ++-
 .../source/libraries/sessions/041.php         |  5 +-
 .../source/libraries/sessions/042.php         |  7 ++-
 .../source/libraries/sessions/043.php         |  7 ++-
 .../source/libraries/sessions/044.php         |  9 ++--
 .../source/libraries/throttler/003.php        | 11 +++--
 .../source/libraries/throttler/004.php        |  9 ++--
 .../source/libraries/validation/003.php       | 15 +++---
 .../source/libraries/validation/031.php       | 13 +++--
 .../source/libraries/validation/032.php       | 15 +++---
 .../source/libraries/validation/034.php       | 15 +++---
 .../source/libraries/validation/036.php       | 49 ++++++++++---------
 30 files changed, 228 insertions(+), 138 deletions(-)

diff --git a/user_guide_src/source/libraries/caching/013.php b/user_guide_src/source/libraries/caching/013.php
index 66f0fa99e959..52e77d4b7f4b 100644
--- a/user_guide_src/source/libraries/caching/013.php
+++ b/user_guide_src/source/libraries/caching/013.php
@@ -1,8 +1,11 @@
 <?php
 
-public $memcached = [
-    'host'   => '127.0.0.1',
-    'port'   => 11211,
-    'weight' => 1,
-    'raw'    => false,
-];
+class Cache extends BaseConfig
+{
+    public $memcached = [
+        'host'   => '127.0.0.1',
+        'port'   => 11211,
+        'weight' => 1,
+        'raw'    => false,
+    ];
+}
diff --git a/user_guide_src/source/libraries/caching/014.php b/user_guide_src/source/libraries/caching/014.php
index 20dfb69ce9b0..2c0f5eb719bd 100644
--- a/user_guide_src/source/libraries/caching/014.php
+++ b/user_guide_src/source/libraries/caching/014.php
@@ -1,9 +1,12 @@
 <?php
 
-public $redis = [
-    'host'     => '127.0.0.1',
-    'password' => null,
-    'port'     => 6379,
-    'timeout'  => 0,
-    'database' => 0,
-];
+class Cache extends BaseConfig
+{
+    public $redis = [
+        'host'     => '127.0.0.1',
+        'password' => null,
+        'port'     => 6379,
+        'timeout'  => 0,
+        'database' => 0,
+    ];
+}
diff --git a/user_guide_src/source/libraries/curlrequest/001.php b/user_guide_src/source/libraries/curlrequest/001.php
index 43e1f74bc943..35d47924e213 100644
--- a/user_guide_src/source/libraries/curlrequest/001.php
+++ b/user_guide_src/source/libraries/curlrequest/001.php
@@ -1,3 +1,6 @@
 <?php
 
-public $shareOptions = false;
+class CURLRequest extends BaseConfig
+{
+    public $shareOptions = false;
+}
diff --git a/user_guide_src/source/libraries/encryption/005.php b/user_guide_src/source/libraries/encryption/005.php
index 18c449480333..992d322a1bd2 100644
--- a/user_guide_src/source/libraries/encryption/005.php
+++ b/user_guide_src/source/libraries/encryption/005.php
@@ -1,3 +1,6 @@
 <?php
 
-public $key = 'YOUR KEY';
+class Encryption extends BaseConfig
+{
+    public $key = 'YOUR KEY';
+}
diff --git a/user_guide_src/source/libraries/encryption/008.php b/user_guide_src/source/libraries/encryption/008.php
index 3e5899ec4cdf..77849fb96f6a 100644
--- a/user_guide_src/source/libraries/encryption/008.php
+++ b/user_guide_src/source/libraries/encryption/008.php
@@ -1,7 +1,10 @@
 <?php
 
-// In Encryption, you may use
-public $key = 'hex2bin:<your-hex-encoded-key>'
+class Encryption extends BaseConfig
+{
+    // In Encryption, you may use
+    public $key = 'hex2bin:<your-hex-encoded-key>';
 
-// or
-public $key = 'base64:<your-base64-encoded-key>'
+    // or
+    public $key = 'base64:<your-base64-encoded-key>';
+}
diff --git a/user_guide_src/source/libraries/honeypot/001.php b/user_guide_src/source/libraries/honeypot/001.php
index 1ed16460a9a4..8d73a4f1e586 100644
--- a/user_guide_src/source/libraries/honeypot/001.php
+++ b/user_guide_src/source/libraries/honeypot/001.php
@@ -1,12 +1,15 @@
 <?php
 
-public $globals = [
-    'before' => [
-        'honeypot'
-        // 'csrf',
-    ],
-    'after' => [
-        'toolbar',
-        'honeypot',
-    ],
-];
+class Filters extends BaseConfig
+{
+    public $globals = [
+        'before' => [
+            'honeypot',
+            // 'csrf',
+        ],
+        'after' => [
+            'toolbar',
+            'honeypot',
+        ],
+    ];
+}
diff --git a/user_guide_src/source/libraries/pagination/003.php b/user_guide_src/source/libraries/pagination/003.php
index f0ea0d90ed76..423adc232c19 100644
--- a/user_guide_src/source/libraries/pagination/003.php
+++ b/user_guide_src/source/libraries/pagination/003.php
@@ -10,10 +10,14 @@
 
 // You can move the conditions to a separate method.
 // Model method
-public function banned()
+class UserModel extends Model
 {
-    $this->builder()->where('ban', 1);
-    return $this; // This will allow the call chain to be used.
+    public function banned()
+    {
+        $this->builder()->where('ban', 1);
+
+        return $this; // This will allow the call chain to be used.
+    }
 }
 
 $data = [
diff --git a/user_guide_src/source/libraries/pagination/004.php b/user_guide_src/source/libraries/pagination/004.php
index cd425a1026eb..6326d1f9c825 100644
--- a/user_guide_src/source/libraries/pagination/004.php
+++ b/user_guide_src/source/libraries/pagination/004.php
@@ -1,20 +1,22 @@
 <?php
 
 // In the Controller
-public function index()
+class UserController extends Controller
 {
-    $userModel = new \App\Models\UserModel();
-    $pageModel = new \App\Models\PageModel();
+    public function index()
+    {
+        $userModel = new \App\Models\UserModel();
+        $pageModel = new \App\Models\PageModel();
 
-    $data = [
-        'users' => $userModel->paginate(10, 'group1'),
-        'pages' => $pageModel->paginate(15, 'group2'),
-        'pager' => $userModel->pager,
-    ];
+        $data = [
+            'users' => $userModel->paginate(10, 'group1'),
+            'pages' => $pageModel->paginate(15, 'group2'),
+            'pager' => $userModel->pager,
+        ];
 
-    echo view('users/index', $data);
+        echo view('users/index', $data);
+    }
 }
-
 ?>
 
 <!-- In your view file: -->
diff --git a/user_guide_src/source/libraries/pagination/010.php b/user_guide_src/source/libraries/pagination/010.php
index 95d27f8e4e3c..1f97238b0506 100644
--- a/user_guide_src/source/libraries/pagination/010.php
+++ b/user_guide_src/source/libraries/pagination/010.php
@@ -1,6 +1,9 @@
 <?php
 
-public $templates = [
-    'default_full'   => 'CodeIgniter\Pager\Views\default_full',
-    'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
-];
+class Pager extends BaseConfig
+{
+    public $templates = [
+        'default_full'   => 'CodeIgniter\Pager\Views\default_full',
+        'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
+    ];
+}
diff --git a/user_guide_src/source/libraries/pagination/011.php b/user_guide_src/source/libraries/pagination/011.php
index fa59edbacf9b..8387b1e82dbd 100644
--- a/user_guide_src/source/libraries/pagination/011.php
+++ b/user_guide_src/source/libraries/pagination/011.php
@@ -1,7 +1,10 @@
 <?php
 
-public $templates = [
-    'default_full'   => 'CodeIgniter\Pager\Views\default_full',
-    'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
-    'front_full'     => 'App\Views\Pagers\foundation_full',
-];
+class Pager extends BaseConfig
+{
+    public $templates = [
+        'default_full'   => 'CodeIgniter\Pager\Views\default_full',
+        'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
+        'front_full'     => 'App\Views\Pagers\foundation_full',
+    ];
+}
diff --git a/user_guide_src/source/libraries/security/002.php b/user_guide_src/source/libraries/security/002.php
index 292d5a9410dc..1ce5fbba68d9 100644
--- a/user_guide_src/source/libraries/security/002.php
+++ b/user_guide_src/source/libraries/security/002.php
@@ -1,3 +1,6 @@
 <?php
 
-public $csrfProtection = 'session';
+class Security extends BaseConfig
+{
+    public $csrfProtection = 'session';
+}
diff --git a/user_guide_src/source/libraries/security/003.php b/user_guide_src/source/libraries/security/003.php
index 2d5f7fd89e18..22b06da0e4c6 100644
--- a/user_guide_src/source/libraries/security/003.php
+++ b/user_guide_src/source/libraries/security/003.php
@@ -1,3 +1,6 @@
 <?php
 
-public $tokenRandomize = true;
+class Security extends BaseConfig
+{
+    public $tokenRandomize = true;
+}
diff --git a/user_guide_src/source/libraries/security/004.php b/user_guide_src/source/libraries/security/004.php
index cf3007d83bd5..61075283006e 100644
--- a/user_guide_src/source/libraries/security/004.php
+++ b/user_guide_src/source/libraries/security/004.php
@@ -1,3 +1,6 @@
 <?php
 
-public $regenerate  = true;
+class Security extends BaseConfig
+{
+    public $regenerate = true;
+}
diff --git a/user_guide_src/source/libraries/security/005.php b/user_guide_src/source/libraries/security/005.php
index 80e931c5e387..56a89f54783b 100644
--- a/user_guide_src/source/libraries/security/005.php
+++ b/user_guide_src/source/libraries/security/005.php
@@ -1,3 +1,6 @@
 <?php
 
-public $redirect = false;
+class Security extends BaseConfig
+{
+    public $redirect = false;
+}
diff --git a/user_guide_src/source/libraries/security/006.php b/user_guide_src/source/libraries/security/006.php
index 3533227938cd..3e487bb37686 100644
--- a/user_guide_src/source/libraries/security/006.php
+++ b/user_guide_src/source/libraries/security/006.php
@@ -1,8 +1,11 @@
 <?php
 
-public $globals = [
-    'before' => [
-        // 'honeypot',
-        'csrf',
-    ],
-];
+class Filters extends BaseConfig
+{
+    public $globals = [
+        'before' => [
+            // 'honeypot',
+            'csrf',
+        ],
+    ];
+}
diff --git a/user_guide_src/source/libraries/security/007.php b/user_guide_src/source/libraries/security/007.php
index d647d1b8c120..db1b03df65fb 100644
--- a/user_guide_src/source/libraries/security/007.php
+++ b/user_guide_src/source/libraries/security/007.php
@@ -1,7 +1,10 @@
 <?php
 
-public $globals = [
-    'before' => [
-        'csrf' => ['except' => ['api/record/save']],
-    ],
-];
+class Filters extends BaseConfig
+{
+    public $globals = [
+        'before' => [
+            'csrf' => ['except' => ['api/record/save']],
+        ],
+    ];
+}
diff --git a/user_guide_src/source/libraries/security/008.php b/user_guide_src/source/libraries/security/008.php
index c78d18937b08..2138994f0241 100644
--- a/user_guide_src/source/libraries/security/008.php
+++ b/user_guide_src/source/libraries/security/008.php
@@ -1,7 +1,10 @@
 <?php
 
-public $globals = [
-    'before' => [
-        'csrf' => ['except' => ['api/record/[0-9]+']],
-    ],
-];
+class Filters extends BaseConfig
+{
+    public $globals = [
+        'before' => [
+            'csrf' => ['except' => ['api/record/[0-9]+']],
+        ],
+    ];
+}
diff --git a/user_guide_src/source/libraries/security/009.php b/user_guide_src/source/libraries/security/009.php
index e2b03e79ba25..b2ffbeaadc37 100644
--- a/user_guide_src/source/libraries/security/009.php
+++ b/user_guide_src/source/libraries/security/009.php
@@ -1,6 +1,9 @@
 <?php
 
-public $methods = [
-    'get'  => ['csrf'],
-    'post' => ['csrf'],
-];
+class Filters extends BaseConfig
+{
+    public $methods = [
+        'get'  => ['csrf'],
+        'post' => ['csrf'],
+    ];
+}
diff --git a/user_guide_src/source/libraries/sessions/040.php b/user_guide_src/source/libraries/sessions/040.php
index a3724620886d..7aa5f051b875 100644
--- a/user_guide_src/source/libraries/sessions/040.php
+++ b/user_guide_src/source/libraries/sessions/040.php
@@ -1,4 +1,7 @@
 <?php
 
-public $sessionDriver   = 'CodeIgniter\Session\Handlers\DatabaseHandler';
-public $sessionSavePath = 'ci_sessions';
+class App extends BaseConfig
+{
+    public $sessionDriver   = 'CodeIgniter\Session\Handlers\DatabaseHandler';
+    public $sessionSavePath = 'ci_sessions';
+}
diff --git a/user_guide_src/source/libraries/sessions/041.php b/user_guide_src/source/libraries/sessions/041.php
index 88cd3d7030d6..130cd7087bbe 100644
--- a/user_guide_src/source/libraries/sessions/041.php
+++ b/user_guide_src/source/libraries/sessions/041.php
@@ -1,3 +1,6 @@
 <?php
 
-public $sessionDBGroup = 'groupName';
+class App extends BaseConfig
+{
+    public $sessionDBGroup = 'groupName';
+}
diff --git a/user_guide_src/source/libraries/sessions/042.php b/user_guide_src/source/libraries/sessions/042.php
index ab2dbf89153c..c07412cbed30 100644
--- a/user_guide_src/source/libraries/sessions/042.php
+++ b/user_guide_src/source/libraries/sessions/042.php
@@ -1,4 +1,7 @@
 <?php
 
-public $sessionDiver    = 'CodeIgniter\Session\Handlers\RedisHandler';
-public $sessionSavePath = 'tcp://localhost:6379';
+class App extends BaseConfig
+{
+    public $sessionDiver    = 'CodeIgniter\Session\Handlers\RedisHandler';
+    public $sessionSavePath = 'tcp://localhost:6379';
+}
diff --git a/user_guide_src/source/libraries/sessions/043.php b/user_guide_src/source/libraries/sessions/043.php
index 9a50340f6af7..6c9dbb9aae1b 100644
--- a/user_guide_src/source/libraries/sessions/043.php
+++ b/user_guide_src/source/libraries/sessions/043.php
@@ -1,4 +1,7 @@
 <?php
 
-public $sessionDriver   = 'CodeIgniter\Session\Handlers\MemcachedHandler';
-public $sessionSavePath = 'localhost:11211';
+class App extends BaseConfig
+{
+    public $sessionDriver   = 'CodeIgniter\Session\Handlers\MemcachedHandler';
+    public $sessionSavePath = 'localhost:11211';
+}
diff --git a/user_guide_src/source/libraries/sessions/044.php b/user_guide_src/source/libraries/sessions/044.php
index e188b256cbe1..85ba471fea1a 100644
--- a/user_guide_src/source/libraries/sessions/044.php
+++ b/user_guide_src/source/libraries/sessions/044.php
@@ -1,5 +1,8 @@
 <?php
 
-// localhost will be given higher priority (5) here,
-// compared to 192.0.2.1 with a weight of 1.
-public $sessionSavePath = 'localhost:11211:5,192.0.2.1:11211:1';
+class App extends BaseConfig
+{
+    // localhost will be given higher priority (5) here,
+    // compared to 192.0.2.1 with a weight of 1.
+    public $sessionSavePath = 'localhost:11211:5,192.0.2.1:11211:1';
+}
diff --git a/user_guide_src/source/libraries/throttler/003.php b/user_guide_src/source/libraries/throttler/003.php
index 98e496c8a6d2..5b340cadb333 100644
--- a/user_guide_src/source/libraries/throttler/003.php
+++ b/user_guide_src/source/libraries/throttler/003.php
@@ -1,6 +1,9 @@
 <?php
 
-public $aliases = [
-    // ...
-    'throttle' => \App\Filters\Throttle::class,
-];
+class Filters extends BaseConfig
+{
+    public $aliases = [
+        // ...
+        'throttle' => \App\Filters\Throttle::class,
+    ];
+}
diff --git a/user_guide_src/source/libraries/throttler/004.php b/user_guide_src/source/libraries/throttler/004.php
index 455874cd5730..e7d0643db053 100644
--- a/user_guide_src/source/libraries/throttler/004.php
+++ b/user_guide_src/source/libraries/throttler/004.php
@@ -1,5 +1,8 @@
 <?php
 
-public $methods = [
-    'post' => ['throttle'],
-];
+class Filters extends BaseConfig
+{
+    public $methods = [
+        'post' => ['throttle'],
+    ];
+}
diff --git a/user_guide_src/source/libraries/validation/003.php b/user_guide_src/source/libraries/validation/003.php
index a6ae3a4a6fff..a9e83b94698b 100644
--- a/user_guide_src/source/libraries/validation/003.php
+++ b/user_guide_src/source/libraries/validation/003.php
@@ -1,8 +1,11 @@
 <?php
 
-public $ruleSets = [
-    \CodeIgniter\Validation\StrictRules\CreditCardRules::class,
-    \CodeIgniter\Validation\StrictRules\FileRules::class,
-    \CodeIgniter\Validation\StrictRules\FormatRules::class,
-    \CodeIgniter\Validation\StrictRules\Rules::class,
-];
+class Validation
+{
+    public $ruleSets = [
+        \CodeIgniter\Validation\StrictRules\CreditCardRules::class,
+        \CodeIgniter\Validation\StrictRules\FileRules::class,
+        \CodeIgniter\Validation\StrictRules\FormatRules::class,
+        \CodeIgniter\Validation\StrictRules\Rules::class,
+    ];
+}
diff --git a/user_guide_src/source/libraries/validation/031.php b/user_guide_src/source/libraries/validation/031.php
index 110b159a41cc..d8917ff8ec87 100644
--- a/user_guide_src/source/libraries/validation/031.php
+++ b/user_guide_src/source/libraries/validation/031.php
@@ -1,7 +1,10 @@
 <?php
 
-public $templates = [
-    'list'    => 'CodeIgniter\Validation\Views\list',
-    'single'  => 'CodeIgniter\Validation\Views\single',
-    'my_list' => '_errors_list',
-];
+class Validation
+{
+    public $templates = [
+        'list'    => 'CodeIgniter\Validation\Views\list',
+        'single'  => 'CodeIgniter\Validation\Views\single',
+        'my_list' => '_errors_list',
+    ];
+}
diff --git a/user_guide_src/source/libraries/validation/032.php b/user_guide_src/source/libraries/validation/032.php
index ccee27b08ad7..9877e6e85579 100644
--- a/user_guide_src/source/libraries/validation/032.php
+++ b/user_guide_src/source/libraries/validation/032.php
@@ -5,9 +5,12 @@
 use CodeIgniter\Validation\FormatRules;
 use CodeIgniter\Validation\Rules;
 
-public $ruleSets = [
-    Rules::class,
-    FormatRules::class,
-    FileRules::class,
-    CreditCardRules::class,
-];
+class Validation
+{
+    public $ruleSets = [
+        Rules::class,
+        FormatRules::class,
+        FileRules::class,
+        CreditCardRules::class,
+    ];
+}
diff --git a/user_guide_src/source/libraries/validation/034.php b/user_guide_src/source/libraries/validation/034.php
index a6a9b07f54ef..843b623ba98c 100644
--- a/user_guide_src/source/libraries/validation/034.php
+++ b/user_guide_src/source/libraries/validation/034.php
@@ -1,12 +1,15 @@
 <?php
 
-public function even(string $str, string &$error = null): bool
+class MyRules
 {
-    if ((int) $str % 2 !== 0) {
-        $error = lang('myerrors.evenError');
+    public function even(string $str, ?string &$error = null): bool
+    {
+        if ((int) $str % 2 !== 0) {
+            $error = lang('myerrors.evenError');
 
-        return false;
-    }
+            return false;
+        }
 
-    return true;
+        return true;
+    }
 }
diff --git a/user_guide_src/source/libraries/validation/036.php b/user_guide_src/source/libraries/validation/036.php
index 9511380c04f5..491c528e87e4 100644
--- a/user_guide_src/source/libraries/validation/036.php
+++ b/user_guide_src/source/libraries/validation/036.php
@@ -1,34 +1,37 @@
 <?php
 
-public function required_with($str, string $fields, array $data): bool
+class MyRules
 {
-    $fields = explode(',', $fields);
+    public function required_with($str, string $fields, array $data): bool
+    {
+        $fields = explode(',', $fields);
 
-    // If the field is present we can safely assume that
-    // the field is here, no matter whether the corresponding
-    // search field is present or not.
-    $present = $this->required($str ?? '');
+        // If the field is present we can safely assume that
+        // the field is here, no matter whether the corresponding
+        // search field is present or not.
+        $present = $this->required($str ?? '');
 
-    if ($present) {
-        return true;
-    }
+        if ($present) {
+            return true;
+        }
 
-    // Still here? Then we fail this test if
-    // any of the fields are present in $data
-    // as $fields is the lis
-    $requiredFields = [];
+        // Still here? Then we fail this test if
+        // any of the fields are present in $data
+        // as $fields is the lis
+        $requiredFields = [];
 
-    foreach ($fields as $field) {
-        if (array_key_exists($field, $data)) {
-            $requiredFields[] = $field;
+        foreach ($fields as $field) {
+            if (array_key_exists($field, $data)) {
+                $requiredFields[] = $field;
+            }
         }
-    }
 
-    // Remove any keys with empty values since, that means they
-    // weren't truly there, as far as this is concerned.
-    $requiredFields = array_filter($requiredFields, function ($item) use ($data) {
-        return ! empty($data[$item]);
-    });
+        // Remove any keys with empty values since, that means they
+        // weren't truly there, as far as this is concerned.
+        $requiredFields = array_filter($requiredFields, static function ($item) use ($data) {
+            return ! empty($data[$item]);
+        });
 
-    return empty($requiredFields);
+        return empty($requiredFields);
+    }
 }

From 9aad6521d16ae398618ba6b2ae1486a88ae48c1e Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Mon, 28 Feb 2022 16:34:19 +0100
Subject: [PATCH 1701/2325] Edit view_parser.

---
 user_guide_src/source/outgoing/view_parser/014.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/outgoing/view_parser/014.php b/user_guide_src/source/outgoing/view_parser/014.php
index 6219ce03b07d..182480337653 100644
--- a/user_guide_src/source/outgoing/view_parser/014.php
+++ b/user_guide_src/source/outgoing/view_parser/014.php
@@ -2,8 +2,9 @@
 
 class View extends BaseView
 {
-   'foo' => '\Some\Class::methodName',
+
     public $plugins = [
+        'foo' => '\Some\Class::methodName',
         'bar' => function($str, array $params = []) {
             return $str;
         },

From 439153fe4838ab68ef592d9c227e95fd10a24f2e Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Mon, 28 Feb 2022 16:40:00 +0100
Subject: [PATCH 1702/2325] Fix testing from code review.

---
 user_guide_src/source/testing/overview.rst     | 5 +++--
 user_guide_src/source/testing/overview/007.php | 5 +----
 user_guide_src/source/testing/overview/019.php | 6 +++---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst
index 648b3b4e79d9..2cfae8328caa 100644
--- a/user_guide_src/source/testing/overview.rst
+++ b/user_guide_src/source/testing/overview.rst
@@ -87,8 +87,9 @@ to help with staging and clean up::
 
     public static function setUpBeforeClass(): void
     public static function tearDownAfterClass(): void
-    public function setUp(): void
-    public function tearDown(): void
+
+    protected function setUp(): void
+    protected function tearDown(): void
 
 The static methods run before and after the entire test case, whereas the local methods run
 between each test. If you implement any of these special functions make sure you run their
diff --git a/user_guide_src/source/testing/overview/007.php b/user_guide_src/source/testing/overview/007.php
index 1ba21e197b0a..4921e027b721 100644
--- a/user_guide_src/source/testing/overview/007.php
+++ b/user_guide_src/source/testing/overview/007.php
@@ -10,10 +10,7 @@ protected function setUpAuthTrait()
     // ...
 }
 
-/**
- * @internal
- */
-final class AuthenticationFeatureTest
+final class AuthenticationFeatureTest extends CIUnitTestCase
 {
     use AuthTrait;
 
diff --git a/user_guide_src/source/testing/overview/019.php b/user_guide_src/source/testing/overview/019.php
index 3ede5c1e1291..d45682fcffaa 100644
--- a/user_guide_src/source/testing/overview/019.php
+++ b/user_guide_src/source/testing/overview/019.php
@@ -2,18 +2,18 @@
 
 final class Sometest extends CIUnitTestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         CITestStreamFilter::$buffer = '';
         $this->stream_filter        = stream_filter_append(STDOUT, 'CITestStreamFilter');
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         stream_filter_remove($this->stream_filter);
     }
 
-    public function testSomeOutput()
+    public function testSomeOutput(): void
     {
         CLI::write('first.');
         $expected = "first.\n";

From a1206a62e64c79cf42d65c4a066025150842cda2 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Mon, 28 Feb 2022 22:33:01 +0100
Subject: [PATCH 1703/2325] Fix view_parser examples.

---
 user_guide_src/source/outgoing/view_parser.rst     | 4 ++--
 user_guide_src/source/outgoing/view_parser/014.php | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index cee76727ef84..2e615e52bdb9 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -467,11 +467,11 @@ Registering a Plugin
 
 At its simplest, all you need to do to register a new plugin and make it ready for use is to add it to the
 **app/Config/View.php**, under the **$plugins** array. The key is the name of the plugin that is
-used within the template file. The value is any valid PHP callable, including static class methods, and closures:
+used within the template file. The value is any valid PHP callable, including static class methods:
 
 .. literalinclude:: view_parser/014.php
 
-Any closures that are being used must be defined in the config file's constructor:
+You can also use closures, but these can only be defined in the config file's constructor:
 
 .. literalinclude:: view_parser/015.php
 
diff --git a/user_guide_src/source/outgoing/view_parser/014.php b/user_guide_src/source/outgoing/view_parser/014.php
index 182480337653..22dd679fb9bd 100644
--- a/user_guide_src/source/outgoing/view_parser/014.php
+++ b/user_guide_src/source/outgoing/view_parser/014.php
@@ -2,11 +2,7 @@
 
 class View extends BaseView
 {
-
     public $plugins = [
         'foo' => '\Some\Class::methodName',
-        'bar' => function($str, array $params = []) {
-            return $str;
-        },
     ];
 }

From de2113d130d3739baf4510496a9b7c9c5678e4b5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 28 Feb 2022 16:36:08 +0900
Subject: [PATCH 1704/2325] docs: add section to link to "Extending the
 Controller"

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

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 21c717d9eace..5ade052c563a 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -307,6 +307,11 @@ Example:
 
 .. literalinclude:: controllers/012.php
 
+Extending the Controller
+************************
+
+If you want to extend the controller, see :doc:`../extending/basecontroller`.
+
 That's it!
 **********
 

From 4b5fd2fb341f16d1ea4f3d353b43f98e1964b2c0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 1 Mar 2022 13:43:29 +0900
Subject: [PATCH 1705/2325] docs: fix section titles and its marks

---
 .../source/tutorial/create_news_items.rst     | 14 ++++++------
 .../source/tutorial/news_section.rst          | 22 +++++++++----------
 .../source/tutorial/static_pages.rst          | 16 +++++++-------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index 7925edc05fd1..4300b44c3155 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -1,4 +1,4 @@
-Create news items
+Create News Items
 #################
 
 You now know how you can read data from a database using CodeIgniter, but
@@ -7,7 +7,7 @@ you'll expand your news controller and model created earlier to include
 this functionality.
 
 Enable CSRF Filter
-------------------
+******************
 
 Before creating a form, let's enable the CSRF protection.
 
@@ -22,8 +22,8 @@ You can read more about the CSRF protection in :doc:`Security </libraries/securi
     because auto-routing permits any HTTP method to access a controller.
     Accessing the controller with a method you don't expect could bypass the filter.
 
-Create a form
--------------
+Create a Form
+*************
 
 To input data into the database, you need to create a form where you can
 input the information to be stored. This means you'll be needing a form
@@ -96,7 +96,7 @@ This could be as simple as:
     News item created successfully.
 
 Model Updating
--------------------------------------------------------
+**************
 
 The only thing that remains is ensuring that your model is set up
 to allow data to be saved properly. The ``save()`` method that was
@@ -119,7 +119,7 @@ This helps protect against Mass Assignment Vulnerabilities. If your model is
 handling your timestamps, you would also leave those out.
 
 Routing
--------------------------------------------------------
+*******
 
 Before you can start adding news items into your CodeIgniter application
 you have to add an extra rule to **app/Config/Routes.php** file. Make sure your
@@ -144,7 +144,7 @@ Add some news and check out the different pages you made.
     :width: 45%
 
 Congratulations
--------------------------------------------------------
+***************
 
 You just completed your first CodeIgniter4 application!
 
diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
index 9a144dd06c19..b9713c3acadb 100644
--- a/user_guide_src/source/tutorial/news_section.rst
+++ b/user_guide_src/source/tutorial/news_section.rst
@@ -1,13 +1,13 @@
-News section
-###############################################################################
+News Section
+############
 
 In the last section, we went over some basic concepts of the framework
 by writing a class that references static pages. We cleaned up the URI by
 adding custom routing rules. Now it's time to introduce dynamic content
 and start using a database.
 
-Create a database to work with
--------------------------------------------------------
+Create a Database to Work with
+******************************
 
 The CodeIgniter installation assumes that you have set up an appropriate
 database, as outlined in the :doc:`requirements </intro/requirements>`.
@@ -47,8 +47,8 @@ The seed records might be something like:
     (2,'Say it isn\'t so!','say-it-isnt-so','Scientists conclude that some programmers have a sense of humor.'),
     (3,'Caffeination, Yes!','caffeination-yes','World\'s largest coffee shop open onsite nested coffee shop for staff only.');
 
-Connect to your database
--------------------------------------------------------
+Connect to Your Database
+************************
 
 The local configuration file, ``.env``, that you created when you installed
 CodeIgniter, should have the database property settings uncommented and
@@ -63,8 +63,8 @@ your database properly as described :doc:`here <../database/configuration>`.
     database.default.password = root
     database.default.DBDriver = MySQLi
 
-Setting up your model
--------------------------------------------------------
+Setting up Your Model
+*********************
 
 Instead of writing database operations right in the controller, queries
 should be placed in a model, so they can easily be reused later. Models
@@ -106,8 +106,8 @@ that use the Query Builder to run their commands on the current table, and
 returning an array of results in the format of your choice. In this example,
 ``findAll()`` returns an array of array.
 
-Display the news
--------------------------------------------------------
+Display the News
+****************
 
 Now that the queries are written, the model should be tied to the views
 that are going to display the news items to the user. This could be done
@@ -174,7 +174,7 @@ The only thing left to do is create the corresponding view at
 .. literalinclude:: news_section/007.php
 
 Routing
--------------------------------------------------------
+*******
 
 Because of the wildcard routing rule created earlier, you need an extra
 route to view the controller that you just made. Modify your routing file
diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
index 090a4d79e2f8..c6091aa46609 100644
--- a/user_guide_src/source/tutorial/static_pages.rst
+++ b/user_guide_src/source/tutorial/static_pages.rst
@@ -1,5 +1,5 @@
-Static pages
-###############################################################################
+Static Pages
+############
 
 .. note:: This tutorial assumes you've downloaded CodeIgniter and
    :doc:`installed the framework <../installation/index>` in your
@@ -27,8 +27,8 @@ you'll see URL patterns that match:
 As URL schemes become more complex, this may change. But for now, this
 is all we will need to know.
 
-Let's make our first controller
--------------------------------------------------------
+Let's Make our First Controller
+*******************************
 
 Create a file at **app/Controllers/Pages.php** with the following
 code.
@@ -85,8 +85,8 @@ includes the following code::
     function. It's a global function provided by CodeIgniter to help prevent
     XSS attacks. You can read more about it :doc:`here </general/common_functions>`.
 
-Adding logic to the controller
--------------------------------------------------------
+Adding Logic to the Controller
+******************************
 
 Earlier you set up a controller with a ``view()`` method. The method
 accepts one parameter, which is the name of the page to be loaded. The
@@ -131,7 +131,7 @@ view.
     :doc:`here </outgoing/views>`.
 
 Running the App
--------------------------------------------------------
+***************
 
 Ready to test? You cannot run the app using PHP's built-in server,
 since it will not properly process the ``.htaccess`` rules that are provided in
@@ -177,7 +177,7 @@ controller you made above produces...
     +---------------------------------+-----------------------------------------------------------------+
 
 Routing
--------------------------------------------------------
+*******
 
 The controller is now functioning!
 

From 6f3dde36f192b77a2f683d2fa2742b361438de16 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 1 Mar 2022 13:47:57 +0900
Subject: [PATCH 1706/2325] docs: fix RST format `::`

---
 .../source/tutorial/create_news_items.rst     |  8 ++-----
 user_guide_src/source/tutorial/index.rst      |  8 ++-----
 .../source/tutorial/news_section.rst          | 21 +++++++------------
 .../source/tutorial/static_pages.rst          | 16 ++++----------
 4 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index 4300b44c3155..32bc4b703e18 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -29,9 +29,7 @@ To input data into the database, you need to create a form where you can
 input the information to be stored. This means you'll be needing a form
 with two fields, one for the title and one for the text. You'll derive
 the slug from our title in the model. Create a new view at
-**app/Views/news/create.php**.
-
-::
+**app/Views/news/create.php**::
 
     <h2><?= esc($title) ?></h2>
 
@@ -89,9 +87,7 @@ slug, perfect for creating URIs.
 After this, a view is loaded to display a success message. Create a view at
 **app/Views/news/success.php** and write a success message.
 
-This could be as simple as:
-
-::
+This could be as simple as::
 
     News item created successfully.
 
diff --git a/user_guide_src/source/tutorial/index.rst b/user_guide_src/source/tutorial/index.rst
index 35cb5ba9ba7f..a47cdab405d1 100644
--- a/user_guide_src/source/tutorial/index.rst
+++ b/user_guide_src/source/tutorial/index.rst
@@ -55,9 +55,7 @@ Getting Up and Running
 
 You can download a release manually from the site, but for this tutorial we will
 use the recommended way and install the AppStarter package through Composer.
-From your command line type the following:
-
-::
+From your command line type the following::
 
     > composer create-project codeigniter4/appstarter ci-news
 
@@ -88,9 +86,7 @@ The Welcome Page
 ****************
 
 Now point your browser to the correct URL you will be greeted by a welcome screen.
-Try it now by heading to the following URL:
-
-::
+Try it now by heading to the following URL::
 
     http://localhost:8080
 
diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
index b9713c3acadb..2797c8a5cfaa 100644
--- a/user_guide_src/source/tutorial/news_section.rst
+++ b/user_guide_src/source/tutorial/news_section.rst
@@ -18,13 +18,7 @@ commands (mysql, MySQL Workbench, or phpMyAdmin).
 You need to create a database that can be used for this tutorial,
 and then configure CodeIgniter to use it.
 
-Using your database client, connect to your database and run the SQL command below (MySQL).
-Also, add some seed records. For now, we'll just show you the SQL statements needed
-to create the table, but you should be aware that this can be done programmatically
-once you are more familiar with CodeIgniter; you can read about :doc:`Migrations <../dbmgmt/migration>`
-and :doc:`Seeds <../dbmgmt/seeds>` to create more useful database setups later.
-
-::
+Using your database client, connect to your database and run the SQL command below (MySQL)::
 
     CREATE TABLE news (
         id INT UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -35,12 +29,15 @@ and :doc:`Seeds <../dbmgmt/seeds>` to create more useful database setups later.
         KEY slug (slug)
     );
 
+Also, add some seed records. For now, we'll just show you the SQL statements needed
+to create the table, but you should be aware that this can be done programmatically
+once you are more familiar with CodeIgniter; you can read about :doc:`Migrations <../dbmgmt/migration>`
+and :doc:`Seeds <../dbmgmt/seeds>` to create more useful database setups later.
+
 A note of interest: a "slug", in the context of web publishing, is a
 user- and SEO-friendly short text used in a URL to identify and describe a resource.
 
-The seed records might be something like:
-
-::
+The seed records might be something like::
 
     INSERT INTO news VALUES
     (1,'Elvis sighted','elvis-sighted','Elvis was sighted at the Podunk internet cafe. It looked like he was writing a CodeIgniter app.'),
@@ -53,9 +50,7 @@ Connect to Your Database
 The local configuration file, ``.env``, that you created when you installed
 CodeIgniter, should have the database property settings uncommented and
 set appropriately for the database you want to use. Make sure you've configured
-your database properly as described :doc:`here <../database/configuration>`.
-
-::
+your database properly as described :doc:`here <../database/configuration>`::
 
     database.default.hostname = localhost
     database.default.database = ci4tutorial
diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
index c6091aa46609..5128d6665e2c 100644
--- a/user_guide_src/source/tutorial/static_pages.rst
+++ b/user_guide_src/source/tutorial/static_pages.rst
@@ -9,18 +9,14 @@ The first thing you're going to do is set up a **controller** to handle
 static pages. A controller is simply a class that helps delegate work.
 It is the glue of your web application.
 
-For example, when a call is made to:
-
-::
+For example, when a call is made to::
 
     http://example.com/news/latest/10
 
 We might imagine that there is a controller named "news". The method
 being called on news would be "latest". The news method's job could be to
 grab 10 news items, and render them on the page. Very often in MVC,
-you'll see URL patterns that match:
-
-::
+you'll see URL patterns that match::
 
     http://example.com/[controller-class]/[controller-method]/[arguments]
 
@@ -138,9 +134,7 @@ since it will not properly process the ``.htaccess`` rules that are provided in
 ``public``, and which eliminate the need to specify "index.php/"
 as part of a URL. CodeIgniter has its own command that you can use though.
 
-From the command line, at the root of your project:
-
-::
+From the command line, at the root of your project::
 
     > php spark serve
 
@@ -182,9 +176,7 @@ Routing
 The controller is now functioning!
 
 Using custom routing rules, you have the power to map any URI to any
-controller and method, and break free from the normal convention:
-
-::
+controller and method, and break free from the normal convention::
 
     http://example.com/[controller-class]/[controller-method]/[arguments]
 

From 4e4ab0b381e57a334c89d0626812c24746656bf7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 1 Mar 2022 13:48:24 +0900
Subject: [PATCH 1707/2325] docs: fix out-of-dated description

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

diff --git a/user_guide_src/source/tutorial/index.rst b/user_guide_src/source/tutorial/index.rst
index a47cdab405d1..e940ec849057 100644
--- a/user_guide_src/source/tutorial/index.rst
+++ b/user_guide_src/source/tutorial/index.rst
@@ -22,7 +22,7 @@ This tutorial will primarily focus on:
 -  Model-View-Controller basics
 -  Routing basics
 -  Form validation
--  Performing basic database queries using CodeIgniter's "Query Builder"
+-  Performing basic database queries using CodeIgniter's Model
 
 The entire tutorial is split up over several pages, each explaining a
 small part of the functionality of the CodeIgniter framework. You'll go

From 6288b6b60722a750483feed8da5dd90dbe71a24a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 1 Mar 2022 14:43:32 +0900
Subject: [PATCH 1708/2325] docs: add how to code to prevent CSRF

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

diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index 7d69bc84ea2c..456d92207ef9 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -22,12 +22,43 @@ If you find a case where you do need direct access though, you may load it throu
 .. _cross-site-request-forgery:
 
 *********************************
-Cross-site request forgery (CSRF)
+Cross-Site Request Forgery (CSRF)
 *********************************
 
 .. warning:: The CSRF Protection is only available for **POST/PUT/PATCH/DELETE** requests.
     Requests for other methods are not protected.
 
+Prerequisite
+============
+
+When you use the CodeIgniter's CSRF protection, you still need to code as the following.
+Otherwise, the CSRF protection may be bypassed.
+
+When Auto-Routing is Disabled
+-----------------------------
+
+Do one of the following:
+
+1. Do not use ``$routes->add()``, and use HTTP verbs in routes.
+2. Check the request method in the controller method before processing.
+
+E.g.::
+
+    if (strtolower($this->request->getMethod()) !== 'post') {
+        return $this->response->setStatusCode(405)->setBody('Method Not Allowed');
+    }
+
+When Auto-Routing is Enabled
+----------------------------
+
+1. Check the request method in the controller method before processing.
+
+E.g.::
+
+    if (strtolower($this->request->getMethod()) !== 'post') {
+        return $this->response->setStatusCode(405)->setBody('Method Not Allowed');
+    }
+
 Config for CSRF
 ===============
 

From bcb3607debb42fa23ee5669ab6ffccf5e91065b6 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Tue, 1 Mar 2022 14:55:18 +0800
Subject: [PATCH 1709/2325] unnecessary parameter check.

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/Database/BaseBuilder.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index cc3e245a107b..43ce80c34abf 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -450,12 +450,6 @@ public function selectCount(string $select = '', string $alias = '')
      */
     public function selectSubquery(BaseBuilder $subquery, string $as): self
     {
-        if (! $this->isSubquery($subquery)) {
-            throw new DatabaseException(
-                'The BaseBuilder::selectSubquery() method expects a BaseBuilder instance.'
-            );
-        }
-
         $this->QBSelect[] = $this->buildSubquery($subquery, true, $as);
 
         return $this;

From 8f8a2e760ced0d7ed651c404c35783e858240440 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <40514119+sfadschm@users.noreply.github.com>
Date: Tue, 1 Mar 2022 08:48:25 +0100
Subject: [PATCH 1710/2325] Fix class names.

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 user_guide_src/source/incoming/controllers/010.php | 2 +-
 user_guide_src/source/incoming/controllers/011.php | 2 +-
 user_guide_src/source/incoming/controllers/012.php | 2 +-
 user_guide_src/source/incoming/controllers/013.php | 2 +-
 user_guide_src/source/incoming/controllers/017.php | 2 +-
 user_guide_src/source/incoming/controllers/018.php | 2 +-
 user_guide_src/source/incoming/controllers/019.php | 2 +-
 user_guide_src/source/incoming/routing/011.php     | 2 +-
 user_guide_src/source/testing/overview/017.php     | 2 +-
 user_guide_src/source/testing/overview/018.php     | 2 +-
 user_guide_src/source/testing/overview/019.php     | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/user_guide_src/source/incoming/controllers/010.php b/user_guide_src/source/incoming/controllers/010.php
index b74d386d6289..1add1c02464e 100644
--- a/user_guide_src/source/incoming/controllers/010.php
+++ b/user_guide_src/source/incoming/controllers/010.php
@@ -1,6 +1,6 @@
 <?php
 
-class myController extends BaseController
+class Products extends BaseController
 {
     public function _remap()
     {
diff --git a/user_guide_src/source/incoming/controllers/011.php b/user_guide_src/source/incoming/controllers/011.php
index c6b648d617c4..5c48b24ab3b2 100644
--- a/user_guide_src/source/incoming/controllers/011.php
+++ b/user_guide_src/source/incoming/controllers/011.php
@@ -1,6 +1,6 @@
 <?php
 
-class myController extends BaseController
+class Products extends BaseController
 {
     public function _remap($method)
     {
diff --git a/user_guide_src/source/incoming/controllers/012.php b/user_guide_src/source/incoming/controllers/012.php
index e6cc91140f6f..2e2ead7ea33f 100644
--- a/user_guide_src/source/incoming/controllers/012.php
+++ b/user_guide_src/source/incoming/controllers/012.php
@@ -1,6 +1,6 @@
 <?php
 
-class myController extends BaseController
+class Products extends BaseController
 {
     public function _remap($method, ...$params)
     {
diff --git a/user_guide_src/source/incoming/controllers/013.php b/user_guide_src/source/incoming/controllers/013.php
index 2586a7781dfe..7abe76b036da 100644
--- a/user_guide_src/source/incoming/controllers/013.php
+++ b/user_guide_src/source/incoming/controllers/013.php
@@ -1,6 +1,6 @@
 <?php
 
-class myController extends BaseController
+class Products extends BaseController
 {
     protected function utility()
     {
diff --git a/user_guide_src/source/incoming/controllers/017.php b/user_guide_src/source/incoming/controllers/017.php
index 8e4e5b50f96a..d2c48d32c4ac 100644
--- a/user_guide_src/source/incoming/controllers/017.php
+++ b/user_guide_src/source/incoming/controllers/017.php
@@ -1,6 +1,6 @@
 <?php
 
-class userController extends BaseController
+class UserController extends BaseController
 {
     public function updateUser(int $userID)
     {
diff --git a/user_guide_src/source/incoming/controllers/018.php b/user_guide_src/source/incoming/controllers/018.php
index 29c3780cc854..f57d704396db 100644
--- a/user_guide_src/source/incoming/controllers/018.php
+++ b/user_guide_src/source/incoming/controllers/018.php
@@ -1,6 +1,6 @@
 <?php
 
-class userController extends BaseController
+class UserController extends BaseController
 {
     public function updateUser(int $userID)
     {
diff --git a/user_guide_src/source/incoming/controllers/019.php b/user_guide_src/source/incoming/controllers/019.php
index c27156d7232a..dfdb53330703 100644
--- a/user_guide_src/source/incoming/controllers/019.php
+++ b/user_guide_src/source/incoming/controllers/019.php
@@ -1,6 +1,6 @@
 <?php
 
-class storeController extends BaseController
+class StoreController extends BaseController
 {
     public function product(int $id)
     {
diff --git a/user_guide_src/source/incoming/routing/011.php b/user_guide_src/source/incoming/routing/011.php
index 790f965912ca..d2bce55f78dc 100644
--- a/user_guide_src/source/incoming/routing/011.php
+++ b/user_guide_src/source/incoming/routing/011.php
@@ -1,6 +1,6 @@
 <?php
 
-class productController extends BaseController
+class ProductController extends BaseController
 {
     public function productLookup($seg1 = false, $seg2 = false, $seg3 = false)
     {
diff --git a/user_guide_src/source/testing/overview/017.php b/user_guide_src/source/testing/overview/017.php
index 9fb311e795e3..c2bdfeb29426 100644
--- a/user_guide_src/source/testing/overview/017.php
+++ b/user_guide_src/source/testing/overview/017.php
@@ -1,6 +1,6 @@
 <?php
 
-final class Sometest extends CIUnitTestCase
+final class SomeTest extends CIUnitTestCase
 {
     public function testSomething()
     {
diff --git a/user_guide_src/source/testing/overview/018.php b/user_guide_src/source/testing/overview/018.php
index 4c607dddb77e..8baf7888f36c 100644
--- a/user_guide_src/source/testing/overview/018.php
+++ b/user_guide_src/source/testing/overview/018.php
@@ -1,6 +1,6 @@
 <?php
 
-final class Sometest extends CIUnitTestCase
+final class SomeTest extends CIUnitTestCase
 {
     protected function setUp()
     {
diff --git a/user_guide_src/source/testing/overview/019.php b/user_guide_src/source/testing/overview/019.php
index d45682fcffaa..0dc69b4971fc 100644
--- a/user_guide_src/source/testing/overview/019.php
+++ b/user_guide_src/source/testing/overview/019.php
@@ -1,6 +1,6 @@
 <?php
 
-final class Sometest extends CIUnitTestCase
+final class SomeTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {

From 362c213842f5f529d74f0590cc8e65065baebcc8 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <40514119+sfadschm@users.noreply.github.com>
Date: Tue, 1 Mar 2022 08:57:39 +0100
Subject: [PATCH 1711/2325] Indicate other class methods/properties by '...'.

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 user_guide_src/source/database/configuration/001.php          | 2 ++
 user_guide_src/source/general/modules/001.php                 | 2 ++
 user_guide_src/source/general/modules/002.php                 | 4 ++++
 user_guide_src/source/general/modules/003.php                 | 2 ++
 user_guide_src/source/general/modules/004.php                 | 2 ++
 user_guide_src/source/incoming/filters/003.php                | 2 ++
 user_guide_src/source/installation/troubleshooting/001.php    | 4 ++++
 user_guide_src/source/installation/upgrade_415/001.php        | 4 ++++
 .../source/installation/upgrade_localization/001.php          | 4 ++++
 user_guide_src/source/installation/upgrade_security/001.php   | 4 ++++
 user_guide_src/source/libraries/caching/013.php               | 3 +++
 user_guide_src/source/libraries/encryption/005.php            | 2 ++
 12 files changed, 35 insertions(+)

diff --git a/user_guide_src/source/database/configuration/001.php b/user_guide_src/source/database/configuration/001.php
index 5a59fabfcfdc..ed5ba8a34304 100644
--- a/user_guide_src/source/database/configuration/001.php
+++ b/user_guide_src/source/database/configuration/001.php
@@ -20,4 +20,6 @@ class Database extends Config
         'strictOn' => false,
         'failover' => [],
     ];
+    
+    // ...
 }
diff --git a/user_guide_src/source/general/modules/001.php b/user_guide_src/source/general/modules/001.php
index 47a56e70072f..a11a9c4345cc 100644
--- a/user_guide_src/source/general/modules/001.php
+++ b/user_guide_src/source/general/modules/001.php
@@ -7,4 +7,6 @@ class Autoload extends AutoloadConfig
         'Config'      => APPPATH . 'Config',
         'Acme'        => ROOTPATH . 'acme',
     ];
+    
+    // ...
 }
diff --git a/user_guide_src/source/general/modules/002.php b/user_guide_src/source/general/modules/002.php
index 4d7b355da602..5b2826e9fcbc 100644
--- a/user_guide_src/source/general/modules/002.php
+++ b/user_guide_src/source/general/modules/002.php
@@ -2,9 +2,13 @@
 
 class Autoload extends AutoloadConfig
 {
+    // ...
+
     public $files = [
         'path/to/my/functions.php',
         'path/to/my/constants.php',
         'path/to/my/bootstrap.php',
     ];
+    
+    // ...
 }
diff --git a/user_guide_src/source/general/modules/003.php b/user_guide_src/source/general/modules/003.php
index 1124ef4d04db..a6247cd94103 100644
--- a/user_guide_src/source/general/modules/003.php
+++ b/user_guide_src/source/general/modules/003.php
@@ -7,4 +7,6 @@ class Autoload extends AutoloadConfig
         'Config'      => APPPATH . 'Config',
         'Acme\Blog'   => ROOTPATH . 'acme/Blog', // Change
     ];
+    
+    // ...
 }
diff --git a/user_guide_src/source/general/modules/004.php b/user_guide_src/source/general/modules/004.php
index 0f2c1c3967ad..c085dfa81736 100644
--- a/user_guide_src/source/general/modules/004.php
+++ b/user_guide_src/source/general/modules/004.php
@@ -3,4 +3,6 @@
 class Modules extends BaseModules
 {
     public $discoverInComposer = false;
+    
+    // ...
 }
diff --git a/user_guide_src/source/incoming/filters/003.php b/user_guide_src/source/incoming/filters/003.php
index a757fdf8f029..6957806f0bf5 100644
--- a/user_guide_src/source/incoming/filters/003.php
+++ b/user_guide_src/source/incoming/filters/003.php
@@ -5,4 +5,6 @@ class Filters extends BaseConfig
     public $aliases = [
         'csrf' => \CodeIgniter\Filters\CSRF::class,
     ];
+    
+    // ...
 }
diff --git a/user_guide_src/source/installation/troubleshooting/001.php b/user_guide_src/source/installation/troubleshooting/001.php
index c3aa124d6ce2..f8d52a35fb83 100644
--- a/user_guide_src/source/installation/troubleshooting/001.php
+++ b/user_guide_src/source/installation/troubleshooting/001.php
@@ -2,5 +2,9 @@
 
 class App extends BaseConfig
 {
+    // ...
+    
     public $indexPage = 'index.php';
+    
+    // ...
 }
diff --git a/user_guide_src/source/installation/upgrade_415/001.php b/user_guide_src/source/installation/upgrade_415/001.php
index b2ffbeaadc37..98909b124369 100644
--- a/user_guide_src/source/installation/upgrade_415/001.php
+++ b/user_guide_src/source/installation/upgrade_415/001.php
@@ -2,8 +2,12 @@
 
 class Filters extends BaseConfig
 {
+    // ...
+    
     public $methods = [
         'get'  => ['csrf'],
         'post' => ['csrf'],
     ];
+    
+    // ...
 }
diff --git a/user_guide_src/source/installation/upgrade_localization/001.php b/user_guide_src/source/installation/upgrade_localization/001.php
index 53d156de0545..a3d7897a9956 100644
--- a/user_guide_src/source/installation/upgrade_localization/001.php
+++ b/user_guide_src/source/installation/upgrade_localization/001.php
@@ -2,5 +2,9 @@
 
 class App extends BaseConfig
 {
+    // ...
+    
     public $defaultLocale = 'en';
+    
+    // ...
 }
diff --git a/user_guide_src/source/installation/upgrade_security/001.php b/user_guide_src/source/installation/upgrade_security/001.php
index 3e487bb37686..57c7b583ed88 100644
--- a/user_guide_src/source/installation/upgrade_security/001.php
+++ b/user_guide_src/source/installation/upgrade_security/001.php
@@ -2,10 +2,14 @@
 
 class Filters extends BaseConfig
 {
+    // ...
+    
     public $globals = [
         'before' => [
             // 'honeypot',
             'csrf',
         ],
     ];
+    
+    // ...
 }
diff --git a/user_guide_src/source/libraries/caching/013.php b/user_guide_src/source/libraries/caching/013.php
index 52e77d4b7f4b..a68fb194b935 100644
--- a/user_guide_src/source/libraries/caching/013.php
+++ b/user_guide_src/source/libraries/caching/013.php
@@ -2,10 +2,13 @@
 
 class Cache extends BaseConfig
 {
+    // ...
     public $memcached = [
         'host'   => '127.0.0.1',
         'port'   => 11211,
         'weight' => 1,
         'raw'    => false,
     ];
+    
+    // ...
 }
diff --git a/user_guide_src/source/libraries/encryption/005.php b/user_guide_src/source/libraries/encryption/005.php
index 992d322a1bd2..37e9ae3fe79b 100644
--- a/user_guide_src/source/libraries/encryption/005.php
+++ b/user_guide_src/source/libraries/encryption/005.php
@@ -3,4 +3,6 @@
 class Encryption extends BaseConfig
 {
     public $key = 'YOUR KEY';
+    
+    // ...
 }

From 546015f97e1c5ba96492d58cf5274cdf6e47e35a Mon Sep 17 00:00:00 2001
From: Alex Schmitz <40514119+sfadschm@users.noreply.github.com>
Date: Tue, 1 Mar 2022 09:50:45 +0100
Subject: [PATCH 1712/2325] Fix ...

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 user_guide_src/source/libraries/encryption/008.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/user_guide_src/source/libraries/encryption/008.php b/user_guide_src/source/libraries/encryption/008.php
index 77849fb96f6a..f48f42a0bbf5 100644
--- a/user_guide_src/source/libraries/encryption/008.php
+++ b/user_guide_src/source/libraries/encryption/008.php
@@ -7,4 +7,6 @@ class Encryption extends BaseConfig
 
     // or
     public $key = 'base64:<your-base64-encoded-key>';
+    
+    // ...
 }

From 4cc4ecc0c2771ba1b30295bf0c613bd9db49c36c Mon Sep 17 00:00:00 2001
From: Alex Schmitz <40514119+sfadschm@users.noreply.github.com>
Date: Tue, 1 Mar 2022 09:59:31 +0100
Subject: [PATCH 1713/2325] Add namspaces and use statements - first run.

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 user_guide_src/source/database/configuration/001.php        | 4 ++++
 user_guide_src/source/dbmgmt/migration/002.php              | 4 ++++
 user_guide_src/source/dbmgmt/seeds/003.php                  | 4 ++++
 user_guide_src/source/extending/basecontroller/002.php      | 2 ++
 user_guide_src/source/extending/basecontroller/003.php      | 2 ++
 user_guide_src/source/extending/core_classes/002.php        | 4 ++++
 user_guide_src/source/general/configuration/008.php         | 4 ++++
 user_guide_src/source/general/logging/002.php               | 4 ++++
 user_guide_src/source/general/logging/003.php               | 4 ++++
 user_guide_src/source/general/logging/004.php               | 4 ++++
 user_guide_src/source/general/managing_apps/001.php         | 2 ++
 user_guide_src/source/general/modules/001.php               | 4 ++++
 user_guide_src/source/general/modules/002.php               | 4 ++++
 user_guide_src/source/general/modules/003.php               | 4 ++++
 user_guide_src/source/general/modules/004.php               | 4 ++++
 user_guide_src/source/incoming/controllers/010.php          | 2 ++
 user_guide_src/source/incoming/filters/002.php              | 6 ++++++
 user_guide_src/source/incoming/filters/003.php              | 4 ++++
 user_guide_src/source/incoming/routing/011.php              | 2 ++
 user_guide_src/source/installation/troubleshooting/001.php  | 4 ++++
 user_guide_src/source/installation/upgrade_415/001.php      | 4 ++++
 .../source/installation/upgrade_localization/001.php        | 4 ++++
 user_guide_src/source/installation/upgrade_security/001.php | 4 ++++
 user_guide_src/source/libraries/caching/013.php             | 4 ++++
 user_guide_src/source/libraries/curlrequest/001.php         | 4 ++++
 user_guide_src/source/libraries/encryption/005.php          | 4 ++++
 26 files changed, 96 insertions(+)

diff --git a/user_guide_src/source/database/configuration/001.php b/user_guide_src/source/database/configuration/001.php
index ed5ba8a34304..5631cf7faede 100644
--- a/user_guide_src/source/database/configuration/001.php
+++ b/user_guide_src/source/database/configuration/001.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Database\Config;
+
 class Database extends Config
 {
     public $default = [
diff --git a/user_guide_src/source/dbmgmt/migration/002.php b/user_guide_src/source/dbmgmt/migration/002.php
index 35726a23aade..6a8482fb1478 100644
--- a/user_guide_src/source/dbmgmt/migration/002.php
+++ b/user_guide_src/source/dbmgmt/migration/002.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Database\Migrations;
+
+use CodeIgniter\Database\Migration;
+
 class AddBlog extends Migration
 {
     public function up()
diff --git a/user_guide_src/source/dbmgmt/seeds/003.php b/user_guide_src/source/dbmgmt/seeds/003.php
index 099904f4f2ab..8ec8f66d4b9f 100644
--- a/user_guide_src/source/dbmgmt/seeds/003.php
+++ b/user_guide_src/source/dbmgmt/seeds/003.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Database\Seeds;
+
+use CodeIgniter\Database\Seeder;
+
 class SimpleSeeder extends Seeder
 {
     public function run()
diff --git a/user_guide_src/source/extending/basecontroller/002.php b/user_guide_src/source/extending/basecontroller/002.php
index 509bb27a8707..bd7de42a0a94 100644
--- a/user_guide_src/source/extending/basecontroller/002.php
+++ b/user_guide_src/source/extending/basecontroller/002.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Controllers;
+
 class Home extends BaseController
 {
     protected $helpers = ['html', 'text'];
diff --git a/user_guide_src/source/extending/basecontroller/003.php b/user_guide_src/source/extending/basecontroller/003.php
index 5c053a71669f..4948b49bf0ac 100644
--- a/user_guide_src/source/extending/basecontroller/003.php
+++ b/user_guide_src/source/extending/basecontroller/003.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Controllers;
+
 class Home extends BaseController
 {
     public function initController(/* ... */)
diff --git a/user_guide_src/source/extending/core_classes/002.php b/user_guide_src/source/extending/core_classes/002.php
index cc3f38347ccf..df96db2fa7bf 100644
--- a/user_guide_src/source/extending/core_classes/002.php
+++ b/user_guide_src/source/extending/core_classes/002.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseService;
+
 class Services extends BaseService
 {
     public static function routes(bool $getShared = true)
diff --git a/user_guide_src/source/general/configuration/008.php b/user_guide_src/source/general/configuration/008.php
index dd301d8c69a1..197c200970ab 100644
--- a/user_guide_src/source/general/configuration/008.php
+++ b/user_guide_src/source/general/configuration/008.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseService;
+
 class MyConfig extends BaseConfig
 {
     public static $registrars = [
diff --git a/user_guide_src/source/general/logging/002.php b/user_guide_src/source/general/logging/002.php
index d542f40b4ccb..8d1409b481fe 100644
--- a/user_guide_src/source/general/logging/002.php
+++ b/user_guide_src/source/general/logging/002.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Logger extends BaseConfig
 {
     public $threshold = 5;
diff --git a/user_guide_src/source/general/logging/003.php b/user_guide_src/source/general/logging/003.php
index 7592b5674a50..e34a67075a09 100644
--- a/user_guide_src/source/general/logging/003.php
+++ b/user_guide_src/source/general/logging/003.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Logger extends BaseConfig
 {
     // Log only debug and info type messages
diff --git a/user_guide_src/source/general/logging/004.php b/user_guide_src/source/general/logging/004.php
index 00b79046e385..32746068e2b6 100644
--- a/user_guide_src/source/general/logging/004.php
+++ b/user_guide_src/source/general/logging/004.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Logger extends BaseConfig
 {
     public $handlers = [
diff --git a/user_guide_src/source/general/managing_apps/001.php b/user_guide_src/source/general/managing_apps/001.php
index d1690bdd55e6..253d888d316c 100644
--- a/user_guide_src/source/general/managing_apps/001.php
+++ b/user_guide_src/source/general/managing_apps/001.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Config;
+
 class Paths
 {
     public $appDirectory = '/path/to/your/app';
diff --git a/user_guide_src/source/general/modules/001.php b/user_guide_src/source/general/modules/001.php
index a11a9c4345cc..c8d49bd4d362 100644
--- a/user_guide_src/source/general/modules/001.php
+++ b/user_guide_src/source/general/modules/001.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\AutoloadConfig;
+
 class Autoload extends AutoloadConfig
 {
     public $psr4 = [
diff --git a/user_guide_src/source/general/modules/002.php b/user_guide_src/source/general/modules/002.php
index 5b2826e9fcbc..1ee3a742d9aa 100644
--- a/user_guide_src/source/general/modules/002.php
+++ b/user_guide_src/source/general/modules/002.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\AutoloadConfig;
+
 class Autoload extends AutoloadConfig
 {
     // ...
diff --git a/user_guide_src/source/general/modules/003.php b/user_guide_src/source/general/modules/003.php
index a6247cd94103..24accb0c737b 100644
--- a/user_guide_src/source/general/modules/003.php
+++ b/user_guide_src/source/general/modules/003.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\AutoloadConfig;
+
 class Autoload extends AutoloadConfig
 {
     public $psr4 = [
diff --git a/user_guide_src/source/general/modules/004.php b/user_guide_src/source/general/modules/004.php
index c085dfa81736..33bbe70b086f 100644
--- a/user_guide_src/source/general/modules/004.php
+++ b/user_guide_src/source/general/modules/004.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Modules\Modules as BaseModules;
+
 class Modules extends BaseModules
 {
     public $discoverInComposer = false;
diff --git a/user_guide_src/source/incoming/controllers/010.php b/user_guide_src/source/incoming/controllers/010.php
index 1add1c02464e..8bcb6a2b00f9 100644
--- a/user_guide_src/source/incoming/controllers/010.php
+++ b/user_guide_src/source/incoming/controllers/010.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Controllers;
+
 class Products extends BaseController
 {
     public function _remap()
diff --git a/user_guide_src/source/incoming/filters/002.php b/user_guide_src/source/incoming/filters/002.php
index b6c77a2eaa34..dc6cb337802b 100644
--- a/user_guide_src/source/incoming/filters/002.php
+++ b/user_guide_src/source/incoming/filters/002.php
@@ -1,5 +1,11 @@
 <?php
 
+namespace App\Filters;
+
+use CodeIgniter\Filters\FilterInterface;
+use CodeIgniter\HTTP\RequestInterface;
+use CodeIgniter\HTTP\ResponseInterface;
+
 class MyFilter implements FilterInterface
 {
     public function before(RequestInterface $request, $arguments = null)
diff --git a/user_guide_src/source/incoming/filters/003.php b/user_guide_src/source/incoming/filters/003.php
index 6957806f0bf5..9137ebb2c506 100644
--- a/user_guide_src/source/incoming/filters/003.php
+++ b/user_guide_src/source/incoming/filters/003.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+// ...
+
 class Filters extends BaseConfig
 {
     public $aliases = [
diff --git a/user_guide_src/source/incoming/routing/011.php b/user_guide_src/source/incoming/routing/011.php
index d2bce55f78dc..2b5433da8d67 100644
--- a/user_guide_src/source/incoming/routing/011.php
+++ b/user_guide_src/source/incoming/routing/011.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Controllers;
+
 class ProductController extends BaseController
 {
     public function productLookup($seg1 = false, $seg2 = false, $seg3 = false)
diff --git a/user_guide_src/source/installation/troubleshooting/001.php b/user_guide_src/source/installation/troubleshooting/001.php
index f8d52a35fb83..65f74aae9efc 100644
--- a/user_guide_src/source/installation/troubleshooting/001.php
+++ b/user_guide_src/source/installation/troubleshooting/001.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class App extends BaseConfig
 {
     // ...
diff --git a/user_guide_src/source/installation/upgrade_415/001.php b/user_guide_src/source/installation/upgrade_415/001.php
index 98909b124369..cd4d9bc18723 100644
--- a/user_guide_src/source/installation/upgrade_415/001.php
+++ b/user_guide_src/source/installation/upgrade_415/001.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+// ...
+
 class Filters extends BaseConfig
 {
     // ...
diff --git a/user_guide_src/source/installation/upgrade_localization/001.php b/user_guide_src/source/installation/upgrade_localization/001.php
index a3d7897a9956..731d1c5f2430 100644
--- a/user_guide_src/source/installation/upgrade_localization/001.php
+++ b/user_guide_src/source/installation/upgrade_localization/001.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class App extends BaseConfig
 {
     // ...
diff --git a/user_guide_src/source/installation/upgrade_security/001.php b/user_guide_src/source/installation/upgrade_security/001.php
index 57c7b583ed88..70be69c69684 100644
--- a/user_guide_src/source/installation/upgrade_security/001.php
+++ b/user_guide_src/source/installation/upgrade_security/001.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+// ...
+
 class Filters extends BaseConfig
 {
     // ...
diff --git a/user_guide_src/source/libraries/caching/013.php b/user_guide_src/source/libraries/caching/013.php
index a68fb194b935..74bda7604f34 100644
--- a/user_guide_src/source/libraries/caching/013.php
+++ b/user_guide_src/source/libraries/caching/013.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+// ...
+
 class Cache extends BaseConfig
 {
     // ...
diff --git a/user_guide_src/source/libraries/curlrequest/001.php b/user_guide_src/source/libraries/curlrequest/001.php
index 35d47924e213..35fd4621a92a 100644
--- a/user_guide_src/source/libraries/curlrequest/001.php
+++ b/user_guide_src/source/libraries/curlrequest/001.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class CURLRequest extends BaseConfig
 {
     public $shareOptions = false;
diff --git a/user_guide_src/source/libraries/encryption/005.php b/user_guide_src/source/libraries/encryption/005.php
index 37e9ae3fe79b..cbc92a5d1be1 100644
--- a/user_guide_src/source/libraries/encryption/005.php
+++ b/user_guide_src/source/libraries/encryption/005.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Encryption extends BaseConfig
 {
     public $key = 'YOUR KEY';

From b061ddbfd5501a86e1daba528ebd15dd3bb978e3 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Tue, 1 Mar 2022 11:05:37 +0100
Subject: [PATCH 1714/2325] Add namespaces and use statements - second run.

---
 user_guide_src/source/cli/cli_library/001.php            | 4 ++--
 user_guide_src/source/concepts/services/006.php          | 6 +++++-
 user_guide_src/source/concepts/services/007.php          | 4 ++++
 user_guide_src/source/concepts/services/008.php          | 4 ++++
 user_guide_src/source/concepts/services/010.php          | 6 +++++-
 user_guide_src/source/database/configuration/006.php     | 4 ++++
 user_guide_src/source/database/configuration/008.php     | 6 +++++-
 user_guide_src/source/dbmgmt/migration/005.php           | 4 +++-
 user_guide_src/source/extending/basecontroller/001.php   | 2 --
 user_guide_src/source/extending/basecontroller/004.php   | 8 ++++++--
 user_guide_src/source/general/errors/005.php             | 4 ++++
 user_guide_src/source/general/errors/006.php             | 6 +++++-
 user_guide_src/source/helpers/test_helper/002.php        | 4 +++-
 user_guide_src/source/incoming/controllers/002.php       | 2 +-
 user_guide_src/source/incoming/controllers/003.php       | 2 +-
 user_guide_src/source/incoming/controllers/004.php       | 2 +-
 user_guide_src/source/incoming/controllers/011.php       | 2 ++
 user_guide_src/source/incoming/controllers/012.php       | 2 ++
 user_guide_src/source/incoming/controllers/013.php       | 2 ++
 user_guide_src/source/incoming/controllers/017.php       | 2 ++
 user_guide_src/source/incoming/controllers/018.php       | 2 ++
 user_guide_src/source/incoming/controllers/019.php       | 2 ++
 user_guide_src/source/incoming/filters/003.php           | 3 +--
 user_guide_src/source/incoming/filters/004.php           | 4 ++++
 user_guide_src/source/incoming/filters/005.php           | 4 ++++
 user_guide_src/source/incoming/filters/006.php           | 4 ++++
 user_guide_src/source/incoming/filters/007.php           | 4 ++++
 user_guide_src/source/incoming/filters/008.php           | 4 ++++
 user_guide_src/source/incoming/filters/009.php           | 4 ++++
 user_guide_src/source/incoming/filters/011.php           | 4 ++++
 user_guide_src/source/incoming/incomingrequest/022.php   | 4 +++-
 .../source/installation/troubleshooting/002.php          | 7 +++++++
 user_guide_src/source/installation/upgrade_415/001.php   | 5 ++---
 .../source/installation/upgrade_security/001.php         | 5 ++---
 user_guide_src/source/libraries/caching/013.php          | 3 +--
 user_guide_src/source/libraries/caching/014.php          | 4 ++++
 user_guide_src/source/libraries/encryption/008.php       | 5 ++++-
 user_guide_src/source/libraries/files/014.php            | 4 +++-
 user_guide_src/source/libraries/honeypot/001.php         | 4 ++++
 user_guide_src/source/libraries/pagination/004.php       | 5 ++++-
 user_guide_src/source/libraries/pagination/010.php       | 4 ++++
 user_guide_src/source/libraries/pagination/011.php       | 4 ++++
 user_guide_src/source/libraries/security/002.php         | 4 ++++
 user_guide_src/source/libraries/security/003.php         | 4 ++++
 user_guide_src/source/libraries/security/004.php         | 4 ++++
 user_guide_src/source/libraries/security/005.php         | 4 ++++
 user_guide_src/source/libraries/security/006.php         | 4 ++++
 user_guide_src/source/libraries/security/007.php         | 4 ++++
 user_guide_src/source/libraries/security/008.php         | 4 ++++
 user_guide_src/source/libraries/security/009.php         | 4 ++++
 user_guide_src/source/libraries/sessions/040.php         | 4 ++++
 user_guide_src/source/libraries/sessions/041.php         | 4 ++++
 user_guide_src/source/libraries/sessions/042.php         | 4 ++++
 user_guide_src/source/libraries/sessions/043.php         | 4 ++++
 user_guide_src/source/libraries/sessions/044.php         | 4 ++++
 user_guide_src/source/libraries/throttler/003.php        | 4 ++++
 user_guide_src/source/libraries/throttler/004.php        | 4 ++++
 user_guide_src/source/libraries/validation/003.php       | 2 ++
 user_guide_src/source/libraries/validation/013.php       | 2 ++
 user_guide_src/source/libraries/validation/015.php       | 7 ++++---
 user_guide_src/source/libraries/validation/016.php       | 4 +++-
 user_guide_src/source/libraries/validation/031.php       | 2 ++
 user_guide_src/source/libraries/validation/032.php       | 2 ++
 user_guide_src/source/models/entities/019.php            | 4 +++-
 user_guide_src/source/models/entities/020.php            | 4 ++++
 user_guide_src/source/models/entities/021.php            | 8 +++++---
 user_guide_src/source/models/model/021.php               | 8 +++++---
 user_guide_src/source/models/model/027.php               | 9 ++++++---
 user_guide_src/source/models/model/034.php               | 4 ++++
 user_guide_src/source/models/model/038.php               | 4 ++++
 user_guide_src/source/models/model/040.php               | 4 ++++
 user_guide_src/source/models/model/041.php               | 4 ++++
 user_guide_src/source/models/model/050.php               | 4 ++++
 user_guide_src/source/models/model/051.php               | 4 ++++
 user_guide_src/source/models/model/052.php               | 4 ++++
 user_guide_src/source/models/model/054.php               | 4 ++++
 user_guide_src/source/outgoing/api_responses/001.php     | 3 ++-
 user_guide_src/source/outgoing/api_responses/003.php     | 4 ++++
 user_guide_src/source/outgoing/api_responses/004.php     | 4 ++++
 user_guide_src/source/outgoing/localization/001.php      | 4 ++++
 user_guide_src/source/outgoing/localization/002.php      | 4 ++++
 user_guide_src/source/outgoing/localization/003.php      | 4 ++++
 user_guide_src/source/outgoing/localization/005.php      | 2 +-
 user_guide_src/source/outgoing/response/011.php          | 4 ++++
 user_guide_src/source/outgoing/view_decorators/002.php   | 4 ++++
 user_guide_src/source/outgoing/view_layouts/001.php      | 2 ++
 user_guide_src/source/outgoing/view_parser/012.php       | 4 ++++
 user_guide_src/source/outgoing/view_parser/013.php       | 4 ++++
 user_guide_src/source/outgoing/view_parser/014.php       | 4 ++++
 user_guide_src/source/outgoing/view_parser/015.php       | 8 ++++++--
 user_guide_src/source/outgoing/view_parser/016.php       | 4 ++++
 user_guide_src/source/outgoing/view_parser/017.php       | 4 ++++
 user_guide_src/source/outgoing/views/002.php             | 4 +++-
 user_guide_src/source/outgoing/views/003.php             | 4 +++-
 user_guide_src/source/outgoing/views/009.php             | 8 +++++---
 user_guide_src/source/outgoing/views/011.php             | 4 +++-
 user_guide_src/source/testing/controllers/012.php        | 8 ++++++--
 user_guide_src/source/testing/controllers/014.php        | 5 +++++
 user_guide_src/source/testing/debugging/003.php          | 4 ++++
 user_guide_src/source/testing/fabricator/001.php         | 7 ++++++-
 user_guide_src/source/testing/fabricator/005.php         | 2 ++
 user_guide_src/source/testing/fabricator/006.php         | 4 +++-
 user_guide_src/source/testing/fabricator/021.php         | 4 +++-
 user_guide_src/source/testing/overview/004.php           | 4 ++++
 user_guide_src/source/testing/overview/005.php           | 4 ++++
 user_guide_src/source/testing/overview/006.php           | 4 ++++
 user_guide_src/source/testing/overview/007.php           | 2 ++
 user_guide_src/source/testing/overview/017.php           | 2 ++
 user_guide_src/source/testing/overview/018.php           | 2 ++
 user_guide_src/source/testing/overview/019.php           | 2 ++
 user_guide_src/source/tutorial/create_news_items/001.php | 4 ++++
 user_guide_src/source/tutorial/create_news_items/002.php | 2 ++
 user_guide_src/source/tutorial/news_section/004.php      | 4 ++++
 user_guide_src/source/tutorial/news_section/006.php      | 4 ++++
 user_guide_src/source/tutorial/static_pages/002.php      | 2 ++
 115 files changed, 404 insertions(+), 58 deletions(-)

diff --git a/user_guide_src/source/cli/cli_library/001.php b/user_guide_src/source/cli/cli_library/001.php
index d0b0af7095c1..89e798a5647b 100644
--- a/user_guide_src/source/cli/cli_library/001.php
+++ b/user_guide_src/source/cli/cli_library/001.php
@@ -2,9 +2,9 @@
 
 namespace App\Controllers;
 
-use CodeIgniter\CLI\CLI;
+use CodeIgniter\Controller;
 
-class MyController extends \CodeIgniter\Controller
+class MyController extends Controller
 {
     // ...
 }
diff --git a/user_guide_src/source/concepts/services/006.php b/user_guide_src/source/concepts/services/006.php
index 65d27f7c734a..c352a4365710 100644
--- a/user_guide_src/source/concepts/services/006.php
+++ b/user_guide_src/source/concepts/services/006.php
@@ -1,6 +1,10 @@
 <?php
 
-class MyRouter implements \CodeIgniter\Router\RouteCollectionInterface
+namespace App\Router;
+
+use CodeIgniter\Router\RouteCollectionInterface;
+
+class MyRouter implements RouteCollectionInterface
 {
     // Implement required methods here.
 }
diff --git a/user_guide_src/source/concepts/services/007.php b/user_guide_src/source/concepts/services/007.php
index 6096fe592142..ed1990b3dca2 100644
--- a/user_guide_src/source/concepts/services/007.php
+++ b/user_guide_src/source/concepts/services/007.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseService;
+
 class Services extends BaseService
 {
     public static function routes()
diff --git a/user_guide_src/source/concepts/services/008.php b/user_guide_src/source/concepts/services/008.php
index 3fdffe4ddd9d..1f1db41226b0 100644
--- a/user_guide_src/source/concepts/services/008.php
+++ b/user_guide_src/source/concepts/services/008.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseService;
+
 class Services extends BaseService
 {
     public static function renderer($viewPath = APPPATH . 'views/')
diff --git a/user_guide_src/source/concepts/services/010.php b/user_guide_src/source/concepts/services/010.php
index e3b031234d81..f4332f6404e3 100644
--- a/user_guide_src/source/concepts/services/010.php
+++ b/user_guide_src/source/concepts/services/010.php
@@ -1,6 +1,10 @@
 <?php
 
-class Services
+namespace Config;
+
+use CodeIgniter\Config\BaseService;
+
+class Services extends BaseService
 {
     public static function routes($getShared = false)
     {
diff --git a/user_guide_src/source/database/configuration/006.php b/user_guide_src/source/database/configuration/006.php
index d5b4a5d691d5..31cd766c4f8e 100644
--- a/user_guide_src/source/database/configuration/006.php
+++ b/user_guide_src/source/database/configuration/006.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Database\Config;
+
 class Database extends Config
 {
     public $test = [
diff --git a/user_guide_src/source/database/configuration/008.php b/user_guide_src/source/database/configuration/008.php
index 9d2d76336d94..5639c484d125 100644
--- a/user_guide_src/source/database/configuration/008.php
+++ b/user_guide_src/source/database/configuration/008.php
@@ -1,6 +1,10 @@
 <?php
 
-class Database
+namespace Config;
+
+use CodeIgniter\Database\Config;
+
+class Database extends Config
 {
     public $development = [/* ... */];
     public $test        = [/* ... */];
diff --git a/user_guide_src/source/dbmgmt/migration/005.php b/user_guide_src/source/dbmgmt/migration/005.php
index 854744f68e5e..958aff859e9d 100644
--- a/user_guide_src/source/dbmgmt/migration/005.php
+++ b/user_guide_src/source/dbmgmt/migration/005.php
@@ -2,7 +2,9 @@
 
 namespace App\Controllers;
 
-class Migrate extends \CodeIgniter\Controller
+use CodeIgniter\Controller;
+
+class Migrate extends Controller
 {
     public function index()
     {
diff --git a/user_guide_src/source/extending/basecontroller/001.php b/user_guide_src/source/extending/basecontroller/001.php
index f201f751b0e0..bcdb45a9ffe5 100644
--- a/user_guide_src/source/extending/basecontroller/001.php
+++ b/user_guide_src/source/extending/basecontroller/001.php
@@ -2,8 +2,6 @@
 
 namespace App\Controllers;
 
-use CodeIgniter\Controller;
-
 class Home extends BaseController
 {
     // ...
diff --git a/user_guide_src/source/extending/basecontroller/004.php b/user_guide_src/source/extending/basecontroller/004.php
index 427b0662ff80..ea935c6c107f 100644
--- a/user_guide_src/source/extending/basecontroller/004.php
+++ b/user_guide_src/source/extending/basecontroller/004.php
@@ -1,6 +1,10 @@
 <?php
 
-class Home extends \CodeIgniter\Controller
-{
+namespace App\Controllers;
+
+use CodeIgniter\Controller;
 
+class Home extends Controller
+{
+    // ...
 }
diff --git a/user_guide_src/source/general/errors/005.php b/user_guide_src/source/general/errors/005.php
index 463d1460ba8e..4fe23c0834bd 100644
--- a/user_guide_src/source/general/errors/005.php
+++ b/user_guide_src/source/general/errors/005.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Exceptions extends BaseConfig
 {
     public $log = true;
diff --git a/user_guide_src/source/general/errors/006.php b/user_guide_src/source/general/errors/006.php
index e661df24cbf6..e4d1b854a614 100644
--- a/user_guide_src/source/general/errors/006.php
+++ b/user_guide_src/source/general/errors/006.php
@@ -1,6 +1,10 @@
 <?php
 
+namespace App\Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Exceptions extends BaseConfig
 {
-    public $ignoredCodes = [ 404 ];
+    public $ignoredCodes = [404];
 }
diff --git a/user_guide_src/source/helpers/test_helper/002.php b/user_guide_src/source/helpers/test_helper/002.php
index 10fb42b1260f..0b3d561db0b7 100644
--- a/user_guide_src/source/helpers/test_helper/002.php
+++ b/user_guide_src/source/helpers/test_helper/002.php
@@ -1,6 +1,8 @@
 <?php
 
-final class MyTestClass extends \CodeIgniter\Test\CIUnitTestCase
+use CodeIgniter\Test\CIUnitTestCase;
+
+final class MyTestClass extends CIUnitTestCase
 {
     public function testUserAccess()
     {
diff --git a/user_guide_src/source/incoming/controllers/002.php b/user_guide_src/source/incoming/controllers/002.php
index 663ac8682499..20fe63dc2d69 100644
--- a/user_guide_src/source/incoming/controllers/002.php
+++ b/user_guide_src/source/incoming/controllers/002.php
@@ -4,5 +4,5 @@
 
 class Helloworld extends BaseController
 {
-
+    // ...
 }
diff --git a/user_guide_src/source/incoming/controllers/003.php b/user_guide_src/source/incoming/controllers/003.php
index cc324c127c55..5248ba4b2bdd 100644
--- a/user_guide_src/source/incoming/controllers/003.php
+++ b/user_guide_src/source/incoming/controllers/003.php
@@ -4,5 +4,5 @@
 
 class helloworld extends BaseController
 {
-
+    // ...
 }
diff --git a/user_guide_src/source/incoming/controllers/004.php b/user_guide_src/source/incoming/controllers/004.php
index 7eb66a416bba..7615eecaeba0 100644
--- a/user_guide_src/source/incoming/controllers/004.php
+++ b/user_guide_src/source/incoming/controllers/004.php
@@ -4,5 +4,5 @@
 
 class HelloWorld extends BaseController
 {
-
+    // ...
 }
diff --git a/user_guide_src/source/incoming/controllers/011.php b/user_guide_src/source/incoming/controllers/011.php
index 5c48b24ab3b2..159009b6b855 100644
--- a/user_guide_src/source/incoming/controllers/011.php
+++ b/user_guide_src/source/incoming/controllers/011.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Controllers;
+
 class Products extends BaseController
 {
     public function _remap($method)
diff --git a/user_guide_src/source/incoming/controllers/012.php b/user_guide_src/source/incoming/controllers/012.php
index 2e2ead7ea33f..4bfdb1393d02 100644
--- a/user_guide_src/source/incoming/controllers/012.php
+++ b/user_guide_src/source/incoming/controllers/012.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Controllers;
+
 class Products extends BaseController
 {
     public function _remap($method, ...$params)
diff --git a/user_guide_src/source/incoming/controllers/013.php b/user_guide_src/source/incoming/controllers/013.php
index 7abe76b036da..7c2e9b7091ea 100644
--- a/user_guide_src/source/incoming/controllers/013.php
+++ b/user_guide_src/source/incoming/controllers/013.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Controllers;
+
 class Products extends BaseController
 {
     protected function utility()
diff --git a/user_guide_src/source/incoming/controllers/017.php b/user_guide_src/source/incoming/controllers/017.php
index d2c48d32c4ac..65b1c77f8014 100644
--- a/user_guide_src/source/incoming/controllers/017.php
+++ b/user_guide_src/source/incoming/controllers/017.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Controllers;
+
 class UserController extends BaseController
 {
     public function updateUser(int $userID)
diff --git a/user_guide_src/source/incoming/controllers/018.php b/user_guide_src/source/incoming/controllers/018.php
index f57d704396db..48e936b60595 100644
--- a/user_guide_src/source/incoming/controllers/018.php
+++ b/user_guide_src/source/incoming/controllers/018.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Controllers;
+
 class UserController extends BaseController
 {
     public function updateUser(int $userID)
diff --git a/user_guide_src/source/incoming/controllers/019.php b/user_guide_src/source/incoming/controllers/019.php
index dfdb53330703..1ae78e5791ff 100644
--- a/user_guide_src/source/incoming/controllers/019.php
+++ b/user_guide_src/source/incoming/controllers/019.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Controllers;
+
 class StoreController extends BaseController
 {
     public function product(int $id)
diff --git a/user_guide_src/source/incoming/filters/003.php b/user_guide_src/source/incoming/filters/003.php
index 9137ebb2c506..060f5957b5cc 100644
--- a/user_guide_src/source/incoming/filters/003.php
+++ b/user_guide_src/source/incoming/filters/003.php
@@ -2,13 +2,12 @@
 
 namespace Config;
 
-// ...
+use CodeIgniter\Config\BaseConfig;
 
 class Filters extends BaseConfig
 {
     public $aliases = [
         'csrf' => \CodeIgniter\Filters\CSRF::class,
     ];
-    
     // ...
 }
diff --git a/user_guide_src/source/incoming/filters/004.php b/user_guide_src/source/incoming/filters/004.php
index 3615cf8f6072..c6ebb321f7e2 100644
--- a/user_guide_src/source/incoming/filters/004.php
+++ b/user_guide_src/source/incoming/filters/004.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Filters extends BaseConfig
 {
     public $aliases = [
diff --git a/user_guide_src/source/incoming/filters/005.php b/user_guide_src/source/incoming/filters/005.php
index 7599c93e1203..7dca9d31631d 100644
--- a/user_guide_src/source/incoming/filters/005.php
+++ b/user_guide_src/source/incoming/filters/005.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Filters extends BaseConfig
 {
     public $globals = [
diff --git a/user_guide_src/source/incoming/filters/006.php b/user_guide_src/source/incoming/filters/006.php
index 3cd37f8224e9..3781a875cff8 100644
--- a/user_guide_src/source/incoming/filters/006.php
+++ b/user_guide_src/source/incoming/filters/006.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Filters extends BaseConfig
 {
     public $globals = [
diff --git a/user_guide_src/source/incoming/filters/007.php b/user_guide_src/source/incoming/filters/007.php
index e9c1dba48fc6..03844d9f763d 100644
--- a/user_guide_src/source/incoming/filters/007.php
+++ b/user_guide_src/source/incoming/filters/007.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Filters extends BaseConfig
 {
     public $globals = [
diff --git a/user_guide_src/source/incoming/filters/008.php b/user_guide_src/source/incoming/filters/008.php
index e50628a13bd5..f35895d26e2e 100644
--- a/user_guide_src/source/incoming/filters/008.php
+++ b/user_guide_src/source/incoming/filters/008.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Filters extends BaseConfig
 {
     public $methods = [
diff --git a/user_guide_src/source/incoming/filters/009.php b/user_guide_src/source/incoming/filters/009.php
index 2505d8fcc2a2..1fd9ab69ec4c 100644
--- a/user_guide_src/source/incoming/filters/009.php
+++ b/user_guide_src/source/incoming/filters/009.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Filters extends BaseConfig
 {
     public $filters = [
diff --git a/user_guide_src/source/incoming/filters/011.php b/user_guide_src/source/incoming/filters/011.php
index 54b276967859..ccc7c2cbd1f5 100644
--- a/user_guide_src/source/incoming/filters/011.php
+++ b/user_guide_src/source/incoming/filters/011.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Filters extends BaseConfig
 {
     public $aliases = [
diff --git a/user_guide_src/source/incoming/incomingrequest/022.php b/user_guide_src/source/incoming/incomingrequest/022.php
index 55484f98a10b..a726fcf2d5cf 100644
--- a/user_guide_src/source/incoming/incomingrequest/022.php
+++ b/user_guide_src/source/incoming/incomingrequest/022.php
@@ -1,6 +1,8 @@
 <?php
 
-class MyMenuTest extends CIUnitTestCase
+use CodeIgniter\Test\CIUnitTestCase;
+
+final class MyMenuTest extends CIUnitTestCase
 {
     public function testActiveLinkUsesCurrentUrl()
     {
diff --git a/user_guide_src/source/installation/troubleshooting/002.php b/user_guide_src/source/installation/troubleshooting/002.php
index ca7c9183ddbf..719aabac2f65 100644
--- a/user_guide_src/source/installation/troubleshooting/002.php
+++ b/user_guide_src/source/installation/troubleshooting/002.php
@@ -1,6 +1,13 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class App extends BaseConfig
 {
+    // ...
+
     public $indexPage = 'index.php?';
+    // ...
 }
diff --git a/user_guide_src/source/installation/upgrade_415/001.php b/user_guide_src/source/installation/upgrade_415/001.php
index cd4d9bc18723..9d51911e38eb 100644
--- a/user_guide_src/source/installation/upgrade_415/001.php
+++ b/user_guide_src/source/installation/upgrade_415/001.php
@@ -2,16 +2,15 @@
 
 namespace Config;
 
-// ...
+use CodeIgniter\Config\BaseConfig;
 
 class Filters extends BaseConfig
 {
     // ...
-    
+
     public $methods = [
         'get'  => ['csrf'],
         'post' => ['csrf'],
     ];
-    
     // ...
 }
diff --git a/user_guide_src/source/installation/upgrade_security/001.php b/user_guide_src/source/installation/upgrade_security/001.php
index 70be69c69684..38536bd67cce 100644
--- a/user_guide_src/source/installation/upgrade_security/001.php
+++ b/user_guide_src/source/installation/upgrade_security/001.php
@@ -2,18 +2,17 @@
 
 namespace Config;
 
-// ...
+use CodeIgniter\Config\BaseConfig;
 
 class Filters extends BaseConfig
 {
     // ...
-    
+
     public $globals = [
         'before' => [
             // 'honeypot',
             'csrf',
         ],
     ];
-    
     // ...
 }
diff --git a/user_guide_src/source/libraries/caching/013.php b/user_guide_src/source/libraries/caching/013.php
index 74bda7604f34..3dd8ff740944 100644
--- a/user_guide_src/source/libraries/caching/013.php
+++ b/user_guide_src/source/libraries/caching/013.php
@@ -2,7 +2,7 @@
 
 namespace Config;
 
-// ...
+use CodeIgniter\Config\BaseConfig;
 
 class Cache extends BaseConfig
 {
@@ -13,6 +13,5 @@ class Cache extends BaseConfig
         'weight' => 1,
         'raw'    => false,
     ];
-    
     // ...
 }
diff --git a/user_guide_src/source/libraries/caching/014.php b/user_guide_src/source/libraries/caching/014.php
index 2c0f5eb719bd..716bf637161b 100644
--- a/user_guide_src/source/libraries/caching/014.php
+++ b/user_guide_src/source/libraries/caching/014.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Cache extends BaseConfig
 {
     public $redis = [
diff --git a/user_guide_src/source/libraries/encryption/008.php b/user_guide_src/source/libraries/encryption/008.php
index f48f42a0bbf5..506a5d594c4e 100644
--- a/user_guide_src/source/libraries/encryption/008.php
+++ b/user_guide_src/source/libraries/encryption/008.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Encryption extends BaseConfig
 {
     // In Encryption, you may use
@@ -7,6 +11,5 @@ class Encryption extends BaseConfig
 
     // or
     public $key = 'base64:<your-base64-encoded-key>';
-    
     // ...
 }
diff --git a/user_guide_src/source/libraries/files/014.php b/user_guide_src/source/libraries/files/014.php
index a768829427f3..cbd6f90e5388 100644
--- a/user_guide_src/source/libraries/files/014.php
+++ b/user_guide_src/source/libraries/files/014.php
@@ -1,6 +1,8 @@
 <?php
 
-class ConfigCollection extends \CodeIgniter\Files\FileCollection
+use CodeIgniter\Files\FileCollection;
+
+class ConfigCollection extends FileCollection
 {
     protected function define(): void
     {
diff --git a/user_guide_src/source/libraries/honeypot/001.php b/user_guide_src/source/libraries/honeypot/001.php
index 8d73a4f1e586..5fd6cefc3036 100644
--- a/user_guide_src/source/libraries/honeypot/001.php
+++ b/user_guide_src/source/libraries/honeypot/001.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Filters extends BaseConfig
 {
     public $globals = [
diff --git a/user_guide_src/source/libraries/pagination/004.php b/user_guide_src/source/libraries/pagination/004.php
index 6326d1f9c825..75eb88c3e409 100644
--- a/user_guide_src/source/libraries/pagination/004.php
+++ b/user_guide_src/source/libraries/pagination/004.php
@@ -1,6 +1,9 @@
 <?php
 
-// In the Controller
+namespace App\Controllers;
+
+use CodeIgniter\Controller;
+
 class UserController extends Controller
 {
     public function index()
diff --git a/user_guide_src/source/libraries/pagination/010.php b/user_guide_src/source/libraries/pagination/010.php
index 1f97238b0506..868bc5e8620f 100644
--- a/user_guide_src/source/libraries/pagination/010.php
+++ b/user_guide_src/source/libraries/pagination/010.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Pager extends BaseConfig
 {
     public $templates = [
diff --git a/user_guide_src/source/libraries/pagination/011.php b/user_guide_src/source/libraries/pagination/011.php
index 8387b1e82dbd..4d596e593312 100644
--- a/user_guide_src/source/libraries/pagination/011.php
+++ b/user_guide_src/source/libraries/pagination/011.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Pager extends BaseConfig
 {
     public $templates = [
diff --git a/user_guide_src/source/libraries/security/002.php b/user_guide_src/source/libraries/security/002.php
index 1ce5fbba68d9..64de01125e4f 100644
--- a/user_guide_src/source/libraries/security/002.php
+++ b/user_guide_src/source/libraries/security/002.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Security extends BaseConfig
 {
     public $csrfProtection = 'session';
diff --git a/user_guide_src/source/libraries/security/003.php b/user_guide_src/source/libraries/security/003.php
index 22b06da0e4c6..c877680a923b 100644
--- a/user_guide_src/source/libraries/security/003.php
+++ b/user_guide_src/source/libraries/security/003.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Security extends BaseConfig
 {
     public $tokenRandomize = true;
diff --git a/user_guide_src/source/libraries/security/004.php b/user_guide_src/source/libraries/security/004.php
index 61075283006e..d12b4e2243f7 100644
--- a/user_guide_src/source/libraries/security/004.php
+++ b/user_guide_src/source/libraries/security/004.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Security extends BaseConfig
 {
     public $regenerate = true;
diff --git a/user_guide_src/source/libraries/security/005.php b/user_guide_src/source/libraries/security/005.php
index 56a89f54783b..51040f3be460 100644
--- a/user_guide_src/source/libraries/security/005.php
+++ b/user_guide_src/source/libraries/security/005.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Security extends BaseConfig
 {
     public $redirect = false;
diff --git a/user_guide_src/source/libraries/security/006.php b/user_guide_src/source/libraries/security/006.php
index 3e487bb37686..c2a392bbcc63 100644
--- a/user_guide_src/source/libraries/security/006.php
+++ b/user_guide_src/source/libraries/security/006.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Filters extends BaseConfig
 {
     public $globals = [
diff --git a/user_guide_src/source/libraries/security/007.php b/user_guide_src/source/libraries/security/007.php
index db1b03df65fb..c32e7bc2b517 100644
--- a/user_guide_src/source/libraries/security/007.php
+++ b/user_guide_src/source/libraries/security/007.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Filters extends BaseConfig
 {
     public $globals = [
diff --git a/user_guide_src/source/libraries/security/008.php b/user_guide_src/source/libraries/security/008.php
index 2138994f0241..faa45c0bd605 100644
--- a/user_guide_src/source/libraries/security/008.php
+++ b/user_guide_src/source/libraries/security/008.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Filters extends BaseConfig
 {
     public $globals = [
diff --git a/user_guide_src/source/libraries/security/009.php b/user_guide_src/source/libraries/security/009.php
index b2ffbeaadc37..397681518d26 100644
--- a/user_guide_src/source/libraries/security/009.php
+++ b/user_guide_src/source/libraries/security/009.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Filters extends BaseConfig
 {
     public $methods = [
diff --git a/user_guide_src/source/libraries/sessions/040.php b/user_guide_src/source/libraries/sessions/040.php
index 7aa5f051b875..29d50c78302c 100644
--- a/user_guide_src/source/libraries/sessions/040.php
+++ b/user_guide_src/source/libraries/sessions/040.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class App extends BaseConfig
 {
     public $sessionDriver   = 'CodeIgniter\Session\Handlers\DatabaseHandler';
diff --git a/user_guide_src/source/libraries/sessions/041.php b/user_guide_src/source/libraries/sessions/041.php
index 130cd7087bbe..fe2777cae60c 100644
--- a/user_guide_src/source/libraries/sessions/041.php
+++ b/user_guide_src/source/libraries/sessions/041.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class App extends BaseConfig
 {
     public $sessionDBGroup = 'groupName';
diff --git a/user_guide_src/source/libraries/sessions/042.php b/user_guide_src/source/libraries/sessions/042.php
index c07412cbed30..830569b5dcbb 100644
--- a/user_guide_src/source/libraries/sessions/042.php
+++ b/user_guide_src/source/libraries/sessions/042.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class App extends BaseConfig
 {
     public $sessionDiver    = 'CodeIgniter\Session\Handlers\RedisHandler';
diff --git a/user_guide_src/source/libraries/sessions/043.php b/user_guide_src/source/libraries/sessions/043.php
index 6c9dbb9aae1b..4a50d0e20c51 100644
--- a/user_guide_src/source/libraries/sessions/043.php
+++ b/user_guide_src/source/libraries/sessions/043.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class App extends BaseConfig
 {
     public $sessionDriver   = 'CodeIgniter\Session\Handlers\MemcachedHandler';
diff --git a/user_guide_src/source/libraries/sessions/044.php b/user_guide_src/source/libraries/sessions/044.php
index 85ba471fea1a..3e889f270f3d 100644
--- a/user_guide_src/source/libraries/sessions/044.php
+++ b/user_guide_src/source/libraries/sessions/044.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class App extends BaseConfig
 {
     // localhost will be given higher priority (5) here,
diff --git a/user_guide_src/source/libraries/throttler/003.php b/user_guide_src/source/libraries/throttler/003.php
index 5b340cadb333..56b0fe4e1c59 100644
--- a/user_guide_src/source/libraries/throttler/003.php
+++ b/user_guide_src/source/libraries/throttler/003.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Filters extends BaseConfig
 {
     public $aliases = [
diff --git a/user_guide_src/source/libraries/throttler/004.php b/user_guide_src/source/libraries/throttler/004.php
index e7d0643db053..e8ec69b0b046 100644
--- a/user_guide_src/source/libraries/throttler/004.php
+++ b/user_guide_src/source/libraries/throttler/004.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Filters extends BaseConfig
 {
     public $methods = [
diff --git a/user_guide_src/source/libraries/validation/003.php b/user_guide_src/source/libraries/validation/003.php
index a9e83b94698b..79e2c7820e1d 100644
--- a/user_guide_src/source/libraries/validation/003.php
+++ b/user_guide_src/source/libraries/validation/003.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Config;
+
 class Validation
 {
     public $ruleSets = [
diff --git a/user_guide_src/source/libraries/validation/013.php b/user_guide_src/source/libraries/validation/013.php
index f90dfc0ba5fc..827e86e51957 100644
--- a/user_guide_src/source/libraries/validation/013.php
+++ b/user_guide_src/source/libraries/validation/013.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Config;
+
 class Validation
 {
     public $signup = [
diff --git a/user_guide_src/source/libraries/validation/015.php b/user_guide_src/source/libraries/validation/015.php
index 31cf681b92a7..e223cdaaa504 100644
--- a/user_guide_src/source/libraries/validation/015.php
+++ b/user_guide_src/source/libraries/validation/015.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Config;
+
 class Validation
 {
     public $signup = [
@@ -8,12 +10,11 @@ class Validation
         'pass_confirm' => 'required|matches[password]',
         'email'        => 'required|valid_email',
     ];
-
     public $signup_errors = [
         'username' => [
-            'required'    => 'You must choose a username.',
+            'required' => 'You must choose a username.',
         ],
-        'email'    => [
+        'email' => [
             'valid_email' => 'Please check the Email field. It does not appear to be valid.',
         ],
     ];
diff --git a/user_guide_src/source/libraries/validation/016.php b/user_guide_src/source/libraries/validation/016.php
index 55d9f6985cf9..3b777bb92ddd 100644
--- a/user_guide_src/source/libraries/validation/016.php
+++ b/user_guide_src/source/libraries/validation/016.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Config;
+
 class Validation
 {
     public $signup = [
@@ -9,7 +11,7 @@ class Validation
                 'required' => 'You must choose a Username.',
             ],
         ],
-        'email'    => [
+        'email' => [
             'rules'  => 'required|valid_email',
             'errors' => [
                 'valid_email' => 'Please check the Email field. It does not appear to be valid.',
diff --git a/user_guide_src/source/libraries/validation/031.php b/user_guide_src/source/libraries/validation/031.php
index d8917ff8ec87..e85808bdab63 100644
--- a/user_guide_src/source/libraries/validation/031.php
+++ b/user_guide_src/source/libraries/validation/031.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Config;
+
 class Validation
 {
     public $templates = [
diff --git a/user_guide_src/source/libraries/validation/032.php b/user_guide_src/source/libraries/validation/032.php
index 9877e6e85579..86534cd84ed4 100644
--- a/user_guide_src/source/libraries/validation/032.php
+++ b/user_guide_src/source/libraries/validation/032.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Config;
+
 use CodeIgniter\Validation\CreditCardRules;
 use CodeIgniter\Validation\FileRules;
 use CodeIgniter\Validation\FormatRules;
diff --git a/user_guide_src/source/models/entities/019.php b/user_guide_src/source/models/entities/019.php
index 7d3744cc037c..d05789504a66 100644
--- a/user_guide_src/source/models/entities/019.php
+++ b/user_guide_src/source/models/entities/019.php
@@ -1,11 +1,13 @@
 <?php
 
+namespace App\Entities\Cast;
+
 use CodeIgniter\Entity\Cast\BaseCast;
 
 class CastBase64 extends BaseCast
 {
     public static function get($value, array $params = [])
     {
-        return base64_decode($value);
+        return base64_decode($value, true);
     }
 }
diff --git a/user_guide_src/source/models/entities/020.php b/user_guide_src/source/models/entities/020.php
index 0fa4e8e140df..7d3708b044d8 100644
--- a/user_guide_src/source/models/entities/020.php
+++ b/user_guide_src/source/models/entities/020.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Entities;
+
+use CodeIgniter\Entity\Entity;
+
 class MyEntity extends Entity
 {
     // Defining a type with parameters
diff --git a/user_guide_src/source/models/entities/021.php b/user_guide_src/source/models/entities/021.php
index 12a805850827..a117e2a81f37 100644
--- a/user_guide_src/source/models/entities/021.php
+++ b/user_guide_src/source/models/entities/021.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Entities\Cast;
+
 use CodeIgniter\Entity\Cast\BaseCast;
 
 class SomeHandler extends BaseCast
@@ -9,11 +11,11 @@ public static function get($value, array $params = [])
         var_dump($params);
         // array(3) {
         //   [0]=>
-        //   string(13) "App\SomeClass"
+        // string(13) "App\SomeClass"
         //   [1]=>
-        //   string(6) "param2"
+        // string(6) "param2"
         //   [2]=>
-        //   string(6) "param3"
+        // string(6) "param3"
         // }
     }
 }
diff --git a/user_guide_src/source/models/model/021.php b/user_guide_src/source/models/model/021.php
index a49cfe210163..f0367b5044e2 100644
--- a/user_guide_src/source/models/model/021.php
+++ b/user_guide_src/source/models/model/021.php
@@ -1,12 +1,14 @@
 <?php
 
+namespace App\Models;
+
 use CodeIgniter\Model;
 
 class JobModel extends Model
 {
-    protected $table = 'jobs';
-    protected $returnType = '\App\Entities\Job';
+    protected $table         = 'jobs';
+    protected $returnType    = '\App\Entities\Job';
     protected $allowedFields = [
-        'name', 'description'
+        'name', 'description',
     ];
 }
diff --git a/user_guide_src/source/models/model/027.php b/user_guide_src/source/models/model/027.php
index b0d19738c5c0..5c457a09dce3 100644
--- a/user_guide_src/source/models/model/027.php
+++ b/user_guide_src/source/models/model/027.php
@@ -1,16 +1,19 @@
 <?php
 
+namespace App\Models;
+
+use CodeIgniter\Model;
+
 class UserModel extends Model
 {
-    protected $validationRules    = [
+    protected $validationRules = [
         'username'     => 'required|alpha_numeric_space|min_length[3]',
         'email'        => 'required|valid_email|is_unique[users.email]',
         'password'     => 'required|min_length[8]',
         'pass_confirm' => 'required_with[password]|matches[password]',
     ];
-
     protected $validationMessages = [
-        'email'        => [
+        'email' => [
             'is_unique' => 'Sorry. That email has already been taken. Please choose another.',
         ],
     ];
diff --git a/user_guide_src/source/models/model/034.php b/user_guide_src/source/models/model/034.php
index 8de746bec4cd..b18544ee555e 100644
--- a/user_guide_src/source/models/model/034.php
+++ b/user_guide_src/source/models/model/034.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Models;
+
+use CodeIgniter\Model;
+
 class UserModel extends Model
 {
     protected $validationRules = 'users';
diff --git a/user_guide_src/source/models/model/038.php b/user_guide_src/source/models/model/038.php
index d08b6333bc84..820d37def40c 100644
--- a/user_guide_src/source/models/model/038.php
+++ b/user_guide_src/source/models/model/038.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Models;
+
+use CodeIgniter\Model;
+
 class MyModel extends Model
 {
     protected $validationRules = [
diff --git a/user_guide_src/source/models/model/040.php b/user_guide_src/source/models/model/040.php
index 9e3402559d62..6e1ff1711960 100644
--- a/user_guide_src/source/models/model/040.php
+++ b/user_guide_src/source/models/model/040.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Models;
+
+use CodeIgniter\Model;
+
 class MyModel extends Model
 {
     protected $validationRules = [
diff --git a/user_guide_src/source/models/model/041.php b/user_guide_src/source/models/model/041.php
index f2f89729a632..94ad48e0effb 100644
--- a/user_guide_src/source/models/model/041.php
+++ b/user_guide_src/source/models/model/041.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Models;
+
+use CodeIgniter\Model;
+
 class MyModel extends Model
 {
     protected $allowedFields = ['name', 'email', 'address'];
diff --git a/user_guide_src/source/models/model/050.php b/user_guide_src/source/models/model/050.php
index 600d33afef59..9f6d334609f1 100644
--- a/user_guide_src/source/models/model/050.php
+++ b/user_guide_src/source/models/model/050.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Models;
+
+use CodeIgniter\Model;
+
 class MyModel extends Model
 {
     protected function hashPassword(array $data)
diff --git a/user_guide_src/source/models/model/051.php b/user_guide_src/source/models/model/051.php
index 692e4df8ff32..0ca5ee317a37 100644
--- a/user_guide_src/source/models/model/051.php
+++ b/user_guide_src/source/models/model/051.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Models;
+
+use CodeIgniter\Model;
+
 class MyModel extends Model
 {
     protected $beforeInsert = ['hashPassword'];
diff --git a/user_guide_src/source/models/model/052.php b/user_guide_src/source/models/model/052.php
index 131552f39c46..292b752bdc3c 100644
--- a/user_guide_src/source/models/model/052.php
+++ b/user_guide_src/source/models/model/052.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Models;
+
+use CodeIgniter\Model;
+
 class MyModel extends Model
 {
     protected $allowCallbacks = false;
diff --git a/user_guide_src/source/models/model/054.php b/user_guide_src/source/models/model/054.php
index f4817da0ae19..6b72095f087f 100644
--- a/user_guide_src/source/models/model/054.php
+++ b/user_guide_src/source/models/model/054.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Models;
+
+use CodeIgniter\Model;
+
 class MyModel extends Model
 {
     protected $beforeFind = ['checkCache'];
diff --git a/user_guide_src/source/outgoing/api_responses/001.php b/user_guide_src/source/outgoing/api_responses/001.php
index c2a196482b58..930ad3f0c23a 100644
--- a/user_guide_src/source/outgoing/api_responses/001.php
+++ b/user_guide_src/source/outgoing/api_responses/001.php
@@ -3,8 +3,9 @@
 namespace App\Controllers;
 
 use CodeIgniter\API\ResponseTrait;
+use CodeIgniter\Controller;
 
-class Users extends \CodeIgniter\Controller
+class Users extends Controller
 {
     use ResponseTrait;
 
diff --git a/user_guide_src/source/outgoing/api_responses/003.php b/user_guide_src/source/outgoing/api_responses/003.php
index a8e8ed09de64..1b5a498b5940 100644
--- a/user_guide_src/source/outgoing/api_responses/003.php
+++ b/user_guide_src/source/outgoing/api_responses/003.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Format extends BaseConfig
 {
     public $supportedResponseFormats = [
diff --git a/user_guide_src/source/outgoing/api_responses/004.php b/user_guide_src/source/outgoing/api_responses/004.php
index 12ea88bd97df..b092ec70372e 100644
--- a/user_guide_src/source/outgoing/api_responses/004.php
+++ b/user_guide_src/source/outgoing/api_responses/004.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Format extends BaseConfig
 {
     public $formatters = [
diff --git a/user_guide_src/source/outgoing/localization/001.php b/user_guide_src/source/outgoing/localization/001.php
index 53d156de0545..7af57b09d921 100644
--- a/user_guide_src/source/outgoing/localization/001.php
+++ b/user_guide_src/source/outgoing/localization/001.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class App extends BaseConfig
 {
     public $defaultLocale = 'en';
diff --git a/user_guide_src/source/outgoing/localization/002.php b/user_guide_src/source/outgoing/localization/002.php
index 30785b81d850..ae6aa825e7a8 100644
--- a/user_guide_src/source/outgoing/localization/002.php
+++ b/user_guide_src/source/outgoing/localization/002.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class App extends BaseConfig
 {
     public $negotiateLocale = true;
diff --git a/user_guide_src/source/outgoing/localization/003.php b/user_guide_src/source/outgoing/localization/003.php
index 45d3e8e3b19e..dd3cad7ee548 100644
--- a/user_guide_src/source/outgoing/localization/003.php
+++ b/user_guide_src/source/outgoing/localization/003.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class App extends BaseConfig
 {
     public $supportedLocales = ['en', 'es', 'fr-FR'];
diff --git a/user_guide_src/source/outgoing/localization/005.php b/user_guide_src/source/outgoing/localization/005.php
index 09d2d5cae03d..be23e05fac89 100644
--- a/user_guide_src/source/outgoing/localization/005.php
+++ b/user_guide_src/source/outgoing/localization/005.php
@@ -2,7 +2,7 @@
 
 namespace App\Controllers;
 
-class UserController extends \CodeIgniter\Controller
+class UserController extends \Controller
 {
     public function index()
     {
diff --git a/user_guide_src/source/outgoing/response/011.php b/user_guide_src/source/outgoing/response/011.php
index 4e27ad6c43df..5f546ff5781a 100644
--- a/user_guide_src/source/outgoing/response/011.php
+++ b/user_guide_src/source/outgoing/response/011.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class App extends BaseConfig
 {
     public $CSPEnabled = true;
diff --git a/user_guide_src/source/outgoing/view_decorators/002.php b/user_guide_src/source/outgoing/view_decorators/002.php
index 49631992068b..a7d0f3937fa9 100644
--- a/user_guide_src/source/outgoing/view_decorators/002.php
+++ b/user_guide_src/source/outgoing/view_decorators/002.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\View as BaseView;
+
 class View extends BaseView
 {
     public array $decorators = [
diff --git a/user_guide_src/source/outgoing/view_layouts/001.php b/user_guide_src/source/outgoing/view_layouts/001.php
index 801ebf92c42e..2eed4c4f53dc 100644
--- a/user_guide_src/source/outgoing/view_layouts/001.php
+++ b/user_guide_src/source/outgoing/view_layouts/001.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Controllers;
+
 class MyController extends BaseController
 {
     public function index()
diff --git a/user_guide_src/source/outgoing/view_parser/012.php b/user_guide_src/source/outgoing/view_parser/012.php
index 626b3c21fe77..40a6a62e3964 100644
--- a/user_guide_src/source/outgoing/view_parser/012.php
+++ b/user_guide_src/source/outgoing/view_parser/012.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\View as BaseView;
+
 class View extends BaseView
 {
     public $filters = [
diff --git a/user_guide_src/source/outgoing/view_parser/013.php b/user_guide_src/source/outgoing/view_parser/013.php
index 78788515d081..20a7f800af10 100644
--- a/user_guide_src/source/outgoing/view_parser/013.php
+++ b/user_guide_src/source/outgoing/view_parser/013.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\View as BaseView;
+
 class View extends BaseView
 {
     public $filters = [
diff --git a/user_guide_src/source/outgoing/view_parser/014.php b/user_guide_src/source/outgoing/view_parser/014.php
index 22dd679fb9bd..87e70e1a43b5 100644
--- a/user_guide_src/source/outgoing/view_parser/014.php
+++ b/user_guide_src/source/outgoing/view_parser/014.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\View as BaseView;
+
 class View extends BaseView
 {
     public $plugins = [
diff --git a/user_guide_src/source/outgoing/view_parser/015.php b/user_guide_src/source/outgoing/view_parser/015.php
index bac6137888f1..008d6f748622 100644
--- a/user_guide_src/source/outgoing/view_parser/015.php
+++ b/user_guide_src/source/outgoing/view_parser/015.php
@@ -1,12 +1,16 @@
 <?php
 
-class View extends \CodeIgniter\Config\View
+namespace Config;
+
+use CodeIgniter\Config\View as BaseView;
+
+class View extends BaseView
 {
     public $plugins = [];
 
     public function __construct()
     {
-        $this->plugins['bar'] = function (array $params=[]) {
+        $this->plugins['bar'] = static function (array $params = []) {
             return $params[0] ?? '';
         };
 
diff --git a/user_guide_src/source/outgoing/view_parser/016.php b/user_guide_src/source/outgoing/view_parser/016.php
index 5e2f5a2f0b0b..a78667ef2762 100644
--- a/user_guide_src/source/outgoing/view_parser/016.php
+++ b/user_guide_src/source/outgoing/view_parser/016.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\View as BaseView;
+
 class View extends BaseView
 {
     public $plugins = [
diff --git a/user_guide_src/source/outgoing/view_parser/017.php b/user_guide_src/source/outgoing/view_parser/017.php
index d38e54c5274f..6c98122dd7af 100644
--- a/user_guide_src/source/outgoing/view_parser/017.php
+++ b/user_guide_src/source/outgoing/view_parser/017.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\View as BaseView;
+
 class View extends BaseView
 {
     public $plugins = [
diff --git a/user_guide_src/source/outgoing/views/002.php b/user_guide_src/source/outgoing/views/002.php
index 263ba6afe957..11a54b427208 100644
--- a/user_guide_src/source/outgoing/views/002.php
+++ b/user_guide_src/source/outgoing/views/002.php
@@ -2,7 +2,9 @@
 
 namespace App\Controllers;
 
-class Blog extends \CodeIgniter\Controller
+use CodeIgniter\Controller;
+
+class Blog extends Controller
 {
     public function index()
     {
diff --git a/user_guide_src/source/outgoing/views/003.php b/user_guide_src/source/outgoing/views/003.php
index aa61ad6d1614..6feb85d6af25 100644
--- a/user_guide_src/source/outgoing/views/003.php
+++ b/user_guide_src/source/outgoing/views/003.php
@@ -2,7 +2,9 @@
 
 namespace App\Controllers;
 
-class Page extends \CodeIgniter\Controller
+use CodeIgniter\Controller;
+
+class Page extends Controller
 {
     public function index()
     {
diff --git a/user_guide_src/source/outgoing/views/009.php b/user_guide_src/source/outgoing/views/009.php
index 02ce288dd6c8..61963a40bbb2 100644
--- a/user_guide_src/source/outgoing/views/009.php
+++ b/user_guide_src/source/outgoing/views/009.php
@@ -2,12 +2,14 @@
 
 namespace App\Controllers;
 
-class Blog extends \CodeIgniter\Controller
+use CodeIgniter\Controller;
+
+class Blog extends Controller
 {
     public function index()
     {
-        $data['title']   = "My Real Title";
-        $data['heading'] = "My Real Heading";
+        $data['title']   = 'My Real Title';
+        $data['heading'] = 'My Real Heading';
 
         echo view('blog_view', $data);
     }
diff --git a/user_guide_src/source/outgoing/views/011.php b/user_guide_src/source/outgoing/views/011.php
index 2f3cb13c2989..e3ddaeba2075 100644
--- a/user_guide_src/source/outgoing/views/011.php
+++ b/user_guide_src/source/outgoing/views/011.php
@@ -2,7 +2,9 @@
 
 namespace App\Controllers;
 
-class Blog extends \CodeIgniter\Controller
+use CodeIgniter\Controller;
+
+class Blog extends Controller
 {
     public function index()
     {
diff --git a/user_guide_src/source/testing/controllers/012.php b/user_guide_src/source/testing/controllers/012.php
index e9425a085488..620bdb363c6e 100644
--- a/user_guide_src/source/testing/controllers/012.php
+++ b/user_guide_src/source/testing/controllers/012.php
@@ -1,6 +1,11 @@
 <?php
 
-class FilterTestCase extends CIUnitTestCase
+namespace CodeIgniter;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\FilterTestTrait;
+
+final class FilterTestCase extends CIUnitTestCase
 {
     use FilterTestTrait;
 
@@ -10,6 +15,5 @@ protected function testFilterFailsOnAdminRoute()
 
         $this->assertHasFilters('unfiltered/route', 'before');
     }
-
     // ...
 }
diff --git a/user_guide_src/source/testing/controllers/014.php b/user_guide_src/source/testing/controllers/014.php
index bc6dc8bf9e18..feb1d4448540 100644
--- a/user_guide_src/source/testing/controllers/014.php
+++ b/user_guide_src/source/testing/controllers/014.php
@@ -1,5 +1,10 @@
 <?php
 
+namespace CodeIgniter;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\FilterTestTrait;
+
 final class FilterTestCase extends CIUnitTestCase
 {
     use FilterTestTrait;
diff --git a/user_guide_src/source/testing/debugging/003.php b/user_guide_src/source/testing/debugging/003.php
index de9476fe7d39..ec42da23856a 100644
--- a/user_guide_src/source/testing/debugging/003.php
+++ b/user_guide_src/source/testing/debugging/003.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Toolbar extends BaseConfig
 {
     public $collectors = [
diff --git a/user_guide_src/source/testing/fabricator/001.php b/user_guide_src/source/testing/fabricator/001.php
index a4e6456549a6..8fbf136032ca 100644
--- a/user_guide_src/source/testing/fabricator/001.php
+++ b/user_guide_src/source/testing/fabricator/001.php
@@ -1,5 +1,10 @@
 <?php
 
-class MyModel implements CodeIgniter\Test\Interfaces\FabricatorModel {
+namespace App\Models;
+
+use CodeIgniter\Test\Interfaces\FabricatorModel;
+
+class MyModel implements FabricatorModel
+{
     // ...
 }
diff --git a/user_guide_src/source/testing/fabricator/005.php b/user_guide_src/source/testing/fabricator/005.php
index de1e6d7ef6c5..e5bb7bde9f82 100644
--- a/user_guide_src/source/testing/fabricator/005.php
+++ b/user_guide_src/source/testing/fabricator/005.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Models;
+
 class UserModel
 {
     public function fake(Generator &$faker)
diff --git a/user_guide_src/source/testing/fabricator/006.php b/user_guide_src/source/testing/fabricator/006.php
index 13b4b96cb07d..56f34781622c 100644
--- a/user_guide_src/source/testing/fabricator/006.php
+++ b/user_guide_src/source/testing/fabricator/006.php
@@ -2,7 +2,9 @@
 
 namespace Tests\Support\Models;
 
-class UserFabricator extends \App\Models\UserModel
+use App\Models\UserModel;
+
+class UserFabricator extends UserModel
 {
     public function fake(&$faker)
     {
diff --git a/user_guide_src/source/testing/fabricator/021.php b/user_guide_src/source/testing/fabricator/021.php
index d6c848ac3c06..236dd553d492 100644
--- a/user_guide_src/source/testing/fabricator/021.php
+++ b/user_guide_src/source/testing/fabricator/021.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Models;
+
 class UserModel
 {
     protected $table = 'users';
@@ -9,7 +11,7 @@ public function fake(Generator &$faker)
         return [
             'first'    => $faker->firstName,
             'email'    => $faker->email,
-            'group_id' => rand(1, Fabricator::getCount('groups')),
+            'group_id' => mt_rand(1, Fabricator::getCount('groups')),
         ];
     }
 }
diff --git a/user_guide_src/source/testing/overview/004.php b/user_guide_src/source/testing/overview/004.php
index 2f8a20c6ca52..4d2e7ef4b5a8 100644
--- a/user_guide_src/source/testing/overview/004.php
+++ b/user_guide_src/source/testing/overview/004.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Models;
+
+use CodeIgniter\Test\CIUnitTestCase;
+
 final class OneOfMyModelsTest extends CIUnitTestCase
 {
     protected function setUp(): void
diff --git a/user_guide_src/source/testing/overview/005.php b/user_guide_src/source/testing/overview/005.php
index 68a0d15fda19..4a0e6030b2fa 100644
--- a/user_guide_src/source/testing/overview/005.php
+++ b/user_guide_src/source/testing/overview/005.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Models;
+
+use CodeIgniter\Test\CIUnitTestCase;
+
 final class OneOfMyModelsTest extends CIUnitTestCase
 {
     protected $setUpMethods = [
diff --git a/user_guide_src/source/testing/overview/006.php b/user_guide_src/source/testing/overview/006.php
index e7d8031ba319..86dc1c44b40f 100644
--- a/user_guide_src/source/testing/overview/006.php
+++ b/user_guide_src/source/testing/overview/006.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Models;
+
+use CodeIgniter\Test\CIUnitTestCase;
+
 final class OneOfMyModelsTest extends CIUnitTestCase
 {
     protected $tearDownMethods = [
diff --git a/user_guide_src/source/testing/overview/007.php b/user_guide_src/source/testing/overview/007.php
index 4921e027b721..dec488ef2e5e 100644
--- a/user_guide_src/source/testing/overview/007.php
+++ b/user_guide_src/source/testing/overview/007.php
@@ -10,6 +10,8 @@ protected function setUpAuthTrait()
     // ...
 }
 
+use CodeIgniter\Test\CIUnitTestCase;
+
 final class AuthenticationFeatureTest extends CIUnitTestCase
 {
     use AuthTrait;
diff --git a/user_guide_src/source/testing/overview/017.php b/user_guide_src/source/testing/overview/017.php
index c2bdfeb29426..cf0c211496b6 100644
--- a/user_guide_src/source/testing/overview/017.php
+++ b/user_guide_src/source/testing/overview/017.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\Test\CIUnitTestCase;
+
 final class SomeTest extends CIUnitTestCase
 {
     public function testSomething()
diff --git a/user_guide_src/source/testing/overview/018.php b/user_guide_src/source/testing/overview/018.php
index 8baf7888f36c..b7138b5ec63b 100644
--- a/user_guide_src/source/testing/overview/018.php
+++ b/user_guide_src/source/testing/overview/018.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\Test\CIUnitTestCase;
+
 final class SomeTest extends CIUnitTestCase
 {
     protected function setUp()
diff --git a/user_guide_src/source/testing/overview/019.php b/user_guide_src/source/testing/overview/019.php
index 0dc69b4971fc..e0e55131f5b3 100644
--- a/user_guide_src/source/testing/overview/019.php
+++ b/user_guide_src/source/testing/overview/019.php
@@ -1,5 +1,7 @@
 <?php
 
+use CodeIgniter\Test\CIUnitTestCase;
+
 final class SomeTest extends CIUnitTestCase
 {
     protected function setUp(): void
diff --git a/user_guide_src/source/tutorial/create_news_items/001.php b/user_guide_src/source/tutorial/create_news_items/001.php
index 5091ec750126..5982d0b159ab 100644
--- a/user_guide_src/source/tutorial/create_news_items/001.php
+++ b/user_guide_src/source/tutorial/create_news_items/001.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
 class Filters extends BaseConfig
 {
     public $methods = [
diff --git a/user_guide_src/source/tutorial/create_news_items/002.php b/user_guide_src/source/tutorial/create_news_items/002.php
index b5a5004e0961..cdebb0a71e6a 100644
--- a/user_guide_src/source/tutorial/create_news_items/002.php
+++ b/user_guide_src/source/tutorial/create_news_items/002.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Controllers;
+
 class News extends BaseController
 {
     public function create()
diff --git a/user_guide_src/source/tutorial/news_section/004.php b/user_guide_src/source/tutorial/news_section/004.php
index f6973a3deafc..475b86fa2f45 100644
--- a/user_guide_src/source/tutorial/news_section/004.php
+++ b/user_guide_src/source/tutorial/news_section/004.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Controllers;
+
+use App\Models\NewsModel;
+
 class News extends BaseController
 {
     public function index()
diff --git a/user_guide_src/source/tutorial/news_section/006.php b/user_guide_src/source/tutorial/news_section/006.php
index afaa1cee5800..36faacb39a50 100644
--- a/user_guide_src/source/tutorial/news_section/006.php
+++ b/user_guide_src/source/tutorial/news_section/006.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Controllers;
+
+use App\Models\NewsModel;
+
 class News extends BaseController
 {
     public function view($slug = null)
diff --git a/user_guide_src/source/tutorial/static_pages/002.php b/user_guide_src/source/tutorial/static_pages/002.php
index bd3eb8938a57..970e663558d5 100644
--- a/user_guide_src/source/tutorial/static_pages/002.php
+++ b/user_guide_src/source/tutorial/static_pages/002.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Controllers;
+
 class Pages extends BaseController
 {
     public function view($page = 'home')

From a7af20b0becf9390bf3cff7907f8f95467f32307 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Tue, 1 Mar 2022 11:16:31 +0100
Subject: [PATCH 1715/2325] Add '...' for config examples.

---
 user_guide_src/source/concepts/factories/005.php             | 1 +
 user_guide_src/source/concepts/services/007.php              | 1 +
 user_guide_src/source/concepts/services/008.php              | 1 +
 user_guide_src/source/concepts/services/010.php              | 1 +
 user_guide_src/source/database/configuration/006.php         | 1 +
 user_guide_src/source/database/configuration/008.php         | 1 +
 user_guide_src/source/extending/core_classes/002.php         | 1 +
 user_guide_src/source/general/configuration/004.php          | 2 +-
 user_guide_src/source/general/configuration/008.php          | 3 +--
 user_guide_src/source/general/logging/002.php                | 1 +
 user_guide_src/source/general/logging/003.php                | 1 +
 user_guide_src/source/general/logging/004.php                | 1 +
 user_guide_src/source/general/managing_apps/001.php          | 1 +
 user_guide_src/source/incoming/filters/004.php               | 1 +
 user_guide_src/source/incoming/filters/005.php               | 1 +
 user_guide_src/source/incoming/filters/006.php               | 1 +
 user_guide_src/source/incoming/filters/007.php               | 1 +
 user_guide_src/source/incoming/filters/008.php               | 1 +
 user_guide_src/source/incoming/filters/009.php               | 1 +
 user_guide_src/source/incoming/filters/011.php               | 1 +
 .../source/installation/upgrade_configuration/002.php        | 5 +++--
 user_guide_src/source/libraries/caching/014.php              | 3 +++
 user_guide_src/source/libraries/curlrequest/001.php          | 1 +
 user_guide_src/source/libraries/honeypot/001.php             | 1 +
 user_guide_src/source/libraries/pagination/010.php           | 1 +
 user_guide_src/source/libraries/pagination/011.php           | 1 +
 user_guide_src/source/libraries/security/002.php             | 1 +
 user_guide_src/source/libraries/security/003.php             | 1 +
 user_guide_src/source/libraries/security/004.php             | 1 +
 user_guide_src/source/libraries/security/005.php             | 1 +
 user_guide_src/source/libraries/security/006.php             | 1 +
 user_guide_src/source/libraries/security/007.php             | 1 +
 user_guide_src/source/libraries/security/008.php             | 1 +
 user_guide_src/source/libraries/security/009.php             | 1 +
 user_guide_src/source/libraries/sessions/040.php             | 1 +
 user_guide_src/source/libraries/sessions/041.php             | 1 +
 user_guide_src/source/libraries/sessions/042.php             | 1 +
 user_guide_src/source/libraries/sessions/043.php             | 1 +
 user_guide_src/source/libraries/sessions/044.php             | 1 +
 user_guide_src/source/libraries/throttler/003.php            | 1 +
 user_guide_src/source/libraries/throttler/004.php            | 1 +
 user_guide_src/source/libraries/validation/003.php           | 1 +
 user_guide_src/source/libraries/validation/013.php           | 1 +
 user_guide_src/source/libraries/validation/015.php           | 1 +
 user_guide_src/source/libraries/validation/016.php           | 1 +
 user_guide_src/source/libraries/validation/031.php           | 1 +
 user_guide_src/source/libraries/validation/032.php           | 1 +
 user_guide_src/source/outgoing/api_responses/003.php         | 1 +
 user_guide_src/source/outgoing/api_responses/004.php         | 1 +
 user_guide_src/source/outgoing/localization/001.php          | 1 +
 user_guide_src/source/outgoing/localization/002.php          | 1 +
 user_guide_src/source/outgoing/localization/003.php          | 1 +
 user_guide_src/source/outgoing/response/011.php              | 1 +
 user_guide_src/source/outgoing/view_decorators/002.php       | 1 +
 user_guide_src/source/outgoing/view_parser/012.php           | 1 +
 user_guide_src/source/outgoing/view_parser/013.php           | 1 +
 user_guide_src/source/outgoing/view_parser/014.php           | 1 +
 user_guide_src/source/outgoing/view_parser/015.php           | 1 +
 user_guide_src/source/outgoing/view_parser/016.php           | 1 +
 user_guide_src/source/outgoing/view_parser/017.php           | 1 +
 user_guide_src/source/testing/debugging/003.php              | 1 +
 user_guide_src/source/tutorial/create_news_items/001.php     | 1 +
 62 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/user_guide_src/source/concepts/factories/005.php b/user_guide_src/source/concepts/factories/005.php
index 10a82b828d73..0c860b7a1672 100644
--- a/user_guide_src/source/concepts/factories/005.php
+++ b/user_guide_src/source/concepts/factories/005.php
@@ -10,4 +10,5 @@ class Factories extends BaseFactory
     public $filters = [
         'instanceOf' => FilterInterface::class,
     ];
+    // ...
 }
diff --git a/user_guide_src/source/concepts/services/007.php b/user_guide_src/source/concepts/services/007.php
index ed1990b3dca2..298b8abd010f 100644
--- a/user_guide_src/source/concepts/services/007.php
+++ b/user_guide_src/source/concepts/services/007.php
@@ -10,4 +10,5 @@ public static function routes()
     {
         return new \App\Router\MyRouter();
     }
+    // ...
 }
diff --git a/user_guide_src/source/concepts/services/008.php b/user_guide_src/source/concepts/services/008.php
index 1f1db41226b0..52edb387792c 100644
--- a/user_guide_src/source/concepts/services/008.php
+++ b/user_guide_src/source/concepts/services/008.php
@@ -10,4 +10,5 @@ public static function renderer($viewPath = APPPATH . 'views/')
     {
         return new \CodeIgniter\View\View($viewPath);
     }
+    // ...
 }
diff --git a/user_guide_src/source/concepts/services/010.php b/user_guide_src/source/concepts/services/010.php
index f4332f6404e3..fd5d3f6c4e35 100644
--- a/user_guide_src/source/concepts/services/010.php
+++ b/user_guide_src/source/concepts/services/010.php
@@ -14,4 +14,5 @@ public static function routes($getShared = false)
 
         return static::getSharedInstance('routes');
     }
+    // ...
 }
diff --git a/user_guide_src/source/database/configuration/006.php b/user_guide_src/source/database/configuration/006.php
index 31cd766c4f8e..afc24022c199 100644
--- a/user_guide_src/source/database/configuration/006.php
+++ b/user_guide_src/source/database/configuration/006.php
@@ -24,4 +24,5 @@ class Database extends Config
         'strictOn' => false,
         'failover' => [],
     ];
+    // ...
 }
diff --git a/user_guide_src/source/database/configuration/008.php b/user_guide_src/source/database/configuration/008.php
index 5639c484d125..c6084e212234 100644
--- a/user_guide_src/source/database/configuration/008.php
+++ b/user_guide_src/source/database/configuration/008.php
@@ -14,4 +14,5 @@ public function __construct()
     {
         $this->defaultGroup = ENVIRONMENT;
     }
+    // ...
 }
diff --git a/user_guide_src/source/extending/core_classes/002.php b/user_guide_src/source/extending/core_classes/002.php
index df96db2fa7bf..1d0de27ee238 100644
--- a/user_guide_src/source/extending/core_classes/002.php
+++ b/user_guide_src/source/extending/core_classes/002.php
@@ -14,4 +14,5 @@ public static function routes(bool $getShared = true)
 
         return new \App\Libraries\RouteCollection(static::locator(), config('Modules'));
     }
+    // ...
 }
diff --git a/user_guide_src/source/general/configuration/004.php b/user_guide_src/source/general/configuration/004.php
index 5d39a34c48b5..cc013d77583f 100644
--- a/user_guide_src/source/general/configuration/004.php
+++ b/user_guide_src/source/general/configuration/004.php
@@ -8,5 +8,5 @@ class CustomClass extends BaseConfig
 {
     public $siteName  = 'My Great Site';
     public $siteEmail = 'webmaster@example.com';
-
+    // ...
 }
diff --git a/user_guide_src/source/general/configuration/008.php b/user_guide_src/source/general/configuration/008.php
index 197c200970ab..86749331c9c5 100644
--- a/user_guide_src/source/general/configuration/008.php
+++ b/user_guide_src/source/general/configuration/008.php
@@ -2,11 +2,10 @@
 
 namespace Config;
 
-use CodeIgniter\Config\BaseService;
-
 class MyConfig extends BaseConfig
 {
     public static $registrars = [
         SupportingPackageRegistrar::class,
     ];
+    // ...
 }
diff --git a/user_guide_src/source/general/logging/002.php b/user_guide_src/source/general/logging/002.php
index 8d1409b481fe..1c27f2410126 100644
--- a/user_guide_src/source/general/logging/002.php
+++ b/user_guide_src/source/general/logging/002.php
@@ -7,4 +7,5 @@
 class Logger extends BaseConfig
 {
     public $threshold = 5;
+    // ...
 }
diff --git a/user_guide_src/source/general/logging/003.php b/user_guide_src/source/general/logging/003.php
index e34a67075a09..170b74457967 100644
--- a/user_guide_src/source/general/logging/003.php
+++ b/user_guide_src/source/general/logging/003.php
@@ -8,4 +8,5 @@ class Logger extends BaseConfig
 {
     // Log only debug and info type messages
     public $threshold = [5, 8];
+    // ...
 }
diff --git a/user_guide_src/source/general/logging/004.php b/user_guide_src/source/general/logging/004.php
index 32746068e2b6..ff5f9511d81f 100644
--- a/user_guide_src/source/general/logging/004.php
+++ b/user_guide_src/source/general/logging/004.php
@@ -12,4 +12,5 @@ class Logger extends BaseConfig
             'handles' => ['critical', 'alert', 'emergency', 'debug', 'error', 'info', 'notice', 'warning'],
         ],
     ];
+    // ...
 }
diff --git a/user_guide_src/source/general/managing_apps/001.php b/user_guide_src/source/general/managing_apps/001.php
index 253d888d316c..2d0690cabc41 100644
--- a/user_guide_src/source/general/managing_apps/001.php
+++ b/user_guide_src/source/general/managing_apps/001.php
@@ -5,4 +5,5 @@
 class Paths
 {
     public $appDirectory = '/path/to/your/app';
+    // ...
 }
diff --git a/user_guide_src/source/incoming/filters/004.php b/user_guide_src/source/incoming/filters/004.php
index c6ebb321f7e2..d39de5a0bee8 100644
--- a/user_guide_src/source/incoming/filters/004.php
+++ b/user_guide_src/source/incoming/filters/004.php
@@ -12,4 +12,5 @@ class Filters extends BaseConfig
             \App\Filters\ApiAuth::class,
         ],
     ];
+    // ...
 }
diff --git a/user_guide_src/source/incoming/filters/005.php b/user_guide_src/source/incoming/filters/005.php
index 7dca9d31631d..55b7d1fa522b 100644
--- a/user_guide_src/source/incoming/filters/005.php
+++ b/user_guide_src/source/incoming/filters/005.php
@@ -12,4 +12,5 @@ class Filters extends BaseConfig
         ],
         'after' => [],
     ];
+    // ...
 }
diff --git a/user_guide_src/source/incoming/filters/006.php b/user_guide_src/source/incoming/filters/006.php
index 3781a875cff8..ed7ce0a8a120 100644
--- a/user_guide_src/source/incoming/filters/006.php
+++ b/user_guide_src/source/incoming/filters/006.php
@@ -12,4 +12,5 @@ class Filters extends BaseConfig
         ],
         'after' => [],
     ];
+    // ...
 }
diff --git a/user_guide_src/source/incoming/filters/007.php b/user_guide_src/source/incoming/filters/007.php
index 03844d9f763d..fa79b5bbb7c8 100644
--- a/user_guide_src/source/incoming/filters/007.php
+++ b/user_guide_src/source/incoming/filters/007.php
@@ -12,4 +12,5 @@ class Filters extends BaseConfig
         ],
         'after' => [],
     ];
+    // ...
 }
diff --git a/user_guide_src/source/incoming/filters/008.php b/user_guide_src/source/incoming/filters/008.php
index f35895d26e2e..a37967a538c0 100644
--- a/user_guide_src/source/incoming/filters/008.php
+++ b/user_guide_src/source/incoming/filters/008.php
@@ -10,4 +10,5 @@ class Filters extends BaseConfig
         'post' => ['foo', 'bar'],
         'get'  => ['baz'],
     ];
+    // ...
 }
diff --git a/user_guide_src/source/incoming/filters/009.php b/user_guide_src/source/incoming/filters/009.php
index 1fd9ab69ec4c..bfc7d6176b77 100644
--- a/user_guide_src/source/incoming/filters/009.php
+++ b/user_guide_src/source/incoming/filters/009.php
@@ -10,4 +10,5 @@ class Filters extends BaseConfig
         'foo' => ['before' => ['admin/*'], 'after' => ['users/*']],
         'bar' => ['before' => ['api/*', 'admin/*']],
     ];
+    // ...
 }
diff --git a/user_guide_src/source/incoming/filters/011.php b/user_guide_src/source/incoming/filters/011.php
index ccc7c2cbd1f5..8b6e24c5fe91 100644
--- a/user_guide_src/source/incoming/filters/011.php
+++ b/user_guide_src/source/incoming/filters/011.php
@@ -10,4 +10,5 @@ class Filters extends BaseConfig
         // ...
         'secureheaders' => \App\Filters\SecureHeaders::class,
     ];
+    // ...
 }
diff --git a/user_guide_src/source/installation/upgrade_configuration/002.php b/user_guide_src/source/installation/upgrade_configuration/002.php
index 5150d6b8896d..cc013d77583f 100644
--- a/user_guide_src/source/installation/upgrade_configuration/002.php
+++ b/user_guide_src/source/installation/upgrade_configuration/002.php
@@ -6,6 +6,7 @@
 
 class CustomClass extends BaseConfig
 {
-   public $siteName  = 'My Great Site';
-   public $siteEmail = 'webmaster@example.com';
+    public $siteName  = 'My Great Site';
+    public $siteEmail = 'webmaster@example.com';
+    // ...
 }
diff --git a/user_guide_src/source/libraries/caching/014.php b/user_guide_src/source/libraries/caching/014.php
index 716bf637161b..cfb6eeb6698f 100644
--- a/user_guide_src/source/libraries/caching/014.php
+++ b/user_guide_src/source/libraries/caching/014.php
@@ -6,6 +6,8 @@
 
 class Cache extends BaseConfig
 {
+    // ...
+
     public $redis = [
         'host'     => '127.0.0.1',
         'password' => null,
@@ -13,4 +15,5 @@ class Cache extends BaseConfig
         'timeout'  => 0,
         'database' => 0,
     ];
+    // ...
 }
diff --git a/user_guide_src/source/libraries/curlrequest/001.php b/user_guide_src/source/libraries/curlrequest/001.php
index 35fd4621a92a..35486f4e7971 100644
--- a/user_guide_src/source/libraries/curlrequest/001.php
+++ b/user_guide_src/source/libraries/curlrequest/001.php
@@ -7,4 +7,5 @@
 class CURLRequest extends BaseConfig
 {
     public $shareOptions = false;
+    // ...
 }
diff --git a/user_guide_src/source/libraries/honeypot/001.php b/user_guide_src/source/libraries/honeypot/001.php
index 5fd6cefc3036..8463a919d54a 100644
--- a/user_guide_src/source/libraries/honeypot/001.php
+++ b/user_guide_src/source/libraries/honeypot/001.php
@@ -16,4 +16,5 @@ class Filters extends BaseConfig
             'honeypot',
         ],
     ];
+    // ...
 }
diff --git a/user_guide_src/source/libraries/pagination/010.php b/user_guide_src/source/libraries/pagination/010.php
index 868bc5e8620f..d168163446ee 100644
--- a/user_guide_src/source/libraries/pagination/010.php
+++ b/user_guide_src/source/libraries/pagination/010.php
@@ -10,4 +10,5 @@ class Pager extends BaseConfig
         'default_full'   => 'CodeIgniter\Pager\Views\default_full',
         'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
     ];
+    // ...
 }
diff --git a/user_guide_src/source/libraries/pagination/011.php b/user_guide_src/source/libraries/pagination/011.php
index 4d596e593312..4302997f8bff 100644
--- a/user_guide_src/source/libraries/pagination/011.php
+++ b/user_guide_src/source/libraries/pagination/011.php
@@ -11,4 +11,5 @@ class Pager extends BaseConfig
         'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
         'front_full'     => 'App\Views\Pagers\foundation_full',
     ];
+    // ...
 }
diff --git a/user_guide_src/source/libraries/security/002.php b/user_guide_src/source/libraries/security/002.php
index 64de01125e4f..39df6fa8d292 100644
--- a/user_guide_src/source/libraries/security/002.php
+++ b/user_guide_src/source/libraries/security/002.php
@@ -7,4 +7,5 @@
 class Security extends BaseConfig
 {
     public $csrfProtection = 'session';
+    // ...
 }
diff --git a/user_guide_src/source/libraries/security/003.php b/user_guide_src/source/libraries/security/003.php
index c877680a923b..7d8b3241c285 100644
--- a/user_guide_src/source/libraries/security/003.php
+++ b/user_guide_src/source/libraries/security/003.php
@@ -7,4 +7,5 @@
 class Security extends BaseConfig
 {
     public $tokenRandomize = true;
+    // ...
 }
diff --git a/user_guide_src/source/libraries/security/004.php b/user_guide_src/source/libraries/security/004.php
index d12b4e2243f7..7187a1b523c5 100644
--- a/user_guide_src/source/libraries/security/004.php
+++ b/user_guide_src/source/libraries/security/004.php
@@ -7,4 +7,5 @@
 class Security extends BaseConfig
 {
     public $regenerate = true;
+    // ...
 }
diff --git a/user_guide_src/source/libraries/security/005.php b/user_guide_src/source/libraries/security/005.php
index 51040f3be460..f7539874c023 100644
--- a/user_guide_src/source/libraries/security/005.php
+++ b/user_guide_src/source/libraries/security/005.php
@@ -7,4 +7,5 @@
 class Security extends BaseConfig
 {
     public $redirect = false;
+    // ...
 }
diff --git a/user_guide_src/source/libraries/security/006.php b/user_guide_src/source/libraries/security/006.php
index c2a392bbcc63..cc3ef9d162c6 100644
--- a/user_guide_src/source/libraries/security/006.php
+++ b/user_guide_src/source/libraries/security/006.php
@@ -12,4 +12,5 @@ class Filters extends BaseConfig
             'csrf',
         ],
     ];
+    // ...
 }
diff --git a/user_guide_src/source/libraries/security/007.php b/user_guide_src/source/libraries/security/007.php
index c32e7bc2b517..0b099addb52c 100644
--- a/user_guide_src/source/libraries/security/007.php
+++ b/user_guide_src/source/libraries/security/007.php
@@ -11,4 +11,5 @@ class Filters extends BaseConfig
             'csrf' => ['except' => ['api/record/save']],
         ],
     ];
+    // ...
 }
diff --git a/user_guide_src/source/libraries/security/008.php b/user_guide_src/source/libraries/security/008.php
index faa45c0bd605..370bd2bcedad 100644
--- a/user_guide_src/source/libraries/security/008.php
+++ b/user_guide_src/source/libraries/security/008.php
@@ -11,4 +11,5 @@ class Filters extends BaseConfig
             'csrf' => ['except' => ['api/record/[0-9]+']],
         ],
     ];
+    // ...
 }
diff --git a/user_guide_src/source/libraries/security/009.php b/user_guide_src/source/libraries/security/009.php
index 397681518d26..d90632e53f1c 100644
--- a/user_guide_src/source/libraries/security/009.php
+++ b/user_guide_src/source/libraries/security/009.php
@@ -10,4 +10,5 @@ class Filters extends BaseConfig
         'get'  => ['csrf'],
         'post' => ['csrf'],
     ];
+    // ...
 }
diff --git a/user_guide_src/source/libraries/sessions/040.php b/user_guide_src/source/libraries/sessions/040.php
index 29d50c78302c..3aedc2f047af 100644
--- a/user_guide_src/source/libraries/sessions/040.php
+++ b/user_guide_src/source/libraries/sessions/040.php
@@ -8,4 +8,5 @@ class App extends BaseConfig
 {
     public $sessionDriver   = 'CodeIgniter\Session\Handlers\DatabaseHandler';
     public $sessionSavePath = 'ci_sessions';
+    // ...
 }
diff --git a/user_guide_src/source/libraries/sessions/041.php b/user_guide_src/source/libraries/sessions/041.php
index fe2777cae60c..f645887ec2be 100644
--- a/user_guide_src/source/libraries/sessions/041.php
+++ b/user_guide_src/source/libraries/sessions/041.php
@@ -7,4 +7,5 @@
 class App extends BaseConfig
 {
     public $sessionDBGroup = 'groupName';
+    // ...
 }
diff --git a/user_guide_src/source/libraries/sessions/042.php b/user_guide_src/source/libraries/sessions/042.php
index 830569b5dcbb..f0aed919a816 100644
--- a/user_guide_src/source/libraries/sessions/042.php
+++ b/user_guide_src/source/libraries/sessions/042.php
@@ -8,4 +8,5 @@ class App extends BaseConfig
 {
     public $sessionDiver    = 'CodeIgniter\Session\Handlers\RedisHandler';
     public $sessionSavePath = 'tcp://localhost:6379';
+    // ...
 }
diff --git a/user_guide_src/source/libraries/sessions/043.php b/user_guide_src/source/libraries/sessions/043.php
index 4a50d0e20c51..cad56413151c 100644
--- a/user_guide_src/source/libraries/sessions/043.php
+++ b/user_guide_src/source/libraries/sessions/043.php
@@ -8,4 +8,5 @@ class App extends BaseConfig
 {
     public $sessionDriver   = 'CodeIgniter\Session\Handlers\MemcachedHandler';
     public $sessionSavePath = 'localhost:11211';
+    // ...
 }
diff --git a/user_guide_src/source/libraries/sessions/044.php b/user_guide_src/source/libraries/sessions/044.php
index 3e889f270f3d..2cc31e9035db 100644
--- a/user_guide_src/source/libraries/sessions/044.php
+++ b/user_guide_src/source/libraries/sessions/044.php
@@ -9,4 +9,5 @@ class App extends BaseConfig
     // localhost will be given higher priority (5) here,
     // compared to 192.0.2.1 with a weight of 1.
     public $sessionSavePath = 'localhost:11211:5,192.0.2.1:11211:1';
+    // ...
 }
diff --git a/user_guide_src/source/libraries/throttler/003.php b/user_guide_src/source/libraries/throttler/003.php
index 56b0fe4e1c59..ae13441bb8ad 100644
--- a/user_guide_src/source/libraries/throttler/003.php
+++ b/user_guide_src/source/libraries/throttler/003.php
@@ -10,4 +10,5 @@ class Filters extends BaseConfig
         // ...
         'throttle' => \App\Filters\Throttle::class,
     ];
+    // ...
 }
diff --git a/user_guide_src/source/libraries/throttler/004.php b/user_guide_src/source/libraries/throttler/004.php
index e8ec69b0b046..077cb46a66dc 100644
--- a/user_guide_src/source/libraries/throttler/004.php
+++ b/user_guide_src/source/libraries/throttler/004.php
@@ -9,4 +9,5 @@ class Filters extends BaseConfig
     public $methods = [
         'post' => ['throttle'],
     ];
+    // ...
 }
diff --git a/user_guide_src/source/libraries/validation/003.php b/user_guide_src/source/libraries/validation/003.php
index 79e2c7820e1d..fbcbb7690260 100644
--- a/user_guide_src/source/libraries/validation/003.php
+++ b/user_guide_src/source/libraries/validation/003.php
@@ -10,4 +10,5 @@ class Validation
         \CodeIgniter\Validation\StrictRules\FormatRules::class,
         \CodeIgniter\Validation\StrictRules\Rules::class,
     ];
+    // ...
 }
diff --git a/user_guide_src/source/libraries/validation/013.php b/user_guide_src/source/libraries/validation/013.php
index 827e86e51957..4e2982d7564f 100644
--- a/user_guide_src/source/libraries/validation/013.php
+++ b/user_guide_src/source/libraries/validation/013.php
@@ -10,4 +10,5 @@ class Validation
         'pass_confirm' => 'required|matches[password]',
         'email'        => 'required|valid_email',
     ];
+    // ...
 }
diff --git a/user_guide_src/source/libraries/validation/015.php b/user_guide_src/source/libraries/validation/015.php
index e223cdaaa504..46ef2c4431a1 100644
--- a/user_guide_src/source/libraries/validation/015.php
+++ b/user_guide_src/source/libraries/validation/015.php
@@ -18,4 +18,5 @@ class Validation
             'valid_email' => 'Please check the Email field. It does not appear to be valid.',
         ],
     ];
+    // ...
 }
diff --git a/user_guide_src/source/libraries/validation/016.php b/user_guide_src/source/libraries/validation/016.php
index 3b777bb92ddd..5b08e73980a8 100644
--- a/user_guide_src/source/libraries/validation/016.php
+++ b/user_guide_src/source/libraries/validation/016.php
@@ -18,4 +18,5 @@ class Validation
             ],
         ],
     ];
+    // ...
 }
diff --git a/user_guide_src/source/libraries/validation/031.php b/user_guide_src/source/libraries/validation/031.php
index e85808bdab63..7ed5d307b0e2 100644
--- a/user_guide_src/source/libraries/validation/031.php
+++ b/user_guide_src/source/libraries/validation/031.php
@@ -9,4 +9,5 @@ class Validation
         'single'  => 'CodeIgniter\Validation\Views\single',
         'my_list' => '_errors_list',
     ];
+    // ...
 }
diff --git a/user_guide_src/source/libraries/validation/032.php b/user_guide_src/source/libraries/validation/032.php
index 86534cd84ed4..5f16ca283c1e 100644
--- a/user_guide_src/source/libraries/validation/032.php
+++ b/user_guide_src/source/libraries/validation/032.php
@@ -15,4 +15,5 @@ class Validation
         FileRules::class,
         CreditCardRules::class,
     ];
+    // ...
 }
diff --git a/user_guide_src/source/outgoing/api_responses/003.php b/user_guide_src/source/outgoing/api_responses/003.php
index 1b5a498b5940..eebb83c43fc1 100644
--- a/user_guide_src/source/outgoing/api_responses/003.php
+++ b/user_guide_src/source/outgoing/api_responses/003.php
@@ -10,4 +10,5 @@ class Format extends BaseConfig
         'application/json',
         'application/xml',
     ];
+    // ...
 }
diff --git a/user_guide_src/source/outgoing/api_responses/004.php b/user_guide_src/source/outgoing/api_responses/004.php
index b092ec70372e..57532911f13b 100644
--- a/user_guide_src/source/outgoing/api_responses/004.php
+++ b/user_guide_src/source/outgoing/api_responses/004.php
@@ -10,4 +10,5 @@ class Format extends BaseConfig
         'application/json' => \CodeIgniter\Format\JSONFormatter::class,
         'application/xml'  => \CodeIgniter\Format\XMLFormatter::class,
     ];
+    // ...
 }
diff --git a/user_guide_src/source/outgoing/localization/001.php b/user_guide_src/source/outgoing/localization/001.php
index 7af57b09d921..ebc1e57ef45c 100644
--- a/user_guide_src/source/outgoing/localization/001.php
+++ b/user_guide_src/source/outgoing/localization/001.php
@@ -7,4 +7,5 @@
 class App extends BaseConfig
 {
     public $defaultLocale = 'en';
+    // ...
 }
diff --git a/user_guide_src/source/outgoing/localization/002.php b/user_guide_src/source/outgoing/localization/002.php
index ae6aa825e7a8..6a0cce0ea027 100644
--- a/user_guide_src/source/outgoing/localization/002.php
+++ b/user_guide_src/source/outgoing/localization/002.php
@@ -7,4 +7,5 @@
 class App extends BaseConfig
 {
     public $negotiateLocale = true;
+    // ...
 }
diff --git a/user_guide_src/source/outgoing/localization/003.php b/user_guide_src/source/outgoing/localization/003.php
index dd3cad7ee548..81aa073152a0 100644
--- a/user_guide_src/source/outgoing/localization/003.php
+++ b/user_guide_src/source/outgoing/localization/003.php
@@ -7,4 +7,5 @@
 class App extends BaseConfig
 {
     public $supportedLocales = ['en', 'es', 'fr-FR'];
+    // ...
 }
diff --git a/user_guide_src/source/outgoing/response/011.php b/user_guide_src/source/outgoing/response/011.php
index 5f546ff5781a..2ad152a51755 100644
--- a/user_guide_src/source/outgoing/response/011.php
+++ b/user_guide_src/source/outgoing/response/011.php
@@ -7,4 +7,5 @@
 class App extends BaseConfig
 {
     public $CSPEnabled = true;
+    // ...
 }
diff --git a/user_guide_src/source/outgoing/view_decorators/002.php b/user_guide_src/source/outgoing/view_decorators/002.php
index a7d0f3937fa9..6bd050126f90 100644
--- a/user_guide_src/source/outgoing/view_decorators/002.php
+++ b/user_guide_src/source/outgoing/view_decorators/002.php
@@ -9,4 +9,5 @@ class View extends BaseView
     public array $decorators = [
         'App\Views\Decorators\MyDecorator',
     ];
+    // ...
 }
diff --git a/user_guide_src/source/outgoing/view_parser/012.php b/user_guide_src/source/outgoing/view_parser/012.php
index 40a6a62e3964..a006a51d5c33 100644
--- a/user_guide_src/source/outgoing/view_parser/012.php
+++ b/user_guide_src/source/outgoing/view_parser/012.php
@@ -10,4 +10,5 @@ class View extends BaseView
         'abs'        => '\CodeIgniter\View\Filters::abs',
         'capitalize' => '\CodeIgniter\View\Filters::capitalize',
     ];
+    // ...
 }
diff --git a/user_guide_src/source/outgoing/view_parser/013.php b/user_guide_src/source/outgoing/view_parser/013.php
index 20a7f800af10..c45a72b89bde 100644
--- a/user_guide_src/source/outgoing/view_parser/013.php
+++ b/user_guide_src/source/outgoing/view_parser/013.php
@@ -9,4 +9,5 @@ class View extends BaseView
     public $filters = [
         'str_repeat' => '\str_repeat',
     ];
+    // ...
 }
diff --git a/user_guide_src/source/outgoing/view_parser/014.php b/user_guide_src/source/outgoing/view_parser/014.php
index 87e70e1a43b5..866a547e3b28 100644
--- a/user_guide_src/source/outgoing/view_parser/014.php
+++ b/user_guide_src/source/outgoing/view_parser/014.php
@@ -9,4 +9,5 @@ class View extends BaseView
     public $plugins = [
         'foo' => '\Some\Class::methodName',
     ];
+    // ...
 }
diff --git a/user_guide_src/source/outgoing/view_parser/015.php b/user_guide_src/source/outgoing/view_parser/015.php
index 008d6f748622..ecfafffbf97a 100644
--- a/user_guide_src/source/outgoing/view_parser/015.php
+++ b/user_guide_src/source/outgoing/view_parser/015.php
@@ -16,4 +16,5 @@ public function __construct()
 
         parent::__construct();
     }
+    // ...
 }
diff --git a/user_guide_src/source/outgoing/view_parser/016.php b/user_guide_src/source/outgoing/view_parser/016.php
index a78667ef2762..0350043cf4fa 100644
--- a/user_guide_src/source/outgoing/view_parser/016.php
+++ b/user_guide_src/source/outgoing/view_parser/016.php
@@ -9,6 +9,7 @@ class View extends BaseView
     public $plugins = [
         'foo' => '\Some\Class::methodName',
     ];
+    // ...
 }
 
 // Tag is replaced by the return value of Some\Class::methodName static function.
diff --git a/user_guide_src/source/outgoing/view_parser/017.php b/user_guide_src/source/outgoing/view_parser/017.php
index 6c98122dd7af..1042665a0fcf 100644
--- a/user_guide_src/source/outgoing/view_parser/017.php
+++ b/user_guide_src/source/outgoing/view_parser/017.php
@@ -9,6 +9,7 @@ class View extends BaseView
     public $plugins = [
         'foo' => ['\Some\Class::methodName'],
     ];
+    // ...
 }
 
 // {+ foo +} inner content {+ /foo +}
diff --git a/user_guide_src/source/testing/debugging/003.php b/user_guide_src/source/testing/debugging/003.php
index ec42da23856a..4c1804e2d82b 100644
--- a/user_guide_src/source/testing/debugging/003.php
+++ b/user_guide_src/source/testing/debugging/003.php
@@ -16,4 +16,5 @@ class Toolbar extends BaseConfig
         \CodeIgniter\Debug\Toolbar\Collectors\Routes::class,
         \CodeIgniter\Debug\Toolbar\Collectors\Events::class,
     ];
+    // ...
 }
diff --git a/user_guide_src/source/tutorial/create_news_items/001.php b/user_guide_src/source/tutorial/create_news_items/001.php
index 5982d0b159ab..c63e033af0bf 100644
--- a/user_guide_src/source/tutorial/create_news_items/001.php
+++ b/user_guide_src/source/tutorial/create_news_items/001.php
@@ -9,4 +9,5 @@ class Filters extends BaseConfig
     public $methods = [
         'post' => ['csrf'],
     ];
+    // ...
 }

From 589bd7ca252fd757d8617a579bc05b7e4664da5b Mon Sep 17 00:00:00 2001
From: Alex Schmitz <40514119+sfadschm@users.noreply.github.com>
Date: Wed, 2 Mar 2022 08:31:36 +0100
Subject: [PATCH 1716/2325] Fix cli_library.

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 user_guide_src/source/cli/cli_library/001.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide_src/source/cli/cli_library/001.php b/user_guide_src/source/cli/cli_library/001.php
index 89e798a5647b..e42c9a9231e6 100644
--- a/user_guide_src/source/cli/cli_library/001.php
+++ b/user_guide_src/source/cli/cli_library/001.php
@@ -2,6 +2,7 @@
 
 namespace App\Controllers;
 
+use CodeIgniter\CLI\CLI;
 use CodeIgniter\Controller;
 
 class MyController extends Controller

From 8c83892af24a6821ad4d6500c8282cd0508d0877 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <40514119+sfadschm@users.noreply.github.com>
Date: Wed, 2 Mar 2022 10:09:59 +0100
Subject: [PATCH 1717/2325] Apply suggestions from code review.

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 user_guide_src/source/concepts/factories/005.php                | 1 -
 user_guide_src/source/database/configuration/008.php            | 1 -
 user_guide_src/source/extending/basecontroller/003.php          | 2 ++
 .../source/installation/upgrade_configuration/002.php           | 1 -
 user_guide_src/source/testing/overview/018.php                  | 2 +-
 5 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/concepts/factories/005.php b/user_guide_src/source/concepts/factories/005.php
index 0c860b7a1672..10a82b828d73 100644
--- a/user_guide_src/source/concepts/factories/005.php
+++ b/user_guide_src/source/concepts/factories/005.php
@@ -10,5 +10,4 @@ class Factories extends BaseFactory
     public $filters = [
         'instanceOf' => FilterInterface::class,
     ];
-    // ...
 }
diff --git a/user_guide_src/source/database/configuration/008.php b/user_guide_src/source/database/configuration/008.php
index c6084e212234..5639c484d125 100644
--- a/user_guide_src/source/database/configuration/008.php
+++ b/user_guide_src/source/database/configuration/008.php
@@ -14,5 +14,4 @@ public function __construct()
     {
         $this->defaultGroup = ENVIRONMENT;
     }
-    // ...
 }
diff --git a/user_guide_src/source/extending/basecontroller/003.php b/user_guide_src/source/extending/basecontroller/003.php
index 4948b49bf0ac..22afdf184f75 100644
--- a/user_guide_src/source/extending/basecontroller/003.php
+++ b/user_guide_src/source/extending/basecontroller/003.php
@@ -4,6 +4,8 @@
 
 class Home extends BaseController
 {
+    // ...
+    
     public function initController(/* ... */)
     {
         // Do Not Edit This Line
diff --git a/user_guide_src/source/installation/upgrade_configuration/002.php b/user_guide_src/source/installation/upgrade_configuration/002.php
index cc013d77583f..f62f19b7c5ad 100644
--- a/user_guide_src/source/installation/upgrade_configuration/002.php
+++ b/user_guide_src/source/installation/upgrade_configuration/002.php
@@ -8,5 +8,4 @@ class CustomClass extends BaseConfig
 {
     public $siteName  = 'My Great Site';
     public $siteEmail = 'webmaster@example.com';
-    // ...
 }
diff --git a/user_guide_src/source/testing/overview/018.php b/user_guide_src/source/testing/overview/018.php
index b7138b5ec63b..67ccc4a634dc 100644
--- a/user_guide_src/source/testing/overview/018.php
+++ b/user_guide_src/source/testing/overview/018.php
@@ -4,7 +4,7 @@
 
 final class SomeTest extends CIUnitTestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

From 7011b01108352310fa7653e9aa42a2e80583c1df Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Wed, 2 Mar 2022 10:14:53 +0100
Subject: [PATCH 1718/2325] Fix spaces.

---
 user_guide_src/source/models/entities/021.php | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/user_guide_src/source/models/entities/021.php b/user_guide_src/source/models/entities/021.php
index a117e2a81f37..219c437b378c 100644
--- a/user_guide_src/source/models/entities/021.php
+++ b/user_guide_src/source/models/entities/021.php
@@ -9,13 +9,17 @@ class SomeHandler extends BaseCast
     public static function get($value, array $params = [])
     {
         var_dump($params);
-        // array(3) {
-        //   [0]=>
-        // string(13) "App\SomeClass"
-        //   [1]=>
-        // string(6) "param2"
-        //   [2]=>
-        // string(6) "param3"
-        // }
+        /*
+            Output:
+
+            array(3) {
+              [0]=>
+              string(13) "App\SomeClass"
+              [1]=>
+              string(6) "param2"
+              [2]=>
+              string(6) "param3"
+            }
+        */
     }
 }

From f7d93e3ed2d2767e8bac8eaaea69c32c496191bc Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Wed, 2 Mar 2022 10:22:34 +0100
Subject: [PATCH 1719/2325] Fix BaseController examples.

---
 user_guide_src/source/extending/basecontroller/002.php | 8 +++++++-
 user_guide_src/source/extending/basecontroller/003.php | 6 ++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/extending/basecontroller/002.php b/user_guide_src/source/extending/basecontroller/002.php
index bd7de42a0a94..1add155f1b4c 100644
--- a/user_guide_src/source/extending/basecontroller/002.php
+++ b/user_guide_src/source/extending/basecontroller/002.php
@@ -2,7 +2,13 @@
 
 namespace App\Controllers;
 
-class Home extends BaseController
+use CodeIgniter\Controller;
+
+abstract class BaseController extends Controller
 {
+    // ...
+
     protected $helpers = ['html', 'text'];
+
+    // ...
 }
diff --git a/user_guide_src/source/extending/basecontroller/003.php b/user_guide_src/source/extending/basecontroller/003.php
index 22afdf184f75..5c9fcf1fc255 100644
--- a/user_guide_src/source/extending/basecontroller/003.php
+++ b/user_guide_src/source/extending/basecontroller/003.php
@@ -2,10 +2,12 @@
 
 namespace App\Controllers;
 
-class Home extends BaseController
+use CodeIgniter\Controller;
+
+abstract class BaseController extends Controller
 {
     // ...
-    
+
     public function initController(/* ... */)
     {
         // Do Not Edit This Line

From b4f3c06cd78c8cb73bc64d4b8a9f7c7b8c40cde2 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <40514119+sfadschm@users.noreply.github.com>
Date: Wed, 2 Mar 2022 10:22:58 +0100
Subject: [PATCH 1720/2325] Fix empty line.

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 user_guide_src/source/dbmgmt/migration/002.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide_src/source/dbmgmt/migration/002.php b/user_guide_src/source/dbmgmt/migration/002.php
index 6a8482fb1478..b324f22003a7 100644
--- a/user_guide_src/source/dbmgmt/migration/002.php
+++ b/user_guide_src/source/dbmgmt/migration/002.php
@@ -11,6 +11,7 @@ public function up()
         $this->db->disableForeignKeyChecks();
 
         // Migration rules would go here..
+        
         $this->db->enableForeignKeyChecks();
     }
 }

From 561706af62db143cbd494e70242a3a4a1d3133c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Mar 2022 00:45:54 +0800
Subject: [PATCH 1721/2325] chore(deps): bump actions/checkout from 2 to 3
 (#5760)

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [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/v2...v3)

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

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/deploy-apidocs.yml          | 4 ++--
 .github/workflows/deploy-framework.yml        | 8 ++++----
 .github/workflows/deploy-userguide-latest.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-phpunit.yml            | 2 +-
 .github/workflows/test-rector.yml             | 2 +-
 .github/workflows/test-scss.yml               | 2 +-
 .github/workflows/test-userguide.yml          | 2 +-
 12 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/deploy-apidocs.yml b/.github/workflows/deploy-apidocs.yml
index 4a7d20dd502b..55480f4fd5a4 100644
--- a/.github/workflows/deploy-apidocs.yml
+++ b/.github/workflows/deploy-apidocs.yml
@@ -24,12 +24,12 @@ jobs:
           git config --global user.name "${GITHUB_ACTOR}"
 
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: source
 
       - name: Checkout target
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: codeigniter4/api
           token: ${{ secrets.ACCESS_TOKEN }}
diff --git a/.github/workflows/deploy-framework.yml b/.github/workflows/deploy-framework.yml
index 339565dcfdfc..9fdbc8f08127 100644
--- a/.github/workflows/deploy-framework.yml
+++ b/.github/workflows/deploy-framework.yml
@@ -18,12 +18,12 @@ jobs:
           git config --global user.name "${GITHUB_ACTOR}"
 
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: source
 
       - name: Checkout target
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: codeigniter4/framework
           token: ${{ secrets.ACCESS_TOKEN }}
@@ -63,12 +63,12 @@ jobs:
           git config --global user.name "${GITHUB_ACTOR}"
 
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: source
 
       - name: Checkout target
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: codeigniter4/appstarter
           token: ${{ secrets.ACCESS_TOKEN }}
diff --git a/.github/workflows/deploy-userguide-latest.yml b/.github/workflows/deploy-userguide-latest.yml
index 22e6eed4db4f..fb453f0c9694 100644
--- a/.github/workflows/deploy-userguide-latest.yml
+++ b/.github/workflows/deploy-userguide-latest.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Build the latest User Guide
       - name: Build with Sphinx
diff --git a/.github/workflows/test-autoreview.yml b/.github/workflows/test-autoreview.yml
index 28f1230b0073..ccc97dcf137e 100644
--- a/.github/workflows/test-autoreview.yml
+++ b/.github/workflows/test-autoreview.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - 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 583f4d5df72c..4e9509f4fb2e 100644
--- a/.github/workflows/test-coding-standards.yml
+++ b/.github/workflows/test-coding-standards.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test-deptrac.yml b/.github/workflows/test-deptrac.yml
index 262da202c02f..ac280f964d0a 100644
--- a/.github/workflows/test-deptrac.yml
+++ b/.github/workflows/test-deptrac.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test-phpcpd.yml b/.github/workflows/test-phpcpd.yml
index 6cfd76a054f1..e4d869c09d4a 100644
--- a/.github/workflows/test-phpcpd.yml
+++ b/.github/workflows/test-phpcpd.yml
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test-phpstan.yml b/.github/workflows/test-phpstan.yml
index d0235ec9beb6..f7c09d1aa89e 100644
--- a/.github/workflows/test-phpstan.yml
+++ b/.github/workflows/test-phpstan.yml
@@ -37,7 +37,7 @@ jobs:
         php-versions: ['8.0', '8.1']
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 964f9fcb3f72..623d13f59475 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -120,7 +120,7 @@ jobs:
         run: echo -e "ALTER SESSION SET CONTAINER = XEPDB1;\nCREATE BIGFILE TABLESPACE \"TEST\" DATAFILE '/opt/oracle/product/18c/dbhomeXE/dbs/TEST' SIZE 10M AUTOEXTEND ON MAXSIZE UNLIMITED SEGMENT SPACE MANAGEMENT AUTO EXTENT MANAGEMENT LOCAL AUTOALLOCATE;\nCREATE USER \"ORACLE\" IDENTIFIED BY \"ORACLE\" DEFAULT TABLESPACE \"TEST\" TEMPORARY TABLESPACE TEMP QUOTA UNLIMITED ON \"TEST\";\nGRANT CONNECT,RESOURCE TO \"ORACLE\";\nexit;" | /lib/oracle/18.5/client64/bin/sqlplus -s sys/Oracle18@localhost:1521/XE as sysdba
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test-rector.yml b/.github/workflows/test-rector.yml
index 1282205c8bf6..a96821da3191 100644
--- a/.github/workflows/test-rector.yml
+++ b/.github/workflows/test-rector.yml
@@ -37,7 +37,7 @@ jobs:
         php-versions: ['7.4', '8.0']
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/test-scss.yml b/.github/workflows/test-scss.yml
index ff65863fe3a6..0d335a29552a 100644
--- a/.github/workflows/test-scss.yml
+++ b/.github/workflows/test-scss.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - 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 44cfa52c8b17..b01c141a9c61 100644
--- a/.github/workflows/test-userguide.yml
+++ b/.github/workflows/test-userguide.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Detect usage of tabs in RST files
         run: php utils/check_tabs_in_rst.php

From 45c8e27663107cede2a2da64ad07b934a8c19ca6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 3 Mar 2022 08:56:34 +0900
Subject: [PATCH 1722/2325] docs: fix incorrect config filename

---
 user_guide_src/source/concepts/factories.rst     | 6 +++---
 user_guide_src/source/concepts/factories/005.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst
index db48a58e8f74..2ddab73f2216 100644
--- a/user_guide_src/source/concepts/factories.rst
+++ b/user_guide_src/source/concepts/factories.rst
@@ -79,8 +79,8 @@ Factories Behavior
 
 Options can be applied in one of three ways (listed in ascending priority):
 
-* A configuration file ``Factory`` with a component property.
-* The static method ``Factories::setOptions``.
+* A configuration class ``Config\Factory`` with a ``$component`` property.
+* The static method ``Factories::setOptions()``.
 * Passing options directly at call time with a parameter.
 
 Configurations
@@ -89,7 +89,7 @@ Configurations
 To set default component options, create a new Config files at **app/Config/Factory.php**
 that supplies options as an array property that matches the name of the component. For example,
 if you wanted to ensure that all Filters used by your app were valid framework instances,
-your **Factories.php** file might look like this:
+your **Factory.php** file might look like this:
 
 .. literalinclude:: factories/005.php
 
diff --git a/user_guide_src/source/concepts/factories/005.php b/user_guide_src/source/concepts/factories/005.php
index 10a82b828d73..1c63105feb04 100644
--- a/user_guide_src/source/concepts/factories/005.php
+++ b/user_guide_src/source/concepts/factories/005.php
@@ -5,7 +5,7 @@
 use CodeIgniter\Config\Factory as BaseFactory;
 use CodeIgniter\Filters\FilterInterface;
 
-class Factories extends BaseFactory
+class Factory extends BaseFactory
 {
     public $filters = [
         'instanceOf' => FilterInterface::class,

From eb45f56dcd2ef942a044e3ea45df5234954fa091 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Thu, 3 Mar 2022 20:36:03 +0700
Subject: [PATCH 1723/2325] [Rector] Update to Rector 0.12.17 and Re-run it

---
 composer.json                                     | 2 +-
 phpstan-baseline.neon.dist                        | 4 ++++
 tests/system/Database/Live/FabricatorLiveTest.php | 2 +-
 tests/system/Database/Live/ForgeTest.php          | 8 ++------
 tests/system/Filters/HoneypotTest.php             | 2 +-
 tests/system/HTTP/URITest.php                     | 2 +-
 tests/system/Honeypot/HoneypotTest.php            | 2 +-
 tests/system/I18n/TimeTest.php                    | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/composer.json b/composer.json
index d9daf5748fb3..945e9d30e723 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.16"
+        "rector/rector": "0.12.17"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"
diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index 3343075a3159..7c0704286696 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -915,3 +915,7 @@ parameters:
 			paths:
 				- system/Cache/CacheFactory.php
 				- system/Filters/Filters.php
+
+		-
+			message: "#^Binary operation \"/\" between string and 8 results in an error\\.$#"
+			path: system/Encryption/Handlers/OpenSSLHandler.php
diff --git a/tests/system/Database/Live/FabricatorLiveTest.php b/tests/system/Database/Live/FabricatorLiveTest.php
index b1cf373f1244..761de0a39fae 100644
--- a/tests/system/Database/Live/FabricatorLiveTest.php
+++ b/tests/system/Database/Live/FabricatorLiveTest.php
@@ -50,7 +50,7 @@ public function testCreateAddsCountToDatabase()
         // Some countries violate the 40 character limit so override that
         $fabricator->setOverrides(['country' => 'France']);
 
-        $result = $fabricator->create($count);
+        $fabricator->create($count);
 
         $this->seeNumRecords($count, 'user', []);
     }
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index e20f26556f1d..113f2c0a211e 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -30,11 +30,7 @@ final class ForgeTest extends CIUnitTestCase
 
     protected $refresh = true;
     protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
-
-    /**
-     * @var Forge
-     */
-    protected $forge;
+    protected Forge $forge;
 
     protected function setUp(): void
     {
@@ -812,7 +808,7 @@ public function testAddFields()
 
         $this->forge->addKey('id', true);
         $this->forge->addUniqueKey(['username', 'active']);
-        $create = $this->forge->createTable($tableName, true);
+        $this->forge->createTable($tableName, true);
 
         $fieldsNames = $this->db->getFieldNames($tableName);
         $fieldsData  = $this->db->getFieldData($tableName);
diff --git a/tests/system/Filters/HoneypotTest.php b/tests/system/Filters/HoneypotTest.php
index 938f0fe525f5..4919b8490fde 100644
--- a/tests/system/Filters/HoneypotTest.php
+++ b/tests/system/Filters/HoneypotTest.php
@@ -53,7 +53,7 @@ public function testBeforeTriggered()
         $uri     = 'admin/foo/bar';
 
         $this->expectException(HoneypotException::class);
-        $request = $filters->run($uri, 'before');
+        $filters->run($uri, 'before');
     }
 
     public function testBeforeClean()
diff --git a/tests/system/HTTP/URITest.php b/tests/system/HTTP/URITest.php
index a4faacfbdd80..1a51741b8c36 100644
--- a/tests/system/HTTP/URITest.php
+++ b/tests/system/HTTP/URITest.php
@@ -155,7 +155,7 @@ public function testMalformedUri()
     {
         $this->expectException(HTTPException::class);
         $url = 'http://abc:a123';
-        $uri = new URI($url);
+        new URI($url);
     }
 
     public function testMissingScheme()
diff --git a/tests/system/Honeypot/HoneypotTest.php b/tests/system/Honeypot/HoneypotTest.php
index e7f6893b9cf9..860d552d4e86 100644
--- a/tests/system/Honeypot/HoneypotTest.php
+++ b/tests/system/Honeypot/HoneypotTest.php
@@ -114,7 +114,7 @@ public function testHoneypotFilterBefore()
         $uri     = 'admin/foo/bar';
 
         $this->expectException(HoneypotException::class);
-        $request = $filters->run($uri, 'before');
+        $filters->run($uri, 'before');
     }
 
     public function testHoneypotFilterAfter()
diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php
index bdc605d2d253..ed1b747699a4 100644
--- a/tests/system/I18n/TimeTest.php
+++ b/tests/system/I18n/TimeTest.php
@@ -235,7 +235,7 @@ public function testCreateFromFormatWithInvalidFormat()
         $this->expectException(I18nException::class);
         $this->expectExceptionMessage(lang('Time.invalidFormat', [$format]));
 
-        $time = Time::createFromFormat($format, 'America/Chicago');
+        Time::createFromFormat($format, 'America/Chicago');
     }
 
     public function testCreateFromTimestamp()

From f9ef14a2064c1c6981d0fa95b02ccec9e09e545a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 4 Mar 2022 11:37:07 +0900
Subject: [PATCH 1724/2325] docs: change comment style

---
 user_guide_src/source/cli/cli_library/007.php | 14 ++++++++------
 user_guide_src/source/cli/cli_library/008.php | 14 ++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/user_guide_src/source/cli/cli_library/007.php b/user_guide_src/source/cli/cli_library/007.php
index 474229ba6e6a..6d77ee91e4a0 100644
--- a/user_guide_src/source/cli/cli_library/007.php
+++ b/user_guide_src/source/cli/cli_library/007.php
@@ -2,9 +2,11 @@
 
 $fruit = CLI::promptByKey('These are your choices:', ['The red apple', 'The plump orange', 'The ripe banana']);
 
-//These are your choices:
-//  [0]  The red apple
-//  [1]  The plump orange
-//  [2]  The ripe banana
-//
-//[0, 1, 2]:
+/*
+These are your choices:
+  [0]  The red apple
+  [1]  The plump orange
+  [2]  The ripe banana
+
+[0, 1, 2]:
+*/
diff --git a/user_guide_src/source/cli/cli_library/008.php b/user_guide_src/source/cli/cli_library/008.php
index 003c9a362444..b455b7efe22e 100644
--- a/user_guide_src/source/cli/cli_library/008.php
+++ b/user_guide_src/source/cli/cli_library/008.php
@@ -6,9 +6,11 @@
     'banana' => 'The ripe banana'
 ]);
 
-//These are your choices:
-//  [apple]   The red apple
-//  [orange]  The plump orange
-//  [banana]  The ripe banana
-//
-//Which would you like? [apple, orange, banana]:
+/*
+These are your choices:
+  [apple]   The red apple
+  [orange]  The plump orange
+  [banana]  The ripe banana
+
+Which would you like? [apple, orange, banana]:
+*/

From 85e624f5d724a451d496f0caa90873cbd5a99dcd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 4 Mar 2022 11:57:25 +0900
Subject: [PATCH 1725/2325] docs: move CodeIgniter 3 sample code to `ci3sample`
 folder

---
 user_guide_src/source/installation/upgrade_configuration.rst    | 2 +-
 .../installation/upgrade_configuration/{ => ci3sample}/001.php  | 0
 user_guide_src/source/installation/upgrade_controllers.rst      | 2 +-
 .../installation/upgrade_controllers/{ => ci3sample}/001.php    | 0
 user_guide_src/source/installation/upgrade_database.rst         | 2 +-
 .../installation/upgrade_database/{ => ci3sample}/001.php       | 0
 user_guide_src/source/installation/upgrade_emails.rst           | 2 +-
 .../source/installation/upgrade_emails/{ => ci3sample}/001.php  | 0
 user_guide_src/source/installation/upgrade_encryption.rst       | 2 +-
 .../installation/upgrade_encryption/{ => ci3sample}/001.php     | 0
 user_guide_src/source/installation/upgrade_file_upload.rst      | 2 +-
 .../installation/upgrade_file_upload/{ => ci3sample}/001.php    | 0
 user_guide_src/source/installation/upgrade_html_tables.rst      | 2 +-
 .../installation/upgrade_html_tables/{ => ci3sample}/001.php    | 0
 user_guide_src/source/installation/upgrade_localization.rst     | 2 +-
 .../installation/upgrade_localization/{ => ci3sample}/002.php   | 0
 user_guide_src/source/installation/upgrade_migrations.rst       | 2 +-
 .../installation/upgrade_migrations/{ => ci3sample}/001.php     | 0
 user_guide_src/source/installation/upgrade_models.rst           | 2 +-
 .../source/installation/upgrade_models/{ => ci3sample}/001.php  | 0
 user_guide_src/source/installation/upgrade_pagination.rst       | 2 +-
 .../installation/upgrade_pagination/{ => ci3sample}/001.php     | 0
 user_guide_src/source/installation/upgrade_responses.rst        | 2 +-
 .../installation/upgrade_responses/{ => ci3sample}/001.php      | 0
 user_guide_src/source/installation/upgrade_routing.rst          | 2 +-
 .../source/installation/upgrade_routing/{ => ci3sample}/001.php | 0
 user_guide_src/source/installation/upgrade_security.rst         | 2 +-
 .../installation/upgrade_security/{ => ci3sample}/002.php       | 0
 user_guide_src/source/installation/upgrade_sessions.rst         | 2 +-
 .../installation/upgrade_sessions/{ => ci3sample}/001.php       | 0
 user_guide_src/source/installation/upgrade_validations.rst      | 2 +-
 .../installation/upgrade_validations/{ => ci3sample}/002.php    | 0
 user_guide_src/source/installation/upgrade_view_parser.rst      | 2 +-
 .../installation/upgrade_view_parser/{ => ci3sample}/001.php    | 0
 user_guide_src/source/installation/upgrade_views.rst            | 2 +-
 .../source/installation/upgrade_views/{ => ci3sample}/001.php   | 0
 36 files changed, 18 insertions(+), 18 deletions(-)
 rename user_guide_src/source/installation/upgrade_configuration/{ => ci3sample}/001.php (100%)
 rename user_guide_src/source/installation/upgrade_controllers/{ => ci3sample}/001.php (100%)
 rename user_guide_src/source/installation/upgrade_database/{ => ci3sample}/001.php (100%)
 rename user_guide_src/source/installation/upgrade_emails/{ => ci3sample}/001.php (100%)
 rename user_guide_src/source/installation/upgrade_encryption/{ => ci3sample}/001.php (100%)
 rename user_guide_src/source/installation/upgrade_file_upload/{ => ci3sample}/001.php (100%)
 rename user_guide_src/source/installation/upgrade_html_tables/{ => ci3sample}/001.php (100%)
 rename user_guide_src/source/installation/upgrade_localization/{ => ci3sample}/002.php (100%)
 rename user_guide_src/source/installation/upgrade_migrations/{ => ci3sample}/001.php (100%)
 rename user_guide_src/source/installation/upgrade_models/{ => ci3sample}/001.php (100%)
 rename user_guide_src/source/installation/upgrade_pagination/{ => ci3sample}/001.php (100%)
 rename user_guide_src/source/installation/upgrade_responses/{ => ci3sample}/001.php (100%)
 rename user_guide_src/source/installation/upgrade_routing/{ => ci3sample}/001.php (100%)
 rename user_guide_src/source/installation/upgrade_security/{ => ci3sample}/002.php (100%)
 rename user_guide_src/source/installation/upgrade_sessions/{ => ci3sample}/001.php (100%)
 rename user_guide_src/source/installation/upgrade_validations/{ => ci3sample}/002.php (100%)
 rename user_guide_src/source/installation/upgrade_view_parser/{ => ci3sample}/001.php (100%)
 rename user_guide_src/source/installation/upgrade_views/{ => ci3sample}/001.php (100%)

diff --git a/user_guide_src/source/installation/upgrade_configuration.rst b/user_guide_src/source/installation/upgrade_configuration.rst
index 21ae6101c158..6a9f38069478 100644
--- a/user_guide_src/source/installation/upgrade_configuration.rst
+++ b/user_guide_src/source/installation/upgrade_configuration.rst
@@ -40,7 +40,7 @@ CodeIgniter Version 3.x
 
 Path: **application/config**:
 
-.. literalinclude:: upgrade_configuration/001.php
+.. literalinclude:: upgrade_configuration/ci3sample/001.php
 
 CodeIgniter Version 4.x
 -----------------------
diff --git a/user_guide_src/source/installation/upgrade_configuration/001.php b/user_guide_src/source/installation/upgrade_configuration/ci3sample/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_configuration/001.php
rename to user_guide_src/source/installation/upgrade_configuration/ci3sample/001.php
diff --git a/user_guide_src/source/installation/upgrade_controllers.rst b/user_guide_src/source/installation/upgrade_controllers.rst
index fc0bcb4d37d7..3e7521445691 100644
--- a/user_guide_src/source/installation/upgrade_controllers.rst
+++ b/user_guide_src/source/installation/upgrade_controllers.rst
@@ -43,7 +43,7 @@ CodeIgniter Version 3.x
 
 Path: **application/controllers**:
 
-.. literalinclude:: upgrade_controllers/001.php
+.. literalinclude:: upgrade_controllers/ci3sample/001.php
 
 CodeIgniter Version 4.x
 -----------------------
diff --git a/user_guide_src/source/installation/upgrade_controllers/001.php b/user_guide_src/source/installation/upgrade_controllers/ci3sample/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_controllers/001.php
rename to user_guide_src/source/installation/upgrade_controllers/ci3sample/001.php
diff --git a/user_guide_src/source/installation/upgrade_database.rst b/user_guide_src/source/installation/upgrade_database.rst
index 4479c46ff5e8..10b1e6ac1c96 100644
--- a/user_guide_src/source/installation/upgrade_database.rst
+++ b/user_guide_src/source/installation/upgrade_database.rst
@@ -46,7 +46,7 @@ Code Example
 CodeIgniter Version 3.x
 ------------------------
 
-.. literalinclude:: upgrade_database/001.php
+.. literalinclude:: upgrade_database/ci3sample/001.php
 
 CodeIgniter Version 4.x
 -----------------------
diff --git a/user_guide_src/source/installation/upgrade_database/001.php b/user_guide_src/source/installation/upgrade_database/ci3sample/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_database/001.php
rename to user_guide_src/source/installation/upgrade_database/ci3sample/001.php
diff --git a/user_guide_src/source/installation/upgrade_emails.rst b/user_guide_src/source/installation/upgrade_emails.rst
index 1ece732add8f..af322f2d7c7a 100644
--- a/user_guide_src/source/installation/upgrade_emails.rst
+++ b/user_guide_src/source/installation/upgrade_emails.rst
@@ -28,7 +28,7 @@ Code Example
 CodeIgniter Version 3.x
 ------------------------
 
-.. literalinclude:: upgrade_emails/001.php
+.. literalinclude:: upgrade_emails/ci3sample/001.php
 
 CodeIgniter Version 4.x
 -----------------------
diff --git a/user_guide_src/source/installation/upgrade_emails/001.php b/user_guide_src/source/installation/upgrade_emails/ci3sample/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_emails/001.php
rename to user_guide_src/source/installation/upgrade_emails/ci3sample/001.php
diff --git a/user_guide_src/source/installation/upgrade_encryption.rst b/user_guide_src/source/installation/upgrade_encryption.rst
index fb617a5424d5..9d626d341d5d 100644
--- a/user_guide_src/source/installation/upgrade_encryption.rst
+++ b/user_guide_src/source/installation/upgrade_encryption.rst
@@ -26,7 +26,7 @@ Code Example
 CodeIgniter Version 3.x
 ------------------------
 
-.. literalinclude:: upgrade_encryption/001.php
+.. literalinclude:: upgrade_encryption/ci3sample/001.php
 
 CodeIgniter Version 4.x
 -----------------------
diff --git a/user_guide_src/source/installation/upgrade_encryption/001.php b/user_guide_src/source/installation/upgrade_encryption/ci3sample/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_encryption/001.php
rename to user_guide_src/source/installation/upgrade_encryption/ci3sample/001.php
diff --git a/user_guide_src/source/installation/upgrade_file_upload.rst b/user_guide_src/source/installation/upgrade_file_upload.rst
index f0eb3a24c405..ed620bbaeb67 100644
--- a/user_guide_src/source/installation/upgrade_file_upload.rst
+++ b/user_guide_src/source/installation/upgrade_file_upload.rst
@@ -27,7 +27,7 @@ Code Example
 CodeIgniter Version 3.x
 ------------------------
 
-.. literalinclude:: upgrade_file_upload/001.php
+.. literalinclude:: upgrade_file_upload/ci3sample/001.php
 
 CodeIgniter Version 4.x
 -----------------------
diff --git a/user_guide_src/source/installation/upgrade_file_upload/001.php b/user_guide_src/source/installation/upgrade_file_upload/ci3sample/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_file_upload/001.php
rename to user_guide_src/source/installation/upgrade_file_upload/ci3sample/001.php
diff --git a/user_guide_src/source/installation/upgrade_html_tables.rst b/user_guide_src/source/installation/upgrade_html_tables.rst
index 2a0bbaacd5c7..ae97e8e3baf2 100644
--- a/user_guide_src/source/installation/upgrade_html_tables.rst
+++ b/user_guide_src/source/installation/upgrade_html_tables.rst
@@ -27,7 +27,7 @@ Code Example
 CodeIgniter Version 3.x
 ------------------------
 
-.. literalinclude:: upgrade_html_tables/001.php
+.. literalinclude:: upgrade_html_tables/ci3sample/001.php
 
 CodeIgniter Version 4.x
 -----------------------
diff --git a/user_guide_src/source/installation/upgrade_html_tables/001.php b/user_guide_src/source/installation/upgrade_html_tables/ci3sample/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_html_tables/001.php
rename to user_guide_src/source/installation/upgrade_html_tables/ci3sample/001.php
diff --git a/user_guide_src/source/installation/upgrade_localization.rst b/user_guide_src/source/installation/upgrade_localization.rst
index 0d1ed53f2ebb..782336334974 100644
--- a/user_guide_src/source/installation/upgrade_localization.rst
+++ b/user_guide_src/source/installation/upgrade_localization.rst
@@ -32,7 +32,7 @@ Code Example
 CodeIgniter Version 3.x
 ------------------------
 
-.. literalinclude:: upgrade_localization/002.php
+.. literalinclude:: upgrade_localization/ci3sample/002.php
 
 CodeIgniter Version 4.x
 -----------------------
diff --git a/user_guide_src/source/installation/upgrade_localization/002.php b/user_guide_src/source/installation/upgrade_localization/ci3sample/002.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_localization/002.php
rename to user_guide_src/source/installation/upgrade_localization/ci3sample/002.php
diff --git a/user_guide_src/source/installation/upgrade_migrations.rst b/user_guide_src/source/installation/upgrade_migrations.rst
index 07dc32e96675..60f6b8d7b090 100644
--- a/user_guide_src/source/installation/upgrade_migrations.rst
+++ b/user_guide_src/source/installation/upgrade_migrations.rst
@@ -53,7 +53,7 @@ CodeIgniter Version 3.x
 
 Path: **application/migrations**:
 
-.. literalinclude:: upgrade_migrations/001.php
+.. literalinclude:: upgrade_migrations/ci3sample/001.php
 
 CodeIgniter Version 4.x
 -----------------------
diff --git a/user_guide_src/source/installation/upgrade_migrations/001.php b/user_guide_src/source/installation/upgrade_migrations/ci3sample/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_migrations/001.php
rename to user_guide_src/source/installation/upgrade_migrations/ci3sample/001.php
diff --git a/user_guide_src/source/installation/upgrade_models.rst b/user_guide_src/source/installation/upgrade_models.rst
index ea9928a8f47e..1ffce60151e0 100644
--- a/user_guide_src/source/installation/upgrade_models.rst
+++ b/user_guide_src/source/installation/upgrade_models.rst
@@ -42,7 +42,7 @@ CodeIgniter Version 3.x
 
 Path: **application/models**:
 
-.. literalinclude:: upgrade_models/001.php
+.. literalinclude:: upgrade_models/ci3sample/001.php
 
 CodeIgniter Version 4.x
 -----------------------
diff --git a/user_guide_src/source/installation/upgrade_models/001.php b/user_guide_src/source/installation/upgrade_models/ci3sample/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_models/001.php
rename to user_guide_src/source/installation/upgrade_models/ci3sample/001.php
diff --git a/user_guide_src/source/installation/upgrade_pagination.rst b/user_guide_src/source/installation/upgrade_pagination.rst
index c39638682534..6658ae8e4bd7 100644
--- a/user_guide_src/source/installation/upgrade_pagination.rst
+++ b/user_guide_src/source/installation/upgrade_pagination.rst
@@ -34,7 +34,7 @@ Code Example
 CodeIgniter Version 3.x
 ------------------------
 
-.. literalinclude:: upgrade_pagination/001.php
+.. literalinclude:: upgrade_pagination/ci3sample/001.php
 
 CodeIgniter Version 4.x
 -----------------------
diff --git a/user_guide_src/source/installation/upgrade_pagination/001.php b/user_guide_src/source/installation/upgrade_pagination/ci3sample/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_pagination/001.php
rename to user_guide_src/source/installation/upgrade_pagination/ci3sample/001.php
diff --git a/user_guide_src/source/installation/upgrade_responses.rst b/user_guide_src/source/installation/upgrade_responses.rst
index 455e5aa1617c..c6b925d144f1 100644
--- a/user_guide_src/source/installation/upgrade_responses.rst
+++ b/user_guide_src/source/installation/upgrade_responses.rst
@@ -25,7 +25,7 @@ Code Example
 CodeIgniter Version 3.x
 ------------------------
 
-.. literalinclude:: upgrade_responses/001.php
+.. literalinclude:: upgrade_responses/ci3sample/001.php
 
 CodeIgniter Version 4.x
 -----------------------
diff --git a/user_guide_src/source/installation/upgrade_responses/001.php b/user_guide_src/source/installation/upgrade_responses/ci3sample/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_responses/001.php
rename to user_guide_src/source/installation/upgrade_responses/ci3sample/001.php
diff --git a/user_guide_src/source/installation/upgrade_routing.rst b/user_guide_src/source/installation/upgrade_routing.rst
index 533826babd29..9e6c512ff423 100644
--- a/user_guide_src/source/installation/upgrade_routing.rst
+++ b/user_guide_src/source/installation/upgrade_routing.rst
@@ -30,7 +30,7 @@ CodeIgniter Version 3.x
 ------------------------
 Path: **application/config/routes.php**:
 
-.. literalinclude:: upgrade_routing/001.php
+.. literalinclude:: upgrade_routing/ci3sample/001.php
 
 CodeIgniter Version 4.x
 -----------------------
diff --git a/user_guide_src/source/installation/upgrade_routing/001.php b/user_guide_src/source/installation/upgrade_routing/ci3sample/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_routing/001.php
rename to user_guide_src/source/installation/upgrade_routing/ci3sample/001.php
diff --git a/user_guide_src/source/installation/upgrade_security.rst b/user_guide_src/source/installation/upgrade_security.rst
index 9000bea7167a..0a6d615e0841 100644
--- a/user_guide_src/source/installation/upgrade_security.rst
+++ b/user_guide_src/source/installation/upgrade_security.rst
@@ -33,7 +33,7 @@ Code Example
 CodeIgniter Version 3.x
 ------------------------
 
-.. literalinclude:: upgrade_security/002.php
+.. literalinclude:: upgrade_security/ci3sample/002.php
 
 CodeIgniter Version 4.x
 -----------------------
diff --git a/user_guide_src/source/installation/upgrade_security/002.php b/user_guide_src/source/installation/upgrade_security/ci3sample/002.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_security/002.php
rename to user_guide_src/source/installation/upgrade_security/ci3sample/002.php
diff --git a/user_guide_src/source/installation/upgrade_sessions.rst b/user_guide_src/source/installation/upgrade_sessions.rst
index df5ff7daae85..a309033bc816 100644
--- a/user_guide_src/source/installation/upgrade_sessions.rst
+++ b/user_guide_src/source/installation/upgrade_sessions.rst
@@ -31,7 +31,7 @@ Code Example
 CodeIgniter Version 3.x
 ------------------------
 
-.. literalinclude:: upgrade_sessions/001.php
+.. literalinclude:: upgrade_sessions/ci3sample/001.php
 
 CodeIgniter Version 4.x
 -----------------------
diff --git a/user_guide_src/source/installation/upgrade_sessions/001.php b/user_guide_src/source/installation/upgrade_sessions/ci3sample/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_sessions/001.php
rename to user_guide_src/source/installation/upgrade_sessions/ci3sample/001.php
diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
index 22dd0a2aff00..3612784ade28 100644
--- a/user_guide_src/source/installation/upgrade_validations.rst
+++ b/user_guide_src/source/installation/upgrade_validations.rst
@@ -73,7 +73,7 @@ Path: **application/views**::
 
 Path: **application/controllers**:
 
-.. literalinclude:: upgrade_validations/002.php
+.. literalinclude:: upgrade_validations/ci3sample/002.php
 
 CodeIgniter Version 4.x
 -----------------------
diff --git a/user_guide_src/source/installation/upgrade_validations/002.php b/user_guide_src/source/installation/upgrade_validations/ci3sample/002.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_validations/002.php
rename to user_guide_src/source/installation/upgrade_validations/ci3sample/002.php
diff --git a/user_guide_src/source/installation/upgrade_view_parser.rst b/user_guide_src/source/installation/upgrade_view_parser.rst
index a6faa488471e..5def5e912d5f 100644
--- a/user_guide_src/source/installation/upgrade_view_parser.rst
+++ b/user_guide_src/source/installation/upgrade_view_parser.rst
@@ -27,7 +27,7 @@ Code Example
 CodeIgniter Version 3.x
 ------------------------
 
-.. literalinclude:: upgrade_view_parser/001.php
+.. literalinclude:: upgrade_view_parser/ci3sample/001.php
 
 CodeIgniter Version 4.x
 -----------------------
diff --git a/user_guide_src/source/installation/upgrade_view_parser/001.php b/user_guide_src/source/installation/upgrade_view_parser/ci3sample/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_view_parser/001.php
rename to user_guide_src/source/installation/upgrade_view_parser/ci3sample/001.php
diff --git a/user_guide_src/source/installation/upgrade_views.rst b/user_guide_src/source/installation/upgrade_views.rst
index ac7df48f2844..574de607b42b 100644
--- a/user_guide_src/source/installation/upgrade_views.rst
+++ b/user_guide_src/source/installation/upgrade_views.rst
@@ -36,7 +36,7 @@ CodeIgniter Version 3.x
 
 Path: **application/views**:
 
-.. literalinclude:: upgrade_views/001.php
+.. literalinclude:: upgrade_views/ci3sample/001.php
 
 CodeIgniter Version 4.x
 -----------------------
diff --git a/user_guide_src/source/installation/upgrade_views/001.php b/user_guide_src/source/installation/upgrade_views/ci3sample/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_views/001.php
rename to user_guide_src/source/installation/upgrade_views/ci3sample/001.php

From 7120a4b762af9b10e181c75d1f26881c95d06904 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 4 Mar 2022 13:46:06 +0900
Subject: [PATCH 1726/2325] docs: change comment style

---
 .../source/cli/cli_commands/007.php           |  8 +++--
 .../source/database/query_builder/003.php     |  7 ++--
 .../source/database/query_builder/006.php     | 12 ++++---
 .../source/database/query_builder/018.php     |  7 ++--
 .../source/database/query_builder/074.php     |  7 ++--
 .../source/database/query_builder/087.php     | 11 ++++---
 .../source/database/query_builder/088.php     | 11 ++++---
 .../source/database/query_builder/091.php     | 23 ++++++-------
 .../source/database/query_builder/092.php     |  2 +-
 .../source/database/query_builder/093.php     |  9 +++---
 .../source/database/query_builder/095.php     |  7 ++--
 .../source/database/query_builder/097.php     |  7 ++--
 user_guide_src/source/dbmgmt/forge/004.php    |  6 ++--
 .../source/helpers/array_helper/011.php       |  7 ++--
 .../source/helpers/form_helper/010.php        | 10 +++---
 .../source/helpers/form_helper/011.php        | 10 +++---
 .../source/helpers/form_helper/012.php        |  6 ++--
 .../source/helpers/form_helper/014.php        |  6 ++--
 .../source/helpers/form_helper/017.php        |  6 ++--
 .../source/helpers/form_helper/018.php        | 32 ++++++++-----------
 .../source/helpers/text_helper/020.php        | 14 ++++----
 .../source/incoming/incomingrequest/010.php   | 12 +++----
 .../source/libraries/curlrequest/014.php      | 10 +++---
 .../source/libraries/validation/009.php       | 25 +++++++--------
 .../source/libraries/validation/011.php       | 15 ++++-----
 .../source/libraries/validation/026.php       | 12 +++----
 .../source/libraries/validation/028.2.php     | 11 +++----
 user_guide_src/source/models/entities/021.php |  1 -
 .../source/outgoing/response/021.php          |  7 ++--
 .../source/outgoing/view_parser/016.php       |  7 ++--
 .../source/testing/benchmark/004.php          | 16 ++++------
 31 files changed, 159 insertions(+), 165 deletions(-)

diff --git a/user_guide_src/source/cli/cli_commands/007.php b/user_guide_src/source/cli/cli_commands/007.php
index 7fcb90ccf083..9f9f47f2a4fb 100644
--- a/user_guide_src/source/cli/cli_commands/007.php
+++ b/user_guide_src/source/cli/cli_commands/007.php
@@ -6,6 +6,8 @@
     CLI::write($tab . CLI::color(str_pad($option, $pad), 'green') . $description, 'yellow');
 }
 
-// Output will be
-// -n        Set migration namespace
-// -r        override file
+/*
+ Output will be
+ -n        Set migration namespace
+ -r        override file
+*/
diff --git a/user_guide_src/source/database/query_builder/003.php b/user_guide_src/source/database/query_builder/003.php
index 26a9470fb6ef..b5300a358280 100644
--- a/user_guide_src/source/database/query_builder/003.php
+++ b/user_guide_src/source/database/query_builder/003.php
@@ -1,6 +1,7 @@
 <?php
 
 $query = $builder->get(10, 20);
-
-// Executes: SELECT * FROM mytable LIMIT 20, 10
-// (in MySQL. Other databases have slightly different syntax)
+/*
+Executes: SELECT * FROM mytable LIMIT 20, 10
+(in MySQL. Other databases have slightly different syntax)
+*/
diff --git a/user_guide_src/source/database/query_builder/006.php b/user_guide_src/source/database/query_builder/006.php
index 2868aaa49fee..2d672d5ce9ce 100644
--- a/user_guide_src/source/database/query_builder/006.php
+++ b/user_guide_src/source/database/query_builder/006.php
@@ -1,10 +1,12 @@
 <?php
 
 echo $builder->limit(10,20)->getCompiledSelect(false);
-
-// Prints string: SELECT * FROM mytable LIMIT 20, 10
-// (in MySQL. Other databases have slightly different syntax)
+/*
+Prints string: SELECT * FROM mytable LIMIT 20, 10
+(in MySQL. Other databases have slightly different syntax)
+*/
 
 echo $builder->select('title, content, date')->getCompiledSelect();
-
-// Prints string: SELECT title, content, date FROM mytable LIMIT 20, 10
+/*
+Prints string: SELECT title, content, date FROM mytable LIMIT 20, 10
+*/
diff --git a/user_guide_src/source/database/query_builder/018.php b/user_guide_src/source/database/query_builder/018.php
index 870a45e638e6..17465bd1cb43 100644
--- a/user_guide_src/source/database/query_builder/018.php
+++ b/user_guide_src/source/database/query_builder/018.php
@@ -4,6 +4,7 @@
 $builder->select('*');
 $builder->join('comments', 'comments.id = blogs.id');
 $query = $builder->get();
-
-// Produces:
-// SELECT * FROM blogs JOIN comments ON comments.id = blogs.id
+/*
+Produces:
+SELECT * FROM blogs JOIN comments ON comments.id = blogs.id
+*/
diff --git a/user_guide_src/source/database/query_builder/074.php b/user_guide_src/source/database/query_builder/074.php
index 20025bc32cee..68fbcbb0bf60 100644
--- a/user_guide_src/source/database/query_builder/074.php
+++ b/user_guide_src/source/database/query_builder/074.php
@@ -10,6 +10,7 @@
     ->groupEnd()
     ->where('d', 'd')
 ->get();
-
-// Generates:
-// SELECT * FROM (`my_table`) WHERE ( `a` = 'a' OR ( `b` = 'b' AND `c` = 'c' ) ) AND `d` = 'd'
+/*
+Generates:
+SELECT * FROM (`my_table`) WHERE ( `a` = 'a' OR ( `b` = 'b' AND `c` = 'c' ) ) AND `d` = 'd'
+*/
diff --git a/user_guide_src/source/database/query_builder/087.php b/user_guide_src/source/database/query_builder/087.php
index 1b99a6196706..3032402a7c32 100644
--- a/user_guide_src/source/database/query_builder/087.php
+++ b/user_guide_src/source/database/query_builder/087.php
@@ -8,8 +8,9 @@
 
 $builder->where('id', $id);
 $builder->update($data);
-// Produces:
-//
-// UPDATE mytable
-// SET title = '{$title}', name = '{$name}', date = '{$date}'
-// WHERE id = $id
+/*
+Produces:
+UPDATE mytable
+SET title = '{$title}', name = '{$name}', date = '{$date}'
+WHERE id = $id
+*/
diff --git a/user_guide_src/source/database/query_builder/088.php b/user_guide_src/source/database/query_builder/088.php
index c789d85e02bf..37afb6ce2b46 100644
--- a/user_guide_src/source/database/query_builder/088.php
+++ b/user_guide_src/source/database/query_builder/088.php
@@ -10,8 +10,9 @@ class Myclass
 $object = new Myclass;
 $builder->where('id', $id);
 $builder->update($object);
-// Produces:
-//
-// UPDATE `mytable`
-// SET `title` = '{$title}', `name` = '{$name}', `date` = '{$date}'
-// WHERE id = `$id`
+/*
+Produces:
+UPDATE `mytable`
+SET `title` = '{$title}', `name` = '{$name}', `date` = '{$date}'
+WHERE id = `$id`
+*/
diff --git a/user_guide_src/source/database/query_builder/091.php b/user_guide_src/source/database/query_builder/091.php
index 545641a98f74..a3943d41cfb9 100644
--- a/user_guide_src/source/database/query_builder/091.php
+++ b/user_guide_src/source/database/query_builder/091.php
@@ -14,14 +14,15 @@
 ];
 
 $builder->updateBatch($data, 'title');
-
-// Produces:
-// UPDATE `mytable` SET `name` = CASE
-// WHEN `title` = 'My title' THEN 'My Name 2'
-// WHEN `title` = 'Another title' THEN 'Another Name 2'
-// ELSE `name` END,
-// `date` = CASE
-// WHEN `title` = 'My title' THEN 'My date 2'
-// WHEN `title` = 'Another title' THEN 'Another date 2'
-// ELSE `date` END
-// WHERE `title` IN ('My title','Another title')
+/*
+Produces:
+UPDATE `mytable` SET `name` = CASE
+WHEN `title` = 'My title' THEN 'My Name 2'
+WHEN `title` = 'Another title' THEN 'Another Name 2'
+ELSE `name` END,
+`date` = CASE
+WHEN `title` = 'My title' THEN 'My date 2'
+WHEN `title` = 'Another title' THEN 'Another date 2'
+ELSE `date` END
+WHERE `title` IN ('My title','Another title')
+*/
diff --git a/user_guide_src/source/database/query_builder/092.php b/user_guide_src/source/database/query_builder/092.php
index 605d533162bd..ed680a441d98 100644
--- a/user_guide_src/source/database/query_builder/092.php
+++ b/user_guide_src/source/database/query_builder/092.php
@@ -1,4 +1,4 @@
 <?php
 
 $builder->delete(['id' => $id]);
-// Produces: // DELETE FROM mytable  // WHERE id = $id
+// Produces: DELETE FROM mytable WHERE id = $id
diff --git a/user_guide_src/source/database/query_builder/093.php b/user_guide_src/source/database/query_builder/093.php
index 6628a09b5056..70e9ed3b7f69 100644
--- a/user_guide_src/source/database/query_builder/093.php
+++ b/user_guide_src/source/database/query_builder/093.php
@@ -2,7 +2,8 @@
 
 $builder->where('id', $id);
 $builder->delete();
-
-// Produces:
-// DELETE FROM mytable
-// WHERE id = $id
+/*
+Produces:
+DELETE FROM mytable
+WHERE id = $id
+*/
diff --git a/user_guide_src/source/database/query_builder/095.php b/user_guide_src/source/database/query_builder/095.php
index 0cdf6ef52bfa..c2afc9fe3c2a 100644
--- a/user_guide_src/source/database/query_builder/095.php
+++ b/user_guide_src/source/database/query_builder/095.php
@@ -1,6 +1,7 @@
 <?php
 
 $builder->truncate();
-
-// Produce:
-// TRUNCATE mytable
+/*
+Produce:
+TRUNCATE mytable
+*/
diff --git a/user_guide_src/source/database/query_builder/097.php b/user_guide_src/source/database/query_builder/097.php
index f484292a9d27..ec48b920e406 100644
--- a/user_guide_src/source/database/query_builder/097.php
+++ b/user_guide_src/source/database/query_builder/097.php
@@ -11,6 +11,7 @@
 // ...
 
 $data = $builder->get()->getResultArray();
-
-// Would execute and return an array of results of the following query:
-// SELECT field1, field1 from mytable where field3 = 5;
+/*
+Would execute and return an array of results of the following query:
+SELECT field1, field1 from mytable where field3 = 5;
+*/
diff --git a/user_guide_src/source/dbmgmt/forge/004.php b/user_guide_src/source/dbmgmt/forge/004.php
index c514b3c0e46a..d793fd8b82d8 100644
--- a/user_guide_src/source/dbmgmt/forge/004.php
+++ b/user_guide_src/source/dbmgmt/forge/004.php
@@ -1,5 +1,7 @@
 <?php
 
 $forge->createDatabase('my_db', true);
-// gives CREATE DATABASE IF NOT EXISTS `my_db`
-// or will check if a database exists
+/*
+gives CREATE DATABASE IF NOT EXISTS `my_db`
+or will check if a database exists
+*/
diff --git a/user_guide_src/source/helpers/array_helper/011.php b/user_guide_src/source/helpers/array_helper/011.php
index 754588747d6c..31ee64387979 100644
--- a/user_guide_src/source/helpers/array_helper/011.php
+++ b/user_guide_src/source/helpers/array_helper/011.php
@@ -2,12 +2,13 @@
 
 // using the same data from above
 $flattened = array_flatten_with_dots($arrayToFlatten, 'foo_');
-
-// $flattened is now:
+/*
+$flattened is now:
 [
     'foo_personal.first_name' => 'john',
     'foo_personal.last_name'  => 'smith',
     'foo_personal.age'        => '26',
     'foo_personal.address'    => 'US',
     'foo_other_details'       => 'marines officer',
-];
+]
+*/
diff --git a/user_guide_src/source/helpers/form_helper/010.php b/user_guide_src/source/helpers/form_helper/010.php
index 8efbdfdeddf1..401a94c685b1 100644
--- a/user_guide_src/source/helpers/form_helper/010.php
+++ b/user_guide_src/source/helpers/form_helper/010.php
@@ -7,11 +7,9 @@
 ];
 
 echo form_hidden($data);
-
 /*
-    Would produce:
-
-    <input type="hidden" name="name" value="John Doe" />
-    <input type="hidden" name="email" value="john@example.com" />
-    <input type="hidden" name="url" value="http://example.com" />
+Would produce:
+<input type="hidden" name="name" value="John Doe" />
+<input type="hidden" name="email" value="john@example.com" />
+<input type="hidden" name="url" value="http://example.com" />
 */
diff --git a/user_guide_src/source/helpers/form_helper/011.php b/user_guide_src/source/helpers/form_helper/011.php
index 26641f577429..6e28c61e8352 100644
--- a/user_guide_src/source/helpers/form_helper/011.php
+++ b/user_guide_src/source/helpers/form_helper/011.php
@@ -7,11 +7,9 @@
 ];
 
 echo form_hidden('my_array', $data);
-
 /*
-    Would produce:
-
-    <input type="hidden" name="my_array[name]" value="John Doe" />
-    <input type="hidden" name="my_array[email]" value="john@example.com" />
-    <input type="hidden" name="my_array[url]" value="http://example.com" />
+Would produce:
+<input type="hidden" name="my_array[name]" value="John Doe" />
+<input type="hidden" name="my_array[email]" value="john@example.com" />
+<input type="hidden" name="my_array[url]" value="http://example.com" />
 */
diff --git a/user_guide_src/source/helpers/form_helper/012.php b/user_guide_src/source/helpers/form_helper/012.php
index 1059821da652..4b232ba110f8 100644
--- a/user_guide_src/source/helpers/form_helper/012.php
+++ b/user_guide_src/source/helpers/form_helper/012.php
@@ -9,9 +9,7 @@
 ];
 
 echo form_input($data);
-
 /*
-    Would produce:
-
-    <input type="hidden" name="email" value="john@example.com" id="hiddenemail" class="hiddenemail" />
+Would produce:
+<input type="hidden" name="email" value="john@example.com" id="hiddenemail" class="hiddenemail" />
 */
diff --git a/user_guide_src/source/helpers/form_helper/014.php b/user_guide_src/source/helpers/form_helper/014.php
index 6143aed6eaaf..cf8a20dbadff 100644
--- a/user_guide_src/source/helpers/form_helper/014.php
+++ b/user_guide_src/source/helpers/form_helper/014.php
@@ -10,9 +10,7 @@
 ];
 
 echo form_input($data);
-
 /*
-    Would produce:
-
-    <input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%" />
+Would produce:
+<input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%" />
 */
diff --git a/user_guide_src/source/helpers/form_helper/017.php b/user_guide_src/source/helpers/form_helper/017.php
index 0ec6a19ca99f..99106e9b4fa8 100644
--- a/user_guide_src/source/helpers/form_helper/017.php
+++ b/user_guide_src/source/helpers/form_helper/017.php
@@ -1,9 +1,7 @@
 <?php
 
 echo form_input('email', 'joe@example.com', ['placeholder' => 'Email Address...'], 'email');
-
 /*
-     Would produce:
-
-    <input type="email" name="email" value="joe@example.com" placeholder="Email Address..." />
+Would produce:
+<input type="email" name="email" value="joe@example.com" placeholder="Email Address..." />
 */
diff --git a/user_guide_src/source/helpers/form_helper/018.php b/user_guide_src/source/helpers/form_helper/018.php
index fc6521be6e06..6e521ed04985 100644
--- a/user_guide_src/source/helpers/form_helper/018.php
+++ b/user_guide_src/source/helpers/form_helper/018.php
@@ -9,27 +9,23 @@
 
 $shirts_on_sale = ['small', 'large'];
 echo form_dropdown('shirts', $options, 'large');
-
 /*
-    Would produce:
-
-    <select name="shirts">
-        <option value="small">Small Shirt</option>
-        <option value="med">Medium Shirt</option>
-        <option value="large" selected="selected">Large Shirt</option>
-        <option value="xlarge">Extra Large Shirt</option>
-    </select>
+Would produce:
+<select name="shirts">
+    <option value="small">Small Shirt</option>
+    <option value="med">Medium Shirt</option>
+    <option value="large" selected="selected">Large Shirt</option>
+    <option value="xlarge">Extra Large Shirt</option>
+</select>
 */
 
 echo form_dropdown('shirts', $options, $shirts_on_sale);
-
 /*
-    Would produce:
-
-    <select name="shirts" multiple="multiple">
-        <option value="small" selected="selected">Small Shirt</option>
-        <option value="med">Medium Shirt</option>
-        <option value="large" selected="selected">Large Shirt</option>
-        <option value="xlarge">Extra Large Shirt</option>
-    </select>
+Would produce:
+<select name="shirts" multiple="multiple">
+    <option value="small" selected="selected">Small Shirt</option>
+    <option value="med">Medium Shirt</option>
+    <option value="large" selected="selected">Large Shirt</option>
+    <option value="xlarge">Extra Large Shirt</option>
+</select>
 */
diff --git a/user_guide_src/source/helpers/text_helper/020.php b/user_guide_src/source/helpers/text_helper/020.php
index 1b235b77497e..4bd123f5ae8a 100644
--- a/user_guide_src/source/helpers/text_helper/020.php
+++ b/user_guide_src/source/helpers/text_helper/020.php
@@ -2,14 +2,12 @@
 
 $string = "Here is a simple string of text that will help us demonstrate this function.";
 echo word_wrap($string, 25);
-
 /*
-  Would produce:
-
-    Here is a simple string
-    of text that will help us
-    demonstrate this
-    function.
+Would produce:
+Here is a simple string
+of text that will help us
+demonstrate this
+function.
 
-  Excessively long words will be split, but URLs will not be.
+Excessively long words will be split, but URLs will not be.
 */
diff --git a/user_guide_src/source/incoming/incomingrequest/010.php b/user_guide_src/source/incoming/incomingrequest/010.php
index e223b7772d54..a1dc2ccfb9cd 100644
--- a/user_guide_src/source/incoming/incomingrequest/010.php
+++ b/user_guide_src/source/incoming/incomingrequest/010.php
@@ -1,13 +1,13 @@
 <?php
 
 /*
-    With a request body of:
-    {
-        "foo": "bar",
-        "fizz": {
-            "buzz": "baz"
-        }
+With a request body of:
+{
+    "foo": "bar",
+    "fizz": {
+        "buzz": "baz"
     }
+}
 */
 
 $data = $request->getVar('foo');
diff --git a/user_guide_src/source/libraries/curlrequest/014.php b/user_guide_src/source/libraries/curlrequest/014.php
index 9147c8861423..2f7e79cc4be7 100644
--- a/user_guide_src/source/libraries/curlrequest/014.php
+++ b/user_guide_src/source/libraries/curlrequest/014.php
@@ -1,11 +1,9 @@
 <?php
 
 $client->request('GET', 'http://example.com', ['allow_redirects' => true]);
-
 /*
-    Sets the following defaults:
-
-    'max'       => 5, // Maximum number of redirects to follow before stopping
-    'strict'    => true, // Ensure POST requests stay POST requests through redirects
-    'protocols' => ['http', 'https'] // Restrict redirects to one or more protocols
+Sets the following defaults:
+'max'       => 5, // Maximum number of redirects to follow before stopping
+'strict'    => true, // Ensure POST requests stay POST requests through redirects
+'protocols' => ['http', 'https'] // Restrict redirects to one or more protocols
 */
diff --git a/user_guide_src/source/libraries/validation/009.php b/user_guide_src/source/libraries/validation/009.php
index 8792a8a8f728..6f7ce8b9e992 100644
--- a/user_guide_src/source/libraries/validation/009.php
+++ b/user_guide_src/source/libraries/validation/009.php
@@ -1,21 +1,20 @@
 <?php
 
 /*
-    The data to test:
-
-    [
-        'contacts' => [
-           'name' => 'Joe Smith',
-            'friends' => [
-                [
-                    'name' => 'Fred Flinstone',
-                ],
-                [
-                    'name' => 'Wilma',
-                ],
-            ]
+The data to test:
+[
+    'contacts' => [
+       'name' => 'Joe Smith',
+        'friends' => [
+            [
+                'name' => 'Fred Flinstone',
+            ],
+            [
+                'name' => 'Wilma',
+            ],
         ]
     ]
+]
 */
 
 // Joe Smith
diff --git a/user_guide_src/source/libraries/validation/011.php b/user_guide_src/source/libraries/validation/011.php
index ec6b9c9adbab..fa5cad04369c 100644
--- a/user_guide_src/source/libraries/validation/011.php
+++ b/user_guide_src/source/libraries/validation/011.php
@@ -1,15 +1,14 @@
 <?php
 
 /*
-    The data to test:
-
-    [
-        'user_ids' => [
-            1,
-            2,
-            3,
-        ]
+The data to test:
+[
+    'user_ids' => [
+        1,
+        2,
+        3,
     ]
+]
 */
 
 // Rule
diff --git a/user_guide_src/source/libraries/validation/026.php b/user_guide_src/source/libraries/validation/026.php
index e633f5cdd1e3..4c27f4548b0e 100644
--- a/user_guide_src/source/libraries/validation/026.php
+++ b/user_guide_src/source/libraries/validation/026.php
@@ -1,12 +1,10 @@
 <?php
 
 $errors = $validation->getErrors();
-
 /*
-   Produces:
-
-    [
-        'field1' => 'error message',
-        'field2' => 'error message',
-    ]
+Produces:
+[
+    'field1' => 'error message',
+    'field2' => 'error message',
+]
 */
diff --git a/user_guide_src/source/libraries/validation/028.2.php b/user_guide_src/source/libraries/validation/028.2.php
index 6ad70098c789..34a4d7edefe3 100644
--- a/user_guide_src/source/libraries/validation/028.2.php
+++ b/user_guide_src/source/libraries/validation/028.2.php
@@ -1,12 +1,11 @@
 <?php
 
 /*
-    For errors:
-
-    [
-        'foo.0.bar'   => 'Error',
-        'foo.baz.bar' => 'Error',
-    ]
+For errors:
+[
+    'foo.0.bar'   => 'Error',
+    'foo.baz.bar' => 'Error',
+]
 */
 
 // returns true
diff --git a/user_guide_src/source/models/entities/021.php b/user_guide_src/source/models/entities/021.php
index 219c437b378c..ceb17247a908 100644
--- a/user_guide_src/source/models/entities/021.php
+++ b/user_guide_src/source/models/entities/021.php
@@ -11,7 +11,6 @@ public static function get($value, array $params = [])
         var_dump($params);
         /*
             Output:
-
             array(3) {
               [0]=>
               string(13) "App\SomeClass"
diff --git a/user_guide_src/source/outgoing/response/021.php b/user_guide_src/source/outgoing/response/021.php
index 092a758b18db..51abaf76bdbd 100644
--- a/user_guide_src/source/outgoing/response/021.php
+++ b/user_guide_src/source/outgoing/response/021.php
@@ -1,6 +1,7 @@
 <?php
 
 $response->noCache();
-
-// Sets the following header:
-// Cache-Control: no-store, max-age=0, no-cache
+/*
+Sets the following header:
+Cache-Control: no-store, max-age=0, no-cache
+*/
diff --git a/user_guide_src/source/outgoing/view_parser/016.php b/user_guide_src/source/outgoing/view_parser/016.php
index 0350043cf4fa..0c71e3f88fbb 100644
--- a/user_guide_src/source/outgoing/view_parser/016.php
+++ b/user_guide_src/source/outgoing/view_parser/016.php
@@ -9,8 +9,11 @@ class View extends BaseView
     public $plugins = [
         'foo' => '\Some\Class::methodName',
     ];
+
     // ...
 }
 
-// Tag is replaced by the return value of Some\Class::methodName static function.
-// {+ foo +}
+/*
+Tag is replaced by the return value of Some\Class::methodName() static function.
+{+ foo +}
+*/
diff --git a/user_guide_src/source/testing/benchmark/004.php b/user_guide_src/source/testing/benchmark/004.php
index 3048a2851ff3..32dc5df31b1a 100644
--- a/user_guide_src/source/testing/benchmark/004.php
+++ b/user_guide_src/source/testing/benchmark/004.php
@@ -1,15 +1,13 @@
 <?php
 
 $timers = $benchmark->getTimers();
-
 /*
-    Produces:
-
-    [
-        'render view'  => [
-            'start'    => 1234567890,
-            'end'      => 1345678920,
-            'duration' => 15.4315, // number of seconds
-        ]
+Produces:
+[
+    'render view'  => [
+        'start'    => 1234567890,
+        'end'      => 1345678920,
+        'duration' => 15.4315, // number of seconds
     ]
+]
 */

From 806d5726011d9dcc04fdf7ac951d5007834d7702 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 4 Mar 2022 13:50:09 +0900
Subject: [PATCH 1727/2325] docs: change comment style

---
 user_guide_src/source/cli/cli_commands/007.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/cli/cli_commands/007.php b/user_guide_src/source/cli/cli_commands/007.php
index 9f9f47f2a4fb..3365e8afdd0e 100644
--- a/user_guide_src/source/cli/cli_commands/007.php
+++ b/user_guide_src/source/cli/cli_commands/007.php
@@ -7,7 +7,7 @@
 }
 
 /*
- Output will be
- -n        Set migration namespace
- -r        override file
+Output will be:
+-n        Set migration namespace
+-r        override file
 */

From fff15ead6010363f5938bec26c3c08409fe03dd9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 4 Mar 2022 12:55:51 +0900
Subject: [PATCH 1728/2325] docs: add empty line in sample code

---
 user_guide_src/source/concepts/services/007.php          | 1 +
 user_guide_src/source/concepts/services/008.php          | 1 +
 user_guide_src/source/concepts/services/010.php          | 1 +
 user_guide_src/source/database/configuration/006.php     | 1 +
 user_guide_src/source/database/helpers/001.php           | 1 -
 user_guide_src/source/database/helpers/002.php           | 1 -
 user_guide_src/source/database/query_builder/005.php     | 1 -
 user_guide_src/source/database/query_builder/008.php     | 1 -
 user_guide_src/source/database/query_builder/016.php     | 1 -
 user_guide_src/source/database/query_builder/017.php     | 1 -
 user_guide_src/source/database/query_builder/027.php     | 2 --
 user_guide_src/source/database/query_builder/032.php     | 1 -
 user_guide_src/source/database/query_builder/034.php     | 1 -
 user_guide_src/source/database/query_builder/036.php     | 1 -
 user_guide_src/source/database/query_builder/053.php     | 1 -
 user_guide_src/source/database/query_builder/055.php     | 1 -
 user_guide_src/source/database/query_builder/057.php     | 1 -
 user_guide_src/source/database/query_builder/078.php     | 1 -
 user_guide_src/source/database/query_builder/079.php     | 2 --
 user_guide_src/source/database/query_builder/081.php     | 1 -
 user_guide_src/source/database/query_builder/098.php     | 1 -
 user_guide_src/source/extending/core_classes/002.php     | 1 +
 user_guide_src/source/general/configuration/008.php      | 1 +
 user_guide_src/source/general/logging/002.php            | 1 +
 user_guide_src/source/general/logging/003.php            | 1 +
 user_guide_src/source/general/logging/004.php            | 1 +
 user_guide_src/source/general/managing_apps/001.php      | 1 +
 user_guide_src/source/incoming/filters/003.php           | 1 +
 user_guide_src/source/incoming/filters/004.php           | 1 +
 user_guide_src/source/incoming/filters/005.php           | 1 +
 user_guide_src/source/incoming/filters/006.php           | 1 +
 user_guide_src/source/incoming/filters/007.php           | 1 +
 user_guide_src/source/incoming/filters/008.php           | 1 +
 user_guide_src/source/incoming/filters/009.php           | 1 +
 user_guide_src/source/incoming/filters/011.php           | 1 +
 user_guide_src/source/libraries/caching/013.php          | 2 ++
 user_guide_src/source/libraries/caching/014.php          | 1 +
 user_guide_src/source/libraries/curlrequest/001.php      | 1 +
 user_guide_src/source/libraries/encryption/008.php       | 1 -
 user_guide_src/source/libraries/honeypot/001.php         | 1 +
 user_guide_src/source/libraries/pagination/010.php       | 1 +
 user_guide_src/source/libraries/pagination/011.php       | 1 +
 user_guide_src/source/libraries/security/002.php         | 1 +
 user_guide_src/source/libraries/security/003.php         | 1 +
 user_guide_src/source/libraries/security/004.php         | 1 +
 user_guide_src/source/libraries/security/006.php         | 1 +
 user_guide_src/source/libraries/security/007.php         | 1 +
 user_guide_src/source/libraries/security/008.php         | 1 +
 user_guide_src/source/libraries/security/009.php         | 1 +
 user_guide_src/source/libraries/sessions/010.php         | 2 --
 user_guide_src/source/libraries/sessions/017.php         | 2 --
 user_guide_src/source/libraries/sessions/038.php         | 2 --
 user_guide_src/source/libraries/sessions/044.php         | 1 +
 user_guide_src/source/libraries/throttler/003.php        | 1 +
 user_guide_src/source/libraries/throttler/004.php        | 1 +
 user_guide_src/source/libraries/validation/003.php       | 1 +
 user_guide_src/source/libraries/validation/013.php       | 1 +
 user_guide_src/source/libraries/validation/015.php       | 2 ++
 user_guide_src/source/libraries/validation/031.php       | 1 +
 user_guide_src/source/libraries/validation/032.php       | 1 +
 user_guide_src/source/outgoing/api_responses/003.php     | 1 +
 user_guide_src/source/outgoing/api_responses/004.php     | 1 +
 user_guide_src/source/outgoing/localization/001.php      | 1 +
 user_guide_src/source/outgoing/localization/002.php      | 1 +
 user_guide_src/source/outgoing/localization/003.php      | 1 +
 user_guide_src/source/outgoing/response/011.php          | 1 +
 user_guide_src/source/outgoing/view_decorators/002.php   | 1 +
 user_guide_src/source/outgoing/view_parser/005.php       | 1 -
 user_guide_src/source/outgoing/view_parser/012.php       | 1 +
 user_guide_src/source/outgoing/view_parser/013.php       | 1 +
 user_guide_src/source/outgoing/view_parser/014.php       | 1 +
 user_guide_src/source/outgoing/view_parser/015.php       | 1 +
 user_guide_src/source/outgoing/view_parser/017.php       | 1 +
 user_guide_src/source/outgoing/view_parser/018.php       | 1 -
 user_guide_src/source/outgoing/view_parser/019.php       | 1 -
 user_guide_src/source/outgoing/view_parser/020.php       | 1 -
 user_guide_src/source/testing/controllers/012.php        | 1 +
 user_guide_src/source/testing/overview/007.php           | 1 +
 user_guide_src/source/tutorial/create_news_items/001.php | 1 +
 79 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/user_guide_src/source/concepts/services/007.php b/user_guide_src/source/concepts/services/007.php
index 298b8abd010f..296d8445fefc 100644
--- a/user_guide_src/source/concepts/services/007.php
+++ b/user_guide_src/source/concepts/services/007.php
@@ -10,5 +10,6 @@ public static function routes()
     {
         return new \App\Router\MyRouter();
     }
+
     // ...
 }
diff --git a/user_guide_src/source/concepts/services/008.php b/user_guide_src/source/concepts/services/008.php
index 52edb387792c..5843b28ab5e2 100644
--- a/user_guide_src/source/concepts/services/008.php
+++ b/user_guide_src/source/concepts/services/008.php
@@ -10,5 +10,6 @@ public static function renderer($viewPath = APPPATH . 'views/')
     {
         return new \CodeIgniter\View\View($viewPath);
     }
+
     // ...
 }
diff --git a/user_guide_src/source/concepts/services/010.php b/user_guide_src/source/concepts/services/010.php
index fd5d3f6c4e35..b74d9c470888 100644
--- a/user_guide_src/source/concepts/services/010.php
+++ b/user_guide_src/source/concepts/services/010.php
@@ -14,5 +14,6 @@ public static function routes($getShared = false)
 
         return static::getSharedInstance('routes');
     }
+
     // ...
 }
diff --git a/user_guide_src/source/database/configuration/006.php b/user_guide_src/source/database/configuration/006.php
index afc24022c199..4381a0a71fff 100644
--- a/user_guide_src/source/database/configuration/006.php
+++ b/user_guide_src/source/database/configuration/006.php
@@ -24,5 +24,6 @@ class Database extends Config
         'strictOn' => false,
         'failover' => [],
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/database/helpers/001.php b/user_guide_src/source/database/helpers/001.php
index f5dea164c946..e36a3989a74f 100644
--- a/user_guide_src/source/database/helpers/001.php
+++ b/user_guide_src/source/database/helpers/001.php
@@ -1,5 +1,4 @@
 <?php
 
 echo $db->table('my_table')->countAll();
-
 // Produces an integer, like 25
diff --git a/user_guide_src/source/database/helpers/002.php b/user_guide_src/source/database/helpers/002.php
index d43cf8dbc3bc..bca6cfe1b5a8 100644
--- a/user_guide_src/source/database/helpers/002.php
+++ b/user_guide_src/source/database/helpers/002.php
@@ -1,5 +1,4 @@
 <?php
 
 echo $db->table('my_table')->like('title', 'match')->countAllResults();
-
 // Produces an integer, like 5
diff --git a/user_guide_src/source/database/query_builder/005.php b/user_guide_src/source/database/query_builder/005.php
index 38bc63a577e7..7a33f8be2d82 100644
--- a/user_guide_src/source/database/query_builder/005.php
+++ b/user_guide_src/source/database/query_builder/005.php
@@ -2,5 +2,4 @@
 
 $sql = $builder->getCompiledSelect();
 echo $sql;
-
 // Prints string: SELECT * FROM mytable
diff --git a/user_guide_src/source/database/query_builder/008.php b/user_guide_src/source/database/query_builder/008.php
index e2b594d51865..f9ebd8650717 100644
--- a/user_guide_src/source/database/query_builder/008.php
+++ b/user_guide_src/source/database/query_builder/008.php
@@ -2,5 +2,4 @@
 
 $builder->select('title, content, date');
 $query = $builder->get();
-
 // Executes: SELECT title, content, date FROM mytable
diff --git a/user_guide_src/source/database/query_builder/016.php b/user_guide_src/source/database/query_builder/016.php
index e505681ddc57..f00c2dbe47c2 100644
--- a/user_guide_src/source/database/query_builder/016.php
+++ b/user_guide_src/source/database/query_builder/016.php
@@ -3,5 +3,4 @@
 $subquery = $db->table('users');
 $builder  = $db->table('jobs')->fromSubquery($subquery, 'alias');
 $query = $builder->get();
-
 // Produces: SELECT * FROM `jobs`, (SELECT * FROM `users`) AS `alias`
diff --git a/user_guide_src/source/database/query_builder/017.php b/user_guide_src/source/database/query_builder/017.php
index 938edc98c72c..965ae956a6af 100644
--- a/user_guide_src/source/database/query_builder/017.php
+++ b/user_guide_src/source/database/query_builder/017.php
@@ -3,5 +3,4 @@
 $subquery = $db->table('users')->select('id, name');
 $builder  = $db->newQuery()->fromSubquery($subquery, 't');
 $query = $builder->get();
-
 // Produces: SELECT * FROM (SELECT `id`, `name` FROM users) AS `t`
diff --git a/user_guide_src/source/database/query_builder/027.php b/user_guide_src/source/database/query_builder/027.php
index 7583487da1a2..043b7d9e451b 100644
--- a/user_guide_src/source/database/query_builder/027.php
+++ b/user_guide_src/source/database/query_builder/027.php
@@ -1,11 +1,9 @@
 <?php
 
 // With closure
-
 $builder->where('advance_amount <', function (BaseBuilder $builder) {
     return $builder->select('MAX(advance_amount)', false)->from('orders')->where('id >', 2);
 });
-
 // Produces: WHERE "advance_amount" < (SELECT MAX(advance_amount) FROM "orders" WHERE "id" > 2)
 
 // With builder directly
diff --git a/user_guide_src/source/database/query_builder/032.php b/user_guide_src/source/database/query_builder/032.php
index 07aee709b79c..7a7a44182396 100644
--- a/user_guide_src/source/database/query_builder/032.php
+++ b/user_guide_src/source/database/query_builder/032.php
@@ -4,7 +4,6 @@
 $builder->orWhereIn('id', function (BaseBuilder $builder) {
     return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
 });
-
 // Produces: OR "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
 
 // With builder directly
diff --git a/user_guide_src/source/database/query_builder/034.php b/user_guide_src/source/database/query_builder/034.php
index e5e366acb069..2316388e16b6 100644
--- a/user_guide_src/source/database/query_builder/034.php
+++ b/user_guide_src/source/database/query_builder/034.php
@@ -4,7 +4,6 @@
 $builder->whereNotIn('id', function (BaseBuilder $builder) {
     return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
 });
-
 // Produces: WHERE "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
 
 // With builder directly
diff --git a/user_guide_src/source/database/query_builder/036.php b/user_guide_src/source/database/query_builder/036.php
index 8b3087cac1c1..d50bcc113853 100644
--- a/user_guide_src/source/database/query_builder/036.php
+++ b/user_guide_src/source/database/query_builder/036.php
@@ -4,7 +4,6 @@
 $builder->orWhereNotIn('id', function (BaseBuilder $builder) {
     return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
 });
-
 // Produces: OR "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
 
 // With builder directly
diff --git a/user_guide_src/source/database/query_builder/053.php b/user_guide_src/source/database/query_builder/053.php
index 3bbf43645915..baa936c5df82 100644
--- a/user_guide_src/source/database/query_builder/053.php
+++ b/user_guide_src/source/database/query_builder/053.php
@@ -4,7 +4,6 @@
 $builder->orHavingIn('id', function (BaseBuilder $builder) {
     return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
 });
-
 // Produces: OR "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
 
 // With builder directly
diff --git a/user_guide_src/source/database/query_builder/055.php b/user_guide_src/source/database/query_builder/055.php
index 2c032a5b1cec..986b3ff24cb9 100644
--- a/user_guide_src/source/database/query_builder/055.php
+++ b/user_guide_src/source/database/query_builder/055.php
@@ -4,7 +4,6 @@
 $builder->havingNotIn('id', function (BaseBuilder $builder) {
     return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
 });
-
 // Produces: HAVING "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
 
 // With builder directly
diff --git a/user_guide_src/source/database/query_builder/057.php b/user_guide_src/source/database/query_builder/057.php
index 7960a3382f79..85cab6e2eba8 100644
--- a/user_guide_src/source/database/query_builder/057.php
+++ b/user_guide_src/source/database/query_builder/057.php
@@ -4,7 +4,6 @@
 $builder->orHavingNotIn('id', function (BaseBuilder $builder) {
     return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
 });
-
 // Produces: OR "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
 
 // With builder directly
diff --git a/user_guide_src/source/database/query_builder/078.php b/user_guide_src/source/database/query_builder/078.php
index e4ddf03e6732..ed0e4cb3f7a1 100644
--- a/user_guide_src/source/database/query_builder/078.php
+++ b/user_guide_src/source/database/query_builder/078.php
@@ -8,5 +8,4 @@
 
 $sql = $builder->set($data)->getCompiledInsert();
 echo $sql;
-
 // Produces string: INSERT INTO mytable (`title`, `name`, `date`) VALUES ('My title', 'My name', 'My date')
diff --git a/user_guide_src/source/database/query_builder/079.php b/user_guide_src/source/database/query_builder/079.php
index 4e095f9e0c72..1807be1d706a 100644
--- a/user_guide_src/source/database/query_builder/079.php
+++ b/user_guide_src/source/database/query_builder/079.php
@@ -1,9 +1,7 @@
 <?php
 
 echo $builder->set('title', 'My Title')->getCompiledInsert(false);
-
 // Produces string: INSERT INTO mytable (`title`) VALUES ('My Title')
 
 echo $builder->set('content', 'My Content')->getCompiledInsert();
-
 // Produces string: INSERT INTO mytable (`title`, `content`) VALUES ('My Title', 'My Content')
diff --git a/user_guide_src/source/database/query_builder/081.php b/user_guide_src/source/database/query_builder/081.php
index bb263a3b4eba..d4bd972f5830 100644
--- a/user_guide_src/source/database/query_builder/081.php
+++ b/user_guide_src/source/database/query_builder/081.php
@@ -7,5 +7,4 @@
 ];
 
 $builder->replace($data);
-
 // Executes: REPLACE INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')
diff --git a/user_guide_src/source/database/query_builder/098.php b/user_guide_src/source/database/query_builder/098.php
index e9be12b58273..a6fb3cc4beed 100644
--- a/user_guide_src/source/database/query_builder/098.php
+++ b/user_guide_src/source/database/query_builder/098.php
@@ -3,5 +3,4 @@
 $subquery = $db->table('countries')->select('name')->where('id', 1);
 $builder  = $db->table('users')->select('name')->selectSubquery($subquery, 'country');
 $query = $builder->get();
-
 // Produces: SELECT `name`, (SELECT `name` FROM `countries` WHERE `id` = 1) AS `country` FROM `users`
diff --git a/user_guide_src/source/extending/core_classes/002.php b/user_guide_src/source/extending/core_classes/002.php
index 1d0de27ee238..68d22ff508b8 100644
--- a/user_guide_src/source/extending/core_classes/002.php
+++ b/user_guide_src/source/extending/core_classes/002.php
@@ -14,5 +14,6 @@ public static function routes(bool $getShared = true)
 
         return new \App\Libraries\RouteCollection(static::locator(), config('Modules'));
     }
+
     // ...
 }
diff --git a/user_guide_src/source/general/configuration/008.php b/user_guide_src/source/general/configuration/008.php
index 86749331c9c5..752084b65072 100644
--- a/user_guide_src/source/general/configuration/008.php
+++ b/user_guide_src/source/general/configuration/008.php
@@ -7,5 +7,6 @@ class MyConfig extends BaseConfig
     public static $registrars = [
         SupportingPackageRegistrar::class,
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/general/logging/002.php b/user_guide_src/source/general/logging/002.php
index 1c27f2410126..7a1e4e97fde5 100644
--- a/user_guide_src/source/general/logging/002.php
+++ b/user_guide_src/source/general/logging/002.php
@@ -7,5 +7,6 @@
 class Logger extends BaseConfig
 {
     public $threshold = 5;
+
     // ...
 }
diff --git a/user_guide_src/source/general/logging/003.php b/user_guide_src/source/general/logging/003.php
index 170b74457967..926e04a017de 100644
--- a/user_guide_src/source/general/logging/003.php
+++ b/user_guide_src/source/general/logging/003.php
@@ -8,5 +8,6 @@ class Logger extends BaseConfig
 {
     // Log only debug and info type messages
     public $threshold = [5, 8];
+
     // ...
 }
diff --git a/user_guide_src/source/general/logging/004.php b/user_guide_src/source/general/logging/004.php
index ff5f9511d81f..7691936b3165 100644
--- a/user_guide_src/source/general/logging/004.php
+++ b/user_guide_src/source/general/logging/004.php
@@ -12,5 +12,6 @@ class Logger extends BaseConfig
             'handles' => ['critical', 'alert', 'emergency', 'debug', 'error', 'info', 'notice', 'warning'],
         ],
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/general/managing_apps/001.php b/user_guide_src/source/general/managing_apps/001.php
index 2d0690cabc41..c116317678be 100644
--- a/user_guide_src/source/general/managing_apps/001.php
+++ b/user_guide_src/source/general/managing_apps/001.php
@@ -5,5 +5,6 @@
 class Paths
 {
     public $appDirectory = '/path/to/your/app';
+
     // ...
 }
diff --git a/user_guide_src/source/incoming/filters/003.php b/user_guide_src/source/incoming/filters/003.php
index 060f5957b5cc..2e7770e88ddd 100644
--- a/user_guide_src/source/incoming/filters/003.php
+++ b/user_guide_src/source/incoming/filters/003.php
@@ -9,5 +9,6 @@ class Filters extends BaseConfig
     public $aliases = [
         'csrf' => \CodeIgniter\Filters\CSRF::class,
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/incoming/filters/004.php b/user_guide_src/source/incoming/filters/004.php
index d39de5a0bee8..c645d9f8191d 100644
--- a/user_guide_src/source/incoming/filters/004.php
+++ b/user_guide_src/source/incoming/filters/004.php
@@ -12,5 +12,6 @@ class Filters extends BaseConfig
             \App\Filters\ApiAuth::class,
         ],
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/incoming/filters/005.php b/user_guide_src/source/incoming/filters/005.php
index 55b7d1fa522b..226db2389c58 100644
--- a/user_guide_src/source/incoming/filters/005.php
+++ b/user_guide_src/source/incoming/filters/005.php
@@ -12,5 +12,6 @@ class Filters extends BaseConfig
         ],
         'after' => [],
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/incoming/filters/006.php b/user_guide_src/source/incoming/filters/006.php
index ed7ce0a8a120..bfddf66c3c4e 100644
--- a/user_guide_src/source/incoming/filters/006.php
+++ b/user_guide_src/source/incoming/filters/006.php
@@ -12,5 +12,6 @@ class Filters extends BaseConfig
         ],
         'after' => [],
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/incoming/filters/007.php b/user_guide_src/source/incoming/filters/007.php
index fa79b5bbb7c8..d7f21efa1344 100644
--- a/user_guide_src/source/incoming/filters/007.php
+++ b/user_guide_src/source/incoming/filters/007.php
@@ -12,5 +12,6 @@ class Filters extends BaseConfig
         ],
         'after' => [],
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/incoming/filters/008.php b/user_guide_src/source/incoming/filters/008.php
index a37967a538c0..1d99d0226a79 100644
--- a/user_guide_src/source/incoming/filters/008.php
+++ b/user_guide_src/source/incoming/filters/008.php
@@ -10,5 +10,6 @@ class Filters extends BaseConfig
         'post' => ['foo', 'bar'],
         'get'  => ['baz'],
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/incoming/filters/009.php b/user_guide_src/source/incoming/filters/009.php
index bfc7d6176b77..162af6dcbaec 100644
--- a/user_guide_src/source/incoming/filters/009.php
+++ b/user_guide_src/source/incoming/filters/009.php
@@ -10,5 +10,6 @@ class Filters extends BaseConfig
         'foo' => ['before' => ['admin/*'], 'after' => ['users/*']],
         'bar' => ['before' => ['api/*', 'admin/*']],
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/incoming/filters/011.php b/user_guide_src/source/incoming/filters/011.php
index 8b6e24c5fe91..fa12db31a9e7 100644
--- a/user_guide_src/source/incoming/filters/011.php
+++ b/user_guide_src/source/incoming/filters/011.php
@@ -10,5 +10,6 @@ class Filters extends BaseConfig
         // ...
         'secureheaders' => \App\Filters\SecureHeaders::class,
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/caching/013.php b/user_guide_src/source/libraries/caching/013.php
index 3dd8ff740944..84287d5e7bcb 100644
--- a/user_guide_src/source/libraries/caching/013.php
+++ b/user_guide_src/source/libraries/caching/013.php
@@ -7,11 +7,13 @@
 class Cache extends BaseConfig
 {
     // ...
+
     public $memcached = [
         'host'   => '127.0.0.1',
         'port'   => 11211,
         'weight' => 1,
         'raw'    => false,
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/caching/014.php b/user_guide_src/source/libraries/caching/014.php
index cfb6eeb6698f..6b0012696bf3 100644
--- a/user_guide_src/source/libraries/caching/014.php
+++ b/user_guide_src/source/libraries/caching/014.php
@@ -15,5 +15,6 @@ class Cache extends BaseConfig
         'timeout'  => 0,
         'database' => 0,
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/curlrequest/001.php b/user_guide_src/source/libraries/curlrequest/001.php
index 35486f4e7971..e89e0692462f 100644
--- a/user_guide_src/source/libraries/curlrequest/001.php
+++ b/user_guide_src/source/libraries/curlrequest/001.php
@@ -7,5 +7,6 @@
 class CURLRequest extends BaseConfig
 {
     public $shareOptions = false;
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/encryption/008.php b/user_guide_src/source/libraries/encryption/008.php
index 506a5d594c4e..0fe44575e8db 100644
--- a/user_guide_src/source/libraries/encryption/008.php
+++ b/user_guide_src/source/libraries/encryption/008.php
@@ -8,7 +8,6 @@ class Encryption extends BaseConfig
 {
     // In Encryption, you may use
     public $key = 'hex2bin:<your-hex-encoded-key>';
-
     // or
     public $key = 'base64:<your-base64-encoded-key>';
     // ...
diff --git a/user_guide_src/source/libraries/honeypot/001.php b/user_guide_src/source/libraries/honeypot/001.php
index 8463a919d54a..f0dbf7e64d57 100644
--- a/user_guide_src/source/libraries/honeypot/001.php
+++ b/user_guide_src/source/libraries/honeypot/001.php
@@ -16,5 +16,6 @@ class Filters extends BaseConfig
             'honeypot',
         ],
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/pagination/010.php b/user_guide_src/source/libraries/pagination/010.php
index d168163446ee..86947793c132 100644
--- a/user_guide_src/source/libraries/pagination/010.php
+++ b/user_guide_src/source/libraries/pagination/010.php
@@ -10,5 +10,6 @@ class Pager extends BaseConfig
         'default_full'   => 'CodeIgniter\Pager\Views\default_full',
         'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/pagination/011.php b/user_guide_src/source/libraries/pagination/011.php
index 4302997f8bff..6c15797754e0 100644
--- a/user_guide_src/source/libraries/pagination/011.php
+++ b/user_guide_src/source/libraries/pagination/011.php
@@ -11,5 +11,6 @@ class Pager extends BaseConfig
         'default_simple' => 'CodeIgniter\Pager\Views\default_simple',
         'front_full'     => 'App\Views\Pagers\foundation_full',
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/security/002.php b/user_guide_src/source/libraries/security/002.php
index 39df6fa8d292..d7af0b687f0b 100644
--- a/user_guide_src/source/libraries/security/002.php
+++ b/user_guide_src/source/libraries/security/002.php
@@ -7,5 +7,6 @@
 class Security extends BaseConfig
 {
     public $csrfProtection = 'session';
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/security/003.php b/user_guide_src/source/libraries/security/003.php
index 7d8b3241c285..f092196845a4 100644
--- a/user_guide_src/source/libraries/security/003.php
+++ b/user_guide_src/source/libraries/security/003.php
@@ -7,5 +7,6 @@
 class Security extends BaseConfig
 {
     public $tokenRandomize = true;
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/security/004.php b/user_guide_src/source/libraries/security/004.php
index 7187a1b523c5..ff5c6cca8b06 100644
--- a/user_guide_src/source/libraries/security/004.php
+++ b/user_guide_src/source/libraries/security/004.php
@@ -7,5 +7,6 @@
 class Security extends BaseConfig
 {
     public $regenerate = true;
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/security/006.php b/user_guide_src/source/libraries/security/006.php
index cc3ef9d162c6..9105bc43dd80 100644
--- a/user_guide_src/source/libraries/security/006.php
+++ b/user_guide_src/source/libraries/security/006.php
@@ -12,5 +12,6 @@ class Filters extends BaseConfig
             'csrf',
         ],
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/security/007.php b/user_guide_src/source/libraries/security/007.php
index 0b099addb52c..437bc7bfbead 100644
--- a/user_guide_src/source/libraries/security/007.php
+++ b/user_guide_src/source/libraries/security/007.php
@@ -11,5 +11,6 @@ class Filters extends BaseConfig
             'csrf' => ['except' => ['api/record/save']],
         ],
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/security/008.php b/user_guide_src/source/libraries/security/008.php
index 370bd2bcedad..8a4a6ef4d430 100644
--- a/user_guide_src/source/libraries/security/008.php
+++ b/user_guide_src/source/libraries/security/008.php
@@ -11,5 +11,6 @@ class Filters extends BaseConfig
             'csrf' => ['except' => ['api/record/[0-9]+']],
         ],
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/security/009.php b/user_guide_src/source/libraries/security/009.php
index d90632e53f1c..bd6bc93cfeb6 100644
--- a/user_guide_src/source/libraries/security/009.php
+++ b/user_guide_src/source/libraries/security/009.php
@@ -10,5 +10,6 @@ class Filters extends BaseConfig
         'get'  => ['csrf'],
         'post' => ['csrf'],
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/sessions/010.php b/user_guide_src/source/libraries/sessions/010.php
index fd3471eba73e..4bbbfb2646db 100644
--- a/user_guide_src/source/libraries/sessions/010.php
+++ b/user_guide_src/source/libraries/sessions/010.php
@@ -1,7 +1,5 @@
 <?php
 
 $userData = $_SESSION;
-
 // or:
-
 $userData = $session->get();
diff --git a/user_guide_src/source/libraries/sessions/017.php b/user_guide_src/source/libraries/sessions/017.php
index 66a5f8662b39..2b00df65a034 100644
--- a/user_guide_src/source/libraries/sessions/017.php
+++ b/user_guide_src/source/libraries/sessions/017.php
@@ -1,9 +1,7 @@
 <?php
 
 unset($_SESSION['some_name']);
-
 // or multiple values:
-
 unset(
     $_SESSION['some_name'],
     $_SESSION['another_name']
diff --git a/user_guide_src/source/libraries/sessions/038.php b/user_guide_src/source/libraries/sessions/038.php
index 72c7d5d07602..1e7931f34f33 100644
--- a/user_guide_src/source/libraries/sessions/038.php
+++ b/user_guide_src/source/libraries/sessions/038.php
@@ -1,7 +1,5 @@
 <?php
 
 session_destroy();
-
 // or
-
 $session->destroy();
diff --git a/user_guide_src/source/libraries/sessions/044.php b/user_guide_src/source/libraries/sessions/044.php
index 2cc31e9035db..e5fab8602236 100644
--- a/user_guide_src/source/libraries/sessions/044.php
+++ b/user_guide_src/source/libraries/sessions/044.php
@@ -9,5 +9,6 @@ class App extends BaseConfig
     // localhost will be given higher priority (5) here,
     // compared to 192.0.2.1 with a weight of 1.
     public $sessionSavePath = 'localhost:11211:5,192.0.2.1:11211:1';
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/throttler/003.php b/user_guide_src/source/libraries/throttler/003.php
index ae13441bb8ad..b365df88fa53 100644
--- a/user_guide_src/source/libraries/throttler/003.php
+++ b/user_guide_src/source/libraries/throttler/003.php
@@ -10,5 +10,6 @@ class Filters extends BaseConfig
         // ...
         'throttle' => \App\Filters\Throttle::class,
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/throttler/004.php b/user_guide_src/source/libraries/throttler/004.php
index 077cb46a66dc..ab4d91257f8f 100644
--- a/user_guide_src/source/libraries/throttler/004.php
+++ b/user_guide_src/source/libraries/throttler/004.php
@@ -9,5 +9,6 @@ class Filters extends BaseConfig
     public $methods = [
         'post' => ['throttle'],
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/validation/003.php b/user_guide_src/source/libraries/validation/003.php
index fbcbb7690260..d27270810429 100644
--- a/user_guide_src/source/libraries/validation/003.php
+++ b/user_guide_src/source/libraries/validation/003.php
@@ -10,5 +10,6 @@ class Validation
         \CodeIgniter\Validation\StrictRules\FormatRules::class,
         \CodeIgniter\Validation\StrictRules\Rules::class,
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/validation/013.php b/user_guide_src/source/libraries/validation/013.php
index 4e2982d7564f..671b5386fe98 100644
--- a/user_guide_src/source/libraries/validation/013.php
+++ b/user_guide_src/source/libraries/validation/013.php
@@ -10,5 +10,6 @@ class Validation
         'pass_confirm' => 'required|matches[password]',
         'email'        => 'required|valid_email',
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/validation/015.php b/user_guide_src/source/libraries/validation/015.php
index 46ef2c4431a1..5815abfaccf4 100644
--- a/user_guide_src/source/libraries/validation/015.php
+++ b/user_guide_src/source/libraries/validation/015.php
@@ -10,6 +10,7 @@ class Validation
         'pass_confirm' => 'required|matches[password]',
         'email'        => 'required|valid_email',
     ];
+
     public $signup_errors = [
         'username' => [
             'required' => 'You must choose a username.',
@@ -18,5 +19,6 @@ class Validation
             'valid_email' => 'Please check the Email field. It does not appear to be valid.',
         ],
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/validation/031.php b/user_guide_src/source/libraries/validation/031.php
index 7ed5d307b0e2..acec3cfc6ba2 100644
--- a/user_guide_src/source/libraries/validation/031.php
+++ b/user_guide_src/source/libraries/validation/031.php
@@ -9,5 +9,6 @@ class Validation
         'single'  => 'CodeIgniter\Validation\Views\single',
         'my_list' => '_errors_list',
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/validation/032.php b/user_guide_src/source/libraries/validation/032.php
index 5f16ca283c1e..890b4c453fc0 100644
--- a/user_guide_src/source/libraries/validation/032.php
+++ b/user_guide_src/source/libraries/validation/032.php
@@ -15,5 +15,6 @@ class Validation
         FileRules::class,
         CreditCardRules::class,
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/outgoing/api_responses/003.php b/user_guide_src/source/outgoing/api_responses/003.php
index eebb83c43fc1..6e99762ccaed 100644
--- a/user_guide_src/source/outgoing/api_responses/003.php
+++ b/user_guide_src/source/outgoing/api_responses/003.php
@@ -10,5 +10,6 @@ class Format extends BaseConfig
         'application/json',
         'application/xml',
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/outgoing/api_responses/004.php b/user_guide_src/source/outgoing/api_responses/004.php
index 57532911f13b..713d1b314dce 100644
--- a/user_guide_src/source/outgoing/api_responses/004.php
+++ b/user_guide_src/source/outgoing/api_responses/004.php
@@ -10,5 +10,6 @@ class Format extends BaseConfig
         'application/json' => \CodeIgniter\Format\JSONFormatter::class,
         'application/xml'  => \CodeIgniter\Format\XMLFormatter::class,
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/outgoing/localization/001.php b/user_guide_src/source/outgoing/localization/001.php
index ebc1e57ef45c..6978e6fb35e7 100644
--- a/user_guide_src/source/outgoing/localization/001.php
+++ b/user_guide_src/source/outgoing/localization/001.php
@@ -7,5 +7,6 @@
 class App extends BaseConfig
 {
     public $defaultLocale = 'en';
+
     // ...
 }
diff --git a/user_guide_src/source/outgoing/localization/002.php b/user_guide_src/source/outgoing/localization/002.php
index 6a0cce0ea027..bb4941fd2c14 100644
--- a/user_guide_src/source/outgoing/localization/002.php
+++ b/user_guide_src/source/outgoing/localization/002.php
@@ -7,5 +7,6 @@
 class App extends BaseConfig
 {
     public $negotiateLocale = true;
+
     // ...
 }
diff --git a/user_guide_src/source/outgoing/localization/003.php b/user_guide_src/source/outgoing/localization/003.php
index 81aa073152a0..36ccb2344557 100644
--- a/user_guide_src/source/outgoing/localization/003.php
+++ b/user_guide_src/source/outgoing/localization/003.php
@@ -7,5 +7,6 @@
 class App extends BaseConfig
 {
     public $supportedLocales = ['en', 'es', 'fr-FR'];
+
     // ...
 }
diff --git a/user_guide_src/source/outgoing/response/011.php b/user_guide_src/source/outgoing/response/011.php
index 2ad152a51755..4a21b5c29078 100644
--- a/user_guide_src/source/outgoing/response/011.php
+++ b/user_guide_src/source/outgoing/response/011.php
@@ -7,5 +7,6 @@
 class App extends BaseConfig
 {
     public $CSPEnabled = true;
+
     // ...
 }
diff --git a/user_guide_src/source/outgoing/view_decorators/002.php b/user_guide_src/source/outgoing/view_decorators/002.php
index 6bd050126f90..ba56ea1e80ad 100644
--- a/user_guide_src/source/outgoing/view_decorators/002.php
+++ b/user_guide_src/source/outgoing/view_decorators/002.php
@@ -9,5 +9,6 @@ class View extends BaseView
     public array $decorators = [
         'App\Views\Decorators\MyDecorator',
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/outgoing/view_parser/005.php b/user_guide_src/source/outgoing/view_parser/005.php
index 6681b588d74e..e77c54268648 100644
--- a/user_guide_src/source/outgoing/view_parser/005.php
+++ b/user_guide_src/source/outgoing/view_parser/005.php
@@ -4,5 +4,4 @@
 $data     = ['blog_title' => 'My ramblings'];
 
 echo $parser->setData($data)->renderString($template);
-
 // Result: <head><title>My ramblings</title></head>
diff --git a/user_guide_src/source/outgoing/view_parser/012.php b/user_guide_src/source/outgoing/view_parser/012.php
index a006a51d5c33..000642837149 100644
--- a/user_guide_src/source/outgoing/view_parser/012.php
+++ b/user_guide_src/source/outgoing/view_parser/012.php
@@ -10,5 +10,6 @@ class View extends BaseView
         'abs'        => '\CodeIgniter\View\Filters::abs',
         'capitalize' => '\CodeIgniter\View\Filters::capitalize',
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/outgoing/view_parser/013.php b/user_guide_src/source/outgoing/view_parser/013.php
index c45a72b89bde..e5546bdda272 100644
--- a/user_guide_src/source/outgoing/view_parser/013.php
+++ b/user_guide_src/source/outgoing/view_parser/013.php
@@ -9,5 +9,6 @@ class View extends BaseView
     public $filters = [
         'str_repeat' => '\str_repeat',
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/outgoing/view_parser/014.php b/user_guide_src/source/outgoing/view_parser/014.php
index 866a547e3b28..5153c4ee6757 100644
--- a/user_guide_src/source/outgoing/view_parser/014.php
+++ b/user_guide_src/source/outgoing/view_parser/014.php
@@ -9,5 +9,6 @@ class View extends BaseView
     public $plugins = [
         'foo' => '\Some\Class::methodName',
     ];
+
     // ...
 }
diff --git a/user_guide_src/source/outgoing/view_parser/015.php b/user_guide_src/source/outgoing/view_parser/015.php
index ecfafffbf97a..e499e9805416 100644
--- a/user_guide_src/source/outgoing/view_parser/015.php
+++ b/user_guide_src/source/outgoing/view_parser/015.php
@@ -16,5 +16,6 @@ public function __construct()
 
         parent::__construct();
     }
+
     // ...
 }
diff --git a/user_guide_src/source/outgoing/view_parser/017.php b/user_guide_src/source/outgoing/view_parser/017.php
index 1042665a0fcf..d9427bde4bf4 100644
--- a/user_guide_src/source/outgoing/view_parser/017.php
+++ b/user_guide_src/source/outgoing/view_parser/017.php
@@ -9,6 +9,7 @@ class View extends BaseView
     public $plugins = [
         'foo' => ['\Some\Class::methodName'],
     ];
+
     // ...
 }
 
diff --git a/user_guide_src/source/outgoing/view_parser/018.php b/user_guide_src/source/outgoing/view_parser/018.php
index cd9ca09109b9..64101a6a8cfa 100644
--- a/user_guide_src/source/outgoing/view_parser/018.php
+++ b/user_guide_src/source/outgoing/view_parser/018.php
@@ -8,5 +8,4 @@
 ];
 echo $parser->setData($data)
             ->renderString($template);
-
 // Result: Hello, John Doe
diff --git a/user_guide_src/source/outgoing/view_parser/019.php b/user_guide_src/source/outgoing/view_parser/019.php
index dfce0c26ccb4..2570076b3018 100644
--- a/user_guide_src/source/outgoing/view_parser/019.php
+++ b/user_guide_src/source/outgoing/view_parser/019.php
@@ -8,5 +8,4 @@
 ];
 echo $parser->setData($data)
             ->renderString($template);
-
 // Result: Hello, John {initials} Doe
diff --git a/user_guide_src/source/outgoing/view_parser/020.php b/user_guide_src/source/outgoing/view_parser/020.php
index 371fa9a21f14..a7966a9c2bfd 100644
--- a/user_guide_src/source/outgoing/view_parser/020.php
+++ b/user_guide_src/source/outgoing/view_parser/020.php
@@ -12,5 +12,4 @@
 ];
 echo $parser->setData($data)
             ->renderString($template);
-
 // Result: Hello, John Doe (Mr{degree} {/degrees})
diff --git a/user_guide_src/source/testing/controllers/012.php b/user_guide_src/source/testing/controllers/012.php
index 620bdb363c6e..e94476c6364a 100644
--- a/user_guide_src/source/testing/controllers/012.php
+++ b/user_guide_src/source/testing/controllers/012.php
@@ -15,5 +15,6 @@ protected function testFilterFailsOnAdminRoute()
 
         $this->assertHasFilters('unfiltered/route', 'before');
     }
+
     // ...
 }
diff --git a/user_guide_src/source/testing/overview/007.php b/user_guide_src/source/testing/overview/007.php
index dec488ef2e5e..6193eb88bf50 100644
--- a/user_guide_src/source/testing/overview/007.php
+++ b/user_guide_src/source/testing/overview/007.php
@@ -7,6 +7,7 @@ protected function setUpAuthTrait()
         $user = $this->createFakeUser();
         $this->logInUser($user);
     }
+
     // ...
 }
 
diff --git a/user_guide_src/source/tutorial/create_news_items/001.php b/user_guide_src/source/tutorial/create_news_items/001.php
index c63e033af0bf..4e6615b6bbda 100644
--- a/user_guide_src/source/tutorial/create_news_items/001.php
+++ b/user_guide_src/source/tutorial/create_news_items/001.php
@@ -9,5 +9,6 @@ class Filters extends BaseConfig
     public $methods = [
         'post' => ['csrf'],
     ];
+
     // ...
 }

From 2854d99655d74450bb23d66daf78a42e724d36b8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 4 Mar 2022 17:00:23 +0900
Subject: [PATCH 1729/2325] docs: change comment style to `*` each line

---
 .../source/cli/cli_commands/007.php           |  9 +++---
 user_guide_src/source/cli/cli_library/007.php | 15 ++++-----
 user_guide_src/source/cli/cli_library/008.php | 15 ++++-----
 .../source/database/query_builder/003.php     |  6 ++--
 .../source/database/query_builder/006.php     | 10 +++---
 .../source/database/query_builder/018.php     |  6 ++--
 .../source/database/query_builder/074.php     |  6 ++--
 .../source/database/query_builder/087.php     | 10 +++---
 .../source/database/query_builder/088.php     | 10 +++---
 .../source/database/query_builder/091.php     | 22 ++++++-------
 .../source/database/query_builder/093.php     |  8 ++---
 .../source/database/query_builder/095.php     |  6 ++--
 .../source/database/query_builder/097.php     |  6 ++--
 user_guide_src/source/dbmgmt/forge/004.php    |  6 ++--
 .../source/helpers/array_helper/011.php       | 18 +++++------
 .../source/helpers/form_helper/010.php        | 10 +++---
 .../source/helpers/form_helper/011.php        | 10 +++---
 .../source/helpers/form_helper/012.php        |  6 ++--
 .../source/helpers/form_helper/014.php        |  6 ++--
 .../source/helpers/form_helper/017.php        |  6 ++--
 .../source/helpers/form_helper/018.php        | 32 +++++++++----------
 .../source/helpers/text_helper/020.php        | 16 +++++-----
 .../source/incoming/controllers/005.php       |  5 ++-
 .../source/incoming/incomingrequest/010.php   | 16 +++++-----
 .../source/incoming/incomingrequest/013.php   | 13 ++++----
 .../source/incoming/incomingrequest/015.php   | 15 ++++-----
 .../source/incoming/message/003.php           | 27 +++++++---------
 .../source/incoming/message/005.php           |  7 ++--
 .../source/libraries/curlrequest/014.php      | 10 +++---
 user_guide_src/source/libraries/uri/026.php   | 15 ++++-----
 .../source/libraries/validation/009.php       | 30 ++++++++---------
 .../source/libraries/validation/011.php       | 18 +++++------
 .../source/libraries/validation/026.php       | 12 +++----
 .../source/libraries/validation/028.2.php     | 12 +++----
 user_guide_src/source/models/entities/021.php | 20 ++++++------
 .../source/outgoing/response/021.php          |  6 ++--
 .../source/outgoing/view_parser/016.php       |  6 ++--
 .../source/testing/benchmark/004.php          | 18 +++++------
 .../source/testing/response/030.php           | 17 ++++------
 .../source/testing/response/032.php           | 11 +++----
 40 files changed, 241 insertions(+), 256 deletions(-)

diff --git a/user_guide_src/source/cli/cli_commands/007.php b/user_guide_src/source/cli/cli_commands/007.php
index 3365e8afdd0e..76150e4d4e5c 100644
--- a/user_guide_src/source/cli/cli_commands/007.php
+++ b/user_guide_src/source/cli/cli_commands/007.php
@@ -5,9 +5,8 @@
 foreach ($this->options as $option => $description) {
     CLI::write($tab . CLI::color(str_pad($option, $pad), 'green') . $description, 'yellow');
 }
-
 /*
-Output will be:
--n        Set migration namespace
--r        override file
-*/
+ * Output will be:
+ * -n        Set migration namespace
+ * -r        override file
+ */
diff --git a/user_guide_src/source/cli/cli_library/007.php b/user_guide_src/source/cli/cli_library/007.php
index 6d77ee91e4a0..0c9d257b1ecd 100644
--- a/user_guide_src/source/cli/cli_library/007.php
+++ b/user_guide_src/source/cli/cli_library/007.php
@@ -1,12 +1,11 @@
 <?php
 
 $fruit = CLI::promptByKey('These are your choices:', ['The red apple', 'The plump orange', 'The ripe banana']);
-
 /*
-These are your choices:
-  [0]  The red apple
-  [1]  The plump orange
-  [2]  The ripe banana
-
-[0, 1, 2]:
-*/
+ * These are your choices:
+ *   [0]  The red apple
+ *   [1]  The plump orange
+ *   [2]  The ripe banana
+ *
+ * [0, 1, 2]:
+ */
diff --git a/user_guide_src/source/cli/cli_library/008.php b/user_guide_src/source/cli/cli_library/008.php
index b455b7efe22e..ab2d1fcd1fea 100644
--- a/user_guide_src/source/cli/cli_library/008.php
+++ b/user_guide_src/source/cli/cli_library/008.php
@@ -5,12 +5,11 @@
     'orange' => 'The plump orange',
     'banana' => 'The ripe banana'
 ]);
-
 /*
-These are your choices:
-  [apple]   The red apple
-  [orange]  The plump orange
-  [banana]  The ripe banana
-
-Which would you like? [apple, orange, banana]:
-*/
+ * These are your choices:
+ *   [apple]   The red apple
+ *   [orange]  The plump orange
+ *   [banana]  The ripe banana
+ *
+ * Which would you like? [apple, orange, banana]:
+ */
diff --git a/user_guide_src/source/database/query_builder/003.php b/user_guide_src/source/database/query_builder/003.php
index b5300a358280..faad112895ba 100644
--- a/user_guide_src/source/database/query_builder/003.php
+++ b/user_guide_src/source/database/query_builder/003.php
@@ -2,6 +2,6 @@
 
 $query = $builder->get(10, 20);
 /*
-Executes: SELECT * FROM mytable LIMIT 20, 10
-(in MySQL. Other databases have slightly different syntax)
-*/
+ * Executes: SELECT * FROM mytable LIMIT 20, 10
+ * (in MySQL. Other databases have slightly different syntax)
+ */
diff --git a/user_guide_src/source/database/query_builder/006.php b/user_guide_src/source/database/query_builder/006.php
index 2d672d5ce9ce..78a92e7b7b9d 100644
--- a/user_guide_src/source/database/query_builder/006.php
+++ b/user_guide_src/source/database/query_builder/006.php
@@ -2,11 +2,11 @@
 
 echo $builder->limit(10,20)->getCompiledSelect(false);
 /*
-Prints string: SELECT * FROM mytable LIMIT 20, 10
-(in MySQL. Other databases have slightly different syntax)
-*/
+ * Prints string: SELECT * FROM mytable LIMIT 20, 10
+ * (in MySQL. Other databases have slightly different syntax)
+ */
 
 echo $builder->select('title, content, date')->getCompiledSelect();
 /*
-Prints string: SELECT title, content, date FROM mytable LIMIT 20, 10
-*/
+ * Prints string: SELECT title, content, date FROM mytable LIMIT 20, 10
+ */
diff --git a/user_guide_src/source/database/query_builder/018.php b/user_guide_src/source/database/query_builder/018.php
index 17465bd1cb43..159f88e4a984 100644
--- a/user_guide_src/source/database/query_builder/018.php
+++ b/user_guide_src/source/database/query_builder/018.php
@@ -5,6 +5,6 @@
 $builder->join('comments', 'comments.id = blogs.id');
 $query = $builder->get();
 /*
-Produces:
-SELECT * FROM blogs JOIN comments ON comments.id = blogs.id
-*/
+ * Produces:
+ * SELECT * FROM blogs JOIN comments ON comments.id = blogs.id
+ */
diff --git a/user_guide_src/source/database/query_builder/074.php b/user_guide_src/source/database/query_builder/074.php
index 68fbcbb0bf60..d858451993a2 100644
--- a/user_guide_src/source/database/query_builder/074.php
+++ b/user_guide_src/source/database/query_builder/074.php
@@ -11,6 +11,6 @@
     ->where('d', 'd')
 ->get();
 /*
-Generates:
-SELECT * FROM (`my_table`) WHERE ( `a` = 'a' OR ( `b` = 'b' AND `c` = 'c' ) ) AND `d` = 'd'
-*/
+ * Generates:
+ * SELECT * FROM (`my_table`) WHERE ( `a` = 'a' OR ( `b` = 'b' AND `c` = 'c' ) ) AND `d` = 'd'
+ */
diff --git a/user_guide_src/source/database/query_builder/087.php b/user_guide_src/source/database/query_builder/087.php
index 3032402a7c32..7869b4b4d966 100644
--- a/user_guide_src/source/database/query_builder/087.php
+++ b/user_guide_src/source/database/query_builder/087.php
@@ -9,8 +9,8 @@
 $builder->where('id', $id);
 $builder->update($data);
 /*
-Produces:
-UPDATE mytable
-SET title = '{$title}', name = '{$name}', date = '{$date}'
-WHERE id = $id
-*/
+ * Produces:
+ * UPDATE mytable
+ * SET title = '{$title}', name = '{$name}', date = '{$date}'
+ * WHERE id = $id
+ */
diff --git a/user_guide_src/source/database/query_builder/088.php b/user_guide_src/source/database/query_builder/088.php
index 37afb6ce2b46..ce38024e558d 100644
--- a/user_guide_src/source/database/query_builder/088.php
+++ b/user_guide_src/source/database/query_builder/088.php
@@ -11,8 +11,8 @@ class Myclass
 $builder->where('id', $id);
 $builder->update($object);
 /*
-Produces:
-UPDATE `mytable`
-SET `title` = '{$title}', `name` = '{$name}', `date` = '{$date}'
-WHERE id = `$id`
-*/
+ * Produces:
+ * UPDATE `mytable`
+ * SET `title` = '{$title}', `name` = '{$name}', `date` = '{$date}'
+ * WHERE id = `$id`
+ */
diff --git a/user_guide_src/source/database/query_builder/091.php b/user_guide_src/source/database/query_builder/091.php
index a3943d41cfb9..56f04036cd6f 100644
--- a/user_guide_src/source/database/query_builder/091.php
+++ b/user_guide_src/source/database/query_builder/091.php
@@ -15,14 +15,14 @@
 
 $builder->updateBatch($data, 'title');
 /*
-Produces:
-UPDATE `mytable` SET `name` = CASE
-WHEN `title` = 'My title' THEN 'My Name 2'
-WHEN `title` = 'Another title' THEN 'Another Name 2'
-ELSE `name` END,
-`date` = CASE
-WHEN `title` = 'My title' THEN 'My date 2'
-WHEN `title` = 'Another title' THEN 'Another date 2'
-ELSE `date` END
-WHERE `title` IN ('My title','Another title')
-*/
+ * Produces:
+ * UPDATE `mytable` SET `name` = CASE
+ * WHEN `title` = 'My title' THEN 'My Name 2'
+ * WHEN `title` = 'Another title' THEN 'Another Name 2'
+ * ELSE `name` END,
+ * `date` = CASE
+ * WHEN `title` = 'My title' THEN 'My date 2'
+ * WHEN `title` = 'Another title' THEN 'Another date 2'
+ * ELSE `date` END
+ * WHERE `title` IN ('My title','Another title')
+ */
diff --git a/user_guide_src/source/database/query_builder/093.php b/user_guide_src/source/database/query_builder/093.php
index 70e9ed3b7f69..f1ba27e29ef2 100644
--- a/user_guide_src/source/database/query_builder/093.php
+++ b/user_guide_src/source/database/query_builder/093.php
@@ -3,7 +3,7 @@
 $builder->where('id', $id);
 $builder->delete();
 /*
-Produces:
-DELETE FROM mytable
-WHERE id = $id
-*/
+ * Produces:
+ * DELETE FROM mytable
+ * WHERE id = $id
+ */
diff --git a/user_guide_src/source/database/query_builder/095.php b/user_guide_src/source/database/query_builder/095.php
index c2afc9fe3c2a..a6c0ab4fc069 100644
--- a/user_guide_src/source/database/query_builder/095.php
+++ b/user_guide_src/source/database/query_builder/095.php
@@ -2,6 +2,6 @@
 
 $builder->truncate();
 /*
-Produce:
-TRUNCATE mytable
-*/
+ * Produce:
+ * TRUNCATE mytable
+ */
diff --git a/user_guide_src/source/database/query_builder/097.php b/user_guide_src/source/database/query_builder/097.php
index ec48b920e406..30c4d0c4526a 100644
--- a/user_guide_src/source/database/query_builder/097.php
+++ b/user_guide_src/source/database/query_builder/097.php
@@ -12,6 +12,6 @@
 
 $data = $builder->get()->getResultArray();
 /*
-Would execute and return an array of results of the following query:
-SELECT field1, field1 from mytable where field3 = 5;
-*/
+ * Would execute and return an array of results of the following query:
+ * SELECT field1, field1 from mytable where field3 = 5;
+ */
diff --git a/user_guide_src/source/dbmgmt/forge/004.php b/user_guide_src/source/dbmgmt/forge/004.php
index d793fd8b82d8..6c44a8e553a0 100644
--- a/user_guide_src/source/dbmgmt/forge/004.php
+++ b/user_guide_src/source/dbmgmt/forge/004.php
@@ -2,6 +2,6 @@
 
 $forge->createDatabase('my_db', true);
 /*
-gives CREATE DATABASE IF NOT EXISTS `my_db`
-or will check if a database exists
-*/
+ * gives CREATE DATABASE IF NOT EXISTS `my_db`
+ * or will check if a database exists
+ */
diff --git a/user_guide_src/source/helpers/array_helper/011.php b/user_guide_src/source/helpers/array_helper/011.php
index 31ee64387979..c80dc01e0caa 100644
--- a/user_guide_src/source/helpers/array_helper/011.php
+++ b/user_guide_src/source/helpers/array_helper/011.php
@@ -3,12 +3,12 @@
 // using the same data from above
 $flattened = array_flatten_with_dots($arrayToFlatten, 'foo_');
 /*
-$flattened is now:
-[
-    'foo_personal.first_name' => 'john',
-    'foo_personal.last_name'  => 'smith',
-    'foo_personal.age'        => '26',
-    'foo_personal.address'    => 'US',
-    'foo_other_details'       => 'marines officer',
-]
-*/
+ * $flattened is now:
+ * [
+ *     'foo_personal.first_name' => 'john',
+ *     'foo_personal.last_name'  => 'smith',
+ *     'foo_personal.age'        => '26',
+ *     'foo_personal.address'    => 'US',
+ *     'foo_other_details'       => 'marines officer',
+ * ]
+ */
diff --git a/user_guide_src/source/helpers/form_helper/010.php b/user_guide_src/source/helpers/form_helper/010.php
index 401a94c685b1..4edb9a0922c6 100644
--- a/user_guide_src/source/helpers/form_helper/010.php
+++ b/user_guide_src/source/helpers/form_helper/010.php
@@ -8,8 +8,8 @@
 
 echo form_hidden($data);
 /*
-Would produce:
-<input type="hidden" name="name" value="John Doe" />
-<input type="hidden" name="email" value="john@example.com" />
-<input type="hidden" name="url" value="http://example.com" />
-*/
+ * Would produce:
+ * <input type="hidden" name="name" value="John Doe" />
+ * <input type="hidden" name="email" value="john@example.com" />
+ * <input type="hidden" name="url" value="http://example.com" />
+ */
diff --git a/user_guide_src/source/helpers/form_helper/011.php b/user_guide_src/source/helpers/form_helper/011.php
index 6e28c61e8352..472793162640 100644
--- a/user_guide_src/source/helpers/form_helper/011.php
+++ b/user_guide_src/source/helpers/form_helper/011.php
@@ -8,8 +8,8 @@
 
 echo form_hidden('my_array', $data);
 /*
-Would produce:
-<input type="hidden" name="my_array[name]" value="John Doe" />
-<input type="hidden" name="my_array[email]" value="john@example.com" />
-<input type="hidden" name="my_array[url]" value="http://example.com" />
-*/
+ * Would produce:
+ * <input type="hidden" name="my_array[name]" value="John Doe" />
+ * <input type="hidden" name="my_array[email]" value="john@example.com" />
+ * <input type="hidden" name="my_array[url]" value="http://example.com" />
+ */
diff --git a/user_guide_src/source/helpers/form_helper/012.php b/user_guide_src/source/helpers/form_helper/012.php
index 4b232ba110f8..2d781ad3effd 100644
--- a/user_guide_src/source/helpers/form_helper/012.php
+++ b/user_guide_src/source/helpers/form_helper/012.php
@@ -10,6 +10,6 @@
 
 echo form_input($data);
 /*
-Would produce:
-<input type="hidden" name="email" value="john@example.com" id="hiddenemail" class="hiddenemail" />
-*/
+ * Would produce:
+ * <input type="hidden" name="email" value="john@example.com" id="hiddenemail" class="hiddenemail" />
+ */
diff --git a/user_guide_src/source/helpers/form_helper/014.php b/user_guide_src/source/helpers/form_helper/014.php
index cf8a20dbadff..d194b318d2dd 100644
--- a/user_guide_src/source/helpers/form_helper/014.php
+++ b/user_guide_src/source/helpers/form_helper/014.php
@@ -11,6 +11,6 @@
 
 echo form_input($data);
 /*
-Would produce:
-<input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%" />
-*/
+ * Would produce:
+ * <input type="text" name="username" value="johndoe" id="username" maxlength="100" size="50" style="width:50%" />
+ */
diff --git a/user_guide_src/source/helpers/form_helper/017.php b/user_guide_src/source/helpers/form_helper/017.php
index 99106e9b4fa8..fb73d427ba63 100644
--- a/user_guide_src/source/helpers/form_helper/017.php
+++ b/user_guide_src/source/helpers/form_helper/017.php
@@ -2,6 +2,6 @@
 
 echo form_input('email', 'joe@example.com', ['placeholder' => 'Email Address...'], 'email');
 /*
-Would produce:
-<input type="email" name="email" value="joe@example.com" placeholder="Email Address..." />
-*/
+ * Would produce:
+ * <input type="email" name="email" value="joe@example.com" placeholder="Email Address..." />
+ */
diff --git a/user_guide_src/source/helpers/form_helper/018.php b/user_guide_src/source/helpers/form_helper/018.php
index 6e521ed04985..9177e4d3435d 100644
--- a/user_guide_src/source/helpers/form_helper/018.php
+++ b/user_guide_src/source/helpers/form_helper/018.php
@@ -10,22 +10,22 @@
 $shirts_on_sale = ['small', 'large'];
 echo form_dropdown('shirts', $options, 'large');
 /*
-Would produce:
-<select name="shirts">
-    <option value="small">Small Shirt</option>
-    <option value="med">Medium Shirt</option>
-    <option value="large" selected="selected">Large Shirt</option>
-    <option value="xlarge">Extra Large Shirt</option>
-</select>
-*/
+ * Would produce:
+ * <select name="shirts">
+ *     <option value="small">Small Shirt</option>
+ *     <option value="med">Medium Shirt</option>
+ *     <option value="large" selected="selected">Large Shirt</option>
+ *     <option value="xlarge">Extra Large Shirt</option>
+ * </select>
+ */
 
 echo form_dropdown('shirts', $options, $shirts_on_sale);
 /*
-Would produce:
-<select name="shirts" multiple="multiple">
-    <option value="small" selected="selected">Small Shirt</option>
-    <option value="med">Medium Shirt</option>
-    <option value="large" selected="selected">Large Shirt</option>
-    <option value="xlarge">Extra Large Shirt</option>
-</select>
-*/
+ * Would produce:
+ * <select name="shirts" multiple="multiple">
+ *     <option value="small" selected="selected">Small Shirt</option>
+ *     <option value="med">Medium Shirt</option>
+ *     <option value="large" selected="selected">Large Shirt</option>
+ *     <option value="xlarge">Extra Large Shirt</option>
+ * </select>
+ */
diff --git a/user_guide_src/source/helpers/text_helper/020.php b/user_guide_src/source/helpers/text_helper/020.php
index 4bd123f5ae8a..2a4f595f3655 100644
--- a/user_guide_src/source/helpers/text_helper/020.php
+++ b/user_guide_src/source/helpers/text_helper/020.php
@@ -3,11 +3,11 @@
 $string = "Here is a simple string of text that will help us demonstrate this function.";
 echo word_wrap($string, 25);
 /*
-Would produce:
-Here is a simple string
-of text that will help us
-demonstrate this
-function.
-
-Excessively long words will be split, but URLs will not be.
-*/
+ * Would produce:
+ * Here is a simple string
+ * of text that will help us
+ * demonstrate this
+ * function.
+ *
+ * Excessively long words will be split, but URLs will not be.
+ */
diff --git a/user_guide_src/source/incoming/controllers/005.php b/user_guide_src/source/incoming/controllers/005.php
index 84b910be2507..efaecbb8f400 100644
--- a/user_guide_src/source/incoming/controllers/005.php
+++ b/user_guide_src/source/incoming/controllers/005.php
@@ -1,9 +1,8 @@
 <?php
 
 /*
-  Folder and file structure:
-
-  \<NamespaceName>(\<SubNamespaceNames>)*\<ClassName>
+ * Folder and file structure:
+ * \<NamespaceName>(\<SubNamespaceNames>)*\<ClassName>
  */
 
 $routes->get('helloworld', '\App\Controllers\HelloWorld::index');
diff --git a/user_guide_src/source/incoming/incomingrequest/010.php b/user_guide_src/source/incoming/incomingrequest/010.php
index a1dc2ccfb9cd..a199c91bffe2 100644
--- a/user_guide_src/source/incoming/incomingrequest/010.php
+++ b/user_guide_src/source/incoming/incomingrequest/010.php
@@ -1,14 +1,14 @@
 <?php
 
 /*
-With a request body of:
-{
-    "foo": "bar",
-    "fizz": {
-        "buzz": "baz"
-    }
-}
-*/
+ * With a request body of:
+ * {
+ *     "foo": "bar",
+ *     "fizz": {
+ *         "buzz": "baz"
+ *     }
+ * }
+ */
 
 $data = $request->getVar('foo');
 // $data = "bar"
diff --git a/user_guide_src/source/incoming/incomingrequest/013.php b/user_guide_src/source/incoming/incomingrequest/013.php
index bdb8b43b5206..483662cbfaf7 100644
--- a/user_guide_src/source/incoming/incomingrequest/013.php
+++ b/user_guide_src/source/incoming/incomingrequest/013.php
@@ -3,10 +3,9 @@
 var_dump($request->getRawInput());
 
 /*
-    Outputs:
-
-    [
-        'Param1' => 'Value1',
-        'Param2' => 'Value2',
-    ]
-*/
+ * Outputs:
+ * [
+ *     'Param1' => 'Value1',
+ *     'Param2' => 'Value2',
+ * ]
+ */
diff --git a/user_guide_src/source/incoming/incomingrequest/015.php b/user_guide_src/source/incoming/incomingrequest/015.php
index 95d483206211..81043ae80587 100644
--- a/user_guide_src/source/incoming/incomingrequest/015.php
+++ b/user_guide_src/source/incoming/incomingrequest/015.php
@@ -3,11 +3,10 @@
 var_dump($request->headers());
 
 /*
-    Outputs:
-
-    [
-        'Host'          => CodeIgniter\HTTP\Header,
-        'Cache-Control' => CodeIgniter\HTTP\Header,
-        'Accept'        => CodeIgniter\HTTP\Header,
-    ]
-*/
+ * Outputs:
+ * [
+ *     'Host'          => CodeIgniter\HTTP\Header,
+ *     'Cache-Control' => CodeIgniter\HTTP\Header,
+ *     'Accept'        => CodeIgniter\HTTP\Header,
+ * ]
+ */
diff --git a/user_guide_src/source/incoming/message/003.php b/user_guide_src/source/incoming/message/003.php
index 41aa837fb49f..9d51f9a183ab 100644
--- a/user_guide_src/source/incoming/message/003.php
+++ b/user_guide_src/source/incoming/message/003.php
@@ -1,25 +1,22 @@
 <?php
 
 echo $message->header('Accept-Language');
-
 /*
-    Outputs something like:
-    'Accept-Language: en,en-US'
-*/
+ * Outputs something like:
+ * 'Accept-Language: en,en-US'
+ */
 
 echo $message->header('Accept-Language')->getValue();
-
 /*
-    Outputs something like:
-    [
-        'en',
-        'en-US'
-    ]
-*/
+ * Outputs something like:
+ * [
+ *     'en',
+ *     'en-US',
+ * ]
+ */
 
 echo $message->header('Accept-Language')->getValueLine();
-
 /*
-    Outputs something like:
-   'en,en-US'
-*/
+ * Outputs something like:
+ * en,en-US'
+ */
diff --git a/user_guide_src/source/incoming/message/005.php b/user_guide_src/source/incoming/message/005.php
index b67851a9258a..5c450073a340 100644
--- a/user_guide_src/source/incoming/message/005.php
+++ b/user_guide_src/source/incoming/message/005.php
@@ -1,8 +1,7 @@
 <?php
 
 echo $message->getHeaderLine('Accept-Language');
-
 /*
-    Outputs:
-    'en,en-US'
-*/
+ * Outputs:
+ * 'en,en-US'
+ */
diff --git a/user_guide_src/source/libraries/curlrequest/014.php b/user_guide_src/source/libraries/curlrequest/014.php
index 2f7e79cc4be7..410ed9980e34 100644
--- a/user_guide_src/source/libraries/curlrequest/014.php
+++ b/user_guide_src/source/libraries/curlrequest/014.php
@@ -2,8 +2,8 @@
 
 $client->request('GET', 'http://example.com', ['allow_redirects' => true]);
 /*
-Sets the following defaults:
-'max'       => 5, // Maximum number of redirects to follow before stopping
-'strict'    => true, // Ensure POST requests stay POST requests through redirects
-'protocols' => ['http', 'https'] // Restrict redirects to one or more protocols
-*/
+ * Sets the following defaults:
+ * 'max'       => 5, // Maximum number of redirects to follow before stopping
+ * 'strict'    => true, // Ensure POST requests stay POST requests through redirects
+ * 'protocols' => ['http', 'https'] // Restrict redirects to one or more protocols
+ */
diff --git a/user_guide_src/source/libraries/uri/026.php b/user_guide_src/source/libraries/uri/026.php
index 60c076bc13cf..f2d8bb72553f 100644
--- a/user_guide_src/source/libraries/uri/026.php
+++ b/user_guide_src/source/libraries/uri/026.php
@@ -3,11 +3,10 @@
 $segments = $uri->getSegments();
 
 /*
-    Produces:
-
-    [
-        0 => 'users',
-        1 => '15',
-        2 => 'profile',
-    ]
-*/
+ * Produces:
+ * [
+ *     0 => 'users',
+ *     1 => '15',
+ *     2 => 'profile',
+ * ]
+ */
diff --git a/user_guide_src/source/libraries/validation/009.php b/user_guide_src/source/libraries/validation/009.php
index 6f7ce8b9e992..58f0749a0c5d 100644
--- a/user_guide_src/source/libraries/validation/009.php
+++ b/user_guide_src/source/libraries/validation/009.php
@@ -1,21 +1,21 @@
 <?php
 
 /*
-The data to test:
-[
-    'contacts' => [
-       'name' => 'Joe Smith',
-        'friends' => [
-            [
-                'name' => 'Fred Flinstone',
-            ],
-            [
-                'name' => 'Wilma',
-            ],
-        ]
-    ]
-]
-*/
+ * The data to test:
+ * [
+ *     'contacts' => [
+ *        'name' => 'Joe Smith',
+ *         'friends' => [
+ *             [
+ *                 'name' => 'Fred Flinstone',
+ *             ],
+ *             [
+ *                 'name' => 'Wilma',
+ *             ],
+ *         ]
+ *     ]
+ * ]
+ */
 
 // Joe Smith
 $validation->setRules([
diff --git a/user_guide_src/source/libraries/validation/011.php b/user_guide_src/source/libraries/validation/011.php
index fa5cad04369c..2754c41ac933 100644
--- a/user_guide_src/source/libraries/validation/011.php
+++ b/user_guide_src/source/libraries/validation/011.php
@@ -1,15 +1,15 @@
 <?php
 
 /*
-The data to test:
-[
-    'user_ids' => [
-        1,
-        2,
-        3,
-    ]
-]
-*/
+ * The data to test:
+ * [
+ *     'user_ids' => [
+ *         1,
+ *         2,
+ *         3,
+ *     ]
+ * ]
+ */
 
 // Rule
 $validation->setRules([
diff --git a/user_guide_src/source/libraries/validation/026.php b/user_guide_src/source/libraries/validation/026.php
index 4c27f4548b0e..4488f2a6be57 100644
--- a/user_guide_src/source/libraries/validation/026.php
+++ b/user_guide_src/source/libraries/validation/026.php
@@ -2,9 +2,9 @@
 
 $errors = $validation->getErrors();
 /*
-Produces:
-[
-    'field1' => 'error message',
-    'field2' => 'error message',
-]
-*/
+ * Produces:
+ * [
+ *     'field1' => 'error message',
+ *     'field2' => 'error message',
+ * ]
+ */
diff --git a/user_guide_src/source/libraries/validation/028.2.php b/user_guide_src/source/libraries/validation/028.2.php
index 34a4d7edefe3..5470a1eecea6 100644
--- a/user_guide_src/source/libraries/validation/028.2.php
+++ b/user_guide_src/source/libraries/validation/028.2.php
@@ -1,12 +1,12 @@
 <?php
 
 /*
-For errors:
-[
-    'foo.0.bar'   => 'Error',
-    'foo.baz.bar' => 'Error',
-]
-*/
+ * For errors:
+ * [
+ *     'foo.0.bar'   => 'Error',
+ *     'foo.baz.bar' => 'Error',
+ * ]
+ */
 
 // returns true
 $validation->hasError('foo.*.bar');
diff --git a/user_guide_src/source/models/entities/021.php b/user_guide_src/source/models/entities/021.php
index ceb17247a908..1ea3a26de623 100644
--- a/user_guide_src/source/models/entities/021.php
+++ b/user_guide_src/source/models/entities/021.php
@@ -10,15 +10,15 @@ public static function get($value, array $params = [])
     {
         var_dump($params);
         /*
-            Output:
-            array(3) {
-              [0]=>
-              string(13) "App\SomeClass"
-              [1]=>
-              string(6) "param2"
-              [2]=>
-              string(6) "param3"
-            }
-        */
+         * Output:
+         * array(3) {
+         *   [0]=>
+         *   string(13) "App\SomeClass"
+         *   [1]=>
+         *   string(6) "param2"
+         *   [2]=>
+         *   string(6) "param3"
+         * }
+         */
     }
 }
diff --git a/user_guide_src/source/outgoing/response/021.php b/user_guide_src/source/outgoing/response/021.php
index 51abaf76bdbd..d5275cfb734e 100644
--- a/user_guide_src/source/outgoing/response/021.php
+++ b/user_guide_src/source/outgoing/response/021.php
@@ -2,6 +2,6 @@
 
 $response->noCache();
 /*
-Sets the following header:
-Cache-Control: no-store, max-age=0, no-cache
-*/
+ * Sets the following header:
+ * Cache-Control: no-store, max-age=0, no-cache
+ */
diff --git a/user_guide_src/source/outgoing/view_parser/016.php b/user_guide_src/source/outgoing/view_parser/016.php
index 0c71e3f88fbb..5120c1eebf27 100644
--- a/user_guide_src/source/outgoing/view_parser/016.php
+++ b/user_guide_src/source/outgoing/view_parser/016.php
@@ -14,6 +14,6 @@ class View extends BaseView
 }
 
 /*
-Tag is replaced by the return value of Some\Class::methodName() static function.
-{+ foo +}
-*/
+ * Tag is replaced by the return value of Some\Class::methodName() static function.
+ * {+ foo +}
+ */
diff --git a/user_guide_src/source/testing/benchmark/004.php b/user_guide_src/source/testing/benchmark/004.php
index 32dc5df31b1a..8a5c4d248837 100644
--- a/user_guide_src/source/testing/benchmark/004.php
+++ b/user_guide_src/source/testing/benchmark/004.php
@@ -2,12 +2,12 @@
 
 $timers = $benchmark->getTimers();
 /*
-Produces:
-[
-    'render view'  => [
-        'start'    => 1234567890,
-        'end'      => 1345678920,
-        'duration' => 15.4315, // number of seconds
-    ]
-]
-*/
+ * Produces:
+ * [
+ *     'render view'  => [
+ *         'start'    => 1234567890,
+ *         'end'      => 1345678920,
+ *         'duration' => 15.4315, // number of seconds
+ *     ]
+ * ]
+ */
diff --git a/user_guide_src/source/testing/response/030.php b/user_guide_src/source/testing/response/030.php
index 060f5c551a87..47e480c6081f 100644
--- a/user_guide_src/source/testing/response/030.php
+++ b/user_guide_src/source/testing/response/030.php
@@ -1,17 +1,14 @@
 <?php
 
 /*
-    Response body is this:
-
-    ['foo' => 'bar']
-*/
+ * Response body is this:
+ * ['foo' => 'bar']
+ */
 
 $json = $result->getJSON();
-
 /*
-    $json is this:
-
-    {
-        "foo": "bar"
-    }
+ * $json is this:
+ * {
+ *     "foo": "bar"
+ * }
 `*/
diff --git a/user_guide_src/source/testing/response/032.php b/user_guide_src/source/testing/response/032.php
index 6de63a9cfce8..14f13f1942f5 100644
--- a/user_guide_src/source/testing/response/032.php
+++ b/user_guide_src/source/testing/response/032.php
@@ -1,12 +1,11 @@
 <?php
 
 /*
-    Response body is this:
-
-    [
-        'config' => ['key-a', 'key-b'],
-    ]
-*/
+ * Response body is this:
+ * [
+ *     'config' => ['key-a', 'key-b'],
+ * ]
+ */
 
 // Is true
 $result->assertJSONFragment(['config' => ['key-a']]);

From a1e4f09527bb8b484e1a55a3b53e7319bb425316 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 4 Mar 2022 19:11:27 +0900
Subject: [PATCH 1730/2325] docs: fix parent classname

---
 user_guide_src/source/outgoing/localization/005.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/outgoing/localization/005.php b/user_guide_src/source/outgoing/localization/005.php
index be23e05fac89..fa115d6cf3db 100644
--- a/user_guide_src/source/outgoing/localization/005.php
+++ b/user_guide_src/source/outgoing/localization/005.php
@@ -2,7 +2,7 @@
 
 namespace App\Controllers;
 
-class UserController extends \Controller
+class UserController extends BaseController
 {
     public function index()
     {

From 3ef6925e4f9fc7424e0f12b11bb0fa361457715d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 4 Mar 2022 19:11:49 +0900
Subject: [PATCH 1731/2325] docs: add return type void

---
 user_guide_src/source/testing/database/002.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/testing/database/002.php b/user_guide_src/source/testing/database/002.php
index 4702f22d35ba..4b75aa739784 100644
--- a/user_guide_src/source/testing/database/002.php
+++ b/user_guide_src/source/testing/database/002.php
@@ -9,14 +9,14 @@ class MyTests extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
         // Do something here....
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();
 

From 861f5100c89daa7c7b5a2332b68e8bec79b0cd4c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 5 Mar 2022 08:37:53 +0900
Subject: [PATCH 1732/2325] docs: run php-cs-fixer

php-cs-fixer fix --verbose --diff --config=.user-guide.php-cs-fixer.dist.php
---
 user_guide_src/source/cli/cli_library/004.php |  2 +-
 user_guide_src/source/cli/cli_library/008.php |  4 +--
 user_guide_src/source/cli/cli_library/013.php |  2 +-
 user_guide_src/source/cli/cli_library/015.php |  2 +-
 user_guide_src/source/cli/cli_library/021.php |  2 +-
 .../source/concepts/autoloader/003.php        |  2 +-
 .../source/database/call_function/004.php     |  2 +-
 .../source/database/configuration/001.php     |  2 +-
 .../source/database/configuration/005.php     |  2 +-
 .../source/database/examples/006.php          |  2 +-
 .../source/database/examples/008.php          |  2 +-
 .../source/database/metadata/007.php          |  2 +-
 .../source/database/queries/003.php           |  4 +--
 .../source/database/queries/009.php           |  2 +-
 .../source/database/queries/011.php           |  2 +-
 .../source/database/queries/012.php           |  2 +-
 .../source/database/queries/013.php           |  2 +-
 .../source/database/queries/014.php           |  2 +-
 .../source/database/queries/016.php           |  4 +--
 .../source/database/queries/017.php           |  4 +--
 .../source/database/queries/018.php           |  4 +--
 .../source/database/queries/019.php           |  4 +--
 .../source/database/query_builder/006.php     |  6 ++--
 .../source/database/query_builder/016.php     |  2 +-
 .../source/database/query_builder/017.php     |  2 +-
 .../source/database/query_builder/026.php     |  2 +-
 .../source/database/query_builder/027.php     |  4 +--
 .../source/database/query_builder/030.php     |  4 +--
 .../source/database/query_builder/032.php     |  4 +--
 .../source/database/query_builder/034.php     |  4 +--
 .../source/database/query_builder/036.php     |  4 +--
 .../source/database/query_builder/044.php     |  2 +-
 .../source/database/query_builder/045.php     |  2 +-
 .../source/database/query_builder/047.php     |  2 +-
 .../source/database/query_builder/049.php     |  4 +--
 .../source/database/query_builder/051.php     |  4 +--
 .../source/database/query_builder/053.php     |  6 ++--
 .../source/database/query_builder/055.php     |  6 ++--
 .../source/database/query_builder/057.php     |  6 ++--
 .../source/database/query_builder/074.php     | 12 +++----
 .../source/database/query_builder/076.php     |  2 +-
 .../source/database/query_builder/086.php     |  2 +-
 .../source/database/query_builder/088.php     |  2 +-
 .../source/database/query_builder/089.php     |  2 +-
 .../source/database/query_builder/091.php     | 20 ++++++------
 .../source/database/query_builder/096.php     |  6 ++--
 .../source/database/query_builder/097.php     |  6 ++--
 .../source/database/query_builder/098.php     |  2 +-
 .../source/database/results/001.php           |  2 +-
 .../source/database/results/002.php           |  2 +-
 .../source/database/results/003.php           |  2 +-
 .../source/database/results/004.php           |  2 +-
 .../source/database/results/005.php           |  2 +-
 .../source/database/results/007.php           |  4 +--
 .../source/database/results/008.php           |  2 +-
 .../source/database/results/010.php           |  2 +-
 .../source/database/results/011.php           |  7 ++--
 .../source/database/results/013.php           |  4 +--
 .../source/database/results/014.php           |  2 +-
 .../source/database/results/015.php           |  2 +-
 .../source/database/utilities/001.php         |  6 ++--
 user_guide_src/source/dbmgmt/forge/007.php    | 32 +++++++++----------
 user_guide_src/source/dbmgmt/forge/022.php    |  2 +-
 user_guide_src/source/dbmgmt/forge/023.php    |  4 +--
 .../source/dbmgmt/migration/001.php           |  4 +--
 .../source/dbmgmt/migration/002.php           |  2 +-
 .../source/dbmgmt/migration/005.php           |  3 +-
 user_guide_src/source/dbmgmt/seeds/001.php    |  4 +--
 .../source/extending/events/002.php           |  3 +-
 .../source/extending/events/006.php           |  2 +-
 .../source/general/common_functions/001.php   |  2 +-
 .../source/general/common_functions/008.php   |  4 +--
 .../source/general/configuration/006.php      |  4 +--
 .../source/general/configuration/009.php      |  4 +--
 .../source/general/configuration/011.php      |  2 +-
 user_guide_src/source/general/errors/001.php  |  2 +-
 user_guide_src/source/general/errors/002.php  |  2 +-
 user_guide_src/source/general/helpers/005.php |  2 +-
 user_guide_src/source/general/logging/005.php |  4 +--
 user_guide_src/source/general/modules/001.php |  2 +-
 user_guide_src/source/general/modules/002.php |  2 +-
 user_guide_src/source/general/modules/003.php |  2 +-
 user_guide_src/source/general/modules/004.php |  2 +-
 user_guide_src/source/general/modules/007.php |  2 +-
 .../source/helpers/array_helper/002.php       |  4 +--
 .../source/helpers/array_helper/008.php       |  6 ++--
 .../source/helpers/filesystem_helper/010.php  |  2 +-
 .../source/helpers/filesystem_helper/011.php  |  2 +-
 .../source/helpers/form_helper/020.php        |  2 +-
 .../source/helpers/form_helper/022.php        |  4 +--
 .../source/helpers/form_helper/025.php        |  2 +-
 .../source/helpers/form_helper/029.php        |  2 +-
 .../source/helpers/form_helper/031.php        |  2 +-
 .../source/helpers/html_helper/011.php        |  2 +-
 .../source/helpers/html_helper/013.php        |  8 ++---
 .../source/helpers/html_helper/014.php        | 17 +++++-----
 .../source/helpers/html_helper/017.php        |  2 +-
 .../source/helpers/text_helper/006.php        |  2 +-
 .../source/helpers/text_helper/007.php        |  4 +--
 .../source/helpers/text_helper/008.php        |  2 +-
 .../source/helpers/text_helper/009.php        |  4 +--
 .../source/helpers/text_helper/010.php        |  4 +--
 .../source/helpers/text_helper/011.php        |  2 +-
 .../source/helpers/text_helper/012.php        |  2 +-
 .../source/helpers/text_helper/013.php        |  2 +-
 .../source/helpers/text_helper/014.php        |  2 +-
 .../source/helpers/text_helper/019.php        |  4 +--
 .../source/helpers/text_helper/020.php        |  2 +-
 .../source/incoming/filters/001.php           |  2 +-
 .../source/incoming/incomingrequest/007.php   |  2 +-
 .../source/incoming/incomingrequest/018.php   |  2 +-
 .../source/incoming/incomingrequest/019.php   |  2 +-
 .../source/incoming/restful/001.php           | 14 ++++----
 .../source/incoming/restful/002.php           |  2 +-
 .../source/incoming/restful/003.php           |  2 +-
 .../source/incoming/restful/009.php           | 16 +++++-----
 .../source/incoming/restful/011.php           |  2 +-
 .../source/incoming/restful/015.php           |  1 -
 .../source/incoming/routing/002.php           |  2 +-
 .../source/incoming/routing/016.php           |  2 +-
 .../source/incoming/routing/019.php           |  2 +-
 .../source/incoming/routing/020.php           |  2 +-
 .../source/incoming/routing/021.php           |  2 +-
 .../source/incoming/routing/022.php           |  4 +--
 .../source/incoming/routing/024.php           |  2 +-
 .../source/incoming/routing/025.php           |  2 +-
 .../source/incoming/routing/026.php           |  2 +-
 .../source/incoming/routing/029.php           |  2 +-
 .../source/incoming/routing/030.php           |  2 +-
 .../source/incoming/routing/032.php           |  2 +-
 .../source/incoming/routing/033.php           |  2 +-
 .../source/incoming/routing/047.php           |  3 +-
 .../installation/troubleshooting/001.php      |  4 +--
 .../installation/upgrade_database/002.php     |  6 ++--
 .../installation/upgrade_encryption/002.php   |  2 +-
 .../installation/upgrade_file_upload/002.php  |  8 ++---
 .../installation/upgrade_localization/001.php |  4 +--
 .../installation/upgrade_validations/001.php  |  2 +-
 .../installation/upgrade_view_parser/002.php  |  2 +-
 .../source/libraries/cookies/003.php          |  2 +-
 .../source/libraries/curlrequest/003.php      |  2 +-
 .../source/libraries/curlrequest/010.php      |  2 +-
 .../source/libraries/curlrequest/015.php      |  2 +-
 .../source/libraries/curlrequest/017.php      |  2 +-
 user_guide_src/source/libraries/email/013.php |  5 ++-
 user_guide_src/source/libraries/email/022.php |  2 +-
 .../source/libraries/encryption/002.php       |  2 +-
 .../source/libraries/encryption/005.php       |  2 +-
 user_guide_src/source/libraries/files/004.php |  2 +-
 .../source/libraries/images/011.php           |  2 +-
 .../source/libraries/images/014.php           |  2 +-
 .../source/libraries/pagination/005.php       |  2 +-
 .../source/libraries/publisher/005.php        |  3 +-
 .../source/libraries/publisher/009.php        |  2 --
 .../source/libraries/publisher/010.php        |  1 +
 .../source/libraries/sessions/014.php         |  2 +-
 .../source/libraries/sessions/016.php         |  2 +-
 .../source/libraries/sessions/029.php         |  4 +--
 user_guide_src/source/libraries/time/030.php  |  2 +-
 .../source/libraries/uploaded_files/002.php   |  7 ++--
 .../source/libraries/uploaded_files/009.php   |  2 +-
 user_guide_src/source/libraries/uri/023.php   |  2 +-
 .../source/libraries/validation/002.php       |  2 +-
 .../source/libraries/validation/004.php       |  2 +-
 .../source/libraries/validation/021.php       |  2 +-
 .../source/libraries/validation/023.php       |  5 +--
 .../source/libraries/validation/024.php       |  5 +--
 .../source/libraries/validation/025.php       |  3 +-
 .../source/libraries/validation/030.php       |  2 +-
 .../source/libraries/validation/033.php       |  2 +-
 .../source/libraries/validation/036.php       |  4 +--
 .../source/libraries/validation/037.php       |  8 ++---
 user_guide_src/source/models/entities/003.php |  2 +-
 user_guide_src/source/models/entities/017.php |  2 +-
 user_guide_src/source/models/model/001.php    |  2 +-
 user_guide_src/source/models/model/007.php    |  2 +-
 user_guide_src/source/models/model/010.php    |  2 +-
 user_guide_src/source/models/model/012.php    |  2 +-
 user_guide_src/source/models/model/018.php    |  2 +-
 user_guide_src/source/models/model/020.php    |  4 +--
 user_guide_src/source/models/model/022.php    |  2 +-
 user_guide_src/source/models/model/024.php    |  2 +-
 user_guide_src/source/models/model/028.php    |  2 +-
 user_guide_src/source/models/model/029.php    |  2 +-
 user_guide_src/source/models/model/030.php    |  2 +-
 user_guide_src/source/models/model/039.php    |  4 +--
 user_guide_src/source/models/model/042.php    |  4 +--
 user_guide_src/source/models/model/045.php    |  4 +--
 user_guide_src/source/models/model/049.php    |  2 +-
 .../source/outgoing/api_responses/007.php     |  1 +
 .../source/outgoing/api_responses/008.php     |  1 +
 .../source/outgoing/api_responses/009.php     |  1 +
 .../source/outgoing/localization/007.php      |  2 +-
 .../source/outgoing/localization/012.php      |  2 +-
 .../source/outgoing/response/003.php          |  2 +-
 .../source/outgoing/response/004.php          |  2 +-
 .../source/outgoing/response/005.php          |  2 +-
 .../source/outgoing/response/007.php          |  1 +
 .../source/outgoing/response/010.php          |  2 +-
 .../source/outgoing/response/013.php          |  2 +-
 .../source/outgoing/response/016.php          |  2 +-
 .../source/outgoing/response/023.php          | 16 +++++-----
 user_guide_src/source/outgoing/table/005.php  |  2 +-
 user_guide_src/source/outgoing/table/006.php  | 32 +++++++++----------
 user_guide_src/source/outgoing/table/007.php  |  2 +-
 user_guide_src/source/outgoing/table/008.php  |  2 +-
 user_guide_src/source/outgoing/table/016.php  |  2 +-
 user_guide_src/source/outgoing/table/017.php  |  2 +-
 .../source/outgoing/view_parser/003.php       |  2 +-
 .../source/outgoing/view_parser/006.php       |  2 +-
 .../source/outgoing/view_parser/007.php       |  4 +--
 .../source/outgoing/view_parser/008.php       |  2 +-
 .../source/outgoing/view_parser/010.php       |  4 +--
 .../source/outgoing/view_parser/011.php       |  2 +-
 .../source/outgoing/view_parser/015.php       |  4 +--
 .../source/outgoing/view_parser/018.php       |  6 ++--
 .../source/outgoing/view_parser/019.php       |  4 +--
 .../source/outgoing/view_parser/020.php       |  4 +--
 .../source/outgoing/view_parser/021.php       | 10 +++---
 .../source/outgoing/view_parser/025.php       |  2 +-
 .../source/outgoing/view_parser/026.php       |  2 +-
 .../source/outgoing/view_renderer/003.php     |  4 +--
 .../source/outgoing/view_renderer/007.php     |  2 +-
 .../source/outgoing/view_renderer/008.php     |  2 +-
 .../source/testing/benchmark/007.php          |  6 ++--
 .../source/testing/controllers/001.php        |  5 +--
 .../source/testing/controllers/002.php        |  9 +++---
 .../source/testing/controllers/004.php        |  2 +-
 .../source/testing/controllers/005.php        |  6 ++--
 .../source/testing/controllers/006.php        |  4 +--
 .../source/testing/controllers/007.php        |  4 +--
 .../source/testing/controllers/008.php        |  6 ++--
 .../source/testing/controllers/009.php        |  4 +--
 .../source/testing/controllers/010.php        |  4 +--
 .../source/testing/database/002.php           |  4 +--
 .../source/testing/database/003.php           |  2 +-
 .../source/testing/debugging/006.php          |  2 +-
 .../source/testing/fabricator/009.php         | 12 +++----
 .../source/testing/fabricator/012.php         | 16 +++++-----
 .../source/testing/fabricator/016.php         | 24 +++++++-------
 .../source/testing/fabricator/018.php         | 24 +++++++-------
 user_guide_src/source/testing/feature/001.php |  3 +-
 user_guide_src/source/testing/feature/002.php |  2 +-
 .../source/testing/overview/009.php           |  2 +-
 .../source/testing/overview/010.php           |  2 +-
 .../source/testing/overview/011.php           |  2 +-
 246 files changed, 442 insertions(+), 464 deletions(-)

diff --git a/user_guide_src/source/cli/cli_library/004.php b/user_guide_src/source/cli/cli_library/004.php
index 10a92407bcbd..7fae108cd3e7 100644
--- a/user_guide_src/source/cli/cli_library/004.php
+++ b/user_guide_src/source/cli/cli_library/004.php
@@ -1,3 +1,3 @@
 <?php
 
-$overwrite = CLI::prompt('File exists. Overwrite?', ['y','n']);
+$overwrite = CLI::prompt('File exists. Overwrite?', ['y', 'n']);
diff --git a/user_guide_src/source/cli/cli_library/008.php b/user_guide_src/source/cli/cli_library/008.php
index ab2d1fcd1fea..c1d434b77960 100644
--- a/user_guide_src/source/cli/cli_library/008.php
+++ b/user_guide_src/source/cli/cli_library/008.php
@@ -1,9 +1,9 @@
 <?php
 
 $fruit = CLI::promptByKey(['These are your choices:', 'Which would you like?'], [
-    'apple' => 'The red apple',
+    'apple'  => 'The red apple',
     'orange' => 'The plump orange',
-    'banana' => 'The ripe banana'
+    'banana' => 'The ripe banana',
 ]);
 /*
  * These are your choices:
diff --git a/user_guide_src/source/cli/cli_library/013.php b/user_guide_src/source/cli/cli_library/013.php
index cfbeb34a3ffa..64c5ad14f457 100644
--- a/user_guide_src/source/cli/cli_library/013.php
+++ b/user_guide_src/source/cli/cli_library/013.php
@@ -1,3 +1,3 @@
 <?php
 
-CLI::write("fileA \t". CLI::color('/path/to/file', 'white'), 'yellow');
+CLI::write("fileA \t" . CLI::color('/path/to/file', 'white'), 'yellow');
diff --git a/user_guide_src/source/cli/cli_library/015.php b/user_guide_src/source/cli/cli_library/015.php
index c43abc860710..6eaf10f9c1e0 100644
--- a/user_guide_src/source/cli/cli_library/015.php
+++ b/user_guide_src/source/cli/cli_library/015.php
@@ -1,4 +1,4 @@
 <?php
 
 CLI::color("task1\t", 'yellow');
-CLI::wrap("Some long description goes here that might be longer than the current window.");
+CLI::wrap('Some long description goes here that might be longer than the current window.');
diff --git a/user_guide_src/source/cli/cli_library/021.php b/user_guide_src/source/cli/cli_library/021.php
index 54c25fca5c42..899d7eaecb8c 100644
--- a/user_guide_src/source/cli/cli_library/021.php
+++ b/user_guide_src/source/cli/cli_library/021.php
@@ -3,7 +3,7 @@
 $thead = ['ID', 'Title', 'Updated At', 'Active'];
 $tbody = [
     [7, 'A great item title', '2017-11-15 10:35:02', 1],
-    [8, 'Another great item title', '2017-11-16 13:46:54', 0]
+    [8, 'Another great item title', '2017-11-16 13:46:54', 0],
 ];
 
 CLI::table($tbody, $thead);
diff --git a/user_guide_src/source/concepts/autoloader/003.php b/user_guide_src/source/concepts/autoloader/003.php
index 43fc56c171e0..af05ce2bea37 100644
--- a/user_guide_src/source/concepts/autoloader/003.php
+++ b/user_guide_src/source/concepts/autoloader/003.php
@@ -1,5 +1,5 @@
 <?php
 
 $classmap = [
-    'Markdown' => APPPATH . 'third_party/markdown.php'
+    'Markdown' => APPPATH . 'third_party/markdown.php',
 ];
diff --git a/user_guide_src/source/database/call_function/004.php b/user_guide_src/source/database/call_function/004.php
index 2739752f852d..0a8afc4199ef 100644
--- a/user_guide_src/source/database/call_function/004.php
+++ b/user_guide_src/source/database/call_function/004.php
@@ -1,5 +1,5 @@
 <?php
 
-$query = $db->query("SOME QUERY");
+$query = $db->query('SOME QUERY');
 
 $query->resultID;
diff --git a/user_guide_src/source/database/configuration/001.php b/user_guide_src/source/database/configuration/001.php
index 5631cf7faede..eae7a19f2dab 100644
--- a/user_guide_src/source/database/configuration/001.php
+++ b/user_guide_src/source/database/configuration/001.php
@@ -24,6 +24,6 @@ class Database extends Config
         'strictOn' => false,
         'failover' => [],
     ];
-    
+
     // ...
 }
diff --git a/user_guide_src/source/database/configuration/005.php b/user_guide_src/source/database/configuration/005.php
index acc4a7b8db70..7e2da93f95d3 100644
--- a/user_guide_src/source/database/configuration/005.php
+++ b/user_guide_src/source/database/configuration/005.php
@@ -32,5 +32,5 @@
         'encrypt'  => false,
         'compress' => false,
         'strictOn' => false,
-    ]
+    ],
 ];
diff --git a/user_guide_src/source/database/examples/006.php b/user_guide_src/source/database/examples/006.php
index 1f7ac810d441..5f8843348c60 100644
--- a/user_guide_src/source/database/examples/006.php
+++ b/user_guide_src/source/database/examples/006.php
@@ -1,5 +1,5 @@
 <?php
 
-$sql = "INSERT INTO mytable (title, name) VALUES (".$db->escape($title).", ".$db->escape($name).")";
+$sql = 'INSERT INTO mytable (title, name) VALUES (' . $db->escape($title) . ', ' . $db->escape($name) . ')';
 $db->query($sql);
 echo $db->affectedRows();
diff --git a/user_guide_src/source/database/examples/008.php b/user_guide_src/source/database/examples/008.php
index 00ed0b27dbfc..76e35e0e0932 100644
--- a/user_guide_src/source/database/examples/008.php
+++ b/user_guide_src/source/database/examples/008.php
@@ -3,7 +3,7 @@
 $data = [
     'title' => $title,
     'name'  => $name,
-    'date'  => $date
+    'date'  => $date,
 ];
 
 $db->table('mytable')->insert($data);
diff --git a/user_guide_src/source/database/metadata/007.php b/user_guide_src/source/database/metadata/007.php
index fdac8c74ffec..2c68fc14b5f4 100644
--- a/user_guide_src/source/database/metadata/007.php
+++ b/user_guide_src/source/database/metadata/007.php
@@ -1,4 +1,4 @@
 <?php
 
-$query  = $db->query("YOUR QUERY");
+$query  = $db->query('YOUR QUERY');
 $fields = $query->fieldData();
diff --git a/user_guide_src/source/database/queries/003.php b/user_guide_src/source/database/queries/003.php
index 9980b5d1701e..f414f829b39e 100644
--- a/user_guide_src/source/database/queries/003.php
+++ b/user_guide_src/source/database/queries/003.php
@@ -1,7 +1,7 @@
 <?php
 
 if ($db->simpleQuery('YOUR QUERY')) {
-    echo "Success!";
+    echo 'Success!';
 } else {
-    echo "Query failed!";
+    echo 'Query failed!';
 }
diff --git a/user_guide_src/source/database/queries/009.php b/user_guide_src/source/database/queries/009.php
index e93ca2da877c..24961e75db6e 100644
--- a/user_guide_src/source/database/queries/009.php
+++ b/user_guide_src/source/database/queries/009.php
@@ -1,3 +1,3 @@
 <?php
 
-$sql = "INSERT INTO table (title) VALUES(" . $db->escape($title) . ")";
+$sql = 'INSERT INTO table (title) VALUES(' . $db->escape($title) . ')';
diff --git a/user_guide_src/source/database/queries/011.php b/user_guide_src/source/database/queries/011.php
index 4b4e40660456..e3b1f9033bc9 100644
--- a/user_guide_src/source/database/queries/011.php
+++ b/user_guide_src/source/database/queries/011.php
@@ -1,5 +1,5 @@
 <?php
 
 $search = '20% raise';
-$sql = "SELECT id FROM table WHERE column LIKE '%" .
+$sql    = "SELECT id FROM table WHERE column LIKE '%" .
 $db->escapeLikeString($search) . "%' ESCAPE '!'";
diff --git a/user_guide_src/source/database/queries/012.php b/user_guide_src/source/database/queries/012.php
index 5aebc0688a14..11f1035c0ef7 100644
--- a/user_guide_src/source/database/queries/012.php
+++ b/user_guide_src/source/database/queries/012.php
@@ -1,4 +1,4 @@
 <?php
 
-$sql = "SELECT * FROM some_table WHERE id = ? AND status = ? AND author = ?";
+$sql = 'SELECT * FROM some_table WHERE id = ? AND status = ? AND author = ?';
 $db->query($sql, [3, 'live', 'Rick']);
diff --git a/user_guide_src/source/database/queries/013.php b/user_guide_src/source/database/queries/013.php
index 572886ee41b8..1e6afe7861a5 100644
--- a/user_guide_src/source/database/queries/013.php
+++ b/user_guide_src/source/database/queries/013.php
@@ -1,4 +1,4 @@
 <?php
 
-$sql = "SELECT * FROM some_table WHERE id IN ? AND status = ? AND author = ?";
+$sql = 'SELECT * FROM some_table WHERE id IN ? AND status = ? AND author = ?';
 $db->query($sql, [[3, 6], 'live', 'Rick']);
diff --git a/user_guide_src/source/database/queries/014.php b/user_guide_src/source/database/queries/014.php
index 6fadb198fd45..63d156cc6d13 100644
--- a/user_guide_src/source/database/queries/014.php
+++ b/user_guide_src/source/database/queries/014.php
@@ -1,6 +1,6 @@
 <?php
 
-$sql = "SELECT * FROM some_table WHERE id = :id: AND status = :status: AND author = :name:";
+$sql = 'SELECT * FROM some_table WHERE id = :id: AND status = :status: AND author = :name:';
 $db->query($sql, [
     'id'     => 3,
     'status' => 'live',
diff --git a/user_guide_src/source/database/queries/016.php b/user_guide_src/source/database/queries/016.php
index b614183dfa83..f674f7c7ccce 100644
--- a/user_guide_src/source/database/queries/016.php
+++ b/user_guide_src/source/database/queries/016.php
@@ -1,9 +1,9 @@
 <?php
 
-$pQuery = $db->prepare(function ($db) {
+$pQuery = $db->prepare(static function ($db) {
     return $db->table('user')->insert([
         'name'    => 'x',
         'email'   => 'y',
-        'country' => 'US'
+        'country' => 'US',
     ]);
 });
diff --git a/user_guide_src/source/database/queries/017.php b/user_guide_src/source/database/queries/017.php
index 3862d566dd3f..308412f64653 100644
--- a/user_guide_src/source/database/queries/017.php
+++ b/user_guide_src/source/database/queries/017.php
@@ -2,8 +2,8 @@
 
 use CodeIgniter\Database\Query;
 
-$pQuery = $db->prepare(function ($db) {
-    $sql = "INSERT INTO user (name, email, country) VALUES (?, ?, ?)";
+$pQuery = $db->prepare(static function ($db) {
+    $sql = 'INSERT INTO user (name, email, country) VALUES (?, ?, ?)';
 
     return (new Query($db))->setQuery($sql);
 });
diff --git a/user_guide_src/source/database/queries/018.php b/user_guide_src/source/database/queries/018.php
index ddf8aa0dd58f..a6df9b8d6dbe 100644
--- a/user_guide_src/source/database/queries/018.php
+++ b/user_guide_src/source/database/queries/018.php
@@ -2,8 +2,8 @@
 
 use CodeIgniter\Database\Query;
 
-$pQuery = $db->prepare(function ($db) {
-    $sql = "INSERT INTO user (name, email, country) VALUES (?, ?, ?)";
+$pQuery = $db->prepare(static function ($db) {
+    $sql = 'INSERT INTO user (name, email, country) VALUES (?, ?, ?)';
 
     return (new Query($db))->setQuery($sql);
 }, $options);
diff --git a/user_guide_src/source/database/queries/019.php b/user_guide_src/source/database/queries/019.php
index 73467a9394e5..28729f2e484a 100644
--- a/user_guide_src/source/database/queries/019.php
+++ b/user_guide_src/source/database/queries/019.php
@@ -1,11 +1,11 @@
 <?php
 
 // Prepare the Query
-$pQuery = $db->prepare(function ($db) {
+$pQuery = $db->prepare(static function ($db) {
     return $db->table('user')->insert([
         'name'    => 'x',
         'email'   => 'y',
-        'country' => 'US'
+        'country' => 'US',
     ]);
 });
 
diff --git a/user_guide_src/source/database/query_builder/006.php b/user_guide_src/source/database/query_builder/006.php
index 78a92e7b7b9d..52af6d2a4913 100644
--- a/user_guide_src/source/database/query_builder/006.php
+++ b/user_guide_src/source/database/query_builder/006.php
@@ -1,12 +1,10 @@
 <?php
 
-echo $builder->limit(10,20)->getCompiledSelect(false);
+echo $builder->limit(10, 20)->getCompiledSelect(false);
 /*
  * Prints string: SELECT * FROM mytable LIMIT 20, 10
  * (in MySQL. Other databases have slightly different syntax)
  */
 
 echo $builder->select('title, content, date')->getCompiledSelect();
-/*
- * Prints string: SELECT title, content, date FROM mytable LIMIT 20, 10
- */
+// Prints string: SELECT title, content, date FROM mytable LIMIT 20, 10
diff --git a/user_guide_src/source/database/query_builder/016.php b/user_guide_src/source/database/query_builder/016.php
index f00c2dbe47c2..1ad1c917ff57 100644
--- a/user_guide_src/source/database/query_builder/016.php
+++ b/user_guide_src/source/database/query_builder/016.php
@@ -2,5 +2,5 @@
 
 $subquery = $db->table('users');
 $builder  = $db->table('jobs')->fromSubquery($subquery, 'alias');
-$query = $builder->get();
+$query    = $builder->get();
 // Produces: SELECT * FROM `jobs`, (SELECT * FROM `users`) AS `alias`
diff --git a/user_guide_src/source/database/query_builder/017.php b/user_guide_src/source/database/query_builder/017.php
index 965ae956a6af..b33dd475b6f8 100644
--- a/user_guide_src/source/database/query_builder/017.php
+++ b/user_guide_src/source/database/query_builder/017.php
@@ -2,5 +2,5 @@
 
 $subquery = $db->table('users')->select('id, name');
 $builder  = $db->newQuery()->fromSubquery($subquery, 't');
-$query = $builder->get();
+$query    = $builder->get();
 // Produces: SELECT * FROM (SELECT `id`, `name` FROM users) AS `t`
diff --git a/user_guide_src/source/database/query_builder/026.php b/user_guide_src/source/database/query_builder/026.php
index d4e93699151c..ed45b84bf363 100644
--- a/user_guide_src/source/database/query_builder/026.php
+++ b/user_guide_src/source/database/query_builder/026.php
@@ -1,5 +1,5 @@
 <?php
 
-$name = $builder->db->escape('Joe');
+$name  = $builder->db->escape('Joe');
 $where = "name={$name} AND status='boss' OR status='active'";
 $builder->where($where);
diff --git a/user_guide_src/source/database/query_builder/027.php b/user_guide_src/source/database/query_builder/027.php
index 043b7d9e451b..019386718cd1 100644
--- a/user_guide_src/source/database/query_builder/027.php
+++ b/user_guide_src/source/database/query_builder/027.php
@@ -1,9 +1,7 @@
 <?php
 
 // With closure
-$builder->where('advance_amount <', function (BaseBuilder $builder) {
-    return $builder->select('MAX(advance_amount)', false)->from('orders')->where('id >', 2);
-});
+$builder->where('advance_amount <', static fn (BaseBuilder $builder) => $builder->select('MAX(advance_amount)', false)->from('orders')->where('id >', 2));
 // Produces: WHERE "advance_amount" < (SELECT MAX(advance_amount) FROM "orders" WHERE "id" > 2)
 
 // With builder directly
diff --git a/user_guide_src/source/database/query_builder/030.php b/user_guide_src/source/database/query_builder/030.php
index 7f80507b4435..5aa7619c0dc8 100644
--- a/user_guide_src/source/database/query_builder/030.php
+++ b/user_guide_src/source/database/query_builder/030.php
@@ -1,9 +1,7 @@
 <?php
 
 // With closure
-$builder->whereIn('id', function (BaseBuilder $builder) {
-    return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
-});
+$builder->whereIn('id', static fn (BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
 // Produces: WHERE "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
 
 // With builder directly
diff --git a/user_guide_src/source/database/query_builder/032.php b/user_guide_src/source/database/query_builder/032.php
index 7a7a44182396..ae8ddb7ce7a4 100644
--- a/user_guide_src/source/database/query_builder/032.php
+++ b/user_guide_src/source/database/query_builder/032.php
@@ -1,9 +1,7 @@
 <?php
 
 // With closure
-$builder->orWhereIn('id', function (BaseBuilder $builder) {
-    return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
-});
+$builder->orWhereIn('id', static fn (BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
 // Produces: OR "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
 
 // With builder directly
diff --git a/user_guide_src/source/database/query_builder/034.php b/user_guide_src/source/database/query_builder/034.php
index 2316388e16b6..02904a3962f3 100644
--- a/user_guide_src/source/database/query_builder/034.php
+++ b/user_guide_src/source/database/query_builder/034.php
@@ -1,9 +1,7 @@
 <?php
 
 // With closure
-$builder->whereNotIn('id', function (BaseBuilder $builder) {
-    return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
-});
+$builder->whereNotIn('id', static fn (BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
 // Produces: WHERE "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
 
 // With builder directly
diff --git a/user_guide_src/source/database/query_builder/036.php b/user_guide_src/source/database/query_builder/036.php
index d50bcc113853..f5668aa1a30d 100644
--- a/user_guide_src/source/database/query_builder/036.php
+++ b/user_guide_src/source/database/query_builder/036.php
@@ -1,9 +1,7 @@
 <?php
 
 // With closure
-$builder->orWhereNotIn('id', function (BaseBuilder $builder) {
-    return $builder->select('job_id')->from('users_jobs')->where('user_id', 3);
-});
+$builder->orWhereNotIn('id', static fn (BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
 // Produces: OR "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
 
 // With builder directly
diff --git a/user_guide_src/source/database/query_builder/044.php b/user_guide_src/source/database/query_builder/044.php
index 1c0a0e15991d..ffe4786baaae 100644
--- a/user_guide_src/source/database/query_builder/044.php
+++ b/user_guide_src/source/database/query_builder/044.php
@@ -1,4 +1,4 @@
 <?php
 
-$builder->groupBy("title");
+$builder->groupBy('title');
 // Produces: GROUP BY title
diff --git a/user_guide_src/source/database/query_builder/045.php b/user_guide_src/source/database/query_builder/045.php
index 5758e29187be..0872996afe9f 100644
--- a/user_guide_src/source/database/query_builder/045.php
+++ b/user_guide_src/source/database/query_builder/045.php
@@ -1,4 +1,4 @@
 <?php
 
-$builder->groupBy(["title", "date"]);
+$builder->groupBy(['title', 'date']);
 // Produces: GROUP BY title, date
diff --git a/user_guide_src/source/database/query_builder/047.php b/user_guide_src/source/database/query_builder/047.php
index cf439e52d0fb..87f435064238 100644
--- a/user_guide_src/source/database/query_builder/047.php
+++ b/user_guide_src/source/database/query_builder/047.php
@@ -1,4 +1,4 @@
 <?php
 
 $builder->having('user_id = 45'); // Produces: HAVING user_id = 45
-$builder->having('user_id',  45); // Produces: HAVING user_id = 45
+$builder->having('user_id', 45); // Produces: HAVING user_id = 45
diff --git a/user_guide_src/source/database/query_builder/049.php b/user_guide_src/source/database/query_builder/049.php
index 4a22eccffc4d..b044b821f388 100644
--- a/user_guide_src/source/database/query_builder/049.php
+++ b/user_guide_src/source/database/query_builder/049.php
@@ -1,4 +1,4 @@
 <?php
 
-$builder->having('user_id',  45); // Produces: HAVING `user_id` = 45 in some databases such as MySQL
-$builder->having('user_id',  45, false); // Produces: HAVING user_id = 45
+$builder->having('user_id', 45); // Produces: HAVING `user_id` = 45 in some databases such as MySQL
+$builder->having('user_id', 45, false); // Produces: HAVING user_id = 45
diff --git a/user_guide_src/source/database/query_builder/051.php b/user_guide_src/source/database/query_builder/051.php
index 325e99679082..1f5736243866 100644
--- a/user_guide_src/source/database/query_builder/051.php
+++ b/user_guide_src/source/database/query_builder/051.php
@@ -1,9 +1,7 @@
 <?php
 
 // With closure
-$builder->havingIn('id', function (BaseBuilder $builder) {
-    return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
-});
+$builder->havingIn('id', static fn (BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
 // Produces: HAVING "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
 
 // With builder directly
diff --git a/user_guide_src/source/database/query_builder/053.php b/user_guide_src/source/database/query_builder/053.php
index baa936c5df82..8a19ff4ac7d8 100644
--- a/user_guide_src/source/database/query_builder/053.php
+++ b/user_guide_src/source/database/query_builder/053.php
@@ -1,9 +1,7 @@
 <?php
 
-//With closure
-$builder->orHavingIn('id', function (BaseBuilder $builder) {
-    return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
-});
+// With closure
+$builder->orHavingIn('id', static fn (BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
 // Produces: OR "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
 
 // With builder directly
diff --git a/user_guide_src/source/database/query_builder/055.php b/user_guide_src/source/database/query_builder/055.php
index 986b3ff24cb9..67a54f87f7bc 100644
--- a/user_guide_src/source/database/query_builder/055.php
+++ b/user_guide_src/source/database/query_builder/055.php
@@ -1,9 +1,7 @@
 <?php
 
-//With closure
-$builder->havingNotIn('id', function (BaseBuilder $builder) {
-    return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
-});
+// With closure
+$builder->havingNotIn('id', static fn (BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
 // Produces: HAVING "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
 
 // With builder directly
diff --git a/user_guide_src/source/database/query_builder/057.php b/user_guide_src/source/database/query_builder/057.php
index 85cab6e2eba8..8a92da5725b2 100644
--- a/user_guide_src/source/database/query_builder/057.php
+++ b/user_guide_src/source/database/query_builder/057.php
@@ -1,9 +1,7 @@
 <?php
 
-//With closure
-$builder->orHavingNotIn('id', function (BaseBuilder $builder) {
-    return $builder->select('user_id')->from('users_jobs')->where('group_id', 3);
-});
+// With closure
+$builder->orHavingNotIn('id', static fn (BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
 // Produces: OR "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
 
 // With builder directly
diff --git a/user_guide_src/source/database/query_builder/074.php b/user_guide_src/source/database/query_builder/074.php
index d858451993a2..1ce884db6e6a 100644
--- a/user_guide_src/source/database/query_builder/074.php
+++ b/user_guide_src/source/database/query_builder/074.php
@@ -2,14 +2,14 @@
 
 $builder->select('*')->from('my_table')
     ->groupStart()
-        ->where('a', 'a')
-        ->orGroupStart()
-            ->where('b', 'b')
-            ->where('c', 'c')
-        ->groupEnd()
+    ->where('a', 'a')
+    ->orGroupStart()
+    ->where('b', 'b')
+    ->where('c', 'c')
+    ->groupEnd()
     ->groupEnd()
     ->where('d', 'd')
-->get();
+    ->get();
 /*
  * Generates:
  * SELECT * FROM (`my_table`) WHERE ( `a` = 'a' OR ( `b` = 'b' AND `c` = 'c' ) ) AND `d` = 'd'
diff --git a/user_guide_src/source/database/query_builder/076.php b/user_guide_src/source/database/query_builder/076.php
index cdacf0a53df5..ba38d99ff43b 100644
--- a/user_guide_src/source/database/query_builder/076.php
+++ b/user_guide_src/source/database/query_builder/076.php
@@ -7,6 +7,6 @@ class Myclass
     public $date    = 'My Date';
 }
 
-$object = new Myclass;
+$object = new Myclass();
 $builder->insert($object);
 // Produces: INSERT INTO mytable (title, content, date) VALUES ('My Title', 'My Content', 'My Date')
diff --git a/user_guide_src/source/database/query_builder/086.php b/user_guide_src/source/database/query_builder/086.php
index c7dcd01aa071..d395bc3b8ea9 100644
--- a/user_guide_src/source/database/query_builder/086.php
+++ b/user_guide_src/source/database/query_builder/086.php
@@ -7,6 +7,6 @@ class Myclass
     public $date    = 'My Date';
 }
 
-$object = new Myclass;
+$object = new Myclass();
 $builder->set($object);
 $builder->insert();
diff --git a/user_guide_src/source/database/query_builder/088.php b/user_guide_src/source/database/query_builder/088.php
index ce38024e558d..445e53716041 100644
--- a/user_guide_src/source/database/query_builder/088.php
+++ b/user_guide_src/source/database/query_builder/088.php
@@ -7,7 +7,7 @@ class Myclass
     public $date    = 'My Date';
 }
 
-$object = new Myclass;
+$object = new Myclass();
 $builder->where('id', $id);
 $builder->update($object);
 /*
diff --git a/user_guide_src/source/database/query_builder/089.php b/user_guide_src/source/database/query_builder/089.php
index 2a4a01cc6346..d2ed79d26832 100644
--- a/user_guide_src/source/database/query_builder/089.php
+++ b/user_guide_src/source/database/query_builder/089.php
@@ -1,3 +1,3 @@
 <?php
 
-$builder->update($data, "id = 4");
+$builder->update($data, 'id = 4');
diff --git a/user_guide_src/source/database/query_builder/091.php b/user_guide_src/source/database/query_builder/091.php
index 56f04036cd6f..e60b9ee6b486 100644
--- a/user_guide_src/source/database/query_builder/091.php
+++ b/user_guide_src/source/database/query_builder/091.php
@@ -1,16 +1,16 @@
 <?php
 
 $data = [
-   [
-      'title' => 'My title' ,
-      'name'  => 'My Name 2' ,
-      'date'  => 'My date 2',
-   ],
-   [
-      'title' => 'Another title' ,
-      'name'  => 'Another Name 2' ,
-      'date'  => 'Another date 2',
-   ],
+    [
+        'title' => 'My title',
+        'name'  => 'My Name 2',
+        'date'  => 'My date 2',
+    ],
+    [
+        'title' => 'Another title',
+        'name'  => 'Another Name 2',
+        'date'  => 'Another date 2',
+    ],
 ];
 
 $builder->updateBatch($data, 'title');
diff --git a/user_guide_src/source/database/query_builder/096.php b/user_guide_src/source/database/query_builder/096.php
index 78b57dd13df5..5a05f70d8070 100644
--- a/user_guide_src/source/database/query_builder/096.php
+++ b/user_guide_src/source/database/query_builder/096.php
@@ -1,6 +1,6 @@
 <?php
 
 $query = $builder->select('title')
-                 ->where('id', $id)
-                 ->limit(10, 20)
-                 ->get();
+    ->where('id', $id)
+    ->limit(10, 20)
+    ->get();
diff --git a/user_guide_src/source/database/query_builder/097.php b/user_guide_src/source/database/query_builder/097.php
index 30c4d0c4526a..50d274d63a54 100644
--- a/user_guide_src/source/database/query_builder/097.php
+++ b/user_guide_src/source/database/query_builder/097.php
@@ -1,9 +1,9 @@
 <?php
 
 // Note that the second parameter of the ``get_compiled_select`` method is false
-$sql = $builder->select(['field1','field2'])
-               ->where('field3',5)
-               ->getCompiledSelect(false);
+$sql = $builder->select(['field1', 'field2'])
+    ->where('field3', 5)
+    ->getCompiledSelect(false);
 
 // ...
 // Do something crazy with the SQL code... like add it to a cron script for
diff --git a/user_guide_src/source/database/query_builder/098.php b/user_guide_src/source/database/query_builder/098.php
index a6fb3cc4beed..b3890e978005 100644
--- a/user_guide_src/source/database/query_builder/098.php
+++ b/user_guide_src/source/database/query_builder/098.php
@@ -2,5 +2,5 @@
 
 $subquery = $db->table('countries')->select('name')->where('id', 1);
 $builder  = $db->table('users')->select('name')->selectSubquery($subquery, 'country');
-$query = $builder->get();
+$query    = $builder->get();
 // Produces: SELECT `name`, (SELECT `name` FROM `countries` WHERE `id` = 1) AS `country` FROM `users`
diff --git a/user_guide_src/source/database/results/001.php b/user_guide_src/source/database/results/001.php
index 0cbecfb88ba9..af0b6117f689 100644
--- a/user_guide_src/source/database/results/001.php
+++ b/user_guide_src/source/database/results/001.php
@@ -1,6 +1,6 @@
 <?php
 
-$query = $db->query("YOUR QUERY");
+$query = $db->query('YOUR QUERY');
 
 foreach ($query->getResult() as $row) {
     echo $row->title;
diff --git a/user_guide_src/source/database/results/002.php b/user_guide_src/source/database/results/002.php
index 8b702c8e1150..2ab6e0535a3a 100644
--- a/user_guide_src/source/database/results/002.php
+++ b/user_guide_src/source/database/results/002.php
@@ -1,6 +1,6 @@
 <?php
 
-$query = $db->query("YOUR QUERY");
+$query = $db->query('YOUR QUERY');
 
 foreach ($query->getResult('array') as $row) {
     echo $row['title'];
diff --git a/user_guide_src/source/database/results/003.php b/user_guide_src/source/database/results/003.php
index 1ad7d7dcb9fe..da55c19717c1 100644
--- a/user_guide_src/source/database/results/003.php
+++ b/user_guide_src/source/database/results/003.php
@@ -1,6 +1,6 @@
 <?php
 
-$query = $db->query("SELECT * FROM users;");
+$query = $db->query('SELECT * FROM users;');
 
 foreach ($query->getResult('User') as $user) {
     echo $user->name; // access attributes
diff --git a/user_guide_src/source/database/results/004.php b/user_guide_src/source/database/results/004.php
index e8e9acecdcdc..66c537b57344 100644
--- a/user_guide_src/source/database/results/004.php
+++ b/user_guide_src/source/database/results/004.php
@@ -1,6 +1,6 @@
 <?php
 
-$query = $db->query("YOUR QUERY");
+$query = $db->query('YOUR QUERY');
 
 foreach ($query->getResultArray() as $row) {
     echo $row['title'];
diff --git a/user_guide_src/source/database/results/005.php b/user_guide_src/source/database/results/005.php
index af79170b8b89..bd0e2ed47050 100644
--- a/user_guide_src/source/database/results/005.php
+++ b/user_guide_src/source/database/results/005.php
@@ -1,6 +1,6 @@
 <?php
 
-$query = $db->query("YOUR QUERY");
+$query = $db->query('YOUR QUERY');
 
 $row = $query->getRow();
 
diff --git a/user_guide_src/source/database/results/007.php b/user_guide_src/source/database/results/007.php
index 4b46945c285e..6a6c309efb4f 100644
--- a/user_guide_src/source/database/results/007.php
+++ b/user_guide_src/source/database/results/007.php
@@ -1,7 +1,7 @@
 <?php
 
-$query = $db->query("SELECT * FROM users LIMIT 1;");
-$row = $query->getRow(0, 'User');
+$query = $db->query('SELECT * FROM users LIMIT 1;');
+$row   = $query->getRow(0, 'User');
 
 echo $row->name; // access attributes
 echo $row->reverse_name(); // or methods defined on the 'User' class
diff --git a/user_guide_src/source/database/results/008.php b/user_guide_src/source/database/results/008.php
index 8b576d1d3117..9925567c5a01 100644
--- a/user_guide_src/source/database/results/008.php
+++ b/user_guide_src/source/database/results/008.php
@@ -1,6 +1,6 @@
 <?php
 
-$query = $db->query("YOUR QUERY");
+$query = $db->query('YOUR QUERY');
 
 $row = $query->getRowArray();
 
diff --git a/user_guide_src/source/database/results/010.php b/user_guide_src/source/database/results/010.php
index ad0b4c326d0f..072c511f89bd 100644
--- a/user_guide_src/source/database/results/010.php
+++ b/user_guide_src/source/database/results/010.php
@@ -1,6 +1,6 @@
 <?php
 
-$query = $db->query("YOUR QUERY");
+$query = $db->query('YOUR QUERY');
 
 while ($row = $query->getUnbufferedRow()) {
     echo $row->title;
diff --git a/user_guide_src/source/database/results/011.php b/user_guide_src/source/database/results/011.php
index f57aa21a2504..b33681cd74b4 100644
--- a/user_guide_src/source/database/results/011.php
+++ b/user_guide_src/source/database/results/011.php
@@ -2,14 +2,13 @@
 
 $db->resultMode = MYSQLI_USE_RESULT; // for unbuffered results
 
-$query = $db->query("YOUR QUERY");
+$query = $db->query('YOUR QUERY');
 
-$file = new \CodeIgniter\Files\File(WRITEPATH.'data.csv');
+$file = new \CodeIgniter\Files\File(WRITEPATH . 'data.csv');
 
 $csv = $file->openFile('w');
 
-while ($row = $query->getUnbufferedRow('array'))
-{
+while ($row = $query->getUnbufferedRow('array')) {
     $csv->fputcsv($row);
 }
 
diff --git a/user_guide_src/source/database/results/013.php b/user_guide_src/source/database/results/013.php
index 6c47fe5bf256..380945848ebb 100644
--- a/user_guide_src/source/database/results/013.php
+++ b/user_guide_src/source/database/results/013.php
@@ -22,8 +22,8 @@ public function __set($name, $value)
 
     public function __get($name)
     {
-        if (isset($this->$name)) {
-            return $this->$name;
+        if (isset($this->{$name})) {
+            return $this->{$name};
         }
     }
 }
diff --git a/user_guide_src/source/database/results/014.php b/user_guide_src/source/database/results/014.php
index df6073c5ed79..f0845bf55ac3 100644
--- a/user_guide_src/source/database/results/014.php
+++ b/user_guide_src/source/database/results/014.php
@@ -1,6 +1,6 @@
 <?php
 
-$query = $db->query("YOUR QUERY");
+$query = $db->query('YOUR QUERY');
 
 $rows = $query->getCustomResultObject('User');
 
diff --git a/user_guide_src/source/database/results/015.php b/user_guide_src/source/database/results/015.php
index a57dddfa42d0..247d5d8b5313 100644
--- a/user_guide_src/source/database/results/015.php
+++ b/user_guide_src/source/database/results/015.php
@@ -1,6 +1,6 @@
 <?php
 
-$query = $db->query("YOUR QUERY");
+$query = $db->query('YOUR QUERY');
 
 $row = $query->getCustomRowObject(0, 'User');
 
diff --git a/user_guide_src/source/database/utilities/001.php b/user_guide_src/source/database/utilities/001.php
index 9b0e88d70753..697e6a786930 100644
--- a/user_guide_src/source/database/utilities/001.php
+++ b/user_guide_src/source/database/utilities/001.php
@@ -1,12 +1,10 @@
 <?php
 
-$model = new class extends \CodeIgniter\Model {
+$model                    = new class () extends \CodeIgniter\Model {
     protected $table      = 'foo';
     protected $primaryKey = 'id';
 };
-$db = \Closure::bind(function ($model) {
-    return $model->db;
-}, null, $model)($model);
+$db = \Closure::bind(static fn ($model) => $model->db, null, $model)($model);
 
 $util = (new \CodeIgniter\Database\Database())->loadUtils($db);
 echo $util->getXMLFromResult($model->get());
diff --git a/user_guide_src/source/dbmgmt/forge/007.php b/user_guide_src/source/dbmgmt/forge/007.php
index 5150dd8495ef..182ea8347633 100644
--- a/user_guide_src/source/dbmgmt/forge/007.php
+++ b/user_guide_src/source/dbmgmt/forge/007.php
@@ -1,29 +1,29 @@
 <?php
 
 $fields = [
-    'id'          => [
+    'id' => [
         'type'           => 'INT',
         'constraint'     => 5,
         'unsigned'       => true,
-        'auto_increment' => true
+        'auto_increment' => true,
     ],
-    'title'       => [
-        'type'           => 'VARCHAR',
-        'constraint'     => '100',
-        'unique'         => true,
+    'title' => [
+        'type'       => 'VARCHAR',
+        'constraint' => '100',
+        'unique'     => true,
     ],
-    'author'      => [
-        'type'           =>'VARCHAR',
-        'constraint'     => 100,
-        'default'        => 'King of Town',
+    'author' => [
+        'type'       => 'VARCHAR',
+        'constraint' => 100,
+        'default'    => 'King of Town',
     ],
     'description' => [
-        'type'           => 'TEXT',
-        'null'           => true,
+        'type' => 'TEXT',
+        'null' => true,
     ],
-    'status'      => [
-        'type'           => 'ENUM',
-        'constraint'     => ['publish', 'pending', 'draft'],
-        'default'        => 'pending',
+    'status' => [
+        'type'       => 'ENUM',
+        'constraint' => ['publish', 'pending', 'draft'],
+        'default'    => 'pending',
     ],
 ];
diff --git a/user_guide_src/source/dbmgmt/forge/022.php b/user_guide_src/source/dbmgmt/forge/022.php
index 22b335fc992c..80b0b9f5e098 100644
--- a/user_guide_src/source/dbmgmt/forge/022.php
+++ b/user_guide_src/source/dbmgmt/forge/022.php
@@ -1,7 +1,7 @@
 <?php
 
 $fields = [
-    'preferences' => ['type' => 'TEXT']
+    'preferences' => ['type' => 'TEXT'],
 ];
 $forge->addColumn('table_name', $fields);
 // Executes: ALTER TABLE `table_name` ADD `preferences` TEXT
diff --git a/user_guide_src/source/dbmgmt/forge/023.php b/user_guide_src/source/dbmgmt/forge/023.php
index 50a5bc799909..957d9a37dafc 100644
--- a/user_guide_src/source/dbmgmt/forge/023.php
+++ b/user_guide_src/source/dbmgmt/forge/023.php
@@ -2,10 +2,10 @@
 
 // Will place the new column after the `another_field` column:
 $fields = [
-    'preferences' => ['type' => 'TEXT', 'after' => 'another_field']
+    'preferences' => ['type' => 'TEXT', 'after' => 'another_field'],
 ];
 
 // Will place the new column at the start of the table definition:
 $fields = [
-    'preferences' => ['type' => 'TEXT', 'first' => true]
+    'preferences' => ['type' => 'TEXT', 'first' => true],
 ];
diff --git a/user_guide_src/source/dbmgmt/migration/001.php b/user_guide_src/source/dbmgmt/migration/001.php
index 0d08e2b44308..3f73906231f1 100644
--- a/user_guide_src/source/dbmgmt/migration/001.php
+++ b/user_guide_src/source/dbmgmt/migration/001.php
@@ -9,13 +9,13 @@ class AddBlog extends Migration
     public function up()
     {
         $this->forge->addField([
-            'blog_id'          => [
+            'blog_id' => [
                 'type'           => 'INT',
                 'constraint'     => 5,
                 'unsigned'       => true,
                 'auto_increment' => true,
             ],
-            'blog_title'       => [
+            'blog_title' => [
                 'type'       => 'VARCHAR',
                 'constraint' => '100',
             ],
diff --git a/user_guide_src/source/dbmgmt/migration/002.php b/user_guide_src/source/dbmgmt/migration/002.php
index b324f22003a7..ec555bb81cd6 100644
--- a/user_guide_src/source/dbmgmt/migration/002.php
+++ b/user_guide_src/source/dbmgmt/migration/002.php
@@ -11,7 +11,7 @@ public function up()
         $this->db->disableForeignKeyChecks();
 
         // Migration rules would go here..
-        
+
         $this->db->enableForeignKeyChecks();
     }
 }
diff --git a/user_guide_src/source/dbmgmt/migration/005.php b/user_guide_src/source/dbmgmt/migration/005.php
index 958aff859e9d..e9b4c2ad37fe 100644
--- a/user_guide_src/source/dbmgmt/migration/005.php
+++ b/user_guide_src/source/dbmgmt/migration/005.php
@@ -3,6 +3,7 @@
 namespace App\Controllers;
 
 use CodeIgniter\Controller;
+use Throwable;
 
 class Migrate extends Controller
 {
@@ -12,7 +13,7 @@ public function index()
 
         try {
             $migrate->latest();
-        } catch (\Throwable $e) {
+        } catch (Throwable $e) {
             // Do something with the error here...
         }
     }
diff --git a/user_guide_src/source/dbmgmt/seeds/001.php b/user_guide_src/source/dbmgmt/seeds/001.php
index 627f554fc515..b65b92182611 100644
--- a/user_guide_src/source/dbmgmt/seeds/001.php
+++ b/user_guide_src/source/dbmgmt/seeds/001.php
@@ -10,11 +10,11 @@ public function run()
     {
         $data = [
             'username' => 'darth',
-            'email'    => 'darth@theempire.com'
+            'email'    => 'darth@theempire.com',
         ];
 
         // Simple Queries
-        $this->db->query("INSERT INTO users (username, email) VALUES(:username:, :email:)", $data);
+        $this->db->query('INSERT INTO users (username, email) VALUES(:username:, :email:)', $data);
 
         // Using Query Builder
         $this->db->table('users')->insert($data);
diff --git a/user_guide_src/source/extending/events/002.php b/user_guide_src/source/extending/events/002.php
index 1c28aa8dc471..00fa912bd45a 100644
--- a/user_guide_src/source/extending/events/002.php
+++ b/user_guide_src/source/extending/events/002.php
@@ -11,7 +11,6 @@
 Events::on('pre_system', 'SomeClass::someMethod');
 
 // Use a Closure
-Events::on('pre_system', function (...$params)
-{
+Events::on('pre_system', static function (...$params) {
     // ...
 });
diff --git a/user_guide_src/source/extending/events/006.php b/user_guide_src/source/extending/events/006.php
index 5233c94e1808..bceef2866e9e 100644
--- a/user_guide_src/source/extending/events/006.php
+++ b/user_guide_src/source/extending/events/006.php
@@ -2,6 +2,6 @@
 
 \CodeIgniter\Events\Events::trigger('some_events', $foo, $bar, $baz);
 
-Events::on('some_event', function ($foo, $bar, $baz) {
+Events::on('some_event', static function ($foo, $bar, $baz) {
     // ...
 });
diff --git a/user_guide_src/source/general/common_functions/001.php b/user_guide_src/source/general/common_functions/001.php
index f4d4e1521fff..eeb8da7c2069 100644
--- a/user_guide_src/source/general/common_functions/001.php
+++ b/user_guide_src/source/general/common_functions/001.php
@@ -1,4 +1,4 @@
 <?php
 
-$foo = cache('foo');
+$foo   = cache('foo');
 $cache = cache();
diff --git a/user_guide_src/source/general/common_functions/008.php b/user_guide_src/source/general/common_functions/008.php
index 2b6ea90d2c4f..d8f097974401 100644
--- a/user_guide_src/source/general/common_functions/008.php
+++ b/user_guide_src/source/general/common_functions/008.php
@@ -1,4 +1,4 @@
 <?php
 
-$logger = service('logger');
-$renderer = service('renderer', APPPATH.'views/');
+$logger   = service('logger');
+$renderer = service('renderer', APPPATH . 'views/');
diff --git a/user_guide_src/source/general/configuration/006.php b/user_guide_src/source/general/configuration/006.php
index e260cb6dc30d..71a46be3c9ad 100644
--- a/user_guide_src/source/general/configuration/006.php
+++ b/user_guide_src/source/general/configuration/006.php
@@ -1,4 +1,4 @@
 <?php
 
-$address['city']    = "Berlin";
-$address['country'] = "Germany";
+$address['city']    = 'Berlin';
+$address['country'] = 'Germany';
diff --git a/user_guide_src/source/general/configuration/009.php b/user_guide_src/source/general/configuration/009.php
index 5b1cb6e22b91..c578b4d884b7 100644
--- a/user_guide_src/source/general/configuration/009.php
+++ b/user_guide_src/source/general/configuration/009.php
@@ -7,8 +7,8 @@
 class MySalesConfig extends BaseConfig
 {
     public $target            = 100;
-    public $campaign          = "Winter Wonderland";
+    public $campaign          = 'Winter Wonderland';
     public static $registrars = [
-        '\App\Models\RegionalSales'
+        '\App\Models\RegionalSales',
     ];
 }
diff --git a/user_guide_src/source/general/configuration/011.php b/user_guide_src/source/general/configuration/011.php
index 88a419140123..e8cc24a109b9 100644
--- a/user_guide_src/source/general/configuration/011.php
+++ b/user_guide_src/source/general/configuration/011.php
@@ -1,4 +1,4 @@
 <?php
 
 $target   = 45;
-$campaign = "Winter Wonderland";
+$campaign = 'Winter Wonderland';
diff --git a/user_guide_src/source/general/errors/001.php b/user_guide_src/source/general/errors/001.php
index b994b1b63f3e..e2e253748543 100644
--- a/user_guide_src/source/general/errors/001.php
+++ b/user_guide_src/source/general/errors/001.php
@@ -1,3 +1,3 @@
 <?php
 
-throw new \Exception("Some message goes here");
+throw new \Exception('Some message goes here');
diff --git a/user_guide_src/source/general/errors/002.php b/user_guide_src/source/general/errors/002.php
index f8991487795d..4e04619be5bb 100644
--- a/user_guide_src/source/general/errors/002.php
+++ b/user_guide_src/source/general/errors/002.php
@@ -3,5 +3,5 @@
 try {
     $user = $userModel->find($id);
 } catch (\Exception $e) {
-    die($e->getMessage());
+    exit($e->getMessage());
 }
diff --git a/user_guide_src/source/general/helpers/005.php b/user_guide_src/source/general/helpers/005.php
index 8d58b073035b..13a7f3015387 100644
--- a/user_guide_src/source/general/helpers/005.php
+++ b/user_guide_src/source/general/helpers/005.php
@@ -1 +1 @@
-<?= anchor('blog/comments', 'Click Here') ?>
+<?= anchor('blog/comments', 'Click Here');
diff --git a/user_guide_src/source/general/logging/005.php b/user_guide_src/source/general/logging/005.php
index 5f4a43915a26..48c2b0297ac4 100644
--- a/user_guide_src/source/general/logging/005.php
+++ b/user_guide_src/source/general/logging/005.php
@@ -2,8 +2,8 @@
 
 // Generates a message like: User 123 logged into the system from 127.0.0.1
 $info = [
-    'id' => $user->id,
-    'ip_address' => $this->request->getIPAddress()
+    'id'         => $user->id,
+    'ip_address' => $this->request->getIPAddress(),
 ];
 
 log_message('info', 'User {id} logged into the system from {ip_address}', $info);
diff --git a/user_guide_src/source/general/modules/001.php b/user_guide_src/source/general/modules/001.php
index c8d49bd4d362..4ced75497590 100644
--- a/user_guide_src/source/general/modules/001.php
+++ b/user_guide_src/source/general/modules/001.php
@@ -11,6 +11,6 @@ class Autoload extends AutoloadConfig
         'Config'      => APPPATH . 'Config',
         'Acme'        => ROOTPATH . 'acme',
     ];
-    
+
     // ...
 }
diff --git a/user_guide_src/source/general/modules/002.php b/user_guide_src/source/general/modules/002.php
index 1ee3a742d9aa..c23c48890b32 100644
--- a/user_guide_src/source/general/modules/002.php
+++ b/user_guide_src/source/general/modules/002.php
@@ -13,6 +13,6 @@ class Autoload extends AutoloadConfig
         'path/to/my/constants.php',
         'path/to/my/bootstrap.php',
     ];
-    
+
     // ...
 }
diff --git a/user_guide_src/source/general/modules/003.php b/user_guide_src/source/general/modules/003.php
index 24accb0c737b..93601b2f1d66 100644
--- a/user_guide_src/source/general/modules/003.php
+++ b/user_guide_src/source/general/modules/003.php
@@ -11,6 +11,6 @@ class Autoload extends AutoloadConfig
         'Config'      => APPPATH . 'Config',
         'Acme\Blog'   => ROOTPATH . 'acme/Blog', // Change
     ];
-    
+
     // ...
 }
diff --git a/user_guide_src/source/general/modules/004.php b/user_guide_src/source/general/modules/004.php
index 33bbe70b086f..47a4b1bad712 100644
--- a/user_guide_src/source/general/modules/004.php
+++ b/user_guide_src/source/general/modules/004.php
@@ -7,6 +7,6 @@
 class Modules extends BaseModules
 {
     public $discoverInComposer = false;
-    
+
     // ...
 }
diff --git a/user_guide_src/source/general/modules/007.php b/user_guide_src/source/general/modules/007.php
index 06038f690a8c..0030a0885214 100644
--- a/user_guide_src/source/general/modules/007.php
+++ b/user_guide_src/source/general/modules/007.php
@@ -1,5 +1,5 @@
 <?php
 
-$routes->group('blog', ['namespace' => 'Acme\Blog\Controllers'], function ($routes) {
+$routes->group('blog', ['namespace' => 'Acme\Blog\Controllers'], static function ($routes) {
     $routes->get('/', 'Blog::index');
 });
diff --git a/user_guide_src/source/helpers/array_helper/002.php b/user_guide_src/source/helpers/array_helper/002.php
index 50ce70084c86..8dde5d7a181b 100644
--- a/user_guide_src/source/helpers/array_helper/002.php
+++ b/user_guide_src/source/helpers/array_helper/002.php
@@ -7,6 +7,6 @@
         ],
         'bar' => [
             'baz' => 23,
-        ]
-    ]
+        ],
+    ],
 ];
diff --git a/user_guide_src/source/helpers/array_helper/008.php b/user_guide_src/source/helpers/array_helper/008.php
index 14c6213b8410..64342dc6da9b 100644
--- a/user_guide_src/source/helpers/array_helper/008.php
+++ b/user_guide_src/source/helpers/array_helper/008.php
@@ -6,7 +6,7 @@
         'team_id'  => 5,
         'position' => 1,
         'team'     => [
-            'id' => 5,
+            'id'    => 5,
             'order' => 1,
         ],
     ],
@@ -15,7 +15,7 @@
         'team_id'  => 5,
         'position' => 4,
         'team'     => [
-            'id' => 5,
+            'id'    => 5,
             'order' => 1,
         ],
     ],
@@ -24,7 +24,7 @@
         'team_id'  => 2,
         'position' => 3,
         'team'     => [
-            'id' => 1,
+            'id'    => 1,
             'order' => 2,
         ],
     ],
diff --git a/user_guide_src/source/helpers/filesystem_helper/010.php b/user_guide_src/source/helpers/filesystem_helper/010.php
index 9c703479fe68..51db194b6d63 100644
--- a/user_guide_src/source/helpers/filesystem_helper/010.php
+++ b/user_guide_src/source/helpers/filesystem_helper/010.php
@@ -1,3 +1,3 @@
 <?php
 
-$controllers = get_filenames(APPPATH.'controllers/');
+$controllers = get_filenames(APPPATH . 'controllers/');
diff --git a/user_guide_src/source/helpers/filesystem_helper/011.php b/user_guide_src/source/helpers/filesystem_helper/011.php
index 830fb581242b..61ae0fd853f9 100644
--- a/user_guide_src/source/helpers/filesystem_helper/011.php
+++ b/user_guide_src/source/helpers/filesystem_helper/011.php
@@ -1,3 +1,3 @@
 <?php
 
-$models_info = get_dir_file_info(APPPATH.'models/');
+$models_info = get_dir_file_info(APPPATH . 'models/');
diff --git a/user_guide_src/source/helpers/form_helper/020.php b/user_guide_src/source/helpers/form_helper/020.php
index 02fe8f5386af..7846e39129f9 100644
--- a/user_guide_src/source/helpers/form_helper/020.php
+++ b/user_guide_src/source/helpers/form_helper/020.php
@@ -2,6 +2,6 @@
 
 $js = [
     'id'       => 'shirts',
-    'onChange' => 'some_function();'
+    'onChange' => 'some_function();',
 ];
 echo form_dropdown('shirts', $options, 'large', $js);
diff --git a/user_guide_src/source/helpers/form_helper/022.php b/user_guide_src/source/helpers/form_helper/022.php
index a8ca201db3e3..77fea178b64c 100644
--- a/user_guide_src/source/helpers/form_helper/022.php
+++ b/user_guide_src/source/helpers/form_helper/022.php
@@ -2,7 +2,7 @@
 
 $attributes = [
     'id'    => 'address_info',
-    'class' => 'address_info'
+    'class' => 'address_info',
 ];
 
 echo form_fieldset('Address Information', $attributes);
@@ -11,7 +11,7 @@
 
 ?>
 
-<!-- Produces: --> 
+<!-- Produces: -->
 <fieldset id="address_info" class="address_info">
     <legend>Address Information</legend>
     <p>form content here</p>
diff --git a/user_guide_src/source/helpers/form_helper/025.php b/user_guide_src/source/helpers/form_helper/025.php
index d889aab62591..3929501e40fb 100644
--- a/user_guide_src/source/helpers/form_helper/025.php
+++ b/user_guide_src/source/helpers/form_helper/025.php
@@ -5,7 +5,7 @@
     'id'      => 'newsletter',
     'value'   => 'accept',
     'checked' => true,
-    'style'   => 'margin:10px'
+    'style'   => 'margin:10px',
 ];
 
 echo form_checkbox($data);
diff --git a/user_guide_src/source/helpers/form_helper/029.php b/user_guide_src/source/helpers/form_helper/029.php
index c05370129514..9344463584f6 100644
--- a/user_guide_src/source/helpers/form_helper/029.php
+++ b/user_guide_src/source/helpers/form_helper/029.php
@@ -2,7 +2,7 @@
 
 $attributes = [
     'class' => 'mycustomclass',
-    'style' => 'color: #000;'
+    'style' => 'color: #000;',
 ];
 
 echo form_label('What is your Name', 'username', $attributes);
diff --git a/user_guide_src/source/helpers/form_helper/031.php b/user_guide_src/source/helpers/form_helper/031.php
index 671a69fcf6d8..c95d783fc985 100644
--- a/user_guide_src/source/helpers/form_helper/031.php
+++ b/user_guide_src/source/helpers/form_helper/031.php
@@ -1,4 +1,4 @@
 <?php
 
-echo form_button('name','content');
+echo form_button('name', 'content');
 // Would produce: <button name="name" type="button">Content</button>
diff --git a/user_guide_src/source/helpers/html_helper/011.php b/user_guide_src/source/helpers/html_helper/011.php
index 0d15fc0e6c69..126fd86c4952 100644
--- a/user_guide_src/source/helpers/html_helper/011.php
+++ b/user_guide_src/source/helpers/html_helper/011.php
@@ -1,6 +1,6 @@
 <?php
 
-$script = ['src'  => 'js/printer.js'];
+$script = ['src' => 'js/printer.js'];
 
 echo script_tag($script);
 // <script src="http://site.com/js/printer.js" type="text/javascript"></script>
diff --git a/user_guide_src/source/helpers/html_helper/013.php b/user_guide_src/source/helpers/html_helper/013.php
index 435ebc5535d2..113ecbbaf6c6 100644
--- a/user_guide_src/source/helpers/html_helper/013.php
+++ b/user_guide_src/source/helpers/html_helper/013.php
@@ -20,9 +20,9 @@
             'sphere',
         ],
     ],
-    'moods'  => [
+    'moods' => [
         'happy',
-        'upset'   => [
+        'upset' => [
             'defeated' => [
                 'dejected',
                 'disheartened',
@@ -31,8 +31,8 @@
             'annoyed',
             'cross',
             'angry',
-        ]
-    ]
+        ],
+    ],
 ];
 
 echo ul($list, $attributes);
diff --git a/user_guide_src/source/helpers/html_helper/014.php b/user_guide_src/source/helpers/html_helper/014.php
index 505b771d5f1b..e61c2db89e12 100644
--- a/user_guide_src/source/helpers/html_helper/014.php
+++ b/user_guide_src/source/helpers/html_helper/014.php
@@ -2,7 +2,7 @@
 
 $tracks = [
     track('subtitles_no.vtt', 'subtitles', 'no', 'Norwegian No'),
-    track('subtitles_yes.vtt', 'subtitles', 'yes', 'Norwegian Yes')
+    track('subtitles_yes.vtt', 'subtitles', 'yes', 'Norwegian Yes'),
 ];
 
 echo video('test.mp4', 'Your browser does not support the video tag.', 'controls');
@@ -14,13 +14,14 @@
     $tracks
 );
 
-echo video([
-    source('movie.mp4', 'video/mp4', 'class="test"'),
-    source('movie.ogg', 'video/ogg'),
-    source('movie.mov', 'video/quicktime'),
-    source('movie.ogv', 'video/ogv; codecs=dirac, speex')
-],
+echo video(
+    [
+        source('movie.mp4', 'video/mp4', 'class="test"'),
+        source('movie.ogg', 'video/ogg'),
+        source('movie.mov', 'video/quicktime'),
+        source('movie.ogv', 'video/ogv; codecs=dirac, speex'),
+    ],
     'Your browser does not support the video tag.',
     'class="test" controls',
     $tracks
- );
+);
diff --git a/user_guide_src/source/helpers/html_helper/017.php b/user_guide_src/source/helpers/html_helper/017.php
index a0b38b79e672..1ff7fb45ba01 100644
--- a/user_guide_src/source/helpers/html_helper/017.php
+++ b/user_guide_src/source/helpers/html_helper/017.php
@@ -8,6 +8,6 @@
     'class="test"',
     [
         param('foo', 'bar', 'ref', 'class="test"'),
-        param('hello', 'world', 'ref', 'class="test"')
+        param('hello', 'world', 'ref', 'class="test"'),
     ]
 );
diff --git a/user_guide_src/source/helpers/text_helper/006.php b/user_guide_src/source/helpers/text_helper/006.php
index 4c564c6da0f6..3327d2e2176d 100644
--- a/user_guide_src/source/helpers/text_helper/006.php
+++ b/user_guide_src/source/helpers/text_helper/006.php
@@ -1,4 +1,4 @@
 <?php
 
-$string = "http://example.com//index.php";
+$string = 'http://example.com//index.php';
 echo reduce_double_slashes($string); // results in "http://example.com/index.php"
diff --git a/user_guide_src/source/helpers/text_helper/007.php b/user_guide_src/source/helpers/text_helper/007.php
index 82306af31aab..a6018c0083f2 100644
--- a/user_guide_src/source/helpers/text_helper/007.php
+++ b/user_guide_src/source/helpers/text_helper/007.php
@@ -1,8 +1,8 @@
 <?php
 
 $str = [
-    'question' => "Is your name O\'reilly?",
-    'answer'   => "No, my name is O\'connor."
+    'question' => "Is your name O\\'reilly?",
+    'answer'   => "No, my name is O\\'connor.",
 ];
 
 $str = strip_slashes($str);
diff --git a/user_guide_src/source/helpers/text_helper/008.php b/user_guide_src/source/helpers/text_helper/008.php
index 073f97ff0046..c4cd2f1c53ca 100644
--- a/user_guide_src/source/helpers/text_helper/008.php
+++ b/user_guide_src/source/helpers/text_helper/008.php
@@ -2,5 +2,5 @@
 
 [
     'question' => "Is your name O'reilly?",
-    'answer'   => "No, my name is O'connor."
+    'answer'   => "No, my name is O'connor.",
 ];
diff --git a/user_guide_src/source/helpers/text_helper/009.php b/user_guide_src/source/helpers/text_helper/009.php
index 8081482f17eb..60f35bc49ead 100644
--- a/user_guide_src/source/helpers/text_helper/009.php
+++ b/user_guide_src/source/helpers/text_helper/009.php
@@ -1,4 +1,4 @@
 <?php
 
-$string = "Fred, Bill,, Joe, Jimmy";
-$string = reduce_multiples($string, ","); // results in "Fred, Bill, Joe, Jimmy"
+$string = 'Fred, Bill,, Joe, Jimmy';
+$string = reduce_multiples($string, ','); // results in "Fred, Bill, Joe, Jimmy"
diff --git a/user_guide_src/source/helpers/text_helper/010.php b/user_guide_src/source/helpers/text_helper/010.php
index 45cdcc98bf21..fd79b8f639c1 100644
--- a/user_guide_src/source/helpers/text_helper/010.php
+++ b/user_guide_src/source/helpers/text_helper/010.php
@@ -1,4 +1,4 @@
 <?php
 
-$string = ",Fred, Bill,, Joe, Jimmy,";
-$string = reduce_multiples($string, ", ", true); // results in "Fred, Bill, Joe, Jimmy"
+$string = ',Fred, Bill,, Joe, Jimmy,';
+$string = reduce_multiples($string, ', ', true); // results in "Fred, Bill, Joe, Jimmy"
diff --git a/user_guide_src/source/helpers/text_helper/011.php b/user_guide_src/source/helpers/text_helper/011.php
index 793d3551b555..61966a8325af 100644
--- a/user_guide_src/source/helpers/text_helper/011.php
+++ b/user_guide_src/source/helpers/text_helper/011.php
@@ -1,4 +1,4 @@
 <?php
 
 $string = "Joe's \"dinner\"";
-$string = quotes_to_entities($string); //results in "Joe&#39;s &quot;dinner&quot;"
+$string = quotes_to_entities($string); // results in "Joe&#39;s &quot;dinner&quot;"
diff --git a/user_guide_src/source/helpers/text_helper/012.php b/user_guide_src/source/helpers/text_helper/012.php
index 1aacfb1e5dc8..32260df7eb53 100644
--- a/user_guide_src/source/helpers/text_helper/012.php
+++ b/user_guide_src/source/helpers/text_helper/012.php
@@ -1,4 +1,4 @@
 <?php
 
 $string = "Joe's \"dinner\"";
-$string = strip_quotes($string); //results in "Joes dinner"
+$string = strip_quotes($string); // results in "Joes dinner"
diff --git a/user_guide_src/source/helpers/text_helper/013.php b/user_guide_src/source/helpers/text_helper/013.php
index a48bc596d2fb..df9b7041b93b 100644
--- a/user_guide_src/source/helpers/text_helper/013.php
+++ b/user_guide_src/source/helpers/text_helper/013.php
@@ -1,5 +1,5 @@
 <?php
 
-$string = "Here is a nice text string consisting of eleven words.";
+$string = 'Here is a nice text string consisting of eleven words.';
 $string = word_limiter($string, 4);
 // Returns:  Here is a nice
diff --git a/user_guide_src/source/helpers/text_helper/014.php b/user_guide_src/source/helpers/text_helper/014.php
index 853da16b0346..cfaa446bfa8f 100644
--- a/user_guide_src/source/helpers/text_helper/014.php
+++ b/user_guide_src/source/helpers/text_helper/014.php
@@ -1,5 +1,5 @@
 <?php
 
-$string = "Here is a nice text string consisting of eleven words.";
+$string = 'Here is a nice text string consisting of eleven words.';
 $string = character_limiter($string, 20);
 // Returns:  Here is a nice text string
diff --git a/user_guide_src/source/helpers/text_helper/019.php b/user_guide_src/source/helpers/text_helper/019.php
index e543d6784a78..22e34f25b939 100644
--- a/user_guide_src/source/helpers/text_helper/019.php
+++ b/user_guide_src/source/helpers/text_helper/019.php
@@ -1,4 +1,4 @@
 <?php
 
-$string = "Here is a nice text string about nothing in particular.";
-echo highlight_phrase($string, "nice text", '<span style="color:#990000;">', '</span>');
+$string = 'Here is a nice text string about nothing in particular.';
+echo highlight_phrase($string, 'nice text', '<span style="color:#990000;">', '</span>');
diff --git a/user_guide_src/source/helpers/text_helper/020.php b/user_guide_src/source/helpers/text_helper/020.php
index 2a4f595f3655..8b2606aea1bf 100644
--- a/user_guide_src/source/helpers/text_helper/020.php
+++ b/user_guide_src/source/helpers/text_helper/020.php
@@ -1,6 +1,6 @@
 <?php
 
-$string = "Here is a simple string of text that will help us demonstrate this function.";
+$string = 'Here is a simple string of text that will help us demonstrate this function.';
 echo word_wrap($string, 25);
 /*
  * Would produce:
diff --git a/user_guide_src/source/incoming/filters/001.php b/user_guide_src/source/incoming/filters/001.php
index 442cbadb89be..50e41518cabf 100644
--- a/user_guide_src/source/incoming/filters/001.php
+++ b/user_guide_src/source/incoming/filters/001.php
@@ -2,9 +2,9 @@
 
 namespace App\Filters;
 
+use CodeIgniter\Filters\FilterInterface;
 use CodeIgniter\HTTP\RequestInterface;
 use CodeIgniter\HTTP\ResponseInterface;
-use CodeIgniter\Filters\FilterInterface;
 
 class MyFilter implements FilterInterface
 {
diff --git a/user_guide_src/source/incoming/incomingrequest/007.php b/user_guide_src/source/incoming/incomingrequest/007.php
index 1c7a14b45ed5..922f9228c358 100644
--- a/user_guide_src/source/incoming/incomingrequest/007.php
+++ b/user_guide_src/source/incoming/incomingrequest/007.php
@@ -1,3 +1,3 @@
 <?php
 
-$something = isset($_POST['foo']) ? $_POST['foo'] : null;
+$something = $_POST['foo'] ?? null;
diff --git a/user_guide_src/source/incoming/incomingrequest/018.php b/user_guide_src/source/incoming/incomingrequest/018.php
index 80243598d821..feee76d3c226 100644
--- a/user_guide_src/source/incoming/incomingrequest/018.php
+++ b/user_guide_src/source/incoming/incomingrequest/018.php
@@ -1,4 +1,4 @@
 <?php
 
 // Accept-Encoding: gzip, deflate, sdch
-echo 'Accept-Encoding: '.$request->getHeaderLine('accept-encoding');
+echo 'Accept-Encoding: ' . $request->getHeaderLine('accept-encoding');
diff --git a/user_guide_src/source/incoming/incomingrequest/019.php b/user_guide_src/source/incoming/incomingrequest/019.php
index 14e917083397..a31ffd384853 100644
--- a/user_guide_src/source/incoming/incomingrequest/019.php
+++ b/user_guide_src/source/incoming/incomingrequest/019.php
@@ -1,3 +1,3 @@
 <?php
 
-echo (string)$header;
+echo (string) $header;
diff --git a/user_guide_src/source/incoming/restful/001.php b/user_guide_src/source/incoming/restful/001.php
index 4a3ee8133b7d..3244b799ff91 100644
--- a/user_guide_src/source/incoming/restful/001.php
+++ b/user_guide_src/source/incoming/restful/001.php
@@ -3,11 +3,11 @@
 $routes->resource('photos');
 
 // Equivalent to the following:
-$routes->get('photos/new',             'Photos::new');
-$routes->post('photos',                'Photos::create');
-$routes->get('photos',                 'Photos::index');
-$routes->get('photos/(:segment)',      'Photos::show/$1');
+$routes->get('photos/new', 'Photos::new');
+$routes->post('photos', 'Photos::create');
+$routes->get('photos', 'Photos::index');
+$routes->get('photos/(:segment)', 'Photos::show/$1');
 $routes->get('photos/(:segment)/edit', 'Photos::edit/$1');
-$routes->put('photos/(:segment)',      'Photos::update/$1');
-$routes->patch('photos/(:segment)',    'Photos::update/$1');
-$routes->delete('photos/(:segment)',   'Photos::delete/$1');
+$routes->put('photos/(:segment)', 'Photos::update/$1');
+$routes->patch('photos/(:segment)', 'Photos::update/$1');
+$routes->delete('photos/(:segment)', 'Photos::delete/$1');
diff --git a/user_guide_src/source/incoming/restful/002.php b/user_guide_src/source/incoming/restful/002.php
index cc879a2ab667..67ce23393964 100644
--- a/user_guide_src/source/incoming/restful/002.php
+++ b/user_guide_src/source/incoming/restful/002.php
@@ -4,4 +4,4 @@
 
 // The following equivalent routes are created:
 $routes->post('photos/(:segment)/delete', 'Photos::delete/$1');
-$routes->post('photos/(:segment)',        'Photos::update/$1');
+$routes->post('photos/(:segment)', 'Photos::update/$1');
diff --git a/user_guide_src/source/incoming/restful/003.php b/user_guide_src/source/incoming/restful/003.php
index 1485f3c4edea..6610555f0a5f 100644
--- a/user_guide_src/source/incoming/restful/003.php
+++ b/user_guide_src/source/incoming/restful/003.php
@@ -1,6 +1,6 @@
 <?php
 
-$routes->resource('photos', ['controller' =>'App\Gallery']);
+$routes->resource('photos', ['controller' => 'App\Gallery']);
 
 // Would create routes like:
 $routes->get('photos', 'App\Gallery::index');
diff --git a/user_guide_src/source/incoming/restful/009.php b/user_guide_src/source/incoming/restful/009.php
index 5918a044fab5..25e069258781 100644
--- a/user_guide_src/source/incoming/restful/009.php
+++ b/user_guide_src/source/incoming/restful/009.php
@@ -3,13 +3,13 @@
 $routes->presenter('photos');
 
 // Equivalent to the following:
-$routes->get('photos/new',                'Photos::new');
-$routes->post('photos/create',            'Photos::create');
-$routes->post('photos',                   'Photos::create');   // alias
-$routes->get('photos',                    'Photos::index');
-$routes->get('photos/show/(:segment)',    'Photos::show/$1');
-$routes->get('photos/(:segment)',         'Photos::show/$1');  // alias
-$routes->get('photos/edit/(:segment)',    'Photos::edit/$1');
+$routes->get('photos/new', 'Photos::new');
+$routes->post('photos/create', 'Photos::create');
+$routes->post('photos', 'Photos::create');   // alias
+$routes->get('photos', 'Photos::index');
+$routes->get('photos/show/(:segment)', 'Photos::show/$1');
+$routes->get('photos/(:segment)', 'Photos::show/$1');  // alias
+$routes->get('photos/edit/(:segment)', 'Photos::edit/$1');
 $routes->post('photos/update/(:segment)', 'Photos::update/$1');
-$routes->get('photos/remove/(:segment)',  'Photos::remove/$1');
+$routes->get('photos/remove/(:segment)', 'Photos::remove/$1');
 $routes->post('photos/delete/(:segment)', 'Photos::delete/$1');
diff --git a/user_guide_src/source/incoming/restful/011.php b/user_guide_src/source/incoming/restful/011.php
index 5c949d80cc29..cbb6f13bdf85 100644
--- a/user_guide_src/source/incoming/restful/011.php
+++ b/user_guide_src/source/incoming/restful/011.php
@@ -1,6 +1,6 @@
 <?php
 
-$routes->presenter('photos', ['controller' =>'App\Gallery']);
+$routes->presenter('photos', ['controller' => 'App\Gallery']);
 
 // Would create routes like:
 $routes->get('photos', 'App\Gallery::index');
diff --git a/user_guide_src/source/incoming/restful/015.php b/user_guide_src/source/incoming/restful/015.php
index fc5713b20d61..0600f7c686ef 100644
--- a/user_guide_src/source/incoming/restful/015.php
+++ b/user_guide_src/source/incoming/restful/015.php
@@ -6,7 +6,6 @@
 
 class Photos extends ResourcePresenter
 {
-
     protected $modelName = 'App\Models\Photos';
 
     public function index()
diff --git a/user_guide_src/source/incoming/routing/002.php b/user_guide_src/source/incoming/routing/002.php
index 4ddfd31abaed..030ac6d25045 100644
--- a/user_guide_src/source/incoming/routing/002.php
+++ b/user_guide_src/source/incoming/routing/002.php
@@ -4,4 +4,4 @@
 $routes->get('users', 'Users::list');
 
 // Calls $Users->list(1, 23)
-$routes->get('users/1/23', 'Users::list/1/23');
\ No newline at end of file
+$routes->get('users/1/23', 'Users::list/1/23');
diff --git a/user_guide_src/source/incoming/routing/016.php b/user_guide_src/source/incoming/routing/016.php
index 2d0f48cb284e..e4fc5bde4a68 100644
--- a/user_guide_src/source/incoming/routing/016.php
+++ b/user_guide_src/source/incoming/routing/016.php
@@ -1,6 +1,6 @@
 <?php
 
-$routes->get('feed', function () {
+$routes->get('feed', static function () {
     $rss = new RSSFeeder();
 
     return $rss->feed('general');
diff --git a/user_guide_src/source/incoming/routing/019.php b/user_guide_src/source/incoming/routing/019.php
index 8c770fd05f24..6f08c319c551 100644
--- a/user_guide_src/source/incoming/routing/019.php
+++ b/user_guide_src/source/incoming/routing/019.php
@@ -1,6 +1,6 @@
 <?php
 
-$routes->group('admin', function ($routes) {
+$routes->group('admin', static function ($routes) {
     $routes->get('users', 'Admin\Users::index');
     $routes->get('blog', 'Admin\Blog::index');
 });
diff --git a/user_guide_src/source/incoming/routing/020.php b/user_guide_src/source/incoming/routing/020.php
index 678e90700e74..7c66c3b693dd 100644
--- a/user_guide_src/source/incoming/routing/020.php
+++ b/user_guide_src/source/incoming/routing/020.php
@@ -1,5 +1,5 @@
 <?php
 
-$routes->group('api', ['namespace' => 'App\API\v1'], function ($routes) {
+$routes->group('api', ['namespace' => 'App\API\v1'], static function ($routes) {
     $routes->resource('users');
 });
diff --git a/user_guide_src/source/incoming/routing/021.php b/user_guide_src/source/incoming/routing/021.php
index 395ddfe6c8c8..75cec09100cb 100644
--- a/user_guide_src/source/incoming/routing/021.php
+++ b/user_guide_src/source/incoming/routing/021.php
@@ -1,5 +1,5 @@
 <?php
 
-$routes->group('api', ['filter' => 'api-auth'], function ($routes) {
+$routes->group('api', ['filter' => 'api-auth'], static function ($routes) {
     $routes->resource('users');
 });
diff --git a/user_guide_src/source/incoming/routing/022.php b/user_guide_src/source/incoming/routing/022.php
index 08169acec275..1ed2a8a96ee6 100644
--- a/user_guide_src/source/incoming/routing/022.php
+++ b/user_guide_src/source/incoming/routing/022.php
@@ -1,7 +1,7 @@
 <?php
 
-$routes->group('admin', function ($routes) {
-    $routes->group('users', function ($routes) {
+$routes->group('admin', static function ($routes) {
+    $routes->group('users', static function ($routes) {
         $routes->get('list', 'Admin\Users::list');
     });
 });
diff --git a/user_guide_src/source/incoming/routing/024.php b/user_guide_src/source/incoming/routing/024.php
index 69a4c184ab36..53921b33f5eb 100644
--- a/user_guide_src/source/incoming/routing/024.php
+++ b/user_guide_src/source/incoming/routing/024.php
@@ -1,5 +1,5 @@
 <?php
 
-$routes->environment('development', function ($routes) {
+$routes->environment('development', static function ($routes) {
     $routes->get('builder', 'Tools\Builder::index');
 });
diff --git a/user_guide_src/source/incoming/routing/025.php b/user_guide_src/source/incoming/routing/025.php
index 3379179f4be1..e6bc6bdfb65f 100644
--- a/user_guide_src/source/incoming/routing/025.php
+++ b/user_guide_src/source/incoming/routing/025.php
@@ -5,6 +5,6 @@
 
 ?>
 
-<!-- Generate the relative URL to link to user ID 15, gallery 12: --> 
+<!-- Generate the relative URL to link to user ID 15, gallery 12: -->
 <a href="<?= route_to('App\Controllers\Galleries::showUserGallery', 15, 12) ?>">View Gallery</a>
 <!-- Result: '/users/15/gallery/12' -->
diff --git a/user_guide_src/source/incoming/routing/026.php b/user_guide_src/source/incoming/routing/026.php
index 604e9f95b26e..1c1c629893e3 100644
--- a/user_guide_src/source/incoming/routing/026.php
+++ b/user_guide_src/source/incoming/routing/026.php
@@ -5,6 +5,6 @@
 
 ?>
 
-<!-- Generate the relative URL to link to user ID 15, gallery 12: --> 
+<!-- Generate the relative URL to link to user ID 15, gallery 12: -->
 <a href="<?= route_to('user_gallery', 15, 12) ?>">View Gallery</a>
 <!-- Result: '/users/15/gallery/12' -->
diff --git a/user_guide_src/source/incoming/routing/029.php b/user_guide_src/source/incoming/routing/029.php
index fad1213d3f22..ff7e995a1526 100644
--- a/user_guide_src/source/incoming/routing/029.php
+++ b/user_guide_src/source/incoming/routing/029.php
@@ -11,4 +11,4 @@
 $routes->match(['get', 'put'], 'from', 'to', $options);
 $routes->resource('photos', $options);
 $routes->map($array, $options);
-$routes->group('name', $options, function (){});
+$routes->group('name', $options, static function () {});
diff --git a/user_guide_src/source/incoming/routing/030.php b/user_guide_src/source/incoming/routing/030.php
index ca1121e0786d..2515937bb02a 100644
--- a/user_guide_src/source/incoming/routing/030.php
+++ b/user_guide_src/source/incoming/routing/030.php
@@ -1,3 +1,3 @@
 <?php
 
-$routes->get('admin',' AdminController::index', ['filter' => 'admin-auth']);
+$routes->get('admin', ' AdminController::index', ['filter' => 'admin-auth']);
diff --git a/user_guide_src/source/incoming/routing/032.php b/user_guide_src/source/incoming/routing/032.php
index 14d5142de2f0..dd6cd63ba61d 100644
--- a/user_guide_src/source/incoming/routing/032.php
+++ b/user_guide_src/source/incoming/routing/032.php
@@ -1,3 +1,3 @@
 <?php
 
-$routes->get('admin',' AdminController::index', ['filter' => \App\Filters\SomeFilter::class]);
+$routes->get('admin', ' AdminController::index', ['filter' => \App\Filters\SomeFilter::class]);
diff --git a/user_guide_src/source/incoming/routing/033.php b/user_guide_src/source/incoming/routing/033.php
index 24cf6c5dbc2d..94ae43246897 100644
--- a/user_guide_src/source/incoming/routing/033.php
+++ b/user_guide_src/source/incoming/routing/033.php
@@ -1,3 +1,3 @@
 <?php
 
-$routes->get('admin',' AdminController::index', ['filter' => ['admin-auth', \App\Filters\SomeFilter::class]]);
+$routes->get('admin', ' AdminController::index', ['filter' => ['admin-auth', \App\Filters\SomeFilter::class]]);
diff --git a/user_guide_src/source/incoming/routing/047.php b/user_guide_src/source/incoming/routing/047.php
index 1f3758e244d4..dddd067f0f26 100644
--- a/user_guide_src/source/incoming/routing/047.php
+++ b/user_guide_src/source/incoming/routing/047.php
@@ -4,7 +4,6 @@
 $routes->set404Override('App\Errors::show404');
 
 // Will display a custom view
-$routes->set404Override(function ()
-{
+$routes->set404Override(static function () {
     echo view('my_errors/not_found.html');
 });
diff --git a/user_guide_src/source/installation/troubleshooting/001.php b/user_guide_src/source/installation/troubleshooting/001.php
index 65f74aae9efc..54f5c279f554 100644
--- a/user_guide_src/source/installation/troubleshooting/001.php
+++ b/user_guide_src/source/installation/troubleshooting/001.php
@@ -7,8 +7,8 @@
 class App extends BaseConfig
 {
     // ...
-    
+
     public $indexPage = 'index.php';
-    
+
     // ...
 }
diff --git a/user_guide_src/source/installation/upgrade_database/002.php b/user_guide_src/source/installation/upgrade_database/002.php
index 65fdc4c24d1b..18a1e627fe80 100644
--- a/user_guide_src/source/installation/upgrade_database/002.php
+++ b/user_guide_src/source/installation/upgrade_database/002.php
@@ -3,6 +3,6 @@
 $builder = $db->table('mytable');
 
 $query = $builder->select('title')
-             ->where('id', $id)
-             ->limit(10, 20)
-             ->get();
+    ->where('id', $id)
+    ->limit(10, 20)
+    ->get();
diff --git a/user_guide_src/source/installation/upgrade_encryption/002.php b/user_guide_src/source/installation/upgrade_encryption/002.php
index 91b00ee54e83..695d69e24a28 100644
--- a/user_guide_src/source/installation/upgrade_encryption/002.php
+++ b/user_guide_src/source/installation/upgrade_encryption/002.php
@@ -2,7 +2,7 @@
 
 $encrypter = service('encrypter');
 
-$plainText = 'This is a plain-text message!';
+$plainText  = 'This is a plain-text message!';
 $ciphertext = $encrypter->encrypt($plainText);
 
 // Outputs: This is a plain-text message!
diff --git a/user_guide_src/source/installation/upgrade_file_upload/002.php b/user_guide_src/source/installation/upgrade_file_upload/002.php
index 29de4bf665dc..6a4e6c88e250 100644
--- a/user_guide_src/source/installation/upgrade_file_upload/002.php
+++ b/user_guide_src/source/installation/upgrade_file_upload/002.php
@@ -2,8 +2,8 @@
 
 namespace App\Controllers;
 
-class Upload extends BaseController {
-
+class Upload extends BaseController
+{
     public function index()
     {
         echo view('upload_form', ['error' => ' ']);
@@ -14,13 +14,13 @@ public function do_upload()
         $this->validate([
             'userfile' => 'uploaded[userfile]|max_size[userfile,100]'
                            . '|mime_in[userfile,image/png,image/jpg,image/gif]'
-                           . '|ext_in[userfile,png,jpg,gif]|max_dims[userfile,1024,768]'
+                           . '|ext_in[userfile,png,jpg,gif]|max_dims[userfile,1024,768]',
         ]);
 
         $file = $this->request->getFile('userfile');
 
         if (! $path = $file->store()) {
-            echo view('upload_form', ['error' => "upload failed"]);
+            echo view('upload_form', ['error' => 'upload failed']);
         } else {
             $data = ['upload_file_path' => $path];
 
diff --git a/user_guide_src/source/installation/upgrade_localization/001.php b/user_guide_src/source/installation/upgrade_localization/001.php
index 731d1c5f2430..7248a03e3c72 100644
--- a/user_guide_src/source/installation/upgrade_localization/001.php
+++ b/user_guide_src/source/installation/upgrade_localization/001.php
@@ -7,8 +7,8 @@
 class App extends BaseConfig
 {
     // ...
-    
+
     public $defaultLocale = 'en';
-    
+
     // ...
 }
diff --git a/user_guide_src/source/installation/upgrade_validations/001.php b/user_guide_src/source/installation/upgrade_validations/001.php
index f9730b8f3e3f..36ec03941532 100644
--- a/user_guide_src/source/installation/upgrade_validations/001.php
+++ b/user_guide_src/source/installation/upgrade_validations/001.php
@@ -3,5 +3,5 @@
 $isValid = $this->validate([
     'name'  => 'required|min_length[3]',
     'email' => 'required|valid_email',
-    'phone' => 'required|numeric|max_length[10]'
+    'phone' => 'required|numeric|max_length[10]',
 ]);
diff --git a/user_guide_src/source/installation/upgrade_view_parser/002.php b/user_guide_src/source/installation/upgrade_view_parser/002.php
index 2f4607092635..6bef47ef69ec 100644
--- a/user_guide_src/source/installation/upgrade_view_parser/002.php
+++ b/user_guide_src/source/installation/upgrade_view_parser/002.php
@@ -4,7 +4,7 @@
 
 $data = [
     'blog_title'   => 'My Blog Title',
-    'blog_heading' => 'My Blog Heading'
+    'blog_heading' => 'My Blog Heading',
 ];
 
 echo $parser->setData($data)
diff --git a/user_guide_src/source/libraries/cookies/003.php b/user_guide_src/source/libraries/cookies/003.php
index 2b41c1e4209f..f878ff8592d1 100644
--- a/user_guide_src/source/libraries/cookies/003.php
+++ b/user_guide_src/source/libraries/cookies/003.php
@@ -4,7 +4,7 @@
 use Config\Cookie as CookieConfig;
 
 $oldDefaults = Cookie::setDefaults(new CookieConfig());
-$cookie = new Cookie('my_token', 'muffins');
+$cookie      = new Cookie('my_token', 'muffins');
 
 // return the old defaults
 Cookie::setDefaults($oldDefaults);
diff --git a/user_guide_src/source/libraries/curlrequest/003.php b/user_guide_src/source/libraries/curlrequest/003.php
index 9eb5d0d1e591..5f02e4f18c00 100644
--- a/user_guide_src/source/libraries/curlrequest/003.php
+++ b/user_guide_src/source/libraries/curlrequest/003.php
@@ -2,6 +2,6 @@
 
 $options = [
     'baseURI' => 'http://example.com/api/v1/',
-    'timeout'  => 3,
+    'timeout' => 3,
 ];
 $client = \Config\Services::curlrequest($options);
diff --git a/user_guide_src/source/libraries/curlrequest/010.php b/user_guide_src/source/libraries/curlrequest/010.php
index e13fa1c5e7e3..12e892980beb 100644
--- a/user_guide_src/source/libraries/curlrequest/010.php
+++ b/user_guide_src/source/libraries/curlrequest/010.php
@@ -5,5 +5,5 @@
 
 // Get all headers
 foreach ($response->getHeaders() as $name => $value) {
-    echo $name .': '. $response->getHeaderLine($name) ."\n";
+    echo $name . ': ' . $response->getHeaderLine($name) . "\n";
 }
diff --git a/user_guide_src/source/libraries/curlrequest/015.php b/user_guide_src/source/libraries/curlrequest/015.php
index c8c85ee7f116..136a6ca13286 100644
--- a/user_guide_src/source/libraries/curlrequest/015.php
+++ b/user_guide_src/source/libraries/curlrequest/015.php
@@ -2,5 +2,5 @@
 
 $client->request('GET', 'http://example.com', ['allow_redirects' => [
     'max'       => 10,
-    'protocols' => ['https'] // Force HTTPS domains only.
+    'protocols' => ['https'], // Force HTTPS domains only.
 ]]);
diff --git a/user_guide_src/source/libraries/curlrequest/017.php b/user_guide_src/source/libraries/curlrequest/017.php
index fbc6302a68ec..3f6012cfb70b 100644
--- a/user_guide_src/source/libraries/curlrequest/017.php
+++ b/user_guide_src/source/libraries/curlrequest/017.php
@@ -1,3 +1,3 @@
 <?php
 
-$client->setBody($body) ->request('put', 'http://example.com');
+$client->setBody($body)->request('put', 'http://example.com');
diff --git a/user_guide_src/source/libraries/email/013.php b/user_guide_src/source/libraries/email/013.php
index 744360f49cc1..60147e305d34 100644
--- a/user_guide_src/source/libraries/email/013.php
+++ b/user_guide_src/source/libraries/email/013.php
@@ -1,12 +1,11 @@
 <?php
 
-foreach ($list as $name => $address)
-{
+foreach ($list as $name => $address) {
     $email->clear();
 
     $email->setTo($address);
     $email->setFrom('your@example.com');
-    $email->setSubject('Here is your info '.$name);
+    $email->setSubject('Here is your info ' . $name);
     $email->setMessage('Hi ' . $name . ' Here is the info you requested.');
     $email->send();
 }
diff --git a/user_guide_src/source/libraries/email/022.php b/user_guide_src/source/libraries/email/022.php
index a6d9bfadeb70..80dcaf8d85ce 100644
--- a/user_guide_src/source/libraries/email/022.php
+++ b/user_guide_src/source/libraries/email/022.php
@@ -6,6 +6,6 @@
 foreach ($list as $address) {
     $email->setTo($address);
     $cid = $email->setAttachmentCID($filename);
-    $email->setMessage('<img src="cid:'. $cid .'" alt="photo1" />');
+    $email->setMessage('<img src="cid:' . $cid . '" alt="photo1" />');
     $email->send();
 }
diff --git a/user_guide_src/source/libraries/encryption/002.php b/user_guide_src/source/libraries/encryption/002.php
index c7dccced0797..62061dbd928d 100644
--- a/user_guide_src/source/libraries/encryption/002.php
+++ b/user_guide_src/source/libraries/encryption/002.php
@@ -1,6 +1,6 @@
 <?php
 
-$plainText = 'This is a plain-text message!';
+$plainText  = 'This is a plain-text message!';
 $ciphertext = $encrypter->encrypt($plainText);
 
 // Outputs: This is a plain-text message!
diff --git a/user_guide_src/source/libraries/encryption/005.php b/user_guide_src/source/libraries/encryption/005.php
index cbc92a5d1be1..df42a88d3a08 100644
--- a/user_guide_src/source/libraries/encryption/005.php
+++ b/user_guide_src/source/libraries/encryption/005.php
@@ -7,6 +7,6 @@
 class Encryption extends BaseConfig
 {
     public $key = 'YOUR KEY';
-    
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/files/004.php b/user_guide_src/source/libraries/files/004.php
index e73de3b6cd74..e3998d56af19 100644
--- a/user_guide_src/source/libraries/files/004.php
+++ b/user_guide_src/source/libraries/files/004.php
@@ -1,3 +1,3 @@
 <?php
 
-$size     = $file->getSize(); // 256901
+$size = $file->getSize(); // 256901
diff --git a/user_guide_src/source/libraries/images/011.php b/user_guide_src/source/libraries/images/011.php
index c72932893af8..f18fb55545a1 100644
--- a/user_guide_src/source/libraries/images/011.php
+++ b/user_guide_src/source/libraries/images/011.php
@@ -7,5 +7,5 @@
 
 \Config\Services::image('imagick')
     ->withFile('/path/to/image/mypic.png')
-    ->flatten(25,25,112)
+    ->flatten(25, 25, 112)
     ->save('/path/to/new/image.jpg');
diff --git a/user_guide_src/source/libraries/images/014.php b/user_guide_src/source/libraries/images/014.php
index 4afd1e12d420..32943ed142c6 100644
--- a/user_guide_src/source/libraries/images/014.php
+++ b/user_guide_src/source/libraries/images/014.php
@@ -8,6 +8,6 @@
         'withShadow' => true,
         'hAlign'     => 'center',
         'vAlign'     => 'bottom',
-        'fontSize'   => 20
+        'fontSize'   => 20,
     ])
     ->save('/path/to/new/image.jpg');
diff --git a/user_guide_src/source/libraries/pagination/005.php b/user_guide_src/source/libraries/pagination/005.php
index 149f369b321c..dec2c3161e76 100644
--- a/user_guide_src/source/libraries/pagination/005.php
+++ b/user_guide_src/source/libraries/pagination/005.php
@@ -1,6 +1,6 @@
 <?php
 
 $userModel = new \App\Models\UserModel();
-$page = 3;
+$page      = 3;
 
 $users = $userModel->paginate(10, 'group1', $page);
diff --git a/user_guide_src/source/libraries/publisher/005.php b/user_guide_src/source/libraries/publisher/005.php
index 5d598c3f7d1c..d369073dd6df 100644
--- a/user_guide_src/source/libraries/publisher/005.php
+++ b/user_guide_src/source/libraries/publisher/005.php
@@ -3,8 +3,7 @@
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\Publisher\Publisher;
 
-foreach (Publisher::discover() as $publisher)
-{
+foreach (Publisher::discover() as $publisher) {
     $result = $publisher->publish();
 
     if ($result === false) {
diff --git a/user_guide_src/source/libraries/publisher/009.php b/user_guide_src/source/libraries/publisher/009.php
index 4756956740bd..1e840ce9da2c 100644
--- a/user_guide_src/source/libraries/publisher/009.php
+++ b/user_guide_src/source/libraries/publisher/009.php
@@ -27,8 +27,6 @@ class BootstrapPublisher extends Publisher
     /**
      * Use the "publish" method to indicate that this
      * class is ready to be discovered and automated.
-     *
-     * @return boolean
      */
     public function publish(): bool
     {
diff --git a/user_guide_src/source/libraries/publisher/010.php b/user_guide_src/source/libraries/publisher/010.php
index 3ea9c40e24b6..652322fd0bcb 100644
--- a/user_guide_src/source/libraries/publisher/010.php
+++ b/user_guide_src/source/libraries/publisher/010.php
@@ -28,6 +28,7 @@ public function run(array $params)
             ])->merge(false); // Be careful not to overwrite anything
         } catch (Throwable $e) {
             $this->showError($e);
+
             return;
         }
 
diff --git a/user_guide_src/source/libraries/sessions/014.php b/user_guide_src/source/libraries/sessions/014.php
index 50b76d2409b5..45bce58b5e06 100644
--- a/user_guide_src/source/libraries/sessions/014.php
+++ b/user_guide_src/source/libraries/sessions/014.php
@@ -2,6 +2,6 @@
 
 // returns false if the 'some_name' item doesn't exist or is null,
 // true otherwise:
-if(isset($_SESSION['some_name'])) {
+if (isset($_SESSION['some_name'])) {
     // ...
 }
diff --git a/user_guide_src/source/libraries/sessions/016.php b/user_guide_src/source/libraries/sessions/016.php
index ef48af6552cc..e80a0177905a 100644
--- a/user_guide_src/source/libraries/sessions/016.php
+++ b/user_guide_src/source/libraries/sessions/016.php
@@ -1,3 +1,3 @@
 <?php
 
-$session->push('hobbies', ['sport'=>'tennis']);
+$session->push('hobbies', ['sport' => 'tennis']);
diff --git a/user_guide_src/source/libraries/sessions/029.php b/user_guide_src/source/libraries/sessions/029.php
index 978341190b52..fd8d241ad069 100644
--- a/user_guide_src/source/libraries/sessions/029.php
+++ b/user_guide_src/source/libraries/sessions/029.php
@@ -6,6 +6,6 @@
 // 'item' will be erased after 300 seconds, while 'item2'
 // will do so after only 240 seconds
 $session->markAsTempdata([
-    'item'    => 300,
-    'item2'    => 240,
+    'item'  => 300,
+    'item2' => 240,
 ]);
diff --git a/user_guide_src/source/libraries/time/030.php b/user_guide_src/source/libraries/time/030.php
index 929a9f272e28..243416cbbdb5 100644
--- a/user_guide_src/source/libraries/time/030.php
+++ b/user_guide_src/source/libraries/time/030.php
@@ -1,6 +1,6 @@
 <?php
 
-$time = Time::parse('May 10, 2017', 'America/Chicago');
+$time  = Time::parse('May 10, 2017', 'America/Chicago');
 $time2 = $time->setTimestamp(strtotime('April 1, 2017'));
 
 echo $time->toDateTimeString();  // 2017-05-10 00:00:00
diff --git a/user_guide_src/source/libraries/uploaded_files/002.php b/user_guide_src/source/libraries/uploaded_files/002.php
index f186d517fd96..11c6b18698d4 100644
--- a/user_guide_src/source/libraries/uploaded_files/002.php
+++ b/user_guide_src/source/libraries/uploaded_files/002.php
@@ -39,10 +39,9 @@ public function upload()
             $data = ['uploaded_flleinfo' => new File($filepath)];
 
             return view('upload_success', $data);
-        } else {
-            $data = ['errors' => 'The file has already been moved.'];
-
-            return view('upload_form', $data);
         }
+        $data = ['errors' => 'The file has already been moved.'];
+
+        return view('upload_form', $data);
     }
 }
diff --git a/user_guide_src/source/libraries/uploaded_files/009.php b/user_guide_src/source/libraries/uploaded_files/009.php
index f37491c04821..f0be5ba1aafb 100644
--- a/user_guide_src/source/libraries/uploaded_files/009.php
+++ b/user_guide_src/source/libraries/uploaded_files/009.php
@@ -1,7 +1,7 @@
 <?php
 
 if ($imagefile = $this->request->getFiles()) {
-    foreach($imagefile['images'] as $img) {
+    foreach ($imagefile['images'] as $img) {
         if ($img->isValid() && ! $img->hasMoved()) {
             $newName = $img->getRandomName();
             $img->move(WRITEPATH . 'uploads', $newName);
diff --git a/user_guide_src/source/libraries/uri/023.php b/user_guide_src/source/libraries/uri/023.php
index 8c611f066c28..34e8764cd045 100644
--- a/user_guide_src/source/libraries/uri/023.php
+++ b/user_guide_src/source/libraries/uri/023.php
@@ -3,6 +3,6 @@
 // URI = http://example.com/users/15/profile
 
 // Prints '15'
-if ($uri->getSegment(1) == 'users') {
+if ($uri->getSegment(1) === 'users') {
     echo $uri->getSegment(2);
 }
diff --git a/user_guide_src/source/libraries/validation/002.php b/user_guide_src/source/libraries/validation/002.php
index 1cc4b9e188ab..30b845e20701 100644
--- a/user_guide_src/source/libraries/validation/002.php
+++ b/user_guide_src/source/libraries/validation/002.php
@@ -4,7 +4,7 @@
     'username' => 'required',
     'password' => 'required|min_length[10]',
     'passconf' => 'required|matches[password]',
-    'email'    => 'required|valid_email',
+    'email' => 'required|valid_email',
 ])) {
     // ...
 }
diff --git a/user_guide_src/source/libraries/validation/004.php b/user_guide_src/source/libraries/validation/004.php
index 60b31dec6d82..01e5f9b648bd 100644
--- a/user_guide_src/source/libraries/validation/004.php
+++ b/user_guide_src/source/libraries/validation/004.php
@@ -1,3 +1,3 @@
 <?php
 
-$validation =  \Config\Services::validation();
+$validation = \Config\Services::validation();
diff --git a/user_guide_src/source/libraries/validation/021.php b/user_guide_src/source/libraries/validation/021.php
index ab70fa937a5d..fa1b37d0f839 100644
--- a/user_guide_src/source/libraries/validation/021.php
+++ b/user_guide_src/source/libraries/validation/021.php
@@ -1,6 +1,6 @@
 <?php
 
 $_POST = [
-    'id' => 4,
+    'id'    => 4,
     'email' => 'foo@example.com',
 ];
diff --git a/user_guide_src/source/libraries/validation/023.php b/user_guide_src/source/libraries/validation/023.php
index 5d0618b338ee..f9ba86d1f60c 100644
--- a/user_guide_src/source/libraries/validation/023.php
+++ b/user_guide_src/source/libraries/validation/023.php
@@ -1,8 +1,9 @@
 <?php
 
-$validation->setRules([
+$validation->setRules(
+    [
         'username' => 'required|is_unique[users.username]',
-        'password' => 'required|min_length[10]'
+        'password' => 'required|min_length[10]',
     ],
     [   // Errors
         'username' => [
diff --git a/user_guide_src/source/libraries/validation/024.php b/user_guide_src/source/libraries/validation/024.php
index b6b7c7464a5d..84478a772271 100644
--- a/user_guide_src/source/libraries/validation/024.php
+++ b/user_guide_src/source/libraries/validation/024.php
@@ -1,6 +1,7 @@
 <?php
 
-$validation->setRules([
+$validation->setRules(
+    [
         'username' => [
             'label'  => 'Username',
             'rules'  => 'required|is_unique[users.username]',
@@ -14,6 +15,6 @@
             'errors' => [
                 'min_length' => 'Your {field} is too short. You want to get hacked?',
             ],
-        ]
+        ],
     ]
 );
diff --git a/user_guide_src/source/libraries/validation/025.php b/user_guide_src/source/libraries/validation/025.php
index 50bd0147aaf2..f04a161f4f47 100644
--- a/user_guide_src/source/libraries/validation/025.php
+++ b/user_guide_src/source/libraries/validation/025.php
@@ -1,6 +1,7 @@
 <?php
 
-$validation->setRules([
+$validation->setRules(
+    [
         'username' => [
             'label'  => 'Rules.username',
             'rules'  => 'required|is_unique[users.username]',
diff --git a/user_guide_src/source/libraries/validation/030.php b/user_guide_src/source/libraries/validation/030.php
index 0da86ca2d054..abac67b15dec 100644
--- a/user_guide_src/source/libraries/validation/030.php
+++ b/user_guide_src/source/libraries/validation/030.php
@@ -2,5 +2,5 @@
 
 $errors = [
     'username' => 'The username field must be unique.',
-    'email'    => 'You must provide a valid email address.'
+    'email'    => 'You must provide a valid email address.',
 ];
diff --git a/user_guide_src/source/libraries/validation/033.php b/user_guide_src/source/libraries/validation/033.php
index d7a10b5071cd..282bef9aabbc 100644
--- a/user_guide_src/source/libraries/validation/033.php
+++ b/user_guide_src/source/libraries/validation/033.php
@@ -4,6 +4,6 @@ class MyRules
 {
     public function even(string $str): bool
     {
-        return (int) $str % 2 == 0;
+        return (int) $str % 2 === 0;
     }
 }
diff --git a/user_guide_src/source/libraries/validation/036.php b/user_guide_src/source/libraries/validation/036.php
index 491c528e87e4..9e13c663b0d7 100644
--- a/user_guide_src/source/libraries/validation/036.php
+++ b/user_guide_src/source/libraries/validation/036.php
@@ -28,9 +28,7 @@ public function required_with($str, string $fields, array $data): bool
 
         // Remove any keys with empty values since, that means they
         // weren't truly there, as far as this is concerned.
-        $requiredFields = array_filter($requiredFields, static function ($item) use ($data) {
-            return ! empty($data[$item]);
-        });
+        $requiredFields = array_filter($requiredFields, static fn ($item) => ! empty($data[$item]));
 
         return empty($requiredFields);
     }
diff --git a/user_guide_src/source/libraries/validation/037.php b/user_guide_src/source/libraries/validation/037.php
index 089b0eeaf465..f37307b0ae07 100644
--- a/user_guide_src/source/libraries/validation/037.php
+++ b/user_guide_src/source/libraries/validation/037.php
@@ -3,8 +3,8 @@
 // is_unique[table.field,ignore_field,ignore_value]
 
 $validation->setRules([
-    'name' => "is_unique[supplier.name,uuid, $uuid]",  // is not ok
-    'name' => "is_unique[supplier.name,uuid,$uuid ]",  // is not ok
-    'name' => "is_unique[supplier.name,uuid,$uuid]",   // is ok
-    'name' => "is_unique[supplier.name,uuid,{uuid}]",  // is ok - see "Validation Placeholders"
+    'name' => "is_unique[supplier.name,uuid, {$uuid}]",  // is not ok
+    'name' => "is_unique[supplier.name,uuid,{$uuid} ]",  // is not ok
+    'name' => "is_unique[supplier.name,uuid,{$uuid}]",   // is ok
+    'name' => 'is_unique[supplier.name,uuid,{uuid}]',  // is ok - see "Validation Placeholders"
 ]);
diff --git a/user_guide_src/source/models/entities/003.php b/user_guide_src/source/models/entities/003.php
index c8cfd58c14db..3b50b6691d0d 100644
--- a/user_guide_src/source/models/entities/003.php
+++ b/user_guide_src/source/models/entities/003.php
@@ -16,7 +16,7 @@
 $userModel->save($user);
 
 // Create
-$user = new \App\Entities\User();
+$user           = new \App\Entities\User();
 $user->username = 'foo';
 $user->email    = 'foo@example.com';
 $userModel->save($user);
diff --git a/user_guide_src/source/models/entities/017.php b/user_guide_src/source/models/entities/017.php
index 422a28cd1c37..cfbd01207678 100644
--- a/user_guide_src/source/models/entities/017.php
+++ b/user_guide_src/source/models/entities/017.php
@@ -9,7 +9,7 @@ class CastBase64 extends BaseCast
 {
     public static function get($value, array $params = [])
     {
-        return base64_decode($value);
+        return base64_decode($value, true);
     }
 
     public static function set($value, array $params = [])
diff --git a/user_guide_src/source/models/model/001.php b/user_guide_src/source/models/model/001.php
index ac8ede5c3dec..c9074ddda6cd 100644
--- a/user_guide_src/source/models/model/001.php
+++ b/user_guide_src/source/models/model/001.php
@@ -12,5 +12,5 @@
 // Create shared instance with a supplied database connection
 // When no namespace is given, it will search through all namespaces
 // the system knows about and attempt to located the UserModel class.
-$db = db_connect('custom');
+$db        = db_connect('custom');
 $userModel = model('UserModel', true, $db);
diff --git a/user_guide_src/source/models/model/007.php b/user_guide_src/source/models/model/007.php
index 1c5d65b7d93e..312575c09578 100644
--- a/user_guide_src/source/models/model/007.php
+++ b/user_guide_src/source/models/model/007.php
@@ -1,3 +1,3 @@
 <?php
 
-$users = $userModel->find([1,2,3]);
+$users = $userModel->find([1, 2, 3]);
diff --git a/user_guide_src/source/models/model/010.php b/user_guide_src/source/models/model/010.php
index bc654f2703c9..cdb8fe06588d 100644
--- a/user_guide_src/source/models/model/010.php
+++ b/user_guide_src/source/models/model/010.php
@@ -1,4 +1,4 @@
 <?php
 
 $users = $userModel->where('active', 1)
-                   ->findAll();
+    ->findAll();
diff --git a/user_guide_src/source/models/model/012.php b/user_guide_src/source/models/model/012.php
index 117771f78ca8..f00b70258b05 100644
--- a/user_guide_src/source/models/model/012.php
+++ b/user_guide_src/source/models/model/012.php
@@ -1,4 +1,4 @@
 <?php
 
 $user = $userModel->where('deleted', 0)
-                  ->first();
+    ->first();
diff --git a/user_guide_src/source/models/model/018.php b/user_guide_src/source/models/model/018.php
index 8c13a5a85e2a..a5f03a2118dc 100644
--- a/user_guide_src/source/models/model/018.php
+++ b/user_guide_src/source/models/model/018.php
@@ -1,6 +1,6 @@
 <?php
 
 $userModel
-    ->whereIn('id', [1,2,3])
+    ->whereIn('id', [1, 2, 3])
     ->set(['active' => 1])
     ->update();
diff --git a/user_guide_src/source/models/model/020.php b/user_guide_src/source/models/model/020.php
index ebc37ee608c1..7d659c7fcd36 100644
--- a/user_guide_src/source/models/model/020.php
+++ b/user_guide_src/source/models/model/020.php
@@ -11,14 +11,14 @@ class Job
     public function __get($key)
     {
         if (property_exists($this, $key)) {
-            return $this->$key;
+            return $this->{$key};
         }
     }
 
     public function __set($key, $value)
     {
         if (property_exists($this, $key)) {
-            $this->$key = $value;
+            $this->{$key} = $value;
         }
     }
 }
diff --git a/user_guide_src/source/models/model/022.php b/user_guide_src/source/models/model/022.php
index e1137c8fa845..0df2b39c0c66 100644
--- a/user_guide_src/source/models/model/022.php
+++ b/user_guide_src/source/models/model/022.php
@@ -4,7 +4,7 @@
 $job = $model->find(15);
 
 // Make some changes
-$job->name = "Foobar";
+$job->name = 'Foobar';
 
 // Save the changes
 $model->save($job);
diff --git a/user_guide_src/source/models/model/024.php b/user_guide_src/source/models/model/024.php
index f6769f061142..cdac096377b2 100644
--- a/user_guide_src/source/models/model/024.php
+++ b/user_guide_src/source/models/model/024.php
@@ -1,3 +1,3 @@
 <?php
 
-$userModel->delete([1,2,3]);
+$userModel->delete([1, 2, 3]);
diff --git a/user_guide_src/source/models/model/028.php b/user_guide_src/source/models/model/028.php
index c9bea660de81..acffbf22be01 100644
--- a/user_guide_src/source/models/model/028.php
+++ b/user_guide_src/source/models/model/028.php
@@ -1,6 +1,6 @@
 <?php
 
-$fieldName = 'username';
+$fieldName  = 'username';
 $fieldRules = 'required|alpha_numeric_space|min_length[3]';
 
 $model->setValidationRule($fieldName, $fieldRules);
diff --git a/user_guide_src/source/models/model/029.php b/user_guide_src/source/models/model/029.php
index 15221f2505a6..b7876797a6e2 100644
--- a/user_guide_src/source/models/model/029.php
+++ b/user_guide_src/source/models/model/029.php
@@ -2,7 +2,7 @@
 
 $validationRules = [
     'username' => 'required|alpha_numeric_space|min_length[3]',
-    'email' => [
+    'email'    => [
         'rules'  => 'required|valid_email|is_unique[users.email]',
         'errors' => [
             'required' => 'We really need your email.',
diff --git a/user_guide_src/source/models/model/030.php b/user_guide_src/source/models/model/030.php
index deca0d44f722..251f9bade2cd 100644
--- a/user_guide_src/source/models/model/030.php
+++ b/user_guide_src/source/models/model/030.php
@@ -1,6 +1,6 @@
 <?php
 
-$fieldName = 'name';
+$fieldName              = 'name';
 $fieldValidationMessage = [
     'required' => 'Your name is required here',
 ];
diff --git a/user_guide_src/source/models/model/039.php b/user_guide_src/source/models/model/039.php
index 00ab7df2a766..fa1b37d0f839 100644
--- a/user_guide_src/source/models/model/039.php
+++ b/user_guide_src/source/models/model/039.php
@@ -1,6 +1,6 @@
 <?php
 
 $_POST = [
-    'id' => 4,
-    'email' => 'foo@example.com'
+    'id'    => 4,
+    'email' => 'foo@example.com',
 ];
diff --git a/user_guide_src/source/models/model/042.php b/user_guide_src/source/models/model/042.php
index a3742c451104..7688fa03057f 100644
--- a/user_guide_src/source/models/model/042.php
+++ b/user_guide_src/source/models/model/042.php
@@ -1,5 +1,5 @@
 <?php
 
 $model->protect(false)
-      ->insert($data)
-      ->protect(true);
+    ->insert($data)
+    ->protect(true);
diff --git a/user_guide_src/source/models/model/045.php b/user_guide_src/source/models/model/045.php
index 9b064dd4fbff..e4d005fb3acc 100644
--- a/user_guide_src/source/models/model/045.php
+++ b/user_guide_src/source/models/model/045.php
@@ -1,5 +1,5 @@
 <?php
 
 $users = $userModel->where('status', 'active')
-                   ->orderBy('last_login', 'asc')
-                   ->findAll();
+    ->orderBy('last_login', 'asc')
+    ->findAll();
diff --git a/user_guide_src/source/models/model/049.php b/user_guide_src/source/models/model/049.php
index 0aace6d0fc28..92493d8e47d5 100644
--- a/user_guide_src/source/models/model/049.php
+++ b/user_guide_src/source/models/model/049.php
@@ -1,6 +1,6 @@
 <?php
 
-$userModel->chunk(100, function ($data) {
+$userModel->chunk(100, static function ($data) {
     // do something.
     // $data is a single row of data.
 });
diff --git a/user_guide_src/source/outgoing/api_responses/007.php b/user_guide_src/source/outgoing/api_responses/007.php
index 568075938d3a..4e30f3e6b6ac 100644
--- a/user_guide_src/source/outgoing/api_responses/007.php
+++ b/user_guide_src/source/outgoing/api_responses/007.php
@@ -1,4 +1,5 @@
 <?php
 
 $user = $userModel->insert($data);
+
 return $this->respondCreated($user);
diff --git a/user_guide_src/source/outgoing/api_responses/008.php b/user_guide_src/source/outgoing/api_responses/008.php
index 5c1fe47efb65..abbd2322bcda 100644
--- a/user_guide_src/source/outgoing/api_responses/008.php
+++ b/user_guide_src/source/outgoing/api_responses/008.php
@@ -1,4 +1,5 @@
 <?php
 
 $user = $userModel->delete($id);
+
 return $this->respondDeleted(['id' => $id]);
diff --git a/user_guide_src/source/outgoing/api_responses/009.php b/user_guide_src/source/outgoing/api_responses/009.php
index e7672d94a610..8eea1b15dfaf 100644
--- a/user_guide_src/source/outgoing/api_responses/009.php
+++ b/user_guide_src/source/outgoing/api_responses/009.php
@@ -1,4 +1,5 @@
 <?php
 
 sleep(1);
+
 return $this->respondNoContent();
diff --git a/user_guide_src/source/outgoing/localization/007.php b/user_guide_src/source/outgoing/localization/007.php
index adc24e5d6242..035d13bcfb64 100644
--- a/user_guide_src/source/outgoing/localization/007.php
+++ b/user_guide_src/source/outgoing/localization/007.php
@@ -1,5 +1,5 @@
 <?php
 
 return [
-    'languageKey' => 'The actual message to be shown.'
+    'languageKey' => 'The actual message to be shown.',
 ];
diff --git a/user_guide_src/source/outgoing/localization/012.php b/user_guide_src/source/outgoing/localization/012.php
index 7e3990788c5b..ab4564fece6d 100644
--- a/user_guide_src/source/outgoing/localization/012.php
+++ b/user_guide_src/source/outgoing/localization/012.php
@@ -8,4 +8,4 @@
 ];
 
 // Displays "I have 3 apples."
-echo lang('Tests.apples', [ 3 ]);
+echo lang('Tests.apples', [3]);
diff --git a/user_guide_src/source/outgoing/response/003.php b/user_guide_src/source/outgoing/response/003.php
index e8d671f81739..e5bff8cabf2f 100644
--- a/user_guide_src/source/outgoing/response/003.php
+++ b/user_guide_src/source/outgoing/response/003.php
@@ -2,7 +2,7 @@
 
 $data = [
     'success' => true,
-    'id' => 123,
+    'id'      => 123,
 ];
 
 return $this->response->setJSON($data);
diff --git a/user_guide_src/source/outgoing/response/004.php b/user_guide_src/source/outgoing/response/004.php
index 2777aea2795b..0497dea06e58 100644
--- a/user_guide_src/source/outgoing/response/004.php
+++ b/user_guide_src/source/outgoing/response/004.php
@@ -1,4 +1,4 @@
 <?php
 
 $response->setHeader('Location', 'http://example.com')
-         ->setHeader('WWW-Authenticate', 'Negotiate');
+    ->setHeader('WWW-Authenticate', 'Negotiate');
diff --git a/user_guide_src/source/outgoing/response/005.php b/user_guide_src/source/outgoing/response/005.php
index acc3254fa49a..39276d3f80f1 100644
--- a/user_guide_src/source/outgoing/response/005.php
+++ b/user_guide_src/source/outgoing/response/005.php
@@ -1,4 +1,4 @@
 <?php
 
 $response->setHeader('Cache-Control', 'no-cache')
-         ->appendHeader('Cache-Control', 'must-revalidate');
+    ->appendHeader('Cache-Control', 'must-revalidate');
diff --git a/user_guide_src/source/outgoing/response/007.php b/user_guide_src/source/outgoing/response/007.php
index c8e545831e00..9f80218ee669 100644
--- a/user_guide_src/source/outgoing/response/007.php
+++ b/user_guide_src/source/outgoing/response/007.php
@@ -2,4 +2,5 @@
 
 $data = 'Here is some text!';
 $name = 'mytext.txt';
+
 return $response->download($name, $data);
diff --git a/user_guide_src/source/outgoing/response/010.php b/user_guide_src/source/outgoing/response/010.php
index 724c1fb213a1..93acf62e99fa 100644
--- a/user_guide_src/source/outgoing/response/010.php
+++ b/user_guide_src/source/outgoing/response/010.php
@@ -3,6 +3,6 @@
 $options = [
     'max-age'  => 300,
     's-maxage' => 900,
-    'etag'     => 'abcde'
+    'etag'     => 'abcde',
 ];
 $this->response->setCache($options);
diff --git a/user_guide_src/source/outgoing/response/013.php b/user_guide_src/source/outgoing/response/013.php
index 8cebd2451096..273d72c29a1d 100644
--- a/user_guide_src/source/outgoing/response/013.php
+++ b/user_guide_src/source/outgoing/response/013.php
@@ -3,4 +3,4 @@
 $response->addChildSrc('https://youtube.com'); // allowed
 $response->reportOnly(true);
 $response->addChildSrc('https://metube.com'); // allowed but reported
-$response->addChildSrc('https://ourtube.com',false); // allowed
+$response->addChildSrc('https://ourtube.com', false); // allowed
diff --git a/user_guide_src/source/outgoing/response/016.php b/user_guide_src/source/outgoing/response/016.php
index 38d6a8e3b690..31a4990eb9ee 100644
--- a/user_guide_src/source/outgoing/response/016.php
+++ b/user_guide_src/source/outgoing/response/016.php
@@ -1,3 +1,3 @@
 <?php
 
-$response->setStatusCode(230, "Tardis initiated");
+$response->setStatusCode(230, 'Tardis initiated');
diff --git a/user_guide_src/source/outgoing/response/023.php b/user_guide_src/source/outgoing/response/023.php
index 35d072f354d9..3d0855739e96 100644
--- a/user_guide_src/source/outgoing/response/023.php
+++ b/user_guide_src/source/outgoing/response/023.php
@@ -1,15 +1,15 @@
 <?php
 
 $cookie = [
-    'name'   => 'The Cookie Name',
-    'value'  => 'The Value',
-    'expire' => '86500',
-    'domain' => '.some-domain.com',
-    'path'   => '/',
-    'prefix' => 'myprefix_',
-    'secure' => true,
+    'name'     => 'The Cookie Name',
+    'value'    => 'The Value',
+    'expire'   => '86500',
+    'domain'   => '.some-domain.com',
+    'path'     => '/',
+    'prefix'   => 'myprefix_',
+    'secure'   => true,
     'httponly' => false,
-    'samesite' => 'Lax'
+    'samesite' => 'Lax',
 ];
 
 $response->setCookie($cookie);
diff --git a/user_guide_src/source/outgoing/table/005.php b/user_guide_src/source/outgoing/table/005.php
index 06eaf75d9f8d..08d6dabb1850 100644
--- a/user_guide_src/source/outgoing/table/005.php
+++ b/user_guide_src/source/outgoing/table/005.php
@@ -2,7 +2,7 @@
 
 $table = new \CodeIgniter\View\Table();
 
-$table->setHeading(array('Name', 'Color', 'Size'));
+$table->setHeading(['Name', 'Color', 'Size']);
 
 $table->addRow(['Fred', 'Blue', 'Small']);
 $table->addRow(['Mary', 'Red', 'Large']);
diff --git a/user_guide_src/source/outgoing/table/006.php b/user_guide_src/source/outgoing/table/006.php
index 2bc38b546950..a5955aa5704b 100644
--- a/user_guide_src/source/outgoing/table/006.php
+++ b/user_guide_src/source/outgoing/table/006.php
@@ -1,38 +1,38 @@
 <?php
 
 $template = [
-    'table_open'         => '<table border="0" cellpadding="4" cellspacing="0">',
+    'table_open' => '<table border="0" cellpadding="4" cellspacing="0">',
 
-    'thead_open'         => '<thead>',
-    'thead_close'        => '</thead>',
+    'thead_open'  => '<thead>',
+    'thead_close' => '</thead>',
 
     'heading_row_start'  => '<tr>',
     'heading_row_end'    => '</tr>',
     'heading_cell_start' => '<th>',
     'heading_cell_end'   => '</th>',
 
-    'tfoot_open'         => '<tfoot>',
-    'tfoot_close'        => '</tfoot>',
+    'tfoot_open'  => '<tfoot>',
+    'tfoot_close' => '</tfoot>',
 
     'footing_row_start'  => '<tr>',
     'footing_row_end'    => '</tr>',
     'footing_cell_start' => '<td>',
     'footing_cell_end'   => '</td>',
 
-    'tbody_open'         => '<tbody>',
-    'tbody_close'        => '</tbody>',
+    'tbody_open'  => '<tbody>',
+    'tbody_close' => '</tbody>',
 
-    'row_start'          => '<tr>',
-    'row_end'            => '</tr>',
-    'cell_start'         => '<td>',
-    'cell_end'           => '</td>',
+    'row_start'  => '<tr>',
+    'row_end'    => '</tr>',
+    'cell_start' => '<td>',
+    'cell_end'   => '</td>',
 
-    'row_alt_start'      => '<tr>',
-    'row_alt_end'        => '</tr>',
-    'cell_alt_start'     => '<td>',
-    'cell_alt_end'       => '</td>',
+    'row_alt_start'  => '<tr>',
+    'row_alt_end'    => '</tr>',
+    'cell_alt_start' => '<td>',
+    'cell_alt_end'   => '</td>',
 
-    'table_close'        => '</table>'
+    'table_close' => '</table>',
 ];
 
 $table->setTemplate($template);
diff --git a/user_guide_src/source/outgoing/table/007.php b/user_guide_src/source/outgoing/table/007.php
index 307d2e9a6c26..022abfc296ad 100644
--- a/user_guide_src/source/outgoing/table/007.php
+++ b/user_guide_src/source/outgoing/table/007.php
@@ -1,7 +1,7 @@
 <?php
 
 $template = [
-    'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">'
+    'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">',
 ];
 
 $table->setTemplate($template);
diff --git a/user_guide_src/source/outgoing/table/008.php b/user_guide_src/source/outgoing/table/008.php
index 9d6dbddd40c6..99f12f2b2fcd 100644
--- a/user_guide_src/source/outgoing/table/008.php
+++ b/user_guide_src/source/outgoing/table/008.php
@@ -1,7 +1,7 @@
 <?php
 
 $customSettings = [
-    'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">'
+    'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">',
 ];
 
 $table = new \CodeIgniter\View\Table($customSettings);
diff --git a/user_guide_src/source/outgoing/table/016.php b/user_guide_src/source/outgoing/table/016.php
index 307d2e9a6c26..022abfc296ad 100644
--- a/user_guide_src/source/outgoing/table/016.php
+++ b/user_guide_src/source/outgoing/table/016.php
@@ -1,7 +1,7 @@
 <?php
 
 $template = [
-    'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">'
+    'table_open' => '<table border="1" cellpadding="2" cellspacing="1" class="mytable">',
 ];
 
 $table->setTemplate($template);
diff --git a/user_guide_src/source/outgoing/table/017.php b/user_guide_src/source/outgoing/table/017.php
index 41ecff5926c7..8f7b203a3344 100644
--- a/user_guide_src/source/outgoing/table/017.php
+++ b/user_guide_src/source/outgoing/table/017.php
@@ -1,3 +1,3 @@
 <?php
 
-$table->setEmpty("&nbsp;");
+$table->setEmpty('&nbsp;');
diff --git a/user_guide_src/source/outgoing/view_parser/003.php b/user_guide_src/source/outgoing/view_parser/003.php
index 0eefa68d2781..1ee48b997ae6 100644
--- a/user_guide_src/source/outgoing/view_parser/003.php
+++ b/user_guide_src/source/outgoing/view_parser/003.php
@@ -6,4 +6,4 @@
 ];
 
 echo $parser->setData($data)
-            ->render('blog_template');
+    ->render('blog_template');
diff --git a/user_guide_src/source/outgoing/view_parser/006.php b/user_guide_src/source/outgoing/view_parser/006.php
index 1bedecc07c0a..6b1409c46c1d 100644
--- a/user_guide_src/source/outgoing/view_parser/006.php
+++ b/user_guide_src/source/outgoing/view_parser/006.php
@@ -13,4 +13,4 @@
 ];
 
 echo $parser->setData($data)
-            ->render('blog_template');
+    ->render('blog_template');
diff --git a/user_guide_src/source/outgoing/view_parser/007.php b/user_guide_src/source/outgoing/view_parser/007.php
index 8932712a7835..032f9d55f268 100644
--- a/user_guide_src/source/outgoing/view_parser/007.php
+++ b/user_guide_src/source/outgoing/view_parser/007.php
@@ -1,6 +1,6 @@
 <?php
 
-$query = $db->query("SELECT * FROM blog");
+$query = $db->query('SELECT * FROM blog');
 
 $data = [
     'blog_title'   => 'My Blog Title',
@@ -9,4 +9,4 @@
 ];
 
 echo $parser->setData($data)
-            ->render('blog_template');
+    ->render('blog_template');
diff --git a/user_guide_src/source/outgoing/view_parser/008.php b/user_guide_src/source/outgoing/view_parser/008.php
index ef502cf5e3af..62be126a407d 100644
--- a/user_guide_src/source/outgoing/view_parser/008.php
+++ b/user_guide_src/source/outgoing/view_parser/008.php
@@ -10,4 +10,4 @@
 ];
 
 echo $parser->setData($data)
-            ->render('blog_template');
+    ->render('blog_template');
diff --git a/user_guide_src/source/outgoing/view_parser/010.php b/user_guide_src/source/outgoing/view_parser/010.php
index 33439f861407..7fcd5bafbfec 100644
--- a/user_guide_src/source/outgoing/view_parser/010.php
+++ b/user_guide_src/source/outgoing/view_parser/010.php
@@ -7,8 +7,8 @@
     'location' => ['city' => 'Red City', 'planet' => 'Mars'],
 ];
 
-echo $parser->setData($data)->renderString($template, ['cascadeData'=>false]);
+echo $parser->setData($data)->renderString($template, ['cascadeData' => false]);
 // Result: {name} lives in Red City on Mars.
 
-echo $parser->setData($data)->renderString($template, ['cascadeData'=>true]);
+echo $parser->setData($data)->renderString($template, ['cascadeData' => true]);
 // Result: George lives in Red City on Mars.
diff --git a/user_guide_src/source/outgoing/view_parser/011.php b/user_guide_src/source/outgoing/view_parser/011.php
index 8030f44e8883..88e2060b1ed5 100644
--- a/user_guide_src/source/outgoing/view_parser/011.php
+++ b/user_guide_src/source/outgoing/view_parser/011.php
@@ -1,3 +1,3 @@
-<?php if ($role=='admin'): ?>
+<?php if ($role === 'admin'): ?>
     <h1>Welcome, Admin!</h1>
 <?php endif ?>
diff --git a/user_guide_src/source/outgoing/view_parser/015.php b/user_guide_src/source/outgoing/view_parser/015.php
index e499e9805416..c0aa68b3381f 100644
--- a/user_guide_src/source/outgoing/view_parser/015.php
+++ b/user_guide_src/source/outgoing/view_parser/015.php
@@ -10,9 +10,7 @@ class View extends BaseView
 
     public function __construct()
     {
-        $this->plugins['bar'] = static function (array $params = []) {
-            return $params[0] ?? '';
-        };
+        $this->plugins['bar'] = static fn (array $params = []) => $params[0] ?? '';
 
         parent::__construct();
     }
diff --git a/user_guide_src/source/outgoing/view_parser/018.php b/user_guide_src/source/outgoing/view_parser/018.php
index 64101a6a8cfa..4e039f02a08c 100644
--- a/user_guide_src/source/outgoing/view_parser/018.php
+++ b/user_guide_src/source/outgoing/view_parser/018.php
@@ -1,11 +1,11 @@
 <?php
 
 $template = 'Hello, {firstname} {lastname}';
-$data = [
+$data     = [
     'title'     => 'Mr',
     'firstname' => 'John',
-    'lastname'  => 'Doe'
+    'lastname'  => 'Doe',
 ];
 echo $parser->setData($data)
-            ->renderString($template);
+    ->renderString($template);
 // Result: Hello, John Doe
diff --git a/user_guide_src/source/outgoing/view_parser/019.php b/user_guide_src/source/outgoing/view_parser/019.php
index 2570076b3018..16621ef2f190 100644
--- a/user_guide_src/source/outgoing/view_parser/019.php
+++ b/user_guide_src/source/outgoing/view_parser/019.php
@@ -1,11 +1,11 @@
 <?php
 
 $template = 'Hello, {firstname} {initials} {lastname}';
-$data = [
+$data     = [
     'title'     => 'Mr',
     'firstname' => 'John',
     'lastname'  => 'Doe',
 ];
 echo $parser->setData($data)
-            ->renderString($template);
+    ->renderString($template);
 // Result: Hello, John {initials} Doe
diff --git a/user_guide_src/source/outgoing/view_parser/020.php b/user_guide_src/source/outgoing/view_parser/020.php
index a7966a9c2bfd..9226793f280d 100644
--- a/user_guide_src/source/outgoing/view_parser/020.php
+++ b/user_guide_src/source/outgoing/view_parser/020.php
@@ -1,7 +1,7 @@
 <?php
 
 $template = 'Hello, {firstname} {lastname} ({degrees}{degree} {/degrees})';
-$data = [
+$data     = [
     'degrees'   => 'Mr',
     'firstname' => 'John',
     'lastname'  => 'Doe',
@@ -11,5 +11,5 @@
     ],
 ];
 echo $parser->setData($data)
-            ->renderString($template);
+    ->renderString($template);
 // Result: Hello, John Doe (Mr{degree} {/degrees})
diff --git a/user_guide_src/source/outgoing/view_parser/021.php b/user_guide_src/source/outgoing/view_parser/021.php
index 6dce1f1316e2..3c9982437a19 100644
--- a/user_guide_src/source/outgoing/view_parser/021.php
+++ b/user_guide_src/source/outgoing/view_parser/021.php
@@ -1,19 +1,19 @@
 <?php
 
-$temp = '';
+$temp      = '';
 $template1 = '<li><a href="{link}">{title}</a></li>';
-$data1 = [
+$data1     = [
     ['title' => 'First Link', 'link' => '/first'],
     ['title' => 'Second Link', 'link' => '/second'],
 ];
 
-foreach ($data1 as $menuItem){
+foreach ($data1 as $menuItem) {
     $temp .= $parser->setData($menuItem)->renderString($template1);
 }
 
 $template2 = '<ul>{menuitems}</ul>';
-$data = [
+$data      = [
     'menuitems' => $temp,
 ];
 echo $parser->setData($data)
-            ->renderString($template2);
+    ->renderString($template2);
diff --git a/user_guide_src/source/outgoing/view_parser/025.php b/user_guide_src/source/outgoing/view_parser/025.php
index 76ba0b537f96..8fa85f4faa98 100644
--- a/user_guide_src/source/outgoing/view_parser/025.php
+++ b/user_guide_src/source/outgoing/view_parser/025.php
@@ -1,3 +1,3 @@
 <?php
 
-$renderer->setVar('name','Joe','html');
+$renderer->setVar('name', 'Joe', 'html');
diff --git a/user_guide_src/source/outgoing/view_parser/026.php b/user_guide_src/source/outgoing/view_parser/026.php
index a8633d5717c7..46cfd9afd818 100644
--- a/user_guide_src/source/outgoing/view_parser/026.php
+++ b/user_guide_src/source/outgoing/view_parser/026.php
@@ -1,3 +1,3 @@
 <?php
 
-$renderer->setDelimiters('[',']');
+$renderer->setDelimiters('[', ']');
diff --git a/user_guide_src/source/outgoing/view_renderer/003.php b/user_guide_src/source/outgoing/view_renderer/003.php
index c4609b018c58..04e8c18a3ca4 100644
--- a/user_guide_src/source/outgoing/view_renderer/003.php
+++ b/user_guide_src/source/outgoing/view_renderer/003.php
@@ -1,5 +1,5 @@
 <?php
 
 $view->setVar('one', $one)
-     ->setVar('two', $two)
-     ->render('myView');
+    ->setVar('two', $two)
+    ->render('myView');
diff --git a/user_guide_src/source/outgoing/view_renderer/007.php b/user_guide_src/source/outgoing/view_renderer/007.php
index 1b45fef3dca5..99080056b1bc 100644
--- a/user_guide_src/source/outgoing/view_renderer/007.php
+++ b/user_guide_src/source/outgoing/view_renderer/007.php
@@ -1,3 +1,3 @@
 <?php
 
-$view->setData(['name'=>'George', 'position'=>'Boss']);
+$view->setData(['name' => 'George', 'position' => 'Boss']);
diff --git a/user_guide_src/source/outgoing/view_renderer/008.php b/user_guide_src/source/outgoing/view_renderer/008.php
index 284b58caf6be..f0b868b54bca 100644
--- a/user_guide_src/source/outgoing/view_renderer/008.php
+++ b/user_guide_src/source/outgoing/view_renderer/008.php
@@ -1,3 +1,3 @@
 <?php
 
-$view->setVar('name','Joe','html');
+$view->setVar('name', 'Joe', 'html');
diff --git a/user_guide_src/source/testing/benchmark/007.php b/user_guide_src/source/testing/benchmark/007.php
index c126ed4a9670..13a95ec66e29 100644
--- a/user_guide_src/source/testing/benchmark/007.php
+++ b/user_guide_src/source/testing/benchmark/007.php
@@ -3,11 +3,11 @@
 $iterator = new \CodeIgniter\Benchmark\Iterator();
 
 // Add a new task
-$iterator->add('single_concat', function () {
-    $str = 'Some basic'.'little'.'string concatenation test.';
+$iterator->add('single_concat', static function () {
+    $str = 'Some basic' . 'little' . 'string concatenation test.';
 });
 
 // Add another task
-$iterator->add('double', function ($a = 'little') {
+$iterator->add('double', static function ($a = 'little') {
     $str = "Some basic {$little} string test.";
 });
diff --git a/user_guide_src/source/testing/controllers/001.php b/user_guide_src/source/testing/controllers/001.php
index 9c31d5b62d00..9162fa0aeabd 100644
--- a/user_guide_src/source/testing/controllers/001.php
+++ b/user_guide_src/source/testing/controllers/001.php
@@ -2,11 +2,12 @@
 
 namespace CodeIgniter;
 
-use CodeIgniter\Test\ControllerTestTrait;
 use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\ControllerTestTrait;
 use CodeIgniter\Test\DatabaseTestTrait;
 
 class TestControllerA extends CIUnitTestCase
 {
-    use ControllerTestTrait, DatabaseTestTrait;
+    use ControllerTestTrait;
+    use DatabaseTestTrait;
 }
diff --git a/user_guide_src/source/testing/controllers/002.php b/user_guide_src/source/testing/controllers/002.php
index 708f7761afbf..a21362e952a2 100644
--- a/user_guide_src/source/testing/controllers/002.php
+++ b/user_guide_src/source/testing/controllers/002.php
@@ -2,19 +2,20 @@
 
 namespace CodeIgniter;
 
-use CodeIgniter\Test\ControllerTestTrait;
 use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\ControllerTestTrait;
 use CodeIgniter\Test\DatabaseTestTrait;
 
 class TestControllerA extends CIUnitTestCase
 {
-    use ControllerTestTrait, DatabaseTestTrait;
+    use ControllerTestTrait;
+    use DatabaseTestTrait;
 
     public function testShowCategories()
     {
         $result = $this->withURI('http://example.com/categories')
-                       ->controller(\App\Controllers\ForumController::class)
-                       ->execute('showCategories');
+            ->controller(\App\Controllers\ForumController::class)
+            ->execute('showCategories');
 
         $this->assertTrue($result->isOK());
     }
diff --git a/user_guide_src/source/testing/controllers/004.php b/user_guide_src/source/testing/controllers/004.php
index d06bb51768c3..17b5f42590ce 100644
--- a/user_guide_src/source/testing/controllers/004.php
+++ b/user_guide_src/source/testing/controllers/004.php
@@ -1,4 +1,4 @@
 <?php
 
 $results = $this->controller(\App\Controllers\ForumController::class)
-                ->execute('showCategories');
+    ->execute('showCategories');
diff --git a/user_guide_src/source/testing/controllers/005.php b/user_guide_src/source/testing/controllers/005.php
index bffc4c9c8f95..7d2864f5fcbf 100644
--- a/user_guide_src/source/testing/controllers/005.php
+++ b/user_guide_src/source/testing/controllers/005.php
@@ -1,8 +1,8 @@
 <?php
 
-$config = new Config\App();
+$config              = new Config\App();
 $config->appTimezone = 'America/Chicago';
 
 $results = $this->withConfig($config)
-                ->controller(\App\Controllers\ForumController::class)
-                ->execute('showCategories');
+    ->controller(\App\Controllers\ForumController::class)
+    ->execute('showCategories');
diff --git a/user_guide_src/source/testing/controllers/006.php b/user_guide_src/source/testing/controllers/006.php
index aef7e41e071e..0fc7670487de 100644
--- a/user_guide_src/source/testing/controllers/006.php
+++ b/user_guide_src/source/testing/controllers/006.php
@@ -4,5 +4,5 @@
 $request->setLocale($locale);
 
 $results = $this->withRequest($request)
-                ->controller(\App\Controllers\ForumController::class)
-                ->execute('showCategories');
+    ->controller(\App\Controllers\ForumController::class)
+    ->execute('showCategories');
diff --git a/user_guide_src/source/testing/controllers/007.php b/user_guide_src/source/testing/controllers/007.php
index 73b1d4e122c2..8f7d55448035 100644
--- a/user_guide_src/source/testing/controllers/007.php
+++ b/user_guide_src/source/testing/controllers/007.php
@@ -3,5 +3,5 @@
 $response = new \CodeIgniter\HTTP\Response(new \Config\App());
 
 $results = $this->withResponse($response)
-                ->controller(\App\Controllers\ForumController::class)
-                ->execute('showCategories');
+    ->controller(\App\Controllers\ForumController::class)
+    ->execute('showCategories');
diff --git a/user_guide_src/source/testing/controllers/008.php b/user_guide_src/source/testing/controllers/008.php
index 4ea1c84dee20..641a7f92f68b 100644
--- a/user_guide_src/source/testing/controllers/008.php
+++ b/user_guide_src/source/testing/controllers/008.php
@@ -3,6 +3,6 @@
 $logger = new \CodeIgniter\Log\Handlers\FileHandler();
 
 $results = $this->withResponse($response)
-                ->withLogger($logger)
-                ->controller(\App\Controllers\ForumController::class)
-                ->execute('showCategories');
+    ->withLogger($logger)
+    ->controller(\App\Controllers\ForumController::class)
+    ->execute('showCategories');
diff --git a/user_guide_src/source/testing/controllers/009.php b/user_guide_src/source/testing/controllers/009.php
index 4559dd8f4711..711d947b4267 100644
--- a/user_guide_src/source/testing/controllers/009.php
+++ b/user_guide_src/source/testing/controllers/009.php
@@ -1,5 +1,5 @@
 <?php
 
 $results = $this->withURI('http://example.com/forums/categories')
-                ->controller(\App\Controllers\ForumController::class)
-                ->execute('showCategories');
+    ->controller(\App\Controllers\ForumController::class)
+    ->execute('showCategories');
diff --git a/user_guide_src/source/testing/controllers/010.php b/user_guide_src/source/testing/controllers/010.php
index 2cf6d9919c31..e257dcbc4928 100644
--- a/user_guide_src/source/testing/controllers/010.php
+++ b/user_guide_src/source/testing/controllers/010.php
@@ -3,5 +3,5 @@
 $body = json_encode(['foo' => 'bar']);
 
 $results = $this->withBody($body)
-                ->controller(\App\Controllers\ForumController::class)
-                ->execute('showCategories');
+    ->controller(\App\Controllers\ForumController::class)
+    ->execute('showCategories');
diff --git a/user_guide_src/source/testing/database/002.php b/user_guide_src/source/testing/database/002.php
index 4b75aa739784..be357858ae62 100644
--- a/user_guide_src/source/testing/database/002.php
+++ b/user_guide_src/source/testing/database/002.php
@@ -9,14 +9,14 @@ class MyTests extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 
         // Do something here....
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         parent::tearDown();
 
diff --git a/user_guide_src/source/testing/database/003.php b/user_guide_src/source/testing/database/003.php
index d293cce95f81..399ddfb04425 100644
--- a/user_guide_src/source/testing/database/003.php
+++ b/user_guide_src/source/testing/database/003.php
@@ -12,4 +12,4 @@ class MyTests extends CIUnitTestCase
     protected $refresh  = true;
     protected $seed     = 'TestSeeder';
     protected $basePath = 'path/to/database/files';
-}
\ No newline at end of file
+}
diff --git a/user_guide_src/source/testing/debugging/006.php b/user_guide_src/source/testing/debugging/006.php
index 3140ea7e4a81..3ad25be67894 100644
--- a/user_guide_src/source/testing/debugging/006.php
+++ b/user_guide_src/source/testing/debugging/006.php
@@ -9,4 +9,4 @@
         'foo' => 'bar',
         'bar' => 'baz',
     ],
- ];
+];
diff --git a/user_guide_src/source/testing/fabricator/009.php b/user_guide_src/source/testing/fabricator/009.php
index 9c8d366d8684..a82d6063213e 100644
--- a/user_guide_src/source/testing/fabricator/009.php
+++ b/user_guide_src/source/testing/fabricator/009.php
@@ -1,9 +1,9 @@
 <?php
 
-array(
-    'first'  => "Maynard",
-    'email'  => "king.alford@example.org",
-    'phone'  => "201-886-0269 x3767",
-    'avatar' => "http://lorempixel.com/800/400/",
+[
+    'first'  => 'Maynard',
+    'email'  => 'king.alford@example.org',
+    'phone'  => '201-886-0269 x3767',
+    'avatar' => 'http://lorempixel.com/800/400/',
     'login'  => null,
-);
+];
diff --git a/user_guide_src/source/testing/fabricator/012.php b/user_guide_src/source/testing/fabricator/012.php
index 89731845f145..98e83b610318 100644
--- a/user_guide_src/source/testing/fabricator/012.php
+++ b/user_guide_src/source/testing/fabricator/012.php
@@ -1,12 +1,12 @@
 <?php
 
-array(
+[
     'id'         => 1,
-    'first'      => "Rachel",
-    'email'      => "bradley72@gmail.com",
-    'phone'      => "741-241-2356",
-    'avatar'     => "http://lorempixel.com/800/400/",
+    'first'      => 'Rachel',
+    'email'      => 'bradley72@gmail.com',
+    'phone'      => '741-241-2356',
+    'avatar'     => 'http://lorempixel.com/800/400/',
     'login'      => null,
-    'created_at' => "2020-05-08 14:52:10",
-    'updated_at' => "2020-05-08 14:52:10",
-);
+    'created_at' => '2020-05-08 14:52:10',
+    'updated_at' => '2020-05-08 14:52:10',
+];
diff --git a/user_guide_src/source/testing/fabricator/016.php b/user_guide_src/source/testing/fabricator/016.php
index eb9edc657239..8b3f9513280d 100644
--- a/user_guide_src/source/testing/fabricator/016.php
+++ b/user_guide_src/source/testing/fabricator/016.php
@@ -1,17 +1,17 @@
 <?php
 
-array(
-    'first'  => "Bobby",
-    'email'  => "latta.kindel@company.org",
-    'phone'  => "251-806-2169",
-    'avatar' => "http://lorempixel.com/800/400/",
+[
+    'first'  => 'Bobby',
+    'email'  => 'latta.kindel@company.org',
+    'phone'  => '251-806-2169',
+    'avatar' => 'http://lorempixel.com/800/400/',
     'login'  => null,
-);
+];
 
-array(
-    'first'  => "Bobby",
-    'email'  => "melissa.strike@fabricon.us",
-    'phone'  => "525-214-2656 x23546",
-    'avatar' => "http://lorempixel.com/800/400/",
+[
+    'first'  => 'Bobby',
+    'email'  => 'melissa.strike@fabricon.us',
+    'phone'  => '525-214-2656 x23546',
+    'avatar' => 'http://lorempixel.com/800/400/',
     'login'  => null,
-);
+];
diff --git a/user_guide_src/source/testing/fabricator/018.php b/user_guide_src/source/testing/fabricator/018.php
index 60599b602f6e..9eb1dbf0334d 100644
--- a/user_guide_src/source/testing/fabricator/018.php
+++ b/user_guide_src/source/testing/fabricator/018.php
@@ -1,17 +1,17 @@
 <?php
 
-array(
-    'first'  => "Bobby",
-    'email'  => "belingadon142@example.org",
-    'phone'  => "741-857-1933 x1351",
-    'avatar' => "http://lorempixel.com/800/400/",
+[
+    'first'  => 'Bobby',
+    'email'  => 'belingadon142@example.org',
+    'phone'  => '741-857-1933 x1351',
+    'avatar' => 'http://lorempixel.com/800/400/',
     'login'  => null,
-);
+];
 
-array(
-    'first'  => "Hans",
-    'email'  => "hoppifur@metraxalon.com",
-    'phone'  => "487-235-7006",
-    'avatar' => "http://lorempixel.com/800/400/",
+[
+    'first'  => 'Hans',
+    'email'  => 'hoppifur@metraxalon.com',
+    'phone'  => '487-235-7006',
+    'avatar' => 'http://lorempixel.com/800/400/',
     'login'  => null,
-);
+];
diff --git a/user_guide_src/source/testing/feature/001.php b/user_guide_src/source/testing/feature/001.php
index 5449332fe266..0ab640465052 100644
--- a/user_guide_src/source/testing/feature/001.php
+++ b/user_guide_src/source/testing/feature/001.php
@@ -7,7 +7,8 @@
 
 class TestFoo extends CIUnitTestCase
 {
-    use DatabaseTestTrait, FeatureTestTrait;
+    use DatabaseTestTrait;
+    use FeatureTestTrait;
 
     protected function setUp(): void
     {
diff --git a/user_guide_src/source/testing/feature/002.php b/user_guide_src/source/testing/feature/002.php
index 553aaa0bfd03..8af5fda7b7c6 100644
--- a/user_guide_src/source/testing/feature/002.php
+++ b/user_guide_src/source/testing/feature/002.php
@@ -6,5 +6,5 @@
 // Submit a form
 $result = $this->call('post', 'contact', [
     'name'  => 'Fred Flintstone',
-    'email' => 'flintyfred@example.com'
+    'email' => 'flintyfred@example.com',
 ]);
diff --git a/user_guide_src/source/testing/overview/009.php b/user_guide_src/source/testing/overview/009.php
index 115cf6bda9e4..5d69c01c16d5 100644
--- a/user_guide_src/source/testing/overview/009.php
+++ b/user_guide_src/source/testing/overview/009.php
@@ -1,6 +1,6 @@
 <?php
 
-Events::on('foo', function ($arg) use(&$result) {
+Events::on('foo', static function ($arg) use (&$result) {
     $result = $arg;
 });
 
diff --git a/user_guide_src/source/testing/overview/010.php b/user_guide_src/source/testing/overview/010.php
index 4884f9a4a9f2..506d75a8d433 100644
--- a/user_guide_src/source/testing/overview/010.php
+++ b/user_guide_src/source/testing/overview/010.php
@@ -6,4 +6,4 @@
 $this->response->send();
 $output = ob_get_clean(); // in case you want to check the actual body
 
-$this->assertHeaderEmitted("Set-Cookie: foo=bar");
+$this->assertHeaderEmitted('Set-Cookie: foo=bar');
diff --git a/user_guide_src/source/testing/overview/011.php b/user_guide_src/source/testing/overview/011.php
index a2aa11c7bb64..10e9d4a0d31b 100644
--- a/user_guide_src/source/testing/overview/011.php
+++ b/user_guide_src/source/testing/overview/011.php
@@ -6,4 +6,4 @@
 $this->response->send();
 $output = ob_get_clean(); // in case you want to check the actual body
 
-$this->assertHeaderNotEmitted("Set-Cookie: banana");
+$this->assertHeaderNotEmitted('Set-Cookie: banana');

From e8202c2baa7e325ae85387cf75656596081f8954 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 5 Mar 2022 08:48:32 +0900
Subject: [PATCH 1733/2325] docs: add dummy HTML tags

---
 user_guide_src/source/general/helpers/005.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/general/helpers/005.php b/user_guide_src/source/general/helpers/005.php
index 13a7f3015387..0602338d208b 100644
--- a/user_guide_src/source/general/helpers/005.php
+++ b/user_guide_src/source/general/helpers/005.php
@@ -1 +1,3 @@
-<?= anchor('blog/comments', 'Click Here');
+<div>
+<?= anchor('blog/comments', 'Click Here') ?>
+</div>

From 170faa1f8f3491ffeb2bbdcfbc268fbafd5af187 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 6 Mar 2022 08:41:56 +0900
Subject: [PATCH 1734/2325] docs: revert method chaining indentation

---
 user_guide_src/source/database/query_builder/074.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/user_guide_src/source/database/query_builder/074.php b/user_guide_src/source/database/query_builder/074.php
index 1ce884db6e6a..3ea4d947f4a7 100644
--- a/user_guide_src/source/database/query_builder/074.php
+++ b/user_guide_src/source/database/query_builder/074.php
@@ -2,11 +2,11 @@
 
 $builder->select('*')->from('my_table')
     ->groupStart()
-    ->where('a', 'a')
-    ->orGroupStart()
-    ->where('b', 'b')
-    ->where('c', 'c')
-    ->groupEnd()
+        ->where('a', 'a')
+        ->orGroupStart()
+            ->where('b', 'b')
+            ->where('c', 'c')
+        ->groupEnd()
     ->groupEnd()
     ->where('d', 'd')
     ->get();

From f8d29aeed1837bf584ba637f2fc55a74e5c48768 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 6 Mar 2022 09:46:28 +0900
Subject: [PATCH 1735/2325] docs: update @param comments

---
 system/Database/BaseConnection.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 134a50517ae6..6d7170dc5bb3 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -962,8 +962,9 @@ public function getConnectDuration(int $decimals = 6): string
      * the correct identifiers.
      *
      * @param array|string $item
-     * @param bool         $prefixSingle Prefix an item with no segments?
-     * @param bool         $fieldExists  Supplied $item contains a field name?
+     * @param bool         $prefixSingle       Prefix a table name with no segments?
+     * @param bool         $protectIdentifiers Protect table or column names?
+     * @param bool         $fieldExists        Supplied $item contains a column name?
      *
      * @return array|string
      */

From 30bc414a9e22bf886c1d186691ddce9539e5f974 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 7 Mar 2022 08:25:02 +0900
Subject: [PATCH 1736/2325] fix: table name is double prefixed when LIKE clause

---
 system/Database/BaseBuilder.php            |  4 ++--
 tests/system/Database/Builder/LikeTest.php | 23 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 79bdf08ffb43..1d0c241903e8 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1051,7 +1051,7 @@ protected function _like($field, string $match = '', string $type = 'AND ', stri
                 $bind = $this->setBind($k, "%{$v}%", $escape);
             }
 
-            $likeStatement = $this->_like_statement($prefix, $this->db->protectIdentifiers($k, false, $escape), $not, $bind, $insensitiveSearch);
+            $likeStatement = $this->_like_statement($prefix, $k, $not, $bind, $insensitiveSearch);
 
             // some platforms require an escape sequence definition for LIKE wildcards
             if ($escape === true && $this->db->likeEscapeStr !== '') {
@@ -1073,7 +1073,7 @@ protected function _like($field, string $match = '', string $type = 'AND ', stri
     protected function _like_statement(?string $prefix, string $column, ?string $not, string $bind, bool $insensitiveSearch = false): string
     {
         if ($insensitiveSearch === true) {
-            return "{$prefix} LOWER({$column}) {$not} LIKE :{$bind}:";
+            return "{$prefix} LOWER(" . $this->db->escapeIdentifiers($column) . ") {$not} LIKE :{$bind}:";
         }
 
         return "{$prefix} {$column} {$not} LIKE :{$bind}:";
diff --git a/tests/system/Database/Builder/LikeTest.php b/tests/system/Database/Builder/LikeTest.php
index ba7c176b7c90..2d81db2b90fa 100644
--- a/tests/system/Database/Builder/LikeTest.php
+++ b/tests/system/Database/Builder/LikeTest.php
@@ -183,4 +183,27 @@ public function testCaseInsensitiveLike()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
         $this->assertSame($expectedBinds, $builder->getBinds());
     }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5775
+     */
+    public function testDBPrefixAndCoulmnWithTablename()
+    {
+        $this->db = new MockConnection(['DBPrefix' => 'db_']);
+        $builder  = new BaseBuilder('test', $this->db);
+
+        $builder->like('test.field', 'string');
+
+        $expectedSQL = <<<'SQL'
+            SELECT * FROM "db_test" WHERE "db_test"."field" LIKE '%string%' ESCAPE '!'
+            SQL;
+        $expectedBinds = [
+            'test.field' => [
+                '%string%',
+                true,
+            ],
+        ];
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
 }

From 7509003826079c0d1056300e17796fd68a176efe Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 7 Mar 2022 08:25:33 +0900
Subject: [PATCH 1737/2325] refactor: revert unneeded workaround from #5361

---
 system/Database/BaseConnection.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 6d7170dc5bb3..4f54c1980830 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -1022,8 +1022,7 @@ public function protectIdentifiers($item, bool $prefixSingle = false, ?bool $pro
             //
             // NOTE: The ! empty() condition prevents this method
             // from breaking when QB isn't enabled.
-            $firstSegment = trim($parts[0], $this->escapeChar);
-            if (! empty($this->aliasedTables) && in_array($firstSegment, $this->aliasedTables, true)) {
+            if (! empty($this->aliasedTables) && in_array($parts[0], $this->aliasedTables, true)) {
                 if ($protectIdentifiers === true) {
                     foreach ($parts as $key => $val) {
                         if (! in_array($val, $this->reservedIdentifiers, true)) {

From 3e52f412d024f0d50f0041d676e7c56197f5a5c0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 7 Mar 2022 08:43:59 +0900
Subject: [PATCH 1738/2325] fix: app/Config/Routes.php is loaded twice on
 Windows

system/Config/Routes.php is loaded in app/Config/Routes.php
---
 system/Router/RouteCollection.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 7eded3411b7f..65bf4f4985af 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -357,9 +357,14 @@ protected function discoverRoutes()
         if ($this->moduleConfig->shouldDiscover('routes')) {
             $files = $this->fileLocator->search('Config/Routes.php');
 
+            $excludes = [
+                APPPATH . 'Config' . DIRECTORY_SEPARATOR . 'Routes.php',
+                SYSTEMPATH . 'Config' . DIRECTORY_SEPARATOR . 'Routes.php',
+            ];
+
             foreach ($files as $file) {
                 // Don't include our main file again...
-                if ($file === APPPATH . 'Config/Routes.php') {
+                if (in_array($file, $excludes, true)) {
                     continue;
                 }
 

From 539cdd7f7925d8f99254542cf65ddb55aa08090d Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Tue, 8 Mar 2022 01:09:50 +0000
Subject: [PATCH 1739/2325] Add User Guide deploy script

---
 .github/scripts/deploy-userguide       | 36 ++++++++++++++++
 .github/workflows/deploy-userguide.yml | 59 ++++++++++++++++++++++++++
 2 files changed, 95 insertions(+)
 create mode 100755 .github/scripts/deploy-userguide
 create mode 100644 .github/workflows/deploy-userguide.yml

diff --git a/.github/scripts/deploy-userguide b/.github/scripts/deploy-userguide
new file mode 100755
index 000000000000..abbb768a5017
--- /dev/null
+++ b/.github/scripts/deploy-userguide
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+## Deploy codeigniter4/userguide
+
+# Setup variables
+SOURCE=$1
+TARGET=$2
+RELEASE=$3
+VERSION=`echo "$RELEASE" | cut -c 2-`
+
+echo "Preparing for version $3"
+echo "Merging files from $1 to $2"
+
+# Prepare the source
+cd $SOURCE
+git checkout master
+cd user_guide_src
+make html
+make epub
+
+# Prepare the target
+cd $TARGET
+git checkout master
+rm -rf docs
+
+# Copy files
+cp -Rf ${SOURCE}/user_guide_src/build/html ./docs
+cp -Rf ${SOURCE}/user_guide_src/build/epub/CodeIgniter.epub ./CodeIgniter${VERSION}.epub
+
+# Ensure underscore prefixed files are published
+touch ${TARGET}/docs/.nojekyll
+
+# Commit the changes
+git add .
+git commit -m "Release ${RELEASE}"
+git push
diff --git a/.github/workflows/deploy-userguide.yml b/.github/workflows/deploy-userguide.yml
new file mode 100644
index 000000000000..384eeef5186f
--- /dev/null
+++ b/.github/workflows/deploy-userguide.yml
@@ -0,0 +1,59 @@
+# When a new Release is created, deploy relevant
+# files to each of the generated repos.
+name: Deploy User Guide
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  framework:
+    name: Deploy to userguide
+    if: (github.repository == 'codeigniter4/CodeIgniter4')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Identify
+        run: |
+          git config --global user.email "action@github.com"
+          git config --global user.name "${GITHUB_ACTOR}"
+
+      - name: Checkout source
+        uses: actions/checkout@v3
+        with:
+          path: source
+
+      - name: Checkout target
+        uses: actions/checkout@v3
+        with:
+          repository: codeigniter4/userguide
+          token: ${{ secrets.ACCESS_TOKEN }}
+          path: userguide
+
+      - name: Install Sphinx
+        run: |
+          sudo apt install python3-sphinx
+          sudo pip3 install sphinxcontrib-phpdomain
+          sudo pip3 install sphinx_rtd_theme
+
+      - name: Chmod
+        run: chmod +x ./source/.github/scripts/deploy-userguide
+
+      - name: Deploy
+        run: ./source/.github/scripts/deploy-userguide ${GITHUB_WORKSPACE}/source ${GITHUB_WORKSPACE}/userguide ${GITHUB_REF##*/}
+
+      - name: Release
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{secrets.ACCESS_TOKEN}}
+          script: |
+            const release = await github.rest.repos.getLatestRelease({
+              owner: context.repo.owner,
+              repo: context.repo.repo
+            })
+            github.rest.repos.createRelease({
+              owner: context.repo.owner,
+              repo: 'userguide',
+              tag_name: release.data.tag_name,
+              name: release.data.name,
+              body: release.data.body
+            })

From 3cc2ea9ea2255a8300d20a6532f31c0d076f6128 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 8 Mar 2022 15:30:27 +0900
Subject: [PATCH 1740/2325] chore: fix php-cs-fixer version to 3.6

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

diff --git a/admin/framework/composer.json b/admin/framework/composer.json
index 42ca449ddf3c..03d3965770ba 100644
--- a/admin/framework/composer.json
+++ b/admin/framework/composer.json
@@ -17,7 +17,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.1",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "^3.6",
+        "friendsofphp/php-cs-fixer": "3.6.*",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.3",
         "phpunit/phpunit": "^9.1",
diff --git a/composer.json b/composer.json
index 945e9d30e723..d31045882d31 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.1",
         "fakerphp/faker": "^1.9",
-        "friendsofphp/php-cs-fixer": "^3.6",
+        "friendsofphp/php-cs-fixer": "3.6.*",
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.3",
         "nexusphp/tachycardia": "^1.0",

From 848a72318537da4a88b5118554c478c3284d5020 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 3 Mar 2022 15:58:41 +0900
Subject: [PATCH 1741/2325] chore: add .user-guide.php-cs-fixer.dist.php and
 update composer cs-fix

---
 .php-cs-fixer.dist.php            |  1 +
 .user-guide.php-cs-fixer.dist.php | 48 +++++++++++++++++++++++++++++++
 composer.json                     |  2 ++
 3 files changed, 51 insertions(+)
 create mode 100644 .user-guide.php-cs-fixer.dist.php

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index ec0ceaeb0172..7caeaec1035c 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -30,6 +30,7 @@
     ->append([
         __FILE__,
         __DIR__ . '/.no-header.php-cs-fixer.dist.php',
+        __DIR__ . '/.user-guide.php-cs-fixer.dist.php',
         __DIR__ . '/rector.php',
         __DIR__ . '/spark',
         __DIR__ . '/user_guide_src/renumerate.php',
diff --git a/.user-guide.php-cs-fixer.dist.php b/.user-guide.php-cs-fixer.dist.php
new file mode 100644
index 000000000000..ba33baaf409d
--- /dev/null
+++ b/.user-guide.php-cs-fixer.dist.php
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+use CodeIgniter\CodingStandard\CodeIgniter4;
+use Nexus\CsConfig\Factory;
+use Nexus\CsConfig\Fixer\Comment\NoCodeSeparatorCommentFixer;
+use Nexus\CsConfig\Fixer\Comment\SpaceAfterCommentStartFixer;
+use Nexus\CsConfig\FixerGenerator;
+use PhpCsFixer\Finder;
+
+$finder = Finder::create()
+    ->files()
+    ->in([
+        __DIR__ . '/user_guide_src/source',
+    ])
+    ->notPath([
+        'ci3sample/',
+        'libraries/sessions/017.php',
+    ]);
+
+$overrides = [
+    'echo_tag_syntax'             => false,
+    'php_unit_internal_class'     => false,
+    'no_unused_imports'           => false,
+    'class_attributes_separation' => false,
+];
+
+$options = [
+    'cacheFile'    => 'build/.user-guide.php-cs-fixer.cache',
+    'finder'       => $finder,
+    'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
+    'customRules'  => [
+        NoCodeSeparatorCommentFixer::name() => true,
+        SpaceAfterCommentStartFixer::name() => true,
+    ],
+];
+
+return Factory::create(new CodeIgniter4(), $overrides, $options)->forProjects();
diff --git a/composer.json b/composer.json
index d31045882d31..ed6ff59ccad4 100644
--- a/composer.json
+++ b/composer.json
@@ -62,10 +62,12 @@
         "analyze": "phpstan analyse",
         "test": "phpunit",
         "cs": [
+            "php-cs-fixer fix --verbose --dry-run --diff --config=.user-guide.php-cs-fixer.dist.php",
             "php-cs-fixer fix --verbose --dry-run --diff --config=.no-header.php-cs-fixer.dist.php",
             "php-cs-fixer fix --verbose --dry-run --diff"
         ],
         "cs-fix": [
+            "php-cs-fixer fix --verbose --diff --config=.user-guide.php-cs-fixer.dist.php",
             "php-cs-fixer fix --verbose --diff --config=.no-header.php-cs-fixer.dist.php",
             "php-cs-fixer fix --verbose --diff"
         ]

From e7095469ef365ad6cd50a19c83352110078ff478 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 4 Mar 2022 09:36:15 +0900
Subject: [PATCH 1742/2325] chore: add checking on user guide PHP coding style

---
 admin/pre-commit | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/admin/pre-commit b/admin/pre-commit
index 4f1e7d11f544..e8fdcff64499 100644
--- a/admin/pre-commit
+++ b/admin/pre-commit
@@ -63,6 +63,18 @@ if [ "$FILES" != "" ]; then
         echo "Files in system, tests, utils, or root are not following the coding standards. Please fix them before commit."
         exit 1
     fi
+
+    # Next, run on user_guide_src/source PHP files
+    if [ -d /proc/cygdrive ]; then
+        ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.user-guide.php-cs-fixer.dist.php
+    else
+        php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.user-guide.php-cs-fixer.dist.php
+    fi
+
+    if [ $? != 0 ]; then
+        echo "Files in user_guide_src/source are not following the coding standards. Please fix them before commit."
+        exit 1
+    fi
 fi
 
 if [ "$STAGED_RST_FILES" != "" ]; then

From 24b2210fdc1596a5e4e867f84175fd70d85048b7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 6 Mar 2022 08:45:27 +0900
Subject: [PATCH 1743/2325] docs: add file to exclude

very special method chaining
---
 .user-guide.php-cs-fixer.dist.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.user-guide.php-cs-fixer.dist.php b/.user-guide.php-cs-fixer.dist.php
index ba33baaf409d..7a48f922f1d7 100644
--- a/.user-guide.php-cs-fixer.dist.php
+++ b/.user-guide.php-cs-fixer.dist.php
@@ -26,6 +26,7 @@
     ->notPath([
         'ci3sample/',
         'libraries/sessions/017.php',
+        'database/query_builder/074.php',
     ]);
 
 $overrides = [

From 03354eed49cd344dbecfc2e141d47d06fd2f28eb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 8 Mar 2022 18:52:43 +0900
Subject: [PATCH 1744/2325] chore: add coding style check for user_guide/ in
 GitHub Action

---
 .github/workflows/test-coding-standards.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test-coding-standards.yml b/.github/workflows/test-coding-standards.yml
index 4e9509f4fb2e..c966d9e1e603 100644
--- a/.github/workflows/test-coding-standards.yml
+++ b/.github/workflows/test-coding-standards.yml
@@ -56,3 +56,6 @@ jobs:
 
       - name: Run lint on `system/`, `tests`, `utils/`, and root PHP files
         run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --using-cache=no --diff
+
+      - name: Run lint on `user_guide_src/source/`
+        run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.user-guide.php-cs-fixer.dist.php --using-cache=no --diff

From 5307ec4642c60f51b6427b2d6fbc51c6a06f25e0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 9 Mar 2022 09:10:01 +0900
Subject: [PATCH 1745/2325] docs: add TOC

---
 user_guide_src/source/extending/basecontroller.rst | 4 ++++
 user_guide_src/source/extending/core_classes.rst   | 4 ++++
 user_guide_src/source/extending/events.rst         | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/user_guide_src/source/extending/basecontroller.rst b/user_guide_src/source/extending/basecontroller.rst
index 790eac099060..cdd3710a3c24 100644
--- a/user_guide_src/source/extending/basecontroller.rst
+++ b/user_guide_src/source/extending/basecontroller.rst
@@ -8,6 +8,10 @@ advantage of preloaded components and any additional functionality you provide:
 
 .. literalinclude:: basecontroller/001.php
 
+.. contents::
+    :local:
+    :depth: 2
+
 Preloading Components
 =====================
 
diff --git a/user_guide_src/source/extending/core_classes.rst b/user_guide_src/source/extending/core_classes.rst
index fc06e2c305f8..2de8de4d961b 100644
--- a/user_guide_src/source/extending/core_classes.rst
+++ b/user_guide_src/source/extending/core_classes.rst
@@ -12,6 +12,10 @@ who would like to significantly alter the CodeIgniter core.**
 .. note:: Messing with a core system class has a lot of implications, so make sure you know what you are doing before
     attempting it.
 
+.. contents::
+    :local:
+    :depth: 2
+
 System Class List
 =================
 
diff --git a/user_guide_src/source/extending/events.rst b/user_guide_src/source/extending/events.rst
index cf15415813a4..c14f56a11022 100644
--- a/user_guide_src/source/extending/events.rst
+++ b/user_guide_src/source/extending/events.rst
@@ -11,6 +11,10 @@ Events work on a *publish/subscribe* pattern, where an event, is triggered at so
 Other scripts can "subscribe" to that event by registering with the Events class to let it know they want to perform an
 action when that event is triggered.
 
+.. contents::
+    :local:
+    :depth: 2
+
 Enabling Events
 ===============
 

From e234e9f734a7ba4ac889e598394edf58a06598aa Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 9 Mar 2022 09:10:29 +0900
Subject: [PATCH 1746/2325] docs: update System Class List

---
 user_guide_src/source/extending/core_classes.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/extending/core_classes.rst b/user_guide_src/source/extending/core_classes.rst
index 2de8de4d961b..7695c55ac38d 100644
--- a/user_guide_src/source/extending/core_classes.rst
+++ b/user_guide_src/source/extending/core_classes.rst
@@ -21,13 +21,16 @@ System Class List
 
 The following is a list of the core system files that are invoked every time CodeIgniter runs:
 
-* Config\\Services
 * CodeIgniter\\Autoloader\\Autoloader
+* CodeIgniter\\CodeIgniter
 * CodeIgniter\\Config\\DotEnv
+* CodeIgniter\\Config\\Services
 * CodeIgniter\\Controller
 * CodeIgniter\\Debug\\Exceptions
 * CodeIgniter\\Debug\\Timer
 * CodeIgniter\\Events\\Events
+* CodeIgniter\\Filters\\Filters
+* CodeIgniter\\HTTP\\ContentSecurityPolicy
 * CodeIgniter\\HTTP\\CLIRequest (if launched from command line only)
 * CodeIgniter\\HTTP\\IncomingRequest (if launched over HTTP)
 * CodeIgniter\\HTTP\\Request
@@ -39,9 +42,7 @@ The following is a list of the core system files that are invoked every time Cod
 * CodeIgniter\\Log\\Handlers\\FileHandler
 * CodeIgniter\\Router\\RouteCollection
 * CodeIgniter\\Router\\Router
-* CodeIgniter\\Security\\Security
 * CodeIgniter\\View\\View
-* CodeIgniter\\View\\Escaper
 
 Replacing Core Classes
 ======================

From 43cd7c99e59993f02ebcf7d16f85ef47da2a3613 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 9 Mar 2022 09:18:07 +0900
Subject: [PATCH 1747/2325] docs: decorate classnames with '``'

---
 .../source/extending/core_classes.rst         | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/user_guide_src/source/extending/core_classes.rst b/user_guide_src/source/extending/core_classes.rst
index 7695c55ac38d..5530421f24c5 100644
--- a/user_guide_src/source/extending/core_classes.rst
+++ b/user_guide_src/source/extending/core_classes.rst
@@ -21,28 +21,28 @@ System Class List
 
 The following is a list of the core system files that are invoked every time CodeIgniter runs:
 
-* CodeIgniter\\Autoloader\\Autoloader
-* CodeIgniter\\CodeIgniter
-* CodeIgniter\\Config\\DotEnv
-* CodeIgniter\\Config\\Services
-* CodeIgniter\\Controller
-* CodeIgniter\\Debug\\Exceptions
-* CodeIgniter\\Debug\\Timer
-* CodeIgniter\\Events\\Events
-* CodeIgniter\\Filters\\Filters
-* CodeIgniter\\HTTP\\ContentSecurityPolicy
-* CodeIgniter\\HTTP\\CLIRequest (if launched from command line only)
-* CodeIgniter\\HTTP\\IncomingRequest (if launched over HTTP)
-* CodeIgniter\\HTTP\\Request
-* CodeIgniter\\HTTP\\Response
-* CodeIgniter\\HTTP\\Message
-* CodeIgniter\\HTTP\\URI
-* CodeIgniter\\Log\\Logger
-* CodeIgniter\\Log\\Handlers\\BaseHandler
-* CodeIgniter\\Log\\Handlers\\FileHandler
-* CodeIgniter\\Router\\RouteCollection
-* CodeIgniter\\Router\\Router
-* CodeIgniter\\View\\View
+*  ``CodeIgniter\Autoloader\Autoloader``
+*  ``CodeIgniter\CodeIgniter``
+*  ``CodeIgniter\Config\DotEnv``
+*  ``CodeIgniter\Config\Services``
+*  ``CodeIgniter\Controller``
+*  ``CodeIgniter\Debug\Exceptions``
+*  ``CodeIgniter\Debug\Timer``
+*  ``CodeIgniter\Events\Events``
+*  ``CodeIgniter\Filters\Filters``
+*  ``CodeIgniter\HTTP\ContentSecurityPolicy``
+*  ``CodeIgniter\HTTP\CLIRequest`` (if launched from command line only)
+*  ``CodeIgniter\HTTP\IncomingRequest`` (if launched over HTTP)
+*  ``CodeIgniter\HTTP\Request``
+*  ``CodeIgniter\HTTP\Response``
+*  ``CodeIgniter\HTTP\Message``
+*  ``CodeIgniter\HTTP\URI``
+*  ``CodeIgniter\Log\Logger``
+*  ``CodeIgniter\Log\Handlers\BaseHandler``
+*  ``CodeIgniter\Log\Handlers\FileHandler``
+*  ``CodeIgniter\Router\RouteCollection``
+*  ``CodeIgniter\Router\Router``
+*  ``CodeIgniter\View\View``
 
 Replacing Core Classes
 ======================
@@ -69,7 +69,7 @@ identical to replacing a class with one exception:
 
 * The class declaration must extend the parent class.
 
-For example, to extend the native RouteCollection class, you would declare your class with:
+For example, to extend the native ``RouteCollection`` class, you would declare your class with:
 
 .. literalinclude:: core_classes/003.php
 

From caa5d62484d759d3c1befab536d1ea657713c487 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 9 Mar 2022 09:18:44 +0900
Subject: [PATCH 1748/2325] docs: fix words

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

diff --git a/user_guide_src/source/extending/core_classes.rst b/user_guide_src/source/extending/core_classes.rst
index 5530421f24c5..8f923a2e14bd 100644
--- a/user_guide_src/source/extending/core_classes.rst
+++ b/user_guide_src/source/extending/core_classes.rst
@@ -19,7 +19,7 @@ who would like to significantly alter the CodeIgniter core.**
 System Class List
 =================
 
-The following is a list of the core system files that are invoked every time CodeIgniter runs:
+The following is a list of the core system classes that are invoked every time CodeIgniter runs:
 
 *  ``CodeIgniter\Autoloader\Autoloader``
 *  ``CodeIgniter\CodeIgniter``
@@ -48,7 +48,7 @@ Replacing Core Classes
 ======================
 
 To use one of your own system classes instead of a default one, ensure that the :doc:`Autoloader <../concepts/autoloader>`
-can find your class, that your new class extends the appropriate interface, and modify the appropriate
+can find your class, that your new class implements the appropriate interface, and modify the appropriate
 :doc:`Service <../concepts/services>` to load your class in place of the core class.
 
 For example, if you have a new ``App\Libraries\RouteCollection`` class that you would like to use in place of

From e80d3b9933ecf5073c11127f7917c6e253030ca5 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Tue, 8 Mar 2022 22:23:25 -0600
Subject: [PATCH 1749/2325] Extend Validation from BaseConfig so Registrars can
 add rules.

---
 app/Config/Validation.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Config/Validation.php b/app/Config/Validation.php
index 1cff0424f4de..a254c1850015 100644
--- a/app/Config/Validation.php
+++ b/app/Config/Validation.php
@@ -2,12 +2,13 @@
 
 namespace Config;
 
+use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Validation\CreditCardRules;
 use CodeIgniter\Validation\FileRules;
 use CodeIgniter\Validation\FormatRules;
 use CodeIgniter\Validation\Rules;
 
-class Validation
+class Validation extends BaseConfig
 {
     //--------------------------------------------------------------------
     // Setup

From 6804486d254ec67e16fa862c69422d26891bba68 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 10 Mar 2022 09:00:42 +0900
Subject: [PATCH 1750/2325] docs: fix incorrect directory name

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

diff --git a/user_guide_src/source/extending/common.rst b/user_guide_src/source/extending/common.rst
index 5c5bf9c999e0..e85ca6c56ef8 100644
--- a/user_guide_src/source/extending/common.rst
+++ b/user_guide_src/source/extending/common.rst
@@ -4,9 +4,9 @@ Replacing Common Functions
 
 There are quite a few functions necessary to CodeIgniter that need to be loaded early for use in the core classes and
 thus cannot be placed into a helper. While most users will never have any need to do this, but the option to replace
-these functions does exist for those who would like to significantly alter the CodeIgniter core. In the ``App\``
-directory there is a file ``Common.php``, and any functions defined in there will take precedence over the versions
-found in ``system/Common.php``. This is also an opportunity to create globally-available functions you intend to
+these functions does exist for those who would like to significantly alter the CodeIgniter core. In the **app/**
+directory there is a file **Common.php**, and any functions defined in there will take precedence over the versions
+found in **system/Common.php**. This is also an opportunity to create globally-available functions you intend to
 use throughout the framework.
 
 .. note:: Messing with a core system class has a lot of implications, so make sure you know what you are doing before

From a4d777bdcea8a959d984c4362acc40d979a06e2a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 10 Mar 2022 09:03:40 +0900
Subject: [PATCH 1751/2325] docs: fix incorrect event name and method name

---
 user_guide_src/source/extending/events.rst     | 4 ++--
 user_guide_src/source/extending/events/001.php | 2 +-
 user_guide_src/source/extending/events/002.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/extending/events.rst b/user_guide_src/source/extending/events.rst
index c14f56a11022..439aaffd4718 100644
--- a/user_guide_src/source/extending/events.rst
+++ b/user_guide_src/source/extending/events.rst
@@ -29,8 +29,8 @@ a callable that will be run when that event is triggered:
 
 .. literalinclude:: events/001.php
 
-In this example, whenever the **pre_controller** event is executed, an instance of ``MyClass`` is created and the
-``MyFunction`` method is run. Note that the second parameter can be *any* form of
+In this example, whenever the ``pre_system`` event is executed, an instance of ``MyClass`` is created and the
+``myFunction()`` method is run. Note that the second parameter can be *any* form of
 `callable <https://www.php.net/manual/en/function.is-callable.php>`_ that PHP recognizes:
 
 .. literalinclude:: events/002.php
diff --git a/user_guide_src/source/extending/events/001.php b/user_guide_src/source/extending/events/001.php
index 2a3ee317e594..3702ec7518c2 100644
--- a/user_guide_src/source/extending/events/001.php
+++ b/user_guide_src/source/extending/events/001.php
@@ -2,4 +2,4 @@
 
 use CodeIgniter\Events\Events;
 
-Events::on('pre_system', ['MyClass', 'MyFunction']);
+Events::on('pre_system', ['MyClass', 'myFunction']);
diff --git a/user_guide_src/source/extending/events/002.php b/user_guide_src/source/extending/events/002.php
index 00fa912bd45a..ca9bf0074209 100644
--- a/user_guide_src/source/extending/events/002.php
+++ b/user_guide_src/source/extending/events/002.php
@@ -5,7 +5,7 @@
 
 // Call on an instance method
 $user = new User();
-Events::on('pre_system', [$user, 'some_method']);
+Events::on('pre_system', [$user, 'someMethod']);
 
 // Call on a static method
 Events::on('pre_system', 'SomeClass::someMethod');

From d8b3ed4fb47172677665b47757703fb65a9eee81 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 10 Mar 2022 09:04:50 +0900
Subject: [PATCH 1752/2325] docs: decorate classname with '``'

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

diff --git a/user_guide_src/source/extending/events.rst b/user_guide_src/source/extending/events.rst
index 439aaffd4718..1b2c53a918cd 100644
--- a/user_guide_src/source/extending/events.rst
+++ b/user_guide_src/source/extending/events.rst
@@ -24,7 +24,7 @@ Defining an Event
 =================
 
 Most events are defined within the **app/Config/Events.php** file. You can subscribe an action to an event with
-the Events class' ``on()`` method. The first parameter is the name of the event to subscribe to. The second parameter is
+the ``Events`` class' ``on()`` method. The first parameter is the name of the event to subscribe to. The second parameter is
 a callable that will be run when that event is triggered:
 
 .. literalinclude:: events/001.php

From 7ea657bdff71b9ae7fbe33a5dc0e3635d8a7598e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 11 Mar 2022 08:49:34 +0900
Subject: [PATCH 1753/2325] docs: fix RST format

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

diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
index af683bc0afe2..55e68adc5847 100644
--- a/user_guide_src/source/libraries/publisher.rst
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -80,6 +80,7 @@ In order to prevent modules from injecting malicious code into your projects, ``
 that defines which directories and file patterns are allowed as destinations. By default, files may only be published
 to your project (to prevent access to the rest of the filesystem), and the **public/** folder (``FCPATH``) will only
 receive files with the following extensions:
+
 * Web assets: css, scss, js, map
 * Non-executable web files: htm, html, xml, json, webmanifest
 * Fonts: tff, eot, woff

From 1f6e857b89fd3a81435f881a7c1b23738aba2ea3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 11 Mar 2022 08:49:52 +0900
Subject: [PATCH 1754/2325] docs: add config file path

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

diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
index 55e68adc5847..9acf7ec48011 100644
--- a/user_guide_src/source/libraries/publisher.rst
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -86,7 +86,7 @@ receive files with the following extensions:
 * Fonts: tff, eot, woff
 * Images: gif, jpg, jpeg, tiff, png, webp, bmp, ico, svg
 
-If you need to add or adjust the security for your project then alter the ``$restrictions`` property of ``Config\Publisher``.
+If you need to add or adjust the security for your project then alter the ``$restrictions`` property of ``Config\Publisher`` in **app/Config/Publisher.php**.
 
 ********
 Examples

From 7ff85e66362b2f5da8503ab2d78d40322629cdfe Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 11 Mar 2022 08:56:24 +0900
Subject: [PATCH 1755/2325] docs: add .tif

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

diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
index 9acf7ec48011..69de79bd7464 100644
--- a/user_guide_src/source/libraries/publisher.rst
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -84,7 +84,7 @@ receive files with the following extensions:
 * Web assets: css, scss, js, map
 * Non-executable web files: htm, html, xml, json, webmanifest
 * Fonts: tff, eot, woff
-* Images: gif, jpg, jpeg, tiff, png, webp, bmp, ico, svg
+* Images: gif, jpg, jpeg, tif, tiff, png, webp, bmp, ico, svg
 
 If you need to add or adjust the security for your project then alter the ``$restrictions`` property of ``Config\Publisher`` in **app/Config/Publisher.php**.
 

From 43ad9b8148d42c014f890434f6febbcad64fe55d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 11 Mar 2022 08:58:23 +0900
Subject: [PATCH 1756/2325] fix: regex for file extentions to FCPATH

---
 app/Config/Publisher.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Config/Publisher.php b/app/Config/Publisher.php
index f3768bc577b4..4f7cf11037f5 100644
--- a/app/Config/Publisher.php
+++ b/app/Config/Publisher.php
@@ -23,6 +23,6 @@ class Publisher extends BasePublisher
      */
     public $restrictions = [
         ROOTPATH => '*',
-        FCPATH   => '#\.(?css|js|map|htm?|xml|json|webmanifest|tff|eot|woff?|gif|jpe?g|tiff?|png|webp|bmp|ico|svg)$#i',
+        FCPATH   => '#\.(s?css|js|map|html?|xml|json|webmanifest|tff|eot|woff|gif|jpe?g|tiff?|png|webp|bmp|ico|svg)$#i',
     ];
 }

From 81c588bacf1f6488e6fbe51a3d799c09390b789c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 11 Mar 2022 09:05:01 +0900
Subject: [PATCH 1757/2325] test: fix classname in comment

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

diff --git a/tests/system/Publisher/PublisherRestrictionsTest.php b/tests/system/Publisher/PublisherRestrictionsTest.php
index a3750f1427ad..9353c1d6ccfd 100644
--- a/tests/system/Publisher/PublisherRestrictionsTest.php
+++ b/tests/system/Publisher/PublisherRestrictionsTest.php
@@ -25,7 +25,7 @@
 final class PublisherRestrictionsTest extends CIUnitTestCase
 {
     /**
-     * @see Tests\Support\Config\Registrars::Publisher()
+     * @see \Tests\Support\Config\Registrar::Publisher()
      */
     public function testRegistrarsNotAllowed()
     {

From 3a0d78b664417408ed339b3b7533bba38be1e20c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 11 Mar 2022 09:05:35 +0900
Subject: [PATCH 1758/2325] test: refactor dataProvider

---
 tests/system/Publisher/PublisherRestrictionsTest.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/system/Publisher/PublisherRestrictionsTest.php b/tests/system/Publisher/PublisherRestrictionsTest.php
index 9353c1d6ccfd..620a74dcf224 100644
--- a/tests/system/Publisher/PublisherRestrictionsTest.php
+++ b/tests/system/Publisher/PublisherRestrictionsTest.php
@@ -69,11 +69,11 @@ public function testDefaultPublicRestrictions(string $path)
 
     public function fileProvider()
     {
-        yield 'php' => ['index.php'];
-
-        yield 'exe' => ['cat.exe'];
-
-        yield 'flat' => ['banana'];
+        yield from [
+            'php'  => ['index.php'],
+            'exe'  => ['cat.exe'],
+            'flat' => ['banana'],
+        ];
     }
 
     /**

From 608fa4251ade74f87164e3656b3e245d1151e79e Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Fri, 11 Mar 2022 17:32:44 +0100
Subject: [PATCH 1759/2325] Renumerate examples.

---
 user_guide_src/{renumerate => renumerate.php} |   0
 .../source/database/query_builder.rst         | 168 +++++++++---------
 .../source/database/query_builder/015.php     |   9 +-
 .../source/database/query_builder/016.php     |   9 +-
 .../source/database/query_builder/017.php     |   6 +-
 .../source/database/query_builder/018.php     |  12 +-
 .../source/database/query_builder/019.php     |  10 +-
 .../source/database/query_builder/020.php     |   4 +-
 .../source/database/query_builder/021.php     |   4 +-
 .../source/database/query_builder/022.php     |   7 +-
 .../source/database/query_builder/023.php     |   6 +-
 .../source/database/query_builder/024.php     |   3 +-
 .../source/database/query_builder/025.php     |   4 +-
 .../source/database/query_builder/026.php     |   3 +-
 .../source/database/query_builder/027.php     |  10 +-
 .../source/database/query_builder/028.php     |  10 +-
 .../source/database/query_builder/029.php     |   6 +-
 .../source/database/query_builder/030.php     |  10 +-
 .../source/database/query_builder/031.php     |  10 +-
 .../source/database/query_builder/032.php     |  10 +-
 .../source/database/query_builder/033.php     |  10 +-
 .../source/database/query_builder/034.php     |  10 +-
 .../source/database/query_builder/035.php     |  10 +-
 .../source/database/query_builder/036.php     |  10 +-
 .../source/database/query_builder/037.php     |   9 +-
 .../source/database/query_builder/038.php     |   3 +-
 .../source/database/query_builder/039.php     |   6 +-
 .../source/database/query_builder/040.php     |   6 +-
 .../source/database/query_builder/041.php     |   5 +-
 .../source/database/query_builder/042.php     |   3 +-
 .../source/database/query_builder/043.php     |   4 +-
 .../source/database/query_builder/044.php     |   5 +-
 .../source/database/query_builder/045.php     |   4 +-
 .../source/database/query_builder/046.php     |   5 +-
 .../source/database/query_builder/047.php     |   5 +-
 .../source/database/query_builder/048.php     |   4 +-
 .../source/database/query_builder/049.php     |   4 +-
 .../source/database/query_builder/050.php     |   5 +-
 .../source/database/query_builder/051.php     |  10 +-
 .../source/database/query_builder/052.php     |  10 +-
 .../source/database/query_builder/053.php     |  10 +-
 .../source/database/query_builder/054.php     |  10 +-
 .../source/database/query_builder/055.php     |  10 +-
 .../source/database/query_builder/056.php     |  10 +-
 .../source/database/query_builder/057.php     |  10 +-
 .../source/database/query_builder/058.php     |   9 +-
 .../source/database/query_builder/059.php     |   3 +-
 .../source/database/query_builder/060.php     |   6 +-
 .../source/database/query_builder/061.php     |   6 +-
 .../source/database/query_builder/062.php     |   5 +-
 .../source/database/query_builder/063.php     |   4 +-
 .../source/database/query_builder/064.php     |   5 +-
 .../source/database/query_builder/065.php     |   5 +-
 .../source/database/query_builder/066.php     |   4 +-
 .../source/database/query_builder/067.php     |   3 +-
 .../source/database/query_builder/068.php     |   8 +-
 .../source/database/query_builder/069.php     |   7 +-
 .../source/database/query_builder/070.php     |   4 +-
 .../source/database/query_builder/071.php     |   6 +-
 .../source/database/query_builder/072.php     |   5 +-
 .../source/database/query_builder/073.php     |   2 +-
 .../source/database/query_builder/074.php     |  15 +-
 .../source/database/query_builder/075.php     |  22 ++-
 .../source/database/query_builder/076.php     |  16 +-
 .../source/database/query_builder/077.php     |  16 +-
 .../source/database/query_builder/078.php     |   5 +-
 .../source/database/query_builder/079.php     |  12 +-
 .../source/database/query_builder/080.php     |  18 +-
 .../source/database/query_builder/081.php     |  17 +-
 .../source/database/query_builder/082.php     |  11 +-
 .../source/database/query_builder/083.php     |   3 +-
 .../source/database/query_builder/084.php     |  13 +-
 .../source/database/query_builder/085.php     |  15 +-
 .../source/database/query_builder/086.php     |  14 +-
 .../source/database/query_builder/087.php     |  22 +--
 .../source/database/query_builder/088.php     |  20 +--
 .../source/database/query_builder/089.php     |  17 +-
 .../source/database/query_builder/090.php     |   2 +-
 .../source/database/query_builder/091.php     |  27 +--
 .../source/database/query_builder/092.php     |  28 ++-
 .../source/database/query_builder/093.php     |   9 +-
 .../source/database/query_builder/094.php     |   9 +-
 .../source/database/query_builder/095.php     |   7 +-
 .../source/database/query_builder/096.php     |   9 +-
 .../source/database/query_builder/097.php     |  19 +-
 .../source/database/query_builder/098.php     |  19 +-
 .../source/incoming/controllers.rst           |  38 ++--
 .../source/incoming/controllers/001.php       |   7 +-
 .../source/incoming/controllers/002.php       |   7 +-
 .../source/incoming/controllers/003.php       |   7 +-
 .../source/incoming/controllers/004.php       |  16 +-
 .../source/incoming/controllers/005.php       |  19 +-
 .../source/incoming/controllers/006.php       |  23 ++-
 .../source/incoming/controllers/007.php       |   5 +-
 .../source/incoming/controllers/008.php       |  10 +-
 .../source/incoming/controllers/009.php       |   7 +-
 .../source/incoming/controllers/010.php       |   7 +-
 .../source/incoming/controllers/011.php       |  11 +-
 .../source/incoming/controllers/012.php       |  19 +-
 .../source/incoming/controllers/013.php       |  11 +-
 .../source/incoming/controllers/014.php       |  11 +-
 .../source/incoming/controllers/015.php       |   4 +-
 .../source/incoming/controllers/016.php       |   7 +-
 .../source/incoming/controllers/017.php       |  15 +-
 .../source/incoming/controllers/018.php       |  12 +-
 .../source/incoming/controllers/019.php       |  20 +--
 user_guide_src/source/incoming/routing.rst    |  80 ++++-----
 .../source/incoming/routing/004_1.php         |   3 -
 .../source/incoming/routing/004_2.php         |   5 -
 .../source/incoming/routing/004_3.php         |   8 -
 .../source/incoming/routing/004_4.php         |   8 -
 .../source/incoming/routing/013.php           |   3 +-
 .../source/incoming/routing/014.php           |   4 +-
 .../source/incoming/routing/015.php           |   7 +-
 .../source/incoming/routing/016.php           |   9 +-
 .../source/incoming/routing/017.php           |   8 +-
 .../source/incoming/routing/018.php           |   7 +-
 .../source/incoming/routing/019.php           |   5 +-
 .../source/incoming/routing/020.php           |   6 +-
 .../source/incoming/routing/021.php           |   9 +-
 .../source/incoming/routing/022.php           |  11 +-
 .../source/incoming/routing/023.php           |   7 +-
 .../source/incoming/routing/024.php           |   4 +-
 .../source/incoming/routing/025.php           |  11 +-
 .../source/incoming/routing/026.php           |  13 +-
 .../source/incoming/routing/027.php           |   6 +-
 .../source/incoming/routing/028.php           |   4 +-
 .../source/incoming/routing/029.php           |  20 +--
 .../source/incoming/routing/030.php           |   9 +-
 .../source/incoming/routing/031.php           |   2 +-
 .../source/incoming/routing/032.php           |   2 +-
 .../source/incoming/routing/033.php           |  13 +-
 .../source/incoming/routing/034.php           |   3 +-
 .../source/incoming/routing/035.php           |   2 +-
 .../source/incoming/routing/036.php           |   3 +-
 .../source/incoming/routing/037.php           |   3 +-
 .../source/incoming/routing/038.php           |   6 +-
 .../source/incoming/routing/039.php           |  11 +-
 .../source/incoming/routing/040.php           |   3 +-
 .../source/incoming/routing/041.php           |   9 +-
 .../source/incoming/routing/042.php           |   9 +-
 .../source/incoming/routing/043.php           |  12 +-
 .../source/incoming/routing/044.php           |   2 +-
 .../source/incoming/routing/045.php           |   8 +-
 .../source/incoming/routing/046.php           |   8 +-
 .../source/incoming/routing/047.php           |   9 +-
 .../source/incoming/routing/048.php           |   6 +-
 .../source/incoming/routing/049.php           |   3 +
 .../source/incoming/routing/050.php           |   3 +
 .../source/incoming/routing/051.php           |   9 +
 .../source/incoming/routing/052.php           |   7 +
 user_guide_src/source/libraries/sessions.rst  |  84 ++++-----
 .../source/libraries/sessions/002.php         |   3 +
 .../source/libraries/sessions/003.php         |   2 +-
 .../source/libraries/sessions/004.php         |   2 +-
 .../source/libraries/sessions/005.php         |   2 +-
 .../source/libraries/sessions/006.php         |   2 +-
 .../source/libraries/sessions/007.php         |   2 +-
 .../source/libraries/sessions/008.php         |  10 +-
 .../source/libraries/sessions/009.php         |  10 +-
 .../source/libraries/sessions/010.php         |   4 +-
 .../source/libraries/sessions/011.php         |   8 +-
 .../source/libraries/sessions/012.php         |   8 +-
 .../source/libraries/sessions/013.php         |   6 +-
 .../source/libraries/sessions/014.php         |   6 +-
 .../source/libraries/sessions/015.php         |   2 +-
 .../source/libraries/sessions/016.php         |   7 +-
 .../source/libraries/sessions/017.php         |   7 +-
 .../source/libraries/sessions/018.php         |   3 +-
 .../source/libraries/sessions/019.php         |   3 +-
 .../source/libraries/sessions/020.php         |   2 +-
 .../source/libraries/sessions/021.php         |   3 +-
 .../source/libraries/sessions/022.php         |   3 +-
 .../source/libraries/sessions/023.php         |   2 +-
 .../source/libraries/sessions/024.php         |   2 +-
 .../source/libraries/sessions/025.php         |   2 +-
 .../source/libraries/sessions/026.php         |   3 +-
 .../source/libraries/sessions/027.php         |   4 +-
 .../source/libraries/sessions/028.php         |  11 +-
 .../source/libraries/sessions/029.php         |  11 +-
 .../source/libraries/sessions/030.php         |   3 +-
 .../source/libraries/sessions/031.php         |   3 +-
 .../source/libraries/sessions/032.php         |   3 +-
 .../source/libraries/sessions/033.php         |   2 +-
 .../source/libraries/sessions/034.php         |   2 +-
 .../source/libraries/sessions/035.php         |   2 +-
 .../source/libraries/sessions/036.php         |   2 +-
 .../source/libraries/sessions/037.php         |   4 +-
 .../source/libraries/sessions/038.php         |   4 +-
 .../source/libraries/sessions/039.php         |  11 +-
 .../source/libraries/sessions/040.php         |   3 +-
 .../source/libraries/sessions/041.php         |   3 +-
 .../source/libraries/sessions/042.php         |   4 +-
 .../source/libraries/sessions/043.php         |   6 +-
 .../source/libraries/sessions/044.php         |  14 --
 .../source/libraries/uploaded_files.rst       |  34 ++--
 .../source/libraries/uploaded_files/004.php   |   3 +
 .../source/libraries/uploaded_files/005.php   |   3 +
 .../source/libraries/uploaded_files/006.php   |  10 ++
 .../source/libraries/uploaded_files/007.php   |   3 +-
 .../source/libraries/uploaded_files/008.php   |   2 +-
 .../source/libraries/uploaded_files/009.php   |  10 +-
 .../source/libraries/uploaded_files/010.php   |   5 +-
 .../source/libraries/uploaded_files/011.php   |   2 +-
 .../source/libraries/uploaded_files/012.php   |   3 +-
 .../source/libraries/uploaded_files/013.php   |   4 +-
 .../source/libraries/uploaded_files/014.php   |   2 +-
 .../source/libraries/uploaded_files/015.php   |   4 +-
 .../source/libraries/uploaded_files/016.php   |   2 +-
 .../source/libraries/uploaded_files/017.php   |   3 +-
 .../source/libraries/uploaded_files/018.php   |   6 +-
 .../source/libraries/uploaded_files/019.php   |   2 +-
 .../source/libraries/uploaded_files/020.php   |   3 +-
 .../source/libraries/uploaded_files/021.php   |   5 -
 .../source/libraries/uploaded_files/022.php   |   3 -
 .../source/libraries/uploaded_files/023.php   |   3 -
 .../source/libraries/validation.rst           |  20 +--
 .../source/libraries/validation/028.2.php     |  12 --
 .../source/libraries/validation/029.php       |  19 +-
 .../source/libraries/validation/030.php       |  13 +-
 .../source/libraries/validation/031.php       |  16 +-
 .../source/libraries/validation/032.php       |  14 +-
 .../source/libraries/validation/033.php       |  21 ++-
 .../source/libraries/validation/034.php       |  10 +-
 .../source/libraries/validation/035.php       |  16 +-
 .../source/libraries/validation/036.php       |  36 +---
 .../source/libraries/validation/037.php       |  41 ++++-
 .../source/libraries/validation/038.php       |  10 ++
 user_guide_src/source/testing/overview.rst    |  32 ++--
 .../source/testing/overview/003.php           |  14 ++
 .../source/testing/overview/004.php           |  10 +-
 .../source/testing/overview/005.php           |  11 +-
 .../source/testing/overview/006.php           |  22 ++-
 .../source/testing/overview/007.php           |  22 +--
 .../source/testing/overview/008.php           |  10 +-
 .../source/testing/overview/009.php           |  10 +-
 .../source/testing/overview/010.php           |   2 +-
 .../source/testing/overview/011.php           |  10 +-
 .../source/testing/overview/012.php           |   2 +-
 .../source/testing/overview/013.php           |  11 +-
 .../source/testing/overview/014.php           |   7 +-
 .../source/testing/overview/015.php           |   6 +-
 .../source/testing/overview/016.php           |  17 +-
 .../source/testing/overview/017.php           |  10 +-
 .../source/testing/overview/018.php           |  16 +-
 .../source/testing/overview/019.php           |  24 ---
 246 files changed, 1209 insertions(+), 1209 deletions(-)
 rename user_guide_src/{renumerate => renumerate.php} (100%)
 delete mode 100644 user_guide_src/source/incoming/routing/004_1.php
 delete mode 100644 user_guide_src/source/incoming/routing/004_2.php
 delete mode 100644 user_guide_src/source/incoming/routing/004_3.php
 delete mode 100644 user_guide_src/source/incoming/routing/004_4.php
 create mode 100644 user_guide_src/source/incoming/routing/049.php
 create mode 100644 user_guide_src/source/incoming/routing/050.php
 create mode 100644 user_guide_src/source/incoming/routing/051.php
 create mode 100644 user_guide_src/source/incoming/routing/052.php
 create mode 100644 user_guide_src/source/libraries/sessions/002.php
 delete mode 100644 user_guide_src/source/libraries/sessions/044.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/004.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/005.php
 create mode 100644 user_guide_src/source/libraries/uploaded_files/006.php
 delete mode 100644 user_guide_src/source/libraries/uploaded_files/021.php
 delete mode 100644 user_guide_src/source/libraries/uploaded_files/022.php
 delete mode 100644 user_guide_src/source/libraries/uploaded_files/023.php
 delete mode 100644 user_guide_src/source/libraries/validation/028.2.php
 create mode 100644 user_guide_src/source/libraries/validation/038.php
 create mode 100644 user_guide_src/source/testing/overview/003.php
 delete mode 100644 user_guide_src/source/testing/overview/019.php

diff --git a/user_guide_src/renumerate b/user_guide_src/renumerate.php
similarity index 100%
rename from user_guide_src/renumerate
rename to user_guide_src/renumerate.php
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 2df0d3a03084..d6e5b27aac36 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -159,7 +159,7 @@ the resulting field.
 
 Adds a subquery to the SELECT section.
 
-.. literalinclude:: query_builder/098.php
+.. literalinclude:: query_builder/015.php
    :lines: 2-
 
 From
@@ -169,7 +169,7 @@ From
 
 Permits you to write the **FROM** portion of your query:
 
-.. literalinclude:: query_builder/015.php
+.. literalinclude:: query_builder/016.php
 
 .. note:: As shown earlier, the **FROM** portion of your query can be specified
     in the ``$db->table()`` method. Additional calls to ``from()`` will add more tables
@@ -186,11 +186,11 @@ Permits you to write part of a **FROM** query as a subquery.
 
 This is where we add a subquery to an existing table:
 
-.. literalinclude:: query_builder/016.php
+.. literalinclude:: query_builder/017.php
 
 Use the ``$db->newQuery()`` method to make a subquery the main table:
 
-.. literalinclude:: query_builder/017.php
+.. literalinclude:: query_builder/018.php
 
 Join
 ====
@@ -199,7 +199,7 @@ Join
 
 Permits you to write the **JOIN** portion of your query:
 
-.. literalinclude:: query_builder/018.php
+.. literalinclude:: query_builder/019.php
 
 Multiple method calls can be made if you need several joins in one
 query.
@@ -208,7 +208,7 @@ If you need a specific type of **JOIN** you can specify it via the third
 parameter of the method. Options are: ``left``, ``right``, ``outer``, ``inner``, ``left
 outer``, and ``right outer``.
 
-.. literalinclude:: query_builder/019.php
+.. literalinclude:: query_builder/020.php
 
 *************************
 Looking for Specific Data
@@ -227,97 +227,97 @@ methods:
 
 #. **Simple key/value method:**
 
-    .. literalinclude:: query_builder/020.php
+    .. literalinclude:: query_builder/021.php
 
     Notice that the equal sign is added for you.
 
     If you use multiple method calls they will be chained together with
     **AND** between them:
 
-    .. literalinclude:: query_builder/021.php
+    .. literalinclude:: query_builder/022.php
 
 #. **Custom key/value method:**
 
     You can include an operator in the first parameter in order to
     control the comparison:
 
-    .. literalinclude:: query_builder/022.php
+    .. literalinclude:: query_builder/023.php
 
 #. **Associative array method:**
 
-    .. literalinclude:: query_builder/023.php
+    .. literalinclude:: query_builder/024.php
 
     You can include your own operators using this method as well:
 
-    .. literalinclude:: query_builder/024.php
+    .. literalinclude:: query_builder/025.php
 
 #. **Custom string:**
 
     You can write your own clauses manually:
 
-    .. literalinclude:: query_builder/025.php
+    .. literalinclude:: query_builder/026.php
 
     .. warning:: If you are using user-supplied data within the string, you MUST escape the
         data manually. Failure to do so could result in SQL injections.
 
-        .. literalinclude:: query_builder/026.php
+        .. literalinclude:: query_builder/027.php
 
 .. _query-builder-where-subquery:
 
 5. **Subqueries:**
 
-    .. literalinclude:: query_builder/027.php
+    .. literalinclude:: query_builder/028.php
 
 **$builder->orWhere()**
 
 This method is identical to the one above, except that multiple
 instances are joined by **OR**:
 
-.. literalinclude:: query_builder/028.php
+.. literalinclude:: query_builder/029.php
 
 **$builder->whereIn()**
 
 Generates a **WHERE** field IN ('item', 'item') SQL query joined with **AND** if
 appropriate:
 
-.. literalinclude:: query_builder/029.php
+.. literalinclude:: query_builder/030.php
 
 You can use subqueries instead of an array of values:
 
-.. literalinclude:: query_builder/030.php
+.. literalinclude:: query_builder/031.php
 
 **$builder->orWhereIn()**
 
 Generates a **WHERE field IN ('item', 'item')** SQL query joined with **OR** if
 appropriate:
 
-.. literalinclude:: query_builder/031.php
+.. literalinclude:: query_builder/032.php
 
 You can use subqueries instead of an array of values:
 
-.. literalinclude:: query_builder/032.php
+.. literalinclude:: query_builder/033.php
 
 **$builder->whereNotIn()**
 
 Generates a **WHERE field NOT IN ('item', 'item')** SQL query joined with
 **AND** if appropriate:
 
-.. literalinclude:: query_builder/033.php
+.. literalinclude:: query_builder/034.php
 
 You can use subqueries instead of an array of values:
 
-.. literalinclude:: query_builder/034.php
+.. literalinclude:: query_builder/035.php
 
 **$builder->orWhereNotIn()**
 
 Generates a **WHERE field NOT IN ('item', 'item')** SQL query joined with **OR**
 if appropriate:
 
-.. literalinclude:: query_builder/035.php
+.. literalinclude:: query_builder/036.php
 
 You can use subqueries instead of an array of values:
 
-.. literalinclude:: query_builder/036.php
+.. literalinclude:: query_builder/037.php
 
 ************************
 Looking for Similar Data
@@ -337,76 +337,76 @@ searches.
 
 #. **Simple key/value method:**
 
-    .. literalinclude:: query_builder/037.php
+    .. literalinclude:: query_builder/038.php
 
     If you use multiple method calls they will be chained together with
     **AND** between them:
 
-    .. literalinclude:: query_builder/038.php
+    .. literalinclude:: query_builder/039.php
 
     If you want to control where the wildcard (**%**) is placed, you can use
     an optional third argument. Your options are ``before``, ``after`` and
     ``both`` (which is the default).
 
-    .. literalinclude:: query_builder/039.php
+    .. literalinclude:: query_builder/040.php
 
 #. **Associative array method:**
 
-       .. literalinclude:: query_builder/040.php
+       .. literalinclude:: query_builder/041.php
 
 **$builder->orLike()**
 
 This method is identical to the one above, except that multiple
 instances are joined by **OR**:
 
-.. literalinclude:: query_builder/041.php
+.. literalinclude:: query_builder/042.php
 
 **$builder->notLike()**
 
 This method is identical to ``like()``, except that it generates
 **NOT LIKE** statements:
 
-.. literalinclude:: query_builder/042.php
+.. literalinclude:: query_builder/043.php
 
 **$builder->orNotLike()**
 
 This method is identical to ``notLike()``, except that multiple
 instances are joined by **OR**:
 
-.. literalinclude:: query_builder/043.php
+.. literalinclude:: query_builder/044.php
 
 **$builder->groupBy()**
 
 Permits you to write the **GROUP BY** portion of your query:
 
-.. literalinclude:: query_builder/044.php
+.. literalinclude:: query_builder/045.php
 
 You can also pass an array of multiple values as well:
 
-.. literalinclude:: query_builder/045.php
+.. literalinclude:: query_builder/046.php
 
 **$builder->distinct()**
 
 Adds the **DISTINCT** keyword to a query
 
-.. literalinclude:: query_builder/046.php
+.. literalinclude:: query_builder/047.php
 
 **$builder->having()**
 
 Permits you to write the **HAVING** portion of your query. There are 2
 possible syntaxes, 1 argument or 2:
 
-.. literalinclude:: query_builder/047.php
+.. literalinclude:: query_builder/048.php
 
 You can also pass an array of multiple values as well:
 
-.. literalinclude:: query_builder/048.php
+.. literalinclude:: query_builder/049.php
 
 If you are using a database that CodeIgniter escapes queries for, you
 can prevent escaping content by passing an optional third argument, and
 setting it to ``false``.
 
-.. literalinclude:: query_builder/049.php
+.. literalinclude:: query_builder/050.php
 
 **$builder->orHaving()**
 
@@ -417,44 +417,44 @@ Identical to ``having()``, only separates multiple clauses with **OR**.
 Generates a **HAVING field IN ('item', 'item')** SQL query joined with **AND** if
 appropriate:
 
-.. literalinclude:: query_builder/050.php
+.. literalinclude:: query_builder/051.php
 
 You can use subqueries instead of an array of values:
 
-.. literalinclude:: query_builder/051.php
+.. literalinclude:: query_builder/052.php
 
 **$builder->orHavingIn()**
 
 Generates a **HAVING field IN ('item', 'item')** SQL query joined with **OR** if
 appropriate
 
-.. literalinclude:: query_builder/052.php
+.. literalinclude:: query_builder/053.php
 
 You can use subqueries instead of an array of values:
 
-.. literalinclude:: query_builder/053.php
+.. literalinclude:: query_builder/054.php
 
 **$builder->havingNotIn()**
 
 Generates a **HAVING field NOT IN ('item', 'item')** SQL query joined with
 **AND** if appropriate
 
-.. literalinclude:: query_builder/054.php
+.. literalinclude:: query_builder/055.php
 
 You can use subqueries instead of an array of values:
 
-.. literalinclude:: query_builder/055.php
+.. literalinclude:: query_builder/056.php
 
 **$builder->orHavingNotIn()**
 
 Generates a **HAVING field NOT IN ('item', 'item')** SQL query joined with **OR**
 if appropriate
 
-.. literalinclude:: query_builder/056.php
+.. literalinclude:: query_builder/057.php
 
 You can use subqueries instead of an array of values:
 
-.. literalinclude:: query_builder/057.php
+.. literalinclude:: query_builder/058.php
 
 **$builder->havingLike()**
 
@@ -470,43 +470,43 @@ searches.
 
 #. **Simple key/value method:**
 
-    .. literalinclude:: query_builder/058.php
+    .. literalinclude:: query_builder/059.php
 
     If you use multiple method calls they will be chained together with
     **AND** between them:
 
-    .. literalinclude:: query_builder/059.php
+    .. literalinclude:: query_builder/060.php
 
     If you want to control where the wildcard (**%**) is placed, you can use
     an optional third argument. Your options are ``before``, ``after`` and
     ``both`` (which is the default).
 
-    .. literalinclude:: query_builder/060.php
+    .. literalinclude:: query_builder/061.php
 
 #. **Associative array method:**
 
-       .. literalinclude:: query_builder/061.php
+       .. literalinclude:: query_builder/062.php
 
 **$builder->orHavingLike()**
 
 This method is identical to the one above, except that multiple
 instances are joined by **OR**:
 
-.. literalinclude:: query_builder/062.php
+.. literalinclude:: query_builder/063.php
 
 **$builder->notHavingLike()**
 
 This method is identical to ``havingLike()``, except that it generates
 **NOT LIKE** statements:
 
-.. literalinclude:: query_builder/063.php
+.. literalinclude:: query_builder/064.php
 
 **$builder->orNotHavingLike()**
 
 This method is identical to ``notHavingLike()``, except that multiple
 instances are joined by **OR**:
 
-.. literalinclude:: query_builder/064.php
+.. literalinclude:: query_builder/065.php
 
 ****************
 Ordering Results
@@ -521,20 +521,20 @@ The first parameter contains the name of the column you would like to order by.
 The second parameter lets you set the direction of the result.
 Options are ``ASC``, ``DESC`` AND ``RANDOM``.
 
-.. literalinclude:: query_builder/065.php
+.. literalinclude:: query_builder/066.php
 
 You can also pass your own string in the first parameter:
 
-.. literalinclude:: query_builder/066.php
+.. literalinclude:: query_builder/067.php
 
 Or multiple method calls can be made if you need multiple fields.
 
-.. literalinclude:: query_builder/067.php
+.. literalinclude:: query_builder/068.php
 
 If you choose the ``RANDOM`` direction option, then the first parameters will
 be ignored, unless you specify a numeric seed value.
 
-.. literalinclude:: query_builder/068.php
+.. literalinclude:: query_builder/069.php
 
 ****************************
 Limiting or Counting Results
@@ -544,11 +544,11 @@ Limiting or Counting Results
 
 Lets you limit the number of rows you would like returned by the query:
 
-.. literalinclude:: query_builder/069.php
+.. literalinclude:: query_builder/070.php
 
 The second parameter lets you set a result offset.
 
-.. literalinclude:: query_builder/070.php
+.. literalinclude:: query_builder/071.php
 
 **$builder->countAllResults()**
 
@@ -556,20 +556,20 @@ Permits you to determine the number of rows in a particular Query
 Builder query. Queries will accept Query Builder restrictors such as
 ``where()``, ``orWhere()``, ``like()``, ``orLike()``, etc. Example:
 
-.. literalinclude:: query_builder/071.php
+.. literalinclude:: query_builder/072.php
 
 However, this method also resets any field values that you may have passed
 to ``select()``. If you need to keep them, you can pass ``false`` as the
 first parameter.
 
-.. literalinclude:: query_builder/072.php
+.. literalinclude:: query_builder/073.php
 
 **$builder->countAll()**
 
 Permits you to determine the number of rows in a particular table.
 Example:
 
-.. literalinclude:: query_builder/073.php
+.. literalinclude:: query_builder/074.php
 
 As is in ``countAllResult()`` method, this method resets any field values that you may have passed
 to ``select()`` as well. If you need to keep them, you can pass ``false`` as the
@@ -582,7 +582,7 @@ Query grouping
 Query grouping allows you to create groups of **WHERE** clauses by enclosing them in parentheses. This will allow
 you to create queries with complex **WHERE** clauses. Nested groups are supported. Example:
 
-.. literalinclude:: query_builder/074.php
+.. literalinclude:: query_builder/075.php
 
 .. note:: Groups need to be balanced, make sure every ``groupStart()`` is matched by a ``groupEnd()``.
 
@@ -636,13 +636,13 @@ Generates an insert string based on the data you supply, and runs the
 query. You can either pass an **array** or an **object** to the
 method. Here is an example using an array:
 
-.. literalinclude:: query_builder/075.php
+.. literalinclude:: query_builder/076.php
 
 The first parameter is an associative array of values.
 
 Here is an example using an object:
 
-.. literalinclude:: query_builder/076.php
+.. literalinclude:: query_builder/077.php
 
 The first parameter is an object.
 
@@ -654,7 +654,7 @@ Generates an insert ignore string based on the data you supply, and runs the
 query. So if an entry with the same primary key already exists, the query won't be inserted.
 You can optionally pass an **boolean** to the method. Here is an example using the array of the above example:
 
-.. literalinclude:: query_builder/077.php
+.. literalinclude:: query_builder/078.php
 
 **$builder->getCompiledInsert()**
 
@@ -663,12 +663,12 @@ Compiles the insertion query just like ``$builder->insert()`` but does not
 
 Example:
 
-.. literalinclude:: query_builder/078.php
+.. literalinclude:: query_builder/079.php
 
 The first parameter enables you to set whether or not the query builder query
 will be reset (by default it will be--just like ``$builder->insert()``):
 
-.. literalinclude:: query_builder/079.php
+.. literalinclude:: query_builder/080.php
 
 The reason the second query worked is that the query has not been executed
 using ``$builder->insert()`` which resets values or reset directly using
@@ -682,7 +682,7 @@ Generates an insert string based on the data you supply, and runs the
 query. You can either pass an **array** or an **object** to the
 method. Here is an example using an array:
 
-.. literalinclude:: query_builder/080.php
+.. literalinclude:: query_builder/081.php
 
 The first parameter is an associative array of values.
 
@@ -703,7 +703,7 @@ logics with different combinations of  ``select()``, ``update()``,
 
 Example:
 
-.. literalinclude:: query_builder/081.php
+.. literalinclude:: query_builder/082.php
 
 In the above example, if we assume that the ``title`` field is our primary
 key, then if a row containing ``My title`` as the ``title`` value, that row
@@ -719,27 +719,27 @@ This method enables you to set values for inserts or updates.
 **It can be used instead of passing a data array directly to the insert()
 or update() methods:**
 
-.. literalinclude:: query_builder/082.php
+.. literalinclude:: query_builder/083.php
 
 If you use multiple method called they will be assembled properly
 based on whether you are doing an insert or an update:
 
-.. literalinclude:: query_builder/083.php
+.. literalinclude:: query_builder/084.php
 
 ``set()`` will also accept an optional third parameter (``$escape``), that
 will prevent data from being escaped if set to ``false``. To illustrate the
 difference, here is ``set()`` used both with and without the escape
 parameter.
 
-.. literalinclude:: query_builder/084.php
+.. literalinclude:: query_builder/085.php
 
 You can also pass an associative array to this method:
 
-.. literalinclude:: query_builder/085.php
+.. literalinclude:: query_builder/086.php
 
 Or an object:
 
-.. literalinclude:: query_builder/086.php
+.. literalinclude:: query_builder/087.php
 
 **$builder->update()**
 
@@ -747,11 +747,11 @@ Generates an update string and runs the query based on the data you
 supply. You can pass an **array** or an **object** to the method. Here
 is an example using an array:
 
-.. literalinclude:: query_builder/087.php
+.. literalinclude:: query_builder/088.php
 
 Or you can supply an object:
 
-.. literalinclude:: query_builder/088.php
+.. literalinclude:: query_builder/089.php
 
 .. note:: All values are escaped automatically producing safer queries.
 
@@ -759,11 +759,11 @@ You'll notice the use of the ``$builder->where()`` method, enabling you
 to set the **WHERE** clause. You can optionally pass this information
 directly into the ``update()`` method as a string:
 
-.. literalinclude:: query_builder/089.php
+.. literalinclude:: query_builder/090.php
 
 Or as an array:
 
-.. literalinclude:: query_builder/090.php
+.. literalinclude:: query_builder/091.php
 
 You may also use the ``$builder->set()`` method described above when
 performing updates.
@@ -774,7 +774,7 @@ Generates an update string based on the data you supply, and runs the query.
 You can either pass an **array** or an **object** to the method.
 Here is an example using an array:
 
-.. literalinclude:: query_builder/091.php
+.. literalinclude:: query_builder/092.php
 
 The first parameter is an associative array of values, the second parameter is the where key.
 
@@ -801,13 +801,13 @@ Deleting Data
 
 Generates a **DELETE** SQL string and runs the query.
 
-.. literalinclude:: query_builder/092.php
+.. literalinclude:: query_builder/093.php
 
 The first parameter is the where clause.
 You can also use the ``where()`` or ``or_where()`` methods instead of passing
 the data to the first parameter of the method:
 
-.. literalinclude:: query_builder/093.php
+.. literalinclude:: query_builder/094.php
 
 If you want to delete all data from a table, you can use the ``truncate()``
 method, or ``emptyTable()``.
@@ -817,13 +817,13 @@ method, or ``emptyTable()``.
 Generates a **DELETE** SQL string and runs the
 query:
 
-.. literalinclude:: query_builder/094.php
+.. literalinclude:: query_builder/095.php
 
 **$builder->truncate()**
 
 Generates a **TRUNCATE** SQL string and runs the query.
 
-.. literalinclude:: query_builder/095.php
+.. literalinclude:: query_builder/096.php
 
 .. note:: If the TRUNCATE command isn't available, ``truncate()`` will
     execute as "DELETE FROM table".
@@ -842,7 +842,7 @@ Method Chaining
 Method chaining allows you to simplify your syntax by connecting
 multiple methods. Consider this example:
 
-.. literalinclude:: query_builder/096.php
+.. literalinclude:: query_builder/097.php
 
 .. _ar-caching:
 
@@ -859,7 +859,7 @@ This is useful in situations where you are using Query Builder to generate SQL
 (e.g., ``$builder->getCompiledSelect()``) but then choose to, for instance,
 run the query:
 
-.. literalinclude:: query_builder/097.php
+.. literalinclude:: query_builder/098.php
 
 ***************
 Class Reference
diff --git a/user_guide_src/source/database/query_builder/015.php b/user_guide_src/source/database/query_builder/015.php
index 727a7e5bd3e8..b3890e978005 100644
--- a/user_guide_src/source/database/query_builder/015.php
+++ b/user_guide_src/source/database/query_builder/015.php
@@ -1,7 +1,6 @@
 <?php
 
-$builder = $db->table('users');
-$builder->select('title, content, date');
-$builder->from('mytable');
-$query = $builder->get();
-// Produces: SELECT title, content, date FROM users, mytable
+$subquery = $db->table('countries')->select('name')->where('id', 1);
+$builder  = $db->table('users')->select('name')->selectSubquery($subquery, 'country');
+$query    = $builder->get();
+// Produces: SELECT `name`, (SELECT `name` FROM `countries` WHERE `id` = 1) AS `country` FROM `users`
diff --git a/user_guide_src/source/database/query_builder/016.php b/user_guide_src/source/database/query_builder/016.php
index 1ad1c917ff57..727a7e5bd3e8 100644
--- a/user_guide_src/source/database/query_builder/016.php
+++ b/user_guide_src/source/database/query_builder/016.php
@@ -1,6 +1,7 @@
 <?php
 
-$subquery = $db->table('users');
-$builder  = $db->table('jobs')->fromSubquery($subquery, 'alias');
-$query    = $builder->get();
-// Produces: SELECT * FROM `jobs`, (SELECT * FROM `users`) AS `alias`
+$builder = $db->table('users');
+$builder->select('title, content, date');
+$builder->from('mytable');
+$query = $builder->get();
+// Produces: SELECT title, content, date FROM users, mytable
diff --git a/user_guide_src/source/database/query_builder/017.php b/user_guide_src/source/database/query_builder/017.php
index b33dd475b6f8..1ad1c917ff57 100644
--- a/user_guide_src/source/database/query_builder/017.php
+++ b/user_guide_src/source/database/query_builder/017.php
@@ -1,6 +1,6 @@
 <?php
 
-$subquery = $db->table('users')->select('id, name');
-$builder  = $db->newQuery()->fromSubquery($subquery, 't');
+$subquery = $db->table('users');
+$builder  = $db->table('jobs')->fromSubquery($subquery, 'alias');
 $query    = $builder->get();
-// Produces: SELECT * FROM (SELECT `id`, `name` FROM users) AS `t`
+// Produces: SELECT * FROM `jobs`, (SELECT * FROM `users`) AS `alias`
diff --git a/user_guide_src/source/database/query_builder/018.php b/user_guide_src/source/database/query_builder/018.php
index 159f88e4a984..b33dd475b6f8 100644
--- a/user_guide_src/source/database/query_builder/018.php
+++ b/user_guide_src/source/database/query_builder/018.php
@@ -1,10 +1,6 @@
 <?php
 
-$builder = $db->table('blogs');
-$builder->select('*');
-$builder->join('comments', 'comments.id = blogs.id');
-$query = $builder->get();
-/*
- * Produces:
- * SELECT * FROM blogs JOIN comments ON comments.id = blogs.id
- */
+$subquery = $db->table('users')->select('id, name');
+$builder  = $db->newQuery()->fromSubquery($subquery, 't');
+$query    = $builder->get();
+// Produces: SELECT * FROM (SELECT `id`, `name` FROM users) AS `t`
diff --git a/user_guide_src/source/database/query_builder/019.php b/user_guide_src/source/database/query_builder/019.php
index 428451dfb822..159f88e4a984 100644
--- a/user_guide_src/source/database/query_builder/019.php
+++ b/user_guide_src/source/database/query_builder/019.php
@@ -1,4 +1,10 @@
 <?php
 
-$builder->join('comments', 'comments.id = blogs.id', 'left');
-// Produces: LEFT JOIN comments ON comments.id = blogs.id
+$builder = $db->table('blogs');
+$builder->select('*');
+$builder->join('comments', 'comments.id = blogs.id');
+$query = $builder->get();
+/*
+ * Produces:
+ * SELECT * FROM blogs JOIN comments ON comments.id = blogs.id
+ */
diff --git a/user_guide_src/source/database/query_builder/020.php b/user_guide_src/source/database/query_builder/020.php
index cf0ce1b24ff2..428451dfb822 100644
--- a/user_guide_src/source/database/query_builder/020.php
+++ b/user_guide_src/source/database/query_builder/020.php
@@ -1,4 +1,4 @@
 <?php
 
-$builder->where('name', $name);
-// Produces: WHERE name = 'Joe'
+$builder->join('comments', 'comments.id = blogs.id', 'left');
+// Produces: LEFT JOIN comments ON comments.id = blogs.id
diff --git a/user_guide_src/source/database/query_builder/021.php b/user_guide_src/source/database/query_builder/021.php
index 08d3c63f40d5..cf0ce1b24ff2 100644
--- a/user_guide_src/source/database/query_builder/021.php
+++ b/user_guide_src/source/database/query_builder/021.php
@@ -1,6 +1,4 @@
 <?php
 
 $builder->where('name', $name);
-$builder->where('title', $title);
-$builder->where('status', $status);
-// WHERE name = 'Joe' AND title = 'boss' AND status = 'active'
+// Produces: WHERE name = 'Joe'
diff --git a/user_guide_src/source/database/query_builder/022.php b/user_guide_src/source/database/query_builder/022.php
index e6950008ff68..08d3c63f40d5 100644
--- a/user_guide_src/source/database/query_builder/022.php
+++ b/user_guide_src/source/database/query_builder/022.php
@@ -1,5 +1,6 @@
 <?php
 
-$builder->where('name !=', $name);
-$builder->where('id <', $id);
-// Produces: WHERE name != 'Joe' AND id < 45
+$builder->where('name', $name);
+$builder->where('title', $title);
+$builder->where('status', $status);
+// WHERE name = 'Joe' AND title = 'boss' AND status = 'active'
diff --git a/user_guide_src/source/database/query_builder/023.php b/user_guide_src/source/database/query_builder/023.php
index 36fdf370be96..e6950008ff68 100644
--- a/user_guide_src/source/database/query_builder/023.php
+++ b/user_guide_src/source/database/query_builder/023.php
@@ -1,5 +1,5 @@
 <?php
 
-$array = ['name' => $name, 'title' => $title, 'status' => $status];
-$builder->where($array);
-// Produces: WHERE name = 'Joe' AND title = 'boss' AND status = 'active'
+$builder->where('name !=', $name);
+$builder->where('id <', $id);
+// Produces: WHERE name != 'Joe' AND id < 45
diff --git a/user_guide_src/source/database/query_builder/024.php b/user_guide_src/source/database/query_builder/024.php
index d136a85683a9..36fdf370be96 100644
--- a/user_guide_src/source/database/query_builder/024.php
+++ b/user_guide_src/source/database/query_builder/024.php
@@ -1,4 +1,5 @@
 <?php
 
-$array = ['name !=' => $name, 'id <' => $id, 'date >' => $date];
+$array = ['name' => $name, 'title' => $title, 'status' => $status];
 $builder->where($array);
+// Produces: WHERE name = 'Joe' AND title = 'boss' AND status = 'active'
diff --git a/user_guide_src/source/database/query_builder/025.php b/user_guide_src/source/database/query_builder/025.php
index 10175cc40a71..d136a85683a9 100644
--- a/user_guide_src/source/database/query_builder/025.php
+++ b/user_guide_src/source/database/query_builder/025.php
@@ -1,4 +1,4 @@
 <?php
 
-$where = "name='Joe' AND status='boss' OR status='active'";
-$builder->where($where);
+$array = ['name !=' => $name, 'id <' => $id, 'date >' => $date];
+$builder->where($array);
diff --git a/user_guide_src/source/database/query_builder/026.php b/user_guide_src/source/database/query_builder/026.php
index ed45b84bf363..10175cc40a71 100644
--- a/user_guide_src/source/database/query_builder/026.php
+++ b/user_guide_src/source/database/query_builder/026.php
@@ -1,5 +1,4 @@
 <?php
 
-$name  = $builder->db->escape('Joe');
-$where = "name={$name} AND status='boss' OR status='active'";
+$where = "name='Joe' AND status='boss' OR status='active'";
 $builder->where($where);
diff --git a/user_guide_src/source/database/query_builder/027.php b/user_guide_src/source/database/query_builder/027.php
index 019386718cd1..ed45b84bf363 100644
--- a/user_guide_src/source/database/query_builder/027.php
+++ b/user_guide_src/source/database/query_builder/027.php
@@ -1,9 +1,5 @@
 <?php
 
-// With closure
-$builder->where('advance_amount <', static fn (BaseBuilder $builder) => $builder->select('MAX(advance_amount)', false)->from('orders')->where('id >', 2));
-// Produces: WHERE "advance_amount" < (SELECT MAX(advance_amount) FROM "orders" WHERE "id" > 2)
-
-// With builder directly
-$subQuery = $db->table('orders')->select('MAX(advance_amount)', false)->where('id >', 2);
-$builder->where('advance_amount <', $subQuery);
+$name  = $builder->db->escape('Joe');
+$where = "name={$name} AND status='boss' OR status='active'";
+$builder->where($where);
diff --git a/user_guide_src/source/database/query_builder/028.php b/user_guide_src/source/database/query_builder/028.php
index d925a347e428..019386718cd1 100644
--- a/user_guide_src/source/database/query_builder/028.php
+++ b/user_guide_src/source/database/query_builder/028.php
@@ -1,5 +1,9 @@
 <?php
 
-$builder->where('name !=', $name);
-$builder->orWhere('id >', $id);
-// Produces: WHERE name != 'Joe' OR id > 50
+// With closure
+$builder->where('advance_amount <', static fn (BaseBuilder $builder) => $builder->select('MAX(advance_amount)', false)->from('orders')->where('id >', 2));
+// Produces: WHERE "advance_amount" < (SELECT MAX(advance_amount) FROM "orders" WHERE "id" > 2)
+
+// With builder directly
+$subQuery = $db->table('orders')->select('MAX(advance_amount)', false)->where('id >', 2);
+$builder->where('advance_amount <', $subQuery);
diff --git a/user_guide_src/source/database/query_builder/029.php b/user_guide_src/source/database/query_builder/029.php
index 6683a842eb99..d925a347e428 100644
--- a/user_guide_src/source/database/query_builder/029.php
+++ b/user_guide_src/source/database/query_builder/029.php
@@ -1,5 +1,5 @@
 <?php
 
-$names = ['Frank', 'Todd', 'James'];
-$builder->whereIn('username', $names);
-// Produces: WHERE username IN ('Frank', 'Todd', 'James')
+$builder->where('name !=', $name);
+$builder->orWhere('id >', $id);
+// Produces: WHERE name != 'Joe' OR id > 50
diff --git a/user_guide_src/source/database/query_builder/030.php b/user_guide_src/source/database/query_builder/030.php
index 5aa7619c0dc8..6683a842eb99 100644
--- a/user_guide_src/source/database/query_builder/030.php
+++ b/user_guide_src/source/database/query_builder/030.php
@@ -1,9 +1,5 @@
 <?php
 
-// With closure
-$builder->whereIn('id', static fn (BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
-// Produces: WHERE "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
-
-// With builder directly
-$subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
-$builder->whereIn('id', $subQuery);
+$names = ['Frank', 'Todd', 'James'];
+$builder->whereIn('username', $names);
+// Produces: WHERE username IN ('Frank', 'Todd', 'James')
diff --git a/user_guide_src/source/database/query_builder/031.php b/user_guide_src/source/database/query_builder/031.php
index b1fea4626937..5aa7619c0dc8 100644
--- a/user_guide_src/source/database/query_builder/031.php
+++ b/user_guide_src/source/database/query_builder/031.php
@@ -1,5 +1,9 @@
 <?php
 
-$names = ['Frank', 'Todd', 'James'];
-$builder->orWhereIn('username', $names);
-// Produces: OR username IN ('Frank', 'Todd', 'James')
+// With closure
+$builder->whereIn('id', static fn (BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
+// Produces: WHERE "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
+
+// With builder directly
+$subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
+$builder->whereIn('id', $subQuery);
diff --git a/user_guide_src/source/database/query_builder/032.php b/user_guide_src/source/database/query_builder/032.php
index ae8ddb7ce7a4..b1fea4626937 100644
--- a/user_guide_src/source/database/query_builder/032.php
+++ b/user_guide_src/source/database/query_builder/032.php
@@ -1,9 +1,5 @@
 <?php
 
-// With closure
-$builder->orWhereIn('id', static fn (BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
-// Produces: OR "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
-
-// With builder directly
-$subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
-$builder->orWhereIn('id', $subQuery);
+$names = ['Frank', 'Todd', 'James'];
+$builder->orWhereIn('username', $names);
+// Produces: OR username IN ('Frank', 'Todd', 'James')
diff --git a/user_guide_src/source/database/query_builder/033.php b/user_guide_src/source/database/query_builder/033.php
index 46b196764e71..ae8ddb7ce7a4 100644
--- a/user_guide_src/source/database/query_builder/033.php
+++ b/user_guide_src/source/database/query_builder/033.php
@@ -1,5 +1,9 @@
 <?php
 
-$names = ['Frank', 'Todd', 'James'];
-$builder->whereNotIn('username', $names);
-// Produces: WHERE username NOT IN ('Frank', 'Todd', 'James')
+// With closure
+$builder->orWhereIn('id', static fn (BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
+// Produces: OR "id" IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
+
+// With builder directly
+$subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
+$builder->orWhereIn('id', $subQuery);
diff --git a/user_guide_src/source/database/query_builder/034.php b/user_guide_src/source/database/query_builder/034.php
index 02904a3962f3..46b196764e71 100644
--- a/user_guide_src/source/database/query_builder/034.php
+++ b/user_guide_src/source/database/query_builder/034.php
@@ -1,9 +1,5 @@
 <?php
 
-// With closure
-$builder->whereNotIn('id', static fn (BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
-// Produces: WHERE "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
-
-// With builder directly
-$subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
-$builder->whereNotIn('id', $subQuery);
+$names = ['Frank', 'Todd', 'James'];
+$builder->whereNotIn('username', $names);
+// Produces: WHERE username NOT IN ('Frank', 'Todd', 'James')
diff --git a/user_guide_src/source/database/query_builder/035.php b/user_guide_src/source/database/query_builder/035.php
index d37209c5efd8..02904a3962f3 100644
--- a/user_guide_src/source/database/query_builder/035.php
+++ b/user_guide_src/source/database/query_builder/035.php
@@ -1,5 +1,9 @@
 <?php
 
-$names = ['Frank', 'Todd', 'James'];
-$builder->orWhereNotIn('username', $names);
-// Produces: OR username NOT IN ('Frank', 'Todd', 'James')
+// With closure
+$builder->whereNotIn('id', static fn (BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
+// Produces: WHERE "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
+
+// With builder directly
+$subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
+$builder->whereNotIn('id', $subQuery);
diff --git a/user_guide_src/source/database/query_builder/036.php b/user_guide_src/source/database/query_builder/036.php
index f5668aa1a30d..d37209c5efd8 100644
--- a/user_guide_src/source/database/query_builder/036.php
+++ b/user_guide_src/source/database/query_builder/036.php
@@ -1,9 +1,5 @@
 <?php
 
-// With closure
-$builder->orWhereNotIn('id', static fn (BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
-// Produces: OR "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
-
-// With builder directly
-$subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
-$builder->orWhereNotIn('id', $subQuery);
+$names = ['Frank', 'Todd', 'James'];
+$builder->orWhereNotIn('username', $names);
+// Produces: OR username NOT IN ('Frank', 'Todd', 'James')
diff --git a/user_guide_src/source/database/query_builder/037.php b/user_guide_src/source/database/query_builder/037.php
index d5218d2f8f59..f5668aa1a30d 100644
--- a/user_guide_src/source/database/query_builder/037.php
+++ b/user_guide_src/source/database/query_builder/037.php
@@ -1,4 +1,9 @@
 <?php
 
-$builder->like('title', 'match');
-// Produces: WHERE `title` LIKE '%match%' ESCAPE '!'
+// With closure
+$builder->orWhereNotIn('id', static fn (BaseBuilder $builder) => $builder->select('job_id')->from('users_jobs')->where('user_id', 3));
+// Produces: OR "id" NOT IN (SELECT "job_id" FROM "users_jobs" WHERE "user_id" = 3)
+
+// With builder directly
+$subQuery = $db->table('users_jobs')->select('job_id')->where('user_id', 3);
+$builder->orWhereNotIn('id', $subQuery);
diff --git a/user_guide_src/source/database/query_builder/038.php b/user_guide_src/source/database/query_builder/038.php
index a8ae3efa1d27..d5218d2f8f59 100644
--- a/user_guide_src/source/database/query_builder/038.php
+++ b/user_guide_src/source/database/query_builder/038.php
@@ -1,5 +1,4 @@
 <?php
 
 $builder->like('title', 'match');
-$builder->like('body', 'match');
-// WHERE `title` LIKE '%match%' ESCAPE '!' AND  `body` LIKE '%match%' ESCAPE '!'
+// Produces: WHERE `title` LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/039.php b/user_guide_src/source/database/query_builder/039.php
index 519686f9e4d9..a8ae3efa1d27 100644
--- a/user_guide_src/source/database/query_builder/039.php
+++ b/user_guide_src/source/database/query_builder/039.php
@@ -1,5 +1,5 @@
 <?php
 
-$builder->like('title', 'match', 'before'); // Produces: WHERE `title` LIKE '%match' ESCAPE '!'
-$builder->like('title', 'match', 'after');  // Produces: WHERE `title` LIKE 'match%' ESCAPE '!'
-$builder->like('title', 'match', 'both');   // Produces: WHERE `title` LIKE '%match%' ESCAPE '!'
+$builder->like('title', 'match');
+$builder->like('body', 'match');
+// WHERE `title` LIKE '%match%' ESCAPE '!' AND  `body` LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/040.php b/user_guide_src/source/database/query_builder/040.php
index 0583a2a79187..519686f9e4d9 100644
--- a/user_guide_src/source/database/query_builder/040.php
+++ b/user_guide_src/source/database/query_builder/040.php
@@ -1,5 +1,5 @@
 <?php
 
-$array = ['title' => $match, 'page1' => $match, 'page2' => $match];
-$builder->like($array);
-// WHERE `title` LIKE '%match%' ESCAPE '!' AND  `page1` LIKE '%match%' ESCAPE '!' AND  `page2` LIKE '%match%' ESCAPE '!'
+$builder->like('title', 'match', 'before'); // Produces: WHERE `title` LIKE '%match' ESCAPE '!'
+$builder->like('title', 'match', 'after');  // Produces: WHERE `title` LIKE 'match%' ESCAPE '!'
+$builder->like('title', 'match', 'both');   // Produces: WHERE `title` LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/041.php b/user_guide_src/source/database/query_builder/041.php
index 7c9935e4f356..0583a2a79187 100644
--- a/user_guide_src/source/database/query_builder/041.php
+++ b/user_guide_src/source/database/query_builder/041.php
@@ -1,4 +1,5 @@
 <?php
 
-$builder->like('title', 'match'); $builder->orLike('body', $match);
-// WHERE `title` LIKE '%match%' ESCAPE '!' OR  `body` LIKE '%match%' ESCAPE '!'
+$array = ['title' => $match, 'page1' => $match, 'page2' => $match];
+$builder->like($array);
+// WHERE `title` LIKE '%match%' ESCAPE '!' AND  `page1` LIKE '%match%' ESCAPE '!' AND  `page2` LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/042.php b/user_guide_src/source/database/query_builder/042.php
index 983068b45fef..7c9935e4f356 100644
--- a/user_guide_src/source/database/query_builder/042.php
+++ b/user_guide_src/source/database/query_builder/042.php
@@ -1,3 +1,4 @@
 <?php
 
-$builder->notLike('title', 'match'); // WHERE `title` NOT LIKE '%match% ESCAPE '!'
+$builder->like('title', 'match'); $builder->orLike('body', $match);
+// WHERE `title` LIKE '%match%' ESCAPE '!' OR  `body` LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/043.php b/user_guide_src/source/database/query_builder/043.php
index f0f442dfeb78..983068b45fef 100644
--- a/user_guide_src/source/database/query_builder/043.php
+++ b/user_guide_src/source/database/query_builder/043.php
@@ -1,5 +1,3 @@
 <?php
 
-$builder->like('title', 'match');
-$builder->orNotLike('body', 'match');
-// WHERE `title` LIKE '%match% OR  `body` NOT LIKE '%match%' ESCAPE '!'
+$builder->notLike('title', 'match'); // WHERE `title` NOT LIKE '%match% ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/044.php b/user_guide_src/source/database/query_builder/044.php
index ffe4786baaae..f0f442dfeb78 100644
--- a/user_guide_src/source/database/query_builder/044.php
+++ b/user_guide_src/source/database/query_builder/044.php
@@ -1,4 +1,5 @@
 <?php
 
-$builder->groupBy('title');
-// Produces: GROUP BY title
+$builder->like('title', 'match');
+$builder->orNotLike('body', 'match');
+// WHERE `title` LIKE '%match% OR  `body` NOT LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/045.php b/user_guide_src/source/database/query_builder/045.php
index 0872996afe9f..ffe4786baaae 100644
--- a/user_guide_src/source/database/query_builder/045.php
+++ b/user_guide_src/source/database/query_builder/045.php
@@ -1,4 +1,4 @@
 <?php
 
-$builder->groupBy(['title', 'date']);
-// Produces: GROUP BY title, date
+$builder->groupBy('title');
+// Produces: GROUP BY title
diff --git a/user_guide_src/source/database/query_builder/046.php b/user_guide_src/source/database/query_builder/046.php
index 0e6f6415d6f7..0872996afe9f 100644
--- a/user_guide_src/source/database/query_builder/046.php
+++ b/user_guide_src/source/database/query_builder/046.php
@@ -1,5 +1,4 @@
 <?php
 
-$builder->distinct();
-$builder->get();
-// Produces: SELECT DISTINCT * FROM mytable
+$builder->groupBy(['title', 'date']);
+// Produces: GROUP BY title, date
diff --git a/user_guide_src/source/database/query_builder/047.php b/user_guide_src/source/database/query_builder/047.php
index 87f435064238..0e6f6415d6f7 100644
--- a/user_guide_src/source/database/query_builder/047.php
+++ b/user_guide_src/source/database/query_builder/047.php
@@ -1,4 +1,5 @@
 <?php
 
-$builder->having('user_id = 45'); // Produces: HAVING user_id = 45
-$builder->having('user_id', 45); // Produces: HAVING user_id = 45
+$builder->distinct();
+$builder->get();
+// Produces: SELECT DISTINCT * FROM mytable
diff --git a/user_guide_src/source/database/query_builder/048.php b/user_guide_src/source/database/query_builder/048.php
index e911e5e87302..87f435064238 100644
--- a/user_guide_src/source/database/query_builder/048.php
+++ b/user_guide_src/source/database/query_builder/048.php
@@ -1,4 +1,4 @@
 <?php
 
-$builder->having(['title =' => 'My Title', 'id <' => $id]);
-// Produces: HAVING title = 'My Title', id < 45
+$builder->having('user_id = 45'); // Produces: HAVING user_id = 45
+$builder->having('user_id', 45); // Produces: HAVING user_id = 45
diff --git a/user_guide_src/source/database/query_builder/049.php b/user_guide_src/source/database/query_builder/049.php
index b044b821f388..e911e5e87302 100644
--- a/user_guide_src/source/database/query_builder/049.php
+++ b/user_guide_src/source/database/query_builder/049.php
@@ -1,4 +1,4 @@
 <?php
 
-$builder->having('user_id', 45); // Produces: HAVING `user_id` = 45 in some databases such as MySQL
-$builder->having('user_id', 45, false); // Produces: HAVING user_id = 45
+$builder->having(['title =' => 'My Title', 'id <' => $id]);
+// Produces: HAVING title = 'My Title', id < 45
diff --git a/user_guide_src/source/database/query_builder/050.php b/user_guide_src/source/database/query_builder/050.php
index bc6f5a3e1412..b044b821f388 100644
--- a/user_guide_src/source/database/query_builder/050.php
+++ b/user_guide_src/source/database/query_builder/050.php
@@ -1,5 +1,4 @@
 <?php
 
-$groups = [1, 2, 3];
-$builder->havingIn('group_id', $groups);
-// Produces: HAVING group_id IN (1, 2, 3)
+$builder->having('user_id', 45); // Produces: HAVING `user_id` = 45 in some databases such as MySQL
+$builder->having('user_id', 45, false); // Produces: HAVING user_id = 45
diff --git a/user_guide_src/source/database/query_builder/051.php b/user_guide_src/source/database/query_builder/051.php
index 1f5736243866..bc6f5a3e1412 100644
--- a/user_guide_src/source/database/query_builder/051.php
+++ b/user_guide_src/source/database/query_builder/051.php
@@ -1,9 +1,5 @@
 <?php
 
-// With closure
-$builder->havingIn('id', static fn (BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
-// Produces: HAVING "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
-
-// With builder directly
-$subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
-$builder->havingIn('id', $subQuery);
+$groups = [1, 2, 3];
+$builder->havingIn('group_id', $groups);
+// Produces: HAVING group_id IN (1, 2, 3)
diff --git a/user_guide_src/source/database/query_builder/052.php b/user_guide_src/source/database/query_builder/052.php
index aa07cad01be9..1f5736243866 100644
--- a/user_guide_src/source/database/query_builder/052.php
+++ b/user_guide_src/source/database/query_builder/052.php
@@ -1,5 +1,9 @@
 <?php
 
-$groups = [1, 2, 3];
-$builder->orHavingIn('group_id', $groups);
-// Produces: OR group_id IN (1, 2, 3)
+// With closure
+$builder->havingIn('id', static fn (BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
+// Produces: HAVING "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
+
+// With builder directly
+$subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
+$builder->havingIn('id', $subQuery);
diff --git a/user_guide_src/source/database/query_builder/053.php b/user_guide_src/source/database/query_builder/053.php
index 8a19ff4ac7d8..aa07cad01be9 100644
--- a/user_guide_src/source/database/query_builder/053.php
+++ b/user_guide_src/source/database/query_builder/053.php
@@ -1,9 +1,5 @@
 <?php
 
-// With closure
-$builder->orHavingIn('id', static fn (BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
-// Produces: OR "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
-
-// With builder directly
-$subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
-$builder->orHavingIn('id', $subQuery);
+$groups = [1, 2, 3];
+$builder->orHavingIn('group_id', $groups);
+// Produces: OR group_id IN (1, 2, 3)
diff --git a/user_guide_src/source/database/query_builder/054.php b/user_guide_src/source/database/query_builder/054.php
index 875a2afcbfe4..8a19ff4ac7d8 100644
--- a/user_guide_src/source/database/query_builder/054.php
+++ b/user_guide_src/source/database/query_builder/054.php
@@ -1,5 +1,9 @@
 <?php
 
-$groups = [1, 2, 3];
-$builder->havingNotIn('group_id', $groups);
-// Produces: HAVING group_id NOT IN (1, 2, 3)
+// With closure
+$builder->orHavingIn('id', static fn (BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
+// Produces: OR "id" IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
+
+// With builder directly
+$subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
+$builder->orHavingIn('id', $subQuery);
diff --git a/user_guide_src/source/database/query_builder/055.php b/user_guide_src/source/database/query_builder/055.php
index 67a54f87f7bc..875a2afcbfe4 100644
--- a/user_guide_src/source/database/query_builder/055.php
+++ b/user_guide_src/source/database/query_builder/055.php
@@ -1,9 +1,5 @@
 <?php
 
-// With closure
-$builder->havingNotIn('id', static fn (BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
-// Produces: HAVING "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
-
-// With builder directly
-$subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
-$builder->havingNotIn('id', $subQuery);
+$groups = [1, 2, 3];
+$builder->havingNotIn('group_id', $groups);
+// Produces: HAVING group_id NOT IN (1, 2, 3)
diff --git a/user_guide_src/source/database/query_builder/056.php b/user_guide_src/source/database/query_builder/056.php
index 6d5a27ad2b95..67a54f87f7bc 100644
--- a/user_guide_src/source/database/query_builder/056.php
+++ b/user_guide_src/source/database/query_builder/056.php
@@ -1,5 +1,9 @@
 <?php
 
-$groups = [1, 2, 3];
-$builder->havingNotIn('group_id', $groups);
-// Produces: OR group_id NOT IN (1, 2, 3)
+// With closure
+$builder->havingNotIn('id', static fn (BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
+// Produces: HAVING "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
+
+// With builder directly
+$subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
+$builder->havingNotIn('id', $subQuery);
diff --git a/user_guide_src/source/database/query_builder/057.php b/user_guide_src/source/database/query_builder/057.php
index 8a92da5725b2..6d5a27ad2b95 100644
--- a/user_guide_src/source/database/query_builder/057.php
+++ b/user_guide_src/source/database/query_builder/057.php
@@ -1,9 +1,5 @@
 <?php
 
-// With closure
-$builder->orHavingNotIn('id', static fn (BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
-// Produces: OR "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
-
-// With builder directly
-$subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
-$builder->orHavingNotIn('id', $subQuery);
+$groups = [1, 2, 3];
+$builder->havingNotIn('group_id', $groups);
+// Produces: OR group_id NOT IN (1, 2, 3)
diff --git a/user_guide_src/source/database/query_builder/058.php b/user_guide_src/source/database/query_builder/058.php
index e24f2ed0ef45..8a92da5725b2 100644
--- a/user_guide_src/source/database/query_builder/058.php
+++ b/user_guide_src/source/database/query_builder/058.php
@@ -1,4 +1,9 @@
 <?php
 
-$builder->havingLike('title', 'match');
-// Produces: HAVING `title` LIKE '%match%' ESCAPE '!'
+// With closure
+$builder->orHavingNotIn('id', static fn (BaseBuilder $builder) => $builder->select('user_id')->from('users_jobs')->where('group_id', 3));
+// Produces: OR "id" NOT IN (SELECT "user_id" FROM "users_jobs" WHERE "group_id" = 3)
+
+// With builder directly
+$subQuery = $db->table('users_jobs')->select('user_id')->where('group_id', 3);
+$builder->orHavingNotIn('id', $subQuery);
diff --git a/user_guide_src/source/database/query_builder/059.php b/user_guide_src/source/database/query_builder/059.php
index 9ef7f263e19f..e24f2ed0ef45 100644
--- a/user_guide_src/source/database/query_builder/059.php
+++ b/user_guide_src/source/database/query_builder/059.php
@@ -1,5 +1,4 @@
 <?php
 
 $builder->havingLike('title', 'match');
-$builder->havingLike('body', 'match');
-// HAVING `title` LIKE '%match%' ESCAPE '!' AND  `body` LIKE '%match% ESCAPE '!'
+// Produces: HAVING `title` LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/060.php b/user_guide_src/source/database/query_builder/060.php
index 3acc5d4f0fd4..9ef7f263e19f 100644
--- a/user_guide_src/source/database/query_builder/060.php
+++ b/user_guide_src/source/database/query_builder/060.php
@@ -1,5 +1,5 @@
 <?php
 
-$builder->havingLike('title', 'match', 'before'); // Produces: HAVING `title` LIKE '%match' ESCAPE '!'
-$builder->havingLike('title', 'match', 'after');  // Produces: HAVING `title` LIKE 'match%' ESCAPE '!'
-$builder->havingLike('title', 'match', 'both');   // Produces: HAVING `title` LIKE '%match%' ESCAPE '!'
+$builder->havingLike('title', 'match');
+$builder->havingLike('body', 'match');
+// HAVING `title` LIKE '%match%' ESCAPE '!' AND  `body` LIKE '%match% ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/061.php b/user_guide_src/source/database/query_builder/061.php
index ba1767f6706e..3acc5d4f0fd4 100644
--- a/user_guide_src/source/database/query_builder/061.php
+++ b/user_guide_src/source/database/query_builder/061.php
@@ -1,5 +1,5 @@
 <?php
 
-$array = ['title' => $match, 'page1' => $match, 'page2' => $match];
-$builder->havingLike($array);
-// HAVING `title` LIKE '%match%' ESCAPE '!' AND  `page1` LIKE '%match%' ESCAPE '!' AND  `page2` LIKE '%match%' ESCAPE '!'
+$builder->havingLike('title', 'match', 'before'); // Produces: HAVING `title` LIKE '%match' ESCAPE '!'
+$builder->havingLike('title', 'match', 'after');  // Produces: HAVING `title` LIKE 'match%' ESCAPE '!'
+$builder->havingLike('title', 'match', 'both');   // Produces: HAVING `title` LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/062.php b/user_guide_src/source/database/query_builder/062.php
index 0b7543273430..ba1767f6706e 100644
--- a/user_guide_src/source/database/query_builder/062.php
+++ b/user_guide_src/source/database/query_builder/062.php
@@ -1,4 +1,5 @@
 <?php
 
-$builder->havingLike('title', 'match'); $builder->orHavingLike('body', $match);
-// HAVING `title` LIKE '%match%' ESCAPE '!' OR  `body` LIKE '%match%' ESCAPE '!'
+$array = ['title' => $match, 'page1' => $match, 'page2' => $match];
+$builder->havingLike($array);
+// HAVING `title` LIKE '%match%' ESCAPE '!' AND  `page1` LIKE '%match%' ESCAPE '!' AND  `page2` LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/063.php b/user_guide_src/source/database/query_builder/063.php
index a5c028d78e2c..0b7543273430 100644
--- a/user_guide_src/source/database/query_builder/063.php
+++ b/user_guide_src/source/database/query_builder/063.php
@@ -1,4 +1,4 @@
 <?php
 
-$builder->notHavingLike('title', 'match');
-// HAVING `title` NOT LIKE '%match% ESCAPE '!'
+$builder->havingLike('title', 'match'); $builder->orHavingLike('body', $match);
+// HAVING `title` LIKE '%match%' ESCAPE '!' OR  `body` LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/064.php b/user_guide_src/source/database/query_builder/064.php
index 194a382baa13..a5c028d78e2c 100644
--- a/user_guide_src/source/database/query_builder/064.php
+++ b/user_guide_src/source/database/query_builder/064.php
@@ -1,5 +1,4 @@
 <?php
 
-$builder->havingLike('title', 'match');
-$builder->orNotHavingLike('body', 'match');
-// HAVING `title` LIKE '%match% OR  `body` NOT LIKE '%match%' ESCAPE '!'
+$builder->notHavingLike('title', 'match');
+// HAVING `title` NOT LIKE '%match% ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/065.php b/user_guide_src/source/database/query_builder/065.php
index f36b6af2b449..194a382baa13 100644
--- a/user_guide_src/source/database/query_builder/065.php
+++ b/user_guide_src/source/database/query_builder/065.php
@@ -1,4 +1,5 @@
 <?php
 
-$builder->orderBy('title', 'DESC');
-// Produces: ORDER BY `title` DESC
+$builder->havingLike('title', 'match');
+$builder->orNotHavingLike('body', 'match');
+// HAVING `title` LIKE '%match% OR  `body` NOT LIKE '%match%' ESCAPE '!'
diff --git a/user_guide_src/source/database/query_builder/066.php b/user_guide_src/source/database/query_builder/066.php
index 01ef14c9a1c3..f36b6af2b449 100644
--- a/user_guide_src/source/database/query_builder/066.php
+++ b/user_guide_src/source/database/query_builder/066.php
@@ -1,4 +1,4 @@
 <?php
 
-$builder->orderBy('title DESC, name ASC');
-// Produces: ORDER BY `title` DESC, `name` ASC
+$builder->orderBy('title', 'DESC');
+// Produces: ORDER BY `title` DESC
diff --git a/user_guide_src/source/database/query_builder/067.php b/user_guide_src/source/database/query_builder/067.php
index 6ba7dc157b59..01ef14c9a1c3 100644
--- a/user_guide_src/source/database/query_builder/067.php
+++ b/user_guide_src/source/database/query_builder/067.php
@@ -1,5 +1,4 @@
 <?php
 
-$builder->orderBy('title', 'DESC');
-$builder->orderBy('name', 'ASC');
+$builder->orderBy('title DESC, name ASC');
 // Produces: ORDER BY `title` DESC, `name` ASC
diff --git a/user_guide_src/source/database/query_builder/068.php b/user_guide_src/source/database/query_builder/068.php
index f038c3e67184..6ba7dc157b59 100644
--- a/user_guide_src/source/database/query_builder/068.php
+++ b/user_guide_src/source/database/query_builder/068.php
@@ -1,7 +1,5 @@
 <?php
 
-$builder->orderBy('title', 'RANDOM');
-// Produces: ORDER BY RAND()
-
-$builder->orderBy(42, 'RANDOM');
-// Produces: ORDER BY RAND(42)
+$builder->orderBy('title', 'DESC');
+$builder->orderBy('name', 'ASC');
+// Produces: ORDER BY `title` DESC, `name` ASC
diff --git a/user_guide_src/source/database/query_builder/069.php b/user_guide_src/source/database/query_builder/069.php
index dadbdc5dea19..f038c3e67184 100644
--- a/user_guide_src/source/database/query_builder/069.php
+++ b/user_guide_src/source/database/query_builder/069.php
@@ -1,4 +1,7 @@
 <?php
 
-$builder->limit(10);
-// Produces: LIMIT 10
+$builder->orderBy('title', 'RANDOM');
+// Produces: ORDER BY RAND()
+
+$builder->orderBy(42, 'RANDOM');
+// Produces: ORDER BY RAND(42)
diff --git a/user_guide_src/source/database/query_builder/070.php b/user_guide_src/source/database/query_builder/070.php
index 0bfcab7b1fcf..dadbdc5dea19 100644
--- a/user_guide_src/source/database/query_builder/070.php
+++ b/user_guide_src/source/database/query_builder/070.php
@@ -1,4 +1,4 @@
 <?php
 
-$builder->limit(10, 20);
-// Produces: LIMIT 20, 10 (in MySQL. Other databases have slightly different syntax)
+$builder->limit(10);
+// Produces: LIMIT 10
diff --git a/user_guide_src/source/database/query_builder/071.php b/user_guide_src/source/database/query_builder/071.php
index 4b1c33356b7e..0bfcab7b1fcf 100644
--- a/user_guide_src/source/database/query_builder/071.php
+++ b/user_guide_src/source/database/query_builder/071.php
@@ -1,6 +1,4 @@
 <?php
 
-echo $builder->countAllResults(); // Produces an integer, like 25
-$builder->like('title', 'match');
-$builder->from('my_table');
-echo $builder->countAllResults(); // Produces an integer, like 17
+$builder->limit(10, 20);
+// Produces: LIMIT 20, 10 (in MySQL. Other databases have slightly different syntax)
diff --git a/user_guide_src/source/database/query_builder/072.php b/user_guide_src/source/database/query_builder/072.php
index bb3a9c4d4b63..4b1c33356b7e 100644
--- a/user_guide_src/source/database/query_builder/072.php
+++ b/user_guide_src/source/database/query_builder/072.php
@@ -1,3 +1,6 @@
 <?php
 
-echo $builder->countAllResults(false); // Produces an integer, like 17
+echo $builder->countAllResults(); // Produces an integer, like 25
+$builder->like('title', 'match');
+$builder->from('my_table');
+echo $builder->countAllResults(); // Produces an integer, like 17
diff --git a/user_guide_src/source/database/query_builder/073.php b/user_guide_src/source/database/query_builder/073.php
index 11bc5421cb42..bb3a9c4d4b63 100644
--- a/user_guide_src/source/database/query_builder/073.php
+++ b/user_guide_src/source/database/query_builder/073.php
@@ -1,3 +1,3 @@
 <?php
 
-echo $builder->countAll(); // Produces an integer, like 25
+echo $builder->countAllResults(false); // Produces an integer, like 17
diff --git a/user_guide_src/source/database/query_builder/074.php b/user_guide_src/source/database/query_builder/074.php
index 3ea4d947f4a7..11bc5421cb42 100644
--- a/user_guide_src/source/database/query_builder/074.php
+++ b/user_guide_src/source/database/query_builder/074.php
@@ -1,16 +1,3 @@
 <?php
 
-$builder->select('*')->from('my_table')
-    ->groupStart()
-        ->where('a', 'a')
-        ->orGroupStart()
-            ->where('b', 'b')
-            ->where('c', 'c')
-        ->groupEnd()
-    ->groupEnd()
-    ->where('d', 'd')
-    ->get();
-/*
- * Generates:
- * SELECT * FROM (`my_table`) WHERE ( `a` = 'a' OR ( `b` = 'b' AND `c` = 'c' ) ) AND `d` = 'd'
- */
+echo $builder->countAll(); // Produces an integer, like 25
diff --git a/user_guide_src/source/database/query_builder/075.php b/user_guide_src/source/database/query_builder/075.php
index 2e87e8345dd0..3ea4d947f4a7 100644
--- a/user_guide_src/source/database/query_builder/075.php
+++ b/user_guide_src/source/database/query_builder/075.php
@@ -1,10 +1,16 @@
 <?php
 
-$data = [
-    'title' => 'My title',
-    'name'  => 'My Name',
-    'date'  => 'My date',
-];
-
-$builder->insert($data);
-// Produces: INSERT INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')
+$builder->select('*')->from('my_table')
+    ->groupStart()
+        ->where('a', 'a')
+        ->orGroupStart()
+            ->where('b', 'b')
+            ->where('c', 'c')
+        ->groupEnd()
+    ->groupEnd()
+    ->where('d', 'd')
+    ->get();
+/*
+ * Generates:
+ * SELECT * FROM (`my_table`) WHERE ( `a` = 'a' OR ( `b` = 'b' AND `c` = 'c' ) ) AND `d` = 'd'
+ */
diff --git a/user_guide_src/source/database/query_builder/076.php b/user_guide_src/source/database/query_builder/076.php
index ba38d99ff43b..2e87e8345dd0 100644
--- a/user_guide_src/source/database/query_builder/076.php
+++ b/user_guide_src/source/database/query_builder/076.php
@@ -1,12 +1,10 @@
 <?php
 
-class Myclass
-{
-    public $title   = 'My Title';
-    public $content = 'My Content';
-    public $date    = 'My Date';
-}
+$data = [
+    'title' => 'My title',
+    'name'  => 'My Name',
+    'date'  => 'My date',
+];
 
-$object = new Myclass();
-$builder->insert($object);
-// Produces: INSERT INTO mytable (title, content, date) VALUES ('My Title', 'My Content', 'My Date')
+$builder->insert($data);
+// Produces: INSERT INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')
diff --git a/user_guide_src/source/database/query_builder/077.php b/user_guide_src/source/database/query_builder/077.php
index bb07bc8bdd9c..ba38d99ff43b 100644
--- a/user_guide_src/source/database/query_builder/077.php
+++ b/user_guide_src/source/database/query_builder/077.php
@@ -1,10 +1,12 @@
 <?php
 
-$data = [
-    'title' => 'My title',
-    'name'  => 'My Name',
-    'date'  => 'My date',
-];
+class Myclass
+{
+    public $title   = 'My Title';
+    public $content = 'My Content';
+    public $date    = 'My Date';
+}
 
-$builder->ignore(true)->insert($data);
-// Produces: INSERT OR IGNORE INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')
+$object = new Myclass();
+$builder->insert($object);
+// Produces: INSERT INTO mytable (title, content, date) VALUES ('My Title', 'My Content', 'My Date')
diff --git a/user_guide_src/source/database/query_builder/078.php b/user_guide_src/source/database/query_builder/078.php
index ed0e4cb3f7a1..bb07bc8bdd9c 100644
--- a/user_guide_src/source/database/query_builder/078.php
+++ b/user_guide_src/source/database/query_builder/078.php
@@ -6,6 +6,5 @@
     'date'  => 'My date',
 ];
 
-$sql = $builder->set($data)->getCompiledInsert();
-echo $sql;
-// Produces string: INSERT INTO mytable (`title`, `name`, `date`) VALUES ('My title', 'My name', 'My date')
+$builder->ignore(true)->insert($data);
+// Produces: INSERT OR IGNORE INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')
diff --git a/user_guide_src/source/database/query_builder/079.php b/user_guide_src/source/database/query_builder/079.php
index 1807be1d706a..ed0e4cb3f7a1 100644
--- a/user_guide_src/source/database/query_builder/079.php
+++ b/user_guide_src/source/database/query_builder/079.php
@@ -1,7 +1,11 @@
 <?php
 
-echo $builder->set('title', 'My Title')->getCompiledInsert(false);
-// Produces string: INSERT INTO mytable (`title`) VALUES ('My Title')
+$data = [
+    'title' => 'My title',
+    'name'  => 'My Name',
+    'date'  => 'My date',
+];
 
-echo $builder->set('content', 'My Content')->getCompiledInsert();
-// Produces string: INSERT INTO mytable (`title`, `content`) VALUES ('My Title', 'My Content')
+$sql = $builder->set($data)->getCompiledInsert();
+echo $sql;
+// Produces string: INSERT INTO mytable (`title`, `name`, `date`) VALUES ('My title', 'My name', 'My date')
diff --git a/user_guide_src/source/database/query_builder/080.php b/user_guide_src/source/database/query_builder/080.php
index 0f263005c18e..1807be1d706a 100644
--- a/user_guide_src/source/database/query_builder/080.php
+++ b/user_guide_src/source/database/query_builder/080.php
@@ -1,17 +1,7 @@
 <?php
 
-$data = [
-    [
-        'title' => 'My title',
-        'name'  => 'My Name',
-        'date'  => 'My date',
-    ],
-    [
-        'title' => 'Another title',
-        'name'  => 'Another Name',
-        'date'  => 'Another date',
-    ],
-];
+echo $builder->set('title', 'My Title')->getCompiledInsert(false);
+// Produces string: INSERT INTO mytable (`title`) VALUES ('My Title')
 
-$builder->insertBatch($data);
-// Produces: INSERT INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date'),  ('Another title', 'Another name', 'Another date')
+echo $builder->set('content', 'My Content')->getCompiledInsert();
+// Produces string: INSERT INTO mytable (`title`, `content`) VALUES ('My Title', 'My Content')
diff --git a/user_guide_src/source/database/query_builder/081.php b/user_guide_src/source/database/query_builder/081.php
index d4bd972f5830..0f263005c18e 100644
--- a/user_guide_src/source/database/query_builder/081.php
+++ b/user_guide_src/source/database/query_builder/081.php
@@ -1,10 +1,17 @@
 <?php
 
 $data = [
-    'title' => 'My title',
-    'name'  => 'My Name',
-    'date'  => 'My date',
+    [
+        'title' => 'My title',
+        'name'  => 'My Name',
+        'date'  => 'My date',
+    ],
+    [
+        'title' => 'Another title',
+        'name'  => 'Another Name',
+        'date'  => 'Another date',
+    ],
 ];
 
-$builder->replace($data);
-// Executes: REPLACE INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')
+$builder->insertBatch($data);
+// Produces: INSERT INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date'),  ('Another title', 'Another name', 'Another date')
diff --git a/user_guide_src/source/database/query_builder/082.php b/user_guide_src/source/database/query_builder/082.php
index 59d14e130215..d4bd972f5830 100644
--- a/user_guide_src/source/database/query_builder/082.php
+++ b/user_guide_src/source/database/query_builder/082.php
@@ -1,5 +1,10 @@
 <?php
 
-$builder->set('name', $name);
-$builder->insert();
-// Produces: INSERT INTO mytable (`name`) VALUES ('{$name}')
+$data = [
+    'title' => 'My title',
+    'name'  => 'My Name',
+    'date'  => 'My date',
+];
+
+$builder->replace($data);
+// Executes: REPLACE INTO mytable (title, name, date) VALUES ('My title', 'My name', 'My date')
diff --git a/user_guide_src/source/database/query_builder/083.php b/user_guide_src/source/database/query_builder/083.php
index 8e2fbe2fabe5..59d14e130215 100644
--- a/user_guide_src/source/database/query_builder/083.php
+++ b/user_guide_src/source/database/query_builder/083.php
@@ -1,6 +1,5 @@
 <?php
 
 $builder->set('name', $name);
-$builder->set('title', $title);
-$builder->set('status', $status);
 $builder->insert();
+// Produces: INSERT INTO mytable (`name`) VALUES ('{$name}')
diff --git a/user_guide_src/source/database/query_builder/084.php b/user_guide_src/source/database/query_builder/084.php
index 2e76bea9e5d5..8e2fbe2fabe5 100644
--- a/user_guide_src/source/database/query_builder/084.php
+++ b/user_guide_src/source/database/query_builder/084.php
@@ -1,11 +1,6 @@
 <?php
 
-$builder->set('field', 'field+1', false);
-$builder->where('id', 2);
-$builder->update();
-// gives UPDATE mytable SET field = field+1 WHERE `id` = 2
-
-$builder->set('field', 'field+1');
-$builder->where('id', 2);
-$builder->update();
-// gives UPDATE `mytable` SET `field` = 'field+1' WHERE `id` = 2
+$builder->set('name', $name);
+$builder->set('title', $title);
+$builder->set('status', $status);
+$builder->insert();
diff --git a/user_guide_src/source/database/query_builder/085.php b/user_guide_src/source/database/query_builder/085.php
index 319e29a88142..2e76bea9e5d5 100644
--- a/user_guide_src/source/database/query_builder/085.php
+++ b/user_guide_src/source/database/query_builder/085.php
@@ -1,10 +1,11 @@
 <?php
 
-$array = [
-    'name'   => $name,
-    'title'  => $title,
-    'status' => $status,
-];
+$builder->set('field', 'field+1', false);
+$builder->where('id', 2);
+$builder->update();
+// gives UPDATE mytable SET field = field+1 WHERE `id` = 2
 
-$builder->set($array);
-$builder->insert();
+$builder->set('field', 'field+1');
+$builder->where('id', 2);
+$builder->update();
+// gives UPDATE `mytable` SET `field` = 'field+1' WHERE `id` = 2
diff --git a/user_guide_src/source/database/query_builder/086.php b/user_guide_src/source/database/query_builder/086.php
index d395bc3b8ea9..319e29a88142 100644
--- a/user_guide_src/source/database/query_builder/086.php
+++ b/user_guide_src/source/database/query_builder/086.php
@@ -1,12 +1,10 @@
 <?php
 
-class Myclass
-{
-    public $title   = 'My Title';
-    public $content = 'My Content';
-    public $date    = 'My Date';
-}
+$array = [
+    'name'   => $name,
+    'title'  => $title,
+    'status' => $status,
+];
 
-$object = new Myclass();
-$builder->set($object);
+$builder->set($array);
 $builder->insert();
diff --git a/user_guide_src/source/database/query_builder/087.php b/user_guide_src/source/database/query_builder/087.php
index 7869b4b4d966..d395bc3b8ea9 100644
--- a/user_guide_src/source/database/query_builder/087.php
+++ b/user_guide_src/source/database/query_builder/087.php
@@ -1,16 +1,12 @@
 <?php
 
-$data = [
-    'title' => $title,
-    'name'  => $name,
-    'date'  => $date,
-];
+class Myclass
+{
+    public $title   = 'My Title';
+    public $content = 'My Content';
+    public $date    = 'My Date';
+}
 
-$builder->where('id', $id);
-$builder->update($data);
-/*
- * Produces:
- * UPDATE mytable
- * SET title = '{$title}', name = '{$name}', date = '{$date}'
- * WHERE id = $id
- */
+$object = new Myclass();
+$builder->set($object);
+$builder->insert();
diff --git a/user_guide_src/source/database/query_builder/088.php b/user_guide_src/source/database/query_builder/088.php
index 445e53716041..7869b4b4d966 100644
--- a/user_guide_src/source/database/query_builder/088.php
+++ b/user_guide_src/source/database/query_builder/088.php
@@ -1,18 +1,16 @@
 <?php
 
-class Myclass
-{
-    public $title   = 'My Title';
-    public $content = 'My Content';
-    public $date    = 'My Date';
-}
+$data = [
+    'title' => $title,
+    'name'  => $name,
+    'date'  => $date,
+];
 
-$object = new Myclass();
 $builder->where('id', $id);
-$builder->update($object);
+$builder->update($data);
 /*
  * Produces:
- * UPDATE `mytable`
- * SET `title` = '{$title}', `name` = '{$name}', `date` = '{$date}'
- * WHERE id = `$id`
+ * UPDATE mytable
+ * SET title = '{$title}', name = '{$name}', date = '{$date}'
+ * WHERE id = $id
  */
diff --git a/user_guide_src/source/database/query_builder/089.php b/user_guide_src/source/database/query_builder/089.php
index d2ed79d26832..445e53716041 100644
--- a/user_guide_src/source/database/query_builder/089.php
+++ b/user_guide_src/source/database/query_builder/089.php
@@ -1,3 +1,18 @@
 <?php
 
-$builder->update($data, 'id = 4');
+class Myclass
+{
+    public $title   = 'My Title';
+    public $content = 'My Content';
+    public $date    = 'My Date';
+}
+
+$object = new Myclass();
+$builder->where('id', $id);
+$builder->update($object);
+/*
+ * Produces:
+ * UPDATE `mytable`
+ * SET `title` = '{$title}', `name` = '{$name}', `date` = '{$date}'
+ * WHERE id = `$id`
+ */
diff --git a/user_guide_src/source/database/query_builder/090.php b/user_guide_src/source/database/query_builder/090.php
index 66a1ee575cee..d2ed79d26832 100644
--- a/user_guide_src/source/database/query_builder/090.php
+++ b/user_guide_src/source/database/query_builder/090.php
@@ -1,3 +1,3 @@
 <?php
 
-$builder->update($data, ['id' => $id]);
+$builder->update($data, 'id = 4');
diff --git a/user_guide_src/source/database/query_builder/091.php b/user_guide_src/source/database/query_builder/091.php
index e60b9ee6b486..66a1ee575cee 100644
--- a/user_guide_src/source/database/query_builder/091.php
+++ b/user_guide_src/source/database/query_builder/091.php
@@ -1,28 +1,3 @@
 <?php
 
-$data = [
-    [
-        'title' => 'My title',
-        'name'  => 'My Name 2',
-        'date'  => 'My date 2',
-    ],
-    [
-        'title' => 'Another title',
-        'name'  => 'Another Name 2',
-        'date'  => 'Another date 2',
-    ],
-];
-
-$builder->updateBatch($data, 'title');
-/*
- * Produces:
- * UPDATE `mytable` SET `name` = CASE
- * WHEN `title` = 'My title' THEN 'My Name 2'
- * WHEN `title` = 'Another title' THEN 'Another Name 2'
- * ELSE `name` END,
- * `date` = CASE
- * WHEN `title` = 'My title' THEN 'My date 2'
- * WHEN `title` = 'Another title' THEN 'Another date 2'
- * ELSE `date` END
- * WHERE `title` IN ('My title','Another title')
- */
+$builder->update($data, ['id' => $id]);
diff --git a/user_guide_src/source/database/query_builder/092.php b/user_guide_src/source/database/query_builder/092.php
index ed680a441d98..e60b9ee6b486 100644
--- a/user_guide_src/source/database/query_builder/092.php
+++ b/user_guide_src/source/database/query_builder/092.php
@@ -1,4 +1,28 @@
 <?php
 
-$builder->delete(['id' => $id]);
-// Produces: DELETE FROM mytable WHERE id = $id
+$data = [
+    [
+        'title' => 'My title',
+        'name'  => 'My Name 2',
+        'date'  => 'My date 2',
+    ],
+    [
+        'title' => 'Another title',
+        'name'  => 'Another Name 2',
+        'date'  => 'Another date 2',
+    ],
+];
+
+$builder->updateBatch($data, 'title');
+/*
+ * Produces:
+ * UPDATE `mytable` SET `name` = CASE
+ * WHEN `title` = 'My title' THEN 'My Name 2'
+ * WHEN `title` = 'Another title' THEN 'Another Name 2'
+ * ELSE `name` END,
+ * `date` = CASE
+ * WHEN `title` = 'My title' THEN 'My date 2'
+ * WHEN `title` = 'Another title' THEN 'Another date 2'
+ * ELSE `date` END
+ * WHERE `title` IN ('My title','Another title')
+ */
diff --git a/user_guide_src/source/database/query_builder/093.php b/user_guide_src/source/database/query_builder/093.php
index f1ba27e29ef2..ed680a441d98 100644
--- a/user_guide_src/source/database/query_builder/093.php
+++ b/user_guide_src/source/database/query_builder/093.php
@@ -1,9 +1,4 @@
 <?php
 
-$builder->where('id', $id);
-$builder->delete();
-/*
- * Produces:
- * DELETE FROM mytable
- * WHERE id = $id
- */
+$builder->delete(['id' => $id]);
+// Produces: DELETE FROM mytable WHERE id = $id
diff --git a/user_guide_src/source/database/query_builder/094.php b/user_guide_src/source/database/query_builder/094.php
index 0251fe47031d..f1ba27e29ef2 100644
--- a/user_guide_src/source/database/query_builder/094.php
+++ b/user_guide_src/source/database/query_builder/094.php
@@ -1,4 +1,9 @@
 <?php
 
-$builder->emptyTable('mytable');
-// Produces: DELETE FROM mytable
+$builder->where('id', $id);
+$builder->delete();
+/*
+ * Produces:
+ * DELETE FROM mytable
+ * WHERE id = $id
+ */
diff --git a/user_guide_src/source/database/query_builder/095.php b/user_guide_src/source/database/query_builder/095.php
index a6c0ab4fc069..0251fe47031d 100644
--- a/user_guide_src/source/database/query_builder/095.php
+++ b/user_guide_src/source/database/query_builder/095.php
@@ -1,7 +1,4 @@
 <?php
 
-$builder->truncate();
-/*
- * Produce:
- * TRUNCATE mytable
- */
+$builder->emptyTable('mytable');
+// Produces: DELETE FROM mytable
diff --git a/user_guide_src/source/database/query_builder/096.php b/user_guide_src/source/database/query_builder/096.php
index 5a05f70d8070..a6c0ab4fc069 100644
--- a/user_guide_src/source/database/query_builder/096.php
+++ b/user_guide_src/source/database/query_builder/096.php
@@ -1,6 +1,7 @@
 <?php
 
-$query = $builder->select('title')
-    ->where('id', $id)
-    ->limit(10, 20)
-    ->get();
+$builder->truncate();
+/*
+ * Produce:
+ * TRUNCATE mytable
+ */
diff --git a/user_guide_src/source/database/query_builder/097.php b/user_guide_src/source/database/query_builder/097.php
index 50d274d63a54..5a05f70d8070 100644
--- a/user_guide_src/source/database/query_builder/097.php
+++ b/user_guide_src/source/database/query_builder/097.php
@@ -1,17 +1,6 @@
 <?php
 
-// Note that the second parameter of the ``get_compiled_select`` method is false
-$sql = $builder->select(['field1', 'field2'])
-    ->where('field3', 5)
-    ->getCompiledSelect(false);
-
-// ...
-// Do something crazy with the SQL code... like add it to a cron script for
-// later execution or something...
-// ...
-
-$data = $builder->get()->getResultArray();
-/*
- * Would execute and return an array of results of the following query:
- * SELECT field1, field1 from mytable where field3 = 5;
- */
+$query = $builder->select('title')
+    ->where('id', $id)
+    ->limit(10, 20)
+    ->get();
diff --git a/user_guide_src/source/database/query_builder/098.php b/user_guide_src/source/database/query_builder/098.php
index b3890e978005..50d274d63a54 100644
--- a/user_guide_src/source/database/query_builder/098.php
+++ b/user_guide_src/source/database/query_builder/098.php
@@ -1,6 +1,17 @@
 <?php
 
-$subquery = $db->table('countries')->select('name')->where('id', 1);
-$builder  = $db->table('users')->select('name')->selectSubquery($subquery, 'country');
-$query    = $builder->get();
-// Produces: SELECT `name`, (SELECT `name` FROM `countries` WHERE `id` = 1) AS `country` FROM `users`
+// Note that the second parameter of the ``get_compiled_select`` method is false
+$sql = $builder->select(['field1', 'field2'])
+    ->where('field3', 5)
+    ->getCompiledSelect(false);
+
+// ...
+// Do something crazy with the SQL code... like add it to a cron script for
+// later execution or something...
+// ...
+
+$data = $builder->get()->getResultArray();
+/*
+ * Would execute and return an array of results of the following query:
+ * SELECT field1, field1 from mytable where field3 = 5;
+ */
diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 5ade052c563a..037710255100 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -41,7 +41,7 @@ You can define an array of helper files as a class property. Whenever the contro
 these helper files will be automatically loaded into memory so that you can use their methods anywhere
 inside the controller:
 
-.. literalinclude:: controllers/016.php
+.. literalinclude:: controllers/001.php
 
 .. _controllers-validating-data:
 
@@ -51,13 +51,13 @@ forceHTTPS
 A convenience method for forcing a method to be accessed via HTTPS is available within all
 controllers:
 
-.. literalinclude:: controllers/014.php
+.. literalinclude:: controllers/002.php
 
 By default, and in modern browsers that support the HTTP Strict Transport Security header, this
 call should force the browser to convert non-HTTPS calls to HTTPS calls for one year. You can
 modify this by passing the duration (in seconds) as the first parameter:
 
-.. literalinclude:: controllers/015.php
+.. literalinclude:: controllers/003.php
 
 .. note:: A number of :doc:`time-based constants </general/common_functions>` are always available for you to use, including ``YEAR``, ``MONTH``, and more.
 
@@ -75,12 +75,12 @@ if the items are not valid. Internally, this uses the controller's
 The :doc:`Validation Library docs </libraries/validation>` have details on
 rule and message array formats, as well as available rules:
 
-.. literalinclude:: controllers/017.php
+.. literalinclude:: controllers/004.php
 
 If you find it simpler to keep the rules in the configuration file, you can replace
 the ``$rules`` array with the name of the group as defined in ``Config\Validation.php``:
 
-.. literalinclude:: controllers/018.php
+.. literalinclude:: controllers/005.php
 
 .. note:: Validation can also be handled automatically in the model, but sometimes it's easier to do it in the controller. Where is up to you.
 
@@ -91,7 +91,7 @@ Sometimes you may want to check the controller method parameters or other custom
 In that case, you can use the ``$this->validateData()`` method.
 The method accepts an array of data to validate in the first parameter:
 
-.. literalinclude:: controllers/019.php
+.. literalinclude:: controllers/006.php
 
 Private methods
 ***************
@@ -101,7 +101,7 @@ To achieve this, simply declare the method as ``private`` or ``protected``.
 That will prevent it from being served by a URL request. For example,
 if you were to define a method like this for the ``Helloworld`` controller:
 
-.. literalinclude:: controllers/013.php
+.. literalinclude:: controllers/007.php
 
 then trying to access it using the following URL will not work::
 
@@ -141,7 +141,7 @@ controllers. You can extend this class in any new controller.
 
 For security reasons be sure to declare any new utility methods as ``protected`` or ``private``:
 
-.. literalinclude:: controllers/001.php
+.. literalinclude:: controllers/008.php
 
 Then save the file to your **/app/Controllers/** directory.
 
@@ -159,15 +159,15 @@ If you did it right you should see::
 
 This is valid:
 
-.. literalinclude:: controllers/002.php
+.. literalinclude:: controllers/009.php
 
 This is **not** valid:
 
-.. literalinclude:: controllers/003.php
+.. literalinclude:: controllers/010.php
 
 This is **not** valid:
 
-.. literalinclude:: controllers/004.php
+.. literalinclude:: controllers/011.php
 
 Also, always make sure your controller extends the parent controller
 class so that it can inherit all its methods.
@@ -181,7 +181,7 @@ class so that it can inherit all its methods.
 
     Here is an example based on PSR-4 Autoloader:
 
-    .. literalinclude:: controllers/005.php
+    .. literalinclude:: controllers/012.php
 
 Methods
 =======
@@ -197,7 +197,7 @@ controller gets called.**
 
 Let's try it. Add a new method to your controller:
 
-.. literalinclude:: controllers/006.php
+.. literalinclude:: controllers/013.php
 
 Now load the following URL to see the comment method::
 
@@ -217,7 +217,7 @@ For example, let's say you have a URI like this::
 
 Your method will be passed URI segments 3 and 4 (``'sandals'`` and ``'123'``):
 
-.. literalinclude:: controllers/007.php
+.. literalinclude:: controllers/014.php
 
 .. important:: If you are using the :doc:`URI Routing <routing>`
     feature, the segments passed to your method will be the re-routed
@@ -233,13 +233,13 @@ with the ``Helloworld`` controller.
 To specify a default controller open your **app/Config/Routes.php**
 file and set this variable:
 
-.. literalinclude:: controllers/008.php
+.. literalinclude:: controllers/015.php
 
 Where ``Helloworld`` is the name of the controller class you want to be used.
 
 A few lines further down **Routes.php** in the "Route Definitions" section, comment out the line:
 
-.. literalinclude:: controllers/009.php
+.. literalinclude:: controllers/016.php
 
 If you now browse to your site without specifying any URI segments you'll
 see the "Hello World" message.
@@ -288,7 +288,7 @@ As noted above, the second segment of the URI typically determines which
 method in the controller gets called. CodeIgniter permits you to override
 this behavior through the use of the ``_remap()`` method:
 
-.. literalinclude:: controllers/010.php
+.. literalinclude:: controllers/017.php
 
 .. important:: If your controller contains a method named ``_remap()``,
     it will **always** get called regardless of what your URI contains. It
@@ -298,14 +298,14 @@ this behavior through the use of the ``_remap()`` method:
 The overridden method call (typically the second segment of the URI) will
 be passed as a parameter to the ``_remap()`` method:
 
-.. literalinclude:: controllers/011.php
+.. literalinclude:: controllers/018.php
 
 Any extra segments after the method name are passed into ``_remap()``. These parameters can be passed to the method
 to emulate CodeIgniter's default behavior.
 
 Example:
 
-.. literalinclude:: controllers/012.php
+.. literalinclude:: controllers/019.php
 
 Extending the Controller
 ************************
diff --git a/user_guide_src/source/incoming/controllers/001.php b/user_guide_src/source/incoming/controllers/001.php
index 926de1e9fbdf..ff3ab9edfcf1 100644
--- a/user_guide_src/source/incoming/controllers/001.php
+++ b/user_guide_src/source/incoming/controllers/001.php
@@ -2,10 +2,7 @@
 
 namespace App\Controllers;
 
-class Helloworld extends BaseController
+class MyController extends BaseController
 {
-    public function index()
-    {
-        echo 'Hello World!';
-    }
+    protected $helpers = ['url', 'form'];
 }
diff --git a/user_guide_src/source/incoming/controllers/002.php b/user_guide_src/source/incoming/controllers/002.php
index 20fe63dc2d69..9414addbb81a 100644
--- a/user_guide_src/source/incoming/controllers/002.php
+++ b/user_guide_src/source/incoming/controllers/002.php
@@ -1,8 +1,5 @@
 <?php
 
-namespace App\Controllers;
-
-class Helloworld extends BaseController
-{
-    // ...
+if (! $this->request->isSecure()) {
+    $this->forceHTTPS();
 }
diff --git a/user_guide_src/source/incoming/controllers/003.php b/user_guide_src/source/incoming/controllers/003.php
index 5248ba4b2bdd..c3309ddbf201 100644
--- a/user_guide_src/source/incoming/controllers/003.php
+++ b/user_guide_src/source/incoming/controllers/003.php
@@ -1,8 +1,5 @@
 <?php
 
-namespace App\Controllers;
-
-class helloworld extends BaseController
-{
-    // ...
+if (! $this->request->isSecure()) {
+    $this->forceHTTPS(31536000); // one year
 }
diff --git a/user_guide_src/source/incoming/controllers/004.php b/user_guide_src/source/incoming/controllers/004.php
index 7615eecaeba0..65b1c77f8014 100644
--- a/user_guide_src/source/incoming/controllers/004.php
+++ b/user_guide_src/source/incoming/controllers/004.php
@@ -2,7 +2,19 @@
 
 namespace App\Controllers;
 
-class HelloWorld extends BaseController
+class UserController extends BaseController
 {
-    // ...
+    public function updateUser(int $userID)
+    {
+        if (! $this->validate([
+            'email' => "required|is_unique[users.email,id,{$userID}]",
+            'name' => 'required|alpha_numeric_spaces',
+        ])) {
+            return view('users/update', [
+                'errors' => $this->validator->getErrors(),
+            ]);
+        }
+
+        // do something here if successful...
+    }
 }
diff --git a/user_guide_src/source/incoming/controllers/005.php b/user_guide_src/source/incoming/controllers/005.php
index efaecbb8f400..48e936b60595 100644
--- a/user_guide_src/source/incoming/controllers/005.php
+++ b/user_guide_src/source/incoming/controllers/005.php
@@ -1,8 +1,17 @@
 <?php
 
-/*
- * Folder and file structure:
- * \<NamespaceName>(\<SubNamespaceNames>)*\<ClassName>
- */
+namespace App\Controllers;
 
-$routes->get('helloworld', '\App\Controllers\HelloWorld::index');
+class UserController extends BaseController
+{
+    public function updateUser(int $userID)
+    {
+        if (! $this->validate('userRules')) {
+            return view('users/update', [
+                'errors' => $this->validator->getErrors(),
+            ]);
+        }
+
+        // do something here if successful...
+    }
+}
diff --git a/user_guide_src/source/incoming/controllers/006.php b/user_guide_src/source/incoming/controllers/006.php
index e43c3e4f2b34..1ae78e5791ff 100644
--- a/user_guide_src/source/incoming/controllers/006.php
+++ b/user_guide_src/source/incoming/controllers/006.php
@@ -2,15 +2,24 @@
 
 namespace App\Controllers;
 
-class Helloworld extends BaseController
+class StoreController extends BaseController
 {
-    public function index()
+    public function product(int $id)
     {
-        echo 'Hello World!';
-    }
+        $data = [
+            'id'   => $id,
+            'name' => $this->request->getVar('name'),
+        ];
 
-    public function comment()
-    {
-        echo 'I am not flat!';
+        $rule = [
+            'id'   => 'integer',
+            'name' => 'required|max_length[255]',
+        ];
+
+        if (! $this->validateData($data, $rule)) {
+            // ...
+        }
+
+        // ...
     }
 }
diff --git a/user_guide_src/source/incoming/controllers/007.php b/user_guide_src/source/incoming/controllers/007.php
index 319fd8471a7b..7c2e9b7091ea 100644
--- a/user_guide_src/source/incoming/controllers/007.php
+++ b/user_guide_src/source/incoming/controllers/007.php
@@ -4,9 +4,8 @@
 
 class Products extends BaseController
 {
-    public function shoes($sandals, $id)
+    protected function utility()
     {
-        echo $sandals;
-        echo $id;
+        // some code
     }
 }
diff --git a/user_guide_src/source/incoming/controllers/008.php b/user_guide_src/source/incoming/controllers/008.php
index 2de1b716d040..926de1e9fbdf 100644
--- a/user_guide_src/source/incoming/controllers/008.php
+++ b/user_guide_src/source/incoming/controllers/008.php
@@ -1,3 +1,11 @@
 <?php
 
-$routes->setDefaultController('Helloworld');
+namespace App\Controllers;
+
+class Helloworld extends BaseController
+{
+    public function index()
+    {
+        echo 'Hello World!';
+    }
+}
diff --git a/user_guide_src/source/incoming/controllers/009.php b/user_guide_src/source/incoming/controllers/009.php
index d799d1cf0fb5..20fe63dc2d69 100644
--- a/user_guide_src/source/incoming/controllers/009.php
+++ b/user_guide_src/source/incoming/controllers/009.php
@@ -1,3 +1,8 @@
 <?php
 
-$routes->get('/', 'Home::index');
+namespace App\Controllers;
+
+class Helloworld extends BaseController
+{
+    // ...
+}
diff --git a/user_guide_src/source/incoming/controllers/010.php b/user_guide_src/source/incoming/controllers/010.php
index 8bcb6a2b00f9..5248ba4b2bdd 100644
--- a/user_guide_src/source/incoming/controllers/010.php
+++ b/user_guide_src/source/incoming/controllers/010.php
@@ -2,10 +2,7 @@
 
 namespace App\Controllers;
 
-class Products extends BaseController
+class helloworld extends BaseController
 {
-    public function _remap()
-    {
-        // Some code here...
-    }
+    // ...
 }
diff --git a/user_guide_src/source/incoming/controllers/011.php b/user_guide_src/source/incoming/controllers/011.php
index 159009b6b855..7615eecaeba0 100644
--- a/user_guide_src/source/incoming/controllers/011.php
+++ b/user_guide_src/source/incoming/controllers/011.php
@@ -2,14 +2,7 @@
 
 namespace App\Controllers;
 
-class Products extends BaseController
+class HelloWorld extends BaseController
 {
-    public function _remap($method)
-    {
-        if ($method === 'some_method') {
-            return $this->{$method}();
-        }
-
-        return $this->default_method();
-    }
+    // ...
 }
diff --git a/user_guide_src/source/incoming/controllers/012.php b/user_guide_src/source/incoming/controllers/012.php
index 4bfdb1393d02..efaecbb8f400 100644
--- a/user_guide_src/source/incoming/controllers/012.php
+++ b/user_guide_src/source/incoming/controllers/012.php
@@ -1,17 +1,8 @@
 <?php
 
-namespace App\Controllers;
+/*
+ * Folder and file structure:
+ * \<NamespaceName>(\<SubNamespaceNames>)*\<ClassName>
+ */
 
-class Products extends BaseController
-{
-    public function _remap($method, ...$params)
-    {
-        $method = 'process_' . $method;
-
-        if (method_exists($this, $method)) {
-            return $this->{$method}(...$params);
-        }
-
-        throw \CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound();
-    }
-}
+$routes->get('helloworld', '\App\Controllers\HelloWorld::index');
diff --git a/user_guide_src/source/incoming/controllers/013.php b/user_guide_src/source/incoming/controllers/013.php
index 7c2e9b7091ea..e43c3e4f2b34 100644
--- a/user_guide_src/source/incoming/controllers/013.php
+++ b/user_guide_src/source/incoming/controllers/013.php
@@ -2,10 +2,15 @@
 
 namespace App\Controllers;
 
-class Products extends BaseController
+class Helloworld extends BaseController
 {
-    protected function utility()
+    public function index()
     {
-        // some code
+        echo 'Hello World!';
+    }
+
+    public function comment()
+    {
+        echo 'I am not flat!';
     }
 }
diff --git a/user_guide_src/source/incoming/controllers/014.php b/user_guide_src/source/incoming/controllers/014.php
index 9414addbb81a..319fd8471a7b 100644
--- a/user_guide_src/source/incoming/controllers/014.php
+++ b/user_guide_src/source/incoming/controllers/014.php
@@ -1,5 +1,12 @@
 <?php
 
-if (! $this->request->isSecure()) {
-    $this->forceHTTPS();
+namespace App\Controllers;
+
+class Products extends BaseController
+{
+    public function shoes($sandals, $id)
+    {
+        echo $sandals;
+        echo $id;
+    }
 }
diff --git a/user_guide_src/source/incoming/controllers/015.php b/user_guide_src/source/incoming/controllers/015.php
index c3309ddbf201..2de1b716d040 100644
--- a/user_guide_src/source/incoming/controllers/015.php
+++ b/user_guide_src/source/incoming/controllers/015.php
@@ -1,5 +1,3 @@
 <?php
 
-if (! $this->request->isSecure()) {
-    $this->forceHTTPS(31536000); // one year
-}
+$routes->setDefaultController('Helloworld');
diff --git a/user_guide_src/source/incoming/controllers/016.php b/user_guide_src/source/incoming/controllers/016.php
index ff3ab9edfcf1..d799d1cf0fb5 100644
--- a/user_guide_src/source/incoming/controllers/016.php
+++ b/user_guide_src/source/incoming/controllers/016.php
@@ -1,8 +1,3 @@
 <?php
 
-namespace App\Controllers;
-
-class MyController extends BaseController
-{
-    protected $helpers = ['url', 'form'];
-}
+$routes->get('/', 'Home::index');
diff --git a/user_guide_src/source/incoming/controllers/017.php b/user_guide_src/source/incoming/controllers/017.php
index 65b1c77f8014..8bcb6a2b00f9 100644
--- a/user_guide_src/source/incoming/controllers/017.php
+++ b/user_guide_src/source/incoming/controllers/017.php
@@ -2,19 +2,10 @@
 
 namespace App\Controllers;
 
-class UserController extends BaseController
+class Products extends BaseController
 {
-    public function updateUser(int $userID)
+    public function _remap()
     {
-        if (! $this->validate([
-            'email' => "required|is_unique[users.email,id,{$userID}]",
-            'name' => 'required|alpha_numeric_spaces',
-        ])) {
-            return view('users/update', [
-                'errors' => $this->validator->getErrors(),
-            ]);
-        }
-
-        // do something here if successful...
+        // Some code here...
     }
 }
diff --git a/user_guide_src/source/incoming/controllers/018.php b/user_guide_src/source/incoming/controllers/018.php
index 48e936b60595..159009b6b855 100644
--- a/user_guide_src/source/incoming/controllers/018.php
+++ b/user_guide_src/source/incoming/controllers/018.php
@@ -2,16 +2,14 @@
 
 namespace App\Controllers;
 
-class UserController extends BaseController
+class Products extends BaseController
 {
-    public function updateUser(int $userID)
+    public function _remap($method)
     {
-        if (! $this->validate('userRules')) {
-            return view('users/update', [
-                'errors' => $this->validator->getErrors(),
-            ]);
+        if ($method === 'some_method') {
+            return $this->{$method}();
         }
 
-        // do something here if successful...
+        return $this->default_method();
     }
 }
diff --git a/user_guide_src/source/incoming/controllers/019.php b/user_guide_src/source/incoming/controllers/019.php
index 1ae78e5791ff..4bfdb1393d02 100644
--- a/user_guide_src/source/incoming/controllers/019.php
+++ b/user_guide_src/source/incoming/controllers/019.php
@@ -2,24 +2,16 @@
 
 namespace App\Controllers;
 
-class StoreController extends BaseController
+class Products extends BaseController
 {
-    public function product(int $id)
+    public function _remap($method, ...$params)
     {
-        $data = [
-            'id'   => $id,
-            'name' => $this->request->getVar('name'),
-        ];
+        $method = 'process_' . $method;
 
-        $rule = [
-            'id'   => 'integer',
-            'name' => 'required|max_length[255]',
-        ];
-
-        if (! $this->validateData($data, $rule)) {
-            // ...
+        if (method_exists($this, $method)) {
+            return $this->{$method}(...$params);
         }
 
-        // ...
+        throw \CodeIgniter\Exceptions\PageNotFoundException::forPageNotFound();
     }
 }
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 83cb4cc95e6d..eb7d57370015 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -118,23 +118,23 @@ Array Callable Syntax
 
 Since v4.2.0, you can use array callable syntax to specify the controller:
 
-.. literalinclude:: routing/004_1.php
+.. literalinclude:: routing/013.php
    :lines: 2-
 
 Or using ``use`` keyword:
 
-.. literalinclude:: routing/004_2.php
+.. literalinclude:: routing/014.php
    :lines: 2-
 
 If there are placeholders, it will automatically set the parameters in the specified order:
 
-.. literalinclude:: routing/004_3.php
+.. literalinclude:: routing/015.php
    :lines: 2-
 
 But the auto-configured parameters may not be correct if you use regular expressions in routes.
 In such a case, you can specify the parameters manually:
 
-.. literalinclude:: routing/004_4.php
+.. literalinclude:: routing/016.php
    :lines: 2-
 
 Custom Placeholders
@@ -147,7 +147,7 @@ You add new placeholders with the ``addPlaceholder()`` method. The first paramet
 the placeholder. The second parameter is the Regular Expression pattern it should be replaced with.
 This must be called before you add the route:
 
-.. literalinclude:: routing/013.php
+.. literalinclude:: routing/017.php
 
 Regular Expressions
 ===================
@@ -158,7 +158,7 @@ is allowed, as are back-references.
 .. important:: Note: If you use back-references you must use the dollar syntax rather than the double backslash syntax.
     A typical RegEx route might look something like this:
 
-    .. literalinclude:: routing/014.php
+    .. literalinclude:: routing/018.php
 
 In the above example, a URI similar to **products/shirts/123** would instead call the ``show`` method
 of the ``Products`` controller class, with the original first and second segment passed as arguments to it.
@@ -169,7 +169,7 @@ represent the delimiter between multiple segments.
 For example, if a user accesses a password protected area of your web application and you wish to be able to
 redirect them back to the same page after they log in, you may find this example useful:
 
-.. literalinclude:: routing/015.php
+.. literalinclude:: routing/019.php
 
 For those of you who don't know regular expressions and want to learn more about them,
 `regular-expressions.info <https://www.regular-expressions.info/>`_ might be a good starting point.
@@ -183,7 +183,7 @@ You can use an anonymous function, or Closure, as the destination that a route m
 executed when the user visits that URI. This is handy for quickly executing small tasks, or even just showing
 a simple view:
 
-.. literalinclude:: routing/016.php
+.. literalinclude:: routing/020.php
 
 Mapping multiple routes
 =======================
@@ -192,7 +192,7 @@ While the ``add()`` method is simple to use, it is often handier to work with mu
 the ``map()`` method. Instead of calling the ``add()`` method for each route that you need to add, you can
 define an array of routes and then pass it as the first parameter to the ``map()`` method:
 
-.. literalinclude:: routing/017.php
+.. literalinclude:: routing/021.php
 
 Redirecting Routes
 ==================
@@ -203,7 +203,7 @@ second parameter is either the new URI to redirect to, or the name of a named ro
 the HTTP status code that should be sent along with the redirect. The default value is ``302`` which is a temporary
 redirect and is recommended in most cases:
 
-.. literalinclude:: routing/018.php
+.. literalinclude:: routing/022.php
 
 If a redirect route is matched during a page load, the user will be immediately redirected to the new page before a
 controller can be loaded.
@@ -215,26 +215,26 @@ You can group your routes under a common name with the ``group()`` method. The g
 appears prior to the routes defined inside of the group. This allows you to reduce the typing needed to build out an
 extensive set of routes that all share the opening string, like when building an admin area:
 
-.. literalinclude:: routing/019.php
+.. literalinclude:: routing/023.php
 
 This would prefix the **users** and **blog** URIs with **admin**, handling URLs like **admin/users** and **admin/blog**.
 
 If you need to assign options to a group, like a :ref:`assigning-namespace`, do it before the callback:
 
-.. literalinclude:: routing/020.php
+.. literalinclude:: routing/024.php
 
 This would handle a resource route to the ``App\API\v1\Users`` controller with the **api/users** URI.
 
 You can also use a specific :doc:`filter <filters>` for a group of routes. This will always
 run the filter before or after the controller. This is especially handy during authentication or api logging:
 
-.. literalinclude:: routing/021.php
+.. literalinclude:: routing/025.php
 
 The value for the filter must match one of the aliases defined within **app/Config/Filters.php**.
 
 It is possible to nest groups within groups for finer organization if you need it:
 
-.. literalinclude:: routing/022.php
+.. literalinclude:: routing/026.php
 
 This would handle the URL at **admin/users/list**.
 
@@ -245,7 +245,7 @@ config options like namespace, subdomain, etc. Without necessarily needing to ad
 an empty string in place of the prefix and the routes in the group will be routed as though the group never existed but with the
 given route config options:
 
-.. literalinclude:: routing/023.php
+.. literalinclude:: routing/027.php
 
 Environment Restrictions
 ========================
@@ -255,7 +255,7 @@ tools that only the developer can use on their local machines that are not reach
 This can be done with the ``environment()`` method. The first parameter is the name of the environment. Any
 routes defined within this closure are only accessible from the given environment:
 
-.. literalinclude:: routing/024.php
+.. literalinclude:: routing/028.php
 
 Reverse Routing
 ===============
@@ -269,7 +269,7 @@ function to get the current route that should be used. The first parameter is th
 separated by a double colon (``::``), much like you would use when writing the initial route itself. Any parameters that
 should be passed to the route are passed in next:
 
-.. literalinclude:: routing/025.php
+.. literalinclude:: routing/029.php
 
 Using Named Routes
 ==================
@@ -279,7 +279,7 @@ later, and even if the route definition changes, all of the links in your applic
 will still work without you having to make any changes. A route is named by passing in the ``as`` option
 with the name of the route:
 
-.. literalinclude:: routing/026.php
+.. literalinclude:: routing/030.php
 
 This has the added benefit of making the views more readable, too.
 
@@ -289,7 +289,7 @@ Routes with any HTTP verbs
 It is possible to define a route with any HTTP verbs.
 You can use the ``add()`` method:
 
-.. literalinclude:: routing/027.php
+.. literalinclude:: routing/031.php
 
 .. warning:: While the ``add()`` method seems to be convenient, it is recommended to always use the HTTP-verb-based
     routes, described above, as it is more secure. If you use the :doc:`CSRF protection </libraries/security>`, it does not protect **GET**
@@ -310,7 +310,7 @@ You can create routes that work only from the command-line, and are inaccessible
 route methods will also be inaccessible from the CLI, but routes created by the ``add()`` method will still be
 available from the command line:
 
-.. literalinclude:: routing/028.php
+.. literalinclude:: routing/032.php
 
 .. warning:: If you don't disable auto-routing and place the command file in **app/Controllers**,
     anyone could access the command with the help of auto-routing via HTTP.
@@ -321,7 +321,7 @@ Global Options
 All of the methods for creating a route (add, get, post, :doc:`resource <restful>` etc) can take an array of options that
 can modify the generated routes, or further restrict them. The ``$options`` array is always the last parameter:
 
-.. literalinclude:: routing/029.php
+.. literalinclude:: routing/033.php
 
 .. _applying-filters:
 
@@ -347,17 +347,17 @@ See :doc:`Controller filters <filters>` for more information on setting up filte
 
 You specify an alias defined in **app/Config/Filters.php** for the filter value:
 
-.. literalinclude:: routing/030.php
+.. literalinclude:: routing/034.php
 
 You may also supply arguments to be passed to the alias filter's ``before()`` and ``after()`` methods:
 
-.. literalinclude:: routing/031.php
+.. literalinclude:: routing/035.php
 
 **Classname filter**
 
 You specify a filter classname for the filter value:
 
-.. literalinclude:: routing/032.php
+.. literalinclude:: routing/036.php
 
 **Multiple filters**
 
@@ -365,7 +365,7 @@ You specify a filter classname for the filter value:
 
 You specify an array for the filter value:
 
-.. literalinclude:: routing/033.php
+.. literalinclude:: routing/037.php
 
 .. _assigning-namespace:
 
@@ -376,7 +376,7 @@ While a default namespace will be prepended to the generated controllers (see be
 a different namespace to be used in any options array, with the ``namespace`` option. The value should be the
 namespace you want modified:
 
-.. literalinclude:: routing/034.php
+.. literalinclude:: routing/038.php
 
 The new namespace is only applied during that call for any methods that create a single route, like get, post, etc.
 For any methods that create multiple routes, the new namespace is attached to all routes generated by that function
@@ -388,7 +388,7 @@ Limit to Hostname
 You can restrict groups of routes to function only in certain domain or sub-domains of your application
 by passing the "hostname" option along with the desired domain to allow it on as part of the options array:
 
-.. literalinclude:: routing/035.php
+.. literalinclude:: routing/039.php
 
 This example would only allow the specified hosts to work if the domain exactly matched **accounts.example.com**.
 It would not work under the main site at **example.com**.
@@ -399,12 +399,12 @@ Limit to Subdomains
 When the ``subdomain`` option is present, the system will restrict the routes to only be available on that
 sub-domain. The route will only be matched if the subdomain is the one the application is being viewed through:
 
-.. literalinclude:: routing/036.php
+.. literalinclude:: routing/040.php
 
 You can restrict it to any subdomain by setting the value to an asterisk, (``*``). If you are viewing from a URL
 that does not have any subdomain present, this will not be matched:
 
-.. literalinclude:: routing/037.php
+.. literalinclude:: routing/041.php
 
 .. important:: The system is not perfect and should be tested for your specific domain before being used in production.
     Most domains should work fine but some edge case ones, especially with a period in the domain itself (not used
@@ -419,7 +419,7 @@ value being the number of segments to offset.
 This can be beneficial when developing API's with the first URI segment being the version number. It can also
 be used when the first parameter is a language string:
 
-.. literalinclude:: routing/038.php
+.. literalinclude:: routing/042.php
 
 .. _routing-priority:
 
@@ -432,11 +432,11 @@ You can solve this problem by lowering the priority of route processing using th
 accepts positive integers and zero. The higher the number specified in the ``priority``, the lower
 route priority in the processing queue:
 
-.. literalinclude:: routing/039.php
+.. literalinclude:: routing/043.php
 
 To disable this functionality, you must call the method with the parameter ``false``:
 
-.. literalinclude:: routing/040.php
+.. literalinclude:: routing/044.php
 
 .. note:: By default, all routes have a priority of 0.
     Negative integers will be cast to the absolute value.
@@ -458,12 +458,12 @@ specified by the route. By default, this value is ``App\Controllers``.
 If you set the value empty string (``''``), it leaves each route to specify the fully namespaced
 controller:
 
-.. literalinclude:: routing/041.php
+.. literalinclude:: routing/045.php
 
 If your controllers are not explicitly namespaced, there is no need to change this. If you namespace your controllers,
 then you can change this value to save typing:
 
-.. literalinclude:: routing/042.php
+.. literalinclude:: routing/046.php
 
 Default Controller
 ==================
@@ -472,7 +472,7 @@ When a user visits the root of your site (i.e., example.com) the controller to u
 the ``setDefaultController()`` method, unless a route exists for it explicitly. The default value for this is ``Home``
 which matches the controller at **app/Controllers/Home.php**:
 
-.. literalinclude:: routing/043.php
+.. literalinclude:: routing/047.php
 
 The default controller is also used when no matching route has been found, and the URI would point to a directory
 in the controllers directory. For example, if the user visits **example.com/admin**, if a controller was found at
@@ -488,7 +488,7 @@ when a controller is found that matches the URI, but no segment exists for the m
 In this example, if the user were to visit **example.com/products**, and a ``Products`` controller existed, the
 ``Products::listAll()`` method would be executed:
 
-.. literalinclude:: routing/044.php
+.. literalinclude:: routing/048.php
 
 Translate URI Dashes
 ====================
@@ -497,7 +497,7 @@ This option enables you to automatically replace dashes (``-``) with underscores
 URI segments, thus saving you additional route entries if you need to do that. This is required because the
 dash isn't a valid class or method name character and would cause a fatal error if you try to use it:
 
-.. literalinclude:: routing/045.php
+.. literalinclude:: routing/049.php
 
 .. _use-defined-routes-only:
 
@@ -508,7 +508,7 @@ When no defined route is found that matches the URI, the system will attempt to
 controllers and methods as described in :ref:`auto-routing`. You can disable this automatic matching, and restrict routes
 to only those defined by you, by setting the ``setAutoRoute()`` option to false:
 
-.. literalinclude:: routing/046.php
+.. literalinclude:: routing/050.php
 
 .. warning:: If you use the :doc:`CSRF protection </libraries/security>`, it does not protect **GET**
     requests. If the URI is accessible by the GET method, the CSRF protection will not work.
@@ -520,7 +520,7 @@ When a page is not found that matches the current URI, the system will show a ge
 what happens by specifying an action to happen with the ``set404Override()`` method. The value can be either
 a valid class/method pair, just like you would show in any route, or a Closure:
 
-.. literalinclude:: routing/047.php
+.. literalinclude:: routing/051.php
 
 Route processing by priority
 ============================
@@ -529,7 +529,7 @@ Enables or disables processing of the routes queue by priority. Lowering the pri
 Disabled by default. This functionality affects all routes.
 For an example use of lowering the priority see :ref:`routing-priority`:
 
-.. literalinclude:: routing/048.php
+.. literalinclude:: routing/052.php
 
 .. _auto-routing:
 
diff --git a/user_guide_src/source/incoming/routing/004_1.php b/user_guide_src/source/incoming/routing/004_1.php
deleted file mode 100644
index b562d01ba3b2..000000000000
--- a/user_guide_src/source/incoming/routing/004_1.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$routes->get('/', [\App\Controllers\Home::class, 'index']);
diff --git a/user_guide_src/source/incoming/routing/004_2.php b/user_guide_src/source/incoming/routing/004_2.php
deleted file mode 100644
index 6105564b13f3..000000000000
--- a/user_guide_src/source/incoming/routing/004_2.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-use App\Controllers\Home;
-
-$routes->get('/', [Home::class, 'index']);
diff --git a/user_guide_src/source/incoming/routing/004_3.php b/user_guide_src/source/incoming/routing/004_3.php
deleted file mode 100644
index cd98314d8fe8..000000000000
--- a/user_guide_src/source/incoming/routing/004_3.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-use App\Controllers\Product;
-
-$routes->get('product/(:num)/(:num)', [Product::class, 'index']);
-
-// The above code is the same as the following:
-$routes->get('product/(:num)/(:num)', 'Product::index/$1/$2');
diff --git a/user_guide_src/source/incoming/routing/004_4.php b/user_guide_src/source/incoming/routing/004_4.php
deleted file mode 100644
index aed6cc5176df..000000000000
--- a/user_guide_src/source/incoming/routing/004_4.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-use App\Controllers\Product;
-
-$routes->get('product/(:num)/(:num)', [[Product::class, 'index'], '$2/$1']);
-
-// The above code is the same as the following:
-$routes->get('product/(:num)/(:num)', 'Product::index/$2/$1');
diff --git a/user_guide_src/source/incoming/routing/013.php b/user_guide_src/source/incoming/routing/013.php
index cb1cdda7c78c..b562d01ba3b2 100644
--- a/user_guide_src/source/incoming/routing/013.php
+++ b/user_guide_src/source/incoming/routing/013.php
@@ -1,4 +1,3 @@
 <?php
 
-$routes->addPlaceholder('uuid', '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}');
-$routes->get('users/(:uuid)', 'Users::show/$1');
+$routes->get('/', [\App\Controllers\Home::class, 'index']);
diff --git a/user_guide_src/source/incoming/routing/014.php b/user_guide_src/source/incoming/routing/014.php
index a1619a4bf080..6105564b13f3 100644
--- a/user_guide_src/source/incoming/routing/014.php
+++ b/user_guide_src/source/incoming/routing/014.php
@@ -1,3 +1,5 @@
 <?php
 
-$routes->get('products/([a-z]+)/(\d+)', 'Products::show/$1/id_$2');
+use App\Controllers\Home;
+
+$routes->get('/', [Home::class, 'index']);
diff --git a/user_guide_src/source/incoming/routing/015.php b/user_guide_src/source/incoming/routing/015.php
index c9ddfae73610..cd98314d8fe8 100644
--- a/user_guide_src/source/incoming/routing/015.php
+++ b/user_guide_src/source/incoming/routing/015.php
@@ -1,3 +1,8 @@
 <?php
 
-$routes->get('login/(.+)', 'Auth::login/$1');
+use App\Controllers\Product;
+
+$routes->get('product/(:num)/(:num)', [Product::class, 'index']);
+
+// The above code is the same as the following:
+$routes->get('product/(:num)/(:num)', 'Product::index/$1/$2');
diff --git a/user_guide_src/source/incoming/routing/016.php b/user_guide_src/source/incoming/routing/016.php
index e4fc5bde4a68..aed6cc5176df 100644
--- a/user_guide_src/source/incoming/routing/016.php
+++ b/user_guide_src/source/incoming/routing/016.php
@@ -1,7 +1,8 @@
 <?php
 
-$routes->get('feed', static function () {
-    $rss = new RSSFeeder();
+use App\Controllers\Product;
 
-    return $rss->feed('general');
-});
+$routes->get('product/(:num)/(:num)', [[Product::class, 'index'], '$2/$1']);
+
+// The above code is the same as the following:
+$routes->get('product/(:num)/(:num)', 'Product::index/$2/$1');
diff --git a/user_guide_src/source/incoming/routing/017.php b/user_guide_src/source/incoming/routing/017.php
index 8ebc27e3f9f5..cb1cdda7c78c 100644
--- a/user_guide_src/source/incoming/routing/017.php
+++ b/user_guide_src/source/incoming/routing/017.php
@@ -1,8 +1,4 @@
 <?php
 
-$multipleRoutes = [
-    'product/(:num)'      => 'Catalog::productLookupById',
-    'product/(:alphanum)' => 'Catalog::productLookupByName',
-];
-
-$routes->map($multipleRoutes);
+$routes->addPlaceholder('uuid', '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}');
+$routes->get('users/(:uuid)', 'Users::show/$1');
diff --git a/user_guide_src/source/incoming/routing/018.php b/user_guide_src/source/incoming/routing/018.php
index d92d9934db5a..a1619a4bf080 100644
--- a/user_guide_src/source/incoming/routing/018.php
+++ b/user_guide_src/source/incoming/routing/018.php
@@ -1,8 +1,3 @@
 <?php
 
-$routes->get('users/profile', 'Users::profile', ['as' => 'profile']);
-
-// Redirect to a named route
-$routes->addRedirect('users/about', 'profile');
-// Redirect to a URI
-$routes->addRedirect('users/about', 'users/profile');
+$routes->get('products/([a-z]+)/(\d+)', 'Products::show/$1/id_$2');
diff --git a/user_guide_src/source/incoming/routing/019.php b/user_guide_src/source/incoming/routing/019.php
index 6f08c319c551..c9ddfae73610 100644
--- a/user_guide_src/source/incoming/routing/019.php
+++ b/user_guide_src/source/incoming/routing/019.php
@@ -1,6 +1,3 @@
 <?php
 
-$routes->group('admin', static function ($routes) {
-    $routes->get('users', 'Admin\Users::index');
-    $routes->get('blog', 'Admin\Blog::index');
-});
+$routes->get('login/(.+)', 'Auth::login/$1');
diff --git a/user_guide_src/source/incoming/routing/020.php b/user_guide_src/source/incoming/routing/020.php
index 7c66c3b693dd..e4fc5bde4a68 100644
--- a/user_guide_src/source/incoming/routing/020.php
+++ b/user_guide_src/source/incoming/routing/020.php
@@ -1,5 +1,7 @@
 <?php
 
-$routes->group('api', ['namespace' => 'App\API\v1'], static function ($routes) {
-    $routes->resource('users');
+$routes->get('feed', static function () {
+    $rss = new RSSFeeder();
+
+    return $rss->feed('general');
 });
diff --git a/user_guide_src/source/incoming/routing/021.php b/user_guide_src/source/incoming/routing/021.php
index 75cec09100cb..8ebc27e3f9f5 100644
--- a/user_guide_src/source/incoming/routing/021.php
+++ b/user_guide_src/source/incoming/routing/021.php
@@ -1,5 +1,8 @@
 <?php
 
-$routes->group('api', ['filter' => 'api-auth'], static function ($routes) {
-    $routes->resource('users');
-});
+$multipleRoutes = [
+    'product/(:num)'      => 'Catalog::productLookupById',
+    'product/(:alphanum)' => 'Catalog::productLookupByName',
+];
+
+$routes->map($multipleRoutes);
diff --git a/user_guide_src/source/incoming/routing/022.php b/user_guide_src/source/incoming/routing/022.php
index 1ed2a8a96ee6..d92d9934db5a 100644
--- a/user_guide_src/source/incoming/routing/022.php
+++ b/user_guide_src/source/incoming/routing/022.php
@@ -1,7 +1,8 @@
 <?php
 
-$routes->group('admin', static function ($routes) {
-    $routes->group('users', static function ($routes) {
-        $routes->get('list', 'Admin\Users::list');
-    });
-});
+$routes->get('users/profile', 'Users::profile', ['as' => 'profile']);
+
+// Redirect to a named route
+$routes->addRedirect('users/about', 'profile');
+// Redirect to a URI
+$routes->addRedirect('users/about', 'users/profile');
diff --git a/user_guide_src/source/incoming/routing/023.php b/user_guide_src/source/incoming/routing/023.php
index d7624ddc6d5c..6f08c319c551 100644
--- a/user_guide_src/source/incoming/routing/023.php
+++ b/user_guide_src/source/incoming/routing/023.php
@@ -1,7 +1,6 @@
 <?php
 
-$routes->group('', ['namespace' => 'Myth\Auth\Controllers'], static function ($routes) {
-    $routes->get('login', 'AuthController::login', ['as' => 'login']);
-    $routes->post('login', 'AuthController::attemptLogin');
-    $routes->get('logout', 'AuthController::logout');
+$routes->group('admin', static function ($routes) {
+    $routes->get('users', 'Admin\Users::index');
+    $routes->get('blog', 'Admin\Blog::index');
 });
diff --git a/user_guide_src/source/incoming/routing/024.php b/user_guide_src/source/incoming/routing/024.php
index 53921b33f5eb..7c66c3b693dd 100644
--- a/user_guide_src/source/incoming/routing/024.php
+++ b/user_guide_src/source/incoming/routing/024.php
@@ -1,5 +1,5 @@
 <?php
 
-$routes->environment('development', static function ($routes) {
-    $routes->get('builder', 'Tools\Builder::index');
+$routes->group('api', ['namespace' => 'App\API\v1'], static function ($routes) {
+    $routes->resource('users');
 });
diff --git a/user_guide_src/source/incoming/routing/025.php b/user_guide_src/source/incoming/routing/025.php
index e6bc6bdfb65f..75cec09100cb 100644
--- a/user_guide_src/source/incoming/routing/025.php
+++ b/user_guide_src/source/incoming/routing/025.php
@@ -1,10 +1,5 @@
 <?php
 
-// The route is defined as:
-$routes->get('users/(:num)/gallery(:any)', 'App\Controllers\Galleries::showUserGallery/$1/$2');
-
-?>
-
-<!-- Generate the relative URL to link to user ID 15, gallery 12: -->
-<a href="<?= route_to('App\Controllers\Galleries::showUserGallery', 15, 12) ?>">View Gallery</a>
-<!-- Result: '/users/15/gallery/12' -->
+$routes->group('api', ['filter' => 'api-auth'], static function ($routes) {
+    $routes->resource('users');
+});
diff --git a/user_guide_src/source/incoming/routing/026.php b/user_guide_src/source/incoming/routing/026.php
index 1c1c629893e3..1ed2a8a96ee6 100644
--- a/user_guide_src/source/incoming/routing/026.php
+++ b/user_guide_src/source/incoming/routing/026.php
@@ -1,10 +1,7 @@
 <?php
 
-// The route is defined as:
-$routes->get('users/(:num)/gallery(:any)', 'Galleries::showUserGallery/$1/$2', ['as' => 'user_gallery']);
-
-?>
-
-<!-- Generate the relative URL to link to user ID 15, gallery 12: -->
-<a href="<?= route_to('user_gallery', 15, 12) ?>">View Gallery</a>
-<!-- Result: '/users/15/gallery/12' -->
+$routes->group('admin', static function ($routes) {
+    $routes->group('users', static function ($routes) {
+        $routes->get('list', 'Admin\Users::list');
+    });
+});
diff --git a/user_guide_src/source/incoming/routing/027.php b/user_guide_src/source/incoming/routing/027.php
index e2a3784f335f..d7624ddc6d5c 100644
--- a/user_guide_src/source/incoming/routing/027.php
+++ b/user_guide_src/source/incoming/routing/027.php
@@ -1,3 +1,7 @@
 <?php
 
-$routes->add('products', 'Product::feature');
+$routes->group('', ['namespace' => 'Myth\Auth\Controllers'], static function ($routes) {
+    $routes->get('login', 'AuthController::login', ['as' => 'login']);
+    $routes->post('login', 'AuthController::attemptLogin');
+    $routes->get('logout', 'AuthController::logout');
+});
diff --git a/user_guide_src/source/incoming/routing/028.php b/user_guide_src/source/incoming/routing/028.php
index a82d57ebc5c7..53921b33f5eb 100644
--- a/user_guide_src/source/incoming/routing/028.php
+++ b/user_guide_src/source/incoming/routing/028.php
@@ -1,3 +1,5 @@
 <?php
 
-$routes->cli('migrate', 'App\Database::migrate');
+$routes->environment('development', static function ($routes) {
+    $routes->get('builder', 'Tools\Builder::index');
+});
diff --git a/user_guide_src/source/incoming/routing/029.php b/user_guide_src/source/incoming/routing/029.php
index ff7e995a1526..e6bc6bdfb65f 100644
--- a/user_guide_src/source/incoming/routing/029.php
+++ b/user_guide_src/source/incoming/routing/029.php
@@ -1,14 +1,10 @@
 <?php
 
-$routes->add('from', 'to', $options);
-$routes->get('from', 'to', $options);
-$routes->post('from', 'to', $options);
-$routes->put('from', 'to', $options);
-$routes->head('from', 'to', $options);
-$routes->options('from', 'to', $options);
-$routes->delete('from', 'to', $options);
-$routes->patch('from', 'to', $options);
-$routes->match(['get', 'put'], 'from', 'to', $options);
-$routes->resource('photos', $options);
-$routes->map($array, $options);
-$routes->group('name', $options, static function () {});
+// The route is defined as:
+$routes->get('users/(:num)/gallery(:any)', 'App\Controllers\Galleries::showUserGallery/$1/$2');
+
+?>
+
+<!-- Generate the relative URL to link to user ID 15, gallery 12: -->
+<a href="<?= route_to('App\Controllers\Galleries::showUserGallery', 15, 12) ?>">View Gallery</a>
+<!-- Result: '/users/15/gallery/12' -->
diff --git a/user_guide_src/source/incoming/routing/030.php b/user_guide_src/source/incoming/routing/030.php
index 2515937bb02a..1c1c629893e3 100644
--- a/user_guide_src/source/incoming/routing/030.php
+++ b/user_guide_src/source/incoming/routing/030.php
@@ -1,3 +1,10 @@
 <?php
 
-$routes->get('admin', ' AdminController::index', ['filter' => 'admin-auth']);
+// The route is defined as:
+$routes->get('users/(:num)/gallery(:any)', 'Galleries::showUserGallery/$1/$2', ['as' => 'user_gallery']);
+
+?>
+
+<!-- Generate the relative URL to link to user ID 15, gallery 12: -->
+<a href="<?= route_to('user_gallery', 15, 12) ?>">View Gallery</a>
+<!-- Result: '/users/15/gallery/12' -->
diff --git a/user_guide_src/source/incoming/routing/031.php b/user_guide_src/source/incoming/routing/031.php
index b50db49bd962..e2a3784f335f 100644
--- a/user_guide_src/source/incoming/routing/031.php
+++ b/user_guide_src/source/incoming/routing/031.php
@@ -1,3 +1,3 @@
 <?php
 
-$routes->post('users/delete/(:segment)', 'AdminController::index', ['filter' => 'admin-auth:dual,noreturn']);
+$routes->add('products', 'Product::feature');
diff --git a/user_guide_src/source/incoming/routing/032.php b/user_guide_src/source/incoming/routing/032.php
index dd6cd63ba61d..a82d57ebc5c7 100644
--- a/user_guide_src/source/incoming/routing/032.php
+++ b/user_guide_src/source/incoming/routing/032.php
@@ -1,3 +1,3 @@
 <?php
 
-$routes->get('admin', ' AdminController::index', ['filter' => \App\Filters\SomeFilter::class]);
+$routes->cli('migrate', 'App\Database::migrate');
diff --git a/user_guide_src/source/incoming/routing/033.php b/user_guide_src/source/incoming/routing/033.php
index 94ae43246897..ff7e995a1526 100644
--- a/user_guide_src/source/incoming/routing/033.php
+++ b/user_guide_src/source/incoming/routing/033.php
@@ -1,3 +1,14 @@
 <?php
 
-$routes->get('admin', ' AdminController::index', ['filter' => ['admin-auth', \App\Filters\SomeFilter::class]]);
+$routes->add('from', 'to', $options);
+$routes->get('from', 'to', $options);
+$routes->post('from', 'to', $options);
+$routes->put('from', 'to', $options);
+$routes->head('from', 'to', $options);
+$routes->options('from', 'to', $options);
+$routes->delete('from', 'to', $options);
+$routes->patch('from', 'to', $options);
+$routes->match(['get', 'put'], 'from', 'to', $options);
+$routes->resource('photos', $options);
+$routes->map($array, $options);
+$routes->group('name', $options, static function () {});
diff --git a/user_guide_src/source/incoming/routing/034.php b/user_guide_src/source/incoming/routing/034.php
index b992deb96ecf..2515937bb02a 100644
--- a/user_guide_src/source/incoming/routing/034.php
+++ b/user_guide_src/source/incoming/routing/034.php
@@ -1,4 +1,3 @@
 <?php
 
-// Routes to \Admin\Users::index()
-$routes->get('admin/users', 'Users::index', ['namespace' => 'Admin']);
+$routes->get('admin', ' AdminController::index', ['filter' => 'admin-auth']);
diff --git a/user_guide_src/source/incoming/routing/035.php b/user_guide_src/source/incoming/routing/035.php
index 5b415a50138b..b50db49bd962 100644
--- a/user_guide_src/source/incoming/routing/035.php
+++ b/user_guide_src/source/incoming/routing/035.php
@@ -1,3 +1,3 @@
 <?php
 
-$routes->get('from', 'to', ['hostname' => 'accounts.example.com']);
+$routes->post('users/delete/(:segment)', 'AdminController::index', ['filter' => 'admin-auth:dual,noreturn']);
diff --git a/user_guide_src/source/incoming/routing/036.php b/user_guide_src/source/incoming/routing/036.php
index 32a74934eb3a..dd6cd63ba61d 100644
--- a/user_guide_src/source/incoming/routing/036.php
+++ b/user_guide_src/source/incoming/routing/036.php
@@ -1,4 +1,3 @@
 <?php
 
-// Limit to media.example.com
-$routes->get('from', 'to', ['subdomain' => 'media']);
+$routes->get('admin', ' AdminController::index', ['filter' => \App\Filters\SomeFilter::class]);
diff --git a/user_guide_src/source/incoming/routing/037.php b/user_guide_src/source/incoming/routing/037.php
index 0d0fd0e67fb4..94ae43246897 100644
--- a/user_guide_src/source/incoming/routing/037.php
+++ b/user_guide_src/source/incoming/routing/037.php
@@ -1,4 +1,3 @@
 <?php
 
-// Limit to any sub-domain
-$routes->get('from', 'to', ['subdomain' => '*']);
+$routes->get('admin', ' AdminController::index', ['filter' => ['admin-auth', \App\Filters\SomeFilter::class]]);
diff --git a/user_guide_src/source/incoming/routing/038.php b/user_guide_src/source/incoming/routing/038.php
index ec7fa680f65e..b992deb96ecf 100644
--- a/user_guide_src/source/incoming/routing/038.php
+++ b/user_guide_src/source/incoming/routing/038.php
@@ -1,6 +1,4 @@
 <?php
 
-$routes->get('users/(:num)', 'users/show/$1', ['offset' => 1]);
-
-// Creates:
-$routes['users/(:num)'] = 'users/show/$2';
+// Routes to \Admin\Users::index()
+$routes->get('admin/users', 'Users::index', ['namespace' => 'Admin']);
diff --git a/user_guide_src/source/incoming/routing/039.php b/user_guide_src/source/incoming/routing/039.php
index 29fc83e59f17..5b415a50138b 100644
--- a/user_guide_src/source/incoming/routing/039.php
+++ b/user_guide_src/source/incoming/routing/039.php
@@ -1,12 +1,3 @@
 <?php
 
-// First you need to enable sorting.
-$routes->setPrioritize();
-
-// App\Config\Routes
-$routes->get('(.*)', 'Posts::index', ['priority' => 1]);
-
-// Modules\Acme\Config\Routes
-$routes->get('admin', 'Admin::index');
-
-// The "admin" route will now be processed before the wildcard router.
+$routes->get('from', 'to', ['hostname' => 'accounts.example.com']);
diff --git a/user_guide_src/source/incoming/routing/040.php b/user_guide_src/source/incoming/routing/040.php
index 9465f4147e2c..32a74934eb3a 100644
--- a/user_guide_src/source/incoming/routing/040.php
+++ b/user_guide_src/source/incoming/routing/040.php
@@ -1,3 +1,4 @@
 <?php
 
-$routes->setPrioritize(false);
+// Limit to media.example.com
+$routes->get('from', 'to', ['subdomain' => 'media']);
diff --git a/user_guide_src/source/incoming/routing/041.php b/user_guide_src/source/incoming/routing/041.php
index 98aef9276f9d..0d0fd0e67fb4 100644
--- a/user_guide_src/source/incoming/routing/041.php
+++ b/user_guide_src/source/incoming/routing/041.php
@@ -1,9 +1,4 @@
 <?php
 
-$routes->setDefaultNamespace('');
-
-// Controller is \Users
-$routes->get('users', 'Users::index');
-
-// Controller is \Admin\Users
-$routes->get('users', 'Admin\Users::index');
+// Limit to any sub-domain
+$routes->get('from', 'to', ['subdomain' => '*']);
diff --git a/user_guide_src/source/incoming/routing/042.php b/user_guide_src/source/incoming/routing/042.php
index fbbbee2300df..ec7fa680f65e 100644
--- a/user_guide_src/source/incoming/routing/042.php
+++ b/user_guide_src/source/incoming/routing/042.php
@@ -1,9 +1,6 @@
 <?php
 
-$routes->setDefaultNamespace('App');
+$routes->get('users/(:num)', 'users/show/$1', ['offset' => 1]);
 
-// Controller is \App\Users
-$routes->get('users', 'Users::index');
-
-// Controller is \App\Admin\Users
-$routes->get('users', 'Admin\Users::index');
+// Creates:
+$routes['users/(:num)'] = 'users/show/$2';
diff --git a/user_guide_src/source/incoming/routing/043.php b/user_guide_src/source/incoming/routing/043.php
index 5d17df8130d4..29fc83e59f17 100644
--- a/user_guide_src/source/incoming/routing/043.php
+++ b/user_guide_src/source/incoming/routing/043.php
@@ -1,4 +1,12 @@
 <?php
 
-// example.com routes to app/Controllers/Welcome.php
-$routes->setDefaultController('Welcome');
+// First you need to enable sorting.
+$routes->setPrioritize();
+
+// App\Config\Routes
+$routes->get('(.*)', 'Posts::index', ['priority' => 1]);
+
+// Modules\Acme\Config\Routes
+$routes->get('admin', 'Admin::index');
+
+// The "admin" route will now be processed before the wildcard router.
diff --git a/user_guide_src/source/incoming/routing/044.php b/user_guide_src/source/incoming/routing/044.php
index e926e651287d..9465f4147e2c 100644
--- a/user_guide_src/source/incoming/routing/044.php
+++ b/user_guide_src/source/incoming/routing/044.php
@@ -1,3 +1,3 @@
 <?php
 
-$routes->setDefaultMethod('listAll');
+$routes->setPrioritize(false);
diff --git a/user_guide_src/source/incoming/routing/045.php b/user_guide_src/source/incoming/routing/045.php
index 31d49508ab86..98aef9276f9d 100644
--- a/user_guide_src/source/incoming/routing/045.php
+++ b/user_guide_src/source/incoming/routing/045.php
@@ -1,3 +1,9 @@
 <?php
 
-$routes->setTranslateURIDashes(true);
+$routes->setDefaultNamespace('');
+
+// Controller is \Users
+$routes->get('users', 'Users::index');
+
+// Controller is \Admin\Users
+$routes->get('users', 'Admin\Users::index');
diff --git a/user_guide_src/source/incoming/routing/046.php b/user_guide_src/source/incoming/routing/046.php
index c331102cd9f4..fbbbee2300df 100644
--- a/user_guide_src/source/incoming/routing/046.php
+++ b/user_guide_src/source/incoming/routing/046.php
@@ -1,3 +1,9 @@
 <?php
 
-$routes->setAutoRoute(false);
+$routes->setDefaultNamespace('App');
+
+// Controller is \App\Users
+$routes->get('users', 'Users::index');
+
+// Controller is \App\Admin\Users
+$routes->get('users', 'Admin\Users::index');
diff --git a/user_guide_src/source/incoming/routing/047.php b/user_guide_src/source/incoming/routing/047.php
index dddd067f0f26..5d17df8130d4 100644
--- a/user_guide_src/source/incoming/routing/047.php
+++ b/user_guide_src/source/incoming/routing/047.php
@@ -1,9 +1,4 @@
 <?php
 
-// Would execute the show404 method of the App\Errors class
-$routes->set404Override('App\Errors::show404');
-
-// Will display a custom view
-$routes->set404Override(static function () {
-    echo view('my_errors/not_found.html');
-});
+// example.com routes to app/Controllers/Welcome.php
+$routes->setDefaultController('Welcome');
diff --git a/user_guide_src/source/incoming/routing/048.php b/user_guide_src/source/incoming/routing/048.php
index e3dd9f60c989..e926e651287d 100644
--- a/user_guide_src/source/incoming/routing/048.php
+++ b/user_guide_src/source/incoming/routing/048.php
@@ -1,7 +1,3 @@
 <?php
 
-// to enable
-$routes->setPrioritize();
-
-// to disable
-$routes->setPrioritize(false);
+$routes->setDefaultMethod('listAll');
diff --git a/user_guide_src/source/incoming/routing/049.php b/user_guide_src/source/incoming/routing/049.php
new file mode 100644
index 000000000000..31d49508ab86
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/049.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->setTranslateURIDashes(true);
diff --git a/user_guide_src/source/incoming/routing/050.php b/user_guide_src/source/incoming/routing/050.php
new file mode 100644
index 000000000000..c331102cd9f4
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/050.php
@@ -0,0 +1,3 @@
+<?php
+
+$routes->setAutoRoute(false);
diff --git a/user_guide_src/source/incoming/routing/051.php b/user_guide_src/source/incoming/routing/051.php
new file mode 100644
index 000000000000..dddd067f0f26
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/051.php
@@ -0,0 +1,9 @@
+<?php
+
+// Would execute the show404 method of the App\Errors class
+$routes->set404Override('App\Errors::show404');
+
+// Will display a custom view
+$routes->set404Override(static function () {
+    echo view('my_errors/not_found.html');
+});
diff --git a/user_guide_src/source/incoming/routing/052.php b/user_guide_src/source/incoming/routing/052.php
new file mode 100644
index 000000000000..e3dd9f60c989
--- /dev/null
+++ b/user_guide_src/source/incoming/routing/052.php
@@ -0,0 +1,7 @@
+<?php
+
+// to enable
+$routes->setPrioritize();
+
+// to disable
+$routes->setPrioritize(false);
diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
index 8dea63ab953f..59557db92cf8 100644
--- a/user_guide_src/source/libraries/sessions.rst
+++ b/user_guide_src/source/libraries/sessions.rst
@@ -37,7 +37,7 @@ Alternatively, you can use the helper function that will use the default
 configuration options. This version is a little friendlier to read,
 but does not take any configuration options.
 
-.. literalinclude:: sessions/003.php
+.. literalinclude:: sessions/002.php
 
 How do Sessions work?
 =====================
@@ -89,7 +89,7 @@ have the session open, while you've already processed it and therefore no
 longer need it. So, what you need is to close the session for the
 current request after you no longer need it.
 
-.. literalinclude:: sessions/004.php
+.. literalinclude:: sessions/003.php
 
 What is Session Data?
 =====================
@@ -115,25 +115,25 @@ Retrieving Session Data
 Any piece of information from the session array is available through the
 ``$_SESSION`` superglobal:
 
-.. literalinclude:: sessions/005.php
+.. literalinclude:: sessions/004.php
 
 Or through the conventional accessor method:
 
-.. literalinclude:: sessions/006.php
+.. literalinclude:: sessions/005.php
 
 Or through the magic getter:
 
-.. literalinclude:: sessions/007.php
+.. literalinclude:: sessions/006.php
 
 Or even through the session helper method:
 
-.. literalinclude:: sessions/008.php
+.. literalinclude:: sessions/007.php
 
 Where ``item`` is the array key corresponding to the item you wish to fetch.
 For example, to assign a previously stored 'name' item to the ``$name``
 variable, you will do this:
 
-.. literalinclude:: sessions/009.php
+.. literalinclude:: sessions/008.php
 
 .. note:: The ``get()`` method returns null if the item you are trying
     to access does not exist.
@@ -141,7 +141,7 @@ variable, you will do this:
 If you want to retrieve all of the existing userdata, you can simply
 omit the item key (magic getter only works for single property values):
 
-.. literalinclude:: sessions/010.php
+.. literalinclude:: sessions/009.php
 
 Adding Session Data
 ===================
@@ -158,26 +158,26 @@ The former userdata method is deprecated,
 but you can pass an array containing your new session data to the
 ``set()`` method:
 
-.. literalinclude:: sessions/011.php
+.. literalinclude:: sessions/010.php
 
 Where ``$array`` is an associative array containing your new data. Here's
 an example:
 
-.. literalinclude:: sessions/012.php
+.. literalinclude:: sessions/011.php
 
 If you want to add session data one value at a time, ``set()`` also
 supports this syntax:
 
-.. literalinclude:: sessions/013.php
+.. literalinclude:: sessions/012.php
 
 If you want to verify that a session value exists, simply check with
 ``isset()``:
 
-.. literalinclude:: sessions/014.php
+.. literalinclude:: sessions/013.php
 
 Or you can call ``has()``:
 
-.. literalinclude:: sessions/015.php
+.. literalinclude:: sessions/014.php
 
 Pushing new value to session data
 =================================
@@ -185,7 +185,7 @@ Pushing new value to session data
 The push method is used to push a new value onto a session value that is an array.
 For instance, if the 'hobbies' key contains an array of hobbies, you can add a new value onto the array like so:
 
-.. literalinclude:: sessions/016.php
+.. literalinclude:: sessions/015.php
 
 Removing Session Data
 =====================
@@ -193,18 +193,18 @@ Removing Session Data
 Just as with any other variable, unsetting a value in ``$_SESSION`` can be
 done through ``unset()``:
 
-.. literalinclude:: sessions/017.php
+.. literalinclude:: sessions/016.php
 
 Also, just as ``set()`` can be used to add information to a
 session, ``remove()`` can be used to remove it, by passing the
 session key. For example, if you wanted to remove 'some_name' from your
 session data array:
 
-.. literalinclude:: sessions/018.php
+.. literalinclude:: sessions/017.php
 
 This method also accepts an array of item keys to unset:
 
-.. literalinclude:: sessions/019.php
+.. literalinclude:: sessions/018.php
 
 Flashdata
 =========
@@ -220,20 +220,20 @@ managed inside the CodeIgniter session handler.
 
 To mark an existing item as "flashdata":
 
-.. literalinclude:: sessions/020.php
+.. literalinclude:: sessions/019.php
 
 If you want to mark multiple items as flashdata, simply pass the keys as an
 array:
 
-.. literalinclude:: sessions/021.php
+.. literalinclude:: sessions/020.php
 
 To add flashdata:
 
-.. literalinclude:: sessions/022.php
+.. literalinclude:: sessions/021.php
 
 Or alternatively, using the ``setFlashdata()`` method:
 
-.. literalinclude:: sessions/023.php
+.. literalinclude:: sessions/022.php
 
 You can also pass an array to ``setFlashdata()``, in the same manner as
 ``set()``.
@@ -241,7 +241,7 @@ You can also pass an array to ``setFlashdata()``, in the same manner as
 Reading flashdata variables is the same as reading regular session data
 through ``$_SESSION``:
 
-.. literalinclude:: sessions/024.php
+.. literalinclude:: sessions/023.php
 
 .. important:: The ``get()`` method WILL return flashdata items when
     retrieving a single item by key. It will not return flashdata when
@@ -250,11 +250,11 @@ through ``$_SESSION``:
 However, if you want to be sure that you're reading "flashdata" (and not
 any other kind), you can also use the ``getFlashdata()`` method:
 
-.. literalinclude:: sessions/025.php
+.. literalinclude:: sessions/024.php
 
 Or to get an array with all flashdata, simply omit the key parameter:
 
-.. literalinclude:: sessions/026.php
+.. literalinclude:: sessions/025.php
 
 .. note:: The ``getFlashdata()`` method returns null if the item cannot be
     found.
@@ -263,7 +263,7 @@ If you find that you need to preserve a flashdata variable through an
 additional request, you can do so using the ``keepFlashdata()`` method.
 You can either pass a single item or an array of flashdata items to keep.
 
-.. literalinclude:: sessions/027.php
+.. literalinclude:: sessions/026.php
 
 Tempdata
 ========
@@ -278,24 +278,24 @@ CodeIgniter session handler.
 To mark an existing item as "tempdata", simply pass its key and expiry time
 (in seconds!) to the ``markAsTempdata()`` method:
 
-.. literalinclude:: sessions/028.php
+.. literalinclude:: sessions/027.php
 
 You can mark multiple items as tempdata in two ways, depending on whether
 you want them all to have the same expiry time or not:
 
-.. literalinclude:: sessions/029.php
+.. literalinclude:: sessions/028.php
 
 To add tempdata:
 
-.. literalinclude:: sessions/030.php
+.. literalinclude:: sessions/029.php
 
 Or alternatively, using the ``setTempdata()`` method:
 
-.. literalinclude:: sessions/031.php
+.. literalinclude:: sessions/030.php
 
 You can also pass an array to ``setTempdata()``:
 
-.. literalinclude:: sessions/032.php
+.. literalinclude:: sessions/031.php
 
 .. note:: If the expiration is omitted or set to 0, the default
     time-to-live value of 300 seconds (or 5 minutes) will be used.
@@ -303,7 +303,7 @@ You can also pass an array to ``setTempdata()``:
 To read a tempdata variable, again you can just access it through the
 ``$_SESSION`` superglobal array:
 
-.. literalinclude:: sessions/033.php
+.. literalinclude:: sessions/032.php
 
 .. important:: The ``get()`` method WILL return tempdata items when
     retrieving a single item by key. It will not return tempdata when
@@ -312,11 +312,11 @@ To read a tempdata variable, again you can just access it through the
 Or if you want to be sure that you're reading "tempdata" (and not any
 other kind), you can also use the ``getTempdata()`` method:
 
-.. literalinclude:: sessions/034.php
+.. literalinclude:: sessions/033.php
 
 And of course, if you want to retrieve all existing tempdata:
 
-.. literalinclude:: sessions/035.php
+.. literalinclude:: sessions/034.php
 
 .. note:: The ``getTempdata()`` method returns null if the item cannot be
     found.
@@ -324,14 +324,14 @@ And of course, if you want to retrieve all existing tempdata:
 If you need to remove a tempdata value before it expires, you can directly
 unset it from the ``$_SESSION`` array:
 
-.. literalinclude:: sessions/036.php
+.. literalinclude:: sessions/035.php
 
 However, this won't remove the marker that makes this specific item to be
 tempdata (it will be invalidated on the next HTTP request), so if you
 intend to reuse that same key in the same request, you'd want to use
 ``removeTempdata()``:
 
-.. literalinclude:: sessions/037.php
+.. literalinclude:: sessions/036.php
 
 Destroying a Session
 ====================
@@ -341,7 +341,7 @@ simply use either PHP's `session_destroy() <https://www.php.net/session_destroy>
 function, or the library's ``destroy()`` method. Both will work in exactly the
 same way:
 
-.. literalinclude:: sessions/038.php
+.. literalinclude:: sessions/037.php
 
 .. note:: This must be the last session-related operation that you do
     during the same request. All session data (including flashdata and
@@ -352,7 +352,7 @@ You may also use the ``stop()`` method to completely kill the session
 by removing the old session_id, destroying all data, and destroying
 the cookie that contained the session id:
 
-.. literalinclude:: sessions/039.php
+.. literalinclude:: sessions/038.php
 
 Accessing session metadata
 ==========================
@@ -527,7 +527,7 @@ table that we already mentioned and then set it as your
 For example, if you would like to use 'ci_sessions' as your table name,
 you would do this:
 
-.. literalinclude:: sessions/040.php
+.. literalinclude:: sessions/039.php
 
 And then of course, create the database table ...
 
@@ -567,7 +567,7 @@ setting**. The examples below work both on MySQL and PostgreSQL::
 You can choose the Database group to use by adding a new line to the
 **app/Config/App.php** file with the name of the group to use:
 
-.. literalinclude:: sessions/041.php
+.. literalinclude:: sessions/040.php
 
 If you'd rather not do all of this by hand, you can use the ``session:migration`` command
 from the cli to generate a migration file for you::
@@ -620,7 +620,7 @@ link you to it:
 For the most common case however, a simple ``host:port`` pair should be
 sufficient:
 
-.. literalinclude:: sessions/042.php
+.. literalinclude:: sessions/041.php
 
 MemcachedHandler Driver
 =======================
@@ -647,7 +647,7 @@ considered as it may result in loss of sessions.
 The ``$sessionSavePath`` format is fairly straightforward here,
 being just a ``host:port`` pair:
 
-.. literalinclude:: sessions/043.php
+.. literalinclude:: sessions/042.php
 
 Bonus Tip
 ---------
@@ -659,4 +659,4 @@ to note that we haven't tested if that is reliable.
 If you want to experiment with this feature (on your own risk), simply
 separate the multiple server paths with commas:
 
-.. literalinclude:: sessions/044.php
+.. literalinclude:: sessions/043.php
diff --git a/user_guide_src/source/libraries/sessions/002.php b/user_guide_src/source/libraries/sessions/002.php
new file mode 100644
index 000000000000..ba2650b4808a
--- /dev/null
+++ b/user_guide_src/source/libraries/sessions/002.php
@@ -0,0 +1,3 @@
+<?php
+
+$session = session();
diff --git a/user_guide_src/source/libraries/sessions/003.php b/user_guide_src/source/libraries/sessions/003.php
index ba2650b4808a..ed979ddc0738 100644
--- a/user_guide_src/source/libraries/sessions/003.php
+++ b/user_guide_src/source/libraries/sessions/003.php
@@ -1,3 +1,3 @@
 <?php
 
-$session = session();
+session_write_close();
diff --git a/user_guide_src/source/libraries/sessions/004.php b/user_guide_src/source/libraries/sessions/004.php
index ed979ddc0738..ec1e40879798 100644
--- a/user_guide_src/source/libraries/sessions/004.php
+++ b/user_guide_src/source/libraries/sessions/004.php
@@ -1,3 +1,3 @@
 <?php
 
-session_write_close();
+$item = $_SESSION['item'];
diff --git a/user_guide_src/source/libraries/sessions/005.php b/user_guide_src/source/libraries/sessions/005.php
index ec1e40879798..3248324f7ee6 100644
--- a/user_guide_src/source/libraries/sessions/005.php
+++ b/user_guide_src/source/libraries/sessions/005.php
@@ -1,3 +1,3 @@
 <?php
 
-$item = $_SESSION['item'];
+$item = $session->get('item');
diff --git a/user_guide_src/source/libraries/sessions/006.php b/user_guide_src/source/libraries/sessions/006.php
index 3248324f7ee6..180d52833615 100644
--- a/user_guide_src/source/libraries/sessions/006.php
+++ b/user_guide_src/source/libraries/sessions/006.php
@@ -1,3 +1,3 @@
 <?php
 
-$item = $session->get('item');
+$item = $session->item;
diff --git a/user_guide_src/source/libraries/sessions/007.php b/user_guide_src/source/libraries/sessions/007.php
index 180d52833615..2825b97d5c4b 100644
--- a/user_guide_src/source/libraries/sessions/007.php
+++ b/user_guide_src/source/libraries/sessions/007.php
@@ -1,3 +1,3 @@
 <?php
 
-$item = $session->item;
+$item = session('item');
diff --git a/user_guide_src/source/libraries/sessions/008.php b/user_guide_src/source/libraries/sessions/008.php
index 2825b97d5c4b..12632835f531 100644
--- a/user_guide_src/source/libraries/sessions/008.php
+++ b/user_guide_src/source/libraries/sessions/008.php
@@ -1,3 +1,11 @@
 <?php
 
-$item = session('item');
+$name = $_SESSION['name'];
+
+// or:
+
+$name = $session->name;
+
+// or:
+
+$name = $session->get('name');
diff --git a/user_guide_src/source/libraries/sessions/009.php b/user_guide_src/source/libraries/sessions/009.php
index 12632835f531..4bbbfb2646db 100644
--- a/user_guide_src/source/libraries/sessions/009.php
+++ b/user_guide_src/source/libraries/sessions/009.php
@@ -1,11 +1,5 @@
 <?php
 
-$name = $_SESSION['name'];
-
+$userData = $_SESSION;
 // or:
-
-$name = $session->name;
-
-// or:
-
-$name = $session->get('name');
+$userData = $session->get();
diff --git a/user_guide_src/source/libraries/sessions/010.php b/user_guide_src/source/libraries/sessions/010.php
index 4bbbfb2646db..b8b949797d22 100644
--- a/user_guide_src/source/libraries/sessions/010.php
+++ b/user_guide_src/source/libraries/sessions/010.php
@@ -1,5 +1,3 @@
 <?php
 
-$userData = $_SESSION;
-// or:
-$userData = $session->get();
+$session->set($array);
diff --git a/user_guide_src/source/libraries/sessions/011.php b/user_guide_src/source/libraries/sessions/011.php
index b8b949797d22..01bbbe1670b0 100644
--- a/user_guide_src/source/libraries/sessions/011.php
+++ b/user_guide_src/source/libraries/sessions/011.php
@@ -1,3 +1,9 @@
 <?php
 
-$session->set($array);
+$newdata = [
+    'username'  => 'johndoe',
+    'email'     => 'johndoe@some-site.com',
+    'logged_in' => true,
+];
+
+$session->set($newdata);
diff --git a/user_guide_src/source/libraries/sessions/012.php b/user_guide_src/source/libraries/sessions/012.php
index 01bbbe1670b0..0d9c4699281a 100644
--- a/user_guide_src/source/libraries/sessions/012.php
+++ b/user_guide_src/source/libraries/sessions/012.php
@@ -1,9 +1,3 @@
 <?php
 
-$newdata = [
-    'username'  => 'johndoe',
-    'email'     => 'johndoe@some-site.com',
-    'logged_in' => true,
-];
-
-$session->set($newdata);
+$session->set('some_name', 'some_value');
diff --git a/user_guide_src/source/libraries/sessions/013.php b/user_guide_src/source/libraries/sessions/013.php
index 0d9c4699281a..45bce58b5e06 100644
--- a/user_guide_src/source/libraries/sessions/013.php
+++ b/user_guide_src/source/libraries/sessions/013.php
@@ -1,3 +1,7 @@
 <?php
 
-$session->set('some_name', 'some_value');
+// returns false if the 'some_name' item doesn't exist or is null,
+// true otherwise:
+if (isset($_SESSION['some_name'])) {
+    // ...
+}
diff --git a/user_guide_src/source/libraries/sessions/014.php b/user_guide_src/source/libraries/sessions/014.php
index 45bce58b5e06..5b00a839dcb8 100644
--- a/user_guide_src/source/libraries/sessions/014.php
+++ b/user_guide_src/source/libraries/sessions/014.php
@@ -1,7 +1,3 @@
 <?php
 
-// returns false if the 'some_name' item doesn't exist or is null,
-// true otherwise:
-if (isset($_SESSION['some_name'])) {
-    // ...
-}
+$session->has('some_name');
diff --git a/user_guide_src/source/libraries/sessions/015.php b/user_guide_src/source/libraries/sessions/015.php
index 5b00a839dcb8..e80a0177905a 100644
--- a/user_guide_src/source/libraries/sessions/015.php
+++ b/user_guide_src/source/libraries/sessions/015.php
@@ -1,3 +1,3 @@
 <?php
 
-$session->has('some_name');
+$session->push('hobbies', ['sport' => 'tennis']);
diff --git a/user_guide_src/source/libraries/sessions/016.php b/user_guide_src/source/libraries/sessions/016.php
index e80a0177905a..2b00df65a034 100644
--- a/user_guide_src/source/libraries/sessions/016.php
+++ b/user_guide_src/source/libraries/sessions/016.php
@@ -1,3 +1,8 @@
 <?php
 
-$session->push('hobbies', ['sport' => 'tennis']);
+unset($_SESSION['some_name']);
+// or multiple values:
+unset(
+    $_SESSION['some_name'],
+    $_SESSION['another_name']
+);
diff --git a/user_guide_src/source/libraries/sessions/017.php b/user_guide_src/source/libraries/sessions/017.php
index 2b00df65a034..7c7dbf3ca32a 100644
--- a/user_guide_src/source/libraries/sessions/017.php
+++ b/user_guide_src/source/libraries/sessions/017.php
@@ -1,8 +1,3 @@
 <?php
 
-unset($_SESSION['some_name']);
-// or multiple values:
-unset(
-    $_SESSION['some_name'],
-    $_SESSION['another_name']
-);
+$session->remove('some_name');
diff --git a/user_guide_src/source/libraries/sessions/018.php b/user_guide_src/source/libraries/sessions/018.php
index 7c7dbf3ca32a..2ebd4f8a4e5f 100644
--- a/user_guide_src/source/libraries/sessions/018.php
+++ b/user_guide_src/source/libraries/sessions/018.php
@@ -1,3 +1,4 @@
 <?php
 
-$session->remove('some_name');
+$array_items = ['username', 'email'];
+$session->remove($array_items);
diff --git a/user_guide_src/source/libraries/sessions/019.php b/user_guide_src/source/libraries/sessions/019.php
index 2ebd4f8a4e5f..471c5c5fef96 100644
--- a/user_guide_src/source/libraries/sessions/019.php
+++ b/user_guide_src/source/libraries/sessions/019.php
@@ -1,4 +1,3 @@
 <?php
 
-$array_items = ['username', 'email'];
-$session->remove($array_items);
+$session->markAsFlashdata('item');
diff --git a/user_guide_src/source/libraries/sessions/020.php b/user_guide_src/source/libraries/sessions/020.php
index 471c5c5fef96..4be42e7f3a62 100644
--- a/user_guide_src/source/libraries/sessions/020.php
+++ b/user_guide_src/source/libraries/sessions/020.php
@@ -1,3 +1,3 @@
 <?php
 
-$session->markAsFlashdata('item');
+$session->markAsFlashdata(['item', 'item2']);
diff --git a/user_guide_src/source/libraries/sessions/021.php b/user_guide_src/source/libraries/sessions/021.php
index 4be42e7f3a62..d87dd8763d34 100644
--- a/user_guide_src/source/libraries/sessions/021.php
+++ b/user_guide_src/source/libraries/sessions/021.php
@@ -1,3 +1,4 @@
 <?php
 
-$session->markAsFlashdata(['item', 'item2']);
+$_SESSION['item'] = 'value';
+$session->markAsFlashdata('item');
diff --git a/user_guide_src/source/libraries/sessions/022.php b/user_guide_src/source/libraries/sessions/022.php
index d87dd8763d34..f22af522ab61 100644
--- a/user_guide_src/source/libraries/sessions/022.php
+++ b/user_guide_src/source/libraries/sessions/022.php
@@ -1,4 +1,3 @@
 <?php
 
-$_SESSION['item'] = 'value';
-$session->markAsFlashdata('item');
+$session->setFlashdata('item', 'value');
diff --git a/user_guide_src/source/libraries/sessions/023.php b/user_guide_src/source/libraries/sessions/023.php
index f22af522ab61..ec1e40879798 100644
--- a/user_guide_src/source/libraries/sessions/023.php
+++ b/user_guide_src/source/libraries/sessions/023.php
@@ -1,3 +1,3 @@
 <?php
 
-$session->setFlashdata('item', 'value');
+$item = $_SESSION['item'];
diff --git a/user_guide_src/source/libraries/sessions/024.php b/user_guide_src/source/libraries/sessions/024.php
index ec1e40879798..407208d20b4a 100644
--- a/user_guide_src/source/libraries/sessions/024.php
+++ b/user_guide_src/source/libraries/sessions/024.php
@@ -1,3 +1,3 @@
 <?php
 
-$item = $_SESSION['item'];
+$session->getFlashdata('item');
diff --git a/user_guide_src/source/libraries/sessions/025.php b/user_guide_src/source/libraries/sessions/025.php
index 407208d20b4a..7c387b5a4fa2 100644
--- a/user_guide_src/source/libraries/sessions/025.php
+++ b/user_guide_src/source/libraries/sessions/025.php
@@ -1,3 +1,3 @@
 <?php
 
-$session->getFlashdata('item');
+$session->getFlashdata();
diff --git a/user_guide_src/source/libraries/sessions/026.php b/user_guide_src/source/libraries/sessions/026.php
index 7c387b5a4fa2..94a299006a5d 100644
--- a/user_guide_src/source/libraries/sessions/026.php
+++ b/user_guide_src/source/libraries/sessions/026.php
@@ -1,3 +1,4 @@
 <?php
 
-$session->getFlashdata();
+$session->keepFlashdata('item');
+$session->keepFlashdata(['item1', 'item2', 'item3']);
diff --git a/user_guide_src/source/libraries/sessions/027.php b/user_guide_src/source/libraries/sessions/027.php
index 94a299006a5d..d2ed461826c0 100644
--- a/user_guide_src/source/libraries/sessions/027.php
+++ b/user_guide_src/source/libraries/sessions/027.php
@@ -1,4 +1,4 @@
 <?php
 
-$session->keepFlashdata('item');
-$session->keepFlashdata(['item1', 'item2', 'item3']);
+// 'item' will be erased after 300 seconds
+$session->markAsTempdata('item', 300);
diff --git a/user_guide_src/source/libraries/sessions/028.php b/user_guide_src/source/libraries/sessions/028.php
index d2ed461826c0..fd8d241ad069 100644
--- a/user_guide_src/source/libraries/sessions/028.php
+++ b/user_guide_src/source/libraries/sessions/028.php
@@ -1,4 +1,11 @@
 <?php
 
-// 'item' will be erased after 300 seconds
-$session->markAsTempdata('item', 300);
+// Both 'item' and 'item2' will expire after 300 seconds
+$session->markAsTempdata(['item', 'item2'], 300);
+
+// 'item' will be erased after 300 seconds, while 'item2'
+// will do so after only 240 seconds
+$session->markAsTempdata([
+    'item'  => 300,
+    'item2' => 240,
+]);
diff --git a/user_guide_src/source/libraries/sessions/029.php b/user_guide_src/source/libraries/sessions/029.php
index fd8d241ad069..d4e8941b5d34 100644
--- a/user_guide_src/source/libraries/sessions/029.php
+++ b/user_guide_src/source/libraries/sessions/029.php
@@ -1,11 +1,4 @@
 <?php
 
-// Both 'item' and 'item2' will expire after 300 seconds
-$session->markAsTempdata(['item', 'item2'], 300);
-
-// 'item' will be erased after 300 seconds, while 'item2'
-// will do so after only 240 seconds
-$session->markAsTempdata([
-    'item'  => 300,
-    'item2' => 240,
-]);
+$_SESSION['item'] = 'value';
+$session->markAsTempdata('item', 300); // Expire in 5 minutes
diff --git a/user_guide_src/source/libraries/sessions/030.php b/user_guide_src/source/libraries/sessions/030.php
index d4e8941b5d34..444c045adae9 100644
--- a/user_guide_src/source/libraries/sessions/030.php
+++ b/user_guide_src/source/libraries/sessions/030.php
@@ -1,4 +1,3 @@
 <?php
 
-$_SESSION['item'] = 'value';
-$session->markAsTempdata('item', 300); // Expire in 5 minutes
+$session->setTempdata('item', 'value', 300);
diff --git a/user_guide_src/source/libraries/sessions/031.php b/user_guide_src/source/libraries/sessions/031.php
index 444c045adae9..f7099d76289a 100644
--- a/user_guide_src/source/libraries/sessions/031.php
+++ b/user_guide_src/source/libraries/sessions/031.php
@@ -1,3 +1,4 @@
 <?php
 
-$session->setTempdata('item', 'value', 300);
+$tempdata = ['newuser' => true, 'message' => 'Thanks for joining!'];
+$session->setTempdata($tempdata, null, $expire);
diff --git a/user_guide_src/source/libraries/sessions/032.php b/user_guide_src/source/libraries/sessions/032.php
index f7099d76289a..ec1e40879798 100644
--- a/user_guide_src/source/libraries/sessions/032.php
+++ b/user_guide_src/source/libraries/sessions/032.php
@@ -1,4 +1,3 @@
 <?php
 
-$tempdata = ['newuser' => true, 'message' => 'Thanks for joining!'];
-$session->setTempdata($tempdata, null, $expire);
+$item = $_SESSION['item'];
diff --git a/user_guide_src/source/libraries/sessions/033.php b/user_guide_src/source/libraries/sessions/033.php
index ec1e40879798..e940ed0e6a02 100644
--- a/user_guide_src/source/libraries/sessions/033.php
+++ b/user_guide_src/source/libraries/sessions/033.php
@@ -1,3 +1,3 @@
 <?php
 
-$item = $_SESSION['item'];
+$session->getTempdata('item');
diff --git a/user_guide_src/source/libraries/sessions/034.php b/user_guide_src/source/libraries/sessions/034.php
index e940ed0e6a02..f44b959eee81 100644
--- a/user_guide_src/source/libraries/sessions/034.php
+++ b/user_guide_src/source/libraries/sessions/034.php
@@ -1,3 +1,3 @@
 <?php
 
-$session->getTempdata('item');
+$session->getTempdata();
diff --git a/user_guide_src/source/libraries/sessions/035.php b/user_guide_src/source/libraries/sessions/035.php
index f44b959eee81..f063fa2907f4 100644
--- a/user_guide_src/source/libraries/sessions/035.php
+++ b/user_guide_src/source/libraries/sessions/035.php
@@ -1,3 +1,3 @@
 <?php
 
-$session->getTempdata();
+unset($_SESSION['item']);
diff --git a/user_guide_src/source/libraries/sessions/036.php b/user_guide_src/source/libraries/sessions/036.php
index f063fa2907f4..0c3302fb6db3 100644
--- a/user_guide_src/source/libraries/sessions/036.php
+++ b/user_guide_src/source/libraries/sessions/036.php
@@ -1,3 +1,3 @@
 <?php
 
-unset($_SESSION['item']);
+$session->removeTempdata('item');
diff --git a/user_guide_src/source/libraries/sessions/037.php b/user_guide_src/source/libraries/sessions/037.php
index 0c3302fb6db3..1e7931f34f33 100644
--- a/user_guide_src/source/libraries/sessions/037.php
+++ b/user_guide_src/source/libraries/sessions/037.php
@@ -1,3 +1,5 @@
 <?php
 
-$session->removeTempdata('item');
+session_destroy();
+// or
+$session->destroy();
diff --git a/user_guide_src/source/libraries/sessions/038.php b/user_guide_src/source/libraries/sessions/038.php
index 1e7931f34f33..7b43795e71e4 100644
--- a/user_guide_src/source/libraries/sessions/038.php
+++ b/user_guide_src/source/libraries/sessions/038.php
@@ -1,5 +1,3 @@
 <?php
 
-session_destroy();
-// or
-$session->destroy();
+$session->stop();
diff --git a/user_guide_src/source/libraries/sessions/039.php b/user_guide_src/source/libraries/sessions/039.php
index 7b43795e71e4..3aedc2f047af 100644
--- a/user_guide_src/source/libraries/sessions/039.php
+++ b/user_guide_src/source/libraries/sessions/039.php
@@ -1,3 +1,12 @@
 <?php
 
-$session->stop();
+namespace Config;
+
+use CodeIgniter\Config\BaseConfig;
+
+class App extends BaseConfig
+{
+    public $sessionDriver   = 'CodeIgniter\Session\Handlers\DatabaseHandler';
+    public $sessionSavePath = 'ci_sessions';
+    // ...
+}
diff --git a/user_guide_src/source/libraries/sessions/040.php b/user_guide_src/source/libraries/sessions/040.php
index 3aedc2f047af..f645887ec2be 100644
--- a/user_guide_src/source/libraries/sessions/040.php
+++ b/user_guide_src/source/libraries/sessions/040.php
@@ -6,7 +6,6 @@
 
 class App extends BaseConfig
 {
-    public $sessionDriver   = 'CodeIgniter\Session\Handlers\DatabaseHandler';
-    public $sessionSavePath = 'ci_sessions';
+    public $sessionDBGroup = 'groupName';
     // ...
 }
diff --git a/user_guide_src/source/libraries/sessions/041.php b/user_guide_src/source/libraries/sessions/041.php
index f645887ec2be..f0aed919a816 100644
--- a/user_guide_src/source/libraries/sessions/041.php
+++ b/user_guide_src/source/libraries/sessions/041.php
@@ -6,6 +6,7 @@
 
 class App extends BaseConfig
 {
-    public $sessionDBGroup = 'groupName';
+    public $sessionDiver    = 'CodeIgniter\Session\Handlers\RedisHandler';
+    public $sessionSavePath = 'tcp://localhost:6379';
     // ...
 }
diff --git a/user_guide_src/source/libraries/sessions/042.php b/user_guide_src/source/libraries/sessions/042.php
index f0aed919a816..cad56413151c 100644
--- a/user_guide_src/source/libraries/sessions/042.php
+++ b/user_guide_src/source/libraries/sessions/042.php
@@ -6,7 +6,7 @@
 
 class App extends BaseConfig
 {
-    public $sessionDiver    = 'CodeIgniter\Session\Handlers\RedisHandler';
-    public $sessionSavePath = 'tcp://localhost:6379';
+    public $sessionDriver   = 'CodeIgniter\Session\Handlers\MemcachedHandler';
+    public $sessionSavePath = 'localhost:11211';
     // ...
 }
diff --git a/user_guide_src/source/libraries/sessions/043.php b/user_guide_src/source/libraries/sessions/043.php
index cad56413151c..e5fab8602236 100644
--- a/user_guide_src/source/libraries/sessions/043.php
+++ b/user_guide_src/source/libraries/sessions/043.php
@@ -6,7 +6,9 @@
 
 class App extends BaseConfig
 {
-    public $sessionDriver   = 'CodeIgniter\Session\Handlers\MemcachedHandler';
-    public $sessionSavePath = 'localhost:11211';
+    // localhost will be given higher priority (5) here,
+    // compared to 192.0.2.1 with a weight of 1.
+    public $sessionSavePath = 'localhost:11211:5,192.0.2.1:11211:1';
+
     // ...
 }
diff --git a/user_guide_src/source/libraries/sessions/044.php b/user_guide_src/source/libraries/sessions/044.php
deleted file mode 100644
index e5fab8602236..000000000000
--- a/user_guide_src/source/libraries/sessions/044.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Config;
-
-use CodeIgniter\Config\BaseConfig;
-
-class App extends BaseConfig
-{
-    // localhost will be given higher priority (5) here,
-    // compared to 192.0.2.1 with a weight of 1.
-    public $sessionSavePath = 'localhost:11211:5,192.0.2.1:11211:1';
-
-    // ...
-}
diff --git a/user_guide_src/source/libraries/uploaded_files.rst b/user_guide_src/source/libraries/uploaded_files.rst
index b1a19d3e202c..7e905d5fd7ca 100644
--- a/user_guide_src/source/libraries/uploaded_files.rst
+++ b/user_guide_src/source/libraries/uploaded_files.rst
@@ -176,7 +176,7 @@ With the simplest usage, a single file might be submitted like::
 
 Which would return a simple file instance like:
 
-.. literalinclude:: uploaded_files/007.php
+.. literalinclude:: uploaded_files/004.php
 
 Array notation
 --------------
@@ -187,7 +187,7 @@ If you used an array notation for the name, the input would look something like:
 
 For get the file instance:
 
-.. literalinclude:: uploaded_files/008.php
+.. literalinclude:: uploaded_files/005.php
 
 Multiple files
 ==============
@@ -198,7 +198,7 @@ Multiple files
 
 In controller:
 
-.. literalinclude:: uploaded_files/009.php
+.. literalinclude:: uploaded_files/006.php
 
 where the ``images`` is a loop from the form field name.
 
@@ -206,11 +206,11 @@ If there are multiple files with the same name you can use ``getFile()`` to retr
 
 In controller:
 
-.. literalinclude:: uploaded_files/010.php
+.. literalinclude:: uploaded_files/007.php
 
 You might find it easier to use ``getFileMultiple()``, to get an array of uploaded files with the same name:
 
-.. literalinclude:: uploaded_files/011.php
+.. literalinclude:: uploaded_files/008.php
 
 Another example::
 
@@ -219,7 +219,7 @@ Another example::
 
 In controller:
 
-.. literalinclude:: uploaded_files/012.php
+.. literalinclude:: uploaded_files/009.php
 
 .. note:: Using ``getFiles()`` is more appropriate.
 
@@ -237,7 +237,7 @@ Verify a File
 
 You can check that a file was actually uploaded via HTTP with no errors by calling the ``isValid()`` method:
 
-.. literalinclude:: uploaded_files/013.php
+.. literalinclude:: uploaded_files/010.php
 
 As seen in this example, if a file had an upload error, you can retrieve the error code (an integer) and the error
 message with the ``getError()`` and ``getErrorString()`` methods. The following errors can be discovered through
@@ -260,19 +260,19 @@ You can retrieve the original filename provided by the client with the ``getName
 filename sent by the client, and should not be trusted. If the file has been moved, this will return the final name of
 the moved file:
 
-.. literalinclude:: uploaded_files/014.php
+.. literalinclude:: uploaded_files/011.php
 
 **getClientName()**
 
 Always returns the original name of the uploaded file as sent by the client, even if the file has been moved:
 
-.. literalinclude:: uploaded_files/015.php
+.. literalinclude:: uploaded_files/012.php
 
 **getTempName()**
 
 To get the full path of the temp file that was created during the upload, you can use the ``getTempName()`` method:
 
-.. literalinclude:: uploaded_files/016.php
+.. literalinclude:: uploaded_files/013.php
 
 Other File Info
 ===============
@@ -281,7 +281,7 @@ Other File Info
 
 Returns the original file extension, based on the file name that was uploaded:
 
-.. literalinclude:: uploaded_files/017.php
+.. literalinclude:: uploaded_files/014.php
 
 .. warning:: This is NOT a trusted source. For a trusted version, use ``guessExtension()`` instead.
 
@@ -290,7 +290,7 @@ Returns the original file extension, based on the file name that was uploaded:
 Returns the mime type (mime type) of the file as provided by the client. This is NOT a trusted value. For a trusted
 version, use ``getMimeType()`` instead:
 
-.. literalinclude:: uploaded_files/018.php
+.. literalinclude:: uploaded_files/015.php
 
 Moving Files
 ============
@@ -298,16 +298,16 @@ Moving Files
 Each file can be moved to its new location with the aptly named ``move()`` method. This takes the directory to move
 the file to as the first parameter:
 
-.. literalinclude:: uploaded_files/019.php
+.. literalinclude:: uploaded_files/016.php
 
 By default, the original filename was used. You can specify a new filename by passing it as the second parameter:
 
-.. literalinclude:: uploaded_files/020.php
+.. literalinclude:: uploaded_files/017.php
 
 Once the file has been removed the temporary file is deleted. You can check if a file has been moved already with
 the ``hasMoved()`` method, which returns a boolean:
 
-.. literalinclude:: uploaded_files/021.php
+.. literalinclude:: uploaded_files/018.php
 
 Moving an uploaded file can fail, with an HTTPException, under several circumstances:
 
@@ -327,12 +327,12 @@ With the simplest usage, a single file might be submitted like::
 By default, upload files are saved in **writable/uploads** directory. The **YYYYMMDD** folder
 and random file name will be created. Returns a file path:
 
-.. literalinclude:: uploaded_files/022.php
+.. literalinclude:: uploaded_files/019.php
 
 You can specify a directory to move the file to as the first parameter. A new filename by
 passing it as the second parameter:
 
-.. literalinclude:: uploaded_files/023.php
+.. literalinclude:: uploaded_files/020.php
 
 Moving an uploaded file can fail, with an ``HTTPException``, under several circumstances:
 
diff --git a/user_guide_src/source/libraries/uploaded_files/004.php b/user_guide_src/source/libraries/uploaded_files/004.php
new file mode 100644
index 000000000000..e5f6440d96fb
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/004.php
@@ -0,0 +1,3 @@
+<?php
+
+$file = $this->request->getFile('userfile');
diff --git a/user_guide_src/source/libraries/uploaded_files/005.php b/user_guide_src/source/libraries/uploaded_files/005.php
new file mode 100644
index 000000000000..ad71bd5575fb
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/005.php
@@ -0,0 +1,3 @@
+<?php
+
+$file = $this->request->getFile('my-form.details.avatar');
diff --git a/user_guide_src/source/libraries/uploaded_files/006.php b/user_guide_src/source/libraries/uploaded_files/006.php
new file mode 100644
index 000000000000..f0be5ba1aafb
--- /dev/null
+++ b/user_guide_src/source/libraries/uploaded_files/006.php
@@ -0,0 +1,10 @@
+<?php
+
+if ($imagefile = $this->request->getFiles()) {
+    foreach ($imagefile['images'] as $img) {
+        if ($img->isValid() && ! $img->hasMoved()) {
+            $newName = $img->getRandomName();
+            $img->move(WRITEPATH . 'uploads', $newName);
+        }
+    }
+}
diff --git a/user_guide_src/source/libraries/uploaded_files/007.php b/user_guide_src/source/libraries/uploaded_files/007.php
index e5f6440d96fb..da51d17dbd15 100644
--- a/user_guide_src/source/libraries/uploaded_files/007.php
+++ b/user_guide_src/source/libraries/uploaded_files/007.php
@@ -1,3 +1,4 @@
 <?php
 
-$file = $this->request->getFile('userfile');
+$file1 = $this->request->getFile('images.0');
+$file2 = $this->request->getFile('images.1');
diff --git a/user_guide_src/source/libraries/uploaded_files/008.php b/user_guide_src/source/libraries/uploaded_files/008.php
index ad71bd5575fb..646e6bb0b8b9 100644
--- a/user_guide_src/source/libraries/uploaded_files/008.php
+++ b/user_guide_src/source/libraries/uploaded_files/008.php
@@ -1,3 +1,3 @@
 <?php
 
-$file = $this->request->getFile('my-form.details.avatar');
+$files = $this->request->getFileMultiple('images');
diff --git a/user_guide_src/source/libraries/uploaded_files/009.php b/user_guide_src/source/libraries/uploaded_files/009.php
index f0be5ba1aafb..d18a755ba234 100644
--- a/user_guide_src/source/libraries/uploaded_files/009.php
+++ b/user_guide_src/source/libraries/uploaded_files/009.php
@@ -1,10 +1,4 @@
 <?php
 
-if ($imagefile = $this->request->getFiles()) {
-    foreach ($imagefile['images'] as $img) {
-        if ($img->isValid() && ! $img->hasMoved()) {
-            $newName = $img->getRandomName();
-            $img->move(WRITEPATH . 'uploads', $newName);
-        }
-    }
-}
+$file1 = $this->request->getFile('my-form.details.avatars.0');
+$file2 = $this->request->getFile('my-form.details.avatars.1');
diff --git a/user_guide_src/source/libraries/uploaded_files/010.php b/user_guide_src/source/libraries/uploaded_files/010.php
index da51d17dbd15..094ea73c1064 100644
--- a/user_guide_src/source/libraries/uploaded_files/010.php
+++ b/user_guide_src/source/libraries/uploaded_files/010.php
@@ -1,4 +1,5 @@
 <?php
 
-$file1 = $this->request->getFile('images.0');
-$file2 = $this->request->getFile('images.1');
+if (! $file->isValid()) {
+    throw new \RuntimeException($file->getErrorString() . '(' . $file->getError() . ')');
+}
diff --git a/user_guide_src/source/libraries/uploaded_files/011.php b/user_guide_src/source/libraries/uploaded_files/011.php
index 646e6bb0b8b9..057a56b3e9a0 100644
--- a/user_guide_src/source/libraries/uploaded_files/011.php
+++ b/user_guide_src/source/libraries/uploaded_files/011.php
@@ -1,3 +1,3 @@
 <?php
 
-$files = $this->request->getFileMultiple('images');
+$name = $file->getName();
diff --git a/user_guide_src/source/libraries/uploaded_files/012.php b/user_guide_src/source/libraries/uploaded_files/012.php
index d18a755ba234..4fb0cae0ad12 100644
--- a/user_guide_src/source/libraries/uploaded_files/012.php
+++ b/user_guide_src/source/libraries/uploaded_files/012.php
@@ -1,4 +1,3 @@
 <?php
 
-$file1 = $this->request->getFile('my-form.details.avatars.0');
-$file2 = $this->request->getFile('my-form.details.avatars.1');
+$originalName = $file->getClientName();
diff --git a/user_guide_src/source/libraries/uploaded_files/013.php b/user_guide_src/source/libraries/uploaded_files/013.php
index 094ea73c1064..c9e4774a4bbf 100644
--- a/user_guide_src/source/libraries/uploaded_files/013.php
+++ b/user_guide_src/source/libraries/uploaded_files/013.php
@@ -1,5 +1,3 @@
 <?php
 
-if (! $file->isValid()) {
-    throw new \RuntimeException($file->getErrorString() . '(' . $file->getError() . ')');
-}
+$tempfile = $file->getTempName();
diff --git a/user_guide_src/source/libraries/uploaded_files/014.php b/user_guide_src/source/libraries/uploaded_files/014.php
index 057a56b3e9a0..867877238c76 100644
--- a/user_guide_src/source/libraries/uploaded_files/014.php
+++ b/user_guide_src/source/libraries/uploaded_files/014.php
@@ -1,3 +1,3 @@
 <?php
 
-$name = $file->getName();
+$ext = $file->getClientExtension();
diff --git a/user_guide_src/source/libraries/uploaded_files/015.php b/user_guide_src/source/libraries/uploaded_files/015.php
index 4fb0cae0ad12..dd1288e441c3 100644
--- a/user_guide_src/source/libraries/uploaded_files/015.php
+++ b/user_guide_src/source/libraries/uploaded_files/015.php
@@ -1,3 +1,5 @@
 <?php
 
-$originalName = $file->getClientName();
+$type = $file->getClientMimeType();
+
+echo $type; // image/png
diff --git a/user_guide_src/source/libraries/uploaded_files/016.php b/user_guide_src/source/libraries/uploaded_files/016.php
index c9e4774a4bbf..12499a3ca1ba 100644
--- a/user_guide_src/source/libraries/uploaded_files/016.php
+++ b/user_guide_src/source/libraries/uploaded_files/016.php
@@ -1,3 +1,3 @@
 <?php
 
-$tempfile = $file->getTempName();
+$file->move(WRITEPATH . 'uploads');
diff --git a/user_guide_src/source/libraries/uploaded_files/017.php b/user_guide_src/source/libraries/uploaded_files/017.php
index 867877238c76..2e6b39645a4b 100644
--- a/user_guide_src/source/libraries/uploaded_files/017.php
+++ b/user_guide_src/source/libraries/uploaded_files/017.php
@@ -1,3 +1,4 @@
 <?php
 
-$ext = $file->getClientExtension();
+$newName = $file->getRandomName();
+$file->move(WRITEPATH . 'uploads', $newName);
diff --git a/user_guide_src/source/libraries/uploaded_files/018.php b/user_guide_src/source/libraries/uploaded_files/018.php
index dd1288e441c3..7f49d1f5232e 100644
--- a/user_guide_src/source/libraries/uploaded_files/018.php
+++ b/user_guide_src/source/libraries/uploaded_files/018.php
@@ -1,5 +1,5 @@
 <?php
 
-$type = $file->getClientMimeType();
-
-echo $type; // image/png
+if ($file->isValid() && ! $file->hasMoved()) {
+    $file->move($path);
+}
diff --git a/user_guide_src/source/libraries/uploaded_files/019.php b/user_guide_src/source/libraries/uploaded_files/019.php
index 12499a3ca1ba..90f9495eaf7b 100644
--- a/user_guide_src/source/libraries/uploaded_files/019.php
+++ b/user_guide_src/source/libraries/uploaded_files/019.php
@@ -1,3 +1,3 @@
 <?php
 
-$file->move(WRITEPATH . 'uploads');
+$path = $this->request->getFile('userfile')->store();
diff --git a/user_guide_src/source/libraries/uploaded_files/020.php b/user_guide_src/source/libraries/uploaded_files/020.php
index 2e6b39645a4b..0e552f417d52 100644
--- a/user_guide_src/source/libraries/uploaded_files/020.php
+++ b/user_guide_src/source/libraries/uploaded_files/020.php
@@ -1,4 +1,3 @@
 <?php
 
-$newName = $file->getRandomName();
-$file->move(WRITEPATH . 'uploads', $newName);
+$path = $this->request->getFile('userfile')->store('head_img/', 'user_name.jpg');
diff --git a/user_guide_src/source/libraries/uploaded_files/021.php b/user_guide_src/source/libraries/uploaded_files/021.php
deleted file mode 100644
index 7f49d1f5232e..000000000000
--- a/user_guide_src/source/libraries/uploaded_files/021.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-if ($file->isValid() && ! $file->hasMoved()) {
-    $file->move($path);
-}
diff --git a/user_guide_src/source/libraries/uploaded_files/022.php b/user_guide_src/source/libraries/uploaded_files/022.php
deleted file mode 100644
index 90f9495eaf7b..000000000000
--- a/user_guide_src/source/libraries/uploaded_files/022.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$path = $this->request->getFile('userfile')->store();
diff --git a/user_guide_src/source/libraries/uploaded_files/023.php b/user_guide_src/source/libraries/uploaded_files/023.php
deleted file mode 100644
index 0e552f417d52..000000000000
--- a/user_guide_src/source/libraries/uploaded_files/023.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$path = $this->request->getFile('userfile')->store('head_img/', 'user_name.jpg');
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 1d2c8490d339..8d3204804e92 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -484,7 +484,7 @@ You can check to see if an error exists with the ``hasError()`` method. The only
 
 When specifying a field with a wildcard, all errors matching the mask will be checked:
 
-.. literalinclude:: validation/028.2.php
+.. literalinclude:: validation/029.php
 
 Customizing Error Display
 *************************
@@ -500,12 +500,12 @@ The first step is to create custom views. These can be placed anywhere that the
 which means the standard View directory, or any namespaced View folder will work. For example, you could create
 a new view at **/app/Views/_errors_list.php**:
 
-.. literalinclude:: validation/029.php
+.. literalinclude:: validation/030.php
 
 An array named ``$errors`` is available within the view that contains a list of the errors, where the key is
 the name of the field that had the error, and the value is the error message, like this:
 
-.. literalinclude:: validation/030.php
+.. literalinclude:: validation/031.php
 
 There are actually two types of views that you can create. The first has an array of all of the errors, and is what
 we just looked at. The other type is simpler, and only contains a single variable, ``$error`` that contains the
@@ -520,7 +520,7 @@ Once you have your views created, you need to let the Validation library know ab
 Inside, you'll find the ``$templates`` property where you can list as many custom views as you want, and provide an
 short alias they can be referenced by. If we were to add our example file from above, it would look something like:
 
-.. literalinclude:: validation/031.php
+.. literalinclude:: validation/032.php
 
 Specifying the Template
 =======================
@@ -541,7 +541,7 @@ Rules are stored within simple, namespaced classes. They can be stored any locat
 autoloader can find it. These files are called RuleSets. To add a new RuleSet, edit **Config/Validation.php** and
 add the new file to the ``$ruleSets`` array:
 
-.. literalinclude:: validation/032.php
+.. literalinclude:: validation/033.php
 
 You can add it as either a simple string with the fully qualified class name, or using the ``::class`` suffix as
 shown above. The primary benefit here is that it provides some extra navigation capabilities in more advanced IDEs.
@@ -549,17 +549,17 @@ shown above. The primary benefit here is that it provides some extra navigation
 Within the file itself, each method is a rule and must accept a string as the first parameter, and must return
 a boolean true or false value signifying true if it passed the test or false if it did not:
 
-.. literalinclude:: validation/033.php
+.. literalinclude:: validation/034.php
 
 By default, the system will look within ``CodeIgniter\Language\en\Validation.php`` for the language strings used
 within errors. In custom rules, you may provide error messages by accepting a ``$error`` variable by reference in the
 second parameter:
 
-.. literalinclude:: validation/034.php
+.. literalinclude:: validation/035.php
 
 Your new custom rule could now be used just like any other rule:
 
-.. literalinclude:: validation/035.php
+.. literalinclude:: validation/036.php
 
 Allowing Parameters
 ===================
@@ -568,7 +568,7 @@ If your method needs to work with parameters, the function will need a minimum o
 the parameter string, and an array with all of the data that was submitted the form. The ``$data`` array is especially handy
 for rules like ``require_with`` that needs to check the value of another submitted field to base its result on:
 
-.. literalinclude:: validation/036.php
+.. literalinclude:: validation/037.php
 
 Custom errors can be returned as the fourth parameter, just as described above.
 
@@ -580,7 +580,7 @@ The following is a list of all the native rules that are available to use:
 .. note:: Rule is a string; there must be **no spaces** between the parameters, especially the ``is_unique`` rule.
     There can be no spaces before and after ``ignore_value``.
 
-.. literalinclude:: validation/037.php
+.. literalinclude:: validation/038.php
 
 ======================= ========== ============================================= ===================================================
 Rule                    Parameter  Description                                   Example
diff --git a/user_guide_src/source/libraries/validation/028.2.php b/user_guide_src/source/libraries/validation/028.2.php
deleted file mode 100644
index 5470a1eecea6..000000000000
--- a/user_guide_src/source/libraries/validation/028.2.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/*
- * For errors:
- * [
- *     'foo.0.bar'   => 'Error',
- *     'foo.baz.bar' => 'Error',
- * ]
- */
-
-// returns true
-$validation->hasError('foo.*.bar');
diff --git a/user_guide_src/source/libraries/validation/029.php b/user_guide_src/source/libraries/validation/029.php
index f7c69eb42e99..5470a1eecea6 100644
--- a/user_guide_src/source/libraries/validation/029.php
+++ b/user_guide_src/source/libraries/validation/029.php
@@ -1,7 +1,12 @@
-<div class="alert alert-danger" role="alert">
-    <ul>
-    <?php foreach ($errors as $error): ?>
-        <li><?= esc($error) ?></li>
-    <?php endforeach ?>
-    </ul>
-</div>
+<?php
+
+/*
+ * For errors:
+ * [
+ *     'foo.0.bar'   => 'Error',
+ *     'foo.baz.bar' => 'Error',
+ * ]
+ */
+
+// returns true
+$validation->hasError('foo.*.bar');
diff --git a/user_guide_src/source/libraries/validation/030.php b/user_guide_src/source/libraries/validation/030.php
index abac67b15dec..f7c69eb42e99 100644
--- a/user_guide_src/source/libraries/validation/030.php
+++ b/user_guide_src/source/libraries/validation/030.php
@@ -1,6 +1,7 @@
-<?php
-
-$errors = [
-    'username' => 'The username field must be unique.',
-    'email'    => 'You must provide a valid email address.',
-];
+<div class="alert alert-danger" role="alert">
+    <ul>
+    <?php foreach ($errors as $error): ?>
+        <li><?= esc($error) ?></li>
+    <?php endforeach ?>
+    </ul>
+</div>
diff --git a/user_guide_src/source/libraries/validation/031.php b/user_guide_src/source/libraries/validation/031.php
index acec3cfc6ba2..abac67b15dec 100644
--- a/user_guide_src/source/libraries/validation/031.php
+++ b/user_guide_src/source/libraries/validation/031.php
@@ -1,14 +1,6 @@
 <?php
 
-namespace Config;
-
-class Validation
-{
-    public $templates = [
-        'list'    => 'CodeIgniter\Validation\Views\list',
-        'single'  => 'CodeIgniter\Validation\Views\single',
-        'my_list' => '_errors_list',
-    ];
-
-    // ...
-}
+$errors = [
+    'username' => 'The username field must be unique.',
+    'email'    => 'You must provide a valid email address.',
+];
diff --git a/user_guide_src/source/libraries/validation/032.php b/user_guide_src/source/libraries/validation/032.php
index 890b4c453fc0..acec3cfc6ba2 100644
--- a/user_guide_src/source/libraries/validation/032.php
+++ b/user_guide_src/source/libraries/validation/032.php
@@ -2,18 +2,12 @@
 
 namespace Config;
 
-use CodeIgniter\Validation\CreditCardRules;
-use CodeIgniter\Validation\FileRules;
-use CodeIgniter\Validation\FormatRules;
-use CodeIgniter\Validation\Rules;
-
 class Validation
 {
-    public $ruleSets = [
-        Rules::class,
-        FormatRules::class,
-        FileRules::class,
-        CreditCardRules::class,
+    public $templates = [
+        'list'    => 'CodeIgniter\Validation\Views\list',
+        'single'  => 'CodeIgniter\Validation\Views\single',
+        'my_list' => '_errors_list',
     ];
 
     // ...
diff --git a/user_guide_src/source/libraries/validation/033.php b/user_guide_src/source/libraries/validation/033.php
index 282bef9aabbc..890b4c453fc0 100644
--- a/user_guide_src/source/libraries/validation/033.php
+++ b/user_guide_src/source/libraries/validation/033.php
@@ -1,9 +1,20 @@
 <?php
 
-class MyRules
+namespace Config;
+
+use CodeIgniter\Validation\CreditCardRules;
+use CodeIgniter\Validation\FileRules;
+use CodeIgniter\Validation\FormatRules;
+use CodeIgniter\Validation\Rules;
+
+class Validation
 {
-    public function even(string $str): bool
-    {
-        return (int) $str % 2 === 0;
-    }
+    public $ruleSets = [
+        Rules::class,
+        FormatRules::class,
+        FileRules::class,
+        CreditCardRules::class,
+    ];
+
+    // ...
 }
diff --git a/user_guide_src/source/libraries/validation/034.php b/user_guide_src/source/libraries/validation/034.php
index 843b623ba98c..282bef9aabbc 100644
--- a/user_guide_src/source/libraries/validation/034.php
+++ b/user_guide_src/source/libraries/validation/034.php
@@ -2,14 +2,8 @@
 
 class MyRules
 {
-    public function even(string $str, ?string &$error = null): bool
+    public function even(string $str): bool
     {
-        if ((int) $str % 2 !== 0) {
-            $error = lang('myerrors.evenError');
-
-            return false;
-        }
-
-        return true;
+        return (int) $str % 2 === 0;
     }
 }
diff --git a/user_guide_src/source/libraries/validation/035.php b/user_guide_src/source/libraries/validation/035.php
index 99db5f30eae4..843b623ba98c 100644
--- a/user_guide_src/source/libraries/validation/035.php
+++ b/user_guide_src/source/libraries/validation/035.php
@@ -1,5 +1,15 @@
 <?php
 
-$this->validate($request, [
-    'foo' => 'required|even',
-]);
+class MyRules
+{
+    public function even(string $str, ?string &$error = null): bool
+    {
+        if ((int) $str % 2 !== 0) {
+            $error = lang('myerrors.evenError');
+
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/user_guide_src/source/libraries/validation/036.php b/user_guide_src/source/libraries/validation/036.php
index 9e13c663b0d7..99db5f30eae4 100644
--- a/user_guide_src/source/libraries/validation/036.php
+++ b/user_guide_src/source/libraries/validation/036.php
@@ -1,35 +1,5 @@
 <?php
 
-class MyRules
-{
-    public function required_with($str, string $fields, array $data): bool
-    {
-        $fields = explode(',', $fields);
-
-        // If the field is present we can safely assume that
-        // the field is here, no matter whether the corresponding
-        // search field is present or not.
-        $present = $this->required($str ?? '');
-
-        if ($present) {
-            return true;
-        }
-
-        // Still here? Then we fail this test if
-        // any of the fields are present in $data
-        // as $fields is the lis
-        $requiredFields = [];
-
-        foreach ($fields as $field) {
-            if (array_key_exists($field, $data)) {
-                $requiredFields[] = $field;
-            }
-        }
-
-        // Remove any keys with empty values since, that means they
-        // weren't truly there, as far as this is concerned.
-        $requiredFields = array_filter($requiredFields, static fn ($item) => ! empty($data[$item]));
-
-        return empty($requiredFields);
-    }
-}
+$this->validate($request, [
+    'foo' => 'required|even',
+]);
diff --git a/user_guide_src/source/libraries/validation/037.php b/user_guide_src/source/libraries/validation/037.php
index f37307b0ae07..9e13c663b0d7 100644
--- a/user_guide_src/source/libraries/validation/037.php
+++ b/user_guide_src/source/libraries/validation/037.php
@@ -1,10 +1,35 @@
 <?php
 
-// is_unique[table.field,ignore_field,ignore_value]
-
-$validation->setRules([
-    'name' => "is_unique[supplier.name,uuid, {$uuid}]",  // is not ok
-    'name' => "is_unique[supplier.name,uuid,{$uuid} ]",  // is not ok
-    'name' => "is_unique[supplier.name,uuid,{$uuid}]",   // is ok
-    'name' => 'is_unique[supplier.name,uuid,{uuid}]',  // is ok - see "Validation Placeholders"
-]);
+class MyRules
+{
+    public function required_with($str, string $fields, array $data): bool
+    {
+        $fields = explode(',', $fields);
+
+        // If the field is present we can safely assume that
+        // the field is here, no matter whether the corresponding
+        // search field is present or not.
+        $present = $this->required($str ?? '');
+
+        if ($present) {
+            return true;
+        }
+
+        // Still here? Then we fail this test if
+        // any of the fields are present in $data
+        // as $fields is the lis
+        $requiredFields = [];
+
+        foreach ($fields as $field) {
+            if (array_key_exists($field, $data)) {
+                $requiredFields[] = $field;
+            }
+        }
+
+        // Remove any keys with empty values since, that means they
+        // weren't truly there, as far as this is concerned.
+        $requiredFields = array_filter($requiredFields, static fn ($item) => ! empty($data[$item]));
+
+        return empty($requiredFields);
+    }
+}
diff --git a/user_guide_src/source/libraries/validation/038.php b/user_guide_src/source/libraries/validation/038.php
new file mode 100644
index 000000000000..f37307b0ae07
--- /dev/null
+++ b/user_guide_src/source/libraries/validation/038.php
@@ -0,0 +1,10 @@
+<?php
+
+// is_unique[table.field,ignore_field,ignore_value]
+
+$validation->setRules([
+    'name' => "is_unique[supplier.name,uuid, {$uuid}]",  // is not ok
+    'name' => "is_unique[supplier.name,uuid,{$uuid} ]",  // is not ok
+    'name' => "is_unique[supplier.name,uuid,{$uuid}]",   // is ok
+    'name' => 'is_unique[supplier.name,uuid,{uuid}]',  // is ok - see "Validation Placeholders"
+]);
diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst
index 2cfae8328caa..2ff02af66ac3 100644
--- a/user_guide_src/source/testing/overview.rst
+++ b/user_guide_src/source/testing/overview.rst
@@ -95,17 +95,17 @@ The static methods run before and after the entire test case, whereas the local
 between each test. If you implement any of these special functions make sure you run their
 parent as well so extended test cases do not interfere with staging:
 
-.. literalinclude:: overview/004.php
+.. literalinclude:: overview/003.php
 
 In addition to these methods, ``CIUnitTestCase`` also comes with a convenience property for
 parameter-free methods you want run during set up and tear down:
 
-.. literalinclude:: overview/005.php
+.. literalinclude:: overview/004.php
 
 You can see by default these handle the mocking of intrusive services, but your class may override
 that or provide their own:
 
-.. literalinclude:: overview/006.php
+.. literalinclude:: overview/005.php
 
 Traits
 ------
@@ -116,7 +116,7 @@ to run named for the trait itself. For example, if you needed to add authenticat
 of your test cases you could create an authentication trait with a set up method to fake a
 logged in user:
 
-.. literalinclude:: overview/007.php
+.. literalinclude:: overview/006.php
 
 Additional Assertions
 ---------------------
@@ -127,19 +127,19 @@ Additional Assertions
 
 Ensure that something you expected to be logged actually was:
 
-.. literalinclude:: overview/008.php
+.. literalinclude:: overview/007.php
 
 **assertEventTriggered($eventName)**
 
 Ensure that an event you expected to be triggered actually was:
 
-.. literalinclude:: overview/009.php
+.. literalinclude:: overview/008.php
 
 **assertHeaderEmitted($header, $ignoreCase = false)**
 
 Ensure that a header or cookie was actually emitted:
 
-.. literalinclude:: overview/010.php
+.. literalinclude:: overview/009.php
 
 Note: the test case with this should be `run as a separate process
 in PHPunit <https://phpunit.readthedocs.io/en/9.5/annotations.html#runinseparateprocess>`_.
@@ -148,7 +148,7 @@ in PHPunit <https://phpunit.readthedocs.io/en/9.5/annotations.html#runinseparate
 
 Ensure that a header or cookie was not emitted:
 
-.. literalinclude:: overview/011.php
+.. literalinclude:: overview/010.php
 
 Note: the test case with this should be `run as a separate process
 in PHPunit <https://phpunit.readthedocs.io/en/9.5/annotations.html#runinseparateprocess>`_.
@@ -158,7 +158,7 @@ in PHPunit <https://phpunit.readthedocs.io/en/9.5/annotations.html#runinseparate
 For extended execution time testing, tests that the absolute difference
 between expected and actual time is within the prescribed tolerance:
 
-.. literalinclude:: overview/012.php
+.. literalinclude:: overview/011.php
 
 The above test will allow the actual time to be either 660 or 661 seconds.
 
@@ -167,7 +167,7 @@ The above test will allow the actual time to be either 660 or 661 seconds.
 For extended execution time testing, tests that the absolute difference
 between expected and actual time, formatted as strings, is within the prescribed tolerance:
 
-.. literalinclude:: overview/013.php
+.. literalinclude:: overview/012.php
 
 The above test will allow the actual time to be either 660 or 661 seconds.
 
@@ -182,21 +182,21 @@ properties in the classes that you are testing.
 Enables you to call private methods from outside the class. This returns a function that can be called. The first
 parameter is an instance of the class to test. The second parameter is the name of the method you want to call.
 
-.. literalinclude:: overview/014.php
+.. literalinclude:: overview/013.php
 
 **getPrivateProperty($instance, $property)**
 
 Retrieves the value of a private/protected class property from an instance of a class. The first parameter is an
 instance of the class to test. The second parameter is the name of the property.
 
-.. literalinclude:: overview/015.php
+.. literalinclude:: overview/014.php
 
 **setPrivateProperty($instance, $property, $value)**
 
 Set a protected value within a class instance. The first parameter is an instance of the class to test. The second
 parameter is the name of the property to set the value of. The third parameter is the value to set it to:
 
-.. literalinclude:: overview/016.php
+.. literalinclude:: overview/015.php
 
 Mocking Services
 ================
@@ -211,7 +211,7 @@ to simplify this.
 This method allows you to define the exact instance that will be returned by the Services class. You can use this to
 set properties of a service so that it behaves in a certain way, or replace a service with a mocked class.
 
-.. literalinclude:: overview/017.php
+.. literalinclude:: overview/016.php
 
 The first parameter is the service that you are replacing. The name must match the function name in the Services
 class exactly. The second parameter is the instance to replace it with.
@@ -234,7 +234,7 @@ during testing that will be used with ``Factories``. Use the same ``injectMock()
 static methods like **Services**, but they take an additional preceding parameter for the
 component name:
 
-.. literalinclude:: overview/018.php
+.. literalinclude:: overview/017.php
 
 .. note:: All component Factories are reset by default between each test. Modify your test case's ``$setUpMethods`` if you need instances to persist.
 
@@ -248,4 +248,4 @@ might be helpful. The ``CITestStreamFilter`` helps you capture the output from t
 
 An example demonstrating this inside one of your test cases:
 
-.. literalinclude:: overview/019.php
+.. literalinclude:: overview/018.php
diff --git a/user_guide_src/source/testing/overview/003.php b/user_guide_src/source/testing/overview/003.php
new file mode 100644
index 000000000000..4d2e7ef4b5a8
--- /dev/null
+++ b/user_guide_src/source/testing/overview/003.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Test\CIUnitTestCase;
+
+final class OneOfMyModelsTest extends CIUnitTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+        helper('text');
+    }
+}
diff --git a/user_guide_src/source/testing/overview/004.php b/user_guide_src/source/testing/overview/004.php
index 4d2e7ef4b5a8..4a0e6030b2fa 100644
--- a/user_guide_src/source/testing/overview/004.php
+++ b/user_guide_src/source/testing/overview/004.php
@@ -6,9 +6,9 @@
 
 final class OneOfMyModelsTest extends CIUnitTestCase
 {
-    protected function setUp(): void
-    {
-        parent::setUp();
-        helper('text');
-    }
+    protected $setUpMethods = [
+        'mockEmail',
+        'mockSession',
+    ];
+    protected $tearDownMethods = [];
 }
diff --git a/user_guide_src/source/testing/overview/005.php b/user_guide_src/source/testing/overview/005.php
index 4a0e6030b2fa..86dc1c44b40f 100644
--- a/user_guide_src/source/testing/overview/005.php
+++ b/user_guide_src/source/testing/overview/005.php
@@ -6,9 +6,12 @@
 
 final class OneOfMyModelsTest extends CIUnitTestCase
 {
-    protected $setUpMethods = [
-        'mockEmail',
-        'mockSession',
+    protected $tearDownMethods = [
+        'purgeRows',
     ];
-    protected $tearDownMethods = [];
+
+    protected function purgeRows()
+    {
+        $this->model->purgeDeleted();
+    }
 }
diff --git a/user_guide_src/source/testing/overview/006.php b/user_guide_src/source/testing/overview/006.php
index 86dc1c44b40f..6193eb88bf50 100644
--- a/user_guide_src/source/testing/overview/006.php
+++ b/user_guide_src/source/testing/overview/006.php
@@ -1,17 +1,21 @@
 <?php
 
-namespace App\Models;
+trait AuthTrait
+{
+    protected function setUpAuthTrait()
+    {
+        $user = $this->createFakeUser();
+        $this->logInUser($user);
+    }
+
+    // ...
+}
 
 use CodeIgniter\Test\CIUnitTestCase;
 
-final class OneOfMyModelsTest extends CIUnitTestCase
+final class AuthenticationFeatureTest extends CIUnitTestCase
 {
-    protected $tearDownMethods = [
-        'purgeRows',
-    ];
+    use AuthTrait;
 
-    protected function purgeRows()
-    {
-        $this->model->purgeDeleted();
-    }
+    // ...
 }
diff --git a/user_guide_src/source/testing/overview/007.php b/user_guide_src/source/testing/overview/007.php
index 6193eb88bf50..55077ed36818 100644
--- a/user_guide_src/source/testing/overview/007.php
+++ b/user_guide_src/source/testing/overview/007.php
@@ -1,21 +1,9 @@
 <?php
 
-trait AuthTrait
-{
-    protected function setUpAuthTrait()
-    {
-        $user = $this->createFakeUser();
-        $this->logInUser($user);
-    }
+$config = new LoggerConfig();
+$logger = new Logger($config);
 
-    // ...
-}
+// ... do something that you expect a log entry from
+$logger->log('error', "That's no moon");
 
-use CodeIgniter\Test\CIUnitTestCase;
-
-final class AuthenticationFeatureTest extends CIUnitTestCase
-{
-    use AuthTrait;
-
-    // ...
-}
+$this->assertLogged('error', "That's no moon");
diff --git a/user_guide_src/source/testing/overview/008.php b/user_guide_src/source/testing/overview/008.php
index 55077ed36818..5d69c01c16d5 100644
--- a/user_guide_src/source/testing/overview/008.php
+++ b/user_guide_src/source/testing/overview/008.php
@@ -1,9 +1,9 @@
 <?php
 
-$config = new LoggerConfig();
-$logger = new Logger($config);
+Events::on('foo', static function ($arg) use (&$result) {
+    $result = $arg;
+});
 
-// ... do something that you expect a log entry from
-$logger->log('error', "That's no moon");
+Events::trigger('foo', 'bar');
 
-$this->assertLogged('error', "That's no moon");
+$this->assertEventTriggered('foo');
diff --git a/user_guide_src/source/testing/overview/009.php b/user_guide_src/source/testing/overview/009.php
index 5d69c01c16d5..506d75a8d433 100644
--- a/user_guide_src/source/testing/overview/009.php
+++ b/user_guide_src/source/testing/overview/009.php
@@ -1,9 +1,9 @@
 <?php
 
-Events::on('foo', static function ($arg) use (&$result) {
-    $result = $arg;
-});
+$response->setCookie('foo', 'bar');
 
-Events::trigger('foo', 'bar');
+ob_start();
+$this->response->send();
+$output = ob_get_clean(); // in case you want to check the actual body
 
-$this->assertEventTriggered('foo');
+$this->assertHeaderEmitted('Set-Cookie: foo=bar');
diff --git a/user_guide_src/source/testing/overview/010.php b/user_guide_src/source/testing/overview/010.php
index 506d75a8d433..10e9d4a0d31b 100644
--- a/user_guide_src/source/testing/overview/010.php
+++ b/user_guide_src/source/testing/overview/010.php
@@ -6,4 +6,4 @@
 $this->response->send();
 $output = ob_get_clean(); // in case you want to check the actual body
 
-$this->assertHeaderEmitted('Set-Cookie: foo=bar');
+$this->assertHeaderNotEmitted('Set-Cookie: banana');
diff --git a/user_guide_src/source/testing/overview/011.php b/user_guide_src/source/testing/overview/011.php
index 10e9d4a0d31b..c9b85aef7f87 100644
--- a/user_guide_src/source/testing/overview/011.php
+++ b/user_guide_src/source/testing/overview/011.php
@@ -1,9 +1,5 @@
 <?php
 
-$response->setCookie('foo', 'bar');
-
-ob_start();
-$this->response->send();
-$output = ob_get_clean(); // in case you want to check the actual body
-
-$this->assertHeaderNotEmitted('Set-Cookie: banana');
+$timer = new Timer();
+$timer->start('longjohn', strtotime('-11 minutes'));
+$this->assertCloseEnough(11 * 60, $timer->getElapsedTime('longjohn'));
diff --git a/user_guide_src/source/testing/overview/012.php b/user_guide_src/source/testing/overview/012.php
index c9b85aef7f87..1c03733868e4 100644
--- a/user_guide_src/source/testing/overview/012.php
+++ b/user_guide_src/source/testing/overview/012.php
@@ -2,4 +2,4 @@
 
 $timer = new Timer();
 $timer->start('longjohn', strtotime('-11 minutes'));
-$this->assertCloseEnough(11 * 60, $timer->getElapsedTime('longjohn'));
+$this->assertCloseEnoughString(11 * 60, $timer->getElapsedTime('longjohn'));
diff --git a/user_guide_src/source/testing/overview/013.php b/user_guide_src/source/testing/overview/013.php
index 1c03733868e4..f228dcf28963 100644
--- a/user_guide_src/source/testing/overview/013.php
+++ b/user_guide_src/source/testing/overview/013.php
@@ -1,5 +1,10 @@
 <?php
 
-$timer = new Timer();
-$timer->start('longjohn', strtotime('-11 minutes'));
-$this->assertCloseEnoughString(11 * 60, $timer->getElapsedTime('longjohn'));
+// Create an instance of the class to test
+$obj = new Foo();
+
+// Get the invoker for the 'privateMethod' method.
+$method = $this->getPrivateMethodInvoker($obj, 'privateMethod');
+
+// Test the results
+$this->assertEquals('bar', $method('param1', 'param2'));
diff --git a/user_guide_src/source/testing/overview/014.php b/user_guide_src/source/testing/overview/014.php
index f228dcf28963..1befb710253e 100644
--- a/user_guide_src/source/testing/overview/014.php
+++ b/user_guide_src/source/testing/overview/014.php
@@ -3,8 +3,5 @@
 // Create an instance of the class to test
 $obj = new Foo();
 
-// Get the invoker for the 'privateMethod' method.
-$method = $this->getPrivateMethodInvoker($obj, 'privateMethod');
-
-// Test the results
-$this->assertEquals('bar', $method('param1', 'param2'));
+// Test the value
+$this->assertEquals('bar', $this->getPrivateProperty($obj, 'baz'));
diff --git a/user_guide_src/source/testing/overview/015.php b/user_guide_src/source/testing/overview/015.php
index 1befb710253e..c2e815953dd9 100644
--- a/user_guide_src/source/testing/overview/015.php
+++ b/user_guide_src/source/testing/overview/015.php
@@ -3,5 +3,7 @@
 // Create an instance of the class to test
 $obj = new Foo();
 
-// Test the value
-$this->assertEquals('bar', $this->getPrivateProperty($obj, 'baz'));
+// Set the value
+$this->setPrivateProperty($obj, 'baz', 'oops!');
+
+// Do normal testing...
diff --git a/user_guide_src/source/testing/overview/016.php b/user_guide_src/source/testing/overview/016.php
index c2e815953dd9..cf0c211496b6 100644
--- a/user_guide_src/source/testing/overview/016.php
+++ b/user_guide_src/source/testing/overview/016.php
@@ -1,9 +1,16 @@
 <?php
 
-// Create an instance of the class to test
-$obj = new Foo();
+use CodeIgniter\Test\CIUnitTestCase;
 
-// Set the value
-$this->setPrivateProperty($obj, 'baz', 'oops!');
+final class SomeTest extends CIUnitTestCase
+{
+    public function testSomething()
+    {
+        $curlrequest = $this->getMockBuilder('CodeIgniter\HTTP\CURLRequest')
+            ->setMethods(['request'])
+            ->getMock();
+        Services::injectMock('curlrequest', $curlrequest);
 
-// Do normal testing...
+        // Do normal testing here....
+    }
+}
diff --git a/user_guide_src/source/testing/overview/017.php b/user_guide_src/source/testing/overview/017.php
index cf0c211496b6..67ccc4a634dc 100644
--- a/user_guide_src/source/testing/overview/017.php
+++ b/user_guide_src/source/testing/overview/017.php
@@ -4,13 +4,11 @@
 
 final class SomeTest extends CIUnitTestCase
 {
-    public function testSomething()
+    protected function setUp(): void
     {
-        $curlrequest = $this->getMockBuilder('CodeIgniter\HTTP\CURLRequest')
-            ->setMethods(['request'])
-            ->getMock();
-        Services::injectMock('curlrequest', $curlrequest);
+        parent::setUp();
 
-        // Do normal testing here....
+        $model = new MockUserModel();
+        Factories::injectMock('models', 'App\Models\UserModel', $model);
     }
 }
diff --git a/user_guide_src/source/testing/overview/018.php b/user_guide_src/source/testing/overview/018.php
index 67ccc4a634dc..e0e55131f5b3 100644
--- a/user_guide_src/source/testing/overview/018.php
+++ b/user_guide_src/source/testing/overview/018.php
@@ -6,9 +6,19 @@ final class SomeTest extends CIUnitTestCase
 {
     protected function setUp(): void
     {
-        parent::setUp();
+        CITestStreamFilter::$buffer = '';
+        $this->stream_filter        = stream_filter_append(STDOUT, 'CITestStreamFilter');
+    }
 
-        $model = new MockUserModel();
-        Factories::injectMock('models', 'App\Models\UserModel', $model);
+    protected function tearDown(): void
+    {
+        stream_filter_remove($this->stream_filter);
+    }
+
+    public function testSomeOutput(): void
+    {
+        CLI::write('first.');
+        $expected = "first.\n";
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
 }
diff --git a/user_guide_src/source/testing/overview/019.php b/user_guide_src/source/testing/overview/019.php
deleted file mode 100644
index e0e55131f5b3..000000000000
--- a/user_guide_src/source/testing/overview/019.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-use CodeIgniter\Test\CIUnitTestCase;
-
-final class SomeTest extends CIUnitTestCase
-{
-    protected function setUp(): void
-    {
-        CITestStreamFilter::$buffer = '';
-        $this->stream_filter        = stream_filter_append(STDOUT, 'CITestStreamFilter');
-    }
-
-    protected function tearDown(): void
-    {
-        stream_filter_remove($this->stream_filter);
-    }
-
-    public function testSomeOutput(): void
-    {
-        CLI::write('first.');
-        $expected = "first.\n";
-        $this->assertSame($expected, CITestStreamFilter::$buffer);
-    }
-}

From 60c7083a741f20f4f32dd41a87e453c1ad801ffd Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Fri, 11 Mar 2022 17:41:49 +0100
Subject: [PATCH 1760/2325] Renumerate installation.

---
 .../source/installation/upgrade_configuration.rst      |  2 +-
 .../upgrade_configuration/{002.php => 001.php}         |  0
 .../source/installation/upgrade_controllers.rst        |  2 +-
 .../upgrade_controllers/{002.php => 001.php}           |  0
 .../source/installation/upgrade_database.rst           |  2 +-
 .../installation/upgrade_database/{002.php => 001.php} |  0
 user_guide_src/source/installation/upgrade_emails.rst  |  2 +-
 .../installation/upgrade_emails/{002.php => 001.php}   |  0
 .../source/installation/upgrade_encryption.rst         |  2 +-
 .../upgrade_encryption/{002.php => 001.php}            |  0
 .../source/installation/upgrade_file_upload.rst        |  2 +-
 .../upgrade_file_upload/{002.php => 001.php}           |  0
 .../source/installation/upgrade_html_tables.rst        |  2 +-
 .../upgrade_html_tables/{002.php => 001.php}           |  0
 .../source/installation/upgrade_localization.rst       |  2 +-
 .../upgrade_localization/{003.php => 002.php}          |  0
 .../source/installation/upgrade_migrations.rst         |  2 +-
 .../upgrade_migrations/{002.php => 001.php}            |  0
 user_guide_src/source/installation/upgrade_models.rst  |  2 +-
 .../installation/upgrade_models/{002.php => 001.php}   |  0
 .../source/installation/upgrade_pagination.rst         |  2 +-
 .../upgrade_pagination/{002.php => 001.php}            |  0
 .../source/installation/upgrade_responses.rst          |  2 +-
 .../upgrade_responses/{002.php => 001.php}             |  0
 user_guide_src/source/installation/upgrade_routing.rst |  2 +-
 .../installation/upgrade_routing/{002.php => 001.php}  |  0
 .../source/installation/upgrade_security.rst           | 10 +---------
 .../source/installation/upgrade_security/002.php       |  8 ++++++++
 .../source/installation/upgrade_sessions.rst           |  2 +-
 .../installation/upgrade_sessions/{002.php => 001.php} |  0
 .../source/installation/upgrade_validations.rst        |  2 +-
 .../upgrade_validations/{003.php => 002.php}           |  0
 .../source/installation/upgrade_view_parser.rst        |  2 +-
 .../upgrade_view_parser/{002.php => 001.php}           |  0
 user_guide_src/source/installation/upgrade_views.rst   |  2 +-
 .../installation/upgrade_views/{002.php => 001.php}    |  0
 36 files changed, 26 insertions(+), 26 deletions(-)
 rename user_guide_src/source/installation/upgrade_configuration/{002.php => 001.php} (100%)
 rename user_guide_src/source/installation/upgrade_controllers/{002.php => 001.php} (100%)
 rename user_guide_src/source/installation/upgrade_database/{002.php => 001.php} (100%)
 rename user_guide_src/source/installation/upgrade_emails/{002.php => 001.php} (100%)
 rename user_guide_src/source/installation/upgrade_encryption/{002.php => 001.php} (100%)
 rename user_guide_src/source/installation/upgrade_file_upload/{002.php => 001.php} (100%)
 rename user_guide_src/source/installation/upgrade_html_tables/{002.php => 001.php} (100%)
 rename user_guide_src/source/installation/upgrade_localization/{003.php => 002.php} (100%)
 rename user_guide_src/source/installation/upgrade_migrations/{002.php => 001.php} (100%)
 rename user_guide_src/source/installation/upgrade_models/{002.php => 001.php} (100%)
 rename user_guide_src/source/installation/upgrade_pagination/{002.php => 001.php} (100%)
 rename user_guide_src/source/installation/upgrade_responses/{002.php => 001.php} (100%)
 rename user_guide_src/source/installation/upgrade_routing/{002.php => 001.php} (100%)
 create mode 100644 user_guide_src/source/installation/upgrade_security/002.php
 rename user_guide_src/source/installation/upgrade_sessions/{002.php => 001.php} (100%)
 rename user_guide_src/source/installation/upgrade_validations/{003.php => 002.php} (100%)
 rename user_guide_src/source/installation/upgrade_view_parser/{002.php => 001.php} (100%)
 rename user_guide_src/source/installation/upgrade_views/{002.php => 001.php} (100%)

diff --git a/user_guide_src/source/installation/upgrade_configuration.rst b/user_guide_src/source/installation/upgrade_configuration.rst
index 6a9f38069478..aca4af05d4a7 100644
--- a/user_guide_src/source/installation/upgrade_configuration.rst
+++ b/user_guide_src/source/installation/upgrade_configuration.rst
@@ -47,4 +47,4 @@ CodeIgniter Version 4.x
 
 Path: **app/Config**:
 
-.. literalinclude:: upgrade_configuration/002.php
+.. literalinclude:: upgrade_configuration/001.php
diff --git a/user_guide_src/source/installation/upgrade_configuration/002.php b/user_guide_src/source/installation/upgrade_configuration/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_configuration/002.php
rename to user_guide_src/source/installation/upgrade_configuration/001.php
diff --git a/user_guide_src/source/installation/upgrade_controllers.rst b/user_guide_src/source/installation/upgrade_controllers.rst
index 3e7521445691..1810ea615506 100644
--- a/user_guide_src/source/installation/upgrade_controllers.rst
+++ b/user_guide_src/source/installation/upgrade_controllers.rst
@@ -50,4 +50,4 @@ CodeIgniter Version 4.x
 
 Path: **app/Controllers**:
 
-.. literalinclude:: upgrade_controllers/002.php
+.. literalinclude:: upgrade_controllers/001.php
diff --git a/user_guide_src/source/installation/upgrade_controllers/002.php b/user_guide_src/source/installation/upgrade_controllers/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_controllers/002.php
rename to user_guide_src/source/installation/upgrade_controllers/001.php
diff --git a/user_guide_src/source/installation/upgrade_database.rst b/user_guide_src/source/installation/upgrade_database.rst
index 10b1e6ac1c96..f62044d8a302 100644
--- a/user_guide_src/source/installation/upgrade_database.rst
+++ b/user_guide_src/source/installation/upgrade_database.rst
@@ -51,4 +51,4 @@ CodeIgniter Version 3.x
 CodeIgniter Version 4.x
 -----------------------
 
-.. literalinclude:: upgrade_database/002.php
+.. literalinclude:: upgrade_database/001.php
diff --git a/user_guide_src/source/installation/upgrade_database/002.php b/user_guide_src/source/installation/upgrade_database/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_database/002.php
rename to user_guide_src/source/installation/upgrade_database/001.php
diff --git a/user_guide_src/source/installation/upgrade_emails.rst b/user_guide_src/source/installation/upgrade_emails.rst
index af322f2d7c7a..7eb40a050042 100644
--- a/user_guide_src/source/installation/upgrade_emails.rst
+++ b/user_guide_src/source/installation/upgrade_emails.rst
@@ -33,4 +33,4 @@ CodeIgniter Version 3.x
 CodeIgniter Version 4.x
 -----------------------
 
-.. literalinclude:: upgrade_emails/002.php
+.. literalinclude:: upgrade_emails/001.php
diff --git a/user_guide_src/source/installation/upgrade_emails/002.php b/user_guide_src/source/installation/upgrade_emails/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_emails/002.php
rename to user_guide_src/source/installation/upgrade_emails/001.php
diff --git a/user_guide_src/source/installation/upgrade_encryption.rst b/user_guide_src/source/installation/upgrade_encryption.rst
index 9d626d341d5d..a4d8a74ce659 100644
--- a/user_guide_src/source/installation/upgrade_encryption.rst
+++ b/user_guide_src/source/installation/upgrade_encryption.rst
@@ -31,4 +31,4 @@ CodeIgniter Version 3.x
 CodeIgniter Version 4.x
 -----------------------
 
-.. literalinclude:: upgrade_encryption/002.php
+.. literalinclude:: upgrade_encryption/001.php
diff --git a/user_guide_src/source/installation/upgrade_encryption/002.php b/user_guide_src/source/installation/upgrade_encryption/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_encryption/002.php
rename to user_guide_src/source/installation/upgrade_encryption/001.php
diff --git a/user_guide_src/source/installation/upgrade_file_upload.rst b/user_guide_src/source/installation/upgrade_file_upload.rst
index ed620bbaeb67..d7a38a1f97d8 100644
--- a/user_guide_src/source/installation/upgrade_file_upload.rst
+++ b/user_guide_src/source/installation/upgrade_file_upload.rst
@@ -32,4 +32,4 @@ CodeIgniter Version 3.x
 CodeIgniter Version 4.x
 -----------------------
 
-.. literalinclude:: upgrade_file_upload/002.php
+.. literalinclude:: upgrade_file_upload/001.php
diff --git a/user_guide_src/source/installation/upgrade_file_upload/002.php b/user_guide_src/source/installation/upgrade_file_upload/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_file_upload/002.php
rename to user_guide_src/source/installation/upgrade_file_upload/001.php
diff --git a/user_guide_src/source/installation/upgrade_html_tables.rst b/user_guide_src/source/installation/upgrade_html_tables.rst
index ae97e8e3baf2..09059e547abe 100644
--- a/user_guide_src/source/installation/upgrade_html_tables.rst
+++ b/user_guide_src/source/installation/upgrade_html_tables.rst
@@ -32,4 +32,4 @@ CodeIgniter Version 3.x
 CodeIgniter Version 4.x
 -----------------------
 
-.. literalinclude:: upgrade_html_tables/002.php
+.. literalinclude:: upgrade_html_tables/001.php
diff --git a/user_guide_src/source/installation/upgrade_html_tables/002.php b/user_guide_src/source/installation/upgrade_html_tables/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_html_tables/002.php
rename to user_guide_src/source/installation/upgrade_html_tables/001.php
diff --git a/user_guide_src/source/installation/upgrade_localization.rst b/user_guide_src/source/installation/upgrade_localization.rst
index 782336334974..d962eb462fd4 100644
--- a/user_guide_src/source/installation/upgrade_localization.rst
+++ b/user_guide_src/source/installation/upgrade_localization.rst
@@ -37,4 +37,4 @@ CodeIgniter Version 3.x
 CodeIgniter Version 4.x
 -----------------------
 
-.. literalinclude:: upgrade_localization/003.php
+.. literalinclude:: upgrade_localization/002.php
diff --git a/user_guide_src/source/installation/upgrade_localization/003.php b/user_guide_src/source/installation/upgrade_localization/002.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_localization/003.php
rename to user_guide_src/source/installation/upgrade_localization/002.php
diff --git a/user_guide_src/source/installation/upgrade_migrations.rst b/user_guide_src/source/installation/upgrade_migrations.rst
index 60f6b8d7b090..31eabc0766e1 100644
--- a/user_guide_src/source/installation/upgrade_migrations.rst
+++ b/user_guide_src/source/installation/upgrade_migrations.rst
@@ -60,7 +60,7 @@ CodeIgniter Version 4.x
 
 Path: **app/Database/Migrations**:
 
-.. literalinclude:: upgrade_migrations/002.php
+.. literalinclude:: upgrade_migrations/001.php
 
 Search & Replace
 ================
diff --git a/user_guide_src/source/installation/upgrade_migrations/002.php b/user_guide_src/source/installation/upgrade_migrations/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_migrations/002.php
rename to user_guide_src/source/installation/upgrade_migrations/001.php
diff --git a/user_guide_src/source/installation/upgrade_models.rst b/user_guide_src/source/installation/upgrade_models.rst
index 1ffce60151e0..6acf6aa76969 100644
--- a/user_guide_src/source/installation/upgrade_models.rst
+++ b/user_guide_src/source/installation/upgrade_models.rst
@@ -49,6 +49,6 @@ CodeIgniter Version 4.x
 
 Path: **app/Models**:
 
-.. literalinclude:: upgrade_models/002.php
+.. literalinclude:: upgrade_models/001.php
 
 To insert data you can just directly call the ``$model->insert()`` method because this method is built-in since CI4.
diff --git a/user_guide_src/source/installation/upgrade_models/002.php b/user_guide_src/source/installation/upgrade_models/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_models/002.php
rename to user_guide_src/source/installation/upgrade_models/001.php
diff --git a/user_guide_src/source/installation/upgrade_pagination.rst b/user_guide_src/source/installation/upgrade_pagination.rst
index 6658ae8e4bd7..69e19d57164c 100644
--- a/user_guide_src/source/installation/upgrade_pagination.rst
+++ b/user_guide_src/source/installation/upgrade_pagination.rst
@@ -39,4 +39,4 @@ CodeIgniter Version 3.x
 CodeIgniter Version 4.x
 -----------------------
 
-.. literalinclude:: upgrade_pagination/002.php
+.. literalinclude:: upgrade_pagination/001.php
diff --git a/user_guide_src/source/installation/upgrade_pagination/002.php b/user_guide_src/source/installation/upgrade_pagination/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_pagination/002.php
rename to user_guide_src/source/installation/upgrade_pagination/001.php
diff --git a/user_guide_src/source/installation/upgrade_responses.rst b/user_guide_src/source/installation/upgrade_responses.rst
index c6b925d144f1..6788468c0b57 100644
--- a/user_guide_src/source/installation/upgrade_responses.rst
+++ b/user_guide_src/source/installation/upgrade_responses.rst
@@ -30,4 +30,4 @@ CodeIgniter Version 3.x
 CodeIgniter Version 4.x
 -----------------------
 
-.. literalinclude:: upgrade_responses/002.php
+.. literalinclude:: upgrade_responses/001.php
diff --git a/user_guide_src/source/installation/upgrade_responses/002.php b/user_guide_src/source/installation/upgrade_responses/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_responses/002.php
rename to user_guide_src/source/installation/upgrade_responses/001.php
diff --git a/user_guide_src/source/installation/upgrade_routing.rst b/user_guide_src/source/installation/upgrade_routing.rst
index 9e6c512ff423..882ef380ca92 100644
--- a/user_guide_src/source/installation/upgrade_routing.rst
+++ b/user_guide_src/source/installation/upgrade_routing.rst
@@ -36,4 +36,4 @@ CodeIgniter Version 4.x
 -----------------------
 Path: **app/Config/Routes.php**:
 
-.. literalinclude:: upgrade_routing/002.php
+.. literalinclude:: upgrade_routing/001.php
diff --git a/user_guide_src/source/installation/upgrade_routing/002.php b/user_guide_src/source/installation/upgrade_routing/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_routing/002.php
rename to user_guide_src/source/installation/upgrade_routing/001.php
diff --git a/user_guide_src/source/installation/upgrade_security.rst b/user_guide_src/source/installation/upgrade_security.rst
index 0a6d615e0841..c520b9c50350 100644
--- a/user_guide_src/source/installation/upgrade_security.rst
+++ b/user_guide_src/source/installation/upgrade_security.rst
@@ -37,13 +37,5 @@ CodeIgniter Version 3.x
 
 CodeIgniter Version 4.x
 -----------------------
-::
 
-    <form>
-        <input name="name" type="text">
-        <input name="email" type="text">
-        <input name="password" type="password">
-
-        <?= csrf_field() ?>
-        <input type="submit" value="Save">
-    </form>
+.. literalinclude:: upgrade_security/002.php
diff --git a/user_guide_src/source/installation/upgrade_security/002.php b/user_guide_src/source/installation/upgrade_security/002.php
new file mode 100644
index 000000000000..89c3b3882c56
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_security/002.php
@@ -0,0 +1,8 @@
+<form>
+    <input name="name" type="text">
+    <input name="email" type="text">
+    <input name="password" type="password">
+
+    <?= csrf_field() ?>
+    <input type="submit" value="Save">
+</form>
diff --git a/user_guide_src/source/installation/upgrade_sessions.rst b/user_guide_src/source/installation/upgrade_sessions.rst
index a309033bc816..177552282a9c 100644
--- a/user_guide_src/source/installation/upgrade_sessions.rst
+++ b/user_guide_src/source/installation/upgrade_sessions.rst
@@ -36,4 +36,4 @@ CodeIgniter Version 3.x
 CodeIgniter Version 4.x
 -----------------------
 
-.. literalinclude:: upgrade_sessions/002.php
+.. literalinclude:: upgrade_sessions/001.php
diff --git a/user_guide_src/source/installation/upgrade_sessions/002.php b/user_guide_src/source/installation/upgrade_sessions/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_sessions/002.php
rename to user_guide_src/source/installation/upgrade_sessions/001.php
diff --git a/user_guide_src/source/installation/upgrade_validations.rst b/user_guide_src/source/installation/upgrade_validations.rst
index 3612784ade28..5bd6a2a1d514 100644
--- a/user_guide_src/source/installation/upgrade_validations.rst
+++ b/user_guide_src/source/installation/upgrade_validations.rst
@@ -110,4 +110,4 @@ Path: **app/Views**::
 
 Path: **app/Controllers**:
 
-.. literalinclude:: upgrade_validations/003.php
+.. literalinclude:: upgrade_validations/002.php
diff --git a/user_guide_src/source/installation/upgrade_validations/003.php b/user_guide_src/source/installation/upgrade_validations/002.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_validations/003.php
rename to user_guide_src/source/installation/upgrade_validations/002.php
diff --git a/user_guide_src/source/installation/upgrade_view_parser.rst b/user_guide_src/source/installation/upgrade_view_parser.rst
index 5def5e912d5f..55e86fb357a4 100644
--- a/user_guide_src/source/installation/upgrade_view_parser.rst
+++ b/user_guide_src/source/installation/upgrade_view_parser.rst
@@ -32,4 +32,4 @@ CodeIgniter Version 3.x
 CodeIgniter Version 4.x
 -----------------------
 
-.. literalinclude:: upgrade_view_parser/002.php
+.. literalinclude:: upgrade_view_parser/001.php
diff --git a/user_guide_src/source/installation/upgrade_view_parser/002.php b/user_guide_src/source/installation/upgrade_view_parser/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_view_parser/002.php
rename to user_guide_src/source/installation/upgrade_view_parser/001.php
diff --git a/user_guide_src/source/installation/upgrade_views.rst b/user_guide_src/source/installation/upgrade_views.rst
index 574de607b42b..8509705c76dc 100644
--- a/user_guide_src/source/installation/upgrade_views.rst
+++ b/user_guide_src/source/installation/upgrade_views.rst
@@ -43,4 +43,4 @@ CodeIgniter Version 4.x
 
 Path: **app/Views**:
 
-.. literalinclude:: upgrade_views/002.php
+.. literalinclude:: upgrade_views/001.php
diff --git a/user_guide_src/source/installation/upgrade_views/002.php b/user_guide_src/source/installation/upgrade_views/001.php
similarity index 100%
rename from user_guide_src/source/installation/upgrade_views/002.php
rename to user_guide_src/source/installation/upgrade_views/001.php

From 2ccc2cdb9ea562c0e23dc953bcd1f328903099a3 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Fri, 11 Mar 2022 17:53:48 +0100
Subject: [PATCH 1761/2325] Delete renumerate script.

---
 user_guide_src/renumerate.php | 98 -----------------------------------
 1 file changed, 98 deletions(-)
 delete mode 100644 user_guide_src/renumerate.php

diff --git a/user_guide_src/renumerate.php b/user_guide_src/renumerate.php
deleted file mode 100644
index 7ecf1a631e4b..000000000000
--- a/user_guide_src/renumerate.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?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.
- */
-
-$srcFolder = __DIR__ . '/source';
-
-// Exclude static folders
-$excludes = ['_static', 'images'];
-
-// Safety prefix
-$prefix = 'old_';
-
-// Begin user info
-echo 'The following sections were renumerated:', PHP_EOL;
-
-// Loop source directory
-$srcIterator = new DirectoryIterator($srcFolder);
-
-foreach ($srcIterator as $chapterInfo) {
-    if (! $chapterInfo->isDot() && $chapterInfo->isDir() && ! in_array($chapterInfo->getFilename(), $excludes, true)) {
-        $chapterName = $chapterInfo->getFilename();
-
-        // Iterate the working directory
-        $chapterIterator = new DirectoryIterator($chapterInfo->getPathname());
-
-        foreach ($chapterIterator as $sectionInfo) {
-            if (! $sectionInfo->isDot() && $sectionInfo->isFile() && $sectionInfo->getExtension() === 'rst') {
-                $sectionName   = $sectionInfo->getBasename('.rst');
-                $sectionFolder = $sectionInfo->getPath() . '/' . $sectionName;
-
-                // Read the section file
-                $sectionContent = file_get_contents($sectionInfo->getPathname());
-
-                // Match all includes
-                preg_match_all("~\\.\\. literalinclude:: {$sectionName}\\/(.+)\\.php~", $sectionContent, $matches);
-                $includeStrings = $matches[0];
-                $exampleNames   = $matches[1];
-
-                // Exit early if no matches
-                if (count($exampleNames) === 0) {
-                    continue;
-                }
-
-                // Check if examples are consecutive
-                $consecutive = true;
-
-                foreach ($exampleNames as $exampleIndex => $exampleName) {
-                    if (str_pad($exampleIndex + 1, 3, '0', STR_PAD_LEFT) !== $exampleName) {
-                        $consecutive = false;
-                        break;
-                    }
-                }
-
-                // Exit if examples are already consecutive
-                if ($consecutive) {
-                    continue;
-                }
-
-                // Rename all example files to avoid conflicts
-                $exampleIterator = new DirectoryIterator($sectionFolder);
-
-                foreach ($exampleIterator as $exampleInfo) {
-                    if (! $exampleInfo->isDot() && $exampleInfo->isFile() && $exampleInfo->getExtension() === 'php') {
-                        rename($exampleInfo->getPathname(), $exampleInfo->getPath() . '/' . $prefix . $exampleInfo->getFilename());
-                    }
-                }
-                $sectionContent = preg_replace("~\\.\\. literalinclude:: {$sectionName}\\/(.+)\\.php~", ".. literalinclude:: {$sectionName}/{$prefix}$1.php", $sectionContent);
-
-                // Renumerate examples
-                foreach ($exampleNames as $exampleIndex => $exampleName) {
-                    $newName = str_pad($exampleIndex + 1, 3, '0', STR_PAD_LEFT);
-
-                    // Rename example file
-                    rename($sectionFolder . '/' . $prefix . $exampleName . '.php', $sectionFolder . '/' . $newName . '.php');
-
-                    // Fix include link
-                    $sectionContent = preg_replace('~' . preg_quote(str_replace($exampleName, $prefix . $exampleName, $includeStrings[$exampleIndex]), '~') . '~', str_replace($exampleName, $newName, $includeStrings[$exampleIndex]), $sectionContent, 1, $count);
-                }
-
-                // Write new content to rst
-                file_put_contents($sectionInfo->getPathname(), $sectionContent);
-
-                // User info
-                echo $chapterName, '/', $sectionName, PHP_EOL;
-            }
-        }
-    }
-}
-
-// End user info
-echo 'Renumerating finished.', PHP_EOL;

From 27a2132c598de9a9990207aa8ecfb5a156fba9d9 Mon Sep 17 00:00:00 2001
From: Alex Schmitz <alexander.schmitz@uni-due.de>
Date: Fri, 11 Mar 2022 18:00:21 +0100
Subject: [PATCH 1762/2325] Update cs-fixer excludes.

---
 .user-guide.php-cs-fixer.dist.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.user-guide.php-cs-fixer.dist.php b/.user-guide.php-cs-fixer.dist.php
index 7a48f922f1d7..900c26ec81e1 100644
--- a/.user-guide.php-cs-fixer.dist.php
+++ b/.user-guide.php-cs-fixer.dist.php
@@ -25,8 +25,8 @@
     ])
     ->notPath([
         'ci3sample/',
-        'libraries/sessions/017.php',
-        'database/query_builder/074.php',
+        'libraries/sessions/016.php',
+        'database/query_builder/075.php',
     ]);
 
 $overrides = [

From 929cf6158fbb22657fb71b982e3780d6a546c37a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 12 Mar 2022 09:22:42 +0900
Subject: [PATCH 1763/2325] docs: fix `@return` description

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

diff --git a/system/Debug/Timer.php b/system/Debug/Timer.php
index 5783c77aae72..9be1dd121f1a 100644
--- a/system/Debug/Timer.php
+++ b/system/Debug/Timer.php
@@ -78,7 +78,7 @@ public function stop(string $name)
      * @param string $name     The name of the timer.
      * @param int    $decimals Number of decimal places.
      *
-     * @return float|null Returns null if timer exists by that name.
+     * @return float|null Returns null if timer does not exist by that name.
      *                    Returns a float representing the number of
      *                    seconds elapsed while that timer was running.
      */

From 3c706a52b112aa7ea309a4d7c56dadfad6d956f5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 12 Mar 2022 09:23:28 +0900
Subject: [PATCH 1764/2325] fix: Timer::getElapsedTime() returns incorrect
 value

---
 system/Debug/Timer.php           | 2 +-
 tests/system/Debug/TimerTest.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/system/Debug/Timer.php b/system/Debug/Timer.php
index 9be1dd121f1a..9ca51d1c9b08 100644
--- a/system/Debug/Timer.php
+++ b/system/Debug/Timer.php
@@ -96,7 +96,7 @@ public function getElapsedTime(string $name, int $decimals = 4)
             $timer['end'] = microtime(true);
         }
 
-        return (float) number_format($timer['end'] - $timer['start'], $decimals);
+        return (float) number_format($timer['end'] - $timer['start'], $decimals, '.', '');
     }
 
     /**
diff --git a/tests/system/Debug/TimerTest.php b/tests/system/Debug/TimerTest.php
index 7b7b75199ea9..fdd09829d9ff 100644
--- a/tests/system/Debug/TimerTest.php
+++ b/tests/system/Debug/TimerTest.php
@@ -92,8 +92,8 @@ public function testThrowsExceptionStoppingNonTimer()
     public function testLongExecutionTime()
     {
         $timer = new Timer();
-        $timer->start('longjohn', strtotime('-11 minutes'));
-        $this->assertCloseEnough(11 * 60, $timer->getElapsedTime('longjohn'));
+        $timer->start('longjohn', strtotime('-110 minutes'));
+        $this->assertCloseEnough(110 * 60, $timer->getElapsedTime('longjohn'));
     }
 
     public function testLongExecutionTimeThroughCommonFunc()

From 81f062f84fe7d3e6cb19203596ad7d2ae516de02 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 12 Mar 2022 10:40:57 +0900
Subject: [PATCH 1765/2325] config: add .woff2

---
 app/Config/Publisher.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Config/Publisher.php b/app/Config/Publisher.php
index 4f7cf11037f5..7088703fc0d5 100644
--- a/app/Config/Publisher.php
+++ b/app/Config/Publisher.php
@@ -23,6 +23,6 @@ class Publisher extends BasePublisher
      */
     public $restrictions = [
         ROOTPATH => '*',
-        FCPATH   => '#\.(s?css|js|map|html?|xml|json|webmanifest|tff|eot|woff|gif|jpe?g|tiff?|png|webp|bmp|ico|svg)$#i',
+        FCPATH   => '#\.(s?css|js|map|html?|xml|json|webmanifest|tff|eot|woff2?|gif|jpe?g|tiff?|png|webp|bmp|ico|svg)$#i',
     ];
 }

From 5d4753c824fcdfbdd6bc36888780debc62633116 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 12 Mar 2022 10:42:30 +0900
Subject: [PATCH 1766/2325] docs: add .woff2

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

diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
index 69de79bd7464..947a102019e1 100644
--- a/user_guide_src/source/libraries/publisher.rst
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -83,7 +83,7 @@ receive files with the following extensions:
 
 * Web assets: css, scss, js, map
 * Non-executable web files: htm, html, xml, json, webmanifest
-* Fonts: tff, eot, woff
+* Fonts: tff, eot, woff, woff2
 * Images: gif, jpg, jpeg, tif, tiff, png, webp, bmp, ico, svg
 
 If you need to add or adjust the security for your project then alter the ``$restrictions`` property of ``Config\Publisher`` in **app/Config/Publisher.php**.

From 7b0520e495c7fbe3ee2c2c184cb41f7b897e80b2 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Tue, 15 Mar 2022 00:30:45 +0000
Subject: [PATCH 1767/2325] Fix extension typo

---
 app/Config/Publisher.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Config/Publisher.php b/app/Config/Publisher.php
index 7088703fc0d5..47475112c080 100644
--- a/app/Config/Publisher.php
+++ b/app/Config/Publisher.php
@@ -23,6 +23,6 @@ class Publisher extends BasePublisher
      */
     public $restrictions = [
         ROOTPATH => '*',
-        FCPATH   => '#\.(s?css|js|map|html?|xml|json|webmanifest|tff|eot|woff2?|gif|jpe?g|tiff?|png|webp|bmp|ico|svg)$#i',
+        FCPATH   => '#\.(s?css|js|map|html?|xml|json|webmanifest|ttf|eot|woff2?|gif|jpe?g|tiff?|png|webp|bmp|ico|svg)$#i',
     ];
 }

From 75184b97b686f5283a5e5cfb57d12d8af9d9ded2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 15 Mar 2022 09:58:46 +0900
Subject: [PATCH 1768/2325] docs: fix extension typo

See #5800
---
 user_guide_src/source/libraries/publisher.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/libraries/publisher.rst b/user_guide_src/source/libraries/publisher.rst
index 947a102019e1..5b37369445f1 100644
--- a/user_guide_src/source/libraries/publisher.rst
+++ b/user_guide_src/source/libraries/publisher.rst
@@ -83,7 +83,7 @@ receive files with the following extensions:
 
 * Web assets: css, scss, js, map
 * Non-executable web files: htm, html, xml, json, webmanifest
-* Fonts: tff, eot, woff, woff2
+* Fonts: ttf, eot, woff, woff2
 * Images: gif, jpg, jpeg, tif, tiff, png, webp, bmp, ico, svg
 
 If you need to add or adjust the security for your project then alter the ``$restrictions`` property of ``Config\Publisher`` in **app/Config/Publisher.php**.

From 74daf1aa53f10166671cd295b8e68e336c77c68e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 16 Mar 2022 08:50:11 +0900
Subject: [PATCH 1769/2325] test: remove helper('url')

URL Helper is automatically loaded.
---
 tests/system/HTTP/UserAgentTest.php               | 2 --
 tests/system/Helpers/HTMLHelperTest.php           | 2 --
 tests/system/Helpers/URLHelper/CurrentUrlTest.php | 7 -------
 tests/system/Helpers/URLHelper/MiscUrlTest.php    | 7 -------
 tests/system/Helpers/URLHelper/SiteUrlTest.php    | 7 -------
 tests/system/Pager/PagerTest.php                  | 1 -
 tests/system/View/ParserPluginTest.php            | 5 -----
 7 files changed, 31 deletions(-)

diff --git a/tests/system/HTTP/UserAgentTest.php b/tests/system/HTTP/UserAgentTest.php
index 6b80d8f25b30..e4f2d1e7f025 100644
--- a/tests/system/HTTP/UserAgentTest.php
+++ b/tests/system/HTTP/UserAgentTest.php
@@ -34,8 +34,6 @@ protected function setUp(): void
         $_SERVER['HTTP_USER_AGENT'] = $this->_user_agent;
 
         $this->agent = new UserAgent();
-
-        helper('url');
     }
 
     public function testMobile()
diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index 79cb5da92334..b3ed47d0c3e6 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -35,8 +35,6 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        // URL is needed by the HTML Helper.
-        helper('url');
         helper('html');
 
         $this->tracks = [
diff --git a/tests/system/Helpers/URLHelper/CurrentUrlTest.php b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
index b4f522f16071..0f316a305988 100644
--- a/tests/system/Helpers/URLHelper/CurrentUrlTest.php
+++ b/tests/system/Helpers/URLHelper/CurrentUrlTest.php
@@ -30,13 +30,6 @@ final class CurrentUrlTest extends CIUnitTestCase
 {
     private App $config;
 
-    public static function setUpBeforeClass(): void
-    {
-        parent::setUpBeforeClass();
-
-        helper('url');
-    }
-
     protected function setUp(): void
     {
         parent::setUp();
diff --git a/tests/system/Helpers/URLHelper/MiscUrlTest.php b/tests/system/Helpers/URLHelper/MiscUrlTest.php
index a5a78c5cc687..709d1b815207 100644
--- a/tests/system/Helpers/URLHelper/MiscUrlTest.php
+++ b/tests/system/Helpers/URLHelper/MiscUrlTest.php
@@ -27,13 +27,6 @@ final class MiscUrlTest extends CIUnitTestCase
 {
     private App $config;
 
-    public static function setUpBeforeClass(): void
-    {
-        parent::setUpBeforeClass();
-
-        helper('url');
-    }
-
     protected function setUp(): void
     {
         parent::setUp();
diff --git a/tests/system/Helpers/URLHelper/SiteUrlTest.php b/tests/system/Helpers/URLHelper/SiteUrlTest.php
index e9b5ec9c25dd..f942ce453af8 100644
--- a/tests/system/Helpers/URLHelper/SiteUrlTest.php
+++ b/tests/system/Helpers/URLHelper/SiteUrlTest.php
@@ -30,13 +30,6 @@ final class SiteUrlTest extends CIUnitTestCase
 {
     private App $config;
 
-    public static function setUpBeforeClass(): void
-    {
-        parent::setUpBeforeClass();
-
-        helper('url');
-    }
-
     protected function setUp(): void
     {
         parent::setUp();
diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index 05b069d83c21..745a8464111b 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -35,7 +35,6 @@ final class PagerTest extends CIUnitTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        helper('url');
 
         $_SERVER['HTTP_HOST']   = 'example.com';
         $_SERVER['REQUEST_URI'] = '/';
diff --git a/tests/system/View/ParserPluginTest.php b/tests/system/View/ParserPluginTest.php
index 55e5e4ce9c75..7a4a94a87cc2 100644
--- a/tests/system/View/ParserPluginTest.php
+++ b/tests/system/View/ParserPluginTest.php
@@ -42,7 +42,6 @@ protected function setUp(): void
 
     public function testCurrentURL()
     {
-        helper('url');
         $template = '{+ current_url +}';
 
         $this->assertSame(current_url(), $this->parser->renderString($template));
@@ -50,7 +49,6 @@ public function testCurrentURL()
 
     public function testPreviousURL()
     {
-        helper('url');
         $template = '{+ previous_url +}';
 
         // Ensure a previous URL exists to work with.
@@ -61,7 +59,6 @@ public function testPreviousURL()
 
     public function testMailto()
     {
-        helper('url');
         $template = '{+ mailto email=foo@example.com title=Silly +}';
 
         $this->assertSame(mailto('foo@example.com', 'Silly'), $this->parser->renderString($template));
@@ -72,7 +69,6 @@ public function testMailto()
      */
     public function testMailtoWithDashAndParenthesis()
     {
-        helper('url');
         $template = '{+ mailto email=foo-bar@example.com title="Scilly (the Great)" +}';
 
         $this->assertSame(mailto('foo-bar@example.com', 'Scilly (the Great)'), $this->parser->renderString($template));
@@ -80,7 +76,6 @@ public function testMailtoWithDashAndParenthesis()
 
     public function testSafeMailto()
     {
-        helper('url');
         $template = '{+ safe_mailto email=foo@example.com title=Silly +}';
 
         $this->assertSame(safe_mailto('foo@example.com', 'Silly'), $this->parser->renderString($template));

From f83160b2be6393938a46bf04e378c05b21ed7e2f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 16 Mar 2022 11:34:22 +0900
Subject: [PATCH 1770/2325] test: refactor setUp()

$_SERVER['HTTP_HOST'] is not used in Pager or Request.
---
 tests/system/Pager/PagerTest.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index 745a8464111b..1259e0065b50 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -36,18 +36,16 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $_SERVER['HTTP_HOST']   = 'example.com';
         $_SERVER['REQUEST_URI'] = '/';
         $_GET                   = [];
 
         $config          = new App();
         $config->baseURL = 'http://example.com/';
         $request         = Services::request($config);
-        $request->uri    = new URI('http://example.com');
+        $request->uri    = new URI($config->baseURL);
 
         Services::injectMock('request', $request);
 
-        $_GET         = [];
         $this->config = new Pager();
         $this->pager  = new \CodeIgniter\Pager\Pager($this->config, Services::renderer());
     }

From d071fc4bb97e7d83b9724e9f98c1874e5cb37140 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 16 Mar 2022 11:37:07 +0900
Subject: [PATCH 1771/2325] test: extract createPager() method

---
 tests/system/Pager/PagerTest.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index 1259e0065b50..4a317fcdef42 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -36,13 +36,18 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $_SERVER['REQUEST_URI'] = '/';
+        $this->createPager('/');
+    }
+
+    private function createPager(string $path): void
+    {
+        $_SERVER['REQUEST_URI'] = $path;
         $_GET                   = [];
 
         $config          = new App();
         $config->baseURL = 'http://example.com/';
         $request         = Services::request($config);
-        $request->uri    = new URI($config->baseURL);
+        $request->uri    = new URI($config->baseURL . ltrim($path, '/'));
 
         Services::injectMock('request', $request);
 

From 82a5a98e6ff887323c008a01f73e5fecfe7d0c1a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 16 Mar 2022 11:45:00 +0900
Subject: [PATCH 1772/2325] test: fix Request and Config state

Setting $request->uri later does not make correct state of Request.
At least Request::$path is incorrect.
---
 tests/system/Pager/PagerTest.php | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index 4a317fcdef42..c4b180a00f05 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -11,7 +11,10 @@
 
 namespace CodeIgniter\Pager;
 
+use CodeIgniter\Config\Factories;
+use CodeIgniter\HTTP\IncomingRequest;
 use CodeIgniter\HTTP\URI;
+use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Pager\Exceptions\PagerException;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\App;
@@ -46,8 +49,16 @@ private function createPager(string $path): void
 
         $config          = new App();
         $config->baseURL = 'http://example.com/';
-        $request         = Services::request($config);
-        $request->uri    = new URI($config->baseURL . ltrim($path, '/'));
+        Factories::injectMock('config', 'App', $config);
+
+        $request = new IncomingRequest(
+            $config,
+            new URI($config->baseURL . ltrim($path, '/')),
+            'php://input',
+            new UserAgent()
+        );
+        $request = $request->withMethod('GET');
+        Services::injectMock('request', $request);
 
         Services::injectMock('request', $request);
 
@@ -148,11 +159,11 @@ public function testStoreWithQueries()
 
         $this->pager->store('default', 3, 25, 100);
 
-        $this->assertSame('http://example.com/index.php?page=2&foo=bar', $this->pager->getPreviousPageURI());
-        $this->assertSame('http://example.com/index.php?page=4&foo=bar', $this->pager->getNextPageURI());
-        $this->assertSame('http://example.com/index.php?page=5&foo=bar', $this->pager->getPageURI(5));
+        $this->assertSame('http://example.com/index.php/?page=2&foo=bar', $this->pager->getPreviousPageURI());
+        $this->assertSame('http://example.com/index.php/?page=4&foo=bar', $this->pager->getNextPageURI());
+        $this->assertSame('http://example.com/index.php/?page=5&foo=bar', $this->pager->getPageURI(5));
         $this->assertSame(
-            'http://example.com/index.php?foo=bar&page=5',
+            'http://example.com/index.php/?foo=bar&page=5',
             $this->pager->only(['foo'])->getPageURI(5)
         );
     }

From 1094c371bc32e253bf4abea9c211fafcf86a69aa Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 16 Mar 2022 12:55:16 +0900
Subject: [PATCH 1773/2325] test: remove `index.php` from URI

---
 tests/system/Pager/PagerTest.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index c4b180a00f05..e3f61694d76b 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -45,10 +45,12 @@ protected function setUp(): void
     private function createPager(string $path): void
     {
         $_SERVER['REQUEST_URI'] = $path;
+        $_SERVER['SCRIPT_NAME'] = '/index.php';
         $_GET                   = [];
 
-        $config          = new App();
-        $config->baseURL = 'http://example.com/';
+        $config            = new App();
+        $config->baseURL   = 'http://example.com/';
+        $config->indexPage = '';
         Factories::injectMock('config', 'App', $config);
 
         $request = new IncomingRequest(
@@ -159,11 +161,11 @@ public function testStoreWithQueries()
 
         $this->pager->store('default', 3, 25, 100);
 
-        $this->assertSame('http://example.com/index.php/?page=2&foo=bar', $this->pager->getPreviousPageURI());
-        $this->assertSame('http://example.com/index.php/?page=4&foo=bar', $this->pager->getNextPageURI());
-        $this->assertSame('http://example.com/index.php/?page=5&foo=bar', $this->pager->getPageURI(5));
+        $this->assertSame('http://example.com/?page=2&foo=bar', $this->pager->getPreviousPageURI());
+        $this->assertSame('http://example.com/?page=4&foo=bar', $this->pager->getNextPageURI());
+        $this->assertSame('http://example.com/?page=5&foo=bar', $this->pager->getPageURI(5));
         $this->assertSame(
-            'http://example.com/index.php/?foo=bar&page=5',
+            'http://example.com/?foo=bar&page=5',
             $this->pager->only(['foo'])->getPageURI(5)
         );
     }

From 41845d4ebe878caa519bdf8a355cb64765951afc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 16 Mar 2022 13:05:49 +0900
Subject: [PATCH 1774/2325] fix: can't get current page from segment

---
 system/Pager/Pager.php           |  7 ++++++-
 tests/system/Pager/PagerTest.php | 10 ++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
index f3d6d4bec39d..76eed216f5d5 100644
--- a/system/Pager/Pager.php
+++ b/system/Pager/Pager.php
@@ -163,6 +163,10 @@ public function setSegment(int $number, string $group = 'default')
     {
         $this->segment[$group] = $number;
 
+        // Recalculate current page
+        $this->ensureGroup($group);
+        $this->calculateCurrentPage($group);
+
         return $this;
     }
 
@@ -383,6 +387,7 @@ protected function ensureGroup(string $group, ?int $perPage = null)
         }
 
         $this->groups[$group] = [
+            'currentUri'   => clone current_url(true),
             'uri'          => clone current_url(true),
             'hasMore'      => false,
             'total'        => null,
@@ -405,7 +410,7 @@ protected function calculateCurrentPage(string $group)
     {
         if (array_key_exists($group, $this->segment)) {
             try {
-                $this->groups[$group]['currentPage'] = (int) $this->groups[$group]['uri']->setSilent(false)->getSegment($this->segment[$group]);
+                $this->groups[$group]['currentPage'] = (int) $this->groups[$group]['currentUri']->setSilent(false)->getSegment($this->segment[$group]);
             } catch (HTTPException $e) {
                 $this->groups[$group]['currentPage'] = 1;
             }
diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index e3f61694d76b..085c569864fa 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -229,6 +229,16 @@ public function testGetCurrentPageDetectsGroupedURI()
         $this->assertSame(2, $this->pager->getCurrentPage('foo'));
     }
 
+    public function testGetCurrentPageFromSegment()
+    {
+        $this->createPager('/page/2');
+
+        $this->pager->setPath('foo');
+        $this->pager->setSegment(2);
+
+        $this->assertSame(2, $this->pager->getCurrentPage());
+    }
+
     public function testGetTotalPagesDefaultsToOne()
     {
         $this->assertSame(1, $this->pager->getPageCount());

From e07611de529ca9c580b18a38788186c0812111a7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 16 Mar 2022 13:28:39 +0900
Subject: [PATCH 1775/2325] test: rename variable name

---
 tests/system/Pager/PagerTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index 085c569864fa..6c6b14fdca7b 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -42,9 +42,9 @@ protected function setUp(): void
         $this->createPager('/');
     }
 
-    private function createPager(string $path): void
+    private function createPager(string $requestUri): void
     {
-        $_SERVER['REQUEST_URI'] = $path;
+        $_SERVER['REQUEST_URI'] = $requestUri;
         $_SERVER['SCRIPT_NAME'] = '/index.php';
         $_GET                   = [];
 
@@ -55,7 +55,7 @@ private function createPager(string $path): void
 
         $request = new IncomingRequest(
             $config,
-            new URI($config->baseURL . ltrim($path, '/')),
+            new URI($config->baseURL . ltrim($requestUri, '/')),
             'php://input',
             new UserAgent()
         );

From 65f5f6f6032f64a9ffd3349f7784118d7001d772 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 16 Mar 2022 13:39:25 +0900
Subject: [PATCH 1776/2325] refactor: break long lines

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

diff --git a/system/Pager/Pager.php b/system/Pager/Pager.php
index 76eed216f5d5..32843ba9e98d 100644
--- a/system/Pager/Pager.php
+++ b/system/Pager/Pager.php
@@ -283,7 +283,15 @@ public function getPageURI(?int $page = null, string $group = 'default', bool $r
             $uri->setQueryArray($query);
         }
 
-        return $returnObject === true ? $uri : URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
+        return ($returnObject === true)
+            ? $uri
+            : URI::createURIString(
+                $uri->getScheme(),
+                $uri->getAuthority(),
+                $uri->getPath(),
+                $uri->getQuery(),
+                $uri->getFragment()
+            );
     }
 
     /**
@@ -410,7 +418,8 @@ protected function calculateCurrentPage(string $group)
     {
         if (array_key_exists($group, $this->segment)) {
             try {
-                $this->groups[$group]['currentPage'] = (int) $this->groups[$group]['currentUri']->setSilent(false)->getSegment($this->segment[$group]);
+                $this->groups[$group]['currentPage'] = (int) $this->groups[$group]['currentUri']
+                    ->setSilent(false)->getSegment($this->segment[$group]);
             } catch (HTTPException $e) {
                 $this->groups[$group]['currentPage'] = 1;
             }

From e954172459431185ad8233c446507a8bb4453f53 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 16 Mar 2022 14:16:20 +0900
Subject: [PATCH 1777/2325] fix: ErrorException when the field is not sent

ErrorException
DateTime::createFromFormat(): Passing null to parameter #2 ($datetime) of type string is deprecated
---
 system/Validation/FormatRules.php           | 4 ++++
 tests/system/Validation/FormatRulesTest.php | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index 990ea8128809..676ae8485ba2 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -333,6 +333,10 @@ public function valid_url_strict(?string $str = null, ?string $validSchemes = nu
      */
     public function valid_date(?string $str = null, ?string $format = null): bool
     {
+        if (($str === null)) {
+            return false;
+        }
+
         if (empty($format)) {
             return strtotime($str) !== false;
         }
diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php
index f4a22b2af973..bf9bf92eb6dc 100644
--- a/tests/system/Validation/FormatRulesTest.php
+++ b/tests/system/Validation/FormatRulesTest.php
@@ -1206,6 +1206,11 @@ public function testValidDate(?string $str, ?string $format, bool $expected): vo
     public function validDateProvider(): Generator
     {
         yield from [
+            [
+                null,
+                'Y-m-d',
+                false,
+            ],
             [
                 'Sun',
                 'D',

From 6bd3ee9ae10c21330f1bcbddcb3b3e7c39442dd7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 16 Mar 2022 21:13:35 +0900
Subject: [PATCH 1778/2325] refactor: remove uneeded parentheses

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

diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index 676ae8485ba2..21353d1a3385 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -333,7 +333,7 @@ public function valid_url_strict(?string $str = null, ?string $validSchemes = nu
      */
     public function valid_date(?string $str = null, ?string $format = null): bool
     {
-        if (($str === null)) {
+        if ($str === null) {
             return false;
         }
 

From 2a2e9dae03905d7438dacbebce448383233167d7 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Thu, 17 Mar 2022 13:10:11 +0800
Subject: [PATCH 1779/2325] Update Laminas Escaper to v2.10

---
 system/ThirdParty/Escaper/Escaper.php | 30 +++++++++------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/system/ThirdParty/Escaper/Escaper.php b/system/ThirdParty/Escaper/Escaper.php
index ca0f1a9dd21c..d6a02e14c9be 100644
--- a/system/ThirdParty/Escaper/Escaper.php
+++ b/system/ThirdParty/Escaper/Escaper.php
@@ -6,10 +6,8 @@
 
 use function bin2hex;
 use function ctype_digit;
-use function function_exists;
 use function hexdec;
 use function htmlspecialchars;
-use function iconv;
 use function in_array;
 use function mb_convert_encoding;
 use function ord;
@@ -38,7 +36,7 @@ class Escaper
      * entities that XML supports. Using HTML entities would result in this error:
      *     XML Parsing Error: undefined entity
      *
-     * @var array
+     * @var array<int, string>
      */
     protected static $htmlNamedEntityMap = [
         34 => 'quot', // quotation mark
@@ -67,6 +65,7 @@ class Escaper
      * Static Matcher which escapes characters for HTML Attribute contexts
      *
      * @var callable
+     * @psalm-var callable(array<array-key, string>):string
      */
     protected $htmlAttrMatcher;
 
@@ -74,6 +73,7 @@ class Escaper
      * Static Matcher which escapes characters for Javascript contexts
      *
      * @var callable
+     * @psalm-var callable(array<array-key, string>):string
      */
     protected $jsMatcher;
 
@@ -81,6 +81,7 @@ class Escaper
      * Static Matcher which escapes characters for CSS Attribute contexts
      *
      * @var callable
+     * @psalm-var callable(array<array-key, string>):string
      */
     protected $cssMatcher;
 
@@ -255,7 +256,7 @@ public function escapeCss(string $string)
      * Callback function for preg_replace_callback that applies HTML Attribute
      * escaping to all matches.
      *
-     * @param array $matches
+     * @param array<array-key, string> $matches
      * @return string
      */
     protected function htmlAttrMatcher($matches)
@@ -302,7 +303,7 @@ protected function htmlAttrMatcher($matches)
      * Callback function for preg_replace_callback that applies Javascript
      * escaping to all matches.
      *
-     * @param array $matches
+     * @param array<array-key, string> $matches
      * @return string
      */
     protected function jsMatcher($matches)
@@ -325,7 +326,7 @@ protected function jsMatcher($matches)
      * Callback function for preg_replace_callback that applies CSS
      * escaping to all matches.
      *
-     * @param array $matches
+     * @param array<array-key, string> $matches
      * @return string
      */
     protected function cssMatcher($matches)
@@ -391,32 +392,21 @@ protected function isUtf8($string)
     }
 
     /**
-     * Encoding conversion helper which wraps iconv and mbstring where they exist or throws
-     * and exception where neither is available.
+     * Encoding conversion helper which wraps mb_convert_encoding
      *
      * @param string $string
      * @param string $to
      * @param array|string $from
-     * @throws Exception\RuntimeException
      * @return string
      */
     protected function convertEncoding($string, $to, $from)
     {
-        if (function_exists('iconv')) {
-            $result = iconv($from, $to, $string);
-        } elseif (function_exists('mb_convert_encoding')) {
-            $result = mb_convert_encoding($string, $to, $from);
-        } else {
-            throw new Exception\RuntimeException(
-                static::class
-                . ' requires either the iconv or mbstring extension to be installed'
-                . ' when escaping for non UTF-8 strings.'
-            );
-        }
+        $result = mb_convert_encoding($string, $to, $from);
 
         if ($result === false) {
             return ''; // return non-fatal blank string on encoding errors from users
         }
+
         return $result;
     }
 }

From b3589085dd1643e0c953d396d7515514651c1356 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 18 Mar 2022 11:59:00 +0900
Subject: [PATCH 1780/2325] docs: clarify that current_url() returns URL based
 on Config\App

---
 system/Helpers/url_helper.php                | 2 +-
 user_guide_src/source/helpers/url_helper.rst | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
index 98dd596c1a4d..e1e8b8a30e32 100644
--- a/system/Helpers/url_helper.php
+++ b/system/Helpers/url_helper.php
@@ -109,7 +109,7 @@ function base_url($relativePath = '', ?string $scheme = null): string
 
 if (! function_exists('current_url')) {
     /**
-     * Returns the current full URL based on the IncomingRequest.
+     * Returns the current full URL based on the Config\App settings and IncomingRequest.
      * String returns ignore query and fragment parts.
      *
      * @param bool                 $returnObject True to return an object instead of a string
diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst
index 37374890548e..8f0252c27cff 100644
--- a/user_guide_src/source/helpers/url_helper.rst
+++ b/user_guide_src/source/helpers/url_helper.rst
@@ -88,8 +88,9 @@ The following functions are available:
     :returns: The current URL
     :rtype:    string|\\CodeIgniter\\HTTP\\URI
 
-    Returns the full URL (including segments) of the page being currently
-    viewed.
+    Returns the full URL (including segments) of the page being currently viewed.
+    However for security reasons, it is created based on the ``Config\App`` settings,
+    and not intended to match the browser URL.
 
     .. note:: Calling this function is the same as doing this:
 

From 5b528af01f1a2b478454ff10c528c1aaecd54252 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 6 Mar 2022 14:38:42 +0900
Subject: [PATCH 1781/2325] fix: now initEnvValue() converts type when the
 default property value is int and float

---
 system/Config/BaseConfig.php                  | 22 ++++++++++++++-----
 tests/system/Config/BaseConfigTest.php        | 19 ++++++++++++++++
 tests/system/Config/fixtures/.env             |  5 +++++
 tests/system/Config/fixtures/SimpleConfig.php |  3 +++
 4 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/system/Config/BaseConfig.php b/system/Config/BaseConfig.php
index 9b71a4963bab..359fcc1488ba 100644
--- a/system/Config/BaseConfig.php
+++ b/system/Config/BaseConfig.php
@@ -88,7 +88,7 @@ public function __construct()
      *
      * @param mixed $property
      *
-     * @return mixed
+     * @return void
      */
     protected function initEnvValue(&$property, string $name, string $prefix, string $shortPrefix)
     {
@@ -102,16 +102,28 @@ protected function initEnvValue(&$property, string $name, string $prefix, string
             } elseif ($value === 'true') {
                 $value = true;
             }
-            $property = is_bool($value) ? $value : trim($value, '\'"');
-        }
+            if (is_bool($value)) {
+                $property = $value;
+
+                return;
+            }
+
+            $value = trim($value, '\'"');
 
-        return $property;
+            if (is_int($property)) {
+                $value = (int) $value;
+            } elseif (is_float($property)) {
+                $value = (float) $value;
+            }
+
+            $property = $value;
+        }
     }
 
     /**
      * Retrieve an environment-specific configuration setting
      *
-     * @return mixed
+     * @return string|null
      */
     protected function getEnvValue(string $property, string $prefix, string $shortPrefix)
     {
diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php
index 4c2d4ba20ccb..667a877287fb 100644
--- a/tests/system/Config/BaseConfigTest.php
+++ b/tests/system/Config/BaseConfigTest.php
@@ -55,6 +55,25 @@ public function testBasicValues()
         $this->assertSame(18, $config->golf);
     }
 
+    public function testUseDefaultValueTypeIntAndFloatValues()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, '.env');
+        $dotenv->load();
+        $config = new SimpleConfig();
+
+        $this->assertSame(0.0, $config->float);
+        $this->assertSame(999, $config->int);
+    }
+
+    public function testUseDefaultValueTypeStringValue()
+    {
+        $dotenv = new DotEnv($this->fixturesFolder, '.env');
+        $dotenv->load();
+        $config = new SimpleConfig();
+
+        $this->assertSame('123456', $config->password);
+    }
+
     /**
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
diff --git a/tests/system/Config/fixtures/.env b/tests/system/Config/fixtures/.env
index 2f859cc9faca..38ca0bed6f0b 100644
--- a/tests/system/Config/fixtures/.env
+++ b/tests/system/Config/fixtures/.env
@@ -32,3 +32,8 @@ SimpleConfig.crew.captain = Malcolm
 SimpleConfig.crew.pilot = Wash
 SimpleConfig.crew.comms = true
 SimpleConfig.crew.doctor = false
+
+SimpleConfig.float = '0.0'
+SimpleConfig.int = '999'
+
+SimpleConfig.password = 123456
diff --git a/tests/system/Config/fixtures/SimpleConfig.php b/tests/system/Config/fixtures/SimpleConfig.php
index 69f5590e90f1..d64aa1a0d741 100644
--- a/tests/system/Config/fixtures/SimpleConfig.php
+++ b/tests/system/Config/fixtures/SimpleConfig.php
@@ -48,4 +48,7 @@ class SimpleConfig extends \CodeIgniter\Config\BaseConfig
     public $one_deep = [
         'under_deep' => null,
     ];
+    public $float    = 12.34;
+    public $int      = 1234;
+    public $password = 'secret';
 }

From 8524bb963bd79bd3be676fa21ab82b8c98b6a412 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 18 Mar 2022 16:08:22 +0900
Subject: [PATCH 1782/2325] test: add test for nullable int property

---
 tests/system/Config/BaseConfigTest.php        | 3 +++
 tests/system/Config/fixtures/.env             | 2 ++
 tests/system/Config/fixtures/SimpleConfig.php | 7 ++++---
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php
index 667a877287fb..20d2f77c8421 100644
--- a/tests/system/Config/BaseConfigTest.php
+++ b/tests/system/Config/BaseConfigTest.php
@@ -117,6 +117,9 @@ public function testEnvironmentOverrides()
         $this->assertSame('bar', $config->onedeep_value);
         // array property name with underscore and key with underscore
         $this->assertSame('foo', $config->one_deep['under_deep']);
+
+        // The default property value is null but has type
+        $this->assertSame(20, $config->size);
     }
 
     public function testPrefixedValues()
diff --git a/tests/system/Config/fixtures/.env b/tests/system/Config/fixtures/.env
index 38ca0bed6f0b..36f5651cf532 100644
--- a/tests/system/Config/fixtures/.env
+++ b/tests/system/Config/fixtures/.env
@@ -37,3 +37,5 @@ SimpleConfig.float = '0.0'
 SimpleConfig.int = '999'
 
 SimpleConfig.password = 123456
+
+SimpleConfig.size=20
diff --git a/tests/system/Config/fixtures/SimpleConfig.php b/tests/system/Config/fixtures/SimpleConfig.php
index d64aa1a0d741..9870c72b0ac2 100644
--- a/tests/system/Config/fixtures/SimpleConfig.php
+++ b/tests/system/Config/fixtures/SimpleConfig.php
@@ -48,7 +48,8 @@ class SimpleConfig extends \CodeIgniter\Config\BaseConfig
     public $one_deep = [
         'under_deep' => null,
     ];
-    public $float    = 12.34;
-    public $int      = 1234;
-    public $password = 'secret';
+    public $float     = 12.34;
+    public $int       = 1234;
+    public $password  = 'secret';
+    public ?int $size = null;
 }

From 2609cc949c1fdb05f585f2211c12e8b9ca8c3887 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 18 Mar 2022 17:30:31 +0900
Subject: [PATCH 1783/2325] docs: add note about `attributes`

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

diff --git a/user_guide_src/source/models/entities.rst b/user_guide_src/source/models/entities.rst
index a1941fb31d97..d2c99c8623b6 100644
--- a/user_guide_src/source/models/entities.rst
+++ b/user_guide_src/source/models/entities.rst
@@ -31,6 +31,8 @@ Assume you have a database table named ``users`` that has the following schema::
     password    - string
     created_at  - datetime
 
+.. important:: ``attributes`` is a reserved word for internal use. If you use it as a column name, the Entity does not work correctly.
+
 Create the Entity Class
 -----------------------
 

From d61b3c7487f2168f38b6f01ea2398b409d7c2523 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 19 Mar 2022 10:11:18 +0900
Subject: [PATCH 1784/2325] test: change .env entry

Do not recommend to use `'` for int/float value.
---
 tests/system/Config/fixtures/.env | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/system/Config/fixtures/.env b/tests/system/Config/fixtures/.env
index 36f5651cf532..17d9e8e9116e 100644
--- a/tests/system/Config/fixtures/.env
+++ b/tests/system/Config/fixtures/.env
@@ -33,9 +33,12 @@ SimpleConfig.crew.pilot = Wash
 SimpleConfig.crew.comms = true
 SimpleConfig.crew.doctor = false
 
-SimpleConfig.float = '0.0'
-SimpleConfig.int = '999'
+# The default value's type in the Config class is float, so it will be converted to float
+SimpleConfig.float = 0.0
+# The default value's type in the Config class is int, so it will be converted to int
+SimpleConfig.int = 999
 
 SimpleConfig.password = 123456
 
+# The property type in the Config class is ?int, so it will be converted to int by PHP
 SimpleConfig.size=20

From 4f97aac34420631753a936c2b7decd7f17cb68c0 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sat, 19 Mar 2022 22:52:14 +0700
Subject: [PATCH 1785/2325] [Rector] Clean up skip config and re-run Rector

---
 app/Config/App.php                            |  3 +-
 app/Config/Database.php                       |  3 +-
 app/Config/Format.php                         |  8 +++--
 app/Config/Logger.php                         |  3 +-
 rector.php                                    | 16 +++++++---
 system/Cache/Handlers/PredisHandler.php       |  2 +-
 system/CodeIgniter.php                        |  2 +-
 system/Commands/Database/CreateDatabase.php   |  3 +-
 .../Generators/ControllerGenerator.php        |  9 ++++--
 system/Config/AutoloadConfig.php              | 28 +++++++++++------
 system/Config/BaseService.php                 |  4 +--
 system/Database/BaseConnection.php            |  2 +-
 system/Database/BasePreparedQuery.php         |  2 +-
 system/Database/BaseResult.php                |  3 +-
 system/Database/MySQLi/Result.php             |  2 +-
 system/Database/OCI8/Result.php               |  2 +-
 system/Database/Postgre/Result.php            |  2 +-
 system/Database/SQLSRV/Result.php             |  2 +-
 system/Database/SQLite3/Connection.php        |  2 +-
 system/Database/SQLite3/Result.php            |  4 +--
 system/Images/Handlers/ImageMagickHandler.php |  2 +-
 system/Language/Language.php                  |  2 +-
 system/Test/Fabricator.php                    |  3 +-
 system/Test/Mock/MockResult.php               |  3 +-
 system/View/View.php                          |  3 +-
 tests/system/API/ResponseTraitTest.php        |  8 ++---
 tests/system/Autoloader/AutoloaderTest.php    | 11 +++----
 tests/system/Autoloader/FileLocatorTest.php   |  5 +--
 tests/system/CLI/CLITest.php                  |  5 +--
 tests/system/Cache/CacheFactoryTest.php       |  9 +++---
 .../system/Cache/Handlers/BaseHandlerTest.php |  5 +--
 .../system/Cache/Handlers/FileHandlerTest.php |  3 +-
 tests/system/CodeIgniterTest.php              |  9 ++----
 tests/system/CommonFunctionsTest.php          |  2 +-
 tests/system/Config/DotEnvTest.php            |  5 +--
 tests/system/Config/ServicesTest.php          |  3 +-
 tests/system/Database/Builder/InsertTest.php  |  7 +++--
 tests/system/Database/Builder/ReplaceTest.php |  3 +-
 tests/system/Database/Builder/UpdateTest.php  |  9 +++---
 tests/system/Database/ConfigTest.php          | 13 ++++----
 tests/system/Database/DatabaseSeederTest.php  |  7 +++--
 tests/system/Database/Live/DbUtilsTest.php    |  5 +--
 tests/system/Database/Live/DeleteTest.php     |  2 +-
 tests/system/Database/Live/ForgeTest.php      | 31 ++++++++++---------
 tests/system/Database/Live/GetTest.php        |  5 +--
 .../Database/Live/SQLite/AlterTableTest.php   | 16 ++++------
 .../Migrations/MigrationRunnerTest.php        |  5 +--
 tests/system/Encryption/EncryptionTest.php    | 14 ++++-----
 .../Handlers/OpenSSLHandlerTest.php           | 12 +++----
 .../Encryption/Handlers/SodiumHandlerTest.php | 24 ++++++--------
 tests/system/Entity/EntityTest.php            |  2 +-
 tests/system/Files/FileTest.php               |  3 +-
 tests/system/Format/FormatTest.php            |  8 ++---
 tests/system/Format/JSONFormatterTest.php     |  3 +-
 .../HTTP/CURLRequestDoNotShareOptionsTest.php |  7 ++---
 tests/system/HTTP/CURLRequestTest.php         |  7 ++---
 tests/system/Helpers/ArrayHelperTest.php      |  6 ++--
 tests/system/HomeTest.php                     |  3 +-
 tests/system/Honeypot/HoneypotTest.php        |  4 +--
 tests/system/I18n/TimeTest.php                | 22 ++++++-------
 tests/system/Language/LanguageTest.php        |  5 +--
 tests/system/Models/FindModelTest.php         |  3 +-
 .../system/RESTful/ResourceControllerTest.php | 10 +++---
 .../system/RESTful/ResourcePresenterTest.php  | 18 +++++------
 .../Session/Handlers/DatabaseHandlerTest.php  |  2 +-
 tests/system/Session/SessionTest.php          |  2 +-
 tests/system/Test/FabricatorTest.php          |  8 ++---
 tests/system/Test/FilterTestTraitTest.php     |  6 ++--
 tests/system/View/CellTest.php                |  9 ++----
 69 files changed, 235 insertions(+), 226 deletions(-)

diff --git a/app/Config/App.php b/app/Config/App.php
index 7ab0c7d7cfcb..c6c716822756 100644
--- a/app/Config/App.php
+++ b/app/Config/App.php
@@ -3,6 +3,7 @@
 namespace Config;
 
 use CodeIgniter\Config\BaseConfig;
+use CodeIgniter\Session\Handlers\FileHandler;
 
 class App extends BaseConfig
 {
@@ -151,7 +152,7 @@ class App extends BaseConfig
      *
      * @var string
      */
-    public $sessionDriver = 'CodeIgniter\Session\Handlers\FileHandler';
+    public $sessionDriver = FileHandler::class;
 
     /**
      * --------------------------------------------------------------------------
diff --git a/app/Config/Database.php b/app/Config/Database.php
index 1e6340899bf4..376de53a821d 100644
--- a/app/Config/Database.php
+++ b/app/Config/Database.php
@@ -3,6 +3,7 @@
 namespace Config;
 
 use CodeIgniter\Database\Config;
+use SQLite3;
 
 /**
  * Database Configuration
@@ -62,7 +63,7 @@ class Database extends Config
         'username' => '',
         'password' => '',
         'database' => ':memory:',
-        'DBDriver' => 'SQLite3',
+        'DBDriver' => SQLite3::class,
         'DBPrefix' => 'db_',  // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE FOR CI DEVS
         'pConnect' => false,
         'DBDebug'  => (ENVIRONMENT !== 'production'),
diff --git a/app/Config/Format.php b/app/Config/Format.php
index 533540e27918..d89e40842c22 100644
--- a/app/Config/Format.php
+++ b/app/Config/Format.php
@@ -4,6 +4,8 @@
 
 use CodeIgniter\Config\BaseConfig;
 use CodeIgniter\Format\FormatterInterface;
+use CodeIgniter\Format\JSONFormatter;
+use CodeIgniter\Format\XMLFormatter;
 
 class Format extends BaseConfig
 {
@@ -40,9 +42,9 @@ class Format extends BaseConfig
      * @var array<string, string>
      */
     public $formatters = [
-        'application/json' => 'CodeIgniter\Format\JSONFormatter',
-        'application/xml'  => 'CodeIgniter\Format\XMLFormatter',
-        'text/xml'         => 'CodeIgniter\Format\XMLFormatter',
+        'application/json' => JSONFormatter::class,
+        'application/xml'  => XMLFormatter::class,
+        'text/xml'         => XMLFormatter::class,
     ];
 
     /**
diff --git a/app/Config/Logger.php b/app/Config/Logger.php
index a4eaeb648955..406d9aaccc85 100644
--- a/app/Config/Logger.php
+++ b/app/Config/Logger.php
@@ -2,6 +2,7 @@
 
 namespace Config;
 
+use CodeIgniter\Log\Handlers\FileHandler;
 use CodeIgniter\Config\BaseConfig;
 
 class Logger extends BaseConfig
@@ -83,7 +84,7 @@ class Logger extends BaseConfig
          * File Handler
          * --------------------------------------------------------------------
          */
-        'CodeIgniter\Log\Handlers\FileHandler' => [
+        FileHandler::class => [
 
             // The log levels that this handler will handle.
             'handles' => [
diff --git a/rector.php b/rector.php
index b90225d80fcf..6c2bc99bcf8d 100644
--- a/rector.php
+++ b/rector.php
@@ -84,8 +84,6 @@
         RemoveUnusedPrivateMethodRector::class => [
             // private method called via getPrivateMethodInvoker
             __DIR__ . '/tests/system/Test/ReflectionHelperTest.php',
-            // Rector bug?
-            __DIR__ . '/system/CodeIgniter.php',
         ],
 
         // call on purpose for nothing happen check
@@ -103,9 +101,17 @@
             __DIR__ . '/system/Session/Handlers',
         ],
 
-        // may cause load view files directly when detecting class that
-        // make warning
-        StringClassNameToClassConstantRector::class,
+        StringClassNameToClassConstantRector::class => [
+            // may cause load view files directly when detecting namespaced string
+            // due to internal PHPStan issue
+            __DIR__ . '/app/Config/Pager.php',
+            __DIR__ . '/app/Config/Validation.php',
+            __DIR__ . '/tests/system/Validation/StrictRules/ValidationTest.php',
+            __DIR__ . '/tests/system/Validation/ValidationTest.php',
+
+            // expected Qualified name
+            __DIR__ . '/tests/system/Autoloader/FileLocatorTest.php',
+        ],
 
         // sometime too detail
         CountOnNullRector::class,
diff --git a/system/Cache/Handlers/PredisHandler.php b/system/Cache/Handlers/PredisHandler.php
index 5d1f37cdfc24..87ab4e333dca 100644
--- a/system/Cache/Handlers/PredisHandler.php
+++ b/system/Cache/Handlers/PredisHandler.php
@@ -222,6 +222,6 @@ public function getMetaData(string $key)
      */
     public function isSupported(): bool
     {
-        return class_exists('Predis\Client');
+        return class_exists(Client::class);
     }
 }
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 86e70546dd41..127e087458a0 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -830,7 +830,7 @@ protected function startController()
         $this->benchmark->start('controller_constructor');
 
         // Is it routed to a Closure?
-        if (is_object($this->controller) && (get_class($this->controller) === 'Closure')) {
+        if (is_object($this->controller) && (get_class($this->controller) === Closure::class)) {
             $controller = $this->controller;
 
             return $controller(...$this->router->params());
diff --git a/system/Commands/Database/CreateDatabase.php b/system/Commands/Database/CreateDatabase.php
index 17e1e51bb68b..0682f945b9bf 100644
--- a/system/Commands/Database/CreateDatabase.php
+++ b/system/Commands/Database/CreateDatabase.php
@@ -16,6 +16,7 @@
 use CodeIgniter\Config\Factories;
 use CodeIgniter\Database\SQLite3\Connection;
 use Config\Database;
+use SQLite3;
 use Throwable;
 
 /**
@@ -106,7 +107,7 @@ public function run(array $params)
                     $name = str_replace(['.db', '.sqlite'], '', $name) . ".{$ext}";
                 }
 
-                $config->{$group}['DBDriver'] = 'SQLite3';
+                $config->{$group}['DBDriver'] = SQLite3::class;
                 $config->{$group}['database'] = $name;
 
                 if ($name !== ':memory:') {
diff --git a/system/Commands/Generators/ControllerGenerator.php b/system/Commands/Generators/ControllerGenerator.php
index 36a951cf0df0..f27c77ee0fe5 100644
--- a/system/Commands/Generators/ControllerGenerator.php
+++ b/system/Commands/Generators/ControllerGenerator.php
@@ -14,6 +14,9 @@
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\CLI\GeneratorTrait;
+use CodeIgniter\Controller;
+use CodeIgniter\RESTful\ResourceController;
+use CodeIgniter\RESTful\ResourcePresenter;
 
 /**
  * Generates a skeleton controller file.
@@ -99,7 +102,7 @@ protected function prepare(string $class): string
         // Gets the appropriate parent class to extend.
         if ($bare || $rest) {
             if ($bare) {
-                $useStatement = 'CodeIgniter\Controller';
+                $useStatement = Controller::class;
                 $extends      = 'Controller';
             } elseif ($rest) {
                 $rest = is_string($rest) ? $rest : 'controller';
@@ -112,10 +115,10 @@ protected function prepare(string $class): string
                 }
 
                 if ($rest === 'controller') {
-                    $useStatement = 'CodeIgniter\RESTful\ResourceController';
+                    $useStatement = ResourceController::class;
                     $extends      = 'ResourceController';
                 } elseif ($rest === 'presenter') {
-                    $useStatement = 'CodeIgniter\RESTful\ResourcePresenter';
+                    $useStatement = ResourcePresenter::class;
                     $extends      = 'ResourcePresenter';
                 }
             }
diff --git a/system/Config/AutoloadConfig.php b/system/Config/AutoloadConfig.php
index d3dbefcd7c3c..13a6721fd2e6 100644
--- a/system/Config/AutoloadConfig.php
+++ b/system/Config/AutoloadConfig.php
@@ -11,6 +11,16 @@
 
 namespace CodeIgniter\Config;
 
+use Laminas\Escaper\Escaper;
+use Psr\Log\AbstractLogger;
+use Psr\Log\InvalidArgumentException;
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerAwareTrait;
+use Psr\Log\LoggerInterface;
+use Psr\Log\LoggerTrait;
+use Psr\Log\LogLevel;
+use Psr\Log\NullLogger;
+
 /**
  * AUTOLOADER CONFIGURATION
  *
@@ -93,15 +103,15 @@ class AutoloadConfig
      * @var array<string, string>
      */
     protected $coreClassmap = [
-        'Psr\Log\AbstractLogger'           => SYSTEMPATH . 'ThirdParty/PSR/Log/AbstractLogger.php',
-        'Psr\Log\InvalidArgumentException' => SYSTEMPATH . 'ThirdParty/PSR/Log/InvalidArgumentException.php',
-        'Psr\Log\LoggerAwareInterface'     => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareInterface.php',
-        'Psr\Log\LoggerAwareTrait'         => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareTrait.php',
-        'Psr\Log\LoggerInterface'          => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerInterface.php',
-        'Psr\Log\LoggerTrait'              => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerTrait.php',
-        'Psr\Log\LogLevel'                 => SYSTEMPATH . 'ThirdParty/PSR/Log/LogLevel.php',
-        'Psr\Log\NullLogger'               => SYSTEMPATH . 'ThirdParty/PSR/Log/NullLogger.php',
-        'Laminas\Escaper\Escaper'          => SYSTEMPATH . 'ThirdParty/Escaper/Escaper.php',
+        AbstractLogger::class           => SYSTEMPATH . 'ThirdParty/PSR/Log/AbstractLogger.php',
+        InvalidArgumentException::class => SYSTEMPATH . 'ThirdParty/PSR/Log/InvalidArgumentException.php',
+        LoggerAwareInterface::class     => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareInterface.php',
+        LoggerAwareTrait::class         => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareTrait.php',
+        LoggerInterface::class          => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerInterface.php',
+        LoggerTrait::class              => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerTrait.php',
+        LogLevel::class                 => SYSTEMPATH . 'ThirdParty/PSR/Log/LogLevel.php',
+        NullLogger::class               => SYSTEMPATH . 'ThirdParty/PSR/Log/NullLogger.php',
+        Escaper::class                  => SYSTEMPATH . 'ThirdParty/Escaper/Escaper.php',
     ];
 
     /**
diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
index 572b6cf576bd..4244b7a7097d 100644
--- a/system/Config/BaseService.php
+++ b/system/Config/BaseService.php
@@ -332,7 +332,7 @@ protected static function discoverServices(string $name, array $arguments)
                 foreach ($files as $file) {
                     $classname = $locator->getClassname($file);
 
-                    if (! in_array($classname, ['CodeIgniter\\Config\\Services'], true)) {
+                    if (! in_array($classname, [\CodeIgniter\Config\Services::class], true)) {
                         static::$services[] = new $classname();
                     }
                 }
@@ -369,7 +369,7 @@ protected static function buildServicesCache(): void
                 foreach ($files as $file) {
                     $classname = $locator->getClassname($file);
 
-                    if ($classname !== 'CodeIgniter\\Config\\Services') {
+                    if ($classname !== \CodeIgniter\Config\Services::class) {
                         self::$serviceNames[] = $classname;
                         static::$services[]   = new $classname();
                     }
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 4f54c1980830..d2ce3fdd390a 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -326,7 +326,7 @@ abstract class BaseConnection implements ConnectionInterface
      *
      * @var string
      */
-    protected $queryClass = 'CodeIgniter\\Database\\Query';
+    protected $queryClass = Query::class;
 
     /**
      * Saves our connection settings.
diff --git a/system/Database/BasePreparedQuery.php b/system/Database/BasePreparedQuery.php
index b6e2db706d2a..ce5a208a1ef3 100644
--- a/system/Database/BasePreparedQuery.php
+++ b/system/Database/BasePreparedQuery.php
@@ -69,7 +69,7 @@ public function __construct(BaseConnection $db)
      *
      * @return mixed
      */
-    public function prepare(string $sql, array $options = [], string $queryClass = 'CodeIgniter\\Database\\Query')
+    public function prepare(string $sql, array $options = [], string $queryClass = Query::class)
     {
         // We only supports positional placeholders (?)
         // in order to work with the execute method below, so we
diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php
index 5d223c7fc08b..b5818525dc30 100644
--- a/system/Database/BaseResult.php
+++ b/system/Database/BaseResult.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Database;
 
 use CodeIgniter\Entity\Entity;
+use stdClass;
 
 /**
  * Class BaseResult
@@ -508,5 +509,5 @@ abstract protected function fetchAssoc();
      *
      * @return object
      */
-    abstract protected function fetchObject(string $className = 'stdClass');
+    abstract protected function fetchObject(string $className = stdClass::class);
 }
diff --git a/system/Database/MySQLi/Result.php b/system/Database/MySQLi/Result.php
index 7eab7d86c685..35f480776c85 100644
--- a/system/Database/MySQLi/Result.php
+++ b/system/Database/MySQLi/Result.php
@@ -139,7 +139,7 @@ protected function fetchAssoc()
      *
      * @return bool|Entity|object
      */
-    protected function fetchObject(string $className = 'stdClass')
+    protected function fetchObject(string $className = stdClass::class)
     {
         if (is_subclass_of($className, Entity::class)) {
             return empty($data = $this->fetchAssoc()) ? false : (new $className())->setAttributes($data);
diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php
index ce3a73def1c4..6ad26b649480 100644
--- a/system/Database/OCI8/Result.php
+++ b/system/Database/OCI8/Result.php
@@ -98,7 +98,7 @@ protected function fetchObject(string $className = stdClass::class)
     {
         $row = oci_fetch_object($this->resultID);
 
-        if ($className === 'stdClass' || ! $row) {
+        if ($className === stdClass::class || ! $row) {
             return $row;
         }
         if (is_subclass_of($className, Entity::class)) {
diff --git a/system/Database/Postgre/Result.php b/system/Database/Postgre/Result.php
index 76a0dd956515..581d79b1d421 100644
--- a/system/Database/Postgre/Result.php
+++ b/system/Database/Postgre/Result.php
@@ -105,7 +105,7 @@ protected function fetchAssoc()
      *
      * @return bool|Entity|object
      */
-    protected function fetchObject(string $className = 'stdClass')
+    protected function fetchObject(string $className = stdClass::class)
     {
         if (is_subclass_of($className, Entity::class)) {
             return empty($data = $this->fetchAssoc()) ? false : (new $className())->setAttributes($data);
diff --git a/system/Database/SQLSRV/Result.php b/system/Database/SQLSRV/Result.php
index 2a55e452ac09..045a5eebd81a 100755
--- a/system/Database/SQLSRV/Result.php
+++ b/system/Database/SQLSRV/Result.php
@@ -147,7 +147,7 @@ protected function fetchAssoc()
      *
      * @return bool|Entity|object
      */
-    protected function fetchObject(string $className = 'stdClass')
+    protected function fetchObject(string $className = stdClass::class)
     {
         if (is_subclass_of($className, Entity::class)) {
             return empty($data = $this->fetchAssoc()) ? false : (new $className())->setAttributes($data);
diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
index 39fbca8bcfea..e335e7985ba7 100644
--- a/system/Database/SQLite3/Connection.php
+++ b/system/Database/SQLite3/Connection.php
@@ -28,7 +28,7 @@ class Connection extends BaseConnection
      *
      * @var string
      */
-    public $DBDriver = 'SQLite3';
+    public $DBDriver = SQLite3::class;
 
     /**
      * Identifier escape character
diff --git a/system/Database/SQLite3/Result.php b/system/Database/SQLite3/Result.php
index 6afc04c51578..39b9897af1e4 100644
--- a/system/Database/SQLite3/Result.php
+++ b/system/Database/SQLite3/Result.php
@@ -122,14 +122,14 @@ protected function fetchAssoc()
      *
      * @return bool|object
      */
-    protected function fetchObject(string $className = 'stdClass')
+    protected function fetchObject(string $className = stdClass::class)
     {
         // No native support for fetching rows as objects
         if (($row = $this->fetchAssoc()) === false) {
             return false;
         }
 
-        if ($className === 'stdClass') {
+        if ($className === stdClass::class) {
             return (object) $row;
         }
 
diff --git a/system/Images/Handlers/ImageMagickHandler.php b/system/Images/Handlers/ImageMagickHandler.php
index 37bd168ead02..5e0bafe00841 100644
--- a/system/Images/Handlers/ImageMagickHandler.php
+++ b/system/Images/Handlers/ImageMagickHandler.php
@@ -49,7 +49,7 @@ public function __construct($config = null)
 
         // We should never see this, so can't test it
         // @codeCoverageIgnoreStart
-        if (! (extension_loaded('imagick') || class_exists('Imagick'))) {
+        if (! (extension_loaded('imagick') || class_exists(Imagick::class))) {
             throw ImageException::forMissingExtension('IMAGICK');
         }
         // @codeCoverageIgnoreEnd
diff --git a/system/Language/Language.php b/system/Language/Language.php
index 299618657aa2..640dcfaa552d 100644
--- a/system/Language/Language.php
+++ b/system/Language/Language.php
@@ -57,7 +57,7 @@ public function __construct(string $locale)
     {
         $this->locale = $locale;
 
-        if (class_exists('MessageFormatter')) {
+        if (class_exists(MessageFormatter::class)) {
             $this->intlSupport = true;
         }
     }
diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
index d4369765f0ee..d474e796df78 100644
--- a/system/Test/Fabricator.php
+++ b/system/Test/Fabricator.php
@@ -17,6 +17,7 @@
 use Faker\Generator;
 use InvalidArgumentException;
 use RuntimeException;
+use stdClass;
 
 /**
  * Fabricator
@@ -409,7 +410,7 @@ public function makeObject(?string $className = null): object
     {
         if ($className === null) {
             if ($this->model->returnType === 'object' || $this->model->returnType === 'array') {
-                $className = 'stdClass';
+                $className = stdClass::class;
             } else {
                 $className = $this->model->returnType;
             }
diff --git a/system/Test/Mock/MockResult.php b/system/Test/Mock/MockResult.php
index 0aaa340a95de..f3807d9170c9 100644
--- a/system/Test/Mock/MockResult.php
+++ b/system/Test/Mock/MockResult.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Test\Mock;
 
 use CodeIgniter\Database\BaseResult;
+use stdClass;
 
 class MockResult extends BaseResult
 {
@@ -81,7 +82,7 @@ protected function fetchAssoc()
      *
      * @return object
      */
-    protected function fetchObject($className = 'stdClass')
+    protected function fetchObject($className = stdClass::class)
     {
         return new $className();
     }
diff --git a/system/View/View.php b/system/View/View.php
index f557b6629b0a..b0206d67caba 100644
--- a/system/View/View.php
+++ b/system/View/View.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Autoloader\FileLocator;
 use CodeIgniter\Debug\Toolbar\Collectors\Views;
+use CodeIgniter\Filters\DebugToolbar;
 use CodeIgniter\View\Exceptions\ViewException;
 use Config\Services;
 use Config\Toolbar;
@@ -235,7 +236,7 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
         $this->logPerformance($this->renderVars['start'], microtime(true), $this->renderVars['view']);
 
         if (($this->debug && (! isset($options['debug']) || $options['debug'] === true))
-            && in_array('CodeIgniter\Filters\DebugToolbar', service('filters')->getFiltersClass()['after'], true)
+            && in_array(DebugToolbar::class, service('filters')->getFiltersClass()['after'], true)
         ) {
             $toolbarCollectors = config(Toolbar::class)->collectors;
 
diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
index 8cf06372dcdd..821e217a35b8 100644
--- a/tests/system/API/ResponseTraitTest.php
+++ b/tests/system/API/ResponseTraitTest.php
@@ -29,11 +29,7 @@ final class ResponseTraitTest extends CIUnitTestCase
 {
     protected $request;
     protected $response;
-
-    /**
-     * @var FormatterInterface|null
-     */
-    protected $formatter;
+    protected ?FormatterInterface $formatter = null;
 
     protected function setUp(): void
     {
@@ -505,7 +501,7 @@ public function testXMLFormatter()
         $this->formatter = new XMLFormatter();
         $controller      = $this->makeController();
 
-        $this->assertInstanceOf('CodeIgniter\Format\XMLFormatter', $this->formatter);
+        $this->assertInstanceOf(XMLFormatter::class, $this->formatter);
 
         $this->invoke($controller, 'respondCreated', [['id' => 3], 'A Custom Reason']);
 
diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php
index 3c7156abdde2..95d74c6c1b7e 100644
--- a/tests/system/Autoloader/AutoloaderTest.php
+++ b/tests/system/Autoloader/AutoloaderTest.php
@@ -15,6 +15,7 @@
 use Config\Autoload;
 use Config\Modules;
 use Config\Services;
+use InvalidArgumentException;
 use UnnamespacedClass;
 
 /**
@@ -22,12 +23,8 @@
  */
 final class AutoloaderTest extends CIUnitTestCase
 {
-    /**
-     * @var Autoloader
-     */
-    protected $loader;
-
-    protected $filesPath = SUPPORTPATH . 'Autoloader/';
+    protected Autoloader $loader;
+    protected string $filesPath = SUPPORTPATH . 'Autoloader/';
 
     protected function setUp(): void
     {
@@ -58,7 +55,7 @@ public function testLoadStoredClass()
 
     public function testInitializeWithInvalidArguments()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage("Config array must contain either the 'psr4' key or the 'classmap' key.");
 
         $config                      = new Autoload();
diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php
index 3a40ed24345b..54a471d74453 100644
--- a/tests/system/Autoloader/FileLocatorTest.php
+++ b/tests/system/Autoloader/FileLocatorTest.php
@@ -20,10 +20,7 @@
  */
 final class FileLocatorTest extends CIUnitTestCase
 {
-    /**
-     * @var FileLocator
-     */
-    protected $locator;
+    protected FileLocator $locator;
 
     protected function setUp(): void
     {
diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php
index 68008ccc1e4d..107ac1463e67 100644
--- a/tests/system/CLI/CLITest.php
+++ b/tests/system/CLI/CLITest.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
 use ReflectionProperty;
+use RuntimeException;
 
 /**
  * @internal
@@ -100,7 +101,7 @@ public function testNewLine()
 
     public function testColorExceptionForeground()
     {
-        $this->expectException('RuntimeException');
+        $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Invalid foreground color: Foreground');
 
         CLI::color('test', 'Foreground');
@@ -108,7 +109,7 @@ public function testColorExceptionForeground()
 
     public function testColorExceptionBackground()
     {
-        $this->expectException('RuntimeException');
+        $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Invalid background color: Background');
 
         CLI::color('test', 'white', 'Background');
diff --git a/tests/system/Cache/CacheFactoryTest.php b/tests/system/Cache/CacheFactoryTest.php
index c67d1c805ad0..45bc16df58e8 100644
--- a/tests/system/Cache/CacheFactoryTest.php
+++ b/tests/system/Cache/CacheFactoryTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Cache;
 
+use CodeIgniter\Cache\Exceptions\CacheException;
 use CodeIgniter\Cache\Handlers\DummyHandler;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Cache;
@@ -50,7 +51,7 @@ public function testNew()
 
     public function testGetHandlerExceptionCacheInvalidHandlers()
     {
-        $this->expectException('CodeIgniter\Cache\Exceptions\CacheException');
+        $this->expectException(CacheException::class);
         $this->expectExceptionMessage('Cache config must have an array of $validHandlers.');
 
         $this->config->validHandlers = null;
@@ -60,7 +61,7 @@ public function testGetHandlerExceptionCacheInvalidHandlers()
 
     public function testGetHandlerExceptionCacheNoBackup()
     {
-        $this->expectException('CodeIgniter\Cache\Exceptions\CacheException');
+        $this->expectException(CacheException::class);
         $this->expectExceptionMessage('Cache config must have a handler and backupHandler set.');
 
         $this->config->backupHandler = null;
@@ -70,7 +71,7 @@ public function testGetHandlerExceptionCacheNoBackup()
 
     public function testGetHandlerExceptionCacheNoHandler()
     {
-        $this->expectException('CodeIgniter\Cache\Exceptions\CacheException');
+        $this->expectException(CacheException::class);
         $this->expectExceptionMessage('Cache config must have a handler and backupHandler set.');
 
         $this->config->handler = null;
@@ -80,7 +81,7 @@ public function testGetHandlerExceptionCacheNoHandler()
 
     public function testGetHandlerExceptionCacheHandlerNotFound()
     {
-        $this->expectException('CodeIgniter\Cache\Exceptions\CacheException');
+        $this->expectException(CacheException::class);
         $this->expectExceptionMessage('Cache config has an invalid handler or backup handler specified.');
 
         unset($this->config->validHandlers[$this->config->handler]);
diff --git a/tests/system/Cache/Handlers/BaseHandlerTest.php b/tests/system/Cache/Handlers/BaseHandlerTest.php
index b2ebb61e01ef..18bfcff0d113 100644
--- a/tests/system/Cache/Handlers/BaseHandlerTest.php
+++ b/tests/system/Cache/Handlers/BaseHandlerTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\Test\CIUnitTestCase;
+use InvalidArgumentException;
 use stdClass;
 use Tests\Support\Cache\RestrictiveHandler;
 
@@ -27,7 +28,7 @@ final class BaseHandlerTest extends CIUnitTestCase
      */
     public function testValidateKeyInvalidType($input)
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Cache key must be a string');
 
         BaseHandler::validateKey($input);
@@ -48,7 +49,7 @@ public function testValidateKeyUsesConfig()
     {
         config('Cache')->reservedCharacters = 'b';
 
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Cache key contains reserved characters b');
 
         BaseHandler::validateKey('banana');
diff --git a/tests/system/Cache/Handlers/FileHandlerTest.php b/tests/system/Cache/Handlers/FileHandlerTest.php
index 032243d890f1..23573dee3314 100644
--- a/tests/system/Cache/Handlers/FileHandlerTest.php
+++ b/tests/system/Cache/Handlers/FileHandlerTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Cache\Handlers;
 
+use CodeIgniter\Cache\Exceptions\CacheException;
 use CodeIgniter\CLI\CLI;
 use Config\Cache;
 
@@ -76,7 +77,7 @@ public function testNew()
 
     public function testNewWithNonWritablePath()
     {
-        $this->expectException('CodeIgniter\Cache\Exceptions\CacheException');
+        $this->expectException(CacheException::class);
 
         chmod($this->config->file['storePath'], 0444);
         new FileHandler($this->config);
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index 418bde4530f6..42706e39d110 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter;
 
 use CodeIgniter\Config\Services;
+use CodeIgniter\HTTP\Response;
 use CodeIgniter\Router\RouteCollection;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockCodeIgniter;
@@ -26,11 +27,7 @@
  */
 final class CodeIgniterTest extends CIUnitTestCase
 {
-    /**
-     * @var CodeIgniter
-     */
-    protected $codeigniter;
-
+    protected CodeIgniter $codeigniter;
     protected $routes;
 
     protected function setUp(): void
@@ -218,7 +215,7 @@ public function testResponseConfigEmpty()
 
         $response = Services::response(null, false);
 
-        $this->assertInstanceOf('\CodeIgniter\HTTP\Response', $response);
+        $this->assertInstanceOf(Response::class, $response);
     }
 
     public function testRoutesIsEmpty()
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 1c8088fdf227..758e1727eca1 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -399,7 +399,7 @@ public function testSlashItem()
     protected function injectSessionMock()
     {
         $defaults = [
-            'sessionDriver'            => 'CodeIgniter\Session\Handlers\FileHandler',
+            'sessionDriver'            => FileHandler::class,
             'sessionCookieName'        => 'ci_session',
             'sessionExpiration'        => 7200,
             'sessionSavePath'          => null,
diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php
index 2aff090b9576..077bd8f23ea4 100644
--- a/tests/system/Config/DotEnvTest.php
+++ b/tests/system/Config/DotEnvTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Config;
 
 use CodeIgniter\Test\CIUnitTestCase;
+use InvalidArgumentException;
 use org\bovigo\vfs\vfsStream;
 
 /**
@@ -115,7 +116,7 @@ public function testLoadsUnreadableFile()
         $file = 'unreadable.env';
         $path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
         chmod($path, 0000);
-        $this->expectException('\InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage("The .env file is not readable: {$path}");
         $dotenv = new DotEnv($this->fixturesFolder, $file);
         $dotenv->load();
@@ -135,7 +136,7 @@ public function testQuotedDotenvLoadsEnvironmentVars()
 
     public function testSpacedValuesWithoutQuotesThrowsException()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('.env values containing spaces must be surrounded by quotes.');
 
         $dotenv = new DotEnv($this->fixturesFolder, 'spaced-wrong.env');
diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php
index b33ff13f9387..14fbd27a2910 100644
--- a/tests/system/Config/ServicesTest.php
+++ b/tests/system/Config/ServicesTest.php
@@ -43,6 +43,7 @@
 use CodeIgniter\View\Parser;
 use Config\App;
 use Config\Exceptions;
+use RuntimeException;
 use Tests\Support\Config\Services;
 
 /**
@@ -69,7 +70,7 @@ protected function tearDown(): void
 
     public function testCanReplaceFrameworkServices()
     {
-        $this->expectException('RuntimeException');
+        $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage('Service originated from Tests\Support\Config\Services');
 
         Services::uri('testCanReplaceFrameworkServices');
diff --git a/tests/system/Database/Builder/InsertTest.php b/tests/system/Database/Builder/InsertTest.php
index 1844434d3a1c..713e77bd15a7 100644
--- a/tests/system/Database/Builder/InsertTest.php
+++ b/tests/system/Database/Builder/InsertTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Database\Builder;
 
+use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\Query;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
@@ -62,7 +63,7 @@ public function testThrowsExceptionOnNoValuesSet()
     {
         $builder = $this->db->table('jobs');
 
-        $this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
+        $this->expectException(DatabaseException::class);
         $this->expectExceptionMessage('You must use the "set" method to update an entry.');
 
         $builder->testMode()->insert(null, true);
@@ -192,7 +193,7 @@ public function testInsertBatchThrowsExceptionOnNoData()
     {
         $builder = $this->db->table('jobs');
 
-        $this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
+        $this->expectException(DatabaseException::class);
         $this->expectExceptionMessage('You must use the "set" method to update an entry.');
         $builder->insertBatch();
     }
@@ -201,7 +202,7 @@ public function testInsertBatchThrowsExceptionOnEmptyData()
     {
         $builder = $this->db->table('jobs');
 
-        $this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
+        $this->expectException(DatabaseException::class);
         $this->expectExceptionMessage('insertBatch() called with no data');
         $builder->insertBatch([]);
     }
diff --git a/tests/system/Database/Builder/ReplaceTest.php b/tests/system/Database/Builder/ReplaceTest.php
index 4197ed05449d..e7a1262cb107 100644
--- a/tests/system/Database/Builder/ReplaceTest.php
+++ b/tests/system/Database/Builder/ReplaceTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Database\Builder;
 
+use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
@@ -47,7 +48,7 @@ public function testReplaceThrowsExceptionWithNoData()
     {
         $builder = $this->db->table('jobs');
 
-        $this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
+        $this->expectException(DatabaseException::class);
         $this->expectExceptionMessage('You must use the "set" method to update an entry.');
 
         $builder->replace();
diff --git a/tests/system/Database/Builder/UpdateTest.php b/tests/system/Database/Builder/UpdateTest.php
index bda9ae49915d..5af1490f6f66 100644
--- a/tests/system/Database/Builder/UpdateTest.php
+++ b/tests/system/Database/Builder/UpdateTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
+use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 use CodeIgniter\Test\Mock\MockQuery;
@@ -177,7 +178,7 @@ public function testUpdateThrowsExceptionWithNoData()
     {
         $builder = new BaseBuilder('jobs', $this->db);
 
-        $this->expectException('CodeIgniter\Database\Exceptions\DatabaseException');
+        $this->expectException(DatabaseException::class);
         $this->expectExceptionMessage('You must use the "set" method to update an entry.');
 
         $builder->update(null, null, null);
@@ -266,7 +267,7 @@ public function testUpdateBatchThrowsExceptionWithNoData()
     {
         $builder = new BaseBuilder('jobs', $this->db);
 
-        $this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
+        $this->expectException(DatabaseException::class);
         $this->expectExceptionMessage('You must use the "set" method to update an entry.');
 
         $builder->updateBatch(null, 'id');
@@ -276,7 +277,7 @@ public function testUpdateBatchThrowsExceptionWithNoID()
     {
         $builder = new BaseBuilder('jobs', $this->db);
 
-        $this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
+        $this->expectException(DatabaseException::class);
         $this->expectExceptionMessage('You must specify an index to match on for batch updates.');
 
         $builder->updateBatch([]);
@@ -286,7 +287,7 @@ public function testUpdateBatchThrowsExceptionWithEmptySetArray()
     {
         $builder = new BaseBuilder('jobs', $this->db);
 
-        $this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
+        $this->expectException(DatabaseException::class);
         $this->expectExceptionMessage('updateBatch() called with no data');
 
         $builder->updateBatch([], 'id');
diff --git a/tests/system/Database/ConfigTest.php b/tests/system/Database/ConfigTest.php
index 0dc9a1619485..301a95158bf1 100644
--- a/tests/system/Database/ConfigTest.php
+++ b/tests/system/Database/ConfigTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\ReflectionHelper;
+use SQLite3;
 
 /**
  * @internal
@@ -21,7 +22,7 @@ final class ConfigTest extends CIUnitTestCase
 {
     use ReflectionHelper;
 
-    protected $group = [
+    protected array $group = [
         'DSN'      => '',
         'hostname' => 'localhost',
         'username' => 'first',
@@ -40,13 +41,13 @@ final class ConfigTest extends CIUnitTestCase
         'failover' => [],
         'port'     => 3306,
     ];
-    protected $dsnGroup = [
+    protected array $dsnGroup = [
         'DSN'      => 'MySQLi://user:pass@localhost:3306/dbname?DBPrefix=test_&pConnect=true&charset=latin1&DBCollat=latin1_swedish_ci',
         'hostname' => '',
         'username' => '',
         'password' => '',
         'database' => '',
-        'DBDriver' => 'SQLite3',
+        'DBDriver' => SQLite3::class,
         'DBPrefix' => 't_',
         'pConnect' => false,
         'DBDebug'  => (ENVIRONMENT !== 'production'),
@@ -59,13 +60,13 @@ final class ConfigTest extends CIUnitTestCase
         'failover' => [],
         'port'     => 3306,
     ];
-    protected $dsnGroupPostgre = [
+    protected array $dsnGroupPostgre = [
         'DSN'      => 'Postgre://user:pass@localhost:5432/dbname?DBPrefix=test_&connect_timeout=5&sslmode=1',
         'hostname' => '',
         'username' => '',
         'password' => '',
         'database' => '',
-        'DBDriver' => 'SQLite3',
+        'DBDriver' => SQLite3::class,
         'DBPrefix' => 't_',
         'pConnect' => false,
         'DBDebug'  => (ENVIRONMENT !== 'production'),
@@ -78,7 +79,7 @@ final class ConfigTest extends CIUnitTestCase
         'failover' => [],
         'port'     => 5432,
     ];
-    protected $dsnGroupPostgreNative = [
+    protected array $dsnGroupPostgreNative = [
         'DSN'      => 'pgsql:host=localhost;port=5432;dbname=database_name',
         'hostname' => '',
         'username' => '',
diff --git a/tests/system/Database/DatabaseSeederTest.php b/tests/system/Database/DatabaseSeederTest.php
index 7e08d6648508..70721718ea8a 100644
--- a/tests/system/Database/DatabaseSeederTest.php
+++ b/tests/system/Database/DatabaseSeederTest.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Database;
 use Faker\Generator;
+use InvalidArgumentException;
 
 /**
  * @internal
@@ -22,7 +23,7 @@ final class DatabaseSeederTest extends CIUnitTestCase
 {
     public function testInstantiateNoSeedPath()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
 
         $config            = new Database();
         $config->filesPath = '';
@@ -31,7 +32,7 @@ public function testInstantiateNoSeedPath()
 
     public function testInstantiateNotDirSeedPath()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
 
         $config            = new Database();
         $config->filesPath = APPPATH . 'Foo';
@@ -48,7 +49,7 @@ public function testFakerGet()
 
     public function testCallOnEmptySeeder()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
 
         $seeder = new Seeder(new Database());
         $seeder->call('');
diff --git a/tests/system/Database/Live/DbUtilsTest.php b/tests/system/Database/Live/DbUtilsTest.php
index e767d0b6991d..414412a72ded 100644
--- a/tests/system/Database/Live/DbUtilsTest.php
+++ b/tests/system/Database/Live/DbUtilsTest.php
@@ -15,6 +15,7 @@
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use SQLite3;
 
 /**
  * @group DatabaseLive
@@ -80,7 +81,7 @@ public function testUtilsListDatabases()
             $databases = $util->listDatabases();
 
             $this->assertContains($this->db->getDatabase(), $databases);
-        } elseif ($this->db->DBDriver === 'SQLite3') {
+        } elseif ($this->db->DBDriver === SQLite3::class) {
             $this->expectException(DatabaseException::class);
             $this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
 
@@ -96,7 +97,7 @@ public function testUtilsDatabaseExist()
             $exist = $util->databaseExists($this->db->getDatabase());
 
             $this->assertTrue($exist);
-        } elseif ($this->db->DBDriver === 'SQLite3') {
+        } elseif ($this->db->DBDriver === SQLite3::class) {
             $this->expectException(DatabaseException::class);
             $this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
 
diff --git a/tests/system/Database/Live/DeleteTest.php b/tests/system/Database/Live/DeleteTest.php
index 31b89412e78a..f8311e9d042a 100644
--- a/tests/system/Database/Live/DeleteTest.php
+++ b/tests/system/Database/Live/DeleteTest.php
@@ -29,7 +29,7 @@ final class DeleteTest extends CIUnitTestCase
 
     public function testDeleteThrowExceptionWithNoCriteria()
     {
-        $this->expectException('\CodeIgniter\Database\Exceptions\DatabaseException');
+        $this->expectException(DatabaseException::class);
 
         $this->db->table('job')->delete();
     }
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 113f2c0a211e..f83593ed320e 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -18,6 +18,7 @@
 use Config\Database;
 use InvalidArgumentException;
 use RuntimeException;
+use SQLite3;
 
 /**
  * @group DatabaseLive
@@ -56,7 +57,7 @@ public function testCreateDatabaseIfNotExists()
         $dbName = 'test_forge_database_exist';
 
         $databaseCreateIfNotExists = $this->forge->createDatabase($dbName, true);
-        if ($this->db->DBDriver !== 'SQLite3') {
+        if ($this->db->DBDriver !== SQLite3::class) {
             $this->forge->dropDatabase($dbName);
         }
 
@@ -72,7 +73,7 @@ public function testCreateDatabaseIfNotExistsWithDb()
 
         $this->forge->createDatabase($dbName);
         $databaseExists = $this->forge->createDatabase($dbName, true);
-        if ($this->db->DBDriver !== 'SQLite3') {
+        if ($this->db->DBDriver !== SQLite3::class) {
             $this->forge->dropDatabase($dbName);
         }
 
@@ -84,7 +85,7 @@ public function testDropDatabase()
         if ($this->db->DBDriver === 'OCI8') {
             $this->markTestSkipped('OCI8 does not support drop database.');
         }
-        if ($this->db->DBDriver === 'SQLite3') {
+        if ($this->db->DBDriver === SQLite3::class) {
             $this->markTestSkipped('SQLite3 requires file path to drop database');
         }
 
@@ -97,7 +98,7 @@ public function testCreateDatabaseExceptionNoCreateStatement()
     {
         $this->setPrivateProperty($this->forge, 'createDatabaseStr', false);
 
-        if ($this->db->DBDriver === 'SQLite3') {
+        if ($this->db->DBDriver === SQLite3::class) {
             $databaseCreated = $this->forge->createDatabase('test_forge_database');
             $this->assertTrue($databaseCreated);
         } else {
@@ -112,7 +113,7 @@ public function testDropDatabaseExceptionNoDropStatement()
     {
         $this->setPrivateProperty($this->forge, 'dropDatabaseStr', false);
 
-        if ($this->db->DBDriver === 'SQLite3') {
+        if ($this->db->DBDriver === SQLite3::class) {
             $this->markTestSkipped('SQLite3 requires file path to drop database');
         } else {
             $this->expectException(DatabaseException::class);
@@ -175,7 +176,7 @@ public function testCreateTableApplyBigInt()
             $this->assertSame(strtolower($fieldsData[0]->type), 'bigint');
         } elseif ($this->db->DBDriver === 'Postgre') {
             $this->assertSame(strtolower($fieldsData[0]->type), 'bigint');
-        } elseif ($this->db->DBDriver === 'SQLite3') {
+        } elseif ($this->db->DBDriver === SQLite3::class) {
             $this->assertSame(strtolower($fieldsData[0]->type), 'integer');
         } elseif ($this->db->DBDriver === 'OCI8') {
             $this->assertSame(strtolower($fieldsData[0]->type), 'number');
@@ -191,7 +192,7 @@ public function testCreateTableWithAttributes()
         if ($this->db->DBDriver === 'OCI8') {
             $this->markTestSkipped('OCI8 does not support comments on tables or columns.');
         }
-        if ($this->db->DBDriver === 'SQLite3') {
+        if ($this->db->DBDriver === SQLite3::class) {
             $this->markTestSkipped('SQLite3 does not support comments on tables or columns.');
         }
 
@@ -213,7 +214,7 @@ public function testCreateTableWithAttributes()
 
     public function testCreateTableWithArrayFieldConstraints()
     {
-        if (in_array($this->db->DBDriver, ['MySQLi', 'SQLite3'], true)) {
+        if (in_array($this->db->DBDriver, ['MySQLi', SQLite3::class], true)) {
             $this->forge->dropTable('forge_array_constraint', true);
             $this->forge->addField([
                 'status' => [
@@ -231,7 +232,7 @@ public function testCreateTableWithArrayFieldConstraints()
 
             $this->assertSame('status', $fields[0]->name);
 
-            if ($this->db->DBDriver === 'SQLite3') {
+            if ($this->db->DBDriver === SQLite3::class) {
                 // SQLite3 converts array constraints to TEXT CHECK(...)
                 $this->assertSame('TEXT', $fields[0]->type);
             } else {
@@ -431,7 +432,7 @@ public function testForeignKey()
 
         $foreignKeyData = $this->db->getForeignKeyData($tableName);
 
-        if ($this->db->DBDriver === 'SQLite3') {
+        if ($this->db->DBDriver === SQLite3::class) {
             $this->assertSame($foreignKeyData[0]->constraint_name, 'users_id to db_forge_test_users.id');
             $this->assertSame($foreignKeyData[0]->sequence, 0);
         } elseif ($this->db->DBDriver === 'OCI8') {
@@ -553,7 +554,7 @@ public function testCompositeForeignKey()
 
         $foreignKeyData = $this->db->getForeignKeyData($forgeTestInvoicesTableName);
 
-        if ($this->db->DBDriver === 'SQLite3') {
+        if ($this->db->DBDriver === SQLite3::class) {
             $this->assertSame('users_id to db_forge_test_users.id', $foreignKeyData[0]->constraint_name);
             $this->assertSame(0, $foreignKeyData[0]->sequence);
             $this->assertSame('users_second_id to db_forge_test_users.second_id', $foreignKeyData[1]->constraint_name);
@@ -843,7 +844,7 @@ public function testAddFields()
             $this->assertSame(32, (int) $fieldsData[0]->max_length);
             $this->assertNull($fieldsData[1]->default);
             $this->assertSame(255, (int) $fieldsData[1]->max_length);
-        } elseif ($this->db->DBDriver === 'SQLite3') {
+        } elseif ($this->db->DBDriver === SQLite3::class) {
             $this->assertSame('integer', strtolower($fieldsData[0]->type));
             $this->assertSame('varchar', strtolower($fieldsData[1]->type));
             $this->assertNull($fieldsData[1]->default);
@@ -868,7 +869,7 @@ public function testAddFields()
     public function testCompositeKey()
     {
         // SQLite3 uses auto increment different
-        $uniqueOrAuto = $this->db->DBDriver === 'SQLite3' ? 'unique' : 'auto_increment';
+        $uniqueOrAuto = $this->db->DBDriver === SQLite3::class ? 'unique' : 'auto_increment';
 
         $this->forge->addField([
             'id' => [
@@ -916,7 +917,7 @@ public function testCompositeKey()
             $this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
             $this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
             $this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
-        } elseif ($this->db->DBDriver === 'SQLite3') {
+        } elseif ($this->db->DBDriver === SQLite3::class) {
             $this->assertSame($keys['sqlite_autoindex_db_forge_test_1_1']->name, 'sqlite_autoindex_db_forge_test_1_1');
             $this->assertSame($keys['sqlite_autoindex_db_forge_test_1_1']->fields, ['id']);
             $this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
@@ -1054,7 +1055,7 @@ public function testDropTableSuccess()
 
         $this->assertFalse($this->db->tableExists('dropTest'));
 
-        if ($this->db->DBDriver === 'SQLite3') {
+        if ($this->db->DBDriver === SQLite3::class) {
             $this->assertCount(0, $this->db->getIndexData('droptest'));
         }
     }
diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php
index 20ae2e099d0d..768f24d72de3 100644
--- a/tests/system/Database/Live/GetTest.php
+++ b/tests/system/Database/Live/GetTest.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use SQLite3;
 
 /**
  * @group DatabaseLive
@@ -91,7 +92,7 @@ public function testGetFieldData()
 
         $typeTest = $this->db->table('type_test')->get()->getFieldData();
 
-        if ($this->db->DBDriver === 'SQLite3') {
+        if ($this->db->DBDriver === SQLite3::class) {
             $this->assertSame('integer', $typeTest[0]->type_name); // INTEGER AUTO INC
             $this->assertSame('text', $typeTest[1]->type_name);  // VARCHAR
             $this->assertSame('text', $typeTest[2]->type_name);  // CHAR
@@ -172,7 +173,7 @@ public function testGetDataSeek()
     {
         $data = $this->db->table('job')->get();
 
-        if ($this->db->DBDriver === 'SQLite3') {
+        if ($this->db->DBDriver === SQLite3::class) {
             $this->expectException(DatabaseException::class);
             $this->expectExceptionMessage('SQLite3 doesn\'t support seeking to other offset.');
         } elseif ($this->db->DBDriver === 'OCI8') {
diff --git a/tests/system/Database/Live/SQLite/AlterTableTest.php b/tests/system/Database/Live/SQLite/AlterTableTest.php
index 2816008a2a54..8889c9d8f639 100644
--- a/tests/system/Database/Live/SQLite/AlterTableTest.php
+++ b/tests/system/Database/Live/SQLite/AlterTableTest.php
@@ -11,12 +11,14 @@
 
 namespace CodeIgniter\Database\Live\SQLite;
 
+use CodeIgniter\Database\Exceptions\DataException;
 use CodeIgniter\Database\SQLite3\Connection;
 use CodeIgniter\Database\SQLite3\Forge;
 use CodeIgniter\Database\SQLite3\Table;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 use Config\Database;
+use SQLite3;
 
 /**
  * @group DatabaseLive
@@ -34,27 +36,21 @@ final class AlterTableTest extends CIUnitTestCase
      */
     protected $migrate = false;
 
-    /**
-     * @var Table
-     */
-    protected $table;
+    protected Table $table;
 
     /**
      * @var Connection
      */
     protected $db;
 
-    /**
-     * @var Forge
-     */
-    protected $forge;
+    protected Forge $forge;
 
     protected function setUp(): void
     {
         parent::setUp();
 
         $config = [
-            'DBDriver' => 'SQLite3',
+            'DBDriver' => SQLite3::class,
             'database' => 'database.db',
         ];
 
@@ -77,7 +73,7 @@ private function dropTables()
 
     public function testFromTableThrowsOnNoTable()
     {
-        $this->expectException('CodeIgniter\Database\Exceptions\DataException');
+        $this->expectException(DataException::class);
         $this->expectExceptionMessage('Table `foo` was not found in the current database.');
 
         $this->table->fromTable('foo');
diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php
index 2c9fa09e1d73..9a5f467ed9c2 100644
--- a/tests/system/Database/Migrations/MigrationRunnerTest.php
+++ b/tests/system/Database/Migrations/MigrationRunnerTest.php
@@ -22,6 +22,7 @@
 use Config\Migrations;
 use Config\Services;
 use org\bovigo\vfs\vfsStream;
+use SQLite3;
 
 /**
  * @group DatabaseLive
@@ -74,7 +75,7 @@ public function testLoadsDefaultDatabaseWhenNoneSpecified()
 
         $this->assertInstanceOf(BaseConnection::class, $db);
         $this->assertSame(
-            ($dbConfig->tests['DBDriver'] === 'SQLite3' ? WRITEPATH : '') . $dbConfig->tests['database'],
+            ($dbConfig->tests['DBDriver'] === SQLite3::class ? WRITEPATH : '') . $dbConfig->tests['database'],
             $this->getPrivateProperty($db, 'database')
         );
         $this->assertSame($dbConfig->tests['DBDriver'], $this->getPrivateProperty($db, 'DBDriver'));
@@ -254,7 +255,7 @@ public function testFindMigrationsSuccessTimestamp()
 
     public function testMigrationThrowsDisabledException()
     {
-        $this->expectException('CodeIgniter\Exceptions\ConfigException');
+        $this->expectException(ConfigException::class);
         $this->expectExceptionMessage('Migrations have been loaded but are disabled or setup incorrectly.');
 
         $config          = $this->config;
diff --git a/tests/system/Encryption/EncryptionTest.php b/tests/system/Encryption/EncryptionTest.php
index a1f6085a33a6..cb4eb4cad7da 100644
--- a/tests/system/Encryption/EncryptionTest.php
+++ b/tests/system/Encryption/EncryptionTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Encryption;
 
+use CodeIgniter\Encryption\Exceptions\EncryptionException;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Encryption as EncryptionConfig;
 use Config\Services;
@@ -20,10 +21,7 @@
  */
 final class EncryptionTest extends CIUnitTestCase
 {
-    /**
-     * @var \CodeIgniter\Encryption\Encryption
-     */
-    protected $encryption;
+    protected \CodeIgniter\Encryption\Encryption $encryption;
 
     protected function setUp(): void
     {
@@ -57,7 +55,7 @@ public function testConstructor()
      */
     public function testBadDriver()
     {
-        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+        $this->expectException(EncryptionException::class);
 
         // ask for a bad driver
         $config         = new EncryptionConfig();
@@ -72,7 +70,7 @@ public function testBadDriver()
      */
     public function testMissingDriver()
     {
-        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+        $this->expectException(EncryptionException::class);
 
         // ask for a bad driver
         $config         = new EncryptionConfig();
@@ -101,7 +99,7 @@ public function testServiceSuccess()
 
     public function testServiceFailure()
     {
-        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+        $this->expectException(EncryptionException::class);
 
         // ask for a bad driver
         $config         = new EncryptionConfig();
@@ -113,7 +111,7 @@ public function testServiceFailure()
 
     public function testServiceWithoutKey()
     {
-        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+        $this->expectException(EncryptionException::class);
 
         Services::encrypter();
     }
diff --git a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
index 89886b6f8901..5427c99a5edb 100644
--- a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
+++ b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Encryption\Handlers;
 
 use CodeIgniter\Encryption\Encryption;
+use CodeIgniter\Encryption\Exceptions\EncryptionException;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Encryption as EncryptionConfig;
 
@@ -20,10 +21,7 @@
  */
 final class OpenSSLHandlerTest extends CIUnitTestCase
 {
-    /**
-     * @var \CodeIgniter\Encryption\Encryption
-     */
-    protected $encryption;
+    protected \CodeIgniter\Encryption\Encryption $encryption;
 
     protected function setUp(): void
     {
@@ -79,7 +77,7 @@ public function testSimple()
      */
     public function testWithoutKey()
     {
-        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+        $this->expectException(EncryptionException::class);
 
         $encrypter = new OpenSSLHandler();
         $message1  = 'This is a plain-text message.';
@@ -100,7 +98,7 @@ public function testWithKeyString()
      */
     public function testWithWrongKeyString()
     {
-        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+        $this->expectException(EncryptionException::class);
 
         $key1      = 'abracadabra';
         $encrypter = new OpenSSLHandler();
@@ -125,7 +123,7 @@ public function testWithKeyArray()
      */
     public function testWithWrongKeyArray()
     {
-        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+        $this->expectException(EncryptionException::class);
 
         $key1      = 'abracadabra';
         $encrypter = new OpenSSLHandler();
diff --git a/tests/system/Encryption/Handlers/SodiumHandlerTest.php b/tests/system/Encryption/Handlers/SodiumHandlerTest.php
index fc5f353d2ffb..421af43e1330 100644
--- a/tests/system/Encryption/Handlers/SodiumHandlerTest.php
+++ b/tests/system/Encryption/Handlers/SodiumHandlerTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Encryption\Handlers;
 
 use CodeIgniter\Encryption\Encryption;
+use CodeIgniter\Encryption\Exceptions\EncryptionException;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Encryption as EncryptionConfig;
 
@@ -20,15 +21,8 @@
  */
 final class SodiumHandlerTest extends CIUnitTestCase
 {
-    /**
-     * @var \CodeIgniter\Encryption\Encryption
-     */
-    protected $encryption;
-
-    /**
-     * @var \Config\Encryption
-     */
-    protected $config;
+    protected \CodeIgniter\Encryption\Encryption $encryption;
+    protected \Config\Encryption $config;
 
     protected function setUp(): void
     {
@@ -57,7 +51,7 @@ public function testPropertiesGetter()
 
     public function testEmptyKeyThrowsErrorOnInitialize()
     {
-        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+        $this->expectException(EncryptionException::class);
 
         $this->config->key = '';
         $this->encryption->initialize($this->config);
@@ -65,7 +59,7 @@ public function testEmptyKeyThrowsErrorOnInitialize()
 
     public function testEmptyKeyThrowsErrorOnEncrypt()
     {
-        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+        $this->expectException(EncryptionException::class);
 
         $encrypter = $this->encryption->initialize($this->config);
         $encrypter->encrypt('Some message to encrypt', '');
@@ -73,7 +67,7 @@ public function testEmptyKeyThrowsErrorOnEncrypt()
 
     public function testInvalidBlockSizeThrowsErrorOnEncrypt()
     {
-        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+        $this->expectException(EncryptionException::class);
         $this->config->blockSize = -1;
 
         $encrypter = $this->encryption->initialize($this->config);
@@ -82,7 +76,7 @@ public function testInvalidBlockSizeThrowsErrorOnEncrypt()
 
     public function testEmptyKeyThrowsErrorOnDecrypt()
     {
-        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+        $this->expectException(EncryptionException::class);
 
         $encrypter  = $this->encryption->initialize($this->config);
         $ciphertext = $encrypter->encrypt('Some message to encrypt');
@@ -92,7 +86,7 @@ public function testEmptyKeyThrowsErrorOnDecrypt()
 
     public function testInvalidBlockSizeThrowsErrorOnDecrypt()
     {
-        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+        $this->expectException(EncryptionException::class);
         $key = $this->config->key;
 
         $encrypter  = $this->encryption->initialize($this->config);
@@ -103,7 +97,7 @@ public function testInvalidBlockSizeThrowsErrorOnDecrypt()
 
     public function testTruncatedMessageThrowsErrorOnDecrypt()
     {
-        $this->expectException('CodeIgniter\Encryption\Exceptions\EncryptionException');
+        $this->expectException(EncryptionException::class);
 
         $encrypter  = $this->encryption->initialize($this->config);
         $ciphertext = $encrypter->encrypt('Some message to encrypt');
diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php
index a9a59502575f..82c758f92f5e 100644
--- a/tests/system/Entity/EntityTest.php
+++ b/tests/system/Entity/EntityTest.php
@@ -382,7 +382,7 @@ public function testCastDateTime()
 
         $entity->eighth = 'March 12, 2017';
 
-        $this->assertInstanceOf('DateTime', $entity->eighth);
+        $this->assertInstanceOf(DateTime::class, $entity->eighth);
         $this->assertSame('2017-03-12', $entity->eighth->format('Y-m-d'));
     }
 
diff --git a/tests/system/Files/FileTest.php b/tests/system/Files/FileTest.php
index 6ff5b77fd3bc..573c8cdb3499 100644
--- a/tests/system/Files/FileTest.php
+++ b/tests/system/Files/FileTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Files;
 
+use CodeIgniter\Files\Exceptions\FileNotFoundException;
 use CodeIgniter\Test\CIUnitTestCase;
 
 /**
@@ -85,7 +86,7 @@ public function testGetSizeReturnsBytes()
 
     public function testThrowsExceptionIfNotAFile()
     {
-        $this->expectException('CodeIgniter\Files\Exceptions\FileNotFoundException');
+        $this->expectException(FileNotFoundException::class);
 
         new File(SYSTEMPATH . 'Commoner.php', true);
     }
diff --git a/tests/system/Format/FormatTest.php b/tests/system/Format/FormatTest.php
index 0cd53e62a22c..3bc6854fa3ae 100644
--- a/tests/system/Format/FormatTest.php
+++ b/tests/system/Format/FormatTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Format;
 
 use CodeIgniter\Format\Exceptions\FormatException;
+use CodeIgniter\HTTP\URI;
 use CodeIgniter\Test\CIUnitTestCase;
 
 /**
@@ -19,10 +20,7 @@
  */
 final class FormatTest extends CIUnitTestCase
 {
-    /**
-     * @var Format
-     */
-    protected $format;
+    protected Format $format;
 
     protected function setUp(): void
     {
@@ -66,7 +64,7 @@ public function testGetFormatterExpectsExceptionOnClassNotImplementingFormatterI
     {
         $this->format->getConfig()->formatters = array_merge(
             $this->format->getConfig()->formatters,
-            ['text/xml' => 'CodeIgniter\HTTP\URI']
+            ['text/xml' => URI::class]
         );
 
         $this->expectException(FormatException::class);
diff --git a/tests/system/Format/JSONFormatterTest.php b/tests/system/Format/JSONFormatterTest.php
index b2eb5f2e0d5e..19dacb02e86c 100644
--- a/tests/system/Format/JSONFormatterTest.php
+++ b/tests/system/Format/JSONFormatterTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Format;
 
 use CodeIgniter\Test\CIUnitTestCase;
+use RuntimeException;
 
 /**
  * @internal
@@ -67,7 +68,7 @@ public function testKeepsURLs()
 
     public function testJSONError()
     {
-        $this->expectException('RuntimeException');
+        $this->expectException(RuntimeException::class);
 
         $data     = ["\xB1\x31"];
         $expected = 'Boom';
diff --git a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
index 21070736d741..bcf9d1c51124 100644
--- a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
+++ b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
@@ -25,10 +25,7 @@
  */
 final class CURLRequestDoNotShareOptionsTest extends CIUnitTestCase
 {
-    /**
-     * @var MockCURLRequest
-     */
-    protected $request;
+    protected MockCURLRequest $request;
 
     protected function setUp(): void
     {
@@ -96,7 +93,7 @@ public function testSendReturnsResponse()
 
         $response = $this->request->setOutput($output)->send('get', 'http://example.com');
 
-        $this->assertInstanceOf('CodeIgniter\\HTTP\\Response', $response);
+        $this->assertInstanceOf(Response::class, $response);
         $this->assertSame($output, $response->getBody());
     }
 
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index 64b824cbad56..31808a739e29 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -25,10 +25,7 @@
  */
 final class CURLRequestTest extends CIUnitTestCase
 {
-    /**
-     * @var MockCURLRequest
-     */
-    protected $request;
+    protected MockCURLRequest $request;
 
     protected function setUp(): void
     {
@@ -96,7 +93,7 @@ public function testSendReturnsResponse()
 
         $response = $this->request->setOutput($output)->send('get', 'http://example.com');
 
-        $this->assertInstanceOf('CodeIgniter\\HTTP\\Response', $response);
+        $this->assertInstanceOf(Response::class, $response);
         $this->assertSame($output, $response->getBody());
     }
 
diff --git a/tests/system/Helpers/ArrayHelperTest.php b/tests/system/Helpers/ArrayHelperTest.php
index 90413c570a00..59257fbab7d6 100644
--- a/tests/system/Helpers/ArrayHelperTest.php
+++ b/tests/system/Helpers/ArrayHelperTest.php
@@ -12,6 +12,8 @@
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Test\CIUnitTestCase;
+use ErrorException;
+use ValueError;
 
 /**
  * @internal
@@ -295,9 +297,9 @@ public function testArraySortByMultipleKeysFailsInconsistentArraySizes($data)
     {
         // PHP 8 changes this error type
         if (version_compare(PHP_VERSION, '8.0', '<')) {
-            $this->expectException('ErrorException');
+            $this->expectException(ErrorException::class);
         } else {
-            $this->expectException('ValueError');
+            $this->expectException(ValueError::class);
         }
 
         $this->expectExceptionMessage('Array sizes are inconsistent');
diff --git a/tests/system/HomeTest.php b/tests/system/HomeTest.php
index fca482d3dec8..382e6c4ee522 100644
--- a/tests/system/HomeTest.php
+++ b/tests/system/HomeTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\FeatureTestTrait;
+use CodeIgniter\Test\TestResponse;
 
 /**
  * @internal
@@ -32,7 +33,7 @@ public function testPageLoadsSuccessfully()
         ]);
 
         $response = $this->get('home');
-        $this->assertInstanceOf('CodeIgniter\Test\TestResponse', $response);
+        $this->assertInstanceOf(TestResponse::class, $response);
         $this->assertTrue($response->isOK());
     }
 }
diff --git a/tests/system/Honeypot/HoneypotTest.php b/tests/system/Honeypot/HoneypotTest.php
index 860d552d4e86..b732b27fca7b 100644
--- a/tests/system/Honeypot/HoneypotTest.php
+++ b/tests/system/Honeypot/HoneypotTest.php
@@ -103,7 +103,7 @@ public function testConfigName()
     public function testHoneypotFilterBefore()
     {
         $config = [
-            'aliases' => ['trap' => '\CodeIgniter\Filters\Honeypot'],
+            'aliases' => ['trap' => \CodeIgniter\Filters\Honeypot::class],
             'globals' => [
                 'before' => ['trap'],
                 'after'  => [],
@@ -120,7 +120,7 @@ public function testHoneypotFilterBefore()
     public function testHoneypotFilterAfter()
     {
         $config = [
-            'aliases' => ['trap' => '\CodeIgniter\Filters\Honeypot'],
+            'aliases' => ['trap' => \CodeIgniter\Filters\Honeypot::class],
             'globals' => [
                 'before' => [],
                 'after'  => ['trap'],
diff --git a/tests/system/I18n/TimeTest.php b/tests/system/I18n/TimeTest.php
index ed1b747699a4..03f142479478 100644
--- a/tests/system/I18n/TimeTest.php
+++ b/tests/system/I18n/TimeTest.php
@@ -497,7 +497,7 @@ public function testSetDay()
 
     public function testSetDayOverMaxInCurrentMonth()
     {
-        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+        $this->expectException(I18nException::class);
 
         $time = Time::parse('Feb 02, 2009');
         $time->setDay(29);
@@ -545,7 +545,7 @@ public function testSetSecond()
 
     public function testSetMonthTooSmall()
     {
-        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+        $this->expectException(I18nException::class);
 
         $time = Time::parse('May 10, 2017');
         $time->setMonth(-5);
@@ -553,7 +553,7 @@ public function testSetMonthTooSmall()
 
     public function testSetMonthTooBig()
     {
-        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+        $this->expectException(I18nException::class);
 
         $time = Time::parse('May 10, 2017');
         $time->setMonth(30);
@@ -561,7 +561,7 @@ public function testSetMonthTooBig()
 
     public function testSetDayTooSmall()
     {
-        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+        $this->expectException(I18nException::class);
 
         $time = Time::parse('May 10, 2017');
         $time->setDay(-5);
@@ -569,7 +569,7 @@ public function testSetDayTooSmall()
 
     public function testSetDayTooBig()
     {
-        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+        $this->expectException(I18nException::class);
 
         $time = Time::parse('May 10, 2017');
         $time->setDay(80);
@@ -577,7 +577,7 @@ public function testSetDayTooBig()
 
     public function testSetHourTooSmall()
     {
-        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+        $this->expectException(I18nException::class);
 
         $time = Time::parse('May 10, 2017');
         $time->setHour(-5);
@@ -585,7 +585,7 @@ public function testSetHourTooSmall()
 
     public function testSetHourTooBig()
     {
-        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+        $this->expectException(I18nException::class);
 
         $time = Time::parse('May 10, 2017');
         $time->setHour(80);
@@ -593,7 +593,7 @@ public function testSetHourTooBig()
 
     public function testSetMinuteTooSmall()
     {
-        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+        $this->expectException(I18nException::class);
 
         $time = Time::parse('May 10, 2017');
         $time->setMinute(-5);
@@ -601,7 +601,7 @@ public function testSetMinuteTooSmall()
 
     public function testSetMinuteTooBig()
     {
-        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+        $this->expectException(I18nException::class);
 
         $time = Time::parse('May 10, 2017');
         $time->setMinute(80);
@@ -609,7 +609,7 @@ public function testSetMinuteTooBig()
 
     public function testSetSecondTooSmall()
     {
-        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+        $this->expectException(I18nException::class);
 
         $time = Time::parse('May 10, 2017');
         $time->setSecond(-5);
@@ -617,7 +617,7 @@ public function testSetSecondTooSmall()
 
     public function testSetSecondTooBig()
     {
-        $this->expectException('CodeIgniter\I18n\Exceptions\I18nException');
+        $this->expectException(I18nException::class);
 
         $time = Time::parse('May 10, 2017');
         $time->setSecond(80);
diff --git a/tests/system/Language/LanguageTest.php b/tests/system/Language/LanguageTest.php
index f89e6dd18125..58994434b3ec 100644
--- a/tests/system/Language/LanguageTest.php
+++ b/tests/system/Language/LanguageTest.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockLanguage;
 use Config\Services;
+use MessageFormatter;
 use Tests\Support\Language\SecondMockLanguage;
 
 /**
@@ -96,7 +97,7 @@ public function testGetLineArrayReturnsLineArray()
     public function testGetLineFormatsMessage()
     {
         // No intl extension? then we can't test this - go away....
-        if (! class_exists('MessageFormatter')) {
+        if (! class_exists(MessageFormatter::class)) {
             $this->markTestSkipped('No intl support.');
         }
 
@@ -110,7 +111,7 @@ public function testGetLineFormatsMessage()
     public function testGetLineArrayFormatsMessages()
     {
         // No intl extension? Then we can't test this - go away...
-        if (! class_exists('MessageFormatter')) {
+        if (! class_exists(MessageFormatter::class)) {
             $this->markTestSkipped('No intl support.');
         }
 
diff --git a/tests/system/Models/FindModelTest.php b/tests/system/Models/FindModelTest.php
index e564f570ec8c..e0fdad5024a1 100644
--- a/tests/system/Models/FindModelTest.php
+++ b/tests/system/Models/FindModelTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Database\Exceptions\DataException;
 use CodeIgniter\Exceptions\ModelException;
+use stdClass;
 use Tests\Support\Models\JobModel;
 use Tests\Support\Models\SecondaryModel;
 use Tests\Support\Models\UserModel;
@@ -295,7 +296,7 @@ public function testFirstWithNoPrimaryKey(): void
         ]);
 
         $record = $this->model->first();
-        $this->assertInstanceOf('stdClass', $record);
+        $this->assertInstanceOf(stdClass::class, $record);
         $this->assertSame('foo', $record->key);
     }
 
diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index e6098527d09c..06719fdbfd85 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -19,6 +19,7 @@
 use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\HTTP\UserAgent;
+use CodeIgniter\Model;
 use CodeIgniter\Router\RouteCollection;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockCodeIgniter;
@@ -40,10 +41,7 @@
  */
 final class ResourceControllerTest extends CIUnitTestCase
 {
-    /**
-     * @var CodeIgniter
-     */
-    protected $codeigniter;
+    protected CodeIgniter $codeigniter;
 
     /**
      * @var RouteCollection
@@ -247,7 +245,7 @@ public function testModelByName()
     {
         $resource = new MockResourceController();
         $resource->setModel('\Tests\Support\Models\UserModel');
-        $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
+        $this->assertInstanceOf(Model::class, $resource->getModel());
         $this->assertSame('\Tests\Support\Models\UserModel', $resource->getModelName());
     }
 
@@ -256,7 +254,7 @@ public function testModelByObject()
         $resource = new MockResourceController();
         $model    = new UserModel();
         $resource->setModel($model);
-        $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
+        $this->assertInstanceOf(Model::class, $resource->getModel());
 
         // Note that the leading backslash is missing if we build it this way
         $this->assertSame('Tests\Support\Models\UserModel', $resource->getModelName());
diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php
index 26ea1084b196..568b395a778c 100644
--- a/tests/system/RESTful/ResourcePresenterTest.php
+++ b/tests/system/RESTful/ResourcePresenterTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\CodeIgniter;
 use CodeIgniter\Config\Services;
+use CodeIgniter\Model;
 use CodeIgniter\Router\RouteCollection;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockCodeIgniter;
@@ -34,10 +35,7 @@
  */
 final class ResourcePresenterTest extends CIUnitTestCase
 {
-    /**
-     * @var CodeIgniter
-     */
-    protected $codeigniter;
+    protected CodeIgniter $codeigniter;
 
     /**
      * @var RouteCollection
@@ -247,7 +245,7 @@ public function testModelByName()
     {
         $resource = new MockResourcePresenter();
         $resource->setModel('\Tests\Support\Models\UserModel');
-        $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
+        $this->assertInstanceOf(Model::class, $resource->getModel());
         $this->assertSame('\Tests\Support\Models\UserModel', $resource->getModelName());
     }
 
@@ -256,7 +254,7 @@ public function testModelByObject()
         $resource = new MockResourcePresenter();
         $model    = new UserModel();
         $resource->setModel($model);
-        $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
+        $this->assertInstanceOf(Model::class, $resource->getModel());
 
         // Note that the leading backslash is missing if we build it this way
         $this->assertSame('Tests\Support\Models\UserModel', $resource->getModelName());
@@ -266,12 +264,12 @@ public function testChangeSetModelByObject()
     {
         $resource = new MockResourcePresenter();
         $resource->setModel('\Tests\Support\Models\UserModel');
-        $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
+        $this->assertInstanceOf(Model::class, $resource->getModel());
         $this->assertSame('\Tests\Support\Models\UserModel', $resource->getModelName());
 
         $model = new EntityModel();
         $resource->setModel($model);
-        $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
+        $this->assertInstanceOf(Model::class, $resource->getModel());
         $this->assertSame('Tests\Support\Models\EntityModel', $resource->getModelName());
     }
 
@@ -279,11 +277,11 @@ public function testChangeSetModelByName()
     {
         $resource = new MockResourcePresenter();
         $resource->setModel('\Tests\Support\Models\UserModel');
-        $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
+        $this->assertInstanceOf(Model::class, $resource->getModel());
         $this->assertSame('\Tests\Support\Models\UserModel', $resource->getModelName());
 
         $resource->setModel('\Tests\Support\Models\EntityModel');
-        $this->assertInstanceOf('CodeIgniter\Model', $resource->getModel());
+        $this->assertInstanceOf(Model::class, $resource->getModel());
         $this->assertSame('\Tests\Support\Models\EntityModel', $resource->getModelName());
     }
 }
diff --git a/tests/system/Session/Handlers/DatabaseHandlerTest.php b/tests/system/Session/Handlers/DatabaseHandlerTest.php
index 2349bc292bd8..7af077606cba 100644
--- a/tests/system/Session/Handlers/DatabaseHandlerTest.php
+++ b/tests/system/Session/Handlers/DatabaseHandlerTest.php
@@ -40,7 +40,7 @@ protected function setUp(): void
     protected function getInstance($options = [])
     {
         $defaults = [
-            'sessionDriver'            => 'CodeIgniter\Session\Handlers\DatabaseHandler',
+            'sessionDriver'            => DatabaseHandler::class,
             'sessionCookieName'        => 'ci_session',
             'sessionExpiration'        => 7200,
             'sessionSavePath'          => 'ci_sessions',
diff --git a/tests/system/Session/SessionTest.php b/tests/system/Session/SessionTest.php
index c295e26ba7d3..574ffaf99ce9 100644
--- a/tests/system/Session/SessionTest.php
+++ b/tests/system/Session/SessionTest.php
@@ -41,7 +41,7 @@ protected function setUp(): void
     protected function getInstance($options = [])
     {
         $defaults = [
-            'sessionDriver'            => 'CodeIgniter\Session\Handlers\FileHandler',
+            'sessionDriver'            => FileHandler::class,
             'sessionCookieName'        => 'ci_session',
             'sessionExpiration'        => 7200,
             'sessionSavePath'          => null,
diff --git a/tests/system/Test/FabricatorTest.php b/tests/system/Test/FabricatorTest.php
index f7ba5781979a..13de446cbcb9 100644
--- a/tests/system/Test/FabricatorTest.php
+++ b/tests/system/Test/FabricatorTest.php
@@ -26,10 +26,8 @@ final class FabricatorTest extends CIUnitTestCase
 {
     /**
      * Default formatters to use for UserModel. Should match detected version.
-     *
-     * @var array
      */
-    protected $formatters = [
+    protected array $formatters = [
         'name'       => 'name',
         'email'      => 'email',
         'country'    => 'country',
@@ -363,7 +361,7 @@ public function testMakeReturnsSingleton()
 
         $result = $fabricator->make();
 
-        $this->assertInstanceOf('stdClass', $result);
+        $this->assertInstanceOf(stdClass::class, $result);
     }
 
     public function testMakeReturnsExpectedCount()
@@ -383,7 +381,7 @@ public function testCreateMockReturnsSingleton()
 
         $result = $fabricator->create(null, true);
 
-        $this->assertInstanceOf('stdClass', $result);
+        $this->assertInstanceOf(stdClass::class, $result);
     }
 
     public function testCreateMockReturnsExpectedCount()
diff --git a/tests/system/Test/FilterTestTraitTest.php b/tests/system/Test/FilterTestTraitTest.php
index 15b98379fbcf..f3cb0a4a6165 100644
--- a/tests/system/Test/FilterTestTraitTest.php
+++ b/tests/system/Test/FilterTestTraitTest.php
@@ -11,8 +11,10 @@
 
 namespace CodeIgniter\Test;
 
+use Closure;
 use CodeIgniter\Filters\Filters;
 use CodeIgniter\HTTP\RequestInterface;
+use InvalidArgumentException;
 use Tests\Support\Filters\Customfilter;
 
 /**
@@ -50,12 +52,12 @@ public function testGetCallerReturnsClosure()
         $caller = $this->getFilterCaller('test-customfilter', 'before');
 
         $this->assertIsCallable($caller);
-        $this->assertInstanceOf('Closure', $caller);
+        $this->assertInstanceOf(Closure::class, $caller);
     }
 
     public function testGetCallerInvalidPosition()
     {
-        $this->expectException('InvalidArgumentException');
+        $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Invalid filter position passed: banana');
 
         $this->getFilterCaller('test-customfilter', 'banana');
diff --git a/tests/system/View/CellTest.php b/tests/system/View/CellTest.php
index 2d05fad5fbf2..f15e7ce16abb 100644
--- a/tests/system/View/CellTest.php
+++ b/tests/system/View/CellTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\View;
 
+use CodeIgniter\HTTP\Response;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockCache;
 use CodeIgniter\View\Exceptions\ViewException;
@@ -21,11 +22,7 @@
 final class CellTest extends CIUnitTestCase
 {
     protected $cache;
-
-    /**
-     * @var Cell
-     */
-    protected $cell;
+    protected Cell $cell;
 
     protected function setUp(): void
     {
@@ -252,6 +249,6 @@ public function testParametersDontMatch()
 
     public function testCallInitControllerIfMethodExists()
     {
-        $this->assertSame('CodeIgniter\HTTP\Response', $this->cell->render('\Tests\Support\View\SampleClassWithInitController::index'));
+        $this->assertSame(Response::class, $this->cell->render('\Tests\Support\View\SampleClassWithInitController::index'));
     }
 }

From f33b0feb28c724df00273846512b1c0ef9f56412 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sun, 20 Mar 2022 01:25:13 +0700
Subject: [PATCH 1786/2325] Update system/Config/BaseService.php

Co-authored-by: Mostafa Khudair <59371810+mostafakhudair@users.noreply.github.com>
---
 system/Config/BaseService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
index 4244b7a7097d..0e36c6254e9f 100644
--- a/system/Config/BaseService.php
+++ b/system/Config/BaseService.php
@@ -332,7 +332,7 @@ protected static function discoverServices(string $name, array $arguments)
                 foreach ($files as $file) {
                     $classname = $locator->getClassname($file);
 
-                    if (! in_array($classname, [\CodeIgniter\Config\Services::class], true)) {
+                    if (! in_array($classname, [Services::class], true)) {
                         static::$services[] = new $classname();
                     }
                 }

From 74cb75c1b02a0fcc9812d7e8995805c2c28a7c69 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sun, 20 Mar 2022 01:25:18 +0700
Subject: [PATCH 1787/2325] Update system/Config/BaseService.php

Co-authored-by: Mostafa Khudair <59371810+mostafakhudair@users.noreply.github.com>
---
 system/Config/BaseService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
index 0e36c6254e9f..ba2779d4f580 100644
--- a/system/Config/BaseService.php
+++ b/system/Config/BaseService.php
@@ -369,7 +369,7 @@ protected static function buildServicesCache(): void
                 foreach ($files as $file) {
                     $classname = $locator->getClassname($file);
 
-                    if ($classname !== \CodeIgniter\Config\Services::class) {
+                    if ($classname !== Services::class) {
                         self::$serviceNames[] = $classname;
                         static::$services[]   = new $classname();
                     }

From 8aa0a1eae255f5e0e81f7d098a4a1d39d2763669 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 20 Mar 2022 09:30:15 +0900
Subject: [PATCH 1788/2325] refactor: rename variable names

---
 system/Router/Router.php | 52 ++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/system/Router/Router.php b/system/Router/Router.php
index da00d054e4af..f930a3ba3f9b 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -362,31 +362,31 @@ protected function checkRoutes(string $uri): bool
             : trim($uri, '/ ');
 
         // Loop through the route array looking for wildcards
-        foreach ($routes as $key => $val) {
+        foreach ($routes as $routeKey => $handler) {
             // Reset localeSegment
             $localeSegment = null;
 
-            $key = $key === '/'
-                ? $key
-                : ltrim($key, '/ ');
+            $routeKey = $routeKey === '/'
+                ? $routeKey
+                : ltrim($routeKey, '/ ');
 
-            $matchedKey = $key;
+            $matchedKey = $routeKey;
 
             // Are we dealing with a locale?
-            if (strpos($key, '{locale}') !== false) {
-                $localeSegment = array_search('{locale}', preg_split('/[\/]*((^[a-zA-Z0-9])|\(([^()]*)\))*[\/]+/m', $key), true);
+            if (strpos($routeKey, '{locale}') !== false) {
+                $localeSegment = array_search('{locale}', preg_split('/[\/]*((^[a-zA-Z0-9])|\(([^()]*)\))*[\/]+/m', $routeKey), true);
 
                 // Replace it with a regex so it
                 // will actually match.
-                $key = str_replace('/', '\/', $key);
-                $key = str_replace('{locale}', '[^\/]+', $key);
+                $routeKey = str_replace('/', '\/', $routeKey);
+                $routeKey = str_replace('{locale}', '[^\/]+', $routeKey);
             }
 
             // Does the RegEx match?
-            if (preg_match('#^' . $key . '$#u', $uri, $matches)) {
+            if (preg_match('#^' . $routeKey . '$#u', $uri, $matches)) {
                 // Is this route supposed to redirect to another?
-                if ($this->collection->isRedirect($key)) {
-                    throw new RedirectException(is_array($val) ? key($val) : $val, $this->collection->getRedirectCode($key));
+                if ($this->collection->isRedirect($routeKey)) {
+                    throw new RedirectException(is_array($handler) ? key($handler) : $handler, $this->collection->getRedirectCode($routeKey));
                 }
                 // Store our locale so CodeIgniter object can
                 // assign it to the Request.
@@ -399,8 +399,8 @@ protected function checkRoutes(string $uri): bool
                 // Are we using Closures? If so, then we need
                 // to collect the params into an array
                 // so it can be passed to the controller method later.
-                if (! is_string($val) && is_callable($val)) {
-                    $this->controller = $val;
+                if (! is_string($handler) && is_callable($handler)) {
+                    $this->controller = $handler;
 
                     // Remove the original string from the matches array
                     array_shift($matches);
@@ -409,7 +409,7 @@ protected function checkRoutes(string $uri): bool
 
                     $this->matchedRoute = [
                         $matchedKey,
-                        $val,
+                        $handler,
                     ];
 
                     $this->matchedRouteOptions = $this->collection->getRoutesOptions($matchedKey);
@@ -420,26 +420,26 @@ protected function checkRoutes(string $uri): bool
 
                 // Support resource route when function with subdirectory
                 // ex: $routes->resource('Admin/Admins');
-                if (strpos($val, '$') !== false && strpos($key, '(') !== false && strpos($key, '/') !== false) {
-                    $replacekey = str_replace('/(.*)', '', $key);
-                    $val        = preg_replace('#^' . $key . '$#u', $val, $uri);
-                    $val        = str_replace($replacekey, str_replace('/', '\\', $replacekey), $val);
-                } elseif (strpos($val, '$') !== false && strpos($key, '(') !== false) {
-                    $val = preg_replace('#^' . $key . '$#u', $val, $uri);
-                } elseif (strpos($val, '/') !== false) {
-                    [$controller, $method] = explode('::', $val);
+                if (strpos($handler, '$') !== false && strpos($routeKey, '(') !== false && strpos($routeKey, '/') !== false) {
+                    $replacekey = str_replace('/(.*)', '', $routeKey);
+                    $handler    = preg_replace('#^' . $routeKey . '$#u', $handler, $uri);
+                    $handler    = str_replace($replacekey, str_replace('/', '\\', $replacekey), $handler);
+                } elseif (strpos($handler, '$') !== false && strpos($routeKey, '(') !== false) {
+                    $handler = preg_replace('#^' . $routeKey . '$#u', $handler, $uri);
+                } elseif (strpos($handler, '/') !== false) {
+                    [$controller, $method] = explode('::', $handler);
 
                     // Only replace slashes in the controller, not in the method.
                     $controller = str_replace('/', '\\', $controller);
 
-                    $val = $controller . '::' . $method;
+                    $handler = $controller . '::' . $method;
                 }
 
-                $this->setRequest(explode('/', $val));
+                $this->setRequest(explode('/', $handler));
 
                 $this->matchedRoute = [
                     $matchedKey,
-                    $val,
+                    $handler,
                 ];
 
                 $this->matchedRouteOptions = $this->collection->getRoutesOptions($matchedKey);

From bb6f480e3039939241257b29d7be30bb8f5ef9e0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 20 Mar 2022 09:40:58 +0900
Subject: [PATCH 1789/2325] docs: remove comments

I don't understand what's saying.
---
 system/Router/Router.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/system/Router/Router.php b/system/Router/Router.php
index f930a3ba3f9b..1f8d2ea2f7db 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -416,10 +416,7 @@ protected function checkRoutes(string $uri): bool
 
                     return true;
                 }
-                // Are we using the default method for back-references?
 
-                // Support resource route when function with subdirectory
-                // ex: $routes->resource('Admin/Admins');
                 if (strpos($handler, '$') !== false && strpos($routeKey, '(') !== false && strpos($routeKey, '/') !== false) {
                     $replacekey = str_replace('/(.*)', '', $routeKey);
                     $handler    = preg_replace('#^' . $routeKey . '$#u', $handler, $uri);

From 44d68fa6908f554708b795e098ab1f0b4161f63e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 20 Mar 2022 09:46:49 +0900
Subject: [PATCH 1790/2325] test: fix route key

All lowercase is better.
---
 tests/system/Router/RouterTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index 4ba9972b1288..c3fed4d15660 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -59,7 +59,7 @@ protected function setUp(): void
             'books/(:num)/(:alpha)/(:num)'                    => 'Blog::show/$3/$1',
             'closure/(:num)/(:alpha)'                         => static fn ($num, $str) => $num . '-' . $str,
             '{locale}/pages'                                  => 'App\Pages::list_all',
-            'Admin/Admins'                                    => 'App\Admin\Admins::list_all',
+            'admin/admins'                                    => 'App\Admin\Admins::list_all',
             '/some/slash'                                     => 'App\Slash::index',
             'objects/(:segment)/sort/(:segment)/([A-Z]{3,7})' => 'AdminList::objectsSortCreate/$1/$2/$3',
         ];
@@ -398,7 +398,7 @@ public function testRouteResource()
     {
         $router = new Router($this->collection, $this->request);
 
-        $router->handle('Admin/Admins');
+        $router->handle('admin/admins');
 
         $this->assertSame('\App\Admin\Admins', $router->controllerName());
         $this->assertSame('list_all', $router->methodName());

From 53ac90afe0e73b19ec3aca8399c52a1a7665b50f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 20 Mar 2022 10:00:22 +0900
Subject: [PATCH 1791/2325] test: remove empty tearDown()

---
 tests/system/Router/RouterTest.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index c3fed4d15660..06e6b2033daa 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -69,10 +69,6 @@ protected function setUp(): void
         $this->request->setMethod('get');
     }
 
-    protected function tearDown(): void
-    {
-    }
-
     public function testEmptyURIMatchesDefaults()
     {
         $router = new Router($this->collection, $this->request);

From 98fdcb909e0d37ed14244d5d436ce9d7c6864ffe Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 20 Mar 2022 10:00:45 +0900
Subject: [PATCH 1792/2325] refactor: make if conditions a bit easier to read

---
 system/Router/Router.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/system/Router/Router.php b/system/Router/Router.php
index 1f8d2ea2f7db..ccf83f143740 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -417,12 +417,16 @@ protected function checkRoutes(string $uri): bool
                     return true;
                 }
 
-                if (strpos($handler, '$') !== false && strpos($routeKey, '(') !== false && strpos($routeKey, '/') !== false) {
-                    $replacekey = str_replace('/(.*)', '', $routeKey);
-                    $handler    = preg_replace('#^' . $routeKey . '$#u', $handler, $uri);
-                    $handler    = str_replace($replacekey, str_replace('/', '\\', $replacekey), $handler);
-                } elseif (strpos($handler, '$') !== false && strpos($routeKey, '(') !== false) {
-                    $handler = preg_replace('#^' . $routeKey . '$#u', $handler, $uri);
+                if (strpos($handler, '$') !== false && strpos($routeKey, '(') !== false) {
+                    // Using back-references
+
+                    if (strpos($routeKey, '/') !== false) {
+                        $replacekey = str_replace('/(.*)', '', $routeKey);
+                        $handler    = preg_replace('#^' . $routeKey . '$#u', $handler, $uri);
+                        $handler    = str_replace($replacekey, str_replace('/', '\\', $replacekey), $handler);
+                    } else {
+                        $handler = preg_replace('#^' . $routeKey . '$#u', $handler, $uri);
+                    }
                 } elseif (strpos($handler, '/') !== false) {
                     [$controller, $method] = explode('::', $handler);
 

From 46401c205dcf7c63fab4d31a70fcb87ae052b49a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 20 Mar 2022 10:21:04 +0900
Subject: [PATCH 1793/2325] fix: add check for dynamic controller

Dynamic controller should not be used, but if you set a route like this, it worked.
$routes->get('(:segment)/(:segment)/(:segment)', '\App\Controllers\\\\$2::$3');
---
 system/Language/en/Router.php                |  5 +++--
 system/Router/Exceptions/RouterException.php | 10 ++++++++++
 system/Router/Router.php                     |  6 ++++++
 tests/system/Router/RouterTest.php           | 12 ++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/system/Language/en/Router.php b/system/Language/en/Router.php
index 9f6cdb700f04..90aaa132b489 100644
--- a/system/Language/en/Router.php
+++ b/system/Language/en/Router.php
@@ -11,6 +11,7 @@
 
 // Router language settings
 return [
-    'invalidParameter'    => 'A parameter does not match the expected type.',
-    'missingDefaultRoute' => 'Unable to determine what should be displayed. A default route has not been specified in the routing file.',
+    'invalidParameter'         => 'A parameter does not match the expected type.',
+    'missingDefaultRoute'      => 'Unable to determine what should be displayed. A default route has not been specified in the routing file.',
+    'invalidDynamicController' => 'A dynamic controller is not allowed for security reasons. Route handler: {0}',
 ];
diff --git a/system/Router/Exceptions/RouterException.php b/system/Router/Exceptions/RouterException.php
index 8c469d967b78..b50042b3421b 100644
--- a/system/Router/Exceptions/RouterException.php
+++ b/system/Router/Exceptions/RouterException.php
@@ -58,4 +58,14 @@ public static function forInvalidRoute(string $route)
     {
         return new static(lang('HTTP.invalidRoute', [$route]));
     }
+
+    /**
+     * Throw when dynamic controller.
+     *
+     * @return RouterException
+     */
+    public static function forDynamicController(string $handler)
+    {
+        return new static(lang('Router.invalidDynamicController', [$handler]));
+    }
 }
diff --git a/system/Router/Router.php b/system/Router/Router.php
index ccf83f143740..42f2eb0c7a42 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -420,6 +420,12 @@ protected function checkRoutes(string $uri): bool
                 if (strpos($handler, '$') !== false && strpos($routeKey, '(') !== false) {
                     // Using back-references
 
+                    // Checks dynamic controller
+                    [$controller, ] = explode('::', $handler);
+                    if (strpos($controller, '$') !== false) {
+                        throw RouterException::forDynamicController($handler);
+                    }
+
                     if (strpos($routeKey, '/') !== false) {
                         $replacekey = str_replace('/(.*)', '', $routeKey);
                         $handler    = preg_replace('#^' . $routeKey . '$#u', $handler, $uri);
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index 06e6b2033daa..b2c476f5add6 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Config\Services;
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\Router\Exceptions\RouterException;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Modules;
 use Tests\Support\Filters\Customfilter;
@@ -62,6 +63,7 @@ protected function setUp(): void
             'admin/admins'                                    => 'App\Admin\Admins::list_all',
             '/some/slash'                                     => 'App\Slash::index',
             'objects/(:segment)/sort/(:segment)/([A-Z]{3,7})' => 'AdminList::objectsSortCreate/$1/$2/$3',
+            '(:segment)/(:segment)/(:segment)'                => '$2::$3/$1',
         ];
 
         $this->collection->map($routes);
@@ -410,6 +412,16 @@ public function testRouteWithLeadingSlash()
         $this->assertSame('index', $router->methodName());
     }
 
+    public function testRouteWithDynamicController()
+    {
+        $this->expectException(RouterException::class);
+        $this->expectExceptionMessage('A dynamic controller is not allowed for security reasons. Route handler: \$2::$3/$1');
+
+        $router = new Router($this->collection, $this->request);
+
+        $router->handle('en/zoo/bar');
+    }
+
     // options need to be declared separately, to not confuse PHPCBF
     public function testMatchedRouteOptions()
     {

From 579d0d5119423a8c7d4bc350c1bcf622a623c422 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 20 Mar 2022 11:13:40 +0900
Subject: [PATCH 1794/2325] docs: change the description to note to make it
 stand out

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

diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst
index 8f0252c27cff..9f673b88e8bb 100644
--- a/user_guide_src/source/helpers/url_helper.rst
+++ b/user_guide_src/source/helpers/url_helper.rst
@@ -106,10 +106,10 @@ The following functions are available:
 
     Returns the full URL (including segments) of the page the user was previously on.
 
-    Due to security issues of blindly trusting the HTTP_REFERER system variable, CodeIgniter will
-    store previously visited pages in the session if it's available. This ensures that we always
-    use a known and trusted source. If the session hasn't been loaded, or is otherwise unavailable,
-    then a sanitized version of HTTP_REFERER will be used.
+    .. note:: Due to security issues of blindly trusting the HTTP_REFERER system variable, CodeIgniter will
+        store previously visited pages in the session if it's available. This ensures that we always
+        use a known and trusted source. If the session hasn't been loaded, or is otherwise unavailable,
+        then a sanitized version of HTTP_REFERER will be used.
 
 .. php:function:: uri_string([$relative = false])
 

From fedf4f18ec2752b4f3651ead5dfe0430ba19a736 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 20 Mar 2022 11:14:36 +0900
Subject: [PATCH 1795/2325] docs: add explanation about redirect()->back()

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

diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index 920e2496b43b..f8cbcf69bc53 100755
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -303,6 +303,10 @@ Miscellaneous Functions
 
     .. literalinclude:: common_functions/005.php
 
+    .. note:: ``redirect()->back()`` is not the same as browser "back" button.
+        It takes a visitor to "the last page viewed during the Session" when the Session is available.
+        If the Session hasn’t been loaded, or is otherwise unavailable, then a sanitized version of HTTP_REFERER will be used.
+
     When passing an argument into the function, it is treated as a named/reverse-routed route, not a relative/full URI,
     treating it the same as using ``redirect()->route()``:
 

From e4fcba2749b3e7e5dd3af55b5cdd057820343fe0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 20 Mar 2022 16:14:40 +0900
Subject: [PATCH 1796/2325] fix: failover's DBPrefix not working

Fixes #5812
---
 system/Database/BaseConnection.php         |  7 +++++++
 tests/system/Database/Live/ConnectTest.php | 12 ++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 4f54c1980830..9c803d0c1372 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -342,6 +342,13 @@ public function __construct(array $params)
         if (class_exists($queryClass)) {
             $this->queryClass = $queryClass;
         }
+
+        if ($this->failover !== []) {
+            // If there is a failover database, connect now to do failover.
+            // Otherwise, Query Builder creates SQL statement with the main database config
+            // (DBPrefix) even when the main database is down.
+            $this->initialize();
+        }
     }
 
     /**
diff --git a/tests/system/Database/Live/ConnectTest.php b/tests/system/Database/Live/ConnectTest.php
index 743b5450cca3..1757f91cb676 100644
--- a/tests/system/Database/Live/ConnectTest.php
+++ b/tests/system/Database/Live/ConnectTest.php
@@ -95,14 +95,22 @@ public function testConnectWorksWithGroupName()
     public function testConnectWithFailover()
     {
         $this->tests['failover'][] = $this->tests;
-
         unset($this->tests['failover'][0]['failover']);
 
+        // Change main's DBPrefix
+        $this->tests['DBPrefix'] = 'main_';
+
+        if ($this->tests['DBDriver'] === 'SQLite3') {
+            // Change main's database path to fail to connect
+            $this->tests['database'] = '/does/not/exists/test.db';
+        }
+
         $this->tests['username'] = 'wrong';
 
         $db1 = Database::connect($this->tests);
 
-        $this->assertSame($this->tests['failover'][0]['DBDriver'], $this->getPrivateProperty($db1, 'DBDriver'));
+        $this->assertSame($this->tests['failover'][0]['DBPrefix'], $this->getPrivateProperty($db1, 'DBPrefix'));
+
         $this->assertGreaterThanOrEqual(0, count($db1->listTables()));
     }
 }

From 5a456125d8a8503945568564b91a2ad256d2d184 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 20 Mar 2022 16:40:08 +0900
Subject: [PATCH 1797/2325] test: fix failed test

---
 tests/system/Database/BaseConnectionTest.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/system/Database/BaseConnectionTest.php b/tests/system/Database/BaseConnectionTest.php
index 9bb8ddee1499..781588dd78e8 100644
--- a/tests/system/Database/BaseConnectionTest.php
+++ b/tests/system/Database/BaseConnectionTest.php
@@ -105,8 +105,11 @@ public function testCanConnectToFailoverWhenNoConnectionAvailable()
         $options             = $this->options;
         $options['failover'] = [$this->failoverOptions];
 
-        $db = new MockConnection($options);
-        $db->shouldReturn('connect', [false, 345])->initialize();
+        $db                         = new class ($options) extends MockConnection {
+            protected $returnValues = [
+                'connect' => [false, 345],
+            ];
+        };
 
         $this->assertSame(345, $db->getConnection());
         $this->assertSame('failover', $db->username);

From 6a0ed54b9922c7c88dce16033615750d7fe67d36 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sun, 20 Mar 2022 15:45:17 +0700
Subject: [PATCH 1798/2325] revert SQLite3 as string

---
 app/Config/Database.php                       |  3 +-
 rector.php                                    | 11 +++++++
 system/Commands/Database/CreateDatabase.php   |  3 +-
 system/Database/SQLite3/Connection.php        |  2 +-
 tests/system/Database/ConfigTest.php          |  5 ++-
 tests/system/Database/Live/DbUtilsTest.php    |  5 ++-
 tests/system/Database/Live/ForgeTest.php      | 31 +++++++++----------
 tests/system/Database/Live/GetTest.php        |  5 ++-
 .../Database/Live/SQLite/AlterTableTest.php   |  3 +-
 .../Migrations/MigrationRunnerTest.php        |  3 +-
 10 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/app/Config/Database.php b/app/Config/Database.php
index 376de53a821d..1e6340899bf4 100644
--- a/app/Config/Database.php
+++ b/app/Config/Database.php
@@ -3,7 +3,6 @@
 namespace Config;
 
 use CodeIgniter\Database\Config;
-use SQLite3;
 
 /**
  * Database Configuration
@@ -63,7 +62,7 @@ class Database extends Config
         'username' => '',
         'password' => '',
         'database' => ':memory:',
-        'DBDriver' => SQLite3::class,
+        'DBDriver' => 'SQLite3',
         'DBPrefix' => 'db_',  // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE FOR CI DEVS
         'pConnect' => false,
         'DBDebug'  => (ENVIRONMENT !== 'production'),
diff --git a/rector.php b/rector.php
index 6c2bc99bcf8d..c43f25f3a274 100644
--- a/rector.php
+++ b/rector.php
@@ -111,6 +111,17 @@
 
             // expected Qualified name
             __DIR__ . '/tests/system/Autoloader/FileLocatorTest.php',
+
+            // SQLite3 as string
+            __DIR__ . '/app/Config/Database.php',
+            __DIR__ . '/system/Commands/Database/CreateDatabase.php',
+            __DIR__ . '/system/Database/SQLite3/Connection.php',
+            __DIR__ . '/tests/system/Database/ConfigTest.php',
+            __DIR__ . '/tests/system/Database/Live/DbUtilsTest.php',
+            __DIR__ . '/tests/system/Database/Live/ForgeTest.php',
+            __DIR__ . '/tests/system/Database/Live/GetTest.php',
+            __DIR__ . '/tests/system/Database/Live/SQLite/AlterTableTest.php',
+            __DIR__ . '/tests/system/Database/Migrations/MigrationRunnerTest.php',
         ],
 
         // sometime too detail
diff --git a/system/Commands/Database/CreateDatabase.php b/system/Commands/Database/CreateDatabase.php
index 0682f945b9bf..17e1e51bb68b 100644
--- a/system/Commands/Database/CreateDatabase.php
+++ b/system/Commands/Database/CreateDatabase.php
@@ -16,7 +16,6 @@
 use CodeIgniter\Config\Factories;
 use CodeIgniter\Database\SQLite3\Connection;
 use Config\Database;
-use SQLite3;
 use Throwable;
 
 /**
@@ -107,7 +106,7 @@ public function run(array $params)
                     $name = str_replace(['.db', '.sqlite'], '', $name) . ".{$ext}";
                 }
 
-                $config->{$group}['DBDriver'] = SQLite3::class;
+                $config->{$group}['DBDriver'] = 'SQLite3';
                 $config->{$group}['database'] = $name;
 
                 if ($name !== ':memory:') {
diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
index e335e7985ba7..39fbca8bcfea 100644
--- a/system/Database/SQLite3/Connection.php
+++ b/system/Database/SQLite3/Connection.php
@@ -28,7 +28,7 @@ class Connection extends BaseConnection
      *
      * @var string
      */
-    public $DBDriver = SQLite3::class;
+    public $DBDriver = 'SQLite3';
 
     /**
      * Identifier escape character
diff --git a/tests/system/Database/ConfigTest.php b/tests/system/Database/ConfigTest.php
index 301a95158bf1..fdbc42749d1d 100644
--- a/tests/system/Database/ConfigTest.php
+++ b/tests/system/Database/ConfigTest.php
@@ -13,7 +13,6 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\ReflectionHelper;
-use SQLite3;
 
 /**
  * @internal
@@ -47,7 +46,7 @@ final class ConfigTest extends CIUnitTestCase
         'username' => '',
         'password' => '',
         'database' => '',
-        'DBDriver' => SQLite3::class,
+        'DBDriver' => 'SQLite3',
         'DBPrefix' => 't_',
         'pConnect' => false,
         'DBDebug'  => (ENVIRONMENT !== 'production'),
@@ -66,7 +65,7 @@ final class ConfigTest extends CIUnitTestCase
         'username' => '',
         'password' => '',
         'database' => '',
-        'DBDriver' => SQLite3::class,
+        'DBDriver' => 'SQLite3',
         'DBPrefix' => 't_',
         'pConnect' => false,
         'DBDebug'  => (ENVIRONMENT !== 'production'),
diff --git a/tests/system/Database/Live/DbUtilsTest.php b/tests/system/Database/Live/DbUtilsTest.php
index 414412a72ded..e767d0b6991d 100644
--- a/tests/system/Database/Live/DbUtilsTest.php
+++ b/tests/system/Database/Live/DbUtilsTest.php
@@ -15,7 +15,6 @@
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
-use SQLite3;
 
 /**
  * @group DatabaseLive
@@ -81,7 +80,7 @@ public function testUtilsListDatabases()
             $databases = $util->listDatabases();
 
             $this->assertContains($this->db->getDatabase(), $databases);
-        } elseif ($this->db->DBDriver === SQLite3::class) {
+        } elseif ($this->db->DBDriver === 'SQLite3') {
             $this->expectException(DatabaseException::class);
             $this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
 
@@ -97,7 +96,7 @@ public function testUtilsDatabaseExist()
             $exist = $util->databaseExists($this->db->getDatabase());
 
             $this->assertTrue($exist);
-        } elseif ($this->db->DBDriver === SQLite3::class) {
+        } elseif ($this->db->DBDriver === 'SQLite3') {
             $this->expectException(DatabaseException::class);
             $this->expectExceptionMessage('Unsupported feature of the database platform you are using.');
 
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index f83593ed320e..113f2c0a211e 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -18,7 +18,6 @@
 use Config\Database;
 use InvalidArgumentException;
 use RuntimeException;
-use SQLite3;
 
 /**
  * @group DatabaseLive
@@ -57,7 +56,7 @@ public function testCreateDatabaseIfNotExists()
         $dbName = 'test_forge_database_exist';
 
         $databaseCreateIfNotExists = $this->forge->createDatabase($dbName, true);
-        if ($this->db->DBDriver !== SQLite3::class) {
+        if ($this->db->DBDriver !== 'SQLite3') {
             $this->forge->dropDatabase($dbName);
         }
 
@@ -73,7 +72,7 @@ public function testCreateDatabaseIfNotExistsWithDb()
 
         $this->forge->createDatabase($dbName);
         $databaseExists = $this->forge->createDatabase($dbName, true);
-        if ($this->db->DBDriver !== SQLite3::class) {
+        if ($this->db->DBDriver !== 'SQLite3') {
             $this->forge->dropDatabase($dbName);
         }
 
@@ -85,7 +84,7 @@ public function testDropDatabase()
         if ($this->db->DBDriver === 'OCI8') {
             $this->markTestSkipped('OCI8 does not support drop database.');
         }
-        if ($this->db->DBDriver === SQLite3::class) {
+        if ($this->db->DBDriver === 'SQLite3') {
             $this->markTestSkipped('SQLite3 requires file path to drop database');
         }
 
@@ -98,7 +97,7 @@ public function testCreateDatabaseExceptionNoCreateStatement()
     {
         $this->setPrivateProperty($this->forge, 'createDatabaseStr', false);
 
-        if ($this->db->DBDriver === SQLite3::class) {
+        if ($this->db->DBDriver === 'SQLite3') {
             $databaseCreated = $this->forge->createDatabase('test_forge_database');
             $this->assertTrue($databaseCreated);
         } else {
@@ -113,7 +112,7 @@ public function testDropDatabaseExceptionNoDropStatement()
     {
         $this->setPrivateProperty($this->forge, 'dropDatabaseStr', false);
 
-        if ($this->db->DBDriver === SQLite3::class) {
+        if ($this->db->DBDriver === 'SQLite3') {
             $this->markTestSkipped('SQLite3 requires file path to drop database');
         } else {
             $this->expectException(DatabaseException::class);
@@ -176,7 +175,7 @@ public function testCreateTableApplyBigInt()
             $this->assertSame(strtolower($fieldsData[0]->type), 'bigint');
         } elseif ($this->db->DBDriver === 'Postgre') {
             $this->assertSame(strtolower($fieldsData[0]->type), 'bigint');
-        } elseif ($this->db->DBDriver === SQLite3::class) {
+        } elseif ($this->db->DBDriver === 'SQLite3') {
             $this->assertSame(strtolower($fieldsData[0]->type), 'integer');
         } elseif ($this->db->DBDriver === 'OCI8') {
             $this->assertSame(strtolower($fieldsData[0]->type), 'number');
@@ -192,7 +191,7 @@ public function testCreateTableWithAttributes()
         if ($this->db->DBDriver === 'OCI8') {
             $this->markTestSkipped('OCI8 does not support comments on tables or columns.');
         }
-        if ($this->db->DBDriver === SQLite3::class) {
+        if ($this->db->DBDriver === 'SQLite3') {
             $this->markTestSkipped('SQLite3 does not support comments on tables or columns.');
         }
 
@@ -214,7 +213,7 @@ public function testCreateTableWithAttributes()
 
     public function testCreateTableWithArrayFieldConstraints()
     {
-        if (in_array($this->db->DBDriver, ['MySQLi', SQLite3::class], true)) {
+        if (in_array($this->db->DBDriver, ['MySQLi', 'SQLite3'], true)) {
             $this->forge->dropTable('forge_array_constraint', true);
             $this->forge->addField([
                 'status' => [
@@ -232,7 +231,7 @@ public function testCreateTableWithArrayFieldConstraints()
 
             $this->assertSame('status', $fields[0]->name);
 
-            if ($this->db->DBDriver === SQLite3::class) {
+            if ($this->db->DBDriver === 'SQLite3') {
                 // SQLite3 converts array constraints to TEXT CHECK(...)
                 $this->assertSame('TEXT', $fields[0]->type);
             } else {
@@ -432,7 +431,7 @@ public function testForeignKey()
 
         $foreignKeyData = $this->db->getForeignKeyData($tableName);
 
-        if ($this->db->DBDriver === SQLite3::class) {
+        if ($this->db->DBDriver === 'SQLite3') {
             $this->assertSame($foreignKeyData[0]->constraint_name, 'users_id to db_forge_test_users.id');
             $this->assertSame($foreignKeyData[0]->sequence, 0);
         } elseif ($this->db->DBDriver === 'OCI8') {
@@ -554,7 +553,7 @@ public function testCompositeForeignKey()
 
         $foreignKeyData = $this->db->getForeignKeyData($forgeTestInvoicesTableName);
 
-        if ($this->db->DBDriver === SQLite3::class) {
+        if ($this->db->DBDriver === 'SQLite3') {
             $this->assertSame('users_id to db_forge_test_users.id', $foreignKeyData[0]->constraint_name);
             $this->assertSame(0, $foreignKeyData[0]->sequence);
             $this->assertSame('users_second_id to db_forge_test_users.second_id', $foreignKeyData[1]->constraint_name);
@@ -844,7 +843,7 @@ public function testAddFields()
             $this->assertSame(32, (int) $fieldsData[0]->max_length);
             $this->assertNull($fieldsData[1]->default);
             $this->assertSame(255, (int) $fieldsData[1]->max_length);
-        } elseif ($this->db->DBDriver === SQLite3::class) {
+        } elseif ($this->db->DBDriver === 'SQLite3') {
             $this->assertSame('integer', strtolower($fieldsData[0]->type));
             $this->assertSame('varchar', strtolower($fieldsData[1]->type));
             $this->assertNull($fieldsData[1]->default);
@@ -869,7 +868,7 @@ public function testAddFields()
     public function testCompositeKey()
     {
         // SQLite3 uses auto increment different
-        $uniqueOrAuto = $this->db->DBDriver === SQLite3::class ? 'unique' : 'auto_increment';
+        $uniqueOrAuto = $this->db->DBDriver === 'SQLite3' ? 'unique' : 'auto_increment';
 
         $this->forge->addField([
             'id' => [
@@ -917,7 +916,7 @@ public function testCompositeKey()
             $this->assertSame($keys['db_forge_test_1_code_active']->name, 'db_forge_test_1_code_active');
             $this->assertSame($keys['db_forge_test_1_code_active']->fields, ['code', 'active']);
             $this->assertSame($keys['db_forge_test_1_code_active']->type, 'UNIQUE');
-        } elseif ($this->db->DBDriver === SQLite3::class) {
+        } elseif ($this->db->DBDriver === 'SQLite3') {
             $this->assertSame($keys['sqlite_autoindex_db_forge_test_1_1']->name, 'sqlite_autoindex_db_forge_test_1_1');
             $this->assertSame($keys['sqlite_autoindex_db_forge_test_1_1']->fields, ['id']);
             $this->assertSame($keys['db_forge_test_1_code_company']->name, 'db_forge_test_1_code_company');
@@ -1055,7 +1054,7 @@ public function testDropTableSuccess()
 
         $this->assertFalse($this->db->tableExists('dropTest'));
 
-        if ($this->db->DBDriver === SQLite3::class) {
+        if ($this->db->DBDriver === 'SQLite3') {
             $this->assertCount(0, $this->db->getIndexData('droptest'));
         }
     }
diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php
index 768f24d72de3..20ae2e099d0d 100644
--- a/tests/system/Database/Live/GetTest.php
+++ b/tests/system/Database/Live/GetTest.php
@@ -14,7 +14,6 @@
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
-use SQLite3;
 
 /**
  * @group DatabaseLive
@@ -92,7 +91,7 @@ public function testGetFieldData()
 
         $typeTest = $this->db->table('type_test')->get()->getFieldData();
 
-        if ($this->db->DBDriver === SQLite3::class) {
+        if ($this->db->DBDriver === 'SQLite3') {
             $this->assertSame('integer', $typeTest[0]->type_name); // INTEGER AUTO INC
             $this->assertSame('text', $typeTest[1]->type_name);  // VARCHAR
             $this->assertSame('text', $typeTest[2]->type_name);  // CHAR
@@ -173,7 +172,7 @@ public function testGetDataSeek()
     {
         $data = $this->db->table('job')->get();
 
-        if ($this->db->DBDriver === SQLite3::class) {
+        if ($this->db->DBDriver === 'SQLite3') {
             $this->expectException(DatabaseException::class);
             $this->expectExceptionMessage('SQLite3 doesn\'t support seeking to other offset.');
         } elseif ($this->db->DBDriver === 'OCI8') {
diff --git a/tests/system/Database/Live/SQLite/AlterTableTest.php b/tests/system/Database/Live/SQLite/AlterTableTest.php
index 8889c9d8f639..ff103d699510 100644
--- a/tests/system/Database/Live/SQLite/AlterTableTest.php
+++ b/tests/system/Database/Live/SQLite/AlterTableTest.php
@@ -18,7 +18,6 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 use Config\Database;
-use SQLite3;
 
 /**
  * @group DatabaseLive
@@ -50,7 +49,7 @@ protected function setUp(): void
         parent::setUp();
 
         $config = [
-            'DBDriver' => SQLite3::class,
+            'DBDriver' => 'SQLite3',
             'database' => 'database.db',
         ];
 
diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php
index 9a5f467ed9c2..e97e4e38e56c 100644
--- a/tests/system/Database/Migrations/MigrationRunnerTest.php
+++ b/tests/system/Database/Migrations/MigrationRunnerTest.php
@@ -22,7 +22,6 @@
 use Config\Migrations;
 use Config\Services;
 use org\bovigo\vfs\vfsStream;
-use SQLite3;
 
 /**
  * @group DatabaseLive
@@ -75,7 +74,7 @@ public function testLoadsDefaultDatabaseWhenNoneSpecified()
 
         $this->assertInstanceOf(BaseConnection::class, $db);
         $this->assertSame(
-            ($dbConfig->tests['DBDriver'] === SQLite3::class ? WRITEPATH : '') . $dbConfig->tests['database'],
+            ($dbConfig->tests['DBDriver'] === 'SQLite3' ? WRITEPATH : '') . $dbConfig->tests['database'],
             $this->getPrivateProperty($db, 'database')
         );
         $this->assertSame($dbConfig->tests['DBDriver'], $this->getPrivateProperty($db, 'DBDriver'));

From 4ccda780e5f8300cc210a6834851f8f99f94d4c9 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sun, 20 Mar 2022 17:58:20 +0700
Subject: [PATCH 1799/2325] Update
 tests/system/Encryption/Handlers/SodiumHandlerTest.php

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 tests/system/Encryption/Handlers/SodiumHandlerTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/Encryption/Handlers/SodiumHandlerTest.php b/tests/system/Encryption/Handlers/SodiumHandlerTest.php
index 421af43e1330..e7cf3a54eef5 100644
--- a/tests/system/Encryption/Handlers/SodiumHandlerTest.php
+++ b/tests/system/Encryption/Handlers/SodiumHandlerTest.php
@@ -21,7 +21,7 @@
  */
 final class SodiumHandlerTest extends CIUnitTestCase
 {
-    protected \CodeIgniter\Encryption\Encryption $encryption;
+    protected Encryption $encryption;
     protected \Config\Encryption $config;
 
     protected function setUp(): void

From de9adf5d2e2061abfc156f4450aa7e2d175c8f26 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sun, 20 Mar 2022 17:58:55 +0700
Subject: [PATCH 1800/2325] Update
 tests/system/Encryption/Handlers/SodiumHandlerTest.php

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 tests/system/Encryption/Handlers/SodiumHandlerTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/Encryption/Handlers/SodiumHandlerTest.php b/tests/system/Encryption/Handlers/SodiumHandlerTest.php
index e7cf3a54eef5..28319b477ea6 100644
--- a/tests/system/Encryption/Handlers/SodiumHandlerTest.php
+++ b/tests/system/Encryption/Handlers/SodiumHandlerTest.php
@@ -22,7 +22,7 @@
 final class SodiumHandlerTest extends CIUnitTestCase
 {
     protected Encryption $encryption;
-    protected \Config\Encryption $config;
+    protected EncryptionConfig $config;
 
     protected function setUp(): void
     {

From 977defed45be74def619915bb5390fee789056e2 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sun, 20 Mar 2022 18:00:43 +0700
Subject: [PATCH 1801/2325] use Encryption class

---
 tests/system/Encryption/EncryptionTest.php              | 2 +-
 tests/system/Encryption/Handlers/OpenSSLHandlerTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/system/Encryption/EncryptionTest.php b/tests/system/Encryption/EncryptionTest.php
index cb4eb4cad7da..c5681e10e66a 100644
--- a/tests/system/Encryption/EncryptionTest.php
+++ b/tests/system/Encryption/EncryptionTest.php
@@ -21,7 +21,7 @@
  */
 final class EncryptionTest extends CIUnitTestCase
 {
-    protected \CodeIgniter\Encryption\Encryption $encryption;
+    protected Encryption $encryption;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
index 5427c99a5edb..81f3959710bc 100644
--- a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
+++ b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
@@ -21,7 +21,7 @@
  */
 final class OpenSSLHandlerTest extends CIUnitTestCase
 {
-    protected \CodeIgniter\Encryption\Encryption $encryption;
+    protected Encryption $encryption;
 
     protected function setUp(): void
     {

From 0176bb4224c3fcdf86b5c526808a1d754035154b Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 21 Mar 2022 01:39:09 +0700
Subject: [PATCH 1802/2325] exclude native classes

---
 rector.php                                    | 20 +++++++++----------
 system/CodeIgniter.php                        |  2 +-
 system/Database/BaseResult.php                |  3 +--
 system/Database/MySQLi/Result.php             |  2 +-
 system/Database/OCI8/Result.php               |  5 ++---
 system/Database/Postgre/Result.php            |  2 +-
 system/Database/SQLSRV/Result.php             |  2 +-
 system/Database/SQLite3/Result.php            |  4 ++--
 system/Test/Fabricator.php                    |  3 +--
 system/Test/Mock/MockResult.php               |  3 +--
 tests/system/Autoloader/AutoloaderTest.php    |  3 +--
 .../system/Cache/Handlers/BaseHandlerTest.php |  5 ++---
 tests/system/CommonFunctionsTest.php          |  3 +--
 tests/system/Config/DotEnvTest.php            |  5 ++---
 tests/system/Config/FactoriesTest.php         |  8 ++++----
 tests/system/Cookie/CookieTest.php            |  3 +--
 tests/system/Database/Builder/WhereTest.php   |  5 ++---
 tests/system/Database/DatabaseSeederTest.php  |  7 +++----
 tests/system/Database/Live/ForgeTest.php      |  7 +++----
 tests/system/Entity/EntityTest.php            |  5 ++---
 tests/system/Helpers/FilesystemHelperTest.php |  5 ++---
 tests/system/Models/FindModelTest.php         |  3 +--
 .../system/Models/MiscellaneousModelTest.php  |  3 +--
 tests/system/Test/ControllerTestTraitTest.php |  5 ++---
 tests/system/Test/DOMParserTest.php           |  4 +---
 tests/system/Test/FabricatorTest.php          | 12 +++++------
 tests/system/Test/FilterTestTraitTest.php     |  6 ++----
 27 files changed, 55 insertions(+), 80 deletions(-)

diff --git a/rector.php b/rector.php
index c43f25f3a274..9ee8a4217d21 100644
--- a/rector.php
+++ b/rector.php
@@ -111,17 +111,6 @@
 
             // expected Qualified name
             __DIR__ . '/tests/system/Autoloader/FileLocatorTest.php',
-
-            // SQLite3 as string
-            __DIR__ . '/app/Config/Database.php',
-            __DIR__ . '/system/Commands/Database/CreateDatabase.php',
-            __DIR__ . '/system/Database/SQLite3/Connection.php',
-            __DIR__ . '/tests/system/Database/ConfigTest.php',
-            __DIR__ . '/tests/system/Database/Live/DbUtilsTest.php',
-            __DIR__ . '/tests/system/Database/Live/ForgeTest.php',
-            __DIR__ . '/tests/system/Database/Live/GetTest.php',
-            __DIR__ . '/tests/system/Database/Live/SQLite/AlterTableTest.php',
-            __DIR__ . '/tests/system/Database/Migrations/MigrationRunnerTest.php',
         ],
 
         // sometime too detail
@@ -164,4 +153,13 @@
     $services->set(MakeInheritedMethodVisibilitySameAsParentRector::class);
     $services->set(SimplifyEmptyArrayCheckRector::class);
     $services->set(NormalizeNamespaceByPSR4ComposerAutoloadRector::class);
+    $services->set(StringClassNameToClassConstantRector::class)
+        ->configure([
+            'Error',
+            'Exception',
+            'InvalidArgumentException',
+            'Closure',
+            'stdClass',
+            'SQLite3',
+        ]);
 };
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 127e087458a0..86e70546dd41 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -830,7 +830,7 @@ protected function startController()
         $this->benchmark->start('controller_constructor');
 
         // Is it routed to a Closure?
-        if (is_object($this->controller) && (get_class($this->controller) === Closure::class)) {
+        if (is_object($this->controller) && (get_class($this->controller) === 'Closure')) {
             $controller = $this->controller;
 
             return $controller(...$this->router->params());
diff --git a/system/Database/BaseResult.php b/system/Database/BaseResult.php
index b5818525dc30..5d223c7fc08b 100644
--- a/system/Database/BaseResult.php
+++ b/system/Database/BaseResult.php
@@ -12,7 +12,6 @@
 namespace CodeIgniter\Database;
 
 use CodeIgniter\Entity\Entity;
-use stdClass;
 
 /**
  * Class BaseResult
@@ -509,5 +508,5 @@ abstract protected function fetchAssoc();
      *
      * @return object
      */
-    abstract protected function fetchObject(string $className = stdClass::class);
+    abstract protected function fetchObject(string $className = 'stdClass');
 }
diff --git a/system/Database/MySQLi/Result.php b/system/Database/MySQLi/Result.php
index 35f480776c85..7eab7d86c685 100644
--- a/system/Database/MySQLi/Result.php
+++ b/system/Database/MySQLi/Result.php
@@ -139,7 +139,7 @@ protected function fetchAssoc()
      *
      * @return bool|Entity|object
      */
-    protected function fetchObject(string $className = stdClass::class)
+    protected function fetchObject(string $className = 'stdClass')
     {
         if (is_subclass_of($className, Entity::class)) {
             return empty($data = $this->fetchAssoc()) ? false : (new $className())->setAttributes($data);
diff --git a/system/Database/OCI8/Result.php b/system/Database/OCI8/Result.php
index 6ad26b649480..72a1b0980a28 100644
--- a/system/Database/OCI8/Result.php
+++ b/system/Database/OCI8/Result.php
@@ -14,7 +14,6 @@
 use CodeIgniter\Database\BaseResult;
 use CodeIgniter\Database\ResultInterface;
 use CodeIgniter\Entity;
-use stdClass;
 
 /**
  * Result for OCI8
@@ -94,11 +93,11 @@ protected function fetchAssoc()
      *
      * @return bool|Entity|object
      */
-    protected function fetchObject(string $className = stdClass::class)
+    protected function fetchObject(string $className = 'stdClass')
     {
         $row = oci_fetch_object($this->resultID);
 
-        if ($className === stdClass::class || ! $row) {
+        if ($className === 'stdClass' || ! $row) {
             return $row;
         }
         if (is_subclass_of($className, Entity::class)) {
diff --git a/system/Database/Postgre/Result.php b/system/Database/Postgre/Result.php
index 581d79b1d421..76a0dd956515 100644
--- a/system/Database/Postgre/Result.php
+++ b/system/Database/Postgre/Result.php
@@ -105,7 +105,7 @@ protected function fetchAssoc()
      *
      * @return bool|Entity|object
      */
-    protected function fetchObject(string $className = stdClass::class)
+    protected function fetchObject(string $className = 'stdClass')
     {
         if (is_subclass_of($className, Entity::class)) {
             return empty($data = $this->fetchAssoc()) ? false : (new $className())->setAttributes($data);
diff --git a/system/Database/SQLSRV/Result.php b/system/Database/SQLSRV/Result.php
index 045a5eebd81a..2a55e452ac09 100755
--- a/system/Database/SQLSRV/Result.php
+++ b/system/Database/SQLSRV/Result.php
@@ -147,7 +147,7 @@ protected function fetchAssoc()
      *
      * @return bool|Entity|object
      */
-    protected function fetchObject(string $className = stdClass::class)
+    protected function fetchObject(string $className = 'stdClass')
     {
         if (is_subclass_of($className, Entity::class)) {
             return empty($data = $this->fetchAssoc()) ? false : (new $className())->setAttributes($data);
diff --git a/system/Database/SQLite3/Result.php b/system/Database/SQLite3/Result.php
index 39b9897af1e4..6afc04c51578 100644
--- a/system/Database/SQLite3/Result.php
+++ b/system/Database/SQLite3/Result.php
@@ -122,14 +122,14 @@ protected function fetchAssoc()
      *
      * @return bool|object
      */
-    protected function fetchObject(string $className = stdClass::class)
+    protected function fetchObject(string $className = 'stdClass')
     {
         // No native support for fetching rows as objects
         if (($row = $this->fetchAssoc()) === false) {
             return false;
         }
 
-        if ($className === stdClass::class) {
+        if ($className === 'stdClass') {
             return (object) $row;
         }
 
diff --git a/system/Test/Fabricator.php b/system/Test/Fabricator.php
index d474e796df78..d4369765f0ee 100644
--- a/system/Test/Fabricator.php
+++ b/system/Test/Fabricator.php
@@ -17,7 +17,6 @@
 use Faker\Generator;
 use InvalidArgumentException;
 use RuntimeException;
-use stdClass;
 
 /**
  * Fabricator
@@ -410,7 +409,7 @@ public function makeObject(?string $className = null): object
     {
         if ($className === null) {
             if ($this->model->returnType === 'object' || $this->model->returnType === 'array') {
-                $className = stdClass::class;
+                $className = 'stdClass';
             } else {
                 $className = $this->model->returnType;
             }
diff --git a/system/Test/Mock/MockResult.php b/system/Test/Mock/MockResult.php
index f3807d9170c9..0aaa340a95de 100644
--- a/system/Test/Mock/MockResult.php
+++ b/system/Test/Mock/MockResult.php
@@ -12,7 +12,6 @@
 namespace CodeIgniter\Test\Mock;
 
 use CodeIgniter\Database\BaseResult;
-use stdClass;
 
 class MockResult extends BaseResult
 {
@@ -82,7 +81,7 @@ protected function fetchAssoc()
      *
      * @return object
      */
-    protected function fetchObject($className = stdClass::class)
+    protected function fetchObject($className = 'stdClass')
     {
         return new $className();
     }
diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php
index 95d74c6c1b7e..f9a56cae82db 100644
--- a/tests/system/Autoloader/AutoloaderTest.php
+++ b/tests/system/Autoloader/AutoloaderTest.php
@@ -15,7 +15,6 @@
 use Config\Autoload;
 use Config\Modules;
 use Config\Services;
-use InvalidArgumentException;
 use UnnamespacedClass;
 
 /**
@@ -55,7 +54,7 @@ public function testLoadStoredClass()
 
     public function testInitializeWithInvalidArguments()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage("Config array must contain either the 'psr4' key or the 'classmap' key.");
 
         $config                      = new Autoload();
diff --git a/tests/system/Cache/Handlers/BaseHandlerTest.php b/tests/system/Cache/Handlers/BaseHandlerTest.php
index 18bfcff0d113..b2ebb61e01ef 100644
--- a/tests/system/Cache/Handlers/BaseHandlerTest.php
+++ b/tests/system/Cache/Handlers/BaseHandlerTest.php
@@ -12,7 +12,6 @@
 namespace CodeIgniter\Cache\Handlers;
 
 use CodeIgniter\Test\CIUnitTestCase;
-use InvalidArgumentException;
 use stdClass;
 use Tests\Support\Cache\RestrictiveHandler;
 
@@ -28,7 +27,7 @@ final class BaseHandlerTest extends CIUnitTestCase
      */
     public function testValidateKeyInvalidType($input)
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage('Cache key must be a string');
 
         BaseHandler::validateKey($input);
@@ -49,7 +48,7 @@ public function testValidateKeyUsesConfig()
     {
         config('Cache')->reservedCharacters = 'b';
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage('Cache key contains reserved characters b');
 
         BaseHandler::validateKey('banana');
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 758e1727eca1..b69f6120656a 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -29,7 +29,6 @@
 use Config\App;
 use Config\Logger;
 use Config\Modules;
-use InvalidArgumentException;
 use Kint;
 use stdClass;
 use Tests\Support\Models\JobModel;
@@ -167,7 +166,7 @@ public function testEscapeWithDifferentEncodings()
 
     public function testEscapeBadContext()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
         esc(['width' => '800', 'height' => '600'], 'bogus');
     }
 
diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php
index 077bd8f23ea4..71fb1b560f77 100644
--- a/tests/system/Config/DotEnvTest.php
+++ b/tests/system/Config/DotEnvTest.php
@@ -12,7 +12,6 @@
 namespace CodeIgniter\Config;
 
 use CodeIgniter\Test\CIUnitTestCase;
-use InvalidArgumentException;
 use org\bovigo\vfs\vfsStream;
 
 /**
@@ -116,7 +115,7 @@ public function testLoadsUnreadableFile()
         $file = 'unreadable.env';
         $path = rtrim($this->fixturesFolder, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR . $file;
         chmod($path, 0000);
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage("The .env file is not readable: {$path}");
         $dotenv = new DotEnv($this->fixturesFolder, $file);
         $dotenv->load();
@@ -136,7 +135,7 @@ public function testQuotedDotenvLoadsEnvironmentVars()
 
     public function testSpacedValuesWithoutQuotesThrowsException()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage('.env values containing spaces must be surrounded by quotes.');
 
         $dotenv = new DotEnv($this->fixturesFolder, 'spaced-wrong.env');
diff --git a/tests/system/Config/FactoriesTest.php b/tests/system/Config/FactoriesTest.php
index 3a8cb7584f7d..92356d638106 100644
--- a/tests/system/Config/FactoriesTest.php
+++ b/tests/system/Config/FactoriesTest.php
@@ -189,7 +189,7 @@ public function testInjection()
 
         $result = Factories::widgets('Banana');
 
-        $this->assertInstanceOf(stdClass::class, $result);
+        $this->assertInstanceOf('stdClass', $result);
     }
 
     public function testRespectsComponentAlias()
@@ -210,7 +210,7 @@ public function testRespectsPath()
 
     public function testRespectsInstanceOf()
     {
-        Factories::setOptions('widgets', ['instanceOf' => stdClass::class]);
+        Factories::setOptions('widgets', ['instanceOf' => 'stdClass']);
 
         $result = Factories::widgets('SomeWidget');
         $this->assertInstanceOf(SomeWidget::class, $result);
@@ -223,13 +223,13 @@ public function testSharedRespectsInstanceOf()
     {
         Factories::injectMock('widgets', 'SomeWidget', new OtherWidget());
 
-        $result = Factories::widgets('SomeWidget', ['instanceOf' => stdClass::class]);
+        $result = Factories::widgets('SomeWidget', ['instanceOf' => 'stdClass']);
         $this->assertInstanceOf(SomeWidget::class, $result);
     }
 
     public function testPrioritizesParameterOptions()
     {
-        Factories::setOptions('widgets', ['instanceOf' => stdClass::class]);
+        Factories::setOptions('widgets', ['instanceOf' => 'stdClass']);
 
         $result = Factories::widgets('OtherWidget', ['instanceOf' => null]);
         $this->assertInstanceOf(OtherWidget::class, $result);
diff --git a/tests/system/Cookie/CookieTest.php b/tests/system/Cookie/CookieTest.php
index 34d9d59955e6..341280024ae4 100644
--- a/tests/system/Cookie/CookieTest.php
+++ b/tests/system/Cookie/CookieTest.php
@@ -16,7 +16,6 @@
 use Config\Cookie as CookieConfig;
 use DateTimeImmutable;
 use DateTimeZone;
-use InvalidArgumentException;
 use LogicException;
 
 /**
@@ -274,7 +273,7 @@ public function testArrayAccessOfCookie(): void
         $this->assertArrayHasKey('path', $cookie);
         $this->assertSame($cookie['path'], $cookie->getPath());
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
         $cookie['expiry'];
     }
 
diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php
index 60d328483972..ace628f6bc38 100644
--- a/tests/system/Database/Builder/WhereTest.php
+++ b/tests/system/Database/Builder/WhereTest.php
@@ -14,7 +14,6 @@
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
-use InvalidArgumentException;
 use stdClass;
 
 /**
@@ -267,7 +266,7 @@ public function provideInvalidKeys()
      */
     public function testWhereInvalidKeyThrowInvalidArgumentException($key)
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
         $builder = $this->db->table('jobs');
 
         $builder->whereIn($key, ['Politician', 'Accountant']);
@@ -289,7 +288,7 @@ public function provideInvalidValues()
      */
     public function testWhereInEmptyValuesThrowInvalidArgumentException($values)
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
         $builder = $this->db->table('jobs');
 
         $builder->whereIn('name', $values);
diff --git a/tests/system/Database/DatabaseSeederTest.php b/tests/system/Database/DatabaseSeederTest.php
index 70721718ea8a..7e08d6648508 100644
--- a/tests/system/Database/DatabaseSeederTest.php
+++ b/tests/system/Database/DatabaseSeederTest.php
@@ -14,7 +14,6 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Database;
 use Faker\Generator;
-use InvalidArgumentException;
 
 /**
  * @internal
@@ -23,7 +22,7 @@ final class DatabaseSeederTest extends CIUnitTestCase
 {
     public function testInstantiateNoSeedPath()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
 
         $config            = new Database();
         $config->filesPath = '';
@@ -32,7 +31,7 @@ public function testInstantiateNoSeedPath()
 
     public function testInstantiateNotDirSeedPath()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
 
         $config            = new Database();
         $config->filesPath = APPPATH . 'Foo';
@@ -49,7 +48,7 @@ public function testFakerGet()
 
     public function testCallOnEmptySeeder()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
 
         $seeder = new Seeder(new Database());
         $seeder->call('');
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 113f2c0a211e..47eadc34d0b2 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -16,7 +16,6 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 use Config\Database;
-use InvalidArgumentException;
 use RuntimeException;
 
 /**
@@ -297,7 +296,7 @@ public function testCreateTableWithEmptyName()
         $this->forge->addField('id');
         $this->forge->addField('name varchar(100) NULL');
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage('A table name is required for that operation.');
 
         $this->forge->createTable('');
@@ -315,7 +314,7 @@ public function testCreateTableWithNoFields()
 
     public function testCreateTableWithStringFieldException()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage('Field information is required for that operation.');
 
         $this->forge->dropTable('forge_test_table', true);
@@ -351,7 +350,7 @@ public function testRenameTableEmptyNameException()
 
         $this->forge->createTable('forge_test_table');
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage('A table name is required for that operation.');
 
         $this->forge->renameTable('forge_test_table', '');
diff --git a/tests/system/Entity/EntityTest.php b/tests/system/Entity/EntityTest.php
index 82c758f92f5e..d88f509694f7 100644
--- a/tests/system/Entity/EntityTest.php
+++ b/tests/system/Entity/EntityTest.php
@@ -19,7 +19,6 @@
 use CodeIgniter\Test\ReflectionHelper;
 use DateTime;
 use ReflectionException;
-use stdClass;
 use Tests\Support\Entity\Cast\CastBase64;
 use Tests\Support\Entity\Cast\CastPassParameters;
 use Tests\Support\Entity\Cast\NotExtendsBaseCast;
@@ -372,7 +371,7 @@ public function testCastObject()
         $entity->sixth = $data;
 
         $this->assertIsObject($entity->sixth);
-        $this->assertInstanceOf(stdClass::class, $entity->sixth);
+        $this->assertInstanceOf('stdClass', $entity->sixth);
         $this->assertSame($data, (array) $entity->sixth);
     }
 
@@ -516,7 +515,7 @@ public function testCastAsJSON()
         $check = $this->getPrivateProperty($entity, 'attributes')['tenth'];
         $this->assertSame('{"foo":"bar"}', $check);
 
-        $this->assertInstanceOf(stdClass::class, $entity->tenth);
+        $this->assertInstanceOf('stdClass', $entity->tenth);
         $this->assertSame(['foo' => 'bar'], (array) $entity->tenth);
     }
 
diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php
index 7b837064a410..d20d93481e39 100644
--- a/tests/system/Helpers/FilesystemHelperTest.php
+++ b/tests/system/Helpers/FilesystemHelperTest.php
@@ -12,7 +12,6 @@
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\Test\CIUnitTestCase;
-use InvalidArgumentException;
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\visitor\vfsStreamStructureVisitor;
 
@@ -525,13 +524,13 @@ public function testSymbolicPermissions()
 
     public function testRealPathURL()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
         set_realpath('http://somewhere.com/overtherainbow');
     }
 
     public function testRealPathInvalid()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
         set_realpath(SUPPORTPATH . 'root/../', true);
     }
 
diff --git a/tests/system/Models/FindModelTest.php b/tests/system/Models/FindModelTest.php
index e0fdad5024a1..e564f570ec8c 100644
--- a/tests/system/Models/FindModelTest.php
+++ b/tests/system/Models/FindModelTest.php
@@ -13,7 +13,6 @@
 
 use CodeIgniter\Database\Exceptions\DataException;
 use CodeIgniter\Exceptions\ModelException;
-use stdClass;
 use Tests\Support\Models\JobModel;
 use Tests\Support\Models\SecondaryModel;
 use Tests\Support\Models\UserModel;
@@ -296,7 +295,7 @@ public function testFirstWithNoPrimaryKey(): void
         ]);
 
         $record = $this->model->first();
-        $this->assertInstanceOf(stdClass::class, $record);
+        $this->assertInstanceOf('stdClass', $record);
         $this->assertSame('foo', $record->key);
     }
 
diff --git a/tests/system/Models/MiscellaneousModelTest.php b/tests/system/Models/MiscellaneousModelTest.php
index 1c4af20a87f0..80a9639cd2f1 100644
--- a/tests/system/Models/MiscellaneousModelTest.php
+++ b/tests/system/Models/MiscellaneousModelTest.php
@@ -13,7 +13,6 @@
 
 use CodeIgniter\Database\Exceptions\DataException;
 use CodeIgniter\I18n\Time;
-use InvalidArgumentException;
 use Tests\Support\Models\EntityModel;
 use Tests\Support\Models\JobModel;
 use Tests\Support\Models\SimpleEntity;
@@ -102,7 +101,7 @@ public function testGetValidationMessagesForReplace(): void
 
     public function testUndefinedTypeInTransformDataToArray(): void
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage('Invalid type "whatever" used upon transforming data to array.');
 
         $this->createModel(JobModel::class);
diff --git a/tests/system/Test/ControllerTestTraitTest.php b/tests/system/Test/ControllerTestTraitTest.php
index 65a671bf4df9..a5e10323a4ee 100644
--- a/tests/system/Test/ControllerTestTraitTest.php
+++ b/tests/system/Test/ControllerTestTraitTest.php
@@ -17,7 +17,6 @@
 use CodeIgniter\Test\Mock\MockLogger as LoggerConfig;
 use Config\App;
 use Config\Services;
-use InvalidArgumentException;
 use Tests\Support\Controllers\Popcorn;
 
 /**
@@ -34,7 +33,7 @@ final class ControllerTestTraitTest extends CIUnitTestCase
 
     public function testBadController()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
         $logger = new Logger(new LoggerConfig());
         $this->withURI('http://example.com')
             ->withLogger($logger)
@@ -44,7 +43,7 @@ public function testBadController()
 
     public function testBadControllerMethod()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
         $logger = new Logger(new LoggerConfig());
         $this->withURI('http://example.com')
             ->withLogger($logger)
diff --git a/tests/system/Test/DOMParserTest.php b/tests/system/Test/DOMParserTest.php
index 7eeee05e4385..e700a3daa163 100644
--- a/tests/system/Test/DOMParserTest.php
+++ b/tests/system/Test/DOMParserTest.php
@@ -11,8 +11,6 @@
 
 namespace CodeIgniter\Test;
 
-use InvalidArgumentException;
-
 /**
  * @internal
  */
@@ -396,7 +394,7 @@ public function testWithNotFile()
 
         $filename = APPPATH . 'bogus.html';
 
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
         $dom->withFile($filename);
     }
 
diff --git a/tests/system/Test/FabricatorTest.php b/tests/system/Test/FabricatorTest.php
index 13de446cbcb9..701eecb02c30 100644
--- a/tests/system/Test/FabricatorTest.php
+++ b/tests/system/Test/FabricatorTest.php
@@ -12,8 +12,6 @@
 namespace CodeIgniter\Test;
 
 use CodeIgniter\Database\ModelFactory;
-use InvalidArgumentException;
-use stdClass;
 use Tests\Support\Models\EntityModel;
 use Tests\Support\Models\EventModel;
 use Tests\Support\Models\FabricatorModel;
@@ -59,7 +57,7 @@ public function testConstructorWithInstance()
 
     public function testConstructorWithInvalid()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage(lang('Fabricator.invalidModel'));
 
         new Fabricator('SillyRabbit\Models\AreForKids');
@@ -313,7 +311,7 @@ public function testMakeObjectReturnsStdClassForArrayReturnType()
 
         $result = $fabricator->makeObject();
 
-        $this->assertInstanceOf(stdClass::class, $result);
+        $this->assertInstanceOf('stdClass', $result);
     }
 
     public function testMakeObjectReturnsStdClassForObjectReturnType()
@@ -322,7 +320,7 @@ public function testMakeObjectReturnsStdClassForObjectReturnType()
 
         $result = $fabricator->makeObject();
 
-        $this->assertInstanceOf(stdClass::class, $result);
+        $this->assertInstanceOf('stdClass', $result);
     }
 
     public function testMakeObjectUsesOverrides()
@@ -361,7 +359,7 @@ public function testMakeReturnsSingleton()
 
         $result = $fabricator->make();
 
-        $this->assertInstanceOf(stdClass::class, $result);
+        $this->assertInstanceOf('stdClass', $result);
     }
 
     public function testMakeReturnsExpectedCount()
@@ -381,7 +379,7 @@ public function testCreateMockReturnsSingleton()
 
         $result = $fabricator->create(null, true);
 
-        $this->assertInstanceOf(stdClass::class, $result);
+        $this->assertInstanceOf('stdClass', $result);
     }
 
     public function testCreateMockReturnsExpectedCount()
diff --git a/tests/system/Test/FilterTestTraitTest.php b/tests/system/Test/FilterTestTraitTest.php
index f3cb0a4a6165..15b98379fbcf 100644
--- a/tests/system/Test/FilterTestTraitTest.php
+++ b/tests/system/Test/FilterTestTraitTest.php
@@ -11,10 +11,8 @@
 
 namespace CodeIgniter\Test;
 
-use Closure;
 use CodeIgniter\Filters\Filters;
 use CodeIgniter\HTTP\RequestInterface;
-use InvalidArgumentException;
 use Tests\Support\Filters\Customfilter;
 
 /**
@@ -52,12 +50,12 @@ public function testGetCallerReturnsClosure()
         $caller = $this->getFilterCaller('test-customfilter', 'before');
 
         $this->assertIsCallable($caller);
-        $this->assertInstanceOf(Closure::class, $caller);
+        $this->assertInstanceOf('Closure', $caller);
     }
 
     public function testGetCallerInvalidPosition()
     {
-        $this->expectException(InvalidArgumentException::class);
+        $this->expectException('InvalidArgumentException');
         $this->expectExceptionMessage('Invalid filter position passed: banana');
 
         $this->getFilterCaller('test-customfilter', 'banana');

From 42d50cc9353aaf8f761cdf4a40b75cc2fea95177 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Mar 2022 15:03:28 +0000
Subject: [PATCH 1803/2325] chore(deps): bump actions/cache from 2 to 3

Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2...v3)

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

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/test-autoreview.yml       | 2 +-
 .github/workflows/test-coding-standards.yml | 2 +-
 .github/workflows/test-deptrac.yml          | 4 ++--
 .github/workflows/test-phpstan.yml          | 4 ++--
 .github/workflows/test-phpunit.yml          | 2 +-
 .github/workflows/test-rector.yml           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test-autoreview.yml b/.github/workflows/test-autoreview.yml
index ccc97dcf137e..7e6ff05c2734 100644
--- a/.github/workflows/test-autoreview.yml
+++ b/.github/workflows/test-autoreview.yml
@@ -34,7 +34,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composercache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
diff --git a/.github/workflows/test-coding-standards.yml b/.github/workflows/test-coding-standards.yml
index c966d9e1e603..e5b4a2043342 100644
--- a/.github/workflows/test-coding-standards.yml
+++ b/.github/workflows/test-coding-standards.yml
@@ -40,7 +40,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
diff --git a/.github/workflows/test-deptrac.yml b/.github/workflows/test-deptrac.yml
index ac280f964d0a..42b77998325c 100644
--- a/.github/workflows/test-deptrac.yml
+++ b/.github/workflows/test-deptrac.yml
@@ -50,7 +50,7 @@ jobs:
         run: mkdir -p ${{ steps.composer-cache.outputs.dir }}
 
       - name: Cache composer dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -60,7 +60,7 @@ jobs:
         run: mkdir -p build/
 
       - name: Cache Deptrac results
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: build
           key: ${{ runner.os }}-deptrac-${{ github.sha }}
diff --git a/.github/workflows/test-phpstan.yml b/.github/workflows/test-phpstan.yml
index f7c09d1aa89e..805e34edcdde 100644
--- a/.github/workflows/test-phpstan.yml
+++ b/.github/workflows/test-phpstan.yml
@@ -59,7 +59,7 @@ jobs:
         run: mkdir -p ${{ steps.composer-cache.outputs.dir }}
 
       - name: Cache composer dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
@@ -69,7 +69,7 @@ jobs:
         run: mkdir -p build/phpstan
 
       - name: Cache PHPStan result cache directory
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: build/phpstan
           key: ${{ runner.os }}-phpstan-${{ github.sha }}
diff --git a/.github/workflows/test-phpunit.yml b/.github/workflows/test-phpunit.yml
index 623d13f59475..9b7850ea03d5 100644
--- a/.github/workflows/test-phpunit.yml
+++ b/.github/workflows/test-phpunit.yml
@@ -144,7 +144,7 @@ jobs:
         run: echo "::set-output name=dir::$(composer config cache-files-dir)"
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composercache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
diff --git a/.github/workflows/test-rector.yml b/.github/workflows/test-rector.yml
index a96821da3191..372b10289291 100644
--- a/.github/workflows/test-rector.yml
+++ b/.github/workflows/test-rector.yml
@@ -59,7 +59,7 @@ jobs:
         run: mkdir -p ${{ steps.composer-cache.outputs.dir }}
 
       - name: Cache composer dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}

From 50c0bb1bb96214f2ea9c2500f82ce06ae7b5f1f2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Mar 2022 15:03:33 +0000
Subject: [PATCH 1804/2325] chore(deps-dev): update rector/rector requirement

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

---
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 ed6ff59ccad4..bee1f4e924d1 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.17"
+        "rector/rector": "0.12.18"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From 7784157f4482a90c5d02c363f14054d1c2c6759f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 15 Feb 2022 12:01:35 +0900
Subject: [PATCH 1805/2325] refactor: Database Session Handler

---
 system/Config/Services.php                    |  20 +-
 .../Handlers/Database/MySQLiHandler.php       |  53 ++++++
 .../Handlers/Database/PostgreHandler.php      | 175 ++++++++++++++++++
 system/Session/Handlers/DatabaseHandler.php   |  79 +-------
 .../AbstactHandlerTestCase.php}               |  33 +---
 .../Handlers/Database/MySQLiHandlerTest.php   |  57 ++++++
 .../Handlers/Database/PostgreHandlerTest.php  |  57 ++++++
 7 files changed, 374 insertions(+), 100 deletions(-)
 create mode 100644 system/Session/Handlers/Database/MySQLiHandler.php
 create mode 100644 system/Session/Handlers/Database/PostgreHandler.php
 rename tests/system/Session/Handlers/{DatabaseHandlerTest.php => Database/AbstactHandlerTestCase.php} (77%)
 create mode 100644 tests/system/Session/Handlers/Database/MySQLiHandlerTest.php
 create mode 100644 tests/system/Session/Handlers/Database/PostgreHandlerTest.php

diff --git a/system/Config/Services.php b/system/Config/Services.php
index 2d44e3ccfd78..9dca50115f51 100644
--- a/system/Config/Services.php
+++ b/system/Config/Services.php
@@ -47,6 +47,9 @@
 use CodeIgniter\Router\RouteCollectionInterface;
 use CodeIgniter\Router\Router;
 use CodeIgniter\Security\Security;
+use CodeIgniter\Session\Handlers\Database\MySQLiHandler;
+use CodeIgniter\Session\Handlers\Database\PostgreHandler;
+use CodeIgniter\Session\Handlers\DatabaseHandler;
 use CodeIgniter\Session\Session;
 use CodeIgniter\Throttle\Throttler;
 use CodeIgniter\Typography\Typography;
@@ -58,6 +61,7 @@
 use Config\App;
 use Config\Cache;
 use Config\ContentSecurityPolicy as CSPConfig;
+use Config\Database;
 use Config\Email as EmailConfig;
 use Config\Encryption as EncryptionConfig;
 use Config\Exceptions as ExceptionsConfig;
@@ -585,7 +589,21 @@ public static function session(?App $config = null, bool $getShared = true)
         $logger = AppServices::logger();
 
         $driverName = $config->sessionDriver;
-        $driver     = new $driverName($config, AppServices::request()->getIPAddress());
+
+        if ($driverName === DatabaseHandler::class) {
+            $DBGroup = $config->sessionDBGroup ?? config(Database::class)->defaultGroup;
+            $db      = Database::connect($DBGroup);
+
+            $driver = $db->getPlatform();
+
+            if ($driver === 'MySQLi') {
+                $driverName = MySQLiHandler::class;
+            } elseif ($driver === 'Postgre') {
+                $driverName = PostgreHandler::class;
+            }
+        }
+
+        $driver = new $driverName($config, AppServices::request()->getIPAddress());
         $driver->setLogger($logger);
 
         $session = new Session($driver, $config);
diff --git a/system/Session/Handlers/Database/MySQLiHandler.php b/system/Session/Handlers/Database/MySQLiHandler.php
new file mode 100644
index 000000000000..fabaae451e6a
--- /dev/null
+++ b/system/Session/Handlers/Database/MySQLiHandler.php
@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Session\Handlers\Database;
+
+use CodeIgniter\Session\Handlers\DatabaseHandler;
+
+/**
+ * Session handler for MySQLi
+ */
+class MySQLiHandler extends DatabaseHandler
+{
+    /**
+     * Lock the session.
+     */
+    protected function lockSession(string $sessionID): bool
+    {
+        $arg = md5($sessionID . ($this->matchIP ? '_' . $this->ipAddress : ''));
+        if ($this->db->query("SELECT GET_LOCK('{$arg}', 300) AS ci_session_lock")->getRow()->ci_session_lock) {
+            $this->lock = $arg;
+
+            return true;
+        }
+
+        return $this->fail();
+    }
+
+    /**
+     * Releases the lock, if any.
+     */
+    protected function releaseLock(): bool
+    {
+        if (! $this->lock) {
+            return true;
+        }
+
+        if ($this->db->query("SELECT RELEASE_LOCK('{$this->lock}') AS ci_session_lock")->getRow()->ci_session_lock) {
+            $this->lock = false;
+
+            return true;
+        }
+
+        return $this->fail();
+    }
+}
diff --git a/system/Session/Handlers/Database/PostgreHandler.php b/system/Session/Handlers/Database/PostgreHandler.php
new file mode 100644
index 000000000000..a75d4ea4eaf0
--- /dev/null
+++ b/system/Session/Handlers/Database/PostgreHandler.php
@@ -0,0 +1,175 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Session\Handlers\Database;
+
+use CodeIgniter\Session\Handlers\DatabaseHandler;
+use ReturnTypeWillChange;
+
+/**
+ * Session handler for Postgre
+ */
+class PostgreHandler extends DatabaseHandler
+{
+    /**
+     * Reads the session data from the session storage, and returns the results.
+     *
+     * @param string $id The session ID
+     *
+     * @return false|string Returns an encoded string of the read data.
+     *                      If nothing was read, it must return false.
+     */
+    #[ReturnTypeWillChange]
+    public function read($id)
+    {
+        if ($this->lockSession($id) === false) {
+            $this->fingerprint = md5('');
+
+            return '';
+        }
+
+        if (! isset($this->sessionID)) {
+            $this->sessionID = $id;
+        }
+
+        $builder = $this->db->table($this->table)
+            ->select("encode(data, 'base64') AS data")
+            ->where('id', $id);
+
+        if ($this->matchIP) {
+            $builder = $builder->where('ip_address', $this->ipAddress);
+        }
+
+        $result = $builder->get()->getRow();
+
+        if ($result === null) {
+            // PHP7 will reuse the same SessionHandler object after
+            // ID regeneration, so we need to explicitly set this to
+            // FALSE instead of relying on the default ...
+            $this->rowExists   = false;
+            $this->fingerprint = md5('');
+
+            return '';
+        }
+
+        $result = is_bool($result) ? '' : base64_decode(rtrim($result->data), true);
+
+        $this->fingerprint = md5($result);
+        $this->rowExists   = true;
+
+        return $result;
+    }
+
+    /**
+     * Writes the session data to the session storage.
+     *
+     * @param string $id   The session ID
+     * @param string $data The encoded session data
+     */
+    public function write($id, $data): bool
+    {
+        if ($this->lock === false) {
+            return $this->fail();
+        }
+
+        if ($this->sessionID !== $id) {
+            $this->rowExists = false;
+            $this->sessionID = $id;
+        }
+
+        if ($this->rowExists === false) {
+            $insertData = [
+                'id'         => $id,
+                'ip_address' => $this->ipAddress,
+                'data'       => '\x' . bin2hex($data),
+            ];
+
+            if (! $this->db->table($this->table)->set('timestamp', 'now()', false)->insert($insertData)) {
+                return $this->fail();
+            }
+
+            $this->fingerprint = md5($data);
+            $this->rowExists   = true;
+
+            return true;
+        }
+
+        $builder = $this->db->table($this->table)->where('id', $id);
+
+        if ($this->matchIP) {
+            $builder = $builder->where('ip_address', $this->ipAddress);
+        }
+
+        $updateData = [];
+
+        if ($this->fingerprint !== md5($data)) {
+            $updateData['data'] = '\x' . bin2hex($data);
+        }
+
+        if (! $builder->set('timestamp', 'now()', false)->update($updateData)) {
+            return $this->fail();
+        }
+
+        $this->fingerprint = md5($data);
+
+        return true;
+    }
+
+    /**
+     * Cleans up expired sessions.
+     *
+     * @param int $max_lifetime Sessions that have not updated
+     *                          for the last max_lifetime seconds will be removed.
+     *
+     * @return false|int Returns the number of deleted sessions on success, or false on failure.
+     */
+    #[ReturnTypeWillChange]
+    public function gc($max_lifetime)
+    {
+        $separator = '\'';
+        $interval  = implode($separator, ['', "{$max_lifetime} second", '']);
+
+        return $this->db->table($this->table)->where('timestamp <', "now() - INTERVAL {$interval}", false)->delete() ? 1 : $this->fail();
+    }
+
+    /**
+     * Lock the session.
+     */
+    protected function lockSession(string $sessionID): bool
+    {
+        $arg = "hashtext('{$sessionID}')" . ($this->matchIP ? ", hashtext('{$this->ipAddress}')" : '');
+        if ($this->db->simpleQuery("SELECT pg_advisory_lock({$arg})")) {
+            $this->lock = $arg;
+
+            return true;
+        }
+
+        return $this->fail();
+    }
+
+    /**
+     * Releases the lock, if any.
+     */
+    protected function releaseLock(): bool
+    {
+        if (! $this->lock) {
+            return true;
+        }
+
+        if ($this->db->simpleQuery("SELECT pg_advisory_unlock({$this->lock})")) {
+            $this->lock = false;
+
+            return true;
+        }
+
+        return $this->fail();
+    }
+}
diff --git a/system/Session/Handlers/DatabaseHandler.php b/system/Session/Handlers/DatabaseHandler.php
index dfaa472029fd..64c6a1c511d1 100644
--- a/system/Session/Handlers/DatabaseHandler.php
+++ b/system/Session/Handlers/DatabaseHandler.php
@@ -18,7 +18,9 @@
 use ReturnTypeWillChange;
 
 /**
- * Session handler using current Database for storage
+ * Base database session handler
+ *
+ * Do not use this class. Use database specific handler class.
  */
 class DatabaseHandler extends BaseHandler
 {
@@ -44,7 +46,7 @@ class DatabaseHandler extends BaseHandler
     protected $db;
 
     /**
-     * The database type, for locking purposes.
+     * The database type
      *
      * @var string
      */
@@ -73,13 +75,7 @@ public function __construct(AppConfig $config, string $ipAddress)
 
         $this->db = Database::connect($this->DBGroup);
 
-        $driver = strtolower(get_class($this->db));
-
-        if (strpos($driver, 'mysql') !== false) {
-            $this->platform = 'mysql';
-        } elseif (strpos($driver, 'postgre') !== false) {
-            $this->platform = 'postgre';
-        }
+        $this->platform = $this->db->getPlatform();
     }
 
     /**
@@ -119,7 +115,7 @@ public function read($id)
         }
 
         $builder = $this->db->table($this->table)
-            ->select($this->platform === 'postgre' ? "encode(data, 'base64') AS data" : 'data')
+            ->select('data')
             ->where('id', $id);
 
         if ($this->matchIP) {
@@ -138,11 +134,7 @@ public function read($id)
             return '';
         }
 
-        if (is_bool($result)) {
-            $result = '';
-        } else {
-            $result = ($this->platform === 'postgre') ? base64_decode(rtrim($result->data), true) : $result->data;
-        }
+        $result = is_bool($result) ? '' : $result->data;
 
         $this->fingerprint = md5($result);
         $this->rowExists   = true;
@@ -171,7 +163,7 @@ public function write($id, $data): bool
             $insertData = [
                 'id'         => $id,
                 'ip_address' => $this->ipAddress,
-                'data'       => $this->platform === 'postgre' ? '\x' . bin2hex($data) : $data,
+                'data'       => $data,
             ];
 
             if (! $this->db->table($this->table)->set('timestamp', 'now()', false)->insert($insertData)) {
@@ -193,7 +185,7 @@ public function write($id, $data): bool
         $updateData = [];
 
         if ($this->fingerprint !== md5($data)) {
-            $updateData['data'] = ($this->platform === 'postgre') ? '\x' . bin2hex($data) : $data;
+            $updateData['data'] = $data;
         }
 
         if (! $builder->set('timestamp', 'now()', false)->update($updateData)) {
@@ -252,43 +244,12 @@ public function destroy($id): bool
     #[ReturnTypeWillChange]
     public function gc($max_lifetime)
     {
-        $separator = $this->platform === 'postgre' ? '\'' : ' ';
+        $separator = ' ';
         $interval  = implode($separator, ['', "{$max_lifetime} second", '']);
 
         return $this->db->table($this->table)->where('timestamp <', "now() - INTERVAL {$interval}", false)->delete() ? 1 : $this->fail();
     }
 
-    /**
-     * Lock the session.
-     */
-    protected function lockSession(string $sessionID): bool
-    {
-        if ($this->platform === 'mysql') {
-            $arg = md5($sessionID . ($this->matchIP ? '_' . $this->ipAddress : ''));
-            if ($this->db->query("SELECT GET_LOCK('{$arg}', 300) AS ci_session_lock")->getRow()->ci_session_lock) {
-                $this->lock = $arg;
-
-                return true;
-            }
-
-            return $this->fail();
-        }
-
-        if ($this->platform === 'postgre') {
-            $arg = "hashtext('{$sessionID}')" . ($this->matchIP ? ", hashtext('{$this->ipAddress}')" : '');
-            if ($this->db->simpleQuery("SELECT pg_advisory_lock({$arg})")) {
-                $this->lock = $arg;
-
-                return true;
-            }
-
-            return $this->fail();
-        }
-
-        // Unsupported DB? Let the parent handle the simplified version.
-        return parent::lockSession($sessionID);
-    }
-
     /**
      * Releases the lock, if any.
      */
@@ -298,26 +259,6 @@ protected function releaseLock(): bool
             return true;
         }
 
-        if ($this->platform === 'mysql') {
-            if ($this->db->query("SELECT RELEASE_LOCK('{$this->lock}') AS ci_session_lock")->getRow()->ci_session_lock) {
-                $this->lock = false;
-
-                return true;
-            }
-
-            return $this->fail();
-        }
-
-        if ($this->platform === 'postgre') {
-            if ($this->db->simpleQuery("SELECT pg_advisory_unlock({$this->lock})")) {
-                $this->lock = false;
-
-                return true;
-            }
-
-            return $this->fail();
-        }
-
         // Unsupported DB? Let the parent handle the simple version.
         return parent::releaseLock();
     }
diff --git a/tests/system/Session/Handlers/DatabaseHandlerTest.php b/tests/system/Session/Handlers/Database/AbstactHandlerTestCase.php
similarity index 77%
rename from tests/system/Session/Handlers/DatabaseHandlerTest.php
rename to tests/system/Session/Handlers/Database/AbstactHandlerTestCase.php
index 7af077606cba..9d6a6781ce57 100644
--- a/tests/system/Session/Handlers/DatabaseHandlerTest.php
+++ b/tests/system/Session/Handlers/Database/AbstactHandlerTestCase.php
@@ -9,18 +9,16 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace CodeIgniter\Session\Handlers;
+namespace CodeIgniter\Session\Handlers\Database;
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 use CodeIgniter\Test\ReflectionHelper;
-use Config\App as AppConfig;
-use Config\Database as DatabaseConfig;
 
 /**
  * @internal
  */
-final class DatabaseHandlerTest extends CIUnitTestCase
+abstract class AbstactHandlerTestCase extends CIUnitTestCase
 {
     use DatabaseTestTrait;
     use ReflectionHelper;
@@ -37,32 +35,7 @@ protected function setUp(): void
         }
     }
 
-    protected function getInstance($options = [])
-    {
-        $defaults = [
-            'sessionDriver'            => DatabaseHandler::class,
-            'sessionCookieName'        => 'ci_session',
-            'sessionExpiration'        => 7200,
-            'sessionSavePath'          => 'ci_sessions',
-            'sessionMatchIP'           => false,
-            'sessionTimeToUpdate'      => 300,
-            'sessionRegenerateDestroy' => false,
-            'cookieDomain'             => '',
-            'cookiePrefix'             => '',
-            'cookiePath'               => '/',
-            'cookieSecure'             => false,
-            'cookieSameSite'           => 'Lax',
-        ];
-
-        $config    = array_merge($defaults, $options);
-        $appConfig = new AppConfig();
-
-        foreach ($config as $key => $c) {
-            $appConfig->{$key} = $c;
-        }
-
-        return new DatabaseHandler($appConfig, '127.0.0.1');
-    }
+    abstract protected function getInstance($options = []);
 
     public function testOpen()
     {
diff --git a/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php b/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php
new file mode 100644
index 000000000000..b1fcd51dd24c
--- /dev/null
+++ b/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Session\Handlers\Database;
+
+use Config\App as AppConfig;
+use Config\Database as DatabaseConfig;
+
+/**
+ * @internal
+ */
+final class MySQLiHandlerTest extends AbstactHandlerTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        if (config(DatabaseConfig::class)->tests['DBDriver'] !== 'MySQLi') {
+            $this->markTestSkipped('This test case needs MySQLi');
+        }
+    }
+
+    protected function getInstance($options = [])
+    {
+        $defaults = [
+            'sessionDriver'            => 'CodeIgniter\Session\Handlers\DatabaseHandler',
+            'sessionCookieName'        => 'ci_session',
+            'sessionExpiration'        => 7200,
+            'sessionSavePath'          => 'ci_sessions',
+            'sessionMatchIP'           => false,
+            'sessionTimeToUpdate'      => 300,
+            'sessionRegenerateDestroy' => false,
+            'cookieDomain'             => '',
+            'cookiePrefix'             => '',
+            'cookiePath'               => '/',
+            'cookieSecure'             => false,
+            'cookieSameSite'           => 'Lax',
+        ];
+
+        $config    = array_merge($defaults, $options);
+        $appConfig = new AppConfig();
+
+        foreach ($config as $key => $c) {
+            $appConfig->{$key} = $c;
+        }
+
+        return new MySQLiHandler($appConfig, '127.0.0.1');
+    }
+}
diff --git a/tests/system/Session/Handlers/Database/PostgreHandlerTest.php b/tests/system/Session/Handlers/Database/PostgreHandlerTest.php
new file mode 100644
index 000000000000..b84298f92868
--- /dev/null
+++ b/tests/system/Session/Handlers/Database/PostgreHandlerTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Session\Handlers\Database;
+
+use Config\App as AppConfig;
+use Config\Database as DatabaseConfig;
+
+/**
+ * @internal
+ */
+final class PostgreHandlerTest extends AbstactHandlerTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        if (config(DatabaseConfig::class)->tests['DBDriver'] !== 'Postgre') {
+            $this->markTestSkipped('This test case needs Postgre');
+        }
+    }
+
+    protected function getInstance($options = [])
+    {
+        $defaults = [
+            'sessionDriver'            => 'CodeIgniter\Session\Handlers\DatabaseHandler',
+            'sessionCookieName'        => 'ci_session',
+            'sessionExpiration'        => 7200,
+            'sessionSavePath'          => 'ci_sessions',
+            'sessionMatchIP'           => false,
+            'sessionTimeToUpdate'      => 300,
+            'sessionRegenerateDestroy' => false,
+            'cookieDomain'             => '',
+            'cookiePrefix'             => '',
+            'cookiePath'               => '/',
+            'cookieSecure'             => false,
+            'cookieSameSite'           => 'Lax',
+        ];
+
+        $config    = array_merge($defaults, $options);
+        $appConfig = new AppConfig();
+
+        foreach ($config as $key => $c) {
+            $appConfig->{$key} = $c;
+        }
+
+        return new PostgreHandler($appConfig, '127.0.0.1');
+    }
+}

From 43f2453472ef06d5806cd7174c0e4fe0e6c14bb4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 15 Feb 2022 12:02:40 +0900
Subject: [PATCH 1806/2325] docs: fix PHPDocs

---
 phpstan-baseline.neon.dist              | 20 --------------------
 system/Database/BaseConnection.php      |  2 +-
 system/Session/Handlers/BaseHandler.php |  2 +-
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index 7c0704286696..1021eb445899 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -745,26 +745,6 @@ parameters:
 			count: 1
 			path: system/Session/Handlers/DatabaseHandler.php
 
-		-
-			message: "#^Property CodeIgniter\\\\Session\\\\Handlers\\\\BaseHandler\\:\\:\\$sessionID \\(string\\) in isset\\(\\) is not nullable\\.$#"
-			count: 1
-			path: system/Session/Handlers/DatabaseHandler.php
-
-		-
-			message: "#^Property CodeIgniter\\\\Session\\\\Handlers\\\\BaseHandler\\:\\:\\$sessionID \\(string\\) in isset\\(\\) is not nullable\\.$#"
-			count: 1
-			path: system/Session/Handlers/FileHandler.php
-
-		-
-			message: "#^Property CodeIgniter\\\\Session\\\\Handlers\\\\BaseHandler\\:\\:\\$sessionID \\(string\\) in isset\\(\\) is not nullable\\.$#"
-			count: 1
-			path: system/Session/Handlers/MemcachedHandler.php
-
-		-
-			message: "#^Property CodeIgniter\\\\Session\\\\Handlers\\\\BaseHandler\\:\\:\\$sessionID \\(string\\) in isset\\(\\) is not nullable\\.$#"
-			count: 1
-			path: system/Session/Handlers/RedisHandler.php
-
 		-
 			message: "#^Strict comparison using \\=\\=\\= between string and true will always evaluate to false\\.$#"
 			count: 1
diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index d2ce3fdd390a..23a78d423c47 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -508,7 +508,7 @@ public function getPrefix(): string
     }
 
     /**
-     * The name of the platform in use (MySQLi, mssql, etc)
+     * The name of the platform in use (MySQLi, Postgre, SQLite3, OCI8, etc)
      */
     public function getPlatform(): string
     {
diff --git a/system/Session/Handlers/BaseHandler.php b/system/Session/Handlers/BaseHandler.php
index f6fa57b23b68..008cae369e80 100644
--- a/system/Session/Handlers/BaseHandler.php
+++ b/system/Session/Handlers/BaseHandler.php
@@ -81,7 +81,7 @@ abstract class BaseHandler implements SessionHandlerInterface
     /**
      * Current session ID
      *
-     * @var string
+     * @var string|null
      */
     protected $sessionID;
 

From 9cf3b5e45279b812c5a985062574c693b20f6dee Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 15 Feb 2022 14:06:17 +0900
Subject: [PATCH 1807/2325] refactor: remove duplicate code in write()

---
 .../Handlers/Database/PostgreHandler.php      | 53 ++-----------------
 system/Session/Handlers/DatabaseHandler.php   | 12 ++++-
 2 files changed, 13 insertions(+), 52 deletions(-)

diff --git a/system/Session/Handlers/Database/PostgreHandler.php b/system/Session/Handlers/Database/PostgreHandler.php
index a75d4ea4eaf0..3a708fefc746 100644
--- a/system/Session/Handlers/Database/PostgreHandler.php
+++ b/system/Session/Handlers/Database/PostgreHandler.php
@@ -69,58 +69,11 @@ public function read($id)
     }
 
     /**
-     * Writes the session data to the session storage.
-     *
-     * @param string $id   The session ID
-     * @param string $data The encoded session data
+     * Prepare data to insert/update
      */
-    public function write($id, $data): bool
+    protected function prepareData(string $data): string
     {
-        if ($this->lock === false) {
-            return $this->fail();
-        }
-
-        if ($this->sessionID !== $id) {
-            $this->rowExists = false;
-            $this->sessionID = $id;
-        }
-
-        if ($this->rowExists === false) {
-            $insertData = [
-                'id'         => $id,
-                'ip_address' => $this->ipAddress,
-                'data'       => '\x' . bin2hex($data),
-            ];
-
-            if (! $this->db->table($this->table)->set('timestamp', 'now()', false)->insert($insertData)) {
-                return $this->fail();
-            }
-
-            $this->fingerprint = md5($data);
-            $this->rowExists   = true;
-
-            return true;
-        }
-
-        $builder = $this->db->table($this->table)->where('id', $id);
-
-        if ($this->matchIP) {
-            $builder = $builder->where('ip_address', $this->ipAddress);
-        }
-
-        $updateData = [];
-
-        if ($this->fingerprint !== md5($data)) {
-            $updateData['data'] = '\x' . bin2hex($data);
-        }
-
-        if (! $builder->set('timestamp', 'now()', false)->update($updateData)) {
-            return $this->fail();
-        }
-
-        $this->fingerprint = md5($data);
-
-        return true;
+        return '\x' . bin2hex($data);
     }
 
     /**
diff --git a/system/Session/Handlers/DatabaseHandler.php b/system/Session/Handlers/DatabaseHandler.php
index 64c6a1c511d1..6f20c7688dd8 100644
--- a/system/Session/Handlers/DatabaseHandler.php
+++ b/system/Session/Handlers/DatabaseHandler.php
@@ -163,7 +163,7 @@ public function write($id, $data): bool
             $insertData = [
                 'id'         => $id,
                 'ip_address' => $this->ipAddress,
-                'data'       => $data,
+                'data'       => $this->prepareData($data),
             ];
 
             if (! $this->db->table($this->table)->set('timestamp', 'now()', false)->insert($insertData)) {
@@ -185,7 +185,7 @@ public function write($id, $data): bool
         $updateData = [];
 
         if ($this->fingerprint !== md5($data)) {
-            $updateData['data'] = $data;
+            $updateData['data'] = $this->prepareData($data);
         }
 
         if (! $builder->set('timestamp', 'now()', false)->update($updateData)) {
@@ -197,6 +197,14 @@ public function write($id, $data): bool
         return true;
     }
 
+    /**
+     * Prepare data to insert/update
+     */
+    protected function prepareData(string $data): string
+    {
+        return $data;
+    }
+
     /**
      * Closes the current session.
      */

From 0b2f01c6befbde7d9604351b9825ade841e8f0e6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 15 Feb 2022 14:41:46 +0900
Subject: [PATCH 1808/2325] refactor: remove duplicate code in read()

---
 .../Handlers/Database/PostgreHandler.php      | 56 +++++--------------
 system/Session/Handlers/DatabaseHandler.php   | 29 ++++++++--
 2 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/system/Session/Handlers/Database/PostgreHandler.php b/system/Session/Handlers/Database/PostgreHandler.php
index 3a708fefc746..2b730d831c89 100644
--- a/system/Session/Handlers/Database/PostgreHandler.php
+++ b/system/Session/Handlers/Database/PostgreHandler.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Session\Handlers\Database;
 
+use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Session\Handlers\DatabaseHandler;
 use ReturnTypeWillChange;
 
@@ -20,52 +21,23 @@
 class PostgreHandler extends DatabaseHandler
 {
     /**
-     * Reads the session data from the session storage, and returns the results.
+     * Sets SELECT clause
+     */
+    protected function setSelect(BaseBuilder $builder)
+    {
+        $builder->select("encode(data, 'base64') AS data");
+    }
+
+    /**
+     * Decodes column data
      *
-     * @param string $id The session ID
+     * @param mixed $data
      *
-     * @return false|string Returns an encoded string of the read data.
-     *                      If nothing was read, it must return false.
+     * @return false|string
      */
-    #[ReturnTypeWillChange]
-    public function read($id)
+    protected function decodeData($data)
     {
-        if ($this->lockSession($id) === false) {
-            $this->fingerprint = md5('');
-
-            return '';
-        }
-
-        if (! isset($this->sessionID)) {
-            $this->sessionID = $id;
-        }
-
-        $builder = $this->db->table($this->table)
-            ->select("encode(data, 'base64') AS data")
-            ->where('id', $id);
-
-        if ($this->matchIP) {
-            $builder = $builder->where('ip_address', $this->ipAddress);
-        }
-
-        $result = $builder->get()->getRow();
-
-        if ($result === null) {
-            // PHP7 will reuse the same SessionHandler object after
-            // ID regeneration, so we need to explicitly set this to
-            // FALSE instead of relying on the default ...
-            $this->rowExists   = false;
-            $this->fingerprint = md5('');
-
-            return '';
-        }
-
-        $result = is_bool($result) ? '' : base64_decode(rtrim($result->data), true);
-
-        $this->fingerprint = md5($result);
-        $this->rowExists   = true;
-
-        return $result;
+        return base64_decode(rtrim($data), true);
     }
 
     /**
diff --git a/system/Session/Handlers/DatabaseHandler.php b/system/Session/Handlers/DatabaseHandler.php
index 6f20c7688dd8..8cbf43ca280a 100644
--- a/system/Session/Handlers/DatabaseHandler.php
+++ b/system/Session/Handlers/DatabaseHandler.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Session\Handlers;
 
+use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Database\BaseConnection;
 use CodeIgniter\Session\Exceptions\SessionException;
 use Config\App as AppConfig;
@@ -114,14 +115,14 @@ public function read($id)
             $this->sessionID = $id;
         }
 
-        $builder = $this->db->table($this->table)
-            ->select('data')
-            ->where('id', $id);
+        $builder = $this->db->table($this->table)->where('id', $id);
 
         if ($this->matchIP) {
             $builder = $builder->where('ip_address', $this->ipAddress);
         }
 
+        $this->setSelect($builder);
+
         $result = $builder->get()->getRow();
 
         if ($result === null) {
@@ -134,7 +135,7 @@ public function read($id)
             return '';
         }
 
-        $result = is_bool($result) ? '' : $result->data;
+        $result = is_bool($result) ? '' : $this->decodeData($result->data);
 
         $this->fingerprint = md5($result);
         $this->rowExists   = true;
@@ -142,6 +143,26 @@ public function read($id)
         return $result;
     }
 
+    /**
+     * Sets SELECT clause
+     */
+    protected function setSelect(BaseBuilder $builder)
+    {
+        $builder->select('data');
+    }
+
+    /**
+     * Decodes column data
+     *
+     * @param mixed $data
+     *
+     * @return false|string
+     */
+    protected function decodeData($data)
+    {
+        return $data;
+    }
+
     /**
      * Writes the session data to the session storage.
      *

From 685a11bdf6ed209641fd4602e938bd9ffa5a249e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 22 Mar 2022 10:54:57 +0900
Subject: [PATCH 1809/2325] refactor: vendor/bin/rector

---
 tests/system/Session/Handlers/Database/MySQLiHandlerTest.php  | 3 ++-
 tests/system/Session/Handlers/Database/PostgreHandlerTest.php | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php b/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php
index b1fcd51dd24c..469b0c8e1f7e 100644
--- a/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php
+++ b/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Session\Handlers\Database;
 
+use CodeIgniter\Session\Handlers\DatabaseHandler;
 use Config\App as AppConfig;
 use Config\Database as DatabaseConfig;
 
@@ -31,7 +32,7 @@ protected function setUp(): void
     protected function getInstance($options = [])
     {
         $defaults = [
-            'sessionDriver'            => 'CodeIgniter\Session\Handlers\DatabaseHandler',
+            'sessionDriver'            => DatabaseHandler::class,
             'sessionCookieName'        => 'ci_session',
             'sessionExpiration'        => 7200,
             'sessionSavePath'          => 'ci_sessions',
diff --git a/tests/system/Session/Handlers/Database/PostgreHandlerTest.php b/tests/system/Session/Handlers/Database/PostgreHandlerTest.php
index b84298f92868..9575b68e499f 100644
--- a/tests/system/Session/Handlers/Database/PostgreHandlerTest.php
+++ b/tests/system/Session/Handlers/Database/PostgreHandlerTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Session\Handlers\Database;
 
+use CodeIgniter\Session\Handlers\DatabaseHandler;
 use Config\App as AppConfig;
 use Config\Database as DatabaseConfig;
 
@@ -31,7 +32,7 @@ protected function setUp(): void
     protected function getInstance($options = [])
     {
         $defaults = [
-            'sessionDriver'            => 'CodeIgniter\Session\Handlers\DatabaseHandler',
+            'sessionDriver'            => DatabaseHandler::class,
             'sessionCookieName'        => 'ci_session',
             'sessionExpiration'        => 7200,
             'sessionSavePath'          => 'ci_sessions',

From 036d9b55993ac1edd6157daa7aec04b36e78ea84 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 22 Mar 2022 11:08:03 +0900
Subject: [PATCH 1810/2325] test: fix mistake of rebase

---
 .../system/Session/Handlers/Database/AbstactHandlerTestCase.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/system/Session/Handlers/Database/AbstactHandlerTestCase.php b/tests/system/Session/Handlers/Database/AbstactHandlerTestCase.php
index 9d6a6781ce57..7434301f40cc 100644
--- a/tests/system/Session/Handlers/Database/AbstactHandlerTestCase.php
+++ b/tests/system/Session/Handlers/Database/AbstactHandlerTestCase.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 use CodeIgniter\Test\ReflectionHelper;
+use Config\Database as DatabaseConfig;
 
 /**
  * @internal

From 51057f144c2b461f2ec89fdb46b2e0b89f079c79 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 22 Mar 2022 17:24:36 +0900
Subject: [PATCH 1811/2325] docs: add full support for PHP 8.1

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

diff --git a/user_guide_src/source/changelogs/v4.1.6.rst b/user_guide_src/source/changelogs/v4.1.6.rst
index 2321f413e173..84e4f9f7d39e 100644
--- a/user_guide_src/source/changelogs/v4.1.6.rst
+++ b/user_guide_src/source/changelogs/v4.1.6.rst
@@ -37,6 +37,7 @@ Validation changes
 Enhancements
 ************
 
+- Full support for PHP 8.1.
 - Database pane on debug toolbar now displays location where Query was called from. Also displays full backtrace.
 - :ref:`Subqueries <query-builder-where-subquery>` in QueryBuilder can now be an instance of the BaseBuilder class.
 - Kint was updated from ^3.3 to ^4.0.

From 4ba72e6ab7df9a40e2d376cb5d2abe4e7fa572b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= <k1pstabug@gmail.com>
Date: Tue, 22 Mar 2022 16:33:11 +0100
Subject: [PATCH 1812/2325] Update incomingrequest.rst

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

diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index c20e897b92de..74f3cf5289b0 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -44,10 +44,10 @@ You can check the HTTP method that this request represents with the ``method()``
 .. literalinclude:: incomingrequest/005.php
 
 By default, the method is returned as a lower-case string (i.e., 'get', 'post', etc). You can get an
-uppercase version by wrapping the call in ``str_to_upper()``::
+uppercase version by wrapping the call in ``strtoupper()``::
 
     // Returns 'GET'
-    $method = str_to_upper($request->getMethod());
+    $method = strtoupper($request->getMethod());
 
 You can also check if the request was made through and HTTPS connection with the ``isSecure()`` method:
 

From 57e0594a8d2a12b32de852ecd52a1ab679fa4705 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 23 Mar 2022 09:13:11 +0900
Subject: [PATCH 1813/2325] chore: remove App\ and Config\ in autoload.psr-4 in
 app starter composer.json

Revert #3423

Problems:
- Cannot change `app` folder name. Because the composer's path overwrite the config in Config\Autoload.
- Causes error when defining new namespace under app/. See #5818
---
 admin/starter/composer.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/admin/starter/composer.json b/admin/starter/composer.json
index f2959dd49b51..026329ca9a24 100644
--- a/admin/starter/composer.json
+++ b/admin/starter/composer.json
@@ -17,10 +17,6 @@
         "ext-fileinfo": "Improves mime type detection for files"
     },
     "autoload": {
-        "psr-4": {
-            "App\\": "app",
-            "Config\\": "app/Config"
-        },
         "exclude-from-classmap": [
             "**/Database/Migrations/**"
         ]

From 135222d40724d3b6bc470fd88bf9c85b1fff9b95 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 23 Mar 2022 09:23:43 +0900
Subject: [PATCH 1814/2325] docs: add @TODO

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

diff --git a/system/CLI/Commands.php b/system/CLI/Commands.php
index 3f84f33d918f..d153b3aa857a 100644
--- a/system/CLI/Commands.php
+++ b/system/CLI/Commands.php
@@ -76,6 +76,10 @@ public function getCommands()
     /**
      * Discovers all commands in the framework and within user code,
      * and collects instances of them to work with.
+     *
+     * @TODO this approach (find qualified classname from path) causes error,
+     *      when using Composer autoloader.
+     *      See https://github.com/codeigniter4/CodeIgniter4/issues/5818
      */
     public function discoverCommands()
     {

From 15931e9c4283f01474c56874ec7dec2c3c68c1b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:27:04 +0000
Subject: [PATCH 1815/2325] chore(deps-dev): update rector/rector requirement

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

---
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 bee1f4e924d1..8d77bc48cde8 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.18"
+        "rector/rector": "0.12.19"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From c5eb48011648c5f9dfa0f2390f69297a13d7e651 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Sun, 27 Mar 2022 00:11:10 +0800
Subject: [PATCH 1816/2325] Rename `Abstact` to `Abstract`

---
 .../{AbstactHandlerTestCase.php => AbstractHandlerTestCase.php} | 2 +-
 tests/system/Session/Handlers/Database/MySQLiHandlerTest.php    | 2 +-
 tests/system/Session/Handlers/Database/PostgreHandlerTest.php   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename tests/system/Session/Handlers/Database/{AbstactHandlerTestCase.php => AbstractHandlerTestCase.php} (98%)

diff --git a/tests/system/Session/Handlers/Database/AbstactHandlerTestCase.php b/tests/system/Session/Handlers/Database/AbstractHandlerTestCase.php
similarity index 98%
rename from tests/system/Session/Handlers/Database/AbstactHandlerTestCase.php
rename to tests/system/Session/Handlers/Database/AbstractHandlerTestCase.php
index 7434301f40cc..f252fc24fb43 100644
--- a/tests/system/Session/Handlers/Database/AbstactHandlerTestCase.php
+++ b/tests/system/Session/Handlers/Database/AbstractHandlerTestCase.php
@@ -19,7 +19,7 @@
 /**
  * @internal
  */
-abstract class AbstactHandlerTestCase extends CIUnitTestCase
+abstract class AbstractHandlerTestCase extends CIUnitTestCase
 {
     use DatabaseTestTrait;
     use ReflectionHelper;
diff --git a/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php b/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php
index 469b0c8e1f7e..5fba8bb779d0 100644
--- a/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php
+++ b/tests/system/Session/Handlers/Database/MySQLiHandlerTest.php
@@ -18,7 +18,7 @@
 /**
  * @internal
  */
-final class MySQLiHandlerTest extends AbstactHandlerTestCase
+final class MySQLiHandlerTest extends AbstractHandlerTestCase
 {
     protected function setUp(): void
     {
diff --git a/tests/system/Session/Handlers/Database/PostgreHandlerTest.php b/tests/system/Session/Handlers/Database/PostgreHandlerTest.php
index 9575b68e499f..d28d1fab7134 100644
--- a/tests/system/Session/Handlers/Database/PostgreHandlerTest.php
+++ b/tests/system/Session/Handlers/Database/PostgreHandlerTest.php
@@ -18,7 +18,7 @@
 /**
  * @internal
  */
-final class PostgreHandlerTest extends AbstactHandlerTestCase
+final class PostgreHandlerTest extends AbstractHandlerTestCase
 {
     protected function setUp(): void
     {

From 7612cdb09129ab2ce3e736fa3c131f834b52caa9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 28 Mar 2022 12:46:08 +0900
Subject: [PATCH 1817/2325] docs: add index.php/spark changes in changelog

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 9751dd06fee0..f12a13bcb416 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -13,6 +13,9 @@ BREAKING
 ********
 
 - The method signature of ``Validation::setRule()`` has been changed. The ``string`` typehint on the ``$rules`` parameter was removed. Extending classes should likewise remove the parameter so as not to break LSP.
+- The ``CodeIgniter\CodeIgniter`` class has a new property ``$context`` and it must have the correct context at runtime. So the following files have been changed:
+    - ``public/index.php``
+    - ``spark``
 
 Enhancements
 ************

From 2f8157dc34d328ba450788ab473fcc076f3a3772 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 28 Mar 2022 13:02:28 +0900
Subject: [PATCH 1818/2325] chore: fix ImportError

ImportError: cannot import name 'environmentfilter' from 'jinja2' (/usr/local/lib/python3.10/site-packages/jinja2/__init__.py)
See https://github.com/sphinx-doc/sphinx/issues/10291
---
 user_guide_src/requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide_src/requirements.txt b/user_guide_src/requirements.txt
index 19f5064b9815..5d11554964d1 100644
--- a/user_guide_src/requirements.txt
+++ b/user_guide_src/requirements.txt
@@ -2,3 +2,4 @@ sphinx>=2.4.4,<3
 sphinxcontrib-phpdomain>=0.7.1
 docutils>=0.16
 sphinx-rtd-theme>=0.5.0
+jinja2<3.1

From 4138c04808f95699699a9140671a9fe605e5c2eb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 29 Mar 2022 21:16:43 +0900
Subject: [PATCH 1819/2325] config: add mime type for webp

---
 app/Config/Mimes.php                        | 1 +
 user_guide_src/source/changelogs/v4.2.0.rst | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/Config/Mimes.php b/app/Config/Mimes.php
index 786bc6a1e5c7..a1bb458a2804 100644
--- a/app/Config/Mimes.php
+++ b/app/Config/Mimes.php
@@ -260,6 +260,7 @@ class Mimes
             'image/png',
             'image/x-png',
         ],
+        'webp' => 'image/webp',
         'tif'  => 'image/tiff',
         'tiff' => 'image/tiff',
         'css'  => [
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index f12a13bcb416..a0494ebd47c0 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -34,6 +34,7 @@ Enhancements
 - The ``spark routes`` command now shows closure routes, auto routes, and filters. See :ref:`URI Routing <spark-routes>`.
 - Exception information logged through ``log_message()`` has now improved. It now includes the file and line where the exception originated. It also does not truncate the message anymore.
     - The log format has also changed. If users are depending on the log format in their apps, the new log format is "<1-based count> <cleaned filepath>(<line>): <class><function><args>"
+- Added support for webp files to **app/Config/Mimes.php**.
 
 Changes
 *******

From 250b0cadc1a453573a86d721ad9acbf31e8dfc0b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 30 Mar 2022 11:27:59 +0900
Subject: [PATCH 1820/2325] docs: fix comment

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

diff --git a/system/View/Parser.php b/system/View/Parser.php
index 6834c003e500..dbb0395fbd0b 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -289,7 +289,7 @@ protected function parsePair(string $variable, array $data, string $template): a
          */
         foreach ($matches as $match) {
             // Loop over each piece of $data, replacing
-            // it's contents so that we know what to replace in parse()
+            // its contents so that we know what to replace in parse()
             $str = '';  // holds the new contents for this tag pair.
 
             foreach ($data as $row) {

From 9a85788f51b056c24c1d7c4477a4108e52bec9f1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 30 Mar 2022 11:28:59 +0900
Subject: [PATCH 1821/2325] fix: view parser fails with ({variable}) in loop

---
 system/View/Parser.php           | 11 +----------
 tests/system/View/ParserTest.php | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/system/View/Parser.php b/system/View/Parser.php
index dbb0395fbd0b..6f62ca4fb333 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -338,8 +338,7 @@ protected function parsePair(string $variable, array $data, string $template): a
                 $str .= $out;
             }
 
-            // Escape | character from filters as it's handled as OR in regex
-            $escapedMatch = preg_replace('/(?<!\\\\)\\|/', '\\|', $match[0]);
+            $escapedMatch = preg_quote($match[0], '#');
 
             $replace['#' . $escapedMatch . '#s'] = $str;
         }
@@ -471,16 +470,8 @@ public function setDelimiters($leftDelimiter = '{', $rightDelimiter = '}'): Rend
      */
     protected function replaceSingle($pattern, $content, $template, bool $escape = false): string
     {
-        // Any dollar signs in the pattern will be misinterpreted, so slash them
-        $pattern = addcslashes($pattern, '$');
         $content = (string) $content;
 
-        // Flesh out the main pattern from the delimiters and escape the hash
-        // See https://regex101.com/r/IKdUlk/1
-        if (preg_match('/^(#)(.+)(#(m?s)?)$/s', $pattern, $parts)) {
-            $pattern = $parts[1] . addcslashes($parts[2], '#') . $parts[3];
-        }
-
         // Replace the content in the template
         return preg_replace_callback($pattern, function ($matches) use ($content, $escape) {
             // Check for {! !} syntax to not escape this one.
diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php
index 3462b0cc2a84..2520c680ce0f 100644
--- a/tests/system/View/ParserTest.php
+++ b/tests/system/View/ParserTest.php
@@ -220,6 +220,26 @@ public function testParseLoop()
         $this->assertSame("Super Heroes\nTom Dick Henry ", $this->parser->renderString($template));
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5825
+     */
+    public function testParseLoopVariableWithParentheses()
+    {
+        $data = [
+            'title'  => 'Super Heroes',
+            'powers' => [
+                ['name' => 'Tom'],
+                ['name' => 'Dick'],
+                ['name' => 'Henry'],
+            ],
+        ];
+
+        $template = "{title}\n{powers}({name}) {/powers}";
+
+        $this->parser->setData($data);
+        $this->assertSame("Super Heroes\n(Tom) (Dick) (Henry) ", $this->parser->renderString($template));
+    }
+
     public function testParseLoopObjectProperties()
     {
         $obj1 = new stdClass();

From 78d42a58f57eb4cc6a8a6e9f74be876b93b4051c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 28 Mar 2022 11:40:45 +0900
Subject: [PATCH 1822/2325] fix: spark can't use options in PHP 7.4

Cannot unpack array with string keys
at SYSTEMPATH/CodeIgniter.php:893
---
 system/CLI/CommandRunner.php           |  4 ++--
 system/CodeIgniter.php                 | 10 +++++----
 tests/system/CLI/CommandRunnerTest.php |  2 +-
 tests/system/SparkTest.php             | 29 ++++++++++++++++++++++++++
 4 files changed, 38 insertions(+), 7 deletions(-)
 create mode 100644 tests/system/SparkTest.php

diff --git a/system/CLI/CommandRunner.php b/system/CLI/CommandRunner.php
index a6985d0db931..06d06863de2f 100644
--- a/system/CLI/CommandRunner.php
+++ b/system/CLI/CommandRunner.php
@@ -40,13 +40,13 @@ public function __construct()
      * so we have the chance to look for a Command first.
      *
      * @param string $method
-     * @param array  ...$params
+     * @param array  $params
      *
      * @throws ReflectionException
      *
      * @return mixed
      */
-    public function _remap($method, ...$params)
+    public function _remap($method, $params)
     {
         // The first param is usually empty, so scrap it.
         if (empty($params[0])) {
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 86e70546dd41..093687254c77 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -884,14 +884,16 @@ protected function runController($class)
             /** @var CLIRequest $request */
             $request = $this->request;
             $params  = $request->getArgs();
+
+            $output = $class->_remap($this->method, $params);
         } else {
             // This is a Web request or PHP CLI request
             $params = $this->router->params();
-        }
 
-        $output = method_exists($class, '_remap')
-            ? $class->_remap($this->method, ...$params)
-            : $class->{$this->method}(...$params);
+            $output = method_exists($class, '_remap')
+                ? $class->_remap($this->method, ...$params)
+                : $class->{$this->method}(...$params);
+        }
 
         $this->benchmark->stop('controller');
 
diff --git a/tests/system/CLI/CommandRunnerTest.php b/tests/system/CLI/CommandRunnerTest.php
index 32ca71357e75..c9e3245b932c 100644
--- a/tests/system/CLI/CommandRunnerTest.php
+++ b/tests/system/CLI/CommandRunnerTest.php
@@ -123,7 +123,7 @@ public function testBadCommand()
      */
     public function testRemapEmptyFirstParams()
     {
-        self::$runner->_remap('anyvalue', null, 'list');
+        self::$runner->_remap('anyvalue', [null, 'list']);
         $result = CITestStreamFilter::$buffer;
 
         // make sure the result looks like a command list
diff --git a/tests/system/SparkTest.php b/tests/system/SparkTest.php
new file mode 100644
index 000000000000..0cd76453c02a
--- /dev/null
+++ b/tests/system/SparkTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter;
+
+use CodeIgniter\Test\CIUnitTestCase;
+
+/**
+ * @internal
+ */
+final class SparkTest extends CIUnitTestCase
+{
+    public function testCanUseOption()
+    {
+        ob_start();
+        passthru('php spark list --simple');
+        $output = ob_get_clean();
+
+        $this->assertStringContainsString('cache:clear', $output);
+    }
+}

From 9cade91cf68f5121428c507135aba69a7dc182c4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 28 Mar 2022 11:44:41 +0900
Subject: [PATCH 1823/2325] refactor: remove unneeded logic

It seems out of dated logic.
---
 system/CLI/CommandRunner.php           |  5 -----
 tests/system/CLI/CommandRunnerTest.php | 12 ------------
 2 files changed, 17 deletions(-)

diff --git a/system/CLI/CommandRunner.php b/system/CLI/CommandRunner.php
index 06d06863de2f..ef4ed057b606 100644
--- a/system/CLI/CommandRunner.php
+++ b/system/CLI/CommandRunner.php
@@ -48,11 +48,6 @@ public function __construct()
      */
     public function _remap($method, $params)
     {
-        // The first param is usually empty, so scrap it.
-        if (empty($params[0])) {
-            array_shift($params);
-        }
-
         return $this->index($params);
     }
 
diff --git a/tests/system/CLI/CommandRunnerTest.php b/tests/system/CLI/CommandRunnerTest.php
index c9e3245b932c..892b7b5ff516 100644
--- a/tests/system/CLI/CommandRunnerTest.php
+++ b/tests/system/CLI/CommandRunnerTest.php
@@ -117,16 +117,4 @@ public function testBadCommand()
         // make sure the result looks like a command list
         $this->assertStringContainsString('Command "bogus" not found', CITestStreamFilter::$buffer);
     }
-
-    /**
-     * @TODO When the first param is empty? Use case?
-     */
-    public function testRemapEmptyFirstParams()
-    {
-        self::$runner->_remap('anyvalue', [null, 'list']);
-        $result = CITestStreamFilter::$buffer;
-
-        // make sure the result looks like a command list
-        $this->assertStringContainsString('Lists the available commands.', $result);
-    }
 }

From d0b323d9fbf7a7227551b7190f80ba0dbbf265ef Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 30 Mar 2022 19:16:35 +0900
Subject: [PATCH 1824/2325] docs: add CommandRunner::_remap() change in
 changelogs

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index f12a13bcb416..34daeff2f474 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -16,6 +16,7 @@ BREAKING
 - The ``CodeIgniter\CodeIgniter`` class has a new property ``$context`` and it must have the correct context at runtime. So the following files have been changed:
     - ``public/index.php``
     - ``spark``
+- The method signature of ``CodeIgniter\CLI\CommandRunner::_remap()`` has been changed to fix a bug.
 
 Enhancements
 ************

From 60ee4f3b946b7984ce7465d4770b4cd97bd3d2fe Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 1 Mar 2022 11:09:11 +0900
Subject: [PATCH 1825/2325] config: disable auto-routing by default

---
 app/Config/Routes.php                              |  2 +-
 system/Router/RouteCollection.php                  |  2 +-
 tests/system/CodeIgniterTest.php                   | 14 ++++++++++++++
 tests/system/Commands/RoutesTest.php               |  1 +
 .../Utilities/Routes/FilterCollectorTest.php       |  2 ++
 tests/system/Router/RouterTest.php                 |  4 ++++
 user_guide_src/source/changelogs/v4.2.0.rst        |  1 +
 7 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 0060a6f67dff..2b35d0dda6f8 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -21,7 +21,7 @@
 $routes->setDefaultMethod('index');
 $routes->setTranslateURIDashes(false);
 $routes->set404Override();
-$routes->setAutoRoute(true);
+$routes->setAutoRoute(false);
 
 /*
  * --------------------------------------------------------------------
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 65bf4f4985af..a1dd7b1a8fe7 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -76,7 +76,7 @@ class RouteCollection implements RouteCollectionInterface
      *
      * @var bool
      */
-    protected $autoRoute = true;
+    protected $autoRoute = false;
 
     /**
      * A callable that will be shown
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index 42706e39d110..a29879522e37 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -47,6 +47,8 @@ protected function tearDown(): void
         if (count(ob_list_handlers()) > 1) {
             ob_end_clean();
         }
+
+        $this->resetServices();
     }
 
     public function testRunEmptyDefaultRoute()
@@ -469,6 +471,12 @@ public function testSpoofRequestMethodCanUsePUT()
 
         $_POST['_method'] = 'PUT';
 
+        $routes = \Config\Services::routes();
+        $routes->setDefaultNamespace('App\Controllers');
+        $routes->resetRoutes();
+        $routes->post('/', 'Home::index');
+        $routes->put('/', 'Home::index');
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run();
         ob_get_clean();
@@ -487,6 +495,12 @@ public function testSpoofRequestMethodCannotUseGET()
 
         $_POST['_method'] = 'GET';
 
+        $routes = \Config\Services::routes();
+        $routes->setDefaultNamespace('App\Controllers');
+        $routes->resetRoutes();
+        $routes->post('/', 'Home::index');
+        $routes->get('/', 'Home::index');
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run();
         ob_get_clean();
diff --git a/tests/system/Commands/RoutesTest.php b/tests/system/Commands/RoutesTest.php
index dd5e6b3280a8..1787e8bef3fa 100644
--- a/tests/system/Commands/RoutesTest.php
+++ b/tests/system/Commands/RoutesTest.php
@@ -67,6 +67,7 @@ public function testRoutesCommandRouteFilterAndAutoRoute()
         $routes->setDefaultNamespace('App\Controllers');
         $routes->resetRoutes();
         $routes->get('/', 'Home::index', ['filter' => 'csrf']);
+        $routes->setAutoRoute(true);
 
         command('routes');
 
diff --git a/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php
index 6002323d3393..5037c148b704 100644
--- a/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php
+++ b/tests/system/Commands/Utilities/Routes/FilterCollectorTest.php
@@ -23,6 +23,8 @@ public function testGet()
     {
         $routes = Services::routes();
         $routes->resetRoutes();
+        $routes->setDefaultNamespace('App\Controllers');
+        $routes->get('/', 'Home::index');
 
         $collector = new FilterCollector();
 
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index b2c476f5add6..d3ca04422c41 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -728,7 +728,10 @@ public function testAutoRouteMatchesZeroParams()
     public function testAutoRouteMethodEmpty()
     {
         $router = new Router($this->collection, $this->request);
+        $this->collection->setAutoRoute(true);
+
         $router->handle('Home/');
+
         $this->assertSame('Home', $router->controllerName());
         $this->assertSame('index', $router->methodName());
     }
@@ -775,6 +778,7 @@ public function testRegularExpressionPlaceholderWithUnicode()
     public function testRouterPriorDirectory()
     {
         $router = new Router($this->collection, $this->request);
+        $this->collection->setAutoRoute(true);
 
         $router->setDirectory('foo/bar/baz', false, true);
         $router->handle('Some_controller/some_method/param1/param2/param3');
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index f12a13bcb416..55f7986375aa 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -43,6 +43,7 @@ Changes
 - The process of sending cookies has been moved to the ``Response`` class. Now the ``Session`` class doesn't send cookies, set them to the Response.
 - Validation. Changed generation of errors when using fields with a wildcard (*). Now the error key contains the full path. See :ref:`validation-getting-all-errors`.
 - ``Validation::getError()`` when using a wildcard will return all found errors matching the mask as a string.
+- To make the default configuration more secure, auto-routing has been changed to disabled by default.
 
 Deprecations
 ************

From d9a2389bf4437bf811368568cd536ba216bc5fc1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 1 Mar 2022 11:33:42 +0900
Subject: [PATCH 1826/2325] docs: move "Default Controller" in the "Auto
 Routing"

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

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index eb7d57370015..3a761ed1d5a0 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -465,31 +465,6 @@ then you can change this value to save typing:
 
 .. literalinclude:: routing/046.php
 
-Default Controller
-==================
-
-When a user visits the root of your site (i.e., example.com) the controller to use is determined by the value set by
-the ``setDefaultController()`` method, unless a route exists for it explicitly. The default value for this is ``Home``
-which matches the controller at **app/Controllers/Home.php**:
-
-.. literalinclude:: routing/047.php
-
-The default controller is also used when no matching route has been found, and the URI would point to a directory
-in the controllers directory. For example, if the user visits **example.com/admin**, if a controller was found at
-**app/Controllers/Admin/Home.php**, it would be used.
-
-Default Method
-==============
-
-This works similar to the default controller setting, but is used to determine the default method that is used
-when a controller is found that matches the URI, but no segment exists for the method. The default value is
-``index``.
-
-In this example, if the user were to visit **example.com/products**, and a ``Products`` controller existed, the
-``Products::listAll()`` method would be executed:
-
-.. literalinclude:: routing/048.php
-
 Translate URI Dashes
 ====================
 
@@ -566,8 +541,33 @@ and executes the corresponding controller method. The auto-routing is enabled by
 
 .. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method.
 
+Default Controller
+==================
+
+When a user visits the root of your site (i.e., example.com) the controller to use is determined by the value set by
+the ``setDefaultController()`` method, unless a route exists for it explicitly. The default value for this is ``Home``
+which matches the controller at **app/Controllers/Home.php**:
+
+.. literalinclude:: routing/047.php
+
+The default controller is also used when no matching route has been found, and the URI would point to a directory
+in the controllers directory. For example, if the user visits **example.com/admin**, if a controller was found at
+**app/Controllers/Admin/Home.php**, it would be used.
+
 See :ref:`Auto Routing in Controllers <controller-auto-routing>` for more info.
 
+Default Method
+==============
+
+This works similar to the default controller setting, but is used to determine the default method that is used
+when a controller is found that matches the URI, but no segment exists for the method. The default value is
+``index``.
+
+In this example, if the user were to visit **example.com/products**, and a ``Products`` controller existed, the
+``Products::listAll()`` method would be executed:
+
+.. literalinclude:: routing/048.php
+
 Confirming Routes
 *****************
 

From aa69f381eae378e867d940c38363efc548ec047f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 1 Mar 2022 11:40:19 +0900
Subject: [PATCH 1827/2325] docs: move "Default Method" in "Auto Routing"

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

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 3a761ed1d5a0..d4b4c2f34cf1 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -539,10 +539,13 @@ and executes the corresponding controller method. The auto-routing is enabled by
 .. note:: To prevent misconfiguration and miscoding, we recommend that you disable
     the auto-routing feature. See :ref:`use-defined-routes-only`.
 
+Configuration Options
+=====================
+
 .. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method.
 
 Default Controller
-==================
+------------------
 
 When a user visits the root of your site (i.e., example.com) the controller to use is determined by the value set by
 the ``setDefaultController()`` method, unless a route exists for it explicitly. The default value for this is ``Home``
@@ -557,7 +560,7 @@ in the controllers directory. For example, if the user visits **example.com/admi
 See :ref:`Auto Routing in Controllers <controller-auto-routing>` for more info.
 
 Default Method
-==============
+--------------
 
 This works similar to the default controller setting, but is used to determine the default method that is used
 when a controller is found that matches the URI, but no segment exists for the method. The default value is

From fabcf1c4ab76efdc41faf24553d094bde2cee385 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 1 Mar 2022 11:53:07 +0900
Subject: [PATCH 1828/2325] docs: add "Enable Auto Routing"

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

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index d4b4c2f34cf1..04beafd9f2dc 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -515,6 +515,15 @@ It is recommended that all routes are defined in the **app/Config/Routes.php** f
 However, CodeIgniter can also automatically route HTTP requests based on conventions
 and execute the corresponding controller methods.
 
+Enable Auto Routing
+===================
+
+Since v4.2.0, the auto-routing is disabled by default.
+
+To use it, you need to change the setting ``setAutoRoute()`` option to true in **app/Config/Routes.php**::
+
+    $routes->setAutoRoute(true);
+
 URI Segments
 ============
 

From a514043270fa56efe301f37e5a4955d140a72527 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 1 Mar 2022 11:53:54 +0900
Subject: [PATCH 1829/2325] docs: update existing description for disabling
 auto-routing by default

---
 user_guide_src/source/incoming/controllers.rst |  6 +++---
 user_guide_src/source/incoming/routing.rst     | 14 +++++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 037710255100..287d6ae28153 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -114,10 +114,10 @@ Auto Routing
 
 This section describes the functionality of the auto-routing.
 It automatically routes an HTTP request, and executes the corresponding controller method
-without route definitions. The auto-routing is enabled by default.
+without route definitions. The auto-routing is disabled by default.
 
 .. note:: To prevent misconfiguration and miscoding, we recommend that you disable
-    the auto-routing feature. See :ref:`use-defined-routes-only`.
+    the auto-routing feature.
 
 .. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method.
 
@@ -220,7 +220,7 @@ Your method will be passed URI segments 3 and 4 (``'sandals'`` and ``'123'``):
 .. literalinclude:: controllers/014.php
 
 .. important:: If you are using the :doc:`URI Routing <routing>`
-    feature, the segments passed to your method will be the re-routed
+    feature, the segments passed to your method will be the defined
     ones.
 
 Defining a Default Controller
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 04beafd9f2dc..77d68533fba2 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -312,7 +312,7 @@ available from the command line:
 
 .. literalinclude:: routing/032.php
 
-.. warning:: If you don't disable auto-routing and place the command file in **app/Controllers**,
+.. warning:: If you enable auto-routing and place the command file in **app/Controllers**,
     anyone could access the command with the help of auto-routing via HTTP.
 
 Global Options
@@ -515,6 +515,11 @@ It is recommended that all routes are defined in the **app/Config/Routes.php** f
 However, CodeIgniter can also automatically route HTTP requests based on conventions
 and execute the corresponding controller methods.
 
+.. warning:: To prevent misconfiguration and miscoding, we recommend that you disable
+    the auto-routing feature.
+
+.. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method.
+
 Enable Auto Routing
 ===================
 
@@ -543,15 +548,14 @@ In the above example, CodeIgniter would attempt to find a controller named **Hel
 and executes ``index()`` method with passing ``'1'`` as the first argument.
 
 We call this "**Auto Routes**". CodeIgniter automatically routes an HTTP request,
-and executes the corresponding controller method. The auto-routing is enabled by default.
+and executes the corresponding controller method. The auto-routing is disabled by default.
 
-.. note:: To prevent misconfiguration and miscoding, we recommend that you disable
-    the auto-routing feature. See :ref:`use-defined-routes-only`.
+See :ref:`Auto Routing in Controllers <controller-auto-routing>` for more info.
 
 Configuration Options
 =====================
 
-.. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method.
+These options are available at the top of **app/Config/Routes.php**.
 
 Default Controller
 ------------------

From 1e6a48625fd77546390107b71823a095f9b13428 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 1 Mar 2022 12:51:06 +0900
Subject: [PATCH 1830/2325] docs: replace remap with map

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

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 287d6ae28153..a4c635a6532c 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -279,7 +279,7 @@ called if the URL contains *only* the sub-directory. Simply put a controller
 in there that matches the name of your default controller as specified in
 your **app/Config/Routes.php** file.
 
-CodeIgniter also permits you to remap your URIs using its :doc:`URI Routing <routing>` feature.
+CodeIgniter also permits you to map your URIs using its :doc:`URI Routing <routing>` feature.
 
 Remapping Method Calls
 **********************
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 77d68533fba2..41741fb93ebf 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -76,22 +76,22 @@ Examples
 
 Here are a few basic routing examples.
 
-A URL containing the word **journals** in the first segment will be remapped to the ``\App\Controllers\Blogs`` class,
+A URL containing the word **journals** in the first segment will be mapped to the ``\App\Controllers\Blogs`` class,
 and the default method, which is usually ``index()``:
 
 .. literalinclude:: routing/006.php
 
-A URL containing the segments **blog/joe** will be remapped to the ``\App\Controllers\Blogs`` class and the ``users`` method.
+A URL containing the segments **blog/joe** will be mapped to the ``\App\Controllers\Blogs`` class and the ``users`` method.
 The ID will be set to ``34``:
 
 .. literalinclude:: routing/007.php
 
-A URL with **product** as the first segment, and anything in the second will be remapped to the ``\App\Controllers\Catalog`` class
+A URL with **product** as the first segment, and anything in the second will be mapped to the ``\App\Controllers\Catalog`` class
 and the ``productLookup`` method:
 
 .. literalinclude:: routing/008.php
 
-A URL with **product** as the first segment, and a number in the second will be remapped to the ``\App\Controllers\Catalog`` class
+A URL with **product** as the first segment, and a number in the second will be mapped to the ``\App\Controllers\Catalog`` class
 and the ``productLookupByID`` method passing in the match as a variable to the method:
 
 .. literalinclude:: routing/009.php

From 08ecf84170635df1235ae757c6d9ff4b4ee1fe92 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 1 Mar 2022 12:55:26 +0900
Subject: [PATCH 1831/2325] docs: add `()` at the end of method names

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

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 41741fb93ebf..4103abb6e428 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -81,18 +81,18 @@ and the default method, which is usually ``index()``:
 
 .. literalinclude:: routing/006.php
 
-A URL containing the segments **blog/joe** will be mapped to the ``\App\Controllers\Blogs`` class and the ``users`` method.
+A URL containing the segments **blog/joe** will be mapped to the ``\App\Controllers\Blogs`` class and the ``users()`` method.
 The ID will be set to ``34``:
 
 .. literalinclude:: routing/007.php
 
 A URL with **product** as the first segment, and anything in the second will be mapped to the ``\App\Controllers\Catalog`` class
-and the ``productLookup`` method:
+and the ``productLookup()`` method:
 
 .. literalinclude:: routing/008.php
 
 A URL with **product** as the first segment, and a number in the second will be mapped to the ``\App\Controllers\Catalog`` class
-and the ``productLookupByID`` method passing in the match as a variable to the method:
+and the ``productLookupByID()`` method passing in the match as a variable to the method:
 
 .. literalinclude:: routing/009.php
 

From ab1d3d862c2774b51e432279412124daa5344e04 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 2 Mar 2022 09:32:49 +0900
Subject: [PATCH 1832/2325] docs: update Tutorial

---
 .../source/tutorial/create_news_items.rst     |   2 +-
 .../source/tutorial/create_news_items/004.php |   5 +
 .../source/tutorial/news_section.rst          |   3 +-
 .../source/tutorial/news_section/008.php      |   5 +
 .../source/tutorial/static_pages.rst          | 120 +++++++-----------
 .../source/tutorial/static_pages/003.php      |   6 +
 .../source/tutorial/static_pages/004.php      |   1 +
 7 files changed, 68 insertions(+), 74 deletions(-)

diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index 32bc4b703e18..49ebc36c2bc3 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -119,7 +119,7 @@ Routing
 
 Before you can start adding news items into your CodeIgniter application
 you have to add an extra rule to **app/Config/Routes.php** file. Make sure your
-file contains the following. This makes sure CodeIgniter sees ``create``
+file contains the following. This makes sure CodeIgniter sees ``create()``
 as a method instead of a news item's slug. You can read more about different
 routing types :doc:`here </incoming/routing>`.
 
diff --git a/user_guide_src/source/tutorial/create_news_items/004.php b/user_guide_src/source/tutorial/create_news_items/004.php
index c8c66824fd82..8a0905770c82 100644
--- a/user_guide_src/source/tutorial/create_news_items/004.php
+++ b/user_guide_src/source/tutorial/create_news_items/004.php
@@ -1,6 +1,11 @@
 <?php
 
+// ...
+
 $routes->match(['get', 'post'], 'news/create', 'News::create');
 $routes->get('news/(:segment)', 'News::view/$1');
 $routes->get('news', 'News::index');
+$routes->get('pages', 'Pages::index');
 $routes->get('(:any)', 'Pages::view/$1');
+
+// ...
diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
index 2797c8a5cfaa..a27902819265 100644
--- a/user_guide_src/source/tutorial/news_section.rst
+++ b/user_guide_src/source/tutorial/news_section.rst
@@ -171,8 +171,7 @@ The only thing left to do is create the corresponding view at
 Routing
 *******
 
-Because of the wildcard routing rule created earlier, you need an extra
-route to view the controller that you just made. Modify your routing file
+Modify your routing file
 (**app/Config/Routes.php**) so it looks as follows.
 This makes sure the requests reach the ``News`` controller instead of
 going directly to the ``Pages`` controller. The first line routes URI's
diff --git a/user_guide_src/source/tutorial/news_section/008.php b/user_guide_src/source/tutorial/news_section/008.php
index 8943925258bd..4ba41638ef7f 100644
--- a/user_guide_src/source/tutorial/news_section/008.php
+++ b/user_guide_src/source/tutorial/news_section/008.php
@@ -1,5 +1,10 @@
 <?php
 
+// ...
+
 $routes->get('news/(:segment)', 'News::view/$1');
 $routes->get('news', 'News::index');
+$routes->get('pages', 'Pages::index');
 $routes->get('(:any)', 'Pages::view/$1');
+
+// ...
diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
index 5128d6665e2c..6c39f82b5f80 100644
--- a/user_guide_src/source/tutorial/static_pages.rst
+++ b/user_guide_src/source/tutorial/static_pages.rst
@@ -9,20 +9,6 @@ The first thing you're going to do is set up a **controller** to handle
 static pages. A controller is simply a class that helps delegate work.
 It is the glue of your web application.
 
-For example, when a call is made to::
-
-    http://example.com/news/latest/10
-
-We might imagine that there is a controller named "news". The method
-being called on news would be "latest". The news method's job could be to
-grab 10 news items, and render them on the page. Very often in MVC,
-you'll see URL patterns that match::
-
-    http://example.com/[controller-class]/[controller-method]/[arguments]
-
-As URL schemes become more complex, this may change. But for now, this
-is all we will need to know.
-
 Let's Make our First Controller
 *******************************
 
@@ -126,59 +112,11 @@ view.
     throw errors on case-sensitive platforms. You can read more about it
     :doc:`here </outgoing/views>`.
 
-Running the App
-***************
-
-Ready to test? You cannot run the app using PHP's built-in server,
-since it will not properly process the ``.htaccess`` rules that are provided in
-``public``, and which eliminate the need to specify "index.php/"
-as part of a URL. CodeIgniter has its own command that you can use though.
-
-From the command line, at the root of your project::
-
-    > php spark serve
-
-will start a web server, accessible on port 8080. If you set the location field
-in your browser to ``localhost:8080``, you should see the CodeIgniter welcome page.
-
-You can now try several URLs in the browser location field, to see what the ``Pages``
-controller you made above produces...
-
-.. table::
-    :widths: 20 80
-
-    +---------------------------------+-----------------------------------------------------------------+
-    | URL                             | Will show                                                       |
-    +=================================+=================================================================+
-    | localhost:8080/pages            | the results from the `index` method inside our `Pages`          |
-    |                                 | controller, which is to display the CodeIgniter "welcome" page, |
-    |                                 | because "index" is the default controller method                |
-    +---------------------------------+-----------------------------------------------------------------+
-    | localhost:8080/pages/index      | the CodeIgniter "welcome" page, because we explicitly asked for |
-    |                                 | the "index" method                                              |
-    +---------------------------------+-----------------------------------------------------------------+
-    | localhost:8080/pages/view       | the "home" page that you made above, because it is the default  |
-    |                                 | "page" parameter to the ``view()`` method.                      |
-    +---------------------------------+-----------------------------------------------------------------+
-    | localhost:8080/pages/view/home  | show the "home" page that you made above, because we explicitly |
-    |                                 | asked for it                                                    |
-    +---------------------------------+-----------------------------------------------------------------+
-    | localhost:8080/pages/view/about | the "about" page that you made above, because we explicitly     |
-    |                                 | asked for it                                                    |
-    +---------------------------------+-----------------------------------------------------------------+
-    | localhost:8080/pages/view/shop  | a "404 - File Not Found" error page, because there is no        |
-    |                                 | `app/Views/pages/shop.php`                                      |
-    +---------------------------------+-----------------------------------------------------------------+
-
 Routing
 *******
 
-The controller is now functioning!
-
-Using custom routing rules, you have the power to map any URI to any
-controller and method, and break free from the normal convention::
-
-    http://example.com/[controller-class]/[controller-method]/[arguments]
+We have made the controller. The next thing is to set routing rules.
+Routing associates a URI with a controller's method.
 
 Let's do that. Open the routing file located at
 **app/Config/Routes.php** and look for the "Route Definitions"
@@ -191,9 +129,10 @@ The only uncommented line there to start with should be:
 This directive says that any incoming request without any content
 specified should be handled by the ``index()`` method inside the ``Home`` controller.
 
-Add the following line, **after** the route directive for '/'.
+Add the following lines, **after** the route directive for '/'.
 
 .. literalinclude:: static_pages/004.php
+   :lines: 2-
 
 CodeIgniter reads its routing rules from top to bottom and routes the
 request to the first matching rule. Each rule is a regular expression
@@ -205,18 +144,57 @@ arguments.
 More information about routing can be found in the URI Routing
 :doc:`documentation </incoming/routing>`.
 
-Here, the second rule in the ``$routes`` object matches **any** request
-using the wildcard string ``(:any)``. and passes the parameter to the
+Here, the second rule in the ``$routes`` object matches GET request
+to the URI path ``/pages`` maps the ``index()`` method of the ``Pages`` class.
+
+The third rule in the ``$routes`` object matches GET request to **any** URI path
+using the wildcard string ``(:any)``, and passes the parameter to the
 ``view()`` method of the ``Pages`` class.
 
+Running the App
+***************
+
+Ready to test? You cannot run the app using PHP's built-in server,
+since it will not properly process the ``.htaccess`` rules that are provided in
+``public``, and which eliminate the need to specify "index.php/"
+as part of a URL. CodeIgniter has its own command that you can use though.
+
+From the command line, at the root of your project::
+
+    > php spark serve
+
+will start a web server, accessible on port 8080. If you set the location field
+in your browser to ``localhost:8080``, you should see the CodeIgniter welcome page.
+
 Now visit ``localhost:8080/home``. Did it get routed correctly to the ``view()``
-method in the pages controller? Awesome!
+method in the ``Pages`` controller? Awesome!
 
 You should see something like the following:
 
 .. image:: ../images/tutorial1.png
     :align: center
 
-.. note:: When manually specifying routes, it is recommended to disable
-    auto-routing by setting ``$routes->setAutoRoute(false);`` in the **Routes.php** file.
-    This ensures that only routes you define can be accessed.
+You can now try several URLs in the browser location field, to see what the ``Pages``
+controller you made above produces...
+
+.. table::
+    :widths: 20 80
+
+    +---------------------------------+-----------------------------------------------------------------+
+    | URL                             | Will show                                                       |
+    +=================================+=================================================================+
+    | localhost:8080/pages            | the results from the ``index()`` method inside our ``Pages``    |
+    |                                 | controller, which is to display the CodeIgniter "welcome" page. |
+    +---------------------------------+-----------------------------------------------------------------+
+    | localhost:8080/pages/view       | the "home" page that you made above, because it is the default  |
+    |                                 | "page" parameter to the ``view()`` method.                      |
+    +---------------------------------+-----------------------------------------------------------------+
+    | localhost:8080/pages/view/home  | show the "home" page that you made above, because we explicitly |
+    |                                 | asked for it.                                                   |
+    +---------------------------------+-----------------------------------------------------------------+
+    | localhost:8080/pages/view/about | the "about" page that you made above, because we explicitly     |
+    |                                 | asked for it.                                                   |
+    +---------------------------------+-----------------------------------------------------------------+
+    | localhost:8080/pages/view/shop  | a "404 - File Not Found" error page, because there is no        |
+    |                                 | **app/Views/pages/shop.php**.                                   |
+    +---------------------------------+-----------------------------------------------------------------+
diff --git a/user_guide_src/source/tutorial/static_pages/003.php b/user_guide_src/source/tutorial/static_pages/003.php
index d799d1cf0fb5..956c097d390f 100644
--- a/user_guide_src/source/tutorial/static_pages/003.php
+++ b/user_guide_src/source/tutorial/static_pages/003.php
@@ -1,3 +1,9 @@
 <?php
 
+// ...
+
+// We get a performance increase by specifying the default
+// route since we don't have to scan directories.
 $routes->get('/', 'Home::index');
+
+// ...
diff --git a/user_guide_src/source/tutorial/static_pages/004.php b/user_guide_src/source/tutorial/static_pages/004.php
index f998b89762fd..a48a8caf18cb 100644
--- a/user_guide_src/source/tutorial/static_pages/004.php
+++ b/user_guide_src/source/tutorial/static_pages/004.php
@@ -1,3 +1,4 @@
 <?php
 
+$routes->get('pages', 'Pages::index');
 $routes->get('(:any)', 'Pages::view/$1');

From 4027b1f9247ea3d6cf5b18c26a3d21179ccd7a67 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 2 Mar 2022 10:00:10 +0900
Subject: [PATCH 1833/2325] docs: change "note" to "warning"

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

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index a4c635a6532c..928a16fff9b3 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -116,7 +116,7 @@ This section describes the functionality of the auto-routing.
 It automatically routes an HTTP request, and executes the corresponding controller method
 without route definitions. The auto-routing is disabled by default.
 
-.. note:: To prevent misconfiguration and miscoding, we recommend that you disable
+.. warning:: To prevent misconfiguration and miscoding, we recommend that you disable
     the auto-routing feature.
 
 .. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method.

From c7edb7c4c26ce82044b29607177de761e84b5311 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 2 Mar 2022 12:26:02 +0900
Subject: [PATCH 1834/2325] docs: make warning more detailed

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

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 928a16fff9b3..99c22b5a356d 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -116,8 +116,9 @@ This section describes the functionality of the auto-routing.
 It automatically routes an HTTP request, and executes the corresponding controller method
 without route definitions. The auto-routing is disabled by default.
 
-.. warning:: To prevent misconfiguration and miscoding, we recommend that you disable
-    the auto-routing feature.
+.. warning:: To prevent misconfiguration and miscoding, we recommend that you do not use
+    the auto-routing feature. It is easy to create vulnerable apps where controller filters
+    or CSRF protection are bypassed.
 
 .. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method.
 
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 4103abb6e428..504e555dd76c 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -515,8 +515,9 @@ It is recommended that all routes are defined in the **app/Config/Routes.php** f
 However, CodeIgniter can also automatically route HTTP requests based on conventions
 and execute the corresponding controller methods.
 
-.. warning:: To prevent misconfiguration and miscoding, we recommend that you disable
-    the auto-routing feature.
+.. warning:: To prevent misconfiguration and miscoding, we recommend that you do not use
+    the auto-routing feature. It is easy to create vulnerable apps where controller filters
+    or CSRF protection are bypassed.
 
 .. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method.
 

From d811d5b37ad4ede6d04afb4dd51ff510481e9205 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 2 Mar 2022 12:27:06 +0900
Subject: [PATCH 1835/2325] docs: update description

---
 user_guide_src/source/cli/cli.rst          | 2 +-
 user_guide_src/source/incoming/routing.rst | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/cli/cli.rst b/user_guide_src/source/cli/cli.rst
index f3ffcc9285f6..bd57d4f608fd 100644
--- a/user_guide_src/source/cli/cli.rst
+++ b/user_guide_src/source/cli/cli.rst
@@ -88,7 +88,7 @@ works exactly like a normal route definition:
 
 For more information, see the :ref:`Routes <command-line-only-routes>` page.
 
-.. warning:: If you don't disable auto-routing and place the command file in **app/Controllers**,
+.. warning:: If you enable auto-routing and place the command file in **app/Controllers**,
     anyone could access the command with the help of auto-routing via HTTP.
 
 The CLI Library
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 504e555dd76c..4989f0891e0b 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -479,8 +479,12 @@ dash isn't a valid class or method name character and would cause a fatal error
 Use Defined Routes Only
 =======================
 
+Since v4.2.0, the auto-routing is disabled by default.
+
 When no defined route is found that matches the URI, the system will attempt to match that URI against the
-controllers and methods as described in :ref:`auto-routing`. You can disable this automatic matching, and restrict routes
+controllers and methods when :ref:`auto-routing` is enabled.
+
+You can disable this automatic matching, and restrict routes
 to only those defined by you, by setting the ``setAutoRoute()`` option to false:
 
 .. literalinclude:: routing/050.php

From 1fe49bafc27d3483f9d0c863c4dbc4c29fb853fb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 2 Mar 2022 12:33:35 +0900
Subject: [PATCH 1836/2325] docs: add warning as a comment

---
 app/Config/Routes.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 2b35d0dda6f8..15371af7de5e 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -21,7 +21,10 @@
 $routes->setDefaultMethod('index');
 $routes->setTranslateURIDashes(false);
 $routes->set404Override();
-$routes->setAutoRoute(false);
+// The auto-routing is very dangerous. It is easy to create vulnerable apps
+// where controller filters or CSRF protection are bypassed.
+// It is recommended that you do not set it to `true`.
+//$routes->setAutoRoute(false);
 
 /*
  * --------------------------------------------------------------------

From a65bc3ab2f5302c11bff26e545b12ec7b75e4e8f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 3 Mar 2022 09:21:21 +0900
Subject: [PATCH 1837/2325] docs: add about the config change of auto-routing
 in Upgrade Note

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

diff --git a/user_guide_src/source/installation/upgrade_420.rst b/user_guide_src/source/installation/upgrade_420.rst
index a302f113ae61..daf89b39290f 100644
--- a/user_guide_src/source/installation/upgrade_420.rst
+++ b/user_guide_src/source/installation/upgrade_420.rst
@@ -49,7 +49,8 @@ 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:
 
-*
+* ``app/Config/Routes.php``
+    * To make the default configuration more secure, auto-routing has been changed to disabled by default.
 
 All Changes
 ===========

From dafce4979cba1aed3b8a39705b919014fa6cd340 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 31 Mar 2022 10:34:00 +0900
Subject: [PATCH 1838/2325] feat: add options to change delimitors for
 conditionals

To avoid accidentally changing JavaScript code.
---
 system/View/Parser.php           | 45 +++++++++++++++++++++++++++--
 tests/system/View/ParserTest.php | 49 ++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+), 3 deletions(-)

diff --git a/system/View/Parser.php b/system/View/Parser.php
index 6834c003e500..665347d8f978 100644
--- a/system/View/Parser.php
+++ b/system/View/Parser.php
@@ -37,6 +37,16 @@ class Parser extends View
      */
     public $rightDelimiter = '}';
 
+    /**
+     * Left delimiter characters for conditionals
+     */
+    protected string $leftConditionalDelimiter = '{';
+
+    /**
+     * Right delimiter characters for conditionals
+     */
+    protected string $rightConditionalDelimiter = '}';
+
     /**
      * Stores extracted noparse blocks.
      *
@@ -405,7 +415,14 @@ public function insertNoparse(string $template): string
      */
     protected function parseConditionals(string $template): string
     {
-        $pattern = '/\{\s*(if|elseif)\s*((?:\()?(.*?)(?:\))?)\s*\}/ms';
+        $leftDelimiter  = preg_quote($this->leftConditionalDelimiter, '/');
+        $rightDelimiter = preg_quote($this->rightConditionalDelimiter, '/');
+
+        $pattern = '/'
+            . $leftDelimiter
+            . '\s*(if|elseif)\s*((?:\()?(.*?)(?:\))?)\s*'
+            . $rightDelimiter
+            . '/ms';
 
         /*
          * For each match:
@@ -424,8 +441,16 @@ protected function parseConditionals(string $template): string
             $template  = str_replace($match[0], $statement, $template);
         }
 
-        $template = preg_replace('/\{\s*else\s*\}/ms', '<?php else: ?>', $template);
-        $template = preg_replace('/\{\s*endif\s*\}/ms', '<?php endif; ?>', $template);
+        $template = preg_replace(
+            '/' . $leftDelimiter . '\s*else\s*' . $rightDelimiter . '/ms',
+            '<?php else: ?>',
+            $template
+        );
+        $template = preg_replace(
+            '/' . $leftDelimiter . '\s*endif\s*' . $rightDelimiter . '/ms',
+            '<?php endif; ?>',
+            $template
+        );
 
         // Parse the PHP itself, or insert an error so they can debug
         ob_start();
@@ -461,6 +486,20 @@ public function setDelimiters($leftDelimiter = '{', $rightDelimiter = '}'): Rend
         return $this;
     }
 
+    /**
+     * Over-ride the substitution conditional delimiters.
+     *
+     * @param string $leftDelimiter
+     * @param string $rightDelimiter
+     */
+    public function setConditionalDelimiters($leftDelimiter = '{', $rightDelimiter = '}'): RendererInterface
+    {
+        $this->leftConditionalDelimiter  = $leftDelimiter;
+        $this->rightConditionalDelimiter = $rightDelimiter;
+
+        return $this;
+    }
+
     /**
      * Handles replacing a pseudo-variable with the actual content. Will double-check
      * for escaping brackets.
diff --git a/tests/system/View/ParserTest.php b/tests/system/View/ParserTest.php
index 3462b0cc2a84..bf307a419f61 100644
--- a/tests/system/View/ParserTest.php
+++ b/tests/system/View/ParserTest.php
@@ -938,4 +938,53 @@ public function testRenderFindsOtherView()
         $expected = '<h1>Hello World</h1>';
         $this->assertSame($expected, $this->parser->render('Simpler.html'));
     }
+
+    public function testChangedConditionalDelimitersTrue()
+    {
+        $this->parser->setConditionalDelimiters('{%', '%}');
+
+        $data = [
+            'doit'     => true,
+            'dontdoit' => false,
+        ];
+        $this->parser->setData($data);
+
+        $template = '{% if $doit %}Howdy{% endif %}{% if $dontdoit === false %}Welcome{% endif %}';
+        $output   = $this->parser->renderString($template);
+
+        $this->assertSame('HowdyWelcome', $output);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5831
+     */
+    public function testChangeConditionalDelimitersWorkWithJavaScriptCode()
+    {
+        $this->parser->setConditionalDelimiters('{%', '%}');
+
+        $data = [
+            'message' => 'Warning!',
+        ];
+        $this->parser->setData($data);
+
+        $template = <<<'EOL'
+            <script type="text/javascript">
+             var f = function() {
+                 if (true) {
+                     alert('{message}');
+                 }
+             }
+            </script>
+            EOL;
+        $expected = <<<'EOL'
+            <script type="text/javascript">
+             var f = function() {
+                 if (true) {
+                     alert('Warning!');
+                 }
+             }
+            </script>
+            EOL;
+        $this->assertSame($expected, $this->parser->renderString($template));
+    }
 }

From 2d90f0cc6ca2bca0927bd73413d04f60d77fd9a2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 31 Mar 2022 10:55:53 +0900
Subject: [PATCH 1839/2325] docs: add setConditionalDelimiters()

---
 .../source/outgoing/view_parser.rst           | 25 +++++++++++++++++++
 .../source/outgoing/view_parser/027.php       |  3 +++
 2 files changed, 28 insertions(+)
 create mode 100644 user_guide_src/source/outgoing/view_parser/027.php

diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index 2e615e52bdb9..752dcc489590 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -290,6 +290,31 @@ of the comparison operators you would normally, like ``==``, ``===``, ``!==``, `
 .. warning:: In the background, conditionals are parsed using an ``eval()``, so you must ensure that you take
     care with the user data that is used within conditionals, or you could open your application up to security risks.
 
+Changing the Conditional Delimiters
+-----------------------------------
+
+If you have JavaScript code like the following in your templates, the Parser raises a syntax error because there are strings that can be interpreted as a conditional::
+
+    <script type="text/javascript">
+        var f = function() {
+            if (hasAlert) {
+                alert('{message}');
+            }
+        }
+    </script>
+
+In that case, you can change the delimiters for conditionals with the ``setConditionalDelimiters()`` method to avoid misinterpretations:
+
+.. literalinclude:: view_parser/027.php
+
+In this case, you will write code in your template::
+
+    {% if $role=='admin' %}
+        <h1>Welcome, Admin</h1>
+    {% else %}
+        <h1>Welcome, User</h1>
+    {% endif %}
+
 Escaping Data
 =============
 
diff --git a/user_guide_src/source/outgoing/view_parser/027.php b/user_guide_src/source/outgoing/view_parser/027.php
new file mode 100644
index 000000000000..84730679ced5
--- /dev/null
+++ b/user_guide_src/source/outgoing/view_parser/027.php
@@ -0,0 +1,3 @@
+<?php
+
+$parser->setConditionalDelimiters('{%', '%}');

From e521f66fdabee7d0d109761caf084809132ccebc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 31 Mar 2022 11:40:15 +0900
Subject: [PATCH 1840/2325] docs: replace variables with properties

They are different.
---
 user_guide_src/source/tutorial/static_pages.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
index 6c39f82b5f80..668683995231 100644
--- a/user_guide_src/source/tutorial/static_pages.rst
+++ b/user_guide_src/source/tutorial/static_pages.rst
@@ -30,7 +30,7 @@ displays the CodeIgniter welcome page.
 
 The ``Pages`` class is extending the ``BaseController`` class that extends the
 ``CodeIgniter\Controller`` class. This means that the new Pages class can access the
-methods and variables defined in the ``CodeIgniter\Controller`` class
+methods and properties defined in the ``CodeIgniter\Controller`` class
 (**system/Controller.php**).
 
 The **controller is what will become the center of every request** to

From 5dacb15c7ccd93ecb74b99d9788397941dd642cb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 31 Mar 2022 11:59:08 +0900
Subject: [PATCH 1841/2325] fix: remove session _ci_validation_errors before
 running validation

---
 system/Validation/Validation.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 155efc223492..f330c91799f6 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -108,6 +108,12 @@ public function __construct($config, RendererInterface $view)
      */
     public function run(?array $data = null, ?string $group = null, ?string $dbGroup = null): bool
     {
+        // If there are still validation errors for redirect_with_input request, remove them.
+        // See `getErrors()` method.
+        if (isset($_SESSION, $_SESSION['_ci_validation_errors'])) {
+            unset($_SESSION['_ci_validation_errors']);
+        }
+
         $data ??= $this->data;
 
         // i.e. is_unique

From 35c2947d1a1988f37a422275e5ba037f32f11aa3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 31 Mar 2022 11:40:53 +0900
Subject: [PATCH 1842/2325] docs: remove `echo` in the controller and use
 `return`

echo() has side effects, so return is better.
---
 .../source/tutorial/create_news_items/002.php          | 10 +++++-----
 user_guide_src/source/tutorial/news_section/004.php    |  6 +++---
 user_guide_src/source/tutorial/news_section/006.php    |  6 +++---
 user_guide_src/source/tutorial/static_pages/002.php    |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/user_guide_src/source/tutorial/create_news_items/002.php b/user_guide_src/source/tutorial/create_news_items/002.php
index cdebb0a71e6a..66ff5e26776b 100644
--- a/user_guide_src/source/tutorial/create_news_items/002.php
+++ b/user_guide_src/source/tutorial/create_news_items/002.php
@@ -18,11 +18,11 @@ public function create()
                 'body'  => $this->request->getPost('body'),
             ]);
 
-            echo view('news/success');
-        } else {
-            echo view('templates/header', ['title' => 'Create a news item']);
-            echo view('news/create');
-            echo view('templates/footer');
+            return view('news/success');
         }
+
+        return view('templates/header', ['title' => 'Create a news item'])
+            . view('news/create')
+            . view('templates/footer');
     }
 }
diff --git a/user_guide_src/source/tutorial/news_section/004.php b/user_guide_src/source/tutorial/news_section/004.php
index 475b86fa2f45..b62562bfe351 100644
--- a/user_guide_src/source/tutorial/news_section/004.php
+++ b/user_guide_src/source/tutorial/news_section/004.php
@@ -15,8 +15,8 @@ public function index()
             'title' => 'News archive',
         ];
 
-        echo view('templates/header', $data);
-        echo view('news/overview', $data);
-        echo view('templates/footer', $data);
+        return view('templates/header', $data)
+            . view('news/overview', $data)
+            . view('templates/footer', $data);
     }
 }
diff --git a/user_guide_src/source/tutorial/news_section/006.php b/user_guide_src/source/tutorial/news_section/006.php
index 36faacb39a50..8bfc123e43f7 100644
--- a/user_guide_src/source/tutorial/news_section/006.php
+++ b/user_guide_src/source/tutorial/news_section/006.php
@@ -18,8 +18,8 @@ public function view($slug = null)
 
         $data['title'] = $data['news']['title'];
 
-        echo view('templates/header', $data);
-        echo view('news/view', $data);
-        echo view('templates/footer', $data);
+        return view('templates/header', $data)
+            . view('news/view', $data)
+            . view('templates/footer', $data);
     }
 }
diff --git a/user_guide_src/source/tutorial/static_pages/002.php b/user_guide_src/source/tutorial/static_pages/002.php
index 970e663558d5..9f80c4556a58 100644
--- a/user_guide_src/source/tutorial/static_pages/002.php
+++ b/user_guide_src/source/tutorial/static_pages/002.php
@@ -13,8 +13,8 @@ public function view($page = 'home')
 
         $data['title'] = ucfirst($page); // Capitalize the first letter
 
-        echo view('templates/header', $data);
-        echo view('pages/' . $page, $data);
-        echo view('templates/footer', $data);
+        return view('templates/header', $data)
+            . view('pages/' . $page, $data)
+            . view('templates/footer', $data);
     }
 }

From 59260c1cceda48673214e82b4607ba8567f135c4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 1 Apr 2022 11:27:15 +0900
Subject: [PATCH 1843/2325] docs: remove unneeded & in sample code

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

diff --git a/user_guide_src/source/models/model/055.php b/user_guide_src/source/models/model/055.php
index 1d62c54ba058..537199753d49 100644
--- a/user_guide_src/source/models/model/055.php
+++ b/user_guide_src/source/models/model/055.php
@@ -8,8 +8,8 @@ class UserModel
 {
     protected $db;
 
-    public function __construct(ConnectionInterface &$db)
+    public function __construct(ConnectionInterface $db)
     {
-        $this->db = &$db;
+        $this->db = $db;
     }
 }

From d84440415a86cfd5deb32a88d74bbf4236ef9e75 Mon Sep 17 00:00:00 2001
From: Toto <mail@totoprayogo.com>
Date: Fri, 1 Apr 2022 21:26:11 +0700
Subject: [PATCH 1844/2325] update link

https://codeigniter.com/en/contribute not found
---
 app/Views/welcome_message.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Views/welcome_message.php b/app/Views/welcome_message.php
index 9ee2e427c308..b982f58aa158 100644
--- a/app/Views/welcome_message.php
+++ b/app/Views/welcome_message.php
@@ -279,7 +279,7 @@
 
 		<p>CodeIgniter is a community driven project and accepts contributions
 			 of code and documentation from the community. Why not
-			 <a href="https://codeigniter.com/en/contribute" target="_blank">
+			 <a href="https://codeigniter.com/contribute" target="_blank">
 			 join us</a> ?</p>
 
 	</section>

From 88a7f8b88a9bbd29daaea1f94deeb95a618ccd76 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Fri, 1 Apr 2022 12:28:28 -0500
Subject: [PATCH 1845/2325] Added contributors to readme

---
 README.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a8a3566e395d..d8525f299037 100644
--- a/README.md
+++ b/README.md
@@ -69,10 +69,19 @@ to optional packages, with their own repository.
 
 ## Contributing
 
-We **are** accepting contributions from the community!
+We **are** accepting contributions from the community! It doesn't matter whether you can code, write documentation, or help find bugs, 
+all contributions are welcome. 
 
 Please read the [*Contributing to CodeIgniter*](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/README.md).
 
+CodeIgniter has had thousands on contributions from people since its creation. This project would not be what it is without them. 
+
+<a href="https://github.com/codeigniter4/CodeIgniter4/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=codeigniter4/CodeIgniter4" />
+</a>
+
+Made with [contrib.rocks](https://contrib.rocks).
+
 ## Server Requirements
 
 PHP version 7.4 or higher is required, with the following extensions installed:

From 27a74023bb25aefd752beb8f473393e84ac4fbfd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 2 Apr 2022 12:50:56 +0900
Subject: [PATCH 1846/2325] fix: FileLocator::listFiles() returns directories

We don't need directories.
---
 system/Autoloader/FileLocator.php           |  3 +++
 tests/system/Autoloader/FileLocatorTest.php | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index f9734828b692..0b7b5d1d4345 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -309,6 +309,9 @@ public function listFiles(string $path): array
 
             $tempFiles = get_filenames($fullPath, true);
 
+            // Remove directories
+            $tempFiles = array_filter($tempFiles, static fn ($path) => strtolower(substr($path, -4)) === '.php');
+
             if (! empty($tempFiles)) {
                 $files = array_merge($files, $tempFiles);
             }
diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php
index 54a471d74453..3b86cfb7e535 100644
--- a/tests/system/Autoloader/FileLocatorTest.php
+++ b/tests/system/Autoloader/FileLocatorTest.php
@@ -211,6 +211,18 @@ public function testListFilesSimple()
         $this->assertTrue(in_array($expectedWin, $files, true) || in_array($expectedLin, $files, true));
     }
 
+    public function testListFilesDoesNotContainDirectories()
+    {
+        $files = $this->locator->listFiles('Config/');
+
+        $directory = str_replace(
+            '/',
+            DIRECTORY_SEPARATOR,
+            APPPATH . 'Config/Boot'
+        );
+        $this->assertNotContains($directory, $files);
+    }
+
     public function testListFilesWithFileAsInput()
     {
         $files = $this->locator->listFiles('Config/App.php');

From 37e99bf13f1db654c546c2187d30dc9ec3c8b6f1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 2 Apr 2022 12:53:10 +0900
Subject: [PATCH 1847/2325] docs: add @return

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

diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index 0b7b5d1d4345..cfe12b79c2fa 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -289,6 +289,8 @@ public function findQualifiedNameFromPath(string $path)
     /**
      * Scans the defined namespaces, returning a list of all files
      * that are contained within the subpath specified by $path.
+     *
+     * @return string[] List of file paths
      */
     public function listFiles(string $path): array
     {
@@ -323,6 +325,8 @@ public function listFiles(string $path): array
     /**
      * Scans the provided namespace, returning a list of all files
      * that are contained within the sub path specified by $path.
+     *
+     * @return string[] List of file paths
      */
     public function listNamespaceFiles(string $prefix, string $path): array
     {

From 7aba08ab2f93a2e42a452a6fd995ad9b5c308318 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 2 Apr 2022 12:53:51 +0900
Subject: [PATCH 1848/2325] fix: discoverCommands() loads incorrect classname

---
 system/CLI/Commands.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/system/CLI/Commands.php b/system/CLI/Commands.php
index d153b3aa857a..2714db30bcf9 100644
--- a/system/CLI/Commands.php
+++ b/system/CLI/Commands.php
@@ -76,10 +76,6 @@ public function getCommands()
     /**
      * Discovers all commands in the framework and within user code,
      * and collects instances of them to work with.
-     *
-     * @TODO this approach (find qualified classname from path) causes error,
-     *      when using Composer autoloader.
-     *      See https://github.com/codeigniter4/CodeIgniter4/issues/5818
      */
     public function discoverCommands()
     {
@@ -100,9 +96,9 @@ public function discoverCommands()
         // Loop over each file checking to see if a command with that
         // alias exists in the class.
         foreach ($files as $file) {
-            $className = $locator->findQualifiedNameFromPath($file);
+            $className = $locator->getClassname($file);
 
-            if (empty($className) || ! class_exists($className)) {
+            if ($className === '' || ! class_exists($className)) {
                 continue;
             }
 

From 4c1dc38a75847a52e9efe2dab952cdcdbbc46ed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tuna=20=C3=87a=C4=9Flar=20G=C3=BCm=C3=BC=C5=9F?=
 <tunacaglargumus@gmail.com>
Date: Sat, 2 Apr 2022 13:58:12 +0300
Subject: [PATCH 1849/2325] wrong function name.

Needs to be orWhere(). There is no or_where in CI 4.
---
 user_guide_src/source/database/query_builder.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index d6e5b27aac36..5e05f0ce6b0b 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -804,7 +804,7 @@ Generates a **DELETE** SQL string and runs the query.
 .. literalinclude:: query_builder/093.php
 
 The first parameter is the where clause.
-You can also use the ``where()`` or ``or_where()`` methods instead of passing
+You can also use the ``where()`` or ``orWhere()`` methods instead of passing
 the data to the first parameter of the method:
 
 .. literalinclude:: query_builder/094.php

From de7c19c456bf944e61c9e32835097727cd5d79ef Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 2 Apr 2022 14:02:14 +0900
Subject: [PATCH 1850/2325] test: fix assertions

If we use Compoesr autoloader, the path would be like `/vendor/composer/../../app/Controllers/Home.php`.
---
 tests/system/Autoloader/AutoloaderTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php
index f9a56cae82db..82e0307affad 100644
--- a/tests/system/Autoloader/AutoloaderTest.php
+++ b/tests/system/Autoloader/AutoloaderTest.php
@@ -88,7 +88,7 @@ public function testServiceAutoLoaderFromShareInstances()
         // look for Home controller, as that should be in base repo
         $actual   = $autoloader->loadClass('App\Controllers\Home');
         $expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php';
-        $this->assertSame($expected, $actual);
+        $this->assertSame($expected, realpath($actual) ?: $actual);
     }
 
     public function testServiceAutoLoader()
@@ -99,7 +99,7 @@ public function testServiceAutoLoader()
         // look for Home controller, as that should be in base repo
         $actual   = $autoloader->loadClass('App\Controllers\Home');
         $expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php';
-        $this->assertSame($expected, $actual);
+        $this->assertSame($expected, realpath($actual) ?: $actual);
     }
 
     public function testExistingFile()

From 46b3de8aef4d74600235693a09a9052c476df731 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 2 Apr 2022 14:07:33 +0900
Subject: [PATCH 1851/2325] refactor: extract method

---
 system/Autoloader/Autoloader.php | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
index bfd535f856ca..7423fc235586 100644
--- a/system/Autoloader/Autoloader.php
+++ b/system/Autoloader/Autoloader.php
@@ -106,7 +106,8 @@ public function initialize(Autoload $config, Modules $modules)
 
         // Should we load through Composer's namespaces, also?
         if ($modules->discoverInComposer) {
-            $this->discoverComposerNamespaces();
+            $this->loadComposerClassmap();
+            $this->loadComposerNamespaces();
         }
 
         return $this;
@@ -296,10 +297,7 @@ public function sanitizeFilename(string $filename): string
         return trim($filename, '.-_');
     }
 
-    /**
-     * Locates autoload information from Composer, if available.
-     */
-    protected function discoverComposerNamespaces()
+    protected function loadComposerNamespaces()
     {
         if (! is_file(COMPOSER_PATH)) {
             return;
@@ -310,7 +308,6 @@ protected function discoverComposerNamespaces()
          */
         $composer = include COMPOSER_PATH;
         $paths    = $composer->getPrefixesPsr4();
-        $classes  = $composer->getClassMap();
 
         unset($composer);
 
@@ -327,6 +324,23 @@ protected function discoverComposerNamespaces()
         }
 
         $this->prefixes = array_merge($this->prefixes, $newPaths);
+    }
+
+    protected function loadComposerClassmap(): void
+    {
+        if (! is_file(COMPOSER_PATH)) {
+            return;
+        }
+
+        /**
+         * @var ClassLoader $composer
+         */
+        $composer = include COMPOSER_PATH;
+
+        $classes = $composer->getClassMap();
+
+        unset($composer);
+
         $this->classmap = array_merge($this->classmap, $classes);
     }
 }

From ceb9418bd5ea051fd0a71fb916cb90a399bb0bda Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 2 Apr 2022 14:17:41 +0900
Subject: [PATCH 1852/2325] refactor: move duplicated logic up

---
 system/Autoloader/Autoloader.php | 44 ++++++++++++--------------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
index 7423fc235586..88f3dd743470 100644
--- a/system/Autoloader/Autoloader.php
+++ b/system/Autoloader/Autoloader.php
@@ -104,10 +104,19 @@ public function initialize(Autoload $config, Modules $modules)
             $this->files = $config->files;
         }
 
-        // Should we load through Composer's namespaces, also?
-        if ($modules->discoverInComposer) {
-            $this->loadComposerClassmap();
-            $this->loadComposerNamespaces();
+        if (is_file(COMPOSER_PATH)) {
+            /**
+             * @var ClassLoader $composer
+             */
+            $composer = include COMPOSER_PATH;
+
+            // Should we load through Composer's namespaces, also?
+            if ($modules->discoverInComposer) {
+                $this->loadComposerClassmap($composer);
+                $this->loadComposerNamespaces($composer);
+            }
+
+            unset($composer);
         }
 
         return $this;
@@ -297,19 +306,9 @@ public function sanitizeFilename(string $filename): string
         return trim($filename, '.-_');
     }
 
-    protected function loadComposerNamespaces()
+    protected function loadComposerNamespaces(ClassLoader $composer): void
     {
-        if (! is_file(COMPOSER_PATH)) {
-            return;
-        }
-
-        /**
-         * @var ClassLoader $composer
-         */
-        $composer = include COMPOSER_PATH;
-        $paths    = $composer->getPrefixesPsr4();
-
-        unset($composer);
+        $paths = $composer->getPrefixesPsr4();
 
         // Get rid of CodeIgniter so we don't have duplicates
         if (isset($paths['CodeIgniter\\'])) {
@@ -326,21 +325,10 @@ protected function loadComposerNamespaces()
         $this->prefixes = array_merge($this->prefixes, $newPaths);
     }
 
-    protected function loadComposerClassmap(): void
+    protected function loadComposerClassmap(ClassLoader $composer): void
     {
-        if (! is_file(COMPOSER_PATH)) {
-            return;
-        }
-
-        /**
-         * @var ClassLoader $composer
-         */
-        $composer = include COMPOSER_PATH;
-
         $classes = $composer->getClassMap();
 
-        unset($composer);
-
         $this->classmap = array_merge($this->classmap, $classes);
     }
 }

From 954b647ddd7ac3df8f455a44b4cbfa13f6f68194 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 2 Apr 2022 14:18:22 +0900
Subject: [PATCH 1853/2325] fix: don't load Composer classmap if
 $discoverInComposer is false

Now it always loads and uses Composer classmap if it is available.
---
 system/Autoloader/Autoloader.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
index 88f3dd743470..f4c37b4d250e 100644
--- a/system/Autoloader/Autoloader.php
+++ b/system/Autoloader/Autoloader.php
@@ -110,9 +110,10 @@ public function initialize(Autoload $config, Modules $modules)
              */
             $composer = include COMPOSER_PATH;
 
+            $this->loadComposerClassmap($composer);
+
             // Should we load through Composer's namespaces, also?
             if ($modules->discoverInComposer) {
-                $this->loadComposerClassmap($composer);
                 $this->loadComposerNamespaces($composer);
             }
 

From 783835efddd6c383de74c42402380c95903f88f5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 2 Apr 2022 14:20:09 +0900
Subject: [PATCH 1854/2325] refactor: extract method

---
 system/Autoloader/Autoloader.php | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
index f4c37b4d250e..cca4a7d28f1e 100644
--- a/system/Autoloader/Autoloader.php
+++ b/system/Autoloader/Autoloader.php
@@ -105,22 +105,27 @@ public function initialize(Autoload $config, Modules $modules)
         }
 
         if (is_file(COMPOSER_PATH)) {
-            /**
-             * @var ClassLoader $composer
-             */
-            $composer = include COMPOSER_PATH;
+            $this->loadComposerInfo($modules);
+        }
 
-            $this->loadComposerClassmap($composer);
+        return $this;
+    }
 
-            // Should we load through Composer's namespaces, also?
-            if ($modules->discoverInComposer) {
-                $this->loadComposerNamespaces($composer);
-            }
+    protected function loadComposerInfo(Modules $modules): void
+    {
+        /**
+         * @var ClassLoader $composer
+         */
+        $composer = include COMPOSER_PATH;
+
+        $this->loadComposerClassmap($composer);
 
-            unset($composer);
+        // Should we load through Composer's namespaces, also?
+        if ($modules->discoverInComposer) {
+            $this->loadComposerNamespaces($composer);
         }
 
-        return $this;
+        unset($composer);
     }
 
     /**

From c179ed044558faa93d7ad05869b1e4c9b22069ca Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Apr 2022 08:01:39 +0900
Subject: [PATCH 1855/2325] refactor: restore discoverComposerNamespaces() and
 deprecate

---
 system/Autoloader/Autoloader.php | 36 ++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
index cca4a7d28f1e..7152f160c652 100644
--- a/system/Autoloader/Autoloader.php
+++ b/system/Autoloader/Autoloader.php
@@ -337,4 +337,40 @@ protected function loadComposerClassmap(ClassLoader $composer): void
 
         $this->classmap = array_merge($this->classmap, $classes);
     }
+
+    /**
+     * Locates autoload information from Composer, if available.
+     *
+     * @deprecated No longer used.
+     */
+    protected function discoverComposerNamespaces()
+    {
+        if (! is_file(COMPOSER_PATH)) {
+            return;
+        }
+
+        /**
+         * @var ClassLoader $composer
+         */
+        $composer = include COMPOSER_PATH;
+        $paths    = $composer->getPrefixesPsr4();
+        $classes  = $composer->getClassMap();
+
+        unset($composer);
+
+        // Get rid of CodeIgniter so we don't have duplicates
+        if (isset($paths['CodeIgniter\\'])) {
+            unset($paths['CodeIgniter\\']);
+        }
+
+        $newPaths = [];
+
+        foreach ($paths as $key => $value) {
+            // Composer stores namespaces with trailing slash. We don't.
+            $newPaths[rtrim($key, '\\ ')] = $value;
+        }
+
+        $this->prefixes = array_merge($this->prefixes, $newPaths);
+        $this->classmap = array_merge($this->classmap, $classes);
+    }
 }

From 577eefe25c4061e0a286b51969fc96ad177282b3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Apr 2022 08:03:15 +0900
Subject: [PATCH 1856/2325] refactor: make new methods private

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

diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
index 7152f160c652..520e669be685 100644
--- a/system/Autoloader/Autoloader.php
+++ b/system/Autoloader/Autoloader.php
@@ -111,7 +111,7 @@ public function initialize(Autoload $config, Modules $modules)
         return $this;
     }
 
-    protected function loadComposerInfo(Modules $modules): void
+    private function loadComposerInfo(Modules $modules): void
     {
         /**
          * @var ClassLoader $composer
@@ -312,7 +312,7 @@ public function sanitizeFilename(string $filename): string
         return trim($filename, '.-_');
     }
 
-    protected function loadComposerNamespaces(ClassLoader $composer): void
+    private function loadComposerNamespaces(ClassLoader $composer): void
     {
         $paths = $composer->getPrefixesPsr4();
 
@@ -331,7 +331,7 @@ protected function loadComposerNamespaces(ClassLoader $composer): void
         $this->prefixes = array_merge($this->prefixes, $newPaths);
     }
 
-    protected function loadComposerClassmap(ClassLoader $composer): void
+    private function loadComposerClassmap(ClassLoader $composer): void
     {
         $classes = $composer->getClassMap();
 

From c7e659fc367eefd76cb0680214880fb14eaa4585 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Apr 2022 08:13:44 +0900
Subject: [PATCH 1857/2325] docs: add changelog

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 465054262b41..99f980d6b35e 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -17,6 +17,7 @@ BREAKING
     - ``public/index.php``
     - ``spark``
 - The method signature of ``CodeIgniter\CLI\CommandRunner::_remap()`` has been changed to fix a bug.
+- The ``CodeIgniter\Autoloader\Autoloader::initialize()`` has changed the behavior to fix a bug. It used to use Composer classmap only when ``$modules->discoverInComposer`` is true. Now it always uses the Composer classmap if Composer is available.
 
 Enhancements
 ************
@@ -55,6 +56,7 @@ Deprecations
 - ``CodeIgniter\Log\Logger::cleanFilenames()`` and ``CodeIgniter\Test\TestLogger::cleanup()`` are both deprecated. Use the ``clean_path()`` function instead.
 - ``CodeIgniter\Router\Router::setDefaultController()`` is deprecated.
 - The constant ``SPARKED`` in **spark** is deprecated. Use the ``$context`` property in ``CodeIgniter\CodeIgniter`` instead.
+- ``CodeIgniter\Autoloader\Autoloader::discoverComposerNamespaces()`` is deprecated, and no longer used.
 
 Bugs Fixed
 **********

From c03df2ea180af20c82ad94a8a96e55b2bab35b15 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Apr 2022 09:10:11 +0900
Subject: [PATCH 1858/2325] docs: add missing `+`

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

diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index 752dcc489590..b431b9979602 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -458,7 +458,7 @@ While plugins will often consist of tag pairs, like shown above, they can also b
 Opening tags can also contain parameters that can customize how the plugin works. The parameters are represented as
 key/value pairs::
 
-    {+ foo bar=2 baz="x y" }
+    {+ foo bar=2 baz="x y" +}
 
 Parameters can also be single values::
 

From 53fb7ac06fd959077323bec40d9c4d596d21d853 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Apr 2022 09:10:40 +0900
Subject: [PATCH 1859/2325] docs: remove unnecessary line breaks in sample code

---
 user_guide_src/source/installation/upgrade_view_parser/001.php | 3 +--
 user_guide_src/source/outgoing/view_parser.rst                 | 3 +--
 user_guide_src/source/outgoing/view_parser/003.php             | 3 +--
 user_guide_src/source/outgoing/view_parser/006.php             | 3 +--
 user_guide_src/source/outgoing/view_parser/007.php             | 3 +--
 user_guide_src/source/outgoing/view_parser/008.php             | 3 +--
 user_guide_src/source/outgoing/view_parser/018.php             | 3 +--
 user_guide_src/source/outgoing/view_parser/019.php             | 3 +--
 user_guide_src/source/outgoing/view_parser/020.php             | 3 +--
 user_guide_src/source/outgoing/view_parser/021.php             | 3 +--
 10 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_view_parser/001.php b/user_guide_src/source/installation/upgrade_view_parser/001.php
index 6bef47ef69ec..27dc410b1708 100644
--- a/user_guide_src/source/installation/upgrade_view_parser/001.php
+++ b/user_guide_src/source/installation/upgrade_view_parser/001.php
@@ -7,5 +7,4 @@
     'blog_heading' => 'My Blog Heading',
 ];
 
-echo $parser->setData($data)
-    ->render('blog_template');
+echo $parser->setData($data)->render('blog_template');
diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index b431b9979602..6c6c2601b451 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -550,8 +550,7 @@ An example with the iteration controlled in the view::
             ['title' => 'Second Link', 'link' => '/second'],
         ]
     ];
-    echo $parser->setData($data)
-                ->renderString($template);
+    echo $parser->setData($data)->renderString($template);
 
 Result::
 
diff --git a/user_guide_src/source/outgoing/view_parser/003.php b/user_guide_src/source/outgoing/view_parser/003.php
index 1ee48b997ae6..da4ef088f6bd 100644
--- a/user_guide_src/source/outgoing/view_parser/003.php
+++ b/user_guide_src/source/outgoing/view_parser/003.php
@@ -5,5 +5,4 @@
     'blog_heading' => 'My Blog Heading',
 ];
 
-echo $parser->setData($data)
-    ->render('blog_template');
+echo $parser->setData($data)->render('blog_template');
diff --git a/user_guide_src/source/outgoing/view_parser/006.php b/user_guide_src/source/outgoing/view_parser/006.php
index 6b1409c46c1d..dfde61eec728 100644
--- a/user_guide_src/source/outgoing/view_parser/006.php
+++ b/user_guide_src/source/outgoing/view_parser/006.php
@@ -12,5 +12,4 @@
     ],
 ];
 
-echo $parser->setData($data)
-    ->render('blog_template');
+echo $parser->setData($data)->render('blog_template');
diff --git a/user_guide_src/source/outgoing/view_parser/007.php b/user_guide_src/source/outgoing/view_parser/007.php
index 032f9d55f268..b3ca937f711f 100644
--- a/user_guide_src/source/outgoing/view_parser/007.php
+++ b/user_guide_src/source/outgoing/view_parser/007.php
@@ -8,5 +8,4 @@
     'blog_entries' => $query->getResultArray(),
 ];
 
-echo $parser->setData($data)
-    ->render('blog_template');
+echo $parser->setData($data)->render('blog_template');
diff --git a/user_guide_src/source/outgoing/view_parser/008.php b/user_guide_src/source/outgoing/view_parser/008.php
index 62be126a407d..4b0a6215830e 100644
--- a/user_guide_src/source/outgoing/view_parser/008.php
+++ b/user_guide_src/source/outgoing/view_parser/008.php
@@ -9,5 +9,4 @@
     ],
 ];
 
-echo $parser->setData($data)
-    ->render('blog_template');
+echo $parser->setData($data)->render('blog_template');
diff --git a/user_guide_src/source/outgoing/view_parser/018.php b/user_guide_src/source/outgoing/view_parser/018.php
index 4e039f02a08c..0bb60828d691 100644
--- a/user_guide_src/source/outgoing/view_parser/018.php
+++ b/user_guide_src/source/outgoing/view_parser/018.php
@@ -6,6 +6,5 @@
     'firstname' => 'John',
     'lastname'  => 'Doe',
 ];
-echo $parser->setData($data)
-    ->renderString($template);
+echo $parser->setData($data)->renderString($template);
 // Result: Hello, John Doe
diff --git a/user_guide_src/source/outgoing/view_parser/019.php b/user_guide_src/source/outgoing/view_parser/019.php
index 16621ef2f190..a3cb80300299 100644
--- a/user_guide_src/source/outgoing/view_parser/019.php
+++ b/user_guide_src/source/outgoing/view_parser/019.php
@@ -6,6 +6,5 @@
     'firstname' => 'John',
     'lastname'  => 'Doe',
 ];
-echo $parser->setData($data)
-    ->renderString($template);
+echo $parser->setData($data)->renderString($template);
 // Result: Hello, John {initials} Doe
diff --git a/user_guide_src/source/outgoing/view_parser/020.php b/user_guide_src/source/outgoing/view_parser/020.php
index 9226793f280d..62256192019d 100644
--- a/user_guide_src/source/outgoing/view_parser/020.php
+++ b/user_guide_src/source/outgoing/view_parser/020.php
@@ -10,6 +10,5 @@
         ['degree' => 'PhD'],
     ],
 ];
-echo $parser->setData($data)
-    ->renderString($template);
+echo $parser->setData($data)->renderString($template);
 // Result: Hello, John Doe (Mr{degree} {/degrees})
diff --git a/user_guide_src/source/outgoing/view_parser/021.php b/user_guide_src/source/outgoing/view_parser/021.php
index 3c9982437a19..977b8b958140 100644
--- a/user_guide_src/source/outgoing/view_parser/021.php
+++ b/user_guide_src/source/outgoing/view_parser/021.php
@@ -15,5 +15,4 @@
 $data      = [
     'menuitems' => $temp,
 ];
-echo $parser->setData($data)
-    ->renderString($template2);
+echo $parser->setData($data)->renderString($template2);

From 71a7682d1eba5bad20109362e292479cf952f5b4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Apr 2022 09:13:15 +0900
Subject: [PATCH 1860/2325] docs: fix text decoration for variable

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

diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index 6c6c2601b451..e3908ec0a391 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -491,7 +491,7 @@ Registering a Plugin
 --------------------
 
 At its simplest, all you need to do to register a new plugin and make it ready for use is to add it to the
-**app/Config/View.php**, under the **$plugins** array. The key is the name of the plugin that is
+**app/Config/View.php**, under the ``$plugins`` array. The key is the name of the plugin that is
 used within the template file. The value is any valid PHP callable, including static class methods:
 
 .. literalinclude:: view_parser/014.php

From 931c6f43a7724446b9fcf8dbd13b782e0dd352c6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Apr 2022 09:20:31 +0900
Subject: [PATCH 1861/2325] docs: remove unsupported options `leftDelimiter`
 and `rightDelimiter`

---
 user_guide_src/source/outgoing/view_parser.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index e3908ec0a391..67ee0b7680eb 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -595,8 +595,6 @@ Class Reference
             - ``cache_name`` - the ID used to save/retrieve a cached view result; defaults to the viewpath
             - ``cascadeData`` - true if the data pairs in effect when a nested or loop substitution occurs should be propagated
             - ``saveData`` - true if the view data parameter should be retained for subsequent calls
-            - ``leftDelimiter`` - the left delimiter to use in pseudo-variable syntax
-            - ``rightDelimiter`` - the right delimiter to use in pseudo-variable syntax
 
         Any conditional substitutions are performed first, then remaining
         substitutions are performed for each data pair.

From 20194690313be9d7e7f60165808376baf49a12f9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Apr 2022 09:24:59 +0900
Subject: [PATCH 1862/2325] docs: rename variable name in sample code

Make the same name as other sample code.
---
 user_guide_src/source/outgoing/view_parser/024.php | 2 +-
 user_guide_src/source/outgoing/view_parser/025.php | 2 +-
 user_guide_src/source/outgoing/view_parser/026.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/outgoing/view_parser/024.php b/user_guide_src/source/outgoing/view_parser/024.php
index 42ddfa949331..17a0a477e756 100644
--- a/user_guide_src/source/outgoing/view_parser/024.php
+++ b/user_guide_src/source/outgoing/view_parser/024.php
@@ -1,3 +1,3 @@
 <?php
 
-$renderer->setData(['name' => 'George', 'position' => 'Boss']);
+$parser->setData(['name' => 'George', 'position' => 'Boss']);
diff --git a/user_guide_src/source/outgoing/view_parser/025.php b/user_guide_src/source/outgoing/view_parser/025.php
index 8fa85f4faa98..fe67fe17aeb4 100644
--- a/user_guide_src/source/outgoing/view_parser/025.php
+++ b/user_guide_src/source/outgoing/view_parser/025.php
@@ -1,3 +1,3 @@
 <?php
 
-$renderer->setVar('name', 'Joe', 'html');
+$parser->setVar('name', 'Joe', 'html');
diff --git a/user_guide_src/source/outgoing/view_parser/026.php b/user_guide_src/source/outgoing/view_parser/026.php
index 46cfd9afd818..a7efd14837f2 100644
--- a/user_guide_src/source/outgoing/view_parser/026.php
+++ b/user_guide_src/source/outgoing/view_parser/026.php
@@ -1,3 +1,3 @@
 <?php
 
-$renderer->setDelimiters('[', ']');
+$parser->setDelimiters('[', ']');

From 08d4dbecccf14847f098804edfa2987120668efe Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Apr 2022 09:29:10 +0900
Subject: [PATCH 1863/2325] docs: add setConditionalDelimiters() in Class
 Reference

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

diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index 67ee0b7680eb..c369e7a5a78b 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -652,3 +652,14 @@ Class Reference
         Override the substitution field delimiters:
 
         .. literalinclude:: view_parser/026.php
+
+    .. php:method:: setConditionalDelimiters($leftDelimiter = '{', $rightDelimiter = '}')
+
+        :param  string  $leftDelimiter: Left delimiter for conditionals
+        :param  string  $rightDelimiter: right delimiter for conditionals
+        :returns: The Renderer, for method chaining
+        :rtype: CodeIgniter\\View\\RendererInterface.
+
+        Override the conditional delimiters:
+
+        .. literalinclude:: view_parser/027.php

From bbea1665c368b235086a7b3cbbc5f462431e26f3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Apr 2022 09:32:27 +0900
Subject: [PATCH 1864/2325] docs: remove parameters of methods in text

No parameters make them easier to read.
---
 user_guide_src/source/outgoing/view_parser.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index c369e7a5a78b..f4239b320207 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -53,9 +53,9 @@ can instantiate it directly:
 .. literalinclude:: view_parser/002.php
 
 Then you can use any of the three standard rendering methods that it provides:
-``render(viewpath, options, save)``, ``setVar(name, value, context)`` and
-``setData(data, context)``. You will also be able to specify delimiters directly,
-through the ``setDelimiters(left, right)`` method.
+``render()``, ``setVar()`` and
+``setData()``. You will also be able to specify delimiters directly,
+through the ``setDelimiters()`` method.
 
 Using the ``Parser``, your view templates are processed only by the Parser
 itself, and not like a conventional view PHP script. PHP code in such a script

From faf39c2003bbb17c04957facf03d9300b0969424 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Apr 2022 09:36:29 +0900
Subject: [PATCH 1865/2325] docs: make text as a important note

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

diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index f4239b320207..b72388486eb6 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -57,11 +57,11 @@ Then you can use any of the three standard rendering methods that it provides:
 ``setData()``. You will also be able to specify delimiters directly,
 through the ``setDelimiters()`` method.
 
-Using the ``Parser``, your view templates are processed only by the Parser
-itself, and not like a conventional view PHP script. PHP code in such a script
-is ignored by the parser, and only substitutions are performed.
+.. important:: Using the ``Parser``, your view templates are processed only by the Parser
+    itself, and not like a conventional view PHP script. PHP code in such a script
+    is ignored by the parser, and only substitutions are performed.
 
-This is purposeful: view files with no PHP.
+    This is purposeful: view files with no PHP.
 
 What It Does
 ============

From d368c511299d7ca063e9cfa70f56761924129b7c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Apr 2022 09:44:45 +0900
Subject: [PATCH 1866/2325] docs: fix text decoration for filter

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

diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index b72388486eb6..50b4b4376707 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -336,7 +336,7 @@ Filters
 
 Any single variable substitution can have one or more filters applied to it to modify the way it is presented. These
 are not intended to drastically change the output, but provide ways to reuse the same variable data but with different
-presentations. The **esc** filter discussed above is one example. Dates are another common use case, where you might
+presentations. The ``esc`` filter discussed above is one example. Dates are another common use case, where you might
 need to format the same data differently in several sections on the same page.
 
 Filters are commands that come after the pseudo-variable name, and are separated by the pipe symbol, ``|``::

From b5423cc15a7f8471cc14d32ea7da22bc3ca821d9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Apr 2022 09:45:05 +0900
Subject: [PATCH 1867/2325] docs: add space between tags

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

diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index 50b4b4376707..961d8ea96c31 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -250,7 +250,7 @@ This example gives different results, depending on cascading:
 Preventing Parsing
 ==================
 
-You can specify portions of the page to not be parsed with the ``{noparse}{/noparse}`` tag pair. Anything in this
+You can specify portions of the page to not be parsed with the ``{noparse}`` ``{/noparse}`` tag pair. Anything in this
 section will stay exactly as it is, with no variable substitution, looping, etc, happening to the markup between the brackets.
 
 ::

From cf4d83d1e5d7e144a44d49e19892ac819d908c6c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Apr 2022 10:25:57 +0900
Subject: [PATCH 1868/2325] docs: add links to reference

---
 user_guide_src/source/tutorial/conclusion.rst   | 5 +++--
 user_guide_src/source/tutorial/news_section.rst | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/tutorial/conclusion.rst b/user_guide_src/source/tutorial/conclusion.rst
index afb38465904b..2a4f66264784 100644
--- a/user_guide_src/source/tutorial/conclusion.rst
+++ b/user_guide_src/source/tutorial/conclusion.rst
@@ -10,8 +10,9 @@ design patterns, which you can expand upon.
 Now that you've completed this tutorial, we recommend you check out the
 rest of the documentation. CodeIgniter is often praised because of its
 comprehensive documentation. Use this to your advantage and read the
-"Overview" and "General Topics" sections thoroughly. You should read
-the class and helper references when needed.
+:doc:`Overview </concepts/index>` and :doc:`/general/index`
+sections thoroughly. You should read
+the :doc:`Library </libraries/index>` and :doc:`/helpers/index` references when needed.
 
 Every intermediate PHP programmer should be able to get the hang of
 CodeIgniter within a few days.
diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
index a27902819265..aca19a25cad3 100644
--- a/user_guide_src/source/tutorial/news_section.rst
+++ b/user_guide_src/source/tutorial/news_section.rst
@@ -80,7 +80,7 @@ library. This will make the database class available through the
 Now that the database and a model have been set up, you'll need a method
 to get all of our posts from our database. To do this, the database
 abstraction layer that is included with CodeIgniter -
-:doc:`Query Builder <../database/query_builder>` - is used. This makes it
+:doc:`Query Builder <../database/query_builder>` - is used in the ``CodeIgnite\Model``. This makes it
 possible to write your 'queries' once and make them work on :doc:`all
 supported database systems <../intro/requirements>`. The Model class
 also allows you to easily work with the Query Builder and provides

From 3f480d453479b17a6d75cc0abadf3ded39c65e34 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Apr 2022 10:26:28 +0900
Subject: [PATCH 1869/2325] docs: update forum url and add slack url

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

diff --git a/user_guide_src/source/tutorial/conclusion.rst b/user_guide_src/source/tutorial/conclusion.rst
index 2a4f66264784..94b8ba5e3f2d 100644
--- a/user_guide_src/source/tutorial/conclusion.rst
+++ b/user_guide_src/source/tutorial/conclusion.rst
@@ -20,4 +20,5 @@ CodeIgniter within a few days.
 If you still have questions about the framework or your own CodeIgniter
 code, you can:
 
--  Check out our `forums <http://forum.codeigniter.com/>`_
+-  Check out our `Forum <https://forum.codeigniter.com/>`_
+-  Check out our `Slack <https://codeigniterchat.slack.com/>`_

From f58bac1954d5c189bf635309eb2a1ec6e8d5ed84 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Apr 2022 10:26:58 +0900
Subject: [PATCH 1870/2325] docs: remove unneeded `<?=` and `?>`

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

diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index 49ebc36c2bc3..a59124515a59 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -50,7 +50,7 @@ the slug from our title in the model. Create a new view at
 
 There are probably only three things here that look unfamiliar.
 
-The ``<?= session()->getFlashdata('error') ?>`` function is used to report
+The ``session()->getFlashdata('error')`` function is used to report
 errors related to CSRF protection.
 
 The ``service('validation')->listErrors()`` function is used to report

From 54d80bcd0727c9f10c5f7ebf2f98548131732402 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Apr 2022 10:27:26 +0900
Subject: [PATCH 1871/2325] docs: fix link to validation page

---
 user_guide_src/source/incoming/controllers.rst       | 2 ++
 user_guide_src/source/tutorial/create_news_items.rst | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 99c22b5a356d..c5a963c81fdd 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -61,6 +61,8 @@ modify this by passing the duration (in seconds) as the first parameter:
 
 .. note:: A number of :doc:`time-based constants </general/common_functions>` are always available for you to use, including ``YEAR``, ``MONTH``, and more.
 
+.. _controller-validate:
+
 Validating data
 ***************
 
diff --git a/user_guide_src/source/tutorial/create_news_items.rst b/user_guide_src/source/tutorial/create_news_items.rst
index a59124515a59..99d28abf3cdb 100644
--- a/user_guide_src/source/tutorial/create_news_items.rst
+++ b/user_guide_src/source/tutorial/create_news_items.rst
@@ -60,8 +60,8 @@ The ``csrf_field()`` function creates a hidden input with a CSRF token that help
 
 Go back to your ``News`` controller. You're going to do two things here,
 check whether the form was submitted and whether the submitted data
-passed the validation rules. You'll use the :doc:`form
-validation <../libraries/validation>` library to do this.
+passed the validation rules.
+You'll use the :ref:`validation method in Controller <controller-validate>` to do this.
 
 .. literalinclude:: create_news_items/002.php
 

From 149555ebd23d404ecf8684e52cb363365a7470ef Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Apr 2022 13:47:18 +0900
Subject: [PATCH 1872/2325] docs: replace echo with return

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

diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
index 668683995231..6fde0a671da7 100644
--- a/user_guide_src/source/tutorial/static_pages.rst
+++ b/user_guide_src/source/tutorial/static_pages.rst
@@ -24,7 +24,7 @@ displays the CodeIgniter welcome page.
 
 .. note:: There are two ``view()`` functions referred to in this tutorial.
     One is the class method created with ``public function view($page = 'home')``
-    and ``echo view('welcome_message')`` for displaying a view.
+    and ``return view('welcome_message')`` for displaying a view.
     Both are *technically* a function. But when you create a function in a class,
     it's called a method.
 

From 977eb2561db4108b6ed3dfe97541de150e9b6429 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 4 Apr 2022 08:35:49 +0900
Subject: [PATCH 1873/2325] docs: remove unneeded $data for view()

$saveData is true by default, so we don't need to pass $data more than once.
---
 user_guide_src/source/tutorial/news_section/004.php | 4 ++--
 user_guide_src/source/tutorial/news_section/006.php | 4 ++--
 user_guide_src/source/tutorial/static_pages/002.php | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/tutorial/news_section/004.php b/user_guide_src/source/tutorial/news_section/004.php
index b62562bfe351..9e823b6f7589 100644
--- a/user_guide_src/source/tutorial/news_section/004.php
+++ b/user_guide_src/source/tutorial/news_section/004.php
@@ -16,7 +16,7 @@ public function index()
         ];
 
         return view('templates/header', $data)
-            . view('news/overview', $data)
-            . view('templates/footer', $data);
+            . view('news/overview')
+            . view('templates/footer');
     }
 }
diff --git a/user_guide_src/source/tutorial/news_section/006.php b/user_guide_src/source/tutorial/news_section/006.php
index 8bfc123e43f7..94548ac9307f 100644
--- a/user_guide_src/source/tutorial/news_section/006.php
+++ b/user_guide_src/source/tutorial/news_section/006.php
@@ -19,7 +19,7 @@ public function view($slug = null)
         $data['title'] = $data['news']['title'];
 
         return view('templates/header', $data)
-            . view('news/view', $data)
-            . view('templates/footer', $data);
+            . view('news/view')
+            . view('templates/footer');
     }
 }
diff --git a/user_guide_src/source/tutorial/static_pages/002.php b/user_guide_src/source/tutorial/static_pages/002.php
index 9f80c4556a58..5c8ec102a5a1 100644
--- a/user_guide_src/source/tutorial/static_pages/002.php
+++ b/user_guide_src/source/tutorial/static_pages/002.php
@@ -14,7 +14,7 @@ public function view($page = 'home')
         $data['title'] = ucfirst($page); // Capitalize the first letter
 
         return view('templates/header', $data)
-            . view('pages/' . $page, $data)
-            . view('templates/footer', $data);
+            . view('pages/' . $page)
+            . view('templates/footer');
     }
 }

From e0569f673f0c119b620f37981bf90dd19d8390a1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 3 Apr 2022 14:19:58 +0900
Subject: [PATCH 1874/2325] docs: replace echo with return

echo() has side effects, so return is better.
---
 user_guide_src/source/cli/cli/001.php                 |  2 +-
 user_guide_src/source/incoming/controllers/008.php    |  2 +-
 user_guide_src/source/incoming/controllers/013.php    |  4 ++--
 user_guide_src/source/incoming/controllers/014.php    |  4 ++--
 .../source/installation/upgrade_controllers/001.php   |  2 +-
 .../source/installation/upgrade_file_upload/001.php   | 11 +++++------
 .../source/installation/upgrade_pagination/001.php    |  2 +-
 .../source/installation/upgrade_view_parser.rst       |  2 +-
 .../source/installation/upgrade_view_parser/001.php   |  2 +-
 user_guide_src/source/installation/upgrade_views.rst  |  4 ++--
 user_guide_src/source/libraries/pagination/002.php    |  2 +-
 user_guide_src/source/libraries/validation/001.php    |  6 +++---
 user_guide_src/source/outgoing/view_layouts/001.php   |  2 +-
 user_guide_src/source/outgoing/view_parser.rst        |  3 ++-
 user_guide_src/source/outgoing/view_parser/003.php    |  2 +-
 user_guide_src/source/outgoing/view_parser/004.php    |  2 +-
 user_guide_src/source/outgoing/view_parser/005.php    |  2 +-
 user_guide_src/source/outgoing/view_parser/006.php    |  2 +-
 user_guide_src/source/outgoing/view_parser/007.php    |  2 +-
 user_guide_src/source/outgoing/view_parser/008.php    |  2 +-
 user_guide_src/source/outgoing/view_parser/009.php    |  2 +-
 user_guide_src/source/outgoing/view_parser/010.php    |  6 ++++--
 user_guide_src/source/outgoing/view_parser/018.php    |  3 ++-
 user_guide_src/source/outgoing/view_parser/019.php    |  3 ++-
 user_guide_src/source/outgoing/view_parser/020.php    |  3 ++-
 user_guide_src/source/outgoing/view_parser/021.php    |  3 ++-
 user_guide_src/source/outgoing/view_parser/022.php    |  2 +-
 user_guide_src/source/outgoing/view_parser/023.php    |  2 +-
 user_guide_src/source/outgoing/views.rst              |  3 ---
 user_guide_src/source/outgoing/views/001.php          |  2 +-
 user_guide_src/source/outgoing/views/002.php          |  2 +-
 user_guide_src/source/outgoing/views/003.php          |  8 ++++----
 user_guide_src/source/outgoing/views/004.php          |  2 +-
 user_guide_src/source/outgoing/views/005.php          |  2 +-
 user_guide_src/source/outgoing/views/006.php          |  2 +-
 user_guide_src/source/outgoing/views/007.php          |  2 +-
 user_guide_src/source/outgoing/views/008.php          |  2 +-
 user_guide_src/source/outgoing/views/009.php          |  2 +-
 user_guide_src/source/outgoing/views/010.php          |  2 +-
 user_guide_src/source/outgoing/views/011.php          |  2 +-
 40 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/user_guide_src/source/cli/cli/001.php b/user_guide_src/source/cli/cli/001.php
index b407ee50b145..999a5482e4d6 100644
--- a/user_guide_src/source/cli/cli/001.php
+++ b/user_guide_src/source/cli/cli/001.php
@@ -8,6 +8,6 @@ class Tools extends Controller
 {
     public function message($to = 'World')
     {
-        echo "Hello {$to}!" . PHP_EOL;
+        return "Hello {$to}!" . PHP_EOL;
     }
 }
diff --git a/user_guide_src/source/incoming/controllers/008.php b/user_guide_src/source/incoming/controllers/008.php
index 926de1e9fbdf..3aa859567c44 100644
--- a/user_guide_src/source/incoming/controllers/008.php
+++ b/user_guide_src/source/incoming/controllers/008.php
@@ -6,6 +6,6 @@ class Helloworld extends BaseController
 {
     public function index()
     {
-        echo 'Hello World!';
+        return 'Hello World!';
     }
 }
diff --git a/user_guide_src/source/incoming/controllers/013.php b/user_guide_src/source/incoming/controllers/013.php
index e43c3e4f2b34..68d4450d4e3a 100644
--- a/user_guide_src/source/incoming/controllers/013.php
+++ b/user_guide_src/source/incoming/controllers/013.php
@@ -6,11 +6,11 @@ class Helloworld extends BaseController
 {
     public function index()
     {
-        echo 'Hello World!';
+        return 'Hello World!';
     }
 
     public function comment()
     {
-        echo 'I am not flat!';
+        return 'I am not flat!';
     }
 }
diff --git a/user_guide_src/source/incoming/controllers/014.php b/user_guide_src/source/incoming/controllers/014.php
index 319fd8471a7b..da295eb61836 100644
--- a/user_guide_src/source/incoming/controllers/014.php
+++ b/user_guide_src/source/incoming/controllers/014.php
@@ -6,7 +6,7 @@ class Products extends BaseController
 {
     public function shoes($sandals, $id)
     {
-        echo $sandals;
-        echo $id;
+        return $sandals
+            . $id;
     }
 }
diff --git a/user_guide_src/source/installation/upgrade_controllers/001.php b/user_guide_src/source/installation/upgrade_controllers/001.php
index 5f292b54d1b8..b90fe63c538f 100644
--- a/user_guide_src/source/installation/upgrade_controllers/001.php
+++ b/user_guide_src/source/installation/upgrade_controllers/001.php
@@ -6,6 +6,6 @@ class Helloworld extends BaseController
 {
     public function index($name)
     {
-        echo 'Hello ' . esc($name) . '!';
+        return 'Hello ' . esc($name) . '!';
     }
 }
diff --git a/user_guide_src/source/installation/upgrade_file_upload/001.php b/user_guide_src/source/installation/upgrade_file_upload/001.php
index 6a4e6c88e250..a8b727c29745 100644
--- a/user_guide_src/source/installation/upgrade_file_upload/001.php
+++ b/user_guide_src/source/installation/upgrade_file_upload/001.php
@@ -6,7 +6,7 @@ class Upload extends BaseController
 {
     public function index()
     {
-        echo view('upload_form', ['error' => ' ']);
+        return view('upload_form', ['error' => ' ']);
     }
 
     public function do_upload()
@@ -20,11 +20,10 @@ public function do_upload()
         $file = $this->request->getFile('userfile');
 
         if (! $path = $file->store()) {
-            echo view('upload_form', ['error' => 'upload failed']);
-        } else {
-            $data = ['upload_file_path' => $path];
-
-            echo view('upload_success', $data);
+            return view('upload_form', ['error' => 'upload failed']);
         }
+        $data = ['upload_file_path' => $path];
+
+        return view('upload_success', $data);
     }
 }
diff --git a/user_guide_src/source/installation/upgrade_pagination/001.php b/user_guide_src/source/installation/upgrade_pagination/001.php
index fa1b373a5fc6..62710360fca9 100644
--- a/user_guide_src/source/installation/upgrade_pagination/001.php
+++ b/user_guide_src/source/installation/upgrade_pagination/001.php
@@ -7,4 +7,4 @@
     'pager' => $model->pager,
 ];
 
-echo view('users/index', $data);
+return view('users/index', $data);
diff --git a/user_guide_src/source/installation/upgrade_view_parser.rst b/user_guide_src/source/installation/upgrade_view_parser.rst
index 55e86fb357a4..c58aeb8dd491 100644
--- a/user_guide_src/source/installation/upgrade_view_parser.rst
+++ b/user_guide_src/source/installation/upgrade_view_parser.rst
@@ -19,7 +19,7 @@ What has been changed
 Upgrade Guide
 =============
 1. Wherever you use the View Parser Library replace ``$this->load->library('parser');`` with ``$parser = service('parser');``.
-2. You have to change the render part in your controller from ``$this->parser->parse('blog_template', $data);`` to ``echo $parser->setData($data)->render('blog_template');``.
+2. You have to change the render part in your controller from ``$this->parser->parse('blog_template', $data);`` to ``return $parser->setData($data)->render('blog_template');``.
 
 Code Example
 ============
diff --git a/user_guide_src/source/installation/upgrade_view_parser/001.php b/user_guide_src/source/installation/upgrade_view_parser/001.php
index 27dc410b1708..9acf5e9449d8 100644
--- a/user_guide_src/source/installation/upgrade_view_parser/001.php
+++ b/user_guide_src/source/installation/upgrade_view_parser/001.php
@@ -7,4 +7,4 @@
     'blog_heading' => 'My Blog Heading',
 ];
 
-echo $parser->setData($data)->render('blog_template');
+return $parser->setData($data)->render('blog_template');
diff --git a/user_guide_src/source/installation/upgrade_views.rst b/user_guide_src/source/installation/upgrade_views.rst
index 8509705c76dc..29dcace6ee62 100644
--- a/user_guide_src/source/installation/upgrade_views.rst
+++ b/user_guide_src/source/installation/upgrade_views.rst
@@ -15,7 +15,7 @@ What has been changed
 =====================
 
 - Your views look much like before, but they are invoked differently ... instead of CI3's
-  ``$this->load->view(x);``, you can use ``echo view(x);``.
+  ``$this->load->view(x);``, you can use ``return view(x);``.
 - CI4 supports *View Cells* to build your response in pieces, and *View Layouts* for page layout.
 - The template parser is still there, and substantially enhanced.
 
@@ -24,7 +24,7 @@ Upgrade Guide
 
 1. First, move all views  to the folder **app/Views**
 2. Change the loading syntax of views in every script where you load views:
-    - from ``$this->load->view('directory_name/file_name')`` to ``echo view('directory_name/file_name');``
+    - from ``$this->load->view('directory_name/file_name')`` to ``return view('directory_name/file_name');``
     - from ``$content = $this->load->view('file', $data, TRUE);`` to ``$content = view('file', $data);``
 3. (optional) You can change the echo syntax in views from ``<?php echo $title; ?>`` to ``<?= $title ?>``
 
diff --git a/user_guide_src/source/libraries/pagination/002.php b/user_guide_src/source/libraries/pagination/002.php
index baaa8471111f..c8cd31ebec5c 100644
--- a/user_guide_src/source/libraries/pagination/002.php
+++ b/user_guide_src/source/libraries/pagination/002.php
@@ -15,6 +15,6 @@ public function index()
             'pager' => $model->pager,
         ];
 
-        echo view('users/index', $data);
+        return view('users/index', $data);
     }
 }
diff --git a/user_guide_src/source/libraries/validation/001.php b/user_guide_src/source/libraries/validation/001.php
index e52362c46cea..41d51f1b8a25 100644
--- a/user_guide_src/source/libraries/validation/001.php
+++ b/user_guide_src/source/libraries/validation/001.php
@@ -11,11 +11,11 @@ public function index()
         helper(['form', 'url']);
 
         if (! $this->validate([])) {
-            echo view('Signup', [
+            return view('Signup', [
                 'validation' => $this->validator,
             ]);
-        } else {
-            echo view('Success');
         }
+
+        return view('Success');
     }
 }
diff --git a/user_guide_src/source/outgoing/view_layouts/001.php b/user_guide_src/source/outgoing/view_layouts/001.php
index 2eed4c4f53dc..f6105365fa47 100644
--- a/user_guide_src/source/outgoing/view_layouts/001.php
+++ b/user_guide_src/source/outgoing/view_layouts/001.php
@@ -6,6 +6,6 @@ class MyController extends BaseController
 {
     public function index()
     {
-        echo view('some_view');
+        return view('some_view');
     }
 }
diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index 961d8ea96c31..c0705e7fa257 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -550,7 +550,8 @@ An example with the iteration controlled in the view::
             ['title' => 'Second Link', 'link' => '/second'],
         ]
     ];
-    echo $parser->setData($data)->renderString($template);
+
+    return $parser->setData($data)->renderString($template);
 
 Result::
 
diff --git a/user_guide_src/source/outgoing/view_parser/003.php b/user_guide_src/source/outgoing/view_parser/003.php
index da4ef088f6bd..90f3c88273fc 100644
--- a/user_guide_src/source/outgoing/view_parser/003.php
+++ b/user_guide_src/source/outgoing/view_parser/003.php
@@ -5,4 +5,4 @@
     'blog_heading' => 'My Blog Heading',
 ];
 
-echo $parser->setData($data)->render('blog_template');
+return $parser->setData($data)->render('blog_template');
diff --git a/user_guide_src/source/outgoing/view_parser/004.php b/user_guide_src/source/outgoing/view_parser/004.php
index 70862b585adc..643f541a5b3e 100644
--- a/user_guide_src/source/outgoing/view_parser/004.php
+++ b/user_guide_src/source/outgoing/view_parser/004.php
@@ -1,6 +1,6 @@
 <?php
 
-echo $parser->render('blog_template', [
+return $parser->render('blog_template', [
     'cache'      => HOUR,
     'cache_name' => 'something_unique',
 ]);
diff --git a/user_guide_src/source/outgoing/view_parser/005.php b/user_guide_src/source/outgoing/view_parser/005.php
index e77c54268648..e85e49db45a2 100644
--- a/user_guide_src/source/outgoing/view_parser/005.php
+++ b/user_guide_src/source/outgoing/view_parser/005.php
@@ -3,5 +3,5 @@
 $template = '<head><title>{blog_title}</title></head>';
 $data     = ['blog_title' => 'My ramblings'];
 
-echo $parser->setData($data)->renderString($template);
+return $parser->setData($data)->renderString($template);
 // Result: <head><title>My ramblings</title></head>
diff --git a/user_guide_src/source/outgoing/view_parser/006.php b/user_guide_src/source/outgoing/view_parser/006.php
index dfde61eec728..40d379aec2ea 100644
--- a/user_guide_src/source/outgoing/view_parser/006.php
+++ b/user_guide_src/source/outgoing/view_parser/006.php
@@ -12,4 +12,4 @@
     ],
 ];
 
-echo $parser->setData($data)->render('blog_template');
+return $parser->setData($data)->render('blog_template');
diff --git a/user_guide_src/source/outgoing/view_parser/007.php b/user_guide_src/source/outgoing/view_parser/007.php
index b3ca937f711f..5128ed3cbe4a 100644
--- a/user_guide_src/source/outgoing/view_parser/007.php
+++ b/user_guide_src/source/outgoing/view_parser/007.php
@@ -8,4 +8,4 @@
     'blog_entries' => $query->getResultArray(),
 ];
 
-echo $parser->setData($data)->render('blog_template');
+return $parser->setData($data)->render('blog_template');
diff --git a/user_guide_src/source/outgoing/view_parser/008.php b/user_guide_src/source/outgoing/view_parser/008.php
index 4b0a6215830e..8cac9bbbaa9d 100644
--- a/user_guide_src/source/outgoing/view_parser/008.php
+++ b/user_guide_src/source/outgoing/view_parser/008.php
@@ -9,4 +9,4 @@
     ],
 ];
 
-echo $parser->setData($data)->render('blog_template');
+return $parser->setData($data)->render('blog_template');
diff --git a/user_guide_src/source/outgoing/view_parser/009.php b/user_guide_src/source/outgoing/view_parser/009.php
index 6b112fdd6829..6f4b96e82274 100644
--- a/user_guide_src/source/outgoing/view_parser/009.php
+++ b/user_guide_src/source/outgoing/view_parser/009.php
@@ -7,5 +7,5 @@
     'location' => ['city' => 'Red City', 'planet' => 'Mars'],
 ];
 
-echo $parser->setData($data)->renderString($template);
+return $parser->setData($data)->renderString($template);
 // Result: George lives in Red City on Mars.
diff --git a/user_guide_src/source/outgoing/view_parser/010.php b/user_guide_src/source/outgoing/view_parser/010.php
index 7fcd5bafbfec..4eb11fd6d908 100644
--- a/user_guide_src/source/outgoing/view_parser/010.php
+++ b/user_guide_src/source/outgoing/view_parser/010.php
@@ -7,8 +7,10 @@
     'location' => ['city' => 'Red City', 'planet' => 'Mars'],
 ];
 
-echo $parser->setData($data)->renderString($template, ['cascadeData' => false]);
+return $parser->setData($data)->renderString($template, ['cascadeData' => false]);
 // Result: {name} lives in Red City on Mars.
 
-echo $parser->setData($data)->renderString($template, ['cascadeData' => true]);
+// or
+
+return $parser->setData($data)->renderString($template, ['cascadeData' => true]);
 // Result: George lives in Red City on Mars.
diff --git a/user_guide_src/source/outgoing/view_parser/018.php b/user_guide_src/source/outgoing/view_parser/018.php
index 0bb60828d691..5a88dd651c25 100644
--- a/user_guide_src/source/outgoing/view_parser/018.php
+++ b/user_guide_src/source/outgoing/view_parser/018.php
@@ -6,5 +6,6 @@
     'firstname' => 'John',
     'lastname'  => 'Doe',
 ];
-echo $parser->setData($data)->renderString($template);
+
+return $parser->setData($data)->renderString($template);
 // Result: Hello, John Doe
diff --git a/user_guide_src/source/outgoing/view_parser/019.php b/user_guide_src/source/outgoing/view_parser/019.php
index a3cb80300299..5f465be2296b 100644
--- a/user_guide_src/source/outgoing/view_parser/019.php
+++ b/user_guide_src/source/outgoing/view_parser/019.php
@@ -6,5 +6,6 @@
     'firstname' => 'John',
     'lastname'  => 'Doe',
 ];
-echo $parser->setData($data)->renderString($template);
+
+return $parser->setData($data)->renderString($template);
 // Result: Hello, John {initials} Doe
diff --git a/user_guide_src/source/outgoing/view_parser/020.php b/user_guide_src/source/outgoing/view_parser/020.php
index 62256192019d..fd072cbc0e5c 100644
--- a/user_guide_src/source/outgoing/view_parser/020.php
+++ b/user_guide_src/source/outgoing/view_parser/020.php
@@ -10,5 +10,6 @@
         ['degree' => 'PhD'],
     ],
 ];
-echo $parser->setData($data)->renderString($template);
+
+return $parser->setData($data)->renderString($template);
 // Result: Hello, John Doe (Mr{degree} {/degrees})
diff --git a/user_guide_src/source/outgoing/view_parser/021.php b/user_guide_src/source/outgoing/view_parser/021.php
index 977b8b958140..60fbb625da79 100644
--- a/user_guide_src/source/outgoing/view_parser/021.php
+++ b/user_guide_src/source/outgoing/view_parser/021.php
@@ -15,4 +15,5 @@
 $data      = [
     'menuitems' => $temp,
 ];
-echo $parser->setData($data)->renderString($template2);
+
+return $parser->setData($data)->renderString($template2);
diff --git a/user_guide_src/source/outgoing/view_parser/022.php b/user_guide_src/source/outgoing/view_parser/022.php
index 022450bb6fd6..1bdb256d92f1 100644
--- a/user_guide_src/source/outgoing/view_parser/022.php
+++ b/user_guide_src/source/outgoing/view_parser/022.php
@@ -1,3 +1,3 @@
 <?php
 
-echo $parser->render('myview');
+return $parser->render('myview');
diff --git a/user_guide_src/source/outgoing/view_parser/023.php b/user_guide_src/source/outgoing/view_parser/023.php
index 022450bb6fd6..1bdb256d92f1 100644
--- a/user_guide_src/source/outgoing/view_parser/023.php
+++ b/user_guide_src/source/outgoing/view_parser/023.php
@@ -1,3 +1,3 @@
 <?php
 
-echo $parser->render('myview');
+return $parser->render('myview');
diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst
index 55da9ed98a22..56f736f23545 100644
--- a/user_guide_src/source/outgoing/views.rst
+++ b/user_guide_src/source/outgoing/views.rst
@@ -51,9 +51,6 @@ If you visit your site using the URL you did earlier you should see your new vie
 
     example.com/index.php/blog/
 
-.. note:: While all of the examples show echo the view directly, you can also return the output from the view, instead,
-    and it will be appended to any captured output.
-
 Loading Multiple Views
 ======================
 
diff --git a/user_guide_src/source/outgoing/views/001.php b/user_guide_src/source/outgoing/views/001.php
index 90c817235bf5..c1b1ff23a6dd 100644
--- a/user_guide_src/source/outgoing/views/001.php
+++ b/user_guide_src/source/outgoing/views/001.php
@@ -1,3 +1,3 @@
 <?php
 
-echo view('name');
+return view('name');
diff --git a/user_guide_src/source/outgoing/views/002.php b/user_guide_src/source/outgoing/views/002.php
index 11a54b427208..dda8dc67f363 100644
--- a/user_guide_src/source/outgoing/views/002.php
+++ b/user_guide_src/source/outgoing/views/002.php
@@ -8,6 +8,6 @@ class Blog extends Controller
 {
     public function index()
     {
-        echo view('blog_view');
+        return view('blog_view');
     }
 }
diff --git a/user_guide_src/source/outgoing/views/003.php b/user_guide_src/source/outgoing/views/003.php
index 6feb85d6af25..29dd7c7f96f3 100644
--- a/user_guide_src/source/outgoing/views/003.php
+++ b/user_guide_src/source/outgoing/views/003.php
@@ -12,9 +12,9 @@ public function index()
             'page_title' => 'Your title',
         ];
 
-        echo view('header');
-        echo view('menu');
-        echo view('content', $data);
-        echo view('footer');
+        return view('header')
+            . view('menu')
+            . view('content', $data)
+            . view('footer');
     }
 }
diff --git a/user_guide_src/source/outgoing/views/004.php b/user_guide_src/source/outgoing/views/004.php
index d77e328657f3..7c665c263391 100644
--- a/user_guide_src/source/outgoing/views/004.php
+++ b/user_guide_src/source/outgoing/views/004.php
@@ -1,3 +1,3 @@
 <?php
 
-echo view('directory_name/file_name');
+return view('directory_name/file_name');
diff --git a/user_guide_src/source/outgoing/views/005.php b/user_guide_src/source/outgoing/views/005.php
index d5070aee9fe6..e9ad6a75d7b5 100644
--- a/user_guide_src/source/outgoing/views/005.php
+++ b/user_guide_src/source/outgoing/views/005.php
@@ -1,3 +1,3 @@
 <?php
 
-echo view('Example\Blog\Views\blog_view');
+return view('Example\Blog\Views\blog_view');
diff --git a/user_guide_src/source/outgoing/views/006.php b/user_guide_src/source/outgoing/views/006.php
index 98414c50db23..df46084d4f9b 100644
--- a/user_guide_src/source/outgoing/views/006.php
+++ b/user_guide_src/source/outgoing/views/006.php
@@ -1,4 +1,4 @@
 <?php
 
 // Cache the view for 60 seconds
-echo view('file_name', $data, ['cache' => 60]);
+return view('file_name', $data, ['cache' => 60]);
diff --git a/user_guide_src/source/outgoing/views/007.php b/user_guide_src/source/outgoing/views/007.php
index b1d22eb55260..1b020abbc5a5 100644
--- a/user_guide_src/source/outgoing/views/007.php
+++ b/user_guide_src/source/outgoing/views/007.php
@@ -1,4 +1,4 @@
 <?php
 
 // Cache the view for 60 seconds
-echo view('file_name', $data, ['cache' => 60, 'cache_name' => 'my_cached_view']);
+return view('file_name', $data, ['cache' => 60, 'cache_name' => 'my_cached_view']);
diff --git a/user_guide_src/source/outgoing/views/008.php b/user_guide_src/source/outgoing/views/008.php
index c9b2ab2f5bbd..8f3218c7029b 100644
--- a/user_guide_src/source/outgoing/views/008.php
+++ b/user_guide_src/source/outgoing/views/008.php
@@ -6,4 +6,4 @@
     'message' => 'My Message',
 ];
 
-echo view('blog_view', $data);
+return view('blog_view', $data);
diff --git a/user_guide_src/source/outgoing/views/009.php b/user_guide_src/source/outgoing/views/009.php
index 61963a40bbb2..008d1cf85d26 100644
--- a/user_guide_src/source/outgoing/views/009.php
+++ b/user_guide_src/source/outgoing/views/009.php
@@ -11,6 +11,6 @@ public function index()
         $data['title']   = 'My Real Title';
         $data['heading'] = 'My Real Heading';
 
-        echo view('blog_view', $data);
+        return view('blog_view', $data);
     }
 }
diff --git a/user_guide_src/source/outgoing/views/010.php b/user_guide_src/source/outgoing/views/010.php
index c7dda333df20..189b5dc9f190 100644
--- a/user_guide_src/source/outgoing/views/010.php
+++ b/user_guide_src/source/outgoing/views/010.php
@@ -6,4 +6,4 @@
     'message' => 'My Message',
 ];
 
-echo view('blog_view', $data, ['saveData' => true]);
+return view('blog_view', $data, ['saveData' => true]);
diff --git a/user_guide_src/source/outgoing/views/011.php b/user_guide_src/source/outgoing/views/011.php
index e3ddaeba2075..bb1a5fc21725 100644
--- a/user_guide_src/source/outgoing/views/011.php
+++ b/user_guide_src/source/outgoing/views/011.php
@@ -14,6 +14,6 @@ public function index()
             'heading'   => 'My Real Heading',
         ];
 
-        echo view('blog_view', $data);
+        return view('blog_view', $data);
     }
 }

From 76beb9d37b5f78ebcdc000ba00c9444a09cea72b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 4 Apr 2022 09:55:59 +0900
Subject: [PATCH 1875/2325] docs: fix header level

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

diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst
index 84860e65f5c3..ea9b9712fd39 100644
--- a/user_guide_src/source/concepts/services.rst
+++ b/user_guide_src/source/concepts/services.rst
@@ -40,7 +40,7 @@ error-resistant.
 .. note:: It is recommended to only create services within controllers. Other files, like models and libraries should have the dependencies either passed into the constructor or through a setter method.
 
 Convenience Functions
----------------------
+=====================
 
 Two functions have been provided for getting a service. These functions are always available.
 
@@ -110,7 +110,7 @@ within the class, and, if not, creates a new one. All of the factory methods pro
 .. literalinclude:: services/010.php
 
 Service Discovery
------------------
+=================
 
 CodeIgniter can automatically discover any Config\\Services.php files you may have created within any defined namespaces.
 This allows simple use of any module Services files. In order for custom Services files to be discovered, they must

From 1944a69dad76ca7bfc925640ae664fcef396834f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 4 Apr 2022 09:56:57 +0900
Subject: [PATCH 1876/2325] docs: use full classname in sample code

Relative classname might not work.
---
 user_guide_src/source/concepts/services/012.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/concepts/services/012.php b/user_guide_src/source/concepts/services/012.php
index cc4b63b4e20c..bd3c89f971ec 100644
--- a/user_guide_src/source/concepts/services/012.php
+++ b/user_guide_src/source/concepts/services/012.php
@@ -1,3 +1,3 @@
 <?php
 
-$postManager = Config\Services::postManager();
+$postManager = \Config\Services::postManager();

From a7dac5e5567e00ee127248be5b33ab028e5eb906 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 4 Apr 2022 09:58:24 +0900
Subject: [PATCH 1877/2325] docs: add / at the end of the path

The default value ends with /.
---
 user_guide_src/source/concepts/services/009.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/concepts/services/009.php b/user_guide_src/source/concepts/services/009.php
index 1bdf73954e16..78e4d7c74caf 100644
--- a/user_guide_src/source/concepts/services/009.php
+++ b/user_guide_src/source/concepts/services/009.php
@@ -1,3 +1,3 @@
 <?php
 
-$renderer = \Config\Services::renderer('/shared/views');
+$renderer = \Config\Services::renderer('/shared/views/');

From 5a97137c20077055316e11beb57c4f180efa8a27 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 4 Apr 2022 10:00:13 +0900
Subject: [PATCH 1878/2325] docs: fix text decoration, etc.

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

diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst
index ea9b9712fd39..b5678c024bc8 100644
--- a/user_guide_src/source/concepts/services.rst
+++ b/user_guide_src/source/concepts/services.rst
@@ -75,7 +75,7 @@ create a new class that implements the ``RouterCollectionInterface``:
 
 .. literalinclude:: services/006.php
 
-Finally, modify **/app/Config/Services.php** to create a new instance of ``MyRouter``
+Finally, modify **app/Config/Services.php** to create a new instance of ``MyRouter``
 instead of ``CodeIgniter\Router\RouterCollection``:
 
 .. literalinclude:: services/007.php
@@ -87,7 +87,7 @@ In some instances, you will want the option to pass a setting to the class durin
 Since the services file is a very simple class, it is easy to make this work.
 
 A good example is the ``renderer`` service. By default, we want this class to be able
-to find the views at ``APPPATH.views/``. We want the developer to have the option of
+to find the views at ``APPPATH . views/``. We want the developer to have the option of
 changing that path, though, if their needs require it. So the class accepts the ``$viewPath``
 as a constructor parameter. The service method looks like this:
 
@@ -112,19 +112,19 @@ within the class, and, if not, creates a new one. All of the factory methods pro
 Service Discovery
 =================
 
-CodeIgniter can automatically discover any Config\\Services.php files you may have created within any defined namespaces.
+CodeIgniter can automatically discover any **Config/Services.php** files you may have created within any defined namespaces.
 This allows simple use of any module Services files. In order for custom Services files to be discovered, they must
 meet these requirements:
 
-- Its namespace must be defined in ``Config\Autoload.php``
-- Inside the namespace, the file must be found at ``Config\Services.php``
+- Its namespace must be defined in **app/Config/Autoload.php**
+- Inside the namespace, the file must be found at **Config/Services.php**
 - It must extend ``CodeIgniter\Config\BaseService``
 
 A small example should clarify this.
 
-Imagine that you've created a new directory, ``Blog`` in your root directory. This will hold a **blog module** with controllers,
+Imagine that you've created a new directory, **Blog** in your project root directory. This will hold a **Blog module** with controllers,
 models, etc, and you'd like to make some of the classes available as a service. The first step is to create a new file:
-``Blog\Config\Services.php``. The skeleton of the file should be:
+**Blog/Config/Services.php**. The skeleton of the file should be:
 
 .. literalinclude:: services/011.php
 

From 31720766b8049ae7dee5471911334338fc81f7d5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 4 Apr 2022 10:43:28 +0900
Subject: [PATCH 1879/2325] docs: add headings

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

diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst
index b5678c024bc8..3539c16c7420 100644
--- a/user_guide_src/source/concepts/services.rst
+++ b/user_guide_src/source/concepts/services.rst
@@ -44,6 +44,9 @@ Convenience Functions
 
 Two functions have been provided for getting a service. These functions are always available.
 
+service()
+---------
+
 The first is ``service()`` which returns a new instance of the requested service. The only
 required parameter is the service name. This is the same as the method name within the Services
 file always returns a SHARED instance of the class, so calling the function multiple times should
@@ -55,6 +58,9 @@ If the creation method requires additional parameters, they can be passed after
 
 .. literalinclude:: services/004.php
 
+single_service()
+----------------
+
 The second function, ``single_service()`` works just like ``service()`` but returns a new instance of
 the class:
 

From f00e952e346b47d827ecab149b70daf4b3e03e45 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 4 Apr 2022 10:52:07 +0900
Subject: [PATCH 1880/2325] docs: add sample code

---
 user_guide_src/source/concepts/services/003.php | 3 +++
 user_guide_src/source/concepts/services/004.php | 3 +++
 user_guide_src/source/concepts/services/005.php | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/user_guide_src/source/concepts/services/003.php b/user_guide_src/source/concepts/services/003.php
index ebbd1d89c30d..a13e8ebf1696 100644
--- a/user_guide_src/source/concepts/services/003.php
+++ b/user_guide_src/source/concepts/services/003.php
@@ -1,3 +1,6 @@
 <?php
 
 $logger = service('logger');
+
+// The code above is the same as the code below.
+$logger = \Config\Services::logger();
diff --git a/user_guide_src/source/concepts/services/004.php b/user_guide_src/source/concepts/services/004.php
index 2e044fe27625..04f7670a0d2c 100644
--- a/user_guide_src/source/concepts/services/004.php
+++ b/user_guide_src/source/concepts/services/004.php
@@ -1,3 +1,6 @@
 <?php
 
 $renderer = service('renderer', APPPATH . 'views/');
+
+// The code above is the same as the code below.
+$renderer = \Config\Services::renderer(APPPATH . 'views/');
diff --git a/user_guide_src/source/concepts/services/005.php b/user_guide_src/source/concepts/services/005.php
index 8f2bcf566ce2..827a8a6c0707 100644
--- a/user_guide_src/source/concepts/services/005.php
+++ b/user_guide_src/source/concepts/services/005.php
@@ -1,3 +1,6 @@
 <?php
 
 $logger = single_service('logger');
+
+// The code above is the same as the code below.
+$logger = \Config\Services::logger(false);

From 82e59e6dd5e854619ac0c6afdde57363107cf59f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 4 Apr 2022 11:08:03 +0900
Subject: [PATCH 1881/2325] docs: add What is Services? and Why use Services?

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

diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst
index 3539c16c7420..b5747e4a913a 100644
--- a/user_guide_src/source/concepts/services.rst
+++ b/user_guide_src/source/concepts/services.rst
@@ -9,10 +9,19 @@ Services
 Introduction
 ============
 
+What is Services?
+-----------------
+
+The **Services** in CodeIgniter 4 provide the functionality to create and share new class instances.
+It is implemented as the ``Config\Services`` class.
+
 All of the core classes within CodeIgniter are provided as "services". This simply means that, instead
 of hard-coding a class name to load, the classes to call are defined within a very simple
 configuration file. This file acts as a type of factory to create new instances of the required class.
 
+Why use Services?
+-----------------
+
 A quick example will probably make things clearer, so imagine that you need to pull in an instance
 of the Timer class. The simplest method would simply be to create a new instance of that class:
 

From 11e97ad12b8cd3c0181c90d1d9682d8b35f87b25 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 4 Apr 2022 11:10:44 +0900
Subject: [PATCH 1882/2325] docs: fix heading marks

---
 user_guide_src/source/concepts/services.rst | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst
index b5747e4a913a..2ede82c668ac 100644
--- a/user_guide_src/source/concepts/services.rst
+++ b/user_guide_src/source/concepts/services.rst
@@ -7,10 +7,10 @@ Services
     :depth: 2
 
 Introduction
-============
+************
 
 What is Services?
------------------
+=================
 
 The **Services** in CodeIgniter 4 provide the functionality to create and share new class instances.
 It is implemented as the ``Config\Services`` class.
@@ -20,7 +20,7 @@ of hard-coding a class name to load, the classes to call are defined within a ve
 configuration file. This file acts as a type of factory to create new instances of the required class.
 
 Why use Services?
------------------
+=================
 
 A quick example will probably make things clearer, so imagine that you need to pull in an instance
 of the Timer class. The simplest method would simply be to create a new instance of that class:
@@ -49,12 +49,12 @@ error-resistant.
 .. note:: It is recommended to only create services within controllers. Other files, like models and libraries should have the dependencies either passed into the constructor or through a setter method.
 
 Convenience Functions
-=====================
+*********************
 
 Two functions have been provided for getting a service. These functions are always available.
 
 service()
----------
+=========
 
 The first is ``service()`` which returns a new instance of the requested service. The only
 required parameter is the service name. This is the same as the method name within the Services
@@ -68,7 +68,7 @@ If the creation method requires additional parameters, they can be passed after
 .. literalinclude:: services/004.php
 
 single_service()
-----------------
+================
 
 The second function, ``single_service()`` works just like ``service()`` but returns a new instance of
 the class:
@@ -76,7 +76,7 @@ the class:
 .. literalinclude:: services/005.php
 
 Defining Services
-=================
+*****************
 
 To make services work well, you have to be able to rely on each class having a constant API, or
 `interface <https://www.php.net/manual/en/language.oop5.interfaces.php>`_, to use. Almost all of
@@ -96,7 +96,7 @@ instead of ``CodeIgniter\Router\RouterCollection``:
 .. literalinclude:: services/007.php
 
 Allowing Parameters
--------------------
+===================
 
 In some instances, you will want the option to pass a setting to the class during instantiation.
 Since the services file is a very simple class, it is easy to make this work.
@@ -114,7 +114,7 @@ the path it uses:
 .. literalinclude:: services/009.php
 
 Shared Classes
------------------
+==============
 
 There are occasions where you need to require that only a single instance of a service
 is created. This is easily handled with the ``getSharedInstance()`` method that is called from within the
@@ -125,7 +125,7 @@ within the class, and, if not, creates a new one. All of the factory methods pro
 .. literalinclude:: services/010.php
 
 Service Discovery
-=================
+*****************
 
 CodeIgniter can automatically discover any **Config/Services.php** files you may have created within any defined namespaces.
 This allows simple use of any module Services files. In order for custom Services files to be discovered, they must

From 5fef49fe2ed5cf444e8d2c9dcb6ee0b2391a1db4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 4 Apr 2022 11:26:26 +0900
Subject: [PATCH 1883/2325] docs: add How to Get a Service

---
 user_guide_src/source/concepts/services.rst   | 19 ++++++++++++++++---
 .../source/concepts/services/013.php          |  3 +++
 .../source/concepts/services/014.php          |  3 +++
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 user_guide_src/source/concepts/services/013.php
 create mode 100644 user_guide_src/source/concepts/services/014.php

diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst
index 2ede82c668ac..b69a4e4c4f85 100644
--- a/user_guide_src/source/concepts/services.rst
+++ b/user_guide_src/source/concepts/services.rst
@@ -48,13 +48,26 @@ error-resistant.
 
 .. note:: It is recommended to only create services within controllers. Other files, like models and libraries should have the dependencies either passed into the constructor or through a setter method.
 
+How to Get a Service
+********************
+
+As many CodeIgniter classes are provided as services, you can get them like the following:
+
+.. literalinclude:: services/013.php
+
+The ``$typography`` is an instance of the Typography class, and if you call ``\Config\Services::typography()`` again, you will get the exactly same instance.
+
+If you want to get a new instance of the Typography class, you need to pass ``false`` to the argument ``$getShared``:
+
+.. literalinclude:: services/014.php
+
 Convenience Functions
-*********************
+=====================
 
 Two functions have been provided for getting a service. These functions are always available.
 
 service()
-=========
+---------
 
 The first is ``service()`` which returns a new instance of the requested service. The only
 required parameter is the service name. This is the same as the method name within the Services
@@ -68,7 +81,7 @@ If the creation method requires additional parameters, they can be passed after
 .. literalinclude:: services/004.php
 
 single_service()
-================
+----------------
 
 The second function, ``single_service()`` works just like ``service()`` but returns a new instance of
 the class:
diff --git a/user_guide_src/source/concepts/services/013.php b/user_guide_src/source/concepts/services/013.php
new file mode 100644
index 000000000000..0c82ed0e95fa
--- /dev/null
+++ b/user_guide_src/source/concepts/services/013.php
@@ -0,0 +1,3 @@
+<?php
+
+$typography = \Config\Services::typography();
diff --git a/user_guide_src/source/concepts/services/014.php b/user_guide_src/source/concepts/services/014.php
new file mode 100644
index 000000000000..ce012f44a65b
--- /dev/null
+++ b/user_guide_src/source/concepts/services/014.php
@@ -0,0 +1,3 @@
+<?php
+
+$typography = \Config\Services::typography(false);

From e9e0bc1692e5a25f727dd52d6f92fcd6f83c4a0b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 4 Apr 2022 12:36:06 +0900
Subject: [PATCH 1884/2325] docs: add Convenience Functions

---
 user_guide_src/source/concepts/factories.rst  | 19 +++++++++++++++++++
 .../source/concepts/factories/008.php         |  6 ++++++
 .../source/concepts/factories/009.php         |  6 ++++++
 3 files changed, 31 insertions(+)
 create mode 100644 user_guide_src/source/concepts/factories/008.php
 create mode 100644 user_guide_src/source/concepts/factories/009.php

diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst
index 2ddab73f2216..05dd7559da03 100644
--- a/user_guide_src/source/concepts/factories.rst
+++ b/user_guide_src/source/concepts/factories.rst
@@ -35,6 +35,25 @@ you get back the instance as before:
 
 .. literalinclude:: factories/003.php
 
+Convenience Functions
+=====================
+
+Two functions for short cut of the Factories have been provided. These functions are always available.
+
+config()
+--------
+
+The first is ``config()`` which returns a new instance of a Config class. The only required parameter is the class name:
+
+.. literalinclude:: factories/008.php
+
+model()
+--------
+
+The second function, ``model()`` returns a new instance of a Model class. The only required parameter is the class name:
+
+.. literalinclude:: factories/009.php
+
 Factory Parameters
 ==================
 
diff --git a/user_guide_src/source/concepts/factories/008.php b/user_guide_src/source/concepts/factories/008.php
new file mode 100644
index 000000000000..866daa36acb2
--- /dev/null
+++ b/user_guide_src/source/concepts/factories/008.php
@@ -0,0 +1,6 @@
+<?php
+
+$appConfig = config('App');
+
+// The code above is the same as the code below.
+$appConfig = \CodeIgniter\Config\Factories::config('App');
diff --git a/user_guide_src/source/concepts/factories/009.php b/user_guide_src/source/concepts/factories/009.php
new file mode 100644
index 000000000000..7ca5f31baada
--- /dev/null
+++ b/user_guide_src/source/concepts/factories/009.php
@@ -0,0 +1,6 @@
+<?php
+
+$user = model('UserModel');
+
+// The code above is the same as the code below.
+$user = \CodeIgniter\Config\Factories::models('UserModel');

From 99e5e0a2fb7597adb05dfad75df28b47eaabae06 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 4 Apr 2022 12:37:48 +0900
Subject: [PATCH 1885/2325] docs: add What is Factories?

---
 user_guide_src/source/concepts/factories.rst | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst
index 05dd7559da03..f04317174273 100644
--- a/user_guide_src/source/concepts/factories.rst
+++ b/user_guide_src/source/concepts/factories.rst
@@ -9,8 +9,13 @@ Factories
 Introduction
 ============
 
-Like ``Services``, ``Factories`` are an extension of autoloading that helps keep your code
-concise yet optimal, without having to pass around object instances between classes. At its
+What is Factories?
+------------------
+
+Like :doc:`./services`, **Factories** are an extension of autoloading that helps keep your code
+concise yet optimal, without having to pass around object instances between classes.
+
+At its
 simplest, Factories provide a common way to create a class instance and access it from
 anywhere. This is a great way to reuse object states and reduce memory load from keeping
 multiple instances loaded across your app.

From c0884be3ff9b983318a2f9262cc3828f860f69b4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 4 Apr 2022 13:44:20 +0900
Subject: [PATCH 1886/2325] docs: add explanation about Differences from
 Services and preferApp behavior

---
 user_guide_src/source/concepts/factories.rst  | 46 +++++++++++++++----
 .../source/concepts/factories/002.php         |  2 +-
 .../source/concepts/factories/003.php         |  2 +-
 .../source/concepts/factories/010.php         |  3 ++
 4 files changed, 42 insertions(+), 11 deletions(-)
 create mode 100644 user_guide_src/source/concepts/factories/010.php

diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst
index f04317174273..2e23e448a8f9 100644
--- a/user_guide_src/source/concepts/factories.rst
+++ b/user_guide_src/source/concepts/factories.rst
@@ -20,14 +20,32 @@ simplest, Factories provide a common way to create a class instance and access i
 anywhere. This is a great way to reuse object states and reduce memory load from keeping
 multiple instances loaded across your app.
 
-Anything can be loaded by Factories, but the best examples are those classes that are used
+Any class can be loaded by Factories, but the best examples are those classes that are used
 to work on or transmit common data. The framework itself uses Factories internally, e.g., to
 make sure the correct configuration is loaded when using the ``Config`` class.
 
-Take a look at ``Models`` as an example. You can access the Factory specific to ``Models``
-by using the magic static method of the Factories class, ``Factories::models()``. Because of
-the common path structure for namespaces and folders, Factories know that the model files
-and classes are found within **Models**, so you can request a model by its shorthand base name:
+Differences from Services
+-------------------------
+
+Factories require a concrete class name to instantiate, and do not have code to create instances.
+
+So Factories are not good for creating complex instance that needs many dependencies,
+and cannot change the class of the instance to be returned.
+
+On the other hand, Services have code to create instances, so it can create a complex instance
+that needs other services or class instances. When you get a service, Services require a service name,
+not a class name, so the returned instance can be changed without changing the client code.
+
+Example
+-------
+
+Take a look at **Models** as an example. You can access the Factory specific to Models
+by using the magic static method of the Factories class, ``Factories::models()``.
+
+By default, Factories first searches in the ``App`` namespace for the path corresponding to the magic static method name.
+``Factories::models()`` searches the path **Models/**.
+
+In the following code, if you have ``App\Models\UserModel``, the instance will be returned:
 
 .. literalinclude:: factories/001.php
 
@@ -35,7 +53,17 @@ Or you could also request a specific class:
 
 .. literalinclude:: factories/002.php
 
-Next time you ask for the same class anywhere in your code, ``Factories`` will be sure
+If you have only ``Blog\Models\UserModel``, the instance will be returned.
+But if you have both ``App\Models\UserModel`` and ``Blog\Models\UserModel``,
+The instance of ``App\Models\UserModel`` will be returned.
+
+If you want to get ``Blog\Models\UserModel``, you need the option ``preferApp``:
+
+.. literalinclude:: factories/010.php
+
+See :ref:`factories-options` for the details.
+
+Next time you ask for the same class anywhere in your code, Factories will be sure
 you get back the instance as before:
 
 .. literalinclude:: factories/003.php
@@ -112,13 +140,13 @@ Configurations
 
 To set default component options, create a new Config files at **app/Config/Factory.php**
 that supplies options as an array property that matches the name of the component. For example,
-if you wanted to ensure that all Filters used by your app were valid framework instances,
-your **Factory.php** file might look like this:
+if you wanted to ensure that all **Filters** used by your app were valid framework instances,
+your **app/Config/Factory.php** file might look like this:
 
 .. literalinclude:: factories/005.php
 
 This would prevent conflict of an unrelated third-party module which happened to have an
-unrelated "Filters" path in its namespace.
+unrelated ``Filters`` path in its namespace.
 
 setOptions Method
 -----------------
diff --git a/user_guide_src/source/concepts/factories/002.php b/user_guide_src/source/concepts/factories/002.php
index cbc19d8b2730..6a56bbe7a374 100644
--- a/user_guide_src/source/concepts/factories/002.php
+++ b/user_guide_src/source/concepts/factories/002.php
@@ -1,3 +1,3 @@
 <?php
 
-$widgets = Factories::models('Some\Namespace\Models\WidgetModel');
+$users = Factories::models('Blog\Models\UserModel');
diff --git a/user_guide_src/source/concepts/factories/003.php b/user_guide_src/source/concepts/factories/003.php
index 5b34b3ff4fcd..44d3b06c55f6 100644
--- a/user_guide_src/source/concepts/factories/003.php
+++ b/user_guide_src/source/concepts/factories/003.php
@@ -4,7 +4,7 @@ class SomeOtherClass
 {
     public function someFunction()
     {
-        $widgets = Factories::models('WidgetModel');
+        $users = Factories::models('UserModel');
 
         // ...
     }
diff --git a/user_guide_src/source/concepts/factories/010.php b/user_guide_src/source/concepts/factories/010.php
new file mode 100644
index 000000000000..20df61e3b397
--- /dev/null
+++ b/user_guide_src/source/concepts/factories/010.php
@@ -0,0 +1,3 @@
+<?php
+
+$widgets = Factories::models('Blog\Models\UserModel', ['preferApp' => false]);

From 221d484dd012db99371b0d7819bded4dc043bccc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 4 Apr 2022 09:23:08 +0900
Subject: [PATCH 1887/2325] docs: fix Parser saveData description

The default value for $saveData is null, and Config\View::$saveData (true by default) will be set.
---
 user_guide_src/source/outgoing/view_parser.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/outgoing/view_parser.rst b/user_guide_src/source/outgoing/view_parser.rst
index c0705e7fa257..3cefd845de95 100644
--- a/user_guide_src/source/outgoing/view_parser.rst
+++ b/user_guide_src/source/outgoing/view_parser.rst
@@ -106,7 +106,7 @@ Several options can be passed to the ``render()`` or ``renderString()`` methods.
 -   ``cache_name`` - the ID used to save/retrieve a cached view result; defaults to the viewpath;
     ignored for renderString()
 -   ``saveData`` - true if the view data parameters should be retained for subsequent calls;
-    default is **false**
+    default is **true**
 -   ``cascadeData`` - true if pseudo-variable settings should be passed on to nested
     substitutions; default is **true**
 
@@ -578,7 +578,7 @@ Class Reference
 
 .. php:class:: CodeIgniter\\View\\Parser
 
-    .. php:method:: render($view[, $options[, $saveData = false]])
+    .. php:method:: render($view[, $options[, $saveData]])
 
         :param  string  $view: File name of the view source
         :param  array   $options: Array of options, as key/value pairs
@@ -600,7 +600,7 @@ Class Reference
         Any conditional substitutions are performed first, then remaining
         substitutions are performed for each data pair.
 
-    .. php:method:: renderString($template[, $options[, $saveData = false]])
+    .. php:method:: renderString($template[, $options[, $saveData]])
 
         :param  string  $template: View source provided as a string
         :param  array   $options: Array of options, as key/value pairs

From b95708ed0600e4eddff4dd849869594931930479 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 4 Apr 2022 09:28:30 +0900
Subject: [PATCH 1888/2325] docs: fix View saveData description

The default is true.
---
 user_guide_src/source/outgoing/views.rst     | 17 +++++++++++------
 user_guide_src/source/outgoing/views/010.php |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst
index 56f736f23545..903f1fef4727 100644
--- a/user_guide_src/source/outgoing/views.rst
+++ b/user_guide_src/source/outgoing/views.rst
@@ -123,15 +123,20 @@ Now open your view file and change the text to variables that correspond to the
 
 Then load the page at the URL you've been using and you should see the variables replaced.
 
-The data passed in is only available during one call to `view`. If you call the function multiple times
-in a single request, you will have to pass the desired data to each view. This keeps any data from "bleeding" into
-other views, potentially causing issues. If you would prefer the data to persist, you can pass the `saveData` option
-into the `$option` array in the third parameter.
+The saveData Option
+-------------------
+
+The data passed in is retained for subsequent calls to ``view()``. If you call the function multiple times
+in a single request, you will not have to pass the desired data to each ``view()``.
+
+But this might not keep any data from "bleeding" into
+other views, potentially causing issues. If you would prefer to clean the data after one call, you can pass the ``saveData`` option
+into the ``$option`` array in the third parameter.
 
 .. literalinclude:: views/010.php
 
-Additionally, if you would like the default functionality of the view function to be that it does save the data
-between calls, you can set ``$saveData`` to **true** in **app/Config/Views.php**.
+Additionally, if you would like the default functionality of the view function to be that it does clear the data
+between calls, you can set ``$saveData`` to **false** in **app/Config/Views.php**.
 
 Creating Loops
 ==============
diff --git a/user_guide_src/source/outgoing/views/010.php b/user_guide_src/source/outgoing/views/010.php
index 189b5dc9f190..8411aa134e7b 100644
--- a/user_guide_src/source/outgoing/views/010.php
+++ b/user_guide_src/source/outgoing/views/010.php
@@ -6,4 +6,4 @@
     'message' => 'My Message',
 ];
 
-return view('blog_view', $data, ['saveData' => true]);
+return view('blog_view', $data, ['saveData' => false]);

From 510810c2b27a1a2adcb9f21d05fbdf057dce4a86 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 4 Apr 2022 09:31:00 +0900
Subject: [PATCH 1889/2325] docs: decorate view() function

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

diff --git a/user_guide_src/source/outgoing/views.rst b/user_guide_src/source/outgoing/views.rst
index 903f1fef4727..3eb80427fc2a 100644
--- a/user_guide_src/source/outgoing/views.rst
+++ b/user_guide_src/source/outgoing/views.rst
@@ -101,7 +101,7 @@ along ``cache_name`` and the cache ID you wish to use:
 Adding Dynamic Data to the View
 ===============================
 
-Data is passed from the controller to the view by way of an array in the second parameter of the view function.
+Data is passed from the controller to the view by way of an array in the second parameter of the ``view()`` function.
 Here's an example:
 
 .. literalinclude:: views/008.php
@@ -135,7 +135,7 @@ into the ``$option`` array in the third parameter.
 
 .. literalinclude:: views/010.php
 
-Additionally, if you would like the default functionality of the view function to be that it does clear the data
+Additionally, if you would like the default functionality of the ``view()`` function to be that it does clear the data
 between calls, you can set ``$saveData`` to **false** in **app/Config/Views.php**.
 
 Creating Loops

From 926fc6eeabdbc9553869b7b7fba466a1c15b41b7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 4 Apr 2022 20:25:14 +0900
Subject: [PATCH 1890/2325] fix: Publisher::discover() may loads incorrect
 classname

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

diff --git a/system/Publisher/Publisher.php b/system/Publisher/Publisher.php
index 5cd392d921a8..01a3c62db657 100644
--- a/system/Publisher/Publisher.php
+++ b/system/Publisher/Publisher.php
@@ -111,9 +111,9 @@ final public static function discover(string $directory = 'Publishers'): array
 
         // Loop over each file checking to see if it is a Publisher
         foreach (array_unique($files) as $file) {
-            $className = $locator->findQualifiedNameFromPath($file);
+            $className = $locator->getClassname($file);
 
-            if (is_string($className) && class_exists($className) && is_a($className, self::class, true)) {
+            if ($className !== '' && class_exists($className) && is_a($className, self::class, true)) {
                 self::$discovered[$directory][] = new $className();
             }
         }

From 74fb4fb8788bd419016e8bccc53f1825814a721e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 5 Apr 2022 10:41:27 +0900
Subject: [PATCH 1891/2325] refactor: extract withErrors() method

---
 system/HTTP/RedirectResponse.php | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/system/HTTP/RedirectResponse.php b/system/HTTP/RedirectResponse.php
index 54e1ae12f36d..b9cabbba6793 100644
--- a/system/HTTP/RedirectResponse.php
+++ b/system/HTTP/RedirectResponse.php
@@ -85,18 +85,35 @@ public function back(?int $code = null, string $method = 'auto')
     public function withInput()
     {
         $session = Services::session();
-
         $session->setFlashdata('_ci_old_input', [
             'get'  => $_GET ?? [],
             'post' => $_POST ?? [],
         ]);
 
-        // If the validation has any errors, transmit those back
-        // so they can be displayed when the validation is handled
-        // within a method different than displaying the form.
+        // @TODO Remove this in the future.
+        //      See https://github.com/codeigniter4/CodeIgniter4/issues/5839#issuecomment-1086624600
+        $this->withErrors();
+
+        return $this;
+    }
+
+    /**
+     * Set validation errors in the session.
+     *
+     * If the validation has any errors, transmit those back
+     * so they can be displayed when the validation is handled
+     * within a method different than displaying the form.
+     *
+     * @TODO Make this method public when removing $this->withErrors() in withInput().
+     *
+     * @return $this
+     */
+    private function withErrors(): self
+    {
         $validation = Services::validation();
 
         if ($validation->getErrors()) {
+            $session = Services::session();
             $session->setFlashdata('_ci_validation_errors', serialize($validation->getErrors()));
         }
 

From e4f1d8817af17b3106e6ea3fbe3a1e57870813c6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 5 Apr 2022 11:10:01 +0900
Subject: [PATCH 1892/2325] fix: validation errors in model are not cleared
 when running validation again

---
 phpstan-baseline.neon.dist                  |  5 -----
 system/BaseModel.php                        |  4 +++-
 tests/system/Models/ValidationModelTest.php | 23 +++++++++++++++++++++
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index 1021eb445899..53d3710b7ea7 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -25,11 +25,6 @@ parameters:
 			count: 1
 			path: system/Autoloader/Autoloader.php
 
-		-
-			message: "#^Method CodeIgniter\\\\Validation\\\\ValidationInterface\\:\\:run\\(\\) invoked with 3 parameters, 0\\-2 required\\.$#"
-			count: 1
-			path: system/BaseModel.php
-
 		-
 			message: "#^Property Config\\\\Cache\\:\\:\\$backupHandler \\(string\\) in isset\\(\\) is not nullable\\.$#"
 			count: 1
diff --git a/system/BaseModel.php b/system/BaseModel.php
index 64753be5b3e3..39bd9ce2cb4c 100644
--- a/system/BaseModel.php
+++ b/system/BaseModel.php
@@ -1344,7 +1344,9 @@ public function validate($data): bool
             return true;
         }
 
-        return $this->validation->setRules($rules, $this->validationMessages)->run($data, null, $this->DBGroup);
+        $this->validation->reset()->setRules($rules, $this->validationMessages);
+
+        return $this->validation->run($data, null, $this->DBGroup);
     }
 
     /**
diff --git a/tests/system/Models/ValidationModelTest.php b/tests/system/Models/ValidationModelTest.php
index 0d60d36524ac..e7cc4a8d11e5 100644
--- a/tests/system/Models/ValidationModelTest.php
+++ b/tests/system/Models/ValidationModelTest.php
@@ -55,6 +55,29 @@ public function testValidationBasics(): void
         $this->assertSame('You forgot to name the baby.', $errors['name']);
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5859
+     */
+    public function testValidationTwice(): void
+    {
+        $data = [
+            'name'        => null,
+            'description' => 'some great marketing stuff',
+        ];
+
+        $this->assertFalse($this->model->insert($data));
+
+        $errors = $this->model->errors();
+        $this->assertSame('You forgot to name the baby.', $errors['name']);
+
+        $data = [
+            'name'        => 'some name',
+            'description' => 'some great marketing stuff',
+        ];
+
+        $this->assertIsInt($this->model->insert($data));
+    }
+
     public function testValidationWithSetValidationRule(): void
     {
         $data = [

From 8f1ed45f1bb3d2df34665e80767d171bd4cef167 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 5 Apr 2022 11:42:31 +0900
Subject: [PATCH 1893/2325] feat: add $includeDir option to get_filenames()

---
 system/Helpers/filesystem_helper.php          | 23 ++++++++++++-------
 tests/system/Helpers/FilesystemHelperTest.php | 16 +++++++++++++
 .../source/helpers/filesystem_helper.rst      |  7 +++---
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/system/Helpers/filesystem_helper.php b/system/Helpers/filesystem_helper.php
index 89d4d507f961..4918e87e7bf2 100644
--- a/system/Helpers/filesystem_helper.php
+++ b/system/Helpers/filesystem_helper.php
@@ -194,9 +194,14 @@ function delete_files(string $path, bool $delDir = false, bool $htdocs = false,
      * @param string    $sourceDir   Path to source
      * @param bool|null $includePath Whether to include the path as part of the filename; false for no path, null for a relative path, true for full path
      * @param bool      $hidden      Whether to include hidden files (files beginning with a period)
+     * @param bool      $includeDir  Whether to include directories
      */
-    function get_filenames(string $sourceDir, ?bool $includePath = false, bool $hidden = false): array
-    {
+    function get_filenames(
+        string $sourceDir,
+        ?bool $includePath = false,
+        bool $hidden = false,
+        bool $includeDir = true
+    ): array {
         $files = [];
 
         $sourceDir = realpath($sourceDir) ?: $sourceDir;
@@ -212,12 +217,14 @@ function get_filenames(string $sourceDir, ?bool $includePath = false, bool $hidd
                     continue;
                 }
 
-                if ($includePath === false) {
-                    $files[] = $basename;
-                } elseif ($includePath === null) {
-                    $files[] = str_replace($sourceDir, '', $name);
-                } else {
-                    $files[] = $name;
+                if ($includeDir || ! $object->isDir()) {
+                    if ($includePath === false) {
+                        $files[] = $basename;
+                    } elseif ($includePath === null) {
+                        $files[] = str_replace($sourceDir, '', $name);
+                    } else {
+                        $files[] = $name;
+                    }
                 }
             }
         } catch (Throwable $e) {
diff --git a/tests/system/Helpers/FilesystemHelperTest.php b/tests/system/Helpers/FilesystemHelperTest.php
index d20d93481e39..c9f5789a9d4c 100644
--- a/tests/system/Helpers/FilesystemHelperTest.php
+++ b/tests/system/Helpers/FilesystemHelperTest.php
@@ -305,6 +305,22 @@ public function testGetFilenames()
         $this->assertSame($expected, get_filenames($vfs->url(), false));
     }
 
+    public function testGetFilenamesWithoutDirectories()
+    {
+        $vfs = vfsStream::setup('root', null, $this->structure);
+
+        $filenames = get_filenames($vfs->url(), true, false, false);
+
+        $expected = [
+            'vfs://root/boo/far',
+            'vfs://root/boo/faz',
+            'vfs://root/foo/bar',
+            'vfs://root/foo/baz',
+            'vfs://root/simpleFile',
+        ];
+        $this->assertSame($expected, $filenames);
+    }
+
     public function testGetFilenamesWithHidden()
     {
         $this->assertTrue(function_exists('get_filenames'));
diff --git a/user_guide_src/source/helpers/filesystem_helper.rst b/user_guide_src/source/helpers/filesystem_helper.rst
index 4cb00fb23188..017ee9a82149 100644
--- a/user_guide_src/source/helpers/filesystem_helper.rst
+++ b/user_guide_src/source/helpers/filesystem_helper.rst
@@ -150,11 +150,12 @@ The following functions are available:
 
     .. note:: The files must be writable or owned by the system in order to be deleted.
 
-.. php:function:: get_filenames($source_dir[, $include_path = false])
+.. php:function:: get_filenames($sourceDir[, $includePath = false[, $hidden = false[, $includeDir = true]]])
 
-    :param    string    $source_dir: Directory path
-    :param    bool|null    $include_path: Whether to include the path as part of the filename; false for no path, null for the path relative to $source_dir, true for the full path
+    :param    string    $sourceDir: Directory path
+    :param    bool|null    $includePath: Whether to include the path as part of the filename; false for no path, null for the path relative to ``$sourceDir``, true for the full path
     :param    bool    $hidden: Whether to include hidden files (files beginning with a period)
+    :param    bool    $includeDir: Whether to include directories
     :returns:    An array of file names
     :rtype:    array
 

From 7b442c6a49fb469de6998531433be82cb1ce3345 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 5 Apr 2022 13:00:45 +0900
Subject: [PATCH 1894/2325] docs: fix function reference

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

diff --git a/user_guide_src/source/helpers/filesystem_helper.rst b/user_guide_src/source/helpers/filesystem_helper.rst
index 4cb00fb23188..e45c7ce31565 100644
--- a/user_guide_src/source/helpers/filesystem_helper.rst
+++ b/user_guide_src/source/helpers/filesystem_helper.rst
@@ -21,10 +21,10 @@ Available Functions
 
 The following functions are available:
 
-.. php:function:: directory_map($source_dir[, $directory_depth = 0[, $hidden = false]])
+.. php:function:: directory_map($sourceDir[, $directoryDepth = 0[, $hidden = false]])
 
-    :param    string  $source_dir: Path to the source directory
-    :param    int   $directory_depth: Depth of directories to traverse (0 = fully recursive, 1 = current dir, etc)
+    :param    string  $sourceDir: Path to the source directory
+    :param    int   $directoryDepth: Depth of directories to traverse (0 = fully recursive, 1 = current dir, etc)
     :param    bool    $hidden: Whether to include hidden paths
     :returns:    An array of files
     :rtype:    array
@@ -167,10 +167,10 @@ The following functions are available:
 
     .. literalinclude:: filesystem_helper/010.php
 
-.. php:function:: get_dir_file_info($source_dir, $top_level_only)
+.. php:function:: get_dir_file_info($sourceDir[, $topLevelOnly = true])
 
-    :param    string    $source_dir: Directory path
-    :param    bool    $top_level_only: Whether to look only at the specified directory (excluding sub-directories)
+    :param    string    $sourceDir: Directory path
+    :param    bool    $topLevelOnly: Whether to look only at the specified directory (excluding sub-directories)
     :returns:    An array containing info on the supplied directory's contents
     :rtype:    array
 
@@ -183,10 +183,10 @@ The following functions are available:
 
     .. literalinclude:: filesystem_helper/011.php
 
-.. php:function:: get_file_info($file[, $returned_values = ['name', 'server_path', 'size', 'date']])
+.. php:function:: get_file_info($file[, $returnedValues = ['name', 'server_path', 'size', 'date']])
 
     :param    string        $file: File path
-    :param    array|string  $returned_values: What type of info to return to be passed as array or comma separated string
+    :param    array|string  $returnedValues: What type of info to return to be passed as array or comma separated string
     :returns:    An array containing info on the specified file or false on failure
     :rtype:    array
 
@@ -194,8 +194,8 @@ The following functions are available:
     information attributes for a file. Second parameter allows you to explicitly declare what
     information you want returned.
 
-    Valid ``$returned_values`` options are: `name`, `size`, `date`, `readable`, `writeable`,
-    `executable` and `fileperms`.
+    Valid ``$returnedValues`` options are: ``name``, ``size``, ``date``, ``readable``, ``writeable``,
+    ``executable`` and ``fileperms``.
 
 .. php:function:: symbolic_permissions($perms)
 
@@ -230,10 +230,10 @@ The following functions are available:
 
     .. literalinclude:: filesystem_helper/014.php
 
-.. php:function:: set_realpath($path[, $check_existence = false])
+.. php:function:: set_realpath($path[, $checkExistence = false])
 
     :param    string    $path: Path
-    :param    bool    $check_existence: Whether to check if the path actually exists
+    :param    bool    $checkExistence: Whether to check if the path actually exists
     :returns:    An absolute path
     :rtype:    string
 

From e19872ad2cc39b6f7142c1f024a7e2cd8f4020f6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 5 Apr 2022 16:52:30 +0900
Subject: [PATCH 1895/2325] docs: remove HackerOne link

CI4 does not use HackerOne.
---
 contributing/bug_report.md | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/contributing/bug_report.md b/contributing/bug_report.md
index c564a9a734f4..43767cdd1766 100644
--- a/contributing/bug_report.md
+++ b/contributing/bug_report.md
@@ -27,15 +27,7 @@ have found a bug, again - please ask on the forums first.
 
 ## Security
 
-Did you find a security issue in CodeIgniter?
-
-Please *don't* disclose it publicly, but e-mail us at
-<security@codeigniter.com>, or report it via our page on
-[HackerOne](https://hackerone.com/codeigniter).
-
-If you've found a critical vulnerability, we'd be happy to credit you in
-our
-[ChangeLog](https://codeigniter4.github.io/CodeIgniter4/changelogs/index.html).
+See [SECURITY.md](../SECURITY.md).
 
 ## Tips for a Good Issue Report
 

From 70af24e461382a2c895a139f87e3c4960a111ba6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 5 Apr 2022 17:21:12 +0900
Subject: [PATCH 1896/2325] chore: rename php-cs-fixer config files

The php-cs-fixer configuration files are all in one place and easy to find.
---
 .github/workflows/test-coding-standards.yml               | 4 ++--
 .php-cs-fixer.dist.php                                    | 4 ++--
 ...r.php-cs-fixer.dist.php => .php-cs-fixer.no-header.php | 2 +-
 ....php-cs-fixer.dist.php => .php-cs-fixer.user-guide.php | 2 +-
 admin/pre-commit                                          | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename .no-header.php-cs-fixer.dist.php => .php-cs-fixer.no-header.php (95%)
 rename .user-guide.php-cs-fixer.dist.php => .php-cs-fixer.user-guide.php (95%)

diff --git a/.github/workflows/test-coding-standards.yml b/.github/workflows/test-coding-standards.yml
index e5b4a2043342..5fa13728b37d 100644
--- a/.github/workflows/test-coding-standards.yml
+++ b/.github/workflows/test-coding-standards.yml
@@ -52,10 +52,10 @@ jobs:
         run: composer update --ansi --no-interaction
 
       - name: Run lint on `app/`, `admin/`, `public/`
-        run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.no-header.php-cs-fixer.dist.php --using-cache=no --diff
+        run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.php-cs-fixer.no-header.php --using-cache=no --diff
 
       - name: Run lint on `system/`, `tests`, `utils/`, and root PHP files
         run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --using-cache=no --diff
 
       - name: Run lint on `user_guide_src/source/`
-        run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.user-guide.php-cs-fixer.dist.php --using-cache=no --diff
+        run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --config=.php-cs-fixer.user-guide.php --using-cache=no --diff
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 7caeaec1035c..02c6549b2c03 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -29,8 +29,8 @@
     ->notName('#Foobar.php$#')
     ->append([
         __FILE__,
-        __DIR__ . '/.no-header.php-cs-fixer.dist.php',
-        __DIR__ . '/.user-guide.php-cs-fixer.dist.php',
+        __DIR__ . '/.php-cs-fixer.no-header.php',
+        __DIR__ . '/.php-cs-fixer.user-guide.php',
         __DIR__ . '/rector.php',
         __DIR__ . '/spark',
         __DIR__ . '/user_guide_src/renumerate.php',
diff --git a/.no-header.php-cs-fixer.dist.php b/.php-cs-fixer.no-header.php
similarity index 95%
rename from .no-header.php-cs-fixer.dist.php
rename to .php-cs-fixer.no-header.php
index 153ac5bd1328..6c136cd4b164 100644
--- a/.no-header.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.no-header.php
@@ -33,7 +33,7 @@
 $overrides = [];
 
 $options = [
-    'cacheFile'    => 'build/.no-header.php-cs-fixer.cache',
+    'cacheFile'    => 'build/.php-cs-fixer.no-header.cache',
     'finder'       => $finder,
     'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
     'customRules'  => [
diff --git a/.user-guide.php-cs-fixer.dist.php b/.php-cs-fixer.user-guide.php
similarity index 95%
rename from .user-guide.php-cs-fixer.dist.php
rename to .php-cs-fixer.user-guide.php
index 900c26ec81e1..8081d73698ca 100644
--- a/.user-guide.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.user-guide.php
@@ -37,7 +37,7 @@
 ];
 
 $options = [
-    'cacheFile'    => 'build/.user-guide.php-cs-fixer.cache',
+    'cacheFile'    => 'build/.php-cs-fixer.user-guide.cache',
     'finder'       => $finder,
     'customFixers' => FixerGenerator::create('vendor/nexusphp/cs-config/src/Fixer', 'Nexus\\CsConfig\\Fixer'),
     'customRules'  => [
diff --git a/admin/pre-commit b/admin/pre-commit
index e8fdcff64499..1fa6b15e5984 100644
--- a/admin/pre-commit
+++ b/admin/pre-commit
@@ -42,9 +42,9 @@ if [ "$FILES" != "" ]; then
     # Run on whole codebase to skip on unnecessary filtering
     # Run first on app, admin, public
     if [ -d /proc/cygdrive ]; then
-        ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.no-header.php-cs-fixer.dist.php
+        ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.php-cs-fixer.no-header.php
     else
-        php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.no-header.php-cs-fixer.dist.php
+        php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.php-cs-fixer.no-header.php
     fi
 
     if [ $? != 0 ]; then
@@ -66,9 +66,9 @@ if [ "$FILES" != "" ]; then
 
     # Next, run on user_guide_src/source PHP files
     if [ -d /proc/cygdrive ]; then
-        ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.user-guide.php-cs-fixer.dist.php
+        ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.php-cs-fixer.user-guide.php
     else
-        php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.user-guide.php-cs-fixer.dist.php
+        php ./vendor/bin/php-cs-fixer fix --verbose --dry-run --diff --config=.php-cs-fixer.user-guide.php
     fi
 
     if [ $? != 0 ]; then

From b71ed71595ff7e0828a6ad97a9e6e0e1082f5df1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Apr 2022 08:50:23 +0900
Subject: [PATCH 1897/2325] docs: fix by proofreading

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/concepts/factories.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst
index 2e23e448a8f9..ac9f562732b0 100644
--- a/user_guide_src/source/concepts/factories.rst
+++ b/user_guide_src/source/concepts/factories.rst
@@ -57,7 +57,7 @@ If you have only ``Blog\Models\UserModel``, the instance will be returned.
 But if you have both ``App\Models\UserModel`` and ``Blog\Models\UserModel``,
 The instance of ``App\Models\UserModel`` will be returned.
 
-If you want to get ``Blog\Models\UserModel``, you need the option ``preferApp``:
+If you want to get ``Blog\Models\UserModel``, you need to disable the option ``preferApp``:
 
 .. literalinclude:: factories/010.php
 

From b1a77e71cff780d9079beaf3d291bdd715d4e2a9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Apr 2022 08:50:40 +0900
Subject: [PATCH 1898/2325] docs: fix by proofreading

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/concepts/factories.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst
index ac9f562732b0..ca1025168367 100644
--- a/user_guide_src/source/concepts/factories.rst
+++ b/user_guide_src/source/concepts/factories.rst
@@ -71,7 +71,7 @@ you get back the instance as before:
 Convenience Functions
 =====================
 
-Two functions for short cut of the Factories have been provided. These functions are always available.
+Two shortcut functions for Factories have been provided. These functions are always available.
 
 config()
 --------

From 12aa1aaf21e651d93f6c102445e866c7fe849585 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Apr 2022 08:51:14 +0900
Subject: [PATCH 1899/2325] docs: fix by proofreading

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/concepts/factories.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst
index ca1025168367..5f34b4a1bb5a 100644
--- a/user_guide_src/source/concepts/factories.rst
+++ b/user_guide_src/source/concepts/factories.rst
@@ -140,7 +140,7 @@ Configurations
 
 To set default component options, create a new Config files at **app/Config/Factory.php**
 that supplies options as an array property that matches the name of the component. For example,
-if you wanted to ensure that all **Filters** used by your app were valid framework instances,
+if you want to ensure that each ``Filter`` used by your app is an actual framework,
 your **app/Config/Factory.php** file might look like this:
 
 .. literalinclude:: factories/005.php

From d41fbe26f89ef1d9df9158aaf305ba9b32fca3d1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Apr 2022 08:53:26 +0900
Subject: [PATCH 1900/2325] docs: remove duplicated "unrelated"

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

diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst
index 5f34b4a1bb5a..600a153d1a8c 100644
--- a/user_guide_src/source/concepts/factories.rst
+++ b/user_guide_src/source/concepts/factories.rst
@@ -145,7 +145,7 @@ your **app/Config/Factory.php** file might look like this:
 
 .. literalinclude:: factories/005.php
 
-This would prevent conflict of an unrelated third-party module which happened to have an
+This would prevent conflict of an third-party module which happened to have an
 unrelated ``Filters`` path in its namespace.
 
 setOptions Method

From ac6a97d04c7345223427a7243dd11735672d3dba Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Apr 2022 09:05:57 +0900
Subject: [PATCH 1901/2325] docs: add more explanation for filters component

---
 user_guide_src/source/concepts/factories.rst | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst
index 600a153d1a8c..ff5ea4faf140 100644
--- a/user_guide_src/source/concepts/factories.rst
+++ b/user_guide_src/source/concepts/factories.rst
@@ -139,12 +139,17 @@ Configurations
 --------------
 
 To set default component options, create a new Config files at **app/Config/Factory.php**
-that supplies options as an array property that matches the name of the component. For example,
-if you want to ensure that each ``Filter`` used by your app is an actual framework,
+that supplies options as an array property that matches the name of the component.
+
+For example, if you want to create **Filters** by Factories, the component name wll be ``filters``.
+And if you want to ensure that each filter is an instance of a class which implements CodeIgniter's ``FilterInterface``,
 your **app/Config/Factory.php** file might look like this:
 
 .. literalinclude:: factories/005.php
 
+Now you can create a filter with code like ``Factories::filters('SomeFilter')``,
+and the returned instance will surely be a CodeIgniter's filter.
+
 This would prevent conflict of an third-party module which happened to have an
 unrelated ``Filters`` path in its namespace.
 

From 6214ece43aaf6207bd3007822cf7ac0c3f6cefe8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Apr 2022 09:45:36 +0900
Subject: [PATCH 1902/2325] docs: revise the description to be more accurate

The property $component does not exist.
---
 user_guide_src/source/concepts/factories.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst
index ff5ea4faf140..569fbaa7db1e 100644
--- a/user_guide_src/source/concepts/factories.rst
+++ b/user_guide_src/source/concepts/factories.rst
@@ -131,7 +131,7 @@ Factories Behavior
 
 Options can be applied in one of three ways (listed in ascending priority):
 
-* A configuration class ``Config\Factory`` with a ``$component`` property.
+* A configuration class ``Config\Factory`` with a property that matches the name of a component.
 * The static method ``Factories::setOptions()``.
 * Passing options directly at call time with a parameter.
 

From ea781ab2351e1b74bfae71884f90cbf58e3eaa72 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 5 Apr 2022 17:58:37 +0900
Subject: [PATCH 1903/2325] chore: update composer scripts

---
 composer.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 8d77bc48cde8..2a0329252a46 100644
--- a/composer.json
+++ b/composer.json
@@ -62,14 +62,14 @@
         "analyze": "phpstan analyse",
         "test": "phpunit",
         "cs": [
-            "php-cs-fixer fix --verbose --dry-run --diff --config=.user-guide.php-cs-fixer.dist.php",
-            "php-cs-fixer fix --verbose --dry-run --diff --config=.no-header.php-cs-fixer.dist.php",
-            "php-cs-fixer fix --verbose --dry-run --diff"
+            "php-cs-fixer fix --ansi --verbose --dry-run --diff --config=.php-cs-fixer.user-guide.php",
+            "php-cs-fixer fix --ansi --verbose --dry-run --diff --config=.php-cs-fixer.no-header.php",
+            "php-cs-fixer fix --ansi --verbose --dry-run --diff"
         ],
         "cs-fix": [
-            "php-cs-fixer fix --verbose --diff --config=.user-guide.php-cs-fixer.dist.php",
-            "php-cs-fixer fix --verbose --diff --config=.no-header.php-cs-fixer.dist.php",
-            "php-cs-fixer fix --verbose --diff"
+            "php-cs-fixer fix --ansi --verbose --diff --config=.php-cs-fixer.user-guide.php",
+            "php-cs-fixer fix --ansi --verbose --diff --config=.php-cs-fixer.no-header.php",
+            "php-cs-fixer fix --ansi --verbose --diff"
         ]
     },
     "scripts-descriptions": {

From c01667dbe1eff42313cdf115003cd4a65eef2e5b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Apr 2022 17:28:08 +0900
Subject: [PATCH 1904/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/concepts/factories.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst
index 569fbaa7db1e..62d40b3352c9 100644
--- a/user_guide_src/source/concepts/factories.rst
+++ b/user_guide_src/source/concepts/factories.rst
@@ -9,7 +9,7 @@ Factories
 Introduction
 ============
 
-What is Factories?
+What are Factories?
 ------------------
 
 Like :doc:`./services`, **Factories** are an extension of autoloading that helps keep your code

From cd2abe85e60626a26cfc5cbcbfc6517ef15515f7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Apr 2022 17:29:04 +0900
Subject: [PATCH 1905/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/concepts/factories.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst
index 62d40b3352c9..d33c49e2398b 100644
--- a/user_guide_src/source/concepts/factories.rst
+++ b/user_guide_src/source/concepts/factories.rst
@@ -27,10 +27,10 @@ make sure the correct configuration is loaded when using the ``Config`` class.
 Differences from Services
 -------------------------
 
-Factories require a concrete class name to instantiate, and do not have code to create instances.
+Factories require a concrete class name to instantiate and do not have code to create instances.
 
-So Factories are not good for creating complex instance that needs many dependencies,
-and cannot change the class of the instance to be returned.
+So, Factories are not good for creating a complex instance that needs many dependencies,
+and you cannot change the class of the instance to be returned.
 
 On the other hand, Services have code to create instances, so it can create a complex instance
 that needs other services or class instances. When you get a service, Services require a service name,

From 9dd0e02d0feda051865e99383ab775da6937b762 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Apr 2022 17:29:23 +0900
Subject: [PATCH 1906/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/concepts/factories.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst
index d33c49e2398b..138b73c1342e 100644
--- a/user_guide_src/source/concepts/factories.rst
+++ b/user_guide_src/source/concepts/factories.rst
@@ -55,7 +55,7 @@ Or you could also request a specific class:
 
 If you have only ``Blog\Models\UserModel``, the instance will be returned.
 But if you have both ``App\Models\UserModel`` and ``Blog\Models\UserModel``,
-The instance of ``App\Models\UserModel`` will be returned.
+the instance of ``App\Models\UserModel`` will be returned.
 
 If you want to get ``Blog\Models\UserModel``, you need to disable the option ``preferApp``:
 

From 1b1d03c6363bb0db9b0a935440d791fce2f54859 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Apr 2022 17:31:59 +0900
Subject: [PATCH 1907/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/concepts/services.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst
index b69a4e4c4f85..632ad10cedf0 100644
--- a/user_guide_src/source/concepts/services.rst
+++ b/user_guide_src/source/concepts/services.rst
@@ -115,7 +115,7 @@ In some instances, you will want the option to pass a setting to the class durin
 Since the services file is a very simple class, it is easy to make this work.
 
 A good example is the ``renderer`` service. By default, we want this class to be able
-to find the views at ``APPPATH . views/``. We want the developer to have the option of
+to find the views at ``APPPATH . 'views/'``. We want the developer to have the option of
 changing that path, though, if their needs require it. So the class accepts the ``$viewPath``
 as a constructor parameter. The service method looks like this:
 

From 606518ac686abfe275a40727f747199c8d921e60 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Apr 2022 17:33:37 +0900
Subject: [PATCH 1908/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/helpers/filesystem_helper.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/helpers/filesystem_helper.rst b/user_guide_src/source/helpers/filesystem_helper.rst
index 017ee9a82149..6d7618b9d783 100644
--- a/user_guide_src/source/helpers/filesystem_helper.rst
+++ b/user_guide_src/source/helpers/filesystem_helper.rst
@@ -155,7 +155,7 @@ The following functions are available:
     :param    string    $sourceDir: Directory path
     :param    bool|null    $includePath: Whether to include the path as part of the filename; false for no path, null for the path relative to ``$sourceDir``, true for the full path
     :param    bool    $hidden: Whether to include hidden files (files beginning with a period)
-    :param    bool    $includeDir: Whether to include directories
+    :param    bool    $includeDir: Whether to include directories in the array output
     :returns:    An array of file names
     :rtype:    array
 

From 3fe7b8a45a2455a4cb3b2e7a1e2aa47072f883ba Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Apr 2022 17:44:29 +0900
Subject: [PATCH 1909/2325] docs: add changelog

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 99f980d6b35e..0ed69ab0760a 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -37,6 +37,7 @@ Enhancements
 - Exception information logged through ``log_message()`` has now improved. It now includes the file and line where the exception originated. It also does not truncate the message anymore.
     - The log format has also changed. If users are depending on the log format in their apps, the new log format is "<1-based count> <cleaned filepath>(<line>): <class><function><args>"
 - Added support for webp files to **app/Config/Mimes.php**.
+- Added 4th parameter ``$includeDir`` to ``get_filenames()``. See :php:func:`get_filenames`.
 
 Changes
 *******

From 9f2d3ced709e1774128b03a9831424d90b26e29f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 6 Apr 2022 20:23:33 +0900
Subject: [PATCH 1910/2325] docs: fix title underline

factories.rst:13: WARNING: Title underline too short.
---
 user_guide_src/source/concepts/factories.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst
index 138b73c1342e..754f831257e3 100644
--- a/user_guide_src/source/concepts/factories.rst
+++ b/user_guide_src/source/concepts/factories.rst
@@ -10,7 +10,7 @@ Introduction
 ============
 
 What are Factories?
-------------------
+-------------------
 
 Like :doc:`./services`, **Factories** are an extension of autoloading that helps keep your code
 concise yet optimal, without having to pass around object instances between classes.

From df954fae54dc76873b6a16e883aac791f9f0a48f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Apr 2022 15:05:18 +0000
Subject: [PATCH 1911/2325] chore(deps-dev): update rector/rector requirement

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

---
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 8d77bc48cde8..e21ae85ecff3 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.0",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.19"
+        "rector/rector": "0.12.20"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From 5ee5304c24cc96df3a2d6c3dcf0ca069454da40c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Apr 2022 08:47:57 +0900
Subject: [PATCH 1912/2325] docs: update `spark migrate:status` output

---
 user_guide_src/source/dbmgmt/migration.rst | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst
index cd5787328a96..ff81f4ff0708 100644
--- a/user_guide_src/source/dbmgmt/migration.rst
+++ b/user_guide_src/source/dbmgmt/migration.rst
@@ -162,8 +162,13 @@ You can use (refresh) with the following options:
 Displays a list of all migrations and the date and time they ran, or '--' if they have not been run::
 
   > php spark migrate:status
-  Filename               Migrated On
-  First_migration.php    2016-04-25 04:44:22
+  +----------------------+-------------------+-----------------------+---------+---------------------+-------+
+  | Namespace            | Version           | Filename              | Group   | Migrated On         | Batch |
+  +----------------------+-------------------+-----------------------+---------+---------------------+-------+
+  | App                  | 2022-04-06-234508 | CreateCiSessionsTable | default | 2022-04-06 18:45:14 | 2     |
+  | CodeIgniter\Settings | 2021-07-04-041948 | CreateSettingsTable   | default | 2022-04-06 01:23:08 | 1     |
+  | CodeIgniter\Settings | 2021-11-14-143905 | AddContextColumn      | default | 2022-04-06 01:23:08 | 1     |
+  +----------------------+-------------------+-----------------------+---------+---------------------+-------+
 
 You can use (status) with the following options:
 

From 180dca40ece4a328892bbdbf050f5d7394cec947 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Apr 2022 08:48:31 +0900
Subject: [PATCH 1913/2325] docs: update deprecated command

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

diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
index 59557db92cf8..11ac22f12add 100644
--- a/user_guide_src/source/libraries/sessions.rst
+++ b/user_guide_src/source/libraries/sessions.rst
@@ -569,10 +569,10 @@ You can choose the Database group to use by adding a new line to the
 
 .. literalinclude:: sessions/040.php
 
-If you'd rather not do all of this by hand, you can use the ``session:migration`` command
+If you'd rather not do all of this by hand, you can use the ``make:migration --session`` command
 from the cli to generate a migration file for you::
 
-  > php spark session:migration
+  > php spark make:migration --session
   > php spark migrate
 
 This command will take the **sessionSavePath** and **sessionMatchIP** settings into account

From 7b58b7217eb556d2e91edae5f8b5813abfb16f59 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Apr 2022 13:27:54 +0900
Subject: [PATCH 1914/2325] chore: update gitattributes

---
 .gitattributes | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 79c65323dade..de04ad191549 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -14,17 +14,23 @@ contributing/ export-ignore
 .editorconfig export-ignore
 .nojekyll export-ignore export-ignore
 CODE_OF_CONDUCT.md export-ignore
+CONTRIBUTING.md export-ignore
 PULL_REQUEST_TEMPLATE.md export-ignore
 stale.yml export-ignore
 Vagrantfile.dist export-ignore
 
 # They don't want our test files
+tests/AutoReview/ export-ignore
 tests/system/ export-ignore
 utils/ export-ignore
+depfile.yaml export-ignore
 rector.php export-ignore
 phpunit.xml.dist export-ignore
+phpstan-baseline.neon.dist export-ignore
 phpstan.neon.dist export-ignore
 .php-cs-fixer.dist.php export-ignore
+.php-cs-fixer.no-header.php export-ignore
+.php-cs-fixer.user-guide.php export-ignore
 
 # The source user guide, either
 user_guide_src/ export-ignore

From 53cdb671b8b4e04b7d4a0752dd3b6046819abb52 Mon Sep 17 00:00:00 2001
From: "Michael R. Krisnadhi" <michaelkrisnadhi@gmail.com>
Date: Fri, 8 Apr 2022 16:08:14 +0700
Subject: [PATCH 1915/2325] clarify Models user guide

Inform the $useAutoIncrement default value (which is 'true'), so developers would be aware of that option if they don't use auto-incremented INT's on primary keys, especially when triggering an 'afterInsert' event which will eventually cause the $data['id'] value to be 0 instead of the actual primary key (see 'system/Model.php' line 254 : https://github.com/codeigniter4/CodeIgniter4/blob/622d50aa2976b85f7cb1479faec7558cd9ec2341/system/Model.php#L254)
---
 user_guide_src/source/models/model.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index f55e60656c03..fa354d7c3aff 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -99,7 +99,8 @@ is used with methods like ``find()`` to know what column to match the specified
 
 Specifies if the table uses an auto-increment feature for ``$primaryKey``. If set to ``false``
 then you are responsible for providing primary key value for every record in the table. This
-feature may be handy when we want to implement 1:1 relation or use UUIDs for our model.
+feature may be handy when we want to implement 1:1 relation or use UUIDs for our model. The
+default value is ``true``.
 
 .. note:: If you set ``$useAutoIncrement`` to ``false``, then make sure to set your primary
     key in the database to ``unique``. This way you will make sure that all of Model's features

From 3fc0c6b61bd318f73090cf1cc672ba303c7b09b2 Mon Sep 17 00:00:00 2001
From: Toto Prayogo <mail@totoprayogo.com>
Date: Fri, 8 Apr 2022 20:34:42 +0700
Subject: [PATCH 1916/2325] add `literalinclude` for curlrequest -> debug

---
 user_guide_src/source/libraries/curlrequest.rst     | 2 +-
 user_guide_src/source/libraries/curlrequest/034.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 user_guide_src/source/libraries/curlrequest/034.php

diff --git a/user_guide_src/source/libraries/curlrequest.rst b/user_guide_src/source/libraries/curlrequest.rst
index 3d0b91b511fb..b77d41e6b088 100644
--- a/user_guide_src/source/libraries/curlrequest.rst
+++ b/user_guide_src/source/libraries/curlrequest.rst
@@ -219,7 +219,7 @@ script execution. This is done by passing CURLOPT_VERBOSE and echoing the output
 server via ``spark serve`` you will see the output in the console. Otherwise, the output will be written to
 the server's error log.
 
-    $response->request('GET', 'http://example.com', ['debug' => true]);
+.. literalinclude:: curlrequest/034.php
 
 You can pass a filename as the value for debug to have the output written to a file:
 
diff --git a/user_guide_src/source/libraries/curlrequest/034.php b/user_guide_src/source/libraries/curlrequest/034.php
new file mode 100644
index 000000000000..1560cd589fec
--- /dev/null
+++ b/user_guide_src/source/libraries/curlrequest/034.php
@@ -0,0 +1,3 @@
+<?php
+
+$response->request('GET', 'http://example.com', ['debug' => true]);

From fc8946faf361a6571beccba1b054fd33ecae581a Mon Sep 17 00:00:00 2001
From: Toto Prayogo <mail@totoprayogo.com>
Date: Fri, 8 Apr 2022 20:44:35 +0700
Subject: [PATCH 1917/2325] fix parameters display for API response >
 `setResponseFormat($format)` method

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

diff --git a/user_guide_src/source/outgoing/api_responses.rst b/user_guide_src/source/outgoing/api_responses.rst
index 6d657e6bc765..bdb853563e2b 100644
--- a/user_guide_src/source/outgoing/api_responses.rst
+++ b/user_guide_src/source/outgoing/api_responses.rst
@@ -60,7 +60,7 @@ Class Reference
 ***************
 .. php:method:: setResponseFormat($format)
 
-    :param string $format The type of response to return, either ``json`` or ``xml``
+    :param string $format: The type of response to return, either ``json`` or ``xml``
 
     This defines the format to be used when formatting arrays in responses. If you provide a ``null`` value for
     ``$format``, it will be automatically determined through content negotiation.

From 5161942e2c0211698ff7242f5df9d8e8aef1e757 Mon Sep 17 00:00:00 2001
From: Toto Prayogo <mail@totoprayogo.com>
Date: Fri, 8 Apr 2022 21:07:41 +0700
Subject: [PATCH 1918/2325] fix paths

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

diff --git a/user_guide_src/source/general/managing_apps.rst b/user_guide_src/source/general/managing_apps.rst
index 0681b1b534e6..fc00dcd06985 100644
--- a/user_guide_src/source/general/managing_apps.rst
+++ b/user_guide_src/source/general/managing_apps.rst
@@ -25,7 +25,7 @@ your main **app/Config/Paths.php** and set a *full server path* in the
 You will need to modify two additional files in your project root, so that
 they can find the **Paths** configuration file:
 
-- **/spark** runs command line apps; the path is specified on or about line 35:
+- **/spark** runs command line apps; the path is specified on or about line 49:
 
   .. literalinclude:: managing_apps/002.php
 

From 571923915b7b431d055407f51c1201a1979f2da9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Apr 2022 15:03:24 +0000
Subject: [PATCH 1919/2325] chore(deps): bump actions/upload-artifact from 2 to
 3

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2...v3)

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

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/deploy-userguide-latest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy-userguide-latest.yml b/.github/workflows/deploy-userguide-latest.yml
index fb453f0c9694..8fc77b9f7698 100644
--- a/.github/workflows/deploy-userguide-latest.yml
+++ b/.github/workflows/deploy-userguide-latest.yml
@@ -29,7 +29,7 @@ jobs:
 
       # Create an artifact of the html output
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: HTML Documentation
           path: user_guide_src/build/html/

From 022563377e7e995fc7b6845e4a8e026d545ee876 Mon Sep 17 00:00:00 2001
From: Toto Prayogo <mail@totoprayogo.com>
Date: Sat, 9 Apr 2022 03:44:19 +0700
Subject: [PATCH 1920/2325] change `$request->` to `$client->`

---
 user_guide_src/source/libraries/curlrequest/020.php | 2 +-
 user_guide_src/source/libraries/curlrequest/021.php | 2 +-
 user_guide_src/source/libraries/curlrequest/022.php | 2 +-
 user_guide_src/source/libraries/curlrequest/023.php | 2 +-
 user_guide_src/source/libraries/curlrequest/030.php | 2 +-
 user_guide_src/source/libraries/curlrequest/031.php | 2 +-
 user_guide_src/source/libraries/curlrequest/034.php | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/user_guide_src/source/libraries/curlrequest/020.php b/user_guide_src/source/libraries/curlrequest/020.php
index 6e0b1e3726a7..14fad31cdea4 100644
--- a/user_guide_src/source/libraries/curlrequest/020.php
+++ b/user_guide_src/source/libraries/curlrequest/020.php
@@ -1,3 +1,3 @@
 <?php
 
-$response->request('GET', 'http://example.com', ['connect_timeout' => 0]);
+$client->request('GET', 'http://example.com', ['connect_timeout' => 0]);
diff --git a/user_guide_src/source/libraries/curlrequest/021.php b/user_guide_src/source/libraries/curlrequest/021.php
index 4acf82aa9e0b..051df32e1a37 100644
--- a/user_guide_src/source/libraries/curlrequest/021.php
+++ b/user_guide_src/source/libraries/curlrequest/021.php
@@ -1,3 +1,3 @@
 <?php
 
-$response->request('GET', 'http://example.com', ['cookie' => WRITEPATH . 'CookieSaver.txt']);
+$client->request('GET', 'http://example.com', ['cookie' => WRITEPATH . 'CookieSaver.txt']);
diff --git a/user_guide_src/source/libraries/curlrequest/022.php b/user_guide_src/source/libraries/curlrequest/022.php
index 6acbcf0a7784..69b0e4ed8bec 100644
--- a/user_guide_src/source/libraries/curlrequest/022.php
+++ b/user_guide_src/source/libraries/curlrequest/022.php
@@ -1,3 +1,3 @@
 <?php
 
-$response->request('GET', 'http://example.com', ['debug' => '/usr/local/curl_log.txt']);
+$client->request('GET', 'http://example.com', ['debug' => '/usr/local/curl_log.txt']);
diff --git a/user_guide_src/source/libraries/curlrequest/023.php b/user_guide_src/source/libraries/curlrequest/023.php
index b6846257ad83..61e6f6df5214 100644
--- a/user_guide_src/source/libraries/curlrequest/023.php
+++ b/user_guide_src/source/libraries/curlrequest/023.php
@@ -1,4 +1,4 @@
 <?php
 
 // Delay for 2 seconds
-$response->request('GET', 'http://example.com', ['delay' => 2000]);
+$client->request('GET', 'http://example.com', ['delay' => 2000]);
diff --git a/user_guide_src/source/libraries/curlrequest/030.php b/user_guide_src/source/libraries/curlrequest/030.php
index 83bf718e33e4..16c0c6fd6c49 100644
--- a/user_guide_src/source/libraries/curlrequest/030.php
+++ b/user_guide_src/source/libraries/curlrequest/030.php
@@ -1,3 +1,3 @@
 <?php
 
-$response->request('GET', 'http://example.com', ['timeout' => 5]);
+$client->request('GET', 'http://example.com', ['timeout' => 5]);
diff --git a/user_guide_src/source/libraries/curlrequest/031.php b/user_guide_src/source/libraries/curlrequest/031.php
index 1709d6d90b9c..8023c84faa39 100644
--- a/user_guide_src/source/libraries/curlrequest/031.php
+++ b/user_guide_src/source/libraries/curlrequest/031.php
@@ -1,3 +1,3 @@
 <?php
 
-$response->request('GET', 'http://example.com', ['user_agent' => 'CodeIgniter Framework v4']);
+$client->request('GET', 'http://example.com', ['user_agent' => 'CodeIgniter Framework v4']);
diff --git a/user_guide_src/source/libraries/curlrequest/034.php b/user_guide_src/source/libraries/curlrequest/034.php
index 1560cd589fec..9e343aa9d9da 100644
--- a/user_guide_src/source/libraries/curlrequest/034.php
+++ b/user_guide_src/source/libraries/curlrequest/034.php
@@ -1,3 +1,3 @@
 <?php
 
-$response->request('GET', 'http://example.com', ['debug' => true]);
+$client->request('GET', 'http://example.com', ['debug' => true]);

From 830750edd49d9fe5219ff2f581afdfec63e93c56 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 9 Apr 2022 09:04:37 +0900
Subject: [PATCH 1921/2325] feat: throws exception when controller name in
 routes contains `/`

---
 system/Language/en/Router.php                |  1 +
 system/Router/Exceptions/RouterException.php | 10 ++++++++++
 system/Router/Router.php                     |  5 +++++
 tests/system/Router/RouterTest.php           | 12 ++++++++++++
 4 files changed, 28 insertions(+)

diff --git a/system/Language/en/Router.php b/system/Language/en/Router.php
index 90aaa132b489..7d0b5cc99e25 100644
--- a/system/Language/en/Router.php
+++ b/system/Language/en/Router.php
@@ -14,4 +14,5 @@
     'invalidParameter'         => 'A parameter does not match the expected type.',
     'missingDefaultRoute'      => 'Unable to determine what should be displayed. A default route has not been specified in the routing file.',
     'invalidDynamicController' => 'A dynamic controller is not allowed for security reasons. Route handler: {0}',
+    'invalidControllerName'    => 'The namespace delimiter is a backslash (\), not a slash (/). Route handler: {0}',
 ];
diff --git a/system/Router/Exceptions/RouterException.php b/system/Router/Exceptions/RouterException.php
index b50042b3421b..5a510e4716fe 100644
--- a/system/Router/Exceptions/RouterException.php
+++ b/system/Router/Exceptions/RouterException.php
@@ -68,4 +68,14 @@ public static function forDynamicController(string $handler)
     {
         return new static(lang('Router.invalidDynamicController', [$handler]));
     }
+
+    /**
+     * Throw when controller name has `/`.
+     *
+     * @return RouterException
+     */
+    public static function forInvalidControllerName(string $handler)
+    {
+        return new static(lang('Router.invalidControllerName', [$handler]));
+    }
 }
diff --git a/system/Router/Router.php b/system/Router/Router.php
index 42f2eb0c7a42..37c88114172e 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -426,6 +426,11 @@ protected function checkRoutes(string $uri): bool
                         throw RouterException::forDynamicController($handler);
                     }
 
+                    // Checks `/` in controller name
+                    if (strpos($controller, '/') !== false) {
+                        throw RouterException::forInvalidControllerName($handler);
+                    }
+
                     if (strpos($routeKey, '/') !== false) {
                         $replacekey = str_replace('/(.*)', '', $routeKey);
                         $handler    = preg_replace('#^' . $routeKey . '$#u', $handler, $uri);
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index d3ca04422c41..38eb9b7ba48c 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -61,6 +61,7 @@ protected function setUp(): void
             'closure/(:num)/(:alpha)'                         => static fn ($num, $str) => $num . '-' . $str,
             '{locale}/pages'                                  => 'App\Pages::list_all',
             'admin/admins'                                    => 'App\Admin\Admins::list_all',
+            'admin/admins/edit/(:any)'                        => 'App/Admin/Admins::edit_show/$1',
             '/some/slash'                                     => 'App\Slash::index',
             'objects/(:segment)/sort/(:segment)/([A-Z]{3,7})' => 'AdminList::objectsSortCreate/$1/$2/$3',
             '(:segment)/(:segment)/(:segment)'                => '$2::$3/$1',
@@ -402,6 +403,17 @@ public function testRouteResource()
         $this->assertSame('list_all', $router->methodName());
     }
 
+    public function testRouteWithSlashInControllerName()
+    {
+        $this->expectExceptionMessage(
+            'The namespace delimiter is a backslash (\), not a slash (/). Route handler: \App/Admin/Admins::edit_show/$1'
+        );
+
+        $router = new Router($this->collection, $this->request);
+
+        $router->handle('admin/admins/edit/1');
+    }
+
     public function testRouteWithLeadingSlash()
     {
         $router = new Router($this->collection, $this->request);

From 1640b8f89b069d66d1318768371ab0ed9cb554bf Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 9 Apr 2022 09:29:24 +0900
Subject: [PATCH 1922/2325] docs: fix heading level

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

diff --git a/user_guide_src/source/outgoing/api_responses.rst b/user_guide_src/source/outgoing/api_responses.rst
index bdb853563e2b..0500a8ee92dd 100644
--- a/user_guide_src/source/outgoing/api_responses.rst
+++ b/user_guide_src/source/outgoing/api_responses.rst
@@ -56,8 +56,10 @@ So, if your request asks for JSON formatted data in an **Accept** header, the da
 ``respond*`` or ``fail*`` methods will be formatted by the ``CodeIgniter\Format\JSONFormatter`` class. The resulting
 JSON data will be sent back to the client.
 
+***************
 Class Reference
 ***************
+
 .. php:method:: setResponseFormat($format)
 
     :param string $format: The type of response to return, either ``json`` or ``xml``

From 7c137dc250553cb118435d50a52b03e48beeab65 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 9 Apr 2022 09:46:23 +0900
Subject: [PATCH 1923/2325] docs: add TOC

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

diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst
index 03d72ac160eb..2166dda681a4 100644
--- a/user_guide_src/source/installation/upgrade_4xx.rst
+++ b/user_guide_src/source/installation/upgrade_4xx.rst
@@ -25,6 +25,10 @@ them one by one.
 
 **Do read the user guide** before embarking on a project conversion!
 
+.. contents::
+    :local:
+    :depth: 2
+
 General Adjustments
 ===================
 

From fd6c6e5378c9358bd92713ee0d0f9d043e0fffcc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 9 Apr 2022 09:46:45 +0900
Subject: [PATCH 1924/2325] docs: fix heading underlines

---
 .../source/installation/upgrade_4xx.rst       | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_4xx.rst b/user_guide_src/source/installation/upgrade_4xx.rst
index 2166dda681a4..a97a2e339a29 100644
--- a/user_guide_src/source/installation/upgrade_4xx.rst
+++ b/user_guide_src/source/installation/upgrade_4xx.rst
@@ -30,18 +30,21 @@ them one by one.
     :depth: 2
 
 General Adjustments
-===================
+*******************
 
-**Downloads**
+Downloads
+=========
 
 - CI4 is still available as a ready-to-run zip or tarball.
 - It can also be installed using Composer.
 
-**Namespaces**
+Namespaces
+==========
 
 - CI4 is built for PHP 7.4+, and everything in the framework is namespaced, except for the helpers.
 
-**Application Structure**
+Application Structure
+=====================
 
 - The **application** folder is renamed as **app** and the framework still has **system** folders,
   with the same interpretation as before.
@@ -52,7 +55,8 @@ General Adjustments
 - There is no longer a nested **application/core** folder, as we have
   a different mechanism for extending framework components (see below).
 
-**Model, View and Controller**
+Model, View and Controller
+==========================
 
 - CodeIgniter is based on the MVC concept. Thus, the changes on the Model, View and Controller
   are one of the most important things you have to handle.
@@ -75,7 +79,8 @@ General Adjustments
     upgrade_views
     upgrade_controllers
 
-**Class loading**
+Class Loading
+=============
 
 - There is no longer a CodeIgniter "superobject", with framework component
   references magically injected as properties of your controller.
@@ -87,27 +92,31 @@ General Adjustments
 - You can configure the class loading to support whatever application structure
   you are most comfortable with, including the "HMVC" style.
 
-**Libraries**
+Libraries
+=========
 
 - Your app classes can still go inside **app/Libraries**, but they don't have to.
 - Instead of CI3's ``$this->load->library(x);`` you can now use
   ``$this->x = new X();``, following namespaced conventions for your component.
 
-**Helpers**
+Helpers
+=======
 
 - Helpers are pretty much the same as before, though some have been simplified.
 - In CI4, ``redirect()`` returns a ``RedirectResponse`` instance instead of redirecting and terminating script execution. You must return it.
     - `redirect() Documentation CodeIgniter 3.X <https://codeigniter.com/userguide3/helpers/url_helper.html#redirect>`_
     - `redirect() Documentation CodeIgniter 4.X <../general/common_functions.html#redirect>`_
 
-**Events**
+Events
+======
 
 - Hooks have been replaced by Events.
 - Instead of CI3's ``$hook['post_controller_constructor']`` you now use
   ``Events::on('post_controller_constructor', ['MyClass', 'MyFunction']);``, with the namespace ``CodeIgniter\Events\Events;``.
 - Events are always enabled, and are available globally.
 
-**Extending the framework**
+Extending the Framework
+=======================
 
 - You don't need a **core** folder to hold ``MY_...`` framework
   component extensions or replacements.
@@ -118,7 +127,7 @@ General Adjustments
   your components instead of the default ones.
 
 Upgrading Libraries
-===================
+*******************
 
 - Your app classes can still go inside **app/Libraries**, but they don't have to.
 - Instead of CI3's ``$this->load->library(x);`` you can now use ``$this->x = new X();``,

From ab0d86b96726e89ce3a27b87d45190c7ea8b7968 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 9 Apr 2022 10:43:07 +0900
Subject: [PATCH 1925/2325] docs: add link to the detailed page

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 0ed69ab0760a..c0081761ffd4 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -27,7 +27,7 @@ Enhancements
     - Added the config ``$autoNonce`` in ``Config\ContentSecurityPolicy`` to disable the CSP placeholder replacement
     - Added the functions ``csp_script_nonce()`` and ``csp_style_nonce()`` to get nonce attributes
     - See :ref:`content-security-policy` for details.
-- New View Decorators allow modifying the generated HTML prior to caching.
+- New :doc:`../outgoing/view_decorators` allow modifying the generated HTML prior to caching.
 - Added Subqueries in the FROM section. See :ref:`query-builder-from-subquery`.
 - Added Subqueries in the SELECT section. See :ref:`query-builder-select`.
 - Added Validation Strict Rules. See :ref:`validation-traditional-and-strict-rules`.

From 7f595062e2111b39a10a5300eca45cf8076908e8 Mon Sep 17 00:00:00 2001
From: Chl <chl@xlii.si>
Date: Fri, 8 Apr 2022 23:31:04 +0200
Subject: [PATCH 1926/2325] script_tag: cosmetic for value-less attributes

Some attributes are usually written without values, for example :
`<script defer async src="..." />`

This is purely cosmetic as the attribute should also be accepted with an empty
value or a value identical to the attribute's name :
https://dev.w3.org/html5/pf-summary/infrastructure.html#boolean-attribute
---
 system/Helpers/html_helper.php                |  5 +++--
 tests/system/Helpers/HTMLHelperTest.php       | 21 +++++++++++++++++++
 .../source/helpers/html_helper/011.php        |  4 ++--
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
index 868d1a27883e..0fc2f110399f 100755
--- a/system/Helpers/html_helper.php
+++ b/system/Helpers/html_helper.php
@@ -207,11 +207,12 @@ function script_tag($src = '', bool $indexPage = false): string
                     $script .= 'src="' . slash_item('baseURL') . $v . '" ';
                 }
             } else {
-                $script .= $k . '="' . $v . '" ';
+                // for attributes without values, like async or defer, use NULL.
+                $script .= $k . (is_null($v) ? ' ' : '="' . $v . '" ');
             }
         }
 
-        return $script . 'type="text/javascript"' . '></script>';
+        return $script . 'type="text/javascript"></script>';
     }
 }
 
diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index b3ed47d0c3e6..74b087228fdd 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -248,6 +248,27 @@ public function testScriptTagWithIndexpage()
         $this->assertSame($expected, script_tag($target, true));
     }
 
+    public function testScriptTagWithSrc()
+    {
+        $target   = ['src' => 'http://site.com/js/mystyles.js'];
+        $expected = '<script src="http://site.com/js/mystyles.js" type="text/javascript"></script>';
+        $this->assertSame($expected, script_tag($target));
+    }
+
+    public function testScriptTagWithSrcWithoutProtocol()
+    {
+        $target   = ['src' => 'js/mystyles.js'];
+        $expected = '<script src="http://example.com/js/mystyles.js" type="text/javascript"></script>';
+        $this->assertSame($expected, script_tag($target));
+    }
+
+    public function testScriptTagWithSrcAndAttributes()
+    {
+        $target   = ['src' => 'js/mystyles.js', 'charset' => 'UTF-8', 'defer' => '', 'async' => null];
+        $expected = '<script src="http://example.com/js/mystyles.js" charset="UTF-8" defer="" async type="text/javascript"></script>';
+        $this->assertSame($expected, script_tag($target));
+    }
+
     public function testLinkTag()
     {
         $target   = 'css/mystyles.css';
diff --git a/user_guide_src/source/helpers/html_helper/011.php b/user_guide_src/source/helpers/html_helper/011.php
index 126fd86c4952..f47bb7053770 100644
--- a/user_guide_src/source/helpers/html_helper/011.php
+++ b/user_guide_src/source/helpers/html_helper/011.php
@@ -1,6 +1,6 @@
 <?php
 
-$script = ['src' => 'js/printer.js'];
+$script = ['src' => 'js/printer.js', 'defer' => null];
 
 echo script_tag($script);
-// <script src="http://site.com/js/printer.js" type="text/javascript"></script>
+// <script src="http://site.com/js/printer.js" defer type="text/javascript"></script>

From a8d5b894c9ae17f1a8c8721eae44c0da22bec87c Mon Sep 17 00:00:00 2001
From: Chl <chl@xlii.si>
Date: Sun, 10 Apr 2022 03:10:15 +0200
Subject: [PATCH 1927/2325] coding style: cs-fixer is_null() rule

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

diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
index 0fc2f110399f..a15b18ff47e8 100755
--- a/system/Helpers/html_helper.php
+++ b/system/Helpers/html_helper.php
@@ -208,7 +208,7 @@ function script_tag($src = '', bool $indexPage = false): string
                 }
             } else {
                 // for attributes without values, like async or defer, use NULL.
-                $script .= $k . (is_null($v) ? ' ' : '="' . $v . '" ');
+                $script .= $k . (null === $v ? ' ' : '="' . $v . '" ');
             }
         }
 

From 16dde2391c09e725ea852685f41488d83d26f0d4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Apr 2022 18:16:27 +0900
Subject: [PATCH 1928/2325] fix: add Escaper Exception classes in $coreClassmap

---
 system/Config/AutoloadConfig.php | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/system/Config/AutoloadConfig.php b/system/Config/AutoloadConfig.php
index 13a6721fd2e6..79cad2ab8d25 100644
--- a/system/Config/AutoloadConfig.php
+++ b/system/Config/AutoloadConfig.php
@@ -12,6 +12,9 @@
 namespace CodeIgniter\Config;
 
 use Laminas\Escaper\Escaper;
+use Laminas\Escaper\Exception\ExceptionInterface;
+use Laminas\Escaper\Exception\InvalidArgumentException as EscaperInvalidArgumentException;
+use Laminas\Escaper\Exception\RuntimeException;
 use Psr\Log\AbstractLogger;
 use Psr\Log\InvalidArgumentException;
 use Psr\Log\LoggerAwareInterface;
@@ -103,15 +106,18 @@ class AutoloadConfig
      * @var array<string, string>
      */
     protected $coreClassmap = [
-        AbstractLogger::class           => SYSTEMPATH . 'ThirdParty/PSR/Log/AbstractLogger.php',
-        InvalidArgumentException::class => SYSTEMPATH . 'ThirdParty/PSR/Log/InvalidArgumentException.php',
-        LoggerAwareInterface::class     => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareInterface.php',
-        LoggerAwareTrait::class         => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareTrait.php',
-        LoggerInterface::class          => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerInterface.php',
-        LoggerTrait::class              => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerTrait.php',
-        LogLevel::class                 => SYSTEMPATH . 'ThirdParty/PSR/Log/LogLevel.php',
-        NullLogger::class               => SYSTEMPATH . 'ThirdParty/PSR/Log/NullLogger.php',
-        Escaper::class                  => SYSTEMPATH . 'ThirdParty/Escaper/Escaper.php',
+        AbstractLogger::class                  => SYSTEMPATH . 'ThirdParty/PSR/Log/AbstractLogger.php',
+        InvalidArgumentException::class        => SYSTEMPATH . 'ThirdParty/PSR/Log/InvalidArgumentException.php',
+        LoggerAwareInterface::class            => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareInterface.php',
+        LoggerAwareTrait::class                => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerAwareTrait.php',
+        LoggerInterface::class                 => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerInterface.php',
+        LoggerTrait::class                     => SYSTEMPATH . 'ThirdParty/PSR/Log/LoggerTrait.php',
+        LogLevel::class                        => SYSTEMPATH . 'ThirdParty/PSR/Log/LogLevel.php',
+        NullLogger::class                      => SYSTEMPATH . 'ThirdParty/PSR/Log/NullLogger.php',
+        ExceptionInterface::class              => SYSTEMPATH . 'ThirdParty/Escaper/Exception/ExceptionInterface.php',
+        EscaperInvalidArgumentException::class => SYSTEMPATH . 'ThirdParty/Escaper/Exception/InvalidArgumentException.php',
+        RuntimeException::class                => SYSTEMPATH . 'ThirdParty/Escaper/Exception/RuntimeException.php',
+        Escaper::class                         => SYSTEMPATH . 'ThirdParty/Escaper/Escaper.php',
     ];
 
     /**

From 61999b0205bb76825027d394ce54e00bf72eac16 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 13 Apr 2022 11:57:03 +0900
Subject: [PATCH 1929/2325] fix: multiple CLI::color() inside CLI::write()
 change color of strings that shouldn't be affected

---
 system/CLI/CLI.php           | 75 ++++++++++++++++++++++++------------
 tests/system/CLI/CLITest.php | 22 ++++++++++-
 2 files changed, 71 insertions(+), 26 deletions(-)

diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index 347a894f7578..4a55d2f7ef00 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -473,6 +473,10 @@ public static function color(string $text, string $foreground, ?string $backgrou
             return $text;
         }
 
+        if ($text === '') {
+            return $text;
+        }
+
         if (! array_key_exists($foreground, static::$foreground_colors)) {
             throw CLIException::forInvalidColor('foreground', $foreground);
         }
@@ -481,6 +485,51 @@ public static function color(string $text, string $foreground, ?string $backgrou
             throw CLIException::forInvalidColor('background', $background);
         }
 
+        // Reset text
+        $newText = '';
+
+        // Detect if color method was already in use with this text
+        if (strpos($text, "\033[0m") !== false) {
+            $pattern = '/\\033\\[0;.+?\\033\\[0m/u';
+
+            preg_match_all($pattern, $text, $matches);
+            $coloredStrings = $matches[0];
+
+            // No colored string found. Invalid strings with no `\033[0;??`.
+            if ($coloredStrings === []) {
+                $newText .= self::getColoredText($text, $foreground, $background, $format);
+
+                return $newText;
+            }
+
+            $nonColoredText = preg_replace(
+                $pattern,
+                '<<__colored_string__>>',
+                $text
+            );
+            $nonColoredChunks = preg_split(
+                '/<<__colored_string__>>/u',
+                $nonColoredText
+            );
+
+            foreach ($nonColoredChunks as $i => $chunk) {
+                if ($chunk !== '') {
+                    $newText .= self::getColoredText($chunk, $foreground, $background, $format);
+                }
+
+                if (isset($coloredStrings[$i])) {
+                    $newText .= $coloredStrings[$i];
+                }
+            }
+        } else {
+            $newText .= self::getColoredText($text, $foreground, $background, $format);
+        }
+
+        return $newText;
+    }
+
+    private static function getColoredText(string $text, string $foreground, ?string $background, ?string $format): string
+    {
         $string = "\033[" . static::$foreground_colors[$foreground] . 'm';
 
         if ($background !== null) {
@@ -491,31 +540,9 @@ public static function color(string $text, string $foreground, ?string $backgrou
             $string .= "\033[4m";
         }
 
-        // Detect if color method was already in use with this text
-        if (strpos($text, "\033[0m") !== false) {
-            // Split the text into parts so that we can see
-            // if any part missing the color definition
-            $chunks = mb_split('\\033\\[0m', $text);
-            // Reset text
-            $text = '';
-
-            foreach ($chunks as $chunk) {
-                if ($chunk === '') {
-                    continue;
-                }
-
-                // If chunk doesn't have colors defined we need to add them
-                if (strpos($chunk, "\033[") === false) {
-                    $chunk = static::color($chunk, $foreground, $background, $format);
-                    // Add color reset before chunk and clear end of the string
-                    $text .= rtrim("\033[0m" . $chunk, "\033[0m");
-                } else {
-                    $text .= $chunk;
-                }
-            }
-        }
+        $string .= $text . "\033[0m";
 
-        return $string . $text . "\033[0m";
+        return $string;
     }
 
     /**
diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php
index 107ac1463e67..0c2b81c0b3e4 100644
--- a/tests/system/CLI/CLITest.php
+++ b/tests/system/CLI/CLITest.php
@@ -122,6 +122,7 @@ public function testColorSupportOnNoColor()
 
         CLI::init(); // force re-check on env
         $this->assertSame('test', CLI::color('test', 'white', 'green'));
+
         putenv($nocolor ? "NO_COLOR={$nocolor}" : 'NO_COLOR');
     }
 
@@ -132,6 +133,7 @@ public function testColorSupportOnHyperTerminals()
 
         CLI::init(); // force re-check on env
         $this->assertSame("\033[1;37m\033[42m\033[4mtest\033[0m", CLI::color('test', 'white', 'green', 'underline'));
+
         putenv($termProgram ? "TERM_PROGRAM={$termProgram}" : 'TERM_PROGRAM');
     }
 
@@ -190,14 +192,30 @@ public function testWriteForeground()
     public function testWriteForegroundWithColorBefore()
     {
         CLI::write(CLI::color('green', 'green') . ' red', 'red');
-        $expected = "\033[0;31m\033[0;32mgreen\033[0m\033[0;31m red\033[0m" . PHP_EOL;
+
+        $expected = "\033[0;32mgreen\033[0m\033[0;31m red\033[0m" . PHP_EOL;
         $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
 
     public function testWriteForegroundWithColorAfter()
     {
         CLI::write('red ' . CLI::color('green', 'green'), 'red');
-        $expected = "\033[0;31mred \033[0;32mgreen\033[0m" . PHP_EOL;
+
+        $expected = "\033[0;31mred \033[0m\033[0;32mgreen\033[0m" . PHP_EOL;
+        $this->assertSame($expected, CITestStreamFilter::$buffer);
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5892
+     */
+    public function testWriteForegroundWithColorTwice()
+    {
+        CLI::write(
+            CLI::color('green', 'green') . ' red ' . CLI::color('green', 'green'),
+            'red'
+        );
+
+        $expected = "\033[0;32mgreen\033[0m\033[0;31m red \033[0m\033[0;32mgreen\033[0m" . PHP_EOL;
         $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
 

From f406f4aee220b3b85474219b3a4bf0397e914f48 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 13 Apr 2022 12:47:57 +0900
Subject: [PATCH 1930/2325] refactor: vendor/bin/rector process

---
 system/CLI/CLI.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index 4a55d2f7ef00..b43d0005ff77 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -497,9 +497,7 @@ public static function color(string $text, string $foreground, ?string $backgrou
 
             // No colored string found. Invalid strings with no `\033[0;??`.
             if ($coloredStrings === []) {
-                $newText .= self::getColoredText($text, $foreground, $background, $format);
-
-                return $newText;
+                return $newText . self::getColoredText($text, $foreground, $background, $format);
             }
 
             $nonColoredText = preg_replace(
@@ -540,9 +538,7 @@ private static function getColoredText(string $text, string $foreground, ?string
             $string .= "\033[4m";
         }
 
-        $string .= $text . "\033[0m";
-
-        return $string;
+        return $string . ($text . "\033[0m");
     }
 
     /**

From 7688add69c8b1e5e87daf04e173d937bd09e4f7f Mon Sep 17 00:00:00 2001
From: Pooya Parsa Dadashi <pooya_parsa_dadashi@yahoo.com>
Date: Wed, 13 Apr 2022 09:02:52 +0430
Subject: [PATCH 1931/2325] mailPath Alright!

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

diff --git a/user_guide_src/source/libraries/email.rst b/user_guide_src/source/libraries/email.rst
index b610e69a20df..1287f961713a 100644
--- a/user_guide_src/source/libraries/email.rst
+++ b/user_guide_src/source/libraries/email.rst
@@ -108,7 +108,7 @@ Preference          Default Value          Options                      Descript
 =================== ====================== ============================ =======================================================================
 **userAgent**       CodeIgniter            None                         The "user agent".
 **protocol**        mail                   mail, sendmail, or smtp      The mail sending protocol.
-**mailpath**        /usr/sbin/sendmail     None                         The server path to Sendmail.
+**mailPath**        /usr/sbin/sendmail     None                         The server path to Sendmail.
 **SMTPHost**        No Default             None                         SMTP Server Address.
 **SMTPUser**        No Default             None                         SMTP Username.
 **SMTPPass**        No Default             None                         SMTP Password.

From 8995da98a74748cbca558f13addcc422b743cc05 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 13 Apr 2022 21:24:16 +0900
Subject: [PATCH 1932/2325] test: add line breaks

---
 tests/system/CLI/CLITest.php | 51 +++++++++++++++++++++++++++++-------
 1 file changed, 42 insertions(+), 9 deletions(-)

diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php
index 0c2b81c0b3e4..2f569e5c81c5 100644
--- a/tests/system/CLI/CLITest.php
+++ b/tests/system/CLI/CLITest.php
@@ -39,18 +39,21 @@ protected function tearDown(): void
     public function testNew()
     {
         $actual = new CLI();
+
         $this->assertInstanceOf(CLI::class, $actual);
     }
 
     public function testBeep()
     {
         $this->expectOutputString("\x07");
+
         CLI::beep();
     }
 
     public function testBeep4()
     {
         $this->expectOutputString("\x07\x07\x07\x07");
+
         CLI::beep(4);
     }
 
@@ -96,6 +99,7 @@ public function testIsWindows()
     public function testNewLine()
     {
         $this->expectOutputString('');
+
         CLI::newLine();
     }
 
@@ -119,8 +123,8 @@ public function testColorSupportOnNoColor()
     {
         $nocolor = getenv('NO_COLOR');
         putenv('NO_COLOR=1');
-
         CLI::init(); // force re-check on env
+
         $this->assertSame('test', CLI::color('test', 'white', 'green'));
 
         putenv($nocolor ? "NO_COLOR={$nocolor}" : 'NO_COLOR');
@@ -130,8 +134,8 @@ public function testColorSupportOnHyperTerminals()
     {
         $termProgram = getenv('TERM_PROGRAM');
         putenv('TERM_PROGRAM=Hyper');
-
         CLI::init(); // force re-check on env
+
         $this->assertSame("\033[1;37m\033[42m\033[4mtest\033[0m", CLI::color('test', 'white', 'green', 'underline'));
 
         putenv($termProgram ? "TERM_PROGRAM={$termProgram}" : 'TERM_PROGRAM');
@@ -148,36 +152,41 @@ public function testColor()
         // After the tests on NO_COLOR and TERM_PROGRAM above,
         // the $isColored variable is rigged. So we reset this.
         CLI::init();
-        $this->assertSame("\033[1;37m\033[42m\033[4mtest\033[0m", CLI::color('test', 'white', 'green', 'underline'));
+
+        $this->assertSame(
+            "\033[1;37m\033[42m\033[4mtest\033[0m",
+            CLI::color('test', 'white', 'green', 'underline')
+        );
     }
 
     public function testPrint()
     {
         CLI::print('test');
-        $expected = 'test';
 
+        $expected = 'test';
         $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
 
     public function testPrintForeground()
     {
         CLI::print('test', 'red');
-        $expected = "\033[0;31mtest\033[0m";
 
+        $expected = "\033[0;31mtest\033[0m";
         $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
 
     public function testPrintBackground()
     {
         CLI::print('test', 'red', 'green');
-        $expected = "\033[0;31m\033[42mtest\033[0m";
 
+        $expected = "\033[0;31m\033[42mtest\033[0m";
         $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
 
     public function testWrite()
     {
         CLI::write('test');
+
         $expected = PHP_EOL . 'test' . PHP_EOL;
         $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
@@ -185,6 +194,7 @@ public function testWrite()
     public function testWriteForeground()
     {
         CLI::write('test', 'red');
+
         $expected = "\033[0;31mtest\033[0m" . PHP_EOL;
         $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
@@ -222,6 +232,7 @@ public function testWriteForegroundWithColorTwice()
     public function testWriteBackground()
     {
         CLI::write('test', 'red', 'green');
+
         $expected = "\033[0;31m\033[42mtest\033[0m" . PHP_EOL;
         $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
@@ -229,7 +240,9 @@ public function testWriteBackground()
     public function testError()
     {
         $this->stream_filter = stream_filter_append(STDERR, 'CITestStreamFilter');
+
         CLI::error('test');
+
         // red expected cuz stderr
         $expected = "\033[1;31mtest\033[0m" . PHP_EOL;
         $this->assertSame($expected, CITestStreamFilter::$buffer);
@@ -238,7 +251,9 @@ public function testError()
     public function testErrorForeground()
     {
         $this->stream_filter = stream_filter_append(STDERR, 'CITestStreamFilter');
+
         CLI::error('test', 'purple');
+
         $expected = "\033[0;35mtest\033[0m" . PHP_EOL;
         $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
@@ -246,7 +261,9 @@ public function testErrorForeground()
     public function testErrorBackground()
     {
         $this->stream_filter = stream_filter_append(STDERR, 'CITestStreamFilter');
+
         CLI::error('test', 'purple', 'green');
+
         $expected = "\033[0;35m\033[42mtest\033[0m" . PHP_EOL;
         $this->assertSame($expected, CITestStreamFilter::$buffer);
     }
@@ -291,9 +308,18 @@ public function testShowProgressWithoutBar()
     public function testWrap()
     {
         $this->assertSame('', CLI::wrap(''));
-        $this->assertSame('1234' . PHP_EOL . ' 5678' . PHP_EOL . ' 90' . PHP_EOL . ' abc' . PHP_EOL . ' de' . PHP_EOL . ' fghij' . PHP_EOL . ' 0987654321', CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', 5, 1));
-        $this->assertSame('1234 5678 90' . PHP_EOL . '  abc de fghij' . PHP_EOL . '  0987654321', CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', 999, 2));
-        $this->assertSame('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321'));
+        $this->assertSame(
+            '1234' . PHP_EOL . ' 5678' . PHP_EOL . ' 90' . PHP_EOL . ' abc' . PHP_EOL . ' de' . PHP_EOL . ' fghij' . PHP_EOL . ' 0987654321',
+            CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', 5, 1)
+        );
+        $this->assertSame(
+            '1234 5678 90' . PHP_EOL . '  abc de fghij' . PHP_EOL . '  0987654321',
+            CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321', 999, 2)
+        );
+        $this->assertSame(
+            '1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321',
+            CLI::wrap('1234 5678 90' . PHP_EOL . 'abc de fghij' . PHP_EOL . '0987654321')
+        );
     }
 
     public function testParseCommand()
@@ -305,6 +331,7 @@ public function testParseCommand()
         ];
         $_SERVER['argc'] = 3;
         CLI::init();
+
         $this->assertNull(CLI::getSegment(3));
         $this->assertSame('b', CLI::getSegment(1));
         $this->assertSame('c', CLI::getSegment(2));
@@ -330,6 +357,7 @@ public function testParseCommandMixed()
             'sure',
         ];
         CLI::init();
+
         $this->assertNull(CLI::getSegment(7));
         $this->assertSame('b', CLI::getSegment(1));
         $this->assertSame('c', CLI::getSegment(2));
@@ -353,6 +381,7 @@ public function testParseCommandOption()
             'd',
         ];
         CLI::init();
+
         $this->assertSame(['parm' => 'pvalue'], CLI::getOptions());
         $this->assertSame('pvalue', CLI::getOption('parm'));
         $this->assertSame('-parm pvalue ', CLI::getOptionString());
@@ -377,6 +406,7 @@ public function testParseCommandMultipleOptions()
             'value 3',
         ];
         CLI::init();
+
         $this->assertSame(['parm' => 'pvalue', 'p2' => null, 'p3' => 'value 3'], CLI::getOptions());
         $this->assertSame('pvalue', CLI::getOption('parm'));
         $this->assertSame('-parm pvalue -p2 -p3 "value 3" ', CLI::getOptionString());
@@ -391,11 +421,13 @@ public function testWindow()
         $height = new ReflectionProperty(CLI::class, 'height');
         $height->setAccessible(true);
         $height->setValue(null);
+
         $this->assertIsInt(CLI::getHeight());
 
         $width = new ReflectionProperty(CLI::class, 'width');
         $width->setAccessible(true);
         $width->setValue(null);
+
         $this->assertIsInt(CLI::getWidth());
     }
 
@@ -409,6 +441,7 @@ public function testWindow()
     public function testTable($tbody, $thead, $expected)
     {
         CLI::table($tbody, $thead);
+
         $this->assertSame(CITestStreamFilter::$buffer, $expected);
     }
 

From 1b26129b2443f7a083968b9bcf8f111e093878a5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 13 Apr 2022 21:28:55 +0900
Subject: [PATCH 1933/2325] test: add test

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

diff --git a/tests/system/CLI/CLITest.php b/tests/system/CLI/CLITest.php
index 2f569e5c81c5..a8452cdfa7a6 100644
--- a/tests/system/CLI/CLITest.php
+++ b/tests/system/CLI/CLITest.php
@@ -159,6 +159,14 @@ public function testColor()
         );
     }
 
+    public function testColorEmtpyString()
+    {
+        $this->assertSame(
+            '',
+            CLI::color('', 'white', 'green', 'underline')
+        );
+    }
+
     public function testPrint()
     {
         CLI::print('test');

From 768dd238f5eb85a516668f89bde8fc620e0a8022 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 14 Apr 2022 17:05:07 +0900
Subject: [PATCH 1934/2325] docs: improve Managing your Applications

- add note for composer.json autoload.psr-4
- change example from Zip install to Composer install
---
 .../source/general/managing_apps.rst          | 72 ++++++++++++++-----
 .../source/general/managing_apps/001.php      |  2 +
 .../source/general/managing_apps/005.php      | 12 ++++
 3 files changed, 67 insertions(+), 19 deletions(-)
 create mode 100644 user_guide_src/source/general/managing_apps/005.php

diff --git a/user_guide_src/source/general/managing_apps.rst b/user_guide_src/source/general/managing_apps.rst
index fc00dcd06985..ddba276825d2 100644
--- a/user_guide_src/source/general/managing_apps.rst
+++ b/user_guide_src/source/general/managing_apps.rst
@@ -8,10 +8,27 @@ directory. It is possible, however, to have multiple sets of
 applications that share a single CodeIgniter installation, or even to
 rename or relocate your application directory.
 
+.. important:: When you installed CodeIgniter v4.1.9 or before, and if there are ``App\\`` and ``Config\\`` namespaces in your ``/composer.json``'s ``autoload.psr-4`` like the following, you need to remove these lines, and run ``composer dump-autolod``.
+
+    .. code-block:: text
+
+        {
+            ...
+            "autoload": {
+                "psr-4": {
+                    "App\\": "app",             <-- Remove this line
+                    "Config\\": "app/Config"    <-- Remove this line
+                }
+            },
+            ...
+        }
+
 .. contents::
     :local:
     :depth: 2
 
+.. _renaming-app-directory:
+
 Renaming or Relocating the Application Directory
 ================================================
 
@@ -46,32 +63,49 @@ and **bar**. You could structure your application project directories like this:
 
 .. code-block:: text
 
-    /foo
-        /app
-        /public
-        /tests
-        /writable
+    foo/
+        app/
+        public/
+        tests/
+        writable/
+        env
+        phpunit.xml.dist
         spark
-    /bar
-        /app
-        /public
-        /tests
-        /writable
+    bar/
+        app/
+        public/
+        tests/
+        writable/
+        env
+        phpunit.xml.dist
         spark
-    /codeigniter
-        /system
+    vendor/
+        autoload.php
+        codeigniter4/framework/
+    composer.json
+    composer.lock
+
+.. note:: If you install CodeIgniter from the Zip file, the directory structure would be following:
+
+    .. code-block:: text
+
+        foo/
+        bar/
+        codeigniter4/system/
 
 This would have two apps, **foo** and **bar**, both having standard application directories
-and a **public** folder, and sharing a common **codeigniter** framework.
+and a **public** folder, and sharing a common **codeigniter4/framework**.
 
-The **index.php** inside each application would refer to its own configuration,
-``../app/Config/Paths.php``, and the ``$systemDirectory`` variable in **app/Config/Paths.php** inside each
-of those would be set to refer to the shared common **system** folder.
+The ``$systemDirectory`` variable in **app/Config/Paths.php** inside each
+of those would be set to refer to the shared common **codeigniter4/framework** folder:
 
-If either of the applications had a command-line component, then you would also
-modify **spark** inside each application's project folder, as directed above.
+.. literalinclude:: managing_apps/005.php
 
-When you use Composer autoloader, fix the ``COMPOSER_PATH`` constant in **app/Config/Constants.php** inside each
+.. note:: If you install CodeIgniter from the Zip file, the ``$systemDirectory`` would be ``__DIR__ . '/../../../codeigniter4/system'``.
+
+And modify the ``COMPOSER_PATH`` constant in **app/Config/Constants.php** inside each
 of those:
 
 .. literalinclude:: managing_apps/004.php
+
+Only when you change the Application Directory, see :ref:`renaming-app-directory` and modify the paths in the **index.php** and **spark**.
diff --git a/user_guide_src/source/general/managing_apps/001.php b/user_guide_src/source/general/managing_apps/001.php
index c116317678be..da4991fd738d 100644
--- a/user_guide_src/source/general/managing_apps/001.php
+++ b/user_guide_src/source/general/managing_apps/001.php
@@ -4,6 +4,8 @@
 
 class Paths
 {
+    // ...
+
     public $appDirectory = '/path/to/your/app';
 
     // ...
diff --git a/user_guide_src/source/general/managing_apps/005.php b/user_guide_src/source/general/managing_apps/005.php
new file mode 100644
index 000000000000..4f5cbf47244c
--- /dev/null
+++ b/user_guide_src/source/general/managing_apps/005.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Config;
+
+class Paths
+{
+    // ...
+
+    public $systemDirectory = __DIR__ . '/../../../vendor/codeigniter4/framework/system';
+
+    // ...
+}

From f18959447828a4c2f3659f8b940e986a87d64390 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 15 Apr 2022 11:16:07 +0900
Subject: [PATCH 1935/2325] docs: replace /app/ with app/

Because there are more places listed as app/.
---
 user_guide_src/source/cli/cli_commands.rst      | 4 ++--
 user_guide_src/source/concepts/autoloader.rst   | 4 ++--
 user_guide_src/source/concepts/mvc.rst          | 8 ++++----
 user_guide_src/source/general/configuration.rst | 6 +++---
 user_guide_src/source/incoming/controllers.rst  | 2 +-
 user_guide_src/source/libraries/throttler.rst   | 2 +-
 user_guide_src/source/libraries/validation.rst  | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/user_guide_src/source/cli/cli_commands.rst b/user_guide_src/source/cli/cli_commands.rst
index 30d92a195390..524ab80f3644 100644
--- a/user_guide_src/source/cli/cli_commands.rst
+++ b/user_guide_src/source/cli/cli_commands.rst
@@ -88,7 +88,7 @@ File Location
 =============
 
 Commands must be stored within a directory named **Commands**. However, that directory can be located anywhere
-that the :doc:`Autoloader </concepts/autoloader>` can locate it. This could be in **/app/Commands**, or
+that the :doc:`Autoloader </concepts/autoloader>` can locate it. This could be in **app/Commands**, or
 a directory that you keep commands in to use in all of your project development, like **Acme/Commands**.
 
 .. note:: When the commands are executed, the full CodeIgniter CLI environment has been loaded, making it
@@ -98,7 +98,7 @@ An Example Command
 ==================
 
 Let's step through an example command whose only function is to report basic information about the application
-itself, for demonstration purposes. Start by creating a new file at **/app/Commands/AppInfo.php**. It
+itself, for demonstration purposes. Start by creating a new file at **app/Commands/AppInfo.php**. It
 should contain the following code:
 
 .. literalinclude:: cli_commands/002.php
diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst
index b748e520fd98..06f6fa45025c 100644
--- a/user_guide_src/source/concepts/autoloader.rst
+++ b/user_guide_src/source/concepts/autoloader.rst
@@ -28,7 +28,7 @@ beginning of the framework's execution.
 Configuration
 =============
 
-Initial configuration is done in **/app/Config/Autoload.php**. This file contains two primary
+Initial configuration is done in **app/Config/Autoload.php**. This file contains two primary
 arrays: one for the classmap, and one for PSR-4 compatible namespaces.
 
 Namespaces
@@ -48,7 +48,7 @@ have a trailing slash.
 
 By default, the application folder is namespace to the ``App`` namespace. While you are not forced to namespace the controllers,
 libraries, or models in the application directory, if you do, they will be found under the ``App`` namespace.
-You may change this namespace by editing the **/app/Config/Constants.php** file and setting the
+You may change this namespace by editing the **app/Config/Constants.php** file and setting the
 new namespace value under the ``APP_NAMESPACE`` setting:
 
 .. literalinclude:: autoloader/002.php
diff --git a/user_guide_src/source/concepts/mvc.rst b/user_guide_src/source/concepts/mvc.rst
index 11aa8efcd0af..1338290cc8b0 100644
--- a/user_guide_src/source/concepts/mvc.rst
+++ b/user_guide_src/source/concepts/mvc.rst
@@ -37,11 +37,11 @@ Views get the data to display from the controllers, who pass it to the views as
 with simple ``echo`` calls. You can also display other views within a view, making it pretty simple to display a
 common header or footer on every page.
 
-Views are generally stored in **/app/Views**, but can quickly become unwieldy if not organized in some fashion.
+Views are generally stored in **app/Views**, but can quickly become unwieldy if not organized in some fashion.
 CodeIgniter does not enforce any type of organization, but a good rule of thumb would be to create a new directory in
 the **Views** directory for each controller. Then, name views by the method name. This makes them very easy to find later
 on. For example, a user's profile might be displayed in a controller named ``User``, and a method named ``profile``.
-You might store the view file for this method in **/app/Views/User/Profile.php**.
+You might store the view file for this method in **app/Views/User/Profile.php**.
 
 That type of organization works great as a base habit to get into. At times you might need to organize it differently.
 That's not a problem. As long as CodeIgniter can find the file, it can display it.
@@ -61,7 +61,7 @@ it's saved to meet company standards, or formatting a column in a certain way be
 By keeping these business requirements in the model, you won't repeat code throughout several controllers and accidentally
 miss updating an area.
 
-Models are typically stored in **/app/Models**, though they can use a namespace to be grouped however you need.
+Models are typically stored in **app/Models**, though they can use a namespace to be grouped however you need.
 
 :doc:`Find out more about models </models/model>`
 
@@ -77,7 +77,7 @@ The other responsibility of the controller is to handle everything that pertains
 authentication, web safety, encoding, etc. In short, the controller is where you make sure that people are allowed to
 be there, and they get the data they need in a format they can use.
 
-Controllers are typically stored in **/app/Controllers**, though they can use a namespace to be grouped however
+Controllers are typically stored in **app/Controllers**, though they can use a namespace to be grouped however
 you need.
 
 :doc:`Find out more about controllers </incoming/controllers>`
diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst
index 85bdc91fe62c..88d389c456a2 100644
--- a/user_guide_src/source/general/configuration.rst
+++ b/user_guide_src/source/general/configuration.rst
@@ -9,7 +9,7 @@ the required settings are public properties.
 Unlike many other frameworks, CodeIgniter configurable items aren't contained in
 a single file. Instead, each class that needs configurable items will have a
 configuration file with the same name as the class that uses it. You will find
-the application configuration files in the **/app/Config** folder.
+the application configuration files in the **app/Config** folder.
 
 .. contents::
     :local:
@@ -33,7 +33,7 @@ All configuration object properties are public, so you access the settings like
 .. literalinclude:: configuration/003.php
 
 If no namespace is provided, it will look for the file in all defined namespaces
-as well as **/app/Config/**.
+as well as **app/Config/**.
 
 All of the configuration files that ship with CodeIgniter are namespaced with
 ``Config``. Using this namespace in your application will provide the best
@@ -48,7 +48,7 @@ Creating Configuration Files
 ============================
 
 When you need a new configuration, first you create a new file at your desired location.
-The default file location (recommended for most cases) is **/app/Config**.
+The default file location (recommended for most cases) is **app/Config**.
 The class should use the appropriate namespace, and it should extend
 ``CodeIgniter\Config\BaseConfig`` to ensure that it can receive environment-specific settings.
 
diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index c5a963c81fdd..9074bf18046f 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -146,7 +146,7 @@ For security reasons be sure to declare any new utility methods as ``protected``
 
 .. literalinclude:: controllers/008.php
 
-Then save the file to your **/app/Controllers/** directory.
+Then save the file to your **app/Controllers/** directory.
 
 .. important:: The file must be called **Helloworld.php**, with a capital ``H``.
 
diff --git a/user_guide_src/source/libraries/throttler.rst b/user_guide_src/source/libraries/throttler.rst
index df0dfeb29d37..27a3283dae6e 100644
--- a/user_guide_src/source/libraries/throttler.rst
+++ b/user_guide_src/source/libraries/throttler.rst
@@ -64,7 +64,7 @@ Applying the Filter
 
 We don't necessarily need to throttle every page on the site. For many web applications, this makes the most sense
 to apply only to POST requests, though API's might want to limit every request made by a user. In order to apply
-this to incoming requests, you need to edit **/app/Config/Filters.php** and first add an alias to the
+this to incoming requests, you need to edit **app/Config/Filters.php** and first add an alias to the
 filter:
 
 .. literalinclude:: throttler/003.php
diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 8d3204804e92..641058b29a87 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -498,7 +498,7 @@ Creating the Views
 
 The first step is to create custom views. These can be placed anywhere that the ``view()`` method can locate them,
 which means the standard View directory, or any namespaced View folder will work. For example, you could create
-a new view at **/app/Views/_errors_list.php**:
+a new view at **app/Views/_errors_list.php**:
 
 .. literalinclude:: validation/030.php
 

From 33ef2742a96880e7eb1819305c7737f2ec59e94f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 15 Apr 2022 11:29:10 +0900
Subject: [PATCH 1936/2325] docs: small improvement

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

diff --git a/user_guide_src/source/intro/requirements.rst b/user_guide_src/source/intro/requirements.rst
index a55b8c46d0d9..974cf108c406 100644
--- a/user_guide_src/source/intro/requirements.rst
+++ b/user_guide_src/source/intro/requirements.rst
@@ -7,7 +7,10 @@ Server Requirements
 installed.
 
 The following PHP extensions should be enabled on your server:
-``php-json``, ``php-mysqlnd``, ``php-xml``
+
+  - ``php-json``
+  - ``php-mysqlnd`` (if you use MySQL)
+  - ``php-xml``
 
 In order to use the :doc:`CURLRequest </libraries/curlrequest>`, you will need
 `libcurl <https://www.php.net/manual/en/curl.requirements.php>`_ installed.
@@ -15,7 +18,7 @@ In order to use the :doc:`CURLRequest </libraries/curlrequest>`, you will need
 A database is required for most web application programming.
 Currently supported databases are:
 
-  - MySQL (5.1+) via the *MySQLi* driver
+  - MySQL via the *MySQLi* driver (version 5.1 and above only)
   - PostgreSQL via the *Postgre* driver
   - SQLite3 via the *SQLite3* driver
   - MSSQL via the *SQLSRV* driver (version 2005 and above only)

From 6c01476b8323b18c8838d3371cddaf643e44b4b8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 15 Apr 2022 11:56:03 +0900
Subject: [PATCH 1937/2325] docs: add TOC

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

diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst
index b748e520fd98..ecd4428a0cfa 100644
--- a/user_guide_src/source/concepts/autoloader.rst
+++ b/user_guide_src/source/concepts/autoloader.rst
@@ -2,6 +2,10 @@
 Autoloading Files
 #################
 
+.. contents::
+    :local:
+    :depth: 2
+
 Every application consists of a large number of classes in many different locations.
 The framework provides classes for core functionality. Your application will have a
 number of libraries, models, and other entities to make it work. You might have third-party

From a5c8c50cae82cb1acefcc83447eefc89c363eb68 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 15 Apr 2022 11:56:18 +0900
Subject: [PATCH 1938/2325] docs: remove out of dated description

The core classes are not added to the classmap.
---
 user_guide_src/source/concepts/autoloader.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst
index ecd4428a0cfa..577a70bf2430 100644
--- a/user_guide_src/source/concepts/autoloader.rst
+++ b/user_guide_src/source/concepts/autoloader.rst
@@ -18,8 +18,6 @@ It can locate individual namespaced classes that adhere to
 `PSR-4 <https://www.php-fig.org/psr/psr-4/>`_ autoloading
 directory structures.
 
-For performance improvement, the core CodeIgniter components have been added to the classmap.
-
 The autoloader works great by itself, but can also work with other autoloaders, like
 `Composer <https://getcomposer.org>`_, or even your own custom autoloaders, if needed.
 Because they're all registered through

From 5d737089b8e90fb6665404a1881fdf83cb944956 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 15 Apr 2022 11:58:10 +0900
Subject: [PATCH 1939/2325] docs: remove unneeded description

We don't need a trailing back slash, so escaping back slashes is not needed.
Double-quotes have nothing to do with escaping.
---
 user_guide_src/source/concepts/autoloader.rst | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst
index 577a70bf2430..7e931c677995 100644
--- a/user_guide_src/source/concepts/autoloader.rst
+++ b/user_guide_src/source/concepts/autoloader.rst
@@ -43,9 +43,8 @@ those classes can be found in:
 
 .. literalinclude:: autoloader/001.php
 
-The key of each row is the namespace itself. This does not need a trailing slash. If you use double-quotes
-to define the array, be sure to escape the backward slash. That means that it would be ``My\\App``,
-not ``My\App``. The value is the location to the directory the classes can be found in. They should
+The key of each row is the namespace itself. This does not need a trailing slash.
+The value is the location to the directory the classes can be found in. They should
 have a trailing slash.
 
 By default, the application folder is namespace to the ``App`` namespace. While you are not forced to namespace the controllers,

From 43fb2fc9b94ca90f8b7a52f8b48582cb20992273 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 15 Apr 2022 12:04:00 +0900
Subject: [PATCH 1940/2325] docs: add `back`

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

diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst
index 7e931c677995..5dd349065860 100644
--- a/user_guide_src/source/concepts/autoloader.rst
+++ b/user_guide_src/source/concepts/autoloader.rst
@@ -43,7 +43,7 @@ those classes can be found in:
 
 .. literalinclude:: autoloader/001.php
 
-The key of each row is the namespace itself. This does not need a trailing slash.
+The key of each row is the namespace itself. This does not need a trailing back slash.
 The value is the location to the directory the classes can be found in. They should
 have a trailing slash.
 

From c2bb64594ada1e76b3ad862f3d0f1909a0e24f5e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 15 Apr 2022 12:04:26 +0900
Subject: [PATCH 1941/2325] docs: fix the file path text decration

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

diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst
index 5dd349065860..3c68567486da 100644
--- a/user_guide_src/source/concepts/autoloader.rst
+++ b/user_guide_src/source/concepts/autoloader.rst
@@ -76,7 +76,7 @@ Composer Support
 
 Composer support is automatically initialized by default. By default, it looks for Composer's autoload file at
 ``ROOTPATH . 'vendor/autoload.php'``. If you need to change the location of that file for any reason, you can modify
-the value defined in ``Config\Constants.php``.
+the value defined in **app/Config/Constants.php**.
 
 .. note:: If the same namespace is defined in both CodeIgniter and Composer, CodeIgniter's autoloader will be
     the first one to get a chance to locate the file.

From 0208c720f256ee0b3257f1b9c6efd9fdb65548fd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 15 Apr 2022 14:00:25 +0900
Subject: [PATCH 1942/2325] fix: Composer PSR-4 overwrites
 Config\Autoload::$psr4

---
 system/Autoloader/Autoloader.php           |  2 +-
 tests/system/Autoloader/AutoloaderTest.php | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
index 520e669be685..311428fe4165 100644
--- a/system/Autoloader/Autoloader.php
+++ b/system/Autoloader/Autoloader.php
@@ -328,7 +328,7 @@ private function loadComposerNamespaces(ClassLoader $composer): void
             $newPaths[rtrim($key, '\\ ')] = $value;
         }
 
-        $this->prefixes = array_merge($this->prefixes, $newPaths);
+        $this->addNamespace($newPaths);
     }
 
     private function loadComposerClassmap(ClassLoader $composer): void
diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php
index 82e0307affad..1279910d2289 100644
--- a/tests/system/Autoloader/AutoloaderTest.php
+++ b/tests/system/Autoloader/AutoloaderTest.php
@@ -233,6 +233,23 @@ public function testFindsComposerRoutes()
         $this->assertArrayHasKey('Laminas\\Escaper', $namespaces);
     }
 
+    public function testComposerNamespaceDoesNotOverwriteConfigAutoloadPsr4()
+    {
+        $config       = new Autoload();
+        $config->psr4 = [
+            'Psr\Log' => '/Config/Autoload/Psr/Log/',
+        ];
+        $modules                     = new Modules();
+        $modules->discoverInComposer = true;
+
+        $this->loader = new Autoloader();
+        $this->loader->initialize($config, $modules);
+
+        $namespaces = $this->loader->getNamespace();
+        $this->assertSame('/Config/Autoload/Psr/Log/', $namespaces['Psr\Log'][0]);
+        $this->assertStringContainsString(VENDORPATH, $namespaces['Psr\Log'][1]);
+    }
+
     public function testFindsComposerRoutesWithComposerPathNotFound()
     {
         $composerPath = COMPOSER_PATH;

From c3ecc1971d1b6b1bbacfe67372c48b6eb07f15d7 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 8 Apr 2022 01:12:00 +0700
Subject: [PATCH 1943/2325] [PHPStan] Prepare for PHPStan 1.6.x-dev

---
 composer.json     | 2 +-
 phpstan.neon.dist | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 578156bd017c..e6935404bae9 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.3",
         "nexusphp/tachycardia": "^1.0",
-        "phpstan/phpstan": "^1.0",
+        "phpstan/phpstan": "1.6.x-dev",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
         "rector/rector": "0.12.20"
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 8aa28016ca33..cbacdfb82745 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -7,6 +7,10 @@ services:
 		class: Utils\PHPStan\CheckFrameworkExceptionInstantiationViaNamedConstructorRule
 		tags:
 			- phpstan.rules.rule
+	-
+		class: PhpParser\NodeVisitor\NodeConnectingVisitor
+		tags:
+			- phpstan.parser.richParserNodeVisitor
 
 includes:
 	- phpstan-baseline.neon.dist

From fc9a7b8fbd6274768069fa2da42d2ffd316fd213 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 15 Apr 2022 20:36:37 +0700
Subject: [PATCH 1944/2325] set conditional tag

---
 composer.json     | 2 +-
 phpstan.neon.dist | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index e6935404bae9..d3e0b85bdee8 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.3",
         "nexusphp/tachycardia": "^1.0",
-        "phpstan/phpstan": "1.6.x-dev",
+        "phpstan/phpstan": "^1.5.6",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
         "rector/rector": "0.12.20"
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index cbacdfb82745..e4832b125ae2 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -1,3 +1,7 @@
+conditionalTags:
+	PhpParser\NodeVisitor\NodeConnectingVisitor:
+		phpstan.parser.richParserNodeVisitor: true
+
 services:
 	-
 		class: Utils\PHPStan\CheckUseStatementsAfterLicenseRule
@@ -7,10 +11,6 @@ services:
 		class: Utils\PHPStan\CheckFrameworkExceptionInstantiationViaNamedConstructorRule
 		tags:
 			- phpstan.rules.rule
-	-
-		class: PhpParser\NodeVisitor\NodeConnectingVisitor
-		tags:
-			- phpstan.parser.richParserNodeVisitor
 
 includes:
 	- phpstan-baseline.neon.dist

From 9a60eb3d57671ffe2d69413136c8bcd2aba4c775 Mon Sep 17 00:00:00 2001
From: Pooya Parsa Dadashi <Pooya_parsa_dadashi@yahoo.com>
Date: Sun, 17 Apr 2022 01:18:58 +0330
Subject: [PATCH 1945/2325] docs:Correction due to 404 Not Found

---
 tests/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/README.md b/tests/README.md
index 0df329864c6b..80f9439d1e6d 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -18,7 +18,7 @@ If running under OS X or Linux, you can create a symbolic link to make running t
 
 	> ln -s ./vendor/bin/phpunit ./phpunit
 
-You also need to install [XDebug](https://xdebug.org/index.php) in order
+You also need to install [XDebug](https://xdebug.org/docs/install) in order
 for code coverage to be calculated successfully.
 
 ## Setting Up

From ae56d6c66260064b4d1c71629c3fb12d81d79d77 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Apr 2022 08:15:27 +0900
Subject: [PATCH 1946/2325] docs: remove out of dated comment

---
 system/CLI/CLI.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index b43d0005ff77..f017346604a7 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -485,7 +485,6 @@ public static function color(string $text, string $foreground, ?string $backgrou
             throw CLIException::forInvalidColor('background', $background);
         }
 
-        // Reset text
         $newText = '';
 
         // Detect if color method was already in use with this text

From 63207331448887c8ff81e675b7ac80b34cac15ed Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Apr 2022 08:17:48 +0900
Subject: [PATCH 1947/2325] refactor: combine if statements

---
 system/CLI/CLI.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index f017346604a7..ae61d50e41d4 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -469,11 +469,7 @@ public static function clearScreen()
      */
     public static function color(string $text, string $foreground, ?string $background = null, ?string $format = null): string
     {
-        if (! static::$isColored) {
-            return $text;
-        }
-
-        if ($text === '') {
+        if (! static::$isColored || $text === '') {
             return $text;
         }
 

From 9dcb39cb1e2d87bffb0cdc8c85be55253af2041d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Apr 2022 08:18:18 +0900
Subject: [PATCH 1948/2325] refacter: remove unneeded parentheses

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

diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
index ae61d50e41d4..d88374e80944 100644
--- a/system/CLI/CLI.php
+++ b/system/CLI/CLI.php
@@ -533,7 +533,7 @@ private static function getColoredText(string $text, string $foreground, ?string
             $string .= "\033[4m";
         }
 
-        return $string . ($text . "\033[0m");
+        return $string . $text . "\033[0m";
     }
 
     /**

From 2aa93487f2d22365eb18237b48e2fdbea3ddce44 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Apr 2022 08:27:32 +0900
Subject: [PATCH 1949/2325] docs: fix heading underlines

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

diff --git a/user_guide_src/source/cli/cli_library.rst b/user_guide_src/source/cli/cli_library.rst
index 4ea8e71e4996..8d269aeead09 100644
--- a/user_guide_src/source/cli/cli_library.rst
+++ b/user_guide_src/source/cli/cli_library.rst
@@ -15,7 +15,7 @@ CodeIgniter's CLI library makes creating interactive command-line scripts simple
     :depth: 2
 
 Initializing the Class
-======================
+**********************
 
 You do not need to create an instance of the CLI library, since all of it's methods are static. Instead, you simply
 need to ensure your controller can locate it via a ``use`` statement above your class:
@@ -25,7 +25,7 @@ need to ensure your controller can locate it via a ``use`` statement above your
 The class is automatically initialized when the file is loaded the first time.
 
 Getting Input from the User
-===========================
+***************************
 
 Sometimes you need to ask the user for more information. They might not have provided optional command-line
 arguments, or the script may have encountered an existing file and needs confirmation before overwriting. This is
@@ -66,7 +66,7 @@ Named keys are also possible:
 Finally, you can pass :ref:`validation <validation>` rules to the answer input as the third parameter, the acceptable answers are automatically restricted to the passed options.
 
 Providing Feedback
-==================
+******************
 
 **write()**
 

From 85670436edbc7a605f85d8898d61dec374455481 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Apr 2022 08:31:59 +0900
Subject: [PATCH 1950/2325] docs: change method names to headings

Otherwise, I can't link to it.
---
 user_guide_src/source/cli/cli_library.rst | 33 +++++++++++++++--------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/user_guide_src/source/cli/cli_library.rst b/user_guide_src/source/cli/cli_library.rst
index 8d269aeead09..bfb3a2479903 100644
--- a/user_guide_src/source/cli/cli_library.rst
+++ b/user_guide_src/source/cli/cli_library.rst
@@ -52,7 +52,8 @@ Validation rules can also be written in the array syntax:
 
 .. literalinclude:: cli_library/006.php
 
-**promptByKey()**
+promptByKey()
+=============
 
 Predefined answers (options) for prompt sometimes need to be described or are too complex to select via their value.
 ``promptByKey()`` allows the user to select an option by its key instead of its value:
@@ -68,7 +69,8 @@ Finally, you can pass :ref:`validation <validation>` rules to the answer input a
 Providing Feedback
 ******************
 
-**write()**
+write()
+=======
 
 Several methods are provided for you to provide feedback to your users. This can be as simple as a single status update
 or a complex table of information that wraps to the user's terminal window. At the core of this is the ``write()``
@@ -116,7 +118,8 @@ And a smaller number are available as background colors:
 * light_gray
 * magenta
 
-**print()**
+print()
+=======
 
 Print functions identically to the ``write()`` method, except that it does not force a newline either before or after.
 Instead it prints it to the screen wherever the cursor is currently. This allows you to print multiple items all on
@@ -125,7 +128,8 @@ print "Done" on the same line:
 
 .. literalinclude:: cli_library/012.php
 
-**color()**
+color()
+=======
 
 While the ``write()`` command will write a single line to the terminal, ending it with a EOL character, you can
 use the ``color()`` method to make a string fragment that can be used in the same way, except that it will not force
@@ -137,7 +141,8 @@ it inside of a ``write()`` method to create a string of a different color inside
 This example would write a single line to the window, with ``fileA`` in yellow, followed by a tab, and then
 ``/path/to/file`` in white text.
 
-**error()**
+error()
+=======
 
 If you need to output errors, you should use the appropriately named ``error()`` method. This writes light-red text
 to STDERR, instead of STDOUT, like ``write()`` and ``color()`` do. This can be useful if you have scripts watching
@@ -146,7 +151,8 @@ exactly as you would the ``write()`` method:
 
 .. literalinclude:: cli_library/014.php
 
-**wrap()**
+wrap()
+======
 
 This command will take a string, start printing it on the current line, and wrap it to a set length on new lines.
 This might be useful when displaying a list of options with descriptions that you want to wrap in the current
@@ -179,13 +185,15 @@ Would create something like this:
                industry's standard dummy
                text ever since the
 
-**newLine()**
+newLine()
+=========
 
 The ``newLine()`` method displays a blank line to the user. It does not take any parameters:
 
 .. literalinclude:: cli_library/018.php
 
-**clearScreen()**
+clearScreen()
+=============
 
 You can clear the current terminal window with the ``clearScreen()`` method. In most versions of Windows, this will
 simply insert 40 blank lines since Windows doesn't support this feature. Windows 10 bash integration should change
@@ -193,7 +201,8 @@ this:
 
 .. literalinclude:: cli_library/019.php
 
-**showProgress()**
+showProgress()
+==============
 
 If you have a long-running task that you would like to keep the user updated with the progress, you can use the
 ``showProgress()`` method which displays something like the following:
@@ -210,7 +219,8 @@ pass ``false`` as the first parameter and the progress bar will be removed.
 
 .. literalinclude:: cli_library/020.php
 
-**table()**
+table()
+=======
 
 .. literalinclude:: cli_library/021.php
 
@@ -223,7 +233,8 @@ pass ``false`` as the first parameter and the progress bar will be removed.
     | 8  | Another great item title | 2017-11-16 13:46:54 | 0      |
     +----+--------------------------+---------------------+--------+
 
-**wait()**
+wait()
+======
 
 Waits a certain number of seconds, optionally showing a wait message and
 waiting for a key press.

From c0ca99f51475e25d3fb87d9a7ed02dd74baf4725 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Apr 2022 08:38:10 +0900
Subject: [PATCH 1951/2325] docs: add changelog

---
 user_guide_src/source/changelogs/v4.2.0.rst | 1 +
 user_guide_src/source/cli/cli_library.rst   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index c0081761ffd4..449ad50f970d 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -18,6 +18,7 @@ BREAKING
     - ``spark``
 - The method signature of ``CodeIgniter\CLI\CommandRunner::_remap()`` has been changed to fix a bug.
 - The ``CodeIgniter\Autoloader\Autoloader::initialize()`` has changed the behavior to fix a bug. It used to use Composer classmap only when ``$modules->discoverInComposer`` is true. Now it always uses the Composer classmap if Composer is available.
+- The color code output by :ref:`CLI::color() <cli-library-color>` has been changed to fix a bug.
 
 Enhancements
 ************
diff --git a/user_guide_src/source/cli/cli_library.rst b/user_guide_src/source/cli/cli_library.rst
index bfb3a2479903..29bc6b252f88 100644
--- a/user_guide_src/source/cli/cli_library.rst
+++ b/user_guide_src/source/cli/cli_library.rst
@@ -128,6 +128,8 @@ print "Done" on the same line:
 
 .. literalinclude:: cli_library/012.php
 
+.. _cli-library-color:
+
 color()
 =======
 

From 4ad1edfdbb16ec7fc7dc903f832dd975e2063b4b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Apr 2022 13:07:27 +0900
Subject: [PATCH 1952/2325] docs: fix heading underline level

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

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index fa354d7c3aff..e626662bef2d 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -7,7 +7,7 @@ Using CodeIgniter's Model
     :depth: 2
 
 Models
-======
+******
 
 The CodeIgniter's Model provides convenience features and additional functionality
 that people commonly use to make working with a **single table** in your database more convenient.
@@ -17,7 +17,7 @@ methods for much of the standard ways you would need to interact with a database
 updating records, deleting records, and more.
 
 Accessing Models
-================
+****************
 
 Models are typically stored in the ``app/Models`` directory. They should have a namespace that matches their
 location within the directory, like ``namespace App\Models``.
@@ -27,7 +27,7 @@ You can access models within your classes by creating a new instance or using th
 .. literalinclude:: model/001.php
 
 CodeIgniter's Model
-===================
+*******************
 
 CodeIgniter does provide a model class that provides a few nice features, including:
 
@@ -41,7 +41,7 @@ This class provides a solid base from which to build your own models, allowing y
 rapidly build out your application's model layer.
 
 Creating Your Model
-===================
+*******************
 
 To take advantage of CodeIgniter's model, you would simply create a new model class
 that extends ``CodeIgniter\Model``:
@@ -58,7 +58,7 @@ extra steps without repeating the constructor parameters, for example extending
 .. literalinclude:: model/003.php
 
 Connecting to the Database
---------------------------
+==========================
 
 When the class is first instantiated, if no database connection instance is passed to the constructor,
 it will automatically connect to the default database group, as set in the configuration. You can
@@ -72,7 +72,7 @@ You would replace "group_name" with the name of a defined database group from th
 configuration file.
 
 Configuring Your Model
-----------------------
+======================
 
 The model class has a few configuration options that can be set to allow the class' methods
 to work seamlessly for you. The first two are used by all of the CRUD methods to determine
@@ -190,10 +190,10 @@ time specified in the property name.
 Whether the callbacks defined above should be used.
 
 Working With Data
-=================
+*****************
 
 Finding Data
-------------
+============
 
 Several functions are provided for doing basic CRUD work on your tables, including ``find()``,
 ``insert()``, ``update()``, ``delete()`` and more.
@@ -258,7 +258,7 @@ the next **find*()** methods to return only soft deleted rows:
 .. literalinclude:: model/014.php
 
 Saving Data
------------
+===========
 
 **insert()**
 
@@ -316,7 +316,7 @@ model's ``save()`` method to inspect the class, grab any public and private prop
     that provides several handy features that make developing Entities simpler.
 
 Deleting Data
--------------
+=============
 
 **delete()**
 
@@ -343,7 +343,7 @@ Cleans out the database table by permanently removing all rows that have 'delete
 .. literalinclude:: model/026.php
 
 Validating Data
----------------
+===============
 
 For many people, validating data in the model is the preferred way to ensure the data is kept to a single
 standard, without duplicating code. The Model class provides a way to automatically have all data validated
@@ -416,7 +416,7 @@ and simply set ``$validationRules`` to the name of the validation rule group you
 .. literalinclude:: model/034.php
 
 Retrieving Validation Rules
----------------------------
+===========================
 
 You can retrieve a model's validation rules by accessing its ``validationRules``
 property:
@@ -435,7 +435,7 @@ value an array of fieldnames of interest:
 .. literalinclude:: model/037.php
 
 Validation Placeholders
------------------------
+=======================
 
 The model provides a simple method to replace parts of your rules based on data that's being passed into it. This
 sounds fairly obscure but can be especially handy with the ``is_unique`` validation rule. Placeholders are simply
@@ -459,7 +459,7 @@ This can also be used to create more dynamic rules at runtime, as long as you ta
 keys passed in don't conflict with your form data.
 
 Protecting Fields
------------------
+=================
 
 To help protect against Mass Assignment Attacks, the Model class **requires** that you list all of the field names
 that can be changed during inserts and updates in the ``$allowedFields`` class property. Any data provided
@@ -474,7 +474,7 @@ testing, migrations, or seeds. In these cases, you can turn the protection on or
 .. literalinclude:: model/042.php
 
 Working With Query Builder
---------------------------
+==========================
 
 You can get access to a shared instance of the Query Builder for that model's database connection any time you
 need it:
@@ -501,7 +501,7 @@ very elegant use:
     .. literalinclude:: model/046.php
 
 Runtime Return Type Changes
-----------------------------
+===========================
 
 You can specify the format that data should be returned as when using the **find*()** methods as the class property,
 ``$returnType``. There may be times that you would like the data back in a different format, though. The Model
@@ -523,7 +523,7 @@ Returns data from the next **find*()** method as standard objects or custom clas
 .. literalinclude:: model/048.php
 
 Processing Large Amounts of Data
---------------------------------
+================================
 
 Sometimes, you need to process large amounts of data and would run the risk of running out of memory.
 To make this simpler, you may use the chunk() method to get smaller chunks of data that you can then
@@ -535,7 +535,7 @@ This is best used during cronjobs, data exports, or other large tasks.
 .. literalinclude:: model/049.php
 
 Model Events
-============
+************
 
 There are several points within the model's execution that you can specify multiple callback methods to run.
 These methods can be used to normalize data, hash passwords, save related entities, and much more. The following
@@ -543,7 +543,7 @@ points in the model's execution can be affected, each through a class property:
 ``$beforeUpdate``, ``$afterUpdate``, ``$afterFind``, and ``$afterDelete``.
 
 Defining Callbacks
-------------------
+==================
 
 You specify the callbacks by first creating a new class method in your model to use. This class will always
 receive a ``$data`` array as its only parameter. The exact contents of the ``$data`` array will vary between events, but
@@ -555,7 +555,7 @@ must return the original $data array so other callbacks have the full informatio
 .. literalinclude:: model/050.php
 
 Specifying Callbacks To Run
----------------------------
+===========================
 
 You specify when to run the callbacks by adding the method name to the appropriate class property (``$beforeInsert``, ``$afterUpdate``,
 etc). Multiple callbacks can be added to a single event and they will be processed one after the other. You can
@@ -572,7 +572,7 @@ You may also change this setting temporarily for a single model call sing the ``
 .. literalinclude:: model/053.php
 
 Event Parameters
-----------------
+================
 
 Since the exact data passed to each callback varies a bit, here are the details on what is in the ``$data`` parameter
 passed to each event:
@@ -607,7 +607,7 @@ afterDelete       **id** = primary key of row being deleted.
 ================ =========================================================================================================
 
 Modifying Find* Data
---------------------
+====================
 
 The ``beforeFind`` and ``afterFind`` methods can both return a modified set of data to override the normal response
 from the model. For ``afterFind`` any changes made to ``data`` in the return array will automatically be passed back
@@ -617,7 +617,7 @@ boolean, ``returnData``:
 .. literalinclude:: model/054.php
 
 Manual Model Creation
-=====================
+*********************
 
 You do not need to extend any special class to create a model for your application. All you need is to get an
 instance of the database connection and you're good to go. This allows you to bypass the features CodeIgniter's

From f3a34f72ff38fe9fb9ebfe95beb84daf512b043c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 18 Apr 2022 13:08:21 +0900
Subject: [PATCH 1953/2325] docs: change **foo** to headings

You can link to headings, but cannot link to `**foo**`.
---
 user_guide_src/source/models/model.rst | 101 ++++++++++++++++---------
 1 file changed, 67 insertions(+), 34 deletions(-)

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index e626662bef2d..84fdbf4be249 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -80,13 +80,15 @@ what table to use and how we can find the required records:
 
 .. literalinclude:: model/005.php
 
-**$table**
+$table
+------
 
 Specifies the database table that this model primarily works with. This only applies to the
 built-in CRUD methods. You are not restricted to using only this table in your own
 queries.
 
-**$primaryKey**
+$primaryKey
+-----------
 
 This is the name of the column that uniquely identifies the records in this table. This
 does not necessarily have to match the primary key that is specified in the database, but
@@ -95,7 +97,8 @@ is used with methods like ``find()`` to know what column to match the specified
 .. note:: All Models must have a primaryKey specified to allow all of the features to work
     as expected.
 
-**$useAutoIncrement**
+$useAutoIncrement
+-----------------
 
 Specifies if the table uses an auto-increment feature for ``$primaryKey``. If set to ``false``
 then you are responsible for providing primary key value for every record in the table. This
@@ -106,7 +109,8 @@ default value is ``true``.
     key in the database to ``unique``. This way you will make sure that all of Model's features
     will still work the same as before.
 
-**$returnType**
+$returnType
+-----------
 
 The Model's CRUD methods will take a step of work away from you and automatically return
 the resulting data, instead of the Result object. This setting allows you to define
@@ -114,7 +118,8 @@ the type of data that is returned. Valid values are '**array**' (the default), '
 qualified name of a class** that can be used with the Result object's ``getCustomResultObject()``
 method.
 
-**$useSoftDeletes**
+$useSoftDeletes
+---------------
 
 If true, then any ``delete()`` method calls will set ``deleted_at`` in the database, instead of
 actually deleting the row. This can preserve data when it might be referenced elsewhere, or
@@ -126,66 +131,81 @@ This requires either a DATETIME or INTEGER field in the database as per the mode
 ``$dateFormat`` setting. The default field name is ``deleted_at`` however this name can be
 configured to any name of your choice by using ``$deletedField`` property.
 
-**$allowedFields**
+$allowedFields
+--------------
 
 This array should be updated with the field names that can be set during ``save()``, ``insert()``, or
 ``update()`` methods. Any field names other than these will be discarded. This helps to protect
 against just taking input from a form and throwing it all at the model, resulting in
 potential mass assignment vulnerabilities.
 
-**$useTimestamps**
+$useTimestamps
+--------------
 
 This boolean value determines whether the current date is automatically added to all inserts
 and updates. If true, will set the current time in the format specified by ``$dateFormat``. This
 requires that the table have columns named **created_at** and **updated_at** in the appropriate
 data type.
 
-**$createdField**
+$createdField
+-------------
 
 Specifies which database field to use for data record create timestamp.
 Leave it empty to avoid updating it (even if ``$useTimestamps`` is enabled).
 
-**$updatedField**
+$updatedField
+-------------
 
 Specifies which database field should use for keep data record update timestamp.
 Leave it empty to avoid update it (even ``$useTimestamps`` is enabled).
 
-**$dateFormat**
+$dateFormat
+-----------
 
 This value works with ``$useTimestamps`` and ``$useSoftDeletes`` to ensure that the correct type of
 date value gets inserted into the database. By default, this creates DATETIME values, but
 valid options are: ``'datetime'``, ``'date'``, or ``'int'`` (a PHP timestamp). Using **useSoftDeletes** or
-**useTimestamps** with an invalid or missing dateFormat will cause an exception.
+useTimestamps with an invalid or missing dateFormat will cause an exception.
 
-**$validationRules**
+$validationRules
+----------------
 
 Contains either an array of validation rules as described in :ref:`validation-array`
 or a string containing the name of a validation group, as described in the same section.
 Described in more detail below.
 
-**$validationMessages**
+$validationMessages
+-------------------
 
 Contains an array of custom error messages that should be used during validation, as
 described in :ref:`validation-custom-errors`. Described in more detail below.
 
-**$skipValidation**
+$skipValidation
+---------------
 
 Whether validation should be skipped during all **inserts** and **updates**. The default
 value is false, meaning that data will always attempt to be validated. This is
 primarily used by the ``skipValidation()`` method, but may be changed to ``true`` so
 this model will never validate.
 
-**$beforeInsert**
-**$afterInsert**
-**$beforeUpdate**
-**$afterUpdate**
-**$afterFind**
-**$afterDelete**
+$beforeInsert
+-------------
+$afterInsert
+------------
+$beforeUpdate
+-------------
+$afterUpdate
+------------
+$afterFind
+----------
+$afterDelete
+------------
 
 These arrays allow you to specify callback methods that will be run on the data at the
 time specified in the property name.
 
-**$allowCallbacks**
+$allowCallbacks
+---------------
 
 Whether the callbacks defined above should be used.
 
@@ -198,7 +218,8 @@ Finding Data
 Several functions are provided for doing basic CRUD work on your tables, including ``find()``,
 ``insert()``, ``update()``, ``delete()`` and more.
 
-**find()**
+find()
+------
 
 Returns a single row where the primary key matches the value passed in as the first parameter:
 
@@ -214,7 +235,8 @@ of just one:
 If no parameters are passed in, will return all rows in that model's table, effectively acting
 like ``findAll()``, though less explicit.
 
-**findColumn()**
+findColumn()
+------------
 
 Returns null or an indexed array of column values:
 
@@ -222,7 +244,8 @@ Returns null or an indexed array of column values:
 
 ``$column_name`` should be a name of single column else you will get the DataException.
 
-**findAll()**
+findAll()
+---------
 
 Returns all results:
 
@@ -237,20 +260,23 @@ parameters, respectively:
 
 .. literalinclude:: model/011.php
 
-**first()**
+first()
+-------
 
 Returns the first row in the result set. This is best used in combination with the query builder.
 
 .. literalinclude:: model/012.php
 
-**withDeleted()**
+withDeleted()
+-------------
 
 If ``$useSoftDeletes`` is true, then the **find*()** methods will not return any rows where 'deleted_at IS NOT NULL'.
 To temporarily override this, you can use the ``withDeleted()`` method prior to calling the **find*()** method.
 
 .. literalinclude:: model/013.php
 
-**onlyDeleted()**
+onlyDeleted()
+-------------
 
 Whereas ``withDeleted()`` will return both deleted and not-deleted rows, this method modifies
 the next **find*()** methods to return only soft deleted rows:
@@ -260,7 +286,8 @@ the next **find*()** methods to return only soft deleted rows:
 Saving Data
 ===========
 
-**insert()**
+insert()
+--------
 
 An associative array of data is passed into this method as the only parameter to create a new
 row of data in the database. The array's keys must match the name of the columns in a ``$table``, while
@@ -268,7 +295,8 @@ the array's values are the values to save for that key:
 
 .. literalinclude:: model/015.php
 
-**update()**
+update()
+--------
 
 Updates an existing record in the database. The first parameter is the ``$primaryKey`` of the record to update.
 An associative array of data is passed into this method as the second parameter. The array's keys must match the name
@@ -285,7 +313,8 @@ update command, with the added benefit of validation, events, etc:
 
 .. literalinclude:: model/018.php
 
-**save()**
+save()
+------
 
 This is a wrapper around the ``insert()`` and ``update()`` methods that handle inserting or updating the record
 automatically, based on whether it finds an array key matching the **primary key** value:
@@ -318,7 +347,8 @@ model's ``save()`` method to inspect the class, grab any public and private prop
 Deleting Data
 =============
 
-**delete()**
+delete()
+--------
 
 Takes a primary key value as the first parameter and deletes the matching record from the model's table:
 
@@ -336,7 +366,8 @@ previously:
 
 .. literalinclude:: model/025.php
 
-**purgeDeleted()**
+purgeDeleted()
+--------------
 
 Cleans out the database table by permanently removing all rows that have 'deleted_at IS NOT NULL'.
 
@@ -510,13 +541,15 @@ provides methods that allow you to do just that.
 .. note:: These methods only change the return type for the next **find*()** method call. After that,
     it is reset to its default value.
 
-**asArray()**
+asArray()
+---------
 
 Returns data from the next **find*()** method as associative arrays:
 
 .. literalinclude:: model/047.php
 
-**asObject()**
+asObject()
+----------
 
 Returns data from the next **find*()** method as standard objects or custom class intances:
 

From 8f1b0c80f73745abfeb9354e491391cdb41a0863 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Apr 2022 15:02:55 +0000
Subject: [PATCH 1954/2325] chore(deps-dev): update rector/rector requirement

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

---
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 d3e0b85bdee8..9c1ee4adb46e 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.5.6",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.20"
+        "rector/rector": "0.12.21"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From 185754ed87b80dc846810097bd38e147a9bac4fb Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 18 Apr 2022 22:15:59 +0700
Subject: [PATCH 1955/2325] clean up removed service and updated to use new
 RectorConfig

---
 rector.php | 98 ++++++++++++++++++++++++++----------------------------
 1 file changed, 47 insertions(+), 51 deletions(-)

diff --git a/rector.php b/rector.php
index 9ee8a4217d21..79aa188aa94f 100644
--- a/rector.php
+++ b/rector.php
@@ -21,12 +21,11 @@
 use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector;
-use Rector\CodeQuality\Rector\Return_\SimplifyUselessVariableRector;
 use Rector\CodeQuality\Rector\Ternary\UnnecessaryTernaryExpressionRector;
 use Rector\CodingStyle\Rector\ClassMethod\FuncGetArgsToVariadicParamRector;
 use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector;
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
-use Rector\Core\Configuration\Option;
+use Rector\Config\RectorConfig;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector;
 use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector;
@@ -45,31 +44,31 @@
 use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
-use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Utils\Rector\PassStrictParameterToFunctionParameterRector;
 use Utils\Rector\RemoveErrorSuppressInTryCatchStmtsRector;
 use Utils\Rector\RemoveVarTagFromClassConstantRector;
 use Utils\Rector\UnderscoreToCamelCaseVariableNameRector;
 
-return static function (ContainerConfigurator $containerConfigurator): void {
-    $containerConfigurator->import(SetList::DEAD_CODE);
-    $containerConfigurator->import(LevelSetList::UP_TO_PHP_74);
-    $containerConfigurator->import(PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD);
-    $containerConfigurator->import(PHPUnitSetList::PHPUNIT_80);
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->sets([
+        SetList::DEAD_CODE,
+        LevelSetList::UP_TO_PHP_74,
+        PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD,
+        PHPUnitSetList::PHPUNIT_80,
+    ]);
 
-    $parameters = $containerConfigurator->parameters();
+    $rectorConfig->parallel();
 
-    $parameters->set(Option::PARALLEL, true);
     // paths to refactor; solid alternative to CLI arguments
-    $parameters->set(Option::PATHS, [__DIR__ . '/app', __DIR__ . '/system', __DIR__ . '/tests', __DIR__ . '/utils/Rector']);
+    $rectorConfig->paths([__DIR__ . '/app', __DIR__ . '/system', __DIR__ . '/tests', __DIR__ . '/utils/Rector']);
 
     // do you need to include constants, class aliases or custom autoloader? files listed will be executed
-    $parameters->set(Option::BOOTSTRAP_FILES, [
+    $rectorConfig->bootstrapFiles([
         __DIR__ . '/system/Test/bootstrap.php',
     ]);
 
     // is there a file you need to skip?
-    $parameters->set(Option::SKIP, [
+    $rectorConfig->skip([
         __DIR__ . '/app/Views',
         __DIR__ . '/system/Debug/Toolbar/Views/toolbar.tpl.php',
         __DIR__ . '/system/ThirdParty',
@@ -124,42 +123,39 @@
     ]);
 
     // auto import fully qualified class names
-    $parameters->set(Option::AUTO_IMPORT_NAMES, true);
-
-    $services = $containerConfigurator->services();
-    $services->set(UnderscoreToCamelCaseVariableNameRector::class);
-    $services->set(SimplifyUselessVariableRector::class);
-    $services->set(RemoveAlwaysElseRector::class);
-    $services->set(PassStrictParameterToFunctionParameterRector::class);
-    $services->set(CountArrayToEmptyArrayComparisonRector::class);
-    $services->set(ForToForeachRector::class);
-    $services->set(ChangeNestedForeachIfsToEarlyContinueRector::class);
-    $services->set(ChangeIfElseValueAssignToEarlyReturnRector::class);
-    $services->set(SimplifyStrposLowerRector::class);
-    $services->set(CombineIfRector::class);
-    $services->set(SimplifyIfReturnBoolRector::class);
-    $services->set(InlineIfToExplicitIfRector::class);
-    $services->set(PreparedValueToEarlyReturnRector::class);
-    $services->set(ShortenElseIfRector::class);
-    $services->set(SimplifyIfElseToTernaryRector::class);
-    $services->set(UnusedForeachValueToArrayKeysRector::class);
-    $services->set(ChangeArrayPushToArrayAssignRector::class);
-    $services->set(UnnecessaryTernaryExpressionRector::class);
-    $services->set(RemoveErrorSuppressInTryCatchStmtsRector::class);
-    $services->set(RemoveVarTagFromClassConstantRector::class);
-    $services->set(AddPregQuoteDelimiterRector::class);
-    $services->set(SimplifyRegexPatternRector::class);
-    $services->set(FuncGetArgsToVariadicParamRector::class);
-    $services->set(MakeInheritedMethodVisibilitySameAsParentRector::class);
-    $services->set(SimplifyEmptyArrayCheckRector::class);
-    $services->set(NormalizeNamespaceByPSR4ComposerAutoloadRector::class);
-    $services->set(StringClassNameToClassConstantRector::class)
-        ->configure([
-            'Error',
-            'Exception',
-            'InvalidArgumentException',
-            'Closure',
-            'stdClass',
-            'SQLite3',
-        ]);
+    $rectorConfig->importNames();
+
+    $rectorConfig->rule(UnderscoreToCamelCaseVariableNameRector::class);
+    $rectorConfig->rule(RemoveAlwaysElseRector::class);
+    $rectorConfig->rule(PassStrictParameterToFunctionParameterRector::class);
+    $rectorConfig->rule(CountArrayToEmptyArrayComparisonRector::class);
+    $rectorConfig->rule(ForToForeachRector::class);
+    $rectorConfig->rule(ChangeNestedForeachIfsToEarlyContinueRector::class);
+    $rectorConfig->rule(ChangeIfElseValueAssignToEarlyReturnRector::class);
+    $rectorConfig->rule(SimplifyStrposLowerRector::class);
+    $rectorConfig->rule(CombineIfRector::class);
+    $rectorConfig->rule(SimplifyIfReturnBoolRector::class);
+    $rectorConfig->rule(InlineIfToExplicitIfRector::class);
+    $rectorConfig->rule(PreparedValueToEarlyReturnRector::class);
+    $rectorConfig->rule(ShortenElseIfRector::class);
+    $rectorConfig->rule(SimplifyIfElseToTernaryRector::class);
+    $rectorConfig->rule(UnusedForeachValueToArrayKeysRector::class);
+    $rectorConfig->rule(ChangeArrayPushToArrayAssignRector::class);
+    $rectorConfig->rule(UnnecessaryTernaryExpressionRector::class);
+    $rectorConfig->rule(RemoveErrorSuppressInTryCatchStmtsRector::class);
+    $rectorConfig->rule(RemoveVarTagFromClassConstantRector::class);
+    $rectorConfig->rule(AddPregQuoteDelimiterRector::class);
+    $rectorConfig->rule(SimplifyRegexPatternRector::class);
+    $rectorConfig->rule(FuncGetArgsToVariadicParamRector::class);
+    $rectorConfig->rule(MakeInheritedMethodVisibilitySameAsParentRector::class);
+    $rectorConfig->rule(SimplifyEmptyArrayCheckRector::class);
+    $rectorConfig->rule(NormalizeNamespaceByPSR4ComposerAutoloadRector::class);
+    $rectorConfig->ruleWithConfiguration(StringClassNameToClassConstantRector::class, [
+        'Error',
+        'Exception',
+        'InvalidArgumentException',
+        'Closure',
+        'stdClass',
+        'SQLite3',
+    ]);
 };

From 4fd7ac58307590112e6bdb6add99c1d9d085e57f Mon Sep 17 00:00:00 2001
From: Chl <chl@xlii.si>
Date: Mon, 18 Apr 2022 16:43:20 +0200
Subject: [PATCH 1956/2325] script_tag: changelog, doc + test with default arg

---
 system/Helpers/html_helper.php                |  4 ++--
 tests/system/Helpers/HTMLHelperTest.php       | 10 ++++++++++
 user_guide_src/source/changelogs/v4.2.0.rst   |  1 +
 user_guide_src/source/helpers/html_helper.rst |  4 ++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/system/Helpers/html_helper.php b/system/Helpers/html_helper.php
index a15b18ff47e8..c2e48d890fef 100755
--- a/system/Helpers/html_helper.php
+++ b/system/Helpers/html_helper.php
@@ -189,8 +189,8 @@ function doctype(string $type = 'html5'): string
      *
      * Generates link to a JS file
      *
-     * @param mixed $src       Script source or an array
-     * @param bool  $indexPage Should indexPage be added to the JS path
+     * @param array|string $src       Script source or an array of attributes
+     * @param bool         $indexPage Should indexPage be added to the JS path
      */
     function script_tag($src = '', bool $indexPage = false): string
     {
diff --git a/tests/system/Helpers/HTMLHelperTest.php b/tests/system/Helpers/HTMLHelperTest.php
index 74b087228fdd..d539d7421be6 100755
--- a/tests/system/Helpers/HTMLHelperTest.php
+++ b/tests/system/Helpers/HTMLHelperTest.php
@@ -269,6 +269,16 @@ public function testScriptTagWithSrcAndAttributes()
         $this->assertSame($expected, script_tag($target));
     }
 
+    /**
+     * This test has probably no real-world value but may help detecting
+     * a change in the default behaviour.
+     */
+    public function testScriptTagWithoutAnyArg()
+    {
+        $expected = '<script src="http://example.com/" type="text/javascript"></script>';
+        $this->assertSame($expected, script_tag());
+    }
+
     public function testLinkTag()
     {
         $target   = 'css/mystyles.css';
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 0ed69ab0760a..fa88608dc355 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -38,6 +38,7 @@ Enhancements
     - The log format has also changed. If users are depending on the log format in their apps, the new log format is "<1-based count> <cleaned filepath>(<line>): <class><function><args>"
 - Added support for webp files to **app/Config/Mimes.php**.
 - Added 4th parameter ``$includeDir`` to ``get_filenames()``. See :php:func:`get_filenames`.
+- HTML helper ``script_tag()`` now uses ``null`` values to write boolean attributes in minimized form: ``<script src="..." defer />``. See the sample code for :php:func:`script_tag`.
 
 Changes
 *******
diff --git a/user_guide_src/source/helpers/html_helper.rst b/user_guide_src/source/helpers/html_helper.rst
index 44d0089ac6c7..220e94ebee64 100755
--- a/user_guide_src/source/helpers/html_helper.rst
+++ b/user_guide_src/source/helpers/html_helper.rst
@@ -104,8 +104,8 @@ The following functions are available:
 
 .. php:function:: script_tag([$src = ''[, $indexPage = false]])
 
-    :param  mixed  $src: The source name of a JavaScript file
-    :param  bool    $indexPage: Whether to treat ``$src`` as a routed URI string
+    :param  array|string  $src: The source name or URL of a JavaScript file, or an associative array specifying the attributes
+    :param  bool          $indexPage: Whether to treat ``$src`` as a routed URI string
     :returns:   HTML script tag
     :rtype: string
 

From 0a4393142f5fa4904be8c4dd42db28c1ffcea838 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 19 Apr 2022 18:55:03 +0700
Subject: [PATCH 1957/2325] [Rector] Add back SimplifyUselessVariableRector

---
 rector.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rector.php b/rector.php
index 79aa188aa94f..856d45f76553 100644
--- a/rector.php
+++ b/rector.php
@@ -17,6 +17,7 @@
 use Rector\CodeQuality\Rector\FuncCall\ChangeArrayPushToArrayAssignRector;
 use Rector\CodeQuality\Rector\FuncCall\SimplifyRegexPatternRector;
 use Rector\CodeQuality\Rector\FuncCall\SimplifyStrposLowerRector;
+use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector;
 use Rector\CodeQuality\Rector\If_\CombineIfRector;
 use Rector\CodeQuality\Rector\If_\ShortenElseIfRector;
 use Rector\CodeQuality\Rector\If_\SimplifyIfElseToTernaryRector;
@@ -126,6 +127,7 @@
     $rectorConfig->importNames();
 
     $rectorConfig->rule(UnderscoreToCamelCaseVariableNameRector::class);
+    $rectorConfig->rule(SimplifyUselessVariableRector::class);
     $rectorConfig->rule(RemoveAlwaysElseRector::class);
     $rectorConfig->rule(PassStrictParameterToFunctionParameterRector::class);
     $rectorConfig->rule(CountArrayToEmptyArrayComparisonRector::class);

From fbfc4bbab4851a8f35b2416ed98075ea590e835b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 8 Apr 2022 10:10:11 +0900
Subject: [PATCH 1958/2325] docs: update PHPDocs

---
 system/CodeIgniter.php                     |  2 ++
 system/Router/RouteCollectionInterface.php |  4 ++--
 system/Router/Router.php                   |  6 ++----
 system/Router/RouterInterface.php          | 21 +++++++++------------
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 093687254c77..3bc71d632993 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -792,6 +792,8 @@ protected function tryToRouteIt(?RouteCollectionInterface $routes = null)
     /**
      * Determines the path to use for us to try to route to, based
      * on user input (setPath), or the CLI/IncomingRequest path.
+     *
+     * @return string
      */
     protected function determinePath()
     {
diff --git a/system/Router/RouteCollectionInterface.php b/system/Router/RouteCollectionInterface.php
index a55b5d80a0b9..e5e4350a5db6 100644
--- a/system/Router/RouteCollectionInterface.php
+++ b/system/Router/RouteCollectionInterface.php
@@ -131,7 +131,7 @@ public function getDefaultMethod();
     /**
      * Returns the current value of the translateURIDashes setting.
      *
-     * @return mixed
+     * @return bool
      */
     public function shouldTranslateURIDashes();
 
@@ -145,7 +145,7 @@ public function shouldAutoRoute();
     /**
      * Returns the raw array of available routes.
      *
-     * @return mixed
+     * @return array
      */
     public function getRoutes();
 
diff --git a/system/Router/Router.php b/system/Router/Router.php
index 37c88114172e..477aa5db130d 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -115,8 +115,6 @@ class Router implements RouterInterface
 
     /**
      * Stores a reference to the RouteCollection object.
-     *
-     * @param Request $request
      */
     public function __construct(RouteCollectionInterface $routes, ?Request $request = null)
     {
@@ -132,7 +130,7 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request
      * @throws PageNotFoundException
      * @throws RedirectException
      *
-     * @return mixed|string
+     * @return Closure|string Controller classname or Closure
      */
     public function handle(?string $uri = null)
     {
@@ -204,7 +202,7 @@ public function getFilters(): array
     /**
      * Returns the name of the matched controller.
      *
-     * @return Closure|string
+     * @return Closure|string Controller classname or Closure
      */
     public function controllerName()
     {
diff --git a/system/Router/RouterInterface.php b/system/Router/RouterInterface.php
index e252b56decc8..1efeb2e2c6e2 100644
--- a/system/Router/RouterInterface.php
+++ b/system/Router/RouterInterface.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Router;
 
+use Closure;
 use CodeIgniter\HTTP\Request;
 
 /**
@@ -20,33 +21,29 @@ interface RouterInterface
 {
     /**
      * Stores a reference to the RouteCollection object.
-     *
-     * @param Request $request
      */
     public function __construct(RouteCollectionInterface $routes, ?Request $request = null);
 
     /**
-     * Scans the URI and attempts to match the current URI to the
-     * one of the defined routes in the RouteCollection.
+     * Finds the controller method corresponding to the URI.
      *
      * @param string $uri
      *
-     * @return mixed
+     * @return Closure|string Controller classname or Closure
      */
     public function handle(?string $uri = null);
 
     /**
      * Returns the name of the matched controller.
      *
-     * @return mixed
+     * @return Closure|string Controller classname or Closure
      */
     public function controllerName();
 
     /**
-     * Returns the name of the method to run in the
-     * chosen container.
+     * Returns the name of the method in the controller to run.
      *
-     * @return mixed
+     * @return string
      */
     public function methodName();
 
@@ -55,19 +52,19 @@ public function methodName();
      * during the parsing process as an array, ready to send to
      * instance->method(...$params).
      *
-     * @return mixed
+     * @return array
      */
     public function params();
 
     /**
      * Sets the value that should be used to match the index.php file. Defaults
-     * to index.php but this allows you to modify it in case your are using
+     * to index.php but this allows you to modify it in case you are using
      * something like mod_rewrite to remove the page. This allows you to set
      * it a blank.
      *
      * @param string $page
      *
-     * @return mixed
+     * @return RouterInterface
      */
     public function setIndexPage($page);
 }

From 1004321c8ef0c8221c19f50161abb06b37fa34dd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 8 Apr 2022 10:42:35 +0900
Subject: [PATCH 1959/2325] docs: add comments

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

diff --git a/system/Router/Router.php b/system/Router/Router.php
index 477aa5db130d..3d1cff12fcc3 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -120,6 +120,7 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request
     {
         $this->collection = $routes;
 
+        // These are only for auto-routing
         $this->controller = $this->collection->getDefaultController();
         $this->method     = $this->collection->getDefaultMethod();
 
@@ -137,7 +138,7 @@ public function handle(?string $uri = null)
         $this->translateURIDashes = $this->collection->shouldTranslateURIDashes();
 
         // If we cannot find a URI to match against, then
-        // everything runs off of it's default settings.
+        // everything runs off of its default settings.
         if ($uri === null || $uri === '') {
             return strpos($this->controller, '\\') === false
                 ? $this->collection->getDefaultNamespace() . $this->controller
@@ -151,6 +152,7 @@ public function handle(?string $uri = null)
         $this->filterInfo  = null;
         $this->filtersInfo = [];
 
+        // Checks defined routes
         if ($this->checkRoutes($uri)) {
             if ($this->collection->isFiltered($this->matchedRoute[0])) {
                 $multipleFiltersEnabled = config('Feature')->multipleFilters ?? false;
@@ -172,6 +174,7 @@ public function handle(?string $uri = null)
             throw new PageNotFoundException("Can't find a route for '{$uri}'.");
         }
 
+        // Checks auto routes
         $this->autoRoute($uri);
 
         return $this->controllerName();
@@ -336,6 +339,8 @@ public function getLocale()
     }
 
     /**
+     * Checks Defined Routs.
+     *
      * Compares the uri string against the routes that the
      * RouteCollection class defined for us, attempting to find a match.
      * This method will modify $this->controller, etal as needed.

From 56781cbcfd0e8768958654489fe5c4ac75a2ae34 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 8 Apr 2022 10:50:12 +0900
Subject: [PATCH 1960/2325] refactor: move property initialization to
 constructor

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

diff --git a/system/Router/Router.php b/system/Router/Router.php
index 3d1cff12fcc3..80e0d24fb9af 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -125,6 +125,8 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request
         $this->method     = $this->collection->getDefaultMethod();
 
         $this->collection->setHTTPVerb($request->getMethod() ?? strtolower($_SERVER['REQUEST_METHOD']));
+
+        $this->translateURIDashes = $this->collection->shouldTranslateURIDashes();
     }
 
     /**
@@ -135,8 +137,6 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request
      */
     public function handle(?string $uri = null)
     {
-        $this->translateURIDashes = $this->collection->shouldTranslateURIDashes();
-
         // If we cannot find a URI to match against, then
         // everything runs off of its default settings.
         if ($uri === null || $uri === '') {

From 0b505c62565a21d030e7f9efe0b7998528ecd2d7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 8 Apr 2022 13:50:07 +0900
Subject: [PATCH 1961/2325] refactor: extract AutoRouter class

---
 phpstan-baseline.neon.dist   |   7 +-
 system/Router/AutoRouter.php | 277 +++++++++++++++++++++++++++++++++++
 system/Router/Router.php     | 113 ++++----------
 3 files changed, 312 insertions(+), 85 deletions(-)
 create mode 100644 system/Router/AutoRouter.php

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index 53d3710b7ea7..6193a69d7c1c 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -722,9 +722,14 @@ parameters:
 
 		-
 			message: "#^Method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRoutes\\(\\) invoked with 1 parameter, 0 required\\.$#"
-			count: 2
+			count: 1
 			path: system/Router/Router.php
 
+		-
+			message: "#^Method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRoutes\\(\\) invoked with 1 parameter, 0 required\\.$#"
+			count: 1
+			path: system/Router/AutoRouter.php
+
 		-
 			message: "#^Property Config\\\\App\\:\\:\\$CSRF[a-zA-Z]+ \\([a-zA-Z]+\\) on left side of \\?\\? is not nullable\\.$#"
 			count: 6
diff --git a/system/Router/AutoRouter.php b/system/Router/AutoRouter.php
new file mode 100644
index 000000000000..3d43ffb28209
--- /dev/null
+++ b/system/Router/AutoRouter.php
@@ -0,0 +1,277 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Router;
+
+use CodeIgniter\Exceptions\PageNotFoundException;
+
+/**
+ * Router for Auto-Routing
+ */
+class AutoRouter
+{
+    /**
+     * A RouteCollection instance.
+     */
+    protected RouteCollectionInterface $collection;
+
+    /**
+     * Sub-directory that contains the requested controller class.
+     * Primarily used by 'autoRoute'.
+     */
+    protected ?string $directory = null;
+
+    /**
+     * The name of the controller class.
+     */
+    protected string $controller;
+
+    /**
+     * The name of the method to use.
+     */
+    protected string $method;
+
+    /**
+     * An array of params to the controller method.
+     */
+    protected array $params = [];
+
+    /**
+     * Whether dashes in URI's should be converted
+     * to underscores when determining method names.
+     */
+    protected bool $translateURIDashes;
+
+    /**
+     * HTTP verb for the request.
+     */
+    protected string $httpVerb;
+
+    /**
+     * Default namespace for controllers.
+     */
+    protected string $defaultNamespace;
+
+    public function __construct(
+        RouteCollectionInterface $routes,
+        string $defaultNamespace,
+        bool $translateURIDashes,
+        string $httpVerb
+    ) {
+        $this->collection         = $routes;
+        $this->defaultNamespace   = $defaultNamespace;
+        $this->translateURIDashes = $translateURIDashes;
+        $this->httpVerb           = $httpVerb;
+
+        $this->controller = $this->collection->getDefaultController();
+        $this->method     = $this->collection->getDefaultMethod();
+    }
+
+    /**
+     * Attempts to match a URI path against Controllers and directories
+     * found in APPPATH/Controllers, to find a matching route.
+     *
+     * @return array [directory_name, controller_name, controller_method, params]
+     */
+    public function getRoute(string $uri): array
+    {
+        $segments = explode('/', $uri);
+
+        // WARNING: Directories get shifted out of the segments array.
+        $segments = $this->scanControllers($segments);
+
+        // If we don't have any segments left - use the default controller;
+        // If not empty, then the first segment should be the controller
+        if (! empty($segments)) {
+            $this->controller = ucfirst(array_shift($segments));
+        }
+
+        $controllerName = $this->controllerName();
+
+        if (! $this->isValidSegment($controllerName)) {
+            throw new PageNotFoundException($this->controller . ' is not a valid controller name');
+        }
+
+        // Use the method name if it exists.
+        // If it doesn't, no biggie - the default method name
+        // has already been set.
+        if (! empty($segments)) {
+            $this->method = array_shift($segments) ?: $this->method;
+        }
+
+        // Prevent access to initController method
+        if (strtolower($this->method) === 'initcontroller') {
+            throw PageNotFoundException::forPageNotFound();
+        }
+
+        if (! empty($segments)) {
+            $this->params = $segments;
+        }
+
+        // Ensure routes registered via $routes->cli() are not accessible via web.
+        if ($this->httpVerb !== 'cli') {
+            $controller = '\\' . $this->defaultNamespace;
+
+            $controller .= $this->directory ? str_replace('/', '\\', $this->directory) : '';
+            $controller .= $controllerName;
+
+            $controller = strtolower($controller);
+            $methodName = strtolower($this->methodName());
+
+            foreach ($this->collection->getRoutes('cli') as $route) {
+                if (is_string($route)) {
+                    $route = strtolower($route);
+                    if (strpos($route, $controller . '::' . $methodName) === 0) {
+                        throw new PageNotFoundException();
+                    }
+
+                    if ($route === $controller) {
+                        throw new PageNotFoundException();
+                    }
+                }
+            }
+        }
+
+        // Load the file so that it's available for CodeIgniter.
+        $file = APPPATH . 'Controllers/' . $this->directory . $controllerName . '.php';
+        if (is_file($file)) {
+            include_once $file;
+        }
+
+        // Ensure the controller stores the fully-qualified class name
+        // We have to check for a length over 1, since by default it will be '\'
+        if (strpos($this->controller, '\\') === false && strlen($this->defaultNamespace) > 1) {
+            $this->controller = '\\' . ltrim(str_replace('/', '\\', $this->defaultNamespace . $this->directory . $controllerName), '\\');
+        }
+
+        return [$this->directory, $this->controllerName(), $this->methodName(), $this->params];
+    }
+
+    /**
+     * Tells the system whether we should translate URI dashes or not
+     * in the URI from a dash to an underscore.
+     */
+    public function setTranslateURIDashes(bool $val = false): self
+    {
+        $this->translateURIDashes = $val;
+
+        return $this;
+    }
+
+    /**
+     * Scans the controller directory, attempting to locate a controller matching the supplied uri $segments
+     *
+     * @param array $segments URI segments
+     *
+     * @return array returns an array of remaining uri segments that don't map onto a directory
+     */
+    protected function scanControllers(array $segments): array
+    {
+        $segments = array_filter($segments, static fn ($segment) => $segment !== '');
+        // numerically reindex the array, removing gaps
+        $segments = array_values($segments);
+
+        // if a prior directory value has been set, just return segments and get out of here
+        if (isset($this->directory)) {
+            return $segments;
+        }
+
+        // Loop through our segments and return as soon as a controller
+        // is found or when such a directory doesn't exist
+        $c = count($segments);
+
+        while ($c-- > 0) {
+            $segmentConvert = ucfirst($this->translateURIDashes === true ? str_replace('-', '_', $segments[0]) : $segments[0]);
+            // as soon as we encounter any segment that is not PSR-4 compliant, stop searching
+            if (! $this->isValidSegment($segmentConvert)) {
+                return $segments;
+            }
+
+            $test = APPPATH . 'Controllers/' . $this->directory . $segmentConvert;
+
+            // as long as each segment is *not* a controller file but does match a directory, add it to $this->directory
+            if (! is_file($test . '.php') && is_dir($test)) {
+                $this->setDirectory($segmentConvert, true, false);
+                array_shift($segments);
+
+                continue;
+            }
+
+            return $segments;
+        }
+
+        // This means that all segments were actually directories
+        return $segments;
+    }
+
+    /**
+     * Returns true if the supplied $segment string represents a valid PSR-4 compliant namespace/directory segment
+     *
+     * regex comes from https://www.php.net/manual/en/language.variables.basics.php
+     */
+    private function isValidSegment(string $segment): bool
+    {
+        return (bool) preg_match('/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*$/', $segment);
+    }
+
+    /**
+     * Sets the sub-directory that the controller is in.
+     *
+     * @param bool $validate if true, checks to make sure $dir consists of only PSR4 compliant segments
+     */
+    public function setDirectory(?string $dir = null, bool $append = false, bool $validate = true)
+    {
+        if (empty($dir)) {
+            $this->directory = null;
+
+            return;
+        }
+
+        if ($validate) {
+            $segments = explode('/', trim($dir, '/'));
+
+            foreach ($segments as $segment) {
+                if (! $this->isValidSegment($segment)) {
+                    return;
+                }
+            }
+        }
+
+        if ($append !== true || empty($this->directory)) {
+            $this->directory = trim($dir, '/') . '/';
+        } else {
+            $this->directory .= trim($dir, '/') . '/';
+        }
+    }
+
+    /**
+     * Returns the name of the sub-directory the controller is in,
+     * if any. Relative to APPPATH.'Controllers'.
+     */
+    public function directory(): string
+    {
+        return ! empty($this->directory) ? $this->directory : '';
+    }
+
+    private function controllerName(): string
+    {
+        return $this->translateURIDashes
+            ? str_replace('-', '_', $this->controller)
+            : $this->controller;
+    }
+
+    private function methodName(): string
+    {
+        return $this->translateURIDashes
+            ? str_replace('-', '_', $this->method)
+            : $this->method;
+    }
+}
diff --git a/system/Router/Router.php b/system/Router/Router.php
index 80e0d24fb9af..673d95bc1d9b 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -113,6 +113,11 @@ class Router implements RouterInterface
      */
     protected $filtersInfo = [];
 
+    /**
+     * @var AutoRouter|null
+     */
+    protected $autoRouter;
+
     /**
      * Stores a reference to the RouteCollection object.
      */
@@ -127,6 +132,13 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request
         $this->collection->setHTTPVerb($request->getMethod() ?? strtolower($_SERVER['REQUEST_METHOD']));
 
         $this->translateURIDashes = $this->collection->shouldTranslateURIDashes();
+
+        $this->autoRouter = new AutoRouter(
+            $this->collection,
+            $this->collection->getDefaultNamespace(),
+            $this->translateURIDashes,
+            $this->collection->getHTTPVerb()
+        );
     }
 
     /**
@@ -264,10 +276,12 @@ public function params(): array
      * if any. Relative to APPPATH.'Controllers'.
      *
      * Only used when auto-routing is turned on.
+     *
+     * @deprecated Moved to AutoRouter class.
      */
     public function directory(): string
     {
-        return ! empty($this->directory) ? $this->directory : '';
+        return $this->autoRouter->directory();
     }
 
     /**
@@ -309,10 +323,12 @@ public function setIndexPage($page): self
     /**
      * Tells the system whether we should translate URI dashes or not
      * in the URI from a dash to an underscore.
+     *
+     * @deprecated Moved to AutoRouter class.
      */
     public function setTranslateURIDashes(bool $val = false): self
     {
-        $this->translateURIDashes = $val;
+        $this->autoRouter->setTranslateURIDashes($val);
 
         return $this;
     }
@@ -467,78 +483,15 @@ protected function checkRoutes(string $uri): bool
     }
 
     /**
+     * Checks Auto Routs.
+     *
      * Attempts to match a URI path against Controllers and directories
      * found in APPPATH/Controllers, to find a matching route.
      */
     public function autoRoute(string $uri)
     {
-        $segments = explode('/', $uri);
-
-        // WARNING: Directories get shifted out of the segments array.
-        $segments = $this->scanControllers($segments);
-
-        // If we don't have any segments left - use the default controller;
-        // If not empty, then the first segment should be the controller
-        if (! empty($segments)) {
-            $this->controller = ucfirst(array_shift($segments));
-        }
-
-        $controllerName = $this->controllerName();
-        if (! $this->isValidSegment($controllerName)) {
-            throw new PageNotFoundException($this->controller . ' is not a valid controller name');
-        }
-
-        // Use the method name if it exists.
-        // If it doesn't, no biggie - the default method name
-        // has already been set.
-        if (! empty($segments)) {
-            $this->method = array_shift($segments) ?: $this->method;
-        }
-
-        // Prevent access to initController method
-        if (strtolower($this->method) === 'initcontroller') {
-            throw PageNotFoundException::forPageNotFound();
-        }
-
-        if (! empty($segments)) {
-            $this->params = $segments;
-        }
-
-        $defaultNamespace = $this->collection->getDefaultNamespace();
-        if ($this->collection->getHTTPVerb() !== 'cli') {
-            $controller = '\\' . $defaultNamespace;
-
-            $controller .= $this->directory ? str_replace('/', '\\', $this->directory) : '';
-            $controller .= $controllerName;
-
-            $controller = strtolower($controller);
-            $methodName = strtolower($this->methodName());
-
-            foreach ($this->collection->getRoutes('cli') as $route) {
-                if (is_string($route)) {
-                    $route = strtolower($route);
-                    if (strpos($route, $controller . '::' . $methodName) === 0) {
-                        throw new PageNotFoundException();
-                    }
-
-                    if ($route === $controller) {
-                        throw new PageNotFoundException();
-                    }
-                }
-            }
-        }
-
-        // Load the file so that it's available for CodeIgniter.
-        $file = APPPATH . 'Controllers/' . $this->directory . $controllerName . '.php';
-        if (is_file($file)) {
-            include_once $file;
-        }
-
-        // Ensure the controller stores the fully-qualified class name
-        // We have to check for a length over 1, since by default it will be '\'
-        if (strpos($this->controller, '\\') === false && strlen($defaultNamespace) > 1) {
-            $this->controller = '\\' . ltrim(str_replace('/', '\\', $defaultNamespace . $this->directory . $controllerName), '\\');
-        }
+        [$this->directory, $this->controller, $this->method, $this->params]
+            = $this->autoRouter->getRoute($uri);
     }
 
     /**
@@ -563,6 +516,8 @@ protected function validateRequest(array $segments): array
      * @param array $segments URI segments
      *
      * @return array returns an array of remaining uri segments that don't map onto a directory
+     *
+     * @deprecated Not used. Moved to AutoRouter class.
      */
     protected function scanControllers(array $segments): array
     {
@@ -607,6 +562,8 @@ protected function scanControllers(array $segments): array
      * Sets the sub-directory that the controller is in.
      *
      * @param bool $validate if true, checks to make sure $dir consists of only PSR4 compliant segments
+     *
+     * @deprecated Moved to AutoRouter class.
      */
     public function setDirectory(?string $dir = null, bool $append = false, bool $validate = true)
     {
@@ -616,27 +573,15 @@ public function setDirectory(?string $dir = null, bool $append = false, bool $va
             return;
         }
 
-        if ($validate) {
-            $segments = explode('/', trim($dir, '/'));
-
-            foreach ($segments as $segment) {
-                if (! $this->isValidSegment($segment)) {
-                    return;
-                }
-            }
-        }
-
-        if ($append !== true || empty($this->directory)) {
-            $this->directory = trim($dir, '/') . '/';
-        } else {
-            $this->directory .= trim($dir, '/') . '/';
-        }
+        $this->autoRouter->setDirectory($dir, $append, $validate);
     }
 
     /**
      * Returns true if the supplied $segment string represents a valid PSR-4 compliant namespace/directory segment
      *
      * regex comes from https://www.php.net/manual/en/language.variables.basics.php
+     *
+     * @deprecated Moved to AutoRouter class.
      */
     private function isValidSegment(string $segment): bool
     {

From eabb12c9cce9cc724977b0619638ec039eefce1a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 8 Apr 2022 14:26:52 +0900
Subject: [PATCH 1962/2325] style: break long lines

---
 system/Router/AutoRouter.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/system/Router/AutoRouter.php b/system/Router/AutoRouter.php
index 3d43ffb28209..149811149cf1 100644
--- a/system/Router/AutoRouter.php
+++ b/system/Router/AutoRouter.php
@@ -149,7 +149,14 @@ public function getRoute(string $uri): array
         // Ensure the controller stores the fully-qualified class name
         // We have to check for a length over 1, since by default it will be '\'
         if (strpos($this->controller, '\\') === false && strlen($this->defaultNamespace) > 1) {
-            $this->controller = '\\' . ltrim(str_replace('/', '\\', $this->defaultNamespace . $this->directory . $controllerName), '\\');
+            $this->controller = '\\' . ltrim(
+                str_replace(
+                    '/',
+                    '\\',
+                    $this->defaultNamespace . $this->directory . $controllerName
+                ),
+                '\\'
+            );
         }
 
         return [$this->directory, $this->controllerName(), $this->methodName(), $this->params];
@@ -189,7 +196,11 @@ protected function scanControllers(array $segments): array
         $c = count($segments);
 
         while ($c-- > 0) {
-            $segmentConvert = ucfirst($this->translateURIDashes === true ? str_replace('-', '_', $segments[0]) : $segments[0]);
+            $segmentConvert = ucfirst(
+                $this->translateURIDashes === true
+                    ? str_replace('-', '_', $segments[0])
+                    : $segments[0]
+            );
             // as soon as we encounter any segment that is not PSR-4 compliant, stop searching
             if (! $this->isValidSegment($segmentConvert)) {
                 return $segments;

From 43e11ba75eda71720432ed7095a5c440f145eea3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 11 Apr 2022 10:16:38 +0900
Subject: [PATCH 1963/2325] refactor: remove uneeded `=== true`

Co-authored-by: Mostafa Khudair <59371810+mostafakhudair@users.noreply.github.com>
---
 system/Router/AutoRouter.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/system/Router/AutoRouter.php b/system/Router/AutoRouter.php
index 149811149cf1..a03859141545 100644
--- a/system/Router/AutoRouter.php
+++ b/system/Router/AutoRouter.php
@@ -197,9 +197,7 @@ protected function scanControllers(array $segments): array
 
         while ($c-- > 0) {
             $segmentConvert = ucfirst(
-                $this->translateURIDashes === true
-                    ? str_replace('-', '_', $segments[0])
-                    : $segments[0]
+                $this->translateURIDashes ? str_replace('-', '_', $segments[0]) : $segments[0]
             );
             // as soon as we encounter any segment that is not PSR-4 compliant, stop searching
             if (! $this->isValidSegment($segmentConvert)) {

From dc912e09318c2584e4216f74ee73377e8dd06f09 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 11 Apr 2022 09:46:20 +0900
Subject: [PATCH 1964/2325] feat: add
 RouteCollection::getRegisteredControllers()

---
 phpstan-baseline.neon.dist                  |  6 +-
 system/Router/RouteCollection.php           | 51 +++++++++++
 tests/system/Router/RouteCollectionTest.php | 93 +++++++++++++++++++++
 3 files changed, 147 insertions(+), 3 deletions(-)

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index 6193a69d7c1c..7887ee6a3b03 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -716,19 +716,19 @@ parameters:
 			path: system/Router/Router.php
 
 		-
-			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
+			message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRegisteredControllers\\(\\)\\.$#"
 			count: 1
 			path: system/Router/Router.php
 
 		-
-			message: "#^Method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRoutes\\(\\) invoked with 1 parameter, 0 required\\.$#"
+			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
 			count: 1
 			path: system/Router/Router.php
 
 		-
 			message: "#^Method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRoutes\\(\\) invoked with 1 parameter, 0 required\\.$#"
 			count: 1
-			path: system/Router/AutoRouter.php
+			path: system/Router/Router.php
 
 		-
 			message: "#^Property Config\\\\App\\:\\:\\$CSRF[a-zA-Z]+ \\([a-zA-Z]+\\) on left side of \\?\\? is not nullable\\.$#"
diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index a1dd7b1a8fe7..4bb048991a99 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -105,6 +105,16 @@ class RouteCollection implements RouteCollectionInterface
      * An array of all routes and their mappings.
      *
      * @var array
+     *
+     * [
+     *     verb => [
+     *         routeName => [
+     *             'route' => [
+     *                 routeKey => handler,
+     *             ]
+     *         ]
+     *     ],
+     * ]
      */
     protected $routes = [
         '*'       => [],
@@ -1403,4 +1413,45 @@ public function setPrioritize(bool $enabled = true)
 
         return $this;
     }
+
+    /**
+     * Get all controllers in Route Handlers
+     *
+     * @param string|null $verb HTTP verb. `'*'` returns all controllers in any verb.
+     */
+    public function getRegisteredControllers(?string $verb = '*'): array
+    {
+        $routes = [];
+
+        if ($verb === '*') {
+            $rawRoutes = [];
+
+            foreach ($this->defaultHTTPMethods as $tmpVerb) {
+                $rawRoutes = array_merge($rawRoutes, $this->routes[$tmpVerb]);
+            }
+
+            foreach ($rawRoutes as $route) {
+                $key     = key($route['route']);
+                $handler = $route['route'][$key];
+
+                $routes[$key] = $handler;
+            }
+        } else {
+            $routes = $this->getRoutes($verb);
+        }
+
+        $controllers = [];
+
+        foreach ($routes as $handler) {
+            if (! is_string($handler)) {
+                continue;
+            }
+
+            [$controller] = explode('::', $handler, 2);
+
+            $controllers[] = $controller;
+        }
+
+        return array_unique($controllers);
+    }
 }
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index 513658b57642..7eb3f99f3128 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -1674,4 +1674,97 @@ public function testRoutePriorityValue()
         $collection->add('string-negative-integer', 'Controller::method', ['priority' => '-1']);
         $this->assertSame(1, $collection->getRoutesOptions('string-negative-integer')['priority']);
     }
+
+    public function testGetRegisteredControllersReturnsControllerForHTTPverb()
+    {
+        $collection = $this->getCollector();
+        $collection->get('test', '\App\Controllers\Hello::get');
+        $collection->post('test', '\App\Controllers\Hello::post');
+
+        $routes = $collection->getRegisteredControllers('get');
+
+        $expects = [
+            '\App\Controllers\Hello',
+        ];
+        $this->assertSame($expects, $routes);
+
+        $routes = $collection->getRegisteredControllers('post');
+
+        $expects = [
+            '\App\Controllers\Hello',
+        ];
+        $this->assertSame($expects, $routes);
+    }
+
+    public function testGetRegisteredControllersReturnsTwoControllers()
+    {
+        $collection = $this->getCollector();
+        $collection->post('test', '\App\Controllers\Test::post');
+        $collection->post('hello', '\App\Controllers\Hello::post');
+
+        $routes = $collection->getRegisteredControllers('post');
+
+        $expects = [
+            '\App\Controllers\Test',
+            '\App\Controllers\Hello',
+        ];
+        $this->assertSame($expects, $routes);
+    }
+
+    public function testGetRegisteredControllersReturnsOneControllerWhenTwoRoutsWithDiffernetMethods()
+    {
+        $collection = $this->getCollector();
+        $collection->post('test', '\App\Controllers\Test::test');
+        $collection->post('hello', '\App\Controllers\Test::hello');
+
+        $routes = $collection->getRegisteredControllers('post');
+
+        $expects = [
+            '\App\Controllers\Test',
+        ];
+        $this->assertSame($expects, $routes);
+    }
+
+    public function testGetRegisteredControllersReturnsAllControllers()
+    {
+        $collection = $this->getCollector();
+        $collection->get('test', '\App\Controllers\Hello::get');
+        $collection->post('test', '\App\Controllers\Hello::post');
+        $collection->post('hello', '\App\Controllers\Test::hello');
+
+        $routes = $collection->getRegisteredControllers('*');
+
+        $expects = [
+            '\App\Controllers\Hello',
+            '\App\Controllers\Test',
+        ];
+        $this->assertSame($expects, $routes);
+    }
+
+    public function testGetRegisteredControllersReturnsControllerByAddMethod()
+    {
+        $collection = $this->getCollector();
+        $collection->get('test', '\App\Controllers\Hello::get');
+        $collection->add('hello', '\App\Controllers\Test::hello');
+
+        $routes = $collection->getRegisteredControllers('get');
+
+        $expects = [
+            '\App\Controllers\Hello',
+            '\App\Controllers\Test',
+        ];
+        $this->assertSame($expects, $routes);
+    }
+
+    public function testGetRegisteredControllersDoesNotReturnClosures()
+    {
+        $collection = $this->getCollector();
+        $collection->get('feed', static function () {
+        });
+
+        $routes = $collection->getRegisteredControllers('*');
+
+        $expects = [];
+        $this->assertSame($expects, $routes);
+    }
 }

From c8169d68e4535d110d86d5c803fa81210a40d1a2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 11 Apr 2022 10:11:15 +0900
Subject: [PATCH 1965/2325] fix: can access controller by auto-routing when
 adding cli route with placeholder as a method

Example:
  $routes->setAutoRoute(true);
  $routes->cli('hello/(:segment)', 'Home::$1');
  Navigate to http://localhost:8080/home

- remove RouteCollection in AutoRouter
- improve TestCase
---
 system/Router/AutoRouter.php               | 35 +++++++++++-----------
 system/Router/Router.php                   |  4 ++-
 tests/system/Test/FeatureTestTraitTest.php | 24 +++++++++++----
 3 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/system/Router/AutoRouter.php b/system/Router/AutoRouter.php
index a03859141545..465d7ad47bb1 100644
--- a/system/Router/AutoRouter.php
+++ b/system/Router/AutoRouter.php
@@ -19,9 +19,9 @@
 class AutoRouter
 {
     /**
-     * A RouteCollection instance.
+     * Controller list that can't be accessible.
      */
-    protected RouteCollectionInterface $collection;
+    protected array $protectedControllers;
 
     /**
      * Sub-directory that contains the requested controller class.
@@ -61,18 +61,20 @@ class AutoRouter
     protected string $defaultNamespace;
 
     public function __construct(
-        RouteCollectionInterface $routes,
+        array $protectedControllers,
         string $defaultNamespace,
+        string $defaultController,
+        string $defaultMethod,
         bool $translateURIDashes,
         string $httpVerb
     ) {
-        $this->collection         = $routes;
-        $this->defaultNamespace   = $defaultNamespace;
-        $this->translateURIDashes = $translateURIDashes;
-        $this->httpVerb           = $httpVerb;
+        $this->protectedControllers = $protectedControllers;
+        $this->defaultNamespace     = $defaultNamespace;
+        $this->translateURIDashes   = $translateURIDashes;
+        $this->httpVerb             = $httpVerb;
 
-        $this->controller = $this->collection->getDefaultController();
-        $this->method     = $this->collection->getDefaultMethod();
+        $this->controller = $defaultController;
+        $this->method     = $defaultMethod;
     }
 
     /**
@@ -126,15 +128,12 @@ public function getRoute(string $uri): array
             $controller = strtolower($controller);
             $methodName = strtolower($this->methodName());
 
-            foreach ($this->collection->getRoutes('cli') as $route) {
-                if (is_string($route)) {
-                    $route = strtolower($route);
-                    if (strpos($route, $controller . '::' . $methodName) === 0) {
-                        throw new PageNotFoundException();
-                    }
-
-                    if ($route === $controller) {
-                        throw new PageNotFoundException();
+            foreach ($this->protectedControllers as $controllerInRoute) {
+                if (is_string($controllerInRoute)) {
+                    if (strtolower($controllerInRoute) === $controller) {
+                        throw new PageNotFoundException(
+                            'Cannot access the controller in a CLI Route. Controller: ' . $controllerInRoute
+                        );
                     }
                 }
             }
diff --git a/system/Router/Router.php b/system/Router/Router.php
index 673d95bc1d9b..2d2314cce5d7 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -134,8 +134,10 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request
         $this->translateURIDashes = $this->collection->shouldTranslateURIDashes();
 
         $this->autoRouter = new AutoRouter(
-            $this->collection,
+            $this->collection->getRegisteredControllers('cli'),
             $this->collection->getDefaultNamespace(),
+            $this->collection->getDefaultController(),
+            $this->collection->getDefaultMethod(),
             $this->translateURIDashes,
             $this->collection->getHTTPVerb()
         );
diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php
index 0a424aff4ad2..7fcb7cb13fe1 100644
--- a/tests/system/Test/FeatureTestTraitTest.php
+++ b/tests/system/Test/FeatureTestTraitTest.php
@@ -13,11 +13,10 @@
 
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\Response;
+use Config\Services;
 
 /**
- * @group                       DatabaseLive
- * @runTestsInSeparateProcesses
- * @preserveGlobalState         disabled
+ * @group DatabaseLive
  *
  * @internal
  */
@@ -32,6 +31,13 @@ protected function setUp(): void
         $this->skipEvents();
     }
 
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        $this->resetServices();
+    }
+
     public function testCallGet()
     {
         $this->withRoutes([
@@ -253,11 +259,16 @@ public function provideRoutesData()
                 'Hello::index',
                 'Hello',
             ],
-            'parameterized cli' => [
+            'parameterized param cli' => [
                 'hello/(:any)',
                 'Hello::index/$1',
                 'Hello/index/samsonasik',
             ],
+            'parameterized method cli' => [
+                'hello/(:segment)',
+                'Hello::$1',
+                'Hello/index',
+            ],
             'default method index' => [
                 'hello',
                 'Hello',
@@ -281,8 +292,11 @@ public function provideRoutesData()
     public function testOpenCliRoutesFromHttpGot404($from, $to, $httpGet)
     {
         $this->expectException(PageNotFoundException::class);
+        $this->expectExceptionMessage('Cannot access the controller in a CLI Route.');
 
-        require_once SUPPORTPATH . 'Controllers/Hello.php';
+        $collection = Services::routes();
+        $collection->setAutoRoute(true);
+        $collection->setDefaultNamespace('Tests\Support\Controllers');
 
         $this->withRoutes([
             [

From 0e42760154ad7e53fdb2c85e2c1dbbb9cae90472 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 11 Apr 2022 10:25:26 +0900
Subject: [PATCH 1966/2325] docs: remove @deprecated

This method is used by Toolbar.
---
 system/Router/Router.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/system/Router/Router.php b/system/Router/Router.php
index 2d2314cce5d7..ae42f56574e8 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -278,8 +278,6 @@ public function params(): array
      * if any. Relative to APPPATH.'Controllers'.
      *
      * Only used when auto-routing is turned on.
-     *
-     * @deprecated Moved to AutoRouter class.
      */
     public function directory(): string
     {

From 98cc70cfc715b90e9af46c6f52e3420f7f40ac21 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 11 Apr 2022 10:26:57 +0900
Subject: [PATCH 1967/2325] refactor: add property type

---
 system/Router/Router.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/system/Router/Router.php b/system/Router/Router.php
index ae42f56574e8..e3d84c06235a 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -113,10 +113,7 @@ class Router implements RouterInterface
      */
     protected $filtersInfo = [];
 
-    /**
-     * @var AutoRouter|null
-     */
-    protected $autoRouter;
+    protected ?AutoRouter $autoRouter;
 
     /**
      * Stores a reference to the RouteCollection object.

From 74a0364992897a3e002a57268d081605ef3cad48 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 11 Apr 2022 10:44:15 +0900
Subject: [PATCH 1968/2325] refactor: instantiate AutoRouter only when auto
 routing is enabled

---
 system/Router/Router.php           | 32 +++++++++++++++++++++---------
 tests/system/Router/RouterTest.php | 21 +++++++++++++++++++-
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/system/Router/Router.php b/system/Router/Router.php
index e3d84c06235a..1b9ec718ff11 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -113,7 +113,7 @@ class Router implements RouterInterface
      */
     protected $filtersInfo = [];
 
-    protected ?AutoRouter $autoRouter;
+    protected ?AutoRouter $autoRouter = null;
 
     /**
      * Stores a reference to the RouteCollection object.
@@ -130,14 +130,16 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request
 
         $this->translateURIDashes = $this->collection->shouldTranslateURIDashes();
 
-        $this->autoRouter = new AutoRouter(
-            $this->collection->getRegisteredControllers('cli'),
-            $this->collection->getDefaultNamespace(),
-            $this->collection->getDefaultController(),
-            $this->collection->getDefaultMethod(),
-            $this->translateURIDashes,
-            $this->collection->getHTTPVerb()
-        );
+        if ($this->collection->shouldAutoRoute()) {
+            $this->autoRouter = new AutoRouter(
+                $this->collection->getRegisteredControllers('cli'),
+                $this->collection->getDefaultNamespace(),
+                $this->collection->getDefaultController(),
+                $this->collection->getDefaultMethod(),
+                $this->translateURIDashes,
+                $this->collection->getHTTPVerb()
+            );
+        }
     }
 
     /**
@@ -278,6 +280,10 @@ public function params(): array
      */
     public function directory(): string
     {
+        if ($this->autoRouter === null) {
+            return '';
+        }
+
         return $this->autoRouter->directory();
     }
 
@@ -325,6 +331,10 @@ public function setIndexPage($page): self
      */
     public function setTranslateURIDashes(bool $val = false): self
     {
+        if ($this->autoRouter === null) {
+            return $this;
+        }
+
         $this->autoRouter->setTranslateURIDashes($val);
 
         return $this;
@@ -570,6 +580,10 @@ public function setDirectory(?string $dir = null, bool $append = false, bool $va
             return;
         }
 
+        if ($this->autoRouter === null) {
+            return;
+        }
+
         $this->autoRouter->setDirectory($dir, $append, $validate);
     }
 
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index 38eb9b7ba48c..be65a9d41460 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -200,6 +200,7 @@ public function testClosures()
 
     public function testAutoRouteFindsDefaultControllerAndMethod()
     {
+        $this->collection->setAutoRoute(true);
         $this->collection->setDefaultController('Test');
         $this->collection->setDefaultMethod('test');
         $router = new Router($this->collection, $this->request);
@@ -212,6 +213,7 @@ public function testAutoRouteFindsDefaultControllerAndMethod()
 
     public function testAutoRouteFindsControllerWithFileAndMethod()
     {
+        $this->collection->setAutoRoute(true);
         $router = new Router($this->collection, $this->request);
 
         $router->autoRoute('myController/someMethod');
@@ -222,6 +224,7 @@ public function testAutoRouteFindsControllerWithFileAndMethod()
 
     public function testAutoRouteFindsControllerWithFile()
     {
+        $this->collection->setAutoRoute(true);
         $router = new Router($this->collection, $this->request);
 
         $router->autoRoute('myController');
@@ -232,6 +235,7 @@ public function testAutoRouteFindsControllerWithFile()
 
     public function testAutoRouteFindsControllerWithSubfolder()
     {
+        $this->collection->setAutoRoute(true);
         $router = new Router($this->collection, $this->request);
 
         mkdir(APPPATH . 'Controllers/Subfolder');
@@ -246,6 +250,7 @@ public function testAutoRouteFindsControllerWithSubfolder()
 
     public function testAutoRouteFindsDashedSubfolder()
     {
+        $this->collection->setAutoRoute(true);
         $router = new Router($this->collection, $this->request);
         $router->setTranslateURIDashes(true);
 
@@ -262,6 +267,7 @@ public function testAutoRouteFindsDashedSubfolder()
 
     public function testAutoRouteFindsDashedController()
     {
+        $this->collection->setAutoRoute(true);
         $router = new Router($this->collection, $this->request);
         $router->setTranslateURIDashes(true);
 
@@ -280,6 +286,7 @@ public function testAutoRouteFindsDashedController()
 
     public function testAutoRouteFindsDashedMethod()
     {
+        $this->collection->setAutoRoute(true);
         $router = new Router($this->collection, $this->request);
         $router->setTranslateURIDashes(true);
 
@@ -298,6 +305,7 @@ public function testAutoRouteFindsDashedMethod()
 
     public function testAutoRouteFindsDefaultDashFolder()
     {
+        $this->collection->setAutoRoute(true);
         $router = new Router($this->collection, $this->request);
         $router->setTranslateURIDashes(true);
 
@@ -314,6 +322,7 @@ public function testAutoRouteFindsDefaultDashFolder()
 
     public function testAutoRouteFindsMByteDir()
     {
+        $this->collection->setAutoRoute(true);
         $router = new Router($this->collection, $this->request);
         $router->setTranslateURIDashes(true);
 
@@ -330,6 +339,7 @@ public function testAutoRouteFindsMByteDir()
 
     public function testAutoRouteFindsMByteController()
     {
+        $this->collection->setAutoRoute(true);
         $router = new Router($this->collection, $this->request);
         $router->setTranslateURIDashes(true);
 
@@ -345,6 +355,7 @@ public function testAutoRouteFindsMByteController()
 
     public function testAutoRouteRejectsSingleDot()
     {
+        $this->collection->setAutoRoute(true);
         $router = new Router($this->collection, $this->request);
         $router->setTranslateURIDashes(true);
 
@@ -355,6 +366,7 @@ public function testAutoRouteRejectsSingleDot()
 
     public function testAutoRouteRejectsDoubleDot()
     {
+        $this->collection->setAutoRoute(true);
         $router = new Router($this->collection, $this->request);
         $router->setTranslateURIDashes(true);
 
@@ -365,6 +377,7 @@ public function testAutoRouteRejectsDoubleDot()
 
     public function testAutoRouteRejectsMidDot()
     {
+        $this->collection->setAutoRoute(true);
         $router = new Router($this->collection, $this->request);
         $router->setTranslateURIDashes(true);
 
@@ -375,6 +388,7 @@ public function testAutoRouteRejectsMidDot()
 
     public function testAutoRouteRejectsInitController()
     {
+        $this->collection->setAutoRoute(true);
         $router = new Router($this->collection, $this->request);
         $router->setTranslateURIDashes(true);
 
@@ -706,6 +720,7 @@ public function testTranslateURIDashesForParams()
      */
     public function testTranslateURIDashesForAutoRoute()
     {
+        $this->collection->setAutoRoute(true);
         $router = new Router($this->collection, $this->request);
         $router->setTranslateURIDashes(true);
 
@@ -720,6 +735,7 @@ public function testTranslateURIDashesForAutoRoute()
      */
     public function testAutoRouteMatchesZeroParams()
     {
+        $this->collection->setAutoRoute(true);
         $router = new Router($this->collection, $this->request);
 
         $router->autoRoute('myController/someMethod/0/abc');
@@ -739,6 +755,7 @@ public function testAutoRouteMatchesZeroParams()
      */
     public function testAutoRouteMethodEmpty()
     {
+        $this->collection->setAutoRoute(true);
         $router = new Router($this->collection, $this->request);
         $this->collection->setAutoRoute(true);
 
@@ -789,8 +806,8 @@ public function testRegularExpressionPlaceholderWithUnicode()
 
     public function testRouterPriorDirectory()
     {
-        $router = new Router($this->collection, $this->request);
         $this->collection->setAutoRoute(true);
+        $router = new Router($this->collection, $this->request);
 
         $router->setDirectory('foo/bar/baz', false, true);
         $router->handle('Some_controller/some_method/param1/param2/param3');
@@ -802,6 +819,7 @@ public function testRouterPriorDirectory()
 
     public function testSetDirectoryValid()
     {
+        $this->collection->setAutoRoute(true);
         $router = new Router($this->collection, $this->request);
         $router->setDirectory('foo/bar/baz', false, true);
 
@@ -810,6 +828,7 @@ public function testSetDirectoryValid()
 
     public function testSetDirectoryInvalid()
     {
+        $this->collection->setAutoRoute(true);
         $router = new Router($this->collection, $this->request);
         $router->setDirectory('foo/bad-segment/bar', false, true);
 

From a98bde1b2d5ebf43511e6ae501875b750dd0bd2b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 11 Apr 2022 13:08:53 +0900
Subject: [PATCH 1969/2325] refactor: remove unneeded $this->params

---
 system/Router/AutoRouter.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/system/Router/AutoRouter.php b/system/Router/AutoRouter.php
index 465d7ad47bb1..1e5cf7af5a52 100644
--- a/system/Router/AutoRouter.php
+++ b/system/Router/AutoRouter.php
@@ -39,11 +39,6 @@ class AutoRouter
      */
     protected string $method;
 
-    /**
-     * An array of params to the controller method.
-     */
-    protected array $params = [];
-
     /**
      * Whether dashes in URI's should be converted
      * to underscores when determining method names.
@@ -114,8 +109,11 @@ public function getRoute(string $uri): array
             throw PageNotFoundException::forPageNotFound();
         }
 
+        /** @var array $params An array of params to the controller method. */
+        $params = [];
+
         if (! empty($segments)) {
-            $this->params = $segments;
+            $params = $segments;
         }
 
         // Ensure routes registered via $routes->cli() are not accessible via web.
@@ -158,7 +156,7 @@ public function getRoute(string $uri): array
             );
         }
 
-        return [$this->directory, $this->controllerName(), $this->methodName(), $this->params];
+        return [$this->directory, $this->controllerName(), $this->methodName(), $params];
     }
 
     /**

From 2c331f56672169465c1c59bba33d48f606644378 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 11 Apr 2022 17:02:40 +0900
Subject: [PATCH 1970/2325] refactor: run rector and php-cs-fixer

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

diff --git a/system/Router/AutoRouter.php b/system/Router/AutoRouter.php
index 1e5cf7af5a52..7de96f33205a 100644
--- a/system/Router/AutoRouter.php
+++ b/system/Router/AutoRouter.php
@@ -127,13 +127,16 @@ public function getRoute(string $uri): array
             $methodName = strtolower($this->methodName());
 
             foreach ($this->protectedControllers as $controllerInRoute) {
-                if (is_string($controllerInRoute)) {
-                    if (strtolower($controllerInRoute) === $controller) {
-                        throw new PageNotFoundException(
-                            'Cannot access the controller in a CLI Route. Controller: ' . $controllerInRoute
-                        );
-                    }
+                if (! is_string($controllerInRoute)) {
+                    continue;
                 }
+                if (strtolower($controllerInRoute) !== $controller) {
+                    continue;
+                }
+
+                throw new PageNotFoundException(
+                    'Cannot access the controller in a CLI Route. Controller: ' . $controllerInRoute
+                );
             }
         }
 

From 000c115bca7f3370b9148153cbcea5c3a3acd825 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Apr 2022 11:17:11 +0900
Subject: [PATCH 1971/2325] test: make Event simulate false in
 FeatureTestTraitTest tearDown()

In setUp() Event simulate is set to true, so it should be restored in tearDown().
---
 tests/system/Test/FeatureTestTraitTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/system/Test/FeatureTestTraitTest.php b/tests/system/Test/FeatureTestTraitTest.php
index 7fcb7cb13fe1..4636d58d3927 100644
--- a/tests/system/Test/FeatureTestTraitTest.php
+++ b/tests/system/Test/FeatureTestTraitTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Test;
 
+use CodeIgniter\Events\Events;
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\Response;
 use Config\Services;
@@ -35,6 +36,8 @@ protected function tearDown(): void
     {
         parent::tearDown();
 
+        Events::simulate(false);
+
         $this->resetServices();
     }
 

From 1ad510b61da47dd72c9bb4cb12a70ed75c45c4ea Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Apr 2022 11:24:26 +0900
Subject: [PATCH 1972/2325] test: fix MigrationRunnerTest

---
 .../Database/Migrations/MigrationRunnerTest.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php
index e97e4e38e56c..774137bc0f76 100644
--- a/tests/system/Database/Migrations/MigrationRunnerTest.php
+++ b/tests/system/Database/Migrations/MigrationRunnerTest.php
@@ -33,6 +33,12 @@ final class MigrationRunnerTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
+
+    // Do not migrate automatically, because we test migrations.
+    protected $migrate = false;
+
+    // Use specific migration files for this test case.
+    protected $namespace = 'Tests\Support\MigrationTestMigrations';
     protected $root;
     protected $start;
     protected $config;
@@ -62,6 +68,8 @@ protected function tearDown(): void
     {
         parent::tearDown();
 
+        // To delete data with `$this->regressDatabase()`, set it true.
+        $this->migrate = true;
         $this->regressDatabase();
     }
 
@@ -342,10 +350,11 @@ public function testLatestTriggersEvent()
     {
         $runner = new MigrationRunner($this->config);
         $runner->setSilent(false)
-            ->setNamespace('Tests\Support\MigrationTestMigrations')
-            ->clearHistory();
+            ->setNamespace('Tests\Support\MigrationTestMigrations');
 
         $result = null;
+
+        Events::removeAllListeners();
         Events::on('migrate', static function ($arg) use (&$result) {
             $result = $arg;
         });
@@ -360,10 +369,10 @@ public function testRegressTriggersEvent()
     {
         $runner = new MigrationRunner($this->config);
         $runner->setSilent(false)
-            ->setNamespace('Tests\Support\MigrationTestMigrations')
-            ->clearHistory();
+            ->setNamespace('Tests\Support\MigrationTestMigrations');
 
         $result = null;
+        Events::removeAllListeners();
         Events::on('migrate', static function ($arg) use (&$result) {
             $result = $arg;
         });

From 72ef96808bb81e23f1217bc7c08678e5ebb56e1e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 19 Apr 2022 13:36:11 +0900
Subject: [PATCH 1973/2325] docs: improve doc comment

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 system/Router/AutoRouter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Router/AutoRouter.php b/system/Router/AutoRouter.php
index 7de96f33205a..b1e14a2aa7f0 100644
--- a/system/Router/AutoRouter.php
+++ b/system/Router/AutoRouter.php
@@ -19,7 +19,7 @@
 class AutoRouter
 {
     /**
-     * Controller list that can't be accessible.
+     * List of controllers registered for the CLI verb that should not be accessed in the web.
      */
     protected array $protectedControllers;
 

From d899e0b71fef6a39f70a0a62209b052c886f3008 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 20 Apr 2022 14:58:33 +0900
Subject: [PATCH 1974/2325] refactor: remove unused variable

---
 system/Router/AutoRouter.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/system/Router/AutoRouter.php b/system/Router/AutoRouter.php
index b1e14a2aa7f0..bd55d7fae39c 100644
--- a/system/Router/AutoRouter.php
+++ b/system/Router/AutoRouter.php
@@ -124,7 +124,6 @@ public function getRoute(string $uri): array
             $controller .= $controllerName;
 
             $controller = strtolower($controller);
-            $methodName = strtolower($this->methodName());
 
             foreach ($this->protectedControllers as $controllerInRoute) {
                 if (! is_string($controllerInRoute)) {

From 3b405ad421fbb385619b984d7b027776c919bce6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 20 Apr 2022 15:10:26 +0900
Subject: [PATCH 1975/2325] docs: add changelog

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 449ad50f970d..67477d37cdf8 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -19,6 +19,7 @@ BREAKING
 - The method signature of ``CodeIgniter\CLI\CommandRunner::_remap()`` has been changed to fix a bug.
 - The ``CodeIgniter\Autoloader\Autoloader::initialize()`` has changed the behavior to fix a bug. It used to use Composer classmap only when ``$modules->discoverInComposer`` is true. Now it always uses the Composer classmap if Composer is available.
 - The color code output by :ref:`CLI::color() <cli-library-color>` has been changed to fix a bug.
+- To prevent unexpected access from the web browser, if a controller is added to a cli route (``$routes->cli()``), all methods of that controller are no longer accessible via auto routing.
 
 Enhancements
 ************

From 41ad06acf00eedecedeca5655882f209cbeb810c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 08:40:32 +0900
Subject: [PATCH 1976/2325] docs: fix heading underline level

---
 .../source/general/configuration.rst          | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst
index 88d389c456a2..312c2785e4d7 100644
--- a/user_guide_src/source/general/configuration.rst
+++ b/user_guide_src/source/general/configuration.rst
@@ -16,7 +16,7 @@ the application configuration files in the **app/Config** folder.
     :depth: 2
 
 Working With Configuration Files
-================================
+********************************
 
 You can access configuration files for your classes in several different ways.
 
@@ -45,7 +45,7 @@ that is not web-accessible while keeping it under **/app** for easy access
 during development.
 
 Creating Configuration Files
-============================
+****************************
 
 When you need a new configuration, first you create a new file at your desired location.
 The default file location (recommended for most cases) is **app/Config**.
@@ -57,14 +57,14 @@ Define the class and fill it with public properties that represent your settings
 .. literalinclude:: configuration/004.php
 
 Environment Variables
-=====================
+*********************
 
 One of today's best practices for application setup is to use Environment Variables. One reason for this is that Environment Variables are easy to change between deploys without changing any code. Configuration can change a lot across deploys, but code does not. For instance, multiple environments, such as the developer's local machine and the production server, usually need different configuration values for each particular setup.
 
 Environment Variables should also be used for anything private such as passwords, API keys, or other sensitive data.
 
 Environment Variables and CodeIgniter
-=====================================
+*************************************
 
 CodeIgniter makes it simple and painless to set Environment Variables by using a "dotenv" file. The term comes from the file name, which starts with a dot before the text "env".
 
@@ -94,7 +94,7 @@ overwritten. The loaded Environment variables are accessed using any of the foll
 .. warning:: Note that your settings from the **.env** file are added to Environment Variables. As a side effect, this means that if your CodeIgniter application is (for example) generating a ``var_dump($_ENV)`` or ``phpinfo()`` (for debugging or other valid reasons) **your secure credentials are publicly exposed**.
 
 Nesting Variables
-=================
+*****************
 
 To save on typing, you can reuse variables that you've already specified in the file by wrapping the
 variable name within ``${...}``:
@@ -106,7 +106,7 @@ variable name within ``${...}``:
     TMP_DIR="${BASE_DIR}/tmp"
 
 Namespaced Variables
-====================
+********************
 
 There will be times when you will have several variables with the same name.
 The system needs a way of knowing what the correct setting should be.
@@ -130,7 +130,7 @@ prefix followed by a dot (.), and then the variable name itself.
     BackEnd.db = admin
 
 Configuration Classes and Environment Variables
-===============================================
+***********************************************
 
 When you instantiate a configuration class, any *namespaced* environment variables
 are considered for merging into the configuration object's properties.
@@ -168,7 +168,7 @@ Some environments do not permit variable name with dots. In such case, you could
     app_CSPEnabled = true
 
 Environment Variables as Replacements for Data
-==============================================
+**********************************************
 
 It is very important to always remember that environment variables contained in your **.env** are
 **only replacements for existing data**. This means that you cannot expect to fill your **.env** with all
@@ -183,7 +183,7 @@ Simply put, you cannot just put ``app.myNewConfig = foo`` in your **.env** and e
 to magically have that property and value at run time.
 
 Treating Environment Variables as Arrays
-========================================
+****************************************
 
 A namespaced environment variable can be further treated as an array.
 If the prefix matches the configuration class, then the remainder of the
@@ -215,7 +215,7 @@ held the following then the result would be the same as above.
     address.country = "Germany"
 
 Handling Different Environments
-===============================
+*******************************
 
 Configuring multiple environments is easily accomplished by using a separate **.env** file with values modified to meet that environment's needs.
 
@@ -228,7 +228,7 @@ Do not track **.env** files with your version control system. If you do, and the
 .. _registrars:
 
 Registrars
-==========
+**********
 
 "Registrars" are any other classes which might provide additional configuration properties.
 Registrars provide a means of altering a configuration at runtime across namespaces and files.
@@ -237,7 +237,7 @@ There are two ways to implement a Registrar: implicit and explicit.
 .. note:: Values from **.env** always take priority over Registrars.
 
 Implicit Registrars
--------------------
+===================
 
 Any namespace may define registrars by using the **Config/Registrar.php** file, if discovery
 is enabled in :doc:`Modules </general/modules>`. These files are classes whose methods are
@@ -253,7 +253,7 @@ of the target config file. Existing values are merged, and Registrar properties
 overwrite priority.
 
 Explicit Registrars
--------------------
+===================
 
 A configuration file can also specify any number of registrars explicitly.
 This is done by adding a ``$registrars`` property to your configuration file,

From 2dd808a129e8e42a1a3bd66d91e41c19df663640 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 08:45:36 +0900
Subject: [PATCH 1977/2325] docs: fix heading level

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

diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst
index 312c2785e4d7..b16f925d1bff 100644
--- a/user_guide_src/source/general/configuration.rst
+++ b/user_guide_src/source/general/configuration.rst
@@ -64,7 +64,7 @@ One of today's best practices for application setup is to use Environment Variab
 Environment Variables should also be used for anything private such as passwords, API keys, or other sensitive data.
 
 Environment Variables and CodeIgniter
-*************************************
+=====================================
 
 CodeIgniter makes it simple and painless to set Environment Variables by using a "dotenv" file. The term comes from the file name, which starts with a dot before the text "env".
 
@@ -94,7 +94,7 @@ overwritten. The loaded Environment variables are accessed using any of the foll
 .. warning:: Note that your settings from the **.env** file are added to Environment Variables. As a side effect, this means that if your CodeIgniter application is (for example) generating a ``var_dump($_ENV)`` or ``phpinfo()`` (for debugging or other valid reasons) **your secure credentials are publicly exposed**.
 
 Nesting Variables
-*****************
+=================
 
 To save on typing, you can reuse variables that you've already specified in the file by wrapping the
 variable name within ``${...}``:
@@ -106,7 +106,7 @@ variable name within ``${...}``:
     TMP_DIR="${BASE_DIR}/tmp"
 
 Namespaced Variables
-********************
+====================
 
 There will be times when you will have several variables with the same name.
 The system needs a way of knowing what the correct setting should be.
@@ -168,7 +168,7 @@ Some environments do not permit variable name with dots. In such case, you could
     app_CSPEnabled = true
 
 Environment Variables as Replacements for Data
-**********************************************
+==============================================
 
 It is very important to always remember that environment variables contained in your **.env** are
 **only replacements for existing data**. This means that you cannot expect to fill your **.env** with all
@@ -183,7 +183,7 @@ Simply put, you cannot just put ``app.myNewConfig = foo`` in your **.env** and e
 to magically have that property and value at run time.
 
 Treating Environment Variables as Arrays
-****************************************
+========================================
 
 A namespaced environment variable can be further treated as an array.
 If the prefix matches the configuration class, then the remainder of the

From f7af35e05372dee4e0bb0ad8083a129dd80304fe Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 08:48:40 +0900
Subject: [PATCH 1978/2325] docs: remove ``system`` because appstarter does not
 have it alongside ``app``

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

diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst
index b16f925d1bff..dc4fa0cd3d11 100644
--- a/user_guide_src/source/general/configuration.rst
+++ b/user_guide_src/source/general/configuration.rst
@@ -68,8 +68,8 @@ Environment Variables and CodeIgniter
 
 CodeIgniter makes it simple and painless to set Environment Variables by using a "dotenv" file. The term comes from the file name, which starts with a dot before the text "env".
 
-CodeIgniter expects **.env** to be at the root of your project alongside the ``system``
-and ``app`` directories. There is a template file distributed with CodeIgniter that's
+CodeIgniter expects **.env** to be at the root of your project alongside the
+``app`` directories. There is a template file distributed with CodeIgniter that's
 located at the project root named **env** (Notice there's no dot (**.**) at the start?).
 It has a large collection of variables your project might use that have been assigned
 empty, dummy, or default values. You can use this file as a starting place for your
@@ -221,7 +221,7 @@ Configuring multiple environments is easily accomplished by using a separate **.
 
 The file should not contain every possible setting for every configuration class used by the application. In truth, it should include only those items that are specific to the environment or are sensitive details like passwords and API keys and other information that should not be exposed. But anything that changes between deployments is fair-game.
 
-In each environment, place the **.env** file in the project's root folder. For most setups, this will be the same level as the ``system`` and ``app`` directories.
+In each environment, place the **.env** file in the project's root folder. For most setups, this will be the same level as the ``app`` directories.
 
 Do not track **.env** files with your version control system. If you do, and the repository is made public, you will have put sensitive information where everybody can find it.
 

From d2115edc67a2267ef295340b4d563b626bf5cd4e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 09:06:50 +0900
Subject: [PATCH 1979/2325] docs: improve description for namespace separator
 `_`

---
 .../source/general/configuration.rst          | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/user_guide_src/source/general/configuration.rst b/user_guide_src/source/general/configuration.rst
index dc4fa0cd3d11..1d37f2acf45f 100644
--- a/user_guide_src/source/general/configuration.rst
+++ b/user_guide_src/source/general/configuration.rst
@@ -129,6 +129,19 @@ prefix followed by a dot (.), and then the variable name itself.
     backend.db = admin
     BackEnd.db = admin
 
+.. _env-var-namespace-separator:
+
+Namespace Separator
+-------------------
+
+Some environments, e.g., Docker, CloudFormation, do not permit variable name with dots (``.``). In such case, since v4.1.5, you could also use underscores (``_``) as a seperator.
+
+::
+
+    // namespaced variables with underscore
+    app_forceGlobalSecureRequests = true
+    app_CSPEnabled = true
+
 Configuration Classes and Environment Variables
 ***********************************************
 
@@ -158,15 +171,13 @@ the value from **.env** replaces the configuration file value.
     app.forceGlobalSecureRequests = true
     app.CSPEnabled = true
 
-.. note:: When using the *short prefix* the property names must still exactly match the class defined name.
-
-Some environments do not permit variable name with dots. In such case, you could also use ``_`` as a seperator.
-
-::
+Since v4.1.5, you can also write with underscores::
 
     app_forceGlobalSecureRequests = true
     app_CSPEnabled = true
 
+.. note:: When using the *short prefix* the property names must still exactly match the class defined name.
+
 Environment Variables as Replacements for Data
 ==============================================
 

From 49bca7855b98cfe34b55301ef15bd9d13ae583fb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 09:07:19 +0900
Subject: [PATCH 1980/2325] docs: add link to detailed page

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

diff --git a/user_guide_src/source/changelogs/v4.1.5.rst b/user_guide_src/source/changelogs/v4.1.5.rst
index 1ef2ec8775a0..960d29b8a4f9 100644
--- a/user_guide_src/source/changelogs/v4.1.5.rst
+++ b/user_guide_src/source/changelogs/v4.1.5.rst
@@ -23,7 +23,7 @@ Enhancements
 - Added Cache config for reserved characters
 - The :ref:`addForeignKey()<adding-foreign-keys>` function of the ``Forge`` class can now define composite foreign keys in an array
 - The ``dropKey`` function of the ``Forge`` class can remove key
-- Now ``_`` can be used as separators in environment variable
+- Now ``_`` can be used as separators in environment variable. See :ref:`env-var-namespace-separator`.
 - Added Multiple filters for a route and Classname filter
 - Reduced memory usage of ``insertBatch()`` and ``updateBatch()``
 - Added :ref:`Session based CSRF Protection <csrf-protection-methods>`

From 5ecbb0ae05374bedd6c83ec5b98e814343dfa966 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 09:31:12 +0900
Subject: [PATCH 1981/2325] docs: add comment in `env`

---
 env | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/env b/env
index 83def018081f..67faaee5b57a 100644
--- a/env
+++ b/env
@@ -21,6 +21,8 @@
 #--------------------------------------------------------------------
 
 # app.baseURL = ''
+# If you have trouble with `.`, you could also use `_`.
+# app_baseURL = ''
 # app.forceGlobalSecureRequests = false
 
 # app.sessionDriver = 'CodeIgniter\Session\Handlers\FileHandler'

From 4dd09a0eaa4acc90fa295109d7ba9001b9f44964 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 09:38:00 +0900
Subject: [PATCH 1982/2325] docs: fix heading underline

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

diff --git a/user_guide_src/source/testing/database.rst b/user_guide_src/source/testing/database.rst
index 680c0a3f3518..a5872f46037d 100644
--- a/user_guide_src/source/testing/database.rst
+++ b/user_guide_src/source/testing/database.rst
@@ -1,13 +1,13 @@
-=====================
+#####################
 Testing Your Database
-=====================
+#####################
 
 .. contents::
     :local:
     :depth: 2
 
 The Test Class
-==============
+**************
 
 In order to take advantage of the built-in database tools that CodeIgniter provides for testing, your
 tests must extend ``CIUnitTestCase`` and use the ``DatabaseTestTrait``:
@@ -21,7 +21,7 @@ of the functionality described here:
 .. literalinclude:: database/002.php
 
 Setting Up a Test Database
-==========================
+**************************
 
 When running database tests, you need to provide a database that can be used during testing. Instead of
 using the PHPUnit built-in database features, the framework provides tools specific to CodeIgniter. The first
@@ -38,7 +38,7 @@ correct information::
     database.tests.database = '';
 
 Migrations and Seeds
---------------------
+====================
 
 When running tests, you need to ensure that your database has the correct schema set up and that
 it is in a known state for every test. You can use migrations and seeds to set up your database,
@@ -88,7 +88,7 @@ This should not include the **Database\\Migrations** sub-namespace but just the
 To run migrations from all available namespaces set this property to ``null``.
 
 Helper Methods
-==============
+**************
 
 The **DatabaseTestTrait** class provides several helper methods to aid in testing your database.
 

From 8d29cc5e2a83d67c3864656f2b2e05ff26e37202 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 09:43:44 +0900
Subject: [PATCH 1983/2325] docs: change properties/methods to headings

You can link to them.
---
 user_guide_src/source/testing/database.rst | 45 ++++++++++++++--------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/user_guide_src/source/testing/database.rst b/user_guide_src/source/testing/database.rst
index a5872f46037d..3bee04fb3a5f 100644
--- a/user_guide_src/source/testing/database.rst
+++ b/user_guide_src/source/testing/database.rst
@@ -46,41 +46,48 @@ by adding a couple of class properties to your test.
 
 .. literalinclude:: database/003.php
 
-**$migrate**
+$migrate
+--------
 
 This boolean value determines whether the database migration runs before test.
 By default, the database is always migrated to the latest available state as defined by ``$namespace``.
 If false, migration never runs. If you want to disable migration, set false.
 
-**$migrateOnce**
+$migrateOnce
+------------
 
 This boolean value determines whether the database migration runs only once. If you want
 to run migration once before the first test, set true. If not present or false, migration
 runs before each test.
 
-**$refresh**
+$refresh
+--------
 
 This boolean value determines whether the database is completely refreshed before test. If true,
 all migrations are rolled back to version 0.
 
-**$seed**
+$seed
+-----
 
 If present and not empty, this specifies the name of a Seed file that is used to populate the database with
 test data prior to test running.
 
-**$seedOnce**
+$seedOnce
+---------
 
 This boolean value determines whether the database seeding runs only once. If you want
 to run database seeding once before the first test, set true. If not present or false, database seeding
 runs before each test.
 
-**$basePath**
+$basePath
+---------
 
 By default, CodeIgniter will look in **tests/_support/Database/Seeds** to locate the seeds that it should run during testing.
 You can change this directory by specifying the ``$basePath`` property. This should not include the **Seeds** directory,
 but the path to the single directory that holds the sub-directory.
 
-**$namespace**
+$namespace
+----------
 
 By default, CodeIgniter will look in **tests/_support/Database/Migrations** to locate the migrations
 that it should run during testing. You can change this location by specifying a new namespace in the ``$namespace`` properties.
@@ -92,46 +99,54 @@ Helper Methods
 
 The **DatabaseTestTrait** class provides several helper methods to aid in testing your database.
 
-**regressDatabase()**
+regressDatabase()
+=================
 
 Called during ``$refresh`` described above, this method is available if you need to reset the database manually.
 
-**migrateDatabase()**
+migrateDatabase()
+=================
 
 Called during ``setUp``, this method is available if you need to run migrations manually.
 
-**seed($name)**
+seed($name)
+===========
 
 Allows you to manually load a Seed into the database. The only parameter is the name of the seed to run. The seed
 must be present within the path specified in ``$basePath``.
 
-**dontSeeInDatabase($table, $criteria)**
+dontSeeInDatabase($table, $criteria)
+====================================
 
 Asserts that a row with criteria matching the key/value pairs in ``$criteria`` DOES NOT exist in the database.
 
 .. literalinclude:: database/004.php
 
-**seeInDatabase($table, $criteria)**
+seeInDatabase($table, $criteria)
+================================
 
 Asserts that a row with criteria matching the key/value pairs in ``$criteria`` DOES exist in the database.
 
 .. literalinclude:: database/005.php
 
-**grabFromDatabase($table, $column, $criteria)**
+grabFromDatabase($table, $column, $criteria)
+============================================
 
 Returns the value of ``$column`` from the specified table where the row matches ``$criteria``. If more than one
 row is found, it will only test against the first one.
 
 .. literalinclude:: database/006.php
 
-**hasInDatabase($table, $data)**
+hasInDatabase($table, $data)
+============================
 
 Inserts a new row into the database. This row is removed after the current test runs. ``$data`` is an associative
 array with the data to insert into the table.
 
 .. literalinclude:: database/007.php
 
-**seeNumRecords($expected, $table, $criteria)**
+seeNumRecords($expected, $table, $criteria)
+===========================================
 
 Asserts that a number of matching rows are found in the database that match ``$criteria``.
 

From 373e2d7126900060ac6ad32ff8de1e4b6f7e3812 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 09:54:28 +0900
Subject: [PATCH 1984/2325] docs: add properties in sample code

---
 user_guide_src/source/testing/database/003.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/testing/database/003.php b/user_guide_src/source/testing/database/003.php
index 399ddfb04425..f8097d91e7d6 100644
--- a/user_guide_src/source/testing/database/003.php
+++ b/user_guide_src/source/testing/database/003.php
@@ -9,7 +9,16 @@ class MyTests extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
-    protected $refresh  = true;
+    // For Migrations
+    protected $migrate     = true;
+    protected $migrateOnce = false;
+    protected $refresh     = true;
+    protected $namespace   = 'Tests\Support';
+
+    // For Seeds
+    protected $seedOnce = false;
     protected $seed     = 'TestSeeder';
     protected $basePath = 'path/to/database/files';
+
+    // ...
 }

From 302d3bfe98d4302a0a566890ba8ed0fcd110f68b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 10:07:42 +0900
Subject: [PATCH 1985/2325] docs: add headings and move $namespace into
 Migration section

---
 user_guide_src/source/testing/database.rst | 34 +++++++++++++---------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/user_guide_src/source/testing/database.rst b/user_guide_src/source/testing/database.rst
index 3bee04fb3a5f..8bc9c7040dc1 100644
--- a/user_guide_src/source/testing/database.rst
+++ b/user_guide_src/source/testing/database.rst
@@ -46,54 +46,60 @@ by adding a couple of class properties to your test.
 
 .. literalinclude:: database/003.php
 
+Migrations
+----------
+
 $migrate
---------
+^^^^^^^^
 
 This boolean value determines whether the database migration runs before test.
 By default, the database is always migrated to the latest available state as defined by ``$namespace``.
 If false, migration never runs. If you want to disable migration, set false.
 
 $migrateOnce
-------------
+^^^^^^^^^^^^
 
 This boolean value determines whether the database migration runs only once. If you want
 to run migration once before the first test, set true. If not present or false, migration
 runs before each test.
 
 $refresh
---------
+^^^^^^^^
 
 This boolean value determines whether the database is completely refreshed before test. If true,
 all migrations are rolled back to version 0.
 
-$seed
+$namespace
+^^^^^^^^^^
+
+By default, CodeIgniter will look in **tests/_support/Database/Migrations** to locate the migrations
+that it should run during testing. You can change this location by specifying a new namespace in the ``$namespace`` properties.
+This should not include the **Database\\Migrations** sub-namespace but just the base namespace.
+To run migrations from all available namespaces set this property to ``null``.
+
+Seeds
 -----
 
+$seed
+^^^^^
+
 If present and not empty, this specifies the name of a Seed file that is used to populate the database with
 test data prior to test running.
 
 $seedOnce
----------
+^^^^^^^^^
 
 This boolean value determines whether the database seeding runs only once. If you want
 to run database seeding once before the first test, set true. If not present or false, database seeding
 runs before each test.
 
 $basePath
----------
+^^^^^^^^^
 
 By default, CodeIgniter will look in **tests/_support/Database/Seeds** to locate the seeds that it should run during testing.
 You can change this directory by specifying the ``$basePath`` property. This should not include the **Seeds** directory,
 but the path to the single directory that holds the sub-directory.
 
-$namespace
-----------
-
-By default, CodeIgniter will look in **tests/_support/Database/Migrations** to locate the migrations
-that it should run during testing. You can change this location by specifying a new namespace in the ``$namespace`` properties.
-This should not include the **Database\\Migrations** sub-namespace but just the base namespace.
-To run migrations from all available namespaces set this property to ``null``.
-
 Helper Methods
 **************
 

From d44917aa88715aea8f2265d4b4a7bbf12485cc85 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 10:12:15 +0900
Subject: [PATCH 1986/2325] docs: change the null description to be more
 prominent

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

diff --git a/user_guide_src/source/testing/database.rst b/user_guide_src/source/testing/database.rst
index 8bc9c7040dc1..770a3eeb46c2 100644
--- a/user_guide_src/source/testing/database.rst
+++ b/user_guide_src/source/testing/database.rst
@@ -75,7 +75,8 @@ $namespace
 By default, CodeIgniter will look in **tests/_support/Database/Migrations** to locate the migrations
 that it should run during testing. You can change this location by specifying a new namespace in the ``$namespace`` properties.
 This should not include the **Database\\Migrations** sub-namespace but just the base namespace.
-To run migrations from all available namespaces set this property to ``null``.
+
+.. important:: If you set this property to ``null``, it runs migrations from all available namespaces like ``php spark migrate --all``.
 
 Seeds
 -----

From 46ff10891041da8b30b1d3383473aead8dfd7866 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 10:25:55 +0900
Subject: [PATCH 1987/2325] docs: decorate true and false

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

diff --git a/user_guide_src/source/testing/database.rst b/user_guide_src/source/testing/database.rst
index 770a3eeb46c2..ac04006211f4 100644
--- a/user_guide_src/source/testing/database.rst
+++ b/user_guide_src/source/testing/database.rst
@@ -54,19 +54,19 @@ $migrate
 
 This boolean value determines whether the database migration runs before test.
 By default, the database is always migrated to the latest available state as defined by ``$namespace``.
-If false, migration never runs. If you want to disable migration, set false.
+If ``false``, migration never runs. If you want to disable migration, set ``false``.
 
 $migrateOnce
 ^^^^^^^^^^^^
 
 This boolean value determines whether the database migration runs only once. If you want
-to run migration once before the first test, set true. If not present or false, migration
+to run migration once before the first test, set ``true``. If not present or ``false``, migration
 runs before each test.
 
 $refresh
 ^^^^^^^^
 
-This boolean value determines whether the database is completely refreshed before test. If true,
+This boolean value determines whether the database is completely refreshed before test. If ``true``,
 all migrations are rolled back to version 0.
 
 $namespace
@@ -91,7 +91,7 @@ $seedOnce
 ^^^^^^^^^
 
 This boolean value determines whether the database seeding runs only once. If you want
-to run database seeding once before the first test, set true. If not present or false, database seeding
+to run database seeding once before the first test, set ``true``. If not present or ``false``, database seeding
 runs before each test.
 
 $basePath

From e7c2e17e117e86320ad848c788679bd02c2e2afe Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 10:27:53 +0900
Subject: [PATCH 1988/2325] docs: add () after method name

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

diff --git a/user_guide_src/source/testing/database.rst b/user_guide_src/source/testing/database.rst
index ac04006211f4..185ac255abff 100644
--- a/user_guide_src/source/testing/database.rst
+++ b/user_guide_src/source/testing/database.rst
@@ -114,7 +114,7 @@ Called during ``$refresh`` described above, this method is available if you need
 migrateDatabase()
 =================
 
-Called during ``setUp``, this method is available if you need to run migrations manually.
+Called during ``setUp()``, this method is available if you need to run migrations manually.
 
 seed($name)
 ===========

From 99004e4c3de67d3f305cff4a51eba9642b5fa346 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 10:34:18 +0900
Subject: [PATCH 1989/2325] docs: add section titles

---
 user_guide_src/source/testing/database.rst | 49 +++++++++++++---------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/user_guide_src/source/testing/database.rst b/user_guide_src/source/testing/database.rst
index 185ac255abff..fd2c95d2f3ed 100644
--- a/user_guide_src/source/testing/database.rst
+++ b/user_guide_src/source/testing/database.rst
@@ -106,54 +106,63 @@ Helper Methods
 
 The **DatabaseTestTrait** class provides several helper methods to aid in testing your database.
 
+Changing Database State
+=======================
+
 regressDatabase()
-=================
+-----------------
 
 Called during ``$refresh`` described above, this method is available if you need to reset the database manually.
 
 migrateDatabase()
-=================
+-----------------
 
 Called during ``setUp()``, this method is available if you need to run migrations manually.
 
 seed($name)
-===========
+-----------
 
 Allows you to manually load a Seed into the database. The only parameter is the name of the seed to run. The seed
 must be present within the path specified in ``$basePath``.
 
-dontSeeInDatabase($table, $criteria)
-====================================
-
-Asserts that a row with criteria matching the key/value pairs in ``$criteria`` DOES NOT exist in the database.
+.. literalinclude:: database/006.php
 
-.. literalinclude:: database/004.php
+hasInDatabase($table, $data)
+----------------------------
 
-seeInDatabase($table, $criteria)
-================================
+Inserts a new row into the database. This row is removed after the current test runs. ``$data`` is an associative
+array with the data to insert into the table.
 
-Asserts that a row with criteria matching the key/value pairs in ``$criteria`` DOES exist in the database.
+.. literalinclude:: database/007.php
 
-.. literalinclude:: database/005.php
+Getting Data from Database
+==========================
 
 grabFromDatabase($table, $column, $criteria)
-============================================
+--------------------------------------------
 
 Returns the value of ``$column`` from the specified table where the row matches ``$criteria``. If more than one
 row is found, it will only test against the first one.
 
-.. literalinclude:: database/006.php
+Assertions
+==========
 
-hasInDatabase($table, $data)
-============================
+dontSeeInDatabase($table, $criteria)
+------------------------------------
 
-Inserts a new row into the database. This row is removed after the current test runs. ``$data`` is an associative
-array with the data to insert into the table.
+Asserts that a row with criteria matching the key/value pairs in ``$criteria`` DOES NOT exist in the database.
 
-.. literalinclude:: database/007.php
+.. literalinclude:: database/004.php
+
+seeInDatabase($table, $criteria)
+--------------------------------
+
+Asserts that a row with criteria matching the key/value pairs in ``$criteria`` DOES exist in the database.
+
+.. literalinclude:: database/005.php
 
 seeNumRecords($expected, $table, $criteria)
-===========================================
+-------------------------------------------
 
 Asserts that a number of matching rows are found in the database that match ``$criteria``.
 

From 536c874f336753a36441a5ed1e6968360d05f714 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 10:38:17 +0900
Subject: [PATCH 1990/2325] docs: fix description

grabFromDatabase() does not test anything.
---
 user_guide_src/source/testing/database.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/testing/database.rst b/user_guide_src/source/testing/database.rst
index fd2c95d2f3ed..382b4ee4aa56 100644
--- a/user_guide_src/source/testing/database.rst
+++ b/user_guide_src/source/testing/database.rst
@@ -142,7 +142,7 @@ grabFromDatabase($table, $column, $criteria)
 --------------------------------------------
 
 Returns the value of ``$column`` from the specified table where the row matches ``$criteria``. If more than one
-row is found, it will only test against the first one.
+row is found, it will only return the first one.
 
 Assertions
 ==========

From 1ba3fb9a433f64467648a9cefa7bbd11b93baef0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 10:52:09 +0900
Subject: [PATCH 1991/2325] docs: add missing `-`

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

diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
index 4fd3bca63016..5c462fa139f4 100644
--- a/system/Test/CIUnitTestCase.php
+++ b/system/Test/CIUnitTestCase.php
@@ -116,7 +116,7 @@ abstract class CIUnitTestCase extends TestCase
 
     /**
      * The namespace(s) to help us find the migration classes.
-     * Empty is equivalent to running `spark migrate -all`.
+     * Empty is equivalent to running `spark migrate --all`.
      * Note that running "all" runs migrations in date order,
      * but specifying namespaces runs them in namespace order (then date)
      *

From 286a6cde48d7990ba1c87750766f49dc48eb47be Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 10:57:26 +0900
Subject: [PATCH 1992/2325] docs: add about null

---
 system/Database/MigrationRunner.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
index 517688889ec6..cd96ebed9a1b 100644
--- a/system/Database/MigrationRunner.php
+++ b/system/Database/MigrationRunner.php
@@ -40,7 +40,8 @@ class MigrationRunner
     protected $table;
 
     /**
-     * The Namespace  where migrations can be found.
+     * The Namespace where migrations can be found.
+     * `null` is all namespaces.
      *
      * @var string|null
      */

From 73b19877ade52eefab1cff531269c8829f8163b0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 11:03:29 +0900
Subject: [PATCH 1993/2325] docs: make first letter in title uppser case

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

diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst
index ff81f4ff0708..64c144c86769 100644
--- a/user_guide_src/source/dbmgmt/migration.rst
+++ b/user_guide_src/source/dbmgmt/migration.rst
@@ -19,7 +19,7 @@ include migrations from all namespaces.
     :depth: 2
 
 ********************
-Migration file names
+Migration File Names
 ********************
 
 Each Migration is run in numeric order forward or backwards depending on the

From d42b4b289c107375ab20dec9bf0a68139256ea4f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 11:05:56 +0900
Subject: [PATCH 1994/2325] docs: decorate file path with **

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

diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst
index 64c144c86769..e827297224d9 100644
--- a/user_guide_src/source/dbmgmt/migration.rst
+++ b/user_guide_src/source/dbmgmt/migration.rst
@@ -81,7 +81,7 @@ Namespaces
 The migration library can automatically scan all namespaces you have defined within
 **app/Config/Autoload.php** or loaded from an external source like Composer, using
 the ``$psr4`` property for matching directory names. It will include all migrations
-it finds in Database/Migrations.
+it finds in **Database/Migrations**.
 
 Each namespace has its own version sequence, this will help you upgrade and downgrade each module (namespace) without affecting other namespaces.
 

From e9f68a280eaae2b2af1bb0db6b2576c7cac3d028 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 21 Apr 2022 11:13:17 +0900
Subject: [PATCH 1995/2325] docs: add about null

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

diff --git a/user_guide_src/source/dbmgmt/migration.rst b/user_guide_src/source/dbmgmt/migration.rst
index e827297224d9..5fc93f79aa6f 100644
--- a/user_guide_src/source/dbmgmt/migration.rst
+++ b/user_guide_src/source/dbmgmt/migration.rst
@@ -253,7 +253,7 @@ Class Reference
 
     .. php:method:: setNamespace($namespace)
 
-        :param  string  $namespace: application namespace.
+        :param  string|null  $namespace: application namespace. ``null`` is all namespaces.
         :returns:   The current MigrationRunner instance
         :rtype:     CodeIgniter\\Database\\MigrationRunner
 
@@ -261,6 +261,8 @@ Class Reference
 
         .. literalinclude:: migration/007.php
 
+        .. note:: If you set ``null``, it looks for migration files in all namespaces.
+
     .. php:method:: setGroup($group)
 
         :param  string  $group: database group name.

From 49d8b86c1e92d4298dc92068d6b08ace903d0f65 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Thu, 21 Apr 2022 17:21:34 +0800
Subject: [PATCH 1996/2325] Redirecting Routes. Placeholders.

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/Router/Router.php                      | 12 +++++-
 tests/system/Router/RouterTest.php            | 38 +++++++++++++++++++
 user_guide_src/source/changelogs/v4.2.0.rst   |  1 +
 .../source/incoming/routing/022.php           |  8 ++++
 4 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/system/Router/Router.php b/system/Router/Router.php
index 1b9ec718ff11..ad431ddbfa58 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -412,7 +412,17 @@ protected function checkRoutes(string $uri): bool
             if (preg_match('#^' . $routeKey . '$#u', $uri, $matches)) {
                 // Is this route supposed to redirect to another?
                 if ($this->collection->isRedirect($routeKey)) {
-                    throw new RedirectException(is_array($handler) ? key($handler) : $handler, $this->collection->getRedirectCode($routeKey));
+                    // replacing matched route groups with references: post/([0-9]+) -> post/$1
+                    $redirectTo = preg_replace_callback('/(\([^\(]+\))/', static function () {
+                        static $i = 1;
+
+                        return '$' . $i++;
+                    }, is_array($handler) ? key($handler) : $handler);
+
+                    throw new RedirectException(
+                        preg_replace('#^' . $routeKey . '$#u', $redirectTo, $uri),
+                        $this->collection->getRedirectCode($routeKey)
+                    );
                 }
                 // Store our locale so CodeIgniter object can
                 // assign it to the Request.
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index be65a9d41460..0389194688ef 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Config\Services;
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\IncomingRequest;
+use CodeIgniter\Router\Exceptions\RedirectException;
 use CodeIgniter\Router\Exceptions\RouterException;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Modules;
@@ -837,4 +838,41 @@ public function testSetDirectoryInvalid()
         $this->assertNull($internal);
         $this->assertSame('', $router->directory());
     }
+
+    /**
+     * @dataProvider provideRedirectCase
+     */
+    public function testRedirectRoute(
+        string $route,
+        string $redirectFrom,
+        string $redirectTo,
+        string $url,
+        string $expectedPath,
+        string $alias
+    ) {
+        $collection = clone $this->collection;
+        $collection->resetRoutes();
+
+        $collection->get($route, 'Controller::method', ['as' => $alias]);
+        $collection->addRedirect($redirectFrom, $redirectTo);
+
+        $this->expectException(RedirectException::class);
+        $this->expectExceptionMessage($expectedPath);
+
+        $router = new Router($collection, $this->request);
+        $router->handle($url);
+    }
+
+    public function provideRedirectCase(): array
+    {
+        // [$route, $redirectFrom, $redirectTo, $url, $expectedPath, $alias]
+        return [
+            ['posts', 'articles', 'posts', '/articles', 'posts', 'alias'],
+            ['posts', 'articles', 'alias', '/articles', 'posts', 'alias'],
+            ['post/(:num)', 'article/(:num)', 'post/$1', '/article/1', 'post/1', 'alias'],
+            ['post/(:num)', 'article/(:num)', 'alias', '/article/1', 'post/1', 'alias'],
+            ['post/(:num)/comment/(:any)', 'article/(:num)/(:any)', 'post/$1/comment/$2', '/article/1/2', 'post/1/comment/2', 'alias'],
+            ['post/(:segment)/comment/(:any)', 'article/(:num)/(:any)', 'alias', '/article/1/2', 'post/1/comment/2', 'alias'],
+        ];
+    }
 }
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 67477d37cdf8..98b48c1b3b4b 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -40,6 +40,7 @@ Enhancements
     - The log format has also changed. If users are depending on the log format in their apps, the new log format is "<1-based count> <cleaned filepath>(<line>): <class><function><args>"
 - Added support for webp files to **app/Config/Mimes.php**.
 - Added 4th parameter ``$includeDir`` to ``get_filenames()``. See :php:func:`get_filenames`.
+- RouteCollection::addRedirect() can now use placeholders.
 
 Changes
 *******
diff --git a/user_guide_src/source/incoming/routing/022.php b/user_guide_src/source/incoming/routing/022.php
index d92d9934db5a..c4da46bdd431 100644
--- a/user_guide_src/source/incoming/routing/022.php
+++ b/user_guide_src/source/incoming/routing/022.php
@@ -6,3 +6,11 @@
 $routes->addRedirect('users/about', 'profile');
 // Redirect to a URI
 $routes->addRedirect('users/about', 'users/profile');
+
+// Redirect with placeholder
+$routes->get('post/(:num)/comment/(:num)', 'PostsComments::index', ['as' => 'post.comment']);
+
+// Redirect to a URI
+$routes->addRedirect('article/(:num)/(:num)', 'post/$1/comment/$2');
+// Redirect to a named route
+$routes->addRedirect('article/(:num)/(:num)', 'post.comment');

From 2c77ee5da6f611df73d301281520960a4699d20f Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Sat, 23 Apr 2022 03:22:31 +0800
Subject: [PATCH 1997/2325] Optimizing the RouteCollection::getRoutes() method

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/Router/RouteCollection.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 4bb048991a99..120ed99c73ee 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -452,16 +452,12 @@ public function getRoutes(?string $verb = null): array
         // we might need to do.
         $this->discoverRoutes();
 
-        $routes     = [];
-        $collection = [];
+        $routes = [];
 
         if (isset($this->routes[$verb])) {
             // Keep current verb's routes at the beginning, so they're matched
             // before any of the generic, "add" routes.
-            if (isset($this->routes['*'])) {
-                $extraRules = array_diff_key($this->routes['*'], $this->routes[$verb]);
-                $collection = array_merge($this->routes[$verb], $extraRules);
-            }
+            $collection = $this->routes[$verb] + ($this->routes['*'] ?? []);
 
             foreach ($collection as $r) {
                 $key          = key($r['route']);

From 598ae1e23e092fa1d403e8f2eaf8a8e1ba68ac07 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sat, 23 Apr 2022 09:30:46 +0700
Subject: [PATCH 1998/2325] Allow null type for request property in CodeIgniter
 class

to allow remove ignored unreachable phpstan notice
---
 system/CodeIgniter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 3bc71d632993..8289b2852e45 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -80,7 +80,7 @@ class CodeIgniter
     /**
      * Current request.
      *
-     * @var CLIRequest|IncomingRequest|Request
+     * @var CLIRequest|IncomingRequest|Request|null
      */
     protected $request;
 

From 85bfca2665098dd5e8cdf337b60df7183c89bf7e Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Sat, 23 Apr 2022 09:33:43 +0700
Subject: [PATCH 1999/2325] clean up unreachable ignore errors

---
 phpstan-baseline.neon.dist | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index 7887ee6a3b03..7e1f16d6bccf 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -115,11 +115,6 @@ parameters:
 			count: 1
 			path: system/CodeIgniter.php
 
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: system/CodeIgniter.php
-
 		-
 			message: "#^Binary operation \"\\+\" between array\\<string, class\\-string\\>\\|false and non\\-empty\\-array\\<string, string\\> results in an error\\.$#"
 			count: 1

From 7c430ad88ac9e9d68dc5c6cfe07111008e9f2d6e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 25 Apr 2022 10:29:57 +0900
Subject: [PATCH 2000/2325] docs: add links to upgrade instructions in
 Upgrading pages

---
 user_guide_src/source/installation/upgrade_404.rst | 10 ++++++++++
 user_guide_src/source/installation/upgrade_405.rst | 10 ++++++++++
 user_guide_src/source/installation/upgrade_410.rst | 10 ++++++++++
 user_guide_src/source/installation/upgrade_412.rst | 10 ++++++++++
 user_guide_src/source/installation/upgrade_413.rst | 10 ++++++++++
 user_guide_src/source/installation/upgrade_414.rst | 10 ++++++++++
 user_guide_src/source/installation/upgrade_415.rst |  6 ++++++
 7 files changed, 66 insertions(+)

diff --git a/user_guide_src/source/installation/upgrade_404.rst b/user_guide_src/source/installation/upgrade_404.rst
index 8eb7dd9a753f..899dfb49a35a 100644
--- a/user_guide_src/source/installation/upgrade_404.rst
+++ b/user_guide_src/source/installation/upgrade_404.rst
@@ -2,6 +2,16 @@
 Upgrading from 4.0.x to 4.0.4
 #############################
 
+Please refer to the upgrade instructions corresponding to your installation method.
+
+- :ref:`Composer Installation App Starter Upgrading <app-starter-upgrading>`
+- :ref:`Composer Installation Adding CodeIgniter4 to an Existing Project Upgrading <adding-codeigniter4-upgrading>`
+- :ref:`Manual Installation Upgrading <installing-manual-upgrading>`
+
+.. contents::
+    :local:
+    :depth: 2
+
 CodeIgniter 4.0.4 fixes a bug in the implementation of :doc:`Controller Filters </incoming/filters>`, breaking
 code implementing the ``FilterInterface``.
 
diff --git a/user_guide_src/source/installation/upgrade_405.rst b/user_guide_src/source/installation/upgrade_405.rst
index 2df633e85d31..d83f461b3218 100644
--- a/user_guide_src/source/installation/upgrade_405.rst
+++ b/user_guide_src/source/installation/upgrade_405.rst
@@ -2,6 +2,16 @@
 Upgrading from 4.0.4 to 4.0.5
 #############################
 
+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
+
 **Cookie SameSite support**
 
 CodeIgniter 4.0.5 introduces a setting for the cookie SameSite attribute. Prior versions did not set this
diff --git a/user_guide_src/source/installation/upgrade_410.rst b/user_guide_src/source/installation/upgrade_410.rst
index ac8f7a2ba7a4..2cb763174079 100644
--- a/user_guide_src/source/installation/upgrade_410.rst
+++ b/user_guide_src/source/installation/upgrade_410.rst
@@ -2,6 +2,16 @@
 Upgrading from 4.0.5 to 4.1.0 or 4.1.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
+
 **Legacy Autoloading**
 
 `Autoloader::loadLegacy()` method was originally for transition to CodeIgniter v4. Since `4.1.0`,
diff --git a/user_guide_src/source/installation/upgrade_412.rst b/user_guide_src/source/installation/upgrade_412.rst
index 991d048beed6..6f21464b9766 100644
--- a/user_guide_src/source/installation/upgrade_412.rst
+++ b/user_guide_src/source/installation/upgrade_412.rst
@@ -2,6 +2,16 @@
 Upgrading from 4.1.1 to 4.1.2
 #############################
 
+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
+
 **current_url() and indexPage**
 
 Due to `a bug <https://github.com/codeigniter4/CodeIgniter4/issues/4116>`_ in ``current_url()``,
diff --git a/user_guide_src/source/installation/upgrade_413.rst b/user_guide_src/source/installation/upgrade_413.rst
index 2ecfd237ea0f..4fb2b6edd661 100644
--- a/user_guide_src/source/installation/upgrade_413.rst
+++ b/user_guide_src/source/installation/upgrade_413.rst
@@ -2,6 +2,16 @@
 Upgrading from 4.1.2 to 4.1.3
 #############################
 
+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
+
 **Cache TTL**
 
 There is a new value in **app/Config/Cache.php**: ``$ttl``. This is not used by framework
diff --git a/user_guide_src/source/installation/upgrade_414.rst b/user_guide_src/source/installation/upgrade_414.rst
index 60cdc46f0e40..2fdd637fca2c 100644
--- a/user_guide_src/source/installation/upgrade_414.rst
+++ b/user_guide_src/source/installation/upgrade_414.rst
@@ -2,6 +2,16 @@
 Upgrading from 4.1.3 to 4.1.4
 #############################
 
+Please refer to the upgrade instructions corresponding to your installation method.
+
+- :ref:`Composer Installation App Starter Upgrading <app-starter-upgrading>`
+- :ref:`Composer Installation Adding CodeIgniter4 to an Existing Project Upgrading <adding-codeigniter4-upgrading>`
+- :ref:`Manual Installation Upgrading <installing-manual-upgrading>`
+
+.. contents::
+    :local:
+    :depth: 2
+
 This release focuses on code style. All changes (except those noted below) are cosmetic to bring the code in line with the new
 `CodeIgniter Coding Standard <https://github.com/CodeIgniter/coding-standard>`_ (based on PSR-12).
 
diff --git a/user_guide_src/source/installation/upgrade_415.rst b/user_guide_src/source/installation/upgrade_415.rst
index 69969c09c651..21c3fa44d94f 100644
--- a/user_guide_src/source/installation/upgrade_415.rst
+++ b/user_guide_src/source/installation/upgrade_415.rst
@@ -2,6 +2,12 @@
 Upgrading from 4.1.4 to 4.1.5
 #############################
 
+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

From db0835865369ea4de29b5c4afa09f8299ed2b33e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 25 Apr 2022 10:53:40 +0900
Subject: [PATCH 2001/2325] docs: improve changelog v4.1.0 mainly formatting

---
 user_guide_src/source/changelogs/v4.1.0.rst | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.1.0.rst b/user_guide_src/source/changelogs/v4.1.0.rst
index 8512455ae475..dfa6b29bd48f 100644
--- a/user_guide_src/source/changelogs/v4.1.0.rst
+++ b/user_guide_src/source/changelogs/v4.1.0.rst
@@ -5,16 +5,21 @@ Release Date: January 31, 2021
 
 **4.1.0 release of CodeIgniter4**
 
-Changes:
+.. contents::
+    :local:
+    :depth: 2
 
-- Dropped support for PHP 7.2
-
-Removed:
+BREAKING
+********
 
 - ``Autoloader::loadLegacy()`` method was previously used for migration of non-namespaced classes in transition to CodeIgniter v4. Since ``4.1.0``, this support was removed.
 
-Bugs Fixed:
+Changes
+*******
+
+- Dropped support for PHP 7.2
 
-Deprecations:
+Deprecations
+************
 
-- Deprecated ``Model::fillPlaceholders(array $rules, array $data)`` method, use ``fillPlaceholders(array $rules, array $data)`` from Validation instead.
+- Deprecated ``Model::fillPlaceholders()`` method, use ``Validation::fillPlaceholders()`` instead.

From 77a2896ed455d3d9231e30f17278e312711c6b59 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 25 Apr 2022 10:54:04 +0900
Subject: [PATCH 2002/2325] docs: improve upgrade_410

Remove deprecated Model::fillPlaceholders(), because it should be noted in changelogs.
---
 user_guide_src/source/installation/upgrade_410.rst | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/installation/upgrade_410.rst b/user_guide_src/source/installation/upgrade_410.rst
index 2cb763174079..d5b9d94a8955 100644
--- a/user_guide_src/source/installation/upgrade_410.rst
+++ b/user_guide_src/source/installation/upgrade_410.rst
@@ -12,11 +12,10 @@ Please refer to the upgrade instructions corresponding to your installation meth
     :local:
     :depth: 2
 
-**Legacy Autoloading**
-
-`Autoloader::loadLegacy()` method was originally for transition to CodeIgniter v4. Since `4.1.0`,
-this support was removed and this method should not be used.
+Breaking Changes
+****************
 
-**Model::fillPlaceholders**
+**Legacy Autoloading**
 
-Replace any use of this method with its equivalent version from Validation instead.
+``Autoloader::loadLegacy()`` method was originally for transition to CodeIgniter v4. Since 4.1.0,
+this support was removed. All classes must be namespaced.

From f0ce83f6bc099c2397149f41adb0eebd434d8b60 Mon Sep 17 00:00:00 2001
From: "Michael R. Krisnadhi" <michaelkrisnadhi@gmail.com>
Date: Mon, 25 Apr 2022 19:49:00 +0700
Subject: [PATCH 2003/2325] [docs/models] expose getInsertID() method

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

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index 84fdbf4be249..6e05f3af0f23 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -295,6 +295,8 @@ the array's values are the values to save for that key:
 
 .. literalinclude:: model/015.php
 
+You can retrieve the last inserted row's primary key using the ``getInsertID()`` method.
+
 update()
 --------
 

From 73502a82be35bdac09cec0806963b7901c145c8b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 28 Apr 2022 06:43:07 +0900
Subject: [PATCH 2004/2325] docs: fix @param

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

diff --git a/system/CLI/BaseCommand.php b/system/CLI/BaseCommand.php
index 8f843c4f5c73..af9fe7ca23b8 100644
--- a/system/CLI/BaseCommand.php
+++ b/system/CLI/BaseCommand.php
@@ -96,7 +96,7 @@ public function __construct(LoggerInterface $logger, Commands $commands)
     /**
      * Actually execute a command.
      *
-     * @param array<string, mixed> $params
+     * @param array<int|string, string> $params
      */
     abstract public function run(array $params);
 

From d46cd1e236e68efff7c54b69b43f94108870f0f5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 28 Apr 2022 06:52:43 +0900
Subject: [PATCH 2005/2325] docs: fix @return

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

diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index cfe12b79c2fa..eb5da6d7a326 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -212,7 +212,7 @@ protected function ensureExt(string $path, string $ext): string
     /**
      * Return the namespace mappings we know about.
      *
-     * @return array|string
+     * @return array<int, array<string, string>>
      */
     protected function getNamespaces()
     {

From efe2e641eafd3c8c3227abfa41dc2c5e8d47aba1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 28 Apr 2022 06:54:34 +0900
Subject: [PATCH 2006/2325] chore: update phpstan-baseline.neon.dist

---
 phpstan-baseline.neon.dist | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index 7e1f16d6bccf..709daad82cdd 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -185,11 +185,6 @@ parameters:
 			count: 1
 			path: system/Database/MigrationRunner.php
 
-		-
-			message: "#^Cannot access property \\$affected_rows on bool\\|object\\|resource\\.$#"
-			count: 1
-			path: system/Database/MySQLi/Connection.php
-
 		-
 			message: "#^Cannot access property \\$errno on bool\\|object\\|resource\\.$#"
 			count: 1
@@ -735,11 +730,6 @@ parameters:
 			count: 8
 			path: system/Security/Security.php
 
-		-
-			message: "#^Access to an undefined property Config\\\\App\\:\\:\\$sessionDBGroup\\.$#"
-			count: 1
-			path: system/Session/Handlers/DatabaseHandler.php
-
 		-
 			message: "#^Strict comparison using \\=\\=\\= between string and true will always evaluate to false\\.$#"
 			count: 1

From 1ef6e00262a66d3e76ecf8205520385c0227afbd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 28 Apr 2022 11:46:13 +0900
Subject: [PATCH 2007/2325] docs: update the link to user guide

The develop version is better.
---
 tests/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/README.md b/tests/README.md
index 80f9439d1e6d..b0efb16fa933 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -27,7 +27,7 @@ A number of the tests use a running database.
 In order to set up the database edit the details for the `tests` group in 
 **app/Config/Database.php** or **phpunit.xml**. Make sure that you provide a database engine 
 that is currently running on your machine. More details on a test database setup are in the 
-[Testing Your Database](https://codeigniter.com/user_guide/testing/database.html) section of the documentation.
+[Testing Your Database](https://codeigniter4.github.io/CodeIgniter4/testing/database.html) section of the documentation.
 
 If you want to run the tests without using live database you can 
 exclude `@DatabaseLive` group. Or make a copy of **phpunit.dist.xml** - 

From 05801cb1ad45e16969389f03d133065b5184be26 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 28 Apr 2022 11:52:09 +0900
Subject: [PATCH 2008/2325] docs: add how to run phpunit on Windows

---
 admin/starter/tests/README.md | 4 ++++
 tests/README.md               | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/admin/starter/tests/README.md b/admin/starter/tests/README.md
index 1edb10176e21..4aa8e33c6432 100644
--- a/admin/starter/tests/README.md
+++ b/admin/starter/tests/README.md
@@ -44,6 +44,10 @@ The entire test suite can be run by simply typing one command-line command from
 
 	> ./phpunit
 
+If you are using Windows, use the following command.
+
+	> vendor\bin\phpunit
+
 You can limit tests to those within a single test directory by specifying the 
 directory name after phpunit. 
 
diff --git a/tests/README.md b/tests/README.md
index b0efb16fa933..e66acd2727ab 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -40,6 +40,10 @@ The entire test suite can be run by simply typing one command-line command from
 
 	> ./phpunit
 
+If you are using Windows, use the following command.
+
+	> vendor\bin\phpunit
+
 You can limit tests to those within a single test directory by specifying the 
 directory name after phpunit. All core tests are stored under **tests/system**.
 

From 53f95167f8c31c67ea18a42258bafdf72e384ced Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 28 Apr 2022 11:52:47 +0900
Subject: [PATCH 2009/2325] docs: update PHPUnit version and doc link

---
 admin/starter/tests/README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/admin/starter/tests/README.md b/admin/starter/tests/README.md
index 4aa8e33c6432..923997b8396d 100644
--- a/admin/starter/tests/README.md
+++ b/admin/starter/tests/README.md
@@ -6,13 +6,14 @@ It is not intended to be a full description of the test features that you can
 use to test your application. Those details can be found in the documentation.
 
 ## Resources
+
 * [CodeIgniter 4 User Guide on Testing](https://codeigniter4.github.io/userguide/testing/index.html)
-* [PHPUnit docs](https://phpunit.readthedocs.io/en/8.5/index.html)
+* [PHPUnit docs](https://phpunit.de/documentation.html)
 
 ## Requirements
 
 It is recommended to use the latest version of PHPUnit. At the time of this 
-writing we are running version 8.5.13. Support for this has been built into the 
+writing we are running version 9.x. Support for this has been built into the 
 **composer.json** file that ships with CodeIgniter and can easily be installed 
 via [Composer](https://getcomposer.org/) if you don't already have it installed globally.
 

From 63a53ad09faad3d1653ef9cac0a2500bc094c500 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 28 Apr 2022 11:57:25 +0900
Subject: [PATCH 2010/2325] docs: add link to user guide

---
 admin/starter/tests/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/starter/tests/README.md b/admin/starter/tests/README.md
index 923997b8396d..9d20661afecd 100644
--- a/admin/starter/tests/README.md
+++ b/admin/starter/tests/README.md
@@ -31,8 +31,8 @@ for code coverage to be calculated successfully.
 A number of the tests use a running database. 
 In order to set up the database edit the details for the `tests` group in 
 **app/Config/Database.php** or **phpunit.xml**. Make sure that you provide a database engine 
-that is currently running on your machine. More details on a test database setup are in the 
-*Docs>>Testing>>Testing Your Database* section of the documentation.
+that is currently running on your machine. More details on a test database setup are in the
+[Testing Your Database](https://codeigniter4.github.io/userguide/testing/database.html) section of the documentation.
 
 If you want to run the tests without using live database you can 
 exclude @DatabaseLive group. Or make a copy of **phpunit.dist.xml** - 

From 8c6d1efc72f124f5c5d6342d887e225c7c5cb1e9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 28 Apr 2022 14:11:07 +0900
Subject: [PATCH 2011/2325] docs: fix @param

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

diff --git a/system/CLI/BaseCommand.php b/system/CLI/BaseCommand.php
index af9fe7ca23b8..f5d0d370e0ea 100644
--- a/system/CLI/BaseCommand.php
+++ b/system/CLI/BaseCommand.php
@@ -96,7 +96,7 @@ public function __construct(LoggerInterface $logger, Commands $commands)
     /**
      * Actually execute a command.
      *
-     * @param array<int|string, string> $params
+     * @param array<int|string, string|null> $params
      */
     abstract public function run(array $params);
 

From 1882f297b74c2c94039ff57fad3e98439334e837 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 28 Apr 2022 15:04:13 +0000
Subject: [PATCH 2012/2325] chore(deps-dev): update rector/rector requirement

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

---
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 9c1ee4adb46e..6e37fe7a25bf 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.5.6",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.21"
+        "rector/rector": "0.12.22"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From 55afc80841faad09d0987f6cb6a52a38ec714f28 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Thu, 28 Apr 2022 22:21:29 +0700
Subject: [PATCH 2013/2325] re-run rector 0.12.22 locally

---
 system/Database/OCI8/Builder.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/system/Database/OCI8/Builder.php b/system/Database/OCI8/Builder.php
index ac64b7ba5ca7..a954ec2337ad 100644
--- a/system/Database/OCI8/Builder.php
+++ b/system/Database/OCI8/Builder.php
@@ -132,9 +132,8 @@ protected function _replace(string $table, array $keys, array $values): string
         $sql .= implode(', ', array_map(static fn ($columnName) => $columnName . ' = "_replace".' . $columnName, $replaceableFields));
 
         $sql .= ' WHEN NOT MATCHED THEN INSERT (' . implode(', ', $replaceableFields) . ') VALUES ';
-        $sql .= ' (' . implode(', ', array_map(static fn ($columnName) => '"_replace".' . $columnName, $replaceableFields)) . ')';
 
-        return $sql;
+        return $sql . (' (' . implode(', ', array_map(static fn ($columnName) => '"_replace".' . $columnName, $replaceableFields)) . ')');
     }
 
     /**

From 346c83ff7693520be63d5293e978645c571461fc Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Thu, 28 Apr 2022 22:38:36 +0700
Subject: [PATCH 2014/2325] try increase paralel timeout

---
 rector.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rector.php b/rector.php
index 856d45f76553..a8472023c3de 100644
--- a/rector.php
+++ b/rector.php
@@ -27,6 +27,7 @@
 use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector;
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
 use Rector\Config\RectorConfig;
+use Rector\Core\Configuration\Option;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector;
 use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector;
@@ -160,4 +161,7 @@
         'stdClass',
         'SQLite3',
     ]);
+
+    $parameters = $rectorConfig->parameters();
+    $parameters->set(Option::PARALLEL_TIMEOUT_IN_SECONDS, 180);
 };

From abcb42ced7bd8c41ad9bfafe63c1b196b46bd0c0 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Thu, 28 Apr 2022 23:19:07 +0700
Subject: [PATCH 2015/2325] update to use by paths on run rector to avoid
 timeout parallel

---
 .github/workflows/test-rector.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-rector.yml b/.github/workflows/test-rector.yml
index 372b10289291..07c0372f515c 100644
--- a/.github/workflows/test-rector.yml
+++ b/.github/workflows/test-rector.yml
@@ -35,6 +35,11 @@ jobs:
       fail-fast: false
       matrix:
         php-versions: ['7.4', '8.0']
+        paths:
+          - app
+          - system
+          - tests
+          - utils/Rector
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -69,4 +74,4 @@ jobs:
         run: composer update --ansi --no-interaction
 
       - name: Run static analysis
-        run: vendor/bin/rector process --dry-run --no-progress-bar
+        run: vendor/bin/rector process ${{ matrix.paths }} --dry-run --no-progress-bar

From e422a35d49cabf351cec583222d671041e312629 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Thu, 28 Apr 2022 23:22:01 +0700
Subject: [PATCH 2016/2325] define path in title workflow rector

---
 .github/workflows/test-rector.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-rector.yml b/.github/workflows/test-rector.yml
index 07c0372f515c..f98d759f6edb 100644
--- a/.github/workflows/test-rector.yml
+++ b/.github/workflows/test-rector.yml
@@ -29,7 +29,7 @@ on:
 
 jobs:
   build:
-    name: PHP ${{ matrix.php-versions }} Analyze code (Rector)
+    name: PHP ${{ matrix.php-versions }} Analyze code (Rector) on ${{ matrix.paths }}
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false

From f8ed66d5245e7713145ef63ed96592a0dda9fdac Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 29 Apr 2022 00:07:19 +0700
Subject: [PATCH 2017/2325] re-run rector 0.12.22 locally

---
 tests/system/Autoloader/AutoloaderTest.php    |  9 ++--
 tests/system/Commands/CreateDatabaseTest.php  |  6 +--
 .../Utilities/Routes/ControllerFinderTest.php |  3 +-
 tests/system/CommonFunctionsTest.php          |  2 +-
 tests/system/Config/BaseConfigTest.php        |  6 ++-
 tests/system/Config/ConfigTest.php            |  4 +-
 tests/system/Config/FactoriesTest.php         |  7 ++--
 tests/system/ControllerTest.php               | 18 ++------
 tests/system/Database/BaseConnectionTest.php  |  4 +-
 .../system/Database/DatabaseTestCaseTest.php  |  8 ++--
 tests/system/Database/Live/AliasTest.php      |  3 +-
 tests/system/Database/Live/BadQueryTest.php   |  3 +-
 tests/system/Database/Live/CountTest.php      |  3 +-
 .../Live/DatabaseTestTraitCaseTest.php        |  3 +-
 tests/system/Database/Live/DbUtilsTest.php    |  3 +-
 tests/system/Database/Live/DeleteTest.php     |  3 +-
 tests/system/Database/Live/EmptyTest.php      |  3 +-
 tests/system/Database/Live/ForgeTest.php      |  3 +-
 tests/system/Database/Live/FromTest.php       |  3 +-
 tests/system/Database/Live/GetNumRowsTest.php |  3 +-
 tests/system/Database/Live/GetTest.php        |  3 +-
 tests/system/Database/Live/GroupTest.php      |  3 +-
 tests/system/Database/Live/IncrementTest.php  |  3 +-
 tests/system/Database/Live/InsertTest.php     |  3 +-
 tests/system/Database/Live/JoinTest.php       |  3 +-
 tests/system/Database/Live/LikeTest.php       |  3 +-
 tests/system/Database/Live/LimitTest.php      |  3 +-
 tests/system/Database/Live/MetadataTest.php   |  7 ++--
 .../Database/Live/OCI8/LastInsertIDTest.php   |  3 +-
 tests/system/Database/Live/OrderTest.php      |  3 +-
 tests/system/Database/Live/SelectTest.php     |  3 +-
 tests/system/Database/Live/UpdateTest.php     |  3 +-
 tests/system/Database/Live/WhereTest.php      |  3 +-
 .../Database/Live/WriteTypeQueryTest.php      |  3 +-
 tests/system/Database/ModelFactoryTest.php    |  4 +-
 tests/system/Events/EventsTest.php            |  4 +-
 tests/system/Files/FileWithVfsTest.php        |  6 +--
 tests/system/Filters/FiltersTest.php          | 42 +++++++++++--------
 tests/system/Format/FormatTest.php            |  2 +-
 tests/system/HTTP/CLIRequestTest.php          |  5 +--
 .../HTTP/IncomingRequestDetectingTest.php     |  5 +--
 tests/system/HTTP/IncomingRequestTest.php     |  5 +--
 tests/system/HTTP/MessageTest.php             |  5 +--
 tests/system/HTTP/NegotiateTest.php           | 11 +----
 tests/system/HTTP/RequestTest.php             |  5 +--
 tests/system/HTTP/UserAgentTest.php           | 10 ++---
 tests/system/Images/ImageTest.php             |  2 +-
 tests/system/Log/Handlers/FileHandlerTest.php | 29 ++++++-------
 tests/system/Log/LoggerTest.php               |  2 +-
 tests/system/Models/LiveModelTestCase.php     |  3 +-
 tests/system/Pager/PagerRendererTest.php      |  5 +--
 tests/system/Pager/PagerTest.php              |  6 +--
 .../system/RESTful/ResourceControllerTest.php |  9 ++--
 .../system/RESTful/ResourcePresenterTest.php  | 23 +++++-----
 tests/system/Router/RouteCollectionTest.php   |  3 +-
 tests/system/Router/RouterTest.php            | 12 ++----
 .../SecurityCSRFSessionRandomizeTokenTest.php |  3 +-
 .../Security/SecurityCSRFSessionTest.php      |  3 +-
 .../Database/AbstractHandlerTestCase.php      |  3 +-
 tests/system/Test/BootstrapFCPATHTest.php     |  3 +-
 tests/system/Test/FabricatorTest.php          |  5 ++-
 tests/system/Test/TestResponseTest.php        |  5 +--
 tests/system/View/DecoratorsTest.php          |  2 +-
 tests/system/View/ParserPluginTest.php        | 11 +----
 64 files changed, 176 insertions(+), 200 deletions(-)

diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php
index 1279910d2289..c0a408162430 100644
--- a/tests/system/Autoloader/AutoloaderTest.php
+++ b/tests/system/Autoloader/AutoloaderTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Autoloader;
 
+use App\Controllers\Home;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Autoload;
 use Config\Modules;
@@ -86,7 +87,7 @@ public function testServiceAutoLoaderFromShareInstances()
     {
         $autoloader = Services::autoloader();
         // look for Home controller, as that should be in base repo
-        $actual   = $autoloader->loadClass('App\Controllers\Home');
+        $actual   = $autoloader->loadClass(Home::class);
         $expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php';
         $this->assertSame($expected, realpath($actual) ?: $actual);
     }
@@ -97,14 +98,14 @@ public function testServiceAutoLoader()
         $autoloader->initialize(new Autoload(), new Modules());
         $autoloader->register();
         // look for Home controller, as that should be in base repo
-        $actual   = $autoloader->loadClass('App\Controllers\Home');
+        $actual   = $autoloader->loadClass(Home::class);
         $expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php';
         $this->assertSame($expected, realpath($actual) ?: $actual);
     }
 
     public function testExistingFile()
     {
-        $actual   = $this->loader->loadClass('App\Controllers\Home');
+        $actual   = $this->loader->loadClass(Home::class);
         $expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php';
         $this->assertSame($expected, $actual);
 
@@ -115,7 +116,7 @@ public function testExistingFile()
 
     public function testMatchesWithPrecedingSlash()
     {
-        $actual   = $this->loader->loadClass('\App\Controllers\Home');
+        $actual   = $this->loader->loadClass(Home::class);
         $expected = APPPATH . 'Controllers' . DIRECTORY_SEPARATOR . 'Home.php';
         $this->assertSame($expected, $actual);
     }
diff --git a/tests/system/Commands/CreateDatabaseTest.php b/tests/system/Commands/CreateDatabaseTest.php
index ccbadc51f0c3..96120847791c 100644
--- a/tests/system/Commands/CreateDatabaseTest.php
+++ b/tests/system/Commands/CreateDatabaseTest.php
@@ -25,11 +25,7 @@
 final class CreateDatabaseTest extends CIUnitTestCase
 {
     protected $streamFilter;
-
-    /**
-     * @var BaseConnection
-     */
-    protected $connection;
+    protected BaseConnection $connection;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php b/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php
index 676a1869b1b3..175187a2dadb 100644
--- a/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php
+++ b/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Commands\Utilities\Routes;
 
 use CodeIgniter\Test\CIUnitTestCase;
+use Tests\Support\Controllers\Hello;
 
 /**
  * @internal
@@ -26,6 +27,6 @@ public function testFind()
         $controllers = $finder->find();
 
         $this->assertCount(3, $controllers);
-        $this->assertSame('Tests\Support\Controllers\Hello', $controllers[0]);
+        $this->assertSame(Hello::class, $controllers[0]);
     }
 }
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index b69f6120656a..98ee02f30bbc 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -274,7 +274,7 @@ public function testModelExistsClassname()
 
     public function testModelExistsAbsoluteClassname()
     {
-        $this->assertInstanceOf(JobModel::class, model('\Tests\Support\Models\JobModel'));
+        $this->assertInstanceOf(JobModel::class, model(JobModel::class));
     }
 
     /**
diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php
index 20d2f77c8421..b24a761c3d26 100644
--- a/tests/system/Config/BaseConfigTest.php
+++ b/tests/system/Config/BaseConfigTest.php
@@ -16,6 +16,8 @@
 use RegistrarConfig;
 use RuntimeException;
 use SimpleConfig;
+use Tests\Support\Config\BadRegistrar;
+use Tests\Support\Config\TestRegistrar;
 
 /**
  * @internal
@@ -236,7 +238,7 @@ public function testRecognizesLooseValues()
     public function testRegistrars()
     {
         $config              = new RegistrarConfig();
-        $config::$registrars = ['\Tests\Support\Config\TestRegistrar'];
+        $config::$registrars = [TestRegistrar::class];
         $this->setPrivateProperty($config, 'didDiscovery', true);
         $method = $this->getPrivateMethodInvoker($config, 'registerProperties');
         $method();
@@ -255,7 +257,7 @@ public function testBadRegistrar()
     {
         // Shouldn't change any values.
         $config              = new RegistrarConfig();
-        $config::$registrars = ['\Tests\Support\Config\BadRegistrar'];
+        $config::$registrars = [BadRegistrar::class];
         $this->setPrivateProperty($config, 'didDiscovery', true);
 
         $this->expectException(RuntimeException::class);
diff --git a/tests/system/Config/ConfigTest.php b/tests/system/Config/ConfigTest.php
index a784280bdc12..0e3dc8d3082a 100644
--- a/tests/system/Config/ConfigTest.php
+++ b/tests/system/Config/ConfigTest.php
@@ -23,7 +23,7 @@ final class ConfigTest extends CIUnitTestCase
     public function testCreateSingleInstance()
     {
         $Config          = Config::get('DocTypes', false);
-        $NamespaceConfig = Config::get('Config\\DocTypes', false);
+        $NamespaceConfig = Config::get(DocTypes::class, false);
 
         $this->assertInstanceOf(DocTypes::class, $Config);
         $this->assertInstanceOf(DocTypes::class, $NamespaceConfig);
@@ -39,7 +39,7 @@ public function testCreateInvalidInstance()
     public function testCreateSharedInstance()
     {
         $Config  = Config::get('DocTypes');
-        $Config2 = Config::get('Config\\DocTypes');
+        $Config2 = Config::get(DocTypes::class);
 
         $this->assertSame($Config2, $Config);
     }
diff --git a/tests/system/Config/FactoriesTest.php b/tests/system/Config/FactoriesTest.php
index 92356d638106..d186807c1762 100644
--- a/tests/system/Config/FactoriesTest.php
+++ b/tests/system/Config/FactoriesTest.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use ReflectionClass;
 use stdClass;
+use Tests\Support\Models\UserModel;
 use Tests\Support\Widgets\OtherWidget;
 use Tests\Support\Widgets\SomeWidget;
 
@@ -132,7 +133,7 @@ public function testGetsBasenameByClassname()
 
     public function testGetsBasenameByAbsoluteClassname()
     {
-        $this->assertSame('UserModel', Factories::getBasename('\Tests\Support\Models\UserModel'));
+        $this->assertSame('UserModel', Factories::getBasename(UserModel::class));
     }
 
     public function testGetsBasenameInvalid()
@@ -156,9 +157,9 @@ public function testCreatesByClassname()
 
     public function testCreatesByAbsoluteClassname()
     {
-        $result = Factories::models('\Tests\Support\Models\UserModel', ['getShared' => false]);
+        $result = Factories::models(UserModel::class, ['getShared' => false]);
 
-        $this->assertInstanceOf('Tests\Support\Models\UserModel', $result);
+        $this->assertInstanceOf(UserModel::class, $result);
     }
 
     public function testCreatesInvalid()
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index 31c69405e382..ea2d7f9e553e 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -33,10 +33,7 @@
  */
 final class ControllerTest extends CIUnitTestCase
 {
-    /**
-     * @var CodeIgniter
-     */
-    protected $codeigniter;
+    protected CodeIgniter $codeigniter;
 
     /**
      * @var Controller
@@ -45,22 +42,15 @@ final class ControllerTest extends CIUnitTestCase
 
     /**
      * Current request.
-     *
-     * @var Request
      */
-    protected $request;
+    protected Request $request;
 
     /**
      * Current response.
-     *
-     * @var Response
      */
-    protected $response;
+    protected Response $response;
 
-    /**
-     * @var LoggerInterface
-     */
-    protected $logger;
+    protected LoggerInterface $logger;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Database/BaseConnectionTest.php b/tests/system/Database/BaseConnectionTest.php
index 781588dd78e8..02f41319027b 100644
--- a/tests/system/Database/BaseConnectionTest.php
+++ b/tests/system/Database/BaseConnectionTest.php
@@ -21,7 +21,7 @@
  */
 final class BaseConnectionTest extends CIUnitTestCase
 {
-    protected $options = [
+    protected array $options = [
         'DSN'      => '',
         'hostname' => 'localhost',
         'username' => 'first',
@@ -39,7 +39,7 @@ final class BaseConnectionTest extends CIUnitTestCase
         'strictOn' => true,
         'failover' => [],
     ];
-    protected $failoverOptions = [
+    protected array $failoverOptions = [
         'DSN'      => '',
         'hostname' => 'localhost',
         'username' => 'failover',
diff --git a/tests/system/Database/DatabaseTestCaseTest.php b/tests/system/Database/DatabaseTestCaseTest.php
index 71a5264d93f6..23525f71571a 100644
--- a/tests/system/Database/DatabaseTestCaseTest.php
+++ b/tests/system/Database/DatabaseTestCaseTest.php
@@ -14,6 +14,8 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 use Config\Services;
+use Tests\Support\Database\Seeds\AnotherSeeder;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -24,7 +26,7 @@ final class DatabaseTestCaseTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
-    protected static $loaded = false;
+    protected static bool $loaded = false;
 
     /**
      * Should the db be refreshed before
@@ -41,8 +43,8 @@ final class DatabaseTestCaseTest extends CIUnitTestCase
      * @var array|string
      */
     protected $seed = [
-        'Tests\Support\Database\Seeds\CITestSeeder',
-        'Tests\Support\Database\Seeds\AnotherSeeder',
+        CITestSeeder::class,
+        AnotherSeeder::class,
     ];
 
     /**
diff --git a/tests/system/Database/Live/AliasTest.php b/tests/system/Database/Live/AliasTest.php
index c032cd1b6546..6cb993431daf 100644
--- a/tests/system/Database/Live/AliasTest.php
+++ b/tests/system/Database/Live/AliasTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -24,7 +25,7 @@ final class AliasTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     public function testAlias()
     {
diff --git a/tests/system/Database/Live/BadQueryTest.php b/tests/system/Database/Live/BadQueryTest.php
index b7d7840525c6..4c9ee180674d 100644
--- a/tests/system/Database/Live/BadQueryTest.php
+++ b/tests/system/Database/Live/BadQueryTest.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 use Exception;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -25,7 +26,7 @@ final class BadQueryTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
     protected static $origDebug;
 
     /**
diff --git a/tests/system/Database/Live/CountTest.php b/tests/system/Database/Live/CountTest.php
index d87833759f24..a84170e3d463 100644
--- a/tests/system/Database/Live/CountTest.php
+++ b/tests/system/Database/Live/CountTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -24,7 +25,7 @@ final class CountTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     public function testCountReturnsZeroWithNoResults()
     {
diff --git a/tests/system/Database/Live/DatabaseTestTraitCaseTest.php b/tests/system/Database/Live/DatabaseTestTraitCaseTest.php
index 3e9267b2b05d..0558905ca061 100644
--- a/tests/system/Database/Live/DatabaseTestTraitCaseTest.php
+++ b/tests/system/Database/Live/DatabaseTestTraitCaseTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -24,7 +25,7 @@ final class DatabaseTestTraitCaseTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     public function testHasInDatabase()
     {
diff --git a/tests/system/Database/Live/DbUtilsTest.php b/tests/system/Database/Live/DbUtilsTest.php
index e767d0b6991d..7fbdfb7d3c94 100644
--- a/tests/system/Database/Live/DbUtilsTest.php
+++ b/tests/system/Database/Live/DbUtilsTest.php
@@ -15,6 +15,7 @@
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -26,7 +27,7 @@ final class DbUtilsTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
     protected static $origDebug;
 
     /**
diff --git a/tests/system/Database/Live/DeleteTest.php b/tests/system/Database/Live/DeleteTest.php
index f8311e9d042a..9badfb6ec516 100644
--- a/tests/system/Database/Live/DeleteTest.php
+++ b/tests/system/Database/Live/DeleteTest.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -25,7 +26,7 @@ final class DeleteTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     public function testDeleteThrowExceptionWithNoCriteria()
     {
diff --git a/tests/system/Database/Live/EmptyTest.php b/tests/system/Database/Live/EmptyTest.php
index 912f627911c6..ac0de48a1d5e 100644
--- a/tests/system/Database/Live/EmptyTest.php
+++ b/tests/system/Database/Live/EmptyTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -24,7 +25,7 @@ final class EmptyTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     public function testEmpty()
     {
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 47eadc34d0b2..0a110ae2ee6b 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -17,6 +17,7 @@
 use CodeIgniter\Test\DatabaseTestTrait;
 use Config\Database;
 use RuntimeException;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -28,7 +29,7 @@ final class ForgeTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
     protected Forge $forge;
 
     protected function setUp(): void
diff --git a/tests/system/Database/Live/FromTest.php b/tests/system/Database/Live/FromTest.php
index 5037dd717f71..a3688ae03616 100644
--- a/tests/system/Database/Live/FromTest.php
+++ b/tests/system/Database/Live/FromTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -24,7 +25,7 @@ final class FromTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     public function testFromCanAddTables()
     {
diff --git a/tests/system/Database/Live/GetNumRowsTest.php b/tests/system/Database/Live/GetNumRowsTest.php
index 791fef5acf39..8ed483a53a78 100644
--- a/tests/system/Database/Live/GetNumRowsTest.php
+++ b/tests/system/Database/Live/GetNumRowsTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @internal
@@ -22,7 +23,7 @@ final class GetNumRowsTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     /**
      * Added as instructed at https://codeigniter4.github.io/userguide/testing/database.html#the-test-class
diff --git a/tests/system/Database/Live/GetTest.php b/tests/system/Database/Live/GetTest.php
index 20ae2e099d0d..59381e07a6c2 100644
--- a/tests/system/Database/Live/GetTest.php
+++ b/tests/system/Database/Live/GetTest.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -25,7 +26,7 @@ final class GetTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     public function testGet()
     {
diff --git a/tests/system/Database/Live/GroupTest.php b/tests/system/Database/Live/GroupTest.php
index c7514d0954dc..da028757e9eb 100644
--- a/tests/system/Database/Live/GroupTest.php
+++ b/tests/system/Database/Live/GroupTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -24,7 +25,7 @@ final class GroupTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     public function testGroupBy()
     {
diff --git a/tests/system/Database/Live/IncrementTest.php b/tests/system/Database/Live/IncrementTest.php
index bb5faccf4e15..0c3ddf600833 100644
--- a/tests/system/Database/Live/IncrementTest.php
+++ b/tests/system/Database/Live/IncrementTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -24,7 +25,7 @@ final class IncrementTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     public function testIncrement()
     {
diff --git a/tests/system/Database/Live/InsertTest.php b/tests/system/Database/Live/InsertTest.php
index a5bd090b7578..4143ef1f6ddd 100644
--- a/tests/system/Database/Live/InsertTest.php
+++ b/tests/system/Database/Live/InsertTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -24,7 +25,7 @@ final class InsertTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     public function testInsert()
     {
diff --git a/tests/system/Database/Live/JoinTest.php b/tests/system/Database/Live/JoinTest.php
index b30c8ac8b9bb..265ea31c8adc 100644
--- a/tests/system/Database/Live/JoinTest.php
+++ b/tests/system/Database/Live/JoinTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -24,7 +25,7 @@ final class JoinTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     public function testSimpleJoin()
     {
diff --git a/tests/system/Database/Live/LikeTest.php b/tests/system/Database/Live/LikeTest.php
index 65261f2372fb..f192d4a0f224 100644
--- a/tests/system/Database/Live/LikeTest.php
+++ b/tests/system/Database/Live/LikeTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -24,7 +25,7 @@ final class LikeTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     public function testLikeDefault()
     {
diff --git a/tests/system/Database/Live/LimitTest.php b/tests/system/Database/Live/LimitTest.php
index 8673b5bc486d..2ab4000423fe 100644
--- a/tests/system/Database/Live/LimitTest.php
+++ b/tests/system/Database/Live/LimitTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -24,7 +25,7 @@ final class LimitTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     public function testLimit()
     {
diff --git a/tests/system/Database/Live/MetadataTest.php b/tests/system/Database/Live/MetadataTest.php
index 8c6806c4d86e..107beca4c293 100644
--- a/tests/system/Database/Live/MetadataTest.php
+++ b/tests/system/Database/Live/MetadataTest.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 use Config\Database;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -25,14 +26,12 @@ final class MetadataTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     /**
      * Array of expected tables.
-     *
-     * @var array
      */
-    protected $expectedTables;
+    protected array $expectedTables;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Database/Live/OCI8/LastInsertIDTest.php b/tests/system/Database/Live/OCI8/LastInsertIDTest.php
index 16e4d84e989c..d55e9832f179 100644
--- a/tests/system/Database/Live/OCI8/LastInsertIDTest.php
+++ b/tests/system/Database/Live/OCI8/LastInsertIDTest.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Database\Query;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -25,7 +26,7 @@ final class LastInsertIDTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Database/Live/OrderTest.php b/tests/system/Database/Live/OrderTest.php
index eaab910edc5e..378b149f4b84 100644
--- a/tests/system/Database/Live/OrderTest.php
+++ b/tests/system/Database/Live/OrderTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -24,7 +25,7 @@ final class OrderTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     public function testOrderAscending()
     {
diff --git a/tests/system/Database/Live/SelectTest.php b/tests/system/Database/Live/SelectTest.php
index fbfa3ca97052..a6248197aacc 100644
--- a/tests/system/Database/Live/SelectTest.php
+++ b/tests/system/Database/Live/SelectTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -24,7 +25,7 @@ final class SelectTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     public function testSelectAllByDefault()
     {
diff --git a/tests/system/Database/Live/UpdateTest.php b/tests/system/Database/Live/UpdateTest.php
index c5502ce949a1..d69db467cdc2 100644
--- a/tests/system/Database/Live/UpdateTest.php
+++ b/tests/system/Database/Live/UpdateTest.php
@@ -15,6 +15,7 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 use Config\Database;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -26,7 +27,7 @@ final class UpdateTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     public function testUpdateSetsAllWithoutWhere()
     {
diff --git a/tests/system/Database/Live/WhereTest.php b/tests/system/Database/Live/WhereTest.php
index f349418eef0d..6c5cd5b81ca3 100644
--- a/tests/system/Database/Live/WhereTest.php
+++ b/tests/system/Database/Live/WhereTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -24,7 +25,7 @@ final class WhereTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     public function testWhereSimpleKeyValue()
     {
diff --git a/tests/system/Database/Live/WriteTypeQueryTest.php b/tests/system/Database/Live/WriteTypeQueryTest.php
index 9ec6c1c1dbe3..19ca62ae3b06 100644
--- a/tests/system/Database/Live/WriteTypeQueryTest.php
+++ b/tests/system/Database/Live/WriteTypeQueryTest.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @group DatabaseLive
@@ -25,7 +26,7 @@ final class WriteTypeQueryTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     public function testSet()
     {
diff --git a/tests/system/Database/ModelFactoryTest.php b/tests/system/Database/ModelFactoryTest.php
index 0be0341cc999..d49ccd455de3 100644
--- a/tests/system/Database/ModelFactoryTest.php
+++ b/tests/system/Database/ModelFactoryTest.php
@@ -33,7 +33,7 @@ protected function setUp(): void
     public function testCreateSeparateInstances()
     {
         $basenameModel  = ModelFactory::get('JobModel', false);
-        $namespaceModel = ModelFactory::get('Tests\\Support\\Models\\JobModel', false);
+        $namespaceModel = ModelFactory::get(JobModel::class, false);
 
         $this->assertInstanceOf(JobModel::class, $basenameModel);
         $this->assertInstanceOf(JobModel::class, $namespaceModel);
@@ -43,7 +43,7 @@ public function testCreateSeparateInstances()
     public function testCreateSharedInstance()
     {
         $basenameModel  = ModelFactory::get('JobModel', true);
-        $namespaceModel = ModelFactory::get('Tests\\Support\\Models\\JobModel', true);
+        $namespaceModel = ModelFactory::get(JobModel::class, true);
 
         $this->assertSame($basenameModel, $namespaceModel);
     }
diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php
index bb3b3e87a827..e35150f647a6 100644
--- a/tests/system/Events/EventsTest.php
+++ b/tests/system/Events/EventsTest.php
@@ -22,10 +22,8 @@ final class EventsTest extends CIUnitTestCase
 {
     /**
      * Accessible event manager instance
-     *
-     * @var MockEvents
      */
-    protected $manager;
+    protected MockEvents $manager;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Files/FileWithVfsTest.php b/tests/system/Files/FileWithVfsTest.php
index 33a87535ed54..2dbcbb9aca17 100644
--- a/tests/system/Files/FileWithVfsTest.php
+++ b/tests/system/Files/FileWithVfsTest.php
@@ -23,11 +23,7 @@ final class FileWithVfsTest extends CIUnitTestCase
     protected $root;
     protected $path;
     protected $start;
-
-    /**
-     * @var File
-     */
-    protected $file;
+    protected File $file;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index f2003e3891b6..bb6f02390265 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -13,6 +13,14 @@
 
 use CodeIgniter\Config\Services;
 use CodeIgniter\Filters\Exceptions\FilterException;
+use CodeIgniter\Filters\fixtures\GoogleCurious;
+use CodeIgniter\Filters\fixtures\GoogleEmpty;
+use CodeIgniter\Filters\fixtures\GoogleMe;
+use CodeIgniter\Filters\fixtures\GoogleYou;
+use CodeIgniter\Filters\fixtures\InvalidClass;
+use CodeIgniter\Filters\fixtures\Multiple1;
+use CodeIgniter\Filters\fixtures\Multiple2;
+use CodeIgniter\Filters\fixtures\Role;
 use CodeIgniter\HTTP\CLIRequest;
 use CodeIgniter\HTTP\ResponseInterface;
 use CodeIgniter\Test\CIUnitTestCase;
@@ -457,7 +465,7 @@ public function testRunThrowsWithInvalidClassType()
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
         $config = [
-            'aliases' => ['invalid' => 'CodeIgniter\Filters\fixtures\InvalidClass'],
+            'aliases' => ['invalid' => InvalidClass::class],
             'globals' => [
                 'before' => ['invalid'],
                 'after'  => [],
@@ -477,7 +485,7 @@ public function testRunDoesBefore()
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
         $config = [
-            'aliases' => ['google' => 'CodeIgniter\Filters\fixtures\GoogleMe'],
+            'aliases' => ['google' => GoogleMe::class],
             'globals' => [
                 'before' => ['google'],
                 'after'  => [],
@@ -497,7 +505,7 @@ public function testRunDoesAfter()
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
         $config = [
-            'aliases' => ['google' => 'CodeIgniter\Filters\fixtures\GoogleMe'],
+            'aliases' => ['google' => GoogleMe::class],
             'globals' => [
                 'before' => [],
                 'after'  => ['google'],
@@ -517,7 +525,7 @@ public function testShortCircuit()
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
         $config = [
-            'aliases' => ['banana' => 'CodeIgniter\Filters\fixtures\GoogleYou'],
+            'aliases' => ['banana' => GoogleYou::class],
             'globals' => [
                 'before' => ['banana'],
                 'after'  => [],
@@ -539,8 +547,8 @@ public function testOtherResult()
 
         $config = [
             'aliases' => [
-                'nowhere' => 'CodeIgniter\Filters\fixtures\GoogleEmpty',
-                'banana'  => 'CodeIgniter\Filters\fixtures\GoogleCurious',
+                'nowhere' => GoogleEmpty::class,
+                'banana'  => GoogleCurious::class,
             ],
             'globals' => [
                 'before' => [
@@ -700,7 +708,7 @@ public function testAddFilter()
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
         $config = [
-            'aliases' => ['google' => 'CodeIgniter\Filters\fixtures\GoogleMe'],
+            'aliases' => ['google' => GoogleMe::class],
             'globals' => [
                 'before' => ['google'],
                 'after'  => [],
@@ -754,7 +762,7 @@ public function testEnableFilter()
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
         $config = [
-            'aliases' => ['google' => 'CodeIgniter\Filters\fixtures\GoogleMe'],
+            'aliases' => ['google' => GoogleMe::class],
             'globals' => [
                 'before' => [],
                 'after'  => [],
@@ -775,7 +783,7 @@ public function testEnableFilterWithArguments()
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
         $config = [
-            'aliases' => ['role' => 'CodeIgniter\Filters\fixtures\Role'],
+            'aliases' => ['role' => Role::class],
             'globals' => [
                 'before' => [],
                 'after'  => [],
@@ -807,7 +815,7 @@ public function testEnableFilterWithNoArguments()
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
         $config = [
-            'aliases' => ['role' => 'CodeIgniter\Filters\fixtures\Role'],
+            'aliases' => ['role' => Role::class],
             'globals' => [
                 'before' => [],
                 'after'  => [],
@@ -839,7 +847,7 @@ public function testEnableNonFilter()
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
         $config = [
-            'aliases' => ['google' => 'CodeIgniter\Filters\fixtures\GoogleMe'],
+            'aliases' => ['google' => GoogleMe::class],
             'globals' => [
                 'before' => [],
                 'after'  => [],
@@ -1077,8 +1085,8 @@ public function testFilterAliasMultiple()
         $config = [
             'aliases' => [
                 'multipleTest' => [
-                    'CodeIgniter\Filters\fixtures\Multiple1',
-                    'CodeIgniter\Filters\fixtures\Multiple2',
+                    Multiple1::class,
+                    Multiple2::class,
                 ],
             ],
             'globals' => [
@@ -1102,8 +1110,8 @@ public function testFilterClass()
         $config = [
             'aliases' => [
                 'multipleTest' => [
-                    'CodeIgniter\Filters\fixtures\Multiple1',
-                    'CodeIgniter\Filters\fixtures\Multiple2',
+                    Multiple1::class,
+                    Multiple2::class,
                 ],
             ],
             'globals' => [
@@ -1120,8 +1128,8 @@ public function testFilterClass()
         $expected = [
             'before' => [],
             'after'  => [
-                'CodeIgniter\Filters\fixtures\Multiple1',
-                'CodeIgniter\Filters\fixtures\Multiple2',
+                Multiple1::class,
+                Multiple2::class,
             ],
         ];
         $this->assertSame($expected, $filters->getFiltersClass());
diff --git a/tests/system/Format/FormatTest.php b/tests/system/Format/FormatTest.php
index 3bc6854fa3ae..f0a4e82c9b6a 100644
--- a/tests/system/Format/FormatTest.php
+++ b/tests/system/Format/FormatTest.php
@@ -32,7 +32,7 @@ public function testFormatConfigType()
         $config = new \Config\Format();
         $format = new Format($config);
 
-        $this->assertInstanceOf('Config\Format', $format->getConfig());
+        $this->assertInstanceOf(\Config\Format::class, $format->getConfig());
         $this->assertSame($config, $format->getConfig());
     }
 
diff --git a/tests/system/HTTP/CLIRequestTest.php b/tests/system/HTTP/CLIRequestTest.php
index 6bd37e954520..c08bda24eb4d 100644
--- a/tests/system/HTTP/CLIRequestTest.php
+++ b/tests/system/HTTP/CLIRequestTest.php
@@ -24,10 +24,7 @@
  */
 final class CLIRequestTest extends CIUnitTestCase
 {
-    /**
-     * @var CLIRequest
-     */
-    protected $request;
+    protected CLIRequest $request;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php
index a28fd86525da..8958b65a0af9 100644
--- a/tests/system/HTTP/IncomingRequestDetectingTest.php
+++ b/tests/system/HTTP/IncomingRequestDetectingTest.php
@@ -21,10 +21,7 @@
  */
 final class IncomingRequestDetectingTest extends CIUnitTestCase
 {
-    /**
-     * @var IncomingRequest
-     */
-    protected $request;
+    protected IncomingRequest $request;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 67122397e7ed..84421ec167b0 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -23,10 +23,7 @@
  */
 final class IncomingRequestTest extends CIUnitTestCase
 {
-    /**
-     * @var IncomingRequest
-     */
-    protected $request;
+    protected IncomingRequest $request;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php
index 38361fdb1ce4..49bed7e8777b 100644
--- a/tests/system/HTTP/MessageTest.php
+++ b/tests/system/HTTP/MessageTest.php
@@ -19,10 +19,7 @@
  */
 final class MessageTest extends CIUnitTestCase
 {
-    /**
-     * @var Message
-     */
-    protected $message;
+    protected ?Message $message;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/NegotiateTest.php b/tests/system/HTTP/NegotiateTest.php
index af7549e30239..bf5996a0cd37 100644
--- a/tests/system/HTTP/NegotiateTest.php
+++ b/tests/system/HTTP/NegotiateTest.php
@@ -20,15 +20,8 @@
  */
 final class NegotiateTest extends CIUnitTestCase
 {
-    /**
-     * @var Request
-     */
-    protected $request;
-
-    /**
-     * @var Negotiate
-     */
-    protected $negotiate;
+    protected ?Request $request;
+    protected ?Negotiate $negotiate;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/RequestTest.php b/tests/system/HTTP/RequestTest.php
index e4ad2d6bf340..e6cba20dcb1e 100644
--- a/tests/system/HTTP/RequestTest.php
+++ b/tests/system/HTTP/RequestTest.php
@@ -21,10 +21,7 @@
  */
 final class RequestTest extends CIUnitTestCase
 {
-    /**
-     * @var Request
-     */
-    protected $request;
+    protected Request $request;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/UserAgentTest.php b/tests/system/HTTP/UserAgentTest.php
index e4f2d1e7f025..b75a17080161 100644
--- a/tests/system/HTTP/UserAgentTest.php
+++ b/tests/system/HTTP/UserAgentTest.php
@@ -18,13 +18,9 @@
  */
 final class UserAgentTest extends CIUnitTestCase
 {
-    protected $_user_agent = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27';
-    protected $_mobile_ua  = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7';
-
-    /**
-     * @var UserAgent
-     */
-    protected $agent;
+    protected string $_user_agent = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27';
+    protected string $_mobile_ua  = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7';
+    protected UserAgent $agent;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Images/ImageTest.php b/tests/system/Images/ImageTest.php
index f011a76a2bc8..4347e1e6ca9b 100644
--- a/tests/system/Images/ImageTest.php
+++ b/tests/system/Images/ImageTest.php
@@ -20,7 +20,7 @@
  */
 final class ImageTest extends CIUnitTestCase
 {
-    protected $path = 'tests/_support/ci-logo.png';
+    protected string $path = 'tests/_support/ci-logo.png';
 
     protected function setUp(): void
     {
diff --git a/tests/system/Log/Handlers/FileHandlerTest.php b/tests/system/Log/Handlers/FileHandlerTest.php
index e2ea5246ad86..3739ad130197 100644
--- a/tests/system/Log/Handlers/FileHandlerTest.php
+++ b/tests/system/Log/Handlers/FileHandlerTest.php
@@ -15,6 +15,7 @@
 use CodeIgniter\Test\Mock\MockFileLogger;
 use CodeIgniter\Test\Mock\MockLogger as LoggerConfig;
 use org\bovigo\vfs\vfsStream;
+use Tests\Support\Log\Handlers\TestHandler;
 
 /**
  * @internal
@@ -32,20 +33,20 @@ public function testHandle()
     {
         $config = new LoggerConfig();
 
-        $config->handlers['Tests\Support\Log\Handlers\TestHandler']['handles'] = ['critical'];
+        $config->handlers[TestHandler::class]['handles'] = ['critical'];
 
-        $logger = new MockFileLogger($config->handlers['Tests\Support\Log\Handlers\TestHandler']);
+        $logger = new MockFileLogger($config->handlers[TestHandler::class]);
         $logger->setDateFormat('Y-m-d H:i:s:u');
         $this->assertTrue($logger->handle('warning', 'This is a test log'));
     }
 
     public function testBasicHandle()
     {
-        $config                                                                = new LoggerConfig();
-        $config->handlers['Tests\Support\Log\Handlers\TestHandler']['path']    = $this->start . 'charlie/';
-        $config->handlers['Tests\Support\Log\Handlers\TestHandler']['handles'] = ['critical'];
+        $config                                          = new LoggerConfig();
+        $config->handlers[TestHandler::class]['path']    = $this->start . 'charlie/';
+        $config->handlers[TestHandler::class]['handles'] = ['critical'];
 
-        $logger = new MockFileLogger($config->handlers['Tests\Support\Log\Handlers\TestHandler']);
+        $logger = new MockFileLogger($config->handlers[TestHandler::class]);
         $logger->setDateFormat('Y-m-d H:i:s:u');
         $expected = 'log-' . date('Y-m-d') . '.log';
         vfsStream::newFile($expected)->at(vfsStream::setup('root/charlie'))->withContent('This is a test log');
@@ -54,16 +55,16 @@ public function testBasicHandle()
 
     public function testHandleCreateFile()
     {
-        $config                                                             = new LoggerConfig();
-        $config->handlers['Tests\Support\Log\Handlers\TestHandler']['path'] = $this->start;
-        $logger                                                             = new MockFileLogger($config->handlers['Tests\Support\Log\Handlers\TestHandler']);
+        $config                                       = new LoggerConfig();
+        $config->handlers[TestHandler::class]['path'] = $this->start;
+        $logger                                       = new MockFileLogger($config->handlers[TestHandler::class]);
 
         $logger->setDateFormat('Y-m-d H:i:s:u');
         $expected = 'log-' . date('Y-m-d') . '.log';
         vfsStream::newFile($expected)->at(vfsStream::setup('root'))->withContent('This is a test log');
         $logger->handle('warning', 'This is a test log');
 
-        $fp   = fopen($config->handlers['Tests\Support\Log\Handlers\TestHandler']['path'] . $expected, 'rb');
+        $fp   = fopen($config->handlers[TestHandler::class]['path'] . $expected, 'rb');
         $line = fgets($fp);
         fclose($fp);
 
@@ -74,15 +75,15 @@ public function testHandleCreateFile()
 
     public function testHandleDateTimeCorrectly()
     {
-        $config                                                             = new LoggerConfig();
-        $config->handlers['Tests\Support\Log\Handlers\TestHandler']['path'] = $this->start;
-        $logger                                                             = new MockFileLogger($config->handlers['Tests\Support\Log\Handlers\TestHandler']);
+        $config                                       = new LoggerConfig();
+        $config->handlers[TestHandler::class]['path'] = $this->start;
+        $logger                                       = new MockFileLogger($config->handlers[TestHandler::class]);
 
         $logger->setDateFormat('Y-m-d');
         $expected = 'log-' . date('Y-m-d') . '.log';
         vfsStream::newFile($expected)->at(vfsStream::setup('root'))->withContent('Test message');
         $logger->handle('debug', 'Test message');
-        $fp   = fopen($config->handlers['Tests\Support\Log\Handlers\TestHandler']['path'] . $expected, 'rb');
+        $fp   = fopen($config->handlers[TestHandler::class]['path'] . $expected, 'rb');
         $line = fgets($fp); // and get the second line
         fclose($fp);
 
diff --git a/tests/system/Log/LoggerTest.php b/tests/system/Log/LoggerTest.php
index cbddab72cbbc..d9f3cbebeaf3 100644
--- a/tests/system/Log/LoggerTest.php
+++ b/tests/system/Log/LoggerTest.php
@@ -74,7 +74,7 @@ public function testLogDoesnotLogUnhandledLevels()
     {
         $config = new LoggerConfig();
 
-        $config->handlers['Tests\Support\Log\Handlers\TestHandler']['handles'] = ['critical'];
+        $config->handlers[TestHandler::class]['handles'] = ['critical'];
 
         $logger = new Logger($config);
 
diff --git a/tests/system/Models/LiveModelTestCase.php b/tests/system/Models/LiveModelTestCase.php
index d8052967f290..de63907b903d 100644
--- a/tests/system/Models/LiveModelTestCase.php
+++ b/tests/system/Models/LiveModelTestCase.php
@@ -16,6 +16,7 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 use CodeIgniter\Test\ReflectionHelper;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * LiveModelTestCase should be in testing Model's features that
@@ -33,7 +34,7 @@ abstract class LiveModelTestCase extends CIUnitTestCase
      */
     protected $model;
 
-    protected $seed = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed = CITestSeeder::class;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Pager/PagerRendererTest.php b/tests/system/Pager/PagerRendererTest.php
index 90546a31b117..948d945ab8f9 100644
--- a/tests/system/Pager/PagerRendererTest.php
+++ b/tests/system/Pager/PagerRendererTest.php
@@ -19,10 +19,7 @@
  */
 final class PagerRendererTest extends CIUnitTestCase
 {
-    /**
-     * @var URI
-     */
-    protected $uri;
+    protected URI $uri;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index 6c6b14fdca7b..1d7b61ede2ec 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -28,11 +28,7 @@
  */
 final class PagerTest extends CIUnitTestCase
 {
-    /**
-     * @var \CodeIgniter\Pager\Pager
-     */
-    protected $pager;
-
+    protected ?\CodeIgniter\Pager\Pager $pager = null;
     protected $config;
 
     protected function setUp(): void
diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index 06719fdbfd85..80dc18f3ebec 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -27,6 +27,7 @@
 use Config\App;
 use Psr\Log\NullLogger;
 use Tests\Support\Models\UserModel;
+use Tests\Support\RESTful\Worker;
 
 /**
  * Exercise our ResourceController class.
@@ -58,7 +59,7 @@ protected function setUp(): void
 
         // Inject mock router.
         $this->routes = Services::routes();
-        $this->routes->resource('work', ['controller' => '\Tests\Support\RESTful\Worker']);
+        $this->routes->resource('work', ['controller' => Worker::class]);
         Services::injectMock('routes', $this->routes);
 
         $config            = new App();
@@ -244,9 +245,9 @@ public function testModelBogus()
     public function testModelByName()
     {
         $resource = new MockResourceController();
-        $resource->setModel('\Tests\Support\Models\UserModel');
+        $resource->setModel(UserModel::class);
         $this->assertInstanceOf(Model::class, $resource->getModel());
-        $this->assertSame('\Tests\Support\Models\UserModel', $resource->getModelName());
+        $this->assertSame(UserModel::class, $resource->getModelName());
     }
 
     public function testModelByObject()
@@ -257,7 +258,7 @@ public function testModelByObject()
         $this->assertInstanceOf(Model::class, $resource->getModel());
 
         // Note that the leading backslash is missing if we build it this way
-        $this->assertSame('Tests\Support\Models\UserModel', $resource->getModelName());
+        $this->assertSame(UserModel::class, $resource->getModelName());
     }
 
     public function testFormat()
diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php
index 568b395a778c..b38f0a1a4f94 100644
--- a/tests/system/RESTful/ResourcePresenterTest.php
+++ b/tests/system/RESTful/ResourcePresenterTest.php
@@ -21,6 +21,7 @@
 use Config\App;
 use Tests\Support\Models\EntityModel;
 use Tests\Support\Models\UserModel;
+use Tests\Support\RESTful\Worker2;
 
 /**
  * Exercise our core ResourcePresenter class.
@@ -52,7 +53,7 @@ protected function setUp(): void
 
         // Inject mock router.
         $this->routes = Services::routes();
-        $this->routes->presenter('work', ['controller' => 'Tests\Support\RESTful\Worker2']);
+        $this->routes->presenter('work', ['controller' => Worker2::class]);
         Services::injectMock('routes', $this->routes);
 
         $config            = new App();
@@ -244,9 +245,9 @@ public function testModelBogus()
     public function testModelByName()
     {
         $resource = new MockResourcePresenter();
-        $resource->setModel('\Tests\Support\Models\UserModel');
+        $resource->setModel(UserModel::class);
         $this->assertInstanceOf(Model::class, $resource->getModel());
-        $this->assertSame('\Tests\Support\Models\UserModel', $resource->getModelName());
+        $this->assertSame(UserModel::class, $resource->getModelName());
     }
 
     public function testModelByObject()
@@ -257,31 +258,31 @@ public function testModelByObject()
         $this->assertInstanceOf(Model::class, $resource->getModel());
 
         // Note that the leading backslash is missing if we build it this way
-        $this->assertSame('Tests\Support\Models\UserModel', $resource->getModelName());
+        $this->assertSame(UserModel::class, $resource->getModelName());
     }
 
     public function testChangeSetModelByObject()
     {
         $resource = new MockResourcePresenter();
-        $resource->setModel('\Tests\Support\Models\UserModel');
+        $resource->setModel(UserModel::class);
         $this->assertInstanceOf(Model::class, $resource->getModel());
-        $this->assertSame('\Tests\Support\Models\UserModel', $resource->getModelName());
+        $this->assertSame(UserModel::class, $resource->getModelName());
 
         $model = new EntityModel();
         $resource->setModel($model);
         $this->assertInstanceOf(Model::class, $resource->getModel());
-        $this->assertSame('Tests\Support\Models\EntityModel', $resource->getModelName());
+        $this->assertSame(EntityModel::class, $resource->getModelName());
     }
 
     public function testChangeSetModelByName()
     {
         $resource = new MockResourcePresenter();
-        $resource->setModel('\Tests\Support\Models\UserModel');
+        $resource->setModel(UserModel::class);
         $this->assertInstanceOf(Model::class, $resource->getModel());
-        $this->assertSame('\Tests\Support\Models\UserModel', $resource->getModelName());
+        $this->assertSame(UserModel::class, $resource->getModelName());
 
-        $resource->setModel('\Tests\Support\Models\EntityModel');
+        $resource->setModel(EntityModel::class);
         $this->assertInstanceOf(Model::class, $resource->getModel());
-        $this->assertSame('\Tests\Support\Models\EntityModel', $resource->getModelName());
+        $this->assertSame(EntityModel::class, $resource->getModelName());
     }
 }
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index 7eb3f99f3128..987fb96ff9c3 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -11,6 +11,7 @@
 
 namespace CodeIgniter\Router;
 
+use App\Controllers\Home;
 use CodeIgniter\Config\Services;
 use CodeIgniter\Router\Exceptions\RouterException;
 use CodeIgniter\Test\CIUnitTestCase;
@@ -1505,7 +1506,7 @@ public function testRouteOverwritingTwoRules()
         $routes->get('/', 'Home::index');
 
         // the second rule applies, so overwrites the first
-        $expects = '\App\Controllers\Home';
+        $expects = Home::class;
 
         $this->assertSame($expects, $router->handle('/'));
     }
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index 0389194688ef..cd19ca998390 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -25,10 +25,7 @@
  */
 final class RouterTest extends CIUnitTestCase
 {
-    /**
-     * @var RouteCollection
-     */
-    protected $collection;
+    protected RouteCollection $collection;
 
     /**
      * vfsStream root directory
@@ -37,10 +34,7 @@ final class RouterTest extends CIUnitTestCase
      */
     protected $root;
 
-    /**
-     * @var IncomingRequest
-     */
-    protected $request;
+    protected IncomingRequest $request;
 
     protected function setUp(): void
     {
@@ -596,7 +590,7 @@ public function testRouteWorksWithClassnameFilter()
 
         $this->assertSame('\TestController', $router->controllerName());
         $this->assertSame('foo', $router->methodName());
-        $this->assertSame('Tests\Support\Filters\Customfilter', $router->getFilter());
+        $this->assertSame(Customfilter::class, $router->getFilter());
     }
 
     public function testRouteWorksWithMultipleFilters()
diff --git a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
index 97b3330e8f24..0295abe41556 100644
--- a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
+++ b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
@@ -18,6 +18,7 @@
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Security\Exceptions\SecurityException;
 use CodeIgniter\Session\Handlers\ArrayHandler;
+use CodeIgniter\Session\Handlers\FileHandler;
 use CodeIgniter\Session\Session;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockAppConfig;
@@ -64,7 +65,7 @@ protected function setUp(): void
     private function createSession($options = []): Session
     {
         $defaults = [
-            'sessionDriver'            => 'CodeIgniter\Session\Handlers\FileHandler',
+            'sessionDriver'            => FileHandler::class,
             'sessionCookieName'        => 'ci_session',
             'sessionExpiration'        => 7200,
             'sessionSavePath'          => null,
diff --git a/tests/system/Security/SecurityCSRFSessionTest.php b/tests/system/Security/SecurityCSRFSessionTest.php
index db6326b5257a..d80ca938e1f1 100644
--- a/tests/system/Security/SecurityCSRFSessionTest.php
+++ b/tests/system/Security/SecurityCSRFSessionTest.php
@@ -18,6 +18,7 @@
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Security\Exceptions\SecurityException;
 use CodeIgniter\Session\Handlers\ArrayHandler;
+use CodeIgniter\Session\Handlers\FileHandler;
 use CodeIgniter\Session\Session;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockAppConfig;
@@ -57,7 +58,7 @@ protected function setUp(): void
     private function createSession($options = []): Session
     {
         $defaults = [
-            'sessionDriver'            => 'CodeIgniter\Session\Handlers\FileHandler',
+            'sessionDriver'            => FileHandler::class,
             'sessionCookieName'        => 'ci_session',
             'sessionExpiration'        => 7200,
             'sessionSavePath'          => null,
diff --git a/tests/system/Session/Handlers/Database/AbstractHandlerTestCase.php b/tests/system/Session/Handlers/Database/AbstractHandlerTestCase.php
index f252fc24fb43..c6d20f4267a9 100644
--- a/tests/system/Session/Handlers/Database/AbstractHandlerTestCase.php
+++ b/tests/system/Session/Handlers/Database/AbstractHandlerTestCase.php
@@ -15,6 +15,7 @@
 use CodeIgniter\Test\DatabaseTestTrait;
 use CodeIgniter\Test\ReflectionHelper;
 use Config\Database as DatabaseConfig;
+use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
  * @internal
@@ -25,7 +26,7 @@ abstract class AbstractHandlerTestCase extends CIUnitTestCase
     use ReflectionHelper;
 
     protected $refresh = true;
-    protected $seed    = 'Tests\Support\Database\Seeds\CITestSeeder';
+    protected $seed    = CITestSeeder::class;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Test/BootstrapFCPATHTest.php b/tests/system/Test/BootstrapFCPATHTest.php
index 5deb0850d524..ab243da398e7 100644
--- a/tests/system/Test/BootstrapFCPATHTest.php
+++ b/tests/system/Test/BootstrapFCPATHTest.php
@@ -93,9 +93,8 @@ private function fileContents()
         $fileContents .= "include_once '" . $this->currentDir . "' . '/../../../vendor/autoload.php';" . PHP_EOL;
         $fileContents .= "include_once '" . $this->currentDir . "' . '/../../../system/Test/bootstrap.php';" . PHP_EOL;
         $fileContents .= '// return value of FCPATH' . PHP_EOL;
-        $fileContents .= 'echo FCPATH;' . PHP_EOL;
 
-        return $fileContents;
+        return $fileContents . ('echo FCPATH;' . PHP_EOL);
     }
 
     private function readOutput($file)
diff --git a/tests/system/Test/FabricatorTest.php b/tests/system/Test/FabricatorTest.php
index 701eecb02c30..17319af7bcde 100644
--- a/tests/system/Test/FabricatorTest.php
+++ b/tests/system/Test/FabricatorTest.php
@@ -15,6 +15,7 @@
 use Tests\Support\Models\EntityModel;
 use Tests\Support\Models\EventModel;
 use Tests\Support\Models\FabricatorModel;
+use Tests\Support\Models\SimpleEntity;
 use Tests\Support\Models\UserModel;
 
 /**
@@ -97,7 +98,7 @@ public function testModelUsesNewInstance()
     {
         // Inject the wrong model for UserModel to show it is ignored by Fabricator
         $mock = new FabricatorModel();
-        ModelFactory::injectMock('Tests\Support\Models\UserModel', $mock);
+        ModelFactory::injectMock(UserModel::class, $mock);
 
         $fabricator = new Fabricator(UserModel::class);
         $this->assertInstanceOf(UserModel::class, $fabricator->getModel());
@@ -298,7 +299,7 @@ public function testMakeObjectReturnsModelReturnType()
     public function testMakeObjectReturnsProvidedClass()
     {
         $fabricator = new Fabricator(UserModel::class, $this->formatters);
-        $className  = 'Tests\Support\Models\SimpleEntity';
+        $className  = SimpleEntity::class;
 
         $result = $fabricator->makeObject($className);
 
diff --git a/tests/system/Test/TestResponseTest.php b/tests/system/Test/TestResponseTest.php
index cef63bd63af4..eb8be1a3d11d 100644
--- a/tests/system/Test/TestResponseTest.php
+++ b/tests/system/Test/TestResponseTest.php
@@ -23,10 +23,7 @@
  */
 final class TestResponseTest extends CIUnitTestCase
 {
-    /**
-     * @var TestResponse
-     */
-    protected $testResponse;
+    protected ?TestResponse $testResponse = null;
 
     /**
      * @var ResponseInterface
diff --git a/tests/system/View/DecoratorsTest.php b/tests/system/View/DecoratorsTest.php
index 571005897099..6513f1f4bb6d 100644
--- a/tests/system/View/DecoratorsTest.php
+++ b/tests/system/View/DecoratorsTest.php
@@ -53,7 +53,7 @@ public function testNoDecoratorsDoesntAlter()
     public function testThrowsOnInvalidClass()
     {
         $this->expectException(ViewException::class);
-        $this->expectExceptionMessage(lang('View.invalidDecoratorClass', ['Tests\Support\View\BadDecorator']));
+        $this->expectExceptionMessage(lang('View.invalidDecoratorClass', [BadDecorator::class]));
 
         $config             = $this->config;
         $config->decorators = [BadDecorator::class];
diff --git a/tests/system/View/ParserPluginTest.php b/tests/system/View/ParserPluginTest.php
index 7a4a94a87cc2..4205eb0520b3 100644
--- a/tests/system/View/ParserPluginTest.php
+++ b/tests/system/View/ParserPluginTest.php
@@ -20,15 +20,8 @@
  */
 final class ParserPluginTest extends CIUnitTestCase
 {
-    /**
-     * @var Parser
-     */
-    protected $parser;
-
-    /**
-     * @var Validation
-     */
-    protected $validator;
+    protected Parser $parser;
+    protected Validation $validator;
 
     protected function setUp(): void
     {

From 10b629081f2df9234197b8c9ebc28717e92c6152 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 29 Apr 2022 00:21:51 +0700
Subject: [PATCH 2018/2325] fix test IncomingRequestTest

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

diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 84421ec167b0..037514461cb4 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\HTTP\Files\UploadedFile;
+use CodeIgniter\HTTP\Request;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\App;
 
@@ -23,7 +24,7 @@
  */
 final class IncomingRequestTest extends CIUnitTestCase
 {
-    protected IncomingRequest $request;
+    protected Request $request;
 
     protected function setUp(): void
     {

From 4a92f5b8982db8a74b3ab5570d4902eebbba0762 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 29 Apr 2022 00:25:10 +0700
Subject: [PATCH 2019/2325] fix RouteCollectionTest

---
 rector.php                                  | 1 +
 tests/system/Router/RouteCollectionTest.php | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rector.php b/rector.php
index a8472023c3de..8d77c2b32be4 100644
--- a/rector.php
+++ b/rector.php
@@ -112,6 +112,7 @@
 
             // expected Qualified name
             __DIR__ . '/tests/system/Autoloader/FileLocatorTest.php',
+            __DIR__ . '/tests/system/Router/RouteCollectionTest.php',
         ],
 
         // sometime too detail
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index 987fb96ff9c3..7eb3f99f3128 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -11,7 +11,6 @@
 
 namespace CodeIgniter\Router;
 
-use App\Controllers\Home;
 use CodeIgniter\Config\Services;
 use CodeIgniter\Router\Exceptions\RouterException;
 use CodeIgniter\Test\CIUnitTestCase;
@@ -1506,7 +1505,7 @@ public function testRouteOverwritingTwoRules()
         $routes->get('/', 'Home::index');
 
         // the second rule applies, so overwrites the first
-        $expects = Home::class;
+        $expects = '\App\Controllers\Home';
 
         $this->assertSame($expects, $router->handle('/'));
     }

From 67b30c937b14f171c820fb92abf6ca2f897154bc Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 29 Apr 2022 00:27:22 +0700
Subject: [PATCH 2020/2325] cs fix

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

diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index 037514461cb4..d6c1f91a231d 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -13,7 +13,6 @@
 
 use CodeIgniter\HTTP\Exceptions\HTTPException;
 use CodeIgniter\HTTP\Files\UploadedFile;
-use CodeIgniter\HTTP\Request;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\App;
 

From 4fef2bc5af23a0d77802d475e3a1329422ca17f9 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 29 Apr 2022 01:32:05 +0700
Subject: [PATCH 2021/2325] [Rector] Apply PrivatizeFinalClassPropertyRector

---
 rector.php                                             |  2 ++
 tests/system/API/ResponseTraitTest.php                 |  6 +++---
 tests/system/Autoloader/AutoloaderTest.php             |  4 ++--
 tests/system/Autoloader/FileLocatorTest.php            |  2 +-
 tests/system/CodeIgniterTest.php                       |  2 +-
 tests/system/Commands/BaseCommandTest.php              |  4 ++--
 tests/system/Commands/ClearCacheTest.php               |  2 +-
 tests/system/Commands/ClearDebugbarTest.php            |  4 ++--
 tests/system/Commands/ClearLogsTest.php                |  4 ++--
 tests/system/Commands/CommandGeneratorTest.php         |  2 +-
 tests/system/Commands/CommandTest.php                  |  4 ++--
 tests/system/Commands/ConfigGeneratorTest.php          |  2 +-
 tests/system/Commands/ConfigurableSortImportsTest.php  |  2 +-
 tests/system/Commands/ControllerGeneratorTest.php      |  2 +-
 tests/system/Commands/CreateDatabaseTest.php           |  4 ++--
 tests/system/Commands/DatabaseCommandsTest.php         |  2 +-
 tests/system/Commands/EntityGeneratorTest.php          |  2 +-
 tests/system/Commands/FilterGeneratorTest.php          |  2 +-
 tests/system/Commands/GeneratorsTest.php               |  2 +-
 tests/system/Commands/InfoCacheTest.php                |  2 +-
 tests/system/Commands/MigrationGeneratorTest.php       |  2 +-
 tests/system/Commands/RoutesTest.php                   |  4 ++--
 tests/system/Commands/ScaffoldGeneratorTest.php        |  2 +-
 tests/system/Commands/SeederGeneratorTest.php          |  2 +-
 tests/system/Commands/ValidationGeneratorTest.php      |  2 +-
 tests/system/Config/BaseConfigTest.php                 |  2 +-
 tests/system/Config/DotEnvTest.php                     |  2 +-
 tests/system/Config/ServicesTest.php                   |  4 ++--
 tests/system/ControllerTest.php                        | 10 +++++-----
 tests/system/Database/BaseConnectionTest.php           |  4 ++--
 tests/system/Database/ConfigTest.php                   |  8 ++++----
 tests/system/Database/DatabaseTestCaseTest.php         |  2 +-
 tests/system/Database/Live/BadQueryTest.php            |  2 +-
 tests/system/Database/Live/ConnectTest.php             |  6 +++---
 tests/system/Database/Live/DbUtilsTest.php             |  2 +-
 tests/system/Database/Live/EscapeTest.php              |  2 +-
 tests/system/Database/Live/ForgeTest.php               |  2 +-
 tests/system/Database/Live/MetadataTest.php            |  2 +-
 tests/system/Database/Live/SQLite/AlterTableTest.php   |  4 ++--
 .../system/Database/Migrations/MigrationRunnerTest.php |  6 +++---
 tests/system/Encryption/EncryptionTest.php             |  2 +-
 .../system/Encryption/Handlers/OpenSSLHandlerTest.php  |  2 +-
 tests/system/Encryption/Handlers/SodiumHandlerTest.php |  4 ++--
 tests/system/Events/EventsTest.php                     |  2 +-
 tests/system/Files/FileWithVfsTest.php                 |  8 ++++----
 tests/system/Filters/CSRFTest.php                      |  6 +++---
 tests/system/Filters/DebugToolbarTest.php              |  4 ++--
 tests/system/Filters/HoneypotTest.php                  |  8 ++++----
 tests/system/Filters/SecureHeadersTest.php             |  4 ++--
 tests/system/Format/FormatTest.php                     |  2 +-
 tests/system/Format/JSONFormatterTest.php              |  2 +-
 tests/system/Format/XMLFormatterTest.php               |  2 +-
 tests/system/HTTP/CLIRequestTest.php                   |  2 +-
 tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php |  2 +-
 tests/system/HTTP/CURLRequestTest.php                  |  2 +-
 tests/system/HTTP/IncomingRequestDetectingTest.php     |  2 +-
 tests/system/HTTP/IncomingRequestTest.php              |  2 +-
 tests/system/HTTP/MessageTest.php                      |  2 +-
 tests/system/HTTP/NegotiateTest.php                    |  4 ++--
 tests/system/HTTP/RedirectResponseTest.php             |  4 ++--
 tests/system/HTTP/RequestTest.php                      |  2 +-
 tests/system/HTTP/ResponseTest.php                     |  2 +-
 tests/system/HTTP/UserAgentTest.php                    |  6 +++---
 tests/system/Honeypot/HoneypotTest.php                 |  8 ++++----
 tests/system/Images/ImageTest.php                      |  2 +-
 tests/system/Pager/PagerRendererTest.php               |  2 +-
 tests/system/Pager/PagerTest.php                       |  4 ++--
 tests/system/RESTful/ResourceControllerTest.php        |  2 +-
 tests/system/RESTful/ResourcePresenterTest.php         |  2 +-
 tests/system/Router/RouterTest.php                     |  6 +++---
 tests/system/Test/FabricatorTest.php                   |  2 +-
 tests/system/Test/TestResponseTest.php                 |  4 ++--
 tests/system/Typography/TypographyTest.php             |  2 +-
 tests/system/View/CellTest.php                         |  4 ++--
 tests/system/View/DecoratorsTest.php                   |  6 +++---
 tests/system/View/ParserFilterTest.php                 |  6 +++---
 tests/system/View/ParserPluginTest.php                 |  4 ++--
 tests/system/View/ViewTest.php                         |  6 +++---
 78 files changed, 132 insertions(+), 130 deletions(-)

diff --git a/rector.php b/rector.php
index 8d77c2b32be4..aaaa49aff8bc 100644
--- a/rector.php
+++ b/rector.php
@@ -43,6 +43,7 @@
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
+use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
 use Rector\PSR4\Rector\FileWithoutNamespace\NormalizeNamespaceByPSR4ComposerAutoloadRector;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
@@ -162,6 +163,7 @@
         'stdClass',
         'SQLite3',
     ]);
+    $rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
 
     $parameters = $rectorConfig->parameters();
     $parameters->set(Option::PARALLEL_TIMEOUT_IN_SECONDS, 180);
diff --git a/tests/system/API/ResponseTraitTest.php b/tests/system/API/ResponseTraitTest.php
index 821e217a35b8..d463f0bd4d03 100644
--- a/tests/system/API/ResponseTraitTest.php
+++ b/tests/system/API/ResponseTraitTest.php
@@ -27,9 +27,9 @@
  */
 final class ResponseTraitTest extends CIUnitTestCase
 {
-    protected $request;
-    protected $response;
-    protected ?FormatterInterface $formatter = null;
+    private $request;
+    private $response;
+    private ?FormatterInterface $formatter = null;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php
index c0a408162430..278b7869e05d 100644
--- a/tests/system/Autoloader/AutoloaderTest.php
+++ b/tests/system/Autoloader/AutoloaderTest.php
@@ -23,8 +23,8 @@
  */
 final class AutoloaderTest extends CIUnitTestCase
 {
-    protected Autoloader $loader;
-    protected string $filesPath = SUPPORTPATH . 'Autoloader/';
+    private Autoloader $loader;
+    private string $filesPath = SUPPORTPATH . 'Autoloader/';
 
     protected function setUp(): void
     {
diff --git a/tests/system/Autoloader/FileLocatorTest.php b/tests/system/Autoloader/FileLocatorTest.php
index 3b86cfb7e535..81903cac08da 100644
--- a/tests/system/Autoloader/FileLocatorTest.php
+++ b/tests/system/Autoloader/FileLocatorTest.php
@@ -20,7 +20,7 @@
  */
 final class FileLocatorTest extends CIUnitTestCase
 {
-    protected FileLocator $locator;
+    private FileLocator $locator;
 
     protected function setUp(): void
     {
diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index a29879522e37..8245d3bf18df 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -27,7 +27,7 @@
  */
 final class CodeIgniterTest extends CIUnitTestCase
 {
-    protected CodeIgniter $codeigniter;
+    private CodeIgniter $codeigniter;
     protected $routes;
 
     protected function setUp(): void
diff --git a/tests/system/Commands/BaseCommandTest.php b/tests/system/Commands/BaseCommandTest.php
index 5f9764208042..6df219c7427d 100644
--- a/tests/system/Commands/BaseCommandTest.php
+++ b/tests/system/Commands/BaseCommandTest.php
@@ -21,8 +21,8 @@
  */
 final class BaseCommandTest extends CIUnitTestCase
 {
-    protected $logger;
-    protected $runner;
+    private $logger;
+    private $runner;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/ClearCacheTest.php b/tests/system/Commands/ClearCacheTest.php
index 2a48a3742f5f..9f988a9d864e 100644
--- a/tests/system/Commands/ClearCacheTest.php
+++ b/tests/system/Commands/ClearCacheTest.php
@@ -21,7 +21,7 @@
  */
 final class ClearCacheTest extends CIUnitTestCase
 {
-    protected $streamFilter;
+    private $streamFilter;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/ClearDebugbarTest.php b/tests/system/Commands/ClearDebugbarTest.php
index 0d9957dde7e5..2a5490a68390 100644
--- a/tests/system/Commands/ClearDebugbarTest.php
+++ b/tests/system/Commands/ClearDebugbarTest.php
@@ -19,8 +19,8 @@
  */
 final class ClearDebugbarTest extends CIUnitTestCase
 {
-    protected $streamFilter;
-    protected $time;
+    private $streamFilter;
+    private $time;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/ClearLogsTest.php b/tests/system/Commands/ClearLogsTest.php
index 2297fdccb284..4fb1badba8cf 100644
--- a/tests/system/Commands/ClearLogsTest.php
+++ b/tests/system/Commands/ClearLogsTest.php
@@ -19,8 +19,8 @@
  */
 final class ClearLogsTest extends CIUnitTestCase
 {
-    protected $streamFilter;
-    protected $date;
+    private $streamFilter;
+    private $date;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/CommandGeneratorTest.php b/tests/system/Commands/CommandGeneratorTest.php
index c878b969d5e9..6f4e866eebd2 100644
--- a/tests/system/Commands/CommandGeneratorTest.php
+++ b/tests/system/Commands/CommandGeneratorTest.php
@@ -19,7 +19,7 @@
  */
 final class CommandGeneratorTest extends CIUnitTestCase
 {
-    protected $streamFilter;
+    private $streamFilter;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/CommandTest.php b/tests/system/Commands/CommandTest.php
index bb6d91998f19..9dbe62c3427c 100644
--- a/tests/system/Commands/CommandTest.php
+++ b/tests/system/Commands/CommandTest.php
@@ -22,8 +22,8 @@
 final class CommandTest extends CIUnitTestCase
 {
     private $streamFilter;
-    protected $logger;
-    protected $commands;
+    private $logger;
+    private $commands;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/ConfigGeneratorTest.php b/tests/system/Commands/ConfigGeneratorTest.php
index 4ea808864afe..30e4130c014e 100644
--- a/tests/system/Commands/ConfigGeneratorTest.php
+++ b/tests/system/Commands/ConfigGeneratorTest.php
@@ -19,7 +19,7 @@
  */
 final class ConfigGeneratorTest extends CIUnitTestCase
 {
-    protected $streamFilter;
+    private $streamFilter;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/ConfigurableSortImportsTest.php b/tests/system/Commands/ConfigurableSortImportsTest.php
index 914796aef3bb..f5f8dd947e4b 100644
--- a/tests/system/Commands/ConfigurableSortImportsTest.php
+++ b/tests/system/Commands/ConfigurableSortImportsTest.php
@@ -19,7 +19,7 @@
  */
 final class ConfigurableSortImportsTest extends CIUnitTestCase
 {
-    protected $streamFilter;
+    private $streamFilter;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/ControllerGeneratorTest.php b/tests/system/Commands/ControllerGeneratorTest.php
index e1ee68fb540a..2d30393ff1de 100644
--- a/tests/system/Commands/ControllerGeneratorTest.php
+++ b/tests/system/Commands/ControllerGeneratorTest.php
@@ -19,7 +19,7 @@
  */
 final class ControllerGeneratorTest extends CIUnitTestCase
 {
-    protected $streamFilter;
+    private $streamFilter;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/CreateDatabaseTest.php b/tests/system/Commands/CreateDatabaseTest.php
index 96120847791c..025e00481e71 100644
--- a/tests/system/Commands/CreateDatabaseTest.php
+++ b/tests/system/Commands/CreateDatabaseTest.php
@@ -24,8 +24,8 @@
  */
 final class CreateDatabaseTest extends CIUnitTestCase
 {
-    protected $streamFilter;
-    protected BaseConnection $connection;
+    private $streamFilter;
+    private BaseConnection $connection;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/DatabaseCommandsTest.php b/tests/system/Commands/DatabaseCommandsTest.php
index 51221142f9b1..b80fcd5f0bb8 100644
--- a/tests/system/Commands/DatabaseCommandsTest.php
+++ b/tests/system/Commands/DatabaseCommandsTest.php
@@ -19,7 +19,7 @@
  */
 final class DatabaseCommandsTest extends CIUnitTestCase
 {
-    protected $streamFilter;
+    private $streamFilter;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/EntityGeneratorTest.php b/tests/system/Commands/EntityGeneratorTest.php
index 3f644d6ee526..724d3145db15 100644
--- a/tests/system/Commands/EntityGeneratorTest.php
+++ b/tests/system/Commands/EntityGeneratorTest.php
@@ -19,7 +19,7 @@
  */
 final class EntityGeneratorTest extends CIUnitTestCase
 {
-    protected $streamFilter;
+    private $streamFilter;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/FilterGeneratorTest.php b/tests/system/Commands/FilterGeneratorTest.php
index ceff677f420e..40f90fc3b046 100644
--- a/tests/system/Commands/FilterGeneratorTest.php
+++ b/tests/system/Commands/FilterGeneratorTest.php
@@ -19,7 +19,7 @@
  */
 final class FilterGeneratorTest extends CIUnitTestCase
 {
-    protected $streamFilter;
+    private $streamFilter;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/GeneratorsTest.php b/tests/system/Commands/GeneratorsTest.php
index 8b37dc5112f1..29df4ee924c5 100644
--- a/tests/system/Commands/GeneratorsTest.php
+++ b/tests/system/Commands/GeneratorsTest.php
@@ -19,7 +19,7 @@
  */
 final class GeneratorsTest extends CIUnitTestCase
 {
-    protected $streamFilter;
+    private $streamFilter;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/InfoCacheTest.php b/tests/system/Commands/InfoCacheTest.php
index 56a52b72bf1c..8ea6ddbcb7ef 100644
--- a/tests/system/Commands/InfoCacheTest.php
+++ b/tests/system/Commands/InfoCacheTest.php
@@ -21,7 +21,7 @@
  */
 final class InfoCacheTest extends CIUnitTestCase
 {
-    protected $streamFilter;
+    private $streamFilter;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/MigrationGeneratorTest.php b/tests/system/Commands/MigrationGeneratorTest.php
index 7e65639948a2..c817ac200db7 100644
--- a/tests/system/Commands/MigrationGeneratorTest.php
+++ b/tests/system/Commands/MigrationGeneratorTest.php
@@ -19,7 +19,7 @@
  */
 final class MigrationGeneratorTest extends CIUnitTestCase
 {
-    protected $streamFilter;
+    private $streamFilter;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/RoutesTest.php b/tests/system/Commands/RoutesTest.php
index 1787e8bef3fa..fcd4c0ca4eff 100644
--- a/tests/system/Commands/RoutesTest.php
+++ b/tests/system/Commands/RoutesTest.php
@@ -21,8 +21,8 @@
 final class RoutesTest extends CIUnitTestCase
 {
     private $streamFilter;
-    protected $logger;
-    protected $commands;
+    private $logger;
+    private $commands;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/ScaffoldGeneratorTest.php b/tests/system/Commands/ScaffoldGeneratorTest.php
index 3aa6164cc2c5..d40902ecb045 100644
--- a/tests/system/Commands/ScaffoldGeneratorTest.php
+++ b/tests/system/Commands/ScaffoldGeneratorTest.php
@@ -22,7 +22,7 @@
  */
 final class ScaffoldGeneratorTest extends CIUnitTestCase
 {
-    protected $streamFilter;
+    private $streamFilter;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/SeederGeneratorTest.php b/tests/system/Commands/SeederGeneratorTest.php
index aa41d745803a..25c4ae5350b5 100644
--- a/tests/system/Commands/SeederGeneratorTest.php
+++ b/tests/system/Commands/SeederGeneratorTest.php
@@ -19,7 +19,7 @@
  */
 final class SeederGeneratorTest extends CIUnitTestCase
 {
-    protected $streamFilter;
+    private $streamFilter;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/ValidationGeneratorTest.php b/tests/system/Commands/ValidationGeneratorTest.php
index 64698d1b55db..0b2f7de6d500 100644
--- a/tests/system/Commands/ValidationGeneratorTest.php
+++ b/tests/system/Commands/ValidationGeneratorTest.php
@@ -19,7 +19,7 @@
  */
 final class ValidationGeneratorTest extends CIUnitTestCase
 {
-    protected $streamFilter;
+    private $streamFilter;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php
index b24a761c3d26..82596455f866 100644
--- a/tests/system/Config/BaseConfigTest.php
+++ b/tests/system/Config/BaseConfigTest.php
@@ -24,7 +24,7 @@
  */
 final class BaseConfigTest extends CIUnitTestCase
 {
-    protected $fixturesFolder;
+    private $fixturesFolder;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php
index 71fb1b560f77..94c531c3f442 100644
--- a/tests/system/Config/DotEnvTest.php
+++ b/tests/system/Config/DotEnvTest.php
@@ -21,7 +21,7 @@
  */
 final class DotEnvTest extends CIUnitTestCase
 {
-    protected $fixturesFolder;
+    private $fixturesFolder;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php
index 14fbd27a2910..3c1eb3e1c000 100644
--- a/tests/system/Config/ServicesTest.php
+++ b/tests/system/Config/ServicesTest.php
@@ -51,8 +51,8 @@
  */
 final class ServicesTest extends CIUnitTestCase
 {
-    protected $config;
-    protected $original;
+    private $config;
+    private $original;
 
     protected function setUp(): void
     {
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index ea2d7f9e553e..f29db9e02368 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -33,24 +33,24 @@
  */
 final class ControllerTest extends CIUnitTestCase
 {
-    protected CodeIgniter $codeigniter;
+    private CodeIgniter $codeigniter;
 
     /**
      * @var Controller
      */
-    protected $controller;
+    private $controller;
 
     /**
      * Current request.
      */
-    protected Request $request;
+    private Request $request;
 
     /**
      * Current response.
      */
-    protected Response $response;
+    private Response $response;
 
-    protected LoggerInterface $logger;
+    private LoggerInterface $logger;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Database/BaseConnectionTest.php b/tests/system/Database/BaseConnectionTest.php
index 02f41319027b..a4dd9d55015a 100644
--- a/tests/system/Database/BaseConnectionTest.php
+++ b/tests/system/Database/BaseConnectionTest.php
@@ -21,7 +21,7 @@
  */
 final class BaseConnectionTest extends CIUnitTestCase
 {
-    protected array $options = [
+    private array $options = [
         'DSN'      => '',
         'hostname' => 'localhost',
         'username' => 'first',
@@ -39,7 +39,7 @@ final class BaseConnectionTest extends CIUnitTestCase
         'strictOn' => true,
         'failover' => [],
     ];
-    protected array $failoverOptions = [
+    private array $failoverOptions = [
         'DSN'      => '',
         'hostname' => 'localhost',
         'username' => 'failover',
diff --git a/tests/system/Database/ConfigTest.php b/tests/system/Database/ConfigTest.php
index fdbc42749d1d..a9e074565da7 100644
--- a/tests/system/Database/ConfigTest.php
+++ b/tests/system/Database/ConfigTest.php
@@ -21,7 +21,7 @@ final class ConfigTest extends CIUnitTestCase
 {
     use ReflectionHelper;
 
-    protected array $group = [
+    private array $group = [
         'DSN'      => '',
         'hostname' => 'localhost',
         'username' => 'first',
@@ -40,7 +40,7 @@ final class ConfigTest extends CIUnitTestCase
         'failover' => [],
         'port'     => 3306,
     ];
-    protected array $dsnGroup = [
+    private array $dsnGroup = [
         'DSN'      => 'MySQLi://user:pass@localhost:3306/dbname?DBPrefix=test_&pConnect=true&charset=latin1&DBCollat=latin1_swedish_ci',
         'hostname' => '',
         'username' => '',
@@ -59,7 +59,7 @@ final class ConfigTest extends CIUnitTestCase
         'failover' => [],
         'port'     => 3306,
     ];
-    protected array $dsnGroupPostgre = [
+    private array $dsnGroupPostgre = [
         'DSN'      => 'Postgre://user:pass@localhost:5432/dbname?DBPrefix=test_&connect_timeout=5&sslmode=1',
         'hostname' => '',
         'username' => '',
@@ -78,7 +78,7 @@ final class ConfigTest extends CIUnitTestCase
         'failover' => [],
         'port'     => 5432,
     ];
-    protected array $dsnGroupPostgreNative = [
+    private array $dsnGroupPostgreNative = [
         'DSN'      => 'pgsql:host=localhost;port=5432;dbname=database_name',
         'hostname' => '',
         'username' => '',
diff --git a/tests/system/Database/DatabaseTestCaseTest.php b/tests/system/Database/DatabaseTestCaseTest.php
index 23525f71571a..867d17dd6b0b 100644
--- a/tests/system/Database/DatabaseTestCaseTest.php
+++ b/tests/system/Database/DatabaseTestCaseTest.php
@@ -26,7 +26,7 @@ final class DatabaseTestCaseTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
-    protected static bool $loaded = false;
+    private static bool $loaded = false;
 
     /**
      * Should the db be refreshed before
diff --git a/tests/system/Database/Live/BadQueryTest.php b/tests/system/Database/Live/BadQueryTest.php
index 4c9ee180674d..7a0c81ff8b2c 100644
--- a/tests/system/Database/Live/BadQueryTest.php
+++ b/tests/system/Database/Live/BadQueryTest.php
@@ -27,7 +27,7 @@ final class BadQueryTest extends CIUnitTestCase
 
     protected $refresh = true;
     protected $seed    = CITestSeeder::class;
-    protected static $origDebug;
+    private static $origDebug;
 
     /**
      * This test must run first to store the inital debug value before we tinker with it below
diff --git a/tests/system/Database/Live/ConnectTest.php b/tests/system/Database/Live/ConnectTest.php
index 1757f91cb676..f618ee465136 100644
--- a/tests/system/Database/Live/ConnectTest.php
+++ b/tests/system/Database/Live/ConnectTest.php
@@ -26,9 +26,9 @@ final class ConnectTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
-    protected $group1;
-    protected $group2;
-    protected $tests;
+    private $group1;
+    private $group2;
+    private $tests;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Database/Live/DbUtilsTest.php b/tests/system/Database/Live/DbUtilsTest.php
index 7fbdfb7d3c94..964e024b24c9 100644
--- a/tests/system/Database/Live/DbUtilsTest.php
+++ b/tests/system/Database/Live/DbUtilsTest.php
@@ -28,7 +28,7 @@ final class DbUtilsTest extends CIUnitTestCase
 
     protected $refresh = true;
     protected $seed    = CITestSeeder::class;
-    protected static $origDebug;
+    private static $origDebug;
 
     /**
      * This test must run first to store the inital debug value before we tinker with it below
diff --git a/tests/system/Database/Live/EscapeTest.php b/tests/system/Database/Live/EscapeTest.php
index 1260badcee77..8aacd092ff16 100644
--- a/tests/system/Database/Live/EscapeTest.php
+++ b/tests/system/Database/Live/EscapeTest.php
@@ -24,7 +24,7 @@ final class EscapeTest extends CIUnitTestCase
     use DatabaseTestTrait;
 
     protected $refresh = false;
-    protected $char;
+    private $char;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 0a110ae2ee6b..28f40817ae15 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -30,7 +30,7 @@ final class ForgeTest extends CIUnitTestCase
 
     protected $refresh = true;
     protected $seed    = CITestSeeder::class;
-    protected Forge $forge;
+    private Forge $forge;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Database/Live/MetadataTest.php b/tests/system/Database/Live/MetadataTest.php
index 107beca4c293..c72329d7bc71 100644
--- a/tests/system/Database/Live/MetadataTest.php
+++ b/tests/system/Database/Live/MetadataTest.php
@@ -31,7 +31,7 @@ final class MetadataTest extends CIUnitTestCase
     /**
      * Array of expected tables.
      */
-    protected array $expectedTables;
+    private array $expectedTables;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Database/Live/SQLite/AlterTableTest.php b/tests/system/Database/Live/SQLite/AlterTableTest.php
index ff103d699510..9f819ee36945 100644
--- a/tests/system/Database/Live/SQLite/AlterTableTest.php
+++ b/tests/system/Database/Live/SQLite/AlterTableTest.php
@@ -35,14 +35,14 @@ final class AlterTableTest extends CIUnitTestCase
      */
     protected $migrate = false;
 
-    protected Table $table;
+    private Table $table;
 
     /**
      * @var Connection
      */
     protected $db;
 
-    protected Forge $forge;
+    private Forge $forge;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php
index 774137bc0f76..6d9519a3d0dc 100644
--- a/tests/system/Database/Migrations/MigrationRunnerTest.php
+++ b/tests/system/Database/Migrations/MigrationRunnerTest.php
@@ -39,9 +39,9 @@ final class MigrationRunnerTest extends CIUnitTestCase
 
     // Use specific migration files for this test case.
     protected $namespace = 'Tests\Support\MigrationTestMigrations';
-    protected $root;
-    protected $start;
-    protected $config;
+    private $root;
+    private $start;
+    private $config;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Encryption/EncryptionTest.php b/tests/system/Encryption/EncryptionTest.php
index c5681e10e66a..95a69d35f0b9 100644
--- a/tests/system/Encryption/EncryptionTest.php
+++ b/tests/system/Encryption/EncryptionTest.php
@@ -21,7 +21,7 @@
  */
 final class EncryptionTest extends CIUnitTestCase
 {
-    protected Encryption $encryption;
+    private Encryption $encryption;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
index 81f3959710bc..8956650506c8 100644
--- a/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
+++ b/tests/system/Encryption/Handlers/OpenSSLHandlerTest.php
@@ -21,7 +21,7 @@
  */
 final class OpenSSLHandlerTest extends CIUnitTestCase
 {
-    protected Encryption $encryption;
+    private Encryption $encryption;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Encryption/Handlers/SodiumHandlerTest.php b/tests/system/Encryption/Handlers/SodiumHandlerTest.php
index 28319b477ea6..c54cb346ed80 100644
--- a/tests/system/Encryption/Handlers/SodiumHandlerTest.php
+++ b/tests/system/Encryption/Handlers/SodiumHandlerTest.php
@@ -21,8 +21,8 @@
  */
 final class SodiumHandlerTest extends CIUnitTestCase
 {
-    protected Encryption $encryption;
-    protected EncryptionConfig $config;
+    private Encryption $encryption;
+    private EncryptionConfig $config;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php
index e35150f647a6..e73e8f01d00a 100644
--- a/tests/system/Events/EventsTest.php
+++ b/tests/system/Events/EventsTest.php
@@ -23,7 +23,7 @@ final class EventsTest extends CIUnitTestCase
     /**
      * Accessible event manager instance
      */
-    protected MockEvents $manager;
+    private MockEvents $manager;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Files/FileWithVfsTest.php b/tests/system/Files/FileWithVfsTest.php
index 2dbcbb9aca17..e1daca27f55e 100644
--- a/tests/system/Files/FileWithVfsTest.php
+++ b/tests/system/Files/FileWithVfsTest.php
@@ -20,10 +20,10 @@
 final class FileWithVfsTest extends CIUnitTestCase
 {
     // For VFS stuff
-    protected $root;
-    protected $path;
-    protected $start;
-    protected File $file;
+    private $root;
+    private $path;
+    private $start;
+    private File $file;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Filters/CSRFTest.php b/tests/system/Filters/CSRFTest.php
index 5ad75c055393..395eb8ee9bb4 100644
--- a/tests/system/Filters/CSRFTest.php
+++ b/tests/system/Filters/CSRFTest.php
@@ -21,9 +21,9 @@
  */
 final class CSRFTest extends CIUnitTestCase
 {
-    protected $config;
-    protected $request;
-    protected $response;
+    private $config;
+    private $request;
+    private $response;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Filters/DebugToolbarTest.php b/tests/system/Filters/DebugToolbarTest.php
index 543eb6941def..bc411767d643 100644
--- a/tests/system/Filters/DebugToolbarTest.php
+++ b/tests/system/Filters/DebugToolbarTest.php
@@ -22,8 +22,8 @@
  */
 final class DebugToolbarTest extends CIUnitTestCase
 {
-    protected $request;
-    protected $response;
+    private $request;
+    private $response;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Filters/HoneypotTest.php b/tests/system/Filters/HoneypotTest.php
index 4919b8490fde..15a99315f5fa 100644
--- a/tests/system/Filters/HoneypotTest.php
+++ b/tests/system/Filters/HoneypotTest.php
@@ -23,10 +23,10 @@
  */
 final class HoneypotTest extends CIUnitTestCase
 {
-    protected $config;
-    protected $honey;
-    protected $request;
-    protected $response;
+    private $config;
+    private $honey;
+    private $request;
+    private $response;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Filters/SecureHeadersTest.php b/tests/system/Filters/SecureHeadersTest.php
index 038ef81003ab..1d806c4c4179 100644
--- a/tests/system/Filters/SecureHeadersTest.php
+++ b/tests/system/Filters/SecureHeadersTest.php
@@ -19,8 +19,8 @@
  */
 final class SecureHeadersTest extends CIUnitTestCase
 {
-    protected $request;
-    protected $response;
+    private $request;
+    private $response;
 
     public function testAfter()
     {
diff --git a/tests/system/Format/FormatTest.php b/tests/system/Format/FormatTest.php
index f0a4e82c9b6a..1f62b0df526c 100644
--- a/tests/system/Format/FormatTest.php
+++ b/tests/system/Format/FormatTest.php
@@ -20,7 +20,7 @@
  */
 final class FormatTest extends CIUnitTestCase
 {
-    protected Format $format;
+    private Format $format;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Format/JSONFormatterTest.php b/tests/system/Format/JSONFormatterTest.php
index 19dacb02e86c..09205dc29c47 100644
--- a/tests/system/Format/JSONFormatterTest.php
+++ b/tests/system/Format/JSONFormatterTest.php
@@ -19,7 +19,7 @@
  */
 final class JSONFormatterTest extends CIUnitTestCase
 {
-    protected $jsonFormatter;
+    private $jsonFormatter;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Format/XMLFormatterTest.php b/tests/system/Format/XMLFormatterTest.php
index 5e0d7fda9340..1011f39295d5 100644
--- a/tests/system/Format/XMLFormatterTest.php
+++ b/tests/system/Format/XMLFormatterTest.php
@@ -19,7 +19,7 @@
  */
 final class XMLFormatterTest extends CIUnitTestCase
 {
-    protected $xmlFormatter;
+    private $xmlFormatter;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/CLIRequestTest.php b/tests/system/HTTP/CLIRequestTest.php
index c08bda24eb4d..bf78ccc6e752 100644
--- a/tests/system/HTTP/CLIRequestTest.php
+++ b/tests/system/HTTP/CLIRequestTest.php
@@ -24,7 +24,7 @@
  */
 final class CLIRequestTest extends CIUnitTestCase
 {
-    protected CLIRequest $request;
+    private CLIRequest $request;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
index bcf9d1c51124..7f7d20209ce2 100644
--- a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
+++ b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
@@ -25,7 +25,7 @@
  */
 final class CURLRequestDoNotShareOptionsTest extends CIUnitTestCase
 {
-    protected MockCURLRequest $request;
+    private MockCURLRequest $request;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
index 31808a739e29..30ba8adcc102 100644
--- a/tests/system/HTTP/CURLRequestTest.php
+++ b/tests/system/HTTP/CURLRequestTest.php
@@ -25,7 +25,7 @@
  */
 final class CURLRequestTest extends CIUnitTestCase
 {
-    protected MockCURLRequest $request;
+    private MockCURLRequest $request;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/IncomingRequestDetectingTest.php b/tests/system/HTTP/IncomingRequestDetectingTest.php
index 8958b65a0af9..47db74d1bbcf 100644
--- a/tests/system/HTTP/IncomingRequestDetectingTest.php
+++ b/tests/system/HTTP/IncomingRequestDetectingTest.php
@@ -21,7 +21,7 @@
  */
 final class IncomingRequestDetectingTest extends CIUnitTestCase
 {
-    protected IncomingRequest $request;
+    private IncomingRequest $request;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index d6c1f91a231d..cb267c170d7d 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -23,7 +23,7 @@
  */
 final class IncomingRequestTest extends CIUnitTestCase
 {
-    protected Request $request;
+    private Request $request;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/MessageTest.php b/tests/system/HTTP/MessageTest.php
index 49bed7e8777b..53cc7603f5c6 100644
--- a/tests/system/HTTP/MessageTest.php
+++ b/tests/system/HTTP/MessageTest.php
@@ -19,7 +19,7 @@
  */
 final class MessageTest extends CIUnitTestCase
 {
-    protected ?Message $message;
+    private ?Message $message;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/NegotiateTest.php b/tests/system/HTTP/NegotiateTest.php
index bf5996a0cd37..c1ad8aa4da19 100644
--- a/tests/system/HTTP/NegotiateTest.php
+++ b/tests/system/HTTP/NegotiateTest.php
@@ -20,8 +20,8 @@
  */
 final class NegotiateTest extends CIUnitTestCase
 {
-    protected ?Request $request;
-    protected ?Negotiate $negotiate;
+    private ?Request $request;
+    private ?Negotiate $negotiate;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/RedirectResponseTest.php b/tests/system/HTTP/RedirectResponseTest.php
index ac2e8abaaba9..21647a997cd0 100644
--- a/tests/system/HTTP/RedirectResponseTest.php
+++ b/tests/system/HTTP/RedirectResponseTest.php
@@ -31,8 +31,8 @@ final class RedirectResponseTest extends CIUnitTestCase
      */
     protected $routes;
 
-    protected $request;
-    protected $config;
+    private $request;
+    private $config;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/RequestTest.php b/tests/system/HTTP/RequestTest.php
index e6cba20dcb1e..1ca021074db3 100644
--- a/tests/system/HTTP/RequestTest.php
+++ b/tests/system/HTTP/RequestTest.php
@@ -21,7 +21,7 @@
  */
 final class RequestTest extends CIUnitTestCase
 {
-    protected Request $request;
+    private Request $request;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/ResponseTest.php b/tests/system/HTTP/ResponseTest.php
index a94cd8e8b2b5..f66be1513004 100644
--- a/tests/system/HTTP/ResponseTest.php
+++ b/tests/system/HTTP/ResponseTest.php
@@ -26,7 +26,7 @@
  */
 final class ResponseTest extends CIUnitTestCase
 {
-    protected $server;
+    private $server;
 
     protected function setUp(): void
     {
diff --git a/tests/system/HTTP/UserAgentTest.php b/tests/system/HTTP/UserAgentTest.php
index b75a17080161..8314b43e9ce9 100644
--- a/tests/system/HTTP/UserAgentTest.php
+++ b/tests/system/HTTP/UserAgentTest.php
@@ -18,9 +18,9 @@
  */
 final class UserAgentTest extends CIUnitTestCase
 {
-    protected string $_user_agent = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27';
-    protected string $_mobile_ua  = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7';
-    protected UserAgent $agent;
+    private string $_user_agent = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; en-us) AppleWebKit/533.20.25 (KHTML, like Gecko) Version/5.0.4 Safari/533.20.27';
+    private string $_mobile_ua  = 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_1 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8B117 Safari/6531.22.7';
+    private UserAgent $agent;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Honeypot/HoneypotTest.php b/tests/system/Honeypot/HoneypotTest.php
index b732b27fca7b..ca0cbbfce852 100644
--- a/tests/system/Honeypot/HoneypotTest.php
+++ b/tests/system/Honeypot/HoneypotTest.php
@@ -23,10 +23,10 @@
  */
 final class HoneypotTest extends CIUnitTestCase
 {
-    protected $config;
-    protected $honeypot;
-    protected $request;
-    protected $response;
+    private $config;
+    private $honeypot;
+    private $request;
+    private $response;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Images/ImageTest.php b/tests/system/Images/ImageTest.php
index 4347e1e6ca9b..38d395a77976 100644
--- a/tests/system/Images/ImageTest.php
+++ b/tests/system/Images/ImageTest.php
@@ -20,7 +20,7 @@
  */
 final class ImageTest extends CIUnitTestCase
 {
-    protected string $path = 'tests/_support/ci-logo.png';
+    private string $path = 'tests/_support/ci-logo.png';
 
     protected function setUp(): void
     {
diff --git a/tests/system/Pager/PagerRendererTest.php b/tests/system/Pager/PagerRendererTest.php
index 948d945ab8f9..6214c8ee5902 100644
--- a/tests/system/Pager/PagerRendererTest.php
+++ b/tests/system/Pager/PagerRendererTest.php
@@ -19,7 +19,7 @@
  */
 final class PagerRendererTest extends CIUnitTestCase
 {
-    protected URI $uri;
+    private URI $uri;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Pager/PagerTest.php b/tests/system/Pager/PagerTest.php
index 1d7b61ede2ec..67b19633996f 100644
--- a/tests/system/Pager/PagerTest.php
+++ b/tests/system/Pager/PagerTest.php
@@ -28,8 +28,8 @@
  */
 final class PagerTest extends CIUnitTestCase
 {
-    protected ?\CodeIgniter\Pager\Pager $pager = null;
-    protected $config;
+    private ?\CodeIgniter\Pager\Pager $pager = null;
+    private $config;
 
     protected function setUp(): void
     {
diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index 80dc18f3ebec..916c7f4fa789 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -42,7 +42,7 @@
  */
 final class ResourceControllerTest extends CIUnitTestCase
 {
-    protected CodeIgniter $codeigniter;
+    private CodeIgniter $codeigniter;
 
     /**
      * @var RouteCollection
diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php
index b38f0a1a4f94..7086251aef9d 100644
--- a/tests/system/RESTful/ResourcePresenterTest.php
+++ b/tests/system/RESTful/ResourcePresenterTest.php
@@ -36,7 +36,7 @@
  */
 final class ResourcePresenterTest extends CIUnitTestCase
 {
-    protected CodeIgniter $codeigniter;
+    private CodeIgniter $codeigniter;
 
     /**
      * @var RouteCollection
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index cd19ca998390..ff89ead92cfe 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -25,16 +25,16 @@
  */
 final class RouterTest extends CIUnitTestCase
 {
-    protected RouteCollection $collection;
+    private RouteCollection $collection;
 
     /**
      * vfsStream root directory
      *
      * @var
      */
-    protected $root;
+    private $root;
 
-    protected IncomingRequest $request;
+    private IncomingRequest $request;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Test/FabricatorTest.php b/tests/system/Test/FabricatorTest.php
index 17319af7bcde..dbcb4c55b283 100644
--- a/tests/system/Test/FabricatorTest.php
+++ b/tests/system/Test/FabricatorTest.php
@@ -26,7 +26,7 @@ final class FabricatorTest extends CIUnitTestCase
     /**
      * Default formatters to use for UserModel. Should match detected version.
      */
-    protected array $formatters = [
+    private array $formatters = [
         'name'       => 'name',
         'email'      => 'email',
         'country'    => 'country',
diff --git a/tests/system/Test/TestResponseTest.php b/tests/system/Test/TestResponseTest.php
index eb8be1a3d11d..4a68b389f255 100644
--- a/tests/system/Test/TestResponseTest.php
+++ b/tests/system/Test/TestResponseTest.php
@@ -23,12 +23,12 @@
  */
 final class TestResponseTest extends CIUnitTestCase
 {
-    protected ?TestResponse $testResponse = null;
+    private ?TestResponse $testResponse = null;
 
     /**
      * @var ResponseInterface
      */
-    protected $response;
+    private $response;
 
     protected function setUp(): void
     {
diff --git a/tests/system/Typography/TypographyTest.php b/tests/system/Typography/TypographyTest.php
index ad242ee273c7..c56aa858267b 100644
--- a/tests/system/Typography/TypographyTest.php
+++ b/tests/system/Typography/TypographyTest.php
@@ -18,7 +18,7 @@
  */
 final class TypographyTest extends CIUnitTestCase
 {
-    protected $typography;
+    private $typography;
 
     protected function setUp(): void
     {
diff --git a/tests/system/View/CellTest.php b/tests/system/View/CellTest.php
index f15e7ce16abb..43326df4e5ce 100644
--- a/tests/system/View/CellTest.php
+++ b/tests/system/View/CellTest.php
@@ -21,8 +21,8 @@
  */
 final class CellTest extends CIUnitTestCase
 {
-    protected $cache;
-    protected Cell $cell;
+    private $cache;
+    private Cell $cell;
 
     protected function setUp(): void
     {
diff --git a/tests/system/View/DecoratorsTest.php b/tests/system/View/DecoratorsTest.php
index 6513f1f4bb6d..e6678c04e6fd 100644
--- a/tests/system/View/DecoratorsTest.php
+++ b/tests/system/View/DecoratorsTest.php
@@ -23,9 +23,9 @@
  */
 final class DecoratorsTest extends CIUnitTestCase
 {
-    protected $loader;
-    protected $viewsDir;
-    protected $config;
+    private $loader;
+    private $viewsDir;
+    private $config;
 
     protected function setUp(): void
     {
diff --git a/tests/system/View/ParserFilterTest.php b/tests/system/View/ParserFilterTest.php
index 4ed4feab56ab..0279e22d3ef6 100644
--- a/tests/system/View/ParserFilterTest.php
+++ b/tests/system/View/ParserFilterTest.php
@@ -20,9 +20,9 @@
  */
 final class ParserFilterTest extends CIUnitTestCase
 {
-    protected $loader;
-    protected $viewsDir;
-    protected $config;
+    private $loader;
+    private $viewsDir;
+    private $config;
 
     protected function setUp(): void
     {
diff --git a/tests/system/View/ParserPluginTest.php b/tests/system/View/ParserPluginTest.php
index 4205eb0520b3..4f5d199e7374 100644
--- a/tests/system/View/ParserPluginTest.php
+++ b/tests/system/View/ParserPluginTest.php
@@ -20,8 +20,8 @@
  */
 final class ParserPluginTest extends CIUnitTestCase
 {
-    protected Parser $parser;
-    protected Validation $validator;
+    private Parser $parser;
+    private Validation $validator;
 
     protected function setUp(): void
     {
diff --git a/tests/system/View/ViewTest.php b/tests/system/View/ViewTest.php
index d740e17a4c34..8e63fa9a8675 100644
--- a/tests/system/View/ViewTest.php
+++ b/tests/system/View/ViewTest.php
@@ -22,9 +22,9 @@
  */
 final class ViewTest extends CIUnitTestCase
 {
-    protected $loader;
-    protected $viewsDir;
-    protected $config;
+    private $loader;
+    private $viewsDir;
+    private $config;
 
     protected function setUp(): void
     {

From a5dc4859b12836ba956d4d5421427ef563447e0f Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 29 Apr 2022 01:49:57 +0700
Subject: [PATCH 2022/2325] remove unused private property via
 RemoveUnusedPrivatePropertyRector

---
 tests/system/Autoloader/AutoloaderTest.php               | 1 -
 tests/system/Commands/BaseCommandTest.php                | 2 --
 tests/system/Commands/RoutesTest.php                     | 5 -----
 tests/system/ControllerTest.php                          | 3 ---
 tests/system/Database/DatabaseTestCaseTest.php           | 2 --
 tests/system/Database/Migrations/MigrationRunnerTest.php | 2 --
 tests/system/Filters/SecureHeadersTest.php               | 3 ---
 tests/system/Images/ImageTest.php                        | 2 --
 tests/system/Router/RouterTest.php                       | 7 -------
 9 files changed, 27 deletions(-)

diff --git a/tests/system/Autoloader/AutoloaderTest.php b/tests/system/Autoloader/AutoloaderTest.php
index 278b7869e05d..bcf91b90b679 100644
--- a/tests/system/Autoloader/AutoloaderTest.php
+++ b/tests/system/Autoloader/AutoloaderTest.php
@@ -24,7 +24,6 @@
 final class AutoloaderTest extends CIUnitTestCase
 {
     private Autoloader $loader;
-    private string $filesPath = SUPPORTPATH . 'Autoloader/';
 
     protected function setUp(): void
     {
diff --git a/tests/system/Commands/BaseCommandTest.php b/tests/system/Commands/BaseCommandTest.php
index 6df219c7427d..c174fbb1546e 100644
--- a/tests/system/Commands/BaseCommandTest.php
+++ b/tests/system/Commands/BaseCommandTest.php
@@ -22,13 +22,11 @@
 final class BaseCommandTest extends CIUnitTestCase
 {
     private $logger;
-    private $runner;
 
     protected function setUp(): void
     {
         parent::setUp();
         $this->logger = Services::logger();
-        $this->runner = new CommandRunner();
     }
 
     public function testMagicIssetTrue()
diff --git a/tests/system/Commands/RoutesTest.php b/tests/system/Commands/RoutesTest.php
index fcd4c0ca4eff..744914770019 100644
--- a/tests/system/Commands/RoutesTest.php
+++ b/tests/system/Commands/RoutesTest.php
@@ -21,8 +21,6 @@
 final class RoutesTest extends CIUnitTestCase
 {
     private $streamFilter;
-    private $logger;
-    private $commands;
 
     protected function setUp(): void
     {
@@ -34,9 +32,6 @@ protected function setUp(): void
 
         $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
         $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
-
-        $this->logger   = Services::logger();
-        $this->commands = Services::commands();
     }
 
     protected function tearDown(): void
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index f29db9e02368..5d2e58deb958 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -33,8 +33,6 @@
  */
 final class ControllerTest extends CIUnitTestCase
 {
-    private CodeIgniter $codeigniter;
-
     /**
      * @var Controller
      */
@@ -60,7 +58,6 @@ protected function setUp(): void
         $this->request     = new IncomingRequest($this->config, new URI('https://somwhere.com'), null, new UserAgent());
         $this->response    = new Response($this->config);
         $this->logger      = \Config\Services::logger();
-        $this->codeigniter = new MockCodeIgniter($this->config);
     }
 
     public function testConstructor()
diff --git a/tests/system/Database/DatabaseTestCaseTest.php b/tests/system/Database/DatabaseTestCaseTest.php
index 867d17dd6b0b..5d779727cc1e 100644
--- a/tests/system/Database/DatabaseTestCaseTest.php
+++ b/tests/system/Database/DatabaseTestCaseTest.php
@@ -26,8 +26,6 @@ final class DatabaseTestCaseTest extends CIUnitTestCase
 {
     use DatabaseTestTrait;
 
-    private static bool $loaded = false;
-
     /**
      * Should the db be refreshed before
      * each test?
diff --git a/tests/system/Database/Migrations/MigrationRunnerTest.php b/tests/system/Database/Migrations/MigrationRunnerTest.php
index 6d9519a3d0dc..746b66795bae 100644
--- a/tests/system/Database/Migrations/MigrationRunnerTest.php
+++ b/tests/system/Database/Migrations/MigrationRunnerTest.php
@@ -40,7 +40,6 @@ final class MigrationRunnerTest extends CIUnitTestCase
     // Use specific migration files for this test case.
     protected $namespace = 'Tests\Support\MigrationTestMigrations';
     private $root;
-    private $start;
     private $config;
 
     protected function setUp(): void
@@ -50,7 +49,6 @@ protected function setUp(): void
         parent::setUp();
 
         $this->root   = vfsStream::setup('root');
-        $this->start  = $this->root->url() . '/';
         $this->config = new Migrations();
 
         $this->config->enabled = true;
diff --git a/tests/system/Filters/SecureHeadersTest.php b/tests/system/Filters/SecureHeadersTest.php
index 1d806c4c4179..86cb2fbd2297 100644
--- a/tests/system/Filters/SecureHeadersTest.php
+++ b/tests/system/Filters/SecureHeadersTest.php
@@ -19,9 +19,6 @@
  */
 final class SecureHeadersTest extends CIUnitTestCase
 {
-    private $request;
-    private $response;
-
     public function testAfter()
     {
         $filter   = new SecureHeaders();
diff --git a/tests/system/Images/ImageTest.php b/tests/system/Images/ImageTest.php
index 38d395a77976..485da082f750 100644
--- a/tests/system/Images/ImageTest.php
+++ b/tests/system/Images/ImageTest.php
@@ -20,8 +20,6 @@
  */
 final class ImageTest extends CIUnitTestCase
 {
-    private string $path = 'tests/_support/ci-logo.png';
-
     protected function setUp(): void
     {
         // create virtual file system
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index ff89ead92cfe..59b542751b0e 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -27,13 +27,6 @@ final class RouterTest extends CIUnitTestCase
 {
     private RouteCollection $collection;
 
-    /**
-     * vfsStream root directory
-     *
-     * @var
-     */
-    private $root;
-
     private IncomingRequest $request;
 
     protected function setUp(): void

From 2c4be44f26c6f5f9f1bb8da50f5c16976e61f99c Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 29 Apr 2022 01:53:08 +0700
Subject: [PATCH 2023/2325] cs fix

---
 tests/system/Commands/BaseCommandTest.php | 1 -
 tests/system/ControllerTest.php           | 9 ++++-----
 tests/system/Router/RouterTest.php        | 1 -
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/tests/system/Commands/BaseCommandTest.php b/tests/system/Commands/BaseCommandTest.php
index c174fbb1546e..6c518573f8e9 100644
--- a/tests/system/Commands/BaseCommandTest.php
+++ b/tests/system/Commands/BaseCommandTest.php
@@ -11,7 +11,6 @@
 
 namespace CodeIgniter\Commands;
 
-use CodeIgniter\CLI\CommandRunner;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Services;
 use Tests\Support\Commands\AppInfo;
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index 5d2e58deb958..9330b9e15d16 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -17,7 +17,6 @@
 use CodeIgniter\HTTP\URI;
 use CodeIgniter\HTTP\UserAgent;
 use CodeIgniter\Test\CIUnitTestCase;
-use CodeIgniter\Test\Mock\MockCodeIgniter;
 use CodeIgniter\Validation\Exceptions\ValidationException;
 use Config\App;
 use Psr\Log\LoggerInterface;
@@ -54,10 +53,10 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->config      = new App();
-        $this->request     = new IncomingRequest($this->config, new URI('https://somwhere.com'), null, new UserAgent());
-        $this->response    = new Response($this->config);
-        $this->logger      = \Config\Services::logger();
+        $this->config   = new App();
+        $this->request  = new IncomingRequest($this->config, new URI('https://somwhere.com'), null, new UserAgent());
+        $this->response = new Response($this->config);
+        $this->logger   = \Config\Services::logger();
     }
 
     public function testConstructor()
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index 59b542751b0e..1b0de4a29267 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -26,7 +26,6 @@
 final class RouterTest extends CIUnitTestCase
 {
     private RouteCollection $collection;
-
     private IncomingRequest $request;
 
     protected function setUp(): void

From 49e124f91a31e08a2160d5fa6fc365465bcbcc94 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Fri, 29 Apr 2022 01:57:59 +0700
Subject: [PATCH 2024/2325] increse timeout seconds to avoid error like in
 develop branch

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

diff --git a/rector.php b/rector.php
index aaaa49aff8bc..ee58a356f961 100644
--- a/rector.php
+++ b/rector.php
@@ -166,5 +166,5 @@
     $rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
 
     $parameters = $rectorConfig->parameters();
-    $parameters->set(Option::PARALLEL_TIMEOUT_IN_SECONDS, 180);
+    $parameters->set(Option::PARALLEL_TIMEOUT_IN_SECONDS, 240);
 };

From 6ba18b861edbef5cd7dbecd78f8419d48668f5b0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Apr 2022 17:52:13 +0900
Subject: [PATCH 2025/2325] docs: make method names linkable

---
 .../source/libraries/pagination.rst           | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index 9327d7b8cfc1..12a665365ef5 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -188,12 +188,14 @@ usefulness. It is easiest to demonstrate creating a new view by showing you the
 
 .. literalinclude:: pagination/012.php
 
-**setSurroundCount()**
+setSurroundCount()
+------------------
 
 In the first line, the ``setSurroundCount()`` method specifies than we want to show two links to either side of
 the current page link. The only parameter that it accepts is the number of links to show.
 
-**hasPrevious()** & **hasNext()**
+hasPrevious() & hasNext()
+-------------------------
 
 These methods return a boolean true if there are more links that can be displayed on either side of the current page,
 based on the value passed to ``setSurroundCount()``. For example, let's say we have 20 pages of data. The current
@@ -201,17 +203,20 @@ page is page 3. If the surrounding count is 2, then the following links would sh
 Since the first link displayed is page one, ``hasPrevious()`` would return **false** since there is no page zero. However,
 ``hasNext()`` would return **true** since there are 15 additional pages of results after page five.
 
-**getPrevious()** & **getNext()**
+getPrevious() & getNext()
+-------------------------
 
 These methods return the URL for the previous or next pages of results on either side of the numbered links. See the
 previous paragraph for a full explanation.
 
-**getFirst()** & **getLast()**
+getFirst() & getLast()
+----------------------
 
 Much like ``getPrevious()`` and ``getNext()``, these methods return links to the first and last pages in the
 result set.
 
-**links()**
+links()
+-------
 
 Returns an array of data about all of the numbered links. Each link's array contains the uri for the link, the
 title, which is just the number, and a boolean that tells whether the link is the current/active link or not:
@@ -226,31 +231,37 @@ See following an example with these changes:
 
 .. literalinclude:: pagination/014.php
 
-**hasPreviousPage()** & **hasNextPage()**
+hasPreviousPage() & hasNextPage()
+---------------------------------
 
 This method returns a boolean true if there are links to a page before and after, respectively, the current page being displayed.
 
 Their difference to ``hasPrevious()`` and ``hasNext()`` is that they are based on the current page while ``hasPrevious()`` and ``hasNext()`` are based on the set of links to be displayed before and after the current page based on the value passed in ``setSurroundCount()``.
 
-**getPreviousPage()** & **getNextPage()**
+getPreviousPage() & getNextPage()
+---------------------------------
 
 These methods return a URL for the previous and next pages in relation to the current page being displayed, unlike ``getPrevious()`` and ``getNext()`` that return the URL for the previous or next pages of results on either side of the numbered links. See the previous paragraph for a full explanation.
 
 If you want page numbers instead of URLs, you can use the following methods:
 
-**getPreviousPageNumber()** & **getNextPageNumber()**
+getPreviousPageNumber() & getNextPageNumber()
+---------------------------------------------
 
 These methods return the page number for the previous or next pages in relation to the current page being displayed.
 
-**getFirstPageNumber()** & **getLastPageNumber()**
+getFirstPageNumber() & getLastPageNumber()
+------------------------------------------
 
 These methods return page numbers to the first and last pages in the
 result set.
 
-**getCurrentPageNumber()**
+getCurrentPageNumber()
+----------------------
 
 This method returns the page number of the current page.
 
-**getPageCount()**
+getPageCount()
+--------------
 
 This method returns total number of pages.

From 7948400d34e0794ef44801c7fe95d480a90a6345 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Apr 2022 18:03:16 +0900
Subject: [PATCH 2026/2325] docs: add example for getPrevious() & getNext() and
 getPreviousPage() & getNextPage()

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

diff --git a/user_guide_src/source/libraries/pagination.rst b/user_guide_src/source/libraries/pagination.rst
index 12a665365ef5..da48206b0300 100644
--- a/user_guide_src/source/libraries/pagination.rst
+++ b/user_guide_src/source/libraries/pagination.rst
@@ -206,8 +206,15 @@ Since the first link displayed is page one, ``hasPrevious()`` would return **fal
 getPrevious() & getNext()
 -------------------------
 
-These methods return the URL for the previous or next pages of results on either side of the numbered links. See the
-previous paragraph for a full explanation.
+These methods return the URL for the previous or next pages of results on either side of the numbered links.
+
+For example, you have the current page set at 5 and you want to have the links before and after (the surroundCount) to be 2 each, that will give you something like this::
+
+    3  |  4  |  5  |  6  |  7
+
+``getPrevious()`` returns the URL for page 2. ``getNext()`` returns the URL for page 8.
+
+If you want to get page 4 and page 6, use ``getPreviousPage()`` and ``getNextPage()`` instead.
 
 getFirst() & getLast()
 ----------------------
@@ -243,6 +250,12 @@ getPreviousPage() & getNextPage()
 
 These methods return a URL for the previous and next pages in relation to the current page being displayed, unlike ``getPrevious()`` and ``getNext()`` that return the URL for the previous or next pages of results on either side of the numbered links. See the previous paragraph for a full explanation.
 
+For example, you have the current page set at 5 and you want to have the links before and after (the surroundCount) to be 2 each, that will give you something like this::
+
+    3  |  4  |  5  |  6  |  7
+
+``getPreviousPage()`` returns the URL for page 4. ``getNextPage()`` returns the URL for page 6.
+
 If you want page numbers instead of URLs, you can use the following methods:
 
 getPreviousPageNumber() & getNextPageNumber()

From 1fab815808fead2cd6ce0d6f8638f276bfb949ed Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Apr 2022 19:48:02 +0900
Subject: [PATCH 2027/2325] docs: add note

---
 system/Helpers/url_helper.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/system/Helpers/url_helper.php b/system/Helpers/url_helper.php
index e1e8b8a30e32..8efd11c1ea6a 100644
--- a/system/Helpers/url_helper.php
+++ b/system/Helpers/url_helper.php
@@ -522,6 +522,9 @@ function mb_url_title(string $str, string $separator = '-', bool $lowercase = fa
      * Get the full, absolute URL to a controller method
      * (with additional arguments)
      *
+     * NOTE: This requires the controller/method to
+     * have a route defined in the routes Config file.
+     *
      * @param mixed ...$args
      *
      * @throws RouterException

From 2a585bf852100d62f4bfbf21297ad5e3796844e6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Apr 2022 19:49:37 +0900
Subject: [PATCH 2028/2325] fix: reverseRoute() does not take into account the
 default namespace

---
 system/Router/RouteCollection.php           |  9 ++++++++
 tests/system/Router/RouteCollectionTest.php | 24 +++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index 120ed99c73ee..abfa5493ae1f 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -997,6 +997,15 @@ public function reverseRoute(string $search, ...$params)
             }
         }
 
+        // Add the default namespace if needed.
+        $namespace = trim($this->defaultNamespace, '\\') . '\\';
+        if (
+            substr($search, 0, 1) !== '\\'
+            || substr($search, 0, strlen($namespace)) !== $namespace
+        ) {
+            $search = $namespace . $search;
+        }
+
         // If it's not a named route, then loop over
         // all routes to find a match.
         foreach ($this->routes as $collection) {
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index 7eb3f99f3128..444d32d9b258 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -849,6 +849,30 @@ public function testReverseRoutingWithLocale()
         $this->assertSame('/en/contact', $routes->reverseRoute('myController::goto'));
     }
 
+    public function testReverseRoutingDefaultNamespaceAppController()
+    {
+        $routes = $this->getCollector();
+        $routes->setDefaultNamespace('App\Controllers');
+
+        $routes->get('users/(:num)/gallery(:any)', 'Galleries::showUserGallery/$1/$2');
+
+        $match = $routes->reverseRoute('Galleries::showUserGallery', 15, 12);
+
+        $this->assertSame('/users/15/gallery12', $match);
+    }
+
+    public function testReverseRoutingDefaultNamespaceAppControllerSubNamespace()
+    {
+        $routes = $this->getCollector();
+        $routes->setDefaultNamespace('App\Controllers');
+
+        $routes->get('admin/(:num)/gallery(:any)', 'Admin\Galleries::showUserGallery/$1/$2');
+
+        $match = $routes->reverseRoute('Admin\Galleries::showUserGallery', 15, 12);
+
+        $this->assertSame('/admin/15/gallery12', $match);
+    }
+
     public function testNamedRoutes()
     {
         $routes = $this->getCollector();

From 83720c7074782a364fe56061efdca3e5b14299ac Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Apr 2022 19:50:19 +0900
Subject: [PATCH 2029/2325] docs: fix incorrect sample

By default, 'App\Controllers\Galleries::showUserGallery/$1/$2' means 'App\Controllers\App\Controllers\Galleries::showUserGallery/$1/$2'.
---
 user_guide_src/source/incoming/routing/029.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/incoming/routing/029.php b/user_guide_src/source/incoming/routing/029.php
index e6bc6bdfb65f..c1a8d5947cd8 100644
--- a/user_guide_src/source/incoming/routing/029.php
+++ b/user_guide_src/source/incoming/routing/029.php
@@ -1,10 +1,10 @@
 <?php
 
 // The route is defined as:
-$routes->get('users/(:num)/gallery(:any)', 'App\Controllers\Galleries::showUserGallery/$1/$2');
+$routes->get('users/(:num)/gallery(:any)', 'Galleries::showUserGallery/$1/$2');
 
 ?>
 
 <!-- Generate the relative URL to link to user ID 15, gallery 12: -->
-<a href="<?= route_to('App\Controllers\Galleries::showUserGallery', 15, 12) ?>">View Gallery</a>
+<a href="<?= route_to('Galleries::showUserGallery', 15, 12) ?>">View Gallery</a>
 <!-- Result: '/users/15/gallery/12' -->

From 0e060c8bfefb09d69035b280139fbbcae302018e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Apr 2022 20:01:09 +0900
Subject: [PATCH 2030/2325] docs: add note

---
 user_guide_src/source/general/common_functions.rst | 2 ++
 user_guide_src/source/helpers/url_helper.rst       | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index f8cbcf69bc53..4b8ef4e92cc2 100755
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -331,6 +331,8 @@ Miscellaneous Functions
     :param   string  $method: The named route alias, or name of the controller/method to match.
     :param   mixed   $params: One or more parameters to be passed to be matched in the route.
 
+    .. note:: This function requires the controller/method to have a route defined in **app/Config/routes.php**.
+
     Generates a URI relative to the domain name (not **baseUrl**) for you based on either a named route alias,
     or a controller::method combination. Will take parameters into effect, if provided.
 
diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst
index 9f673b88e8bb..c7aff69cb86a 100644
--- a/user_guide_src/source/helpers/url_helper.rst
+++ b/user_guide_src/source/helpers/url_helper.rst
@@ -351,6 +351,8 @@ The following functions are available:
     :returns: Absolute URL
     :rtype: string
 
+    .. note:: This function requires the controller/method to have a route defined in **app/Config/routes.php**.
+
     Builds an absolute URL to a controller method in your app. Example:
 
     .. literalinclude:: url_helper/021.php

From 5145228643b43fca6c31cf519230117c24142a87 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Apr 2022 21:04:02 +0900
Subject: [PATCH 2031/2325] docs: update PHPUnit link

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

diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst
index 2ff02af66ac3..d6675012671e 100644
--- a/user_guide_src/source/testing/overview.rst
+++ b/user_guide_src/source/testing/overview.rst
@@ -40,7 +40,7 @@ tests for this project by typing::
 Phar
 ----
 
-The other option is to download the .phar file from the `PHPUnit <https://phpunit.de/getting-started/phpunit-7.html>`__ site.
+The other option is to download the .phar file from the `PHPUnit <https://phpunit.de/getting-started/phpunit-9.html>`__ site.
 This is a standalone file that should be placed within your project root.
 
 ************************

From 05c52624e3eac8d375033d0e3115bed038f9ec66 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 29 Apr 2022 21:04:30 +0900
Subject: [PATCH 2032/2325] docs: make method names linkable

---
 user_guide_src/source/testing/overview.rst | 36 ++++++++++++++--------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst
index d6675012671e..fc9c7fd92cab 100644
--- a/user_guide_src/source/testing/overview.rst
+++ b/user_guide_src/source/testing/overview.rst
@@ -123,19 +123,22 @@ Additional Assertions
 
 ``CIUnitTestCase`` provides additional unit testing assertions that you might find useful.
 
-**assertLogged($level, $expectedMessage)**
+assertLogged($level, $expectedMessage)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Ensure that something you expected to be logged actually was:
 
 .. literalinclude:: overview/007.php
 
-**assertEventTriggered($eventName)**
+assertEventTriggered($eventName)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Ensure that an event you expected to be triggered actually was:
 
 .. literalinclude:: overview/008.php
 
-**assertHeaderEmitted($header, $ignoreCase = false)**
+assertHeaderEmitted($header, $ignoreCase = false)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Ensure that a header or cookie was actually emitted:
 
@@ -144,7 +147,8 @@ Ensure that a header or cookie was actually emitted:
 Note: the test case with this should be `run as a separate process
 in PHPunit <https://phpunit.readthedocs.io/en/9.5/annotations.html#runinseparateprocess>`_.
 
-**assertHeaderNotEmitted($header, $ignoreCase = false)**
+assertHeaderNotEmitted($header, $ignoreCase = false)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Ensure that a header or cookie was not emitted:
 
@@ -153,7 +157,8 @@ Ensure that a header or cookie was not emitted:
 Note: the test case with this should be `run as a separate process
 in PHPunit <https://phpunit.readthedocs.io/en/9.5/annotations.html#runinseparateprocess>`_.
 
-**assertCloseEnough($expected, $actual, $message = '', $tolerance = 1)**
+assertCloseEnough($expected, $actual, $message = '', $tolerance = 1)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 For extended execution time testing, tests that the absolute difference
 between expected and actual time is within the prescribed tolerance:
@@ -162,7 +167,8 @@ between expected and actual time is within the prescribed tolerance:
 
 The above test will allow the actual time to be either 660 or 661 seconds.
 
-**assertCloseEnoughString($expected, $actual, $message = '', $tolerance = 1)**
+assertCloseEnoughString($expected, $actual, $message = '', $tolerance = 1)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 For extended execution time testing, tests that the absolute difference
 between expected and actual time, formatted as strings, is within the prescribed tolerance:
@@ -177,21 +183,24 @@ Accessing Protected/Private Properties
 When testing, you can use the following setter and getter methods to access protected and private methods and
 properties in the classes that you are testing.
 
-**getPrivateMethodInvoker($instance, $method)**
+getPrivateMethodInvoker($instance, $method)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Enables you to call private methods from outside the class. This returns a function that can be called. The first
 parameter is an instance of the class to test. The second parameter is the name of the method you want to call.
 
 .. literalinclude:: overview/013.php
 
-**getPrivateProperty($instance, $property)**
+getPrivateProperty($instance, $property)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Retrieves the value of a private/protected class property from an instance of a class. The first parameter is an
 instance of the class to test. The second parameter is the name of the property.
 
 .. literalinclude:: overview/014.php
 
-**setPrivateProperty($instance, $property, $value)**
+setPrivateProperty($instance, $property, $value)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Set a protected value within a class instance. The first parameter is an instance of the class to test. The second
 parameter is the name of the property to set the value of. The third parameter is the value to set it to:
@@ -206,7 +215,8 @@ your tests to only the code in question, while simulating various responses from
 true when testing controllers and other integration testing. The **Services** class provides the following methods
 to simplify this.
 
-**injectMock()**
+injectMock()
+^^^^^^^^^^^^
 
 This method allows you to define the exact instance that will be returned by the Services class. You can use this to
 set properties of a service so that it behaves in a certain way, or replace a service with a mocked class.
@@ -216,11 +226,13 @@ set properties of a service so that it behaves in a certain way, or replace a se
 The first parameter is the service that you are replacing. The name must match the function name in the Services
 class exactly. The second parameter is the instance to replace it with.
 
-**reset()**
+reset()
+^^^^^^^
 
 Removes all mocked classes from the Services class, bringing it back to its original state.
 
-**resetSingle(string $name)**
+resetSingle(string $name)
+^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Removes any mock and shared instances for a single service, by its name.
 

From febfc9cf80f33d1ca87918605660526a9f59c48b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 30 Apr 2022 09:52:26 +0900
Subject: [PATCH 2033/2325] docs: fix Title level inconsistent

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

diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst
index fc9c7fd92cab..dd89f837eb6a 100644
--- a/user_guide_src/source/testing/overview.rst
+++ b/user_guide_src/source/testing/overview.rst
@@ -216,7 +216,7 @@ true when testing controllers and other integration testing. The **Services** cl
 to simplify this.
 
 injectMock()
-^^^^^^^^^^^^
+------------
 
 This method allows you to define the exact instance that will be returned by the Services class. You can use this to
 set properties of a service so that it behaves in a certain way, or replace a service with a mocked class.
@@ -227,12 +227,12 @@ The first parameter is the service that you are replacing. The name must match t
 class exactly. The second parameter is the instance to replace it with.
 
 reset()
-^^^^^^^
+-------
 
 Removes all mocked classes from the Services class, bringing it back to its original state.
 
 resetSingle(string $name)
-^^^^^^^^^^^^^^^^^^^^^^^^^
+-------------------------
 
 Removes any mock and shared instances for a single service, by its name.
 

From d01dfd719dec26173b3f74c653f57fc549395432 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Tue, 26 Apr 2022 11:47:22 +0800
Subject: [PATCH 2034/2325] Validation with wildcard keys.

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/Validation/Validation.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index f330c91799f6..20144c778bf5 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -145,12 +145,16 @@ public function run(?array $data = null, ?string $group = null, ?string $dbGroup
                 $rules = $this->splitRules($rules);
             }
 
-            $values = strpos($field, '*') !== false
-                ? array_filter(array_flatten_with_dots($data), static fn ($key) => preg_match(
+            if (strpos($field, '*') !== false) {
+                $values = array_filter(array_flatten_with_dots($data), static fn ($key) => preg_match(
                     '/^' . str_replace('\.\*', '\..+', preg_quote($field, '/')) . '$/',
                     $key
-                ), ARRAY_FILTER_USE_KEY)
-                : dot_array_search($field, $data);
+                ), ARRAY_FILTER_USE_KEY);
+                // if keys not found
+                $values = $values ?: [$field => null];
+            } else {
+                $values = dot_array_search($field, $data);
+            }
 
             if ($values === []) {
                 // We'll process the values right away if an empty array

From 7e933c832627766abfc814ebe8957455eff6c842 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 30 Apr 2022 11:04:49 +0900
Subject: [PATCH 2035/2325] test: add test

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

diff --git a/tests/system/Validation/ValidationTest.php b/tests/system/Validation/ValidationTest.php
index 664a92d5527f..4c63b689a995 100644
--- a/tests/system/Validation/ValidationTest.php
+++ b/tests/system/Validation/ValidationTest.php
@@ -1244,4 +1244,72 @@ public function testPlaceholderReplacementSetMultipleRulesComplexArray()
 
         $this->placeholderReplacementResultDetermination();
     }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5922
+     */
+    public function testNestedArrayThrowsException(): void
+    {
+        $rule = [
+            'customer_account_number' => [
+                'label' => 'ACCOUNT NUMBER',
+                'rules' => 'required|exact_length[5]',
+            ],
+            'debit_amount' => [
+                'label' => 'DEBIT AMOUNT',
+                'rules' => 'required|decimal|is_natural_no_zero',
+            ],
+            'beneficiaries_accounts.*.account_number' => [
+                'label' => 'BENEFICIARY ACCOUNT NUMBER',
+                'rules' => 'exact_length[5]',
+            ],
+            'beneficiaries_accounts.*.credit_amount' => [
+                'label' => 'CREDIT AMOUNT',
+                'rules' => 'required|decimal|is_natural_no_zero',
+            ],
+            'beneficiaries_accounts.*.purpose' => [
+                'label' => 'PURPOSE',
+                'rules' => 'required_without[beneficiaries_accounts.*.account_number]|min_length[3]|max_length[255]',
+            ],
+        ];
+
+        $this->validation->setRules($rule);
+        $data = [
+            'customer_account_number' => 'A_490',
+            'debit_amount'            => '1500',
+            'beneficiaries_accounts'  => [],
+        ];
+        $this->validation->run($data);
+
+        $this->assertSame([
+            'beneficiaries_accounts.*.account_number' => 'The BENEFICIARY ACCOUNT NUMBER field must be exactly 5 characters in length.',
+            'beneficiaries_accounts.*.credit_amount'  => 'The CREDIT AMOUNT field is required.',
+            'beneficiaries_accounts.*.purpose'        => 'The PURPOSE field is required when BENEFICIARY ACCOUNT NUMBER is not present.',
+        ], $this->validation->getErrors());
+
+        $this->validation->reset();
+        $this->validation->setRules($rule);
+        $data = [
+            'customer_account_number' => 'A_490',
+            'debit_amount'            => '1500',
+            'beneficiaries_accounts'  => [
+                'account_1' => [
+                    'account_number' => 'A_103',
+                    'credit_amount'  => 1000,
+                    'purpose'        => 'Personal',
+                ],
+                'account_2' => [
+                    'account_number' => 'A_258',
+                    'credit_amount'  => null,
+                    'purpose'        => 'A',
+                ],
+            ],
+        ];
+        $this->validation->run($data);
+
+        $this->assertSame([
+            'beneficiaries_accounts.account_2.credit_amount' => 'The CREDIT AMOUNT field is required.',
+            'beneficiaries_accounts.account_2.purpose'       => 'The PURPOSE field must be at least 3 characters in length.',
+        ], $this->validation->getErrors());
+    }
 }

From e3cb001c9a9f8e0923951f16533378170bc6b26e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 2 May 2022 08:28:12 +0900
Subject: [PATCH 2036/2325] docs: make titles linkable

---
 user_guide_src/source/testing/fabricator.rst | 21 ++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/testing/fabricator.rst b/user_guide_src/source/testing/fabricator.rst
index 9acec31b5db2..826e435d0821 100644
--- a/user_guide_src/source/testing/fabricator.rst
+++ b/user_guide_src/source/testing/fabricator.rst
@@ -44,7 +44,8 @@ of the time you will want to specify the formatters to use as the second paramet
 
 You can also change the formatters after a fabricator is initialized by using the ``setFormatters()`` method.
 
-**Advanced Formatting**
+Advanced Formatting
+-------------------
 
 Sometimes the default return of a formatter is not enough. Faker providers allow parameters to most formatters
 to further limit the scope of random data. A fabricator will check its representative model for the ``fake()``
@@ -162,29 +163,37 @@ Your model's fake method could look like this:
 
 Now creating a new user will ensure it is a part of a valid group: ``$user = fake(UserModel::class);``
 
+Methods
+-------
+
 ``Fabricator`` handles the counts internally but you can also access these static methods
 to assist with using them:
 
-**getCount(string $table): int**
+getCount(string $table): int
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Return the current value for a specific table (default: 0).
 
-**setCount(string $table, int $count): int**
+setCount(string $table, int $count): int
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Set the value for a specific table manually, for example if you create some test items
 without using a fabricator that you still wanted factored into the final counts.
 
-**upCount(string $table): int**
+upCount(string $table): int
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Increment the value for a specific table by one and return the new value. (This is what is
 used internally with ``Fabricator::create()``).
 
-**downCount(string $table): int**
+downCount(string $table): int
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Decrement the value for a specific table by one and return the new value, for example if
 you deleted a fake item but wanted to track the change.
 
-**resetCounts()**
+resetCounts()
+^^^^^^^^^^^^^
 
 Resets all counts. Good idea to call this between test cases (though using
 ``CIUnitTestCase::$refresh = true`` does it automatically).

From d9d153044524a6afe323753c9cb6f9346d374a3d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 2 May 2022 08:33:37 +0900
Subject: [PATCH 2037/2325] docs: add example to return "return type object"

---
 user_guide_src/source/testing/fabricator/005.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/user_guide_src/source/testing/fabricator/005.php b/user_guide_src/source/testing/fabricator/005.php
index e5bb7bde9f82..c61fa527125e 100644
--- a/user_guide_src/source/testing/fabricator/005.php
+++ b/user_guide_src/source/testing/fabricator/005.php
@@ -4,6 +4,8 @@
 
 class UserModel
 {
+    // ...
+
     public function fake(Generator &$faker)
     {
         return [
@@ -13,5 +15,18 @@ public function fake(Generator &$faker)
             'avatar' => Faker\Provider\Image::imageUrl(800, 400),
             'login'  => config('Auth')->allowRemembering ? date('Y-m-d') : null,
         ];
+
+        /*
+         * Or you can return a return type object.
+
+        return new User([
+            'first'  => $faker->firstName,
+            'email'  => $faker->email,
+            'phone'  => $faker->phoneNumber,
+            'avatar' => Faker\Provider\Image::imageUrl(800, 400),
+            'login'  => config('Auth')->allowRemembering ? date('Y-m-d') : null,
+        ]);
+
+        */
     }
 }

From 3caa6d04603c87ad1e06df8f3c2f29c96bfa0928 Mon Sep 17 00:00:00 2001
From: Pooya Parsa Dadashi <Pooya_parsa_dadashi@yahoo.com>
Date: Sat, 30 Apr 2022 01:44:22 +0330
Subject: [PATCH 2038/2325] Explain about the activation coverage that is
 required to run the unit test

---
 tests/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/README.md b/tests/README.md
index 80f9439d1e6d..04c78995ea52 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -19,7 +19,7 @@ If running under OS X or Linux, you can create a symbolic link to make running t
 	> ln -s ./vendor/bin/phpunit ./phpunit
 
 You also need to install [XDebug](https://xdebug.org/docs/install) in order
-for code coverage to be calculated successfully.
+for code coverage to be calculated successfully. After installing `XDebug`, you must add `xdebug.mode=coverage` in the **php.ini** file to enable code coverage.
 
 ## Setting Up
 

From 9c062a73c75b206f007194061532ce3e0fa01793 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 2 May 2022 15:00:34 +0700
Subject: [PATCH 2039/2325] [Rector] Update Rector to 0.12.23, clean up
 parallel timeout setting

---
 composer.json | 2 +-
 rector.php    | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 6e37fe7a25bf..f12e6714bed3 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.5.6",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.22"
+        "rector/rector": "0.12.23"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"
diff --git a/rector.php b/rector.php
index ee58a356f961..b5d7131f725a 100644
--- a/rector.php
+++ b/rector.php
@@ -27,7 +27,6 @@
 use Rector\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector;
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
 use Rector\Config\RectorConfig;
-use Rector\Core\Configuration\Option;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector;
 use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector;
@@ -164,7 +163,4 @@
         'SQLite3',
     ]);
     $rectorConfig->rule(PrivatizeFinalClassPropertyRector::class);
-
-    $parameters = $rectorConfig->parameters();
-    $parameters->set(Option::PARALLEL_TIMEOUT_IN_SECONDS, 240);
 };

From a940503e8c7a5ac429d1cc07d48baeba90b77a32 Mon Sep 17 00:00:00 2001
From: "Michael R. Krisnadhi" <michaelkrisnadhi@gmail.com>
Date: Mon, 2 May 2022 16:58:30 +0700
Subject: [PATCH 2040/2325] [docs] add DB nested transaction

---
 user_guide_src/source/database/transactions.rst   | 15 +++++++++++++++
 .../source/database/transactions/007.php          |  9 +++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 user_guide_src/source/database/transactions/007.php

diff --git a/user_guide_src/source/database/transactions.rst b/user_guide_src/source/database/transactions.rst
index a5612362cb8c..1bc3e37adcf2 100644
--- a/user_guide_src/source/database/transactions.rst
+++ b/user_guide_src/source/database/transactions.rst
@@ -97,3 +97,18 @@ If you would like to run transactions manually you can do so as follows:
 
 .. note:: Make sure to use ``$this->db->transBegin()`` when running manual
     transactions, **NOT** ``$this->db->transStart()``.
+
+Nested Transactions
+===================
+
+In CodeIgniter, transactions can be nested in a way such that only the
+outmost or top-level transaction commands are executed. You can include as
+many pairs of ``transStart``/``transComplete`` or ``transBegin``/``transCommit``/``transRollback``
+as you want inside a transaction block and so on. CodeIgniter will keep
+track of the transaction "depth" and only take action at the outermost layer
+(zero depth).
+
+.. literalinclude:: transactions/007.php
+
+.. note:: Use this technique ONLY IF you actually know what you are doing.
+
diff --git a/user_guide_src/source/database/transactions/007.php b/user_guide_src/source/database/transactions/007.php
new file mode 100644
index 000000000000..c67309174566
--- /dev/null
+++ b/user_guide_src/source/database/transactions/007.php
@@ -0,0 +1,9 @@
+<?php
+
+$this->db->transStart(); // actually starts a transaction
+$this->db->query('SOME QUERY 1 ...');
+$this->db->transStart(); // doesn't necessarily start another transaction
+$this->db->query('SOME QUERY 2 ...');
+$this->db->transComplete(); // doesn't necessarily end the transaction, but required to finish the inner transaction
+$this->db->query('SOME QUERY 3 ...');
+$this->db->transComplete(); // actually ends the transaction

From cf783ce667c2d2229f453f9dfd4dc5c7dccba78f Mon Sep 17 00:00:00 2001
From: "Michael R. Krisnadhi" <michaelkrisnadhi@gmail.com>
Date: Mon, 2 May 2022 19:53:39 +0700
Subject: [PATCH 2041/2325] update DB nested transaction note

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

diff --git a/user_guide_src/source/database/transactions.rst b/user_guide_src/source/database/transactions.rst
index 1bc3e37adcf2..86a3cdb0b495 100644
--- a/user_guide_src/source/database/transactions.rst
+++ b/user_guide_src/source/database/transactions.rst
@@ -110,5 +110,4 @@ track of the transaction "depth" and only take action at the outermost layer
 
 .. literalinclude:: transactions/007.php
 
-.. note:: Use this technique ONLY IF you actually know what you are doing.
-
+.. note:: Use this technique carefully in order to keep the commands balanced.

From 680f9ff270f6d3fb251c557a94a90f352ae2cd62 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 8 Apr 2022 20:22:11 +0900
Subject: [PATCH 2042/2325] feat: add AutoRouterImproved class

---
 app/Config/Feature.php                        |   9 +-
 phpstan-baseline.neon.dist                    |   7 +-
 system/Router/AutoRouter.php                  |   4 +-
 system/Router/AutoRouterImproved.php          | 268 ++++++++++++++++++
 system/Router/AutoRouterInterface.php         |  25 ++
 system/Router/Router.php                      |  50 ++--
 .../system/Router/AutoRouterImprovedTest.php  | 207 ++++++++++++++
 .../Dash_folder/Dash_controller.php           |  18 ++
 .../Dash_folder/Emptyfolder/.gitkeep          |   0
 .../Controllers/Dash_folder/MyController.php  |  18 ++
 tests/system/Router/Controllers/Home.php      |  18 ++
 .../Router/Controllers/MyController.php       |  18 ++
 .../Controllers/Subfolder/MyController.php    |  18 ++
 tests/system/Router/Controllers/Test.php      |  21 ++
 14 files changed, 658 insertions(+), 23 deletions(-)
 create mode 100644 system/Router/AutoRouterImproved.php
 create mode 100644 system/Router/AutoRouterInterface.php
 create mode 100644 tests/system/Router/AutoRouterImprovedTest.php
 create mode 100644 tests/system/Router/Controllers/Dash_folder/Dash_controller.php
 create mode 100644 tests/system/Router/Controllers/Dash_folder/Emptyfolder/.gitkeep
 create mode 100644 tests/system/Router/Controllers/Dash_folder/MyController.php
 create mode 100644 tests/system/Router/Controllers/Home.php
 create mode 100644 tests/system/Router/Controllers/MyController.php
 create mode 100644 tests/system/Router/Controllers/Subfolder/MyController.php
 create mode 100644 tests/system/Router/Controllers/Test.php

diff --git a/app/Config/Feature.php b/app/Config/Feature.php
index af42534ac423..b2e013bf3a2f 100644
--- a/app/Config/Feature.php
+++ b/app/Config/Feature.php
@@ -10,7 +10,7 @@
 class Feature extends BaseConfig
 {
     /**
-     * Enable multiple filters for a route or not
+     * Enable multiple filters for a route or not.
      *
      * If you enable this:
      *   - CodeIgniter\CodeIgniter::handleRequest() uses:
@@ -24,4 +24,11 @@ class Feature extends BaseConfig
      * @var bool
      */
     public $multipleFilters = false;
+
+    /**
+     * Use improved new auto routing, instead of the traditional auto routing.
+     *
+     * @var bool
+     */
+    public $autoRoutesImproved = false;
 }
diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index 709daad82cdd..d7a30aab6a3b 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -677,7 +677,7 @@ parameters:
 
 		-
 			message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getDefaultNamespace\\(\\)\\.$#"
-			count: 2
+			count: 3
 			path: system/Router/Router.php
 
 		-
@@ -720,6 +720,11 @@ parameters:
 			count: 1
 			path: system/Router/Router.php
 
+		-
+			message: "#^Method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRoutes\\(\\) invoked with 1 parameter, 0 required\\.$#"
+			count: 1
+			path: system/Router/AutoRouterImproved.php
+
 		-
 			message: "#^Property Config\\\\App\\:\\:\\$CSRF[a-zA-Z]+ \\([a-zA-Z]+\\) on left side of \\?\\? is not nullable\\.$#"
 			count: 6
diff --git a/system/Router/AutoRouter.php b/system/Router/AutoRouter.php
index bd55d7fae39c..f6b44eac9431 100644
--- a/system/Router/AutoRouter.php
+++ b/system/Router/AutoRouter.php
@@ -16,7 +16,7 @@
 /**
  * Router for Auto-Routing
  */
-class AutoRouter
+class AutoRouter implements AutoRouterInterface
 {
     /**
      * List of controllers registered for the CLI verb that should not be accessed in the web.
@@ -263,6 +263,8 @@ public function setDirectory(?string $dir = null, bool $append = false, bool $va
     /**
      * Returns the name of the sub-directory the controller is in,
      * if any. Relative to APPPATH.'Controllers'.
+     *
+     * @deprecated This method is not necessary.
      */
     public function directory(): string
     {
diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php
new file mode 100644
index 000000000000..ea70c0e954d1
--- /dev/null
+++ b/system/Router/AutoRouterImproved.php
@@ -0,0 +1,268 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Router;
+
+use CodeIgniter\Exceptions\PageNotFoundException;
+
+/**
+ * New Secure Router for Auto-Routing
+ */
+class AutoRouterImproved implements AutoRouterInterface
+{
+    /**
+     * A RouteCollection instance.
+     */
+    protected RouteCollectionInterface $collection;
+
+    /**
+     * Sub-directory that contains the requested controller class.
+     */
+    protected ?string $directory = null;
+
+    /**
+     * Sub-namespace that contains the requested controller class.
+     */
+    protected ?string $subNamespace = null;
+
+    /**
+     * The name of the controller class.
+     */
+    protected string $controller;
+
+    /**
+     * The name of the method to use.
+     */
+    protected string $method;
+
+    /**
+     * An array of params to the controller method.
+     */
+    protected array $params = [];
+
+    /**
+     * Whether dashes in URI's should be converted
+     * to underscores when determining method names.
+     */
+    protected bool $translateURIDashes;
+
+    /**
+     * HTTP verb for the request.
+     */
+    protected string $httpVerb;
+
+    /**
+     * The namespace for controllers.
+     */
+    protected string $namespace;
+
+    /**
+     * The name of the default controller class.
+     */
+    protected string $defaultController;
+
+    /**
+     * The name of the default method
+     */
+    protected string $defaultMethod;
+
+    public function __construct(
+        RouteCollectionInterface $routes,
+        string $namespace,
+        bool $translateURIDashes,
+        string $httpVerb
+    ) {
+        $this->collection         = $routes;
+        $this->namespace          = rtrim($namespace, '\\') . '\\';
+        $this->translateURIDashes = $translateURIDashes;
+        $this->httpVerb           = $httpVerb;
+
+        $this->defaultController = $this->collection->getDefaultController();
+        $this->defaultMethod     = $httpVerb . ucfirst($this->collection->getDefaultMethod());
+
+        // Set the default values
+        $this->controller = $this->defaultController;
+        $this->method     = $this->defaultMethod;
+    }
+
+    /**
+     * Finds controller, method and params from the URI.
+     *
+     * @return array [directory_name, controller_name, controller_method, params]
+     */
+    public function getRoute(string $uri): array
+    {
+        $segments = explode('/', $uri);
+
+        // WARNING: Directories get shifted out of the segments array.
+        $nonDirSegments = $this->scanControllers($segments);
+
+        $controllerSegment  = '';
+        $baseControllerName = $this->defaultController;
+
+        // If we don't have any segments left - use the default controller;
+        // If not empty, then the first segment should be the controller
+        if (! empty($nonDirSegments)) {
+            $controllerSegment = array_shift($nonDirSegments);
+
+            $baseControllerName = $this->translateURIDashes(ucfirst($controllerSegment));
+        }
+
+        if (! $this->isValidSegment($baseControllerName)) {
+            throw new PageNotFoundException($baseControllerName . ' is not a valid controller name');
+        }
+
+        // Prevent access to default controller path
+        if (
+            strtolower($baseControllerName) === strtolower($this->defaultController)
+            && strtolower($controllerSegment) === strtolower($this->defaultController)
+        ) {
+            throw PageNotFoundException::forPageNotFound();
+        }
+
+        // Use the method name if it exists.
+        if (! empty($nonDirSegments)) {
+            $methodSegment = $this->translateURIDashes(array_shift($nonDirSegments));
+
+            // Prefix HTTP verb
+            $this->method = $this->httpVerb . ucfirst($methodSegment);
+
+            // Prevent access to default method path
+            if (strtolower($this->method) === strtolower($this->defaultMethod)) {
+                throw PageNotFoundException::forPageNotFound();
+            }
+        }
+
+        if (! empty($nonDirSegments)) {
+            $this->params = $nonDirSegments;
+        }
+
+        // Ensure the controller stores the fully-qualified class name
+        $this->controller = '\\' . ltrim(
+            str_replace(
+                '/',
+                '\\',
+                $this->namespace . $this->subNamespace . $baseControllerName
+            ),
+            '\\'
+        );
+
+        // Ensure routes registered via $routes->cli() are not accessible via web.
+        if ($this->httpVerb !== 'cli') {
+            $controller = strtolower($this->controller);
+            $methodName = strtolower($this->method);
+
+            foreach ($this->collection->getRoutes('cli') as $route) {
+                if (is_string($route)) {
+                    $route = strtolower($route);
+                    if (strpos($route, $controller . '::' . $methodName) === 0) {
+                        throw new PageNotFoundException();
+                    }
+
+                    if ($route === $controller) {
+                        throw new PageNotFoundException();
+                    }
+                }
+            }
+        }
+
+        return [$this->directory, $this->controller, $this->method, $this->params];
+    }
+
+    /**
+     * Scans the controller directory, attempting to locate a controller matching the supplied uri $segments
+     *
+     * @param array $segments URI segments
+     *
+     * @return array returns an array of remaining uri segments that don't map onto a directory
+     */
+    private function scanControllers(array $segments): array
+    {
+        $segments = array_filter($segments, static fn ($segment) => $segment !== '');
+        // numerically reindex the array, removing gaps
+        $segments = array_values($segments);
+
+        // Loop through our segments and return as soon as a controller
+        // is found or when such a directory doesn't exist
+        $c = count($segments);
+
+        while ($c-- > 0) {
+            $segmentConvert = ucfirst(
+                $this->translateURIDashes === true
+                    ? str_replace('-', '_', $segments[0])
+                    : $segments[0]
+            );
+
+            // as soon as we encounter any segment that is not PSR-4 compliant, stop searching
+            if (! $this->isValidSegment($segmentConvert)) {
+                return $segments;
+            }
+
+            $test = $this->namespace . $this->subNamespace . $segmentConvert;
+
+            // as long as each segment is *not* a controller file, add it to $this->subNamespace
+            if (! class_exists($test)) {
+                $this->setSubNamespace($segmentConvert, true, false);
+                array_shift($segments);
+
+                $this->directory .= $this->directory . $segmentConvert . '/';
+
+                continue;
+            }
+
+            return $segments;
+        }
+
+        // This means that all segments were actually directories
+        return $segments;
+    }
+
+    /**
+     * Returns true if the supplied $segment string represents a valid PSR-4 compliant namespace/directory segment
+     *
+     * regex comes from https://www.php.net/manual/en/language.variables.basics.php
+     */
+    private function isValidSegment(string $segment): bool
+    {
+        return (bool) preg_match('/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*$/', $segment);
+    }
+
+    /**
+     * Sets the sub-namespace that the controller is in.
+     *
+     * @param bool $validate if true, checks to make sure $dir consists of only PSR4 compliant segments
+     */
+    private function setSubNamespace(?string $namespace = null, bool $append = false, bool $validate = true)
+    {
+        if ($validate) {
+            $segments = explode('/', trim($namespace, '/'));
+
+            foreach ($segments as $segment) {
+                if (! $this->isValidSegment($segment)) {
+                    return;
+                }
+            }
+        }
+
+        if ($append !== true || empty($this->subNamespace)) {
+            $this->subNamespace = trim($namespace, '/') . '\\';
+        } else {
+            $this->subNamespace .= trim($namespace, '/') . '\\';
+        }
+    }
+
+    private function translateURIDashes(string $classname): string
+    {
+        return $this->translateURIDashes
+            ? str_replace('-', '_', $classname)
+            : $classname;
+    }
+}
diff --git a/system/Router/AutoRouterInterface.php b/system/Router/AutoRouterInterface.php
new file mode 100644
index 000000000000..9ecdd3ec2b30
--- /dev/null
+++ b/system/Router/AutoRouterInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Router;
+
+/**
+ * Expected behavior of a AutoRouter.
+ */
+interface AutoRouterInterface
+{
+    /**
+     * Returns controller, method and params from the URI.
+     *
+     * @return array [directory_name, controller_name, controller_method, params]
+     */
+    public function getRoute(string $uri): array;
+}
diff --git a/system/Router/Router.php b/system/Router/Router.php
index ad431ddbfa58..ec51c3ef1e3e 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -113,7 +113,7 @@ class Router implements RouterInterface
      */
     protected $filtersInfo = [];
 
-    protected ?AutoRouter $autoRouter = null;
+    protected ?AutoRouterInterface $autoRouter = null;
 
     /**
      * Stores a reference to the RouteCollection object.
@@ -131,14 +131,24 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request
         $this->translateURIDashes = $this->collection->shouldTranslateURIDashes();
 
         if ($this->collection->shouldAutoRoute()) {
-            $this->autoRouter = new AutoRouter(
-                $this->collection->getRegisteredControllers('cli'),
-                $this->collection->getDefaultNamespace(),
-                $this->collection->getDefaultController(),
-                $this->collection->getDefaultMethod(),
-                $this->translateURIDashes,
-                $this->collection->getHTTPVerb()
-            );
+            $autoRoutesImproved = config('Feature')->autoRoutesImproved ?? false;
+            if ($autoRoutesImproved) {
+                $this->autoRouter = new AutoRouterImproved(
+                    $this->collection,
+                    $this->collection->getDefaultNamespace(),
+                    $this->translateURIDashes,
+                    $this->collection->getHTTPVerb()
+                );
+            } else {
+                $this->autoRouter = new AutoRouter(
+                    $this->collection->getRegisteredControllers('cli'),
+                    $this->collection->getDefaultNamespace(),
+                    $this->collection->getDefaultController(),
+                    $this->collection->getDefaultMethod(),
+                    $this->translateURIDashes,
+                    $this->collection->getHTTPVerb()
+                );
+            }
         }
     }
 
@@ -280,11 +290,11 @@ public function params(): array
      */
     public function directory(): string
     {
-        if ($this->autoRouter === null) {
-            return '';
+        if ($this->autoRouter instanceof AutoRouter) {
+            return $this->autoRouter->directory();
         }
 
-        return $this->autoRouter->directory();
+        return '';
     }
 
     /**
@@ -327,16 +337,16 @@ public function setIndexPage($page): self
      * Tells the system whether we should translate URI dashes or not
      * in the URI from a dash to an underscore.
      *
-     * @deprecated Moved to AutoRouter class.
+     * @deprecated This method should be removed.
      */
     public function setTranslateURIDashes(bool $val = false): self
     {
-        if ($this->autoRouter === null) {
+        if ($this->autoRouter instanceof AutoRouter) {
+            $this->autoRouter->setTranslateURIDashes($val);
+
             return $this;
         }
 
-        $this->autoRouter->setTranslateURIDashes($val);
-
         return $this;
     }
 
@@ -580,7 +590,7 @@ protected function scanControllers(array $segments): array
      *
      * @param bool $validate if true, checks to make sure $dir consists of only PSR4 compliant segments
      *
-     * @deprecated Moved to AutoRouter class.
+     * @deprecated This method should be removed.
      */
     public function setDirectory(?string $dir = null, bool $append = false, bool $validate = true)
     {
@@ -590,11 +600,11 @@ public function setDirectory(?string $dir = null, bool $append = false, bool $va
             return;
         }
 
-        if ($this->autoRouter === null) {
+        if ($this->autoRouter instanceof AutoRouter) {
+            $this->autoRouter->setDirectory($dir, $append, $validate);
+
             return;
         }
-
-        $this->autoRouter->setDirectory($dir, $append, $validate);
     }
 
     /**
diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php
new file mode 100644
index 000000000000..f499452bc768
--- /dev/null
+++ b/tests/system/Router/AutoRouterImprovedTest.php
@@ -0,0 +1,207 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Router;
+
+use CodeIgniter\Config\Services;
+use CodeIgniter\Exceptions\PageNotFoundException;
+use CodeIgniter\Test\CIUnitTestCase;
+use Config\Modules;
+
+/**
+ * @internal
+ */
+final class AutoRouterImprovedTest extends CIUnitTestCase
+{
+    /**
+     * @var RouteCollection
+     */
+    protected $collection;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $moduleConfig          = new Modules();
+        $moduleConfig->enabled = false;
+        $this->collection      = new RouteCollection(Services::locator(), $moduleConfig);
+    }
+
+    private function createNewAutoRouter(): AutoRouterImproved
+    {
+        return new AutoRouterImproved(
+            $this->collection,
+            'CodeIgniter\Router\Controllers',
+            true,
+            'get'
+        );
+    }
+
+    public function testAutoRouteFindsDefaultControllerAndMethodGet()
+    {
+        $this->collection->setDefaultController('Test');
+
+        $router = $this->createNewAutoRouter();
+
+        [$directory, $controller, $method, $params]
+            = $router->getRoute('/');
+
+        $this->assertNull($directory);
+        $this->assertSame('\CodeIgniter\Router\Controllers\Test', $controller);
+        $this->assertSame('getIndex', $method);
+        $this->assertSame([], $params);
+    }
+
+    public function testAutoRouteFindsControllerWithFileAndMethod()
+    {
+        $router = $this->createNewAutoRouter();
+
+        [$directory, $controller, $method, $params]
+            = $router->getRoute('myController/someMethod');
+
+        $this->assertNull($directory);
+        $this->assertSame('\CodeIgniter\Router\Controllers\MyController', $controller);
+        $this->assertSame('getSomeMethod', $method);
+        $this->assertSame([], $params);
+    }
+
+    public function testAutoRouteFindsControllerWithFile()
+    {
+        $router = $this->createNewAutoRouter();
+
+        [$directory, $controller, $method, $params]
+            = $router->getRoute('myController');
+
+        $this->assertNull($directory);
+        $this->assertSame('\CodeIgniter\Router\Controllers\MyController', $controller);
+        $this->assertSame('getIndex', $method);
+        $this->assertSame([], $params);
+    }
+
+    public function testAutoRouteFindsControllerWithSubfolder()
+    {
+        $router = $this->createNewAutoRouter();
+
+        [$directory, $controller, $method, $params]
+            = $router->getRoute('subfolder/myController/someMethod');
+
+        $this->assertSame('Subfolder/', $directory);
+        $this->assertSame('\CodeIgniter\Router\Controllers\Subfolder\MyController', $controller);
+        $this->assertSame('getSomeMethod', $method);
+        $this->assertSame([], $params);
+    }
+
+    public function testAutoRouteFindsDashedSubfolder()
+    {
+        $router = $this->createNewAutoRouter();
+
+        [$directory, $controller, $method, $params]
+            = $router->getRoute('dash-folder/mycontroller/somemethod');
+
+        $this->assertSame('Dash_folder/', $directory);
+        $this->assertSame('\CodeIgniter\Router\Controllers\Dash_folder\Mycontroller', $controller);
+        $this->assertSame('getSomemethod', $method);
+        $this->assertSame([], $params);
+    }
+
+    public function testAutoRouteFindsDashedController()
+    {
+        $router = $this->createNewAutoRouter();
+
+        [$directory, $controller, $method, $params]
+            = $router->getRoute('dash-folder/dash-controller/somemethod');
+
+        $this->assertSame('Dash_folder/', $directory);
+        $this->assertSame('\CodeIgniter\Router\Controllers\Dash_folder\Dash_controller', $controller);
+        $this->assertSame('getSomemethod', $method);
+        $this->assertSame([], $params);
+    }
+
+    public function testAutoRouteFindsDashedMethod()
+    {
+        $router = $this->createNewAutoRouter();
+
+        [$directory, $controller, $method, $params]
+            = $router->getRoute('dash-folder/dash-controller/dash-method');
+
+        $this->assertSame('Dash_folder/', $directory);
+        $this->assertSame('\CodeIgniter\Router\Controllers\Dash_folder\Dash_controller', $controller);
+        $this->assertSame('getDash_method', $method);
+        $this->assertSame([], $params);
+    }
+
+    public function testAutoRouteFindsDefaultDashFolder()
+    {
+        $router = $this->createNewAutoRouter();
+
+        [$directory, $controller, $method, $params]
+            = $router->getRoute('dash-folder');
+
+        $this->assertSame('Dash_folder/', $directory);
+        $this->assertSame('\CodeIgniter\Router\Controllers\Dash_folder\Home', $controller);
+        $this->assertSame('getIndex', $method);
+        $this->assertSame([], $params);
+    }
+
+    public function testAutoRouteRejectsSingleDot()
+    {
+        $this->expectException(PageNotFoundException::class);
+
+        $router = $this->createNewAutoRouter();
+
+        $router->getRoute('.');
+    }
+
+    public function testAutoRouteRejectsDoubleDot()
+    {
+        $this->expectException(PageNotFoundException::class);
+
+        $router = $this->createNewAutoRouter();
+
+        $router->getRoute('..');
+    }
+
+    public function testAutoRouteRejectsMidDot()
+    {
+        $this->expectException(PageNotFoundException::class);
+
+        $router = $this->createNewAutoRouter();
+
+        $router->getRoute('foo.bar');
+    }
+
+    public function testRejectsDefaultControllerPath()
+    {
+        $this->expectException(PageNotFoundException::class);
+
+        $router = $this->createNewAutoRouter();
+
+        $router->getRoute('home');
+    }
+
+    public function testRejectsDefaultControllerAndDefaultMethodPath()
+    {
+        $this->expectException(PageNotFoundException::class);
+
+        $router = $this->createNewAutoRouter();
+
+        $router->getRoute('home/index');
+    }
+
+    public function testRejectsDefaultMethodPath()
+    {
+        $this->expectException(PageNotFoundException::class);
+
+        $router = $this->createNewAutoRouter();
+
+        $router->getRoute('test/index');
+    }
+}
diff --git a/tests/system/Router/Controllers/Dash_folder/Dash_controller.php b/tests/system/Router/Controllers/Dash_folder/Dash_controller.php
new file mode 100644
index 000000000000..621ffac5a256
--- /dev/null
+++ b/tests/system/Router/Controllers/Dash_folder/Dash_controller.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Router\Controllers\Dash_folder;
+
+use App\Controllers\BaseController;
+
+class Dash_controller extends BaseController
+{
+}
diff --git a/tests/system/Router/Controllers/Dash_folder/Emptyfolder/.gitkeep b/tests/system/Router/Controllers/Dash_folder/Emptyfolder/.gitkeep
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/system/Router/Controllers/Dash_folder/MyController.php b/tests/system/Router/Controllers/Dash_folder/MyController.php
new file mode 100644
index 000000000000..cea295165d1c
--- /dev/null
+++ b/tests/system/Router/Controllers/Dash_folder/MyController.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Router\Controllers\Dash_folder;
+
+use App\Controllers\BaseController;
+
+class MyController extends BaseController
+{
+}
diff --git a/tests/system/Router/Controllers/Home.php b/tests/system/Router/Controllers/Home.php
new file mode 100644
index 000000000000..f9931de7a484
--- /dev/null
+++ b/tests/system/Router/Controllers/Home.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Router\Controllers;
+
+use App\Controllers\BaseController;
+
+class Home extends BaseController
+{
+}
diff --git a/tests/system/Router/Controllers/MyController.php b/tests/system/Router/Controllers/MyController.php
new file mode 100644
index 000000000000..51f32bfc52eb
--- /dev/null
+++ b/tests/system/Router/Controllers/MyController.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Router\Controllers;
+
+use App\Controllers\BaseController;
+
+class MyController extends BaseController
+{
+}
diff --git a/tests/system/Router/Controllers/Subfolder/MyController.php b/tests/system/Router/Controllers/Subfolder/MyController.php
new file mode 100644
index 000000000000..61a436edc83a
--- /dev/null
+++ b/tests/system/Router/Controllers/Subfolder/MyController.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Router\Controllers\Subfolder;
+
+use App\Controllers\BaseController;
+
+class MyController extends BaseController
+{
+}
diff --git a/tests/system/Router/Controllers/Test.php b/tests/system/Router/Controllers/Test.php
new file mode 100644
index 000000000000..fbf87610ade4
--- /dev/null
+++ b/tests/system/Router/Controllers/Test.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Router\Controllers;
+
+use App\Controllers\BaseController;
+
+/**
+ * @internal
+ */
+final class Test extends BaseController
+{
+}

From fd4f9b885d5f5be3017710612062f1b1fead2712 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 9 Apr 2022 18:10:09 +0900
Subject: [PATCH 2043/2325] feat: add param checking

---
 system/Router/AutoRouterImproved.php          | 33 ++++++++++++++++++-
 .../system/Router/AutoRouterImprovedTest.php  | 29 ++++++++++++++--
 .../Dash_folder/Dash_controller.php           |  7 ++++
 .../Router/Controllers/Dash_folder/Home.php   | 21 ++++++++++++
 .../Controllers/Dash_folder/MyController.php  |  3 ++
 .../Router/Controllers/MyController.php       |  7 ++++
 .../Controllers/Subfolder/MyController.php    |  3 ++
 tests/system/Router/Controllers/Test.php      |  7 ++++
 8 files changed, 107 insertions(+), 3 deletions(-)
 create mode 100644 tests/system/Router/Controllers/Dash_folder/Home.php

diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php
index ea70c0e954d1..324d02caa6de 100644
--- a/system/Router/AutoRouterImproved.php
+++ b/system/Router/AutoRouterImproved.php
@@ -12,6 +12,8 @@
 namespace CodeIgniter\Router;
 
 use CodeIgniter\Exceptions\PageNotFoundException;
+use ReflectionClass;
+use ReflectionException;
 
 /**
  * New Secure Router for Auto-Routing
@@ -163,7 +165,10 @@ public function getRoute(string $uri): array
             foreach ($this->collection->getRoutes('cli') as $route) {
                 if (is_string($route)) {
                     $route = strtolower($route);
-                    if (strpos($route, $controller . '::' . $methodName) === 0) {
+                    if (strpos(
+                            $route,
+                            $controller . '::' . $methodName
+                        ) === 0) {
                         throw new PageNotFoundException();
                     }
 
@@ -174,9 +179,35 @@ public function getRoute(string $uri): array
             }
         }
 
+        // Check parameters
+        try {
+            $this->checkParameters($uri);
+        } catch (ReflectionException $e) {
+            throw PageNotFoundException::forControllerNotFound($this->controller, $this->method);
+        }
+
         return [$this->directory, $this->controller, $this->method, $this->params];
     }
 
+    private function checkParameters(string $uri)
+    {
+        $refClass  = new ReflectionClass($this->controller);
+        $refMethod = $refClass->getMethod($this->method);
+        $refParams = $refMethod->getParameters();
+
+        if (! $refMethod->isPublic()) {
+            throw PageNotFoundException::forMethodNotFound($this->method);
+        }
+
+        if (count($refParams) < count($this->params)) {
+            throw new PageNotFoundException(
+                'The param count in the URI are greater than the controller method params.'
+                . ' Handler:' . $this->controller . '::' . $this->method
+                . ', URI:' . $uri
+            );
+        }
+    }
+
     /**
      * Scans the controller directory, attempting to locate a controller matching the supplied uri $segments
      *
diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php
index f499452bc768..dc86093acb68 100644
--- a/tests/system/Router/AutoRouterImprovedTest.php
+++ b/tests/system/Router/AutoRouterImprovedTest.php
@@ -35,13 +35,13 @@ protected function setUp(): void
         $this->collection      = new RouteCollection(Services::locator(), $moduleConfig);
     }
 
-    private function createNewAutoRouter(): AutoRouterImproved
+    private function createNewAutoRouter(string $httpVerb = 'get'): AutoRouterImproved
     {
         return new AutoRouterImproved(
             $this->collection,
             'CodeIgniter\Router\Controllers',
             true,
-            'get'
+            $httpVerb
         );
     }
 
@@ -73,6 +73,31 @@ public function testAutoRouteFindsControllerWithFileAndMethod()
         $this->assertSame([], $params);
     }
 
+    public function testFindsControllerAndMethodAndParam()
+    {
+        $router = $this->createNewAutoRouter();
+
+        [$directory, $controller, $method, $params]
+            = $router->getRoute('myController/someMethod/a');
+
+        $this->assertNull($directory);
+        $this->assertSame('\CodeIgniter\Router\Controllers\MyController', $controller);
+        $this->assertSame('getSomeMethod', $method);
+        $this->assertSame(['a'], $params);
+    }
+
+    public function testUriParamCountIsGreaterThanMethodParams()
+    {
+        $this->expectException(PageNotFoundException::class);
+        $this->expectExceptionMessage(
+            'Handler:\CodeIgniter\Router\Controllers\MyController::getSomeMethod, URI:myController/someMethod/a/b'
+        );
+
+        $router = $this->createNewAutoRouter();
+
+        $router->getRoute('myController/someMethod/a/b');
+    }
+
     public function testAutoRouteFindsControllerWithFile()
     {
         $router = $this->createNewAutoRouter();
diff --git a/tests/system/Router/Controllers/Dash_folder/Dash_controller.php b/tests/system/Router/Controllers/Dash_folder/Dash_controller.php
index 621ffac5a256..427a5f26f10f 100644
--- a/tests/system/Router/Controllers/Dash_folder/Dash_controller.php
+++ b/tests/system/Router/Controllers/Dash_folder/Dash_controller.php
@@ -15,4 +15,11 @@
 
 class Dash_controller extends BaseController
 {
+    public function getSomemethod()
+    {
+    }
+
+    public function getDash_method()
+    {
+    }
 }
diff --git a/tests/system/Router/Controllers/Dash_folder/Home.php b/tests/system/Router/Controllers/Dash_folder/Home.php
new file mode 100644
index 000000000000..1f32003552bf
--- /dev/null
+++ b/tests/system/Router/Controllers/Dash_folder/Home.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Router\Controllers\Dash_folder;
+
+use App\Controllers\BaseController;
+
+class Home extends BaseController
+{
+    public function getIndex()
+    {
+    }
+}
diff --git a/tests/system/Router/Controllers/Dash_folder/MyController.php b/tests/system/Router/Controllers/Dash_folder/MyController.php
index cea295165d1c..916dc5619813 100644
--- a/tests/system/Router/Controllers/Dash_folder/MyController.php
+++ b/tests/system/Router/Controllers/Dash_folder/MyController.php
@@ -15,4 +15,7 @@
 
 class MyController extends BaseController
 {
+    public function getSomemethod()
+    {
+    }
 }
diff --git a/tests/system/Router/Controllers/MyController.php b/tests/system/Router/Controllers/MyController.php
index 51f32bfc52eb..431b2a5777b3 100644
--- a/tests/system/Router/Controllers/MyController.php
+++ b/tests/system/Router/Controllers/MyController.php
@@ -15,4 +15,11 @@
 
 class MyController extends BaseController
 {
+    public function getIndex()
+    {
+    }
+
+    public function getSomeMethod($first = '')
+    {
+    }
 }
diff --git a/tests/system/Router/Controllers/Subfolder/MyController.php b/tests/system/Router/Controllers/Subfolder/MyController.php
index 61a436edc83a..c70e1796d27b 100644
--- a/tests/system/Router/Controllers/Subfolder/MyController.php
+++ b/tests/system/Router/Controllers/Subfolder/MyController.php
@@ -15,4 +15,7 @@
 
 class MyController extends BaseController
 {
+    public function getSomeMethod()
+    {
+    }
 }
diff --git a/tests/system/Router/Controllers/Test.php b/tests/system/Router/Controllers/Test.php
index fbf87610ade4..36c859809b65 100644
--- a/tests/system/Router/Controllers/Test.php
+++ b/tests/system/Router/Controllers/Test.php
@@ -18,4 +18,11 @@
  */
 final class Test extends BaseController
 {
+    public function getIndex()
+    {
+    }
+
+    public function postIndex()
+    {
+    }
 }

From a5f8d800de70c8fc8a83f1c77144f860de6e94e2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 9 Apr 2022 18:10:32 +0900
Subject: [PATCH 2044/2325] test: add test for POST method

---
 tests/system/Router/AutoRouterImprovedTest.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php
index dc86093acb68..90369253e499 100644
--- a/tests/system/Router/AutoRouterImprovedTest.php
+++ b/tests/system/Router/AutoRouterImprovedTest.php
@@ -60,6 +60,21 @@ public function testAutoRouteFindsDefaultControllerAndMethodGet()
         $this->assertSame([], $params);
     }
 
+    public function testAutoRouteFindsDefaultControllerAndMethodPost()
+    {
+        $this->collection->setDefaultController('Test');
+
+        $router = $this->createNewAutoRouter('post');
+
+        [$directory, $controller, $method, $params]
+            = $router->getRoute('/');
+
+        $this->assertNull($directory);
+        $this->assertSame('\CodeIgniter\Router\Controllers\Test', $controller);
+        $this->assertSame('postIndex', $method);
+        $this->assertSame([], $params);
+    }
+
     public function testAutoRouteFindsControllerWithFileAndMethod()
     {
         $router = $this->createNewAutoRouter();

From bdac511c3cfa7397a34b9c8e547f3324e5b4ee64 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 9 Apr 2022 19:09:45 +0900
Subject: [PATCH 2045/2325] refactor: improve exception messages

---
 system/Router/AutoRouterImproved.php | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php
index 324d02caa6de..381a8503d2bf 100644
--- a/system/Router/AutoRouterImproved.php
+++ b/system/Router/AutoRouterImproved.php
@@ -127,7 +127,9 @@ public function getRoute(string $uri): array
             strtolower($baseControllerName) === strtolower($this->defaultController)
             && strtolower($controllerSegment) === strtolower($this->defaultController)
         ) {
-            throw PageNotFoundException::forPageNotFound();
+            throw new PageNotFoundException(
+                'Cannot access the default controller "' . $baseControllerName . '" with the controller name URI path.'
+            );
         }
 
         // Use the method name if it exists.
@@ -139,7 +141,9 @@ public function getRoute(string $uri): array
 
             // Prevent access to default method path
             if (strtolower($this->method) === strtolower($this->defaultMethod)) {
-                throw PageNotFoundException::forPageNotFound();
+                throw new PageNotFoundException(
+                    'Cannot access the default method "' . $this->method . '" with the method name URI path.'
+                );
             }
         }
 
@@ -164,16 +168,20 @@ public function getRoute(string $uri): array
 
             foreach ($this->collection->getRoutes('cli') as $route) {
                 if (is_string($route)) {
-                    $route = strtolower($route);
+                    $routeLowerCase = strtolower($route);
                     if (strpos(
-                            $route,
-                            $controller . '::' . $methodName
-                        ) === 0) {
-                        throw new PageNotFoundException();
+                        $routeLowerCase,
+                        $controller . '::' . $methodName
+                    ) === 0) {
+                        throw new PageNotFoundException(
+                            'Cannot access CLI Route Handler: ' . $route
+                        );
                     }
 
-                    if ($route === $controller) {
-                        throw new PageNotFoundException();
+                    if ($routeLowerCase === $controller) {
+                        throw new PageNotFoundException(
+                            'Cannot access CLI Route Handler: ' . $route
+                        );
                     }
                 }
             }

From d7d51744de47c348c87d794230738ddea220aefd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 9 Apr 2022 22:18:36 +0900
Subject: [PATCH 2046/2325] refactor: fix classnames and method names

Follow auto routing naming conventions.
---
 .../system/Router/AutoRouterImprovedTest.php  | 31 ++++++++++---------
 .../{MyController.php => Mycontroller.php}    |  2 +-
 .../{MyController.php => Mycontroller.php}    |  4 +--
 .../{MyController.php => Mycontroller.php}    |  4 +--
 4 files changed, 22 insertions(+), 19 deletions(-)
 rename tests/system/Router/Controllers/Dash_folder/{MyController.php => Mycontroller.php} (90%)
 rename tests/system/Router/Controllers/{MyController.php => Mycontroller.php} (81%)
 rename tests/system/Router/Controllers/Subfolder/{MyController.php => Mycontroller.php} (82%)

diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php
index 90369253e499..2cdf97b03603 100644
--- a/tests/system/Router/AutoRouterImprovedTest.php
+++ b/tests/system/Router/AutoRouterImprovedTest.php
@@ -80,11 +80,11 @@ public function testAutoRouteFindsControllerWithFileAndMethod()
         $router = $this->createNewAutoRouter();
 
         [$directory, $controller, $method, $params]
-            = $router->getRoute('myController/someMethod');
+            = $router->getRoute('mycontroller/somemethod');
 
         $this->assertNull($directory);
-        $this->assertSame('\CodeIgniter\Router\Controllers\MyController', $controller);
-        $this->assertSame('getSomeMethod', $method);
+        $this->assertSame('\CodeIgniter\Router\Controllers\Mycontroller', $controller);
+        $this->assertSame('getSomemethod', $method);
         $this->assertSame([], $params);
     }
 
@@ -93,11 +93,11 @@ public function testFindsControllerAndMethodAndParam()
         $router = $this->createNewAutoRouter();
 
         [$directory, $controller, $method, $params]
-            = $router->getRoute('myController/someMethod/a');
+            = $router->getRoute('mycontroller/somemethod/a');
 
         $this->assertNull($directory);
-        $this->assertSame('\CodeIgniter\Router\Controllers\MyController', $controller);
-        $this->assertSame('getSomeMethod', $method);
+        $this->assertSame('\CodeIgniter\Router\Controllers\Mycontroller', $controller);
+        $this->assertSame('getSomemethod', $method);
         $this->assertSame(['a'], $params);
     }
 
@@ -105,12 +105,12 @@ public function testUriParamCountIsGreaterThanMethodParams()
     {
         $this->expectException(PageNotFoundException::class);
         $this->expectExceptionMessage(
-            'Handler:\CodeIgniter\Router\Controllers\MyController::getSomeMethod, URI:myController/someMethod/a/b'
+            'Handler:\CodeIgniter\Router\Controllers\Mycontroller::getSomemethod, URI:mycontroller/somemethod/a/b'
         );
 
         $router = $this->createNewAutoRouter();
 
-        $router->getRoute('myController/someMethod/a/b');
+        $router->getRoute('mycontroller/somemethod/a/b');
     }
 
     public function testAutoRouteFindsControllerWithFile()
@@ -118,10 +118,10 @@ public function testAutoRouteFindsControllerWithFile()
         $router = $this->createNewAutoRouter();
 
         [$directory, $controller, $method, $params]
-            = $router->getRoute('myController');
+            = $router->getRoute('mycontroller');
 
         $this->assertNull($directory);
-        $this->assertSame('\CodeIgniter\Router\Controllers\MyController', $controller);
+        $this->assertSame('\CodeIgniter\Router\Controllers\Mycontroller', $controller);
         $this->assertSame('getIndex', $method);
         $this->assertSame([], $params);
     }
@@ -131,11 +131,11 @@ public function testAutoRouteFindsControllerWithSubfolder()
         $router = $this->createNewAutoRouter();
 
         [$directory, $controller, $method, $params]
-            = $router->getRoute('subfolder/myController/someMethod');
+            = $router->getRoute('subfolder/mycontroller/somemethod');
 
         $this->assertSame('Subfolder/', $directory);
-        $this->assertSame('\CodeIgniter\Router\Controllers\Subfolder\MyController', $controller);
-        $this->assertSame('getSomeMethod', $method);
+        $this->assertSame('\CodeIgniter\Router\Controllers\Subfolder\Mycontroller', $controller);
+        $this->assertSame('getSomemethod', $method);
         $this->assertSame([], $params);
     }
 
@@ -147,7 +147,10 @@ public function testAutoRouteFindsDashedSubfolder()
             = $router->getRoute('dash-folder/mycontroller/somemethod');
 
         $this->assertSame('Dash_folder/', $directory);
-        $this->assertSame('\CodeIgniter\Router\Controllers\Dash_folder\Mycontroller', $controller);
+        $this->assertSame(
+            '\CodeIgniter\Router\Controllers\Dash_folder\Mycontroller',
+            $controller
+        );
         $this->assertSame('getSomemethod', $method);
         $this->assertSame([], $params);
     }
diff --git a/tests/system/Router/Controllers/Dash_folder/MyController.php b/tests/system/Router/Controllers/Dash_folder/Mycontroller.php
similarity index 90%
rename from tests/system/Router/Controllers/Dash_folder/MyController.php
rename to tests/system/Router/Controllers/Dash_folder/Mycontroller.php
index 916dc5619813..afbc5da7ce31 100644
--- a/tests/system/Router/Controllers/Dash_folder/MyController.php
+++ b/tests/system/Router/Controllers/Dash_folder/Mycontroller.php
@@ -13,7 +13,7 @@
 
 use App\Controllers\BaseController;
 
-class MyController extends BaseController
+class Mycontroller extends BaseController
 {
     public function getSomemethod()
     {
diff --git a/tests/system/Router/Controllers/MyController.php b/tests/system/Router/Controllers/Mycontroller.php
similarity index 81%
rename from tests/system/Router/Controllers/MyController.php
rename to tests/system/Router/Controllers/Mycontroller.php
index 431b2a5777b3..e8ebc50c8e41 100644
--- a/tests/system/Router/Controllers/MyController.php
+++ b/tests/system/Router/Controllers/Mycontroller.php
@@ -13,13 +13,13 @@
 
 use App\Controllers\BaseController;
 
-class MyController extends BaseController
+class Mycontroller extends BaseController
 {
     public function getIndex()
     {
     }
 
-    public function getSomeMethod($first = '')
+    public function getSomemethod($first = '')
     {
     }
 }
diff --git a/tests/system/Router/Controllers/Subfolder/MyController.php b/tests/system/Router/Controllers/Subfolder/Mycontroller.php
similarity index 82%
rename from tests/system/Router/Controllers/Subfolder/MyController.php
rename to tests/system/Router/Controllers/Subfolder/Mycontroller.php
index c70e1796d27b..ff6139d64d73 100644
--- a/tests/system/Router/Controllers/Subfolder/MyController.php
+++ b/tests/system/Router/Controllers/Subfolder/Mycontroller.php
@@ -13,9 +13,9 @@
 
 use App\Controllers\BaseController;
 
-class MyController extends BaseController
+class Mycontroller extends BaseController
 {
-    public function getSomeMethod()
+    public function getSomemethod()
     {
     }
 }

From b69138745e5cec3a0cb956001fd59e155be4b5da Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 10 Apr 2022 09:22:09 +0900
Subject: [PATCH 2047/2325] test: rename Controllers/Test

It is better not to use sample controller class `Test` in tests/ folder.
---
 tests/system/Router/AutoRouterImprovedTest.php         | 10 +++++-----
 .../system/Router/Controllers/{Test.php => Index.php}  |  5 +----
 2 files changed, 6 insertions(+), 9 deletions(-)
 rename tests/system/Router/Controllers/{Test.php => Index.php} (87%)

diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php
index 2cdf97b03603..1e6bf3c26d98 100644
--- a/tests/system/Router/AutoRouterImprovedTest.php
+++ b/tests/system/Router/AutoRouterImprovedTest.php
@@ -47,7 +47,7 @@ private function createNewAutoRouter(string $httpVerb = 'get'): AutoRouterImprov
 
     public function testAutoRouteFindsDefaultControllerAndMethodGet()
     {
-        $this->collection->setDefaultController('Test');
+        $this->collection->setDefaultController('Index');
 
         $router = $this->createNewAutoRouter();
 
@@ -55,14 +55,14 @@ public function testAutoRouteFindsDefaultControllerAndMethodGet()
             = $router->getRoute('/');
 
         $this->assertNull($directory);
-        $this->assertSame('\CodeIgniter\Router\Controllers\Test', $controller);
+        $this->assertSame('\CodeIgniter\Router\Controllers\Index', $controller);
         $this->assertSame('getIndex', $method);
         $this->assertSame([], $params);
     }
 
     public function testAutoRouteFindsDefaultControllerAndMethodPost()
     {
-        $this->collection->setDefaultController('Test');
+        $this->collection->setDefaultController('Index');
 
         $router = $this->createNewAutoRouter('post');
 
@@ -70,7 +70,7 @@ public function testAutoRouteFindsDefaultControllerAndMethodPost()
             = $router->getRoute('/');
 
         $this->assertNull($directory);
-        $this->assertSame('\CodeIgniter\Router\Controllers\Test', $controller);
+        $this->assertSame('\CodeIgniter\Router\Controllers\Index', $controller);
         $this->assertSame('postIndex', $method);
         $this->assertSame([], $params);
     }
@@ -245,6 +245,6 @@ public function testRejectsDefaultMethodPath()
 
         $router = $this->createNewAutoRouter();
 
-        $router->getRoute('test/index');
+        $router->getRoute('mycontroller/index');
     }
 }
diff --git a/tests/system/Router/Controllers/Test.php b/tests/system/Router/Controllers/Index.php
similarity index 87%
rename from tests/system/Router/Controllers/Test.php
rename to tests/system/Router/Controllers/Index.php
index 36c859809b65..c4b494a787aa 100644
--- a/tests/system/Router/Controllers/Test.php
+++ b/tests/system/Router/Controllers/Index.php
@@ -13,10 +13,7 @@
 
 use App\Controllers\BaseController;
 
-/**
- * @internal
- */
-final class Test extends BaseController
+class Index extends BaseController
 {
     public function getIndex()
     {

From dcd8ba7d0686c72cfae14ab0af8a995c67fb4f60 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 10 Apr 2022 09:38:31 +0900
Subject: [PATCH 2048/2325] feat: AutoRouterImproved does not support _remap()

It makes the router complex.
---
 system/Router/AutoRouterImproved.php          | 18 +++++++++
 .../system/Router/AutoRouterImprovedTest.php  | 12 ++++++
 tests/system/Router/Controllers/Remap.php     | 39 +++++++++++++++++++
 3 files changed, 69 insertions(+)
 create mode 100644 tests/system/Router/Controllers/Remap.php

diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php
index 381a8503d2bf..6584ad9846fb 100644
--- a/system/Router/AutoRouterImproved.php
+++ b/system/Router/AutoRouterImproved.php
@@ -187,6 +187,9 @@ public function getRoute(string $uri): array
             }
         }
 
+        // Check _remao()
+        $this->checkRemap();
+
         // Check parameters
         try {
             $this->checkParameters($uri);
@@ -216,6 +219,21 @@ private function checkParameters(string $uri)
         }
     }
 
+    private function checkRemap()
+    {
+        try {
+            $refClass  = new ReflectionClass($this->controller);
+            $refMethod = $refClass->getMethod('_remap');
+
+            throw new PageNotFoundException(
+                'AutoRouterImproved does not support `_remap()` method.'
+                . ' Controller:' . $this->controller
+            );
+        } catch (ReflectionException $e) {
+            // Do nothing.
+        }
+    }
+
     /**
      * Scans the controller directory, attempting to locate a controller matching the supplied uri $segments
      *
diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php
index 1e6bf3c26d98..4553582dc4e1 100644
--- a/tests/system/Router/AutoRouterImprovedTest.php
+++ b/tests/system/Router/AutoRouterImprovedTest.php
@@ -247,4 +247,16 @@ public function testRejectsDefaultMethodPath()
 
         $router->getRoute('mycontroller/index');
     }
+
+    public function testRejectsControllerWithRemapMethod()
+    {
+        $this->expectException(PageNotFoundException::class);
+        $this->expectExceptionMessage(
+            'AutoRouterImproved does not support `_remap()` method. Controller:\CodeIgniter\Router\Controllers\Remap'
+        );
+
+        $router = $this->createNewAutoRouter();
+
+        $router->getRoute('remap/test');
+    }
 }
diff --git a/tests/system/Router/Controllers/Remap.php b/tests/system/Router/Controllers/Remap.php
new file mode 100644
index 000000000000..ac87a65021c6
--- /dev/null
+++ b/tests/system/Router/Controllers/Remap.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Router\Controllers;
+
+use App\Controllers\BaseController;
+use CodeIgniter\Exceptions\PageNotFoundException;
+
+class Remap extends BaseController
+{
+    public function _remap(string $method, ...$params): string
+    {
+        $method = 'process_' . $method;
+
+        if (method_exists($this, $method)) {
+            return $this->{$method}(...$params);
+        }
+
+        throw PageNotFoundException::forPageNotFound();
+    }
+
+    public function getTest(): string
+    {
+        return __METHOD__;
+    }
+
+    protected function process_index(): string
+    {
+        return __METHOD__;
+    }
+}

From 8e89710b6d46599af2bc7020db1b414b9863cd7b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 10 Apr 2022 09:44:34 +0900
Subject: [PATCH 2049/2325] refactor: extract protectDefinedCliRoutes() method

---
 system/Router/AutoRouterImproved.php | 29 ++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php
index 6584ad9846fb..b0531aedb210 100644
--- a/system/Router/AutoRouterImproved.php
+++ b/system/Router/AutoRouterImproved.php
@@ -162,6 +162,23 @@ public function getRoute(string $uri): array
         );
 
         // Ensure routes registered via $routes->cli() are not accessible via web.
+        $this->protectDefinedCliRoutes();
+
+        // Check _remao()
+        $this->checkRemap();
+
+        // Check parameters
+        try {
+            $this->checkParameters($uri);
+        } catch (ReflectionException $e) {
+            throw PageNotFoundException::forControllerNotFound($this->controller, $this->method);
+        }
+
+        return [$this->directory, $this->controller, $this->method, $this->params];
+    }
+
+    private function protectDefinedCliRoutes()
+    {
         if ($this->httpVerb !== 'cli') {
             $controller = strtolower($this->controller);
             $methodName = strtolower($this->method);
@@ -186,18 +203,6 @@ public function getRoute(string $uri): array
                 }
             }
         }
-
-        // Check _remao()
-        $this->checkRemap();
-
-        // Check parameters
-        try {
-            $this->checkParameters($uri);
-        } catch (ReflectionException $e) {
-            throw PageNotFoundException::forControllerNotFound($this->controller, $this->method);
-        }
-
-        return [$this->directory, $this->controller, $this->method, $this->params];
     }
 
     private function checkParameters(string $uri)

From f0f212bcb5b2909410ba4473be2e31b427a68ab6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Apr 2022 12:47:42 +0900
Subject: [PATCH 2050/2325] fix: update __construct() and
 protectDefinedCliRoutes() in AutoRouterImproved

---
 system/Router/AutoRouterImproved.php          | 51 +++++++++----------
 system/Router/Router.php                      |  4 +-
 .../system/Router/AutoRouterImprovedTest.php  |  4 +-
 3 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php
index b0531aedb210..a99368184f44 100644
--- a/system/Router/AutoRouterImproved.php
+++ b/system/Router/AutoRouterImproved.php
@@ -21,9 +21,11 @@
 class AutoRouterImproved implements AutoRouterInterface
 {
     /**
-     * A RouteCollection instance.
+     * Controller list that can't be accessible.
+     *
+     * @var class-string[]
      */
-    protected RouteCollectionInterface $collection;
+    protected array $protectedControllers;
 
     /**
      * Sub-directory that contains the requested controller class.
@@ -76,19 +78,24 @@ class AutoRouterImproved implements AutoRouterInterface
      */
     protected string $defaultMethod;
 
+    /**
+     * @param class-string[] $protectedControllers
+     * @param string         $defaultController    Short classname
+     */
     public function __construct(
-        RouteCollectionInterface $routes,
+        array $protectedControllers,
         string $namespace,
+        string $defaultController,
+        string $defaultMethod,
         bool $translateURIDashes,
         string $httpVerb
     ) {
-        $this->collection         = $routes;
-        $this->namespace          = rtrim($namespace, '\\') . '\\';
-        $this->translateURIDashes = $translateURIDashes;
-        $this->httpVerb           = $httpVerb;
-
-        $this->defaultController = $this->collection->getDefaultController();
-        $this->defaultMethod     = $httpVerb . ucfirst($this->collection->getDefaultMethod());
+        $this->protectedControllers = $protectedControllers;
+        $this->namespace            = rtrim($namespace, '\\') . '\\';
+        $this->translateURIDashes   = $translateURIDashes;
+        $this->httpVerb             = $httpVerb;
+        $this->defaultController    = $defaultController;
+        $this->defaultMethod        = $httpVerb . ucfirst($defaultMethod);
 
         // Set the default values
         $this->controller = $this->defaultController;
@@ -183,23 +190,13 @@ private function protectDefinedCliRoutes()
             $controller = strtolower($this->controller);
             $methodName = strtolower($this->method);
 
-            foreach ($this->collection->getRoutes('cli') as $route) {
-                if (is_string($route)) {
-                    $routeLowerCase = strtolower($route);
-                    if (strpos(
-                        $routeLowerCase,
-                        $controller . '::' . $methodName
-                    ) === 0) {
-                        throw new PageNotFoundException(
-                            'Cannot access CLI Route Handler: ' . $route
-                        );
-                    }
-
-                    if ($routeLowerCase === $controller) {
-                        throw new PageNotFoundException(
-                            'Cannot access CLI Route Handler: ' . $route
-                        );
-                    }
+            foreach ($this->protectedControllers as $controllerInRoutes) {
+                $routeLowerCase = strtolower($controllerInRoutes);
+
+                if ($routeLowerCase === $controller) {
+                    throw new PageNotFoundException(
+                        'Cannot access CLI Route Handler: ' . $controllerInRoutes
+                    );
                 }
             }
         }
diff --git a/system/Router/Router.php b/system/Router/Router.php
index ec51c3ef1e3e..113a92fbde0f 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -134,8 +134,10 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request
             $autoRoutesImproved = config('Feature')->autoRoutesImproved ?? false;
             if ($autoRoutesImproved) {
                 $this->autoRouter = new AutoRouterImproved(
-                    $this->collection,
+                    $this->collection->getRegisteredControllers('*'),
                     $this->collection->getDefaultNamespace(),
+                    $this->collection->getDefaultController(),
+                    $this->collection->getDefaultMethod(),
                     $this->translateURIDashes,
                     $this->collection->getHTTPVerb()
                 );
diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php
index 4553582dc4e1..81bc03b8999e 100644
--- a/tests/system/Router/AutoRouterImprovedTest.php
+++ b/tests/system/Router/AutoRouterImprovedTest.php
@@ -38,8 +38,10 @@ protected function setUp(): void
     private function createNewAutoRouter(string $httpVerb = 'get'): AutoRouterImproved
     {
         return new AutoRouterImproved(
-            $this->collection,
+            [],
             'CodeIgniter\Router\Controllers',
+            'Home',
+            'index',
             true,
             $httpVerb
         );

From 3fd4182e45c781f6d48bb1381f77c52bb9fe85a2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Apr 2022 12:54:38 +0900
Subject: [PATCH 2051/2325] chore: updatte phpstan-baseline.neon.dist

---
 phpstan-baseline.neon.dist | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index d7a30aab6a3b..4b3938eccbae 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -706,8 +706,8 @@ parameters:
 			path: system/Router/Router.php
 
 		-
-			message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRegisteredControllers\\(\\)\\.$#"
-			count: 1
+			message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRegisteredControllers\\(.*\\)\\.$#"
+			count: 2
 			path: system/Router/Router.php
 
 		-
@@ -720,11 +720,6 @@ parameters:
 			count: 1
 			path: system/Router/Router.php
 
-		-
-			message: "#^Method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRoutes\\(\\) invoked with 1 parameter, 0 required\\.$#"
-			count: 1
-			path: system/Router/AutoRouterImproved.php
-
 		-
 			message: "#^Property Config\\\\App\\:\\:\\$CSRF[a-zA-Z]+ \\([a-zA-Z]+\\) on left side of \\?\\? is not nullable\\.$#"
 			count: 6

From ddfa0d7dd95370ae09bdd2befc4b830770f43829 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Apr 2022 12:55:02 +0900
Subject: [PATCH 2052/2325] docs: add @var

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

diff --git a/system/Router/AutoRouter.php b/system/Router/AutoRouter.php
index f6b44eac9431..ca5f3301c941 100644
--- a/system/Router/AutoRouter.php
+++ b/system/Router/AutoRouter.php
@@ -20,6 +20,8 @@ class AutoRouter implements AutoRouterInterface
 {
     /**
      * List of controllers registered for the CLI verb that should not be accessed in the web.
+     *
+     * @var class-string[]
      */
     protected array $protectedControllers;
 

From c253b61b565f97913e1e75599d1bde57a1f9ebdd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Apr 2022 12:56:14 +0900
Subject: [PATCH 2053/2325] refactor: rename method name

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

diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php
index a99368184f44..238712c461c9 100644
--- a/system/Router/AutoRouterImproved.php
+++ b/system/Router/AutoRouterImproved.php
@@ -169,7 +169,7 @@ public function getRoute(string $uri): array
         );
 
         // Ensure routes registered via $routes->cli() are not accessible via web.
-        $this->protectDefinedCliRoutes();
+        $this->protectDefinedRoutes();
 
         // Check _remao()
         $this->checkRemap();
@@ -184,7 +184,7 @@ public function getRoute(string $uri): array
         return [$this->directory, $this->controller, $this->method, $this->params];
     }
 
-    private function protectDefinedCliRoutes()
+    private function protectDefinedRoutes()
     {
         if ($this->httpVerb !== 'cli') {
             $controller = strtolower($this->controller);

From a090a6496b8ec6750634ac879ee4c55f13353fdb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Apr 2022 13:01:23 +0900
Subject: [PATCH 2054/2325] test: fix tests

---
 tests/system/Router/AutoRouterImprovedTest.php | 4 ++--
 tests/system/Router/Controllers/Home.php       | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php
index 81bc03b8999e..296765f5fa05 100644
--- a/tests/system/Router/AutoRouterImprovedTest.php
+++ b/tests/system/Router/AutoRouterImprovedTest.php
@@ -40,8 +40,8 @@ private function createNewAutoRouter(string $httpVerb = 'get'): AutoRouterImprov
         return new AutoRouterImproved(
             [],
             'CodeIgniter\Router\Controllers',
-            'Home',
-            'index',
+            $this->collection->getDefaultController(),
+            $this->collection->getDefaultMethod(),
             true,
             $httpVerb
         );
diff --git a/tests/system/Router/Controllers/Home.php b/tests/system/Router/Controllers/Home.php
index f9931de7a484..4d524bb15c6d 100644
--- a/tests/system/Router/Controllers/Home.php
+++ b/tests/system/Router/Controllers/Home.php
@@ -15,4 +15,11 @@
 
 class Home extends BaseController
 {
+    public function getIndex()
+    {
+    }
+
+    public function postIndex()
+    {
+    }
 }

From 8f3365a7d99087af436915d57a34e27fdf02698d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Apr 2022 13:28:39 +0900
Subject: [PATCH 2055/2325] refactor: vendor/bin/rector process

---
 system/Router/AutoRouterImproved.php | 5 ++---
 system/Router/Router.php             | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php
index 238712c461c9..e2126a791f3b 100644
--- a/system/Router/AutoRouterImproved.php
+++ b/system/Router/AutoRouterImproved.php
@@ -188,7 +188,6 @@ private function protectDefinedRoutes()
     {
         if ($this->httpVerb !== 'cli') {
             $controller = strtolower($this->controller);
-            $methodName = strtolower($this->method);
 
             foreach ($this->protectedControllers as $controllerInRoutes) {
                 $routeLowerCase = strtolower($controllerInRoutes);
@@ -224,8 +223,8 @@ private function checkParameters(string $uri)
     private function checkRemap()
     {
         try {
-            $refClass  = new ReflectionClass($this->controller);
-            $refMethod = $refClass->getMethod('_remap');
+            $refClass = new ReflectionClass($this->controller);
+            $refClass->getMethod('_remap');
 
             throw new PageNotFoundException(
                 'AutoRouterImproved does not support `_remap()` method.'
diff --git a/system/Router/Router.php b/system/Router/Router.php
index 113a92fbde0f..ef0996938ccd 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -604,8 +604,6 @@ public function setDirectory(?string $dir = null, bool $append = false, bool $va
 
         if ($this->autoRouter instanceof AutoRouter) {
             $this->autoRouter->setDirectory($dir, $append, $validate);
-
-            return;
         }
     }
 

From 9fc97e798a7c9f65ad0d242227277fffd373448b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 12 Apr 2022 13:30:37 +0900
Subject: [PATCH 2056/2325] refactor: add return types

---
 system/Router/AutoRouterImproved.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php
index e2126a791f3b..759f90d5747d 100644
--- a/system/Router/AutoRouterImproved.php
+++ b/system/Router/AutoRouterImproved.php
@@ -184,7 +184,7 @@ public function getRoute(string $uri): array
         return [$this->directory, $this->controller, $this->method, $this->params];
     }
 
-    private function protectDefinedRoutes()
+    private function protectDefinedRoutes(): void
     {
         if ($this->httpVerb !== 'cli') {
             $controller = strtolower($this->controller);
@@ -201,7 +201,7 @@ private function protectDefinedRoutes()
         }
     }
 
-    private function checkParameters(string $uri)
+    private function checkParameters(string $uri): void
     {
         $refClass  = new ReflectionClass($this->controller);
         $refMethod = $refClass->getMethod($this->method);
@@ -220,7 +220,7 @@ private function checkParameters(string $uri)
         }
     }
 
-    private function checkRemap()
+    private function checkRemap(): void
     {
         try {
             $refClass = new ReflectionClass($this->controller);
@@ -298,7 +298,7 @@ private function isValidSegment(string $segment): bool
      *
      * @param bool $validate if true, checks to make sure $dir consists of only PSR4 compliant segments
      */
-    private function setSubNamespace(?string $namespace = null, bool $append = false, bool $validate = true)
+    private function setSubNamespace(?string $namespace = null, bool $append = false, bool $validate = true): void
     {
         if ($validate) {
             $segments = explode('/', trim($namespace, '/'));

From 3cff22c23c2952f4fe99862b2d59c62e55c2a0e5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 13 Apr 2022 13:34:34 +0900
Subject: [PATCH 2057/2325] test: remove using BaseController because of
 rector's error

Error: ] Could not process "tests/system/Router/AutoRouterImprovedTest.php"
         file, due to:
         "System error: "Class 'App\Controllers\BaseController' not found"
         Run Rector with "--debug" option and post the report here:
         https://github.com/rectorphp/rector/issues/new". On line: 16
---
 .../system/Router/Controllers/Dash_folder/Dash_controller.php | 4 ++--
 tests/system/Router/Controllers/Dash_folder/Home.php          | 4 ++--
 tests/system/Router/Controllers/Dash_folder/Mycontroller.php  | 4 ++--
 tests/system/Router/Controllers/Home.php                      | 4 ++--
 tests/system/Router/Controllers/Index.php                     | 4 ++--
 tests/system/Router/Controllers/Mycontroller.php              | 4 ++--
 tests/system/Router/Controllers/Remap.php                     | 4 ++--
 tests/system/Router/Controllers/Subfolder/Mycontroller.php    | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/system/Router/Controllers/Dash_folder/Dash_controller.php b/tests/system/Router/Controllers/Dash_folder/Dash_controller.php
index 427a5f26f10f..52736f751b2f 100644
--- a/tests/system/Router/Controllers/Dash_folder/Dash_controller.php
+++ b/tests/system/Router/Controllers/Dash_folder/Dash_controller.php
@@ -11,9 +11,9 @@
 
 namespace CodeIgniter\Router\Controllers\Dash_folder;
 
-use App\Controllers\BaseController;
+use CodeIgniter\Controller;
 
-class Dash_controller extends BaseController
+class Dash_controller extends Controller
 {
     public function getSomemethod()
     {
diff --git a/tests/system/Router/Controllers/Dash_folder/Home.php b/tests/system/Router/Controllers/Dash_folder/Home.php
index 1f32003552bf..60ca6ce6c853 100644
--- a/tests/system/Router/Controllers/Dash_folder/Home.php
+++ b/tests/system/Router/Controllers/Dash_folder/Home.php
@@ -11,9 +11,9 @@
 
 namespace CodeIgniter\Router\Controllers\Dash_folder;
 
-use App\Controllers\BaseController;
+use CodeIgniter\Controller;
 
-class Home extends BaseController
+class Home extends Controller
 {
     public function getIndex()
     {
diff --git a/tests/system/Router/Controllers/Dash_folder/Mycontroller.php b/tests/system/Router/Controllers/Dash_folder/Mycontroller.php
index afbc5da7ce31..a5d5ba65fc6a 100644
--- a/tests/system/Router/Controllers/Dash_folder/Mycontroller.php
+++ b/tests/system/Router/Controllers/Dash_folder/Mycontroller.php
@@ -11,9 +11,9 @@
 
 namespace CodeIgniter\Router\Controllers\Dash_folder;
 
-use App\Controllers\BaseController;
+use CodeIgniter\Controller;
 
-class Mycontroller extends BaseController
+class Mycontroller extends Controller
 {
     public function getSomemethod()
     {
diff --git a/tests/system/Router/Controllers/Home.php b/tests/system/Router/Controllers/Home.php
index 4d524bb15c6d..e4411e4ae592 100644
--- a/tests/system/Router/Controllers/Home.php
+++ b/tests/system/Router/Controllers/Home.php
@@ -11,9 +11,9 @@
 
 namespace CodeIgniter\Router\Controllers;
 
-use App\Controllers\BaseController;
+use CodeIgniter\Controller;
 
-class Home extends BaseController
+class Home extends Controller
 {
     public function getIndex()
     {
diff --git a/tests/system/Router/Controllers/Index.php b/tests/system/Router/Controllers/Index.php
index c4b494a787aa..bfc3539e0b1f 100644
--- a/tests/system/Router/Controllers/Index.php
+++ b/tests/system/Router/Controllers/Index.php
@@ -11,9 +11,9 @@
 
 namespace CodeIgniter\Router\Controllers;
 
-use App\Controllers\BaseController;
+use CodeIgniter\Controller;
 
-class Index extends BaseController
+class Index extends Controller
 {
     public function getIndex()
     {
diff --git a/tests/system/Router/Controllers/Mycontroller.php b/tests/system/Router/Controllers/Mycontroller.php
index e8ebc50c8e41..dc7f72a21dc5 100644
--- a/tests/system/Router/Controllers/Mycontroller.php
+++ b/tests/system/Router/Controllers/Mycontroller.php
@@ -11,9 +11,9 @@
 
 namespace CodeIgniter\Router\Controllers;
 
-use App\Controllers\BaseController;
+use CodeIgniter\Controller;
 
-class Mycontroller extends BaseController
+class Mycontroller extends Controller
 {
     public function getIndex()
     {
diff --git a/tests/system/Router/Controllers/Remap.php b/tests/system/Router/Controllers/Remap.php
index ac87a65021c6..ca56c9d90ce0 100644
--- a/tests/system/Router/Controllers/Remap.php
+++ b/tests/system/Router/Controllers/Remap.php
@@ -11,10 +11,10 @@
 
 namespace CodeIgniter\Router\Controllers;
 
-use App\Controllers\BaseController;
+use CodeIgniter\Controller;
 use CodeIgniter\Exceptions\PageNotFoundException;
 
-class Remap extends BaseController
+class Remap extends Controller
 {
     public function _remap(string $method, ...$params): string
     {
diff --git a/tests/system/Router/Controllers/Subfolder/Mycontroller.php b/tests/system/Router/Controllers/Subfolder/Mycontroller.php
index ff6139d64d73..9ab632a0fd98 100644
--- a/tests/system/Router/Controllers/Subfolder/Mycontroller.php
+++ b/tests/system/Router/Controllers/Subfolder/Mycontroller.php
@@ -11,9 +11,9 @@
 
 namespace CodeIgniter\Router\Controllers\Subfolder;
 
-use App\Controllers\BaseController;
+use CodeIgniter\Controller;
 
-class Mycontroller extends BaseController
+class Mycontroller extends Controller
 {
     public function getSomemethod()
     {

From c8b1e4117e4883f8452a43e4f74cf554f49cfdcc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 13 Apr 2022 13:36:15 +0900
Subject: [PATCH 2058/2325] refactor: vendor/bin/rector process

---
 .../system/Router/AutoRouterImprovedTest.php  | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php
index 296765f5fa05..9a062754a4e9 100644
--- a/tests/system/Router/AutoRouterImprovedTest.php
+++ b/tests/system/Router/AutoRouterImprovedTest.php
@@ -13,6 +13,10 @@
 
 use CodeIgniter\Config\Services;
 use CodeIgniter\Exceptions\PageNotFoundException;
+use CodeIgniter\Router\Controllers\Dash_folder\Dash_controller;
+use CodeIgniter\Router\Controllers\Dash_folder\Home;
+use CodeIgniter\Router\Controllers\Index;
+use CodeIgniter\Router\Controllers\Mycontroller;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\Modules;
 
@@ -21,10 +25,7 @@
  */
 final class AutoRouterImprovedTest extends CIUnitTestCase
 {
-    /**
-     * @var RouteCollection
-     */
-    protected $collection;
+    protected RouteCollection $collection;
 
     protected function setUp(): void
     {
@@ -57,7 +58,7 @@ public function testAutoRouteFindsDefaultControllerAndMethodGet()
             = $router->getRoute('/');
 
         $this->assertNull($directory);
-        $this->assertSame('\CodeIgniter\Router\Controllers\Index', $controller);
+        $this->assertSame(Index::class, $controller);
         $this->assertSame('getIndex', $method);
         $this->assertSame([], $params);
     }
@@ -72,7 +73,7 @@ public function testAutoRouteFindsDefaultControllerAndMethodPost()
             = $router->getRoute('/');
 
         $this->assertNull($directory);
-        $this->assertSame('\CodeIgniter\Router\Controllers\Index', $controller);
+        $this->assertSame(Index::class, $controller);
         $this->assertSame('postIndex', $method);
         $this->assertSame([], $params);
     }
@@ -85,7 +86,7 @@ public function testAutoRouteFindsControllerWithFileAndMethod()
             = $router->getRoute('mycontroller/somemethod');
 
         $this->assertNull($directory);
-        $this->assertSame('\CodeIgniter\Router\Controllers\Mycontroller', $controller);
+        $this->assertSame(Mycontroller::class, $controller);
         $this->assertSame('getSomemethod', $method);
         $this->assertSame([], $params);
     }
@@ -98,7 +99,7 @@ public function testFindsControllerAndMethodAndParam()
             = $router->getRoute('mycontroller/somemethod/a');
 
         $this->assertNull($directory);
-        $this->assertSame('\CodeIgniter\Router\Controllers\Mycontroller', $controller);
+        $this->assertSame(Mycontroller::class, $controller);
         $this->assertSame('getSomemethod', $method);
         $this->assertSame(['a'], $params);
     }
@@ -123,7 +124,7 @@ public function testAutoRouteFindsControllerWithFile()
             = $router->getRoute('mycontroller');
 
         $this->assertNull($directory);
-        $this->assertSame('\CodeIgniter\Router\Controllers\Mycontroller', $controller);
+        $this->assertSame(Mycontroller::class, $controller);
         $this->assertSame('getIndex', $method);
         $this->assertSame([], $params);
     }
@@ -136,7 +137,7 @@ public function testAutoRouteFindsControllerWithSubfolder()
             = $router->getRoute('subfolder/mycontroller/somemethod');
 
         $this->assertSame('Subfolder/', $directory);
-        $this->assertSame('\CodeIgniter\Router\Controllers\Subfolder\Mycontroller', $controller);
+        $this->assertSame(\CodeIgniter\Router\Controllers\Subfolder\Mycontroller::class, $controller);
         $this->assertSame('getSomemethod', $method);
         $this->assertSame([], $params);
     }
@@ -150,7 +151,7 @@ public function testAutoRouteFindsDashedSubfolder()
 
         $this->assertSame('Dash_folder/', $directory);
         $this->assertSame(
-            '\CodeIgniter\Router\Controllers\Dash_folder\Mycontroller',
+            \CodeIgniter\Router\Controllers\Dash_folder\Mycontroller::class,
             $controller
         );
         $this->assertSame('getSomemethod', $method);
@@ -165,7 +166,7 @@ public function testAutoRouteFindsDashedController()
             = $router->getRoute('dash-folder/dash-controller/somemethod');
 
         $this->assertSame('Dash_folder/', $directory);
-        $this->assertSame('\CodeIgniter\Router\Controllers\Dash_folder\Dash_controller', $controller);
+        $this->assertSame(Dash_controller::class, $controller);
         $this->assertSame('getSomemethod', $method);
         $this->assertSame([], $params);
     }
@@ -178,7 +179,7 @@ public function testAutoRouteFindsDashedMethod()
             = $router->getRoute('dash-folder/dash-controller/dash-method');
 
         $this->assertSame('Dash_folder/', $directory);
-        $this->assertSame('\CodeIgniter\Router\Controllers\Dash_folder\Dash_controller', $controller);
+        $this->assertSame(Dash_controller::class, $controller);
         $this->assertSame('getDash_method', $method);
         $this->assertSame([], $params);
     }
@@ -191,7 +192,7 @@ public function testAutoRouteFindsDefaultDashFolder()
             = $router->getRoute('dash-folder');
 
         $this->assertSame('Dash_folder/', $directory);
-        $this->assertSame('\CodeIgniter\Router\Controllers\Dash_folder\Home', $controller);
+        $this->assertSame(Home::class, $controller);
         $this->assertSame('getIndex', $method);
         $this->assertSame([], $params);
     }

From e6eaf71e8fb56a90809f3499c48d41da7a0d5217 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 13 Apr 2022 13:49:38 +0900
Subject: [PATCH 2059/2325] test: fix tests that rector broke

---
 .../system/Router/AutoRouterImprovedTest.php  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php
index 9a062754a4e9..592ce9db1efc 100644
--- a/tests/system/Router/AutoRouterImprovedTest.php
+++ b/tests/system/Router/AutoRouterImprovedTest.php
@@ -58,7 +58,7 @@ public function testAutoRouteFindsDefaultControllerAndMethodGet()
             = $router->getRoute('/');
 
         $this->assertNull($directory);
-        $this->assertSame(Index::class, $controller);
+        $this->assertSame('\\' . Index::class, $controller);
         $this->assertSame('getIndex', $method);
         $this->assertSame([], $params);
     }
@@ -73,7 +73,7 @@ public function testAutoRouteFindsDefaultControllerAndMethodPost()
             = $router->getRoute('/');
 
         $this->assertNull($directory);
-        $this->assertSame(Index::class, $controller);
+        $this->assertSame('\\' . Index::class, $controller);
         $this->assertSame('postIndex', $method);
         $this->assertSame([], $params);
     }
@@ -86,7 +86,7 @@ public function testAutoRouteFindsControllerWithFileAndMethod()
             = $router->getRoute('mycontroller/somemethod');
 
         $this->assertNull($directory);
-        $this->assertSame(Mycontroller::class, $controller);
+        $this->assertSame('\\' . Mycontroller::class, $controller);
         $this->assertSame('getSomemethod', $method);
         $this->assertSame([], $params);
     }
@@ -99,7 +99,7 @@ public function testFindsControllerAndMethodAndParam()
             = $router->getRoute('mycontroller/somemethod/a');
 
         $this->assertNull($directory);
-        $this->assertSame(Mycontroller::class, $controller);
+        $this->assertSame('\\' . Mycontroller::class, $controller);
         $this->assertSame('getSomemethod', $method);
         $this->assertSame(['a'], $params);
     }
@@ -124,7 +124,7 @@ public function testAutoRouteFindsControllerWithFile()
             = $router->getRoute('mycontroller');
 
         $this->assertNull($directory);
-        $this->assertSame(Mycontroller::class, $controller);
+        $this->assertSame('\\' . Mycontroller::class, $controller);
         $this->assertSame('getIndex', $method);
         $this->assertSame([], $params);
     }
@@ -137,7 +137,7 @@ public function testAutoRouteFindsControllerWithSubfolder()
             = $router->getRoute('subfolder/mycontroller/somemethod');
 
         $this->assertSame('Subfolder/', $directory);
-        $this->assertSame(\CodeIgniter\Router\Controllers\Subfolder\Mycontroller::class, $controller);
+        $this->assertSame('\\' . \CodeIgniter\Router\Controllers\Subfolder\Mycontroller::class, $controller);
         $this->assertSame('getSomemethod', $method);
         $this->assertSame([], $params);
     }
@@ -151,7 +151,7 @@ public function testAutoRouteFindsDashedSubfolder()
 
         $this->assertSame('Dash_folder/', $directory);
         $this->assertSame(
-            \CodeIgniter\Router\Controllers\Dash_folder\Mycontroller::class,
+            '\\' . \CodeIgniter\Router\Controllers\Dash_folder\Mycontroller::class,
             $controller
         );
         $this->assertSame('getSomemethod', $method);
@@ -166,7 +166,7 @@ public function testAutoRouteFindsDashedController()
             = $router->getRoute('dash-folder/dash-controller/somemethod');
 
         $this->assertSame('Dash_folder/', $directory);
-        $this->assertSame(Dash_controller::class, $controller);
+        $this->assertSame('\\' . Dash_controller::class, $controller);
         $this->assertSame('getSomemethod', $method);
         $this->assertSame([], $params);
     }
@@ -179,7 +179,7 @@ public function testAutoRouteFindsDashedMethod()
             = $router->getRoute('dash-folder/dash-controller/dash-method');
 
         $this->assertSame('Dash_folder/', $directory);
-        $this->assertSame(Dash_controller::class, $controller);
+        $this->assertSame('\\' . Dash_controller::class, $controller);
         $this->assertSame('getDash_method', $method);
         $this->assertSame([], $params);
     }
@@ -192,7 +192,7 @@ public function testAutoRouteFindsDefaultDashFolder()
             = $router->getRoute('dash-folder');
 
         $this->assertSame('Dash_folder/', $directory);
-        $this->assertSame(Home::class, $controller);
+        $this->assertSame('\\' . Home::class, $controller);
         $this->assertSame('getIndex', $method);
         $this->assertSame([], $params);
     }

From 97dcb469718fed81b1292f5f47c11e88070f1f5c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 20 Apr 2022 17:38:04 +0900
Subject: [PATCH 2060/2325] fix: protectDefinedRoutes()

Remove unneeded if condition.
Fix exception message.
---
 system/Router/AutoRouterImproved.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php
index 759f90d5747d..07f75ddcd989 100644
--- a/system/Router/AutoRouterImproved.php
+++ b/system/Router/AutoRouterImproved.php
@@ -186,17 +186,15 @@ public function getRoute(string $uri): array
 
     private function protectDefinedRoutes(): void
     {
-        if ($this->httpVerb !== 'cli') {
-            $controller = strtolower($this->controller);
+        $controller = strtolower($this->controller);
 
-            foreach ($this->protectedControllers as $controllerInRoutes) {
-                $routeLowerCase = strtolower($controllerInRoutes);
+        foreach ($this->protectedControllers as $controllerInRoutes) {
+            $routeLowerCase = strtolower($controllerInRoutes);
 
-                if ($routeLowerCase === $controller) {
-                    throw new PageNotFoundException(
-                        'Cannot access CLI Route Handler: ' . $controllerInRoutes
-                    );
-                }
+            if ($routeLowerCase === $controller) {
+                throw new PageNotFoundException(
+                    'Cannot access the controller in Defined Routes. Controller: ' . $controllerInRoutes
+                );
             }
         }
     }

From 6d6ad00a0374c074416c138a869d895030765d4d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 20 Apr 2022 17:41:31 +0900
Subject: [PATCH 2061/2325] docs: improve doc comment

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

diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php
index 07f75ddcd989..be99ffe9fbed 100644
--- a/system/Router/AutoRouterImproved.php
+++ b/system/Router/AutoRouterImproved.php
@@ -21,7 +21,7 @@
 class AutoRouterImproved implements AutoRouterInterface
 {
     /**
-     * Controller list that can't be accessible.
+     * List of controllers in Defined Routes that should not be accessed via this Auto-Routing.
      *
      * @var class-string[]
      */

From 6e454e52c6ca705fcb50af30437fb03d071972cd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 20 Apr 2022 17:45:33 +0900
Subject: [PATCH 2062/2325] refactor: add final to new classes that implements
 AutoRouterInterface

---
 system/Router/AutoRouter.php         | 18 +++++++++---------
 system/Router/AutoRouterImproved.php | 24 ++++++++++++------------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/system/Router/AutoRouter.php b/system/Router/AutoRouter.php
index ca5f3301c941..e9f5fc8a021d 100644
--- a/system/Router/AutoRouter.php
+++ b/system/Router/AutoRouter.php
@@ -16,46 +16,46 @@
 /**
  * Router for Auto-Routing
  */
-class AutoRouter implements AutoRouterInterface
+final class AutoRouter implements AutoRouterInterface
 {
     /**
      * List of controllers registered for the CLI verb that should not be accessed in the web.
      *
      * @var class-string[]
      */
-    protected array $protectedControllers;
+    private array $protectedControllers;
 
     /**
      * Sub-directory that contains the requested controller class.
      * Primarily used by 'autoRoute'.
      */
-    protected ?string $directory = null;
+    private ?string $directory = null;
 
     /**
      * The name of the controller class.
      */
-    protected string $controller;
+    private string $controller;
 
     /**
      * The name of the method to use.
      */
-    protected string $method;
+    private string $method;
 
     /**
      * Whether dashes in URI's should be converted
      * to underscores when determining method names.
      */
-    protected bool $translateURIDashes;
+    private bool $translateURIDashes;
 
     /**
      * HTTP verb for the request.
      */
-    protected string $httpVerb;
+    private string $httpVerb;
 
     /**
      * Default namespace for controllers.
      */
-    protected string $defaultNamespace;
+    private string $defaultNamespace;
 
     public function __construct(
         array $protectedControllers,
@@ -181,7 +181,7 @@ public function setTranslateURIDashes(bool $val = false): self
      *
      * @return array returns an array of remaining uri segments that don't map onto a directory
      */
-    protected function scanControllers(array $segments): array
+    private function scanControllers(array $segments): array
     {
         $segments = array_filter($segments, static fn ($segment) => $segment !== '');
         // numerically reindex the array, removing gaps
diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php
index be99ffe9fbed..f2fa5d1ca8a4 100644
--- a/system/Router/AutoRouterImproved.php
+++ b/system/Router/AutoRouterImproved.php
@@ -18,65 +18,65 @@
 /**
  * New Secure Router for Auto-Routing
  */
-class AutoRouterImproved implements AutoRouterInterface
+final class AutoRouterImproved implements AutoRouterInterface
 {
     /**
      * List of controllers in Defined Routes that should not be accessed via this Auto-Routing.
      *
      * @var class-string[]
      */
-    protected array $protectedControllers;
+    private array $protectedControllers;
 
     /**
      * Sub-directory that contains the requested controller class.
      */
-    protected ?string $directory = null;
+    private ?string $directory = null;
 
     /**
      * Sub-namespace that contains the requested controller class.
      */
-    protected ?string $subNamespace = null;
+    private ?string $subNamespace = null;
 
     /**
      * The name of the controller class.
      */
-    protected string $controller;
+    private string $controller;
 
     /**
      * The name of the method to use.
      */
-    protected string $method;
+    private string $method;
 
     /**
      * An array of params to the controller method.
      */
-    protected array $params = [];
+    private array $params = [];
 
     /**
      * Whether dashes in URI's should be converted
      * to underscores when determining method names.
      */
-    protected bool $translateURIDashes;
+    private bool $translateURIDashes;
 
     /**
      * HTTP verb for the request.
      */
-    protected string $httpVerb;
+    private string $httpVerb;
 
     /**
      * The namespace for controllers.
      */
-    protected string $namespace;
+    private string $namespace;
 
     /**
      * The name of the default controller class.
      */
-    protected string $defaultController;
+    private string $defaultController;
 
     /**
      * The name of the default method
      */
-    protected string $defaultMethod;
+    private string $defaultMethod;
 
     /**
      * @param class-string[] $protectedControllers

From 0ec9c067f54987eca1ef23c533b9e20e4128bddf Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 20 Apr 2022 17:48:18 +0900
Subject: [PATCH 2063/2325] docs: add @deprecated

---
 system/Router/AutoRouter.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/system/Router/AutoRouter.php b/system/Router/AutoRouter.php
index e9f5fc8a021d..3c29ff8290d4 100644
--- a/system/Router/AutoRouter.php
+++ b/system/Router/AutoRouter.php
@@ -166,6 +166,8 @@ public function getRoute(string $uri): array
     /**
      * Tells the system whether we should translate URI dashes or not
      * in the URI from a dash to an underscore.
+     *
+     * @deprecated This method should be removed.
      */
     public function setTranslateURIDashes(bool $val = false): self
     {
@@ -236,6 +238,8 @@ private function isValidSegment(string $segment): bool
      * Sets the sub-directory that the controller is in.
      *
      * @param bool $validate if true, checks to make sure $dir consists of only PSR4 compliant segments
+     *
+     * @deprecated This method should be removed.
      */
     public function setDirectory(?string $dir = null, bool $append = false, bool $validate = true)
     {
@@ -266,7 +270,7 @@ public function setDirectory(?string $dir = null, bool $append = false, bool $va
      * Returns the name of the sub-directory the controller is in,
      * if any. Relative to APPPATH.'Controllers'.
      *
-     * @deprecated This method is not necessary.
+     * @deprecated This method should be removed.
      */
     public function directory(): string
     {

From 83c4342609ed9d1bb7beafadee8fdf123bbd9946 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 20 Apr 2022 17:52:56 +0900
Subject: [PATCH 2064/2325] refactor: add property type

Co-authored-by: Abdul Malik Ikhsan <samsonasik@gmail.com>
---
 app/Config/Feature.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Config/Feature.php b/app/Config/Feature.php
index b2e013bf3a2f..4d2c9d9fd7b0 100644
--- a/app/Config/Feature.php
+++ b/app/Config/Feature.php
@@ -30,5 +30,5 @@ class Feature extends BaseConfig
      *
      * @var bool
      */
-    public $autoRoutesImproved = false;
+    public bool $autoRoutesImproved = false;
 }

From 56f183cb19b04e1dda40ea1a99134b0484f050a9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 20 Apr 2022 17:55:47 +0900
Subject: [PATCH 2065/2325] docs: composer cs-fix

---
 app/Config/Feature.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/Config/Feature.php b/app/Config/Feature.php
index 4d2c9d9fd7b0..614d4ac733b6 100644
--- a/app/Config/Feature.php
+++ b/app/Config/Feature.php
@@ -27,8 +27,6 @@ class Feature extends BaseConfig
 
     /**
      * Use improved new auto routing, instead of the traditional auto routing.
-     *
-     * @var bool
      */
     public bool $autoRoutesImproved = false;
 }

From 061984a14102bc3f8b3ea0a604a534ddd2edfc9e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 26 Apr 2022 12:54:59 +0900
Subject: [PATCH 2066/2325] docs: add docs

---
 user_guide_src/source/changelogs/v4.2.0.rst   |  24 ++-
 .../source/incoming/controllers.rst           | 196 ++++++++++++++++--
 .../source/incoming/controllers/014.php       |   3 +-
 .../source/incoming/controllers/020.php       |  11 +
 .../source/incoming/controllers/021.php       |  16 ++
 .../source/incoming/controllers/022.php       |  11 +
 user_guide_src/source/incoming/routing.rst    | 141 +++++++++++--
 7 files changed, 360 insertions(+), 42 deletions(-)
 create mode 100644 user_guide_src/source/incoming/controllers/020.php
 create mode 100644 user_guide_src/source/incoming/controllers/021.php
 create mode 100644 user_guide_src/source/incoming/controllers/022.php

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 52cc16b86dc7..dd2044ff0ed2 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -19,11 +19,33 @@ BREAKING
 - The method signature of ``CodeIgniter\CLI\CommandRunner::_remap()`` has been changed to fix a bug.
 - The ``CodeIgniter\Autoloader\Autoloader::initialize()`` has changed the behavior to fix a bug. It used to use Composer classmap only when ``$modules->discoverInComposer`` is true. Now it always uses the Composer classmap if Composer is available.
 - The color code output by :ref:`CLI::color() <cli-library-color>` has been changed to fix a bug.
-- To prevent unexpected access from the web browser, if a controller is added to a cli route (``$routes->cli()``), all methods of that controller are no longer accessible via auto routing.
+- To prevent unexpected access from the web browser, if a controller is added to a cli route (``$routes->cli()``), all methods of that controller are no longer accessible via auto-routing.
 
 Enhancements
 ************
 
+New Improved Auto Routing
+=========================
+
+Added an optional new more secure auto router. These are the changes from the traditional auto-routing:
+
+- A controller method needs HTTP verb prefix like ``getIndex()``, ``postCreate()``.
+    - Developers always know HTTP method, so requests by unexpected HTTP method does not happen.
+- The Default Controller (``Home`` by default) and the Default Method (``index`` by default) must be omitted in the URI.
+    - It restricts one-to-one correspondence between controller methods and URIs.
+    - E.g. by default, you can access ``/``, but ``/home`` and ``/home/index`` will be 404.
+- It checks method parameter count.
+    - If there are more parameters in the URI than the method parameters, it results in 404.
+- It does not support ``_remap()`` method.
+    - It restricts one-to-one correspondence between controller methods and URIs.
+- Can't access controllers in Defined Routes.
+    - It completely separates controllers accessible via **Auto Routes** from those accessible via **Defined Routes**.
+
+See :ref:`auto-routing-improved` for the details.
+
+Others
+======
+
 - Content Security Policy (CSP) enhancements
     - Added the configs ``$scriptNonceTag`` and ``$styleNonceTag`` in  ``Config\ContentSecurityPolicy`` to customize the CSP placeholders (``{csp-script-nonce}`` and ``{csp-style-nonce}``)
     - Added the config ``$autoNonce`` in ``Config\ContentSecurityPolicy`` to disable the CSP placeholder replacement
diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 9074bf18046f..07926d61732e 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -109,20 +109,187 @@ then trying to access it using the following URL will not work::
 
     example.com/index.php/helloworld/utility/
 
+.. _controller-auto-routing-improved:
+
+Auto Routing (Improved)
+************************
+
+Since v4.2.0, the new more secure Auto Routing has been introduced.
+
+This section describes the functionality of the new auto-routing.
+It automatically routes an HTTP request, and executes the corresponding controller method
+without route definitions.
+
+Since v4.2.0, the auto-routing is disabled by default. To use it, see :ref:`enabled-auto-routing-improved`.
+
+Consider this URI::
+
+    example.com/index.php/helloworld/
+
+In the above example, CodeIgniter would attempt to find a controller named ``App\Controllers\Helloworld`` and load it, when auto-routing is enabled.
+
+.. note:: When a controller's short name matches the first segment of a URI, it will be loaded.
+
+Let's try it: Hello World!
+==========================
+
+Let's create a simple controller so you can see it in action. Using your text editor, create a file called **Helloworld.php**,
+and put the following code in it. You will notice that the ``Helloworld`` Controller is extending the ``BaseController``. you can
+also extend the ``CodeIgniter\Controller`` if you do not need the functionality of the BaseController.
+
+The BaseController provides a convenient place for loading components and performing functions that are needed by all your
+controllers. You can extend this class in any new controller.
+
+.. literalinclude:: controllers/020.php
+
+Then save the file to your **app/Controllers/** directory.
+
+.. important:: The file must be called **Helloworld.php**, with a capital ``H``. Controller class names MUST start with an uppercase letter and ONLY the first character can be uppercase.
+
+.. important:: A controller method that will be executed by Auto Routing (Improved) needs HTTP verb (``get``, ``post``, ``put``, etc.) prefix like ``getIndex()``, ``postCreate()``.
+
+Now visit your site using a URL similar to this::
+
+    example.com/index.php/helloworld
+
+If you did it right you should see::
+
+    Hello World!
+
+This is valid:
+
+.. literalinclude:: controllers/009.php
+
+This is **not** valid:
+
+.. literalinclude:: controllers/010.php
+
+This is **not** valid:
+
+.. literalinclude:: controllers/011.php
+
+Also, always make sure your controller extends the parent controller
+class so that it can inherit all its methods.
+
+.. note::
+    The system will attempt to match the URI against Controllers by matching each segment against
+    folders/files in **app/Controllers/**, when a match wasn't found against defined routes.
+    That's why your folders/files MUST start with a capital letter and the rest MUST be lowercase.
+
+    Here is an example based on PSR-4 Autoloader:
+
+    .. literalinclude:: controllers/012.php
+
+    If you want another naming convention you need to manually define it using the
+    :ref:`Defined Route Routing <defined-route-routing>`.
+
+Methods
+=======
+
+In the above example, the method name is ``getIndex()``.
+The method (HTTP verb + ``Index()``) is loaded if the **second segment** of the URI is empty.
+
+**The second segment of the URI determines which method in the
+controller gets called.**
+
+Let's try it. Add a new method to your controller:
+
+.. literalinclude:: controllers/021.php
+
+Now load the following URL to see the ``getComment()`` method::
+
+    example.com/index.php/helloworld/comment/
+
+You should see your new message.
+
+.. warning:: For security reasons be sure to declare any new utility methods as ``protected`` or ``private``.
+
+Passing URI Segments to Your Methods
+====================================
+
+If your URI contains more than two segments they will be passed to your
+method as parameters.
+
+For example, let's say you have a URI like this::
+
+    example.com/index.php/products/shoes/sandals/123
+
+Your method will be passed URI segments 3 and 4 (``'sandals'`` and ``'123'``):
+
+.. literalinclude:: controllers/022.php
+
+Defining a Default Controller
+=============================
+
+CodeIgniter can be told to load a default controller when a URI is not
+present, as will be the case when only your site root URL is requested. Let's try it
+with the ``Helloworld`` controller.
+
+To specify a default controller open your **app/Config/Routes.php**
+file and set this variable:
+
+.. literalinclude:: controllers/015.php
+
+Where ``Helloworld`` is the name of the controller class you want to be used.
+
+A few lines further down **Routes.php** in the "Route Definitions" section, comment out the line:
+
+.. literalinclude:: controllers/016.php
+
+If you now browse to your site without specifying any URI segments you'll
+see the "Hello World" message.
+
+.. note:: The line ``$routes->get('/', 'Home::index');`` is an optimization that you will want to use in a "real-world" app. But for demonstration purposes we don't want to use that feature. ``$routes->get()`` is explained in :doc:`URI Routing <routing>`
+
+For more information, please refer to the :ref:`routes-configuration-options` section of the
+:doc:`URI Routing <routing>` documentation.
+
+Organizing Your Controllers into Sub-directories
+================================================
+
+If you are building a large application you might want to hierarchically
+organize or structure your controllers into sub-directories. CodeIgniter
+permits you to do this.
+
+Simply create sub-directories under the main **app/Controllers/**,
+and place your controller classes within them.
+
+.. important:: Folder names MUST start with an uppercase letter and ONLY the first character can be uppercase.
+
+When using this feature the first segment of your URI must
+specify the folder. For example, let's say you have a controller located here::
+
+    app/Controllers/Products/Shoes.php
+
+To call the above controller your URI will look something like this::
+
+    example.com/index.php/products/shoes/show/123
+
+.. note:: You cannot have directories with the same name in **app/Controllers/** and **public/**.
+    This is because if there is a directory, the web server will search for it and
+    it will not be routed to CodeIgniter.
+
+Each of your sub-directories may contain a default controller which will be
+called if the URL contains *only* the sub-directory. Simply put a controller
+in there that matches the name of your default controller as specified in
+your **app/Config/Routes.php** file.
+
+CodeIgniter also permits you to map your URIs using its :ref:`Defined Route Routing <defined-route-routing>`..
+
 .. _controller-auto-routing:
 
-Auto Routing
-************
+Auto Routing (Traditional)
+**************************
 
-This section describes the functionality of the auto-routing.
+This section describes the functionality of Auto Routing (Traditional) that is a routing system from CodeIgniter 3.
 It automatically routes an HTTP request, and executes the corresponding controller method
 without route definitions. The auto-routing is disabled by default.
 
 .. warning:: To prevent misconfiguration and miscoding, we recommend that you do not use
-    the auto-routing feature. It is easy to create vulnerable apps where controller filters
+    Auto Routing (Traditional). It is easy to create vulnerable apps where controller filters
     or CSRF protection are bypassed.
 
-.. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method.
+.. important:: Auto Routing (Traditional) routes a HTTP request with **any** HTTP method to a controller method.
 
 Consider this URI::
 
@@ -130,7 +297,7 @@ Consider this URI::
 
 In the above example, CodeIgniter would attempt to find a controller named **Helloworld.php** and load it.
 
-**When a controller's name matches the first segment of a URI, it will be loaded.**
+.. note:: When a controller's short name matches the first segment of a URI, it will be loaded.
 
 Let's try it: Hello World!
 ==========================
@@ -148,7 +315,7 @@ For security reasons be sure to declare any new utility methods as ``protected``
 
 Then save the file to your **app/Controllers/** directory.
 
-.. important:: The file must be called **Helloworld.php**, with a capital ``H``.
+.. important:: The file must be called **Helloworld.php**, with a capital ``H``. Controller class names MUST start with an uppercase letter and ONLY the first character can be uppercase.
 
 Now visit your site using a URL similar to this::
 
@@ -158,8 +325,6 @@ If you did it right you should see::
 
     Hello World!
 
-.. important:: Controller class names MUST start with an uppercase letter and ONLY the first character can be uppercase.
-
 This is valid:
 
 .. literalinclude:: controllers/009.php
@@ -179,13 +344,14 @@ class so that it can inherit all its methods.
     The system will attempt to match the URI against Controllers by matching each segment against
     folders/files in **app/Controllers/**, when a match wasn't found against defined routes.
     That's why your folders/files MUST start with a capital letter and the rest MUST be lowercase.
-    If you want another naming convention you need to manually define it using the
-    :doc:`URI Routing <routing>` feature.
 
     Here is an example based on PSR-4 Autoloader:
 
     .. literalinclude:: controllers/012.php
 
+    If you want another naming convention you need to manually define it using the
+    :ref:`Defined Route Routing <defined-route-routing>`.
+
 Methods
 =======
 
@@ -208,7 +374,7 @@ Now load the following URL to see the comment method::
 
 You should see your new message.
 
-Passing URI Segments to your methods
+Passing URI Segments to Your Methods
 ====================================
 
 If your URI contains more than two segments they will be passed to your
@@ -222,10 +388,6 @@ Your method will be passed URI segments 3 and 4 (``'sandals'`` and ``'123'``):
 
 .. literalinclude:: controllers/014.php
 
-.. important:: If you are using the :doc:`URI Routing <routing>`
-    feature, the segments passed to your method will be the defined
-    ones.
-
 Defining a Default Controller
 =============================
 
@@ -282,7 +444,7 @@ called if the URL contains *only* the sub-directory. Simply put a controller
 in there that matches the name of your default controller as specified in
 your **app/Config/Routes.php** file.
 
-CodeIgniter also permits you to map your URIs using its :doc:`URI Routing <routing>` feature.
+CodeIgniter also permits you to map your URIs using its :ref:`Defined Route Routing <defined-route-routing>`..
 
 Remapping Method Calls
 **********************
diff --git a/user_guide_src/source/incoming/controllers/014.php b/user_guide_src/source/incoming/controllers/014.php
index da295eb61836..18c076f5bc25 100644
--- a/user_guide_src/source/incoming/controllers/014.php
+++ b/user_guide_src/source/incoming/controllers/014.php
@@ -6,7 +6,6 @@ class Products extends BaseController
 {
     public function shoes($sandals, $id)
     {
-        return $sandals
-            . $id;
+        return $sandals . $id;
     }
 }
diff --git a/user_guide_src/source/incoming/controllers/020.php b/user_guide_src/source/incoming/controllers/020.php
new file mode 100644
index 000000000000..ff485a0327a5
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/020.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Controllers;
+
+class Helloworld extends BaseController
+{
+    public function getIndex()
+    {
+        return 'Hello World!';
+    }
+}
diff --git a/user_guide_src/source/incoming/controllers/021.php b/user_guide_src/source/incoming/controllers/021.php
new file mode 100644
index 000000000000..633a89ac8965
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/021.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Controllers;
+
+class Helloworld extends BaseController
+{
+    public function getIndex()
+    {
+        return 'Hello World!';
+    }
+
+    public function getComment()
+    {
+        return 'I am not flat!';
+    }
+}
diff --git a/user_guide_src/source/incoming/controllers/022.php b/user_guide_src/source/incoming/controllers/022.php
new file mode 100644
index 000000000000..9e4646596e18
--- /dev/null
+++ b/user_guide_src/source/incoming/controllers/022.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Controllers;
+
+class Products extends BaseController
+{
+    public function getShoes($sandals, $id)
+    {
+        return $sandals . $id;
+    }
+}
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 4989f0891e0b..36eeb673f3be 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -11,6 +11,14 @@ What is URI Routing?
 
 URI Routing associates a URI with a controller's method.
 
+CodeIgniter has two kinds of routing. One is **Defined Route Routing**, and the other is **Auto Routing**.
+With Defined Route Routing, you can define routes manually. It allows flexible URL.
+Auto Routing automatically routes HTTP requests based on conventions and execute the corresponding controller methods. There is no need to define routes manually.
+
+First, let's look at Defined Route Routing. If you want to use Auto Routing, see :ref:`auto-routing-improved`.
+
+.. _defined-route-routing:
+
 Setting Routing Rules
 *********************
 
@@ -482,7 +490,7 @@ Use Defined Routes Only
 Since v4.2.0, the auto-routing is disabled by default.
 
 When no defined route is found that matches the URI, the system will attempt to match that URI against the
-controllers and methods when :ref:`auto-routing` is enabled.
+controllers and methods when Auto Routing is enabled.
 
 You can disable this automatic matching, and restrict routes
 to only those defined by you, by setting the ``setAutoRoute()`` option to false:
@@ -510,30 +518,35 @@ For an example use of lowering the priority see :ref:`routing-priority`:
 
 .. literalinclude:: routing/052.php
 
-.. _auto-routing:
+.. _auto-routing-improved:
+
+Auto Routing (Improved)
+***********************
+
+Since v4.2.0, the new more secure Auto Routing has been introduced.
 
-Auto Routing
-************
+When no defined route is found that matches the URI, the system will attempt to match that URI against the controllers and methods when Auto Routing is enabled.
 
-It is recommended that all routes are defined in the **app/Config/Routes.php** file.
-However, CodeIgniter can also automatically route HTTP requests based on conventions
+.. important:: For security reasons, if a controller is used in the defined routes, Auto Routing (Improved) does not route to the controller.
+
+Auto Routing can automatically route HTTP requests based on conventions
 and execute the corresponding controller methods.
 
-.. warning:: To prevent misconfiguration and miscoding, we recommend that you do not use
-    the auto-routing feature. It is easy to create vulnerable apps where controller filters
-    or CSRF protection are bypassed.
+.. note:: Auto Routing (Improved) is disabled by default. To use it, see below.
 
-.. important:: The auto-routing routes a HTTP request with **any** HTTP method to a controller method.
+.. _enabled-auto-routing-improved:
 
 Enable Auto Routing
 ===================
 
-Since v4.2.0, the auto-routing is disabled by default.
-
 To use it, you need to change the setting ``setAutoRoute()`` option to true in **app/Config/Routes.php**::
 
     $routes->setAutoRoute(true);
 
+And you need to change the property ``$autoRoutesImproved`` to ``true`` in **app/Config/Feature.php**::
+
+    public bool $autoRoutesImproved = true;
+
 URI Segments
 ============
 
@@ -547,15 +560,15 @@ The segments in the URL, in following with the Model-View-Controller approach, u
 
 Consider this URI::
 
-    example.com/index.php/helloworld/index/1
+    example.com/index.php/helloworld/hello/1
 
-In the above example, CodeIgniter would attempt to find a controller named **Helloworld.php**
-and executes ``index()`` method with passing ``'1'`` as the first argument.
+In the above example, when you send a HTTP request with **GET** method,
+Auto Routing would attempt to find a controller named ``App\Controllers\Helloworld``
+and executes ``getHello()`` method with passing ``'1'`` as the first argument.
 
-We call this "**Auto Routes**". CodeIgniter automatically routes an HTTP request,
-and executes the corresponding controller method. The auto-routing is disabled by default.
+.. note:: A controller method that will be executed by Auto Routing (Improved) needs HTTP verb (``get``, ``post``, ``put``, etc.) prefix like ``getIndex()``, ``postCreate()``.
 
-See :ref:`Auto Routing in Controllers <controller-auto-routing>` for more info.
+See :ref:`Auto Routing in Controllers <controller-auto-routing-improved>` for more info.
 
 Configuration Options
 =====================
@@ -565,7 +578,7 @@ These options are available at the top of **app/Config/Routes.php**.
 Default Controller
 ------------------
 
-When a user visits the root of your site (i.e., example.com) the controller to use is determined by the value set by
+When a user visits the root of your site (i.e., **example.com**) the controller to use is determined by the value set by
 the ``setDefaultController()`` method, unless a route exists for it explicitly. The default value for this is ``Home``
 which matches the controller at **app/Controllers/Home.php**:
 
@@ -575,7 +588,10 @@ The default controller is also used when no matching route has been found, and t
 in the controllers directory. For example, if the user visits **example.com/admin**, if a controller was found at
 **app/Controllers/Admin/Home.php**, it would be used.
 
-See :ref:`Auto Routing in Controllers <controller-auto-routing>` for more info.
+.. note:: You cannot access the default controller with the URI of the controller name.
+    When the default controller is ``Home``, you can access **example.com/**, but if you access **example.com/home**, it will be not found.
+
+See :ref:`Auto Routing in Controllers <controller-auto-routing-improved>` for more info.
 
 Default Method
 --------------
@@ -589,6 +605,87 @@ In this example, if the user were to visit **example.com/products**, and a ``Pro
 
 .. literalinclude:: routing/048.php
 
+.. note:: You cannot access the controller with the URI of the default method name.
+    In the example above, you can access **example.com/products**, but if you access **example.com/products/listall**, it will be not found.
+
+.. _auto-routing:
+
+Auto Routing (Traditional)
+**************************
+
+Auto Routing (Traditional) is a routing system from CodeIgniter 3.
+It can automatically route HTTP requests based on conventions and execute the corresponding controller methods.
+
+It is recommended that all routes are defined in the **app/Config/Routes.php** file,
+or to use :ref:`auto-routing-improved`,
+
+.. warning:: To prevent misconfiguration and miscoding, we recommend that you do not use
+    Auto Routing (Traditional) feature. It is easy to create vulnerable apps where controller filters
+    or CSRF protection are bypassed.
+
+.. important:: Auto Routing (Traditional) routes a HTTP request with **any** HTTP method to a controller method.
+
+Enable Auto Routing (Traditional)
+=================================
+
+Since v4.2.0, the auto-routing is disabled by default.
+
+To use it, you need to change the setting ``setAutoRoute()`` option to true in **app/Config/Routes.php**::
+
+    $routes->setAutoRoute(true);
+
+URI Segments (Traditional)
+==========================
+
+The segments in the URL, in following with the Model-View-Controller approach, usually represent::
+
+    example.com/class/method/ID
+
+1. The first segment represents the controller **class** that should be invoked.
+2. The second segment represents the class **method** that should be called.
+3. The third, and any additional segments, represent the ID and any variables that will be passed to the controller.
+
+Consider this URI::
+
+    example.com/index.php/helloworld/index/1
+
+In the above example, CodeIgniter would attempt to find a controller named **Helloworld.php**
+and executes ``index()`` method with passing ``'1'`` as the first argument.
+
+See :ref:`Auto Routing (Traditional) in Controllers <controller-auto-routing>` for more info.
+
+Configuration Options (Traditional)
+===================================
+
+These options are available at the top of **app/Config/Routes.php**.
+
+Default Controller (Traditional)
+--------------------------------
+
+When a user visits the root of your site (i.e., example.com) the controller to use is determined by the value set by
+the ``setDefaultController()`` method, unless a route exists for it explicitly. The default value for this is ``Home``
+which matches the controller at **app/Controllers/Home.php**:
+
+.. literalinclude:: routing/047.php
+
+The default controller is also used when no matching route has been found, and the URI would point to a directory
+in the controllers directory. For example, if the user visits **example.com/admin**, if a controller was found at
+**app/Controllers/Admin/Home.php**, it would be used.
+
+See :ref:`Auto Routing in Controllers <controller-auto-routing>` for more info.
+
+Default Method (Traditional)
+----------------------------
+
+This works similar to the default controller setting, but is used to determine the default method that is used
+when a controller is found that matches the URI, but no segment exists for the method. The default value is
+``index``.
+
+In this example, if the user were to visit **example.com/products**, and a ``Products`` controller existed, the
+``Products::listAll()`` method would be executed:
+
+.. literalinclude:: routing/048.php
+
 Confirming Routes
 *****************
 
@@ -617,11 +714,11 @@ The output is like the following:
     | auto   | home/index[/...] | \App\Controllers\Home::index             | invalidchars   | secureheaders toolbar |
     +--------+------------------+------------------------------------------+----------------+-----------------------+
 
-The *Method* column shows the HTTP method that the route is listening for. ``auto`` means that the route is discovered by auto routing, so it is not defined in **app/Config/Routes.php**.
+The *Method* column shows the HTTP method that the route is listening for. ``auto`` means that the route is discovered by auto-routing, so it is not defined in **app/Config/Routes.php**.
 
 The *Route* column shows the URI path to match. The route of a defined route is expressed as a regular expression.
 But ``[/...]`` in the route of an auto route is indicates any number of segments.
 
-.. note:: When auto routing is enabled, if you have the route ``home``, it can be also accessd by ``Home``, or maybe by ``hOme``, ``hoMe``, ``HOME``, etc. But the command shows only ``home``.
+.. note:: When auto-routing is enabled, if you have the route ``home``, it can be also accessd by ``Home``, or maybe by ``hOme``, ``hoMe``, ``HOME``, etc. But the command shows only ``home``.
 
 .. important:: The system is not perfect. If you use Custom Placeholders, *Filters* might not be correct. But the filters defined in **app/Config/Routes.php** are always displayed correctly.

From 2639a7fc97639d3e18786470a4836d81ebdb8734 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 28 Apr 2022 10:31:48 +0900
Subject: [PATCH 2067/2325] docs: fix by proofreading

Co-authored-by: MGatner <mgatner@icloud.com>
---
 app/Config/Feature.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Config/Feature.php b/app/Config/Feature.php
index 614d4ac733b6..4c5ec90cd3ff 100644
--- a/app/Config/Feature.php
+++ b/app/Config/Feature.php
@@ -26,7 +26,7 @@ class Feature extends BaseConfig
     public $multipleFilters = false;
 
     /**
-     * Use improved new auto routing, instead of the traditional auto routing.
+     * Use improved new auto routing instead of the default legacy version.
      */
     public bool $autoRoutesImproved = false;
 }

From 7b087b2c8db64ca05753716202d37aec9fd0d85f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 28 Apr 2022 10:32:22 +0900
Subject: [PATCH 2068/2325] docs: fix typo

Co-authored-by: MGatner <mgatner@icloud.com>
---
 system/Router/AutoRouterImproved.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Router/AutoRouterImproved.php b/system/Router/AutoRouterImproved.php
index f2fa5d1ca8a4..7b03e705a1df 100644
--- a/system/Router/AutoRouterImproved.php
+++ b/system/Router/AutoRouterImproved.php
@@ -171,7 +171,7 @@ public function getRoute(string $uri): array
         // Ensure routes registered via $routes->cli() are not accessible via web.
         $this->protectDefinedRoutes();
 
-        // Check _remao()
+        // Check _remap()
         $this->checkRemap();
 
         // Check parameters

From 9e090979c069f30b75c70391796d906cfccfb5f2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 28 Apr 2022 10:32:39 +0900
Subject: [PATCH 2069/2325] docs: fix by proofreading

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/changelogs/v4.2.0.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index dd2044ff0ed2..8b0de87e7883 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -30,7 +30,7 @@ New Improved Auto Routing
 Added an optional new more secure auto router. These are the changes from the traditional auto-routing:
 
 - A controller method needs HTTP verb prefix like ``getIndex()``, ``postCreate()``.
-    - Developers always know HTTP method, so requests by unexpected HTTP method does not happen.
+    - Developers always know the HTTP method, so requests by an unexpected HTTP method does not pass.
 - The Default Controller (``Home`` by default) and the Default Method (``index`` by default) must be omitted in the URI.
     - It restricts one-to-one correspondence between controller methods and URIs.
     - E.g. by default, you can access ``/``, but ``/home`` and ``/home/index`` will be 404.

From 70f62aad3e0cc244b0f4c05b1337e2ba833a8777 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 28 Apr 2022 10:39:11 +0900
Subject: [PATCH 2070/2325] docs: replace Traditional with Legacy for
 auto-routing

---
 user_guide_src/source/changelogs/v4.2.0.rst   |  2 +-
 .../source/incoming/controllers.rst           | 10 +++---
 user_guide_src/source/incoming/routing.rst    | 32 +++++++++----------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 8b0de87e7883..14e63e6990cb 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -27,7 +27,7 @@ Enhancements
 New Improved Auto Routing
 =========================
 
-Added an optional new more secure auto router. These are the changes from the traditional auto-routing:
+Added an optional new more secure auto router. These are the changes from the legacy auto-routing:
 
 - A controller method needs HTTP verb prefix like ``getIndex()``, ``postCreate()``.
     - Developers always know the HTTP method, so requests by an unexpected HTTP method does not pass.
diff --git a/user_guide_src/source/incoming/controllers.rst b/user_guide_src/source/incoming/controllers.rst
index 07926d61732e..594c7ceadfd9 100644
--- a/user_guide_src/source/incoming/controllers.rst
+++ b/user_guide_src/source/incoming/controllers.rst
@@ -278,18 +278,18 @@ CodeIgniter also permits you to map your URIs using its :ref:`Defined Route Rout
 
 .. _controller-auto-routing:
 
-Auto Routing (Traditional)
-**************************
+Auto Routing (Legacy)
+*********************
 
-This section describes the functionality of Auto Routing (Traditional) that is a routing system from CodeIgniter 3.
+This section describes the functionality of Auto Routing (Legacy) that is a routing system from CodeIgniter 3.
 It automatically routes an HTTP request, and executes the corresponding controller method
 without route definitions. The auto-routing is disabled by default.
 
 .. warning:: To prevent misconfiguration and miscoding, we recommend that you do not use
-    Auto Routing (Traditional). It is easy to create vulnerable apps where controller filters
+    Auto Routing (Legacy). It is easy to create vulnerable apps where controller filters
     or CSRF protection are bypassed.
 
-.. important:: Auto Routing (Traditional) routes a HTTP request with **any** HTTP method to a controller method.
+.. important:: Auto Routing (Legacy) routes a HTTP request with **any** HTTP method to a controller method.
 
 Consider this URI::
 
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 36eeb673f3be..1ddabd1856e4 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -610,23 +610,23 @@ In this example, if the user were to visit **example.com/products**, and a ``Pro
 
 .. _auto-routing:
 
-Auto Routing (Traditional)
-**************************
+Auto Routing (Legacy)
+*********************
 
-Auto Routing (Traditional) is a routing system from CodeIgniter 3.
+Auto Routing (Legacy) is a routing system from CodeIgniter 3.
 It can automatically route HTTP requests based on conventions and execute the corresponding controller methods.
 
 It is recommended that all routes are defined in the **app/Config/Routes.php** file,
 or to use :ref:`auto-routing-improved`,
 
 .. warning:: To prevent misconfiguration and miscoding, we recommend that you do not use
-    Auto Routing (Traditional) feature. It is easy to create vulnerable apps where controller filters
+    Auto Routing (Legacy) feature. It is easy to create vulnerable apps where controller filters
     or CSRF protection are bypassed.
 
-.. important:: Auto Routing (Traditional) routes a HTTP request with **any** HTTP method to a controller method.
+.. important:: Auto Routing (Legacy) routes a HTTP request with **any** HTTP method to a controller method.
 
-Enable Auto Routing (Traditional)
-=================================
+Enable Auto Routing (Legacy)
+============================
 
 Since v4.2.0, the auto-routing is disabled by default.
 
@@ -634,8 +634,8 @@ To use it, you need to change the setting ``setAutoRoute()`` option to true in *
 
     $routes->setAutoRoute(true);
 
-URI Segments (Traditional)
-==========================
+URI Segments (Legacy)
+=====================
 
 The segments in the URL, in following with the Model-View-Controller approach, usually represent::
 
@@ -652,15 +652,15 @@ Consider this URI::
 In the above example, CodeIgniter would attempt to find a controller named **Helloworld.php**
 and executes ``index()`` method with passing ``'1'`` as the first argument.
 
-See :ref:`Auto Routing (Traditional) in Controllers <controller-auto-routing>` for more info.
+See :ref:`Auto Routing (Legacy) in Controllers <controller-auto-routing>` for more info.
 
-Configuration Options (Traditional)
-===================================
+Configuration Options (Legacy)
+==============================
 
 These options are available at the top of **app/Config/Routes.php**.
 
-Default Controller (Traditional)
---------------------------------
+Default Controller (Legacy)
+---------------------------
 
 When a user visits the root of your site (i.e., example.com) the controller to use is determined by the value set by
 the ``setDefaultController()`` method, unless a route exists for it explicitly. The default value for this is ``Home``
@@ -674,8 +674,8 @@ in the controllers directory. For example, if the user visits **example.com/admi
 
 See :ref:`Auto Routing in Controllers <controller-auto-routing>` for more info.
 
-Default Method (Traditional)
-----------------------------
+Default Method (Legacy)
+-----------------------
 
 This works similar to the default controller setting, but is used to determine the default method that is used
 when a controller is found that matches the URI, but no segment exists for the method. The default value is

From 2fe510725dbf7131a674ae6b9dc5f1e60609c36f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 3 May 2022 14:43:35 +0900
Subject: [PATCH 2071/2325] test: run rector

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

diff --git a/tests/system/Router/AutoRouterImprovedTest.php b/tests/system/Router/AutoRouterImprovedTest.php
index 592ce9db1efc..4298a59c5b3b 100644
--- a/tests/system/Router/AutoRouterImprovedTest.php
+++ b/tests/system/Router/AutoRouterImprovedTest.php
@@ -25,7 +25,7 @@
  */
 final class AutoRouterImprovedTest extends CIUnitTestCase
 {
-    protected RouteCollection $collection;
+    private RouteCollection $collection;
 
     protected function setUp(): void
     {

From f61e8b3b84a6b258dcaa5a802a5661580c64a151 Mon Sep 17 00:00:00 2001
From: "Michael R. Krisnadhi" <michaelkrisnadhi@gmail.com>
Date: Tue, 3 May 2022 16:32:20 +0700
Subject: [PATCH 2072/2325] Update
 user_guide_src/source/database/transactions.rst

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

diff --git a/user_guide_src/source/database/transactions.rst b/user_guide_src/source/database/transactions.rst
index 86a3cdb0b495..eb2dea6c988c 100644
--- a/user_guide_src/source/database/transactions.rst
+++ b/user_guide_src/source/database/transactions.rst
@@ -103,7 +103,7 @@ Nested Transactions
 
 In CodeIgniter, transactions can be nested in a way such that only the
 outmost or top-level transaction commands are executed. You can include as
-many pairs of ``transStart``/``transComplete`` or ``transBegin``/``transCommit``/``transRollback``
+many pairs of ``transStart()``/``transComplete()`` or ``transBegin()``/``transCommit()``/``transRollback()``
 as you want inside a transaction block and so on. CodeIgniter will keep
 track of the transaction "depth" and only take action at the outermost layer
 (zero depth).

From 0bdeb91d259ef838725e949e521f58739133e40e Mon Sep 17 00:00:00 2001
From: "Michael R. Krisnadhi" <michaelkrisnadhi@gmail.com>
Date: Tue, 3 May 2022 16:33:20 +0700
Subject: [PATCH 2073/2325] update DB nested transaction note

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

diff --git a/user_guide_src/source/database/transactions.rst b/user_guide_src/source/database/transactions.rst
index eb2dea6c988c..958a87a21e0a 100644
--- a/user_guide_src/source/database/transactions.rst
+++ b/user_guide_src/source/database/transactions.rst
@@ -110,4 +110,7 @@ track of the transaction "depth" and only take action at the outermost layer
 
 .. literalinclude:: transactions/007.php
 
-.. note:: Use this technique carefully in order to keep the commands balanced.
+.. note:: In case the structure is far more complex, it's your responsibility
+    to ensure that the inner transactions can reach the outermost layer again
+    in order to be fully executed by the database, thus prevents unintended
+    commits/rollbacks.

From acab083258316cabb8b8a25c70fff07e8d6288e8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 3 May 2022 10:14:53 +0900
Subject: [PATCH 2074/2325] feat: add AutoRouterImproved/ControllerMethodReader

---
 .../ControllerMethodReader.php                | 182 ++++++++++++++++++
 tests/_support/Controllers/Newautorouting.php |  27 +++
 .../ControllerMethodReaderTest.php            |  73 +++++++
 3 files changed, 282 insertions(+)
 create mode 100644 system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php
 create mode 100644 tests/_support/Controllers/Newautorouting.php
 create mode 100644 tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php

diff --git a/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php b/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php
new file mode 100644
index 000000000000..3f373c433f1b
--- /dev/null
+++ b/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReader.php
@@ -0,0 +1,182 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved;
+
+use ReflectionClass;
+use ReflectionMethod;
+
+/**
+ * Reads a controller and returns a list of auto route listing.
+ */
+final class ControllerMethodReader
+{
+    /**
+     * @var string the default namespace
+     */
+    private string $namespace;
+
+    private array $httpMethods;
+
+    /**
+     * @param string $namespace the default namespace
+     */
+    public function __construct(string $namespace, array $httpMethods)
+    {
+        $this->namespace   = $namespace;
+        $this->httpMethods = $httpMethods;
+    }
+
+    /**
+     * Returns found route info in the controller.
+     *
+     * @phpstan-param class-string $class
+     *
+     * @return array<int, array<string, array|string>>
+     * @phpstan-return list<array<string, string|array>>
+     */
+    public function read(string $class, string $defaultController = 'Home', string $defaultMethod = 'index'): array
+    {
+        $reflection = new ReflectionClass($class);
+
+        if ($reflection->isAbstract()) {
+            return [];
+        }
+
+        $classname      = $reflection->getName();
+        $classShortname = $reflection->getShortName();
+
+        $output     = [];
+        $classInUri = $this->getUriByClass($classname);
+
+        foreach ($reflection->getMethods(ReflectionMethod::IS_PUBLIC) as $method) {
+            $methodName = $method->getName();
+
+            foreach ($this->httpMethods as $httpVerb) {
+                if (strpos($methodName, $httpVerb) === 0) {
+                    // Remove HTTP verb prefix.
+                    $methodInUri = lcfirst(substr($methodName, strlen($httpVerb)));
+
+                    if ($methodInUri === $defaultMethod) {
+                        $routeWithoutController = $this->getRouteWithoutController(
+                            $classShortname,
+                            $defaultController,
+                            $classInUri,
+                            $classname,
+                            $methodName,
+                            $httpVerb
+                        );
+
+                        if ($routeWithoutController !== []) {
+                            $output = [...$output, ...$routeWithoutController];
+
+                            continue;
+                        }
+
+                        // Route for the default method.
+                        $output[] = [
+                            'method'       => $httpVerb,
+                            'route'        => $classInUri,
+                            'route_params' => '',
+                            'handler'      => '\\' . $classname . '::' . $methodName,
+                            'params'       => [],
+                        ];
+
+                        continue;
+                    }
+
+                    $route = $classInUri . '/' . $methodInUri;
+
+                    $params      = [];
+                    $routeParams = '';
+                    $refParams   = $method->getParameters();
+
+                    foreach ($refParams as $param) {
+                        $required = true;
+                        if ($param->isOptional()) {
+                            $required = false;
+
+                            $routeParams .= '[/..]';
+                        } else {
+                            $routeParams .= '/..';
+                        }
+
+                        // [variable_name => required?]
+                        $params[$param->getName()] = $required;
+                    }
+
+                    $output[] = [
+                        'method'       => $httpVerb,
+                        'route'        => $route,
+                        'route_params' => $routeParams,
+                        'handler'      => '\\' . $classname . '::' . $methodName,
+                        'params'       => $params,
+                    ];
+                }
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * @phpstan-param class-string $classname
+     *
+     * @return string URI path part from the folder(s) and controller
+     */
+    private function getUriByClass(string $classname): string
+    {
+        // remove the namespace
+        $pattern = '/' . preg_quote($this->namespace, '/') . '/';
+        $class   = ltrim(preg_replace($pattern, '', $classname), '\\');
+
+        $classParts = explode('\\', $class);
+        $classPath  = '';
+
+        foreach ($classParts as $part) {
+            // make the first letter lowercase, because auto routing makes
+            // the URI path's first letter uppercase and search the controller
+            $classPath .= lcfirst($part) . '/';
+        }
+
+        return rtrim($classPath, '/');
+    }
+
+    /**
+     * Gets a route without default controller.
+     */
+    private function getRouteWithoutController(
+        string $classShortname,
+        string $defaultController,
+        string $uriByClass,
+        string $classname,
+        string $methodName,
+        string $httpVerb
+    ): array {
+        $output = [];
+
+        if ($classShortname === $defaultController) {
+            $pattern                = '#' . preg_quote(lcfirst($defaultController), '#') . '\z#';
+            $routeWithoutController = rtrim(preg_replace($pattern, '', $uriByClass), '/');
+            $routeWithoutController = $routeWithoutController ?: '/';
+
+            $output[] = [
+                'method'       => $httpVerb,
+                'route'        => $routeWithoutController,
+                'route_params' => '',
+                'handler'      => '\\' . $classname . '::' . $methodName,
+                'params'       => [],
+            ];
+        }
+
+        return $output;
+    }
+}
diff --git a/tests/_support/Controllers/Newautorouting.php b/tests/_support/Controllers/Newautorouting.php
new file mode 100644
index 000000000000..f3c8479f3685
--- /dev/null
+++ b/tests/_support/Controllers/Newautorouting.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\Controllers;
+
+use CodeIgniter\Controller;
+
+class Newautorouting extends Controller
+{
+    public function getIndex()
+    {
+        return 'Hello';
+    }
+
+    public function postSave(int $a, string $b, $c = null)
+    {
+        return 'Saved';
+    }
+}
diff --git a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php
new file mode 100644
index 000000000000..3536117a6343
--- /dev/null
+++ b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/ControllerMethodReaderTest.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use Tests\Support\Controllers\Newautorouting;
+use Tests\Support\Controllers\Remap;
+
+/**
+ * @internal
+ */
+final class ControllerMethodReaderTest extends CIUnitTestCase
+{
+    private function createControllerMethodReader(): ControllerMethodReader
+    {
+        $methods = [
+            'get',
+            'post',
+        ];
+        $namespace = 'Tests\Support\Controllers';
+
+        return new ControllerMethodReader($namespace, $methods);
+    }
+
+    public function testRead()
+    {
+        $reader = $this->createControllerMethodReader();
+
+        $routes = $reader->read(Newautorouting::class);
+
+        $expected = [
+            0 => [
+                'method'       => 'get',
+                'route'        => 'newautorouting',
+                'route_params' => '',
+                'handler'      => '\Tests\Support\Controllers\Newautorouting::getIndex',
+                'params'       => [],
+            ],
+            [
+                'method'       => 'post',
+                'route'        => 'newautorouting/save',
+                'route_params' => '/../..[/..]',
+                'handler'      => '\Tests\Support\Controllers\Newautorouting::postSave',
+                'params'       => [
+                    'a' => true,
+                    'b' => true,
+                    'c' => false,
+                ],
+            ],
+        ];
+
+        $this->assertSame($expected, $routes);
+    }
+
+    public function testReadControllerWithRemap()
+    {
+        $reader = $this->createControllerMethodReader();
+
+        $routes = $reader->read(Remap::class);
+
+        $expected = [];
+        $this->assertSame($expected, $routes);
+    }
+}

From 757773f69522a3f874e0856e61e1fcbfdf484f59 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 21 Mar 2022 14:40:20 +0900
Subject: [PATCH 2075/2325] feat: add RawSql class

---
 system/Database/RawSql.php           | 49 +++++++++++++++++++++++++++
 tests/system/Database/RawSqlTest.php | 50 ++++++++++++++++++++++++++++
 2 files changed, 99 insertions(+)
 create mode 100644 system/Database/RawSql.php
 create mode 100644 tests/system/Database/RawSqlTest.php

diff --git a/system/Database/RawSql.php b/system/Database/RawSql.php
new file mode 100644
index 000000000000..7ecb7fd378ae
--- /dev/null
+++ b/system/Database/RawSql.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
+
+class RawSql
+{
+    /**
+     * @var string Raw SQL string
+     */
+    private string $string;
+
+    public function __construct(string $sqlString)
+    {
+        $this->string = $sqlString;
+    }
+
+    public function __toString(): string
+    {
+        return $this->string;
+    }
+
+    /**
+     * Create new instance with new SQL string
+     */
+    public function with(string $newSqlString): self
+    {
+        $new         = clone $this;
+        $new->string = $newSqlString;
+
+        return $new;
+    }
+
+    /**
+     * Returns unique id for binding key
+     */
+    public function getBindingKey(): string
+    {
+        return 'RawSql' . spl_object_id($this);
+    }
+}
diff --git a/tests/system/Database/RawSqlTest.php b/tests/system/Database/RawSqlTest.php
new file mode 100644
index 000000000000..a271486141a7
--- /dev/null
+++ b/tests/system/Database/RawSqlTest.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database;
+
+use CodeIgniter\Test\CIUnitTestCase;
+
+/**
+ * @internal
+ */
+final class RawSqlTest extends CIUnitTestCase
+{
+    public function testCanConvertToString()
+    {
+        $expected = 'REGEXP_SUBSTR(ral_anno,"[0-9]{1,2}([,.][0-9]{1,3})([,.][0-9]{1,3})") AS ral';
+        $rawSql   = new RawSql($expected);
+
+        $this->assertSame($expected, (string) $rawSql);
+    }
+
+    public function testCanCreateNewObject()
+    {
+        $firstSql = 'a = 1 AND b = 2';
+        $rawSql   = new RawSql($firstSql);
+
+        $secondSql = 'a = 1 AND b = 2 OR c = 3';
+        $newRawSQL = $rawSql->with($secondSql);
+
+        $this->assertSame($firstSql, (string) $rawSql);
+        $this->assertSame($secondSql, (string) $newRawSQL);
+    }
+
+    public function testGetBindingKey()
+    {
+        $firstSql = 'a = 1 AND b = 2';
+        $rawSql   = new RawSql($firstSql);
+
+        $key = $rawSql->getBindingKey();
+
+        $this->assertMatchesRegularExpression('/\ARawSql[0-9]+\z/', $key);
+    }
+}

From e8687c76324f38a502fd7b47dd3b05356ea8a140 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 21 Mar 2022 14:42:58 +0900
Subject: [PATCH 2076/2325] feat: select() supports RawSql

---
 system/Database/BaseBuilder.php              |  8 ++++++++
 tests/system/Database/Builder/SelectTest.php | 15 +++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 1d0c241903e8..4321d699007c 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -371,6 +371,12 @@ public function select($select = '*', ?bool $escape = null)
             $escape = $this->db->protectIdentifiers;
         }
 
+        if ($select instanceof RawSql) {
+            $this->QBSelect[] = $select;
+
+            return $this;
+        }
+
         foreach ($select as $val) {
             $val = trim($val);
 
@@ -2339,6 +2345,8 @@ protected function compileSelect($selectOverride = false): string
 
             if (empty($this->QBSelect)) {
                 $sql .= '*';
+            } elseif ($this->QBSelect[0] instanceof RawSql) {
+                $sql .= (string) $this->QBSelect[0];
             } else {
                 // Cycle through the "select" portion of the query and prep each column name.
                 // The reason we protect identifiers here rather than in the select() function
diff --git a/tests/system/Database/Builder/SelectTest.php b/tests/system/Database/Builder/SelectTest.php
index 97460f0010da..808e581d6ce5 100644
--- a/tests/system/Database/Builder/SelectTest.php
+++ b/tests/system/Database/Builder/SelectTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Database\Exceptions\DataException;
+use CodeIgniter\Database\RawSql;
 use CodeIgniter\Database\SQLSRV\Builder as SQLSRVBuilder;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
@@ -95,6 +96,20 @@ public function testSelectWorksWithComplexSelects()
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/4355
+     */
+    public function testSelectWorksWithRawSql()
+    {
+        $builder = new BaseBuilder('users', $this->db);
+
+        $sql = 'REGEXP_SUBSTR(ral_anno,"[0-9]{1,2}([,.][0-9]{1,3})([,.][0-9]{1,3})") AS ral';
+        $builder->select(new RawSql($sql));
+
+        $expected = 'SELECT ' . $sql . ' FROM "users"';
+        $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
+
     public function testSelectMinWithNoAlias()
     {
         $builder = new BaseBuilder('invoices', $this->db);

From 04c68b49224d6d01d902b2f235e7b0627b11c3ab Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 31 Mar 2022 18:01:10 +0900
Subject: [PATCH 2077/2325] feat: where() supports RawSql

---
 system/Database/BaseBuilder.php             | 55 +++++++++++++--------
 tests/system/Database/Builder/WhereTest.php | 15 ++++++
 2 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 4321d699007c..51960986de54 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -356,7 +356,7 @@ public function ignore(bool $ignore = true)
     /**
      * Generates the SELECT portion of the query
      *
-     * @param array|string $select
+     * @param array|RawSql|string $select
      *
      * @return $this
      */
@@ -649,8 +649,8 @@ public function join(string $table, string $cond, string $type = '', ?bool $esca
      * Generates the WHERE portion of the query.
      * Separates multiple calls with 'AND'.
      *
-     * @param mixed $key
-     * @param mixed $value
+     * @param array|RawSql|string $key
+     * @param mixed               $value
      *
      * @return $this
      */
@@ -665,9 +665,9 @@ public function where($key, $value = null, ?bool $escape = null)
      * Generates the WHERE portion of the query.
      * Separates multiple calls with 'OR'.
      *
-     * @param mixed $key
-     * @param mixed $value
-     * @param bool  $escape
+     * @param array|RawSql|string $key
+     * @param mixed               $value
+     * @param bool                $escape
      *
      * @return $this
      */
@@ -682,15 +682,20 @@ public function orWhere($key, $value = null, ?bool $escape = null)
      * @used-by having()
      * @used-by orHaving()
      *
-     * @param mixed $key
-     * @param mixed $value
+     * @param array|RawSql|string $key
+     * @param mixed               $value
      *
      * @return $this
      */
     protected function whereHaving(string $qbKey, $key, $value = null, string $type = 'AND ', ?bool $escape = null)
     {
-        if (! is_array($key)) {
-            $key = [$key => $value];
+        if ($key instanceof RawSql) {
+            $keyValue = [(string) $key => $key];
+            $escape   = false;
+        } elseif (! is_array($key)) {
+            $keyValue = [$key => $value];
+        } else {
+            $keyValue = $key;
         }
 
         // If the escape value was not set will base it on the global setting
@@ -698,10 +703,13 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
             $escape = $this->db->protectIdentifiers;
         }
 
-        foreach ($key as $k => $v) {
+        foreach ($keyValue as $k => $v) {
             $prefix = empty($this->{$qbKey}) ? $this->groupGetType('') : $this->groupGetType($type);
 
-            if ($v !== null) {
+            if ($v instanceof RawSql) {
+                $k  = '';
+                $op = '';
+            } elseif ($v !== null) {
                 $op = $this->getOperator($k, true);
 
                 if (! empty($op)) {
@@ -737,10 +745,17 @@ protected function whereHaving(string $qbKey, $key, $value = null, string $type
                 $op = '';
             }
 
-            $this->{$qbKey}[] = [
-                'condition' => $prefix . $k . $op . $v,
-                'escape'    => $escape,
-            ];
+            if ($v instanceof RawSql) {
+                $this->{$qbKey}[] = [
+                    'condition' => $v->with($prefix . $k . $op . $v),
+                    'escape'    => $escape,
+                ];
+            } else {
+                $this->{$qbKey}[] = [
+                    'condition' => $prefix . $k . $op . $v,
+                    'escape'    => $escape,
+                ];
+            }
         }
 
         return $this;
@@ -1275,8 +1290,8 @@ public function groupBy($by, ?bool $escape = null)
     /**
      * Separates multiple calls with 'AND'.
      *
-     * @param array|string $key
-     * @param mixed        $value
+     * @param array|RawSql|string $key
+     * @param mixed               $value
      *
      * @return $this
      */
@@ -1288,8 +1303,8 @@ public function having($key, $value = null, ?bool $escape = null)
     /**
      * Separates multiple calls with 'OR'.
      *
-     * @param array|string $key
-     * @param mixed        $value
+     * @param array|RawSql|string $key
+     * @param mixed               $value
      *
      * @return $this
      */
diff --git a/tests/system/Database/Builder/WhereTest.php b/tests/system/Database/Builder/WhereTest.php
index ace628f6bc38..a10f20e8545d 100644
--- a/tests/system/Database/Builder/WhereTest.php
+++ b/tests/system/Database/Builder/WhereTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
+use CodeIgniter\Database\RawSql;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 use stdClass;
@@ -140,6 +141,20 @@ public function testWhereCustomString()
         $this->assertSame($expectedBinds, $builder->getBinds());
     }
 
+    public function testWhereRawSql()
+    {
+        $builder = $this->db->table('jobs');
+
+        $sql = "id > 2 AND name != 'Accountant'";
+        $builder->where(new RawSql($sql));
+
+        $expectedSQL   = "SELECT * FROM \"jobs\" WHERE id > 2 AND name != 'Accountant'";
+        $expectedBinds = [];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
     public function testWhereValueSubQuery()
     {
         $expectedSQL = 'SELECT * FROM "neworder" WHERE "advance_amount" < (SELECT MAX(advance_amount) FROM "orders" WHERE "id" > 2)';

From 8c0566046a4de9b720f8880313d74b8b13187961 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 31 Mar 2022 18:04:25 +0900
Subject: [PATCH 2078/2325] feat: like() supports RawSql

---
 system/Database/BaseBuilder.php            | 68 +++++++++++++++++-----
 tests/system/Database/Builder/LikeTest.php | 24 ++++++++
 2 files changed, 78 insertions(+), 14 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 51960986de54..6a19032eda5a 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -932,7 +932,7 @@ protected function _whereIn(?string $key = null, $values = null, bool $not = fal
      * Generates a %LIKE% portion of the query.
      * Separates multiple calls with 'AND'.
      *
-     * @param mixed $field
+     * @param array|RawSql|string $field
      *
      * @return $this
      */
@@ -945,7 +945,7 @@ public function like($field, string $match = '', string $side = 'both', ?bool $e
      * Generates a NOT LIKE portion of the query.
      * Separates multiple calls with 'AND'.
      *
-     * @param mixed $field
+     * @param array|RawSql|string $field
      *
      * @return $this
      */
@@ -958,7 +958,7 @@ public function notLike($field, string $match = '', string $side = 'both', ?bool
      * Generates a %LIKE% portion of the query.
      * Separates multiple calls with 'OR'.
      *
-     * @param mixed $field
+     * @param array|RawSql|string $field
      *
      * @return $this
      */
@@ -971,7 +971,7 @@ public function orLike($field, string $match = '', string $side = 'both', ?bool
      * Generates a NOT LIKE portion of the query.
      * Separates multiple calls with 'OR'.
      *
-     * @param mixed $field
+     * @param array|RawSql|string $field
      *
      * @return $this
      */
@@ -984,7 +984,7 @@ public function orNotLike($field, string $match = '', string $side = 'both', ?bo
      * Generates a %LIKE% portion of the query.
      * Separates multiple calls with 'AND'.
      *
-     * @param mixed $field
+     * @param array|RawSql|string $field
      *
      * @return $this
      */
@@ -997,7 +997,7 @@ public function havingLike($field, string $match = '', string $side = 'both', ?b
      * Generates a NOT LIKE portion of the query.
      * Separates multiple calls with 'AND'.
      *
-     * @param mixed $field
+     * @param array|RawSql|string $field
      *
      * @return $this
      */
@@ -1010,7 +1010,7 @@ public function notHavingLike($field, string $match = '', string $side = 'both',
      * Generates a %LIKE% portion of the query.
      * Separates multiple calls with 'OR'.
      *
-     * @param mixed $field
+     * @param array|RawSql|string $field
      *
      * @return $this
      */
@@ -1023,7 +1023,7 @@ public function orHavingLike($field, string $match = '', string $side = 'both',
      * Generates a NOT LIKE portion of the query.
      * Separates multiple calls with 'OR'.
      *
-     * @param mixed $field
+     * @param array|RawSql|string $field
      *
      * @return $this
      */
@@ -1042,20 +1042,54 @@ public function orNotHavingLike($field, string $match = '', string $side = 'both
      * @used-by notHavingLike()
      * @used-by orNotHavingLike()
      *
-     * @param mixed $field
+     * @param array|RawSql|string $field
      *
      * @return $this
      */
     protected function _like($field, string $match = '', string $type = 'AND ', string $side = 'both', string $not = '', ?bool $escape = null, bool $insensitiveSearch = false, string $clause = 'QBWhere')
     {
-        if (! is_array($field)) {
-            $field = [$field => $match];
-        }
-
         $escape = is_bool($escape) ? $escape : $this->db->protectIdentifiers;
         $side   = strtolower($side);
 
-        foreach ($field as $k => $v) {
+        if ($field instanceof RawSql) {
+            $k                 = (string) $field;
+            $v                 = $match;
+            $insensitiveSearch = false;
+
+            $prefix = empty($this->{$clause}) ? $this->groupGetType('') : $this->groupGetType($type);
+
+            if ($side === 'none') {
+                $bind = $this->setBind($field->getBindingKey(), $v, $escape);
+            } elseif ($side === 'before') {
+                $bind = $this->setBind($field->getBindingKey(), "%{$v}", $escape);
+            } elseif ($side === 'after') {
+                $bind = $this->setBind($field->getBindingKey(), "{$v}%", $escape);
+            } else {
+                $bind = $this->setBind($field->getBindingKey(), "%{$v}%", $escape);
+            }
+
+            $likeStatement = $this->_like_statement($prefix, $k, $not, $bind, $insensitiveSearch);
+
+            // some platforms require an escape sequence definition for LIKE wildcards
+            if ($escape === true && $this->db->likeEscapeStr !== '') {
+                $likeStatement .= sprintf($this->db->likeEscapeStr, $this->db->likeEscapeChar);
+            }
+
+            $this->{$clause}[] = [
+                'condition' => $field->with($likeStatement),
+                'escape'    => $escape,
+            ];
+
+            return $this;
+        }
+
+        if (! is_array($field)) {
+            $keyValue = [$field => $match];
+        } else {
+            $keyValue = $field;
+        }
+
+        foreach ($keyValue as $k => $v) {
             if ($insensitiveSearch === true) {
                 $v = strtolower($v);
             }
@@ -2430,6 +2464,12 @@ protected function compileWhereHaving(string $qbKey): string
                     continue;
                 }
 
+                if ($qbkey['condition'] instanceof RawSql) {
+                    $qbkey = $qbkey['condition'];
+
+                    continue;
+                }
+
                 if ($qbkey['escape'] === false) {
                     $qbkey = $qbkey['condition'];
 
diff --git a/tests/system/Database/Builder/LikeTest.php b/tests/system/Database/Builder/LikeTest.php
index 2d81db2b90fa..22afc5c7549c 100644
--- a/tests/system/Database/Builder/LikeTest.php
+++ b/tests/system/Database/Builder/LikeTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Database\Builder;
 
 use CodeIgniter\Database\BaseBuilder;
+use CodeIgniter\Database\RawSql;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
@@ -47,6 +48,29 @@ public function testSimpleLike()
         $this->assertSame($expectedBinds, $builder->getBinds());
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/3970
+     */
+    public function testLikeWithRawSql()
+    {
+        $builder = new BaseBuilder('users', $this->db);
+
+        $sql    = "concat(users.name, ' ', IF(users.surname IS NULL or users.surname = '', '', users.surname))";
+        $rawSql = new RawSql($sql);
+        $builder->like($rawSql, 'value', 'both');
+
+        $expectedSQL   = "SELECT * FROM \"users\" WHERE  {$sql}  LIKE '%value%' ESCAPE '!' ";
+        $expectedBinds = [
+            $rawSql->getBindingKey() => [
+                '%value%',
+                true,
+            ],
+        ];
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+        $this->assertSame($expectedBinds, $builder->getBinds());
+    }
+
     public function testLikeNoSide()
     {
         $builder = new BaseBuilder('job', $this->db);

From 76dccbf81994b46c64edee8b961a7506179a8091 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 1 Apr 2022 12:28:09 +0900
Subject: [PATCH 2079/2325] refactor: vendor/bin/rector

---
 system/Database/BaseBuilder.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 6a19032eda5a..be1aee7e1a60 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -1083,11 +1083,7 @@ protected function _like($field, string $match = '', string $type = 'AND ', stri
             return $this;
         }
 
-        if (! is_array($field)) {
-            $keyValue = [$field => $match];
-        } else {
-            $keyValue = $field;
-        }
+        $keyValue = ! is_array($field) ? [$field => $match] : $field;
 
         foreach ($keyValue as $k => $v) {
             if ($insensitiveSearch === true) {

From 32e90d00df0a26cb720292a751b4511363834055 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 13 Apr 2022 15:00:43 +0900
Subject: [PATCH 2080/2325] docs: add section headings and fix title level

---
 .../source/database/query_builder.rst         | 222 +++++++++++++-----
 1 file changed, 159 insertions(+), 63 deletions(-)

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 5e05f0ce6b0b..c2533f7c6e38 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -41,7 +41,8 @@ The following methods allow you to build SQL **SELECT** statements.
 Get
 ===
 
-**$builder->get()**
+$builder->get()
+---------------
 
 Runs the selection query and returns the result. Can be used by itself
 to retrieve all records from a table:
@@ -61,7 +62,8 @@ $query, which can be used to show the results:
 Please visit the :doc:`getResult*() method <results>` page for a full
 discussion regarding result generation.
 
-**$builder->getCompiledSelect()**
+$builder->getCompiledSelect()
+-----------------------------
 
 Compiles the selection query just like ``$builder->get()`` but does not *run*
 the query. This method simply returns the SQL query as a string.
@@ -81,7 +83,8 @@ parameter. The reason for this outcome is because the query has not been
 executed using ``$builder->get()`` which resets values or reset directly
 using ``$builder->resetQuery()``.
 
-**$builder->getWhere()**
+$builder->getWhere()
+--------------------
 
 Identical to the ``get()`` method except that it permits you to add a
 "where" clause in the first parameter, instead of using the ``$builder->where()``
@@ -96,7 +99,8 @@ Please read about the ``where()`` method below for more information.
 Select
 ======
 
-**$builder->select()**
+$builder->select()
+------------------
 
 Permits you to write the **SELECT** portion of your query:
 
@@ -113,14 +117,16 @@ escaping of fields may break them.
 
 .. literalinclude:: query_builder/009.php
 
-**$builder->selectMax()**
+$builder->selectMax()
+---------------------
 
 Writes a **SELECT MAX(field)** portion for your query. You can optionally
 include a second parameter to rename the resulting field.
 
 .. literalinclude:: query_builder/010.php
 
-**$builder->selectMin()**
+$builder->selectMin()
+---------------------
 
 Writes a **SELECT MIN(field)** portion for your query. As with
 ``selectMax()``, You can optionally include a second parameter to rename
@@ -128,7 +134,8 @@ the resulting field.
 
 .. literalinclude:: query_builder/011.php
 
-**$builder->selectAvg()**
+$builder->selectAvg()
+---------------------
 
 Writes a **SELECT AVG(field)** portion for your query. As with
 ``selectMax()``, You can optionally include a second parameter to rename
@@ -136,7 +143,8 @@ the resulting field.
 
 .. literalinclude:: query_builder/012.php
 
-**$builder->selectSum()**
+$builder->selectSum()
+---------------------
 
 Writes a **SELECT SUM(field)** portion for your query. As with
 ``selectMax()``, You can optionally include a second parameter to rename
@@ -144,7 +152,8 @@ the resulting field.
 
 .. literalinclude:: query_builder/013.php
 
-**$builder->selectCount()**
+$builder->selectCount()
+-----------------------
 
 Writes a **SELECT COUNT(field)** portion for your query. As with
 ``selectMax()``, You can optionally include a second parameter to rename
@@ -155,7 +164,8 @@ the resulting field.
 
 .. literalinclude:: query_builder/014.php
 
-**$builder->selectSubquery()**
+$builder->selectSubquery()
+--------------------------
 
 Adds a subquery to the SELECT section.
 
@@ -165,7 +175,8 @@ Adds a subquery to the SELECT section.
 From
 ====
 
-**$builder->from()**
+$builder->from()
+----------------
 
 Permits you to write the **FROM** portion of your query:
 
@@ -180,7 +191,8 @@ Permits you to write the **FROM** portion of your query:
 Subqueries
 ==========
 
-**$builder->fromSubquery()**
+$builder->fromSubquery()
+------------------------
 
 Permits you to write part of a **FROM** query as a subquery.
 
@@ -195,7 +207,8 @@ Use the ``$db->newQuery()`` method to make a subquery the main table:
 Join
 ====
 
-**$builder->join()**
+$builder->join()
+----------------
 
 Permits you to write the **JOIN** portion of your query:
 
@@ -214,7 +227,11 @@ outer``, and ``right outer``.
 Looking for Specific Data
 *************************
 
-**$builder->where()**
+Where
+=====
+
+$builder->where()
+-----------------
 
 This method enables you to set **WHERE** clauses using one of five
 methods:
@@ -268,14 +285,16 @@ methods:
 
     .. literalinclude:: query_builder/028.php
 
-**$builder->orWhere()**
+$builder->orWhere()
+-------------------
 
 This method is identical to the one above, except that multiple
 instances are joined by **OR**:
 
 .. literalinclude:: query_builder/029.php
 
-**$builder->whereIn()**
+$builder->whereIn()
+-------------------
 
 Generates a **WHERE** field IN ('item', 'item') SQL query joined with **AND** if
 appropriate:
@@ -286,7 +305,8 @@ You can use subqueries instead of an array of values:
 
 .. literalinclude:: query_builder/031.php
 
-**$builder->orWhereIn()**
+$builder->orWhereIn()
+---------------------
 
 Generates a **WHERE field IN ('item', 'item')** SQL query joined with **OR** if
 appropriate:
@@ -297,7 +317,8 @@ You can use subqueries instead of an array of values:
 
 .. literalinclude:: query_builder/033.php
 
-**$builder->whereNotIn()**
+$builder->whereNotIn()
+----------------------
 
 Generates a **WHERE field NOT IN ('item', 'item')** SQL query joined with
 **AND** if appropriate:
@@ -308,7 +329,8 @@ You can use subqueries instead of an array of values:
 
 .. literalinclude:: query_builder/035.php
 
-**$builder->orWhereNotIn()**
+$builder->orWhereNotIn()
+------------------------
 
 Generates a **WHERE field NOT IN ('item', 'item')** SQL query joined with **OR**
 if appropriate:
@@ -323,7 +345,11 @@ You can use subqueries instead of an array of values:
 Looking for Similar Data
 ************************
 
-**$builder->like()**
+Like
+====
+
+$builder->like()
+----------------
 
 This method enables you to generate **LIKE** clauses, useful for doing
 searches.
@@ -354,28 +380,32 @@ searches.
 
        .. literalinclude:: query_builder/041.php
 
-**$builder->orLike()**
+$builder->orLike()
+------------------
 
 This method is identical to the one above, except that multiple
 instances are joined by **OR**:
 
 .. literalinclude:: query_builder/042.php
 
-**$builder->notLike()**
+$builder->notLike()
+-------------------
 
 This method is identical to ``like()``, except that it generates
 **NOT LIKE** statements:
 
 .. literalinclude:: query_builder/043.php
 
-**$builder->orNotLike()**
+$builder->orNotLike()
+---------------------
 
 This method is identical to ``notLike()``, except that multiple
 instances are joined by **OR**:
 
 .. literalinclude:: query_builder/044.php
 
-**$builder->groupBy()**
+$builder->groupBy()
+-------------------
 
 Permits you to write the **GROUP BY** portion of your query:
 
@@ -385,13 +415,15 @@ You can also pass an array of multiple values as well:
 
 .. literalinclude:: query_builder/046.php
 
-**$builder->distinct()**
+$builder->distinct()
+--------------------
 
 Adds the **DISTINCT** keyword to a query
 
 .. literalinclude:: query_builder/047.php
 
-**$builder->having()**
+$builder->having()
+------------------
 
 Permits you to write the **HAVING** portion of your query. There are 2
 possible syntaxes, 1 argument or 2:
@@ -408,11 +440,13 @@ setting it to ``false``.
 
 .. literalinclude:: query_builder/050.php
 
-**$builder->orHaving()**
+$builder->orHaving()
+--------------------
 
 Identical to ``having()``, only separates multiple clauses with **OR**.
 
-**$builder->havingIn()**
+$builder->havingIn()
+--------------------
 
 Generates a **HAVING field IN ('item', 'item')** SQL query joined with **AND** if
 appropriate:
@@ -423,7 +457,8 @@ You can use subqueries instead of an array of values:
 
 .. literalinclude:: query_builder/052.php
 
-**$builder->orHavingIn()**
+$builder->orHavingIn()
+----------------------
 
 Generates a **HAVING field IN ('item', 'item')** SQL query joined with **OR** if
 appropriate
@@ -434,7 +469,8 @@ You can use subqueries instead of an array of values:
 
 .. literalinclude:: query_builder/054.php
 
-**$builder->havingNotIn()**
+$builder->havingNotIn()
+-----------------------
 
 Generates a **HAVING field NOT IN ('item', 'item')** SQL query joined with
 **AND** if appropriate
@@ -445,7 +481,8 @@ You can use subqueries instead of an array of values:
 
 .. literalinclude:: query_builder/056.php
 
-**$builder->orHavingNotIn()**
+$builder->orHavingNotIn()
+-------------------------
 
 Generates a **HAVING field NOT IN ('item', 'item')** SQL query joined with **OR**
 if appropriate
@@ -456,7 +493,8 @@ You can use subqueries instead of an array of values:
 
 .. literalinclude:: query_builder/058.php
 
-**$builder->havingLike()**
+$builder->havingLike()
+----------------------
 
 This method enables you to generate **LIKE** clauses for **HAVING** part or the query, useful for doing
 searches.
@@ -487,21 +525,24 @@ searches.
 
        .. literalinclude:: query_builder/062.php
 
-**$builder->orHavingLike()**
+$builder->orHavingLike()
+------------------------
 
 This method is identical to the one above, except that multiple
 instances are joined by **OR**:
 
 .. literalinclude:: query_builder/063.php
 
-**$builder->notHavingLike()**
+$builder->notHavingLike()
+-------------------------
 
 This method is identical to ``havingLike()``, except that it generates
 **NOT LIKE** statements:
 
 .. literalinclude:: query_builder/064.php
 
-**$builder->orNotHavingLike()**
+$builder->orNotHavingLike()
+---------------------------
 
 This method is identical to ``notHavingLike()``, except that multiple
 instances are joined by **OR**:
@@ -512,7 +553,11 @@ instances are joined by **OR**:
 Ordering Results
 ****************
 
-**$builder->orderBy()**
+OrderBy
+=======
+
+$builder->orderBy()
+-------------------
 
 Lets you set an **ORDER BY** clause.
 
@@ -540,7 +585,11 @@ be ignored, unless you specify a numeric seed value.
 Limiting or Counting Results
 ****************************
 
-**$builder->limit()**
+Limit
+=====
+
+$builder->limit()
+-----------------
 
 Lets you limit the number of rows you would like returned by the query:
 
@@ -550,7 +599,8 @@ The second parameter lets you set a result offset.
 
 .. literalinclude:: query_builder/071.php
 
-**$builder->countAllResults()**
+$builder->countAllResults()
+---------------------------
 
 Permits you to determine the number of rows in a particular Query
 Builder query. Queries will accept Query Builder restrictors such as
@@ -564,7 +614,8 @@ first parameter.
 
 .. literalinclude:: query_builder/073.php
 
-**$builder->countAll()**
+$builder->countAll()
+--------------------
 
 Permits you to determine the number of rows in a particular table.
 Example:
@@ -579,6 +630,9 @@ first parameter.
 Query grouping
 **************
 
+Group
+=====
+
 Query grouping allows you to create groups of **WHERE** clauses by enclosing them in parentheses. This will allow
 you to create queries with complex **WHERE** clauses. Nested groups are supported. Example:
 
@@ -586,43 +640,53 @@ you to create queries with complex **WHERE** clauses. Nested groups are supporte
 
 .. note:: Groups need to be balanced, make sure every ``groupStart()`` is matched by a ``groupEnd()``.
 
-**$builder->groupStart()**
+$builder->groupStart()
+----------------------
 
 Starts a new group by adding an opening parenthesis to the **WHERE** clause of the query.
 
-**$builder->orGroupStart()**
+$builder->orGroupStart()
+------------------------
 
 Starts a new group by adding an opening parenthesis to the **WHERE** clause of the query, prefixing it with **OR**.
 
-**$builder->notGroupStart()**
+$builder->notGroupStart()
+-------------------------
 
 Starts a new group by adding an opening parenthesis to the **WHERE** clause of the query, prefixing it with **NOT**.
 
-**$builder->orNotGroupStart()**
+$builder->orNotGroupStart()
+---------------------------
 
 Starts a new group by adding an opening parenthesis to the **WHERE** clause of the query, prefixing it with **OR NOT**.
 
-**$builder->groupEnd()**
+$builder->groupEnd()
+--------------------
 
 Ends the current group by adding a closing parenthesis to the **WHERE** clause of the query.
 
-**$builder->havingGroupStart()**
+$builder->havingGroupStart()
+----------------------------
 
 Starts a new group by adding an opening parenthesis to the **HAVING** clause of the query.
 
-**$builder->orHavingGroupStart()**
+$builder->orHavingGroupStart()
+------------------------------
 
 Starts a new group by adding an opening parenthesis to the **HAVING** clause of the query, prefixing it with **OR**.
 
-**$builder->notHavingGroupStart()**
+$builder->notHavingGroupStart()
+-------------------------------
 
 Starts a new group by adding an opening parenthesis to the **HAVING** clause of the query, prefixing it with **NOT**.
 
-**$builder->orNotHavingGroupStart()**
+$builder->orNotHavingGroupStart()
+---------------------------------
 
 Starts a new group by adding an opening parenthesis to the **HAVING** clause of the query, prefixing it with **OR NOT**.
 
-**$builder->havingGroupEnd()**
+$builder->havingGroupEnd()
+--------------------------
 
 Ends the current group by adding a closing parenthesis to the **HAVING** clause of the query.
 
@@ -630,7 +694,11 @@ Ends the current group by adding a closing parenthesis to the **HAVING** clause
 Inserting Data
 **************
 
-**$builder->insert()**
+Insert
+======
+
+$builder->insert()
+------------------
 
 Generates an insert string based on the data you supply, and runs the
 query. You can either pass an **array** or an **object** to the
@@ -648,7 +716,8 @@ The first parameter is an object.
 
 .. note:: All values are escaped automatically producing safer queries.
 
-**$builder->ignore()**
+$builder->ignore()
+------------------
 
 Generates an insert ignore string based on the data you supply, and runs the
 query. So if an entry with the same primary key already exists, the query won't be inserted.
@@ -656,7 +725,8 @@ You can optionally pass an **boolean** to the method. Here is an example using t
 
 .. literalinclude:: query_builder/078.php
 
-**$builder->getCompiledInsert()**
+$builder->getCompiledInsert()
+-----------------------------
 
 Compiles the insertion query just like ``$builder->insert()`` but does not
 *run* the query. This method simply returns the SQL query as a string.
@@ -676,7 +746,11 @@ using ``$builder->insert()`` which resets values or reset directly using
 
 .. note:: This method doesn't work for batch inserts.
 
-**$builder->insertBatch()**
+insertBatch
+===========
+
+$builder->insertBatch()
+-----------------------
 
 Generates an insert string based on the data you supply, and runs the
 query. You can either pass an **array** or an **object** to the
@@ -692,7 +766,11 @@ The first parameter is an associative array of values.
 Updating Data
 *************
 
-**$builder->replace()**
+Update
+======
+
+$builder->replace()
+-------------------
 
 This method executes a **REPLACE** statement, which is basically the SQL
 standard for (optional) **DELETE** + **INSERT**, using *PRIMARY* and *UNIQUE*
@@ -712,7 +790,8 @@ will be deleted with our new row data replacing it.
 Usage of the ``set()`` method is also allowed and all fields are
 automatically escaped, just like with ``insert()``.
 
-**$builder->set()**
+$builder->set()
+---------------
 
 This method enables you to set values for inserts or updates.
 
@@ -741,7 +820,8 @@ Or an object:
 
 .. literalinclude:: query_builder/087.php
 
-**$builder->update()**
+$builder->update()
+------------------
 
 Generates an update string and runs the query based on the data you
 supply. You can pass an **array** or an **object** to the method. Here
@@ -768,7 +848,11 @@ Or as an array:
 You may also use the ``$builder->set()`` method described above when
 performing updates.
 
-**$builder->updateBatch()**
+UpdateBatch
+===========
+
+$builder->updateBatch()
+-----------------------
 
 Generates an update string based on the data you supply, and runs the query.
 You can either pass an **array** or an **object** to the method.
@@ -784,7 +868,8 @@ The first parameter is an associative array of values, the second parameter is t
     due to the very nature of how it works. Instead, ``updateBatch()``
     returns the number of rows affected.
 
-**$builder->getCompiledUpdate()**
+$builder->getCompiledUpdate()
+-----------------------------
 
 This works exactly the same way as ``$builder->getCompiledInsert()`` except
 that it produces an **UPDATE** SQL string instead of an **INSERT** SQL string.
@@ -797,7 +882,11 @@ For more information view documentation for ``$builder->getCompiledInsert()``.
 Deleting Data
 *************
 
-**$builder->delete()**
+Delete
+======
+
+$builder->delete()
+------------------
 
 Generates a **DELETE** SQL string and runs the query.
 
@@ -812,14 +901,16 @@ the data to the first parameter of the method:
 If you want to delete all data from a table, you can use the ``truncate()``
 method, or ``emptyTable()``.
 
-**$builder->emptyTable()**
+$builder->emptyTable()
+----------------------
 
 Generates a **DELETE** SQL string and runs the
 query:
 
 .. literalinclude:: query_builder/095.php
 
-**$builder->truncate()**
+$builder->truncate()
+--------------------
 
 Generates a **TRUNCATE** SQL string and runs the query.
 
@@ -828,7 +919,8 @@ Generates a **TRUNCATE** SQL string and runs the query.
 .. note:: If the TRUNCATE command isn't available, ``truncate()`` will
     execute as "DELETE FROM table".
 
-**$builder->getCompiledDelete()**
+$builder->getCompiledDelete()
+-----------------------------
 
 This works exactly the same way as ``$builder->getCompiledInsert()`` except
 that it produces a **DELETE** SQL string instead of an **INSERT** SQL string.
@@ -850,7 +942,11 @@ multiple methods. Consider this example:
 Resetting Query Builder
 ***********************
 
-**$builder->resetQuery()**
+ResetQuery
+==========
+
+$builder->resetQuery()
+----------------------
 
 Resetting Query Builder allows you to start fresh with your query without
 executing it first using a method like ``$builder->get()`` or ``$builder->insert()``.

From 084a442c657360ec45b703f5a2c1100bf2952fb3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 13 Apr 2022 15:07:52 +0900
Subject: [PATCH 2081/2325] docs: add section titles

---
 .../source/database/query_builder.rst         | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index c2533f7c6e38..ef888f9ae1d7 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -242,7 +242,8 @@ methods:
 .. note:: ``$builder->where()`` accepts an optional third parameter. If you set it to
     ``false``, CodeIgniter will not try to protect your field or table names.
 
-#. **Simple key/value method:**
+1. Simple key/value method
+^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     .. literalinclude:: query_builder/021.php
 
@@ -253,14 +254,16 @@ methods:
 
     .. literalinclude:: query_builder/022.php
 
-#. **Custom key/value method:**
+2. Custom key/value method
+^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     You can include an operator in the first parameter in order to
     control the comparison:
 
     .. literalinclude:: query_builder/023.php
 
-#. **Associative array method:**
+3. Associative array method
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     .. literalinclude:: query_builder/024.php
 
@@ -268,7 +271,8 @@ methods:
 
     .. literalinclude:: query_builder/025.php
 
-#. **Custom string:**
+4. Custom string
+^^^^^^^^^^^^^^^^
 
     You can write your own clauses manually:
 
@@ -281,7 +285,8 @@ methods:
 
 .. _query-builder-where-subquery:
 
-5. **Subqueries:**
+5. Subqueries
+^^^^^^^^^^^^^
 
     .. literalinclude:: query_builder/028.php
 
@@ -361,7 +366,8 @@ searches.
         otherwise, will force the values to be lowercase, i.e., ``WHERE LOWER(column) LIKE '%search%'``. This
         may require indexes to be made for ``LOWER(column)`` instead of ``column`` to be effective.
 
-#. **Simple key/value method:**
+1. Simple key/value method
+^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     .. literalinclude:: query_builder/038.php
 
@@ -376,7 +382,8 @@ searches.
 
     .. literalinclude:: query_builder/040.php
 
-#. **Associative array method:**
+2. Associative array method
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
        .. literalinclude:: query_builder/041.php
 
@@ -506,7 +513,8 @@ searches.
     otherwise, will force the values to be lowercase, i.e., ``HAVING LOWER(column) LIKE '%search%'``. This
     may require indexes to be made for ``LOWER(column)`` instead of ``column`` to be effective.
 
-#. **Simple key/value method:**
+1. Simple key/value method
+^^^^^^^^^^^^^^^^^^^^^^^^^^
 
     .. literalinclude:: query_builder/059.php
 
@@ -521,7 +529,8 @@ searches.
 
     .. literalinclude:: query_builder/061.php
 
-#. **Associative array method:**
+2. Associative array method
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
        .. literalinclude:: query_builder/062.php
 

From 6bb2e5bf902d81545a1820f3138bc19049d3cd1a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 13 Apr 2022 15:46:59 +0900
Subject: [PATCH 2082/2325] docs: add about RawSql

---
 user_guide_src/source/changelogs/v4.2.0.rst   |  4 ++-
 .../source/database/query_builder.rst         | 35 ++++++++++++++++++-
 .../source/database/query_builder/099.php     |  7 ++++
 .../source/database/query_builder/100.php     |  6 ++++
 .../source/database/query_builder/101.php     |  7 ++++
 5 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 user_guide_src/source/database/query_builder/099.php
 create mode 100644 user_guide_src/source/database/query_builder/100.php
 create mode 100644 user_guide_src/source/database/query_builder/101.php

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 14e63e6990cb..04b42eff6f04 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -64,7 +64,9 @@ Others
 - Added 4th parameter ``$includeDir`` to ``get_filenames()``. See :php:func:`get_filenames`.
 - HTML helper ``script_tag()`` now uses ``null`` values to write boolean attributes in minimized form: ``<script src="..." defer />``. See the sample code for :php:func:`script_tag`.
 - RouteCollection::addRedirect() can now use placeholders.
-
+- QueryBuilder raw SQL string support
+    - Added the class ``CodeIgniter\Database\RawSql`` which expresses raw SQL strings.
+    - :ref:`select() <query-builder-select-rawsql>`, :ref:`where() <query-builder-where-rawsql>`, :ref:`like() <query-builder-like-rawsql>` accept the ``CodeIgniter\Database\RawSql`` instance.
 
 Changes
 *******
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index ef888f9ae1d7..9c8fe0dcaddc 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -117,6 +117,17 @@ escaping of fields may break them.
 
 .. literalinclude:: query_builder/009.php
 
+.. _query-builder-select-rawsql:
+
+RawSql
+^^^^^^
+
+Since v4.2.0, ``$builder->select()`` accepts a ``CodeIgniter\Database\RawSql`` instance, which expresses raw SQL strings.
+
+.. literalinclude:: query_builder/099.php
+
+.. warning:: When you use ``RawSql``, you MUST escape the data manually. Failure to do so could result in SQL injections.
+
 $builder->selectMax()
 ---------------------
 
@@ -283,9 +294,20 @@ methods:
 
         .. literalinclude:: query_builder/027.php
 
+.. _query-builder-where-rawsql:
+
+5. RawSql
+^^^^^^^^^
+
+    Since v4.2.0, ``$builder->where()`` accepts a ``CodeIgniter\Database\RawSql`` instance, which expresses raw SQL strings.
+
+    .. literalinclude:: query_builder/100.php
+
+    .. warning:: When you use ``RawSql``, you MUST escape the data manually. Failure to do so could result in SQL injections.
+
 .. _query-builder-where-subquery:
 
-5. Subqueries
+6. Subqueries
 ^^^^^^^^^^^^^
 
     .. literalinclude:: query_builder/028.php
@@ -387,6 +409,17 @@ searches.
 
        .. literalinclude:: query_builder/041.php
 
+.. _query-builder-like-rawsql:
+
+3. RawSql
+^^^^^^^^^
+
+    Since v4.2.0, ``$builder->like()`` accepts a ``CodeIgniter\Database\RawSql`` instance, which expresses raw SQL strings.
+
+    .. literalinclude:: query_builder/101.php
+
+    .. warning:: When you use ``RawSql``, you MUST escape the data manually. Failure to do so could result in SQL injections.
+
 $builder->orLike()
 ------------------
 
diff --git a/user_guide_src/source/database/query_builder/099.php b/user_guide_src/source/database/query_builder/099.php
new file mode 100644
index 000000000000..649a16951eea
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/099.php
@@ -0,0 +1,7 @@
+<?php
+
+use CodeIgniter\Database\RawSql;
+
+$sql = 'REGEXP_SUBSTR(ral_anno,"[0-9]{1,2}([,.][0-9]{1,3})([,.][0-9]{1,3})") AS ral';
+$builder->select(new RawSql($sql));
+$query = $builder->get();
diff --git a/user_guide_src/source/database/query_builder/100.php b/user_guide_src/source/database/query_builder/100.php
new file mode 100644
index 000000000000..a06497870b3b
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/100.php
@@ -0,0 +1,6 @@
+<?php
+
+use CodeIgniter\Database\RawSql;
+
+$sql = "id > 2 AND name != 'Accountant'";
+$builder->where(new RawSql($sql));
diff --git a/user_guide_src/source/database/query_builder/101.php b/user_guide_src/source/database/query_builder/101.php
new file mode 100644
index 000000000000..e00a0e84ac06
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/101.php
@@ -0,0 +1,7 @@
+<?php
+
+use CodeIgniter\Database\RawSql;
+
+$sql    = "CONCAT(users.name, ' ', IF(users.surname IS NULL OR users.surname = '', '', users.surname))";
+$rawSql = new RawSql($sql);
+$builder->like($rawSql, 'value', 'both');

From b3ab7145e6974fbc8390572b6ba305e0f8073138 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 13 Apr 2022 15:52:39 +0900
Subject: [PATCH 2083/2325] docs: fix indentation of selectSubquery method

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

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 9c8fe0dcaddc..145cf323340e 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -1116,7 +1116,7 @@ Class Reference
 
         Adds a ``SELECT COUNT(field)`` clause to a query.
 
-.. php:method:: selectSubquery(BaseBuilder $subquery, string $as)
+    .. php:method:: selectSubquery(BaseBuilder $subquery, string $as)
 
         :param string $subquery: Instance of BaseBuilder
         :param string $as: Alias for the resulting value name

From a02151b6bb45039892843598c0020c4459be6d63 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 13 Apr 2022 15:56:51 +0900
Subject: [PATCH 2084/2325] docs: update Class Reference

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

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 145cf323340e..a0094d0b98a2 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -1064,7 +1064,7 @@ Class Reference
 
     .. php:method:: select([$select = '*'[, $escape = null]])
 
-        :param string $select: The SELECT portion of a query
+        :param array|RawSql|string $select: The SELECT portion of a query
         :param bool $escape: Whether to escape values and identifiers
         :returns:   ``BaseBuilder`` instance (method chaining)
         :rtype:     ``BaseBuilder``
@@ -1165,7 +1165,7 @@ Class Reference
 
     .. php:method:: where($key[, $value = null[, $escape = null]])
 
-        :param mixed $key: Name of field to compare, or associative array
+        :param array|RawSql|string $key: Name of field to compare, or associative array
         :param mixed $value: If a single key, compared to this value
         :param bool    $escape: Whether to escape values and identifiers
         :returns:   ``BaseBuilder`` instance (method chaining)
@@ -1260,7 +1260,7 @@ Class Reference
 
     .. php:method:: like($field[, $match = ''[, $side = 'both'[, $escape = null[, $insensitiveSearch = false]]]])
 
-        :param string $field: Field name
+        :param array|RawSql|string $field: Field name
         :param string $match: Text portion to match
         :param string $side: Which side of the expression to put the '%' wildcard on
         :param bool    $escape: Whether to escape values and identifiers

From 5340ec65bbe97bf3692254d1d635dc335d8534c0 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 3 May 2022 10:16:55 +0900
Subject: [PATCH 2085/2325] feat: add AutoRouterImproved/AutoRouteCollector

---
 .../AutoRouterImproved/AutoRouteCollector.php | 138 ++++++++++++++++++
 .../AutoRouteCollectorTest.php                | 104 +++++++++++++
 2 files changed, 242 insertions(+)
 create mode 100644 system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php
 create mode 100644 tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php

diff --git a/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php b/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php
new file mode 100644
index 000000000000..0df2e6bff490
--- /dev/null
+++ b/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollector.php
@@ -0,0 +1,138 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved;
+
+use CodeIgniter\Commands\Utilities\Routes\ControllerFinder;
+use CodeIgniter\Commands\Utilities\Routes\FilterCollector;
+
+/**
+ * Collects data for Auto Routing Improved.
+ */
+final class AutoRouteCollector
+{
+    /**
+     * @var string namespace to search
+     */
+    private string $namespace;
+
+    private string $defaultController;
+    private string $defaultMethod;
+    private array $httpMethods;
+
+    /**
+     * List of controllers in Defined Routes that should not be accessed via Auto-Routing.
+     *
+     * @var class-string[]
+     */
+    private array $protectedControllers;
+
+    /**
+     * @param string $namespace namespace to search
+     */
+    public function __construct(
+        string $namespace,
+        string $defaultController,
+        string $defaultMethod,
+        array $httpMethods,
+        array $protectedControllers
+    ) {
+        $this->namespace            = $namespace;
+        $this->defaultController    = $defaultController;
+        $this->defaultMethod        = $defaultMethod;
+        $this->httpMethods          = $httpMethods;
+        $this->protectedControllers = $protectedControllers;
+    }
+
+    /**
+     * @return array<int, array<int, string>>
+     * @phpstan-return list<list<string>>
+     */
+    public function get(): array
+    {
+        $finder = new ControllerFinder($this->namespace);
+        $reader = new ControllerMethodReader($this->namespace, $this->httpMethods);
+
+        $tbody = [];
+
+        foreach ($finder->find() as $class) {
+            // Exclude controllers in Defined Routes.
+            if (in_array($class, $this->protectedControllers, true)) {
+                continue;
+            }
+
+            $routes = $reader->read(
+                $class,
+                $this->defaultController,
+                $this->defaultMethod
+            );
+
+            if ($routes === []) {
+                continue;
+            }
+
+            $routes = $this->addFilters($routes);
+
+            foreach ($routes as $item) {
+                $tbody[] = [
+                    strtoupper($item['method']) . '(auto)',
+                    $item['route'] . $item['route_params'],
+                    $item['handler'],
+                    $item['before'],
+                    $item['after'],
+                ];
+            }
+        }
+
+        return $tbody;
+    }
+
+    private function addFilters($routes)
+    {
+        $filterCollector = new FilterCollector(true);
+
+        foreach ($routes as &$route) {
+            // Search filters for the URI with all params
+            $sampleUri      = $this->generateSampleUri($route);
+            $filtersLongest = $filterCollector->get($route['method'], $route['route'] . $sampleUri);
+
+            // Search filters for the URI without optional params
+            $sampleUri       = $this->generateSampleUri($route, false);
+            $filtersShortest = $filterCollector->get($route['method'], $route['route'] . $sampleUri);
+
+            // Get common array elements
+            $filters['before'] = array_intersect($filtersLongest['before'], $filtersShortest['before']);
+            $filters['after']  = array_intersect($filtersLongest['after'], $filtersShortest['after']);
+
+            $route['before'] = implode(' ', array_map('class_basename', $filters['before']));
+            $route['after']  = implode(' ', array_map('class_basename', $filters['after']));
+        }
+
+        return $routes;
+    }
+
+    private function generateSampleUri(array $route, bool $longest = true): string
+    {
+        $sampleUri = '';
+
+        if (isset($route['params'])) {
+            $i = 1;
+
+            foreach ($route['params'] as $required) {
+                if ($longest && ! $required) {
+                    $sampleUri .= '/' . $i++;
+                }
+            }
+        }
+
+        return $sampleUri;
+    }
+}
diff --git a/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php
new file mode 100644
index 000000000000..0f368925d57f
--- /dev/null
+++ b/tests/system/Commands/Utilities/Routes/AutoRouterImproved/AutoRouteCollectorTest.php
@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use Config\Filters;
+use Config\Services;
+
+/**
+ * @internal
+ */
+final class AutoRouteCollectorTest extends CIUnitTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->resetServices(true);
+    }
+
+    private function createAutoRouteCollector(array $filterConfigFilters): AutoRouteCollector
+    {
+        $routes = Services::routes();
+        $routes->resetRoutes();
+        $routes->setAutoRoute(true);
+        config('Feature')->autoRoutesImproved = true;
+        $namespace                            = 'Tests\Support\Controllers';
+        $routes->setDefaultNamespace($namespace);
+
+        /** @var Filters $filterConfig */
+        $filterConfig          = config('Filters');
+        $filterConfig->filters = $filterConfigFilters;
+        Services::filters($filterConfig);
+
+        return new AutoRouteCollector(
+            $namespace,
+            'Home',
+            'index',
+            ['get', 'post'],
+            [],
+        );
+    }
+
+    public function testGetFilterMatches()
+    {
+        $filterConfigFilters = ['honeypot' => ['before' => ['newautorouting/save*']]];
+        $collector           = $this->createAutoRouteCollector($filterConfigFilters);
+
+        $routes = $collector->get();
+
+        $expected = [
+            0 => [
+                0 => 'GET(auto)',
+                1 => 'newautorouting',
+                2 => '\\Tests\\Support\\Controllers\\Newautorouting::getIndex',
+                3 => '',
+                4 => 'toolbar',
+            ],
+            1 => [
+                0 => 'POST(auto)',
+                1 => 'newautorouting/save/../..[/..]',
+                2 => '\\Tests\\Support\\Controllers\\Newautorouting::postSave',
+                3 => 'honeypot',
+                4 => 'toolbar',
+            ],
+        ];
+        $this->assertSame($expected, $routes);
+    }
+
+    public function testGetFilterDoesNotMatch()
+    {
+        $filterConfigFilters = ['honeypot' => ['before' => ['newautorouting/save/*/*']]];
+        $collector           = $this->createAutoRouteCollector($filterConfigFilters);
+
+        $routes = $collector->get();
+
+        $expected = [
+            0 => [
+                0 => 'GET(auto)',
+                1 => 'newautorouting',
+                2 => '\\Tests\\Support\\Controllers\\Newautorouting::getIndex',
+                3 => '',
+                4 => 'toolbar',
+            ],
+            1 => [
+                0 => 'POST(auto)',
+                1 => 'newautorouting/save/../..[/..]',
+                2 => '\\Tests\\Support\\Controllers\\Newautorouting::postSave',
+                3 => '',
+                4 => 'toolbar',
+            ],
+        ];
+        $this->assertSame($expected, $routes);
+    }
+}

From b21a18de5bbc36cc2f1c5cd901745dfe67d1fbf1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 3 May 2022 13:48:18 +0900
Subject: [PATCH 2086/2325] feat: add resetRoutes flag to search filters only
 for Auto Routes

---
 .../Utilities/Routes/FilterCollector.php      | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/system/Commands/Utilities/Routes/FilterCollector.php b/system/Commands/Utilities/Routes/FilterCollector.php
index 78d8e3132079..630416749115 100644
--- a/system/Commands/Utilities/Routes/FilterCollector.php
+++ b/system/Commands/Utilities/Routes/FilterCollector.php
@@ -21,6 +21,18 @@
  */
 final class FilterCollector
 {
+    /**
+     * Whether to reset Defined Routes.
+     *
+     * If set to true, route filters are not found.
+     */
+    private bool $resetRoutes;
+
+    public function __construct(bool $resetRoutes = false)
+    {
+        $this->resetRoutes = $resetRoutes;
+    }
+
     /**
      * @param string $method HTTP method
      * @param string $uri    URI path to find filters for
@@ -49,7 +61,13 @@ public function get(string $method, string $uri): array
 
     private function createRouter(Request $request): Router
     {
-        return new Router(Services::routes(), $request);
+        $routes = Services::routes();
+
+        if ($this->resetRoutes) {
+            $routes->resetRoutes();
+        }
+
+        return new Router($routes, $request);
     }
 
     private function createFilters(Request $request): Filters

From 63bcdf34c101c8b427834d9f30241d39ff617b8f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 3 May 2022 13:49:40 +0900
Subject: [PATCH 2087/2325] feat: use AutoRouteCollectorImproved()

---
 system/Commands/Utilities/Routes.php | 42 +++++++++++++++++++---------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/system/Commands/Utilities/Routes.php b/system/Commands/Utilities/Routes.php
index 754c1b9b2380..c8fc46bf3876 100644
--- a/system/Commands/Utilities/Routes.php
+++ b/system/Commands/Utilities/Routes.php
@@ -15,6 +15,7 @@
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
 use CodeIgniter\Commands\Utilities\Routes\AutoRouteCollector;
+use CodeIgniter\Commands\Utilities\Routes\AutoRouterImproved\AutoRouteCollector as AutoRouteCollectorImproved;
 use CodeIgniter\Commands\Utilities\Routes\FilterCollector;
 use CodeIgniter\Commands\Utilities\Routes\SampleURIGenerator;
 use Config\Services;
@@ -112,19 +113,34 @@ public function run(array $params)
         }
 
         if ($collection->shouldAutoRoute()) {
-            $autoRouteCollector = new AutoRouteCollector(
-                $collection->getDefaultNamespace(),
-                $collection->getDefaultController(),
-                $collection->getDefaultMethod()
-            );
-            $autoRoutes = $autoRouteCollector->get();
-
-            foreach ($autoRoutes as &$routes) {
-                // There is no `auto` method, but it is intentional not to get route filters.
-                $filters = $filterCollector->get('auto', $uriGenerator->get($routes[1]));
-
-                $routes[] = implode(' ', array_map('class_basename', $filters['before']));
-                $routes[] = implode(' ', array_map('class_basename', $filters['after']));
+            $autoRoutesImproved = config('Feature')->autoRoutesImproved ?? false;
+
+            if ($autoRoutesImproved) {
+                $autoRouteCollector = new AutoRouteCollectorImproved(
+                    $collection->getDefaultNamespace(),
+                    $collection->getDefaultController(),
+                    $collection->getDefaultMethod(),
+                    $methods,
+                    $collection->getRegisteredControllers('*')
+                );
+
+                $autoRoutes = $autoRouteCollector->get();
+            } else {
+                $autoRouteCollector = new AutoRouteCollector(
+                    $collection->getDefaultNamespace(),
+                    $collection->getDefaultController(),
+                    $collection->getDefaultMethod()
+                );
+
+                $autoRoutes = $autoRouteCollector->get();
+
+                foreach ($autoRoutes as &$routes) {
+                    // There is no `auto` method, but it is intentional not to get route filters.
+                    $filters = $filterCollector->get('auto', $uriGenerator->get($routes[1]));
+
+                    $routes[] = implode(' ', array_map('class_basename', $filters['before']));
+                    $routes[] = implode(' ', array_map('class_basename', $filters['after']));
+                }
             }
 
             $tbody = [...$tbody, ...$autoRoutes];

From bf3acd86da3e982686c1f0a7a8c7fdb63f6d3b49 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 3 May 2022 14:12:10 +0900
Subject: [PATCH 2088/2325] test: update existing tests

---
 .../Routes/AutoRouteCollectorTest.php         | 46 +++++++++++--------
 .../Utilities/Routes/ControllerFinderTest.php |  2 +-
 2 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php
index dd1c5db46b5f..12e82eef93af 100644
--- a/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php
+++ b/tests/system/Commands/Utilities/Routes/AutoRouteCollectorTest.php
@@ -30,87 +30,95 @@ public function testGet()
         $routes = $collector->get();
 
         $expected = [
-            0 => [
+            [
                 0 => 'auto',
                 1 => 'hello',
                 2 => '\\Tests\\Support\\Controllers\\Hello::index',
             ],
-            1 => [
+            [
                 0 => 'auto',
                 1 => 'hello/index[/...]',
                 2 => '\\Tests\\Support\\Controllers\\Hello::index',
             ],
-            2 => [
+            [
+                0 => 'auto',
+                1 => 'newautorouting/getIndex[/...]',
+                2 => '\Tests\Support\Controllers\Newautorouting::getIndex',
+            ],
+            [
+                0 => 'auto',
+                1 => 'newautorouting/postSave[/...]',
+                2 => '\Tests\Support\Controllers\Newautorouting::postSave',
+            ],
+            [
                 0 => 'auto',
                 1 => 'popcorn',
                 2 => '\\Tests\\Support\\Controllers\\Popcorn::index',
             ],
-            3 => [
+            [
                 0 => 'auto',
                 1 => 'popcorn/index[/...]',
                 2 => '\\Tests\\Support\\Controllers\\Popcorn::index',
             ],
-            4 => [
+            [
                 0 => 'auto',
                 1 => 'popcorn/pop[/...]',
                 2 => '\\Tests\\Support\\Controllers\\Popcorn::pop',
             ],
-            5 => [
+            [
                 0 => 'auto',
                 1 => 'popcorn/popper[/...]',
                 2 => '\\Tests\\Support\\Controllers\\Popcorn::popper',
             ],
-            6 => [
+            [
                 0 => 'auto',
                 1 => 'popcorn/weasel[/...]',
                 2 => '\\Tests\\Support\\Controllers\\Popcorn::weasel',
             ],
-            7 => [
+            [
                 0 => 'auto',
                 1 => 'popcorn/oops[/...]',
                 2 => '\\Tests\\Support\\Controllers\\Popcorn::oops',
-            ],
-            8 => [
+            ], [
                 0 => 'auto',
                 1 => 'popcorn/goaway[/...]',
                 2 => '\\Tests\\Support\\Controllers\\Popcorn::goaway',
-            ],
-            9 => [
+            ], [
                 0 => 'auto',
                 1 => 'popcorn/index3[/...]',
                 2 => '\\Tests\\Support\\Controllers\\Popcorn::index3',
             ],
-            10 => [
+            [
                 0 => 'auto',
                 1 => 'popcorn/canyon[/...]',
                 2 => '\\Tests\\Support\\Controllers\\Popcorn::canyon',
             ],
-            11 => [
+            [
                 0 => 'auto',
                 1 => 'popcorn/cat[/...]',
                 2 => '\\Tests\\Support\\Controllers\\Popcorn::cat',
             ],
-            12 => [
+            [
                 0 => 'auto',
                 1 => 'popcorn/json[/...]',
                 2 => '\\Tests\\Support\\Controllers\\Popcorn::json',
             ],
-            13 => [
+            [
                 0 => 'auto',
                 1 => 'popcorn/xml[/...]',
                 2 => '\\Tests\\Support\\Controllers\\Popcorn::xml',
             ],
-            14 => [
+            [
                 0 => 'auto',
                 1 => 'popcorn/toindex[/...]',
                 2 => '\\Tests\\Support\\Controllers\\Popcorn::toindex',
             ],
-            15 => [
+            [
                 0 => 'auto',
                 1 => 'popcorn/echoJson[/...]',
                 2 => '\\Tests\\Support\\Controllers\\Popcorn::echoJson',
             ],
-            16 => [
+            [
                 0 => 'auto',
                 1 => 'remap[/...]',
                 2 => '\\Tests\\Support\\Controllers\\Remap::_remap',
diff --git a/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php b/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php
index 175187a2dadb..ad5caf7c9e52 100644
--- a/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php
+++ b/tests/system/Commands/Utilities/Routes/ControllerFinderTest.php
@@ -26,7 +26,7 @@ public function testFind()
 
         $controllers = $finder->find();
 
-        $this->assertCount(3, $controllers);
+        $this->assertCount(4, $controllers);
         $this->assertSame(Hello::class, $controllers[0]);
     }
 }

From b9d1555bae0755be979a2d1a8d0eebb1df2b606a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 4 May 2022 08:42:35 +0900
Subject: [PATCH 2089/2325] docs: update comment

---
 app/Config/Routes.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 15371af7de5e..281bc89b8e63 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -21,9 +21,10 @@
 $routes->setDefaultMethod('index');
 $routes->setTranslateURIDashes(false);
 $routes->set404Override();
-// The auto-routing is very dangerous. It is easy to create vulnerable apps
+// The Auto Routing (Legacy) is very dangerous. It is easy to create vulnerable apps
 // where controller filters or CSRF protection are bypassed.
-// It is recommended that you do not set it to `true`.
+// If you don't want to define all routes, please use the Auto Routing (Improved).
+// Set `$autoRoutesImproved` to true in `app/Config/Feature.php` and set the following to true.
 //$routes->setAutoRoute(false);
 
 /*

From 3b3d679384b36e51ba3ad33b3fcce90476c21880 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 4 May 2022 09:17:47 +0900
Subject: [PATCH 2090/2325] docs: make title linkable

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

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 1ddabd1856e4..8b13bcbb0d4e 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -693,7 +693,8 @@ CodeIgniter has the following :doc:`command </cli/cli_commands>` to display all
 
 .. _spark-routes:
 
-**routes**
+routes
+======
 
 Displays all routes and filters::
 

From 51947660e422e2c9b29830d03c3ed7201b88df2c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 4 May 2022 09:18:15 +0900
Subject: [PATCH 2091/2325] docs: update the user guide

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

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 8b13bcbb0d4e..edbc7ff7f047 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -715,11 +715,25 @@ The output is like the following:
     | auto   | home/index[/...] | \App\Controllers\Home::index             | invalidchars   | secureheaders toolbar |
     +--------+------------------+------------------------------------------+----------------+-----------------------+
 
-The *Method* column shows the HTTP method that the route is listening for. ``auto`` means that the route is discovered by auto-routing, so it is not defined in **app/Config/Routes.php**.
+The *Method* column shows the HTTP method that the route is listening for. ``auto`` means that the route is discovered by Auto Routing (Legacy), so it is not defined in **app/Config/Routes.php**.
 
 The *Route* column shows the URI path to match. The route of a defined route is expressed as a regular expression.
 But ``[/...]`` in the route of an auto route is indicates any number of segments.
 
+When you use Auto Routing (Improved), the output is like the following:
+
+.. code-block:: none
+
+    +-----------+-------------------------+------------------------------------------+----------------+---------------+
+    | Method    | Route                   | Handler                                  | Before Filters | After Filters |
+    +-----------+-------------------------+------------------------------------------+----------------+---------------+
+    | CLI       | ci(.*)                  | \CodeIgniter\CLI\CommandRunner::index/$1 |                |               |
+    | GET(auto) | product/list/../..[/..] | \App\Controllers\Product::getList        |                | toolbar       |
+    +-----------+-------------------------+------------------------------------------+----------------+---------------+
+
+The *Method* will be like ``GET(auto)``. ``/..`` in the *Route* column indicates one segment.
+``[/..]`` indicates it is optional.
+
 .. note:: When auto-routing is enabled, if you have the route ``home``, it can be also accessd by ``Home``, or maybe by ``hOme``, ``hoMe``, ``HOME``, etc. But the command shows only ``home``.
 
 .. important:: The system is not perfect. If you use Custom Placeholders, *Filters* might not be correct. But the filters defined in **app/Config/Routes.php** are always displayed correctly.

From b6f887eb4a175a1c001bedf9b7c4bb464edcdd86 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 4 May 2022 11:57:01 +0900
Subject: [PATCH 2092/2325] docs: add missing `'`

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

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 641058b29a87..b8bf93990103 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -458,7 +458,7 @@ When using a wildcard, the error will point to a specific field, replacing the a
     ]
 
     // rule
-    contacts.*.name => 'required'
+    'contacts.*.name' => 'required'
 
     // error will be
     'contacts.friends.1.name' => 'The contacts.*.name field is required.'

From 04730e0739a6d00982429d80db62f5357dcfc829 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 4 May 2022 12:05:44 +0900
Subject: [PATCH 2093/2325] docs: fix RST format

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

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index b8bf93990103..72a399a845a3 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -412,7 +412,7 @@ Or as a labeled style:
 .. literalinclude:: validation/024.php
 
 If you'd like to include a field's "human" name, or the optional parameter some rules allow for (such as max_length),
-or the value that was validated you can add the ``{field}``, ``{param}`` and ``{value}`` tags to your message, respectively:
+or the value that was validated you can add the ``{field}``, ``{param}`` and ``{value}`` tags to your message, respectively::
 
     'min_length' => 'Supplied value ({value}) for {field} must have at least {param} characters.'
 

From eefc67b22796a882b97e0fb3510c1f7c1399a472 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 4 May 2022 17:45:40 +0900
Subject: [PATCH 2094/2325] feat: debugbar logging requests using microtime

From https://github.com/codeigniter4/CodeIgniter4/pull/5643
---
 admin/css/debug-toolbar/toolbar.scss          |  4 +-
 system/Debug/Toolbar.php                      | 10 +--
 system/Debug/Toolbar/Collectors/History.php   | 14 ++--
 system/Debug/Toolbar/Views/_history.tpl       | 24 +++---
 system/Debug/Toolbar/Views/toolbar.css        |  4 +-
 .../Debug/Toolbar/Collectors/HistoryTest.php  | 82 +++++++++++++++++++
 user_guide_src/source/changelogs/v4.2.0.rst   |  3 +
 7 files changed, 114 insertions(+), 27 deletions(-)
 create mode 100644 tests/system/Debug/Toolbar/Collectors/HistoryTest.php

diff --git a/admin/css/debug-toolbar/toolbar.scss b/admin/css/debug-toolbar/toolbar.scss
index d9bc347c4b3b..23e0807fabfc 100644
--- a/admin/css/debug-toolbar/toolbar.scss
+++ b/admin/css/debug-toolbar/toolbar.scss
@@ -474,8 +474,8 @@
     width: 70px;
 }
 
-.debug-bar-width140p {
-    width: 140px;
+.debug-bar-width190p {
+    width: 190px;
 }
 
 .debug-bar-width20e {
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 72328e6c334f..32bd217c79e8 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -54,7 +54,7 @@ public function __construct(ToolbarConfig $config)
         foreach ($config->collectors as $collector) {
             if (! class_exists($collector)) {
                 log_message('critical', 'Toolbar collector does not exists(' . $collector . ').' .
-                        'please check $collectors in the Config\Toolbar.php file.');
+                                      'please check $collectors in the Config\Toolbar.php file.');
 
                 continue;
             }
@@ -378,8 +378,8 @@ public function prepare(?RequestInterface $request = null, ?ResponseInterface $r
 
             helper('filesystem');
 
-            // Updated to time() so we can get history
-            $time = time();
+            // Updated to microtime() so we can get history
+            $time = sprintf('%.6f', microtime(true));
 
             if (! is_dir(WRITEPATH . 'debugbar')) {
                 mkdir(WRITEPATH . 'debugbar', 0777);
@@ -485,10 +485,10 @@ protected function format(string $data, string $format = 'html'): string
     {
         $data = json_decode($data, true);
 
-        if ($this->config->maxHistory !== 0) {
+        if ($this->config->maxHistory !== 0 && preg_match('/\d+\.\d{6}/s', (string) Services::request()->getGet('debugbar_time'), $debugbarTime)) {
             $history = new History();
             $history->setFiles(
-                (int) Services::request()->getGet('debugbar_time'),
+                $debugbarTime[0],
                 $this->config->maxHistory
             );
 
diff --git a/system/Debug/Toolbar/Collectors/History.php b/system/Debug/Toolbar/Collectors/History.php
index 3c0f4268f65e..afc68ee85f2e 100644
--- a/system/Debug/Toolbar/Collectors/History.php
+++ b/system/Debug/Toolbar/Collectors/History.php
@@ -11,6 +11,8 @@
 
 namespace CodeIgniter\Debug\Toolbar\Collectors;
 
+use DateTime;
+
 /**
  * History collector
  */
@@ -56,10 +58,10 @@ class History extends BaseCollector
     /**
      * Specify time limit & file count for debug history.
      *
-     * @param int $current Current history time
-     * @param int $limit   Max history files
+     * @param string $current Current history time
+     * @param int    $limit   Max history files
      */
-    public function setFiles(int $current, int $limit = 20)
+    public function setFiles(string $current, int $limit = 20)
     {
         $filenames = glob(WRITEPATH . 'debugbar/debugbar_*.json');
 
@@ -81,13 +83,13 @@ public function setFiles(int $current, int $limit = 20)
 
             $contents = @json_decode($contents);
             if (json_last_error() === JSON_ERROR_NONE) {
-                preg_match_all('/\d+/', $filename, $time);
-                $time = (int) end($time[0]);
+                preg_match('/debugbar_(.*)\.json$/s', $filename, $time);
+                $time = sprintf('%.6f', $time[1] ?? 0);
 
                 // Debugbar files shown in History Collector
                 $files[] = [
                     'time'        => $time,
-                    'datetime'    => date('Y-m-d H:i:s', $time),
+                    'datetime'    => DateTime::createFromFormat('U.u', $time)->format('Y-m-d H:i:s.u'),
                     'active'      => $time === $current,
                     'status'      => $contents->vars->response->statusCode,
                     'method'      => $contents->method,
diff --git a/system/Debug/Toolbar/Views/_history.tpl b/system/Debug/Toolbar/Views/_history.tpl
index 9db00ecc4679..7f22f560f936 100644
--- a/system/Debug/Toolbar/Views/_history.tpl
+++ b/system/Debug/Toolbar/Views/_history.tpl
@@ -1,22 +1,22 @@
 <table>
     <thead>
-        <tr>
-            <th>Action</th>
-            <th>Datetime</th>
-            <th>Status</th>
-            <th>Method</th>
-            <th>URL</th>
-            <th>Content-Type</th>
-            <th>Is AJAX?</th>
-        </tr>
+    <tr>
+        <th>Action</th>
+        <th>Datetime</th>
+        <th>Status</th>
+        <th>Method</th>
+        <th>URL</th>
+        <th>Content-Type</th>
+        <th>Is AJAX?</th>
+    </tr>
     </thead>
     <tbody>
     {files}
         <tr data-active="{active}">
-        	<td class="debug-bar-width70p">
-            	<button class="ci-history-load" data-time="{time}">Load</button>
+            <td class="debug-bar-width70p">
+                <button class="ci-history-load" data-time="{time}">Load</button>
             </td>
-            <td class="debug-bar-width140p">{datetime}</td>
+            <td class="debug-bar-width190p">{datetime}</td>
             <td>{status}</td>
             <td>{method}</td>
             <td>{url}</td>
diff --git a/system/Debug/Toolbar/Views/toolbar.css b/system/Debug/Toolbar/Views/toolbar.css
index 8fb9c15737c5..11a3301a954c 100644
--- a/system/Debug/Toolbar/Views/toolbar.css
+++ b/system/Debug/Toolbar/Views/toolbar.css
@@ -773,8 +773,8 @@
   width: 70px;
 }
 
-.debug-bar-width140p {
-  width: 140px;
+.debug-bar-width190p {
+  width: 190px;
 }
 
 .debug-bar-width20e {
diff --git a/tests/system/Debug/Toolbar/Collectors/HistoryTest.php b/tests/system/Debug/Toolbar/Collectors/HistoryTest.php
new file mode 100644
index 000000000000..82c07e535a6d
--- /dev/null
+++ b/tests/system/Debug/Toolbar/Collectors/HistoryTest.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Debug\Toolbar\Collectors;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use DateTime;
+
+/**
+ * @internal
+ */
+final class HistoryTest extends CIUnitTestCase
+{
+    private const STEP = 0.0001;
+
+    private float $time;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->time = (float) sprintf('%.4f', microtime(true));
+    }
+
+    private function createDummyDebugbarJson()
+    {
+        $time = $this->time;
+        $path = WRITEPATH . 'debugbar' . DIRECTORY_SEPARATOR . "debugbar_{$time}.json";
+
+        $dummyData = [
+            'vars' => [
+                'response' => [
+                    'statusCode'  => 200,
+                    'contentType' => 'text/html; charset=UTF-8',
+                ],
+            ],
+            'method' => 'get',
+            'url'    => 'localhost',
+            'isAJAX' => false,
+        ];
+        // create 20 dummy debugbar json files
+        for ($i = 0; $i < 20; $i++) {
+            $path = str_replace($time, sprintf('%.4f', $time - self::STEP), $path);
+            file_put_contents($path, json_encode($dummyData));
+            $time = sprintf('%.4f', $time - self::STEP);
+        }
+    }
+
+    protected function tearDown(): void
+    {
+        command('debugbar:clear');
+    }
+
+    public function testSetFiles()
+    {
+        $time = $this->time;
+        // test dir is now populated with json
+        $this->createDummyDebugbarJson();
+
+        $activeRowTime = $time = sprintf('%.6f', $time - self::STEP);
+
+        $history = new History();
+        $history->setFiles($time, 20);
+        $this->assertArrayHasKey('files', $history->display());
+        $this->assertNotEmpty($history->display()['files'], 'Dummy Debugbar data is empty');
+
+        foreach ($history->display()['files'] as $request) {
+            $this->assertSame($request['time'], sprintf('%.6f', $time));
+            $this->assertSame($request['datetime'], DateTime::createFromFormat('U.u', $time)->format('Y-m-d H:i:s.u'));
+            $this->assertSame($request['active'], ($time === $activeRowTime));
+
+            $time = sprintf('%.6f', $time - self::STEP);
+        }
+    }
+}
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 04b42eff6f04..7ae85bf86928 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -20,6 +20,7 @@ BREAKING
 - The ``CodeIgniter\Autoloader\Autoloader::initialize()`` has changed the behavior to fix a bug. It used to use Composer classmap only when ``$modules->discoverInComposer`` is true. Now it always uses the Composer classmap if Composer is available.
 - The color code output by :ref:`CLI::color() <cli-library-color>` has been changed to fix a bug.
 - To prevent unexpected access from the web browser, if a controller is added to a cli route (``$routes->cli()``), all methods of that controller are no longer accessible via auto-routing.
+- There is a possible backward compatibility break for those users extending the History Collector and they should probably update ``History::setFiles()`` method.
 
 Enhancements
 ************
@@ -67,6 +68,8 @@ Others
 - QueryBuilder raw SQL string support
     - Added the class ``CodeIgniter\Database\RawSql`` which expresses raw SQL strings.
     - :ref:`select() <query-builder-select-rawsql>`, :ref:`where() <query-builder-where-rawsql>`, :ref:`like() <query-builder-like-rawsql>` accept the ``CodeIgniter\Database\RawSql`` instance.
+- Debugbar enhancements
+    - Debug toolbar is now using ``microtime()`` instead of ``time()``.
 
 Changes
 *******

From b8395b72136f0a4501f76909d8139bc1780076a8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 4 May 2022 17:57:26 +0900
Subject: [PATCH 2095/2325] test: fix test

---
 .../Debug/Toolbar/Collectors/HistoryTest.php  | 35 +++++++++++++------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/tests/system/Debug/Toolbar/Collectors/HistoryTest.php b/tests/system/Debug/Toolbar/Collectors/HistoryTest.php
index 82c07e535a6d..ac1b4907a2f7 100644
--- a/tests/system/Debug/Toolbar/Collectors/HistoryTest.php
+++ b/tests/system/Debug/Toolbar/Collectors/HistoryTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Debug\Toolbar\Collectors;
 
 use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\Filters\CITestStreamFilter;
 use DateTime;
 
 /**
@@ -19,14 +20,27 @@
  */
 final class HistoryTest extends CIUnitTestCase
 {
-    private const STEP = 0.0001;
+    private const STEP = 0.000001;
 
     private float $time;
+    private $streamFilter;
 
     protected function setUp(): void
     {
         parent::setUp();
-        $this->time = (float) sprintf('%.4f', microtime(true));
+
+        CITestStreamFilter::$buffer = '';
+        $this->streamFilter         = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter         = stream_filter_append(STDERR, 'CITestStreamFilter');
+
+        $this->time = (float) sprintf('%.6f', microtime(true));
+    }
+
+    protected function tearDown(): void
+    {
+        command('debugbar:clear');
+
+        stream_filter_remove($this->streamFilter);
     }
 
     private function createDummyDebugbarJson()
@@ -45,22 +59,19 @@ private function createDummyDebugbarJson()
             'url'    => 'localhost',
             'isAJAX' => false,
         ];
+
         // create 20 dummy debugbar json files
         for ($i = 0; $i < 20; $i++) {
-            $path = str_replace($time, sprintf('%.4f', $time - self::STEP), $path);
+            $path = str_replace($time, sprintf('%.6f', $time - self::STEP), $path);
             file_put_contents($path, json_encode($dummyData));
-            $time = sprintf('%.4f', $time - self::STEP);
+            $time = sprintf('%.6f', $time - self::STEP);
         }
     }
 
-    protected function tearDown(): void
-    {
-        command('debugbar:clear');
-    }
-
     public function testSetFiles()
     {
         $time = $this->time;
+
         // test dir is now populated with json
         $this->createDummyDebugbarJson();
 
@@ -68,12 +79,16 @@ public function testSetFiles()
 
         $history = new History();
         $history->setFiles($time, 20);
+
         $this->assertArrayHasKey('files', $history->display());
         $this->assertNotEmpty($history->display()['files'], 'Dummy Debugbar data is empty');
 
         foreach ($history->display()['files'] as $request) {
             $this->assertSame($request['time'], sprintf('%.6f', $time));
-            $this->assertSame($request['datetime'], DateTime::createFromFormat('U.u', $time)->format('Y-m-d H:i:s.u'));
+            $this->assertSame(
+                $request['datetime'],
+                DateTime::createFromFormat('U.u', $time)->format('Y-m-d H:i:s.u')
+            );
             $this->assertSame($request['active'], ($time === $activeRowTime));
 
             $time = sprintf('%.6f', $time - self::STEP);

From 02b120a05f4381aff48af900e2a7bf4f3542d94c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 4 May 2022 18:05:20 +0900
Subject: [PATCH 2096/2325] fix: log message

---
 system/Debug/Toolbar.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 32bd217c79e8..e3d1619044cb 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -53,8 +53,11 @@ public function __construct(ToolbarConfig $config)
 
         foreach ($config->collectors as $collector) {
             if (! class_exists($collector)) {
-                log_message('critical', 'Toolbar collector does not exists(' . $collector . ').' .
-                                      'please check $collectors in the Config\Toolbar.php file.');
+                log_message(
+                    'critical',
+                    'Toolbar collector does not exists(' . $collector . ').'
+                    . ' please check $collectors in the app/Config/Toolbar.php file.'
+                );
 
                 continue;
             }

From a4de6d8aa93fcd4ddb60761cf5ee63a5ac8b5946 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 5 May 2022 06:40:15 +0900
Subject: [PATCH 2097/2325] docs: make titles linkable

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

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 1ddabd1856e4..e4c5c94638d6 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -351,7 +351,8 @@ See :doc:`Controller filters <filters>` for more information on setting up filte
     in which case the filter you specified to the route will not be applied.
     See :ref:`use-defined-routes-only` to disable auto-routing.
 
-**Alias filter**
+Alias Filter
+^^^^^^^^^^^^
 
 You specify an alias defined in **app/Config/Filters.php** for the filter value:
 
@@ -361,13 +362,15 @@ You may also supply arguments to be passed to the alias filter's ``before()`` an
 
 .. literalinclude:: routing/035.php
 
-**Classname filter**
+Classname Filter
+^^^^^^^^^^^^^^^^
 
 You specify a filter classname for the filter value:
 
 .. literalinclude:: routing/036.php
 
-**Multiple filters**
+Multiple Filters
+^^^^^^^^^^^^^^^^
 
 .. important:: *Multiple filters* is disabled by default. Because it breaks backward compatibility. If you want to use it, you need to configure. See :ref:`upgrade-415-multiple-filters-for-a-route` for the details.
 

From 6e3ab414907b8194353e75e2498e2906eb61113c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 5 May 2022 06:40:34 +0900
Subject: [PATCH 2098/2325] docs: make the first letter of title to uppercase

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

diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index e4c5c94638d6..49a3ca84175e 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -193,7 +193,7 @@ a simple view:
 
 .. literalinclude:: routing/020.php
 
-Mapping multiple routes
+Mapping Multiple Routes
 =======================
 
 While the ``add()`` method is simple to use, it is often handier to work with multiple routes at once, using

From 8e248f33d2bdd8dda74d5ab992eada6965a01563 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 5 May 2022 09:11:43 +0900
Subject: [PATCH 2099/2325] fix: limit to subdomain '*' does not work

---
 system/Router/RouteCollection.php           |  6 +++---
 tests/system/Router/RouteCollectionTest.php | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index abfa5493ae1f..b9f59c1aa14d 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -1297,7 +1297,7 @@ private function getMethodParams(string $from): string
      * Compares the subdomain(s) passed in against the current subdomain
      * on this page request.
      *
-     * @param mixed $subdomains
+     * @param string|string[] $subdomains
      */
     private function checkSubdomains($subdomains): bool
     {
@@ -1330,7 +1330,7 @@ private function checkSubdomains($subdomains): bool
      * It's especially not perfect since it's possible to register a domain
      * with a period (.) as part of the domain name.
      *
-     * @return mixed
+     * @return false|string the subdomain
      */
     private function determineCurrentSubdomain()
     {
@@ -1351,7 +1351,7 @@ private function determineCurrentSubdomain()
         }
 
         // Get rid of any domains, which will be the last
-        unset($host[count($host)]);
+        unset($host[count($host) - 1]);
 
         // Account for .co.uk, .co.nz, etc. domains
         if (end($host) === 'co') {
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index 444d32d9b258..10bb36ec9c08 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -1156,6 +1156,20 @@ public function testWithDifferentSubdomainMissing()
         $this->assertSame($expects, $routes->getRoutes());
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/5959
+     */
+    public function testWithNoSubdomainAndDot()
+    {
+        $_SERVER['HTTP_HOST'] = 'example.com';
+
+        $routes = $this->getCollector();
+
+        $routes->add('/objects/(:alphanum)', 'App::objectsList/$1', ['subdomain' => '*']);
+
+        $this->assertSame([], $routes->getRoutes());
+    }
+
     /**
      * @see https://github.com/codeigniter4/CodeIgniter4/issues/1692
      */

From 38d5c109981bb51dc3ba2309ca6152c49fc07f28 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 5 May 2022 09:16:42 +0900
Subject: [PATCH 2100/2325] fix: incorrect test

`example.com` does not match`'subdomain' => '*'`, so the route is not registered.
---
 tests/system/Router/RouteCollectionTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index 10bb36ec9c08..a36fcb8de3b2 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -1462,7 +1462,7 @@ public function testRouteToWithGenericSubdomainNot()
 
         $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => '*', 'as' => 'doc_item']);
 
-        $this->assertSame('/i/sth', $routes->reverseRoute('doc_item', 'sth'));
+        $this->assertFalse($routes->reverseRoute('doc_item', 'sth'));
     }
 
     public function testRouteToWithoutSubdomainMatch()

From 6927873281c219692bfb02b9e695069441d12a04 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 5 May 2022 10:17:42 +0900
Subject: [PATCH 2101/2325] refactor: add strtolower() to Request::getMethod()

The $upper functionality will be removed.
---
 system/CodeIgniter.php           | 4 ++--
 system/Router/Router.php         | 2 +-
 system/Validation/Validation.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 8289b2852e45..df44847c3ef6 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -318,7 +318,7 @@ public function run(?RouteCollectionInterface $routes = null, bool $returnRespon
 
         $this->spoofRequestMethod();
 
-        if ($this->request instanceof IncomingRequest && $this->request->getMethod() === 'cli') {
+        if ($this->request instanceof IncomingRequest && strtolower($this->request->getMethod()) === 'cli') {
             $this->response->setStatusCode(405)->setBody('Method Not Allowed');
 
             return $this->sendResponse();
@@ -1047,7 +1047,7 @@ public function storePreviousURL($uri)
     public function spoofRequestMethod()
     {
         // Only works with POSTED forms
-        if ($this->request->getMethod() !== 'post') {
+        if (strtolower($this->request->getMethod()) !== 'post') {
             return;
         }
 
diff --git a/system/Router/Router.php b/system/Router/Router.php
index ef0996938ccd..c3dc1b0dfbca 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -126,7 +126,7 @@ public function __construct(RouteCollectionInterface $routes, ?Request $request
         $this->controller = $this->collection->getDefaultController();
         $this->method     = $this->collection->getDefaultMethod();
 
-        $this->collection->setHTTPVerb($request->getMethod() ?? strtolower($_SERVER['REQUEST_METHOD']));
+        $this->collection->setHTTPVerb(strtolower($request->getMethod() ?? $_SERVER['REQUEST_METHOD']));
 
         $this->translateURIDashes = $this->collection->shouldTranslateURIDashes();
 
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php
index 20144c778bf5..eb91114ca218 100644
--- a/system/Validation/Validation.php
+++ b/system/Validation/Validation.php
@@ -354,7 +354,7 @@ public function withRequest(RequestInterface $request): ValidationInterface
             return $this;
         }
 
-        if (in_array($request->getMethod(), ['put', 'patch', 'delete'], true)
+        if (in_array(strtolower($request->getMethod()), ['put', 'patch', 'delete'], true)
             && strpos($request->getHeaderLine('Content-Type'), 'multipart/form-data') === false
         ) {
             $this->data = $request->getRawInput();

From bc2dea254700d7afecadb111c761830eb69c4aca Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 5 May 2022 10:18:58 +0900
Subject: [PATCH 2102/2325] refactor: add strtoupper() to Request::getMethod()

The $upper functionality will be removed.
---
 app/Views/errors/html/error_exception.php | 2 +-
 system/Debug/Toolbar.php                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
index 60fb16c2f899..6cb520a5912e 100644
--- a/app/Views/errors/html/error_exception.php
+++ b/app/Views/errors/html/error_exception.php
@@ -199,7 +199,7 @@
 						</tr>
 						<tr>
 							<td>HTTP Method</td>
-							<td><?= esc($request->getMethod(true)) ?></td>
+							<td><?= esc(strtoupper($request->getMethod())) ?></td>
 						</tr>
 						<tr>
 							<td>IP Address</td>
diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index 72328e6c334f..ffc1abd0d516 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -76,7 +76,7 @@ public function run(float $startTime, float $totalTime, RequestInterface $reques
     {
         // Data items used within the view.
         $data['url']             = current_url();
-        $data['method']          = $request->getMethod(true);
+        $data['method']          = strtoupper($request->getMethod());
         $data['isAJAX']          = $request->isAJAX();
         $data['startTime']       = $startTime;
         $data['totalTime']       = $totalTime * 1000;

From e04901aa33f371144df0f53a5ad1f2b98792eab5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 5 May 2022 12:47:16 +0900
Subject: [PATCH 2103/2325] fix: typo in log message

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 system/Debug/Toolbar.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Debug/Toolbar.php b/system/Debug/Toolbar.php
index e3d1619044cb..f314af1a89f0 100644
--- a/system/Debug/Toolbar.php
+++ b/system/Debug/Toolbar.php
@@ -55,8 +55,8 @@ public function __construct(ToolbarConfig $config)
             if (! class_exists($collector)) {
                 log_message(
                     'critical',
-                    'Toolbar collector does not exists(' . $collector . ').'
-                    . ' please check $collectors in the app/Config/Toolbar.php file.'
+                    'Toolbar collector does not exist (' . $collector . ').'
+                    . ' Please check $collectors in the app/Config/Toolbar.php file.'
                 );
 
                 continue;

From d97f6d8cacd1a7c0e4086988041eb41e625ae0b6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 5 May 2022 17:31:05 +0900
Subject: [PATCH 2104/2325] chore: update deptrac config file

---
 depfile.yaml | 232 --------------------------------------------------
 deptrac.yaml | 233 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 233 insertions(+), 232 deletions(-)
 delete mode 100644 depfile.yaml
 create mode 100644 deptrac.yaml

diff --git a/depfile.yaml b/depfile.yaml
deleted file mode 100644
index cca2df95c14d..000000000000
--- a/depfile.yaml
+++ /dev/null
@@ -1,232 +0,0 @@
-# Defines the layers for each framework
-# component and their allowed interactions.
-# The following components are exempt
-# due to their global nature:
-#   - CLI & Commands
-#   - Config
-#   - Debug
-#   - Exception
-#   - Service
-#   - Validation\FormatRules
-paths:
-  - ./app
-  - ./system
-exclude_files:
-  - '#.*test.*#i'
-layers:
-  - name: API
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\API\\.*
-  - name: Cache
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\Cache\\.*
-  - name: Controller
-    collectors:
-      - type: className
-        regex: ^CodeIgniter\\Controller$
-  - name: Cookie
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\Cookie\\.*
-  - name: Database
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\Database\\.*
-  - name: Email
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\Email\\.*
-  - name: Encryption
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\Encryption\\.*
-  - name: Entity
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\Entity\\.*
-  - name: Events
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\Events\\.*
-  - name: Files
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\Files\\.*
-  - name: Filters
-    collectors:
-      - type: bool
-        must:
-        - type: className
-          regex: ^Codeigniter\\Filters\\Filter.*
-  - name: Format
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\Format\\.*
-  - name: Honeypot
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\.*Honeypot.* # includes the Filter
-  - name: HTTP
-    collectors:
-      - type: bool
-        must:
-        - type: className
-          regex: ^Codeigniter\\HTTP\\.*
-        must_not:
-        - type: className
-          regex: (Exception|URI)
-  - name: I18n
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\I18n\\.*
-  - name: Images
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\Images\\.*
-  - name: Language
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\Language\\.*
-  - name: Log
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\Log\\.*
-  - name: Model
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\.*Model$
-  - name: Modules
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\Modules\\.*
-  - name: Pager
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\Pager\\.*
-  - name: Publisher
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\Publisher\\.*
-  - name: RESTful
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\RESTful\\.*
-  - name: Router
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\Router\\.*
-  - name: Security
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\Security\\.*
-  - name: Session
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\Session\\.*
-  - name: Throttle
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\Throttle\\.*
-  - name: Typography
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\Typography\\.*
-  - name: URI
-    collectors:
-      - type: className
-        regex: ^CodeIgniter\\HTTP\\URI$
-  - name: Validation
-    collectors:
-      - type: bool
-        must:
-        - type: className
-          regex: ^Codeigniter\\Validation\\.*
-        must_not:
-        - type: className
-          regex: ^Codeigniter\\Validation\\FormatRules$
-  - name: View
-    collectors:
-      - type: className
-        regex: ^Codeigniter\\View\\.*
-ruleset:
-  API:
-    - Format
-    - HTTP
-  Controller:
-    - HTTP
-    - Validation
-  Database:
-    - Entity
-    - Events
-  Email:
-    - Events
-  Entity:
-    - I18n
-  Filters:
-    - HTTP
-  Honeypot:
-    - Filters
-    - HTTP
-  HTTP:
-    - Cookie
-    - Files
-    - Security
-    - URI
-  Images:
-    - Files
-  Model:
-    - Database
-    - I18n
-    - Pager
-    - Validation
-  Pager:
-    - URI
-    - View
-  Publisher:
-    - Files
-    - URI
-  RESTful:
-    - +API
-    - +Controller
-  Router:
-    - HTTP
-  Security:
-    - Cookie
-    - Session
-    - HTTP
-  Session:
-    - Cookie
-    - HTTP
-    - Database
-  Throttle:
-    - Cache
-  Validation:
-    - HTTP
-  View:
-    - Cache
-skip_violations:
-  # Individual class exemptions
-  CodeIgniter\Entity\Cast\URICast:
-    - CodeIgniter\HTTP\URI
-  CodeIgniter\Log\Handlers\ChromeLoggerHandler:
-    - CodeIgniter\HTTP\ResponseInterface
-  CodeIgniter\View\Table:
-    - CodeIgniter\Database\BaseResult
-  CodeIgniter\View\Plugins:
-    - CodeIgniter\HTTP\URI
-
-  # BC changes that should be fixed
-  CodeIgniter\HTTP\ResponseTrait:
-    - CodeIgniter\Pager\PagerInterface
-  CodeIgniter\HTTP\ResponseInterface:
-    - CodeIgniter\Pager\PagerInterface
-  CodeIgniter\HTTP\Response:
-    - CodeIgniter\Pager\PagerInterface
-  CodeIgniter\HTTP\RedirectResponse:
-    - CodeIgniter\Pager\PagerInterface
-  CodeIgniter\HTTP\DownloadResponse:
-    - CodeIgniter\Pager\PagerInterface
-  CodeIgniter\Validation\Validation:
-    - CodeIgniter\View\RendererInterface
diff --git a/deptrac.yaml b/deptrac.yaml
new file mode 100644
index 000000000000..8d43af6117ae
--- /dev/null
+++ b/deptrac.yaml
@@ -0,0 +1,233 @@
+# Defines the layers for each framework
+# component and their allowed interactions.
+# The following components are exempt
+# due to their global nature:
+#   - CLI & Commands
+#   - Config
+#   - Debug
+#   - Exception
+#   - Service
+#   - Validation\FormatRules
+parameters:
+  paths:
+    - ./app
+    - ./system
+  exclude_files:
+    - '#.*test.*#i'
+  layers:
+    - name: API
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\API\\.*
+    - name: Cache
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\Cache\\.*
+    - name: Controller
+      collectors:
+        - type: className
+          regex: ^CodeIgniter\\Controller$
+    - name: Cookie
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\Cookie\\.*
+    - name: Database
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\Database\\.*
+    - name: Email
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\Email\\.*
+    - name: Encryption
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\Encryption\\.*
+    - name: Entity
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\Entity\\.*
+    - name: Events
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\Events\\.*
+    - name: Files
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\Files\\.*
+    - name: Filters
+      collectors:
+        - type: bool
+          must:
+          - type: className
+            regex: ^Codeigniter\\Filters\\Filter.*
+    - name: Format
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\Format\\.*
+    - name: Honeypot
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\.*Honeypot.* # includes the Filter
+    - name: HTTP
+      collectors:
+        - type: bool
+          must:
+          - type: className
+            regex: ^Codeigniter\\HTTP\\.*
+          must_not:
+          - type: className
+            regex: (Exception|URI)
+    - name: I18n
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\I18n\\.*
+    - name: Images
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\Images\\.*
+    - name: Language
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\Language\\.*
+    - name: Log
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\Log\\.*
+    - name: Model
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\.*Model$
+    - name: Modules
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\Modules\\.*
+    - name: Pager
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\Pager\\.*
+    - name: Publisher
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\Publisher\\.*
+    - name: RESTful
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\RESTful\\.*
+    - name: Router
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\Router\\.*
+    - name: Security
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\Security\\.*
+    - name: Session
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\Session\\.*
+    - name: Throttle
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\Throttle\\.*
+    - name: Typography
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\Typography\\.*
+    - name: URI
+      collectors:
+        - type: className
+          regex: ^CodeIgniter\\HTTP\\URI$
+    - name: Validation
+      collectors:
+        - type: bool
+          must:
+          - type: className
+            regex: ^Codeigniter\\Validation\\.*
+          must_not:
+          - type: className
+            regex: ^Codeigniter\\Validation\\FormatRules$
+    - name: View
+      collectors:
+        - type: className
+          regex: ^Codeigniter\\View\\.*
+  ruleset:
+    API:
+      - Format
+      - HTTP
+    Controller:
+      - HTTP
+      - Validation
+    Database:
+      - Entity
+      - Events
+    Email:
+      - Events
+    Entity:
+      - I18n
+    Filters:
+      - HTTP
+    Honeypot:
+      - Filters
+      - HTTP
+    HTTP:
+      - Cookie
+      - Files
+      - Security
+      - URI
+    Images:
+      - Files
+    Model:
+      - Database
+      - I18n
+      - Pager
+      - Validation
+    Pager:
+      - URI
+      - View
+    Publisher:
+      - Files
+      - URI
+    RESTful:
+      - +API
+      - +Controller
+    Router:
+      - HTTP
+    Security:
+      - Cookie
+      - Session
+      - HTTP
+    Session:
+      - Cookie
+      - HTTP
+      - Database
+    Throttle:
+      - Cache
+    Validation:
+      - HTTP
+    View:
+      - Cache
+  skip_violations:
+    # Individual class exemptions
+    CodeIgniter\Entity\Cast\URICast:
+      - CodeIgniter\HTTP\URI
+    CodeIgniter\Log\Handlers\ChromeLoggerHandler:
+      - CodeIgniter\HTTP\ResponseInterface
+    CodeIgniter\View\Table:
+      - CodeIgniter\Database\BaseResult
+    CodeIgniter\View\Plugins:
+      - CodeIgniter\HTTP\URI
+
+    # BC changes that should be fixed
+    CodeIgniter\HTTP\ResponseTrait:
+      - CodeIgniter\Pager\PagerInterface
+    CodeIgniter\HTTP\ResponseInterface:
+      - CodeIgniter\Pager\PagerInterface
+    CodeIgniter\HTTP\Response:
+      - CodeIgniter\Pager\PagerInterface
+    CodeIgniter\HTTP\RedirectResponse:
+      - CodeIgniter\Pager\PagerInterface
+    CodeIgniter\HTTP\DownloadResponse:
+      - CodeIgniter\Pager\PagerInterface
+    CodeIgniter\Validation\Validation:
+      - CodeIgniter\View\RendererInterface

From 8a5932edb94aabe6ed335c05dd9e90f47dee78d8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 5 May 2022 09:57:32 +0900
Subject: [PATCH 2105/2325] refactor: remove $_SERVER['HTTP_HOST']

---
 system/Router/RouteCollection.php           | 13 ++++--
 tests/system/Router/RouteCollectionTest.php | 50 +++++++++++----------
 2 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/system/Router/RouteCollection.php b/system/Router/RouteCollection.php
index abfa5493ae1f..82951917ee35 100644
--- a/system/Router/RouteCollection.php
+++ b/system/Router/RouteCollection.php
@@ -218,6 +218,11 @@ class RouteCollection implements RouteCollectionInterface
      */
     protected $prioritizeDetected = false;
 
+    /**
+     * The current hostname from $_SERVER['HTTP_HOST']
+     */
+    private ?string $httpHost = null;
+
     /**
      * Constructor
      */
@@ -225,6 +230,8 @@ public function __construct(FileLocator $locator, Modules $moduleConfig)
     {
         $this->fileLocator  = $locator;
         $this->moduleConfig = $moduleConfig;
+
+        $this->httpHost = Services::request()->getServer('HTTP_HOST');
     }
 
     /**
@@ -1176,7 +1183,7 @@ protected function create(string $verb, string $from, $to, ?array $options = nul
         // Hostname limiting?
         if (! empty($options['hostname'])) {
             // @todo determine if there's a way to whitelist hosts?
-            if (isset($_SERVER['HTTP_HOST']) && strtolower($_SERVER['HTTP_HOST']) !== strtolower($options['hostname'])) {
+            if (isset($this->httpHost) && strtolower($this->httpHost) !== strtolower($options['hostname'])) {
                 return;
             }
 
@@ -1302,7 +1309,7 @@ private function getMethodParams(string $from): string
     private function checkSubdomains($subdomains): bool
     {
         // CLI calls can't be on subdomain.
-        if (! isset($_SERVER['HTTP_HOST'])) {
+        if (! isset($this->httpHost)) {
             return false;
         }
 
@@ -1337,7 +1344,7 @@ private function determineCurrentSubdomain()
         // We have to ensure that a scheme exists
         // on the URL else parse_url will mis-interpret
         // 'host' as the 'path'.
-        $url = $_SERVER['HTTP_HOST'];
+        $url = $this->httpHost;
         if (strpos($url, 'http') !== 0) {
             $url = 'http://' . $url;
         }
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index 444d32d9b258..b385d372b517 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -18,12 +18,17 @@
 use Tests\Support\Controllers\Hello;
 
 /**
- * @backupGlobals enabled
- *
  * @internal
  */
 final class RouteCollectionTest extends CIUnitTestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->resetServices();
+    }
+
     protected function getCollector(array $config = [], array $files = [], $moduleConfig = null)
     {
         $defaults = [
@@ -1062,25 +1067,24 @@ public function testAddRedirectGetMethod()
      */
     public function testWithSubdomain()
     {
-        $routes = $this->getCollector();
-
         $_SERVER['HTTP_HOST'] = 'adm.example.com';
 
+        $routes = $this->getCollector();
+
         $routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'adm']);
         $routes->add('/objects/(:alphanum)', 'App::objectsList/$1');
 
         $expects = [
             'objects/([a-zA-Z0-9]+)' => '\Admin::objectsList/$1',
         ];
-
         $this->assertSame($expects, $routes->getRoutes());
     }
 
     public function testWithSubdomainMissing()
     {
-        $routes = $this->getCollector();
+        $_SERVER['HTTP_HOST'] = 'www.example.com';
 
-        //      $_SERVER['HTTP_HOST'] = 'adm.example.com';
+        $routes = $this->getCollector();
 
         $routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'adm']);
         $routes->add('/objects/(:alphanum)', 'App::objectsList/$1');
@@ -1088,23 +1092,21 @@ public function testWithSubdomainMissing()
         $expects = [
             'objects/([a-zA-Z0-9]+)' => '\App::objectsList/$1',
         ];
-
         $this->assertSame($expects, $routes->getRoutes());
     }
 
     public function testWithDifferentSubdomain()
     {
-        $routes = $this->getCollector();
-
         $_SERVER['HTTP_HOST'] = 'adm.example.com';
 
+        $routes = $this->getCollector();
+
         $routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'sales']);
         $routes->add('/objects/(:alphanum)', 'App::objectsList/$1');
 
         $expects = [
             'objects/([a-zA-Z0-9]+)' => '\App::objectsList/$1',
         ];
-
         $this->assertSame($expects, $routes->getRoutes());
     }
 
@@ -1381,10 +1383,10 @@ public function testOffsetParameters()
      */
     public function testRouteToWithSubdomainMatch()
     {
-        $routes = $this->getCollector();
-
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'doc.example.com';
+        Services::request()->setMethod('get');
+
+        $routes = $this->getCollector();
 
         $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => 'doc', 'as' => 'doc_item']);
 
@@ -1393,10 +1395,10 @@ public function testRouteToWithSubdomainMatch()
 
     public function testRouteToWithSubdomainMismatch()
     {
-        $routes = $this->getCollector();
-
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'dev.example.com';
+        Services::request()->setMethod('get');
+
+        $routes = $this->getCollector();
 
         $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => 'doc', 'as' => 'doc_item']);
 
@@ -1453,10 +1455,10 @@ public function testRouteToWithGenericSubdomainNot()
 
     public function testRouteToWithoutSubdomainMatch()
     {
-        $routes = $this->getCollector();
-
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'doc.example.com';
+        Services::request()->setMethod('get');
+
+        $routes = $this->getCollector();
 
         $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['hostname' => 'example.com', 'as' => 'doc_item']);
 
@@ -1477,10 +1479,10 @@ public function testRouteToWithoutSubdomainMismatch()
 
     public function testRouteToWithoutSubdomainNot()
     {
-        $routes = $this->getCollector();
-
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'example.com';
+        Services::request()->setMethod('get');
+
+        $routes = $this->getCollector();
 
         $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['hostname' => 'example.com', 'as' => 'doc_item']);
 
@@ -1494,8 +1496,8 @@ public function testRouteToWithoutSubdomainNot()
      */
     public function testRouteOverwritingDifferentSubdomains()
     {
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'doc.domain.com';
+        Services::request()->setMethod('get');
 
         $routes = $this->getCollector();
         $router = new Router($routes, Services::request());

From 289ea7d01216b7c5d7563dc1512d4480cd9c42e9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 5 May 2022 10:38:10 +0900
Subject: [PATCH 2106/2325] test: fix failed tests

---
 .../system/RESTful/ResourceControllerTest.php | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index 916c7f4fa789..c552bae36cf7 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -35,9 +35,6 @@
  * so we need to make sure that the methods routed to
  * return correct responses.
  *
- * @runTestsInSeparateProcesses
- * @preserveGlobalState         disabled
- *
  * @internal
  */
 final class ResourceControllerTest extends CIUnitTestCase
@@ -54,7 +51,10 @@ protected function setUp(): void
         parent::setUp();
 
         $this->resetServices();
+    }
 
+    private function createCodeigniter(): void
+    {
         $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
 
         // Inject mock router.
@@ -86,6 +86,8 @@ public function testResourceGet()
         $_SERVER['REQUEST_URI']    = '/work';
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
@@ -105,6 +107,8 @@ public function testResourceGetNew()
         $_SERVER['REQUEST_URI']    = '/work/new';
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
@@ -125,6 +129,8 @@ public function testResourceGetEdit()
         $_SERVER['REQUEST_URI']    = '/work/1/edit';
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
@@ -144,6 +150,8 @@ public function testResourceGetOne()
         $_SERVER['REQUEST_URI']    = '/work/1';
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
@@ -162,6 +170,8 @@ public function testResourcePost()
         $_SERVER['REQUEST_URI']    = '/work';
         $_SERVER['REQUEST_METHOD'] = 'POST';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
@@ -181,6 +191,8 @@ public function testResourcePatch()
         $_SERVER['REQUEST_URI']    = '/work/123';
         $_SERVER['REQUEST_METHOD'] = 'PATCH';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
@@ -200,6 +212,8 @@ public function testResourcePut()
         $_SERVER['REQUEST_URI']    = '/work/123';
         $_SERVER['REQUEST_METHOD'] = 'PUT';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
@@ -219,6 +233,8 @@ public function testResourceDelete()
         $_SERVER['REQUEST_URI']    = '/work/123';
         $_SERVER['REQUEST_METHOD'] = 'DELETE';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();

From cd3bd878a534a28d06715f882368009520a0b0e3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 5 May 2022 10:54:16 +0900
Subject: [PATCH 2107/2325] test: fix failed tests

---
 .../system/RESTful/ResourcePresenterTest.php  | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php
index 7086251aef9d..253d077bdbce 100644
--- a/tests/system/RESTful/ResourcePresenterTest.php
+++ b/tests/system/RESTful/ResourcePresenterTest.php
@@ -29,9 +29,6 @@
  * so we need to make sure that the methods routed to
  * return correct responses.
  *
- * @runTestsInSeparateProcesses
- * @preserveGlobalState         disabled
- *
  * @internal
  */
 final class ResourcePresenterTest extends CIUnitTestCase
@@ -48,7 +45,10 @@ protected function setUp(): void
         parent::setUp();
 
         $this->resetServices();
+    }
 
+    private function createCodeigniter(): void
+    {
         $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
 
         // Inject mock router.
@@ -80,6 +80,8 @@ public function testResourceGet()
         $_SERVER['REQUEST_URI']    = '/work';
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
@@ -100,6 +102,8 @@ public function testResourceShow()
         $_SERVER['REQUEST_URI']    = '/work/show/1';
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
@@ -119,6 +123,8 @@ public function testResourceNew()
         $_SERVER['REQUEST_URI']    = '/work/new';
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
@@ -138,6 +144,8 @@ public function testResourceCreate()
         $_SERVER['REQUEST_URI']    = '/work/create';
         $_SERVER['REQUEST_METHOD'] = 'POST';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
@@ -158,6 +166,8 @@ public function testResourceRemove()
         $_SERVER['REQUEST_URI']    = '/work/remove/123';
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
@@ -178,6 +188,8 @@ public function testResourceDelete()
         $_SERVER['REQUEST_URI']    = '/work/delete/123';
         $_SERVER['REQUEST_METHOD'] = 'POST';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
@@ -199,6 +211,8 @@ public function testResourceEdit()
         $_SERVER['REQUEST_URI']    = '/work/edit/1';
         $_SERVER['REQUEST_METHOD'] = 'GET';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
@@ -219,6 +233,8 @@ public function testResourceUpdate()
         $_SERVER['REQUEST_URI']    = '/work/update/123';
         $_SERVER['REQUEST_METHOD'] = 'POST';
 
+        $this->createCodeigniter();
+
         ob_start();
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();

From deb9f3d2c7df1b9c0a86107b1d52491479d81e2d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 5 May 2022 15:37:25 +0900
Subject: [PATCH 2108/2325] test: add @group SeparateProcess

---
 tests/system/Commands/GenerateKeyTest.php                      | 2 ++
 tests/system/CommonFunctionsSendTest.php                       | 2 ++
 tests/system/CommonFunctionsTest.php                           | 2 ++
 tests/system/Config/BaseConfigTest.php                         | 2 ++
 tests/system/Config/ConfigTest.php                             | 2 ++
 tests/system/Config/DotEnvTest.php                             | 2 ++
 tests/system/Config/ServicesTest.php                           | 2 ++
 tests/system/Events/EventsTest.php                             | 2 ++
 tests/system/Filters/HoneypotTest.php                          | 2 ++
 tests/system/HTTP/ContentSecurityPolicyTest.php                | 2 ++
 tests/system/HTTP/DownloadResponseTest.php                     | 2 ++
 tests/system/HTTP/IncomingRequestTest.php                      | 2 ++
 tests/system/HTTP/RedirectResponseTest.php                     | 2 ++
 tests/system/HTTP/ResponseSendTest.php                         | 2 ++
 tests/system/Helpers/FormHelperTest.php                        | 2 ++
 .../system/Security/SecurityCSRFSessionRandomizeTokenTest.php  | 2 ++
 tests/system/Security/SecurityCSRFSessionTest.php              | 2 ++
 tests/system/Session/SessionTest.php                           | 3 ++-
 tests/system/Test/ControllerTestTraitTest.php                  | 2 ++
 tests/system/Test/TestCaseEmissionsTest.php                    | 2 ++
 20 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/tests/system/Commands/GenerateKeyTest.php b/tests/system/Commands/GenerateKeyTest.php
index 8def37509d67..760eca5e9c0d 100644
--- a/tests/system/Commands/GenerateKeyTest.php
+++ b/tests/system/Commands/GenerateKeyTest.php
@@ -16,6 +16,8 @@
 
 /**
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class GenerateKeyTest extends CIUnitTestCase
 {
diff --git a/tests/system/CommonFunctionsSendTest.php b/tests/system/CommonFunctionsSendTest.php
index 49a99b1494ea..594a0faab4db 100644
--- a/tests/system/CommonFunctionsSendTest.php
+++ b/tests/system/CommonFunctionsSendTest.php
@@ -15,6 +15,8 @@
 
 /**
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class CommonFunctionsSendTest extends CIUnitTestCase
 {
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 98ee02f30bbc..2069762bba57 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -37,6 +37,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class CommonFunctionsTest extends CIUnitTestCase
 {
diff --git a/tests/system/Config/BaseConfigTest.php b/tests/system/Config/BaseConfigTest.php
index 82596455f866..d1de7532cb39 100644
--- a/tests/system/Config/BaseConfigTest.php
+++ b/tests/system/Config/BaseConfigTest.php
@@ -21,6 +21,8 @@
 
 /**
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class BaseConfigTest extends CIUnitTestCase
 {
diff --git a/tests/system/Config/ConfigTest.php b/tests/system/Config/ConfigTest.php
index 0e3dc8d3082a..e5d382527edb 100644
--- a/tests/system/Config/ConfigTest.php
+++ b/tests/system/Config/ConfigTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class ConfigTest extends CIUnitTestCase
 {
diff --git a/tests/system/Config/DotEnvTest.php b/tests/system/Config/DotEnvTest.php
index 94c531c3f442..dbd296040117 100644
--- a/tests/system/Config/DotEnvTest.php
+++ b/tests/system/Config/DotEnvTest.php
@@ -18,6 +18,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class DotEnvTest extends CIUnitTestCase
 {
diff --git a/tests/system/Config/ServicesTest.php b/tests/system/Config/ServicesTest.php
index 3c1eb3e1c000..96ce95089389 100644
--- a/tests/system/Config/ServicesTest.php
+++ b/tests/system/Config/ServicesTest.php
@@ -48,6 +48,8 @@
 
 /**
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class ServicesTest extends CIUnitTestCase
 {
diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php
index e73e8f01d00a..571118a6d534 100644
--- a/tests/system/Events/EventsTest.php
+++ b/tests/system/Events/EventsTest.php
@@ -17,6 +17,8 @@
 
 /**
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class EventsTest extends CIUnitTestCase
 {
diff --git a/tests/system/Filters/HoneypotTest.php b/tests/system/Filters/HoneypotTest.php
index 15a99315f5fa..94ec0b61d1ff 100644
--- a/tests/system/Filters/HoneypotTest.php
+++ b/tests/system/Filters/HoneypotTest.php
@@ -20,6 +20,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class HoneypotTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/ContentSecurityPolicyTest.php b/tests/system/HTTP/ContentSecurityPolicyTest.php
index d2113e28e366..4b51d9dbc46d 100644
--- a/tests/system/HTTP/ContentSecurityPolicyTest.php
+++ b/tests/system/HTTP/ContentSecurityPolicyTest.php
@@ -22,6 +22,8 @@
  * See https://cspvalidator.org/
  *
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class ContentSecurityPolicyTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/DownloadResponseTest.php b/tests/system/HTTP/DownloadResponseTest.php
index 5c66052f164d..eb6df43eecac 100644
--- a/tests/system/HTTP/DownloadResponseTest.php
+++ b/tests/system/HTTP/DownloadResponseTest.php
@@ -19,6 +19,8 @@
 
 /**
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class DownloadResponseTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/IncomingRequestTest.php b/tests/system/HTTP/IncomingRequestTest.php
index cb267c170d7d..f19f9cf53ee4 100644
--- a/tests/system/HTTP/IncomingRequestTest.php
+++ b/tests/system/HTTP/IncomingRequestTest.php
@@ -20,6 +20,8 @@
  * @backupGlobals enabled
  *
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class IncomingRequestTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/RedirectResponseTest.php b/tests/system/HTTP/RedirectResponseTest.php
index 21647a997cd0..9773ab8c7b72 100644
--- a/tests/system/HTTP/RedirectResponseTest.php
+++ b/tests/system/HTTP/RedirectResponseTest.php
@@ -23,6 +23,8 @@
 
 /**
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class RedirectResponseTest extends CIUnitTestCase
 {
diff --git a/tests/system/HTTP/ResponseSendTest.php b/tests/system/HTTP/ResponseSendTest.php
index eef845297182..b67820785eb5 100644
--- a/tests/system/HTTP/ResponseSendTest.php
+++ b/tests/system/HTTP/ResponseSendTest.php
@@ -23,6 +23,8 @@
  * test cases need to be run as separate processes.
  *
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class ResponseSendTest extends CIUnitTestCase
 {
diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
index 4a1ef8fcddcd..59f476f5d92d 100644
--- a/tests/system/Helpers/FormHelperTest.php
+++ b/tests/system/Helpers/FormHelperTest.php
@@ -19,6 +19,8 @@
 
 /**
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class FormHelperTest extends CIUnitTestCase
 {
diff --git a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
index 0295abe41556..dca549685757 100644
--- a/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
+++ b/tests/system/Security/SecurityCSRFSessionRandomizeTokenTest.php
@@ -34,6 +34,8 @@
  * @preserveGlobalState disabled
  *
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class SecurityCSRFSessionRandomizeTokenTest extends CIUnitTestCase
 {
diff --git a/tests/system/Security/SecurityCSRFSessionTest.php b/tests/system/Security/SecurityCSRFSessionTest.php
index d80ca938e1f1..af7f8c21905a 100644
--- a/tests/system/Security/SecurityCSRFSessionTest.php
+++ b/tests/system/Security/SecurityCSRFSessionTest.php
@@ -33,6 +33,8 @@
  * @preserveGlobalState disabled
  *
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class SecurityCSRFSessionTest extends CIUnitTestCase
 {
diff --git a/tests/system/Session/SessionTest.php b/tests/system/Session/SessionTest.php
index 574ffaf99ce9..c6cf278a6073 100644
--- a/tests/system/Session/SessionTest.php
+++ b/tests/system/Session/SessionTest.php
@@ -23,10 +23,11 @@
 
 /**
  * @runTestsInSeparateProcesses
- *
  * @preserveGlobalState disabled
  *
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class SessionTest extends CIUnitTestCase
 {
diff --git a/tests/system/Test/ControllerTestTraitTest.php b/tests/system/Test/ControllerTestTraitTest.php
index a5e10323a4ee..c03e5132ce2b 100644
--- a/tests/system/Test/ControllerTestTraitTest.php
+++ b/tests/system/Test/ControllerTestTraitTest.php
@@ -26,6 +26,8 @@
  * @preserveGlobalState         disabled
  *
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class ControllerTestTraitTest extends CIUnitTestCase
 {
diff --git a/tests/system/Test/TestCaseEmissionsTest.php b/tests/system/Test/TestCaseEmissionsTest.php
index 5374cd61d327..64f21b121734 100644
--- a/tests/system/Test/TestCaseEmissionsTest.php
+++ b/tests/system/Test/TestCaseEmissionsTest.php
@@ -21,6 +21,8 @@
  * test cases need to be run as separate processes.
  *
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class TestCaseEmissionsTest extends CIUnitTestCase
 {

From a0ffd36f7ea151833e27020c50b3726f3d0f49e3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 5 May 2022 15:57:04 +0900
Subject: [PATCH 2109/2325] test: fix tests (wip)

---
 .../system/RESTful/ResourceControllerTest.php | 27 ++++++++++++-------
 .../system/RESTful/ResourcePresenterTest.php  |  3 ++-
 tests/system/Router/RouteCollectionTest.php   |  4 ++-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index c552bae36cf7..0aa70bcd4a40 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -50,7 +50,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->resetServices();
+        $this->resetServices(true);
+        $this->resetFactories();
     }
 
     private function createCodeigniter(): void
@@ -92,7 +93,8 @@ public function testResourceGet()
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['index']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['index']), $error);
     }
 
     public function testResourceGetNew()
@@ -113,7 +115,8 @@ public function testResourceGetNew()
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['new']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['new']), $error);
     }
 
     public function testResourceGetEdit()
@@ -135,7 +138,8 @@ public function testResourceGetEdit()
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['edit']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['edit']), $error);
     }
 
     public function testResourceGetOne()
@@ -156,7 +160,8 @@ public function testResourceGetOne()
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['show']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['show']), $error);
     }
 
     public function testResourcePost()
@@ -176,7 +181,8 @@ public function testResourcePost()
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['create']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['create']), $error);
     }
 
     public function testResourcePatch()
@@ -197,7 +203,8 @@ public function testResourcePatch()
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['patch']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['update']), $error);
     }
 
     public function testResourcePut()
@@ -218,7 +225,8 @@ public function testResourcePut()
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['put']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['update']), $error);
     }
 
     public function testResourceDelete()
@@ -239,7 +247,8 @@ public function testResourceDelete()
         $this->codeigniter->useSafeOutput(true)->run($this->routes);
         $output = ob_get_clean();
 
-        $this->assertStringContainsString(lang('RESTful.notImplemented', ['delete']), $output);
+        $error = json_decode($output)->messages->error;
+        $this->assertStringContainsString(lang('RESTful.notImplemented', ['delete']), $error);
     }
 
     public function testModel()
diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php
index 253d077bdbce..663e9f4051d3 100644
--- a/tests/system/RESTful/ResourcePresenterTest.php
+++ b/tests/system/RESTful/ResourcePresenterTest.php
@@ -44,7 +44,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->resetServices();
+        $this->resetServices(true);
+        $this->resetFactories();
     }
 
     private function createCodeigniter(): void
diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index b385d372b517..6ccf8c3e8460 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -26,7 +26,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->resetServices();
+        $this->resetServices(true);
+        $this->resetFactories();
     }
 
     protected function getCollector(array $config = [], array $files = [], $moduleConfig = null)
@@ -1661,6 +1662,7 @@ public function testAutoRoutesControllerNameReturnsFQCN($namespace)
      */
     public function testRoutesControllerNameReturnsFQCN($namespace)
     {
+        Services::request()->setMethod('get');
         $routes = $this->getCollector();
         $routes->setAutoRoute(false);
         $routes->setDefaultNamespace($namespace);

From fe627b35e930710ed951569b8031f38023fc14ab Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 5 May 2022 16:28:03 +0900
Subject: [PATCH 2110/2325] test: revert @runTestsInSeparateProcesses

Without it, tests fail. I don't know why.
---
 tests/system/RESTful/ResourceControllerTest.php | 5 +++++
 tests/system/RESTful/ResourcePresenterTest.php  | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/tests/system/RESTful/ResourceControllerTest.php b/tests/system/RESTful/ResourceControllerTest.php
index 0aa70bcd4a40..d3dc0ea56a94 100644
--- a/tests/system/RESTful/ResourceControllerTest.php
+++ b/tests/system/RESTful/ResourceControllerTest.php
@@ -35,7 +35,12 @@
  * so we need to make sure that the methods routed to
  * return correct responses.
  *
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState         disabled
+ *
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class ResourceControllerTest extends CIUnitTestCase
 {
diff --git a/tests/system/RESTful/ResourcePresenterTest.php b/tests/system/RESTful/ResourcePresenterTest.php
index 663e9f4051d3..c44bbba564d1 100644
--- a/tests/system/RESTful/ResourcePresenterTest.php
+++ b/tests/system/RESTful/ResourcePresenterTest.php
@@ -29,7 +29,12 @@
  * so we need to make sure that the methods routed to
  * return correct responses.
  *
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState         disabled
+ *
  * @internal
+ *
+ * @group SeparateProcess
  */
 final class ResourcePresenterTest extends CIUnitTestCase
 {

From e0407eec180c0e6e02d95a8911ee757f0a655111 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 5 May 2022 20:52:49 +0900
Subject: [PATCH 2111/2325] fix: Implicit conversion from float to int loses
 precision

---
 system/Images/Handlers/GDHandler.php  | 2 +-
 tests/system/Images/GDHandlerTest.php | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/system/Images/Handlers/GDHandler.php b/system/Images/Handlers/GDHandler.php
index ab8e0b7e3dd3..e35fc726948a 100644
--- a/system/Images/Handlers/GDHandler.php
+++ b/system/Images/Handlers/GDHandler.php
@@ -451,7 +451,7 @@ protected function textOverlay(string $text, array $options = [], bool $isShadow
          * Get the rest of the string and split it into 2-length
          * hex values:
          */
-        $opacity = ($options['opacity'] * 127);
+        $opacity = (int) ($options['opacity'] * 127);
 
         // Allow opacity to be applied to the text
         imagealphablending($src, true);
diff --git a/tests/system/Images/GDHandlerTest.php b/tests/system/Images/GDHandlerTest.php
index 30216725a988..7661004ca2d4 100644
--- a/tests/system/Images/GDHandlerTest.php
+++ b/tests/system/Images/GDHandlerTest.php
@@ -289,7 +289,10 @@ public function testFitPositions()
     public function testText()
     {
         $this->handler->withFile($this->path);
-        $this->handler->text('vertical', ['hAlign' => 'right', 'vAlign' => 'bottom']);
+        $this->handler->text(
+            'vertical',
+            ['hAlign' => 'right', 'vAlign' => 'bottom', 'opacity' => 0.5]
+        );
         $this->assertSame(155, $this->handler->getWidth());
         $this->assertSame(200, $this->handler->getHeight());
     }

From fbc94c149bcfe3cb905a4124810de6c954507e85 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 6 May 2022 09:55:48 +0900
Subject: [PATCH 2112/2325] test: fix wrong test

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

diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index a36fcb8de3b2..44747ca35d3a 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -1128,7 +1128,7 @@ public function testWithDotCoSubdomain()
     {
         $routes = $this->getCollector();
 
-        $_SERVER['HTTP_HOST'] = 'example.uk.co';
+        $_SERVER['HTTP_HOST'] = 'example.co.uk';
 
         $routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'sales']);
         $routes->add('/objects/(:alphanum)', 'App::objectsList/$1');

From 33dcb92b89e25d8ccce155a1c25af742fecb0a13 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 6 May 2022 13:54:35 +0900
Subject: [PATCH 2113/2325] docs: fix title level

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

diff --git a/user_guide_src/source/libraries/images.rst b/user_guide_src/source/libraries/images.rst
index f3a0de06fb3a..b8bb7fb71f08 100644
--- a/user_guide_src/source/libraries/images.rst
+++ b/user_guide_src/source/libraries/images.rst
@@ -43,8 +43,9 @@ server in **app/Config/Images.php**.
         loaded on the server. As long as your script can access the library
         and can run ``exec()`` on the server, it should work.
 
+*******************
 Processing an Image
-===================
+*******************
 
 Regardless of the type of processing you would like to perform
 (resizing, cropping, rotation, or watermarking), the general process is

From 2ee7e766a3301930d65c820f11a0aa777d8a3513 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 6 May 2022 14:12:33 +0900
Subject: [PATCH 2114/2325] docs: decorate source code (variables, methods)
 with '``'

---
 user_guide_src/source/libraries/images.rst | 94 +++++++++++-----------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/user_guide_src/source/libraries/images.rst b/user_guide_src/source/libraries/images.rst
index b8bb7fb71f08..4f9fee0d90f4 100644
--- a/user_guide_src/source/libraries/images.rst
+++ b/user_guide_src/source/libraries/images.rst
@@ -33,8 +33,8 @@ Service function:
 
 The available Handlers are as follows:
 
-- gd        The GD/GD2 image library
-- imagick   The ImageMagick library.
+- ``gd``      The GD/GD2 image library
+- ``imagick`` The ImageMagick library.
 
 If using the ImageMagick library, you must set the path to the library on your
 server in **app/Config/Images.php**.
@@ -58,7 +58,7 @@ For example, to create an image thumbnail you'll do this:
 The above code tells the library to look for an image
 called *mypic.jpg* located in the source_image folder, then create a
 new image from it that is 100 x 100pixels using the GD2 image_library,
-and save it to a new file (the thumb). Since it is using the fit() method,
+and save it to a new file (the thumb). Since it is using the ``fit()`` method,
 it will attempt to find the best portion of the image to crop based on the
 desired aspect ratio, and then crop and resize the result.
 
@@ -103,14 +103,14 @@ Processing Methods
 
 There are seven available processing methods:
 
--  $image->crop()
--  $image->convert()
--  $image->fit()
--  $image->flatten()
--  $image->flip()
--  $image->resize()
--  $image->rotate()
--  $image->text()
+-  ``$image->crop()``
+-  ``$image->convert()``
+-  ``$image->fit()``
+-  ``$image->flatten()``
+-  ``$image->flip()``
+-  ``$image->resize()``
+-  ``$image->rotate()``
+-  ``$image->text()``
 
 These methods return the class instance so they can be chained together, as shown above.
 If they fail they will throw a ``CodeIgniter\Images\ImageException`` that contains
@@ -127,12 +127,12 @@ thumbnail images that should match a certain size/aspect ratio. This is handled
 
     crop(int $width = null, int $height = null, int $x = null, int $y = null, bool $maintainRatio = false, string $masterDim = 'auto')
 
-- **$width** is the desired width of the resulting image, in pixels.
-- **$height** is the desired height of the resulting image, in pixels.
-- **$x** is the number of pixels from the left side of the image to start cropping.
-- **$y** is the number of pixels from the top of the image to start cropping.
-- **$maintainRatio** will, if true, adjust the final dimensions as needed to maintain the image's original aspect ratio.
-- **$masterDim** specifies which dimension should be left untouched when $maintainRatio is true. Values can be: 'width', 'height', or 'auto'.
+- ``$width`` is the desired width of the resulting image, in pixels.
+- ``$height`` is the desired height of the resulting image, in pixels.
+- ``$x`` is the number of pixels from the left side of the image to start cropping.
+- ``$y`` is the number of pixels from the top of the image to start cropping.
+- ``$maintainRatio`` will, if true, adjust the final dimensions as needed to maintain the image's original aspect ratio.
+- ``$masterDim`` specifies which dimension should be left untouched when ``$maintainRatio`` is true. Values can be: ``'width'``, ``'height'``, or ``'auto'``.
 
 To take a 50x50 pixel square out of the center of an image, you would need to first calculate the appropriate x and y
 offset values:
@@ -146,12 +146,12 @@ The ``convert()`` method changes the library's internal indicator for the desire
 
     convert(int $imageType)
 
-- **$imageType** is one of PHP's image type constants (see for example https://www.php.net/manual/en/function.image-type-to-mime-type.php):
+- ``$imageType`` is one of PHP's image type constants (see for example https://www.php.net/manual/en/function.image-type-to-mime-type.php):
 
   .. literalinclude:: images/009.php
 
 .. note:: ImageMagick already saves files in the type
-    indicated by their extension, ignoring **$imageType**
+    indicated by their extension, ignoring ``$imageType``.
 
 Fitting Images
 --------------
@@ -166,9 +166,9 @@ The ``fit()`` method aims to help simplify cropping a portion of an image in a "
 
     fit(int $width, int $height = null, string $position = 'center')
 
-- **$width** is the desired final width of the image.
-- **$height** is the desired final height of the image.
-- **$position** determines the portion of the image to crop out. Allowed positions: 'top-left', 'top', 'top-right', 'left', 'center', 'right', 'bottom-left', 'bottom', 'bottom-right'.
+- ``$width`` is the desired final width of the image.
+- ``$height`` is the desired final height of the image.
+- ``$position`` determines the portion of the image to crop out. Allowed positions: ``'top-left'``, ``'top'``, ``'top-right'``, ``'left'``, ``'center'``, ``'right'``, ``'bottom-left'``, ``'bottom'``, ``'bottom-right'``.
 
 This provides a much simpler way to crop that will always maintain the aspect ratio:
 
@@ -185,9 +185,9 @@ The ``flatten()`` method aims to add a background color behind transparent image
 
     flatten(int $red = 255, int $green = 255, int $blue = 255)
 
-- **$red** is the red value of the background.
-- **$green** is the green value of the background.
-- **$blue** is the blue value of the background.
+- ``$red`` is the red value of the background.
+- ``$green`` is the green value of the background.
+- ``$blue`` is the blue value of the background.
 
 .. literalinclude:: images/011.php
 
@@ -198,24 +198,24 @@ Images can be flipped along either their horizontal or vertical axis::
 
     flip(string $dir)
 
-- **$dir** specifies the axis to flip along. Can be either 'vertical' or 'horizontal'.
+- ``$dir`` specifies the axis to flip along. Can be either ``'vertical'`` or ``'horizontal'``.
 
 .. literalinclude:: images/012.php
 
 Resizing Images
 ---------------
 
-Images can be resized to fit any dimension you require with the resize() method::
+Images can be resized to fit any dimension you require with the ``resize()`` method::
 
     resize(int $width, int $height, bool $maintainRatio = false, string $masterDim = 'auto')
 
-- **$width** is the desired width of the new image in pixels
-- **$height** is the desired height of the new image in pixels
-- **$maintainRatio** determines whether the image is stretched to fit the new dimensions, or the original aspect ratio is maintained.
-- **$masterDim** specifies which axis should have its dimension honored when maintaining ratio. Either 'width', 'height'.
+- ``$width`` is the desired width of the new image in pixels
+- ``$height`` is the desired height of the new image in pixels
+- ``$maintainRatio`` determines whether the image is stretched to fit the new dimensions, or the original aspect ratio is maintained.
+- ``$masterDim`` specifies which axis should have its dimension honored when maintaining ratio. Either ``'width'``, ``'height'``.
 
 When resizing images you can choose whether to maintain the ratio of the original image, or stretch/squash the new
-image to fit the desired dimensions. If $maintainRatio is true, the dimension specified by $masterDim will stay the same,
+image to fit the desired dimensions. If ``$maintainRatio`` is true, the dimension specified by ``$masterDim`` will stay the same,
 while the other dimension will be altered to match the original image's aspect ratio.
 
 .. literalinclude:: images/013.php
@@ -223,19 +223,19 @@ while the other dimension will be altered to match the original image's aspect r
 Rotating Images
 ---------------
 
-The rotate() method allows you to rotate an image in 90 degree increments::
+The ``rotate()`` method allows you to rotate an image in 90 degree increments::
 
     rotate(float $angle)
 
-- **$angle** is the number of degrees to rotate. One of '90', '180', '270'.
+- ``$angle`` is the number of degrees to rotate. One of ``90``, ``180``, ``270``.
 
-.. note:: While the $angle parameter accepts a float, it will convert it to an integer during the process.
+.. note:: While the ``$angle`` parameter accepts a float, it will convert it to an integer during the process.
         If the value is any other than the three values listed above, it will throw a CodeIgniter\Images\ImageException.
 
 Adding a Text Watermark
 -----------------------
 
-You can overlay a text watermark onto the image very simply with the text() method. This is useful for placing copyright
+You can overlay a text watermark onto the image very simply with the ``text()`` method. This is useful for placing copyright
 notices, photographer names, or simply marking the images as a preview so they won't be used in other people's final
 products.
 
@@ -250,17 +250,17 @@ that allow you to specify how the text should be displayed:
 
 The possible options that are recognized are as follows:
 
-- color         Text Color (hex number), i.e., #ff0000
-- opacity        A number between 0 and 1 that represents the opacity of the text.
-- withShadow    Boolean value whether to display a shadow or not.
-- shadowColor   Color of the shadow (hex number)
-- shadowOffset    How many pixels to offset the shadow. Applies to both the vertical and horizontal values.
-- hAlign        Horizontal alignment: left, center, right
-- vAlign        Vertical alignment: top, middle, bottom
-- hOffset        Additional offset on the x axis, in pixels
-- vOffset        Additional offset on the y axis, in pixels
-- fontPath        The full server path to the TTF font you wish to use. System font will be used if none is given.
-- fontSize        The font size to use. When using the GD handler with the system font, valid values are between 1-5.
+- ``color``         Text Color (hex number), i.e., #ff0000
+- ``opacity``        A number between 0 and 1 that represents the opacity of the text.
+- ``withShadow``    Boolean value whether to display a shadow or not.
+- ``shadowColor``   Color of the shadow (hex number)
+- ``shadowOffset``    How many pixels to offset the shadow. Applies to both the vertical and horizontal values.
+- ``hAlign``        Horizontal alignment: left, center, right
+- ``vAlign``        Vertical alignment: top, middle, bottom
+- ``hOffset``        Additional offset on the x axis, in pixels
+- ``vOffset``        Additional offset on the y axis, in pixels
+- ``fontPath``        The full server path to the TTF font you wish to use. System font will be used if none is given.
+- ``fontSize``        The font size to use. When using the GD handler with the system font, valid values are between 1-5.
 
 .. note:: The ImageMagick driver does not recognize full server path for fontPath. Instead, simply provide the
         name of one of the installed system fonts that you wish to use, i.e., Calibri.

From 716039ad484f283c0a1c6f826b68aa42a28aaacd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 6 May 2022 14:18:03 +0900
Subject: [PATCH 2115/2325] docs: fix title level

---
 user_guide_src/source/libraries/images.rst | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/user_guide_src/source/libraries/images.rst b/user_guide_src/source/libraries/images.rst
index 4f9fee0d90f4..1e4f85692467 100644
--- a/user_guide_src/source/libraries/images.rst
+++ b/user_guide_src/source/libraries/images.rst
@@ -98,8 +98,9 @@ You will need to include the image resource or you will end up with an exact cop
 
 .. literalinclude:: images/006.php
 
+******************
 Processing Methods
-==================
+******************
 
 There are seven available processing methods:
 
@@ -120,7 +121,7 @@ error upon failure, like this:
 .. literalinclude:: images/007.php
 
 Cropping Images
----------------
+===============
 
 Images can be cropped so that only a portion of the original image remains. This is often used when creating
 thumbnail images that should match a certain size/aspect ratio. This is handled with the ``crop()`` method::
@@ -140,7 +141,7 @@ offset values:
 .. literalinclude:: images/008.php
 
 Converting Images
------------------
+=================
 
 The ``convert()`` method changes the library's internal indicator for the desired file format. This doesn't touch the actual image resource, but indicates to ``save()`` what format to use::
 
@@ -154,7 +155,7 @@ The ``convert()`` method changes the library's internal indicator for the desire
     indicated by their extension, ignoring ``$imageType``.
 
 Fitting Images
---------------
+==============
 
 The ``fit()`` method aims to help simplify cropping a portion of an image in a "smart" way, by doing the following steps:
 
@@ -175,7 +176,7 @@ This provides a much simpler way to crop that will always maintain the aspect ra
 .. literalinclude:: images/010.php
 
 Flattening Images
------------------
+=================
 
 The ``flatten()`` method aims to add a background color behind transparent images (PNG) and convert RGBA pixels to RGB pixels
 
@@ -192,7 +193,7 @@ The ``flatten()`` method aims to add a background color behind transparent image
 .. literalinclude:: images/011.php
 
 Flipping Images
----------------
+===============
 
 Images can be flipped along either their horizontal or vertical axis::
 
@@ -203,7 +204,7 @@ Images can be flipped along either their horizontal or vertical axis::
 .. literalinclude:: images/012.php
 
 Resizing Images
----------------
+===============
 
 Images can be resized to fit any dimension you require with the ``resize()`` method::
 
@@ -221,7 +222,7 @@ while the other dimension will be altered to match the original image's aspect r
 .. literalinclude:: images/013.php
 
 Rotating Images
----------------
+===============
 
 The ``rotate()`` method allows you to rotate an image in 90 degree increments::
 
@@ -233,7 +234,7 @@ The ``rotate()`` method allows you to rotate an image in 90 degree increments::
         If the value is any other than the three values listed above, it will throw a CodeIgniter\Images\ImageException.
 
 Adding a Text Watermark
------------------------
+=======================
 
 You can overlay a text watermark onto the image very simply with the ``text()`` method. This is useful for placing copyright
 notices, photographer names, or simply marking the images as a preview so they won't be used in other people's final

From a21aac8d265db9f57248d8af562950462eb7cc67 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 6 May 2022 14:18:42 +0900
Subject: [PATCH 2116/2325] docs: fix sample code

save() returns bool.
---
 user_guide_src/source/libraries/images/003.php | 3 +--
 user_guide_src/source/libraries/images/004.php | 3 +--
 user_guide_src/source/libraries/images/005.php | 3 +--
 user_guide_src/source/libraries/images/006.php | 3 +--
 user_guide_src/source/libraries/images/007.php | 7 ++++---
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/user_guide_src/source/libraries/images/003.php b/user_guide_src/source/libraries/images/003.php
index 3877ff56af12..ea3a007d1ea1 100644
--- a/user_guide_src/source/libraries/images/003.php
+++ b/user_guide_src/source/libraries/images/003.php
@@ -1,6 +1,5 @@
 <?php
 
-$image = \Config\Services::image()
-    ->withFile('/path/to/image/mypic.jpg')
+$image->withFile('/path/to/image/mypic.jpg')
     ->fit(100, 100, 'center')
     ->save('/path/to/image/mypic_thumb.jpg');
diff --git a/user_guide_src/source/libraries/images/004.php b/user_guide_src/source/libraries/images/004.php
index ec6026592341..ff01d0187568 100644
--- a/user_guide_src/source/libraries/images/004.php
+++ b/user_guide_src/source/libraries/images/004.php
@@ -1,7 +1,6 @@
 <?php
 
-$image = \Config\Services::image()
-    ->withFile('/path/to/image/mypic.jpg')
+$image->withFile('/path/to/image/mypic.jpg')
     ->reorient()
     ->rotate(90)
     ->crop(100, 100, 0, 0)
diff --git a/user_guide_src/source/libraries/images/005.php b/user_guide_src/source/libraries/images/005.php
index 3f7470ee82ac..faafbddd158b 100644
--- a/user_guide_src/source/libraries/images/005.php
+++ b/user_guide_src/source/libraries/images/005.php
@@ -1,6 +1,5 @@
 <?php
 
-$image = \Config\Services::image()
-    ->withFile('/path/to/image/mypic.jpg')
+$image->withFile('/path/to/image/mypic.jpg')
     // processing methods
     ->save('/path/to/image/my_low_quality_pic.jpg', 10);
diff --git a/user_guide_src/source/libraries/images/006.php b/user_guide_src/source/libraries/images/006.php
index 9bfcb18b3b7e..e49d368fc0da 100644
--- a/user_guide_src/source/libraries/images/006.php
+++ b/user_guide_src/source/libraries/images/006.php
@@ -1,6 +1,5 @@
 <?php
 
-$image = \Config\Services::image()
-    ->withFile('/path/to/image/mypic.jpg')
+$image->withFile('/path/to/image/mypic.jpg')
     ->withResource()
     ->save('/path/to/image/my_low_quality_pic.jpg', 10);
diff --git a/user_guide_src/source/libraries/images/007.php b/user_guide_src/source/libraries/images/007.php
index 503c038cf81c..51521268855f 100644
--- a/user_guide_src/source/libraries/images/007.php
+++ b/user_guide_src/source/libraries/images/007.php
@@ -1,10 +1,11 @@
 <?php
 
+$image = \Config\Services::image();
+
 try {
-    $image = \Config\Services::image()
-        ->withFile('/path/to/image/mypic.jpg')
+    $image->withFile('/path/to/image/mypic.jpg')
         ->fit(100, 100, 'center')
         ->save('/path/to/image/mypic_thumb.jpg');
-} catch (CodeIgniter\Images\ImageException $e) {
+} catch (CodeIgniter\Images\Exceptions\ImageException $e) {
     echo $e->getMessage();
 }

From 19f401c9fc39478a9275a09b0c590ba52c9f515b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 6 May 2022 15:46:11 +0900
Subject: [PATCH 2117/2325] fix: GDHandler::convert() does not work

---
 system/Images/Handlers/BaseHandler.php         | 2 ++
 tests/system/Images/GDHandlerTest.php          | 1 -
 tests/system/Images/ImageMagickHandlerTest.php | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Images/Handlers/BaseHandler.php b/system/Images/Handlers/BaseHandler.php
index 3e0d81c2dc68..c539120288fd 100644
--- a/system/Images/Handlers/BaseHandler.php
+++ b/system/Images/Handlers/BaseHandler.php
@@ -296,6 +296,8 @@ public function crop(?int $width = null, ?int $height = null, ?int $x = null, ?i
      */
     public function convert(int $imageType)
     {
+        $this->ensureResource();
+
         $this->image()->imageType = $imageType;
 
         return $this;
diff --git a/tests/system/Images/GDHandlerTest.php b/tests/system/Images/GDHandlerTest.php
index 30216725a988..76635d522354 100644
--- a/tests/system/Images/GDHandlerTest.php
+++ b/tests/system/Images/GDHandlerTest.php
@@ -394,7 +394,6 @@ public function testImageCompressionWithResource()
     public function testImageConvert()
     {
         $this->handler->withFile($this->origin . 'ci-logo.jpeg');
-        $this->handler->getResource(); // make sure resource is loaded
         $this->handler->convert(IMAGETYPE_PNG);
         $this->handler->save($this->start . 'work/ci-logo.png');
         $this->assertSame(exif_imagetype($this->start . 'work/ci-logo.png'), IMAGETYPE_PNG);
diff --git a/tests/system/Images/ImageMagickHandlerTest.php b/tests/system/Images/ImageMagickHandlerTest.php
index c79283b3f8fe..31f1aeadb35b 100644
--- a/tests/system/Images/ImageMagickHandlerTest.php
+++ b/tests/system/Images/ImageMagickHandlerTest.php
@@ -392,7 +392,6 @@ public function testImageCompressionWithResource()
     public function testImageConvert()
     {
         $this->handler->withFile($this->origin . 'ci-logo.jpeg');
-        $this->handler->getResource(); // make sure resource is loaded
         $this->handler->convert(IMAGETYPE_PNG);
         $this->handler->save($this->root . 'ci-logo.png');
         $this->assertSame(exif_imagetype($this->root . 'ci-logo.png'), IMAGETYPE_PNG);

From 4e5161029e1d7fa007020017aeced2dad89a7b23 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 7 May 2022 07:36:26 +0900
Subject: [PATCH 2118/2325] docs: remove "@mixin BaseBuilder", add "@method"

---
 phpstan-baseline.neon.dist |  5 -----
 system/Model.php           | 32 ++++++++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index 4b3938eccbae..58c7bd61823c 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -665,11 +665,6 @@ parameters:
 			count: 1
 			path: system/Log/Logger.php
 
-		-
-			message: "#^Call to an undefined method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:asArray\\(\\)\\.$#"
-			count: 1
-			path: system/Model.php
-
 		-
 			message: "#^Property CodeIgniter\\\\RESTful\\\\ResourceController\\:\\:\\$formatter \\(CodeIgniter\\\\Format\\\\FormatterInterface\\) in isset\\(\\) is not nullable\\.$#"
 			count: 1
diff --git a/system/Model.php b/system/Model.php
index 31447cb00d72..4b2087d9dfed 100644
--- a/system/Model.php
+++ b/system/Model.php
@@ -38,9 +38,37 @@
  *      - allow intermingling calls to the builder
  *      - removes the need to use Result object directly in most cases
  *
- * @mixin BaseBuilder
- *
  * @property BaseConnection $db
+ *
+ * @method $this havingIn(?string $key = null, $values = null, ?bool $escape = null)
+ * @method $this havingLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+ * @method $this havingNotIn(?string $key = null, $values = null, ?bool $escape = null)
+ * @method $this join(string $table, string $cond, string $type = '', ?bool $escape = null)
+ * @method $this like($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+ * @method $this limit(?int $value = null, ?int $offset = 0)
+ * @method $this notHavingLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+ * @method $this notLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+ * @method $this offset(int $offset)
+ * @method $this orderBy(string $orderBy, string $direction = '', ?bool $escape = null)
+ * @method $this orHaving($key, $value = null, ?bool $escape = null)
+ * @method $this orHavingIn(?string $key = null, $values = null, ?bool $escape = null)
+ * @method $this orHavingLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+ * @method $this orHavingNotIn(?string $key = null, $values = null, ?bool $escape = null)
+ * @method $this orLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+ * @method $this orNotHavingLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+ * @method $this orNotLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+ * @method $this orWhere($key, $value = null, ?bool $escape = null)
+ * @method $this orWhereIn(?string $key = null, $values = null, ?bool $escape = null)
+ * @method $this orWhereNotIn(?string $key = null, $values = null, ?bool $escape = null)
+ * @method $this select($select = '*', ?bool $escape = null)
+ * @method $this selectAvg(string $select = '', string $alias = '')
+ * @method $this selectCount(string $select = '', string $alias = '')
+ * @method $this selectMax(string $select = '', string $alias = '')
+ * @method $this selectMin(string $select = '', string $alias = '')
+ * @method $this selectSum(string $select = '', string $alias = '')
+ * @method $this where($key, $value = null, ?bool $escape = null)
+ * @method $this whereIn(?string $key = null, $values = null, ?bool $escape = null)
+ * @method $this whereNotIn(?string $key = null, $values = null, ?bool $escape = null)
  */
 class Model extends BaseModel
 {

From 56afff0d41ac06b3715a8c8a30b98d51b57c03c8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 7 May 2022 08:10:09 +0900
Subject: [PATCH 2119/2325] test: run rector

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

diff --git a/tests/system/Models/FindModelTest.php b/tests/system/Models/FindModelTest.php
index e564f570ec8c..8f370f02f1e9 100644
--- a/tests/system/Models/FindModelTest.php
+++ b/tests/system/Models/FindModelTest.php
@@ -338,7 +338,7 @@ public function testSoftDeleteWithTableJoinsFirst(): void
     {
         $this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at' => null]);
 
-        $results = $this->createModel(UserModel::class)->join('job', 'job.id = user.id')->first(1);
+        $results = $this->createModel(UserModel::class)->join('job', 'job.id = user.id')->first();
         $this->assertSame(1, (int) $results->id);
     }
 }

From d177fd63a5fb20084fcb434934233d650bc9f602 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 7 May 2022 08:17:31 +0900
Subject: [PATCH 2120/2325] fix: GDHandler::save() remove transparency

---
 system/Images/Handlers/GDHandler.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/system/Images/Handlers/GDHandler.php b/system/Images/Handlers/GDHandler.php
index ab8e0b7e3dd3..b05084d273a1 100644
--- a/system/Images/Handlers/GDHandler.php
+++ b/system/Images/Handlers/GDHandler.php
@@ -225,6 +225,12 @@ public function save(?string $target = null, int $quality = 90): bool
 
         $this->ensureResource();
 
+        // for png and webp we can actually preserve transparency
+        if (in_array($this->image()->imageType, $this->supportTransparency, true)) {
+            imagealphablending($this->resource, false);
+            imagesavealpha($this->resource, true);
+        }
+
         switch ($this->image()->imageType) {
             case IMAGETYPE_GIF:
                 if (! function_exists('imagegif')) {

From 77fb67d324f592a31e96a410535bc83f9a21c351 Mon Sep 17 00:00:00 2001
From: Alexandr Toropov <toropovsite@yandex.ru>
Date: Sun, 8 May 2022 00:25:53 +0300
Subject: [PATCH 2121/2325] fix: object property which doesn't exist

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

diff --git a/system/Common.php b/system/Common.php
index 257c238d2b42..32b8f9b057d7 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -1014,10 +1014,13 @@ function single_service(string $name, ...$params)
     function slash_item(string $item): ?string
     {
         $config     = config(App::class);
-        $configItem = $config->{$item};
+
+        if (property_exists($config, $item)) {
+            $configItem = $config->{$item};
+        }
 
         if (! isset($configItem) || empty(trim($configItem))) {
-            return $configItem;
+            return null;
         }
 
         return rtrim($configItem, '/') . '/';

From de4b7c0dbfb8ace37517752c57c44e1c0b7c223c Mon Sep 17 00:00:00 2001
From: Alexandr Toropov <toropovsite@yandex.ru>
Date: Sun, 8 May 2022 08:25:06 +0300
Subject: [PATCH 2122/2325] fix: coding style

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

diff --git a/system/Common.php b/system/Common.php
index 32b8f9b057d7..e78f7c6ad7f1 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -1013,7 +1013,7 @@ function single_service(string $name, ...$params)
      */
     function slash_item(string $item): ?string
     {
-        $config     = config(App::class);
+        $config = config(App::class);
 
         if (property_exists($config, $item)) {
             $configItem = $config->{$item};

From 20ef1f3bc0e9808c81a768ba8f0ee5f75ee73b35 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 8 May 2022 20:41:25 +0900
Subject: [PATCH 2123/2325] fix: invalid css

---
 app/Views/errors/html/error_404.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Views/errors/html/error_404.php b/app/Views/errors/html/error_404.php
index 1cca20c485a9..56818c750314 100644
--- a/app/Views/errors/html/error_404.php
+++ b/app/Views/errors/html/error_404.php
@@ -24,7 +24,7 @@
 		}
 		h1 {
 			font-weight: lighter;
-			letter-spacing: 0.8;
+			letter-spacing: normal;
 			font-size: 3rem;
 			margin-top: 0;
 			margin-bottom: 0;

From 0ff1392d84803344d52a6370ea3bad11249a4d5d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 12:57:40 +0900
Subject: [PATCH 2124/2325] test: fix test code

---
 tests/system/Router/RouteCollectionTest.php | 46 ++++++++++-----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/tests/system/Router/RouteCollectionTest.php b/tests/system/Router/RouteCollectionTest.php
index a06d7ca651f7..0e6ddbf8a185 100644
--- a/tests/system/Router/RouteCollectionTest.php
+++ b/tests/system/Router/RouteCollectionTest.php
@@ -1145,10 +1145,10 @@ public function testWithDotCoSubdomain()
 
     public function testWithDifferentSubdomainMissing()
     {
-        $routes = $this->getCollector();
-
         $_SERVER['HTTP_HOST'] = 'adm.example.com';
 
+        $routes = $this->getCollector();
+
         $routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'nothere']);
         $routes->add('/objects/(:alphanum)', 'App::objectsList/$1', ['subdomain' => '*']);
 
@@ -1178,10 +1178,10 @@ public function testWithNoSubdomainAndDot()
      */
     public function testWithSubdomainOrdered()
     {
-        $routes = $this->getCollector();
-
         $_SERVER['HTTP_HOST'] = 'adm.example.com';
 
+        $routes = $this->getCollector();
+
         $routes->add('/objects/(:alphanum)', 'App::objectsList/$1');
         $routes->add('/objects/(:alphanum)', 'Admin::objectsList/$1', ['subdomain' => 'adm']);
 
@@ -1422,10 +1422,10 @@ public function testRouteToWithSubdomainMismatch()
 
     public function testRouteToWithSubdomainNot()
     {
-        $routes = $this->getCollector();
-
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'example.com';
+        Services::request()->setMethod('get');
+
+        $routes = $this->getCollector();
 
         $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => 'doc', 'as' => 'doc_item']);
 
@@ -1434,10 +1434,10 @@ public function testRouteToWithSubdomainNot()
 
     public function testRouteToWithGenericSubdomainMatch()
     {
-        $routes = $this->getCollector();
-
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'doc.example.com';
+        Services::request()->setMethod('get');
+
+        $routes = $this->getCollector();
 
         $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => '*', 'as' => 'doc_item']);
 
@@ -1446,10 +1446,10 @@ public function testRouteToWithGenericSubdomainMatch()
 
     public function testRouteToWithGenericSubdomainMismatch()
     {
-        $routes = $this->getCollector();
-
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'dev.example.com';
+        Services::request()->setMethod('get');
+
+        $routes = $this->getCollector();
 
         $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => '*', 'as' => 'doc_item']);
 
@@ -1458,10 +1458,10 @@ public function testRouteToWithGenericSubdomainMismatch()
 
     public function testRouteToWithGenericSubdomainNot()
     {
-        $routes = $this->getCollector();
-
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'example.com';
+        Services::request()->setMethod('get');
+
+        $routes = $this->getCollector();
 
         $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['subdomain' => '*', 'as' => 'doc_item']);
 
@@ -1482,10 +1482,10 @@ public function testRouteToWithoutSubdomainMatch()
 
     public function testRouteToWithoutSubdomainMismatch()
     {
-        $routes = $this->getCollector();
-
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'dev.example.com';
+        Services::request()->setMethod('get');
+
+        $routes = $this->getCollector();
 
         $routes->get('i/(:any)', 'App\Controllers\Site\CDoc::item/$1', ['hostname' => 'example.com', 'as' => 'doc_item']);
 
@@ -1532,8 +1532,8 @@ public function testRouteOverwritingDifferentSubdomains()
 
     public function testRouteOverwritingTwoRules()
     {
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'doc.domain.com';
+        Services::request()->setMethod('get');
 
         $routes = $this->getCollector();
         $router = new Router($routes, Services::request());
@@ -1553,8 +1553,8 @@ public function testRouteOverwritingTwoRules()
 
     public function testRouteOverwritingTwoRulesLastApplies()
     {
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'doc.domain.com';
+        Services::request()->setMethod('get');
 
         $routes = $this->getCollector();
         $router = new Router($routes, Services::request());
@@ -1573,8 +1573,8 @@ public function testRouteOverwritingTwoRulesLastApplies()
 
     public function testRouteOverwritingMatchingSubdomain()
     {
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'doc.domain.com';
+        Services::request()->setMethod('get');
 
         $routes = $this->getCollector();
         $router = new Router($routes, Services::request());
@@ -1593,8 +1593,8 @@ public function testRouteOverwritingMatchingSubdomain()
 
     public function testRouteOverwritingMatchingHost()
     {
-        Services::request()->setMethod('get');
         $_SERVER['HTTP_HOST'] = 'doc.domain.com';
+        Services::request()->setMethod('get');
 
         $routes = $this->getCollector();
         $router = new Router($routes, Services::request());

From b08c5b985124a99680f29179aeec1d944b2a113c Mon Sep 17 00:00:00 2001
From: Pooya Parsa Dadashi <pooya_parsa_dadashi@yahoo.com>
Date: Wed, 13 Apr 2022 17:39:21 +0330
Subject: [PATCH 2125/2325] CLI : Add new command ``db:table``

I do not know if this has been discussed before.
However, I sent the request.
If merged.
This command is simple, but practical.
This command displays the information in the table.
I will add options if it merged.
---
 system/Commands/Database/ShowTableInfo.php  | 236 ++++++++++++++++++++
 user_guide_src/source/changelogs/v4.2.0.rst |   6 +
 user_guide_src/source/database/examples.rst |  18 ++
 user_guide_src/source/database/metadata.rst |  15 ++
 4 files changed, 275 insertions(+)
 create mode 100644 system/Commands/Database/ShowTableInfo.php

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
new file mode 100644
index 000000000000..89fc7c7a3404
--- /dev/null
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -0,0 +1,236 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Database;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use Config\Database;
+
+/**
+ * Get table data if it exists in the database.
+ */
+class ShowTableInfo extends BaseCommand
+{
+    /**
+     * The group the command is lumped under
+     * when listing commands.
+     *
+     * @var string
+     */
+    protected $group = 'Database';
+
+    /**
+     * The Command's name
+     *
+     * @var string
+     */
+    protected $name = 'db:table';
+
+    /**
+     * the Command's short description
+     *
+     * @var string
+     */
+    protected $description = 'Retrieves information on the selected table.';
+
+    /**
+     * the Command's usage
+     *
+     * @var string
+     */
+    protected $usage = 'db:table <table_name> [options]';
+
+    /**
+     * The Command's arguments
+     *
+     * @var array<string, string>
+     */
+    protected $arguments = [
+        'table_name' => 'The table name for show info',
+    ];
+
+    /**
+     * The Command's options
+     *
+     * @var array<string, string>
+     */
+    protected $options = [
+        '--show'               => 'List the names of all database tables.',
+        '--metadata'           => 'Retrieves list of containing field information.',
+        '--desc'               => 'Sort the table rows in DESC order.',
+        '--limit-rows'         => 'Limit the number of rows. [Default = 10]',
+        '--limit-fields-value' => 'Custom length Limit of field values. [Default = 15]',
+    ];
+
+    private array $tbody;
+    private string $db       = '';
+    private bool $sortIsDESC = false;
+
+    public function run(array $params)
+    {
+        $this->db = Database::connect();
+
+        $tables = $this->db->listTables();
+
+        $this->sortIsDESC = CLI::getOption('desc');
+
+        if ($tables === []) {
+            CLI::error('Database has no tables!', 'light_gray', 'red');
+            CLI::newLine();
+
+            return;
+        }
+
+        if (CLI::getOption('show')) {
+            CLI::write('The following is a list of the names of all database tables:', 'black', 'yellow');
+            CLI::newLine();
+
+            $thead       = ['ID', 'Table name', 'Number of rows', 'Number of fields'];
+            $this->tbody = $this->makeTbodyForShowAllTables($tables);
+
+            CLI::table($this->tbody, $thead);
+            CLI::newLine();
+
+            return;
+        }
+
+        $tableName = array_shift($params);
+
+        if (in_array($tableName, $tables, true)) {
+            if (CLI::getOption('metadata')) {
+                $this->showFieldMetaData($tableName);
+
+                return;
+            }
+
+            CLI::newLine();
+            CLI::write("Data of table \"{$tableName}\":", 'black', 'yellow');
+            CLI::newLine();
+
+            $thead       = $this->db->getFieldNames($tableName);
+            $this->tbody = $this->makeTableRows($tableName);
+            CLI::table($this->tbody, $thead);
+
+            return;
+        }
+
+        $tableName = CLI::promptByKey(['Here is the list of your database tables:', 'Which table do you want to see?'], $tables, 'required');
+
+        if (CLI::getOption('metadata')) {
+            $this->showFieldMetaData($tables[$tableName]);
+
+            return;
+        }
+
+        CLI::newLine();
+        CLI::write("Data of table \"{$tables[$tableName]}\":", 'black', 'yellow');
+        CLI::newLine();
+
+        $thead       = $this->db->getFieldNames($tables[$tableName]);
+        $this->tbody = $this->makeTableRows($tables[$tableName]);
+        CLI::table($this->tbody, $thead);
+    }
+
+    private function makeTbodyForShowAllTables(array $tables): array
+    {
+        foreach ($tables  as $id => $tableName) {
+            $db = $this->db->query("SELECT * FROM {$tableName}");
+
+            $this->tbody[] = [
+                $id + 1,
+                $tableName,
+                $db->getNumRows(),
+                $db->getFieldCount(),
+            ];
+        }
+
+        if ($this->sortIsDESC) {
+            krsort($this->tbody);
+        }
+
+        return $this->tbody;
+    }
+
+    private function makeTableRows(string $tableName): array
+    {
+        $limitRows = (int) CLI::getOption('limit-rows');
+
+        if (in_array($limitRows, [null, true, 0, 1], true)) {
+            $limitRows = 10;
+        }
+
+        $limitFieldsValue = (int) CLI::getOption('limit-fields-value');
+
+        if (in_array($limitFieldsValue, [null, true, 0, 1], true)) {
+            $limitFieldsValue = 15;
+        }
+
+        $this->tbody = [];
+
+        $customQueryForEachField = '';
+
+        $fieldNames = $this->db->getFieldNames($tableName);
+
+        foreach ($fieldNames as $fieldName) {
+            $customQueryForEachField .= ",IF(length(`{$fieldName}`) > {$limitFieldsValue} ,CONCAT(SUBSTRING(`{$fieldName}`, 1, {$limitFieldsValue}),'...'), `{$fieldName}` ) as `{$fieldName}`";
+        }
+
+        $rows = $this->db->query('SELECT * ' . $customQueryForEachField . " FROM {$tableName} LIMIT {$limitRows}")->getResultArray();
+
+        foreach ($rows as $row) {
+            $this->tbody[] = $row;
+        }
+
+        if ($this->sortIsDESC) {
+            krsort($this->tbody);
+        }
+
+        return $this->tbody;
+    }
+
+    private function showFieldMetaData(string $tableName): void
+    {
+        CLI::newLine();
+        CLI::write("List of metadata information in table \"{$tableName}\":", 'black', 'yellow');
+        CLI::newLine();
+
+        $thead = ['field name', 'type', 'max_length', 'nullable', 'default', 'primary_key'];
+
+        $fields = $this->db->getFieldData($tableName);
+
+        foreach ($fields as $row) {
+            $this->tbody[] = [
+                $row->name,
+                $row->type,
+                $row->max_length,
+                $this->setYesOrNo($row->nullable),
+                $row->default,
+                $this->setYesOrNo($row->primary_key),
+            ];
+        }
+
+        if ($this->sortIsDESC) {
+            krsort($this->tbody);
+        }
+
+        CLI::table($this->tbody, $thead);
+    }
+
+    private function setYesOrNo(bool $fieldValue): string
+    {
+        if ($fieldValue) {
+            return CLI::color('Yes', 'green');
+        }
+
+        return CLI::color('No', 'red');
+    }
+}
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 7ae85bf86928..ae5010d96725 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -70,6 +70,12 @@ Others
     - :ref:`select() <query-builder-select-rawsql>`, :ref:`where() <query-builder-where-rawsql>`, :ref:`like() <query-builder-like-rawsql>` accept the ``CodeIgniter\Database\RawSql`` instance.
 - Debugbar enhancements
     - Debug toolbar is now using ``microtime()`` instead of ``time()``.
+- Added new Command for CLI.
+  - ``db:table`` - You can now see the names of all the tables in the database you are currently connected, field names or other metadata, like the column type, max length and ... each table, and the information in that table in the terminal.
+    - ``db:table --show``
+    - ``db:table my_table``
+    - ``db:table my_table --metadata``
+    - ``db:table my_table --limit-row 50 --limit-fields-value 20 --desc``
 
 Changes
 *******
diff --git a/user_guide_src/source/database/examples.rst b/user_guide_src/source/database/examples.rst
index bee7e9066597..d4d3db1814b5 100644
--- a/user_guide_src/source/database/examples.rst
+++ b/user_guide_src/source/database/examples.rst
@@ -76,3 +76,21 @@ Query Builder Insert
 ====================
 
 .. literalinclude:: examples/008.php
+
+Get table rows in the Command Line
+===============================
+
+You can see specific table info on the command line. Assuming there is a table called ``my_table`` , use the following command to get started::
+
+    > php spark db:table my_table
+
+If table `my_table` is not in the database, the CodeIgniter displays a list of available tables to select.
+You can also use only the following command without the table name. In this case, the table name will be asked ::
+
+    > php spark db:table
+
+.. note:: You can use the optional ``--desc``, ``--limit-rows``, ``--limit-fields-value`` options at any time when using command ``db:table`` .
+
+Command ``db:table --limit-rows 50``, for example, limits the number of rows to 50 rows.
+Command ``db:table --desc``, set the sort direction to "DESC".
+And Command ``db:table --limit-fields-value 10`` limits the values of the fields to "10" characters, to prevent confusion of the table output in the terminal.
diff --git a/user_guide_src/source/database/metadata.rst b/user_guide_src/source/database/metadata.rst
index 20b00f5e4671..95c31e777a87 100644
--- a/user_guide_src/source/database/metadata.rst
+++ b/user_guide_src/source/database/metadata.rst
@@ -24,6 +24,12 @@ you are currently connected to. Example:
 
 .. note:: Some drivers have additional system tables that are excluded from this return.
 
+CodeIgniter supports show List the tables in your database straight from your favorite terminal using the dedicated ``db:table --show`` command. By using this command it is assumed that the tables is   existing. Otherwise, CodeIgniter will complain that tables list show has failed.
+
+To start, just type ::
+
+    > php spark db:table --show
+
 Determine If a Table Exists
 ===========================
 
@@ -100,6 +106,15 @@ database:
 -  primary_key - 1 if the column is a primary key
 -  type - the type of the column
 
+CodeIgniter supports show table containing field information in your database straight from your favorite terminal using the dedicated ``db:table my_table --metadata`` command. By using this command it is assumed that the table ``my_table`` is existing. Otherwise, CodeIgniter will show that tables list for select.
+Also, you can use this command as ``db:table --metadata``.
+
+.. note:: You can use the optional ``--desc``, ``--limit-rows``, ``--limit-fields-value`` options at any time when using command ``db:table`` .
+
+Command ``db:table --limit-rows 50``, for example, limits the number of rows to 50 rows.
+Command ``db:table --desc``, set the sort direction to "DESC". 
+And Command ``db:table --limit-fields-value 10`` limits the values of the fields to 10 characters, to prevent confusion of the table output in the terminal.
+
 List the Indexes in a Table
 ===========================
 

From 8cfd2c3d6e9d779472bde7c05c72daff111c6868 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 09:07:09 +0900
Subject: [PATCH 2126/2325] fix: $sortIsDESC assignment

Ensure that boolean is assigned.
---
 system/Commands/Database/ShowTableInfo.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index 89fc7c7a3404..23192b3511bb 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -81,7 +81,9 @@ public function run(array $params)
 
         $tables = $this->db->listTables();
 
-        $this->sortIsDESC = CLI::getOption('desc');
+        if (CLI::getOption('desc') === true) {
+            $this->sortIsDESC = true;
+        }
 
         if ($tables === []) {
             CLI::error('Database has no tables!', 'light_gray', 'red');

From e632c4080f5a469c0002466d29d915cf2425d5ba Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 09:09:15 +0900
Subject: [PATCH 2127/2325] fix: $db type

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

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index 23192b3511bb..4b627b490329 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\CLI\BaseCommand;
 use CodeIgniter\CLI\CLI;
+use CodeIgniter\Database\BaseConnection;
 use Config\Database;
 
 /**
@@ -72,7 +73,7 @@ class ShowTableInfo extends BaseCommand
     ];
 
     private array $tbody;
-    private string $db       = '';
+    private BaseConnection $db;
     private bool $sortIsDESC = false;
 
     public function run(array $params)

From 41f3c93e7480039866049727388e0fd05726b034 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 09:10:07 +0900
Subject: [PATCH 2128/2325] refactor: change option name

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

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index 4b627b490329..97581e120f19 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -69,7 +69,7 @@ class ShowTableInfo extends BaseCommand
         '--metadata'           => 'Retrieves list of containing field information.',
         '--desc'               => 'Sort the table rows in DESC order.',
         '--limit-rows'         => 'Limit the number of rows. [Default = 10]',
-        '--limit-fields-value' => 'Custom length Limit of field values. [Default = 15]',
+        '--limit-fields' => 'Limit the number of fields. Default: 15.',
     ];
 
     private array $tbody;
@@ -171,7 +171,7 @@ private function makeTableRows(string $tableName): array
             $limitRows = 10;
         }
 
-        $limitFieldsValue = (int) CLI::getOption('limit-fields-value');
+        $limitFieldsValue = (int) CLI::getOption('limit-fields');
 
         if (in_array($limitFieldsValue, [null, true, 0, 1], true)) {
             $limitFieldsValue = 15;

From e91d03e47cb8991e96409d5795efdd48842c296f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 09:10:37 +0900
Subject: [PATCH 2129/2325] refactor: tweak output message

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

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index 97581e120f19..9ad7b21b51cc 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -56,7 +56,7 @@ class ShowTableInfo extends BaseCommand
      * @var array<string, string>
      */
     protected $arguments = [
-        'table_name' => 'The table name for show info',
+        'table_name' => 'The table name to show info',
     ];
 
     /**
@@ -65,11 +65,11 @@ class ShowTableInfo extends BaseCommand
      * @var array<string, string>
      */
     protected $options = [
-        '--show'               => 'List the names of all database tables.',
-        '--metadata'           => 'Retrieves list of containing field information.',
-        '--desc'               => 'Sort the table rows in DESC order.',
-        '--limit-rows'         => 'Limit the number of rows. [Default = 10]',
-        '--limit-fields' => 'Limit the number of fields. Default: 15.',
+        '--show'         => 'Lists the names of all database tables.',
+        '--metadata'     => 'Retrieves list containing field information.',
+        '--desc'         => 'Sorts the table rows in DESC order.',
+        '--limit-rows'   => 'Limits the number of rows. Default: 10.',
+        '--limit-fields' => 'Limits the number of fields. Default: 15.',
     ];
 
     private array $tbody;
@@ -97,7 +97,7 @@ public function run(array $params)
             CLI::write('The following is a list of the names of all database tables:', 'black', 'yellow');
             CLI::newLine();
 
-            $thead       = ['ID', 'Table name', 'Number of rows', 'Number of fields'];
+            $thead       = ['ID', 'Table Name', 'Num of Rows', 'Num of Fields'];
             $this->tbody = $this->makeTbodyForShowAllTables($tables);
 
             CLI::table($this->tbody, $thead);
@@ -116,7 +116,7 @@ public function run(array $params)
             }
 
             CLI::newLine();
-            CLI::write("Data of table \"{$tableName}\":", 'black', 'yellow');
+            CLI::write("Data of Table \"{$tableName}\":", 'black', 'yellow');
             CLI::newLine();
 
             $thead       = $this->db->getFieldNames($tableName);
@@ -135,7 +135,7 @@ public function run(array $params)
         }
 
         CLI::newLine();
-        CLI::write("Data of table \"{$tables[$tableName]}\":", 'black', 'yellow');
+        CLI::write("Data of Table \"{$tables[$tableName]}\":", 'black', 'yellow');
         CLI::newLine();
 
         $thead       = $this->db->getFieldNames($tables[$tableName]);
@@ -203,10 +203,10 @@ private function makeTableRows(string $tableName): array
     private function showFieldMetaData(string $tableName): void
     {
         CLI::newLine();
-        CLI::write("List of metadata information in table \"{$tableName}\":", 'black', 'yellow');
+        CLI::write("List of Metadata Information in Table \"{$tableName}\":", 'black', 'yellow');
         CLI::newLine();
 
-        $thead = ['field name', 'type', 'max_length', 'nullable', 'default', 'primary_key'];
+        $thead = ['Field Name', 'Type', 'Max Length', 'Nullable', 'Default', 'Primary Key'];
 
         $fields = $this->db->getFieldData($tableName);
 

From c50b420bf4c80653f924b6cb0948c93696711302 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 09:12:28 +0900
Subject: [PATCH 2130/2325] refactor: rename variable name

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

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index 9ad7b21b51cc..154ae4aed281 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -171,10 +171,10 @@ private function makeTableRows(string $tableName): array
             $limitRows = 10;
         }
 
-        $limitFieldsValue = (int) CLI::getOption('limit-fields');
+        $limitFields = (int) CLI::getOption('limit-fields');
 
-        if (in_array($limitFieldsValue, [null, true, 0, 1], true)) {
-            $limitFieldsValue = 15;
+        if (in_array($limitFields, [null, true, 0, 1], true)) {
+            $limitFields = 15;
         }
 
         $this->tbody = [];
@@ -184,7 +184,7 @@ private function makeTableRows(string $tableName): array
         $fieldNames = $this->db->getFieldNames($tableName);
 
         foreach ($fieldNames as $fieldName) {
-            $customQueryForEachField .= ",IF(length(`{$fieldName}`) > {$limitFieldsValue} ,CONCAT(SUBSTRING(`{$fieldName}`, 1, {$limitFieldsValue}),'...'), `{$fieldName}` ) as `{$fieldName}`";
+            $customQueryForEachField .= ",IF(length(`{$fieldName}`) > {$limitFields} ,CONCAT(SUBSTRING(`{$fieldName}`, 1, {$limitFields}),'...'), `{$fieldName}` ) as `{$fieldName}`";
         }
 
         $rows = $this->db->query('SELECT * ' . $customQueryForEachField . " FROM {$tableName} LIMIT {$limitRows}")->getResultArray();

From 61869102ca756ba3594ac58033fa2c114c43dd80 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 09:16:53 +0900
Subject: [PATCH 2131/2325] docs: add PHPDocs

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

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index 154ae4aed281..1f3c504263c9 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -72,8 +72,16 @@ class ShowTableInfo extends BaseCommand
         '--limit-fields' => 'Limits the number of fields. Default: 15.',
     ];
 
+    /**
+     * @phpstan-var  list<list<string|int>> Table Data.
+     */
     private array $tbody;
+
     private BaseConnection $db;
+
+    /**
+     * @var bool Sort the table rows in DESC order or not.
+     */
     private bool $sortIsDESC = false;
 
     public function run(array $params)

From eda2b65f5cdcc44644ef88147ca8245f462bfbc9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 09:21:49 +0900
Subject: [PATCH 2132/2325] refactor: rename property name

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

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index 1f3c504263c9..e72203b3ff47 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -82,7 +82,7 @@ class ShowTableInfo extends BaseCommand
     /**
      * @var bool Sort the table rows in DESC order or not.
      */
-    private bool $sortIsDESC = false;
+    private bool $sortDesc = false;
 
     public function run(array $params)
     {
@@ -91,7 +91,7 @@ public function run(array $params)
         $tables = $this->db->listTables();
 
         if (CLI::getOption('desc') === true) {
-            $this->sortIsDESC = true;
+            $this->sortDesc = true;
         }
 
         if ($tables === []) {
@@ -164,7 +164,7 @@ private function makeTbodyForShowAllTables(array $tables): array
             ];
         }
 
-        if ($this->sortIsDESC) {
+        if ($this->sortDesc) {
             krsort($this->tbody);
         }
 
@@ -201,7 +201,7 @@ private function makeTableRows(string $tableName): array
             $this->tbody[] = $row;
         }
 
-        if ($this->sortIsDESC) {
+        if ($this->sortDesc) {
             krsort($this->tbody);
         }
 
@@ -229,7 +229,7 @@ private function showFieldMetaData(string $tableName): void
             ];
         }
 
-        if ($this->sortIsDESC) {
+        if ($this->sortDesc) {
             krsort($this->tbody);
         }
 

From daac9c4674f4b1ca429755472714236f3f85a682 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 10:05:26 +0900
Subject: [PATCH 2133/2325] refactor: remove CLI::getOption()

In phpunit testing, it could not get vaules.
---
 system/Commands/Database/ShowTableInfo.php | 30 ++++++++--------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index e72203b3ff47..a94f3f89f552 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -90,7 +90,7 @@ public function run(array $params)
 
         $tables = $this->db->listTables();
 
-        if (CLI::getOption('desc') === true) {
+        if (array_key_exists('desc', $params)) {
             $this->sortDesc = true;
         }
 
@@ -101,7 +101,7 @@ public function run(array $params)
             return;
         }
 
-        if (CLI::getOption('show')) {
+        if (array_key_exists('show', $params)) {
             CLI::write('The following is a list of the names of all database tables:', 'black', 'yellow');
             CLI::newLine();
 
@@ -114,10 +114,12 @@ public function run(array $params)
             return;
         }
 
-        $tableName = array_shift($params);
+        $tableName   = $params[0] ?? null;
+        $limitRows   = (int) ($params['limit-rows'] ?? 10);
+        $limitFields = (int) ($params['limit-fields'] ?? 15);
 
         if (in_array($tableName, $tables, true)) {
-            if (CLI::getOption('metadata')) {
+            if (array_key_exists('metadata', $params)) {
                 $this->showFieldMetaData($tableName);
 
                 return;
@@ -128,7 +130,7 @@ public function run(array $params)
             CLI::newLine();
 
             $thead       = $this->db->getFieldNames($tableName);
-            $this->tbody = $this->makeTableRows($tableName);
+            $this->tbody = $this->makeTableRows($tableName, $limitRows, $limitFields);
             CLI::table($this->tbody, $thead);
 
             return;
@@ -136,7 +138,7 @@ public function run(array $params)
 
         $tableName = CLI::promptByKey(['Here is the list of your database tables:', 'Which table do you want to see?'], $tables, 'required');
 
-        if (CLI::getOption('metadata')) {
+        if (array_key_exists('metadata', $params)) {
             $this->showFieldMetaData($tables[$tableName]);
 
             return;
@@ -147,7 +149,7 @@ public function run(array $params)
         CLI::newLine();
 
         $thead       = $this->db->getFieldNames($tables[$tableName]);
-        $this->tbody = $this->makeTableRows($tables[$tableName]);
+        $this->tbody = $this->makeTableRows($tables[$tableName], $limitRows, $limitFields);
         CLI::table($this->tbody, $thead);
     }
 
@@ -171,20 +173,8 @@ private function makeTbodyForShowAllTables(array $tables): array
         return $this->tbody;
     }
 
-    private function makeTableRows(string $tableName): array
+    private function makeTableRows(string $tableName, $limitRows, $limitFields): array
     {
-        $limitRows = (int) CLI::getOption('limit-rows');
-
-        if (in_array($limitRows, [null, true, 0, 1], true)) {
-            $limitRows = 10;
-        }
-
-        $limitFields = (int) CLI::getOption('limit-fields');
-
-        if (in_array($limitFields, [null, true, 0, 1], true)) {
-            $limitFields = 15;
-        }
-
         $this->tbody = [];
 
         $customQueryForEachField = '';

From e46fcc46f05c961cd242999339f45f5afd577dc9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 10:14:37 +0900
Subject: [PATCH 2134/2325] refactor: extract methods

---
 system/Commands/Database/ShowTableInfo.php | 40 ++++++++++++----------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index a94f3f89f552..293ab94c3c9b 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -102,14 +102,7 @@ public function run(array $params)
         }
 
         if (array_key_exists('show', $params)) {
-            CLI::write('The following is a list of the names of all database tables:', 'black', 'yellow');
-            CLI::newLine();
-
-            $thead       = ['ID', 'Table Name', 'Num of Rows', 'Num of Fields'];
-            $this->tbody = $this->makeTbodyForShowAllTables($tables);
-
-            CLI::table($this->tbody, $thead);
-            CLI::newLine();
+            $this->showAllTables($tables);
 
             return;
         }
@@ -125,13 +118,7 @@ public function run(array $params)
                 return;
             }
 
-            CLI::newLine();
-            CLI::write("Data of Table \"{$tableName}\":", 'black', 'yellow');
-            CLI::newLine();
-
-            $thead       = $this->db->getFieldNames($tableName);
-            $this->tbody = $this->makeTableRows($tableName, $limitRows, $limitFields);
-            CLI::table($this->tbody, $thead);
+            $this->showDataOfTable($tableName, $limitRows, $limitFields);
 
             return;
         }
@@ -144,15 +131,32 @@ public function run(array $params)
             return;
         }
 
+        $this->showDataOfTable($tables[$tableName], $limitRows, $limitFields);
+    }
+
+    private function showDataOfTable(string $tableName, int $limitRows, int $limitFields)
+    {
         CLI::newLine();
-        CLI::write("Data of Table \"{$tables[$tableName]}\":", 'black', 'yellow');
+        CLI::write("Data of Table \"{$tableName}\":", 'black', 'yellow');
         CLI::newLine();
 
-        $thead       = $this->db->getFieldNames($tables[$tableName]);
-        $this->tbody = $this->makeTableRows($tables[$tableName], $limitRows, $limitFields);
+        $thead       = $this->db->getFieldNames($tableName);
+        $this->tbody = $this->makeTableRows($tableName, $limitRows, $limitFields);
         CLI::table($this->tbody, $thead);
     }
 
+    private function showAllTables(array $tables)
+    {
+        CLI::write('The following is a list of the names of all database tables:', 'black', 'yellow');
+        CLI::newLine();
+
+        $thead       = ['ID', 'Table Name', 'Num of Rows', 'Num of Fields'];
+        $this->tbody = $this->makeTbodyForShowAllTables($tables);
+
+        CLI::table($this->tbody, $thead);
+        CLI::newLine();
+    }
+
     private function makeTbodyForShowAllTables(array $tables): array
     {
         foreach ($tables  as $id => $tableName) {

From f7ef1354b46103ca3a3bab3afeb02349e483e6fa Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 10:45:44 +0900
Subject: [PATCH 2135/2325] refactor: remove duplicate code

---
 system/Commands/Database/ShowTableInfo.php | 24 +++++++++-------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index 293ab94c3c9b..8e6ac60651c8 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -111,27 +111,23 @@ public function run(array $params)
         $limitRows   = (int) ($params['limit-rows'] ?? 10);
         $limitFields = (int) ($params['limit-fields'] ?? 15);
 
-        if (in_array($tableName, $tables, true)) {
-            if (array_key_exists('metadata', $params)) {
-                $this->showFieldMetaData($tableName);
-
-                return;
-            }
-
-            $this->showDataOfTable($tableName, $limitRows, $limitFields);
-
-            return;
+        if (! in_array($tableName, $tables, true)) {
+            $tableNameNo = CLI::promptByKey(
+                ['Here is the list of your database tables:', 'Which table do you want to see?'],
+                $tables,
+                'required'
+            );
+
+            $tableName = $tables[$tableNameNo];
         }
 
-        $tableName = CLI::promptByKey(['Here is the list of your database tables:', 'Which table do you want to see?'], $tables, 'required');
-
         if (array_key_exists('metadata', $params)) {
-            $this->showFieldMetaData($tables[$tableName]);
+            $this->showFieldMetaData($tableName);
 
             return;
         }
 
-        $this->showDataOfTable($tables[$tableName], $limitRows, $limitFields);
+        $this->showDataOfTable($tableName, $limitRows, $limitFields);
     }
 
     private function showDataOfTable(string $tableName, int $limitRows, int $limitFields)

From d339e470ce09ddddca2049fb925c087d5b0e6934 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 10:48:32 +0900
Subject: [PATCH 2136/2325] test: add tests

---
 .../Commands/Database/ShowTableInfoTest.php   | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)
 create mode 100644 tests/system/Commands/Database/ShowTableInfoTest.php

diff --git a/tests/system/Commands/Database/ShowTableInfoTest.php b/tests/system/Commands/Database/ShowTableInfoTest.php
new file mode 100644
index 000000000000..e3d8dce94528
--- /dev/null
+++ b/tests/system/Commands/Database/ShowTableInfoTest.php
@@ -0,0 +1,130 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Commands\Database;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use CodeIgniter\Test\Filters\CITestStreamFilter;
+use Tests\Support\Database\Seeds\CITestSeeder;
+
+/**
+ * @internal
+ */
+final class ShowTableInfoTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+
+    private $streamFilter;
+    protected $migrateOnce = true;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        CITestStreamFilter::$buffer = '';
+
+        $this->streamFilter = stream_filter_append(STDOUT, 'CITestStreamFilter');
+        $this->streamFilter = stream_filter_append(STDERR, 'CITestStreamFilter');
+    }
+
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+
+        stream_filter_remove($this->streamFilter);
+    }
+
+    private function getResultWithoutControlCode(): string
+    {
+        return str_replace(
+            ["\033[0;30m", "\033[0;33m", "\033[43m", "\033[0m"],
+            '',
+            CITestStreamFilter::$buffer
+        );
+    }
+
+    public function testDbTable(): void
+    {
+        command('db:table db_migrations');
+
+        $result = $this->getResultWithoutControlCode();
+
+        $expected = 'Data of Table "db_migrations":';
+        $this->assertStringContainsString($expected, $result);
+
+        $expected = <<<'EOL'
+            +----+----------------+--------------------+-------+---------------+------------+-------+
+            | id | version        | class              | group | namespace     | time       | batch |
+            +----+----------------+--------------------+-------+---------------+------------+-------+
+            EOL;
+        $this->assertStringContainsString($expected, $result);
+    }
+
+    public function testDbTableShow(): void
+    {
+        command('db:table --show');
+
+        $result = $this->getResultWithoutControlCode();
+
+        $expected = 'The following is a list of the names of all database tables:';
+        $this->assertStringContainsString($expected, $result);
+
+        $expected = <<<'EOL'
+            +----+---------------------------+-------------+---------------+
+            | ID | Table Name                | Num of Rows | Num of Fields |
+            +----+---------------------------+-------------+---------------+
+            EOL;
+        $this->assertStringContainsString($expected, $result);
+    }
+
+    public function testDbTableMetadata(): void
+    {
+        command('db:table db_migrations --metadata');
+
+        $result = $this->getResultWithoutControlCode();
+
+        $expected = 'List of Metadata Information in Table "db_migrations":';
+        $this->assertStringContainsString($expected, $result);
+
+        $expected = <<<'EOL'
+            +------------+---------+------------+----------+---------+-------------+
+            | Field Name | Type    | Max Length | Nullable | Default | Primary Key |
+            +------------+---------+------------+----------+---------+-------------+
+            EOL;
+        $this->assertStringContainsString($expected, $result);
+    }
+
+    public function testDbTableDesc(): void
+    {
+        $seeder = \Config\Database::seeder();
+        $seeder->call(CITestSeeder::class);
+
+        command('db:table db_user --desc');
+
+        $result = $this->getResultWithoutControlCode();
+
+        $expected = 'Data of Table "db_user":';
+        $this->assertStringContainsString($expected, $result);
+
+        $expected = <<<'EOL'
+            +----+--------------------+--------------------+---------+------------+------------+------------+
+            | id | name               | email              | country | created_at | updated_at | deleted_at |
+            +----+--------------------+--------------------+---------+------------+------------+------------+
+            | 4  | Chris Martin       | chris@world.com    | UK      |            |            |            |
+            | 3  | Richard A Cause... | richard@world.c... | US      |            |            |            |
+            | 2  | Ahmadinejad        | ahmadinejad@wor... | Iran    |            |            |            |
+            | 1  | Derek Jones        | derek@world.com    | US      |            |            |            |
+            +----+--------------------+--------------------+---------+------------+------------+------------+
+            EOL;
+        $this->assertStringContainsString($expected, $result);
+    }
+}

From b6bbe32a6a58055b7edd2dde312ae519b24630f9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 11:38:16 +0900
Subject: [PATCH 2137/2325] refactor: change option name

--limit-fields -> --limit-column-length
---
 system/Commands/Database/ShowTableInfo.php | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index 8e6ac60651c8..8b5a06ffb5c7 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -65,11 +65,11 @@ class ShowTableInfo extends BaseCommand
      * @var array<string, string>
      */
     protected $options = [
-        '--show'         => 'Lists the names of all database tables.',
-        '--metadata'     => 'Retrieves list containing field information.',
-        '--desc'         => 'Sorts the table rows in DESC order.',
-        '--limit-rows'   => 'Limits the number of rows. Default: 10.',
-        '--limit-fields' => 'Limits the number of fields. Default: 15.',
+        '--show'                => 'Lists the names of all database tables.',
+        '--metadata'            => 'Retrieves list containing field information.',
+        '--desc'                => 'Sorts the table rows in DESC order.',
+        '--limit-rows'          => 'Limits the number of rows. Default: 10.',
+        '--limit-column-length' => 'Limits the length of columns. Default: 15.',
     ];
 
     /**
@@ -107,9 +107,9 @@ public function run(array $params)
             return;
         }
 
-        $tableName   = $params[0] ?? null;
-        $limitRows   = (int) ($params['limit-rows'] ?? 10);
-        $limitFields = (int) ($params['limit-fields'] ?? 15);
+        $tableName         = $params[0] ?? null;
+        $limitRows         = (int) ($params['limit-rows'] ?? 10);
+        $limitColumnLength = (int) ($params['limit-column-length'] ?? 15);
 
         if (! in_array($tableName, $tables, true)) {
             $tableNameNo = CLI::promptByKey(
@@ -127,17 +127,17 @@ public function run(array $params)
             return;
         }
 
-        $this->showDataOfTable($tableName, $limitRows, $limitFields);
+        $this->showDataOfTable($tableName, $limitRows, $limitColumnLength);
     }
 
-    private function showDataOfTable(string $tableName, int $limitRows, int $limitFields)
+    private function showDataOfTable(string $tableName, int $limitRows, int $limitColumnLength)
     {
         CLI::newLine();
         CLI::write("Data of Table \"{$tableName}\":", 'black', 'yellow');
         CLI::newLine();
 
         $thead       = $this->db->getFieldNames($tableName);
-        $this->tbody = $this->makeTableRows($tableName, $limitRows, $limitFields);
+        $this->tbody = $this->makeTableRows($tableName, $limitRows, $limitColumnLength);
         CLI::table($this->tbody, $thead);
     }
 
@@ -173,7 +173,7 @@ private function makeTbodyForShowAllTables(array $tables): array
         return $this->tbody;
     }
 
-    private function makeTableRows(string $tableName, $limitRows, $limitFields): array
+    private function makeTableRows(string $tableName, $limitRows, $limitColumnLength): array
     {
         $this->tbody = [];
 
@@ -182,7 +182,7 @@ private function makeTableRows(string $tableName, $limitRows, $limitFields): arr
         $fieldNames = $this->db->getFieldNames($tableName);
 
         foreach ($fieldNames as $fieldName) {
-            $customQueryForEachField .= ",IF(length(`{$fieldName}`) > {$limitFields} ,CONCAT(SUBSTRING(`{$fieldName}`, 1, {$limitFields}),'...'), `{$fieldName}` ) as `{$fieldName}`";
+            $customQueryForEachField .= ",IF(length(`{$fieldName}`) > {$limitColumnLength} ,CONCAT(SUBSTRING(`{$fieldName}`, 1, {$limitColumnLength}),'...'), `{$fieldName}` ) as `{$fieldName}`";
         }
 
         $rows = $this->db->query('SELECT * ' . $customQueryForEachField . " FROM {$tableName} LIMIT {$limitRows}")->getResultArray();

From d34d876b0831ddd23175074feabad20b23f5d04b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 11:08:13 +0900
Subject: [PATCH 2138/2325] docs: update user guide

---
 user_guide_src/source/changelogs/v4.2.0.rst |  2 +-
 user_guide_src/source/database/examples.rst | 10 +++----
 user_guide_src/source/database/metadata.rst | 30 ++++++++++++++-------
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index ae5010d96725..de560711da2a 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -75,7 +75,7 @@ Others
     - ``db:table --show``
     - ``db:table my_table``
     - ``db:table my_table --metadata``
-    - ``db:table my_table --limit-row 50 --limit-fields-value 20 --desc``
+    - ``db:table my_table --limit-row 50 --limit-column-length 20 --desc``
 
 Changes
 *******
diff --git a/user_guide_src/source/database/examples.rst b/user_guide_src/source/database/examples.rst
index d4d3db1814b5..3920ac26d06c 100644
--- a/user_guide_src/source/database/examples.rst
+++ b/user_guide_src/source/database/examples.rst
@@ -77,20 +77,20 @@ Query Builder Insert
 
 .. literalinclude:: examples/008.php
 
-Get table rows in the Command Line
-===============================
+Get Table Rows in the Command Line
+==================================
 
 You can see specific table info on the command line. Assuming there is a table called ``my_table`` , use the following command to get started::
 
     > php spark db:table my_table
 
-If table `my_table` is not in the database, the CodeIgniter displays a list of available tables to select.
+If table ``my_table`` is not in the database, the CodeIgniter displays a list of available tables to select.
 You can also use only the following command without the table name. In this case, the table name will be asked ::
 
     > php spark db:table
 
-.. note:: You can use the optional ``--desc``, ``--limit-rows``, ``--limit-fields-value`` options at any time when using command ``db:table`` .
+.. note:: You can use the optional ``--desc``, ``--limit-rows``, ``--limit-column-length`` options at any time when using command ``db:table`` .
 
 Command ``db:table --limit-rows 50``, for example, limits the number of rows to 50 rows.
 Command ``db:table --desc``, set the sort direction to "DESC".
-And Command ``db:table --limit-fields-value 10`` limits the values of the fields to "10" characters, to prevent confusion of the table output in the terminal.
+And Command ``db:table --limit-column-length 10`` limits the length of the columns to 10 characters, to prevent confusion of the table output in the terminal.
diff --git a/user_guide_src/source/database/metadata.rst b/user_guide_src/source/database/metadata.rst
index 95c31e777a87..7917504a79e9 100644
--- a/user_guide_src/source/database/metadata.rst
+++ b/user_guide_src/source/database/metadata.rst
@@ -15,7 +15,8 @@ These functions let you fetch table information.
 List the Tables in Your Database
 ================================
 
-**$db->listTables();**
+$db->listTables()
+-----------------
 
 Returns an array containing the names of all the tables in the database
 you are currently connected to. Example:
@@ -24,7 +25,10 @@ you are currently connected to. Example:
 
 .. note:: Some drivers have additional system tables that are excluded from this return.
 
-CodeIgniter supports show List the tables in your database straight from your favorite terminal using the dedicated ``db:table --show`` command. By using this command it is assumed that the tables is   existing. Otherwise, CodeIgniter will complain that tables list show has failed.
+db:table --show command
+-----------------------
+
+CodeIgniter supports show list the tables in your database straight from your favorite terminal using the dedicated ``db:table --show`` command. By using this command it is assumed that the tables is   existing. Otherwise, CodeIgniter will complain that tables list show has failed.
 
 To start, just type ::
 
@@ -33,7 +37,8 @@ To start, just type ::
 Determine If a Table Exists
 ===========================
 
-**$db->tableExists();**
+$db->tableExists()
+------------------
 
 Sometimes it's helpful to know whether a particular table exists before
 running an operation on it. Returns a boolean true/false. Usage example:
@@ -49,7 +54,8 @@ Field MetaData
 List the Fields in a Table
 ==========================
 
-**$db->getFieldNames()**
+$db->getFieldNames()
+--------------------
 
 Returns an array containing the field names. This query can be called
 two ways:
@@ -66,7 +72,8 @@ calling the function from your query result object:
 Determine If a Field is Present in a Table
 ==========================================
 
-**$db->fieldExists()**
+$db->fieldExists()
+------------------
 
 Sometimes it's helpful to know whether a particular field exists before
 performing an action. Returns a boolean true/false. Usage example:
@@ -80,7 +87,8 @@ performing an action. Returns a boolean true/false. Usage example:
 Retrieve Field Metadata
 =======================
 
-**$db->getFieldData()**
+$db->getFieldData()
+-------------------
 
 Returns an array of objects containing field information.
 
@@ -106,19 +114,23 @@ database:
 -  primary_key - 1 if the column is a primary key
 -  type - the type of the column
 
+db:table --metadata command
+---------------------------
+
 CodeIgniter supports show table containing field information in your database straight from your favorite terminal using the dedicated ``db:table my_table --metadata`` command. By using this command it is assumed that the table ``my_table`` is existing. Otherwise, CodeIgniter will show that tables list for select.
 Also, you can use this command as ``db:table --metadata``.
 
-.. note:: You can use the optional ``--desc``, ``--limit-rows``, ``--limit-fields-value`` options at any time when using command ``db:table`` .
+.. note:: You can use the optional ``--desc``, ``--limit-rows``, ``--limit-column-length`` options at any time when using command ``db:table`` .
 
 Command ``db:table --limit-rows 50``, for example, limits the number of rows to 50 rows.
 Command ``db:table --desc``, set the sort direction to "DESC". 
-And Command ``db:table --limit-fields-value 10`` limits the values of the fields to 10 characters, to prevent confusion of the table output in the terminal.
+And Command ``db:table --limit-column-length 10`` limits the length of the column to 10 characters, to prevent confusion of the table output in the terminal.
 
 List the Indexes in a Table
 ===========================
 
-**$db->getIndexData()**
+$db->getIndexData()
+-------------------
 
 Returns an array of objects containing index information.
 

From 0e0647dba93607e3351bef3203cd465e5d3da12b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 11:47:29 +0900
Subject: [PATCH 2139/2325] test: add test

---
 .../Commands/Database/ShowTableInfoTest.php   | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/tests/system/Commands/Database/ShowTableInfoTest.php b/tests/system/Commands/Database/ShowTableInfoTest.php
index e3d8dce94528..e7bf1438713a 100644
--- a/tests/system/Commands/Database/ShowTableInfoTest.php
+++ b/tests/system/Commands/Database/ShowTableInfoTest.php
@@ -127,4 +127,29 @@ public function testDbTableDesc(): void
             EOL;
         $this->assertStringContainsString($expected, $result);
     }
+
+    public function testDbTableLimitColumnLength(): void
+    {
+        $seeder = \Config\Database::seeder();
+        $seeder->call(CITestSeeder::class);
+
+        command('db:table db_user --limit-column-length 5');
+
+        $result = $this->getResultWithoutControlCode();
+
+        $expected = 'Data of Table "db_user":';
+        $this->assertStringContainsString($expected, $result);
+
+        $expected = <<<'EOL'
+            +----+----------+----------+---------+------------+------------+------------+
+            | id | name     | email    | country | created_at | updated_at | deleted_at |
+            +----+----------+----------+---------+------------+------------+------------+
+            | 1  | Derek... | derek... | US      |            |            |            |
+            | 2  | Ahmad... | ahmad... | Iran    |            |            |            |
+            | 3  | Richa... | richa... | US      |            |            |            |
+            | 4  | Chris... | chris... | UK      |            |            |            |
+            +----+----------+----------+---------+------------+------------+------------+
+            EOL;
+        $this->assertStringContainsString($expected, $result);
+    }
 }

From 1a49be0f547a2bd46735bb218dbcffedbe57114f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 11:55:13 +0900
Subject: [PATCH 2140/2325] fix: protect identifiers in SQL statements

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

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index 8b5a06ffb5c7..f099976f8aa7 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -156,7 +156,8 @@ private function showAllTables(array $tables)
     private function makeTbodyForShowAllTables(array $tables): array
     {
         foreach ($tables  as $id => $tableName) {
-            $db = $this->db->query("SELECT * FROM {$tableName}");
+            $table = $this->db->protectIdentifiers($tableName);
+            $db    = $this->db->query("SELECT * FROM {$table}");
 
             $this->tbody[] = [
                 $id + 1,
@@ -173,7 +174,7 @@ private function makeTbodyForShowAllTables(array $tables): array
         return $this->tbody;
     }
 
-    private function makeTableRows(string $tableName, $limitRows, $limitColumnLength): array
+    private function makeTableRows(string $tableName, int $limitRows, int $limitColumnLength): array
     {
         $this->tbody = [];
 
@@ -182,10 +183,14 @@ private function makeTableRows(string $tableName, $limitRows, $limitColumnLength
         $fieldNames = $this->db->getFieldNames($tableName);
 
         foreach ($fieldNames as $fieldName) {
-            $customQueryForEachField .= ",IF(length(`{$fieldName}`) > {$limitColumnLength} ,CONCAT(SUBSTRING(`{$fieldName}`, 1, {$limitColumnLength}),'...'), `{$fieldName}` ) as `{$fieldName}`";
+            $field = $this->db->protectIdentifiers($fieldName);
+            $customQueryForEachField .= ", IF(LENGTH({$field}) > {$limitColumnLength}, CONCAT(SUBSTRING({$field}, 1, {$limitColumnLength}), '...'), {$field}) AS {$field}";
         }
 
-        $rows = $this->db->query('SELECT * ' . $customQueryForEachField . " FROM {$tableName} LIMIT {$limitRows}")->getResultArray();
+        $table = $this->db->protectIdentifiers($tableName);
+        $rows  = $this->db->query(
+            'SELECT * ' . $customQueryForEachField . " FROM {$table} LIMIT {$limitRows}"
+        )->getResultArray();
 
         foreach ($rows as $row) {
             $this->tbody[] = $row;

From 1498052eae61b3905bfc3d043a725b558bc5ab6c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 12:02:24 +0900
Subject: [PATCH 2141/2325] test: run rector

---
 tests/system/Commands/Database/ShowTableInfoTest.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/system/Commands/Database/ShowTableInfoTest.php b/tests/system/Commands/Database/ShowTableInfoTest.php
index e7bf1438713a..5df856455bed 100644
--- a/tests/system/Commands/Database/ShowTableInfoTest.php
+++ b/tests/system/Commands/Database/ShowTableInfoTest.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\DatabaseTestTrait;
 use CodeIgniter\Test\Filters\CITestStreamFilter;
+use Config\Database;
 use Tests\Support\Database\Seeds\CITestSeeder;
 
 /**
@@ -105,7 +106,7 @@ public function testDbTableMetadata(): void
 
     public function testDbTableDesc(): void
     {
-        $seeder = \Config\Database::seeder();
+        $seeder = Database::seeder();
         $seeder->call(CITestSeeder::class);
 
         command('db:table db_user --desc');
@@ -130,7 +131,7 @@ public function testDbTableDesc(): void
 
     public function testDbTableLimitColumnLength(): void
     {
-        $seeder = \Config\Database::seeder();
+        $seeder = Database::seeder();
         $seeder->call(CITestSeeder::class);
 
         command('db:table db_user --limit-column-length 5');

From 7f6aeda97fa31dc11df84b0f18ad8291bb333c3d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 12:14:41 +0900
Subject: [PATCH 2142/2325] refactor: change option name

--limit-column-length -> --limit-field-value
---
 system/Commands/Database/ShowTableInfo.php    | 26 +++++++++----------
 .../Commands/Database/ShowTableInfoTest.php   |  4 +--
 user_guide_src/source/changelogs/v4.2.0.rst   |  2 +-
 user_guide_src/source/database/examples.rst   |  4 +--
 user_guide_src/source/database/metadata.rst   |  4 +--
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index f099976f8aa7..fcefb2683bc6 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -65,11 +65,11 @@ class ShowTableInfo extends BaseCommand
      * @var array<string, string>
      */
     protected $options = [
-        '--show'                => 'Lists the names of all database tables.',
-        '--metadata'            => 'Retrieves list containing field information.',
-        '--desc'                => 'Sorts the table rows in DESC order.',
-        '--limit-rows'          => 'Limits the number of rows. Default: 10.',
-        '--limit-column-length' => 'Limits the length of columns. Default: 15.',
+        '--show'              => 'Lists the names of all database tables.',
+        '--metadata'          => 'Retrieves list containing field information.',
+        '--desc'              => 'Sorts the table rows in DESC order.',
+        '--limit-rows'        => 'Limits the number of rows. Default: 10.',
+        '--limit-field-value' => 'Limits the length of field values. Default: 15.',
     ];
 
     /**
@@ -107,9 +107,9 @@ public function run(array $params)
             return;
         }
 
-        $tableName         = $params[0] ?? null;
-        $limitRows         = (int) ($params['limit-rows'] ?? 10);
-        $limitColumnLength = (int) ($params['limit-column-length'] ?? 15);
+        $tableName       = $params[0] ?? null;
+        $limitRows       = (int) ($params['limit-rows'] ?? 10);
+        $limitFieldValue = (int) ($params['limit-field-value'] ?? 15);
 
         if (! in_array($tableName, $tables, true)) {
             $tableNameNo = CLI::promptByKey(
@@ -127,17 +127,17 @@ public function run(array $params)
             return;
         }
 
-        $this->showDataOfTable($tableName, $limitRows, $limitColumnLength);
+        $this->showDataOfTable($tableName, $limitRows, $limitFieldValue);
     }
 
-    private function showDataOfTable(string $tableName, int $limitRows, int $limitColumnLength)
+    private function showDataOfTable(string $tableName, int $limitRows, int $limitFieldValue)
     {
         CLI::newLine();
         CLI::write("Data of Table \"{$tableName}\":", 'black', 'yellow');
         CLI::newLine();
 
         $thead       = $this->db->getFieldNames($tableName);
-        $this->tbody = $this->makeTableRows($tableName, $limitRows, $limitColumnLength);
+        $this->tbody = $this->makeTableRows($tableName, $limitRows, $limitFieldValue);
         CLI::table($this->tbody, $thead);
     }
 
@@ -174,7 +174,7 @@ private function makeTbodyForShowAllTables(array $tables): array
         return $this->tbody;
     }
 
-    private function makeTableRows(string $tableName, int $limitRows, int $limitColumnLength): array
+    private function makeTableRows(string $tableName, int $limitRows, int $limitFieldValue): array
     {
         $this->tbody = [];
 
@@ -184,7 +184,7 @@ private function makeTableRows(string $tableName, int $limitRows, int $limitColu
 
         foreach ($fieldNames as $fieldName) {
             $field = $this->db->protectIdentifiers($fieldName);
-            $customQueryForEachField .= ", IF(LENGTH({$field}) > {$limitColumnLength}, CONCAT(SUBSTRING({$field}, 1, {$limitColumnLength}), '...'), {$field}) AS {$field}";
+            $customQueryForEachField .= ", IF(LENGTH({$field}) > {$limitFieldValue}, CONCAT(SUBSTRING({$field}, 1, {$limitFieldValue}), '...'), {$field}) AS {$field}";
         }
 
         $table = $this->db->protectIdentifiers($tableName);
diff --git a/tests/system/Commands/Database/ShowTableInfoTest.php b/tests/system/Commands/Database/ShowTableInfoTest.php
index 5df856455bed..6d9151deceb7 100644
--- a/tests/system/Commands/Database/ShowTableInfoTest.php
+++ b/tests/system/Commands/Database/ShowTableInfoTest.php
@@ -129,12 +129,12 @@ public function testDbTableDesc(): void
         $this->assertStringContainsString($expected, $result);
     }
 
-    public function testDbTableLimitColumnLength(): void
+    public function testDbTableLimitFieldValueLength(): void
     {
         $seeder = Database::seeder();
         $seeder->call(CITestSeeder::class);
 
-        command('db:table db_user --limit-column-length 5');
+        command('db:table db_user --limit-field-value 5');
 
         $result = $this->getResultWithoutControlCode();
 
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index de560711da2a..cb928f2905d9 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -75,7 +75,7 @@ Others
     - ``db:table --show``
     - ``db:table my_table``
     - ``db:table my_table --metadata``
-    - ``db:table my_table --limit-row 50 --limit-column-length 20 --desc``
+    - ``db:table my_table --limit-row 50 --limit-field-value 20 --desc``
 
 Changes
 *******
diff --git a/user_guide_src/source/database/examples.rst b/user_guide_src/source/database/examples.rst
index 3920ac26d06c..c660ed32f6ae 100644
--- a/user_guide_src/source/database/examples.rst
+++ b/user_guide_src/source/database/examples.rst
@@ -89,8 +89,8 @@ You can also use only the following command without the table name. In this case
 
     > php spark db:table
 
-.. note:: You can use the optional ``--desc``, ``--limit-rows``, ``--limit-column-length`` options at any time when using command ``db:table`` .
+.. note:: You can use the optional ``--desc``, ``--limit-rows``, ``--limit-field-value`` options at any time when using command ``db:table`` .
 
 Command ``db:table --limit-rows 50``, for example, limits the number of rows to 50 rows.
 Command ``db:table --desc``, set the sort direction to "DESC".
-And Command ``db:table --limit-column-length 10`` limits the length of the columns to 10 characters, to prevent confusion of the table output in the terminal.
+And Command ``db:table --limit-field-value 10`` limits the length of the field values to 10 characters, to prevent confusion of the table output in the terminal.
diff --git a/user_guide_src/source/database/metadata.rst b/user_guide_src/source/database/metadata.rst
index 7917504a79e9..15ed5d6cd8fb 100644
--- a/user_guide_src/source/database/metadata.rst
+++ b/user_guide_src/source/database/metadata.rst
@@ -120,11 +120,11 @@ db:table --metadata command
 CodeIgniter supports show table containing field information in your database straight from your favorite terminal using the dedicated ``db:table my_table --metadata`` command. By using this command it is assumed that the table ``my_table`` is existing. Otherwise, CodeIgniter will show that tables list for select.
 Also, you can use this command as ``db:table --metadata``.
 
-.. note:: You can use the optional ``--desc``, ``--limit-rows``, ``--limit-column-length`` options at any time when using command ``db:table`` .
+.. note:: You can use the optional ``--desc``, ``--limit-rows``, ``--limit-field-value`` options at any time when using command ``db:table`` .
 
 Command ``db:table --limit-rows 50``, for example, limits the number of rows to 50 rows.
 Command ``db:table --desc``, set the sort direction to "DESC". 
-And Command ``db:table --limit-column-length 10`` limits the length of the column to 10 characters, to prevent confusion of the table output in the terminal.
+And Command ``db:table --limit-field-value 10`` limits the length of the field values to 10 characters, to prevent confusion of the table output in the terminal.
 
 List the Indexes in a Table
 ===========================

From 0dc06f7840ac1af17b9b55d9e339edb0fa27b64d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 14:02:57 +0900
Subject: [PATCH 2143/2325] fix: remove MySQL specific query, use PHP to
 process data

---
 system/Commands/Database/ShowTableInfo.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index fcefb2683bc6..8491c827edd6 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -178,21 +178,22 @@ private function makeTableRows(string $tableName, int $limitRows, int $limitFiel
     {
         $this->tbody = [];
 
-        $customQueryForEachField = '';
-
-        $fieldNames = $this->db->getFieldNames($tableName);
-
-        foreach ($fieldNames as $fieldName) {
-            $field = $this->db->protectIdentifiers($fieldName);
-            $customQueryForEachField .= ", IF(LENGTH({$field}) > {$limitFieldValue}, CONCAT(SUBSTRING({$field}, 1, {$limitFieldValue}), '...'), {$field}) AS {$field}";
-        }
-
         $table = $this->db->protectIdentifiers($tableName);
         $rows  = $this->db->query(
-            'SELECT * ' . $customQueryForEachField . " FROM {$table} LIMIT {$limitRows}"
+            "SELECT * FROM {$table} LIMIT {$limitRows}"
         )->getResultArray();
 
         foreach ($rows as $row) {
+            $row = array_map(
+                static function ($item) use ($limitFieldValue) {
+                    if (mb_strlen((string) $item) > $limitFieldValue) {
+                        return mb_substr((string) $item, 0, $limitFieldValue) . '...';
+                    }
+
+                    return $item;
+                },
+                $row
+            );
             $this->tbody[] = $row;
         }
 

From cf243219f3ae9293bfd4699cf9805c154158238c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 14:22:37 +0900
Subject: [PATCH 2144/2325] fix: remove LIMIT clause, use QueryBuilder

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

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index 8491c827edd6..bede0a9de428 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -178,10 +178,8 @@ private function makeTableRows(string $tableName, int $limitRows, int $limitFiel
     {
         $this->tbody = [];
 
-        $table = $this->db->protectIdentifiers($tableName);
-        $rows  = $this->db->query(
-            "SELECT * FROM {$table} LIMIT {$limitRows}"
-        )->getResultArray();
+        $builder = $this->db->table($tableName);
+        $rows    = $builder->limit($limitRows)->get()->getResultArray();
 
         foreach ($rows as $row) {
             $row = array_map(

From 33b8088bcd5d7d25325d7846973e4598c879b04f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 14:31:55 +0900
Subject: [PATCH 2145/2325] test: fix test that fails on SQLite

---
 tests/system/Commands/Database/ShowTableInfoTest.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/system/Commands/Database/ShowTableInfoTest.php b/tests/system/Commands/Database/ShowTableInfoTest.php
index 6d9151deceb7..d1c008533494 100644
--- a/tests/system/Commands/Database/ShowTableInfoTest.php
+++ b/tests/system/Commands/Database/ShowTableInfoTest.php
@@ -131,9 +131,6 @@ public function testDbTableDesc(): void
 
     public function testDbTableLimitFieldValueLength(): void
     {
-        $seeder = Database::seeder();
-        $seeder->call(CITestSeeder::class);
-
         command('db:table db_user --limit-field-value 5');
 
         $result = $this->getResultWithoutControlCode();

From 10e432522bfde1eeaddb9b88dd1f783160b6ce7a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 16:11:41 +0900
Subject: [PATCH 2146/2325] fix: undefined property

Some databases do not return nullable and primary key info.
---
 system/Commands/Database/ShowTableInfo.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index bede0a9de428..21006eb79d2d 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -217,9 +217,9 @@ private function showFieldMetaData(string $tableName): void
                 $row->name,
                 $row->type,
                 $row->max_length,
-                $this->setYesOrNo($row->nullable),
+                isset($row->nullable) ? $this->setYesOrNo($row->nullable) : 'n/a',
                 $row->default,
-                $this->setYesOrNo($row->primary_key),
+                isset($row->primary_key) ? $this->setYesOrNo($row->primary_key) : 'n/a',
             ];
         }
 

From 3b48aaebe6b049af166880852bc36b202b78f18d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 16:12:47 +0900
Subject: [PATCH 2147/2325] fix: duplicate DBPrefix

---
 system/Commands/Database/ShowTableInfo.php    | 28 +++++++++++++++++--
 .../Commands/Database/ShowTableInfoTest.php   |  5 ++--
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index 21006eb79d2d..80d6bc367e4a 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -84,9 +84,12 @@ class ShowTableInfo extends BaseCommand
      */
     private bool $sortDesc = false;
 
+    private string $DBPrefix;
+
     public function run(array $params)
     {
-        $this->db = Database::connect();
+        $this->db       = Database::connect();
+        $this->DBPrefix = $this->db->getPrefix();
 
         $tables = $this->db->listTables();
 
@@ -130,13 +133,26 @@ public function run(array $params)
         $this->showDataOfTable($tableName, $limitRows, $limitFieldValue);
     }
 
+    private function removeDBPrefix(): void
+    {
+        $this->db->setPrefix('');
+    }
+
+    private function restoreDBPrefix(): void
+    {
+        $this->db->setPrefix($this->DBPrefix);
+    }
+
     private function showDataOfTable(string $tableName, int $limitRows, int $limitFieldValue)
     {
         CLI::newLine();
         CLI::write("Data of Table \"{$tableName}\":", 'black', 'yellow');
         CLI::newLine();
 
-        $thead       = $this->db->getFieldNames($tableName);
+        $this->removeDBPrefix();
+        $thead = $this->db->getFieldNames($tableName);
+        $this->restoreDBPrefix();
+
         $this->tbody = $this->makeTableRows($tableName, $limitRows, $limitFieldValue);
         CLI::table($this->tbody, $thead);
     }
@@ -155,6 +171,8 @@ private function showAllTables(array $tables)
 
     private function makeTbodyForShowAllTables(array $tables): array
     {
+        $this->removeDBPrefix();
+
         foreach ($tables  as $id => $tableName) {
             $table = $this->db->protectIdentifiers($tableName);
             $db    = $this->db->query("SELECT * FROM {$table}");
@@ -167,6 +185,8 @@ private function makeTbodyForShowAllTables(array $tables): array
             ];
         }
 
+        $this->restoreDBPrefix();
+
         if ($this->sortDesc) {
             krsort($this->tbody);
         }
@@ -178,8 +198,10 @@ private function makeTableRows(string $tableName, int $limitRows, int $limitFiel
     {
         $this->tbody = [];
 
+        $this->removeDBPrefix();
         $builder = $this->db->table($tableName);
         $rows    = $builder->limit($limitRows)->get()->getResultArray();
+        $this->restoreDBPrefix();
 
         foreach ($rows as $row) {
             $row = array_map(
@@ -210,7 +232,9 @@ private function showFieldMetaData(string $tableName): void
 
         $thead = ['Field Name', 'Type', 'Max Length', 'Nullable', 'Default', 'Primary Key'];
 
+        $this->removeDBPrefix();
         $fields = $this->db->getFieldData($tableName);
+        $this->restoreDBPrefix();
 
         foreach ($fields as $row) {
             $this->tbody[] = [
diff --git a/tests/system/Commands/Database/ShowTableInfoTest.php b/tests/system/Commands/Database/ShowTableInfoTest.php
index d1c008533494..cacb6bf8f43d 100644
--- a/tests/system/Commands/Database/ShowTableInfoTest.php
+++ b/tests/system/Commands/Database/ShowTableInfoTest.php
@@ -96,10 +96,9 @@ public function testDbTableMetadata(): void
         $expected = 'List of Metadata Information in Table "db_migrations":';
         $this->assertStringContainsString($expected, $result);
 
+        $result   = preg_replace('/\s+/', ' ', $result);
         $expected = <<<'EOL'
-            +------------+---------+------------+----------+---------+-------------+
-            | Field Name | Type    | Max Length | Nullable | Default | Primary Key |
-            +------------+---------+------------+----------+---------+-------------+
+            | Field Name | Type | Max Length | Nullable | Default | Primary Key |
             EOL;
         $this->assertStringContainsString($expected, $result);
     }

From d7c8f04f5191e860ef6c24c285c399117ff5779c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 16:33:10 +0900
Subject: [PATCH 2148/2325] test: add empty lines or so

---
 tests/system/Database/Live/ForgeTest.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 28f40817ae15..99db3e51aa5c 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -835,31 +835,40 @@ public function testAddFields()
 
             $this->assertNull($fieldsData[0]->default);
             $this->assertNull($fieldsData[1]->default);
+
             $this->assertSame(1, (int) $fieldsData[0]->primary_key);
+
             $this->assertSame(255, (int) $fieldsData[1]->max_length);
         } elseif ($this->db->DBDriver === 'Postgre') {
             $this->assertSame('integer', $fieldsData[0]->type);
             $this->assertSame('character varying', $fieldsData[1]->type);
+
             $this->assertSame(32, (int) $fieldsData[0]->max_length);
-            $this->assertNull($fieldsData[1]->default);
             $this->assertSame(255, (int) $fieldsData[1]->max_length);
+
+            $this->assertNull($fieldsData[1]->default);
         } elseif ($this->db->DBDriver === 'SQLite3') {
             $this->assertSame('integer', strtolower($fieldsData[0]->type));
             $this->assertSame('varchar', strtolower($fieldsData[1]->type));
+
             $this->assertNull($fieldsData[1]->default);
         } elseif ($this->db->DBDriver === 'SQLSRV') {
             $this->assertSame('int', $fieldsData[0]->type);
-            $this->assertSame(10, (int) $fieldsData[0]->max_length);
             $this->assertSame('varchar', $fieldsData[1]->type);
-            $this->assertNull($fieldsData[1]->default);
+
+            $this->assertSame(10, (int) $fieldsData[0]->max_length);
             $this->assertSame(255, (int) $fieldsData[1]->max_length);
+
+            $this->assertNull($fieldsData[1]->default);
         } elseif ($this->db->DBDriver === 'OCI8') {
             // Check types
             $this->assertSame('NUMBER', $fieldsData[0]->type);
             $this->assertSame('VARCHAR2', $fieldsData[1]->type);
+
             $this->assertSame('11', $fieldsData[0]->max_length);
-            $this->assertSame('', $fieldsData[1]->default);
             $this->assertSame('255', $fieldsData[1]->max_length);
+
+            $this->assertSame('', $fieldsData[1]->default);
         } else {
             $this->fail(sprintf('DB driver "%s" is not supported.', $this->db->DBDriver));
         }

From cca471a014d763d607a8f2bdc540e4059e7ff7e6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 16:38:45 +0900
Subject: [PATCH 2149/2325] feat: getFieldData() returns nullable data on
 PostgreSQL

---
 system/Database/Postgre/Connection.php   | 7 ++++---
 tests/system/Database/Live/ForgeTest.php | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/system/Database/Postgre/Connection.php b/system/Database/Postgre/Connection.php
index bf78f379d1ef..6827ba70b54f 100644
--- a/system/Database/Postgre/Connection.php
+++ b/system/Database/Postgre/Connection.php
@@ -234,9 +234,9 @@ protected function _listColumns(string $table = ''): string
      */
     protected function _fieldData(string $table): array
     {
-        $sql = 'SELECT "column_name", "data_type", "character_maximum_length", "numeric_precision", "column_default"
-			FROM "information_schema"."columns"
-			WHERE LOWER("table_name") = '
+        $sql = 'SELECT "column_name", "data_type", "character_maximum_length", "numeric_precision", "column_default",  "is_nullable"
+            FROM "information_schema"."columns"
+            WHERE LOWER("table_name") = '
                 . $this->escape(strtolower($table))
                 . ' ORDER BY "ordinal_position"';
 
@@ -252,6 +252,7 @@ protected function _fieldData(string $table): array
 
             $retVal[$i]->name       = $query[$i]->column_name;
             $retVal[$i]->type       = $query[$i]->data_type;
+            $retVal[$i]->nullable   = $query[$i]->is_nullable === 'YES';
             $retVal[$i]->default    = $query[$i]->column_default;
             $retVal[$i]->max_length = $query[$i]->character_maximum_length > 0 ? $query[$i]->character_maximum_length : $query[$i]->numeric_precision;
         }
diff --git a/tests/system/Database/Live/ForgeTest.php b/tests/system/Database/Live/ForgeTest.php
index 99db3e51aa5c..2122afb36a45 100644
--- a/tests/system/Database/Live/ForgeTest.php
+++ b/tests/system/Database/Live/ForgeTest.php
@@ -843,6 +843,9 @@ public function testAddFields()
             $this->assertSame('integer', $fieldsData[0]->type);
             $this->assertSame('character varying', $fieldsData[1]->type);
 
+            $this->assertFalse($fieldsData[0]->nullable);
+            $this->assertFalse($fieldsData[1]->nullable);
+
             $this->assertSame(32, (int) $fieldsData[0]->max_length);
             $this->assertSame(255, (int) $fieldsData[1]->max_length);
 

From da6313d11af0812d0b5ebbb91e7482e6f254f124 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 16:48:33 +0900
Subject: [PATCH 2150/2325] refactor: use arrow function

Co-authored-by: Abdul Malik Ikhsan <samsonasik@gmail.com>
---
 system/Commands/Database/ShowTableInfo.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index 80d6bc367e4a..19cffa034b4d 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -205,13 +205,10 @@ private function makeTableRows(string $tableName, int $limitRows, int $limitFiel
 
         foreach ($rows as $row) {
             $row = array_map(
-                static function ($item) use ($limitFieldValue) {
-                    if (mb_strlen((string) $item) > $limitFieldValue) {
-                        return mb_substr((string) $item, 0, $limitFieldValue) . '...';
-                    }
-
-                    return $item;
-                },
+                static fn ($item): string => mb_strlen((string) $item) > $limitFieldValue) 
+                    ? mb_substr((string) $item, 0, $limitFieldValue) . '...'
+                    : $item
+                ,
                 $row
             );
             $this->tbody[] = $row;

From b434be40d490768f952709a974326e397046eae8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 16:58:17 +0900
Subject: [PATCH 2151/2325] fix: arrow function

- remove unneeded `)`
- $item may be null, but cast to string here, because after all casted to string
---
 system/Commands/Database/ShowTableInfo.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index 19cffa034b4d..359012377018 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -205,10 +205,9 @@ private function makeTableRows(string $tableName, int $limitRows, int $limitFiel
 
         foreach ($rows as $row) {
             $row = array_map(
-                static fn ($item): string => mb_strlen((string) $item) > $limitFieldValue) 
+                static fn ($item): string => mb_strlen((string) $item) > $limitFieldValue
                     ? mb_substr((string) $item, 0, $limitFieldValue) . '...'
-                    : $item
-                ,
+                    : (string) $item,
                 $row
             );
             $this->tbody[] = $row;

From e6b7d18f71f10d84a2f079f45713797ca3f634d3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 17:11:54 +0900
Subject: [PATCH 2152/2325] fix: $usage

<table_name> is optional.
---
 system/Commands/Database/ShowTableInfo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index 359012377018..a746964e812e 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -48,7 +48,7 @@ class ShowTableInfo extends BaseCommand
      *
      * @var string
      */
-    protected $usage = 'db:table <table_name> [options]';
+    protected $usage = 'db:table [<table_name>] [options]';
 
     /**
      * The Command's arguments

From b823b59092ddc09a9637688cceaad7f210f6584c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 17:37:19 +0900
Subject: [PATCH 2153/2325] docs: add Commnads section in changelog

---
 user_guide_src/source/changelogs/v4.2.0.rst | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index cb928f2905d9..2d077730a7ec 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -44,6 +44,17 @@ Added an optional new more secure auto router. These are the changes from the le
 
 See :ref:`auto-routing-improved` for the details.
 
+Commands
+========
+
+- Added ``db:table`` command.
+    - You can now see the names of all the tables in the database you are currently connected, field names or other metadata, like the column type, max length and ... each table, and the information in that table in the terminal.
+        - ``db:table --show``
+        - ``db:table my_table``
+        - ``db:table my_table --metadata``
+        - ``db:table my_table --limit-row 50 --limit-field-value 20 --desc``
+- The ``spark routes`` command now shows closure routes, auto routes, and filters. See :ref:`URI Routing <spark-routes>`.
+
 Others
 ======
 
@@ -58,7 +69,6 @@ Others
 - Added Validation Strict Rules. See :ref:`validation-traditional-and-strict-rules`.
 - Added new OCI8 driver for database.
     - It can access Oracle Database and supports SQL and PL/SQL statements.
-- The ``spark routes`` command now shows closure routes, auto routes, and filters. See :ref:`URI Routing <spark-routes>`.
 - Exception information logged through ``log_message()`` has now improved. It now includes the file and line where the exception originated. It also does not truncate the message anymore.
     - The log format has also changed. If users are depending on the log format in their apps, the new log format is "<1-based count> <cleaned filepath>(<line>): <class><function><args>"
 - Added support for webp files to **app/Config/Mimes.php**.
@@ -70,12 +80,6 @@ Others
     - :ref:`select() <query-builder-select-rawsql>`, :ref:`where() <query-builder-where-rawsql>`, :ref:`like() <query-builder-like-rawsql>` accept the ``CodeIgniter\Database\RawSql`` instance.
 - Debugbar enhancements
     - Debug toolbar is now using ``microtime()`` instead of ``time()``.
-- Added new Command for CLI.
-  - ``db:table`` - You can now see the names of all the tables in the database you are currently connected, field names or other metadata, like the column type, max length and ... each table, and the information in that table in the terminal.
-    - ``db:table --show``
-    - ``db:table my_table``
-    - ``db:table my_table --metadata``
-    - ``db:table my_table --limit-row 50 --limit-field-value 20 --desc``
 
 Changes
 *******

From e26a3b8ec8c76c57984f0585e060665671547909 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 20:40:08 +0900
Subject: [PATCH 2154/2325] chore: fix for deployed user guide

---
 user_guide_src/add-edit-this-page | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/add-edit-this-page b/user_guide_src/add-edit-this-page
index cb036524369d..cede3f406150 100755
--- a/user_guide_src/add-edit-this-page
+++ b/user_guide_src/add-edit-this-page
@@ -47,10 +47,10 @@ foreach ($files as $filePath => $fileInfo) {
         continue;
     }
 
-    $pattern = '/<div role="navigation" aria-label="breadcrumbs navigation">/u';
+    $pattern = '/<div class="rst-content">/u';
     $content = preg_replace(
         $pattern,
-        $gitHubLink . PHP_EOL . '<div role="navigation" aria-label="breadcrumbs navigation">',
+        '<div class="rst-content">' . PHP_EOL . $gitHubLink . PHP_EOL,
         $content
     );
 

From b6605e9685deba623497e5bcf963b60604f61724 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 9 May 2022 20:41:44 +0900
Subject: [PATCH 2155/2325] chore: add action to add edit this page links

---
 .github/workflows/deploy-userguide-latest.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/deploy-userguide-latest.yml b/.github/workflows/deploy-userguide-latest.yml
index 8fc77b9f7698..4ba79a8b341b 100644
--- a/.github/workflows/deploy-userguide-latest.yml
+++ b/.github/workflows/deploy-userguide-latest.yml
@@ -21,12 +21,25 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.0'
+          coverage: none
+
       # Build the latest User Guide
       - name: Build with Sphinx
         uses: ammaraskar/sphinx-action@0.4
         with:
           docs-folder: user_guide_src/
 
+      - name: Add "Edit this page" links
+        run: |
+          cd user_guide_src
+          # Fix permissions
+          sudo chown -R runner:docker build/html/
+          php add-edit-this-page build/html/
+
       # Create an artifact of the html output
       - name: Upload artifact
         uses: actions/upload-artifact@v3

From ca8acb71e18de9e110dd18fd8b10f8b49591805d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 10 May 2022 09:34:49 +0900
Subject: [PATCH 2156/2325] docs: make method names linkable

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

diff --git a/user_guide_src/source/testing/debugging.rst b/user_guide_src/source/testing/debugging.rst
index fc04a08921d5..1bc4b14b8eb6 100644
--- a/user_guide_src/source/testing/debugging.rst
+++ b/user_guide_src/source/testing/debugging.rst
@@ -26,18 +26,21 @@ This is defined in the boot files (e.g. **app/Config/Boot/development.php**).
 Using Kint
 ==========
 
-**d()**
+d()
+---
 
 The ``d()`` method dumps all of the data it knows about the contents passed as the only parameter to the screen, and
 allows the script to continue executing:
 
 .. literalinclude:: debugging/001.php
 
-**dd()**
+dd()
+----
 
 This method is identical to ``d()``, except that it also ``dies()`` and no further code is executed this request.
 
-**trace()**
+trace()
+-------
 
 This provides a backtrace to the current execution point, with Kint's own unique spin:
 

From 976cec82203da50626f5a6b92a28e9308c0d2ac6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 10 May 2022 09:58:48 +0900
Subject: [PATCH 2157/2325] feat: improve Exception message

---
 system/Router/Router.php           |  2 +-
 tests/system/Router/RouterTest.php | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/system/Router/Router.php b/system/Router/Router.php
index c3dc1b0dfbca..2ebd1674cea9 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -196,7 +196,7 @@ public function handle(?string $uri = null)
         // Controllers/directories, but the application may not
         // want this, like in the case of API's.
         if (! $this->collection->shouldAutoRoute()) {
-            throw new PageNotFoundException("Can't find a route for '{$uri}'.");
+            throw new PageNotFoundException("Can't find a route for '{$this->collection->getHTTPVerb()}: {$uri}'.");
         }
 
         // Checks auto routes
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index 1b0de4a29267..d2e48bff992d 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -384,6 +384,16 @@ public function testAutoRouteRejectsInitController()
         $router->autoRoute('home/initController');
     }
 
+    public function testExceptionMessageWhenRouteNotFound()
+    {
+        $router = new Router($this->collection, $this->request);
+
+        $this->expectException(PageNotFoundException::class);
+        $this->expectExceptionMessage("Can't find a route for 'get: url/not-exists'");
+
+        $router->handle('url/not-exists');
+    }
+
     public function testDetectsLocales()
     {
         $router = new Router($this->collection, $this->request);

From 557ba27567eeb1c1f16e2a42bccdd7747caac325 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 10 May 2022 09:59:34 +0900
Subject: [PATCH 2158/2325] style: break long line

---
 system/Router/Router.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/Router/Router.php b/system/Router/Router.php
index 2ebd1674cea9..ea5eb79b8d70 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -196,7 +196,9 @@ public function handle(?string $uri = null)
         // Controllers/directories, but the application may not
         // want this, like in the case of API's.
         if (! $this->collection->shouldAutoRoute()) {
-            throw new PageNotFoundException("Can't find a route for '{$this->collection->getHTTPVerb()}: {$uri}'.");
+            throw new PageNotFoundException(
+                "Can't find a route for '{$this->collection->getHTTPVerb()}: {$uri}'."
+            );
         }
 
         // Checks auto routes

From 9953840771dbeeb8c61b6f144c269a4c06aecb01 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 10 May 2022 12:38:51 +0900
Subject: [PATCH 2159/2325] docs: make method names linkable

---
 user_guide_src/source/cli/cli_request.rst | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/user_guide_src/source/cli/cli_request.rst b/user_guide_src/source/cli/cli_request.rst
index 8ef96d40ee6f..b1354830cbd1 100644
--- a/user_guide_src/source/cli/cli_request.rst
+++ b/user_guide_src/source/cli/cli_request.rst
@@ -10,31 +10,36 @@ but adds some accessor methods for convenience.
 Additional Accessors
 ====================
 
-**getSegments()**
+getSegments()
+-------------
 
 Returns an array of the command line arguments deemed to be part of a path:
 
 .. literalinclude:: cli_request/001.php
 
-**getPath()**
+getPath()
+---------
 
 Returns the reconstructed path as a string:
 
 .. literalinclude:: cli_request/002.php
 
-**getOptions()**
+getOptions()
+------------
 
 Returns an array of the command line arguments deemed to be options:
 
 .. literalinclude:: cli_request/003.php
 
-**getOption($which)**
+getOption($which)
+-----------------
 
 Returns the value of a specific command line argument deemed to be an option:
 
 .. literalinclude:: cli_request/004.php
 
-**getOptionString()**
+getOptionString()
+-----------------
 
 Returns the reconstructed command line string for the options:
 

From 114eae0d1ff7855c7cf2e7fda2a0d53f60cb6140 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 10 May 2022 12:39:07 +0900
Subject: [PATCH 2160/2325] docs: align comment indentation

---
 user_guide_src/source/cli/cli_request/004.php | 2 +-
 user_guide_src/source/cli/cli_request/006.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/cli/cli_request/004.php b/user_guide_src/source/cli/cli_request/004.php
index 91e4f020361d..ec8986345e19 100644
--- a/user_guide_src/source/cli/cli_request/004.php
+++ b/user_guide_src/source/cli/cli_request/004.php
@@ -1,5 +1,5 @@
 <?php
 
 // command line: php index.php users 21 profile --foo bar
-echo $request->getOption('foo');  // bar
+echo $request->getOption('foo');      // bar
 echo $request->getOption('notthere'); // null
diff --git a/user_guide_src/source/cli/cli_request/006.php b/user_guide_src/source/cli/cli_request/006.php
index d7efe5b40095..ed4e836da895 100644
--- a/user_guide_src/source/cli/cli_request/006.php
+++ b/user_guide_src/source/cli/cli_request/006.php
@@ -1,5 +1,5 @@
 <?php
 
 // php index.php user 21 --foo bar -f
-echo $request->getOptionString(); // -foo bar -f
+echo $request->getOptionString();     // -foo bar -f
 echo $request->getOptionString(true); // --foo bar -f

From 0c8437f7554d0b210b3d1c1347d2e3a68fe98a40 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 10 May 2022 12:55:09 +0900
Subject: [PATCH 2161/2325] docs: decorate sample code with '``'

---
 user_guide_src/source/database/results.rst | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/user_guide_src/source/database/results.rst b/user_guide_src/source/database/results.rst
index b415a0936f77..cfae6f8645da 100644
--- a/user_guide_src/source/database/results.rst
+++ b/user_guide_src/source/database/results.rst
@@ -81,18 +81,18 @@ digit in the first parameter:
 In addition, you can walk forward/backwards/first/last through your
 results using these variations:
 
-    | **$row = $query->getFirstRow()**
-    | **$row = $query->getLastRow()**
-    | **$row = $query->getNextRow()**
-    | **$row = $query->getPreviousRow()**
+    | ``$row = $query->getFirstRow()``
+    | ``$row = $query->getLastRow()``
+    | ``$row = $query->getNextRow()``
+    | ``$row = $query->getPreviousRow()``
 
 By default they return an object unless you put the word "array" in the
 parameter:
 
-    | **$row = $query->getFirstRow('array')**
-    | **$row = $query->getLastRow('array')**
-    | **$row = $query->getNextRow('array')**
-    | **$row = $query->getPreviousRow('array')**
+    | ``$row = $query->getFirstRow('array')``
+    | ``$row = $query->getLastRow('array')``
+    | ``$row = $query->getNextRow('array')``
+    | ``$row = $query->getPreviousRow('array')``
 
 .. note:: All the methods above will load the whole result into memory
     (prefetching). Use ``getUnbufferedRow()`` for processing large

From f1767b3b79b6aa3f241cdf567406e41ab8ed61b2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 10 May 2022 12:55:34 +0900
Subject: [PATCH 2162/2325] docs: make method names linkable

---
 user_guide_src/source/database/results.rst | 36 ++++++++++++++--------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/user_guide_src/source/database/results.rst b/user_guide_src/source/database/results.rst
index cfae6f8645da..2e93207fa3d0 100644
--- a/user_guide_src/source/database/results.rst
+++ b/user_guide_src/source/database/results.rst
@@ -12,7 +12,8 @@ There are several ways to generate query results:
 Result Arrays
 *************
 
-**getResult()**
+getResult()
+===========
 
 This method returns the query result as an array of **objects**, or
 **an empty array** on failure. Typically you'll use this in a foreach
@@ -36,7 +37,8 @@ instantiate for each result object
 
 The above method is an alias of ``getCustomResultObject()``.
 
-**getResultArray()**
+getResultArray()
+================
 
 This method returns the query result as a pure array, or an empty
 array when no result is produced. Typically you'll use this in a foreach
@@ -48,7 +50,8 @@ loop, like this:
 Result Rows
 ***********
 
-**getRow()**
+getRow()
+========
 
 This method returns a single result row. If your query has more than
 one row, it returns only the first row. The result is returned as an
@@ -66,7 +69,8 @@ to instantiate the row with:
 
 .. literalinclude:: results/007.php
 
-**getRowArray()**
+getRowArray()
+=============
 
 Identical to the above ``row()`` method, except it returns an array.
 Example:
@@ -98,7 +102,8 @@ parameter:
     (prefetching). Use ``getUnbufferedRow()`` for processing large
     result sets.
 
-**getUnbufferedRow()**
+getUnbufferedRow()
+==================
 
 This method returns a single result row without prefetching the whole
 result in memory as ``row()`` does. If your query has more than one row,
@@ -145,7 +150,8 @@ In addition to the two methods listed below, the following methods also can
 take a class name to return the results as: ``getFirstRow()``, ``getLastRow()``,
 ``getNextRow()``, and ``getPreviousRow()``.
 
-**getCustomResultObject()**
+getCustomResultObject()
+=======================
 
 Returns the entire result set as an array of instances of the class requested.
 The only parameter is the name of the class to instantiate.
@@ -154,7 +160,8 @@ Example:
 
 .. literalinclude:: results/014.php
 
-**getCustomRowObject()**
+getCustomRowObject()
+====================
 
 Returns a single row from your query results. The first parameter is the row
 number of the results. The second parameter is the class name to instantiate.
@@ -173,21 +180,24 @@ Example:
 Result Helper Methods
 *********************
 
-**getFieldCount()**
+getFieldCount()
+===============
 
 The number of FIELDS (columns) returned by the query. Make sure to call
 the method using your query result object:
 
 .. literalinclude:: results/017.php
 
-**getFieldNames()**
+getFieldNames()
+===============
 
 Returns an array with the names of the FIELDS (columns) returned by the query.
 Make sure to call the method using your query result object:
 
 .. literalinclude:: results/018.php
 
-**getNumRows()**
+getNumRows()
+============
 
 The number of records returned by the query. Make sure to call
 the method using your query result object:
@@ -198,7 +208,8 @@ the method using your query result object:
     CodeIgniter will fetch and buffer the query result records internally and
     return a count of the resulting record array, which can be inefficient.
 
-**freeResult()**
+freeResult()
+============
 
 It frees the memory associated with the result and deletes the result
 resource ID. Normally PHP frees its memory automatically at the end of
@@ -210,7 +221,8 @@ Example:
 
 .. literalinclude:: results/020.php
 
-**dataSeek()**
+dataSeek()
+==========
 
 This method sets the internal pointer for the next result row to be
 fetched. It is only useful in combination with ``getUnbufferedRow()``.

From f798da490b5167c96e7c7828e6e5fa4e88881c2a Mon Sep 17 00:00:00 2001
From: Stefan Bauer <sba@gmx.ch>
Date: Tue, 10 May 2022 13:49:31 +0200
Subject: [PATCH 2163/2325] change dies() to php's function name die()

dies() may be linguistically more correct, but I would write die() here
---
 user_guide_src/source/testing/debugging.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/testing/debugging.rst b/user_guide_src/source/testing/debugging.rst
index 1bc4b14b8eb6..b8da022d018f 100644
--- a/user_guide_src/source/testing/debugging.rst
+++ b/user_guide_src/source/testing/debugging.rst
@@ -37,7 +37,7 @@ allows the script to continue executing:
 dd()
 ----
 
-This method is identical to ``d()``, except that it also ``dies()`` and no further code is executed this request.
+This method is identical to ``d()``, except that it also ``die()`` and no further code is executed this request.
 
 trace()
 -------

From 8b2df8c81c93bbe7c146b660ed32bbb16391e84d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 11 May 2022 07:12:21 +0900
Subject: [PATCH 2164/2325] docs: update deprecated $cookiePrefix

---
 user_guide_src/source/helpers/cookie_helper.rst    | 4 ++--
 user_guide_src/source/incoming/incomingrequest.rst | 2 +-
 user_guide_src/source/libraries/sessions.rst       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/helpers/cookie_helper.rst b/user_guide_src/source/helpers/cookie_helper.rst
index 66d6879a4fec..9ccceb54eeda 100755
--- a/user_guide_src/source/helpers/cookie_helper.rst
+++ b/user_guide_src/source/helpers/cookie_helper.rst
@@ -50,8 +50,8 @@ The following functions are available:
     cookies. Refer to the :doc:`IncomingRequest Library </incoming/incomingrequest>` for
     detailed description of its use, as this function acts very
     similarly to ``IncomingRequest::getCookie()``, except it will also prepend
-    the ``$cookiePrefix`` that you might've set in your
-    **app/Config/App.php** file.
+    the ``Config\Cookie::$prefix`` that you might've set in your
+    **app/Config/Cookie.php** file.
 
 .. warning:: Using XSS filtering is a bad practice. It does not prevent XSS attacks perfectly. Using ``esc()`` with the correct ``$context`` in the views is recommended.
 
diff --git a/user_guide_src/source/incoming/incomingrequest.rst b/user_guide_src/source/incoming/incomingrequest.rst
index 74f3cf5289b0..40dbb4a47b0f 100644
--- a/user_guide_src/source/incoming/incomingrequest.rst
+++ b/user_guide_src/source/incoming/incomingrequest.rst
@@ -383,7 +383,7 @@ The methods provided by the parent classes that are available are:
 
         .. note:: Unlike the :doc:`Cookie Helper <../helpers/cookie_helper>`
             function :php:func:`get_cookie()`, this method does NOT prepend
-            your configured ``$config['cookie_prefix']`` value.
+            your configured ``Config\Cookie::$prefix`` value.
 
     .. php:method:: getServer([$index = null[, $filter = null[, $flags = null]]])
         :noindex:
diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
index 11ac22f12add..08d394d0ba24 100644
--- a/user_guide_src/source/libraries/sessions.rst
+++ b/user_guide_src/source/libraries/sessions.rst
@@ -429,7 +429,7 @@ Preference           Default         Description
 
 .. note:: The 'cookieHTTPOnly' setting doesn't have an effect on sessions.
     Instead the HttpOnly parameter is always enabled, for security
-    reasons. Additionally, the 'cookiePrefix' setting is completely
+    reasons. Additionally, the ``Config\Cookie::$prefix`` setting is completely
     ignored.
 
 Session Drivers

From 0c442fa69bdfc7967e806d985e0c4af395be9b2b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 11 May 2022 07:24:33 +0900
Subject: [PATCH 2165/2325] docs: add that deleted_at column must be nullable

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

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index 6e05f3af0f23..1baccfd1facc 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -131,6 +131,8 @@ This requires either a DATETIME or INTEGER field in the database as per the mode
 ``$dateFormat`` setting. The default field name is ``deleted_at`` however this name can be
 configured to any name of your choice by using ``$deletedField`` property.
 
+.. important:: The ``deleted_at`` field must be nullable.
+
 $allowedFields
 --------------
 

From 7b17b440bf2c050d88ff6e62cc1fc68223df7d22 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 11 May 2022 08:32:03 +0900
Subject: [PATCH 2166/2325] docs: fix section titles

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

diff --git a/user_guide_src/source/database/utilities.rst b/user_guide_src/source/database/utilities.rst
index 20d4953247e5..4648c05af6b0 100644
--- a/user_guide_src/source/database/utilities.rst
+++ b/user_guide_src/source/database/utilities.rst
@@ -1,6 +1,6 @@
-########################
+#########
 Utilities
-########################
+#########
 
 The Database Utility Class contains methods that help you manage your database.
 
@@ -9,7 +9,7 @@ The Database Utility Class contains methods that help you manage your database.
     :depth: 2
 
 *******************
-Get XML FROM Result
+Get XML from Result
 *******************
 
 **getXMLFromResult()**

From 00ef10bf5bc6b05b49875c2826a703adfa578d22 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 11 May 2022 08:32:21 +0900
Subject: [PATCH 2167/2325] docs: make method name linkable

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

diff --git a/user_guide_src/source/database/utilities.rst b/user_guide_src/source/database/utilities.rst
index 4648c05af6b0..6bbc99b28ced 100644
--- a/user_guide_src/source/database/utilities.rst
+++ b/user_guide_src/source/database/utilities.rst
@@ -12,7 +12,8 @@ The Database Utility Class contains methods that help you manage your database.
 Get XML from Result
 *******************
 
-**getXMLFromResult()**
+getXMLFromResult()
+==================
 
 This method returns the xml result from database result. You can do like this:
 

From ed2447e64f1a2f2b1c6b73b33df9b7a9ab6edb51 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 11 May 2022 08:33:20 +0900
Subject: [PATCH 2168/2325] docs: fix tricky sample code

---
 user_guide_src/source/database/utilities/001.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/database/utilities/001.php b/user_guide_src/source/database/utilities/001.php
index 697e6a786930..44bc02b1b3f5 100644
--- a/user_guide_src/source/database/utilities/001.php
+++ b/user_guide_src/source/database/utilities/001.php
@@ -4,7 +4,7 @@
     protected $table      = 'foo';
     protected $primaryKey = 'id';
 };
-$db = \Closure::bind(static fn ($model) => $model->db, null, $model)($model);
 
-$util = (new \CodeIgniter\Database\Database())->loadUtils($db);
+$util = \CodeIgniter\Database\Config::utils();
+
 echo $util->getXMLFromResult($model->get());

From 5b2cc5e6d22fe499d95b40680f8b70e03963a6e1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 11 May 2022 09:44:16 +0900
Subject: [PATCH 2169/2325] docs: make method names linkable

---
 user_guide_src/source/testing/controllers.rst | 44 ++++++++++++++-----
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/user_guide_src/source/testing/controllers.rst b/user_guide_src/source/testing/controllers.rst
index 604a118e4ead..113c5ef2b66e 100644
--- a/user_guide_src/source/testing/controllers.rst
+++ b/user_guide_src/source/testing/controllers.rst
@@ -31,14 +31,16 @@ to run as the parameter:
 Helper Methods
 ==============
 
-**controller($class)**
+controller($class)
+------------------
 
 Specifies the class name of the controller to test. The first parameter must be a fully qualified class name
 (i.e., include the namespace):
 
 .. literalinclude:: controllers/003.php
 
-**execute(string $method, ...$params)**
+execute(string $method, ...$params)
+-----------------------------------
 
 Executes the specified method within the controller. The first parameter is the name of the method to run:
 
@@ -49,7 +51,8 @@ By specifying the second and subsequent parameters, you can pass them to the con
 This returns a new helper class that provides a number of routines for checking the response itself. See below
 for details.
 
-**withConfig($config)**
+withConfig($config)
+-------------------
 
 Allows you to pass in a modified version of **Config\App.php** to test with different settings:
 
@@ -57,7 +60,8 @@ Allows you to pass in a modified version of **Config\App.php** to test with diff
 
 If you do not provide one, the application's App config file will be used.
 
-**withRequest($request)**
+withRequest($request)
+---------------------
 
 Allows you to provide an **IncomingRequest** instance tailored to your testing needs:
 
@@ -66,7 +70,8 @@ Allows you to provide an **IncomingRequest** instance tailored to your testing n
 If you do not provide one, a new IncomingRequest instance with the default application values will be passed
 into your controller.
 
-**withResponse($response)**
+withResponse($response)
+-----------------------
 
 Allows you to provide a **Response** instance:
 
@@ -75,7 +80,8 @@ Allows you to provide a **Response** instance:
 If you do not provide one, a new Response instance with the default application values will be passed
 into your controller.
 
-**withLogger($logger)**
+withLogger($logger)
+-------------------
 
 Allows you to provide a **Logger** instance:
 
@@ -84,7 +90,8 @@ Allows you to provide a **Logger** instance:
 If you do not provide one, a new Logger instance with the default configuration values will be passed
 into your controller.
 
-**withURI(string $uri)**
+withURI(string $uri)
+--------------------
 
 Allows you to provide a new URI that simulates the URL the client was visiting when this controller was run.
 This is helpful if you need to check URI segments within your controller. The only parameter is a string
@@ -94,7 +101,8 @@ representing a valid URI:
 
 It is a good practice to always provide the URI during testing to avoid surprises.
 
-**withBody($body)**
+withBody($body)
+---------------
 
 Allows you to provide a custom body for the request. This can be helpful when testing API controllers where
 you need to set a JSON value as the body. The only parameter is a string that represents the body of the request:
@@ -187,18 +195,30 @@ Assertions
 In addition to the helper methods above ``FilterTestTrait`` also comes with some assertions
 to streamline your test methods.
 
-The **assertFilter()** method checks that the given route at position uses the filter (by its alias):
+assertFilter()
+^^^^^^^^^^^^^^
+
+The ``assertFilter()`` method checks that the given route at position uses the filter (by its alias):
 
 .. literalinclude:: controllers/015.php
 
-The **assertNotFilter()** method checks that the given route at position does not use the filter (by its alias):
+assertNotFilter()
+^^^^^^^^^^^^^^^^^
+
+The ``assertNotFilter()`` method checks that the given route at position does not use the filter (by its alias):
 
 .. literalinclude:: controllers/016.php
 
-The **assertHasFilters()** method checks that the given route at position has at least one filter set:
+assertHasFilters()
+^^^^^^^^^^^^^^^^^^
+
+The ``assertHasFilters()`` method checks that the given route at position has at least one filter set:
 
 .. literalinclude:: controllers/017.php
 
-The **assertNotHasFilters()** method checks that the given route at position has no filters set:
+assertNotHasFilters()
+^^^^^^^^^^^^^^^^^^^^^
+
+The ``assertNotHasFilters()`` method checks that the given route at position has no filters set:
 
 .. literalinclude:: controllers/018.php

From 3ad9f67545e2fa2a3916d3e0cfa2d13e8955fedd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 11 May 2022 10:07:38 +0900
Subject: [PATCH 2170/2325] docs: fix section titles

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

diff --git a/user_guide_src/source/database/queries.rst b/user_guide_src/source/database/queries.rst
index 5161000d8614..7000647cd9b2 100644
--- a/user_guide_src/source/database/queries.rst
+++ b/user_guide_src/source/database/queries.rst
@@ -51,7 +51,7 @@ fetchable results.
     So keep that in mind if you're looking for a boolean value.
 
 ***************************************
-Working with Database prefixes manually
+Working with Database Prefixes Manually
 ***************************************
 
 If you have configured a database prefix and would like to prepend it to
@@ -70,7 +70,7 @@ You can get the current prefix any time with this method:
 .. literalinclude:: queries/006.php
 
 **********************
-Protecting identifiers
+Protecting Identifiers
 **********************
 
 In many databases, it is advisable to protect table and field names - for

From 9b092ff86a334df19b720b78ad7ef98c9f7105ae Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 11 May 2022 10:11:25 +0900
Subject: [PATCH 2171/2325] docs: make method names linkable

---
 user_guide_src/source/database/queries.rst | 65 ++++++++++++++--------
 1 file changed, 43 insertions(+), 22 deletions(-)

diff --git a/user_guide_src/source/database/queries.rst b/user_guide_src/source/database/queries.rst
index 7000647cd9b2..d7e61c070f3e 100644
--- a/user_guide_src/source/database/queries.rst
+++ b/user_guide_src/source/database/queries.rst
@@ -99,21 +99,30 @@ It's a very good security practice to escape your data before submitting
 it into your database. CodeIgniter has three methods that help you do
 this:
 
-#. **$db->escape()** This function determines the data type so
-   that it can escape only string data. It also automatically adds
-   single quotes around the data so you don't have to:
+1. $db->escape()
+================
 
-   .. literalinclude:: queries/009.php
+This function determines the data type so
+that it can escape only string data. It also automatically adds
+single quotes around the data so you don't have to:
 
-#. **$db->escapeString()** This function escapes the data passed to
-   it, regardless of type. Most of the time you'll use the above
-   function rather than this one. Use the function like this:
+.. literalinclude:: queries/009.php
 
-   .. literalinclude:: queries/010.php
+2. $db->escapeString()
+======================
 
 #. **$db->escapeLikeString()** This method should be used when
    strings are to be used in LIKE conditions so that LIKE wildcards
    ('%', '\_') in the string are also properly escaped.
+This function escapes the data passed to
+it, regardless of type. Most of the time you'll use the above
+function rather than this one. Use the function like this:
+
+.. literalinclude:: queries/010.php
+
+3. $db->escapeLikeString()
+==========================
+
 
 .. literalinclude:: queries/011.php
 
@@ -162,7 +171,8 @@ placeholders in the query:
 Handling Errors
 ***************
 
-**$db->error();**
+$db->error()
+============
 
 If you need to get the last error that has occurred, the ``error()`` method
 will return an array containing its code and message. Here's a quick
@@ -220,23 +230,26 @@ Other Methods
 
 In addition to these two primary methods, the prepared query object also has the following methods:
 
-**close()**
+close()
+-------
 
 While PHP does a pretty good job of closing all open statements with the database it's always a good idea to
 close out the prepared statement when you're done with it:
 
 .. literalinclude:: queries/020.php
 
-**getQueryString()**
+getQueryString()
+----------------
 
 This returns the prepared query as a string.
 
-**hasError()**
+hasError()
+----------
 
 Returns boolean true/false if the last ``execute()`` call created any errors.
 
-**getErrorCode()**
-**getErrorMessage()**
+getErrorCode() getErrorMessage()
+--------------------------------
 
 If any errors were encountered these methods can be used to retrieve the error code and string.
 
@@ -249,7 +262,8 @@ Internally, all queries are processed and stored as instances of
 the parameters, otherwise preparing the query, and storing performance
 data about its query.
 
-**getLastQuery()**
+getLastQuery()
+==============
 
 When you just need to retrieve the last Query object, use the
 getLastQuery() method:
@@ -263,7 +277,8 @@ Each query object stores several pieces of information about the query itself.
 This is used, in part, by the Timeline feature, but is available for your use
 as well.
 
-**getQuery()**
+getQuery()
+----------
 
 Returns the final query after all processing has happened. This is the exact
 query that was sent to the database:
@@ -274,28 +289,32 @@ This same value can be retrieved by casting the Query object to a string:
 
 .. literalinclude:: queries/023.php
 
-**getOriginalQuery()**
+getOriginalQuery()
+------------------
 
 Returns the raw SQL that was passed into the object. This will not have any
 binds in it, or prefixes swapped out, etc:
 
 .. literalinclude:: queries/024.php
 
-**hasError()**
+hasError()
+----------
 
 If an error was encountered during the execution of this query this method
 will return true:
 
 .. literalinclude:: queries/025.php
 
-**isWriteType()**
+isWriteType()
+-------------
 
 Returns true if the query was determined to be a write-type query (i.e.,
 INSERT, UPDATE, DELETE, etc):
 
 .. literalinclude:: queries/026.php
 
-**swapPrefix()**
+swapPrefix()
+------------
 
 Replaces one table prefix with another value in the SQL. The first
 parameter is the original prefix that you want replaced, and the second
@@ -303,13 +322,15 @@ parameter is the value you want it replaced with:
 
 .. literalinclude:: queries/027.php
 
-**getStartTime()**
+getStartTime()
+--------------
 
 Gets the time the query was executed in seconds with microseconds:
 
 .. literalinclude:: queries/028.php
 
-**getDuration()**
+getDuration()
+-------------
 
 Returns a float with the duration of the query in seconds with microseconds:
 

From 82be78b34ccffd842ce324631bb20dab87b2bcf2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 11 May 2022 10:12:01 +0900
Subject: [PATCH 2172/2325] docs: fix text decoration

---
 user_guide_src/source/database/queries.rst | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/user_guide_src/source/database/queries.rst b/user_guide_src/source/database/queries.rst
index d7e61c070f3e..08163309c6e7 100644
--- a/user_guide_src/source/database/queries.rst
+++ b/user_guide_src/source/database/queries.rst
@@ -32,7 +32,7 @@ this:
 Simplified Queries
 ==================
 
-The **simpleQuery** method is a simplified version of the
+The ``simpleQuery()`` method is a simplified version of the
 ``$db->query()`` method. It DOES
 NOT return a database result set, nor does it set the query timer, or
 compile bind data, or store your query for debugging. It simply lets you
@@ -85,9 +85,9 @@ identifier you can use:
     is NOT designed to work with arbitrary user input. DO NOT feed it
     with unsanitized user data.
 
-This function will also add a table prefix to your table, assuming you
+This function will also add a **table prefix** to your table, assuming you
 have a prefix specified in your database config file. To enable the
-prefixing set true (boolean) via the second parameter:
+prefixing set ``true`` (boolean) via the second parameter:
 
 .. literalinclude:: queries/008.php
 
@@ -111,9 +111,6 @@ single quotes around the data so you don't have to:
 2. $db->escapeString()
 ======================
 
-#. **$db->escapeLikeString()** This method should be used when
-   strings are to be used in LIKE conditions so that LIKE wildcards
-   ('%', '\_') in the string are also properly escaped.
 This function escapes the data passed to
 it, regardless of type. Most of the time you'll use the above
 function rather than this one. Use the function like this:
@@ -123,11 +120,14 @@ function rather than this one. Use the function like this:
 3. $db->escapeLikeString()
 ==========================
 
+This method should be used when
+strings are to be used in LIKE conditions so that LIKE wildcards
+(``%``, ``_``) in the string are also properly escaped.
 
 .. literalinclude:: queries/011.php
 
-.. important:: The ``escapeLikeString()`` method uses '!' (exclamation mark)
-    to escape special characters for *LIKE* conditions. Because this
+.. important:: The ``escapeLikeString()`` method uses ``'!'`` (exclamation mark)
+    to escape special characters for ``LIKE`` conditions. Because this
     method escapes partial strings that you would wrap in quotes
     yourself, it cannot automatically add the ``ESCAPE '!'``
     condition for you, and so you'll have to manually do that.
@@ -266,7 +266,7 @@ getLastQuery()
 ==============
 
 When you just need to retrieve the last Query object, use the
-getLastQuery() method:
+``getLastQuery()`` method:
 
 .. literalinclude:: queries/021.php
 

From ef6dee934f4af7f589e4d2244b686ca5c1df9339 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 11 May 2022 10:34:08 +0900
Subject: [PATCH 2173/2325] docs: fix section title level

---
 user_guide_src/source/testing/response.rst | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/user_guide_src/source/testing/response.rst b/user_guide_src/source/testing/response.rst
index 99c44be38c62..56729e9b1e42 100644
--- a/user_guide_src/source/testing/response.rst
+++ b/user_guide_src/source/testing/response.rst
@@ -14,13 +14,13 @@ create your own directly using any ``ResponseInterface``:
     :depth: 2
 
 Testing the Response
-====================
+********************
 
 Whether you have received a ``TestResponse`` as a result of your tests or created one yourself,
 there are a number of new assertions that you can use in your tests.
 
 Accessing Request/Response
---------------------------
+==========================
 
 **request()**
 
@@ -35,7 +35,7 @@ This allows you direct access to the response object:
 .. literalinclude:: response/003.php
 
 Checking Response Status
-------------------------
+========================
 
 **isOK()**
 
@@ -82,7 +82,7 @@ Asserts that the HTTP status code returned matches $code.
 .. literalinclude:: response/010.php
 
 Session Assertions
-------------------
+==================
 
 **assertSessionHas(string $key, $value = null)**
 
@@ -98,7 +98,7 @@ Asserts that the resulting session does not include the specified $key.
 .. literalinclude:: response/012.php
 
 Header Assertions
------------------
+=================
 
 **assertHeader(string $key, $value = null)**
 
@@ -114,7 +114,7 @@ Asserts that a header name **$key** does not exist in the response.
 .. literalinclude:: response/014.php
 
 Cookie Assertions
------------------
+=================
 
 **assertCookie(string $key, $value = null, string $prefix = '')**
 
@@ -137,7 +137,7 @@ in as the second parameter.
 .. literalinclude:: response/017.php
 
 DOM Helpers
------------
+===========
 
 The response you get back contains a number of helper methods to inspect the HTML output within the response. These
 are useful for using within assertions in your tests.
@@ -169,7 +169,7 @@ Finally, you can check if a checkbox exists and is checked with the **seeCheckbo
 .. literalinclude:: response/023.php
 
 DOM Assertions
---------------
+==============
 
 You can perform tests to see if specific elements/text/etc exist with the body of the response with the following
 assertions.
@@ -213,7 +213,7 @@ Asserts that an input tag exists with the name and value:
 .. literalinclude:: response/029.php
 
 Working With JSON
------------------
+=================
 
 Responses will frequently contain JSON responses, especially when working with API methods. The following methods
 can help to test the responses.
@@ -241,7 +241,7 @@ Asserts that $fragment is found within the JSON response. It does not need to ma
 Similar to **assertJSONFragment()**, but checks the entire JSON response to ensure exact matches.
 
 Working With XML
-----------------
+================
 
 **getXML()**
 

From a127fb8cd57017c85b9ada5c388410568a4d6c0f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 11 May 2022 10:35:30 +0900
Subject: [PATCH 2174/2325] docs: add method titles

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

diff --git a/user_guide_src/source/testing/response.rst b/user_guide_src/source/testing/response.rst
index 56729e9b1e42..cbfa1cff9efc 100644
--- a/user_guide_src/source/testing/response.rst
+++ b/user_guide_src/source/testing/response.rst
@@ -143,6 +143,9 @@ The response you get back contains a number of helper methods to inspect the HTM
 are useful for using within assertions in your tests.
 
 The **see()** method checks the text on the page to see if it exists either by itself, or more specifically within
+see()
+-----
+
 a tag, as specified by type, class, or id:
 
 .. literalinclude:: response/018.php
@@ -152,19 +155,31 @@ The **dontSee()** method is the exact opposite:
 .. literalinclude:: response/019.php
 
 The **seeElement()** and **dontSeeElement()** are very similar to the previous methods, but do not look at the
+seeElement()
+------------
+
 values of the elements. Instead, they simply check that the elements exist on the page:
 
 .. literalinclude:: response/020.php
 
 You can use **seeLink()** to ensure that a link appears on the page with the specified text:
+seeLink()
+---------
+
 
 .. literalinclude:: response/021.php
 
 The **seeInField()** method checks for any input tags exist with the name and value:
+seeInField()
+------------
+
 
 .. literalinclude:: response/022.php
 
 Finally, you can check if a checkbox exists and is checked with the **seeCheckboxIsChecked()** method:
+seeCheckboxIsChecked()
+----------------------
+
 
 .. literalinclude:: response/023.php
 

From f47f3f6c3cd8f6bf916919665335b8916735e64e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 11 May 2022 10:37:59 +0900
Subject: [PATCH 2175/2325] docs: make method names linkable

---
 user_guide_src/source/testing/response.rst | 78 ++++++++++++++--------
 1 file changed, 52 insertions(+), 26 deletions(-)

diff --git a/user_guide_src/source/testing/response.rst b/user_guide_src/source/testing/response.rst
index cbfa1cff9efc..09aa973b91f6 100644
--- a/user_guide_src/source/testing/response.rst
+++ b/user_guide_src/source/testing/response.rst
@@ -22,13 +22,15 @@ there are a number of new assertions that you can use in your tests.
 Accessing Request/Response
 ==========================
 
-**request()**
+request()
+---------
 
 You can access directly the Request object, if it was set during testing:
 
 .. literalinclude:: response/002.php
 
-**response()**
+response()
+----------
 
 This allows you direct access to the response object:
 
@@ -37,45 +39,52 @@ This allows you direct access to the response object:
 Checking Response Status
 ========================
 
-**isOK()**
+isOK()
+------
 
 Returns a boolean true/false based on whether the response is perceived to be "ok". This is primarily determined by
 a response status code in the 200 or 300's. An empty body is not considered valid, unless in redirects.
 
 .. literalinclude:: response/004.php
 
-**assertOK()**
+assertOK()
+----------
 
 This assertion simply uses the **isOK()** method to test a response. **assertNotOK** is the inverse of this assertion.
 
 .. literalinclude:: response/005.php
 
-**isRedirect()**
+isRedirect()
+------------
 
 Returns a boolean true/false based on whether the response is a redirected response.
 
 .. literalinclude:: response/006.php
 
-**assertRedirect()**
+assertRedirect()
+----------------
 
 Asserts that the Response is an instance of RedirectResponse. **assertNotRedirect** is the inverse of this assertion.
 
 .. literalinclude:: response/007.php
 
-**assertRedirectTo()**
+assertRedirectTo()
+------------------
 
 Asserts that the Response is an instance of RedirectResponse and the destination
 matches the uri given.
 
 .. literalinclude:: response/008.php
 
-**getRedirectUrl()**
+getRedirectUrl()
+----------------
 
 Returns the URL set for a RedirectResponse, or null for failure.
 
 .. literalinclude:: response/009.php
 
-**assertStatus(int $code)**
+assertStatus(int $code)
+-----------------------
 
 Asserts that the HTTP status code returned matches $code.
 
@@ -84,14 +93,16 @@ Asserts that the HTTP status code returned matches $code.
 Session Assertions
 ==================
 
-**assertSessionHas(string $key, $value = null)**
+assertSessionHas(string $key, $value = null)
+--------------------------------------------
 
 Asserts that a value exists in the resulting session. If $value is passed, will also assert that the variable's value
 matches what was specified.
 
 .. literalinclude:: response/011.php
 
-**assertSessionMissing(string $key)**
+assertSessionMissing(string $key)
+---------------------------------
 
 Asserts that the resulting session does not include the specified $key.
 
@@ -100,14 +111,16 @@ Asserts that the resulting session does not include the specified $key.
 Header Assertions
 =================
 
-**assertHeader(string $key, $value = null)**
+assertHeader(string $key, $value = null)
+----------------------------------------
 
 Asserts that a header named **$key** exists in the response. If **$value** is not empty, will also assert that
 the values match.
 
 .. literalinclude:: response/013.php
 
-**assertHeaderMissing(string $key)**
+assertHeaderMissing(string $key)
+--------------------------------
 
 Asserts that a header name **$key** does not exist in the response.
 
@@ -116,20 +129,23 @@ Asserts that a header name **$key** does not exist in the response.
 Cookie Assertions
 =================
 
-**assertCookie(string $key, $value = null, string $prefix = '')**
+assertCookie(string $key, $value = null, string $prefix = '')
+-------------------------------------------------------------
 
 Asserts that a cookie named **$key** exists in the response. If **$value** is not empty, will also assert that
 the values match. You can set the cookie prefix, if needed, by passing it in as the third parameter.
 
 .. literalinclude:: response/015.php
 
-**assertCookieMissing(string $key)**
+assertCookieMissing(string $key)
+--------------------------------
 
 Asserts that a cookie named **$key** does not exist in the response.
 
 .. literalinclude:: response/016.php
 
-**assertCookieExpired(string $key, string $prefix = '')**
+assertCookieExpired(string $key, string $prefix = '')
+-----------------------------------------------------
 
 Asserts that a cookie named **$key** exists, but has expired. You can set the cookie prefix, if needed, by passing it
 in as the second parameter.
@@ -189,39 +205,45 @@ DOM Assertions
 You can perform tests to see if specific elements/text/etc exist with the body of the response with the following
 assertions.
 
-**assertSee(string $search = null, string $element = null)**
+assertSee(string $search = null, string $element = null)
+--------------------------------------------------------
 
 Asserts that text/HTML is on the page, either by itself or - more specifically - within
 a tag, as specified by type, class, or id:
 
 .. literalinclude:: response/024.php
 
-**assertDontSee(string $search = null, string $element = null)**
+assertDontSee(string $search = null, string $element = null)
+------------------------------------------------------------
 
 Asserts the exact opposite of the **assertSee()** method:
 
 .. literalinclude:: response/025.php
 
-**assertSeeElement(string $search)**
+assertSeeElement(string $search)
+--------------------------------
 
 Similar to **assertSee()**, however this only checks for an existing element. It does not check for specific text:
 
 .. literalinclude:: response/026.php
 
-**assertDontSeeElement(string $search)**
+assertDontSeeElement(string $search)
+------------------------------------
 
 Similar to **assertSee()**, however this only checks for an existing element that is missing. It does not check for
 specific text:
 
 .. literalinclude:: response/027.php
 
-**assertSeeLink(string $text, string $details=null)**
+assertSeeLink(string $text, string $details = null)
+---------------------------------------------------
 
 Asserts that an anchor tag is found with matching **$text** as the body of the tag:
 
 .. literalinclude:: response/028.php
 
-**assertSeeInField(string $field, string $value=null)**
+assertSeeInField(string $field, string $value = null)
+-----------------------------------------------------
 
 Asserts that an input tag exists with the name and value:
 
@@ -233,7 +255,8 @@ Working With JSON
 Responses will frequently contain JSON responses, especially when working with API methods. The following methods
 can help to test the responses.
 
-**getJSON()**
+getJSON()
+---------
 
 This method will return the body of the response as a JSON string:
 
@@ -245,19 +268,22 @@ You can use this method to determine if ``$response`` actually holds JSON conten
 
 .. note:: Be aware that the JSON string will be pretty-printed in the result.
 
-**assertJSONFragment(array $fragment)**
+assertJSONFragment(array $fragment)
+-----------------------------------
 
 Asserts that $fragment is found within the JSON response. It does not need to match the entire JSON value.
 
 .. literalinclude:: response/032.php
 
-**assertJSONExact($test)**
+assertJSONExact($test)
+----------------------
 
 Similar to **assertJSONFragment()**, but checks the entire JSON response to ensure exact matches.
 
 Working With XML
 ================
 
-**getXML()**
+getXML()
+--------
 
 If your application returns XML, you can retrieve it through this method.

From b196d4afd4de94e8ac59013614089536f8826a9e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 11 May 2022 10:38:22 +0900
Subject: [PATCH 2176/2325] docs: fix text decoration

---
 user_guide_src/source/testing/response.rst | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/user_guide_src/source/testing/response.rst b/user_guide_src/source/testing/response.rst
index 09aa973b91f6..c28fd46bbb81 100644
--- a/user_guide_src/source/testing/response.rst
+++ b/user_guide_src/source/testing/response.rst
@@ -50,7 +50,7 @@ a response status code in the 200 or 300's. An empty body is not considered vali
 assertOK()
 ----------
 
-This assertion simply uses the **isOK()** method to test a response. **assertNotOK** is the inverse of this assertion.
+This assertion simply uses the ``isOK()`` method to test a response. ``assertNotOK()`` is the inverse of this assertion.
 
 .. literalinclude:: response/005.php
 
@@ -64,7 +64,7 @@ Returns a boolean true/false based on whether the response is a redirected respo
 assertRedirect()
 ----------------
 
-Asserts that the Response is an instance of RedirectResponse. **assertNotRedirect** is the inverse of this assertion.
+Asserts that the Response is an instance of RedirectResponse. ``assertNotRedirect()`` is the inverse of this assertion.
 
 .. literalinclude:: response/007.php
 
@@ -114,7 +114,7 @@ Header Assertions
 assertHeader(string $key, $value = null)
 ----------------------------------------
 
-Asserts that a header named **$key** exists in the response. If **$value** is not empty, will also assert that
+Asserts that a header named ``$key`` exists in the response. If ``$value`` is not empty, will also assert that
 the values match.
 
 .. literalinclude:: response/013.php
@@ -122,7 +122,7 @@ the values match.
 assertHeaderMissing(string $key)
 --------------------------------
 
-Asserts that a header name **$key** does not exist in the response.
+Asserts that a header name ``$key`` does not exist in the response.
 
 .. literalinclude:: response/014.php
 
@@ -132,7 +132,7 @@ Cookie Assertions
 assertCookie(string $key, $value = null, string $prefix = '')
 -------------------------------------------------------------
 
-Asserts that a cookie named **$key** exists in the response. If **$value** is not empty, will also assert that
+Asserts that a cookie named ``$key`` exists in the response. If ``$value`` is not empty, will also assert that
 the values match. You can set the cookie prefix, if needed, by passing it in as the third parameter.
 
 .. literalinclude:: response/015.php
@@ -140,14 +140,14 @@ the values match. You can set the cookie prefix, if needed, by passing it in as
 assertCookieMissing(string $key)
 --------------------------------
 
-Asserts that a cookie named **$key** does not exist in the response.
+Asserts that a cookie named ``$key`` does not exist in the response.
 
 .. literalinclude:: response/016.php
 
 assertCookieExpired(string $key, string $prefix = '')
 -----------------------------------------------------
 
-Asserts that a cookie named **$key** exists, but has expired. You can set the cookie prefix, if needed, by passing it
+Asserts that a cookie named ``$key`` exists, but has expired. You can set the cookie prefix, if needed, by passing it
 in as the second parameter.
 
 .. literalinclude:: response/017.php
@@ -158,44 +158,44 @@ DOM Helpers
 The response you get back contains a number of helper methods to inspect the HTML output within the response. These
 are useful for using within assertions in your tests.
 
-The **see()** method checks the text on the page to see if it exists either by itself, or more specifically within
 see()
 -----
 
+The ``see()`` method checks the text on the page to see if it exists either by itself, or more specifically within
 a tag, as specified by type, class, or id:
 
 .. literalinclude:: response/018.php
 
-The **dontSee()** method is the exact opposite:
+The ``dontSee()`` method is the exact opposite:
 
 .. literalinclude:: response/019.php
 
-The **seeElement()** and **dontSeeElement()** are very similar to the previous methods, but do not look at the
 seeElement()
 ------------
 
+The ``seeElement()`` and ``dontSeeElement()`` are very similar to the previous methods, but do not look at the
 values of the elements. Instead, they simply check that the elements exist on the page:
 
 .. literalinclude:: response/020.php
 
-You can use **seeLink()** to ensure that a link appears on the page with the specified text:
 seeLink()
 ---------
 
+You can use ``seeLink()`` to ensure that a link appears on the page with the specified text:
 
 .. literalinclude:: response/021.php
 
-The **seeInField()** method checks for any input tags exist with the name and value:
 seeInField()
 ------------
 
+The ``seeInField()`` method checks for any input tags exist with the name and value:
 
 .. literalinclude:: response/022.php
 
-Finally, you can check if a checkbox exists and is checked with the **seeCheckboxIsChecked()** method:
 seeCheckboxIsChecked()
 ----------------------
 
+Finally, you can check if a checkbox exists and is checked with the ``seeCheckboxIsChecked()`` method:
 
 .. literalinclude:: response/023.php
 
@@ -216,21 +216,21 @@ a tag, as specified by type, class, or id:
 assertDontSee(string $search = null, string $element = null)
 ------------------------------------------------------------
 
-Asserts the exact opposite of the **assertSee()** method:
+Asserts the exact opposite of the ``assertSee()`` method:
 
 .. literalinclude:: response/025.php
 
 assertSeeElement(string $search)
 --------------------------------
 
-Similar to **assertSee()**, however this only checks for an existing element. It does not check for specific text:
+Similar to ``assertSee()``, however this only checks for an existing element. It does not check for specific text:
 
 .. literalinclude:: response/026.php
 
 assertDontSeeElement(string $search)
 ------------------------------------
 
-Similar to **assertSee()**, however this only checks for an existing element that is missing. It does not check for
+Similar to ``assertSee()``, however this only checks for an existing element that is missing. It does not check for
 specific text:
 
 .. literalinclude:: response/027.php
@@ -238,7 +238,7 @@ specific text:
 assertSeeLink(string $text, string $details = null)
 ---------------------------------------------------
 
-Asserts that an anchor tag is found with matching **$text** as the body of the tag:
+Asserts that an anchor tag is found with matching ``$text`` as the body of the tag:
 
 .. literalinclude:: response/028.php
 
@@ -278,7 +278,7 @@ Asserts that $fragment is found within the JSON response. It does not need to ma
 assertJSONExact($test)
 ----------------------
 
-Similar to **assertJSONFragment()**, but checks the entire JSON response to ensure exact matches.
+Similar to ``assertJSONFragment()``, but checks the entire JSON response to ensure exact matches.
 
 Working With XML
 ================

From 61d9b3fc5a70976a108c0cac5f70e7ae340596b1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 12 May 2022 11:44:35 +0900
Subject: [PATCH 2177/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/database/examples.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/database/examples.rst b/user_guide_src/source/database/examples.rst
index c660ed32f6ae..2b2a5b89d1de 100644
--- a/user_guide_src/source/database/examples.rst
+++ b/user_guide_src/source/database/examples.rst
@@ -80,7 +80,7 @@ Query Builder Insert
 Get Table Rows in the Command Line
 ==================================
 
-You can see specific table info on the command line. Assuming there is a table called ``my_table`` , use the following command to get started::
+You can see specific table information on the command line. Assuming there is a table called ``my_table``, use the following command to get started::
 
     > php spark db:table my_table
 

From 44687c7866cb4a2e63e9097a71722947388159b8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 12 May 2022 11:44:53 +0900
Subject: [PATCH 2178/2325] docs: fix by proofreading

Co-authored-by: John Paul E. Balandan, CPA <51850998+paulbalandan@users.noreply.github.com>
---
 user_guide_src/source/database/examples.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/database/examples.rst b/user_guide_src/source/database/examples.rst
index 2b2a5b89d1de..cf30f344f253 100644
--- a/user_guide_src/source/database/examples.rst
+++ b/user_guide_src/source/database/examples.rst
@@ -84,7 +84,7 @@ You can see specific table information on the command line. Assuming there is a
 
     > php spark db:table my_table
 
-If table ``my_table`` is not in the database, the CodeIgniter displays a list of available tables to select.
+If table ``my_table`` is not in the database, CodeIgniter displays a list of available tables to select.
 You can also use only the following command without the table name. In this case, the table name will be asked ::
 
     > php spark db:table

From 8fc874be83afef766892045208079ddc2c5bd371 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 12 May 2022 11:47:43 +0900
Subject: [PATCH 2179/2325] docs: improve the description

---
 user_guide_src/source/changelogs/v4.2.0.rst | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 2d077730a7ec..976fd9cf6fb9 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -47,12 +47,14 @@ See :ref:`auto-routing-improved` for the details.
 Commands
 ========
 
-- Added ``db:table`` command.
-    - You can now see the names of all the tables in the database you are currently connected, field names or other metadata, like the column type, max length and ... each table, and the information in that table in the terminal.
-        - ``db:table --show``
-        - ``db:table my_table``
-        - ``db:table my_table --metadata``
-        - ``db:table my_table --limit-row 50 --limit-field-value 20 --desc``
+- Added ``spark db:table`` command.
+    - You can now see the names of all the tables in the database you are currently connected in the terminal.
+        - ``spark db:table --show``
+    - Or you can see the field names and the records of a table.
+        - ``spark db:table my_table``
+        - ``spark db:table my_table --limit-row 50 --limit-field-value 20 --desc``
+    - Or you can see metadata like the column type, max length of a table.
+        - ``spark db:table my_table --metadata``
 - The ``spark routes`` command now shows closure routes, auto routes, and filters. See :ref:`URI Routing <spark-routes>`.
 
 Others

From 021eb5378d913fbbdd13230272b71645e8537a67 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 12 May 2022 13:18:53 +0900
Subject: [PATCH 2180/2325] docs: add missing "s"

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 976fd9cf6fb9..e07e5d53e44a 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -52,7 +52,7 @@ Commands
         - ``spark db:table --show``
     - Or you can see the field names and the records of a table.
         - ``spark db:table my_table``
-        - ``spark db:table my_table --limit-row 50 --limit-field-value 20 --desc``
+        - ``spark db:table my_table --limit-rows 50 --limit-field-value 20 --desc``
     - Or you can see metadata like the column type, max length of a table.
         - ``spark db:table my_table --metadata``
 - The ``spark routes`` command now shows closure routes, auto routes, and filters. See :ref:`URI Routing <spark-routes>`.

From fef201878d7b38cd2f09d176f602b0cabaeb725a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 12 May 2022 13:19:30 +0900
Subject: [PATCH 2181/2325] add dbmgmt/db_commands.rst

---
 user_guide_src/source/database/metadata.rst  | 21 -------
 user_guide_src/source/dbmgmt/db_commands.rst | 61 ++++++++++++++++++++
 user_guide_src/source/dbmgmt/index.rst       |  1 +
 3 files changed, 62 insertions(+), 21 deletions(-)
 create mode 100644 user_guide_src/source/dbmgmt/db_commands.rst

diff --git a/user_guide_src/source/database/metadata.rst b/user_guide_src/source/database/metadata.rst
index 15ed5d6cd8fb..5ba9453672a3 100644
--- a/user_guide_src/source/database/metadata.rst
+++ b/user_guide_src/source/database/metadata.rst
@@ -25,15 +25,6 @@ you are currently connected to. Example:
 
 .. note:: Some drivers have additional system tables that are excluded from this return.
 
-db:table --show command
------------------------
-
-CodeIgniter supports show list the tables in your database straight from your favorite terminal using the dedicated ``db:table --show`` command. By using this command it is assumed that the tables is   existing. Otherwise, CodeIgniter will complain that tables list show has failed.
-
-To start, just type ::
-
-    > php spark db:table --show
-
 Determine If a Table Exists
 ===========================
 
@@ -114,18 +105,6 @@ database:
 -  primary_key - 1 if the column is a primary key
 -  type - the type of the column
 
-db:table --metadata command
----------------------------
-
-CodeIgniter supports show table containing field information in your database straight from your favorite terminal using the dedicated ``db:table my_table --metadata`` command. By using this command it is assumed that the table ``my_table`` is existing. Otherwise, CodeIgniter will show that tables list for select.
-Also, you can use this command as ``db:table --metadata``.
-
-.. note:: You can use the optional ``--desc``, ``--limit-rows``, ``--limit-field-value`` options at any time when using command ``db:table`` .
-
-Command ``db:table --limit-rows 50``, for example, limits the number of rows to 50 rows.
-Command ``db:table --desc``, set the sort direction to "DESC". 
-And Command ``db:table --limit-field-value 10`` limits the length of the field values to 10 characters, to prevent confusion of the table output in the terminal.
-
 List the Indexes in a Table
 ===========================
 
diff --git a/user_guide_src/source/dbmgmt/db_commands.rst b/user_guide_src/source/dbmgmt/db_commands.rst
new file mode 100644
index 000000000000..df568529bcdc
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/db_commands.rst
@@ -0,0 +1,61 @@
+#################
+Database Commands
+#################
+
+CodeIgniter provides some simple commands for databse management.
+
+.. contents::
+    :local:
+    :depth: 2
+
+*************************
+Showing Table Information
+*************************
+
+List the Tables in Your Database
+================================
+
+db:table --show
+---------------
+
+To list all the tables in your database straight from your favorite terminal,
+you can use the ``db:table --show`` command::
+
+    > php spark db:table --show
+
+When using this command it is assumed that a table exists.
+Otherwise, CodeIgniter will complain that the database has no tables.
+
+Retrieve Some Records
+=====================
+
+db:table
+--------
+
+When you have a table named ``my_table``, you can see the field names and the records of a table::
+
+    > php spark db:table my_table
+
+You can also pass a few options::
+
+    > php spark db:table my_table --limit-rows 50 --limit-field-value 20 --desc
+
+The option ``--limit-rows 50`` limits the number of rows to 50 rows.
+
+The option  ``--limit-field-value 20`` limits the length of the field values to 20 characters, to prevent confusion of the table output in the terminal.
+
+The option ``--desc`` sets the sort direction to "DESC".
+
+Retrieve Field Metadata
+=======================
+
+db:table --metadata
+-------------------
+
+When you have a table named ``my_table``, you can see metadata like the column type, max length of the table with the ``--metadata`` option::
+
+    > php spark db:table my_table --metadata
+
+When using this command it is assumed that the table exists.
+Otherwise, CodeIgniter will show a table list to select.
+Also, you can use this command as ``db:table --metadata``.
diff --git a/user_guide_src/source/dbmgmt/index.rst b/user_guide_src/source/dbmgmt/index.rst
index 2868c0869da0..68bfea3e6098 100644
--- a/user_guide_src/source/dbmgmt/index.rst
+++ b/user_guide_src/source/dbmgmt/index.rst
@@ -10,3 +10,4 @@ CodeIgniter comes with tools to restructure or seed your database.
     Database Manipulation with Database Forge <forge>
     Database Migrations <migration>
     Database Seeding <seeds>
+    db_commands

From 845f932257a24c4cbfaada19402a0b860859c890 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 12 May 2022 15:37:59 +0900
Subject: [PATCH 2182/2325] feat: add usage

---
 system/Commands/Database/ShowTableInfo.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index a746964e812e..5d9c2e49e9bf 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -48,7 +48,16 @@ class ShowTableInfo extends BaseCommand
      *
      * @var string
      */
-    protected $usage = 'db:table [<table_name>] [options]';
+    protected $usage = <<<'EOL'
+        db:table [<table_name>] [options]
+
+          Examples:
+            db:table --show
+            db:table --metadata
+            db:table my_table --metadata
+            db:table my_table
+            db:table my_table --limit-rows 5 --limit-field-value 10 --desc
+        EOL;
 
     /**
      * The Command's arguments

From 1a7b9c8c439bca6c69eb7bcfebacb41921cc8222 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 12 May 2022 15:41:59 +0900
Subject: [PATCH 2183/2325] docs: add link to the details

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index e07e5d53e44a..a75a88281025 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -47,7 +47,7 @@ See :ref:`auto-routing-improved` for the details.
 Commands
 ========
 
-- Added ``spark db:table`` command.
+- Added ``spark db:table`` command. See :doc:`../dbmgmt/db_commands` for the details.
     - You can now see the names of all the tables in the database you are currently connected in the terminal.
         - ``spark db:table --show``
     - Or you can see the field names and the records of a table.

From dd89dc242aebefc7fb60c502683761776838f53a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 12 May 2022 16:21:22 +0900
Subject: [PATCH 2184/2325] test: add test for --limit-lows

---
 .../Commands/Database/ShowTableInfoTest.php   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/tests/system/Commands/Database/ShowTableInfoTest.php b/tests/system/Commands/Database/ShowTableInfoTest.php
index cacb6bf8f43d..7f9c8919cf28 100644
--- a/tests/system/Commands/Database/ShowTableInfoTest.php
+++ b/tests/system/Commands/Database/ShowTableInfoTest.php
@@ -149,4 +149,24 @@ public function testDbTableLimitFieldValueLength(): void
             EOL;
         $this->assertStringContainsString($expected, $result);
     }
+
+    public function testDbTableLimitRows(): void
+    {
+        command('db:table db_user --limit-rows 2');
+
+        $result = $this->getResultWithoutControlCode();
+
+        $expected = 'Data of Table "db_user":';
+        $this->assertStringContainsString($expected, $result);
+
+        $expected = <<<'EOL'
+            +----+-------------+--------------------+---------+------------+------------+------------+
+            | id | name        | email              | country | created_at | updated_at | deleted_at |
+            +----+-------------+--------------------+---------+------------+------------+------------+
+            | 1  | Derek Jones | derek@world.com    | US      |            |            |            |
+            | 2  | Ahmadinejad | ahmadinejad@wor... | Iran    |            |            |            |
+            +----+-------------+--------------------+---------+------------+------------+------------+
+            EOL;
+        $this->assertStringContainsString($expected, $result);
+    }
 }

From 1e5b6d975b4995e7f1ef7639dc326bd6efcf53dd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 12 May 2022 16:22:28 +0900
Subject: [PATCH 2185/2325] fix: --desc handling

But tables having the column `id` can be sorted properly.
---
 system/Commands/Database/ShowTableInfo.php    | 24 +++++++++++++++----
 .../Commands/Database/ShowTableInfoTest.php   | 20 ++++++++++++++++
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/system/Commands/Database/ShowTableInfo.php b/system/Commands/Database/ShowTableInfo.php
index 5d9c2e49e9bf..7e3d6a4807ff 100644
--- a/system/Commands/Database/ShowTableInfo.php
+++ b/system/Commands/Database/ShowTableInfo.php
@@ -162,7 +162,13 @@ private function showDataOfTable(string $tableName, int $limitRows, int $limitFi
         $thead = $this->db->getFieldNames($tableName);
         $this->restoreDBPrefix();
 
-        $this->tbody = $this->makeTableRows($tableName, $limitRows, $limitFieldValue);
+        // If there is a field named `id`, sort by it.
+        $sortField = null;
+        if (in_array('id', $thead, true)) {
+            $sortField = 'id';
+        }
+
+        $this->tbody = $this->makeTableRows($tableName, $limitRows, $limitFieldValue, $sortField);
         CLI::table($this->tbody, $thead);
     }
 
@@ -203,13 +209,21 @@ private function makeTbodyForShowAllTables(array $tables): array
         return $this->tbody;
     }
 
-    private function makeTableRows(string $tableName, int $limitRows, int $limitFieldValue): array
-    {
+    private function makeTableRows(
+        string $tableName,
+        int $limitRows,
+        int $limitFieldValue,
+        ?string $sortField = null
+    ): array {
         $this->tbody = [];
 
         $this->removeDBPrefix();
         $builder = $this->db->table($tableName);
-        $rows    = $builder->limit($limitRows)->get()->getResultArray();
+        $builder->limit($limitRows);
+        if ($sortField !== null) {
+            $builder->orderBy($sortField, $this->sortDesc ? 'DESC' : 'ASC');
+        }
+        $rows = $builder->get()->getResultArray();
         $this->restoreDBPrefix();
 
         foreach ($rows as $row) {
@@ -222,7 +236,7 @@ private function makeTableRows(string $tableName, int $limitRows, int $limitFiel
             $this->tbody[] = $row;
         }
 
-        if ($this->sortDesc) {
+        if ($sortField === null && $this->sortDesc) {
             krsort($this->tbody);
         }
 
diff --git a/tests/system/Commands/Database/ShowTableInfoTest.php b/tests/system/Commands/Database/ShowTableInfoTest.php
index 7f9c8919cf28..2824588695c7 100644
--- a/tests/system/Commands/Database/ShowTableInfoTest.php
+++ b/tests/system/Commands/Database/ShowTableInfoTest.php
@@ -169,4 +169,24 @@ public function testDbTableLimitRows(): void
             EOL;
         $this->assertStringContainsString($expected, $result);
     }
+
+    public function testDbTableAllOptions(): void
+    {
+        command('db:table db_user --limit-rows 2 --limit-field-value 5 --desc');
+
+        $result = $this->getResultWithoutControlCode();
+
+        $expected = 'Data of Table "db_user":';
+        $this->assertStringContainsString($expected, $result);
+
+        $expected = <<<'EOL'
+            +----+----------+----------+---------+------------+------------+------------+
+            | id | name     | email    | country | created_at | updated_at | deleted_at |
+            +----+----------+----------+---------+------------+------------+------------+
+            | 4  | Chris... | chris... | UK      |            |            |            |
+            | 3  | Richa... | richa... | US      |            |            |            |
+            +----+----------+----------+---------+------------+------------+------------+
+            EOL;
+        $this->assertStringContainsString($expected, $result);
+    }
 }

From 8eb2df1efb2a1858e4aa1bc50453075ecca9909c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 12 May 2022 16:40:51 +0900
Subject: [PATCH 2186/2325] docs: remove db:table in database/examples.rst, add
 explanation in db_commands.rst

---
 user_guide_src/source/database/examples.rst  | 18 ------------------
 user_guide_src/source/dbmgmt/db_commands.rst |  8 ++++++++
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/user_guide_src/source/database/examples.rst b/user_guide_src/source/database/examples.rst
index cf30f344f253..bee7e9066597 100644
--- a/user_guide_src/source/database/examples.rst
+++ b/user_guide_src/source/database/examples.rst
@@ -76,21 +76,3 @@ Query Builder Insert
 ====================
 
 .. literalinclude:: examples/008.php
-
-Get Table Rows in the Command Line
-==================================
-
-You can see specific table information on the command line. Assuming there is a table called ``my_table``, use the following command to get started::
-
-    > php spark db:table my_table
-
-If table ``my_table`` is not in the database, CodeIgniter displays a list of available tables to select.
-You can also use only the following command without the table name. In this case, the table name will be asked ::
-
-    > php spark db:table
-
-.. note:: You can use the optional ``--desc``, ``--limit-rows``, ``--limit-field-value`` options at any time when using command ``db:table`` .
-
-Command ``db:table --limit-rows 50``, for example, limits the number of rows to 50 rows.
-Command ``db:table --desc``, set the sort direction to "DESC".
-And Command ``db:table --limit-field-value 10`` limits the length of the field values to 10 characters, to prevent confusion of the table output in the terminal.
diff --git a/user_guide_src/source/dbmgmt/db_commands.rst b/user_guide_src/source/dbmgmt/db_commands.rst
index df568529bcdc..e9df61306c4f 100644
--- a/user_guide_src/source/dbmgmt/db_commands.rst
+++ b/user_guide_src/source/dbmgmt/db_commands.rst
@@ -36,6 +36,14 @@ When you have a table named ``my_table``, you can see the field names and the re
 
     > php spark db:table my_table
 
+If the table ``my_table`` is not in the database, CodeIgniter displays a list of available tables to select.
+
+You can also use the following command without the table name::
+
+    > php spark db:table
+
+In this case, the table name will be asked.
+
 You can also pass a few options::
 
     > php spark db:table my_table --limit-rows 50 --limit-field-value 20 --desc

From 8c2a592a88ff9cc485a0e029904003d10b3dfc09 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 12 May 2022 16:58:09 +0900
Subject: [PATCH 2187/2325] docs: rename cli.rst to cli_controllers.rst

---
 .../cli/{cli.rst => cli_controllers.rst}      | 27 +++----------------
 .../cli/{cli => cli_controllers}/001.php      |  0
 .../cli/{cli => cli_controllers}/002.php      |  0
 3 files changed, 3 insertions(+), 24 deletions(-)
 rename user_guide_src/source/cli/{cli.rst => cli_controllers.rst} (73%)
 rename user_guide_src/source/cli/{cli => cli_controllers}/001.php (100%)
 rename user_guide_src/source/cli/{cli => cli_controllers}/002.php (100%)

diff --git a/user_guide_src/source/cli/cli.rst b/user_guide_src/source/cli/cli_controllers.rst
similarity index 73%
rename from user_guide_src/source/cli/cli.rst
rename to user_guide_src/source/cli/cli_controllers.rst
index bd57d4f608fd..51500894bf97 100644
--- a/user_guide_src/source/cli/cli.rst
+++ b/user_guide_src/source/cli/cli_controllers.rst
@@ -1,6 +1,6 @@
-############################
-Running via the Command Line
-############################
+###########################
+Running Controllers via CLI
+###########################
 
 As well as calling an application's :doc:`Controllers </incoming/controllers>`
 via the URL in a browser they can also be loaded via the command-line
@@ -10,27 +10,6 @@ interface (CLI).
     :local:
     :depth: 2
 
-What is the CLI?
-================
-
-The command-line interface is a text-based method of interacting with
-computers. For more information, check the `Wikipedia
-article <https://en.wikipedia.org/wiki/Command-line_interface>`_.
-
-Why run via the command-line?
-=============================
-
-There are many reasons for running CodeIgniter from the command-line,
-but they are not always obvious.
-
--  Run your cron-jobs without needing to use *wget* or *curl*.
--  Make your cron-jobs inaccessible from being loaded in the URL by
-   checking the return value of :php:func:`is_cli()`.
--  Make interactive "tasks" that can do things like set permissions,
-   prune cache folders, run backups, etc.
--  Integrate with other applications in other languages. For example, a
-   random C++ script could call one command and run code in your models!
-
 Let's try it: Hello World!
 ==========================
 
diff --git a/user_guide_src/source/cli/cli/001.php b/user_guide_src/source/cli/cli_controllers/001.php
similarity index 100%
rename from user_guide_src/source/cli/cli/001.php
rename to user_guide_src/source/cli/cli_controllers/001.php
diff --git a/user_guide_src/source/cli/cli/002.php b/user_guide_src/source/cli/cli_controllers/002.php
similarity index 100%
rename from user_guide_src/source/cli/cli/002.php
rename to user_guide_src/source/cli/cli_controllers/002.php

From e442bc10d4ccba931bb9db335182b1295d36d7ea Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 12 May 2022 18:06:52 +0900
Subject: [PATCH 2188/2325] docs: rework "Command Line Usage"

---
 user_guide_src/source/cli/cli_commands.rst    | 72 +++----------------
 user_guide_src/source/cli/cli_controllers.rst | 65 +++++++++--------
 user_guide_src/source/cli/cli_overview.rst    | 53 ++++++++++++++
 user_guide_src/source/cli/index.rst           |  4 +-
 user_guide_src/source/cli/spark_commands.rst  | 62 ++++++++++++++++
 5 files changed, 164 insertions(+), 92 deletions(-)
 create mode 100644 user_guide_src/source/cli/cli_overview.rst
 create mode 100644 user_guide_src/source/cli/spark_commands.rst

diff --git a/user_guide_src/source/cli/cli_commands.rst b/user_guide_src/source/cli/cli_commands.rst
index 524ab80f3644..8766673b15d8 100644
--- a/user_guide_src/source/cli/cli_commands.rst
+++ b/user_guide_src/source/cli/cli_commands.rst
@@ -1,9 +1,9 @@
-###################
-Custom CLI Commands
-###################
+#######################
+Creating Spark Commands
+#######################
 
-While the ability to use CLI commands like any other route is convenient, you might find times where you
-need a little something different. That's where CLI commands come in. They are simple classes that do not
+While the ability to use Controllers via CLI like any other route is convenient, you might find times where you
+need a little something different. That's where Spark commands come in. They are simple classes that do not
 need to have routes defined for, making them perfect for building tools that developers can use to make
 their jobs simpler, whether by handling migrations or database seeding, checking cronjob status, or even
 building out custom code generators for your company.
@@ -12,60 +12,6 @@ building out custom code generators for your company.
     :local:
     :depth: 2
 
-****************
-Running Commands
-****************
-
-Commands are run from the command line, in the root directory. The same one that holds the **/app**
-and **/system** directories. A custom script, **spark** has been provided that is used to run any of the
-CLI commands::
-
-    > php spark
-
-When called without specifying a command, a simple help page is displayed that also provides a list of
-available commands. You should pass the name of the command as the first argument to run that command::
-
-    > php spark migrate
-
-Some commands take additional arguments, which should be provided directly after the command, separated by spaces::
-
-    > php spark db:seed DevUserSeeder
-
-You may always pass ``--no-header`` to suppress the header output, helpful for parsing results::
-
-    > php spark cache:clear --no-header
-
-For all of the commands CodeIgniter provides, if you do not provide the required arguments, you will be prompted
-for the information it needs to run correctly::
-
-    > php spark migrate:version
-    > Version?
-
-Calling Commands
-================
-
-Commands can also be ran from within your own code. This is most often done within a controller for cronjob tasks,
-but they can be used at any time. You do this by using the ``command()`` function. This function is always available.
-
-.. literalinclude:: cli_commands/001.php
-
-The only argument is string that is the command called and any parameters. This appears exactly as you would call
-it from the command line.
-
-All output from the command that is ran is captured when not run from the command line. It is returned from the command
-so that you can choose to display it or not.
-
-******************
-Using Help Command
-******************
-
-You can get help about any CLI command using the help command as follows::
-
-    > php spark help db:seed
-
-Use the **list** command to get a list of available commands and their descriptions, sorted by categories.
-You may also use ``spark list --simple`` to get a raw list of all available commands, sorted alphabetically.
-
 *********************
 Creating New Commands
 *********************
@@ -130,17 +76,19 @@ Then **foo** is the command name, and the ``$params`` array would be:
 This can also be accessed through the :doc:`CLI </cli/cli_library>` library, but this already has your command removed
 from the string. These parameters can be used to customize how your scripts behave.
 
-Our demo command might have a ``run`` method something like:
+Our demo command might have a ``run()`` method something like:
 
 .. literalinclude:: cli_commands/004.php
 
+See the :doc:`CLI Library </cli/cli_library>` page for detailed information.
+
 ***********
 BaseCommand
 ***********
 
 The ``BaseCommand`` class that all commands must extend have a couple of helpful utility methods that you should
 be familiar with when creating your own commands. It also has a :doc:`Logger </general/logging>` available at
-**$this->logger**.
+``$this->logger``.
 
 .. php:class:: CodeIgniter\\CLI\\BaseCommand
 
@@ -170,6 +118,6 @@ be familiar with when creating your own commands. It also has a :doc:`Logger </g
         :param array    $array: The  $key => $value array.
         :param integer  $pad: The pad spaces.
 
-        A method to calculate padding for $key => $value array output. The padding can be used to output a will formatted table in CLI:
+        A method to calculate padding for ``$key => $value`` array output. The padding can be used to output a will formatted table in CLI:
 
         .. literalinclude:: cli_commands/007.php
diff --git a/user_guide_src/source/cli/cli_controllers.rst b/user_guide_src/source/cli/cli_controllers.rst
index 51500894bf97..9c16e1bb30ac 100644
--- a/user_guide_src/source/cli/cli_controllers.rst
+++ b/user_guide_src/source/cli/cli_controllers.rst
@@ -10,17 +10,43 @@ interface (CLI).
     :local:
     :depth: 2
 
+**************************
 Let's try it: Hello World!
-==========================
+**************************
+
+Create a Controller
+===================
 
 Let's create a simple controller so you can see it in action. Using your
 text editor, create a file called Tools.php, and put the following code
 in it:
 
-.. literalinclude:: cli/001.php
+.. literalinclude:: cli_controllers/001.php
+
+.. note:: If you use :ref:`auto-routing-improved`, change the method name to ``cli_message()``.
 
 Then save the file to your **app/Controllers/** directory.
 
+Define a Route
+==============
+
+If you use Auto Routing, skip this.
+
+In your **app/Config/Routes.php** file you can create routes that are only accessible from
+the CLI as easily as you would create any other route. Instead of using the ``get()``,
+``post()``, or similar method, you would use the ``cli()`` method. Everything else
+works exactly like a normal route definition:
+
+.. literalinclude:: cli_controllers/002.php
+
+For more information, see the :ref:`Routes <command-line-only-routes>` page.
+
+.. warning:: If you enable :ref:`auto-routing` and place the command file in **app/Controllers**,
+    anyone could access the command with the help of auto-routing via HTTP.
+
+Run via CLI
+===========
+
 Now normally you would visit your site using a URL similar to this::
 
     example.com/index.php/tools/message/to
@@ -33,7 +59,7 @@ in Windows and navigate to our CodeIgniter project's web root.
     $ cd /path/to/project/public
     $ php index.php tools message
 
-If you did it right, you should see *Hello World!* printed.
+If you did it right, you should see "Hello World!" printed.
 
 .. code-block:: bash
 
@@ -44,37 +70,18 @@ work. "John Smith" is passed as an argument and output is::
 
     Hello John Smith!
 
-That's the basics!
-==================
+******************
+That's the Basics!
+******************
 
 That, in a nutshell, is all there is to know about controllers on the
 command line. Remember that this is just a normal controller, so routing
 and ``_remap()`` works fine.
 
+.. note:: ``_remap()`` does not work with :ref:`auto-routing-improved`.
+
+If you want to make sure running via CLI, check the return value of :php:func:`is_cli()`.
+
 However, CodeIgniter provides additional tools to make creating CLI-accessible
 scripts even more pleasant, include CLI-only routing, and a library that helps
 you with CLI-only tools.
-
-CLI-Only Routing
-----------------
-
-In your **app/Config/Routes.php** file you can create routes that are only accessible from
-the CLI as easily as you would create any other route. Instead of using the ``get()``,
-``post()``, or similar method, you would use the ``cli()`` method. Everything else
-works exactly like a normal route definition:
-
-.. literalinclude:: cli/002.php
-
-For more information, see the :ref:`Routes <command-line-only-routes>` page.
-
-.. warning:: If you enable auto-routing and place the command file in **app/Controllers**,
-    anyone could access the command with the help of auto-routing via HTTP.
-
-The CLI Library
----------------
-
-The CLI library makes working with the CLI interface simple.
-It provides easy ways to output text in multiple colors to the terminal window. It also
-allows you to prompt a user for information, making it easy to build flexible, smart tools.
-
-See the :doc:`CLI Library </cli/cli_library>` page for detailed information.
diff --git a/user_guide_src/source/cli/cli_overview.rst b/user_guide_src/source/cli/cli_overview.rst
new file mode 100644
index 000000000000..b2c91344d1bc
--- /dev/null
+++ b/user_guide_src/source/cli/cli_overview.rst
@@ -0,0 +1,53 @@
+############
+CLI Overview
+############
+
+CodeIgniter 4 provides built-in command **spark** and useful commands and library.
+You can also create spark commands, and run controllers via CLI.
+
+.. contents::
+    :local:
+    :depth: 2
+
+****************
+What is the CLI?
+****************
+
+The command-line interface is a text-based method of interacting with
+computers. For more information, check the `Wikipedia
+article <https://en.wikipedia.org/wiki/Command-line_interface>`_.
+
+*****************************
+Why Run via the Command-Line?
+*****************************
+
+There are many reasons for running CodeIgniter from the command-line,
+but they are not always obvious.
+
+-  Run your cron-jobs without needing to use *wget* or *curl*.
+-  Make interactive "tasks" that can do things like set permissions,
+   prune cache folders, run backups, etc.
+-  Integrate with other applications in other languages. For example, a
+   random C++ script could call one command and run code in your models!
+
+******************
+The Spark Commands
+******************
+
+CodeIgniter ships with the official command **spark** and built-in commands.
+
+You can run the spark and see the help::
+
+    > php spark
+
+See the :doc:`spark_commands` page for detailed information.
+
+***************
+The CLI Library
+***************
+
+The CLI library makes working with the CLI interface simple.
+It provides easy ways to output text in multiple colors to the terminal window. It also
+allows you to prompt a user for information, making it easy to build flexible, smart tools.
+
+See the :doc:`CLI Library </cli/cli_library>` page for detailed information.
diff --git a/user_guide_src/source/cli/index.rst b/user_guide_src/source/cli/index.rst
index 9a8c016d6a1d..01fa70847b0a 100644
--- a/user_guide_src/source/cli/index.rst
+++ b/user_guide_src/source/cli/index.rst
@@ -7,7 +7,9 @@ CodeIgniter 4 can also be used with command line programs.
 .. toctree::
     :titlesonly:
 
-    cli
+    cli_overview
+    cli_controllers
+    spark_commands
     cli_commands
     cli_generators
     cli_library
diff --git a/user_guide_src/source/cli/spark_commands.rst b/user_guide_src/source/cli/spark_commands.rst
new file mode 100644
index 000000000000..e336623ec571
--- /dev/null
+++ b/user_guide_src/source/cli/spark_commands.rst
@@ -0,0 +1,62 @@
+##############
+Spark Commands
+##############
+
+CodeIgniter ships with the official command **spark** and built-in commands.
+
+.. contents::
+    :local:
+    :depth: 2
+
+****************
+Running Commands
+****************
+
+The commands are run from the command line, in the root directory.
+A custom script, **spark** has been provided that is used to run any of the CLI commands::
+
+    > php spark
+
+When called without specifying a command, a simple help page is displayed that also provides a list of
+available commands. You should pass the name of the command as the first argument to run that command::
+
+    > php spark migrate
+
+Some commands take additional arguments, which should be provided directly after the command, separated by spaces::
+
+    > php spark db:seed DevUserSeeder
+
+You may always pass ``--no-header`` to suppress the header output, helpful for parsing results::
+
+    > php spark cache:clear --no-header
+
+For all of the commands CodeIgniter provides, if you do not provide the required arguments, you will be prompted
+for the information it needs to run correctly::
+
+    > php spark migrate:version
+    > Version?
+
+Calling Commands
+================
+
+Commands can also be ran from within your own code. This is most often done within a controller for cronjob tasks,
+but they can be used at any time. You do this by using the ``command()`` function. This function is always available.
+
+.. literalinclude:: cli_commands/001.php
+
+The only argument is string that is the command called and any parameters. This appears exactly as you would call
+it from the command line.
+
+All output from the command that is ran is captured when not run from the command line. It is returned from the command
+so that you can choose to display it or not.
+
+******************
+Using Help Command
+******************
+
+You can get help about any CLI command using the help command as follows::
+
+    > php spark help db:seed
+
+Use the **list** command to get a list of available commands and their descriptions, sorted by categories.
+You may also use ``spark list --simple`` to get a raw list of all available commands, sorted alphabetically.

From 50d48b4db55c6e9e70788ef9b27cfa405194f4fe Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 12 May 2022 19:52:49 +0900
Subject: [PATCH 2189/2325] docs: make method names linkable

---
 user_guide_src/source/libraries/files.rst | 50 +++++++++++++++--------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/user_guide_src/source/libraries/files.rst b/user_guide_src/source/libraries/files.rst
index d3950ae6c7a3..c41af3b9bbf5 100644
--- a/user_guide_src/source/libraries/files.rst
+++ b/user_guide_src/source/libraries/files.rst
@@ -31,34 +31,39 @@ New Features
 
 In addition to all of the methods in the SplFileInfo class, you get some new tools.
 
-**getRandomName()**
+getRandomName()
+---------------
 
 You can generate a cryptographically secure random filename, with the current timestamp prepended, with the ``getRandomName()``
 method. This is especially useful to rename files when moving it so that the filename is unguessable:
 
 .. literalinclude:: files/003.php
 
-**getSize()**
+getSize()
+---------
 
 Returns the size of the uploaded file in bytes:
 
 .. literalinclude:: files/004.php
 
-**getSizeByUnit()**
+getSizeByUnit()
+---------------
 
 Returns the size of the uploaded file default in bytes. You can pass in either 'kb' or 'mb' as the first parameter to get
 the results in kilobytes or megabytes, respectively:
 
 .. literalinclude:: files/005.php
 
-**getMimeType()**
+getMimeType()
+-------------
 
 Retrieve the media type (mime type) of the file. Uses methods that are considered as secure as possible when determining
 the type of file:
 
 .. literalinclude:: files/006.php
 
-**guessExtension()**
+guessExtension()
+----------------
 
 Attempts to determine the file extension based on the trusted ``getMimeType()`` method. If the mime type is unknown,
 will return null. This is often a more trusted source than simply using the extension provided by the filename. Uses
@@ -108,12 +113,14 @@ Below are the specific methods for working with a ``FileCollection``.
 Starting a Collection
 =====================
 
-**__construct(string[] $files = [])**
+__construct(string[] $files = [])
+---------------------------------
 
 The constructor accepts an optional array of file paths to use as the initial collection. These are passed to
 ``add()`` so any files supplied by child classes in the ``$files`` will remain.
 
-**define()**
+define()
+--------
 
 Allows child classes to define their own initial files. This method is called by the constructor and allows
 predefined collections without having to use their methods. Example:
@@ -123,7 +130,8 @@ predefined collections without having to use their methods. Example:
 Now you may use the ``ConfigCollection`` anywhere in your project to access all App Config files without
 having to re-call the collection methods every time.
 
-**set(array $files)**
+set(array $files)
+-----------------
 
 Sets the list of input files to the provided string array of file paths. This will remove any existing
 files from the collection, so ``$collection->set([])`` is essentially a hard reset.
@@ -131,23 +139,26 @@ files from the collection, so ``$collection->set([])`` is essentially a hard res
 Inputting Files
 ===============
 
-**add(string[]|string $paths, bool $recursive = true)**
+add(string[]|string $paths, bool $recursive = true)
+---------------------------------------------------
 
 Adds all files indicated by the path or array of paths. If the path resolves to a directory then ``$recursive``
 will include sub-directories.
 
-**addFile(string $file)** /
-**addFiles(array $files)**
+addFile(string $file) / addFiles(array $files)
+----------------------------------------------
 
 Adds the file or files to the current list of input files. Files are absolute paths to actual files.
 
-**removeFile(string $file)** /
-**removeFiles(array $files)**
+removeFile(string $file) / removeFiles(array $files)
+----------------------------------------------------
 
 Removes the file or files from the current list of input files.
 
-**addDirectory(string $directory, bool $recursive = false)** /
-**addDirectories(array $directories, bool $recursive = false)**
+addDirectory(string $directory, bool $recursive = false)
+--------------------------------------------------------
+addDirectories(array $directories, bool $recursive = false)
+-----------------------------------------------------------
 
 Adds all files from the directory or directories, optionally recursing into sub-directories. Directories are
 absolute paths to actual directories.
@@ -155,8 +166,10 @@ absolute paths to actual directories.
 Filtering Files
 ===============
 
-**removePattern(string $pattern, string $scope = null)** /
-**retainPattern(string $pattern, string $scope = null)**
+removePattern(string $pattern, string $scope = null)
+----------------------------------------------------
+retainPattern(string $pattern, string $scope = null)
+----------------------------------------------------
 
 Filters the current file list through the pattern (and optional scope), removing or retaining matched
 files. ``$pattern`` may be a complete regex (like ``'#[A-Za-z]+\.php#'``) or a pseudo-regex similar
@@ -171,7 +184,8 @@ Examples:
 Retrieving Files
 ================
 
-**get(): string[]**
+get(): string[]
+---------------
 
 Returns an array of all the loaded input files.
 

From 7f2c708f604deae4baf071abde1d385c3eec7878 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 12 May 2022 19:57:54 +0900
Subject: [PATCH 2190/2325] docs: fix title level

---
 user_guide_src/source/libraries/files.rst | 54 +++++++++++------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/user_guide_src/source/libraries/files.rst b/user_guide_src/source/libraries/files.rst
index c41af3b9bbf5..c6fe88a7d00c 100644
--- a/user_guide_src/source/libraries/files.rst
+++ b/user_guide_src/source/libraries/files.rst
@@ -1,6 +1,6 @@
-******************
+##################
 Working with Files
-******************
+##################
 
 CodeIgniter provides a File class that wraps the `SplFileInfo <https://www.php.net/manual/en/class.splfileinfo.php>`_ class
 and provides some additional convenience methods. This class is the base class for :doc:`uploaded files </libraries/uploaded_files>`
@@ -11,7 +11,7 @@ and :doc:`images </libraries/images>`.
     :depth: 2
 
 Getting a File instance
-=======================
+***********************
 
 You create a new File instance by passing in the path to the file in the constructor.
 By default, the file does not need to exist. However, you can pass an additional argument of "true"
@@ -20,19 +20,19 @@ to check that the file exists and throw ``FileNotFoundException()`` if it does n
 .. literalinclude:: files/001.php
 
 Taking Advantage of Spl
-=======================
+***********************
 
 Once you have an instance, you have the full power of the SplFileInfo class at the ready, including:
 
 .. literalinclude:: files/002.php
 
 New Features
-============
+************
 
 In addition to all of the methods in the SplFileInfo class, you get some new tools.
 
 getRandomName()
----------------
+===============
 
 You can generate a cryptographically secure random filename, with the current timestamp prepended, with the ``getRandomName()``
 method. This is especially useful to rename files when moving it so that the filename is unguessable:
@@ -40,14 +40,14 @@ method. This is especially useful to rename files when moving it so that the fil
 .. literalinclude:: files/003.php
 
 getSize()
----------
+=========
 
 Returns the size of the uploaded file in bytes:
 
 .. literalinclude:: files/004.php
 
 getSizeByUnit()
----------------
+===============
 
 Returns the size of the uploaded file default in bytes. You can pass in either 'kb' or 'mb' as the first parameter to get
 the results in kilobytes or megabytes, respectively:
@@ -55,7 +55,7 @@ the results in kilobytes or megabytes, respectively:
 .. literalinclude:: files/005.php
 
 getMimeType()
--------------
+=============
 
 Retrieve the media type (mime type) of the file. Uses methods that are considered as secure as possible when determining
 the type of file:
@@ -63,7 +63,7 @@ the type of file:
 .. literalinclude:: files/006.php
 
 guessExtension()
-----------------
+================
 
 Attempts to determine the file extension based on the trusted ``getMimeType()`` method. If the mime type is unknown,
 will return null. This is often a more trusted source than simply using the extension provided by the filename. Uses
@@ -72,7 +72,7 @@ the values in **app/Config/Mimes.php** to determine extension:
 .. literalinclude:: files/007.php
 
 Moving Files
-------------
+============
 
 Each file can be moved to its new location with the aptly named ``move()`` method. This takes the directory to move
 the file to as the first parameter:
@@ -88,9 +88,9 @@ resulting location is needed:
 
 .. literalinclude:: files/010.php
 
-****************
+################
 File Collections
-****************
+################
 
 Working with groups of files can be cumbersome, so the framework supplies the ``FileCollection`` class to facilitate
 locating and working with groups of files across the filesystem. At its most basic, ``FileCollection`` is an index
@@ -111,16 +111,16 @@ When your collection is complete, you can use ``get()`` to retrieve the final li
 Below are the specific methods for working with a ``FileCollection``.
 
 Starting a Collection
-=====================
+*********************
 
 __construct(string[] $files = [])
----------------------------------
+=================================
 
 The constructor accepts an optional array of file paths to use as the initial collection. These are passed to
 ``add()`` so any files supplied by child classes in the ``$files`` will remain.
 
 define()
---------
+========
 
 Allows child classes to define their own initial files. This method is called by the constructor and allows
 predefined collections without having to use their methods. Example:
@@ -131,13 +131,13 @@ Now you may use the ``ConfigCollection`` anywhere in your project to access all
 having to re-call the collection methods every time.
 
 set(array $files)
------------------
+=================
 
 Sets the list of input files to the provided string array of file paths. This will remove any existing
 files from the collection, so ``$collection->set([])`` is essentially a hard reset.
 
 Inputting Files
-===============
+***************
 
 add(string[]|string $paths, bool $recursive = true)
 ---------------------------------------------------
@@ -146,30 +146,30 @@ Adds all files indicated by the path or array of paths. If the path resolves to
 will include sub-directories.
 
 addFile(string $file) / addFiles(array $files)
-----------------------------------------------
+==============================================
 
 Adds the file or files to the current list of input files. Files are absolute paths to actual files.
 
 removeFile(string $file) / removeFiles(array $files)
-----------------------------------------------------
+====================================================
 
 Removes the file or files from the current list of input files.
 
 addDirectory(string $directory, bool $recursive = false)
---------------------------------------------------------
+========================================================
 addDirectories(array $directories, bool $recursive = false)
------------------------------------------------------------
+===========================================================
 
 Adds all files from the directory or directories, optionally recursing into sub-directories. Directories are
 absolute paths to actual directories.
 
 Filtering Files
-===============
+***************
 
 removePattern(string $pattern, string $scope = null)
-----------------------------------------------------
+====================================================
 retainPattern(string $pattern, string $scope = null)
-----------------------------------------------------
+====================================================
 
 Filters the current file list through the pattern (and optional scope), removing or retaining matched
 files. ``$pattern`` may be a complete regex (like ``'#[A-Za-z]+\.php#'``) or a pseudo-regex similar
@@ -182,10 +182,10 @@ Examples:
 .. literalinclude:: files/015.php
 
 Retrieving Files
-================
+****************
 
 get(): string[]
----------------
+===============
 
 Returns an array of all the loaded input files.
 

From 924b6b55b7dfce672121d88dba678dc587f2c75d Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Tue, 17 May 2022 08:51:28 +0800
Subject: [PATCH 2191/2325] Changing the subquery builder for Oracle

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/Database/BaseBuilder.php              | 2 +-
 tests/system/Database/Builder/FromTest.php   | 8 ++++----
 tests/system/Database/Builder/SelectTest.php | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index be1aee7e1a60..b26b8484b13f 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -2846,7 +2846,7 @@ protected function buildSubquery($builder, bool $wrapped = false, string $alias
             $alias    = trim($alias);
 
             if ($alias !== '') {
-                $subquery .= ' AS ' . ($this->db->protectIdentifiers ? $this->db->escapeIdentifiers($alias) : $alias);
+                $subquery .= ' ' . ($this->db->protectIdentifiers ? $this->db->escapeIdentifiers($alias) : $alias);
             }
         }
 
diff --git a/tests/system/Database/Builder/FromTest.php b/tests/system/Database/Builder/FromTest.php
index b0e3ee335035..05e24b05b3ff 100644
--- a/tests/system/Database/Builder/FromTest.php
+++ b/tests/system/Database/Builder/FromTest.php
@@ -103,19 +103,19 @@ public function testFromReset()
 
     public function testFromSubquery()
     {
-        $expectedSQL = 'SELECT * FROM (SELECT * FROM "users") AS "alias"';
+        $expectedSQL = 'SELECT * FROM (SELECT * FROM "users") "alias"';
         $subquery    = new BaseBuilder('users', $this->db);
         $builder     = $this->db->newQuery()->fromSubquery($subquery, 'alias');
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
-        $expectedSQL = 'SELECT * FROM (SELECT "id", "name" FROM "users") AS "users_1"';
+        $expectedSQL = 'SELECT * FROM (SELECT "id", "name" FROM "users") "users_1"';
         $subquery    = (new BaseBuilder('users', $this->db))->select('id, name');
         $builder     = $this->db->newQuery()->fromSubquery($subquery, 'users_1');
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
 
-        $expectedSQL = 'SELECT * FROM (SELECT * FROM "users") AS "alias", "some_table"';
+        $expectedSQL = 'SELECT * FROM (SELECT * FROM "users") "alias", "some_table"';
         $subquery    = new BaseBuilder('users', $this->db);
         $builder     = $this->db->newQuery()->fromSubquery($subquery, 'alias')->from('some_table');
 
@@ -145,7 +145,7 @@ public function testFromSubqueryWithSQLSRV()
 
         $builder->fromSubquery($subquery, 'users_1');
 
-        $expectedSQL = 'SELECT * FROM "test"."dbo"."jobs", (SELECT * FROM "test"."dbo"."users") AS "users_1"';
+        $expectedSQL = 'SELECT * FROM "test"."dbo"."jobs", (SELECT * FROM "test"."dbo"."users") "users_1"';
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
diff --git a/tests/system/Database/Builder/SelectTest.php b/tests/system/Database/Builder/SelectTest.php
index 808e581d6ce5..7c2c44bd246f 100644
--- a/tests/system/Database/Builder/SelectTest.php
+++ b/tests/system/Database/Builder/SelectTest.php
@@ -270,7 +270,7 @@ public function testSelectSubquery()
         $subquery->select('name')->where('id', 1);
         $builder->select('name')->selectSubquery($subquery, 'country');
 
-        $expected = 'SELECT "name", (SELECT "name" FROM "countries" WHERE "id" = 1) AS "country" FROM "users"';
+        $expected = 'SELECT "name", (SELECT "name" FROM "countries" WHERE "id" = 1) "country" FROM "users"';
 
         $this->assertSame($expected, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }

From d21115993a5c3a761b02bb4d69364f6e8f439dab Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Tue, 17 May 2022 08:59:43 +0800
Subject: [PATCH 2192/2325] docs fix

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 user_guide_src/source/database/query_builder/015.php | 2 +-
 user_guide_src/source/database/query_builder/017.php | 2 +-
 user_guide_src/source/database/query_builder/018.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/database/query_builder/015.php b/user_guide_src/source/database/query_builder/015.php
index b3890e978005..b790e19e27d7 100644
--- a/user_guide_src/source/database/query_builder/015.php
+++ b/user_guide_src/source/database/query_builder/015.php
@@ -3,4 +3,4 @@
 $subquery = $db->table('countries')->select('name')->where('id', 1);
 $builder  = $db->table('users')->select('name')->selectSubquery($subquery, 'country');
 $query    = $builder->get();
-// Produces: SELECT `name`, (SELECT `name` FROM `countries` WHERE `id` = 1) AS `country` FROM `users`
+// Produces: SELECT `name`, (SELECT `name` FROM `countries` WHERE `id` = 1) `country` FROM `users`
diff --git a/user_guide_src/source/database/query_builder/017.php b/user_guide_src/source/database/query_builder/017.php
index 1ad1c917ff57..d0487570b9bb 100644
--- a/user_guide_src/source/database/query_builder/017.php
+++ b/user_guide_src/source/database/query_builder/017.php
@@ -3,4 +3,4 @@
 $subquery = $db->table('users');
 $builder  = $db->table('jobs')->fromSubquery($subquery, 'alias');
 $query    = $builder->get();
-// Produces: SELECT * FROM `jobs`, (SELECT * FROM `users`) AS `alias`
+// Produces: SELECT * FROM `jobs`, (SELECT * FROM `users`) `alias`
diff --git a/user_guide_src/source/database/query_builder/018.php b/user_guide_src/source/database/query_builder/018.php
index b33dd475b6f8..26ee565a20c9 100644
--- a/user_guide_src/source/database/query_builder/018.php
+++ b/user_guide_src/source/database/query_builder/018.php
@@ -3,4 +3,4 @@
 $subquery = $db->table('users')->select('id, name');
 $builder  = $db->newQuery()->fromSubquery($subquery, 't');
 $query    = $builder->get();
-// Produces: SELECT * FROM (SELECT `id`, `name` FROM users) AS `t`
+// Produces: SELECT * FROM (SELECT `id`, `name` FROM users) `t`

From f26943cfd8bcbad4211e5da201c66e3459498044 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 7 May 2022 11:56:11 +0900
Subject: [PATCH 2193/2325] refactor: move CodeIgniter instantiation from
 system/bootstrap.php

---
 public/index.php     | 19 +++++++++++++++++--
 spark                | 10 ++++++++--
 system/bootstrap.php | 15 ---------------
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/public/index.php b/public/index.php
index f1c2f7e1e72f..65dbf4880be5 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,5 +1,7 @@
 <?php
 
+use Config\Services;
+
 // Path to the front controller (this file)
 define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR);
 
@@ -19,14 +21,27 @@
 // This is the line that might need to be changed, depending on your folder structure.
 $pathsConfig = FCPATH . '../app/Config/Paths.php';
 // ^^^ Change this if you move your application folder
+
 require realpath($pathsConfig) ?: $pathsConfig;
 
 $paths = new Config\Paths();
 
 // Location of the framework bootstrap file.
 $bootstrap = rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
-/** @var CodeIgniter\CodeIgniter $app */
-$app     = require realpath($bootstrap) ?: $bootstrap;
+
+require realpath($bootstrap) ?: $bootstrap;
+
+/*
+ * ---------------------------------------------------------------
+ * GRAB OUR CODEIGNITER INSTANCE
+ * ---------------------------------------------------------------
+ *
+ * The CodeIgniter class contains the core functionality to make
+ * the application run, and does all of the dirty work to get
+ * the pieces all working together.
+ */
+$app = Services::codeigniter();
+$app->initialize();
 $context = is_cli() ? 'php-cli' : 'web';
 $app->setContext($context);
 
diff --git a/spark b/spark
index 7d8b8eb64557..80c4cc166bd1 100755
--- a/spark
+++ b/spark
@@ -21,6 +21,8 @@
  * this class mainly acts as a passthru to the framework itself.
  */
 
+use Config\Services;
+
 /**
  * @var bool
  *
@@ -48,6 +50,7 @@ define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR)
 // Load our paths config file
 $pathsConfig = 'app/Config/Paths.php';
 // ^^^ Change this line if you move your application folder
+
 require realpath($pathsConfig) ?: $pathsConfig;
 
 $paths = new Config\Paths();
@@ -56,8 +59,11 @@ $paths = new Config\Paths();
 chdir(FCPATH);
 
 $bootstrap = rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
-/** @var CodeIgniter\CodeIgniter $app */
-$app = require realpath($bootstrap) ?: $bootstrap;
+
+require realpath($bootstrap) ?: $bootstrap;
+
+$app = Services::codeigniter();
+$app->initialize();
 $app->setContext('spark');
 
 // Grab our Console
diff --git a/system/bootstrap.php b/system/bootstrap.php
index 4549fbc2c939..15566118cd51 100644
--- a/system/bootstrap.php
+++ b/system/bootstrap.php
@@ -131,18 +131,3 @@ class_alias('Config\Services', 'CodeIgniter\Services');
 
 // Always load the URL helper, it should be used in most of apps.
 helper('url');
-
-/*
- * ---------------------------------------------------------------
- * GRAB OUR CODEIGNITER INSTANCE
- * ---------------------------------------------------------------
- *
- * The CodeIgniter class contains the core functionality to make
- * the application run, and does all of the dirty work to get
- * the pieces all working together.
- */
-
-$app = Services::codeigniter();
-$app->initialize();
-
-return $app;

From 1adabfe043d2609be2f345f4f25b4136d308a4eb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 7 May 2022 12:51:32 +0900
Subject: [PATCH 2194/2325] refactor: remove realpath()

No need to use it.
---
 public/index.php | 4 ++--
 spark            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/index.php b/public/index.php
index 65dbf4880be5..2a67ce232b58 100644
--- a/public/index.php
+++ b/public/index.php
@@ -22,14 +22,14 @@
 $pathsConfig = FCPATH . '../app/Config/Paths.php';
 // ^^^ Change this if you move your application folder
 
-require realpath($pathsConfig) ?: $pathsConfig;
+require $pathsConfig;
 
 $paths = new Config\Paths();
 
 // Location of the framework bootstrap file.
 $bootstrap = rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
-require realpath($bootstrap) ?: $bootstrap;
+require $bootstrap;
 
 /*
  * ---------------------------------------------------------------
diff --git a/spark b/spark
index 80c4cc166bd1..3852706cac8c 100755
--- a/spark
+++ b/spark
@@ -51,7 +51,7 @@ define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR)
 $pathsConfig = 'app/Config/Paths.php';
 // ^^^ Change this line if you move your application folder
 
-require realpath($pathsConfig) ?: $pathsConfig;
+require $pathsConfig;
 
 $paths = new Config\Paths();
 
@@ -60,7 +60,7 @@ chdir(FCPATH);
 
 $bootstrap = rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
-require realpath($bootstrap) ?: $bootstrap;
+require $bootstrap;
 
 $app = Services::codeigniter();
 $app->initialize();

From b6a27dc5127801df9c512be16fa4c6bb8d57c3e6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 7 May 2022 13:04:29 +0900
Subject: [PATCH 2195/2325] chore: tweak the files so that their contents are
 as same as possible.

---
 public/index.php | 10 ++++------
 spark            | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/public/index.php b/public/index.php
index 2a67ce232b58..f385a8367293 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,7 +1,5 @@
 <?php
 
-use Config\Services;
-
 // Path to the front controller (this file)
 define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR);
 
@@ -15,13 +13,13 @@
  */
 
 // Ensure the current directory is pointing to the front controller's directory
-chdir(__DIR__);
+chdir(FCPATH);
 
-// Load our paths config file
 // This is the line that might need to be changed, depending on your folder structure.
 $pathsConfig = FCPATH . '../app/Config/Paths.php';
-// ^^^ Change this if you move your application folder
+// ^^^ Change this line if you move your application folder
 
+// Load our paths config file
 require $pathsConfig;
 
 $paths = new Config\Paths();
@@ -40,7 +38,7 @@
  * the application run, and does all of the dirty work to get
  * the pieces all working together.
  */
-$app = Services::codeigniter();
+$app = Config\Services::codeigniter();
 $app->initialize();
 $context = is_cli() ? 'php-cli' : 'web';
 $app->setContext($context);
diff --git a/spark b/spark
index 3852706cac8c..7624023fa121 100755
--- a/spark
+++ b/spark
@@ -21,8 +21,6 @@
  * this class mainly acts as a passthru to the framework itself.
  */
 
-use Config\Services;
-
 /**
  * @var bool
  *
@@ -30,6 +28,9 @@ use Config\Services;
  */
 define('SPARKED', true);
 
+// Path to the front controller
+define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR);
+
 /*
  *---------------------------------------------------------------
  * BOOTSTRAP THE APPLICATION
@@ -39,30 +40,29 @@ define('SPARKED', true);
  * and fires up an environment-specific bootstrapping.
  */
 
+// Ensure the current directory is pointing to the front controller's directory
+chdir(FCPATH);
+
 // Refuse to run when called from php-cgi
 if (strpos(PHP_SAPI, 'cgi') === 0) {
     exit("The cli tool is not supported when running php-cgi. It needs php-cli to function!\n\n");
 }
 
-// Path to the front controller
-define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR);
-
-// Load our paths config file
-$pathsConfig = 'app/Config/Paths.php';
+// This is the line that might need to be changed, depending on your folder structure.
+$pathsConfig = FCPATH . '../app/Config/Paths.php';
 // ^^^ Change this line if you move your application folder
 
+// Load our paths config file
 require $pathsConfig;
 
 $paths = new Config\Paths();
 
-// Ensure the current directory is pointing to the front controller's directory
-chdir(FCPATH);
-
+// Location of the framework bootstrap file.
 $bootstrap = rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
 require $bootstrap;
 
-$app = Services::codeigniter();
+$app = Config\Services::codeigniter();
 $app->initialize();
 $app->setContext('spark');
 

From e2e94e8f0db1aad21196243e1bec253e1eae1572 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 7 May 2022 13:18:24 +0900
Subject: [PATCH 2196/2325] refactor: move DotEnv::load() from
 system/bootstrap.php

---
 public/index.php     | 6 ++++++
 spark                | 6 ++++++
 system/bootstrap.php | 7 -------
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/public/index.php b/public/index.php
index f385a8367293..973433c70882 100644
--- a/public/index.php
+++ b/public/index.php
@@ -29,6 +29,12 @@
 
 require $bootstrap;
 
+// Load environment settings from .env files into $_SERVER and $_ENV
+require_once SYSTEMPATH . 'Config/DotEnv.php';
+
+$env = new CodeIgniter\Config\DotEnv(ROOTPATH);
+$env->load();
+
 /*
  * ---------------------------------------------------------------
  * GRAB OUR CODEIGNITER INSTANCE
diff --git a/spark b/spark
index 7624023fa121..7edc4c4f4992 100755
--- a/spark
+++ b/spark
@@ -62,6 +62,12 @@ $bootstrap = rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'boo
 
 require $bootstrap;
 
+// Load environment settings from .env files into $_SERVER and $_ENV
+require_once SYSTEMPATH . 'Config/DotEnv.php';
+
+$env = new CodeIgniter\Config\DotEnv(ROOTPATH);
+$env->load();
+
 $app = Config\Services::codeigniter();
 $app->initialize();
 $app->setContext('spark');
diff --git a/system/bootstrap.php b/system/bootstrap.php
index 15566118cd51..7fae1a2a417e 100644
--- a/system/bootstrap.php
+++ b/system/bootstrap.php
@@ -9,7 +9,6 @@
  * the LICENSE file that was distributed with this source code.
  */
 
-use CodeIgniter\Config\DotEnv;
 use Config\Autoload;
 use Config\Modules;
 use Config\Paths;
@@ -123,11 +122,5 @@ class_alias('Config\Services', 'CodeIgniter\Services');
     require_once COMPOSER_PATH;
 }
 
-// Load environment settings from .env files into $_SERVER and $_ENV
-require_once SYSTEMPATH . 'Config/DotEnv.php';
-
-$env = new DotEnv(ROOTPATH);
-$env->load();
-
 // Always load the URL helper, it should be used in most of apps.
 helper('url');

From 1f6761b96c5b83dad9e4ad8b0269317bc2e578f1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 7 May 2022 13:20:13 +0900
Subject: [PATCH 2197/2325] refactor: move SAPI check up

---
 spark | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spark b/spark
index 7edc4c4f4992..63c3de77e04e 100755
--- a/spark
+++ b/spark
@@ -21,6 +21,11 @@
  * this class mainly acts as a passthru to the framework itself.
  */
 
+// Refuse to run when called from php-cgi
+if (strpos(PHP_SAPI, 'cgi') === 0) {
+    exit("The cli tool is not supported when running php-cgi. It needs php-cli to function!\n\n");
+}
+
 /**
  * @var bool
  *
@@ -43,11 +48,6 @@ define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR)
 // Ensure the current directory is pointing to the front controller's directory
 chdir(FCPATH);
 
-// Refuse to run when called from php-cgi
-if (strpos(PHP_SAPI, 'cgi') === 0) {
-    exit("The cli tool is not supported when running php-cgi. It needs php-cli to function!\n\n");
-}
-
 // This is the line that might need to be changed, depending on your folder structure.
 $pathsConfig = FCPATH . '../app/Config/Paths.php';
 // ^^^ Change this line if you move your application folder

From 788072724e659660b6a71bd03f3d3e51c9496198 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 7 May 2022 13:24:48 +0900
Subject: [PATCH 2198/2325] refactor: move error reporting config up

---
 spark | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spark b/spark
index 63c3de77e04e..cb1ee1bd65c9 100755
--- a/spark
+++ b/spark
@@ -26,6 +26,10 @@ if (strpos(PHP_SAPI, 'cgi') === 0) {
     exit("The cli tool is not supported when running php-cgi. It needs php-cli to function!\n\n");
 }
 
+// We want errors to be shown when using it from the CLI.
+error_reporting(-1);
+ini_set('display_errors', '1');
+
 /**
  * @var bool
  *
@@ -75,10 +79,6 @@ $app->setContext('spark');
 // Grab our Console
 $console = new CodeIgniter\CLI\Console($app);
 
-// We want errors to be shown when using it from the CLI.
-error_reporting(-1);
-ini_set('display_errors', '1');
-
 // Show basic information before we do anything else.
 if (is_int($suppress = array_search('--no-header', $_SERVER['argv'], true))) {
     unset($_SERVER['argv'][$suppress]); // @codeCoverageIgnore

From a2a9b6c11886735d2fd1ca5798a0ad6a43582b59 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 7 May 2022 13:51:40 +0900
Subject: [PATCH 2199/2325] refactor: remove variables

---
 public/index.php | 14 ++++----------
 spark            | 14 ++++----------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/public/index.php b/public/index.php
index 973433c70882..33601ff9b1b1 100644
--- a/public/index.php
+++ b/public/index.php
@@ -15,25 +15,19 @@
 // Ensure the current directory is pointing to the front controller's directory
 chdir(FCPATH);
 
+// Load our paths config file
 // This is the line that might need to be changed, depending on your folder structure.
-$pathsConfig = FCPATH . '../app/Config/Paths.php';
+require FCPATH . '../app/Config/Paths.php';
 // ^^^ Change this line if you move your application folder
 
-// Load our paths config file
-require $pathsConfig;
-
 $paths = new Config\Paths();
 
 // Location of the framework bootstrap file.
-$bootstrap = rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
-
-require $bootstrap;
+require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
 // Load environment settings from .env files into $_SERVER and $_ENV
 require_once SYSTEMPATH . 'Config/DotEnv.php';
-
-$env = new CodeIgniter\Config\DotEnv(ROOTPATH);
-$env->load();
+(new CodeIgniter\Config\DotEnv(ROOTPATH))->load();
 
 /*
  * ---------------------------------------------------------------
diff --git a/spark b/spark
index cb1ee1bd65c9..fd453e84ce25 100755
--- a/spark
+++ b/spark
@@ -52,25 +52,19 @@ define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR)
 // Ensure the current directory is pointing to the front controller's directory
 chdir(FCPATH);
 
+// Load our paths config file
 // This is the line that might need to be changed, depending on your folder structure.
-$pathsConfig = FCPATH . '../app/Config/Paths.php';
+require FCPATH . '../app/Config/Paths.php';
 // ^^^ Change this line if you move your application folder
 
-// Load our paths config file
-require $pathsConfig;
-
 $paths = new Config\Paths();
 
 // Location of the framework bootstrap file.
-$bootstrap = rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
-
-require $bootstrap;
+require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
 
 // Load environment settings from .env files into $_SERVER and $_ENV
 require_once SYSTEMPATH . 'Config/DotEnv.php';
-
-$env = new CodeIgniter\Config\DotEnv(ROOTPATH);
-$env->load();
+(new CodeIgniter\Config\DotEnv(ROOTPATH))->load();
 
 $app = Config\Services::codeigniter();
 $app->initialize();

From b2ed452f6575836328bdd7b4f04810805844aee5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 8 May 2022 07:30:48 +0900
Subject: [PATCH 2200/2325] refactor: move chdir() up

---
 public/index.php     | 8 +++++---
 spark                | 7 ++++---
 system/bootstrap.php | 1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/public/index.php b/public/index.php
index 33601ff9b1b1..51f4be81e731 100644
--- a/public/index.php
+++ b/public/index.php
@@ -3,6 +3,9 @@
 // Path to the front controller (this file)
 define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR);
 
+// Ensure the current directory is pointing to the front controller's directory
+chdir(FCPATH);
+
 /*
  *---------------------------------------------------------------
  * BOOTSTRAP THE APPLICATION
@@ -12,9 +15,6 @@
  * and fires up an environment-specific bootstrapping.
  */
 
-// Ensure the current directory is pointing to the front controller's directory
-chdir(FCPATH);
-
 // Load our paths config file
 // This is the line that might need to be changed, depending on your folder structure.
 require FCPATH . '../app/Config/Paths.php';
@@ -38,6 +38,7 @@
  * the application run, and does all of the dirty work to get
  * the pieces all working together.
  */
+
 $app = Config\Services::codeigniter();
 $app->initialize();
 $context = is_cli() ? 'php-cli' : 'web';
@@ -50,4 +51,5 @@
  * Now that everything is setup, it's time to actually fire
  * up the engines and make this app do its thang.
  */
+
 $app->run();
diff --git a/spark b/spark
index fd453e84ce25..225422aace74 100755
--- a/spark
+++ b/spark
@@ -40,6 +40,9 @@ define('SPARKED', true);
 // Path to the front controller
 define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR);
 
+// Ensure the current directory is pointing to the front controller's directory
+chdir(FCPATH);
+
 /*
  *---------------------------------------------------------------
  * BOOTSTRAP THE APPLICATION
@@ -49,9 +52,6 @@ define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR)
  * and fires up an environment-specific bootstrapping.
  */
 
-// Ensure the current directory is pointing to the front controller's directory
-chdir(FCPATH);
-
 // Load our paths config file
 // This is the line that might need to be changed, depending on your folder structure.
 require FCPATH . '../app/Config/Paths.php';
@@ -66,6 +66,7 @@ require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstra
 require_once SYSTEMPATH . 'Config/DotEnv.php';
 (new CodeIgniter\Config\DotEnv(ROOTPATH))->load();
 
+// Grab our CodeIgniter
 $app = Config\Services::codeigniter();
 $app->initialize();
 $app->setContext('spark');
diff --git a/system/bootstrap.php b/system/bootstrap.php
index 7fae1a2a417e..fec0e5c14b02 100644
--- a/system/bootstrap.php
+++ b/system/bootstrap.php
@@ -66,6 +66,7 @@
  * GRAB OUR CONSTANTS & COMMON
  * ---------------------------------------------------------------
  */
+
 if (! defined('APP_NAMESPACE')) {
     require_once APPPATH . 'Config/Constants.php';
 }

From 6545d0dd5f18e2d16b33ac8f7f6b0774de8a382a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 8 May 2022 08:42:39 +0900
Subject: [PATCH 2201/2325] docs: add user guide

---
 user_guide_src/source/changelogs/v4.2.0.rst        | 1 +
 user_guide_src/source/installation/upgrade_420.rst | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index a75a88281025..93c81004522c 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -16,6 +16,7 @@ BREAKING
 - The ``CodeIgniter\CodeIgniter`` class has a new property ``$context`` and it must have the correct context at runtime. So the following files have been changed:
     - ``public/index.php``
     - ``spark``
+- The ``system/bootstrap.php`` no longer returns a ``CodeIgniter`` instance, and does not load ``.env`` file.
 - The method signature of ``CodeIgniter\CLI\CommandRunner::_remap()`` has been changed to fix a bug.
 - The ``CodeIgniter\Autoloader\Autoloader::initialize()`` has changed the behavior to fix a bug. It used to use Composer classmap only when ``$modules->discoverInComposer`` is true. Now it always uses the Composer classmap if Composer is available.
 - The color code output by :ref:`CLI::color() <cli-library-color>` has been changed to fix a bug.
diff --git a/user_guide_src/source/installation/upgrade_420.rst b/user_guide_src/source/installation/upgrade_420.rst
index daf89b39290f..7b44f979e1c1 100644
--- a/user_guide_src/source/installation/upgrade_420.rst
+++ b/user_guide_src/source/installation/upgrade_420.rst
@@ -24,7 +24,7 @@ The following files received significant changes and
 Breaking Changes
 ****************
 
-
+- The ``system/bootstrap.php`` file no longer returns a ``CodeIgniter`` instance, and does not load ``.env`` file. The ``index.php`` and ``spark`` now do them. If you have code that expects these behaviors, it will no longer work and must be modified.
 
 Breaking Enhancements
 *********************

From caea4b6cba77d001933cf0bbcdb5d5aff1016a36 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 10 May 2022 21:53:22 +0900
Subject: [PATCH 2202/2325] docs: fix by proofreading

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/installation/upgrade_420.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/installation/upgrade_420.rst b/user_guide_src/source/installation/upgrade_420.rst
index 7b44f979e1c1..dc77c28ed85e 100644
--- a/user_guide_src/source/installation/upgrade_420.rst
+++ b/user_guide_src/source/installation/upgrade_420.rst
@@ -24,7 +24,7 @@ The following files received significant changes and
 Breaking Changes
 ****************
 
-- The ``system/bootstrap.php`` file no longer returns a ``CodeIgniter`` instance, and does not load ``.env`` file. The ``index.php`` and ``spark`` now do them. If you have code that expects these behaviors, it will no longer work and must be modified.
+- The ``system/bootstrap.php`` file no longer returns a ``CodeIgniter`` instance, and does not load the ``.env`` file (now handled in ``index.php`` and ``spark``). If you have code that expects these behaviors it will no longer work and must be modified.
 
 Breaking Enhancements
 *********************

From d3baa55fc4c4fc546ed5610361d51d032fe036bb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 17 May 2022 15:00:04 +0900
Subject: [PATCH 2203/2325] docs: add why or so

---
 user_guide_src/source/changelogs/v4.2.0.rst        | 2 +-
 user_guide_src/source/installation/upgrade_420.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 93c81004522c..c5f25f1b8396 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -16,7 +16,7 @@ BREAKING
 - The ``CodeIgniter\CodeIgniter`` class has a new property ``$context`` and it must have the correct context at runtime. So the following files have been changed:
     - ``public/index.php``
     - ``spark``
-- The ``system/bootstrap.php`` no longer returns a ``CodeIgniter`` instance, and does not load ``.env`` file.
+- The ``system/bootstrap.php`` file has been modified to easily implement `Preloading <https://www.php.net/manual/en/opcache.preloading.php>`_. Returning a ``CodeIgniter`` instance and loading ``.env`` file have been moved to ``index.php`` and ``spark``.
 - The method signature of ``CodeIgniter\CLI\CommandRunner::_remap()`` has been changed to fix a bug.
 - The ``CodeIgniter\Autoloader\Autoloader::initialize()`` has changed the behavior to fix a bug. It used to use Composer classmap only when ``$modules->discoverInComposer`` is true. Now it always uses the Composer classmap if Composer is available.
 - The color code output by :ref:`CLI::color() <cli-library-color>` has been changed to fix a bug.
diff --git a/user_guide_src/source/installation/upgrade_420.rst b/user_guide_src/source/installation/upgrade_420.rst
index dc77c28ed85e..4e39cb3aee51 100644
--- a/user_guide_src/source/installation/upgrade_420.rst
+++ b/user_guide_src/source/installation/upgrade_420.rst
@@ -24,7 +24,7 @@ The following files received significant changes and
 Breaking Changes
 ****************
 
-- The ``system/bootstrap.php`` file no longer returns a ``CodeIgniter`` instance, and does not load the ``.env`` file (now handled in ``index.php`` and ``spark``). If you have code that expects these behaviors it will no longer work and must be modified.
+- The ``system/bootstrap.php`` file no longer returns a ``CodeIgniter`` instance, and does not load the ``.env`` file (now handled in ``index.php`` and ``spark``). If you have code that expects these behaviors it will no longer work and must be modified. This has been changed to make `Preloading <https://www.php.net/manual/en/opcache.preloading.php>`_ easier to implement.
 
 Breaking Enhancements
 *********************

From 35e178db1bea5d4946258dfd4d2c5a959890feeb Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 17 May 2022 15:16:00 +0900
Subject: [PATCH 2204/2325] refactor: deprecate EVENT_PRIORITY_* and add class
 constants

---
 app/Config/Constants.php           | 15 +++++++++++++++
 system/Events/Events.php           |  8 ++++----
 tests/system/Events/EventsTest.php |  6 +++---
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/app/Config/Constants.php b/app/Config/Constants.php
index 2290758cebee..0c1b53487cd9 100644
--- a/app/Config/Constants.php
+++ b/app/Config/Constants.php
@@ -77,3 +77,18 @@
 defined('EXIT_DATABASE')       || define('EXIT_DATABASE', 8); // database error
 defined('EXIT__AUTO_MIN')      || define('EXIT__AUTO_MIN', 9); // lowest automatically-assigned error code
 defined('EXIT__AUTO_MAX')      || define('EXIT__AUTO_MAX', 125); // highest automatically-assigned error code
+
+/**
+ * @deprecated Use \CodeIgniter\Events\Events::PRIORITY_LOW instead.
+ */
+define('EVENT_PRIORITY_LOW', 200);
+
+/**
+ * @deprecated Use \CodeIgniter\Events\Events::PRIORITY_NORMAL instead.
+ */
+define('EVENT_PRIORITY_NORMAL', 100);
+
+/**
+ * @deprecated Use \CodeIgniter\Events\Events::PRIORITY_HIGH instead.
+ */
+define('EVENT_PRIORITY_HIGH', 10);
diff --git a/system/Events/Events.php b/system/Events/Events.php
index ac08107459ca..f3d1c4d67128 100644
--- a/system/Events/Events.php
+++ b/system/Events/Events.php
@@ -14,15 +14,15 @@
 use Config\Modules;
 use Config\Services;
 
-define('EVENT_PRIORITY_LOW', 200);
-define('EVENT_PRIORITY_NORMAL', 100);
-define('EVENT_PRIORITY_HIGH', 10);
-
 /**
  * Events
  */
 class Events
 {
+    public const PRIORITY_LOW    = 200;
+    public const PRIORITY_NORMAL = 100;
+    public const PRIORITY_HIGH   = 10;
+
     /**
      * The list of listeners.
      *
diff --git a/tests/system/Events/EventsTest.php b/tests/system/Events/EventsTest.php
index 571118a6d534..77b233f9c1d5 100644
--- a/tests/system/Events/EventsTest.php
+++ b/tests/system/Events/EventsTest.php
@@ -157,15 +157,15 @@ public function testPriorityWithMultiple()
 
         Events::on('foo', static function () use (&$result) {
             $result[] = 'a';
-        }, EVENT_PRIORITY_NORMAL);
+        }, Events::PRIORITY_NORMAL);
 
         Events::on('foo', static function () use (&$result) {
             $result[] = 'b';
-        }, EVENT_PRIORITY_LOW);
+        }, Events::PRIORITY_LOW);
 
         Events::on('foo', static function () use (&$result) {
             $result[] = 'c';
-        }, EVENT_PRIORITY_HIGH);
+        }, Events::PRIORITY_HIGH);
 
         Events::on('foo', static function () use (&$result) {
             $result[] = 'd';

From 98b3ad2c3bf52a76306b5e8361a19aae57260c6d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 17 May 2022 15:36:23 +0900
Subject: [PATCH 2205/2325] docs: update user guide

---
 user_guide_src/source/changelogs/v4.2.0.rst        | 1 +
 user_guide_src/source/extending/events.rst         | 4 +++-
 user_guide_src/source/extending/events/004.php     | 8 +++++---
 user_guide_src/source/installation/upgrade_420.rst | 8 ++++++++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index a75a88281025..8fa41aa1dd8c 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -102,6 +102,7 @@ Deprecations
 - ``CodeIgniter\Router\Router::setDefaultController()`` is deprecated.
 - The constant ``SPARKED`` in **spark** is deprecated. Use the ``$context`` property in ``CodeIgniter\CodeIgniter`` instead.
 - ``CodeIgniter\Autoloader\Autoloader::discoverComposerNamespaces()`` is deprecated, and no longer used.
+- The constants ``EVENT_PRIORITY_LOW``, ``EVENT_PRIORITY_NORMAL`` and ``EVENT_PRIORITY_HIGH`` are deprecated. Use the class constants ``CodeIgniter\Events\Events::PRIORITY_LOW``, ``CodeIgniter\Events\Events::PRIORITY_NORMAL`` and ``CodeIgniter\Events\Events::PRIORITY_HIGH`` instead.
 
 Bugs Fixed
 **********
diff --git a/user_guide_src/source/extending/events.rst b/user_guide_src/source/extending/events.rst
index 1b2c53a918cd..aa4f99e797c8 100644
--- a/user_guide_src/source/extending/events.rst
+++ b/user_guide_src/source/extending/events.rst
@@ -46,11 +46,13 @@ are executed first, with a value of 1 having the highest priority, and there bei
 
 Any subscribers with the same priority will be executed in the order they were defined.
 
-Three constants are defined for your use, that set some helpful ranges on the values. You are not required to use these
+Since v4.2.0, three class constants are defined for your use, that set some helpful ranges on the values. You are not required to use these
 but you might find they aid readability:
 
 .. literalinclude:: events/004.php
 
+.. note:: The constants ``EVENT_PRIORITY_LOW``, ``EVENT_PRIORITY_NORMAL`` and ``EVENT_PRIORITY_HIGH`` are deprecated, and the definitions are moved to ``app/Config/Constants.php``.
+
 Once sorted, all subscribers are executed in order. If any subscriber returns a boolean false value, then execution of
 the subscribers will stop.
 
diff --git a/user_guide_src/source/extending/events/004.php b/user_guide_src/source/extending/events/004.php
index df0ce3b16958..c211495e3e3c 100644
--- a/user_guide_src/source/extending/events/004.php
+++ b/user_guide_src/source/extending/events/004.php
@@ -1,5 +1,7 @@
 <?php
 
-define('EVENT_PRIORITY_LOW', 200);
-define('EVENT_PRIORITY_NORMAL', 100);
-define('EVENT_PRIORITY_HIGH', 10);
+use CodeIgniter\Events\Events;
+
+Events::PRIORITY_LOW;    // 200
+Events::PRIORITY_NORMAL; // 100
+Events::PRIORITY_HIGH;   // 10
diff --git a/user_guide_src/source/installation/upgrade_420.rst b/user_guide_src/source/installation/upgrade_420.rst
index daf89b39290f..ca3613365c4f 100644
--- a/user_guide_src/source/installation/upgrade_420.rst
+++ b/user_guide_src/source/installation/upgrade_420.rst
@@ -15,12 +15,20 @@ Please refer to the upgrade instructions corresponding to your installation meth
 Mandatory File Changes
 **********************
 
+index.php and spark
+===================
+
 The following files received significant changes and
 **you must merge the updated versions** with your application:
 
 * ``public/index.php``
 * ``spark``
 
+Config/Constants.php
+====================
+
+The constants ``EVENT_PRIORITY_LOW``, ``EVENT_PRIORITY_NORMAL`` and ``EVENT_PRIORITY_HIGH`` are deprecated, and the definitions are moved to ``app/Config/Constants.php``. If you use these constants, define them in ``app/Config/Constants.php``. Or use new class constants ``CodeIgniter\Events\Events::PRIORITY_LOW``, ``CodeIgniter\Events\Events::PRIORITY_NORMAL`` and ``CodeIgniter\Events\Events::PRIORITY_HIGH``.
+
 Breaking Changes
 ****************
 

From 945df7b5925874a387818f5da2eb963e7ea54ce3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 17 May 2022 15:57:08 +0900
Subject: [PATCH 2206/2325] docs: add how to link

---
 contributing/documentation.rst | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/contributing/documentation.rst b/contributing/documentation.rst
index eba3eb99437e..11de48c7dd21 100644
--- a/contributing/documentation.rst
+++ b/contributing/documentation.rst
@@ -9,9 +9,7 @@ on readability and user friendliness.
 While they can be quite technical, we always write for humans!
 
 A local table of contents should always be included, like the one below.
-It is created automatically by inserting the following:
-
-::
+It is created automatically by inserting the following::
 
     .. contents::
         :local:
@@ -86,8 +84,8 @@ create these with the following tab triggers::
 References
 **********
 
-References to a Section
-=======================
+To a Section
+============
 
 If you need to link to a specific section, the first you add the label before a header::
 
@@ -102,11 +100,23 @@ And then you can reference it like this::
 
     See :ref:`curlrequest-request-options-headers` for how to add.
 
-References to a Page
-====================
+To a Section in the Page
+========================
+
+You can reference a section in the current page like the following::
+
+     See `Result Rows`_
+
+To a Page
+=========
 
 You can reference a page like the following::
 
-    :doc:`Session <../libraries/sessions>` library
+    See :doc:`Session <../libraries/sessions>` library
+
+    See :doc:`../libraries/sessions` library
+
+To a URL
+========
 
-    :doc:`../libraries/sessions` library
+    `CodeIgniter 4 framework <https://github.com/codeigniter4/framework>`_

From 4d2c97bbeccd102d2773579a3f30080d7f0a5cf7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 17 May 2022 16:24:55 +0900
Subject: [PATCH 2207/2325] docs: fix section level

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

diff --git a/user_guide_src/source/database/helpers.rst b/user_guide_src/source/database/helpers.rst
index 223b797ec640..40a06bb85c9b 100644
--- a/user_guide_src/source/database/helpers.rst
+++ b/user_guide_src/source/database/helpers.rst
@@ -7,7 +7,7 @@ Query Helper Methods
     :depth: 2
 
 Information From Executing a Query
-==================================
+**********************************
 
 **$db->insertID()**
 
@@ -32,7 +32,7 @@ Displays the number of affected rows, when doing "write" type queries
 Returns a Query object that represents the last query that was run (the query string, not the result).
 
 Information About Your Database
-===============================
+*******************************
 
 **$db->countAll()**
 

From 52b48c383d2d121c760a97c47f4de272f5f408ec Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 17 May 2022 16:28:33 +0900
Subject: [PATCH 2208/2325] docs: make method names linkable

---
 user_guide_src/source/database/helpers.rst | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/user_guide_src/source/database/helpers.rst b/user_guide_src/source/database/helpers.rst
index 40a06bb85c9b..c092edef3076 100644
--- a/user_guide_src/source/database/helpers.rst
+++ b/user_guide_src/source/database/helpers.rst
@@ -9,7 +9,8 @@ Query Helper Methods
 Information From Executing a Query
 **********************************
 
-**$db->insertID()**
+$db->insertID()
+===============
 
 The insert ID number when performing database inserts.
 
@@ -17,7 +18,8 @@ The insert ID number when performing database inserts.
     driver, this function requires a $name parameter, which specifies the
     appropriate sequence to check for the insert id.
 
-**$db->affectedRows()**
+$db->affectedRows()
+===================
 
 Displays the number of affected rows, when doing "write" type queries
 (insert, update, etc.).
@@ -27,14 +29,16 @@ Displays the number of affected rows, when doing "write" type queries
     affected rows. By default this hack is enabled but it can be turned off
     in the database driver file.
 
-**$db->getLastQuery()**
+$db->getLastQuery()
+===================
 
 Returns a Query object that represents the last query that was run (the query string, not the result).
 
 Information About Your Database
 *******************************
 
-**$db->countAll()**
+$db->countAll()
+===============
 
 Permits you to determine the number of rows in a particular table.
 Submit the table name in the first parameter. This is part of Query Builder.
@@ -42,7 +46,8 @@ Example:
 
 .. literalinclude:: helpers/001.php
 
-**$db->countAllResults()**
+$db->countAllResults()
+======================
 
 Permits you to determine the number of rows in a particular result set.
 Submit the table name in the first parameter. This is part of Query Builder.
@@ -50,14 +55,16 @@ Example:
 
 .. literalinclude:: helpers/002.php
 
-**$db->getPlatform()**
+$db->getPlatform()
+==================
 
 Outputs the database platform you are running (MySQL, MS SQL, Postgres,
 etc...):
 
 .. literalinclude:: helpers/003.php
 
-**$db->getVersion()**
+$db->getVersion()
+=================
 
 Outputs the database version you are running:
 

From 8e71cd6093b11c897a403241c3160472414cf21c Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Wed, 18 May 2022 10:14:42 +0800
Subject: [PATCH 2209/2325] Fix: Route placeholder {locale}

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/Router/Router.php           | 23 ++++++++++-------------
 tests/system/Router/RouterTest.php |  6 ++++++
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/system/Router/Router.php b/system/Router/Router.php
index ea5eb79b8d70..c5985f95af30 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -403,9 +403,6 @@ protected function checkRoutes(string $uri): bool
 
         // Loop through the route array looking for wildcards
         foreach ($routes as $routeKey => $handler) {
-            // Reset localeSegment
-            $localeSegment = null;
-
             $routeKey = $routeKey === '/'
                 ? $routeKey
                 : ltrim($routeKey, '/ ');
@@ -414,12 +411,7 @@ protected function checkRoutes(string $uri): bool
 
             // Are we dealing with a locale?
             if (strpos($routeKey, '{locale}') !== false) {
-                $localeSegment = array_search('{locale}', preg_split('/[\/]*((^[a-zA-Z0-9])|\(([^()]*)\))*[\/]+/m', $routeKey), true);
-
-                // Replace it with a regex so it
-                // will actually match.
-                $routeKey = str_replace('/', '\/', $routeKey);
-                $routeKey = str_replace('{locale}', '[^\/]+', $routeKey);
+                $routeKey = str_replace('{locale}', '[^/]+', $routeKey);
             }
 
             // Does the RegEx match?
@@ -440,10 +432,15 @@ protected function checkRoutes(string $uri): bool
                 }
                 // Store our locale so CodeIgniter object can
                 // assign it to the Request.
-                if (isset($localeSegment)) {
-                    // The following may be inefficient, but doesn't upset NetBeans :-/
-                    $temp                 = (explode('/', $uri));
-                    $this->detectedLocale = $temp[$localeSegment];
+                if (strpos($matchedKey, '{locale}') !== false) {
+                    preg_match(
+                        '#^' . str_replace('{locale}', '(?<locale>[^/]+)', $matchedKey) . '$#u',
+                        $uri,
+                        $matched
+                    );
+
+                    $this->detectedLocale = $matched['locale'];
+                    unset($matched);
                 }
 
                 // Are we using Closures? If so, then we need
diff --git a/tests/system/Router/RouterTest.php b/tests/system/Router/RouterTest.php
index d2e48bff992d..db9cd9c5e7e9 100644
--- a/tests/system/Router/RouterTest.php
+++ b/tests/system/Router/RouterTest.php
@@ -47,6 +47,7 @@ protected function setUp(): void
             'books/(:num)/(:alpha)/(:num)'                    => 'Blog::show/$3/$1',
             'closure/(:num)/(:alpha)'                         => static fn ($num, $str) => $num . '-' . $str,
             '{locale}/pages'                                  => 'App\Pages::list_all',
+            'test/(:any)/lang/{locale}'                       => 'App\Pages::list_all',
             'admin/admins'                                    => 'App\Admin\Admins::list_all',
             'admin/admins/edit/(:any)'                        => 'App/Admin/Admins::edit_show/$1',
             '/some/slash'                                     => 'App\Slash::index',
@@ -402,6 +403,11 @@ public function testDetectsLocales()
 
         $this->assertTrue($router->hasLocale());
         $this->assertSame('fr', $router->getLocale());
+
+        $router->handle('test/123/lang/bg');
+
+        $this->assertTrue($router->hasLocale());
+        $this->assertSame('bg', $router->getLocale());
     }
 
     public function testRouteResource()

From abdeaa560d2a1e1380d6834d2d7115250d04fe3b Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Wed, 18 May 2022 11:13:53 +0800
Subject: [PATCH 2210/2325] Router class optimization.

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 phpstan-baseline.neon.dist |  2 +-
 system/Router/Router.php   | 59 ++++++++++++++++----------------------
 2 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index 58c7bd61823c..9c7258cefc44 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -687,7 +687,7 @@ parameters:
 
 		-
 			message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getRoutesOptions\\(\\)\\.$#"
-			count: 2
+			count: 1
 			path: system/Router/Router.php
 
 		-
diff --git a/system/Router/Router.php b/system/Router/Router.php
index ea5eb79b8d70..e8eaa94e5c82 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -457,54 +457,31 @@ protected function checkRoutes(string $uri): bool
 
                     $this->params = $matches;
 
-                    $this->matchedRoute = [
-                        $matchedKey,
-                        $handler,
-                    ];
-
-                    $this->matchedRouteOptions = $this->collection->getRoutesOptions($matchedKey);
+                    $this->setMatchedRoute($matchedKey, $handler);
 
                     return true;
                 }
 
-                if (strpos($handler, '$') !== false && strpos($routeKey, '(') !== false) {
-                    // Using back-references
+                [$controller, ] = explode('::', $handler);
 
+                // Checks `/` in controller name
+                if (strpos($controller, '/') !== false) {
+                    throw RouterException::forInvalidControllerName($handler);
+                }
+
+                if (strpos($handler, '$') !== false && strpos($routeKey, '(') !== false) {
                     // Checks dynamic controller
-                    [$controller, ] = explode('::', $handler);
                     if (strpos($controller, '$') !== false) {
                         throw RouterException::forDynamicController($handler);
                     }
 
-                    // Checks `/` in controller name
-                    if (strpos($controller, '/') !== false) {
-                        throw RouterException::forInvalidControllerName($handler);
-                    }
-
-                    if (strpos($routeKey, '/') !== false) {
-                        $replacekey = str_replace('/(.*)', '', $routeKey);
-                        $handler    = preg_replace('#^' . $routeKey . '$#u', $handler, $uri);
-                        $handler    = str_replace($replacekey, str_replace('/', '\\', $replacekey), $handler);
-                    } else {
-                        $handler = preg_replace('#^' . $routeKey . '$#u', $handler, $uri);
-                    }
-                } elseif (strpos($handler, '/') !== false) {
-                    [$controller, $method] = explode('::', $handler);
-
-                    // Only replace slashes in the controller, not in the method.
-                    $controller = str_replace('/', '\\', $controller);
-
-                    $handler = $controller . '::' . $method;
+                    // Using back-references
+                    $handler = preg_replace('#^' . $routeKey . '$#u', $handler, $uri);
                 }
 
                 $this->setRequest(explode('/', $handler));
 
-                $this->matchedRoute = [
-                    $matchedKey,
-                    $handler,
-                ];
-
-                $this->matchedRouteOptions = $this->collection->getRoutesOptions($matchedKey);
+                $this->setMatchedRoute($matchedKey, $handler);
 
                 return true;
             }
@@ -672,4 +649,18 @@ protected function setDefaultController()
 
         log_message('info', 'Used the default controller.');
     }
+
+    /**
+     * @param callable|string $handler
+     *
+     * @return static
+     */
+    protected function setMatchedRoute(string $route, $handler)
+    {
+        $this->matchedRoute = [$route, $handler];
+
+        $this->matchedRouteOptions = $this->collection->getRoutesOptions($route);
+
+        return $this;
+    }
 }

From be2423d6a1fbe7ca4c1bec09872ecf2e233a8457 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 18 May 2022 15:19:05 +0900
Subject: [PATCH 2211/2325] fix: replace EVENT_PRIORITY_NORMAL with
 Events::PRIORITY_NORMAL

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

diff --git a/system/Events/Events.php b/system/Events/Events.php
index f3d1c4d67128..3117969882df 100644
--- a/system/Events/Events.php
+++ b/system/Events/Events.php
@@ -110,7 +110,7 @@ public static function initialize()
      * @param callable $callback
      * @param int      $priority
      */
-    public static function on($eventName, $callback, $priority = EVENT_PRIORITY_NORMAL)
+    public static function on($eventName, $callback, $priority = self::PRIORITY_NORMAL)
     {
         if (! isset(static::$listeners[$eventName])) {
             static::$listeners[$eventName] = [

From c59628b6eb4a9e98aea086ab799567577c1c7da1 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Wed, 18 May 2022 16:59:19 +0800
Subject: [PATCH 2212/2325] The changelog is missing info about the change.

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 user_guide_src/source/changelogs/v4.2.0.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 227f825fc67c..32129c30c4eb 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -69,6 +69,7 @@ Others
 - New :doc:`../outgoing/view_decorators` allow modifying the generated HTML prior to caching.
 - Added Subqueries in the FROM section. See :ref:`query-builder-from-subquery`.
 - Added Subqueries in the SELECT section. See :ref:`query-builder-select`.
+- The BaseBuilder::buildSubquery() method can take an optional third argument ``string $alias``.
 - Added Validation Strict Rules. See :ref:`validation-traditional-and-strict-rules`.
 - Added new OCI8 driver for database.
     - It can access Oracle Database and supports SQL and PL/SQL statements.

From 218b6bb2973b68479404d644ededc21e67909c48 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Fri, 20 May 2022 00:49:17 +0800
Subject: [PATCH 2213/2325] The setMatchedRoute method now returns nothing.

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/Router/Router.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/system/Router/Router.php b/system/Router/Router.php
index e8eaa94e5c82..a11e7127d77a 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -653,14 +653,12 @@ protected function setDefaultController()
     /**
      * @param callable|string $handler
      *
-     * @return static
+     * @return void
      */
     protected function setMatchedRoute(string $route, $handler)
     {
         $this->matchedRoute = [$route, $handler];
 
         $this->matchedRouteOptions = $this->collection->getRoutesOptions($route);
-
-        return $this;
     }
 }

From 2724e4b2e0a868a1cda15380fb18ecf0842c85e7 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Fri, 20 May 2022 00:53:04 +0800
Subject: [PATCH 2214/2325] Added return type

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/Router/Router.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/system/Router/Router.php b/system/Router/Router.php
index a11e7127d77a..f319433732aa 100644
--- a/system/Router/Router.php
+++ b/system/Router/Router.php
@@ -652,10 +652,8 @@ protected function setDefaultController()
 
     /**
      * @param callable|string $handler
-     *
-     * @return void
      */
-    protected function setMatchedRoute(string $route, $handler)
+    protected function setMatchedRoute(string $route, $handler): void
     {
         $this->matchedRoute = [$route, $handler];
 

From fa615965cce726300f5da4cae51bc3a363b3f6ec Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 30 Apr 2022 16:46:45 +0900
Subject: [PATCH 2215/2325] test: refactor for easier reading

---
 tests/system/Helpers/ArrayHelperTest.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/tests/system/Helpers/ArrayHelperTest.php b/tests/system/Helpers/ArrayHelperTest.php
index 59257fbab7d6..6acb68edca66 100644
--- a/tests/system/Helpers/ArrayHelperTest.php
+++ b/tests/system/Helpers/ArrayHelperTest.php
@@ -77,15 +77,24 @@ public function testArrayDotEscape()
 
     public function testArraySearchDotMultiLevels()
     {
-        $data1 = ['bar' => [['foo' => 'baz']]];
-        $data2 = ['bar' => [
-            ['foo' => 'bizz'],
-            ['foo' => 'buzz'],
-        ]];
-        $data3 = ['baz' => 'none'];
-
+        $data1 = [
+            'bar' => [
+                ['foo' => 'baz'],
+            ],
+        ];
         $this->assertSame('baz', dot_array_search('bar.*.foo', $data1));
+
+        $data2 = [
+            'bar' => [
+                ['foo' => 'bizz'],
+                ['foo' => 'buzz'],
+            ],
+        ];
         $this->assertSame(['bizz', 'buzz'], dot_array_search('bar.*.foo', $data2));
+
+        $data3 = [
+            'baz' => 'none',
+        ];
         $this->assertNull(dot_array_search('bar.*.foo', $data3));
     }
 

From 3d987fda85784f8794b5970f3fb77437e02cb30a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 30 Apr 2022 16:47:58 +0900
Subject: [PATCH 2216/2325] fix: unexpected behavior

---
 system/Helpers/array_helper.php          |  4 ++--
 tests/system/Helpers/ArrayHelperTest.php | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/system/Helpers/array_helper.php b/system/Helpers/array_helper.php
index b5350cdd8b70..9d2b44876cc9 100644
--- a/system/Helpers/array_helper.php
+++ b/system/Helpers/array_helper.php
@@ -89,8 +89,8 @@ function _array_search_dot(array $indexes, array $array)
             return _array_search_dot($indexes, $array[$currentIndex]);
         }
 
-        // Otherwise we've found our match!
-        return $array[$currentIndex];
+        // Otherwise, not found.
+        return null;
     }
 }
 
diff --git a/tests/system/Helpers/ArrayHelperTest.php b/tests/system/Helpers/ArrayHelperTest.php
index 6acb68edca66..50c6f94f4bfc 100644
--- a/tests/system/Helpers/ArrayHelperTest.php
+++ b/tests/system/Helpers/ArrayHelperTest.php
@@ -45,7 +45,16 @@ public function testArrayDotTooManyLevels()
             ],
         ];
 
-        $this->assertSame(23, dot_array_search('foo.bar.baz', $data));
+        $this->assertNull(dot_array_search('foo.bar.baz', $data));
+    }
+
+    public function testArrayDotTooManyLevelsWithWildCard()
+    {
+        $data = [
+            'a' => [],
+        ];
+
+        $this->assertNull(dot_array_search('a.*.c', $data));
     }
 
     /**

From be1610bd80f4a345bd694c93193f2b176d289198 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 4 May 2022 11:39:33 +0900
Subject: [PATCH 2217/2325] docs: add user guide

---
 user_guide_src/source/changelogs/v4.2.0.rst    | 1 +
 user_guide_src/source/helpers/array_helper.rst | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 32129c30c4eb..b314dd892794 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -22,6 +22,7 @@ BREAKING
 - The color code output by :ref:`CLI::color() <cli-library-color>` has been changed to fix a bug.
 - To prevent unexpected access from the web browser, if a controller is added to a cli route (``$routes->cli()``), all methods of that controller are no longer accessible via auto-routing.
 - There is a possible backward compatibility break for those users extending the History Collector and they should probably update ``History::setFiles()`` method.
+- The :php:func:`dot_array_search`'s unexpected behavior has been fixed. Now ``dot_array_search('foo.bar.baz', ['foo' => ['bar' => 23]])`` returns ``null``. The previous versions returned ``23``.
 
 Enhancements
 ************
diff --git a/user_guide_src/source/helpers/array_helper.rst b/user_guide_src/source/helpers/array_helper.rst
index 845ccccf39b4..cf9517925234 100644
--- a/user_guide_src/source/helpers/array_helper.rst
+++ b/user_guide_src/source/helpers/array_helper.rst
@@ -48,6 +48,9 @@ The following functions are available:
 
     .. literalinclude:: array_helper/005.php
 
+.. note:: Prior to v4.2.0, ``dot_array_search('foo.bar.baz', ['foo' => ['bar' => 23]])`` returned ``23``
+    due to a bug. v4.2.0 and later returns ``null``.
+
 ..  php:function:: array_deep_search($key, array $array)
 
     :param  mixed  $key: The target key

From 6000d30f4a9fa5e370096698ba653f06aad10783 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 7 Apr 2022 19:06:18 +0900
Subject: [PATCH 2218/2325] feat: join() supports RawSql

---
 system/Database/BaseBuilder.php            | 20 +++++++++++++------
 system/Database/Postgre/Builder.php        |  5 ++++-
 system/Database/SQLSRV/Builder.php         |  5 ++++-
 tests/system/Database/Builder/JoinTest.php | 23 ++++++++++++++++++++++
 4 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index be1aee7e1a60..24939d03e607 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -579,9 +579,11 @@ public function fromSubquery(BaseBuilder $from, string $alias): self
     /**
      * Generates the JOIN portion of the query
      *
+     * @param RawSql|string $cond
+     *
      * @return $this
      */
-    public function join(string $table, string $cond, string $type = '', ?bool $escape = null)
+    public function join(string $table, $cond, string $type = '', ?bool $escape = null)
     {
         if ($type !== '') {
             $type = strtoupper(trim($type));
@@ -601,6 +603,17 @@ public function join(string $table, string $cond, string $type = '', ?bool $esca
             $escape = $this->db->protectIdentifiers;
         }
 
+        // Do we want to escape the table name?
+        if ($escape === true) {
+            $table = $this->db->protectIdentifiers($table, true, null, false);
+        }
+
+        if ($cond instanceof RawSql) {
+            $this->QBJoin[] = $type . 'JOIN ' . $table . ' ON ' . $cond;
+
+            return $this;
+        }
+
         if (! $this->hasOperator($cond)) {
             $cond = ' USING (' . ($escape ? $this->db->escapeIdentifiers($cond) : $cond) . ')';
         } elseif ($escape === false) {
@@ -634,11 +647,6 @@ public function join(string $table, string $cond, string $type = '', ?bool $esca
             }
         }
 
-        // Do we want to escape the table name?
-        if ($escape === true) {
-            $table = $this->db->protectIdentifiers($table, true, null, false);
-        }
-
         // Assemble the JOIN statement
         $this->QBJoin[] = $type . 'JOIN ' . $table . $cond;
 
diff --git a/system/Database/Postgre/Builder.php b/system/Database/Postgre/Builder.php
index 80e9f278cf50..1d80f687568c 100644
--- a/system/Database/Postgre/Builder.php
+++ b/system/Database/Postgre/Builder.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Database\Exceptions\DatabaseException;
+use CodeIgniter\Database\RawSql;
 
 /**
  * Builder for Postgre
@@ -300,9 +301,11 @@ protected function _like_statement(?string $prefix, string $column, ?string $not
     /**
      * Generates the JOIN portion of the query
      *
+     * @param RawSql|string $cond
+     *
      * @return BaseBuilder
      */
-    public function join(string $table, string $cond, string $type = '', ?bool $escape = null)
+    public function join(string $table, $cond, string $type = '', ?bool $escape = null)
     {
         if (! in_array('FULL OUTER', $this->joinTypes, true)) {
             $this->joinTypes = array_merge($this->joinTypes, ['FULL OUTER']);
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index 55da29b7bf85..f84d1dfddd07 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -14,6 +14,7 @@
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Database\Exceptions\DataException;
+use CodeIgniter\Database\RawSql;
 use CodeIgniter\Database\ResultInterface;
 
 /**
@@ -88,9 +89,11 @@ protected function _truncate(string $table): string
     /**
      * Generates the JOIN portion of the query
      *
+     * @param RawSql|string $cond
+     *
      * @return $this
      */
-    public function join(string $table, string $cond, string $type = '', ?bool $escape = null)
+    public function join(string $table, $cond, string $type = '', ?bool $escape = null)
     {
         if ($type !== '') {
             $type = strtoupper(trim($type));
diff --git a/tests/system/Database/Builder/JoinTest.php b/tests/system/Database/Builder/JoinTest.php
index 7ebb188adf6d..59857c25ab98 100644
--- a/tests/system/Database/Builder/JoinTest.php
+++ b/tests/system/Database/Builder/JoinTest.php
@@ -13,6 +13,7 @@
 
 use CodeIgniter\Database\BaseBuilder;
 use CodeIgniter\Database\Postgre\Builder as PostgreBuilder;
+use CodeIgniter\Database\RawSql;
 use CodeIgniter\Database\SQLSRV\Builder as SQLSRVBuilder;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
@@ -75,6 +76,28 @@ public function testJoinMultipleConditions()
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
 
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/3832
+     */
+    public function testJoinRawSql()
+    {
+        $builder = new BaseBuilder('device', $this->db);
+
+        $sql = 'user.id = device.user_id
+            AND (
+                (1=1 OR 1=1)
+                OR
+                (1=1 OR 1=1)
+            )';
+        $builder->join('user', new RawSql($sql), 'LEFT');
+
+        $expectedSQL = 'SELECT * FROM "device" LEFT JOIN "user" ON user.id = device.user_id AND ( (1=1 OR 1=1) OR (1=1 OR 1=1) )';
+
+        $output = str_replace("\n", ' ', $builder->getCompiledSelect());
+        $output = preg_replace('/\s+/', ' ', $output);
+        $this->assertSame($expectedSQL, $output);
+    }
+
     public function testFullOuterJoin()
     {
         $builder = new PostgreBuilder('jobs', $this->db);

From c656564ddec0b946f7ac6cec75c245bfab084296 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 4 May 2022 15:49:21 +0900
Subject: [PATCH 2219/2325] docs: add section for database in Enhancements

---
 user_guide_src/source/changelogs/v4.2.0.rst | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 32129c30c4eb..c65c6f3959e9 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -58,6 +58,18 @@ Commands
         - ``spark db:table my_table --metadata``
 - The ``spark routes`` command now shows closure routes, auto routes, and filters. See :ref:`URI Routing <spark-routes>`.
 
+Database
+========
+
+- Added Subqueries in the FROM section. See :ref:`query-builder-from-subquery`.
+- Added Subqueries in the SELECT section. See :ref:`query-builder-select`.
+- The BaseBuilder::buildSubquery() method can take an optional third argument ``string $alias``.
+- Added new OCI8 driver for database.
+    - It can access Oracle Database and supports SQL and PL/SQL statements.
+- QueryBuilder raw SQL string support
+    - Added the class ``CodeIgniter\Database\RawSql`` which expresses raw SQL strings.
+    - :ref:`select() <query-builder-select-rawsql>`, :ref:`where() <query-builder-where-rawsql>`, :ref:`like() <query-builder-like-rawsql>` accept the ``CodeIgniter\Database\RawSql`` instance.
+
 Others
 ======
 
@@ -67,21 +79,14 @@ Others
     - Added the functions ``csp_script_nonce()`` and ``csp_style_nonce()`` to get nonce attributes
     - See :ref:`content-security-policy` for details.
 - New :doc:`../outgoing/view_decorators` allow modifying the generated HTML prior to caching.
-- Added Subqueries in the FROM section. See :ref:`query-builder-from-subquery`.
-- Added Subqueries in the SELECT section. See :ref:`query-builder-select`.
-- The BaseBuilder::buildSubquery() method can take an optional third argument ``string $alias``.
 - Added Validation Strict Rules. See :ref:`validation-traditional-and-strict-rules`.
-- Added new OCI8 driver for database.
-    - It can access Oracle Database and supports SQL and PL/SQL statements.
+- The ``spark routes`` command now shows closure routes, auto routes, and filters. See :ref:`URI Routing <spark-routes>`.
 - Exception information logged through ``log_message()`` has now improved. It now includes the file and line where the exception originated. It also does not truncate the message anymore.
     - The log format has also changed. If users are depending on the log format in their apps, the new log format is "<1-based count> <cleaned filepath>(<line>): <class><function><args>"
 - Added support for webp files to **app/Config/Mimes.php**.
 - Added 4th parameter ``$includeDir`` to ``get_filenames()``. See :php:func:`get_filenames`.
 - HTML helper ``script_tag()`` now uses ``null`` values to write boolean attributes in minimized form: ``<script src="..." defer />``. See the sample code for :php:func:`script_tag`.
 - RouteCollection::addRedirect() can now use placeholders.
-- QueryBuilder raw SQL string support
-    - Added the class ``CodeIgniter\Database\RawSql`` which expresses raw SQL strings.
-    - :ref:`select() <query-builder-select-rawsql>`, :ref:`where() <query-builder-where-rawsql>`, :ref:`like() <query-builder-like-rawsql>` accept the ``CodeIgniter\Database\RawSql`` instance.
 - Debugbar enhancements
     - Debug toolbar is now using ``microtime()`` instead of ``time()``.
 

From fe33275343205e777a06aeeaef73890817a373e8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 4 May 2022 16:00:22 +0900
Subject: [PATCH 2220/2325] docs: add the user guide

---
 user_guide_src/source/changelogs/v4.2.0.rst          |  2 +-
 user_guide_src/source/database/query_builder.rst     | 11 +++++++++++
 user_guide_src/source/database/query_builder/102.php |  7 +++++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 user_guide_src/source/database/query_builder/102.php

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index c65c6f3959e9..335f9dcffd91 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -68,7 +68,7 @@ Database
     - It can access Oracle Database and supports SQL and PL/SQL statements.
 - QueryBuilder raw SQL string support
     - Added the class ``CodeIgniter\Database\RawSql`` which expresses raw SQL strings.
-    - :ref:`select() <query-builder-select-rawsql>`, :ref:`where() <query-builder-where-rawsql>`, :ref:`like() <query-builder-like-rawsql>` accept the ``CodeIgniter\Database\RawSql`` instance.
+    - :ref:`select() <query-builder-select-rawsql>`, :ref:`where() <query-builder-where-rawsql>`, :ref:`like() <query-builder-like-rawsql>`, :ref:`join() <query-builder-join-rawsql>` accept the ``CodeIgniter\Database\RawSql`` instance.
 
 Others
 ======
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index a0094d0b98a2..0d1d219a127e 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -234,6 +234,17 @@ outer``, and ``right outer``.
 
 .. literalinclude:: query_builder/020.php
 
+.. _query-builder-join-rawsql:
+
+RawSql
+^^^^^^
+
+Since v4.2.0, ``$builder->join()`` accepts a ``CodeIgniter\Database\RawSql`` instance, which expresses raw SQL strings.
+
+.. literalinclude:: query_builder/102.php
+
+.. warning:: When you use ``RawSql``, you MUST escape the data manually. Failure to do so could result in SQL injections.
+
 *************************
 Looking for Specific Data
 *************************
diff --git a/user_guide_src/source/database/query_builder/102.php b/user_guide_src/source/database/query_builder/102.php
new file mode 100644
index 000000000000..fc298a8504cf
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/102.php
@@ -0,0 +1,7 @@
+<?php
+
+use CodeIgniter\Database\RawSql;
+
+$sql = 'user.id = device.user_id AND ((1=1 OR 1=1) OR (1=1 OR 1=1))';
+$builder->join('user', new RawSql($sql), 'LEFT');
+// Produces: LEFT JOIN "user" ON user.id = device.user_id AND ((1=1 OR 1=1) OR (1=1 OR 1=1))

From 6c97f9dfa35c996fcd5234c1d44920e7a02ab8fd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 4 May 2022 16:12:37 +0900
Subject: [PATCH 2221/2325] docs: move method signature changes in one place

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 335f9dcffd91..c7308085e3e0 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -13,6 +13,7 @@ BREAKING
 ********
 
 - The method signature of ``Validation::setRule()`` has been changed. The ``string`` typehint on the ``$rules`` parameter was removed. Extending classes should likewise remove the parameter so as not to break LSP.
+- The method signature of ``CodeIgniter\CLI\CommandRunner::_remap()`` has been changed to fix a bug.
 - The ``CodeIgniter\CodeIgniter`` class has a new property ``$context`` and it must have the correct context at runtime. So the following files have been changed:
     - ``public/index.php``
     - ``spark``

From ae40b35fe66af7ff3533174fccc4f3879c74b6f2 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 4 May 2022 16:13:43 +0900
Subject: [PATCH 2222/2325] docs: add changelogs and upgrade_420

---
 user_guide_src/source/changelogs/v4.2.0.rst        | 3 ++-
 user_guide_src/source/installation/upgrade_420.rst | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index c7308085e3e0..3603d86110c9 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -12,7 +12,8 @@ Release Date: Not Released
 BREAKING
 ********
 
-- The method signature of ``Validation::setRule()`` has been changed. The ``string`` typehint on the ``$rules`` parameter was removed. Extending classes should likewise remove the parameter so as not to break LSP.
+- The method signature of ``Validation::setRule()`` has been changed.
+- The method signature of ``CodeIgniter\Database\BaseBuilder::join()`` and ``CodeIgniter\Database\*\Builder::join()`` have been changed.
 - The method signature of ``CodeIgniter\CLI\CommandRunner::_remap()`` has been changed to fix a bug.
 - The ``CodeIgniter\CodeIgniter`` class has a new property ``$context`` and it must have the correct context at runtime. So the following files have been changed:
     - ``public/index.php``
diff --git a/user_guide_src/source/installation/upgrade_420.rst b/user_guide_src/source/installation/upgrade_420.rst
index b011db54dfe4..c56d34b65f4a 100644
--- a/user_guide_src/source/installation/upgrade_420.rst
+++ b/user_guide_src/source/installation/upgrade_420.rst
@@ -37,7 +37,8 @@ Breaking Changes
 Breaking Enhancements
 *********************
 
-none.
+- The method signature of ``Validation::setRule()`` has been changed. The ``string`` typehint on the ``$rules`` parameter was removed. Extending classes should likewise remove the parameter so as not to break LSP.
+- The method signature of ``CodeIgniter\Database\BaseBuilder::join()`` and ``CodeIgniter\Database\*\Builder::join()`` have been changed. The ``string`` typehint on the ``$cond`` parameter was removed. Extending classes should likewise remove the parameter so as not to break LSP.
 
 Project Files
 *************

From 70c05ba1483d9713cc7bbfb149ecdd4d606bbd2c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 20 May 2022 11:37:18 +0900
Subject: [PATCH 2223/2325] test: change Config\Images::$libraryPath only when
 the file exists

---
 tests/system/Images/ImageMagickHandlerTest.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/system/Images/ImageMagickHandlerTest.php b/tests/system/Images/ImageMagickHandlerTest.php
index 31f1aeadb35b..012e782f6424 100644
--- a/tests/system/Images/ImageMagickHandlerTest.php
+++ b/tests/system/Images/ImageMagickHandlerTest.php
@@ -47,9 +47,11 @@ protected function setUp(): void
 
         $this->path = $this->origin . 'ci-logo.png';
 
-        $handlerConfig              = new Images();
-        $handlerConfig->libraryPath = '/usr/bin/convert';
-        $this->handler              = Services::image('imagick', $handlerConfig, false);
+        $handlerConfig = new Images();
+        if (is_file('/usr/bin/convert')) {
+            $handlerConfig->libraryPath = '/usr/bin/convert';
+        }
+        $this->handler = Services::image('imagick', $handlerConfig, false);
     }
 
     public function testGetVersion()

From aac88a0d160c806143b1e2611b2b75a03fe7252b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 20 May 2022 11:11:08 +0900
Subject: [PATCH 2224/2325] fix: CURLRequest request body is not reset on the
 next request

---
 system/HTTP/CURLRequest.php                   |  3 +++
 .../HTTP/CURLRequestDoNotShareOptionsTest.php | 27 +++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
index c8aceb9cdac0..db794d5e907a 100644
--- a/system/HTTP/CURLRequest.php
+++ b/system/HTTP/CURLRequest.php
@@ -151,6 +151,9 @@ protected function resetOptions()
         $this->headers   = [];
         $this->headerMap = [];
 
+        // Reset body
+        $this->body = null;
+
         // Reset configs
         $this->config = $this->defaultConfig;
 
diff --git a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
index 7f7d20209ce2..12c58abf8fa9 100644
--- a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
+++ b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
@@ -807,6 +807,21 @@ public function testApplyBody()
         $this->assertSame('name=George', $request->curl_options[CURLOPT_POSTFIELDS]);
     }
 
+    public function testBodyIsResstOnSecondRequest()
+    {
+        $request = $this->getRequest([
+            'base_uri' => 'http://www.foo.com/api/v1/',
+            'delay'    => 100,
+        ]);
+        $request->setBody('name=George');
+        $request->setOutput('Hi there');
+
+        $request->post('answer');
+        $request->post('answer');
+
+        $this->assertArrayNotHasKey(CURLOPT_POSTFIELDS, $request->curl_options);
+    }
+
     public function testResponseHeaders()
     {
         $request = $this->getRequest([
@@ -922,7 +937,10 @@ public function testJSONData()
         $this->assertSame('post', $this->request->getMethod());
 
         $expected = json_encode($params);
-        $this->assertSame($expected, $this->request->getBody());
+        $this->assertSame(
+            $expected,
+            $this->request->curl_options[CURLOPT_POSTFIELDS]
+        );
     }
 
     public function testSetJSON()
@@ -936,7 +954,12 @@ public function testSetJSON()
         ];
         $this->request->setJSON($params)->post('/post');
 
-        $this->assertSame(json_encode($params), $this->request->getBody());
+        $expected = json_encode($params);
+        $this->assertSame(
+            $expected,
+            $this->request->curl_options[CURLOPT_POSTFIELDS]
+        );
+
         $this->assertSame(
             'Content-Type: application/json',
             $this->request->curl_options[CURLOPT_HTTPHEADER][0]

From 3433e288b3a83208fabcbb84d988cca7f334478b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 23 May 2022 07:48:55 +0900
Subject: [PATCH 2225/2325] test: fix typo

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

diff --git a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
index 12c58abf8fa9..e6e7449d2987 100644
--- a/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
+++ b/tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php
@@ -807,7 +807,7 @@ public function testApplyBody()
         $this->assertSame('name=George', $request->curl_options[CURLOPT_POSTFIELDS]);
     }
 
-    public function testBodyIsResstOnSecondRequest()
+    public function testBodyIsResetOnSecondRequest()
     {
         $request = $this->getRequest([
             'base_uri' => 'http://www.foo.com/api/v1/',

From 56962f8d84813b58c83a4bc98c4d0827f39924ae Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 23 May 2022 09:35:14 +0900
Subject: [PATCH 2226/2325] docs: add link to the method

:php:meth: should be used, but it does not work.
---
 user_guide_src/source/helpers/cookie_helper.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/helpers/cookie_helper.rst b/user_guide_src/source/helpers/cookie_helper.rst
index 9ccceb54eeda..b64950222bce 100755
--- a/user_guide_src/source/helpers/cookie_helper.rst
+++ b/user_guide_src/source/helpers/cookie_helper.rst
@@ -37,7 +37,7 @@ The following functions are available:
     This helper function gives you friendlier syntax to set browser
     cookies. Refer to the :doc:`Response Library </outgoing/response>` for
     a description of its use, as this function is an alias for
-    ``Response::setCookie()``.
+    :php:func:`Response::setCookie() <setCookie>`.
 
 .. php:function:: get_cookie($index[, $xssClean = false])
 

From ee41951811ae669d4606d50b46ad947d8755d7d3 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 23 May 2022 09:36:52 +0900
Subject: [PATCH 2227/2325] docs: decorate variable names and values

---
 .../source/helpers/cookie_helper.rst          |  4 +-
 user_guide_src/source/outgoing/response.rst   | 40 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/user_guide_src/source/helpers/cookie_helper.rst b/user_guide_src/source/helpers/cookie_helper.rst
index b64950222bce..5e94fe24ef44 100755
--- a/user_guide_src/source/helpers/cookie_helper.rst
+++ b/user_guide_src/source/helpers/cookie_helper.rst
@@ -31,7 +31,7 @@ The following functions are available:
     :param    string    $prefix: Cookie name prefix
     :param    bool    $secure: Whether to only send the cookie through HTTPS
     :param    bool    $httpOnly: Whether to hide the cookie from JavaScript
-    :param    string    $sameSite: The value for the SameSite cookie parameter. If null, the default from `config/App.php` is used
+    :param    string    $sameSite: The value for the SameSite cookie parameter. If ``null``, the default from **app/Config/Cookie.php** is used
     :rtype:    void
 
     This helper function gives you friendlier syntax to set browser
@@ -69,7 +69,7 @@ The following functions are available:
     .. literalinclude:: cookie_helper/002.php
 
     This function is otherwise identical to ``set_cookie()``, except that it
-    does not have the value and expiration parameters. You can submit an
+    does not have the ``value`` and ``expire`` parameters. You can submit an
     array of values in the first parameter or you can set discrete
     parameters.
 
diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
index 6edafecb2bc3..4c1382a0b971 100644
--- a/user_guide_src/source/outgoing/response.rst
+++ b/user_guide_src/source/outgoing/response.rst
@@ -370,7 +370,7 @@ The methods provided by the parent class that are available are:
         :param string $prefix: Cookie name prefix
         :param bool $secure: Whether to only transfer the cookie through HTTPS
         :param bool $httponly: Whether to only make the cookie accessible for HTTP requests (no JavaScript)
-        :param string $samesite: The value for the SameSite cookie parameter. If set to ``''``, no SameSite attribute will be set on the cookie. If set to `null`, the default value from `config/App.php` will be used
+        :param string $samesite: The value for the SameSite cookie parameter. If set to ``''``, no SameSite attribute will be set on the cookie. If set to ``null``, the default value from **app/Config/Cookie.php** will be used
         :rtype: void
 
         Sets a cookie containing the values you specify. There are two ways to
@@ -386,28 +386,28 @@ The methods provided by the parent class that are available are:
 
         **Notes**
 
-        Only the name and value are required. To delete a cookie set it with the
-        expiration blank.
+        Only the ``name`` and ``value`` are required. To delete a cookie set it with the
+        ``expire`` blank.
 
-        The expiration is set in **seconds**, which will be added to the current
+        The ``expire`` is set in **seconds**, which will be added to the current
         time. Do not include the time, but rather only the number of seconds
-        from *now* that you wish the cookie to be valid. If the expiration is
+        from *now* that you wish the cookie to be valid. If the ``expire`` is
         set to zero the cookie will only last as long as the browser is open.
 
         For site-wide cookies regardless of how your site is requested, add your
-        URL to the **domain** starting with a period, like this:
+        URL to the ``domain`` starting with a period, like this:
         .your-domain.com
 
-        The path is usually not needed since the method sets a root path.
+        The ``path`` is usually not needed since the method sets a root path.
 
-        The prefix is only needed if you need to avoid name collisions with
+        The ``prefix`` is only needed if you need to avoid name collisions with
         other identically named cookies for your server.
 
-        The secure flag is only needed if you want to make it a secure cookie
+        The ``secure`` flag is only needed if you want to make it a secure cookie
         by setting it to ``true``.
 
-        The SameSite value controls how cookies are shared between domains and sub-domains.
-        Allowed values are 'None', 'Lax', 'Strict' or a blank string ``''``.
+        The ``samesite`` value controls how cookies are shared between domains and sub-domains.
+        Allowed values are ``'None'``, ``'Lax'``, ``'Strict'`` or a blank string ``''``.
         If set to blank string, default SameSite attribute will be set.
 
         **Discrete Parameters**
@@ -429,14 +429,14 @@ The methods provided by the parent class that are available are:
 
         **Notes**
 
-        Only the name is required.
+        Only the ``name`` is required.
 
-        The prefix is only needed if you need to avoid name collisions with
+        The ``prefix`` is only needed if you need to avoid name collisions with
         other identically named cookies for your server.
 
-        Provide a prefix if cookies should only be deleted for that subset.
-        Provide a domain name if cookies should only be deleted for that domain.
-        Provide a path name if cookies should only be deleted for that path.
+        Provide a ``prefix`` if cookies should only be deleted for that subset.
+        Provide a ``domain`` name if cookies should only be deleted for that domain.
+        Provide a ``path`` name if cookies should only be deleted for that path.
 
         If any of the optional parameters are empty, then the same-named
         cookie will be deleted across all that apply.
@@ -456,10 +456,10 @@ The methods provided by the parent class that are available are:
 
         **Notes**
 
-        Only the name is required. If a prefix is specified, it will be prepended to the cookie name.
+        Only the ``name`` is required. If a ``prefix`` is specified, it will be prepended to the cookie name.
 
-        If no value is given, the method just checks for the existence of the named cookie.
-        If a value is given, then the method checks that the cookie exists, and that it
+        If no ``value`` is given, the method just checks for the existence of the named cookie.
+        If a ``value`` is given, then the method checks that the cookie exists, and that it
         has the prescribed value.
 
         Example:
@@ -473,7 +473,7 @@ The methods provided by the parent class that are available are:
         :rtype: ``Cookie|Cookie[]|null``
 
         Returns the named cookie, if found, or ``null``.
-        If no name is given, returns the array of ``Cookie`` objects.
+        If no ``name`` is given, returns the array of ``Cookie`` objects.
 
         Example:
 

From 16c21ccb1e9a92849adf75b5a895c0c861e60d11 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 23 May 2022 10:27:39 +0900
Subject: [PATCH 2228/2325] docs: remove extraneous explanations

Setting its expiry to 0 is internal implementation, so it is not needed.
---
 user_guide_src/source/outgoing/response.rst | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
index 4c1382a0b971..3a099980e7c7 100644
--- a/user_guide_src/source/outgoing/response.rst
+++ b/user_guide_src/source/outgoing/response.rst
@@ -425,9 +425,7 @@ The methods provided by the parent class that are available are:
         :param string $prefix: Cookie name prefix
         :rtype: void
 
-        Delete an existing cookie by setting its expiry to ``0``.
-
-        **Notes**
+        Delete an existing cookie.
 
         Only the ``name`` is required.
 

From 9defe6dc09b8376a2c64fcd8af07aa35ba8c67ba Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 23 May 2022 10:31:47 +0900
Subject: [PATCH 2229/2325] docs: add a note for confusing behavior

---
 user_guide_src/source/helpers/cookie_helper.rst | 8 +++++++-
 user_guide_src/source/outgoing/response.rst     | 3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/helpers/cookie_helper.rst b/user_guide_src/source/helpers/cookie_helper.rst
index 5e94fe24ef44..683564ad652a 100755
--- a/user_guide_src/source/helpers/cookie_helper.rst
+++ b/user_guide_src/source/helpers/cookie_helper.rst
@@ -69,7 +69,13 @@ The following functions are available:
     .. literalinclude:: cookie_helper/002.php
 
     This function is otherwise identical to ``set_cookie()``, except that it
-    does not have the ``value`` and ``expire`` parameters. You can submit an
+    does not have the ``value`` and ``expire`` parameters.
+
+    .. note:: When you use ``set_cookie()``,
+        if the ``value`` is set to empty string and the ``expire`` is set to ``0``, the cookie will be deleted.
+        If the ``value`` is set to non-empty string and the ``expire`` is set to ``0``, the cookie will only last as long as the browser is open.
+
+    You can submit an
     array of values in the first parameter or you can set discrete
     parameters.
 
diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
index 3a099980e7c7..0e479829a2fe 100644
--- a/user_guide_src/source/outgoing/response.rst
+++ b/user_guide_src/source/outgoing/response.rst
@@ -394,6 +394,9 @@ The methods provided by the parent class that are available are:
         from *now* that you wish the cookie to be valid. If the ``expire`` is
         set to zero the cookie will only last as long as the browser is open.
 
+        .. note:: But if the ``value`` is set to empty string and the ``expire`` is set to ``0``,
+            the cookie will be deleted.
+
         For site-wide cookies regardless of how your site is requested, add your
         URL to the ``domain`` starting with a period, like this:
         .your-domain.com

From 298643d8361939d21b7ee4fe1d5c60115494d105 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 23 May 2022 10:35:17 +0900
Subject: [PATCH 2230/2325] docs: remove **Notes**

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

diff --git a/user_guide_src/source/outgoing/response.rst b/user_guide_src/source/outgoing/response.rst
index 0e479829a2fe..2227a166e096 100644
--- a/user_guide_src/source/outgoing/response.rst
+++ b/user_guide_src/source/outgoing/response.rst
@@ -384,8 +384,6 @@ The methods provided by the parent class that are available are:
 
         .. literalinclude:: response/023.php
 
-        **Notes**
-
         Only the ``name`` and ``value`` are required. To delete a cookie set it with the
         ``expire`` blank.
 

From e4d07142cf3059dcb3cbc01e94524d57c2bfc38a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 8 May 2022 09:13:27 +0900
Subject: [PATCH 2231/2325] chore: add sample for preloading

---
 preload.php | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 preload.php

diff --git a/preload.php b/preload.php
new file mode 100644
index 000000000000..7e1a04956fa9
--- /dev/null
+++ b/preload.php
@@ -0,0 +1,113 @@
+<?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.
+ */
+
+/*
+ *---------------------------------------------------------------
+ * Sample file for Preloading
+ *---------------------------------------------------------------
+ * See https://www.php.net/manual/en/opcache.preloading.php
+ *
+ * How to Use:
+ *   1. Set Preload::$paths.
+ *   2. Set opcache.preload in php.ini.
+ *     php.ini:
+ *     opcache.preload=/path/to/preload.php
+ */
+
+// Load the paths config file
+require __DIR__ . '/app/Config/Paths.php';
+
+// Path to the front controller
+define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR);
+
+/**
+ * See https://www.php.net/manual/en/function.str-contains.php#126277
+ */
+if (! function_exists('str_contains')) {
+    /**
+     * Polyfill of str_contains()
+     */
+    function str_contains(string $haystack, string $needle): bool
+    {
+        return empty($needle) || strpos($haystack, $needle) !== false;
+    }
+}
+
+class Preload
+{
+    /**
+     * @var array Paths to preload.
+     */
+    private array $paths = [
+        [
+            'include' => // __DIR__ . '/vendor/codeigniter4/framework/system',
+                __DIR__ . '/system',
+            'exclude' => [
+                // Not needed if you don't use them.
+                '/system/Database/OCI8/',
+                '/system/Database/Postgre/',
+                '/system/Database/SQLSRV/',
+                // Not needed.
+                '/system/Database/Seeder.php',
+                '/system/Test/',
+                '/system/Language/',
+                '/system/CLI/',
+                '/system/Commands/',
+                '/system/Publisher/',
+                '/system/ComposerScripts.php',
+                '/Views/',
+                // Errors occur.
+                '/system/Config/Routes.php',
+                '/system/ThirdParty/',
+            ],
+        ],
+    ];
+
+    public function __construct()
+    {
+        $this->loadAutoloader();
+    }
+
+    private function loadAutoloader()
+    {
+        $paths = new Config\Paths();
+        require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
+    }
+
+    /**
+     * Load PHP files.
+     */
+    public function load()
+    {
+        foreach ($this->paths as $path) {
+            $directory = new RecursiveDirectoryIterator($path['include']);
+            $fullTree  = new RecursiveIteratorIterator($directory);
+            $phpFiles  = new RegexIterator(
+                $fullTree,
+                '/.+((?<!Test)+\.php$)/i',
+                RecursiveRegexIterator::GET_MATCH
+            );
+
+            foreach ($phpFiles as $key => $file) {
+                foreach ($path['exclude'] as $exclude) {
+                    if (str_contains($file[0], $exclude)) {
+                        continue 2;
+                    }
+                }
+
+                require_once $file[0];
+                echo 'Loaded: ' . $file[0] . "\n";
+            }
+        }
+    }
+}
+
+(new Preload())->load();

From 9f6b338960453bf6f81fac69163b18217908b352 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 23 May 2022 18:56:23 +0900
Subject: [PATCH 2232/2325] docs: add changelog

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index b314dd892794..f81d3368e458 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -85,6 +85,7 @@ Others
     - :ref:`select() <query-builder-select-rawsql>`, :ref:`where() <query-builder-where-rawsql>`, :ref:`like() <query-builder-like-rawsql>` accept the ``CodeIgniter\Database\RawSql`` instance.
 - Debugbar enhancements
     - Debug toolbar is now using ``microtime()`` instead of ``time()``.
+- Added a sample file for `Preloading <https://www.php.net/manual/en/opcache.preloading.php>`_. See **preload.php**.
 
 Changes
 *******

From db0f631e430b6e9e4b70bee16257d9797aab8af0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 May 2022 15:04:52 +0000
Subject: [PATCH 2233/2325] chore(deps-dev): update rector/rector requirement
 from 0.12.23 to 0.13.0

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.12.23...0.13.0)

---
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 f12e6714bed3..8f237128ae09 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.5.6",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.12.23"
+        "rector/rector": "0.13.0"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From c8faa10e83d5e2ae471ff46295517c3a972e99de Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 24 May 2022 02:08:10 +0700
Subject: [PATCH 2234/2325] [PHPStan] Pin PHPStan to v1.6.9

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8f237128ae09..77873cabc929 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.3",
         "nexusphp/tachycardia": "^1.0",
-        "phpstan/phpstan": "^1.5.6",
+        "phpstan/phpstan": "1.6.9",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
         "rector/rector": "0.13.0"

From a8a8fd76ae65ecb05dbf609d312324fadb85be9a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 24 May 2022 08:13:26 +0900
Subject: [PATCH 2235/2325] fix: change BaseService::reset() $initAutoloader to
 true by default

---
 system/Config/BaseService.php  | 2 +-
 system/Test/CIUnitTestCase.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Config/BaseService.php b/system/Config/BaseService.php
index ba2779d4f580..d77cfb1bbc51 100644
--- a/system/Config/BaseService.php
+++ b/system/Config/BaseService.php
@@ -273,7 +273,7 @@ public static function serviceExists(string $name): ?string
     /**
      * Reset shared instances and mocks for testing.
      */
-    public static function reset(bool $initAutoloader = false)
+    public static function reset(bool $initAutoloader = true)
     {
         static::$mocks     = [];
         static::$instances = [];
diff --git a/system/Test/CIUnitTestCase.php b/system/Test/CIUnitTestCase.php
index 5c462fa139f4..ba3c81b028c7 100644
--- a/system/Test/CIUnitTestCase.php
+++ b/system/Test/CIUnitTestCase.php
@@ -299,7 +299,7 @@ protected function resetFactories()
     /**
      * Resets shared instanced for all Services
      */
-    protected function resetServices(bool $initAutoloader = false)
+    protected function resetServices(bool $initAutoloader = true)
     {
         Services::reset($initAutoloader);
     }

From 663ab03eaf13ee1f4a72adce95fb8f145665e2d1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 24 May 2022 12:01:12 +0900
Subject: [PATCH 2236/2325] docs: add note

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

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index 1baccfd1facc..cf9974b5ccc9 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -141,6 +141,8 @@ This array should be updated with the field names that can be set during ``save(
 against just taking input from a form and throwing it all at the model, resulting in
 potential mass assignment vulnerabilities.
 
+.. note:: The ``$primaryKey`` should never be an allowed field.
+
 $useTimestamps
 --------------
 

From bcd4a73e02e1f3826b6d610b2a55aff8c676678e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 4 May 2022 16:12:37 +0900
Subject: [PATCH 2237/2325] docs: move method signature changes in one place

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index b1ccd3384ca4..345de7cd76d3 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -12,8 +12,8 @@ Release Date: Not Released
 BREAKING
 ********
 
-- The method signature of ``Validation::setRule()`` has been changed.
 - The method signature of ``CodeIgniter\Database\BaseBuilder::join()`` and ``CodeIgniter\Database\*\Builder::join()`` have been changed.
+- The method signature of ``Validation::setRule()`` has been changed. The ``string`` typehint on the ``$rules`` parameter was removed. Extending classes should likewise remove the parameter so as not to break LSP.
 - The method signature of ``CodeIgniter\CLI\CommandRunner::_remap()`` has been changed to fix a bug.
 - The ``CodeIgniter\CodeIgniter`` class has a new property ``$context`` and it must have the correct context at runtime. So the following files have been changed:
     - ``public/index.php``

From bedf9e698e8ed615ddfcc80ff1b6ab6ed4a670f6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 4 May 2022 14:28:06 +0900
Subject: [PATCH 2238/2325] feat: DBForge::addField() default supports RawSql

---
 system/Database/Forge.php                     |  2 +
 .../system/Database/Forge/CreateTableTest.php | 38 +++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/system/Database/Forge.php b/system/Database/Forge.php
index e5f8c9aedc68..0ffd245fa7a0 100644
--- a/system/Database/Forge.php
+++ b/system/Database/Forge.php
@@ -980,6 +980,8 @@ protected function _attributeDefault(array &$attributes, array &$field)
                 // Override the NULL attribute if that's our default
                 $attributes['NULL'] = true;
                 $field['null']      = empty($this->null) ? '' : ' ' . $this->null;
+            } elseif ($attributes['DEFAULT'] instanceof RawSql) {
+                $field['default'] = $this->default . $attributes['DEFAULT'];
             } else {
                 $field['default'] = $this->default . $this->db->escape($attributes['DEFAULT']);
             }
diff --git a/tests/system/Database/Forge/CreateTableTest.php b/tests/system/Database/Forge/CreateTableTest.php
index 1a1f521c3cbb..ddb190b1e4d5 100644
--- a/tests/system/Database/Forge/CreateTableTest.php
+++ b/tests/system/Database/Forge/CreateTableTest.php
@@ -12,6 +12,7 @@
 namespace CodeIgniter\Database\Forge;
 
 use CodeIgniter\Database\Forge;
+use CodeIgniter\Database\RawSql;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockConnection;
 
@@ -39,4 +40,41 @@ public function testCreateTableWithExists()
 
         $this->assertTrue($actual);
     }
+
+    public function testCreateTableWithDefaultRawSql()
+    {
+        $sql = <<<'SQL'
+            CREATE TABLE "foo" (
+            	"id" INT(5) UNSIGNED NOT NULL AUTO_INCREMENT,
+            	"ts" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+            )
+            SQL;
+        $dbMock = $this->getMockBuilder(MockConnection::class)
+            ->setConstructorArgs([[]])
+            ->onlyMethods(['query'])
+            ->getMock();
+        $dbMock->expects($this->any())
+            ->method('query')
+            ->with($sql)
+            ->willReturn(true);
+
+        $forge = new class ($dbMock) extends Forge {};
+
+        $fields = [
+            'id' => [
+                'type'           => 'INT',
+                'constraint'     => 5,
+                'unsigned'       => true,
+                'auto_increment' => true,
+            ],
+            'ts' => [
+                'type'    => 'TIMESTAMP',
+                'default' => new RawSql('CURRENT_TIMESTAMP'),
+            ],
+        ];
+        $forge->addField($fields);
+        $actual = $forge->createTable('foo');
+
+        $this->assertTrue($actual);
+    }
 }

From a1997b66c48aac0a55b45a64897d770ba4e91367 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 6 May 2022 16:27:57 +0900
Subject: [PATCH 2239/2325] docs: make method names linkable

---
 user_guide_src/source/dbmgmt/forge.rst | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index 3777d86e2ad9..3c5a90e8df16 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -31,7 +31,8 @@ to connect to as the first parameter.
 Creating and Dropping Databases
 *******************************
 
-**$forge->createDatabase('db_name')**
+$forge->createDatabase('db_name')
+=================================
 
 Permits you to create the database specified in the first parameter.
 Returns true/false based on success or failure:
@@ -43,7 +44,8 @@ or will check if a database exists before create it (depending on DBMS).
 
 .. literalinclude:: forge/004.php
 
-**$forge->dropDatabase('db_name')**
+$forge->dropDatabase('db_name')
+===============================
 
 Permits you to drop the database specified in the first parameter.
 Returns true/false based on success or failure:
@@ -110,7 +112,8 @@ After the fields have been defined, they can be added using
 ``$forge->addField($fields)`` followed by a call to the
 ``createTable()`` method.
 
-**$forge->addField()**
+$forge->addField()
+------------------
 
 The add fields method will accept the above array.
 
@@ -229,7 +232,8 @@ Modifying Tables
 Adding a Column to a Table
 ==========================
 
-**$forge->addColumn()**
+$forge->addColumn()
+-------------------
 
 The ``addColumn()`` method is used to modify an existing table. It
 accepts the same field array as above, and can be used for an unlimited
@@ -247,7 +251,8 @@ Examples:
 Dropping Columns From a Table
 ==============================
 
-**$forge->dropColumn()**
+$forge->dropColumn()
+--------------------
 
 Used to remove a column from a table.
 
@@ -260,7 +265,8 @@ Used to remove multiple columns from a table.
 Modifying a Column in a Table
 =============================
 
-**$forge->modifyColumn()**
+$forge->modifyColumn()
+----------------------
 
 The usage of this method is identical to ``addColumn()``, except it
 alters an existing column rather than adding a new one. In order to

From e40a40e17fa5743c403de5617e53d4d705a907c4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 6 May 2022 16:44:29 +0900
Subject: [PATCH 2240/2325] docs: make title's first letter uppercase

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

diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index 3c5a90e8df16..85cb07ed6b44 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -117,7 +117,7 @@ $forge->addField()
 
 The add fields method will accept the above array.
 
-Passing strings as fields
+Passing Strings as Fields
 -------------------------
 
 If you know exactly how you want a field to be created, you can pass the

From ba780342c41e3e1f48afb977f87aeddaa45fd1ff Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 6 May 2022 16:45:04 +0900
Subject: [PATCH 2241/2325] docs: add about Raw Sql Strings as Default Values

---
 user_guide_src/source/changelogs/v4.2.0.rst |  1 +
 user_guide_src/source/dbmgmt/forge.rst      | 12 +++++++++++
 user_guide_src/source/dbmgmt/forge/027.php  | 22 +++++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 user_guide_src/source/dbmgmt/forge/027.php

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 345de7cd76d3..082311eca8d3 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -72,6 +72,7 @@ Database
 - QueryBuilder raw SQL string support
     - Added the class ``CodeIgniter\Database\RawSql`` which expresses raw SQL strings.
     - :ref:`select() <query-builder-select-rawsql>`, :ref:`where() <query-builder-where-rawsql>`, :ref:`like() <query-builder-like-rawsql>`, :ref:`join() <query-builder-join-rawsql>` accept the ``CodeIgniter\Database\RawSql`` instance.
+- ``DBForge::addField()`` default value raw SQL string support. See :ref:`forge-addfield-default-value-rawsql`.
 
 Others
 ======
diff --git a/user_guide_src/source/dbmgmt/forge.rst b/user_guide_src/source/dbmgmt/forge.rst
index 85cb07ed6b44..804a0e6ac9d1 100644
--- a/user_guide_src/source/dbmgmt/forge.rst
+++ b/user_guide_src/source/dbmgmt/forge.rst
@@ -117,6 +117,18 @@ $forge->addField()
 
 The add fields method will accept the above array.
 
+.. _forge-addfield-default-value-rawsql:
+
+Raw Sql Strings as Default Values
+---------------------------------
+
+Since v4.2.0, ``$forge->addField()`` accepts a ``CodeIgniter\Database\RawSql`` instance, which expresses raw SQL strings.
+
+
+.. literalinclude:: forge/027.php
+
+.. warning:: When you use ``RawSql``, you MUST escape the data manually. Failure to do so could result in SQL injections.
+
 Passing Strings as Fields
 -------------------------
 
diff --git a/user_guide_src/source/dbmgmt/forge/027.php b/user_guide_src/source/dbmgmt/forge/027.php
new file mode 100644
index 000000000000..e1bbb5b37837
--- /dev/null
+++ b/user_guide_src/source/dbmgmt/forge/027.php
@@ -0,0 +1,22 @@
+<?php
+
+use CodeIgniter\Database\RawSql;
+
+$fields = [
+    'id' => [
+        'type'           => 'INT',
+        'constraint'     => 5,
+        'unsigned'       => true,
+        'auto_increment' => true,
+    ],
+    'created_at' => [
+        'type'    => 'TIMESTAMP',
+        'default' => new RawSql('CURRENT_TIMESTAMP'),
+    ],
+];
+$forge->addField($fields);
+/*
+gives:
+    "id" INT(5) UNSIGNED NOT NULL AUTO_INCREMENT,
+    "created_at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+*/

From 84b1635875787f4813f97d0475990f22369bf507 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 24 May 2022 20:14:45 +0700
Subject: [PATCH 2242/2325] [PHPStan] Update to PHPStan ^1.7.1

---
 composer.json                        | 2 +-
 phpstan-baseline.neon.dist           | 8 +-------
 tests/system/Filters/FiltersTest.php | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 77873cabc929..a6ac3e8730f8 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "mikey179/vfsstream": "^1.6",
         "nexusphp/cs-config": "^3.3",
         "nexusphp/tachycardia": "^1.0",
-        "phpstan/phpstan": "1.6.9",
+        "phpstan/phpstan": "^1.7.1",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
         "rector/rector": "0.13.0"
diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index 9c7258cefc44..f018a20ca851 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -115,11 +115,6 @@ parameters:
 			count: 1
 			path: system/CodeIgniter.php
 
-		-
-			message: "#^Binary operation \"\\+\" between array\\<string, class\\-string\\>\\|false and non\\-empty\\-array\\<string, string\\> results in an error\\.$#"
-			count: 1
-			path: system/Common.php
-
 		-
 			message: "#^Property CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:\\$db \\(CodeIgniter\\\\Database\\\\BaseConnection\\) in empty\\(\\) is not falsy\\.$#"
 			count: 1
@@ -576,7 +571,7 @@ parameters:
 			path: system/HTTP/Request.php
 
 		-
-			message: "#^Cannot unset offset 'path' on array\\{host\\: mixed\\}\\.$#"
+			message: "#^Cannot unset offset 'path' on array{host: non-empty-string}\\.$#"
 			count: 1
 			path: system/HTTP/URI.php
 
@@ -874,7 +869,6 @@ parameters:
 			message: "#^Result of \\|\\| is always false\\.$#"
 			paths:
 				- system/Cache/CacheFactory.php
-				- system/Filters/Filters.php
 
 		-
 			message: "#^Binary operation \"/\" between string and 8 results in an error\\.$#"
diff --git a/tests/system/Filters/FiltersTest.php b/tests/system/Filters/FiltersTest.php
index bb6f02390265..3fc7fe442835 100644
--- a/tests/system/Filters/FiltersTest.php
+++ b/tests/system/Filters/FiltersTest.php
@@ -46,7 +46,7 @@ final class FiltersTest extends CIUnitTestCase
 {
     use ConfigFromArrayTrait;
 
-    protected $response;
+    private $response;
 
     protected function setUp(): void
     {

From e3a00ee5f636ee002fde855d523e6f037418dd88 Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Tue, 24 May 2022 16:53:04 +0000
Subject: [PATCH 2243/2325] Prefer is_file

---
 app/Config/Routes.php                             | 4 ++--
 system/CodeIgniter.php                            | 2 +-
 system/Commands/Encryption/GenerateKey.php        | 4 ++--
 system/Test/bootstrap.php                         | 2 +-
 tests/system/Commands/CommandGeneratorTest.php    | 2 +-
 tests/system/Commands/ControllerGeneratorTest.php | 2 +-
 tests/system/Commands/CreateDatabaseTest.php      | 2 +-
 tests/system/Commands/GenerateKeyTest.php         | 6 +++---
 tests/system/Commands/MigrationGeneratorTest.php  | 2 +-
 tests/system/Commands/ScaffoldGeneratorTest.php   | 2 +-
 tests/system/Commands/SeederGeneratorTest.php     | 2 +-
 tests/system/HTTP/Files/FileMovingTest.php        | 4 ++--
 tests/system/Test/BootstrapFCPATHTest.php         | 2 +-
 13 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 281bc89b8e63..ff2ac645cb9a 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -7,7 +7,7 @@
 
 // Load the system's routing file first, so that the app and ENVIRONMENT
 // can override as needed.
-if (file_exists(SYSTEMPATH . 'Config/Routes.php')) {
+if (is_file(SYSTEMPATH . 'Config/Routes.php')) {
     require SYSTEMPATH . 'Config/Routes.php';
 }
 
@@ -50,6 +50,6 @@
  * You will have access to the $routes object within that file without
  * needing to reload it.
  */
-if (file_exists(APPPATH . 'Config/' . ENVIRONMENT . '/Routes.php')) {
+if (is_file(APPPATH . 'Config/' . ENVIRONMENT . '/Routes.php')) {
     require APPPATH . 'Config/' . ENVIRONMENT . '/Routes.php';
 }
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index df44847c3ef6..092b2905bffe 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -246,7 +246,7 @@ protected function initializeKint()
 
                 $file = SYSTEMPATH . 'ThirdParty/Kint/' . implode('/', $class) . '.php';
 
-                if (file_exists($file)) {
+                if (is_file($file)) {
                     require_once $file;
                 }
             });
diff --git a/system/Commands/Encryption/GenerateKey.php b/system/Commands/Encryption/GenerateKey.php
index 810f2dc92d39..b9d1794ff1fb 100644
--- a/system/Commands/Encryption/GenerateKey.php
+++ b/system/Commands/Encryption/GenerateKey.php
@@ -151,8 +151,8 @@ protected function writeNewEncryptionKeyToFile(string $oldKey, string $newKey):
         $baseEnv = ROOTPATH . 'env';
         $envFile = ROOTPATH . '.env';
 
-        if (! file_exists($envFile)) {
-            if (! file_exists($baseEnv)) {
+        if (! is_file($envFile)) {
+            if (! is_file($baseEnv)) {
                 CLI::write('Both default shipped `env` file and custom `.env` are missing.', 'yellow');
                 CLI::write('Here\'s your new key instead: ' . CLI::color($newKey, 'yellow'));
                 CLI::newLine();
diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php
index 00a4341c6e2a..2a0447ab2194 100644
--- a/system/Test/bootstrap.php
+++ b/system/Test/bootstrap.php
@@ -53,7 +53,7 @@
 defined('VENDORPATH')    || define('VENDORPATH', realpath(HOMEPATH . 'vendor') . DIRECTORY_SEPARATOR);
 
 // Load Common.php from App then System
-if (file_exists(APPPATH . 'Common.php')) {
+if (is_file(APPPATH . 'Common.php')) {
     require_once APPPATH . 'Common.php';
 }
 
diff --git a/tests/system/Commands/CommandGeneratorTest.php b/tests/system/Commands/CommandGeneratorTest.php
index 6f4e866eebd2..211bc373abf9 100644
--- a/tests/system/Commands/CommandGeneratorTest.php
+++ b/tests/system/Commands/CommandGeneratorTest.php
@@ -47,7 +47,7 @@ protected function tearDown(): void
 
     protected function getFileContents(string $filepath): string
     {
-        if (! file_exists($filepath)) {
+        if (! is_file($filepath)) {
             return '';
         }
 
diff --git a/tests/system/Commands/ControllerGeneratorTest.php b/tests/system/Commands/ControllerGeneratorTest.php
index 2d30393ff1de..6065e687560d 100644
--- a/tests/system/Commands/ControllerGeneratorTest.php
+++ b/tests/system/Commands/ControllerGeneratorTest.php
@@ -42,7 +42,7 @@ protected function tearDown(): void
 
     protected function getFileContents(string $filepath): string
     {
-        if (! file_exists($filepath)) {
+        if (! is_file($filepath)) {
             return '';
         }
 
diff --git a/tests/system/Commands/CreateDatabaseTest.php b/tests/system/Commands/CreateDatabaseTest.php
index 025e00481e71..1d0270f367b9 100644
--- a/tests/system/Commands/CreateDatabaseTest.php
+++ b/tests/system/Commands/CreateDatabaseTest.php
@@ -39,7 +39,7 @@ protected function setUp(): void
 
         if ($this->connection instanceof SQLite3Connection) {
             $file = WRITEPATH . 'foobar.db';
-            if (file_exists($file)) {
+            if (is_file($file)) {
                 unlink($file);
             }
         } else {
diff --git a/tests/system/Commands/GenerateKeyTest.php b/tests/system/Commands/GenerateKeyTest.php
index 760eca5e9c0d..e4f05fddad95 100644
--- a/tests/system/Commands/GenerateKeyTest.php
+++ b/tests/system/Commands/GenerateKeyTest.php
@@ -36,7 +36,7 @@ protected function setUp(): void
         $this->envPath       = ROOTPATH . '.env';
         $this->backupEnvPath = ROOTPATH . '.env.backup';
 
-        if (file_exists($this->envPath)) {
+        if (is_file($this->envPath)) {
             rename($this->envPath, $this->backupEnvPath);
         }
 
@@ -47,11 +47,11 @@ protected function tearDown(): void
     {
         stream_filter_remove($this->streamFilter);
 
-        if (file_exists($this->envPath)) {
+        if (is_file($this->envPath)) {
             unlink($this->envPath);
         }
 
-        if (file_exists($this->backupEnvPath)) {
+        if (is_file($this->backupEnvPath)) {
             rename($this->backupEnvPath, $this->envPath);
         }
 
diff --git a/tests/system/Commands/MigrationGeneratorTest.php b/tests/system/Commands/MigrationGeneratorTest.php
index c817ac200db7..e1d895779bb1 100644
--- a/tests/system/Commands/MigrationGeneratorTest.php
+++ b/tests/system/Commands/MigrationGeneratorTest.php
@@ -35,7 +35,7 @@ protected function tearDown(): void
 
         $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
         $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-        if (file_exists($file)) {
+        if (is_file($file)) {
             unlink($file);
         }
     }
diff --git a/tests/system/Commands/ScaffoldGeneratorTest.php b/tests/system/Commands/ScaffoldGeneratorTest.php
index d40902ecb045..0bea3539d7b6 100644
--- a/tests/system/Commands/ScaffoldGeneratorTest.php
+++ b/tests/system/Commands/ScaffoldGeneratorTest.php
@@ -42,7 +42,7 @@ protected function tearDown(): void
 
     protected function getFileContents(string $filepath): string
     {
-        if (! file_exists($filepath)) {
+        if (! is_file($filepath)) {
             return '';
         }
 
diff --git a/tests/system/Commands/SeederGeneratorTest.php b/tests/system/Commands/SeederGeneratorTest.php
index 25c4ae5350b5..92ad9548b7ab 100644
--- a/tests/system/Commands/SeederGeneratorTest.php
+++ b/tests/system/Commands/SeederGeneratorTest.php
@@ -35,7 +35,7 @@ protected function tearDown(): void
 
         $result = str_replace(["\033[0;32m", "\033[0m", "\n"], '', CITestStreamFilter::$buffer);
         $file   = str_replace('APPPATH' . DIRECTORY_SEPARATOR, APPPATH, trim(substr($result, 14)));
-        if (file_exists($file)) {
+        if (is_file($file)) {
             unlink($file);
         }
     }
diff --git a/tests/system/HTTP/Files/FileMovingTest.php b/tests/system/HTTP/Files/FileMovingTest.php
index 9eac8e51f1e7..209e18b2a903 100644
--- a/tests/system/HTTP/Files/FileMovingTest.php
+++ b/tests/system/HTTP/Files/FileMovingTest.php
@@ -326,11 +326,11 @@ public function testFailedMoveBecauseOfFalseReturned()
 
 function is_uploaded_file($filename)
 {
-    if (! file_exists($filename)) {
+    if (! is_file($filename)) {
         file_put_contents($filename, 'data');
     }
 
-    return file_exists($filename);
+    return is_file($filename);
 }
 
 /*
diff --git a/tests/system/Test/BootstrapFCPATHTest.php b/tests/system/Test/BootstrapFCPATHTest.php
index ab243da398e7..b7cb54ed517c 100644
--- a/tests/system/Test/BootstrapFCPATHTest.php
+++ b/tests/system/Test/BootstrapFCPATHTest.php
@@ -78,7 +78,7 @@ private function writeFiles(): void
 
     private function deleteFiles(): void
     {
-        if (file_exists($this->file1)) {
+        if (is_file($this->file1)) {
             unlink($this->file1);
         }
     }

From 3d2de6dd13c0bc960d5480ff5c3f6729e276994e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 25 May 2022 15:23:42 +0900
Subject: [PATCH 2244/2325] refactor: use get_filenames() 4th param

---
 system/Autoloader/FileLocator.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index eb5da6d7a326..250248a579dc 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -309,10 +309,7 @@ public function listFiles(string $path): array
                 continue;
             }
 
-            $tempFiles = get_filenames($fullPath, true);
-
-            // Remove directories
-            $tempFiles = array_filter($tempFiles, static fn ($path) => strtolower(substr($path, -4)) === '.php');
+            $tempFiles = get_filenames($fullPath, true, false, false);
 
             if (! empty($tempFiles)) {
                 $files = array_merge($files, $tempFiles);

From 143599bac6667adca166af33b12a31e5505c7518 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 25 May 2022 16:02:26 +0900
Subject: [PATCH 2245/2325] docs: fix title level

---
 user_guide_src/source/concepts/autoloader.rst |  8 ++--
 user_guide_src/source/concepts/factories.rst  | 28 ++++++-------
 user_guide_src/source/concepts/http.rst       |  9 +++--
 user_guide_src/source/concepts/security.rst   | 40 +++++++++----------
 user_guide_src/source/concepts/structure.rst  | 17 ++++----
 5 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/user_guide_src/source/concepts/autoloader.rst b/user_guide_src/source/concepts/autoloader.rst
index 4519e432ccf3..db60dce9a427 100644
--- a/user_guide_src/source/concepts/autoloader.rst
+++ b/user_guide_src/source/concepts/autoloader.rst
@@ -28,13 +28,13 @@ The autoloader is always active, being registered with ``spl_autoload_register()
 beginning of the framework's execution.
 
 Configuration
-=============
+*************
 
 Initial configuration is done in **app/Config/Autoload.php**. This file contains two primary
 arrays: one for the classmap, and one for PSR-4 compatible namespaces.
 
 Namespaces
-==========
+**********
 
 The recommended method for organizing your classes is to create one or more namespaces for your
 application's files. This is most important for any business-logic related classes, entity classes,
@@ -61,7 +61,7 @@ You will need to modify any existing files that are referencing the current name
     namespace has changed.
 
 Classmap
-========
+********
 
 The classmap is used extensively by CodeIgniter to eke the last ounces of performance out of the system
 by not hitting the file-system with extra ``is_file()`` calls. You can use the classmap to link to
@@ -72,7 +72,7 @@ third-party libraries that are not namespaced:
 The key of each row is the name of the class that you want to locate. The value is the path to locate it at.
 
 Composer Support
-================
+****************
 
 Composer support is automatically initialized by default. By default, it looks for Composer's autoload file at
 ``ROOTPATH . 'vendor/autoload.php'``. If you need to change the location of that file for any reason, you can modify
diff --git a/user_guide_src/source/concepts/factories.rst b/user_guide_src/source/concepts/factories.rst
index 754f831257e3..9d30dbd40f32 100644
--- a/user_guide_src/source/concepts/factories.rst
+++ b/user_guide_src/source/concepts/factories.rst
@@ -7,10 +7,10 @@ Factories
     :depth: 2
 
 Introduction
-============
+************
 
 What are Factories?
--------------------
+===================
 
 Like :doc:`./services`, **Factories** are an extension of autoloading that helps keep your code
 concise yet optimal, without having to pass around object instances between classes.
@@ -25,7 +25,7 @@ to work on or transmit common data. The framework itself uses Factories internal
 make sure the correct configuration is loaded when using the ``Config`` class.
 
 Differences from Services
--------------------------
+=========================
 
 Factories require a concrete class name to instantiate and do not have code to create instances.
 
@@ -37,7 +37,7 @@ that needs other services or class instances. When you get a service, Services r
 not a class name, so the returned instance can be changed without changing the client code.
 
 Example
--------
+=======
 
 Take a look at **Models** as an example. You can access the Factory specific to Models
 by using the magic static method of the Factories class, ``Factories::models()``.
@@ -69,26 +69,26 @@ you get back the instance as before:
 .. literalinclude:: factories/003.php
 
 Convenience Functions
-=====================
+*********************
 
 Two shortcut functions for Factories have been provided. These functions are always available.
 
 config()
---------
+========
 
 The first is ``config()`` which returns a new instance of a Config class. The only required parameter is the class name:
 
 .. literalinclude:: factories/008.php
 
 model()
---------
+=======
 
 The second function, ``model()`` returns a new instance of a Model class. The only required parameter is the class name:
 
 .. literalinclude:: factories/009.php
 
 Factory Parameters
-==================
+******************
 
 ``Factories`` takes as a second parameter an array of option values (described below).
 These directives will override the default options configured for each component.
@@ -106,7 +106,7 @@ class instance that uses the alternate database connection.
 .. _factories-options:
 
 Factories Options
-==================
+*****************
 
 The default behavior might not work for every component. For example, say your component
 name and its path do not align, or you need to limit instances to a certain type of class.
@@ -127,7 +127,7 @@ preferApp  boolean        Whether a class with the same basename in the App name
 ========== ============== ============================================================ ===================================================
 
 Factories Behavior
-==================
+******************
 
 Options can be applied in one of three ways (listed in ascending priority):
 
@@ -136,7 +136,7 @@ Options can be applied in one of three ways (listed in ascending priority):
 * Passing options directly at call time with a parameter.
 
 Configurations
---------------
+==============
 
 To set default component options, create a new Config files at **app/Config/Factory.php**
 that supplies options as an array property that matches the name of the component.
@@ -154,7 +154,7 @@ This would prevent conflict of an third-party module which happened to have an
 unrelated ``Filters`` path in its namespace.
 
 setOptions Method
------------------
+=================
 
 The ``Factories`` class has a static method to allow runtime option configuration: simply
 supply the desired array of options using the ``setOptions()`` method and they will be
@@ -163,7 +163,7 @@ merged with the default values and stored for the next call:
 .. literalinclude:: factories/006.php
 
 Parameter Options
------------------
+=================
 
 ``Factories``'s magic static call takes as a second parameter an array of option values.
 These directives will override the stored options configured for each component and can be
@@ -175,4 +175,4 @@ a component. By adding a second parameter to the magic static call, you can cont
 that single call will return a new or shared instance:
 
 .. literalinclude:: factories/007.php
-   :lines: 2-
\ No newline at end of file
+   :lines: 2-
diff --git a/user_guide_src/source/concepts/http.rst b/user_guide_src/source/concepts/http.rst
index 6833c95f22c1..a2a5a644303d 100644
--- a/user_guide_src/source/concepts/http.rst
+++ b/user_guide_src/source/concepts/http.rst
@@ -10,7 +10,7 @@ The first part of this chapter gives an overview. After the concepts are out of
 how to work with the requests and responses within CodeIgniter.
 
 What is HTTP?
-=============
+*************
 
 HTTP is simply a text-based convention that allows two machines to talk to each other. When a browser
 requests a page, it asks the server if it can get the page. The server then prepares the page and sends
@@ -22,7 +22,8 @@ you develop web applications is to always understand what the browser is request
 respond appropriately.
 
 The Request
------------
+===========
+
 Whenever a client (a web browser, smartphone app, etc) makes a request, it sends a small text message
 to the server and waits for a response.
 
@@ -42,7 +43,7 @@ client accepts, and much more. Wikipedia has an article that lists `all header f
 <https://en.wikipedia.org/wiki/List_of_HTTP_header_fields>`_ if you want to look it over.
 
 The Response
-------------
+============
 
 Once the server receives the request, your application will take that information and generate some output.
 The server will bundle your output as part of its response to the client. This is also represented as
@@ -64,7 +65,7 @@ wasn't found (404). Head over to IANA for a `full list of HTTP status codes
 <https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml>`_.
 
 Working with Requests and Responses
------------------------------------
+***********************************
 
 While PHP provides ways to interact with the request and response headers, CodeIgniter, like most frameworks,
 abstracts them so that you have a consistent, simple interface to them. The :doc:`IncomingRequest class </incoming/incomingrequest>`
diff --git a/user_guide_src/source/concepts/security.rst b/user_guide_src/source/concepts/security.rst
index 9bca73026eba..436c3fd6502a 100644
--- a/user_guide_src/source/concepts/security.rst
+++ b/user_guide_src/source/concepts/security.rst
@@ -24,7 +24,7 @@ the input data from the client to the application. Attack vectors include SQL,
 XML, ORM, code & buffer overflows.
 
 OWASP recommendations
----------------------
+=====================
 
 - Presentation: set correct content type, character set & locale
 - Submission: validate fields and provide feedback
@@ -32,7 +32,7 @@ OWASP recommendations
 - Model: parameterized queries
 
 CodeIgniter provisions
-----------------------
+======================
 
 - :doc:`HTTP library <../incoming/incomingrequest>` provides for input field filtering & content metadata
 - Form validation library
@@ -45,7 +45,7 @@ Inadequate authentication or improper session management can lead to a user
 getting more privileges than they are entitled to.
 
 OWASP recommendations
----------------------
+=====================
 
 - Presentation: validate authentication & role; send CSRF token with forms
 - Design: only use built-in session management
@@ -54,7 +54,7 @@ OWASP recommendations
 - Tip: consider the use of a request governor
 
 CodeIgniter provisions
-----------------------
+======================
 
 - :doc:`Session <../libraries/sessions>` library
 - :doc:`Security </libraries/security>` library provides for CSRF validation
@@ -68,14 +68,14 @@ Insufficient input validation where one user can add content to a web site
 that can be malicious when viewed by other users to the web site.
 
 OWASP recommendations
----------------------
+=====================
 
 - Presentation: output encode all user data as per output context; set input constraints
 - Controller: positive input validation
 - Tips: only process trustworthy data; do not store data HTML encoded in DB
 
 CodeIgniter provisions
-----------------------
+======================
 
 - esc function
 - Form validation library
@@ -90,14 +90,14 @@ attackers can bypass authorization and access resources in the system directly,
 for example database records or files.
 
 OWASP recommendations
----------------------
+=====================
 
 - Presentation: don't expose internal data; use random reference maps
 - Controller: obtain data from trusted sources or random reference maps
 - Model: validate user roles before updating data
 
 CodeIgniter provisions
-----------------------
+======================
 
 - Form validation library
 - Easy to add third party authentication
@@ -110,14 +110,14 @@ Improper configuration of an application architecture can lead to mistakes
 that might compromise the security of the whole architecture.
 
 OWASP recommendations
----------------------
+=====================
 
 - Presentation: harden web and application servers; use HTTP strict transport security
 - Controller: harden web and application servers; protect your XML stack
 - Model: harden database servers
 
 CodeIgniter provisions
-----------------------
+======================
 
 - Sanity checks during bootstrap
 
@@ -131,14 +131,14 @@ if data must be protected when it is stored, it must be protected also during
 transmission.
 
 OWASP recommendations
----------------------
+=====================
 
 - Presentation: use TLS1.2; use strong ciphers and hashes; do not send keys or hashes to browser
 - Controller: use strong ciphers and hashes
 - Model: mandate strong encrypted communications with servers
 
 CodeIgniter provisions
-----------------------
+======================
 
 - Session keys stored encrypted
 
@@ -152,14 +152,14 @@ if data must be protected when it is stored, it must be protected also during
 transmission.
 
 OWASP recommendations
----------------------
+=====================
 
 - Presentation: ensure that non-web data is outside the web root; validate users and roles; send CSRF tokens
 - Controller: validate users and roles; validate CSRF tokens
 - Model: validate roles
 
 CodeIgniter provisions
-----------------------
+======================
 
 - Public folder, with application and system outside
 - :doc:`Security </libraries/security>` library provides for CSRF validation
@@ -172,14 +172,14 @@ CSRF is an attack that forces an end user to execute unwanted actions on a web
 application in which he/she is currently authenticated.
 
 OWASP recommendations
----------------------
+=====================
 
 - Presentation: validate users and roles; send CSRF tokens
 - Controller: validate users and roles; validate CSRF tokens
 - Model: validate roles
 
 CodeIgniter provisions
-----------------------
+======================
 
 - :doc:`Security </libraries/security>` library provides for CSRF validation
 
@@ -191,12 +191,12 @@ Many applications have known vulnerabilities and known attack strategies that
 can be exploited in order to gain remote control or to exploit data.
 
 OWASP recommendations
----------------------
+=====================
 
 - Don't use any of these
 
 CodeIgniter provisions
-----------------------
+======================
 
 - Third party libraries incorporated must be vetted
 
@@ -208,14 +208,14 @@ Faulty business logic or injected actionable code could redirect the user
 inappropriately.
 
 OWASP recommendations
----------------------
+=====================
 
 - Presentation: don't use URL redirection; use random indirect references
 - Controller: don't use URL redirection; use random indirect references
 - Model: validate roles
 
 CodeIgniter provisions
-----------------------
+======================
 
 - :doc:`HTTP library <../incoming/incomingrequest>` provides for ...
 - :doc:`Session <../libraries/sessions>` library provides flashdata
diff --git a/user_guide_src/source/concepts/structure.rst b/user_guide_src/source/concepts/structure.rst
index 561cbb28f97d..bddd590a7bf0 100644
--- a/user_guide_src/source/concepts/structure.rst
+++ b/user_guide_src/source/concepts/structure.rst
@@ -6,14 +6,15 @@ To get the most out of CodeIgniter, you need to understand how the application i
 can change to meet the needs of your application.
 
 Default Directories
-===================
+*******************
 
 A fresh install has five directories: ``/app``, ``/public``,
 ``/writable``, ``/tests`` and ``/system`` or ``/vendor``.
 Each of these directories has a very specific part to play.
 
 app
----
+===
+
 The ``app`` directory is where all of your application code lives. This comes with a default directory
 structure that works well for many applications. The following folders make up the basic contents:
 
@@ -43,7 +44,7 @@ All files in this directory live under the ``App`` namespace, though you are fre
 **app/Config/Constants.php**.
 
 system
-------
+======
 
 .. note:: If you install CodeIgniter with Composer, the ``system`` is located in ``vendor/codeigniter4/framework/system``.
 
@@ -54,7 +55,7 @@ extend the classes, or create new classes, to provide the desired functionality.
 All files in this directory live under the ``CodeIgniter`` namespace.
 
 public
-------
+======
 
 The **public** folder holds the browser-accessible portion of your web application,
 preventing direct access to your source code.
@@ -66,20 +67,22 @@ This folder is meant to be the "web root" of your site, and your web server
 would be configured to point to it.
 
 writable
---------
+========
+
 This directory holds any directories that might need to be written to in the course of an application's life.
 This includes directories for storing cache files, logs, and any uploads a user might send. You should add any other
 directories that your application will need to write to here. This allows you to keep your other primary directories
 non-writable as an added security measure.
 
 tests
------
+=====
+
 This directory is set up to hold your test files. The ``_support`` directory holds various mock classes and other
 utilities that you can use while writing your tests. This directory does not need to be transferred to your
 production servers.
 
 Modifying Directory Locations
------------------------------
+*****************************
 
 If you've relocated any of the main directories, you can change the configuration
 settings inside **app/Config/Paths.php**.

From 0010ce72dfdea7dae48f970ce1e57d417e405f03 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 25 May 2022 16:03:16 +0900
Subject: [PATCH 2246/2325] docs: add TOC

---
 user_guide_src/source/concepts/http.rst      | 4 ++++
 user_guide_src/source/concepts/mvc.rst       | 4 ++++
 user_guide_src/source/concepts/security.rst  | 4 ++++
 user_guide_src/source/concepts/structure.rst | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/user_guide_src/source/concepts/http.rst b/user_guide_src/source/concepts/http.rst
index a2a5a644303d..63b18e45e764 100644
--- a/user_guide_src/source/concepts/http.rst
+++ b/user_guide_src/source/concepts/http.rst
@@ -9,6 +9,10 @@ concepts behind HTTP is a **must** for all developers that want to be successful
 The first part of this chapter gives an overview. After the concepts are out of the way, we will discuss
 how to work with the requests and responses within CodeIgniter.
 
+.. contents::
+    :local:
+    :depth: 2
+
 What is HTTP?
 *************
 
diff --git a/user_guide_src/source/concepts/mvc.rst b/user_guide_src/source/concepts/mvc.rst
index 1338290cc8b0..3be1d0fcac2c 100644
--- a/user_guide_src/source/concepts/mvc.rst
+++ b/user_guide_src/source/concepts/mvc.rst
@@ -2,6 +2,10 @@
 Models, Views, and Controllers
 ##############################
 
+.. contents::
+    :local:
+    :depth: 2
+
 Whenever you create an application, you have to find a way to organize the code to make it simple to locate
 the proper files and make it simple to maintain. Like most of the web frameworks, CodeIgniter uses the Model,
 View, Controller (MVC) pattern to organize the files. This keeps the data, the presentation, and flow through the
diff --git a/user_guide_src/source/concepts/security.rst b/user_guide_src/source/concepts/security.rst
index 436c3fd6502a..147c2a94c6a4 100644
--- a/user_guide_src/source/concepts/security.rst
+++ b/user_guide_src/source/concepts/security.rst
@@ -15,6 +15,10 @@ identifying the top vulnerabilities for web applications.
 For each, we provide a brief description, the OWASP recommendations, and then
 the CodeIgniter provisions to address the problem.
 
+.. contents::
+    :local:
+    :depth: 1
+
 ************
 A1 Injection
 ************
diff --git a/user_guide_src/source/concepts/structure.rst b/user_guide_src/source/concepts/structure.rst
index bddd590a7bf0..8f948be1cdb6 100644
--- a/user_guide_src/source/concepts/structure.rst
+++ b/user_guide_src/source/concepts/structure.rst
@@ -5,6 +5,10 @@ Application Structure
 To get the most out of CodeIgniter, you need to understand how the application is structured, by default, and what you
 can change to meet the needs of your application.
 
+.. contents::
+    :local:
+    :depth: 2
+
 Default Directories
 *******************
 

From 5efc7684e247fee85a912b62a838a87e3f742b4a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 25 May 2022 16:05:41 +0900
Subject: [PATCH 2247/2325] docs: add sub section title

---
 user_guide_src/source/concepts/mvc.rst | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/concepts/mvc.rst b/user_guide_src/source/concepts/mvc.rst
index 3be1d0fcac2c..30baafd1a941 100644
--- a/user_guide_src/source/concepts/mvc.rst
+++ b/user_guide_src/source/concepts/mvc.rst
@@ -6,10 +6,16 @@ Models, Views, and Controllers
     :local:
     :depth: 2
 
+************
+What is MVC?
+************
+
 Whenever you create an application, you have to find a way to organize the code to make it simple to locate
 the proper files and make it simple to maintain. Like most of the web frameworks, CodeIgniter uses the Model,
 View, Controller (MVC) pattern to organize the files. This keeps the data, the presentation, and flow through the
-application as separate parts. It should be noted that there are many views on the exact roles of each element,
+application as separate parts.
+
+It should be noted that there are many views on the exact roles of each element,
 but this document describes our take on it. If you think of it differently, you're free to modify how you use
 each piece as you need.
 

From 2cebaaf9543b6582164e79a02b9f1c2b7e6b1ae6 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 25 May 2022 16:06:17 +0900
Subject: [PATCH 2248/2325] docs: fix section title

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

diff --git a/user_guide_src/source/concepts/services.rst b/user_guide_src/source/concepts/services.rst
index 632ad10cedf0..3e14a87acba0 100644
--- a/user_guide_src/source/concepts/services.rst
+++ b/user_guide_src/source/concepts/services.rst
@@ -9,8 +9,8 @@ Services
 Introduction
 ************
 
-What is Services?
-=================
+What are Services?
+==================
 
 The **Services** in CodeIgniter 4 provide the functionality to create and share new class instances.
 It is implemented as the ``Config\Services`` class.

From 95e5a6a916f9f246f0368dda929db5dc3a5da2e7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 25 May 2022 16:08:46 +0900
Subject: [PATCH 2249/2325] docs: change directory notation

---
 user_guide_src/source/concepts/mvc.rst       |  2 +-
 user_guide_src/source/concepts/structure.rst | 26 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/user_guide_src/source/concepts/mvc.rst b/user_guide_src/source/concepts/mvc.rst
index 30baafd1a941..3840547de494 100644
--- a/user_guide_src/source/concepts/mvc.rst
+++ b/user_guide_src/source/concepts/mvc.rst
@@ -28,7 +28,7 @@ the data storage.
 
 At their most basic, controllers and models are simply classes that have a specific job. They are not the only class
 types that you can use, obviously, but they make up the core of how this framework is designed to be used. They even
-have designated directories in the **/app** directory for their storage, though you're free to store them
+have designated directories in the **app** directory for their storage, though you're free to store them
 wherever you desire, as long as they are properly namespaced. We will discuss that in more detail below.
 
 Let's take a closer look at each of these three main components.
diff --git a/user_guide_src/source/concepts/structure.rst b/user_guide_src/source/concepts/structure.rst
index 8f948be1cdb6..e0a754c69512 100644
--- a/user_guide_src/source/concepts/structure.rst
+++ b/user_guide_src/source/concepts/structure.rst
@@ -12,8 +12,8 @@ can change to meet the needs of your application.
 Default Directories
 *******************
 
-A fresh install has five directories: ``/app``, ``/public``,
-``/writable``, ``/tests`` and ``/system`` or ``/vendor``.
+A fresh install has five directories: ``app/``, ``public/``,
+``writable/``, ``tests/`` and ``vendor/`` or ``system/``.
 Each of these directories has a very specific part to play.
 
 app
@@ -24,17 +24,17 @@ structure that works well for many applications. The following folders make up t
 
 .. code-block:: none
 
-    /app
-        /Config         Stores the configuration files
-        /Controllers    Controllers determine the program flow
-        /Database       Stores the database migrations and seeds files
-        /Filters        Stores filter classes that can run before and after controller
-        /Helpers        Helpers store collections of standalone functions
-        /Language       Multiple language support reads the language strings from here
-        /Libraries      Useful classes that don't fit in another category
-        /Models         Models work with the database to represent the business entities.
-        /ThirdParty     ThirdParty libraries that can be used in application
-        /Views          Views make up the HTML that is displayed to the client.
+    app/
+        Config/         Stores the configuration files
+        Controllers/    Controllers determine the program flow
+        Database/       Stores the database migrations and seeds files
+        Filters/        Stores filter classes that can run before and after controller
+        Helpers/        Helpers store collections of standalone functions
+        Language/       Multiple language support reads the language strings from here
+        Libraries/      Useful classes that don't fit in another category
+        Models/         Models work with the database to represent the business entities
+        ThirdParty/     ThirdParty libraries that can be used in application
+        Views/          Views make up the HTML that is displayed to the client
 
 Because the ``app`` directory is already namespaced, you should feel free to modify the structure
 of this directory to suit your application's needs. For example, you might decide to start using the Repository

From a3ccae4722a261859ebba5f11d87c2696510e333 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Wed, 25 May 2022 15:47:20 +0800
Subject: [PATCH 2250/2325] rebase

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/Database/BaseBuilder.php               | 65 ++++++++++++-
 system/Database/SQLSRV/Builder.php            |  2 +-
 tests/system/Database/Builder/UnionTest.php   | 92 +++++++++++++++++++
 tests/system/Database/Live/UnionTest.php      | 62 +++++++++++++
 user_guide_src/source/changelogs/v4.2.0.rst   |  1 +
 .../source/database/query_builder.rst         | 51 ++++++++++
 .../source/database/query_builder/103.php     | 11 +++
 .../source/database/query_builder/104.php     | 14 +++
 8 files changed, 295 insertions(+), 3 deletions(-)
 create mode 100644 tests/system/Database/Builder/UnionTest.php
 create mode 100644 tests/system/Database/Live/UnionTest.php
 create mode 100644 user_guide_src/source/database/query_builder/103.php
 create mode 100644 user_guide_src/source/database/query_builder/104.php

diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
index 818d4d31deda..ca983691ea0c 100644
--- a/system/Database/BaseBuilder.php
+++ b/system/Database/BaseBuilder.php
@@ -109,6 +109,13 @@ class BaseBuilder
      */
     public $QBOrderBy = [];
 
+    /**
+     * QB UNION data
+     *
+     * @var array<string>
+     */
+    protected array $QBUnion = [];
+
     /**
      * QB NO ESCAPE data
      *
@@ -1138,6 +1145,48 @@ protected function _like_statement(?string $prefix, string $column, ?string $not
         return "{$prefix} {$column} {$not} LIKE :{$bind}:";
     }
 
+    /**
+     * Add UNION statement
+     *
+     * @param BaseBuilder|Closure $union
+     *
+     * @return $this
+     */
+    public function union($union)
+    {
+        return $this->addUnionStatement($union);
+    }
+
+    /**
+     * Add UNION ALL statement
+     *
+     * @param BaseBuilder|Closure $union
+     *
+     * @return $this
+     */
+    public function unionAll($union)
+    {
+        return $this->addUnionStatement($union, true);
+    }
+
+    /**
+     * @used-by union()
+     * @used-by unionAll()
+     *
+     * @param BaseBuilder|Closure $union
+     *
+     * @return $this
+     */
+    protected function addUnionStatement($union, bool $all = false)
+    {
+        $this->QBUnion[] = "\n" . 'UNION '
+            . ($all ? 'ALL ' : '')
+            . 'SELECT * FROM '
+            . $this->buildSubquery($union, true, 'uwrp' . (count($this->QBUnion) + 1));
+
+        return $this;
+    }
+
     /**
      * Starts a query group.
      *
@@ -2427,10 +2476,10 @@ protected function compileSelect($selectOverride = false): string
             . $this->compileOrderBy();
 
         if ($this->QBLimit) {
-            return $this->_limit($sql . "\n");
+            $sql = $this->_limit($sql . "\n");
         }
 
-        return $sql;
+        return $this->unionInjection($sql);
     }
 
     /**
@@ -2585,6 +2634,17 @@ protected function compileOrderBy(): string
         return '';
     }
 
+    protected function unionInjection(string $sql): string
+    {
+        if ($this->QBUnion === []) {
+            return $sql;
+        }
+
+        return 'SELECT * FROM (' . $sql . ') '
+            . ($this->db->protectIdentifiers ? $this->db->escapeIdentifiers('uwrp0') : 'uwrp0')
+            . implode("\n", $this->QBUnion);
+    }
+
     /**
      * Takes an object as input and converts the class variables to array key/vals
      *
@@ -2704,6 +2764,7 @@ protected function resetSelect()
             'QBDistinct' => false,
             'QBLimit'    => false,
             'QBOffset'   => false,
+            'QBUnion'    => [],
         ]);
 
         if (! empty($this->db)) {
diff --git a/system/Database/SQLSRV/Builder.php b/system/Database/SQLSRV/Builder.php
index f84d1dfddd07..a5bf829a6b74 100755
--- a/system/Database/SQLSRV/Builder.php
+++ b/system/Database/SQLSRV/Builder.php
@@ -597,7 +597,7 @@ protected function compileSelect($selectOverride = false): string
             $sql = $this->_limit($sql . "\n");
         }
 
-        return $sql;
+        return $this->unionInjection($sql);
     }
 
     /**
diff --git a/tests/system/Database/Builder/UnionTest.php b/tests/system/Database/Builder/UnionTest.php
new file mode 100644
index 000000000000..10ff971acf7b
--- /dev/null
+++ b/tests/system/Database/Builder/UnionTest.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Builder;
+
+use CodeIgniter\Database\BaseBuilder;
+use CodeIgniter\Database\SQLSRV\Connection as SQLSRVConnection;
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\Mock\MockConnection;
+
+/**
+ * @internal
+ */
+final class UnionTest extends CIUnitTestCase
+{
+    /**
+     * @var MockConnection
+     */
+    protected $db;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->db = new MockConnection([]);
+    }
+
+    public function testUnion(): void
+    {
+        $expected = 'SELECT * FROM (SELECT * FROM "test") "uwrp0" UNION SELECT * FROM (SELECT * FROM "test") "uwrp1"';
+        $builder  = $this->db->table('test');
+
+        $builder->union($this->db->table('test'));
+        $this->assertSame($expected, $this->buildSelect($builder));
+
+        $builder = $this->db->table('test');
+
+        $builder->union(static fn ($builder) => $builder->from('test'));
+        $this->assertSame($expected, $this->buildSelect($builder));
+    }
+
+    public function testUnionAll(): void
+    {
+        $expected = 'SELECT * FROM (SELECT * FROM "test") "uwrp0"'
+            . ' UNION ALL SELECT * FROM (SELECT * FROM "test") "uwrp1"';
+        $builder = $this->db->table('test');
+
+        $builder->unionAll($this->db->table('test'));
+        $this->assertSame($expected, $this->buildSelect($builder));
+    }
+
+    public function testOrderLimit(): void
+    {
+        $expected = 'SELECT * FROM (SELECT * FROM "test" ORDER BY "id" DESC  LIMIT 10) "uwrp0"'
+            . ' UNION SELECT * FROM (SELECT * FROM "test") "uwrp1"';
+        $builder = $this->db->table('test');
+
+        $builder->union($this->db->table('test'))->limit(10)->orderBy('id', 'DESC');
+        $this->assertSame($expected, $this->buildSelect($builder));
+    }
+
+    public function testUnionSQLSRV(): void
+    {
+        $expected = 'SELECT * FROM (SELECT * FROM "test"."dbo"."users") "uwrp0"'
+            . ' UNION SELECT * FROM (SELECT * FROM "test"."dbo"."users") "uwrp1"';
+
+        $db = new SQLSRVConnection(['DBDriver' => 'SQLSRV', 'database' => 'test', 'schema' => 'dbo']);
+
+        $builder = $db->table('users');
+
+        $builder->union($db->table('users'));
+        $this->assertSame($expected, $this->buildSelect($builder));
+
+        $builder = $db->table('users');
+
+        $builder->union(static fn ($builder) => $builder->from('users'));
+        $this->assertSame($expected, $this->buildSelect($builder));
+    }
+
+    protected function buildSelect(BaseBuilder $builder): string
+    {
+        return str_replace("\n", ' ', $builder->getCompiledSelect());
+    }
+}
diff --git a/tests/system/Database/Live/UnionTest.php b/tests/system/Database/Live/UnionTest.php
new file mode 100644
index 000000000000..cd27da0a3689
--- /dev/null
+++ b/tests/system/Database/Live/UnionTest.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * This file is part of CodeIgniter 4 framework.
+ *
+ * (c) CodeIgniter Foundation <admin@codeigniter.com>
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace CodeIgniter\Database\Live;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\DatabaseTestTrait;
+use Tests\Support\Database\Seeds\CITestSeeder;
+
+/**
+ * @group DatabaseLive
+ *
+ * @internal
+ */
+final class UnionTest extends CIUnitTestCase
+{
+    use DatabaseTestTrait;
+
+    protected $refresh = true;
+    protected $seed    = CITestSeeder::class;
+
+    public function testUnion(): void
+    {
+        $union = $this->db->table('user')
+            ->limit(1)
+            ->orderBy('id', 'ASC');
+        $builder = $this->db->table('user');
+
+        $builder->union($union)
+            ->limit(1)
+            ->orderBy('id', 'DESC');
+
+        $result = $this->db->newQuery()
+            ->fromSubquery($builder, 'q')
+            ->orderBy('id', 'DESC')
+            ->get();
+
+        $this->assertSame(2, $result->getNumRows());
+
+        $rows = $result->getResult();
+        $this->assertSame(4, (int) $rows[0]->id);
+        $this->assertSame(1, (int) $rows[1]->id);
+    }
+
+    public function testUnionAll(): void
+    {
+        $union   = $this->db->table('user');
+        $builder = $this->db->table('user');
+
+        $result = $builder->unionAll($union)->get();
+
+        $this->assertSame(8, $result->getNumRows());
+    }
+}
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 082311eca8d3..f440076b5987 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -73,6 +73,7 @@ Database
     - Added the class ``CodeIgniter\Database\RawSql`` which expresses raw SQL strings.
     - :ref:`select() <query-builder-select-rawsql>`, :ref:`where() <query-builder-where-rawsql>`, :ref:`like() <query-builder-like-rawsql>`, :ref:`join() <query-builder-join-rawsql>` accept the ``CodeIgniter\Database\RawSql`` instance.
 - ``DBForge::addField()`` default value raw SQL string support. See :ref:`forge-addfield-default-value-rawsql`.
+- QueryBuilder. Union queries. See :ref:`query-builder-union`.
 
 Others
 ======
diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 0d1d219a127e..032407c5de30 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -679,6 +679,41 @@ As is in ``countAllResult()`` method, this method resets any field values that y
 to ``select()`` as well. If you need to keep them, you can pass ``false`` as the
 first parameter.
 
+.. _query-builder-union:
+
+*************
+Union queries
+*************
+
+Union
+=====
+
+$builder->union()
+-----------------
+
+Is used to combine the result-set of two or more SELECT statements.
+
+.. literalinclude:: query_builder/103.php
+
+.. note:: For correct work with DBMS (such as MSSQL and Oracle) queries are wrapped in ``SELECT * FROM ( ... ) alias``
+    The main query will always have an alias of ``uwrp0``. Each subsequent query added via ``union()`` will have an
+    alias ``uwrpN+1``.
+
+All union queries will be added after the main query, regardless of the order in which the ``union()`` method was
+called. That is, the ``limit()`` or ``orderBy()`` methods will be relative to the main query, even if called after
+``union()``.
+
+In some cases, it may be necessary, for example, to sort or limit the number of records of the query result.
+The solution is to use the wrapper created via ``$db->newQuery()``.
+In the example below, we get the first 5 users + the last 5 users and sort the result by id:
+
+.. literalinclude:: query_builder/104.php
+
+$builder->unionAll()
+--------------------
+
+The behavior is the same as the ``union()`` method.
+
 **************
 Query grouping
 **************
@@ -1495,6 +1530,22 @@ Class Reference
 
         Adds an ``OFFSET`` clause to a query.
 
+    .. php:method:: union($union)
+
+        :param BaseBulder|Closure $union: Union query
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
+
+        Adds a ``UNION`` clause.
+
+    .. php:method:: unionAll($union)
+
+        :param BaseBulder|Closure $union: Union query
+        :returns:   ``BaseBuilder`` instance (method chaining)
+        :rtype:     ``BaseBuilder``
+
+        Adds a ``UNION ALL`` clause.
+
     .. php:method:: set($key[, $value = ''[, $escape = null]])
 
         :param mixed $key: Field name, or an array of field/value pairs
diff --git a/user_guide_src/source/database/query_builder/103.php b/user_guide_src/source/database/query_builder/103.php
new file mode 100644
index 000000000000..ffe869181fc7
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/103.php
@@ -0,0 +1,11 @@
+<?php
+
+$union   = $this->db->table('users')->select('id', 'name');
+$builder = $this->db->table('users')->select('id', 'name');
+
+$builder->union($union)->limit(10)->get();
+/*
+ * Produces:
+ * SELECT * FROM (SELECT `id`, `name` FROM `users` LIMIT 10) uwrp0
+ * UNION SELECT * FROM (SELECT `id`, `name` FROM `users`) uwrp1
+ */
diff --git a/user_guide_src/source/database/query_builder/104.php b/user_guide_src/source/database/query_builder/104.php
new file mode 100644
index 000000000000..11c716dea999
--- /dev/null
+++ b/user_guide_src/source/database/query_builder/104.php
@@ -0,0 +1,14 @@
+<?php
+
+$union   = $this->db->table('users')->select('id', 'name')->orderBy('id', 'DESC')->limit(5);
+$builder = $this->db->table('users')->select('id', 'name')->orderBy('id', 'ASC')->limit(5)->union($union);
+
+$this->db->newQuery()->fromSubquery($builder, 'q')->orderBy('id', 'DESC')->get();
+/*
+ * Produces:
+ * SELECT * FROM (
+ *      SELECT * FROM (SELECT `id`, `name` FROM `users` ORDER BY `id` ASC LIMIT 5) uwrp0
+ *      UNION
+ *      SELECT * FROM (SELECT `id`, `name` FROM `users` ORDER BY `id` DESC LIMIT 5) uwrp1
+ * ) q ORDER BY `id` DESC
+ */

From ddccdcbc844261bc42c42f09a82ed597dca5d60d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 25 May 2022 18:04:04 +0900
Subject: [PATCH 2251/2325] docs: add note for Session::get()

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

diff --git a/user_guide_src/source/libraries/sessions.rst b/user_guide_src/source/libraries/sessions.rst
index 08d394d0ba24..26ffaf8badd0 100644
--- a/user_guide_src/source/libraries/sessions.rst
+++ b/user_guide_src/source/libraries/sessions.rst
@@ -143,6 +143,10 @@ omit the item key (magic getter only works for single property values):
 
 .. literalinclude:: sessions/009.php
 
+.. important:: The ``get()`` method WILL return flashdata or tempdata items when
+    retrieving a single item by key. It will not return flashdata or tempdata when
+    grabbing all userdata from the session, however.
+
 Adding Session Data
 ===================
 

From e90df73706dc42e9fed427c513452093f12d3524 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 25 May 2022 18:47:10 +0900
Subject: [PATCH 2252/2325] docs: add changelog

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 082311eca8d3..12e73f15af4a 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -25,6 +25,7 @@ BREAKING
 - To prevent unexpected access from the web browser, if a controller is added to a cli route (``$routes->cli()``), all methods of that controller are no longer accessible via auto-routing.
 - There is a possible backward compatibility break for those users extending the History Collector and they should probably update ``History::setFiles()`` method.
 - The :php:func:`dot_array_search`'s unexpected behavior has been fixed. Now ``dot_array_search('foo.bar.baz', ['foo' => ['bar' => 23]])`` returns ``null``. The previous versions returned ``23``.
+- The default parameter values for ``Service::reset()`` and ``CIUnitTestCase::resetServices()`` have been changed from ``false`` to ``true``. This is to eliminate unexpected problems during testing, such as ``lang()`` not getting translated messages.
 
 Enhancements
 ************

From 98c43f794cc7abab393e0fb5d0e099a5c4067a50 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 26 May 2022 06:36:45 +0900
Subject: [PATCH 2253/2325] docs: add docs

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

diff --git a/user_guide_src/source/libraries/curlrequest.rst b/user_guide_src/source/libraries/curlrequest.rst
index b77d41e6b088..84995839ecdb 100644
--- a/user_guide_src/source/libraries/curlrequest.rst
+++ b/user_guide_src/source/libraries/curlrequest.rst
@@ -28,12 +28,14 @@ Sharing Options
 
 Due to historical reasons, by default, the CURLRequest shares all the options between requests.
 If you send more than one request with an instance of the class,
-this behavior may cause an error request with unnecessary headers.
+this behavior may cause an error request with unnecessary headers and body.
 
 You can change the behavior by editing the following config parameter value in **app/Config/CURLRequest.php** to ``false``:
 
 .. literalinclude:: curlrequest/001.php
 
+.. note:: Before v4.2.0, the request body is not reset even if ``$shareOptions`` is false due to a bug.
+
 *******************
 Loading the Library
 *******************

From c65a26dc9b817422e1a435e7b8a5b1fb8f58882a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 26 May 2022 13:43:15 +0900
Subject: [PATCH 2254/2325] refactor: use get_filenames() 4th param

No need to return directories.
---
 system/Autoloader/FileLocator.php   | 2 +-
 system/Database/MigrationRunner.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
index 250248a579dc..14d7982c49b4 100644
--- a/system/Autoloader/FileLocator.php
+++ b/system/Autoloader/FileLocator.php
@@ -343,7 +343,7 @@ public function listNamespaceFiles(string $prefix, string $path): array
                 continue;
             }
 
-            $tempFiles = get_filenames($fullPath, true);
+            $tempFiles = get_filenames($fullPath, true, false, false);
 
             if (! empty($tempFiles)) {
                 $files = array_merge($files, $tempFiles);
diff --git a/system/Database/MigrationRunner.php b/system/Database/MigrationRunner.php
index cd96ebed9a1b..e92d31b02450 100644
--- a/system/Database/MigrationRunner.php
+++ b/system/Database/MigrationRunner.php
@@ -424,7 +424,7 @@ public function findNamespaceMigrations(string $namespace): array
         if (! empty($this->path)) {
             helper('filesystem');
             $dir   = rtrim($this->path, DIRECTORY_SEPARATOR) . '/';
-            $files = get_filenames($dir, true);
+            $files = get_filenames($dir, true, false, false);
         } else {
             $files = $locator->listNamespaceFiles($namespace, '/Database/Migrations/');
         }

From dd187f3079d3a88919adaf291c146089b01d12b2 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Thu, 26 May 2022 14:38:38 +0700
Subject: [PATCH 2255/2325] [Rector] Apply PHPUnitSetList::REMOVE_MOCKS

---
 rector.php                                             | 1 +
 tests/system/Database/Forge/CreateTableTest.php        | 4 ++--
 tests/system/Debug/Toolbar/Collectors/DatabaseTest.php | 4 +---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/rector.php b/rector.php
index b5d7131f725a..ba3cf52b0fc7 100644
--- a/rector.php
+++ b/rector.php
@@ -57,6 +57,7 @@
         LevelSetList::UP_TO_PHP_74,
         PHPUnitSetList::PHPUNIT_SPECIFIC_METHOD,
         PHPUnitSetList::PHPUNIT_80,
+        PHPUnitSetList::REMOVE_MOCKS,
     ]);
 
     $rectorConfig->parallel();
diff --git a/tests/system/Database/Forge/CreateTableTest.php b/tests/system/Database/Forge/CreateTableTest.php
index ddb190b1e4d5..4a9c92bd6f27 100644
--- a/tests/system/Database/Forge/CreateTableTest.php
+++ b/tests/system/Database/Forge/CreateTableTest.php
@@ -27,7 +27,7 @@ public function testCreateTableWithExists()
             ->setConstructorArgs([[]])
             ->onlyMethods(['listTables'])
             ->getMock();
-        $dbMock->expects($this->any())
+        $dbMock
             ->method('listTables')
             ->willReturn(['foo']);
 
@@ -53,7 +53,7 @@ public function testCreateTableWithDefaultRawSql()
             ->setConstructorArgs([[]])
             ->onlyMethods(['query'])
             ->getMock();
-        $dbMock->expects($this->any())
+        $dbMock
             ->method('query')
             ->with($sql)
             ->willReturn(true);
diff --git a/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php b/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php
index 3b139d9f2d7e..adcf47702dae 100644
--- a/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php
+++ b/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php
@@ -23,9 +23,7 @@ final class DatabaseTest extends CIUnitTestCase
     public function testDisplay(): void
     {
         /** @var MockObject&Query $query */
-        $query = $this->getMockBuilder(Query::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $query = $this->createMock(Query::class);
 
         // set mock returns
         $query->method('getQuery')->willReturn('SHOW TABLES;');

From b2f228f00292226bcca32153fc4a96d32526dcf9 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Thu, 26 May 2022 14:57:56 +0700
Subject: [PATCH 2256/2325] fix line

---
 tests/system/Debug/Toolbar/Collectors/DatabaseTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php b/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php
index adcf47702dae..a55686a18aec 100644
--- a/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php
+++ b/tests/system/Debug/Toolbar/Collectors/DatabaseTest.php
@@ -37,7 +37,7 @@ public function testDisplay(): void
 
         $this->assertSame('1234.56 ms', $queries[0]['duration']);
         $this->assertSame('<strong>SHOW</strong> TABLES;', $queries[0]['sql']);
-        $this->assertSame(clean_path(__FILE__) . ':35', $queries[0]['trace-file']);
+        $this->assertSame(clean_path(__FILE__) . ':33', $queries[0]['trace-file']);
 
         foreach ($queries[0]['trace'] as $i => $trace) {
             // since we added the index numbering

From 2732abb58fe5077a480098dc23ad5b1b6b1fb092 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 26 May 2022 19:55:37 +0900
Subject: [PATCH 2257/2325] docs: replace "Form validation" with "Validation"

Form validation is the name of CI3 library.
---
 user_guide_src/source/concepts/security.rst   | 6 +++---
 user_guide_src/source/helpers/form_helper.rst | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/user_guide_src/source/concepts/security.rst b/user_guide_src/source/concepts/security.rst
index 147c2a94c6a4..7efc051a49cd 100644
--- a/user_guide_src/source/concepts/security.rst
+++ b/user_guide_src/source/concepts/security.rst
@@ -39,7 +39,7 @@ CodeIgniter provisions
 ======================
 
 - :doc:`HTTP library <../incoming/incomingrequest>` provides for input field filtering & content metadata
-- Form validation library
+- Validation library
 
 *********************************************
 A2 Weak authentication and session management
@@ -82,7 +82,7 @@ CodeIgniter provisions
 ======================
 
 - esc function
-- Form validation library
+- Validation library
 
 ***********************************
 A4 Insecure Direct Object Reference
@@ -103,7 +103,7 @@ OWASP recommendations
 CodeIgniter provisions
 ======================
 
-- Form validation library
+- Validation library
 - Easy to add third party authentication
 
 ****************************
diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst
index 676a16adf5cf..8f270085f85f 100644
--- a/user_guide_src/source/helpers/form_helper.rst
+++ b/user_guide_src/source/helpers/form_helper.rst
@@ -510,8 +510,8 @@ The following functions are available:
         <input type="radio" name="myradio" value="1" <?= set_radio('myradio', '1', true) ?> />
         <input type="radio" name="myradio" value="2" <?= set_radio('myradio', '2') ?> />
 
-    .. note:: If you are using the Form Validation class, you must always specify
+    .. note:: If you are using the Validation class, you must always specify
         a rule for your field, even if empty, in order for the ``set_*()``
-        functions to work. This is because if a Form Validation object is
+        functions to work. This is because if a Validation object is
         defined, the control for ``set_*()`` is handed over to a method of the
         class instead of the generic helper function.

From 4152f15d47847255652944ef9a798f08ac285c54 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 26 May 2022 19:56:29 +0900
Subject: [PATCH 2258/2325] docs: fix title underlines

---
 .../source/libraries/validation.rst           | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/user_guide_src/source/libraries/validation.rst b/user_guide_src/source/libraries/validation.rst
index 72a399a845a3..5710687ee1fd 100644
--- a/user_guide_src/source/libraries/validation.rst
+++ b/user_guide_src/source/libraries/validation.rst
@@ -1,7 +1,7 @@
 .. _validation:
 
 Validation
-##################################################
+##########
 
 CodeIgniter provides a comprehensive data validation class that
 helps minimize the amount of code you'll write.
@@ -11,7 +11,7 @@ helps minimize the amount of code you'll write.
     :depth: 2
 
 Overview
-************************************************
+********
 
 Before explaining CodeIgniter's approach to data validation, let's
 describe the ideal scenario:
@@ -43,7 +43,7 @@ HTML. Form validation, while simple to create, is generally very messy
 and tedious to implement.
 
 Form Validation Tutorial
-************************************************
+************************
 
 What follows is a "hands on" tutorial for implementing CodeIgniter's Form
 Validation.
@@ -60,7 +60,7 @@ Let's create those three things, using a member sign-up form as the
 example.
 
 The Form
-================================================
+========
 
 Using a text editor, create a form called **Signup.php**. In it, place this
 code and save it to your **app/Views/** folder::
@@ -95,7 +95,7 @@ code and save it to your **app/Views/** folder::
     </html>
 
 The Success Page
-================================================
+================
 
 Using a text editor, create a form called **Success.php**. In it, place
 this code and save it to your **app/Views/** folder::
@@ -114,7 +114,7 @@ this code and save it to your **app/Views/** folder::
     </html>
 
 The Controller
-================================================
+==============
 
 Using a text editor, create a controller called **Form.php**. In it, place
 this code and save it to your **app/Controllers/** folder:
@@ -122,7 +122,7 @@ this code and save it to your **app/Controllers/** folder:
 .. literalinclude:: validation/001.php
 
 Try it!
-================================================
+=======
 
 To try your form, visit your site using a URL similar to this one::
 
@@ -140,7 +140,7 @@ the **Validation class** inside. See :ref:`controllers-validating-data`.
     any of them failing.
 
 Explanation
-================================================
+===========
 
 You'll notice several things about the above pages:
 
@@ -166,7 +166,7 @@ Based on whether the validation was successful it either presents the
 form or the success page.
 
 Add Validation Rules
-================================================
+====================
 
 Then add validation rules in the controller (**Form.php**):
 
@@ -206,7 +206,7 @@ If you want to use these rules, you need to change the rule classes in **app/Con
 .. literalinclude:: validation/003.php
 
 Loading the Library
-************************************************
+*******************
 
 The library is loaded as a service named **validation**:
 
@@ -219,7 +219,7 @@ for including multiple Rulesets, and collections of rules that can be easily reu
     the :doc:`Model </models/model>` provide methods to make validation even easier.
 
 Setting Validation Rules
-************************************************
+************************
 
 CodeIgniter lets you set as many validation rules as you need for a
 given field, cascading them in order. To set validation rules you
@@ -268,10 +268,10 @@ data to be validated:
 .. literalinclude:: validation/008.php
 
 Working with Validation
-************************************************
+***********************
 
 Validating Keys that are Arrays
-================================================
+===============================
 
 If your data is in a nested associative array, you can use "dot array syntax" to
 easily validate your data:
@@ -288,14 +288,14 @@ For example, data returned by multi select dropdown:
 .. literalinclude:: validation/011.php
 
 Validate 1 Value
-================================================
+================
 
 Validate one value against a rule:
 
 .. literalinclude:: validation/012.php
 
 Saving Sets of Validation Rules to the Config File
-=======================================================
+==================================================
 
 A nice feature of the Validation class is that it permits you to store all
 your validation rules for your entire application in a config file. You organize
@@ -305,7 +305,7 @@ the validation.
 .. _validation-array:
 
 How to save your rules
--------------------------------------------------------
+----------------------
 
 To store your validation rules, simply create a new public property in the ``Config\Validation``
 class with the name of your group. This element will hold an array with your validation
@@ -330,7 +330,7 @@ Or pass all settings in an array:
 See below for details on the formatting of the array.
 
 Getting & Setting Rule Groups
--------------------------------------------------------
+-----------------------------
 
 **Get Rule Group**
 
@@ -345,7 +345,7 @@ This method sets a rule group from the validation configuration to the validatio
 .. literalinclude:: validation/018.php
 
 Running Multiple Validations
-=======================================================
+============================
 
 .. note:: ``run()`` method will not reset error state. Should a previous run fail,
    ``run()`` will always return false and ``getErrors()`` will return
@@ -359,7 +359,7 @@ you previously set, so ``setRules()``, ``setRuleGroup()`` etc. need to be repeat
 .. literalinclude:: validation/019.php
 
 Validation Placeholders
-=======================================================
+=======================
 
 The Validation class provides a simple method to replace parts of your rules based on data that's being passed into it. This
 sounds fairly obscure but can be especially handy with the ``is_unique`` validation rule. Placeholders are simply
@@ -383,7 +383,7 @@ This can also be used to create more dynamic rules at runtime, as long as you ta
 keys passed in don't conflict with your form data.
 
 Working With Errors
-************************************************
+*******************
 
 The Validation library provides several methods to help you set error messages, provide
 custom error messages, and retrieve one or more errors to display.
@@ -535,7 +535,7 @@ right after the name of the field the error should belong to::
     <?= $validation->showError('username', 'my_single') ?>
 
 Creating Custom Rules
-************************************************
+*********************
 
 Rules are stored within simple, namespaced classes. They can be stored any location you would like, as long as the
 autoloader can find it. These files are called RuleSets. To add a new RuleSet, edit **Config/Validation.php** and

From 7440f7ba7dc6cf6bca6267d06a3d5dc3edebc5f6 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Fri, 27 May 2022 09:48:34 +0800
Subject: [PATCH 2259/2325] Bug: The SQLSRV driver ignores the port value from
 the config.

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/Database/SQLSRV/Connection.php       | 4 ++++
 user_guide_src/source/changelogs/v4.2.0.rst | 1 +
 2 files changed, 5 insertions(+)

diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index acbada4e6c0a..58bbf6f3db30 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -120,6 +120,10 @@ public function connect(bool $persistent = false)
             unset($connection['UID'], $connection['PWD']);
         }
 
+        if (strpos($this->hostname, ',') === false) {
+            $this->hostname = $this->port !== '' ? "{$this->hostname}, {$this->port}" : $this->hostname;
+        }
+
         sqlsrv_configure('WarningsReturnAsErrors', 0);
         $this->connID = sqlsrv_connect($this->hostname, $connection);
 
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 8a280839758b..55a5e6b9739d 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -119,5 +119,6 @@ Deprecations
 
 Bugs Fixed
 **********
+- The SQLSRV driver ignores the port value from the config.
 
 See the repo's `CHANGELOG.md <https://github.com/codeigniter4/CodeIgniter4/blob/develop/CHANGELOG.md>`_ for a complete list of bugs fixed.

From a6d9eefa003935e5070045d074062b0d0c8178ac Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Fri, 27 May 2022 12:38:38 +0800
Subject: [PATCH 2260/2325] Condition changed

Signed-off-by: Andrey Pyzhikov <5071@mail.ru>
---
 system/Database/SQLSRV/Connection.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/Database/SQLSRV/Connection.php b/system/Database/SQLSRV/Connection.php
index 58bbf6f3db30..f180ca4f6b3b 100755
--- a/system/Database/SQLSRV/Connection.php
+++ b/system/Database/SQLSRV/Connection.php
@@ -120,8 +120,8 @@ public function connect(bool $persistent = false)
             unset($connection['UID'], $connection['PWD']);
         }
 
-        if (strpos($this->hostname, ',') === false) {
-            $this->hostname = $this->port !== '' ? "{$this->hostname}, {$this->port}" : $this->hostname;
+        if (strpos($this->hostname, ',') === false && $this->port !== '') {
+            $this->hostname .= ', ' . $this->port;
         }
 
         sqlsrv_configure('WarningsReturnAsErrors', 0);

From e099ad1684642ce5e385b63e9cfe0bbe16b01b9e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 27 May 2022 15:49:49 +0900
Subject: [PATCH 2261/2325] chore: update editorconfig

---
 .editorconfig | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 53faf5c3beac..9d4b1ef22825 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,13 +1,15 @@
-; top-most EditorConfig file
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://editorconfig.org
+
 root = true
 
-; Unix-style newlines
 [*]
-end_of_line = lf
-
-[*.php]
-indent_style = space
-indent_size = 4
 charset = utf-8
-trim_trailing_whitespace = true
+indent_size = 4
+indent_style = space
+end_of_line = lf
 insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.yml]
+indent_size = 2

From fb63cf0351d82b8821ea81951b6fe146d459185a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 27 May 2022 15:50:13 +0900
Subject: [PATCH 2262/2325] style: replace tabs with space in Views

---
 app/Views/errors/html/debug.css            |  214 +--
 app/Views/errors/html/debug.js             |  172 ++-
 app/Views/errors/html/error_404.php        |  150 +--
 app/Views/errors/html/error_exception.php  |  706 +++++-----
 app/Views/errors/html/production.php       |   20 +-
 app/Views/welcome_message.php              |  532 ++++----
 app/index.html                             |    2 +-
 system/Debug/Toolbar/Views/_config.tpl     |   86 +-
 system/Debug/Toolbar/Views/toolbar.js      | 1360 ++++++++++----------
 system/Debug/Toolbar/Views/toolbar.tpl.php |  416 +++---
 10 files changed, 1828 insertions(+), 1830 deletions(-)

diff --git a/app/Views/errors/html/debug.css b/app/Views/errors/html/debug.css
index 384d66d95f87..98f54dbc8a01 100644
--- a/app/Views/errors/html/debug.css
+++ b/app/Views/errors/html/debug.css
@@ -1,197 +1,197 @@
 :root {
-	--main-bg-color: #fff;
-	--main-text-color: #555;
-	--dark-text-color: #222;
-	--light-text-color: #c7c7c7;
-	--brand-primary-color: #E06E3F;
-	--light-bg-color: #ededee;
-	--dark-bg-color: #404040;
+    --main-bg-color: #fff;
+    --main-text-color: #555;
+    --dark-text-color: #222;
+    --light-text-color: #c7c7c7;
+    --brand-primary-color: #E06E3F;
+    --light-bg-color: #ededee;
+    --dark-bg-color: #404040;
 }
 
 body {
-	height: 100%;
-	background: var(--main-bg-color);
-	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
-	color: var(--main-text-color);
-	font-weight: 300;
-	margin: 0;
-	padding: 0;
+    height: 100%;
+    background: var(--main-bg-color);
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
+    color: var(--main-text-color);
+    font-weight: 300;
+    margin: 0;
+    padding: 0;
 }
 h1 {
-	font-weight: lighter;
-	letter-spacing: 0.8;
-	font-size: 3rem;
-	color: var(--dark-text-color);
-	margin: 0;
+    font-weight: lighter;
+    letter-spacing: 0.8;
+    font-size: 3rem;
+    color: var(--dark-text-color);
+    margin: 0;
 }
 h1.headline {
-	margin-top: 20%;
-	font-size: 5rem;
+    margin-top: 20%;
+    font-size: 5rem;
 }
 .text-center {
-	text-align: center;
+    text-align: center;
 }
 p.lead {
-	font-size: 1.6rem;
+    font-size: 1.6rem;
 }
 .container {
-	max-width: 75rem;
-	margin: 0 auto;
-	padding: 1rem;
+    max-width: 75rem;
+    margin: 0 auto;
+    padding: 1rem;
 }
 .header {
-	background: var(--light-bg-color);
-	color: var(--dark-text-color);
+    background: var(--light-bg-color);
+    color: var(--dark-text-color);
 }
 .header .container {
-	padding: 1rem 1.75rem 1.75rem 1.75rem;
+    padding: 1rem 1.75rem 1.75rem 1.75rem;
 }
 .header h1 {
-	font-size: 2.5rem;
-	font-weight: 500;
+    font-size: 2.5rem;
+    font-weight: 500;
 }
 .header p {
-	font-size: 1.2rem;
-	margin: 0;
-	line-height: 2.5;
+    font-size: 1.2rem;
+    margin: 0;
+    line-height: 2.5;
 }
 .header a {
-	color: var(--brand-primary-color);
-	margin-left: 2rem;
-	display: none;
-	text-decoration: none;
+    color: var(--brand-primary-color);
+    margin-left: 2rem;
+    display: none;
+    text-decoration: none;
 }
 .header:hover a {
-	display: inline;
+    display: inline;
 }
 
 .footer {
-	background: var(--dark-bg-color);
-	color: var(--light-text-color);
+    background: var(--dark-bg-color);
+    color: var(--light-text-color);
 }
 .footer .container {
-	border-top: 1px solid #e7e7e7;
-	margin-top: 1rem;
-	text-align: center;
+    border-top: 1px solid #e7e7e7;
+    margin-top: 1rem;
+    text-align: center;
 }
 
 .source {
-	background: #343434;
-	color: var(--light-text-color);
-	padding: 0.5em 1em;
-	border-radius: 5px;
-	font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
-	font-size: 0.85rem;
-	margin: 0;
-	overflow-x: scroll;
+    background: #343434;
+    color: var(--light-text-color);
+    padding: 0.5em 1em;
+    border-radius: 5px;
+    font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+    font-size: 0.85rem;
+    margin: 0;
+    overflow-x: scroll;
 }
 .source span.line {
-	line-height: 1.4;
+    line-height: 1.4;
 }
 .source span.line .number {
-	color: #666;
+    color: #666;
 }
 .source .line .highlight {
-	display: block;
-	background: var(--dark-text-color);
-	color: var(--light-text-color);
+    display: block;
+    background: var(--dark-text-color);
+    color: var(--light-text-color);
 }
 .source span.highlight .number {
-	color: #fff;
+    color: #fff;
 }
 
 .tabs {
-	list-style: none;
-	list-style-position: inside;
-	margin: 0;
-	padding: 0;
-	margin-bottom: -1px;
+    list-style: none;
+    list-style-position: inside;
+    margin: 0;
+    padding: 0;
+    margin-bottom: -1px;
 }
 .tabs li {
-	display: inline;
+    display: inline;
 }
 .tabs a:link,
 .tabs a:visited {
-	padding: 0rem 1rem;
-	line-height: 2.7;
-	text-decoration: none;
-	color: var(--dark-text-color);
-	background: var(--light-bg-color);
-	border: 1px solid rgba(0,0,0,0.15);
-	border-bottom: 0;
-	border-top-left-radius: 5px;
-	border-top-right-radius: 5px;
-	display: inline-block;
+    padding: 0rem 1rem;
+    line-height: 2.7;
+    text-decoration: none;
+    color: var(--dark-text-color);
+    background: var(--light-bg-color);
+    border: 1px solid rgba(0,0,0,0.15);
+    border-bottom: 0;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
+    display: inline-block;
 }
 .tabs a:hover {
-	background: var(--light-bg-color);
-	border-color: rgba(0,0,0,0.15);
+    background: var(--light-bg-color);
+    border-color: rgba(0,0,0,0.15);
 }
 .tabs a.active {
-	background: var(--main-bg-color);
-	color: var(--main-text-color);
+    background: var(--main-bg-color);
+    color: var(--main-text-color);
 }
 .tab-content {
-	background: var(--main-bg-color);
-	border: 1px solid rgba(0,0,0,0.15);
+    background: var(--main-bg-color);
+    border: 1px solid rgba(0,0,0,0.15);
 }
 .content {
-	padding: 1rem;
+    padding: 1rem;
 }
 .hide {
-	display: none;
+    display: none;
 }
 
 .alert {
-	margin-top: 2rem;
-	display: block;
-	text-align: center;
-	line-height: 3.0;
-	background: #d9edf7;
-	border: 1px solid #bcdff1;
-	border-radius: 5px;
-	color: #31708f;
+    margin-top: 2rem;
+    display: block;
+    text-align: center;
+    line-height: 3.0;
+    background: #d9edf7;
+    border: 1px solid #bcdff1;
+    border-radius: 5px;
+    color: #31708f;
 }
 ul, ol {
-	line-height: 1.8;
+    line-height: 1.8;
 }
 
 table {
-	width: 100%;
-	overflow: hidden;
+    width: 100%;
+    overflow: hidden;
 }
 th {
-	text-align: left;
-	border-bottom: 1px solid #e7e7e7;
-	padding-bottom: 0.5rem;
+    text-align: left;
+    border-bottom: 1px solid #e7e7e7;
+    padding-bottom: 0.5rem;
 }
 td {
-	padding: 0.2rem 0.5rem 0.2rem 0;
+    padding: 0.2rem 0.5rem 0.2rem 0;
 }
 tr:hover td {
-	background: #f1f1f1;
+    background: #f1f1f1;
 }
 td pre {
-	white-space: pre-wrap;
+    white-space: pre-wrap;
 }
 
 .trace a {
-	color: inherit;
+    color: inherit;
 }
 .trace table {
-	width: auto;
+    width: auto;
 }
 .trace tr td:first-child {
-	min-width: 5em;
-	font-weight: bold;
+    min-width: 5em;
+    font-weight: bold;
 }
 .trace td {
-	background: var(--light-bg-color);
-	padding: 0 1rem;
+    background: var(--light-bg-color);
+    padding: 0 1rem;
 }
 .trace td pre {
-	margin: 0;
+    margin: 0;
 }
 .args {
-	display: none;
+    display: none;
 }
diff --git a/app/Views/errors/html/debug.js b/app/Views/errors/html/debug.js
index 2b4d0638153a..99199cac872c 100644
--- a/app/Views/errors/html/debug.js
+++ b/app/Views/errors/html/debug.js
@@ -1,118 +1,116 @@
-// Tabs
-
 var tabLinks    = new Array();
 var contentDivs = new Array();
 
 function init()
 {
-	// Grab the tab links and content divs from the page
-	var tabListItems = document.getElementById('tabs').childNodes;
-	console.log(tabListItems);
-	for (var i = 0; i < tabListItems.length; i ++)
-	{
-		if (tabListItems[i].nodeName == "LI")
-		{
-			var tabLink     = getFirstChildWithTagName(tabListItems[i], 'A');
-			var id          = getHash(tabLink.getAttribute('href'));
-			tabLinks[id]    = tabLink;
-			contentDivs[id] = document.getElementById(id);
-		}
-	}
+    // Grab the tab links and content divs from the page
+    var tabListItems = document.getElementById('tabs').childNodes;
+    console.log(tabListItems);
+    for (var i = 0; i < tabListItems.length; i ++)
+    {
+        if (tabListItems[i].nodeName == "LI")
+        {
+            var tabLink     = getFirstChildWithTagName(tabListItems[i], 'A');
+            var id          = getHash(tabLink.getAttribute('href'));
+            tabLinks[id]    = tabLink;
+            contentDivs[id] = document.getElementById(id);
+        }
+    }
 
-	// Assign onclick events to the tab links, and
-	// highlight the first tab
-	var i = 0;
+    // Assign onclick events to the tab links, and
+    // highlight the first tab
+    var i = 0;
 
-	for (var id in tabLinks)
-	{
-		tabLinks[id].onclick = showTab;
-		tabLinks[id].onfocus = function () {
-			this.blur()
-		};
-		if (i == 0)
-		{
-			tabLinks[id].className = 'active';
-		}
-		i ++;
-	}
+    for (var id in tabLinks)
+    {
+        tabLinks[id].onclick = showTab;
+        tabLinks[id].onfocus = function () {
+            this.blur()
+        };
+        if (i == 0)
+        {
+            tabLinks[id].className = 'active';
+        }
+        i ++;
+    }
 
-	// Hide all content divs except the first
-	var i = 0;
+    // Hide all content divs except the first
+    var i = 0;
 
-	for (var id in contentDivs)
-	{
-		if (i != 0)
-		{
-			console.log(contentDivs[id]);
-			contentDivs[id].className = 'content hide';
-		}
-		i ++;
-	}
+    for (var id in contentDivs)
+    {
+        if (i != 0)
+        {
+            console.log(contentDivs[id]);
+            contentDivs[id].className = 'content hide';
+        }
+        i ++;
+    }
 }
 
 function showTab()
 {
-	var selectedId = getHash(this.getAttribute('href'));
+    var selectedId = getHash(this.getAttribute('href'));
 
-	// Highlight the selected tab, and dim all others.
-	// Also show the selected content div, and hide all others.
-	for (var id in contentDivs)
-	{
-		if (id == selectedId)
-		{
-			tabLinks[id].className    = 'active';
-			contentDivs[id].className = 'content';
-		}
-		else
-		{
-			tabLinks[id].className    = '';
-			contentDivs[id].className = 'content hide';
-		}
-	}
+    // Highlight the selected tab, and dim all others.
+    // Also show the selected content div, and hide all others.
+    for (var id in contentDivs)
+    {
+        if (id == selectedId)
+        {
+            tabLinks[id].className    = 'active';
+            contentDivs[id].className = 'content';
+        }
+        else
+        {
+            tabLinks[id].className    = '';
+            contentDivs[id].className = 'content hide';
+        }
+    }
 
-	// Stop the browser following the link
-	return false;
+    // Stop the browser following the link
+    return false;
 }
 
 function getFirstChildWithTagName(element, tagName)
 {
-	for (var i = 0; i < element.childNodes.length; i ++)
-	{
-		if (element.childNodes[i].nodeName == tagName)
-		{
-			return element.childNodes[i];
-		}
-	}
+    for (var i = 0; i < element.childNodes.length; i ++)
+    {
+        if (element.childNodes[i].nodeName == tagName)
+        {
+            return element.childNodes[i];
+        }
+    }
 }
 
 function getHash(url)
 {
-	var hashPos = url.lastIndexOf('#');
-	return url.substring(hashPos + 1);
+    var hashPos = url.lastIndexOf('#');
+    return url.substring(hashPos + 1);
 }
 
 function toggle(elem)
 {
-	elem = document.getElementById(elem);
+    elem = document.getElementById(elem);
 
-	if (elem.style && elem.style['display'])
-	{
-		// Only works with the "style" attr
-		var disp = elem.style['display'];
-	}
-	else if (elem.currentStyle)
-	{
-		// For MSIE, naturally
-		var disp = elem.currentStyle['display'];
-	}
-	else if (window.getComputedStyle)
-	{
-		// For most other browsers
-		var disp = document.defaultView.getComputedStyle(elem, null).getPropertyValue('display');
-	}
+    if (elem.style && elem.style['display'])
+    {
+        // Only works with the "style" attr
+        var disp = elem.style['display'];
+    }
+    else if (elem.currentStyle)
+    {
+        // For MSIE, naturally
+        var disp = elem.currentStyle['display'];
+    }
+    else if (window.getComputedStyle)
+    {
+        // For most other browsers
+        var disp = document.defaultView.getComputedStyle(elem, null).getPropertyValue('display');
+    }
 
-	// Toggle the state of the "display" style
-	elem.style.display = disp == 'block' ? 'none' : 'block';
+    // Toggle the state of the "display" style
+    elem.style.display = disp == 'block' ? 'none' : 'block';
 
-	return false;
+    return false;
 }
diff --git a/app/Views/errors/html/error_404.php b/app/Views/errors/html/error_404.php
index 56818c750314..f81717fdd0f5 100644
--- a/app/Views/errors/html/error_404.php
+++ b/app/Views/errors/html/error_404.php
@@ -1,84 +1,84 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<meta charset="utf-8">
-	<title>404 Page Not Found</title>
+    <meta charset="utf-8">
+    <title>404 Page Not Found</title>
 
-	<style>
-		div.logo {
-			height: 200px;
-			width: 155px;
-			display: inline-block;
-			opacity: 0.08;
-			position: absolute;
-			top: 2rem;
-			left: 50%;
-			margin-left: -73px;
-		}
-		body {
-			height: 100%;
-			background: #fafafa;
-			font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-			color: #777;
-			font-weight: 300;
-		}
-		h1 {
-			font-weight: lighter;
-			letter-spacing: normal;
-			font-size: 3rem;
-			margin-top: 0;
-			margin-bottom: 0;
-			color: #222;
-		}
-		.wrap {
-			max-width: 1024px;
-			margin: 5rem auto;
-			padding: 2rem;
-			background: #fff;
-			text-align: center;
-			border: 1px solid #efefef;
-			border-radius: 0.5rem;
-			position: relative;
-		}
-		pre {
-			white-space: normal;
-			margin-top: 1.5rem;
-		}
-		code {
-			background: #fafafa;
-			border: 1px solid #efefef;
-			padding: 0.5rem 1rem;
-			border-radius: 5px;
-			display: block;
-		}
-		p {
-			margin-top: 1.5rem;
-		}
-		.footer {
-			margin-top: 2rem;
-			border-top: 1px solid #efefef;
-			padding: 1em 2em 0 2em;
-			font-size: 85%;
-			color: #999;
-		}
-		a:active,
-		a:link,
-		a:visited {
-			color: #dd4814;
-		}
-	</style>
+    <style>
+        div.logo {
+            height: 200px;
+            width: 155px;
+            display: inline-block;
+            opacity: 0.08;
+            position: absolute;
+            top: 2rem;
+            left: 50%;
+            margin-left: -73px;
+        }
+        body {
+            height: 100%;
+            background: #fafafa;
+            font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+            color: #777;
+            font-weight: 300;
+        }
+        h1 {
+            font-weight: lighter;
+            letter-spacing: normal;
+            font-size: 3rem;
+            margin-top: 0;
+            margin-bottom: 0;
+            color: #222;
+        }
+        .wrap {
+            max-width: 1024px;
+            margin: 5rem auto;
+            padding: 2rem;
+            background: #fff;
+            text-align: center;
+            border: 1px solid #efefef;
+            border-radius: 0.5rem;
+            position: relative;
+        }
+        pre {
+            white-space: normal;
+            margin-top: 1.5rem;
+        }
+        code {
+            background: #fafafa;
+            border: 1px solid #efefef;
+            padding: 0.5rem 1rem;
+            border-radius: 5px;
+            display: block;
+        }
+        p {
+            margin-top: 1.5rem;
+        }
+        .footer {
+            margin-top: 2rem;
+            border-top: 1px solid #efefef;
+            padding: 1em 2em 0 2em;
+            font-size: 85%;
+            color: #999;
+        }
+        a:active,
+        a:link,
+        a:visited {
+            color: #dd4814;
+        }
+    </style>
 </head>
 <body>
-	<div class="wrap">
-		<h1>404 - File Not Found</h1>
+    <div class="wrap">
+        <h1>404 - File Not Found</h1>
 
-		<p>
-			<?php if (! empty($message) && $message !== '(null)') : ?>
-				<?= nl2br(esc($message)) ?>
-			<?php else : ?>
-				Sorry! Cannot seem to find the page you were looking for.
-			<?php endif ?>
-		</p>
-	</div>
+        <p>
+            <?php if (! empty($message) && $message !== '(null)') : ?>
+                <?= nl2br(esc($message)) ?>
+            <?php else : ?>
+                Sorry! Cannot seem to find the page you were looking for.
+            <?php endif ?>
+        </p>
+    </div>
 </body>
 </html>
diff --git a/app/Views/errors/html/error_exception.php b/app/Views/errors/html/error_exception.php
index 6cb520a5912e..77e963b2920a 100644
--- a/app/Views/errors/html/error_exception.php
+++ b/app/Views/errors/html/error_exception.php
@@ -2,87 +2,87 @@
 <!doctype html>
 <html>
 <head>
-	<meta charset="UTF-8">
-	<meta name="robots" content="noindex">
+    <meta charset="UTF-8">
+    <meta name="robots" content="noindex">
 
-	<title><?= esc($title) ?></title>
-	<style type="text/css">
-		<?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.css')) ?>
-	</style>
+    <title><?= esc($title) ?></title>
+    <style type="text/css">
+        <?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.css')) ?>
+    </style>
 
-	<script type="text/javascript">
-		<?= file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.js') ?>
-	</script>
+    <script type="text/javascript">
+        <?= file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.js') ?>
+    </script>
 </head>
 <body onload="init()">
 
-	<!-- Header -->
-	<div class="header">
-		<div class="container">
-			<h1><?= esc($title), esc($exception->getCode() ? ' #' . $exception->getCode() : '') ?></h1>
-			<p>
-				<?= nl2br(esc($exception->getMessage())) ?>
-				<a href="https://www.duckduckgo.com/?q=<?= urlencode($title . ' ' . preg_replace('#\'.*\'|".*"#Us', '', $exception->getMessage())) ?>"
-				   rel="noreferrer" target="_blank">search &rarr;</a>
-			</p>
-		</div>
-	</div>
-
-	<!-- Source -->
-	<div class="container">
-		<p><b><?= esc(clean_path($file)) ?></b> at line <b><?= esc($line) ?></b></p>
-
-		<?php if (is_file($file)) : ?>
-			<div class="source">
-				<?= static::highlightFile($file, $line, 15); ?>
-			</div>
-		<?php endif; ?>
-	</div>
-
-	<div class="container">
-
-		<ul class="tabs" id="tabs">
-			<li><a href="#backtrace">Backtrace</a></li>
-			<li><a href="#server">Server</a></li>
-			<li><a href="#request">Request</a></li>
-			<li><a href="#response">Response</a></li>
-			<li><a href="#files">Files</a></li>
-			<li><a href="#memory">Memory</a></li>
-		</ul>
-
-		<div class="tab-content">
-
-			<!-- Backtrace -->
-			<div class="content" id="backtrace">
-
-				<ol class="trace">
-				<?php foreach ($trace as $index => $row) : ?>
-
-					<li>
-						<p>
-							<!-- Trace info -->
-							<?php if (isset($row['file']) && is_file($row['file'])) :?>
-								<?php
+    <!-- Header -->
+    <div class="header">
+        <div class="container">
+            <h1><?= esc($title), esc($exception->getCode() ? ' #' . $exception->getCode() : '') ?></h1>
+            <p>
+                <?= nl2br(esc($exception->getMessage())) ?>
+                <a href="https://www.duckduckgo.com/?q=<?= urlencode($title . ' ' . preg_replace('#\'.*\'|".*"#Us', '', $exception->getMessage())) ?>"
+                   rel="noreferrer" target="_blank">search &rarr;</a>
+            </p>
+        </div>
+    </div>
+
+    <!-- Source -->
+    <div class="container">
+        <p><b><?= esc(clean_path($file)) ?></b> at line <b><?= esc($line) ?></b></p>
+
+        <?php if (is_file($file)) : ?>
+            <div class="source">
+                <?= static::highlightFile($file, $line, 15); ?>
+            </div>
+        <?php endif; ?>
+    </div>
+
+    <div class="container">
+
+        <ul class="tabs" id="tabs">
+            <li><a href="#backtrace">Backtrace</a></li>
+            <li><a href="#server">Server</a></li>
+            <li><a href="#request">Request</a></li>
+            <li><a href="#response">Response</a></li>
+            <li><a href="#files">Files</a></li>
+            <li><a href="#memory">Memory</a></li>
+        </ul>
+
+        <div class="tab-content">
+
+            <!-- Backtrace -->
+            <div class="content" id="backtrace">
+
+                <ol class="trace">
+                <?php foreach ($trace as $index => $row) : ?>
+
+                    <li>
+                        <p>
+                            <!-- Trace info -->
+                            <?php if (isset($row['file']) && is_file($row['file'])) :?>
+                                <?php
                                 if (isset($row['function']) && in_array($row['function'], ['include', 'include_once', 'require', 'require_once'], true)) {
                                     echo esc($row['function'] . ' ' . clean_path($row['file']));
                                 } else {
                                     echo esc(clean_path($row['file']) . ' : ' . $row['line']);
                                 }
                                 ?>
-							<?php else: ?>
-								{PHP internal code}
-							<?php endif; ?>
-
-							<!-- Class/Method -->
-							<?php if (isset($row['class'])) : ?>
-								&nbsp;&nbsp;&mdash;&nbsp;&nbsp;<?= esc($row['class'] . $row['type'] . $row['function']) ?>
-								<?php if (! empty($row['args'])) : ?>
-									<?php $args_id = $error_id . 'args' . $index ?>
-									( <a href="#" onclick="return toggle('<?= esc($args_id, 'attr') ?>');">arguments</a> )
-									<div class="args" id="<?= esc($args_id, 'attr') ?>">
-										<table cellspacing="0">
-
-										<?php
+                            <?php else: ?>
+                                {PHP internal code}
+                            <?php endif; ?>
+
+                            <!-- Class/Method -->
+                            <?php if (isset($row['class'])) : ?>
+                                &nbsp;&nbsp;&mdash;&nbsp;&nbsp;<?= esc($row['class'] . $row['type'] . $row['function']) ?>
+                                <?php if (! empty($row['args'])) : ?>
+                                    <?php $args_id = $error_id . 'args' . $index ?>
+                                    ( <a href="#" onclick="return toggle('<?= esc($args_id, 'attr') ?>');">arguments</a> )
+                                    <div class="args" id="<?= esc($args_id, 'attr') ?>">
+                                        <table cellspacing="0">
+
+                                        <?php
                                         $params = null;
                                         // Reflection by name is not available for closure function
                                         if (substr($row['function'], -1) !== '}') {
@@ -91,200 +91,200 @@
                                         }
 
                                         foreach ($row['args'] as $key => $value) : ?>
-											<tr>
-												<td><code><?= esc(isset($params[$key]) ? '$' . $params[$key]->name : "#{$key}") ?></code></td>
-												<td><pre><?= esc(print_r($value, true)) ?></pre></td>
-											</tr>
-										<?php endforeach ?>
-
-										</table>
-									</div>
-								<?php else : ?>
-									()
-								<?php endif; ?>
-							<?php endif; ?>
-
-							<?php if (! isset($row['class']) && isset($row['function'])) : ?>
-								&nbsp;&nbsp;&mdash;&nbsp;&nbsp;	<?= esc($row['function']) ?>()
-							<?php endif; ?>
-						</p>
-
-						<!-- Source? -->
-						<?php if (isset($row['file']) && is_file($row['file']) && isset($row['class'])) : ?>
-							<div class="source">
-								<?= static::highlightFile($row['file'], $row['line']) ?>
-							</div>
-						<?php endif; ?>
-					</li>
-
-				<?php endforeach; ?>
-				</ol>
-
-			</div>
-
-			<!-- Server -->
-			<div class="content" id="server">
-				<?php foreach (['_SERVER', '_SESSION'] as $var) : ?>
-					<?php
+                                            <tr>
+                                                <td><code><?= esc(isset($params[$key]) ? '$' . $params[$key]->name : "#{$key}") ?></code></td>
+                                                <td><pre><?= esc(print_r($value, true)) ?></pre></td>
+                                            </tr>
+                                        <?php endforeach ?>
+
+                                        </table>
+                                    </div>
+                                <?php else : ?>
+                                    ()
+                                <?php endif; ?>
+                            <?php endif; ?>
+
+                            <?php if (! isset($row['class']) && isset($row['function'])) : ?>
+                                &nbsp;&nbsp;&mdash;&nbsp;&nbsp;    <?= esc($row['function']) ?>()
+                            <?php endif; ?>
+                        </p>
+
+                        <!-- Source? -->
+                        <?php if (isset($row['file']) && is_file($row['file']) && isset($row['class'])) : ?>
+                            <div class="source">
+                                <?= static::highlightFile($row['file'], $row['line']) ?>
+                            </div>
+                        <?php endif; ?>
+                    </li>
+
+                <?php endforeach; ?>
+                </ol>
+
+            </div>
+
+            <!-- Server -->
+            <div class="content" id="server">
+                <?php foreach (['_SERVER', '_SESSION'] as $var) : ?>
+                    <?php
                     if (empty($GLOBALS[$var]) || ! is_array($GLOBALS[$var])) {
                         continue;
                     } ?>
 
-					<h3>$<?= esc($var) ?></h3>
-
-					<table>
-						<thead>
-							<tr>
-								<th>Key</th>
-								<th>Value</th>
-							</tr>
-						</thead>
-						<tbody>
-						<?php foreach ($GLOBALS[$var] as $key => $value) : ?>
-							<tr>
-								<td><?= esc($key) ?></td>
-								<td>
-									<?php if (is_string($value)) : ?>
-										<?= esc($value) ?>
-									<?php else: ?>
-										<pre><?= esc(print_r($value, true)) ?></pre>
-									<?php endif; ?>
-								</td>
-							</tr>
-						<?php endforeach; ?>
-						</tbody>
-					</table>
-
-				<?php endforeach ?>
-
-				<!-- Constants -->
-				<?php $constants = get_defined_constants(true); ?>
-				<?php if (! empty($constants['user'])) : ?>
-					<h3>Constants</h3>
-
-					<table>
-						<thead>
-							<tr>
-								<th>Key</th>
-								<th>Value</th>
-							</tr>
-						</thead>
-						<tbody>
-						<?php foreach ($constants['user'] as $key => $value) : ?>
-							<tr>
-								<td><?= esc($key) ?></td>
-								<td>
-									<?php if (is_string($value)) : ?>
-										<?= esc($value) ?>
-									<?php else: ?>
-										<pre><?= esc(print_r($value, true)) ?></pre>
-									<?php endif; ?>
-								</td>
-							</tr>
-						<?php endforeach; ?>
-						</tbody>
-					</table>
-				<?php endif; ?>
-			</div>
-
-			<!-- Request -->
-			<div class="content" id="request">
-				<?php $request = \Config\Services::request(); ?>
-
-				<table>
-					<tbody>
-						<tr>
-							<td style="width: 10em">Path</td>
-							<td><?= esc($request->getUri()) ?></td>
-						</tr>
-						<tr>
-							<td>HTTP Method</td>
-							<td><?= esc(strtoupper($request->getMethod())) ?></td>
-						</tr>
-						<tr>
-							<td>IP Address</td>
-							<td><?= esc($request->getIPAddress()) ?></td>
-						</tr>
-						<tr>
-							<td style="width: 10em">Is AJAX Request?</td>
-							<td><?= $request->isAJAX() ? 'yes' : 'no' ?></td>
-						</tr>
-						<tr>
-							<td>Is CLI Request?</td>
-							<td><?= $request->isCLI() ? 'yes' : 'no' ?></td>
-						</tr>
-						<tr>
-							<td>Is Secure Request?</td>
-							<td><?= $request->isSecure() ? 'yes' : 'no' ?></td>
-						</tr>
-						<tr>
-							<td>User Agent</td>
-							<td><?= esc($request->getUserAgent()->getAgentString()) ?></td>
-						</tr>
-
-					</tbody>
-				</table>
-
-
-				<?php $empty = true; ?>
-				<?php foreach (['_GET', '_POST', '_COOKIE'] as $var) : ?>
-					<?php
+                    <h3>$<?= esc($var) ?></h3>
+
+                    <table>
+                        <thead>
+                            <tr>
+                                <th>Key</th>
+                                <th>Value</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        <?php foreach ($GLOBALS[$var] as $key => $value) : ?>
+                            <tr>
+                                <td><?= esc($key) ?></td>
+                                <td>
+                                    <?php if (is_string($value)) : ?>
+                                        <?= esc($value) ?>
+                                    <?php else: ?>
+                                        <pre><?= esc(print_r($value, true)) ?></pre>
+                                    <?php endif; ?>
+                                </td>
+                            </tr>
+                        <?php endforeach; ?>
+                        </tbody>
+                    </table>
+
+                <?php endforeach ?>
+
+                <!-- Constants -->
+                <?php $constants = get_defined_constants(true); ?>
+                <?php if (! empty($constants['user'])) : ?>
+                    <h3>Constants</h3>
+
+                    <table>
+                        <thead>
+                            <tr>
+                                <th>Key</th>
+                                <th>Value</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        <?php foreach ($constants['user'] as $key => $value) : ?>
+                            <tr>
+                                <td><?= esc($key) ?></td>
+                                <td>
+                                    <?php if (is_string($value)) : ?>
+                                        <?= esc($value) ?>
+                                    <?php else: ?>
+                                        <pre><?= esc(print_r($value, true)) ?></pre>
+                                    <?php endif; ?>
+                                </td>
+                            </tr>
+                        <?php endforeach; ?>
+                        </tbody>
+                    </table>
+                <?php endif; ?>
+            </div>
+
+            <!-- Request -->
+            <div class="content" id="request">
+                <?php $request = \Config\Services::request(); ?>
+
+                <table>
+                    <tbody>
+                        <tr>
+                            <td style="width: 10em">Path</td>
+                            <td><?= esc($request->getUri()) ?></td>
+                        </tr>
+                        <tr>
+                            <td>HTTP Method</td>
+                            <td><?= esc(strtoupper($request->getMethod())) ?></td>
+                        </tr>
+                        <tr>
+                            <td>IP Address</td>
+                            <td><?= esc($request->getIPAddress()) ?></td>
+                        </tr>
+                        <tr>
+                            <td style="width: 10em">Is AJAX Request?</td>
+                            <td><?= $request->isAJAX() ? 'yes' : 'no' ?></td>
+                        </tr>
+                        <tr>
+                            <td>Is CLI Request?</td>
+                            <td><?= $request->isCLI() ? 'yes' : 'no' ?></td>
+                        </tr>
+                        <tr>
+                            <td>Is Secure Request?</td>
+                            <td><?= $request->isSecure() ? 'yes' : 'no' ?></td>
+                        </tr>
+                        <tr>
+                            <td>User Agent</td>
+                            <td><?= esc($request->getUserAgent()->getAgentString()) ?></td>
+                        </tr>
+
+                    </tbody>
+                </table>
+
+
+                <?php $empty = true; ?>
+                <?php foreach (['_GET', '_POST', '_COOKIE'] as $var) : ?>
+                    <?php
                     if (empty($GLOBALS[$var]) || ! is_array($GLOBALS[$var])) {
                         continue;
                     } ?>
 
-					<?php $empty = false; ?>
-
-					<h3>$<?= esc($var) ?></h3>
-
-					<table style="width: 100%">
-						<thead>
-							<tr>
-								<th>Key</th>
-								<th>Value</th>
-							</tr>
-						</thead>
-						<tbody>
-						<?php foreach ($GLOBALS[$var] as $key => $value) : ?>
-							<tr>
-								<td><?= esc($key) ?></td>
-								<td>
-									<?php if (is_string($value)) : ?>
-										<?= esc($value) ?>
-									<?php else: ?>
-										<pre><?= esc(print_r($value, true)) ?></pre>
-									<?php endif; ?>
-								</td>
-							</tr>
-						<?php endforeach; ?>
-						</tbody>
-					</table>
-
-				<?php endforeach ?>
-
-				<?php if ($empty) : ?>
-
-					<div class="alert">
-						No $_GET, $_POST, or $_COOKIE Information to show.
-					</div>
-
-				<?php endif; ?>
-
-				<?php $headers = $request->getHeaders(); ?>
-				<?php if (! empty($headers)) : ?>
-
-					<h3>Headers</h3>
-
-					<table>
-						<thead>
-							<tr>
-								<th>Header</th>
-								<th>Value</th>
-							</tr>
-						</thead>
-						<tbody>
-						<?php foreach ($headers as $value) : ?>
-							<?php
+                    <?php $empty = false; ?>
+
+                    <h3>$<?= esc($var) ?></h3>
+
+                    <table style="width: 100%">
+                        <thead>
+                            <tr>
+                                <th>Key</th>
+                                <th>Value</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        <?php foreach ($GLOBALS[$var] as $key => $value) : ?>
+                            <tr>
+                                <td><?= esc($key) ?></td>
+                                <td>
+                                    <?php if (is_string($value)) : ?>
+                                        <?= esc($value) ?>
+                                    <?php else: ?>
+                                        <pre><?= esc(print_r($value, true)) ?></pre>
+                                    <?php endif; ?>
+                                </td>
+                            </tr>
+                        <?php endforeach; ?>
+                        </tbody>
+                    </table>
+
+                <?php endforeach ?>
+
+                <?php if ($empty) : ?>
+
+                    <div class="alert">
+                        No $_GET, $_POST, or $_COOKIE Information to show.
+                    </div>
+
+                <?php endif; ?>
+
+                <?php $headers = $request->getHeaders(); ?>
+                <?php if (! empty($headers)) : ?>
+
+                    <h3>Headers</h3>
+
+                    <table>
+                        <thead>
+                            <tr>
+                                <th>Header</th>
+                                <th>Value</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        <?php foreach ($headers as $value) : ?>
+                            <?php
                             if (empty($value)) {
                                 continue;
                             }
@@ -292,106 +292,106 @@
                             if (! is_array($value)) {
                                 $value = [$value];
                             } ?>
-							<?php foreach ($value as $h) : ?>
-								<tr>
-									<td><?= esc($h->getName(), 'html') ?></td>
-									<td><?= esc($h->getValueLine(), 'html') ?></td>
-								</tr>
-							<?php endforeach; ?>
-						<?php endforeach; ?>
-						</tbody>
-					</table>
-
-				<?php endif; ?>
-			</div>
-
-			<!-- Response -->
-			<?php
+                            <?php foreach ($value as $h) : ?>
+                                <tr>
+                                    <td><?= esc($h->getName(), 'html') ?></td>
+                                    <td><?= esc($h->getValueLine(), 'html') ?></td>
+                                </tr>
+                            <?php endforeach; ?>
+                        <?php endforeach; ?>
+                        </tbody>
+                    </table>
+
+                <?php endif; ?>
+            </div>
+
+            <!-- Response -->
+            <?php
                 $response = \Config\Services::response();
                 $response->setStatusCode(http_response_code());
             ?>
-			<div class="content" id="response">
-				<table>
-					<tr>
-						<td style="width: 15em">Response Status</td>
-						<td><?= esc($response->getStatusCode() . ' - ' . $response->getReasonPhrase()) ?></td>
-					</tr>
-				</table>
-
-				<?php $headers = $response->getHeaders(); ?>
-				<?php if (! empty($headers)) : ?>
-					<?php natsort($headers) ?>
-
-					<h3>Headers</h3>
-
-					<table>
-						<thead>
-							<tr>
-								<th>Header</th>
-								<th>Value</th>
-							</tr>
-						</thead>
-						<tbody>
-						<?php foreach ($headers as $name => $value) : ?>
-							<tr>
-								<td><?= esc($name, 'html') ?></td>
-								<td><?= esc($response->getHeaderLine($name), 'html') ?></td>
-							</tr>
-						<?php endforeach; ?>
-						</tbody>
-					</table>
-
-				<?php endif; ?>
-			</div>
-
-			<!-- Files -->
-			<div class="content" id="files">
-				<?php $files = get_included_files(); ?>
-
-				<ol>
-				<?php foreach ($files as $file) :?>
-					<li><?= esc(clean_path($file)) ?></li>
-				<?php endforeach ?>
-				</ol>
-			</div>
-
-			<!-- Memory -->
-			<div class="content" id="memory">
-
-				<table>
-					<tbody>
-						<tr>
-							<td>Memory Usage</td>
-							<td><?= esc(static::describeMemory(memory_get_usage(true))) ?></td>
-						</tr>
-						<tr>
-							<td style="width: 12em">Peak Memory Usage:</td>
-							<td><?= esc(static::describeMemory(memory_get_peak_usage(true))) ?></td>
-						</tr>
-						<tr>
-							<td>Memory Limit:</td>
-							<td><?= esc(ini_get('memory_limit')) ?></td>
-						</tr>
-					</tbody>
-				</table>
-
-			</div>
-
-		</div>  <!-- /tab-content -->
-
-	</div> <!-- /container -->
-
-	<div class="footer">
-		<div class="container">
-
-			<p>
-				Displayed at <?= esc(date('H:i:sa')) ?> &mdash;
-				PHP: <?= esc(PHP_VERSION) ?>  &mdash;
-				CodeIgniter: <?= esc(\CodeIgniter\CodeIgniter::CI_VERSION) ?>
-			</p>
-
-		</div>
-	</div>
+            <div class="content" id="response">
+                <table>
+                    <tr>
+                        <td style="width: 15em">Response Status</td>
+                        <td><?= esc($response->getStatusCode() . ' - ' . $response->getReasonPhrase()) ?></td>
+                    </tr>
+                </table>
+
+                <?php $headers = $response->getHeaders(); ?>
+                <?php if (! empty($headers)) : ?>
+                    <?php natsort($headers) ?>
+
+                    <h3>Headers</h3>
+
+                    <table>
+                        <thead>
+                            <tr>
+                                <th>Header</th>
+                                <th>Value</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                        <?php foreach ($headers as $name => $value) : ?>
+                            <tr>
+                                <td><?= esc($name, 'html') ?></td>
+                                <td><?= esc($response->getHeaderLine($name), 'html') ?></td>
+                            </tr>
+                        <?php endforeach; ?>
+                        </tbody>
+                    </table>
+
+                <?php endif; ?>
+            </div>
+
+            <!-- Files -->
+            <div class="content" id="files">
+                <?php $files = get_included_files(); ?>
+
+                <ol>
+                <?php foreach ($files as $file) :?>
+                    <li><?= esc(clean_path($file)) ?></li>
+                <?php endforeach ?>
+                </ol>
+            </div>
+
+            <!-- Memory -->
+            <div class="content" id="memory">
+
+                <table>
+                    <tbody>
+                        <tr>
+                            <td>Memory Usage</td>
+                            <td><?= esc(static::describeMemory(memory_get_usage(true))) ?></td>
+                        </tr>
+                        <tr>
+                            <td style="width: 12em">Peak Memory Usage:</td>
+                            <td><?= esc(static::describeMemory(memory_get_peak_usage(true))) ?></td>
+                        </tr>
+                        <tr>
+                            <td>Memory Limit:</td>
+                            <td><?= esc(ini_get('memory_limit')) ?></td>
+                        </tr>
+                    </tbody>
+                </table>
+
+            </div>
+
+        </div>  <!-- /tab-content -->
+
+    </div> <!-- /container -->
+
+    <div class="footer">
+        <div class="container">
+
+            <p>
+                Displayed at <?= esc(date('H:i:sa')) ?> &mdash;
+                PHP: <?= esc(PHP_VERSION) ?>  &mdash;
+                CodeIgniter: <?= esc(\CodeIgniter\CodeIgniter::CI_VERSION) ?>
+            </p>
+
+        </div>
+    </div>
 
 </body>
 </html>
diff --git a/app/Views/errors/html/production.php b/app/Views/errors/html/production.php
index cca49c2ed9c3..9faa4a15b783 100644
--- a/app/Views/errors/html/production.php
+++ b/app/Views/errors/html/production.php
@@ -1,24 +1,24 @@
 <!doctype html>
 <html>
 <head>
-	<meta charset="UTF-8">
-	<meta name="robots" content="noindex">
+    <meta charset="UTF-8">
+    <meta name="robots" content="noindex">
 
-	<title>Whoops!</title>
+    <title>Whoops!</title>
 
-	<style type="text/css">
-		<?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.css')) ?>
-	</style>
+    <style type="text/css">
+        <?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'debug.css')) ?>
+    </style>
 </head>
 <body>
 
-	<div class="container text-center">
+    <div class="container text-center">
 
-		<h1 class="headline">Whoops!</h1>
+        <h1 class="headline">Whoops!</h1>
 
-		<p class="lead">We seem to have hit a snag. Please try again later...</p>
+        <p class="lead">We seem to have hit a snag. Please try again later...</p>
 
-	</div>
+    </div>
 
 </body>
 
diff --git a/app/Views/welcome_message.php b/app/Views/welcome_message.php
index b982f58aa158..c66a9615c6be 100644
--- a/app/Views/welcome_message.php
+++ b/app/Views/welcome_message.php
@@ -1,229 +1,229 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<meta charset="UTF-8">
-	<title>Welcome to CodeIgniter 4!</title>
-	<meta name="description" content="The small framework with powerful features">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<link rel="shortcut icon" type="image/png" href="/favicon.ico"/>
-
-	<!-- STYLES -->
-
-	<style {csp-style-nonce}>
-		* {
-			transition: background-color 300ms ease, color 300ms ease;
-		}
-		*:focus {
-			background-color: rgba(221, 72, 20, .2);
-			outline: none;
-		}
-		html, body {
-			color: rgba(33, 37, 41, 1);
-			font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
-			font-size: 16px;
-			margin: 0;
-			padding: 0;
-			-webkit-font-smoothing: antialiased;
-			-moz-osx-font-smoothing: grayscale;
-			text-rendering: optimizeLegibility;
-		}
-		header {
-			background-color: rgba(247, 248, 249, 1);
-			padding: .4rem 0 0;
-		}
-		.menu {
-			padding: .4rem 2rem;
-		}
-		header ul {
-			border-bottom: 1px solid rgba(242, 242, 242, 1);
-			list-style-type: none;
-			margin: 0;
-			overflow: hidden;
-			padding: 0;
-			text-align: right;
-		}
-		header li {
-			display: inline-block;
-		}
-		header li a {
-			border-radius: 5px;
-			color: rgba(0, 0, 0, .5);
-			display: block;
-			height: 44px;
-			text-decoration: none;
-		}
-		header li.menu-item a {
-			border-radius: 5px;
-			margin: 5px 0;
-			height: 38px;
-			line-height: 36px;
-			padding: .4rem .65rem;
-			text-align: center;
-		}
-		header li.menu-item a:hover,
-		header li.menu-item a:focus {
-			background-color: rgba(221, 72, 20, .2);
-			color: rgba(221, 72, 20, 1);
-		}
-		header .logo {
-			float: left;
-			height: 44px;
-			padding: .4rem .5rem;
-		}
-		header .menu-toggle {
-			display: none;
-			float: right;
-			font-size: 2rem;
-			font-weight: bold;
-		}
-		header .menu-toggle button {
-			background-color: rgba(221, 72, 20, .6);
-			border: none;
-			border-radius: 3px;
-			color: rgba(255, 255, 255, 1);
-			cursor: pointer;
-			font: inherit;
-			font-size: 1.3rem;
-			height: 36px;
-			padding: 0;
-			margin: 11px 0;
-			overflow: visible;
-			width: 40px;
-		}
-		header .menu-toggle button:hover,
-		header .menu-toggle button:focus {
-			background-color: rgba(221, 72, 20, .8);
-			color: rgba(255, 255, 255, .8);
-		}
-		header .heroe {
-			margin: 0 auto;
-			max-width: 1100px;
-			padding: 1rem 1.75rem 1.75rem 1.75rem;
-		}
-		header .heroe h1 {
-			font-size: 2.5rem;
-			font-weight: 500;
-		}
-		header .heroe h2 {
-			font-size: 1.5rem;
-			font-weight: 300;
-		}
-		section {
-			margin: 0 auto;
-			max-width: 1100px;
-			padding: 2.5rem 1.75rem 3.5rem 1.75rem;
-		}
-		section h1 {
-			margin-bottom: 2.5rem;
-		}
-		section h2 {
-			font-size: 120%;
-			line-height: 2.5rem;
-			padding-top: 1.5rem;
-		}
-		section pre {
-			background-color: rgba(247, 248, 249, 1);
-			border: 1px solid rgba(242, 242, 242, 1);
-			display: block;
-			font-size: .9rem;
-			margin: 2rem 0;
-			padding: 1rem 1.5rem;
-			white-space: pre-wrap;
-			word-break: break-all;
-		}
-		section code {
-			display: block;
-		}
-		section a {
-			color: rgba(221, 72, 20, 1);
-		}
-		section svg {
-			margin-bottom: -5px;
-			margin-right: 5px;
-			width: 25px;
-		}
-		.further {
-			background-color: rgba(247, 248, 249, 1);
-			border-bottom: 1px solid rgba(242, 242, 242, 1);
-			border-top: 1px solid rgba(242, 242, 242, 1);
-		}
-		.further h2:first-of-type {
-			padding-top: 0;
-		}
-		footer {
-			background-color: rgba(221, 72, 20, .8);
-			text-align: center;
-		}
-		footer .environment {
-			color: rgba(255, 255, 255, 1);
-			padding: 2rem 1.75rem;
-		}
-		footer .copyrights {
-			background-color: rgba(62, 62, 62, 1);
-			color: rgba(200, 200, 200, 1);
-			padding: .25rem 1.75rem;
-		}
-		@media (max-width: 629px) {
-			header ul {
-				padding: 0;
-			}
-			header .menu-toggle {
-				padding: 0 1rem;
-			}
-			header .menu-item {
-				background-color: rgba(244, 245, 246, 1);
-				border-top: 1px solid rgba(242, 242, 242, 1);
-				margin: 0 15px;
-				width: calc(100% - 30px);
-			}
-			header .menu-toggle {
-				display: block;
-			}
-			header .hidden {
-				display: none;
-			}
-			header li.menu-item a {
-				background-color: rgba(221, 72, 20, .1);
-			}
-			header li.menu-item a:hover,
-			header li.menu-item a:focus {
-				background-color: rgba(221, 72, 20, .7);
-				color: rgba(255, 255, 255, .8);
-			}
-		}
-	</style>
+    <meta charset="UTF-8">
+    <title>Welcome to CodeIgniter 4!</title>
+    <meta name="description" content="The small framework with powerful features">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="shortcut icon" type="image/png" href="/favicon.ico"/>
+
+    <!-- STYLES -->
+
+    <style {csp-style-nonce}>
+        * {
+            transition: background-color 300ms ease, color 300ms ease;
+        }
+        *:focus {
+            background-color: rgba(221, 72, 20, .2);
+            outline: none;
+        }
+        html, body {
+            color: rgba(33, 37, 41, 1);
+            font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
+            font-size: 16px;
+            margin: 0;
+            padding: 0;
+            -webkit-font-smoothing: antialiased;
+            -moz-osx-font-smoothing: grayscale;
+            text-rendering: optimizeLegibility;
+        }
+        header {
+            background-color: rgba(247, 248, 249, 1);
+            padding: .4rem 0 0;
+        }
+        .menu {
+            padding: .4rem 2rem;
+        }
+        header ul {
+            border-bottom: 1px solid rgba(242, 242, 242, 1);
+            list-style-type: none;
+            margin: 0;
+            overflow: hidden;
+            padding: 0;
+            text-align: right;
+        }
+        header li {
+            display: inline-block;
+        }
+        header li a {
+            border-radius: 5px;
+            color: rgba(0, 0, 0, .5);
+            display: block;
+            height: 44px;
+            text-decoration: none;
+        }
+        header li.menu-item a {
+            border-radius: 5px;
+            margin: 5px 0;
+            height: 38px;
+            line-height: 36px;
+            padding: .4rem .65rem;
+            text-align: center;
+        }
+        header li.menu-item a:hover,
+        header li.menu-item a:focus {
+            background-color: rgba(221, 72, 20, .2);
+            color: rgba(221, 72, 20, 1);
+        }
+        header .logo {
+            float: left;
+            height: 44px;
+            padding: .4rem .5rem;
+        }
+        header .menu-toggle {
+            display: none;
+            float: right;
+            font-size: 2rem;
+            font-weight: bold;
+        }
+        header .menu-toggle button {
+            background-color: rgba(221, 72, 20, .6);
+            border: none;
+            border-radius: 3px;
+            color: rgba(255, 255, 255, 1);
+            cursor: pointer;
+            font: inherit;
+            font-size: 1.3rem;
+            height: 36px;
+            padding: 0;
+            margin: 11px 0;
+            overflow: visible;
+            width: 40px;
+        }
+        header .menu-toggle button:hover,
+        header .menu-toggle button:focus {
+            background-color: rgba(221, 72, 20, .8);
+            color: rgba(255, 255, 255, .8);
+        }
+        header .heroe {
+            margin: 0 auto;
+            max-width: 1100px;
+            padding: 1rem 1.75rem 1.75rem 1.75rem;
+        }
+        header .heroe h1 {
+            font-size: 2.5rem;
+            font-weight: 500;
+        }
+        header .heroe h2 {
+            font-size: 1.5rem;
+            font-weight: 300;
+        }
+        section {
+            margin: 0 auto;
+            max-width: 1100px;
+            padding: 2.5rem 1.75rem 3.5rem 1.75rem;
+        }
+        section h1 {
+            margin-bottom: 2.5rem;
+        }
+        section h2 {
+            font-size: 120%;
+            line-height: 2.5rem;
+            padding-top: 1.5rem;
+        }
+        section pre {
+            background-color: rgba(247, 248, 249, 1);
+            border: 1px solid rgba(242, 242, 242, 1);
+            display: block;
+            font-size: .9rem;
+            margin: 2rem 0;
+            padding: 1rem 1.5rem;
+            white-space: pre-wrap;
+            word-break: break-all;
+        }
+        section code {
+            display: block;
+        }
+        section a {
+            color: rgba(221, 72, 20, 1);
+        }
+        section svg {
+            margin-bottom: -5px;
+            margin-right: 5px;
+            width: 25px;
+        }
+        .further {
+            background-color: rgba(247, 248, 249, 1);
+            border-bottom: 1px solid rgba(242, 242, 242, 1);
+            border-top: 1px solid rgba(242, 242, 242, 1);
+        }
+        .further h2:first-of-type {
+            padding-top: 0;
+        }
+        footer {
+            background-color: rgba(221, 72, 20, .8);
+            text-align: center;
+        }
+        footer .environment {
+            color: rgba(255, 255, 255, 1);
+            padding: 2rem 1.75rem;
+        }
+        footer .copyrights {
+            background-color: rgba(62, 62, 62, 1);
+            color: rgba(200, 200, 200, 1);
+            padding: .25rem 1.75rem;
+        }
+        @media (max-width: 629px) {
+            header ul {
+                padding: 0;
+            }
+            header .menu-toggle {
+                padding: 0 1rem;
+            }
+            header .menu-item {
+                background-color: rgba(244, 245, 246, 1);
+                border-top: 1px solid rgba(242, 242, 242, 1);
+                margin: 0 15px;
+                width: calc(100% - 30px);
+            }
+            header .menu-toggle {
+                display: block;
+            }
+            header .hidden {
+                display: none;
+            }
+            header li.menu-item a {
+                background-color: rgba(221, 72, 20, .1);
+            }
+            header li.menu-item a:hover,
+            header li.menu-item a:focus {
+                background-color: rgba(221, 72, 20, .7);
+                color: rgba(255, 255, 255, .8);
+            }
+        }
+    </style>
 </head>
 <body>
 
 <!-- HEADER: MENU + HEROE SECTION -->
 <header>
 
-	<div class="menu">
-		<ul>
-			<li class="logo"><a href="https://codeigniter.com" target="_blank"><img height="44" title="CodeIgniter Logo"
-																					alt="Visit CodeIgniter.com official website!"
-																					src="data:image/png;base64,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"></a>
-			</li>
-			<li class="menu-toggle">
-				<button onclick="toggleMenu();">&#9776;</button>
-			</li>
-			<li class="menu-item hidden"><a href="#">Home</a></li>
-			<li class="menu-item hidden"><a href="https://codeigniter4.github.io/userguide/" target="_blank">Docs</a>
-			</li>
-			<li class="menu-item hidden"><a href="https://forum.codeigniter.com/" target="_blank">Community</a></li>
-			<li class="menu-item hidden"><a
-					href="https://github.com/codeigniter4/CodeIgniter4/blob/develop/CONTRIBUTING.md" target="_blank">Contribute</a>
-			</li>
-		</ul>
-	</div>
-
-	<div class="heroe">
-
-		<h1>Welcome to CodeIgniter <?= CodeIgniter\CodeIgniter::CI_VERSION ?></h1>
-
-		<h2>The small framework with powerful features</h2>
-
-	</div>
+    <div class="menu">
+        <ul>
+            <li class="logo"><a href="https://codeigniter.com" target="_blank"><img height="44" title="CodeIgniter Logo"
+                                                                                    alt="Visit CodeIgniter.com official website!"
+                                                                                    src="data:image/png;base64,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"></a>
+            </li>
+            <li class="menu-toggle">
+                <button onclick="toggleMenu();">&#9776;</button>
+            </li>
+            <li class="menu-item hidden"><a href="#">Home</a></li>
+            <li class="menu-item hidden"><a href="https://codeigniter4.github.io/userguide/" target="_blank">Docs</a>
+            </li>
+            <li class="menu-item hidden"><a href="https://forum.codeigniter.com/" target="_blank">Community</a></li>
+            <li class="menu-item hidden"><a
+                    href="https://github.com/codeigniter4/CodeIgniter4/blob/develop/CONTRIBUTING.md" target="_blank">Contribute</a>
+            </li>
+        </ul>
+    </div>
+
+    <div class="heroe">
+
+        <h1>Welcome to CodeIgniter <?= CodeIgniter\CodeIgniter::CI_VERSION ?></h1>
+
+        <h2>The small framework with powerful features</h2>
+
+    </div>
 
 </header>
 
@@ -231,91 +231,91 @@
 
 <section>
 
-	<h1>About this page</h1>
+    <h1>About this page</h1>
 
-	<p>The page you are looking at is being generated dynamically by CodeIgniter.</p>
+    <p>The page you are looking at is being generated dynamically by CodeIgniter.</p>
 
-	<p>If you would like to edit this page you will find it located at:</p>
+    <p>If you would like to edit this page you will find it located at:</p>
 
-	<pre><code>app/Views/welcome_message.php</code></pre>
+    <pre><code>app/Views/welcome_message.php</code></pre>
 
-	<p>The corresponding controller for this page can be found at:</p>
+    <p>The corresponding controller for this page can be found at:</p>
 
-	<pre><code>app/Controllers/Home.php</code></pre>
+    <pre><code>app/Controllers/Home.php</code></pre>
 
 </section>
 
 <div class="further">
 
-	<section>
+    <section>
 
-		<h1>Go further</h1>
+        <h1>Go further</h1>
 
-		<h2>
-			<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><rect x='32' y='96' width='64' height='368' rx='16' ry='16' style='fill:none;stroke:#000;stroke-linejoin:round;stroke-width:32px'/><line x1='112' y1='224' x2='240' y2='224' style='fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px'/><line x1='112' y1='400' x2='240' y2='400' style='fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px'/><rect x='112' y='160' width='128' height='304' rx='16' ry='16' style='fill:none;stroke:#000;stroke-linejoin:round;stroke-width:32px'/><rect x='256' y='48' width='96' height='416' rx='16' ry='16' style='fill:none;stroke:#000;stroke-linejoin:round;stroke-width:32px'/><path d='M422.46,96.11l-40.4,4.25c-11.12,1.17-19.18,11.57-17.93,23.1l34.92,321.59c1.26,11.53,11.37,20,22.49,18.84l40.4-4.25c11.12-1.17,19.18-11.57,17.93-23.1L445,115C443.69,103.42,433.58,94.94,422.46,96.11Z' style='fill:none;stroke:#000;stroke-linejoin:round;stroke-width:32px'/></svg>
-			Learn
-		</h2>
+        <h2>
+            <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><rect x='32' y='96' width='64' height='368' rx='16' ry='16' style='fill:none;stroke:#000;stroke-linejoin:round;stroke-width:32px'/><line x1='112' y1='224' x2='240' y2='224' style='fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px'/><line x1='112' y1='400' x2='240' y2='400' style='fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:32px'/><rect x='112' y='160' width='128' height='304' rx='16' ry='16' style='fill:none;stroke:#000;stroke-linejoin:round;stroke-width:32px'/><rect x='256' y='48' width='96' height='416' rx='16' ry='16' style='fill:none;stroke:#000;stroke-linejoin:round;stroke-width:32px'/><path d='M422.46,96.11l-40.4,4.25c-11.12,1.17-19.18,11.57-17.93,23.1l34.92,321.59c1.26,11.53,11.37,20,22.49,18.84l40.4-4.25c11.12-1.17,19.18-11.57,17.93-23.1L445,115C443.69,103.42,433.58,94.94,422.46,96.11Z' style='fill:none;stroke:#000;stroke-linejoin:round;stroke-width:32px'/></svg>
+            Learn
+        </h2>
 
-		<p>The User Guide contains an introduction, tutorial, a number of "how to"
-			guides, and then reference documentation for the components that make up
-			the framework. Check the <a href="https://codeigniter4.github.io/userguide"
-			target="_blank">User Guide</a> !</p>
+        <p>The User Guide contains an introduction, tutorial, a number of "how to"
+            guides, and then reference documentation for the components that make up
+            the framework. Check the <a href="https://codeigniter4.github.io/userguide"
+            target="_blank">User Guide</a> !</p>
 
-		<h2>
-			<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><path d='M431,320.6c-1-3.6,1.2-8.6,3.3-12.2a33.68,33.68,0,0,1,2.1-3.1A162,162,0,0,0,464,215c.3-92.2-77.5-167-173.7-167C206.4,48,136.4,105.1,120,180.9a160.7,160.7,0,0,0-3.7,34.2c0,92.3,74.8,169.1,171,169.1,15.3,0,35.9-4.6,47.2-7.7s22.5-7.2,25.4-8.3a26.44,26.44,0,0,1,9.3-1.7,26,26,0,0,1,10.1,2L436,388.6a13.52,13.52,0,0,0,3.9,1,8,8,0,0,0,8-8,12.85,12.85,0,0,0-.5-2.7Z' style='fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px'/><path d='M66.46,232a146.23,146.23,0,0,0,6.39,152.67c2.31,3.49,3.61,6.19,3.21,8s-11.93,61.87-11.93,61.87a8,8,0,0,0,2.71,7.68A8.17,8.17,0,0,0,72,464a7.26,7.26,0,0,0,2.91-.6l56.21-22a15.7,15.7,0,0,1,12,.2c18.94,7.38,39.88,12,60.83,12A159.21,159.21,0,0,0,284,432.11' style='fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px'/></svg>
-			Discuss
-		</h2>
+        <h2>
+            <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><path d='M431,320.6c-1-3.6,1.2-8.6,3.3-12.2a33.68,33.68,0,0,1,2.1-3.1A162,162,0,0,0,464,215c.3-92.2-77.5-167-173.7-167C206.4,48,136.4,105.1,120,180.9a160.7,160.7,0,0,0-3.7,34.2c0,92.3,74.8,169.1,171,169.1,15.3,0,35.9-4.6,47.2-7.7s22.5-7.2,25.4-8.3a26.44,26.44,0,0,1,9.3-1.7,26,26,0,0,1,10.1,2L436,388.6a13.52,13.52,0,0,0,3.9,1,8,8,0,0,0,8-8,12.85,12.85,0,0,0-.5-2.7Z' style='fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px'/><path d='M66.46,232a146.23,146.23,0,0,0,6.39,152.67c2.31,3.49,3.61,6.19,3.21,8s-11.93,61.87-11.93,61.87a8,8,0,0,0,2.71,7.68A8.17,8.17,0,0,0,72,464a7.26,7.26,0,0,0,2.91-.6l56.21-22a15.7,15.7,0,0,1,12,.2c18.94,7.38,39.88,12,60.83,12A159.21,159.21,0,0,0,284,432.11' style='fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px'/></svg>
+            Discuss
+        </h2>
 
-		<p>CodeIgniter is a community-developed open source project, with several
-			 venues for the community members to gather and exchange ideas. View all
-			 the threads on <a href="https://forum.codeigniter.com/"
-			 target="_blank">CodeIgniter's forum</a>, or <a href="https://codeigniterchat.slack.com/"
-			 target="_blank">chat on Slack</a> !</p>
+        <p>CodeIgniter is a community-developed open source project, with several
+             venues for the community members to gather and exchange ideas. View all
+             the threads on <a href="https://forum.codeigniter.com/"
+             target="_blank">CodeIgniter's forum</a>, or <a href="https://codeigniterchat.slack.com/"
+             target="_blank">chat on Slack</a> !</p>
 
-		<h2>
-			 <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><line x1='176' y1='48' x2='336' y2='48' style='fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px'/><line x1='118' y1='304' x2='394' y2='304' style='fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px'/><path d='M208,48v93.48a64.09,64.09,0,0,1-9.88,34.18L73.21,373.49C48.4,412.78,76.63,464,123.08,464H388.92c46.45,0,74.68-51.22,49.87-90.51L313.87,175.66A64.09,64.09,0,0,1,304,141.48V48' style='fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px'/></svg>
-			 Contribute
-		</h2>
+        <h2>
+             <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512'><line x1='176' y1='48' x2='336' y2='48' style='fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px'/><line x1='118' y1='304' x2='394' y2='304' style='fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px'/><path d='M208,48v93.48a64.09,64.09,0,0,1-9.88,34.18L73.21,373.49C48.4,412.78,76.63,464,123.08,464H388.92c46.45,0,74.68-51.22,49.87-90.51L313.87,175.66A64.09,64.09,0,0,1,304,141.48V48' style='fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px'/></svg>
+             Contribute
+        </h2>
 
-		<p>CodeIgniter is a community driven project and accepts contributions
-			 of code and documentation from the community. Why not
-			 <a href="https://codeigniter.com/contribute" target="_blank">
-			 join us</a> ?</p>
+        <p>CodeIgniter is a community driven project and accepts contributions
+             of code and documentation from the community. Why not
+             <a href="https://codeigniter.com/contribute" target="_blank">
+             join us</a> ?</p>
 
-	</section>
+    </section>
 
 </div>
 
 <!-- FOOTER: DEBUG INFO + COPYRIGHTS -->
 
 <footer>
-	<div class="environment">
+    <div class="environment">
 
-		<p>Page rendered in {elapsed_time} seconds</p>
+        <p>Page rendered in {elapsed_time} seconds</p>
 
-		<p>Environment: <?= ENVIRONMENT ?></p>
+        <p>Environment: <?= ENVIRONMENT ?></p>
 
-	</div>
+    </div>
 
-	<div class="copyrights">
+    <div class="copyrights">
 
-		<p>&copy; <?= date('Y') ?> CodeIgniter Foundation. CodeIgniter is open source project released under the MIT
-			open source licence.</p>
+        <p>&copy; <?= date('Y') ?> CodeIgniter Foundation. CodeIgniter is open source project released under the MIT
+            open source licence.</p>
 
-	</div>
+    </div>
 
 </footer>
 
 <!-- SCRIPTS -->
 
 <script>
-	function toggleMenu() {
-		var menuItems = document.getElementsByClassName('menu-item');
-		for (var i = 0; i < menuItems.length; i++) {
-			var menuItem = menuItems[i];
-			menuItem.classList.toggle("hidden");
-		}
-	}
+    function toggleMenu() {
+        var menuItems = document.getElementsByClassName('menu-item');
+        for (var i = 0; i < menuItems.length; i++) {
+            var menuItem = menuItems[i];
+            menuItem.classList.toggle("hidden");
+        }
+    }
 </script>
 
 <!-- -->
diff --git a/app/index.html b/app/index.html
index b702fbc3967b..69df4e1dff68 100644
--- a/app/index.html
+++ b/app/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<title>403 Forbidden</title>
+    <title>403 Forbidden</title>
 </head>
 <body>
 
diff --git a/system/Debug/Toolbar/Views/_config.tpl b/system/Debug/Toolbar/Views/_config.tpl
index 3934cf62ebee..b6c7e0c3d86f 100644
--- a/system/Debug/Toolbar/Views/_config.tpl
+++ b/system/Debug/Toolbar/Views/_config.tpl
@@ -1,48 +1,48 @@
 <p class="debug-bar-alignRight">
-	<a href="https://codeigniter4.github.io/CodeIgniter4/index.html" target="_blank" >Read the CodeIgniter docs...</a>
+    <a href="https://codeigniter4.github.io/CodeIgniter4/index.html" target="_blank" >Read the CodeIgniter docs...</a>
 </p>
 
 <table>
-	<tbody>
-		<tr>
-			<td>CodeIgniter Version:</td>
-			<td>{ ciVersion }</td>
-		</tr>
-		<tr>
-			<td>PHP Version:</td>
-			<td>{ phpVersion }</td>
-		</tr>
-		<tr>
-			<td>PHP SAPI:</td>
-			<td>{ phpSAPI }</td>
-		</tr>
-		<tr>
-			<td>Environment:</td>
-			<td>{ environment }</td>
-		</tr>
-		<tr>
-			<td>Base URL:</td>
-			<td>
-				{ if $baseURL == '' }
-					<div class="warning">
-						The $baseURL should always be set manually to prevent possible URL personification from external parties.
-					</div>
-				{ else }
-					{ baseURL }
-				{ endif }
-			</td>
-		</tr>
-		<tr>
-			<td>Timezone:</td>
-			<td>{ timezone }</td>
-		</tr>
-		<tr>
-			<td>Locale:</td>
-			<td>{ locale }</td>
-		</tr>
-		<tr>
-			<td>Content Security Policy Enabled:</td>
-			<td>{ if $cspEnabled } Yes { else } No { endif }</td>
-		</tr>
-	</tbody>
+    <tbody>
+        <tr>
+            <td>CodeIgniter Version:</td>
+            <td>{ ciVersion }</td>
+        </tr>
+        <tr>
+            <td>PHP Version:</td>
+            <td>{ phpVersion }</td>
+        </tr>
+        <tr>
+            <td>PHP SAPI:</td>
+            <td>{ phpSAPI }</td>
+        </tr>
+        <tr>
+            <td>Environment:</td>
+            <td>{ environment }</td>
+        </tr>
+        <tr>
+            <td>Base URL:</td>
+            <td>
+                { if $baseURL == '' }
+                    <div class="warning">
+                        The $baseURL should always be set manually to prevent possible URL personification from external parties.
+                    </div>
+                { else }
+                    { baseURL }
+                { endif }
+            </td>
+        </tr>
+        <tr>
+            <td>Timezone:</td>
+            <td>{ timezone }</td>
+        </tr>
+        <tr>
+            <td>Locale:</td>
+            <td>{ locale }</td>
+        </tr>
+        <tr>
+            <td>Content Security Policy Enabled:</td>
+            <td>{ if $cspEnabled } Yes { else } No { endif }</td>
+        </tr>
+    </tbody>
 </table>
diff --git a/system/Debug/Toolbar/Views/toolbar.js b/system/Debug/Toolbar/Views/toolbar.js
index 3bd05d5e9592..7805a99dda05 100644
--- a/system/Debug/Toolbar/Views/toolbar.js
+++ b/system/Debug/Toolbar/Views/toolbar.js
@@ -4,684 +4,684 @@
 
 var ciDebugBar = {
 
-	toolbarContainer : null,
-	toolbar : null,
-	icon : null,
-
-	init : function () {
-		this.toolbarContainer = document.getElementById('toolbarContainer');
-		this.toolbar          = document.getElementById('debug-bar');
-		this.icon             = document.getElementById('debug-icon');
-
-		ciDebugBar.createListeners();
-		ciDebugBar.setToolbarState();
-		ciDebugBar.setToolbarPosition();
-		ciDebugBar.setToolbarTheme();
-		ciDebugBar.toggleViewsHints();
-		ciDebugBar.routerLink();
-
-		document.getElementById('debug-bar-link').addEventListener('click', ciDebugBar.toggleToolbar, true);
-		document.getElementById('debug-icon-link').addEventListener('click', ciDebugBar.toggleToolbar, true);
-
-		// Allows to highlight the row of the current history request
-		var btn = this.toolbar.querySelector('button[data-time="' + localStorage.getItem('debugbar-time') + '"]');
-		ciDebugBar.addClass(btn.parentNode.parentNode, 'current');
-
-		historyLoad = this.toolbar.getElementsByClassName('ci-history-load');
-
-		for (var i = 0; i < historyLoad.length; i++)
-		{
-			historyLoad[i].addEventListener('click', function () {
-				loadDoc(this.getAttribute('data-time'));
-			}, true);
-		}
-
-		// Display the active Tab on page load
-		var tab = ciDebugBar.readCookie('debug-bar-tab');
-		if (document.getElementById(tab))
-		{
-			var el           = document.getElementById(tab);
-			el.style.display = 'block';
-			ciDebugBar.addClass(el, 'active');
-			tab = document.querySelector('[data-tab=' + tab + ']');
-			if (tab)
-			{
-				ciDebugBar.addClass(tab.parentNode, 'active');
-			}
-		}
-	},
-
-	createListeners : function () {
-		var buttons = [].slice.call(this.toolbar.querySelectorAll('.ci-label a'));
-
-		for (var i = 0; i < buttons.length; i++)
-		{
-			buttons[i].addEventListener('click', ciDebugBar.showTab, true);
-		}
-
-		// Hook up generic toggle via data attributes `data-toggle="foo"`
-		var links = this.toolbar.querySelectorAll('[data-toggle]');
-		for (var i = 0; i < links.length; i++)
-		{
-			links[i].addEventListener('click', ciDebugBar.toggleRows, true);
-		}
-	},
-
-	showTab: function () {
-		// Get the target tab, if any
-		var tab = document.getElementById(this.getAttribute('data-tab'));
-
-		// If the label have not a tab stops here
-		if (! tab)
-		{
-			return;
-		}
-
-		// Remove debug-bar-tab cookie
-		ciDebugBar.createCookie('debug-bar-tab', '', -1);
-
-		// Check our current state.
-		var state = tab.style.display;
-
-		// Hide all tabs
-		var tabs = document.querySelectorAll('#debug-bar .tab');
-
-		for (var i = 0; i < tabs.length; i++)
-		{
-			tabs[i].style.display = 'none';
-		}
-
-		// Mark all labels as inactive
-		var labels = document.querySelectorAll('#debug-bar .ci-label');
-
-		for (var i = 0; i < labels.length; i++)
-		{
-			ciDebugBar.removeClass(labels[i], 'active');
-		}
-
-		// Show/hide the selected tab
-		if (state != 'block')
-		{
-			tab.style.display = 'block';
-			ciDebugBar.addClass(this.parentNode, 'active');
-			// Create debug-bar-tab cookie to persistent state
-			ciDebugBar.createCookie('debug-bar-tab', this.getAttribute('data-tab'), 365);
-		}
-	},
-
-	addClass : function (el, className) {
-		if (el.classList)
-		{
-			el.classList.add(className);
-		}
-		else
-		{
-			el.className += ' ' + className;
-		}
-	},
-
-	removeClass : function (el, className) {
-		if (el.classList)
-		{
-			el.classList.remove(className);
-		}
-		else
-		{
-			el.className = el.className.replace(new RegExp('(^|\\b)' + className.split(' ').join('|') + '(\\b|$)', 'gi'), ' ');
-		}
-	},
-
-	/**
-	 * Toggle display of another object based on
-	 * the data-toggle value of this object
-	 *
-	 * @param event
-	 */
-	toggleRows : function(event) {
-		if(event.target)
-		{
-			let row = event.target.closest('tr');
-			let target = document.getElementById(row.getAttribute('data-toggle'));
-			target.style.display = target.style.display === 'none' ? 'table-row' : 'none';
-		}
-	},
-
-	/**
-	 * Toggle display of a data table
-	 *
-	 * @param obj
-	 */
-	toggleDataTable : function (obj) {
-		if (typeof obj == 'string')
-		{
-			obj = document.getElementById(obj + '_table');
-		}
-
-		if (obj)
-		{
-			obj.style.display = obj.style.display === 'none' ? 'block' : 'none';
-		}
-	},
-
-	/**
-	 * Toggle display of timeline child elements
-	 *
-	 * @param obj
-	 */
-	toggleChildRows : function (obj) {
-		if (typeof obj == 'string')
-		{
-			par = document.getElementById(obj + '_parent')
-			obj = document.getElementById(obj + '_children');
-		}
-
-		if (par && obj)
-		{
-			obj.style.display = obj.style.display === 'none' ? '' : 'none';
-			par.classList.toggle('timeline-parent-open');
-		}
-	},
-
-
-	//--------------------------------------------------------------------
-
-	/**
-	 *   Toggle tool bar from full to icon and icon to full
-	 */
-	toggleToolbar : function () {
-		var open = ciDebugBar.toolbar.style.display != 'none';
-
-		ciDebugBar.icon.style.display    = open == true ? 'inline-block' : 'none';
-		ciDebugBar.toolbar.style.display = open == false ? 'inline-block' : 'none';
-
-		// Remember it for other page loads on this site
-		ciDebugBar.createCookie('debug-bar-state', '', -1);
-		ciDebugBar.createCookie('debug-bar-state', open == true ? 'minimized' : 'open' , 365);
-	},
-
-	/**
-	 * Sets the initial state of the toolbar (open or minimized) when
-	 * the page is first loaded to allow it to remember the state between refreshes.
-	 */
-	setToolbarState: function () {
-		var open = ciDebugBar.readCookie('debug-bar-state');
-
-		ciDebugBar.icon.style.display    = open != 'open' ? 'inline-block' : 'none';
-		ciDebugBar.toolbar.style.display = open == 'open' ? 'inline-block' : 'none';
-	},
-
-	toggleViewsHints: function () {
-		// Avoid toggle hints on history requests that are not the initial
-		if (localStorage.getItem('debugbar-time') != localStorage.getItem('debugbar-time-new'))
-		{
-			var a  = document.querySelector('a[data-tab="ci-views"]');
-			a.href = '#';
-			return;
-		}
-
-		var nodeList       = []; // [ Element, NewElement( 1 )/OldElement( 0 ) ]
-		var sortedComments = [];
-		var comments       = [];
-
-		var getComments = function () {
-			var nodes        = [];
-			var result       = [];
-			var xpathResults = document.evaluate( "//comment()[starts-with(., ' DEBUG-VIEW')]", document, null, XPathResult.ANY_TYPE, null);
-			var nextNode     = xpathResults.iterateNext();
-			while ( nextNode )
-			{
-				nodes.push( nextNode );
-				nextNode = xpathResults.iterateNext();
-			}
-
-			// sort comment by opening and closing tags
-			for (var i = 0; i < nodes.length; ++i)
-			{
-				// get file path + name to use as key
-				var path = nodes[i].nodeValue.substring( 18, nodes[i].nodeValue.length - 1 );
-
-				if ( nodes[i].nodeValue[12] === 'S' ) // simple check for start comment
-				{
-					// create new entry
-					result[path] = [ nodes[i], null ];
-				}
-				else if (result[path])
-				{
-					// add to existing entry
-					result[path][1] = nodes[i];
-				}
-			}
-
-			return result;
-		};
-
-		// find node that has TargetNode as parentNode
-		var getParentNode = function ( node, targetNode ) {
-			if ( node.parentNode === null )
-			{
-				return null;
-			}
-
-			if ( node.parentNode !== targetNode )
-			{
-				return getParentNode( node.parentNode, targetNode );
-			}
-
-			return node;
-		};
-
-		// define invalid & outer ( also invalid ) elements
-		const INVALID_ELEMENTS = [ 'NOSCRIPT', 'SCRIPT', 'STYLE' ];
-		const OUTER_ELEMENTS   = [ 'HTML', 'BODY', 'HEAD' ];
-
-		var getValidElementInner = function ( node, reverse ) {
-			// handle invalid tags
-			if ( OUTER_ELEMENTS.indexOf( node.nodeName ) !== -1 )
-			{
-				for (var i = 0; i < document.body.children.length; ++i)
-				{
-					var index   = reverse ? document.body.children.length - ( i + 1 ) : i;
-					var element = document.body.children[index];
-
-					// skip invalid tags
-					if ( INVALID_ELEMENTS.indexOf( element.nodeName ) !== -1 )
-					{
-						continue;
-					}
-
-					return [ element, reverse ];
-				}
-
-				return null;
-			}
-
-			// get to next valid element
-			while ( node !== null && INVALID_ELEMENTS.indexOf( node.nodeName ) !== -1 )
-			{
-				node = reverse ? node.previousElementSibling : node.nextElementSibling;
-			}
-
-			// return non array if we couldnt find something
-			if ( node === null )
-			{
-				return null;
-			}
-
-			return [ node, reverse ];
-		};
-
-		// get next valid element ( to be safe to add divs )
-		// @return [ element, skip element ] or null if we couldnt find a valid place
-		var getValidElement = function ( nodeElement ) {
-			if (nodeElement)
-			{
-				if ( nodeElement.nextElementSibling !== null )
-				{
-					return getValidElementInner( nodeElement.nextElementSibling, false )
-						|| getValidElementInner( nodeElement.previousElementSibling, true );
-				}
-				if ( nodeElement.previousElementSibling !== null )
-				{
-					return getValidElementInner( nodeElement.previousElementSibling, true );
-				}
-			}
-
-			// something went wrong! -> element is not in DOM
-			return null;
-		};
-
-		function showHints()
-		{
-			// Had AJAX? Reset view blocks
-			sortedComments = getComments();
-
-			for (var key in sortedComments)
-			{
-				var startElement = getValidElement( sortedComments[key][0] );
-				var endElement   = getValidElement( sortedComments[key][1] );
-
-				// skip if we couldnt get a valid element
-				if ( startElement === null || endElement === null )
-				{
-					continue;
-				}
-
-				// find element which has same parent as startelement
-				var jointParent = getParentNode( endElement[0], startElement[0].parentNode );
-				if ( jointParent === null )
-				{
-					// find element which has same parent as endelement
-					jointParent = getParentNode( startElement[0], endElement[0].parentNode );
-					if ( jointParent === null )
-					{
-						// both tries failed
-						continue;
-					}
-					else
-					{
-						startElement[0] = jointParent;
-					}
-				}
-				else
-				{
-					endElement[0] = jointParent;
-				}
-
-				var debugDiv   = document.createElement( 'div' ); // holder
-				var debugPath  = document.createElement( 'div' ); // path
-				var childArray = startElement[0].parentNode.childNodes; // target child array
-				var parent     = startElement[0].parentNode;
-				var start, end;
-
-				// setup container
-				debugDiv.classList.add( 'debug-view' );
-				debugDiv.classList.add( 'show-view' );
-				debugPath.classList.add( 'debug-view-path' );
-				debugPath.innerText = key;
-				debugDiv.appendChild( debugPath );
-
-				// calc distance between them
-				// start
-				for (var i = 0; i < childArray.length; ++i)
-				{
-					// check for comment ( start & end ) -> if its before valid start element
-					if ( childArray[i] === sortedComments[key][1] ||
-						childArray[i] === sortedComments[key][0] ||
-						childArray[i] === startElement[0] )
-					{
-						start = i;
-						if ( childArray[i] === sortedComments[key][0] )
-						{
-							start++; // increase to skip the start comment
-						}
-						break;
-					}
-				}
-				// adjust if we want to skip the start element
-				if ( startElement[1] )
-				{
-					start++;
-				}
-
-				// end
-				for (var i = start; i < childArray.length; ++i)
-				{
-					if ( childArray[i] === endElement[0] )
-					{
-						end = i;
-						// dont break to check for end comment after end valid element
-					}
-					else if ( childArray[i] === sortedComments[key][1] )
-					{
-						// if we found the end comment, we can break
-						end = i;
-						break;
-					}
-				}
-
-				// move elements
-				var number = end - start;
-				if ( endElement[1] )
-				{
-					number++;
-				}
-				for (var i = 0; i < number; ++i)
-				{
-					if ( INVALID_ELEMENTS.indexOf( childArray[start] ) !== -1 )
-					{
-						// skip invalid childs that can cause problems if moved
-						start++;
-						continue;
-					}
-					debugDiv.appendChild( childArray[start] );
-				}
-
-				// add container to DOM
-				nodeList.push( parent.insertBefore( debugDiv, childArray[start] ) );
-			}
-
-			ciDebugBar.createCookie('debug-view', 'show', 365);
-			ciDebugBar.addClass(btn, 'active');
-		}
-
-		function hideHints()
-		{
-			for (var i = 0; i < nodeList.length; ++i)
-			{
-				var index;
-
-				// find index
-				for (var j = 0; j < nodeList[i].parentNode.childNodes.length; ++j)
-				{
-					if ( nodeList[i].parentNode.childNodes[j] === nodeList[i] )
-					{
-						index = j;
-						break;
-					}
-				}
-
-				// move child back
-				while ( nodeList[i].childNodes.length !== 1 )
-				{
-					nodeList[i].parentNode.insertBefore( nodeList[i].childNodes[1], nodeList[i].parentNode.childNodes[index].nextSibling  );
-					index++;
-				}
-
-				nodeList[i].parentNode.removeChild( nodeList[i] );
-			}
-			nodeList.length = 0;
-
-			ciDebugBar.createCookie('debug-view', '', -1);
-			ciDebugBar.removeClass(btn, 'active');
-		}
-
-		var btn = document.querySelector('[data-tab=ci-views]');
-
-		// If the Views Collector is inactive stops here
-		if (! btn)
-		{
-			return;
-		}
-
-		btn.parentNode.onclick = function () {
-			if (ciDebugBar.readCookie('debug-view'))
-			{
-				hideHints();
-			}
-			else
-			{
-				showHints();
-			}
-		};
-
-		// Determine Hints state on page load
-		if (ciDebugBar.readCookie('debug-view'))
-		{
-			showHints();
-		}
-	},
-
-	setToolbarPosition: function () {
-		var btnPosition = this.toolbar.querySelector('#toolbar-position');
-
-		if (ciDebugBar.readCookie('debug-bar-position') === 'top')
-		{
-			ciDebugBar.addClass(ciDebugBar.icon, 'fixed-top');
-			ciDebugBar.addClass(ciDebugBar.toolbar, 'fixed-top');
-		}
-
-		btnPosition.addEventListener('click', function () {
-			var position = ciDebugBar.readCookie('debug-bar-position');
-
-			ciDebugBar.createCookie('debug-bar-position', '', -1);
-
-			if (!position || position === 'bottom')
-			{
-				ciDebugBar.createCookie('debug-bar-position', 'top', 365);
-				ciDebugBar.addClass(ciDebugBar.icon, 'fixed-top');
-				ciDebugBar.addClass(ciDebugBar.toolbar, 'fixed-top');
-			}
-			else
-			{
-				ciDebugBar.createCookie('debug-bar-position', 'bottom', 365);
-				ciDebugBar.removeClass(ciDebugBar.icon, 'fixed-top');
-				ciDebugBar.removeClass(ciDebugBar.toolbar, 'fixed-top');
-			}
-		}, true);
-	},
-
-	setToolbarTheme: function () {
-		var btnTheme    = this.toolbar.querySelector('#toolbar-theme');
-		var isDarkMode  = window.matchMedia("(prefers-color-scheme: dark)").matches;
-		var isLightMode = window.matchMedia("(prefers-color-scheme: light)").matches;
-
-		// If a cookie is set with a value, we force the color scheme
-		if (ciDebugBar.readCookie('debug-bar-theme') === 'dark')
-		{
-			ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'light');
-			ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'dark');
-		}
-		else if (ciDebugBar.readCookie('debug-bar-theme') === 'light')
-		{
-			ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'dark');
-			ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'light');
-		}
-
-		btnTheme.addEventListener('click', function () {
-			var theme = ciDebugBar.readCookie('debug-bar-theme');
-
-			if (!theme && window.matchMedia("(prefers-color-scheme: dark)").matches)
-			{
-				// If there is no cookie, and "prefers-color-scheme" is set to "dark"
-				// It means that the user wants to switch to light mode
-				ciDebugBar.createCookie('debug-bar-theme', 'light', 365);
-				ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'dark');
-				ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'light');
-			}
-			else
-			{
-				if (theme === 'dark')
-				{
-					ciDebugBar.createCookie('debug-bar-theme', 'light', 365);
-					ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'dark');
-					ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'light');
-				}
-				else
-				{
-					// In any other cases: if there is no cookie, or the cookie is set to
-					// "light", or the "prefers-color-scheme" is "light"...
-					ciDebugBar.createCookie('debug-bar-theme', 'dark', 365);
-					ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'light');
-					ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'dark');
-				}
-			}
-		}, true);
-	},
-
-	/**
-	 * Helper to create a cookie.
-	 *
-	 * @param name
-	 * @param value
-	 * @param days
-	 */
-	createCookie : function (name,value,days) {
-		if (days)
-		{
-			var date = new Date();
-
-			date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
-
-			var expires = "; expires=" + date.toGMTString();
-		}
-		else
-		{
-			var expires = "";
-		}
-
-		document.cookie = name + "=" + value + expires + "; path=/; samesite=Lax";
-	},
-
-	readCookie : function (name) {
-		var nameEQ = name + "=";
-		var ca     = document.cookie.split(';');
-
-		for (var i = 0; i < ca.length; i++)
-		{
-			var c = ca[i];
-			while (c.charAt(0) == ' ')
-			{
-				c = c.substring(1,c.length);
-			}
-			if (c.indexOf(nameEQ) == 0)
-			{
-				return c.substring(nameEQ.length,c.length);
-			}
-		}
-		return null;
-	},
-
-	trimSlash: function (text) {
-		return text.replace(/^\/|\/$/g, '');
-	},
-
-	routerLink: function () {
-		var row, _location;
-		var rowGet = this.toolbar.querySelectorAll('td[data-debugbar-route="GET"]');
-		var patt   = /\((?:[^)(]+|\((?:[^)(]+|\([^)(]*\))*\))*\)/;
-
-		for (var i = 0; i < rowGet.length; i++)
-		{
-			row = rowGet[i];
-			if (!/\/\(.+?\)/.test(rowGet[i].innerText))
-			{
-				row.style = 'cursor: pointer;';
-				row.setAttribute('title', location.origin + '/' + ciDebugBar.trimSlash(row.innerText));
-				row.addEventListener('click', function (ev) {
-					_location          = location.origin + '/' + ciDebugBar.trimSlash(ev.target.innerText);
-					var redirectWindow = window.open(_location, '_blank');
-					redirectWindow.location;
-				});
-			}
-			else
-			{
-				row.innerHTML = '<div>' + row.innerText + '</div>'
-					+ '<form data-debugbar-route-tpl="' + ciDebugBar.trimSlash(row.innerText.replace(patt, '?')) + '">'
-					+ row.innerText.replace(patt, '<input type="text" placeholder="$1">')
-					+ '<input type="submit" value="Go" style="margin-left: 4px;">'
-					+ '</form>';
-			}
-		}
-
-		rowGet = this.toolbar.querySelectorAll('td[data-debugbar-route="GET"] form');
-		for (var i = 0; i < rowGet.length; i++)
-		{
-			row = rowGet[i];
-
-			row.addEventListener('submit', function (event) {
-				event.preventDefault()
-				var inputArray = [], t = 0;
-				var input      = event.target.querySelectorAll('input[type=text]');
-				var tpl        = event.target.getAttribute('data-debugbar-route-tpl');
-
-				for (var n = 0; n < input.length; n++)
-				{
-					if (input[n].value.length > 0)
-					{
-						inputArray.push(input[n].value);
-					}
-				}
-
-				if (inputArray.length > 0)
-				{
-					_location = location.origin + '/' + tpl.replace(/\?/g, function () {
-						return inputArray[t++]
-					});
-
-					var redirectWindow = window.open(_location, '_blank');
-					redirectWindow.location;
-				}
-			})
-		}
-	}
+    toolbarContainer : null,
+    toolbar : null,
+    icon : null,
+
+    init : function () {
+        this.toolbarContainer = document.getElementById('toolbarContainer');
+        this.toolbar          = document.getElementById('debug-bar');
+        this.icon             = document.getElementById('debug-icon');
+
+        ciDebugBar.createListeners();
+        ciDebugBar.setToolbarState();
+        ciDebugBar.setToolbarPosition();
+        ciDebugBar.setToolbarTheme();
+        ciDebugBar.toggleViewsHints();
+        ciDebugBar.routerLink();
+
+        document.getElementById('debug-bar-link').addEventListener('click', ciDebugBar.toggleToolbar, true);
+        document.getElementById('debug-icon-link').addEventListener('click', ciDebugBar.toggleToolbar, true);
+
+        // Allows to highlight the row of the current history request
+        var btn = this.toolbar.querySelector('button[data-time="' + localStorage.getItem('debugbar-time') + '"]');
+        ciDebugBar.addClass(btn.parentNode.parentNode, 'current');
+
+        historyLoad = this.toolbar.getElementsByClassName('ci-history-load');
+
+        for (var i = 0; i < historyLoad.length; i++)
+        {
+            historyLoad[i].addEventListener('click', function () {
+                loadDoc(this.getAttribute('data-time'));
+            }, true);
+        }
+
+        // Display the active Tab on page load
+        var tab = ciDebugBar.readCookie('debug-bar-tab');
+        if (document.getElementById(tab))
+        {
+            var el           = document.getElementById(tab);
+            el.style.display = 'block';
+            ciDebugBar.addClass(el, 'active');
+            tab = document.querySelector('[data-tab=' + tab + ']');
+            if (tab)
+            {
+                ciDebugBar.addClass(tab.parentNode, 'active');
+            }
+        }
+    },
+
+    createListeners : function () {
+        var buttons = [].slice.call(this.toolbar.querySelectorAll('.ci-label a'));
+
+        for (var i = 0; i < buttons.length; i++)
+        {
+            buttons[i].addEventListener('click', ciDebugBar.showTab, true);
+        }
+
+        // Hook up generic toggle via data attributes `data-toggle="foo"`
+        var links = this.toolbar.querySelectorAll('[data-toggle]');
+        for (var i = 0; i < links.length; i++)
+        {
+            links[i].addEventListener('click', ciDebugBar.toggleRows, true);
+        }
+    },
+
+    showTab: function () {
+        // Get the target tab, if any
+        var tab = document.getElementById(this.getAttribute('data-tab'));
+
+        // If the label have not a tab stops here
+        if (! tab)
+        {
+            return;
+        }
+
+        // Remove debug-bar-tab cookie
+        ciDebugBar.createCookie('debug-bar-tab', '', -1);
+
+        // Check our current state.
+        var state = tab.style.display;
+
+        // Hide all tabs
+        var tabs = document.querySelectorAll('#debug-bar .tab');
+
+        for (var i = 0; i < tabs.length; i++)
+        {
+            tabs[i].style.display = 'none';
+        }
+
+        // Mark all labels as inactive
+        var labels = document.querySelectorAll('#debug-bar .ci-label');
+
+        for (var i = 0; i < labels.length; i++)
+        {
+            ciDebugBar.removeClass(labels[i], 'active');
+        }
+
+        // Show/hide the selected tab
+        if (state != 'block')
+        {
+            tab.style.display = 'block';
+            ciDebugBar.addClass(this.parentNode, 'active');
+            // Create debug-bar-tab cookie to persistent state
+            ciDebugBar.createCookie('debug-bar-tab', this.getAttribute('data-tab'), 365);
+        }
+    },
+
+    addClass : function (el, className) {
+        if (el.classList)
+        {
+            el.classList.add(className);
+        }
+        else
+        {
+            el.className += ' ' + className;
+        }
+    },
+
+    removeClass : function (el, className) {
+        if (el.classList)
+        {
+            el.classList.remove(className);
+        }
+        else
+        {
+            el.className = el.className.replace(new RegExp('(^|\\b)' + className.split(' ').join('|') + '(\\b|$)', 'gi'), ' ');
+        }
+    },
+
+    /**
+     * Toggle display of another object based on
+     * the data-toggle value of this object
+     *
+     * @param event
+     */
+    toggleRows : function(event) {
+        if(event.target)
+        {
+            let row = event.target.closest('tr');
+            let target = document.getElementById(row.getAttribute('data-toggle'));
+            target.style.display = target.style.display === 'none' ? 'table-row' : 'none';
+        }
+    },
+
+    /**
+     * Toggle display of a data table
+     *
+     * @param obj
+     */
+    toggleDataTable : function (obj) {
+        if (typeof obj == 'string')
+        {
+            obj = document.getElementById(obj + '_table');
+        }
+
+        if (obj)
+        {
+            obj.style.display = obj.style.display === 'none' ? 'block' : 'none';
+        }
+    },
+
+    /**
+     * Toggle display of timeline child elements
+     *
+     * @param obj
+     */
+    toggleChildRows : function (obj) {
+        if (typeof obj == 'string')
+        {
+            par = document.getElementById(obj + '_parent')
+            obj = document.getElementById(obj + '_children');
+        }
+
+        if (par && obj)
+        {
+            obj.style.display = obj.style.display === 'none' ? '' : 'none';
+            par.classList.toggle('timeline-parent-open');
+        }
+    },
+
+
+    //--------------------------------------------------------------------
+
+    /**
+     *   Toggle tool bar from full to icon and icon to full
+     */
+    toggleToolbar : function () {
+        var open = ciDebugBar.toolbar.style.display != 'none';
+
+        ciDebugBar.icon.style.display    = open == true ? 'inline-block' : 'none';
+        ciDebugBar.toolbar.style.display = open == false ? 'inline-block' : 'none';
+
+        // Remember it for other page loads on this site
+        ciDebugBar.createCookie('debug-bar-state', '', -1);
+        ciDebugBar.createCookie('debug-bar-state', open == true ? 'minimized' : 'open' , 365);
+    },
+
+    /**
+     * Sets the initial state of the toolbar (open or minimized) when
+     * the page is first loaded to allow it to remember the state between refreshes.
+     */
+    setToolbarState: function () {
+        var open = ciDebugBar.readCookie('debug-bar-state');
+
+        ciDebugBar.icon.style.display    = open != 'open' ? 'inline-block' : 'none';
+        ciDebugBar.toolbar.style.display = open == 'open' ? 'inline-block' : 'none';
+    },
+
+    toggleViewsHints: function () {
+        // Avoid toggle hints on history requests that are not the initial
+        if (localStorage.getItem('debugbar-time') != localStorage.getItem('debugbar-time-new'))
+        {
+            var a  = document.querySelector('a[data-tab="ci-views"]');
+            a.href = '#';
+            return;
+        }
+
+        var nodeList       = []; // [ Element, NewElement( 1 )/OldElement( 0 ) ]
+        var sortedComments = [];
+        var comments       = [];
+
+        var getComments = function () {
+            var nodes        = [];
+            var result       = [];
+            var xpathResults = document.evaluate( "//comment()[starts-with(., ' DEBUG-VIEW')]", document, null, XPathResult.ANY_TYPE, null);
+            var nextNode     = xpathResults.iterateNext();
+            while ( nextNode )
+            {
+                nodes.push( nextNode );
+                nextNode = xpathResults.iterateNext();
+            }
+
+            // sort comment by opening and closing tags
+            for (var i = 0; i < nodes.length; ++i)
+            {
+                // get file path + name to use as key
+                var path = nodes[i].nodeValue.substring( 18, nodes[i].nodeValue.length - 1 );
+
+                if ( nodes[i].nodeValue[12] === 'S' ) // simple check for start comment
+                {
+                    // create new entry
+                    result[path] = [ nodes[i], null ];
+                }
+                else if (result[path])
+                {
+                    // add to existing entry
+                    result[path][1] = nodes[i];
+                }
+            }
+
+            return result;
+        };
+
+        // find node that has TargetNode as parentNode
+        var getParentNode = function ( node, targetNode ) {
+            if ( node.parentNode === null )
+            {
+                return null;
+            }
+
+            if ( node.parentNode !== targetNode )
+            {
+                return getParentNode( node.parentNode, targetNode );
+            }
+
+            return node;
+        };
+
+        // define invalid & outer ( also invalid ) elements
+        const INVALID_ELEMENTS = [ 'NOSCRIPT', 'SCRIPT', 'STYLE' ];
+        const OUTER_ELEMENTS   = [ 'HTML', 'BODY', 'HEAD' ];
+
+        var getValidElementInner = function ( node, reverse ) {
+            // handle invalid tags
+            if ( OUTER_ELEMENTS.indexOf( node.nodeName ) !== -1 )
+            {
+                for (var i = 0; i < document.body.children.length; ++i)
+                {
+                    var index   = reverse ? document.body.children.length - ( i + 1 ) : i;
+                    var element = document.body.children[index];
+
+                    // skip invalid tags
+                    if ( INVALID_ELEMENTS.indexOf( element.nodeName ) !== -1 )
+                    {
+                        continue;
+                    }
+
+                    return [ element, reverse ];
+                }
+
+                return null;
+            }
+
+            // get to next valid element
+            while ( node !== null && INVALID_ELEMENTS.indexOf( node.nodeName ) !== -1 )
+            {
+                node = reverse ? node.previousElementSibling : node.nextElementSibling;
+            }
+
+            // return non array if we couldnt find something
+            if ( node === null )
+            {
+                return null;
+            }
+
+            return [ node, reverse ];
+        };
+
+        // get next valid element ( to be safe to add divs )
+        // @return [ element, skip element ] or null if we couldnt find a valid place
+        var getValidElement = function ( nodeElement ) {
+            if (nodeElement)
+            {
+                if ( nodeElement.nextElementSibling !== null )
+                {
+                    return getValidElementInner( nodeElement.nextElementSibling, false )
+                        || getValidElementInner( nodeElement.previousElementSibling, true );
+                }
+                if ( nodeElement.previousElementSibling !== null )
+                {
+                    return getValidElementInner( nodeElement.previousElementSibling, true );
+                }
+            }
+
+            // something went wrong! -> element is not in DOM
+            return null;
+        };
+
+        function showHints()
+        {
+            // Had AJAX? Reset view blocks
+            sortedComments = getComments();
+
+            for (var key in sortedComments)
+            {
+                var startElement = getValidElement( sortedComments[key][0] );
+                var endElement   = getValidElement( sortedComments[key][1] );
+
+                // skip if we couldnt get a valid element
+                if ( startElement === null || endElement === null )
+                {
+                    continue;
+                }
+
+                // find element which has same parent as startelement
+                var jointParent = getParentNode( endElement[0], startElement[0].parentNode );
+                if ( jointParent === null )
+                {
+                    // find element which has same parent as endelement
+                    jointParent = getParentNode( startElement[0], endElement[0].parentNode );
+                    if ( jointParent === null )
+                    {
+                        // both tries failed
+                        continue;
+                    }
+                    else
+                    {
+                        startElement[0] = jointParent;
+                    }
+                }
+                else
+                {
+                    endElement[0] = jointParent;
+                }
+
+                var debugDiv   = document.createElement( 'div' ); // holder
+                var debugPath  = document.createElement( 'div' ); // path
+                var childArray = startElement[0].parentNode.childNodes; // target child array
+                var parent     = startElement[0].parentNode;
+                var start, end;
+
+                // setup container
+                debugDiv.classList.add( 'debug-view' );
+                debugDiv.classList.add( 'show-view' );
+                debugPath.classList.add( 'debug-view-path' );
+                debugPath.innerText = key;
+                debugDiv.appendChild( debugPath );
+
+                // calc distance between them
+                // start
+                for (var i = 0; i < childArray.length; ++i)
+                {
+                    // check for comment ( start & end ) -> if its before valid start element
+                    if ( childArray[i] === sortedComments[key][1] ||
+                        childArray[i] === sortedComments[key][0] ||
+                        childArray[i] === startElement[0] )
+                    {
+                        start = i;
+                        if ( childArray[i] === sortedComments[key][0] )
+                        {
+                            start++; // increase to skip the start comment
+                        }
+                        break;
+                    }
+                }
+                // adjust if we want to skip the start element
+                if ( startElement[1] )
+                {
+                    start++;
+                }
+
+                // end
+                for (var i = start; i < childArray.length; ++i)
+                {
+                    if ( childArray[i] === endElement[0] )
+                    {
+                        end = i;
+                        // dont break to check for end comment after end valid element
+                    }
+                    else if ( childArray[i] === sortedComments[key][1] )
+                    {
+                        // if we found the end comment, we can break
+                        end = i;
+                        break;
+                    }
+                }
+
+                // move elements
+                var number = end - start;
+                if ( endElement[1] )
+                {
+                    number++;
+                }
+                for (var i = 0; i < number; ++i)
+                {
+                    if ( INVALID_ELEMENTS.indexOf( childArray[start] ) !== -1 )
+                    {
+                        // skip invalid childs that can cause problems if moved
+                        start++;
+                        continue;
+                    }
+                    debugDiv.appendChild( childArray[start] );
+                }
+
+                // add container to DOM
+                nodeList.push( parent.insertBefore( debugDiv, childArray[start] ) );
+            }
+
+            ciDebugBar.createCookie('debug-view', 'show', 365);
+            ciDebugBar.addClass(btn, 'active');
+        }
+
+        function hideHints()
+        {
+            for (var i = 0; i < nodeList.length; ++i)
+            {
+                var index;
+
+                // find index
+                for (var j = 0; j < nodeList[i].parentNode.childNodes.length; ++j)
+                {
+                    if ( nodeList[i].parentNode.childNodes[j] === nodeList[i] )
+                    {
+                        index = j;
+                        break;
+                    }
+                }
+
+                // move child back
+                while ( nodeList[i].childNodes.length !== 1 )
+                {
+                    nodeList[i].parentNode.insertBefore( nodeList[i].childNodes[1], nodeList[i].parentNode.childNodes[index].nextSibling  );
+                    index++;
+                }
+
+                nodeList[i].parentNode.removeChild( nodeList[i] );
+            }
+            nodeList.length = 0;
+
+            ciDebugBar.createCookie('debug-view', '', -1);
+            ciDebugBar.removeClass(btn, 'active');
+        }
+
+        var btn = document.querySelector('[data-tab=ci-views]');
+
+        // If the Views Collector is inactive stops here
+        if (! btn)
+        {
+            return;
+        }
+
+        btn.parentNode.onclick = function () {
+            if (ciDebugBar.readCookie('debug-view'))
+            {
+                hideHints();
+            }
+            else
+            {
+                showHints();
+            }
+        };
+
+        // Determine Hints state on page load
+        if (ciDebugBar.readCookie('debug-view'))
+        {
+            showHints();
+        }
+    },
+
+    setToolbarPosition: function () {
+        var btnPosition = this.toolbar.querySelector('#toolbar-position');
+
+        if (ciDebugBar.readCookie('debug-bar-position') === 'top')
+        {
+            ciDebugBar.addClass(ciDebugBar.icon, 'fixed-top');
+            ciDebugBar.addClass(ciDebugBar.toolbar, 'fixed-top');
+        }
+
+        btnPosition.addEventListener('click', function () {
+            var position = ciDebugBar.readCookie('debug-bar-position');
+
+            ciDebugBar.createCookie('debug-bar-position', '', -1);
+
+            if (!position || position === 'bottom')
+            {
+                ciDebugBar.createCookie('debug-bar-position', 'top', 365);
+                ciDebugBar.addClass(ciDebugBar.icon, 'fixed-top');
+                ciDebugBar.addClass(ciDebugBar.toolbar, 'fixed-top');
+            }
+            else
+            {
+                ciDebugBar.createCookie('debug-bar-position', 'bottom', 365);
+                ciDebugBar.removeClass(ciDebugBar.icon, 'fixed-top');
+                ciDebugBar.removeClass(ciDebugBar.toolbar, 'fixed-top');
+            }
+        }, true);
+    },
+
+    setToolbarTheme: function () {
+        var btnTheme    = this.toolbar.querySelector('#toolbar-theme');
+        var isDarkMode  = window.matchMedia("(prefers-color-scheme: dark)").matches;
+        var isLightMode = window.matchMedia("(prefers-color-scheme: light)").matches;
+
+        // If a cookie is set with a value, we force the color scheme
+        if (ciDebugBar.readCookie('debug-bar-theme') === 'dark')
+        {
+            ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'light');
+            ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'dark');
+        }
+        else if (ciDebugBar.readCookie('debug-bar-theme') === 'light')
+        {
+            ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'dark');
+            ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'light');
+        }
+
+        btnTheme.addEventListener('click', function () {
+            var theme = ciDebugBar.readCookie('debug-bar-theme');
+
+            if (!theme && window.matchMedia("(prefers-color-scheme: dark)").matches)
+            {
+                // If there is no cookie, and "prefers-color-scheme" is set to "dark"
+                // It means that the user wants to switch to light mode
+                ciDebugBar.createCookie('debug-bar-theme', 'light', 365);
+                ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'dark');
+                ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'light');
+            }
+            else
+            {
+                if (theme === 'dark')
+                {
+                    ciDebugBar.createCookie('debug-bar-theme', 'light', 365);
+                    ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'dark');
+                    ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'light');
+                }
+                else
+                {
+                    // In any other cases: if there is no cookie, or the cookie is set to
+                    // "light", or the "prefers-color-scheme" is "light"...
+                    ciDebugBar.createCookie('debug-bar-theme', 'dark', 365);
+                    ciDebugBar.removeClass(ciDebugBar.toolbarContainer, 'light');
+                    ciDebugBar.addClass(ciDebugBar.toolbarContainer, 'dark');
+                }
+            }
+        }, true);
+    },
+
+    /**
+     * Helper to create a cookie.
+     *
+     * @param name
+     * @param value
+     * @param days
+     */
+    createCookie : function (name,value,days) {
+        if (days)
+        {
+            var date = new Date();
+
+            date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000));
+
+            var expires = "; expires=" + date.toGMTString();
+        }
+        else
+        {
+            var expires = "";
+        }
+
+        document.cookie = name + "=" + value + expires + "; path=/; samesite=Lax";
+    },
+
+    readCookie : function (name) {
+        var nameEQ = name + "=";
+        var ca     = document.cookie.split(';');
+
+        for (var i = 0; i < ca.length; i++)
+        {
+            var c = ca[i];
+            while (c.charAt(0) == ' ')
+            {
+                c = c.substring(1,c.length);
+            }
+            if (c.indexOf(nameEQ) == 0)
+            {
+                return c.substring(nameEQ.length,c.length);
+            }
+        }
+        return null;
+    },
+
+    trimSlash: function (text) {
+        return text.replace(/^\/|\/$/g, '');
+    },
+
+    routerLink: function () {
+        var row, _location;
+        var rowGet = this.toolbar.querySelectorAll('td[data-debugbar-route="GET"]');
+        var patt   = /\((?:[^)(]+|\((?:[^)(]+|\([^)(]*\))*\))*\)/;
+
+        for (var i = 0; i < rowGet.length; i++)
+        {
+            row = rowGet[i];
+            if (!/\/\(.+?\)/.test(rowGet[i].innerText))
+            {
+                row.style = 'cursor: pointer;';
+                row.setAttribute('title', location.origin + '/' + ciDebugBar.trimSlash(row.innerText));
+                row.addEventListener('click', function (ev) {
+                    _location          = location.origin + '/' + ciDebugBar.trimSlash(ev.target.innerText);
+                    var redirectWindow = window.open(_location, '_blank');
+                    redirectWindow.location;
+                });
+            }
+            else
+            {
+                row.innerHTML = '<div>' + row.innerText + '</div>'
+                    + '<form data-debugbar-route-tpl="' + ciDebugBar.trimSlash(row.innerText.replace(patt, '?')) + '">'
+                    + row.innerText.replace(patt, '<input type="text" placeholder="$1">')
+                    + '<input type="submit" value="Go" style="margin-left: 4px;">'
+                    + '</form>';
+            }
+        }
+
+        rowGet = this.toolbar.querySelectorAll('td[data-debugbar-route="GET"] form');
+        for (var i = 0; i < rowGet.length; i++)
+        {
+            row = rowGet[i];
+
+            row.addEventListener('submit', function (event) {
+                event.preventDefault()
+                var inputArray = [], t = 0;
+                var input      = event.target.querySelectorAll('input[type=text]');
+                var tpl        = event.target.getAttribute('data-debugbar-route-tpl');
+
+                for (var n = 0; n < input.length; n++)
+                {
+                    if (input[n].value.length > 0)
+                    {
+                        inputArray.push(input[n].value);
+                    }
+                }
+
+                if (inputArray.length > 0)
+                {
+                    _location = location.origin + '/' + tpl.replace(/\?/g, function () {
+                        return inputArray[t++]
+                    });
+
+                    var redirectWindow = window.open(_location, '_blank');
+                    redirectWindow.location;
+                }
+            })
+        }
+    }
 };
diff --git a/system/Debug/Toolbar/Views/toolbar.tpl.php b/system/Debug/Toolbar/Views/toolbar.tpl.php
index 077fc9f070ba..0e73076f0e02 100644
--- a/system/Debug/Toolbar/Views/toolbar.tpl.php
+++ b/system/Debug/Toolbar/Views/toolbar.tpl.php
@@ -19,250 +19,250 @@
  */
 ?>
 <style type="text/css">
-	<?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . '/toolbar.css')) ?>
+    <?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . '/toolbar.css')) ?>
 </style>
 
 <script id="toolbar_js" type="text/javascript">
-	<?= file_get_contents(__DIR__ . '/toolbar.js') ?>
+    <?= file_get_contents(__DIR__ . '/toolbar.js') ?>
 </script>
 <div id="debug-icon" class="debug-bar-ndisplay">
-	<a id="debug-icon-link" href="javascript:void(0)">
-		<svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 155 200"><defs/><path fill="#dd4814" d="M73.7 3.7c2.2 7.9-.7 18.5-7.8 29-1.8 2.6-10.7 12.2-19.7 21.3-23.9 24-33.6 37.1-40.3 54.4-7.9 20.6-7.8 40.8.5 58.2C12.8 180 27.6 193 42.5 198l6 2-3-2.2c-21-15.2-22.9-38.7-4.8-58.8 2.5-2.7 4.8-5 5.1-5 .4 0 .7 2.7.7 6.1 0 5.7.2 6.2 3.7 9.5 3 2.7 4.6 3.4 7.8 3.4 5.6 0 9.9-2.4 11.6-6.5 2.9-6.9 1.6-12-5-20.5-10.5-13.4-11.7-23.3-4.3-34.7l3.1-4.8.7 4.7c1.3 8.2 5.8 12.9 25 25.8 20.9 14.1 30.6 26.1 32.8 40.5 1.1 7.2-.1 16.1-3.1 21.8-2.7 5.3-11.2 14.3-16.5 17.4-2.4 1.4-4.3 2.6-4.3 2.8 0 .2 2.4-.4 5.3-1.4 24.1-8.3 42.7-27.1 48.2-48.6 1.9-7.6 1.9-20.2-.1-28.5-3.5-15.2-14.6-30.5-29.9-41.2l-7-4.9-.6 3.3c-.8 4.8-2.6 7.6-5.9 9.3-4.5 2.3-10.3 1.9-13.8-1-6.7-5.7-7.8-14.6-3.7-30.5 3-11.6 3.2-20.6.5-29.1C88.3 18 80.6 6.3 74.8 2.2 73.1.9 73 1 73.7 3.7z"/></svg>
-	</a>
+    <a id="debug-icon-link" href="javascript:void(0)">
+        <svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 155 200"><defs/><path fill="#dd4814" d="M73.7 3.7c2.2 7.9-.7 18.5-7.8 29-1.8 2.6-10.7 12.2-19.7 21.3-23.9 24-33.6 37.1-40.3 54.4-7.9 20.6-7.8 40.8.5 58.2C12.8 180 27.6 193 42.5 198l6 2-3-2.2c-21-15.2-22.9-38.7-4.8-58.8 2.5-2.7 4.8-5 5.1-5 .4 0 .7 2.7.7 6.1 0 5.7.2 6.2 3.7 9.5 3 2.7 4.6 3.4 7.8 3.4 5.6 0 9.9-2.4 11.6-6.5 2.9-6.9 1.6-12-5-20.5-10.5-13.4-11.7-23.3-4.3-34.7l3.1-4.8.7 4.7c1.3 8.2 5.8 12.9 25 25.8 20.9 14.1 30.6 26.1 32.8 40.5 1.1 7.2-.1 16.1-3.1 21.8-2.7 5.3-11.2 14.3-16.5 17.4-2.4 1.4-4.3 2.6-4.3 2.8 0 .2 2.4-.4 5.3-1.4 24.1-8.3 42.7-27.1 48.2-48.6 1.9-7.6 1.9-20.2-.1-28.5-3.5-15.2-14.6-30.5-29.9-41.2l-7-4.9-.6 3.3c-.8 4.8-2.6 7.6-5.9 9.3-4.5 2.3-10.3 1.9-13.8-1-6.7-5.7-7.8-14.6-3.7-30.5 3-11.6 3.2-20.6.5-29.1C88.3 18 80.6 6.3 74.8 2.2 73.1.9 73 1 73.7 3.7z"/></svg>
+    </a>
 </div>
 <div id="debug-bar">
-	<div class="toolbar">
-		<span id="toolbar-position"><a href="javascript: void(0)">&#8597;</a></span>
-		<span id="toolbar-theme"><a href="javascript: void(0)">&#128261;</a></span>
-		<span class="ci-label">
-			<a href="javascript: void(0)" data-tab="ci-timeline">
-				<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD7SURBVEhLY6ArSEtLK09NTbWHcvGC9PR0BaDaQiAdUl9fzwQVxg+AFvwHamqHcnGCpKQkeaDa9yD1UD09UCn8AKaBWJySkmIApFehi0ONwwRQBceBLurAh4FqFoHUAtkrgPgREN+ByYEw1DhMANVEMIhAYQ5U1wtU/wmILwLZRlAp/IBYC8gGw88CaFj3A/FnIL4ETDXGUCnyANSC/UC6HIpnQMXAqQXIvo0khxNDjcMEQEmU9AzDuNI7Lgw1DhOAJIEuhQcRKMcC+e+QNHdDpcgD6BaAANSSQqBcENFlDi6AzQKqgkFlwWhxjVI8o2OgmkFaXI8CTMDAAAAxd1O4FzLMaAAAAABJRU5ErkJggg==">
-				<span class="hide-sm"><?= $totalTime ?> ms &nbsp; <?= $totalMemory ?> MB</span>
-			</a>
-		</span>
+    <div class="toolbar">
+        <span id="toolbar-position"><a href="javascript: void(0)">&#8597;</a></span>
+        <span id="toolbar-theme"><a href="javascript: void(0)">&#128261;</a></span>
+        <span class="ci-label">
+            <a href="javascript: void(0)" data-tab="ci-timeline">
+                <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD7SURBVEhLY6ArSEtLK09NTbWHcvGC9PR0BaDaQiAdUl9fzwQVxg+AFvwHamqHcnGCpKQkeaDa9yD1UD09UCn8AKaBWJySkmIApFehi0ONwwRQBceBLurAh4FqFoHUAtkrgPgREN+ByYEw1DhMANVEMIhAYQ5U1wtU/wmILwLZRlAp/IBYC8gGw88CaFj3A/FnIL4ETDXGUCnyANSC/UC6HIpnQMXAqQXIvo0khxNDjcMEQEmU9AzDuNI7Lgw1DhOAJIEuhQcRKMcC+e+QNHdDpcgD6BaAANSSQqBcENFlDi6AzQKqgkFlwWhxjVI8o2OgmkFaXI8CTMDAAAAxd1O4FzLMaAAAAABJRU5ErkJggg==">
+                <span class="hide-sm"><?= $totalTime ?> ms &nbsp; <?= $totalMemory ?> MB</span>
+            </a>
+        </span>
 
-		<?php foreach ($collectors as $c) : ?>
-			<?php if (! $c['isEmpty'] && ($c['hasTabContent'] || $c['hasLabel'])) : ?>
-				<span class="ci-label">
-					<a href="javascript: void(0)" data-tab="ci-<?= $c['titleSafe'] ?>">
-						<img src="<?= $c['icon'] ?>">
-						<span class="hide-sm">
-							<?= $c['title'] ?>
-							<?php if ($c['badgeValue'] !== null) : ?>
-								<span class="badge"><?= $c['badgeValue'] ?></span>
-							<?php endif ?>
-						</span>
-					</a>
-				</span>
-			<?php endif ?>
-		<?php endforeach ?>
+        <?php foreach ($collectors as $c) : ?>
+            <?php if (! $c['isEmpty'] && ($c['hasTabContent'] || $c['hasLabel'])) : ?>
+                <span class="ci-label">
+                    <a href="javascript: void(0)" data-tab="ci-<?= $c['titleSafe'] ?>">
+                        <img src="<?= $c['icon'] ?>">
+                        <span class="hide-sm">
+                            <?= $c['title'] ?>
+                            <?php if ($c['badgeValue'] !== null) : ?>
+                                <span class="badge"><?= $c['badgeValue'] ?></span>
+                            <?php endif ?>
+                        </span>
+                    </a>
+                </span>
+            <?php endif ?>
+        <?php endforeach ?>
 
-		<span class="ci-label">
-			<a href="javascript: void(0)" data-tab="ci-vars">
-				<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACLSURBVEhLYxgFJIHU1NSraWlp/6H4T0pKSjRUijoAyXAwBlrYDpViAFpmARQrJwZDtWACoCROC4D8CnR5XBiqBRMADfyNprgRKkUdAApzoCUdUNwE5MtApYYIALp6NBWBMVQLJgAaOJqK8AOgq+mSio6DggjEBtLUT0UwQ5HZIADkj6aiUTAggIEBANAEDa/lkCRlAAAAAElFTkSuQmCC">
-				<span class="hide-sm">Vars</span>
-			</a>
-		</span>
+        <span class="ci-label">
+            <a href="javascript: void(0)" data-tab="ci-vars">
+                <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACLSURBVEhLYxgFJIHU1NSraWlp/6H4T0pKSjRUijoAyXAwBlrYDpViAFpmARQrJwZDtWACoCROC4D8CnR5XBiqBRMADfyNprgRKkUdAApzoCUdUNwE5MtApYYIALp6NBWBMVQLJgAaOJqK8AOgq+mSio6DggjEBtLUT0UwQ5HZIADkj6aiUTAggIEBANAEDa/lkCRlAAAAAElFTkSuQmCC">
+                <span class="hide-sm">Vars</span>
+            </a>
+        </span>
 
-		<h1>
-			<span class="ci-label">
-				<a href="javascript: void(0)" data-tab="ci-config">
-					<svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 155 200"><defs/><path fill="#dd4814" d="M73.7 3.7c2.2 7.9-.7 18.5-7.8 29-1.8 2.6-10.7 12.2-19.7 21.3-23.9 24-33.6 37.1-40.3 54.4-7.9 20.6-7.8 40.8.5 58.2C12.8 180 27.6 193 42.5 198l6 2-3-2.2c-21-15.2-22.9-38.7-4.8-58.8 2.5-2.7 4.8-5 5.1-5 .4 0 .7 2.7.7 6.1 0 5.7.2 6.2 3.7 9.5 3 2.7 4.6 3.4 7.8 3.4 5.6 0 9.9-2.4 11.6-6.5 2.9-6.9 1.6-12-5-20.5-10.5-13.4-11.7-23.3-4.3-34.7l3.1-4.8.7 4.7c1.3 8.2 5.8 12.9 25 25.8 20.9 14.1 30.6 26.1 32.8 40.5 1.1 7.2-.1 16.1-3.1 21.8-2.7 5.3-11.2 14.3-16.5 17.4-2.4 1.4-4.3 2.6-4.3 2.8 0 .2 2.4-.4 5.3-1.4 24.1-8.3 42.7-27.1 48.2-48.6 1.9-7.6 1.9-20.2-.1-28.5-3.5-15.2-14.6-30.5-29.9-41.2l-7-4.9-.6 3.3c-.8 4.8-2.6 7.6-5.9 9.3-4.5 2.3-10.3 1.9-13.8-1-6.7-5.7-7.8-14.6-3.7-30.5 3-11.6 3.2-20.6.5-29.1C88.3 18 80.6 6.3 74.8 2.2 73.1.9 73 1 73.7 3.7z"/></svg>
-					<?= $CI_VERSION ?>
-				</a>
-			</span>
-		</h1>
+        <h1>
+            <span class="ci-label">
+                <a href="javascript: void(0)" data-tab="ci-config">
+                    <svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 155 200"><defs/><path fill="#dd4814" d="M73.7 3.7c2.2 7.9-.7 18.5-7.8 29-1.8 2.6-10.7 12.2-19.7 21.3-23.9 24-33.6 37.1-40.3 54.4-7.9 20.6-7.8 40.8.5 58.2C12.8 180 27.6 193 42.5 198l6 2-3-2.2c-21-15.2-22.9-38.7-4.8-58.8 2.5-2.7 4.8-5 5.1-5 .4 0 .7 2.7.7 6.1 0 5.7.2 6.2 3.7 9.5 3 2.7 4.6 3.4 7.8 3.4 5.6 0 9.9-2.4 11.6-6.5 2.9-6.9 1.6-12-5-20.5-10.5-13.4-11.7-23.3-4.3-34.7l3.1-4.8.7 4.7c1.3 8.2 5.8 12.9 25 25.8 20.9 14.1 30.6 26.1 32.8 40.5 1.1 7.2-.1 16.1-3.1 21.8-2.7 5.3-11.2 14.3-16.5 17.4-2.4 1.4-4.3 2.6-4.3 2.8 0 .2 2.4-.4 5.3-1.4 24.1-8.3 42.7-27.1 48.2-48.6 1.9-7.6 1.9-20.2-.1-28.5-3.5-15.2-14.6-30.5-29.9-41.2l-7-4.9-.6 3.3c-.8 4.8-2.6 7.6-5.9 9.3-4.5 2.3-10.3 1.9-13.8-1-6.7-5.7-7.8-14.6-3.7-30.5 3-11.6 3.2-20.6.5-29.1C88.3 18 80.6 6.3 74.8 2.2 73.1.9 73 1 73.7 3.7z"/></svg>
+                    <?= $CI_VERSION ?>
+                </a>
+            </span>
+        </h1>
 
-		<!-- Open/Close Toggle -->
-		<a id="debug-bar-link" href="javascript:void(0)" title="Open/Close">
-			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEPSURBVEhL7ZVLDoJAEEThRuoGDwSEG+jCuFU34s3AK3APP1VDDSGMqI1xx0s6M/2rnlHEaMZElmWrPM+vsDvsYbQ7+us0TReSC2EBrEHxCevRYuppYLXkQpC8sVCuGfTvqSE3hFdFwUGuGfRvqSE35NUAfKZrbQNQm2jrMA+gOK+M+FmhDsRL5voHMA8gFGecq0JOXLWlQg7E7AMIxZnjOiZOEJ82gFCcedUE4gS56QP8yf8ywItz7e+RituKlkkDBoIOH4Nd4HZD4NsGYJ/Abn1xEVOcuZ8f0zc/tHiYmzTAwscBvDIK/veyQ9K/rnewjdF26q0kF1IUxZIFPAVW98x/a+qp8L2M/+HMhETRE6S8TxpZ7KGXAAAAAElFTkSuQmCC">
-		</a>
-	</div>
+        <!-- Open/Close Toggle -->
+        <a id="debug-bar-link" href="javascript:void(0)" title="Open/Close">
+            <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEPSURBVEhL7ZVLDoJAEEThRuoGDwSEG+jCuFU34s3AK3APP1VDDSGMqI1xx0s6M/2rnlHEaMZElmWrPM+vsDvsYbQ7+us0TReSC2EBrEHxCevRYuppYLXkQpC8sVCuGfTvqSE3hFdFwUGuGfRvqSE35NUAfKZrbQNQm2jrMA+gOK+M+FmhDsRL5voHMA8gFGecq0JOXLWlQg7E7AMIxZnjOiZOEJ82gFCcedUE4gS56QP8yf8ywItz7e+RituKlkkDBoIOH4Nd4HZD4NsGYJ/Abn1xEVOcuZ8f0zc/tHiYmzTAwscBvDIK/veyQ9K/rnewjdF26q0kF1IUxZIFPAVW98x/a+qp8L2M/+HMhETRE6S8TxpZ7KGXAAAAAElFTkSuQmCC">
+        </a>
+    </div>
 
-	<!-- Timeline -->
-	<div id="ci-timeline" class="tab">
-		<table class="timeline">
-			<thead>
-			<tr>
-				<th class="debug-bar-width30">NAME</th>
-				<th class="debug-bar-width10">COMPONENT</th>
-				<th class="debug-bar-width10">DURATION</th>
-				<?php for ($i = 0; $i < $segmentCount; $i++) : ?>
-					<th><?= $i * $segmentDuration ?> ms</th>
-				<?php endfor ?>
-			</tr>
-			</thead>
-			<tbody>
-			<?= $this->renderTimeline($collectors, $startTime, $segmentCount, $segmentDuration, $styles) ?>
-			</tbody>
-		</table>
-	</div>
+    <!-- Timeline -->
+    <div id="ci-timeline" class="tab">
+        <table class="timeline">
+            <thead>
+            <tr>
+                <th class="debug-bar-width30">NAME</th>
+                <th class="debug-bar-width10">COMPONENT</th>
+                <th class="debug-bar-width10">DURATION</th>
+                <?php for ($i = 0; $i < $segmentCount; $i++) : ?>
+                    <th><?= $i * $segmentDuration ?> ms</th>
+                <?php endfor ?>
+            </tr>
+            </thead>
+            <tbody>
+            <?= $this->renderTimeline($collectors, $startTime, $segmentCount, $segmentDuration, $styles) ?>
+            </tbody>
+        </table>
+    </div>
 
-	<!-- Collector-provided Tabs -->
-	<?php foreach ($collectors as $c) : ?>
-		<?php if (! $c['isEmpty']) : ?>
-			<?php if ($c['hasTabContent']) : ?>
-				<div id="ci-<?= $c['titleSafe'] ?>" class="tab">
-					<h2><?= $c['title'] ?> <span><?= $c['titleDetails'] ?></span></h2>
+    <!-- Collector-provided Tabs -->
+    <?php foreach ($collectors as $c) : ?>
+        <?php if (! $c['isEmpty']) : ?>
+            <?php if ($c['hasTabContent']) : ?>
+                <div id="ci-<?= $c['titleSafe'] ?>" class="tab">
+                    <h2><?= $c['title'] ?> <span><?= $c['titleDetails'] ?></span></h2>
 
-					<?= is_string($c['display']) ? $c['display'] : $parser->setData($c['display'])->render("_{$c['titleSafe']}.tpl") ?>
-				</div>
-			<?php endif ?>
-		<?php endif ?>
-	<?php endforeach ?>
+                    <?= is_string($c['display']) ? $c['display'] : $parser->setData($c['display'])->render("_{$c['titleSafe']}.tpl") ?>
+                </div>
+            <?php endif ?>
+        <?php endif ?>
+    <?php endforeach ?>
 
-	<!-- In & Out -->
-	<div id="ci-vars" class="tab">
+    <!-- In & Out -->
+    <div id="ci-vars" class="tab">
 
-		<!-- VarData from Collectors -->
-		<?php if (isset($vars['varData'])) : ?>
-			<?php foreach ($vars['varData'] as $heading => $items) : ?>
+        <!-- VarData from Collectors -->
+        <?php if (isset($vars['varData'])) : ?>
+            <?php foreach ($vars['varData'] as $heading => $items) : ?>
 
-				<a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('<?= strtolower(str_replace(' ', '-', $heading)) ?>'); return false;">
-					<h2><?= $heading ?></h2>
-				</a>
+                <a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('<?= strtolower(str_replace(' ', '-', $heading)) ?>'); return false;">
+                    <h2><?= $heading ?></h2>
+                </a>
 
-				<?php if (is_array($items)) : ?>
+                <?php if (is_array($items)) : ?>
 
-					<table id="<?= strtolower(str_replace(' ', '-', $heading . '_table')) ?>">
-						<tbody>
-						<?php foreach ($items as $key => $value) : ?>
-							<tr>
-								<td><?= $key ?></td>
-								<td><?= $value ?></td>
-							</tr>
-						<?php endforeach ?>
-						</tbody>
-					</table>
+                    <table id="<?= strtolower(str_replace(' ', '-', $heading . '_table')) ?>">
+                        <tbody>
+                        <?php foreach ($items as $key => $value) : ?>
+                            <tr>
+                                <td><?= $key ?></td>
+                                <td><?= $value ?></td>
+                            </tr>
+                        <?php endforeach ?>
+                        </tbody>
+                    </table>
 
-				<?php else: ?>
-					<p class="muted">No data to display.</p>
-				<?php endif ?>
-			<?php endforeach ?>
-		<?php endif ?>
+                <?php else: ?>
+                    <p class="muted">No data to display.</p>
+                <?php endif ?>
+            <?php endforeach ?>
+        <?php endif ?>
 
-		<!-- Session -->
-		<a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('session'); return false;">
-			<h2>Session User Data</h2>
-		</a>
+        <!-- Session -->
+        <a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('session'); return false;">
+            <h2>Session User Data</h2>
+        </a>
 
-		<?php if (isset($vars['session'])) : ?>
-			<?php if (! empty($vars['session'])) : ?>
-				<table id="session_table">
-					<tbody>
-					<?php foreach ($vars['session'] as $key => $value) : ?>
-						<tr>
-							<td><?= $key ?></td>
-							<td><?= $value ?></td>
-						</tr>
-					<?php endforeach ?>
-					</tbody>
-				</table>
-			<?php else : ?>
-				<p class="muted">No data to display.</p>
-			<?php endif ?>
-		<?php else : ?>
-			<p class="muted">Session doesn't seem to be active.</p>
-		<?php endif ?>
+        <?php if (isset($vars['session'])) : ?>
+            <?php if (! empty($vars['session'])) : ?>
+                <table id="session_table">
+                    <tbody>
+                    <?php foreach ($vars['session'] as $key => $value) : ?>
+                        <tr>
+                            <td><?= $key ?></td>
+                            <td><?= $value ?></td>
+                        </tr>
+                    <?php endforeach ?>
+                    </tbody>
+                </table>
+            <?php else : ?>
+                <p class="muted">No data to display.</p>
+            <?php endif ?>
+        <?php else : ?>
+            <p class="muted">Session doesn't seem to be active.</p>
+        <?php endif ?>
 
-		<h2>Request <span>( <?= $vars['request'] ?> )</span></h2>
+        <h2>Request <span>( <?= $vars['request'] ?> )</span></h2>
 
-		<?php if (isset($vars['get']) && $get = $vars['get']) : ?>
-			<a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('get'); return false;">
-				<h3>$_GET</h3>
-			</a>
+        <?php if (isset($vars['get']) && $get = $vars['get']) : ?>
+            <a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('get'); return false;">
+                <h3>$_GET</h3>
+            </a>
 
-			<table id="get_table">
-				<tbody>
-				<?php foreach ($get as $name => $value) : ?>
-					<tr>
-						<td><?= $name ?></td>
-						<td><?= $value ?></td>
-					</tr>
-				<?php endforeach ?>
-				</tbody>
-			</table>
-		<?php endif ?>
+            <table id="get_table">
+                <tbody>
+                <?php foreach ($get as $name => $value) : ?>
+                    <tr>
+                        <td><?= $name ?></td>
+                        <td><?= $value ?></td>
+                    </tr>
+                <?php endforeach ?>
+                </tbody>
+            </table>
+        <?php endif ?>
 
-		<?php if (isset($vars['post']) && $post = $vars['post']) : ?>
-			<a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('post'); return false;">
-				<h3>$_POST</h3>
-			</a>
+        <?php if (isset($vars['post']) && $post = $vars['post']) : ?>
+            <a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('post'); return false;">
+                <h3>$_POST</h3>
+            </a>
 
-			<table id="post_table">
-				<tbody>
-				<?php foreach ($post as $name => $value) : ?>
-					<tr>
-						<td><?= $name ?></td>
-						<td><?= $value ?></td>
-					</tr>
-				<?php endforeach ?>
-				</tbody>
-			</table>
-		<?php endif ?>
+            <table id="post_table">
+                <tbody>
+                <?php foreach ($post as $name => $value) : ?>
+                    <tr>
+                        <td><?= $name ?></td>
+                        <td><?= $value ?></td>
+                    </tr>
+                <?php endforeach ?>
+                </tbody>
+            </table>
+        <?php endif ?>
 
-		<?php if (isset($vars['headers']) && $headers = $vars['headers']) : ?>
-			<a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('request_headers'); return false;">
-				<h3>Headers</h3>
-			</a>
+        <?php if (isset($vars['headers']) && $headers = $vars['headers']) : ?>
+            <a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('request_headers'); return false;">
+                <h3>Headers</h3>
+            </a>
 
-			<table id="request_headers_table">
-				<tbody>
-				<?php foreach ($headers as $header => $value) : ?>
-					<tr>
-						<td><?= $header ?></td>
-						<td><?= $value ?></td>
-					</tr>
-				<?php endforeach ?>
-				</tbody>
-			</table>
-		<?php endif ?>
+            <table id="request_headers_table">
+                <tbody>
+                <?php foreach ($headers as $header => $value) : ?>
+                    <tr>
+                        <td><?= $header ?></td>
+                        <td><?= $value ?></td>
+                    </tr>
+                <?php endforeach ?>
+                </tbody>
+            </table>
+        <?php endif ?>
 
-		<?php if (isset($vars['cookies']) && $cookies = $vars['cookies']) : ?>
-			<a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('cookie'); return false;">
-				<h3>Cookies</h3>
-			</a>
+        <?php if (isset($vars['cookies']) && $cookies = $vars['cookies']) : ?>
+            <a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('cookie'); return false;">
+                <h3>Cookies</h3>
+            </a>
 
-			<table id="cookie_table">
-				<tbody>
-				<?php foreach ($cookies as $name => $value) : ?>
-					<tr>
-						<td><?= $name ?></td>
-						<td><?= is_array($value) ? print_r($value, true) : $value ?></td>
-					</tr>
-				<?php endforeach ?>
-				</tbody>
-			</table>
-		<?php endif ?>
+            <table id="cookie_table">
+                <tbody>
+                <?php foreach ($cookies as $name => $value) : ?>
+                    <tr>
+                        <td><?= $name ?></td>
+                        <td><?= is_array($value) ? print_r($value, true) : $value ?></td>
+                    </tr>
+                <?php endforeach ?>
+                </tbody>
+            </table>
+        <?php endif ?>
 
-		<h2>Response
-			<span>( <?= $vars['response']['statusCode'] . ' - ' . $vars['response']['reason'] ?> )</span>
-		</h2>
+        <h2>Response
+            <span>( <?= $vars['response']['statusCode'] . ' - ' . $vars['response']['reason'] ?> )</span>
+        </h2>
 
-		<?php if (isset($vars['response']['headers']) && $headers = $vars['response']['headers']) : ?>
-			<a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('response_headers'); return false;">
-				<h3>Headers</h3>
-			</a>
+        <?php if (isset($vars['response']['headers']) && $headers = $vars['response']['headers']) : ?>
+            <a href="javascript:void(0)" onclick="ciDebugBar.toggleDataTable('response_headers'); return false;">
+                <h3>Headers</h3>
+            </a>
 
-			<table id="response_headers_table">
-				<tbody>
-				<?php foreach ($headers as $header => $value) : ?>
-					<tr>
-						<td><?= $header ?></td>
-						<td><?= $value ?></td>
-					</tr>
-				<?php endforeach ?>
-				</tbody>
-			</table>
-		<?php endif ?>
-	</div>
+            <table id="response_headers_table">
+                <tbody>
+                <?php foreach ($headers as $header => $value) : ?>
+                    <tr>
+                        <td><?= $header ?></td>
+                        <td><?= $value ?></td>
+                    </tr>
+                <?php endforeach ?>
+                </tbody>
+            </table>
+        <?php endif ?>
+    </div>
 
-	<!-- Config Values -->
-	<div id="ci-config" class="tab">
-		<h2>System Configuration</h2>
+    <!-- Config Values -->
+    <div id="ci-config" class="tab">
+        <h2>System Configuration</h2>
 
-		<?= $parser->setData($config)->render('_config.tpl') ?>
-	</div>
+        <?= $parser->setData($config)->render('_config.tpl') ?>
+    </div>
 </div>
 <style type="text/css">
 <?php foreach ($styles as $name => $style): ?>

From fbde269769948eb05d4e7e7561d0332f2d694c86 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 27 May 2022 12:57:43 +0900
Subject: [PATCH 2263/2325] test: add empty lines

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

diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
index 59f476f5d92d..88351be398ac 100644
--- a/tests/system/Helpers/FormHelperTest.php
+++ b/tests/system/Helpers/FormHelperTest.php
@@ -850,6 +850,7 @@ public function testSetRadio()
 
         $this->assertSame(' checked="checked"', set_radio('foo', 'bar'));
         $this->assertSame('', set_radio('foo', 'baz'));
+
         unset($_SESSION['_ci_old_input']);
     }
 
@@ -860,6 +861,7 @@ public function testSetRadio()
     public function testSetRadioFromPost()
     {
         $_POST['bar'] = 'baz';
+
         $this->assertSame(' checked="checked"', set_radio('bar', 'baz'));
         $this->assertSame('', set_radio('bar', 'boop'));
         $this->assertSame(' checked="checked"', set_radio('bar', 'boop', true));
@@ -872,10 +874,12 @@ public function testSetRadioFromPost()
     public function testSetRadioFromPostWithValueZero()
     {
         $_POST['bar'] = 0;
+
         $this->assertSame(' checked="checked"', set_radio('bar', '0'));
         $this->assertSame('', set_radio('bar', 'boop'));
 
         $_POST = [];
+
         $this->assertSame(' checked="checked"', set_radio('bar', '0', true));
     }
 
@@ -891,6 +895,7 @@ public function testSetRadioFromPostArray()
                 ],
             ],
         ];
+
         $this->assertSame(' checked="checked"', set_radio('bar', 'boop'));
         $this->assertSame('', set_radio('bar', 'baz'));
     }
@@ -907,6 +912,7 @@ public function testSetRadioFromPostArrayWithValueZero()
                 ],
             ],
         ];
+
         $this->assertSame(' checked="checked"', set_radio('bar', '0'));
         $this->assertSame('', set_radio('bar', 'baz'));
     }

From 478a7c3be50b9c5a6c7d8420257fda684abfe2df Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 27 May 2022 12:59:55 +0900
Subject: [PATCH 2264/2325] test: change test method names

---
 tests/system/Helpers/FormHelperTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
index 88351be398ac..f0a62e07373c 100644
--- a/tests/system/Helpers/FormHelperTest.php
+++ b/tests/system/Helpers/FormHelperTest.php
@@ -838,7 +838,7 @@ public function testSetCheckboxWithValueZero()
      * @runInSeparateProcess
      * @preserveGlobalState  disabled
      */
-    public function testSetRadio()
+    public function testSetRadioFromSessionOldInput()
     {
         $_SESSION = [
             '_ci_old_input' => [
@@ -883,7 +883,7 @@ public function testSetRadioFromPostWithValueZero()
         $this->assertSame(' checked="checked"', set_radio('bar', '0', true));
     }
 
-    public function testSetRadioFromPostArray()
+    public function testSetRadioFromSessionOldInputPostArray()
     {
         $_SESSION = [
             '_ci_old_input' => [
@@ -900,7 +900,7 @@ public function testSetRadioFromPostArray()
         $this->assertSame('', set_radio('bar', 'baz'));
     }
 
-    public function testSetRadioFromPostArrayWithValueZero()
+    public function testSetRadioFromSessionOldInputPostArrayWithValueZero()
     {
         $_SESSION = [
             '_ci_old_input' => [

From 5e754d6a824f03db51adbea8ef71403e40c30646 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 27 May 2022 13:08:23 +0900
Subject: [PATCH 2265/2325] test: fix arrange for test

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

diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
index f0a62e07373c..1a2556641aca 100644
--- a/tests/system/Helpers/FormHelperTest.php
+++ b/tests/system/Helpers/FormHelperTest.php
@@ -919,6 +919,9 @@ public function testSetRadioFromSessionOldInputPostArrayWithValueZero()
 
     public function testSetRadioDefault()
     {
+        $_SESSION = [];
+        $_POST    = [];
+
         $this->assertSame(' checked="checked"', set_radio('code', 'alpha', true));
         $this->assertSame('', set_radio('code', 'beta', false));
     }

From 62441b9cf8ebad8e57f29e3359c4a40d6c062b6f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 27 May 2022 13:10:22 +0900
Subject: [PATCH 2266/2325] docs: remove out of dated comments

---
 system/Helpers/form_helper.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
index e33ec2e89137..5e8ee6eebb82 100644
--- a/system/Helpers/form_helper.php
+++ b/system/Helpers/form_helper.php
@@ -571,7 +571,6 @@ function set_value(string $field, $default = '', bool $htmlEscape = true)
      * Set Select
      *
      * Let's you set the selected value of a <select> menu via data in the POST array.
-     * If Form Validation is active it retrieves the info from the validation class
      */
     function set_select(string $field, string $value = '', bool $default = false): string
     {
@@ -608,7 +607,6 @@ function set_select(string $field, string $value = '', bool $default = false): s
      * Set Checkbox
      *
      * Let's you set the selected value of a checkbox via the value in the POST array.
-     * If Form Validation is active it retrieves the info from the validation class
      */
     function set_checkbox(string $field, string $value = '', bool $default = false): string
     {
@@ -646,7 +644,6 @@ function set_checkbox(string $field, string $value = '', bool $default = false):
      * Set Radio
      *
      * Let's you set the selected value of a radio field via info in the POST array.
-     * If Form Validation is active it retrieves the info from the validation class
      */
     function set_radio(string $field, string $value = '', bool $default = false): string
     {

From 7ee850ba487819e191ddc345f2f541874c8ac72b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 27 May 2022 13:11:27 +0900
Subject: [PATCH 2267/2325] docs: remove out of dated note

---
 user_guide_src/source/helpers/form_helper.rst | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst
index 8f270085f85f..786d821d9a33 100644
--- a/user_guide_src/source/helpers/form_helper.rst
+++ b/user_guide_src/source/helpers/form_helper.rst
@@ -510,8 +510,3 @@ The following functions are available:
         <input type="radio" name="myradio" value="1" <?= set_radio('myradio', '1', true) ?> />
         <input type="radio" name="myradio" value="2" <?= set_radio('myradio', '2') ?> />
 
-    .. note:: If you are using the Validation class, you must always specify
-        a rule for your field, even if empty, in order for the ``set_*()``
-        functions to work. This is because if a Validation object is
-        defined, the control for ``set_*()`` is handed over to a method of the
-        class instead of the generic helper function.

From 8fa85ddf8e1ec850787547e2cdf7bfe5d0f1370b Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 27 May 2022 13:45:27 +0900
Subject: [PATCH 2268/2325] test: fix set_radio() tests

---
 tests/system/Helpers/FormHelperTest.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
index 1a2556641aca..85a3e8dc0182 100644
--- a/tests/system/Helpers/FormHelperTest.php
+++ b/tests/system/Helpers/FormHelperTest.php
@@ -843,12 +843,12 @@ public function testSetRadioFromSessionOldInput()
         $_SESSION = [
             '_ci_old_input' => [
                 'post' => [
-                    'foo' => 'bar',
+                    'foo' => '<bar>',
                 ],
             ],
         ];
 
-        $this->assertSame(' checked="checked"', set_radio('foo', 'bar'));
+        $this->assertSame(' checked="checked"', set_radio('foo', '<bar>'));
         $this->assertSame('', set_radio('foo', 'baz'));
 
         unset($_SESSION['_ci_old_input']);
@@ -864,7 +864,7 @@ public function testSetRadioFromPost()
 
         $this->assertSame(' checked="checked"', set_radio('bar', 'baz'));
         $this->assertSame('', set_radio('bar', 'boop'));
-        $this->assertSame(' checked="checked"', set_radio('bar', 'boop', true));
+        $this->assertSame('', set_radio('bar', 'boop', true));
     }
 
     /**
@@ -873,7 +873,7 @@ public function testSetRadioFromPost()
      */
     public function testSetRadioFromPostWithValueZero()
     {
-        $_POST['bar'] = 0;
+        $_POST['bar'] = '0';
 
         $this->assertSame(' checked="checked"', set_radio('bar', '0'));
         $this->assertSame('', set_radio('bar', 'boop'));

From 6bb449a4ad7a96c96c8b8a8d875643ad90c370bf Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 27 May 2022 13:48:17 +0900
Subject: [PATCH 2269/2325] fix: set_radio() implementation

---
 system/Helpers/form_helper.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/system/Helpers/form_helper.php b/system/Helpers/form_helper.php
index 5e8ee6eebb82..2466900d0d3e 100644
--- a/system/Helpers/form_helper.php
+++ b/system/Helpers/form_helper.php
@@ -650,14 +650,21 @@ function set_radio(string $field, string $value = '', bool $default = false): st
         $request = Services::request();
 
         // Try any old input data we may have first
-        $input = $request->getOldInput($field);
-        if ($input === null) {
-            $input = $request->getPost($field) ?? $default;
+        $oldInput = $request->getOldInput($field);
+
+        $postInput = $request->getPost($field);
+
+        if ($oldInput !== null) {
+            $input = $oldInput;
+        } elseif ($postInput !== null) {
+            $input = $postInput;
+        } else {
+            $input = $default;
         }
 
         if (is_array($input)) {
             // Note: in_array('', array(0)) returns TRUE, do not use it
-            foreach ($input as &$v) {
+            foreach ($input as $v) {
                 if ($value === $v) {
                     return ' checked="checked"';
                 }
@@ -667,16 +674,11 @@ function set_radio(string $field, string $value = '', bool $default = false): st
         }
 
         // Unchecked checkbox and radio inputs are not even submitted by browsers ...
-        $result = '';
-        if ((string) $input === '0' || ! empty($input = $request->getPost($field)) || ! empty($input = old($field))) {
-            $result = ($input === $value) ? ' checked="checked"' : '';
-        }
-
-        if (empty($result)) {
-            $result = ($default === true) ? ' checked="checked"' : '';
+        if ($oldInput !== null || $postInput !== null) {
+            return ((string) $input === $value) ? ' checked="checked"' : '';
         }
 
-        return $result;
+        return ($default === true) ? ' checked="checked"' : '';
     }
 }
 

From e6e901f370a5780d733236fa2932276551093679 Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Fri, 27 May 2022 16:57:21 +0800
Subject: [PATCH 2270/2325] Update
 user_guide_src/source/database/query_builder.rst

Clarification for union() method.

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

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 032407c5de30..6f0b83837a4c 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -691,7 +691,7 @@ Union
 $builder->union()
 -----------------
 
-Is used to combine the result-set of two or more SELECT statements.
+Is used to combine the result-set of two or more SELECT statements. It will return only the unique results.
 
 .. literalinclude:: query_builder/103.php
 

From fd013cd84f9fdf5f5f497708bca1fb738a44a83e Mon Sep 17 00:00:00 2001
From: Andrey Pyzhikov <5071@mail.ru>
Date: Fri, 27 May 2022 16:58:02 +0800
Subject: [PATCH 2271/2325] Update
 user_guide_src/source/database/query_builder.rst

Clarification for unionAll() method.

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

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 6f0b83837a4c..f03c499863b6 100755
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -712,7 +712,7 @@ In the example below, we get the first 5 users + the last 5 users and sort the r
 $builder->unionAll()
 --------------------
 
-The behavior is the same as the ``union()`` method.
+The behavior is the same as the ``union()`` method. However, all results will be returned, not just the unique ones.
 
 **************
 Query grouping

From fe30fe2e95299b3a0ffdf8f40dac8f6ea056d319 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 27 May 2022 18:54:08 +0900
Subject: [PATCH 2272/2325] docs: small improvements

---
 user_guide_src/source/testing/overview.rst    | 34 +++++++++++--------
 .../source/testing/overview/003.php           |  1 +
 .../source/testing/overview/004.php           |  1 +
 .../source/testing/overview/016.php           |  1 +
 .../source/testing/overview/017.php           |  1 +
 .../source/testing/overview/018.php           |  3 ++
 6 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/user_guide_src/source/testing/overview.rst b/user_guide_src/source/testing/overview.rst
index dd89f837eb6a..77dbf9f3da80 100644
--- a/user_guide_src/source/testing/overview.rst
+++ b/user_guide_src/source/testing/overview.rst
@@ -3,12 +3,12 @@ Testing
 #######
 
 CodeIgniter has been built to make testing both the framework and your application as simple as possible.
-Support for ``PHPUnit`` is built in, and the framework provides a number of convenient
+Support for `PHPUnit <https://phpunit.de/>`__ is built in, and the framework provides a number of convenient
 helper methods to make testing every aspect of your application as painless as possible.
 
 .. contents::
     :local:
-    :depth: 2
+    :depth: 3
 
 *************
 System Set Up
@@ -35,7 +35,11 @@ application and system directories) type the following from the command line::
 This will install the correct version for your current PHP version. Once that is done, you can run all of the
 tests for this project by typing::
 
-    > ./vendor/bin/phpunit
+    > vendor/bin/phpunit
+
+If you are using Windows, use the following command::
+
+    > vendor\bin\phpunit
 
 Phar
 ----
@@ -144,8 +148,8 @@ Ensure that a header or cookie was actually emitted:
 
 .. literalinclude:: overview/009.php
 
-Note: the test case with this should be `run as a separate process
-in PHPunit <https://phpunit.readthedocs.io/en/9.5/annotations.html#runinseparateprocess>`_.
+.. note:: the test case with this should be `run as a separate process
+    in PHPunit <https://phpunit.readthedocs.io/en/9.5/annotations.html#runinseparateprocess>`_.
 
 assertHeaderNotEmitted($header, $ignoreCase = false)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -154,8 +158,8 @@ Ensure that a header or cookie was not emitted:
 
 .. literalinclude:: overview/010.php
 
-Note: the test case with this should be `run as a separate process
-in PHPunit <https://phpunit.readthedocs.io/en/9.5/annotations.html#runinseparateprocess>`_.
+.. note:: the test case with this should be `run as a separate process
+    in PHPunit <https://phpunit.readthedocs.io/en/9.5/annotations.html#runinseparateprocess>`_.
 
 assertCloseEnough($expected, $actual, $message = '', $tolerance = 1)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -215,8 +219,8 @@ your tests to only the code in question, while simulating various responses from
 true when testing controllers and other integration testing. The **Services** class provides the following methods
 to simplify this.
 
-injectMock()
-------------
+Services::injectMock()
+----------------------
 
 This method allows you to define the exact instance that will be returned by the Services class. You can use this to
 set properties of a service so that it behaves in a certain way, or replace a service with a mocked class.
@@ -226,13 +230,15 @@ set properties of a service so that it behaves in a certain way, or replace a se
 The first parameter is the service that you are replacing. The name must match the function name in the Services
 class exactly. The second parameter is the instance to replace it with.
 
-reset()
--------
+Services::reset()
+-----------------
 
 Removes all mocked classes from the Services class, bringing it back to its original state.
 
-resetSingle(string $name)
--------------------------
+You can also use the ``$this->resetServices()`` method that ``CIUnitTestCase`` provides.
+
+Services::resetSingle(string $name)
+-----------------------------------
 
 Removes any mock and shared instances for a single service, by its name.
 
@@ -242,7 +248,7 @@ Mocking Factory Instances
 =========================
 
 Similar to Services, you may find yourself needing to supply a pre-configured class instance
-during testing that will be used with ``Factories``. Use the same ``injectMock()`` and ``reset()``
+during testing that will be used with ``Factories``. Use the same ``Factories::injectMock()`` and ``Factories::reset()``
 static methods like **Services**, but they take an additional preceding parameter for the
 component name:
 
diff --git a/user_guide_src/source/testing/overview/003.php b/user_guide_src/source/testing/overview/003.php
index 4d2e7ef4b5a8..ac01a937d341 100644
--- a/user_guide_src/source/testing/overview/003.php
+++ b/user_guide_src/source/testing/overview/003.php
@@ -9,6 +9,7 @@ final class OneOfMyModelsTest extends CIUnitTestCase
     protected function setUp(): void
     {
         parent::setUp();
+
         helper('text');
     }
 }
diff --git a/user_guide_src/source/testing/overview/004.php b/user_guide_src/source/testing/overview/004.php
index 4a0e6030b2fa..257da38142a4 100644
--- a/user_guide_src/source/testing/overview/004.php
+++ b/user_guide_src/source/testing/overview/004.php
@@ -10,5 +10,6 @@ final class OneOfMyModelsTest extends CIUnitTestCase
         'mockEmail',
         'mockSession',
     ];
+
     protected $tearDownMethods = [];
 }
diff --git a/user_guide_src/source/testing/overview/016.php b/user_guide_src/source/testing/overview/016.php
index cf0c211496b6..d3a769d8379c 100644
--- a/user_guide_src/source/testing/overview/016.php
+++ b/user_guide_src/source/testing/overview/016.php
@@ -1,6 +1,7 @@
 <?php
 
 use CodeIgniter\Test\CIUnitTestCase;
+use Config\Services;
 
 final class SomeTest extends CIUnitTestCase
 {
diff --git a/user_guide_src/source/testing/overview/017.php b/user_guide_src/source/testing/overview/017.php
index 67ccc4a634dc..c31ac96eb459 100644
--- a/user_guide_src/source/testing/overview/017.php
+++ b/user_guide_src/source/testing/overview/017.php
@@ -1,5 +1,6 @@
 <?php
 
+use CodeIgniter\Config\Factories;
 use CodeIgniter\Test\CIUnitTestCase;
 
 final class SomeTest extends CIUnitTestCase
diff --git a/user_guide_src/source/testing/overview/018.php b/user_guide_src/source/testing/overview/018.php
index e0e55131f5b3..179b049e6a3c 100644
--- a/user_guide_src/source/testing/overview/018.php
+++ b/user_guide_src/source/testing/overview/018.php
@@ -1,6 +1,8 @@
 <?php
 
+use CodeIgniter\CLI\CLI;
 use CodeIgniter\Test\CIUnitTestCase;
+use CodeIgniter\Test\Filters\CITestStreamFilter;
 
 final class SomeTest extends CIUnitTestCase
 {
@@ -18,6 +20,7 @@ protected function tearDown(): void
     public function testSomeOutput(): void
     {
         CLI::write('first.');
+
         $expected = "first.\n";
         $this->assertSame($expected, CITestStreamFilter::$buffer);
     }

From dd62421b591e923ad5d7cece4f6ee6afb550facd Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 28 May 2022 09:53:01 +0900
Subject: [PATCH 2273/2325] docs: add upgrade procedure example for v4.2.0

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

diff --git a/user_guide_src/source/installation/upgrade_420.rst b/user_guide_src/source/installation/upgrade_420.rst
index c56d34b65f4a..01336530c9f9 100644
--- a/user_guide_src/source/installation/upgrade_420.rst
+++ b/user_guide_src/source/installation/upgrade_420.rst
@@ -24,6 +24,15 @@ The following files received significant changes and
 * ``public/index.php``
 * ``spark``
 
+.. important:: If you don't update the above two files, CodeIgniter will not work at all
+    after running ``composer update``.
+
+    The upgrade procedure, for example, is as follows::
+
+        > composer update
+        > cp vendor/codeigniter4/framework/public/index.php public/index.php
+        > cp vendor/codeigniter4/framework/spark .
+
 Config/Constants.php
 ====================
 

From 43beea215ec1c858d4aeae6a46d7652725674d03 Mon Sep 17 00:00:00 2001
From: Alexandr Toropov <toropovsite@yandex.ru>
Date: Sat, 28 May 2022 23:17:47 +0300
Subject: [PATCH 2274/2325] fix: unit test

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

diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 98ee02f30bbc..3dd8cfe3cfe8 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -391,7 +391,7 @@ public function testReallyWritable()
     public function testSlashItem()
     {
         $this->assertSame('/', slash_item('cookiePath')); // slash already there
-        $this->assertSame('', slash_item('cookieDomain')); // empty, so untouched
+        $this->assertNull(null, slash_item('cookieDomain')); // empty, so untouched
         $this->assertSame('en/', slash_item('defaultLocale')); // slash appended
     }
 

From 0388d5447dc831b12fd999602511f104acb48cad Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 29 May 2022 10:06:21 +0900
Subject: [PATCH 2275/2325] docs: remove duplicate entries

It seems I mistook when I rebased.
---
 user_guide_src/source/changelogs/v4.2.0.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 67483548bb37..91230a2628a5 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -19,7 +19,6 @@ BREAKING
     - ``public/index.php``
     - ``spark``
 - The ``system/bootstrap.php`` file has been modified to easily implement `Preloading <https://www.php.net/manual/en/opcache.preloading.php>`_. Returning a ``CodeIgniter`` instance and loading ``.env`` file have been moved to ``index.php`` and ``spark``.
-- The method signature of ``CodeIgniter\CLI\CommandRunner::_remap()`` has been changed to fix a bug.
 - The ``CodeIgniter\Autoloader\Autoloader::initialize()`` has changed the behavior to fix a bug. It used to use Composer classmap only when ``$modules->discoverInComposer`` is true. Now it always uses the Composer classmap if Composer is available.
 - The color code output by :ref:`CLI::color() <cli-library-color>` has been changed to fix a bug.
 - To prevent unexpected access from the web browser, if a controller is added to a cli route (``$routes->cli()``), all methods of that controller are no longer accessible via auto-routing.
@@ -86,7 +85,6 @@ Others
     - See :ref:`content-security-policy` for details.
 - New :doc:`../outgoing/view_decorators` allow modifying the generated HTML prior to caching.
 - Added Validation Strict Rules. See :ref:`validation-traditional-and-strict-rules`.
-- The ``spark routes`` command now shows closure routes, auto routes, and filters. See :ref:`URI Routing <spark-routes>`.
 - Exception information logged through ``log_message()`` has now improved. It now includes the file and line where the exception originated. It also does not truncate the message anymore.
     - The log format has also changed. If users are depending on the log format in their apps, the new log format is "<1-based count> <cleaned filepath>(<line>): <class><function><args>"
 - Added support for webp files to **app/Config/Mimes.php**.

From cf440fa01447a2d51978d56b89c4013ffa65f4bc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 29 May 2022 10:16:08 +0900
Subject: [PATCH 2276/2325] docs: categorize changelog v4.2.0

---
 user_guide_src/source/changelogs/v4.2.0.rst | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 91230a2628a5..01b0694ba71f 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -12,9 +12,17 @@ Release Date: Not Released
 BREAKING
 ********
 
+Method Signature Changes
+========================
+
 - The method signature of ``CodeIgniter\Database\BaseBuilder::join()`` and ``CodeIgniter\Database\*\Builder::join()`` have been changed.
 - The method signature of ``Validation::setRule()`` has been changed. The ``string`` typehint on the ``$rules`` parameter was removed. Extending classes should likewise remove the parameter so as not to break LSP.
 - The method signature of ``CodeIgniter\CLI\CommandRunner::_remap()`` has been changed to fix a bug.
+- The default parameter values for ``Service::reset()`` and ``CIUnitTestCase::resetServices()`` have been changed from ``false`` to ``true``. This is to eliminate unexpected problems during testing, such as ``lang()`` not getting translated messages.
+
+Behavior Changes
+================
+
 - The ``CodeIgniter\CodeIgniter`` class has a new property ``$context`` and it must have the correct context at runtime. So the following files have been changed:
     - ``public/index.php``
     - ``spark``
@@ -24,7 +32,6 @@ BREAKING
 - To prevent unexpected access from the web browser, if a controller is added to a cli route (``$routes->cli()``), all methods of that controller are no longer accessible via auto-routing.
 - There is a possible backward compatibility break for those users extending the History Collector and they should probably update ``History::setFiles()`` method.
 - The :php:func:`dot_array_search`'s unexpected behavior has been fixed. Now ``dot_array_search('foo.bar.baz', ['foo' => ['bar' => 23]])`` returns ``null``. The previous versions returned ``23``.
-- The default parameter values for ``Service::reset()`` and ``CIUnitTestCase::resetServices()`` have been changed from ``false`` to ``true``. This is to eliminate unexpected problems during testing, such as ``lang()`` not getting translated messages.
 
 Enhancements
 ************
@@ -75,6 +82,14 @@ Database
 - ``DBForge::addField()`` default value raw SQL string support. See :ref:`forge-addfield-default-value-rawsql`.
 - QueryBuilder. Union queries. See :ref:`query-builder-union`.
 
+Helpers and Functions
+=====================
+
+- HTML helper ``script_tag()`` now uses ``null`` values to write boolean attributes in minimized form: ``<script src="..." defer />``. See the sample code for :php:func:`script_tag`.
+- Added 4th parameter ``$includeDir`` to ``get_filenames()``. See :php:func:`get_filenames`.
+- Exception information logged through ``log_message()`` has now improved. It now includes the file and line where the exception originated. It also does not truncate the message anymore.
+    - The log format has also changed. If users are depending on the log format in their apps, the new log format is "<1-based count> <cleaned filepath>(<line>): <class><function><args>"
+
 Others
 ======
 
@@ -85,11 +100,7 @@ Others
     - See :ref:`content-security-policy` for details.
 - New :doc:`../outgoing/view_decorators` allow modifying the generated HTML prior to caching.
 - Added Validation Strict Rules. See :ref:`validation-traditional-and-strict-rules`.
-- Exception information logged through ``log_message()`` has now improved. It now includes the file and line where the exception originated. It also does not truncate the message anymore.
-    - The log format has also changed. If users are depending on the log format in their apps, the new log format is "<1-based count> <cleaned filepath>(<line>): <class><function><args>"
 - Added support for webp files to **app/Config/Mimes.php**.
-- Added 4th parameter ``$includeDir`` to ``get_filenames()``. See :php:func:`get_filenames`.
-- HTML helper ``script_tag()`` now uses ``null`` values to write boolean attributes in minimized form: ``<script src="..." defer />``. See the sample code for :php:func:`script_tag`.
 - RouteCollection::addRedirect() can now use placeholders.
 - Debugbar enhancements
     - Debug toolbar is now using ``microtime()`` instead of ``time()``.

From c674c967db7798014c389c91dc16925e8bee1dba Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 29 May 2022 10:21:48 +0900
Subject: [PATCH 2277/2325] docs: add link to detailed page

---
 user_guide_src/source/changelogs/v4.2.0.rst | 2 +-
 user_guide_src/source/incoming/routing.rst  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 01b0694ba71f..93be8169faaf 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -101,7 +101,7 @@ Others
 - New :doc:`../outgoing/view_decorators` allow modifying the generated HTML prior to caching.
 - Added Validation Strict Rules. See :ref:`validation-traditional-and-strict-rules`.
 - Added support for webp files to **app/Config/Mimes.php**.
-- RouteCollection::addRedirect() can now use placeholders.
+- ``RouteCollection::addRedirect()`` can now use placeholders. See :ref:`redirecting-routes` for details.
 - Debugbar enhancements
     - Debug toolbar is now using ``microtime()`` instead of ``time()``.
 - Added a sample file for `Preloading <https://www.php.net/manual/en/opcache.preloading.php>`_. See **preload.php**.
diff --git a/user_guide_src/source/incoming/routing.rst b/user_guide_src/source/incoming/routing.rst
index 1b6cdf74c078..dc27a5aeb8e3 100644
--- a/user_guide_src/source/incoming/routing.rst
+++ b/user_guide_src/source/incoming/routing.rst
@@ -202,6 +202,8 @@ define an array of routes and then pass it as the first parameter to the ``map()
 
 .. literalinclude:: routing/021.php
 
+.. _redirecting-routes:
+
 Redirecting Routes
 ==================
 
@@ -213,6 +215,8 @@ redirect and is recommended in most cases:
 
 .. literalinclude:: routing/022.php
 
+.. note:: Since v4.2.0 ``addRedirect()`` can use placeholders.
+
 If a redirect route is matched during a page load, the user will be immediately redirected to the new page before a
 controller can be loaded.
 

From 374acd2563a6a80bfcf3f7255e972cdd4b0ac526 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 29 May 2022 10:26:26 +0900
Subject: [PATCH 2278/2325] docs: categorise Enhancements Database

---
 user_guide_src/source/changelogs/v4.2.0.rst | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 93be8169faaf..6f92133c9540 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -71,16 +71,17 @@ Commands
 Database
 ========
 
-- Added Subqueries in the FROM section. See :ref:`query-builder-from-subquery`.
-- Added Subqueries in the SELECT section. See :ref:`query-builder-select`.
-- The BaseBuilder::buildSubquery() method can take an optional third argument ``string $alias``.
 - Added new OCI8 driver for database.
     - It can access Oracle Database and supports SQL and PL/SQL statements.
-- QueryBuilder raw SQL string support
+- QueryBuilder
+    - Added Subqueries in the FROM section. See :ref:`query-builder-from-subquery`.
+    - Added Subqueries in the SELECT section. See :ref:`query-builder-select`.
+    - The ``BaseBuilder::buildSubquery()`` method can take an optional third argument ``string $alias``.
+    - Union queries. See :ref:`query-builder-union`.
+- Raw SQL string support
     - Added the class ``CodeIgniter\Database\RawSql`` which expresses raw SQL strings.
     - :ref:`select() <query-builder-select-rawsql>`, :ref:`where() <query-builder-where-rawsql>`, :ref:`like() <query-builder-like-rawsql>`, :ref:`join() <query-builder-join-rawsql>` accept the ``CodeIgniter\Database\RawSql`` instance.
-- ``DBForge::addField()`` default value raw SQL string support. See :ref:`forge-addfield-default-value-rawsql`.
-- QueryBuilder. Union queries. See :ref:`query-builder-union`.
+    - ``DBForge::addField()`` default value raw SQL string support. See :ref:`forge-addfield-default-value-rawsql`.
 
 Helpers and Functions
 =====================

From 83c561c7f062adbc47b3bc11735527706b993b7f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sun, 29 May 2022 10:27:48 +0900
Subject: [PATCH 2279/2325] docs: change section order in Enhancements

---
 user_guide_src/source/changelogs/v4.2.0.rst | 26 ++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 6f92133c9540..077cf64a1ac8 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -55,19 +55,6 @@ Added an optional new more secure auto router. These are the changes from the le
 
 See :ref:`auto-routing-improved` for the details.
 
-Commands
-========
-
-- Added ``spark db:table`` command. See :doc:`../dbmgmt/db_commands` for the details.
-    - You can now see the names of all the tables in the database you are currently connected in the terminal.
-        - ``spark db:table --show``
-    - Or you can see the field names and the records of a table.
-        - ``spark db:table my_table``
-        - ``spark db:table my_table --limit-rows 50 --limit-field-value 20 --desc``
-    - Or you can see metadata like the column type, max length of a table.
-        - ``spark db:table my_table --metadata``
-- The ``spark routes`` command now shows closure routes, auto routes, and filters. See :ref:`URI Routing <spark-routes>`.
-
 Database
 ========
 
@@ -91,6 +78,19 @@ Helpers and Functions
 - Exception information logged through ``log_message()`` has now improved. It now includes the file and line where the exception originated. It also does not truncate the message anymore.
     - The log format has also changed. If users are depending on the log format in their apps, the new log format is "<1-based count> <cleaned filepath>(<line>): <class><function><args>"
 
+Commands
+========
+
+- Added ``spark db:table`` command. See :doc:`../dbmgmt/db_commands` for the details.
+    - You can now see the names of all the tables in the database you are currently connected in the terminal.
+        - ``spark db:table --show``
+    - Or you can see the field names and the records of a table.
+        - ``spark db:table my_table``
+        - ``spark db:table my_table --limit-rows 50 --limit-field-value 20 --desc``
+    - Or you can see metadata like the column type, max length of a table.
+        - ``spark db:table my_table --metadata``
+- The ``spark routes`` command now shows closure routes, auto routes, and filters. See :ref:`URI Routing <spark-routes>`.
+
 Others
 ======
 

From cb0a0d458245f17e10d9be743ac5122ce7f0967c Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 30 May 2022 05:48:43 +0900
Subject: [PATCH 2280/2325] docs: add "Updating Your Branch"

---
 contributing/workflow.md | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/contributing/workflow.md b/contributing/workflow.md
index b2309df9477a..1788aff0878b 100644
--- a/contributing/workflow.md
+++ b/contributing/workflow.md
@@ -155,7 +155,6 @@ that it could benefit from a review by fellow developers.
 > Remember to sync your local repo with the shared one before pushing!
 It is a lot easier to resolve conflicts at this stage.
 
-
 Synchronize your repository:
 
     git checkout develop
@@ -215,6 +214,33 @@ Label your PRs with the one of the following [labels](https://github.com/codeign
 And if your PRs have the breaking changes, label the following label:
 - **breaking change** ... PRs that may break existing functionalities
 
+## Updating Your Branch
+
+If you are asked for changes in the review, commit the fix in your branch and push it to GitHub again.
+
+If the `develop` branch progresses and conflicts arise that prevent merging, or if you are asked to *rebase*,
+do the following:
+
+Synchronize your repository:
+
+    git checkout develop
+    git fetch upstream
+    git merge upstream/develop
+    git push origin develop
+
+Bring your feature branch up to date:
+
+    git checkout new/mind-reader
+    git rebase upstream/develop
+
+You might get conflicts when you rebase. It is your
+responsibility to resolve those locally, so that you can continue
+collaborating with the shared repository.
+
+And finally push your local branch to your GitHub repository:
+
+    git push --force-with-lease origin new/mind-reader
+
 ## Cleanup
 
 If your PR is accepted and merged into the shared repository, you can

From 863dad55539a7112bce9abd01e24508cc5dc4808 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 30 May 2022 10:42:10 +0900
Subject: [PATCH 2281/2325] refactor: if a user update CI on product server,
 assert() may not work

---
 system/CodeIgniter.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 092b2905bffe..4e4d49ea0045 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -34,6 +34,7 @@
 use Kint;
 use Kint\Renderer\CliRenderer;
 use Kint\Renderer\RichRenderer;
+use LogicException;
 
 /**
  * This class is the core of the framework, and will analyse the
@@ -304,10 +305,9 @@ protected function initializeKint()
      */
     public function run(?RouteCollectionInterface $routes = null, bool $returnResponse = false)
     {
-        assert(
-            $this->context !== null,
-            'Context must be set before run() is called. If you are upgrading from 4.1.x, you need to merge `public/index.php` and `spark` file from `vendor/codeigniter4/framework`.'
-        );
+        if ($this->context === null) {
+            throw new LogicException('Context must be set before run() is called. If you are upgrading from 4.1.x, you need to merge `public/index.php` and `spark` file from `vendor/codeigniter4/framework`.');
+        }
 
         $this->startBenchmark();
 

From f1744e11c58c53b8c148ce9504232df82153bb23 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 30 May 2022 17:05:15 +0900
Subject: [PATCH 2282/2325] docs: add sub sections and fix section level

---
 .../source/database/configuration.rst         | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst
index b8eb2be48292..4bd63ac78625 100644
--- a/user_guide_src/source/database/configuration.rst
+++ b/user_guide_src/source/database/configuration.rst
@@ -6,6 +6,10 @@ Database Configuration
     :local:
     :depth: 2
 
+***********
+Config File
+***********
+
 CodeIgniter has a config file that lets you store your database
 connection values (username, password, database name, etc.). The config
 file is located at **app/Config/Database.php**. You can also set
@@ -22,6 +26,9 @@ while connecting to specify a group name.
 .. note:: The default location of the SQLite3 database is in the ``writable`` folder.
     If you want to change the location, you must set the full path to the new folder.
 
+DSN
+===
+
 Some database drivers (such as PDO, PostgreSQL, Oracle, ODBC) might
 require a full DSN string to be provided. If that is the case, you
 should use the 'DSN' configuration setting, as if you're using the
@@ -45,6 +52,9 @@ add the config variables as a query string:
     database character set), which are present in the rest of the configuration
     fields, CodeIgniter will append them.
 
+Failovers
+=========
+
 You can also specify failovers for the situation when the main connection cannot connect for some reason.
 These failovers can be specified by setting the failover for a connection like this:
 
@@ -69,14 +79,18 @@ variable located in the config file:
     default we've used the word "default" for the primary connection,
     but it too can be renamed to something more relevant to your project.
 
+defaultGroup
+============
+
 You could modify the config file to detect the environment and automatically
 update the `defaultGroup` value to the correct one by adding the required logic
 within the class' constructor:
 
 .. literalinclude:: configuration/008.php
 
-Configuring With .env File
---------------------------
+**************************
+Configuring with .env File
+**************************
 
 You can also save your configuration values within a **.env** file with the current server's
 database settings. You only need to enter the values that change from what is in the
@@ -89,8 +103,9 @@ default group's configuration settings. The values should be name following this
 
 As with all other
 
+**********************
 Explanation of Values:
-----------------------
+**********************
 
 ==============  ===========================================================================================================
  Name Config    Description

From 96beafa7a2768ec78da17cb1e8beb7987dd3f484 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 30 May 2022 17:05:51 +0900
Subject: [PATCH 2283/2325] docs: remove sentence

I'm not sure what it means.
---
 user_guide_src/source/database/configuration.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst
index 4bd63ac78625..939b175e1ac6 100644
--- a/user_guide_src/source/database/configuration.rst
+++ b/user_guide_src/source/database/configuration.rst
@@ -101,8 +101,6 @@ default group's configuration settings. The values should be name following this
     database.default.password = '';
     database.default.database = 'ci4';
 
-As with all other
-
 **********************
 Explanation of Values:
 **********************

From c92ae7490013795e7e5a7b960e823556315023ff Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 30 May 2022 17:07:22 +0900
Subject: [PATCH 2284/2325] docs: improve and update the config table

---
 .../source/database/configuration.rst         | 32 ++++++++-----------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst
index 939b175e1ac6..4d4de96adc41 100644
--- a/user_guide_src/source/database/configuration.rst
+++ b/user_guide_src/source/database/configuration.rst
@@ -113,34 +113,28 @@ Explanation of Values:
 **username**    The username used to connect to the database.
 **password**    The password used to connect to the database.
 **database**    The name of the database you want to connect to.
-**DBDriver**    The database type. e.g.,: MySQLi, Postgre, etc. The case must match the driver name
+**DBDriver**    The database type. e.g.,: ``MySQLi``, ``Postgres``, etc. The case must match the driver name
 **DBPrefix**    An optional table prefix which will added to the table name when running
                 :doc:`Query Builder <query_builder>` queries. This permits multiple CodeIgniter
                 installations to share one database.
 **pConnect**    true/false (boolean) - Whether to use a persistent connection.
 **DBDebug**     true/false (boolean) - Whether database errors should be displayed.
 **charset**     The character set used in communicating with the database.
-**DBCollat**    The character collation used in communicating with the database
-
-                .. note:: Only used in the 'MySQLi' driver.
-
-**swapPre**     A default table prefix that should be swapped with dbprefix. This is useful for distributed
+**DBCollat**    The character collation used in communicating with the database (``MySQLi`` only)
+**swapPre**     A default table prefix that should be swapped with ``DBPrefix``. This is useful for distributed
                 applications where you might run manually written queries, and need the prefix to still be
                 customizable by the end user.
-**schema**      The database schema, default value varies by driver. Used by PostgreSQL and SQLSRV drivers.
+**schema**      The database schema, default value varies by driver. Used by ``Postgres`` and ``SQLSRV`` drivers.
 **encrypt**     Whether or not to use an encrypted connection.
-
-                - 'sqlsrv' and 'pdo/sqlsrv' drivers accept true/false
-                - 'MySQLi' and 'pdo/mysql' drivers accept an array with the following options:
-
-                    - 'ssl_key'    - Path to the private key file
-                    - 'ssl_cert'   - Path to the public key certificate file
-                    - 'ssl_ca'     - Path to the certificate authority file
-                    - 'ssl_capath' - Path to a directory containing trusted CA certificates in PEM format
-                    - 'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':')
-                    - 'ssl_verify' - true/false; Whether to verify the server certificate or not ('MySQLi' only)
-
-**compress**    Whether or not to use client compression (MySQL only).
+                ``SQLSRV`` drivers accept true/false
+                ``MySQLi`` drivers accept an array with the following options:
+                * ``ssl_key``    - Path to the private key file
+                * ``ssl_cert``   - Path to the public key certificate file
+                * ``ssl_ca``     - Path to the certificate authority file
+                * ``ssl_capath`` - Path to a directory containing trusted CA certificates in PEM format
+                * ``ssl_cipher`` - List of *allowed* ciphers to be used for the encryption, separated by colons (``:``)
+                * ``ssl_verify`` - true/false; Whether to verify the server certificate or not (``MySQLi`` only)
+**compress**    Whether or not to use client compression (``MySQLi`` only).
 **strictOn**    true/false (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL
                 while developing an application.
 **port**        The database port number. To use this value you have to add a line to the database config array.

From 7501477180e8eb3128453f51afccce1fed5b89dc Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 30 May 2022 17:08:03 +0900
Subject: [PATCH 2285/2325] docs: update sample code

---
 user_guide_src/source/database/configuration/001.php |  1 +
 user_guide_src/source/database/configuration/002.php | 10 ++++++++--
 user_guide_src/source/database/configuration/003.php |  5 ++++-
 user_guide_src/source/database/configuration/004.php | 11 +++++++++--
 user_guide_src/source/database/configuration/009.php |  5 ++++-
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/user_guide_src/source/database/configuration/001.php b/user_guide_src/source/database/configuration/001.php
index eae7a19f2dab..6531870602d2 100644
--- a/user_guide_src/source/database/configuration/001.php
+++ b/user_guide_src/source/database/configuration/001.php
@@ -23,6 +23,7 @@ class Database extends Config
         'compress' => false,
         'strictOn' => false,
         'failover' => [],
+        'port'     => 3306,
     ];
 
     // ...
diff --git a/user_guide_src/source/database/configuration/002.php b/user_guide_src/source/database/configuration/002.php
index e46448b54914..7f9f9dabc62b 100644
--- a/user_guide_src/source/database/configuration/002.php
+++ b/user_guide_src/source/database/configuration/002.php
@@ -1,7 +1,13 @@
 <?php
 
 // PDO
-$default['DSN'] = 'pgsql:host=localhost;port=5432;dbname=database_name';
+$default = [
+    'DSN' => 'pgsql:host=localhost;port=5432;dbname=database_name',
+    // ...
+];
 
 // Oracle
-$default['DSN'] = '//localhost/XE';
+$default = [
+    'DSN' => '//localhost/XE',
+    // ...
+];
diff --git a/user_guide_src/source/database/configuration/003.php b/user_guide_src/source/database/configuration/003.php
index 0ab30c3f4489..1c8ea93e8288 100644
--- a/user_guide_src/source/database/configuration/003.php
+++ b/user_guide_src/source/database/configuration/003.php
@@ -1,3 +1,6 @@
 <?php
 
-$default['DSN'] = 'DBDriver://username:password@hostname:port/database';
+$default = [
+    'DSN' => 'DBDriver://username:password@hostname:port/database',
+    // ...
+];
diff --git a/user_guide_src/source/database/configuration/004.php b/user_guide_src/source/database/configuration/004.php
index 82d9bb33a02a..05681bf62a45 100644
--- a/user_guide_src/source/database/configuration/004.php
+++ b/user_guide_src/source/database/configuration/004.php
@@ -1,6 +1,13 @@
 <?php
 
 // MySQLi
-$default['DSN'] = 'MySQLi://username:password@hostname:3306/database?charset=utf8&DBCollat=utf8_general_ci';
+$default = [
+    'DSN' => 'MySQLi://username:password@hostname:3306/database?charset=utf8&DBCollat=utf8_general_ci',
+    // ...
+];
+
 // Postgre
-$default['DSN'] = 'Postgre://username:password@hostname:5432/database?charset=utf8&connect_timeout=5&sslmode=1';
+$default = [
+    'DSN' => 'Postgre://username:password@hostname:5432/database?charset=utf8&connect_timeout=5&sslmode=1',
+    // ...
+];
diff --git a/user_guide_src/source/database/configuration/009.php b/user_guide_src/source/database/configuration/009.php
index 106c39c148ac..06eecbdfd59c 100644
--- a/user_guide_src/source/database/configuration/009.php
+++ b/user_guide_src/source/database/configuration/009.php
@@ -1,3 +1,6 @@
 <?php
 
-$default['port'] = 5432;
+$default = [
+    // ...
+    'port' => 5432,
+];

From 214f2d938efecc6dc16dd859dfa097d2f7528dc7 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 30 May 2022 17:53:32 +0900
Subject: [PATCH 2286/2325] feat: add DB config `foreignKeys` for SQLite3

---
 system/Database/SQLite3/Connection.php           | 14 ++++++++++++++
 user_guide_src/source/database/configuration.rst | 10 +++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/system/Database/SQLite3/Connection.php b/system/Database/SQLite3/Connection.php
index 39fbca8bcfea..35ede04c2c9c 100644
--- a/system/Database/SQLite3/Connection.php
+++ b/system/Database/SQLite3/Connection.php
@@ -37,6 +37,20 @@ class Connection extends BaseConnection
      */
     public $escapeChar = '`';
 
+    /**
+     * @var bool Enable Foreign Key constraint or not
+     */
+    protected $foreignKeys = false;
+
+    public function initialize()
+    {
+        parent::initialize();
+
+        if ($this->foreignKeys) {
+            $this->enableForeignKeyChecks();
+        }
+    }
+
     /**
      * Connect to the database.
      *
diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst
index 4d4de96adc41..eb24f7342fde 100644
--- a/user_guide_src/source/database/configuration.rst
+++ b/user_guide_src/source/database/configuration.rst
@@ -105,9 +105,9 @@ default group's configuration settings. The values should be name following this
 Explanation of Values:
 **********************
 
-==============  ===========================================================================================================
+=============== ===========================================================================================================
  Name Config    Description
-==============  ===========================================================================================================
+=============== ===========================================================================================================
 **dsn**         The DSN connect string (an all-in-one configuration sequence).
 **hostname**    The hostname of your database server. Often this is 'localhost'.
 **username**    The username used to connect to the database.
@@ -140,8 +140,12 @@ Explanation of Values:
 **port**        The database port number. To use this value you have to add a line to the database config array.
 
                 .. literalinclude:: configuration/009.php
+**foreignKeys** true/false (boolean) - Whether or not to enable Foreign Key constraint (``SQLite3`` only).
 
-==============  ===========================================================================================================
+                .. important:: SQLite3 Foreign Key constraint is disabled by default.
+                    See `SQLite documentation <https://www.sqlite.org/pragma.html#pragma_foreign_keys>`_.
+                    To enforce Foreign Key constraint, set this config item to true.
+=============== ===========================================================================================================
 
 .. note:: Depending on what database platform you are using (MySQL, PostgreSQL,
     etc.) not all values will be needed. For example, when using SQLite you

From f970ac2579bbb9d3de16b2274ee04c7de1164fed Mon Sep 17 00:00:00 2001
From: valmorflores <valmorflores@gmail.com>
Date: Mon, 30 May 2022 08:46:59 -0300
Subject: [PATCH 2287/2325] Small change to improve code reading

Small change to improve the reading and understanding of the code, for not type conflict.
---
 system/Validation/FormatRules.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
index 21353d1a3385..3aa1c6840ceb 100644
--- a/system/Validation/FormatRules.php
+++ b/system/Validation/FormatRules.php
@@ -266,19 +266,19 @@ public function valid_ip(?string $ip = null, ?string $which = null): bool
 
         switch (strtolower($which ?? '')) {
             case 'ipv4':
-                $which = FILTER_FLAG_IPV4;
+                $option = FILTER_FLAG_IPV4;
                 break;
 
             case 'ipv6':
-                $which = FILTER_FLAG_IPV6;
+                $option = FILTER_FLAG_IPV6;
                 break;
 
             default:
-                $which = 0;
+                $option = 0;
         }
 
-        return filter_var($ip, FILTER_VALIDATE_IP, $which) !== false
-            || (! ctype_print($ip) && filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which) !== false);
+        return filter_var($ip, FILTER_VALIDATE_IP, $option) !== false
+            || (! ctype_print($ip) && filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $option) !== false);
     }
 
     /**

From 511286bfdd8e09dcc66e4a8bbee3fb46f82b656d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 May 2022 15:04:30 +0000
Subject: [PATCH 2288/2325] chore(deps-dev): update rector/rector requirement
 from 0.13.0 to 0.13.2

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.13.0...0.13.2)

---
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 a6ac3e8730f8..e630b890bdc0 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.7.1",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.13.0"
+        "rector/rector": "0.13.2"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From ffe1ad44b78e082ad31a29b21fe66c25bd13ce15 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Mon, 30 May 2022 22:48:39 +0700
Subject: [PATCH 2289/2325] clean up config, re-run rector, and set alias to
 Config\ClassName when lastname is exists in use statements

---
 rector.php                      | 4 ----
 system/CodeIgniter.php          | 3 ++-
 system/Test/Mock/MockLogger.php | 4 +++-
 system/Test/bootstrap.php       | 3 ++-
 system/bootstrap.php            | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/rector.php b/rector.php
index ba3cf52b0fc7..e83bfcc18c63 100644
--- a/rector.php
+++ b/rector.php
@@ -28,7 +28,6 @@
 use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector;
 use Rector\Config\RectorConfig;
 use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodRector;
-use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPromotedPropertyRector;
 use Rector\DeadCode\Rector\If_\UnwrapFutureCompatibleIfPhpVersionRector;
 use Rector\DeadCode\Rector\MethodCall\RemoveEmptyMethodCallRector;
 use Rector\EarlyReturn\Rector\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector;
@@ -80,9 +79,6 @@
         JsonThrowOnErrorRector::class,
         StringifyStrNeedlesRector::class,
 
-        // requires php 8
-        RemoveUnusedPromotedPropertyRector::class,
-
         RemoveUnusedPrivateMethodRector::class => [
             // private method called via getPrivateMethodInvoker
             __DIR__ . '/tests/system/Test/ReflectionHelperTest.php',
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 4e4d49ea0045..18e8d9eaaf2e 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -29,6 +29,7 @@
 use CodeIgniter\Router\Router;
 use Config\App;
 use Config\Cache;
+use Config\Kint as KintConfig;
 use Config\Services;
 use Exception;
 use Kint;
@@ -258,7 +259,7 @@ protected function initializeKint()
         /**
          * Config\Kint
          */
-        $config = config('Config\Kint');
+        $config = config(KintConfig::class);
 
         Kint::$depth_limit         = $config->maxDepth;
         Kint::$display_called_from = $config->displayCalledFrom;
diff --git a/system/Test/Mock/MockLogger.php b/system/Test/Mock/MockLogger.php
index 97c3e89dfb22..6d6cdb9c9c7a 100644
--- a/system/Test/Mock/MockLogger.php
+++ b/system/Test/Mock/MockLogger.php
@@ -11,6 +11,8 @@
 
 namespace CodeIgniter\Test\Mock;
 
+use Tests\Support\Log\Handlers\TestHandler;
+
 class MockLogger
 {
     /*
@@ -81,7 +83,7 @@ class MockLogger
      */
     public $handlers = [
         // File Handler
-        'Tests\Support\Log\Handlers\TestHandler' => [
+        TestHandler::class => [
             // The log levels that this handler will handle.
             'handles' => [
                 'critical',
diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php
index 2a0447ab2194..884affbb6d4b 100644
--- a/system/Test/bootstrap.php
+++ b/system/Test/bootstrap.php
@@ -15,6 +15,7 @@
 use Config\Autoload;
 use Config\Modules;
 use Config\Paths;
+use Config\Services as ServicesConfig;
 
 error_reporting(E_ALL);
 ini_set('display_errors', '1');
@@ -78,7 +79,7 @@
 
 // Use Config\Services as CodeIgniter\Services
 if (! class_exists('CodeIgniter\Services', false)) {
-    class_alias('Config\Services', 'CodeIgniter\Services');
+    class_alias(ServicesConfig::class, 'CodeIgniter\Services');
 }
 
 // Initialize and register the loader with the SPL autoloader stack.
diff --git a/system/bootstrap.php b/system/bootstrap.php
index fec0e5c14b02..863bb327a93a 100644
--- a/system/bootstrap.php
+++ b/system/bootstrap.php
@@ -89,7 +89,7 @@
  * files can use the path constants.
  */
 
-if (! class_exists('Config\Autoload', false)) {
+if (! class_exists(Autoload::class, false)) {
     require_once SYSTEMPATH . 'Config/AutoloadConfig.php';
     require_once APPPATH . 'Config/Autoload.php';
     require_once SYSTEMPATH . 'Modules/Modules.php';
@@ -103,7 +103,7 @@
 
 // Use Config\Services as CodeIgniter\Services
 if (! class_exists('CodeIgniter\Services', false)) {
-    class_alias('Config\Services', 'CodeIgniter\Services');
+    class_alias(Services::class, 'CodeIgniter\Services');
 }
 
 // Initialize and register the loader with the SPL autoloader stack.

From 040e94e1db4a3664274cd08522b82e0c907c6c39 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 31 May 2022 06:18:02 +0700
Subject: [PATCH 2290/2325] update to use Config\Services on Test/bootstrap

---
 system/Test/bootstrap.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php
index 884affbb6d4b..0b4ab7531176 100644
--- a/system/Test/bootstrap.php
+++ b/system/Test/bootstrap.php
@@ -11,11 +11,10 @@
 
 use CodeIgniter\Config\DotEnv;
 use CodeIgniter\Router\RouteCollection;
-use CodeIgniter\Services;
 use Config\Autoload;
 use Config\Modules;
 use Config\Paths;
-use Config\Services as ServicesConfig;
+use Config\Services;
 
 error_reporting(E_ALL);
 ini_set('display_errors', '1');
@@ -79,7 +78,7 @@
 
 // Use Config\Services as CodeIgniter\Services
 if (! class_exists('CodeIgniter\Services', false)) {
-    class_alias(ServicesConfig::class, 'CodeIgniter\Services');
+    class_alias(Services::class, 'CodeIgniter\Services');
 }
 
 // Initialize and register the loader with the SPL autoloader stack.

From 503ee82ec46a2e7f78efbd0e8bbc9c27584d0faa Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 31 May 2022 06:32:15 +0700
Subject: [PATCH 2291/2325] add phpstan-bootstrap.php to include the fallback
 OCI_COMMIT_ON_SUCCESS constant when not defined

---
 .gitattributes             |  1 +
 phpstan-baseline.neon.dist | 10 ----------
 phpstan-bootstrap.php      |  7 +++++++
 phpstan.neon.dist          |  2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)
 create mode 100644 phpstan-bootstrap.php

diff --git a/.gitattributes b/.gitattributes
index de04ad191549..f1ed82db1653 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -28,6 +28,7 @@ rector.php export-ignore
 phpunit.xml.dist export-ignore
 phpstan-baseline.neon.dist export-ignore
 phpstan.neon.dist export-ignore
+phpstan-bootstrap.php export-ignore
 .php-cs-fixer.dist.php export-ignore
 .php-cs-fixer.no-header.php export-ignore
 .php-cs-fixer.user-guide.php export-ignore
diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index f018a20ca851..8f4bd6c01064 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -455,11 +455,6 @@ parameters:
 			count: 1
 			path: system/Debug/Exceptions.php
 
-		-
-			message: "#^Property CodeIgniter\\\\Debug\\\\Exceptions\\:\\:\\$formatter \\(CodeIgniter\\\\Format\\\\FormatterInterface\\) in isset\\(\\) is not nullable\\.$#"
-			count: 1
-			path: system/Debug/Exceptions.php
-
 		-
 			message: "#^Property Config\\\\Exceptions\\:\\:\\$sensitiveDataInTrace \\(array\\) in isset\\(\\) is not nullable\\.$#"
 			count: 1
@@ -835,11 +830,6 @@ parameters:
 			count: 1
 			path: system/Test/Mock/MockConnection.php
 
-		-
-			message: "#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockResourcePresenter\\:\\:\\$formatter \\(CodeIgniter\\\\Format\\\\FormatterInterface\\) in isset\\(\\) is not nullable\\.$#"
-			count: 1
-			path: system/Test/Mock/MockResourcePresenter.php
-
 		-
 			message: "#^Property CodeIgniter\\\\Throttle\\\\Throttler\\:\\:\\$testTime \\(int\\) on left side of \\?\\? is not nullable\\.$#"
 			count: 1
diff --git a/phpstan-bootstrap.php b/phpstan-bootstrap.php
new file mode 100644
index 000000000000..ab54e85dd91c
--- /dev/null
+++ b/phpstan-bootstrap.php
@@ -0,0 +1,7 @@
+<?php
+
+require_once 'system/Test/bootstrap.php';
+
+if (! defined('OCI_COMMIT_ON_SUCCESS')) {
+    define('OCI_COMMIT_ON_SUCCESS', 32);
+}
\ No newline at end of file
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index e4832b125ae2..d4da560a107d 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -25,7 +25,7 @@ parameters:
 		- utils/PHPStan
 	treatPhpDocTypesAsCertain: false
 	bootstrapFiles:
-		- system/Test/bootstrap.php
+		- phpstan-bootstrap.php
 	excludePaths:
 		- app/Views/errors/cli/*
 		- app/Views/errors/html/*

From de96bd3e878cd3fda3d8aa5d8c3d145a76977c57 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 31 May 2022 06:33:09 +0700
Subject: [PATCH 2292/2325] eol

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

diff --git a/phpstan-bootstrap.php b/phpstan-bootstrap.php
index ab54e85dd91c..adc6cfa1875e 100644
--- a/phpstan-bootstrap.php
+++ b/phpstan-bootstrap.php
@@ -4,4 +4,4 @@
 
 if (! defined('OCI_COMMIT_ON_SUCCESS')) {
     define('OCI_COMMIT_ON_SUCCESS', 32);
-}
\ No newline at end of file
+}

From bb6f3a2fde2f6a9b87ad5ed8385cd82ba484d240 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 31 May 2022 07:17:08 +0700
Subject: [PATCH 2293/2325] set reportUnmatchedIgnoredErrors: false

---
 phpstan-baseline.neon.dist | 10 ++++++++++
 phpstan.neon.dist          |  1 +
 2 files changed, 11 insertions(+)

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index 8f4bd6c01064..f018a20ca851 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -455,6 +455,11 @@ parameters:
 			count: 1
 			path: system/Debug/Exceptions.php
 
+		-
+			message: "#^Property CodeIgniter\\\\Debug\\\\Exceptions\\:\\:\\$formatter \\(CodeIgniter\\\\Format\\\\FormatterInterface\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Debug/Exceptions.php
+
 		-
 			message: "#^Property Config\\\\Exceptions\\:\\:\\$sensitiveDataInTrace \\(array\\) in isset\\(\\) is not nullable\\.$#"
 			count: 1
@@ -830,6 +835,11 @@ parameters:
 			count: 1
 			path: system/Test/Mock/MockConnection.php
 
+		-
+			message: "#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockResourcePresenter\\:\\:\\$formatter \\(CodeIgniter\\\\Format\\\\FormatterInterface\\) in isset\\(\\) is not nullable\\.$#"
+			count: 1
+			path: system/Test/Mock/MockResourcePresenter.php
+
 		-
 			message: "#^Property CodeIgniter\\\\Throttle\\\\Throttler\\:\\:\\$testTime \\(int\\) on left side of \\?\\? is not nullable\\.$#"
 			count: 1
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index d4da560a107d..b5f78b853f80 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -45,3 +45,4 @@ parameters:
 		- CI_DEBUG
 		- ENVIRONMENT
 		- SODIUM_LIBRARY_VERSION
+	reportUnmatchedIgnoredErrors: false

From 19df3a38e568fd2cb0ff5ff72d287e05a9595b97 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 31 May 2022 08:12:47 +0700
Subject: [PATCH 2294/2325] set back report to true

---
 phpstan.neon.dist | 1 -
 1 file changed, 1 deletion(-)

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index b5f78b853f80..d4da560a107d 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -45,4 +45,3 @@ parameters:
 		- CI_DEBUG
 		- ENVIRONMENT
 		- SODIUM_LIBRARY_VERSION
-	reportUnmatchedIgnoredErrors: false

From 724828d16985fd57966185bfeb118f378f7d8501 Mon Sep 17 00:00:00 2001
From: Abdul Malik Ikhsan <samsonasik@gmail.com>
Date: Tue, 31 May 2022 08:56:42 +0700
Subject: [PATCH 2295/2325] Update phpstan-bootstrap.php

Co-authored-by: kenjis <kenji.uui@gmail.com>
---
 phpstan-bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpstan-bootstrap.php b/phpstan-bootstrap.php
index adc6cfa1875e..99acf96227fe 100644
--- a/phpstan-bootstrap.php
+++ b/phpstan-bootstrap.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'system/Test/bootstrap.php';
+require __DIR__ . '/system/Test/bootstrap.php';
 
 if (! defined('OCI_COMMIT_ON_SUCCESS')) {
     define('OCI_COMMIT_ON_SUCCESS', 32);

From d777cee7eb14549fb2732aba23aa287ca77f61aa Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 31 May 2022 09:02:12 +0900
Subject: [PATCH 2296/2325] refactor: remove CodeIgniter\Services

It seems it is not needed.
---
 system/Test/bootstrap.php                     |  5 --
 system/bootstrap.php                          |  5 --
 tests/_support/Services.php                   | 66 -------------------
 tests/system/CommonFunctionsTest.php          |  6 +-
 tests/system/ControllerTest.php               |  1 +
 tests/system/Helpers/FormHelperTest.php       |  2 +-
 .../Log/Handlers/ChromeLoggerHandlerTest.php  |  2 +-
 7 files changed, 6 insertions(+), 81 deletions(-)
 delete mode 100644 tests/_support/Services.php

diff --git a/system/Test/bootstrap.php b/system/Test/bootstrap.php
index 0b4ab7531176..6b0068f04670 100644
--- a/system/Test/bootstrap.php
+++ b/system/Test/bootstrap.php
@@ -76,11 +76,6 @@
 require_once SYSTEMPATH . 'Config/Services.php';
 require_once APPPATH . 'Config/Services.php';
 
-// Use Config\Services as CodeIgniter\Services
-if (! class_exists('CodeIgniter\Services', false)) {
-    class_alias(Services::class, 'CodeIgniter\Services');
-}
-
 // Initialize and register the loader with the SPL autoloader stack.
 Services::autoloader()->initialize(new Autoload(), new Modules())->register();
 
diff --git a/system/bootstrap.php b/system/bootstrap.php
index 863bb327a93a..421b6ca6b7d6 100644
--- a/system/bootstrap.php
+++ b/system/bootstrap.php
@@ -101,11 +101,6 @@
 require_once SYSTEMPATH . 'Config/Services.php';
 require_once APPPATH . 'Config/Services.php';
 
-// Use Config\Services as CodeIgniter\Services
-if (! class_exists('CodeIgniter\Services', false)) {
-    class_alias(Services::class, 'CodeIgniter\Services');
-}
-
 // Initialize and register the loader with the SPL autoloader stack.
 Services::autoloader()->initialize(new Autoload(), new Modules())->register();
 
diff --git a/tests/_support/Services.php b/tests/_support/Services.php
deleted file mode 100644
index e6a8e53e6858..000000000000
--- a/tests/_support/Services.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * This file is part of CodeIgniter 4 framework.
- *
- * (c) CodeIgniter Foundation <admin@codeigniter.com>
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace CodeIgniter;
-
-use CIUnitTestCase;
-use Config\Services as ConfigServices;
-
-/**
- * Services class for testing.
- */
-class Services
-{
-    /**
-     * Mock objects for testing which are returned if exist.
-     *
-     * @var array
-     */
-    protected static $mocks = [];
-
-    /**
-     * Reset shared instances and mocks for testing.
-     */
-    public static function reset()
-    {
-        static::$mocks = [];
-
-        CIUnitTestCase::setPrivateProperty(ConfigServices::class, 'instances', []);
-    }
-
-    /**
-     * Inject mock object for testing.
-     *
-     * @param $mock
-     */
-    public static function injectMock(string $name, $mock)
-    {
-        $name                 = strtolower($name);
-        static::$mocks[$name] = $mock;
-    }
-
-    /**
-     * Returns a service
-     */
-    public static function __callStatic(string $name, array $arguments)
-    {
-        $name = strtolower($name);
-
-        // Returns mock if exists
-        if (isset(static::$mocks[$name])) {
-            return static::$mocks[$name];
-        }
-
-        if (method_exists(ConfigServices::class, $name)) {
-            return ConfigServices::$name(...$arguments);
-        }
-    }
-}
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 2069762bba57..9410b13322c1 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -12,7 +12,6 @@
 namespace CodeIgniter;
 
 use CodeIgniter\Config\BaseService;
-use CodeIgniter\Config\Services;
 use CodeIgniter\HTTP\RedirectResponse;
 use CodeIgniter\HTTP\Response;
 use CodeIgniter\HTTP\URI;
@@ -29,6 +28,7 @@
 use Config\App;
 use Config\Logger;
 use Config\Modules;
+use Config\Services;
 use Kint;
 use stdClass;
 use Tests\Support\Models\JobModel;
@@ -118,8 +118,8 @@ public function testRedirectReturnsRedirectResponse()
             Services::locator(),
             new Modules()
         );
-        \CodeIgniter\Services::injectMock('response', $response);
-        \CodeIgniter\Services::injectMock('routes', $routes);
+        Services::injectMock('response', $response);
+        Services::injectMock('routes', $routes);
 
         $routes->add('home/base', 'Controller::index', ['as' => 'base']);
         $response->method('redirect')->willReturnArgument(0);
diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index 9330b9e15d16..e0ef2b9ee90a 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -19,6 +19,7 @@
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Validation\Exceptions\ValidationException;
 use Config\App;
+use Config\Services;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/tests/system/Helpers/FormHelperTest.php b/tests/system/Helpers/FormHelperTest.php
index 85a3e8dc0182..3fdcc582d0fc 100644
--- a/tests/system/Helpers/FormHelperTest.php
+++ b/tests/system/Helpers/FormHelperTest.php
@@ -12,10 +12,10 @@
 namespace CodeIgniter\Helpers;
 
 use CodeIgniter\HTTP\URI;
-use CodeIgniter\Services;
 use CodeIgniter\Test\CIUnitTestCase;
 use Config\App;
 use Config\Filters;
+use Config\Services;
 
 /**
  * @internal
diff --git a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
index 1060f90da512..f6f49e1ef53c 100644
--- a/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
+++ b/tests/system/Log/Handlers/ChromeLoggerHandlerTest.php
@@ -11,11 +11,11 @@
 
 namespace CodeIgniter\Log\Handlers;
 
-use CodeIgniter\Services;
 use CodeIgniter\Test\CIUnitTestCase;
 use CodeIgniter\Test\Mock\MockLogger as LoggerConfig;
 use CodeIgniter\Test\Mock\MockResponse;
 use Config\App;
+use Config\Services;
 use stdClass;
 
 /**

From d363f1a893819cacce47704075fef19ecd04d6b5 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 31 May 2022 09:18:16 +0900
Subject: [PATCH 2297/2325] config: enable SQLite3 foreignKeys for testing

---
 app/Config/Database.php             | 35 +++++++++++++++--------------
 tests/_support/Config/Registrar.php | 35 +++++++++++++++--------------
 2 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/app/Config/Database.php b/app/Config/Database.php
index 1e6340899bf4..87d73b13ad44 100644
--- a/app/Config/Database.php
+++ b/app/Config/Database.php
@@ -57,23 +57,24 @@ class Database extends Config
      * @var array
      */
     public $tests = [
-        'DSN'      => '',
-        'hostname' => '127.0.0.1',
-        'username' => '',
-        'password' => '',
-        'database' => ':memory:',
-        'DBDriver' => 'SQLite3',
-        'DBPrefix' => 'db_',  // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE FOR CI DEVS
-        'pConnect' => false,
-        'DBDebug'  => (ENVIRONMENT !== 'production'),
-        'charset'  => 'utf8',
-        'DBCollat' => 'utf8_general_ci',
-        'swapPre'  => '',
-        'encrypt'  => false,
-        'compress' => false,
-        'strictOn' => false,
-        'failover' => [],
-        'port'     => 3306,
+        'DSN'         => '',
+        'hostname'    => '127.0.0.1',
+        'username'    => '',
+        'password'    => '',
+        'database'    => ':memory:',
+        'DBDriver'    => 'SQLite3',
+        'DBPrefix'    => 'db_',  // Needed to ensure we're working correctly with prefixes live. DO NOT REMOVE FOR CI DEVS
+        'pConnect'    => false,
+        'DBDebug'     => (ENVIRONMENT !== 'production'),
+        'charset'     => 'utf8',
+        'DBCollat'    => 'utf8_general_ci',
+        'swapPre'     => '',
+        'encrypt'     => false,
+        'compress'    => false,
+        'strictOn'    => false,
+        'failover'    => [],
+        'port'        => 3306,
+        'foreignKeys' => true,
     ];
 
     public function __construct()
diff --git a/tests/_support/Config/Registrar.php b/tests/_support/Config/Registrar.php
index b568629ea19f..ffdd9cba9bf7 100644
--- a/tests/_support/Config/Registrar.php
+++ b/tests/_support/Config/Registrar.php
@@ -63,23 +63,24 @@ class Registrar
             'port'     => 5432,
         ],
         'SQLite3' => [
-            'DSN'      => '',
-            'hostname' => 'localhost',
-            'username' => '',
-            'password' => '',
-            'database' => 'database.db',
-            'DBDriver' => 'SQLite3',
-            'DBPrefix' => 'db_',
-            'pConnect' => false,
-            'DBDebug'  => (ENVIRONMENT !== 'production'),
-            'charset'  => 'utf8',
-            'DBCollat' => 'utf8_general_ci',
-            'swapPre'  => '',
-            'encrypt'  => false,
-            'compress' => false,
-            'strictOn' => false,
-            'failover' => [],
-            'port'     => 3306,
+            'DSN'         => '',
+            'hostname'    => 'localhost',
+            'username'    => '',
+            'password'    => '',
+            'database'    => 'database.db',
+            'DBDriver'    => 'SQLite3',
+            'DBPrefix'    => 'db_',
+            'pConnect'    => false,
+            'DBDebug'     => (ENVIRONMENT !== 'production'),
+            'charset'     => 'utf8',
+            'DBCollat'    => 'utf8_general_ci',
+            'swapPre'     => '',
+            'encrypt'     => false,
+            'compress'    => false,
+            'strictOn'    => false,
+            'failover'    => [],
+            'port'        => 3306,
+            'foreignKeys' => true,
         ],
         'SQLSRV' => [
             'DSN'      => '',

From da0b95ee5798d9d30bb3c87816a3cee2d603d999 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 31 May 2022 11:55:21 +0900
Subject: [PATCH 2298/2325] refactor: run rector

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

diff --git a/tests/system/ControllerTest.php b/tests/system/ControllerTest.php
index e0ef2b9ee90a..6a16ea7bb17f 100644
--- a/tests/system/ControllerTest.php
+++ b/tests/system/ControllerTest.php
@@ -57,7 +57,7 @@ protected function setUp(): void
         $this->config   = new App();
         $this->request  = new IncomingRequest($this->config, new URI('https://somwhere.com'), null, new UserAgent());
         $this->response = new Response($this->config);
-        $this->logger   = \Config\Services::logger();
+        $this->logger   = Services::logger();
     }
 
     public function testConstructor()

From d869f0364d79e0ade534b45c5e3a8f7c1c34dff9 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 31 May 2022 11:55:54 +0900
Subject: [PATCH 2299/2325] chore: remove error pattern

---
 phpstan-baseline.neon.dist | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index f018a20ca851..f86e46975149 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -660,11 +660,6 @@ parameters:
 			count: 1
 			path: system/Log/Logger.php
 
-		-
-			message: "#^Property CodeIgniter\\\\RESTful\\\\ResourceController\\:\\:\\$formatter \\(CodeIgniter\\\\Format\\\\FormatterInterface\\) in isset\\(\\) is not nullable\\.$#"
-			count: 1
-			path: system/RESTful/ResourceController.php
-
 		-
 			message: "#^Call to an undefined method CodeIgniter\\\\Router\\\\RouteCollectionInterface\\:\\:getDefaultNamespace\\(\\)\\.$#"
 			count: 3
@@ -835,11 +830,6 @@ parameters:
 			count: 1
 			path: system/Test/Mock/MockConnection.php
 
-		-
-			message: "#^Property CodeIgniter\\\\Test\\\\Mock\\\\MockResourcePresenter\\:\\:\\$formatter \\(CodeIgniter\\\\Format\\\\FormatterInterface\\) in isset\\(\\) is not nullable\\.$#"
-			count: 1
-			path: system/Test/Mock/MockResourcePresenter.php
-
 		-
 			message: "#^Property CodeIgniter\\\\Throttle\\\\Throttler\\:\\:\\$testTime \\(int\\) on left side of \\?\\? is not nullable\\.$#"
 			count: 1

From 112c111d63f9c358a6578d01f15b518f14913e43 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 31 May 2022 12:31:44 +0900
Subject: [PATCH 2300/2325] docs: fix @var

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

diff --git a/system/API/ResponseTrait.php b/system/API/ResponseTrait.php
index 9ee722b45235..f20affaffaf5 100644
--- a/system/API/ResponseTrait.php
+++ b/system/API/ResponseTrait.php
@@ -75,7 +75,7 @@ trait ResponseTrait
     /**
      * Current Formatter instance. This is usually set by ResponseTrait::format
      *
-     * @var FormatterInterface
+     * @var FormatterInterface|null
      */
     protected $formatter;
 

From e1b03d71980be5f0cfa0d22a059589e9196f2eea Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 31 May 2022 12:32:18 +0900
Subject: [PATCH 2301/2325] chore: remove error pattern

---
 phpstan-baseline.neon.dist | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/phpstan-baseline.neon.dist b/phpstan-baseline.neon.dist
index f86e46975149..17f71d164f29 100644
--- a/phpstan-baseline.neon.dist
+++ b/phpstan-baseline.neon.dist
@@ -455,11 +455,6 @@ parameters:
 			count: 1
 			path: system/Debug/Exceptions.php
 
-		-
-			message: "#^Property CodeIgniter\\\\Debug\\\\Exceptions\\:\\:\\$formatter \\(CodeIgniter\\\\Format\\\\FormatterInterface\\) in isset\\(\\) is not nullable\\.$#"
-			count: 1
-			path: system/Debug/Exceptions.php
-
 		-
 			message: "#^Property Config\\\\Exceptions\\:\\:\\$sensitiveDataInTrace \\(array\\) in isset\\(\\) is not nullable\\.$#"
 			count: 1

From fd19d90a8326449311b89747f27feaefb305d8fd Mon Sep 17 00:00:00 2001
From: Tomohiro Murota <tomohiro.murota@gmail.com>
Date: Sat, 21 May 2022 18:46:13 +0900
Subject: [PATCH 2302/2325] fix: Ignore non-HTML responses in storePreviousURL

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

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 18e8d9eaaf2e..d040e6f01787 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -1031,6 +1031,11 @@ public function storePreviousURL($uri)
             return;
         }
 
+        // Ignore non-HTML responses
+        if (strpos($this->response->getHeaderLine('Content-Type'), 'text/html') === false) {
+            return;
+        }
+
         // This is mainly needed during testing...
         if (is_string($uri)) {
             $uri = new URI($uri);

From 753f9e68ea7bf3fd9c3243833c1f27d94300fe04 Mon Sep 17 00:00:00 2001
From: Tomohiro Murota <tomohiro.murota@gmail.com>
Date: Mon, 30 May 2022 11:08:37 +0900
Subject: [PATCH 2303/2325] test: add test for storePreviousURL in case of
 non-HTML response

---
 tests/system/CodeIgniterTest.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/tests/system/CodeIgniterTest.php b/tests/system/CodeIgniterTest.php
index 8245d3bf18df..29d511d2a9d3 100644
--- a/tests/system/CodeIgniterTest.php
+++ b/tests/system/CodeIgniterTest.php
@@ -424,6 +424,30 @@ public function testNotStoresPreviousURL()
         $this->assertArrayNotHasKey('_ci_previous_url', $_SESSION);
     }
 
+    public function testNotStoresPreviousURLByCheckingContentType()
+    {
+        $_SERVER['argv'] = ['index.php', 'image'];
+        $_SERVER['argc'] = 2;
+
+        $_SERVER['REQUEST_URI'] = '/image';
+
+        // Inject mock router.
+        $routes = Services::routes();
+        $routes->add('image', static function () {
+            $response = Services::response();
+
+            return $response->setContentType('image/jpeg', '');
+        });
+        $router = Services::router($routes, Services::request());
+        Services::injectMock('router', $router);
+
+        ob_start();
+        $this->codeigniter->useSafeOutput(true)->run();
+        ob_get_clean();
+
+        $this->assertArrayNotHasKey('_ci_previous_url', $_SESSION);
+    }
+
     /**
      * The method after all test, reset Servces:: config
      * Can't use static::tearDownAfterClass. This will cause a buffer exception

From 3ca42268d7e3c9f265133abcc7c09e7c3b3a9871 Mon Sep 17 00:00:00 2001
From: Tomohiro Murota <tomohiro.murota@gmail.com>
Date: Mon, 30 May 2022 12:29:09 +0900
Subject: [PATCH 2304/2325] docs: add user guide about breaking changes of
 previous_url

---
 user_guide_src/source/changelogs/v4.2.0.rst        | 1 +
 user_guide_src/source/installation/upgrade_420.rst | 1 +
 2 files changed, 2 insertions(+)

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 077cf64a1ac8..26bb67446c9a 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -32,6 +32,7 @@ Behavior Changes
 - To prevent unexpected access from the web browser, if a controller is added to a cli route (``$routes->cli()``), all methods of that controller are no longer accessible via auto-routing.
 - There is a possible backward compatibility break for those users extending the History Collector and they should probably update ``History::setFiles()`` method.
 - The :php:func:`dot_array_search`'s unexpected behavior has been fixed. Now ``dot_array_search('foo.bar.baz', ['foo' => ['bar' => 23]])`` returns ``null``. The previous versions returned ``23``.
+- The ``CodeIgniter::storePreviousURL()`` has been changed to store only the URLs whose Content-Type was ``text/html``. It also affects the behavior of ``previous_url()`` and ``redirect()->back()``.
 
 Enhancements
 ************
diff --git a/user_guide_src/source/installation/upgrade_420.rst b/user_guide_src/source/installation/upgrade_420.rst
index 01336530c9f9..75774357fd1c 100644
--- a/user_guide_src/source/installation/upgrade_420.rst
+++ b/user_guide_src/source/installation/upgrade_420.rst
@@ -42,6 +42,7 @@ Breaking Changes
 ****************
 
 - The ``system/bootstrap.php`` file no longer returns a ``CodeIgniter`` instance, and does not load the ``.env`` file (now handled in ``index.php`` and ``spark``). If you have code that expects these behaviors it will no longer work and must be modified. This has been changed to make `Preloading <https://www.php.net/manual/en/opcache.preloading.php>`_ easier to implement.
+- ``previous_url()`` has been changed to return only the URLs whose Content-Type was ``text/html``. Accordingly, the behavior of ``redirect()->back()`` has been changed.
 
 Breaking Enhancements
 *********************

From 4d3584ef67a82c962eaa85b37f581bc1f604e08b Mon Sep 17 00:00:00 2001
From: tearoom6 <tomohiro.murota@gmail.com>
Date: Tue, 31 May 2022 09:51:06 +0900
Subject: [PATCH 2305/2325] docs: add links in the user guide

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

diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 26bb67446c9a..32df0dbdf3d3 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -32,7 +32,7 @@ Behavior Changes
 - To prevent unexpected access from the web browser, if a controller is added to a cli route (``$routes->cli()``), all methods of that controller are no longer accessible via auto-routing.
 - There is a possible backward compatibility break for those users extending the History Collector and they should probably update ``History::setFiles()`` method.
 - The :php:func:`dot_array_search`'s unexpected behavior has been fixed. Now ``dot_array_search('foo.bar.baz', ['foo' => ['bar' => 23]])`` returns ``null``. The previous versions returned ``23``.
-- The ``CodeIgniter::storePreviousURL()`` has been changed to store only the URLs whose Content-Type was ``text/html``. It also affects the behavior of ``previous_url()`` and ``redirect()->back()``.
+- The ``CodeIgniter::storePreviousURL()`` has been changed to store only the URLs whose Content-Type was ``text/html``. It also affects the behavior of :php:func:`previous_url` and :php:func:`redirect()->back() <redirect>`.
 
 Enhancements
 ************

From a86e392b0814e580330935ce7e23fa224a45bb15 Mon Sep 17 00:00:00 2001
From: Tomohiro Murota <tomohiro.murota@gmail.com>
Date: Tue, 31 May 2022 10:00:24 +0900
Subject: [PATCH 2306/2325] docs: revert previous_url in the upgrade note

---
 user_guide_src/source/installation/upgrade_420.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/user_guide_src/source/installation/upgrade_420.rst b/user_guide_src/source/installation/upgrade_420.rst
index 75774357fd1c..01336530c9f9 100644
--- a/user_guide_src/source/installation/upgrade_420.rst
+++ b/user_guide_src/source/installation/upgrade_420.rst
@@ -42,7 +42,6 @@ Breaking Changes
 ****************
 
 - The ``system/bootstrap.php`` file no longer returns a ``CodeIgniter`` instance, and does not load the ``.env`` file (now handled in ``index.php`` and ``spark``). If you have code that expects these behaviors it will no longer work and must be modified. This has been changed to make `Preloading <https://www.php.net/manual/en/opcache.preloading.php>`_ easier to implement.
-- ``previous_url()`` has been changed to return only the URLs whose Content-Type was ``text/html``. Accordingly, the behavior of ``redirect()->back()`` has been changed.
 
 Breaking Enhancements
 *********************

From d43fc127f78fa2a0709e6d4edbdedd5b731ae4ff Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 31 May 2022 14:05:17 +0900
Subject: [PATCH 2307/2325] test: fix DBDebug value

The default property value is false, so the test ran under DBDebug = false.
---
 tests/system/Database/Live/SQLite/AlterTableTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/system/Database/Live/SQLite/AlterTableTest.php b/tests/system/Database/Live/SQLite/AlterTableTest.php
index 9f819ee36945..4203afc5114e 100644
--- a/tests/system/Database/Live/SQLite/AlterTableTest.php
+++ b/tests/system/Database/Live/SQLite/AlterTableTest.php
@@ -51,6 +51,7 @@ protected function setUp(): void
         $config = [
             'DBDriver' => 'SQLite3',
             'database' => 'database.db',
+            'DBDebug'  => true,
         ];
 
         $this->db    = db_connect($config);

From 6d505e7d7041e033d60a2fb85a9d1b5afb556269 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 31 May 2022 14:17:27 +0900
Subject: [PATCH 2308/2325] test: fix assertion

---
 tests/system/Database/Live/SQLite/AlterTableTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/system/Database/Live/SQLite/AlterTableTest.php b/tests/system/Database/Live/SQLite/AlterTableTest.php
index 4203afc5114e..297ad5bb4803 100644
--- a/tests/system/Database/Live/SQLite/AlterTableTest.php
+++ b/tests/system/Database/Live/SQLite/AlterTableTest.php
@@ -220,7 +220,7 @@ public function testProcessCopiesOldData()
             ->dropColumn('name')
             ->run();
 
-        $this->dontSeeInDatabase('foo', ['name' => 'George Clinton']);
+        $this->assertFalse($this->db->fieldExists('name', 'foo'));
         $this->seeInDatabase('foo', ['email' => 'funkalicious@example.com']);
     }
 

From 54a3fccdee034824e802b834dd15af8865e23232 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 31 May 2022 14:46:14 +0900
Subject: [PATCH 2309/2325] style: break long line

---
 system/Database/SQLite3/Table.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php
index 8f04c0f645f1..578117320783 100644
--- a/system/Database/SQLite3/Table.php
+++ b/system/Database/SQLite3/Table.php
@@ -279,7 +279,9 @@ protected function copyData()
         $exFields  = implode(', ', $exFields);
         $newFields = implode(', ', $newFields);
 
-        $this->db->query("INSERT INTO {$this->prefixedTableName}({$newFields}) SELECT {$exFields} FROM {$this->db->DBPrefix}temp_{$this->tableName}");
+        $this->db->query(
+            "INSERT INTO {$this->prefixedTableName}({$newFields}) SELECT {$exFields} FROM {$this->db->DBPrefix}temp_{$this->tableName}"
+        );
     }
 
     /**

From 5ad2ce5671c7b1d0c1ea6b8957104469e5fd324e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 31 May 2022 14:48:56 +0900
Subject: [PATCH 2310/2325] fix: protect column name in
 SQLite3\Table::copyData()

---
 system/Database/BaseConnection.php                   |  4 +++-
 system/Database/SQLite3/Table.php                    | 12 ++++++++++--
 tests/system/Database/Live/SQLite/AlterTableTest.php |  7 ++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/system/Database/BaseConnection.php b/system/Database/BaseConnection.php
index 0ebbd71fabe9..9d7e69bf5256 100644
--- a/system/Database/BaseConnection.php
+++ b/system/Database/BaseConnection.php
@@ -14,6 +14,7 @@
 use Closure;
 use CodeIgniter\Database\Exceptions\DatabaseException;
 use CodeIgniter\Events\Events;
+use stdClass;
 use Throwable;
 
 /**
@@ -974,6 +975,7 @@ public function getConnectDuration(int $decimals = 6): string
      * @param bool         $fieldExists        Supplied $item contains a column name?
      *
      * @return array|string
+     * @phpstan-return ($item is array ? array : string)
      */
     public function protectIdentifiers($item, bool $prefixSingle = false, ?bool $protectIdentifiers = null, bool $fieldExists = true)
     {
@@ -1444,7 +1446,7 @@ public function fieldExists(string $fieldName, string $tableName): bool
     /**
      * Returns an object with field data
      *
-     * @return array
+     * @return stdClass[]
      */
     public function getFieldData(string $table)
     {
diff --git a/system/Database/SQLite3/Table.php b/system/Database/SQLite3/Table.php
index 578117320783..1ecb28fdf8b7 100644
--- a/system/Database/SQLite3/Table.php
+++ b/system/Database/SQLite3/Table.php
@@ -28,6 +28,7 @@ class Table
      * All of the fields this table represents.
      *
      * @var array
+     * @phpstan-var array<string, array<string, bool|int|string|null>>
      */
     protected $fields = [];
 
@@ -276,8 +277,14 @@ protected function copyData()
             $exFields[]  = $name;
         }
 
-        $exFields  = implode(', ', $exFields);
-        $newFields = implode(', ', $newFields);
+        $exFields = implode(
+            ', ',
+            array_map(fn ($item) => $this->db->protectIdentifiers($item), $exFields)
+        );
+        $newFields = implode(
+            ', ',
+            array_map(fn ($item) => $this->db->protectIdentifiers($item), $newFields)
+        );
 
         $this->db->query(
             "INSERT INTO {$this->prefixedTableName}({$newFields}) SELECT {$exFields} FROM {$this->db->DBPrefix}temp_{$this->tableName}"
@@ -291,6 +298,7 @@ protected function copyData()
      * @param array|bool $fields
      *
      * @return mixed
+     * @phpstan-return ($fields is array ? array : mixed)
      */
     protected function formatFields($fields)
     {
diff --git a/tests/system/Database/Live/SQLite/AlterTableTest.php b/tests/system/Database/Live/SQLite/AlterTableTest.php
index 297ad5bb4803..7eb2216139e5 100644
--- a/tests/system/Database/Live/SQLite/AlterTableTest.php
+++ b/tests/system/Database/Live/SQLite/AlterTableTest.php
@@ -89,7 +89,7 @@ public function testFromTableFillsDetails()
 
         $fields = $this->getPrivateProperty($this->table, 'fields');
 
-        $this->assertCount(4, $fields);
+        $this->assertCount(5, $fields);
         $this->assertArrayHasKey('id', $fields);
         $this->assertNull($fields['id']['default']);
         $this->assertTrue($fields['id']['null']);
@@ -265,6 +265,11 @@ protected function createTable(string $tableName = 'foo')
                 'constraint' => 11,
                 'unsigned'   => true,
             ],
+            'group' => [
+                'type'       => 'varchar',
+                'constraint' => 255,
+                'null'       => true,
+            ],
         ]);
         $this->forge->addPrimaryKey('id');
         $this->forge->addKey('name');

From e8cbbe4ad81a3cccb3abbbe676f52ff2c3b25f2c Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Tue, 31 May 2022 20:24:07 +0800
Subject: [PATCH 2311/2325] Fix ThrottleTest failing occasionally

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

diff --git a/tests/system/Throttle/ThrottleTest.php b/tests/system/Throttle/ThrottleTest.php
index de0a6bf9bddd..f38366a30595 100644
--- a/tests/system/Throttle/ThrottleTest.php
+++ b/tests/system/Throttle/ThrottleTest.php
@@ -113,7 +113,7 @@ public function testDecrementsValues()
         $throttler->check('127.0.0.1', 60, MINUTE);
         $throttler->check('127.0.0.1', 60, MINUTE);
 
-        $this->assertSame(57, $this->cache->get('throttler_127.0.0.1'));
+        $this->assertCloseEnough(57, $this->cache->get('throttler_127.0.0.1'));
     }
 
     public function testReturnsFalseIfBucketEmpty()

From 026fe88c4bf5e5037a7eac47c065a115faee28d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 31 May 2022 15:02:35 +0000
Subject: [PATCH 2312/2325] chore(deps-dev): update rector/rector requirement
 from 0.13.2 to 0.13.3

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.13.2...0.13.3)

---
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 e630b890bdc0..2c93e30b7d72 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "phpstan/phpstan": "^1.7.1",
         "phpunit/phpunit": "^9.1",
         "predis/predis": "^1.1",
-        "rector/rector": "0.13.2"
+        "rector/rector": "0.13.3"
     },
     "suggest": {
         "ext-fileinfo": "Improves mime type detection for files"

From dc3896d4d247117bc9643694227090b33dff3716 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 1 Jun 2022 06:24:40 +0900
Subject: [PATCH 2313/2325] docs: replace `git checkout` with `git switch`

---
 contributing/workflow.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/contributing/workflow.md b/contributing/workflow.md
index 1788aff0878b..c4c4bb073865 100644
--- a/contributing/workflow.md
+++ b/contributing/workflow.md
@@ -78,7 +78,7 @@ Then synchronizing is done by pulling from us and pushing to you. This
 is normally done locally, so that you can resolve any merge conflicts.
 For instance, to synchronize **develop** branches:
 
-    git checkout develop
+    git switch develop
     git fetch upstream
     git merge upstream/develop
     git push origin develop
@@ -109,8 +109,8 @@ For instance, make sure you are in the *develop* branch, and create a
 new feature branch, based on *develop*, for a new feature you are
 creating:
 
-    git checkout develop
-    git checkout -b new/mind-reader
+    git switch develop
+    git switch -c new/mind-reader
 
 Saving changes only updates your local working area.
 
@@ -131,15 +131,15 @@ Just make sure that your commits in a feature branch are all related.
 If you are working on two features at a time, then you will want to
 switch between them to keep the contributions separate. For instance:
 
-    git checkout new/mind-reader
+    git switch new/mind-reader
     // work away
     git add .
     git commit -S -m "Added adapter for abc"
-    git checkout fix/issue-123
+    git switch fix/issue-123
     // work away
     git add .
     git commit -S -m "Fixed problem in DEF\Something"
-    git checkout develop
+    git switch develop
 
 The last checkout makes sure that you end up in your *develop* branch as
 a starting point for your next session working with your repository.
@@ -157,14 +157,14 @@ It is a lot easier to resolve conflicts at this stage.
 
 Synchronize your repository:
 
-    git checkout develop
+    git switch develop
     git fetch upstream
     git merge upstream/develop
     git push origin develop
 
 Bring your feature branch up to date:
 
-    git checkout new/mind-reader
+    git switch new/mind-reader
     git rebase upstream/develop
 
 And finally push your local branch to your GitHub repository:
@@ -223,14 +223,14 @@ do the following:
 
 Synchronize your repository:
 
-    git checkout develop
+    git switch develop
     git fetch upstream
     git merge upstream/develop
     git push origin develop
 
 Bring your feature branch up to date:
 
-    git checkout new/mind-reader
+    git switch new/mind-reader
     git rebase upstream/develop
 
 You might get conflicts when you rebase. It is your

From 12b4b3f38c8e200c1072a6eace37573646e9a2c8 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 1 Jun 2022 07:37:00 +0900
Subject: [PATCH 2314/2325] docs: fix by proofreading

Co-authored-by: Abdul Malik Ikhsan <samsonasik@gmail.com>
---
 user_guide_src/source/models/model.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user_guide_src/source/models/model.rst b/user_guide_src/source/models/model.rst
index cf9974b5ccc9..18eb6630a7ec 100644
--- a/user_guide_src/source/models/model.rst
+++ b/user_guide_src/source/models/model.rst
@@ -141,7 +141,7 @@ This array should be updated with the field names that can be set during ``save(
 against just taking input from a form and throwing it all at the model, resulting in
 potential mass assignment vulnerabilities.
 
-.. note:: The ``$primaryKey`` should never be an allowed field.
+.. note:: The ``$primaryKey`` field should never be an allowed field.
 
 $useTimestamps
 --------------

From 0767da47958cf21c64eff55140e1ade77ab953ee Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Tue, 31 May 2022 23:25:06 -0500
Subject: [PATCH 2315/2325] Add links to official packages.

---
 user_guide_src/source/index.rst               |  9 +++++
 .../source/libraries/official_packages.rst    | 38 +++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 user_guide_src/source/libraries/official_packages.rst

diff --git a/user_guide_src/source/index.rst b/user_guide_src/source/index.rst
index 7cc3b84742c4..1b850ee44139 100644
--- a/user_guide_src/source/index.rst
+++ b/user_guide_src/source/index.rst
@@ -113,3 +113,12 @@ Advanced Topics
 
     license
     changelogs/index
+
+*****************
+Official Packages
+*****************
+
+.. toctree::
+    :titlesonly:
+
+    libraries/official_packages
diff --git a/user_guide_src/source/libraries/official_packages.rst b/user_guide_src/source/libraries/official_packages.rst
new file mode 100644
index 000000000000..82504b5f418d
--- /dev/null
+++ b/user_guide_src/source/libraries/official_packages.rst
@@ -0,0 +1,38 @@
+#################
+Official Packages
+#################
+
+The CodeIgniter framework cannot solve all of the problems that developers will encounter.
+Many users have said they love how small and fast the framework is, so we don't want to
+bloat the core framework. To bridge the gap we are releasing official packages to provide
+additional functionality that not every site will need or want.
+
+.. contents::
+    :local:
+    :depth: 2
+
+******
+Shield
+******
+
+`CodeIgniter Shield <https://github.com/codeigniter4/shield>`_ is an authentication
+and authorization framework for CodeIgniter 4. It is designed to be secure, flexible,
+and easily extendable to meet the needs of many different types of websites.
+Among the many featues, it includes:
+
+* Session-based authentication
+* Personal access token authentication
+* framework for after login/register "actions" (like Two Factor Authentication, etc)
+* Role-Based Access Control with simple, flexible permissions.
+* Per-user permission overrides,
+* and more...
+
+********
+Settings
+********
+
+`CodeIgniter Settings <https://github.com/codeigniter4/settings>`_ is a wrapper around
+the configuration files that allows any configuration setting to saved to the database,
+while defaulting to the config files when not custom value has been stored. This allows
+an application to ship with the default config values, but adapt as the project grows
+or moves servers, without having to touch the code.

From 5c3f3027395166249b7355eef8e8f1c5427661a1 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 1 Jun 2022 15:12:55 +0900
Subject: [PATCH 2316/2325] docs: add how to link to a function

---
 contributing/documentation.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/contributing/documentation.rst b/contributing/documentation.rst
index 11de48c7dd21..405cb127902a 100644
--- a/contributing/documentation.rst
+++ b/contributing/documentation.rst
@@ -120,3 +120,10 @@ To a URL
 ========
 
     `CodeIgniter 4 framework <https://github.com/codeigniter4/framework>`_
+
+To a Function
+=============
+
+    :php:func:`dot_array_search`
+
+    :php:func:`Response::setCookie() <setCookie>`

From b4542a539f02672d83e0007943ed53df1e16ef6e Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Wed, 1 Jun 2022 15:59:14 +0900
Subject: [PATCH 2317/2325] chore: update Sphinx version

---
 user_guide_src/requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/requirements.txt b/user_guide_src/requirements.txt
index 5d11554964d1..c1b52845bab9 100644
--- a/user_guide_src/requirements.txt
+++ b/user_guide_src/requirements.txt
@@ -1,5 +1,5 @@
-sphinx>=2.4.4,<3
-sphinxcontrib-phpdomain>=0.7.1
+sphinx>=4.5.0,<5
+sphinxcontrib-phpdomain>=0.8.0
 docutils>=0.16
 sphinx-rtd-theme>=0.5.0
 jinja2<3.1

From 42563c2c82d6ff03de3f1744ce495f79109128d6 Mon Sep 17 00:00:00 2001
From: "John Paul E. Balandan, CPA" <paulbalandan@gmail.com>
Date: Wed, 1 Jun 2022 09:31:23 +0800
Subject: [PATCH 2318/2325] Finish fix

---
 system/Common.php                    | 21 +++++++++++++++++----
 tests/system/CommonFunctionsTest.php | 26 +++++++++++++++++++++++---
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/system/Common.php b/system/Common.php
index e78f7c6ad7f1..30e28a1dc840 100644
--- a/system/Common.php
+++ b/system/Common.php
@@ -1015,12 +1015,25 @@ function slash_item(string $item): ?string
     {
         $config = config(App::class);
 
-        if (property_exists($config, $item)) {
-            $configItem = $config->{$item};
+        if (! property_exists($config, $item)) {
+            return null;
         }
 
-        if (! isset($configItem) || empty(trim($configItem))) {
-            return null;
+        $configItem = $config->{$item};
+
+        if (! is_scalar($configItem)) {
+            throw new RuntimeException(sprintf(
+                'Cannot convert "%s::$%s" of type "%s" to type "string".',
+                App::class,
+                $item,
+                gettype($configItem)
+            ));
+        }
+
+        $configItem = trim((string) $configItem);
+
+        if ($configItem === '') {
+            return $configItem;
         }
 
         return rtrim($configItem, '/') . '/';
diff --git a/tests/system/CommonFunctionsTest.php b/tests/system/CommonFunctionsTest.php
index 3dd8cfe3cfe8..e5225d5833f4 100644
--- a/tests/system/CommonFunctionsTest.php
+++ b/tests/system/CommonFunctionsTest.php
@@ -30,6 +30,7 @@
 use Config\Logger;
 use Config\Modules;
 use Kint;
+use RuntimeException;
 use stdClass;
 use Tests\Support\Models\JobModel;
 
@@ -390,9 +391,28 @@ public function testReallyWritable()
 
     public function testSlashItem()
     {
-        $this->assertSame('/', slash_item('cookiePath')); // slash already there
-        $this->assertNull(null, slash_item('cookieDomain')); // empty, so untouched
-        $this->assertSame('en/', slash_item('defaultLocale')); // slash appended
+        $this->assertSame('/', slash_item('cookiePath')); // /
+        $this->assertSame('', slash_item('cookieDomain')); // ''
+        $this->assertSame('en/', slash_item('defaultLocale')); // en
+        $this->assertSame('7200/', slash_item('sessionExpiration')); // int 7200
+        $this->assertSame('', slash_item('negotiateLocale')); // false
+        $this->assertSame('1/', slash_item('cookieHTTPOnly')); // true
+    }
+
+    public function testSlashItemOnInexistentItem()
+    {
+        $this->assertNull(slash_item('foo'));
+        $this->assertNull(slash_item('bar'));
+        $this->assertNull(slash_item('cookieDomains'));
+        $this->assertNull(slash_item('indices'));
+    }
+
+    public function testSlashItemThrowsErrorOnNonStringableItem()
+    {
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('Cannot convert "Config\\App::$supportedLocales" of type "array" to type "string".');
+
+        slash_item('supportedLocales');
     }
 
     protected function injectSessionMock()

From eafe4bbbd2960f3402cf3970b708c541528f012a Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Thu, 2 Jun 2022 20:31:06 +0900
Subject: [PATCH 2319/2325] docs: update repositories.rst

---
 .../source/installation/repositories.rst      | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/user_guide_src/source/installation/repositories.rst b/user_guide_src/source/installation/repositories.rst
index be7e0863136f..2ecfab99f191 100644
--- a/user_guide_src/source/installation/repositories.rst
+++ b/user_guide_src/source/installation/repositories.rst
@@ -1,6 +1,13 @@
 CodeIgniter Repositories
 ########################
 
+.. contents::
+    :local:
+    :depth: 2
+
+codeIgniter4 organization
+=========================
+
 The CodeIgniter 4 open source project has its own
 `GitHub organization <https://github.com/codeigniter4>`_.
 
@@ -15,9 +22,15 @@ There are several development repositories, of interest to potential contributor
 +------------------+--------------+-----------------------------------------------------------------+
 | coding-standard_ | contributors | Coding style conventions & rules                                |
 +------------------+--------------+-----------------------------------------------------------------+
+| devkit           | developers   | Development toolkit for CodeIgniter libraries and projects      |
++------------------+--------------+-----------------------------------------------------------------+
 | settings         | developers   | Settings Library for CodeIgniter 4                              |
 +------------------+--------------+-----------------------------------------------------------------+
-| devkit           | developers   | Development toolkit for CodeIgniter libraries and projects      |
+| shield           | developers   | Authentication and Authorization Library for CodeIgniter 4      |
++------------------+--------------+-----------------------------------------------------------------+
+| tasks            | developers   | Task Scheduler for CodeIgnter 4                                 |
++------------------+--------------+-----------------------------------------------------------------+
+| cache            | developers   | PSR-6 and PSR-16 Cache Adapters for CodeIgniter 4               |
 +------------------+--------------+-----------------------------------------------------------------+
 
 .. _coding-standard: https://github.com/CodeIgniter/coding-standard
@@ -53,6 +66,10 @@ These correspond to the repositories mentioned above:
 - `codeigniter4/appstarter <https://packagist.org/packages/codeigniter4/appstarter>`_
 - `codeigniter4/translations <https://packagist.org/packages/codeigniter4/translations>`_
 - `codeigniter/coding-standard  <https://packagist.org/packages/codeigniter/coding-standard>`_
+- `codeigniter4/devkit <https://packagist.org/packages/codeigniter4/devkit>`_
+- `codeigniter4/settings <https://packagist.org/packages/codeigniter4/settings>`_
+- `codeigniter4/shield <https://packagist.org/packages/codeigniter4/shield>`_
+- `codeigniter4/cache <https://packagist.org/packages/codeigniter4/cache>`_
 
 See the :doc:`Installation </installation/index>` page for more information.
 

From 54fedb08d8e944dd0f8a89f3fc69d2ec1b24a1e7 Mon Sep 17 00:00:00 2001
From: Cole Thorsen <959538+colethorsen@users.noreply.github.com>
Date: Thu, 2 Jun 2022 10:43:20 -0700
Subject: [PATCH 2320/2325] add missing valid_url_strict language string

---
 system/Language/en/Validation.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/system/Language/en/Validation.php b/system/Language/en/Validation.php
index e4fa3a64688d..2b870eb4085f 100644
--- a/system/Language/en/Validation.php
+++ b/system/Language/en/Validation.php
@@ -57,6 +57,7 @@
     'valid_emails'          => 'The {field} field must contain all valid email addresses.',
     'valid_ip'              => 'The {field} field must contain a valid IP.',
     'valid_url'             => 'The {field} field must contain a valid URL.',
+    'valid_url_strict'      => 'The {field} field must contain a valid URL.',
     'valid_date'            => 'The {field} field must contain a valid date.',
 
     // Credit Cards

From 22ba8641989fb96748b25e439152f032abb70644 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 3 Jun 2022 05:53:30 +0900
Subject: [PATCH 2321/2325] docs: fix typo

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

diff --git a/user_guide_src/source/installation/repositories.rst b/user_guide_src/source/installation/repositories.rst
index 2ecfab99f191..7631512518a2 100644
--- a/user_guide_src/source/installation/repositories.rst
+++ b/user_guide_src/source/installation/repositories.rst
@@ -5,7 +5,7 @@ CodeIgniter Repositories
     :local:
     :depth: 2
 
-codeIgniter4 organization
+codeigniter4 organization
 =========================
 
 The CodeIgniter 4 open source project has its own

From 7f795b53c8a1a58e0f33d75ba3f42d943e0237b9 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Thu, 2 Jun 2022 16:28:21 -0500
Subject: [PATCH 2322/2325] Added additional packages.

---
 .../source/libraries/official_packages.rst    | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/user_guide_src/source/libraries/official_packages.rst b/user_guide_src/source/libraries/official_packages.rst
index 82504b5f418d..8695a6be2a8c 100644
--- a/user_guide_src/source/libraries/official_packages.rst
+++ b/user_guide_src/source/libraries/official_packages.rst
@@ -36,3 +36,34 @@ the configuration files that allows any configuration setting to saved to the da
 while defaulting to the config files when not custom value has been stored. This allows
 an application to ship with the default config values, but adapt as the project grows
 or moves servers, without having to touch the code.
+
+
+*****
+Cache
+*****
+
+We provide a `PSR-6 and PSR-16 Cache Adapters <https://github.com/codeigniter4/cache>`_
+for CodeIgniter 4. This is not required for use, since CodeIgniter 4 comes with a fully-
+functional cache component. This module is only for integrating third-party packages
+that rely on the PSR interface provisions.
+
+
+******
+DevKit
+******
+
+`CodeIgniter DevKit <https://github.com/codeigniter4/devkit>`_ provides all of the
+development tools that CodeIgniter uses to help ensure quality code, including
+our coding standard, static analysys tools and rules, unit testing, data generation,
+file-system mocking, security advisories, and more. This can be used in any of
+your personal projects or libraries to get you rapidly setup with 17 different tools.
+
+
+***************
+Coding Standard
+***************
+
+The `CodeIgniter Coding Standard <https://github.com/CodeIgniter/coding-standard>`_
+holds the official coding standards of CodeIgniter based on PHP CS Fixer and powered by
+Nexus CS Config. This can be used into your own projects to form the basis of a
+consistent set of style rules that can be automatically applied to your code.

From b3e497d83e80bea4737c4b7bfa45428cb9051118 Mon Sep 17 00:00:00 2001
From: Lonnie Ezell <lonnieje@gmail.com>
Date: Thu, 2 Jun 2022 18:47:22 -0500
Subject: [PATCH 2323/2325] Apply suggestions from code review

Co-authored-by: MGatner <mgatner@icloud.com>
---
 user_guide_src/source/libraries/official_packages.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/user_guide_src/source/libraries/official_packages.rst b/user_guide_src/source/libraries/official_packages.rst
index 8695a6be2a8c..769da6aac3ed 100644
--- a/user_guide_src/source/libraries/official_packages.rst
+++ b/user_guide_src/source/libraries/official_packages.rst
@@ -42,7 +42,7 @@ or moves servers, without having to touch the code.
 Cache
 *****
 
-We provide a `PSR-6 and PSR-16 Cache Adapters <https://github.com/codeigniter4/cache>`_
+We provide a library with `PSR-6 and PSR-16 Cache Adapters <https://github.com/codeigniter4/cache>`_
 for CodeIgniter 4. This is not required for use, since CodeIgniter 4 comes with a fully-
 functional cache component. This module is only for integrating third-party packages
 that rely on the PSR interface provisions.
@@ -65,5 +65,5 @@ Coding Standard
 
 The `CodeIgniter Coding Standard <https://github.com/CodeIgniter/coding-standard>`_
 holds the official coding standards of CodeIgniter based on PHP CS Fixer and powered by
-Nexus CS Config. This can be used into your own projects to form the basis of a
+Nexus CS Config. This can be used in your own projects to form the basis of a
 consistent set of style rules that can be automatically applied to your code.

From a5ae35dd0aa6e6c0f1be3c80823b6b6ccf238503 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 3 Jun 2022 09:37:49 +0900
Subject: [PATCH 2324/2325] chore: update editorconfig

---
 .editorconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index 9d4b1ef22825..7382bb8eb572 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,5 +11,5 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.yml]
+[*.{yml,yaml}]
 indent_size = 2

From 785bd4c512fa3b8af6e8475fa13f9919e7f2a23d Mon Sep 17 00:00:00 2001
From: MGatner <mgatner@icloud.com>
Date: Fri, 3 Jun 2022 13:16:57 +0000
Subject: [PATCH 2325/2325] Prep for 4.2.0 release

---
 CHANGELOG.md                                  | 158 +++++++++++++++++-
 admin/RELEASE.md                              |   2 +-
 system/CodeIgniter.php                        |   2 +-
 user_guide_src/source/changelogs/v4.2.0.rst   |   2 +-
 user_guide_src/source/conf.py                 |   4 +-
 .../source/installation/upgrade_420.rst       |  27 ++-
 6 files changed, 185 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d2bf2ed7119c..03e7223b90cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,159 @@
 # Changelog
 
+## [v4.2.0](https://github.com/codeigniter4/CodeIgniter4/tree/v4.2.0) (2022-06-03)
+[Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.9...v4.2.0)
+
+### Breaking Changes
+* Validation: support placeholders for anything by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5545
+* Fix: Validation. Error key for field with asterisk by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/5609
+* Improve exception logging by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5684
+* fix: spark can't use options on PHP 7.4 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5836
+* fix: [Autoloader] Composer classmap usage by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5850
+* fix: using multiple CLI::color() in CLI::write() outputs strings with wrong color by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5893
+* refactor: [Router] extract a class for auto-routing by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5877
+* feat: Debugbar request microtime by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5958
+* refactor: `system/bootstrap.php` only loads files and registers autoloader by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5972
+* fix: `dot_array_search()` unexpected behavior by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5940
+* feat: QueryBuilder join() raw SQL string support by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5875
+* fix: change BaseService::reset() $initAutoloader to true by default by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6020
+
+### Fixed Bugs
+* chore: update admin/framework/composer.json Kint by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5531
+* fix: BaseConnection::getConnectDuration() number_format(): Passing null to parameter by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5536
+* Fix: Debug toolbar selectors by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/5544
+* Fix: Toolbar. ciDebugBar.showTab() context. by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/5554
+* Refactor Database Collector display by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5553
+* fix: add missing Migration lang item by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5557
+* feat: add Validation Strict Rules by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5445
+* fix: `Time::createFromTimestamp()` sets incorrect time when specifying timezone by @totoprayogo1916 in https://github.com/codeigniter4/CodeIgniter4/pull/5588
+* fix: Entity's isset() and unset() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5497
+* Fix: Deletion timestamp of the Model is updated when a record that has been soft-deleted is deleted again by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/5578
+* Fix: Added alias escaping in subquery by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/5601
+* fix: spark migrate:status does not show status with different namespaces by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5605
+* BaseService - Use lowercase key in resetSingle by @najdanovicivan in https://github.com/codeigniter4/CodeIgniter4/pull/5596
+* Fix `array_flatten_with_dots` ignores empty array values by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5606
+* fix: debug toolbar Routes Params output by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5619
+* fix: DownloadResponse memory leak by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5623
+* fix: spark does not show Exception by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5638
+* fix: Config CSRF $redirect does not work by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5665
+* fix: do not call header() if headers have already been sent by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5680
+* fix: $routes->setDefaultMethod() does not work by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5682
+* fix: debug toolbar vars response headers includes request headers by @zl59503020 in https://github.com/codeigniter4/CodeIgniter4/pull/5701
+* fix: 404 override controller does not output Response object body by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5703
+* fix: auto routes incorrectly display route filters with GET method by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5712
+* fix: Model::paginate() missing argument $group by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5699
+* Fix options are not passed to Command $params by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5206
+* fix: forceGlobalSecureRequests break URI schemes other than HTTP by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5730
+* fix: TypeError when `$tokenRandomize = true` and no token posted by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5742
+* fix: $builder->ignore()->insertBatch() only ignores on first iteration by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5672
+* fix: app/Config/Routes.php is loaded twice on Windows by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5780
+* fix: table name is double prefixed when LIKE clause by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5778
+* fix: Publisher $restrictions regex to FCPATH by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5793
+* fix: Timer::getElapsedTime() returns incorrect value by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5798
+* bug: Publisher $restrictions regex typo by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/5800
+* fix: [Validation] valid_date ErrorException when the field is not sent by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5804
+* fix: [Pager] can't get correct current page from segment by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5803
+* fix: bug that allows dynamic controllers to be used by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5814
+* config: remove App\ and Config\ in autoload.psr-4 in app starter composer.json by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5824
+* fix: failover's DBPrefix not working by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5816
+* fix: Validation returns incorrect errors after Redirect with Input by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5844
+* feat: [Parser] add configs to change conditional delimiters by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5842
+* fix: Commands::discoverCommands() loads incorrect classname by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5849
+* fix: Publisher::discover() loads incorrect classname by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5858
+* fix: validation errors in Model are not cleared when running validation again by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5861
+* fix: Parser fails with `({variable})` in loop by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5840
+* fix: [BaseConfig] string value is set from environment variable even if it should be int/float by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5779
+* fix: add Escaper Exception classes in $coreClassmap by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5891
+* fix: Composer PSR-4 overwrites Config\Autoload::$psr4 by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5902
+* fix: Reverse Routing does not take into account the default namespace by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5936
+* fix:  [Validation] Fields with an asterisk throws exception by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5938
+* fix: GDHandler::convert() does not work by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5969
+* fix: Images\Handlers\GDHandler Implicit conversion from float to int loses precision by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5965
+* fix: GDHandler::save() removes transparency by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5971
+* fix: route limit to subdomains does not work by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5961
+* fix: Model::_call() static analysis by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5970
+* fix: invalid css in error_404.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5978
+* Fix: Route placeholder (:any) with {locale} by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/6003
+* Changing the subquery builder for the Oracle by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/5999
+* fix: CURLRequest request body is not reset on the next request by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6014
+* Bug: The SQLSRV driver ignores the port value from the config. by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/6036
+* fix: `set_radio()` not working as expected by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6037
+* fix: add config for SQLite3 Foreign Keys by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6050
+* fix: Ignore non-HTML responses in storePreviousURL by @tearoom6 in https://github.com/codeigniter4/CodeIgniter4/pull/6012
+* fix: SQLite3\Table::copyData() does not escape column names by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6055
+* Fix `slash_item()` erroring when property fetched does not exist on `Config\App` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/6058
+
+### New Features
+* Feature Add Oracle driver by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/2487
+* feat: new improved auto router by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5889
+* feat: new improved auto router `spark routes` command by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5953
+* feat: `db:table` command by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5979
+
+### Enhancements
+* feat: CSP enhancements by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5516
+* Feature: Subqueries in the FROM section by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/5510
+* Added new View Decorators. by @lonnieezell in https://github.com/codeigniter4/CodeIgniter4/pull/5567
+* feat: auto routes listing by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5590
+* Feature: "spark routes" command shows routes with closure. by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/5651
+* feat: `spark routes` shows filters by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5628
+* Allow calling getQuery() multiple times, and other improvements by @vlakoff in https://github.com/codeigniter4/CodeIgniter4/pull/5127
+* feat: add Controller::validateData() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5639
+* feat: can add route handler as callable by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5713
+* Checking if the subquery uses the same object as the main query by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/5743
+* Feature: Subquery for SELECT by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/5736
+* Extend Validation from BaseConfig so Registrars can add rules. by @lonnieezell in https://github.com/codeigniter4/CodeIgniter4/pull/5789
+* config: add mime type for webp by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5838
+* feat: add `$includeDir` option to `get_filenames()` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5862
+* feat: throws exception when controller name in routes contains `/` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5885
+* [PHPStan] Prepare for PHPStan 1.6.x-dev by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5876
+* [Rector] Add back SimplifyUselessVariableRector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5911
+* Redirecting Routes. Placeholders. by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/5916
+* script_tag(): cosmetic for value-less attributes by @xlii-chl in https://github.com/codeigniter4/CodeIgniter4/pull/5884
+* feat: QueryBuilder raw SQL string support by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5817
+* improve Router Exception message by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5984
+* feat: DBForge::addField() `default` value raw SQL string support by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5957
+* Add sample file for preloading by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5974
+* Feature. QueryBuilder. Query union. by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/6015
+* feat: `getFieldData()` returns nullable data on PostgreSQL by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5981
+
+### Refactoring
+* refactor: add Factories::models() to suppress PHPStan error by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5358
+* Fixed style for PHP7.4 by @ytetsuro in https://github.com/codeigniter4/CodeIgniter4/pull/5581
+* Fix Autoloader::initialize() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5592
+* refactor: CURLRequest and the slow tests by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5593
+* Refactor `if_exist` validation with dot notation by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5607
+* refactor: small changes in Filters and Router by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5627
+* refactor: replace deprecated `getFilterForRoute()` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5624
+* refactor: make BaseController abstract by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5647
+* refactor: move logic to prevent access to initController by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5648
+* refactor: remove migrations routes by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5652
+* refactor: update Kint CSP nonce by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5657
+* Deprecate object implementations of `clean_path()` function by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5681
+* refactor: Session does not use cookies() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5656
+* refactor: replace deprecated Response::getReason() with getReasonPhrase() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5700
+* refactor: isCLI() in CLIRequest and IncomingRequest by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5653
+* refactor: CodeIgniter has context by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5650
+* Forge use statement by @mostafakhudair in https://github.com/codeigniter4/CodeIgniter4/pull/5729
+* refactor: remove `&` before $db by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5726
+* refactor: remove unneeded `&` references in ContentSecurityPolicy.php by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5734
+* Nonce replacement optimization. by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/5733
+* [Rector] Clean up skip config and re-run Rector by @samsonasik in https://github.com/codeigniter4/CodeIgniter4/pull/5813
+* refactor: DB Session Handler by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5696
+* Rename `Abstact` to `Abstract` by @paulbalandan in https://github.com/codeigniter4/CodeIgniter4/pull/5833
+* refactor: extract RedirectResponse::withErrors() method by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5860
+* Optimizing the RouteCollection::getRoutes() method by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/5918
+* refactor: add strtolower() to Request::getMethod() by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5963
+* refactor: remove `$_SERVER['HTTP_HOST']` in RouteCollection by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/5962
+* refactor: deprecate const `EVENT_PRIORITY_*` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6000
+* fix: replace EVENT_PRIORITY_NORMAL with Events::PRIORITY_NORMAL by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6005
+* Router class optimization. by @iRedds in https://github.com/codeigniter4/CodeIgniter4/pull/6004
+* Prefer `is_file()` by @MGatner in https://github.com/codeigniter4/CodeIgniter4/pull/6025
+* refactor: use get_filenames() 4th param in FileLocator by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6026
+* refactor: use get_filenames() 4th param by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6031
+* refactor: CodeIgniter $context check by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6047
+* Small change to improve code reading by @valmorflores in https://github.com/codeigniter4/CodeIgniter4/pull/6051
+* refactor: remove `CodeIgniter\Services` by @kenjis in https://github.com/codeigniter4/CodeIgniter4/pull/6053
+
 ## [v4.1.9](https://github.com/codeigniter4/CodeIgniter4/tree/v4.1.9) (2022-02-25)
 
 [Full Changelog](https://github.com/codeigniter4/CodeIgniter4/compare/v4.1.8...v4.1.9)
@@ -3178,7 +3332,3 @@ These changes increase security when handling uploaded files as the client can n
 - Fix debugbar loading while csp is enabled [\#1129](https://github.com/codeigniter4/CodeIgniter4/pull/1129) ([puschie286](https://github.com/puschie286))
 - Run session tests in separate processes - fix for \#1106 [\#1128](https://github.com/codeigniter4/CodeIgniter4/pull/1128) ([andreif23](https://github.com/andreif23))
 - Feature/sqlite [\#793](https://github.com/codeigniter4/CodeIgniter4/pull/793) ([lonnieezell](https://github.com/lonnieezell))
-
-
-
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*
diff --git a/admin/RELEASE.md b/admin/RELEASE.md
index d6546f3eb6da..b7ec0ced1905 100644
--- a/admin/RELEASE.md
+++ b/admin/RELEASE.md
@@ -37,7 +37,7 @@ Copy the resulting content into **CHANGELOG.md** and adjust the format to match
 * Replace **CHANGELOG.md** with the new version generated above
 * Set the date in **user_guide_src/source/changelogs/{version}.rst** to format `Release Date: January 31, 2021`
 * Create a new changelog for the next version at **user_guide_src/source/changelogs/{next_version}.rst** and add it to **index.rst**
-* If there are additional upgrade steps, create **user_guide_src/source/installation/upgrade_{ver}.rst** and add it to **upgrading.rst**
+* Create **user_guide_src/source/installation/upgrade_{ver}.rst**, fill in the "All Changes" section, and add it to **upgrading.rst**
 * 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"
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index d040e6f01787..82b08e318879 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -47,7 +47,7 @@ class CodeIgniter
     /**
      * The current version of CodeIgniter Framework
      */
-    public const CI_VERSION = '4.1.9';
+    public const CI_VERSION = '4.2.0';
 
     private const MIN_PHP_VERSION = '7.4';
 
diff --git a/user_guide_src/source/changelogs/v4.2.0.rst b/user_guide_src/source/changelogs/v4.2.0.rst
index 32df0dbdf3d3..1d0cf70f6795 100644
--- a/user_guide_src/source/changelogs/v4.2.0.rst
+++ b/user_guide_src/source/changelogs/v4.2.0.rst
@@ -1,7 +1,7 @@
 Version 4.2.0
 #############
 
-Release Date: Not Released
+Release Date: June 3, 2022
 
 **4.2.0 release of CodeIgniter4**
 
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 188b3146f9ad..3cc7e4d615de 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -21,10 +21,10 @@
 copyright = '2019-2022 CodeIgniter Foundation'
 
 # The short X.Y version.
-version = '4.1'
+version = '4.2'
 
 # The full version, including alpha/beta/rc tags.
-release = '4.1.9'
+release = '4.2.0'
 
 # -- General configuration ---------------------------------------------------
 
diff --git a/user_guide_src/source/installation/upgrade_420.rst b/user_guide_src/source/installation/upgrade_420.rst
index 01336530c9f9..4adac8a7613a 100644
--- a/user_guide_src/source/installation/upgrade_420.rst
+++ b/user_guide_src/source/installation/upgrade_420.rst
@@ -76,4 +76,29 @@ 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:
 
-*
+* app/Config/App.php
+* app/Config/Constants.php
+* app/Config/ContentSecurityPolicy.php
+* app/Config/Database.php
+* app/Config/Events.php
+* app/Config/Feature.php
+* app/Config/Filters.php
+* app/Config/Format.php
+* app/Config/Logger.php
+* app/Config/Mimes.php
+* app/Config/Publisher.php
+* app/Config/Routes.php
+* app/Config/Security.php
+* app/Config/Validation.php
+* app/Config/View.php
+* app/Controllers/BaseController.php
+* app/Views/errors/html/debug.css
+* app/Views/errors/html/debug.js
+* app/Views/errors/html/error_404.php
+* app/Views/errors/html/error_exception.php
+* app/Views/errors/html/production.php
+* app/Views/welcome_message.php
+* app/index.html
+* preload.php
+* public/index.php
+* spark